typedoc 0.27.6 → 0.27.7

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

@@ -4,6 +4,7 @@ import { ConverterComponent } from "../components.js";
 import { ConverterEvents } from "../converter-events.js";
 import { MinimalSourceFile } from "../../utils/minimalSourceFile.js";
 import { isFile } from "../../utils/fs.js";
+import { dedent, escapeRegExp } from "../../utils/general.js";
 /**
  * Handles `@include` and `@includeCode` within comments/documents.
  */
@@ -42,14 +43,22 @@ export class IncludePlugin extends ConverterComponent {
                 !["@include", "@includeCode"].includes(part.tag)) {
                 continue;
             }
-            const file = path.resolve(relative, part.text.trim());
+            const { filename, regionTarget, requestedLines } = parseIncludeCodeTextPart(part.text);
+            const file = path.resolve(relative, filename);
+            this.application.watchFile(file);
             if (included.includes(file) && part.tag === "@include") {
                 this.logger.error(this.logger.i18n.include_0_in_1_specified_2_circular_include_3(part.tag, refl.getFriendlyFullName(), part.text, included.join("\n\t")));
             }
             else if (isFile(file)) {
                 const text = fs.readFileSync(file, "utf-8");
+                const ext = path.extname(file).substring(1);
+                const includedText = regionTarget
+                    ? this.getRegions(refl, file, ext, part.text, text, regionTarget, part.tag, part.tag === "@includeCode")
+                    : requestedLines
+                        ? this.getLines(refl, file, part.text, text, requestedLines, part.tag)
+                        : text;
                 if (part.tag === "@include") {
-                    const sf = new MinimalSourceFile(text, file);
+                    const sf = new MinimalSourceFile(includedText, file);
                     const { content } = this.owner.parseRawComment(sf, refl.project.files);
                     this.checkIncludeTagsParts(refl, path.dirname(file), content, [...included, file]);
                     parts.splice(i, 1, ...content);
@@ -57,17 +66,181 @@ export class IncludePlugin extends ConverterComponent {
                 else {
                     parts[i] = {
                         kind: "code",
-                        text: makeCodeBlock(path.extname(file).substring(1), text),
+                        text: makeCodeBlock(ext, includedText),
                     };
                 }
             }
             else {
-                this.logger.warn(this.logger.i18n.include_0_in_1_specified_2_resolved_to_3_does_not_exist(part.tag, refl.getFriendlyFullName(), part.text, file));
+                this.logger.error(this.logger.i18n.include_0_in_1_specified_2_resolved_to_3_does_not_exist(part.tag, refl.getFriendlyFullName(), part.text, file));
             }
         }
     }
