@remoteoss/json-schema-form 0.4.4-dev.20230829101351 → 0.4.4-dev.20230829102031

package/dist/index.cjs

@@ -1,8 +1,8 @@
 
 /*!
  Copyright (c) 2023 Remote Technology, Inc.
- NPM Package: @remoteoss/json-schema-form@0.4.4-dev.20230829101351
- Generated: Tue, 29 Aug 2023 10:14:13 GMT
+ NPM Package: @remoteoss/json-schema-form@0.4.4-dev.20230829102031
+ Generated: Tue, 29 Aug 2023 10:20:47 GMT
 
  MIT License
 
@@ -103,8 +103,8 @@ function hasProperty(object2, propertyName) {
 }
 
 // src/checkIfConditionMatches.js
-function checkIfConditionMatches(node, formValues, formFields, validations) {
-  return Object.keys(node.if.properties ?? {}).every((name) => {
+function checkIfConditionMatches(node, formValues, formFields) {
+  return Object.keys(node.if.properties).every((name) => {
     const currentProperty = node.if.properties[name];
     const value = formValues[name];
     const hasEmptyValue = typeof value === "undefined" || // NOTE: This is a "Remote API" dependency, as empty fields are sent as "null".
@@ -130,8 +130,7 @@ function checkIfConditionMatches(node, formValues, formFields, validations) {
       return checkIfConditionMatches(
         { if: currentProperty },
         formValues[name],
-        getField(name, formFields).fields,
-        validations
+        getField(name, formFields).fields
       );
     }
     const field = getField(name, formFields);
@@ -147,23 +146,6 @@ function checkIfConditionMatches(node, formValues, formFields, validations) {
     );
   });
 }
-function checkIfMatchesValidationsAndComputedValues(node, formValues, validations, parentID) {
-  const validationsMatch = Object.entries(node.if.validations ?? {}).every(([name, property]) => {
-    const currentValue = validations.getScope(parentID).evaluateValidationRuleInCondition(name, formValues);
-    if (Object.hasOwn(property, "const") && currentValue === property.const)
-      return true;
-    return false;
-  });
-  const computedValuesMatch = Object.entries(node.if.computedValues ?? {}).every(
-    ([name, property]) => {
-      const currentValue = validations.getScope(parentID).evaluateComputedValueRuleInCondition(name, formValues);
-      if (Object.hasOwn(property, "const") && currentValue === property.const)
-        return true;
-      return false;
-    }
-  );
-  return computedValuesMatch && validationsMatch;
-}
 
 // src/internals/helpers.js
 var import_merge = __toESM(require("lodash/fp/merge"));
@@ -424,9 +406,6 @@ function _composeFieldCustomClosure(defaultComposeFn) {
   };
 }
 
-// src/jsonLogic.js
-var import_json_logic_js = __toESM(require("json-logic-js"));
-
 // src/yupSchema.js
 var import_flow = __toESM(require("lodash/flow"));
 var import_noop = __toESM(require("lodash/noop"));
@@ -554,7 +533,7 @@ var getYupSchema = ({ inputType, ...field }) => {
   }
   return yupSchemas[inputType] || yupSchemasToJsonTypes[jsonType];
 };
-function buildYupSchema(field, config, validations) {
+function buildYupSchema(field, config) {
   const { inputType, jsonType: jsonTypeValue, errorMessage = {}, ...propertyFields } = field;
   const isCheckboxBoolean = typeof propertyFields.checkboxValue === "boolean";
   let baseSchema;
@@ -654,8 +633,7 @@ function buildYupSchema(field, config, validations) {
             ...fieldSetfield,
             inputType: fieldSetfield.type
           },
-          { ...config, parentID: field.name },
-          validations
+          config
         )();
       }
     });
@@ -666,11 +644,7 @@ function buildYupSchema(field, config, validations) {
       propertyFields.nthFieldGroup.fields().reduce(
         (schema, groupArrayField) => ({
           ...schema,
-          [groupArrayField.name]: buildYupSchema(
-            groupArrayField,
-            { ...config, parentID: `${propertyFields.nthFieldGroup.name}[]` },
-            validations
-          )()
+          [groupArrayField.name]: buildYupSchema(groupArrayField, config)()
         }),
         {}
       )
@@ -709,11 +683,6 @@ function buildYupSchema(field, config, validations) {
   if (propertyFields.const) {
     validators.push(withConst);
   }
-  if (propertyFields.requiredValidations) {
-    propertyFields.requiredValidations.forEach(
-      (id) => validators.push(yupSchemaWithCustomJSONLogic({ field, id, validations, config }))
-    );
-  }
   return (0, import_flow.default)(validators);
 }
 function getNoSortEdges(fields = []) {
@@ -724,322 +693,26 @@ function getNoSortEdges(fields = []) {
     return list;
   }, []);
 }
-function getSchema(fields = [], config, validations) {
+function getSchema(fields = [], config) {
   const newSchema = {};
   fields.forEach((field) => {
     if (field.schema) {
       if (field.name) {
         if (field.inputType === supportedTypes.FIELDSET) {
-          const fieldsetSchema = buildYupSchema(
-            field,
-            { ...config, parentID: field.name },
-            validations
-          )();
+          const fieldsetSchema = buildYupSchema(field, config)();
           newSchema[field.name] = fieldsetSchema;
         } else {
           newSchema[field.name] = field.schema;
         }
       } else {
-        Object.assign(newSchema, getSchema(field.fields, config, validations));
+        Object.assign(newSchema, getSchema(field.fields, config));
       }
     }
   });
   return newSchema;
 }
-function buildCompleteYupSchema(fields, config, validations) {
-  return (0, import_yup.object)().shape(getSchema(fields, config, validations), getNoSortEdges(fields));
-}
-
-// src/jsonLogic.js
-function createValidationChecker(schema) {
-  const scopes = /* @__PURE__ */ new Map();
-  function createScopes(jsonSchema, key = "root") {
-    const sampleEmptyObject = buildSampleEmptyObject(schema);
-    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}[]`);
-      }
-      createScopes(property, key2);
-    });
-    validateInlineRules(jsonSchema, sampleEmptyObject);
-  }
-  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 ?? {});
-  const sampleEmptyObject = buildSampleEmptyObject(schema);
-  validations.forEach(([id, validation]) => {
-    if (!validation.rule) {
-      throw Error(`Missing rule for validation with id of: "${id}".`);
-    }
-    checkRuleIntegrity(validation.rule, id, sampleEmptyObject);
-    validationMap.set(id, validation);
-  });
-  computedValues.forEach(([id, computedValue]) => {
-    if (!computedValue.rule) {
-      throw Error(`Missing rule for computedValue with id of: "${id}".`);
-    }
-    checkRuleIntegrity(computedValue.rule, id, sampleEmptyObject);
-    computedValuesMap.set(id, computedValue);
-  });
-  function evaluateValidation(rule, values) {
-    return import_json_logic_js.default.apply(rule, clean(values));
-  }
-  return {
-    validationMap,
-    computedValuesMap,
-    evaluateValidation,
-    evaluateValidationRuleInCondition(id, values) {
-      const validation = validationMap.get(id);
-      if (validation === void 0)
-        throw Error(`"${id}" validation in if condition doesn't exist.`);
-      return evaluateValidation(validation.rule, values);
-    },
-    evaluateComputedValueRuleForField(id, values, fieldName) {
-      const validation = computedValuesMap.get(id);
-      if (validation === void 0)
-        throw Error(`"${id}" computedValue in field "${fieldName}" doesn't exist.`);
-      return evaluateValidation(validation.rule, values);
-    },
-    evaluateComputedValueRuleInCondition(id, values) {
-      const validation = computedValuesMap.get(id);
-      if (validation === void 0)
-        throw Error(`"${id}" computedValue in if condition doesn't exist.`);
-      return evaluateValidation(validation.rule, values);
-    }
-  };
-}
-function clean(values = {}) {
-  return Object.entries(values).reduce((prev, [key, value]) => {
-    return { ...prev, [key]: value === void 0 ? null : value };
-  }, {});
-}
-function yupSchemaWithCustomJSONLogic({ field, validations, config, id }) {
-  const { parentID = "root" } = config;
-  const validation = validations.getScope(parentID).validationMap.get(id);
-  if (validation === void 0) {
-    throw Error(`Validation "${id}" required for "${field.name}" doesn't exist.`);
-  }
-  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 replaceHandlebarsTemplates({
-  value: toReplace,
-  validations,
-  formValues,
-  parentID,
-  name: fieldName
-}) {
-  if (typeof toReplace === "string") {
-    return toReplace.replace(/\{\{([^{}]+)\}\}/g, (match, key) => {
-      return validations.getScope(parentID).evaluateComputedValueRuleForField(key.trim(), formValues, fieldName);
-    });
-  } else if (typeof toReplace === "object") {
-    const { value, ...rules } = toReplace;
-    if (Object.keys(rules).length > 1 && !value)
-      throw Error("Cannot define multiple rules without a template string with key `value`.");
-    const computedTemplateValue = Object.entries(rules).reduce((prev, [key, rule]) => {
-      const computedValue = validations.getScope(parentID).evaluateValidation(rule, formValues);
-      return prev.replaceAll(`{{${key}}}`, computedValue);
-    }, value);
-    return computedTemplateValue.replace(/\{\{([^{}]+)\}\}/g, (match, key) => {
-      return validations.getScope(parentID).evaluateComputedValueRuleForField(key.trim(), formValues, fieldName);
-    });
-  }
-}
-function calculateComputedAttributes(fieldParams, { parentID = "root" } = {}) {
-  return ({ validations, isRequired, config, formValues }) => {
-    const { name, computedAttributes } = fieldParams;
-    const attributes = Object.fromEntries(
-      Object.entries(computedAttributes).map(handleComputedAttribute(validations, formValues, parentID, name)).filter(([, value]) => value !== null)
-    );
-    return {
-      ...attributes,
-      schema: buildYupSchema(
-        { ...fieldParams, ...attributes, required: isRequired },
-        config,
-        validations
-      )
-    };
-  };
-}
-function handleComputedAttribute(validations, formValues, parentID, name) {
-  return ([key, value]) => {
-    if (key === "description")
-      return [key, replaceHandlebarsTemplates({ value, validations, formValues, parentID, name })];
-    if (key === "title") {
-      return [
-        "label",
-        replaceHandlebarsTemplates({ value, validations, formValues, parentID, name })
-      ];
-    }
-    if (key === "const")
-      return [
-        key,
-        validations.getScope(parentID).evaluateComputedValueRuleForField(value, formValues, name)
-      ];
-    if (key === "x-jsf-errorMessage") {
-      return [
-        "errorMessage",
-        handleNestedObjectForComputedValues(value, formValues, parentID, validations, name)
-      ];
-    }
-    if (typeof value === "string") {
-      return [
-        key,
-        validations.getScope(parentID).evaluateComputedValueRuleForField(value, formValues, name)
-      ];
-    }
-    if (key === "x-jsf-presentation" && value.statement) {
-      return [
-        "statement",
-        handleNestedObjectForComputedValues(
-          value.statement,
-          formValues,
-          parentID,
-          validations,
-          name
-        )
-      ];
-    }
-    if (typeof value === "object" && value.rule) {
-      return [key, validations.getScope(parentID).evaluateValidation(value.rule, formValues)];
-    }
-  };
-}
-function handleNestedObjectForComputedValues(values, formValues, parentID, validations, name) {
-  return Object.fromEntries(
-    Object.entries(values).map(([key, value]) => {
-      return [key, replaceHandlebarsTemplates({ value, validations, formValues, parentID, name })];
-    })
-  );
-}
-function processJSONLogicNode({
-  node,
-  formFields,
-  formValues,
-  accRequired,
-  parentID,
-  validations
-}) {
-  const requiredFields = new Set(accRequired);
-  if (node.allOf) {
-    node.allOf.map(
-      (allOfNode) => processJSONLogicNode({ node: allOfNode, formValues, formFields, validations, parentID })
-    ).forEach(({ required: allOfItemRequired }) => {
-      allOfItemRequired.forEach(requiredFields.add, requiredFields);
-    });
-  }
-  if (node.if) {
-    const matchesPropertyCondition = checkIfConditionMatches(
-      node,
-      formValues,
-      formFields,
-      validations
-    );
-    const matchesValidationsAndComputedValues = checkIfMatchesValidationsAndComputedValues(
-      node,
-      formValues,
-      validations,
-      parentID
-    );
-    const isConditionMatch = matchesPropertyCondition && matchesValidationsAndComputedValues;
-    if (isConditionMatch && node.then) {
-      const { required: branchRequired } = processNode({
-        node: node.then,
-        formValues,
-        formFields,
-        accRequired,
-        validations
-      });
-      branchRequired.forEach((field) => requiredFields.add(field));
-    }
-    if (!isConditionMatch && node.else) {
-      const { required: branchRequired } = processNode({
-        node: node.else,
-        formValues,
-        formFields,
-        accRequired: requiredFields,
-        validations
-      });
-      branchRequired.forEach((field) => requiredFields.add(field));
-    }
-  }
-  return { required: requiredFields };
-}
-function buildSampleEmptyObject(schema = {}) {
-  const sample = {};
-  if (typeof schema !== "object" || !schema.properties) {
-    return schema;
-  }
-  for (const key in schema.properties) {
-    if (schema.properties[key].type === "object") {
-      sample[key] = buildSampleEmptyObject(schema.properties[key]);
-    } else if (schema.properties[key].type === "array") {
-      const itemSchema = schema.properties[key].items;
-      sample[key] = buildSampleEmptyObject(itemSchema);
-    } else {
-      sample[key] = true;
-    }
-  }
-  return sample;
-}
-function validateInlineRules(jsonSchema, sampleEmptyObject) {
-  const properties = (jsonSchema?.properties || jsonSchema?.items?.properties) ?? {};
-  Object.entries(properties).filter(([, property]) => property["x-jsf-logic-computedAttrs"] !== void 0).forEach(([fieldName, property]) => {
-    Object.entries(property["x-jsf-logic-computedAttrs"]).filter(([, value]) => typeof value === "object").forEach(([key, item]) => {
-      Object.values(item).forEach((rule) => {
-        checkRuleIntegrity(
-          rule,
-          fieldName,
-          sampleEmptyObject,
-          (item2) => `"${item2.var}" in inline rule in property "${fieldName}.x-jsf-logic-computedAttrs.${key}" does not exist as a JSON schema property.`
-        );
-      });
-    });
-  });
-}
-function checkRuleIntegrity(rule, id, data, errorMessage = (item) => `"${item.var}" in rule "${id}" does not exist as a JSON schema property.`) {
-  Object.values(rule ?? {}).map((subRule) => {
-    if (!Array.isArray(subRule) && subRule !== null && subRule !== void 0)
-      return;
-    subRule.map((item) => {
-      const isVar = item !== null && typeof item === "object" && Object.hasOwn(item, "var");
-      if (isVar) {
-        const exists = import_json_logic_js.default.apply({ var: removeIndicesFromPath(item.var) }, data);
-        if (exists === null) {
-          throw Error(errorMessage(item));
-        }
-      } else {
-        checkRuleIntegrity(item, id, data);
-      }
-    });
-  });
-}
-function removeIndicesFromPath(path) {
-  const intermediatePath = path.replace(/\.\d+\./g, ".");
-  return intermediatePath.replace(/\.\d+$/, "");
+function buildCompleteYupSchema(fields, config) {
+  return (0, import_yup.object)().shape(getSchema(fields, config), getNoSortEdges(fields));
 }
 
 // src/helpers.js
@@ -1049,8 +722,8 @@ function hasType(type, typeName) {
 function getField(fieldName, fields) {
   return fields.find(({ name }) => name === fieldName);
 }
-function validateFieldSchema(field, value, validations) {
-  const validator = buildYupSchema(field, {}, validations);
+function validateFieldSchema(field, value) {
+  const validator = buildYupSchema(field);
   return validator().isValidSync(value);
 }
 function compareFormValueWithSchemaValue(formValue, schemaValue) {
@@ -1115,7 +788,7 @@ function getPrefillValues(fields, initialValues = {}) {
   });
   return initialValues;
 }
-function updateField(field, requiredFields, node, formValues, validations, config) {
+function updateField(field, requiredFields, node, formValues) {
   if (!field) {
     return;
   }
@@ -1137,25 +810,8 @@ function updateField(field, requiredFields, node, formValues, validations, confi
       }
     }
   });
-  if (field.getComputedAttributes) {
-    const computedFieldValues = field.getComputedAttributes({
-      field,
-      isRequired: fieldIsRequired,
-      node,
-      formValues,
-      config,
-      validations
-    });
-    updateValues(computedFieldValues);
-  }
   if (field.calculateConditionalProperties) {
-    const newFieldValues = field.calculateConditionalProperties(
-      fieldIsRequired,
-      node,
-      validations,
-      config,
-      formValues
-    );
+    const newFieldValues = field.calculateConditionalProperties(fieldIsRequired, node);
     updateValues(newFieldValues);
   }
   if (field.calculateCustomValidationProperties) {
@@ -1167,46 +823,33 @@ function updateField(field, requiredFields, node, formValues, validations, confi
     updateValues(newFieldValues);
   }
 }
-function processNode({
-  node,
-  formValues,
-  formFields,
-  accRequired = /* @__PURE__ */ new Set(),
-  parentID = "root",
-  validations
-}) {
+function processNode(node, formValues, formFields, accRequired = /* @__PURE__ */ new Set()) {
   const requiredFields = new Set(accRequired);
   Object.keys(node.properties ?? []).forEach((fieldName) => {
     const field = getField(fieldName, formFields);
-    updateField(field, requiredFields, node, formValues, validations, { parentID });
+    updateField(field, requiredFields, node, formValues);
   });
   node.required?.forEach((fieldName) => {
     requiredFields.add(fieldName);
-    updateField(getField(fieldName, formFields), requiredFields, node, formValues, validations, {
-      parentID
-    });
+    updateField(getField(fieldName, formFields), requiredFields, node, formValues);
   });
   if (node.if) {
-    const matchesCondition = checkIfConditionMatches(node, formValues, formFields, validations);
+    const matchesCondition = checkIfConditionMatches(node, formValues, formFields);
     if (matchesCondition && node.then) {
-      const { required: branchRequired } = processNode({
-        node: node.then,
+      const { required: branchRequired } = processNode(
+        node.then,
         formValues,
         formFields,
-        accRequired: requiredFields,
-        parentID,
-        validations
-      });
+        requiredFields
+      );
       branchRequired.forEach((field) => requiredFields.add(field));
     } else if (node.else) {
-      const { required: branchRequired } = processNode({
-        node: node.else,
+      const { required: branchRequired } = processNode(
+        node.else,
         formValues,
         formFields,
-        accRequired: requiredFields,
-        parentID,
-        validations
-      });
+        requiredFields
+      );
       branchRequired.forEach((field) => requiredFields.add(field));
     }
   }
@@ -1218,21 +861,12 @@ function processNode({
     node.anyOf.forEach(({ required = [] }) => {
       required.forEach((fieldName) => {
         const field = getField(fieldName, formFields);
-        updateField(field, requiredFields, node, formValues, validations, { parentID });
+        updateField(field, requiredFields, node, formValues);
       });
     });
   }
   if (node.allOf) {
-    node.allOf.map(
-      (allOfNode) => processNode({
-        node: allOfNode,
-        formValues,
-        formFields,
-        accRequired: requiredFields,
-        parentID,
-        validations
-      })
-    ).forEach(({ required: allOfItemRequired }) => {
+    node.allOf.map((allOfNode) => processNode(allOfNode, formValues, formFields, requiredFields)).forEach(({ required: allOfItemRequired }) => {
       allOfItemRequired.forEach(requiredFields.add, requiredFields);
     });
   }
@@ -1240,27 +874,10 @@ function processNode({
     Object.entries(node.properties).forEach(([name, nestedNode]) => {
       const inputType = getInputType(nestedNode);
       if (inputType === supportedTypes.FIELDSET) {
-        processNode({
-          node: nestedNode,
-          formValues: formValues[name] || {},
-          formFields: getField(name, formFields).fields,
-          validations,
-          parentID: name
-        });
+        processNode(nestedNode, formValues[name] || {}, getField(name, formFields).fields);
       }
     });
   }
-  if (node["x-jsf-logic"]) {
-    const { required: requiredFromLogic } = processJSONLogicNode({
-      node: node["x-jsf-logic"],
-      formValues,
-      formFields,
-      accRequired: requiredFields,
-      parentID,
-      validations
-    });
-    requiredFromLogic.forEach((field) => requiredFields.add(field));
-  }
   return {
     required: requiredFields
   };
@@ -1275,11 +892,11 @@ function clearValuesIfNotVisible(fields, formValues) {
     }
   });
 }
-function updateFieldsProperties(fields, formValues, jsonSchema, validations) {
+function updateFieldsProperties(fields, formValues, jsonSchema) {
   if (!jsonSchema?.properties) {
     return;
   }
-  processNode({ node: jsonSchema, formValues, formFields: fields, validations });
+  processNode(jsonSchema, formValues, fields);
   clearValuesIfNotVisible(fields, formValues);
 }
 var notNullOption = (opt) => opt.const !== null;
@@ -1322,20 +939,12 @@ 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 = {
-    ...computedAttributes ?? {},
-    ...computedAttributes?.const && computedAttributes?.default ? { value: computedAttributes.const } : {}
-  };
   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,
-      // This is a "forced value" when both const and default are present.
-      ...node.const && node.default ? { value: node.const } : {},
       label: node.title,
       readOnly: node.readOnly,
       ...node.deprecated && {
@@ -1370,8 +979,6 @@ function extractParametersFromNode(schemaNode) {
       },
       // Handle [name].presentation
       ...presentation,
-      requiredValidations,
-      computedAttributes: decoratedComputedAttributes,
       description: containsHTML(description) ? wrapWithSpan(description, {
         class: "jsf-description"
       }) : description,
@@ -1408,9 +1015,9 @@ function yupToFormErrors(yupError) {
   }
   return errors;
 }
-var handleValuesChange = (fields, jsonSchema, config, validations) => (values) => {
-  updateFieldsProperties(fields, values, jsonSchema, validations);
-  const lazySchema = (0, import_yup2.lazy)(() => buildCompleteYupSchema(fields, config, validations));
+var handleValuesChange = (fields, jsonSchema, config) => (values) => {
+  updateFieldsProperties(fields, values, jsonSchema);
+  const lazySchema = (0, import_yup2.lazy)(() => buildCompleteYupSchema(fields, config));
   let errors;
   try {
     lazySchema.validateSync(values, {
@@ -1464,8 +1071,8 @@ function rebuildFieldset(fields, property) {
     required: isFieldRequired(property, field)
   }));
 }
-function calculateConditionalProperties(fieldParams, customProperties, validations, config) {
-  return (isRequired, conditionBranch, __, _, formValues) => {
+function calculateConditionalProperties(fieldParams, customProperties) {
+  return (isRequired, conditionBranch) => {
     const conditionalProperty = conditionBranch?.properties?.[fieldParams.name];
     if (conditionalProperty) {
       const presentation = pickXKey(conditionalProperty, "presentation") ?? {};
@@ -1479,31 +1086,17 @@ function calculateConditionalProperties(fieldParams, customProperties, validatio
         fieldSetFields = rebuildFieldset(fieldParams.fields, conditionalProperty);
         newFieldParams.fields = fieldSetFields;
       }
-      const { computedAttributes, ...restNewFieldParams } = newFieldParams;
-      const calculatedComputedAttributes = computedAttributes ? calculateComputedAttributes(newFieldParams, config)({ validations, formValues }) : {};
-      const requiredValidations = [
-        ...fieldParams.requiredValidations ?? [],
-        ...restNewFieldParams.requiredValidations ?? []
-      ];
       const base = {
         isVisible: true,
         required: isRequired,
         ...presentation?.inputType && { type: presentation.inputType },
-        ...calculatedComputedAttributes,
-        ...calculatedComputedAttributes.value ? { value: calculatedComputedAttributes.value } : { value: void 0 },
-        schema: buildYupSchema(
-          {
-            ...fieldParams,
-            ...restNewFieldParams,
-            ...calculatedComputedAttributes,
-            requiredValidations,
-            // If there are inner fields (case of fieldset) they need to be updated based on the condition
-            fields: fieldSetFields,
-            required: isRequired
-          },
-          config,
-          validations
-        )
+        schema: buildYupSchema({
+          ...fieldParams,
+          ...newFieldParams,
+          // If there are inner fields (case of fieldset) they need to be updated based on the condition
+          fields: fieldSetFields,
+          required: isRequired
+        })
       };
       return (0, import_omit2.default)((0, import_merge2.default)(base, presentation, newFieldParams), ["inputType"]);
     }
@@ -1597,19 +1190,14 @@ function sortByOrderOrPosition(a, b, order) {
 function removeInvalidAttributes(fields) {
   return (0, import_omit3.default)(fields, ["items", "maxFileSize", "isDynamic"]);
 }
-function buildFieldParameters(name, fieldProperties, required = [], config = {}, validations) {
+function buildFieldParameters(name, fieldProperties, required = [], config = {}) {
   const { position } = pickXKey(fieldProperties, "presentation") ?? {};
   let fields;
   const inputType = getInputType(fieldProperties, config.strictInputType, name);
   if (inputType === supportedTypes.FIELDSET) {
-    fields = getFieldsFromJSONSchema(
-      fieldProperties,
-      {
-        customProperties: (0, import_get3.default)(config, `customProperties.${name}`, {}),
-        parentID: name
-      },
-      validations
-    );
+    fields = getFieldsFromJSONSchema(fieldProperties, {
+      customProperties: (0, import_get3.default)(config, `customProperties.${name}`, {})
+    });
   }
   const result = {
     name,
@@ -1624,9 +1212,9 @@ function buildFieldParameters(name, fieldProperties, required = [], config = {},
   };
   return (0, import_omitBy2.default)(result, import_isNil3.default);
 }
-function convertJSONSchemaPropertiesToFieldParameters({ properties, required, "x-jsf-order": order }, config = {}, validations) {
+function convertJSONSchemaPropertiesToFieldParameters({ properties, required, "x-jsf-order": order }, config = {}) {
   const sortFields = (a, b) => sortByOrderOrPosition(a, b, order);
-  return Object.entries(properties).filter(([, value]) => typeof value === "object").map(([key, value]) => buildFieldParameters(key, value, required, config, validations)).sort(sortFields).map(({ position, ...fieldParams }) => fieldParams);
+  return Object.entries(properties).filter(([, value]) => typeof value === "object").map(([key, value]) => buildFieldParameters(key, value, required, config)).sort(sortFields).map(({ position, ...fieldParams }) => fieldParams);
 }
 function applyFieldsDependencies(fieldsParameters, node) {
   if (node?.then) {
@@ -1648,9 +1236,6 @@ 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];
@@ -1662,16 +1247,15 @@ function getComposeFunctionForField(fieldParams, hasCustomizations) {
   }
   return composeFn;
 }
-function buildField(fieldParams, config, scopedJsonSchema, validations) {
+function buildField(fieldParams, config, scopedJsonSchema) {
   const customProperties = getCustomPropertiesForField(fieldParams, config);
   const composeFn = getComposeFunctionForField(fieldParams, !!customProperties);
-  const yupSchema = buildYupSchema(fieldParams, config, validations);
-  const calculateConditionalFieldsClosure = fieldParams.isDynamic && calculateConditionalProperties(fieldParams, customProperties, validations, config);
+  const yupSchema = buildYupSchema(fieldParams, config);
+  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
@@ -1684,7 +1268,6 @@ function buildField(fieldParams, config, scopedJsonSchema, validations) {
     ...hasCustomValidations && {
       calculateCustomValidationProperties: calculateCustomValidationPropertiesClosure
     },
-    ...getComputedAttributes && { getComputedAttributes },
     // field customization properties
     ...customProperties && { fieldCustomization: customProperties },
     // base schema
@@ -1693,15 +1276,11 @@ function buildField(fieldParams, config, scopedJsonSchema, validations) {
   };
   return composeFn(finalFieldParams);
 }
-function getFieldsFromJSONSchema(scopedJsonSchema, config, validations) {
+function getFieldsFromJSONSchema(scopedJsonSchema, config) {
   if (!scopedJsonSchema) {
     return [];
   }
-  const fieldParamsList = convertJSONSchemaPropertiesToFieldParameters(
-    scopedJsonSchema,
-    config,
-    validations
-  );
+  const fieldParamsList = convertJSONSchemaPropertiesToFieldParameters(scopedJsonSchema, config);
   applyFieldsDependencies(fieldParamsList, scopedJsonSchema);
   const fields = [];
   fieldParamsList.forEach((fieldParams) => {
@@ -1721,11 +1300,11 @@ function getFieldsFromJSONSchema(scopedJsonSchema, config, validations) {
         fields: () => groupArrayFields,
         addFieldText: fieldParams.addFieldText
       };
-      buildField(fieldParams, config, scopedJsonSchema, validations).forEach((groupField) => {
+      buildField(fieldParams, config, scopedJsonSchema).forEach((groupField) => {
         fields.push(groupField);
       });
     } else {
-      fields.push(buildField(fieldParams, config, scopedJsonSchema, validations));
+      fields.push(buildField(fieldParams, config, scopedJsonSchema));
     }
   });
   return fields;
@@ -1736,15 +1315,9 @@ function createHeadlessForm(jsonSchema, customConfig = {}) {
     ...customConfig
   };
   try {
-    const validations = createValidationChecker(jsonSchema);
-    const fields = getFieldsFromJSONSchema(jsonSchema, config, validations);
-    const handleValidation = handleValuesChange(fields, jsonSchema, config, validations);
-    updateFieldsProperties(
-      fields,
-      getPrefillValues(fields, config.initialValues),
-      jsonSchema,
-      validations
-    );
+    const fields = getFieldsFromJSONSchema(jsonSchema, config);
+    const handleValidation = handleValuesChange(fields, jsonSchema, config);
+    updateFieldsProperties(fields, getPrefillValues(fields, config.initialValues), jsonSchema);
     return {
       fields,
       handleValidation,