@weborigami/language 0.0.65-beta.2 → 0.0.66-beta.1

package/src/runtime/expressionFunction.js

@@ -5,20 +5,19 @@ import { evaluate } from "./internal.js";
 /**
  * Given parsed Origami code, return a function that executes that code.
  *
- * @param {import("../../index.js").ParseResult} parsed - parsed Origami expression
+ * @param {import("../../index.js").Code} code - parsed Origami expression
  * @param {string} [name] - optional name of the function
  */
-export function createExpressionFunction(parsed, name) {
+export function createExpressionFunction(code, name) {
   /** @this {AsyncTree|null} */
   async function fn() {
-    return evaluate.call(this, parsed);
+    return evaluate.call(this, code);
   }
   if (name) {
     Object.defineProperty(fn, "name", { value: name });
   }
-  fn.code = parsed;
-  fn.toString = () =>
-    parsed instanceof Array ? parsed.location.source.text : parsed;
+  fn.code = code;
+  fn.toString = () => code.location.source.text;
   return fn;
 }
 

package/src/runtime/formatError.js

@@ -1,4 +1,7 @@
 // Text we look for in an error stack to guess whether a given line represents a
+
+import codeFragment from "./codeFragment.js";
+
 // function in the Origami source code.
 const origamiSourceSignals = [
   "async-tree/src/",
@@ -35,12 +38,9 @@ export default function formatError(error) {
   // Add location
   let location = /** @type {any} */ (error).location;
   if (location) {
-    let { source, start, end } = location;
-    let fragment = source.text.slice(start.offset, end.offset);
-    if (fragment.length === 0) {
-      // Use entire source.
-      fragment = source.text;
-    }
+    const fragment = codeFragment(location);
+    let { source, start } = location;
+
     message += `\nevaluating: ${fragment}`;
     if (typeof source === "object" && source.url) {
       message += `\n    at ${source.url.href}:${start.line}:${start.column}`;

package/src/runtime/ops.js

@@ -222,7 +222,7 @@ export function lambda(parameters, code) {
   // We set the `length` property on the function so that Tree.traverseOrThrow()
   // will correctly identify how many parameters it wants. This is unorthodox
   // but doesn't appear to affect other behavior.
-  const fnLength = Object.keys(parameters).length;
+  const fnLength = parameters.length;
   Object.defineProperty(invoke, "length", {
     value: fnLength,
   });
@@ -282,6 +282,14 @@ export function spread(...args) {
 }
 spread.toString = () => "«ops.spread»";
 
+/**
+ * Return a primitive value
+ */
+export async function primitive(value) {
+  return value;
+}
+primitive.toString = () => "«ops.primitive»";
+
 /**
  * Traverse a path of keys through a tree.
  */