typedoc 0.25.12 → 0.26.0-beta.0

package/dist/lib/converter/plugins/GroupPlugin.js

@@ -57,6 +57,26 @@ const converter_1 = require("../converter");
 const sort_1 = require("../../utils/sort");
 const utils_1 = require("../../utils");
 const models_1 = require("../../models");
+// Same as the defaultKindSortOrder in sort.ts
+const defaultGroupOrder = [
+    index_1.ReflectionKind.Document,
+    index_1.ReflectionKind.Reference,
+    // project is never a child so never added to a group
+    index_1.ReflectionKind.Module,
+    index_1.ReflectionKind.Namespace,
+    index_1.ReflectionKind.Enum,
+    index_1.ReflectionKind.EnumMember,
+    index_1.ReflectionKind.Class,
+    index_1.ReflectionKind.Interface,
+    index_1.ReflectionKind.TypeAlias,
+    index_1.ReflectionKind.Constructor,
+    index_1.ReflectionKind.Property,
+    index_1.ReflectionKind.Variable,
+    index_1.ReflectionKind.Function,
+    index_1.ReflectionKind.Accessor,
+    index_1.ReflectionKind.Method,
+    // others are never added to groups
+];
 /**
  * A handler that sorts and groups the found reflections in the resolving phase.
  *
@@ -100,6 +120,9 @@ let GroupPlugin = (() => {
                 [converter_1.Converter.EVENT_RESOLVE_BEGIN]: () => {
                     this.sortFunction = (0, sort_1.getSortFunction)(this.application.options);
                     GroupPlugin.WEIGHTS = this.groupOrder;
+                    if (GroupPlugin.WEIGHTS.length === 0) {
+                        GroupPlugin.WEIGHTS = defaultGroupOrder.map((kind) => this.application.internationalization.kindPluralString(kind));
+                    }
                 },
                 [converter_1.Converter.EVENT_RESOLVE_END]: this.onEndResolve,
             }, undefined, -100);
@@ -124,19 +147,24 @@ let GroupPlugin = (() => {
             this.usedBoosts.clear();
             if (unusedBoosts.size &&
                 this.application.options.isSet("searchGroupBoosts")) {
-                context.logger.warn(`Not all groups specified in searchGroupBoosts were used in the documentation.` +
-                    ` The unused groups were:\n\t${Array.from(unusedBoosts).join("\n\t")}`);
+                context.logger.warn(context.i18n.not_all_search_group_boosts_used_0(Array.from(unusedBoosts).join("\n\t")));
             }
         }
         group(reflection) {
-            if (reflection.children &&
-                reflection.children.length > 0 &&
-                !reflection.groups) {
-                if (this.sortEntryPoints ||
-                    !reflection.children.some((c) => c.kindOf(index_1.ReflectionKind.Module))) {
-                    this.sortFunction(reflection.children);
+            if (reflection.childrenIncludingDocuments && !reflection.groups) {
+                if (reflection.children) {
+                    if (this.sortEntryPoints ||
+                        !reflection.children.some((c) => c.kindOf(index_1.ReflectionKind.Module))) {
+                        this.sortFunction(reflection.children);
+                        this.sortFunction(reflection.documents || []);
+                        this.sortFunction(reflection.childrenIncludingDocuments);
+                    }
                 }
-                reflection.groups = this.getReflectionGroups(reflection, reflection.children);
+                else if (reflection.documents) {
+                    this.sortFunction(reflection.documents);
+                    this.sortFunction(reflection.childrenIncludingDocuments);
+                }
+                reflection.groups = this.getReflectionGroups(reflection, reflection.childrenIncludingDocuments);
             }
         }
         /**
@@ -158,19 +186,25 @@ let GroupPlugin = (() => {
                     return false;
                 });
             }
-            extractGroupTags(reflection.comment);
-            for (const sig of reflection.getNonIndexSignatures()) {
-                extractGroupTags(sig.comment);
-            }
-            if (reflection.type?.type === "reflection") {
-                extractGroupTags(reflection.type.declaration.comment);
-                for (const sig of reflection.type.declaration.getNonIndexSignatures()) {
+            if (reflection.isDeclaration()) {
+                extractGroupTags(reflection.comment);
+                for (const sig of reflection.getNonIndexSignatures()) {
                     extractGroupTags(sig.comment);
                 }
+                if (reflection.type?.type === "reflection") {
+                    extractGroupTags(reflection.type.declaration.comment);
+                    for (const sig of reflection.type.declaration.getNonIndexSignatures()) {
+                        extractGroupTags(sig.comment);
+                    }
+                }
+            }
+            if (reflection.isDocument() && "group" in reflection.frontmatter) {
+                groups.add(String(reflection.frontmatter["group"]));
+                delete reflection.frontmatter["group"];
             }
             groups.delete("");
             if (groups.size === 0) {
-                groups.add(index_1.ReflectionKind.pluralString(reflection.kind));
+                groups.add(this.application.internationalization.kindPluralString(reflection.kind));
             }
             for (const group of groups) {
                 if (group in this.boosts) {
@@ -210,7 +244,7 @@ let GroupPlugin = (() => {
                             cat.description = body;
                         }
                         else {
-                            this.application.logger.warn(`Comment for ${parent.getFriendlyFullName()} includes @groupDescription for "${header}", but no child is placed in that group.`);
+                            this.application.logger.warn(this.application.i18n.comment_for_0_includes_groupDescription_for_1_but_no_child_in_group(parent.getFriendlyFullName(), header));
                         }
                         return true;
                     }

package/dist/lib/converter/plugins/ImplementsPlugin.js

@@ -234,8 +234,7 @@ let ImplementsPlugin = (() => {
             const property = findProperty(reflection, childType);
             if (!property) {
                 // We're probably broken... but I don't think this should be fatal.
-                context.logger.warn(`Failed to retrieve${reflection.flags.isStatic ? " static" : ""} member "${reflection.escapedName ?? reflection.name}" of "${reflection.parent
-                    ?.name}" for inheritance analysis. Please report a bug.`);
+                context.logger.warn(`Failed to retrieve${reflection.flags.isStatic ? " static" : ""} member "${reflection.escapedName ?? reflection.name}" of "${reflection.parent?.name}" for inheritance analysis. Please report a bug.`);
                 return;
             }
             // Need to check both extends and implements clauses.
@@ -299,7 +298,9 @@ function createLink(context, reflection, clause, expr, symbol, isOverwrite) {
     link(reflection);
     link(reflection.getSignature);
     link(reflection.setSignature);
-    link(reflection.indexSignature);
+    for (const sig of reflection.indexSignatures || []) {
+        link(sig);
+    }
     for (const sig of reflection.signatures ?? []) {
         link(sig);
     }

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

@@ -1,5 +1,5 @@
 import { ConverterComponent } from "../components";
-import { ValidationOptions } from "../../utils";
+import { type ValidationOptions } from "../../utils";
 /**
  * A plugin that handles `@inheritDoc` tags by copying documentation from another API item.
  * It is NOT responsible for handling bare JSDoc style `@inheritDoc` tags which do not specify

package/dist/lib/converter/plugins/InheritDocPlugin.js

@@ -110,7 +110,7 @@ let InheritDocPlugin = (() => {
                     continue;
                 const declRef = (0, declarationReference_1.parseDeclarationReference)(source, 0, source.length);
                 if (!declRef || /\S/.test(source.substring(declRef[1]))) {
-                    this.application.logger.warn(`Declaration reference in @inheritDoc for ${reflection.getFriendlyFullName()} was not fully parsed and may resolve incorrectly.`);
+                    this.application.logger.warn(this.application.i18n.declaration_reference_in_inheritdoc_for_0_not_fully_parsed(reflection.getFriendlyFullName()));
                 }
                 let sourceRefl = declRef && (0, declarationReferenceResolver_1.resolveDeclarationReference)(reflection, declRef[0]);
                 if (reflection instanceof models_1.SignatureReflection) {
@@ -136,7 +136,7 @@ let InheritDocPlugin = (() => {
                 }
                 if (!sourceRefl) {
                     if (this.validation.invalidLink) {
-                        this.application.logger.warn(`Failed to find "${source}" to inherit the comment from in the comment for ${reflection.getFullName()}`);
+                        this.application.logger.warn(this.application.i18n.failed_to_find_0_to_inherit_comment_from_in_1(source, reflection.getFriendlyFullName()));
                     }
                     continue;
                 }
@@ -160,7 +160,7 @@ let InheritDocPlugin = (() => {
                 source = source.type.declaration.signatures[0];
             }
             if (!source.comment) {
-                this.application.logger.warn(`${target.getFullName()} tried to copy a comment from ${source.getFullName()} with @inheritDoc, but the source has no associated comment.`);
+                this.application.logger.warn(this.application.i18n.reflection_0_tried_to_copy_comment_from_1_but_source_had_no_comment(target.getFullName(), source.getFullName()));
                 return;
             }
             // If the source also has a @inheritDoc tag, we can't do anything yet.
@@ -207,9 +207,7 @@ let InheritDocPlugin = (() => {
                     parts.push(work.name);
                 } while (!this.dependencies.get(work).includes(orig));
                 parts.push(orig.name);
-                this.application.logger.warn(`@inheritDoc specifies a circular inheritance chain: ${parts
-                    .reverse()
-                    .join(" -> ")}`);
+                this.application.logger.warn(this.application.i18n.inheritdoc_circular_inheritance_chain_0(parts.reverse().join(" -> ")));
             };
             for (const orig of this.dependencies.keys()) {
                 if (unwarned.has(orig)) {
@@ -235,6 +233,7 @@ exports.InheritDocPlugin = InheritDocPlugin;
 function copySummaries(source, target) {
     for (const [s, t] of (0, array_1.zip)(source || [], target || [])) {
         t.comment = new models_1.Comment(s.comment?.summary);
+        t.comment.sourcePath = s.comment?.sourcePath;
     }
 }
 function extractInheritDocTagReference(reflection) {

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

@@ -1,7 +1,7 @@
 import { ConverterComponent } from "../components";
 import type { Context } from "../../converter";
-import { ValidationOptions } from "../../utils";
-import { ProjectReflection } from "../../models";
+import { type ValidationOptions } from "../../utils";
+import { type ProjectReflection } from "../../models";
 /**
  * A plugin that resolves `{@link Foo}` tags.
  */

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

