@tsofist/schema-forge 4.2.3 → 5.1.0

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

@@ -1,5 +1,4 @@
 import type { ExportFormatOption } from '@dbml/core/types/export/ModelExporter';
-export declare function convertDBMLToDatabaseModel(source: string): import("@dbml/core/types/model_structure/database").default;
-export declare function convertDBMLToJSON(source: string): import("@dbml/core/types/model_structure/database").RawDatabase;
+export declare function convertDBMLToDatabaseModel(dbmlStringSpec: string): import("@dbml/core/types/model_structure/database").default;
 export declare function convertDBMLToSQL(source: string, format?: ExportFormatOption): string;
 //# sourceMappingURL=converter.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"converter.d.ts","sourceRoot":"","sources":["../../src/dbml-generator/converter.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,uCAAuC,CAAC;AAEhF,wBAAgB,0BAA0B,CAAC,MAAM,EAAE,MAAM,+DAExD;AAED,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,MAAM,mEAE/C;AAED,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,GAAE,kBAA+B,UAEvF"}
+{"version":3,"file":"converter.d.ts","sourceRoot":"","sources":["../../src/dbml-generator/converter.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,uCAAuC,CAAC;AAEhF,wBAAgB,0BAA0B,CAAC,cAAc,EAAE,MAAM,+DAEhE;AAED,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,GAAE,kBAA+B,UAEvF"}

package/lib/dbml-generator/converter.js

@@ -1,14 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.convertDBMLToDatabaseModel = convertDBMLToDatabaseModel;
-exports.convertDBMLToJSON = convertDBMLToJSON;
 exports.convertDBMLToSQL = convertDBMLToSQL;
 const core_1 = require("@dbml/core");
-function convertDBMLToDatabaseModel(source) {
-    return core_1.Parser.parse(source, 'json');
-}
-function convertDBMLToJSON(source) {
-    return core_1.Parser.parseDBMLToJSONv2(source);
+function convertDBMLToDatabaseModel(dbmlStringSpec) {
+    return core_1.Parser.parse(dbmlStringSpec, 'dbmlv2');
 }
 function convertDBMLToSQL(source, format = 'postgres') {
     return core_1.exporter.export(source, format);

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

@@ -1,4 +1,4 @@
-import type { ArrayMay, HexString, PRec } from '@tsofist/stem';
+import type { ArrayMay, HexString } from '@tsofist/stem';
 import type { SchemaDefinitionInfoForType } from '../definition-info/types';
 /**
  * DBML Project Source
@@ -145,9 +145,4 @@ 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":"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"}
+{"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;AAEF,MAAM,MAAM,kBAAkB,GAAG,OAAO,GAAG,MAAM,CAAC"}

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

@@ -0,0 +1,11 @@
+import type { JSONSchema7 } from 'json-schema';
+/**
+ * Shallow dereference a JSON Schema by resolving only the top-level `$ref` pointer
+ *   for each definition.
+ *
+ * @param schema Root JSON Schema to dereference
+ * @param soloRefs If true, only dereference `$ref` entries that appear once in the schema
+ * @returns New (shallow copy) schema with top-level `$ref` pointers resolved.
+ */
+export declare function shallowDereferenceSchema(schema: JSONSchema7, soloRefs?: boolean): JSONSchema7;
+//# sourceMappingURL=dereference-shallow.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"dereference-shallow.d.ts","sourceRoot":"","sources":["../../src/schema-dereference/dereference-shallow.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAE/C;;;;;;;GAOG;AACH,wBAAgB,wBAAwB,CAAC,MAAM,EAAE,WAAW,EAAE,QAAQ,UAAO,GAAG,WAAW,CA+B1F"}

package/lib/schema-dereference/dereference-shallow.js

@@ -0,0 +1,63 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.shallowDereferenceSchema = shallowDereferenceSchema;
+const error_1 = require("@tsofist/stem/lib/error");
+const entries_1 = require("@tsofist/stem/lib/object/entries");
+/**
+ * Shallow dereference a JSON Schema by resolving only the top-level `$ref` pointer
+ *   for each definition.
+ *
+ * @param schema Root JSON Schema to dereference
+ * @param soloRefs If true, only dereference `$ref` entries that appear once in the schema
+ * @returns New (shallow copy) schema with top-level `$ref` pointers resolved.
+ */
+function shallowDereferenceSchema(schema, soloRefs = true) {
+    const result = { ...schema };
+    let defs;
+    if (result.$defs) {
+        defs = result.$defs = { ...result.$defs };
+    }
+    else if (result.definitions) {
+        defs = result.definitions = { ...result.definitions };
+    }
+    else {
+        return result;
+    }
+    const usedRefs = new Map();
+    eachReferencedDefinition(defs, ({ $ref }) => {
+        const count = (usedRefs.get($ref) || 0) + 1;
+        usedRefs.set($ref, count);
+    });
+    eachReferencedDefinition(defs, (def, name) => {
+        const seen = usedRefs.get(def.$ref);
+        if (!soloRefs || seen === 1) {
+            const resolved = resolveRef(def.$ref, schema);
+            if (!resolved) {
+                (0, error_1.raise)(`Failed to dereference $ref: ${def.$ref} during shallow dereference`);
+            }
+            defs[name] = resolved;
+        }
+    });
+    return result;
+}
+function eachReferencedDefinition(defs, cb) {
+    for (const [nameRaw, raw] of (0, entries_1.entries)(defs)) {
+        const def = typeof raw === 'object' && raw !== null ? raw : undefined;
+        if (def && def.$ref && def.$ref.startsWith('#/') && Object.keys(def).length === 1) {
+            cb(def, nameRaw);
+        }
+    }
+}
+function resolveRef(ref, root) {
+    const path = ref.slice(2).split('/').map(decodeURIComponent);
+    let current = root;
+    for (const segment of path) {
+        if (current && typeof current === 'object' && segment in current) {
+            current = current[segment];
+        }
+        else {
+            return undefined;
+        }
+    }
+    return current;
+}

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

@@ -1,7 +1,7 @@
 import type { JSONSchema7 } from 'json-schema';
 import type { SchemaForgeDereferenceOptions } from './types';
 /**
- * Dereference a JSON Schema by resolving all (relative) `$ref` pointers.
+ * Recursively dereference a JSON Schema by resolving all relative `$ref` pointers.
  *
  * @returns new schema with no `$ref` pointers
  */

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":"AAQA,OAAO,KAAK,EAER,kBAAkB,EAClB,iBAAiB,EAEpB,MAAM,UAAU,CAAC;AAIlB,wBAAsB,WAAW,CAAC,OAAO,EAAE,kBAAkB,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAuHzF"}
+{"version":3,"file":"forge.d.ts","sourceRoot":"","sources":["../../src/schema-generator/forge.ts"],"names":[],"mappings":"AAUA,OAAO,KAAK,EAER,kBAAkB,EAClB,iBAAiB,EAEpB,MAAM,UAAU,CAAC;AAKlB,wBAAsB,WAAW,CAAC,OAAO,EAAE,kBAAkB,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAgIzF"}

package/lib/schema-generator/forge.js

@@ -7,8 +7,11 @@ const as_array_1 = require("@tsofist/stem/lib/as-array");
 const error_1 = require("@tsofist/stem/lib/error");
 const noop_1 = require("@tsofist/stem/lib/noop");
 const random_1 = require("@tsofist/stem/lib/string/random");
+const ts_json_schema_generator_1 = require("ts-json-schema-generator");
 const artefacts_policy_1 = require("../artefacts-policy");
 const ref_1 = require("../definition-info/ref");
+const dereference_shallow_1 = require("../schema-dereference/dereference-shallow");
+const format_error_1 = require("./format-error");
 const generate_drafts_1 = require("./generate-drafts");
 const generate_schema_1 = require("./generate-schema");
 async function forgeSchema(options) {
@@ -60,7 +63,7 @@ async function forgeSchema(options) {
                         delete schema.hash;
                     }
                 }
-                const content = JSON.stringify(schema, null, 2);
+                const content = JSON.stringify(options.shallowDeref ? (0, dereference_shallow_1.shallowDereferenceSchema)(schema) : schema, null, 2);
                 await (0, promises_1.writeFile)(options.outputSchemaFile, content, { encoding: 'utf8' });
             }
             if (options.outputSchemaMetadataFile) {
@@ -94,6 +97,12 @@ async function forgeSchema(options) {
                 });
             }
         }
