From b0598f8c6784bc30cd81a66a7b71705a78b2e324 Mon Sep 17 00:00:00 2001 From: Kirk Waiblinger <53019676+kirkwaiblinger@users.noreply.github.com> Date: Thu, 17 Jul 2025 12:07:05 -0600 Subject: [PATCH 1/8] improve regex for tsconfigRootDir inference --- .../src/getTSConfigRootDirFromStack.ts | 5 ++- .../tests/getTsconfigRootDirFromStack.test.ts | 35 +++++++++++++++++-- 2 files changed, 37 insertions(+), 3 deletions(-) diff --git a/packages/typescript-eslint/src/getTSConfigRootDirFromStack.ts b/packages/typescript-eslint/src/getTSConfigRootDirFromStack.ts index 01378b1618f..fd8cca55eb1 100644 --- a/packages/typescript-eslint/src/getTSConfigRootDirFromStack.ts +++ b/packages/typescript-eslint/src/getTSConfigRootDirFromStack.ts @@ -2,7 +2,10 @@ import { fileURLToPath } from 'node:url'; export function getTSConfigRootDirFromStack(stack: string): string | undefined { for (const line of stack.split('\n').map(line => line.trim())) { - const candidate = /(\S+)eslint\.config\.(c|m)?(j|t)s/.exec(line)?.[1]; + const candidate = /(\S+?)[/\\]+eslint\.config\.(c|m)?(j|t)s/.exec( + line, + )?.[1]; + if (!candidate) { continue; } diff --git a/packages/typescript-eslint/tests/getTsconfigRootDirFromStack.test.ts b/packages/typescript-eslint/tests/getTsconfigRootDirFromStack.test.ts index 57a3b0b5f2a..327c7cd9f90 100644 --- a/packages/typescript-eslint/tests/getTsconfigRootDirFromStack.test.ts +++ b/packages/typescript-eslint/tests/getTsconfigRootDirFromStack.test.ts @@ -30,14 +30,14 @@ describe(getTSConfigRootDirFromStack, () => { ].join('\n'), ); - expect(actual).toBe('/path/to/file/'); + expect(actual).toBe('/path/to/file'); }, ); it.each(['cjs', 'cts', 'js', 'mjs', 'mts', 'ts'])( 'returns the path to the config file when its extension is %s', extension => { - const expected = isWindows ? 'C:\\path\\to\\file\\' : '/path/to/file/'; + const expected = isWindows ? 'C:\\path\\to\\file' : '/path/to/file'; const actual = getTSConfigRootDirFromStack( [ @@ -51,4 +51,35 @@ describe(getTSConfigRootDirFromStack, () => { expect(actual).toBe(expected); }, ); + + it("doesn't get tricked by a messed up by not-an-eslint.config.js", () => { + const actual = getTSConfigRootDirFromStack( + [ + `Error`, + ' at file:///a/b/not-an-eslint.config.js', + ' at ModuleJob.run', + 'at async NodeHfs.walk(...)', + ].join('\n'), + ); + + expect(actual).toBeUndefined(); + }); + + it.each(['cjs', 'cts', 'js', 'mjs', 'mts', 'ts'])( + 'correctly resolves the config file even when multiple path seps are present %s', + extension => { + const expected = isWindows ? 'C:\\path\\to\\file' : '/path/to/file'; + + const actual = getTSConfigRootDirFromStack( + [ + `Error`, + ` at ${expected + path.sep + path.sep}eslint.config.${extension}}`, + ' at ModuleJob.run', + 'at async NodeHfs.walk(...)', + ].join('\n'), + ); + + expect(actual).toBe(expected); + }, + ); }); From 23b4027465d118ba312867b1f901d90142468962 Mon Sep 17 00:00:00 2001 From: Kirk Waiblinger <53019676+kirkwaiblinger@users.noreply.github.com> Date: Thu, 17 Jul 2025 12:12:00 -0600 Subject: [PATCH 2/8] rename file to dir --- .../tests/getTsconfigRootDirFromStack.test.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/typescript-eslint/tests/getTsconfigRootDirFromStack.test.ts b/packages/typescript-eslint/tests/getTsconfigRootDirFromStack.test.ts index 327c7cd9f90..7f5fd37bf16 100644 --- a/packages/typescript-eslint/tests/getTsconfigRootDirFromStack.test.ts +++ b/packages/typescript-eslint/tests/getTsconfigRootDirFromStack.test.ts @@ -24,20 +24,20 @@ describe(getTSConfigRootDirFromStack, () => { const actual = getTSConfigRootDirFromStack( [ `Error`, - ' at file:///path/to/file/eslint.config.js', + ' at file:///path/to/dir/eslint.config.js', ' at ModuleJob.run', 'at async NodeHfs.walk(...)', ].join('\n'), ); - expect(actual).toBe('/path/to/file'); + expect(actual).toBe('/path/to/dir'); }, ); it.each(['cjs', 'cts', 'js', 'mjs', 'mts', 'ts'])( 'returns the path to the config file when its extension is %s', extension => { - const expected = isWindows ? 'C:\\path\\to\\file' : '/path/to/file'; + const expected = isWindows ? 'C:\\path\\to\\dir' : '/path/to/dir'; const actual = getTSConfigRootDirFromStack( [ @@ -68,7 +68,7 @@ describe(getTSConfigRootDirFromStack, () => { it.each(['cjs', 'cts', 'js', 'mjs', 'mts', 'ts'])( 'correctly resolves the config file even when multiple path seps are present %s', extension => { - const expected = isWindows ? 'C:\\path\\to\\file' : '/path/to/file'; + const expected = isWindows ? 'C:\\path\\to\\dir' : '/path/to/dir'; const actual = getTSConfigRootDirFromStack( [ From 9aa89c1198990bff8796f0654c1fa0f1347e151e Mon Sep 17 00:00:00 2001 From: Kirk Waiblinger <53019676+kirkwaiblinger@users.noreply.github.com> Date: Thu, 17 Jul 2025 12:41:30 -0600 Subject: [PATCH 3/8] Update packages/typescript-eslint/tests/getTsconfigRootDirFromStack.test.ts MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Josh Goldberg ✨ --- .../typescript-eslint/tests/getTsconfigRootDirFromStack.test.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/typescript-eslint/tests/getTsconfigRootDirFromStack.test.ts b/packages/typescript-eslint/tests/getTsconfigRootDirFromStack.test.ts index 7f5fd37bf16..60d3598d73e 100644 --- a/packages/typescript-eslint/tests/getTsconfigRootDirFromStack.test.ts +++ b/packages/typescript-eslint/tests/getTsconfigRootDirFromStack.test.ts @@ -52,7 +52,7 @@ describe(getTSConfigRootDirFromStack, () => { }, ); - it("doesn't get tricked by a messed up by not-an-eslint.config.js", () => { + it("doesn't get tricked by a not-an-eslint.config.js", () => { const actual = getTSConfigRootDirFromStack( [ `Error`, From e0237bd4dfc3d1c7e63078e231285d44c37650f6 Mon Sep 17 00:00:00 2001 From: Josh Goldberg Date: Fri, 18 Jul 2025 07:43:14 -0400 Subject: [PATCH 4/8] fix(typescript-eslint: tolerate spaces in inferred tsconfigRootDir paths --- .../src/getTSConfigRootDirFromStack.ts | 4 ++- .../tests/getTsconfigRootDirFromStack.test.ts | 30 +++++++++++++++++-- 2 files changed, 30 insertions(+), 4 deletions(-) diff --git a/packages/typescript-eslint/src/getTSConfigRootDirFromStack.ts b/packages/typescript-eslint/src/getTSConfigRootDirFromStack.ts index 01378b1618f..af04a283ce1 100644 --- a/packages/typescript-eslint/src/getTSConfigRootDirFromStack.ts +++ b/packages/typescript-eslint/src/getTSConfigRootDirFromStack.ts @@ -2,7 +2,9 @@ import { fileURLToPath } from 'node:url'; export function getTSConfigRootDirFromStack(stack: string): string | undefined { for (const line of stack.split('\n').map(line => line.trim())) { - const candidate = /(\S+)eslint\.config\.(c|m)?(j|t)s/.exec(line)?.[1]; + const candidate = /(.+)eslint\.config\.(c|m)?(j|t)s/ + .exec(line)?.[1] + ?.replace(/\s*at\s+(async\s+)?/g, ''); if (!candidate) { continue; } diff --git a/packages/typescript-eslint/tests/getTsconfigRootDirFromStack.test.ts b/packages/typescript-eslint/tests/getTsconfigRootDirFromStack.test.ts index 57a3b0b5f2a..4c9812d9488 100644 --- a/packages/typescript-eslint/tests/getTsconfigRootDirFromStack.test.ts +++ b/packages/typescript-eslint/tests/getTsconfigRootDirFromStack.test.ts @@ -9,7 +9,7 @@ describe(getTSConfigRootDirFromStack, () => { const actual = getTSConfigRootDirFromStack( [ `Error`, - ' at file:///other.config.js', + ' at async file:///other.config.js', ' at ModuleJob.run', 'at async NodeHfs.walk(...)', ].join('\n'), @@ -24,7 +24,7 @@ describe(getTSConfigRootDirFromStack, () => { const actual = getTSConfigRootDirFromStack( [ `Error`, - ' at file:///path/to/file/eslint.config.js', + ' at async file:///path/to/file/eslint.config.js', ' at ModuleJob.run', 'at async NodeHfs.walk(...)', ].join('\n'), @@ -42,7 +42,7 @@ describe(getTSConfigRootDirFromStack, () => { const actual = getTSConfigRootDirFromStack( [ `Error`, - ` at ${path.join(expected, `eslint.config.${extension}`)}`, + ` at async ${path.join(expected, `eslint.config.${extension}`)}`, ' at ModuleJob.run', 'at async NodeHfs.walk(...)', ].join('\n'), @@ -51,4 +51,28 @@ describe(getTSConfigRootDirFromStack, () => { expect(actual).toBe(expected); }, ); + + it('returns the full path when it contains spaces', () => { + const actual = getTSConfigRootDirFromStack( + [ + `Error`, + ` at /path/with space/to/dir/eslint.config.ts`, + ' at ModuleJob.run', + ].join('\n'), + ); + + expect(actual).toBe('/path/with space/to/dir/'); + }); + + it('returns the full path when it contains spaces after an async import', () => { + const actual = getTSConfigRootDirFromStack( + [ + `Error`, + ` at async /path/with space/to/dir/eslint.config.ts`, + ' at ModuleJob.run', + ].join('\n'), + ); + + expect(actual).toBe('/path/with space/to/dir/'); + }); }); From 484a6dc9c4a45f332c7616c2860bcdab0621d8ab Mon Sep 17 00:00:00 2001 From: Josh Goldberg Date: Fri, 18 Jul 2025 08:01:21 -0400 Subject: [PATCH 5/8] Remove unnecessary 'at async's from tests --- .../tests/getTsconfigRootDirFromStack.test.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/typescript-eslint/tests/getTsconfigRootDirFromStack.test.ts b/packages/typescript-eslint/tests/getTsconfigRootDirFromStack.test.ts index 4c9812d9488..0b00065bb4c 100644 --- a/packages/typescript-eslint/tests/getTsconfigRootDirFromStack.test.ts +++ b/packages/typescript-eslint/tests/getTsconfigRootDirFromStack.test.ts @@ -9,9 +9,9 @@ describe(getTSConfigRootDirFromStack, () => { const actual = getTSConfigRootDirFromStack( [ `Error`, - ' at async file:///other.config.js', + ' at file:///other.config.js', ' at ModuleJob.run', - 'at async NodeHfs.walk(...)', + 'at NodeHfs.walk(...)', ].join('\n'), ); @@ -24,7 +24,7 @@ describe(getTSConfigRootDirFromStack, () => { const actual = getTSConfigRootDirFromStack( [ `Error`, - ' at async file:///path/to/file/eslint.config.js', + ' at file:///path/to/file/eslint.config.js', ' at ModuleJob.run', 'at async NodeHfs.walk(...)', ].join('\n'), @@ -42,7 +42,7 @@ describe(getTSConfigRootDirFromStack, () => { const actual = getTSConfigRootDirFromStack( [ `Error`, - ` at async ${path.join(expected, `eslint.config.${extension}`)}`, + ` at ${path.join(expected, `eslint.config.${extension}`)}`, ' at ModuleJob.run', 'at async NodeHfs.walk(...)', ].join('\n'), From 25db3887a24e3c85602600599ed1129ce6437788 Mon Sep 17 00:00:00 2001 From: Josh Goldberg Date: Fri, 18 Jul 2025 08:01:41 -0400 Subject: [PATCH 6/8] Not that one --- .../typescript-eslint/tests/getTsconfigRootDirFromStack.test.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/typescript-eslint/tests/getTsconfigRootDirFromStack.test.ts b/packages/typescript-eslint/tests/getTsconfigRootDirFromStack.test.ts index 0b00065bb4c..ff3b184d065 100644 --- a/packages/typescript-eslint/tests/getTsconfigRootDirFromStack.test.ts +++ b/packages/typescript-eslint/tests/getTsconfigRootDirFromStack.test.ts @@ -11,7 +11,7 @@ describe(getTSConfigRootDirFromStack, () => { `Error`, ' at file:///other.config.js', ' at ModuleJob.run', - 'at NodeHfs.walk(...)', + 'at async NodeHfs.walk(...)', ].join('\n'), ); From 5c69735ad7965247416ebec0ee09be81f64e9c6b Mon Sep 17 00:00:00 2001 From: Josh Goldberg Date: Fri, 18 Jul 2025 08:02:27 -0400 Subject: [PATCH 7/8] More testing --- .../tests/getTsconfigRootDirFromStack.test.ts | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/packages/typescript-eslint/tests/getTsconfigRootDirFromStack.test.ts b/packages/typescript-eslint/tests/getTsconfigRootDirFromStack.test.ts index ff3b184d065..9bdf2ada841 100644 --- a/packages/typescript-eslint/tests/getTsconfigRootDirFromStack.test.ts +++ b/packages/typescript-eslint/tests/getTsconfigRootDirFromStack.test.ts @@ -52,7 +52,7 @@ describe(getTSConfigRootDirFromStack, () => { }, ); - it('returns the full path when it contains spaces', () => { + it('returns the full path when it contains a space', () => { const actual = getTSConfigRootDirFromStack( [ `Error`, @@ -64,7 +64,7 @@ describe(getTSConfigRootDirFromStack, () => { expect(actual).toBe('/path/with space/to/dir/'); }); - it('returns the full path when it contains spaces after an async import', () => { + it('returns the full path when it contains a space after an async import', () => { const actual = getTSConfigRootDirFromStack( [ `Error`, @@ -75,4 +75,16 @@ describe(getTSConfigRootDirFromStack, () => { expect(actual).toBe('/path/with space/to/dir/'); }); + + it('returns the full path when it contains multiple spaces', () => { + const actual = getTSConfigRootDirFromStack( + [ + `Error`, + ` at /path/with spaces to dir/eslint.config.ts`, + ' at ModuleJob.run', + ].join('\n'), + ); + + expect(actual).toBe('/path/with spaces to dir/'); + }); }); From 6ffa51108655860d375333dda7d52af923073b5e Mon Sep 17 00:00:00 2001 From: Josh Goldberg Date: Fri, 18 Jul 2025 12:49:39 -0400 Subject: [PATCH 8/8] Object. --- .../src/getTSConfigRootDirFromStack.ts | 3 ++- .../tests/getTsconfigRootDirFromStack.test.ts | 12 ++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/packages/typescript-eslint/src/getTSConfigRootDirFromStack.ts b/packages/typescript-eslint/src/getTSConfigRootDirFromStack.ts index af04a283ce1..aeb63078bbf 100644 --- a/packages/typescript-eslint/src/getTSConfigRootDirFromStack.ts +++ b/packages/typescript-eslint/src/getTSConfigRootDirFromStack.ts @@ -4,7 +4,8 @@ export function getTSConfigRootDirFromStack(stack: string): string | undefined { for (const line of stack.split('\n').map(line => line.trim())) { const candidate = /(.+)eslint\.config\.(c|m)?(j|t)s/ .exec(line)?.[1] - ?.replace(/\s*at\s+(async\s+)?/g, ''); + ?.replace(/\s*at\s+(async\s+)?/g, '') + .replaceAll(/^\S+\s+\(/g, ''); if (!candidate) { continue; } diff --git a/packages/typescript-eslint/tests/getTsconfigRootDirFromStack.test.ts b/packages/typescript-eslint/tests/getTsconfigRootDirFromStack.test.ts index 9bdf2ada841..f7e1d77feba 100644 --- a/packages/typescript-eslint/tests/getTsconfigRootDirFromStack.test.ts +++ b/packages/typescript-eslint/tests/getTsconfigRootDirFromStack.test.ts @@ -87,4 +87,16 @@ describe(getTSConfigRootDirFromStack, () => { expect(actual).toBe('/path/with spaces to dir/'); }); + + it('returns just the path when prefixed with getter information', () => { + const actual = getTSConfigRootDirFromStack( + [ + 'Error', + 'at Object. (/Users/myusername/src/repros/Has Space/eslint.config.js:4:13)', + 'at Module._compile (node:internal/modules/cjs/loader:1692:14)', + ].join('\n'), + ); + + expect(actual).toBe('/Users/myusername/src/repros/Has Space/'); + }); }); pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy