typedoc 0.27.7 → 0.28.0-beta.0

package/dist/lib/converter/comments/textParser.js

@@ -1,4 +1,4 @@
-import { HtmlAttributeParser, ParserState } from "../../utils/html.js";
+import { HtmlAttributeParser, ParserState } from "#node-utils";
 import { TokenSyntaxKind } from "./lexer.js";
 import MarkdownIt from "markdown-it";
 const MdHelpers = new MarkdownIt().helpers;
@@ -97,7 +97,6 @@ export function textContent(sourcePath, token, i18n, warning, outContent, files,
  *
  * Reference: https://github.com/markdown-it/markdown-it/blob/14.1.0/lib/rules_inline/link.mjs
  * Reference: https://github.com/markdown-it/markdown-it/blob/14.1.0/lib/rules_inline/image.mjs
- *
  */
 function checkMarkdownLink(data, reentry) {
     const { token, sourcePath, files } = data;

package/dist/lib/converter/comments/textParser.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"textParser.js","sourceRoot":"","sources":["../../../../src/lib/converter/comments/textParser.ts"],"names":[],"mappings":"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"}

package/dist/lib/converter/components.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"components.d.ts","sourceRoot":"","sources":["../../../src/lib/converter/components.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAC1D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAEhD,8BAAsB,kBAAmB,SAAQ,iBAAiB,CAC9D,SAAS,EACT,EAAE,CACL;CAAG"}

package/dist/lib/converter/components.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"components.js","sourceRoot":"","sources":["../../../src/lib/converter/components.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAG1D,MAAM,OAAgB,kBAAmB,SAAQ,iBAGhD;CAAG"}

package/dist/lib/converter/context.d.ts

@@ -1,7 +1,7 @@
 import ts from "typescript";
-import { type Reflection, type ProjectReflection, DeclarationReflection, type DocumentReflection, ReflectionKind } from "../models/index.js";
+import { DeclarationReflection, type DocumentReflection, type ProjectReflection, type Reflection, ReflectionKind } from "../models/index.js";
 import type { Converter } from "./converter.js";
-import type { TranslationProxy } from "../internationalization/internationalization.js";
+import { type NormalizedPath } from "#utils";
 /**
  * The context describes the current state the converter is in.
  */
@@ -14,10 +14,6 @@ export declare class Context {
      * The TypeChecker instance returned by the TypeScript compiler.
      */
     get checker(): ts.TypeChecker;
-    /**
-     * Translation interface for log messages.
-     */
-    get i18n(): TranslationProxy;
     /**
      * The program currently being converted.
      * Accessing this property will throw if a source file is not currently being converted.
@@ -39,15 +35,16 @@ export declare class Context {
     convertingTypeNode: boolean;
     convertingClassOrInterface: boolean;
     shouldBeStatic: boolean;
+    private reflectionIdToSymbolMap;
     /**
      * Create a new Context instance.
      *
      * @param converter  The converter instance that has created the context.
      * @internal
      */
-    constructor(converter: Converter, programs: readonly ts.Program[], project: ProjectReflection, scope?: Context["scope"]);
+    constructor(converter: Converter, programs: readonly ts.Program[], project: ProjectReflection, scope?: Reflection);
     /** @internal */
-    get logger(): import("../utils/loggers.js").Logger;
+    get logger(): import("#utils").Logger;
     /**
      * Return the type declaration of the given node.
      *
@@ -70,13 +67,15 @@ export declare class Context {
      * @param reflection  The reflection that should be registered.
      * @param symbol  The symbol the given reflection was resolved from.
      */
-    registerReflection(reflection: Reflection, symbol: ts.Symbol | undefined): void;
+    registerReflection(reflection: Reflection, symbol: ts.Symbol | undefined, filePath?: NormalizedPath): void;
+    getReflectionFromSymbol(symbol: ts.Symbol): Reflection | undefined;
+    getSymbolFromReflection(reflection: Reflection): ts.Symbol | undefined;
     /** @internal */
     setActiveProgram(program: ts.Program | undefined): void;
-    getComment(symbol: ts.Symbol, kind: ReflectionKind): import("../models/index.js").Comment | undefined;
-    getNodeComment(node: ts.Node, moduleComment: boolean): import("../models/index.js").Comment | undefined;
-    getFileComment(node: ts.SourceFile): import("../models/index.js").Comment | undefined;
-    getJsDocComment(declaration: ts.JSDocPropertyLikeTag | ts.JSDocCallbackTag | ts.JSDocTypedefTag | ts.JSDocTemplateTag | ts.JSDocEnumTag): import("../models/index.js").Comment | undefined;
-    getSignatureComment(declaration: ts.SignatureDeclaration | ts.JSDocSignature): import("../models/index.js").Comment | undefined;
+    getComment(symbol: ts.Symbol, kind: ReflectionKind): import("../models/Comment.js").Comment | undefined;
+    getNodeComment(node: ts.Node, moduleComment: boolean): import("../models/Comment.js").Comment | undefined;
+    getFileComment(node: ts.SourceFile): import("../models/Comment.js").Comment | undefined;
+    getJsDocComment(declaration: ts.JSDocPropertyLikeTag | ts.JSDocCallbackTag | ts.JSDocTypedefTag | ts.JSDocTemplateTag | ts.JSDocEnumTag): import("../models/Comment.js").Comment | undefined;
+    getSignatureComment(declaration: ts.SignatureDeclaration | ts.JSDocSignature): import("../models/Comment.js").Comment | undefined;
     withScope(scope: Reflection): Context;
 }

package/dist/lib/converter/context.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"context.d.ts","sourceRoot":"","sources":["../../../src/lib/converter/context.ts"],"names":[],"mappings":"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"}

package/dist/lib/converter/context.js

@@ -1,11 +1,14 @@
 import { ok as assert } from "assert";
 import ts from "typescript";
-import { ContainerReflection, DeclarationReflection, ReflectionKind, ReflectionFlag, } from "../models/index.js";
+import { ContainerReflection, DeclarationReflection, ReflectionFlag, ReflectionKind, } from "../models/index.js";
 import { isNamedNode } from "./utils/nodes.js";
 import { ConverterEvents } from "./converter-events.js";
 import { resolveAliasedSymbol } from "./utils/symbols.js";
