@remoteoss/json-schema-form 0.4.5-beta.0 → 0.5.0-beta.0

package/CHANGELOG.md

@@ -1,3 +1,10 @@
+#### 0.5.0-beta.0 (2023-09-12)
+
+##### Changes
+
+- Computed Attributes ([#36](https://github.com/remoteoss/json-schema-form/pull/36)) ([80c29589](https://github.com/remoteoss/json-schema-form/commit/80c29589ac0972e0f33add70a59df15a46db1b43))
+- JSON Logic Skeleton ([#35](https://github.com/remoteoss/json-schema-form/pull/35)) ([63149ae8](https://github.com/remoteoss/json-schema-form/commit/63149ae863cf1b5ad76a3b2a49c7f343e55ce07b))
+
 #### 0.4.5-beta.0 (2023-08-31)
 
 ##### Changes

package/dist/index.cjs

@@ -1,8 +1,8 @@
 
 /*!
  Copyright (c) 2023 Remote Technology, Inc.
- NPM Package: @remoteoss/json-schema-form@0.4.5-beta.0
- Generated: Thu, 31 Aug 2023 07:23:05 GMT
+ NPM Package: @remoteoss/json-schema-form@0.5.0-beta.0
+ Generated: Tue, 12 Sep 2023 07:51:25 GMT
 
  MIT License
 
@@ -411,6 +411,103 @@ var import_flow = __toESM(require("lodash/flow"));
 var import_noop = __toESM(require("lodash/noop"));
 var import_randexp = require("randexp");
 var import_yup = require("yup");
+
+// src/jsonLogic.js
+var import_json_logic_js = __toESM(require("json-logic-js"));
+function createValidationChecker(schema) {
+  const scopes = /* @__PURE__ */ new Map();
+  function createScopes(jsonSchema, key = "root") {
+    scopes.set(key, createValidationsScope(jsonSchema));
+    Object.entries(jsonSchema?.properties ?? {}).filter(([, property]) => property.type === "object" || property.type === "array").forEach(([key2, property]) => {
+      if (property.type === "array") {
+        createScopes(property.items, `${key2}[]`);
+      } else {
+        createScopes(property, key2);
+      }
+    });
+  }
+  createScopes(schema);
+  return {
+    scopes,
+    getScope(name = "root") {
+      return scopes.get(name);
+    }
+  };
+}
+function createValidationsScope(schema) {
+  const validationMap = /* @__PURE__ */ new Map();
+  const computedValuesMap = /* @__PURE__ */ new Map();
+  const logic = schema?.["x-jsf-logic"] ?? {
+    validations: {},
+    computedValues: {}
+  };
+  const validations = Object.entries(logic.validations ?? {});
+  const computedValues = Object.entries(logic.computedValues ?? {});
+  validations.forEach(([id, validation]) => {
+    validationMap.set(id, validation);
+  });
+  computedValues.forEach(([id, computedValue]) => {
+    computedValuesMap.set(id, computedValue);
+  });
+  function validate(rule, values) {
+    return import_json_logic_js.default.apply(rule, replaceUndefinedValuesWithNulls(values));
+  }
+  return {
+    validationMap,
+    computedValuesMap,
+    validate,
+    applyValidationRuleInCondition(id, values) {
+      const validation = validationMap.get(id);
+      return validate(validation.rule, values);
+    },
+    applyComputedValueInField(id, values) {
+      const validation = computedValuesMap.get(id);
+      return validate(validation.rule, values);
+    },
+    applyComputedValueRuleInCondition(id, values) {
+      const validation = computedValuesMap.get(id);
+      return validate(validation.rule, values);
+    }
+  };
+}
+function replaceUndefinedValuesWithNulls(values = {}) {
+  return Object.entries(values).reduce((prev, [key, value]) => {
+    return { ...prev, [key]: value === void 0 ? null : value };
+  }, {});
+}
+function yupSchemaWithCustomJSONLogic({ field, logic, config, id }) {
+  const { parentID = "root" } = config;
+  const validation = logic.getScope(parentID).validationMap.get(id);
+  return (yupSchema) => yupSchema.test(
+    `${field.name}-validation-${id}`,
+    validation?.errorMessage ?? "This field is invalid.",
+    (value, { parent }) => {
+      if (value === void 0 && !field.required)
+        return true;
+      return import_json_logic_js.default.apply(validation.rule, parent);
+    }
+  );
+}
+function calculateComputedAttributes(fieldParams, { parentID = "root" } = {}) {
+  return ({ logic, formValues }) => {
+    const { computedAttributes } = fieldParams;
+    const attributes = Object.fromEntries(
+      Object.entries(computedAttributes).map(handleComputedAttribute(logic, formValues, parentID)).filter(([, value]) => value !== null)
+    );
+    return attributes;
+  };
+}
+function handleComputedAttribute(logic, formValues, parentID) {
+  return ([key, value]) => {
+    if (key === "const")
+      return [key, logic.getScope(parentID).applyComputedValueInField(value, formValues)];
+    if (typeof value === "string") {
+      return [key, logic.getScope(parentID).applyComputedValueInField(value, formValues)];
+    }
+  };
+}
+
+// src/yupSchema.js
 var DEFAULT_DATE_FORMAT = "yyyy-MM-dd";
 var baseString = (0, import_yup.string)().trim();
 var todayDateHint = (/* @__PURE__ */ new Date()).toISOString().substring(0, 10);
@@ -533,7 +630,7 @@ var getYupSchema = ({ inputType, ...field }) => {
   }
   return yupSchemas[inputType] || yupSchemasToJsonTypes[jsonType];
 };
-function buildYupSchema(field, config) {
+function buildYupSchema(field, config, logic) {
   const { inputType, jsonType: jsonTypeValue, errorMessage = {}, ...propertyFields } = field;
   const isCheckboxBoolean = typeof propertyFields.checkboxValue === "boolean";
   let baseSchema;
@@ -683,6 +780,11 @@ function buildYupSchema(field, config) {
   if (propertyFields.const) {
     validators.push(withConst);
   }
+  if (propertyFields.requiredValidations) {
+    propertyFields.requiredValidations.forEach(
+      (id) => validators.push(yupSchemaWithCustomJSONLogic({ field, id, logic, config }))
+    );
+  }
   return (0, import_flow.default)(validators);
 }
 function getNoSortEdges(fields = []) {
@@ -722,8 +824,8 @@ function hasType(type, typeName) {
 function getField(fieldName, fields) {
   return fields.find(({ name }) => name === fieldName);
 }
-function validateFieldSchema(field, value) {
-  const validator = buildYupSchema(field);
+function validateFieldSchema(field, value, logic) {
+  const validator = buildYupSchema(field, {}, logic);
   return validator().isValidSync(value);
 }
 function compareFormValueWithSchemaValue(formValue, schemaValue) {
@@ -797,7 +899,7 @@ function getPrefillValues(fields, initialValues = {}) {
   });
   return initialValues;
 }
-function updateField(field, requiredFields, node, formValues) {
+function updateField(field, requiredFields, node, formValues, logic, config) {
   if (!field) {
     return;
   }
@@ -819,6 +921,17 @@ function updateField(field, requiredFields, node, formValues) {
       }
     }
   });
+  if (field.getComputedAttributes) {
+    const computedFieldValues = field.getComputedAttributes({
+      field,
+      isRequired: fieldIsRequired,
+      node,
+      formValues,
+      config,
+      logic
+    });
+    updateValues(computedFieldValues);
+  }
   if (field.calculateConditionalProperties) {
     const newFieldValues = field.calculateConditionalProperties(fieldIsRequired, node);
     updateValues(newFieldValues);
@@ -832,33 +945,46 @@ function updateField(field, requiredFields, node, formValues) {
     updateValues(newFieldValues);
   }
 }
-function processNode(node, formValues, formFields, accRequired = /* @__PURE__ */ new Set()) {
+function processNode({
+  node,
+  formValues,
+  formFields,
+  accRequired = /* @__PURE__ */ new Set(),
+  parentID = "root",
+  logic
+}) {
   const requiredFields = new Set(accRequired);
   Object.keys(node.properties ?? []).forEach((fieldName) => {
     const field = getField(fieldName, formFields);
-    updateField(field, requiredFields, node, formValues);
+    updateField(field, requiredFields, node, formValues, logic, { parentID });
   });
   node.required?.forEach((fieldName) => {
     requiredFields.add(fieldName);
-    updateField(getField(fieldName, formFields), requiredFields, node, formValues);
+    updateField(getField(fieldName, formFields), requiredFields, node, formValues, logic, {
+      parentID
+    });
   });
   if (node.if) {
-    const matchesCondition = checkIfConditionMatches(node, formValues, formFields);
+    const matchesCondition = checkIfConditionMatches(node, formValues, formFields, logic);
     if (matchesCondition && node.then) {
-      const { required: branchRequired } = processNode(
-        node.then,
+      const { required: branchRequired } = processNode({
+        node: node.then,
         formValues,
         formFields,
-        requiredFields
-      );
+        accRequired: requiredFields,
+        parentID,
+        logic
+      });
       branchRequired.forEach((field) => requiredFields.add(field));
     } else if (node.else) {
-      const { required: branchRequired } = processNode(
-        node.else,
+      const { required: branchRequired } = processNode({
+        node: node.else,
         formValues,
         formFields,
-        requiredFields
-      );
+        accRequired: requiredFields,
+        parentID,
+        logic
+      });
       branchRequired.forEach((field) => requiredFields.add(field));
     }
   }
@@ -870,12 +996,21 @@ function processNode(node, formValues, formFields, accRequired = /* @__PURE__ */
     node.anyOf.forEach(({ required = [] }) => {
       required.forEach((fieldName) => {
         const field = getField(fieldName, formFields);
-        updateField(field, requiredFields, node, formValues);
+        updateField(field, requiredFields, node, formValues, logic, { parentID });
       });
     });
   }
   if (node.allOf) {
-    node.allOf.map((allOfNode) => processNode(allOfNode, formValues, formFields, requiredFields)).forEach(({ required: allOfItemRequired }) => {
+    node.allOf.map(
+      (allOfNode) => processNode({
+        node: allOfNode,
+        formValues,
+        formFields,
+        accRequired: requiredFields,
+        parentID,
+        logic
+      })
+    ).forEach(({ required: allOfItemRequired }) => {
       allOfItemRequired.forEach(requiredFields.add, requiredFields);
     });
   }
@@ -883,7 +1018,13 @@ function processNode(node, formValues, formFields, accRequired = /* @__PURE__ */
     Object.entries(node.properties).forEach(([name, nestedNode]) => {
       const inputType = getInputType(nestedNode);
       if (inputType === supportedTypes.FIELDSET) {
-        processNode(nestedNode, formValues[name] || {}, getField(name, formFields).fields);
+        processNode({
+          node: nestedNode,
+          formValues: formValues[name] || {},
+          formFields: getField(name, formFields).fields,
+          parentID: name,
+          logic
+        });
       }
     });
   }
@@ -901,11 +1042,11 @@ function clearValuesIfNotVisible(fields, formValues) {
     }
   });
 }
-function updateFieldsProperties(fields, formValues, jsonSchema) {
+function updateFieldsProperties(fields, formValues, jsonSchema, logic) {
   if (!jsonSchema?.properties) {
     return;
   }
-  processNode(jsonSchema, formValues, fields);
+  processNode({ node: jsonSchema, formValues, formFields: fields, logic });
   clearValuesIfNotVisible(fields, formValues);
 }
 var notNullOption = (opt) => opt.const !== null;
@@ -948,12 +1089,16 @@ function extractParametersFromNode(schemaNode) {
   }
   const presentation = pickXKey(schemaNode, "presentation") ?? {};
   const errorMessage = pickXKey(schemaNode, "errorMessage") ?? {};
+  const requiredValidations = schemaNode["x-jsf-logic-validations"];
+  const computedAttributes = schemaNode["x-jsf-logic-computedAttrs"];
+  const decoratedComputedAttributes = getDecoratedComputedAttributes(computedAttributes);
   const node = (0, import_omit.default)(schemaNode, ["x-jsf-presentation", "presentation"]);
   const description = presentation?.description || node.description;
   const statementDescription = containsHTML(presentation.statement?.description) ? wrapWithSpan(presentation.statement.description, { class: "jsf-statement" }) : presentation.statement?.description;
   return (0, import_omitBy.default)(
     {
       const: node.const,
+      ...node.const && node.default ? { value: node.const } : {},
       label: node.title,
       readOnly: node.readOnly,
       ...node.deprecated && {
@@ -988,6 +1133,8 @@ function extractParametersFromNode(schemaNode) {
       },
       // Handle [name].presentation
       ...presentation,
+      requiredValidations,
+      computedAttributes: decoratedComputedAttributes,
       description: containsHTML(description) ? wrapWithSpan(description, {
         class: "jsf-description"
       }) : description,
@@ -1024,8 +1171,8 @@ function yupToFormErrors(yupError) {
   }
   return errors;
 }
-var handleValuesChange = (fields, jsonSchema, config) => (values) => {
-  updateFieldsProperties(fields, values, jsonSchema);
+var handleValuesChange = (fields, jsonSchema, config, logic) => (values) => {
+  updateFieldsProperties(fields, values, jsonSchema, logic);
   const lazySchema = (0, import_yup2.lazy)(() => buildCompleteYupSchema(fields, config));
   let errors;
   try {
@@ -1044,6 +1191,12 @@ var handleValuesChange = (fields, jsonSchema, config) => (values) => {
     formErrors: yupToFormErrors(errors)
   };
 };
+function getDecoratedComputedAttributes(computedAttributes) {
+  return {
+    ...computedAttributes ?? {},
+    ...computedAttributes?.const && computedAttributes?.default ? { value: computedAttributes.const } : {}
+  };
+}
 
 // src/calculateConditionalProperties.js
 function isFieldRequired(node, field) {
@@ -1245,6 +1398,9 @@ function applyFieldsDependencies(fieldsParameters, node) {
       applyFieldsDependencies(fieldsParameters, condition);
     });
   }
+  if (node?.["x-jsf-logic"]) {
+    applyFieldsDependencies(fieldsParameters, node["x-jsf-logic"]);
+  }
 }
 function getCustomPropertiesForField(fieldParams, config) {
   return config?.customProperties?.[fieldParams.name];
@@ -1256,15 +1412,16 @@ function getComposeFunctionForField(fieldParams, hasCustomizations) {
   }
   return composeFn;
 }
-function buildField(fieldParams, config, scopedJsonSchema) {
+function buildField(fieldParams, config, scopedJsonSchema, logic) {
   const customProperties = getCustomPropertiesForField(fieldParams, config);
   const composeFn = getComposeFunctionForField(fieldParams, !!customProperties);
-  const yupSchema = buildYupSchema(fieldParams, config);
+  const yupSchema = buildYupSchema(fieldParams, config, logic);
   const calculateConditionalFieldsClosure = fieldParams.isDynamic && calculateConditionalProperties(fieldParams, customProperties);
   const calculateCustomValidationPropertiesClosure = calculateCustomValidationProperties(
     fieldParams,
     customProperties
   );
+  const getComputedAttributes = Object.keys(fieldParams.computedAttributes).length > 0 && calculateComputedAttributes(fieldParams, config);
   const hasCustomValidations = !!customProperties && (0, import_size.default)((0, import_pick2.default)(customProperties, SUPPORTED_CUSTOM_VALIDATION_FIELD_PARAMS)) > 0;
   const finalFieldParams = {
     // invalid attribute cleanup
@@ -1277,6 +1434,7 @@ function buildField(fieldParams, config, scopedJsonSchema) {
     ...hasCustomValidations && {
       calculateCustomValidationProperties: calculateCustomValidationPropertiesClosure
     },
+    ...getComputedAttributes && { getComputedAttributes },
     // field customization properties
     ...customProperties && { fieldCustomization: customProperties },
     // base schema
@@ -1285,7 +1443,7 @@ function buildField(fieldParams, config, scopedJsonSchema) {
   };
   return composeFn(finalFieldParams);
 }
-function getFieldsFromJSONSchema(scopedJsonSchema, config) {
+function getFieldsFromJSONSchema(scopedJsonSchema, config, logic) {
   if (!scopedJsonSchema) {
     return [];
   }
@@ -1309,11 +1467,11 @@ function getFieldsFromJSONSchema(scopedJsonSchema, config) {
         fields: () => groupArrayFields,
         addFieldText: fieldParams.addFieldText
       };
-      buildField(fieldParams, config, scopedJsonSchema).forEach((groupField) => {
+      buildField(fieldParams, config, scopedJsonSchema, logic).forEach((groupField) => {
         fields.push(groupField);
       });
     } else {
-      fields.push(buildField(fieldParams, config, scopedJsonSchema));
+      fields.push(buildField(fieldParams, config, scopedJsonSchema, logic));
     }
   });
   return fields;
@@ -1324,9 +1482,15 @@ function createHeadlessForm(jsonSchema, customConfig = {}) {
     ...customConfig
   };
   try {
-    const fields = getFieldsFromJSONSchema(jsonSchema, config);
-    const handleValidation = handleValuesChange(fields, jsonSchema, config);
-    updateFieldsProperties(fields, getPrefillValues(fields, config.initialValues), jsonSchema);
+    const logic = createValidationChecker(jsonSchema);
+    const fields = getFieldsFromJSONSchema(jsonSchema, config, logic);
+    const handleValidation = handleValuesChange(fields, jsonSchema, config, logic);
+    updateFieldsProperties(
+      fields,
+      getPrefillValues(fields, config.initialValues),
+      jsonSchema,
+      logic
+    );
     return {
       fields,
       handleValidation,