typedoc 0.27.7 → 0.28.0-beta.0

package/dist/lib/utils/options/readers/package-json.d.ts

@@ -1,6 +1,6 @@
 import type { OptionsReader } from "../index.js";
-import type { Logger } from "../../loggers.js";
 import type { Options } from "../options.js";
+import { type Logger } from "#utils";
 export declare class PackageJsonReader implements OptionsReader {
     order: number;
     supportsPackages: boolean;

package/dist/lib/utils/options/readers/package-json.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"package-json.d.ts","sourceRoot":"","sources":["../../../../../src/lib/utils/options/readers/package-json.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AACjD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAK7C,OAAO,EAAQ,KAAK,MAAM,EAAyB,MAAM,QAAQ,CAAC;AAElE,qBAAa,iBAAkB,YAAW,aAAa;IAGnD,KAAK,SAAO;IAEZ,gBAAgB,UAAQ;IAExB,IAAI,SAAkB;IAEtB,IAAI,CACA,SAAS,EAAE,OAAO,EAClB,MAAM,EAAE,MAAM,EACd,GAAG,EAAE,MAAM,EACX,QAAQ,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,GACjC,IAAI;CAmCV"}

package/dist/lib/utils/options/readers/package-json.js

@@ -2,6 +2,7 @@ import { ok } from "assert";
 import { nicePath } from "../../paths.js";
 import { discoverPackageJson } from "../../fs.js";
 import { dirname } from "path";
+import { i18n } from "#utils";
 export class PackageJsonReader {
     // Should run after the TypeDoc config reader but before the TS config
     // reader, so that it can still specify a path to a `tsconfig.json` file.
@@ -15,7 +16,7 @@ export class PackageJsonReader {
         }
         const { file, content } = result;
         if ("typedoc" in content) {
-            logger.warn(logger.i18n.typedoc_key_in_0_ignored(nicePath(file)));
+            logger.warn(i18n.typedoc_key_in_0_ignored(nicePath(file)));
         }
         const optsKey = "typedocOptions";
         if (!(optsKey in content)) {
@@ -23,7 +24,7 @@ export class PackageJsonReader {
         }
         const opts = content[optsKey];
         if (opts === null || typeof opts !== "object") {
-            logger.error(logger.i18n.typedoc_options_must_be_object_in_0(nicePath(file)));
+            logger.error(i18n.typedoc_options_must_be_object_in_0(nicePath(file)));
             return;
         }
         for (const [opt, val] of Object.entries(opts)) {

package/dist/lib/utils/options/readers/package-json.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"package-json.js","sourceRoot":"","sources":["../../../../../src/lib/utils/options/readers/package-json.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AAC5B,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAC1C,OAAO,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAC;AAClD,OAAO,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AAC/B,OAAO,EAAE,IAAI,EAAsC,MAAM,QAAQ,CAAC;AAElE,MAAM,OAAO,iBAAiB;IAC1B,sEAAsE;IACtE,yEAAyE;IACzE,KAAK,GAAG,GAAG,CAAC;IAEZ,gBAAgB,GAAG,IAAI,CAAC;IAExB,IAAI,GAAG,cAAc,CAAC;IAEtB,IAAI,CACA,SAAkB,EAClB,MAAc,EACd,GAAW,EACX,QAAgC;QAEhC,MAAM,MAAM,GAAG,mBAAmB,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;QAElD,IAAI,CAAC,MAAM,EAAE,CAAC;YACV,OAAO;QACX,CAAC;QAED,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,MAAM,CAAC;QAEjC,IAAI,SAAS,IAAI,OAAO,EAAE,CAAC;YACvB,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,wBAAwB,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAC/D,CAAC;QAED,MAAM,OAAO,GAAG,gBAAgB,CAAC;QACjC,IAAI,CAAC,CAAC,OAAO,IAAI,OAAO,CAAC,EAAE,CAAC;YACxB,OAAO;QACX,CAAC;QAED,MAAM,IAAI,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;QAC9B,IAAI,IAAI,KAAK,IAAI,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE,CAAC;YAC5C,MAAM,CAAC,KAAK,CACR,IAAI,CAAC,mCAAmC,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAC3D,CAAC;YACF,OAAO;QACX,CAAC;QAED,KAAK,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC;YAC5C,IAAI,CAAC;gBACD,SAAS,CAAC,QAAQ,CAAC,GAAY,EAAE,GAAY,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC;YAClE,CAAC;YAAC,OAAO,GAAG,EAAE,CAAC;gBACX,EAAE,CAAC,GAAG,YAAY,KAAK,CAAC,CAAC;gBACzB,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,OAA2B,CAAC,CAAC;YAClD,CAAC;QACL,CAAC;IACL,CAAC;CACJ"}

package/dist/lib/utils/options/readers/tsconfig.d.ts

@@ -1,5 +1,5 @@
 import type { Options, OptionsReader } from "../options.js";
-import type { Logger } from "../../loggers.js";
+import { type Logger } from "#utils";
 export declare class TSConfigReader implements OptionsReader {
     /**
      * Note: Runs after the {@link TypeDocReader}.

package/dist/lib/utils/options/readers/tsconfig.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"tsconfig.d.ts","sourceRoot":"","sources":["../../../../../src/lib/utils/options/readers/tsconfig.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,OAAO,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAG5D,OAAO,EAAQ,KAAK,MAAM,EAA6C,MAAM,QAAQ,CAAC;AA0CtF,qBAAa,cAAe,YAAW,aAAa;IAChD;;OAEG;IACH,KAAK,SAAO;IAEZ,IAAI,SAAmB;IAEvB,gBAAgB,UAAQ;IAExB,OAAO,CAAC,cAAc,CAAqB;IAE3C,IAAI,CACA,SAAS,EAAE,OAAO,EAClB,MAAM,EAAE,MAAM,EACd,GAAG,EAAE,MAAM,EACX,QAAQ,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,GAClC,IAAI;IA2DP,OAAO,CAAC,oBAAoB;IA2D5B,OAAO,CAAC,SAAS;CAmDpB"}

package/dist/lib/utils/options/readers/tsconfig.js

@@ -1,38 +1,38 @@
-import { resolve, join, dirname } from "path";
+import { dirname, join, resolve } from "path";
 import ts from "typescript";
 import { isFile } from "../../fs.js";
 import { ok } from "assert";
-import { additionalProperties, isTagString, optional, validate, } from "../../validation.js";
+import { i18n, unique, Validation } from "#utils";
 import { nicePath, normalizePath } from "../../paths.js";
 import { createRequire } from "module";
-import { tsdocBlockTags, tsdocInlineTags, tsdocModifierTags, } from "../tsdoc-defaults.js";
-import { unique } from "../../array.js";
-import { findTsConfigFile, getTypeDocOptionsFromTsConfig, readTsConfig, } from "../../tsconfig.js";
+import { tsdocBlockTags, tsdocInlineTags, tsdocModifierTags } from "../tsdoc-defaults.js";
+import { findTsConfigFile, getTypeDocOptionsFromTsConfig, readTsConfig } from "../../tsconfig.js";
+import { diagnostics } from "../../loggers.js";
 function isSupportForTags(obj) {
-    return (validate({}, obj) &&
+    return (Validation.validate({}, obj) &&
         Object.entries(obj).every(([key, val]) => {
             return (/^@[a-zA-Z][a-zA-Z0-9]*$/.test(key) && typeof val === "boolean");
         }));
 }
 const tsDocSchema = {
-    $schema: optional(String),
-    extends: optional([Array, String]),
-    noStandardTags: optional(Boolean),
-    tagDefinitions: optional([
+    $schema: Validation.optional(String),
+    extends: Validation.optional([Array, String]),
+    noStandardTags: Validation.optional(Boolean),
+    tagDefinitions: Validation.optional([
         Array,
         {
-            tagName: isTagString,
+            tagName: Validation.isTagString,
             syntaxKind: ["inline", "block", "modifier"],
-            allowMultiple: optional(Boolean),
-            [additionalProperties]: false,
+            allowMultiple: Validation.optional(Boolean),
+            [Validation.additionalProperties]: false,
         },
     ]),
-    supportForTags: optional(isSupportForTags),
+    supportForTags: Validation.optional(isSupportForTags),
     // The official parser has code to support for these two, but
     // the schema doesn't allow them... just silently ignore them for now.
-    supportedHtmlElements: optional({}),
-    reportUnsupportedHtmlElements: optional(Boolean),
-    [additionalProperties]: false,
+    supportedHtmlElements: Validation.optional({}),
+    reportUnsupportedHtmlElements: Validation.optional(Boolean),
+    [Validation.additionalProperties]: false,
 };
 export class TSConfigReader {
     /**
@@ -48,7 +48,7 @@ export class TSConfigReader {
         if (!fileToRead) {
             // If the user didn't give us this option, we shouldn't complain about not being able to find it.
             if (container.isSet("tsconfig")) {
-                logger.error(logger.i18n.tsconfig_file_0_does_not_exist(nicePath(file)));
+                logger.error(i18n.tsconfig_file_0_does_not_exist(nicePath(file)));
             }
             return;
         }
@@ -59,17 +59,17 @@ export class TSConfigReader {
         if (!parsed) {
             return;
         }
-        logger.diagnostics(parsed.errors);
+        diagnostics(logger, parsed.errors);
         if (parsed.errors.length) {
             return;
         }
         const typedocOptions = getTypeDocOptionsFromTsConfig(fileToRead);
         if (typedocOptions.options) {
-            logger.error(logger.i18n.tsconfig_file_specifies_options_file());
+            logger.error(i18n.tsconfig_file_specifies_options_file());
             delete typedocOptions.options;
         }
         if (typedocOptions.tsconfig) {
-            logger.error(logger.i18n.tsconfig_file_specifies_tsconfig_file());
+            logger.error(i18n.tsconfig_file_specifies_tsconfig_file());
             delete typedocOptions.tsconfig;
         }
         container.setCompilerOptions(parsed.fileNames, parsed.options, parsed.projectReferences);
@@ -92,7 +92,7 @@ export class TSConfigReader {
         }
         const overwritten = ["blockTags", "inlineTags", "modifierTags"].filter((opt) => container.isSet(opt));
         if (overwritten.length) {
-            logger.warn(logger.i18n.tags_0_defined_in_typedoc_json_overwritten_by_tsdoc_json(overwritten.join(", ")));
+            logger.warn(i18n.tags_0_defined_in_typedoc_json_overwritten_by_tsdoc_json(overwritten.join(", ")));
         }
         const config = this.readTsDoc(logger, tsdoc);
         if (!config)
@@ -124,17 +124,17 @@ export class TSConfigReader {
     }
     readTsDoc(logger, path) {
         if (this.seenTsdocPaths.has(path)) {
-            logger.error(logger.i18n.circular_reference_extends_0(nicePath(path)));
+            logger.error(i18n.circular_reference_extends_0(nicePath(path)));
             return;
         }
         this.seenTsdocPaths.add(path);
         const { config, error } = ts.readConfigFile(normalizePath(path), ts.sys.readFile);
         if (error) {
-            logger.error(logger.i18n.failed_read_tsdoc_json_0(nicePath(path)));
+            logger.error(i18n.failed_read_tsdoc_json_0(nicePath(path)));
             return;
         }
-        if (!validate(tsDocSchema, config)) {
-            logger.error(logger.i18n.invalid_tsdoc_json_0(nicePath(path)));
+        if (!Validation.validate(tsDocSchema, config)) {
+            logger.error(i18n.invalid_tsdoc_json_0(nicePath(path)));
             return;
         }
         const workingConfig = {};
@@ -146,7 +146,7 @@ export class TSConfigReader {
                     resolvedPath = resolver.resolve(extendedPath);
                 }
                 catch {
-                    logger.error(logger.i18n.failed_resolve_0_to_file_in_1(extendedPath, nicePath(path)));
+                    logger.error(i18n.failed_resolve_0_to_file_in_1(extendedPath, nicePath(path)));
                     return;
                 }
                 const parentConfig = this.readTsDoc(logger, resolvedPath);

package/dist/lib/utils/options/readers/tsconfig.js.map

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

package/dist/lib/utils/options/readers/typedoc.d.ts

@@ -1,6 +1,6 @@
 import type { OptionsReader } from "../options.js";
-import type { Logger } from "../../loggers.js";
 import type { Options } from "../options.js";
+import { type Logger } from "#utils";
 /**
  * Obtains option values from typedoc.json
  */

package/dist/lib/utils/options/readers/typedoc.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"typedoc.d.ts","sourceRoot":"","sources":["../../../../../src/lib/utils/options/readers/typedoc.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AACnD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAM7C,OAAO,EAAQ,KAAK,MAAM,EAAyB,MAAM,QAAQ,CAAC;AAElE;;GAEG;AACH,qBAAa,aAAc,YAAW,aAAa;IAC/C;;OAEG;IACH,KAAK,SAAO;IAEZ,IAAI,SAAkB;IAEtB,gBAAgB,UAAQ;IAExB;;OAEG;IACG,IAAI,CACN,SAAS,EAAE,OAAO,EAClB,MAAM,EAAE,MAAM,EACd,GAAG,EAAE,MAAM,EACX,QAAQ,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,GACjC,OAAO,CAAC,IAAI,CAAC;IAiBhB;;;;;OAKG;YACW,QAAQ;IA2FtB;;;;;;OAMG;IACH,OAAO,CAAC,eAAe;CA0B1B"}

package/dist/lib/utils/options/readers/typedoc.js

@@ -1,4 +1,4 @@
-import { join, dirname, resolve } from "path";
+import { dirname, join, resolve } from "path";
 import * as FS from "fs";
 import ts from "typescript";
 import { ok } from "assert";
@@ -6,11 +6,10 @@ import { nicePath, normalizePath } from "../../paths.js";
 import { isFile } from "../../fs.js";
 import { createRequire } from "module";
 import { pathToFileURL } from "url";
+import { i18n } from "#utils";
 /**
  * Obtains option values from typedoc.json
  */
-// Changes need to happen here at some point. I think we should follow ESLint's new config
-// system eventually: https://eslint.org/blog/2022/08/new-config-system-part-1/
 export class TypeDocReader {
     /**
      * Should run before the tsconfig reader so that it can specify a tsconfig file to read.
@@ -26,7 +25,7 @@ export class TypeDocReader {
         const file = this.findTypedocFile(path, usedFile);
         if (!file) {
             if (container.isSet("options")) {
-                logger.error(logger.i18n.options_file_0_does_not_exist(nicePath(path)));
+                logger.error(i18n.options_file_0_does_not_exist(nicePath(path)));
             }
             return;
         }
@@ -41,7 +40,7 @@ export class TypeDocReader {
      */
     async readFile(file, container, logger, seen) {
         if (seen.has(file)) {
-            logger.error(logger.i18n.circular_reference_extends_0(nicePath(file)));
+            logger.error(i18n.circular_reference_extends_0(nicePath(file)));
             return;
         }
         seen.add(file);
@@ -49,7 +48,7 @@ export class TypeDocReader {
         if (file.endsWith(".json") || file.endsWith(".jsonc")) {
             const readResult = ts.readConfigFile(normalizePath(file), (path) => FS.readFileSync(path, "utf-8"));
             if (readResult.error) {
-                logger.error(logger.i18n.failed_read_options_file_0(nicePath(file)));
+                logger.error(i18n.failed_read_options_file_0(nicePath(file)));
                 return;
             }
             else {
@@ -64,13 +63,13 @@ export class TypeDocReader {
                 fileContent = await (await import(esmPath)).default;
             }
             catch (error) {
-                logger.error(logger.i18n.failed_read_options_file_0(nicePath(file)));
+                logger.error(i18n.failed_read_options_file_0(nicePath(file)));
                 logger.error(String(error instanceof Error ? error.message : error));
                 return;
             }
         }
         if (typeof fileContent !== "object" || !fileContent) {
-            logger.error(logger.i18n.failed_read_options_file_0(nicePath(file)));
+            logger.error(i18n.failed_read_options_file_0(nicePath(file)));
             return;
         }
         // clone option object to avoid of property changes in re-calling this file
@@ -85,7 +84,7 @@ export class TypeDocReader {
                     resolvedParent = resolver.resolve(extendedFile);
                 }
                 catch {
-                    logger.error(logger.i18n.failed_resolve_0_to_file_in_1(extendedFile, nicePath(file)));
+                    logger.error(i18n.failed_resolve_0_to_file_in_1(extendedFile, nicePath(file)));
                     continue;
                 }
                 await this.readFile(resolvedParent, container, logger, seen);

package/dist/lib/utils/options/readers/typedoc.js.map

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

package/dist/lib/utils/options/sources/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/lib/utils/options/sources/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC"}

package/dist/lib/utils/options/sources/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/lib/utils/options/sources/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC"}

package/dist/lib/utils/options/sources/typedoc.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"typedoc.d.ts","sourceRoot":"","sources":["../../../../../src/lib/utils/options/sources/typedoc.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAY7C,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,gBAAgB,CAAC,QAk9BzE"}