fix: transcludes and relative paths
This commit is contained in:
		
							parent
							
								
									649090de1b
								
							
						
					
					
						commit
						82bd08d14a
					
				
					 5 changed files with 85 additions and 36 deletions
				
			
		| 
						 | 
				
			
			@ -1,4 +1,4 @@
 | 
			
		|||
import type { ContentDetails } from "../../plugins/emitters/contentIndex"
 | 
			
		||||
import type { ContentDetails, ContentIndex } from "../../plugins/emitters/contentIndex"
 | 
			
		||||
import * as d3 from "d3"
 | 
			
		||||
import { registerEscapeHandler, removeAllChildren } from "./util"
 | 
			
		||||
import { FullSlug, SimpleSlug, getFullSlug, resolveRelative, simplifySlug } from "../../util/path"
 | 
			
		||||
| 
						 | 
				
			
			@ -46,20 +46,22 @@ async function renderGraph(container: string, fullSlug: FullSlug) {
 | 
			
		|||
    showTags,
 | 
			
		||||
  } = JSON.parse(graph.dataset["cfg"]!)
 | 
			
		||||
 | 
			
		||||
  const data = await fetchData
 | 
			
		||||
 | 
			
		||||
  const data: Map<SimpleSlug, ContentDetails> = new Map(
 | 
			
		||||
    Object.entries<ContentDetails>(await fetchData).map(([k, v]) => [
 | 
			
		||||
      simplifySlug(k as FullSlug),
 | 
			
		||||
      v,
 | 
			
		||||
    ]),
 | 
			
		||||
  )
 | 
			
		||||
  const links: LinkData[] = []
 | 
			
		||||
  const tags: SimpleSlug[] = []
 | 
			
		||||
 | 
			
		||||
  const validLinks = new Set(Object.keys(data).map((slug) => simplifySlug(slug as FullSlug)))
 | 
			
		||||
 | 
			
		||||
  for (const [src, details] of Object.entries<ContentDetails>(data)) {
 | 
			
		||||
    const source = simplifySlug(src as FullSlug)
 | 
			
		||||
  const validLinks = new Set(data.keys())
 | 
			
		||||
  for (const [source, details] of data.entries()) {
 | 
			
		||||
    const outgoing = details.links ?? []
 | 
			
		||||
 | 
			
		||||
    for (const dest of outgoing) {
 | 
			
		||||
      if (validLinks.has(dest)) {
 | 
			
		||||
        links.push({ source, target: dest })
 | 
			
		||||
        links.push({ source: source, target: dest })
 | 
			
		||||
      }
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			@ -71,7 +73,7 @@ async function renderGraph(container: string, fullSlug: FullSlug) {
 | 
			
		|||
      tags.push(...localTags.filter((tag) => !tags.includes(tag)))
 | 
			
		||||
 | 
			
		||||
      for (const tag of localTags) {
 | 
			
		||||
        links.push({ source, target: tag })
 | 
			
		||||
        links.push({ source: source, target: tag })
 | 
			
		||||
      }
 | 
			
		||||
    }
 | 
			
		||||
  }
 | 
			
		||||
| 
						 | 
				
			
			@ -93,17 +95,17 @@ async function renderGraph(container: string, fullSlug: FullSlug) {
 | 
			
		|||
      }
 | 
			
		||||
    }
 | 
			
		||||
  } else {
 | 
			
		||||
    Object.keys(data).forEach((id) => neighbourhood.add(simplifySlug(id as FullSlug)))
 | 
			
		||||
    validLinks.forEach((id) => neighbourhood.add(id))
 | 
			
		||||
    if (showTags) tags.forEach((tag) => neighbourhood.add(tag))
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  const graphData: { nodes: NodeData[]; links: LinkData[] } = {
 | 
			
		||||
    nodes: [...neighbourhood].map((url) => {
 | 
			
		||||
      const text = url.startsWith("tags/") ? "#" + url.substring(5) : data[url]?.title ?? url
 | 
			
		||||
      const text = url.startsWith("tags/") ? "#" + url.substring(5) : data.get(url)?.title ?? url
 | 
			
		||||
      return {
 | 
			
		||||
        id: url,
 | 
			
		||||
        text: text,
 | 
			
		||||
        tags: data[url]?.tags ?? [],
 | 
			
		||||
        tags: data.get(url)?.tags ?? [],
 | 
			
		||||
      }
 | 
			
		||||
    }),
 | 
			
		||||
    links: links.filter((l) => neighbourhood.has(l.source) && neighbourhood.has(l.target)),
 | 
			
		||||
| 
						 | 
				
			
			@ -200,7 +202,7 @@ async function renderGraph(container: string, fullSlug: FullSlug) {
 | 
			
		|||
      window.spaNavigate(new URL(targ, window.location.toString()))
 | 
			
		||||
    })
 | 
			
		||||
    .on("mouseover", function (_, d) {
 | 
			
		||||
      const neighbours: SimpleSlug[] = data[fullSlug].links ?? []
 | 
			
		||||
      const neighbours: SimpleSlug[] = data.get(slug)?.links ?? []
 | 
			
		||||
      const neighbourNodes = d3
 | 
			
		||||
        .selectAll<HTMLElement, NodeData>(".node")
 | 
			
		||||
        .filter((d) => neighbours.includes(d.id))
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue