ts-ioc-container 57.2.0 → 57.4.0

package/cjm/container/Container.js

@@ -8,11 +8,12 @@ const AliasMap_1 = require("./AliasMap");
 const DependencyNotFoundError_1 = require("../errors/DependencyNotFoundError");
 const basic_1 = require("../utils/basic");
 const array_1 = require("../utils/array");
+const proxy_1 = require("../utils/proxy");
 class Container {
     isDisposed = false;
     parent;
     scopes = [];
-    instances = [];
+    instances = new Set();
     registrations = [];
     tags;
     providers = new Map();
@@ -108,7 +109,7 @@ class Container {
         }
         this.providers.clear();
         this.aliases.destroy();
-        this.instances = [];
+        this.instances.clear();
         this.registrations = [];
         this.onConstructHookList.length = 0;
         this.onScopeCreatedHookList.length = 0;
@@ -137,7 +138,7 @@ class Container {
         return this;
     }
     addInstance(instance) {
-        this.instances.push(instance);
+        this.instances.add(instance);
         for (const onConstruct of this.onConstructHookList) {
             onConstruct(instance, this);
         }
@@ -146,7 +147,7 @@ class Container {
         return [...this.scopes];
     }
     hasInstance(instance) {
-        return this.instances.includes(instance);
+        return this.instances.has((0, proxy_1.unwrapProxyTarget)(instance));
     }
     getScopeByInstanceOrFail(instance) {
         this.validateContainer();

package/cjm/index.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createHookContext = exports.createHookContextFactory = exports.HookContext = exports.prepend = exports.append = exports.prependHooks = exports.appendHooks = exports.hasHooks = exports.hook = exports.getHooks = exports.UnsupportedTokenTypeError = exports.CannonSingletonApplyTwiceError = exports.UnexpectedHookResultError = exports.ProviderDisposedError = exports.ContainerDisposedError = exports.MethodNotImplementedError = exports.DependencyMissingKeyError = exports.ContainerNotFoundError = exports.DependencyNotFoundError = exports.ContainerError = exports.Registration = exports.appendArgsFn = exports.appendArgs = exports.decorate = exports.singleton = exports.autoResolve = exports.lazy = exports.scopeAccess = exports.scope = exports.bindTo = exports.register = exports.toRegistrationFn = exports.toProviderFn = exports.toBindToken = exports.registerPipe = exports.isProviderPipe = exports.Provider = exports.ProxyInjector = exports.SimpleInjector = exports.resolveArgs = exports.argsFn = exports.args = exports.arg = exports.inject = exports.MetadataInjector = exports.Injector = exports.EmptyContainer = exports.AutoResolveModule = exports.Container = exports.isDependencyKey = void 0;
 exports.pipe = exports.select = exports.once = exports.shallowCache = exports.debounce = exports.throttle = exports.handleAsyncError = exports.handleError = exports.getMethodTags = exports.addMethodTag = exports.getMethodLabels = exports.addMethodLabel = exports.getMethodMeta = exports.addMethodMeta = exports.getParamTags = exports.addParamTag = exports.getParamLabels = exports.addParamLabel = exports.getParamMeta = exports.addParamMeta = exports.getClassTags = exports.addClassTag = exports.getClassLabels = exports.addClassLabel = exports.getClassMeta = exports.addClassMeta = exports.GroupInstanceToken = exports.ConstantToken = exports.FunctionToken = exports.SingleToken = exports.ClassToken = exports.toSingleAlias = exports.SingleAliasToken = exports.toGroupAlias = exports.GroupAliasToken = exports.argToToken = exports.toMappedToken = exports.toToken = exports.InjectionToken = exports.HooksRunner = exports.AddOnDisposeHookModule = exports.onContainerDisposed = exports.onContainerDisposedHooksRunner = exports.AddOnConstructAsyncHookModule = exports.onConstructAsync = exports.onConstructAsyncHooksRunner = exports.AddOnConstructHookModule = exports.onConstruct = exports.onConstructHooksRunner = exports.injectProp = void 0;
-exports.resolveConstructor = exports.Is = void 0;
+exports.resolveConstructor = exports.Is = exports.isProxy = exports.getProxyTarget = exports.createProxy = void 0;
 var IContainer_1 = require("./container/IContainer");
 Object.defineProperty(exports, "isDependencyKey", { enumerable: true, get: function () { return IContainer_1.isDependencyKey; } });
 var Container_1 = require("./container/Container");
@@ -150,6 +150,10 @@ var select_1 = require("./select");
 Object.defineProperty(exports, "select", { enumerable: true, get: function () { return select_1.select; } });
 var fp_1 = require("./utils/fp");
 Object.defineProperty(exports, "pipe", { enumerable: true, get: function () { return fp_1.pipe; } });
+var proxy_1 = require("./utils/proxy");
+Object.defineProperty(exports, "createProxy", { enumerable: true, get: function () { return proxy_1.createProxy; } });
+Object.defineProperty(exports, "getProxyTarget", { enumerable: true, get: function () { return proxy_1.getProxyTarget; } });
+Object.defineProperty(exports, "isProxy", { enumerable: true, get: function () { return proxy_1.isProxy; } });
 var basic_1 = require("./utils/basic");
 Object.defineProperty(exports, "Is", { enumerable: true, get: function () { return basic_1.Is; } });
 Object.defineProperty(exports, "resolveConstructor", { enumerable: true, get: function () { return basic_1.resolveConstructor; } });

package/cjm/utils/proxy.js

@@ -1,24 +1,33 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.unwrapProxyTarget = void 0;
 exports.isProxy = isProxy;
 exports.getProxyTarget = getProxyTarget;
+exports.createProxy = createProxy;
 exports.lazyProxy = lazyProxy;
 exports.toLazyIf = toLazyIf;
 const proxyStateMap = new WeakMap();
 const unwrapProxyTarget = (value) => {
     return isProxy(value) ? getProxyTarget(value) : value;
 };
+exports.unwrapProxyTarget = unwrapProxyTarget;
 function isProxy(value) {
     return proxyStateMap.has(value);
 }
 function getProxyTarget(value) {
-    return proxyStateMap.get(value).getTarget();
+    const target = proxyStateMap.get(value).getTarget();
+    return (0, exports.unwrapProxyTarget)(target);
+}
+function createProxy(target, handler = {}) {
+    const proxy = new Proxy(target, handler);
+    proxyStateMap.set(proxy, { getTarget: () => target });
+    return proxy;
 }
 function lazyProxy(resolveInstance) {
     let instance;
     const state = {
         getTarget: () => {
-            instance = instance ?? unwrapProxyTarget(resolveInstance());
+            instance = instance ?? (0, exports.unwrapProxyTarget)(resolveInstance());
             return instance;
         },
     };

package/esm/container/Container.js

@@ -5,11 +5,12 @@ import { AliasMap } from './AliasMap.js';
 import { DependencyNotFoundError } from '../errors/DependencyNotFoundError.js';
 import { Is } from '../utils/basic.js';
 import { Filter as F } from '../utils/array.js';
+import { unwrapProxyTarget } from '../utils/proxy.js';
 export class Container {
     isDisposed = false;
     parent;
     scopes = [];
-    instances = [];
+    instances = new Set();
     registrations = [];
     tags;
     providers = new Map();
@@ -105,7 +106,7 @@ export class Container {
         }
         this.providers.clear();
         this.aliases.destroy();
-        this.instances = [];
+        this.instances.clear();
         this.registrations = [];
         this.onConstructHookList.length = 0;
         this.onScopeCreatedHookList.length = 0;
@@ -134,7 +135,7 @@ export class Container {
         return this;
     }
     addInstance(instance) {
-        this.instances.push(instance);
+        this.instances.add(instance);
         for (const onConstruct of this.onConstructHookList) {
             onConstruct(instance, this);
         }
@@ -143,7 +144,7 @@ export class Container {
         return [...this.scopes];
     }
     hasInstance(instance) {
-        return this.instances.includes(instance);
+        return this.instances.has(unwrapProxyTarget(instance));
     }
     getScopeByInstanceOrFail(instance) {
         this.validateContainer();

package/esm/index.js

@@ -45,4 +45,5 @@ export { shallowCache } from './utils/shallowCache.js';
 export { once } from './utils/once.js';
 export { select } from './select.js';
 export { pipe } from './utils/fp.js';
+export { createProxy, getProxyTarget, isProxy } from './utils/proxy.js';
 export { Is, resolveConstructor } from './utils/basic.js';

package/esm/utils/proxy.js

@@ -1,12 +1,18 @@
 const proxyStateMap = new WeakMap();
-const unwrapProxyTarget = (value) => {
+export const unwrapProxyTarget = (value) => {
     return isProxy(value) ? getProxyTarget(value) : value;
 };
 export function isProxy(value) {
     return proxyStateMap.has(value);
 }
 export function getProxyTarget(value) {
-    return proxyStateMap.get(value).getTarget();
+    const target = proxyStateMap.get(value).getTarget();
+    return unwrapProxyTarget(target);
+}
+export function createProxy(target, handler = {}) {
+    const proxy = new Proxy(target, handler);
+    proxyStateMap.set(proxy, { getTarget: () => target });
+    return proxy;
 }
 export function lazyProxy(resolveInstance) {
     let instance;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ts-ioc-container",
-  "version": "57.2.0",
+  "version": "57.4.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.",
   "publishConfig": {
     "access": "public",

package/typings/container/Container.d.ts

@@ -9,7 +9,7 @@ export declare class Container implements IContainer {
     isDisposed: boolean;
     private parent;
     private scopes;
-    private instances;
+    private readonly instances;
     private registrations;
     private readonly tags;
     private readonly providers;

package/typings/index.d.ts

@@ -47,4 +47,5 @@ export { once } from './utils/once.js';
 export { type ExecutionContext } from './ExecutionContext.js';
 export { select } from './select.js';
 export { pipe, type MapFn } from './utils/fp.js';
+export { createProxy, getProxyTarget, isProxy } from './utils/proxy.js';
 export { type constructor, type Instance, Is, resolveConstructor } from './utils/basic.js';

package/typings/utils/proxy.d.ts

@@ -1,4 +1,6 @@
+export declare const unwrapProxyTarget: <T extends object>(value: T) => T;
 export declare function isProxy(value: object): boolean;
 export declare function getProxyTarget<T extends object>(value: T): T;
+export declare function createProxy<T extends object>(target: T, handler?: ProxyHandler<T>): T;
 export declare function lazyProxy<T extends object>(resolveInstance: () => T): T;
 export declare function toLazyIf<T extends object>(resolveInstance: () => T, isLazy?: boolean): T;