@coderich/autograph 0.13.22 → 0.13.23

package/package.json

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

package/src/data/Resolver.js

@@ -229,7 +229,7 @@ module.exports = class Resolver {
                 return (...args) => {
                   switch (cmd) {
                     case 'save': {
-                      return queryResolver.save({ ...$doc, ...args[0] });
+                      return queryResolver.save({ ...$doc, ...args[0] }); // $doc incase it's mutated
                     }
                     case 'lookup': {
                       const field = self.toModel(model).fields[args[0]];

package/src/query/Query.js

@@ -1,6 +1,6 @@
 const Util = require('@coderich/util');
 const Pipeline = require('../data/Pipeline');
-const { isGlob, globToRegex, mergeDeep, finalizeWhereClause } = require('../service/AppService');
+const { isGlob, globToRegex, mergeDeep, finalizeWhereClause, JSONParse } = require('../service/AppService');
 
 module.exports = class Query {
   #config;
@@ -82,8 +82,8 @@ module.exports = class Query {
       input: this.#model.walk(input, node => node.value !== undefined && Object.assign(node, { key: node.field.key })),
       where: isNative ? where : this.#model.walk(where, node => Object.assign(node, { key: node.field.key })),
       sort: this.#model.walk(sort, node => Object.assign(node, { key: node.field.key })),
-      before: (!isCursorPaging || !before) ? undefined : JSON.parse(Buffer.from(before, 'base64').toString('ascii')),
-      after: (!isCursorPaging || !after) ? undefined : JSON.parse(Buffer.from(after, 'base64').toString('ascii')),
+      before: (!isCursorPaging || !before) ? undefined : JSONParse(Buffer.from(before, 'base64').toString('ascii')),
+      after: (!isCursorPaging || !after) ? undefined : JSONParse(Buffer.from(after, 'base64').toString('ascii')),
       $schema: this.#schema.resolvePath,
     });
 

package/src/query/QueryBuilder.js

@@ -68,7 +68,7 @@ module.exports = class QueryBuilder {
   }
 
   info(info) {
-    this.select(getGQLSelectFields(this.#query.model, info));
+    // this.select(getGQLSelectFields(this.#query.model, info));
     return this;
   }
 
@@ -82,7 +82,7 @@ module.exports = class QueryBuilder {
   }
 
   where(clause) {
-    this.#propCheck('where', 'native', false);
+    this.#propCheck('where', 'native', false); // Allow redefine of "where" because we merge it
     const $clause = mergeDeep(this.#query.where || {}, clause);
     this.#query.where = $clause;
     this.#query.args.where = $clause;

package/src/schema/Schema.js

@@ -589,7 +589,7 @@ module.exports = class Schema {
             }
             ${connectionFields.length ? `
               extend type ${model} {
-                ${connectionFields.map(field => `${field}: ${field.model}Connection`)}
+                ${connectionFields.map(field => `${field}(${Schema.#getConnectionArguments(field.model)}): ${field.model}Connection`)}
               }
             ` : ''}
           `;
@@ -619,16 +619,7 @@ module.exports = class Schema {
           node(id: ID!): Node
           ${queryModels.map(model => `
             get${model}(id: ID!): ${model}
-            find${model}(
-              where: ${model}InputWhere
-              sortBy: ${model}InputSort
-              limit: Int
-              skip: Int
-              first: Int
-              after: String
-              last: Int
-              before: String
-            ): ${model}Connection!
+            find${model}(${Schema.#getConnectionArguments(model)}): ${model}Connection!
           `)}
         }
 
@@ -713,13 +704,7 @@ module.exports = class Schema {
         Query: queryModels.reduce((prev, model) => {
           return Object.assign(prev, {
             [`get${model}`]: (doc, args, context, info) => context[schema.namespace].resolver.match(model).args(args).info(info).one({ required: true }),
-            [`find${model}`]: (doc, args, context, info) => {
-              return {
-                edges: () => context[schema.namespace].resolver.match(model).args(args).info(info).many(),
-                count: () => context[schema.namespace].resolver.match(model).args(args).info(info).count(),
-                pageInfo: () => context[schema.namespace].resolver.match(model).args(args).info(info).many(),
-              };
-            },
+            [`find${model}`]: (doc, args, context, info) => context[schema.namespace].resolver.match(model).args(args).info(info).resolve(info),
           });
         }, {
           node: (doc, args, context, info) => {
@@ -746,7 +731,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) => {
-                  return context[schema.namespace].resolver.match(field.model).where({ [field.linkBy]: doc[field.linkField.name] }).args(args).info(info).resolve(info);
+                  return doc.$.lookup(field).args(args).info(info).resolve(info);
                 },
               });
             }, {}),
@@ -767,6 +752,19 @@ module.exports = class Schema {
     return type;
   }
 
+  static #getConnectionArguments(model) {
+    return `
+      where: ${model}InputWhere
+      sortBy: ${model}InputSort
+      limit: Int
+      skip: Int
+      first: Int
+      after: String
+      last: Int
+      before: String
+    `;
+  }
+
   static #identifyOnDeletes(models, parentName) {
     return models.reduce((prev, model) => {
       Object.values(model.fields).filter(f => f.onDelete).forEach((field) => {

package/src/service/AppService.js

@@ -43,3 +43,12 @@ exports.getGQLSelectFields = (model, info) => {
 //     return value === undefined ? prev : Object.assign(prev, { [key]: value });
 //   }, {}));
 // };
+
+exports.JSONParse = (mixed) => {
+  try {
+    const json = JSON.parse(mixed);
+    return json;
+  } catch (e) {
+    return undefined;
+  }
+};