ts-ioc-container 47.0.2 → 47.1.0

package/cjm/hooks/HookContext.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createHookContext = exports.HookContext = void 0;
+exports.HookContext = void 0;
 const inject_1 = require("../injector/inject");
 const proxy_1 = require("../utils/proxy");
 class HookContext {
@@ -30,5 +30,3 @@ class HookContext {
     }
 }
 exports.HookContext = HookContext;
-const createHookContext = (Target, scope, methodName = 'constructor') => new HookContext(Target, scope, methodName);
-exports.createHookContext = createHookContext;

package/cjm/hooks/HookContextBuilder.js

@@ -0,0 +1,25 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.DefaultHookContextBuilder = void 0;
+const HookContext_1 = require("./HookContext");
+class DefaultHookContextBuilder {
+    options = {};
+    initialArgs = [];
+    build(context) {
+        const target = context.target ?? this.options.target;
+        const scope = context.scope ?? this.options.scope;
+        const methodName = context.methodName ?? context.methodName;
+        return new HookContext_1.HookContext(target, scope, methodName).setInitialArgs(...this.initialArgs);
+    }
+    mergeOptions(context) {
+        this.options = {
+            ...this.options,
+            ...context,
+        };
+    }
+    appendArgs(...args) {
+        this.initialArgs.push(...args);
+        return this;
+    }
+}
+exports.DefaultHookContextBuilder = DefaultHookContextBuilder;

package/cjm/hooks/HooksRunner.js

@@ -1,19 +1,20 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.HooksRunner = void 0;
-const HookContext_1 = require("./HookContext");
 const hook_1 = require("./hook");
 const UnexpectedHookResultError_1 = require("../errors/UnexpectedHookResultError");
 const promise_1 = require("../utils/promise");
