ts-ioc-container 44.0.3 → 44.0.4

package/README.md

@@ -261,7 +261,7 @@ describe('Disposing', function () {
 Sometimes you want to create dependency only when somebody want to invoke it's method or property. This is what `lazy` is for.
 
 ```typescript
-import { Container, inject, register, Registration as R, singleton, toToken } from 'ts-ioc-container';
+import { Container, inject, register, Registration as R, select as s, singleton } from 'ts-ioc-container';
 
 describe('lazy provider', () => {
   @register(singleton())
@@ -286,7 +286,7 @@ describe('lazy provider', () => {
   }
 
   class App {
-    constructor(@inject(toToken('Service').lazy()) public service: Service) {}
+    constructor(@inject(s.token('Service').lazy()) public service: Service) {}
 
     run() {
       return this.service.greet();
@@ -545,8 +545,8 @@ import {
   register,
   Registration as R,
   scopeAccess,
+  select as s,
   singleton,
-  toToken,
 } from 'ts-ioc-container';
 
 class Logger {}
@@ -763,7 +763,7 @@ describe('Provider', () => {
     }
 
     class Main {
-      constructor(@inject(toToken('ILogger').args({ channel: 'file' })) private logger: Logger) {}
+      constructor(@inject(s.token('ILogger').args({ channel: 'file' })) private logger: Logger) {}
 
       getChannel(): string {
         return this.logger.channel;
@@ -788,7 +788,7 @@ describe('Provider', () => {
 
     class Main {
       constructor(
-        @inject(toToken('ILogger').argsFn((s) => [{ channel: s.resolve('channel') }])) private logger: Logger,
+        @inject(s.token('ILogger').argsFn((s) => [{ channel: s.resolve('channel') }])) private logger: Logger,
       ) {}
 
       getChannel(): string {
@@ -1059,12 +1059,12 @@ import {
   register,
   Registration as R,
   scope,
-  toAlias,
+  select as s,
 } from 'ts-ioc-container';
 
 describe('alias', () => {
   const IMiddlewareKey = 'IMiddleware';
-  const middleware = register(bindTo(toAlias(IMiddlewareKey)));
+  const middleware = register(bindTo(s.alias(IMiddlewareKey)));
 
   interface IMiddleware {
     applyTo(application: IApplication): void;
@@ -1092,7 +1092,7 @@ describe('alias', () => {
   it('should resolve by some alias', () => {
     class App implements IApplication {
       private appliedMiddleware: Set<string> = new Set();
-      constructor(@inject(toAlias(IMiddlewareKey)) public middleware: IMiddleware[]) {}
+      constructor(@inject(s.alias(IMiddlewareKey)) public middleware: IMiddleware[]) {}
 
       markMiddlewareAsApplied(name: string): void {
         this.appliedMiddleware.add(name);
@@ -1125,7 +1125,7 @@ describe('alias', () => {
   });
 
   it('should resolve by some alias', () => {
-    @register(bindTo(toAlias('ILogger')))
+    @register(bindTo(s.alias('ILogger')))
     class FileLogger {}
 
     const container = new Container().addRegistration(R.fromClass(FileLogger));
@@ -1135,10 +1135,10 @@ describe('alias', () => {
   });
 
   it('should resolve by alias', () => {
-    @register(bindTo(toAlias('ILogger')), scope((s) => s.hasTag('root')))
+    @register(bindTo(s.alias('ILogger')), scope((s) => s.hasTag('root')))
     class FileLogger {}
 
-    @register(bindTo(toAlias('ILogger')), scope((s) => s.hasTag('child')))
+    @register(bindTo(s.alias('ILogger')), scope((s) => s.hasTag('child')))
     class DbLogger {}
 
     const container = new Container({ tags: ['root'] })
@@ -1169,8 +1169,8 @@ import {
   inject,
   register,
   Registration as R,
+  select as s,
   singleton,
-  toToken,
 } from 'ts-ioc-container';
 
 describe('lazy provider', () => {
@@ -1199,7 +1199,7 @@ describe('lazy provider', () => {
   class LogRepository implements IRepository {
     constructor(
       private repository: IRepository,
-      @inject(toToken('Logger').lazy()) private logger: Logger,
+      @inject(s.token('Logger').lazy()) private logger: Logger,
     ) {}
 
     async save(item: Todo): Promise<void> {
@@ -1268,8 +1268,8 @@ import {
   register,
   Registration as R,
   scope,
+  select as s,
   singleton,
-  toAlias,
 } from 'ts-ioc-container';
 
 describe('Registration module', function () {
@@ -1311,7 +1311,7 @@ describe('Registration module', function () {
   });
 
   it('should assign additional key which redirects to original one', function () {
-    @register(bindTo('ILogger'), bindTo(toAlias('Logger')), singleton())
+    @register(bindTo('ILogger'), bindTo(s.alias('Logger')), singleton())
     class Logger {}
 
     const root = createContainer().addRegistration(R.fromClass(Logger));

package/cjm/container/Container.js

@@ -30,15 +30,15 @@ class Container {
         this.aliases.setAliasesByKey(key, aliases);
         return this;
     }
-    resolve(key, { args = [], child = this, lazy } = {}) {
+    resolve(target, { args = [], child = this, lazy } = {}) {
         this.validateContainer();
-        if (utils_1.Is.constructor(key)) {
-            return this.injector.resolve(this, key, { args, lazy });
+        if (utils_1.Is.constructor(target)) {
+            return this.injector.resolve(this, target, { args, lazy });
         }
-        const provider = this.providers.get(key);
+        const provider = this.providers.get(target);
         return provider?.hasAccess({ invocationScope: child, providerScope: this })
             ? provider.resolve(this, { args, lazy })
-            : this.parent.resolve(key, { args, child, lazy });
+            : this.parent.resolve(target, { args, child, lazy });
     }
     resolveByAlias(alias, { args = [], child = this, lazy, excludedKeys = [] } = {}) {
         this.validateContainer();

package/cjm/index.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.toAliasUniq = exports.AliasUniqToken = exports.toAlias = exports.AliasToken = exports.InjectionToken = exports.getParameterMetadata = exports.getMethodMetadata = exports.setMethodMetadata = exports.setParameterMetadata = exports.getMetadata = exports.setMetadata = exports.HooksRunner = exports.onDispose = exports.onDisposeHooksRunner = exports.onConstruct = exports.onConstructHooksRunner = exports.injectProp = exports.HookContext = exports.hasHooks = exports.hook = exports.getHooks = exports.UnexpectedHookResultError = exports.ContainerDisposedError = exports.MethodNotImplementedError = exports.DependencyMissingKeyError = exports.DependencyNotFoundError = exports.Registration = exports.bindTo = exports.register = exports.scope = exports.decorate = exports.MultiCache = exports.multiCache = exports.SingletonProvider = exports.singleton = exports.Provider = exports.resolveByArgs = exports.ProviderDecorator = exports.args = exports.argsFn = exports.lazy = exports.scopeAccess = exports.ProxyInjector = exports.SimpleInjector = exports.MetadataInjector = exports.resolveArgs = exports.inject = exports.EmptyContainer = exports.Container = exports.isDependencyKey = void 0;
-exports.Is = exports.select = exports.toToken = exports.InstanceListToken = exports.ConstantToken = exports.FunctionToken = exports.IDToken = exports.ClassToken = void 0;
+exports.ClassToken = exports.toAliasUniq = exports.AliasUniqToken = exports.AliasToken = exports.InjectionToken = exports.getParameterMetadata = exports.getMethodMetadata = exports.setMethodMetadata = exports.setParameterMetadata = exports.getMetadata = exports.setMetadata = exports.HooksRunner = exports.onDispose = exports.onDisposeHooksRunner = exports.onConstruct = exports.onConstructHooksRunner = exports.injectProp = exports.HookContext = exports.hasHooks = exports.hook = exports.getHooks = exports.UnexpectedHookResultError = exports.ContainerDisposedError = exports.MethodNotImplementedError = exports.DependencyMissingKeyError = exports.DependencyNotFoundError = exports.Registration = exports.bindTo = exports.register = exports.scope = exports.decorate = exports.MultiCache = exports.multiCache = exports.SingletonProvider = exports.singleton = exports.Provider = exports.resolveByArgs = exports.ProviderDecorator = exports.args = exports.argsFn = exports.lazy = exports.scopeAccess = exports.ProxyInjector = exports.SimpleInjector = exports.MetadataInjector = exports.resolveArgs = exports.inject = exports.EmptyContainer = exports.Container = exports.isDependencyKey = void 0;
+exports.Is = exports.select = exports.InstanceListToken = exports.ConstantToken = exports.FunctionToken = exports.IDToken = void 0;
 // Containers
 var IContainer_1 = require("./container/IContainer");
 Object.defineProperty(exports, "isDependencyKey", { enumerable: true, get: function () { return IContainer_1.isDependencyKey; } });
@@ -86,7 +86,6 @@ var InjectionToken_1 = require("./token/InjectionToken");
 Object.defineProperty(exports, "InjectionToken", { enumerable: true, get: function () { return InjectionToken_1.InjectionToken; } });
 var AliasToken_1 = require("./token/AliasToken");
 Object.defineProperty(exports, "AliasToken", { enumerable: true, get: function () { return AliasToken_1.AliasToken; } });
-Object.defineProperty(exports, "toAlias", { enumerable: true, get: function () { return AliasToken_1.toAlias; } });
 var AliasUniqToken_1 = require("./token/AliasUniqToken");
 Object.defineProperty(exports, "AliasUniqToken", { enumerable: true, get: function () { return AliasUniqToken_1.AliasUniqToken; } });
 Object.defineProperty(exports, "toAliasUniq", { enumerable: true, get: function () { return AliasUniqToken_1.toAliasUniq; } });
@@ -100,8 +99,6 @@ var ConstantToken_1 = require("./token/ConstantToken");
 Object.defineProperty(exports, "ConstantToken", { enumerable: true, get: function () { return ConstantToken_1.ConstantToken; } });
 var InstanceListToken_1 = require("./token/InstanceListToken");
 Object.defineProperty(exports, "InstanceListToken", { enumerable: true, get: function () { return InstanceListToken_1.InstanceListToken; } });
-var toToken_1 = require("./token/toToken");
-Object.defineProperty(exports, "toToken", { enumerable: true, get: function () { return toToken_1.toToken; } });
 // Others
 var select_1 = require("./select");
 Object.defineProperty(exports, "select", { enumerable: true, get: function () { return select_1.select; } });

package/esm/container/Container.js

@@ -27,15 +27,15 @@ export class Container {
         this.aliases.setAliasesByKey(key, aliases);
         return this;
     }
-    resolve(key, { args = [], child = this, lazy } = {}) {
+    resolve(target, { args = [], child = this, lazy } = {}) {
         this.validateContainer();
-        if (Is.constructor(key)) {
-            return this.injector.resolve(this, key, { args, lazy });
+        if (Is.constructor(target)) {
+            return this.injector.resolve(this, target, { args, lazy });
         }
-        const provider = this.providers.get(key);
+        const provider = this.providers.get(target);
         return provider?.hasAccess({ invocationScope: child, providerScope: this })
             ? provider.resolve(this, { args, lazy })
-            : this.parent.resolve(key, { args, child, lazy });
+            : this.parent.resolve(target, { args, child, lazy });
     }
     resolveByAlias(alias, { args = [], child = this, lazy, excludedKeys = [] } = {}) {
         this.validateContainer();

package/esm/index.js

@@ -34,14 +34,13 @@ export { HooksRunner } from './hooks/HooksRunner';
 export { setMetadata, getMetadata, setParameterMetadata, setMethodMetadata, getMethodMetadata, getParameterMetadata, } from './metadata';
 // InjectionToken
 export { InjectionToken } from './token/InjectionToken';
-export { AliasToken, toAlias } from './token/AliasToken';
+export { AliasToken } from './token/AliasToken';
 export { AliasUniqToken, toAliasUniq } from './token/AliasUniqToken';
 export { ClassToken } from './token/ClassToken';
 export { IDToken } from './token/IDToken';
 export { FunctionToken } from './token/FunctionToken';
 export { ConstantToken } from './token/ConstantToken';
 export { InstanceListToken } from './token/InstanceListToken';
-export { toToken } from './token/toToken';
 // Others
 export { select } from './select';
 export { Is } from './utils';

package/package.json

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

package/typings/container/Container.d.ts

@@ -23,7 +23,7 @@ export declare class Container implements IContainer {
         tags?: Tag[];
     });
     register(key: DependencyKey, provider: IProvider, { aliases }?: RegisterOptions): this;
-    resolve<T>(key: constructor<T> | DependencyKey, { args, child, lazy }?: ResolveOneOptions): T;
+    resolve<T>(target: constructor<T> | DependencyKey, { args, child, lazy }?: ResolveOneOptions): T;
     resolveByAlias<T>(alias: DependencyKey, { args, child, lazy, excludedKeys }?: ResolveManyOptions): T[];
     resolveOneByAlias<T>(alias: DependencyKey, { args, child, lazy }?: ResolveOneOptions): T;
     createScope({ tags }?: CreateScopeOptions): IContainer;

package/typings/container/IContainer.d.ts

@@ -33,7 +33,7 @@ export interface IContainer extends Tagged {
     register(key: DependencyKey, value: IProvider, options?: RegisterOptions): this;
     addRegistration(registration: IRegistration): this;
     getRegistrations(): IRegistration[];
-    resolve<T>(alias: constructor<T> | DependencyKey, options?: ResolveOneOptions): T;
+    resolve<T>(target: constructor<T> | DependencyKey, options?: ResolveOneOptions): T;
     resolveByAlias<T>(alias: DependencyKey, options?: ResolveManyOptions): T[];
     resolveOneByAlias<T>(alias: DependencyKey, options?: ResolveOneOptions): T;
     createScope(options?: CreateScopeOptions): IContainer;

package/typings/index.d.ts

@@ -27,14 +27,13 @@ export { onDisposeHooksRunner, onDispose } from './hooks/onDispose';
 export { HooksRunnerContext, HooksRunner } from './hooks/HooksRunner';
 export { setMetadata, getMetadata, setParameterMetadata, setMethodMetadata, getMethodMetadata, getParameterMetadata, } from './metadata';
 export { InjectionToken } from './token/InjectionToken';
-export { AliasToken, toAlias } from './token/AliasToken';
+export { AliasToken } from './token/AliasToken';
 export { AliasUniqToken, toAliasUniq } from './token/AliasUniqToken';
 export { ClassToken } from './token/ClassToken';
 export { IDToken } from './token/IDToken';
 export { FunctionToken } from './token/FunctionToken';
 export { ConstantToken } from './token/ConstantToken';
 export { type InstancePredicate, InstanceListToken } from './token/InstanceListToken';
-export { toToken } from './token/toToken';
 export { select } from './select';
 export { Is } from './utils';
 export { InjectFn } from './hooks/hook';