@weborigami/language 0.0.42 → 0.0.43

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@weborigami/language",
-  "version": "0.0.42",
+  "version": "0.0.43",
   "description": "Web Origami expression language compiler and runtime",
   "type": "module",
   "main": "./main.js",
@@ -10,8 +10,8 @@
     "typescript": "5.3.3"
   },
   "dependencies": {
-    "@weborigami/async-tree": "https://gitpkg.now.sh/WebOrigami/origami/async-tree?e08c2451",
-    "@weborigami/types": "0.0.42",
+    "@weborigami/async-tree": "0.0.43",
+    "@weborigami/types": "0.0.43",
     "peggy": "3.0.2",
     "watcher": "2.3.0"
   },

package/src/compiler/compile.js

@@ -30,14 +30,14 @@ export function templateDocument(source) {
 //
 // Example:
 //
-//     {{ if `
+//     ${ if `
 //       true text
 //     `, `
 //       false text
-//     ` }}
+//     ` }
 //
 // Case 1: a substitution that starts the text or starts a line (there's only
-// whitespace before the `{{`), and has the line end with the start of a
+// whitespace before the `${`), and has the line end with the start of a
 // template literal (there's only whitespace after the backtick) marks the start
 // of a block.
 //
@@ -45,17 +45,17 @@ export function templateDocument(source) {
 // another is an internal break in the block. Edge case: three backticks in a
 // row, like ```, are common in markdown and are not treated as a break.
 //
-// Case 3: a line that ends a template literal and ends with `}}` or ends the
+// Case 3: a line that ends a template literal and ends with `}` or ends the
 // text marks the end of the block.
 //
 // In all three cases, we trim spaces and tabs from the start and end of the
 // line. In case 1, we also remove the preceding newline.
 function trimTemplateWhitespace(text) {
-  const regex1 = /(^|\n)[ \t]*({{.*?`)[ \t]*\n/g;
+  const regex1 = /(^|\n)[ \t]*((?:{{|\${).*?`)[ \t]*\n/g;
   const regex2 = /\n[ \t]*(`(?!`).*?`)[ \t]*\n/g;
-  const regex3 = /\n[ \t]*(`(?!`).*?}})[ \t]*(?:\n|$)/g;
+  const regex3js = /\n[ \t]*(`(?!`).*?(?:}}|[^\\]}))[ \t]*(?:\n|$)/g;
   const trimBlockStarts = text.replace(regex1, "$1$2");
   const trimBlockBreaks = trimBlockStarts.replace(regex2, "\n$1");
-  const trimBlockEnds = trimBlockBreaks.replace(regex3, "\n$1");
+  const trimBlockEnds = trimBlockBreaks.replace(regex3js, "\n$1");
   return trimBlockEnds;
 }

package/src/compiler/origami.pegjs

@@ -25,8 +25,10 @@ __
   = (inlineSpace / newLine / comment)*  { return ""; }
 
 // A filesystem path that begins with a slash: `/foo/bar`
+// We take care to avoid treating two consecutive leading slashes as a path;
+// that starts a comment.
 absoluteFilePath "absolute file path"
-  = path:leadingSlashPath {
+  = !"//" path:leadingSlashPath {
       return annotate([[ops.filesRoot], ...path], location());
     }
 
@@ -91,7 +93,8 @@ closingParen
 
 // A single line comment
 comment "comment"
-  = "#" [^\n\r]*
+  = multiLineComment
+  / singleLineComment
 
 digits
   = @[0-9]+
@@ -177,6 +180,9 @@ leadingSlashPath "path with a leading slash"
 list "list"
   = @expr|1.., separator| separator?
 
+multiLineComment
+  = "/*" (!"*/" .)* "*/" { return null; }
+
 newLine
   = "\n"
   / "\r\n"
@@ -267,6 +273,10 @@ sign
 
 singleArrow = "→" / "->"
 
+singleLineComment
+  = "#" [^\n\r]* { return null; }
+  / "//" [^\n\r]* { return null; }
+
 singleQuoteString "single quote string"
   = "'" chars:singleQuoteStringChar* "'" { return chars.join(""); }
 
@@ -312,7 +322,7 @@ templateDocument "template"
 
 // Template documents can contain backticks at the top level.
 templateDocumentChar
-  = !"{{" @textChar
+  = !("{{" / "${") @textChar
 
 // The contents of a template document containing plain text and substitutions
 templateDocumentContents
@@ -328,7 +338,7 @@ templateLiteral "template literal"
   = "`" @templateLiteralContents "`"
 
 templateLiteralChar
-  = !("`" / "{{") @textChar
+  = !("`" / "{{" / "${") @textChar
 
 // The contents of a template literal containing plain text and substitutions
 templateLiteralContents
@@ -343,6 +353,7 @@ templateLiteralText
 // A substitution in a template literal: `{{ fn() }}`
 templateSubstitution "template substitution"
   = "{{" @expression "}}"
+  / "${" @expression "}"
 
 textChar
   = escapedChar / .