@weborigami/language 0.2.1 → 0.2.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@weborigami/language",
-  "version": "0.2.1",
+  "version": "0.2.2",
   "description": "Web Origami expression language compiler and runtime",
   "type": "module",
   "main": "./main.js",
@@ -12,8 +12,8 @@
     "yaml": "2.5.1"
   },
   "dependencies": {
-    "@weborigami/async-tree": "0.2.1",
-    "@weborigami/types": "0.2.1",
+    "@weborigami/async-tree": "0.2.2",
+    "@weborigami/types": "0.2.2",
     "watcher": "2.3.1"
   },
   "scripts": {

package/src/compiler/origami.pegjs

@@ -61,7 +61,7 @@ arrayEntries
     }
 
 arrayEntry
-  = spread
+  = spreadElement
   / pipelineExpression
   // JavaScript treats a missing value as `undefined`
   / __ !"]" {
@@ -113,7 +113,7 @@ callExpression "function call"
 closingBrace
   = "}"
   / .? {
-      error("Expected right curly brace");
+      error(`An object ended without a closing brace, or contained something that wasn't expected.\nThe top level of an object can only contain definitions ("a: b" or "a = b") or spreads ("...a").`);
     }
 
 // Required closing bracket
@@ -147,18 +147,20 @@ comment "comment"
   / singleLineComment
 
 conditionalExpression
-  = condition:logicalOrExpression __
-    "?" __ truthy:pipelineExpression __
-    ":" __ falsy:pipelineExpression
+  = condition:logicalOrExpression tail:(__
+    "?" __ @pipelineExpression __
+    ":" __ @pipelineExpression)?
     {
+      if (!tail) {
+        return condition;
+      }
       return annotate([
         ops.conditional,
         downgradeReference(condition),
-        [ops.lambda, [], downgradeReference(truthy)],
-        [ops.lambda, [], downgradeReference(falsy)]
+        [ops.lambda, [], downgradeReference(tail[0])],
+        [ops.lambda, [], downgradeReference(tail[1])]
       ], location());
     }
-  / logicalOrExpression
   
 digits
   = @[0-9]+
@@ -197,10 +199,9 @@ escapedChar "backslash-escaped character"
   / "\\" @.
 
 exponentiationExpression
-  = left:unaryExpression __ "**" __ right:exponentiationExpression {
-      return annotate([ops.exponentiation, left, right], location());
+  = left:unaryExpression right:(__ "**" __ @exponentiationExpression)? {
+      return right ? annotate([ops.exponentiation, left, right], location()) : left;
     }
-  / unaryExpression
 
 // A top-level expression, possibly with leading/trailing whitespace
 expression
@@ -358,7 +359,7 @@ objectEntries
     }
 
 objectEntry
-  = spread
+  = spreadElement
   / objectProperty
   / objectGetter
   / objectShorthandProperty
@@ -557,8 +558,8 @@ singleQuoteString "single quote string"
 singleQuoteStringChar
   = !("'" / newLine) @textChar
 
-spread
-  = ellipsis __ value:conditionalExpression {
+spreadElement
+  = ellipsis __ value:pipelineExpression {
       return annotate([ops.spread, value], location());
     }
 

package/src/compiler/parse.js

@@ -202,7 +202,7 @@ function peg$parse(input, options) {
   var peg$FAILED = {};
   var peg$source = options.grammarSource;
 
-  var peg$startRuleFunctions = { __: peg$parse__, additiveExpression: peg$parseadditiveExpression, additiveOperator: peg$parseadditiveOperator, arguments: peg$parsearguments, arrayLiteral: peg$parsearrayLiteral, arrayEntries: peg$parsearrayEntries, arrayEntry: peg$parsearrayEntry, arrowFunction: peg$parsearrowFunction, bitwiseAndExpression: peg$parsebitwiseAndExpression, bitwiseAndOperator: peg$parsebitwiseAndOperator, bitwiseOrExpression: peg$parsebitwiseOrExpression, bitwiseOrOperator: peg$parsebitwiseOrOperator, bitwiseXorExpression: peg$parsebitwiseXorExpression, bitwiseXorOperator: peg$parsebitwiseXorOperator, callExpression: peg$parsecallExpression, closingBrace: peg$parseclosingBrace, closingBracket: peg$parseclosingBracket, closingParenthesis: peg$parseclosingParenthesis, commaExpression: peg$parsecommaExpression, comment: peg$parsecomment, conditionalExpression: peg$parseconditionalExpression, digits: peg$parsedigits, doubleArrow: peg$parsedoubleArrow, doubleQuoteString: peg$parsedoubleQuoteString, doubleQuoteStringChar: peg$parsedoubleQuoteStringChar, ellipsis: peg$parseellipsis, equalityExpression: peg$parseequalityExpression, equalityOperator: peg$parseequalityOperator, escapedChar: peg$parseescapedChar, exponentiationExpression: peg$parseexponentiationExpression, expression: peg$parseexpression, floatLiteral: peg$parsefloatLiteral, group: peg$parsegroup, guillemetString: peg$parseguillemetString, guillemetStringChar: peg$parseguillemetStringChar, homeDirectory: peg$parsehomeDirectory, host: peg$parsehost, identifier: peg$parseidentifier, identifierChar: peg$parseidentifierChar, identifierList: peg$parseidentifierList, implicitParenthesesCallExpression: peg$parseimplicitParenthesesCallExpression, implicitParensthesesArguments: peg$parseimplicitParensthesesArguments, inlineSpace: peg$parseinlineSpace, integerLiteral: peg$parseintegerLiteral, list: peg$parselist, literal: peg$parseliteral, logicalAndExpression: peg$parselogicalAndExpression, logicalOrExpression: peg$parselogicalOrExpression, multiLineComment: peg$parsemultiLineComment, multiplicativeExpression: peg$parsemultiplicativeExpression, multiplicativeOperator: peg$parsemultiplicativeOperator, namespace: peg$parsenamespace, newLine: peg$parsenewLine, numericLiteral: peg$parsenumericLiteral, nullishCoalescingExpression: peg$parsenullishCoalescingExpression, objectLiteral: peg$parseobjectLiteral, objectEntries: peg$parseobjectEntries, objectEntry: peg$parseobjectEntry, objectGetter: peg$parseobjectGetter, objectHiddenKey: peg$parseobjectHiddenKey, objectKey: peg$parseobjectKey, objectProperty: peg$parseobjectProperty, objectShorthandProperty: peg$parseobjectShorthandProperty, objectPublicKey: peg$parseobjectPublicKey, parenthesesArguments: peg$parseparenthesesArguments, path: peg$parsepath, pathArguments: peg$parsepathArguments, pathKey: peg$parsepathKey, pathSegment: peg$parsepathSegment, pathSegmentChar: peg$parsepathSegmentChar, pipelineExpression: peg$parsepipelineExpression, primary: peg$parseprimary, program: peg$parseprogram, protocolExpression: peg$parseprotocolExpression, qualifiedReference: peg$parsequalifiedReference, reference: peg$parsereference, relationalExpression: peg$parserelationalExpression, relationalOperator: peg$parserelationalOperator, rootDirectory: peg$parserootDirectory, scopeReference: peg$parsescopeReference, separator: peg$parseseparator, slashFollows: peg$parseslashFollows, shebang: peg$parseshebang, shiftExpression: peg$parseshiftExpression, shiftOperator: peg$parseshiftOperator, shorthandFunction: peg$parseshorthandFunction, singleArrow: peg$parsesingleArrow, singleLineComment: peg$parsesingleLineComment, singleQuoteString: peg$parsesingleQuoteString, singleQuoteStringChar: peg$parsesingleQuoteStringChar, spread: peg$parsespread, stringLiteral: peg$parsestringLiteral, templateDocument: peg$parsetemplateDocument, templateDocumentChar: peg$parsetemplateDocumentChar, templateDocumentContents: peg$parsetemplateDocumentContents, templateDocumentText: peg$parsetemplateDocumentText, templateLiteral: peg$parsetemplateLiteral, templateLiteralChar: peg$parsetemplateLiteralChar, templateLiteralContents: peg$parsetemplateLiteralContents, templateLiteralText: peg$parsetemplateLiteralText, templateSubstitution: peg$parsetemplateSubstitution, textChar: peg$parsetextChar, unaryExpression: peg$parseunaryExpression, unaryOperator: peg$parseunaryOperator, whitespaceWithNewLine: peg$parsewhitespaceWithNewLine };
+  var peg$startRuleFunctions = { __: peg$parse__, additiveExpression: peg$parseadditiveExpression, additiveOperator: peg$parseadditiveOperator, arguments: peg$parsearguments, arrayLiteral: peg$parsearrayLiteral, arrayEntries: peg$parsearrayEntries, arrayEntry: peg$parsearrayEntry, arrowFunction: peg$parsearrowFunction, bitwiseAndExpression: peg$parsebitwiseAndExpression, bitwiseAndOperator: peg$parsebitwiseAndOperator, bitwiseOrExpression: peg$parsebitwiseOrExpression, bitwiseOrOperator: peg$parsebitwiseOrOperator, bitwiseXorExpression: peg$parsebitwiseXorExpression, bitwiseXorOperator: peg$parsebitwiseXorOperator, callExpression: peg$parsecallExpression, closingBrace: peg$parseclosingBrace, closingBracket: peg$parseclosingBracket, closingParenthesis: peg$parseclosingParenthesis, commaExpression: peg$parsecommaExpression, comment: peg$parsecomment, conditionalExpression: peg$parseconditionalExpression, digits: peg$parsedigits, doubleArrow: peg$parsedoubleArrow, doubleQuoteString: peg$parsedoubleQuoteString, doubleQuoteStringChar: peg$parsedoubleQuoteStringChar, ellipsis: peg$parseellipsis, equalityExpression: peg$parseequalityExpression, equalityOperator: peg$parseequalityOperator, escapedChar: peg$parseescapedChar, exponentiationExpression: peg$parseexponentiationExpression, expression: peg$parseexpression, floatLiteral: peg$parsefloatLiteral, group: peg$parsegroup, guillemetString: peg$parseguillemetString, guillemetStringChar: peg$parseguillemetStringChar, homeDirectory: peg$parsehomeDirectory, host: peg$parsehost, identifier: peg$parseidentifier, identifierChar: peg$parseidentifierChar, identifierList: peg$parseidentifierList, implicitParenthesesCallExpression: peg$parseimplicitParenthesesCallExpression, implicitParensthesesArguments: peg$parseimplicitParensthesesArguments, inlineSpace: peg$parseinlineSpace, integerLiteral: peg$parseintegerLiteral, list: peg$parselist, literal: peg$parseliteral, logicalAndExpression: peg$parselogicalAndExpression, logicalOrExpression: peg$parselogicalOrExpression, multiLineComment: peg$parsemultiLineComment, multiplicativeExpression: peg$parsemultiplicativeExpression, multiplicativeOperator: peg$parsemultiplicativeOperator, namespace: peg$parsenamespace, newLine: peg$parsenewLine, numericLiteral: peg$parsenumericLiteral, nullishCoalescingExpression: peg$parsenullishCoalescingExpression, objectLiteral: peg$parseobjectLiteral, objectEntries: peg$parseobjectEntries, objectEntry: peg$parseobjectEntry, objectGetter: peg$parseobjectGetter, objectHiddenKey: peg$parseobjectHiddenKey, objectKey: peg$parseobjectKey, objectProperty: peg$parseobjectProperty, objectShorthandProperty: peg$parseobjectShorthandProperty, objectPublicKey: peg$parseobjectPublicKey, parenthesesArguments: peg$parseparenthesesArguments, path: peg$parsepath, pathArguments: peg$parsepathArguments, pathKey: peg$parsepathKey, pathSegment: peg$parsepathSegment, pathSegmentChar: peg$parsepathSegmentChar, pipelineExpression: peg$parsepipelineExpression, primary: peg$parseprimary, program: peg$parseprogram, protocolExpression: peg$parseprotocolExpression, qualifiedReference: peg$parsequalifiedReference, reference: peg$parsereference, relationalExpression: peg$parserelationalExpression, relationalOperator: peg$parserelationalOperator, rootDirectory: peg$parserootDirectory, scopeReference: peg$parsescopeReference, separator: peg$parseseparator, slashFollows: peg$parseslashFollows, shebang: peg$parseshebang, shiftExpression: peg$parseshiftExpression, shiftOperator: peg$parseshiftOperator, shorthandFunction: peg$parseshorthandFunction, singleArrow: peg$parsesingleArrow, singleLineComment: peg$parsesingleLineComment, singleQuoteString: peg$parsesingleQuoteString, singleQuoteStringChar: peg$parsesingleQuoteStringChar, spreadElement: peg$parsespreadElement, stringLiteral: peg$parsestringLiteral, templateDocument: peg$parsetemplateDocument, templateDocumentChar: peg$parsetemplateDocumentChar, templateDocumentContents: peg$parsetemplateDocumentContents, templateDocumentText: peg$parsetemplateDocumentText, templateLiteral: peg$parsetemplateLiteral, templateLiteralChar: peg$parsetemplateLiteralChar, templateLiteralContents: peg$parsetemplateLiteralContents, templateLiteralText: peg$parsetemplateLiteralText, templateSubstitution: peg$parsetemplateSubstitution, textChar: peg$parsetextChar, unaryExpression: peg$parseunaryExpression, unaryOperator: peg$parseunaryOperator, whitespaceWithNewLine: peg$parsewhitespaceWithNewLine };
   var peg$startRuleFunction = peg$parse__;
 
   var peg$c0 = "[";
@@ -412,7 +412,7 @@ function peg$parse(input, options) {
       return annotate(tail.reduce(makeCall, head), location());
     };
   var peg$f11 = function() {
-      error("Expected right curly brace");
+      error(`An object ended without a closing brace, or contained something that wasn't expected.\nThe top level of an object can only contain definitions ("a: b" or "a = b") or spreads ("...a").`);
     };
   var peg$f12 = function() {
       error("Expected right bracket");
@@ -425,12 +425,15 @@ function peg$parse(input, options) {
         ? list[0]
         : annotate([ops.comma, ...list], location());
     };
-  var peg$f15 = function(condition, truthy, falsy) {
+  var peg$f15 = function(condition, tail) {
+      if (!tail) {
+        return condition;
+      }
       return annotate([
         ops.conditional,
         downgradeReference(condition),
-        [ops.lambda, [], downgradeReference(truthy)],
-        [ops.lambda, [], downgradeReference(falsy)]
+        [ops.lambda, [], downgradeReference(tail[0])],
+        [ops.lambda, [], downgradeReference(tail[1])]
       ], location());
     };
   var peg$f16 = function(chars) {
@@ -447,7 +450,7 @@ function peg$parse(input, options) {
   var peg$f23 = function() { return "\t"; };
   var peg$f24 = function() { return "\v"; };
   var peg$f25 = function(left, right) {
-      return annotate([ops.exponentiation, left, right], location());
+      return right ? annotate([ops.exponentiation, left, right], location()) : left;
     };
   var peg$f26 = function() {
       return annotate([ops.literal, parseFloat(text())], location());
@@ -985,7 +988,7 @@ function peg$parse(input, options) {
   function peg$parsearrayEntry() {
     var s0, s1, s2, s3;
 
-    s0 = peg$parsespread();
+    s0 = peg$parsespreadElement();
     if (s0 === peg$FAILED) {
       s0 = peg$parsepipelineExpression();
       if (s0 === peg$FAILED) {
@@ -1546,60 +1549,62 @@ function peg$parse(input, options) {
   }
 
   function peg$parseconditionalExpression() {
-    var s0, s1, s2, s3, s4, s5, s6, s7, s8, s9;
+    var s0, s1, s2, s3, s4, s5, s6, s7, s8, s9, s10;
 
     s0 = peg$currPos;
     s1 = peg$parselogicalOrExpression();
     if (s1 !== peg$FAILED) {
-      s2 = peg$parse__();
+      s2 = peg$currPos;
+      s3 = peg$parse__();
       if (input.charCodeAt(peg$currPos) === 63) {
-        s3 = peg$c9;
+        s4 = peg$c9;
         peg$currPos++;
       } else {
-        s3 = peg$FAILED;
+        s4 = peg$FAILED;
         if (peg$silentFails === 0) { peg$fail(peg$e15); }
       }
-      if (s3 !== peg$FAILED) {
-        s4 = peg$parse__();
-        s5 = peg$parsepipelineExpression();
-        if (s5 !== peg$FAILED) {
-          s6 = peg$parse__();
+      if (s4 !== peg$FAILED) {
+        s5 = peg$parse__();
+        s6 = peg$parsepipelineExpression();
+        if (s6 !== peg$FAILED) {
+          s7 = peg$parse__();
           if (input.charCodeAt(peg$currPos) === 58) {
-            s7 = peg$c10;
+            s8 = peg$c10;
             peg$currPos++;
           } else {
-            s7 = peg$FAILED;
+            s8 = peg$FAILED;
             if (peg$silentFails === 0) { peg$fail(peg$e16); }
           }
-          if (s7 !== peg$FAILED) {
-            s8 = peg$parse__();
-            s9 = peg$parsepipelineExpression();
-            if (s9 !== peg$FAILED) {
-              peg$savedPos = s0;
-              s0 = peg$f15(s1, s5, s9);
+          if (s8 !== peg$FAILED) {
+            s9 = peg$parse__();
+            s10 = peg$parsepipelineExpression();
+            if (s10 !== peg$FAILED) {
+              s2 = [ s6, s10 ];
             } else {
-              peg$currPos = s0;
-              s0 = peg$FAILED;
+              peg$currPos = s2;
+              s2 = peg$FAILED;
             }
           } else {
-            peg$currPos = s0;
-            s0 = peg$FAILED;
+            peg$currPos = s2;
+            s2 = peg$FAILED;
           }
         } else {
-          peg$currPos = s0;
-          s0 = peg$FAILED;
+          peg$currPos = s2;
+          s2 = peg$FAILED;
         }
       } else {
-        peg$currPos = s0;
-        s0 = peg$FAILED;
+        peg$currPos = s2;
+        s2 = peg$FAILED;
+      }
+      if (s2 === peg$FAILED) {
+        s2 = null;
       }
+      peg$savedPos = s0;
+      s0 = peg$f15(s1, s2);
     } else {
       peg$currPos = s0;
       s0 = peg$FAILED;
     }
-    if (s0 === peg$FAILED) {
-      s0 = peg$parselogicalOrExpression();
-    }
 
     return s0;
   }
@@ -2009,40 +2014,42 @@ function peg$parse(input, options) {
   }
 
   function peg$parseexponentiationExpression() {
-    var s0, s1, s2, s3, s4, s5;
+    var s0, s1, s2, s3, s4, s5, s6;
 
     s0 = peg$currPos;
     s1 = peg$parseunaryExpression();
     if (s1 !== peg$FAILED) {
-      s2 = peg$parse__();
+      s2 = peg$currPos;
+      s3 = peg$parse__();
       if (input.substr(peg$currPos, 2) === peg$c28) {
-        s3 = peg$c28;
+        s4 = peg$c28;
         peg$currPos += 2;
       } else {
-        s3 = peg$FAILED;
+        s4 = peg$FAILED;
         if (peg$silentFails === 0) { peg$fail(peg$e37); }
       }
-      if (s3 !== peg$FAILED) {
-        s4 = peg$parse__();
-        s5 = peg$parseexponentiationExpression();
-        if (s5 !== peg$FAILED) {
-          peg$savedPos = s0;
-          s0 = peg$f25(s1, s5);
+      if (s4 !== peg$FAILED) {
+        s5 = peg$parse__();
+        s6 = peg$parseexponentiationExpression();
+        if (s6 !== peg$FAILED) {
+          s2 = s6;
         } else {
-          peg$currPos = s0;
-          s0 = peg$FAILED;
+          peg$currPos = s2;
+          s2 = peg$FAILED;
         }
       } else {
-        peg$currPos = s0;
-        s0 = peg$FAILED;
+        peg$currPos = s2;
+        s2 = peg$FAILED;
+      }
+      if (s2 === peg$FAILED) {
+        s2 = null;
       }
+      peg$savedPos = s0;
+      s0 = peg$f25(s1, s2);
     } else {
       peg$currPos = s0;
       s0 = peg$FAILED;
     }
-    if (s0 === peg$FAILED) {
-      s0 = peg$parseunaryExpression();
-    }
 
     return s0;
   }
@@ -3173,7 +3180,7 @@ function peg$parse(input, options) {
   function peg$parseobjectEntry() {
     var s0;
 
-    s0 = peg$parsespread();
+    s0 = peg$parsespreadElement();
     if (s0 === peg$FAILED) {
       s0 = peg$parseobjectProperty();
       if (s0 === peg$FAILED) {
@@ -4307,14 +4314,14 @@ function peg$parse(input, options) {
     return s0;
   }
 
-  function peg$parsespread() {
+  function peg$parsespreadElement() {
     var s0, s1, s2, s3;
 
     s0 = peg$currPos;
     s1 = peg$parseellipsis();
     if (s1 !== peg$FAILED) {
       s2 = peg$parse__();
-      s3 = peg$parseconditionalExpression();
+      s3 = peg$parsepipelineExpression();
       if (s3 !== peg$FAILED) {
         peg$savedPos = s0;
         s0 = peg$f68(s3);
@@ -4845,7 +4852,7 @@ const peg$allowedStartRules = [
   "singleLineComment",
   "singleQuoteString",
   "singleQuoteStringChar",
-  "spread",
+  "spreadElement",
   "stringLiteral",
   "templateDocument",
   "templateDocumentChar",

package/src/runtime/errors.js

@@ -1,6 +1,10 @@
 // Text we look for in an error stack to guess whether a given line represents a
 
-import { scope as scopeFn, trailingSlash } from "@weborigami/async-tree";
+import {
+  scope as scopeFn,
+  trailingSlash,
+  TraverseError,
+} from "@weborigami/async-tree";
 import codeFragment from "./codeFragment.js";
 import { typos } from "./typos.js";
 
@@ -13,19 +17,24 @@ const origamiSourceSignals = [
 ];
 
 export async function builtinReferenceError(tree, builtins, key) {
-  const messages = [
-    `"${key}" is being called as if it were a builtin function, but it's not.`,
-  ];
   // See if the key is in scope (but not as a builtin)
   const scope = scopeFn(tree);
   const value = await scope.get(key);
+  let message;
   if (value === undefined) {
+    const messages = [
+      `"${key}" is being called as if it were a builtin function, but it's not.`,
+    ];
     const typos = await formatScopeTypos(builtins, key);
     messages.push(typos);
+    message = messages.join(" ");
   } else {
-    messages.push(`Use "${key}/" instead.`);
+    const messages = [
+      `To call a function like "${key}" that's not a builtin, include a slash: ${key}/( )`,
+      `Details: https://weborigami.org/language/syntax.html#shorthand-for-builtin-functions`,
+    ];
+    message = messages.join("\n");
   }
-  const message = messages.join(" ");
   return new ReferenceError(message);
 }
 
@@ -36,37 +45,50 @@ export async function builtinReferenceError(tree, builtins, key) {
  */
 export function formatError(error) {
   let message;
+
+  let location = /** @type {any} */ (error).location;
+  const fragment = location ? codeFragment(location) : null;
+  let fragmentInMessage = false;
+
   if (error.stack) {
     // Display the stack only until we reach the Origami source code.
     message = "";
     let lines = error.stack.split("\n");
     for (let i = 0; i < lines.length; i++) {
-      const line = lines[i];
+      let line = lines[i];
       if (maybeOrigamiSourceCode(line)) {
         break;
       }
+      if (
+        error instanceof TraverseError &&
+        error.message === "A null or undefined value can't be traversed"
+      ) {
+        // Provide more meaningful message for TraverseError
+        line = `TraverseError: This part of the path is null or undefined: ${fragment}`;
+        fragmentInMessage = true;
+      }
       if (message) {
         message += "\n";
       }
-      message += lines[i];
+      message += line;
     }
   } else {
     message = error.toString();
   }
 
   // Add location
-  let location = /** @type {any} */ (error).location;
   if (location) {
-    const fragment = codeFragment(location);
     let { source, start } = location;
-
-    message += `\nevaluating: ${fragment}`;
+    if (!fragmentInMessage) {
+      message += `\nevaluating: ${fragment}`;
+    }
     if (typeof source === "object" && source.url) {
       message += `\n    at ${source.url.href}:${start.line}:${start.column}`;
     } else if (source.text.includes("\n")) {
       message += `\n    at line ${start.line}, column ${start.column}`;
     }
   }
+
   return message;
 }
 

package/test/compiler/parse.test.js

@@ -687,7 +687,7 @@ describe("Origami parser", () => {
     assertParse("objectLiteral", "{ a: 1, ...b }", [
       ops.merge,
       [ops.object, ["a", [ops.literal, 1]]],
-      [undetermined, "b"],
+      [ops.scope, "b"],
     ]);
     assertParse("objectLiteral", "{ (a): 1 }", [
       ops.object,
@@ -946,9 +946,9 @@ describe("Origami parser", () => {
     assertParse("singleLineComment", "// Hello, world!", null, false);
   });
 
-  test("spread", () => {
-    assertParse("spread", "...a", [ops.spread, [undetermined, "a"]]);
-    assertParse("spread", "…a", [ops.spread, [undetermined, "a"]]);
+  test("spreadElement", () => {
+    assertParse("spreadElement", "...a", [ops.spread, [ops.scope, "a"]]);
+    assertParse("spreadElement", "…a", [ops.spread, [ops.scope, "a"]]);
   });
 
   test("stringLiteral", () => {