@orion-js/graphql 2.10.1 → 2.12.2

package/lib/buildSchema/getArgs/getField.js

@@ -15,19 +15,19 @@ var _graphql = require("graphql");
 
 var _schema = require("@orion-js/schema");
 
-var _app = require("@orion-js/app");
-
 var _getScalar = _interopRequireDefault(require("../getType/getScalar"));
 
+var _isModel = _interopRequireDefault(require("../isModel"));
+
 const storedModelInput = {};
 
-const getModelInput = function (model, fields) {
+const getModelInput = function getField(model, fields) {
   if (storedModelInput[model.name]) {
     return storedModelInput[model.name];
   }
 
   storedModelInput[model.name] = new _graphql.GraphQLInputObjectType({
-    name: model.name + 'Input',
+    name: `${model.name}Input`,
     fields
   });
   return storedModelInput[model.name];
@@ -35,13 +35,15 @@ const getModelInput = function (model, fields) {
 
 function getParams(type) {
   if (!type) {
-    throw new Error(`No type specified`);
+    throw new Error('No type specified');
   }
 
   if ((0, _isArray.default)(type)) {
     const graphQLType = getParams(type[0]);
     return new _graphql.GraphQLList(graphQLType);
-  } else if (!type._isFieldType && ((0, _isPlainObject.default)(type) || type instanceof _app.Model)) {
+  }
+
+  if (!type._isFieldType && ((0, _isPlainObject.default)(type) || (0, _isModel.default)(type))) {
     const model = type.__isModel ? type : type.__model;
     if (!model || !model.__isModel) throw new Error('Type if not a Model', type);
     const fields = {};
@@ -53,9 +55,9 @@ function getParams(type) {
     }
 
     return getModelInput(model, fields);
-  } else {
-    const schemaType = (0, _schema.getFieldType)(type);
-    const graphQLType = (0, _getScalar.default)(schemaType);
-    return graphQLType;
   }
+
+  const schemaType = (0, _schema.getFieldType)(type);
+  const graphQLType = (0, _getScalar.default)(schemaType);
+  return graphQLType;
 }

package/lib/buildSchema/getResolvers/index.js

@@ -46,7 +46,7 @@ async function _default({
       type,
       args,
 
-      async resolve(root, params, context) {
+      async resolve(_root, params, context) {
         if (process.env.DEBUG && process.env.DEBUG.split(',').includes('resolver')) {
           logger.info(`[resolver]: name="${name}"`, {
             name,

package/lib/buildSchema/getType/getTypeAsResolver.js

@@ -5,13 +5,13 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.default = _default;
+exports.default = getTypeAsResolver;
 
 var _getArgs = _interopRequireDefault(require("../getArgs"));
 
 var _errorHandler = _interopRequireDefault(require("../../errorHandler"));
 
-function _default({
+function getTypeAsResolver({
   resolver,
   getGraphQLType,
   options,

package/lib/buildSchema/getType/index.js

@@ -15,12 +15,12 @@ var _graphql = require("graphql");
 
 var _schema = require("@orion-js/schema");
 
-var _app = require("@orion-js/app");
-
 var _getScalar = _interopRequireDefault(require("./getScalar"));
 
 var _getTypeAsResolver = _interopRequireDefault(require("./getTypeAsResolver"));
 
+var _isModel = _interopRequireDefault(require("../isModel"));
+
 function getGraphQLType(type, options) {
   if (!type) {
     throw new Error('Type is undefined');
@@ -29,7 +29,9 @@ function getGraphQLType(type, options) {
   if ((0, _isArray.default)(type)) {
     const graphQLType = getGraphQLType(type[0], options);
     return new _graphql.GraphQLList(graphQLType);
-  } else if (!type._isFieldType && ((0, _isPlainObject.default)(type) || type instanceof _app.Model)) {
+  }
+
+  if (!type._isFieldType && ((0, _isPlainObject.default)(type) || (0, _isModel.default)(type))) {
     const model = type.__isModel ? type : type.__model;
     if (!model || !model.__isModel) throw new Error('Type if not a Model', type);
     if (model.graphQLType) return model.graphQLType;
@@ -77,9 +79,9 @@ function getGraphQLType(type, options) {
       }
     });
     return model.graphQLType;
-  } else {
-    const schemaType = (0, _schema.getFieldType)(type);
-    const graphQLType = (0, _getScalar.default)(schemaType);
-    return graphQLType;
   }
+
+  const schemaType = (0, _schema.getFieldType)(type);
+  const graphQLType = (0, _getScalar.default)(schemaType);
+  return graphQLType;
 }

package/lib/buildSchema/isModel.js

@@ -0,0 +1,12 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = _default;
+
+var _app = require("@orion-js/app");
+
+function _default(object) {
+  return object instanceof _app.Model || object.__isModel;
+}

package/lib/startGraphQL.js

@@ -42,7 +42,7 @@ async function _default(options) {
   const handler = apolloServer.createHandler(); // highlight-line
 
   const cacheControlCache = apolloOptions.persistedQueries?.cache ? apolloOptions.persistedQueries.cache : new _apolloServerCaching.InMemoryLRUCache();
-  (0, _app.route)('/graphql', async function (params) {
+  (0, _app.route)('/graphql', async params => {
     const {
       request,
       response,

package/lib/startWebsocket.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.default = _default;
+exports.default = startWebsocket;
 
 var _app = require("@orion-js/app");
 
@@ -15,7 +15,7 @@ var _graphqlSubscriptions = require("graphql-subscriptions");
 
 var _pubsub = require("./pubsub");
 
-function _default({
+function startWebsocket({
   schema
 }, options) {
   (0, _pubsub.setPubsub)(options.pubsub || new _graphqlSubscriptions.PubSub());

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@orion-js/graphql",
-  "version": "2.10.1",
+  "version": "2.12.2",
   "main": "lib/index.js",
   "author": "nicolaslopezj",
   "license": "MIT",
@@ -11,7 +11,7 @@
     "test": "jest"
   },
   "dependencies": {
-    "@orion-js/schema": "^2.10.0",
+    "@orion-js/schema": "^2.12.2",
     "apollo-server-core": "3.4.0",
     "apollo-server-micro": "3.4.0",
     "deep-sort-object": "^1.0.2",
@@ -26,7 +26,7 @@
     "@babel/plugin-transform-runtime": "^7.11.0",
     "@babel/preset-env": "^7.11.0",
     "@babel/runtime": "^7.11.2",
-    "@orion-js/app": "^2.10.1",
+    "@orion-js/app": "^2.12.2",
     "babel-jest": "^26.2.2",
     "graphql": "^15.6.0",
     "jest": "^26.2.2"
@@ -38,5 +38,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "fe42a57b41d5fdac3299680bb9d3a6406f878f0a"
+  "gitHead": "94f4c8bd9168eed8c3b0363afb1dd0f0bcdd3556"
 }