ts-ioc-container 47.1.0 → 47.2.0

package/README.md

@@ -1572,7 +1572,7 @@ describe('ProxyInjector', function () {
     // In a real scenario, you'd register multiple loggers with the same alias.
     const mockLoggers = [new FileLogger(), new ConsoleLogger()];
 
-    container.resolveByAlias = jest.fn().mockReturnValue(mockLoggers);
+    container.resolveByAlias = vi.fn().mockReturnValue(mockLoggers);
 
     const app = container.resolve(App);
 

package/cjm/hooks/HookContext.js

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

package/cjm/hooks/HooksRunner.js

@@ -1,20 +1,19 @@
 "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, contextBuilder = new HookContextBuilder_1.DefaultHookContextBuilder(), predicate = () => true }) {
+    execute(target, { scope, createContext = HookContext_1.createHookContext, 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 = contextBuilder.build({ methodName });
+            const context = createContext(target, scope, methodName);
             for (const execute of executions) {
                 const result = execute(context);
                 if (result instanceof Promise) {
@@ -26,11 +25,10 @@ class HooksRunner {
             runMethodHooks(methodName, executions.map(hook_1.toHookFn));
         }
     }
-    async executeAsync(target, { scope, contextBuilder = new HookContextBuilder_1.DefaultHookContextBuilder(), predicate = () => true }) {
+    async executeAsync(target, { scope, createContext = HookContext_1.createHookContext, 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 = contextBuilder.build({ methodName });
+            const context = createContext(target, scope, 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.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;
+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.createHookContext = exports.createHookContextFactory = 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 = exports.FunctionToken = exports.SingleToken = void 0;
 // Containers
 var IContainer_1 = require("./container/IContainer");
 Object.defineProperty(exports, "isDependencyKey", { enumerable: true, get: function () { return IContainer_1.isDependencyKey; } });
@@ -64,6 +64,8 @@ Object.defineProperty(exports, "hook", { enumerable: true, get: function () { re
 Object.defineProperty(exports, "hasHooks", { enumerable: true, get: function () { return hook_1.hasHooks; } });
 var HookContext_1 = require("./hooks/HookContext");
 Object.defineProperty(exports, "HookContext", { enumerable: true, get: function () { return HookContext_1.HookContext; } });
+Object.defineProperty(exports, "createHookContextFactory", { enumerable: true, get: function () { return HookContext_1.createHookContextFactory; } });
+Object.defineProperty(exports, "createHookContext", { enumerable: true, get: function () { return HookContext_1.createHookContext; } });
 var injectProp_1 = require("./hooks/injectProp");
 Object.defineProperty(exports, "injectProp", { enumerable: true, get: function () { return injectProp_1.injectProp; } });
 var onConstruct_1 = require("./hooks/onConstruct");
@@ -128,5 +130,3 @@ 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,3 +26,5 @@ export class HookContext {
         return this;
     }
 }
+export const createHookContext = (Target, scope, methodName = 'constructor') => new HookContext(Target, scope, methodName);
+export const createHookContextFactory = ({ args = [] } = {}) => (Target, scope, methodName) => createHookContext(Target, scope, methodName).setInitialArgs(...args);

package/esm/hooks/HooksRunner.js

@@ -1,17 +1,16 @@
+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, contextBuilder = new DefaultHookContextBuilder(), predicate = () => true }) {
+    execute(target, { scope, createContext = createHookContext, 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 = contextBuilder.build({ methodName });
+            const context = createContext(target, scope, methodName);
             for (const execute of executions) {
                 const result = execute(context);
                 if (result instanceof Promise) {
@@ -23,11 +22,10 @@ export class HooksRunner {
             runMethodHooks(methodName, executions.map(toHookFn));
         }
     }
-    async executeAsync(target, { scope, contextBuilder = new DefaultHookContextBuilder(), predicate = () => true }) {
+    async executeAsync(target, { scope, createContext = createHookContext, 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 = contextBuilder.build({ methodName });
+            const context = createContext(target, scope, methodName);
             for (const execute of executions) {
                 await promisify(execute(context));
             }

package/esm/index.js

@@ -25,7 +25,7 @@ export { ContainerDisposedError } from './errors/ContainerDisposedError';
 export { UnexpectedHookResultError } from './errors/UnexpectedHookResultError';
 // Hooks
 export { getHooks, hook, hasHooks } from './hooks/hook';
-export { HookContext } from './hooks/HookContext';
+export { HookContext, createHookContextFactory, createHookContext } from './hooks/HookContext';
 export { injectProp } from './hooks/injectProp';
 export { onConstructHooksRunner, onConstruct, AddOnConstructHookModule } from './hooks/onConstruct';
 export { onDisposeHooksRunner, onDispose, AddOnDisposeHookModule } from './hooks/onDispose';
@@ -48,4 +48,3 @@ 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.1.0",
+  "version": "47.2.0",
   "description": "Typescript IoC container",
   "workspaces": [
     "docs"
@@ -46,8 +46,8 @@
     "build:types": "rimraf typings && tsc -p tsconfig.production.json --outDir typings --emitDeclarationOnly --declaration",
     "generate:docs": "scripts/generate-readme/generate-readme.ts && git add README.md",
     "build": "npm run build:cjm && npm run build:esm && npm run build:types",
-    "test": "jest",
-    "test:coverage": "jest --coverage --coverageReporters=lcov --coverageReporters=text-summary",
+    "test": "vitest run",
+    "test:coverage": "vitest run --coverage --coverage.reporter=lcov",
     "type-check": "tsc --noEmit",
     "type-check:watch": "tsc --noEmit --watch",
     "commit": "cz",
@@ -71,27 +71,29 @@
     "@semantic-release/git": "^10.0.1",
     "@semantic-release/github": "^12.0.2",
     "@semantic-release/npm": "^13.1.2",
-    "@types/jest": "29.5.14",
+    "@swc/core": "^1.15.24",
     "@types/node": "^25.5.2",
     "@typescript-eslint/eslint-plugin": "8.29.1",
     "@typescript-eslint/parser": "8.29.1",
+    "@vitest/coverage-v8": "^4.1.2",
     "cz-conventional-changelog": "^3.3.0",
     "eslint": "9.24.0",
     "eslint-config-prettier": "10.1.1",
     "eslint-plugin-prettier": "5.2.6",
     "handlebars": "^4.7.8",
     "husky": "^9.1.7",
-    "jest": "29.7.0",
     "lint-staged": "^15.5.0",
-    "moq.ts": "^7.4.1",
+    "moq.ts": "^10.0.8",
     "prettier": "3.5.3",
     "prettier-plugin-astro": "^0.14.1",
     "reflect-metadata": "^0.2.2",
     "rimraf": "6.0.1",
     "semantic-release": "^25.0.2",
-    "ts-jest": "29.3.1",
     "tsx": "^4.21.0",
-    "typescript": "5.8.3"
+    "typescript": "5.8.3",
+    "unplugin-swc": "^1.5.9",
+    "vite": "^6.4.1",
+    "vitest": "^4.1.2"
   },
   "lint-staged": {
     "*.{js,ts,tsx}": [

package/typings/hooks/HookContext.d.ts

@@ -24,3 +24,8 @@ 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;
+export declare const createHookContextFactory: ({ args }?: {
+    args?: unknown[];
+}) => CreateHookContext;

package/typings/hooks/HooksRunner.d.ts

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

package/typings/index.d.ts

@@ -20,7 +20,7 @@ export { MethodNotImplementedError } from './errors/MethodNotImplementedError';
 export { ContainerDisposedError } from './errors/ContainerDisposedError';
 export { UnexpectedHookResultError } from './errors/UnexpectedHookResultError';
 export { getHooks, hook, hasHooks, type HookFn, type HookClass, type InjectFn, type HooksOfClass } from './hooks/hook';
-export { HookContext, type IHookContext } from './hooks/HookContext';
+export { HookContext, createHookContextFactory, createHookContext, type IHookContext } from './hooks/HookContext';
 export { injectProp } from './hooks/injectProp';
 export { onConstructHooksRunner, onConstruct, AddOnConstructHookModule } from './hooks/onConstruct';
 export { onDisposeHooksRunner, onDispose, AddOnDisposeHookModule } from './hooks/onDispose';
@@ -40,4 +40,3 @@ 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';

package/cjm/hooks/HookContextBuilder.js

@@ -1,25 +0,0 @@
-"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/esm/hooks/HookContextBuilder.js

@@ -1,21 +0,0 @@
-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/typings/hooks/HookContextBuilder.d.ts

@@ -1,19 +0,0 @@
-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;
-}