@tsofist/schema-forge 2.8.0 → 2.10.0-next.1

package/lib/{generator/types-generator.js → schema-generator/generate-drafts.js}

@@ -1,120 +1,103 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateDraftTypeFiles = generateDraftTypeFiles;
-const promises_1 = require("fs/promises");
-const path_1 = require("path");
-const as_bool_1 = require("@tsofist/stem/lib/as-bool");
+const promises_1 = require("node:fs/promises");
+const node_path_1 = require("node:path");
 const error_1 = require("@tsofist/stem/lib/error");
 const text_builder_1 = require("@tsofist/stem/lib/string/text-builder");
 const ts_json_schema_generator_1 = require("ts-json-schema-generator");
 const Config_1 = require("ts-json-schema-generator/dist/src/Config");
 const typescript_1 = require("typescript");
-const index_1 = require("../index");
-const types_1 = require("../types");
-const tsc_1 = require("../util/tsc");
-const types_2 = require("./types");
+const api_signature_1 = require("../definition-info/api-signature");
+const helpers_tsc_1 = require("./helpers-tsc");
+const types_1 = require("./types");
+/**
+ * @internal
+ */
 async function generateDraftTypeFiles(options) {
-    const explicitPublic = (0, as_bool_1.asBool)(options.explicitPublic, true);
     const sourcesTypesGeneratorConfig = {
         ...Config_1.DEFAULT_CONFIG,
-        ...types_2.SG_CONFIG_DEFAULTS,
-        expose: options.expose ?? types_2.SG_CONFIG_DEFAULTS.expose,
+        ...types_1.SFG_CONFIG_DEFAULTS,
+        expose: options.expose ?? types_1.SFG_CONFIG_DEFAULTS.expose,
         path: options.sourcesPattern.length > 1 ? undefined : options.sourcesPattern[0],
         tsconfig: options.tsconfig,
         discriminatorType: Config_1.DEFAULT_CONFIG.discriminatorType,
-        ...types_2.SG_CONFIG_MANDATORY,
+        ...types_1.SFG_CONFIG_MANDATORY,
     };
-    const files = [];
-    let definitions = [];
-    const program = (0, ts_json_schema_generator_1.createProgram)(sourcesTypesGeneratorConfig);
-    const checker = program.getTypeChecker();
-    const compilerOptions = program.getCompilerOptions();
-    const compilerHost = (0, typescript_1.createCompilerHost)(compilerOptions);
-    const fileNames = program.getRootFileNames();
-    const namesBySourceFile = new Map();
-    for (const sourceFileName of fileNames) {
-        const context = {
-            program,
-            compilerOptions,
-            compilerHost,
-            typeChecker: checker,
-            options,
-            fileContent: [],
-            registerDefinition(...names) {
-                let set = namesBySourceFile.get(sourceFileName);
-                if (!set)
-                    namesBySourceFile.set(sourceFileName, (set = new Set()));
-                for (const name of names) {
-                    definitions.push(name);
-                    set.add(name);
-                }
-            },
-        };
-        const source = program.getSourceFile(sourceFileName);
-        if (!source)
-            continue;
-        const statements = [...source.statements];
-        while (statements.length) {
-            const statement = statements.pop();
-            if (!statement)
-                break;
-            if ((0, typescript_1.isExportDeclaration)(statement)) {
-                processExportDeclaration(statement, sourceFileName, statements, context);
-                continue;
-            }
-            if (explicitPublic) {
-                const isPublic = (0, typescript_1.getJSDocPublicTag)(statement) != null;
-                if (!isPublic)
-                    continue;
-            }
-            else {
-                const isPrivate = (0, typescript_1.getJSDocPrivateTag)(statement) != null || (0, tsc_1.hasJSDocTag)(statement, 'internal');
-                if (isPrivate)
-                    continue;
-            }
-            switch (statement.kind) {
-                case typescript_1.SyntaxKind.ImportDeclaration:
-                case typescript_1.SyntaxKind.VariableStatement:
-                    continue;
-                case typescript_1.SyntaxKind.EnumDeclaration:
-                    passDeclaration(statement, context);
-                    break;
-                case typescript_1.SyntaxKind.TypeAliasDeclaration:
-                    passDeclaration(statement, context);
-                    break;
-                case typescript_1.SyntaxKind.InterfaceDeclaration:
-                    if ((0, tsc_1.hasJSDocTag)(statement, 'api')) {
-                        processAPIInterfaceDeclaration(statement, context);
-                    }
-                    else {
-                        passDeclaration(statement, context);
-                    }
-                    break;
-                default:
-                    console.error(`[current statement]`, statement.getText(), '\n');
-                    (0, error_1.raise)(`Unsupported statement kind: ${statement.kind} (${typescript_1.SyntaxKind[statement.kind]}) in ${sourceFileName}`);
-            }
-        }
-        const outputFileName = `${(0, path_1.dirname)(sourceFileName)}/${(0, path_1.basename)(sourceFileName, (0, path_1.extname)(sourceFileName))}${types_2.TMP_FILES_SUFFIX}.ts`;
-        await (0, promises_1.writeFile)(outputFileName, [source.getFullText(), context.fileContent.join('\n')].join('\n'), { encoding: 'utf8' });
-        files.push(outputFileName);
+    // const files: string[] = [];
+    const ctx = createContext(options, sourcesTypesGeneratorConfig);
+    let definitions = ctx.definitions;
+    for (const sourceFileName of ctx.fileNames) {
+        ctx.currentSourceFileName = sourceFileName;
+        ctx.currentFileContent = [];
+        await processSourceFile(sourceFileName, ctx);
     }
     if (options.definitionsFilter) {
         definitions = definitions.filter(options.definitionsFilter);
     }
     definitions.sort();
     return {
-        sourcesTypesGeneratorConfig,
-        files,
+        files: ctx.files,
         definitions,
-        namesBySourceFile,
+        sourcesTypesGeneratorConfig,
+        namesBySourceFile: ctx.namesBySourceFile,
     };
 }
-const S = ' '.repeat(4);
+async function processSourceFile(sourceFileName, context) {
+    const source = context.program.getSourceFile(sourceFileName);
+    if (!source)
+        return;
+    const explicitPublic = context.options.explicitPublic ?? true;
+    const statements = [...source.statements];
+    const outputFileName = `${(0, node_path_1.dirname)(sourceFileName)}/${(0, node_path_1.basename)(sourceFileName, (0, node_path_1.extname)(sourceFileName))}${types_1.TMP_FILES_SUFFIX}.ts`;
+    while (statements.length) {
+        const statement = statements.pop();
+        if (!statement)
+            break;
+        if ((0, typescript_1.isExportDeclaration)(statement)) {
+            processExportDeclaration(statement, statements, context);
+            continue;
+        }
+        if (explicitPublic) {
+            const isPublic = (0, typescript_1.getJSDocPublicTag)(statement) != null;
+            if (!isPublic)
+                continue;
+        }
+        else {
+            const isPrivate = (0, typescript_1.getJSDocPrivateTag)(statement) != null || (0, helpers_tsc_1.hasJSDocTag)(statement, 'internal');
+            if (isPrivate)
+                continue;
+        }
+        switch (statement.kind) {
+            case typescript_1.SyntaxKind.ImportDeclaration:
+            case typescript_1.SyntaxKind.VariableStatement:
+                continue;
+            case typescript_1.SyntaxKind.EnumDeclaration:
+                passDeclaration(statement, context);
+                break;
+            case typescript_1.SyntaxKind.TypeAliasDeclaration:
+                passDeclaration(statement, context);
+                break;
+            case typescript_1.SyntaxKind.InterfaceDeclaration:
+                if ((0, helpers_tsc_1.hasJSDocTag)(statement, 'api')) {
+                    processAPIInterfaceDeclaration(statement, context);
+                }
+                else {
+                    passDeclaration(statement, context);
+                }
+                break;
+            default:
+                console.error(`[current statement]`, statement.getText(), '\n');
+                (0, error_1.raise)(`Unsupported statement kind: ${statement.kind} (${typescript_1.SyntaxKind[statement.kind]}) in ${sourceFileName}`);
+        }
+    }
+    await (0, promises_1.writeFile)(outputFileName, [source.getFullText(), context.currentFileContent.join('\n')].join('\n'), { encoding: 'utf8' });
+    context.files.push(outputFileName);
+}
 function passDeclaration(statement, context) {
-    context.registerDefinition(statement.name.getText());
+    context.registerDefinition(context.currentSourceFileName, statement.name.getText());
 }
-function processExportDeclaration(statement, sourceFileName, list, context) {
+function processExportDeclaration(statement, list, context) {
     if (!statement.exportClause ||
         !(0, typescript_1.isNamedExports)(statement.exportClause) ||
         !statement.moduleSpecifier ||
@@ -127,12 +110,12 @@ function processExportDeclaration(statement, sourceFileName, list, context) {
     }
     let module;
     const moduleSpecifier = statement.moduleSpecifier.text;
-    if (!(0, path_1.isAbsolute)(moduleSpecifier)) {
-        const fn = (0, path_1.resolve)((0, path_1.dirname)(sourceFileName), moduleSpecifier) + '.ts';
+    if (!(0, node_path_1.isAbsolute)(moduleSpecifier)) {
+        const fn = (0, node_path_1.resolve)((0, node_path_1.dirname)(context.currentSourceFileName), moduleSpecifier) + '.ts';
         module = context.program.getSourceFile(fn);
     }
     if (!module) {
-        const filename = (0, tsc_1.resolveModuleFileName)(sourceFileName, moduleSpecifier, context.compilerOptions, context.compilerHost);
+        const filename = (0, helpers_tsc_1.resolveModuleFileName)(context.currentSourceFileName, moduleSpecifier, context.compilerOptions, context.compilerHost);
         if (filename)
             module = context.program.getSourceFile(filename);
     }
@@ -157,9 +140,9 @@ function processExportDeclaration(statement, sourceFileName, list, context) {
 function processAPIInterfaceDeclaration(statement, context) {
     const allowUseFallbackDescription = context.options.allowUseFallbackDescription;
     const definitionsMetaList = [];
-    const interfaceName = (0, tsc_1.readNodeName)(statement);
-    const interfaceGenericText = (0, tsc_1.readInterfaceGenericText)(statement);
-    const interfaceDesc = (0, tsc_1.readJSDocDescription)(statement, allowUseFallbackDescription);
+    const interfaceName = (0, helpers_tsc_1.readNodeName)(statement);
+    const interfaceGenericText = (0, helpers_tsc_1.readInterfaceGenericText)(statement);
+    const interfaceDesc = (0, helpers_tsc_1.readJSDocDescription)(statement, allowUseFallbackDescription);
     const interfaceDeprecated = (0, typescript_1.getTextOfJSDocComment)((0, typescript_1.getJSDocDeprecatedTag)(statement)?.comment);
     function onSignature(method, memberName, memberDescription, deprecated) {
         const minArgsNum = countRequiredParams(method.parameters);
@@ -170,7 +153,7 @@ function processAPIInterfaceDeclaration(statement, context) {
             const name = parameter.name.getText();
             argsNames.push(name);
             const text = parameter.type?.getText() || (0, error_1.raise)(`No type specified for ${name}`);
-            let desc = (0, tsc_1.readJSDocDescription)(parameter, allowUseFallbackDescription, false);
+            let desc = (0, helpers_tsc_1.readJSDocDescription)(parameter, allowUseFallbackDescription, false);
             desc = desc ? `/** @description ${desc} */ ` : '';
             return `${S}${desc}${name}: ${text}`;
         })
@@ -180,9 +163,9 @@ function processAPIInterfaceDeclaration(statement, context) {
             return `${item}${index + 1 <= minArgsNum ? '*' : ''}`;
         })
             .join(', ');
-        const resultTypeName = (0, tsc_1.readMemberTypeName)(method);
-        const definitionNameArgs = (0, index_1.buildAPIInterfaceSchemaSignature)(interfaceName, memberName, types_1.SchemaForgeSignatureSuffix.MethodArguments);
-        const definitionNameResult = (0, index_1.buildAPIInterfaceSchemaSignature)(interfaceName, memberName, types_1.SchemaForgeSignatureSuffix.MethodResult);
+        const resultTypeName = (0, helpers_tsc_1.readMemberTypeName)(method);
+        const definitionNameArgs = (0, api_signature_1.buildAPIMethodArgsSDS)(interfaceName, memberName);
+        const definitionNameResult = (0, api_signature_1.buildAPIMethodResultSDS)(interfaceName, memberName);
         const comment = `Method:${interfaceName}#${memberName}`;
         definitionsMetaList.push({
             name: memberName,
@@ -190,12 +173,12 @@ function processAPIInterfaceDeclaration(statement, context) {
             deprecated,
             desc: [definitionNameArgs, definitionNameResult],
         });
-        context.registerDefinition(definitionNameArgs, definitionNameResult);
-        context.fileContent.push(...[
-            // ARGUMENTS
+        context.registerDefinition(context.currentSourceFileName, definitionNameArgs, definitionNameResult);
+        context.currentFileContent.push(...[
+            // Arguments ->
             `/**`,
-            ` * @interface ${interfaceName}`,
-            ` * @member ${interfaceName}#${memberName}`,
+            ` * @apiInterface ${interfaceName}`,
+            ` * @apiMember ${interfaceName}#${memberName}`,
             ` * @description Arguments for ${comment} ${argsNames.length ? `(${argsNamesText})` : ''}`,
             ` * @comment ${comment}`,
             ` *`,
@@ -204,10 +187,11 @@ function processAPIInterfaceDeclaration(statement, context) {
             ` */`,
             `export type ${definitionNameArgs} = readonly [\n${argsTypesText}\n];`,
             ``,
-            // RESULT
+            // Result ->
             `/**`,
-            ` * @interface ${interfaceName}`,
-            ` * @member ${interfaceName}#${memberName}`,
+            ` * @apiInterface ${interfaceName}`,
+            ` * @apiMember ${interfaceName}#${memberName}`,
+            ` *`,
             ` * @description Result type for ${comment}`,
             ` * @comment ${comment}`,
             ` */`,
@@ -216,11 +200,11 @@ function processAPIInterfaceDeclaration(statement, context) {
         ]);
     }
     function onMember(member) {
-        const isPrivate = (0, typescript_1.getJSDocPrivateTag)(member) != null || (0, tsc_1.hasJSDocTag)(member, 'internal');
+        const isPrivate = (0, typescript_1.getJSDocPrivateTag)(member) != null || (0, helpers_tsc_1.hasJSDocTag)(member, 'internal');
         if (isPrivate)
             return;
-        const memberName = (0, tsc_1.readNodeName)(member);
-        const memberDescription = (0, tsc_1.readJSDocDescription)(member, allowUseFallbackDescription);
+        const memberName = (0, helpers_tsc_1.readNodeName)(member);
+        const memberDescription = (0, helpers_tsc_1.readJSDocDescription)(member, allowUseFallbackDescription);
         const deprecated = (0, typescript_1.getTextOfJSDocComment)((0, typescript_1.getJSDocDeprecatedTag)(member)?.comment);
         if ((0, typescript_1.isMethodSignature)(member)) {
             onSignature(member, memberName, memberDescription, deprecated);
@@ -234,12 +218,12 @@ function processAPIInterfaceDeclaration(statement, context) {
                     name: memberName,
                     description: memberDescription,
                     deprecated,
-                    desc: (0, tsc_1.readMemberTypeName)(member) || 'unknown',
+                    desc: (0, helpers_tsc_1.readMemberTypeName)(member) || 'unknown',
                 });
             }
         }
     }
-    // inheritance first
+    // Inheritance first
     if (statement.heritageClauses) {
         for (const clause of statement.heritageClauses) {
             for (const type of clause.types) {
@@ -263,8 +247,9 @@ function processAPIInterfaceDeclaration(statement, context) {
             const isMethod = Array.isArray(member.desc);
             membersText.push([
                 `/**`,
-                ` * @interface ${interfaceName}`,
-                ` * @${isMethod ? 'method' : 'property'} ${member.name}`,
+                ` * @apiInterface ${interfaceName}`,
+                ` *`,
+                ` * @${isMethod ? 'apiMethod' : 'apiProperty'} ${member.name}`,
                 member.description && ` * @description ${member.description}`,
                 member.deprecated && ` * @deprecated ${member.deprecated}`,
                 ` * @comment ${isMethod ? 'Method' : 'Property'}:${interfaceName}#${member.name}`,
@@ -276,18 +261,19 @@ function processAPIInterfaceDeclaration(statement, context) {
         }
         const interfaceText = new text_builder_1.TextBuilder([
             `/**`,
-            ` * @interface ${interfaceName}`,
+            ` * @apiInterface ${interfaceName}`,
+            ` *`,
             interfaceDesc && ` * @description ${interfaceDesc}`,
             interfaceDeprecated && ` * @deprecated ${interfaceDeprecated}`,
             ` * @comment Interface:${interfaceName}`,
             ` */`,
-            `export interface ${(0, index_1.buildAPIInterfaceSchemaSignature)(interfaceName)}${interfaceGenericText} {`,
+            `export interface ${(0, api_signature_1.buildAPIInterfaceSDS)(interfaceName)}${interfaceGenericText} {`,
             membersText.stringify('\n'),
             `}`,
             ``,
         ]);
-        context.registerDefinition((0, index_1.buildAPIInterfaceSchemaSignature)(interfaceName));
-        context.fileContent.push(interfaceText.stringify('\n'));
+        context.registerDefinition(context.currentSourceFileName, (0, api_signature_1.buildAPIInterfaceSDS)(interfaceName));
+        context.currentFileContent.push(interfaceText.stringify('\n'));
     }
 }
 function countRequiredParams(params) {
@@ -301,3 +287,37 @@ function countRequiredParams(params) {
     }
     return result;
 }
+function createContext(options, sourcesTypesGeneratorConfig) {
+    const program = (0, ts_json_schema_generator_1.createProgram)(sourcesTypesGeneratorConfig);
+    const checker = program.getTypeChecker();
+    const compilerOptions = program.getCompilerOptions();
+    const compilerHost = (0, typescript_1.createCompilerHost)(compilerOptions);
+    const fileNames = program.getRootFileNames();
+    const namesBySourceFile = new Map();
+    const definitions = [];
+    const files = [];
+    const currentFileContent = [];
+    return {
+        currentFileContent,
+        currentSourceFileName: '',
+        namesBySourceFile,
+        fileNames,
+        definitions,
+        program,
+        compilerOptions,
+        compilerHost,
+        typeChecker: checker,
+        options,
+        files,
+        registerDefinition(sourceFilename, ...names) {
+            let set = namesBySourceFile.get(sourceFilename);
+            if (!set)
+                namesBySourceFile.set(sourceFilename, (set = new Set()));
+            for (const name of names) {
+                definitions.push(name);
+                set.add(name);
+            }
+        },
+    };
+}
+const S = ' '.repeat(4);

package/lib/schema-generator/generate-schema.d.ts

@@ -0,0 +1,15 @@
+import './extended-annotations-reader';
+import { SchemaObject } from 'ajv';
+import { CompletedConfig } from 'ts-json-schema-generator';
+import { ForgeSchemaOptions } from '../types';
+/**
+ * @internal
+ */
+export declare function generateSchemaByDraftTypes(options: InternalOptions): Promise<SchemaObject>;
+interface InternalOptions extends ForgeSchemaOptions {
+    tsconfig: string;
+    definitions: readonly string[];
+    sourcesTypesGeneratorConfig: CompletedConfig;
+}
+export {};
+//# sourceMappingURL=generate-schema.d.ts.map

package/lib/schema-generator/generate-schema.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"generate-schema.d.ts","sourceRoot":"","sources":["../../src/schema-generator/generate-schema.ts"],"names":[],"mappings":"AAAA,OAAO,+BAA+B,CAAC;AAGvC,OAAY,EAAE,YAAY,EAAE,MAAM,KAAK,CAAC;AAExC,OAAO,EAGH,eAAe,EAgBlB,MAAM,0BAA0B,CAAC;AAelC,OAAO,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAC;AAM9C;;GAEG;AACH,wBAAsB,0BAA0B,CAAC,OAAO,EAAE,eAAe,GAAG,OAAO,CAAC,YAAY,CAAC,CAqGhG;AAsGD,UAAU,eAAgB,SAAQ,kBAAkB;IAChD,QAAQ,EAAE,MAAM,CAAC;IACjB,WAAW,EAAE,SAAS,MAAM,EAAE,CAAC;IAC/B,2BAA2B,EAAE,eAAe,CAAC;CAChD"}

package/lib/{generator/schema-generator.js → schema-generator/generate-schema.js}

@@ -1,15 +1,19 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateSchemaByDraftTypes = generateSchemaByDraftTypes;
-require("../util/patch.extended-annotations-reader");
+require("./extended-annotations-reader");
 const error_1 = require("@tsofist/stem/lib/error");
 const ajv_1 = require("ajv");
 const jsonpath_plus_1 = require("jsonpath-plus");
 const ts_json_schema_generator_1 = require("ts-json-schema-generator");
 const typescript_1 = require("typescript");
-const sort_properties_1 = require("../util/sort-properties");
-const tsc_1 = require("../util/tsc");
+const helpers_tsc_1 = require("./helpers-tsc");
+const shrink_definition_name_1 = require("./shrink-definition-name");
+const sort_properties_1 = require("./sort-properties");
 const types_1 = require("./types");
+/**
+ * @internal
+ */
 async function generateSchemaByDraftTypes(options) {
     {
         const seen = new Set();
@@ -22,14 +26,12 @@ async function generateSchemaByDraftTypes(options) {
     const allowUseFallbackDescription = options.allowUseFallbackDescription;
     const generatorConfig = {
         ...ts_json_schema_generator_1.DEFAULT_CONFIG,
-        ...types_1.SG_CONFIG_DEFAULTS,
-        expose: options.expose ?? types_1.SG_CONFIG_DEFAULTS.expose,
+        ...types_1.SFG_CONFIG_DEFAULTS,
+        expose: options.expose ?? types_1.SFG_CONFIG_DEFAULTS.expose,
         path: `${options.sourcesDirectoryPattern}/*${types_1.TMP_FILES_SUFFIX}.ts`,
         tsconfig: options.tsconfig,
-        discriminatorType: options.openapiCompatible
-            ? 'open-api'
-            : ts_json_schema_generator_1.DEFAULT_CONFIG.discriminatorType,
-        ...types_1.SG_CONFIG_MANDATORY,
+        discriminatorType: options.discriminatorType ?? ts_json_schema_generator_1.DEFAULT_CONFIG.discriminatorType,
+        ...types_1.SFG_CONFIG_MANDATORY,
     };
     const generatorProgram = (0, ts_json_schema_generator_1.createProgram)(generatorConfig);
     // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
@@ -37,6 +39,7 @@ async function generateSchemaByDraftTypes(options) {
     const parser = (0, ts_json_schema_generator_1.createParser)(generatorProgram, options.sourcesTypesGeneratorConfig, (parser) => {
         parser.addNodeParser(new TupleTypeParser(parser, allowUseFallbackDescription));
         parser.addNodeParser(new ArrayLiteralExpressionIdentifierParser(typeChecker));
+        parser.addNodeParser(new TypeofNodeParserEx(typeChecker, parser));
     });
     const formatter = (0, ts_json_schema_generator_1.createFormatter)(options.sourcesTypesGeneratorConfig);
     const generator = new ts_json_schema_generator_1.SchemaGenerator(generatorProgram, parser, formatter, generatorConfig);
@@ -54,18 +57,23 @@ async function generateSchemaByDraftTypes(options) {
         const schema = generator.createSchema(definitionName);
         Object.assign(result.definitions, schema.definitions);
     }
-    if (options.shrinkDefinitionNames) {
+    const shrinkDefinitionNames = !options.shrinkDefinitionNames
+        ? undefined
+        : options.shrinkDefinitionNames === true
+            ? shrink_definition_name_1.shrinkDefinitionName
+            : options.shrinkDefinitionNames;
+    if (shrinkDefinitionNames) {
         const replacement = new Set();
         // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
         for (const name of Object.keys(result.definitions)) {
-            const r = options.shrinkDefinitionNames(name);
-            if (r) {
-                if (replacement.has(r) || r in result.definitions) {
-                    (0, error_1.raise)(`Duplicate replacement definition name: ${r}`);
+            const shortName = shrinkDefinitionNames(name);
+            if (shortName) {
+                if (replacement.has(shortName) || shortName in result.definitions) {
+                    (0, error_1.raise)(`Duplicate replacement definition name: ${shortName}`);
                 }
                 // rename property
                 // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
-                result.definitions[r] = result.definitions[name];
+                result.definitions[shortName] = result.definitions[name];
                 // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
                 delete result.definitions[name];
                 // rename references
@@ -75,20 +83,20 @@ async function generateSchemaByDraftTypes(options) {
                     eval: 'safe',
                 });
                 targets?.forEach((item) => {
-                    item.$ref = item.$ref.replace(`#/definitions/${name}`, `#/definitions/${r}`);
+                    item.$ref = item.$ref.replace(`#/definitions/${name}`, `#/definitions/${shortName}`);
                 });
             }
         }
     }
     result.definitions = Object.fromEntries(Object.entries((result.definitions || {})).sort());
     if (options.sortObjectProperties)
-        (0, sort_properties_1.sortProperties)(result.definitions);
+        (0, sort_properties_1.sortSchemaProperties)(result.definitions);
     await new ajv_1.default({
         strict: true,
         allErrors: true,
         strictSchema: true,
         strictTypes: false,
-        strictTuples: false,
+        strictTuples: true,
         allowUnionTypes: true,
     }).validateSchema(result, true);
     return result;
@@ -96,6 +104,25 @@ async function generateSchemaByDraftTypes(options) {
 function escapeDefinitionNameForJSONPath(value) {
     return value.replace(/\\/g, '\\\\').replace(/"/g, '\\"');
 }
+class TypeofNodeParserEx extends ts_json_schema_generator_1.TypeofNodeParser {
+    createType(node, context, reference) {
+        const tc = this.typeChecker;
+        let symbol = tc.getSymbolAtLocation(node.exprName);
+        if (symbol && symbol.flags & typescript_1.SymbolFlags.Alias) {
+            symbol = tc.getAliasedSymbol(symbol);
+            const declaration = symbol.valueDeclaration;
+            if (declaration &&
+                (0, typescript_1.isSourceFile)(declaration) &&
+                declaration.fileName.endsWith('.json')) {
+                const statement = declaration.statements.at(0);
+                if (statement && (0, typescript_1.isExpressionStatement)(statement)) {
+                    return this.childNodeParser.createType(statement.expression, context, reference);
+                }
+            }
+        }
+        return super.createType(node, context, reference);
+    }
+}
 class TupleTypeParser {
     constructor(childNodeParser, allowUseFallbackDescription) {
         Object.defineProperty(this, "childNodeParser", {
@@ -118,7 +145,7 @@ class TupleTypeParser {
         const items = node.elements.map((element) => {
             const type = this.childNodeParser.createType(element, context);
             if ((0, typescript_1.isNamedTupleMember)(element)) {
-                const description = (0, tsc_1.readJSDocDescription)(element, this.allowUseFallbackDescription);
+                const description = (0, helpers_tsc_1.readJSDocDescription)(element, this.allowUseFallbackDescription);
                 const nullable = type instanceof ts_json_schema_generator_1.AnnotatedType ? type.isNullable() : false;
                 return description ? new ts_json_schema_generator_1.AnnotatedType(type, { description }, nullable) : type;
             }

package/lib/{util/tsc.d.ts → schema-generator/helpers-tsc.d.ts}

@@ -1,7 +1,8 @@
-import { CompilerHost, CompilerOptions, MethodSignature, NamedDeclaration, Node, PropertySignature, SignatureDeclarationBase } from 'typescript';
+import { type CompilerHost, type CompilerOptions, type MethodSignature, type NamedDeclaration, type Node, type PropertySignature, type SignatureDeclarationBase } from 'typescript';
 export declare function readMemberTypeName(member: MethodSignature | PropertySignature | SignatureDeclarationBase): string | undefined;
 export declare function readJSDocDescription(node: Node, allowUseFallbackDescription: boolean | undefined, allowUseFallbackDescriptionFromParent?: boolean): string | undefined;
 export declare function readNodeName(node: NamedDeclaration): string;
 export declare function readInterfaceGenericText(node: NamedDeclaration): string;
 export declare function hasJSDocTag(statement: Node, tagName: string): boolean;
 export declare function resolveModuleFileName(containingFile: string, moduleName: string, compilerOptions: CompilerOptions, compilerHost: CompilerHost): string | undefined;
+//# sourceMappingURL=helpers-tsc.d.ts.map

package/lib/schema-generator/helpers-tsc.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"helpers-tsc.d.ts","sourceRoot":"","sources":["../../src/schema-generator/helpers-tsc.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,KAAK,YAAY,EACjB,KAAK,eAAe,EAGpB,KAAK,eAAe,EACpB,KAAK,gBAAgB,EACrB,KAAK,IAAI,EACT,KAAK,iBAAiB,EACtB,KAAK,wBAAwB,EAUhC,MAAM,YAAY,CAAC;AAEpB,wBAAgB,kBAAkB,CAC9B,MAAM,EAAE,eAAe,GAAG,iBAAiB,GAAG,wBAAwB,GACvE,MAAM,GAAG,SAAS,CAapB;AAED,wBAAgB,oBAAoB,CAChC,IAAI,EAAE,IAAI,EACV,2BAA2B,EAAE,OAAO,GAAG,SAAS,EAChD,qCAAqC,UAAO,GAC7C,MAAM,GAAG,SAAS,CAsCpB;AAED,wBAAgB,YAAY,CAAC,IAAI,EAAE,gBAAgB,GAAG,MAAM,CAE3D;AAED,wBAAgB,wBAAwB,CAAC,IAAI,EAAE,gBAAgB,GAAG,MAAM,CAKvE;AAED,wBAAgB,WAAW,CAAC,SAAS,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,WAM3D;AAED,wBAAgB,qBAAqB,CACjC,cAAc,EAAE,MAAM,EACtB,UAAU,EAAE,MAAM,EAClB,eAAe,EAAE,eAAe,EAChC,YAAY,EAAE,YAAY,GAC3B,MAAM,GAAG,SAAS,CAQpB"}

package/lib/schema-generator/shrink-definition-name.d.ts

@@ -0,0 +1,7 @@
+import type { NonEmptyString } from '@tsofist/stem';
+/**
+ * Shrink definition name by removing generic type parameters
+ *   and appending a digest of the removed part.
+ */
+export declare function shrinkDefinitionName(definitionName: string, suffixLength?: number): NonEmptyString | undefined;
+//# sourceMappingURL=shrink-definition-name.d.ts.map

package/lib/schema-generator/shrink-definition-name.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"shrink-definition-name.d.ts","sourceRoot":"","sources":["../../src/schema-generator/shrink-definition-name.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AAEpD;;;GAGG;AACH,wBAAgB,oBAAoB,CAChC,cAAc,EAAE,MAAM,EACtB,YAAY,SAAI,GACjB,cAAc,GAAG,SAAS,CAc5B"}

package/lib/schema-generator/shrink-definition-name.js

@@ -0,0 +1,21 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.shrinkDefinitionName = shrinkDefinitionName;
+const node_crypto_1 = require("node:crypto");
+/**
+ * Shrink definition name by removing generic type parameters
+ *   and appending a digest of the removed part.
+ */
+function shrinkDefinitionName(definitionName, suffixLength = 8) {
+    const startPos = definitionName.indexOf('<');
+    if (startPos >= 0) {
+        const hashSource = definitionName.substring(startPos);
+        const prefix = definitionName.substring(0, startPos);
+        const digest = (0, node_crypto_1.createHash)('sha256')
+            .update(hashSource)
+            .digest('hex')
+            .substring(0, suffixLength);
+        return `${prefix}_H${digest}`;
+    }
+    return undefined;
+}

package/lib/schema-generator/sort-properties.d.ts

@@ -0,0 +1,3 @@
+import type { JSONSchema7Object } from 'json-schema';
+export declare function sortSchemaProperties<T extends JSONSchema7Object>(schema: T): T;
+//# sourceMappingURL=sort-properties.d.ts.map

package/lib/schema-generator/sort-properties.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"sort-properties.d.ts","sourceRoot":"","sources":["../../src/schema-generator/sort-properties.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAErD,wBAAgB,oBAAoB,CAAC,CAAC,SAAS,iBAAiB,EAAE,MAAM,EAAE,CAAC,GAAG,CAAC,CAyC9E"}

package/lib/{util → schema-generator}/sort-properties.js

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.sortProperties = sortProperties;
+exports.sortSchemaProperties = sortSchemaProperties;
 const is_empty_1 = require("@tsofist/stem/lib/object/is-empty");
 const compare_1 = require("@tsofist/stem/lib/string/compare");
-function sortProperties(schema) {
+function sortSchemaProperties(schema) {
     const stack = [];
     const isTarget = (target) => {
         return (target != null &&

package/lib/schema-generator/types.d.ts

@@ -0,0 +1,18 @@
+export declare const TMP_FILES_SUFFIX = ".schema-forge.temporary-generated.tmp";
+export declare const SFG_CONFIG_DEFAULTS: {
+    readonly sortProps: true;
+    readonly additionalProperties: false;
+    readonly expose: "export";
+    readonly strictTuples: true;
+    readonly extraTags: ["apiMember", "apiMethod", "apiInterface", "apiProperty", "dbColumn", "dbIndex", "dbEntity", "faker"];
+    readonly encodeRefs: false;
+    readonly markdownDescription: false;
+    readonly discriminatorType: undefined;
+    readonly functions: "hide";
+};
+export declare const SFG_CONFIG_MANDATORY: {
+    readonly jsDoc: "extended";
+    readonly topRef: true;
+    readonly skipTypeCheck: false;
+};
+//# sourceMappingURL=types.d.ts.map

package/lib/schema-generator/types.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/schema-generator/types.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,gBAAgB,0CAA0C,CAAC;AAExE,eAAO,MAAM,mBAAmB;;;;;;;;;;CAsBL,CAAC;AAE5B,eAAO,MAAM,oBAAoB;;;;CAIN,CAAC"}