Remove variadic params from JS platforms for and/or queries

Author: abnegate

templates/deno/src/query.ts.twig

@@ -96,17 +96,9 @@ export class Query {
   static contains = (attribute: string, value: string | string[]): string =>
     new Query("contains", attribute, value).toString();
 
-  static or = (...queries: string[]) =>
-      new Query(
-        "or",
-        undefined,
-        queries.map((query) => JSON.parse(query))
-      ).toString();
-
-  static and = (...queries: string[]) =>
-      new Query(
-        "and",
-        undefined,
-        queries.map((query) => JSON.parse(query))
-      ).toString();
+  static or = (queries: string[]) =>
+      new Query("or", undefined, queries.map((query) => JSON.parse(query))).toString();
+
+  static and = (queries: string[]) =>
+      new Query("and", undefined, queries.map((query) => JSON.parse(query))).toString();
 }

templates/node/lib/query.js.twig

@@ -72,10 +72,10 @@ class Query {
   static contains = (attribute, value) =>
     new Query("contains", attribute, value).toString()
 
-  static or = (...queries) =>
+  static or = (queries) =>
     new Query("or", undefined, queries.map((query) => JSON.parse(query))).toString()
 
-  static and = (...queries) =>
+  static and = (queries) =>
     new Query("and", undefined, queries.map((query) => JSON.parse(query))).toString();
 }
 

templates/web/src/query.ts.twig

@@ -93,9 +93,9 @@ export class Query {
   static contains = (attribute: string, value: string | string[]): string =>
     new Query("contains", attribute, value).toString();
 
-  static or = (...queries: string[]) =>
+  static or = (queries: string[]) =>
     new Query("or", undefined, queries.map((query) => JSON.parse(query))).toString();
 
-  static and = (...queries: string[]) =>
+  static and = (queries: string[]) =>
     new Query("and", undefined, queries.map((query) => JSON.parse(query))).toString();
 }

tests/languages/deno/tests.ts

@@ -157,14 +157,14 @@ async function start() {
   console.log(Query.offset(20));
   console.log(Query.contains("title", "Spider"));
   console.log(Query.contains("labels", "first"));
-  console.log(Query.or(
+  console.log(Query.or([
     Query.equal("released", true),
     Query.lessThan("releasedYear", 1990)
-  ));
-  console.log(Query.and(
+  ]));
+  console.log(Query.and([
     Query.equal("released", false),
     Query.greaterThan("releasedYear", 2015)
-  ));
+  ]));
 
   // Permission & Role helper tests
   console.log(Permission.read(Role.any()));

tests/languages/node/test.js

@@ -122,14 +122,14 @@ async function start() {
     console.log(Query.offset(20));
     console.log(Query.contains("title", "Spider"));
     console.log(Query.contains("labels", "first"));
-    console.log(Query.or(
+    console.log(Query.or([
       Query.equal("released", true),
       Query.lessThan("releasedYear", 1990)
-    ));
-    console.log(Query.and(
+    ]));
+    console.log(Query.and([
         Query.equal("released", false),
         Query.greaterThan("releasedYear", 2015)
-    ));
+    ]));
 
     // Permission & Role helper tests
     console.log(Permission.read(Role.any()));

tests/languages/web/index.html

@@ -143,14 +143,14 @@
             console.log(Query.offset(20));
             console.log(Query.contains("title", "Spider"));
             console.log(Query.contains("labels", "first"));
-            console.log(Query.or(
+            console.log(Query.or([
                 Query.equal("released", true),
                 Query.lessThan("releasedYear", 1990)
-            ));
-            console.log(Query.and(
+            ]));
+            console.log(Query.and([
                 Query.equal("released", false),
                 Query.greaterThan("releasedYear", 2015)
-            ));
+            ]));
 
             // Permission & Role helper tests
             console.log(Permission.read(Role.any()));

tests/languages/web/node.js

@@ -98,14 +98,14 @@ async function start() {
     console.log(Query.offset(20));
     console.log(Query.contains("title", "Spider"));
     console.log(Query.contains("labels", "first"));
-    console.log(Query.or(
+    console.log(Query.or([
         Query.equal("released", true),
         Query.lessThan("releasedYear", 1990)
-    ));
-    console.log(Query.and(
+    ]));
+    console.log(Query.and([
         Query.equal("released", false),
         Query.greaterThan("releasedYear", 2015)
-    ));
+    ]));
 
     // Permission & Role helper tests
     console.log(Permission.read(Role.any()));