@bablr/language-en-es6 0.3.2 → 0.3.4

package/lib/grammar.js

@@ -47,7 +47,7 @@ export {
 
 let reservedWords_ = new Set(reservedWords);
 
-export const canonicalURL = 'https://bablr.org/languages/universe/es6';
+export const canonicalURL = 'https://bablr.org/languages/universe/en/es6';
 
 export const defaultMatcher = m`_+: <_Expression />`;
 
@@ -324,7 +324,7 @@ const atrivial = class ES6Grammar extends importMixin(
 
 export const grammar = triviaEnhancer(
   {
-    triviaIsAllowed: (s) => s.span === 'Bare',
+    triviaIsAllowed: (s) => s.span.name === 'Bare',
     triviaMatcher: m`#: <__Trivia /[ \n\r\t]|\/\/|\/\*/ />`,
   },
   atrivial,

package/lib/mixins/string.js

@@ -59,18 +59,18 @@ const mixin = (Base) =>
       let esc, lit;
       do {
         lit =
-          span === 'String:Single'
+          span.name === 'String:Single'
             ? yield eatMatch(re`/[^\r\n\\']+/`)
-            : span === 'String:Double'
+            : span.name === 'String:Double'
             ? yield eatMatch(re`/[^\r\n\\"]+/`)
-            : span === 'String:Template'
+            : span.name === 'String:Template'
             ? yield eatMatch(re`/(?:[^$\\\u0060]|\$[^{])+/`)
-            : span === 'String:TaggedTemplate'
+            : span.name === 'String:TaggedTemplate'
             ? yield eatMatch(re`/(?:[^$\\\u0060]|\\[$]|[$][^{]|[$]$)+/`)
             : yield fail();
         esc =
           (yield eatMatch(m`@: <EscapeSequence '\\' />`)) ||
-          (span === 'String:TaggedTemplate' && (yield eatMatch('\\')));
+          (span.name === 'String:TaggedTemplate' && (yield eatMatch('\\')));
       } while (esc || lit);
     }
 
@@ -87,7 +87,7 @@ const mixin = (Base) =>
       let s = getState();
       let _match, cooked;
 
-      if (s.span === 'String:Template') {
+      if (s.span.name === 'String:Template') {
         yield startSpan('Escape');
         yield eat(m`escape*: <* '\\' />`);
 
@@ -102,7 +102,7 @@ const mixin = (Base) =>
         }
         yield defineAttribute('cooked', cooked);
         yield endSpan();
-      } else if (s.span === 'String:TaggedTemplate') {
+      } else if (s.span.name === 'String:TaggedTemplate') {
         yield startSpan('Escape');
         yield eat(m`escape*: <* '\\' />`);
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bablr/language-en-es6",
-  "version": "0.3.2",
+  "version": "0.3.4",
   "description": "A BABLR language for ES6 (JavaScript)",
   "engines": {
     "node": ">=12.0.0"
@@ -20,19 +20,19 @@
   "sideEffects": false,
   "dependencies": {
     "@babel/runtime": "7.24.6",
-    "@bablr/agast-helpers": "0.10.3",
-    "@bablr/agast-vm-helpers": "0.10.2",
-    "@bablr/boot": "0.11.1",
+    "@bablr/agast-helpers": "0.10.4",
+    "@bablr/agast-vm-helpers": "0.10.4",
+    "@bablr/boot": "0.11.3",
     "@bablr/coroutine": "0.1.0",
-    "@bablr/helpers": "0.25.1",
-    "@bablr/language-en-blank-space": "0.10.1",
-    "@bablr/language-en-c-comments": "0.10.1",
-    "@bablr/language-en-es5": "0.3.2"
+    "@bablr/helpers": "0.25.2",
+    "@bablr/language-en-blank-space": "0.10.12",
+    "@bablr/language-en-c-comments": "0.10.2",
+    "@bablr/language-en-es5": "0.3.4"
   },
   "devDependencies": {
     "@bablr/eslint-config-base": "github:bablr-lang/eslint-config-base#49f5952efed27f94ee9b94340eb1563c440bf64e",
     "@qnighy/dedent": "0.1.1",
-    "bablr": "^0.11.2",
+    "bablr": "^0.11.3",
     "enhanced-resolve": "^5.12.0",
     "eslint": "^7.32.0",
     "eslint-import-resolver-enhanced-resolve": "^1.0.5",