ember-eslint-parser 0.12.1 → 0.14.0

package/package.json

@@ -1,11 +1,11 @@
 {
   "name": "ember-eslint-parser",
-  "version": "0.12.1",
+  "version": "0.14.0",
   "description": "",
   "keywords": [],
   "repository": {
     "type": "git",
-    "url": "git@github.com:ember-tooling/ember-eslint-parser.git"
+    "url": "git+https://github.com/ember-tooling/ember-eslint-parser.git"
   },
   "license": "ISC",
   "author": "",
@@ -55,7 +55,7 @@
     "vitest": "^1.2.2"
   },
   "peerDependencies": {
-    "@babel/eslint-parser": "^7.28.6",
+    "@babel/eslint-parser": "^7.28.6 || ^8.0.0",
     "@typescript-eslint/parser": "*"
   },
   "peerDependenciesMeta": {

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

@@ -1,5 +1,4 @@
 import { createRequire } from 'node:module';
-import tsconfigUtils from '@typescript-eslint/tsconfig-utils';
 import { registerParsedFile } from '../preprocessor/noop.js';
 import { patchTs, replaceExtensions, syncMtsGtsSourceFiles, typescriptParser } from './ts-patch.js';
 import { buildGlimmerVisitors } from './transforms.js';
@@ -13,15 +12,20 @@ const require = createRequire(import.meta.url);
 // peer (TS-only setups don't need it), so a missing dep yields null and the JS
 // path below emits a targeted error.
 //
-// The experimental-worker entry point runs babel in a worker and matches the
-// parser ember-cli wires up for plain `.js` files in JS-only apps, so config
-// discovery (decorators & friends) lines up with how the rest of the project
-// is being parsed.
+// Matches the parser ember-cli wires up for plain `.js` files in JS-only
+// apps, so config discovery (decorators & friends) lines up with how the
+// rest of the project is being parsed.
 let babelParser = null;
 try {
+  // @babel/eslint-parser < 8
   babelParser = require('@babel/eslint-parser/experimental-worker');
 } catch {
-  // optional peer; left null
+  try {
+    // @babel/eslint-parser >= 8
+    babelParser = require('@babel/eslint-parser');
+  } catch {
+    // optional peer; left null
+  }
 }
 
 /**
@@ -35,115 +39,6 @@ try {
  * a second AST traversal.
  */
 
-/**
- * @param {string} tsconfigPath
- * @param {string} rootDir
- * @returns {boolean|undefined}
- */
-function parseAllowJsFromTsconfig(tsconfigPath, rootDir) {
-  try {
-    const parserPath = require.resolve('@typescript-eslint/parser');
-    // eslint-disable-next-line n/no-unpublished-require
-    const tsPath = require.resolve('typescript', { paths: [parserPath] });
-    const ts = require(tsPath);
-    const parsed = tsconfigUtils.getParsedConfigFile(ts, tsconfigPath, rootDir);
-    return parsed?.options?.allowJs;
-  } catch (e) {
-    // eslint-disable-next-line no-console
-    console.warn('[ember-eslint-parser] Failed to parse tsconfig:', tsconfigPath, e);
-    return undefined;
-  }
-}
-
-/**
- * @param {Array<boolean|undefined>} values
- * @param {string} source
- * @returns {boolean|null}
- */
-function resolveAllowJs(values, source) {
-  const filtered = values.filter((val) => typeof val !== 'undefined');
-  if (filtered.length > 0) {
-    const uniqueValues = [...new Set(filtered)];
-    if (uniqueValues.length > 1) {
-      // eslint-disable-next-line no-console
-      console.warn(
-        `[ember-eslint-parser] Conflicting allowJs values in ${source}. Defaulting allowGjs to false.`
-      );
-      return false;
-    } else {
-      return uniqueValues[0];
-    }
-  }
-  return null;
-}
-
-/**
- * @param {Array<{getCompilerOptions?: Function}>|undefined} programs
- * @returns {boolean|null}
- */
-function getAllowJsFromPrograms(programs) {
-  if (!Array.isArray(programs) || programs.length === 0) return null;
-  const allowJsValues = programs
-    .map((p) => p.getCompilerOptions?.())
-    .filter(Boolean)
-    .map((opts) => opts.allowJs);
-  return resolveAllowJs(allowJsValues, 'programs');
-}
-
-/**
- * @param {boolean|object|undefined} projectService
- * @returns {string|null}
- */
-function getProjectServiceTsconfigPath(projectService) {
-  if (!projectService) return null;
-
-  if (projectService === true) {
-    return 'tsconfig.json';
-  }
-
-  if (typeof projectService === 'object') {
-    if (typeof projectService.allowDefaultProject !== 'undefined') {
-      // eslint-disable-next-line no-console
-      console.warn(
-        '[ember-eslint-parser] projectService.allowDefaultProject is specified. Behavior may differ depending on default project config.'
-      );
-    }
-    return projectService.defaultProject ?? 'tsconfig.json';
-  }
-
-  return null;
-}
-
-/**
- * Returns the resolved allowJs value based on priority: programs > projectService > project/tsconfig
- */
-function getAllowJs(options) {
-  const allowJsFromPrograms = getAllowJsFromPrograms(options.programs);
-  if (allowJsFromPrograms !== null) return allowJsFromPrograms;
-
-  const rootDir = options.tsconfigRootDir || process.cwd();
-
-  const projectServiceTsconfigPath = getProjectServiceTsconfigPath(options.projectService);
-  if (projectServiceTsconfigPath) {
-    return parseAllowJsFromTsconfig(projectServiceTsconfigPath, rootDir);
-  }
-
-  let tsconfigPaths = [];
-  if (Array.isArray(options.project)) {
-    tsconfigPaths = options.project;
-  } else if (typeof options.project === 'string') {
-    tsconfigPaths = [options.project];
-  } else if (options.project) {
-    tsconfigPaths = ['tsconfig.json'];
-  }
-  if (tsconfigPaths.length > 0) {
-    const allowJsValues = tsconfigPaths.map((cfg) => parseAllowJsFromTsconfig(cfg, rootDir));
-    return resolveAllowJs(allowJsValues, 'project');
-  }
-
-  return false;
-}
-
 /**
  * @type {import('eslint').ParserModule}
  */
@@ -153,12 +48,9 @@ export const meta = {
 };
 
 export function parseForESLint(code, options) {
-  const allowGjsWasSet = options.allowGjs !== undefined;
-  const allowGjs = allowGjsWasSet ? options.allowGjs : getAllowJs(options);
-  let actualAllowGjs;
   // Only patch TypeScript if we actually need it.
   if (options.programs || options.projectService || options.project) {
-    ({ allowGjs: actualAllowGjs } = patchTs({ allowGjs }));
+    patchTs();
   }
   registerParsedFile(options.filePath);
 
@@ -260,19 +152,6 @@ export function parseForESLint(code, options) {
     }
 
     if (result.services?.program) {
-      const programAllowJs = result.services.program.getCompilerOptions?.()?.allowJs;
-      if (
-        !allowGjsWasSet &&
-        programAllowJs !== undefined &&
-        actualAllowGjs !== undefined &&
-        actualAllowGjs !== programAllowJs
-      ) {
-        // eslint-disable-next-line no-console
-        console.warn(
-          '[ember-eslint-parser] allowJs does not match the actual program. Consider setting allowGjs explicitly.\n' +
-            `    Current: ${allowGjs}, Program: ${programAllowJs}`
-        );
-      }
       syncMtsGtsSourceFiles(result.services.program);
     }
 

package/src/parser/ts-patch.js

@@ -4,7 +4,7 @@ import { transformForLint, replaceRange } from './transforms.js';
 
 const require = createRequire(import.meta.url);
 
-let patchTs, replaceExtensions, syncMtsGtsSourceFiles, typescriptParser, isPatched, allowGjs;
+let patchTs, replaceExtensions, syncMtsGtsSourceFiles, typescriptParser, isPatched;
 
 try {
   const parserPath = require.resolve('@typescript-eslint/parser');
@@ -12,10 +12,9 @@ try {
   const tsPath = require.resolve('typescript', { paths: [parserPath] });
   const ts = require(tsPath);
   typescriptParser = require('@typescript-eslint/parser');
-  patchTs = function patchTs(options = {}) {
-    if (isPatched) return { allowGjs };
+  patchTs = function patchTs() {
+    if (isPatched) return;
     isPatched = true;
-    allowGjs = options.allowGjs !== undefined ? options.allowGjs : true;
     const sys = { ...ts.sys };
     const newSys = {
       ...ts.sys,
@@ -24,14 +23,14 @@ try {
         const gtsVirtuals = results
           .filter((x) => x.endsWith('.gts'))
           .map((f) => f.replace(/\.gts$/, '.mts'));
-        const gjsVirtuals = allowGjs
-          ? results.filter((x) => x.endsWith('.gjs')).map((f) => f.replace(/\.gjs$/, '.mjs'))
-          : [];
+        const gjsVirtuals = results
+          .filter((x) => x.endsWith('.gjs'))
+          .map((f) => f.replace(/\.gjs$/, '.mjs'));
         return results.concat(gtsVirtuals, gjsVirtuals);
       },
       fileExists(fileName) {
         const gtsExists = fs.existsSync(fileName.replace(/\.m?ts$/, '.gts'));
-        const gjsExists = allowGjs ? fs.existsSync(fileName.replace(/\.m?js$/, '.gjs')) : false;
+        const gjsExists = fs.existsSync(fileName.replace(/\.m?js$/, '.gjs'));
         return gtsExists || gjsExists || fs.existsSync(fileName);
       },
       readFile(fname) {
@@ -46,12 +45,12 @@ try {
         } catch {
           if (fileName.match(/\.m?ts$/)) {
             fileName = fileName.replace(/\.m?ts$/, '.gts');
-          } else if (allowGjs && fileName.match(/\.m?js$/)) {
+          } else if (fileName.match(/\.m?js$/)) {
             fileName = fileName.replace(/\.m?js$/, '.gjs');
           }
           content = fs.readFileSync(fileName).toString();
         }
-        if (fileName.endsWith('.gts') || (allowGjs && fileName.endsWith('.gjs'))) {
+        if (fileName.endsWith('.gts') || fileName.endsWith('.gjs')) {
           try {
             content = transformForLint(content).output;
           } catch (e) {
@@ -62,7 +61,7 @@ try {
         if (
           (!fileName.endsWith('.d.ts') && fileName.endsWith('.ts')) ||
           fileName.endsWith('.gts') ||
-          (allowGjs && fileName.endsWith('.gjs'))
+          fileName.endsWith('.gjs')
         ) {
           try {
             content = replaceExtensions(content);
@@ -75,7 +74,6 @@ try {
       },
     };
     ts.setSys(newSys);
-    return { allowGjs };
   };
 
   replaceExtensions = function replaceExtensions(code) {