Merge branch 'fix/extend-is-empty-operator' into 'master'

fix: validate empty objects as well

See merge request auto-cloud/cloudgraph/sdk!56

Author: tyler-dunkel

src/rules-engine/operators/array.ts

@@ -4,13 +4,4 @@ export default {
   notIn: (a, b) => (Array.isArray(b) ? b.indexOf(a) === -1 : false),
   contains: (a, b) => (Array.isArray(a) ? a.indexOf(b) > -1 : false),
   doesNotContain: (a, b) => (Array.isArray(a) ? a.indexOf(b) === -1 : false),
-  isEmpty: (data, shouldBeEmpty) => {
-    if (Array.isArray(data)) {
-      // Verify empty/filled arrays
-      const array = (data || []).length
-      return shouldBeEmpty ? array === 0 : array > 0
-    }
-
-    return false
-  },
 }

src/rules-engine/operators/common.ts

@@ -0,0 +1,18 @@
+// Common Operators
+export default {
+  isEmpty: (data, shouldBeEmpty) => {
+    if (Array.isArray(data)) {
+      // Verify empty/filled arrays
+      const array = (data || []).length
+      return shouldBeEmpty ? array === 0 : array > 0
+    }
+
+    // Verify empty/filled objects
+    if (typeof data === 'object') {
+      const hasKeys = Object.keys(data).length
+      return shouldBeEmpty ? hasKeys === 0 : hasKeys > 0
+    }
+
+    return false
+  },
+}

src/rules-engine/operators/index.ts

@@ -1,13 +1,15 @@
 import { Operator } from '../types'
 
 import arrayOperators from './array'
+import commonOperators from './common'
 import comparisonOperators from './comparison'
 import dateOperators from './date'
 import regexOperators from './regex'
 
 export default {
-  ...comparisonOperators,
   ...arrayOperators,
+  ...comparisonOperators,
+  ...commonOperators,
   ...dateOperators,
   ...regexOperators,
 } as { [key: string]: Operator }

tests/operators/array.test.ts

@@ -1,21 +1,6 @@
 import ArrayOperators from '../../src/rules-engine/operators/array'
 
 describe('Array Operators', () => {
-  describe('isEmpty Operator', () => {
-    test('Should pass given an empty array', () => {
-      expect(ArrayOperators.isEmpty([], true)).toBeTruthy()
-    })
-    test('Should fail given an empty array', () => {
-      expect(ArrayOperators.isEmpty([], false)).toBeFalsy()
-    })
-    test('Should pass given a filled array', () => {
-      expect(ArrayOperators.isEmpty(['filled'], true)).toBeFalsy()
-    })
-    test('Should fail given a filled array', () => {
-      expect(ArrayOperators.isEmpty(['filled'], false)).toBeTruthy()
-    })
-  })
-
   describe('In Operator', () => {
     test('Should pass given a filled array with the searched element', () => {
       expect(ArrayOperators.in('rule', ['rule'])).toBeTruthy()

tests/operators/common.test.ts

@@ -0,0 +1,30 @@
+import CommonOperators from '../../src/rules-engine/operators/common'
+
+describe('Common Operators', () => {
+  describe('isEmpty Operator', () => {
+    test('Should pass given an empty array', () => {
+      expect(CommonOperators.isEmpty([], true)).toBeTruthy()
+    })
+    test('Should fail given an empty array', () => {
+      expect(CommonOperators.isEmpty([], false)).toBeFalsy()
+    })
+    test('Should pass given a filled array', () => {
+      expect(CommonOperators.isEmpty(['filled'], true)).toBeFalsy()
+    })
+    test('Should fail given a filled array', () => {
+      expect(CommonOperators.isEmpty(['filled'], false)).toBeTruthy()
+    })
+    test('Should pass given a filled object', () => {
+      expect(CommonOperators.isEmpty({ key: 'one' }, false)).toBeTruthy()
+    })
+    test('Should fail given a empty object', () => {
+      expect(CommonOperators.isEmpty({}, false)).toBeFalsy()
+    })
+    test('Should pass given a empty object', () => {
+      expect(CommonOperators.isEmpty({}, true)).toBeTruthy()
+    })
+    test('Should fail given a filled object', () => {
+      expect(CommonOperators.isEmpty({ key: 'one' }, true)).toBeFalsy()
+    })
+  })
+})