swoop-common 2.0.2 → 2.0.4

package/dist/api/index.d.ts

@@ -1,3 +1,4 @@
 export * from "./generated/core/exports";
 export * from "./generated/swoop/exports";
 export { init } from "./init";
+export { deepOrderedMerge } from "../rendering/util/merge";

package/dist/api/index.js

@@ -3,3 +3,4 @@ export * from "./generated/core/exports";
 //export * from "./api/generated/itinerary/exports" Nothing exported directly
 export * from "./generated/swoop/exports";
 export { init } from "./init";
+export { deepOrderedMerge } from "../rendering/util/merge";

package/dist/rendering/schema/generate/jsonSchemaGenerate.js

@@ -9,7 +9,7 @@ export const generateJsonSchema = (formSchema, stage, onlyEditableFields) => {
             properties: {},
             required: [],
         };
-        formSchema.forEach(s => {
+        formSchema.forEach((s) => {
             if (stage < s.existsFrom)
                 return;
             if (onlyEditableFields && !s.editableIn.includes(stage))
@@ -32,12 +32,17 @@ const defaultConverter = (field, stage, omitTitle, isChild) => {
     field.fieldType = (_a = field.fieldType) !== null && _a !== void 0 ? _a : "string";
     let schema = getType(field.fieldType);
     if (!schema)
-        throw new Error("tried to generate schema from unknown type: " + field.fieldType + "\nFull object: " + JSON.stringify(field, null, 2));
+        throw new Error("tried to generate schema from unknown type: " +
+            field.fieldType +
+            "\nFull object: " +
+            JSON.stringify(field, null, 2));
     const requiredFields = [];
     if (field.required)
         requiredFields.push(field.name);
     // Specific for array
-    let arrayItems = field.fieldType === "array" ? defaultConverter((_b = field.arrayOptions) === null || _b === void 0 ? void 0 : _b.itemDefinition, stage, true, true) : undefined;
+    let arrayItems = field.fieldType === "array"
+        ? defaultConverter((_b = field.arrayOptions) === null || _b === void 0 ? void 0 : _b.itemDefinition, stage, true, true)
+        : undefined;
     // Obj childs
     const properties = {};
     for (const child of (_d = (_c = field.objectOptions) === null || _c === void 0 ? void 0 : _c.properties) !== null && _d !== void 0 ? _d : []) {
@@ -46,16 +51,20 @@ const defaultConverter = (field, stage, omitTitle, isChild) => {
         if (child.required)
             requiredFields.push(fieldId);
     }
-    // Enum fails if empty, fixes
-    let enumOpts = field.fieldType === "enum" ? (() => {
-        var _a;
-        let enumOptions = (((_a = field.enumOptions) === null || _a === void 0 ? void 0 : _a.enumValues) || []);
-        if (enumOptions.length === 0)
-            enumOptions.push("");
-        return enumOptions;
-    })() : undefined;
+    let enumOpts = field.fieldType === "enum" || "stagedEnum"
+        ? (() => {
+            var _a;
+            let enumOptions = (((_a = field.enumOptions) === null || _a === void 0 ? void 0 : _a.enumValues) ||
+                []);
+            if (enumOptions.length === 0)
+                enumOptions.push("");
+            return enumOptions;
+        })()
+        : undefined;
     // Component (probably should change this)
-    let templates = field.fieldType === "componentPicker" ? { "x-templateIds": (_e = field.componentOptions) === null || _e === void 0 ? void 0 : _e.templateIds } : {};
+    let templates = field.fieldType === "componentPicker"
+        ? { "x-templateIds": (_e = field.componentOptions) === null || _e === void 0 ? void 0 : _e.templateIds }
+        : {};
     let title = omitTitle ? undefined : field.name;
-    return Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({}, ((!isChild && !field.editableIn.includes(stage)) && { readOnly: true })), { title, type: schema.schema.type, "x-type": schema.schema["x-type"] }), templates), (schema.schema.type === "object" && { properties })), { required: requiredFields }), (enumOpts && { enum: enumOpts })), (arrayItems && { items: arrayItems })), (field.fieldType === "object" && { properties }));
+    return Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({}, (!isChild && !field.editableIn.includes(stage) && { readOnly: true })), { title, type: schema.schema.type, "x-type": schema.schema["x-type"] }), templates), (schema.schema.type === "object" && { properties })), { required: requiredFields }), (enumOpts && { enum: enumOpts })), (arrayItems && { items: arrayItems })), (field.fieldType === "object" && { properties }));
 };

package/dist/rendering/type_registration/register.js

@@ -40,6 +40,20 @@ registerType("enum", "Dropdown", { type: "string" }, {
         },
     },
 }, true);
+registerType("stagedEnum", "Staged Dropdown", {
+    type: "array",
+    items: { type: "string" },
+}, {
+    type: "object",
+    title: "Dropdown Options",
+    properties: {
+        enumValues: {
+            title: "Dropdown Values",
+            type: "array",
+            items: { type: "string" },
+        },
+    },
+}, true);
 registerType("array", "List", { type: "array" }, {
     type: "object",
     title: "List Options",

package/dist/rendering/util/merge.d.ts

@@ -0,0 +1 @@
+export declare const deepOrderedMerge: (...objects: Array<Record<string, any>>) => Record<string, any>;

package/dist/rendering/util/merge.js

@@ -0,0 +1,26 @@
+// If this throws an error, it is due to a missmatch in types between objects
+// Objects a merged in order, with later objects taking priority
+export const deepOrderedMerge = (...objects) => {
+    if (objects.length === 0)
+        return {};
+    if (objects.length === 1)
+        return objects[0];
+    let base = objects[0];
+    // Does not account for TYPES changing, only values
+    for (let i = 1; i < objects.length; i++) {
+        let keys = Object.keys(objects[i]);
+        keys.forEach(key => {
+            const val = objects[i][key];
+            if (!(key in base)) {
+                base[key] = val;
+            }
+            else if (val === null || typeof val !== "object" || Array.isArray(val)) {
+                base[key] = val;
+            }
+            else {
+                base[key] = deepOrderedMerge(base[key], val);
+            }
+        });
+    }
+    return base;
+};

package/dist/test.d.ts

@@ -1 +0,0 @@
-export {};

package/dist/test.js

@@ -1,26 +1 @@
-// If this throws an error, it is due to a missmatch in types between objects
-const conv = (...objects) => {
-    if (objects.length === 0)
-        return {};
-    if (objects.length === 1)
-        return objects[0];
-    let base = objects[0];
-    // Does not account for TYPES changing, only values
-    for (let i = 1; i < objects.length; i++) {
-        let keys = Object.keys(objects[i]);
-        keys.forEach(key => {
-            const val = objects[i][key];
-            if (!(key in base)) {
-                base[key] = val;
-            }
-            else if (val === null || typeof val !== "object" || Array.isArray(val)) {
-                base[key] = val;
-            }
-            else {
-                base[key] = conv(base[key], val);
-            }
-        });
-    }
-    return base;
-};
-export {};
+"use strict";

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "swoop-common",
-    "version": "2.0.2",
+    "version": "2.0.4",
     "main": "dist/api/index.js",
     "types": "dist/api/index.d.ts",
     "exports": {