chore(global): merge pull request #8 from dantothefuture/dev

Add support for "minProperties", "maxProperties" and "multipleOf"

README.md

@@ -66,7 +66,7 @@ The code we generated in the previous step exposes `isValid($id: string): boolea
 
 ```
 match /apples/{appleId} {
-  allow write: isValid("Apple");
+  allow write: if isValid("Apple");
 }
 ```
 

docs/compatibility.md

@@ -9,10 +9,7 @@ Features on this list are not currently supported, but planned for the future re
 
 |Type|Features|
 |--|--|
-|`object`|`minProperties`, `maxProperties`, `dependencies`|
-|`string`|`format`|
-|`integer`|`multipleOf`|
-|`number`|`multipleOf`|
+|`object`|`dependencies`|
 |`other`|`allOf`, `$ref`|
 
 ## Under consideration

src/compile/cel.ts

@@ -1,4 +1,4 @@
-export type CELOperator = '&&'|'||'|'>'|'<'|'=='|'>='|'<=';
+export type CELOperator = '&&'|'||'|'>'|'<'|'=='|'>='|'<='|'%';
 export type CELKeyword = 'is'|'in';
 export type CELPrimitive = null|number|string|boolean;
 export type CELLiteral = CELPrimitive|CELPrimitive[];

src/compile/compile-type/compile-numeric.ts

@@ -31,7 +31,10 @@ export default function(schema: JSONSchema7, ref: string): string {
     guard = cel.calc(guard, '&&', exMaxGuard);
   }
 
-  // TODO: multipleOf
+  if (typeof schema.multipleOf === 'number') {
+    const multipleOfGuard = cel.calc(cel.calc(ref, '%', cel.val(schema.multipleOf)), '==', cel.val(0));
+    guard = cel.calc(guard, '&&', multipleOfGuard);
+  }
 
   return guard;
 }

src/compile/compile-type/compile-object.ts

@@ -10,13 +10,13 @@ export default function(schema: JSONSchema7, ref: string, strictRef: string): st
   const properties = schema.properties || {};
   const requiredProperties = new Set(schema.required || []);
   const allProperties = Object.keys(properties);
+  const actualKeys = cel.ref(cel.call(cel.ref(ref, 'keys')));
+  const actualKeysSize = cel.call(cel.ref(actualKeys, 'size'));
 
   let guard = cel.calc(ref, 'is', cel.ref('map'));
 
   if (allProperties.length > 0) {
     const expectedKeys = cel.val(allProperties);
-    const actualKeys = cel.ref(cel.call(cel.ref(ref, 'keys')));
-
     guard = cel.calc(guard, '&&', cel.call(cel.ref(actualKeys, 'hasOnly'), expectedKeys));
   }
 
@@ -40,8 +40,16 @@ export default function(schema: JSONSchema7, ref: string, strictRef: string): st
     }
   });
 
-  // TODO: minProperties
-  // TODO: maxProperties
+  if (typeof schema.minProperties === 'number') {
+    const minPropertiesGuard = cel.calc(actualKeysSize, '>=', cel.val(schema.minProperties));
+    guard = cel.calc(guard, '&&', minPropertiesGuard);
+  }
+
+  if (typeof schema.maxProperties === 'number') {
+    const maxPropertiesGuard = cel.calc(actualKeysSize, '<=', cel.val(schema.maxProperties));
+    guard = cel.calc(guard, '&&', maxPropertiesGuard);
+  }
+
   // TODO: propertyNames
   // TODO: dependencies
   // TODO: patternProperties

test/compile-type.test.ts

@@ -185,6 +185,13 @@ describe('type compilers', () => {
         '(((ref is int)||(ref is float))&&(ref<0))'
       );
     });
+
+    it('supports "multipleOf"', () => {
+      assert.equal(
+        compileNumeric({ type: 'integer', multipleOf: 2 }, 'ref'),
+        '((ref is int)&&((ref%2)==0))'
+      );
+    });
   });
 
   describe('object', () => {
@@ -203,6 +210,20 @@ describe('type compilers', () => {
       );
     });
 
+    it('supports "minProperties"', () => {
+      assert.equal(
+        compileObject({ type: 'object', minProperties: 0 }, 'ref', 's'),
+        '((ref is map)&&(ref.keys().size()>=0))'
+      );
+    });
+
+    it('supports "maxProperties"', () => {
+      assert.equal(
+        compileObject({ type: 'object', maxProperties: 0 }, 'ref', 's'),
+        '((ref is map)&&(ref.keys().size()<=0))'
+      );
+    });
+
     it('supports "required"', () => {
       assert.equal(
         compileObject({ type: 'object', properties: { a: { type: 'boolean' }}, required: ['a']}, 'ref', 's'),