typedoc 0.24.0-beta.1 → 0.24.0-beta.3

package/README.md

@@ -19,7 +19,7 @@ npm install typedoc --save-dev
 
 ## Usage
 
-To generate documentation TypeDoc needs to know your project entry point, and TypeScript
+To generate documentation TypeDoc needs to know your project entry point and TypeScript
 compiler options. It will automatically try to find your `tsconfig.json` file, so you can
 just specify the entry point of your library:
 
@@ -38,37 +38,10 @@ By default, TypeDoc will search for a file called `index` under the directory.
 
 ### Monorepos / Workspaces
 
-If your codebase is comprised of one or more npm packages, you can pass the paths to these
-packages and TypeDoc will attempt to determine entry points based on `package.json`'s `main`
-property (with default value `index.js`) and if it wasn't found, based on `types` property.
-If any of the packages given are the root of an [npm Workspace](https://docs.npmjs.com/cli/v7/using-npm/workspaces)
-or a [Yarn Workspace](https://classic.yarnpkg.com/en/docs/workspaces/) TypeDoc will find all
-the `workspaces` defined in the `package.json`. In order to find your entry points, TypeDoc requires
-either that you turn on sourcemaps so that it can discover the original TS file, or that you
-specify `"typedocMain": "src/index.ts"` to explicitly state where the package entry point is.
-Supports wildcard paths in the same fashion as those found in npm or Yarn workspaces.
-
-#### Single npm module
-
-```bash
-typedoc --entryPointStrategy packages .
-```
-
-#### Monorepo with npm/Yarn workspace at the root
-
-```bash
-typedoc --entryPointStrategy packages .
-```
-
-#### Monorepo with manually specified sub-packages to document
-
-This can be useful if you do not want all your workspaces to be processed.
-Accepts the same paths as would go in the `package.json`'s workspaces
-
-```bash
-# Note the single quotes prevent shell wildcard expansion, allowing typedoc to do the expansion
-typedoc --entryPointStrategy packages a-package 'some-more-packages/*' 'some-other-packages/*'
-```
+If your codebase is comprised of one or more npm packages, you can build documentation for each of them individually
+and merge the results together into a single site by setting `entryPointStrategy` to `packages`. In this mode TypeDoc
+requires configuration to be present in each directory to specify the entry points. For an example setup, see
+`<TODO need to create example>`
 
 ### Arguments
 

package/dist/index.d.ts

@@ -3,12 +3,12 @@ export { EventDispatcher, Event } from "./lib/utils/events";
 export { resetReflectionID } from "./lib/models/reflections/abstract";
 export { normalizePath } from "./lib/utils/fs";
 export * from "./lib/models";
-export { Converter, Context, type CommentParserConfig, type DeclarationReference, type SymbolReference, type ComponentPath, type Meaning, type MeaningKeyword, } from "./lib/converter";
+export { Converter, Context, type CommentParserConfig, type DeclarationReference, type SymbolReference, type ComponentPath, type Meaning, type MeaningKeyword, type ExternalResolveResult, type ExternalSymbolResolver, } from "./lib/converter";
 export { Renderer, DefaultTheme, DefaultThemeRenderContext, UrlMapping, Theme, PageEvent, RendererEvent, MarkdownEvent, IndexEvent, } from "./lib/output";
 export type { RenderTemplate, RendererHooks } from "./lib/output";
-export { ArgumentsReader, BindOption, CommentStyle, JSX, LogLevel, Logger, Options, ParameterHint, ParameterType, TSConfigReader, TypeDocReader, EntryPointStrategy, EventHooks, MinimalSourceFile, } from "./lib/utils";
+export { ArgumentsReader, BindOption, CommentStyle, JSX, LogLevel, Logger, Options, PackageJsonReader, ParameterHint, ParameterType, TSConfigReader, TypeDocReader, EntryPointStrategy, EventHooks, MinimalSourceFile, } from "./lib/utils";
 export type { OptionsReader, TypeDocOptions, TypeDocOptionMap, ValidationOptions, TypeDocOptionValues, KeyToDeclaration, DeclarationOption, DeclarationOptionBase, StringDeclarationOption, NumberDeclarationOption, BooleanDeclarationOption, ArrayDeclarationOption, MixedDeclarationOption, ObjectDeclarationOption, MapDeclarationOption, FlagsDeclarationOption, DeclarationOptionToOptionType, SortStrategy, ParameterTypeToOptionTypeMap, DocumentationEntryPoint, ManuallyValidatedOption, EnumKeys, } from "./lib/utils";
 export type { EventMap, EventCallback } from "./lib/utils/events";
 export { JSONOutput, Serializer, Deserializer, type Deserializable, type DeserializerComponent, type SerializerComponent, SerializeEvent, } from "./lib/serialization";
-import * as TypeScript from "typescript";
+import TypeScript from "typescript";
 export { TypeScript };

package/dist/index.js

@@ -10,23 +10,14 @@ var __createBinding = (this && this.__createBinding) || (Object.create ? (functi
     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 __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
-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.TypeScript = exports.SerializeEvent = exports.Deserializer = exports.Serializer = exports.JSONOutput = exports.MinimalSourceFile = exports.EventHooks = exports.EntryPointStrategy = exports.TypeDocReader = exports.TSConfigReader = exports.ParameterType = exports.ParameterHint = exports.Options = exports.Logger = exports.LogLevel = exports.JSX = exports.CommentStyle = exports.BindOption = exports.ArgumentsReader = exports.IndexEvent = exports.MarkdownEvent = exports.RendererEvent = exports.PageEvent = exports.Theme = exports.UrlMapping = exports.DefaultThemeRenderContext = exports.DefaultTheme = exports.Renderer = exports.Context = exports.Converter = exports.normalizePath = exports.resetReflectionID = exports.Event = exports.EventDispatcher = exports.Application = void 0;
+exports.TypeScript = exports.SerializeEvent = exports.Deserializer = exports.Serializer = exports.JSONOutput = exports.MinimalSourceFile = exports.EventHooks = exports.EntryPointStrategy = exports.TypeDocReader = exports.TSConfigReader = exports.ParameterType = exports.ParameterHint = exports.PackageJsonReader = exports.Options = exports.Logger = exports.LogLevel = exports.JSX = exports.CommentStyle = exports.BindOption = exports.ArgumentsReader = exports.IndexEvent = exports.MarkdownEvent = exports.RendererEvent = exports.PageEvent = exports.Theme = exports.UrlMapping = exports.DefaultThemeRenderContext = exports.DefaultTheme = exports.Renderer = exports.Context = exports.Converter = exports.normalizePath = exports.resetReflectionID = exports.Event = exports.EventDispatcher = exports.Application = void 0;
 var application_1 = require("./lib/application");
 Object.defineProperty(exports, "Application", { enumerable: true, get: function () { return application_1.Application; } });
 var events_1 = require("./lib/utils/events");
@@ -58,6 +49,7 @@ Object.defineProperty(exports, "JSX", { enumerable: true, get: function () { ret
 Object.defineProperty(exports, "LogLevel", { enumerable: true, get: function () { return utils_1.LogLevel; } });
 Object.defineProperty(exports, "Logger", { enumerable: true, get: function () { return utils_1.Logger; } });
 Object.defineProperty(exports, "Options", { enumerable: true, get: function () { return utils_1.Options; } });
+Object.defineProperty(exports, "PackageJsonReader", { enumerable: true, get: function () { return utils_1.PackageJsonReader; } });
 Object.defineProperty(exports, "ParameterHint", { enumerable: true, get: function () { return utils_1.ParameterHint; } });
 Object.defineProperty(exports, "ParameterType", { enumerable: true, get: function () { return utils_1.ParameterType; } });
 Object.defineProperty(exports, "TSConfigReader", { enumerable: true, get: function () { return utils_1.TSConfigReader; } });
@@ -70,5 +62,5 @@ Object.defineProperty(exports, "JSONOutput", { enumerable: true, get: function (
 Object.defineProperty(exports, "Serializer", { enumerable: true, get: function () { return serialization_1.Serializer; } });
 Object.defineProperty(exports, "Deserializer", { enumerable: true, get: function () { return serialization_1.Deserializer; } });
 Object.defineProperty(exports, "SerializeEvent", { enumerable: true, get: function () { return serialization_1.SerializeEvent; } });
-const TypeScript = __importStar(require("typescript"));
-exports.TypeScript = TypeScript;
+const typescript_1 = __importDefault(require("typescript"));
+exports.TypeScript = typescript_1.default;

package/dist/lib/application-events.d.ts

@@ -1,4 +1,5 @@
 export declare const ApplicationEvents: {
     BOOTSTRAP_END: string;
     REVIVE: string;
+    VALIDATE_PROJECT: string;
 };

package/dist/lib/application-events.js

@@ -4,4 +4,5 @@ exports.ApplicationEvents = void 0;
 exports.ApplicationEvents = {
     BOOTSTRAP_END: "bootstrapEnd",
     REVIVE: "reviveProject",
+    VALIDATE_PROJECT: "validateProject",
 };

package/dist/lib/application.d.ts

@@ -59,12 +59,16 @@ export declare class Application extends ChildableComponent<Application, Abstrac
     static readonly EVENT_BOOTSTRAP_END: string;
     /**
      * Emitted after a project has been deserialized from JSON.
+     * The listener will be given an instance of {@link ProjectReflection}.
      */
     static readonly EVENT_PROJECT_REVIVE: string;
+    /**
+     * Emitted when validation is being run.
+     * The listener will be given an instance of {@link ProjectReflection}.
+     */
+    static readonly EVENT_VALIDATE_PROJECT: string;
     /**
      * Create a new TypeDoc application instance.
-     *
-     * @param options An object containing the options that should be used.
      */
     constructor();
     /**

package/dist/lib/application.js

@@ -28,11 +28,14 @@ var __importStar = (this && this.__importStar) || function (mod) {
     __setModuleDefault(result, mod);
     return result;
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 var Application_1;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Application = void 0;
 const Path = __importStar(require("path"));
-const ts = __importStar(require("typescript"));
+const typescript_1 = __importDefault(require("typescript"));
 const index_1 = require("./converter/index");
 const renderer_1 = require("./output/renderer");
 const serialization_1 = require("./serialization");
@@ -72,8 +75,6 @@ const supportedVersionMajorMinor = packageInfo.peerDependencies.typescript
 let Application = Application_1 = class Application extends component_1.ChildableComponent {
     /**
      * Create a new TypeDoc application instance.
-     *
-     * @param options An object containing the options that should be used.
      */
     constructor() {
         super(null); // We own ourselves
@@ -135,7 +136,7 @@ let Application = Application_1 = class Application extends component_1.Childabl
         return (0, paths_1.nicePath)(Path.dirname(require.resolve("typescript")));
     }
     getTypeScriptVersion() {
-        return ts.version;
+        return typescript_1.default.version;
     }
     /**
      * Gets the entry points to be documented according to the current `entryPoints` and `entryPointStrategy` options.
@@ -161,7 +162,7 @@ let Application = Application_1 = class Application extends component_1.Childabl
         if (this.entryPointStrategy === entry_point_1.EntryPointStrategy.Packages) {
             return this._convertPackages();
         }
-        if (!supportedVersionMajorMinor.some((version) => version == ts.versionMajorMinor)) {
+        if (!supportedVersionMajorMinor.some((version) => version == typescript_1.default.versionMajorMinor)) {
             this.logger.warn(`You are running with an unsupported TypeScript version! If TypeDoc crashes, this is why. TypeDoc supports ${supportedVersionMajorMinor.join(", ")}`);
         }
         const entryPoints = this.getEntryPoints();
@@ -172,7 +173,7 @@ let Application = Application_1 = class Application extends component_1.Childabl
         const programs = (0, array_1.unique)(entryPoints.map((e) => e.program));
         this.logger.verbose(`Converting with ${programs.length} programs ${entryPoints.length} entry points`);
         if (this.skipErrorChecking === false) {
-            const errors = programs.flatMap((program) => ts.getPreEmitDiagnostics(program));
+            const errors = programs.flatMap((program) => typescript_1.default.getPreEmitDiagnostics(program));
             if (errors.length) {
                 this.logger.diagnostics(errors);
                 return;
@@ -193,10 +194,10 @@ let Application = Application_1 = class Application extends component_1.Childabl
         this.options.freeze();
         if (!this.options.getValue("preserveWatchOutput") &&
             this.logger instanceof index_2.ConsoleLogger) {
-            ts.sys.clearScreen?.();
+            typescript_1.default.sys.clearScreen?.();
         }
         this.logger.verbose(`Using TypeScript ${this.getTypeScriptVersion()} from ${this.getTypeScriptPath()}`);
-        if (!supportedVersionMajorMinor.some((version) => version == ts.versionMajorMinor)) {
+        if (!supportedVersionMajorMinor.some((version) => version == typescript_1.default.versionMajorMinor)) {
             this.logger.warn(`You are running with an unsupported TypeScript version! TypeDoc supports ${supportedVersionMajorMinor.join(", ")}`);
         }
         if (Object.keys(this.options.getCompilerOptions()).length === 0) {
@@ -219,15 +220,15 @@ let Application = Application_1 = class Application extends component_1.Childabl
         // We don't want to do it the first time to preserve initial debug status messages. They'll be lost
         // after the user saves a file, but better than nothing...
         let firstStatusReport = true;
-        const host = ts.createWatchCompilerHost(tsconfigFile, {}, ts.sys, ts.createEmitAndSemanticDiagnosticsBuilderProgram, (diagnostic) => this.logger.diagnostic(diagnostic), (status, newLine, _options, errorCount) => {
+        const host = typescript_1.default.createWatchCompilerHost(tsconfigFile, {}, typescript_1.default.sys, typescript_1.default.createEmitAndSemanticDiagnosticsBuilderProgram, (diagnostic) => this.logger.diagnostic(diagnostic), (status, newLine, _options, errorCount) => {
             if (!firstStatusReport &&
                 errorCount === void 0 &&
                 !this.options.getValue("preserveWatchOutput") &&
                 this.logger instanceof index_2.ConsoleLogger) {
-                ts.sys.clearScreen?.();
+                typescript_1.default.sys.clearScreen?.();
             }
             firstStatusReport = false;
-            this.logger.info(ts.flattenDiagnosticMessageText(status.messageText, newLine));
+            this.logger.info(typescript_1.default.flattenDiagnosticMessageText(status.messageText, newLine));
         });
         let successFinished = true;
         let currentProgram;
@@ -264,13 +265,13 @@ let Application = Application_1 = class Application extends component_1.Childabl
         };
         const origAfterProgramCreate = host.afterProgramCreate;
         host.afterProgramCreate = (program) => {
-            if (ts.getPreEmitDiagnostics(program.getProgram()).length === 0) {
+            if (typescript_1.default.getPreEmitDiagnostics(program.getProgram()).length === 0) {
                 currentProgram = program.getProgram();
                 runSuccess();
             }
             origAfterProgramCreate?.(program);
         };
-        ts.createWatchProgram(host);
+        typescript_1.default.createWatchProgram(host);
     }
     validate(project) {
         const checks = this.options.getValue("validation");
@@ -287,6 +288,7 @@ let Application = Application_1 = class Application extends component_1.Childabl
         if (checks.invalidLink) {
             (0, links_1.validateLinks)(project, this.logger);
         }
+        this.trigger(Application_1.EVENT_VALIDATE_PROJECT, project);
         this.logger.verbose(`Validation took ${Date.now() - start}ms`);
     }
     /**
@@ -404,8 +406,14 @@ Application.VERSION = packageInfo.version;
 Application.EVENT_BOOTSTRAP_END = application_events_1.ApplicationEvents.BOOTSTRAP_END;
 /**
  * Emitted after a project has been deserialized from JSON.
+ * The listener will be given an instance of {@link ProjectReflection}.
  */
 Application.EVENT_PROJECT_REVIVE = application_events_1.ApplicationEvents.REVIVE;
+/**
+ * Emitted when validation is being run.
+ * The listener will be given an instance of {@link ProjectReflection}.
+ */
+Application.EVENT_VALIDATE_PROJECT = application_events_1.ApplicationEvents.VALIDATE_PROJECT;
 __decorate([
     (0, utils_1.BindOption)("skipErrorChecking")
 ], Application.prototype, "skipErrorChecking", void 0);

package/dist/lib/cli.js

@@ -36,6 +36,7 @@ const td = __importStar(require("typedoc"));
 const app = new td.Application();
 app.options.addReader(new td.ArgumentsReader(0));
 app.options.addReader(new td.TypeDocReader());
+app.options.addReader(new td.PackageJsonReader());
 app.options.addReader(new td.TSConfigReader());
 app.options.addReader(new td.ArgumentsReader(300));
 void run(app)
@@ -74,17 +75,13 @@ async function run(app) {
     }
     if (app.options.getValue("watch")) {
         app.convertAndWatch(async (project) => {
-            const out = app.options.getValue("out");
-            if (out) {
-                await app.generateDocs(project, out);
-            }
             const json = app.options.getValue("json");
+            if (!json || app.options.isSet("out")) {
+                await app.generateDocs(project, app.options.getValue("out"));
+            }
             if (json) {
                 await app.generateJson(project, json);
             }
-            if (!out && !json) {
-                await app.generateDocs(project, "./docs");
-            }
         });
         return ExitCodes.Ok;
     }
@@ -105,17 +102,13 @@ async function run(app) {
         return ExitCodes.ValidationError;
     }
     if (app.options.getValue("emit") !== "none") {
-        const out = app.options.getValue("out");
-        if (out) {
-            await app.generateDocs(project, out);
-        }
         const json = app.options.getValue("json");
+        if (!json || app.options.isSet("out")) {
+            await app.generateDocs(project, app.options.getValue("out"));
+        }
         if (json) {
             await app.generateJson(project, json);
         }
-        if (!out && !json) {
-            await app.generateDocs(project, "./docs");
-        }
         if (app.logger.hasErrors()) {
             return ExitCodes.OutputError;
         }

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

@@ -6,7 +6,7 @@
  * @module
  */
 export declare const MeaningKeywords: readonly ["class", "interface", "type", "enum", "namespace", "function", "var", "constructor", "member", "event", "call", "new", "index", "complex", "getter", "setter"];
-export type MeaningKeyword = typeof MeaningKeywords[number];
+export type MeaningKeyword = (typeof MeaningKeywords)[number];
 export interface DeclarationReference {
     resolutionStart: "global" | "local";
     moduleSource?: string;

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

@@ -1,4 +1,4 @@
-import * as ts from "typescript";
+import ts from "typescript";
 import { ReflectionKind } from "../../models";
 import { Logger } from "../../utils";
 import { CommentStyle } from "../../utils/options/declaration";

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

@@ -1,30 +1,10 @@
 "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.discoverSignatureComment = exports.discoverComment = void 0;
-const ts = __importStar(require("typescript"));
+const typescript_1 = __importDefault(require("typescript"));
 const models_1 = require("../../models");
 const utils_1 = require("../../utils");
 const declaration_1 = require("../../utils/options/declaration");
@@ -34,84 +14,84 @@ const paths_1 = require("../../utils/paths");
 // the JSDoc converter because we only want part of the comment when
 // getting them.
 const wantedKinds = {
-    [models_1.ReflectionKind.Project]: [ts.SyntaxKind.SourceFile],
-    [models_1.ReflectionKind.Module]: [ts.SyntaxKind.SourceFile],
+    [models_1.ReflectionKind.Project]: [typescript_1.default.SyntaxKind.SourceFile],
+    [models_1.ReflectionKind.Module]: [typescript_1.default.SyntaxKind.SourceFile],
     [models_1.ReflectionKind.Namespace]: [
-        ts.SyntaxKind.ModuleDeclaration,
-        ts.SyntaxKind.SourceFile,
-        ts.SyntaxKind.BindingElement,
-        ts.SyntaxKind.ExportSpecifier,
-        ts.SyntaxKind.NamespaceExport,
+        typescript_1.default.SyntaxKind.ModuleDeclaration,
+        typescript_1.default.SyntaxKind.SourceFile,
+        typescript_1.default.SyntaxKind.BindingElement,
+        typescript_1.default.SyntaxKind.ExportSpecifier,
+        typescript_1.default.SyntaxKind.NamespaceExport,
     ],
     [models_1.ReflectionKind.Enum]: [
-        ts.SyntaxKind.EnumDeclaration,
-        ts.SyntaxKind.VariableDeclaration,
+        typescript_1.default.SyntaxKind.EnumDeclaration,
+        typescript_1.default.SyntaxKind.VariableDeclaration,
     ],
     [models_1.ReflectionKind.EnumMember]: [
-        ts.SyntaxKind.EnumMember,
+        typescript_1.default.SyntaxKind.EnumMember,
         // These here so that @enum gets comments
-        ts.SyntaxKind.PropertyAssignment,
-        ts.SyntaxKind.PropertySignature,
+        typescript_1.default.SyntaxKind.PropertyAssignment,
+        typescript_1.default.SyntaxKind.PropertySignature,
     ],
     [models_1.ReflectionKind.Variable]: [
-        ts.SyntaxKind.VariableDeclaration,
-        ts.SyntaxKind.BindingElement,
-        ts.SyntaxKind.ExportAssignment,
-        ts.SyntaxKind.PropertyAccessExpression,
+        typescript_1.default.SyntaxKind.VariableDeclaration,
+        typescript_1.default.SyntaxKind.BindingElement,
+        typescript_1.default.SyntaxKind.ExportAssignment,
+        typescript_1.default.SyntaxKind.PropertyAccessExpression,
     ],
     [models_1.ReflectionKind.Function]: [
-        ts.SyntaxKind.FunctionDeclaration,
-        ts.SyntaxKind.BindingElement,
-        ts.SyntaxKind.VariableDeclaration,
-        ts.SyntaxKind.ExportAssignment,
-        ts.SyntaxKind.PropertyAccessExpression,
+        typescript_1.default.SyntaxKind.FunctionDeclaration,
+        typescript_1.default.SyntaxKind.BindingElement,
+        typescript_1.default.SyntaxKind.VariableDeclaration,
+        typescript_1.default.SyntaxKind.ExportAssignment,
+        typescript_1.default.SyntaxKind.PropertyAccessExpression,
     ],
     [models_1.ReflectionKind.Class]: [
-        ts.SyntaxKind.ClassDeclaration,
-        ts.SyntaxKind.BindingElement,
+        typescript_1.default.SyntaxKind.ClassDeclaration,
+        typescript_1.default.SyntaxKind.BindingElement,
     ],
-    [models_1.ReflectionKind.Interface]: [ts.SyntaxKind.InterfaceDeclaration],
-    [models_1.ReflectionKind.Constructor]: [ts.SyntaxKind.Constructor],
+    [models_1.ReflectionKind.Interface]: [typescript_1.default.SyntaxKind.InterfaceDeclaration],
+    [models_1.ReflectionKind.Constructor]: [typescript_1.default.SyntaxKind.Constructor],
     [models_1.ReflectionKind.Property]: [
-        ts.SyntaxKind.PropertyDeclaration,
-        ts.SyntaxKind.PropertySignature,
-        ts.SyntaxKind.BinaryExpression,
-        ts.SyntaxKind.PropertyAssignment,
+        typescript_1.default.SyntaxKind.PropertyDeclaration,
+        typescript_1.default.SyntaxKind.PropertySignature,
+        typescript_1.default.SyntaxKind.BinaryExpression,
+        typescript_1.default.SyntaxKind.PropertyAssignment,
         // class X { constructor(/** Comment */ readonly z: string) }
-        ts.SyntaxKind.Parameter,
+        typescript_1.default.SyntaxKind.Parameter,
     ],
     [models_1.ReflectionKind.Method]: [
-        ts.SyntaxKind.FunctionDeclaration,
-        ts.SyntaxKind.MethodDeclaration,
+        typescript_1.default.SyntaxKind.FunctionDeclaration,
+        typescript_1.default.SyntaxKind.MethodDeclaration,
     ],
     [models_1.ReflectionKind.CallSignature]: [
-        ts.SyntaxKind.FunctionDeclaration,
-        ts.SyntaxKind.VariableDeclaration,
-        ts.SyntaxKind.MethodDeclaration,
-        ts.SyntaxKind.MethodDeclaration,
-        ts.SyntaxKind.PropertyDeclaration,
-        ts.SyntaxKind.PropertySignature,
-        ts.SyntaxKind.CallSignature,
+        typescript_1.default.SyntaxKind.FunctionDeclaration,
+        typescript_1.default.SyntaxKind.VariableDeclaration,
+        typescript_1.default.SyntaxKind.MethodDeclaration,
+        typescript_1.default.SyntaxKind.MethodDeclaration,
+        typescript_1.default.SyntaxKind.PropertyDeclaration,
+        typescript_1.default.SyntaxKind.PropertySignature,
+        typescript_1.default.SyntaxKind.CallSignature,
     ],
-    [models_1.ReflectionKind.IndexSignature]: [ts.SyntaxKind.IndexSignature],
-    [models_1.ReflectionKind.ConstructorSignature]: [ts.SyntaxKind.ConstructSignature],
-    [models_1.ReflectionKind.Parameter]: [ts.SyntaxKind.Parameter],
-    [models_1.ReflectionKind.TypeLiteral]: [ts.SyntaxKind.TypeLiteral],
-    [models_1.ReflectionKind.TypeParameter]: [ts.SyntaxKind.TypeParameter],
-    [models_1.ReflectionKind.Accessor]: [ts.SyntaxKind.PropertyDeclaration],
-    [models_1.ReflectionKind.GetSignature]: [ts.SyntaxKind.GetAccessor],
-    [models_1.ReflectionKind.SetSignature]: [ts.SyntaxKind.SetAccessor],
-    [models_1.ReflectionKind.ObjectLiteral]: [ts.SyntaxKind.ObjectLiteralExpression],
-    [models_1.ReflectionKind.TypeAlias]: [ts.SyntaxKind.TypeAliasDeclaration],
+    [models_1.ReflectionKind.IndexSignature]: [typescript_1.default.SyntaxKind.IndexSignature],
+    [models_1.ReflectionKind.ConstructorSignature]: [typescript_1.default.SyntaxKind.ConstructSignature],
+    [models_1.ReflectionKind.Parameter]: [typescript_1.default.SyntaxKind.Parameter],
+    [models_1.ReflectionKind.TypeLiteral]: [typescript_1.default.SyntaxKind.TypeLiteral],
+    [models_1.ReflectionKind.TypeParameter]: [typescript_1.default.SyntaxKind.TypeParameter],
+    [models_1.ReflectionKind.Accessor]: [typescript_1.default.SyntaxKind.PropertyDeclaration],
+    [models_1.ReflectionKind.GetSignature]: [typescript_1.default.SyntaxKind.GetAccessor],
+    [models_1.ReflectionKind.SetSignature]: [typescript_1.default.SyntaxKind.SetAccessor],
+    [models_1.ReflectionKind.ObjectLiteral]: [typescript_1.default.SyntaxKind.ObjectLiteralExpression],
+    [models_1.ReflectionKind.TypeAlias]: [typescript_1.default.SyntaxKind.TypeAliasDeclaration],
     [models_1.ReflectionKind.Reference]: [
-        ts.SyntaxKind.NamespaceExport,
-        ts.SyntaxKind.ExportSpecifier,
+        typescript_1.default.SyntaxKind.NamespaceExport,
+        typescript_1.default.SyntaxKind.ExportSpecifier,
     ],
 };
 function discoverComment(symbol, kind, logger, commentStyle) {
     // For a module comment, we want the first one defined in the file,
     // not the last one, since that will apply to the import or declaration.
-    const reverse = !symbol.declarations?.some(ts.isSourceFile);
+    const reverse = !symbol.declarations?.some(typescript_1.default.isSourceFile);
     const discovered = [];
     for (const decl of symbol.declarations || []) {
         const text = decl.getSourceFile().text;
@@ -127,14 +107,14 @@ function discoverComment(symbol, kind, logger, commentStyle) {
             // See the gh1770 test for an example.
             if (kind & models_1.ReflectionKind.ContainsCallSignatures &&
                 [
-                    ts.SyntaxKind.FunctionDeclaration,
-                    ts.SyntaxKind.MethodDeclaration,
-                    ts.SyntaxKind.Constructor,
+                    typescript_1.default.SyntaxKind.FunctionDeclaration,
+                    typescript_1.default.SyntaxKind.MethodDeclaration,
+                    typescript_1.default.SyntaxKind.Constructor,
                 ].includes(node.kind) &&
                 !node.body) {
                 continue;
             }
-            const comments = collectCommentRanges(ts.getLeadingCommentRanges(text, node.pos));
+            const comments = collectCommentRanges(typescript_1.default.getLeadingCommentRanges(text, node.pos));
             if (reverse) {
                 comments.reverse();
             }
@@ -153,7 +133,7 @@ function discoverComment(symbol, kind, logger, commentStyle) {
             logger.warn(`${symbol.name} has multiple declarations with a comment. An arbitrary comment will be used.`);
             const locations = discovered.map(([sf, [{ pos }]]) => {
                 const path = (0, paths_1.nicePath)(sf.fileName);
-                const line = ts.getLineAndCharacterOfPosition(sf, pos).line + 1;
+                const line = typescript_1.default.getLineAndCharacterOfPosition(sf, pos).line + 1;
                 return `${path}:${line}`;
             });
             logger.info(`The comments for ${symbol.name} are declared at:\n\t${locations.join("\n\t")}`);
@@ -168,7 +148,7 @@ function discoverSignatureComment(declaration, commentStyle) {
         return;
     }
     const text = node.getSourceFile().text;
-    const comments = collectCommentRanges(ts.getLeadingCommentRanges(text, node.pos));
+    const comments = collectCommentRanges(typescript_1.default.getLeadingCommentRanges(text, node.pos));
     comments.reverse();
     const comment = comments.find((ranges) => permittedRange(text, ranges, commentStyle));
     if (comment) {
@@ -190,7 +170,7 @@ exports.discoverSignatureComment = discoverSignatureComment;
  * @return TRUE if the given node is the topmost module declaration, FALSE otherwise.
  */
 function isTopmostModuleDeclaration(node) {
-    return node.getChildren().some(ts.isModuleBlock);
+    return node.getChildren().some(typescript_1.default.isModuleBlock);
 }
 /**
  * Return the root module declaration of the given module declaration.
@@ -204,7 +184,7 @@ function isTopmostModuleDeclaration(node) {
  */
 function getRootModuleDeclaration(node) {
     while (node.parent &&
-        node.parent.kind === ts.SyntaxKind.ModuleDeclaration) {
+        node.parent.kind === typescript_1.default.SyntaxKind.ModuleDeclaration) {
         const parent = node.parent;
         if (node.name.pos === parent.name.end + 1) {
             node = parent;
@@ -220,12 +200,12 @@ function declarationToCommentNode(node) {
         return node;
     // const abc = 123
     //       ^^^
-    if (node.parent.kind === ts.SyntaxKind.VariableDeclarationList) {
+    if (node.parent.kind === typescript_1.default.SyntaxKind.VariableDeclarationList) {
         return node.parent.parent;
     }
     // const a = () => {}
     //           ^^^^^^^^
-    if (node.parent.kind === ts.SyntaxKind.VariableDeclaration) {
+    if (node.parent.kind === typescript_1.default.SyntaxKind.VariableDeclaration) {
         return node.parent.parent.parent;
     }
     // class X { y = () => {} }
@@ -236,13 +216,13 @@ function declarationToCommentNode(node) {
     // export default () => {}
     //                ^^^^^^^^
     if ([
-        ts.SyntaxKind.PropertyDeclaration,
-        ts.SyntaxKind.BinaryExpression,
-        ts.SyntaxKind.ExportAssignment,
+        typescript_1.default.SyntaxKind.PropertyDeclaration,
+        typescript_1.default.SyntaxKind.BinaryExpression,
+        typescript_1.default.SyntaxKind.ExportAssignment,
     ].includes(node.parent.kind)) {
         return node.parent;
     }
-    if (ts.isModuleDeclaration(node)) {
+    if (typescript_1.default.isModuleDeclaration(node)) {
         if (!isTopmostModuleDeclaration(node)) {
             return;
         }
@@ -250,10 +230,10 @@ function declarationToCommentNode(node) {
             return getRootModuleDeclaration(node);
         }
     }
-    if (node.kind === ts.SyntaxKind.ExportSpecifier) {
+    if (node.kind === typescript_1.default.SyntaxKind.ExportSpecifier) {
         return node.parent.parent;
     }
-    if ([ts.SyntaxKind.NamespaceExport, ts.SyntaxKind.FunctionType].includes(node.kind)) {
+    if ([typescript_1.default.SyntaxKind.NamespaceExport, typescript_1.default.SyntaxKind.FunctionType].includes(node.kind)) {
         return node.parent;
     }
     return node;
@@ -268,14 +248,14 @@ function collectCommentRanges(ranges) {
     for (const range of ranges || []) {
         collect.push(range);
         switch (range.kind) {
-            case ts.SyntaxKind.MultiLineCommentTrivia:
+            case typescript_1.default.SyntaxKind.MultiLineCommentTrivia:
                 if (collect.length) {
                     result.push(collect);
                     collect = [];
                 }
                 result.push([range]);
                 break;
-            case ts.SyntaxKind.SingleLineCommentTrivia:
+            case typescript_1.default.SyntaxKind.SingleLineCommentTrivia:
                 collect.push(range);
                 break;
             /* istanbul ignore next */
@@ -293,11 +273,11 @@ function permittedRange(text, ranges, commentStyle) {
         case declaration_1.CommentStyle.All:
             return true;
         case declaration_1.CommentStyle.Block:
-            return ranges[0].kind === ts.SyntaxKind.MultiLineCommentTrivia;
+            return ranges[0].kind === typescript_1.default.SyntaxKind.MultiLineCommentTrivia;
         case declaration_1.CommentStyle.Line:
-            return ranges[0].kind === ts.SyntaxKind.SingleLineCommentTrivia;
+            return ranges[0].kind === typescript_1.default.SyntaxKind.SingleLineCommentTrivia;
         case declaration_1.CommentStyle.JSDoc:
-            return (ranges[0].kind === ts.SyntaxKind.MultiLineCommentTrivia &&
+            return (ranges[0].kind === typescript_1.default.SyntaxKind.MultiLineCommentTrivia &&
                 text[ranges[0].pos] === "/" &&
                 text[ranges[0].pos + 1] === "*" &&
                 text[ranges[0].pos + 2] === "*");