@coderich/autograph 0.10.3 → 0.10.4

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@coderich/autograph",
   "author": "Richard Livolsi (coderich)",
-  "version": "0.10.3",
+  "version": "0.10.4",
   "description": "AutoGraph",
   "keywords": [
     "graphql",
@@ -23,7 +23,7 @@
   },
   "scripts": {
     "start": "APP_ROOT_PATH=$(pwd) node ./test/server",
-    "test": "APP_ROOT_PATH=$(pwd) ratchet test --forceExit",
+    "test": "APP_ROOT_PATH=$(pwd) ratchet test",
     "test:debug": "APP_ROOT_PATH=$(pwd) node --inspect-brk ./node_modules/jest/bin/jest.js --watch --runInBand --logHeapUsage",
     "lint": "APP_ROOT_PATH=$(pwd) ratchet lint",
     "inspect": "APP_ROOT_PATH=$(pwd) node --expose-gc --inspect=9222 ./src/server",

package/src/core/Schema.js

@@ -37,10 +37,18 @@ module.exports = class extends Schema {
     });
   }
 
+  disconnect() {
+    return Promise.all(Object.values(this.drivers).map(({ dao }) => dao.disconnect()));
+  }
+
   initialize() {
     super.initialize();
     this.models = super.getModels().map(model => new Model(this, model, this.drivers[model.getDriverName()]));
-    this.models.forEach(model => model.initialize());
+    return this;
+  }
+
+  finalize() {
+    super.finalize();
     this.models.forEach(model => model.referentialIntegrity(identifyOnDeletes(this.models, model)));
     return this;
   }

package/src/data/DataLoader.js

