ts-ioc-container 41.1.2 → 41.2.0

package/cjm/DepKey.js

@@ -1,12 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.depKey = exports.isDepKey = void 0;
+exports.depKey = void 0;
 const Registration_1 = require("./registration/Registration");
 const Provider_1 = require("./provider/Provider");
-const isDepKey = (key) => {
-    return typeof key === 'object' && key !== null && 'key' in key;
-};
-exports.isDepKey = isDepKey;
 const depKey = (key) => {
     const scopePredicates = [];
     const mappers = [];

package/cjm/container/IContainer.js

@@ -1,14 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DEFAULT_CONTAINER_RESOLVER = void 0;
-exports.isDependencyKey = isDependencyKey;
 const utils_1 = require("../utils");
 const DependencyNotFoundError_1 = require("../errors/DependencyNotFoundError");
-function isDependencyKey(token) {
-    return ['string', 'symbol'].includes(typeof token);
-}
 const DEFAULT_CONTAINER_RESOLVER = (scope, keyOrAlias, options) => {
-    if ((0, utils_1.isConstructor)(keyOrAlias)) {
+    if (utils_1.Is.constructor(keyOrAlias)) {
         return scope.resolveClass(keyOrAlias, options);
     }
     try {

package/cjm/hooks/hook.js

@@ -8,7 +8,7 @@ const utils_1 = require("../utils");
 const UnexpectedHookResultError_1 = require("../errors/UnexpectedHookResultError");
 const inject_1 = require("../injector/inject");
 const isHookClassConstructor = (execute) => {
-    return (0, utils_1.isConstructor)(execute) && execute.prototype.execute;
+    return utils_1.Is.constructor(execute) && execute.prototype.execute;
 };
 const toHookFn = (execute) => isHookClassConstructor(execute) ? (context) => context.scope.resolveOne(execute).execute(context) : execute;
 exports.toHookFn = toHookFn;

package/cjm/index.js

@@ -1,9 +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.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; } });
+exports.depKey = exports.Is = 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 = void 0;
 var Container_1 = require("./container/Container");
 Object.defineProperty(exports, "Container", { enumerable: true, get: function () { return Container_1.Container; } });
 var EmptyContainer_1 = require("./container/EmptyContainer");
@@ -79,5 +76,7 @@ Object.defineProperty(exports, "getParameterMetadata", { enumerable: true, get:
 // Others
 var resolve_1 = require("./resolve");
 Object.defineProperty(exports, "by", { enumerable: true, get: function () { return resolve_1.by; } });
+var utils_1 = require("./utils");
+Object.defineProperty(exports, "Is", { enumerable: true, get: function () { return utils_1.Is; } });
 var DepKey_1 = require("./DepKey");
 Object.defineProperty(exports, "depKey", { enumerable: true, get: function () { return DepKey_1.depKey; } });

package/cjm/injector/inject.js

@@ -4,10 +4,9 @@ exports.resolveArgs = exports.toInjectFn = exports.inject = void 0;
 exports.isInjectBuilder = isInjectBuilder;
 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);
+    (0, metadata_1.setParameterMetadata)((0, HookContext_1.hookMetaKey)(propertyKey), (0, exports.toInjectFn)(fn))(utils_1.Is.instance(target) ? target.constructor : target, propertyKey, parameterIndex);
 };
 exports.inject = inject;
 function isInjectBuilder(fn) {
@@ -17,10 +16,10 @@ const toInjectFn = (target) => {
     if (typeof target === 'object' && isInjectBuilder(target)) {
         return (s) => target.resolve(s);
     }
-    if ((0, utils_1.isConstructor)(target)) {
+    if (utils_1.Is.constructor(target)) {
         return (scope) => scope.resolveClass(target);
     }
-    if ((0, IContainer_1.isDependencyKey)(target)) {
+    if (utils_1.Is.dependencyKey(target)) {
         return (scope) => scope.resolveOne(target);
     }
     return target;

package/cjm/registration/IRegistration.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.asKey = exports.asAlias = exports.register = exports.getTransformers = exports.scope = void 0;
-const IContainer_1 = require("../container/IContainer");
+const utils_1 = require("../utils");
 const metadata_1 = require("../metadata");
 const ProviderPipe_1 = require("../provider/ProviderPipe");
 const scope = (...predicates) => (r) => r.when(...predicates);
@@ -11,7 +11,7 @@ const getTransformers = (Target) => (0, metadata_1.getMetadata)(Target, METADATA
 exports.getTransformers = getTransformers;
 const register = (...mappers) => (0, metadata_1.setMetadata)(METADATA_KEY, mappers.map((m) => ((0, ProviderPipe_1.isProviderPipe)(m) ? (r) => m.mapRegistration(r) : m)));
 exports.register = register;
-const asAlias = (target) => (r) => r.bindToAlias((0, IContainer_1.isDependencyKey)(target) ? target : target.key);
+const asAlias = (target) => (r) => r.bindToAlias(utils_1.Is.dependencyKey(target) ? target : target.key);
 exports.asAlias = asAlias;
 const asKey = (key) => (r) => r.bindToKey(key);
 exports.asKey = asKey;

package/cjm/registration/Registration.js

@@ -15,7 +15,7 @@ class Registration {
         return transform(new Registration(() => Provider_1.Provider.fromClass(Target), Target.name));
     }
     static fromValue(value) {
-        if ((0, utils_1.isConstructor)(value)) {
+        if (utils_1.Is.constructor(value)) {
             const transform = (0, utils_1.pipe)(...(0, IRegistration_1.getTransformers)(value));
             return transform(new Registration(() => Provider_1.Provider.fromValue(value), value.name));
         }

package/cjm/resolve.js

@@ -1,8 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.by = exports.InstancesResolver = exports.InjectionResolver = void 0;
-const IContainer_1 = require("./container/IContainer");
-const DepKey_1 = require("./DepKey");
+const utils_1 = require("./utils");
 class InjectionResolver {
     resolveByOptions;
     isLazy = false;
@@ -55,18 +54,18 @@ class InstancesResolver {
 exports.InstancesResolver = InstancesResolver;
 exports.by = {
     many: (target) => {
-        const alias = (0, IContainer_1.isDependencyKey)(target) ? target : target.key;
+        const alias = utils_1.Is.dependencyKey(target) ? target : target.key;
         return new InjectionResolver((s, options) => s.resolveMany(alias, options));
     },
     one: (target) => {
-        const key = (0, DepKey_1.isDepKey)(target) ? target.key : target;
+        const key = utils_1.Is.DepKey(target) ? target.key : target;
         return new InjectionResolver((s, options) => s.resolveOne(key, options));
     },
     /**
      * Use it only for optimization. Otherwise, recommended to use `by.one`
      */
     aliasOne: (target) => {
-        const alias = (0, DepKey_1.isDepKey)(target) ? target.key : target;
+        const alias = utils_1.Is.DepKey(target) ? target.key : target;
         return new InjectionResolver((s, options) => s.resolveOneByAlias(alias, options));
     },
     instances: (predicate = () => true) => new InstancesResolver(predicate),

package/cjm/utils.js

@@ -1,20 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Is = exports.Filter = exports.List = exports.promisify = exports.constant = exports.pipe = exports.isConstructor = void 0;
-exports.isInstance = isInstance;
+exports.Is = exports.Filter = exports.List = exports.promisify = exports.constant = exports.pipe = void 0;
 exports.fillEmptyIndexes = fillEmptyIndexes;
 exports.lazyProxy = lazyProxy;
-/**
- * @deprecated Use Is.constructor instead
- */
-const isConstructor = (T) => typeof T === 'function' && !!T.prototype;
-exports.isConstructor = isConstructor;
-/**
- * @deprecated Use Is.instance instead
- */
-function isInstance(target) {
-    return Object.prototype.hasOwnProperty.call(target, 'constructor');
-}
 const pipe = (...mappers) => (value) => mappers.reduce((acc, current) => current(acc), value);
 exports.pipe = pipe;
 function fillEmptyIndexes(baseArr, insertArr) {
@@ -56,4 +44,7 @@ exports.Is = {
     constructor: (target) => typeof target === 'function' && !!target.prototype,
     dependencyKey: (target) => ['string', 'symbol'].includes(typeof target),
     injectBuilder: (target) => exports.Is.object(target) && 'resolve' in target && typeof target['resolve'] === 'function',
+    DepKey: (key) => {
+        return typeof key === 'object' && key !== null && 'key' in key;
+    },
 };

package/esm/DepKey.js

@@ -1,8 +1,5 @@
 import { Registration } from './registration/Registration';
 import { Provider } from './provider/Provider';
-export const isDepKey = (key) => {
-    return typeof key === 'object' && key !== null && 'key' in key;
-};
 export const depKey = (key) => {
     const scopePredicates = [];
     const mappers = [];

package/esm/container/IContainer.js

@@ -1,10 +1,7 @@
-import { isConstructor } from '../utils';
+import { Is } from '../utils';
 import { DependencyNotFoundError } from '../errors/DependencyNotFoundError';
-export function isDependencyKey(token) {
-    return ['string', 'symbol'].includes(typeof token);
-}
 export const DEFAULT_CONTAINER_RESOLVER = (scope, keyOrAlias, options) => {
-    if (isConstructor(keyOrAlias)) {
+    if (Is.constructor(keyOrAlias)) {
         return scope.resolveClass(keyOrAlias, options);
     }
     try {

package/esm/hooks/hook.js

@@ -1,9 +1,9 @@
 import { createHookContext } from './HookContext';
-import { isConstructor, promisify } from '../utils';
+import { Is, promisify } from '../utils';
 import { UnexpectedHookResultError } from '../errors/UnexpectedHookResultError';
 import { toInjectFn } from '../injector/inject';
 const isHookClassConstructor = (execute) => {
-    return isConstructor(execute) && execute.prototype.execute;
+    return Is.constructor(execute) && execute.prototype.execute;
 };
 export const toHookFn = (execute) => isHookClassConstructor(execute) ? (context) => context.scope.resolveOne(execute).execute(context) : execute;
 export const hook = (key, ...fns) => (target, propertyKey) => {

package/esm/index.js

@@ -1,5 +1,3 @@
-// Containers
-export { isDependencyKey, } from './container/IContainer';
 export { Container } from './container/Container';
 export { EmptyContainer } from './container/EmptyContainer';
 export { AutoMockedContainer } from './container/AutoMockedContainer';
@@ -29,4 +27,5 @@ export { HookContext } from './hooks/HookContext';
 export { setMetadata, getMetadata, setParameterMetadata, setMethodMetadata, getMethodMetadata, getParameterMetadata, } from './metadata';
 // Others
 export { by } from './resolve';
+export { Is } from './utils';
 export { depKey } from './DepKey';

package/esm/injector/inject.js

@@ -1,9 +1,8 @@
 import { getParameterMetadata, setParameterMetadata } from '../metadata';
-import { constant, fillEmptyIndexes, isConstructor, isInstance } from '../utils';
-import { isDependencyKey } from '../container/IContainer';
+import { constant, fillEmptyIndexes, Is } from '../utils';
 import { hookMetaKey } from '../hooks/HookContext';
 export const inject = (fn) => (target, propertyKey, parameterIndex) => {
-    setParameterMetadata(hookMetaKey(propertyKey), toInjectFn(fn))(isInstance(target) ? target.constructor : target, propertyKey, parameterIndex);
+    setParameterMetadata(hookMetaKey(propertyKey), toInjectFn(fn))(Is.instance(target) ? target.constructor : target, propertyKey, parameterIndex);
 };
 export function isInjectBuilder(fn) {
     return 'resolve' in fn && typeof fn['resolve'] === 'function';
@@ -12,10 +11,10 @@ export const toInjectFn = (target) => {
     if (typeof target === 'object' && isInjectBuilder(target)) {
         return (s) => target.resolve(s);
     }
-    if (isConstructor(target)) {
+    if (Is.constructor(target)) {
         return (scope) => scope.resolveClass(target);
     }
-    if (isDependencyKey(target)) {
+    if (Is.dependencyKey(target)) {
         return (scope) => scope.resolveOne(target);
     }
     return target;

package/esm/registration/IRegistration.js

@@ -1,9 +1,9 @@
-import { isDependencyKey } from '../container/IContainer';
+import { Is } from '../utils';
 import { getMetadata, setMetadata } from '../metadata';
 import { isProviderPipe } from '../provider/ProviderPipe';
 export const scope = (...predicates) => (r) => r.when(...predicates);
 const METADATA_KEY = 'registration';
 export const getTransformers = (Target) => getMetadata(Target, METADATA_KEY) ?? [];
 export const register = (...mappers) => setMetadata(METADATA_KEY, mappers.map((m) => (isProviderPipe(m) ? (r) => m.mapRegistration(r) : m)));
-export const asAlias = (target) => (r) => r.bindToAlias(isDependencyKey(target) ? target : target.key);
+export const asAlias = (target) => (r) => r.bindToAlias(Is.dependencyKey(target) ? target : target.key);
 export const asKey = (key) => (r) => r.bindToKey(key);

package/esm/registration/Registration.js

@@ -1,4 +1,4 @@
-import { isConstructor, pipe } from '../utils';
+import { Is, pipe } from '../utils';
 import { Provider } from '../provider/Provider';
 import { DependencyMissingKeyError } from '../errors/DependencyMissingKeyError';
 import { getTransformers } from './IRegistration';
@@ -12,7 +12,7 @@ export class Registration {
         return transform(new Registration(() => Provider.fromClass(Target), Target.name));
     }
     static fromValue(value) {
-        if (isConstructor(value)) {
+        if (Is.constructor(value)) {
             const transform = pipe(...getTransformers(value));
             return transform(new Registration(() => Provider.fromValue(value), value.name));
         }

package/esm/resolve.js

@@ -1,5 +1,4 @@
-import { isDependencyKey, } from './container/IContainer';
-import { isDepKey } from './DepKey';
+import { Is } from './utils';
 export class InjectionResolver {
     resolveByOptions;
     isLazy = false;
@@ -50,18 +49,18 @@ export class InstancesResolver {
 }
 export const by = {
     many: (target) => {
-        const alias = isDependencyKey(target) ? target : target.key;
+        const alias = Is.dependencyKey(target) ? target : target.key;
         return new InjectionResolver((s, options) => s.resolveMany(alias, options));
     },
     one: (target) => {
-        const key = isDepKey(target) ? target.key : target;
+        const key = Is.DepKey(target) ? target.key : target;
         return new InjectionResolver((s, options) => s.resolveOne(key, options));
     },
     /**
      * Use it only for optimization. Otherwise, recommended to use `by.one`
      */
     aliasOne: (target) => {
-        const alias = isDepKey(target) ? target.key : target;
+        const alias = Is.DepKey(target) ? target.key : target;
         return new InjectionResolver((s, options) => s.resolveOneByAlias(alias, options));
     },
     instances: (predicate = () => true) => new InstancesResolver(predicate),

package/esm/utils.js

@@ -1,13 +1,3 @@
-/**
- * @deprecated Use Is.constructor instead
- */
-export const isConstructor = (T) => typeof T === 'function' && !!T.prototype;
-/**
- * @deprecated Use Is.instance instead
- */
-export function isInstance(target) {
-    return Object.prototype.hasOwnProperty.call(target, 'constructor');
-}
 export const pipe = (...mappers) => (value) => mappers.reduce((acc, current) => current(acc), value);
 export function fillEmptyIndexes(baseArr, insertArr) {
     const a = [...baseArr];
@@ -46,4 +36,7 @@ export const Is = {
     constructor: (target) => typeof target === 'function' && !!target.prototype,
     dependencyKey: (target) => ['string', 'symbol'].includes(typeof target),
     injectBuilder: (target) => Is.object(target) && 'resolve' in target && typeof target['resolve'] === 'function',
+    DepKey: (key) => {
+        return typeof key === 'object' && key !== null && 'key' in key;
+    },
 };

package/package.json

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

package/typings/DepKey.d.ts

@@ -12,5 +12,4 @@ export type DepKey<T> = IInjectFnResolver<T> & {
     when(value: ScopePredicate): DepKey<T>;
     asAlias: (registration: IRegistration<T>) => IRegistration<T>;
 };
-export declare const isDepKey: <T>(key: unknown) => key is DepKey<T>;
 export declare const depKey: <T>(key: DependencyKey) => DepKey<T>;

package/typings/container/IContainer.d.ts

@@ -3,7 +3,6 @@ import { type constructor } from '../utils';
 import { type IRegistration } from '../registration/IRegistration';
 export type Tag = string;
 export type DependencyKey = string | symbol;
-export declare function isDependencyKey(token: unknown): token is DependencyKey;
 export type InjectionToken<T = unknown> = constructor<T> | DependencyKey;
 export type ResolveOneOptions = {
     args?: unknown[];

package/typings/index.d.ts

@@ -1,4 +1,4 @@
-export { type IContainer, type Resolvable, type IContainerModule, isDependencyKey, type DependencyKey, type InjectionToken, type Tag, type Tagged, type Instance, } from './container/IContainer';
+export { type IContainer, type Resolvable, type IContainerModule, type DependencyKey, type InjectionToken, type Tag, type Tagged, type Instance, } from './container/IContainer';
 export { Container } from './container/Container';
 export { EmptyContainer } from './container/EmptyContainer';
 export { AutoMockedContainer } from './container/AutoMockedContainer';
@@ -23,6 +23,6 @@ export { getHooks, hook, hasHooks, type HookFn, type HookClass, runHooks, runHoo
 export { HookContext, type InjectFn, type IHookContext } from './hooks/HookContext';
 export { setMetadata, getMetadata, setParameterMetadata, setMethodMetadata, getMethodMetadata, getParameterMetadata, } from './metadata';
 export { by } from './resolve';
-export { type constructor } from './utils';
+export { type constructor, Is } from './utils';
 export { depKey, type DepKey } from './DepKey';
 export { type InstancePredicate } from './resolve';

package/typings/registration/IRegistration.d.ts

@@ -1,5 +1,5 @@
 import type { DependencyKey, IContainer, IContainerModule } from '../container/IContainer';
-import type { constructor, MapFn } from '../utils';
+import { constructor, MapFn } from '../utils';
 import type { IProvider } from '../provider/IProvider';
 import type { DepKey } from '../DepKey';
 import { ProviderPipe } from '../provider/ProviderPipe';

package/typings/registration/Registration.d.ts

@@ -1,5 +1,5 @@
 import type { DependencyKey, IContainer } from '../container/IContainer';
-import type { constructor, MapFn } from '../utils';
+import { constructor, MapFn } from '../utils';
 import type { IProvider, ResolveDependency } from '../provider/IProvider';
 import type { IRegistration, ScopePredicate } from './IRegistration';
 import type { ProviderPipe } from '../provider/ProviderPipe';

package/typings/utils.d.ts

@@ -1,17 +1,10 @@
 import { DependencyKey } from './container/IContainer';
 import { IInjectFnResolver } from './injector/IInjector';
+import { DepKey } from './DepKey';
 export type constructor<T> = new (...args: any[]) => T;
-/**
- * @deprecated Use Is.constructor instead
- */
-export declare const isConstructor: (T: unknown) => T is constructor<unknown>;
 export interface InstanceOfClass<T = unknown> {
     new (...args: unknown[]): T;
 }
-/**
- * @deprecated Use Is.instance instead
- */
-export declare function isInstance(target: object): target is InstanceOfClass;
 export type MapFn<T> = (value: T) => T;
 export declare const pipe: <T>(...mappers: MapFn<T>[]) => MapFn<T>;
 export declare function fillEmptyIndexes<T>(baseArr: (T | undefined)[], insertArr: T[]): T[];
@@ -30,4 +23,5 @@ export declare const Is: {
     constructor: (target: unknown) => target is constructor<unknown>;
     dependencyKey: (target: unknown) => target is DependencyKey;
     injectBuilder: (target: unknown) => target is IInjectFnResolver<unknown>;
+    DepKey: <T>(key: unknown) => key is DepKey<T>;
 };