utilium 2.8.3 → 2.8.5

package/dist/misc.d.ts

@@ -9,13 +9,11 @@ export declare function canary(error?: Error): () => void;
  * @see https://github.com/tc39/proposal-throw-expressions
  */
 export declare function _throw(e: unknown): never;
-interface MemoizeMetadata extends DecoratorMetadata {
-    memoized?: Record<PropertyKey, any>;
-}
-/**
- * Decorator for memoizing the result of a getter.
- */
-export declare function memoize<T, This>(get: () => T, context: ClassGetterDecoratorContext<This, T> & {
-    metadata?: MemoizeMetadata;
-}): (this: This) => T;
-export {};
+export declare function memoize<T, This extends object>(get: () => T, context: ClassGetterDecoratorContext<This, T>): () => T;
+export declare function memoize<T, This extends object>(value: {
+    get(): T;
+    set(value: T): void;
+}, context: ClassGetterDecoratorContext<This, T>): {
+    get(): T;
+    set(value: T): void;
+};

package/dist/misc.js

@@ -51,20 +51,21 @@ export function _throw(e) {
         Error?.captureStackTrace(e, _throw);
     throw e;
 }
-/**
- * Decorator for memoizing the result of a getter.
- */
-export function memoize(get, context) {
-    if (context.kind != 'getter')
-        throw new Error('@memoize can only be used on getters');
-    return function () {
-        context.metadata ??= {};
-        const { memoized = {} } = context.metadata;
-        if (context.name in memoized) {
-            console.log('Using cached value for', context.name, JSON.stringify(memoized[context.name]));
-            return memoized[context.name];
-        }
-        memoized[context.name] = get.call(this);
-        return memoized[context.name];
-    };
+export function memoize(value, context) {
+    if (!['getter', 'accessor'].includes(context.kind))
+        throw new Error('@memoize can only be used on getters and auto-accessors');
+    const cache = new WeakMap();
+    function get() {
+        if (cache.has(this))
+            return cache.get(this);
+        const result = context.access.get(this);
+        cache.set(this, result);
+        return result;
+    }
+    switch (context.kind) {
+        case 'getter':
+            return get;
+        case 'accessor':
+            return { ...value, get };
+    }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "utilium",
-	"version": "2.8.3",
+	"version": "2.8.5",
 	"description": "Typescript utilities",
 	"funding": {
 		"type": "individual",