@orion-js/graphql 3.0.33 → 3.0.40

package/lib/buildSchema/getType/index.js

@@ -19,6 +19,9 @@ function getGraphQLType(type, options) {
         const graphQLType = getGraphQLType(type[0], options);
         return new graphql_1.GraphQLList(graphQLType);
     }
+    else if (typeof type === 'function' && type.getModel && type.__schemaId) {
+        return getGraphQLType(type.getModel(), options);
+    }
     else if (!type._isFieldType && ((0, isPlainObject_1.default)(type) || type.__isModel)) {
         const model = type.__isModel ? type : type.__model;
         if (!model || !model.__isModel)

package/lib/resolversSchemas/getField.js

@@ -10,8 +10,12 @@ const omit_1 = __importDefault(require("lodash/omit"));
 const getScalar_1 = __importDefault(require("../buildSchema/getType/getScalar"));
 const getStaticFields_1 = require("./getStaticFields");
 async function getParams(field) {
-    const { type } = field;
-    if ((0, isArray_1.default)(type)) {
+    let { type } = field;
+    if (typeof type === 'function' && type.getModel && type.__schemaId) {
+        const model = type.getModel();
+        return await getParams({ ...field, type: model });
+    }
+    else if ((0, isArray_1.default)(type)) {
         const serialized = await getParams({ ...field, type: type[0] });
         return {
             ...serialized,

package/lib/resolversSchemas/getField.test.js

@@ -1,26 +1,56 @@
 "use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+const typed_model_1 = require("@orion-js/typed-model");
 const getField_1 = __importDefault(require("./getField"));
-it('should return a valid serialization of the field', async () => {
-    const schema = {
-        name: {
-            type: String,
-            a: '1234'
-        }
-    };
-    const result = await (0, getField_1.default)(schema.name);
-    expect(result).toEqual({ type: 'string', a: '1234', __graphQLType: 'String' });
-});
-it('should pass field options with simple array fields', async () => {
-    const schema = {
-        name: {
-            type: [String],
-            a: '1234'
-        }
-    };
-    const result = await (0, getField_1.default)(schema.name);
-    expect(result.a).toEqual(schema.name.a);
+describe('Field serialization', () => {
+    it('should return a valid serialization of the field', async () => {
+        const schema = {
+            name: {
+                type: String,
+                a: '1234'
+            }
+        };
+        const result = await (0, getField_1.default)(schema.name);
+        expect(result).toEqual({ type: 'string', a: '1234', __graphQLType: 'String' });
+    });
+    it('should pass field options with simple array fields', async () => {
+        const schema = {
+            name: {
+                type: [String],
+                a: '1234'
+            }
+        };
+        const result = await (0, getField_1.default)(schema.name);
+        expect(result.a).toEqual(schema.name.a);
+    });
+    it('Should allow serialization of typed models', async () => {
+        let Point = class Point {
+        };
+        __decorate([
+            (0, typed_model_1.Prop)({ label: 'Name' }),
+            __metadata("design:type", String)
+        ], Point.prototype, "name", void 0);
+        Point = __decorate([
+            (0, typed_model_1.TypedModel)()
+        ], Point);
+        const schema = {
+            point: {
+                type: Point
+            }
+        };
+        const result = await (0, getField_1.default)(schema.point);
+        expect(result.type.name).toEqual({ type: 'string', label: 'Name', __graphQLType: 'String' });
+    });
 });

package/lib/resolversSchemas/serializeSchema.d.ts

@@ -1 +1,2 @@
-export default function serializeSchema(params: any): Promise<any>;
+import { Schema } from '@orion-js/schema';
+export default function serializeSchema(params: any): Promise<Schema>;

package/lib/resolversSchemas/serializeSchema.js

@@ -7,6 +7,9 @@ const getField_1 = __importDefault(require("./getField"));
 async function serializeSchema(params) {
     if (!params)
         return;
+    if (typeof params === 'function' && params.getModel && params.__schemaId) {
+        params = params.getModel().getCleanSchema(); // typed model
+    }
     if (Object.keys(params).length === 0)
         return;
     const fields = {};

package/lib/resolversSchemas/serializeSchema.test.js

@@ -1,8 +1,18 @@
 "use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+const typed_model_1 = require("@orion-js/typed-model");
 const serializeSchema_1 = __importDefault(require("./serializeSchema"));
 it('should create a JSON of the schema', async () => {
     const schema = {
@@ -17,9 +27,30 @@ it('should pass field options', async () => {
     const schema = {
         name: {
             type: [String],
-            a: '1234'
+            label: '1234'
         }
     };
     const result = await (0, serializeSchema_1.default)(schema);
-    expect(result.name.a).toEqual(schema.name.a);
+    expect(result.name).toEqual({
+        type: ['string'],
+        label: '1234',
+        __graphQLType: '[String]'
+    });
+});
+it('should serialize a typed model', async () => {
+    let Point = class Point {
+    };
+    __decorate([
+        (0, typed_model_1.Prop)({ label: 'Name' }),
+        __metadata("design:type", String)
+    ], Point.prototype, "name", void 0);
+    Point = __decorate([
+        (0, typed_model_1.TypedModel)()
+    ], Point);
+    const result = await (0, serializeSchema_1.default)(Point);
+    expect(result.name).toEqual({
+        type: 'string',
+        label: 'Name',
+        __graphQLType: 'String'
+    });
 });

package/lib/startGraphQL.test.js

@@ -18,6 +18,7 @@ const http_1 = require("@orion-js/http");
 const supertest_1 = __importDefault(require("supertest"));
 const typed_model_1 = require("@orion-js/typed-model");
 const cleanResolvers_1 = require("./cleanResolvers");
+const models_1 = require("@orion-js/models");
 describe('Test GraphQL Server', () => {
     beforeEach(() => {
         (0, cleanResolvers_1.cleanResolvers)();
@@ -139,11 +140,23 @@ describe('Test GraphQL Server', () => {
             };
         };
         const user = (0, resolvers_1.resolver)({
-            params: (0, typed_model_1.getModelForClass)(Params),
-            returns: (0, typed_model_1.getModelForClass)(User),
+            params: Params,
+            returns: User,
             resolve
         });
-        const resolvers = { user };
+        const model = (0, models_1.createModel)({
+            name: 'Model',
+            schema: {
+                user: { type: User }
+            }
+        });
+        const modelMutation = (0, resolvers_1.resolver)({
+            params: Params,
+            returns: [model],
+            mutation: true,
+            resolve
+        });
+        const resolvers = { user, modelMutation };
         const app = (0, http_1.express)();
         await (0, _1.startGraphQL)({
             resolvers,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@orion-js/graphql",
-  "version": "3.0.33",
+  "version": "3.0.40",
   "main": "lib/index.js",
   "author": "nicolaslopezj",
   "license": "MIT",
@@ -13,12 +13,12 @@
     "upgrade-interactive": "yarn upgrade-interactive"
   },
   "dependencies": {
-    "@orion-js/helpers": "^3.0.31",
-    "@orion-js/http": "^3.0.32",
-    "@orion-js/models": "^3.0.32",
-    "@orion-js/resolvers": "^3.0.32",
-    "@orion-js/schema": "^3.0.32",
-    "@orion-js/typed-model": "^3.0.33",
+    "@orion-js/helpers": "^3.0.36",
+    "@orion-js/http": "^3.0.40",
+    "@orion-js/models": "^3.0.38",
+    "@orion-js/resolvers": "^3.0.37",
+    "@orion-js/schema": "^3.0.37",
+    "@orion-js/typed-model": "^3.0.38",
     "apollo-server-core": "3.5.0",
     "graphql-iso-date": "^3.6.1",
     "graphql-subscriptions": "^2.0.0",
@@ -43,5 +43,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "3ae1a9b2872f026dca2edb6684d87d66151bd71e"
+  "gitHead": "c0632276e6b8247bfe6ae2b2eee8815a3bcd441f"
 }