typedoc 0.23.26 → 0.24.0-beta.1

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

@@ -1,65 +1,68 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.resolvePartLinks = exports.resolveLinks = void 0;
-const typescript_1 = __importDefault(require("typescript"));
+const ts = __importStar(require("typescript"));
 const models_1 = require("../../models");
 const declarationReference_1 = require("./declarationReference");
 const declarationReferenceResolver_1 = require("./declarationReferenceResolver");
 const urlPrefix = /^(http|ftp)s?:\/\//;
-const brackets = /\[\[(?!include:)([^\]]+)\]\]/g;
-function resolveLinks(comment, reflection, validation, logger, externalResolver) {
-    let warned = false;
-    const warn = () => {
-        if (!warned) {
-            warned = true;
-            logger.warn(`${reflection.getFriendlyFullName()}: Comment [[target]] style links are deprecated and will be removed in 0.24`);
-        }
-    };
-    comment.summary = resolvePartLinks(reflection, comment.summary, warn, validation, logger, externalResolver);
+function resolveLinks(comment, reflection, attemptExternalResolve) {
+    comment.summary = resolvePartLinks(reflection, comment.summary, attemptExternalResolve);
     for (const tag of comment.blockTags) {
-        tag.content = resolvePartLinks(reflection, tag.content, warn, validation, logger, externalResolver);
+        tag.content = resolvePartLinks(reflection, tag.content, attemptExternalResolve);
     }
     if (reflection instanceof models_1.DeclarationReflection && reflection.readme) {
-        reflection.readme = resolvePartLinks(reflection, reflection.readme, warn, validation, logger, externalResolver);
+        reflection.readme = resolvePartLinks(reflection, reflection.readme, attemptExternalResolve);
     }
 }
 exports.resolveLinks = resolveLinks;
-function resolvePartLinks(reflection, parts, warn, validation, logger, externalResolver) {
-    return parts.flatMap((part) => processPart(reflection, part, warn, validation, logger, externalResolver));
+function resolvePartLinks(reflection, parts, attemptExternalResolve) {
+    return parts.flatMap((part) => processPart(reflection, part, attemptExternalResolve));
 }
 exports.resolvePartLinks = resolvePartLinks;
-function processPart(reflection, part, warn, validation, logger, externalResolver) {
-    if (part.kind === "text" && brackets.test(part.text)) {
-        warn();
-        return replaceBrackets(reflection, part.text, validation, logger);
-    }
+function processPart(reflection, part, attemptExternalResolve) {
     if (part.kind === "inline-tag") {
         if (part.tag === "@link" ||
             part.tag === "@linkcode" ||
             part.tag === "@linkplain") {
-            return resolveLinkTag(reflection, part, externalResolver, (msg) => {
-                if (validation.invalidLink) {
-                    logger.warn(msg);
-                }
-            });
+            return resolveLinkTag(reflection, part, attemptExternalResolve);
         }
     }
     return part;
 }
-function resolveLinkTag(reflection, part, externalResolver, warn) {
+function resolveLinkTag(reflection, part, attemptExternalResolve) {
     let pos = 0;
     const end = part.text.length;
-    while (pos < end && typescript_1.default.isWhiteSpaceLike(part.text.charCodeAt(pos))) {
+    while (pos < end && ts.isWhiteSpaceLike(part.text.charCodeAt(pos))) {
         pos++;
     }
-    const origText = part.text;
     // Try to parse one
     const declRef = (0, declarationReference_1.parseDeclarationReference)(part.text, pos, end);
     let target;
-    let defaultDisplayText = "";
+    let defaultDisplayText;
     if (declRef) {
         // Got one, great! Try to resolve the link
         target = (0, declarationReferenceResolver_1.resolveDeclarationReference)(reflection, declRef[0]);
@@ -69,16 +72,9 @@ function resolveLinkTag(reflection, part, externalResolver, warn) {
         }
         else {
             // If we didn't find a link, it might be a @link tag to an external symbol, check that next.
-            const externalResolveResult = externalResolver(declRef[0], reflection, part);
-            defaultDisplayText = part.text.substring(0, pos);
-            switch (typeof externalResolveResult) {
-                case "string":
-                    target = externalResolveResult;
-                    break;
-                case "object":
-                    target = externalResolveResult.target;
-                    defaultDisplayText =
-                        externalResolveResult.caption || defaultDisplayText;
+            target = attemptExternalResolve(declRef[0]);
+            if (target) {
+                defaultDisplayText = part.text.substring(0, pos);
             }
         }
     }
@@ -91,117 +87,18 @@ function resolveLinkTag(reflection, part, externalResolver, warn) {
             defaultDisplayText = target;
         }
     }
-    // If resolution via a declaration reference failed, revert to the legacy "split and check"
-    // method... this should go away in 0.24, once people have had a chance to migrate any failing links.
-    if (!target) {
-        const resolved = legacyResolveLinkTag(reflection, part);
-        if (resolved.target) {
-            warn(`Failed to resolve {@link ${origText}} in ${reflection.getFriendlyFullName()} with declaration references. This link will break in v0.24.`);
-        }
-        return resolved;
-    }
     // Remaining text after an optional pipe is the link text, so advance
     // until that's consumed.
-    while (pos < end && typescript_1.default.isWhiteSpaceLike(part.text.charCodeAt(pos))) {
+    while (pos < end && ts.isWhiteSpaceLike(part.text.charCodeAt(pos))) {
         pos++;
     }
     if (pos < end && part.text[pos] === "|") {
         pos++;
     }
-    part.target = target;
-    part.text =
-        part.text.substring(pos).trim() || defaultDisplayText || part.text;
-    return part;
-}
-function legacyResolveLinkTag(reflection, part) {
-    const { caption, target } = splitLinkText(part.text);
-    if (urlPrefix.test(target)) {
-        part.text = caption;
-        part.target = target;
-    }
-    else {
-        const targetRefl = reflection.findReflectionByName(target);
-        if (targetRefl) {
-            part.text = caption;
-            part.target = targetRefl;
-        }
+    if (!target) {
+        return part;
     }
+    part.target = target;
+    part.text = part.text.substring(pos).trim() || defaultDisplayText;
     return part;
 }
-function replaceBrackets(reflection, text, validation, logger) {
-    const parts = [];
-    let begin = 0;
-    brackets.lastIndex = 0;
-    for (const match of text.matchAll(brackets)) {
-        if (begin != match.index) {
-            parts.push({
-                kind: "text",
-                text: text.substring(begin, match.index),
-            });
-        }
-        begin = match.index + match[0].length;
-        const content = match[1];
-        const { target, caption } = splitLinkText(content);
-        if (urlPrefix.test(target)) {
-            parts.push({
-                kind: "inline-tag",
-                tag: "@link",
-                text: caption,
-                target,
-            });
-        }
-        else {
-            const targetRefl = reflection.findReflectionByName(target);
-            if (targetRefl) {
-                parts.push({
-                    kind: "inline-tag",
-                    tag: "@link",
-                    text: caption,
-                    target: targetRefl,
-                });
-            }
-            else {
-                if (validation.invalidLink) {
-                    logger.warn("Failed to find target: " + content);
-                }
-                parts.push({
-                    kind: "inline-tag",
-                    tag: "@link",
-                    text: content,
-                });
-            }
-        }
-    }
-    parts.push({
-        kind: "text",
-        text: text.substring(begin),
-    });
-    return parts;
-}
-/**
- * Split the given link into text and target at first pipe or space.
- *
- * @param text  The source string that should be checked for a split character.
- * @returns An object containing the link text and target.
- */
-function splitLinkText(text) {
-    let splitIndex = text.indexOf("|");
-    if (splitIndex === -1) {
-        splitIndex = text.search(/\s/);
-    }
-    if (splitIndex !== -1) {
-        return {
-            caption: text
-                .substring(splitIndex + 1)
-                .replace(/\n+/, " ")
-                .trim(),
-            target: text.substring(0, splitIndex).trim(),
-        };
-    }
-    else {
-        return {
-            caption: text,
-            target: text,
-        };
-    }
-}

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

@@ -1,4 +1,4 @@
-import ts from "typescript";
+import * as ts from "typescript";
 import { Reflection, ProjectReflection, DeclarationReflection, ReflectionKind } from "../models/index";
 import type { Converter } from "./converter";
 /**

package/dist/lib/converter/context.js

@@ -1,16 +1,37 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Context = void 0;
 const assert_1 = require("assert");
-const typescript_1 = __importDefault(require("typescript"));
+const ts = __importStar(require("typescript"));
 const index_1 = require("../models/index");
 const nodes_1 = require("./utils/nodes");
 const converter_events_1 = require("./converter-events");
 const symbols_1 = require("./utils/symbols");
 const comments_1 = require("./comments");
+const tsutils_1 = require("../utils/tsutils");
 /**
  * The context describes the current state the converter is in.
  */
@@ -99,8 +120,8 @@ class Context {
     expectSymbolAtLocation(node) {
         const symbol = this.getSymbolAtLocation(node);
         if (!symbol) {
-            const { line } = typescript_1.default.getLineAndCharacterOfPosition(node.getSourceFile(), node.pos);
-            throw new Error(`Expected a symbol for node with kind ${typescript_1.default.SyntaxKind[node.kind]} at ${node.getSourceFile().fileName}:${line + 1}`);
+            const { line } = ts.getLineAndCharacterOfPosition(node.getSourceFile(), node.pos);
+            throw new Error(`Expected a symbol for node with kind ${ts.SyntaxKind[node.kind]} at ${node.getSourceFile().fileName}:${line + 1}`);
         }
         return symbol;
     }
@@ -110,7 +131,7 @@ class Context {
     createDeclarationReflection(kind, symbol, exportSymbol, 
     // We need this because modules don't always have symbols.
     nameOverride) {
-        const name = getHumanName(nameOverride ?? exportSymbol?.name ?? symbol?.name ?? "unknown");
+        const name = (0, tsutils_1.getHumanName)(nameOverride ?? exportSymbol?.name ?? symbol?.name ?? "unknown");
         const reflection = new index_1.DeclarationReflection(name, kind, this.scope);
         this.postReflectionCreation(reflection, symbol, exportSymbol);
         return reflection;
@@ -189,11 +210,3 @@ class Context {
     }
 }
 exports.Context = Context;
-const uniqueSymbolRegExp = /^__@(.*)@\d+$/;
-function getHumanName(name) {
-    const match = uniqueSymbolRegExp.exec(name);
-    if (match) {
-        return `[${match[1]}]`;
-    }
-    return name;
-}

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

@@ -1,4 +1,4 @@
-import ts from "typescript";
+import * as ts from "typescript";
 /**
  * Return the default value of the given node.
  *

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

@@ -1,10 +1,30 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.convertExpression = exports.convertDefaultValue = void 0;
-const typescript_1 = __importDefault(require("typescript"));
+const ts = __importStar(require("typescript"));
 /**
  * Return the default value of the given node.
  *
@@ -23,32 +43,32 @@ function convertDefaultValue(node) {
 exports.convertDefaultValue = convertDefaultValue;
 function convertExpression(expression) {
     switch (expression.kind) {
-        case typescript_1.default.SyntaxKind.StringLiteral:
-        case typescript_1.default.SyntaxKind.TrueKeyword:
-        case typescript_1.default.SyntaxKind.FalseKeyword:
-        case typescript_1.default.SyntaxKind.NullKeyword:
-        case typescript_1.default.SyntaxKind.NumericLiteral:
-        case typescript_1.default.SyntaxKind.PrefixUnaryExpression:
-        case typescript_1.default.SyntaxKind.Identifier:
+        case ts.SyntaxKind.StringLiteral:
+        case ts.SyntaxKind.TrueKeyword:
+        case ts.SyntaxKind.FalseKeyword:
+        case ts.SyntaxKind.NullKeyword:
+        case ts.SyntaxKind.NumericLiteral:
+        case ts.SyntaxKind.PrefixUnaryExpression:
+        case ts.SyntaxKind.Identifier:
             return expression.getText();
     }
-    if (typescript_1.default.isArrayLiteralExpression(expression) &&
+    if (ts.isArrayLiteralExpression(expression) &&
         expression.elements.length === 0) {
         return "[]";
     }
-    if (typescript_1.default.isObjectLiteralExpression(expression) &&
+    if (ts.isObjectLiteralExpression(expression) &&
         expression.properties.length === 0) {
         return "{}";
     }
     // a.b.c.d
-    if (typescript_1.default.isPropertyAccessExpression(expression)) {
+    if (ts.isPropertyAccessExpression(expression)) {
         const parts = [expression.name.getText()];
         let iter = expression.expression;
-        while (typescript_1.default.isPropertyAccessExpression(iter)) {
+        while (ts.isPropertyAccessExpression(iter)) {
             parts.unshift(iter.name.getText());
             iter = iter.expression;
         }
-        if (typescript_1.default.isIdentifier(iter)) {
+        if (ts.isIdentifier(iter)) {
             parts.unshift(iter.text);
             return parts.join(".");
         }

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

@@ -1,4 +1,4 @@
-import ts from "typescript";
+import * as ts from "typescript";
 import type { Application } from "../application";
 import { Comment, CommentDisplayPart, ProjectReflection, Reflection, SomeType } from "../models/index";
 import { Context } from "./context";
@@ -8,7 +8,6 @@ import { MinimalSourceFile } from "../utils";
 import type { DocumentationEntryPoint } from "../utils/entry-point";
 import { CommentParserConfig } from "./comments";
 import type { CommentStyle, ValidationOptions } from "../utils/options/declaration";
-import { ExternalSymbolResolver, ExternalResolveResult } from "./comments/linkResolver";
 import type { DeclarationReference } from "./comments/declarationReference";
 /**
  * Compiles source files using TypeScript and converts compiler symbols to reflections.
@@ -129,13 +128,12 @@ export declare class Converter extends ChildableComponent<Application, Converter
      *
      * Note: This will be used for both references to types declared in node_modules (in which case the
      * reference passed will have the `moduleSource` set and the `symbolReference` will navigate via `.`)
-     * and user defined \{\@link\} tags which cannot be resolved. If the link being resolved is inferred
-     * from a type, then no `part` will be passed to the resolver function.
+     * and user defined \{\@link\} tags which cannot be resolved.
      * @since 0.22.14
      */
-    addUnknownSymbolResolver(resolver: ExternalSymbolResolver): void;
+    addUnknownSymbolResolver(resolver: (ref: DeclarationReference) => string | undefined): void;
     /** @internal */
-    resolveExternalLink(ref: DeclarationReference, refl: Reflection, part?: CommentDisplayPart): ExternalResolveResult | string | undefined;
+    resolveExternalLink(ref: DeclarationReference): string | undefined;
     resolveLinks(comment: Comment, owner: Reflection): void;
     resolveLinks(parts: readonly CommentDisplayPart[], owner: Reflection): CommentDisplayPart[];
     /**

package/dist/lib/converter/converter.js

@@ -1,17 +1,37 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
     var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
     if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
 };
 var Converter_1;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Converter = void 0;
-const typescript_1 = __importDefault(require("typescript"));
+const ts = __importStar(require("typescript"));
 const index_1 = require("../models/index");
 const context_1 = require("./context");
 const components_1 = require("./components");
@@ -72,9 +92,8 @@ let Converter = Converter_1 = class Converter extends component_1.ChildableCompo
         this.trigger(Converter_1.EVENT_BEGIN, context);
         this.compile(entryPoints, context);
         this.resolve(context);
-        // This should only do anything if a plugin does something bad.
-        project.removeDanglingReferences();
         this.trigger(Converter_1.EVENT_END, context);
+        project.forgetTsReferences();
         return project;
     }
     /** @internal */
@@ -107,34 +126,26 @@ let Converter = Converter_1 = class Converter extends component_1.ChildableCompo
      *
      * Note: This will be used for both references to types declared in node_modules (in which case the
      * reference passed will have the `moduleSource` set and the `symbolReference` will navigate via `.`)
-     * and user defined \{\@link\} tags which cannot be resolved. If the link being resolved is inferred
-     * from a type, then no `part` will be passed to the resolver function.
+     * and user defined \{\@link\} tags which cannot be resolved.
      * @since 0.22.14
      */
     addUnknownSymbolResolver(resolver) {
         this._externalSymbolResolvers.push(resolver);
     }
     /** @internal */
-    resolveExternalLink(ref, refl, part) {
+    resolveExternalLink(ref) {
         for (const resolver of this._externalSymbolResolvers) {
-            const resolved = resolver(ref, refl, part);
+            const resolved = resolver(ref);
             if (resolved)
                 return resolved;
         }
     }
     resolveLinks(comment, owner) {
         if (comment instanceof index_1.Comment) {
-            (0, linkResolver_1.resolveLinks)(comment, owner, this.validation, this.owner.logger, (ref, part, refl) => this.resolveExternalLink(ref, part, refl));
+            (0, linkResolver_1.resolveLinks)(comment, owner, (ref) => this.resolveExternalLink(ref));
         }
         else {
-            let warned = false;
-            const warn = () => {
-                if (!warned) {
-                    warned = true;
-                    this.application.logger.warn(`${owner.name}: Comment [[target]] style links are deprecated and will be removed in 0.24`);
-                }
-            };
-            return (0, linkResolver_1.resolvePartLinks)(owner, comment, warn, this.validation, this.owner.logger, (ref, part, refl) => this.resolveExternalLink(ref, part, refl));
+            return (0, linkResolver_1.resolvePartLinks)(owner, comment, (ref) => this.resolveExternalLink(ref));
         }
     }
     /**
@@ -192,7 +203,7 @@ let Converter = Converter_1 = class Converter extends component_1.ChildableCompo
                 }
                 reflection.readme = comment.summary;
             }
-            reflection.version = entryPoint.version;
+            reflection.packageVersion = entryPoint.version;
             context.finalizeDeclarationReflection(reflection);
             moduleContext = context.withScope(reflection);
         }
@@ -360,15 +371,15 @@ function getSymbolForModuleLike(context, node) {
     // "globals" file, but this is uncommon enough that I'm skipping it for now.
     const sourceFile = node.getSourceFile();
     const globalSymbols = context.checker
-        .getSymbolsInScope(node, typescript_1.default.SymbolFlags.ModuleMember)
+        .getSymbolsInScope(node, ts.SymbolFlags.ModuleMember)
         .filter((s) => s.getDeclarations()?.some((d) => d.getSourceFile() === sourceFile));
     // Detect declaration files with declare module "foo" as their only export
     // and lift that up one level as the source file symbol
     if (globalSymbols.length === 1 &&
         globalSymbols[0]
             .getDeclarations()
-            ?.every((declaration) => typescript_1.default.isModuleDeclaration(declaration) &&
-            typescript_1.default.isStringLiteral(declaration.name))) {
+            ?.every((declaration) => ts.isModuleDeclaration(declaration) &&
+            ts.isStringLiteral(declaration.name))) {
         return globalSymbols[0];
     }
 }
@@ -383,15 +394,15 @@ function getExports(context, node, symbol) {
         // members of the export= class and as functions if a class is directly exported.
         result = [exportEq].concat(context.checker
             .getExportsOfModule(symbol)
-            .filter((s) => !(0, enum_1.hasAnyFlag)(s.flags, typescript_1.default.SymbolFlags.Prototype | typescript_1.default.SymbolFlags.Value)));
+            .filter((s) => !(0, enum_1.hasAnyFlag)(s.flags, ts.SymbolFlags.Prototype | ts.SymbolFlags.Value)));
     }
     else if (symbol) {
         result = context.checker
             .getExportsOfModule(symbol)
-            .filter((s) => !(0, enum_1.hasAllFlags)(s.flags, typescript_1.default.SymbolFlags.Prototype));
+            .filter((s) => !(0, enum_1.hasAllFlags)(s.flags, ts.SymbolFlags.Prototype));
         if (result.length === 0) {
-            const globalDecl = node.statements.find((s) => typescript_1.default.isModuleDeclaration(s) &&
-                s.flags & typescript_1.default.NodeFlags.GlobalAugmentation);
+            const globalDecl = node.statements.find((s) => ts.isModuleDeclaration(s) &&
+                s.flags & ts.NodeFlags.GlobalAugmentation);
             if (globalDecl) {
                 const globalSymbol = context.getSymbolAtLocation(globalDecl);
                 if (globalSymbol) {
@@ -406,7 +417,7 @@ function getExports(context, node, symbol) {
         // Global file with no inferred top level symbol, get all symbols declared in this file.
         const sourceFile = node.getSourceFile();
         result = context.checker
-            .getSymbolsInScope(node, typescript_1.default.SymbolFlags.ModuleMember)
+            .getSymbolsInScope(node, ts.SymbolFlags.ModuleMember)
             .filter((s) => s
             .getDeclarations()
             ?.some((d) => d.getSourceFile() === sourceFile));

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

@@ -1,3 +1,3 @@
-import ts from "typescript";
+import * as ts from "typescript";
 import type { Context } from "../context";
 export declare function convertIndexSignature(context: Context, symbol: ts.Symbol): void;

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

@@ -1,11 +1,34 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.convertIndexSignature = void 0;
 const assert_1 = __importDefault(require("assert"));
-const typescript_1 = __importDefault(require("typescript"));
+const ts = __importStar(require("typescript"));
 const models_1 = require("../../models");
 const converter_events_1 = require("../converter-events");
 function convertIndexSignature(context, symbol) {
@@ -16,9 +39,9 @@ function convertIndexSignature(context, symbol) {
         // and number index signatures... { [x: string]: 1 | 2; [x: number]: 2 }
         // will be misrepresented.
         const indexDeclaration = indexSymbol.getDeclarations()?.[0];
-        (0, assert_1.default)(indexDeclaration && typescript_1.default.isIndexSignatureDeclaration(indexDeclaration));
+        (0, assert_1.default)(indexDeclaration && ts.isIndexSignatureDeclaration(indexDeclaration));
         const param = indexDeclaration.parameters[0];
-        (0, assert_1.default)(param && typescript_1.default.isParameter(param));
+        (0, assert_1.default)(param && ts.isParameter(param));
         const index = new models_1.SignatureReflection("__index", models_1.ReflectionKind.IndexSignature, context.scope);
         index.parameters = [
             new models_1.ParameterReflection(param.name.getText(), models_1.ReflectionKind.Parameter, index),

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

@@ -1,7 +1,7 @@
-import ts from "typescript";
+import * as ts from "typescript";
 import { ParameterReflection, ReflectionKind, SignatureReflection, TypeParameterReflection } from "../../models";
 import type { Context } from "../context";
-export declare function createSignature(context: Context, kind: ReflectionKind.CallSignature | ReflectionKind.ConstructorSignature | ReflectionKind.GetSignature | ReflectionKind.SetSignature, signature: ts.Signature, declaration?: ts.SignatureDeclaration | ts.JSDocSignature): void;
+export declare function createSignature(context: Context, kind: ReflectionKind.CallSignature | ReflectionKind.ConstructorSignature | ReflectionKind.GetSignature | ReflectionKind.SetSignature, signature: ts.Signature, symbol: ts.Symbol | undefined, declaration?: ts.SignatureDeclaration | ts.JSDocSignature): void;
 export declare function convertParameterNodes(context: Context, sigRef: SignatureReflection, parameters: readonly (ts.JSDocParameterTag | ts.ParameterDeclaration)[]): ParameterReflection[];
 export declare function convertTypeParameterNodes(context: Context, parameters: readonly ts.TypeParameterDeclaration[] | undefined): TypeParameterReflection[] | undefined;
 export declare function createTypeParamReflection(param: ts.TypeParameterDeclaration, context: Context): TypeParameterReflection;