@tsofist/schema-forge 3.7.1 → 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/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,6 +220,7 @@ 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',
@@ -197,6 +230,7 @@ describe('generator for a6', () => {
         expect(registry.getSchema('test#/definitions/CollectionItemID3')).toStrictEqual({
             format: 'uuid',
             type: 'string',
+            // see: 'https://ru.wikipedia.org/wiki/UUID Wikipedia',
         });
         expect(registry.getSchema('test#/definitions/CollectionItemID4')).toStrictEqual({
             $ref: '#/definitions/UUID',
@@ -217,12 +251,14 @@ describe('generator for a6', () => {
         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',
             });
         }
         {
@@ -231,6 +267,7 @@ 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',
             });
         }
         {
@@ -277,7 +314,7 @@ describe('generator for a5', () => {
             explicitPublic: true,
             shrinkDefinitionNames: (definitionName) => {
                 if (definitionName === 'NamesType')
-                    return 'NT';
+                    return 'DSN_H';
                 return undefined;
             },
         });
@@ -296,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',
@@ -311,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'],
         });
@@ -331,7 +368,7 @@ describe('generator for a5', () => {
                     $ref: '#/definitions/DomainValuesType',
                 },
                 name0: {
-                    $ref: '#/definitions/NT',
+                    $ref: '#/definitions/DSN_H',
                 },
                 name1: {
                     type: 'string',
@@ -433,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,
         });
@@ -440,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({
@@ -447,6 +486,7 @@ describe('generator for a5', () => {
             format: 'uuid',
             description: 'Inline Foreign Key (2)',
             dbFK: true,
+            // see: 'https://ru.wikipedia.org/wiki/UUID Wikipedia',
         });
     });
 });
@@ -511,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', () => {
@@ -626,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;

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

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

package/lib/schema-generator/helpers-tsc.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.readMemberTypeName = readMemberTypeName;
+exports.readJSDocTagValue = readJSDocTagValue;
 exports.readJSDocDescription = readJSDocDescription;
 exports.readNodeName = readNodeName;
 exports.readInterfaceGenericText = readInterfaceGenericText;
@@ -20,6 +21,19 @@ function readMemberTypeName(member) {
     }
     return type?.getText();
 }