+    getRegions(refl, file, ext, textPart, text, regionTargets, tag, ignoreIndent) {
+        const regionTagsList = regionTagREsByExt[ext];
+        if (!regionTagsList) {
+            this.logger.error(this.logger.i18n.include_0_tag_in_1_region_2_region_not_supported(tag, refl.getFriendlyFullName(), textPart));
+            return "";
+        }
+        const targets = regionTargets.split(",").map((s) => s.trim());
+        let content = "";
+        for (const target of targets) {
+            let found = false;
+            for (const [startTag, endTag] of regionTagsList) {
+                const safeTarget = escapeRegExp(target);
+                const start = text.match(startTag(safeTarget));
+                const end = text.match(endTag(safeTarget));
+                const foundStart = start && start.length > 0;
+                const foundEnd = end && end.length > 0;
+                if (foundStart && !foundEnd) {
+                    this.logger.error(this.logger.i18n.include_0_tag_in_1_specified_2_file_3_region_4_region_close_not_found(tag, refl.getFriendlyFullName(), textPart, file, target));
+                    return "";
+                }
+                if (!foundStart && foundEnd) {
+                    this.logger.error(this.logger.i18n.include_0_tag_in_1_specified_2_file_3_region_4_region_open_not_found(tag, refl.getFriendlyFullName(), textPart, file, target));
+                    return "";
+                }
+                if (foundStart && foundEnd) {
+                    if (start.length > 1) {
+                        this.logger.error(this.logger.i18n.include_0_tag_in_1_specified_2_file_3_region_4_region_open_found_multiple_times(tag, refl.getFriendlyFullName(), textPart, file, target));
+                        return "";
+                    }
+                    if (end.length > 1) {
+                        this.logger.error(this.logger.i18n.include_0_tag_in_1_specified_2_file_3_region_4_region_close_found_multiple_times(tag, refl.getFriendlyFullName(), textPart, file, target));
+                        return "";
+                    }
+                    if (found) {
+                        this.logger.error(this.logger.i18n.include_0_tag_in_1_specified_2_file_3_region_4_region_found_multiple_times(tag, refl.getFriendlyFullName(), textPart, file, target));
+                        return "";
+                    }
+                    found = text.substring(text.indexOf(start[0]) + start[0].length, text.indexOf(end[0]));
+                }
+            }
+            if (found === false) {
+                this.logger.error(this.logger.i18n.include_0_tag_in_1_specified_2_file_3_region_4_region_not_found(tag, refl.getFriendlyFullName(), textPart, file, target));
+                return "";
+            }
+            if (found.trim() === "") {
+                this.logger.warn(this.logger.i18n.include_0_tag_in_1_specified_2_file_3_region_4_region_empty(tag, refl.getFriendlyFullName(), textPart, file, target));
+            }
+            content += ignoreIndent ? dedent(found) + "\n" : found;
+        }
+        return content;
+    }
+    getLines(refl, file, textPart, text, requestedLines, tag) {
+        let output = "";
+        const lines = text.split(/\r\n|\r|\n/);
+        requestedLines.split(",").forEach((requestedLineString) => {
+            if (requestedLineString.includes("-")) {
+                const [start, end] = requestedLineString.split("-").map(Number);
+                if (start > end) {
+                    this.logger.error(this.logger.i18n.include_0_tag_in_1_specified_2_file_3_lines_4_invalid_range(tag, refl.getFriendlyFullName(), textPart, file, requestedLines));
+                    return "";
+                }
+                if (start > lines.length || end > lines.length) {
+                    this.logger.error(this.logger.i18n.include_0_tag_in_1_specified_2_file_3_lines_4_but_only_5_lines(tag, refl.getFriendlyFullName(), textPart, file, requestedLines, lines.length.toString()));
+                    return "";
+                }
+                output += lines.slice(start - 1, end).join("\n") + "\n";
+            }
+            else {
+                const requestedLine = Number(requestedLineString);
+                if (requestedLine > lines.length) {
+                    this.logger.error(this.logger.i18n.include_0_tag_in_1_specified_2_file_3_lines_4_but_only_5_lines(tag, refl.getFriendlyFullName(), textPart, file, requestedLines, lines.length.toString()));
+                    return "";
+                }
+                output += lines[requestedLine - 1] + "\n";
+            }
+        });
+        return output;
+    }
 }
 function makeCodeBlock(lang, code) {
     const escaped = code.replace(/`(?=`)/g, "`\u200B");
     return "\n\n```" + lang + "\n" + escaped.trimEnd() + "\n```";
 }
