@tsofist/schema-forge 3.4.2 → 3.5.0

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

@@ -1,4 +1,4 @@
 import type { SchemaForgeRegistry } from '../schema-registry/types';
-import { DBMLGeneratorOptions, DBMLProjectScope } from './types';
+import type { DBMLGeneratorOptions, DBMLProjectScope } from './types';
 export declare function generateDBMLSpec(schemaRegistry: SchemaForgeRegistry, scopes: DBMLProjectScope[], options?: DBMLGeneratorOptions): string;
 //# sourceMappingURL=generator.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"generator.d.ts","sourceRoot":"","sources":["../../src/dbml-generator/generator.ts"],"names":[],"mappings":"AAgBA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AACpE,OAAO,EAIH,oBAAoB,EAGpB,gBAAgB,EACnB,MAAM,SAAS,CAAC;AAEjB,wBAAgB,gBAAgB,CAC5B,cAAc,EAAE,mBAAmB,EACnC,MAAM,EAAE,gBAAgB,EAAE,EAC1B,OAAO,GAAE,oBAAyB,UAsGrC"}
+{"version":3,"file":"generator.d.ts","sourceRoot":"","sources":["../../src/dbml-generator/generator.ts"],"names":[],"mappings":"AAgBA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAEpE,OAAO,KAAK,EAER,oBAAoB,EAGpB,gBAAgB,EACnB,MAAM,SAAS,CAAC;AAEjB,wBAAgB,gBAAgB,CAC5B,cAAc,EAAE,mBAAmB,EACnC,MAAM,EAAE,gBAAgB,EAAE,EAC1B,OAAO,GAAE,oBAAyB,UAsGrC"}

package/lib/dbml-generator/generator.js

