ts-ioc-container 51.0.0 → 52.0.0

package/README.md

@@ -681,7 +681,18 @@ The `lazy()` registerPipe can be used in two ways: with the `@register` decorato
 
 ```typescript
 import 'reflect-metadata';
-import { args, bindTo, Container, inject, lazy, Provider, register, Registration as R, singleton } from 'ts-ioc-container';
+import {
+  appendArgs,
+  args,
+  bindTo,
+  Container,
+  inject,
+  lazy,
+  Provider,
+  register,
+  Registration as R,
+  singleton,
+} from 'ts-ioc-container';
 
 /**
  * Lazy Loading with registerPipe
@@ -853,7 +864,7 @@ describe('lazy registerPipe', () => {
     it('should allow selective lazy loading - email lazy, SMS eager', () => {
       const container = new Container()
         // EmailService is lazy - won't connect to SMTP until used
-        .addRegistration(R.fromClass(EmailService).pipe(singleton(), (p) => p.lazy()))
+        .addRegistration(R.fromClass(EmailService).pipe(singleton(), lazy()))
         // SmsService is eager - connects to gateway immediately
         .addRegistration(R.fromClass(SmsService).pipe(singleton()))
         .addRegistration(R.fromClass(NotificationService));
@@ -872,7 +883,7 @@ describe('lazy registerPipe', () => {
 
     it('should initialize lazy email service when first accessed', () => {
       const container = new Container()
-        .addRegistration(R.fromClass(EmailService).pipe(singleton(), (p) => p.lazy()))
+        .addRegistration(R.fromClass(EmailService).pipe(singleton(), lazy()))
         .addRegistration(R.fromClass(SmsService).pipe(singleton()))
         .addRegistration(R.fromClass(NotificationService));
 
@@ -888,8 +899,8 @@ describe('lazy registerPipe', () => {
     it('should work with multiple lazy providers', () => {
       const container = new Container()
         // Both services are lazy
-        .addRegistration(R.fromClass(EmailService).pipe(singleton(), (p) => p.lazy()))
-        .addRegistration(R.fromClass(SmsService).pipe(singleton(), (p) => p.lazy()))
+        .addRegistration(R.fromClass(EmailService).pipe(singleton(), lazy()))
+        .addRegistration(R.fromClass(SmsService).pipe(singleton(), lazy()))
         .addRegistration(R.fromClass(NotificationService));
 
       const notifications = container.resolve<NotificationService>(NotificationService);
@@ -940,7 +951,7 @@ describe('lazy registerPipe', () => {
 
     it('should use Provider.fromClass with lazy() helper', () => {
       // Create pure provider with lazy loading
-      const cacheProvider = Provider.fromClass(CacheService).pipe(lazy(), singleton());
+      const cacheProvider = Provider.fromClass(CacheService).lazy().singleton();
 
       const container = new Container();
       container.register('CacheService', cacheProvider);
@@ -958,7 +969,7 @@ describe('lazy registerPipe', () => {
 
     it('should allow importing lazy as named export', () => {
       // Demonstrate that lazy() is imported from the library
-      const cacheProvider = Provider.fromClass(CacheService).pipe(lazy());
+      const cacheProvider = Provider.fromClass(CacheService).lazy();
 
       const container = new Container();
       container.register('CacheService', cacheProvider);
@@ -990,12 +1001,7 @@ describe('lazy registerPipe', () => {
 
     it('should combine lazy with args and singleton', () => {
       const container = new Container().addRegistration(
-        R.fromClass(ConfigService)
-          .pipe(
-            (p) => p.addArgs('https://api.example.com', 5000),
-            (p) => p.lazy(),
-          )
-          .pipe(singleton()),
+        R.fromClass(ConfigService).pipe(appendArgs('https://api.example.com', 5000), lazy()).pipe(singleton()),
       );
 
       // Config not initialized yet
@@ -1288,20 +1294,7 @@ Provider is dependency factory which creates dependency.
 - `new Provider((container, options) => container.resolve(Logger, options))`
 
 ```typescript
