@tsofist/schema-forge 3.7.0 → 3.7.1

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

@@ -4,13 +4,15 @@ const error_1 = require("@tsofist/stem/lib/error");
 const is_empty_1 = require("@tsofist/stem/lib/object/is-empty");
 const ts_json_schema_generator_1 = require("ts-json-schema-generator");
 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) {
-        // if (!hasJSDocTag(node, 'inheritDoc')) return getAnnotations.call(this, node);
+        if (!(0, helpers_tsc_1.hasJSDocTag)(node, 'inheritDoc'))
+            return getAnnotations.call(this, node);
         // @ts-expect-error access to private property
         const checker = this.typeChecker || (0, error_1.raise)('TypeChecker is not available');
         const result = {};

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

@@ -189,10 +189,34 @@ 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',
         });
         {
             const rec = registry.getValidator('test#/definitions/PRec<CollectionItem,UUID>').schema;
@@ -209,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', () => {
@@ -273,7 +322,7 @@ describe('generator for a5', () => {
             $ref: '#/definitions/UUID',
             dbFK: true,
             description: 'Foreign Key Column Type.',
-            format: 'uuid',
+            // format: 'uuid',
         });
         expect(registry.getValidator('test#/definitions/Some').schema).toStrictEqual({
             type: 'object',

package/package.json

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