@tsofist/schema-forge 3.1.1 → 3.3.0

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":"AAWA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAEpE,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,UAqFrC"}
+{"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"}

package/lib/dbml-generator/generator.js

@@ -9,17 +9,21 @@ const snake_1 = require("@tsofist/stem/lib/string/case/snake");
 const compare_1 = require("@tsofist/stem/lib/string/compare");
 const substr_1 = require("@tsofist/stem/lib/string/substr");
 const text_builder_1 = require("@tsofist/stem/lib/string/text-builder");
+const cache_1 = require("../schema-dereference/cache");
+const dereference_1 = require("../schema-dereference/dereference");
 function generateDBMLSpec(schemaRegistry, scopes, options = {}) {
     const text = new text_builder_1.TextBuilder();
     const tables = new Map();
     const groups = new Map();
     const sources = new Map();
+    const dereferencedRootSchemas = new Map();
     if (options.meta?.comment) {
         text.push(`// ${options.meta?.comment}`);
     }
     text.push(`Project ${options.meta?.name ?? 'Scratch'} {`);
     text.push(`database_type: 'PostgreSQL'`, 1);
     if (options.meta?.note) {
+        text.push('');
         text.push(buildNote(options.meta.note), 1);
     }
     text.push('}');
@@ -34,9 +38,21 @@ function generateDBMLSpec(schemaRegistry, scopes, options = {}) {
             sources.set(scope.scopeName ?? DefaultScopeName, scope);
         }
     }
