ts-ioc-container 32.0.5 → 32.0.7

package/README.md

@@ -25,17 +25,17 @@
     - [Scope](#scope) `tags`
     - [Instances](#instances)
     - [Dispose](#dispose)
-    - [Lazy](#lazy)
+    - [Lazy](#lazy) `lazy`
 - [Injector](#injector)
     - [Metadata](#metadata) `@inject`
     - [Simple](#simple)
     - [Proxy](#proxy)
 - [Provider](#provider) `@provider`
     - [Singleton](#singleton) `singleton`
-    - [Arguments](#arguments) `args`
+    - [Arguments](#arguments) `args` `argsFn`
     - [Visibility](#visibility) `visible`
     - [Alias](#alias) `alias`
-    - [Decorator](#decorator)
+    - [Decorator](#decorator) `decorate`
 - [Registration](#registration) `@register`
     - [Key](#key) `key`
     - [Scope](#scope) `scope`
@@ -1149,12 +1149,13 @@ import {
   Registration as R,
   register,
 } from 'ts-ioc-container';
+import { InjectOptions } from '../lib/injector/IInjector.ts';
 
 class MyInjector implements IInjector {
   private injector = new MetadataInjector();
 
-  resolve<T>(container: IContainer, value: constructor<T>, ...deps: unknown[]): T {
-    const instance = this.injector.resolve(container, value, ...deps);
+  resolve<T>(container: IContainer, value: constructor<T>, options: InjectOptions): T {
+    const instance = this.injector.resolve(container, value, options);
     // eslint-disable-next-line @typescript-eslint/ban-types
     for (const [h] of getHooks(instance as object, 'onConstruct')) {
       // @ts-ignore

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.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.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.startAutorun = exports.autorun = exports.byAliases = exports.byAlias = exports.IMemoKey = exports.by = 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.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; } });
@@ -59,6 +59,9 @@ Object.defineProperty(exports, "by", { enumerable: true, get: function () { retu
 Object.defineProperty(exports, "IMemoKey", { enumerable: true, get: function () { return by_1.IMemoKey; } });
 Object.defineProperty(exports, "byAlias", { enumerable: true, get: function () { return by_1.byAlias; } });
 Object.defineProperty(exports, "byAliases", { enumerable: true, get: function () { return by_1.byAliases; } });
+var autorun_1 = require("./utils/autorun");
+Object.defineProperty(exports, "autorun", { enumerable: true, get: function () { return autorun_1.autorun; } });
+Object.defineProperty(exports, "startAutorun", { enumerable: true, get: function () { return autorun_1.startAutorun; } });
 var metadata_1 = require("./metadata");
 Object.defineProperty(exports, "setMetadata", { enumerable: true, get: function () { return metadata_1.setMetadata; } });
 Object.defineProperty(exports, "getMetadata", { enumerable: true, get: function () { return metadata_1.getMetadata; } });

package/cjm/registration/Registration.js

@@ -34,6 +34,10 @@ class Registration {
         this.mappers.push(...mappers);
         return this;
     }
+    when(isValidWhen) {
+        this.matchScope = isValidWhen;
+        return this;
+    }
     applyTo(container) {
         if (!this.matchScope(container)) {
             return;
@@ -43,9 +47,5 @@ class Registration {
         }
         container.register(this.key, this.createProvider().pipe(...this.mappers));
     }
-    when(isValidWhen) {
-        this.matchScope = isValidWhen;
-        return this;
-    }
 }
 exports.Registration = Registration;

package/cjm/utils/autorun.js

@@ -0,0 +1,25 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.startAutorun = exports.getAutorunHooks = exports.autorun = void 0;
+const METADATA_KEY = 'autorun';
+const createStore = () => new Map();
+const autorun = (execute) => (target, propertyKey) => {
+    const hooks = Reflect.hasMetadata(METADATA_KEY, target.constructor)
+        ? Reflect.getMetadata(METADATA_KEY, target.constructor)
+        : createStore();
+    hooks.set(propertyKey, execute);
+    Reflect.defineMetadata(METADATA_KEY, hooks, target.constructor);
+};
+exports.autorun = autorun;
+const getAutorunHooks = (target) => {
+    return Reflect.hasMetadata(METADATA_KEY, target.constructor)
+        ? Reflect.getMetadata(METADATA_KEY, target.constructor)
+        : new Map();
+};
+exports.getAutorunHooks = getAutorunHooks;
+const startAutorun = (target, createContext = (c) => c) => {
+    for (const [methodName, execute] of (0, exports.getAutorunHooks)(target)) {
+        execute(createContext({ instance: target, methodName }));
+    }
+};
+exports.startAutorun = startAutorun;

package/esm/index.js

@@ -22,4 +22,5 @@ export { ContainerDisposedError } from './errors/ContainerDisposedError';
 // Others
 export { getHooks, hook, hasHooks } from './hook';
 export { by, IMemoKey, byAlias, byAliases } from './by';
+export { autorun, startAutorun } from './utils/autorun';
 export { setMetadata, getMetadata, setParameterMetadata, setMethodMetadata, getMethodMetadata, getParameterMetadata, } from './metadata';

package/esm/registration/Registration.js

@@ -31,6 +31,10 @@ export class Registration {
         this.mappers.push(...mappers);
         return this;
     }
+    when(isValidWhen) {
+        this.matchScope = isValidWhen;
+        return this;
+    }
     applyTo(container) {
         if (!this.matchScope(container)) {
             return;
@@ -40,8 +44,4 @@ export class Registration {
         }
         container.register(this.key, this.createProvider().pipe(...this.mappers));
     }
-    when(isValidWhen) {
-        this.matchScope = isValidWhen;
-        return this;
-    }
 }

package/esm/utils/autorun.js

@@ -0,0 +1,19 @@
+const METADATA_KEY = 'autorun';
+const createStore = () => new Map();
+export const autorun = (execute) => (target, propertyKey) => {
+    const hooks = Reflect.hasMetadata(METADATA_KEY, target.constructor)
+        ? Reflect.getMetadata(METADATA_KEY, target.constructor)
+        : createStore();
+    hooks.set(propertyKey, execute);
+    Reflect.defineMetadata(METADATA_KEY, hooks, target.constructor);
+};
+export const getAutorunHooks = (target) => {
+    return Reflect.hasMetadata(METADATA_KEY, target.constructor)
+        ? Reflect.getMetadata(METADATA_KEY, target.constructor)
+        : new Map();
+};
+export const startAutorun = (target, createContext = (c) => c) => {
+    for (const [methodName, execute] of getAutorunHooks(target)) {
+        execute(createContext({ instance: target, methodName }));
+    }
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ts-ioc-container",
-  "version": "32.0.5",
+  "version": "32.0.7",
   "description": "Typescript IoC container",
   "publishConfig": {
     "access": "public",
@@ -44,20 +44,20 @@
     "generate:docs": "ts-node scripts/generateReadme/generateReadme.ts && git add README.md",
     "build": "npm run build:cjm && npm run build:esm && npm run build:types",
     "coverage": "coveralls",
-    "watch": "nodemon --watch ./lib --exec npm run build",
-    "test": "jest --coverage"
+    "test": "jest --coverage",
+    "type-check": "tsc --noEmit",
+    "type-check:watch": "tsc --noEmit --watch"
   },
   "devDependencies": {
     "@types/jest": "27.0.2",
     "handlebars": "^4.7.7",
     "jest": "27.2.3",
     "moq.ts": "^7.3.4",
-    "nodemon": "^2.0.13",
     "reflect-metadata": "^0.2.2",
     "rimraf": "3.0.2",
     "ts-jest": "27.0.5",
     "ts-node": "^10.9.1",
     "typescript": "5.4.3"
   },
-  "gitHead": "28d8b339e45225487d5d1f1479bb216c6e299ac5"
+  "gitHead": "b8a57d6ba85affdbb5e743ac4653dbc6e65b3bc4"
 }

package/typings/index.d.ts

@@ -20,4 +20,5 @@ export { ContainerDisposedError } from './errors/ContainerDisposedError';
 export { getHooks, hook, hasHooks } from './hook';
 export { by, InstancePredicate, IMemo, IMemoKey, byAlias, byAliases } from './by';
 export { constructor } from './utils';
+export { autorun, startAutorun } from './utils/autorun';
 export { setMetadata, getMetadata, setParameterMetadata, setMethodMetadata, getMethodMetadata, getParameterMetadata, } from './metadata';

package/typings/registration/Registration.d.ts

@@ -13,6 +13,6 @@ export declare class Registration<T = unknown> implements IRegistration<T> {
     constructor(createProvider: () => IProvider<T>, key?: DependencyKey | undefined, matchScope?: ScopePredicate);
     to(key: DependencyKey): this;
     pipe(...mappers: MapFn<IProvider<T>>[]): this;
-    applyTo(container: IContainer): void;
     when(isValidWhen: ScopePredicate): this;
+    applyTo(container: IContainer): void;
 }

package/typings/utils/autorun.d.ts

@@ -0,0 +1,12 @@
+interface AutorunContext {
+    instance: object;
+    methodName: string;
+}
+type AutorunHandler = <T extends AutorunContext>(context: T) => void;
+export declare const autorun: (execute: AutorunHandler) => MethodDecorator;
+export declare const getAutorunHooks: (target: object) => Map<string, AutorunHandler>;
+export declare const startAutorun: <Context extends AutorunContext>(target: object, createContext?: (props: {
+    instance: object;
+    methodName: string;
+}) => Context) => void;
+export {};