@@ -6,7 +6,6 @@ import { EntryPointStrategy } from "../../utils";
  */
 export declare class PackagePlugin extends ConverterComponent {
     accessor readme: string;
-    accessor stripYamlFrontmatter: boolean;
     accessor entryPointStrategy: EntryPointStrategy;
     accessor entryPoints: string[];
     accessor includeVersion: boolean;
@@ -25,7 +24,6 @@ export declare class PackagePlugin extends ConverterComponent {
     initialize(): void;
     private onRevive;
     private onBegin;
-    private processReadmeContents;
     private onBeginResolve;
     private addEntries;
 }

package/dist/lib/converter/plugins/PackagePlugin.js

@@ -87,7 +87,7 @@ const path_1 = require("path");
  * current project.
  */
 let PackagePlugin = (() => {
-    var _PackagePlugin_readme_accessor_storage, _PackagePlugin_stripYamlFrontmatter_accessor_storage, _PackagePlugin_entryPointStrategy_accessor_storage, _PackagePlugin_entryPoints_accessor_storage, _PackagePlugin_includeVersion_accessor_storage;
+    var _PackagePlugin_readme_accessor_storage, _PackagePlugin_entryPointStrategy_accessor_storage, _PackagePlugin_entryPoints_accessor_storage, _PackagePlugin_includeVersion_accessor_storage;
     let _classDecorators = [(0, components_1.Component)({ name: "package" })];
     let _classDescriptor;
     let _classExtraInitializers = [];
@@ -96,9 +96,6 @@ let PackagePlugin = (() => {
     let _readme_decorators;
     let _readme_initializers = [];
     let _readme_extraInitializers = [];
-    let _stripYamlFrontmatter_decorators;
-    let _stripYamlFrontmatter_initializers = [];
-    let _stripYamlFrontmatter_extraInitializers = [];
     let _entryPointStrategy_decorators;
     let _entryPointStrategy_initializers = [];
     let _entryPointStrategy_extraInitializers = [];
@@ -112,8 +109,7 @@ let PackagePlugin = (() => {
         constructor() {
             super(...arguments);
             _PackagePlugin_readme_accessor_storage.set(this, __runInitializers(this, _readme_initializers, void 0));
-            _PackagePlugin_stripYamlFrontmatter_accessor_storage.set(this, (__runInitializers(this, _readme_extraInitializers), __runInitializers(this, _stripYamlFrontmatter_initializers, void 0)));
-            _PackagePlugin_entryPointStrategy_accessor_storage.set(this, (__runInitializers(this, _stripYamlFrontmatter_extraInitializers), __runInitializers(this, _entryPointStrategy_initializers, void 0)));
+            _PackagePlugin_entryPointStrategy_accessor_storage.set(this, (__runInitializers(this, _readme_extraInitializers), __runInitializers(this, _entryPointStrategy_initializers, void 0)));
             _PackagePlugin_entryPoints_accessor_storage.set(this, (__runInitializers(this, _entryPointStrategy_extraInitializers), __runInitializers(this, _entryPoints_initializers, void 0)));
             _PackagePlugin_includeVersion_accessor_storage.set(this, (__runInitializers(this, _entryPoints_extraInitializers), __runInitializers(this, _includeVersion_initializers, void 0)));
             /**
@@ -123,8 +119,6 @@ let PackagePlugin = (() => {
         }
         get readme() { return __classPrivateFieldGet(this, _PackagePlugin_readme_accessor_storage, "f"); }
         set readme(value) { __classPrivateFieldSet(this, _PackagePlugin_readme_accessor_storage, value, "f"); }
-        get stripYamlFrontmatter() { return __classPrivateFieldGet(this, _PackagePlugin_stripYamlFrontmatter_accessor_storage, "f"); }
-        set stripYamlFrontmatter(value) { __classPrivateFieldSet(this, _PackagePlugin_stripYamlFrontmatter_accessor_storage, value, "f"); }
         get entryPointStrategy() { return __classPrivateFieldGet(this, _PackagePlugin_entryPointStrategy_accessor_storage, "f"); }
         set entryPointStrategy(value) { __classPrivateFieldSet(this, _PackagePlugin_entryPointStrategy_accessor_storage, value, "f"); }
         get entryPoints() { return __classPrivateFieldGet(this, _PackagePlugin_entryPoints_accessor_storage, "f"); }
@@ -170,11 +164,11 @@ let PackagePlugin = (() => {
             if (this.readme) {
                 // Readme path provided, read only that file.
                 try {
-                    this.readmeContents = this.processReadmeContents((0, utils_1.readFile)(this.readme));
+                    this.readmeContents = (0, utils_1.readFile)(this.readme);
                     this.readmeFile = this.readme;
                 }
                 catch {
-                    this.application.logger.error(`Provided README path, ${(0, paths_1.nicePath)(this.readme)} could not be read.`);
+                    this.application.logger.error(this.application.i18n.provided_readme_at_0_could_not_be_read((0, paths_1.nicePath)(this.readme)));
                 }
             }
             else {
@@ -182,30 +176,17 @@ let PackagePlugin = (() => {
                 const result = (0, fs_1.discoverInParentDir)("readme.md", dirName, (content) => content);
                 if (result) {
                     this.readmeFile = result.file;
-                    this.readmeContents = this.processReadmeContents(result.content);
+                    this.readmeContents = result.content;
                 }
             }
         }
-        processReadmeContents(contents) {
-            if (this.stripYamlFrontmatter) {
-                return contents.replace(/^\s*---\r?\n[\s\S]*?\r?\n---\s*?\r?\n\s*/, "");
-            }
-            return contents;
-        }
         onBeginResolve(context) {
             this.addEntries(context.project);
         }
         addEntries(project) {
             if (this.readmeFile && this.readmeContents) {
-                const comment = this.application.converter.parseRawComment(new minimalSourceFile_1.MinimalSourceFile(this.readmeContents, this.readmeFile));
-                if (comment.blockTags.length || comment.modifierTags.size) {
-                    const ignored = [
-                        ...comment.blockTags.map((tag) => tag.tag),
-                        ...comment.modifierTags,
-                    ];
-                    this.application.logger.warn(`Block and modifier tags will be ignored within the readme:\n\t${ignored.join("\n\t")}`);
-                }
-                project.readme = comment.summary;
+                const { content } = this.application.converter.parseRawComment(new minimalSourceFile_1.MinimalSourceFile(this.readmeContents, this.readmeFile));
+                project.readme = content;
             }
             if (this.packageJson) {
                 project.packageName = this.packageJson.name;
@@ -217,13 +198,12 @@ let PackagePlugin = (() => {
                 }
             }
             else if (!project.name) {
-                this.application.logger.warn('The --name option was not specified, and no package.json was found. Defaulting project name to "Documentation".');
+                this.application.logger.warn(this.application.i18n.defaulting_project_name());
                 project.name = "Documentation";
             }
         }
     };
     _PackagePlugin_readme_accessor_storage = new WeakMap();
-    _PackagePlugin_stripYamlFrontmatter_accessor_storage = new WeakMap();
     _PackagePlugin_entryPointStrategy_accessor_storage = new WeakMap();
     _PackagePlugin_entryPoints_accessor_storage = new WeakMap();
     _PackagePlugin_includeVersion_accessor_storage = new WeakMap();
@@ -231,12 +211,10 @@ let PackagePlugin = (() => {
     (() => {
         const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(_classSuper[Symbol.metadata] ?? null) : void 0;
         _readme_decorators = [(0, utils_1.Option)("readme")];
-        _stripYamlFrontmatter_decorators = [(0, utils_1.Option)("stripYamlFrontmatter")];
         _entryPointStrategy_decorators = [(0, utils_1.Option)("entryPointStrategy")];
         _entryPoints_decorators = [(0, utils_1.Option)("entryPoints")];
         _includeVersion_decorators = [(0, utils_1.Option)("includeVersion")];
         __esDecorate(_classThis, null, _readme_decorators, { kind: "accessor", name: "readme", static: false, private: false, access: { has: obj => "readme" in obj, get: obj => obj.readme, set: (obj, value) => { obj.readme = value; } }, metadata: _metadata }, _readme_initializers, _readme_extraInitializers);
-        __esDecorate(_classThis, null, _stripYamlFrontmatter_decorators, { kind: "accessor", name: "stripYamlFrontmatter", static: false, private: false, access: { has: obj => "stripYamlFrontmatter" in obj, get: obj => obj.stripYamlFrontmatter, set: (obj, value) => { obj.stripYamlFrontmatter = value; } }, metadata: _metadata }, _stripYamlFrontmatter_initializers, _stripYamlFrontmatter_extraInitializers);
         __esDecorate(_classThis, null, _entryPointStrategy_decorators, { kind: "accessor", name: "entryPointStrategy", static: false, private: false, access: { has: obj => "entryPointStrategy" in obj, get: obj => obj.entryPointStrategy, set: (obj, value) => { obj.entryPointStrategy = value; } }, metadata: _metadata }, _entryPointStrategy_initializers, _entryPointStrategy_extraInitializers);
         __esDecorate(_classThis, null, _entryPoints_decorators, { kind: "accessor", name: "entryPoints", static: false, private: false, access: { has: obj => "entryPoints" in obj, get: obj => obj.entryPoints, set: (obj, value) => { obj.entryPoints = value; } }, metadata: _metadata }, _entryPoints_initializers, _entryPoints_extraInitializers);
         __esDecorate(_classThis, null, _includeVersion_decorators, { kind: "accessor", name: "includeVersion", static: false, private: false, access: { has: obj => "includeVersion" in obj, get: obj => obj.includeVersion, set: (obj, value) => { obj.includeVersion = value; } }, metadata: _metadata }, _includeVersion_initializers, _includeVersion_extraInitializers);

package/dist/lib/converter/plugins/SourcePlugin.js

@@ -186,13 +186,13 @@ let SourcePlugin = (() => {
             if (this.disableSources)
                 return;
             if (this.disableGit && !this.sourceLinkTemplate) {
-                this.application.logger.error(`disableGit is set, but sourceLinkTemplate is not, so source links cannot be produced. Set a sourceLinkTemplate or disableSources to prevent source tracking.`);
+                this.application.logger.error(context.i18n.disable_git_set_but_not_source_link_template());
                 return;
             }
             if (this.disableGit &&
                 this.sourceLinkTemplate.includes("{gitRevision}") &&
                 !this.gitRevision) {
-                this.application.logger.warn(`disableGit is set and sourceLinkTemplate contains {gitRevision}, which will be replaced with an empty string as no revision was provided.`);
+                this.application.logger.warn(context.i18n.disable_git_set_and_git_revision_used());
             }
             const basePath = this.basePath || (0, utils_1.getCommonDirectory)([...this.fileNames]);
             for (const id in context.project.reflections) {

package/dist/lib/converter/symbols.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.convertSymbol = void 0;
+exports.convertSymbol = convertSymbol;
 const assert_1 = __importDefault(require("assert"));
 const typescript_1 = __importDefault(require("typescript"));
 const models_1 = require("../models");
@@ -14,6 +14,9 @@ const signature_1 = require("./factories/signature");
 const jsdoc_1 = require("./jsdoc");
 const nodes_1 = require("./utils/nodes");
 const reflections_1 = require("./utils/reflections");
+const path_1 = require("path");
+const utils_1 = require("../utils");
+const paths_1 = require("../utils/paths");
 const symbolConverters = {
     [typescript_1.default.SymbolFlags.RegularEnum]: convertEnum,
     [typescript_1.default.SymbolFlags.ConstEnum]: convertEnum,
@@ -128,7 +131,6 @@ function convertSymbol(context, symbol, exportSymbol) {
         skip |= symbolConverters[flag]?.(context, symbol, exportSymbol) || 0;
     }
 }
-exports.convertSymbol = convertSymbol;
 function convertSymbols(context, symbols) {
     for (const symbol of symbols) {
         convertSymbol(context, symbol);
@@ -178,6 +180,28 @@ function convertNamespace(context, symbol, exportSymbol) {
     else {
         reflection = context.createDeclarationReflection(models_1.ReflectionKind.Namespace, symbol, exportSymbol);
         context.finalizeDeclarationReflection(reflection);
+        let relativeTo = reflection.comment?.sourcePath;
+        if (relativeTo) {
+            relativeTo = (0, path_1.dirname)(relativeTo);
+            const tags = reflection.comment?.getTags("@document") || [];
+            reflection.comment?.removeTags("@document");
+            for (const tag of tags) {
+                const path = models_1.Comment.combineDisplayParts(tag.content);
+                let file;
+                try {
+                    const resolved = (0, path_1.resolve)(relativeTo, path);
+                    file = new utils_1.MinimalSourceFile((0, utils_1.readFile)(resolved), resolved);
+                }
+                catch {
+                    context.logger.warn(context.logger.i18n.failed_to_read_0_when_processing_document_tag_in_1((0, paths_1.nicePath)(path), (0, paths_1.nicePath)(reflection.comment.sourcePath)));
+                    continue;
+                }
+                const { content, frontmatter } = context.converter.parseRawComment(file);
+                const docRefl = new models_1.DocumentReflection((0, path_1.basename)(file.fileName).replace(/\.[^.]+$/, ""), reflection, content, frontmatter);
+                reflection.addChild(docRefl);
+                context.project.registerReflection(docRefl);
+            }
+        }
     }
     convertSymbols(context.withScope(reflection), context.checker
         .getExportsOfModule(symbol)
@@ -218,7 +242,7 @@ function convertTypeAliasAsInterface(context, symbol, exportSymbol, declaration)
     const rc = context.withScope(reflection);
     const type = context.checker.getTypeAtLocation(declaration);
     if (type.getFlags() & typescript_1.default.TypeFlags.Union) {
-        context.logger.warn(`Using @interface on a union type will discard properties not present on all branches of the union. TypeDoc's output may not accurately describe your source code.`, declaration);
+        context.logger.warn(context.i18n.converting_union_as_interface(), declaration);
     }
     // Interfaces have properties
     convertSymbols(rc, type.getProperties());
@@ -237,7 +261,7 @@ function convertTypeAliasAsInterface(context, symbol, exportSymbol, declaration)
     // And maybe constructor signatures
     convertConstructSignatures(rc, symbol);
     // And finally, index signatures
-    (0, index_signature_1.convertIndexSignature)(rc, symbol);
+    (0, index_signature_1.convertIndexSignatures)(rc, symbol);
 }
 function convertFunctionOrMethod(context, symbol, exportSymbol) {
     // Can't just check method flag because this might be called for properties as well
@@ -277,8 +301,6 @@ function convertFunctionOrMethod(context, symbol, exportSymbol) {
     }
     context.finalizeDeclarationReflection(reflection);
     const scope = context.withScope(reflection);
-    // Can't use zip here. We might have less declarations than signatures
-    // or less signatures than declarations.
     for (const sig of signatures) {
         (0, signature_1.createSignature)(scope, models_1.ReflectionKind.CallSignature, sig, symbol);
     }
@@ -356,7 +378,7 @@ function convertClassOrInterface(context, symbol, exportSymbol) {
     // but nobody has complained yet.
     convertConstructSignatures(reflectionContext, symbol);
     // And finally, index signatures
-    (0, index_signature_1.convertIndexSignature)(reflectionContext, symbol);
+    (0, index_signature_1.convertIndexSignatures)(reflectionContext, symbol);
     // Normally this shouldn't matter, unless someone did something with skipLibCheck on.
     return typescript_1.default.SymbolFlags.Alias;
 }
@@ -392,7 +414,6 @@ function convertProperty(context, symbol, exportSymbol) {
     const reflection = context.createDeclarationReflection(context.scope.kindOf(models_1.ReflectionKind.VariableContainer)
         ? models_1.ReflectionKind.Variable
         : models_1.ReflectionKind.Property, symbol, exportSymbol);
-    reflection.conversionFlags |= models_1.ConversionFlags.VariableOrPropertySource;
     const declaration = symbol.getDeclarations()?.[0];
     let parameterType;
     if (declaration &&
@@ -559,7 +580,6 @@ function convertVariableAsFunction(context, symbol, exportSymbol) {
         ? models_1.ReflectionKind.Method
         : models_1.ReflectionKind.Function, symbol, exportSymbol);
     setModifiers(symbol, accessDeclaration, reflection);
-    reflection.conversionFlags |= models_1.ConversionFlags.VariableOrPropertySource;
     context.finalizeDeclarationReflection(reflection);
     const reflectionContext = context.withScope(reflection);
     reflection.signatures ??= [];
@@ -591,7 +611,7 @@ function convertSymbolAsClass(context, symbol, exportSymbol) {
     const rc = context.withScope(reflection);
     context.finalizeDeclarationReflection(reflection);
     if (!symbol.valueDeclaration) {
-        context.logger.error(`No value declaration found when converting ${symbol.name} as a class`, symbol.declarations?.[0]);
+        context.logger.error(context.i18n.converting_0_as_class_requires_value_declaration(symbol.name), symbol.declarations?.[0]);
         return;
     }
     const type = context.checker.getTypeOfSymbolAtLocation(symbol, symbol.valueDeclaration);
@@ -622,7 +642,7 @@ function convertSymbolAsClass(context, symbol, exportSymbol) {
         }
     }
     else {
-        context.logger.warn(`${reflection.getFriendlyFullName()} is being converted as a class, but does not have any construct signatures`, symbol.valueDeclaration);
+        context.logger.warn(context.i18n.converting_0_as_class_without_construct_signatures(reflection.getFriendlyFullName()), symbol.valueDeclaration);
     }
     return (typescript_1.default.SymbolFlags.TypeAlias |
         typescript_1.default.SymbolFlags.Interface |

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

@@ -1,5 +1,5 @@
 import ts from "typescript";
-import { SomeType } from "../models";
+import { type SomeType } from "../models";
 import type { Context } from "./context";
 export interface TypeConverter<TNode extends ts.TypeNode = ts.TypeNode, TType extends ts.Type = ts.Type> {
     kind: TNode["kind"][];

package/dist/lib/converter/types.js

@@ -3,7 +3,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.convertType = exports.loadConverters = void 0;
+exports.loadConverters = loadConverters;
+exports.convertType = convertType;
 const assert_1 = __importDefault(require("assert"));
 const typescript_1 = __importDefault(require("typescript"));
 const models_1 = require("../models");
@@ -61,7 +62,6 @@ function loadConverters() {
         }
     }
 }
-exports.loadConverters = loadConverters;
 // This ought not be necessary, but we need some way to discover recursively
 // typed symbols which do not have type nodes. See the `recursive` symbol in the variables test.
 const seenTypes = new Set();
@@ -122,7 +122,6 @@ function convertType(context, typeOrNode) {
     }
     return requestBugReport(context, typeOrNode);
 }
-exports.convertType = convertType;
 const arrayConverter = {
     kind: [typescript_1.default.SyntaxKind.ArrayType],
     convert(context, node) {
@@ -381,7 +380,7 @@ const typeLiteralConverter = {
         for (const signature of type.getConstructSignatures()) {
             (0, signature_1.createSignature)(rc, models_1.ReflectionKind.ConstructorSignature, signature, symbol);
         }
-        (0, index_signature_1.convertIndexSignature)(rc, symbol);
+        (0, index_signature_1.convertIndexSignatures)(rc, symbol);
         return new models_1.ReflectionType(reflection);
     },
     convertType(context, type) {
@@ -399,7 +398,7 @@ const typeLiteralConverter = {
             (0, signature_1.createSignature)(context.withScope(reflection), models_1.ReflectionKind.ConstructorSignature, signature, symbol);
         }
         if (symbol) {
-            (0, index_signature_1.convertIndexSignature)(context.withScope(reflection), symbol);
+            (0, index_signature_1.convertIndexSignatures)(context.withScope(reflection), symbol);
         }
         return new models_1.ReflectionType(reflection);
     },
@@ -453,7 +452,13 @@ const referenceConverter = {
             return ref;
         }
         const ref = models_1.ReferenceType.createSymbolReference(context.resolveAliasedSymbol(symbol), context);
-        if (type.flags & typescript_1.default.TypeFlags.StringMapping) {
+        if (type.flags & typescript_1.default.TypeFlags.Substitution) {
+            // NoInfer<T>
+            ref.typeArguments = [
+                convertType(context, type.baseType),
+            ];
+        }
+        else if (type.flags & typescript_1.default.TypeFlags.StringMapping) {
             ref.typeArguments = [
                 convertType(context, type.type),
             ];

package/dist/lib/converter/utils/nodes.js

@@ -3,13 +3,14 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isObjectType = exports.getHeritageTypes = exports.isNamedNode = void 0;
+exports.isNamedNode = isNamedNode;
+exports.getHeritageTypes = getHeritageTypes;
+exports.isObjectType = isObjectType;
 const typescript_1 = __importDefault(require("typescript"));
 function isNamedNode(node) {
     const name = node.name;
     return !!name && (typescript_1.default.isMemberName(name) || typescript_1.default.isComputedPropertyName(name));
 }
-exports.isNamedNode = isNamedNode;
 function getHeritageTypes(declarations, kind) {
     const exprs = declarations.flatMap((d) => (d.heritageClauses ?? [])
         .filter((hc) => hc.token === kind)
@@ -24,8 +25,6 @@ function getHeritageTypes(declarations, kind) {
         return true;
     });
 }
-exports.getHeritageTypes = getHeritageTypes;
 function isObjectType(type) {
     return typeof type.objectFlags === "number";
 }
-exports.isObjectType = isObjectType;

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

@@ -1,2 +1,2 @@
-import { SomeType } from "../../models";
+import { type SomeType } from "../../models";
 export declare function removeUndefined(type: SomeType): SomeType;

package/dist/lib/converter/utils/reflections.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.removeUndefined = void 0;
+exports.removeUndefined = removeUndefined;
 const models_1 = require("../../models");
 function removeUndefined(type) {
     if (type instanceof models_1.UnionType) {
@@ -18,4 +18,3 @@ function removeUndefined(type) {
     }
     return type;
 }
-exports.removeUndefined = removeUndefined;