@orion-js/typed-model 3.2.1 → 3.2.4

package/lib/decorators/index.d.ts

@@ -1,3 +1,4 @@
 export * from './typedModel';
+export * from './typedSchema';
 export * from './prop';
 export * from './resolver';

package/lib/decorators/index.js

@@ -11,5 +11,6 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./typedModel"), exports);
+__exportStar(require("./typedSchema"), exports);
 __exportStar(require("./prop"), exports);
 __exportStar(require("./resolver"), exports);

package/lib/decorators/resolver.d.ts

@@ -1,2 +1,5 @@
 import { ModelResolver, ModelResolverResolve } from '@orion-js/resolvers';
+/**
+ * @deprecated Please use a @TypedSchema and a @Model a @ModelResolver instead
+ */
 export declare function ResolverProp(options: ModelResolver<ModelResolverResolve>): PropertyDecorator;

package/lib/decorators/resolver.js

@@ -2,6 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ResolverProp = void 0;
 const metadataStorage_1 = require("../storage/metadataStorage");
+/**
+ * @deprecated Please use a @TypedSchema and a @Model a @ModelResolver instead
+ */
 function ResolverProp(options) {
     return (classDef, propertyKey) => {
         metadataStorage_1.MetadataStorage.addResolverMetadata({ target: classDef.constructor, propertyKey, options });

package/lib/decorators/typedModel.d.ts

@@ -1,2 +1,5 @@
 import { TypedModelOptions } from '../storage/metadataStorage';
+/**
+ * @deprecated Please use @TypedSchema instead
+ */
 export declare function TypedModel(options?: TypedModelOptions): ClassDecorator;

package/lib/decorators/typedModel.js

@@ -3,6 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.TypedModel = void 0;
 const __1 = require("..");
 const metadataStorage_1 = require("../storage/metadataStorage");
+/**
+ * @deprecated Please use @TypedSchema instead
+ */
 function TypedModel(options = {}) {
     return target => {
         metadataStorage_1.MetadataStorage.addSchemaMetadata({ target, options });

package/lib/decorators/typedSchema.d.ts

@@ -0,0 +1,2 @@
+import { TypedModelOptions } from '../storage/metadataStorage';
+export declare function TypedSchema(options?: TypedModelOptions): ClassDecorator;

package/lib/decorators/typedSchema.js

@@ -0,0 +1,13 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.TypedSchema = void 0;
+const __1 = require("..");
+const metadataStorage_1 = require("../storage/metadataStorage");
+function TypedSchema(options = {}) {
+    return target => {
+        metadataStorage_1.MetadataStorage.addSchemaMetadata({ target, options });
+        // @ts-expect-error this is a trick to make it work in resolvers without having to call getModelForClass
+        target.getModel = () => (0, __1.getModelForClass)(target);
+    };
+}
+exports.TypedSchema = TypedSchema;

package/lib/factories/getModelForClass.js

@@ -13,6 +13,11 @@ function processModelSchemaForProp(prop) {
     return (0, processSchemaForProp_1.processSchemaForProp)(prop);
 }
 function getModelForClass(target) {
+    let modelResolvers = null;
+    if (target.prototype.typedModel) {
+        modelResolvers = target.prototype.resolvers || {};
+        target = target.prototype.typedModel;
+    }
     const schemaId = target.__schemaId;
     if (modelCache.has(schemaId)) {
         return modelCache.get(schemaId);
@@ -37,7 +42,10 @@ function getModelForClass(target) {
     const model = (0, models_1.createModel)({
         name: target.name,
         schema,
-        resolvers: resolverMap
+        resolvers: {
+            ...resolverMap,
+            ...modelResolvers
+        }
     });
     modelCache.set(schemaId, model);
     return model;

package/lib/index.d.ts

@@ -1,3 +1,2 @@
 export * from './decorators';
 export * from './factories';
-export * from './resolvers';

package/lib/index.js

@@ -12,4 +12,3 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./decorators"), exports);
 __exportStar(require("./factories"), exports);
-__exportStar(require("./resolvers"), exports);

package/lib/storage/metadataStorage.d.ts

@@ -4,9 +4,7 @@ import { ModelResolver, ModelResolverResolve } from '@orion-js/resolvers';
 export declare type PropertiesMap = {
     [key: string]: PropOptions;
 };
-export interface TypedModelOptions {
-    resolversService?: any;
-}
+export declare type TypedModelOptions = Record<string, never>;
 export declare class MetadataStorageHandler {
     private schemas;
     private getSchema;

package/lib/storage/metadataStorage.js

@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.MetadataStorage = exports.MetadataStorageHandler = void 0;
 const errors_1 = require("../errors");
 const helpers_1 = require("@orion-js/helpers");
-const resolvers_1 = require("../resolvers");
 class MetadataStorageHandler {
     constructor() {
         this.schemas = new Map();
@@ -25,12 +24,6 @@ class MetadataStorageHandler {
     }
     addSchemaMetadata({ target, options }) {
         const schema = this.getSchema(target);
-        if (options.resolversService) {
-            const resolversService = (0, resolvers_1.getServiceModelResolvers)(options.resolversService);
-            Object.entries(resolversService).forEach(([key, resolver]) => {
-                schema.resolvers[key] = resolver;
-            });
-        }
         schema.options = options;
     }
     addPropMetadata({ target, propertyKey, options }) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@orion-js/typed-model",
-  "version": "3.2.1",
+  "version": "3.2.4",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
   "files": [
@@ -34,11 +34,12 @@
     "eslint": "8.2.0",
     "eslint-plugin-import": "2.25.3",
     "jest": "27.3.1",
+    "kafkajs": "^1.16.0",
     "ts-jest": "27.0.7",
     "typescript": "^4.4.4"
   },
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "582bfdbd33b30a1259cc2c35f46111992aeeff81"
+  "gitHead": "a1c4cff581b31f24896ec96a0a180d043dbf802a"
 }

package/lib/resolvers/index.d.ts

@@ -1,19 +0,0 @@
-import { GlobalResolverResolve, ResolverOptions, ModelResolverResolve, Resolver, ModelResolver } from '@orion-js/resolvers';
-export interface GlobalResolverPropertyDescriptor extends Omit<PropertyDecorator, 'value'> {
-    value?: GlobalResolverResolve;
-}
-export declare function CreateResolver(options: Omit<ResolverOptions<any>, 'resolve'> & {
-    thisService: any;
-}): (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 CreateModelResolver(options: Omit<ResolverOptions<any>, 'resolve'> & {
-    thisService: any;
-}): (target: any, propertyKey: string, descriptor: ModelResolverPropertyDescriptor) => void;
-export declare function getServiceModelResolvers(target: any): {
-    [key: string]: ModelResolver<GlobalResolverResolve>;
-};

package/lib/resolvers/index.js

@@ -1,50 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getServiceModelResolvers = exports.CreateModelResolver = exports.getServiceResolvers = exports.CreateResolver = void 0;
-const services_1 = require("@orion-js/services");
-const resolvers_1 = require("@orion-js/resolvers");
-const helpers_1 = require("@orion-js/helpers");
-function CreateResolver(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)(options.thisService);
-                return await instance[propertyKey](params, viewer);
-            }
-        });
-    };
-}
-exports.CreateResolver = CreateResolver;
-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 CreateModelResolver(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)(options.thisService);
-                return await instance[propertyKey](item, params, viewer);
-            }
-        });
-    };
-}
-exports.CreateModelResolver = CreateModelResolver;
-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;

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

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