+function parseIncludeCodeTextPart(text) {
+    let filename = text.trim();
+    let regionTarget;
+    let requestedLines;
+    if (filename.includes("#")) {
+        const parsed = filename.split("#");
+        filename = parsed[0];
+        regionTarget = parsed[1];
+    }
+    else if (filename.includes(":")) {
+        const parsed = filename.split(":");
+        filename = parsed[0];
+        requestedLines = parsed[1];
+    }
+    return { filename, regionTarget, requestedLines };
+}
+const regionTagREsByExt = {
+    bat: [
+        [
+            (regionName) => new RegExp(`:: *#region  *${regionName} *\n`, "g"),
+            (regionName) => new RegExp(`:: *#endregion  *${regionName} *\n`, "g"),
+        ],
+        [
+            (regionName) => new RegExp(`REM  *#region  *${regionName} *\n`, "g"),
+            (regionName) => new RegExp(`REM  *#endregion  *${regionName} *\n`, "g"),
+        ],
+    ],
+    cs: [
+        [
+            (regionName) => new RegExp(`#region  *${regionName} *\n`, "g"),
+            (regionName) => new RegExp(`#endregion  *${regionName} *\n`, "g"),
+        ],
+    ],
+    c: [
+        [
+            (regionName) => new RegExp(`#pragma  *region  *${regionName} *\n`, "g"),
+            (regionName) => new RegExp(`#pragma  *endregion  *${regionName} *\n`, "g"),
+        ],
+    ],
+    css: [
+        [
+            (regionName) => new RegExp(`/\\* *#region *\\*/  *${regionName} *\n`, "g"),
+            (regionName) => new RegExp(`/\\* *#endregion *\\*/  *${regionName} *\n`, "g"),
+        ],
+    ],
+    md: [
+        [
+            (regionName) => new RegExp(`<!--  *#region  *${regionName} *--> *\n`, "g"),
+            (regionName) => new RegExp(`<!--  *#endregion  *${regionName} *--> *\n`, "g"),
+        ],
+    ],
+    ts: [
+        [
+            (regionName) => new RegExp(`// *#region  *${regionName} *\n`, "g"),
+            (regionName) => new RegExp(`// *#endregion  *${regionName} *\n`, "g"),
+        ],
+    ],
+    vb: [
+        [
+            (regionName) => new RegExp(`#Region  *${regionName} *\n`, "g"),
+            (regionName) => new RegExp(`#End Region  *${regionName} *\n`, "g"),
+        ],
+    ],
+};
+regionTagREsByExt["fs"] = [
+    ...regionTagREsByExt["ts"],
+    [
+        (regionName) => new RegExp(`(#_region)  *${regionName} *\n`, "g"),
+        (regionName) => new RegExp(`(#_endregion)  *${regionName} *\n`, "g"),
+    ],
+];
+regionTagREsByExt["java"] = [
+    ...regionTagREsByExt["ts"],
+    [
+        (regionName) => new RegExp(`// *<editor-fold>  *${regionName} *\n`, "g"),
+        (regionName) => new RegExp(`// *</editor-fold>  *${regionName} *\n`, "g"),
+    ],
+];
+regionTagREsByExt["cpp"] = regionTagREsByExt["c"];
+regionTagREsByExt["less"] = regionTagREsByExt["css"];
+regionTagREsByExt["scss"] = regionTagREsByExt["css"];
+regionTagREsByExt["coffee"] = regionTagREsByExt["cs"];
+regionTagREsByExt["php"] = regionTagREsByExt["cs"];
+regionTagREsByExt["ps1"] = regionTagREsByExt["cs"];
+regionTagREsByExt["py"] = regionTagREsByExt["cs"];
+regionTagREsByExt["js"] = regionTagREsByExt["ts"];

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

