ember-eslint-parser 0.3.8 → 0.4.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ember-eslint-parser",
-  "version": "0.3.8",
+  "version": "0.4.1",
   "description": "",
   "keywords": [],
   "repository": {
@@ -19,8 +19,9 @@
   ],
   "devDependencies": {
     "@babel/core": "^7.23.6",
-    "@typescript-eslint/parser": "^6.21.0",
-    "@typescript-eslint/visitor-keys": "^6.21.0",
+    "@typescript-eslint/scope-manager": "^7.1.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 +34,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 +42,6 @@
   "dependencies": {
     "@babel/eslint-parser": "7.23.10",
     "@glimmer/syntax": "^0.88.0",
-    "@typescript-eslint/scope-manager": "^6.21.0",
     "content-tag": "^1.2.2",
     "eslint-scope": "^7.2.2",
     "html-tags": "^3.3.1"
@@ -51,15 +51,19 @@
   },
   "peerDependencies": {
     "@babel/core": "^7.23.6",
-    "@typescript-eslint/parser": "^6.15.0",
-    "typescript": "^5.3.3"
+    "@typescript-eslint/parser": "*"
+  },
+  "peerDependenciesMeta": {
+    "@typescript-eslint/parser": {
+      "optional": true
+    }
   },
   "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

@@ -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) {
@@ -566,20 +574,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

@@ -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) {