ts-ioc-container 32.6.2 → 32.8.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,7 @@
 - [Hook](#hook) `@hook`
     - [OnConstruct](#onconstruct) `@onConstruct`
     - [OnDispose](#ondispose) `@onDispose`
+    - [Inject Property](#inject-property)
 - [Mock](#mock)
 - [Error](#error)
 
@@ -357,6 +360,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 +1259,29 @@ 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);
+  });
+});
+
+```
+
 ## 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,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.executeHooks = exports.hasHooks = exports.getHooks = exports.hook = void 0;
+exports.executeHooks = exports.hasHooks = exports.getHooks = exports.hook = exports.injectProp = void 0;
 const ExecutionContext_1 = require("./ExecutionContext");
-const createStore = () => new Map();
+const injectProp = (fn) => (context) => context.injectProperty(fn);
+exports.injectProp = injectProp;
 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
 };

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.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,16 @@ 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; } });
 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/cjm/provider/DecoratorProvider.js

@@ -8,7 +8,7 @@ class DecoratorProvider extends IProvider_1.ProviderDecorator {
         this.provider = provider;
         this.decorateFn = decorateFn;
     }
-    resolveInstantly(scope, options) {
+    resolve(scope, options) {
         const dependency = this.provider.resolve(scope, options);
         return this.decorateFn(dependency, scope);
     }

package/cjm/provider/IProvider.js

@@ -31,8 +31,8 @@ class ProviderDecorator {
     isVisible(parent, child) {
         return this.decorated.isVisible(parent, child);
     }
-    resolve(container, { args, lazy }) {
-        return (0, utils_1.lazyInstance)(() => this.resolveInstantly(container, { args }), lazy);
+    resolve(container, options) {
+        return this.decorated.resolve(container, options);
     }
     pipe(...mappers) {
         return (0, utils_1.pipe)(...mappers)(this);

package/cjm/provider/Provider.js

@@ -21,8 +21,12 @@ class Provider {
     pipe(...mappers) {
         return (0, utils_1.pipe)(...mappers)(this);
     }
-    resolve(container, { args, lazy }) {
-        return (0, utils_1.lazyInstance)(() => this.resolveDependency(container, { args: [...this.argsFn(container, ...args), ...args] }), lazy);
+    resolve(container, { args, lazy: isLazy }) {
+        const resolveDependency = () => {
+            const deps = [...this.argsFn(container, ...args), ...args];
+            return this.resolveDependency(container, { args: deps });
+        };
+        return isLazy ? (0, utils_1.lazyProxy)(resolveDependency) : resolveDependency();
     }
     setVisibility(predicate) {
         this.isVisibleWhen = predicate;

package/cjm/provider/singleton/SingletonProvider.js

@@ -13,7 +13,7 @@ class SingletonProvider extends IProvider_1.ProviderDecorator {
         this.provider = provider;
         this.cache = cache;
     }
-    resolveInstantly(container, options) {
+    resolve(container, options) {
         const key = this.cache.getKey(...options.args);
         if (!this.cache.hasValue(key)) {
             this.cache.setValue(key, this.provider.resolve(container, options));

package/cjm/utils.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.lazyInstance = exports.isConstructor = exports.constant = exports.fillEmptyIndexes = exports.pipe = void 0;
+exports.lazyProxy = exports.isConstructor = exports.constant = exports.fillEmptyIndexes = exports.pipe = void 0;
 const pipe = (...mappers) => (value) => mappers.reduce((acc, current) => current(acc), value);
 exports.pipe = pipe;
 function fillEmptyIndexes(baseArr, insertArr) {
@@ -18,10 +18,7 @@ const constant = (value) => () => value;
 exports.constant = constant;
 const isConstructor = (T) => typeof T === 'function' && !!T.prototype;
 exports.isConstructor = isConstructor;
-function lazyInstance(resolveInstance, isLazy) {
-    if (!isLazy) {
-        return resolveInstance();
-    }
+function lazyProxy(resolveInstance) {
     let instance;
     return new Proxy({}, {
         get: (_, prop) => {
@@ -31,4 +28,4 @@ function lazyInstance(resolveInstance, isLazy) {
         },
     });
 }
-exports.lazyInstance = lazyInstance;
+exports.lazyProxy = lazyProxy;

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();
+export const injectProp = (fn) => (context) => context.injectProperty(fn);
 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
 };

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 } 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/esm/provider/DecoratorProvider.js

@@ -5,7 +5,7 @@ export class DecoratorProvider extends ProviderDecorator {
         this.provider = provider;
         this.decorateFn = decorateFn;
     }
-    resolveInstantly(scope, options) {
+    resolve(scope, options) {
         const dependency = this.provider.resolve(scope, options);
         return this.decorateFn(dependency, scope);
     }

package/esm/provider/IProvider.js

@@ -1,4 +1,4 @@
-import { lazyInstance, pipe } from '../utils';
+import { pipe } from '../utils';
 import { getMetadata, setMetadata } from '../metadata';
 export function args(...extraArgs) {
     return (provider) => provider.setArgs(() => extraArgs);
@@ -22,8 +22,8 @@ export class ProviderDecorator {
     isVisible(parent, child) {
         return this.decorated.isVisible(parent, child);
     }
-    resolve(container, { args, lazy }) {
-        return lazyInstance(() => this.resolveInstantly(container, { args }), lazy);
+    resolve(container, options) {
+        return this.decorated.resolve(container, options);
     }
     pipe(...mappers) {
         return pipe(...mappers)(this);

package/esm/provider/Provider.js

@@ -1,5 +1,5 @@
 import { getTransformers, } from './IProvider';
-import { isConstructor, lazyInstance, pipe } from '../utils';
+import { isConstructor, lazyProxy, pipe } from '../utils';
 export class Provider {
     static fromClass(Target) {
         const transformers = getTransformers(Target);
@@ -18,8 +18,12 @@ export class Provider {
     pipe(...mappers) {
         return pipe(...mappers)(this);
     }
-    resolve(container, { args, lazy }) {
-        return lazyInstance(() => this.resolveDependency(container, { args: [...this.argsFn(container, ...args), ...args] }), lazy);
+    resolve(container, { args, lazy: isLazy }) {
+        const resolveDependency = () => {
+            const deps = [...this.argsFn(container, ...args), ...args];
+            return this.resolveDependency(container, { args: deps });
+        };
+        return isLazy ? lazyProxy(resolveDependency) : resolveDependency();
     }
     setVisibility(predicate) {
         this.isVisibleWhen = predicate;

package/esm/provider/singleton/SingletonProvider.js

@@ -9,7 +9,7 @@ export class SingletonProvider extends ProviderDecorator {
         this.provider = provider;
         this.cache = cache;
     }
-    resolveInstantly(container, options) {
+    resolve(container, options) {
         const key = this.cache.getKey(...options.args);
         if (!this.cache.hasValue(key)) {
             this.cache.setValue(key, this.provider.resolve(container, options));

package/esm/utils.js

@@ -11,10 +11,7 @@ export function fillEmptyIndexes(baseArr, insertArr) {
 }
 export const constant = (value) => () => value;
 export const isConstructor = (T) => typeof T === 'function' && !!T.prototype;
-export function lazyInstance(resolveInstance, isLazy) {
-    if (!isLazy) {
-        return resolveInstance();
-    }
+export function lazyProxy(resolveInstance) {
     let instance;
     return new Proxy({}, {
         get: (_, prop) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ts-ioc-container",
-  "version": "32.6.2",
+  "version": "32.8.0",
   "description": "Typescript IoC container",
   "publishConfig": {
     "access": "public",
@@ -59,5 +59,5 @@
     "ts-node": "^10.9.1",
     "typescript": "5.4.3"
   },
-  "gitHead": "b51eb6fbe46b4e144453a5b6a421b2ceb486d8a7"
+  "gitHead": "a2647045895a5eae9199e84d613cc5cb735c111c"
 }

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,6 +1,8 @@
 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 injectProp: (fn: InjectFn) => Execution;
 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[]>;
 export declare function hasHooks(target: object, key: string | symbol): boolean;

package/typings/index.d.ts

@@ -6,7 +6,7 @@ export { IInjector } from './injector/IInjector';
 export { MetadataInjector, inject, resolveArgs, getInjectFns, InjectFn } from './injector/MetadataInjector';
 export { SimpleInjector } from './injector/SimpleInjector';
 export { ProxyInjector } from './injector/ProxyInjector';
-export { ResolveDependency, IProvider, provider, visible, alias, argsFn, args, ArgsFn, ProviderDecorator, InstantDependencyOptions, ProviderResolveOptions, } from './provider/IProvider';
+export { ResolveDependency, IProvider, provider, visible, alias, argsFn, args, ArgsFn, ProviderDecorator, ProviderResolveOptions, } from './provider/IProvider';
 export { Provider } from './provider/Provider';
 export { singleton, SingletonProvider } from './provider/singleton/SingletonProvider';
 export { MultiCache, multiCache } from './provider/singleton/MultiCache';
@@ -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 } from './hooks/hook';
 export { ExecutionContext } from './hooks/ExecutionContext';
 export { by, InstancePredicate, IMemo, IMemoKey, byAlias, byAliases } from './by';
 export { constructor } from './utils';

package/typings/provider/DecoratorProvider.d.ts

@@ -1,10 +1,10 @@
 import { IContainer } from '../container/IContainer';
-import { InstantDependencyOptions, IProvider, ProviderDecorator } from './IProvider';
+import { IProvider, ProviderDecorator, ProviderResolveOptions } from './IProvider';
 export type DecorateFn<Instance> = (dep: Instance, scope: IContainer) => Instance;
 export declare class DecoratorProvider<Instance> extends ProviderDecorator<Instance> {
     private provider;
     private decorateFn;
     constructor(provider: IProvider<Instance>, decorateFn: DecorateFn<Instance>);
-    resolveInstantly(scope: IContainer, options: InstantDependencyOptions): Instance;
+    resolve(scope: IContainer, options: ProviderResolveOptions): Instance;
 }
 export declare const decorate: <Instance>(decorateFn: DecorateFn<Instance>) => (provider: IProvider<Instance>) => DecoratorProvider<Instance>;

package/typings/provider/IProvider.d.ts

@@ -4,7 +4,6 @@ export type ProviderResolveOptions = {
     args: unknown[];
     lazy?: boolean;
 };
-export type InstantDependencyOptions = Omit<ProviderResolveOptions, 'lazy'>;
 export type ResolveDependency<T = unknown> = (container: IContainer, options: ProviderResolveOptions) => T;
 export type ChildrenVisibilityPredicate = (options: {
     child: Tagged;
@@ -31,8 +30,7 @@ export declare abstract class ProviderDecorator<T> implements IProvider<T> {
     protected constructor(decorated: IProvider<T>);
     setVisibility(predicate: ChildrenVisibilityPredicate): this;
     isVisible(parent: IContainer, child: Tagged): boolean;
-    resolve(container: IContainer, { args, lazy }: ProviderResolveOptions): T;
-    protected abstract resolveInstantly(container: IContainer, options: InstantDependencyOptions): T;
+    resolve(container: IContainer, options: ProviderResolveOptions): T;
     pipe(...mappers: MapFn<IProvider<T>>[]): IProvider<T>;
     matchAliases(predicate: AliasPredicate): boolean;
     addAliases(...aliases: Alias[]): this;

package/typings/provider/Provider.d.ts

@@ -10,7 +10,7 @@ export declare class Provider<T> implements IProvider<T> {
     private isVisibleWhen;
     constructor(resolveDependency: ResolveDependency<T>);
     pipe(...mappers: MapFn<IProvider<T>>[]): IProvider<T>;
-    resolve(container: IContainer, { args, lazy }: ProviderResolveOptions): T;
+    resolve(container: IContainer, { args, lazy: isLazy }: ProviderResolveOptions): T;
     setVisibility(predicate: ChildrenVisibilityPredicate): this;
     setArgs(argsFn: ArgsFn): this;
     isVisible(parent: Tagged, child: Tagged): boolean;

package/typings/provider/singleton/SingletonProvider.d.ts

@@ -1,5 +1,5 @@
 import { IContainer } from '../../container/IContainer';
-import { InstantDependencyOptions, IProvider, ProviderDecorator } from '../IProvider';
+import { IProvider, ProviderDecorator, ProviderResolveOptions } from '../IProvider';
 import { MapFn } from '../../utils';
 import { Cache } from './Cache';
 export declare function singleton<T = unknown>(cacheProvider?: () => Cache<unknown, T>): MapFn<IProvider<T>>;
@@ -7,5 +7,5 @@ export declare class SingletonProvider<T> extends ProviderDecorator<T> {
     private readonly provider;
     private readonly cache;
     constructor(provider: IProvider<T>, cache: Cache<unknown, T>);
-    resolveInstantly(container: IContainer, options: InstantDependencyOptions): T;
+    resolve(container: IContainer, options: ProviderResolveOptions): T;
 }

package/typings/utils.d.ts

@@ -4,4 +4,4 @@ export declare const pipe: <T>(...mappers: MapFn<T>[]) => MapFn<T>;
 export declare function fillEmptyIndexes<T>(baseArr: (T | undefined)[], insertArr: T[]): T[];
 export declare const constant: <T>(value: T) => () => T;
 export declare const isConstructor: (T: unknown) => T is constructor<unknown>;
-export declare function lazyInstance<T>(resolveInstance: () => T, isLazy?: boolean): T;
+export declare function lazyProxy<T>(resolveInstance: () => T): T;