fix: convert in two steps

to allow all links to be registered before rendering
schoero · Aug 22, 2023 · 7bdbd76 · 7bdbd76
1 parent 826c0b4
commit 7bdbd76
Show file tree

Hide file tree

Showing 5 changed files with 51 additions and 19 deletions.
diff --git a/src/renderer/markup/ast-converter/types/type-reference.ts b/src/renderer/markup/ast-converter/types/type-reference.ts
@@ -33,7 +33,7 @@ export function convertTypeReferenceTypeInline(ctx: MarkupRenderContexts, typeRe
     return fallback;
   }
 
-  const anchor = createAnchorNode(typeReferenceType.target.name ?? "", id, fallback);
+  const anchor = createAnchorNode(typeReferenceType.target.name ?? "", id);
 
   const typeArguments = typeReferenceType.typeArguments && typeReferenceType.typeArguments.length > 0
     ? convertTypeArguments(ctx, typeReferenceType.typeArguments)

diff --git a/src/renderer/markup/html/index.ts b/src/renderer/markup/html/index.ts
@@ -1,7 +1,7 @@
 /* eslint-disable arrow-body-style */
 import { BuiltInRenderers } from "unwritten:renderer/enums/renderer.js";
 import { renderConditionalNode } from "unwritten:renderer/markup/html/ast/conditional.js";
-import { setCurrentSourceFile } from "unwritten:renderer/markup/registry/registry.js";
+import { createCurrentSourceFile, setCurrentSourceFile } from "unwritten:renderer/markup/registry/registry.js";
 import { getDestinationFilePath } from "unwritten:renderer/markup/utils/file.js";
 import { renderNewLine } from "unwritten:renderer/utils/new-line.js";
 import { renderAnchorNode } from "unwritten:renderer:html/ast/anchor.js";
