ts-ioc-container 30.5.0 → 30.7.0

package/cjm/index.js

@@ -1,12 +1,16 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.setParameterMetadata = exports.getMetadata = exports.setMetadata = exports.by = exports.hook = exports.getHooks = exports.ProxyInjector = exports.SimpleInjector = exports.inject = exports.MetadataInjector = exports.alias = exports.register = exports.Registration = exports.key = exports.AutoMockedContainer = exports.SingletonProvider = exports.singleton = exports.ArgsProvider = exports.args = exports.argsFn = exports.scope = exports.visible = exports.provider = exports.Provider = exports.ContainerDisposedError = exports.MethodNotImplementedError = exports.DependencyNotFoundError = exports.EmptyContainer = exports.Container = exports.isDependencyKey = void 0;
+exports.setParameterMetadata = exports.getMetadata = exports.setMetadata = exports.by = exports.hook = exports.getHooks = exports.ProxyInjector = exports.SimpleInjector = exports.inject = exports.MetadataInjector = exports.alias = exports.register = exports.Registration = exports.key = exports.AutoMockedContainer = exports.SingletonProvider = exports.singleton = exports.ArgsProvider = exports.args = exports.argsFn = exports.Provider = exports.ContainerDisposedError = exports.MethodNotImplementedError = exports.DependencyNotFoundError = exports.visible = exports.scope = exports.provider = exports.EmptyContainer = exports.Container = exports.isDependencyKey = void 0;
 var IContainer_1 = require("./container/IContainer");
 Object.defineProperty(exports, "isDependencyKey", { enumerable: true, get: function () { return IContainer_1.isDependencyKey; } });
 var Container_1 = require("./container/Container");
 Object.defineProperty(exports, "Container", { enumerable: true, get: function () { return Container_1.Container; } });
 var EmptyContainer_1 = require("./container/EmptyContainer");
 Object.defineProperty(exports, "EmptyContainer", { enumerable: true, get: function () { return EmptyContainer_1.EmptyContainer; } });
+var IProvider_1 = require("./provider/IProvider");
+Object.defineProperty(exports, "provider", { enumerable: true, get: function () { return IProvider_1.provider; } });
+Object.defineProperty(exports, "scope", { enumerable: true, get: function () { return IProvider_1.scope; } });
+Object.defineProperty(exports, "visible", { enumerable: true, get: function () { return IProvider_1.visible; } });
 var DependencyNotFoundError_1 = require("./errors/DependencyNotFoundError");
 Object.defineProperty(exports, "DependencyNotFoundError", { enumerable: true, get: function () { return DependencyNotFoundError_1.DependencyNotFoundError; } });
 var MethodNotImplementedError_1 = require("./errors/MethodNotImplementedError");
@@ -15,9 +19,6 @@ var ContainerDisposedError_1 = require("./errors/ContainerDisposedError");
 Object.defineProperty(exports, "ContainerDisposedError", { enumerable: true, get: function () { return ContainerDisposedError_1.ContainerDisposedError; } });
 var Provider_1 = require("./provider/Provider");
 Object.defineProperty(exports, "Provider", { enumerable: true, get: function () { return Provider_1.Provider; } });
-Object.defineProperty(exports, "provider", { enumerable: true, get: function () { return Provider_1.provider; } });
-Object.defineProperty(exports, "visible", { enumerable: true, get: function () { return Provider_1.visible; } });
-Object.defineProperty(exports, "scope", { enumerable: true, get: function () { return Provider_1.scope; } });
 var ArgsProvider_1 = require("./provider/ArgsProvider");
 Object.defineProperty(exports, "argsFn", { enumerable: true, get: function () { return ArgsProvider_1.argsFn; } });
 Object.defineProperty(exports, "args", { enumerable: true, get: function () { return ArgsProvider_1.args; } });

package/cjm/metadata.js

@@ -5,7 +5,6 @@ const setMetadata = (key, value) => (target) => {
     Reflect.defineMetadata(key, value, target);
 };
 exports.setMetadata = setMetadata;
-// eslint-disable-next-line @typescript-eslint/ban-types
 function getMetadata(target, key) {
     return Reflect.getOwnMetadata(key, target);
 }

package/cjm/provider/IProvider.js