@@ -131,6 +131,7 @@ let PackagePlugin = (() => {
             }
             if (this.readme) {
                 // Readme path provided, read only that file.
+                this.application.watchFile(this.readme);
                 try {
                     this.readmeContents = readFile(this.readme);
                     this.readmeFile = this.readme;
@@ -145,6 +146,7 @@ let PackagePlugin = (() => {
                 if (result) {
                     this.readmeFile = result.file;
                     this.readmeContents = result.content;
+                    this.application.watchFile(this.readmeFile);
                 }
             }
         }

package/dist/lib/converter/symbols.js

@@ -401,8 +401,13 @@ function convertProperty(context, symbol, exportSymbol) {
         return;
     }
     // Special case: We pretend properties are methods if they look like methods.
-    // This happens with mixins / weird inheritance.
-    if (declarations.length &&
+    // This happens with mixins / weird inheritance. Don't do this if the type
+    // doesn't have call signatures to avoid converting non-functions. This can
+    // happen if @class is used and functions are converted to their return type
+    // with a mapped type (e.g. with Vue's `computed` properties)
+    const type = context.checker.getTypeOfSymbol(symbol);
+    if (type.getCallSignatures().length &&
+        declarations.length &&
         declarations.every((decl) => ts.isMethodSignature(decl) || ts.isMethodDeclaration(decl))) {
         return convertFunctionOrMethod(context, symbol, exportSymbol);
     }
@@ -420,7 +425,7 @@ function convertProperty(context, symbol, exportSymbol) {
         ? ReflectionKind.Variable
         : ReflectionKind.Property, symbol, exportSymbol);
     const declaration = symbol.getDeclarations()?.[0];
-    let parameterType;
+    let parameterTypeNode;
     if (declaration &&
         (ts.isPropertyDeclaration(declaration) ||
             ts.isPropertySignature(declaration) ||
@@ -429,7 +434,7 @@ function convertProperty(context, symbol, exportSymbol) {
             ts.isPropertyAssignment(declaration))) {
         if (!ts.isPropertyAccessExpression(declaration) &&
             !ts.isPropertyAssignment(declaration)) {
-            parameterType = declaration.type;
+            parameterTypeNode = declaration.type;
         }
         setModifiers(symbol, declaration, reflection);
     }
@@ -437,8 +442,12 @@ function convertProperty(context, symbol, exportSymbol) {
         setSymbolModifiers(symbol, reflection);
     }
     reflection.defaultValue = declaration && convertDefaultValue(declaration);
-    reflection.type = context.converter.convertType(context.withScope(reflection), (context.convertingTypeNode ? parameterType : void 0) ??
-        context.checker.getTypeOfSymbol(symbol));
+    if (context.convertingTypeNode && parameterTypeNode) {
+        reflection.type = context.converter.convertType(context.withScope(reflection), parameterTypeNode);
+    }
+    else {
+        reflection.type = context.converter.convertType(context.withScope(reflection), context.checker.getTypeOfSymbol(symbol), parameterTypeNode);
+    }
     if (reflection.flags.isOptional) {
         reflection.type = removeUndefined(reflection.type);
     }
@@ -533,7 +542,12 @@ function convertVariable(context, symbol, exportSymbol) {
         // Otherwise we might have destructuring
         typeNode = declaration.type;
     }
-    reflection.type = context.converter.convertType(context.withScope(reflection), typeNode ?? type);
+    if (typeNode) {
+        reflection.type = context.converter.convertType(context.withScope(reflection), typeNode);
+    }
+    else {
+        reflection.type = context.converter.convertType(context.withScope(reflection), type, typeNode);
+    }
     setModifiers(symbol, declaration, reflection);
     reflection.defaultValue = convertDefaultValue(declaration);
     context.finalizeDeclarationReflection(reflection);

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

@@ -4,7 +4,7 @@ import type { Context } from "./context.js";
 export interface TypeConverter<TNode extends ts.TypeNode = ts.TypeNode, TType extends ts.Type = ts.Type> {
     kind: TNode["kind"][];
     convert(context: Context, node: TNode): SomeType;
-    convertType(context: Context, type: TType, node: TNode): SomeType;
+    convertType(context: Context, type: TType, serializedNode: TNode, originalNode: ts.TypeNode | undefined): SomeType;
 }
 export declare function loadConverters(): void;
-export declare function convertType(context: Context, typeOrNode: ts.Type | ts.TypeNode | undefined): SomeType;
+export declare function convertType(context: Context, typeOrNode: ts.Type | ts.TypeNode | undefined, maybeNode?: ts.TypeNode): SomeType;

package/dist/lib/converter/types.js

@@ -41,6 +41,7 @@ export function loadConverters() {
         tupleConverter,
         typeOperatorConverter,
         unionConverter,
+        jSDocTypeExpressionConverter,
         // Only used if skipLibCheck: true
         jsDocNullableTypeConverter,
         jsDocNonNullableTypeConverter,
@@ -65,7 +66,7 @@ function maybeConvertType(context, typeOrNode) {
     return convertType(context, typeOrNode);
 }
 let typeConversionDepth = 0;
-export function convertType(context, typeOrNode) {
+export function convertType(context, typeOrNode, maybeNode) {
     if (!typeOrNode) {
         return new IntrinsicType("any");
     }
@@ -108,7 +109,7 @@ export function convertType(context, typeOrNode) {
         }
         seenTypes.add(typeOrNode.id);
         ++typeConversionDepth;
-        const result = converter.convertType(context, typeOrNode, node);
+        const result = converter.convertType(context, typeOrNode, node, maybeNode);
         --typeConversionDepth;
         seenTypes.delete(typeOrNode.id);
         return result;
@@ -286,8 +287,10 @@ const jsDocVariadicTypeConverter = {
     convert(context, node) {
         return new ArrayType(convertType(context, node.type));
     },
-    // Should just be an ArrayType
-    convertType: requestBugReport,
+    convertType(context, type, _node, origNode) {
+        assert(isTypeReference(type));
+        return arrayConverter.convertType(context, type, null, origNode);
+    },
 };
 const keywordNames = {
     [ts.SyntaxKind.AnyKeyword]: "any",
@@ -442,14 +445,14 @@ const referenceConverter = {
             // This might not actually be safe, it appears that it is in the relatively small
             // amount of testing I've done with it, but I wouldn't be surprised if someone manages
             // to find a crash.
-            return typeLiteralConverter.convertType(context, type, null);
+            return typeLiteralConverter.convertType(context, type, null, undefined);
         }
         const name = node.typeName.getText();
         const ref = ReferenceType.createSymbolReference(context.resolveAliasedSymbol(symbol), context, name);
         ref.typeArguments = node.typeArguments?.map((type) => convertType(context, type));
         return ref;
     },
-    convertType(context, type, node) {
+    convertType(context, type, node, originalNode) {
         // typeName.symbol handles the case where this is a union which happens to refer
         // to an enumeration. TS doesn't put the symbol on the type for some reason, but
         // does add it to the constructed type node.
@@ -468,7 +471,7 @@ const referenceConverter = {
             // This might not actually be safe, it appears that it is in the relatively small
             // amount of testing I've done with it, but I wouldn't be surprised if someone manages
             // to find a crash.
-            return typeLiteralConverter.convertType(context, type, null);
+            return typeLiteralConverter.convertType(context, type, null, undefined);
         }
         let name;
         if (ts.isIdentifier(node.typeName)) {
@@ -490,21 +493,14 @@ const referenceConverter = {
             ];
         }
         else {
-            // Default type arguments are filled with a reference to the default
-            // type. As TS doesn't support specifying earlier defaults, we know
-            // that this will only filter out type arguments which aren't specified
-            // by the user.
-            let ignoredArgs;
-            if (isTypeReference(type)) {
-                ignoredArgs = type.target.typeParameters
-                    ?.map((p) => p.getDefault())
-                    .filter((x) => !!x);
-            }
             const args = type.aliasSymbol
                 ? type.aliasTypeArguments
                 : type.typeArguments;
+            const maxArgLength = originalNode && ts.isTypeReferenceNode(originalNode)
+                ? (originalNode.typeArguments?.length ?? 0)
+                : args?.length;
             ref.typeArguments = args
-                ?.filter((ref) => !ignoredArgs?.includes(ref))
+                ?.slice(0, maxArgLength)
                 .map((ref) => convertType(context, ref));
         }
         return ref;
@@ -708,6 +704,13 @@ const unionConverter = {
         return new UnionType(types);
     },
 };
+const jSDocTypeExpressionConverter = {
+    kind: [ts.SyntaxKind.JSDocTypeExpression],
+    convert(context, node) {
+        return convertType(context, node.type);
+    },
+    convertType: requestBugReport,
+};
 const jsDocNullableTypeConverter = {
     kind: [ts.SyntaxKind.JSDocNullableType],
     convert(context, node) {

package/dist/lib/internationalization/internationalization.js

@@ -222,7 +222,9 @@ export class Internationalization {
      */
     getSupportedLanguages() {
         return unique([
-            ...readdirSync(join(fileURLToPath(import.meta.url), "../locales")).map((x) => x.substring(0, x.indexOf("."))),
+            ...readdirSync(join(fileURLToPath(import.meta.url), "../locales"))
+                .map((x) => x.substring(0, x.indexOf(".")))
+                .filter((x) => x !== "jp"),
             ...this.allTranslations.keys(),
         ]).sort();
     }

package/dist/lib/internationalization/locales/en.cjs

@@ -8,6 +8,8 @@ module.exports = {
     loaded_plugin_0: `Loaded plugin {0}`,
     solution_not_supported_in_watch_mode: "The provided tsconfig file looks like a solution style tsconfig, which is not supported in watch mode",
     strategy_not_supported_in_watch_mode: "entryPointStrategy must be set to either resolve or expand for watch mode",
+    file_0_changed_restarting: "Configuration file {0} changed: full restart required...",
+    file_0_changed_rebuilding: "File {0} changed: rebuilding output...",
     found_0_errors_and_1_warnings: "Found {0} errors and {1} warnings",
     output_0_could_not_be_generated: "{0} output could not be generated due to the errors above",
     output_0_generated_at_1: "{0} generated at {1}",
@@ -82,6 +84,16 @@ module.exports = {
     reflection_0_tried_to_merge_into_child_1: `The reflection {0} tried to use @mergeModuleWith to merge into one of its children: {1}`,
     include_0_in_1_specified_2_resolved_to_3_does_not_exist: `{0} tag in comment for {1} specified "{2}" to include, which was resolved to "{3}" and does not exist or is not a file.`,
     include_0_in_1_specified_2_circular_include_3: `{0} tag in comment for {1} specified "{2}" to include, which resulted in a circular include:\n\t{3}`,
+    include_0_tag_in_1_specified_2_file_3_region_4_region_not_found: `{0} tag in {1} specified "{2}" to include from file "{3}" the region labeled "{4}", but the region was not found in the file.`,
+    include_0_tag_in_1_region_2_region_not_supported: `{0} tag in {1} specified "{2}", but regions are not supported for this file extension.`,
+    include_0_tag_in_1_specified_2_file_3_region_4_region_close_not_found: `{0} tag in {1} specified "{2}" to include from file "{3}" the region labeled "{4}", but the region closing comment was not found in the file.`,
+    include_0_tag_in_1_specified_2_file_3_region_4_region_open_not_found: `{0} tag in {1} specified "{2}" to include from file "{3}" the region labeled "{4}", but the region opening comment was not found in the file.`,
+    include_0_tag_in_1_specified_2_file_3_region_4_region_close_found_multiple_times: `{0} tag in {1} specified "{2}" to include from file "{3}" the region labeled {4}, but the region closing comment was found multiple times in the file.`,
+    include_0_tag_in_1_specified_2_file_3_region_4_region_open_found_multiple_times: `{0} tag in {1} specified "{2}" to include from file "{3}" the region labeled {4}, but the region opening comment was found multiple times in the file.`,
+    include_0_tag_in_1_specified_2_file_3_region_4_region_found_multiple_times: `{0} tag in {1} specified "{2}" to include from file "{3}" the region labeled {4}, but the region was found multiple times in the file.`,
+    include_0_tag_in_1_specified_2_file_3_region_4_region_empty: `{0} tag in {1} specified "{2}" to include from file "{3}" the region labeled {4}. The region was found but it is empty or contains only whitespace.`,
+    include_0_tag_in_1_specified_2_file_3_lines_4_invalid_range: `{0} tag in {1} specified "{2}" to include from file "{3}" the lines {4}, but an invalid range was specified.`,
+    include_0_tag_in_1_specified_2_file_3_lines_4_but_only_5_lines: `{0} tag in {1} specified "{2}" to include from file "{3}" the lines {4}, but the file only has {5} lines.`,
     // output plugins
     custom_css_file_0_does_not_exist: `Custom CSS file at {0} does not exist`,
     custom_js_file_0_does_not_exist: `Custom JavaScript file at {0} does not exist`,
@@ -364,9 +376,11 @@ module.exports = {
     theme_search: "Search",
     theme_menu: "Menu",
     theme_permalink: "Permalink",
+    theme_folder: "Folder",
     // Used by the frontend JS
     // For the English translations only, these should also be added to
     // src/lib/output/themes/default/assets/typedoc/Application.ts
+    // Also uses theme_folder and singular kinds
     theme_copy: "Copy",
     theme_copied: "Copied!",
     theme_normally_hidden: "This member is normally hidden due to your filter settings.",

package/dist/lib/internationalization/locales/en.d.cts

@@ -5,6 +5,8 @@ declare const _default: {
     readonly loaded_plugin_0: "Loaded plugin {0}";
     readonly solution_not_supported_in_watch_mode: "The provided tsconfig file looks like a solution style tsconfig, which is not supported in watch mode";
     readonly strategy_not_supported_in_watch_mode: "entryPointStrategy must be set to either resolve or expand for watch mode";
+    readonly file_0_changed_restarting: "Configuration file {0} changed: full restart required...";
+    readonly file_0_changed_rebuilding: "File {0} changed: rebuilding output...";
     readonly found_0_errors_and_1_warnings: "Found {0} errors and {1} warnings";
     readonly output_0_could_not_be_generated: "{0} output could not be generated due to the errors above";
     readonly output_0_generated_at_1: "{0} generated at {1}";
@@ -76,6 +78,16 @@ declare const _default: {
     readonly reflection_0_tried_to_merge_into_child_1: "The reflection {0} tried to use @mergeModuleWith to merge into one of its children: {1}";
     readonly include_0_in_1_specified_2_resolved_to_3_does_not_exist: "{0} tag in comment for {1} specified \"{2}\" to include, which was resolved to \"{3}\" and does not exist or is not a file.";
     readonly include_0_in_1_specified_2_circular_include_3: "{0} tag in comment for {1} specified \"{2}\" to include, which resulted in a circular include:\n\t{3}";
+    readonly include_0_tag_in_1_specified_2_file_3_region_4_region_not_found: "{0} tag in {1} specified \"{2}\" to include from file \"{3}\" the region labeled \"{4}\", but the region was not found in the file.";
+    readonly include_0_tag_in_1_region_2_region_not_supported: "{0} tag in {1} specified \"{2}\", but regions are not supported for this file extension.";
+    readonly include_0_tag_in_1_specified_2_file_3_region_4_region_close_not_found: "{0} tag in {1} specified \"{2}\" to include from file \"{3}\" the region labeled \"{4}\", but the region closing comment was not found in the file.";
+    readonly include_0_tag_in_1_specified_2_file_3_region_4_region_open_not_found: "{0} tag in {1} specified \"{2}\" to include from file \"{3}\" the region labeled \"{4}\", but the region opening comment was not found in the file.";
+    readonly include_0_tag_in_1_specified_2_file_3_region_4_region_close_found_multiple_times: "{0} tag in {1} specified \"{2}\" to include from file \"{3}\" the region labeled {4}, but the region closing comment was found multiple times in the file.";
+    readonly include_0_tag_in_1_specified_2_file_3_region_4_region_open_found_multiple_times: "{0} tag in {1} specified \"{2}\" to include from file \"{3}\" the region labeled {4}, but the region opening comment was found multiple times in the file.";
+    readonly include_0_tag_in_1_specified_2_file_3_region_4_region_found_multiple_times: "{0} tag in {1} specified \"{2}\" to include from file \"{3}\" the region labeled {4}, but the region was found multiple times in the file.";
+    readonly include_0_tag_in_1_specified_2_file_3_region_4_region_empty: "{0} tag in {1} specified \"{2}\" to include from file \"{3}\" the region labeled {4}. The region was found but it is empty or contains only whitespace.";
+    readonly include_0_tag_in_1_specified_2_file_3_lines_4_invalid_range: "{0} tag in {1} specified \"{2}\" to include from file \"{3}\" the lines {4}, but an invalid range was specified.";
+    readonly include_0_tag_in_1_specified_2_file_3_lines_4_but_only_5_lines: "{0} tag in {1} specified \"{2}\" to include from file \"{3}\" the lines {4}, but the file only has {5} lines.";
     readonly custom_css_file_0_does_not_exist: "Custom CSS file at {0} does not exist";
     readonly custom_js_file_0_does_not_exist: "Custom JavaScript file at {0} does not exist";
     readonly unsupported_highlight_language_0_not_highlighted_in_comment_for_1: "Unsupported highlight language {0} will not be highlighted in comment for {1}";
@@ -336,6 +348,7 @@ declare const _default: {
     readonly theme_search: "Search";
     readonly theme_menu: "Menu";
     readonly theme_permalink: "Permalink";
+    readonly theme_folder: "Folder";
     readonly theme_copy: "Copy";
     readonly theme_copied: "Copied!";
     readonly theme_normally_hidden: "This member is normally hidden due to your filter settings.";