@@ -124,19 +124,30 @@ const htmlRenderer: HTMLRenderer = {
 
     htmlRenderer.initializeContext(ctx);
 
-    return sourceFileEntities.reduce<RenderOutput>((files, sourceFileEntity) => {
+    return sourceFileEntities.reduce<(SourceFileEntity & { convertedAST: ASTNode; })[]>((convertedSourceFileEntities, sourceFileEntity) => {
+
+      const destination = getDestinationFilePath(ctx, sourceFileEntities, sourceFileEntity);
+      createCurrentSourceFile(ctx, sourceFileEntity, destination);
+      setCurrentSourceFile(ctx, sourceFileEntity);
+
+      convertedSourceFileEntities.push({
+        ...sourceFileEntity,
+        convertedAST: convertToMarkupAST(ctx, sourceFileEntity.exports)
+      });
+
+      return convertedSourceFileEntities;
+
+    }, [])
+      .reduce<RenderOutput>((files, convertedSourceFileEntity) => {
 
       // Reset context
       ctx.nesting = 1;
       ctx.indentation = 0;
 
-      const destination = getDestinationFilePath(ctx, sourceFileEntities, sourceFileEntity);
-      setCurrentSourceFile(ctx, sourceFileEntity, destination);
+      setCurrentSourceFile(ctx, convertedSourceFileEntity);
 
       const renderedNewLine = renderNewLine(ctx);
-
-      const markupAST = convertToMarkupAST(ctx, sourceFileEntity.exports);
-      const renderedContent = renderNode(ctx, markupAST);
+      const renderedContent = renderNode(ctx, convertedSourceFileEntity.convertedAST);
 
       const filePath = ctx.currentFile.dst;
 
@@ -147,7 +158,6 @@ const htmlRenderer: HTMLRenderer = {
 
   })
 
-
 };
 
 export function renderNode(ctx: HTMLRenderContext, node: ASTNode): string {

diff --git a/src/renderer/markup/markdown/index.ts b/src/renderer/markup/markdown/index.ts
@@ -3,7 +3,7 @@
 import { BuiltInRenderers } from "unwritten:renderer/enums/renderer.js";
 import { renderConditionalNode } from "unwritten:renderer/markup/markdown/ast/conditional.js";
 import { escapeMarkdown } from "unwritten:renderer/markup/markdown/utils/escape.js";
-import { setCurrentSourceFile } from "unwritten:renderer/markup/registry/registry.js";
+import { createCurrentSourceFile, setCurrentSourceFile } from "unwritten:renderer/markup/registry/registry.js";
 import { getDestinationFilePath } from "unwritten:renderer/markup/utils/file.js";
 import { renderNewLine } from "unwritten:renderer/utils/new-line.js";
 import { renderAnchorNode } from "unwritten:renderer:markdown/ast/anchor.js";
@@ -127,19 +127,30 @@ const markdownRenderer: MarkdownRenderer = {
 
     markdownRenderer.initializeContext(ctx);
 
-    return sourceFileEntities.reduce<RenderOutput>((files, sourceFileEntity) => {
+    return sourceFileEntities.reduce<(SourceFileEntity & { convertedAST: ASTNode; })[]>((convertedSourceFileEntities, sourceFileEntity) => {
+
+      const destination = getDestinationFilePath(ctx, sourceFileEntities, sourceFileEntity);
+      createCurrentSourceFile(ctx, sourceFileEntity, destination);
+      setCurrentSourceFile(ctx, sourceFileEntity);
+
+      convertedSourceFileEntities.push({
+        ...sourceFileEntity,
+        convertedAST: convertToMarkupAST(ctx, sourceFileEntity.exports)
+      });
+
+      return convertedSourceFileEntities;
+
+    }, [])
+      .reduce<RenderOutput>((files, convertedSourceFileEntity) => {
 
       // Reset context
       ctx.nesting = 1;
       ctx.indentation = 0;
 
-      const destination = getDestinationFilePath(ctx, sourceFileEntities, sourceFileEntity);
-      setCurrentSourceFile(ctx, sourceFileEntity, destination);
+      setCurrentSourceFile(ctx, convertedSourceFileEntity);
 
       const renderedNewLine = renderNewLine(ctx);
-
-      const markupAST = convertToMarkupAST(ctx, sourceFileEntity.exports);
-      const renderedContent = renderNode(ctx, markupAST);
+      const renderedContent = renderNode(ctx, convertedSourceFileEntity.convertedAST);
 
       const filePath = ctx.currentFile.dst;
 

diff --git a/src/renderer/markup/registry/registry.ts b/src/renderer/markup/registry/registry.ts
@@ -1,3 +1,5 @@
+import { assert } from "unwritten:utils/general.js";
+
 import type { MarkupRenderContexts } from "../types-definitions/markup.js";
 
 import type { SourceFileEntity } from "unwritten:interpreter/type-definitions/entities.js";
@@ -120,7 +122,7 @@ function isSymbolExportedFromSourceFile(sourceFile: SourceFile, symbolId: ID): b
   return Object.values(sourceFile.links).some(linkIds => linkIds.includes(symbolId));
 }
 
-export function setCurrentSourceFile(ctx: MarkupRenderContexts, sourceFileEntity: SourceFileEntity, destination: FilePath): void {
+export function createCurrentSourceFile(ctx: MarkupRenderContexts, sourceFileEntity: SourceFileEntity, destination: FilePath): void {
 
   // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
   const index = ctx.links.findIndex(sourceFile => sourceFile.id === sourceFileEntity.symbolId);
@@ -139,6 +141,15 @@ export function setCurrentSourceFile(ctx: MarkupRenderContexts, sourceFileEntity
     ctx.links[index] = sourceFile;
   }
 
-  ctx.currentFile = ctx.links.at(-1)!;
+}
+
+export function setCurrentSourceFile(ctx: MarkupRenderContexts, sourceFileEntity: SourceFileEntity): void {
+
+  // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
+  const index = ctx.links.findIndex(sourceFile => sourceFile.id === sourceFileEntity.symbolId);
+
+  assert(index !== -1, `Source file ${sourceFileEntity.path} is not registered`);
+
+  ctx.currentFile = ctx.links.at(index)!;
 
 }
diff --git a/src/renderer/markup/utils/nodes.ts b/src/renderer/markup/utils/nodes.ts
@@ -24,7 +24,7 @@ import type { AnchorTarget } from "unwritten:renderer/markup/registry/registry.j
 import type { SectionType } from "unwritten:renderer:markup/types-definitions/sections.js";
 
 
-export function createAnchorNode(name: Name, id: ID, inlineFallback?: ASTNode): AnchorNode {
+export function createAnchorNode(name: Name, id: ID): AnchorNode {
   return {
     children: [name],
     id,