@bablr/language-en-blank-space 0.9.0 → 0.10.0

package/lib/grammar.js

@@ -1,55 +1,45 @@
-/* @macrome
- * @generatedby @bablr/macrome-generator-bablr
- * @generatedfrom ./grammar.macro.js#a352424fbde9ad17b2ebc13478766a91070c44b6
- * This file is autogenerated. Please do not edit it directly.
- * When editing run `npx macrome watch` then change the file this is generated from.
- */
-import _applyDecs from "@babel/runtime/helpers/applyDecs2305";
-let _initProto;
 import { re, spam as m } from '@bablr/boot';
 import { o, eat, match, eatMatch } from '@bablr/helpers/grammar';
-import { Node } from '@bablr/helpers/decorators';
+
 export const canonicalURL = 'https://bablr.org/languages/core/en/space-tab-newline';
-export const defaultMatcher = m`<__Blank />`;
+
+export const defaultMatcher = m`<__Blanks />`;
+
 export const grammar = class BlankSpaceGrammar {
-  static {
-    [_initProto] = _applyDecs(this, [[Node, 2, "Space"], [Node, 2, "LeftOffset"], [Node, 2, "Newline"], [Node, 2, "Indent"]], []).e;
-  }
-  constructor() {
-    _initProto(this);
+  *Blanks() {
+    while (yield eatMatch(m`<Blank />`));
   }
+
   *Blank() {
-    while (yield match(re`/[ \t\r\n]/`)) {
-      if (yield match(re`/^/m`)) {
-        yield eatMatch(m`<LeftOffset />`);
-        yield eatMatch(m`<*Space />`);
-      } else if (yield match(re`/[\r\n]/`)) {
-        yield eat(m`<*Newline />`);
-      } else {
-        yield eat(m`<*Space />`, o({
-          onlySameLine: true
-        }));
-      }
+    if (yield match(re`/^/m`)) {
+      yield eatMatch(m`<LeftOffset />`);
+      yield eatMatch(m`<*Space /[ \t\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 }));
     }
   }
-  *Space({
-    props: {
-      onlySameLine
-    }
-  }) {
+
+  *Space({ props: { onlySameLine } }) {
     if (onlySameLine) {
       yield eat(re`/[ \t]+/`);
     } else {
       yield eat(re`/[ \t\r\n]+/`);
     }
   }
+
   *LeftOffset() {
-    while (yield eatMatch(m`indents[]: <*Indent /\t|  / />`));
+    while (yield eatMatch(m`indents[]: <*Indent /\t|  / />`, o({}), o({ literal: true }))) {}
   }
+
   *Newline() {
     yield eat(re`/\r?\n?/`);
   }
+
   *Indent() {
     yield eat(re`/\t|  /`);
   }
-};
+};
+
+export default { canonicalURL, dependencies: {}, grammar, defaultMatcher };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bablr/language-en-blank-space",
-  "version": "0.9.0",
+  "version": "0.10.0",
   "description": "A BABLR language for tabs, spaces, and line terminators",
   "engines": {
     "node": ">=12.0.0"
@@ -14,21 +14,13 @@
     "lib/**/*.js"
   ],
   "sideEffects": false,
-  "scripts": {
-    "build": "macrome build",
-    "watch": "macrome watch",
-    "clean": "macrome clean"
-  },
   "dependencies": {
-    "@babel/runtime": "7.28.2",
-    "@bablr/helpers": "0.24.0",
-    "@bablr/agast-helpers": "0.9.0",
-    "@bablr/agast-vm-helpers": "0.9.0",
-    "@bablr/boot": "0.10.0"
+    "@bablr/helpers": "0.25.0",
+    "@bablr/agast-helpers": "0.10.0",
+    "@bablr/agast-vm-helpers": "0.10.0",
+    "@bablr/boot": "0.11.0"
   },
   "devDependencies": {
-    "@bablr/macrome": "^0.1.3",
-    "@bablr/macrome-generator-bablr": "^0.3.2",
     "@bablr/eslint-config-base": "github:bablr-lang/eslint-config-base#c97bfa4b3663f8378e9b3e42bb5a41e685406cf9",
     "enhanced-resolve": "^5.12.0",
     "eslint": "^8.47.0",
@@ -43,7 +35,10 @@
     "blankspace",
     "whitespace"
   ],
-  "repository": "git@github.com:bablr-lang/language-en-blank-space.git",
+  "repository": {
+    "type": "git",
+    "url": "git+ssh://git@github.com/bablr-lang/language-en-blank-space.git"
+  },
   "homepage": "https://github.com/bablr-lang/language-en-blank-space",
   "author": "Conrad Buck <conartist6@gmail.com>",
   "license": "MIT"

package/lib/grammar.macro.js

@@ -1,46 +0,0 @@
-import { re, spam as m } from '@bablr/boot';
-import { o, eat, match, eatMatch } from '@bablr/helpers/grammar';
-import { Node } from '@bablr/helpers/decorators';
-
-export const canonicalURL = 'https://bablr.org/languages/core/en/space-tab-newline';
-
-export const defaultMatcher = m`<__Blank />`;
-
-export const grammar = class BlankSpaceGrammar {
-  *Blank() {
-    while (yield match(re`/[ \t\r\n]/`)) {
-      if (yield match(re`/^/m`)) {
-        yield eatMatch(m`<LeftOffset />`);
-        yield eatMatch(m`<*Space />`);
-      } else if (yield match(re`/[\r\n]/`)) {
-        yield eat(m`<*Newline />`);
-      } else {
-        yield eat(m`<*Space />`, o({ onlySameLine: true }));
-      }
-    }
-  }
-
-  @Node
-  *Space({ props: { onlySameLine } }) {
-    if (onlySameLine) {
-      yield eat(re`/[ \t]+/`);
-    } else {
-      yield eat(re`/[ \t\r\n]+/`);
-    }
-  }
-
-  @Node
-  *LeftOffset() {
-    while (yield eatMatch(m`indents[]: <*Indent /\t|  / />`));
-  }
-
-  @Node
-  *Newline() {
-    yield eat(re`/\r?\n?/`);
-  }
-
-  @Node
-  *Indent() {
-    yield eat(re`/\t|  /`);
-  }
-};