+        catch (e) {
+            if (e instanceof ts_json_schema_generator_1.BuildError) {
+                console.error('[forgeSchema: build error]\n', (0, format_error_1.formatForgeSchemaError)(e));
+            }
+            throw e;
+        }
         finally {
             if (!artefacts_policy_1.KEEP_GEN_ARTEFACTS) {
                 await Promise.all(files.map((fileName) => (0, promises_1.unlink)(fileName).catch(noop_1.noop)));

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

@@ -443,23 +443,23 @@ describe('generator for a5', () => {
                 },
             },
             required: [
-                'vals',
-                'name0',
-                'name1',
-                'num0',
-                'num1',
-                'variadic',
-                'variadic1',
-                'variadicList',
-                'variadicList1',
                 'abnormalNames',
                 'indexedField1',
                 'indexedField2',
                 'indexedField3',
                 'indexedField4',
+                'name0',
+                'name1',
+                'num0',
+                'num1',
                 'ref0',
                 'ref1',
                 'ref2',
+                'vals',
+                'variadic',
+                'variadic1',
+                'variadicList',
+                'variadicList1',
             ],
             additionalProperties: false,
             dbEntity: 'cmn.some',
@@ -585,7 +585,7 @@ describe('generator for a3', () => {
         //     expect(props.maxItems).toBeUndefined();
         // }
     });
-    it('extends should works', () => {
+    it('should works with extends: interface', () => {
         const props = forgeSchemaResult.schema.definitions?.BAPI__APIInterface?.properties;
         expect(props).toBeTruthy();
         expect((0, keys_1.keysOf)(props)).toStrictEqual([
@@ -605,6 +605,19 @@ describe('generator for a3', () => {
             'methodY',
         ]);
     });
+    // it('should works with extends: type w/ generics', () => {
+    //     const props = forgeSchemaResult!.schema.definitions?.APIFromBase__APIInterface?.properties;
+    //     expect(props).toBeTruthy();
+    //     expect(keysOf(props)).toStrictEqual(['doSomethingAndReturnR', 'doSomethingElse']);
+    // });
+    //
+    // it('should works with extends: type w/o own members', () => {
+    //     const props =
+    //         forgeSchemaResult!.schema.definitions?.APIFromBaseExtendOnly__APIInterface?.properties;
+    //     expect(props).toBeTruthy();
+    //     // console.log(JSON.stringify(forgeSchemaResult!.schema, null, 2));
+    //     expect(keysOf(props)).toStrictEqual(['doSomethingAndReturnR']);
+    // });
 });
 describe('generator for a2', () => {
     const outputSchemaFile = './a2.generated.schema.tmp.json';

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

@@ -1,5 +1,5 @@
 import { type CompletedConfig } from 'ts-json-schema-generator/dist/src/Config';
-import { ForgeSchemaOptions } from '../types';
+import type { ForgeSchemaOptions } from '../types';
 /**
  * @internal
  */

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;;;;;GAkCjE;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":"AAMA,OAAO,EAAE,KAAK,eAAe,EAAkB,MAAM,0CAA0C,CAAC;AAsChG,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAC;AAWnD;;GAEG;AACH,wBAAsB,sBAAsB,CAAC,OAAO,EAAE,YAAY;;;;;GAkCjE;AA8YD,UAAU,YAAa,SAAQ,kBAAkB;IAC7C,QAAQ,EAAE,MAAM,CAAC;IACjB,cAAc,EAAE,MAAM,EAAE,CAAC;CAC5B"}

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

@@ -147,7 +147,25 @@ function processAPIInterfaceDeclaration(statement, context) {
     const interfaceGenericText = (0, helpers_tsc_1.readInterfaceGenericText)(statement);
     const interfaceDesc = (0, helpers_tsc_1.readJSDocDescription)(statement, allowUseFallbackDescription);
     const interfaceDeprecated = (0, typescript_1.getTextOfJSDocComment)((0, typescript_1.getJSDocDeprecatedTag)(statement)?.comment);
-    function onSignature(method, memberName, memberDescription, deprecated) {
+    const interfaceSymbol = context.typeChecker.getSymbolAtLocation(statement.name);
+    const interfaceType = context.typeChecker.getDeclaredTypeOfSymbol(interfaceSymbol);
+    const properties = {};
+    for (const symbol of context.typeChecker.getPropertiesOfType(interfaceType)) {
+        for (const decl of symbol.declarations || []) {
+            if ((0, typescript_1.isMethodSignature)(decl) || (0, typescript_1.isPropertySignature)(decl) || (0, typescript_1.isFunctionTypeNode)(decl)) {
+                const name = (0, helpers_tsc_1.readNodeName)(decl);
+                if (name) {
+                    if (properties[name]) {
+                        // todo throw?
+                    }
+                    else {
+                        properties[name] = symbol;
+                    }
+                }
+            }
+        }
+    }
+    function onSignature(_property, method, memberName, memberDescription, deprecated) {
         const minArgsNum = countRequiredParams(method.parameters);
         const maxArgsNum = method.parameters.length;
         const argsNames = [];
@@ -167,6 +185,16 @@ function processAPIInterfaceDeclaration(statement, context) {
         })
             .join(', ');
         const resultTypeName = (0, helpers_tsc_1.readMemberTypeName)(method);
+        // todo
+        // {
+        //     const pt = context.typeChecker.getTypeOfSymbolAtLocation(property, method);
+        //     const sig = context.typeChecker.getSignaturesOfType(pt, SignatureKind.Call)[0];
+        //     if (sig) {
+        //         const rt = context.typeChecker.getReturnTypeOfSignature(sig);
+        //         const rts = context.typeChecker.typeToString(rt, statement);
+        //         resultTypeName = rts;
+        //     }
+        // }
         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}`;
@@ -207,14 +235,17 @@ function processAPIInterfaceDeclaration(statement, context) {
         if (isPrivate)
             return;
         const memberName = (0, helpers_tsc_1.readNodeName)(member);
+        const property = properties[memberName];
+        if (!property)
+            return;
         const memberDescription = (0, helpers_tsc_1.readJSDocDescription)(member, allowUseFallbackDescription);
         const deprecated = (0, typescript_1.getTextOfJSDocComment)((0, typescript_1.getJSDocDeprecatedTag)(member)?.comment);
         if ((0, typescript_1.isMethodSignature)(member)) {
-            onSignature(member, memberName, memberDescription, deprecated);
+            onSignature(property, member, memberName, memberDescription, deprecated);
         }
         else if ((0, typescript_1.isPropertySignature)(member)) {
             if (member.type && (0, typescript_1.isFunctionTypeNode)(member.type)) {
-                onSignature(member.type, memberName, memberDescription, deprecated);
+                onSignature(property, member.type, memberName, memberDescription, deprecated);
             }
             else {
                 definitionsMetaList.push({
@@ -232,7 +263,7 @@ function processAPIInterfaceDeclaration(statement, context) {
             for (const type of clause.types) {
                 const declaration = context.typeChecker.getTypeAtLocation(type).symbol?.declarations?.[0];
                 if (declaration &&
-                    (0, typescript_1.isInterfaceDeclaration)(declaration) &&
+                    ((0, typescript_1.isInterfaceDeclaration)(declaration) || (0, typescript_1.isTypeLiteralNode)(declaration)) &&
                     declaration.members?.length) {
                     for (const member of declaration.members) {
                         onMember(member);

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;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,CAoGhG;AAgLD,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;AAQvC,OAAO,EAIH,eAAe,EAqBlB,MAAM,0BAA0B,CAAC;AAelC,OAAO,EAAwB,YAAY,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAC;AAQlF;;GAEG;AACH,wBAAsB,0BAA0B,CAAC,OAAO,EAAE,eAAe,GAAG,OAAO,CAAC,YAAY,CAAC,CAoGhG;AA2MD,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

@@ -5,6 +5,7 @@ exports.generateSchemaByDraftTypes = generateSchemaByDraftTypes;
 const tslib_1 = require("tslib");
 require("./extended-annotations-reader");
 const error_1 = require("@tsofist/stem/lib/error");
+const is_empty_1 = require("@tsofist/stem/lib/object/is-empty");
 const value_in_1 = require("@tsofist/stem/lib/value-in");
 const ajv_1 = require("ajv");
 const jsonpath_plus_1 = require("jsonpath-plus");
@@ -13,7 +14,7 @@ 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 sort_contents_1 = require("./sort-contents");
 const types_1 = require("./types");
 /**
  * @internal
@@ -90,8 +91,8 @@ async function generateSchemaByDraftTypes(options) {
         }
     }
     result.definitions = Object.fromEntries(Object.entries((defs || {})).sort());
-    if (options.sortObjectProperties)
-        (0, sort_properties_1.sortSchemaProperties)(result.definitions);
+    if (options.sortContents ?? true)
+        (0, sort_contents_1.sortSchemaContents)(result.definitions, options.sortContents);
     await new ajv_1.default({
         strict: true,
         allErrors: true,
@@ -115,29 +116,61 @@ class EnumTypeFormatterEx extends ts_json_schema_generator_1.EnumTypeFormatter {
     getDefinition(type) {
         const id = type.getId();
         const inherited = super.getDefinition(type);
-        if (inherited?.enum) {
+        const isMember = 'const' in inherited;
+        if (inherited && (inherited.enum || inherited.const)) {
             let count = 0;
-            const annotations = {};
-            for (const value of inherited.enum) {
+            const enumAnnotation = {};
+            const enumMember = {};
+            const append = (value) => {
                 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 (isMember) {
+                            enumMember.title = doc.title;
+                            if (doc.description)
+                                enumMember.note = doc.description;
+                            if (doc.comment)
+                                enumMember.comment = doc.comment;
+                            if (doc.typeName)
+                                enumMember.enum = doc.typeName;
+                        }
+                        else {
+                            const rec = (enumAnnotation[doc.title] = [doc.value]);
+                            if (doc.description)
+                                rec.push(doc.description);
+                            if (doc.comment)
+                                rec.push(doc.comment);
+                            if (isMember && doc.typeName) {
+                                enumAnnotation[''] = [doc.typeName];
+                            }
+                        }
                     }
                 }
+            };
+            if (inherited.const) {
+                append(inherited.const);
+            }
+            else if (inherited.enum) {
+                for (const value of inherited.enum) {
+                    append(value);
+                }
             }
             if (count > 0) {
-                return {
-                    ...inherited,
-                    enumAnnotation: annotations,
-                };
+                if (isMember && !(0, is_empty_1.isEmptyObject)(enumMember)) {
+                    return {
+                        ...inherited,
+                        enumMember,
+                    };
+                }
+                else if (!isMember && !(0, is_empty_1.isEmptyObject)(enumAnnotation)) {
+                    return {
+                        ...inherited,
+                        enumAnnotation,
+                    };
+                }
             }
         }
         return inherited;

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,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"}
+{"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;AAS7D,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

@@ -66,7 +66,9 @@ function readJSDocDescription(node, allowUseFallbackDescription, allowUseFallbac
 }
 function readNodeName(node) {
     if ('name' in node && !!node.name) {
-        return node.name.escapedText + '';
+        const v = node.name;
+        if (v != null && v.escapedText)
+            return v.escapedText;
     }
     return undefined;
 }

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

@@ -0,0 +1,15 @@
+import type { PRec } from '@tsofist/stem';
+export type SGEnumAnnotationOptions = PRec<[
+    /** 0 */ value: string | number,
+    /** 1 */ note?: string,
+    /** 2 */ comment?: string
+]>;
+export type SGEnumMemberOptions = {
+    /** Enum name */
+    enum: string;
+    /** Title (Key) */
+    title: string;
+    note?: string;
+    comment?: string;
+};
+//# sourceMappingURL=kw.types.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"kw.types.d.ts","sourceRoot":"","sources":["../../src/schema-generator/kw.types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,eAAe,CAAC;AAE1C,MAAM,MAAM,uBAAuB,GAAG,IAAI,CACtC;IAEI,QAAQ,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM;IAC/B,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM;IACtB,QAAQ,CAAC,OAAO,CAAC,EAAE,MAAM;CAC5B,CACJ,CAAC;AAEF,MAAM,MAAM,mBAAmB,GAAG;IAC9B,gBAAgB;IAChB,IAAI,EAAE,MAAM,CAAC;IACb,kBAAkB;IAClB,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,OAAO,CAAC,EAAE,MAAM,CAAC;CACpB,CAAC"}

package/lib/schema-generator/kw.types.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

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

@@ -1 +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"}
+{"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,aAmFnD;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

@@ -30,7 +30,18 @@ function patchEnumNodeParser(root, checker, meta, allowUseFallbackDescription) {
         arguments);
         const resultId = result.getId();
         if ((0, typescript_1.isEnumMember)(node)) {
-            // todo EnumMember!
+            const memberValue = checker.getConstantValue(node);
+            const memberName = (0, helpers_tsc_1.readNodeName)(node);
+            const metaKey = `${resultId}.${String(memberValue)}`;
+            const description = (0, helpers_tsc_1.readJSDocDescription)(node, allowUseFallbackDescription);
+            const comment = (0, helpers_tsc_1.readJSDocTagValue)(node, 'comment');
+            meta.set(metaKey, {
+                typeName: (0, helpers_tsc_1.readNodeName)(node.parent),
+                title: memberName,
+                value: memberValue,
+                description,
+                comment,
+            });
             return result;
         }
         else {

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

@@ -0,0 +1,4 @@
+import type { JSONSchema7, JSONSchema7Object } from 'json-schema';
+import { SchemaForgeSortableContentSet } from '../types';
+export declare function sortSchemaContents<T extends JSONSchema7Object | JSONSchema7>(schema: T, contents?: boolean | SchemaForgeSortableContentSet): T;
+//# sourceMappingURL=sort-contents.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"sort-contents.d.ts","sourceRoot":"","sources":["../../src/schema-generator/sort-contents.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,WAAW,EAAE,iBAAiB,EAAuB,MAAM,aAAa,CAAC;AACvF,OAAO,EAAsC,6BAA6B,EAAE,MAAM,UAAU,CAAC;AAG7F,wBAAgB,kBAAkB,CAAC,CAAC,SAAS,iBAAiB,GAAG,WAAW,EACxE,MAAM,EAAE,CAAC,EACT,QAAQ,GAAE,OAAO,GAAG,6BAAkE,GACvF,CAAC,CAsEH"}

package/lib/schema-generator/sort-contents.js

@@ -0,0 +1,108 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.sortSchemaContents = sortSchemaContents;
+const is_primitive_1 = require("@tsofist/stem/lib/is-primitive");
+const entries_1 = require("@tsofist/stem/lib/object/entries");
+const is_empty_1 = require("@tsofist/stem/lib/object/is-empty");
+const omit_1 = require("@tsofist/stem/lib/object/omit");
+const compare_1 = require("@tsofist/stem/lib/string/compare");
+const types_1 = require("../types");
+const types_2 = require("./types");
+function sortSchemaContents(schema, contents = types_1.SchemaForgeDefaultSortableContents) {
+    contents =
+        contents === true ? types_1.SchemaForgeDefaultSortableContents : contents == false ? [] : contents;
+    const stack = [];
+    const process = (item) => {
+        if ((0, is_primitive_1.isPrimitive)(item))
+            return;
+        if (Array.isArray(item)) {
+            stack.push(...item);
+        }
+        else {
+            const processedProps = new Set();
+            const hr = hasRequired(item);
+            const hp = hasProperties(item);
+            if (hr || hp) {
+                if (hr) {
+                    if (contents.includes('required')) {
+                        item.required.sort(compare_1.compareStringsAsc);
+                    }
+                    processedProps.add('required');
+                }
+                if (hp) {
+                    if (contents.includes('properties')) {
+                        item.properties = Object.fromEntries(Object.entries(item.properties).sort(entitiesComparatorAsk));
+                    }
+                    processedProps.add('properties');
+                }
+            }
+            else {
+                if (hasEnum(item)) {
+                    if (contents.includes('enum')) {
+                        item.enum.sort(indexComparatorAsk);
+                    }
+                    processedProps.add('enum');
+                }
+                else if (hasAnyOf(item)) {
+                    if (contents.includes('anyOf')) {
+                        item.anyOf.sort(nullTypeFirstComparator);
+                    }
+                    processedProps.add('anyOf');
+                }
+                else if (hasOneOf(item)) {
+                    if (contents.includes('oneOf')) {
+                        item.oneOf.sort(nullTypeFirstComparator);
+                    }
+                    processedProps.add('oneOf');
+                }
+            }
+            {
+                const saved = { ...item };
+                for (const k in item)
+                    delete item[k];
+                for (const [k, v] of (0, entries_1.entries)(saved).sort(entitiesComparatorAsk)) {
+                    // @ts-expect-error It's OK
+                    item[k] = v;
+                }
+            }
+            stack.push(...Object.values((0, omit_1.omitProps)(item, [...processedProps, ...types_2.SFG_EXTRA_TAGS])));
+        }
+    };
+    process(schema);
+    while (stack.length) {
+        process(stack.pop());
+    }
+    return schema;
+}
+function entitiesComparatorAsk([a], [b]) {
+    return (0, compare_1.compareStringsAsc)(a, b);
+}
+function indexComparatorAsk(a, b) {
+    return a === b ? 0 : a > b ? 1 : -1;
+}
+function nullTypeFirstComparator(a, b) {
+    const an = a.type === 'null';
+    const bn = b.type === 'null';
+    if (an && !bn)
+        return -1;
+    if (!an && bn)
+        return 1;
+    return 0;
+}
+function hasProperties(target) {
+    return ('properties' in target &&
+        typeof target.properties === 'object' &&
+        !(0, is_empty_1.isEmptyObject)(target.properties));
+}
+function hasRequired(target) {
+    return 'required' in target && Array.isArray(target.required) && target.required.length > 0;
+}
+function hasEnum(target) {
+    return 'enum' in target && Array.isArray(target.enum) && target.enum.length > 0;
+}
+function hasAnyOf(target) {
+    return 'anyOf' in target && Array.isArray(target.anyOf) && target.anyOf.length > 0;
+}
+function hasOneOf(target) {
+    return 'oneOf' in target && Array.isArray(target.oneOf) && target.oneOf.length > 0;
+}

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

@@ -5,7 +5,7 @@ export declare const SFG_CONFIG_DEFAULTS: {
     readonly discriminatorType: undefined;
     readonly encodeRefs: false;
     readonly expose: "export";
-    readonly extraTags: ("spec" | "hash" | "dbEntity" | "dbFK" | "dbColumn" | "dbIndex" | "dbEnum" | "enumAnnotation" | "version" | "repository" | "apiInterface" | "apiProperty" | "apiMethod" | "apiMember" | "enumMember" | "faker")[];
+    readonly extraTags: ("spec" | "hash" | "dbEntity" | "dbFK" | "dbColumn" | "dbIndex" | "dbEnum" | "enumAnnotation" | "enumMember" | "version" | "repository" | "apiInterface" | "apiProperty" | "apiMethod" | "apiMember" | "faker")[];
     readonly functions: "hide";
     readonly markdownDescription: false;
     readonly skipTypeCheck: false;

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":"AACA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,KAAK,CAAC;AAO7C,eAAO,MAAM,iBAAiB,EAAE,SAAS,iBAAiB,EA2FtD,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;AAO7C,eAAO,MAAM,iBAAiB,EAAE,SAAS,iBAAiB,EA0GtD,CAAC"}

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

@@ -61,6 +61,21 @@ exports.SFRCommonKeywords = [
             },
         },
     },
+    {
+        keyword: 'enumMember',
+        dependencies: ['const'],
+        metaSchema: {
+            type: 'object',
+            properties: {
+                enum: { type: 'string' },
+                title: { type: 'string', pattern: NP_ENUM_KEY },
+                note: { type: 'string' },
+                comment: { type: 'string' },
+            },
+            required: ['enum', 'title'],
+            additionalProperties: false,
+        },
+    },
     {
         keyword: 'faker',
         metaSchema: {

package/lib/types.d.ts

@@ -2,7 +2,8 @@ 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 { DBMLColumnOptions, DBMLEntityOptionsDef, DBMLEnumAnnotationOptions, DBMLEnumOptionsDef, DBMLForeignKeyOptions, DBMLIndexOptionsDef } from './dbml-generator/types';
+import { DBMLColumnOptions, DBMLEntityOptionsDef, DBMLEnumOptionsDef, DBMLForeignKeyOptions, DBMLIndexOptionsDef } from './dbml-generator/types';
+import { SGEnumAnnotationOptions, SGEnumMemberOptions } from './schema-generator/kw.types';
 export interface ForgeSchemaOptions {
     /**
      * Generate schema definitions for public types only
@@ -83,16 +84,33 @@ export interface ForgeSchemaOptions {
     readonly outputSchemaMetadataFile?: string;
     readonly discriminatorType?: DiscriminatorType;
     /**
-     * Determines whether to sort the properties of object schemas in alphabetical order.
-     *   If set to `true`, the tool will sort both the fields in the `properties` section
-     *     and the field names in the `required` array for object-schema definitions.
-     *   Sorting can improve readability and consistency,
-     *     but may affect the order in which properties appear in generated outputs.
-     *   Applicable only to schemas of type `object`.
+     * Determines whether to sort the contents of the schema.
+     * If set to `true`, the tool will sort certain parts of the schema in alphabetical order.
+     * Sorting can significantly improve readability and consistency
+     *   of the data across iterations of updates.
      *
+     * The following are sorted:
+     *   - `properties` (optional)
+     *   - `required`
+     *   - `enum`
+     *   - `anyOf` (type=null is always first)
+     *   - `oneOf` (type=null is always first)
+     *   - `definitions` / `$defs`
+     *
+     * @default true
+     */
+    readonly sortContents?: boolean | SchemaForgeSortableContentSet;
+    /**
+     * If true, the top-level `$ref` pointers for each definition will be resolved.
+     * This improves schema readability by reducing the number of references
+     *   while still keeping the schema relatively compact.
+     * Note: only references used once will be dereferenced.
+     *
+     * @see shallowDereferenceSchema
+     * @see dereferenceSchema
      * @default false
      */
-    readonly sortObjectProperties?: boolean;
+    readonly shallowDeref?: boolean;
     /**
      * If you want to shrink the schema definition names,
      *   you have to provide a replacement function.
@@ -146,7 +164,7 @@ export type ForgedSchema = Reintroduce<Schema, Pick<ForgedSchemaDefinition, 'see
 export type ForgedEntitySchema = Schema & Pick<ForgedSchemaDefinition, 'see' | 'spec' | 'dbEntity'> & {
     properties?: Rec<ForgedEntitySchema>;
 };
-export type ForgedPropertySchema = Schema & Pick<ForgedSchemaDefinition, 'dbFK' | 'dbColumn' | 'dbIndex' | 'dbEnum' | 'enumAnnotation'>;
+export type ForgedPropertySchema = Schema & Pick<ForgedSchemaDefinition, 'dbFK' | 'dbColumn' | 'dbIndex' | 'dbEnum' | 'enumAnnotation' | 'enumMember'>;
 export type ForgedSchemaDefinition = Schema & {
     see?: (string | [ref: string, title: string])[];
     spec?: string;
@@ -154,7 +172,8 @@ export type ForgedSchemaDefinition = Schema & {
     dbColumn?: DBMLColumnOptions;
     dbIndex?: DBMLIndexOptionsDef;
     dbEnum?: DBMLEnumOptionsDef;
-    enumAnnotation?: DBMLEnumAnnotationOptions;
+    enumAnnotation?: SGEnumAnnotationOptions;
+    enumMember?: SGEnumMemberOptions;
     dbEntity?: DBMLEntityOptionsDef;
     properties?: PRec<ForgedEntitySchema>;
 };
@@ -179,6 +198,9 @@ export interface SchemaForgeValidationResult {
 }
 export type SchemaForgeValidationFunction<T = unknown> = ValidateFunction<T>;
 export type SchemaForgeValidationReport = ErrorObject[];
+export type SchemaForgeSortableContents = 'properties' | 'required' | 'enum' | 'anyOf' | 'oneOf';
+export type SchemaForgeSortableContentSet = SchemaForgeSortableContents[];
+export declare const SchemaForgeDefaultSortableContents: ["required", "enum", "anyOf", "oneOf"];
 type TypeExposeKind = Config['expose'];
 type DiscriminatorType = Config['discriminatorType'];
 export {};

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,3 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.SchemaForgeDefaultSortableContents = void 0;
 const ForgedSchemaDraft7Id = 'http://json-schema.org/draft-07/schema#';
+exports.SchemaForgeDefaultSortableContents = [
+    'required',
+    'enum',
+    'anyOf',
+    'oneOf',
+];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tsofist/schema-forge",
-  "version": "4.2.3",
+  "version": "5.1.0",
   "description": "Generate JSON schema from TypeScript types",
   "author": "Andrew Berdnikov <tsofistgudmen@gmail.com>",
   "license": "LGPL-3.0",
@@ -22,7 +22,7 @@
   "dependencies": {
     "@dbml/core": "~3.13.9",
     "@faker-js/faker": "^9.9.0",
-    "@tsofist/stem": "^5.2.2",
+    "@tsofist/stem": "^5.4.0",
     "@ungap/structured-clone": "^1.3.0",
     "ajv": "^8.17.1",
     "ajv-formats": "^3.0.1",
@@ -38,7 +38,7 @@
     "@types/node": "^20.19.0",
     "@types/supertest": "^6.0.3",
     "@types/ungap__structured-clone": "^1.2.0",
-    "jest": "~30.1.2",
+    "jest": "~30.1.3",
     "rimraf": "^6.0.1",
     "supertest": "^7.1.4",
     "ts-jest": "~29.4.1",

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

@@ -1,3 +0,0 @@
-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 +0,0 @@
-{"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/sort-properties.js

@@ -1,39 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.sortSchemaProperties = sortSchemaProperties;
-const is_empty_1 = require("@tsofist/stem/lib/object/is-empty");
-const compare_1 = require("@tsofist/stem/lib/string/compare");
-function sortSchemaProperties(schema) {
-    const stack = [];
-    const isTarget = (target) => {
-        return (target != null &&
-            typeof target === 'object' &&
-            'type' in target &&
-            target.type === 'object' &&
-            'properties' in target &&
-            typeof target.properties === 'object' &&
-            !(0, is_empty_1.isEmptyObject)(target.properties));
-    };
-    const process = (item) => {
-        if (!item)
-            return;
-        if (Array.isArray(item)) {
-            stack.push(...item);
-        }
-        else {
-            if (isTarget(item)) {
-                item.properties = Object.fromEntries(Object.entries(item.properties).sort(([a], [b]) => (0, compare_1.compareStringsAsc)(a, b)));
-                if (item.required?.length)
-                    item.required.sort(compare_1.compareStringsAsc);
-            }
-            if (typeof item === 'object') {
-                stack.push(...Object.values(item));
-            }
-        }
-    };
-    process(schema);
-    while (stack.length) {
-        process(stack.pop());
-    }
-    return schema;
-}