ember-eslint-parser 0.4.1 → 0.4.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ember-eslint-parser",
-  "version": "0.4.1",
+  "version": "0.4.3",
   "description": "",
   "keywords": [],
   "repository": {
@@ -41,7 +41,7 @@
   },
   "dependencies": {
     "@babel/eslint-parser": "7.23.10",
-    "@glimmer/syntax": "^0.88.0",
+    "@glimmer/syntax": "^0.92.0",
     "content-tag": "^1.2.2",
     "eslint-scope": "^7.2.2",
     "html-tags": "^3.3.1"

package/src/parser/transforms.js

@@ -320,7 +320,7 @@ module.exports.preprocessGlimmerTemplates = function preprocessGlimmerTemplates(
 
       if (n.type === 'ElementNode') {
         n.name = n.tag;
-        n.parts = n.parts.map((p) => {
+        n.parts = [n.path.head].map((p) => {
           const range = [
             offset + docLines.positionToOffset(p.loc.start),
             offset + docLines.positionToOffset(p.loc.end),
@@ -331,9 +331,9 @@ module.exports.preprocessGlimmerTemplates = function preprocessGlimmerTemplates(
           };
           return {
             ...p,
+            name: p.original,
             parent: n,
             type: 'GlimmerElementNodePart',
-            name: p.value,
             range,
             loc,
           };
@@ -341,8 +341,7 @@ module.exports.preprocessGlimmerTemplates = function preprocessGlimmerTemplates(
       }
 
       if ('blockParams' in n) {
-        // program does have blockParams but not blockParamNodes
-        n.params = (n.blockParamNodes || []).map((p) => {
+        n.params = (n.params || []).map((p) => {
           const range = [
             offset + docLines.positionToOffset(p.loc.start),
             offset + docLines.positionToOffset(p.loc.end),
@@ -353,8 +352,9 @@ module.exports.preprocessGlimmerTemplates = function preprocessGlimmerTemplates(
           };
           return {
             ...p,
+            type: 'BlockParam',
+            name: p.original,
             parent: n,
-            name: p.value,
             range,
             loc,
           };
@@ -508,12 +508,33 @@ module.exports.convertAst = function convertAst(result, preprocessedResult, visi
       const scope = result.isTypescript
         ? new TypescriptScope.BlockScope(result.scopeManager, upperScope, node)
         : new Scope(result.scopeManager, 'block', upperScope, node);
+      const declaredVariables =
+        result.scopeManager.declaredVariables || result.scopeManager.__declaredVariables;
+      const vars = [];
+      declaredVariables.set(node, vars);
+      const virtualJSParentNode = {
+        type: 'FunctionDeclaration',
+        params: node.params,
+        range: node.range,
+        loc: node.loc,
+        parent: path.parent,
+      };
       for (const [i, b] of node.params.entries()) {
         const v = new Variable(b.name, scope);
         v.identifiers.push(b);
-        v.defs.push(new Definition('Parameter', b, node, node, i, 'Block Param'));
         scope.variables.push(v);
         scope.set.set(b.name, v);
+        vars.push(v);
+
+        const virtualJSNode = {
+          type: 'Identifier',
+          name: b.name,
+          range: b.range,
+          loc: b.loc,
+          parent: virtualJSParentNode,
+        };
+        v.defs.push(new Definition('Parameter', virtualJSNode, node, node, i, 'Block Param'));
+        v.defs.push(new Definition('Parameter', b, node, node, i, 'Block Param'));
       }
     }
     return null;