@remoteoss/json-schema-form 0.11.7-dev.20241029090957 → 0.11.7-dev.20241120091537

package/dist/index.cjs

@@ -1,8 +1,8 @@
 
 /*!
  Copyright (c) 2024 Remote Technology, Inc.
- NPM Package: @remoteoss/json-schema-form@0.11.7-dev.20241029090957
- Generated: Tue, 29 Oct 2024 09:10:21 GMT
+ NPM Package: @remoteoss/json-schema-form@0.11.7-dev.20241120091537
+ Generated: Wed, 20 Nov 2024 09:15:48 GMT
 
  MIT License
 
@@ -481,12 +481,7 @@ var yupSchemas = {
     }).test(
       "matchesOptionOrPattern",
       ({ value }) => `The option ${JSON.stringify(value)} is not valid.`,
-      (castValue, { originalValue }) => {
-        if (castValue !== void 0 && typeof originalValue !== "string") {
-          return false;
-        }
-        return validateRadioOrSelectOptions(castValue, options);
-      }
+      (value) => validateRadioOrSelectOptions(value, options)
     );
   },
   date: ({ minDate, maxDate }) => {
@@ -627,6 +622,7 @@ function buildYupSchema(field, config, logic) {
   const isCheckboxBoolean = typeof propertyFields.checkboxValue === "boolean";
   let baseSchema;
   const errorMessageFromConfig = config?.inputTypes?.[inputType]?.errorMessage || {};
+  const jsonType = getJsonTypeInArray(field.jsonType);
   if (propertyFields.multiple) {
     baseSchema = yupSchemas.multiple[inputType] || yupSchemasToJsonTypes.array;
   } else if (isCheckboxBoolean) {
@@ -648,6 +644,11 @@ function buildYupSchema(field, config, logic) {
     }
     return yupSchema.required(requiredMessage);
   }
+  function withInteger(yupSchema) {
+    return yupSchema.integer(
+      (message) => errorMessage.integer ?? errorMessageFromConfig.integer ?? `Must not contain decimal points. E.g. ${Math.floor(message.value)} instead of ${message.value}`
+    );
+  }
   function withMin(yupSchema) {
     return yupSchema.min(
       propertyFields.minimum,
@@ -759,6 +760,9 @@ function buildYupSchema(field, config, logic) {
   if (inputType === supportedTypes.FILE) {
     validators.push(withFile);
   }
+  if (jsonType === "integer") {
+    validators.push(withInteger);
+  }
   if (typeof propertyFields.minimum !== "undefined") {
     validators.push(withMin);
   }

package/dist/index.js

@@ -1,8 +1,8 @@
 
 /*!
  Copyright (c) 2024 Remote Technology, Inc.
- NPM Package: @remoteoss/json-schema-form@0.11.7-dev.20241029090957
- Generated: Tue, 29 Oct 2024 09:10:21 GMT
+ NPM Package: @remoteoss/json-schema-form@0.11.7-dev.20241120091537
+ Generated: Wed, 20 Nov 2024 09:15:48 GMT
 
  MIT License
 
@@ -444,12 +444,7 @@ var yupSchemas = {
     }).test(
       "matchesOptionOrPattern",
       ({ value }) => `The option ${JSON.stringify(value)} is not valid.`,
-      (castValue, { originalValue }) => {
-        if (castValue !== void 0 && typeof originalValue !== "string") {
-          return false;
-        }
-        return validateRadioOrSelectOptions(castValue, options);
-      }
+      (value) => validateRadioOrSelectOptions(value, options)
     );
   },
   date: ({ minDate, maxDate }) => {
@@ -590,6 +585,7 @@ function buildYupSchema(field, config, logic) {
   const isCheckboxBoolean = typeof propertyFields.checkboxValue === "boolean";
   let baseSchema;
   const errorMessageFromConfig = config?.inputTypes?.[inputType]?.errorMessage || {};
+  const jsonType = getJsonTypeInArray(field.jsonType);
   if (propertyFields.multiple) {
     baseSchema = yupSchemas.multiple[inputType] || yupSchemasToJsonTypes.array;
   } else if (isCheckboxBoolean) {
@@ -611,6 +607,11 @@ function buildYupSchema(field, config, logic) {
     }
     return yupSchema.required(requiredMessage);
   }
+  function withInteger(yupSchema) {
+    return yupSchema.integer(
+      (message) => errorMessage.integer ?? errorMessageFromConfig.integer ?? `Must not contain decimal points. E.g. ${Math.floor(message.value)} instead of ${message.value}`
+    );
+  }
   function withMin(yupSchema) {
     return yupSchema.min(
       propertyFields.minimum,
@@ -722,6 +723,9 @@ function buildYupSchema(field, config, logic) {
   if (inputType === supportedTypes.FILE) {
     validators.push(withFile);
   }
+  if (jsonType === "integer") {
+    validators.push(withInteger);
+  }
   if (typeof propertyFields.minimum !== "undefined") {
     validators.push(withMin);
   }

package/dist/standalone.js

@@ -1,8 +1,8 @@
 
 /*!
  Copyright (c) 2024 Remote Technology, Inc.
- NPM Package: @remoteoss/json-schema-form@0.11.7-dev.20241029090957
- Generated: Tue, 29 Oct 2024 09:10:21 GMT
+ NPM Package: @remoteoss/json-schema-form@0.11.7-dev.20241120091537
+ Generated: Wed, 20 Nov 2024 09:15:48 GMT
 
  MIT License
 
@@ -11960,12 +11960,7 @@ var yupSchemas = {
     }).test(
       "matchesOptionOrPattern",
       ({ value }) => `The option ${JSON.stringify(value)} is not valid.`,
-      (castValue, { originalValue }) => {
-        if (castValue !== void 0 && typeof originalValue !== "string") {
-          return false;
-        }
-        return validateRadioOrSelectOptions(castValue, options);
-      }
+      (value) => validateRadioOrSelectOptions(value, options)
     );
   },
   date: ({ minDate, maxDate }) => {
@@ -12106,6 +12101,7 @@ function buildYupSchema(field, config, logic) {
   const isCheckboxBoolean = typeof propertyFields.checkboxValue === "boolean";
   let baseSchema;
   const errorMessageFromConfig = config?.inputTypes?.[inputType]?.errorMessage || {};
+  const jsonType = getJsonTypeInArray(field.jsonType);
   if (propertyFields.multiple) {
     baseSchema = yupSchemas.multiple[inputType] || yupSchemasToJsonTypes.array;
   } else if (isCheckboxBoolean) {
@@ -12127,6 +12123,11 @@ function buildYupSchema(field, config, logic) {
     }
     return yupSchema.required(requiredMessage);
   }
+  function withInteger(yupSchema) {
+    return yupSchema.integer(
+      (message) => errorMessage.integer ?? errorMessageFromConfig.integer ?? `Must not contain decimal points. E.g. ${Math.floor(message.value)} instead of ${message.value}`
+    );
+  }
   function withMin(yupSchema) {
     return yupSchema.min(
       propertyFields.minimum,
@@ -12238,6 +12239,9 @@ function buildYupSchema(field, config, logic) {
   if (inputType === supportedTypes.FILE) {
     validators.push(withFile);
   }
+  if (jsonType === "integer") {
+    validators.push(withInteger);
+  }
   if (typeof propertyFields.minimum !== "undefined") {
     validators.push(withMin);
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@remoteoss/json-schema-form",
-  "version": "0.11.7-dev.20241029090957",
+  "version": "0.11.7-dev.20241120091537",
   "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

@@ -9,7 +9,6 @@ import {
   schemaInputTypeText,
   schemaInputTypeRadioDeprecated,
   schemaInputTypeRadioString,
-  schemaInputTypeRadioStringY,
   schemaInputTypeRadioBoolean,
   schemaInputTypeRadioNumber,
   schemaInputTypeRadioRequiredAndOptional,
@@ -23,6 +22,7 @@ import {
   schemaInputTypeSelectMultiple,
   schemaInputTypeSelectMultipleOptional,
   schemaInputTypeFieldset,
+  schemaInputTypeIntegerNumber,
   schemaInputTypeNumber,
   schemaInputTypeNumberZeroMaximum,
   schemaInputTypeDate,
@@ -821,45 +821,6 @@ describe('createHeadlessForm', () => {
       });
     });
 
-    // @BUG COD-1859
-    // it should validate when type is string but value is not a boolean
-    it('support "radio" field string-y type', () => {
-      const { fields, handleValidation } = createHeadlessForm(schemaInputTypeRadioStringY);
-
-      const validateForm = (vals) => friendlyError(handleValidation(vals));
-
-      expect(fields).toMatchObject([
-        {
-          description: 'Do you have any siblings?',
-          label: 'Has siblings',
-          name: 'has_siblings',
-          options: [
-            {
-              label: 'Yes',
-              value: 'true',
-            },
-            {
-              label: 'No',
-              value: 'false',
-            },
-          ],
-          required: true,
-          schema: expect.any(Object),
-          type: 'radio',
-        },
-      ]);
-
-      assertOptionsAllowed({
-        handleValidation,
-        fieldName: 'has_siblings',
-        validOptions: ['true', 'false'],
-      });
-
-      expect(validateForm({ has_siblings: false })).toEqual({
-        has_siblings: 'The option "false" is not valid.',
-      });
-    });
-
     it('support "radio" field number type', () => {
       const { fields, handleValidation } = createHeadlessForm(schemaInputTypeRadioNumber);
 
@@ -1034,6 +995,41 @@ describe('createHeadlessForm', () => {
       expect(fieldOptions).toEqual([]);
     });
 
+    it('support "integer" field type', () => {
+      const result = createHeadlessForm(schemaInputTypeIntegerNumber);
+      expect(result).toMatchObject({
+        fields: [
+          {
+            description: 'How many open tabs do you have?',
+            label: 'Tabs',
+            name: 'tabs',
+            required: false,
+            schema: expect.any(Object),
+            type: 'number',
+            jsonType: 'integer',
+            inputType: 'number',
+            minimum: 1,
+            maximum: 10,
+          },
+        ],
+      });
+
+      const fieldValidator = result.fields[0].schema;
+      expect(fieldValidator.isValidSync('0')).toBe(false);
+      expect(fieldValidator.isValidSync('10')).toBe(true);
+      expect(fieldValidator.isValidSync('11')).toBe(false);
+      expect(fieldValidator.isValidSync('5.5')).toBe(false);
+      expect(fieldValidator.isValidSync('1.0')).toBe(true);
+      expect(fieldValidator.isValidSync('this is text with a number 1')).toBe(false);
+      expect(() => fieldValidator.validateSync('5.5')).toThrowError(
+        'Must not contain decimal points. E.g. 5 instead of 5.5'
+      );
+      expect(() => fieldValidator.validateSync('some text')).toThrowError(
+        'The value must be a number'
+      );
+      expect(() => fieldValidator.validateSync('')).toThrowError('The value must be a number');
+    });
+
     it('support "number" field type', () => {
       const result = createHeadlessForm(schemaInputTypeNumber);
       expect(result).toMatchObject({

package/src/tests/helpers.custom.js

@@ -194,7 +194,7 @@ export const schemaInputTypeHidden = {
       title: 'Money hidden',
       'x-jsf-presentation': { inputType: 'hidden', currency: 'EUR' },
       minimum: 0,
-      default: 12.3,
+      default: 1099,
     },
     a_hidden_select: {
       ...mockSelectInputSolo,

package/src/tests/helpers.js

@@ -61,6 +61,21 @@ export const schemaInputTypeNumberZeroMaximum = {
   },
 };
 
+export const schemaInputTypeIntegerNumber = {
+  properties: {
+    tabs: {
+      title: 'Tabs',
+      description: 'How many open tabs do you have?',
+      'x-jsf-presentation': {
+        inputType: 'number',
+      },
+      minimum: 1,
+      maximum: 10,
+      type: 'integer',
+    },
+  },
+};
+
 export const mockNumberInputWithPercentage = {
   title: 'Shares',
   description: 'What % of shares do you own?',
@@ -148,25 +163,6 @@ export const mockRadioInputBoolean = {
   type: 'boolean',
 };
 
-export const mockRadioInputStringY = {
-  title: 'Has siblings',
-  description: 'Do you have any siblings?',
-  oneOf: [
-    {
-      title: 'Yes',
-      const: 'true',
-    },
-    {
-      title: 'No',
-      const: 'false',
-    },
-  ],
-  'x-jsf-presentation': {
-    inputType: 'radio',
-  },
-  type: 'string',
-};
-
 export const mockRadioInputNumber = {
   title: 'Number of siblings',
   description: 'How many siblings do you have?',
@@ -918,13 +914,6 @@ export const schemaInputTypeRadioString = {
   required: ['has_siblings'],
 };
 
-export const schemaInputTypeRadioStringY = {
-  properties: {
-    has_siblings: mockRadioInputStringY,
-  },
-  required: ['has_siblings'],
-};
-
 export const schemaInputTypeRadioBoolean = {
   properties: {
     over_18: mockRadioInputBoolean,