@orion-js/graphql 3.2.1 → 3.2.4

package/lib/index.d.ts

@@ -8,3 +8,4 @@ import getBasicResultQuery from './resolversSchemas/getBasicResultQuery';
 import * as GraphQL from 'graphql';
 export { GraphQL, startGraphQL, startGraphiQL, resolversSchemas, ResolverParams, serializeSchema, subscription, getBasicResultQuery };
 export * from './types';
+export * from './service';

package/lib/index.js

@@ -43,3 +43,4 @@ exports.getBasicResultQuery = getBasicResultQuery_1.default;
 const GraphQL = __importStar(require("graphql"));
 exports.GraphQL = GraphQL;
 __exportStar(require("./types"), exports);
+__exportStar(require("./service"), exports);

package/lib/service/index.d.ts

@@ -0,0 +1,18 @@
+import { GlobalResolverResolve, ResolverOptions, ModelResolverResolve, Resolver, ModelResolver } from '@orion-js/resolvers';
+export interface GlobalResolverPropertyDescriptor extends Omit<PropertyDecorator, 'value'> {
+    value?: GlobalResolverResolve;
+}
+export declare function Query(options: Omit<ResolverOptions<any>, 'resolve' | 'mutation'>): (target: any, propertyKey: string, descriptor: GlobalResolverPropertyDescriptor) => void;
+export declare function Mutation(options: Omit<ResolverOptions<any>, 'resolve' | 'mutation'>): (target: any, propertyKey: string, descriptor: GlobalResolverPropertyDescriptor) => void;
+export declare function getServiceResolvers(target: any): {
+    [key: string]: Resolver<GlobalResolverResolve>;
+};
+export interface ModelResolverPropertyDescriptor extends Omit<PropertyDecorator, 'value'> {
+    value?: ModelResolverResolve;
+}
+export declare function ModelResolver(options: Omit<ResolverOptions<any>, 'resolve'>): (target: any, propertyKey: string, descriptor: ModelResolverPropertyDescriptor) => void;
+export declare function getServiceModelResolvers(target: any): {
+    [key: string]: ModelResolver<GlobalResolverResolve>;
+};
+export declare function Resolvers(): ClassDecorator;
+export declare function Model(typedModel: any): ClassDecorator;

package/lib/service/index.js

@@ -0,0 +1,83 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Model = exports.Resolvers = exports.getServiceModelResolvers = exports.ModelResolver = exports.getServiceResolvers = exports.Mutation = exports.Query = void 0;
+const services_1 = require("@orion-js/services");
+const resolvers_1 = require("@orion-js/resolvers");
+const helpers_1 = require("@orion-js/helpers");
+function Query(options) {
+    return function (target, propertyKey, descriptor) {
+        if (!descriptor.value)
+            throw new Error(`You must pass resolver function to ${propertyKey}`);
+        target.resolvers = target.resolvers || {};
+        target.resolvers[propertyKey] = (0, resolvers_1.resolver)({
+            ...options,
+            resolve: async (params, viewer) => {
+                const instance = (0, services_1.getInstance)(target.service);
+                return await instance[propertyKey](params, viewer);
+            }
+        });
+    };
+}
+exports.Query = Query;
+function Mutation(options) {
+    return function (target, propertyKey, descriptor) {
+        if (!descriptor.value)
+            throw new Error(`You must pass resolver function to ${propertyKey}`);
+        target.resolvers = target.resolvers || {};
+        target.resolvers[propertyKey] = (0, resolvers_1.resolver)({
+            ...options,
+            mutation: true,
+            resolve: async (params, viewer) => {
+                const instance = (0, services_1.getInstance)(target.service);
+                return await instance[propertyKey](params, viewer);
+            }
+        });
+    };
+}
+exports.Mutation = Mutation;
+function getServiceResolvers(target) {
+    if (!target.prototype) {
+        throw new helpers_1.UserError('You must pass a class to getResolvers');
+    }
+    return target.prototype.resolvers || {};
+}
+exports.getServiceResolvers = getServiceResolvers;
+function ModelResolver(options) {
+    return function (target, propertyKey, descriptor) {
+        if (!descriptor.value)
+            throw new Error(`You must pass resolver function to ${propertyKey}`);
+        target.resolvers = target.resolvers || {};
+        target.resolvers[propertyKey] = (0, resolvers_1.modelResolver)({
+            ...options,
+            resolve: async (item, params, viewer) => {
+                const instance = (0, services_1.getInstance)(target.service);
+                return await instance[propertyKey](item, params, viewer);
+            }
+        });
+    };
+}
+exports.ModelResolver = ModelResolver;
+function getServiceModelResolvers(target) {
+    if (!target.prototype) {
+        throw new helpers_1.UserError('You must pass a class to getResolvers');
+    }
+    return target.prototype.resolvers || {};
+}
+exports.getServiceModelResolvers = getServiceModelResolvers;
+function Resolvers() {
+    return function (target) {
+        (0, services_1.Service)()(target);
+        target.prototype.service = target;
+    };
+}
+exports.Resolvers = Resolvers;
+function Model(typedModel) {
+    return function (target) {
+        (0, services_1.Service)()(target);
+        target.prototype.typedModel = typedModel;
+        target.prototype.service = target;
+        // @ts-expect-error this is a trick to make it work in resolvers without having to call getModelForClass
+        target.getModel = () => getModelForClass(target);
+    };
+}
+exports.Model = Model;

