More cleanup

Author: NullVoxPopuli

src/parser/hbs-parser.js

@@ -1,7 +1,6 @@
 const eslintScope = require('eslint-scope');
 const DocumentLines = require('../utils/document');
-const { visitorKeys: glimmerVisitorKeys } = require('@glimmer/syntax');
-const { processGlimmerTemplate } = require('./transforms');
+const { processGlimmerTemplate, buildGlimmerVisitorKeys } = require('./transforms');
 
 /**
  * implements https://eslint.org/docs/latest/extend/custom-parsers
@@ -64,15 +63,8 @@ module.exports = {
       },
     };
 
-    // Build visitor keys: Program + all Glimmer node types prefixed
-    const visitorKeys = { Program: ['body'] };
-    for (const [k, v] of Object.entries(glimmerVisitorKeys)) {
-      visitorKeys[`Glimmer${k}`] = [...v];
-    }
-    if (!visitorKeys.GlimmerElementNode.includes('blockParamNodes')) {
-      visitorKeys.GlimmerElementNode.push('blockParamNodes', 'parts');
-    }
-    visitorKeys.GlimmerTemplate = ['body'];
+    // Build visitor keys: Program + all Glimmer node types
+    const visitorKeys = { Program: ['body'], ...buildGlimmerVisitorKeys() };
 
     // Create an empty scope manager.
     // For HBS, all locals are assumed to be defined at runtime,

src/parser/transforms.js

@@ -112,14 +112,32 @@ function registerNodeInScope(node, scope, variable) {
   scope.references.push(ref);
 }
 
+/**
+ * Builds the complete Glimmer visitor keys map with "Glimmer" prefix and
+ * additional keys needed for traversal (blockParamNodes, parts, etc).
+ * @return {object}
+ */
+function buildGlimmerVisitorKeys() {
+  const keys = {};
+  for (const [k, v] of Object.entries(glimmerVisitorKeys)) {
+    keys[`Glimmer${k}`] = [...v];
+  }
+  if (!keys.GlimmerElementNode.includes('blockParamNodes')) {
+    keys.GlimmerElementNode.push('blockParamNodes', 'parts');
+  }
+  keys.GlimmerProgram = ['body', 'blockParamNodes'];
+  keys.GlimmerTemplate = ['body'];
+  return keys;
+}
+
 /**
  * traverses all nodes using the {visitorKeys} calling the callback function, visitor
  * @param visitorKeys
  * @param node
  * @param visitor
  */
 function traverse(visitorKeys, node, visitor) {
-  const allVisitorKeys = visitorKeys;
+  const allVisitorKeys = { ...visitorKeys, ...buildGlimmerVisitorKeys() };
   const queue = [];
 
   queue.push({
@@ -137,17 +155,7 @@ function traverse(visitorKeys, node, visitor) {
 
     if (!currentPath.node) continue;
 
-    const visitorKeys = [...(allVisitorKeys[currentPath.node.type] || [])];
-    if (currentPath.node.type === 'GlimmerElementNode') {
-      if (!visitorKeys.includes('blockParamNodes')) {
-        visitorKeys.push('blockParamNodes', 'parts');
-      }
-    }
-    if (currentPath.node.type === 'GlimmerProgram') {
-      if (!visitorKeys.includes('blockParamNodes')) {
-        visitorKeys.push('blockParamNodes');
-      }
-    }
+    const visitorKeys = allVisitorKeys[currentPath.node.type];
     if (!visitorKeys) {
       continue;
     }
@@ -727,3 +735,4 @@ module.exports.transformForLint = function transformForLint(code, fileName) {
 module.exports.traverse = traverse;
 module.exports.tokenize = tokenize;
 module.exports.processGlimmerTemplate = processGlimmerTemplate;
+module.exports.buildGlimmerVisitorKeys = buildGlimmerVisitorKeys;

tests/hbs-parser.test.js

@@ -42,6 +42,7 @@ describe('hbs-parser', () => {
       expectedVisitorKeys[`Glimmer${k}`] = [...v];
     }
     expectedVisitorKeys.GlimmerTemplate = ['body'];
+    expectedVisitorKeys.GlimmerProgram = ['body', 'blockParamNodes'];
     if (!expectedVisitorKeys.GlimmerElementNode.includes('blockParamNodes')) {
       expectedVisitorKeys.GlimmerElementNode.push('blockParamNodes', 'parts');
     }