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

package/dist/index.cjs

@@ -1,8 +1,8 @@
 
 /*!
  Copyright (c) 2023 Remote Technology, Inc.
- NPM Package: @remoteoss/json-schema-form@0.7.1-dev.20231025070834
- Generated: Wed, 25 Oct 2023 07:08:56 GMT
+ NPM Package: @remoteoss/json-schema-form@0.7.1-dev.20231026204916
+ Generated: Thu, 26 Oct 2023 20:49:34 GMT
 
  MIT License
 
@@ -465,13 +465,34 @@ var yupSchemas = {
     if (value === "") {
       return void 0;
     }
-    if (options?.includes(null)) {
+    if (options?.some((option) => option.value === null)) {
       return value;
     }
     return value === null ? void 0 : value;
-  }).oneOf(options, ({ value }) => {
-    return `The option ${JSON.stringify(value)} is not valid.`;
-  }),
+  }).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;
+      }
+      const patternMatch = options.some((option) => option.pattern?.test(value));
+      if (patternMatch) {
+        return true;
+      }
+      return false;
+    }
+  ),
   date: ({ minDate, maxDate }) => {
     let dateString = (0, import_yup.string)().nullable().transform((value) => {
       if (value === "") {
@@ -529,12 +550,15 @@ 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) => option.value);
+  const allValues = field.options?.map((option) => ({
+    value: option.value,
+    pattern: option.pattern ? new RegExp(option.pattern) : null
+  }));
   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, null] : allValues;
+  return isOptionalWithNull ? [...allValues, { option: null }] : allValues;
 };
 var getYupSchema = ({ inputType, ...field }) => {
   const jsonType = getJsonTypeInArray(field.jsonType);

package/dist/index.js

@@ -1,8 +1,8 @@
 
 /*!
  Copyright (c) 2023 Remote Technology, Inc.
- NPM Package: @remoteoss/json-schema-form@0.7.1-dev.20231025070834
- Generated: Wed, 25 Oct 2023 07:08:56 GMT
+ NPM Package: @remoteoss/json-schema-form@0.7.1-dev.20231026204916
+ Generated: Thu, 26 Oct 2023 20:49:34 GMT
 
  MIT License
 
@@ -429,13 +429,34 @@ var yupSchemas = {
     if (value === "") {
       return void 0;
     }
-    if (options?.includes(null)) {
+    if (options?.some((option) => option.value === null)) {
       return value;
     }
     return value === null ? void 0 : value;
-  }).oneOf(options, ({ value }) => {
-    return `The option ${JSON.stringify(value)} is not valid.`;
-  }),
+  }).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;
+      }
+      const patternMatch = options.some((option) => option.pattern?.test(value));
+      if (patternMatch) {
+        return true;
+      }
+      return false;
+    }
+  ),
   date: ({ minDate, maxDate }) => {
     let dateString = string().nullable().transform((value) => {
       if (value === "") {
@@ -493,12 +514,15 @@ 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) => option.value);
+  const allValues = field.options?.map((option) => ({
+    value: option.value,
+    pattern: option.pattern ? new RegExp(option.pattern) : null
+  }));
   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, null] : allValues;
+  return isOptionalWithNull ? [...allValues, { option: null }] : allValues;
 };
 var getYupSchema = ({ inputType, ...field }) => {
   const jsonType = getJsonTypeInArray(field.jsonType);

package/dist/standalone.js

@@ -1,8 +1,8 @@
 
 /*!
  Copyright (c) 2023 Remote Technology, Inc.
- NPM Package: @remoteoss/json-schema-form@0.7.1-dev.20231025070834
- Generated: Wed, 25 Oct 2023 07:08:56 GMT
+ NPM Package: @remoteoss/json-schema-form@0.7.1-dev.20231026204916
+ Generated: Thu, 26 Oct 2023 20:49:34 GMT
 
  MIT License
 
@@ -11783,13 +11783,34 @@ var yupSchemas = {
     if (value === "") {
       return void 0;
     }
-    if (options?.includes(null)) {
+    if (options?.some((option) => option.value === null)) {
       return value;
     }
     return value === null ? void 0 : value;
-  }).oneOf(options, ({ value }) => {
-    return `The option ${JSON.stringify(value)} is not valid.`;
-  }),
+  }).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;
+      }
+      const patternMatch = options.some((option) => option.pattern?.test(value));
+      if (patternMatch) {
+        return true;
+      }
+      return false;
+    }
+  ),
   date: ({ minDate, maxDate }) => {
     let dateString = StringSchema().nullable().transform((value) => {
       if (value === "") {
@@ -11847,12 +11868,15 @@ 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) => option.value);
+  const allValues = field.options?.map((option) => ({
+    value: option.value,
+    pattern: option.pattern ? new RegExp(option.pattern) : null
+  }));
   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, null] : allValues;
+  return isOptionalWithNull ? [...allValues, { option: null }] : allValues;
 };
 var getYupSchema = ({ inputType, ...field }) => {
   const jsonType = getJsonTypeInArray(field.jsonType);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@remoteoss/json-schema-form",
-  "version": "0.7.1-dev.20231025070834",
+  "version": "0.7.1-dev.20231026204916",
   "description": "Headless UI form powered by JSON Schemas",
   "author": "Remote.com <engineering@remote.com> (https://remote.com/)",
   "license": "MIT",

package/src/tests/createHeadlessForm.test.js

@@ -38,6 +38,7 @@ import {
   mockFileInput,
   mockRadioCardInput,
   mockRadioCardExpandableInput,
+  mockTelWithPattern,
   mockTextInput,
   mockTextInputDeprecated,
   mockNumberInput,
@@ -1442,6 +1443,51 @@ describe('createHeadlessForm', () => {
       });
     });
 
+    it('supports oneOf pattern validation', () => {
+      const result = createHeadlessForm(mockTelWithPattern);
+
+      expect(result).toMatchObject({
+        fields: [
+          {
+            label: 'Phone number',
+            name: 'phone_number',
+            type: 'tel',
+            required: false,
+            options: [
+              {
+                label: 'Portugal',
+                pattern: '^(\\+351)[0-9]{9,}$',
+              },
+              {
+                label: 'United Kingdom (UK)',
+                pattern: '^(\\+44)[0-9]{1,}$',
+              },
+              {
+                label: 'Bolivia',
+                pattern: '^(\\+591)[0-9]{9,}$',
+              },
+              {
+                label: 'Canada',
+                pattern: '^(\\+1)(206|224)[0-9]{1,}$',
+              },
+              {
+                label: 'United States',
+                pattern: '^(\\+1)[0-9]{1,}$',
+              },
+            ],
+          },
+        ],
+      });
+
+      const fieldValidator = result.fields[0].schema;
+
+      expect(fieldValidator.isValidSync('+351123123123')).toBe(true);
+      expect(() => fieldValidator.validateSync('+35100')).toThrowError(
+        'The option "+35100" is not valid.'
+      );
+      expect(fieldValidator.isValidSync(undefined)).toBe(true);
+    });
+
     describe('supports "fieldset" field type', () => {
       it('supports basic case', () => {
         const result = createHeadlessForm({
@@ -1947,9 +1993,9 @@ describe('createHeadlessForm', () => {
             },
           },
           {
-            name: 'a_or_b',
-            label: 'A dropdown',
-            type: 'select',
+            name: 'role',
+            label: 'Role',
+            type: 'text',
             statement: {
               description: 'This is another statement message, but more severe.',
               inputType: 'statement',

package/src/tests/helpers.js

@@ -453,6 +453,46 @@ export const mockCheckboxInput = {
   type: 'string',
 };
 
+export const mockTelWithPattern = {
+  properties: {
+    phone_number: {
+      title: 'Phone number',
+      description: 'Enter your telephone number',
+      type: 'string',
+      'x-jsf-presentation': {
+        inputType: 'tel',
+      },
+      oneOf: [
+        {
+          title: 'Portugal',
+          pattern: '^(\\+351)[0-9]{9,}$',
+          'x-jsf-presentation': { meta: { countryCode: '351' } },
+        },
+        {
+          title: 'United Kingdom (UK)',
+          pattern: '^(\\+44)[0-9]{1,}$',
+          'x-jsf-presentation': { meta: { countryCode: '44' } },
+        },
+        {
+          title: 'Bolivia',
+          pattern: '^(\\+591)[0-9]{9,}$',
+          'x-jsf-presentation': { meta: { countryCode: '591' } },
+        },
+        {
+          title: 'Canada',
+          pattern: '^(\\+1)(206|224)[0-9]{1,}$',
+          'x-jsf-presentation': { meta: { countryCode: '1' } },
+        },
+        {
+          title: 'United States',
+          pattern: '^(\\+1)[0-9]{1,}$',
+          'x-jsf-presentation': { meta: { countryCode: '1' } },
+        },
+      ],
+    },
+  },
+};
+
 /**
  * Compose a schema with lower chance of human error
  * @param {Object} schema version