@remoteoss/json-schema-form 0.11.9-dev.20241127210659 → 0.11.9-dev.20241213082826

package/dist/index.cjs

@@ -1,8 +1,8 @@
 
 /*!
  Copyright (c) 2024 Remote Technology, Inc.
- NPM Package: @remoteoss/json-schema-form@0.11.9-dev.20241127210659
- Generated: Wed, 27 Nov 2024 21:07:13 GMT
+ NPM Package: @remoteoss/json-schema-form@0.11.9-dev.20241213082826
+ Generated: Fri, 13 Dec 2024 08:29:06 GMT
 
  MIT License
 
@@ -98,6 +98,9 @@ function hasProperty(object2, propertyName) {
 
 // src/checkIfConditionMatches.js
 function checkIfConditionMatchesProperties(node, formValues, formFields, logic) {
+  if (typeof node.if === "boolean") {
+    return node.if;
+  }
   return Object.keys(node.if.properties ?? {}).every((name) => {
     const currentProperty = node.if.properties[name];
     const value = formValues[name];
@@ -1052,8 +1055,6 @@ function checkRuleIntegrity(rule, id, data, errorMessage = (item) => `[json-sche
     subRule.map((item) => {
       const isVar = item !== null && typeof item === "object" && Object.hasOwn(item, "var");
       if (isVar) {
-        if (Array.isArray(item.var))
-          return;
         const exists = import_json_logic_js.default.apply({ var: removeIndicesFromPath(item.var) }, data);
         if (exists === null) {
           throw Error(errorMessage(item));
@@ -1315,7 +1316,7 @@ function processNode({
       parentID
     });
   });
-  if (node.if) {
+  if (node.if !== void 0) {
     const matchesCondition = checkIfConditionMatchesProperties(node, formValues, formFields, logic);
     if (matchesCondition && node.then) {
       const { required: branchRequired } = processNode({

package/dist/index.js

@@ -1,8 +1,8 @@
 
 /*!
  Copyright (c) 2024 Remote Technology, Inc.
- NPM Package: @remoteoss/json-schema-form@0.11.9-dev.20241127210659
- Generated: Wed, 27 Nov 2024 21:07:13 GMT
+ NPM Package: @remoteoss/json-schema-form@0.11.9-dev.20241213082826
+ Generated: Fri, 13 Dec 2024 08:29:06 GMT
 
  MIT License
 
@@ -61,6 +61,9 @@ function hasProperty(object2, propertyName) {
 
 // src/checkIfConditionMatches.js
 function checkIfConditionMatchesProperties(node, formValues, formFields, logic) {
+  if (typeof node.if === "boolean") {
+    return node.if;
+  }
   return Object.keys(node.if.properties ?? {}).every((name) => {
     const currentProperty = node.if.properties[name];
     const value = formValues[name];
@@ -1015,8 +1018,6 @@ function checkRuleIntegrity(rule, id, data, errorMessage = (item) => `[json-sche
     subRule.map((item) => {
       const isVar = item !== null && typeof item === "object" && Object.hasOwn(item, "var");
       if (isVar) {
-        if (Array.isArray(item.var))
-          return;
         const exists = jsonLogic.apply({ var: removeIndicesFromPath(item.var) }, data);
         if (exists === null) {
           throw Error(errorMessage(item));
@@ -1278,7 +1279,7 @@ function processNode({
       parentID
     });
   });
-  if (node.if) {
+  if (node.if !== void 0) {
     const matchesCondition = checkIfConditionMatchesProperties(node, formValues, formFields, logic);
     if (matchesCondition && node.then) {
       const { required: branchRequired } = processNode({

package/dist/standalone.js

@@ -1,8 +1,8 @@
 
 /*!
  Copyright (c) 2024 Remote Technology, Inc.
- NPM Package: @remoteoss/json-schema-form@0.11.9-dev.20241127210659
- Generated: Wed, 27 Nov 2024 21:07:13 GMT
+ NPM Package: @remoteoss/json-schema-form@0.11.9-dev.20241213082826
+ Generated: Fri, 13 Dec 2024 08:29:06 GMT
 
  MIT License
 
@@ -11578,6 +11578,9 @@ function hasProperty(object2, propertyName) {
 
 // src/checkIfConditionMatches.js
 function checkIfConditionMatchesProperties(node, formValues, formFields, logic) {
+  if (typeof node.if === "boolean") {
+    return node.if;
+  }
   return Object.keys(node.if.properties ?? {}).every((name) => {
     const currentProperty = node.if.properties[name];
     const value = formValues[name];
@@ -12531,8 +12534,6 @@ function checkRuleIntegrity(rule, id, data, errorMessage = (item) => `[json-sche
     subRule.map((item) => {
       const isVar = item !== null && typeof item === "object" && Object.hasOwn(item, "var");
       if (isVar) {
-        if (Array.isArray(item.var))
-          return;
         const exists = import_json_logic_js.default.apply({ var: removeIndicesFromPath(item.var) }, data);
         if (exists === null) {
           throw Error(errorMessage(item));
@@ -12794,7 +12795,7 @@ function processNode({
       parentID
     });
   });
-  if (node.if) {
+  if (node.if !== void 0) {
     const matchesCondition = checkIfConditionMatchesProperties(node, formValues, formFields, logic);
     if (matchesCondition && node.then) {
       const { required: branchRequired } = processNode({

package/package.json

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

package/src/tests/checkIfConditionMatches.test.js

@@ -1,5 +1,13 @@
 import { checkIfConditionMatchesProperties } from '../checkIfConditionMatches';
 
+it('True if is always going to be true', () => {
+  expect(checkIfConditionMatchesProperties({ if: true })).toBe(true);
+});
+
+it('False if is always going to be false', () => {
+  expect(checkIfConditionMatchesProperties({ if: false })).toBe(false);
+});
+
 it('Empty if is always going to be true', () => {
   expect(checkIfConditionMatchesProperties({ if: { properties: {} } })).toBe(true);
 });

package/src/tests/conditions.test.js

@@ -479,3 +479,71 @@ describe('Conditional with a minimum value check', () => {
     expect(handleValidation({ salary: 1000, reason: 'reason_one' }).formErrors).toEqual(undefined);
   });
 });
+
+describe('Conditional with literal booleans', () => {
+  it('handles true case', () => {
+    const schema = {
+      properties: {
+        is_full_time: {
+          type: 'boolean',
+        },
+        salary: {
+          type: 'number',
+        },
+      },
+      required: [],
+      if: true,
+      then: {
+        required: ['is_full_time'],
+      },
+      else: {
+        required: ['salary'],
+      },
+    };
+    const { fields, handleValidation } = createHeadlessForm(schema, { strictInputType: false });
+
+    handleValidation({});
+
+    expect(fields[0]).toMatchObject({
+      name: 'is_full_time',
+      required: true,
+    });
+    expect(fields[1]).toMatchObject({
+      name: 'salary',
+      required: false,
+    });
+  });
+
+  it('handles false case', () => {
+    const schema = {
+      properties: {
+        is_full_time: {
+          type: 'boolean',
+        },
+        salary: {
+          type: 'number',
+        },
+      },
+      required: [],
+      if: false,
+      then: {
+        required: ['is_full_time'],
+      },
+      else: {
+        required: ['salary'],
+      },
+    };
+    const { fields, handleValidation } = createHeadlessForm(schema, { strictInputType: false });
+
+    handleValidation({});
+
+    expect(fields[0]).toMatchObject({
+      name: 'is_full_time',
+      required: false,
+    });
+    expect(fields[1]).toMatchObject({
+      name: 'salary',
+      required: true,
+    });
+  });
+});

package/src/tests/jsonLogic.fixtures.js

@@ -984,51 +984,3 @@ export const schemaWithTwoValidationsWhereOneOfThemIsAppliedConditionally = {
     },
   ],
 };
-
-export const schemaWithReduceAccumulator = {
-  properties: {
-    work_days: {
-      items: {
-        anyOf: [
-          { const: 'monday', title: 'Monday' },
-          { const: 'tuesday', title: 'Tuesday' },
-          { const: 'wednesday', title: 'Wednesday' },
-          { const: 'thursday', title: 'Thursday' },
-          { const: 'friday', title: 'Friday' },
-          { const: 'saturday', title: 'Saturday' },
-          { const: 'sunday', title: 'Sunday' },
-        ],
-      },
-      type: 'array',
-      uniqueItems: true,
-      'x-jsf-presentation': {
-        inputType: 'select',
-      },
-    },
-    working_hours_per_day: {
-      type: 'number',
-    },
-    working_hours_per_week: {
-      type: 'number',
-      'x-jsf-logic-computedAttrs': {
-        const: 'computed_work_hours_per_week',
-        defaultValue: 'computed_work_hours_per_week',
-        title: '{{computed_work_hours_per_week}} hours per week',
-      },
-    },
-  },
-  'x-jsf-logic': {
-    computedValues: {
-      computed_work_hours_per_week: {
-        rule: {
-          '*': [
-            { var: 'working_hours_per_day' },
-            {
-              reduce: [{ var: 'work_days' }, { '+': [{ var: ['accumulator', 0] }, 1] }, 0],
-            },
-          ],
-        },
-      },
-    },
-  },
-};

package/src/tests/jsonLogic.test.js

@@ -36,7 +36,6 @@ import {
   schemaWithUnknownVariableInValidations,
   schemaWithValidationThatDoesNotExistOnProperty,
   badSchemaThatWillNotSetAForcedValue,
-  schemaWithReduceAccumulator,
 } from './jsonLogic.fixtures';
 import { mockConsole, restoreConsoleAndEnsureItWasNotCalled } from './testUtils';
 
@@ -245,22 +244,6 @@ describe('jsonLogic: cross-values validations', () => {
     });
   });
 
-  describe('Reduce', () => {
-    it('reduce: working_hours_per_day * work_days', () => {
-      const { fields, handleValidation } = createHeadlessForm(schemaWithReduceAccumulator, {
-        strictInputType: false,
-      });
-      handleValidation({
-        work_days: ['monday', 'tuesday'],
-        working_hours_per_day: 8,
-      });
-      const field = fields.find((i) => i.name === 'working_hours_per_week');
-      expect(field.const).toEqual(16);
-      expect(field.default).toEqual(16);
-      expect(field.label).toEqual('16 hours per week');
-    });
-  });
-
   describe('Logical: ||, &&', () => {
     it('AND: field_a > field_b && field_a > field_c (implicit with multiple rules in a single field)', () => {
       const schema = createSchemaWithThreePropertiesWithRuleOnFieldA({