ts-ioc-container 71.0.0 → 72.1.0

package/cjm/container/Container.js

@@ -41,11 +41,11 @@ class Container {
     resolve(target, { args = [], child = this, lazy } = {}) {
         this.validateContainer();
         if (basic_1.Is.constructor(target)) {
-            return this.injector.resolve(this, target, { args, lazy });
+            return this.injector.resolve(target, { scope: this, args, lazy });
         }
         const provider = this.providers.get(target);
         return provider?.hasAccess({ invocationScope: child, providerScope: this, args })
-            ? provider.resolve(this, { args, lazy })
+            ? provider.resolve({ scope: this, args, lazy })
             : this.parent.resolve(target, { args, child, lazy });
     }
     resolveByAlias(alias, { args = [], child = this, lazy, excludedKeys = [] } = {}) {
@@ -58,7 +58,7 @@ class Container {
                 continue;
             }
             keys.push(key);
-            deps.push(provider.resolve(this, { args, lazy }));
+            deps.push(provider.resolve({ scope: this, args, lazy }));
         }
         const parentDeps = this.parent.resolveByAlias(alias, {
             args,
@@ -73,7 +73,7 @@ class Container {
         const [key] = this.aliases.getKeysByAlias(alias);
         const provider = key ? this.findProviderByKeyOrFail(key) : undefined;
         return provider?.hasAccess({ invocationScope: child, providerScope: this, args })
-            ? provider.resolve(this, { args, lazy })
+            ? provider.resolve({ scope: this, args, lazy })
             : this.parent.resolveOneByAlias(alias, { args, child, lazy });
     }
     createScope({ tags } = {}) {
@@ -93,7 +93,7 @@ class Container {
         this.validateContainer();
         for (const provider of this.providers.values()) {
             if (provider.isAutoResolvable() && provider.hasAccess({ invocationScope: this, providerScope: this, args })) {
-                provider.resolve(this, { args });
+                provider.resolve({ scope: this, args });
             }
         }
         return this;

package/cjm/hooks/HookContext.js

@@ -13,7 +13,8 @@ class HookContext {
         this.methodName = methodName;
     }
     resolveArgs(...args) {
-        return (0, MetadataInjector_1.resolveArgs)(this.instance, this.methodName)(this.scope, {
+        return (0, MetadataInjector_1.resolveArgs)(this.instance, this.methodName)({
+            scope: this.scope,
             args: [...this.initialArgs, ...args],
         });
     }
@@ -21,7 +22,7 @@ class HookContext {
         return this.instance[this.methodName](...args);
     }
     setProperty(fn) {
-        this.instance[this.methodName] = fn.resolve(this.scope);
+        this.instance[this.methodName] = fn({ scope: this.scope });
     }
     getProperty() {
         return this.instance[this.methodName];

package/cjm/hooks/injectProp.js

@@ -1,7 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.injectProp = void 0;
+const injectProp = (fn) => (context) => context.setProperty(fn);
 exports.injectProp = injectProp;
-const toToken_1 = require("../token/toToken");
-function injectProp(fn, ...mappers) {
-    return (context) => context.setProperty((0, toToken_1.toMappedToken)(fn, mappers));
-}

package/cjm/index.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.injectProp = exports.createHookExecutionContext = exports.createHookContextFactory = exports.HookContext = exports.toHookFn = exports.hasHooks = exports.hook = exports.getHooks = exports.ArgumentNotFoundError = exports.TypedEventDisposedError = exports.UnsupportedTokenTypeError = exports.CannonSingletonApplyTwiceError = exports.ProviderDisposedError = exports.ContainerDisposedError = exports.MethodNotImplementedError = exports.DependencyMissingKeyError = exports.ContainerNotFoundError = exports.DependencyNotFoundError = exports.ContainerError = exports.Registration = exports.onResolve = exports.appendArgsFn = exports.appendArgs = exports.decorate = exports.singleton = exports.autoResolve = exports.lazy = exports.scopeAccess = exports.scope = exports.bindTo = exports.register = exports.toRegistrationFn = exports.toProviderFn = exports.toBindToken = exports.registerPipe = exports.isProviderPipe = exports.Provider = exports.ProxyInjector = exports.SimpleInjector = exports.resolveArgs = exports.argsFn = exports.args = exports.arg = exports.inject = exports.MetadataInjector = exports.Injector = exports.EmptyContainer = exports.AutoResolveModule = exports.Container = exports.isDependencyKey = void 0;
-exports.TypedEvent = exports.getConstructorChain = exports.memoize = exports.once = exports.shallowCache = exports.debounce = exports.throttle = exports.runAtOnce = exports.runInOrder = exports.handleAsyncError = exports.handleError = exports.getMethodTags = exports.addMethodTag = exports.getMethodLabels = exports.addMethodLabel = exports.getMethodMeta = exports.addMethodMeta = exports.getParamTags = exports.addParamTag = exports.getParamLabels = exports.addParamLabel = exports.getParamMeta = exports.addParamMeta = exports.getClassTags = exports.addClassTag = exports.getClassLabels = exports.addClassLabel = exports.getClassMeta = exports.addClassMeta = exports.resolveConstructor = exports.GroupInstanceToken = exports.ConstantToken = exports.FunctionToken = exports.SingleToken = exports.ClassToken = exports.toSingleAlias = exports.SingleAliasToken = exports.toGroupAlias = exports.GroupAliasToken = exports.argToToken = exports.toMappedToken = exports.toToken = exports.forwardArgs = exports.isInjectionToken = exports.InjectionToken = exports.toTask = exports.HookCollector = exports.oncePerInstance = exports.parallel = exports.sequential = void 0;
-exports.isSerializable = exports.Is = exports.unwrapProxy = exports.ProxyRegistry = exports.findOrFail = exports.pipe = exports.select = void 0;
+exports.createHookExecutionContext = exports.createHookContextFactory = exports.HookContext = exports.toHookFn = exports.hasHooks = exports.hook = exports.getHooks = exports.ArgumentNotFoundError = exports.TypedEventDisposedError = exports.UnsupportedTokenTypeError = exports.CannonSingletonApplyTwiceError = exports.ProviderDisposedError = exports.ContainerDisposedError = exports.MethodNotImplementedError = exports.DependencyMissingKeyError = exports.ContainerNotFoundError = exports.DependencyNotFoundError = exports.ContainerError = exports.Registration = exports.onResolve = exports.appendArgsFn = exports.appendArgs = exports.decorate = exports.singleton = exports.autoResolve = exports.lazy = exports.scopeAccess = exports.scope = exports.bindTo = exports.register = exports.toRegistrationFn = exports.toProviderFn = exports.toBindToken = exports.registerPipe = exports.isProviderPipe = exports.Provider = exports.ProxyInjector = exports.SimpleInjector = exports.resolveArgs = exports.by = exports.argsFn = exports.args = exports.arg = exports.inject = exports.MetadataInjector = exports.Injector = exports.EmptyContainer = exports.AutoResolveModule = exports.Container = exports.isDependencyKey = void 0;
+exports.once = exports.shallowCache = exports.debounce = exports.throttle = exports.runAtOnce = exports.runInOrder = exports.handleAsyncError = exports.handleError = exports.createComposeMethodDecorator = exports.getMethodTags = exports.addMethodTag = exports.getMethodLabels = exports.addMethodLabel = exports.getMethodMeta = exports.addMethodMeta = exports.createComposeParameterDecorator = exports.getParamTags = exports.addParamTag = exports.getParamLabels = exports.addParamLabel = exports.getParamMeta = exports.addParamMeta = exports.createComposeClassDecorator = exports.getClassTags = exports.addClassTag = exports.getClassLabels = exports.addClassLabel = exports.getClassMeta = exports.addClassMeta = exports.resolveConstructor = exports.GroupInstanceToken = exports.ConstantToken = exports.FunctionToken = exports.SingleToken = exports.ClassToken = exports.toSingleAlias = exports.SingleAliasToken = exports.toGroupAlias = exports.GroupAliasToken = exports.argToToken = exports.toToken = exports.forwardArgs = exports.isInjectionToken = exports.InjectionToken = exports.toTask = exports.HookCollector = exports.oncePerInstance = exports.parallel = exports.sequential = exports.injectProp = void 0;
+exports.isSerializable = exports.Is = exports.unwrapProxy = exports.ProxyRegistry = exports.findOrFail = exports.pipe = exports.select = exports.TypedEvent = exports.getConstructorChain = exports.memoize = 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");
@@ -19,6 +19,7 @@ Object.defineProperty(exports, "inject", { enumerable: true, get: function () {
 Object.defineProperty(exports, "arg", { enumerable: true, get: function () { return MetadataInjector_1.arg; } });
 Object.defineProperty(exports, "args", { enumerable: true, get: function () { return MetadataInjector_1.args; } });
 Object.defineProperty(exports, "argsFn", { enumerable: true, get: function () { return MetadataInjector_1.argsFn; } });
+Object.defineProperty(exports, "by", { enumerable: true, get: function () { return MetadataInjector_1.by; } });
 Object.defineProperty(exports, "resolveArgs", { enumerable: true, get: function () { return MetadataInjector_1.resolveArgs; } });
 var SimpleInjector_1 = require("./injector/SimpleInjector");
 Object.defineProperty(exports, "SimpleInjector", { enumerable: true, get: function () { return SimpleInjector_1.SimpleInjector; } });
@@ -91,7 +92,6 @@ Object.defineProperty(exports, "isInjectionToken", { enumerable: true, get: func
 Object.defineProperty(exports, "forwardArgs", { enumerable: true, get: function () { return InjectionToken_1.forwardArgs; } });
 var toToken_1 = require("./token/toToken");
 Object.defineProperty(exports, "toToken", { enumerable: true, get: function () { return toToken_1.toToken; } });
-Object.defineProperty(exports, "toMappedToken", { enumerable: true, get: function () { return toToken_1.toMappedToken; } });
 Object.defineProperty(exports, "argToToken", { enumerable: true, get: function () { return toToken_1.argToToken; } });
 var GroupAliasToken_1 = require("./token/GroupAliasToken");
 Object.defineProperty(exports, "GroupAliasToken", { enumerable: true, get: function () { return GroupAliasToken_1.GroupAliasToken; } });
@@ -118,6 +118,7 @@ Object.defineProperty(exports, "addClassLabel", { enumerable: true, get: functio
 Object.defineProperty(exports, "getClassLabels", { enumerable: true, get: function () { return class_1.getClassLabels; } });
 Object.defineProperty(exports, "addClassTag", { enumerable: true, get: function () { return class_1.addClassTag; } });
 Object.defineProperty(exports, "getClassTags", { enumerable: true, get: function () { return class_1.getClassTags; } });
+Object.defineProperty(exports, "createComposeClassDecorator", { enumerable: true, get: function () { return class_1.createComposeClassDecorator; } });
 var parameter_1 = require("./metadata/parameter");
 Object.defineProperty(exports, "addParamMeta", { enumerable: true, get: function () { return parameter_1.addParamMeta; } });
 Object.defineProperty(exports, "getParamMeta", { enumerable: true, get: function () { return parameter_1.getParamMeta; } });
@@ -125,6 +126,7 @@ Object.defineProperty(exports, "addParamLabel", { enumerable: true, get: functio
 Object.defineProperty(exports, "getParamLabels", { enumerable: true, get: function () { return parameter_1.getParamLabels; } });
 Object.defineProperty(exports, "addParamTag", { enumerable: true, get: function () { return parameter_1.addParamTag; } });
 Object.defineProperty(exports, "getParamTags", { enumerable: true, get: function () { return parameter_1.getParamTags; } });
+Object.defineProperty(exports, "createComposeParameterDecorator", { enumerable: true, get: function () { return parameter_1.createComposeParameterDecorator; } });
 var method_1 = require("./metadata/method");
 Object.defineProperty(exports, "addMethodMeta", { enumerable: true, get: function () { return method_1.addMethodMeta; } });
 Object.defineProperty(exports, "getMethodMeta", { enumerable: true, get: function () { return method_1.getMethodMeta; } });
@@ -132,6 +134,7 @@ Object.defineProperty(exports, "addMethodLabel", { enumerable: true, get: functi
 Object.defineProperty(exports, "getMethodLabels", { enumerable: true, get: function () { return method_1.getMethodLabels; } });
 Object.defineProperty(exports, "addMethodTag", { enumerable: true, get: function () { return method_1.addMethodTag; } });
 Object.defineProperty(exports, "getMethodTags", { enumerable: true, get: function () { return method_1.getMethodTags; } });
+Object.defineProperty(exports, "createComposeMethodDecorator", { enumerable: true, get: function () { return method_1.createComposeMethodDecorator; } });
 var errorHandler_1 = require("./utils/errorHandler");
 Object.defineProperty(exports, "handleError", { enumerable: true, get: function () { return errorHandler_1.handleError; } });
 Object.defineProperty(exports, "handleAsyncError", { enumerable: true, get: function () { return errorHandler_1.handleAsyncError; } });

package/cjm/injector/IInjector.js

@@ -8,9 +8,9 @@ class Injector {
     constructor(proxyRegistry = ProxyRegistry_1.ProxyRegistry.getInstance()) {
         this.proxyRegistry = proxyRegistry;
     }
-    resolve(scope, Target, { args, lazy } = {}) {
+    resolve(Target, { scope, args, lazy }) {
         return this.proxyRegistry.toLazyIf(() => {
-            const instance = this.createInstance(scope, Target, { args });
+            const instance = this.createInstance(Target, { scope, args });
             scope.addInstance(instance);
             for (const onConstructed of this.onConstructedHookList) {
                 onConstructed(instance, scope);

package/cjm/injector/MetadataInjector.js

@@ -1,32 +1,37 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.resolveArgs = exports.args = exports.arg = exports.argsFn = exports.MetadataInjector = void 0;
+exports.resolveArgs = exports.args = exports.arg = exports.argsFn = exports.by = exports.MetadataInjector = void 0;
 exports.inject = inject;
 const IInjector_1 = require("./IInjector");
 const target_1 = require("../metadata/target");
 const parameter_1 = require("../metadata/parameter");
 const toToken_1 = require("../token/toToken");
 class MetadataInjector extends IInjector_1.Injector {
-    createInstance(scope, Target, { args: deps = [] } = {}) {
-        const args = (0, exports.resolveArgs)(Target)(scope, { args: deps });
+    createInstance(Target, { scope, args: deps = [] }) {
+        const args = (0, exports.resolveArgs)(Target)({ scope, args: deps });
         return new Target(...args);
     }
 }
 exports.MetadataInjector = MetadataInjector;
 const hookMetaKey = (methodName = 'constructor') => `inject:${methodName}`;
-function inject(fn, ...mappers) {
+function inject(fn) {
     return (target, propertyKey, parameterIndex) => {
-        (0, parameter_1.addParamMeta)(hookMetaKey(propertyKey), () => (0, toToken_1.toMappedToken)(fn, mappers))((0, target_1.resolveConstructor)(target), propertyKey, parameterIndex);
+        (0, parameter_1.addParamMeta)(hookMetaKey(propertyKey), () => fn)((0, target_1.resolveConstructor)(target), propertyKey, parameterIndex);
     };
 }
-const argsFn = (predicate) => (c, { args = [] }) => args.find((value, index) => predicate(value, index));
+const by = (target) => {
+    const token = (0, toToken_1.toToken)(target);
+    return ({ scope, ...options }) => token.resolve(scope, options);
+};
+exports.by = by;
+const argsFn = (predicate) => ({ args = [] }) => args.find((value, index) => predicate(value, index));
 exports.argsFn = argsFn;
 const arg = (index) => (0, exports.argsFn)((value, i) => i === index);
 exports.arg = arg;
-const args = (c, { args = [] }) => args;
+const args = ({ args = [] }) => args;
 exports.args = args;
 const resolveArgs = (target, methodName) => {
-    const tokens = (0, parameter_1.getParamMeta)(hookMetaKey(methodName), target);
-    return (scope, { args = [], lazy }) => tokens.map((fn) => fn.resolve(scope, { args, lazy }));
+    const fns = (0, parameter_1.getParamMeta)(hookMetaKey(methodName), target);
+    return (options) => fns.map((fn) => fn(options));
 };
 exports.resolveArgs = resolveArgs;

package/cjm/injector/ProxyInjector.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ProxyInjector = void 0;
 const IInjector_1 = require("./IInjector");
 class ProxyInjector extends IInjector_1.Injector {
-    createInstance(scope, Target, { args = [] } = {}) {
+    createInstance(Target, { scope, args = [] }) {
         const proxy = new Proxy({}, {
             get(target, prop) {
                 if (prop === 'args') {

package/cjm/injector/SimpleInjector.js

@@ -3,8 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.SimpleInjector = void 0;
 const IInjector_1 = require("./IInjector");
 class SimpleInjector extends IInjector_1.Injector {
-    createInstance(container, Target, { args = [] } = {}) {
-        return new Target(container, ...args);
+    createInstance(Target, { scope, args = [] }) {
+        return new Target(scope, ...args);
     }
 }
 exports.SimpleInjector = SimpleInjector;

package/cjm/metadata/class.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getClassTags = exports.addClassTag = exports.getClassLabels = exports.addClassLabel = exports.addClassMeta = void 0;
+exports.createComposeClassDecorator = exports.getClassTags = exports.addClassTag = exports.getClassLabels = exports.addClassLabel = exports.addClassMeta = void 0;
 exports.getClassMeta = getClassMeta;
 const target_1 = require("./target");
 const addClassMeta = (key, mapFn) => (target) => {
@@ -19,3 +19,5 @@ const addClassTag = (tag) => (0, exports.addClassMeta)('tag', (prev = new Set())
 exports.addClassTag = addClassTag;
 const getClassTags = (target) => getClassMeta(target, 'tag') ?? new Set();
 exports.getClassTags = getClassTags;
+const createComposeClassDecorator = (...decorators) => (target) => decorators.reduceRight((acc, decorate) => decorate(acc) ?? acc, target);
+exports.createComposeClassDecorator = createComposeClassDecorator;

package/cjm/metadata/method.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getMethodTags = exports.addMethodTag = exports.getMethodLabels = exports.addMethodLabel = exports.getMethodMeta = exports.addMethodMeta = void 0;
+exports.createComposeMethodDecorator = exports.getMethodTags = exports.addMethodTag = exports.getMethodLabels = exports.addMethodLabel = exports.getMethodMeta = exports.addMethodMeta = void 0;
 const target_1 = require("./target");
 const addMethodMeta = (key, mapFn) => (target, propertyKey) => {
     const metadata = Reflect.getMetadata(key, target.constructor, propertyKey);
@@ -17,3 +17,5 @@ const addMethodTag = (tag) => (0, exports.addMethodMeta)('tag', (prev = new Set(
 exports.addMethodTag = addMethodTag;
 const getMethodTags = (target, propertyKey) => (0, exports.getMethodMeta)('tag', target, propertyKey) ?? new Set();
 exports.getMethodTags = getMethodTags;
+const createComposeMethodDecorator = (...decorators) => (target, propertyKey, descriptor) => decorators.reduceRight((acc, decorate) => decorate(target, propertyKey, acc) ?? acc, descriptor);
+exports.createComposeMethodDecorator = createComposeMethodDecorator;

package/cjm/metadata/parameter.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getParamTags = exports.addParamTag = exports.getParamLabels = exports.addParamLabel = exports.getParamMeta = exports.addParamMeta = void 0;
+exports.createComposeParameterDecorator = exports.getParamTags = exports.addParamTag = exports.getParamLabels = exports.addParamLabel = exports.getParamMeta = exports.addParamMeta = void 0;
 const target_1 = require("./target");
 const addParamMeta = (key, mapFn) => (target, _, parameterIndex) => {
     const metadata = Reflect.getOwnMetadata(key, target) ?? [];
@@ -32,3 +32,9 @@ const getParamTags = (target, parameterIndex) => {
     return all[parameterIndex] ?? new Set();
 };
 exports.getParamTags = getParamTags;
+const createComposeParameterDecorator = (...decorators) => (target, propertyKey, parameterIndex) => {
+    for (let i = decorators.length - 1; i >= 0; i--) {
+        decorators[i](target, propertyKey, parameterIndex);
+    }
+};
+exports.createComposeParameterDecorator = createComposeParameterDecorator;

package/cjm/provider/Provider.js

@@ -7,13 +7,13 @@ const ProviderDisposedError_1 = require("../errors/ProviderDisposedError");
 class Provider {
     resolveDependency;
     static fromClass(Target) {
-        return new Provider((container, options) => container.resolve(Target, options));
+        return new Provider(({ scope, ...options }) => scope.resolve(Target, options));
     }
     static fromValue(value) {
         return new Provider(() => value);
     }
     static fromKey(key) {
-        return new Provider((c) => c.resolve(key));
+        return new Provider(({ scope }) => scope.resolve(key));
     }
     argsFnList = [];
     accessRules = [];
@@ -27,20 +27,21 @@ class Provider {
     constructor(resolveDependency) {
         this.resolveDependency = resolveDependency;
     }
-    resolve(scope, options) {
+    resolve(options) {
         ProviderDisposedError_1.ProviderDisposedError.assert(!this.isDisposed, 'Provider is already disposed');
         if (!this.getKey) {
-            return this.resolveDep(scope, options);
+            return this.resolveDep(options);
         }
         const key = (0, basic_1.toString)(this.getKey(options.args ?? []));
         if (!this.cache.has(key)) {
-            this.cache.set(key, this.resolveDep(scope, options));
+            this.cache.set(key, this.resolveDep(options));
         }
         return this.cache.get(key);
     }
-    resolveDep(scope, { args = [], lazy } = {}) {
-        let dependency = this.resolveDependency(scope, {
-            args: this.argsFnList.reduce((acc, current) => current(scope, { args: acc }), args),
+    resolveDep({ scope, args = [], lazy }) {
+        let dependency = this.resolveDependency({
+            scope,
+            args: this.argsFnList.reduce((acc, current) => current({ scope, args: acc }), args),
             lazy: lazy ?? this.isLazy,
         });
         dependency = this.mappers.reduce((acc, current) => current(acc, scope), dependency);

package/cjm/registration/IRegistration.js

@@ -40,9 +40,9 @@ const bindTo = (...tokens) => (r) => {
 exports.bindTo = bindTo;
 const scope = (...rules) => (r) => r.when(...rules);
 exports.scope = scope;
-const appendArgs = (...extraArgs) => (0, exports.registerPipe)((p) => p.addArgsFn((_, { args = [] } = {}) => [...args, ...extraArgs]));
+const appendArgs = (...extraArgs) => (0, exports.registerPipe)((p) => p.addArgsFn(({ args = [] }) => [...args, ...extraArgs]));
 exports.appendArgs = appendArgs;
-const appendArgsFn = (fn) => (0, exports.registerPipe)((p) => p.addArgsFn((scope, options) => [...(options?.args ?? []), ...fn(scope, options)]));
+const appendArgsFn = (fn) => (0, exports.registerPipe)((p) => p.addArgsFn((options) => [...(options.args ?? []), ...fn(options)]));
 exports.appendArgsFn = appendArgsFn;
 const scopeAccess = (rule) => (0, exports.registerPipe)((p) => p.addAccessRule(rule));
 exports.scopeAccess = scopeAccess;

package/cjm/select.js

@@ -10,7 +10,7 @@ exports.select = {
     token: toToken_1.toToken,
     instances: (predicate = () => true) => new GroupInstanceToken_1.GroupInstanceToken(predicate),
     scope: {
-        current: new FunctionToken_1.FunctionToken((s) => s),
-        create: (options) => new FunctionToken_1.FunctionToken((s) => s.createScope(options)),
+        current: new FunctionToken_1.FunctionToken(({ scope }) => scope),
+        create: (options) => new FunctionToken_1.FunctionToken(({ scope }) => scope.createScope(options)),
     },
 };

package/cjm/token/ClassToken.js

@@ -17,14 +17,14 @@ class ClassToken extends InjectionToken_1.InjectionToken {
     }
     resolve(s, { args = [], lazy } = {}) {
         return s.resolve(this.target, {
-            args: this._getArgsFn(s, { args }),
+            args: this._getArgsFn({ scope: s, args }),
             lazy: this._isLazy || lazy,
         });
     }
     args(...newArgs) {
         const parentFn = this._getArgsFn;
         return new ClassToken(this.target, {
-            getArgsFn: (s, opts) => [...parentFn(s, opts), ...newArgs],
+            getArgsFn: (options) => [...parentFn(options), ...newArgs],
             isLazy: this._isLazy,
             tags: this.getTags(),
         });
@@ -32,7 +32,7 @@ class ClassToken extends InjectionToken_1.InjectionToken {
     argsFn(fn) {
         const parentFn = this._getArgsFn;
         return new ClassToken(this.target, {
-            getArgsFn: (s, opts) => [...parentFn(s, opts), ...fn(s)],
+            getArgsFn: (options) => [...parentFn(options), ...fn(options.scope)],
             isLazy: this._isLazy,
             tags: this.getTags(),
         });

package/cjm/token/FunctionToken.js

@@ -14,15 +14,16 @@ class FunctionToken extends InjectionToken_1.InjectionToken {
         this._isLazy = isLazy;
     }
     resolve(s, { args = [], lazy } = {}) {
-        return this.fn(s, {
-            args: this._getArgsFn(s, { args }),
+        return this.fn({
+            scope: s,
+            args: this._getArgsFn({ scope: s, args }),
             lazy: this._isLazy || lazy,
         });
     }
     args(...newArgs) {
         const parentFn = this._getArgsFn;
         return new FunctionToken(this.fn, {
-            getArgsFn: (s, opts) => [...parentFn(s, opts), ...newArgs],
+            getArgsFn: (options) => [...parentFn(options), ...newArgs],
             isLazy: this._isLazy,
             tags: this.getTags(),
         });
@@ -30,7 +31,7 @@ class FunctionToken extends InjectionToken_1.InjectionToken {
     argsFn(fn) {
         const parentFn = this._getArgsFn;
         return new FunctionToken(this.fn, {
-            getArgsFn: (s, opts) => [...parentFn(s, opts), ...fn(s)],
+            getArgsFn: (options) => [...parentFn(options), ...fn(options.scope)],
             isLazy: this._isLazy,
             tags: this.getTags(),
         });

package/cjm/token/GroupAliasToken.js

@@ -17,7 +17,7 @@ class GroupAliasToken extends InjectionToken_1.InjectionToken {
     }
     resolve(s, { args = [], lazy } = {}) {
         return s.resolveByAlias(this.token, {
-            args: this._getArgsFn(s, { args }),
+            args: this._getArgsFn({ scope: s, args }),
             lazy: this._isLazy || lazy,
         });
     }
@@ -27,7 +27,7 @@ class GroupAliasToken extends InjectionToken_1.InjectionToken {
     args(...newArgs) {
         const parentFn = this._getArgsFn;
         return new GroupAliasToken(this.token, {
-            getArgsFn: (s, opts) => [...parentFn(s, opts), ...newArgs],
+            getArgsFn: (options) => [...parentFn(options), ...newArgs],
             isLazy: this._isLazy,
             tags: this.getTags(),
         });
@@ -35,7 +35,7 @@ class GroupAliasToken extends InjectionToken_1.InjectionToken {
     argsFn(fn) {
         const parentFn = this._getArgsFn;
         return new GroupAliasToken(this.token, {
-            getArgsFn: (s, opts) => [...parentFn(s, opts), ...fn(s)],
+            getArgsFn: (options) => [...parentFn(options), ...fn(options.scope)],
             isLazy: this._isLazy,
             tags: this.getTags(),
         });

package/cjm/token/InjectionToken.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.InjectionToken = exports.forwardArgs = void 0;
 exports.isInjectionToken = isInjectionToken;
 const basic_1 = require("../utils/basic");
-const forwardArgs = (_, { args = [] } = {}) => args;
+const forwardArgs = ({ args = [] }) => args;
 exports.forwardArgs = forwardArgs;
 class InjectionToken {
     tags;

package/cjm/token/SingleAliasToken.js

@@ -17,7 +17,7 @@ class SingleAliasToken extends InjectionToken_1.InjectionToken {
     }
     resolve(s, { args = [], lazy } = {}) {
         return s.resolveOneByAlias(this.token, {
-            args: this._getArgsFn(s, { args }),
+            args: this._getArgsFn({ scope: s, args }),
             lazy: this._isLazy || lazy,
         });
     }
@@ -27,7 +27,7 @@ class SingleAliasToken extends InjectionToken_1.InjectionToken {
     args(...newArgs) {
         const parentFn = this._getArgsFn;
         return new SingleAliasToken(this.token, {
-            getArgsFn: (s, opts) => [...parentFn(s, opts), ...newArgs],
+            getArgsFn: (options) => [...parentFn(options), ...newArgs],
             isLazy: this._isLazy,
             tags: this.getTags(),
         });
@@ -35,7 +35,7 @@ class SingleAliasToken extends InjectionToken_1.InjectionToken {
     argsFn(fn) {
         const parentFn = this._getArgsFn;
         return new SingleAliasToken(this.token, {
-            getArgsFn: (s, opts) => [...parentFn(s, opts), ...fn(s)],
+            getArgsFn: (options) => [...parentFn(options), ...fn(options.scope)],
             isLazy: this._isLazy,
             tags: this.getTags(),
         });

package/cjm/token/SingleToken.js

@@ -17,7 +17,7 @@ class SingleToken extends InjectionToken_1.InjectionToken {
     }
     resolve(s, { args = [], lazy } = {}) {
         return s.resolve(this.token, {
-            args: this._getArgsFn(s, { args }),
+            args: this._getArgsFn({ scope: s, args }),
             lazy: this._isLazy || lazy,
         });
     }
@@ -27,7 +27,7 @@ class SingleToken extends InjectionToken_1.InjectionToken {
     args(...newArgs) {
         const parentFn = this._getArgsFn;
         return new SingleToken(this.token, {
-            getArgsFn: (s, opts) => [...parentFn(s, opts), ...newArgs],
+            getArgsFn: (options) => [...parentFn(options), ...newArgs],
             isLazy: this._isLazy,
             tags: this.getTags(),
         });
@@ -35,7 +35,7 @@ class SingleToken extends InjectionToken_1.InjectionToken {
     argsFn(fn) {
         const parentFn = this._getArgsFn;
         return new SingleToken(this.token, {
-            getArgsFn: (s, opts) => [...parentFn(s, opts), ...fn(s)],
+            getArgsFn: (options) => [...parentFn(options), ...fn(options.scope)],
             isLazy: this._isLazy,
             tags: this.getTags(),
         });

package/cjm/token/toToken.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.toMappedToken = exports.argToToken = exports.toToken = void 0;
+exports.argToToken = exports.toToken = void 0;
 const IContainer_1 = require("../container/IContainer");
 const SingleToken_1 = require("./SingleToken");
 const ClassToken_1 = require("./ClassToken");
@@ -9,7 +9,6 @@ const UnsupportedTokenTypeError_1 = require("../errors/UnsupportedTokenTypeError
 const InjectionToken_1 = require("./InjectionToken");
 const basic_1 = require("../utils/basic");
 const ConstantToken_1 = require("./ConstantToken");
-const fp_1 = require("../utils/fp");
 const toToken = (token) => {
     if (token instanceof InjectionToken_1.InjectionToken) {
         return token;
@@ -28,9 +27,3 @@ const toToken = (token) => {
 exports.toToken = toToken;
 const argToToken = (v) => ((0, InjectionToken_1.isInjectionToken)(v) ? v : new ConstantToken_1.ConstantToken(v));
 exports.argToToken = argToToken;
-const toMappedToken = (token, mappers) => {
-    const source = (0, exports.toToken)(token);
-    const mapInstance = (0, fp_1.pipe)(...mappers);
-    return new FunctionToken_1.FunctionToken((scope, options) => mapInstance(source.resolve(scope, options)));
-};
-exports.toMappedToken = toMappedToken;

package/esm/container/Container.js

@@ -38,11 +38,11 @@ export class Container {
     resolve(target, { args = [], child = this, lazy } = {}) {
         this.validateContainer();
         if (Is.constructor(target)) {
-            return this.injector.resolve(this, target, { args, lazy });
+            return this.injector.resolve(target, { scope: this, args, lazy });
         }
         const provider = this.providers.get(target);
         return provider?.hasAccess({ invocationScope: child, providerScope: this, args })
-            ? provider.resolve(this, { args, lazy })
+            ? provider.resolve({ scope: this, args, lazy })
             : this.parent.resolve(target, { args, child, lazy });
     }
     resolveByAlias(alias, { args = [], child = this, lazy, excludedKeys = [] } = {}) {
@@ -55,7 +55,7 @@ export class Container {
                 continue;
             }
             keys.push(key);
-            deps.push(provider.resolve(this, { args, lazy }));
+            deps.push(provider.resolve({ scope: this, args, lazy }));
         }
         const parentDeps = this.parent.resolveByAlias(alias, {
             args,
@@ -70,7 +70,7 @@ export class Container {
         const [key] = this.aliases.getKeysByAlias(alias);
         const provider = key ? this.findProviderByKeyOrFail(key) : undefined;
         return provider?.hasAccess({ invocationScope: child, providerScope: this, args })
-            ? provider.resolve(this, { args, lazy })
+            ? provider.resolve({ scope: this, args, lazy })
             : this.parent.resolveOneByAlias(alias, { args, child, lazy });
     }
     createScope({ tags } = {}) {
@@ -90,7 +90,7 @@ export class Container {
         this.validateContainer();
         for (const provider of this.providers.values()) {
             if (provider.isAutoResolvable() && provider.hasAccess({ invocationScope: this, providerScope: this, args })) {
-                provider.resolve(this, { args });
+                provider.resolve({ scope: this, args });
             }
         }
         return this;

package/esm/hooks/HookContext.js

@@ -10,7 +10,8 @@ export class HookContext {
         this.methodName = methodName;
     }
     resolveArgs(...args) {
-        return resolveArgs(this.instance, this.methodName)(this.scope, {
+        return resolveArgs(this.instance, this.methodName)({
+            scope: this.scope,
             args: [...this.initialArgs, ...args],
         });
     }
@@ -18,7 +19,7 @@ export class HookContext {
         return this.instance[this.methodName](...args);
     }
     setProperty(fn) {
-        this.instance[this.methodName] = fn.resolve(this.scope);
+        this.instance[this.methodName] = fn({ scope: this.scope });
     }
     getProperty() {
         return this.instance[this.methodName];

package/esm/hooks/injectProp.js

@@ -1,4 +1 @@
-import { toMappedToken } from '../token/toToken.js';
-export function injectProp(fn, ...mappers) {
-    return (context) => context.setProperty(toMappedToken(fn, mappers));
-}
+export const injectProp = (fn) => (context) => context.setProperty(fn);

package/esm/index.js

@@ -3,7 +3,7 @@ export { Container } from './container/Container.js';
 export { AutoResolveModule } from './container/AutoResolveModule.js';
 export { EmptyContainer } from './container/EmptyContainer.js';
 export { Injector, } from './injector/IInjector.js';
-export { MetadataInjector, inject, arg, args, argsFn, resolveArgs } from './injector/MetadataInjector.js';
+export { MetadataInjector, inject, arg, args, argsFn, by, resolveArgs } from './injector/MetadataInjector.js';
 export { SimpleInjector } from './injector/SimpleInjector.js';
 export { ProxyInjector } from './injector/ProxyInjector.js';
 export { Provider } from './provider/Provider.js';
@@ -26,7 +26,7 @@ export { injectProp } from './hooks/injectProp.js';
 export { sequential, parallel, oncePerInstance } from './hooks/combinators.js';
 export { HookCollector, toTask, } from './hooks/HookCollector.js';
 export { InjectionToken, isInjectionToken, forwardArgs } from './token/InjectionToken.js';
-export { toToken, toMappedToken, argToToken } from './token/toToken.js';
+export { toToken, argToToken } from './token/toToken.js';
 export { GroupAliasToken, toGroupAlias } from './token/GroupAliasToken.js';
 export { SingleAliasToken, toSingleAlias } from './token/SingleAliasToken.js';
 export { ClassToken } from './token/ClassToken.js';
@@ -35,9 +35,9 @@ export { FunctionToken } from './token/FunctionToken.js';
 export { ConstantToken } from './token/ConstantToken.js';
 export { GroupInstanceToken } from './token/GroupInstanceToken.js';
 export { resolveConstructor } from './metadata/target.js';
-export { addClassMeta, getClassMeta, addClassLabel, getClassLabels, addClassTag, getClassTags } from './metadata/class.js';
-export { addParamMeta, getParamMeta, addParamLabel, getParamLabels, addParamTag, getParamTags, } from './metadata/parameter.js';
-export { addMethodMeta, getMethodMeta, addMethodLabel, getMethodLabels, addMethodTag, getMethodTags, } from './metadata/method.js';
+export { addClassMeta, getClassMeta, addClassLabel, getClassLabels, addClassTag, getClassTags, createComposeClassDecorator, } from './metadata/class.js';
+export { addParamMeta, getParamMeta, addParamLabel, getParamLabels, addParamTag, getParamTags, createComposeParameterDecorator, } from './metadata/parameter.js';
+export { addMethodMeta, getMethodMeta, addMethodLabel, getMethodLabels, addMethodTag, getMethodTags, createComposeMethodDecorator, } from './metadata/method.js';
 export { handleError, handleAsyncError } from './utils/errorHandler.js';
 export { runInOrder, runAtOnce } from './utils/task.js';
 export { throttle } from './utils/throttle.js';

package/esm/injector/IInjector.js

@@ -5,9 +5,9 @@ export class Injector {
     constructor(proxyRegistry = ProxyRegistry.getInstance()) {
         this.proxyRegistry = proxyRegistry;
     }
-    resolve(scope, Target, { args, lazy } = {}) {
+    resolve(Target, { scope, args, lazy }) {
         return this.proxyRegistry.toLazyIf(() => {
-            const instance = this.createInstance(scope, Target, { args });
+            const instance = this.createInstance(Target, { scope, args });
             scope.addInstance(instance);
             for (const onConstructed of this.onConstructedHookList) {
                 onConstructed(instance, scope);