ember-eslint-parser 0.3.7 → 0.4.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ember-eslint-parser",
-  "version": "0.3.7",
+  "version": "0.4.0",
   "description": "",
   "keywords": [],
   "repository": {
@@ -19,8 +19,8 @@
   ],
   "devDependencies": {
     "@babel/core": "^7.23.6",
-    "@typescript-eslint/parser": "^6.21.0",
-    "@typescript-eslint/visitor-keys": "^6.21.0",
+    "@typescript-eslint/parser": "^7.1.0",
+    "@typescript-eslint/visitor-keys": "^7.1.0",
     "concurrently": "^8.2.2",
     "eslint": "^8.0.1",
     "eslint-config-prettier": "^9.1.0",
@@ -33,7 +33,7 @@
     "fs-extra": "^11.2.0",
     "prettier": "^3.2.5",
     "publint": "^0.2.6",
-    "release-plan": "^0.7.0",
+    "release-plan": "^0.8.0",
     "typescript": "^5.3.3",
     "vite": "^5.0.12",
     "vitest": "^1.2.2"
@@ -41,7 +41,7 @@
   "dependencies": {
     "@babel/eslint-parser": "7.23.10",
     "@glimmer/syntax": "^0.88.0",
-    "@typescript-eslint/scope-manager": "^6.21.0",
+    "@typescript-eslint/scope-manager": "^7.1.0",
     "content-tag": "^1.2.2",
     "eslint-scope": "^7.2.2",
     "html-tags": "^3.3.1"
@@ -51,15 +51,15 @@
   },
   "peerDependencies": {
     "@babel/core": "^7.23.6",
-    "@typescript-eslint/parser": "^6.15.0",
+    "@typescript-eslint/parser": "^7.1.0",
     "typescript": "^5.3.3"
   },
   "scripts": {
     "test": "vitest run",
     "lint": "concurrently \"npm:lint:*(!fix)\" --names \"lint:\"",
-    "lint:js": "eslint .",
+    "lint:js": "eslint . --max-warnings=0",
     "lint:package": "pnpm publint",
     "lint:fix": "concurrently \"npm:lint:*:fix\" --names \"fix:\"",
-    "lint:js:fix": "eslint . --fix"
+    "lint:js:fix": "eslint . --fix --max-warnings=0"
   }
 }

package/src/parser/transforms.js

@@ -566,20 +566,16 @@ module.exports.transformForLint = function transformForLint(code) {
    */
   const result = processor.parse(code);
   for (const tplInfo of result.reverse()) {
-    const backticks = [...tplInfo.contents].reduce(
-      (prev, curr) => (prev + (curr.codePointAt(0) === '`') ? 1 : 0),
-      0
-    );
-    const content = tplInfo.contents.replace(/`/g, '\\`');
+    const content = tplInfo.contents.replace(/`/g, '\\`').replace(/\$/g, '\\$');
     if (tplInfo.type === 'class-member') {
       const tplLength = tplInfo.range.end - tplInfo.range.start;
-      const spaces = tplLength - byteLength(content) - 'static{`'.length - '`}'.length - backticks;
+      const spaces = tplLength - byteLength(content) - 'static{`'.length - '`}'.length;
       const total = content + ' '.repeat(spaces);
       const replacementCode = `static{\`${total}\`}`;
       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;
       const total = content + ' '.repeat(spaces);
       const replacementCode = `\`${total}\``;
       jsCode = replaceRange(jsCode, tplInfo.range.start, tplInfo.range.end, replacementCode);

package/src/parser/ts-patch.js

@@ -23,15 +23,19 @@ try {
         ];
       },
       fileExists(fileName) {
-        return fs.existsSync(fileName.replace(/\.mts$/, '.gts')) || fs.existsSync(fileName);
+        return fs.existsSync(fileName.replace(/\.m?ts$/, '.gts')) || fs.existsSync(fileName);
       },
       readFile(fname) {
         let fileName = fname;
         let content = '';
+        if (fileName.endsWith('tsconfig.tsbuildinfo')) {
+          return content;
+        }
+
         try {
           content = fs.readFileSync(fileName).toString();
         } catch {
-          fileName = fileName.replace(/\.mts$/, '.gts');
+          fileName = fileName.replace(/\.m?ts$/, '.gts');
           content = fs.readFileSync(fileName).toString();
         }
         if (fileName.endsWith('.gts')) {
@@ -83,8 +87,8 @@ try {
     const sourceFiles = program.getSourceFiles();
     for (const sourceFile of sourceFiles) {
       // check for deleted gts files, need to remove mts as well
-      if (sourceFile.path.endsWith('.mts') && sourceFile.isVirtualGts) {
-        const gtsFile = program.getSourceFile(sourceFile.path.replace(/\.mts$/, '.gts'));
+      if (sourceFile.path.match(/\.m?ts$/) && sourceFile.isVirtualGts) {
+        const gtsFile = program.getSourceFile(sourceFile.path.replace(/\.m?ts$/, '.gts'));
         if (!gtsFile) {
           sourceFile.version = null;
         }
@@ -93,7 +97,10 @@ try {
         /**
          * @type {ts.SourceFile}
          */
-        const mtsSourceFile = program.getSourceFile(sourceFile.path.replace(/\.gts$/, '.mts'));
+        let mtsSourceFile = program.getSourceFile(sourceFile.path.replace(/\.gts$/, '.mts'));
+        if (!mtsSourceFile) {
+          mtsSourceFile = program.getSourceFile(sourceFile.path.replace(/\.gts$/, '.ts'));
+        }
         if (mtsSourceFile) {
           const keep = {
             fileName: mtsSourceFile.fileName,