@coderich/autograph 0.13.9 → 0.13.11

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@coderich/autograph",
   "main": "index.js",
-  "version": "0.13.9",
+  "version": "0.13.11",
   "publishConfig": {
     "access": "public"
   },
@@ -15,7 +15,7 @@
     "dev": "coderich-dev"
   },
   "dependencies": {
-    "@coderich/util": "0.1.4",
+    "@coderich/util": "0.1.11",
     "@graphql-tools/merge": "9.0.0",
     "@graphql-tools/resolvers-composition": "7.0.0",
     "@hapi/boom": "10.0.1",
@@ -36,7 +36,7 @@
     "@coderich/dev": "0.1.0",
     "@graphql-tools/schema": "10.0.0",
     "graphql": "16.6.0",
-    "mongodb": "5.7.0",
+    "mongodb": "5.9.2",
     "mongodb-memory-server": "8.13.0",
     "validator": "13.9.0"
   },

package/src/data/Resolver.js

@@ -76,12 +76,15 @@ module.exports = class Resolver {
     });
   }
 
+  /**
+   * Execute a user-defined loader (curry in context)
+   */
   loader(name) {
     const context = this.#context;
 
     return new Proxy(loaders[name], {
       get(loader, fn, proxy) {
-        if (fn === 'load') return args => loader.load(args, context);
+        if (fn.startsWith('load')) return args => loader[fn](args, context);
         return Reflect.get(loader, fn, proxy);
       },
     });

package/src/query/Query.js

@@ -64,7 +64,7 @@ module.exports = class Query {
   transform() {
     return Promise.all([
       this.pipeline('input', this.#query.input),
-      this.#query.isNative ? this.#query.where : this.pipeline('where', this.#query.where),
+      this.#query.isNative ? this.#query.where : this.pipeline('where', this.#query.where ?? {}),
       this.pipeline('sort', this.#query.sort),
     ]).then(([input, where, sort]) => this.clone({ input, where, sort }));
   }

package/src/schema/Schema.js

@@ -29,8 +29,18 @@ module.exports = class Schema {
     this.#config.directives.field ??= 'field';
     this.#config.directives.link ??= 'link';
     this.#config.directives.index ??= 'index';
-    // this.#typeDefs = Schema.#framework(this.#config.directives);
+    this.#typeDefs = Schema.#framework(this.#config.directives);
+  }
+
+  /* ****** DEPRECATE! ****** */
+  getModels() {
+    return this.#schema.models;
+  }
+
+  getModel(name) {
+    return this.#schema.models[`${name}`];
   }
+  /* ***************** */
 
   /**
    * Decorate each marked @model with config-driven field decorators
@@ -106,6 +116,9 @@ module.exports = class Schema {
     let model, field, isField, isList;
     const thunks = [];
 
+    // Deprecate
+    this.#schema.getModel = name => this.#schema.models[`${name}`];
+
     // Parse AST
     visit(this.#typeDefs, {
       enter: (node) => {
@@ -119,9 +132,9 @@ module.exports = class Schema {
             name,
             key: name,
             fields: {},
-            idField: 'id',
             crud: 'crud',
             scope: 'crud',
+            idField: 'id',
             isPersistable: true,
             source: this.#config.dataSources?.default,
             loader: this.#config.dataLoaders?.default,
@@ -209,6 +222,14 @@ module.exports = class Schema {
                 target[key] = value;
                 break;
               }
+
+              // Backwards compat (deprecated)
+              case 'model-gqlScope': { model.crud = value; break; }
+              case 'model-fieldScope': { model.scope = value; break; }
+              case 'field-gqlScope': { field.crud = value; break; }
+              case 'field-fieldScope': { field.scope = value; break; }
+
+              // Pipelines
               default: {
                 if (pipelines.includes(key)) {
                   target.pipelines[key] = target.pipelines[key].concat(value).filter(Boolean);