@@ -42,8 +42,6 @@ module.exports = class DataLoader extends FBDataLoader {
        */
       const whereShape = model.getShape('create', 'where');
 
-      // console.log(Object.entries(batchQueries).map(([key, value]) => ({ [key]: value.length })));
-
       return Promise.all(Object.entries(batchQueries).map(([key, values]) => {
         switch (key) {
           case defaultBatchName: {
@@ -52,7 +50,7 @@ module.exports = class DataLoader extends FBDataLoader {
           default: {
             const keys = Array.from(new Set(values.map(({ where }) => map(where[key], el => `${el}`)).flat()));
             const batchQuery = new Query({ resolver, model, method: 'findMany', crud: 'read' });
-            const batchWhere = model.shapeObject(whereShape, { [key]: keys }, batchQuery); // This will add back instructs etc
+            const batchWhere = model.shapeObject(whereShape, { ...values[0].where, [key]: keys }, batchQuery); // All where's should be the same - this is for idKey on keys etc
 
             return driver.resolve(batchQuery.where(batchWhere).toDriver()).then(data => handleData(data, model, batchQuery)).then((results) => {
               // One-time data transformation on results to make matching back faster (below)

package/src/data/Model.js

@@ -73,6 +73,7 @@ module.exports = class extends Model {
     const serdes = crud === 'read' ? 'deserialize' : 'serialize';
     const fields = serdes === 'deserialize' ? this.getSelectFields() : this.getPersistableFields();
     const crudMap = { create: ['constructs'], update: ['restructs'], delete: ['destructs'], remove: ['destructs'] };
+    const sortKeys = ['isIdField', 'isBasicType', 'isEmbedded'];
     const crudKeys = crudMap[crud] || [];
 
     // Define target mapping
@@ -82,10 +83,29 @@ module.exports = class extends Model {
       // input: ['defaultValue', 'castValue', 'ensureArrayValue'],
       where: ['castValue', 'instructs', `$${serdes}rs`],
     };
+
     const structureKeys = targetMap[target] || ['castValue'];
 
-    // Create shape, recursive
-    const shape = fields.map((field) => {
+    // Create sorted shape, recursive
+    const shape = fields.sort((a, b) => {
+      const aObject = a.toObject();
+      const bObject = b.toObject();
+
+      // PK first
+      if (aObject.isPrimaryKeyId) return -1;
+      if (bObject.isPrimaryKeyId) return 1;
+
+      // Arrays last
+      if (aObject.isArray && !bObject.isArray) return 1;
+      if (bObject.isArray && !aObject.isArray) return -1;
+
+      // Now, follow sort keys
+      const aNum = sortKeys.findIndex(key => aObject[key]);
+      const bNum = sortKeys.findIndex(key => bObject[key]);
+      if (aNum < bNum) return -1;
+      if (aNum > bNum) return 1;
+      return 0;
+    }).map((field) => {
       let instructed = false;
       const structures = field.getStructures();
       const { key, name, type, isArray, isEmbedded, modelRef } = field.toObject();
@@ -95,7 +115,6 @@ module.exports = class extends Model {
       const subCrud = crud === 'update' && isArray ? 'create' : crud; // Due to limitation to update embedded array
       const subShape = isEmbedded ? modelRef.getShape(subCrud, target, path) : null;
       const transformers = structureKeys.reduce((prev, struct) => {
-        if (instructed) return prev;
         const structs = structures[struct];
         if (struct === 'instructs' && structs.length) instructed = true;
         return prev.concat(structs);
@@ -172,7 +191,11 @@ module.exports = class extends Model {
       return Promise.all(shape.map(({ field, from, path, validators, shape: subShape }) => {
         const value = parent[from]; // It hasn't been shaped yet
 
-        return Promise.all(validators.map(v => v({ model, field, path, docPath, rootPath, parentPath, startValue: value, value, resolver, context }))).then(() => {
+        return Promise.all(validators.map((v) => {
+          return new Promise((resolve, reject) => {
+            return Promise.resolve(v({ model, field, path, docPath, rootPath, parentPath, startValue: value, value, resolver, context })).then(resolve).catch(reject);
+          });
+        })).then(() => {
           return subShape ? this.validateObject(subShape, value, query, root, true) : Promise.resolve();
         });
       }));

package/src/driver/MongoDriver.js

@@ -64,15 +64,12 @@ module.exports = class MongoDriver {
   }
 
   createOne({ model, input, options, flags }) {
+    // console.log(JSON.stringify(input, null, 2));
     return this.query(model, 'insertOne', input, options, flags).then(result => Object.assign(input, { id: result.insertedId }));
   }
 
   updateOne({ model, where, $doc, options, flags }) {
-    const $update = Object.entries($doc).reduce((prev, [key, value]) => {
-      Object.assign(prev.$set, { [key]: value });
-      return prev;
-    }, { $set: {} });
-
+    const $update = { $set: $doc };
     return this.query(model, 'updateOne', where, $update, options, flags).then(() => $doc);
   }
 

package/src/graphql/ast/Field.js

@@ -173,7 +173,7 @@ module.exports = class Field extends Node {
     return this.getGQLType();
   }
 
-  initialize() {
+  finalize() {
     this.props = {
       key: this.getKey(),
       name: this.getName(),
@@ -181,11 +181,13 @@ module.exports = class Field extends Node {
       model: this.model,
       datatype: this.getDataType(),
       defaultValue: this.getDefaultValue(),
+      isEnum: this.isEnum(),
       isArray: this.isArray(),
       isScalar: this.isScalar(),
       isVirtual: this.isVirtual(),
       isRequired: this.isRequired(),
       isEmbedded: this.isEmbedded(),
+      isBasicType: this.isBasicType(),
       isIdField: this.isIdField(),
       isPrimaryKeyId: this.isPrimaryKeyId(),
       isPersistable: this.isPersistable(),

package/src/graphql/ast/Model.js

@@ -138,8 +138,8 @@ module.exports = class Model extends Node {
     });
   }
 
-  initialize() {
-    this.fields.forEach(field => field.initialize());
+  finalize() {
+    this.fields.forEach(field => field.finalize());
     return this;
   }
 };

package/src/graphql/ast/Schema.js

@@ -90,7 +90,6 @@ module.exports = class Schema extends TypeDefApi {
    */
   initialize() {
     super.initialize(this.schema.typeDefs);
-    this.getModels().forEach(model => model.initialize());
     return this;
   }
 
@@ -119,8 +118,8 @@ module.exports = class Schema extends TypeDefApi {
       },
     });
 
+    this.getModels().forEach(model => model.finalize());
     this.schema.typeDefs = { kind: Kind.DOCUMENT, definitions };
-    // validateSchema(this.schema);
     return this;
   }
 

package/src/query/QueryBuilder.js

@@ -10,6 +10,7 @@ const { unravelObject } = require('../service/app.service');
 */
 module.exports = class QueryBuilder {
   constructor(resolver, model) {
+    this.terminated = false; // Prevent accidental re-use of the QueryBuilder
     this.query = new Query({ model, resolver });
 
     // Chainable commands
@@ -57,6 +58,10 @@ module.exports = class QueryBuilder {
   }
 
   execute(cmd, args) {
+    // Do not allow re-use
+    if (this.terminated) return Promise.reject(new Error('This query has already been executed'));
+
+    this.terminated = true;
     let method, crud, input, flags = {};
     const { id, where } = this.query.toObject();