fix(compiler): fix "properties" and "required" compilers in loose and…

… boolean mode

Correct the output for the boolean values of the JSONSchema7Definition (e.g. "property": true) and
make a few adjustments to the loose mode (condition was a bit wrong).

src/compile-type/compile-object.ts

@@ -24,21 +24,21 @@ export default function(schema: JSONSchema7, ref: string, strictRef: string): st
     const value = properties[key];
     const valueRef = cel.ref(ref, key);
 
-    if (typeof value === 'boolean') {
-      guard = cel.calc(guard, '&&', valueRef);
-    } else if (typeof value === 'object') {
-      let valueGuard = compile(value, valueRef, strictRef);
-
-      if (requiredProperties.has(key)) {
-        const includesKey = cel.call(cel.ref(actualKeys, 'hasAll'), cel.val([key]))
-        const definedOrStrict = cel.calc(strictRef, '||', includesKey);
-        valueGuard = cel.calc(definedOrStrict, '&&', valueGuard);
-      } else {
-        valueGuard = cel.calc(valueRef, '&&', valueGuard);
-      }
-
-      guard = cel.calc(guard, '&&', valueGuard);
-    }
+    const loose = cel.calc(strictRef, '==', cel.val(false));
+    const includesKey = cel.call(cel.ref(actualKeys, 'hasAll'), cel.val([key]));
+    const doesNotIncludeKey = cel.calc(includesKey, '==', cel.val(false));
+
+    const skipAssert = requiredProperties.has(key)
+      ? cel.calc(loose, '&&', doesNotIncludeKey)
+      : doesNotIncludeKey;
+
+    const valueGuard = typeof value === 'boolean'
+      ? value
+        ? includesKey
+        : doesNotIncludeKey
+      : compile(value, valueRef, strictRef);
+
+    guard = cel.calc(guard, '&&', cel.calc(skipAssert, '||', valueGuard));
   });
 
   if (typeof schema.minProperties === 'number') {

test/compile-type.test.ts

@@ -233,11 +233,11 @@ describe('type compilers', () => {
     it('supports "properties"', () => {
       assert.equal(
         compileObject({ type: 'object', properties: { a: true, b: true }}, 'ref', 's'),
-        '((((ref is map)&&ref.keys().hasOnly(["a","b"]))&&ref.a)&&ref.b)'
+        '((((ref is map)&&ref.keys().hasOnly(["a","b"]))&&((ref.keys().hasAll(["a"])==false)||ref.keys().hasAll(["a"])))&&((ref.keys().hasAll(["b"])==false)||ref.keys().hasAll(["b"])))'
       );
       assert.equal(
         compileObject({ type: 'object', properties: { a: { type: 'boolean' }}}, 'ref', 's'),
-        '(((ref is map)&&ref.keys().hasOnly(["a"]))&&(ref.a&&(ref.a is bool)))'
+        '(((ref is map)&&ref.keys().hasOnly(["a"]))&&((ref.keys().hasAll(["a"])==false)||(ref.a is bool)))'
       );
     });
 
@@ -258,7 +258,7 @@ describe('type compilers', () => {
     it('supports "required"', () => {
       assert.equal(
         compileObject({ type: 'object', properties: { a: { type: 'boolean' }}, required: ['a']}, 'ref', 's'),
-        '(((ref is map)&&ref.keys().hasOnly(["a"]))&&((s||ref.keys().hasAll(["a"]))&&(ref.a is bool)))'
+        '(((ref is map)&&ref.keys().hasOnly(["a"]))&&(((s==false)&&(ref.keys().hasAll(["a"])==false))||(ref.a is bool)))'
       );
     });
   });

test/compile.test.ts

@@ -30,7 +30,7 @@ describe('function compiler', () => {
     assert.equal(
       compile([{ $id: 'Sample', type: 'object', properties: { a: true }}]),
       [
-        'function _s0(d,s){return (((d is map)&&d.keys().hasOnly(["a"]))&&d.a)}',
+        'function _s0(d,s){return (((d is map)&&d.keys().hasOnly(["a"]))&&((d.keys().hasAll(["a"])==false)||d.keys().hasAll(["a"])))}',
         'function _s(n,d,s){return ((n=="Sample")&&_s0(d,s))}',
         'function isValid(n){return _s(n,request.resource.data,(request.method=="create"))}'
       ].join('')