Add memoization to Cache

.changeset/large-moons-nail.md

@@ -0,0 +1,7 @@
+---
+"@siteimprove/alfa-cache": minor
+---
+
+**Added:** A `Cache.memoize` decorator is now available.
+
+It can decorate methods, or wrap functions, whose parameters are all objects. It will automatically create a cache with the various parameters and correctly call it.

docs/review/api/alfa-cache.api.md

@@ -8,26 +8,21 @@ import { Iterable as Iterable_2 } from '@siteimprove/alfa-iterable';
 import type { Mapper } from '@siteimprove/alfa-mapper';
 import { Option } from '@siteimprove/alfa-option';
 
-// @public (undocumented)
-export class Cache<K extends object, V> {
-    // (undocumented)
-    static empty<K extends object, V>(): Cache<K, V>;
-    // (undocumented)
+// @public
+export class Cache<K extends Cache.Key, V> {
+    static empty<K extends Cache.Key, V>(): Cache<K, V>;
     get(key: K): Option<V>;
-    // (undocumented)
     get<U extends V = V>(key: K, ifMissing: Mapper<this, U>): V;
-    // (undocumented)
     has(key: K): boolean;
-    // (undocumented)
     merge(iterable: Iterable_2<readonly [K, V]>): this;
-    // (undocumented)
     set(key: K, value: V): this;
 }
 
 // @public (undocumented)
 export namespace Cache {
-    // (undocumented)
-    export function from<K extends object, V>(iterable: Iterable_2<readonly [K, V]>): Cache<K, V>;
+    export function from<K extends Key, V>(iterable: Iterable_2<readonly [K, V]>): Cache<K, V>;
+    export type Key = object;
+    export function memoize<This, Args extends Array<Key>, Return>(target: (this: This, ...args: Args) => Return): (this: This, ...args: Args) => Return;
 }
 
 // (No @packageDocumentation comment for this package)

packages/alfa-aria/src/dom/predicate/is-programmatically-hidden.ts

@@ -7,7 +7,7 @@ import { Context } from "@siteimprove/alfa-selector";
 import { Style } from "@siteimprove/alfa-style";
 
 const { hasAttribute, isElement } = Element;
-const { or, test, equals } = Predicate;
+const { or, equals } = Predicate;
 const { and } = Refinement;
 const { hasComputedStyle } = Style;
 
@@ -34,39 +34,32 @@ export function isProgrammaticallyHidden(
   );
 }
 
