apostrophe 3.59.0 → 3.59.1

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## 3.59.1 (2023-11-14)
+
+### Fixes
+
+* Fix `if` and `requiredIf` fields inside arrays. With regard to `if`, this is a hotfix for a regression introduced in 3.59.0.
+
 ## 3.59.0 (2023-11-03)
 
 ### Changes

package/modules/@apostrophecms/schema/index.js

@@ -498,10 +498,10 @@ module.exports = {
             }
             continue;
           } else if (val.$ne) {
-            // eslint-disable-next-line eqeqeq
-            if (val.$ne == destinationKey) {
+            if (val.$ne === destinationKey) {
               return false;
             }
+            continue;
           }
 
           // Handle external conditions:
@@ -526,23 +526,22 @@ module.exports = {
             continue;
           }
 
-          if (val.min && destinationKey < val.min) {
-            return false;
-          }
-          if (val.max && destinationKey > val.max) {
-            return false;
+          // test with Object.prototype for the case val.min === 0
+          if (Object.hasOwn(val, 'min') || Object.hasOwn(val, 'max')) {
+            if (destinationKey < val.min) {
+              return false;
+            }
+            if (destinationKey > val.max) {
+              return false;
+            }
+            continue;
           }
 
           if (conditionalFields?.[key] === false) {
             return false;
           }
 
-          if (typeof val === 'boolean' && !destinationKey) {
-            return false;
-          }
-
-          // eslint-disable-next-line eqeqeq
-          if ((typeof val === 'string' || typeof val === 'number') && destinationKey != val) {
+          if (destinationKey !== val) {
             return false;
           }
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "apostrophe",
-  "version": "3.59.0",
+  "version": "3.59.1",
   "description": "The Apostrophe Content Management System.",
   "main": "index.js",
   "scripts": {

package/test/schemas.js

@@ -2381,7 +2381,9 @@ describe('Schemas', function() {
 
       assert.deepEqual(actual, expected);
     });
+  });
 
+  describe('field if|ifRequired', function () {
     it('should enforce required property not equal match', async function() {
       const req = apos.task.getReq();
       const schema = apos.schema.compose({
@@ -2468,10 +2470,7 @@ describe('Schemas', function() {
           subfield: false
         }
       }, output);
-      console.log('output', require('util').inspect(output, {
-        colors: true,
-        depth: 1
-      }));
+
       assert(!output.requiredProp);
     });
 
@@ -2676,6 +2675,120 @@ describe('Schemas', function() {
       }, 'requiredProp', 'required');
     });
 
+    it('should enforce required property number min', async function() {
+      const req = apos.task.getReq();
+      const schema = apos.schema.compose({
+        addFields: [
+          {
+            name: 'prop1',
+            type: 'integer',
+            required: false
+          },
+          {
+            name: 'prop2',
+            type: 'string',
+            required: true,
+            if: {
+              prop1: {
+                min: 0,
+                max: 10
+              }
+            }
+          }
+        ]
+      });
+      const output = {};
+      await apos.schema.convert(req, schema, {
+        prop1: -1,
+        prop2: ''
+      }, output);
+      assert(output.prop2 === '');
+    });
+
+    it('should error required property number min', async function() {
+      const schema = apos.schema.compose({
+        addFields: [
+          {
+            name: 'prop1',
+            type: 'integer',
+            required: false
+          },
+          {
+            name: 'prop2',
+            type: 'string',
+            required: true,
+            if: {
+              prop1: {
+                min: 0,
+                max: 10
+              }
+            }
+          }
+        ]
+      });
+      await testSchemaError(schema, {
+        prop1: 0,
+        prop2: ''
+      }, 'prop2', 'required');
+    });
+
+    it('should enforce required property number max', async function() {
+      const req = apos.task.getReq();
+      const schema = apos.schema.compose({
+        addFields: [
+          {
+            name: 'prop1',
+            type: 'integer',
+            required: false
+          },
+          {
+            name: 'prop2',
+            type: 'string',
+            required: true,
+            if: {
+              prop1: {
+                min: -10,
+                max: 0
+              }
+            }
+          }
+        ]
+      });
+      const output = {};
+      await apos.schema.convert(req, schema, {
+        prop1: 1,
+        prop2: ''
+      }, output);
+      assert(output.prop2 === '');
+    });
+
+    it('should error required property number max', async function() {
+      const schema = apos.schema.compose({
+        addFields: [
+          {
+            name: 'prop1',
+            type: 'integer',
+            required: false
+          },
+          {
+            name: 'prop2',
+            type: 'string',
+            required: true,
+            if: {
+              prop1: {
+                min: -10,
+                max: 0
+              }
+            }
+          }
+        ]
+      });
+      await testSchemaError(schema, {
+        prop1: 0,
+        prop2: ''
+      }, 'prop2', 'required');
+    });
+
     it('should enforce required property nested logical AND', async function() {
       const req = apos.task.getReq();
       const schema = apos.schema.compose({
@@ -2956,48 +3069,49 @@ describe('Schemas', function() {
       const schema = apos.schema.compose({
         addFields: [
           {
-            name: 'age',
-            type: 'integer',
+            name: 'prop1',
+            type: 'boolean',
             required: false
           },
           {
-            name: 'shoeSize',
-            type: 'integer',
+            name: 'prop2',
+            type: 'string',
             requiredIf: {
-              age: true
+              prop1: true
             }
           }
         ]
       });
       const output = {};
       await apos.schema.convert(req, schema, {
-        shoeSize: '',
-        age: ''
+        prop1: false,
+        prop2: ''
       }, output);
-      assert(output.shoeSize === null);
+
+      assert(output.prop2 === '');
     });
 
     it('should error required property with ifRequired boolean', async function() {
       const schema = apos.schema.compose({
         addFields: [
           {
-            name: 'age',
-            type: 'integer',
+            name: 'prop1',
+            type: 'boolean',
             required: false
           },
           {
-            name: 'shoeSize',
-            type: 'integer',
+            name: 'prop2',
+            type: 'string',
             requiredIf: {
-              age: true
+              prop1: true
             }
           }
         ]
       });
       await testSchemaError(schema, {
-        shoeSize: '',
-        age: '18'
-      }, 'shoeSize', 'required');
+        prop1: true,
+        prop2: ''
+      }, 'prop2', 'required');
     });
 
     it('should enforce required property with ifRequired string', async function() {
@@ -3006,7 +3120,7 @@ describe('Schemas', function() {
         addFields: [
           {
             name: 'age',
-            type: 'integer',
+            type: 'string',
             required: false
           },
           {
@@ -3031,7 +3145,7 @@ describe('Schemas', function() {
         addFields: [
           {
             name: 'age',
-            type: 'integer',
+            type: 'string',
             required: false
           },
           {
@@ -3135,8 +3249,29 @@ describe('Schemas', function() {
             required: false
           },
           {
-            name: 'prop2',
-            type: 'boolean',
+            name: 'shoeSize',
+            type: 'integer',
+            requiredIf: {
+              age: {
+                min: 18
+              }
+            }
+          }
+        ]
+      });
+      await testSchemaError(schema, {
+        shoeSize: '',
+        age: 19
+      }, 'shoeSize', 'required');
+    });
+
+    it('should enforce required property with ifRequired number min 0', async function() {
+      const req = apos.task.getReq();
+      const schema = apos.schema.compose({
+        addFields: [
+          {
+            name: 'age',
+            type: 'integer',
             required: false
           },
           {
@@ -3144,7 +3279,34 @@ describe('Schemas', function() {
             type: 'integer',
             requiredIf: {
               age: {
-                min: 18
+                min: 1
+              }
+            }
+          }
+        ]
+      });
+      const output = {};
+      await apos.schema.convert(req, schema, {
+        shoeSize: '',
+        age: 0
+      }, output);
+      assert(output.shoeSize === null);
+    });
+
+    it('should error required property with ifRequired number min 0', async function() {
+      const schema = apos.schema.compose({
+        addFields: [
+          {
+            name: 'age',
+            type: 'integer',
+            required: false
+          },
+          {
+            name: 'shoeSize',
+            type: 'integer',
+            requiredIf: {
+              age: {
+                min: 0
               }
             }
           }
@@ -3152,8 +3314,7 @@ describe('Schemas', function() {
       });
       await testSchemaError(schema, {
         shoeSize: '',
-        age: 19,
-        prop2: false
+        age: 0
       }, 'shoeSize', 'required');
     });
 
@@ -3194,11 +3355,6 @@ describe('Schemas', function() {
             type: 'integer',
             required: false
           },
-          {
-            name: 'prop2',
-            type: 'boolean',
-            required: false
-          },
           {
             name: 'shoeSize',
             type: 'integer',
@@ -3217,6 +3373,61 @@ describe('Schemas', function() {
       }, 'shoeSize', 'required');
     });
 
+    it('should enforce required property with ifRequired number max 0', async function() {
+      const req = apos.task.getReq();
+      const schema = apos.schema.compose({
+        addFields: [
+          {
+            name: 'prop1',
+            type: 'integer',
+            required: false
+          },
+          {
+            name: 'prop2',
+            type: 'string',
+            requiredIf: {
+              prop1: {
+                min: -10,
+                max: 0
+              }
+            }
+          }
+        ]
+      });
+      const output = {};
+      await apos.schema.convert(req, schema, {
+        prop1: 1,
+        prop2: ''
+      }, output);
+      assert(output.prop2 === '');
+    });
+
+    it('should error required property with ifRequired number max 0', async function() {
+      const schema = apos.schema.compose({
+        addFields: [
+          {
+            name: 'prop1',
+            type: 'integer',
+            required: false
+          },
+          {
+            name: 'prop2',
+            type: 'string',
+            requiredIf: {
+              prop1: {
+                min: -10,
+                max: 0
+              }
+            }
+          }
+        ]
+      });
+      await testSchemaError(schema, {
+        prop1: 0,
+        prop2: ''
+      }, 'prop2', 'required');
+    });
+
     it('should enforce required property with ifRequired logical AND', async function() {
       const req = apos.task.getReq();
       const schema = apos.schema.compose({
@@ -4080,7 +4291,6 @@ describe('Schemas', function() {
 
       await testSchemaError(schema, {}, 'age', 'required');
     });
-
   });
 });