package/lib/resolvers/index.test.js

@@ -1,103 +0,0 @@
-"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 __1 = require("..");
-const factories_1 = require("../factories");
-const _1 = require(".");
-describe('Resolvers with service injection', () => {
-    it('should allow to pass a service as resolve', async () => {
-        var ExampleResolverService_1;
-        let ExampleRepo = class ExampleRepo {
-            getLastName() {
-                return 'Lopez';
-            }
-        };
-        ExampleRepo = __decorate([
-            (0, services_1.Service)()
-        ], ExampleRepo);
-        let ExampleResolverService = ExampleResolverService_1 = class ExampleResolverService {
-            async sayHi(params) {
-                return this.addAge(`My name is ${params.name} ${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.CreateResolver)({
-                thisService: ExampleResolverService_1,
-                params: { name: { type: 'string' } },
-                returns: String
-            }),
-            __metadata("design:type", Function),
-            __metadata("design:paramtypes", [Object]),
-            __metadata("design:returntype", Promise)
-        ], ExampleResolverService.prototype, "sayHi", null);
-        ExampleResolverService = ExampleResolverService_1 = __decorate([
-            (0, services_1.Service)()
-        ], 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 () => {
-        var PersonResolvers_1;
-        let AgeRepo = class AgeRepo {
-            getAge(name) {
-                return `${name} is 100 years old`;
-            }
-        };
-        AgeRepo = __decorate([
-            (0, services_1.Service)()
-        ], AgeRepo);
-        let PersonResolvers = PersonResolvers_1 = class PersonResolvers {
-            async getAge(person) {
-                const result = this.repo.getAge(person.name);
-                return result;
-            }
-        };
-        __decorate([
-            (0, services_1.Inject)(),
-            __metadata("design:type", AgeRepo)
-        ], PersonResolvers.prototype, "repo", void 0);
-        __decorate([
-            (0, _1.CreateModelResolver)({
-                thisService: PersonResolvers_1,
-                returns: String
-            }),
-            __metadata("design:type", Function),
-            __metadata("design:paramtypes", [Object]),
-            __metadata("design:returntype", Promise)
-        ], PersonResolvers.prototype, "getAge", null);
-        PersonResolvers = PersonResolvers_1 = __decorate([
-            (0, services_1.Service)()
-        ], PersonResolvers);
-        let Person = class Person {
-        };
-        __decorate([
-            (0, __1.Prop)(),
-            __metadata("design:type", String)
-        ], Person.prototype, "name", void 0);
-        Person = __decorate([
-            (0, __1.TypedModel)({ resolversService: PersonResolvers })
-        ], Person);
-        const model = (0, factories_1.getModelForClass)(Person);
-        const item = model.initItem({ name: 'Orion' });
-        expect(await item.getAge()).toBe(`Orion is 100 years old`);
-    });
-});