-import { getComment, getFileComment, getJsDocComment, getNodeComment, getSignatureComment, } from "./comments/index.js";
+import { getComment, getFileComment, getJsDocComment, getNodeComment, getSignatureComment } from "./comments/index.js";
 import { getHumanName } from "../utils/tsutils.js";
+import { normalizePath } from "#node-utils";
+import { createSymbolId } from "./factories/symbol-id.js";
+import { removeIf } from "#utils";
 /**
  * The context describes the current state the converter is in.
  */
@@ -20,12 +23,6 @@ export class Context {
     get checker() {
         return this.program.getTypeChecker();
     }
-    /**
-     * Translation interface for log messages.
-     */
-    get i18n() {
-        return this.converter.application.i18n;
-    }
     /**
      * The program currently being converted.
      * Accessing this property will throw if a source file is not currently being converted.
@@ -50,6 +47,7 @@ export class Context {
     convertingTypeNode = false; // Inherited by withScope
     convertingClassOrInterface = false; // Not inherited
     shouldBeStatic = false; // Not inherited
+    reflectionIdToSymbolMap = new Map();
     /**
      * Create a new Context instance.
      *
@@ -142,19 +140,24 @@ export class Context {
             reflection.setFlag(ReflectionFlag.Static);
         }
         if (reflection instanceof DeclarationReflection) {
-            reflection.escapedName = symbol?.escapedName;
+            reflection.escapedName = symbol?.escapedName ? String(symbol.escapedName) : undefined;
             this.addChild(reflection);
         }
         if (symbol && this.converter.isExternal(symbol)) {
             reflection.setFlag(ReflectionFlag.External);
         }
         if (exportSymbol) {
-            this.registerReflection(reflection, exportSymbol);
+            this.registerReflection(reflection, exportSymbol, void 0);
         }
         const path = reflection.kindOf(ReflectionKind.Namespace | ReflectionKind.Module)
             ? symbol?.declarations?.find(ts.isSourceFile)?.fileName
             : undefined;
-        this.project.registerReflection(reflection, symbol, path);
+        if (path) {
+            this.registerReflection(reflection, symbol, normalizePath(path));
+        }
+        else {
+            this.registerReflection(reflection, symbol, undefined);
+        }
     }
     finalizeDeclarationReflection(reflection) {
         this.converter.trigger(ConverterEvents.CREATE_DECLARATION, this, reflection);
@@ -177,8 +180,39 @@ export class Context {
      * @param reflection  The reflection that should be registered.
      * @param symbol  The symbol the given reflection was resolved from.
      */
-    registerReflection(reflection, symbol) {
-        this.project.registerReflection(reflection, symbol, void 0);
+    registerReflection(reflection, symbol, filePath) {
+        if (symbol) {
+            this.reflectionIdToSymbolMap.set(reflection.id, symbol);
+            const id = createSymbolId(symbol);
+            // #2466
+            // If we just registered a member of a class or interface, then we need to check if
+            // we've registered this symbol before under the wrong parent reflection.
+            // This can happen because the compiler API will use non-dependently-typed symbols
+            // for properties of classes/interfaces which inherit them, so we can't rely on the
+            // property being unique for each class.
+            if (reflection.parent?.kindOf(ReflectionKind.ClassOrInterface) &&
+                reflection.kindOf(ReflectionKind.SomeMember)) {
+                const saved = this.project["symbolToReflectionIdMap"].get(id);
+                const parentSymbolReflection = symbol.parent &&
+                    this.getReflectionFromSymbol(symbol.parent);
+                if (typeof saved === "object" &&
+                    saved.length > 1 &&
+                    parentSymbolReflection) {
+                    removeIf(saved, (item) => this.project.getReflectionById(item)?.parent !==
+                        parentSymbolReflection);
+                }
+            }
+            this.project.registerReflection(reflection, id, filePath);
+        }
+        else {
+            this.project.registerReflection(reflection, void 0, filePath);
+        }
+    }
+    getReflectionFromSymbol(symbol) {
+        return this.project.getReflectionFromSymbolId(createSymbolId(symbol));
+    }
+    getSymbolFromReflection(reflection) {
+        return this.reflectionIdToSymbolMap.get(reflection.id);
     }
     /** @internal */
     setActiveProgram(program) {
@@ -200,9 +234,12 @@ export class Context {
         return getSignatureComment(declaration, this.converter.config, this.logger, this.checker, this.project.files);
     }
     withScope(scope) {
+        // TODO: This will be important for #2862
+        // assert(scope.parent === this.scope, "Incorrect context used for withScope");
         const context = new Context(this.converter, this.programs, this.project, scope);
         context.convertingTypeNode = this.convertingTypeNode;
         context.setActiveProgram(this._program);
+        context.reflectionIdToSymbolMap = this.reflectionIdToSymbolMap;
         return context;
     }
 }

package/dist/lib/converter/context.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"context.js","sourceRoot":"","sources":["../../../src/lib/converter/context.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,IAAI,MAAM,EAAE,MAAM,QAAQ,CAAC;AACtC,OAAO,EAAE,MAAM,YAAY,CAAC;AAE5B,OAAO,EACH,mBAAmB,EACnB,qBAAqB,EAIrB,cAAc,EACd,cAAc,GACjB,MAAM,oBAAoB,CAAC;AAG5B,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AACxD,OAAO,EAAE,oBAAoB,EAAE,MAAM,oBAAoB,CAAC;AAC1D,OAAO,EAAE,UAAU,EAAE,cAAc,EAAE,eAAe,EAAE,cAAc,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAC;AACvH,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACnD,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAC5C,OAAO,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAC1D,OAAO,EAAuB,QAAQ,EAAE,MAAM,QAAQ,CAAC;AAEvD;;GAEG;AACH,MAAM,OAAO,OAAO;IAChB;;OAEG;IACM,SAAS,CAAY;IAE9B;;OAEG;IACH,IAAI,OAAO;QACP,OAAO,IAAI,CAAC,OAAO,CAAC,cAAc,EAAE,CAAC;IACzC,CAAC;IAED;;;OAGG;IACH,IAAI,OAAO;QACP,MAAM,CACF,IAAI,CAAC,QAAQ,EACb,mEAAmE,CACtE,CAAC;QACF,OAAO,IAAI,CAAC,QAAQ,CAAC;IACzB,CAAC;IACO,QAAQ,CAAc;IAE9B;;OAEG;IACM,QAAQ,CAAwB;IAEzC;;OAEG;IACM,OAAO,CAAoB;IAEpC;;OAEG;IACM,KAAK,CAAa;IAE3B,kBAAkB,GAAG,KAAK,CAAC,CAAC,yBAAyB;IACrD,0BAA0B,GAAG,KAAK,CAAC,CAAC,gBAAgB;IACpD,cAAc,GAAG,KAAK,CAAC,CAAC,gBAAgB;IAEhC,uBAAuB,GAAG,IAAI,GAAG,EAAqB,CAAC;IAE/D;;;;;OAKG;IACH,YACI,SAAoB,EACpB,QAA+B,EAC/B,OAA0B,EAC1B,QAAoB,OAAO;QAE3B,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;QAC3B,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;QAEzB,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;IACvB,CAAC;IAED,gBAAgB;IAChB,IAAI,MAAM;QACN,OAAO,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,MAAM,CAAC;IAC7C,CAAC;IAED;;;;;OAKG;IACH,iBAAiB,CAAC,IAAa;QAC3B,IAAI,QAA6B,CAAC;QAClC,IAAI,CAAC;YACD,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC,iBAAiB,CAAC,IAAI,CAAC,CAAC;QACpD,CAAC;QAAC,MAAM,CAAC;YACL,SAAS;QACb,CAAC;QACD,IAAI,CAAC,QAAQ,EAAE,CAAC;YACZ,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC;gBACd,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC,uBAAuB,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;gBAC7D,wCAAwC;YAC5C,CAAC;iBAAM,IAAI,IAAI,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC;gBAC7B,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC,uBAAuB,CAC3C,IAAI,CAAC,MAAM,CAAC,MAAM,CACrB,CAAC;gBACF,wCAAwC;YAC5C,CAAC;iBAAM,IAAI,IAAI,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC;gBACrC,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC,uBAAuB,CAC3C,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAC5B,CAAC;YACN,CAAC;QACL,CAAC;QACD,OAAO,QAAQ,CAAC;IACpB,CAAC;IAED,mBAAmB,CAAC,IAAa;QAC7B,IAAI,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC,mBAAmB,CAAC,IAAI,CAAC,CAAC;QACpD,IAAI,CAAC,MAAM,IAAI,WAAW,CAAC,IAAI,CAAC,EAAE,CAAC;YAC/B,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC,mBAAmB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACzD,CAAC;QACD,OAAO,MAAM,CAAC;IAClB,CAAC;IAED,sBAAsB,CAAC,IAAa;QAChC,MAAM,MAAM,GAAG,IAAI,CAAC,mBAAmB,CAAC,IAAI,CAAC,CAAC;QAC9C,IAAI,CAAC,MAAM,EAAE,CAAC;YACV,MAAM,EAAE,IAAI,EAAE,GAAG,EAAE,CAAC,6BAA6B,CAC7C,IAAI,CAAC,aAAa,EAAE,EACpB,IAAI,CAAC,GAAG,CACX,CAAC;YACF,MAAM,IAAI,KAAK,CACX,wCAAwC,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,IAAI,CAAC,aAAa,EAAE,CAAC,QAAQ,IAChG,IAAI,GAAG,CACX,EAAE,CACL,CAAC;QACN,CAAC;QACD,OAAO,MAAM,CAAC;IAClB,CAAC;IAED,oBAAoB,CAAC,MAAiB;QAClC,OAAO,oBAAoB,CAAC,MAAM,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;IACtD,CAAC;IAED,2BAA2B,CACvB,IAAoB,EACpB,MAA6B,EAC7B,YAAmC;IACnC,0DAA0D;IAC1D,YAAqB;QAErB,MAAM,IAAI,GAAG,YAAY,CACrB,YAAY,IAAI,YAAY,EAAE,IAAI,IAAI,MAAM,EAAE,IAAI,IAAI,SAAS,CAClE,CAAC;QAEF,IAAI,IAAI,CAAC,0BAA0B,EAAE,CAAC;YAClC,IAAI,IAAI,KAAK,cAAc,CAAC,QAAQ,EAAE,CAAC;gBACnC,IAAI,GAAG,cAAc,CAAC,MAAM,CAAC;YACjC,CAAC;YACD,IAAI,IAAI,KAAK,cAAc,CAAC,QAAQ,EAAE,CAAC;gBACnC,IAAI,GAAG,cAAc,CAAC,QAAQ,CAAC;YACnC,CAAC;QACL,CAAC;QAED,MAAM,UAAU,GAAG,IAAI,qBAAqB,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC;QACrE,IAAI,CAAC,sBAAsB,CAAC,UAAU,EAAE,MAAM,EAAE,YAAY,CAAC,CAAC;QAE9D,OAAO,UAAU,CAAC;IACtB,CAAC;IAED,sBAAsB,CAClB,UAAsB,EACtB,MAA6B,EAC7B,YAAmC;QAEnC,IACI,YAAY;YACZ,UAAU,CAAC,IAAI;gBACX,CAAC,cAAc,CAAC,UAAU,GAAG,cAAc,CAAC,SAAS,CAAC,EAC5D,CAAC;YACC,UAAU,CAAC,OAAO,GAAG,IAAI,CAAC,UAAU,CAAC,YAAY,EAAE,UAAU,CAAC,IAAI,CAAC,CAAC;QACxE,CAAC;QACD,IAAI,MAAM,IAAI,CAAC,UAAU,CAAC,OAAO,EAAE,CAAC;YAChC,UAAU,CAAC,OAAO,GAAG,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE,UAAU,CAAC,IAAI,CAAC,CAAC;QAClE,CAAC;QAED,IAAI,IAAI,CAAC,cAAc,EAAE,CAAC;YACtB,UAAU,CAAC,OAAO,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC;QAC9C,CAAC;QAED,IAAI,UAAU,YAAY,qBAAqB,EAAE,CAAC;YAC9C,UAAU,CAAC,WAAW,GAAG,MAAM,EAAE,WAAW,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;YACtF,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC;QAC9B,CAAC;QAED,IAAI,MAAM,IAAI,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,CAAC;YAC9C,UAAU,CAAC,OAAO,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAC;QAChD,CAAC;QACD,IAAI,YAAY,EAAE,CAAC;YACf,IAAI,CAAC,kBAAkB,CAAC,UAAU,EAAE,YAAY,EAAE,KAAK,CAAC,CAAC,CAAC;QAC9D,CAAC;QAED,MAAM,IAAI,GAAG,UAAU,CAAC,MAAM,CACtB,cAAc,CAAC,SAAS,GAAG,cAAc,CAAC,MAAM,CACnD;YACD,CAAC,CAAC,MAAM,EAAE,YAAY,EAAE,IAAI,CAAC,EAAE,CAAC,YAAY,CAAC,EAAE,QAAQ;YACvD,CAAC,CAAC,SAAS,CAAC;QAEhB,IAAI,IAAI,EAAE,CAAC;YACP,IAAI,CAAC,kBAAkB,CAAC,UAAU,EAAE,MAAM,EAAE,aAAa,CAAC,IAAI,CAAC,CAAC,CAAC;QACrE,CAAC;aAAM,CAAC;YACJ,IAAI,CAAC,kBAAkB,CAAC,UAAU,EAAE,MAAM,EAAE,SAAS,CAAC,CAAC;QAC3D,CAAC;IACL,CAAC;IAED,6BAA6B,CAAC,UAAiC;QAC3D,IAAI,CAAC,SAAS,CAAC,OAAO,CAClB,eAAe,CAAC,kBAAkB,EAClC,IAAI,EACJ,UAAU,CACb,CAAC;QAEF,IAAI,UAAU,CAAC,MAAM,CAAC,cAAc,CAAC,mBAAmB,CAAC,EAAE,CAAC;YACxD,IAAI,CAAC,SAAS,CAAC,mBAAmB,CAAC,UAAU,EAAE,UAAU,CAAC,CAAC;QAC/D,CAAC;IACL,CAAC;IAED,QAAQ,CAAC,UAAsD;QAC3D,IAAI,IAAI,CAAC,KAAK,YAAY,mBAAmB,EAAE,CAAC;YAC5C,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC;QACpC,CAAC;IACL,CAAC;IAED,YAAY,CAAC,MAAiB;QAC1B,OAAO,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC;IAC/C,CAAC;IAED;;;;;;OAMG;IACH,kBAAkB,CAAC,UAAsB,EAAE,MAA6B,EAAE,QAAyB;QAC/F,IAAI,MAAM,EAAE,CAAC;YACT,IAAI,CAAC,uBAAuB,CAAC,GAAG,CAAC,UAAU,CAAC,EAAE,EAAE,MAAM,CAAC,CAAC;YACxD,MAAM,EAAE,GAAG,cAAc,CAAC,MAAM,CAAC,CAAC;YAElC,QAAQ;YACR,mFAAmF;YACnF,yEAAyE;YACzE,kFAAkF;YAClF,mFAAmF;YACnF,wCAAwC;YACxC,IACI,UAAU,CAAC,MAAM,EAAE,MAAM,CAAC,cAAc,CAAC,gBAAgB,CAAC;gBAC1D,UAAU,CAAC,MAAM,CAAC,cAAc,CAAC,UAAU,CAAC,EAC9C,CAAC;gBACC,MAAM,KAAK,GAAG,IAAI,CAAC,OAAO,CAAC,yBAAyB,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;gBAC9D,MAAM,sBAAsB,GAAG,MAAM,CAAC,MAAM;oBACxC,IAAI,CAAC,uBAAuB,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;gBAEhD,IACI,OAAO,KAAK,KAAK,QAAQ;oBACzB,KAAK,CAAC,MAAM,GAAG,CAAC;oBAChB,sBAAsB,EACxB,CAAC;oBACC,QAAQ,CACJ,KAAK,EACL,CAAC,IAAI,EAAE,EAAE,CACL,IAAI,CAAC,OAAO,CAAC,iBAAiB,CAAC,IAAI,CAAC,EAAE,MAAM;wBACxC,sBAAsB,CACjC,CAAC;gBACN,CAAC;YACL,CAAC;YAED,IAAI,CAAC,OAAO,CAAC,kBAAkB,CAAC,UAAU,EAAE,EAAE,EAAE,QAAQ,CAAC,CAAC;QAC9D,CAAC;aAAM,CAAC;YACJ,IAAI,CAAC,OAAO,CAAC,kBAAkB,CAAC,UAAU,EAAE,KAAK,CAAC,EAAE,QAAQ,CAAC,CAAC;QAClE,CAAC;IACL,CAAC;IAED,uBAAuB,CAAC,MAAiB;QACrC,OAAO,IAAI,CAAC,OAAO,CAAC,yBAAyB,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC,CAAC;IAC1E,CAAC;IAED,uBAAuB,CAAC,UAAsB;QAC1C,OAAO,IAAI,CAAC,uBAAuB,CAAC,GAAG,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC;IAC3D,CAAC;IAED,gBAAgB;IAChB,gBAAgB,CAAC,OAA+B;QAC5C,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC;IAC5B,CAAC;IAED,UAAU,CAAC,MAAiB,EAAE,IAAoB;QAC9C,OAAO,UAAU,CACb,MAAM,EACN,IAAI,EACJ,IAAI,CAAC,SAAS,CAAC,MAAM,EACrB,IAAI,CAAC,MAAM,EACX,IAAI,CAAC,OAAO,EACZ,IAAI,CAAC,OAAO,CAAC,KAAK,CACrB,CAAC;IACN,CAAC;IAED,cAAc,CAAC,IAAa,EAAE,aAAsB;QAChD,OAAO,cAAc,CACjB,IAAI,EACJ,aAAa,EACb,IAAI,CAAC,SAAS,CAAC,MAAM,EACrB,IAAI,CAAC,MAAM,EACX,IAAI,CAAC,OAAO,EACZ,IAAI,CAAC,OAAO,CAAC,KAAK,CACrB,CAAC;IACN,CAAC;IAED,cAAc,CAAC,IAAmB;QAC9B,OAAO,cAAc,CACjB,IAAI,EACJ,IAAI,CAAC,SAAS,CAAC,MAAM,EACrB,IAAI,CAAC,MAAM,EACX,IAAI,CAAC,OAAO,EACZ,IAAI,CAAC,OAAO,CAAC,KAAK,CACrB,CAAC;IACN,CAAC;IAED,eAAe,CACX,WAKqB;QAErB,OAAO,eAAe,CAClB,WAAW,EACX,IAAI,CAAC,SAAS,CAAC,MAAM,EACrB,IAAI,CAAC,MAAM,EACX,IAAI,CAAC,OAAO,EACZ,IAAI,CAAC,OAAO,CAAC,KAAK,CACrB,CAAC;IACN,CAAC;IAED,mBAAmB,CACf,WAAwD;QAExD,OAAO,mBAAmB,CACtB,WAAW,EACX,IAAI,CAAC,SAAS,CAAC,MAAM,EACrB,IAAI,CAAC,MAAM,EACX,IAAI,CAAC,OAAO,EACZ,IAAI,CAAC,OAAO,CAAC,KAAK,CACrB,CAAC;IACN,CAAC;IAEM,SAAS,CAAC,KAAiB;QAC9B,yCAAyC;QACzC,+EAA+E;QAE/E,MAAM,OAAO,GAAG,IAAI,OAAO,CACvB,IAAI,CAAC,SAAS,EACd,IAAI,CAAC,QAAQ,EACb,IAAI,CAAC,OAAO,EACZ,KAAK,CACR,CAAC;QACF,OAAO,CAAC,kBAAkB,GAAG,IAAI,CAAC,kBAAkB,CAAC;QACrD,OAAO,CAAC,gBAAgB,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QACxC,OAAO,CAAC,uBAAuB,GAAG,IAAI,CAAC,uBAAuB,CAAC;QAC/D,OAAO,OAAO,CAAC;IACnB,CAAC;CACJ"}

package/dist/lib/converter/convert-expression.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"convert-expression.d.ts","sourceRoot":"","sources":["../../../src/lib/converter/convert-expression.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,YAAY,CAAC;AAE5B;;;;;GAKG;AACH,wBAAgB,mBAAmB,CAC/B,IAAI,EAAE,EAAE,CAAC,WAAW,GAAG,SAAS,GACjC,MAAM,GAAG,SAAS,CAOpB;AAED,wBAAgB,iBAAiB,CAAC,UAAU,EAAE,EAAE,CAAC,UAAU,GAAG,MAAM,CAmDnE"}

package/dist/lib/converter/convert-expression.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"convert-expression.js","sourceRoot":"","sources":["../../../src/lib/converter/convert-expression.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,YAAY,CAAC;AAE5B;;;;;GAKG;AACH,MAAM,UAAU,mBAAmB,CAC/B,IAAgC;IAEhC,MAAM,OAAO,GAAG,IAAW,CAAC;IAC5B,IAAI,OAAO,EAAE,WAAW,EAAE,CAAC;QACvB,OAAO,iBAAiB,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;IAClD,CAAC;SAAM,CAAC;QACJ,OAAO,SAAS,CAAC;IACrB,CAAC;AACL,CAAC;AAED,MAAM,UAAU,iBAAiB,CAAC,UAAyB;IACvD,QAAQ,UAAU,CAAC,IAAI,EAAE,CAAC;QACtB,KAAK,EAAE,CAAC,UAAU,CAAC,aAAa,CAAC;QACjC,KAAK,EAAE,CAAC,UAAU,CAAC,WAAW,CAAC;QAC/B,KAAK,EAAE,CAAC,UAAU,CAAC,YAAY,CAAC;QAChC,KAAK,EAAE,CAAC,UAAU,CAAC,WAAW,CAAC;QAC/B,KAAK,EAAE,CAAC,UAAU,CAAC,cAAc,CAAC;QAClC,KAAK,EAAE,CAAC,UAAU,CAAC,aAAa,CAAC;QACjC,KAAK,EAAE,CAAC,UAAU,CAAC,UAAU;YACzB,OAAO,UAAU,CAAC,OAAO,EAAE,CAAC;IACpC,CAAC;IAED,IAAI,EAAE,CAAC,uBAAuB,CAAC,UAAU,CAAC,EAAE,CAAC;QACzC,MAAM,KAAK,GAAG,iBAAiB,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;QACpD,IAAI,KAAK,IAAI,KAAK,EAAE,CAAC;YACjB,OAAO,UAAU,CAAC,OAAO,EAAE,CAAC;QAChC,CAAC;IACL,CAAC;IAED,IACI,EAAE,CAAC,wBAAwB,CAAC,UAAU,CAAC;QACvC,UAAU,CAAC,QAAQ,CAAC,MAAM,KAAK,CAAC,EAClC,CAAC;QACC,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,IACI,EAAE,CAAC,yBAAyB,CAAC,UAAU,CAAC;QACxC,UAAU,CAAC,UAAU,CAAC,MAAM,KAAK,CAAC,EACpC,CAAC;QACC,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,UAAU;IACV,IAAI,EAAE,CAAC,0BAA0B,CAAC,UAAU,CAAC,EAAE,CAAC;QAC5C,MAAM,KAAK,GAAG,CAAC,UAAU,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC;QAC1C,IAAI,IAAI,GAAG,UAAU,CAAC,UAAU,CAAC;QACjC,OAAO,EAAE,CAAC,0BAA0B,CAAC,IAAI,CAAC,EAAE,CAAC;YACzC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC;YACnC,IAAI,GAAG,IAAI,CAAC,UAAU,CAAC;QAC3B,CAAC;QAED,IAAI,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,EAAE,CAAC;YACxB,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YACzB,OAAO,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAC3B,CAAC;IACL,CAAC;IAED,0EAA0E;IAC1E,kDAAkD;IAClD,OAAO,KAAK,CAAC;AACjB,CAAC"}

package/dist/lib/converter/converter-events.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"converter-events.d.ts","sourceRoot":"","sources":["../../../src/lib/converter/converter-events.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,eAAe;;;;;;;;;;;;CAYlB,CAAC"}

package/dist/lib/converter/converter-events.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"converter-events.js","sourceRoot":"","sources":["../../../src/lib/converter/converter-events.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,eAAe,GAAG;IAC3B,KAAK,EAAE,OAAO;IACd,GAAG,EAAE,KAAK;IACV,cAAc,EAAE,eAAe;IAC/B,kBAAkB,EAAE,mBAAmB;IACvC,eAAe,EAAE,gBAAgB;IACjC,gBAAgB,EAAE,iBAAiB;IACnC,gBAAgB,EAAE,iBAAiB;IACnC,qBAAqB,EAAE,qBAAqB;IAC5C,aAAa,EAAE,cAAc;IAC7B,OAAO,EAAE,mBAAmB;IAC5B,WAAW,EAAE,YAAY;CACnB,CAAC"}

package/dist/lib/converter/converter.d.ts

@@ -3,12 +3,12 @@ import type { Application } from "../application.js";
 import { Comment, type CommentDisplayPart, type ContainerReflection, type DeclarationReflection, DocumentReflection, type ParameterReflection, ProjectReflection, type Reflection, type ReflectionSymbolId, type SignatureReflection, type SomeType, type TypeParameterReflection } from "../models/index.js";
 import { Context } from "./context.js";
 import { AbstractComponent } from "../utils/component.js";
-import { MinimalSourceFile } from "../utils/index.js";
+import { type GlobString, MinimalSourceFile } from "#utils";
 import type { DocumentationEntryPoint } from "../utils/entry-point.js";
 import type { CommentParserConfig } from "./comments/index.js";
 import type { CommentStyle, ValidationOptions } from "../utils/options/declaration.js";
-import { type ExternalSymbolResolver, type ExternalResolveResult } from "./comments/linkResolver.js";
-import { type DeclarationReference } from "./comments/declarationReference.js";
+import { type ExternalResolveResult, type ExternalSymbolResolver } from "./comments/linkResolver.js";
+import { type DeclarationReference } from "#utils";
 import type { FileRegistry } from "../models/FileRegistry.js";
 import { IncludePlugin } from "./plugins/IncludePlugin.js";
 export interface ConverterEvents {
@@ -41,7 +41,7 @@ export interface ConverterEvents {
  */
 export declare class Converter extends AbstractComponent<Application, ConverterEvents> {
     /** @internal */
-    accessor externalPattern: string[];
+    accessor externalPattern: GlobString[];
     private externalPatternCache?;
     private excludeCache?;
     /** @internal */
@@ -64,6 +64,8 @@ export declare class Converter extends AbstractComponent<Application, ConverterE
     accessor maxTypeConversionDepth: number;
     private _config?;
     private _externalSymbolResolvers;
+    private _deferPermitted;
+    private _defer;
     get config(): CommentParserConfig;
     /**
      * General events
@@ -187,6 +189,10 @@ export declare class Converter extends AbstractComponent<Application, ConverterE
     resolveExternalLink(ref: DeclarationReference, refl: Reflection, part: CommentDisplayPart | undefined, symbolId: ReflectionSymbolId | undefined): ExternalResolveResult | string | undefined;
     resolveLinks(comment: Comment, owner: Reflection): void;
     resolveLinks(parts: readonly CommentDisplayPart[], owner: Reflection): CommentDisplayPart[];
+    /**
+     * Defer a conversion step until later. This may only be called during conversion.
+     */
+    deferConversion(cb: () => void): void;
     /**
      * Compile the files within the given context and convert the compiler symbols to reflections.
      *
@@ -195,7 +201,6 @@ export declare class Converter extends AbstractComponent<Application, ConverterE
      */
     private compile;
     private convertExports;
-    private convertReExports;
     /**
      * Resolve the project within the given context.
      *

package/dist/lib/converter/converter.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"converter.d.ts","sourceRoot":"","sources":["../../../src/lib/converter/converter.ts"],"names":[],"mappings":"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"}

package/dist/lib/converter/converter.js

@@ -33,19 +33,20 @@ var __runInitializers = (this && this.__runInitializers) || function (thisArg, i
     return useValue ? value : void 0;
 };
 import ts from "typescript";
+import { ok } from "assert";
 import { Comment, DocumentReflection, ProjectReflection, ReflectionKind, } from "../models/index.js";
 import { Context } from "./context.js";
 import { AbstractComponent } from "../utils/component.js";
-import { Option, MinimalSourceFile, readFile, unique, getDocumentEntryPoints, } from "../utils/index.js";
+import { getDocumentEntryPoints, Option, readFile } from "../utils/index.js";
 import { convertType } from "./types.js";
 import { ConverterEvents } from "./converter-events.js";
 import { convertSymbol } from "./symbols.js";
-import { createMinimatch, matchesAny, nicePath } from "../utils/paths.js";
-import { hasAllFlags, hasAnyFlag } from "../utils/enum.js";
+import { MinimatchSet, nicePath, normalizePath } from "../utils/paths.js";
+import { hasAllFlags, hasAnyFlag, i18n, MinimalSourceFile, NormalizedPathUtils, partition, unique, } from "#utils";
 import { parseCommentString } from "./comments/parser.js";
 import { lexCommentString } from "./comments/rawLexer.js";
-import { resolvePartLinks, resolveLinks, } from "./comments/linkResolver.js";
-import { meaningToString, } from "./comments/declarationReference.js";
+import { resolveLinks, resolvePartLinks, } from "./comments/linkResolver.js";
+import { meaningToString } from "#utils";
 import { basename, dirname, resolve } from "path";
 import { GroupPlugin } from "./plugins/GroupPlugin.js";
 import { CategoryPlugin } from "./plugins/CategoryPlugin.js";
@@ -165,6 +166,12 @@ let Converter = (() => {
         set maxTypeConversionDepth(value) { this.#maxTypeConversionDepth_accessor_storage = value; }
         _config = __runInitializers(this, _maxTypeConversionDepth_extraInitializers);
         _externalSymbolResolvers = [];
+        // We try to document symbols which are exported from multiple locations
+        // in modules/namespaces which declare them, rather than those which re-export them.
+        // To do this, when converting a symbol, that might be re-exported, we first defer it
+        // to the second conversion pass.
+        _deferPermitted = false;
+        _defer = [];
         get config() {
             return this._config || this._buildCommentParserConfig();
         }
@@ -315,7 +322,7 @@ let Converter = (() => {
                     file = new MinimalSourceFile(readFile(path), path);
                 }
                 catch (error) {
-                    this.application.logger.error(this.application.logger.i18n.failed_to_read_0_when_processing_project_document(path));
+                    this.application.logger.error(i18n.failed_to_read_0_when_processing_project_document(path));
                     continue;
                 }
                 this.addDocument(project, file, displayName);
@@ -365,6 +372,13 @@ let Converter = (() => {
                 return resolvePartLinks(owner, comment, (ref, part, refl, id) => this.resolveExternalLink(ref, part, refl, id), { preserveLinkText: this.preserveLinkText });
             }
         }
+        /**
+         * Defer a conversion step until later. This may only be called during conversion.
+         */
+        deferConversion(cb) {
+            ok(this._deferPermitted, "Attempted to defer conversion when not permitted");
+            this._defer.push(cb);
+        }
         /**
          * Compile the files within the given context and convert the compiler symbols to reflections.
          *
@@ -372,13 +386,9 @@ let Converter = (() => {
          * @returns An array containing all errors generated by the TypeScript compiler.
          */
         compile(entryPoints, context) {
-            const entries = entryPoints.map((e) => {
-                return {
-                    entryPoint: e,
-                    context: undefined,
-                };
-            });
-            let createModuleReflections = entries.length > 1;
+            ok(!this._deferPermitted);
+            this._deferPermitted = true;
+            let createModuleReflections = entryPoints.length > 1;
             if (!createModuleReflections) {
                 const opts = this.application.options;
                 createModuleReflections = opts.isSet("alwaysCreateEntryPointModule")
@@ -388,18 +398,21 @@ let Converter = (() => {
             if (createModuleReflections) {
                 this.trigger(ConverterEvents.CREATE_PROJECT, context, context.project);
             }
-            entries.forEach((e) => {
-                context.setActiveProgram(e.entryPoint.program);
-                e.context = this.convertExports(context, e.entryPoint, createModuleReflections);
-            });
-            for (const { entryPoint, context } of entries) {
-                // active program is already set on context
-                // if we don't have a context, then this entry point is being ignored
-                if (context) {
-                    this.convertReExports(context, entryPoint.sourceFile);
-                }
+            for (const entry of entryPoints) {
+                // Clone context in case deferred conversion uses different programs
+                const entryContext = context.withScope(context.scope);
+                entryContext.setActiveProgram(entry.program);
+                this.convertExports(entryContext, entry, createModuleReflections);
             }
-            context.setActiveProgram(undefined);
+            this.application.logger.verbose(`Have ${this._defer.length} initial deferred tasks`);
+            let count = 0;
+            while (this._defer.length) {
+                ++count;
+                const first = this._defer.shift();
+                first();
+            }
+            this.application.logger.verbose(`Ran ${count} total deferred tasks`);
+            this._deferPermitted = false;
         }
         convertExports(context, entryPoint, createModuleReflections) {
             const node = entryPoint.sourceFile;
@@ -409,7 +422,7 @@ let Converter = (() => {
             if (createModuleReflections === false) {
                 // Special case for when we're giving a single entry point, we don't need to
                 // create modules for each entry. Register the project as this module.
-                context.project.registerReflection(context.project, symbol, entryPoint.sourceFile.fileName);
+                context.registerReflection(context.project, symbol, normalizePath(entryPoint.sourceFile.fileName));
                 context.project.comment = symbol
                     ? context.getComment(symbol, context.project.kind)
                     : context.getFileComment(node);
@@ -426,14 +439,16 @@ let Converter = (() => {
                 moduleContext = context.withScope(reflection);
             }
             const allExports = getExports(context, node, symbol);
-            for (const exp of allExports.filter((exp) => isDirectExport(context.resolveAliasedSymbol(exp), node))) {
+            const [directExport, indirectExports] = partition(allExports, exp => isDirectExport(context.resolveAliasedSymbol(exp), node));
+            for (const exp of directExport) {
                 this.convertSymbol(moduleContext, exp);
             }
-            return moduleContext;
-        }
-        convertReExports(moduleContext, node) {
-            for (const exp of getExports(moduleContext, node, moduleContext.project.getSymbolFromReflection(moduleContext.scope)).filter((exp) => !isDirectExport(moduleContext.resolveAliasedSymbol(exp), node))) {
-                this.convertSymbol(moduleContext, exp);
+            if (indirectExports.length) {
+                this.deferConversion(() => {
+                    for (const exp of indirectExports) {
+                        this.convertSymbol(moduleContext, exp);
+                    }
+                });
             }
         }
         /**
@@ -463,13 +478,13 @@ let Converter = (() => {
             return this.excludeExternals && this.isExternal(symbol);
         }
         isExcluded(symbol) {
-            this.excludeCache ??= createMinimatch(this.application.options.getValue("exclude"));
+            this.excludeCache ??= new MinimatchSet(this.application.options.getValue("exclude"));
             const cache = this.excludeCache;
-            return (symbol.getDeclarations() ?? []).some((node) => matchesAny(cache, node.getSourceFile().fileName));
+            return (symbol.getDeclarations() ?? []).some((node) => cache.matchesAny(node.getSourceFile().fileName));
         }
         /** @internal */
         isExternal(symbol) {
-            this.externalPatternCache ??= createMinimatch(this.externalPattern);
+            this.externalPatternCache ??= new MinimatchSet(this.externalPattern);
             const cache = this.externalPatternCache;
             const declarations = symbol.getDeclarations();
             // `undefined` has no declarations, if someone does `export default undefined`
@@ -481,23 +496,23 @@ let Converter = (() => {
             // If there are any non-external declarations, treat it as non-external
             // This is possible with declaration merging against external namespaces
             // (e.g. merging with HTMLElementTagNameMap)
-            return declarations.every((node) => matchesAny(cache, node.getSourceFile().fileName));
+            return declarations.every((node) => cache.matchesAny(node.getSourceFile().fileName));
         }
         processDocumentTags(reflection, parent) {
             let relativeTo = reflection.comment?.sourcePath;
             if (relativeTo) {
-                relativeTo = dirname(relativeTo);
+                relativeTo = NormalizedPathUtils.dirname(relativeTo);
                 const tags = reflection.comment?.getTags("@document") || [];
                 reflection.comment?.removeTags("@document");
                 for (const tag of tags) {
                     const path = Comment.combineDisplayParts(tag.content);
                     let file;
                     try {
-                        const resolved = resolve(relativeTo, path);
+                        const resolved = normalizePath(resolve(relativeTo, path));
                         file = new MinimalSourceFile(readFile(resolved), resolved);
                     }
                     catch {
-                        this.application.logger.warn(this.application.logger.i18n.failed_to_read_0_when_processing_document_tag_in_1(nicePath(path), nicePath(reflection.comment.sourcePath)));
+                        this.application.logger.warn(i18n.failed_to_read_0_when_processing_document_tag_in_1(nicePath(path), nicePath(reflection.comment.sourcePath)));
                         continue;
                     }
                     this.addDocument(parent, file, basename(file.fileName).replace(/\.[^.]+$/, ""));
@@ -524,7 +539,8 @@ let Converter = (() => {
                             ]);
                         }
                         else {
-                            this.application.logger.error(this.application.i18n.frontmatter_children_0_should_be_an_array_of_strings_or_object_with_string_values(nicePath(file.fileName)));
+                            this.application.logger.error(i18n
+                                .frontmatter_children_0_should_be_an_array_of_strings_or_object_with_string_values(nicePath(file.fileName)));
                             return;
                         }
                     }
@@ -535,20 +551,21 @@ let Converter = (() => {
                             childrenToAdd.push([name, path]);
                         }
                         else {
-                            this.application.logger.error(this.application.i18n.frontmatter_children_0_should_be_an_array_of_strings_or_object_with_string_values(nicePath(file.fileName)));
+                            this.application.logger.error(i18n
+                                .frontmatter_children_0_should_be_an_array_of_strings_or_object_with_string_values(nicePath(file.fileName)));
                             return;
                         }
                     }
                 }
             }
             for (const [displayName, path] of childrenToAdd) {
-                const absPath = resolve(dirname(file.fileName), path);
+                const absPath = normalizePath(resolve(dirname(file.fileName), path));
                 let childFile;
                 try {
                     childFile = new MinimalSourceFile(readFile(absPath), absPath);
                 }
                 catch (error) {
-                    this.application.logger.error(this.application.logger.i18n.failed_to_read_0_when_processing_document_child_in_1(path, nicePath(file.fileName)));
+                    this.application.logger.error(i18n.failed_to_read_0_when_processing_document_child_in_1(path, nicePath(file.fileName)));
                     continue;
                 }
                 this.addDocument(docRefl, childFile, displayName);

package/dist/lib/converter/converter.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"converter.js","sourceRoot":"","sources":["../../../src/lib/converter/converter.ts"],"names":[],"mappings":"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"}

package/dist/lib/converter/factories/index-signature.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index-signature.d.ts","sourceRoot":"","sources":["../../../../src/lib/converter/factories/index-signature.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,MAAM,YAAY,CAAC;AASjC,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAG7C,wBAAgB,sBAAsB,CAAC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,EAAE,CAAC,IAAI,QAmFrE"}

package/dist/lib/converter/factories/index-signature.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index-signature.js","sourceRoot":"","sources":["../../../../src/lib/converter/factories/index-signature.ts"],"names":[],"mappings":"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"}

package/dist/lib/converter/factories/signature.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"signature.d.ts","sourceRoot":"","sources":["../../../../src/lib/converter/factories/signature.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,YAAY,CAAC;AAE5B,OAAO,EAGH,mBAAmB,EAGnB,KAAK,UAAU,EAEf,cAAc,EACd,mBAAmB,EACnB,uBAAuB,EAE1B,MAAM,uBAAuB,CAAC;AAC/B,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAM7C,wBAAgB,eAAe,CAC3B,OAAO,EAAE,OAAO,EAChB,IAAI,EACE,cAAc,CAAC,aAAa,GAC5B,cAAc,CAAC,oBAAoB,GACnC,cAAc,CAAC,YAAY,GAC3B,cAAc,CAAC,YAAY,EACjC,SAAS,EAAE,EAAE,CAAC,SAAS,EACvB,MAAM,EAAE,EAAE,CAAC,MAAM,GAAG,SAAS,EAC7B,WAAW,CAAC,EAAE,EAAE,CAAC,oBAAoB,GAAG,EAAE,CAAC,cAAc,QA0G5D;AAED;;GAEG;AACH,wBAAgB,gCAAgC,CAC5C,OAAO,EAAE,OAAO,EAChB,SAAS,EAAE,EAAE,CAAC,SAAS,EACvB,SAAS,EAAE,UAAU,QA2CxB;AA+GD,wBAAgB,qBAAqB,CACjC,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,mBAAmB,EAC3B,UAAU,EAAE,SAAS,CAAC,EAAE,CAAC,iBAAiB,GAAG,EAAE,CAAC,oBAAoB,CAAC,EAAE,yBA+C1E;AAwED,wBAAgB,yBAAyB,CACrC,OAAO,EAAE,OAAO,EAChB,UAAU,EAAE,SAAS,EAAE,CAAC,wBAAwB,EAAE,GAAG,SAAS,yCAGjE;AAED,wBAAgB,yBAAyB,CACrC,KAAK,EAAE,EAAE,CAAC,wBAAwB,EAClC,OAAO,EAAE,OAAO,2BA+BnB;AAED,wBAAgB,6BAA6B,CACzC,OAAO,EAAE,OAAO,EAChB,KAAK,EAAE,SAAS,EAAE,CAAC,gBAAgB,EAAE,GAAG,SAAS,yCA0CpD"}