+const HookContextBuilder_1 = require("./HookContextBuilder");
 class HooksRunner {
     key;
     constructor(key) {
         this.key = key;
     }
-    execute(target, { scope, createContext = HookContext_1.createHookContext, predicate = () => true }) {
+    execute(target, { scope, contextBuilder = new HookContextBuilder_1.DefaultHookContextBuilder(), predicate = () => true }) {
         const hooks = Array.from((0, hook_1.getHooks)(target, this.key).entries()).filter(([methodName]) => predicate(methodName));
+        contextBuilder.mergeOptions({ target, scope });
         const runMethodHooks = (methodName, executions) => {
-            const context = createContext(target, scope, methodName);
+            const context = contextBuilder.build({ methodName });
             for (const execute of executions) {
                 const result = execute(context);
                 if (result instanceof Promise) {
@@ -25,10 +26,11 @@ class HooksRunner {
             runMethodHooks(methodName, executions.map(hook_1.toHookFn));
         }
     }
-    async executeAsync(target, { scope, createContext = HookContext_1.createHookContext, predicate = () => true, }) {
+    async executeAsync(target, { scope, contextBuilder = new HookContextBuilder_1.DefaultHookContextBuilder(), predicate = () => true }) {
         const hooks = Array.from((0, hook_1.getHooks)(target, this.key).entries()).filter(([methodName]) => predicate(methodName));
+        contextBuilder.mergeOptions({ target, scope });
         const runMethodHooks = async (methodName, executions) => {
-            const context = createContext(target, scope, methodName);
+            const context = contextBuilder.build({ methodName });
             for (const execute of executions) {
                 await (0, promise_1.promisify)(execute(context));
             }

package/cjm/index.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FunctionToken = exports.SingleToken = exports.ClassToken = exports.toSingleAlias = exports.SingleAliasToken = exports.toGroupAlias = exports.GroupAliasToken = exports.InjectionToken = exports.HooksRunner = exports.AddOnDisposeHookModule = exports.onDispose = exports.onDisposeHooksRunner = exports.AddOnConstructHookModule = exports.onConstruct = exports.onConstructHooksRunner = exports.injectProp = exports.HookContext = exports.hasHooks = exports.hook = exports.getHooks = exports.UnexpectedHookResultError = exports.ContainerDisposedError = exports.MethodNotImplementedError = exports.DependencyMissingKeyError = exports.DependencyNotFoundError = exports.Registration = exports.bindTo = exports.register = exports.scope = exports.decorate = exports.MultiCache = exports.multiCache = exports.SingletonProvider = exports.singleton = exports.Provider = exports.resolveByArgs = exports.ProviderDecorator = exports.args = exports.argsFn = exports.lazy = exports.scopeAccess = exports.ProxyInjector = exports.SimpleInjector = exports.MetadataInjector = exports.Injector = exports.resolveArgs = exports.inject = exports.EmptyContainer = exports.Container = exports.isDependencyKey = void 0;
-exports.resolveConstructor = exports.Is = exports.pipe = exports.select = exports.getMethodTags = exports.methodTag = exports.getMethodLabels = exports.methodLabel = exports.getMethodMeta = exports.methodMeta = exports.getParamTags = exports.paramTag = exports.getParamLabels = exports.paramLabel = exports.getParamMeta = exports.paramMeta = exports.getClassTags = exports.classTag = exports.getClassLabels = exports.classLabel = exports.getClassMeta = exports.classMeta = exports.handleAsyncError = exports.handleError = exports.GroupInstanceToken = exports.ConstantToken = void 0;
+exports.DefaultHookContextBuilder = exports.resolveConstructor = exports.Is = exports.pipe = exports.select = exports.getMethodTags = exports.methodTag = exports.getMethodLabels = exports.methodLabel = exports.getMethodMeta = exports.methodMeta = exports.getParamTags = exports.paramTag = exports.getParamLabels = exports.paramLabel = exports.getParamMeta = exports.paramMeta = exports.getClassTags = exports.classTag = exports.getClassLabels = exports.classLabel = exports.getClassMeta = exports.classMeta = exports.handleAsyncError = exports.handleError = exports.GroupInstanceToken = exports.ConstantToken = void 0;
 // Containers
 var IContainer_1 = require("./container/IContainer");
 Object.defineProperty(exports, "isDependencyKey", { enumerable: true, get: function () { return IContainer_1.isDependencyKey; } });
@@ -128,3 +128,5 @@ Object.defineProperty(exports, "pipe", { enumerable: true, get: function () { re
 var basic_1 = require("./utils/basic");
 Object.defineProperty(exports, "Is", { enumerable: true, get: function () { return basic_1.Is; } });
 Object.defineProperty(exports, "resolveConstructor", { enumerable: true, get: function () { return basic_1.resolveConstructor; } });
+var HookContextBuilder_1 = require("./hooks/HookContextBuilder");
+Object.defineProperty(exports, "DefaultHookContextBuilder", { enumerable: true, get: function () { return HookContextBuilder_1.DefaultHookContextBuilder; } });

package/esm/hooks/HookContext.js

@@ -26,4 +26,3 @@ export class HookContext {
         return this;
     }
 }
-export const createHookContext = (Target, scope, methodName = 'constructor') => new HookContext(Target, scope, methodName);

package/esm/hooks/HookContextBuilder.js

@@ -0,0 +1,21 @@
+import { HookContext } from './HookContext';
+export class DefaultHookContextBuilder {
+    options = {};
+    initialArgs = [];
+    build(context) {
+        const target = context.target ?? this.options.target;
+        const scope = context.scope ?? this.options.scope;
+        const methodName = context.methodName ?? context.methodName;
+        return new HookContext(target, scope, methodName).setInitialArgs(...this.initialArgs);
+    }
+    mergeOptions(context) {
+        this.options = {
+            ...this.options,
+            ...context,
+        };
+    }
+    appendArgs(...args) {
+        this.initialArgs.push(...args);
+        return this;
+    }
+}

package/esm/hooks/HooksRunner.js

@@ -1,16 +1,17 @@
-import { createHookContext } from './HookContext';
 import { getHooks, toHookFn } from './hook';
 import { UnexpectedHookResultError } from '../errors/UnexpectedHookResultError';
 import { promisify } from '../utils/promise';
+import { DefaultHookContextBuilder } from './HookContextBuilder';
 export class HooksRunner {
     key;
     constructor(key) {
         this.key = key;
     }
-    execute(target, { scope, createContext = createHookContext, predicate = () => true }) {
+    execute(target, { scope, contextBuilder = new DefaultHookContextBuilder(), predicate = () => true }) {
         const hooks = Array.from(getHooks(target, this.key).entries()).filter(([methodName]) => predicate(methodName));
+        contextBuilder.mergeOptions({ target, scope });
         const runMethodHooks = (methodName, executions) => {
-            const context = createContext(target, scope, methodName);
+            const context = contextBuilder.build({ methodName });
             for (const execute of executions) {
                 const result = execute(context);
                 if (result instanceof Promise) {
@@ -22,10 +23,11 @@ export class HooksRunner {
             runMethodHooks(methodName, executions.map(toHookFn));
         }
     }
-    async executeAsync(target, { scope, createContext = createHookContext, predicate = () => true, }) {
+    async executeAsync(target, { scope, contextBuilder = new DefaultHookContextBuilder(), predicate = () => true }) {
         const hooks = Array.from(getHooks(target, this.key).entries()).filter(([methodName]) => predicate(methodName));
+        contextBuilder.mergeOptions({ target, scope });
         const runMethodHooks = async (methodName, executions) => {
-            const context = createContext(target, scope, methodName);
+            const context = contextBuilder.build({ methodName });
             for (const execute of executions) {
                 await promisify(execute(context));
             }

package/esm/index.js

@@ -48,3 +48,4 @@ export { methodMeta, getMethodMeta, methodLabel, getMethodLabels, methodTag, get
 export { select } from './select';
 export { pipe } from './utils/fp';
 export { Is, resolveConstructor } from './utils/basic';
+export { DefaultHookContextBuilder } from './hooks/HookContextBuilder';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ts-ioc-container",
-  "version": "47.0.2",
+  "version": "47.1.0",
   "description": "Typescript IoC container",
   "workspaces": [
     "docs"

package/typings/hooks/HookContext.d.ts

@@ -24,5 +24,3 @@ export declare class HookContext implements IHookContext {
     setProperty(fn: InjectionToken): void;
     setInitialArgs(...args: unknown[]): this;
 }
-export type CreateHookContext = (Target: object, scope: IContainer, methodName?: string) => IHookContext;
-export declare const createHookContext: CreateHookContext;

package/typings/hooks/HookContextBuilder.d.ts

@@ -0,0 +1,19 @@
+import type { IContainer } from '../container/IContainer';
+import { IHookContext } from './HookContext';
+export type HookContextBuilderOptions = {
+    target: object;
+    scope: IContainer;
+    methodName: string;
+};
+export interface IHookContextBuilder {
+    mergeOptions(context: Partial<HookContextBuilderOptions>): void;
+    build(context: Partial<HookContextBuilderOptions>): IHookContext;
+    appendArgs(...args: unknown[]): this;
+}
+export declare class DefaultHookContextBuilder implements IHookContextBuilder {
+    private options;
+    private initialArgs;
+    build(context: Partial<HookContextBuilderOptions>): IHookContext;
+    mergeOptions(context: Partial<HookContextBuilderOptions>): void;
+    appendArgs(...args: unknown[]): this;
+}

package/typings/hooks/HooksRunner.d.ts

@@ -1,17 +1,13 @@
-import { createHookContext, type CreateHookContext } from './HookContext';
 import type { IContainer } from '../container/IContainer';
+import { IHookContextBuilder } from './HookContextBuilder';
 export type HooksRunnerContext = {
     scope: IContainer;
-    createContext?: CreateHookContext;
+    contextBuilder?: IHookContextBuilder;
     predicate?: (methodName: string) => boolean;
 };
 export declare class HooksRunner {
     private readonly key;
     constructor(key: string | symbol);
-    execute(target: object, { scope, createContext, predicate }: HooksRunnerContext): void;
-    executeAsync(target: object, { scope, createContext, predicate, }: {
-        scope: IContainer;
-        createContext?: typeof createHookContext;
-        predicate?: (methodName: string) => boolean;
-    }): Promise<void[]>;
+    execute(target: object, { scope, contextBuilder, predicate }: HooksRunnerContext): void;
+    executeAsync(target: object, { scope, contextBuilder, predicate }: HooksRunnerContext): Promise<void[]>;
 }

package/typings/index.d.ts

@@ -40,3 +40,4 @@ export { methodMeta, getMethodMeta, methodLabel, getMethodLabels, methodTag, get
 export { select } from './select';
 export { pipe, type MapFn } from './utils/fp';
 export { type constructor, type Instance, Is, resolveConstructor } from './utils/basic';
+export { type IHookContextBuilder, DefaultHookContextBuilder } from './hooks/HookContextBuilder';