ts-ioc-container 50.1.0 → 50.2.0

package/README.md

@@ -56,7 +56,7 @@ no global container objects.
   - [Proxy](#proxy)
 - [Provider](#provider) `provider`
   - [Singleton](#singleton) `singleton`
-  - [Arguments](#arguments) `setArgs` `setArgsFn`
+  - [Arguments](#arguments) `appendArgs` `appendArgsFn`
   - [Visibility](#visibility) `visible`
   - [Alias](#alias) `asAlias`
   - [Decorator](#decorator) `decorate`
@@ -140,7 +140,7 @@ container.resolve(App).start();
 > For classes, prefer the `@register(bindTo('Key'))` decorator over the fluent
 > `R.fromClass(Class).bindToKey('Key')` chain. The decorator co-locates the binding
 > with the class and reads consistently with other registration pipes
-> (`scope`, `singleton`, `setArgsFn`, ...). Use the fluent `bindToKey` chain only
+> (`scope`, `singleton`, `appendArgsFn`, ...). Use the fluent `bindToKey` chain only
 > for `R.fromValue(...)` and `R.fromFn(...)` (which have no class to decorate)
 > or for third-party classes you don't own.
 
@@ -1442,7 +1442,7 @@ describe('lazy registerPipe', () => {
       const container = new Container().addRegistration(
         R.fromClass(ConfigService)
           .pipe(
-            (p) => p.setArgs(() => ['https://api.example.com', 5000]),
+            (p) => p.appendArgs('https://api.example.com', 5000),
             (p) => p.lazy(),
           )
           .pipe(singleton()),
@@ -1740,8 +1740,8 @@ Provider is dependency factory which creates dependency.
 ```typescript
 import {
   args,
-  setArgs,
-  setArgsFn,
+  appendArgs,
+  appendArgsFn,
   bindTo,
   Container,
   inject,
@@ -1823,7 +1823,7 @@ describe('Provider', () => {
 
     const container = new Container().register(
       'FileService',
-      Provider.fromClass(FileService).pipe(setArgs('/var/data')),
+      Provider.fromClass(FileService).pipe(appendArgs('/var/data')),
     );
 
     const service = container.resolve<FileService>('FileService');
@@ -1839,7 +1839,7 @@ describe('Provider', () => {
       'Database',
       Provider.fromClass(Database).pipe(
         // Dynamically resolve connection string at creation time
-        setArgsFn((scope) => [`postgres://${scope.resolve('DbPath')}`]),
+        appendArgsFn((scope) => [`postgres://${scope.resolve('DbPath')}`]),
       ),
     );
 
@@ -1982,9 +1982,9 @@ describe('Singleton', function () {
 
 Sometimes you want to bind some arguments to provider.
 
-- `provider(setArgs('someArgument'))`
-- `provider(setArgsFn((container) => [container.resolve(Logger), 'someValue']))`
-- `Provider.fromClass(Logger).pipe(setArgs('someArgument'))`
+- `provider(appendArgs('someArgument'))`
+- `provider(appendArgsFn((container) => [container.resolve(Logger), 'someValue']))`
+- `Provider.fromClass(Logger).pipe(appendArgs('someArgument'))`
 
 ### Token as argument
 
@@ -2016,16 +2016,14 @@ const userToken = ApiToken.args('https://users.api.com', 1000);
 
 ```typescript
 import {
-  addArgs,
-  addArgsFn,
   args,
+  appendArgs,
+  appendArgsFn,
   bindTo,
   Container,
   inject,
   register,
   Registration as R,
-  setArgs,
-  setArgsFn,
   SingleToken,
   singleton,
 } from 'ts-ioc-container';
@@ -2048,7 +2046,7 @@ describe('IProvider', function () {
   describe('Static Arguments', () => {
     it('can pass static arguments to constructor', function () {
       // Pre-configure the logger with a filename
-      @register(setArgs('/var/log/app.log'))
+      @register(appendArgs('/var/log/app.log'))
       class FileLogger {
         constructor(@inject(args(0)) public filename: string) {}
       }
@@ -2060,19 +2058,21 @@ describe('IProvider', function () {
       expect(logger.filename).toBe('/var/log/app.log');
     });
 
-    it('prioritizes provided args over resolve args', function () {
-      // 'FixedContext' wins over any runtime args
-      @register(setArgs('FixedContext'))
+    it('appends configured args after resolve args', function () {
+      @register(appendArgs('ConfiguredContext'))
       class Logger {
-        constructor(@inject(args(0)) public context: string) {}
+        constructor(
+          @inject(args(0)) public runtimeContext: string,
+          @inject(args(1)) public configuredContext: string,
+        ) {}
       }
 
       const root = createContainer().addRegistration(R.fromClass(Logger));
 
-      // Even if we ask for 'RuntimeContext', we get 'FixedContext'
       const logger = root.resolve<Logger>('Logger', { args: ['RuntimeContext'] });
 
-      expect(logger.context).toBe('FixedContext');
+      expect(logger.runtimeContext).toBe('RuntimeContext');
+      expect(logger.configuredContext).toBe('ConfiguredContext');
     });
   });
 
@@ -2083,7 +2083,7 @@ describe('IProvider', function () {
       }
 
       // Extract 'env' from Config service dynamically
-      @register(setArgsFn((scope) => [scope.resolve<Config>('Config').env]))
+      @register(appendArgsFn((scope) => [scope.resolve<Config>('Config').env]))
       class Service {
         constructor(@inject(args(0)) public env: string) {}
       }
@@ -2099,7 +2099,7 @@ describe('IProvider', function () {
 
   describe('Appending Arguments', () => {
     it('can append static arguments after existing resolve arguments', function () {
-      @register(addArgs('configured'))
+      @register(appendArgs('configured'))
       class Service {
         constructor(
           @inject(args(0)) public runtime: string,
@@ -2114,29 +2114,26 @@ describe('IProvider', function () {
       expect(service.configured).toBe('configured');
     });
 
-    it('can append dynamic arguments after an existing argsFn', function () {
+    it('can append dynamic arguments after runtime args', function () {
       class Config {
         tenant = 'tenant-a';
       }
 
-      @register(
-        setArgs('fixed'),
-        addArgsFn((scope, { args = [] } = {}) => [scope.resolve<Config>('Config').tenant, ...args]),
-      )
+      @register(appendArgs('fixed'), appendArgsFn((scope) => [scope.resolve<Config>('Config').tenant]))
       class Service {
         constructor(
-          @inject(args(0)) public fixed: string,
-          @inject(args(1)) public tenant: string,
-          @inject(args(2)) public runtime: string,
+          @inject(args(0)) public runtime: string,
+          @inject(args(1)) public fixed: string,
+          @inject(args(2)) public tenant: string,
         ) {}
       }
 
       const root = createContainer().addRegistration(R.fromClass(Config)).addRegistration(R.fromClass(Service));
 
       const service = root.resolve<Service>('Service', { args: ['runtime'] });
+      expect(service.runtime).toBe('runtime');
       expect(service.fixed).toBe('fixed');
       expect(service.tenant).toBe('tenant-a');
-      expect(service.runtime).toBe('runtime');
     });
   });
 

package/cjm/index.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-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.setArgs = exports.setArgsFn = exports.addArgsFn = exports.addArgs = 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 = exports.SingleToken = exports.ClassToken = void 0;
+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;
 // Containers
 var IContainer_1 = require("./container/IContainer");
 Object.defineProperty(exports, "isDependencyKey", { enumerable: true, get: function () { return IContainer_1.isDependencyKey; } });
@@ -27,10 +27,8 @@ Object.defineProperty(exports, "ProxyInjector", { enumerable: true, get: functio
 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, "addArgs", { enumerable: true, get: function () { return IProvider_1.addArgs; } });
-Object.defineProperty(exports, "addArgsFn", { enumerable: true, get: function () { return IProvider_1.addArgsFn; } });
-Object.defineProperty(exports, "setArgsFn", { enumerable: true, get: function () { return IProvider_1.setArgsFn; } });
-Object.defineProperty(exports, "setArgs", { enumerable: true, get: function () { return IProvider_1.setArgs; } });
+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; } });

package/cjm/provider/IProvider.js

@@ -1,15 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ProviderDecorator = exports.lazy = exports.scopeAccess = exports.addArgsFn = exports.addArgs = exports.setArgsFn = exports.setArgs = void 0;
+exports.ProviderDecorator = exports.lazy = exports.scopeAccess = exports.appendArgsFn = exports.appendArgs = void 0;
 const ProviderPipe_1 = require("./ProviderPipe");
-const setArgs = (...extraArgs) => (0, ProviderPipe_1.registerPipe)((p) => p.setArgs(() => extraArgs));
-exports.setArgs = setArgs;
-const setArgsFn = (fn) => (0, ProviderPipe_1.registerPipe)((p) => p.setArgs(fn));
-exports.setArgsFn = setArgsFn;
-const addArgs = (...extraArgs) => (0, ProviderPipe_1.registerPipe)((p) => p.addArgs(...extraArgs));
-exports.addArgs = addArgs;
-const addArgsFn = (fn) => (0, ProviderPipe_1.registerPipe)((p) => p.addArgsFn(fn));
-exports.addArgsFn = addArgsFn;
+const appendArgs = (...extraArgs) => (0, ProviderPipe_1.registerPipe)((p) => p.appendArgs(...extraArgs));
+exports.appendArgs = appendArgs;
+const appendArgsFn = (fn) => (0, ProviderPipe_1.registerPipe)((p) => p.appendArgsFn(fn));
+exports.appendArgsFn = appendArgsFn;
 const scopeAccess = (rule) => (0, ProviderPipe_1.registerPipe)((p) => p.setAccessRule(rule));
 exports.scopeAccess = scopeAccess;
 const lazy = () => (0, ProviderPipe_1.registerPipe)((p) => p.lazy());
@@ -39,16 +35,12 @@ class ProviderDecorator {
         this.decorated = this.decorated.pipe(...fns);
         return this;
     }
-    setArgs(argsFn) {
-        this.decorated.setArgs(argsFn);
+    appendArgs(...extraArgs) {
+        this.decorated.appendArgs(...extraArgs);
         return this;
     }
-    addArgs(...extraArgs) {
-        this.decorated.addArgs(...extraArgs);
-        return this;
-    }
-    addArgsFn(argsFn) {
-        this.decorated.addArgsFn(argsFn);
+    appendArgsFn(argsFn) {
+        this.decorated.appendArgsFn(argsFn);
         return this;
     }
     lazy() {

package/cjm/provider/Provider.js

@@ -38,16 +38,12 @@ class Provider {
         this.isLazy = true;
         return this;
     }
-    setArgs(argsFn) {
-        this.argsFn = argsFn;
-        return this;
-    }
-    addArgs(...extraArgs) {
+    appendArgs(...extraArgs) {
         const parentFn = this.argsFn;
         this.argsFn = (container, options) => [...parentFn(container, options), ...extraArgs];
         return this;
     }
-    addArgsFn(argsFn) {
+    appendArgsFn(argsFn) {
         const parentFn = this.argsFn;
         this.argsFn = (container, options) => [...parentFn(container, options), ...argsFn(container, options)];
         return this;

package/cjm/token/InjectionToken.js

@@ -1,13 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.setArgs = exports.InjectionToken = void 0;
+exports.InjectionToken = void 0;
 exports.isInjectionToken = isInjectionToken;
 const basic_1 = require("../utils/basic");
 class InjectionToken {
 }
 exports.InjectionToken = InjectionToken;
-const setArgs = (...args) => (s) => args;
-exports.setArgs = setArgs;
 function isInjectionToken(target) {
     return basic_1.Is.object(target) && 'resolve' in target && 'args' in target && 'argsFn' in target && 'lazy' in target;
 }

package/esm/index.js

@@ -9,7 +9,7 @@ export { MetadataInjector } from './injector/MetadataInjector';
 export { SimpleInjector } from './injector/SimpleInjector';
 export { ProxyInjector } from './injector/ProxyInjector';
 // Providers
-export { scopeAccess, lazy, addArgs, addArgsFn, setArgsFn, setArgs, ProviderDecorator, } from './provider/IProvider';
+export { scopeAccess, lazy, appendArgs, appendArgsFn, ProviderDecorator, } from './provider/IProvider';
 export { Provider } from './provider/Provider';
 export { singleton, SingletonProvider } from './provider/SingletonProvider';
 export { decorate } from './provider/DecoratorProvider';

package/esm/provider/IProvider.js

@@ -1,8 +1,6 @@
 import { isProviderPipe, registerPipe } from './ProviderPipe';
-export const setArgs = (...extraArgs) => registerPipe((p) => p.setArgs(() => extraArgs));
-export const setArgsFn = (fn) => registerPipe((p) => p.setArgs(fn));
-export const addArgs = (...extraArgs) => registerPipe((p) => p.addArgs(...extraArgs));
-export const addArgsFn = (fn) => registerPipe((p) => p.addArgsFn(fn));
+export const appendArgs = (...extraArgs) => registerPipe((p) => p.appendArgs(...extraArgs));
+export const appendArgsFn = (fn) => registerPipe((p) => p.appendArgsFn(fn));
 export const scopeAccess = (rule) => registerPipe((p) => p.setAccessRule(rule));
 export const lazy = () => registerPipe((p) => p.lazy());
 export class ProviderDecorator {
@@ -30,16 +28,12 @@ export class ProviderDecorator {
         this.decorated = this.decorated.pipe(...fns);
         return this;
     }
-    setArgs(argsFn) {
-        this.decorated.setArgs(argsFn);
+    appendArgs(...extraArgs) {
+        this.decorated.appendArgs(...extraArgs);
         return this;
     }
-    addArgs(...extraArgs) {
-        this.decorated.addArgs(...extraArgs);
-        return this;
-    }
-    addArgsFn(argsFn) {
-        this.decorated.addArgsFn(argsFn);
+    appendArgsFn(argsFn) {
+        this.decorated.appendArgsFn(argsFn);
         return this;
     }
     lazy() {

package/esm/provider/Provider.js

@@ -35,16 +35,12 @@ export class Provider {
         this.isLazy = true;
         return this;
     }
-    setArgs(argsFn) {
-        this.argsFn = argsFn;
-        return this;
-    }
-    addArgs(...extraArgs) {
+    appendArgs(...extraArgs) {
         const parentFn = this.argsFn;
         this.argsFn = (container, options) => [...parentFn(container, options), ...extraArgs];
         return this;
     }
-    addArgsFn(argsFn) {
+    appendArgsFn(argsFn) {
         const parentFn = this.argsFn;
         this.argsFn = (container, options) => [...parentFn(container, options), ...argsFn(container, options)];
         return this;

package/esm/token/InjectionToken.js

@@ -1,7 +1,6 @@
 import { Is } from '../utils/basic';
 export class InjectionToken {
 }
-export const setArgs = (...args) => (s) => args;
 export function isInjectionToken(target) {
     return Is.object(target) && 'resolve' in target && 'args' in target && 'argsFn' in target && 'lazy' in target;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ts-ioc-container",
-  "version": "50.1.0",
+  "version": "50.2.0",
   "description": "Fast, lightweight TypeScript dependency injection container with a clean API, scoped lifecycles, decorators, tokens, hooks, lazy injection, customizable providers, and no global container objects.",
   "workspaces": [
     "docs"

package/typings/index.d.ts

@@ -6,7 +6,7 @@ export { type IInjector, type InjectOptions, type IInjectFnResolver, Injector }
 export { MetadataInjector } from './injector/MetadataInjector';
 export { SimpleInjector } from './injector/SimpleInjector';
 export { ProxyInjector } from './injector/ProxyInjector';
-export { type ResolveDependency, type IProvider, scopeAccess, lazy, addArgs, addArgsFn, setArgsFn, setArgs, type ArgsFn, ProviderDecorator, type IMapper, type ProviderOptions, } from './provider/IProvider';
+export { type ResolveDependency, type IProvider, scopeAccess, lazy, appendArgs, appendArgsFn, type ArgsFn, ProviderDecorator, type IMapper, type ProviderOptions, } from './provider/IProvider';
 export { Provider } from './provider/Provider';
 export { singleton, SingletonProvider } from './provider/SingletonProvider';
 export { decorate, type DecorateFn } from './provider/DecoratorProvider';

package/typings/provider/IProvider.d.ts

@@ -21,15 +21,12 @@ export interface IProvider<T = any> {
     hasAccess(options: ScopeAccessOptions): boolean;
     pipe(...mappers: (MapFn<IProvider<T>> | ProviderPipe<T>)[]): IProvider<T>;
     setAccessRule(hasAccessWhen: ScopeAccessRule): this;
-    setArgs(argsFn: ArgsFn): this;
-    addArgs(...extraArgs: unknown[]): this;
-    addArgsFn(argsFn: ArgsFn): this;
+    appendArgs(...extraArgs: unknown[]): this;
+    appendArgsFn(argsFn: ArgsFn): this;
     lazy(): this;
 }
-export declare const setArgs: <T>(...extraArgs: unknown[]) => ProviderPipe<T>;
-export declare const setArgsFn: <T>(fn: ArgsFn) => ProviderPipe<T>;
-export declare const addArgs: <T>(...extraArgs: unknown[]) => ProviderPipe<T>;
-export declare const addArgsFn: <T>(fn: ArgsFn) => ProviderPipe<T>;
+export declare const appendArgs: <T>(...extraArgs: unknown[]) => ProviderPipe<T>;
+export declare const appendArgsFn: <T>(fn: ArgsFn) => ProviderPipe<T>;
 export declare const scopeAccess: <T>(rule: ScopeAccessRule) => ProviderPipe<T>;
 export declare const lazy: <T>() => ProviderPipe<T>;
 export declare abstract class ProviderDecorator<T> implements IProvider<T> {
@@ -39,8 +36,7 @@ export declare abstract class ProviderDecorator<T> implements IProvider<T> {
     hasAccess(options: ScopeAccessOptions): boolean;
     resolve(container: IContainer, options: ProviderOptions): T;
     pipe(...mappers: (MapFn<IProvider<T>> | ProviderPipe<T>)[]): IProvider<T>;
-    setArgs(argsFn: ArgsFn): this;
-    addArgs(...extraArgs: unknown[]): this;
-    addArgsFn(argsFn: ArgsFn): this;
+    appendArgs(...extraArgs: unknown[]): this;
+    appendArgsFn(argsFn: ArgsFn): this;
     lazy(): this;
 }

package/typings/provider/Provider.d.ts

@@ -16,8 +16,7 @@ export declare class Provider<T = any> implements IProvider<T> {
     resolve(container: IContainer, { args, lazy }?: ProviderOptions): T;
     setAccessRule(predicate: ScopeAccessRule): this;
     lazy(): this;
-    setArgs(argsFn: ArgsFn): this;
-    addArgs(...extraArgs: unknown[]): this;
-    addArgsFn(argsFn: ArgsFn): this;
+    appendArgs(...extraArgs: unknown[]): this;
+    appendArgsFn(argsFn: ArgsFn): this;
     hasAccess(options: ScopeAccessOptions): boolean;
 }

package/typings/token/InjectionToken.d.ts

@@ -1,10 +1,9 @@
 import { type IContainer } from '../container/IContainer';
-import { ArgsFn, ProviderOptions } from '../provider/IProvider';
+import { ProviderOptions } from '../provider/IProvider';
 export declare abstract class InjectionToken<T = any> {
     abstract resolve(s: IContainer, options?: ProviderOptions): T;
     abstract args(...deps: unknown[]): InjectionToken<T>;
     abstract argsFn(getArgsFn: (s: IContainer) => unknown[]): InjectionToken<T>;
     abstract lazy(): InjectionToken<T>;
 }
-export declare const setArgs: (...args: unknown[]) => ArgsFn;
 export declare function isInjectionToken(target: unknown): target is InjectionToken;