@trayio/tray-schema 1.3.0 → 1.4.0

package/dist/schema/TJSTraySchemaGenerator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"TJSTraySchemaGenerator.d.ts","sourceRoot":"","sources":["../../src/schema/TJSTraySchemaGenerator.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,GAAG,MAAM,wBAAwB,CAAC;AAC9C,OAAO,EAAE,MAAM,EAAe,MAAM,cAAc,CAAC;AAEnD,OAAO,EAAE,aAAa,EAAE,MAAM,yCAAyC,CAAC;AACxE,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAE5D,qBAAa,sBAAuB,YAAW,mBAAmB;IACjE,gBAAgB,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,MAAM,CAAC,KAAK,EAAE,aAAa,CAAC;IAgC1E,sBAAsB,CAAC,MAAM,EAAE,GAAG,CAAC,UAAU,GAAG,GAAG,CAAC,UAAU;CAqG9D"}
+{"version":3,"file":"TJSTraySchemaGenerator.d.ts","sourceRoot":"","sources":["../../src/schema/TJSTraySchemaGenerator.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,GAAG,MAAM,wBAAwB,CAAC;AAC9C,OAAO,EAAE,MAAM,EAAe,MAAM,cAAc,CAAC;AAEnD,OAAO,EAAE,aAAa,EAAE,MAAM,yCAAyC,CAAC;AACxE,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAE5D,qBAAa,sBAAuB,YAAW,mBAAmB;IACjE,gBAAgB,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,MAAM,CAAC,KAAK,EAAE,aAAa,CAAC;IAgC1E,sBAAsB,CAAC,MAAM,EAAE,GAAG,CAAC,UAAU,GAAG,GAAG,CAAC,UAAU;CAsG9D"}

package/dist/schema/TJSTraySchemaGenerator.js

@@ -76,7 +76,7 @@ class TJSTraySchemaGenerator {
             }
         };
         const generateEnumLabels = (object) => {
-            if (object.enum && Array.isArray(object.enum)) {
+            if (object.enum && !object.enumLabels && Array.isArray(object.enum)) {
                 const enumLabels = [];
                 const enums = object.enum;
                 enums.forEach((enumItem) => {
@@ -142,6 +142,7 @@ class TJSTraySchemaGenerator {
             for (const [key, value] of Object.entries(object)) {
                 if (typeof value === 'object' && value !== null) {
                     transformLookup(value);
+                    transformEnumLabels(value);
                     generateEnumLabels(value);
                     transformOneOf(value);
                     recursiveObjectSearch(value);

package/dist/schema/TJSTraySchemaGenerator.unit.test.js

@@ -195,8 +195,46 @@ describe('TJSTraySchemaGenerator', () => {
                         properties: {
                             text: { type: 'string' },
                             type: {
-                                enumLabels: ['Default Always', 'Primary One', 'The Danger'],
-                                enum: ['default always', 'primary-one', 'the_danger'],
+                                enumLabels: ['Default Always', 'The Danger', 'Primary One'],
+                                enum: ['default always', 'the_danger', 'primary-one'],
+                                type: 'string',
+                            },
+                        },
+                        advanced: [],
+                        required: ['text', 'type'],
+                        additionalProperties: false,
+                    },
+                },
+            },
+            advanced: [],
+            required: ['actions'],
+            additionalProperties: false,
+            $schema: 'http://json-schema.org/draft-07/schema#',
+        };
+        expect(actual).toEqual(expected);
+    });
+    it('Generates enums and custom enumLabels', () => {
+        const type = 'Input';
+        const dirPath = __dirname;
+        const path = (0, path_1.join)(dirPath, 'enumLabels.test.data.ts');
+        const result = new TJSTraySchemaGenerator_1.TJSTraySchemaGenerator().generateFromType(type, path);
+        const actual = E.getOrElse((error) => {
+            console.warn(error);
+            throw new Error(`Failed to generate JSON schema from type`);
+        })(result);
+        const expected = {
+            type: 'object',
+            properties: {
+                actions: {
+                    description: 'example dropdown',
+                    type: 'array',
+                    items: {
+                        type: 'object',
+                        properties: {
+                            text: { type: 'string' },
+                            type: {
+                                enumLabels: ['The Default', 'The Danger', 'The Primary'],
+                                enum: ['default', 'danger', 'primary'],
                                 type: 'string',
                             },
                         },

package/dist/schema/enumLabels.test.data.d.ts

@@ -0,0 +1,20 @@
+export type Input = {
+    /**
+     * @description example dropdown
+     */
+    actions: Action[];
+};
+type Action = {
+    text: string;
+    type: ActionType;
+};
+/**
+ * @enumLabels The Default, The Danger, The Primary
+ */
+declare enum ActionType {
+    default = "default",
+    danger = "danger",
+    primary = "primary"
+}
+export {};
+//# sourceMappingURL=enumLabels.test.data.d.ts.map

package/dist/schema/enumLabels.test.data.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"enumLabels.test.data.d.ts","sourceRoot":"","sources":["../../src/schema/enumLabels.test.data.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,KAAK,GAAG;IACnB;;OAEG;IACH,OAAO,EAAE,MAAM,EAAE,CAAC;CAClB,CAAC;AAEF,KAAK,MAAM,GAAG;IACb,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,UAAU,CAAC;CACjB,CAAC;AACF;;GAEG;AACH,aAAK,UAAU;IACd,OAAO,YAAY;IACnB,MAAM,WAAW;IACjB,OAAO,YAAY;CACnB"}

package/dist/schema/enumLabels.test.data.js

@@ -0,0 +1,11 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+/**
+ * @enumLabels The Default, The Danger, The Primary
+ */
+var ActionType;
+(function (ActionType) {
+    ActionType["default"] = "default";
+    ActionType["danger"] = "danger";
+    ActionType["primary"] = "primary";
+})(ActionType || (ActionType = {}));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@trayio/tray-schema",
-  "version": "1.3.0",
+  "version": "1.4.0",
   "description": "Schema for Tray connectors and authentications",
   "exports": {
     "./*": "./dist/*.js"
@@ -11,10 +11,10 @@
     "access": "public"
   },
   "dependencies": {
-    "@trayio/commons": "1.3.0",
+    "@trayio/commons": "1.4.0",
     "@types/node": "18.11.9",
     "lodash": "4.17.5",
-    "typescript-json-schema": "0.61.0"
+    "typescript-json-schema": "0.62.0"
   },
   "typesVersions": {
     "*": {