@coderich/autograph 0.10.1 → 0.10.2

package/CHANGELOG.md

@@ -22,6 +22,7 @@
 - Exported SchemaDecorator -> Schema
 - Removed embedded schema SystemEvents (internal emitter also removed)
 - Removed spread of arguments in QueryBuilder terminal commands (must pass in array)
+- Must pass makeExecutableSchema to Schema constructor
 
 ## v0.9.x
 - Subscriptions API

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@coderich/autograph",
   "author": "Richard Livolsi (coderich)",
-  "version": "0.10.1",
+  "version": "0.10.2",
   "description": "AutoGraph",
   "keywords": [
     "graphql",
@@ -30,7 +30,6 @@
     "ratchet": "ratchet"
   },
   "dependencies": {
-    "@graphql-tools/schema": "^8.3.14",
     "@hapi/boom": "^9.1.0",
     "axios": "^0.21.4",
     "dataloader": "^2.0.0",
@@ -46,6 +45,7 @@
   },
   "devDependencies": {
     "@coderich/ratchet": "^1.5.7",
+    "@graphql-tools/schema": "^8.3.14",
     "graphql": "^15.5.0",
     "mongodb-memory-server": "^8.7.2",
     "neo4j-driver": "^4.0.0",
@@ -54,9 +54,6 @@
     "redis-mock": "^0.47.0",
     "validator": "^13.7.0"
   },
-  "peerDependencies": {
-    "graphql": "*"
-  },
   "repository": {
     "type": "git",
     "url": "git@github.com:coderich/autograph.git"

package/src/core/Schema.js

@@ -5,8 +5,8 @@ const { createSystemEvent } = require('../service/event.service');
 
 // Export class
 module.exports = class extends Schema {
-  constructor(schema, stores) {
-    super(schema);
+  constructor(schema, stores, toExecutableSchema) {
+    super(schema, toExecutableSchema);
 
     // Create drivers
     this.drivers = Object.entries(stores).reduce((prev, [key, value]) => {

package/src/graphql/ast/Schema.js

@@ -2,7 +2,7 @@ const FS = require('fs');
 const Glob = require('glob');
 const Merge = require('deepmerge');
 const { Kind, print, parse, visit } = require('graphql');
-const { mergeASTArray, makeExecutableSchema } = require('../../service/graphql.service');
+const { mergeASTArray } = require('../../service/graphql.service');
 const { deleteKeys } = require('../../service/app.service');
 const frameworkExt = require('../extension/framework');
 const typeExt = require('../extension/type');
@@ -24,8 +24,9 @@ const Node = require('./Node');
  *
  */
 module.exports = class Schema extends TypeDefApi {
-  constructor(schema) {
+  constructor(schema, toExecutableSchema) {
     super();
+    this.toExecutableSchema = toExecutableSchema;
     this.schema = { typeDefs: [], resolvers: {}, schemaDirectives: {} };
     if (schema) this.mergeSchema(schema);
   }
@@ -124,7 +125,7 @@ module.exports = class Schema extends TypeDefApi {
   }
 
   makeExecutableSchema() {
-    return makeExecutableSchema(this.schema);
+    return this.toExecutableSchema(this.schema);
   }
 
   toObject() {

package/src/service/app.service.js

@@ -105,32 +105,6 @@ exports.mapPromise = (mixed, fn) => {
   return Array.isArray(map) ? Promise.all(map) : Promise.resolve(map);
 };
 
-exports.castCmp = (type, value) => {
-  switch (type) {
-    case 'String': {
-      return `${value}`;
-    }
-    case 'Float': case 'Number': {
-      const num = Number(value);
-      if (!Number.isNaN(num)) return num;
-      return value;
-    }
-    case 'Int': {
-      const num = Number(value);
-      if (!Number.isNaN(num)) return parseInt(value, 10);
-      return value;
-    }
-    case 'Boolean': {
-      if (value === 'true') return true;
-      if (value === 'false') return false;
-      return value;
-    }
-    default: {
-      return value;
-    }
-  }
-};
-
 exports.objectContaining = (a, b) => {
   if (a === b) return true;
 

package/src/service/graphql.service.js

@@ -1,7 +1,5 @@
 const { get } = require('lodash');
 const { Kind, parse, print } = require('graphql');
-const { validate } = require('graphql/validation');
-const { makeExecutableSchema } = require('@graphql-tools/schema');
 
 //
 const mergePairs = [
@@ -81,13 +79,6 @@ exports.mergeASTArray = (arr) => {
   }, []).filter(el => !el.deleteFlag);
 };
 
-exports.validateSchema = (ast) => {
-  const errs = validate(makeExecutableSchema(ast), ast.typeDefs).filter(({ message }) => message.indexOf('not executable') === -1).map(({ message }) => message);
-  if (errs.length) throw new Error(errs.join('\n'));
-};
-
-exports.makeExecutableSchema = makeExecutableSchema;
-
 exports.toAST = (a) => {
   if (typeof a === 'string') return parse(a);
   if (Array.isArray(a)) return parse(a.map(e => exports.toGQL(e)).join('\n\n'));