@weborigami/language 0.6.17 → 0.7.0-beta.2

package/test/runtime/systemCache.test.js

@@ -0,0 +1,66 @@
+/**
+ * Integration tests of several forms of caching using the system cache
+ */
+
+import { SyncMap, Tree } from "@weborigami/async-tree";
+import assert from "node:assert";
+import { describe, test } from "node:test";
+import * as handlers from "../../src/handlers/handlers.js";
+import HandleExtensionsTransform from "../../src/runtime/HandleExtensionsTransform.js";
+import SyncCacheTransform from "../../src/runtime/SyncCacheTransform.js";
+import { cachePathSymbol } from "../../src/runtime/symbols.js";
+
+describe("systemCache", () => {
+  test("property based on external scope recalculates when scope changes", async () => {
+    // Virtual src folder
+    const src = new OrigamiSyncMap([
+      [
+        "site.ori",
+        `
+        {
+          value = data.json/
+        }
+      `,
+      ],
+    ]);
+
+    // Virtual project root folder
+    const project = new OrigamiSyncMap([
+      ["data.json", "1"],
+      ["src", src],
+    ]);
+
+    // Make src a child of the project root
+    src.parent = project;
+
+    // Paths are optional but make cache keys more meaningful
+    src[cachePathSymbol] = "project/src";
+    project[cachePathSymbol] = "project";
+
+    // Add handlers so we can unpack values
+    // @ts-ignore
+    project.globals = handlers;
+
+    const site = await Tree.traverseOrThrow(project, "src/", "site.ori/");
+
+    const value1 = await site.value;
+    assert.equal(value1, 1);
+
+    // Add new data.json to src folder, overriding the one in project root
+    src.set("data.json", "2");
+
+    const value2 = await site.value;
+    assert.equal(value2, 2);
+
+    // Delete data.json from src folder, reverting to the one in project root
+    src.delete("data.json");
+
+    const value3 = await site.value;
+    assert.equal(value3, 1);
+  });
+});
+
+// Like OrigamiFileMap, but in memory
+class OrigamiSyncMap extends SyncCacheTransform(
+  HandleExtensionsTransform(SyncMap),
+) {}

package/src/runtime/assignPropertyDescriptors.js

@@ -1,23 +0,0 @@
-/**
- * This is an analogue of Object.assign that destructively copies properties to
- * a target object -- but avoids invoking property getters. Instead, it copies
- * property descriptors over to the target object.
- *
- * @param {any} target
- * @param  {...any} sources
- */
-export default function assignPropertyDescriptors(target, ...sources) {
-  for (const source of sources) {
-    const descriptors = Object.getOwnPropertyDescriptors(source);
-    for (const [key, descriptor] of Object.entries(descriptors)) {
-      if (descriptor.value !== undefined) {
-        // Simple value, copy it
-        target[key] = descriptor.value;
-      } else {
-        // Getter and/or setter, copy the descriptor
-        Object.defineProperty(target, key, descriptor);
-      }
-    }
-  }
-  return target;
-}

package/src/runtime/asyncStorage.js

@@ -1,7 +0,0 @@
-import { AsyncLocalStorage } from "node:async_hooks";
-
-/**
- * Storage maintained by the execute() function and accessible to async
- * functions called during evaluation.
- */
-export default new AsyncLocalStorage();