@tsofist/schema-forge 4.2.1 → 4.2.3

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

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

@@ -235,15 +235,28 @@ class SchemaGeneratorEx extends ts_json_schema_generator_1.SchemaGenerator {
         tslib_1.__classPrivateFieldSet(this, _SchemaGeneratorEx_multipleDefinitionsErrorSuppression, value, "f");
     }
     appendRootChildDefinitions(rootType, childDefinitions) {
-        try {
-            super.appendRootChildDefinitions(rootType, childDefinitions);
+        if (tslib_1.__classPrivateFieldGet(this, _SchemaGeneratorEx_multipleDefinitionsErrorSuppression, "f")) {
+            const seen = new Set();
+            const children = this.typeFormatter
+                .getChildren(rootType)
+                .filter((child) => child instanceof ts_json_schema_generator_1.DefinitionType)
+                .filter((child) => {
+                if (!seen.has(child.getId())) {
+                    seen.add(child.getId());
+                    return true;
+                }
+                return false;
+            });
+            children.reduce((definitions, child) => {
+                const name = child.getName();
+                if (!(name in definitions)) {
+                    definitions[name] = this.typeFormatter.getDefinition(child.getType());
+                }
+                return definitions;
+            }, childDefinitions);
         }
-        catch (e) {
-            if (e instanceof ts_json_schema_generator_1.MultipleDefinitionsError) {
-                if (tslib_1.__classPrivateFieldGet(this, _SchemaGeneratorEx_multipleDefinitionsErrorSuppression, "f"))
-                    return;
-            }
-            throw e;
+        else {
+            super.appendRootChildDefinitions(rootType, childDefinitions);
         }
     }
 }

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;AAQ7C,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,EA2FtD,CAAC"}

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

@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.SFRCommonKeywords = void 0;
 const FakerModulePattern = '^[a-zA-Z.]+$';
 const NP_ENUM_KEY = '^[a-zA-Z0-9-\\._]+$';
-const NP_ENUM_VALUE = '^[a-zA-Z0-9-\\._:]+$';
 exports.SFRCommonKeywords = [
     {
         keyword: 'version',
@@ -55,7 +54,7 @@ exports.SFRCommonKeywords = [
                 minItems: 1,
                 maxItems: 3,
                 items: [
-                    { title: 'value', type: ['string', 'number'], pattern: NP_ENUM_VALUE },
+                    { title: 'value', type: ['string', 'number'] },
                     { title: 'note', type: 'string' },
                     { title: 'comment', type: 'string' },
                 ],

package/package.json

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