@weborigami/language 0.0.58 → 0.0.60

package/main.js

@@ -5,15 +5,12 @@ export { default as EventTargetMixin } from "./src/runtime/EventTargetMixin.js";
 export { default as ExpressionTree } from "./src/runtime/ExpressionTree.js";
 export { default as HandleExtensionsTransform } from "./src/runtime/HandleExtensionsTransform.js";
 export { default as ImportModulesMixin } from "./src/runtime/ImportModulesMixin.js";
-export { default as InheritScopeMixin } from "./src/runtime/InheritScopeMixin.js";
 export { default as InvokeFunctionsTransform } from "./src/runtime/InvokeFunctionsTransform.js";
 export { default as OrigamiFiles } from "./src/runtime/OrigamiFiles.js";
 export { default as OrigamiTransform } from "./src/runtime/OrigamiTransform.js";
 export { default as OrigamiTree } from "./src/runtime/OrigamiTree.js";
-export { default as Scope } from "./src/runtime/Scope.js";
 export { default as TreeEvent } from "./src/runtime/TreeEvent.js";
 export { default as WatchFilesMixin } from "./src/runtime/WatchFilesMixin.js";
-export { default as concatTreeValues } from "./src/runtime/concatTreeValues.js";
 export { default as evaluate } from "./src/runtime/evaluate.js";
 export * as expressionFunction from "./src/runtime/expressionFunction.js";
 export { default as extname } from "./src/runtime/extname.js";

package/package.json

@@ -1,18 +1,18 @@
 {
   "name": "@weborigami/language",
-  "version": "0.0.58",
+  "version": "0.0.60",
   "description": "Web Origami expression language compiler and runtime",
   "type": "module",
   "main": "./main.js",
   "types": "./index.ts",
   "devDependencies": {
-    "@types/node": "20.12.8",
-    "peggy": "4.0.2",
-    "typescript": "5.4.5"
+    "@types/node": "20.14.9",
+    "peggy": "4.0.3",
+    "typescript": "5.5.3"
   },
   "dependencies": {
-    "@weborigami/async-tree": "0.0.58",
-    "@weborigami/types": "0.0.58",
+    "@weborigami/async-tree": "0.0.60",
+    "@weborigami/types": "0.0.60",
     "watcher": "2.3.1"
   },
   "scripts": {

package/src/compiler/origami.pegjs

@@ -138,6 +138,12 @@ functionComposition "function composition"
 group "parenthetical group"
   = "(" __ @expr __ closingParen
 
+guillemetString "guillemet string"
+  = '«' chars:guillemetStringChar* '»' { return chars.join(""); }
+
+guillemetStringChar
+  = !('»' / newLine) @textChar
+
 // A host identifier that may include a colon and port number: `example.com:80`.
 // This is used as a special case at the head of a path, where we want to
 // interpret a colon as part of a text identifier.
@@ -148,7 +154,7 @@ identifier "identifier"
   = chars:identifierChar+ { return chars.join(""); }
 
 identifierChar
-  = [^(){}\[\]<>\-=,/:\`"'\\ →⇒\t\n\r] // No unescaped whitespace or special chars
+  = [^(){}\[\]<>\-=,/:\`"'«»\\ →⇒\t\n\r] // No unescaped whitespace or special chars
   / @'-' !'>' // Accept a hyphen but not in a single arrow combination
   / escapedChar
 
@@ -160,7 +166,9 @@ identifierOrString
   / string
 
 implicitParensArgs "arguments with implicit parentheses"
-  = inlineSpace+ @list
+  // Implicit parens args are a separate list of `step`, not `expr`, because
+  // they can't contain a pipeline.
+  = inlineSpace+ @step|1.., separator| separator?
 
 inlineSpace
   = [ \t]
@@ -244,7 +252,14 @@ path "slash-separated path"
 
 // A single key in a slash-separated path
 pathKey "path element"
-  = key:identifierChar* { return key.join(""); }
+  = chars:pathKeyChar* { return chars.join(""); }
+
+// A single character in a slash-separated path.
+pathKeyChar
+  // This is more permissive than an identifier. It allows some characters like
+  // brackets or quotes that are not allowed in identifiers.
+  = [^(){}\[\],:/\\ \t\n\r]
+  / escapedChar
 
 // Parse a protocol call like `fn://foo/bar`.
 // There can be zero, one, or two slashes after the colon.
@@ -324,6 +339,7 @@ start
 string "string"
   = doubleQuoteString
   / singleQuoteString
+  / guillemetString
 
 // A top-level document defining a template. This is the same as a template
 // literal, but can contain backticks at the top level.
@@ -364,7 +380,7 @@ templateLiteralText
 
 // A substitution in a template literal: `${x}`
 templateSubstitution "template substitution"
-  = "${" @expression "}"
+  = "${" __ @expr __ "}"
 
 textChar
   = escapedChar / .