@coderich/autograph 0.13.24 → 0.13.26

package/package.json

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

package/src/data/DataLoader.js

@@ -6,9 +6,11 @@ const { hashObject } = require('../service/AppService');
 module.exports = class Loader {
   #model;
   #loader;
+  #resolver;
 
-  constructor(model) {
+  constructor(model, resolver) {
     this.#model = model;
+    this.#resolver = resolver;
     model.loader.cacheKeyFn ??= (query => hashObject(query.toCacheKey()));
     this.#loader = new DataLoader(keys => this.#resolve(keys), model.loader);
   }
@@ -28,8 +30,8 @@ module.exports = class Loader {
 
       return this.#model.source.client.resolve($query).then((data) => {
         if (data == null) return null; // Explicit return null;
-        if ($query.isCursorPaging && Array.isArray(data)) return Loader.#paginateResults(data, query.toObject());
-        return data;
+        if ($query.isCursorPaging && Array.isArray(data)) data = Loader.#paginateResults(data, query.toObject());
+        return this.#resolver.toResultSet(this.#model, data);
       });
     }));
   }

package/src/data/Pipeline.js

@@ -19,16 +19,8 @@ module.exports = class Pipeline {
     const wrapper = Object.defineProperty((args) => {
       try {
         if (ignoreNull && args.value == null) return args.value;
-
-        if (ignoreNull && itemize) {
-          return Util.map(args.value, (value) => {
-            const v = factory({ ...args, value });
-            return v === undefined ? value : v;
-          });
-        }
-
-        const value = factory(args);
-        return value === undefined ? args.value : value;
+        if (ignoreNull && itemize) return Util.map(args.value, value => Util.uvl(factory({ ...args, value }), value));
+        return Util.uvl(factory(args), args.value);
       } catch (e) {
         const { data = {} } = e;
         throw Boom.boomify(e, { data: { ...args, ...data } });
@@ -168,7 +160,7 @@ module.exports = class Pipeline {
   static resolve(params, pipeline) {
     const transformers = params.field.pipelines[pipeline] || [];
 
-    return Util.pipeline(transformers.map(t => async (value) => {
+    return Util.pipeline(transformers.map(t => (value) => {
       return Pipeline[t]({ ...params, value });
     }), params.value);
   }

package/src/data/Resolver.js

@@ -1,6 +1,7 @@
 const { graphql } = require('graphql');
 const Boom = require('@hapi/boom');
 const Util = require('@coderich/util');
+const Pipeline = require('./Pipeline');
 const Emitter = require('./Emitter');
 const Loader = require('./Loader');
 const DataLoader = require('./DataLoader');
@@ -189,11 +190,13 @@ module.exports = class Resolver {
    */
   async resolve(query) {
     let thunk;
-    const { model, doc, crud, isMutation, flags } = query.toObject();
+    const { model, crud, isMutation, flags } = query.toObject();
     const currSession = this.#sessions.slice(-1).pop();
 
     if (isMutation) {
       thunk = tquery => this.#schema.models[model].source.client.resolve(tquery.toDriver().toObject()).then((results) => {
+        const { doc, input } = tquery.toObject();
+
         // We clear the cache immediately (regardless if we're in transaction or not)
         this.clear(model);
 
@@ -201,7 +204,9 @@ module.exports = class Resolver {
         currSession?.thunks.push(...this.#sessions.map(s => () => s.parent.clear(model)));
 
         // Return results
-        return crud === 'delete' ? doc : results;
+        if (crud === 'delete') return doc;
+        if (crud === 'update') return input;
+        return this.toResultSet(model, results);
       });
     } else {
       thunk = tquery => this.#dataLoaders[model].resolve(tquery);
@@ -210,7 +215,7 @@ module.exports = class Resolver {
     return this.#createSystemEvent(query, (tquery) => {
       return thunk(tquery).then((result) => {
         if (flags?.required && (result == null || result?.length === 0)) throw Boom.notFound();
-        return crud === 'delete' ? result : this.toResultSet(model, result);
+        return result;
       });
     });
   }
@@ -220,7 +225,15 @@ module.exports = class Resolver {
     if (result == null) return result;
     if (typeof result !== 'object') return result;
     return Object.defineProperties(Util.map(result, (doc) => {
-      const $doc = this.#schema.models[model].walk(doc, node => node.value !== undefined && Object.assign(node, { key: node.field.name }), { key: 'key' });
+      // Transform result to domain model
+      const $doc = this.#schema.models[model].walk(doc, (node) => {
+        if (node.value === undefined) return undefined;
+        if (node.value != null && node.field.isArray) node.value = Util.ensureArray(node.value);
+        node.key = node.field.name;
+        return node;
+      }, { key: 'key' });
+
+      // Assign useful/needed meta data
       return Object.defineProperties($doc, {
         $: {
           get: () => {
@@ -262,7 +275,7 @@ module.exports = class Resolver {
     return Object.entries(this.#schema.models).filter(([key, value]) => {
       return value.loader && value.isEntity;
     }).reduce((prev, [key, value]) => {
-      return Object.assign(prev, { [key]: new DataLoader(value) });
+      return Object.assign(prev, { [key]: new DataLoader(value, this) });
     }, {});
   }
 
@@ -283,11 +296,12 @@ module.exports = class Resolver {
       // if (query.crud === 'update' && Util.isEqual({ added: {}, updated: {}, deleted: {} }, Util.changeset(query.doc, query.input))) return query.doc;
       const tquery = await $query.transform();
       // await Emitter.emit('validate', event); // We need to re-connect tquery to event
-      return thunk(tquery).then((result) => {
-        event.result = result; // backwards compat
-        query.result = result;
-        return Emitter.emit(`post${type}`, event);
-      });
+      return thunk(tquery);
+    }).then((result) => {
+      event.doc ??= result; // Case of create
+      event.result = result; // backwards compat
+      query.result = result;
+      return Emitter.emit(`post${type}`, event);
     }).then((result = query.result) => result).catch((e) => {
       const { data = {} } = e;
       throw Boom.boomify(e, { data: { ...event, ...data } });