@weborigami/language 0.0.39 → 0.0.40

package/src/runtime/FileLoadersTransform.js

@@ -32,7 +32,7 @@ export default function FileLoadersTransform(Base) {
             value = new String(input);
             const parent = this;
             value.parent = parent;
-            value.unpack = () => unpackFn(input, { key, parent });
+            value.unpack = unpackFn.bind(null, input, { key, parent });
           }
         }
       }

package/src/runtime/concatTreeValues.js

@@ -1,4 +1,8 @@
-import { Tree, getRealmObjectPrototype } from "@weborigami/async-tree";
+import {
+  Tree,
+  getRealmObjectPrototype,
+  isPlainObject,
+} from "@weborigami/async-tree";
 
 /**
  * Concatenate the text values in a tree.
@@ -24,7 +28,16 @@ async function getText(value, scope) {
     value = await value.call(scope);
   }
 
-  if (Tree.isTreelike(value)) {
+  // We'd prefer to use Tree.isTreelike() here, but that counts an object with
+  // an unpack() function as a treelike object. In this case, we don't want to
+  // unpack anything that's not already treelike.
+  const isTreelike =
+    Tree.isAsyncTree(value) ||
+    value instanceof Function ||
+    value instanceof Array ||
+    value instanceof Set ||
+    isPlainObject(value);
+  if (isTreelike) {
     // The mapReduce operation above only implicit casts its top-level input to
     // a tree. If we're asked for the text of a treelike value, we need to
     // explicitly recurse.

package/src/runtime/ops.js

@@ -189,7 +189,9 @@ export async function tree(...entries) {
     return [key, value];
   });
   const object = Object.fromEntries(fns);
-  return new OrigamiTree(object);
+  const result = new OrigamiTree(object);
+  result.scope = new Scope(result, this);
+  return result;
 }
 tree.toString = () => "«ops.tree»";
 

package/test/runtime/InheritScopeMixin.test.js

@@ -1,4 +1,4 @@
-import { ObjectTree } from "@weborigami/async-tree";
+import { DeepObjectTree, ObjectTree } from "@weborigami/async-tree";
 import assert from "node:assert";
 import { describe, test } from "node:test";
 import InheritScopeMixin from "../../src/runtime/InheritScopeMixin.js";
@@ -16,7 +16,7 @@ describe("InheritScopeMixin", () => {
   });
 
   test("adds a subtree's parent to the subtrees's scope", async () => {
-    const fixture = new (InheritScopeMixin(ObjectTree))({
+    const fixture = new (InheritScopeMixin(DeepObjectTree))({
       a: 1,
       subtree: {
         b: 2,