@tsofist/schema-forge 1.30.1 → 1.32.0

package/lib/fake-generator.d.ts

@@ -1,6 +1,6 @@
 import * as fakerModule from '@faker-js/faker';
 import { ArrayMay } from '@tsofist/stem';
-import { JSONSchemaFakerOptions } from 'json-schema-faker';
+import { JSONSchemaFaker, JSONSchemaFakerOptions } from 'json-schema-faker';
 import { SchemaForgeDefinitionRef } from './types';
 import { SchemaForgeValidator } from './validator';
 export type SetupFakerModules = (faker: fakerModule.Faker) => object;
@@ -10,5 +10,13 @@ export interface FakeGeneratorOptions extends JSONSchemaFakerOptions {
     locale?: ArrayMay<FakeGeneratorLocaleName>;
     setupFakerModules?: SetupFakerModules[];
 }
-export declare function generateFakeData<T = unknown>(validator: SchemaForgeValidator, source: SchemaForgeDefinitionRef, options?: FakeGeneratorOptions): Promise<T>;
+export interface FakeGeneratorHost {
+    readonly validator: SchemaForgeValidator;
+    readonly faker: fakerModule.Faker;
+    readonly generator: typeof JSONSchemaFaker;
+    readonly rebuild: () => this;
+}
+export declare function createFakeGeneratorHost(source: SchemaForgeValidator, options?: FakeGeneratorOptions): FakeGeneratorHost;
+export declare function generateFakeData<T = unknown>(validator: SchemaForgeValidator, source: SchemaForgeDefinitionRef, options?: FakeGeneratorOptions): T;
+export declare function generateFakeData<T = unknown>(host: FakeGeneratorHost, source: SchemaForgeDefinitionRef): T;
 //# sourceMappingURL=fake-generator.d.ts.map

package/lib/fake-generator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"fake-generator.d.ts","sourceRoot":"","sources":["../src/fake-generator.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,WAAW,MAAM,iBAAiB,CAAC;AAC/C,OAAO,EAAE,QAAQ,EAAkB,MAAM,eAAe,CAAC;AAKzD,OAAO,EAAmB,sBAAsB,EAAuB,MAAM,mBAAmB,CAAC;AAEjG,OAAO,EAAE,wBAAwB,EAAE,MAAM,SAAS,CAAC;AACnD,OAAO,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAC;AAWnD,MAAM,MAAM,iBAAiB,GAAG,CAAC,KAAK,EAAE,WAAW,CAAC,KAAK,KAAK,MAAM,CAAC;AACrE,MAAM,MAAM,aAAa,GAAG,UAAU,CAAC,WAAW,CAAC,aAAa,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AAEtF,MAAM,MAAM,uBAAuB,GAAG,MAAM,OAAO,WAAW,CAAC,UAAU,CAAC;AAC1E,MAAM,WAAW,oBAAqB,SAAQ,sBAAsB;IAChE,MAAM,CAAC,EAAE,QAAQ,CAAC,uBAAuB,CAAC,CAAC;IAC3C,iBAAiB,CAAC,EAAE,iBAAiB,EAAE,CAAC;CAC3C;AAED,wBAAsB,gBAAgB,CAAC,CAAC,GAAG,OAAO,EAC9C,SAAS,EAAE,oBAAoB,EAC/B,MAAM,EAAE,wBAAwB,EAChC,OAAO,GAAE,oBAAyB,GACnC,OAAO,CAAC,CAAC,CAAC,CA0DZ"}
+{"version":3,"file":"fake-generator.d.ts","sourceRoot":"","sources":["../src/fake-generator.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,WAAW,MAAM,iBAAiB,CAAC;AAC/C,OAAO,EAAQ,QAAQ,EAAE,MAAM,eAAe,CAAC;AAM/C,OAAO,EAAE,eAAe,EAAE,sBAAsB,EAAuB,MAAM,mBAAmB,CAAC;AACjG,OAAO,EAAE,wBAAwB,EAAE,MAAM,SAAS,CAAC;AACnD,OAAO,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAC;AAEnD,MAAM,MAAM,iBAAiB,GAAG,CAAC,KAAK,EAAE,WAAW,CAAC,KAAK,KAAK,MAAM,CAAC;AACrE,MAAM,MAAM,aAAa,GAAG,UAAU,CAAC,WAAW,CAAC,aAAa,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AAEtF,MAAM,MAAM,uBAAuB,GAAG,MAAM,OAAO,WAAW,CAAC,UAAU,CAAC;AAC1E,MAAM,WAAW,oBAAqB,SAAQ,sBAAsB;IAChE,MAAM,CAAC,EAAE,QAAQ,CAAC,uBAAuB,CAAC,CAAC;IAC3C,iBAAiB,CAAC,EAAE,iBAAiB,EAAE,CAAC;CAC3C;AAED,MAAM,WAAW,iBAAiB;IAC9B,QAAQ,CAAC,SAAS,EAAE,oBAAoB,CAAC;IACzC,QAAQ,CAAC,KAAK,EAAE,WAAW,CAAC,KAAK,CAAC;IAClC,QAAQ,CAAC,SAAS,EAAE,OAAO,eAAe,CAAC;IAC3C,QAAQ,CAAC,OAAO,EAAE,MAAM,IAAI,CAAC;CAChC;AAED,wBAAgB,uBAAuB,CACnC,MAAM,EAAE,oBAAoB,EAC5B,OAAO,GAAE,oBAAyB,GACnC,iBAAiB,CA+CnB;AAED,wBAAgB,gBAAgB,CAAC,CAAC,GAAG,OAAO,EACxC,SAAS,EAAE,oBAAoB,EAC/B,MAAM,EAAE,wBAAwB,EAChC,OAAO,CAAC,EAAE,oBAAoB,GAC/B,CAAC,CAAC;AACL,wBAAgB,gBAAgB,CAAC,CAAC,GAAG,OAAO,EACxC,IAAI,EAAE,iBAAiB,EACvB,MAAM,EAAE,wBAAwB,GACjC,CAAC,CAAC"}

package/lib/fake-generator.js

@@ -1,36 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.createFakeGeneratorHost = createFakeGeneratorHost;
 exports.generateFakeData = generateFakeData;
-const tslib_1 = require("tslib");
 const fakerModule = require("@faker-js/faker");
-const stem_1 = require("@tsofist/stem");
 const as_array_1 = require("@tsofist/stem/lib/as-array");
+const entries_1 = require("@tsofist/stem/lib/object/entries");
 const substr_1 = require("@tsofist/stem/lib/string/substr");
 const json_schema_faker_1 = require("json-schema-faker");
-const types_1 = require("./generator/types");
-const PRUNE_PROPS = Array.from(new Set([
-    '$ref',
-    '$comment',
-    //
-    ...(types_1.SG_CONFIG_DEFAULTS.extraTags || []),
-]));
-function generateFakeData(validator_1, source_1) {
-    return tslib_1.__awaiter(this, arguments, void 0, function* (validator, source, options = {}) {
-        const refs = {};
-        {
-            const rootSchemaId = (0, substr_1.substr)(source, 0, '#');
-            for (const def of validator.listDefinitions()) {
-                let schema = validator.getSchema(def.ref);
-                // todo: fix this
-                schema = fixJSONSchemaFakerQuirks(schema);
-                if (rootSchemaId === def.schemaId) {
-                    refs[`#/definitions/${def.name}`] = schema;
-                }
-                else {
-                    refs[def.ref] = schema;
-                }
-            }
-        }
+function createFakeGeneratorHost(source, options = {}) {
+    const rebuild = () => {
+        const validator = source;
         const faker = new fakerModule.Faker({
             locale: (0, as_array_1.asArray)(options.locale || ['en']).map((name) => fakerModule.allLocales[name]),
         });
@@ -48,24 +27,53 @@ function generateFakeData(validator_1, source_1) {
             }
             return faker;
         });
-        generator.option(Object.assign(Object.assign({ alwaysFakeOptionals: true, refDepthMax: 1000 }, options), { resolveJsonPath: false, pruneProperties: PRUNE_PROPS }));
+        generator.option(Object.assign(Object.assign({ alwaysFakeOptionals: true, refDepthMax: 1000 }, options), { resolveJsonPath: false }));
         generator.format('iso-time', () => {
             return (0, substr_1.substr)(faker.date.anytime(), 'T', '.');
         });
-        const schema = validator.getSchema(source);
-        if (schema == null)
-            throw new Error(`Schema not found: ${source}`);
-        return generator.generate(schema, refs);
-    });
+        return {
+            rebuild,
+            generator,
+            faker,
+            validator,
+        };
+    };
+    return rebuild();
+}
+function generateFakeData(validatorOrHost, source, options = {}) {
+    const host = 'validator' in validatorOrHost
+        ? validatorOrHost
+        : createFakeGeneratorHost(validatorOrHost, options);
+    const { validator, generator } = host;
+    const refs = {};
+    {
+        const rootSchemaId = (0, substr_1.substr)(source, 0, '#');
+        for (const def of validator.listDefinitions()) {
+            const schema = validator.getSchema(def.ref);
+            if (rootSchemaId === def.schemaId) {
+                refs[`#/definitions/${def.name}`] = schema;
+            }
+            else {
+                refs[def.ref] = schema;
+            }
+        }
+    }
+    const schema = validator.getSchema(source);
+    if (schema == null)
+        throw new Error(`Schema not found: ${source}`);
+    const result = generator.generate(schema, refs);
+    cleanJSFQuirksArtefacts(result);
+    return result;
 }
 const EmbeddedModules = [
     (faker) => ({
         sf: {
-            url(prefix = 'https://example.com', parts = { min: 1, max: 5 }, words = { min: 1, max: 3 }) {
-                const pathParts = new Array(faker.helpers.rangeToNumber(parts))
+            /** FakerModule: sf.url */
+            url(origin = 'https://example.com', paths = { min: 1, max: 5 }, pathWords = { min: 1, max: 3 }) {
+                const pathParts = new Array(faker.helpers.rangeToNumber(paths))
                     .fill('')
-                    .map(() => faker.lorem.slug(words));
-                return `${prefix}/${pathParts.join('/')}`;
+                    .map(() => faker.lorem.slug(pathWords));
+                return `${origin}/${pathParts.join('/')}`;
             },
         },
     }),
@@ -84,28 +92,37 @@ function proxyFakerDateModule(obj) {
         },
     });
 }