@@ -95,6 +95,7 @@ function generateDBMLSpec(schemaRegistry, scopes, options = {}) {
 function generateTable(info, options, dereferencedRootSchema) {
     const includeNotes = options.includeNotes ?? false;
     const entityTypeName = info.type;
+    const columnsOrder = options.columnsOrder || DefaultColumnsOrder;
     const entitySchema = (dereferencedRootSchema.definitions || dereferencedRootSchema.$defs)?.[entityTypeName];
     if (!entitySchema)
         return;
@@ -104,7 +105,7 @@ function generateTable(info, options, dereferencedRootSchema) {
     if (!tableName)
         return;
     const { properties, required } = listProperties(entitySchema);
-    const columns = generateColumns(properties, required, includeNotes, info.schemaId, tableName);
+    const columns = generateColumns(properties, required, includeNotes, info.schemaId, tableName, columnsOrder);
     const indexes = generateIndexes(tableName, properties, readDBEntityIndexes(entitySchema), includeNotes, info.schemaId);
     const text = new text_builder_1.TextBuilder();
     if (entitySchema.$comment) {
@@ -128,12 +129,12 @@ function generateTable(info, options, dereferencedRootSchema) {
         value: text.stringify(),
     };
 }
-function generateColumns(properties, requiredFields, notes, schemaId, tableName) {
+function generateColumns(properties, requiredFields, notes, schemaId, tableName, columnsOrder) {
     const text = new text_builder_1.TextBuilder();
     let count = 0;
     for (const [key, property] of (0, entries_1.entries)(properties).sort(([keyA], [keyB]) => {
-        const indexA = SortableFields.indexOf(keyA);
-        const indexB = SortableFields.indexOf(keyB);
+        const indexA = columnsOrder.indexOf(keyA);
+        const indexB = columnsOrder.indexOf(keyB);
         if (indexA === -1 && indexB === -1)
             return 0;
         else if (indexA === -1)
@@ -410,28 +411,6 @@ function listProperties(schema) {
     };
 }
 const DefaultScopeName = 'Default';
-// todo REMOVE THIS
-const SortableFields = [
-    'uid',
-    'slug',
-    'system',
-    'created',
-    'updated',
-    'deleted',
-    'position',
-    'priority',
-    'creator',
-    'active',
-    'name',
-    'kind',
-    'validity',
-    'location',
-    'visual',
-    'integration',
-    'refs',
-    'seo',
-    'contacts',
-    'content',
-];
+const DefaultColumnsOrder = ['id', 'uid', 'slug', 'name'];
 // todo escape notes!
 // todo escape comments!

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

@@ -23,6 +23,7 @@ export interface DBMLProjectMeta {
 export interface DBMLGeneratorOptions {
     meta?: DBMLProjectMeta;
     includeNotes?: boolean;
+    columnsOrder?: string[];
 }
 /**
  * Database index type list.
@@ -83,6 +84,8 @@ export type DBMLIndexOptions = {
     comment?: string;
 };
 export type DBMLIndexOptionsDef<B extends boolean = boolean> = ArrayMay<DBMLIndexOptions | string | B>;
+export type DBMLForeignKeyOptionsDef = boolean;
+export type DBMLForeignKeyOptions = DBMLForeignKeyOptionsDef;
 /**
  * Database entity options.
  *

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;CAc1B;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;;;;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":"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"}

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

@@ -28,7 +28,7 @@ function createFakeGeneratorHost(source, options = {}) {
         generator.option({
             alwaysFakeOptionals: true,
             refDepthMax: 1_000,
-            pruneProperties: ['dbEntity', 'dbIndex', 'dbColumn'],
+            pruneProperties: ['dbEntity', 'dbIndex', 'dbColumn', 'dbFK'],
             ...options,
             resolveJsonPath: false,
         });

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

@@ -1,3 +1,3 @@
-import type { ForgeSchemaResult, ForgeSchemaOptions } from '../types';
+import type { ForgeSchemaOptions, ForgeSchemaResult } from '../types';
 export declare function forgeSchema(options: ForgeSchemaOptions): Promise<ForgeSchemaResult>;
 //# sourceMappingURL=forge.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"forge.d.ts","sourceRoot":"","sources":["../../src/schema-generator/forge.ts"],"names":[],"mappings":"AAUA,OAAO,KAAK,EAAuB,iBAAiB,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAC;AAI3F,wBAAsB,WAAW,CAAC,OAAO,EAAE,kBAAkB,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAsHzF"}
+{"version":3,"file":"forge.d.ts","sourceRoot":"","sources":["../../src/schema-generator/forge.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAER,kBAAkB,EAClB,iBAAiB,EAEpB,MAAM,UAAU,CAAC;AAIlB,wBAAsB,WAAW,CAAC,OAAO,EAAE,kBAAkB,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAuHzF"}

package/lib/schema-generator/forge.js

@@ -44,6 +44,7 @@ async function forgeSchema(options) {
                         ...options,
                     })),
                     ...(options.schemaMetadata || {}),
+                    hash: undefined,
                 };
                 {
                     const algorithm = options.schemaMetadata?.hash == null ||
@@ -75,7 +76,7 @@ async function forgeSchema(options) {
                     serviceRefs: {},
                     serviceNames: {},
                 };
-                const defs = new Set(Object.keys((schema.definitions || {})));
+                const defs = new Set(Object.keys(schema.definitions || {}));
                 for (const name of definitions) {
                     const ref = (0, ref_1.buildSchemaDefinitionRef)(name, options.schemaId);
                     map.names[name] = ref;

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

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const promises_1 = require("node:fs/promises");
 const error_1 = require("@tsofist/stem/lib/error");
 const noop_1 = require("@tsofist/stem/lib/noop");
+const keys_1 = require("@tsofist/stem/lib/object/keys");
 const pick_1 = require("@tsofist/stem/lib/object/pick");
 const artefacts_policy_1 = require("../artefacts-policy");
 const types_1 = require("../definition-info/types");
@@ -49,7 +50,7 @@ describe('generator for a8', () => {
     it('generated schema should have correct metadata', () => {
         expect(forgeSchemaResult).toBeTruthy();
         const schema = forgeSchemaResult.schema;
-        expect((0, pick_1.pickProps)(schema, Object.keys(schemaMetadata))).toStrictEqual(schemaMetadata);
+        expect((0, pick_1.pickProps)(schema, (0, keys_1.keysOf)(schemaMetadata))).toStrictEqual(schemaMetadata);
     });
     it('generated schema should be valid', () => {
         expect(forgeSchemaResult).toBeTruthy();
@@ -94,7 +95,7 @@ describe('generator for a7', () => {
     it('generated schema should have correct metadata', () => {
         expect(forgeSchemaResult).toBeTruthy();
         const schema = forgeSchemaResult.schema;
-        expect((0, pick_1.pickProps)(schema, Object.keys(schemaMetadata))).toStrictEqual(schemaMetadata);
+        expect((0, pick_1.pickProps)(schema, (0, keys_1.keysOf)(schemaMetadata))).toStrictEqual(schemaMetadata);
     });
     it('generated schema should be valid', () => {
         expect(forgeSchemaResult).toBeTruthy();
@@ -243,7 +244,7 @@ describe('generator for a5', () => {
         expect(forgeSchemaResult).toBeTruthy();
         const defs = forgeSchemaResult?.schema?.definitions;
         expect(defs).toBeTruthy();
-        expect(Object.keys(defs)).toStrictEqual([
+        expect((0, keys_1.keysOf)(defs)).toStrictEqual([
             'DomainNum',
             'DomainValue',
             'DomainValuesType',
@@ -301,10 +302,12 @@ describe('generator for a5', () => {
                 },
                 indexedField1: {
                     dbIndex: 'ix_some_indexed_field',
+                    dbFK: true,
                     type: 'number',
                 },
                 indexedField2: {
                     dbIndex: true,
+                    dbFK: false,
                     type: 'number',
                 },
                 indexedField3: {
@@ -377,7 +380,7 @@ describe('generator for a4', () => {
         expect(forgeSchemaResult).toBeTruthy();
         const defs = forgeSchemaResult?.schema?.definitions;
         expect(defs).toBeTruthy();
-        expect(Object.keys(defs)).toStrictEqual(['API', 'Enum', 'FormatMode', 'Some', 'Some2']);
+        expect((0, keys_1.keysOf)(defs)).toStrictEqual(['API', 'Enum', 'FormatMode', 'Some', 'Some2']);
     });
 });
 describe('generator for a3', () => {
@@ -410,9 +413,10 @@ describe('generator for a3', () => {
         expect(registry.getRootSchema('')).toBeTruthy();
     });
     it('interface generics should works', () => {
-        const props = forgeSchemaResult.schema.definitions?.InterfaceWithGeneric__APIInterface.properties;
+        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', () => {
@@ -448,9 +452,9 @@ describe('generator for a3', () => {
         // }
     });
     it('extends should works', () => {
-        const props = forgeSchemaResult.schema.definitions?.BAPI__APIInterface.properties;
+        const props = forgeSchemaResult.schema.definitions?.BAPI__APIInterface?.properties;
         expect(props).toBeTruthy();
-        expect(Object.keys(props)).toStrictEqual([
+        expect((0, keys_1.keysOf)(props)).toStrictEqual([
             'propertyA',
             'propertyB',
             'propertyC',

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

@@ -1,11 +1,10 @@
 import './extended-annotations-reader';
-import { SchemaObject } from 'ajv';
 import { CompletedConfig } from 'ts-json-schema-generator';
-import { ForgeSchemaOptions } from '../types';
+import type { ForgedSchema, ForgeSchemaOptions } from '../types';
 /**
  * @internal
  */
-export declare function generateSchemaByDraftTypes(options: InternalOptions): Promise<SchemaObject>;
+export declare function generateSchemaByDraftTypes(options: InternalOptions): Promise<ForgedSchema>;
 interface InternalOptions extends ForgeSchemaOptions {
     tsconfig: string;
     definitions: readonly string[];

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;AAGvC,OAAY,EAAE,YAAY,EAAE,MAAM,KAAK,CAAC;AAExC,OAAO,EAGH,eAAe,EAgBlB,MAAM,0BAA0B,CAAC;AAelC,OAAO,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAC;AAM9C;;GAEG;AACH,wBAAsB,0BAA0B,CAAC,OAAO,EAAE,eAAe,GAAG,OAAO,CAAC,YAAY,CAAC,CAqGhG;AAsGD,UAAU,eAAgB,SAAQ,kBAAkB;IAChD,QAAQ,EAAE,MAAM,CAAC;IACjB,WAAW,EAAE,SAAS,MAAM,EAAE,CAAC;IAC/B,2BAA2B,EAAE,eAAe,CAAC;CAChD"}
+{"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"}

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

@@ -51,11 +51,11 @@ async function generateSchemaByDraftTypes(options) {
         description: undefined,
         version: undefined,
         $comment: undefined,
-        definitions: {},
     };
+    const defs = (result.definitions ??= {});
     for (const definitionName of options.definitions) {
         const schema = generator.createSchema(definitionName);
-        Object.assign(result.definitions, schema.definitions);
+        Object.assign(defs, schema.definitions);
     }
     const shrinkDefinitionNames = !options.shrinkDefinitionNames
         ? undefined
@@ -64,18 +64,15 @@ async function generateSchemaByDraftTypes(options) {
             : options.shrinkDefinitionNames;
     if (shrinkDefinitionNames) {
         const replacement = new Set();
-        // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
-        for (const name of Object.keys(result.definitions)) {
+        for (const name of Object.keys(defs)) {
             const shortName = shrinkDefinitionNames(name);
             if (shortName) {
-                if (replacement.has(shortName) || shortName in result.definitions) {
+                if (replacement.has(shortName) || shortName in defs) {
                     (0, error_1.raise)(`Duplicate replacement definition name: ${shortName}`);
                 }
                 // rename property
-                // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
-                result.definitions[shortName] = result.definitions[name];
-                // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
-                delete result.definitions[name];
+                defs[shortName] = defs[name];
+                delete defs[name];
                 // rename references
                 const targets = (0, jsonpath_plus_1.JSONPath)({
                     path: `$..[?(@ && @.$ref == "#/definitions/${escapeDefinitionNameForJSONPath(name)}")]`,
@@ -88,7 +85,7 @@ async function generateSchemaByDraftTypes(options) {
             }
         }
     }
-    result.definitions = Object.fromEntries(Object.entries((result.definitions || {})).sort());
+    result.definitions = Object.fromEntries(Object.entries((defs || {})).sort());
     if (options.sortObjectProperties)
         (0, sort_properties_1.sortSchemaProperties)(result.definitions);
     await new ajv_1.default({

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

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

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

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

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

@@ -4,7 +4,7 @@ export declare const SFG_CONFIG_DEFAULTS: {
     readonly additionalProperties: false;
     readonly expose: "export";
     readonly strictTuples: true;
-    readonly extraTags: ["apiMember", "apiMethod", "apiInterface", "apiProperty", "dbColumn", "dbIndex", "dbEntity", "faker"];
+    readonly extraTags: ["apiMember", "apiMethod", "apiInterface", "apiProperty", "dbColumn", "dbIndex", "dbEntity", "dbFK", "faker"];
     readonly encodeRefs: false;
     readonly markdownDescription: false;
     readonly discriminatorType: undefined;

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;;;;;;;;;;CAsBL,CAAC;AAE5B,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,mBAAmB;;;;;;;;;;CAuBL,CAAC;AAE5B,eAAO,MAAM,oBAAoB;;;;CAIN,CAAC"}

package/lib/schema-generator/types.js

@@ -17,6 +17,7 @@ exports.SFG_CONFIG_DEFAULTS = {
         'dbColumn',
         'dbIndex',
         'dbEntity',
+        'dbFK',
         //
         'faker',
     ],

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;AA6C7C,eAAO,MAAM,eAAe,EAAE,SAAS,iBAAiB,EA0C9C,CAAC"}
+{"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"}

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

@@ -16,6 +16,9 @@ const DBMLIndexOptionsProperties = {
     note: { type: 'string' },
     comment: { type: 'string' },
 };
+const DBMLForeignKeySchema = {
+    type: ['boolean'],
+};
 const DBMLIndexSchema = {
     type: ['string', 'boolean', 'object', 'array'],
     pattern: NP_IX,
@@ -35,6 +38,10 @@ DBMLIndexSchema.items = {
     type: ['string', 'boolean', 'object'],
 };
 exports.SFRDBMLKeywords = [
+    {
+        keyword: 'dbFK',
+        metaSchema: DBMLForeignKeySchema,
+    },
     {
         keyword: 'dbIndex',
         metaSchema: DBMLIndexSchema,

package/lib/types.d.ts

@@ -1,6 +1,8 @@
-import type { NonEmptyString, Nullable, PRec } from '@tsofist/stem';
-import type { ErrorObject, ErrorsTextOptions, SchemaObject, ValidateFunction } from 'ajv';
+import type { NonEmptyString, Nullable, PRec, 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';
 export interface ForgeSchemaOptions {
     /**
      * Generate schema definitions for public types only
@@ -116,8 +118,29 @@ export interface SchemaForgeMetadata {
     serviceRefs: PRec<string, SchemaForgeDefinitionRef>;
     serviceNames: PRec<SchemaForgeDefinitionRef>;
 }
+declare const ForgedSchemaDraft7Id = "http://json-schema.org/draft-07/schema#";
+export type ForgedSchema = Reintroduce<Schema, {
+    $schema: typeof ForgedSchemaDraft7Id;
+    $id?: string;
+    $comment?: string;
+    hash?: string;
+    title?: string;
+    description?: string;
+    version?: string;
+    $defs?: PRec<Schema>;
+    definitions?: PRec<Schema>;
+}>;
+export type ForgedEntitySchema = Schema & {
+    dbEntity?: DBMLEntityOptionsDef;
+    properties?: PRec<ForgedEntitySchema>;
+};
+export type ForgedPropertySchema = Schema & {
+    dbFK?: DBMLForeignKeyOptions;
+    dbIndex?: DBMLIndexOptionsDef;
+    dbColumn?: DBMLColumnOptions;
+};
 export interface ForgeSchemaResult {
-    schema: SchemaObject;
+    schema: ForgedSchema;
     refs: readonly SchemaForgeDefinitionRef[];
     generatedTemporaryFiles: readonly string[];
     generatedNamesBySourceFile: ReadonlyMap<string, ReadonlySet<string>>;

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/lib/types.js

@@ -1,2 +1,3 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+const ForgedSchemaDraft7Id = 'http://json-schema.org/draft-07/schema#';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tsofist/schema-forge",
-  "version": "3.4.2",
+  "version": "3.5.0",
   "description": "Generate JSON schema from TypeScript types",
   "author": "Andrew Berdnikov <tsofistgudmen@gmail.com>",
   "license": "LGPL-3.0",