@tsofist/schema-forge 1.32.1 → 1.34.0

package/lib/generator.js

@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.forgeSchema = forgeSchema;
 exports.loadJSONSchema = loadJSONSchema;
 exports.loadJSONSchemaSync = loadJSONSchemaSync;
-const tslib_1 = require("tslib");
 const fs_1 = require("fs");
 const promises_1 = require("fs/promises");
 const node_crypto_1 = require("node:crypto");
@@ -16,119 +15,117 @@ const random_1 = require("@tsofist/stem/lib/string/random");
 const schema_generator_1 = require("./generator/schema-generator");
 const types_generator_1 = require("./generator/types-generator");
 const KEEP_ARTEFACTS = false;
-function forgeSchema(options) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c, _d, _e, _f;
-        const { schemaId, sourcesDirectoryPattern, outputSchemaFile } = options;
-        const sourcesPattern = (0, as_array_1.asArray)(options.sourcesFilesPattern).map((filesPattern) => `${sourcesDirectoryPattern}/${filesPattern}`);
-        let tsconfig = options.tsconfig;
-        let tsconfigGenerated = false;
+async function forgeSchema(options) {
+    const { schemaId, sourcesDirectoryPattern, outputSchemaFile } = options;
+    const sourcesPattern = (0, as_array_1.asArray)(options.sourcesFilesPattern).map((filesPattern) => `${sourcesDirectoryPattern}/${filesPattern}`);
+    let tsconfig = options.tsconfig;
+    let tsconfigGenerated = false;
+    try {
+        if (options.tsconfigFrom) {
+            tsconfigGenerated = true;
+            const source = await (0, promises_1.readFile)(options.tsconfigFrom, { encoding: 'utf8' });
+            const config = JSON.parse(source);
+            config.include = sourcesPattern;
+            config.compilerOptions.noUnusedLocals = false;
+            tsconfig = `./tsconfig.schema-forge-generated.${(0, random_1.randomString)(5)}.tmp.json`;
+            await (0, promises_1.writeFile)(tsconfig, JSON.stringify(config, null, 2), { encoding: 'utf8' });
+        }
+        if (!tsconfig)
+            (0, error_1.raise)('tsconfig is not specified');
+        const { sourcesTypesGeneratorConfig, files, definitions, namesBySourceFile } = await (0, types_generator_1.generateDraftTypeFiles)({
+            ...options,
+            tsconfig,
+            sourcesPattern,
+        });
+        const refs = definitions.map((item) => `${options.schemaId || ''}#/definitions/${item}`);
+        let schema;
         try {
-            if (options.tsconfigFrom) {
-                tsconfigGenerated = true;
-                const source = yield (0, promises_1.readFile)(options.tsconfigFrom, { encoding: 'utf8' });
-                const config = JSON.parse(source);
-                config.include = sourcesPattern;
-                config.compilerOptions.noUnusedLocals = false;
-                tsconfig = `./tsconfig.schema-forge-generated.${(0, random_1.randomString)(5)}.tmp.json`;
-                yield (0, promises_1.writeFile)(tsconfig, JSON.stringify(config, null, 2), { encoding: 'utf8' });
-            }
-            if (!tsconfig)
-                (0, error_1.raise)('tsconfig is not specified');
-            const { sourcesTypesGeneratorConfig, files, definitions, namesBySourceFile } = yield (0, types_generator_1.generateDraftTypeFiles)(Object.assign(Object.assign({}, options), { tsconfig,
-                sourcesPattern }));
-            const refs = definitions.map((item) => `${options.schemaId || ''}#/definitions/${item}`);
-            let schema;
-            try {
-                {
-                    schema = yield (0, schema_generator_1.generateSchemaByDraftTypes)({
-                        schemaId,
-                        tsconfig,
-                        definitions,
-                        sourcesDirectoryPattern,
-                        outputSchemaFile,
-                        sourcesTypesGeneratorConfig,
-                        expose: options.expose,
-                        openAPI: options.openapiCompatible,
-                        sortObjectProperties: options.sortObjectProperties,
-                        allowUseFallbackDescription: options.allowUseFallbackDescription,
-                    });
-                    if (options.schemaMetadata) {
-                        for (const key of (0, keys_1.keysOf)(options.schemaMetadata)) {
-                            schema[key] = options.schemaMetadata[key];
-                        }
+            {
+                schema = await (0, schema_generator_1.generateSchemaByDraftTypes)({
+                    schemaId,
+                    tsconfig,
+                    definitions,
+                    sourcesDirectoryPattern,
+                    outputSchemaFile,
+                    sourcesTypesGeneratorConfig,
+                    expose: options.expose,
+                    openAPI: options.openapiCompatible,
+                    sortObjectProperties: options.sortObjectProperties,
+                    allowUseFallbackDescription: options.allowUseFallbackDescription,
+                });
+                if (options.schemaMetadata) {
+                    for (const key of (0, keys_1.keysOf)(options.schemaMetadata)) {
+                        schema[key] = options.schemaMetadata[key];
                     }
-                    {
-                        const algorithm = ((_a = options.schemaMetadata) === null || _a === void 0 ? void 0 : _a.hash) == null
-                            ? 'md5'
-                            : ((_b = options.schemaMetadata) === null || _b === void 0 ? void 0 : _b.hash) === true
-                                ? 'md5'
-                                : options.schemaMetadata.hash;
-                        if (algorithm) {
-                            schema.hash = (0, node_crypto_1.createHash)(algorithm, {})
-                                .update(JSON.stringify(schema))
-                                .digest('hex');
-                        }
-                        else {
-                            delete schema.hash;
-                        }
-                    }
-                    const content = JSON.stringify(schema, null, 2);
-                    yield (0, promises_1.writeFile)(options.outputSchemaFile, content, { encoding: 'utf8' });
                 }
-                if (options.outputSchemaMetadataFile) {
-                    const map = {
-                        $id: options.schemaId || '',
-                        version: (_c = options.schemaMetadata) === null || _c === void 0 ? void 0 : _c.version,
-                        title: (_d = options.schemaMetadata) === null || _d === void 0 ? void 0 : _d.title,
-                        description: (_e = options.schemaMetadata) === null || _e === void 0 ? void 0 : _e.description,
-                        $comment: (_f = options.schemaMetadata) === null || _f === void 0 ? void 0 : _f.$comment,
-                        schemaHash: schema.hash,
-                        refs: {},
-                        names: {},
-                        serviceRefs: {},
-                        serviceNames: {},
-                    };
-                    const defs = new Set(Object.keys((schema.definitions || {})));
-                    for (const name of definitions) {
-                        const ref = `${options.schemaId || ''}#/definitions/${name}`;
-                        map.names[name] = ref;
-                        map.refs[ref] = name;
-                        defs.delete(name);
+                {
+                    const algorithm = options.schemaMetadata?.hash == null
+                        ? 'md5'
+                        : options.schemaMetadata?.hash === true
+                            ? 'md5'
+                            : options.schemaMetadata.hash;
+                    if (algorithm) {
+                        schema.hash = (0, node_crypto_1.createHash)(algorithm, {})
+                            .update(JSON.stringify(schema))
+                            .digest('hex');
                     }
-                    for (const name of defs) {
-                        map.serviceNames[name] = `${options.schemaId || ''}#/definitions/${name}`;
-                        map.serviceRefs[`${options.schemaId || ''}#/definitions/${name}`] = name;
+                    else {
+                        delete schema.hash;
                     }
-                    const content = JSON.stringify(map, null, 2);
-                    yield (0, promises_1.writeFile)(options.outputSchemaMetadataFile, content, {
-                        encoding: 'utf8',
-                    });
                 }
+                const content = JSON.stringify(schema, null, 2);
+                await (0, promises_1.writeFile)(options.outputSchemaFile, content, { encoding: 'utf8' });
             }
-            finally {
-                if (!KEEP_ARTEFACTS) {
-                    yield Promise.all(files.map((fileName) => (0, promises_2.unlink)(fileName).catch(noop_1.noop)));
+            if (options.outputSchemaMetadataFile) {
+                const map = {
+                    $id: options.schemaId || '',
+                    version: options.schemaMetadata?.version,
+                    title: options.schemaMetadata?.title,
+                    description: options.schemaMetadata?.description,
+                    $comment: options.schemaMetadata?.$comment,
+                    schemaHash: schema.hash,
+                    refs: {},
+                    names: {},
+                    serviceRefs: {},
+                    serviceNames: {},
+                };
+                const defs = new Set(Object.keys((schema.definitions || {})));
+                for (const name of definitions) {
+                    const ref = `${options.schemaId || ''}#/definitions/${name}`;
+                    map.names[name] = ref;
+                    map.refs[ref] = name;
+                    defs.delete(name);
+                }
+                for (const name of defs) {
+                    map.serviceNames[name] = `${options.schemaId || ''}#/definitions/${name}`;
+                    map.serviceRefs[`${options.schemaId || ''}#/definitions/${name}`] = name;
                 }
+                const content = JSON.stringify(map, null, 2);
+                await (0, promises_1.writeFile)(options.outputSchemaMetadataFile, content, {
+                    encoding: 'utf8',
+                });
             }
-            return {
-                schema,
-                refs,
-                generatedTemporaryFiles: files,
-                generatedNamesBySourceFile: namesBySourceFile,
-            };
         }
         finally {
-            if (tsconfig && tsconfigGenerated) {
-                yield (0, promises_2.unlink)(tsconfig).catch(noop_1.noop);
+            if (!KEEP_ARTEFACTS) {
+                await Promise.all(files.map((fileName) => (0, promises_2.unlink)(fileName).catch(noop_1.noop)));
             }
         }
-    });
+        return {
+            schema,
+            refs,
+            generatedTemporaryFiles: files,
+            generatedNamesBySourceFile: namesBySourceFile,
+        };
+    }
+    finally {
+        if (tsconfig && tsconfigGenerated) {
+            await (0, promises_2.unlink)(tsconfig).catch(noop_1.noop);
+        }
+    }
 }
-function loadJSONSchema(files) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        return Promise.all(files.map((fn) => (0, promises_1.readFile)(fn, { encoding: 'utf8' }).then(JSON.parse)));
-    });
+async function loadJSONSchema(files) {
+    return Promise.all(files.map((fn) => (0, promises_1.readFile)(fn, { encoding: 'utf8' }).then(JSON.parse)));
 }
 function loadJSONSchemaSync(files) {
     return files.map((fn) => {
@@ -136,4 +133,3 @@ function loadJSONSchemaSync(files) {
         return JSON.parse(content);
     });
 }
-//# sourceMappingURL=generator.js.map

package/lib/generator.spec.d.ts

@@ -1,2 +1 @@
 export {};
-//# sourceMappingURL=generator.spec.d.ts.map

package/lib/generator.spec.js

@@ -1,6 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const tslib_1 = require("tslib");
 const promises_1 = require("node:fs/promises");
 const error_1 = require("@tsofist/stem/lib/error");
 const noop_1 = require("@tsofist/stem/lib/noop");
@@ -15,8 +14,8 @@ describe('generator for a7', () => {
     const outputSchemaMetadataFile = './a7.generated.definitions.tmp.json';
     let forgeSchemaResult;
     let validator;
-    beforeAll(() => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
-        forgeSchemaResult = yield (0, generator_1.forgeSchema)({
+    beforeAll(async () => {
+        forgeSchemaResult = await (0, generator_1.forgeSchema)({
             schemaId: 'test',
             allowUseFallbackDescription: true,
             tsconfigFrom: './tsconfig.build-test.json',
@@ -28,15 +27,15 @@ describe('generator for a7', () => {
             explicitPublic: true,
         });
         validator = (0, validator_1.createSchemaForgeValidator)({}, true);
-        const schema = yield (0, generator_1.loadJSONSchema)([outputSchemaFile]);
+        const schema = await (0, generator_1.loadJSONSchema)([outputSchemaFile]);
         validator.addSchema(schema);
-    }));
-    afterAll(() => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
+    });
+    afterAll(async () => {
         if (!KEEP_ARTEFACTS) {
-            yield (0, promises_1.unlink)(outputSchemaFile).catch(noop_1.noop);
-            yield (0, promises_1.unlink)(outputSchemaMetadataFile).catch(noop_1.noop);
+            await (0, promises_1.unlink)(outputSchemaFile).catch(noop_1.noop);
+            await (0, promises_1.unlink)(outputSchemaMetadataFile).catch(noop_1.noop);
         }
-    }));
+    });
     it('generated schema should be valid', () => {
         expect(forgeSchemaResult).toBeTruthy();
         const schema = validator.getSchema('test#/definitions/SomeAPI_doSomeWithUser_Args');
@@ -56,8 +55,8 @@ describe('generator for a6', () => {
     const outputSchemaMetadataFile = './a6.generated.definitions.tmp.json';
     let forgeSchemaResult;
     let validator;
-    beforeAll(() => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
-        forgeSchemaResult = yield (0, generator_1.forgeSchema)({
+    beforeAll(async () => {
+        forgeSchemaResult = await (0, generator_1.forgeSchema)({
             schemaId: 'test',
             tsconfigFrom: './tsconfig.build-test.json',
             sourcesDirectoryPattern: 'test-sources/a6',
@@ -68,19 +67,18 @@ describe('generator for a6', () => {
             explicitPublic: true,
         });
         validator = (0, validator_1.createSchemaForgeValidator)({}, true);
-        const schema = yield (0, generator_1.loadJSONSchema)([outputSchemaFile]);
+        const schema = await (0, generator_1.loadJSONSchema)([outputSchemaFile]);
         validator.addSchema(schema);
-    }));
-    afterAll(() => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
+    });
+    afterAll(async () => {
         if (!KEEP_ARTEFACTS) {
-            yield (0, promises_1.unlink)(outputSchemaFile).catch(noop_1.noop);
-            yield (0, promises_1.unlink)(outputSchemaMetadataFile).catch(noop_1.noop);
+            await (0, promises_1.unlink)(outputSchemaFile).catch(noop_1.noop);
+            await (0, promises_1.unlink)(outputSchemaMetadataFile).catch(noop_1.noop);
         }
-    }));
+    });
     it('generated schema should be valid', () => {
-        var _a;
         expect(forgeSchemaResult).toBeTruthy();
-        const defs = (_a = forgeSchemaResult === null || forgeSchemaResult === void 0 ? void 0 : forgeSchemaResult.schema) === null || _a === void 0 ? void 0 : _a.definitions;
+        const defs = forgeSchemaResult?.schema?.definitions;
         expect(defs).toBeTruthy();
         expect(validator.getValidator('test#/definitions/CollectionItemID1').schema).toStrictEqual({
             $ref: '#/definitions/UUID',
@@ -113,8 +111,8 @@ describe('generator for a5', () => {
     const outputSchemaMetadataFile = './a5.generated.definitions.tmp.json';
     let forgeSchemaResult;
     let validator;
-    beforeAll(() => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
-        forgeSchemaResult = yield (0, generator_1.forgeSchema)({
+    beforeAll(async () => {
+        forgeSchemaResult = await (0, generator_1.forgeSchema)({
             schemaId: 'test',
             tsconfigFrom: './tsconfig.build-test.json',
             sourcesDirectoryPattern: 'test-sources/a5',
@@ -125,19 +123,18 @@ describe('generator for a5', () => {
             explicitPublic: true,
         });
         validator = (0, validator_1.createSchemaForgeValidator)({}, true);
-        const schema = yield (0, generator_1.loadJSONSchema)([outputSchemaFile]);
+        const schema = await (0, generator_1.loadJSONSchema)([outputSchemaFile]);
         validator.addSchema(schema);
-    }));
-    afterAll(() => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
+    });
+    afterAll(async () => {
         if (!KEEP_ARTEFACTS) {
-            yield (0, promises_1.unlink)(outputSchemaFile).catch(noop_1.noop);
-            yield (0, promises_1.unlink)(outputSchemaMetadataFile).catch(noop_1.noop);
+            await (0, promises_1.unlink)(outputSchemaFile).catch(noop_1.noop);
+            await (0, promises_1.unlink)(outputSchemaMetadataFile).catch(noop_1.noop);
         }
-    }));
+    });
     it('generated schema should be valid', () => {
-        var _a;
         expect(forgeSchemaResult).toBeTruthy();
-        const defs = (_a = forgeSchemaResult === null || forgeSchemaResult === void 0 ? void 0 : forgeSchemaResult.schema) === null || _a === void 0 ? void 0 : _a.definitions;
+        const defs = forgeSchemaResult?.schema?.definitions;
         expect(defs).toBeTruthy();
         expect(Object.keys(defs)).toStrictEqual([
             'DomainNum',
@@ -225,8 +222,8 @@ describe('generator for a4', () => {
     const outputSchemaFile = './a4.generated.schema.tmp.json';
     const outputSchemaMetadataFile = './a4.generated.definitions.tmp.json';
     let forgeSchemaResult;
-    beforeAll(() => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
-        forgeSchemaResult = yield (0, generator_1.forgeSchema)({
+    beforeAll(async () => {
+        forgeSchemaResult = await (0, generator_1.forgeSchema)({
             tsconfigFrom: './tsconfig.build-test.json',
             sourcesDirectoryPattern: 'test-sources/a4',
             sourcesFilesPattern: 'service-api.ts',
@@ -235,17 +232,16 @@ describe('generator for a4', () => {
             expose: 'all',
             explicitPublic: false,
         });
-    }));
-    afterAll(() => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
+    });
+    afterAll(async () => {
         if (!KEEP_ARTEFACTS) {
-            yield (0, promises_1.unlink)(outputSchemaFile).catch(noop_1.noop);
-            yield (0, promises_1.unlink)(outputSchemaMetadataFile).catch(noop_1.noop);
+            await (0, promises_1.unlink)(outputSchemaFile).catch(noop_1.noop);
+            await (0, promises_1.unlink)(outputSchemaMetadataFile).catch(noop_1.noop);
         }
-    }));
+    });
     it('generated schema should be valid', () => {
-        var _a;
         expect(forgeSchemaResult).toBeTruthy();
-        const defs = (_a = forgeSchemaResult === null || forgeSchemaResult === void 0 ? void 0 : forgeSchemaResult.schema) === null || _a === void 0 ? void 0 : _a.definitions;
+        const defs = forgeSchemaResult?.schema?.definitions;
         expect(defs).toBeTruthy();
         expect(Object.keys(defs)).toStrictEqual(['API', 'Enum', 'FormatMode', 'Some', 'Some2']);
     });
@@ -254,8 +250,8 @@ describe('generator for a3', () => {
     const outputSchemaFile = './a3.generated.schema.tmp.json';
     const outputSchemaMetadataFile = './a3.generated.definitions.tmp.json';
     let forgeSchemaResult;
-    beforeAll(() => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
-        forgeSchemaResult = yield (0, generator_1.forgeSchema)({
+    beforeAll(async () => {
+        forgeSchemaResult = await (0, generator_1.forgeSchema)({
             tsconfigFrom: './tsconfig.build-test.json',
             sourcesDirectoryPattern: 'test-sources/a3',
             sourcesFilesPattern: 'service-api.ts',
@@ -263,26 +259,57 @@ describe('generator for a3', () => {
             outputSchemaMetadataFile,
             expose: 'all',
         });
-    }));
-    afterAll(() => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
+    });
+    afterAll(async () => {
         if (!KEEP_ARTEFACTS) {
-            yield (0, promises_1.unlink)(outputSchemaFile).catch(noop_1.noop);
-            yield (0, promises_1.unlink)(outputSchemaMetadataFile).catch(noop_1.noop);
+            await (0, promises_1.unlink)(outputSchemaFile).catch(noop_1.noop);
+            await (0, promises_1.unlink)(outputSchemaMetadataFile).catch(noop_1.noop);
         }
-    }));
+    });
     it('generated schema should be valid', () => {
         expect(forgeSchemaResult).toBeTruthy();
     });
     it('interface generics should works', () => {
-        var _a;
-        const props = (_a = forgeSchemaResult.schema.definitions) === null || _a === void 0 ? void 0 : _a.InterfaceWithGeneric_InterfaceDeclaration.properties;
+        const props = forgeSchemaResult.schema.definitions?.InterfaceWithGeneric_InterfaceDeclaration
+            .properties;
         expect(props).toBeTruthy();
         expect(props.propWithGeneric).toBeTruthy();
         expect(props.propWithGeneric.$ref).toStrictEqual('#/definitions/NonEmptyString');
     });
+    it('optional args in API methods should works', () => {
+        {
+            const props = forgeSchemaResult.schema.definitions?.API_methodG0_Args;
+            expect(props).toBeTruthy();
+            expect(props.minItems).toStrictEqual(0);
+            expect(props.maxItems).toStrictEqual(1);
+        }
+        {
+            const props = forgeSchemaResult.schema.definitions?.API_methodG1_Args;
+            expect(props).toBeTruthy();
+            expect(props.minItems).toStrictEqual(0);
+            expect(props.maxItems).toStrictEqual(2);
+        }
+        {
+            const props = forgeSchemaResult.schema.definitions?.API_methodG2_Args;
+            expect(props).toBeTruthy();
+            expect(props.minItems).toStrictEqual(1);
+            expect(props.maxItems).toStrictEqual(2);
+        }
+        // {
+        //     const props = forgeSchemaResult!.schema.definitions?.API_methodG3_Args;
+        //     expect(props).toBeTruthy();
+        //     expect(props.minItems).toStrictEqual(0);
+        //     expect(props.maxItems).toBeUndefined();
+        // }
+        // {
+        //     const props = forgeSchemaResult!.schema.definitions?.API_methodG4_Args;
+        //     expect(props).toBeTruthy();
+        //     expect(props.minItems).toStrictEqual(1);
+        //     expect(props.maxItems).toBeUndefined();
+        // }
+    });
     it('extends should works', () => {
-        var _a;
-        const props = (_a = forgeSchemaResult.schema.definitions) === null || _a === void 0 ? void 0 : _a.BAPI_InterfaceDeclaration.properties;
+        const props = forgeSchemaResult.schema.definitions?.BAPI_InterfaceDeclaration.properties;
         expect(props).toBeTruthy();
         expect(Object.keys(props)).toStrictEqual([
             'propertyA',
@@ -295,6 +322,9 @@ describe('generator for a3', () => {
             'methodE1',
             'methodE2',
             'methodF',
+            'methodG0',
+            'methodG1',
+            'methodG2',
             'methodY',
         ]);
     });
@@ -303,21 +333,21 @@ describe('generator for a2', () => {
     const outputSchemaFile = './a2.generated.schema.tmp.json';
     const outputSchemaMetadataFile = './a2.generated.definitions.tmp.json';
     let forgeSchemaResult;
-    beforeAll(() => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
-        forgeSchemaResult = yield (0, generator_1.forgeSchema)({
+    beforeAll(async () => {
+        forgeSchemaResult = await (0, generator_1.forgeSchema)({
             tsconfigFrom: './tsconfig.build-test.json',
             sourcesDirectoryPattern: 'test-sources/a2',
             sourcesFilesPattern: 'service-api.ts',
             outputSchemaFile,
             outputSchemaMetadataFile,
         });
-    }));
-    afterAll(() => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
+    });
+    afterAll(async () => {
         if (!KEEP_ARTEFACTS) {
-            yield (0, promises_1.unlink)(outputSchemaFile).catch(noop_1.noop);
-            yield (0, promises_1.unlink)(outputSchemaMetadataFile).catch(noop_1.noop);
+            await (0, promises_1.unlink)(outputSchemaFile).catch(noop_1.noop);
+            await (0, promises_1.unlink)(outputSchemaMetadataFile).catch(noop_1.noop);
         }
-    }));
+    });
     it('generated schema should be valid', () => {
         expect(forgeSchemaResult).toBeTruthy();
     });
@@ -328,8 +358,8 @@ describe('generator for a1', () => {
     const schemaId = 'test';
     let forgeSchemaResult;
     let validator;
-    beforeAll(() => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
-        forgeSchemaResult = yield (0, generator_1.forgeSchema)({
+    beforeAll(async () => {
+        forgeSchemaResult = await (0, generator_1.forgeSchema)({
             allowUseFallbackDescription: false,
             explicitPublic: true,
             schemaId,
@@ -340,15 +370,15 @@ describe('generator for a1', () => {
             outputSchemaMetadataFile,
         });
         validator = (0, validator_1.createSchemaForgeValidator)({}, true);
-        const schema = yield (0, generator_1.loadJSONSchema)([outputSchemaFile]);
+        const schema = await (0, generator_1.loadJSONSchema)([outputSchemaFile]);
         validator.addSchema(schema);
-    }), 10000);
-    afterAll(() => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
+    }, 10_000);
+    afterAll(async () => {
         if (!KEEP_ARTEFACTS) {
-            yield (0, promises_1.unlink)(outputSchemaFile).catch(noop_1.noop);
-            yield (0, promises_1.unlink)(outputSchemaMetadataFile).catch(noop_1.noop);
+            await (0, promises_1.unlink)(outputSchemaFile).catch(noop_1.noop);
+            await (0, promises_1.unlink)(outputSchemaMetadataFile).catch(noop_1.noop);
         }
-    }));
+    });
     it('generated schema should be valid', () => {
         expect(forgeSchemaResult).toBeTruthy();
         expect(forgeSchemaResult.schema.$id).toStrictEqual(schemaId);
@@ -535,4 +565,3 @@ describe('generator for a1', () => {
         expect(schema.properties.methodB.description).toStrictEqual('Description for methodB');
     });
 });
-//# sourceMappingURL=generator.spec.js.map

package/lib/index.d.ts

@@ -4,4 +4,3 @@ export declare function buildAPIInterfaceSchemaSignature(interfaceName: string):
 export declare function buildAPIInterfaceSchemaSignature(interfaceName: string, memberName: string): string;
 export declare function buildAPIInterfaceSchemaSignature(interfaceName: string, methodName: string, suffix: SchemaForgeSignatureSuffix): string;
 export declare function parseSchemaDefinitionInfo(name: string, schemaId: string): SchemaDefinitionInfo;
-//# sourceMappingURL=index.d.ts.map

package/lib/index.js

@@ -58,4 +58,3 @@ function parseSchemaDefinitionInfo(name, schemaId) {
             };
     }
 }
-//# sourceMappingURL=index.js.map

package/lib/types.d.ts

@@ -156,4 +156,3 @@ export interface SchemaForgeValidationResult {
 export type SchemaForgeValidationFunction<T = unknown> = ValidateFunction<T>;
 export type SchemaForgeValidationReport = ErrorObject[];
 export {};
-//# sourceMappingURL=types.d.ts.map

package/lib/types.js

@@ -15,4 +15,3 @@ var SchemaDefinitionKind;
     SchemaDefinitionKind[SchemaDefinitionKind["APIMethodResult"] = 2] = "APIMethodResult";
     SchemaDefinitionKind[SchemaDefinitionKind["APIMethodArguments"] = 3] = "APIMethodArguments";
 })(SchemaDefinitionKind || (exports.SchemaDefinitionKind = SchemaDefinitionKind = {}));
-//# sourceMappingURL=types.js.map

package/lib/util/format.error.d.ts

@@ -1,2 +1 @@
 export declare function formatSchemaForgeError(error: Error, dir?: string): string;
-//# sourceMappingURL=format.error.d.ts.map

package/lib/util/format.error.js

@@ -13,4 +13,3 @@ function formatSchemaForgeError(error, dir = '') {
     }
     return error.message || String(error);
 }
-//# sourceMappingURL=format.error.js.map

package/lib/util/patch.extended-annotations-reader.d.ts

@@ -1,2 +1 @@
 export {};
-//# sourceMappingURL=patch.extended-annotations-reader.d.ts.map

package/lib/util/patch.extended-annotations-reader.js

@@ -10,7 +10,6 @@ const tsc_1 = require("./tsc");
     // eslint-disable-next-line @typescript-eslint/unbound-method
     const getAnnotations = ts_json_schema_generator_1.ExtendedAnnotationsReader.prototype.getAnnotations;
     ts_json_schema_generator_1.ExtendedAnnotationsReader.prototype.getAnnotations = function getAnnotationsWithInheritance(node) {
-        var _a;
         if (!(0, tsc_1.hasJSDocTag)(node, 'inheritDoc'))
             return getAnnotations.call(this, node);
         // @ts-expect-error access to private property
@@ -30,7 +29,7 @@ const tsc_1 = require("./tsc");
                 ? checker.getAliasedSymbol(alias)
                 : undefined;
             const inheritedAnn = {};
-            if (symbol && ((_a = symbol.declarations) === null || _a === void 0 ? void 0 : _a.length)) {
+            if (symbol && symbol.declarations?.length) {
                 for (const declaration of symbol.declarations) {
                     const ann = getAnnotations.call(this, declaration);
                     if (ann)
@@ -47,4 +46,3 @@ const tsc_1 = require("./tsc");
         return (0, is_empty_1.isEmptyObject)(result) ? undefined : result;
     };
 }
-//# sourceMappingURL=patch.extended-annotations-reader.js.map

package/lib/util/sort-properties.d.ts

@@ -1,3 +1,2 @@
 import { SchemaObject } from 'ajv';
 export declare function sortProperties<T extends SchemaObject>(schema: T): T;
-//# sourceMappingURL=sort-properties.d.ts.map

package/lib/util/sort-properties.js

@@ -15,7 +15,6 @@ function sortProperties(schema) {
             !(0, is_empty_1.isEmptyObject)(target.properties));
     };
     const process = (item) => {
-        var _a;
         if (!item)
             return;
         if (Array.isArray(item)) {
@@ -24,7 +23,7 @@ function sortProperties(schema) {
         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)
+                if (item.required?.length)
                     item.required.sort(compare_1.compareStringsAsc);
             }
             if (typeof item === 'object') {
@@ -38,4 +37,3 @@ function sortProperties(schema) {
     }
     return schema;
 }
-//# sourceMappingURL=sort-properties.js.map

package/lib/util/tsc.d.ts

@@ -5,4 +5,3 @@ 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=tsc.d.ts.map