@weborigami/language 0.6.12 → 0.6.13

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@weborigami/language",
-  "version": "0.6.12",
+  "version": "0.6.13",
   "description": "Web Origami expression language compiler and runtime",
   "type": "module",
   "main": "./main.js",
@@ -11,7 +11,7 @@
     "typescript": "5.9.3"
   },
   "dependencies": {
-    "@weborigami/async-tree": "0.6.12",
+    "@weborigami/async-tree": "0.6.13",
     "exif-parser": "0.1.12",
     "watcher": "2.3.1",
     "yaml": "2.8.2"

package/src/compiler/parserHelpers.js

@@ -316,21 +316,21 @@ export function makeLambda(params, body, location) {
  *
  *      {
  *        x = { a: 1 }
- *        ...x
- *        y = x
+ *        ...y
+ *        z = { b: 2}
  *      }
  *
  *  will be treated as:
  *
  *      {
  *        x = { a: 1 }
- *        y = x
- *        _result: {
- *          x
- *          ...x
+ *        z = { b: 2}
+ *        _result: ops.merge(
+ *          { x }
  *          y
- *        }
- *      }.result
+ *          { z }
+ *        )
+ *      }._result
  *
  * @param {*} spreads
  * @param {CodeLocation} location
@@ -338,6 +338,7 @@ export function makeLambda(params, body, location) {
 function makeMerge(spreads, location) {
   const topEntries = [];
   const resultEntries = [];
+
   for (const spread of spreads) {
     if (spread[0] === ops.object) {
       topEntries.push(...spread.slice(1));

package/src/runtime/ops.js

@@ -173,23 +173,12 @@ export function exponentiation(a, b) {
 addOpLabel(exponentiation, "«ops.exponentiation»");
 
 /**
- * Flatten the values of the given trees
+ * Flatten the values of the given trees to a depth of 1
  *
  * @param {...any} args
  */
 export async function flat(...args) {
-  const arrays = await Promise.all(
-    args.map(async (arg) => {
-      if (isUnpackable(arg)) {
-        arg = await arg.unpack();
-      }
-      return arg instanceof Array || typeof arg !== "object"
-        ? arg
-        : await Tree.values(arg);
-    }),
-  );
-
-  return arrays.flat();
+  return Tree.flat(args, 2); // add 1 to account for the array of arguments
 }
 addOpLabel(flat, "«ops.flat»");