@coderich/autograph 0.13.51 → 0.13.53

package/package.json

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

package/src/data/Resolver.js

@@ -2,7 +2,6 @@ const { graphql } = require('graphql');
 const Boom = require('@hapi/boom');
 const Util = require('@coderich/util');
 const QueryResolver = require('../query/QueryResolver');
-const AppService = require('../service/AppService');
 const Emitter = require('./Emitter');
 const Loader = require('./Loader');
 const DataLoader = require('./DataLoader');
@@ -326,9 +325,9 @@ module.exports = class Resolver {
     Object.assign(event, query);
     query.match = query.where;
     query.toObject = () => query;
+    event.merged = event.input;
+    event.input = event.args?.input;
     event.doc ??= {};
-    event.input ??= {};
-    event.merged = AppService.mergeDeep(event.doc, event.input);
 
     return event;
   }

package/src/query/QueryResolver.js

@@ -1,6 +1,7 @@
 const get = require('lodash.get');
 const Util = require('@coderich/util');
 const QueryBuilder = require('./QueryBuilder');
+const { mergeDeep } = require('../service/AppService');
 
 module.exports = class QueryResolver extends QueryBuilder {
   #model;
@@ -33,7 +34,8 @@ module.exports = class QueryResolver extends QueryBuilder {
       }
       case 'updateOne': {
         return this.#get(query).then((doc) => {
-          return this.#resolver.resolve(query.clone({ doc }));
+          const merged = mergeDeep({}, doc, Util.unflatten(input, { safe: true })); // This is for backwards compat
+          return this.#resolver.resolve(query.clone({ doc, input: merged }));
         });
       }
       case 'updateMany': {

package/src/schema/Schema.js

@@ -564,7 +564,7 @@ module.exports = class Schema {
         const [modelKey, ...fieldKeys] = path.split('.');
         const $model = Object.values(this.#schema.models).find(el => el[prop] === modelKey);
         if (!$model || !fieldKeys.length) return $model;
-        return fieldKeys.reduce((parent, key) => Object.values(parent.fields || parent.model.fields).find(el => el[prop] === key) || parent, $model);
+        return fieldKeys.reduce((parent, key) => Object.values(parent.fields || parent.model?.fields || {}).find(el => el[prop] === key) || parent, $model);
       })();
       return resolvePathCache[path];
     };