-function fixJSONSchemaFakerQuirks(schema) {
-    if (typeof schema !== 'object' || schema == null) {
-        return schema;
-    }
-    if (schema.$ref) {
-        const { description, examples } = schema, rest = tslib_1.__rest(schema, ["description", "examples"]);
-        for (const key in rest) {
-            if (stem_1.hasOwnProperty.call(rest, key)) {
-                rest[key] = fixJSONSchemaFakerQuirks(rest[key]);
+function cleanJSFQuirksArtefacts(target) {
+    const stack = [[target]];
+    const hasProblem = (item) => {
+        return (typeof item === 'object' &&
+            item !== null &&
+            ('$ref' in item || 'anyOf' in item || 'allOf' in item || 'not' in item));
+    };
+    while (stack.length > 0) {
+        const [current] = stack.pop();
+        if (Array.isArray(current)) {
+            for (let i = current.length - 1; i >= 0; i--) {
+                const element = current[i];
+                if (hasProblem(element)) {
+                    current.splice(i, 1);
+                }
+                else if (typeof element === 'object' && element !== null) {
+                    stack.push([element]);
+                }
             }
         }
-        return rest;
-    }
-    else if (Array.isArray(schema)) {
-        return schema.map(fixJSONSchemaFakerQuirks);
-    }
-    const result = {};
-    for (const key in schema) {
-        if (stem_1.hasOwnProperty.call(schema, key)) {
-            result[key] = fixJSONSchemaFakerQuirks(schema[key]);
+        else if (current != null && typeof current === 'object') {
+            for (const [propKey, propValue] of (0, entries_1.entries)(current)) {
+                if (hasProblem(propValue)) {
+                    delete current[propKey];
+                }
+                else if (typeof propValue === 'object' && propValue !== null) {
+                    stack.push([propValue]);
+                }
+            }
         }
     }
-    return result;
+    return target;
 }
 //# sourceMappingURL=fake-generator.js.map

package/lib/fake-generator.js.map

@@ -1 +1 @@
-{"version":3,"file":"fake-generator.js","sourceRoot":"","sources":["../src/fake-generator.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"fake-generator.js","sourceRoot":"","sources":["../src/fake-generator.ts"],"names":[],"mappings":"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"}

package/lib/fake-generator.spec.js

@@ -4,6 +4,7 @@ const tslib_1 = require("tslib");
 const guards_1 = require("@tsofist/stem/lib/number/guards");
 const fake_generator_1 = require("./fake-generator");
 const validator_1 = require("./validator");
+/* eslint-disable @typescript-eslint/no-unsafe-member-access,@typescript-eslint/no-unsafe-argument */
 describe('generateFakeData', () => {
     const testSchema1 = {
         $schema: 'http://json-schema.org/draft-07/schema#',
@@ -44,6 +45,30 @@ describe('generateFakeData', () => {
                     minLength: 20,
                 },
             },
+            'IntWithDescription': {
+                $ref: 'test-1#/definitions/Int',
+                description: 'Foreign Int from test-1',
+                $comment: 'Test comment',
+            },
+            'JSFQuirks': {
+                type: 'array',
+                minItems: 10,
+                items: {
+                    type: 'object',
+                    additionalProperties: false,
+                    properties: {
+                        id2: {
+                            type: 'array',
+                            items: { $ref: '#/definitions/IntWithDescription' },
+                            examples: [
+                                [1, 2, 3],
+                                [4, 5, 6],
+                            ],
+                        },
+                    },
+                    required: ['id2'],
+                },
+            },
             'List': {
                 type: 'array',
                 items: {
@@ -133,9 +158,9 @@ describe('generateFakeData', () => {
         },
     };
     let validator;
-    beforeEach(() => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
+    beforeEach(() => {
         validator = (0, validator_1.createSchemaForgeValidator)({ schemas: [testSchema1, testSchema2, testSchema3] }, true);
-    }));
+    });
     it('default behavior', () => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
         {
             const data = yield (0, fake_generator_1.generateFakeData)(validator, 'test-1#/definitions/Int');
@@ -158,6 +183,12 @@ describe('generateFakeData', () => {
         expect(validator.validateBySchema(source, data).valid).toStrictEqual(true);
     }));
     it('complex, nested data should be handled correctly', () => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
+        {
+            const source = 'test-2#/definitions/JSFQuirks';
+            const data = yield (0, fake_generator_1.generateFakeData)(validator, source, {});
+            expect(data).toBeDefined();
+            expect(validator.validateBySchema(source, data).valid).toStrictEqual(true);
+        }
         {
             const source = 'test-2#/definitions/List';
             const data = yield (0, fake_generator_1.generateFakeData)(validator, source);

package/lib/fake-generator.spec.js.map

@@ -1 +1 @@
-{"version":3,"file":"fake-generator.spec.js","sourceRoot":"","sources":["../src/fake-generator.spec.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"fake-generator.spec.js","sourceRoot":"","sources":["../src/fake-generator.spec.ts"],"names":[],"mappings":"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"}

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

@@ -1,5 +1,7 @@
+import '../util/patch.extended-annotations-reader';
 import { SchemaObject } from 'ajv';
-import { CompletedConfig } from 'ts-json-schema-generator';
+import { ChainNodeParser, CompletedConfig, Context, SubNodeParser, TupleType } from 'ts-json-schema-generator';
+import { Node, TupleTypeNode } from 'typescript';
 import { TypeExposeKind } from './types';
 interface Options {
     tsconfig: string;
@@ -11,7 +13,15 @@ interface Options {
     expose?: TypeExposeKind;
     openAPI?: boolean;
     sortObjectProperties?: boolean;
+    allowUseFallbackDescription?: boolean;
 }
 export declare function generateSchemaByDraftTypes(options: Options): Promise<SchemaObject>;
+export declare class TupleTypeParser implements SubNodeParser {
+    protected readonly childNodeParser: ChainNodeParser;
+    protected readonly allowUseFallbackDescription: boolean | undefined;
+    constructor(childNodeParser: ChainNodeParser, allowUseFallbackDescription: boolean | undefined);
+    supportsNode(node: Node): boolean;
+    createType(node: TupleTypeNode, context: Context): TupleType;
+}
 export {};
 //# sourceMappingURL=schema-generator.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"schema-generator.d.ts","sourceRoot":"","sources":["../../src/generator/schema-generator.ts"],"names":[],"mappings":"AAIA,OAAY,EAAE,YAAY,EAAE,MAAM,KAAK,CAAC;AACxC,OAAO,EAYH,eAAe,EAElB,MAAM,0BAA0B,CAAC;AAiBlC,OAAO,EAA6D,cAAc,EAAE,MAAM,SAAS,CAAC;AAEpG,UAAU,OAAO;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,uBAAuB,EAAE,MAAM,CAAC;IAChC,2BAA2B,EAAE,eAAe,CAAC;IAC7C,gBAAgB,EAAE,MAAM,CAAC;IACzB,WAAW,EAAE,MAAM,EAAE,CAAC;IACtB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,MAAM,CAAC,EAAE,cAAc,CAAC;IACxB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,oBAAoB,CAAC,EAAE,OAAO,CAAC;CAClC;AAED,wBAAsB,0BAA0B,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,YAAY,CAAC,CA+CxF"}
+{"version":3,"file":"schema-generator.d.ts","sourceRoot":"","sources":["../../src/generator/schema-generator.ts"],"names":[],"mappings":"AAAA,OAAO,2CAA2C,CAAC;AAGnD,OAAY,EAAE,YAAY,EAAE,MAAM,KAAK,CAAC;AACxC,OAAO,EAEH,eAAe,EACf,eAAe,EACf,OAAO,EAUP,aAAa,EACb,SAAS,EACZ,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAIH,IAAI,EAEJ,aAAa,EAGhB,MAAM,YAAY,CAAC;AAGpB,OAAO,EAA6D,cAAc,EAAE,MAAM,SAAS,CAAC;AAEpG,UAAU,OAAO;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,uBAAuB,EAAE,MAAM,CAAC;IAChC,2BAA2B,EAAE,eAAe,CAAC;IAC7C,gBAAgB,EAAE,MAAM,CAAC;IACzB,WAAW,EAAE,MAAM,EAAE,CAAC;IACtB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,MAAM,CAAC,EAAE,cAAc,CAAC;IACxB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B,2BAA2B,CAAC,EAAE,OAAO,CAAC;CACzC;AAED,wBAAsB,0BAA0B,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,YAAY,CAAC,CAsDxF;AAED,qBAAa,eAAgB,YAAW,aAAa;IAE7C,SAAS,CAAC,QAAQ,CAAC,eAAe,EAAE,eAAe;IACnD,SAAS,CAAC,QAAQ,CAAC,2BAA2B,EAAE,OAAO,GAAG,SAAS;gBADhD,eAAe,EAAE,eAAe,EAChC,2BAA2B,EAAE,OAAO,GAAG,SAAS;IAGvE,YAAY,CAAC,IAAI,EAAE,IAAI,GAAG,OAAO;IAIjC,UAAU,CAAC,IAAI,EAAE,aAAa,EAAE,OAAO,EAAE,OAAO;CAgBnD"}

package/lib/generator/schema-generator.js

@@ -1,13 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.TupleTypeParser = void 0;
 exports.generateSchemaByDraftTypes = generateSchemaByDraftTypes;
 const tslib_1 = require("tslib");
+require("../util/patch.extended-annotations-reader");
 const error_1 = require("@tsofist/stem/lib/error");
-const is_empty_1 = require("@tsofist/stem/lib/object/is-empty");
-const compare_1 = require("@tsofist/stem/lib/string/compare");
 const ajv_1 = require("ajv");
 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 types_1 = require("./types");
 function generateSchemaByDraftTypes(options) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
@@ -20,10 +22,12 @@ function generateSchemaByDraftTypes(options) {
                 seen.add(name);
             }
         }
+        const allowUseFallbackDescription = options.allowUseFallbackDescription;
         const generatorConfig = Object.assign(Object.assign(Object.assign(Object.assign({}, ts_json_schema_generator_1.DEFAULT_CONFIG), types_1.SG_CONFIG_DEFAULTS), { expose: (_a = options.expose) !== null && _a !== void 0 ? _a : types_1.SG_CONFIG_DEFAULTS.expose, path: `${options.sourcesDirectoryPattern}/*${types_1.TMP_FILES_SUFFIX}.ts`, tsconfig: options.tsconfig, discriminatorType: options.openAPI ? 'open-api' : ts_json_schema_generator_1.DEFAULT_CONFIG.discriminatorType }), types_1.SG_CONFIG_MANDATORY);
         const generatorProgram = (0, ts_json_schema_generator_1.createProgram)(generatorConfig);
         const typeChecker = generatorProgram.getTypeChecker();
         const parser = (0, ts_json_schema_generator_1.createParser)(generatorProgram, options.sourcesTypesGeneratorConfig, (parser) => {
+            parser.addNodeParser(new TupleTypeParser(parser, allowUseFallbackDescription));
             parser.addNodeParser(new ArrayLiteralExpressionIdentifierParser(typeChecker));
         });
         const formatter = (0, ts_json_schema_generator_1.createFormatter)(options.sourcesTypesGeneratorConfig);
@@ -38,9 +42,9 @@ function generateSchemaByDraftTypes(options) {
             const schema = generator.createSchema(definitionName);
             Object.assign(result.definitions, schema.definitions);
         }
-        result.definitions = Object.fromEntries(Object.entries(result.definitions || {}).sort());
+        result.definitions = Object.fromEntries(Object.entries((result.definitions || {})).sort());
         if (options.sortObjectProperties)
-            sortProperties(result.definitions);
+            (0, sort_properties_1.sortProperties)(result.definitions);
         yield new ajv_1.default({
             strict: true,
             allErrors: true,
@@ -48,41 +52,30 @@ function generateSchemaByDraftTypes(options) {
         return result;
     });
 }
-function sortProperties(schema) {
-    const stack = [];
-    const isTarget = (target) => {
-        return (target != null &&
-            typeof target === 'object' &&
-            'type' in target &&
-            target.type === 'object' &&
-            'properties' in target &&
-            typeof target.properties === 'object' &&
-            !(0, is_empty_1.isEmptyObject)(target.properties));
-    };
-    const process = (item) => {
-        var _a;
-        if (!item)
-            return;
-        if (Array.isArray(item)) {
-            stack.push(...item);
-        }
-        else {
-            if (isTarget(item)) {
-                item.properties = Object.fromEntries(Object.entries(item.properties).sort(([a], [b]) => (0, compare_1.compareStringsAsc)(a, b)));
-                if ((_a = item.required) === null || _a === void 0 ? void 0 : _a.length)
-                    item.required.sort(compare_1.compareStringsAsc);
-            }
-            if (typeof item === 'object') {
-                stack.push(...Object.values(item));
+class TupleTypeParser {
+    constructor(childNodeParser, allowUseFallbackDescription) {
+        this.childNodeParser = childNodeParser;
+        this.allowUseFallbackDescription = allowUseFallbackDescription;
+    }
+    supportsNode(node) {
+        return (0, typescript_1.isTupleTypeNode)(node);
+    }
+    createType(node, context) {
+        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 nullable = type instanceof ts_json_schema_generator_1.AnnotatedType ? type.isNullable() : false;
+                if (nullable)
+                    console.log(description, nullable);
+                return description ? new ts_json_schema_generator_1.AnnotatedType(type, { description }, nullable) : type;
             }
-        }
-    };
-    process(schema);
-    while (stack.length) {
-        process(stack.pop());
+            return type;
+        });
+        return new ts_json_schema_generator_1.TupleType(items);
     }
-    return schema;
 }
+exports.TupleTypeParser = TupleTypeParser;
 class ArrayLiteralExpressionIdentifierParser {
     constructor(checker) {
         this.checker = checker;
@@ -118,49 +111,4 @@ function getIdentifierLiteralValue(node, checker) {
     }
     return undefined;
 }
-function hasInheritDocTag(node) {
-    return ((0, typescript_1.getAllJSDocTags)(node, (tag) => {
-        return tag.tagName.text === 'inheritDoc';
-    }).length > 0);
-}
-{
-    // Support for @inheritDoc tag to enforce inheritance of annotations
-    const getAnnotations = ts_json_schema_generator_1.ExtendedAnnotationsReader.prototype.getAnnotations;
-    ts_json_schema_generator_1.ExtendedAnnotationsReader.prototype.getAnnotations = function getAnnotationsWithInheritance(node) {
-        var _a;
-        if (!hasInheritDocTag(node))
-            return getAnnotations.call(this, node);
-        const checker = this.typeChecker || (0, error_1.raise)('TypeChecker is not available');
-        const result = {};
-        if (!('ref' in result) &&
-            !('$ref' in result) &&
-            //
-            (0, typescript_1.isTypeAliasDeclaration)(node) &&
-            //
-            (0, typescript_1.isTypeReferenceNode)(node.type) &&
-            (0, typescript_1.isIdentifier)(node.type.typeName) &&
-            !(0, typescript_1.isUnionTypeNode)(node.type) &&
-            !(0, typescript_1.isIntersectionTypeNode)(node.type)) {
-            const alias = checker.getSymbolAtLocation(node.type.typeName);
-            const symbol = alias && typescript_1.SymbolFlags.Alias & alias.flags
-                ? checker.getAliasedSymbol(alias)
-                : undefined;
-            const inheritedAnn = {};
-            if (symbol && ((_a = symbol.declarations) === null || _a === void 0 ? void 0 : _a.length)) {
-                for (const declaration of symbol.declarations) {
-                    const ann = getAnnotations.call(this, declaration);
-                    if (ann)
-                        Object.assign(inheritedAnn, ann);
-                }
-            }
-            Object.assign(result, inheritedAnn);
-        }
-        {
-            const ann = getAnnotations.call(this, node);
-            if (ann)
-                Object.assign(result, ann);
-        }
-        return (0, is_empty_1.isEmptyObject)(result) ? undefined : result;
-    };
-}
 //# sourceMappingURL=schema-generator.js.map

package/lib/generator/schema-generator.js.map

@@ -1 +1 @@
-{"version":3,"file":"schema-generator.js","sourceRoot":"","sources":["../../src/generator/schema-generator.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"schema-generator.js","sourceRoot":"","sources":["../../src/generator/schema-generator.ts"],"names":[],"mappings":"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"}

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

@@ -1 +1 @@
-{"version":3,"file":"types-generator.d.ts","sourceRoot":"","sources":["../../src/generator/types-generator.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,eAAe,EAAkB,MAAM,0CAA0C,CAAC;AAuC3F,OAAO,EACH,sBAAsB,EAIzB,MAAM,SAAS,CAAC;AAEjB,UAAU,OAAQ,SAAQ,sBAAsB;IAC5C,QAAQ,EAAE,MAAM,CAAC;IACjB,cAAc,EAAE,MAAM,EAAE,CAAC;CAC5B;AAaD,wBAAsB,sBAAsB,CAAC,OAAO,EAAE,OAAO;;;;;GAmH5D"}
+{"version":3,"file":"types-generator.d.ts","sourceRoot":"","sources":["../../src/generator/types-generator.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,eAAe,EAAkB,MAAM,0CAA0C,CAAC;AAyC3F,OAAO,EACH,sBAAsB,EAIzB,MAAM,SAAS,CAAC;AAEjB,UAAU,OAAQ,SAAQ,sBAAsB;IAC5C,QAAQ,EAAE,MAAM,CAAC;IACjB,cAAc,EAAE,MAAM,EAAE,CAAC;CAC5B;AAaD,wBAAsB,sBAAsB,CAAC,OAAO,EAAE,OAAO;;;;;GAmH5D"}