@remoteoss/json-schema-form 0.7.1-dev.20231026204916 → 0.7.2-dev.20231106093837

package/CHANGELOG.md

@@ -1,3 +1,9 @@
+#### 0.7.1-beta.0 (2023-10-31)
+
+##### Bug Fixes
+
+- **select:** support string type ([#54](https://github.com/remoteoss/json-schema-form/pull/54)) ([b00f8776](https://github.com/remoteoss/json-schema-form/commit/b00f8776aa244803375ba64fbdd52c8fff9b9bd8))
+
 #### 0.7.0-beta.0 (2023-10-23)
 
 ##### Chores
@@ -27,10 +33,8 @@ BREAKING CHANGES:
 
 - json-logic: Add conditional logic checking. ([#41](https://github.com/remoteoss/json-schema-form/pull/41)) ([6292b01e](https://github.com/remoteoss/json-schema-form/commit/6292b01e3f77a9038328d7375080ffc4cb30dbc8))
 
-
 ###### Full API additions now supported from 0.6.5 onwards.
 
-
 - New custom JSON Schema keyword `x-jsf-logic` added to support cross-field validations. Built on top of [JsonLogic](https://jsonlogic.com/).
 
 - `x-jsf-logic` can contain:
@@ -49,16 +53,11 @@ While docs are underway, you can read examples from all the [tests](https://gith
 
 In short: `x-jsf-logic` is added to support complex conditional cross-field validations. Properties like `x-jsf-logic-validations` allow hooking those up to individual fields.
 
-
 #### 0.6.4-beta.0 (2023-09-15)
 
-
-
 ##### Changes
-- json-logic: computedAttrs - handle inline rules ([#40](https://github.com/remoteoss/json-schema-form/pull/40)) ([860ad91b](https://github.com/remoteoss/json-schema-form/commit/860ad91b034ab35d4d4bc51c0c04675f102bf278))
-
-
 
+- json-logic: computedAttrs - handle inline rules ([#40](https://github.com/remoteoss/json-schema-form/pull/40)) ([860ad91b](https://github.com/remoteoss/json-schema-form/commit/860ad91b034ab35d4d4bc51c0c04675f102bf278))
 
 #### 0.6.1-beta.0 (2023-09-13)
 
@@ -66,50 +65,43 @@ In short: `x-jsf-logic` is added to support complex conditional cross-field vali
 
 - json-logic: Computed string based values ([#37](https://github.com/remoteoss/json-schema-form/pull/37)) ([6e042ea5](https://github.com/remoteoss/json-schema-form/commit/6e042ea579497ea573710c307a6ff7ee2f19b931))
 
-
-
-
 #### 0.5.0-beta.0 (2023-09-12)
 
 ##### Changes
+
 - json-logic: Computed Attributes ([#36](https://github.com/remoteoss/json-schema-form/pull/36)) ([80c29589](https://github.com/remoteoss/json-schema-form/commit/80c29589ac0972e0f33add70a59df15a46db1b43))
 - json-logic: Initial skeleton implementation ([#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)
+
 ##### Bug fixes
 
 - Validate values based on `const` key ([#34](https://github.com/remoteoss/json-schema-form/pull/34)) ([bf07870d](https://github.com/remoteoss/json-schema-form/commit/bf07870d407d9b9b078882a078b9e4c7928df868))
 
-
-
-
 #### 0.4.4-beta.0 (2023-08-30)
 
 ##### Chores
 
-* **fieldset:**  ignore values not matching the field type ([#44](https://github.com/remoteoss/json-schema-form/pull/44)) ([f0af54e5](https://github.com/remoteoss/json-schema-form/commit/f0af54e5d425fb78524ab150bb31629d00369a61))
+- **fieldset:** ignore values not matching the field type ([#44](https://github.com/remoteoss/json-schema-form/pull/44)) ([f0af54e5](https://github.com/remoteoss/json-schema-form/commit/f0af54e5d425fb78524ab150bb31629d00369a61))
 
 #### 0.4.3-beta.0 (2023-08-09)
 
 ##### Bug fixes
 
-* **conditions:** Validate a deeply nested if (e.g. checking an object with a number property) in an if property now doesn't break the form. ([#33](https://github.com/remoteoss/json-schema-form/pull/33)) ([e34cfcc](https://github.com/remoteoss/json-schema-form/commit/e34cfccaf45f1460b346f3cff0c797b3d11259e3))
+- **conditions:** Validate a deeply nested if (e.g. checking an object with a number property) in an if property now doesn't break the form. ([#33](https://github.com/remoteoss/json-schema-form/pull/33)) ([e34cfcc](https://github.com/remoteoss/json-schema-form/commit/e34cfccaf45f1460b346f3cff0c797b3d11259e3))
 
 #### 0.4.2-beta.0 (2023-07-20)
 
 ##### Bug Fixes
 
-* **date:**  Validate based on minDate and maxDate ([#30](https://github.com/remoteoss/json-schema-form/pull/30)) ([01c0143e](https://github.com/remoteoss/json-schema-form/commit/01c0143ea4a3775f9489ae6cb8fd99a90b3f1394))
+- **date:** Validate based on minDate and maxDate ([#30](https://github.com/remoteoss/json-schema-form/pull/30)) ([01c0143e](https://github.com/remoteoss/json-schema-form/commit/01c0143ea4a3775f9489ae6cb8fd99a90b3f1394))
 
 #### 0.4.1-beta.0 (2023-07-03)
 
 ##### Bug Fixes
 
-* **fieldset:**  support root conditionals for fieldsets ([#23](https://github.com/remoteoss/json-schema-form/pull/23)) ([65d87b3a](https://github.com/remoteoss/json-schema-form/commit/65d87b3a93018f0729aed565000eb2a2ce1f2ce7))
-* **select/radio:**  Accept just the values in options (plus `''` and `null` for backward-compatibility) ([#18](https://github.com/remoteoss/json-schema-form/pull/18)) ([37501d2d](https://github.com/remoteoss/json-schema-form/commit/37501d2ddafdd5e207b34d2ca3f6b7b7a1006e9d))
+- **fieldset:** support root conditionals for fieldsets ([#23](https://github.com/remoteoss/json-schema-form/pull/23)) ([65d87b3a](https://github.com/remoteoss/json-schema-form/commit/65d87b3a93018f0729aed565000eb2a2ce1f2ce7))
+- **select/radio:** Accept just the values in options (plus `''` and `null` for backward-compatibility) ([#18](https://github.com/remoteoss/json-schema-form/pull/18)) ([37501d2d](https://github.com/remoteoss/json-schema-form/commit/37501d2ddafdd5e207b34d2ca3f6b7b7a1006e9d))
 
 #### 0.4.0-beta.0 (2023-06-22)
 

package/dist/index.cjs

@@ -1,8 +1,8 @@
 
 /*!
  Copyright (c) 2023 Remote Technology, Inc.
- NPM Package: @remoteoss/json-schema-form@0.7.1-dev.20231026204916
- Generated: Thu, 26 Oct 2023 20:49:34 GMT
+ NPM Package: @remoteoss/json-schema-form@0.7.2-dev.20231106093837
+ Generated: Mon, 06 Nov 2023 09:38:54 GMT
 
  MIT License
 
@@ -461,38 +461,22 @@ var validateMaxDate = (value, minDate) => {
 };
 var yupSchemas = {
   text: validateOnlyStrings,
-  radioOrSelect: (options) => (0, import_yup.string)().nullable().transform((value) => {
-    if (value === "") {
-      return void 0;
+  radioOrSelect: (options, isString) => {
+    if (isString) {
+      return (0, import_yup.string)().nullable();
     }
-    if (options?.some((option) => option.value === null)) {
-      return value;
-    }
-    return value === null ? void 0 : value;
-  }).test(
-    /* 
-      Custom test determines if the value either:
-       - Matches a specific option by value
-       - Matches a pattern
-      If the option is undefined do not test, to allow for optional fields. 
-     */
-    "matchesOptionOrPattern",
-    ({ value }) => `The option ${JSON.stringify(value)} is not valid.`,
-    (value) => {
-      if (value === void 0) {
-        return true;
-      }
-      const exactMatch = options.some((option) => option.value === value);
-      if (exactMatch) {
-        return true;
+    return (0, import_yup.string)().nullable().transform((value) => {
+      if (value === "") {
+        return void 0;
       }
-      const patternMatch = options.some((option) => option.pattern?.test(value));
-      if (patternMatch) {
-        return true;
+      if (options?.includes(null)) {
+        return value;
       }
-      return false;
-    }
-  ),
+      return value === null ? void 0 : value;
+    }).oneOf(options, ({ value }) => {
+      return `The option ${JSON.stringify(value)} is not valid.`;
+    });
+  },
   date: ({ minDate, maxDate }) => {
     let dateString = (0, import_yup.string)().nullable().transform((value) => {
       if (value === "") {
@@ -550,21 +534,19 @@ function getRequiredErrorMessage(inputType, { inlineError, configError }) {
 }
 var getJsonTypeInArray = (jsonType) => Array.isArray(jsonType) ? jsonType.find((val) => val !== "null") : jsonType;
 var getOptions = (field) => {
-  const allValues = field.options?.map((option) => ({
-    value: option.value,
-    pattern: option.pattern ? new RegExp(option.pattern) : null
-  }));
+  const allValues = field.options?.map((option) => option.value);
   const isOptionalWithNull = Array.isArray(field.jsonType) && // @TODO should also check the "oneOf" directly looking for "null"
   // option but we don't have direct access at this point.
   // Otherwise the JSON Schema validator will fail as explained in PR#18
   field.jsonType.includes("null");
-  return isOptionalWithNull ? [...allValues, { option: null }] : allValues;
+  return isOptionalWithNull ? [...allValues, null] : allValues;
 };
 var getYupSchema = ({ inputType, ...field }) => {
   const jsonType = getJsonTypeInArray(field.jsonType);
   if (field.options?.length > 0) {
+    const isString = field.options?.findIndex((option) => option.type === "string") > -1;
     const optionValues = getOptions(field);
-    return yupSchemas.radioOrSelect(optionValues);
+    return yupSchemas.radioOrSelect(optionValues, isString);
   }
   if (field.format === "date") {
     return yupSchemas.date({ minDate: field.minDate, maxDate: field.maxDate });
@@ -1055,6 +1037,33 @@ function processJSONLogicNode({
 }
 
 // src/helpers.js
+var dynamicInternalJsfAttrs = [
+  "isVisible",
+  // Driven from conditionals state
+  "fields",
+  // driven from group-array
+  "getComputedAttributes",
+  // From json-logic
+  "computedAttributes",
+  // From json-logic
+  "calculateConditionalProperties",
+  // driven from conditionals
+  "calculateCustomValidationProperties",
+  // To be deprecated in favor of json-logic
+  "scopedJsonSchema"
+  // The respective JSON Schema
+];
+var dynamicInternalJsfAttrsObj = Object.fromEntries(
+  dynamicInternalJsfAttrs.map((k) => [k, true])
+);
+function removeConditionalStaleAttributes(field, conditionalAttrs, rootAttrs) {
+  Object.keys(field).forEach((key) => {
+    if (conditionalAttrs[key] === void 0 && rootAttrs[key] === void 0 && // Don't remove attrs that were declared in the root field.
+    dynamicInternalJsfAttrsObj[key] === void 0) {
+      field[key] = void 0;
+    }
+  });
+}
 function hasType(type, typeName) {
   return Array.isArray(type) ? type.includes(typeName) : type === typeName;
 }
@@ -1147,19 +1156,21 @@ function updateField(field, requiredFields, node, formValues, logic, config) {
   if (fieldIsRequired) {
     field.isVisible = true;
   }
-  const updateValues = (fieldValues) => Object.entries(fieldValues).forEach(([key, value]) => {
-    field[key] = typeof value === "function" ? value() : value;
-    if (key === "value") {
-      const readOnlyPropertyWasUpdated = typeof fieldValues.readOnly !== "undefined";
-      const isReadonlyByDefault = field.readOnly;
-      const isReadonly = readOnlyPropertyWasUpdated ? fieldValues.readOnly : isReadonlyByDefault;
-      if (!isReadonly && (value === null || field.inputType === "checkbox")) {
-        field.value = void 0;
+  const updateAttributes = (fieldAttrs) => {
+    Object.entries(fieldAttrs).forEach(([key, value]) => {
+      field[key] = typeof value === "function" ? value() : value;
+      if (key === "value") {
+        const readOnlyPropertyWasUpdated = typeof fieldAttrs.readOnly !== "undefined";
+        const isReadonlyByDefault = field.readOnly;
+        const isReadonly = readOnlyPropertyWasUpdated ? fieldAttrs.readOnly : isReadonlyByDefault;
+        if (!isReadonly && (value === null || field.inputType === "checkbox")) {
+          field.value = void 0;
+        }
       }
-    }
-  });
+    });
+  };
   if (field.getComputedAttributes) {
-    const computedFieldValues = field.getComputedAttributes({
+    const newAttributes = field.getComputedAttributes({
       field,
       isRequired: fieldIsRequired,
       node,
@@ -1167,23 +1178,24 @@ function updateField(field, requiredFields, node, formValues, logic, config) {
       config,
       logic
     });
-    updateValues(computedFieldValues);
+    updateAttributes(newAttributes);
   }
   if (field.calculateConditionalProperties) {
-    const newFieldValues = field.calculateConditionalProperties({
+    const { rootFieldAttrs, newAttributes } = field.calculateConditionalProperties({
       isRequired: fieldIsRequired,
       conditionBranch: node,
       formValues
     });
-    updateValues(newFieldValues);
+    updateAttributes(newAttributes, rootFieldAttrs);
+    removeConditionalStaleAttributes(field, newAttributes, rootFieldAttrs);
   }
   if (field.calculateCustomValidationProperties) {
-    const newFieldValues = field.calculateCustomValidationProperties(
+    const newAttributes = field.calculateCustomValidationProperties(
       fieldIsRequired,
       node,
       formValues
     );
-    updateValues(newFieldValues);
+    updateAttributes(newAttributes);
   }
 }
 function processNode({
@@ -1525,17 +1537,23 @@ function calculateConditionalProperties({ fieldParams, customProperties, logic,
           logic
         )
       };
-      return (0, import_omit2.default)((0, import_merge2.default)(base, presentation, newFieldParams), ["inputType"]);
+      return {
+        rootFieldAttrs: fieldParams,
+        newAttributes: (0, import_omit2.default)((0, import_merge2.default)(base, presentation, newFieldParams), ["inputType"])
+      };
     }
     const isVisible = isRequired;
     return {
-      isVisible,
-      required: isRequired,
-      schema: buildYupSchema({
-        ...fieldParams,
-        ...extractParametersFromNode(conditionBranch),
-        required: isRequired
-      })
+      rootFieldAttrs: fieldParams,
+      newAttributes: {
+        isVisible,
+        required: isRequired,
+        schema: buildYupSchema({
+          ...fieldParams,
+          ...extractParametersFromNode(conditionBranch),
+          required: isRequired
+        })
+      }
     };
   };
 }

package/dist/index.js

@@ -1,8 +1,8 @@
 
 /*!
  Copyright (c) 2023 Remote Technology, Inc.
- NPM Package: @remoteoss/json-schema-form@0.7.1-dev.20231026204916
- Generated: Thu, 26 Oct 2023 20:49:34 GMT
+ NPM Package: @remoteoss/json-schema-form@0.7.2-dev.20231106093837
+ Generated: Mon, 06 Nov 2023 09:38:54 GMT
 
  MIT License
 
@@ -425,38 +425,22 @@ var validateMaxDate = (value, minDate) => {
 };
 var yupSchemas = {
   text: validateOnlyStrings,
-  radioOrSelect: (options) => string().nullable().transform((value) => {
-    if (value === "") {
-      return void 0;
+  radioOrSelect: (options, isString) => {
+    if (isString) {
+      return string().nullable();
     }
-    if (options?.some((option) => option.value === null)) {
-      return value;
-    }
-    return value === null ? void 0 : value;
-  }).test(
-    /* 
-      Custom test determines if the value either:
-       - Matches a specific option by value
-       - Matches a pattern
-      If the option is undefined do not test, to allow for optional fields. 
-     */
-    "matchesOptionOrPattern",
-    ({ value }) => `The option ${JSON.stringify(value)} is not valid.`,
-    (value) => {
-      if (value === void 0) {
-        return true;
-      }
-      const exactMatch = options.some((option) => option.value === value);
-      if (exactMatch) {
-        return true;
+    return string().nullable().transform((value) => {
+      if (value === "") {
+        return void 0;
       }
-      const patternMatch = options.some((option) => option.pattern?.test(value));
-      if (patternMatch) {
-        return true;
+      if (options?.includes(null)) {
+        return value;
       }
-      return false;
-    }
-  ),
+      return value === null ? void 0 : value;
+    }).oneOf(options, ({ value }) => {
+      return `The option ${JSON.stringify(value)} is not valid.`;
+    });
+  },
   date: ({ minDate, maxDate }) => {
     let dateString = string().nullable().transform((value) => {
       if (value === "") {
@@ -514,21 +498,19 @@ function getRequiredErrorMessage(inputType, { inlineError, configError }) {
 }
 var getJsonTypeInArray = (jsonType) => Array.isArray(jsonType) ? jsonType.find((val) => val !== "null") : jsonType;
 var getOptions = (field) => {
-  const allValues = field.options?.map((option) => ({
-    value: option.value,
-    pattern: option.pattern ? new RegExp(option.pattern) : null
-  }));
+  const allValues = field.options?.map((option) => option.value);
   const isOptionalWithNull = Array.isArray(field.jsonType) && // @TODO should also check the "oneOf" directly looking for "null"
   // option but we don't have direct access at this point.
   // Otherwise the JSON Schema validator will fail as explained in PR#18
   field.jsonType.includes("null");
-  return isOptionalWithNull ? [...allValues, { option: null }] : allValues;
+  return isOptionalWithNull ? [...allValues, null] : allValues;
 };
 var getYupSchema = ({ inputType, ...field }) => {
   const jsonType = getJsonTypeInArray(field.jsonType);
   if (field.options?.length > 0) {
+    const isString = field.options?.findIndex((option) => option.type === "string") > -1;
     const optionValues = getOptions(field);
-    return yupSchemas.radioOrSelect(optionValues);
+    return yupSchemas.radioOrSelect(optionValues, isString);
   }
   if (field.format === "date") {
     return yupSchemas.date({ minDate: field.minDate, maxDate: field.maxDate });
@@ -1019,6 +1001,33 @@ function processJSONLogicNode({
 }
 
 // src/helpers.js
+var dynamicInternalJsfAttrs = [
+  "isVisible",
+  // Driven from conditionals state
+  "fields",
+  // driven from group-array
+  "getComputedAttributes",
+  // From json-logic
+  "computedAttributes",
+  // From json-logic
+  "calculateConditionalProperties",
+  // driven from conditionals
+  "calculateCustomValidationProperties",
+  // To be deprecated in favor of json-logic
+  "scopedJsonSchema"
+  // The respective JSON Schema
+];
+var dynamicInternalJsfAttrsObj = Object.fromEntries(
+  dynamicInternalJsfAttrs.map((k) => [k, true])
+);
+function removeConditionalStaleAttributes(field, conditionalAttrs, rootAttrs) {
+  Object.keys(field).forEach((key) => {
+    if (conditionalAttrs[key] === void 0 && rootAttrs[key] === void 0 && // Don't remove attrs that were declared in the root field.
+    dynamicInternalJsfAttrsObj[key] === void 0) {
+      field[key] = void 0;
+    }
+  });
+}
 function hasType(type, typeName) {
   return Array.isArray(type) ? type.includes(typeName) : type === typeName;
 }
@@ -1111,19 +1120,21 @@ function updateField(field, requiredFields, node, formValues, logic, config) {
   if (fieldIsRequired) {
     field.isVisible = true;
   }
-  const updateValues = (fieldValues) => Object.entries(fieldValues).forEach(([key, value]) => {
-    field[key] = typeof value === "function" ? value() : value;
-    if (key === "value") {
-      const readOnlyPropertyWasUpdated = typeof fieldValues.readOnly !== "undefined";
-      const isReadonlyByDefault = field.readOnly;
-      const isReadonly = readOnlyPropertyWasUpdated ? fieldValues.readOnly : isReadonlyByDefault;
-      if (!isReadonly && (value === null || field.inputType === "checkbox")) {
-        field.value = void 0;
+  const updateAttributes = (fieldAttrs) => {
+    Object.entries(fieldAttrs).forEach(([key, value]) => {
+      field[key] = typeof value === "function" ? value() : value;
+      if (key === "value") {
+        const readOnlyPropertyWasUpdated = typeof fieldAttrs.readOnly !== "undefined";
+        const isReadonlyByDefault = field.readOnly;
+        const isReadonly = readOnlyPropertyWasUpdated ? fieldAttrs.readOnly : isReadonlyByDefault;
+        if (!isReadonly && (value === null || field.inputType === "checkbox")) {
+          field.value = void 0;
+        }
       }
-    }
-  });
+    });
+  };
   if (field.getComputedAttributes) {
-    const computedFieldValues = field.getComputedAttributes({
+    const newAttributes = field.getComputedAttributes({
       field,
       isRequired: fieldIsRequired,
       node,
@@ -1131,23 +1142,24 @@ function updateField(field, requiredFields, node, formValues, logic, config) {
       config,
       logic
     });
-    updateValues(computedFieldValues);
+    updateAttributes(newAttributes);
   }
   if (field.calculateConditionalProperties) {
-    const newFieldValues = field.calculateConditionalProperties({
+    const { rootFieldAttrs, newAttributes } = field.calculateConditionalProperties({
       isRequired: fieldIsRequired,
       conditionBranch: node,
       formValues
     });
-    updateValues(newFieldValues);
+    updateAttributes(newAttributes, rootFieldAttrs);
+    removeConditionalStaleAttributes(field, newAttributes, rootFieldAttrs);
   }
   if (field.calculateCustomValidationProperties) {
-    const newFieldValues = field.calculateCustomValidationProperties(
+    const newAttributes = field.calculateCustomValidationProperties(
       fieldIsRequired,
       node,
       formValues
     );
-    updateValues(newFieldValues);
+    updateAttributes(newAttributes);
   }
 }
 function processNode({
@@ -1489,17 +1501,23 @@ function calculateConditionalProperties({ fieldParams, customProperties, logic,
           logic
         )
       };
-      return omit2(merge2(base, presentation, newFieldParams), ["inputType"]);
+      return {
+        rootFieldAttrs: fieldParams,
+        newAttributes: omit2(merge2(base, presentation, newFieldParams), ["inputType"])
+      };
     }
     const isVisible = isRequired;
     return {
-      isVisible,
-      required: isRequired,
-      schema: buildYupSchema({
-        ...fieldParams,
-        ...extractParametersFromNode(conditionBranch),
-        required: isRequired
-      })
+      rootFieldAttrs: fieldParams,
+      newAttributes: {
+        isVisible,
+        required: isRequired,
+        schema: buildYupSchema({
+          ...fieldParams,
+          ...extractParametersFromNode(conditionBranch),
+          required: isRequired
+        })
+      }
     };
   };
 }