ts-ioc-container 44.0.4 → 45.0.0

package/cjm/container/Container.js

@@ -30,7 +30,7 @@ class Container {
         this.aliases.setAliasesByKey(key, aliases);
         return this;
     }
-    resolve(target, { args = [], child = this, lazy } = {}) {
+    resolve(target, { args, child = this, lazy } = {}) {
         this.validateContainer();
         if (utils_1.Is.constructor(target)) {
             return this.injector.resolve(this, target, { args, lazy });
@@ -40,7 +40,7 @@ class Container {
             ? provider.resolve(this, { args, lazy })
             : this.parent.resolve(target, { args, child, lazy });
     }
-    resolveByAlias(alias, { args = [], child = this, lazy, excludedKeys = [] } = {}) {
+    resolveByAlias(alias, { args, child = this, lazy, excludedKeys = [] } = {}) {
         this.validateContainer();
         const keys = [];
         const deps = [];
@@ -60,7 +60,7 @@ class Container {
         });
         return [...deps, ...parentDeps];
     }
-    resolveOneByAlias(alias, { args = [], child = this, lazy } = {}) {
+    resolveOneByAlias(alias, { args, child = this, lazy } = {}) {
         this.validateContainer();
         const [key, ..._] = this.aliases.getKeysByAlias(alias);
         const provider = key ? this.findProviderByKeyOrFail(key) : undefined;
@@ -68,12 +68,12 @@ class Container {
             ? provider.resolve(this, { args, lazy })
             : this.parent.resolveOneByAlias(key, { args, child, lazy });
     }
-    createScope({ tags = [] } = {}) {
+    createScope({ tags } = {}) {
         this.validateContainer();
         const scope = new Container({ injector: this.injector, parent: this, tags })
             .addOnConstructHook(...this.onConstructHookList)
             .addOnDisposeHook(...this.onDisposeHookList);
-        for (const registration of this.getRegistrations()) {
+        for (const registration of [...this.parent.getRegistrations(), ...this.registrations]) {
             registration.applyTo(scope);
         }
         this.scopes.push(scope);

package/cjm/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ClassToken = exports.toAliasUniq = exports.AliasUniqToken = exports.AliasToken = exports.InjectionToken = exports.getParameterMetadata = exports.getMethodMetadata = exports.setMethodMetadata = exports.setParameterMetadata = exports.getMetadata = exports.setMetadata = exports.HooksRunner = exports.onDispose = exports.onDisposeHooksRunner = 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.resolveArgs = exports.inject = exports.EmptyContainer = exports.Container = exports.isDependencyKey = void 0;
+exports.ClassToken = exports.toAliasUniq = exports.AliasUniqToken = exports.AliasToken = exports.InjectionToken = exports.getParameterMetadata = exports.getMethodMetadata = exports.setMethodMetadata = exports.setParameterMetadata = exports.getClassMetadata = exports.setClassMetadata = exports.HooksRunner = exports.onDispose = exports.onDisposeHooksRunner = 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.resolveArgs = exports.inject = exports.EmptyContainer = exports.Container = exports.isDependencyKey = void 0;
 exports.Is = exports.select = exports.InstanceListToken = exports.ConstantToken = exports.FunctionToken = exports.IDToken = void 0;
 // Containers
 var IContainer_1 = require("./container/IContainer");
@@ -75,8 +75,8 @@ var HooksRunner_1 = require("./hooks/HooksRunner");
 Object.defineProperty(exports, "HooksRunner", { enumerable: true, get: function () { return HooksRunner_1.HooksRunner; } });
 // Metadata
 var metadata_1 = require("./metadata");
-Object.defineProperty(exports, "setMetadata", { enumerable: true, get: function () { return metadata_1.setMetadata; } });
-Object.defineProperty(exports, "getMetadata", { enumerable: true, get: function () { return metadata_1.getMetadata; } });
+Object.defineProperty(exports, "setClassMetadata", { enumerable: true, get: function () { return metadata_1.setClassMetadata; } });
+Object.defineProperty(exports, "getClassMetadata", { enumerable: true, get: function () { return metadata_1.getClassMetadata; } });
 Object.defineProperty(exports, "setParameterMetadata", { enumerable: true, get: function () { return metadata_1.setParameterMetadata; } });
 Object.defineProperty(exports, "setMethodMetadata", { enumerable: true, get: function () { return metadata_1.setMethodMetadata; } });
 Object.defineProperty(exports, "getMethodMetadata", { enumerable: true, get: function () { return metadata_1.getMethodMetadata; } });

package/cjm/injector/inject.js

@@ -7,7 +7,7 @@ const ConstantToken_1 = require("../token/ConstantToken");
 const toToken_1 = require("../token/toToken");
 const hookMetaKey = (methodName = 'constructor') => `inject:${methodName}`;
 const inject = (fn) => (target, propertyKey, parameterIndex) => {
-    (0, metadata_1.setParameterMetadata)(hookMetaKey(propertyKey), (0, toToken_1.toToken)(fn))(utils_1.Is.instance(target) ? target.constructor : target, propertyKey, parameterIndex);
+    (0, metadata_1.setParameterMetadata)(hookMetaKey(propertyKey), () => (0, toToken_1.toToken)(fn))(utils_1.Is.instance(target) ? target.constructor : target, propertyKey, parameterIndex);
 };
 exports.inject = inject;
 const resolveArgs = (Target, methodName) => {

package/cjm/metadata.js

@@ -1,17 +1,18 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getMethodMetadata = exports.setMethodMetadata = exports.getParameterMetadata = exports.setParameterMetadata = exports.setMetadata = void 0;
-exports.getMetadata = getMetadata;
-const setMetadata = (key, value) => (target) => {
-    Reflect.defineMetadata(key, value, target);
+exports.getMethodMetadata = exports.setMethodMetadata = exports.getParameterMetadata = exports.setParameterMetadata = exports.setClassMetadata = void 0;
+exports.getClassMetadata = getClassMetadata;
+const setClassMetadata = (key, mapFn) => (target) => {
+    const value = Reflect.getOwnMetadata(key, target);
+    Reflect.defineMetadata(key, mapFn(value), target);
 };
-exports.setMetadata = setMetadata;
-function getMetadata(target, key) {
+exports.setClassMetadata = setClassMetadata;
+function getClassMetadata(target, key) {
     return Reflect.getOwnMetadata(key, target);
 }
-const setParameterMetadata = (key, value) => (target, propertyKey, parameterIndex) => {
+const setParameterMetadata = (key, mapFn) => (target, propertyKey, parameterIndex) => {
     const metadata = Reflect.getOwnMetadata(key, target) ?? [];
-    metadata[parameterIndex] = value;
+    metadata[parameterIndex] = mapFn(metadata[parameterIndex]);
     Reflect.defineMetadata(key, metadata, target);
 };
 exports.setParameterMetadata = setParameterMetadata;
@@ -19,8 +20,9 @@ const getParameterMetadata = (key, target) => {
     return Reflect.getOwnMetadata(key, target) ?? [];
 };
 exports.getParameterMetadata = getParameterMetadata;
-const setMethodMetadata = (key, value) => (target, propertyKey) => {
-    Reflect.defineMetadata(key, value, target.constructor, propertyKey);
+const setMethodMetadata = (key, mapFn) => (target, propertyKey) => {
+    const metadata = Reflect.getMetadata(key, target.constructor, propertyKey);
+    Reflect.defineMetadata(key, mapFn(metadata), target.constructor, propertyKey);
 };
 exports.setMethodMetadata = setMethodMetadata;
 const getMethodMetadata = (key, target, propertyKey) => Reflect.getMetadata(key, target.constructor, propertyKey);

package/cjm/registration/IRegistration.js

@@ -8,9 +8,9 @@ const BindToken_1 = require("../token/BindToken");
 const scope = (...predicates) => (r) => r.when(...predicates);
 exports.scope = scope;
 const METADATA_KEY = 'registration';
-const getTransformers = (Target) => (0, metadata_1.getMetadata)(Target, METADATA_KEY) ?? [];
+const getTransformers = (Target) => (0, metadata_1.getClassMetadata)(Target, METADATA_KEY) ?? [];
 exports.getTransformers = getTransformers;
-const register = (...mappers) => (0, metadata_1.setMetadata)(METADATA_KEY, mappers.map((m) => ((0, ProviderPipe_1.isProviderPipe)(m) ? (r) => m.mapRegistration(r) : m)));
+const register = (...mappers) => (0, metadata_1.setClassMetadata)(METADATA_KEY, () => mappers.map((m) => ((0, ProviderPipe_1.isProviderPipe)(m) ? (r) => m.mapRegistration(r) : m)));
 exports.register = register;
 const bindTo = (...tokens) => (r) => {
     for (const token of tokens) {

package/esm/container/Container.js

@@ -27,7 +27,7 @@ export class Container {
         this.aliases.setAliasesByKey(key, aliases);
         return this;
     }
-    resolve(target, { args = [], child = this, lazy } = {}) {
+    resolve(target, { args, child = this, lazy } = {}) {
         this.validateContainer();
         if (Is.constructor(target)) {
             return this.injector.resolve(this, target, { args, lazy });
@@ -37,7 +37,7 @@ export class Container {
             ? provider.resolve(this, { args, lazy })
             : this.parent.resolve(target, { args, child, lazy });
     }
-    resolveByAlias(alias, { args = [], child = this, lazy, excludedKeys = [] } = {}) {
+    resolveByAlias(alias, { args, child = this, lazy, excludedKeys = [] } = {}) {
         this.validateContainer();
         const keys = [];
         const deps = [];
@@ -57,7 +57,7 @@ export class Container {
         });
         return [...deps, ...parentDeps];
     }
-    resolveOneByAlias(alias, { args = [], child = this, lazy } = {}) {
+    resolveOneByAlias(alias, { args, child = this, lazy } = {}) {
         this.validateContainer();
         const [key, ..._] = this.aliases.getKeysByAlias(alias);
         const provider = key ? this.findProviderByKeyOrFail(key) : undefined;
@@ -65,12 +65,12 @@ export class Container {
             ? provider.resolve(this, { args, lazy })
             : this.parent.resolveOneByAlias(key, { args, child, lazy });
     }
-    createScope({ tags = [] } = {}) {
+    createScope({ tags } = {}) {
         this.validateContainer();
         const scope = new Container({ injector: this.injector, parent: this, tags })
             .addOnConstructHook(...this.onConstructHookList)
             .addOnDisposeHook(...this.onDisposeHookList);
-        for (const registration of this.getRegistrations()) {
+        for (const registration of [...this.parent.getRegistrations(), ...this.registrations]) {
             registration.applyTo(scope);
         }
         this.scopes.push(scope);

package/esm/index.js

@@ -31,7 +31,7 @@ export { onDisposeHooksRunner, onDispose } from './hooks/onDispose';
 // Hooks runner
 export { HooksRunner } from './hooks/HooksRunner';
 // Metadata
-export { setMetadata, getMetadata, setParameterMetadata, setMethodMetadata, getMethodMetadata, getParameterMetadata, } from './metadata';
+export { setClassMetadata, getClassMetadata, setParameterMetadata, setMethodMetadata, getMethodMetadata, getParameterMetadata, } from './metadata';
 // InjectionToken
 export { InjectionToken } from './token/InjectionToken';
 export { AliasToken } from './token/AliasToken';

package/esm/injector/inject.js

@@ -4,7 +4,7 @@ import { ConstantToken } from '../token/ConstantToken';
 import { toToken } from '../token/toToken';
 const hookMetaKey = (methodName = 'constructor') => `inject:${methodName}`;
 export const inject = (fn) => (target, propertyKey, parameterIndex) => {
-    setParameterMetadata(hookMetaKey(propertyKey), toToken(fn))(Is.instance(target) ? target.constructor : target, propertyKey, parameterIndex);
+    setParameterMetadata(hookMetaKey(propertyKey), () => toToken(fn))(Is.instance(target) ? target.constructor : target, propertyKey, parameterIndex);
 };
 export const resolveArgs = (Target, methodName) => {
     const argsTokens = getParameterMetadata(hookMetaKey(methodName), Target);

package/esm/metadata.js

@@ -1,18 +1,20 @@
-export const setMetadata = (key, value) => (target) => {
-    Reflect.defineMetadata(key, value, target);
+export const setClassMetadata = (key, mapFn) => (target) => {
+    const value = Reflect.getOwnMetadata(key, target);
+    Reflect.defineMetadata(key, mapFn(value), target);
 };
-export function getMetadata(target, key) {
+export function getClassMetadata(target, key) {
     return Reflect.getOwnMetadata(key, target);
 }
-export const setParameterMetadata = (key, value) => (target, propertyKey, parameterIndex) => {
+export const setParameterMetadata = (key, mapFn) => (target, propertyKey, parameterIndex) => {
     const metadata = Reflect.getOwnMetadata(key, target) ?? [];
-    metadata[parameterIndex] = value;
+    metadata[parameterIndex] = mapFn(metadata[parameterIndex]);
     Reflect.defineMetadata(key, metadata, target);
 };
 export const getParameterMetadata = (key, target) => {
     return Reflect.getOwnMetadata(key, target) ?? [];
 };
-export const setMethodMetadata = (key, value) => (target, propertyKey) => {
-    Reflect.defineMetadata(key, value, target.constructor, propertyKey);
+export const setMethodMetadata = (key, mapFn) => (target, propertyKey) => {
+    const metadata = Reflect.getMetadata(key, target.constructor, propertyKey);
+    Reflect.defineMetadata(key, mapFn(metadata), target.constructor, propertyKey);
 };
 export const getMethodMetadata = (key, target, propertyKey) => Reflect.getMetadata(key, target.constructor, propertyKey);

package/esm/registration/IRegistration.js

@@ -1,11 +1,11 @@
-import { getMetadata, setMetadata } from '../metadata';
+import { getClassMetadata, setClassMetadata } from '../metadata';
 import { isProviderPipe } from '../provider/ProviderPipe';
 import { IDToken } from '../token/IDToken';
 import { isBindToken } from '../token/BindToken';
 export const scope = (...predicates) => (r) => r.when(...predicates);
 const METADATA_KEY = 'registration';
-export const getTransformers = (Target) => getMetadata(Target, METADATA_KEY) ?? [];
-export const register = (...mappers) => setMetadata(METADATA_KEY, mappers.map((m) => (isProviderPipe(m) ? (r) => m.mapRegistration(r) : m)));
+export const getTransformers = (Target) => getClassMetadata(Target, METADATA_KEY) ?? [];
+export const register = (...mappers) => setClassMetadata(METADATA_KEY, () => mappers.map((m) => (isProviderPipe(m) ? (r) => m.mapRegistration(r) : m)));
 export const bindTo = (...tokens) => (r) => {
     for (const token of tokens) {
         const targetToken = isBindToken(token) ? token : new IDToken(token);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ts-ioc-container",
-  "version": "44.0.4",
+  "version": "45.0.0",
   "description": "Typescript IoC container",
   "publishConfig": {
     "access": "public",

package/typings/index.d.ts

@@ -25,7 +25,7 @@ export { injectProp } from './hooks/injectProp';
 export { onConstructHooksRunner, onConstruct } from './hooks/onConstruct';
 export { onDisposeHooksRunner, onDispose } from './hooks/onDispose';
 export { HooksRunnerContext, HooksRunner } from './hooks/HooksRunner';
-export { setMetadata, getMetadata, setParameterMetadata, setMethodMetadata, getMethodMetadata, getParameterMetadata, } from './metadata';
+export { setClassMetadata, getClassMetadata, setParameterMetadata, setMethodMetadata, getMethodMetadata, getParameterMetadata, } from './metadata';
 export { InjectionToken } from './token/InjectionToken';
 export { AliasToken } from './token/AliasToken';
 export { AliasUniqToken, toAliasUniq } from './token/AliasUniqToken';

package/typings/metadata.d.ts

@@ -1,7 +1,7 @@
 import { constructor } from './types';
-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 const setParameterMetadata: (key: string | symbol, value: unknown) => ParameterDecorator;
+export declare const setClassMetadata: <T>(key: string | symbol, mapFn: (prev: T | undefined) => T) => ClassDecorator;
+export declare function getClassMetadata<T>(target: object, key: string | symbol): T | undefined;
+export declare const setParameterMetadata: (key: string | symbol, mapFn: (prev: unknown) => unknown) => ParameterDecorator;
 export declare const getParameterMetadata: (key: string | symbol, target: constructor<unknown>) => unknown[];
-export declare const setMethodMetadata: (key: string, value: unknown) => MethodDecorator;
+export declare const setMethodMetadata: <T>(key: string, mapFn: (prev: T | undefined) => T) => MethodDecorator;
 export declare const getMethodMetadata: (key: string, target: object, propertyKey: string) => unknown;