@bablr/language-en-blank-space 0.10.1 → 0.10.2

package/lib/grammar.js

@@ -1,24 +1,29 @@
 import { re, spam as m } from '@bablr/boot';
-import { o, eat, match, eatMatch } from '@bablr/helpers/grammar';
+import { o, eat, match, eatMatch, startSpan, endSpan } from '@bablr/helpers/grammar';
+import * as Spans from '@bablr/agast-helpers/spans';
+import { buildAlternative, buildElements } from '@bablr/helpers/builders';
 
 export const canonicalURL = 'https://bablr.org/languages/core/en/space-tab-newline';
 
 export const defaultMatcher = m`<__Blanks />`;
 
 export const grammar = class BlankSpaceGrammar {
-  *Blanks() {
-    while (yield eatMatch(m`<Blank />`));
-  }
-
-  *Blank() {
-    if (yield match(re`/^/m`)) {
-      yield eatMatch(m`<LeftOffset />`);
-      yield eatMatch(m`<*Space /[ \t\r\n]+/ />`, o({}), o({ literal: true }));
+  *Blank({ s }) {
+    let span = Spans.getSpan('Trivia', s().spans);
+
+    yield startSpan('Trivia', null, span?.props);
+    if (span && span.props && (yield match(re`/^[ \t\r\n]/m`))) {
+      if (yield eatMatch(m`<LeftOffset />`)) {
+      } else if (yield eatMatch(m`<*Space /[ \t]+/ />`)) {
+      } else {
+        yield eat(m`<*Newline /\r?\n?/ />`, o({}), o({ literal: true }));
+      }
     } else if (yield match(re`/[\r\n]/`)) {
       yield eat(m`<*Newline /\r?\n?/ />`, o({}), o({ literal: true }));
     } else {
       yield eat(m`<*Space /[ \t]+/ />`, o({}), o({ literal: true }));
     }
+    yield endSpan();
   }
 
   *Space({ props: { onlySameLine } }) {
@@ -29,8 +34,21 @@ export const grammar = class BlankSpaceGrammar {
     }
   }
 
-  *LeftOffset() {
-    while (yield eatMatch(m`indents[]: <*Indent /\t|  / />`, o({}), o({ literal: true }))) {}
+  *LeftOffset({ s }) {
+    let { span } = s();
+
+    if (span.name !== 'Trivia') {
+      span = Spans.getSpan('Trivia', s().spans);
+    }
+
+    if (!span || !span.props) {
+      while (yield eatMatch(m`indents[]: <*Indent /\t|  / />`, o({}), o({ literal: true }))) {}
+    } else {
+      let pattern = re`/${buildAlternative(
+        buildElements(new Array(span.props.spaces).fill(re.Character` `)),
+      )}/`.value;
+      while (yield eatMatch(m`indents[]: <*Indent ${pattern} />`, o({}), o({ literal: true }))) {}
+    }
   }
 
   *Newline() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bablr/language-en-blank-space",
-  "version": "0.10.1",
+  "version": "0.10.2",
   "description": "A BABLR language for tabs, spaces, and line terminators",
   "engines": {
     "node": ">=12.0.0"
@@ -15,10 +15,10 @@
   ],
   "sideEffects": false,
   "dependencies": {
-    "@bablr/helpers": "0.25.1",
-    "@bablr/agast-helpers": "0.10.2",
-    "@bablr/agast-vm-helpers": "0.10.2",
-    "@bablr/boot": "0.11.1"
+    "@bablr/helpers": "0.25.2",
+    "@bablr/agast-helpers": "0.10.4",
+    "@bablr/agast-vm-helpers": "0.10.4",
+    "@bablr/boot": "0.11.3"
   },
   "devDependencies": {
     "@bablr/eslint-config-base": "github:bablr-lang/eslint-config-base#c97bfa4b3663f8378e9b3e42bb5a41e685406cf9",