swoop-common 2.2.204 → 2.2.206

package/dist/rendering/schema/formSchemaTypes.d.ts

@@ -7,6 +7,7 @@ export declare enum Stage {
 export interface MasterFieldDefinition {
     fieldType: string;
     name: string;
+    fieldId?: string;
     description?: string;
     required?: boolean;
     [key: `${string}Options`]: Record<string, any> | undefined;

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

@@ -17,9 +17,9 @@ export const generateJsonSchema = (formSchema, stage, onlyEditableFields) => {
                     .includes(stage))
                 return;
             const fieldSchema = defaultConverter(s, stage);
-            built.properties[generateFieldId(s.name)] = fieldSchema;
+            built.properties[generateFieldId(s.name, s.fieldId)] = fieldSchema;
             if (s.required && s.fieldType !== "boolean")
-                built.required.push(generateFieldId(s.name));
+                built.required.push(generateFieldId(s.name, s.fieldId));
         });
         return built;
     }
@@ -43,7 +43,7 @@ const defaultConverter = (field, stage, omitTitle, isChild) => {
         : undefined;
     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);
+        const fieldId = generateFieldId(child.name, child.fieldId);
         properties[fieldId] = defaultConverter(child, stage, false, true);
         if (child.required && child.fieldType != "boolean")
             requiredFields.push(fieldId);
@@ -94,6 +94,9 @@ const defaultConverter = (field, stage, omitTitle, isChild) => {
         : {};
     let title = omitTitle ? undefined : field.name;
     let isReadonly = !isChild && !field.editableIn.map(Number).includes(stage);
+    if (field.fieldType === "operator") {
+        return Object.assign(Object.assign({}, (isReadonly && { readOnly: true })), { title, type: "array", "x-type": "operator", items: { type: "string" }, uniqueItems: true });
+    }
     if (field.fieldType === "enum" && ((_e = field.enumOptions) === null || _e === void 0 ? void 0 : _e.multiSelect)) {
         return Object.assign(Object.assign(Object.assign({}, (isReadonly && { readOnly: true })), { title, type: "array", "x-type": schema.schema["x-type"], items: {
                 type: "string",

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

@@ -13,7 +13,7 @@ export const generateUiSchema = (formSchema, stage, onlyEditableFields) => {
 };
 const uiFieldSchemaFromFieldDefinition = (field, path = []) => {
     var _a;
-    const scope = ["#", ...path, "properties", generateFieldId(field.name)].join("/");
+    const scope = ["#", ...path, "properties", generateFieldId(field.name, field.fieldId)].join("/");
     if (field.fieldType !== "object" || getAllTypes().find((t => t.name === field.fieldType))) {
         const uiElem = Object.assign({ type: "Control", scope }, (field.fieldType === "radio" && { options: { format: "radio" } }));
         return uiElem;
@@ -25,7 +25,7 @@ const uiFieldSchemaFromFieldDefinition = (field, path = []) => {
         elements: children.map((child) => uiFieldSchemaFromFieldDefinition(child, [
             ...path,
             "properties",
-            generateFieldId(field.name),
+            generateFieldId(field.name, field.fieldId),
         ])),
     };
     return group;

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

@@ -1 +1 @@
-export declare function generateFieldId(name: string): string;
+export declare function generateFieldId(name: string, fieldId?: string): string;

package/dist/rendering/schema/util.js

@@ -1,5 +1,7 @@
 // Helper function to generate field ID from name
-export function generateFieldId(name) {
+export function generateFieldId(name, fieldId) {
+    if (fieldId)
+        return fieldId;
     if (!name)
         return `field_${Date.now()}_${Math.floor(Math.random() * 1000)}`;
     return toCamelCase(name);

package/dist/rendering/type_registration/register.js

@@ -161,6 +161,7 @@ registerType("person", "Person (Swooper)", { type: "string" }, {
         },
     },
 }, false);
+registerType("operator", "Operator", { type: "array", items: { type: "string" }, uniqueItems: true }, {}, false);
 registerType("multiline", "Multiline", { type: "string" }, {}, false);
 registerType("wysiwyg-editor", "WYSIWYG Editor", { type: "string" }, {}, false);
 registerType("inspection", "Inspections", { type: "array" }, {}, false);

package/package.json

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