@trayio/tray-schema 4.30.0 → 4.31.0

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

@@ -1 +1 @@
-{"version":3,"file":"TJSTraySchemaGenerator.d.ts","sourceRoot":"","sources":["../../src/schema/TJSTraySchemaGenerator.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,MAAM,EAAe,MAAM,cAAc,CAAC;AAEnD,OAAO,EAEN,aAAa,EAEb,MAAM,yCAAyC,CAAC;AAEjD,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;IA2C1E,sBAAsB,CAAC,MAAM,EAAE,aAAa,GAAG,aAAa;CAsL5D"}
+{"version":3,"file":"TJSTraySchemaGenerator.d.ts","sourceRoot":"","sources":["../../src/schema/TJSTraySchemaGenerator.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,MAAM,EAAQ,MAAM,cAAc,CAAC;AAE5C,OAAO,EACN,aAAa,EAEb,MAAM,yCAAyC,CAAC;AAEjD,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;IA2C1E,sBAAsB,CAAC,MAAM,EAAE,aAAa,GAAG,aAAa;CAiM5D"}

package/dist/schema/TJSTraySchemaGenerator.js

@@ -82,20 +82,30 @@ class TJSTraySchemaGenerator {
         const transformDropDown = (object) => {
             if (object.dropdown === false) {
                 const unionTypes = [];
-                object.oneOf.forEach((item) => {
-                    if (item.type === 'array' ||
-                        item.type === 'object') {
-                        unionTypes.push(item);
-                        return;
-                    }
-                    const types = Array.isArray(item.type)
-                        ? item.type
-                        : [item.type];
-                    unionTypes.push(...types);
-                });
-                object.type = [...new Set(unionTypes)];
-                delete object.oneOf;
-                delete object.dropdown;
+                let extras = {};
+                if (object.oneOf) {
+                    object.oneOf.forEach((item) => {
+                        unionTypes.push(item.type);
+                        if (item.type === 'object') {
+                            extras = {
+                                ...extras,
+                                additionalProperties: true,
+                            };
+                        }
+                        if (item.type === 'array') {
+                            extras = {
+                                ...extras,
+                                items: {
+                                    type: item.items.type,
+                                },
+                            };
+                        }
+                    });
+                    object.type = [...new Set(unionTypes)];
+                    Object.assign(object, extras);
+                    delete object.oneOf;
+                    delete object.dropdown;
+                }
             }
         };
         const transformEnumLabels = (object) => {

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

@@ -453,22 +453,20 @@ describe('TJSTraySchemaGenerator', () => {
             type: 'object',
             properties: {
                 emails: {
-                    type: [
-                        {
-                            type: 'object',
-                            properties: {},
-                            additionalProperties: true,
-                            advanced: [],
-                        },
-                        'string',
-                    ],
+                    type: ['object', 'string'],
+                    additionalProperties: true,
                 },
                 workspaces: {
-                    type: [{ type: 'array', items: { type: 'string' } }, 'string'],
+                    type: ['array', 'string'],
+                    items: { type: 'string' },
+                },
+                projects: {
+                    type: ['array', 'string'],
+                    items: { type: 'number' },
                 },
             },
             advanced: [],
-            required: ['emails', 'workspaces'],
+            required: ['emails', 'projects', 'workspaces'],
             additionalProperties: false,
             $schema: 'http://json-schema.org/draft-07/schema#',
         };

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

@@ -7,5 +7,9 @@ export type Input = {
      * @dropdown false
      */
     workspaces: string | string[];
+    /**
+     * @dropdown false
+     */
+    projects: string | number[];
 };
 //# sourceMappingURL=dropdown.test.data.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"dropdown.test.data.d.ts","sourceRoot":"","sources":["../../src/schema/dropdown.test.data.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,KAAK,GAAG;IACnB;;OAEG;IACH,MAAM,EAAE,MAAM,GAAG,MAAM,CAAC;IAExB;;OAEG;IACH,UAAU,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;CAC9B,CAAC"}
+{"version":3,"file":"dropdown.test.data.d.ts","sourceRoot":"","sources":["../../src/schema/dropdown.test.data.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,KAAK,GAAG;IACnB;;OAEG;IACH,MAAM,EAAE,MAAM,GAAG,MAAM,CAAC;IAExB;;OAEG;IACH,UAAU,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IAE9B;;OAEG;IACH,QAAQ,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;CAC5B,CAAC"}

package/package.json

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