@weborigami/language 0.3.0 → 0.3.1

package/src/compiler/parserHelpers.js

@@ -364,6 +364,15 @@ export function makeProperty(key, value) {
   return [key, modified];
 }
 
+export function makeJsPropertyAccess(expression, property) {
+  const location = {
+    source: expression.location.source,
+    start: expression.location.start,
+    end: property.location.end,
+  };
+  return annotate([expression, property], location);
+}
+
 export function makeReference(identifier) {
   // We can't know for sure that an identifier is a builtin reference until we
   // see whether it's being called as a function.

package/src/runtime/ops.js

@@ -8,7 +8,7 @@
 import {
   ObjectTree,
   Tree,
-  concatTrees,
+  deepText,
   isUnpackable,
   scope as scopeFn,
   symbols,
@@ -533,7 +533,7 @@ addOpLabel(subtraction, "«ops.subtraction»");
  * Apply the default tagged template function.
  */
 export async function template(strings, ...values) {
-  return concatTrees(strings, ...values);
+  return deepText(strings, ...values);
 }
 addOpLabel(template, "«ops.template»");
 

package/test/compiler/parse.test.js

@@ -236,6 +236,24 @@ describe("Origami parser", () => {
     ]);
   });
 
+  test("callExpression using property acccess", () => {
+    assertParse("callExpression", "(foo).bar", [
+      ops.traverse,
+      [ops.scope, "foo"],
+      [ops.literal, "bar"],
+    ]);
+    assertParse("callExpression", "(foo).bar.baz", [
+      ops.traverse,
+      [ops.traverse, [ops.scope, "foo"], [ops.literal, "bar"]],
+      [ops.literal, "baz"],
+    ]);
+    assertParse("callExpression", "foo[bar]", [
+      ops.traverse,
+      [ops.scope, "foo/"],
+      [ops.scope, "bar"],
+    ]);
+  });
+
   test("commaExpression", () => {
     assertParse("commaExpression", "1", [ops.literal, 1]);
     assertParse("commaExpression", "a, b, c", [
@@ -567,6 +585,26 @@ Body`,
     ]);
   });
 
+  test("jsIdentifier", () => {
+    assertParse("jsIdentifier", "foo", "foo", false);
+    assertParse("jsIdentifier", "$Δelta", "$Δelta", false);
+    assertThrows(
+      "jsIdentifier",
+      "1stCharacterIsNumber",
+      "Expected JavaScript identifier start"
+    );
+    assertThrows(
+      "jsIdentifier",
+      "has space",
+      "Expected JavaScript identifier continuation"
+    );
+    assertThrows(
+      "jsIdentifier",
+      "foo.bar",
+      "Expected JavaScript identifier continuation"
+    );
+  });
+
   test("list", () => {
     assertParse("list", "1", [[ops.literal, 1]]);
     assertParse("list", "1,2,3", [