+function readJSDocTagValue(node, tagName) {
+    let value = undefined;
+    {
+        const isTag = (tag) => {
+            if (tag.tagName.escapedText === tagName) {
+                value = (0, typescript_1.getTextOfJSDocComment)(tag.comment);
+            }
+            return value !== undefined;
+        };
+        (0, typescript_1.getAllJSDocTags)(node, isTag);
+    }
+    return value;
+}
 function readJSDocDescription(node, allowUseFallbackDescription, allowUseFallbackDescriptionFromParent = true) {
     let value = undefined;
     let fallback = undefined;
@@ -51,7 +65,10 @@ function readJSDocDescription(node, allowUseFallbackDescription, allowUseFallbac
     return value;
 }
 function readNodeName(node) {
-    return node.name.escapedText + '';
+    if ('name' in node && !!node.name) {
+        return node.name.escapedText + '';
+    }
+    return undefined;
 }
 function readInterfaceGenericText(node) {
     if ((0, typescript_1.isInterfaceDeclaration)(node) && node.typeParameters?.length) {

package/lib/schema-generator/patch-enum-node-parser.d.ts

@@ -0,0 +1,12 @@
+import { NodeParser } from 'ts-json-schema-generator';
+import { TypeChecker } from 'typescript';
+export declare function patchEnumNodeParser(root: NodeParser, checker: TypeChecker, meta: SFEnumMetadataMap, allowUseFallbackDescription: boolean | undefined): undefined;
+export type SFEnumMetadata = {
+    typeName: string;
+    title: string;
+    value: string | number;
+    description: string | undefined;
+    comment: string | undefined;
+};
+export type SFEnumMetadataMap = Map<string, SFEnumMetadata>;
+//# sourceMappingURL=patch-enum-node-parser.d.ts.map

package/lib/schema-generator/patch-enum-node-parser.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"patch-enum-node-parser.d.ts","sourceRoot":"","sources":["../../src/schema-generator/patch-enum-node-parser.ts"],"names":[],"mappings":"AACA,OAAO,EAKH,UAAU,EAEb,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAA6C,WAAW,EAAE,MAAM,YAAY,CAAC;AAGpF,wBAAgB,mBAAmB,CAC/B,IAAI,EAAE,UAAU,EAChB,OAAO,EAAE,WAAW,EACpB,IAAI,EAAE,iBAAiB,EACvB,2BAA2B,EAAE,OAAO,GAAG,SAAS,aAwEnD;AAED,MAAM,MAAM,cAAc,GAAG;IACzB,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,GAAG,MAAM,CAAC;IACvB,WAAW,EAAE,MAAM,GAAG,SAAS,CAAC;IAChC,OAAO,EAAE,MAAM,GAAG,SAAS,CAAC;CAC/B,CAAC;AAEF,MAAM,MAAM,iBAAiB,GAAG,GAAG,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC"}

package/lib/schema-generator/patch-enum-node-parser.js

@@ -0,0 +1,54 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.patchEnumNodeParser = patchEnumNodeParser;
+const error_1 = require("@tsofist/stem/lib/error");
+const ts_json_schema_generator_1 = require("ts-json-schema-generator");
+const typescript_1 = require("typescript");
+const helpers_tsc_1 = require("./helpers-tsc");
+function patchEnumNodeParser(root, checker, meta, allowUseFallbackDescription) {
+    const stack = root.childNodeParser.nodeParsers;
+    const enumNodeParser = stack.find((parser) => {
+        return (
+        //
+        parser instanceof ts_json_schema_generator_1.ExposeNodeParser &&
+            // @ts-expect-error It's a access-hack
+            parser.subNodeParser instanceof ts_json_schema_generator_1.AnnotatedNodeParser &&
+            // @ts-expect-error It's a access-hack
+            parser.subNodeParser.childNodeParser instanceof ts_json_schema_generator_1.EnumNodeParser);
+    });
+    if (!enumNodeParser) {
+        return (0, error_1.raise)(`Failed to patch EnumNodeParser, not found in stack`);
+    }
+    const originalCreateType = enumNodeParser.subNodeParser.childNodeParser.createType.bind(enumNodeParser.subNodeParser.childNodeParser);
+    enumNodeParser.subNodeParser.childNodeParser.createType = function PatchedCreateType() {
+        // eslint-disable-next-line prefer-rest-params
+        const node = arguments[0];
+        const typeName = (0, helpers_tsc_1.readNodeName)(node);
+        const result = originalCreateType.apply(this, 
+        // @ts-expect-error It's a access-hack
+        // eslint-disable-next-line prefer-rest-params
+        arguments);
+        const resultId = result.getId();
+        if ((0, typescript_1.isEnumMember)(node)) {
+            // todo EnumMember!
+            return result;
+        }
+        else {
+            for (const member of node.members) {
+                const memberValue = checker.getConstantValue(member);
+                const memberName = (0, helpers_tsc_1.readNodeName)(member);
+                const description = (0, helpers_tsc_1.readJSDocDescription)(member, allowUseFallbackDescription);
+                const comment = (0, helpers_tsc_1.readJSDocTagValue)(member, 'comment');
+                const metaKey = `${resultId}.${String(memberValue)}`;
+                meta.set(metaKey, {
+                    typeName,
+                    title: memberName,
+                    value: memberValue,
+                    description,
+                    comment,
+                });
+            }
+            return result;
+        }
+    };
+}

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

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

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

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

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

@@ -6,7 +6,7 @@ const node_crypto_1 = require("node:crypto");
  * Shrink definition name by removing generic type parameters
  *   and appending a digest of the removed part.
  */
-function shrinkDefinitionName(definitionName, suffixLength = 8) {
+function shrinkDefinitionName(definitionName, suffixLength = 6) {
     const startPos = definitionName.indexOf('<');
     if (startPos >= 0) {
         const hashSource = definitionName.substring(startPos);
@@ -15,7 +15,7 @@ function shrinkDefinitionName(definitionName, suffixLength = 8) {
             .update(hashSource)
             .digest('hex')
             .substring(0, suffixLength);
-        return `${prefix}_H${digest}`;
+        return `DSN${prefix}_H${digest}`;
     }
     return undefined;
 }

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

@@ -1,19 +1,20 @@
 export declare const TMP_FILES_SUFFIX = ".schema-forge.temporary-generated.tmp";
+export declare const SFG_EXTRA_TAGS: readonly ["apiInterface", "apiProperty", "apiMethod", "apiMember", "dbFK", "dbEntity", "dbColumn", "dbIndex", "dbEnum", "enumAnnotation", "enumMember", "spec", "faker", "version", "hash"];
 export declare const SFG_CONFIG_DEFAULTS: {
-    readonly sortProps: true;
     readonly additionalProperties: false;
-    readonly expose: "export";
-    readonly strictTuples: true;
-    readonly extraTags: ["apiMember", "apiMethod", "apiInterface", "apiProperty", "dbColumn", "dbIndex", "dbEntity", "dbFK", "faker"];
-    readonly encodeRefs: false;
-    readonly markdownDescription: false;
     readonly discriminatorType: undefined;
+    readonly encodeRefs: false;
+    readonly expose: "export";
+    readonly extraTags: ("spec" | "hash" | "dbEntity" | "dbFK" | "dbColumn" | "dbIndex" | "dbEnum" | "enumAnnotation" | "version" | "apiInterface" | "apiProperty" | "apiMethod" | "apiMember" | "enumMember" | "faker")[];
     readonly functions: "hide";
+    readonly markdownDescription: false;
+    readonly skipTypeCheck: false;
+    readonly sortProps: true;
+    readonly strictTuples: true;
 };
 export type SF_EXTRA_JSS_TAG_NAME = (typeof SFG_CONFIG_DEFAULTS)['extraTags'][number];
 export declare const SFG_CONFIG_MANDATORY: {
     readonly jsDoc: "extended";
     readonly topRef: true;
-    readonly skipTypeCheck: false;
 };
 //# sourceMappingURL=types.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/schema-generator/types.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,gBAAgB,0CAA0C,CAAC;AAExE,eAAO,MAAM,mBAAmB;;;;;;;;;;CAuBL,CAAC;AAE5B,MAAM,MAAM,qBAAqB,GAAG,CAAC,OAAO,mBAAmB,CAAC,CAAC,WAAW,CAAC,CAAC,MAAM,CAAC,CAAC;AAEtF,eAAO,MAAM,oBAAoB;;;;CAIN,CAAC"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/schema-generator/types.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,gBAAgB,0CAA0C,CAAC;AAExE,eAAO,MAAM,cAAc,6LAsBjB,CAAC;AAEX,eAAO,MAAM,mBAAmB;;;;;;;;;;;CAWL,CAAC;AAE5B,MAAM,MAAM,qBAAqB,GAAG,CAAC,OAAO,mBAAmB,CAAC,CAAC,WAAW,CAAC,CAAC,MAAM,CAAC,CAAC;AAEtF,eAAO,MAAM,oBAAoB;;;CAGN,CAAC"}

package/lib/schema-generator/types.js

@@ -1,33 +1,43 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.SFG_CONFIG_MANDATORY = exports.SFG_CONFIG_DEFAULTS = exports.TMP_FILES_SUFFIX = void 0;
+exports.SFG_CONFIG_MANDATORY = exports.SFG_CONFIG_DEFAULTS = exports.SFG_EXTRA_TAGS = exports.TMP_FILES_SUFFIX = void 0;
 exports.TMP_FILES_SUFFIX = '.schema-forge.temporary-generated.tmp';
+exports.SFG_EXTRA_TAGS = [
+    //
+    'apiInterface',
+    'apiProperty',
+    'apiMethod',
+    'apiMember',
+    //
+    'dbFK',
+    'dbEntity',
+    'dbColumn',
+    'dbIndex',
+    'dbEnum',
+    //
+    'enumAnnotation',
+    'enumMember',
+    // 'see',
+    'spec',
+    //
+    'faker',
+    //
+    'version',
+    'hash',
+];
 exports.SFG_CONFIG_DEFAULTS = {
-    sortProps: true,
     additionalProperties: false,
-    expose: 'export',
-    strictTuples: true,
-    extraTags: [
-        //
-        'apiMember',
-        'apiMethod',
-        'apiInterface',
-        'apiProperty',
-        //
-        'dbColumn',
-        'dbIndex',
-        'dbEntity',
-        'dbFK',
-        //
-        'faker',
-    ],
-    encodeRefs: false,
-    markdownDescription: false,
     discriminatorType: undefined,
+    encodeRefs: false,
+    expose: 'export',
+    extraTags: Array.from(exports.SFG_EXTRA_TAGS),
     functions: 'hide',
+    markdownDescription: false,
+    skipTypeCheck: false,
+    sortProps: true,
+    strictTuples: true,
 };
 exports.SFG_CONFIG_MANDATORY = {
     jsDoc: 'extended',
     topRef: true,
-    skipTypeCheck: false,
 };

package/lib/schema-registry/kw-api.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"kw-api.d.ts","sourceRoot":"","sources":["../../src/schema-registry/kw-api.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,KAAK,CAAC;AAO7C,eAAO,MAAM,wBAAwB,EAAE,SAAS,iBAAiB,EAiBvD,CAAC"}
+{"version":3,"file":"kw-api.d.ts","sourceRoot":"","sources":["../../src/schema-registry/kw-api.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,KAAK,CAAC;AAQ7C,eAAO,MAAM,wBAAwB,EAAE,SAAS,iBAAiB,EAmB7D,CAAC"}

package/lib/schema-registry/kw-api.js

@@ -7,19 +7,19 @@ const NP_API_METHOD = NP_API_PROP;
 const NP_API_MEMBER = `${NP_API_INTERFACE.substring(0, NP_API_INTERFACE.length - 1)}#${NP_API_PROP.substring(1)}`;
 exports.SFRAPIDefinitionKeywords = [
     {
-        keyword: ['interface', 'apiInterface'],
+        keyword: 'apiInterface',
         metaSchema: { type: 'string', pattern: NP_API_INTERFACE },
     },
     {
-        keyword: ['property', 'apiProperty'],
+        keyword: 'apiProperty',
         metaSchema: { type: 'string', pattern: NP_API_PROP },
     },
     {
-        keyword: ['method', 'apiMethod'],
+        keyword: 'apiMethod',
         metaSchema: { type: 'string', pattern: NP_API_METHOD },
     },
     {
-        keyword: ['member', 'apiMember'],
+        keyword: 'apiMember',
         metaSchema: { type: 'string', pattern: NP_API_MEMBER },
     },
 ];

package/lib/schema-registry/kw-common.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"kw-common.d.ts","sourceRoot":"","sources":["../../src/schema-registry/kw-common.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,KAAK,CAAC;AAI7C,eAAO,MAAM,iBAAiB,EAAE,SAAS,iBAAiB,EA0ChD,CAAC"}
+{"version":3,"file":"kw-common.d.ts","sourceRoot":"","sources":["../../src/schema-registry/kw-common.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,KAAK,CAAC;AAQ7C,eAAO,MAAM,iBAAiB,EAAE,SAAS,iBAAiB,EAsFtD,CAAC"}

package/lib/schema-registry/kw-common.js

@@ -2,6 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SFRCommonKeywords = void 0;
 const FakerModulePattern = '^[a-zA-Z.]+$';
+const NP_ENUM_KEY = '^[a-zA-Z0-9-\\._]+$';
+const NP_ENUM_VALUE = '^[a-zA-Z0-9-\\._:]+$';
 exports.SFRCommonKeywords = [
     {
         keyword: 'version',
@@ -13,6 +15,48 @@ exports.SFRCommonKeywords = [
         dependencies: ['$id', '$schema'],
         metaSchema: { type: 'string' },
     },
+    // {
+    //     keyword: 'see',
+    //     metaSchema: {
+    //         additionalProperties: false,
+    //         type: ['string', 'array'],
+    //         items: {
+    //             anyOf: [
+    //                 { type: 'string', format: 'uri' },
+    //                 {
+    //                     type: 'array',
+    //                     items: [{ type: 'string', format: 'uri' }, { type: 'string' }],
+    //                     minItems: 2,
+    //                 },
+    //             ],
+    //         },
+    //     },
+    // },
+    {
+        keyword: 'spec',
+        metaSchema: {
+            type: 'array',
+            items: { type: 'string' },
+        },
+    },
+    {
+        keyword: 'enumAnnotation',
+        dependencies: ['enum'],
+        metaSchema: {
+            type: 'object',
+            propertyNames: { type: 'string', pattern: NP_ENUM_KEY },
+            additionalProperties: {
+                type: 'array',
+                minItems: 1,
+                maxItems: 3,
+                items: [
+                    { title: 'value', type: ['string', 'number'], pattern: NP_ENUM_VALUE },
+                    { title: 'note', type: 'string' },
+                    { title: 'comment', type: 'string' },
+                ],
+            },
+        },
+    },
     {
         keyword: 'faker',
         metaSchema: {

package/lib/schema-registry/kw-dbml.d.ts

@@ -1,3 +1,3 @@
-import { type KeywordDefinition } from 'ajv';
+import type { KeywordDefinition } from 'ajv';
 export declare const SFRDBMLKeywords: readonly KeywordDefinition[];
 //# sourceMappingURL=kw-dbml.d.ts.map

package/lib/schema-registry/kw-dbml.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"kw-dbml.d.ts","sourceRoot":"","sources":["../../src/schema-registry/kw-dbml.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,iBAAiB,EAAE,MAAM,KAAK,CAAC;AAiD7C,eAAO,MAAM,eAAe,EAAE,SAAS,iBAAiB,EA8C9C,CAAC"}
+{"version":3,"file":"kw-dbml.d.ts","sourceRoot":"","sources":["../../src/schema-registry/kw-dbml.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,KAAK,CAAC;AAkD7C,eAAO,MAAM,eAAe,EAAE,SAAS,iBAAiB,EAoDpD,CAAC"}

package/lib/schema-registry/kw-dbml.js

@@ -4,7 +4,7 @@ exports.SFRDBMLKeywords = void 0;
 const types_1 = require("../dbml-generator/types");
 const NP_IX = '^ix_[a-z][a-zA-Z0-9_]+$';
 const NP_ENTITY = '^([a-zA-Z_][a-z0-9_]*\\.)?[a-z_][a-z0-9_]*$';
-const NP_NESTED_PROP = '^[a-z][a-zA-Z0-9.-]+$';
+const NP_NESTED_PROP = '^[a-z][a-zA-Z0-9-\\._]+$';
 const DBMLIndexOptionsProperties = {
     name: { type: 'string', pattern: NP_IX },
     unique: { type: 'boolean' },
@@ -38,6 +38,10 @@ DBMLIndexSchema.items = {
     type: ['string', 'boolean', 'object'],
 };
 exports.SFRDBMLKeywords = [
+    {
+        keyword: 'dbEnum',
+        metaSchema: { type: ['boolean', 'string'], pattern: NP_NESTED_PROP },
+    },
     {
         keyword: 'dbFK',
         metaSchema: DBMLForeignKeySchema,
@@ -69,7 +73,7 @@ exports.SFRDBMLKeywords = [
                 indexes: {
                     type: 'object',
                     additionalProperties: DBMLIndexSchema,
-                    propertyNames: { pattern: NP_NESTED_PROP },
+                    propertyNames: { type: 'string', pattern: NP_NESTED_PROP },
                 },
                 note: { type: 'string' },
                 comment: { type: 'string' },

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

@@ -1 +1 @@
-{"version":3,"file":"registry.d.ts","sourceRoot":"","sources":["../../src/schema-registry/registry.ts"],"names":[],"mappings":"AA6BA,OAAO,EACH,mBAAmB,EAEnB,0BAA0B,EAC7B,MAAM,SAAS,CAAC;AAsBjB;;;;GAIG;AACH,wBAAgB,yBAAyB,CACrC,OAAO,CAAC,EAAE,0BAA0B,GACrC,mBAAmB,CA0OrB"}
+{"version":3,"file":"registry.d.ts","sourceRoot":"","sources":["../../src/schema-registry/registry.ts"],"names":[],"mappings":"AA8BA,OAAO,EACH,mBAAmB,EAEnB,0BAA0B,EAC7B,MAAM,SAAS,CAAC;AAsBjB;;;;GAIG;AACH,wBAAgB,yBAAyB,CACrC,OAAO,CAAC,EAAE,0BAA0B,GACrC,mBAAmB,CA+OrB"}

package/lib/schema-registry/registry.js

@@ -154,7 +154,7 @@ function createSchemaForgeRegistry(options) {
     }
     function readSchemaKeywords(schema) {
         const result = new Map();
-        for (const tag of types_1.SFG_CONFIG_DEFAULTS.extraTags) {
+        for (const tag of types_1.SFG_EXTRA_TAGS) {
             if (tag in schema) {
                 result.set(tag, 
                 // @ts-expect-error It's OK
@@ -165,9 +165,12 @@ function createSchemaForgeRegistry(options) {
     }
     function listDefinitions(predicate) {
         const result = [];
+        const filter = typeof predicate === 'number'
+            ? (info) => info.kind === predicate
+            : predicate;
         mapDefinitions((name, schemaId, schema) => {
             const info = (0, parser_1.parseSchemaDefinitionInfo)(name, schemaId, legacy);
-            if (predicate === undefined || predicate(info, readSchemaKeywords(schema))) {
+            if (filter === undefined || filter(info, readSchemaKeywords(schema))) {
                 result.push(info);
             }
         });

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

@@ -3,7 +3,7 @@ import type { NonNegativeInt } from '@tsofist/stem/lib/number/integer/types';
 import type { ErrorsTextOptions, Options } from 'ajv';
 import type { Options as AjvOptions } from 'ajv/dist/core';
 import type { JSONSchema7 } from 'json-schema';
-import type { SchemaDefinitionInfo } from '../definition-info/types';
+import type { SchemaDefinitionInfo, SchemaDefinitionInfoKind } from '../definition-info/types';
 import type { SchemaForgeValidationContextBase } from '../efc';
 import type { SF_EXTRA_JSS_TAG_NAME } from '../schema-generator/types';
 import type { SchemaForgeDefinitionRef, SchemaForgeValidationFunction, SchemaForgeValidationReport, SchemaForgeValidationResult } from '../types';
@@ -63,9 +63,9 @@ export interface SchemaForgeRegistry {
      */
     validationErrorsText: (errors: Nullable<SchemaForgeValidationReport>, options?: ErrorsTextOptions) => string;
     /**
-     * List schema definitions
+     * List definitions of all schemas in registry.
      */
-    listDefinitions: (predicate?: SchemaForgeRegistryListDefinitionsPredicate) => SchemaDefinitionInfo[];
+    listDefinitions: <T extends SchemaDefinitionInfo>(predicate?: SchemaForgeRegistryListDefinitionsPredicate | SchemaDefinitionInfoKind) => T[];
     /**
      * Asynchronously warm up schemaRegistry cache.
      * This action is useful to pre-compile all schemas and their definitions

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

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/schema-registry/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AACxD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,wCAAwC,CAAC;AAC7E,OAAO,KAAK,EAAE,iBAAiB,EAAE,OAAO,EAAE,MAAM,KAAK,CAAC;AACtD,OAAO,KAAK,EAAE,OAAO,IAAI,UAAU,EAAE,MAAM,eAAe,CAAC;AAC3D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC/C,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,0BAA0B,CAAC;AACrE,OAAO,KAAK,EAAE,gCAAgC,EAAE,MAAM,QAAQ,CAAC;AAC/D,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,2BAA2B,CAAC;AACvE,OAAO,KAAK,EACR,wBAAwB,EACxB,6BAA6B,EAC7B,2BAA2B,EAC3B,2BAA2B,EAC9B,MAAM,UAAU,CAAC;AAElB,MAAM,MAAM,2CAA2C,GAAG,CACtD,IAAI,EAAE,oBAAoB,EAC1B,QAAQ,EAAE,WAAW,CAAC,qBAAqB,EAAE,OAAO,CAAC,KACpD,OAAO,CAAC;AAEb,MAAM,WAAW,mBAAmB;IAChC;;OAEG;IACH,QAAQ,CAAC,wBAAwB,EAAE,cAAc,CAAC;IAElD;;;OAGG;IACH,QAAQ,CAAC,GAAG,EAAE,cAAc,CAAC;IAE7B;;OAEG;IACH,KAAK,EAAE,CACH,OAAO,CAAC,EAAE,IAAI,CAAC,OAAO,EAAE,SAAS,CAAC,EAClC,QAAQ,CAAC,EAAE,CAAC,MAAM,EAAE,WAAW,KAAK,WAAW,KAC9C,mBAAmB,CAAC;IAEzB;;OAEG;IACH,KAAK,EAAE,YAAY,CAAC;IAEpB;;OAEG;IACH,SAAS,EAAE,CAAC,MAAM,EAAE,WAAW,EAAE,KAAK,IAAI,CAAC;IAE3C;;OAEG;IACH,SAAS,EAAE,CAAC,GAAG,EAAE,wBAAwB,KAAK,OAAO,CAAC;IAEtD;;OAEG;IACH,YAAY,EAAE,CAAC,GAAG,EAAE,QAAQ,CAAC,wBAAwB,CAAC,KAAK,IAAI,CAAC;IAEhE;;OAEG;IACH,SAAS,EAAE,CAAC,GAAG,EAAE,wBAAwB,KAAK,WAAW,GAAG,SAAS,CAAC;IAEtE;;OAEG;IACH,YAAY,EAAE,CAAC,KAAK,GAAG,OAAO,EAC1B,GAAG,EAAE,wBAAwB,GAAG,WAAW,KAC1C,6BAA6B,CAAC,KAAK,CAAC,GAAG,SAAS,CAAC;IAEtD;;OAEG;IACH,aAAa,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,WAAW,GAAG,SAAS,CAAC;IAE7D;;OAEG;IACH,gBAAgB,EAAE,CACd,GAAG,EAAE,wBAAwB,EAC7B,IAAI,EAAE,OAAO,EACb,YAAY,CAAC,EAAE,MAAM,KACpB,2BAA2B,CAAC;IAEjC;;OAEG;IACH,aAAa,EAAE,CACX,CAAC,GAAG,OAAO,EACX,GAAG,SAAS,gCAAgC,GAAG,gCAAgC,EAE/E,GAAG,EAAE,wBAAwB,EAC7B,IAAI,EAAE,CAAC,EACP,OAAO,CAAC,EAAE,GAAG,KACZ,IAAI,IAAI,CAAC,CAAC;IAEf;;OAEG;IACH,oBAAoB,EAAE,CAClB,MAAM,EAAE,QAAQ,CAAC,2BAA2B,CAAC,EAC7C,OAAO,CAAC,EAAE,iBAAiB,KAC1B,MAAM,CAAC;IAEZ;;OAEG;IACH,eAAe,EAAE,CACb,SAAS,CAAC,EAAE,2CAA2C,KACtD,oBAAoB,EAAE,CAAC;IAE5B;;;OAGG;IACH,WAAW,EAAE,CAAC,mBAAmB,CAAC,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAE/E;;;OAGG;IACH,eAAe,EAAE,YAAY,CAAC;CACjC;AAED,MAAM,WAAW,0BAA0B;IACvC;;;;;OAKG;IACH,MAAM,CAAC,EAAE,UAAU,CAAC;IACpB;;;;;OAKG;IACH,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B;;;OAGG;IACH,iBAAiB,CAAC,EAAE,OAAO,CAAC;CAC/B"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/schema-registry/types.ts"],"names":[],"mappings":"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"}

package/lib/types.d.ts

@@ -1,8 +1,8 @@
-import type { NonEmptyString, Nullable, PRec, Reintroduce } from '@tsofist/stem';
+import type { Nullable, PRec, Rec, Reintroduce } from '@tsofist/stem';
 import type { ErrorObject, ErrorsTextOptions, ValidateFunction } from 'ajv';
 import type { JSONSchema7 as Schema } from 'json-schema';
 import type { Config } from 'ts-json-schema-generator';
-import type { DBMLColumnOptions, DBMLEntityOptionsDef, DBMLForeignKeyOptions, DBMLIndexOptionsDef } from './dbml-generator/types';
+import { DBMLColumnOptions, DBMLEntityOptionsDef, DBMLEnumAnnotationOptions, DBMLEnumOptionsDef, DBMLForeignKeyOptions, DBMLIndexOptionsDef } from './dbml-generator/types';
 export interface ForgeSchemaOptions {
     /**
      * Generate schema definitions for public types only
@@ -99,13 +99,21 @@ export interface ForgeSchemaOptions {
      *
      * @see shrinkDefinitionName
      */
-    readonly shrinkDefinitionNames?: boolean | ((definitionName: string) => undefined | NonEmptyString);
+    readonly shrinkDefinitionNames?: boolean | ((definitionName: string) => undefined | ForgedSchemaDefinitionShortName);
     /**
      * @deprecated
      * @default false
      */
     readonly legacyDefinitions?: boolean;
+    /**
+     * Skip type checking.
+     * This may help with some complex projects, but can lead to incorrect schema generation.
+     *
+     * @default false
+     */
+    readonly skipTypeCheck?: boolean;
 }
+export type ForgedSchemaDefinitionShortName = `DSN${string}_H${string}`;
 export interface SchemaForgeMetadata {
     $id: string;
     title?: string;
@@ -119,25 +127,27 @@ export interface SchemaForgeMetadata {
     serviceNames: PRec<SchemaForgeDefinitionRef>;
 }
 declare const ForgedSchemaDraft7Id = "http://json-schema.org/draft-07/schema#";
-export type ForgedSchema = Reintroduce<Schema, {
+export type ForgedSchema = Reintroduce<Schema, Pick<ForgedSchemaDefinition, 'see' | 'spec'> & {
     $schema: typeof ForgedSchemaDraft7Id;
-    $id?: string;
-    $comment?: string;
     hash?: string;
-    title?: string;
-    description?: string;
     version?: string;
-    $defs?: PRec<Schema>;
-    definitions?: PRec<Schema>;
+    $defs?: Rec<ForgedSchemaDefinition>;
+    definitions?: Rec<ForgedSchemaDefinition>;
 }>;
-export type ForgedEntitySchema = Schema & {
-    dbEntity?: DBMLEntityOptionsDef;
-    properties?: PRec<ForgedEntitySchema>;
+export type ForgedEntitySchema = Schema & Pick<ForgedSchemaDefinition, 'see' | 'spec' | 'dbEntity'> & {
+    properties?: Rec<ForgedEntitySchema>;
 };
-export type ForgedPropertySchema = Schema & {
+export type ForgedPropertySchema = Schema & Pick<ForgedSchemaDefinition, 'dbFK' | 'dbColumn' | 'dbIndex' | 'dbEnum' | 'enumAnnotation'>;
+export type ForgedSchemaDefinition = Schema & {
+    see?: (string | [ref: string, title: string])[];
+    spec?: string;
     dbFK?: DBMLForeignKeyOptions;
-    dbIndex?: DBMLIndexOptionsDef;
     dbColumn?: DBMLColumnOptions;
+    dbIndex?: DBMLIndexOptionsDef;
+    dbEnum?: DBMLEnumOptionsDef;
+    enumAnnotation?: DBMLEnumAnnotationOptions;
+    dbEntity?: DBMLEntityOptionsDef;
+    properties?: PRec<ForgedEntitySchema>;
 };
 export interface ForgeSchemaResult {
     schema: ForgedSchema;

package/lib/types.d.ts.map

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tsofist/schema-forge",
-  "version": "3.7.1",
+  "version": "4.0.0",
   "description": "Generate JSON schema from TypeScript types",
   "author": "Andrew Berdnikov <tsofistgudmen@gmail.com>",
   "license": "LGPL-3.0",
@@ -38,11 +38,11 @@
     "@types/node": "^20.19.0",
     "@types/supertest": "^6.0.3",
     "@types/ungap__structured-clone": "^1.2.0",
-    "jest": "~30.0.5",
+    "jest": "~30.1.2",
     "rimraf": "^6.0.1",
     "supertest": "^7.1.4",
-    "ts-jest": "~29.4.0",
-    "typescript": "~5.8.3"
+    "ts-jest": "~29.4.1",
+    "typescript": "~5.9.2"
   },
   "publishConfig": {
     "registry": "https://registry.npmjs.org/",