ts-ioc-container 40.0.0 → 41.0.0

package/README.md

@@ -94,7 +94,7 @@ describe('Basic usage', function () {
 
   it('should inject dependencies', function () {
     class App {
-      constructor(@inject(by.one('ILogger')) public logger: Logger) {}
+      constructor(@inject('ILogger') public logger: Logger) {}
     }
 
     const container = new Container().addRegistration(R.fromClass(Logger).bindToKey('ILogger'));
@@ -280,7 +280,7 @@ describe('lazy provider', () => {
   class Service {
     name = 'Service';
 
-    constructor(@inject(by.one('Flag')) private flag: Flag) {
+    constructor(@inject('Flag') private flag: Flag) {
       this.flag.set();
     }
 
@@ -370,14 +370,14 @@ Also you can [inject property.](#inject-property)
 
 ```typescript
 import 'reflect-metadata';
-import { by, Container, inject, Registration as R } from 'ts-ioc-container';
+import { Container, inject, Registration as R } from 'ts-ioc-container';
 
 class Logger {
   name = 'Logger';
 }
 
 class App {
-  constructor(@inject(by.one('ILogger')) private logger: Logger) {}
+  constructor(@inject('ILogger') private logger: Logger) {}
 
   // OR
   // constructor(@inject((container, ...args) => container.resolve('ILogger', ...args)) private logger: ILogger) {
@@ -1025,8 +1025,8 @@ describe('alias', () => {
 
     const container = new Container().addRegistration(R.fromClass(FileLogger));
 
-    expect(by.one('ILogger').resolve(container)).toBeInstanceOf(FileLogger);
-    expect(() => by.one('logger').resolve(container)).toThrowError(DependencyNotFoundError);
+    expect(container.resolveOne('ILogger')).toBeInstanceOf(FileLogger);
+    expect(() => container.resolveOne('logger')).toThrowError(DependencyNotFoundError);
   });
 
   it('should resolve by alias', () => {
@@ -1040,9 +1040,9 @@ describe('alias', () => {
       .addRegistration(R.fromClass(FileLogger))
       .addRegistration(R.fromClass(DbLogger));
 
-    const result1 = by.one('ILogger').resolve(container);
+    const result1 = container.resolveOne('ILogger');
     const child = container.createScope({ tags: ['child'] });
-    const result2 = by.one('ILogger').resolve(child);
+    const result2 = child.resolveOne('ILogger');
 
     expect(result1).toBeInstanceOf(FileLogger);
     expect(result2).toBeInstanceOf(DbLogger);
@@ -1133,7 +1133,7 @@ describe('lazy provider', () => {
   }
 
   class App {
-    constructor(@inject(by.one('IRepository')) public repository: IRepository) {}
+    constructor(@inject('IRepository') public repository: IRepository) {}
 
     async run() {
       await this.repository.save({ id: '1', text: 'Hello' });
@@ -1379,9 +1379,9 @@ class Logger {
   }) // <--- or extract it to @onDispose
   private messages: string[] = [];
 
-  constructor(@inject(by.one('logsRepo')) private logsRepo: LogsRepo) {}
+  constructor(@inject('logsRepo') private logsRepo: LogsRepo) {}
 
-  log(@inject(by.one('logsRepo')) message: string): void {
+  log(@inject('logsRepo') message: string): void {
     this.messages.push(message);
   }
 
@@ -1417,12 +1417,12 @@ describe('onDispose', function () {
 ### Inject property
 
 ```typescript
-import { by, Container, hook, injectProp, Registration, runHooks } from 'ts-ioc-container';
+import { Container, hook, injectProp, Registration, runHooks } from 'ts-ioc-container';
 
 describe('inject property', () => {
   it('should inject property', () => {
     class App {
-      @hook('onInit', injectProp(by.one('greeting')))
+      @hook('onInit', injectProp('greeting'))
       greeting!: string;
     }
     const expected = 'Hello world!';

package/cjm/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.depKey = exports.by = exports.getParameterMetadata = exports.getMethodMetadata = exports.setMethodMetadata = exports.setParameterMetadata = exports.getMetadata = exports.setMetadata = exports.HookContext = exports.runOnDisposeHooks = exports.runOnConstructHooks = exports.onConstruct = exports.onDispose = exports.injectProp = exports.runHooksAsync = exports.runHooks = exports.hasHooks = exports.hook = exports.getHooks = exports.UnexpectedHookResultError = exports.ContainerDisposedError = exports.MethodNotImplementedError = exports.DependencyNotFoundError = exports.Registration = exports.register = exports.scope = exports.asAlias = exports.asKey = exports.decorate = exports.MultiCache = exports.multiCache = exports.SingletonProvider = exports.singleton = exports.Provider = exports.ProviderDecorator = exports.args = exports.argsFn = exports.scopeAccess = exports.ProxyInjector = exports.SimpleInjector = exports.MetadataInjector = exports.resolveArgs = exports.inject = exports.AutoMockedContainer = exports.EmptyContainer = exports.Container = exports.isDependencyKey = void 0;
+exports.depKey = exports.by = exports.getParameterMetadata = exports.getMethodMetadata = exports.setMethodMetadata = exports.setParameterMetadata = exports.getMetadata = exports.setMetadata = exports.HookContext = exports.runOnDisposeHooks = exports.runOnConstructHooks = exports.onConstruct = exports.onDispose = exports.injectProp = exports.runHooksAsync = exports.runHooks = exports.hasHooks = exports.hook = exports.getHooks = exports.UnexpectedHookResultError = exports.ContainerDisposedError = exports.MethodNotImplementedError = exports.DependencyNotFoundError = exports.Registration = exports.register = exports.scope = exports.asAlias = exports.asKey = exports.decorate = exports.MultiCache = exports.multiCache = exports.SingletonProvider = exports.singleton = exports.Provider = exports.ProviderDecorator = exports.args = exports.argsFn = exports.lazy = exports.scopeAccess = exports.ProxyInjector = exports.SimpleInjector = exports.MetadataInjector = exports.resolveArgs = exports.inject = exports.AutoMockedContainer = exports.EmptyContainer = exports.Container = exports.isDependencyKey = void 0;
 // Containers
 var IContainer_1 = require("./container/IContainer");
 Object.defineProperty(exports, "isDependencyKey", { enumerable: true, get: function () { return IContainer_1.isDependencyKey; } });
@@ -23,6 +23,7 @@ Object.defineProperty(exports, "ProxyInjector", { enumerable: true, get: functio
 // 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, "argsFn", { enumerable: true, get: function () { return IProvider_1.argsFn; } });
 Object.defineProperty(exports, "args", { enumerable: true, get: function () { return IProvider_1.args; } });
 Object.defineProperty(exports, "ProviderDecorator", { enumerable: true, get: function () { return IProvider_1.ProviderDecorator; } });

package/cjm/injector/inject.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.resolveArgs = exports.toInjectFn = exports.inject = void 0;
 const metadata_1 = require("../metadata");
 const utils_1 = require("../utils");
+const IContainer_1 = require("../container/IContainer");
 const HookContext_1 = require("../hooks/HookContext");
 const inject = (fn) => (target, propertyKey, parameterIndex) => {
     (0, metadata_1.setParameterMetadata)((0, HookContext_1.hookMetaKey)(propertyKey), (0, exports.toInjectFn)(fn))((0, utils_1.isInstance)(target) ? target.constructor : target, propertyKey, parameterIndex);
@@ -11,7 +12,18 @@ exports.inject = inject;
 function isInjectBuilder(fn) {
     return 'resolve' in fn && typeof fn['resolve'] === 'function';
 }
-const toInjectFn = (fn) => isInjectBuilder(fn) ? (scope) => fn.resolve(scope) : fn;
+const toInjectFn = (target) => {
+    if (typeof target === 'object' && isInjectBuilder(target)) {
+        return (s) => target.resolve(s);
+    }
+    if ((0, utils_1.isConstructor)(target)) {
+        return (scope) => scope.resolveByClass(target);
+    }
+    if ((0, IContainer_1.isDependencyKey)(target)) {
+        return (scope) => scope.resolveOne(target);
+    }
+    return target;
+};
 exports.toInjectFn = toInjectFn;
 const resolveArgs = (Target, methodName) => {
     const argsFns = getInjectFns(Target, methodName);

package/cjm/provider/IProvider.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ProviderDecorator = exports.scopeAccess = exports.argsFn = exports.args = void 0;
+exports.ProviderDecorator = exports.lazy = exports.scopeAccess = exports.argsFn = exports.args = void 0;
 const ProviderPipe_1 = require("./ProviderPipe");
 const args = (...extraArgs) => (0, ProviderPipe_1.registerPipe)((p) => p.setArgs(() => extraArgs));
 exports.args = args;
@@ -8,6 +8,8 @@ const argsFn = (fn) => (0, ProviderPipe_1.registerPipe)((p) => p.setArgs(fn));
 exports.argsFn = argsFn;
 const scopeAccess = (predicate) => (0, ProviderPipe_1.registerPipe)((p) => p.setAccessPredicate(predicate));
 exports.scopeAccess = scopeAccess;
+const lazy = () => (0, ProviderPipe_1.registerPipe)((p) => p.lazy());
+exports.lazy = lazy;
 class ProviderDecorator {
     decorated;
     constructor(decorated) {
@@ -37,5 +39,9 @@ class ProviderDecorator {
         this.decorated.setArgs(argsFn);
         return this;
     }
+    lazy() {
+        this.decorated.lazy();
+        return this;
+    }
 }
 exports.ProviderDecorator = ProviderDecorator;

package/cjm/provider/Provider.js

@@ -16,6 +16,7 @@ class Provider {
     }
     argsFn = () => [];
     checkAccess = () => true;
+    isLazy = false;
     constructor(resolveDependency) {
         this.resolveDependency = resolveDependency;
     }
@@ -23,14 +24,18 @@ class Provider {
         const fns = mappers.map((m) => ((0, ProviderPipe_1.isProviderPipe)(m) ? m.mapProvider.bind(m) : m));
         return (0, utils_1.pipe)(...fns)(this);
     }
-    resolve(container, { args, lazy: isLazy }) {
+    resolve(container, { args, lazy }) {
         const resolveDependency = () => this.resolveDependency(container, { args: [...this.argsFn(container, ...args), ...args] });
-        return isLazy ? (0, utils_1.lazyProxy)(resolveDependency) : resolveDependency();
+        return (lazy ?? this.isLazy) ? (0, utils_1.lazyProxy)(resolveDependency) : resolveDependency();
     }
     setAccessPredicate(predicate) {
         this.checkAccess = predicate;
         return this;
     }
+    lazy() {
+        this.isLazy = true;
+        return this;
+    }
     setArgs(argsFn) {
         this.argsFn = argsFn;
         return this;

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, argsFn, args, ProviderDecorator, } from './provider/IProvider';
+export { scopeAccess, lazy, argsFn, args, ProviderDecorator, } from './provider/IProvider';
 export { Provider } from './provider/Provider';
 export { singleton, SingletonProvider } from './provider/SingletonProvider';
 export { multiCache, MultiCache } from './provider/Cache';

package/esm/injector/inject.js

@@ -1,5 +1,6 @@
 import { getParameterMetadata, setParameterMetadata } from '../metadata';
-import { constant, fillEmptyIndexes, isInstance } from '../utils';
+import { constant, fillEmptyIndexes, isConstructor, isInstance } from '../utils';
+import { isDependencyKey } from '../container/IContainer';
 import { hookMetaKey } from '../hooks/HookContext';
 export const inject = (fn) => (target, propertyKey, parameterIndex) => {
     setParameterMetadata(hookMetaKey(propertyKey), toInjectFn(fn))(isInstance(target) ? target.constructor : target, propertyKey, parameterIndex);
@@ -7,7 +8,18 @@ export const inject = (fn) => (target, propertyKey, parameterIndex) => {
 function isInjectBuilder(fn) {
     return 'resolve' in fn && typeof fn['resolve'] === 'function';
 }
-export const toInjectFn = (fn) => isInjectBuilder(fn) ? (scope) => fn.resolve(scope) : fn;
+export const toInjectFn = (target) => {
+    if (typeof target === 'object' && isInjectBuilder(target)) {
+        return (s) => target.resolve(s);
+    }
+    if (isConstructor(target)) {
+        return (scope) => scope.resolveByClass(target);
+    }
+    if (isDependencyKey(target)) {
+        return (scope) => scope.resolveOne(target);
+    }
+    return target;
+};
 export const resolveArgs = (Target, methodName) => {
     const argsFns = getInjectFns(Target, methodName);
     return (scope, ...deps) => fillEmptyIndexes(argsFns, deps.map(constant)).map((fn) => fn(scope));

package/esm/provider/IProvider.js

@@ -2,6 +2,7 @@ import { isProviderPipe, registerPipe } from './ProviderPipe';
 export const args = (...extraArgs) => registerPipe((p) => p.setArgs(() => extraArgs));
 export const argsFn = (fn) => registerPipe((p) => p.setArgs(fn));
 export const scopeAccess = (predicate) => registerPipe((p) => p.setAccessPredicate(predicate));
+export const lazy = () => registerPipe((p) => p.lazy());
 export class ProviderDecorator {
     decorated;
     constructor(decorated) {
@@ -31,4 +32,8 @@ export class ProviderDecorator {
         this.decorated.setArgs(argsFn);
         return this;
     }
+    lazy() {
+        this.decorated.lazy();
+        return this;
+    }
 }

package/esm/provider/Provider.js

@@ -13,6 +13,7 @@ export class Provider {
     }
     argsFn = () => [];
     checkAccess = () => true;
+    isLazy = false;
     constructor(resolveDependency) {
         this.resolveDependency = resolveDependency;
     }
@@ -20,14 +21,18 @@ export class Provider {
         const fns = mappers.map((m) => (isProviderPipe(m) ? m.mapProvider.bind(m) : m));
         return pipe(...fns)(this);
     }
-    resolve(container, { args, lazy: isLazy }) {
+    resolve(container, { args, lazy }) {
         const resolveDependency = () => this.resolveDependency(container, { args: [...this.argsFn(container, ...args), ...args] });
-        return isLazy ? lazyProxy(resolveDependency) : resolveDependency();
+        return (lazy ?? this.isLazy) ? lazyProxy(resolveDependency) : resolveDependency();
     }
     setAccessPredicate(predicate) {
         this.checkAccess = predicate;
         return this;
     }
+    lazy() {
+        this.isLazy = true;
+        return this;
+    }
     setArgs(argsFn) {
         this.argsFn = argsFn;
         return this;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ts-ioc-container",
-  "version": "40.0.0",
+  "version": "41.0.0",
   "description": "Typescript IoC container",
   "publishConfig": {
     "access": "public",
@@ -46,7 +46,7 @@
     "test-coverage:update": "scripts/test-coverage/update-coverage-results.ts",
     "build": "npm run build:cjm && npm run build:esm && npm run build:types",
     "coverage": "coveralls",
-    "test": "jest --coverage --coverageReporters='json-summary'",
+    "test": "jest --coverage",
     "type-check": "tsc --noEmit",
     "type-check:watch": "tsc --noEmit --watch",
     "commit": "cz",

package/typings/hooks/hook.d.ts

@@ -1,4 +1,4 @@
-import { type IContainer } from '../container/IContainer';
+import { DependencyKey, type IContainer } from '../container/IContainer';
 import { type CreateHookContext, createHookContext, type IHookContext, type InjectFn } from './HookContext';
 import { type constructor } from '../utils';
 import { type IInjectFnResolver } from '../injector/IInjector';
@@ -21,7 +21,7 @@ export declare const runHooksAsync: (target: object, key: string | symbol, { sco
     createContext?: typeof createHookContext;
     predicate?: (methodName: string) => boolean;
 }) => Promise<void[]>;
-export declare const injectProp: (fn: InjectFn | IInjectFnResolver<unknown>) => HookFn;
+export declare const injectProp: (fn: InjectFn | IInjectFnResolver<unknown> | DependencyKey | constructor<unknown>) => HookFn;
 export declare const onConstruct: (fn: HookFn) => (target: object, propertyKey: string | symbol) => void;
 export declare const runOnConstructHooks: (target: object, scope: IContainer) => void;
 export declare const onDispose: (target: object, propertyKey: string | symbol) => void;

package/typings/index.d.ts

@@ -7,7 +7,7 @@ export { type IInjector, type InjectOptions } from './injector/IInjector';
 export { MetadataInjector } from './injector/MetadataInjector';
 export { SimpleInjector } from './injector/SimpleInjector';
 export { ProxyInjector } from './injector/ProxyInjector';
-export { type ResolveDependency, type IProvider, scopeAccess, argsFn, args, type ArgsFn, ProviderDecorator, type ProviderResolveOptions, type IMapper, } from './provider/IProvider';
+export { type ResolveDependency, type IProvider, scopeAccess, lazy, argsFn, args, type ArgsFn, ProviderDecorator, type ProviderResolveOptions, type IMapper, } from './provider/IProvider';
 export { Provider } from './provider/Provider';
 export { singleton, SingletonProvider } from './provider/SingletonProvider';
 export { type Cache, multiCache, MultiCache } from './provider/Cache';

package/typings/injector/inject.d.ts

@@ -1,8 +1,7 @@
 import { type constructor } from '../utils';
-import { type IContainer } from '../container/IContainer';
+import { DependencyKey, type IContainer } from '../container/IContainer';
 import { type InjectFn } from '../hooks/HookContext';
-import { type DepKey } from '../DepKey';
 import { type IInjectFnResolver } from './IInjector';
-export declare const inject: <T>(fn: InjectFn<T> | DepKey<T> | IInjectFnResolver<T>) => ParameterDecorator;
-export declare const toInjectFn: <T>(fn: InjectFn<T> | IInjectFnResolver<T>) => InjectFn<T>;
+export declare const inject: <T>(fn: InjectFn<T> | IInjectFnResolver<T> | DependencyKey | constructor<T>) => ParameterDecorator;
+export declare const toInjectFn: <T>(target: InjectFn<T> | IInjectFnResolver<T> | DependencyKey | constructor<T>) => InjectFn<T>;
 export declare const resolveArgs: (Target: constructor<unknown>, methodName?: string) => (scope: IContainer, ...deps: unknown[]) => unknown[];

package/typings/provider/IProvider.d.ts

@@ -21,10 +21,12 @@ export interface IProvider<T = any> {
     pipe(...mappers: (MapFn<IProvider<T>> | ProviderPipe<T>)[]): IProvider<T>;
     setAccessPredicate(hasAccessWhen: ScopeAccessFn): this;
     setArgs(argsFn: ArgsFn): this;
+    lazy(): this;
 }
 export declare const args: <T>(...extraArgs: unknown[]) => ProviderPipe<T>;
 export declare const argsFn: <T>(fn: ArgsFn) => ProviderPipe<T>;
 export declare const scopeAccess: <T>(predicate: ScopeAccessFn) => ProviderPipe<T>;
+export declare const lazy: <T>() => ProviderPipe<T>;
 export declare abstract class ProviderDecorator<T> implements IProvider<T> {
     private decorated;
     protected constructor(decorated: IProvider<T>);
@@ -33,4 +35,5 @@ export declare abstract class ProviderDecorator<T> implements IProvider<T> {
     resolve(container: IContainer, options: ProviderResolveOptions): T;
     pipe(...mappers: (MapFn<IProvider<T>> | ProviderPipe<T>)[]): IProvider<T>;
     setArgs(argsFn: ArgsFn): this;
+    lazy(): this;
 }

package/typings/provider/Provider.d.ts

@@ -9,10 +9,12 @@ export declare class Provider<T = any> implements IProvider<T> {
     static fromKey<T>(key: DependencyKey): Provider<T>;
     private argsFn;
     private checkAccess;
+    private isLazy;
     constructor(resolveDependency: ResolveDependency<T>);
     pipe(...mappers: (MapFn<IProvider<T>> | ProviderPipe<T>)[]): IProvider<T>;
-    resolve(container: IContainer, { args, lazy: isLazy }: ProviderResolveOptions): T;
+    resolve(container: IContainer, { args, lazy }: ProviderResolveOptions): T;
     setAccessPredicate(predicate: ScopeAccessFn): this;
+    lazy(): this;
     setArgs(argsFn: ArgsFn): this;
     hasAccess(options: ScopeAccessOptions): boolean;
 }