ts-ioc-container 35.2.1 → 35.2.3

package/cjm/container/IContainer.js

@@ -5,7 +5,7 @@ function isDependencyKey(token) {
     return ['string', 'symbol'].includes(typeof token);
 }
 exports.isDependencyKey = isDependencyKey;
-function isConstructor(token) {
-    return typeof token === 'function';
-}
+const isConstructor = (T) => {
+    return typeof T === 'function' && !!T.prototype && !!T.prototype.constructor;
+};
 exports.isConstructor = isConstructor;

package/cjm/errors/UnexpectedHookResultError.js

@@ -0,0 +1,11 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.UnexpectedHookResultError = void 0;
+class UnexpectedHookResultError extends Error {
+    constructor(message) {
+        super(message);
+        this.name = 'UnexpectedHookResultError';
+        Object.setPrototypeOf(this, UnexpectedHookResultError.prototype);
+    }
+}
+exports.UnexpectedHookResultError = UnexpectedHookResultError;

package/cjm/hooks/hook.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.injectProp = exports.runHooksAsync = exports.runHooks = exports.hasHooks = exports.getHooks = exports.hook = void 0;
 const HookContext_1 = require("./HookContext");
 const utils_1 = require("../utils");
+const UnexpectedHookResultError_1 = require("../errors/UnexpectedHookResultError");
 const isHookClassConstructor = (execute) => {
     return (0, utils_1.isConstructor)(execute) && execute.prototype.execute;
 };
@@ -27,11 +28,9 @@ const runHooks = (target, key, { scope, createContext = HookContext_1.createHook
     for (const [methodName, executions] of hooks) {
         for (const execute of executions) {
             const context = createContext(target, scope, methodName);
-            if (isHookClassConstructor(execute)) {
-                scope.resolve(execute).execute(context);
-            }
-            else {
-                execute(context);
+            const result = isHookClassConstructor(execute) ? scope.resolve(execute).execute(context) : execute(context);
+            if (result instanceof Promise) {
+                throw new UnexpectedHookResultError_1.UnexpectedHookResultError(`Hook ${methodName} returned a promise, use runHooksAsync instead`);
             }
         }
     }

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.depKey = exports.byAliases = exports.byAlias = exports.IMemoKey = exports.by = exports.HookContext = exports.injectProp = exports.runHooksAsync = exports.runHooks = exports.hasHooks = exports.hook = exports.getHooks = exports.ContainerDisposedError = exports.MethodNotImplementedError = exports.DependencyNotFoundError = exports.Registration = exports.redirectFrom = 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.MetadataInjector = exports.resolveArgs = exports.inject = exports.AutoMockedContainer = exports.EmptyContainer = exports.Container = exports.isDependencyKey = void 0;
+exports.getParameterMetadata = exports.getMethodMetadata = exports.setMethodMetadata = exports.setParameterMetadata = exports.getMetadata = exports.setMetadata = exports.depKey = exports.byAliases = exports.byAlias = exports.IMemoKey = exports.by = exports.HookContext = exports.injectProp = exports.runHooksAsync = exports.runHooks = exports.hasHooks = exports.hook = exports.getHooks = exports.UnexpectedHookResultError = exports.ContainerDisposedError = exports.MethodNotImplementedError = exports.DependencyNotFoundError = exports.Registration = exports.redirectFrom = 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.MetadataInjector = exports.resolveArgs = exports.inject = 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; } });
@@ -53,6 +53,8 @@ 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; } });
+var UnexpectedHookResultError_1 = require("./errors/UnexpectedHookResultError");
+Object.defineProperty(exports, "UnexpectedHookResultError", { enumerable: true, get: function () { return UnexpectedHookResultError_1.UnexpectedHookResultError; } });
 // Hooks
 var hook_1 = require("./hooks/hook");
 Object.defineProperty(exports, "getHooks", { enumerable: true, get: function () { return hook_1.getHooks; } });

package/cjm/registration/IRegistration.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.register = exports.getTransformers = exports.scope = exports.redirectFrom = exports.key = void 0;
+const IContainer_1 = require("../container/IContainer");
 const metadata_1 = require("../metadata");
 const by_1 = require("../by");
 const key = (...keys) => (r) => {
@@ -19,6 +20,9 @@ const register = (...mappers) => (0, metadata_1.setMetadata)(METADATA_KEY, mappe
     if ((0, by_1.isDepKey)(m)) {
         return index === 0 ? m.register : m.redirectFrom;
     }
+    if ((0, IContainer_1.isDependencyKey)(m)) {
+        return (r) => (index === 0 ? r.fromKey(m) : r.redirectFrom(m));
+    }
     return m;
 }));
 exports.register = register;

package/esm/container/IContainer.js

@@ -1,6 +1,6 @@
 export function isDependencyKey(token) {
     return ['string', 'symbol'].includes(typeof token);
 }
-export function isConstructor(token) {
-    return typeof token === 'function';
-}
+export const isConstructor = (T) => {
+    return typeof T === 'function' && !!T.prototype && !!T.prototype.constructor;
+};

package/esm/errors/UnexpectedHookResultError.js

@@ -0,0 +1,7 @@
+export class UnexpectedHookResultError extends Error {
+    constructor(message) {
+        super(message);
+        this.name = 'UnexpectedHookResultError';
+        Object.setPrototypeOf(this, UnexpectedHookResultError.prototype);
+    }
+}

