ember-eslint-parser 0.3.2 → 0.3.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ember-eslint-parser",
-  "version": "0.3.2",
+  "version": "0.3.4",
   "description": "",
   "keywords": [],
   "repository": {
@@ -19,7 +19,7 @@
   ],
   "devDependencies": {
     "@babel/core": "^7.23.6",
-    "@typescript-eslint/parser": "^6.15.0",
+    "@typescript-eslint/parser": "^6.21.0",
     "concurrently": "^8.2.2",
     "eslint": "^8.0.1",
     "eslint-config-prettier": "^9.1.0",
@@ -30,17 +30,17 @@
     "eslint-plugin-promise": "^6.0.0",
     "execa": "^8.0.1",
     "fs-extra": "^11.2.0",
-    "vite": "^5.0.12",
-    "vitest": "^1.2.2",
-    "prettier": "^3.1.1",
+    "prettier": "^3.2.5",
     "publint": "^0.2.6",
-    "release-plan": "^0.6.0",
-    "typescript": "^5.3.3"
+    "release-plan": "^0.7.0",
+    "typescript": "^5.3.3",
+    "vite": "^5.0.12",
+    "vitest": "^1.2.2"
   },
   "dependencies": {
-    "@babel/eslint-parser": "^7.23.3",
+    "@babel/eslint-parser": "7.23.10",
     "@glimmer/syntax": "^0.88.0",
-    "@typescript-eslint/scope-manager": "^6.15.0",
+    "@typescript-eslint/scope-manager": "^6.21.0",
     "content-tag": "^1.2.2",
     "eslint-scope": "^7.2.2",
     "html-tags": "^3.3.1"

package/src/parser/gjs-gts-parser.js

@@ -8,8 +8,6 @@ const {
 } = require('./ts-patch');
 const { transformForLint, preprocessGlimmerTemplates, convertAst } = require('./transforms');
 
-patchTs();
-
 /**
  * implements https://eslint.org/docs/latest/extend/custom-parsers
  * 1. transforms gts/gjs files into parseable ts/js without changing the offsets and locations around it
@@ -23,12 +21,13 @@ patchTs();
  */
 module.exports = {
   parseForESLint(code, options) {
+    patchTs();
     registerParsedFile(options.filePath);
     let jsCode = code;
     const info = transformForLint(code);
     jsCode = info.output;
 
-    const isTypescript = options.filePath.endsWith('.gts');
+    const isTypescript = options.filePath.endsWith('.gts') || options.filePath.endsWith('.ts');
 
     let result = null;
     const filePath = options.filePath;

package/src/parser/transforms.js

@@ -24,7 +24,7 @@ function sliceByteRange(str, a, b) {
 
 function byteToCharIndex(str, byteOffset) {
   const buf = getBuffer(str);
-  return buf.slice(0, byteOffset + 1).toString().length - 1;
+  return buf.slice(0, byteOffset).toString().length;
 }
 
 function byteLength(str) {
@@ -419,7 +419,7 @@ module.exports.convertAst = function convertAst(result, preprocessedResult, visi
     if (
       node.type === 'ExpressionStatement' ||
       node.type === 'StaticBlock' ||
-      node.type === 'TaggedTemplateExpression' ||
+      node.type === 'TemplateLiteral' ||
       node.type === 'ExportDefaultDeclaration'
     ) {
       let range = node.range;
@@ -563,9 +563,9 @@ module.exports.transformForLint = function transformForLint(code) {
       jsCode = replaceRange(jsCode, tplInfo.range.start, tplInfo.range.end, replacementCode);
     } else {
       const tplLength = tplInfo.range.end - tplInfo.range.start;
-      const spaces = tplLength - byteLength(content) - '""`'.length - '`'.length - backticks;
+      const spaces = tplLength - byteLength(content) - '`'.length - '`'.length - backticks;
       const total = content + ' '.repeat(spaces);
-      const replacementCode = `""\`${total}\``;
+      const replacementCode = `\`${total}\``;
       jsCode = replaceRange(jsCode, tplInfo.range.start, tplInfo.range.end, replacementCode);
     }
   }

package/src/parser/ts-patch.js

@@ -1,14 +1,17 @@
 const fs = require('node:fs');
 const { transformForLint } = require('./transforms');
-const babel = require('@babel/core');
 const { replaceRange } = require('./transforms');
 
-let patchTs, replaceExtensions, syncMtsGtsSourceFiles, typescriptParser;
+let patchTs, replaceExtensions, syncMtsGtsSourceFiles, typescriptParser, isPatched;
 
 try {
   const ts = require('typescript');
   typescriptParser = require('@typescript-eslint/parser');
   patchTs = function patchTs() {
+    if (isPatched) {
+      return;
+    }
+    isPatched = true;
     const sys = { ...ts.sys };
     const newSys = {
       ...ts.sys,
@@ -32,13 +35,23 @@ try {
           content = fs.readFileSync(fileName).toString();
         }
         if (fileName.endsWith('.gts')) {
-          content = transformForLint(content).output;
+          try {
+            content = transformForLint(content).output;
+          } catch (e) {
+            console.error('failed to transformForLint for gts processing');
+            console.error(e);
+          }
         }
         if (
           (!fileName.endsWith('.d.ts') && fileName.endsWith('.ts')) ||
           fileName.endsWith('.gts')
         ) {
-          content = replaceExtensions(content);
+          try {
+            content = replaceExtensions(content);
+          } catch (e) {
+            console.error('failed to replace extensions for gts processing');
+            console.error(e);
+          }
         }
         return content;
       },
@@ -48,20 +61,12 @@ try {
 
   replaceExtensions = function replaceExtensions(code) {
     let jsCode = code;
-    const babelParseResult = babel.parse(jsCode, {
-      parserOpts: { ranges: true, plugins: ['typescript'] },
-    });
+    const sourceFile = ts.createSourceFile('__x__.ts', code, ts.ScriptTarget.Latest);
     const length = jsCode.length;
-    for (const b of babelParseResult.program.body) {
-      if (b.type === 'ImportDeclaration' && b.source.value.endsWith('.gts')) {
-        const value = b.source.value.replace(/\.gts$/, '.mts');
-        const strWrapper = jsCode[b.source.start];
-        jsCode = replaceRange(
-          jsCode,
-          b.source.start,
-          b.source.end,
-          strWrapper + value + strWrapper
-        );
+    for (const b of sourceFile.statements) {
+      if (b.kind === ts.SyntaxKind.ImportDeclaration && b.moduleSpecifier.text.endsWith('.gts')) {
+        const value = b.moduleSpecifier.text.replace(/\.gts$/, '.mts');
+        jsCode = replaceRange(jsCode, b.moduleSpecifier.pos + 2, b.moduleSpecifier.end - 1, value);
       }
     }
     if (length !== jsCode.length) {