swoop-common 2.2.108 → 2.2.110

package/dist/rendering/contexts/ComponentPickerContext.js

@@ -25,7 +25,6 @@ export const ComponentPickerProvider = ({ children }) => {
         setOpen(true);
         return new Promise((res, rej) => {
             setParentIds(parentIds);
-            console.log("GOT DA PARENTS", parentIds);
             // In case of old refs being called (so i dont need to explicitly remove them)
             let done = false;
             changeProp.current = (value) => {

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

@@ -2,7 +2,6 @@ import { getType } from "../../registry/fields";
 import { generateFieldId } from "../util";
 import "../../prebuild/generated/import_generated";
 export const generateJsonSchema = (formSchema, stage, onlyEditableFields) => {
-    // Lazy try catch rn
     try {
         const built = {
             type: "object",
@@ -31,7 +30,6 @@ export const generateJsonSchema = (formSchema, stage, onlyEditableFields) => {
 };
 const defaultConverter = (field, stage, omitTitle, isChild) => {
     var _a, _b, _c, _d;
-    // Default field type
     field.fieldType = (_a = field.fieldType) !== null && _a !== void 0 ? _a : "string";
     let schema = getType(field.fieldType);
     if (!schema)
@@ -40,16 +38,13 @@ const defaultConverter = (field, stage, omitTitle, isChild) => {
             "\nFull object: " +
             JSON.stringify(field, null, 2));
     const requiredFields = [];
-    // Specific for array
     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 : []) {
         const fieldId = generateFieldId(child.name);
         properties[fieldId] = defaultConverter(child, stage, false, true);
-        console.log("FILD TYPE", child.fieldType, "REWQUIRED", child.required);
         if (child.required && child.fieldType != "boolean")
             requiredFields.push(fieldId);
     }
@@ -73,11 +68,20 @@ const defaultConverter = (field, stage, omitTitle, isChild) => {
             return enumOptions;
         })()
         : undefined;
-    // Component (probably should change this)
     let templates = field.fieldType === "component" && field.componentOptions
-        ? { "x-templateIds": field.componentOptions["x-templateIds"] }
+        ? { "x-templateIds": field.componentOptions["templateIds"] }
+        : {};
+    const speciallyHandledKeys = new Set([
+        "enumValues",
+        "itemDefinition",
+        "properties",
+        "templateIds",
+    ]);
+    const fieldTypeOptions = field[`${field.fieldType}Options`];
+    const directOptions = fieldTypeOptions
+        ? Object.fromEntries(Object.entries(fieldTypeOptions).filter(([key]) => !speciallyHandledKeys.has(key)))
         : {};
     let title = omitTitle ? undefined : field.name;
     let isReadonly = !isChild && !field.editableIn.map(Number).includes(stage);
-    return Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({}, (isReadonly && { readOnly: true })), { title, type: schema.schema.type, "x-type": schema.schema["x-type"] }), templates), (schema.schema.type === "object" && { properties })), (field.fieldType === "object" && { required: requiredFields })), (enumOpts && { enum: enumOpts })), (stagedEnumOpts && { items: { enum: stagedEnumOpts, type: "string" } })), (arrayItems && { items: arrayItems })), (field.fieldType === "object" && { properties })), (field.fieldType === "string" && Object.assign({}, field.stringOptions)));
+    return Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({}, (isReadonly && { readOnly: true })), { title, type: schema.schema.type, "x-type": schema.schema["x-type"] }), templates), (schema.schema.type === "object" && { properties })), (field.fieldType === "object" && { required: requiredFields })), (enumOpts && { enum: enumOpts })), (stagedEnumOpts && { items: { enum: stagedEnumOpts, type: "string" } })), (arrayItems && { items: arrayItems })), (field.fieldType === "object" && { properties })), directOptions);
 };

package/dist/test.js

@@ -1,85 +1,7 @@
 export {};
-/*
-console.log(
-  generateJsonSchema(
-    [
-      {
-        required: true,
-        name: "Journey",
-        fieldType: "component",
-        existsFrom: "0",
-        editableIn: ["0"],
-      },
-      {
-        required: false,
-        name: "Type",
-        fieldType: "string",
-        existsFrom: "0",
-        editableIn: ["0", "1"],
-      },
-      {
-        required: true,
-        name: "Driver",
-        fieldType: "boolean",
-        existsFrom: "0",
-        editableIn: ["0", "1"],
-      },
-      {
-        required: true,
-        name: "Guided",
-        fieldType: "boolean",
-        existsFrom: "0",
-        editableIn: ["0", "1"],
-      },
-      {
-        required: false,
-        name: "Operator",
-        fieldType: "string",
-        existsFrom: "0",
-        editableIn: ["0", "1"],
-      },
-      {
-        required: false,
-        name: "Notes",
-        fieldType: "object",
-        existsFrom: "0",
-        editableIn: ["0", "1"],
-        objectOptions: {
-          properties: [
-            {
-              required: false,
-              name: "Pickup",
-              fieldType: "string",
-              editableIn: ["0", "1"],
-            },
-            {
-              required: false,
-              name: "Schedule",
-              fieldType: "string",
-              existsFrom: "0",
-              editableIn: ["0", "1"],
-            },
-          ],
-        },
-      },
-      {
-        required: false,
-        name: "Departure Time",
-        fieldType: "string",
-        existsFrom: "0",
-        editableIn: ["1", "0"],
-        stringOptions: { format: "time" },
-      },
-      {
-        required: false,
-        name: "Arrival Time",
-        fieldType: "string",
-        existsFrom: "0",
-        editableIn: ["0", "1"],
-        stringOptions: { format: "time" },
-      },
-    ],
-    Stage.Inst
-  )
-);
-*/
+// console.log(
+//     JSON.stringify(generateJsonSchema(
+//         [{ "required": true, "name": "Name", "fieldType": "string", "editableIn": ["1"], "existsFrom": "1" }, { "required": true, "name": "Date", "fieldType": "string", "editableIn": ["1"], "existsFrom": "1", "stringOptions": { "format": "date-time" } }, { "required": true, "name": "Departure Airport", "fieldType": "component", "existsFrom": "1", "editableIn": ["1"], "componentOptions": { "templateIds": ["template_0c105b25350647b096753b4f863ab06c"] } }, { "required": true, "name": "Arrival Airport", "fieldType": "component", "existsFrom": "1", "editableIn": ["1"], "componentOptions": { "templateIds": ["template_0c105b25350647b096753b4f863ab06c"] } }, { "required": false, "name": "Welcome Note", "fieldType": "string", "existsFrom": "1", "editableIn": ["1"], "stringOptions": { "maxLength": 512 } }],
+//         Stage.Inst
+//     ))
+// );

package/package.json

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