@coderich/autograph 0.13.41 → 0.13.42

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@coderich/autograph",
   "main": "index.js",
-  "version": "0.13.41",
+  "version": "0.13.42",
   "publishConfig": {
     "access": "public"
   },

package/src/data/DataLoader.js

@@ -50,6 +50,11 @@ module.exports = class Loader {
           const values = Array.from(new Set(batches.map(batch => batch.values).flat()));
           const $query = { ...batches[0].$query, op: 'findMany', where: { [key]: values } };
 
+          //
+          if (values.length < 3) {
+            return batches.map(batch => this.#model.source.client.resolve(batch.$query).then(data => ({ data, ...batch })));
+          }
+
           // Collect all the $values (Regular Expressions) to match doc (result) data by
           const $values = Array.from(new Set(batches.map(batch => batch.$values).flat()));
           const docsByRegExpKey = $values.reduce((map, re) => map.set(re, []), new Map());

package/src/data/Resolver.js

@@ -205,7 +205,22 @@ module.exports = class Resolver {
         return this.toResultSet(model, results);
       });
     } else {
-      thunk = tquery => this.#dataLoaders[model].resolve(tquery);
+      thunk = (tquery) => {
+        const { where, op } = query.toObject();
+        const values = Object.values(where);
+        const $values = values.flat();
+        const skipQuery = values.length && (!$values.length || $values.includes(undefined));
+
+        if (skipQuery) {
+          switch (op) {
+            case 'count': return Promise.resolve(0);
+            case 'findMany': return Promise.resolve([]);
+            default: return Promise.resolve(null);
+          }
+        }
+
+        return this.#dataLoaders[model].resolve(tquery);
+      };
     }
 
     return this.#createSystemEvent(query, (tquery) => {