@tsofist/schema-forge 3.7.0 → 4.0.0

package/lib/dbml-generator/generator.spec.js

@@ -16,7 +16,7 @@ describe('DBML Generator', () => {
     let registry;
     beforeAll(async () => {
         forgeSchemaResult = await (0, forge_1.forgeSchema)({
-            allowUseFallbackDescription: false,
+            allowUseFallbackDescription: true,
             explicitPublic: true,
             schemaId,
             tsconfigFrom: './tsconfig.build-test.json',
@@ -39,7 +39,18 @@ describe('DBML Generator', () => {
         expect(forgeSchemaResult).toBeTruthy();
         expect(forgeSchemaResult.schema.$id).toStrictEqual(schemaId);
         expect(forgeSchemaResult.generatedTemporaryFiles.length).toStrictEqual(1);
-        expect(forgeSchemaResult.refs.length).toStrictEqual(13);
+        expect(forgeSchemaResult.refs.length).toStrictEqual(18);
+    });
+    describe('enums', () => {
+        it('should generate dbEnum definitions', () => {
+            const definitions = registry.listDefinitions((_info, keywords) => {
+                return keywords.has('dbEnum');
+            });
+            const list = definitions.map((def) => {
+                return registry.getSchema(def.ref);
+            });
+            expect(list).toMatchSnapshot();
+        });
     });
     it('basic cases', () => {
         const definitions = registry.listDefinitions((info, keywords) => {

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

@@ -1,4 +1,4 @@
-import type { ArrayMay, HexString } from '@tsofist/stem';
+import type { ArrayMay, HexString, PRec } from '@tsofist/stem';
 import type { SchemaDefinitionInfoForType } from '../definition-info/types';
 /**
  * DBML Project Source
@@ -144,4 +144,10 @@ export type DBMLColumnOptions = {
      */
     type?: DBMLColumnType;
 };
+export type DBMLEnumOptionsDef = boolean | string;
+export type DBMLEnumAnnotationOptions = PRec<[
+    /** 0 */ value: string | number,
+    /** 1 */ note?: string,
+    /** 2 */ comment?: string
+]>;
 //# sourceMappingURL=types.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/dbml-generator/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AACzD,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,0BAA0B,CAAC;AAE5E;;GAEG;AACH,MAAM,WAAW,gBAAgB;IAC7B,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,2BAA2B,EAAE,CAAC;IAC3C,OAAO,CAAC,EAAE,MAAM,CAAC;CACpB;AAED;;GAEG;AACH,MAAM,WAAW,eAAe;IAC5B,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,OAAO,CAAC,EAAE,MAAM,CAAC;CACpB;AAED;;GAEG;AACH,MAAM,WAAW,oBAAoB;IACjC,IAAI,CAAC,EAAE,eAAe,CAAC;IAIvB,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,YAAY,CAAC,EAAE,MAAM,EAAE,CAAC;CAc3B;AAED;;;;GAIG;AACH,eAAO,MAAM,iBAAiB,6DAQpB,CAAC;AAEX;;GAEG;AACH,eAAO,MAAM,kBAAkB,+ZAkCrB,CAAC;AAEX;;GAEG;AACH,MAAM,MAAM,cAAc,GAAG,CAAC,OAAO,kBAAkB,CAAC,CAAC,MAAM,CAAC,CAAC;AAEjE;;;;;GAKG;AACH,MAAM,MAAM,aAAa,GAAG,CAAC,OAAO,iBAAiB,CAAC,CAAC,MAAM,CAAC,CAAC;AAE/D;;;;GAIG;AACH,MAAM,MAAM,gBAAgB,GAAG;IAC3B;;;OAGG;IACH,IAAI,CAAC,EAAE,aAAa,CAAC;IACrB;;;OAGG;IACH,IAAI,CAAC,EAAE,MAAM,CAAC;IACd;;;OAGG;IACH,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB;;;OAGG;IACH,EAAE,CAAC,EAAE,OAAO,CAAC;IACb;;;OAGG;IACH,IAAI,CAAC,EAAE,MAAM,CAAC;IACd;;;OAGG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;CACpB,CAAC;AAEF,MAAM,MAAM,mBAAmB,CAAC,CAAC,SAAS,OAAO,GAAG,OAAO,IAAI,QAAQ,CACnE,gBAAgB,GAAG,MAAM,GAAG,CAAC,CAChC,CAAC;AAEF,MAAM,MAAM,wBAAwB,GAAG,OAAO,CAAC;AAC/C,MAAM,MAAM,qBAAqB,GAAG,wBAAwB,CAAC;AAE7D;;;;GAIG;AACH,MAAM,MAAM,iBAAiB,GAAG;IAC5B;;;;OAIG;IACH,IAAI,CAAC,EAAE,MAAM,CAAC;IACd;;;;;;OAMG;IACH,OAAO,CAAC,EAAE;QACN,CAAC,KAAK,EAAE,MAAM,GAAG,mBAAmB,CAAC,IAAI,CAAC,CAAC;KAC9C,CAAC;IACF;;;OAGG;IACH,IAAI,CAAC,EAAE,MAAM,CAAC;IACd;;;OAGG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB;;OAEG;IACH,KAAK,CAAC,EAAE,MAAM,CAAC;IACf;;OAEG;IACH,QAAQ,CAAC,EAAE;QAAE,WAAW,EAAE,SAAS,CAAA;KAAE,CAAC;CACzC,CAAC;AAEF,MAAM,MAAM,oBAAoB,GAAG,iBAAiB,GAAG,MAAM,CAAC;AAE9D,MAAM,MAAM,iBAAiB,GAAG;IAC5B;;;;OAIG;IACH,EAAE,CAAC,EAAE,OAAO,CAAC;IACb;;;;OAIG;IACH,IAAI,CAAC,EAAE,cAAc,CAAC;CACzB,CAAC"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/dbml-generator/types.ts"],"names":[],"mappings":"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"}

package/lib/definition-info/guards.d.ts

@@ -1,6 +1,12 @@
-import { APIInterfaceSDS, APIMemberSDS, APIMethodArgsSDS, APIMethodResultSDS } from './types';
+import type { ForgedSchemaDefinitionShortName } from '../types';
+import { APIInterfaceSDS, APIMemberSDS, APIMethodArgsSDS, APIMethodResultSDS, SchemaDefinitionInfo, SchemaDefinitionInfoForAPIInterface, SchemaDefinitionInfoForAPIMethodArguments, SchemaDefinitionInfoForAPIMethodResult, SchemaDefinitionInfoForType } from './types';
 export declare function isAPIDefinitionName(definitionName: string): definitionName is APIInterfaceSDS;
 export declare function isAPIMemberDefinitionName(definitionName: string): definitionName is APIMemberSDS;
 export declare function isAPIMethodArgsDefinitionName(definitionName: string): definitionName is APIMethodArgsSDS;
 export declare function isAPIMethodResultDefinitionName(definitionName: string): definitionName is APIMethodResultSDS;
+export declare function isSchemaDefinitionForType(value: SchemaDefinitionInfo): value is SchemaDefinitionInfoForType;
+export declare function isSchemaDefinitionForAPIInterface(value: SchemaDefinitionInfo): value is SchemaDefinitionInfoForAPIInterface;
+export declare function isSchemaDefinitionForAPIMethodArguments(value: SchemaDefinitionInfo): value is SchemaDefinitionInfoForAPIMethodArguments;
+export declare function isSchemaDefinitionForAPIMethodResult(value: SchemaDefinitionInfo): value is SchemaDefinitionInfoForAPIMethodResult;
+export declare function isSchemaDefinitionShortName(name: string): name is ForgedSchemaDefinitionShortName;
 //# sourceMappingURL=guards.d.ts.map

package/lib/definition-info/guards.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"guards.d.ts","sourceRoot":"","sources":["../../src/definition-info/guards.ts"],"names":[],"mappings":"AAAA,OAAO,EAIH,eAAe,EACf,YAAY,EACZ,gBAAgB,EAChB,kBAAkB,EAKrB,MAAM,SAAS,CAAC;AAEjB,wBAAgB,mBAAmB,CAAC,cAAc,EAAE,MAAM,GAAG,cAAc,IAAI,eAAe,CAE7F;AAED,wBAAgB,yBAAyB,CAAC,cAAc,EAAE,MAAM,GAAG,cAAc,IAAI,YAAY,CAEhG;AAED,wBAAgB,6BAA6B,CACzC,cAAc,EAAE,MAAM,GACvB,cAAc,IAAI,gBAAgB,CAKpC;AAED,wBAAgB,+BAA+B,CAC3C,cAAc,EAAE,MAAM,GACvB,cAAc,IAAI,kBAAkB,CAKtC"}
+{"version":3,"file":"guards.d.ts","sourceRoot":"","sources":["../../src/definition-info/guards.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,+BAA+B,EAAE,MAAM,UAAU,CAAC;AAChE,OAAO,EAIH,eAAe,EACf,YAAY,EACZ,gBAAgB,EAChB,kBAAkB,EAClB,oBAAoB,EACpB,mCAAmC,EACnC,yCAAyC,EACzC,sCAAsC,EACtC,2BAA2B,EAM9B,MAAM,SAAS,CAAC;AAEjB,wBAAgB,mBAAmB,CAAC,cAAc,EAAE,MAAM,GAAG,cAAc,IAAI,eAAe,CAE7F;AAED,wBAAgB,yBAAyB,CAAC,cAAc,EAAE,MAAM,GAAG,cAAc,IAAI,YAAY,CAEhG;AAED,wBAAgB,6BAA6B,CACzC,cAAc,EAAE,MAAM,GACvB,cAAc,IAAI,gBAAgB,CAKpC;AAED,wBAAgB,+BAA+B,CAC3C,cAAc,EAAE,MAAM,GACvB,cAAc,IAAI,kBAAkB,CAKtC;AAED,wBAAgB,yBAAyB,CACrC,KAAK,EAAE,oBAAoB,GAC5B,KAAK,IAAI,2BAA2B,CAEtC;AAED,wBAAgB,iCAAiC,CAC7C,KAAK,EAAE,oBAAoB,GAC5B,KAAK,IAAI,mCAAmC,CAE9C;AAED,wBAAgB,uCAAuC,CACnD,KAAK,EAAE,oBAAoB,GAC5B,KAAK,IAAI,yCAAyC,CAEpD;AAED,wBAAgB,oCAAoC,CAChD,KAAK,EAAE,oBAAoB,GAC5B,KAAK,IAAI,sCAAsC,CAEjD;AAED,wBAAgB,2BAA2B,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,IAAI,+BAA+B,CAEjG"}

package/lib/definition-info/guards.js

@@ -4,6 +4,11 @@ exports.isAPIDefinitionName = isAPIDefinitionName;
 exports.isAPIMemberDefinitionName = isAPIMemberDefinitionName;
 exports.isAPIMethodArgsDefinitionName = isAPIMethodArgsDefinitionName;
 exports.isAPIMethodResultDefinitionName = isAPIMethodResultDefinitionName;
+exports.isSchemaDefinitionForType = isSchemaDefinitionForType;
+exports.isSchemaDefinitionForAPIInterface = isSchemaDefinitionForAPIInterface;
+exports.isSchemaDefinitionForAPIMethodArguments = isSchemaDefinitionForAPIMethodArguments;
+exports.isSchemaDefinitionForAPIMethodResult = isSchemaDefinitionForAPIMethodResult;
+exports.isSchemaDefinitionShortName = isSchemaDefinitionShortName;
 const types_1 = require("./types");
 function isAPIDefinitionName(definitionName) {
     return definitionName.endsWith(types_1.SDS_SUFFIX_API) || definitionName.endsWith(types_1._SDS_SUFFIX_API);
@@ -19,3 +24,18 @@ function isAPIMethodResultDefinitionName(definitionName) {
     return (definitionName.endsWith(types_1.SDS_SUFFIX_METHOD_RES) ||
         definitionName.endsWith(types_1._SDS_SUFFIX_METHOD_RES));
 }
+function isSchemaDefinitionForType(value) {
+    return value.kind === types_1.SchemaDefinitionInfoKind.Type;
+}
+function isSchemaDefinitionForAPIInterface(value) {
+    return value.kind === types_1.SchemaDefinitionInfoKind.API;
+}
+function isSchemaDefinitionForAPIMethodArguments(value) {
+    return value.kind === types_1.SchemaDefinitionInfoKind.APIMethodArguments;
+}
+function isSchemaDefinitionForAPIMethodResult(value) {
+    return value.kind === types_1.SchemaDefinitionInfoKind.APIMethodResult;
+}
+function isSchemaDefinitionShortName(name) {
+    return name.startsWith('DSN') && name.includes('_H');
+}

package/lib/definition-info/parser.d.ts

@@ -1,3 +1,3 @@
 import { type SchemaDefinitionInfo } from './types';
-export declare function parseSchemaDefinitionInfo(definitionName: string, schemaId: string, legacy?: boolean): SchemaDefinitionInfo;
+export declare function parseSchemaDefinitionInfo<T extends SchemaDefinitionInfo>(definitionName: string, schemaId: string, legacy?: boolean): T;
 //# sourceMappingURL=parser.d.ts.map

package/lib/definition-info/parser.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"parser.d.ts","sourceRoot":"","sources":["../../src/definition-info/parser.ts"],"names":[],"mappings":"AAOA,OAAO,EAEH,KAAK,oBAAoB,EAG5B,MAAM,SAAS,CAAC;AAEjB,wBAAgB,yBAAyB,CACrC,cAAc,EAAE,MAAM,EACtB,QAAQ,EAAE,MAAM,EAChB,MAAM,UAAQ,GACf,oBAAoB,CAsCtB"}
+{"version":3,"file":"parser.d.ts","sourceRoot":"","sources":["../../src/definition-info/parser.ts"],"names":[],"mappings":"AAOA,OAAO,EAEH,KAAK,oBAAoB,EAG5B,MAAM,SAAS,CAAC;AAEjB,wBAAgB,yBAAyB,CAAC,CAAC,SAAS,oBAAoB,EACpE,cAAc,EAAE,MAAM,EACtB,QAAQ,EAAE,MAAM,EAChB,MAAM,CAAC,EAAE,OAAO,GACjB,CAAC,CAAC"}

package/lib/definition-info/parser.js

@@ -15,31 +15,31 @@ function parseSchemaDefinitionInfo(definitionName, schemaId, legacy = false) {
                 : types_1.SchemaDefinitionInfoKind.Type;
     const ref = (0, ref_1.buildSchemaDefinitionRef)(definitionName, schemaId);
     switch (kind) {
-        case types_1.SchemaDefinitionInfoKind.API:
+        case types_1.SchemaDefinitionInfoKind.Type:
             return {
                 ref,
-                kind,
-                name: definitionName,
                 schemaId,
-                interface: (0, substr_1.substr)(definitionName, 0, legacy ? types_1._SDS_SUFFIX_API : types_1.SDS_SUFFIX_API),
+                name: definitionName,
+                kind,
+                type: definitionName,
             };
         case types_1.SchemaDefinitionInfoKind.APIMethodArguments:
         case types_1.SchemaDefinitionInfoKind.APIMethodResult:
             return {
                 ref,
-                kind,
-                name: definitionName,
                 schemaId,
+                name: definitionName,
+                kind,
                 interface: (0, substr_1.substr)(definitionName, 0, '_'),
                 method: (0, substr_1.substr)(definitionName, '_', '_'),
             };
-        case types_1.SchemaDefinitionInfoKind.Type:
+        case types_1.SchemaDefinitionInfoKind.API:
             return {
                 ref,
-                kind,
-                name: definitionName,
                 schemaId,
-                type: definitionName,
+                name: definitionName,
+                kind,
+                interface: (0, substr_1.substr)(definitionName, 0, legacy ? types_1._SDS_SUFFIX_API : types_1.SDS_SUFFIX_API),
             };
     }
 }

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

@@ -1 +1 @@
-{"version":3,"file":"generator-host.d.ts","sourceRoot":"","sources":["../../src/fake-generator/generator-host.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAEpE,OAAO,KAAK,EAAE,iBAAiB,EAA2B,oBAAoB,EAAE,MAAM,SAAS,CAAC;AAEhG,wBAAgB,uBAAuB,CACnC,MAAM,EAAE,mBAAmB,EAC3B,OAAO,GAAE,oBAAyB,GACnC,iBAAiB,CA4CnB"}
+{"version":3,"file":"generator-host.d.ts","sourceRoot":"","sources":["../../src/fake-generator/generator-host.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAEpE,OAAO,KAAK,EAAE,iBAAiB,EAA2B,oBAAoB,EAAE,MAAM,SAAS,CAAC;AAEhG,wBAAgB,uBAAuB,CACnC,MAAM,EAAE,mBAAmB,EAC3B,OAAO,GAAE,oBAAyB,GACnC,iBAAiB,CA4CnB"}

package/lib/fake-generator/generator-host.js

@@ -4,6 +4,7 @@ exports.createFakeGeneratorHost = createFakeGeneratorHost;
 const fakerModule = require("@faker-js/faker");
 const as_array_1 = require("@tsofist/stem/lib/as-array");
 const json_schema_faker_1 = require("json-schema-faker");
+const types_1 = require("../schema-generator/types");
 const modules_1 = require("./modules");
 function createFakeGeneratorHost(source, options = {}) {
     const rebuild = () => {
@@ -28,7 +29,7 @@ function createFakeGeneratorHost(source, options = {}) {
         generator.option({
             alwaysFakeOptionals: true,
             refDepthMax: 1_000,
-            pruneProperties: ['dbEntity', 'dbIndex', 'dbColumn', 'dbFK'],
+            pruneProperties: types_1.SFG_EXTRA_TAGS.filter((name) => name.startsWith('db')),
             ...options,
             resolveJsonPath: false,
         });

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

@@ -1 +1 @@
-{"version":3,"file":"dereference.d.ts","sourceRoot":"","sources":["../../src/schema-dereference/dereference.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAE/C,OAAO,KAAK,EAAE,6BAA6B,EAAE,MAAM,SAAS,CAAC;AAE7D;;;;GAIG;AACH,wBAAgB,iBAAiB,CAC7B,MAAM,EAAE,WAAW,EACnB,OAAO,CAAC,EAAE,6BAA6B,GACxC,WAAW,GAAG,SAAS,CAAC"}
+{"version":3,"file":"dereference.d.ts","sourceRoot":"","sources":["../../src/schema-dereference/dereference.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAG/C,OAAO,KAAK,EAAE,6BAA6B,EAAE,MAAM,SAAS,CAAC;AAE7D;;;;GAIG;AACH,wBAAgB,iBAAiB,CAC7B,MAAM,EAAE,WAAW,EACnB,OAAO,CAAC,EAAE,6BAA6B,GACxC,WAAW,GAAG,SAAS,CAAC"}

package/lib/schema-dereference/dereference.js

@@ -10,7 +10,8 @@ function dereferenceSchema(raw, options = {}) {
         return cache.main.get(raw);
     const schema = structuredClone(raw);
     const seen = new WeakMap();
-    const { throwOnDereferenceFailure = true, onDereferenceFailure } = options;
+    const seenRefs = new Set();
+    const { throwOnDereferenceFailure = true, onDereferenceFailure, onDereferenceSuccess, definitionsSource = schema, } = options;
     function resolve(current, path) {
         if (current == undefined || typeof current !== 'object')
             return current;
@@ -25,7 +26,7 @@ function dereferenceSchema(raw, options = {}) {
         }
         // $ref
         if ('$ref' in current && typeof current.$ref === 'string') {
-            const resolvedSchema = resolveRef(cache, schema, current.$ref);
+            const resolvedSchema = resolveRef(cache, definitionsSource, current.$ref);
             if (resolvedSchema == null) {
                 const replacement = onDereferenceFailure && !throwOnDereferenceFailure
                     ? onDereferenceFailure(current.$ref, current, schema)
@@ -57,6 +58,10 @@ function dereferenceSchema(raw, options = {}) {
             delete result.$ref; // !
             Object.assign(placeholder, result);
             seen.set(resolvedSchema, result);
+            if (onDereferenceSuccess != null && !seenRefs.has($ref)) {
+                seenRefs.add($ref);
+                onDereferenceSuccess($ref, result);
+            }
             return result;
         }
         // Objects

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

@@ -1,6 +1,12 @@
+import type { DeepReadonly } from '@tsofist/stem';
 import type { JSONSchema7 } from 'json-schema';
+import type { ForgedSchema, SchemaForgeDefinitionRef } from '../types';
 import type { SchemaDereferenceSharedCache } from './cache';
 export interface SchemaForgeDereferenceOptions {
+    /**
+     * Handler called when a reference is successfully dereferenced.
+     */
+    onDereferenceSuccess?: (resolvedRef: SchemaForgeDefinitionRef, resolvedNode: DeepReadonly<JSONSchema7>) => void;
     /**
      * Handler called when dereferencing fails.
      *
@@ -29,6 +35,13 @@ export interface SchemaForgeDereferenceOptions {
      * @default DefaultSchemaDereferenceSharedCache
      */
     sharedCacheStorage?: SchemaDereferenceSharedCache;
+    /**
+     * Source of definitions for resolving $ref references.
+     * If not provided, the definitions from the root schema will be used.
+     *
+     * @see ForgedSchema
+     */
+    definitionsSource?: ForgedSchema | JSONSchema7;
 }
 export type SchemaForgeDereferenceFailureHandler = (unresolvedRef: string, currentNode: JSONSchema7, resultSchema: JSONSchema7) => JSONSchema7 | undefined;
 //# sourceMappingURL=types.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/schema-dereference/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC/C,OAAO,KAAK,EAAE,4BAA4B,EAAE,MAAM,SAAS,CAAC;AAE5D,MAAM,WAAW,6BAA6B;IAC1C;;;;;;OAMG;IACH,oBAAoB,CAAC,EAAE,oCAAoC,CAAC;IAC5D;;;;;;;;;OASG;IACH,yBAAyB,CAAC,EAAE,OAAO,CAAC;IACpC;;;;;;;OAOG;IACH,kBAAkB,CAAC,EAAE,4BAA4B,CAAC;CACrD;AAED,MAAM,MAAM,oCAAoC,GAAG,CAC/C,aAAa,EAAE,MAAM,EACrB,WAAW,EAAE,WAAW,EACxB,YAAY,EAAE,WAAW,KACxB,WAAW,GAAG,SAAS,CAAC"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/schema-dereference/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAClD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC/C,OAAO,KAAK,EAAE,YAAY,EAAE,wBAAwB,EAAE,MAAM,UAAU,CAAC;AACvE,OAAO,KAAK,EAAE,4BAA4B,EAAE,MAAM,SAAS,CAAC;AAE5D,MAAM,WAAW,6BAA6B;IAC1C;;OAEG;IACH,oBAAoB,CAAC,EAAE,CACnB,WAAW,EAAE,wBAAwB,EACrC,YAAY,EAAE,YAAY,CAAC,WAAW,CAAC,KACtC,IAAI,CAAC;IACV;;;;;;OAMG;IACH,oBAAoB,CAAC,EAAE,oCAAoC,CAAC;IAC5D;;;;;;;;;OASG;IACH,yBAAyB,CAAC,EAAE,OAAO,CAAC;IACpC;;;;;;;OAOG;IACH,kBAAkB,CAAC,EAAE,4BAA4B,CAAC;IAClD;;;;;OAKG;IACH,iBAAiB,CAAC,EAAE,YAAY,GAAG,WAAW,CAAC;CAClD;AAED,MAAM,MAAM,oCAAoC,GAAG,CAC/C,aAAa,EAAE,MAAM,EACrB,WAAW,EAAE,WAAW,EACxB,YAAY,EAAE,WAAW,KACxB,WAAW,GAAG,SAAS,CAAC"}

package/lib/schema-generator/extended-annotations-reader.js

@@ -4,13 +4,15 @@ const error_1 = require("@tsofist/stem/lib/error");
 const is_empty_1 = require("@tsofist/stem/lib/object/is-empty");
 const ts_json_schema_generator_1 = require("ts-json-schema-generator");
 const typescript_1 = require("typescript");
+const helpers_tsc_1 = require("./helpers-tsc");
 {
     // Support for @inheritDoc tag to enforce inheritance of annotations
     // todo rework
     // 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) {
-        // if (!hasJSDocTag(node, 'inheritDoc')) return getAnnotations.call(this, node);
+        if (!(0, helpers_tsc_1.hasJSDocTag)(node, 'inheritDoc'))
+            return getAnnotations.call(this, node);
         // @ts-expect-error access to private property
         const checker = this.typeChecker || (0, error_1.raise)('TypeChecker is not available');
         const result = {};

package/lib/schema-generator/forge.spec.js

@@ -14,6 +14,38 @@ const registry_1 = require("../schema-registry/registry");
 const forge_1 = require("./forge");
 /* eslint-disable @typescript-eslint/no-unsafe-argument */
 /* eslint-disable @typescript-eslint/no-unsafe-member-access */
+describe('validator for a9', () => {
+    const outputSchemaFile = './a9.generated.schema.tmp.json';
+    const outputSchemaMetadataFile = './a9.generated.definitions.tmp.json';
+    let registry;
+    let loadedSchema;
+    beforeAll(async () => {
+        await (0, forge_1.forgeSchema)({
+            schemaId: 'test',
+            allowUseFallbackDescription: true,
+            tsconfigFrom: './tsconfig.build-test.json',
+            sourcesDirectoryPattern: 'test-sources/a9',
+            sourcesFilesPattern: ['service-api.ts', 'types.ts'],
+            outputSchemaFile,
+            outputSchemaMetadataFile,
+            expose: 'export',
+            explicitPublic: true,
+        });
+        registry = (0, registry_1.createSchemaForgeRegistry)();
+        loadedSchema = await (0, loader_1.loadJSONSchema)([outputSchemaFile]);
+        registry.addSchema(loadedSchema);
+    });
+    afterAll(async () => {
+        if (!artefacts_policy_1.KEEP_SPEC_ARTEFACTS) {
+            await (0, promises_1.unlink)(outputSchemaFile).catch(noop_1.noop);
+            await (0, promises_1.unlink)(outputSchemaMetadataFile).catch(noop_1.noop);
+        }
+    });
+    it('schema should be generated correctly with enums', () => {
+        const schema = registry.getRootSchema('test');
+        expect(schema).toMatchSnapshot();
+    });
+});
 describe('generator for a8', () => {
     const outputSchemaFile = './a8.generated.schema.tmp.json';
     const outputSchemaMetadataFile = './a8.generated.definitions.tmp.json';
@@ -188,17 +220,45 @@ describe('generator for a6', () => {
             $ref: '#/definitions/UUID',
             format: 'uuid',
             description: 'This is Collection item ID (inherits from UUID)',
+            // see: 'https://ru.wikipedia.org/wiki/UUID Wikipedia',
+        });
+        expect(registry.getSchema('test#/definitions/CollectionItemID2')).toStrictEqual({
+            $ref: '#/definitions/UUID',
+            description: 'This is Collection item ID (non-inherits from UUID)',
+            $comment: 'This is a comment for CollectionItemID2',
+        });
+        expect(registry.getSchema('test#/definitions/CollectionItemID3')).toStrictEqual({
+            format: 'uuid',
+            type: 'string',
+            // see: 'https://ru.wikipedia.org/wiki/UUID Wikipedia',
         });
-        expect(registry.getValidator('test#/definitions/CollectionItemID2').schema).toStrictEqual({
+        expect(registry.getSchema('test#/definitions/CollectionItemID4')).toStrictEqual({
             $ref: '#/definitions/UUID',
+            description: 'This is Collection item ID (non-inherits from UUID)',
             format: 'uuid',
+        });
+        expect(registry.getSchema('test#/definitions/CollectionItemID6')).toStrictEqual({
+            $ref: '#/definitions/UUID',
             description: 'This is Collection item ID (non-inherits from UUID)',
+            dbFK: true,
+        });
+        expect(registry.getSchema('test#/definitions/CollectionItemID7')).toStrictEqual({
+            $ref: '#/definitions/UUID',
+            description: 'This is Collection item ID (non-inherits from UUID)',
+            dbFK: true,
+            format: 'uuid',
+        });
+        expect(registry.getSchema('test#/definitions/CollectionItemID5')).toStrictEqual({
+            format: 'uuid',
+            type: 'string',
+            // see: 'https://ru.wikipedia.org/wiki/UUID Wikipedia',
         });
         {
             const rec = registry.getValidator('test#/definitions/PRec<CollectionItem,UUID>').schema;
             expect(rec).toBeTruthy();
             expect(rec.propertyNames).toStrictEqual({
                 format: 'uuid',
+                // see: 'https://ru.wikipedia.org/wiki/UUID Wikipedia',
             });
         }
         {
@@ -207,6 +267,32 @@ describe('generator for a6', () => {
             expect(rec.propertyNames).toStrictEqual({
                 format: 'uuid',
                 description: 'This is Collection item ID (inherits from UUID)',
+                // see: 'https://ru.wikipedia.org/wiki/UUID Wikipedia',
+            });
+        }
+        {
+            const rec = registry.getValidator('test#/definitions/Rec<number,CollectionItemID4>').schema;
+            expect(rec).toBeTruthy();
+            expect(rec.propertyNames).toStrictEqual({
+                format: 'uuid',
+                description: 'This is Collection item ID (non-inherits from UUID)',
+            });
+        }
+        {
+            const rec = registry.getValidator('test#/definitions/Rec<number,CollectionItemID6>').schema;
+            expect(rec).toBeTruthy();
+            expect(rec.propertyNames).toStrictEqual({
+                dbFK: true,
+                description: 'This is Collection item ID (non-inherits from UUID)',
+            });
+        }
+        {
+            const rec = registry.getValidator('test#/definitions/Rec<number,CollectionItemID7>').schema;
+            expect(rec).toBeTruthy();
+            expect(rec.propertyNames).toStrictEqual({
+                dbFK: true,
+                format: 'uuid',
+                description: 'This is Collection item ID (non-inherits from UUID)',
             });
         }
     });
@@ -228,7 +314,7 @@ describe('generator for a5', () => {
             explicitPublic: true,
             shrinkDefinitionNames: (definitionName) => {
                 if (definitionName === 'NamesType')
-                    return 'NT';
+                    return 'DSN_H';
                 return undefined;
             },
         });
@@ -247,11 +333,11 @@ describe('generator for a5', () => {
         const defs = forgeSchemaResult?.schema?.definitions;
         expect(defs).toBeTruthy();
         expect((0, keys_1.keysOf)(defs)).toStrictEqual([
+            'DSN_H', // 'NamesType',
             'DomainNum',
             'DomainValue',
             'DomainValuesType',
             'FKColumn',
-            'NT', // 'NamesType',
             'NamesTypeAbnormal',
             'NumN',
             'Nums',
@@ -262,7 +348,7 @@ describe('generator for a5', () => {
             'VariadicList',
             'VariadicList1',
         ]);
-        expect(registry.getValidator('test#/definitions/NT').schema).toStrictEqual({
+        expect(registry.getValidator('test#/definitions/DSN_H').schema).toStrictEqual({
             type: 'string',
             enum: ['v:name1', 'v:name2'],
         });
@@ -273,7 +359,7 @@ describe('generator for a5', () => {
             $ref: '#/definitions/UUID',
             dbFK: true,
             description: 'Foreign Key Column Type.',
-            format: 'uuid',
+            // format: 'uuid',
         });
         expect(registry.getValidator('test#/definitions/Some').schema).toStrictEqual({
             type: 'object',
@@ -282,7 +368,7 @@ describe('generator for a5', () => {
                     $ref: '#/definitions/DomainValuesType',
                 },
                 name0: {
-                    $ref: '#/definitions/NT',
+                    $ref: '#/definitions/DSN_H',
                 },
                 name1: {
                     type: 'string',
@@ -384,6 +470,7 @@ describe('generator for a5', () => {
         expect(v.properties.ref0).toStrictEqual({
             type: 'string',
             format: 'uuid',
+            // see: 'https://ru.wikipedia.org/wiki/UUID Wikipedia',
             description: 'Inline Foreign Key',
             dbFK: true,
         });
@@ -391,6 +478,7 @@ describe('generator for a5', () => {
             type: 'string',
             format: 'uuid',
             description: 'Foreign Key Column Type.',
+            // see: 'https://ru.wikipedia.org/wiki/UUID Wikipedia',
             dbFK: true,
         });
         expect(v.properties.ref2).toStrictEqual({
@@ -398,6 +486,7 @@ describe('generator for a5', () => {
             format: 'uuid',
             description: 'Inline Foreign Key (2)',
             dbFK: true,
+            // see: 'https://ru.wikipedia.org/wiki/UUID Wikipedia',
         });
     });
 });
@@ -462,7 +551,6 @@ describe('generator for a3', () => {
         const props = forgeSchemaResult.schema.definitions?.InterfaceWithGeneric__APIInterface?.properties;
         expect(props).toBeTruthy();
         expect(props.propWithGeneric).toBeTruthy();
-        // @ts-expect-error It's a test
         expect(props.propWithGeneric.$ref).toStrictEqual('#/definitions/NonEmptyString');
     });
     it('optional args in API methods should works', () => {
@@ -577,6 +665,7 @@ describe('generator for a1', () => {
     it('getSchema', () => {
         expect(validator.getValidator('test#/definitions/PositiveInt').schema).toStrictEqual({
             type: 'integer',
+            // see: 'Int',
             minimum: 1,
             maximum: 9007199254740991,
             description: 'Positive integer value.',

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

@@ -1 +1 @@
-{"version":3,"file":"generate-drafts.d.ts","sourceRoot":"","sources":["../../src/schema-generator/generate-drafts.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,KAAK,eAAe,EAAkB,MAAM,0CAA0C,CAAC;AAmChG,OAAO,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAC;AAW9C;;GAEG;AACH,wBAAsB,sBAAsB,CAAC,OAAO,EAAE,YAAY;;;;;GAiCjE;AA6WD,UAAU,YAAa,SAAQ,kBAAkB;IAC7C,QAAQ,EAAE,MAAM,CAAC;IACjB,cAAc,EAAE,MAAM,EAAE,CAAC;CAC5B"}
+{"version":3,"file":"generate-drafts.d.ts","sourceRoot":"","sources":["../../src/schema-generator/generate-drafts.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,KAAK,eAAe,EAAkB,MAAM,0CAA0C,CAAC;AAmChG,OAAO,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAC;AAW9C;;GAEG;AACH,wBAAsB,sBAAsB,CAAC,OAAO,EAAE,YAAY;;;;;GAkCjE;AA6WD,UAAU,YAAa,SAAQ,kBAAkB;IAC7C,QAAQ,EAAE,MAAM,CAAC;IACjB,cAAc,EAAE,MAAM,EAAE,CAAC;CAC5B"}

package/lib/schema-generator/generate-drafts.js

@@ -21,6 +21,7 @@ async function generateDraftTypeFiles(options) {
         expose: options.expose ?? types_1.SFG_CONFIG_DEFAULTS.expose,
         path: options.sourcesPattern.length > 1 ? undefined : options.sourcesPattern[0],
         tsconfig: options.tsconfig,
+        skipTypeCheck: options.skipTypeCheck ?? types_1.SFG_CONFIG_DEFAULTS.skipTypeCheck,
         discriminatorType: Config_1.DEFAULT_CONFIG.discriminatorType,
         ...types_1.SFG_CONFIG_MANDATORY,
     };

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

@@ -1,6 +1,6 @@
 import './extended-annotations-reader';
 import { CompletedConfig } from 'ts-json-schema-generator';
-import type { ForgedSchema, ForgeSchemaOptions } from '../types';
+import { ForgedSchema, ForgeSchemaOptions } from '../types';
 /**
  * @internal
  */

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

@@ -1 +1 @@
-{"version":3,"file":"generate-schema.d.ts","sourceRoot":"","sources":["../../src/schema-generator/generate-schema.ts"],"names":[],"mappings":"AAAA,OAAO,+BAA+B,CAAC;AAKvC,OAAO,EAGH,eAAe,EAgBlB,MAAM,0BAA0B,CAAC;AAelC,OAAO,KAAK,EAAE,YAAY,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAC;AAMjE;;GAEG;AACH,wBAAsB,0BAA0B,CAAC,OAAO,EAAE,eAAe,GAAG,OAAO,CAAC,YAAY,CAAC,CAgGhG;AAsGD,UAAU,eAAgB,SAAQ,kBAAkB;IAChD,QAAQ,EAAE,MAAM,CAAC;IACjB,WAAW,EAAE,SAAS,MAAM,EAAE,CAAC;IAC/B,2BAA2B,EAAE,eAAe,CAAC;CAChD"}
+{"version":3,"file":"generate-schema.d.ts","sourceRoot":"","sources":["../../src/schema-generator/generate-schema.ts"],"names":[],"mappings":"AAAA,OAAO,+BAA+B,CAAC;AAMvC,OAAO,EAIH,eAAe,EAqBlB,MAAM,0BAA0B,CAAC;AAgBlC,OAAO,EAAwB,YAAY,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAC;AAOlF;;GAEG;AACH,wBAAsB,0BAA0B,CAAC,OAAO,EAAE,eAAe,GAAG,OAAO,CAAC,YAAY,CAAC,CAwGhG;AA0JD,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/schema-generator/generate-schema.js

@@ -3,11 +3,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateSchemaByDraftTypes = generateSchemaByDraftTypes;
 require("./extended-annotations-reader");
 const error_1 = require("@tsofist/stem/lib/error");
+const value_in_1 = require("@tsofist/stem/lib/value-in");
 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 helpers_tsc_1 = require("./helpers-tsc");
+const patch_enum_node_parser_1 = require("./patch-enum-node-parser");
 const shrink_definition_name_1 = require("./shrink-definition-name");
 const sort_properties_1 = require("./sort-properties");
 const types_1 = require("./types");
@@ -30,6 +32,7 @@ async function generateSchemaByDraftTypes(options) {
         expose: options.expose ?? types_1.SFG_CONFIG_DEFAULTS.expose,
         path: `${options.sourcesDirectoryPattern}/*${types_1.TMP_FILES_SUFFIX}.ts`,
         tsconfig: options.tsconfig,
+        skipTypeCheck: options.skipTypeCheck ?? types_1.SFG_CONFIG_DEFAULTS.skipTypeCheck,
         discriminatorType: options.discriminatorType ?? ts_json_schema_generator_1.DEFAULT_CONFIG.discriminatorType,
         ...types_1.SFG_CONFIG_MANDATORY,
     };
@@ -41,15 +44,19 @@ async function generateSchemaByDraftTypes(options) {
         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);
+    const enumMetadataMap = new Map();
+    (0, patch_enum_node_parser_1.patchEnumNodeParser)(parser, typeChecker, enumMetadataMap, allowUseFallbackDescription);
+    const formatter = (0, ts_json_schema_generator_1.createFormatter)(options.sourcesTypesGeneratorConfig, (formatter) => {
+        formatter.addTypeFormatter(new EnumTypeFormatterEx(enumMetadataMap));
+    });
+    const generator = new SchemaGeneratorEx(generatorProgram, parser, formatter, generatorConfig);
     const result = {
         $schema: 'http://json-schema.org/draft-07/schema#',
         $id: options.schemaId,
+        version: undefined,
         hash: '',
         title: undefined,
         description: undefined,
-        version: undefined,
         $comment: undefined,
     };
     const defs = (result.definitions ??= {});
@@ -98,8 +105,46 @@ async function generateSchemaByDraftTypes(options) {
     }).validateSchema(result, true);
     return result;
 }
-function escapeDefinitionNameForJSONPath(value) {
-    return value.replace(/\\/g, '\\\\').replace(/"/g, '\\"');
+class EnumTypeFormatterEx extends ts_json_schema_generator_1.EnumTypeFormatter {
+    constructor(metaMap) {
+        super();
+        Object.defineProperty(this, "metaMap", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: metaMap
+        });
+    }
+    getDefinition(type) {
+        const id = type.getId();
+        const inherited = super.getDefinition(type);
+        if (inherited?.enum) {
+            let count = 0;
+            const annotations = {};
+            for (const value of inherited.enum) {
+                if ((0, value_in_1.valueIn)(typeof value, ['string', 'number'])) {
+                    const v = value;
+                    const key = `${id}.${v}`;
+                    const doc = this.metaMap.get(key);
+                    if (doc) {
+                        count++;
+                        const ann = (annotations[doc.title] = [doc.value]);
+                        if (doc.description)
+                            ann.push(doc.description);
+                        if (doc.comment)
+                            ann.push(doc.comment);
+                    }
+                }
+            }
+            if (count > 0) {
+                return {
+                    ...inherited,
+                    enumAnnotation: annotations,
+                };
+            }
+        }
+        return inherited;
+    }
 }
 class TypeofNodeParserEx extends ts_json_schema_generator_1.TypeofNodeParser {
     createType(node, context, reference) {
@@ -184,6 +229,18 @@ class ArrayLiteralExpressionIdentifierParser {
         }
     }
 }
+class SchemaGeneratorEx extends ts_json_schema_generator_1.SchemaGenerator {
+    appendRootChildDefinitions(rootType, childDefinitions) {
+        try {
+            super.appendRootChildDefinitions(rootType, childDefinitions);
+        }
+        catch (e) {
+            if (e instanceof ts_json_schema_generator_1.MultipleDefinitionsError) {
+                // console.log('DUPL:', e.defA.getName()); // todo
+            }
+        }
+    }
+}
 function getIdentifierLiteralValue(node, checker) {
     const type = checker.getTypeAtLocation(node);
     if (type.isNumberLiteral() || type.isStringLiteral()) {
@@ -191,3 +248,6 @@ function getIdentifierLiteralValue(node, checker) {
     }
     return undefined;
 }
+function escapeDefinitionNameForJSONPath(value) {
+    return value.replace(/\\/g, '\\\\').replace(/"/g, '\\"');
+}

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

@@ -1,7 +1,9 @@
 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 readJSDocTagValue(node: Node, tagName: string): 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 readNodeName(node: Node): string | undefined;
 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;