@coderich/autograph 0.13.26 → 0.13.27

package/package.json

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

package/src/data/Resolver.js

@@ -190,13 +190,11 @@ module.exports = class Resolver {
    */
   async resolve(query) {
     let thunk;
-    const { model, crud, isMutation, flags } = query.toObject();
+    const { doc, 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);
 
@@ -205,7 +203,6 @@ module.exports = class Resolver {
 
         // Return results
         if (crud === 'delete') return doc;
-        if (crud === 'update') return input;
         return this.toResultSet(model, results);
       });
     } else {
@@ -261,6 +258,15 @@ module.exports = class Resolver {
         },
         $model: { value: model },
         $cursor: { value: doc.$cursor },
+        // Backwards compat
+        $save: { value: (...args) => $doc.$.save(...args) },
+        $lookup: {
+          value: async (prop, args) => {
+            const field = model.fields[prop];
+            const method = field.isArray ? 'many' : 'one';
+            return $doc.$.lookup(prop).args(args)[method]();
+          },
+        },
       });
     }), {
       $pageInfo: { value: result.$pageInfo },

package/src/query/QueryResolver.js

@@ -34,7 +34,7 @@ module.exports = class QueryResolver extends QueryBuilder {
       }
       case 'updateOne': {
         return this.#get(query).then((doc) => {
-          const merged = mergeDeep({}, Util.unflatten(doc, { safe: true }), Util.unflatten(input, { safe: true }));
+          const merged = mergeDeep({}, doc, Util.unflatten(input, { safe: true }));
           return this.#resolver.resolve(query.clone({ doc, input: merged }));
         });
       }

package/src/schema/Schema.js

@@ -164,13 +164,15 @@ module.exports = class Schema {
         }
 
         if (enumKinds.includes(node.kind)) {
+          const values = Schema.#resolveNodeValue(node);
+
           target = this.#schema.enums[name] = {
+            values,
             directives: {},
             pipelines: pipelines.reduce((prev, key) => Object.assign(prev, { [key]: [] }), {}),
           };
 
           // Define (and assign) an Allow pipeline for the enumeration
-          const values = Schema.#resolveNodeValue(node);
           Pipeline.define(name, Pipeline.Allow(...values), { configurable: true });
           target.pipelines.finalize.push(name);
         }
@@ -360,7 +362,10 @@ module.exports = class Schema {
             // Merge Enums and Scalar type definitions
             const enumer = this.#schema.enums[$field.type];
             const scalar = this.#schema.scalars[$field.type];
-            if (enumer) Object.entries(enumer.pipelines).forEach(([key, values]) => $field.pipelines[key].push(...values));
+            if (enumer) {
+              $field.allows = enumer.values;
+              Object.entries(enumer.pipelines).forEach(([key, values]) => $field.pipelines[key].push(...values));
+            }
             if (scalar) Object.entries(scalar.pipelines).forEach(([key, values]) => $field.pipelines[key].push(...values));
 
             if ($field.isArray) $field.pipelines.normalize.unshift('toArray');
@@ -745,6 +750,7 @@ module.exports = class Schema {
             [model]: Object.values(model.fields).filter(field => field.model?.isEntity).reduce((prev2, field) => {
               return Object.assign(prev2, {
                 [field]: (doc, args, context, info) => {
+                  if (!doc.$) doc = context[schema.namespace].resolver.toResultSet(model, doc); // Ensure resultSet
                   return doc.$.lookup(field).args(args).info(info).resolve(info);
                 },
               });