ts-ioc-container 32.7.0 → 32.9.0

package/README.md

@@ -14,6 +14,8 @@
 - supports `tagged scopes`
 - fully test covered :100:
 - can be used with decorators `@inject`
+- can [inject properties](#inject-property)
+- can inject [lazy dependencies](#lazy)
 - composable and open to extend
 - awesome for testing (auto mocking)
 
@@ -43,6 +45,8 @@
 - [Hook](#hook) `@hook`
     - [OnConstruct](#onconstruct) `@onConstruct`
     - [OnDispose](#ondispose) `@onDispose`
+    - [Inject Property](#inject-property)
+    - [Inject Method](#inject-method)
 - [Mock](#mock)
 - [Error](#error)
 
@@ -357,6 +361,7 @@ describe('lazy provider', () => {
 
 ### Metadata
 This type of injector uses `@inject` decorator to mark where dependencies should be injected. It's bases on `reflect-metadata` package. That's why I call it `MetadataInjector`.
+Also you can [inject property.](#inject-property)
 
 ```typescript
 import 'reflect-metadata';
@@ -1255,6 +1260,56 @@ describe('onDispose', function () {
 
 ```
 
+### Inject property
+
+```typescript
+import { by, Container, executeHooks, hook, injectProp, MetadataInjector, Registration } from 'ts-ioc-container';
+
+describe('inject property', () => {
+  it('should inject property', () => {
+    class App {
+      @hook('onInit', injectProp(by.key('greeting')))
+      greeting!: string;
+    }
+    const expected = 'Hello world!';
+
+    const container = new Container(new MetadataInjector()).add(Registration.fromValue(expected).to('greeting'));
+    const app = container.resolve(App);
+    executeHooks(app, 'onInit', { scope: container });
+
+    expect(app.greeting).toBe(expected);
+  });
+});
+
+```
+
+### Inject method
+    
+```typescript
+import { by, Container, executeHooks, hook, inject, invokeExecution, MetadataInjector, Registration } from 'ts-ioc-container';
+
+describe('inject method', () => {
+  it('should inject method', () => {
+    class App {
+      greeting!: string;
+
+      @hook('onInit', invokeExecution({ handleError: jest.fn(), handleResult: jest.fn() }))
+      setGreeting(@inject(by.key('greeting')) greeting: string) {
+        this.greeting = greeting;
+      }
+    }
+    const expected = 'Hello world!';
+
+    const container = new Container(new MetadataInjector()).add(Registration.fromValue(expected).to('greeting'));
+    const app = container.resolve(App);
+    executeHooks(app, 'onInit', { scope: container });
+
+    expect(app.greeting).toBe(expected);
+  });
+});
+
+```
+
 ## Mock
 Sometimes you need to automatically mock all dependencies in container. This is what `AutoMockedContainer` is for.
 

package/cjm/hooks/ExecutionContext.js

@@ -15,5 +15,9 @@ class ExecutionContext {
         // @ts-ignore
         return this.instance[this.methodName](...args);
     }
+    injectProperty(fn) {
+        // @ts-ignore
+        this.instance[this.methodName] = fn(this.scope);
+    }
 }
 exports.ExecutionContext = ExecutionContext;

package/cjm/hooks/hook.js

@@ -1,12 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.executeHooks = exports.hasHooks = exports.getHooks = exports.hook = void 0;
+exports.invokeExecution = exports.injectProp = exports.executeHooks = exports.hasHooks = exports.getHooks = exports.hook = void 0;
 const ExecutionContext_1 = require("./ExecutionContext");
-const createStore = () => new Map();
+const MetadataInjector_1 = require("../injector/MetadataInjector");
 const hook = (key, ...fns) => (target, propertyKey) => {
     const hooks = Reflect.hasMetadata(key, target.constructor)
         ? Reflect.getMetadata(key, target.constructor)
-        : createStore();
+        : new Map();
     hooks.set(propertyKey, (hooks.get(propertyKey) ?? []).concat(fns));
     Reflect.defineMetadata(key, hooks, target.constructor); // eslint-disable-line @typescript-eslint/ban-types
 };
@@ -27,3 +27,16 @@ const executeHooks = (target, key, { scope, createContext = (c) => c, }) => {
     }
 };
 exports.executeHooks = executeHooks;
+const injectProp = (fn) => (context) => context.injectProperty(fn);
+exports.injectProp = injectProp;
+const invokeExecution = ({ handleError, handleResult, }) => (context) => {
+    const args = (0, MetadataInjector_1.resolveArgs)(context.instance.constructor, context.methodName)(context.scope);
+    try {
+        const result = context.invokeMethod({ args });
+        handleResult(result, context);
+    }
+    catch (e) {
+        handleError(e, context.scope);
+    }
+};
+exports.invokeExecution = invokeExecution;

package/cjm/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getParameterMetadata = exports.getMethodMetadata = exports.setMethodMetadata = exports.setParameterMetadata = exports.getMetadata = exports.setMetadata = exports.byAliases = exports.byAlias = exports.IMemoKey = exports.by = exports.ExecutionContext = exports.executeHooks = exports.hasHooks = exports.hook = exports.getHooks = exports.ContainerDisposedError = exports.MethodNotImplementedError = exports.DependencyNotFoundError = exports.Registration = exports.register = exports.scope = exports.key = exports.decorate = exports.multiCache = exports.MultiCache = exports.SingletonProvider = exports.singleton = exports.Provider = exports.ProviderDecorator = exports.args = exports.argsFn = exports.alias = exports.visible = exports.provider = exports.ProxyInjector = exports.SimpleInjector = exports.getInjectFns = exports.resolveArgs = exports.inject = exports.MetadataInjector = exports.AutoMockedContainer = exports.EmptyContainer = exports.Container = exports.isDependencyKey = void 0;
+exports.getParameterMetadata = exports.getMethodMetadata = exports.setMethodMetadata = exports.setParameterMetadata = exports.getMetadata = exports.setMetadata = exports.byAliases = exports.byAlias = exports.IMemoKey = exports.by = exports.ExecutionContext = exports.invokeExecution = exports.injectProp = exports.executeHooks = exports.hasHooks = exports.hook = exports.getHooks = exports.ContainerDisposedError = exports.MethodNotImplementedError = exports.DependencyNotFoundError = exports.Registration = exports.register = exports.scope = exports.key = exports.decorate = exports.multiCache = exports.MultiCache = exports.SingletonProvider = exports.singleton = exports.Provider = exports.ProviderDecorator = exports.args = exports.argsFn = exports.alias = exports.visible = exports.provider = exports.ProxyInjector = exports.SimpleInjector = exports.getInjectFns = exports.resolveArgs = exports.inject = exports.MetadataInjector = exports.AutoMockedContainer = exports.EmptyContainer = exports.Container = exports.isDependencyKey = void 0;
 // Containers
 var IContainer_1 = require("./container/IContainer");
 Object.defineProperty(exports, "isDependencyKey", { enumerable: true, get: function () { return IContainer_1.isDependencyKey; } });
@@ -51,14 +51,17 @@ var MethodNotImplementedError_1 = require("./errors/MethodNotImplementedError");
 Object.defineProperty(exports, "MethodNotImplementedError", { enumerable: true, get: function () { return MethodNotImplementedError_1.MethodNotImplementedError; } });
 var ContainerDisposedError_1 = require("./errors/ContainerDisposedError");
 Object.defineProperty(exports, "ContainerDisposedError", { enumerable: true, get: function () { return ContainerDisposedError_1.ContainerDisposedError; } });
-// Others
+// Hooks
 var hook_1 = require("./hooks/hook");
 Object.defineProperty(exports, "getHooks", { enumerable: true, get: function () { return hook_1.getHooks; } });
 Object.defineProperty(exports, "hook", { enumerable: true, get: function () { return hook_1.hook; } });
 Object.defineProperty(exports, "hasHooks", { enumerable: true, get: function () { return hook_1.hasHooks; } });
 Object.defineProperty(exports, "executeHooks", { enumerable: true, get: function () { return hook_1.executeHooks; } });
+Object.defineProperty(exports, "injectProp", { enumerable: true, get: function () { return hook_1.injectProp; } });
+Object.defineProperty(exports, "invokeExecution", { enumerable: true, get: function () { return hook_1.invokeExecution; } });
 var ExecutionContext_1 = require("./hooks/ExecutionContext");
 Object.defineProperty(exports, "ExecutionContext", { enumerable: true, get: function () { return ExecutionContext_1.ExecutionContext; } });
+// Others
 var by_1 = require("./by");
 Object.defineProperty(exports, "by", { enumerable: true, get: function () { return by_1.by; } });
 Object.defineProperty(exports, "IMemoKey", { enumerable: true, get: function () { return by_1.IMemoKey; } });

package/esm/hooks/ExecutionContext.js

@@ -12,4 +12,8 @@ export class ExecutionContext {
         // @ts-ignore
         return this.instance[this.methodName](...args);
     }
+    injectProperty(fn) {
+        // @ts-ignore
+        this.instance[this.methodName] = fn(this.scope);
+    }
 }

package/esm/hooks/hook.js

@@ -1,9 +1,9 @@
 import { ExecutionContext } from './ExecutionContext';
-const createStore = () => new Map();
+import { resolveArgs } from '../injector/MetadataInjector';
 export const hook = (key, ...fns) => (target, propertyKey) => {
     const hooks = Reflect.hasMetadata(key, target.constructor)
         ? Reflect.getMetadata(key, target.constructor)
-        : createStore();
+        : new Map();
     hooks.set(propertyKey, (hooks.get(propertyKey) ?? []).concat(fns));
     Reflect.defineMetadata(key, hooks, target.constructor); // eslint-disable-line @typescript-eslint/ban-types
 };
@@ -20,3 +20,14 @@ export const executeHooks = (target, key, { scope, createContext = (c) => c, })
         }
     }
 };
+export const injectProp = (fn) => (context) => context.injectProperty(fn);
+export const invokeExecution = ({ handleError, handleResult, }) => (context) => {
+    const args = resolveArgs(context.instance.constructor, context.methodName)(context.scope);
+    try {
+        const result = context.invokeMethod({ args });
+        handleResult(result, context);
+    }
+    catch (e) {
+        handleError(e, context.scope);
+    }
+};

package/esm/index.js

@@ -19,8 +19,9 @@ export { Registration } from './registration/Registration';
 export { DependencyNotFoundError } from './errors/DependencyNotFoundError';
 export { MethodNotImplementedError } from './errors/MethodNotImplementedError';
 export { ContainerDisposedError } from './errors/ContainerDisposedError';
-// Others
-export { getHooks, hook, hasHooks, executeHooks } from './hooks/hook';
+// Hooks
+export { getHooks, hook, hasHooks, executeHooks, injectProp, invokeExecution } from './hooks/hook';
 export { ExecutionContext } from './hooks/ExecutionContext';
+// Others
 export { by, IMemoKey, byAlias, byAliases } from './by';
 export { setMetadata, getMetadata, setParameterMetadata, setMethodMetadata, getMethodMetadata, getParameterMetadata, } from './metadata';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ts-ioc-container",
-  "version": "32.7.0",
+  "version": "32.9.0",
   "description": "Typescript IoC container",
   "publishConfig": {
     "access": "public",
@@ -59,5 +59,5 @@
     "ts-node": "^10.9.1",
     "typescript": "5.4.3"
   },
-  "gitHead": "085b602ac136f4bf4209f824531709f170582a67"
+  "gitHead": "17060847c051dbbdfd167675ec27af2ae78efbfe"
 }

package/typings/hooks/ExecutionContext.d.ts

@@ -1,3 +1,4 @@
+import { InjectFn } from '../injector/MetadataInjector';
 import { IContainer } from '../container/IContainer';
 export declare class ExecutionContext {
     instance: object;
@@ -8,4 +9,5 @@ export declare class ExecutionContext {
     invokeMethod({ args }: {
         args: unknown[];
     }): unknown;
+    injectProperty(fn: InjectFn): void;
 }

package/typings/hooks/hook.d.ts

@@ -1,5 +1,6 @@
 import { IContainer } from '../container/IContainer';
 import { ExecutionContext } from './ExecutionContext';
+import { InjectFn } from '../injector/MetadataInjector';
 export type Execution<T extends ExecutionContext = ExecutionContext> = (context: T) => void;
 export declare const hook: (key: string | symbol, ...fns: Execution[]) => (target: object, propertyKey: string | symbol) => void;
 export declare function getHooks(target: object, key: string | symbol): Map<string, Execution[]>;
@@ -8,3 +9,8 @@ export declare const executeHooks: <Context extends ExecutionContext>(target: ob
     scope: IContainer;
     createContext?: ((c: ExecutionContext) => Context) | undefined;
 }) => void;
+export declare const injectProp: (fn: InjectFn) => Execution;
+export declare const invokeExecution: ({ handleError, handleResult, }: {
+    handleError: (e: Error, s: IContainer) => void;
+    handleResult: (result: unknown, context: ExecutionContext) => void;
+}) => Execution;

package/typings/index.d.ts

@@ -17,7 +17,7 @@ export { Registration } from './registration/Registration';
 export { DependencyNotFoundError } from './errors/DependencyNotFoundError';
 export { MethodNotImplementedError } from './errors/MethodNotImplementedError';
 export { ContainerDisposedError } from './errors/ContainerDisposedError';
-export { getHooks, hook, hasHooks, Execution, executeHooks } from './hooks/hook';
+export { getHooks, hook, hasHooks, Execution, executeHooks, injectProp, invokeExecution } from './hooks/hook';
 export { ExecutionContext } from './hooks/ExecutionContext';
 export { by, InstancePredicate, IMemo, IMemoKey, byAlias, byAliases } from './by';
 export { constructor } from './utils';