@tsofist/schema-forge 3.6.0 → 3.7.1

package/lib/schema-dereference/dereference.js

@@ -38,19 +38,23 @@ function dereferenceSchema(raw, options = {}) {
                 }
                 return replacement;
             }
-            if (seen.has(resolvedSchema))
-                return seen.get(resolvedSchema);
+            // if (seen.has(resolvedSchema)) return seen.get(resolvedSchema); // todo?
             if (Array.isArray(resolvedSchema)) {
+                if (seen.has(resolvedSchema))
+                    return seen.get(resolvedSchema);
                 const resolvedArray = resolve(resolvedSchema, current.$ref);
                 seen.set(resolvedSchema, resolvedArray);
                 return resolvedArray;
             }
+            const { $ref, ...additionalProps } = current;
             const placeholder = {};
             seen.set(current, placeholder);
             const result = {
                 ...resolvedSchema,
                 ...resolve(resolvedSchema, current.$ref),
+                ...additionalProps,
             };
+            delete result.$ref; // !
             Object.assign(placeholder, result);
             seen.set(resolvedSchema, result);
             return result;

package/lib/schema-generator/extended-annotations-reader.js

@@ -7,6 +7,7 @@ const typescript_1 = require("typescript");
 const helpers_tsc_1 = require("./helpers-tsc");
 {
     // Support for @inheritDoc tag to enforce inheritance of annotations
+    // todo rework
     // eslint-disable-next-line @typescript-eslint/unbound-method
     const getAnnotations = ts_json_schema_generator_1.ExtendedAnnotationsReader.prototype.getAnnotations;
     ts_json_schema_generator_1.ExtendedAnnotationsReader.prototype.getAnnotations = function getAnnotationsWithInheritance(node) {

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

@@ -8,6 +8,7 @@ const pick_1 = require("@tsofist/stem/lib/object/pick");
 const artefacts_policy_1 = require("../artefacts-policy");
 const types_1 = require("../definition-info/types");
 const efc_1 = require("../efc");
+const dereference_1 = require("../schema-dereference/dereference");
 const loader_1 = require("../schema-registry/loader");
 const registry_1 = require("../schema-registry/registry");
 const forge_1 = require("./forge");
@@ -188,7 +189,32 @@ describe('generator for a6', () => {
             format: 'uuid',
             description: 'This is Collection item ID (inherits from UUID)',
         });
-        expect(registry.getValidator('test#/definitions/CollectionItemID2').schema).toStrictEqual({
+        expect(registry.getSchema('test#/definitions/CollectionItemID2')).toStrictEqual({
+            $ref: '#/definitions/UUID',
+            description: 'This is Collection item ID (non-inherits from UUID)',
+            $comment: 'This is a comment for CollectionItemID2',
+        });
+        expect(registry.getSchema('test#/definitions/CollectionItemID3')).toStrictEqual({
+            format: 'uuid',
+            type: 'string',
+        });
+        expect(registry.getSchema('test#/definitions/CollectionItemID4')).toStrictEqual({
+            $ref: '#/definitions/UUID',
+            description: 'This is Collection item ID (non-inherits from UUID)',
+            format: 'uuid',
+        });
+        expect(registry.getSchema('test#/definitions/CollectionItemID6')).toStrictEqual({
+            $ref: '#/definitions/UUID',
+            description: 'This is Collection item ID (non-inherits from UUID)',
+            dbFK: true,
+        });
+        expect(registry.getSchema('test#/definitions/CollectionItemID7')).toStrictEqual({
+            $ref: '#/definitions/UUID',
+            description: 'This is Collection item ID (non-inherits from UUID)',
+            dbFK: true,
+            format: 'uuid',
+        });
+        expect(registry.getSchema('test#/definitions/CollectionItemID5')).toStrictEqual({
             format: 'uuid',
             type: 'string',
         });
@@ -207,6 +233,31 @@ describe('generator for a6', () => {
                 description: 'This is Collection item ID (inherits from UUID)',
             });
         }
+        {
+            const rec = registry.getValidator('test#/definitions/Rec<number,CollectionItemID4>').schema;
+            expect(rec).toBeTruthy();
+            expect(rec.propertyNames).toStrictEqual({
+                format: 'uuid',
+                description: 'This is Collection item ID (non-inherits from UUID)',
+            });
+        }
+        {
+            const rec = registry.getValidator('test#/definitions/Rec<number,CollectionItemID6>').schema;
+            expect(rec).toBeTruthy();
+            expect(rec.propertyNames).toStrictEqual({
+                dbFK: true,
+                description: 'This is Collection item ID (non-inherits from UUID)',
+            });
+        }
+        {
+            const rec = registry.getValidator('test#/definitions/Rec<number,CollectionItemID7>').schema;
+            expect(rec).toBeTruthy();
+            expect(rec.propertyNames).toStrictEqual({
+                dbFK: true,
+                format: 'uuid',
+                description: 'This is Collection item ID (non-inherits from UUID)',
+            });
+        }
     });
 });
 describe('generator for a5', () => {
@@ -248,11 +299,13 @@ describe('generator for a5', () => {
             'DomainNum',
             'DomainValue',
             'DomainValuesType',
+            'FKColumn',
             'NT', // 'NamesType',
             'NamesTypeAbnormal',
             'NumN',
             'Nums',
             'Some',
+            'UUID',
             'Variadic',
             'Variadic1',
             'VariadicList',
@@ -265,6 +318,12 @@ describe('generator for a5', () => {
         expect(registry.getValidator('test#/definitions/NamesTypeAbnormal').schema).toStrictEqual({
             type: 'string',
         });
+        expect(registry.getValidator('test#/definitions/FKColumn').schema).toStrictEqual({
+            $ref: '#/definitions/UUID',
+            dbFK: true,
+            description: 'Foreign Key Column Type.',
+            // format: 'uuid',
+        });
         expect(registry.getValidator('test#/definitions/Some').schema).toStrictEqual({
             type: 'object',
             properties: {
@@ -333,6 +392,18 @@ describe('generator for a5', () => {
                     ],
                     type: 'number',
                 },
+                ref0: {
+                    $ref: '#/definitions/UUID',
+                    dbFK: true,
+                    description: 'Inline Foreign Key',
+                },
+                ref1: {
+                    $ref: '#/definitions/FKColumn',
+                },
+                ref2: {
+                    $ref: '#/definitions/FKColumn',
+                    description: 'Inline Foreign Key (2)',
+                },
             },
             required: [
                 'vals',
@@ -349,11 +420,35 @@ describe('generator for a5', () => {
                 'indexedField2',
                 'indexedField3',
                 'indexedField4',
+                'ref0',
+                'ref1',
+                'ref2',
             ],
             additionalProperties: false,
             dbEntity: 'cmn.some',
         });
     });
+    it('should works with dereferenced schema', () => {
+        const v = (0, dereference_1.dereferenceSchema)(registry.getRootSchema('test')).definitions['Some'];
+        expect(v.properties.ref0).toStrictEqual({
+            type: 'string',
+            format: 'uuid',
+            description: 'Inline Foreign Key',
+            dbFK: true,
+        });
+        expect(v.properties.ref1).toStrictEqual({
+            type: 'string',
+            format: 'uuid',
+            description: 'Foreign Key Column Type.',
+            dbFK: true,
+        });
+        expect(v.properties.ref2).toStrictEqual({
+            type: 'string',
+            format: 'uuid',
+            description: 'Inline Foreign Key (2)',
+            dbFK: true,
+        });
+    });
 });
 describe('generator for a4', () => {
     const outputSchemaFile = './a4.generated.schema.tmp.json';

package/package.json

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