-const cache = Cache.empty<Device, Cache<Context, Cache<Node, boolean>>>();
-
-function hasHiddenAncestors(
+function _hasHiddenAncestors(
   device: Device,
-  context: Context = Context.empty(),
+  context: Context,
 ): Predicate<Node> {
-  return (node) =>
-    cache
-      .get(device, Cache.empty)
-      .get(context, Cache.empty)
-      .get(node, () =>
-        test(
-          or(
-            // Either it is a programmatically hidden element
-            and(
-              isElement,
-              or(
-                hasComputedStyle(
-                  "display",
-                  ({ values: [outside] }) => outside.value === "none",
-                  device,
-                  context,
-                ),
-                hasAttribute("aria-hidden", equals("true")),
-              ),
-            ),
-            // Or its parent is programmatically hidden
-            (node: Node) =>
-              node
-                .parent(Node.fullTree)
-                .some(hasHiddenAncestors(device, context)),
-          ),
-          node,
+  return or(
+    // Either it is a programmatically hidden element
+    and(
+      isElement,
+      or(
+        hasComputedStyle(
+          "display",
+          ({ values: [outside] }) => outside.value === "none",
+          device,
+          context,
         ),
-      );
+        hasAttribute("aria-hidden", equals("true")),
+      ),
+    ),
+    // Or its parent is programmatically hidden
+    (node: Node) =>
+      node.parent(Node.fullTree).some(_hasHiddenAncestors(device, context)),
+  );
 }
+
+const hasHiddenAncestors = Cache.memoize<
+  unknown,
+  [Device, Context],
+  Predicate<Node>
+>(_hasHiddenAncestors);

packages/alfa-cache/src/cache.ts

@@ -3,19 +3,48 @@ import { Option, None } from "@siteimprove/alfa-option";
 import type { Mapper } from "@siteimprove/alfa-mapper";
 
 /**
+ * Caches are wrapper around Javascript's `WeakMap` to store transient values.
+ *
+ * @remarks
+ * Caches are mutable! To preserve referential transparency, the preferred way
+ * of using caches is to store them as a local variable (never send them as
+ * parameters); and to use a single `cache.get(key, () => …)` call to retrieve
+ * values from it. Ideally, use `Cache.memoize()` to create a memoized function.
+ *
+ * Since Caches are built on WeakMap, the keys must be objects.
+ *
+ * Since Caches are built on WeakMap, they do not prevent the garbage collection
+ * of keys, and the associated value is then freed too. This avoids memory leaks,
+ * and ensure a lightweight caching mechanism for objects that stay in memory for
+ * some time.
+ *
+ * Typical use of Caches is to store indirect values related to a DOM tree (e.g.,
+ * the associated ARIA tree, …) Once the audit is done and the DOM tree is
+ * discarded, the cache is automatically freed.
+ *
  * @public
  */
-export class Cache<K extends object, V> {
-  public static empty<K extends object, V>(): Cache<K, V> {
+export class Cache<K extends Cache.Key, V> {
+  /**
+   * Creates an empty cache.
+   */
+  public static empty<K extends Cache.Key, V>(): Cache<K, V> {
     return new Cache();
   }
 
   private readonly _storage = new WeakMap<K, V>();
 
   private constructor() {}
 
+  /**
+   * Returns the value (if it exists) associated with the given key.
+   */
   public get(key: K): Option<V>;
 
+  /**
+   * Returns the value associated with the given key; if it does not exist,
+   * evaluates `ifMissing`, store the result in the cache and returns it.
+   */
   public get<U extends V = V>(key: K, ifMissing: Mapper<this, U>): V;
 
   public get<U extends V = V>(
@@ -43,15 +72,27 @@ export class Cache<K extends object, V> {
     return value;
   }
 
+  /**
+   * Tests whether a given key exists in the cache.
+   */
   public has(key: K): boolean {
     return this._storage.has(key);
   }
 
+  /**
+   * Adds a key-value pair to a cache.
+   *
+   * @remarks
+   * Avoid using this. Prefer using the `ifMissing` parameter of `get()` instead.
+   */
   public set(key: K, value: V): this {
     this._storage.set(key, value);
     return this;
   }
 
+  /**
+   * Merges a cache with an iterable of key-value pairs.
+   */
   public merge(iterable: Iterable<readonly [K, V]>): this {
     return Iterable.reduce(
       iterable,
@@ -65,9 +106,96 @@ export class Cache<K extends object, V> {
  * @public
  */
 export namespace Cache {
-  export function from<K extends object, V>(
+  /**
+   * Allowed keys in a Cache.
+   */
+  export type Key = object;
+
+  /**
+   * Create a new cache from an iterable of key-value pairs.
+   */
+  export function from<K extends Key, V>(
     iterable: Iterable<readonly [K, V]>,
   ): Cache<K, V> {
     return Cache.empty<K, V>().merge(iterable);
   }
+
+  /**
+   * Turns `<[A, B, C], T>` into `Cache<A, Cache<B, Cache<C, T>>>`.
+   */
+  type ToCache<Args extends Array<Key>, T> = Args extends [
+    infer Head extends Key,
+    ...infer Tail extends Array<Key>,
+  ]
+    ? Cache<Head, ToCache<Tail, T>>
+    : T;
+
+  /**
+   * Memoize a function or method.
+   */
+  export function memoize<This, Args extends Array<Key>, Return>(
+    // When called on an instance's method `target`, `this` is the instance.
+    target: (this: This, ...args: Args) => Return,
+  ): (this: This, ...args: Args) => Return {
+    // First, we create the cache.
+    const cache = Cache.empty() as ToCache<Args, Return>;
+
+    // Next, we create the memoized function. Since the cache is scoped to the
+    // decorator, it cannot be accessed from outside and won't be tampered with.
+    return function (this: This, ...args: Args) {
+      // Here, `this` is still the instance on which the (new) method is added.
+      // We need to save it for later.
+      const that = this;
+
+      // We create a recursive memoized function that will traverse the cache,
+      // parameter by parameter. It needs to be passed a (partial) cache
+      // together with the remaining parameters.
+      // This is OK since the side-effect happens only to the previously defined
+      // scoped cache.
+      function memoized<A extends Array<Key>>(
+        cache: ToCache<A, Return>,
+        ...innerArgs: A
+      ): Return {
+        // From now on, `this` is the `memoized` function itself, hence the need
+        // for an earlier copy.
+
+        if (innerArgs.length === 0) {
+          // We have reached the end of the parameters, always hitting the cache,
+          // thus `ToCache<A, Return>` is `Return`, and `cache` is the actual
+          // return value that was `.get()` in the previous call.
+
+          // Typescript is completely lost here. It cannot make the connection
+          // between `innerArgs` being of length 0, and `A` being `[]`; thus is
+          // unable to correctly infer that `ToCache<A, Return>` is `Return`.
+          return cache as Return;
+        }
+
+        // There are still parameters to handle, deconstruct them.
+        const [head, ...tail] = innerArgs;
+
+        // On that bit, TS is so lost that we just disable it…
+        // @ts-ignore
+
+        // Compute the next cache to use, by retrieving the values associated
+        // with `head`. This will be either the final value (if `head` is the las
+        // parameter), or a further cache.
+        const next = cache.get(
+          head,
+          // @ts-ignore
+          // If there are no more parameters, we need to call the original function.
+          // In case of method, we need to re-bind it to the original instance.
+          // (we could directly return the result in that case, but since we need
+          // to test `innerArgs.length === 0` anyway, we let that handle it)
+          //
+          // If there are more parameters, we just create an empty cache.
+          tail.length === 0 ? () => target.bind(that)(...args) : Cache.empty,
+        );
+
+        // Recurse with the next cache and the remaining parameters.
+        return memoized(next, ...tail);
+      }
+
+      return memoized(cache, ...args);
+    };
+  }
 }