@coderich/autograph 0.13.2 → 0.13.4

package/package.json

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

package/src/data/Resolver.js

@@ -48,7 +48,8 @@ module.exports = class Resolver {
   }
 
   raw(model) {
-    return this.toModel(model)?.source?.client?.driver(model);
+    model = this.toModel(model);
+    return model?.source?.client?.driver(model.key);
   }
 
   graphql(args) {

package/src/query/Query.js

@@ -32,6 +32,7 @@ module.exports = class Query {
   toCacheKey() {
     return {
       op: this.#query.op,
+      select: this.#query.select,
       where: this.#query.where,
       sort: this.#query.sort,
       joins: this.#query.joins,
@@ -76,7 +77,7 @@ module.exports = class Query {
 
     const query = this.clone({
       model: this.#model.key,
-      select: Object.values(this.#model.fields).map(field => field.key),
+      select: this.#query.select.map(name => this.#model.fields[name].key),
       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 })),

package/src/query/QueryBuilder.js

@@ -2,19 +2,21 @@ const Query = require('./Query');
 const { getGQLReturnType, getGQLSelectFields, mergeDeep } = require('../service/AppService');
 
 module.exports = class QueryBuilder {
-  #config;
   #query;
+  #config;
   #terminalCommands = ['one', 'many', 'count', 'save', 'delete', 'first', 'last', 'push', 'pull', 'splice'];
 
   constructor(config) {
-    const { query } = config;
+    const { schema, query } = config;
 
     this.#config = config;
+    const model = schema.models[query.model];
 
     this.#query = Object.defineProperties(query, {
       id: { writable: true, enumerable: true, value: query.id },
       args: { writable: true, enumerable: true, value: query.args || {} },
       flags: { writable: true, enumerable: true, value: query.flags || {} },
+      select: { writable: true, enumerable: true, value: query.select || Object.keys(model.fields) },
       options: { writable: true, enumerable: true, value: query.options || {} },
     });
 
@@ -41,8 +43,6 @@ module.exports = class QueryBuilder {
    * For use in GraphQL resolver methods to return the "correct" response
    */
   resolve(info) {
-    this.info(info);
-
     switch (getGQLReturnType(info)) {
       case 'array': return this.many();
       case 'number': return this.count();