-import {
-  args,
-  appendArgs,
-  appendArgsFn,
-  bindTo,
-  Container,
-  inject,
-  lazy,
-  Provider,
-  register,
-  Registration as R,
-  scopeAccess,
-  singleton,
-} from 'ts-ioc-container';
+import { args, bindTo, Container, inject, lazy, Provider, register, Registration as R } from 'ts-ioc-container';
 
 /**
  * Data Processing Pipeline - Provider Patterns
@@ -1338,10 +1331,10 @@ describe('Provider', () => {
   });
 
   it('can be featured by fp method (Singleton Pattern)', () => {
-    // Pipe "singleton()" to cache the instance
+    // Use ".singleton()" to cache the instance
     const appContainer = new Container({ tags: ['application'] }).register(
       'SharedLogger',
-      Provider.fromClass(Logger).pipe(singleton()),
+      Provider.fromClass(Logger).singleton(),
     );
     expect(appContainer.resolve('SharedLogger')).toBe(appContainer.resolve('SharedLogger'));
   });
@@ -1373,7 +1366,7 @@ describe('Provider', () => {
 
     const container = new Container().register(
       'FileService',
-      Provider.fromClass(FileService).pipe(appendArgs('/var/data')),
+      Provider.fromClass(FileService).addArgsFn((_, { args = [] } = {}) => [...args, '/var/data']),
     );
 
     const service = container.resolve<FileService>('FileService');
@@ -1387,10 +1380,8 @@ describe('Provider', () => {
 
     const container = new Container().register('DbPath', Provider.fromValue('localhost:5432')).register(
       'Database',
-      Provider.fromClass(Database).pipe(
-        // Dynamically resolve connection string at creation time
-        appendArgsFn((scope) => [`postgres://${scope.resolve('DbPath')}`]),
-      ),
+      // Dynamically resolve connection string at creation time
+      Provider.fromClass(Database).addArgsFn((scope) => [`postgres://${scope.resolve('DbPath')}`]),
     );
 
     const db = container.resolve<Database>('Database');
@@ -1403,7 +1394,7 @@ describe('Provider', () => {
 
     const appContainer = new Container({ tags: ['application'] }).register(
       'AdminService',
-      Provider.fromClass(AdminService).pipe(scopeAccess((_prev, { invocationScope }) => invocationScope.hasTag('admin'))),
+      Provider.fromClass(AdminService).addAccessRule(({ invocationScope }) => invocationScope.hasTag('admin')),
     );
 
     const adminScope = appContainer.createScope({ tags: ['admin'] });
@@ -1778,8 +1769,8 @@ Sometimes you want to hide dependency if somebody wants to resolve it from certa
 > [!IMPORTANT]
 > Use `scope()` to decide where a provider is registered. Use `scopeAccess()` to decide which invocation scopes can see an already registered provider.
 
-- `provider(scopeAccess((_prev, { invocationScope, providerScope }) => invocationScope === providerScope))` - dependency will be accessible only from the scope where it's registered
-- `Provider.fromClass(Logger).pipe(scopeAccess((_prev, { invocationScope, providerScope }) => invocationScope === providerScope))`
+- `provider(scopeAccess(({ invocationScope, providerScope }) => invocationScope === providerScope))` - dependency will be accessible only from the scope where it's registered
+- `Provider.fromClass(Logger).pipe(scopeAccess(({ invocationScope, providerScope }) => invocationScope === providerScope))`
 
 Rules compose as a left-fold starting from `true` — each rule receives the accumulated result of all previous rules, enabling AND/OR logic across multiple `scopeAccess` calls.
 
@@ -1820,7 +1811,7 @@ describe('Visibility', function () {
       scope((s) => s.hasTag('application')), // Registered at app level
       singleton(),
       // Only accessible from admin scope, not regular request scope
-      scopeAccess((_prev, { invocationScope }) => invocationScope.hasTag('admin')),
+      scopeAccess(({ invocationScope }) => invocationScope.hasTag('admin')),
     )
     class UserManagementService {
       deleteUser(userId: string): string {
@@ -1852,7 +1843,7 @@ describe('Visibility', function () {
       scope((s) => s.hasTag('application')),
       singleton(),
       // Only accessible from the scope where it was registered
-      scopeAccess((_prev, { invocationScope, providerScope }) => invocationScope === providerScope),
+      scopeAccess(({ invocationScope, providerScope }) => invocationScope === providerScope),
     )
     class AuditLogger {
       log(message: string): string {
@@ -2023,7 +2014,7 @@ describe('alias', () => {
 
 ### Decorator
 
-Sometimes you want to decorate you class with some logic. This is what `DecoratorProvider` is for.
+Sometimes you want to decorate you class with some logic. Use the `decorate(...)` pipe — it appends a `DecorateFn` to the provider's mapper chain via `IProvider.map(...)`.
 
 - `provider(decorate((instance, container) => new LoggerDecorator(instance)))`
 

package/cjm/container/Container.js

@@ -31,23 +31,23 @@ class Container {
         this.aliases.setAliasesByKey(key, aliases);
         return this;
     }
-    resolve(target, { args, child = this, lazy } = {}) {
+    resolve(target, { args = [], child = this, lazy } = {}) {
         this.validateContainer();
         if (basic_1.Is.constructor(target)) {
             return this.injector.resolve(this, target, { args, lazy });
         }
         const provider = this.providers.get(target);
-        return provider?.hasAccess({ invocationScope: child, providerScope: this })
+        return provider?.hasAccess({ invocationScope: child, providerScope: this, args })
             ? 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 = [];
         for (const key of this.aliases.getKeysByAlias(alias).filter(array_1.Filter.exclude(excludedKeys))) {
             const provider = this.findProviderByKeyOrFail(key);
-            if (!provider.hasAccess({ invocationScope: child, providerScope: this })) {
+            if (!provider.hasAccess({ invocationScope: child, providerScope: this, args })) {
                 continue;
             }
             keys.push(key);
@@ -61,11 +61,11 @@ 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;
-        return provider?.hasAccess({ invocationScope: child, providerScope: this })
+        return provider?.hasAccess({ invocationScope: child, providerScope: this, args })
             ? provider.resolve(this, { args, lazy })
             : this.parent.resolveOneByAlias(alias, { args, child, lazy });
     }

package/cjm/errors/CannonSingletonApplyError.js

@@ -0,0 +1,12 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CannonSingletonApplyError = void 0;
+const ContainerError_1 = require("./ContainerError");
+class CannonSingletonApplyError extends ContainerError_1.ContainerError {
+    name = 'CannonSingletonApplyError';
+    constructor(message) {
+        super(message);
+        Object.setPrototypeOf(this, CannonSingletonApplyError.prototype);
+    }
+}
+exports.CannonSingletonApplyError = CannonSingletonApplyError;

package/cjm/hooks/HookContext.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createHookContextFactory = exports.createHookContext = exports.HookContext = void 0;
-const inject_1 = require("../injector/inject");
 const proxy_1 = require("../utils/proxy");
+const MetadataInjector_1 = require("../injector/MetadataInjector");
 class HookContext {
     scope;
     methodName;
@@ -14,7 +14,7 @@ class HookContext {
         this.instance = (0, proxy_1.isProxy)(instance) ? (0, proxy_1.getProxyTarget)(instance) : instance;
     }
     resolveArgs(...args) {
-        return (0, inject_1.resolveArgs)(this.instance.constructor, this.methodName)(this.scope, {
+        return (0, MetadataInjector_1.resolveArgs)(this.instance.constructor, this.methodName)(this.scope, {
             args: [...this.initialArgs, ...args],
         });
     }

package/cjm/index.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.SingleToken = exports.ClassToken = exports.toSingleAlias = exports.SingleAliasToken = exports.toGroupAlias = exports.GroupAliasToken = exports.InjectionToken = exports.HooksRunner = exports.AddOnDisposeHookModule = exports.onDispose = exports.onDisposeHooksRunner = exports.AddOnConstructHookModule = exports.onConstruct = exports.onConstructHooksRunner = exports.injectProp = exports.createHookContext = exports.createHookContextFactory = 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.SingletonProvider = exports.singleton = exports.Provider = exports.ProviderDecorator = exports.appendArgsFn = exports.appendArgs = exports.lazy = exports.scopeAccess = exports.ProxyInjector = exports.SimpleInjector = exports.MetadataInjector = exports.Injector = exports.argsFn = exports.args = exports.resolveArgs = exports.inject = exports.EmptyContainer = exports.Container = exports.isDependencyKey = void 0;
-exports.resolveConstructor = exports.Is = exports.pipe = exports.select = exports.once = exports.shallowCache = exports.debounce = exports.throttle = exports.handleAsyncError = exports.handleError = exports.getMethodTags = exports.methodTag = exports.getMethodLabels = exports.methodLabel = exports.getMethodMeta = exports.methodMeta = exports.getParamTags = exports.paramTag = exports.getParamLabels = exports.paramLabel = exports.getParamMeta = exports.paramMeta = exports.getClassTags = exports.classTag = exports.getClassLabels = exports.classLabel = exports.getClassMeta = exports.classMeta = exports.GroupInstanceToken = exports.ConstantToken = exports.FunctionToken = void 0;
+exports.FunctionToken = exports.SingleToken = exports.ClassToken = exports.toSingleAlias = exports.SingleAliasToken = exports.toGroupAlias = exports.GroupAliasToken = exports.InjectionToken = exports.HooksRunner = exports.AddOnDisposeHookModule = exports.onDispose = exports.onDisposeHooksRunner = exports.AddOnConstructHookModule = exports.onConstruct = exports.onConstructHooksRunner = exports.injectProp = exports.createHookContext = exports.createHookContextFactory = exports.HookContext = exports.hasHooks = exports.hook = exports.getHooks = exports.CannonSingletonApplyError = exports.UnexpectedHookResultError = exports.ContainerDisposedError = exports.MethodNotImplementedError = exports.DependencyMissingKeyError = exports.DependencyNotFoundError = exports.Registration = exports.appendArgsFn = exports.appendArgs = exports.decorate = exports.singleton = exports.lazy = exports.scopeAccess = exports.scope = exports.bindTo = exports.register = exports.Provider = exports.ProxyInjector = exports.SimpleInjector = exports.resolveArgs = exports.argsFn = exports.args = exports.inject = exports.MetadataInjector = exports.Injector = exports.EmptyContainer = exports.Container = exports.isDependencyKey = void 0;
+exports.resolveConstructor = exports.Is = exports.pipe = exports.select = exports.once = exports.shallowCache = exports.debounce = exports.throttle = exports.handleAsyncError = exports.handleError = exports.getMethodTags = exports.methodTag = exports.getMethodLabels = exports.methodLabel = exports.getMethodMeta = exports.methodMeta = exports.getParamTags = exports.paramTag = exports.getParamLabels = exports.paramLabel = exports.getParamMeta = exports.paramMeta = exports.getClassTags = exports.classTag = exports.getClassLabels = exports.classLabel = exports.getClassMeta = exports.classMeta = exports.GroupInstanceToken = exports.ConstantToken = void 0;
 // Containers
 var IContainer_1 = require("./container/IContainer");
 Object.defineProperty(exports, "isDependencyKey", { enumerable: true, get: function () { return IContainer_1.isDependencyKey; } });
@@ -10,38 +10,31 @@ Object.defineProperty(exports, "Container", { enumerable: true, get: function ()
 var EmptyContainer_1 = require("./container/EmptyContainer");
 Object.defineProperty(exports, "EmptyContainer", { enumerable: true, get: function () { return EmptyContainer_1.EmptyContainer; } });
 // Injectors
-var inject_1 = require("./injector/inject");
-Object.defineProperty(exports, "inject", { enumerable: true, get: function () { return inject_1.inject; } });
-Object.defineProperty(exports, "resolveArgs", { enumerable: true, get: function () { return inject_1.resolveArgs; } });
-Object.defineProperty(exports, "args", { enumerable: true, get: function () { return inject_1.args; } });
-Object.defineProperty(exports, "argsFn", { enumerable: true, get: function () { return inject_1.argsFn; } });
 var IInjector_1 = require("./injector/IInjector");
 Object.defineProperty(exports, "Injector", { enumerable: true, get: function () { return IInjector_1.Injector; } });
 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; } });
+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, "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; } });
 var ProxyInjector_1 = require("./injector/ProxyInjector");
 Object.defineProperty(exports, "ProxyInjector", { enumerable: true, get: function () { return ProxyInjector_1.ProxyInjector; } });
-// Providers
-var IProvider_1 = require("./provider/IProvider");
-Object.defineProperty(exports, "scopeAccess", { enumerable: true, get: function () { return IProvider_1.scopeAccess; } });
-Object.defineProperty(exports, "lazy", { enumerable: true, get: function () { return IProvider_1.lazy; } });
-Object.defineProperty(exports, "appendArgs", { enumerable: true, get: function () { return IProvider_1.appendArgs; } });
-Object.defineProperty(exports, "appendArgsFn", { enumerable: true, get: function () { return IProvider_1.appendArgsFn; } });
-Object.defineProperty(exports, "ProviderDecorator", { enumerable: true, get: function () { return IProvider_1.ProviderDecorator; } });
 var Provider_1 = require("./provider/Provider");
 Object.defineProperty(exports, "Provider", { enumerable: true, get: function () { return Provider_1.Provider; } });
-var SingletonProvider_1 = require("./provider/SingletonProvider");
-Object.defineProperty(exports, "singleton", { enumerable: true, get: function () { return SingletonProvider_1.singleton; } });
-Object.defineProperty(exports, "SingletonProvider", { enumerable: true, get: function () { return SingletonProvider_1.SingletonProvider; } });
-var DecoratorProvider_1 = require("./provider/DecoratorProvider");
-Object.defineProperty(exports, "decorate", { enumerable: true, get: function () { return DecoratorProvider_1.decorate; } });
 // Registrations
 var IRegistration_1 = require("./registration/IRegistration");
-Object.defineProperty(exports, "scope", { enumerable: true, get: function () { return IRegistration_1.scope; } });
 Object.defineProperty(exports, "register", { enumerable: true, get: function () { return IRegistration_1.register; } });
 Object.defineProperty(exports, "bindTo", { enumerable: true, get: function () { return IRegistration_1.bindTo; } });
+Object.defineProperty(exports, "scope", { enumerable: true, get: function () { return IRegistration_1.scope; } });
+Object.defineProperty(exports, "scopeAccess", { enumerable: true, get: function () { return IRegistration_1.scopeAccess; } });
+Object.defineProperty(exports, "lazy", { enumerable: true, get: function () { return IRegistration_1.lazy; } });
+Object.defineProperty(exports, "singleton", { enumerable: true, get: function () { return IRegistration_1.singleton; } });
+Object.defineProperty(exports, "decorate", { enumerable: true, get: function () { return IRegistration_1.decorate; } });
+Object.defineProperty(exports, "appendArgs", { enumerable: true, get: function () { return IRegistration_1.appendArgs; } });
+Object.defineProperty(exports, "appendArgsFn", { enumerable: true, get: function () { return IRegistration_1.appendArgsFn; } });
 var Registration_1 = require("./registration/Registration");
 Object.defineProperty(exports, "Registration", { enumerable: true, get: function () { return Registration_1.Registration; } });
 // Errors
@@ -55,6 +48,8 @@ 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; } });
+var CannonSingletonApplyError_1 = require("./errors/CannonSingletonApplyError");
+Object.defineProperty(exports, "CannonSingletonApplyError", { enumerable: true, get: function () { return CannonSingletonApplyError_1.CannonSingletonApplyError; } });
 // Hooks
 var hook_1 = require("./hooks/hook");
 Object.defineProperty(exports, "getHooks", { enumerable: true, get: function () { return hook_1.getHooks; } });

package/cjm/injector/MetadataInjector.js

@@ -1,12 +1,30 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.MetadataInjector = void 0;
+exports.resolveArgs = exports.argsFn = exports.args = exports.inject = exports.MetadataInjector = void 0;
 const IInjector_1 = require("./IInjector");
-const inject_1 = require("./inject");
+const basic_1 = require("../utils/basic");
+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, inject_1.resolveArgs)(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}`;
+const inject = (fn) => (target, propertyKey, parameterIndex) => {
+    (0, parameter_1.paramMeta)(hookMetaKey(propertyKey), () => (0, toToken_1.toToken)(fn))(basic_1.Is.instance(target) ? target.constructor : target, propertyKey, parameterIndex);
+};
+exports.inject = inject;
+const args = (index) => (c, { args = [] }) => {
+    return args[index];
+};
+exports.args = args;
+const argsFn = (fn) => (c, options) => fn(...(options.args ?? []));
+exports.argsFn = argsFn;
+const resolveArgs = (Target, methodName) => {
+    const tokens = (0, parameter_1.getParamMeta)(hookMetaKey(methodName), Target);
+    return (scope, { args = [], lazy }) => tokens.map((fn) => fn.resolve(scope, { args: args.map(toToken_1.argToToken).map((t) => t.resolve(scope)), lazy }));
+};
+exports.resolveArgs = resolveArgs;

package/cjm/provider/IProvider.js

@@ -1,51 +1,2 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ProviderDecorator = exports.lazy = exports.scopeAccess = exports.appendArgsFn = exports.appendArgs = void 0;
-const ProviderPipe_1 = require("./ProviderPipe");
-const appendArgs = (...extraArgs) => (0, ProviderPipe_1.registerPipe)((p) => p.addArgs(...extraArgs));
-exports.appendArgs = appendArgs;
-const appendArgsFn = (fn) => (0, ProviderPipe_1.registerPipe)((p) => p.addArgsFn(fn));
-exports.appendArgsFn = appendArgsFn;
-const scopeAccess = (rule) => (0, ProviderPipe_1.registerPipe)((p) => p.addAccessRule(rule));
-exports.scopeAccess = scopeAccess;
-const lazy = () => (0, ProviderPipe_1.registerPipe)((p) => p.lazy());
-exports.lazy = lazy;
-class ProviderDecorator {
-    decorated;
-    constructor(decorated) {
-        this.decorated = decorated;
-    }
-    addAccessRule(rule) {
-        this.decorated.addAccessRule(rule);
-        return this;
-    }
-    hasAccess(options) {
-        return this.decorated.hasAccess(options);
-    }
-    resolve(container, options) {
-        return this.decorated.resolve(container, options);
-    }
-    pipe(...mappers) {
-        const fns = mappers.map((m) => {
-            if ((0, ProviderPipe_1.isProviderPipe)(m)) {
-                return m.mapProvider.bind(m);
-            }
-            return m;
-        });
-        this.decorated = this.decorated.pipe(...fns);
-        return this;
-    }
-    addArgs(...extraArgs) {
-        this.decorated.addArgs(...extraArgs);
-        return this;
-    }
-    addArgsFn(argsFn) {
-        this.decorated.addArgsFn(argsFn);
-        return this;
-    }
-    lazy() {
-        this.decorated.lazy();
-        return this;
-    }
-}
-exports.ProviderDecorator = ProviderDecorator;

package/cjm/provider/Provider.js

@@ -1,8 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Provider = void 0;
-const fp_1 = require("../utils/fp");
-const ProviderPipe_1 = require("./ProviderPipe");
+const CannonSingletonApplyError_1 = require("../errors/CannonSingletonApplyError");
 class Provider {
     resolveDependency;
     static fromClass(Target) {
@@ -14,42 +13,57 @@ class Provider {
     static fromKey(key) {
         return new Provider((c) => c.resolve(key));
     }
-    argsFn = (s, { args = [] } = {}) => args;
+    argsFnList = [];
     accessRules = [];
+    mappers = [];
     isLazy = false;
+    cache = new Map();
+    getKey;
     constructor(resolveDependency) {
         this.resolveDependency = resolveDependency;
     }
-    pipe(...mappers) {
-        const fns = mappers.map((m) => ((0, ProviderPipe_1.isProviderPipe)(m) ? m.mapProvider.bind(m) : m));
-        return (0, fp_1.pipe)(...fns)(this);
+    resolve(scope, options) {
+        if (!this.getKey) {
+            return this.resolveDep(scope, options);
+        }
+        const key = this.getKey(...(options.args ?? []));
+        if (!this.cache.has(key)) {
+            this.cache.set(key, this.resolveDep(scope, options));
+        }
+        return this.cache.get(key);
     }
-    resolve(container, { args = [], lazy } = {}) {
-        return this.resolveDependency(container, {
-            args: this.argsFn(container, { args }),
+    resolveDep(scope, { args = [], lazy } = {}) {
+        const dependency = this.resolveDependency(scope, {
+            args: this.argsFnList.reduce((acc, current) => current(scope, { args: acc }), args),
             lazy: lazy ?? this.isLazy,
         });
+        return this.mappers.reduce((acc, current) => current(acc, scope), dependency);
     }
-    addAccessRule(rule) {
-        this.accessRules.push(rule);
+    map(...mappers) {
+        this.mappers.push(...mappers);
         return this;
     }
-    lazy() {
-        this.isLazy = true;
+    addAccessRule(...rules) {
+        this.accessRules.push(...rules);
         return this;
     }
-    addArgs(...extraArgs) {
-        const parentFn = this.argsFn;
-        this.argsFn = (container, options) => [...parentFn(container, options), ...extraArgs];
+    lazy() {
+        this.isLazy = true;
         return this;
     }
-    addArgsFn(argsFn) {
-        const parentFn = this.argsFn;
-        this.argsFn = (container, options) => [...parentFn(container, options), ...argsFn(container, options)];
+    addArgsFn(...fns) {
+        this.argsFnList.push(...fns);
         return this;
     }
     hasAccess(options) {
-        return this.accessRules.reduce((acc, rule) => rule(acc, options), true);
+        return this.accessRules.reduce((acc, rule) => rule(options, acc), true);
+    }
+    singleton(getCacheKey = () => '1') {
+        if (this.getKey) {
+            throw new CannonSingletonApplyError_1.CannonSingletonApplyError('Provider is already singleton');
+        }
+        this.getKey = getCacheKey;
+        return this;
     }
 }
 exports.Provider = Provider;

package/cjm/registration/IRegistration.js

@@ -1,17 +1,21 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.bindTo = exports.register = exports.getTransformers = exports.scope = void 0;
-const ProviderPipe_1 = require("../provider/ProviderPipe");
+exports.singleton = exports.decorate = exports.lazy = exports.scopeAccess = exports.appendArgsFn = exports.appendArgs = exports.scope = exports.bindTo = exports.register = exports.getTransformers = exports.registerPipe = exports.isProviderPipe = void 0;
 const SingleToken_1 = require("../token/SingleToken");
 const BindToken_1 = require("../token/BindToken");
 const class_1 = require("../metadata/class");
-const scope = (...rules) => (r) => r.when(...rules);
-exports.scope = scope;
+const isProviderPipe = (obj) => obj !== null && typeof obj === 'object' && 'mapProvider' in obj;
+exports.isProviderPipe = isProviderPipe;
+const registerPipe = (mapProvider) => ({
+    mapProvider,
+    mapRegistration: (r) => r.pipe(mapProvider),
+});
+exports.registerPipe = registerPipe;
 const METADATA_KEY = 'registration';
 const getTransformers = (Target) => (0, class_1.getClassMeta)(Target, METADATA_KEY) ?? [];
 exports.getTransformers = getTransformers;
 const register = (...mappers) => (0, class_1.classMeta)(METADATA_KEY, (acc) => {
-    const result = mappers.map((m) => (0, ProviderPipe_1.isProviderPipe)(m) ? (r) => m.mapRegistration(r) : m);
+    const result = mappers.map((m) => (0, exports.isProviderPipe)(m) ? (r) => m.mapRegistration(r) : m);
     return acc ? [...result, ...acc] : result;
 });
 exports.register = register;
@@ -23,3 +27,17 @@ const bindTo = (...tokens) => (r) => {
     return 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]));
+exports.appendArgs = appendArgs;
+const appendArgsFn = (fn) => (0, exports.registerPipe)((p) => p.addArgsFn((scope, options) => [...(options?.args ?? []), ...fn(scope, options)]));
+exports.appendArgsFn = appendArgsFn;
+const scopeAccess = (rule) => (0, exports.registerPipe)((p) => p.addAccessRule(rule));
+exports.scopeAccess = scopeAccess;
+const lazy = () => (0, exports.registerPipe)((p) => p.lazy());
+exports.lazy = lazy;
+const decorate = (...fns) => (0, exports.registerPipe)((p) => p.map(...fns));
+exports.decorate = decorate;
+const singleton = (getCacheKey) => (0, exports.registerPipe)((p) => p.singleton(getCacheKey));
+exports.singleton = singleton;

package/cjm/registration/Registration.js

@@ -5,7 +5,7 @@ const IContainer_1 = require("../container/IContainer");
 const Provider_1 = require("../provider/Provider");
 const DependencyMissingKeyError_1 = require("../errors/DependencyMissingKeyError");
 const IRegistration_1 = require("./IRegistration");
-const ProviderPipe_1 = require("../provider/ProviderPipe");
+const IRegistration_2 = require("./IRegistration");
 const SingleToken_1 = require("../token/SingleToken");
 const fp_1 = require("../utils/fp");
 const basic_1 = require("../utils/basic");
@@ -14,12 +14,12 @@ class Registration {
     key;
     scopeRules;
     static fromClass(Target, { name } = {}) {
-        const transform = (0, fp_1.pipe)(...(0, IRegistration_1.getTransformers)(Target));
+        const transform = (0, fp_1.pipe)(...(0, IRegistration_2.getTransformers)(Target));
         return transform(new Registration(() => Provider_1.Provider.fromClass(Target), name ?? Target.name));
     }
     static fromValue(value) {
         if (basic_1.Is.constructor(value)) {
-            const transform = (0, fp_1.pipe)(...(0, IRegistration_1.getTransformers)(value));
+            const transform = (0, fp_1.pipe)(...(0, IRegistration_2.getTransformers)(value));
             return transform(new Registration(() => Provider_1.Provider.fromValue(value), value.name));
         }
         return new Registration(() => Provider_1.Provider.fromValue(value));
@@ -46,7 +46,7 @@ class Registration {
         return this;
     }
     pipe(...mappers) {
-        const fns = mappers.map((m) => ((0, ProviderPipe_1.isProviderPipe)(m) ? m.mapProvider.bind(m) : m));
+        const fns = mappers.map((m) => ((0, IRegistration_1.isProviderPipe)(m) ? m.mapProvider.bind(m) : m));
         this.mappers.push(...fns);
         return this;
     }
@@ -63,11 +63,7 @@ class Registration {
         return this;
     }
     matchScope(container) {
-        if (this.scopeRules.length === 0) {
-            return true;
-        }
-        const [first, ...rest] = this.scopeRules;
-        return rest.reduce((prev, curr) => curr(container, prev), first(container));
+        return this.scopeRules.reduce((prev, curr) => curr(container, prev), true);
     }
     applyTo(container) {
         if (!this.matchScope(container)) {
@@ -76,8 +72,8 @@ class Registration {
         if (!this.key) {
             throw new DependencyMissingKeyError_1.DependencyMissingKeyError('No key provided for registration');
         }
-        const provider = this.createProvider();
-        container.register(this.key, provider.pipe(...this.mappers), { aliases: [...this.aliases] });
+        const provider = this.mappers.reduce((p, m) => m(p), this.createProvider());
+        container.register(this.key, provider, { aliases: [...this.aliases] });
     }
     getKeyOrFail() {
         if (!this.key) {

package/esm/container/Container.js

@@ -28,23 +28,23 @@ 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 });
         }
         const provider = this.providers.get(target);
-        return provider?.hasAccess({ invocationScope: child, providerScope: this })
+        return provider?.hasAccess({ invocationScope: child, providerScope: this, args })
             ? 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 = [];
         for (const key of this.aliases.getKeysByAlias(alias).filter(F.exclude(excludedKeys))) {
             const provider = this.findProviderByKeyOrFail(key);
-            if (!provider.hasAccess({ invocationScope: child, providerScope: this })) {
+            if (!provider.hasAccess({ invocationScope: child, providerScope: this, args })) {
                 continue;
             }
             keys.push(key);
@@ -58,11 +58,11 @@ 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;
-        return provider?.hasAccess({ invocationScope: child, providerScope: this })
+        return provider?.hasAccess({ invocationScope: child, providerScope: this, args })
             ? provider.resolve(this, { args, lazy })
             : this.parent.resolveOneByAlias(alias, { args, child, lazy });
     }