@prostojs/mate 0.5.0 → 0.5.1

package/dist/index.cjs

@@ -23,7 +23,7 @@ function formatIdentity(identity) {
 function warnOnDuplicateMate() {
 	const g = globalThis;
 	const identity = {};
-	identity.version = "0.4.0";
+	identity.version = "0.5.0";
 	const path = getModulePath();
 	if (path) identity.path = path;
 	const first = g[MATE_MODULE_IDENTITY_KEY];
@@ -33,11 +33,12 @@ function warnOnDuplicateMate() {
 
 //#endregion
 //#region src/utils/helpers.ts
+const hasOwn = Object.prototype.hasOwnProperty;
 function getConstructor(instance) {
 	return isConstructor(instance) ? instance : instance.constructor ? instance.constructor : Object.getPrototypeOf(instance).constructor;
 }
 function isConstructor(v) {
-	return typeof v === "function" && Object.getOwnPropertyDescriptor(v, "prototype") !== void 0 && Object.getOwnPropertyDescriptor(v, "caller") === void 0 && !!v.name;
+	return typeof v === "function" && hasOwn.call(v, "prototype") && !hasOwn.call(v, "caller") && !!v.name;
 }
 
 //#endregion
@@ -108,9 +109,11 @@ var Mate = class {
 	_cleanup() {
 		Reflect._cleanup?.call(Reflect);
 		this._readCache = void 0;
+		this._readCacheNonCtor = void 0;
 	}
 	set(args, key, value, isArray) {
 		this._readCache = void 0;
+		this._readCacheNonCtor = void 0;
 		let level = "CLASS";
 		const newArgs = args.level === "CLASS" ? { target: getConstructor(args.target) } : args.level === "PROP" ? {
 			target: args.target,
@@ -156,11 +159,19 @@ var Mate = class {
 		Reflect.defineMetadata(this.workspace, meta, newArgs.target, newArgs.propKey);
 	}
 	read(target, propKey) {
-		const constructor = isConstructor(target) ? target : getConstructor(target);
-		const proto = constructor.prototype;
 		const propKeyStr = propKey;
-		const ctorCache = this._readCache?.get(constructor);
-		if (ctorCache?.has(propKeyStr)) return ctorCache.get(propKeyStr);
+		const ctorCacheRoot = this._readCache;
+		if (ctorCacheRoot !== void 0 && typeof target === "function") {
+			const hit = readCached(ctorCacheRoot.get(target), propKeyStr);
+			if (hit !== MISS) return hit;
+		}
+		const isConstr = isConstructor(target);
+		const constructor = isConstr ? target : getConstructor(target);
+		if (!isConstr) {
+			const hit = readCached(ctorCacheRoot?.get(constructor) ?? this._readCacheNonCtor?.get(constructor), propKeyStr);
+			if (hit !== MISS) return hit;
+		}
+		const proto = constructor.prototype;
 		let ownMeta = Reflect.getOwnMetadata(this.workspace, typeof propKey === "string" ? proto : constructor, propKey);
 		if (ownMeta && propKey === void 0 && ownMeta.params === void 0) {
 			const parent = Object.getPrototypeOf(constructor);
@@ -192,7 +203,7 @@ var Mate = class {
 				}
 			}
 		}
-		const cache = this._readCache ??= /* @__PURE__ */ new WeakMap();
+		const cache = isConstr || typeof constructor !== "function" || isConstructor(constructor) ? this._readCache ??= /* @__PURE__ */ new WeakMap() : this._readCacheNonCtor ??= /* @__PURE__ */ new WeakMap();
 		let tc = cache.get(constructor);
 		if (!tc) {
 			tc = /* @__PURE__ */ new Map();
@@ -229,6 +240,12 @@ var Mate = class {
 	}
 };
 const fnProto = Object.getPrototypeOf(Function);
+const MISS = Symbol("mate.read.miss");
+function readCached(tc, propKey) {
+	if (tc === void 0) return MISS;
+	const v = tc.get(propKey);
+	return v !== void 0 || tc.has(propKey) ? v : MISS;
+}
 
 //#endregion
 //#region src/index.ts

package/dist/index.d.ts

@@ -46,7 +46,19 @@ declare class Mate<TClass extends TObject = TMateClassMeta<TMateParamMeta>, TPro
   protected workspace: string;
   protected options: TMateOptions<TClass, TProp>;
   protected logger: TConsoleBase;
+  /**
+   * Read cache keyed by the resolved constructor. Invariant: every function
+   * key here passed `isConstructor` when stored, so a hit on a function
+   * `target` itself proves `target` is that constructor — `read` probes
+   * it before running `isConstructor`.
+   */
   protected _readCache?: WeakMap<object, Map<string | undefined, unknown>>;
+  /**
+   * Read cache for resolved "constructors" that are functions failing
+   * `isConstructor` (e.g. an anonymous class reached through an instance's
+   * `.constructor`). Kept apart so they cannot satisfy the fast probe.
+   */
+  protected _readCacheNonCtor?: WeakMap<object, Map<string | undefined, unknown>>;
   constructor(workspace: string, options?: TMateOptions<TClass, TProp>);
   /**
    * Cleanup function to reset metadata

package/dist/index.mjs

@@ -21,7 +21,7 @@ function formatIdentity(identity) {
 function warnOnDuplicateMate() {
 	const g = globalThis;
 	const identity = {};
-	identity.version = "0.4.0";
+	identity.version = "0.5.0";
 	const path = getModulePath();
 	if (path) identity.path = path;
 	const first = g[MATE_MODULE_IDENTITY_KEY];
@@ -31,11 +31,12 @@ function warnOnDuplicateMate() {
 
 //#endregion
 //#region src/utils/helpers.ts
+const hasOwn = Object.prototype.hasOwnProperty;
 function getConstructor(instance) {
 	return isConstructor(instance) ? instance : instance.constructor ? instance.constructor : Object.getPrototypeOf(instance).constructor;
 }
 function isConstructor(v) {
-	return typeof v === "function" && Object.getOwnPropertyDescriptor(v, "prototype") !== void 0 && Object.getOwnPropertyDescriptor(v, "caller") === void 0 && !!v.name;
+	return typeof v === "function" && hasOwn.call(v, "prototype") && !hasOwn.call(v, "caller") && !!v.name;
 }
 
 //#endregion
@@ -106,9 +107,11 @@ var Mate = class {
 	_cleanup() {
 		Reflect._cleanup?.call(Reflect);
 		this._readCache = void 0;
+		this._readCacheNonCtor = void 0;
 	}
 	set(args, key, value, isArray) {
 		this._readCache = void 0;
+		this._readCacheNonCtor = void 0;
 		let level = "CLASS";
 		const newArgs = args.level === "CLASS" ? { target: getConstructor(args.target) } : args.level === "PROP" ? {
 			target: args.target,
@@ -154,11 +157,19 @@ var Mate = class {
 		Reflect.defineMetadata(this.workspace, meta, newArgs.target, newArgs.propKey);
 	}
 	read(target, propKey) {
-		const constructor = isConstructor(target) ? target : getConstructor(target);
-		const proto = constructor.prototype;
 		const propKeyStr = propKey;
-		const ctorCache = this._readCache?.get(constructor);
-		if (ctorCache?.has(propKeyStr)) return ctorCache.get(propKeyStr);
+		const ctorCacheRoot = this._readCache;
+		if (ctorCacheRoot !== void 0 && typeof target === "function") {
+			const hit = readCached(ctorCacheRoot.get(target), propKeyStr);
+			if (hit !== MISS) return hit;
+		}
+		const isConstr = isConstructor(target);
+		const constructor = isConstr ? target : getConstructor(target);
+		if (!isConstr) {
+			const hit = readCached(ctorCacheRoot?.get(constructor) ?? this._readCacheNonCtor?.get(constructor), propKeyStr);
+			if (hit !== MISS) return hit;
+		}
+		const proto = constructor.prototype;
 		let ownMeta = Reflect.getOwnMetadata(this.workspace, typeof propKey === "string" ? proto : constructor, propKey);
 		if (ownMeta && propKey === void 0 && ownMeta.params === void 0) {
 			const parent = Object.getPrototypeOf(constructor);
@@ -190,7 +201,7 @@ var Mate = class {
 				}
 			}
 		}
-		const cache = this._readCache ??= /* @__PURE__ */ new WeakMap();
+		const cache = isConstr || typeof constructor !== "function" || isConstructor(constructor) ? this._readCache ??= /* @__PURE__ */ new WeakMap() : this._readCacheNonCtor ??= /* @__PURE__ */ new WeakMap();
 		let tc = cache.get(constructor);
 		if (!tc) {
 			tc = /* @__PURE__ */ new Map();
@@ -227,6 +238,12 @@ var Mate = class {
 	}
 };
 const fnProto = Object.getPrototypeOf(Function);
+const MISS = Symbol("mate.read.miss");
+function readCached(tc, propKey) {
+	if (tc === void 0) return MISS;
+	const v = tc.get(propKey);
+	return v !== void 0 || tc.has(propKey) ? v : MISS;
+}
 
 //#endregion
 //#region src/index.ts

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@prostojs/mate",
-    "version": "0.5.0",
+    "version": "0.5.1",
     "description": "MATE is TS Metadata Organizer",
     "keywords": [
         "decorators",