@@ -1,2 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.scope = exports.visible = exports.provider = exports.PROVIDER_KEY = void 0;
+const metadata_1 = require("../metadata");
+exports.PROVIDER_KEY = 'provider';
+const provider = (...mappers) => (0, metadata_1.setMetadata)(exports.PROVIDER_KEY, mappers);
+exports.provider = provider;
+const visible = (isVisibleWhen) => (p) => p.setVisibility(isVisibleWhen);
+exports.visible = visible;
+function scope(predicate) {
+    return (provider) => provider.setScopePredicate(predicate);
+}
+exports.scope = scope;

package/cjm/provider/Provider.js

@@ -1,24 +1,17 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Provider = exports.scope = exports.visible = exports.provider = void 0;
+exports.Provider = void 0;
+const IProvider_1 = require("./IProvider");
 const utils_1 = require("../utils");
 const metadata_1 = require("../metadata");
-const PROVIDER_KEY = 'provider';
-const provider = (...mappers) => (0, metadata_1.setMetadata)(PROVIDER_KEY, mappers);
-exports.provider = provider;
-const visible = (isVisibleWhen) => (p) => p.setVisibility(isVisibleWhen);
-exports.visible = visible;
-function scope(predicate) {
-    return (provider) => provider.setScopePredicate(predicate);
-}
-exports.scope = scope;
 class Provider {
     static fromClass(Target) {
-        const mappers = (0, metadata_1.getMetadata)(Target, PROVIDER_KEY) ?? [];
+        const mappers = (0, metadata_1.getMetadata)(Target, IProvider_1.PROVIDER_KEY) ?? [];
         return new Provider((container, ...args) => container.resolve(Target, { args })).pipe(...mappers);
     }
     static fromValue(value) {
-        return new Provider(() => value);
+        const mappers = (0, utils_1.isConstructor)(value) ? (0, metadata_1.getMetadata)(value, IProvider_1.PROVIDER_KEY) ?? [] : [];
+        return new Provider(() => value).pipe(...mappers);
     }
     constructor(resolveDependency, isVisibleWhen = () => true, isValidWhen = () => true) {
         this.resolveDependency = resolveDependency;

package/cjm/provider/Registration.js

@@ -12,15 +12,19 @@ class Registration {
         return transform(new Registration(Provider_1.Provider.fromClass(Target), Target.name));
     }
     static fromValue(value) {
+        if ((0, utils_1.isConstructor)(value)) {
+            const transform = (0, utils_1.pipe)(...((0, metadata_1.getMetadata)(value, DEPENDENCY_KEY) ?? []));
+            return transform(new Registration(Provider_1.Provider.fromValue(value), value.name));
+        }
         return new Registration(Provider_1.Provider.fromValue(value));
     }
     static fromFn(fn) {
         return new Registration(new Provider_1.Provider(fn));
     }
-    constructor(provider, key, aliases = []) {
+    constructor(provider, key) {
         this.provider = provider;
         this.key = key;
-        this.aliases = aliases;
+        this.aliases = [];
     }
     to(key) {
         this.key = key;

package/cjm/utils.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.constant = exports.fillEmptyIndexes = exports.pipe = void 0;
+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) {
@@ -16,3 +16,5 @@ function fillEmptyIndexes(baseArr, insertArr) {
 exports.fillEmptyIndexes = fillEmptyIndexes;
 const constant = (value) => () => value;
 exports.constant = constant;
+const isConstructor = (T) => typeof T === 'function' && !!T.prototype;
+exports.isConstructor = isConstructor;

package/esm/index.js

@@ -1,10 +1,11 @@
 export { isDependencyKey, } from './container/IContainer';
 export { Container } from './container/Container';
 export { EmptyContainer } from './container/EmptyContainer';
+export { provider, scope, visible } from './provider/IProvider';
 export { DependencyNotFoundError } from './errors/DependencyNotFoundError';
 export { MethodNotImplementedError } from './errors/MethodNotImplementedError';
 export { ContainerDisposedError } from './errors/ContainerDisposedError';
-export { Provider, provider, visible, scope } from './provider/Provider';
+export { Provider } from './provider/Provider';
 export { argsFn, args, ArgsProvider } from './provider/ArgsProvider';
 export { singleton, SingletonProvider } from './provider/SingletonProvider';
 export { AutoMockedContainer } from './container/AutoMockedContainer';

package/esm/metadata.js

@@ -1,7 +1,6 @@
 export const setMetadata = (key, value) => (target) => {
     Reflect.defineMetadata(key, value, target);
 };
-// eslint-disable-next-line @typescript-eslint/ban-types
 export function getMetadata(target, key) {
     return Reflect.getOwnMetadata(key, target);
 }

package/esm/provider/IProvider.js

@@ -1 +1,7 @@
-export {};
+import { setMetadata } from '../metadata';
+export const PROVIDER_KEY = 'provider';
+export const provider = (...mappers) => setMetadata(PROVIDER_KEY, mappers);
+export const visible = (isVisibleWhen) => (p) => p.setVisibility(isVisibleWhen);
+export function scope(predicate) {
+    return (provider) => provider.setScopePredicate(predicate);
+}

package/esm/provider/Provider.js

@@ -1,18 +1,14 @@
-import { pipe } from '../utils';
-import { getMetadata, setMetadata } from '../metadata';
-const PROVIDER_KEY = 'provider';
-export const provider = (...mappers) => setMetadata(PROVIDER_KEY, mappers);
-export const visible = (isVisibleWhen) => (p) => p.setVisibility(isVisibleWhen);
-export function scope(predicate) {
-    return (provider) => provider.setScopePredicate(predicate);
-}
+import { PROVIDER_KEY } from './IProvider';
+import { isConstructor, pipe } from '../utils';
+import { getMetadata } from '../metadata';
 export class Provider {
     static fromClass(Target) {
         const mappers = getMetadata(Target, PROVIDER_KEY) ?? [];
         return new Provider((container, ...args) => container.resolve(Target, { args })).pipe(...mappers);
     }
     static fromValue(value) {
-        return new Provider(() => value);
+        const mappers = isConstructor(value) ? getMetadata(value, PROVIDER_KEY) ?? [] : [];
+        return new Provider(() => value).pipe(...mappers);
     }
     constructor(resolveDependency, isVisibleWhen = () => true, isValidWhen = () => true) {
         this.resolveDependency = resolveDependency;

package/esm/provider/Registration.js

@@ -1,4 +1,4 @@
-import { pipe } from '../utils';
+import { isConstructor, pipe } from '../utils';
 import { getMetadata, setMetadata } from '../metadata';
 import { Provider } from './Provider';
 import { DependencyMissingKeyError } from '../errors/DependencyMissingKeyError';
@@ -9,15 +9,19 @@ export class Registration {
         return transform(new Registration(Provider.fromClass(Target), Target.name));
     }
     static fromValue(value) {
+        if (isConstructor(value)) {
+            const transform = pipe(...(getMetadata(value, DEPENDENCY_KEY) ?? []));
+            return transform(new Registration(Provider.fromValue(value), value.name));
+        }
         return new Registration(Provider.fromValue(value));
     }
     static fromFn(fn) {
         return new Registration(new Provider(fn));
     }
-    constructor(provider, key, aliases = []) {
+    constructor(provider, key) {
         this.provider = provider;
         this.key = key;
-        this.aliases = aliases;
+        this.aliases = [];
     }
     to(key) {
         this.key = key;

package/esm/utils.js

@@ -10,3 +10,4 @@ export function fillEmptyIndexes(baseArr, insertArr) {
     return a.concat(b);
 }
 export const constant = (value) => () => value;
+export const isConstructor = (T) => typeof T === 'function' && !!T.prototype;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ts-ioc-container",
-  "version": "30.5.0",
+  "version": "30.7.0",
   "description": "Typescript IoC container",
   "publishConfig": {
     "access": "public",
@@ -59,5 +59,5 @@
     "ts-node": "^10.9.1",
     "typescript": "5.4.3"
   },
-  "gitHead": "f740e3a678cdb705454e79a98f23146626056af2"
+  "gitHead": "406ecdc2fbd80cece9bffa1af64d4c06291e9177"
 }

package/typings/index.d.ts

@@ -2,12 +2,12 @@ export { IContainer, Resolvable, IContainerModule, isDependencyKey, DependencyKe
 export { constructor } from './utils';
 export { Container } from './container/Container';
 export { EmptyContainer } from './container/EmptyContainer';
-export { ResolveDependency, IProvider } from './provider/IProvider';
+export { ResolveDependency, IProvider, provider, scope, visible } from './provider/IProvider';
 export { IInjector } from './injector/IInjector';
 export { DependencyNotFoundError } from './errors/DependencyNotFoundError';
 export { MethodNotImplementedError } from './errors/MethodNotImplementedError';
 export { ContainerDisposedError } from './errors/ContainerDisposedError';
-export { Provider, provider, visible, scope } from './provider/Provider';
+export { Provider } from './provider/Provider';
 export { ArgsFn, argsFn, args, ArgsProvider } from './provider/ArgsProvider';
 export { singleton, SingletonProvider } from './provider/SingletonProvider';
 export { AutoMockedContainer } from './container/AutoMockedContainer';

package/typings/metadata.d.ts

@@ -1,5 +1,5 @@
 import { constructor } from './utils';
 export declare const setMetadata: <T>(key: string | symbol, value: T) => ClassDecorator;
-export declare function getMetadata<T>(target: Object, key: string | symbol): T | undefined;
+export declare function getMetadata<T>(target: object, key: string | symbol): T | undefined;
 export declare const setParameterMetadata: (key: string | symbol, value: unknown) => ParameterDecorator;
 export declare const getParameterMetadata: (key: string | symbol, target: constructor<unknown>) => unknown[];

package/typings/provider/IProvider.d.ts

@@ -15,3 +15,7 @@ export interface IProvider<T = unknown> {
     setVisibility(isVisibleWhen: ChildrenVisibilityPredicate): this;
     setScopePredicate(isValidWhen: ScopePredicate): this;
 }
+export declare const PROVIDER_KEY = "provider";
+export declare const provider: (...mappers: MapFn<IProvider>[]) => ClassDecorator;
+export declare const visible: (isVisibleWhen: ChildrenVisibilityPredicate) => MapFn<IProvider>;
+export declare function scope<T = unknown>(predicate: ScopePredicate): MapFn<IProvider<T>>;

package/typings/provider/Provider.d.ts

@@ -1,15 +1,12 @@
 import { ChildrenVisibilityPredicate, IProvider, ResolveDependency, ScopePredicate } from './IProvider';
 import { IContainer, Tagged } from '../container/IContainer';
 import { constructor, MapFn } from '../utils';
-export declare const provider: (...mappers: MapFn<IProvider>[]) => ClassDecorator;
-export declare const visible: (isVisibleWhen: ChildrenVisibilityPredicate) => MapFn<IProvider>;
-export declare function scope<T = unknown>(predicate: ScopePredicate): MapFn<IProvider<T>>;
 export declare class Provider<T> implements IProvider<T> {
     private readonly resolveDependency;
     private isVisibleWhen;
     private isValidWhen;
     static fromClass<T>(Target: constructor<T>): IProvider<T>;
-    static fromValue<T>(value: T): Provider<T>;
+    static fromValue<T>(value: T): IProvider<T>;
     constructor(resolveDependency: ResolveDependency<T>, isVisibleWhen?: ChildrenVisibilityPredicate, isValidWhen?: ScopePredicate);
     pipe(...mappers: MapFn<IProvider<T>>[]): IProvider<T>;
     clone(): Provider<T>;

package/typings/provider/Registration.d.ts

@@ -4,11 +4,11 @@ import { IProvider, ResolveDependency } from './IProvider';
 export declare class Registration<T = unknown> implements IContainerModule {
     private provider;
     private key?;
-    private aliases;
-    static fromClass<T>(Target: constructor<T>): Registration<unknown>;
+    static fromClass<T>(Target: constructor<T>): Registration<T>;
     static fromValue<T>(value: T): Registration<T>;
     static fromFn<T>(fn: ResolveDependency<T>): Registration<T>;
-    constructor(provider: IProvider<T>, key?: DependencyKey | undefined, aliases?: string[]);
+    private aliases;
+    constructor(provider: IProvider<T>, key?: DependencyKey | undefined);
     to(key: DependencyKey): this;
     addAliases(...aliases: Alias[]): this;
     pipe(...mappers: MapFn<IProvider<T>>[]): this;

package/typings/utils.d.ts

@@ -3,3 +3,4 @@ export type MapFn<T> = (value: T) => T;
 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>;