@halleyassist/rule-templater 0.0.7 → 0.0.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@halleyassist/rule-templater",
-  "version": "0.0.7",
+  "version": "0.0.8",
   "description": "The grammar for HalleyAssist rules",
   "main": "src/RuleTemplater.production.js",
   "browser": "./dist/rule-templater.browser.js",
@@ -20,11 +20,11 @@
   },
   "homepage": "https://github.com/HalleyAssist/rule-templater#readme",
   "dependencies": {
-    "@halleyassist/rule-parser": "^1.0.21",
+    "@halleyassist/rule-parser": "^1.0.22",
     "ebnf": "git+https://github.com/HalleyAssist/node-ebnf.git"
   },
   "devDependencies": {
-    "@types/node": "^25.3.0",
+    "@types/node": "^25.3.1",
     "browserify": "^17.0.1",
     "chai": "^4",
     "gulp": "^5.0.1",

package/src/RuleTemplater.js

@@ -1,9 +1,9 @@
-// Note: We import the internal RuleParser.ebnf to extend the grammar with template rules.
-// This creates coupling to the internal structure of @halleyassist/rule-parser.
-const RuleParserRules = require('@halleyassist/rule-parser/src/RuleParser.ebnf'),
-      TemplateGrammar = require('./RuleTemplate.ebnf'),
+// Note: We are coupled closely with the ebnf grammar structure of rule-parser
+const TemplateGrammar = require('./RuleTemplate.ebnf'),
       TemplateFilters = require('./TemplateFilters'),
-        {Parser} = require('ebnf');
+      RuleParser = require('@halleyassist/rule-parser'),
+      RuleParserRules = RuleParser.ParserRules,
+      {Parser} = require('ebnf');
 
 let ParserCache = null;
 
@@ -69,7 +69,7 @@ class RuleTemplate {
             ParserCache = new Parser(ParserRules, {debug: false})
         }
 
-        const ast = ParserCache.getAST(ruleTemplate.trim(), 'statement_main');
+        const ast = RuleParser.toAst(ruleTemplate.trim(), ParserCache);
         return new RuleTemplate(ruleTemplate, ast);
     }
 

package/src/RuleTemplater.production.js

@@ -1,9 +1,9 @@
-// Note: We import the internal RuleParser.ebnf to extend the grammar with template rules.
-// This creates coupling to the internal structure of @halleyassist/rule-parser.
-const RuleParserRules = require('@halleyassist/rule-parser/src/RuleParser.ebnf'),
-      TemplateGrammar = require('./RuleTemplate.production.ebnf.js'),
+// Note: We are coupled closely with the ebnf grammar structure of rule-parser
+const TemplateGrammar = require('./RuleTemplate.production.ebnf.js'),
       TemplateFilters = require('./TemplateFilters'),
-        {Parser} = require('ebnf');
+      RuleParser = require('@halleyassist/rule-parser'),
+      RuleParserRules = RuleParser.ParserRules,
+      {Parser} = require('ebnf');
 
 let ParserCache = null;
 
@@ -69,7 +69,7 @@ class RuleTemplate {
             ParserCache = new Parser(ParserRules, {debug: false})
         }
 
-        const ast = ParserCache.getAST(ruleTemplate.trim(), 'statement_main');
+        const ast = RuleParser.toAst(ruleTemplate.trim(), ParserCache);
         return new RuleTemplate(ruleTemplate, ast);
     }