fix(compiler): fix loose property checks on objects

CEL doesn't allow accessing undefined properties, so it has to be done via .keys() and .hasAll() checks instead. fix #13
pheekus · Sep 13, 2019 · 447ef08 · 447ef08
1 parent b11dc4d
commit 447ef08
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/compile-type/compile-object.ts b/src/compile-type/compile-object.ts
@@ -30,7 +30,8 @@ export default function(schema: JSONSchema7, ref: string, strictRef: string): st
       let valueGuard = compile(value, valueRef, strictRef);
 
       if (requiredProperties.has(key)) {
-        const definedOrStrict = cel.calc(strictRef, '||', valueRef);
+        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);

diff --git a/test/compile-type.test.ts b/test/compile-type.test.ts
@@ -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.a)&&(ref.a is bool)))'
+        '(((ref is map)&&ref.keys().hasOnly(["a"]))&&((s||ref.keys().hasAll(["a"]))&&(ref.a is bool)))'
       );
     });
   });