@weborigami/origami 0.2.3 → 0.2.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@weborigami/origami",
-  "version": "0.2.3",
+  "version": "0.2.4",
   "description": "Web Origami language, CLI, framework, and server",
   "type": "module",
   "repository": {
@@ -17,9 +17,9 @@
     "typescript": "5.7.2"
   },
   "dependencies": {
-    "@weborigami/async-tree": "0.2.3",
-    "@weborigami/language": "0.2.3",
-    "@weborigami/types": "0.2.3",
+    "@weborigami/async-tree": "0.2.4",
+    "@weborigami/language": "0.2.4",
+    "@weborigami/types": "0.2.4",
     "exif-parser": "0.1.12",
     "graphviz-wasm": "3.0.2",
     "highlight.js": "11.11.0",

package/src/origami/once.js

@@ -1,6 +1,7 @@
 import assertTreeIsDefined from "../common/assertTreeIsDefined.js";
 
-const fnPromiseMap = new WeakMap();
+const fnPromiseMap = new Map();
+const codePromiseMap = new Map();
 
 /**
  * Evaluate the given function only once and cache the result.
@@ -11,8 +12,23 @@ const fnPromiseMap = new WeakMap();
  */
 export default async function once(fn) {
   assertTreeIsDefined(this, "origami:once");
+
+  const code = /** @type {any} */ (fn).code;
+  if (code) {
+    // Origami function, cache by code
+    if (!codePromiseMap.has(code)) {
+      // Don't wait for promise to resolve
+      const promise = fn.call(this);
+      codePromiseMap.set(code, promise);
+    }
+    return codePromiseMap.get(code);
+  }
+
+  // Regular function, cache by function
   if (!fnPromiseMap.has(fn)) {
-    fnPromiseMap.set(fn, fn.call(this));
+    // Don't wait for promise to resolve
+    const promise = fn.call(this);
+    fnPromiseMap.set(fn, promise);
   }
   return fnPromiseMap.get(fn);
 }