fix(compiler): fix validator expression for type path

Use the correct type (`path`) and a key existence check.
pheekus · Sep 4, 2019 · cc54553 · cc54553
1 parent 2e4365e
commit cc54553
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/src/compile/compile-type/compile-path.ts b/src/compile/compile-type/compile-path.ts
@@ -6,7 +6,8 @@ import cel from '../cel';
 
 export default function(schema: JSONSchema7, ref: string): string {
   const map = cel.calc(ref, 'is', 'map');
-  const withPath = cel.calc(cel.ref(ref, 'path'), 'is', 'string');
+  const hasOnly = cel.call(cel.ref(cel.call(cel.ref(ref, 'keys')), 'hasOnly'), cel.val(['path']));
+  const withPath = cel.calc(cel.ref(ref, 'path'), 'is', 'path')
 
-  return cel.calc(map, '&&', withPath);
+  return cel.calc(map, '&&', cel.calc(hasOnly, '&&', withPath));
 }
diff --git a/test/compile-type.test.ts b/test/compile-type.test.ts
@@ -46,7 +46,7 @@ describe('type compilers', () => {
       assert.equal(compilePath({
         definitions: { Path: {}},
         $ref: '#/definitions/Path'
-      }, 'ref'), '((ref is map)&&(ref.path is string))');
+      }, 'ref'), `((ref is map)&&(ref.keys().hasOnly(["path"])&&(ref.path is path)))`);
     });
   });