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

package/CHANGELOG.md

@@ -1,3 +1,9 @@
+#### 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))
+
 #### 0.4.2-beta.0 (2023-07-20)
 
 ##### Bug Fixes

package/dist/index.cjs

@@ -1,8 +1,8 @@
 
 /*!
  Copyright (c) 2023 Remote Technology, Inc.
- NPM Package: @remoteoss/json-schema-form@0.4.3-dev.20230808130245
- Generated: Tue, 08 Aug 2023 13:03:08 GMT
+ NPM Package: @remoteoss/json-schema-form@0.4.4-dev.20230829102031
+ Generated: Tue, 29 Aug 2023 10:20:47 GMT
 
  MIT License
 
@@ -606,6 +606,13 @@ function buildYupSchema(field, config) {
       }) : true
     );
   }
+  function withConst(yupSchema) {
+    return yupSchema.test(
+      "isConst",
+      errorMessage.const ?? errorMessageFromConfig.const ?? `The only accepted value is ${propertyFields.const}.`,
+      (value) => propertyFields.required === false && value === void 0 || value === null || value === propertyFields.const
+    );
+  }
   function withBaseSchema() {
     const customErrorMsg = errorMessage.type || errorMessageFromConfig.type;
     if (customErrorMsg) {
@@ -673,6 +680,9 @@ function buildYupSchema(field, config) {
   if (propertyFields.accept) {
     validators.push(withFileFormat);
   }
+  if (propertyFields.const) {
+    validators.push(withConst);
+  }
   return (0, import_flow.default)(validators);
 }
 function getNoSortEdges(fields = []) {
@@ -934,6 +944,7 @@ function extractParametersFromNode(schemaNode) {
   const statementDescription = containsHTML(presentation.statement?.description) ? wrapWithSpan(presentation.statement.description, { class: "jsf-statement" }) : presentation.statement?.description;
   return (0, import_omitBy.default)(
     {
+      const: node.const,
       label: node.title,
       readOnly: node.readOnly,
       ...node.deprecated && {

package/dist/index.js

@@ -1,8 +1,8 @@
 
 /*!
  Copyright (c) 2023 Remote Technology, Inc.
- NPM Package: @remoteoss/json-schema-form@0.4.3-dev.20230808130245
- Generated: Tue, 08 Aug 2023 13:03:08 GMT
+ NPM Package: @remoteoss/json-schema-form@0.4.4-dev.20230829102031
+ Generated: Tue, 29 Aug 2023 10:20:47 GMT
 
  MIT License
 
@@ -570,6 +570,13 @@ function buildYupSchema(field, config) {
       }) : true
     );
   }
+  function withConst(yupSchema) {
+    return yupSchema.test(
+      "isConst",
+      errorMessage.const ?? errorMessageFromConfig.const ?? `The only accepted value is ${propertyFields.const}.`,
+      (value) => propertyFields.required === false && value === void 0 || value === null || value === propertyFields.const
+    );
+  }
   function withBaseSchema() {
     const customErrorMsg = errorMessage.type || errorMessageFromConfig.type;
     if (customErrorMsg) {
@@ -637,6 +644,9 @@ function buildYupSchema(field, config) {
   if (propertyFields.accept) {
     validators.push(withFileFormat);
   }
+  if (propertyFields.const) {
+    validators.push(withConst);
+  }
   return flow(validators);
 }
 function getNoSortEdges(fields = []) {
@@ -898,6 +908,7 @@ function extractParametersFromNode(schemaNode) {
   const statementDescription = containsHTML(presentation.statement?.description) ? wrapWithSpan(presentation.statement.description, { class: "jsf-statement" }) : presentation.statement?.description;
   return omitBy(
     {
+      const: node.const,
       label: node.title,
       readOnly: node.readOnly,
       ...node.deprecated && {

package/dist/standalone.js

@@ -1,8 +1,8 @@
 
 /*!
  Copyright (c) 2023 Remote Technology, Inc.
- NPM Package: @remoteoss/json-schema-form@0.4.3-dev.20230808130245
- Generated: Tue, 08 Aug 2023 13:03:08 GMT
+ NPM Package: @remoteoss/json-schema-form@0.4.4-dev.20230829102031
+ Generated: Tue, 29 Aug 2023 10:20:47 GMT
 
  MIT License
 
@@ -11546,6 +11546,13 @@ function buildYupSchema(field, config) {
       }) : true
     );
   }
+  function withConst(yupSchema) {
+    return yupSchema.test(
+      "isConst",
+      errorMessage.const ?? errorMessageFromConfig.const ?? `The only accepted value is ${propertyFields.const}.`,
+      (value) => propertyFields.required === false && value === void 0 || value === null || value === propertyFields.const
+    );
+  }
   function withBaseSchema() {
     const customErrorMsg = errorMessage.type || errorMessageFromConfig.type;
     if (customErrorMsg) {
@@ -11613,6 +11620,9 @@ function buildYupSchema(field, config) {
   if (propertyFields.accept) {
     validators.push(withFileFormat);
   }
+  if (propertyFields.const) {
+    validators.push(withConst);
+  }
   return (0, import_flow.default)(validators);
 }
 function getNoSortEdges(fields = []) {
@@ -11874,6 +11884,7 @@ function extractParametersFromNode(schemaNode) {
   const statementDescription = containsHTML(presentation.statement?.description) ? wrapWithSpan(presentation.statement.description, { class: "jsf-statement" }) : presentation.statement?.description;
   return (0, import_omitBy.default)(
     {
+      const: node.const,
       label: node.title,
       readOnly: node.readOnly,
       ...node.deprecated && {

package/package.json

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

package/src/tests/const.test.js

@@ -0,0 +1,78 @@
+import { createHeadlessForm } from '../createHeadlessForm';
+
+it('Should work for number', () => {
+  const { handleValidation } = createHeadlessForm(
+    {
+      properties: {
+        ten_only: { type: 'number', const: 10 },
+      },
+    },
+    { strictInputType: false }
+  );
+  expect(handleValidation({}).formErrors).toEqual(undefined);
+  expect(handleValidation({ ten_only: 1 }).formErrors).toEqual({
+    ten_only: 'The only accepted value is 10.',
+  });
+  expect(handleValidation({ ten_only: 10 }).formErrors).toEqual(undefined);
+});
+
+it('Should work for text', () => {
+  const { handleValidation } = createHeadlessForm(
+    {
+      properties: {
+        hello_only: { type: 'string', const: 'hello' },
+      },
+    },
+    { strictInputType: false }
+  );
+  expect(handleValidation({}).formErrors).toEqual(undefined);
+  expect(handleValidation({ hello_only: 'what' }).formErrors).toEqual({
+    hello_only: 'The only accepted value is hello.',
+  });
+  expect(handleValidation({ hello_only: 'hello' }).formErrors).toEqual(undefined);
+});
+
+it('Should work for a conditionally applied const', () => {
+  const { handleValidation } = createHeadlessForm(
+    {
+      properties: {
+        answer: { type: 'string', oneOf: [{ const: 'yes' }, { const: 'no' }] },
+        amount: { description: 'If you select yes, this needs to be exactly 10.', type: 'number' },
+      },
+      allOf: [
+        {
+          if: { properties: { answer: { const: 'yes' } }, required: ['answer'] },
+          then: { properties: { amount: { const: 10 } }, required: ['amount'] },
+        },
+      ],
+    },
+    { strictInputType: false }
+  );
+  expect(handleValidation({}).formErrors).toEqual(undefined);
+  expect(handleValidation({ answer: 'no' }).formErrors).toEqual(undefined);
+  expect(handleValidation({ answer: 'yes' }).formErrors).toEqual({ amount: 'Required field' });
+  expect(handleValidation({ answer: 'yes', amount: 1 }).formErrors).toEqual({
+    amount: 'The only accepted value is 10.',
+  });
+  expect(handleValidation({ answer: 'yes', amount: 10 }).formErrors).toEqual(undefined);
+});
+
+it('Should show the custom error message', () => {
+  const { handleValidation } = createHeadlessForm(
+    {
+      properties: {
+        string: {
+          type: 'string',
+          const: 'hello',
+          'x-jsf-errorMessage': { const: 'You must say hello!!!' },
+        },
+      },
+    },
+    { strictInputType: false }
+  );
+  expect(handleValidation({}).formErrors).toEqual(undefined);
+  expect(handleValidation({ string: 'hi' }).formErrors).toEqual({
+    string: 'You must say hello!!!',
+  });
+  expect(handleValidation({ string: 'hello' }).formErrors).toEqual(undefined);
+});