ember-eslint-parser 0.4.0 → 0.4.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ember-eslint-parser",
-  "version": "0.4.0",
+  "version": "0.4.2",
   "description": "",
   "keywords": [],
   "repository": {
@@ -19,6 +19,7 @@
   ],
   "devDependencies": {
     "@babel/core": "^7.23.6",
+    "@typescript-eslint/scope-manager": "^7.1.0",
     "@typescript-eslint/parser": "^7.1.0",
     "@typescript-eslint/visitor-keys": "^7.1.0",
     "concurrently": "^8.2.2",
@@ -40,8 +41,7 @@
   },
   "dependencies": {
     "@babel/eslint-parser": "7.23.10",
-    "@glimmer/syntax": "^0.88.0",
-    "@typescript-eslint/scope-manager": "^7.1.0",
+    "@glimmer/syntax": "^0.92.0",
     "content-tag": "^1.2.2",
     "eslint-scope": "^7.2.2",
     "html-tags": "^3.3.1"
@@ -51,8 +51,12 @@
   },
   "peerDependencies": {
     "@babel/core": "^7.23.6",
-    "@typescript-eslint/parser": "^7.1.0",
-    "typescript": "^5.3.3"
+    "@typescript-eslint/parser": "*"
+  },
+  "peerDependenciesMeta": {
+    "@typescript-eslint/parser": {
+      "optional": true
+    }
   },
   "scripts": {
     "test": "vitest run",

package/src/parser/transforms.js

@@ -2,10 +2,18 @@ const ContentTag = require('content-tag');
 const glimmer = require('@glimmer/syntax');
 const DocumentLines = require('../utils/document');
 const { visitorKeys: glimmerVisitorKeys } = require('@glimmer/syntax');
-const TypescriptScope = require('@typescript-eslint/scope-manager');
 const { Reference, Scope, Variable, Definition } = require('eslint-scope');
 const htmlTags = require('html-tags');
 
+let TypescriptScope = null;
+try {
+  const path = require.resolve('@typescript-eslint/parser');
+  // eslint-disable-next-line n/no-unpublished-require
+  TypescriptScope = require('@typescript-eslint/scope-manager', { paths: [path] });
+} catch {
+  // not available
+}
+
 const BufferMap = new Map();
 
 function getBuffer(str) {
@@ -312,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),
@@ -323,9 +331,9 @@ module.exports.preprocessGlimmerTemplates = function preprocessGlimmerTemplates(
           };
           return {
             ...p,
+            name: p.original,
             parent: n,
             type: 'GlimmerElementNodePart',
-            name: p.value,
             range,
             loc,
           };
@@ -333,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),
@@ -345,8 +352,9 @@ module.exports.preprocessGlimmerTemplates = function preprocessGlimmerTemplates(
           };
           return {
             ...p,
+            type: 'BlockParam',
+            name: p.original,
             parent: n,
-            name: p.value,
             range,
             loc,
           };
@@ -500,12 +508,17 @@ 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);
       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);
       }
     }
     return null;

package/src/parser/ts-patch.js

@@ -5,7 +5,9 @@ const { replaceRange } = require('./transforms');
 let patchTs, replaceExtensions, syncMtsGtsSourceFiles, typescriptParser, isPatched;
 
 try {
-  const ts = require('typescript');
+  const tsPath = require.resolve('@typescript-eslint/parser');
+  // eslint-disable-next-line n/no-unpublished-require
+  const ts = require('typescript', { paths: [tsPath] });
   typescriptParser = require('@typescript-eslint/parser');
   patchTs = function patchTs() {
     if (isPatched) {