-    for (const { definitions, scopeName = DefaultScopeName } of sources.values()) {
+    for (const { definitions, scopeName = DefaultScopeName, schemaId } of sources.values()) {
+        let dereferencedRootSchema = dereferencedRootSchemas.get(schemaId);
+        if (!dereferencedRootSchemas.has(schemaId)) {
+            const root = schemaRegistry.getRootSchema(schemaId) ||
+                (0, error_1.raise)(`Root schema ${schemaId} not found`);
+            dereferencedRootSchema =
+                (0, dereference_1.dereferenceSchema)(root, {
+                    throwOnDereferenceFailure: true,
+                    sharedCacheStorage: DereferenceSchemaCache ||
+                        (DereferenceSchemaCache = (0, cache_1.createSchemaDereferenceSharedCache)()),
+                }) || (0, error_1.raise)(`Failed to dereference root schema for ${schemaId}`);
+            dereferencedRootSchemas.set(schemaId, dereferencedRootSchema);
+        }
         for (const definition of definitions) {
-            const tableSpec = generateTable(definition, schemaRegistry, options);
+            const tableSpec = generateTable(definition, options, dereferencedRootSchema);
             if (tableSpec) {
                 if (tables.has(tableSpec.name)) {
                     (0, error_1.raise)(`Definitions contain duplicate table name: ${tableSpec.name}`);
@@ -76,18 +92,20 @@ function generateDBMLSpec(schemaRegistry, scopes, options = {}) {
     }
     return text.stringify();
 }
-function generateTable(info, registry, options) {
-    const includeNotes = options?.includeNotes ?? false;
+function generateTable(info, options, dereferencedRootSchema) {
+    const includeNotes = options.includeNotes ?? false;
     const entityTypeName = info.type;
-    const entitySchema = registry.getSchema(`${info.schemaId}#/definitions/${entityTypeName}`);
+    const entitySchema = (dereferencedRootSchema.definitions || dereferencedRootSchema.$defs)?.[entityTypeName];
     if (!entitySchema)
         return;
+    if (typeof entitySchema !== 'object')
+        (0, error_1.raise)(`Invalid definition type for table: ${typeof entitySchema} (expected object)`);
     const tableName = readDBEntityName(entitySchema);
     if (!tableName)
         return;
     const { properties, required } = listProperties(entitySchema);
-    const columns = generateColumns(properties, required, includeNotes, registry, info.schemaId);
-    const indexes = generateIndexes(tableName, properties, readDBEntityIndexes(entitySchema), includeNotes, registry, info.schemaId);
+    const columns = generateColumns(properties, required, includeNotes, info.schemaId, tableName);
+    const indexes = generateIndexes(tableName, properties, readDBEntityIndexes(entitySchema), includeNotes, info.schemaId);
     const text = new text_builder_1.TextBuilder();
     if (entitySchema.$comment) {
         text.push(stringifyComment(entitySchema.$comment));
@@ -110,7 +128,7 @@ function generateTable(info, registry, options) {
         value: text.stringify(),
     };
 }
-function generateColumns(properties, requiredFields, notes, registry, schemaId) {
+function generateColumns(properties, requiredFields, notes, schemaId, tableName) {
     const text = new text_builder_1.TextBuilder();
     let count = 0;
     for (const [key, property] of (0, entries_1.entries)(properties).sort(([keyA], [keyB]) => {
@@ -128,16 +146,18 @@ function generateColumns(properties, requiredFields, notes, registry, schemaId)
             continue;
         const isRequired = requiredFields.includes(key);
         const isColumnNullable = isNullable(property);
-        const columnType = getType(property, schemaId, registry);
+        const columnType = getDBType(property, schemaId);
         const attributes = generateColumnAttributes(key, property, isRequired, isColumnNullable, notes);
         if (property.$comment)
             text.push(stringifyComment(property.$comment));
-        text.push(`${(0, snake_1.snakeCase)(key)} ${columnType} [${attributes.stringify(', ')}]`);
+        const attributesText = attributes.stringify(', ');
+        const hasLineBreak = attributesText.includes('\n');
+        text.push(`${(0, snake_1.snakeCase)(key)} ${columnType} [${attributesText}${hasLineBreak ? '\n' : ']'}`);
+        hasLineBreak && text.push(']');
         count++;
     }
     if (count === 0) {
-        // todo!
-        // raise(`Table ${schemaId} has no columns`);
+        (0, error_1.raise)(`Table ${tableName} (${schemaId}) does not have any columns defined`);
     }
     return text;
 }
@@ -169,11 +189,11 @@ function generateColumnAttributes(_key, property, isRequired, isColumnNullable,
         result.push(`default: ${String(v)}`);
     }
     if (notes && property.description) {
-        result.push(buildNote(property.description).stringify());
+        result.push(buildNote(property.description, 2).stringify());
     }
     return result;
 }
-function generateIndexes(tableName, schemaProperties, entityIndexes, includeNotes, registry, schemaId) {
+function generateIndexes(tableName, schemaProperties, entityIndexes, includeNotes, schemaId) {
     const text = new text_builder_1.TextBuilder();
     const idx = {};
     const normalizedTableName = tableName.replace(/\./g, '_');
@@ -211,7 +231,7 @@ function generateIndexes(tableName, schemaProperties, entityIndexes, includeNote
                     const field = (0, substr_1.substr)(rawKey, '.');
                     const index = (idx[indexName] ||= {
                         ...(typeof item === 'object' ? item : {}),
-                        columnType: getType(schemaProperties[column], schemaId, registry),
+                        columnType: getDBType(schemaProperties[column], schemaId),
                         columns: [],
                         fields: [],
                     });
@@ -241,9 +261,9 @@ function generateIndexes(tableName, schemaProperties, entityIndexes, includeNote
             continue;
         const { columns, unique, pk, comment, note } = index;
         if (columns.length !== new Set(columns).size) {
-            console.error(`Duplicate columns in index ${indexName} for table ${tableName}`);
+            console.warn(`Duplicate columns in index ${indexName} for table ${tableName}`);
         }
-        const options = [`name: "${indexName}"`];
+        const options = new text_builder_1.TextBuilder(`name: "${indexName}"`);
         const type = index.type || index.columnType === 'jsonb' || index.columnType.endsWith('[]')
             ? 'gin'
             : undefined;
@@ -253,15 +273,15 @@ function generateIndexes(tableName, schemaProperties, entityIndexes, includeNote
             options.push(`pk`);
         if (!pk && unique)
             options.push('unique');
-        // todo
+        // todo?
         // if (includeNotes && fields.length) {
         //     options.push(`note: 'Fields: ${fields.join(', ')};'`);
         // }
         if (includeNotes && note)
-            options.push(buildNote(note).stringify());
+            options.push(buildNote(note, 3).stringify());
         if (comment)
             text.push(`// ${comment}`);
-        text.push(`(${columns.map(snake_1.snakeCase).join(', ')}) [${options.join(', ')}]`);
+        text.push(`(${columns.map(snake_1.snakeCase).join(', ')}) [${options.stringify(', ')}]`);
     }
     return text;
 }
@@ -285,12 +305,12 @@ function stringifyComment(value) {
         return undefined;
     return value.split('\n').map((item) => `// ${item.trim()}`);
 }
-function buildNote(value) {
+function buildNote(value, mlLevel = 1) {
     const result = new text_builder_1.TextBuilder();
     if (value) {
         if (value.includes('\n')) {
             result.push(`note:`);
-            result.push([`'''`, ...value.split('\n'), `'''`], 1);
+            result.push([`'''`, ...value.split('\n'), `'''`], mlLevel);
         }
         else {
             result.push(`note: "${value}"`);
@@ -301,35 +321,26 @@ function buildNote(value) {
 function isNullable(property) {
     return (property.anyOf?.some((item) => typeof item !== 'boolean' && item?.type !== 'null') ?? false);
 }
-function getType(property, schemaId, registry) {
+let DereferenceSchemaCache;
+function getDBType(property, schemaId) {
     if (property.dbColumn?.type)
         return property.dbColumn.type;
     let type = property.type;
-    if (property.$ref) {
-        const schema = registry.getSchema(`${schemaId}${property.$ref}`);
-        if (schema && schema.type)
-            type = schema.type;
-        const ref = schema?.$ref || property.$ref;
-        if (typeof ref !== 'string')
-            (0, error_1.raise)(`Invalid schema reference type ${typeof ref} (expected string)`);
-        const refType = ref.split('/').pop();
-        if (refType && refType in {}) {
-            // @1ts-expect-error It's OK
-            // return TypeMappings[refType];
-            return '-'; // TODO!
-        }
-        else if (schema) {
-            property = schema;
-        }
+    if (!type && property.$ref) {
+        (0, error_1.raise)(`Type ${JSON.stringify(property)} (${schemaId}) was not dereferenced`);
+    }
+    if (type && Array.isArray(type)) {
+        type = type.filter((item) => item !== 'null')[0];
+    }
+    if (type && typeof type !== 'string') {
+        (0, error_1.raise)(`Invalid SchemaTypeName value type (${typeof type}) (expected string)`);
     }
-    if (typeof type !== 'string')
-        (0, error_1.raise)(`Invalid schema type ${typeof type} (expected string)`);
     const variants = property.anyOf || property.oneOf;
     if (variants) {
         const nonNullType = variants.find((item) => typeof item !== 'boolean' && item?.type !== 'null');
         if (nonNullType) {
             return typeof nonNullType === 'object'
-                ? getType(nonNullType, schemaId, registry)
+                ? getDBType(nonNullType, schemaId)
                 : nonNullType.toString();
         }
     }
@@ -352,7 +363,10 @@ function listProperties(schema) {
             required: schema.required || [],
         };
     }
-    // todo oneOf
+    if (schema.oneOf) {
+        // todo oneOf
+        (0, error_1.raise)(`Schema ${JSON.stringify(schema)} has oneOf, but not implemented yet`);
+    }
     if (!schema.anyOf) {
         return {
             type: 'object',
@@ -380,11 +394,11 @@ function listProperties(schema) {
         }
         else {
             if (!(0, equal_keys_1.isEqualKeys)(propertiesMap, item.properties)) {
-                console.error('Properties are not identical across all members of anyOf');
+                console.warn('Properties are not identical across all members of anyOf');
             }
             for (const name of item.required || []) {
                 if (!requiredSet.has(name)) {
-                    console.error('Required fields are not identical across all members of anyOf');
+                    console.warn('Required fields are not identical across all members of anyOf');
                 }
             }
         }

package/lib/definition-info/api-signature.d.ts

@@ -2,7 +2,7 @@ import { type APIInterfaceSDS, type APIMemberSDS, type APIMethodArgsSDS, type AP
 /**
  * Builds the type signature for the API Interface
  */
-export declare function buildAPIInterfaceSDS(interfaceName: string): APIInterfaceSDS;
+export declare function buildAPIInterfaceSDS(interfaceName: string, legacy?: boolean): APIInterfaceSDS;
 /**
  * Builds the type signature for the API Interface member
  */
@@ -10,9 +10,9 @@ export declare function buildAPIMemberSDS(interfaceName: string, memberName: str
 /**
  * Builds the type signature for the API Interface method arguments
  */
-export declare function buildAPIMethodArgsSDS(interfaceName: string, methodName: string): APIMethodArgsSDS;
+export declare function buildAPIMethodArgsSDS(interfaceName: string, methodName: string, legacy?: boolean): APIMethodArgsSDS;
 /**
  * Builds the type signature for the API Interface method result
  */
-export declare function buildAPIMethodResultSDS(interfaceName: string, methodName: string): APIMethodResultSDS;
+export declare function buildAPIMethodResultSDS(interfaceName: string, methodName: string, legacy?: boolean): APIMethodResultSDS;
 //# sourceMappingURL=api-signature.d.ts.map

package/lib/definition-info/api-signature.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"api-signature.d.ts","sourceRoot":"","sources":["../../src/definition-info/api-signature.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,KAAK,eAAe,EACpB,KAAK,YAAY,EACjB,KAAK,gBAAgB,EACrB,KAAK,kBAAkB,EAK1B,MAAM,SAAS,CAAC;AAEjB;;GAEG;AACH,wBAAgB,oBAAoB,CAAC,aAAa,EAAE,MAAM,GAAG,eAAe,CAE3E;AAED;;GAEG;AACH,wBAAgB,iBAAiB,CAAC,aAAa,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,YAAY,CAEzF;AAED;;GAEG;AACH,wBAAgB,qBAAqB,CAAC,aAAa,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,gBAAgB,CAEjG;AAED;;GAEG;AACH,wBAAgB,uBAAuB,CACnC,aAAa,EAAE,MAAM,EACrB,UAAU,EAAE,MAAM,GACnB,kBAAkB,CAEpB"}
+{"version":3,"file":"api-signature.d.ts","sourceRoot":"","sources":["../../src/definition-info/api-signature.ts"],"names":[],"mappings":"AAAA,OAAO,EAIH,KAAK,eAAe,EACpB,KAAK,YAAY,EACjB,KAAK,gBAAgB,EACrB,KAAK,kBAAkB,EAK1B,MAAM,SAAS,CAAC;AAEjB;;GAEG;AACH,wBAAgB,oBAAoB,CAAC,aAAa,EAAE,MAAM,EAAE,MAAM,UAAQ,GAAG,eAAe,CAE3F;AAED;;GAEG;AACH,wBAAgB,iBAAiB,CAAC,aAAa,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,YAAY,CAEzF;AAED;;GAEG;AACH,wBAAgB,qBAAqB,CACjC,aAAa,EAAE,MAAM,EACrB,UAAU,EAAE,MAAM,EAClB,MAAM,UAAQ,GACf,gBAAgB,CAElB;AAED;;GAEG;AACH,wBAAgB,uBAAuB,CACnC,aAAa,EAAE,MAAM,EACrB,UAAU,EAAE,MAAM,EAClB,MAAM,UAAQ,GACf,kBAAkB,CAEpB"}

package/lib/definition-info/api-signature.js

@@ -8,8 +8,8 @@ const types_1 = require("./types");
 /**
  * Builds the type signature for the API Interface
  */
-function buildAPIInterfaceSDS(interfaceName) {
-    return `${interfaceName}${types_1.SDS_SUFFIX_API}`;
+function buildAPIInterfaceSDS(interfaceName, legacy = false) {
+    return `${interfaceName}${legacy ? types_1._SDS_SUFFIX_API : types_1.SDS_SUFFIX_API}`;
 }
 /**
  * Builds the type signature for the API Interface member
@@ -20,12 +20,12 @@ function buildAPIMemberSDS(interfaceName, memberName) {
 /**
  * Builds the type signature for the API Interface method arguments
  */
-function buildAPIMethodArgsSDS(interfaceName, methodName) {
-    return `${interfaceName}_${methodName}${types_1.SDS_SUFFIX_METHOD_ARGS}`;
+function buildAPIMethodArgsSDS(interfaceName, methodName, legacy = false) {
+    return `${interfaceName}_${methodName}${legacy ? types_1._SDS_SUFFIX_METHOD_ARGS : types_1.SDS_SUFFIX_METHOD_ARGS}`;
 }
 /**
  * Builds the type signature for the API Interface method result
  */
-function buildAPIMethodResultSDS(interfaceName, methodName) {
-    return `${interfaceName}_${methodName}${types_1.SDS_SUFFIX_METHOD_RES}`;
+function buildAPIMethodResultSDS(interfaceName, methodName, legacy = false) {
+    return `${interfaceName}_${methodName}${legacy ? types_1._SDS_SUFFIX_METHOD_RES : types_1.SDS_SUFFIX_METHOD_RES}`;
 }

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

@@ -0,0 +1,6 @@
+import { APIInterfaceSDS, APIMemberSDS, APIMethodArgsSDS, APIMethodResultSDS } 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;
+//# sourceMappingURL=guards.d.ts.map

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

@@ -0,0 +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"}

package/lib/definition-info/guards.js

@@ -0,0 +1,21 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.isAPIDefinitionName = isAPIDefinitionName;
+exports.isAPIMemberDefinitionName = isAPIMemberDefinitionName;
+exports.isAPIMethodArgsDefinitionName = isAPIMethodArgsDefinitionName;
+exports.isAPIMethodResultDefinitionName = isAPIMethodResultDefinitionName;
+const types_1 = require("./types");
+function isAPIDefinitionName(definitionName) {
+    return definitionName.endsWith(types_1.SDS_SUFFIX_API) || definitionName.endsWith(types_1._SDS_SUFFIX_API);
+}
+function isAPIMemberDefinitionName(definitionName) {
+    return definitionName.endsWith(types_1.SDS_SUFFIX_MEMBER);
+}
+function isAPIMethodArgsDefinitionName(definitionName) {
+    return (definitionName.endsWith(types_1.SDS_SUFFIX_METHOD_ARGS) ||
+        definitionName.endsWith(types_1._SDS_SUFFIX_METHOD_ARGS));
+}
+function isAPIMethodResultDefinitionName(definitionName) {
+    return (definitionName.endsWith(types_1.SDS_SUFFIX_METHOD_RES) ||
+        definitionName.endsWith(types_1._SDS_SUFFIX_METHOD_RES));
+}

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

@@ -1,3 +1,3 @@
 import { type SchemaDefinitionInfo } from './types';
-export declare function parseSchemaDefinitionInfo(definitionName: string, schemaId: string): SchemaDefinitionInfo;
+export declare function parseSchemaDefinitionInfo(definitionName: string, schemaId: string, legacy?: boolean): SchemaDefinitionInfo;
 //# 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":"AAEA,OAAO,EACH,KAAK,oBAAoB,EAK5B,MAAM,SAAS,CAAC;AAEjB,wBAAgB,yBAAyB,CACrC,cAAc,EAAE,MAAM,EACtB,QAAQ,EAAE,MAAM,GACjB,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,CACrC,cAAc,EAAE,MAAM,EACtB,QAAQ,EAAE,MAAM,EAChB,MAAM,UAAQ,GACf,oBAAoB,CAsCtB"}

package/lib/definition-info/parser.js

@@ -2,14 +2,15 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.parseSchemaDefinitionInfo = parseSchemaDefinitionInfo;
 const substr_1 = require("@tsofist/stem/lib/string/substr");
+const guards_1 = require("./guards");
 const ref_1 = require("./ref");
 const types_1 = require("./types");
-function parseSchemaDefinitionInfo(definitionName, schemaId) {
-    const kind = definitionName.endsWith(types_1.SDS_SUFFIX_API)
+function parseSchemaDefinitionInfo(definitionName, schemaId, legacy = false) {
+    const kind = (0, guards_1.isAPIDefinitionName)(definitionName)
         ? types_1.SchemaDefinitionInfoKind.API
-        : definitionName.endsWith(types_1.SDS_SUFFIX_METHOD_ARGS)
+        : (0, guards_1.isAPIMethodArgsDefinitionName)(definitionName)
             ? types_1.SchemaDefinitionInfoKind.APIMethodArguments
-            : definitionName.endsWith(types_1.SDS_SUFFIX_METHOD_RES)
+            : (0, guards_1.isAPIMethodResultDefinitionName)(definitionName)
                 ? types_1.SchemaDefinitionInfoKind.APIMethodResult
                 : types_1.SchemaDefinitionInfoKind.Type;
     const ref = (0, ref_1.buildSchemaDefinitionRef)(definitionName, schemaId);
@@ -20,7 +21,7 @@ function parseSchemaDefinitionInfo(definitionName, schemaId) {
                 kind,
                 name: definitionName,
                 schemaId,
-                interface: (0, substr_1.substr)(definitionName, 0, types_1.SDS_SUFFIX_API),
+                interface: (0, substr_1.substr)(definitionName, 0, legacy ? types_1._SDS_SUFFIX_API : types_1.SDS_SUFFIX_API),
             };
         case types_1.SchemaDefinitionInfoKind.APIMethodArguments:
         case types_1.SchemaDefinitionInfoKind.APIMethodResult:

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

@@ -36,10 +36,16 @@ interface SDIBase {
     ref: SchemaForgeDefinitionRef;
     kind: SchemaDefinitionInfoKind;
 }
-export declare const SDS_SUFFIX_API: string;
+/** @deprecated */
+export declare const _SDS_SUFFIX_API = "_InterfaceDeclaration";
+/** @deprecated */
+export declare const _SDS_SUFFIX_METHOD_ARGS = "_Args";
+/** @deprecated */
+export declare const _SDS_SUFFIX_METHOD_RES = "_Result";
+export declare const SDS_SUFFIX_API = "__APIInterface";
 export declare const SDS_SUFFIX_MEMBER = "__APIMember";
-export declare const SDS_SUFFIX_METHOD_ARGS: string;
-export declare const SDS_SUFFIX_METHOD_RES: string;
+export declare const SDS_SUFFIX_METHOD_ARGS = "__APIMethodArgs";
+export declare const SDS_SUFFIX_METHOD_RES = "__APIMethodResult";
 export type APIInterfaceSDS = `${string}${typeof SDS_SUFFIX_API}`;
 export type APIMemberSDS = `${string}_${string}${typeof SDS_SUFFIX_MEMBER}`;
 export type APIMethodArgsSDS = `${string}_${string}${typeof SDS_SUFFIX_METHOD_ARGS}`;

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

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/definition-info/types.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,UAAU,CAAC;AAEzD;;GAEG;AACH,oBAAY,wBAAwB;IAChC,IAAI,IAAA;IACJ,GAAG,IAAA;IACH,eAAe,IAAA;IACf,kBAAkB,IAAA;CACrB;AAED;;GAEG;AACH,MAAM,MAAM,oBAAoB,GAC1B,2BAA2B,GAC3B,mCAAmC,GACnC,yCAAyC,GACzC,sCAAsC,CAAC;AAE7C,MAAM,WAAW,2BAA4B,SAAQ,OAAO;IACxD,IAAI,EAAE,wBAAwB,CAAC,IAAI,CAAC;IACpC,IAAI,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,mCAAoC,SAAQ,OAAO;IAChE,IAAI,EAAE,wBAAwB,CAAC,GAAG,CAAC;IACnC,SAAS,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,WAAW,yCAA0C,SAAQ,OAAO;IACtE,IAAI,EAAE,wBAAwB,CAAC,kBAAkB,CAAC;IAClD,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,sCAAuC,SAAQ,OAAO;IACnE,IAAI,EAAE,wBAAwB,CAAC,eAAe,CAAC;IAC/C,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,MAAM,CAAC;CAClB;AAED,UAAU,OAAO;IACb,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,GAAG,EAAE,wBAAwB,CAAC;IAC9B,IAAI,EAAE,wBAAwB,CAAC;CAClC;AAID,eAAO,MAAM,cAAc,QAAkE,CAAC;AAC9F,eAAO,MAAM,iBAAiB,gBAAgB,CAAC;AAC/C,eAAO,MAAM,sBAAsB,QAAmD,CAAC;AACvF,eAAO,MAAM,qBAAqB,QAAuD,CAAC;AAE1F,MAAM,MAAM,eAAe,GAAG,GAAG,MAAM,GAAG,OAAO,cAAc,EAAE,CAAC;AAClE,MAAM,MAAM,YAAY,GAAG,GAAG,MAAM,IAAI,MAAM,GAAG,OAAO,iBAAiB,EAAE,CAAC;AAC5E,MAAM,MAAM,gBAAgB,GAAG,GAAG,MAAM,IAAI,MAAM,GAAG,OAAO,sBAAsB,EAAE,CAAC;AACrF,MAAM,MAAM,kBAAkB,GAAG,GAAG,MAAM,IAAI,MAAM,GAAG,OAAO,qBAAqB,EAAE,CAAC"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/definition-info/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,UAAU,CAAC;AAEzD;;GAEG;AACH,oBAAY,wBAAwB;IAChC,IAAI,IAAA;IACJ,GAAG,IAAA;IACH,eAAe,IAAA;IACf,kBAAkB,IAAA;CACrB;AAED;;GAEG;AACH,MAAM,MAAM,oBAAoB,GAC1B,2BAA2B,GAC3B,mCAAmC,GACnC,yCAAyC,GACzC,sCAAsC,CAAC;AAE7C,MAAM,WAAW,2BAA4B,SAAQ,OAAO;IACxD,IAAI,EAAE,wBAAwB,CAAC,IAAI,CAAC;IACpC,IAAI,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,mCAAoC,SAAQ,OAAO;IAChE,IAAI,EAAE,wBAAwB,CAAC,GAAG,CAAC;IACnC,SAAS,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,WAAW,yCAA0C,SAAQ,OAAO;IACtE,IAAI,EAAE,wBAAwB,CAAC,kBAAkB,CAAC;IAClD,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,sCAAuC,SAAQ,OAAO;IACnE,IAAI,EAAE,wBAAwB,CAAC,eAAe,CAAC;IAC/C,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,MAAM,CAAC;CAClB;AAED,UAAU,OAAO;IACb,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,GAAG,EAAE,wBAAwB,CAAC;IAC9B,IAAI,EAAE,wBAAwB,CAAC;CAClC;AAED,kBAAkB;AAClB,eAAO,MAAM,eAAe,0BAA0B,CAAC;AACvD,kBAAkB;AAClB,eAAO,MAAM,uBAAuB,UAAU,CAAC;AAC/C,kBAAkB;AAClB,eAAO,MAAM,sBAAsB,YAAY,CAAC;AAEhD,eAAO,MAAM,cAAc,mBAAmB,CAAC;AAC/C,eAAO,MAAM,iBAAiB,gBAAgB,CAAC;AAC/C,eAAO,MAAM,sBAAsB,oBAAoB,CAAC;AACxD,eAAO,MAAM,qBAAqB,sBAAsB,CAAC;AAEzD,MAAM,MAAM,eAAe,GAAG,GAAG,MAAM,GAAG,OAAO,cAAc,EAAE,CAAC;AAClE,MAAM,MAAM,YAAY,GAAG,GAAG,MAAM,IAAI,MAAM,GAAG,OAAO,iBAAiB,EAAE,CAAC;AAC5E,MAAM,MAAM,gBAAgB,GAAG,GAAG,MAAM,IAAI,MAAM,GAAG,OAAO,sBAAsB,EAAE,CAAC;AACrF,MAAM,MAAM,kBAAkB,GAAG,GAAG,MAAM,IAAI,MAAM,GAAG,OAAO,qBAAqB,EAAE,CAAC"}

package/lib/definition-info/types.js

@@ -1,8 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.SDS_SUFFIX_METHOD_RES = exports.SDS_SUFFIX_METHOD_ARGS = exports.SDS_SUFFIX_MEMBER = exports.SDS_SUFFIX_API = exports.SchemaDefinitionInfoKind = void 0;
-const process = require("node:process");
-const as_bool_1 = require("@tsofist/stem/lib/as-bool");
+exports.SDS_SUFFIX_METHOD_RES = exports.SDS_SUFFIX_METHOD_ARGS = exports.SDS_SUFFIX_MEMBER = exports.SDS_SUFFIX_API = exports._SDS_SUFFIX_METHOD_RES = exports._SDS_SUFFIX_METHOD_ARGS = exports._SDS_SUFFIX_API = exports.SchemaDefinitionInfoKind = void 0;
 /**
  * Kind of schema definition information
  */
@@ -13,8 +11,13 @@ var SchemaDefinitionInfoKind;
     SchemaDefinitionInfoKind[SchemaDefinitionInfoKind["APIMethodResult"] = 2] = "APIMethodResult";
     SchemaDefinitionInfoKind[SchemaDefinitionInfoKind["APIMethodArguments"] = 3] = "APIMethodArguments";
 })(SchemaDefinitionInfoKind || (exports.SchemaDefinitionInfoKind = SchemaDefinitionInfoKind = {}));
-const LEGACY_DEFINITIONS = (0, as_bool_1.asBool)((process.env || {}).SF_LEGACY_DEFINITIONS); // todo?
-exports.SDS_SUFFIX_API = LEGACY_DEFINITIONS ? '_InterfaceDeclaration' : '__APIInterface';
+/** @deprecated */
+exports._SDS_SUFFIX_API = '_InterfaceDeclaration';
+/** @deprecated */
+exports._SDS_SUFFIX_METHOD_ARGS = '_Args';
+/** @deprecated */
+exports._SDS_SUFFIX_METHOD_RES = '_Result';
+exports.SDS_SUFFIX_API = '__APIInterface';
 exports.SDS_SUFFIX_MEMBER = '__APIMember';
-exports.SDS_SUFFIX_METHOD_ARGS = LEGACY_DEFINITIONS ? '_Args' : '__APIMethodArgs';
-exports.SDS_SUFFIX_METHOD_RES = LEGACY_DEFINITIONS ? '_Result' : '__APIMethodResult';
+exports.SDS_SUFFIX_METHOD_ARGS = '__APIMethodArgs';
+exports.SDS_SUFFIX_METHOD_RES = '__APIMethodResult';

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;AA2WD,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;;;;;GAiCjE;AA6WD,UAAU,YAAa,SAAQ,kBAAkB;IAC7C,QAAQ,EAAE,MAAM,CAAC;IACjB,cAAc,EAAE,MAAM,EAAE,CAAC;CAC5B"}

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

@@ -138,6 +138,8 @@ function processExportDeclaration(statement, list, context) {
     }
 }
 function processAPIInterfaceDeclaration(statement, context) {
+    /** @deprecated */
+    const legacy = context.options.legacyDefinitions ?? false;
     const allowUseFallbackDescription = context.options.allowUseFallbackDescription;
     const definitionsMetaList = [];
     const interfaceName = (0, helpers_tsc_1.readNodeName)(statement);
@@ -164,8 +166,8 @@ function processAPIInterfaceDeclaration(statement, context) {
         })
             .join(', ');
         const resultTypeName = (0, helpers_tsc_1.readMemberTypeName)(method);
-        const definitionNameArgs = (0, api_signature_1.buildAPIMethodArgsSDS)(interfaceName, memberName);
-        const definitionNameResult = (0, api_signature_1.buildAPIMethodResultSDS)(interfaceName, memberName);
+        const definitionNameArgs = (0, api_signature_1.buildAPIMethodArgsSDS)(interfaceName, memberName, legacy);
+        const definitionNameResult = (0, api_signature_1.buildAPIMethodResultSDS)(interfaceName, memberName, legacy);
         const comment = `Method:${interfaceName}#${memberName}`;
         definitionsMetaList.push({
             name: memberName,
@@ -267,12 +269,12 @@ function processAPIInterfaceDeclaration(statement, context) {
             interfaceDeprecated && ` * @deprecated ${interfaceDeprecated}`,
             ` * @comment Interface:${interfaceName}`,
             ` */`,
-            `export interface ${(0, api_signature_1.buildAPIInterfaceSDS)(interfaceName)}${interfaceGenericText} {`,
+            `export interface ${(0, api_signature_1.buildAPIInterfaceSDS)(interfaceName, legacy)}${interfaceGenericText} {`,
             membersText.stringify('\n'),
             `}`,
             ``,
         ]);
-        context.registerDefinition(context.currentSourceFileName, (0, api_signature_1.buildAPIInterfaceSDS)(interfaceName));
+        context.registerDefinition(context.currentSourceFileName, (0, api_signature_1.buildAPIInterfaceSDS)(interfaceName, legacy));
         context.currentFileContent.push(interfaceText.stringify('\n'));
     }
 }

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,CAkOrB"}
+{"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,CAoOrB"}

package/lib/schema-registry/registry.js

@@ -41,6 +41,8 @@ const SFR_DEFAULT_OPTIONS = {
  * @see https://ajv.js.org/json-schema.html ajv
  */
 function createSchemaForgeRegistry(options) {
+    /** @deprecated */
+    const legacy = options?.legacyDefinitions ?? false;
     const engineOptions = { ...SFR_DEFAULT_OPTIONS, ...options?.engine };
     const useAdditionalFormats = options?.extendedVocabulary ?? true;
     const initialSchemas = engineOptions.schemas;
@@ -161,7 +163,7 @@ function createSchemaForgeRegistry(options) {
     function listDefinitions(predicate) {
         const result = [];
         mapDefinitions((name, schemaId, schema) => {
-            const info = (0, parser_1.parseSchemaDefinitionInfo)(name, schemaId);
+            const info = (0, parser_1.parseSchemaDefinitionInfo)(name, schemaId, legacy);
             if (predicate === undefined || predicate(info, readSchemaKeywords(schema))) {
                 result.push(info);
             }

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

@@ -88,7 +88,13 @@ export interface SchemaForgeRegistryOptions {
      * Use additional formats via ajv-formats
      *
      * @see https://ajv.js.org/packages/ajv-formats.html ajv-formats
+     * @default true
      */
     extendedVocabulary?: boolean;
+    /**
+     * @deprecated
+     * @default false
+     */
+    legacyDefinitions?: boolean;
 }
 //# sourceMappingURL=types.d.ts.map

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

package/lib/types.d.ts

@@ -98,6 +98,11 @@ export interface ForgeSchemaOptions {
      * @see shrinkDefinitionName
      */
     readonly shrinkDefinitionNames?: boolean | ((definitionName: string) => undefined | NonEmptyString);
+    /**
+     * @deprecated
+     * @default false
+     */
+    readonly legacyDefinitions?: boolean;
 }
 export interface SchemaForgeMetadata {
     $id: 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/package.json

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

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

@@ -1 +0,0 @@
-//# sourceMappingURL=traversal.d.ts.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"traversal.d.ts","sourceRoot":"","sources":["../../src/definition-info/traversal.ts"],"names":[],"mappings":""}

package/lib/definition-info/traversal.js

@@ -1 +0,0 @@
-"use strict";