fix: argument checking

MikeIbberson · Mar 4, 2022 · 50ac4b9 · 50ac4b9
1 parent b219afa
commit 50ac4b9
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 17 deletions.
diff --git a/.github/workflows/nodejs.yml b/.github/workflows/nodejs.yml
@@ -5,20 +5,19 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        node-version: [8.x, 10.x, 12.x]
+        node-version: [12.x]
     steps:
-    - uses: actions/checkout@v1
-    - name: Use Node.js ${{ matrix.node-version }}
-      uses: actions/setup-node@v1
-      with:
-        node-version: ${{ matrix.node-version }}
-    - name: yarn install, lint and test
-      run: |
-        yarn install
-        yarn lint
-        yarn test
-    - name: Coveralls 
-      uses: coverallsapp/github-action@v1.0.1
-      with:
-        github-token: ${{ secrets.GITHUB_TOKEN }}
-
+      - uses: actions/checkout@v1
+      - name: Use Node.js ${{ matrix.node-version }}
+        uses: actions/setup-node@v1
+        with:
+          node-version: ${{ matrix.node-version }}
+      - name: yarn install, lint and test
+        run: |
+          yarn install
+          yarn lint
+          yarn test
+      - name: Coveralls
+        uses: coverallsapp/github-action@v1.0.1
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
diff --git a/lib/__tests__/comparison.test.js b/lib/__tests__/comparison.test.js
@@ -264,4 +264,20 @@ describe('Comparison', () => {
       });
     });
   });
+
+  describe('isAcceptableParam', () => {
+    it('should accept', () => {
+      expect(Comparison.isAcceptableParam('foo')).toBeFalsy();
+      expect(Comparison.isAcceptableParam(['foo'])).toBeTruthy();
+      expect(
+        Comparison.isAcceptableParam(['foo', { operand: '$or' }]),
+      ).toBeTruthy();
+      expect(
+        Comparison.isAcceptableParam({ operand: '$or' }),
+      ).toBeTruthy();
+      expect(
+        Comparison.isAcceptableParam(['foo', ['bar']]),
+      ).toBeTruthy();
+    });
+  });
 });
diff --git a/lib/index.js b/lib/index.js
@@ -129,7 +129,10 @@ class Comparison {
 
   static isAcceptableParam(item) {
     return (
-      (Array.isArray(item) && item.every((rule) => isString(rule))) ||
+      (Array.isArray(item) &&
+        item.every(
+          (rule) => isString(rule) || this.isAcceptableParam(rule),
+        )) ||
       (isObject(item) && 'operand' in item)
     );
   }