@orion-js/graphql 3.0.17 → 3.0.24

package/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2018 Orionjs Team
+Copyright (c) 2021 Orionjs Team
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package/lib/buildSchema/getArgs/getField.js

@@ -8,6 +8,7 @@ const isArray_1 = __importDefault(require("lodash/isArray"));
 const graphql_1 = require("graphql");
 const schema_1 = require("@orion-js/schema");
 const getScalar_1 = __importDefault(require("../getType/getScalar"));
+const getStaticFields_1 = require("../../resolversSchemas/getStaticFields");
 const storedModelInput = {};
 const getModelInput = function (model, fields) {
     if (storedModelInput[model.name]) {
@@ -32,7 +33,7 @@ function getParams(type) {
         if (!model || !model.__isModel)
             throw new Error(`A type is not a Model`);
         const fields = {};
-        for (const field of model.staticFields) {
+        for (const field of (0, getStaticFields_1.getStaticFields)(model)) {
             fields[field.key] = {
                 type: getParams(field.type)
             };

package/lib/buildSchema/getResolvers/index.d.ts

@@ -1,5 +1,6 @@
+import { GraphQLFieldConfig } from 'graphql';
 export default function ({ resolvers, mutation, options }: {
     resolvers: any;
     mutation: any;
     options: any;
-}): Promise<{}>;
+}): Promise<import("graphql/jsutils/ObjMap").ObjMap<GraphQLFieldConfig<any, any, any>>>;

package/lib/resolversSchemas/ResolverParams.d.ts

@@ -1,2 +1,9 @@
-declare const _default: import("@orion-js/models").Model;
+import { Model } from '@orion-js/models';
+export interface ResolverMetaParam {
+    resolver: {
+        params: any;
+        returns: Model | any;
+    };
+}
+declare const _default: Model;
 export default _default;

package/lib/resolversSchemas/ResolverParams.js

@@ -7,6 +7,9 @@ const serializeSchema_1 = __importDefault(require("./serializeSchema"));
 const getBasicResultQuery_1 = __importDefault(require("./getBasicResultQuery"));
 const models_1 = require("@orion-js/models");
 const resolvers_1 = require("@orion-js/resolvers");
+const resolverReturnsIsModel = (returns) => {
+    return returns && returns.__isModel;
+};
 exports.default = (0, models_1.createModel)({
     name: 'ResolverParams',
     schema: {
@@ -30,7 +33,9 @@ exports.default = (0, models_1.createModel)({
         basicResultQuery: (0, resolvers_1.resolver)({
             returns: String,
             resolve: async function ({ resolver }) {
-                return await (0, getBasicResultQuery_1.default)({ type: resolver.returns.schema });
+                return await (0, getBasicResultQuery_1.default)({
+                    type: resolverReturnsIsModel(resolver.returns) ? resolver.returns.getSchema() : ''
+                });
             }
         })
     }

package/lib/resolversSchemas/getBasicResultQuery.js

@@ -4,13 +4,14 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const isArray_1 = __importDefault(require("lodash/isArray"));
+const getStaticFields_1 = require("./getStaticFields");
 async function getBasicQuery(field) {
     if (!field.type)
         return '';
     if (((0, isArray_1.default)(field.type) && field.type[0].__model) || field.type.__model) {
         const model = (0, isArray_1.default)(field.type) ? field.type[0].__model : field.type.__model;
         const fields = [];
-        for (const field of model.staticFields) {
+        for (const field of (0, getStaticFields_1.getStaticFields)(model)) {
             fields.push(await getBasicQuery(field));
         }
         const key = field.key ? `${field.key} ` : '';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@orion-js/graphql",
-  "version": "3.0.17",
+  "version": "3.0.24",
   "main": "lib/index.js",
   "author": "nicolaslopezj",
   "license": "MIT",
@@ -14,11 +14,11 @@
   },
   "dependencies": {
     "@orion-js/helpers": "^3.0.17",
-    "@orion-js/http": "^3.0.17",
-    "@orion-js/models": "^3.0.17",
-    "@orion-js/resolvers": "^3.0.17",
+    "@orion-js/http": "^3.0.24",
+    "@orion-js/models": "^3.0.24",
+    "@orion-js/resolvers": "^3.0.24",
     "@orion-js/schema": "^3.0.17",
-    "@orion-js/typed-model": "^3.0.17",
+    "@orion-js/typed-model": "^3.0.24",
     "apollo-server-core": "3.5.0",
     "graphql-iso-date": "^3.6.1",
     "graphql-subscriptions": "^2.0.0",
@@ -38,10 +38,10 @@
     "typescript": "^4.4.4"
   },
   "peerDependencies": {
-    "graphql": "^15.6.0"
+    "graphql": "^16.0.1"
   },
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "55e56828a55b355ec68f91c11d942676bbeb241b"
+  "gitHead": "5ac1c68e72af3dbeaf8eb5c2a04d5325da2a7e3f"
 }