ts-ioc-container 31.1.0 → 31.1.2

package/cjm/index.js

@@ -1,6 +1,6 @@
 "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.scope = exports.alias = exports.key = exports.Registration = exports.register = exports.AutoMockedContainer = exports.SingletonProvider = exports.singleton = exports.ArgsProvider = exports.args = exports.argsFn = exports.ProviderDecorator = exports.Provider = exports.ContainerDisposedError = exports.MethodNotImplementedError = exports.DependencyNotFoundError = exports.visible = exports.provider = 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.register = exports.scope = exports.alias = exports.key = exports.Registration = exports.AutoMockedContainer = exports.SingletonProvider = exports.singleton = exports.ArgsProvider = exports.args = exports.argsFn = exports.ProviderDecorator = exports.Provider = exports.ContainerDisposedError = exports.MethodNotImplementedError = exports.DependencyNotFoundError = exports.visible = 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");
@@ -30,12 +30,12 @@ Object.defineProperty(exports, "SingletonProvider", { enumerable: true, get: fun
 var AutoMockedContainer_1 = require("./container/AutoMockedContainer");
 Object.defineProperty(exports, "AutoMockedContainer", { enumerable: true, get: function () { return AutoMockedContainer_1.AutoMockedContainer; } });
 var Registration_1 = require("./registration/Registration");
-Object.defineProperty(exports, "register", { enumerable: true, get: function () { return Registration_1.register; } });
 Object.defineProperty(exports, "Registration", { enumerable: true, get: function () { return Registration_1.Registration; } });
 var IRegistration_1 = require("./registration/IRegistration");
 Object.defineProperty(exports, "key", { enumerable: true, get: function () { return IRegistration_1.key; } });
 Object.defineProperty(exports, "alias", { enumerable: true, get: function () { return IRegistration_1.alias; } });
 Object.defineProperty(exports, "scope", { enumerable: true, get: function () { return IRegistration_1.scope; } });
+Object.defineProperty(exports, "register", { enumerable: true, get: function () { return IRegistration_1.register; } });
 var MetadataInjector_1 = require("./injector/MetadataInjector");
 Object.defineProperty(exports, "MetadataInjector", { enumerable: true, get: function () { return MetadataInjector_1.MetadataInjector; } });
 Object.defineProperty(exports, "inject", { enumerable: true, get: function () { return MetadataInjector_1.inject; } });

package/cjm/injector/MetadataInjector.js

@@ -3,12 +3,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.MetadataInjector = exports.inject = void 0;
 const utils_1 = require("../utils");
 const metadata_1 = require("../metadata");
-const INJECT_FN_LIST_KEY = 'INJECT_FN_LIST';
-const inject = (fn) => (0, metadata_1.setParameterMetadata)(INJECT_FN_LIST_KEY, fn);
+const METADATA_KEY = 'inject';
+const getInjectFns = (Target) => (0, metadata_1.getParameterMetadata)(METADATA_KEY, Target);
+const inject = (fn) => (0, metadata_1.setParameterMetadata)(METADATA_KEY, fn);
 exports.inject = inject;
 class MetadataInjector {
     resolve(container, Target, ...deps) {
-        const injectionFns = (0, metadata_1.getParameterMetadata)(INJECT_FN_LIST_KEY, Target);
+        const injectionFns = getInjectFns(Target);
         const args = (0, utils_1.fillEmptyIndexes)(injectionFns, deps.map(utils_1.constant)).map((fn) => fn(container));
         return new Target(...args);
     }

package/cjm/provider/IProvider.js

@@ -1,9 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.visible = exports.provider = exports.PROVIDER_KEY = void 0;
+exports.visible = exports.getTransformers = exports.provider = void 0;
 const metadata_1 = require("../metadata");
-exports.PROVIDER_KEY = 'provider';
-const provider = (...mappers) => (0, metadata_1.setMetadata)(exports.PROVIDER_KEY, mappers);
+const METADATA_KEY = 'provider';
+const provider = (...mappers) => (0, metadata_1.setMetadata)(METADATA_KEY, mappers);
 exports.provider = provider;
+const getTransformers = (Target) => (0, metadata_1.getMetadata)(Target, METADATA_KEY) ?? [];
+exports.getTransformers = getTransformers;
 const visible = (isVisibleWhen) => (p) => p.setVisibility(isVisibleWhen);
 exports.visible = visible;

package/cjm/provider/Provider.js

@@ -3,14 +3,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.Provider = void 0;
 const IProvider_1 = require("./IProvider");
 const utils_1 = require("../utils");
-const metadata_1 = require("../metadata");
 class Provider {
     static fromClass(Target) {
-        const mappers = (0, metadata_1.getMetadata)(Target, IProvider_1.PROVIDER_KEY) ?? [];
-        return new Provider((container, ...args) => container.resolve(Target, { args })).pipe(...mappers);
+        const transformers = (0, IProvider_1.getTransformers)(Target);
+        return new Provider((container, ...args) => container.resolve(Target, { args })).pipe(...transformers);
     }
     static fromValue(value) {
-        const mappers = (0, utils_1.isConstructor)(value) ? (0, metadata_1.getMetadata)(value, IProvider_1.PROVIDER_KEY) ?? [] : [];
+        const mappers = (0, utils_1.isConstructor)(value) ? (0, IProvider_1.getTransformers)(value) ?? [] : [];
         return new Provider(() => value).pipe(...mappers);
     }
     constructor(resolveDependency, isVisibleWhen = () => true) {

package/cjm/registration/IRegistration.js

@@ -1,9 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.scope = exports.alias = exports.key = void 0;
+exports.register = exports.getTransformers = exports.scope = exports.alias = exports.key = void 0;
+const metadata_1 = require("../metadata");
 const key = (key) => (r) => r.to(key);
 exports.key = key;
 const alias = (...aliases) => (r) => r.addAliases(...aliases);
 exports.alias = alias;
 const scope = (predicate) => (r) => r.setScopePredicate(predicate);
 exports.scope = scope;
+const METADATA_KEY = 'registration';
+const getTransformers = (Target) => (0, metadata_1.getMetadata)(Target, METADATA_KEY) ?? [];
+exports.getTransformers = getTransformers;
+const register = (...mappers) => (0, metadata_1.setMetadata)(METADATA_KEY, mappers);
+exports.register = register;

package/cjm/registration/Registration.js

@@ -1,19 +1,18 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.register = exports.Registration = void 0;
+exports.Registration = void 0;
 const utils_1 = require("../utils");
-const metadata_1 = require("../metadata");
 const Provider_1 = require("../provider/Provider");
 const DependencyMissingKeyError_1 = require("../errors/DependencyMissingKeyError");
-const DEPENDENCY_KEY = 'DEPENDENCY_KEY';
+const IRegistration_1 = require("./IRegistration");
 class Registration {
     static fromClass(Target) {
-        const transform = (0, utils_1.pipe)(...((0, metadata_1.getMetadata)(Target, DEPENDENCY_KEY) ?? []));
+        const transform = (0, utils_1.pipe)(...(0, IRegistration_1.getTransformers)(Target));
         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) ?? []));
+            const transform = (0, utils_1.pipe)(...(0, IRegistration_1.getTransformers)(value));
             return transform(new Registration(() => Provider_1.Provider.fromValue(value), value.name));
         }
         return new Registration(() => Provider_1.Provider.fromValue(value));
@@ -57,5 +56,3 @@ class Registration {
     }
 }
 exports.Registration = Registration;
-const register = (...mappers) => (0, metadata_1.setMetadata)(DEPENDENCY_KEY, mappers);
-exports.register = register;

package/esm/index.js

@@ -10,8 +10,8 @@ export { ProviderDecorator } from './provider/ProviderDecorator';
 export { argsFn, args, ArgsProvider } from './provider/ArgsProvider';
 export { singleton, SingletonProvider } from './provider/SingletonProvider';
 export { AutoMockedContainer } from './container/AutoMockedContainer';
-export { register, Registration } from './registration/Registration';
-export { key, alias, scope } from './registration/IRegistration';
+export { Registration } from './registration/Registration';
+export { key, alias, scope, register } from './registration/IRegistration';
 export { MetadataInjector, inject } from './injector/MetadataInjector';
 export { SimpleInjector } from './injector/SimpleInjector';
 export { ProxyInjector } from './injector/ProxyInjector';

package/esm/injector/MetadataInjector.js

@@ -1,10 +1,11 @@
 import { constant, fillEmptyIndexes } from '../utils';
 import { setParameterMetadata, getParameterMetadata } from '../metadata';
-const INJECT_FN_LIST_KEY = 'INJECT_FN_LIST';
-export const inject = (fn) => setParameterMetadata(INJECT_FN_LIST_KEY, fn);
+const METADATA_KEY = 'inject';
+const getInjectFns = (Target) => getParameterMetadata(METADATA_KEY, Target);
+export const inject = (fn) => setParameterMetadata(METADATA_KEY, fn);
 export class MetadataInjector {
     resolve(container, Target, ...deps) {
-        const injectionFns = getParameterMetadata(INJECT_FN_LIST_KEY, Target);
+        const injectionFns = getInjectFns(Target);
         const args = fillEmptyIndexes(injectionFns, deps.map(constant)).map((fn) => fn(container));
         return new Target(...args);
     }

package/esm/provider/IProvider.js

@@ -1,4 +1,5 @@
-import { setMetadata } from '../metadata';
-export const PROVIDER_KEY = 'provider';
-export const provider = (...mappers) => setMetadata(PROVIDER_KEY, mappers);
+import { getMetadata, setMetadata } from '../metadata';
+const METADATA_KEY = 'provider';
+export const provider = (...mappers) => setMetadata(METADATA_KEY, mappers);
+export const getTransformers = (Target) => getMetadata(Target, METADATA_KEY) ?? [];
 export const visible = (isVisibleWhen) => (p) => p.setVisibility(isVisibleWhen);

package/esm/provider/Provider.js

@@ -1,13 +1,12 @@
-import { PROVIDER_KEY } from './IProvider';
+import { getTransformers } 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);
+        const transformers = getTransformers(Target);
+        return new Provider((container, ...args) => container.resolve(Target, { args })).pipe(...transformers);
     }
     static fromValue(value) {
-        const mappers = isConstructor(value) ? getMetadata(value, PROVIDER_KEY) ?? [] : [];
+        const mappers = isConstructor(value) ? getTransformers(value) ?? [] : [];
         return new Provider(() => value).pipe(...mappers);
     }
     constructor(resolveDependency, isVisibleWhen = () => true) {

package/esm/registration/IRegistration.js

@@ -1,3 +1,7 @@
+import { getMetadata, setMetadata } from '../metadata';
 export const key = (key) => (r) => r.to(key);
 export const alias = (...aliases) => (r) => r.addAliases(...aliases);
 export const scope = (predicate) => (r) => r.setScopePredicate(predicate);
+const METADATA_KEY = 'registration';
+export const getTransformers = (Target) => getMetadata(Target, METADATA_KEY) ?? [];
+export const register = (...mappers) => setMetadata(METADATA_KEY, mappers);

package/esm/registration/Registration.js

@@ -1,16 +1,15 @@
 import { isConstructor, pipe } from '../utils';
-import { getMetadata, setMetadata } from '../metadata';
 import { Provider } from '../provider/Provider';
 import { DependencyMissingKeyError } from '../errors/DependencyMissingKeyError';
-const DEPENDENCY_KEY = 'DEPENDENCY_KEY';
+import { getTransformers } from './IRegistration';
 export class Registration {
     static fromClass(Target) {
-        const transform = pipe(...(getMetadata(Target, DEPENDENCY_KEY) ?? []));
+        const transform = pipe(...getTransformers(Target));
         return transform(new Registration(() => Provider.fromClass(Target), Target.name));
     }
     static fromValue(value) {
         if (isConstructor(value)) {
-            const transform = pipe(...(getMetadata(value, DEPENDENCY_KEY) ?? []));
+            const transform = pipe(...getTransformers(value));
             return transform(new Registration(() => Provider.fromValue(value), value.name));
         }
         return new Registration(() => Provider.fromValue(value));
@@ -53,4 +52,3 @@ export class Registration {
         return this;
     }
 }
-export const register = (...mappers) => setMetadata(DEPENDENCY_KEY, mappers);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ts-ioc-container",
-  "version": "31.1.0",
+  "version": "31.1.2",
   "description": "Typescript IoC container",
   "publishConfig": {
     "access": "public",
@@ -59,5 +59,5 @@
     "ts-node": "^10.9.1",
     "typescript": "5.4.3"
   },
-  "gitHead": "eac5a10597aa606ecbd0c19751b73a63dfe3bb1a"
+  "gitHead": "eb63fe25a61354a09e4c88326ed40907005c9757"
 }

package/typings/index.d.ts

@@ -12,8 +12,8 @@ export { ProviderDecorator } from './provider/ProviderDecorator';
 export { ArgsFn, argsFn, args, ArgsProvider } from './provider/ArgsProvider';
 export { singleton, SingletonProvider } from './provider/SingletonProvider';
 export { AutoMockedContainer } from './container/AutoMockedContainer';
-export { register, Registration } from './registration/Registration';
-export { key, alias, IRegistration, scope } from './registration/IRegistration';
+export { Registration } from './registration/Registration';
+export { key, alias, IRegistration, scope, register } from './registration/IRegistration';
 export { MetadataInjector, inject } from './injector/MetadataInjector';
 export { SimpleInjector } from './injector/SimpleInjector';
 export { ProxyInjector } from './injector/ProxyInjector';

package/typings/provider/IProvider.d.ts

@@ -1,5 +1,5 @@
 import { IContainer, Tagged } from '../container/IContainer';
-import { MapFn } from '../utils';
+import { constructor, MapFn } from '../utils';
 export type ResolveDependency<T = unknown> = (container: IContainer, ...args: unknown[]) => T;
 export type ChildrenVisibilityPredicate = (options: {
     child: Tagged;
@@ -11,6 +11,6 @@ export interface IProvider<T = unknown> {
     pipe(...mappers: MapFn<IProvider<T>>[]): IProvider<T>;
     setVisibility(isVisibleWhen: ChildrenVisibilityPredicate): this;
 }
-export declare const PROVIDER_KEY = "provider";
 export declare const provider: (...mappers: MapFn<IProvider>[]) => ClassDecorator;
+export declare const getTransformers: <T>(Target: constructor<T>) => MapFn<IProvider<T>>[];
 export declare const visible: (isVisibleWhen: ChildrenVisibilityPredicate) => MapFn<IProvider>;

package/typings/registration/IRegistration.d.ts

@@ -1,5 +1,5 @@
 import { Alias, DependencyKey, IContainerModule, Tagged } from '../container/IContainer';
-import { MapFn } from '../utils';
+import { constructor, MapFn } from '../utils';
 export type ScopePredicate = (c: Tagged) => boolean;
 export interface IRegistration extends IContainerModule {
     addAliases(...aliases: Alias[]): this;
@@ -9,3 +9,5 @@ export interface IRegistration extends IContainerModule {
 export declare const key: (key: DependencyKey) => MapFn<IRegistration>;
 export declare const alias: (...aliases: Alias[]) => MapFn<IRegistration>;
 export declare const scope: (predicate: ScopePredicate) => MapFn<IRegistration>;
+export declare const getTransformers: (Target: constructor<unknown>) => MapFn<IRegistration>[];
+export declare const register: (...mappers: MapFn<IRegistration>[]) => ClassDecorator;

package/typings/registration/Registration.d.ts

@@ -6,8 +6,8 @@ export declare class Registration<T = unknown> implements IRegistration {
     private createProvider;
     private key?;
     private matchScope;
-    static fromClass<T>(Target: constructor<T>): Registration<T>;
-    static fromValue<T>(value: T): Registration<T>;
+    static fromClass<T>(Target: constructor<T>): IRegistration;
+    static fromValue<T>(value: T): IRegistration;
     static fromFn<T>(fn: ResolveDependency<T>): Registration<T>;
     private aliases;
     constructor(createProvider: () => IProvider<T>, key?: DependencyKey | undefined, matchScope?: ScopePredicate);
@@ -17,4 +17,3 @@ export declare class Registration<T = unknown> implements IRegistration {
     applyTo(container: IContainer): void;
     setScopePredicate(isValidWhen: ScopePredicate): this;
 }
-export declare const register: (...mappers: MapFn<IRegistration>[]) => ClassDecorator;