@coderich/autograph 0.13.41 → 0.13.43

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@coderich/autograph",
   "main": "index.js",
-  "version": "0.13.41",
+  "version": "0.13.43",
   "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/Pipeline.js

@@ -62,6 +62,7 @@ module.exports = class Pipeline {
     Pipeline.define('$construct', params => Pipeline.resolve(params, 'construct'), { ignoreNull: false });
     Pipeline.define('$restruct', params => Pipeline.resolve(params, 'restruct'), { ignoreNull: false });
     Pipeline.define('$serialize', params => Pipeline.resolve(params, 'serialize'), { ignoreNull: false });
+    Pipeline.define('$deserialize', params => Pipeline.resolve(params, 'deserialize'), { ignoreNull: false });
     Pipeline.define('$validate', params => Pipeline.resolve(params, 'validate'), { ignoreNull: false });
 
     //

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) => {

package/src/schema/Schema.js

@@ -16,7 +16,7 @@ const scalarKinds = [Kind.SCALAR_TYPE_DEFINITION, Kind.SCALAR_TYPE_EXTENSION];
 const fieldKinds = [Kind.FIELD_DEFINITION];
 const modelKinds = [Kind.OBJECT_TYPE_DEFINITION, Kind.OBJECT_TYPE_EXTENSION].concat(interfaceKinds);
 const allowedKinds = modelKinds.concat(fieldKinds).concat(Kind.DOCUMENT, Kind.NON_NULL_TYPE, Kind.NAMED_TYPE, Kind.LIST_TYPE, Kind.DIRECTIVE).concat(scalarKinds).concat(enumKinds);
-const pipelines = ['validate', 'construct', 'restruct', 'instruct', 'normalize', 'serialize'];
+const pipelines = ['validate', 'construct', 'restruct', 'instruct', 'normalize', 'serialize', 'deserialize'];
 const inputPipelines = ['validate', 'construct', 'instruct', 'normalize', 'serialize'];
 const scalars = ['ID', 'String', 'Float', 'Int', 'Boolean'];
 
@@ -418,7 +418,12 @@ module.exports = class Schema {
 
             $model.transformers.doc.config({
               shape: Object.values($model.fields).reduce((prev, curr) => {
-                const rules = [curr.name]; // Rename key
+                const args = { model: $model, field: curr };
+
+                const rules = [
+                  curr.name, // Rename key
+                  a => Pipeline.$deserialize({ ...a, ...args, path: a.path.concat(curr.name) }),
+                ];
                 if (curr.isArray) rules.unshift(({ value }) => (value == null ? value : Util.ensureArray(value)));
                 if (curr.isEmbedded) rules.unshift(({ value }) => Util.map(value, v => curr.model.transformers.doc.transform(v)));
                 return Object.assign(prev, { [curr.key]: rules });
@@ -623,6 +628,7 @@ module.exports = class Schema {
         construct: [AutoGraphPipelineEnum!]
         restruct: [AutoGraphPipelineEnum!]
         serialize: [AutoGraphPipelineEnum!]
+        deserialize: [AutoGraphPipelineEnum!]
         validate: [AutoGraphPipelineEnum!]
 
         # TEMP TO APPEASE TRANSITION
@@ -630,7 +636,6 @@ module.exports = class Schema {
         gqlScope: AutoGraphMixed # Dictate how GraphQL API behaves
         dalScope: AutoGraphMixed # Dictate how the DAL behaves
         transform: [AutoGraphPipelineEnum!]
-        deserialize: [AutoGraphPipelineEnum!]
       ) on FIELD_DEFINITION | INPUT_FIELD_DEFINITION | SCALAR
 
       directive @${link}(