package/esm/hooks/hook.js

@@ -1,5 +1,6 @@
 import { createHookContext } from './HookContext';
 import { isConstructor, promisify } from '../utils';
+import { UnexpectedHookResultError } from '../errors/UnexpectedHookResultError';
 const isHookClassConstructor = (execute) => {
     return isConstructor(execute) && execute.prototype.execute;
 };
@@ -21,11 +22,9 @@ export const runHooks = (target, key, { scope, createContext = createHookContext
     for (const [methodName, executions] of hooks) {
         for (const execute of executions) {
             const context = createContext(target, scope, methodName);
-            if (isHookClassConstructor(execute)) {
-                scope.resolve(execute).execute(context);
-            }
-            else {
-                execute(context);
+            const result = isHookClassConstructor(execute) ? scope.resolve(execute).execute(context) : execute(context);
+            if (result instanceof Promise) {
+                throw new UnexpectedHookResultError(`Hook ${methodName} returned a promise, use runHooksAsync instead`);
             }
         }
     }

package/esm/index.js

@@ -21,6 +21,7 @@ export { Registration } from './registration/Registration';
 export { DependencyNotFoundError } from './errors/DependencyNotFoundError';
 export { MethodNotImplementedError } from './errors/MethodNotImplementedError';
 export { ContainerDisposedError } from './errors/ContainerDisposedError';
+export { UnexpectedHookResultError } from './errors/UnexpectedHookResultError';
 // Hooks
 export { getHooks, hook, hasHooks, runHooks, runHooksAsync, injectProp } from './hooks/hook';
 export { HookContext } from './hooks/HookContext';

package/esm/registration/IRegistration.js

@@ -1,3 +1,4 @@
+import { isDependencyKey } from '../container/IContainer';
 import { getMetadata, setMetadata } from '../metadata';
 import { isDepKey } from '../by';
 export const key = (...keys) => (r) => {
@@ -12,5 +13,8 @@ export const register = (...mappers) => setMetadata(METADATA_KEY, mappers.map((m
     if (isDepKey(m)) {
         return index === 0 ? m.register : m.redirectFrom;
     }
+    if (isDependencyKey(m)) {
+        return (r) => (index === 0 ? r.fromKey(m) : r.redirectFrom(m));
+    }
     return m;
 }));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ts-ioc-container",
-  "version": "35.2.1",
+  "version": "35.2.3",
   "description": "Typescript IoC container",
   "publishConfig": {
     "access": "public",
@@ -59,5 +59,5 @@
     "ts-node": "^10.9.1",
     "typescript": "5.4.3"
   },
-  "gitHead": "12bad3b259ed33df6a226ab6ccb70283b1dccbd0"
+  "gitHead": "5c2d64e52655c92bbceb219595b882cadc44b2f6"
 }

package/typings/container/IContainer.d.ts

@@ -1,10 +1,10 @@
 import { IProvider } from '../provider/IProvider';
-import { constructor } from '../utils';
+import { constructor, MapFn } from '../utils';
 import { IRegistration } from '../registration/IRegistration';
 export type Tag = string;
 export type DependencyKey = string | symbol;
-export declare function isDependencyKey<T>(token: InjectionToken<T>): token is DependencyKey;
-export declare function isConstructor<T>(token: InjectionToken<T>): token is constructor<T>;
+export declare function isDependencyKey(token: constructor<any> | DependencyKey | MapFn<any>): token is DependencyKey;
+export declare const isConstructor: <T>(T: unknown) => T is constructor<T>;
 export type InjectionToken<T = unknown> = constructor<T> | DependencyKey;
 export type ResolveOptions = {
     args?: unknown[];

package/typings/errors/UnexpectedHookResultError.d.ts

@@ -0,0 +1,4 @@
+export declare class UnexpectedHookResultError extends Error {
+    name: string;
+    constructor(message?: string);
+}

package/typings/index.d.ts

@@ -18,6 +18,7 @@ export { Registration } from './registration/Registration';
 export { DependencyNotFoundError } from './errors/DependencyNotFoundError';
 export { MethodNotImplementedError } from './errors/MethodNotImplementedError';
 export { ContainerDisposedError } from './errors/ContainerDisposedError';
+export { UnexpectedHookResultError } from './errors/UnexpectedHookResultError';
 export { getHooks, hook, hasHooks, HookFn, HookClass, runHooks, runHooksAsync, injectProp } from './hooks/hook';
 export { HookContext, InjectFn, IHookContext } from './hooks/HookContext';
 export { by, InstancePredicate, IMemo, IMemoKey, byAlias, byAliases, depKey, DepKey } from './by';

package/typings/registration/IRegistration.d.ts

@@ -14,4 +14,4 @@ export declare const key: (...keys: DependencyKey[]) => MapFn<IRegistration>;
 export declare const redirectFrom: (...keys: DependencyKey[]) => MapFn<IRegistration>;
 export declare const scope: (predicate: ScopePredicate) => MapFn<IRegistration>;
 export declare const getTransformers: (Target: constructor<unknown>) => MapFn<IRegistration<any>>[];
-export declare const register: (...mappers: (MapFn<IRegistration> | DepKey<any>)[]) => ClassDecorator;
+export declare const register: (...mappers: (MapFn<IRegistration> | DepKey<any> | DependencyKey)[]) => ClassDecorator;