package/lib/service/index.test.d.ts

@@ -0,0 +1 @@
+import 'reflect-metadata';

package/lib/service/index.test.js

@@ -0,0 +1,105 @@
+"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);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+require("reflect-metadata");
+const services_1 = require("@orion-js/services");
+const typed_model_1 = require("@orion-js/typed-model");
+const _1 = require(".");
+describe('Resolvers with service injection', () => {
+    it('should allow to pass a service as resolve', async () => {
+        let ExampleRepo = class ExampleRepo {
+            getLastName() {
+                return 'Lopez';
+            }
+        };
+        ExampleRepo = __decorate([
+            (0, services_1.Service)()
+        ], ExampleRepo);
+        let ExampleResolverService = class ExampleResolverService {
+            async sayHi(params) {
+                return this.addAge(`My name is ${params.name} ${this.repo.getLastName()}`);
+            }
+            async setName() {
+                this.repo.getLastName();
+            }
+            async addAge(params) {
+                return `${params} and I'm 100 years old`;
+            }
+        };
+        __decorate([
+            (0, services_1.Inject)(),
+            __metadata("design:type", ExampleRepo)
+        ], ExampleResolverService.prototype, "repo", void 0);
+        __decorate([
+            (0, _1.Query)({
+                params: { name: { type: 'string' } },
+                returns: String
+            }),
+            __metadata("design:type", Function),
+            __metadata("design:paramtypes", [Object]),
+            __metadata("design:returntype", Promise)
+        ], ExampleResolverService.prototype, "sayHi", null);
+        __decorate([
+            (0, _1.Mutation)({ returns: String }),
+            __metadata("design:type", Function),
+            __metadata("design:paramtypes", []),
+            __metadata("design:returntype", Promise)
+        ], ExampleResolverService.prototype, "setName", null);
+        ExampleResolverService = __decorate([
+            (0, _1.Resolvers)()
+        ], ExampleResolverService);
+        const resolvers = (0, _1.getServiceResolvers)(ExampleResolverService);
+        expect(resolvers.sayHi).toBeDefined();
+        const result = await resolvers.sayHi.execute({ params: { name: 'Orion' } });
+        expect(result).toBe(`My name is Orion Lopez and I'm 100 years old`);
+    });
+    it('show allow to pass a service with resolvers to typed model', async () => {
+        let AgeRepo = class AgeRepo {
+            getAge(name) {
+                return `${name} is 100 years old`;
+            }
+        };
+        AgeRepo = __decorate([
+            (0, services_1.Service)()
+        ], AgeRepo);
+        let PersonSchema = class PersonSchema {
+        };
+        __decorate([
+            (0, typed_model_1.Prop)(),
+            __metadata("design:type", String)
+        ], PersonSchema.prototype, "name", void 0);
+        PersonSchema = __decorate([
+            (0, typed_model_1.TypedSchema)()
+        ], PersonSchema);
+        let PersonModel = class PersonModel {
+            async getAge(person) {
+                const result = this.repo.getAge(person.name);
+                return result;
+            }
+        };
+        __decorate([
+            (0, services_1.Inject)(),
+            __metadata("design:type", AgeRepo)
+        ], PersonModel.prototype, "repo", void 0);
+        __decorate([
+            (0, _1.ModelResolver)({ returns: String }),
+            __metadata("design:type", Function),
+            __metadata("design:paramtypes", [PersonSchema]),
+            __metadata("design:returntype", Promise)
+        ], PersonModel.prototype, "getAge", null);
+        PersonModel = __decorate([
+            (0, _1.Model)(PersonSchema)
+        ], PersonModel);
+        const model = (0, typed_model_1.getModelForClass)(PersonModel);
+        const item = model.initItem({ name: 'Orion' });
+        expect(await item.getAge()).toBe(`Orion is 100 years old`);
+    });
+});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@orion-js/graphql",
-  "version": "3.2.1",
+  "version": "3.2.4",
   "main": "lib/index.js",
   "author": "nicolaslopezj",
   "license": "MIT",
@@ -14,11 +14,12 @@
   },
   "dependencies": {
     "@orion-js/helpers": "^3.2.0",
-    "@orion-js/http": "^3.2.0",
+    "@orion-js/http": "^3.2.4",
     "@orion-js/models": "^3.2.0",
     "@orion-js/resolvers": "^3.2.0",
     "@orion-js/schema": "^3.2.0",
-    "@orion-js/typed-model": "^3.2.1",
+    "@orion-js/services": "^3.2.0",
+    "@orion-js/typed-model": "^3.2.4",
     "apollo-server-core": "3.5.0",
     "graphql-iso-date": "^3.6.1",
     "graphql-subscriptions": "^2.0.0",
@@ -33,6 +34,7 @@
     "graphql": "^16.0.1",
     "jest": "27.3.1",
     "mock-socket-with-protocol": "^7.1.1",
+    "reflect-metadata": "^0.1.13",
     "supertest": "^6.1.6",
     "ts-jest": "27.0.7",
     "typescript": "^4.4.4"
@@ -43,5 +45,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "582bfdbd33b30a1259cc2c35f46111992aeeff81"
+  "gitHead": "a1c4cff581b31f24896ec96a0a180d043dbf802a"
 }