@coderich/autograph 0.10.14 → 0.10.15

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@coderich/autograph",
   "author": "Richard Livolsi (coderich)",
-  "version": "0.10.14",
+  "version": "0.10.15",
   "description": "AutoGraph",
   "keywords": [
     "graphql",
@@ -30,11 +30,11 @@
     "ratchet": "ratchet"
   },
   "dependencies": {
+    "@coderich/util": "^0.1.0",
     "@hapi/boom": "^9.1.0",
     "dataloader": "^2.0.0",
     "deepmerge": "^4.2.2",
     "fill-range": "^7.0.1",
-    "flat": "^5.0.2",
     "glob": "^7.1.6",
     "graphql-fields": "^2.0.3",
     "lodash": "^4.17.21",

package/src/data/Model.js

@@ -1,4 +1,6 @@
 const Stream = require('stream');
+const { get } = require('lodash');
+const { flatten } = require('@coderich/util');
 const Field = require('./Field');
 const Model = require('../graphql/ast/Model');
 const { eventEmitter } = require('../service/event.service');
@@ -129,13 +131,14 @@ module.exports = class extends Model {
     shape.model = this;
     shape.serdes = serdes;
     shape.target = target;
+    // console.log(shape.modelRef);
 
     // Cache and return
     this.shapesCache.set(cacheKey, shape);
     return shape;
   }
 
-  shapeObject(shape, obj, query, root, base) {
+  shapeObject(shape, obj, query, root, base, toFlat = false) {
     const { serdes, model } = shape;
     const { context, resolver, doc = {}, flags = {} } = query.toObject();
     const { pipeline } = flags;
@@ -170,7 +173,13 @@ module.exports = class extends Model {
         if (!instructed && subShape && typeof transformedValue !== 'object') return prev;
 
         // Rename key & assign value
-        prev[to] = (!subShape || transformedValue == null) ? transformedValue : this.shapeObject(subShape, transformedValue, query, root, base);
+        prev[to] = (!subShape || transformedValue == null) ? transformedValue : this.shapeObject(subShape, transformedValue, query, root, base, toFlat);
+
+        if (toFlat && get(doc, to) && field.getModelRef()) {
+          const val = prev[to];
+          delete prev[to];
+          Object.assign(prev, flatten({ [to]: val }, { safe: true }));
+        }
 
         return prev;
       }, {});

package/src/driver/MongoDriver.js

@@ -1,6 +1,6 @@
 const Util = require('util');
-const Flat = require('flat');
 const { get } = require('lodash');
+const { unflatten } = require('@coderich/util');
 const { MongoClient, ObjectId } = require('mongodb');
 const { map, ensureArray, proxyDeep, toKeyObj, globToRegex, proxyPromise, isScalarDataType, promiseRetry } = require('../service/app.service');
 
@@ -71,8 +71,8 @@ module.exports = class MongoDriver {
   }
 
   updateOne({ model, where, $doc, options, flags }) {
-    const $update = { $set: Flat.flatten($doc, { safe: true }) };
-    return this.query(model, 'updateOne', where, $update, options, flags).then(() => $doc);
+    const $update = { $set: $doc };
+    return this.query(model, 'updateOne', where, $update, options, flags).then(() => unflatten($doc));
   }
 
   deleteOne({ model, where, options, flags }) {

package/src/query/QueryResolver.js

@@ -86,7 +86,8 @@ module.exports = class QueryResolver {
       return createSystemEvent('Mutation', { query: query.doc(doc).merged(merged) }, async () => {
         const payload = model.shapeObject(inputShape, merged, query);
         await model.validateObject(inputShape, payload, query.payload(payload));
-        return this.resolver.resolve(query.$doc(model.shapeObject(docShape, payload, query)));
+        const $doc = model.shapeObject(docShape, payload, query, undefined, undefined, true);
+        return this.resolver.resolve(query.$doc($doc));
       });
     });
   }