@weborigami/origami 0.0.50 → 0.0.51

package/exports/exports.js

@@ -10,7 +10,6 @@ export { default as concat } from "../src/builtins/@concat.js";
 export { default as config } from "../src/builtins/@config.js";
 export { default as constructor } from "../src/builtins/@constructor.js";
 export { default as copy } from "../src/builtins/@copy.js";
-export { default as count } from "../src/builtins/@count.js";
 export { default as crawl } from "../src/builtins/@crawl.js";
 export { default as debug } from "../src/builtins/@debug.js";
 export { default as deepMap } from "../src/builtins/@deepMap.js";
@@ -50,6 +49,7 @@ export { default as json } from "../src/builtins/@json.js";
 export { default as jsonParse } from "../src/builtins/@jsonParse.js";
 export { default as keys } from "../src/builtins/@keys.js";
 export { default as keysJson } from "../src/builtins/@keysJson.js";
+export { default as length } from "../src/builtins/@length.js";
 export { default as map } from "../src/builtins/@map.js";
 export { default as mapFn } from "../src/builtins/@mapFn.js";
 export { default as match } from "../src/builtins/@match.js";
@@ -73,8 +73,8 @@ export { default as perf } from "../src/builtins/@perf.js";
 export { default as plain } from "../src/builtins/@plain.js";
 export { default as project } from "../src/builtins/@project.js";
 export { default as redirect } from "../src/builtins/@redirect.js";
-export { default as regexParse } from "../src/builtins/@regexParse.js";
-export { default as regexParseFn } from "../src/builtins/@regexParseFn.js";
+export { default as regexMatch } from "../src/builtins/@regexMatch.js";
+export { default as regexMatchFn } from "../src/builtins/@regexMatchFn.js";
 export { default as repeat } from "../src/builtins/@repeat.js";
 export { default as reverse } from "../src/builtins/@reverse.js";
 export { default as rss } from "../src/builtins/@rss.js";

package/package.json

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

package/src/builtins/@groupFn.js

@@ -15,9 +15,13 @@ import assertScopeIsDefined from "../misc/assertScopeIsDefined.js";
 export default function groupFnBuiltin(groupKey) {
   assertScopeIsDefined(this);
   const scope = this;
+
   const groupKeyFn = toFunction(groupKey);
+  // Have the group key function run in this scope.
+  const extendedGroupKeyFn = groupKeyFn.bind(scope);
+
   // @ts-ignore
-  const fn = groupFn(groupKeyFn);
+  const fn = groupFn(extendedGroupKeyFn);
   return async (treelike) => {
     const grouped = await fn(treelike);
     const scoped = Scope.treeWithScope(grouped, scope);

package/src/builtins/{@count.js → @length.js}

@@ -8,11 +8,8 @@ import getTreeArgument from "../misc/getTreeArgument.js";
  * @this {AsyncTree|null}
  * @param {Treelike} [treelike]
  */
-export default async function count(treelike) {
-  const tree = await getTreeArgument(this, arguments, treelike, "@count");
+export default async function length(treelike) {
+  const tree = await getTreeArgument(this, arguments, treelike, "@length");
   const keys = Array.from(await tree.keys());
   return keys.length;
 }
-
-count.usage = `@count <treelike>\tReturn the number of keys in the tree`;
-count.documentation = "https://weborigami.org/cli/@tree.html#count";

package/src/builtins/@mapFn.js

@@ -33,6 +33,9 @@ export default function mapFnBuiltin(operation) {
   if (isPlainObject(operation)) {
     // @ts-ignore
     options = operation;
+    if (`value` in options && !options.value) {
+      throw new TypeError(`@mapFn: The value function is not defined.`);
+    }
     valueFn = options?.value;
   } else if (
     typeof operation === "function" ||
@@ -57,15 +60,14 @@ export default function mapFnBuiltin(operation) {
     );
   }
 
-  // Extend the value function to include the value and key in scope.
   let extendedValueFn;
   if (valueFn) {
     const resolvedValueFn = toFunction(valueFn);
-    extendedValueFn = (sourceValue, sourceKey, tree) =>
-      resolvedValueFn.call(scope, sourceValue, sourceKey, tree);
+    // Have the value function run in this scope.
+    extendedValueFn = resolvedValueFn.bind(scope);
   }
 
-  // Extend the key function to include the value and key in scope.
+  // Extend the value function to run in scope.
   let extendedKeyFn;
   let extendedInverseKeyFn;
   if (extension) {

package/src/builtins/@merge.js

@@ -33,7 +33,7 @@ export default async function treeMerge(...trees) {
 
   // If all trees are plain objects, return a plain object.
   if (unpacked.every((tree) => isPlainObject(tree))) {
-    return Object.assign({}, ...unpacked);
+    return mergeObjects(...unpacked);
   }
 
   // If a tree can take a scope, give it one that includes the other trees and
@@ -55,5 +55,25 @@ export default async function treeMerge(...trees) {
   return result;
 }
 
+/**
+ * Merge the indicated plain objects. If a key is present in multiple objects,
+ * the value from the first object is used.
+ *
+ * This is similar to calling Object.assign() with the objects in reverse order,
+ * but we want to ensure the keys end up in the same order they're encountered
+ * in the objects.
+ *
+ * @param  {...any} objects
+ */
+function mergeObjects(...objects) {
+  const result = {};
+  for (const obj of objects) {
+    for (const key of Object.keys(obj)) {
+      result[key] ??= obj[key];
+    }
+  }
+  return result;
+}
+
 treeMerge.usage = `@merge <...trees>\tMerge the given trees`;
 treeMerge.documentation = "https://weborigami.org/cli/builtins.html#@merge";

package/src/builtins/@regexMatch.js

@@ -0,0 +1,5 @@
+import regexMatchFn from "./@regexMatchFn.js";
+
+export default function regexMatch(text, regex) {
+  return regexMatchFn(regex)(text);
+}

package/src/misc/treeDot.js

@@ -78,10 +78,10 @@ async function statements(tree, nodePath, nodeLabel, options) {
     } else {
       const label = isStringLike(value)
         ? String(value)
-        : value != null
+        : value !== undefined
         ? await serialize.toYaml(value)
         : "";
-      if (value == null) {
+      if (value === undefined) {
         isError = true;
       }
       nodes[key] = { label };

package/src/builtins/@regexParse.js

@@ -1,5 +0,0 @@
-import regexParser from "./@regexParseFn.js";
-
-export default function regexParse(text, regex) {
-  return regexParser(regex)(text);
-}