@weborigami/origami 0.0.47 → 0.0.48

package/exports/exports.js

@@ -76,6 +76,7 @@ export { default as sort } from "../src/builtins/@sort.js";
 export { default as sortBy } from "../src/builtins/@sortBy.js";
 export { default as static } from "../src/builtins/@static.js";
 export { default as stdin } from "../src/builtins/@stdin.js";
+export { default as string } from "../src/builtins/@string.js";
 export { default as svg } from "../src/builtins/@svg.js";
 export { default as table } from "../src/builtins/@table.js";
 export { default as take } from "../src/builtins/@take.js";

package/package.json

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

package/src/builtins/@merge.js

@@ -1,4 +1,4 @@
-import { merge } from "@weborigami/async-tree";
+import { isPlainObject, isUnpackable, merge } from "@weborigami/async-tree";
 import { Scope } from "@weborigami/language";
 import assertScopeIsDefined from "../misc/assertScopeIsDefined.js";
 
@@ -24,10 +24,22 @@ export default async function treeMerge(...trees) {
     return filtered[0];
   }
 
+  // Unpack any packed objects.
+  const unpacked = await Promise.all(
+    filtered.map((obj) =>
+      isUnpackable(obj) ? /** @type {any} */ (obj).unpack() : obj
+    )
+  );
+
+  // If all trees are plain objects, return a plain object.
+  if (unpacked.every((tree) => isPlainObject(tree))) {
+    return Object.assign({}, ...unpacked);
+  }
+
   // If a tree can take a scope, give it one that includes the other trees and
   // the current scope.
-  const scopedTrees = filtered.map((tree) => {
-    const otherTrees = filtered.filter((g) => g !== tree);
+  const scopedTrees = unpacked.map((tree) => {
+    const otherTrees = unpacked.filter((g) => g !== tree);
     const scope = new Scope(...otherTrees, this);
     // Each tree will be included first in its own scope.
     return Scope.treeWithScope(tree, scope);

package/src/builtins/@string.js

@@ -0,0 +1,14 @@
+import { toString } from "../common/utilities.js";
+import assertScopeIsDefined from "../misc/assertScopeIsDefined.js";
+
+/**
+ * Convert an object to a string.
+ *
+ * @typedef {import("@weborigami/types").AsyncTree} AsyncTree
+ * @this {AsyncTree|null}
+ * @param {any} object
+ */
+export default function stringBuiltin(object) {
+  assertScopeIsDefined(this, "string");
+  return toString(object);
+}

package/src/builtins/@unpack.js

@@ -1,11 +1,12 @@
 import assertScopeIsDefined from "../misc/assertScopeIsDefined.js";
 
 /**
- * @typedef {import("@weborigami/types").AsyncTree} AsyncTree
+ * Unpack a packed format like a Buffer or ArrayBuffer to a usable form like
+ * text or a plain JavaScript object.
  *
+ * @typedef {import("@weborigami/types").AsyncTree} AsyncTree
  * @this {AsyncTree|null}
  * @param {any} obj
- * @returns
  */
 export default function unpack(obj) {
   assertScopeIsDefined(this, "unpack");

package/src/builtins/txt_handler.js

@@ -54,7 +54,7 @@ export default {
   async unpack(packed, options = {}) {
     const parent = options.parent ?? null;
     const text = utilities.toString(packed);
-    if (!text) {
+    if (text === null) {
       throw new Error("Tried to treat something as text but it wasn't text.");
     }