Skip to content

Fix bad JSON syntax in tests, use JSON.parse first for perf #61901

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jakebailey merged 2 commits into from
Jun 24, 2025
Merged

Fix bad JSON syntax in tests, use JSON.parse first for perf #61901

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
196ca46
Be strict about package.json JSON syntax
jakebailey Jun 18, 2025
3b0affc
PR feedback
jakebailey Jun 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions src/compiler/utilities.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -467,7 +467,6 @@ import {
ParameterDeclaration,
ParenthesizedExpression,
ParenthesizedTypeNode,
parseConfigFileTextToJson,
PartiallyEmittedExpression,
Path,
pathIsRelative,
Expand Down Expand Up @@ -7715,9 +7714,7 @@ export function base64decode(host: { base64decode?(input: string): string; } | u
export function readJsonOrUndefined(path: string, hostOrText: { readFile(fileName: string): string | undefined; } | string): object | undefined {
const jsonText = isString(hostOrText) ? hostOrText : hostOrText.readFile(path);
if (!jsonText) return undefined;
// gracefully handle if readFile fails or returns not JSON
const result = parseConfigFileTextToJson(path, jsonText);
return !result.error ? result.config : undefined;
return tryParseJson(jsonText);
Comment thread
jakebailey marked this conversation as resolved.
Outdated
}

/** @internal */
Expand Down
5 changes: 3 additions & 2 deletions ...elines/reference/conditionalExportsResolutionFallback(moduleresolution=node16).errors.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ error TS5110: Option 'module' must be set to 'Node16' when option 'moduleResolut
".": {
"import": "./dist/index.mjs",
"require": "./dist/index.js",
"types": "./dist/index.d.ts",
"types": "./dist/index.d.ts"
}
}
}
Expand All @@ -26,4 +26,5 @@ error TS5110: Option 'module' must be set to 'Node16' when option 'moduleResolut
// Should be an untyped resolution to dep/dist/index.mjs,
// but the first search is only for TS files, and when
// there's no dist/index.d.mts, it continues looking for
// matching conditions and resolves via `types`.
// matching conditions and resolves via `types`.

5 changes: 3 additions & 2 deletions ...ines/reference/conditionalExportsResolutionFallback(moduleresolution=nodenext).errors.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ error TS5110: Option 'module' must be set to 'NodeNext' when option 'moduleResol
".": {
"import": "./dist/index.mjs",
"require": "./dist/index.js",
"types": "./dist/index.d.ts",
"types": "./dist/index.d.ts"
}
}
}
Expand All @@ -26,4 +26,5 @@ error TS5110: Option 'module' must be set to 'NodeNext' when option 'moduleResol
// Should be an untyped resolution to dep/dist/index.mjs,
// but the first search is only for TS files, and when
// there's no dist/index.d.mts, it continues looking for
// matching conditions and resolves via `types`.
// matching conditions and resolves via `types`.

5 changes: 3 additions & 2 deletions ...baselines/reference/nodeModulesAllowJsConditionalPackageExports(module=node16).errors.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,12 +126,13 @@ node_modules/inner/index.d.ts(2,13): error TS2303: Circular definition of import
"./types": {
"types": {
"import": "./index.d.mts",
"require": "./index.d.cts",
"require": "./index.d.cts"
},
"node": {
"import": "./index.mjs",
"require": "./index.cjs"
}
}
}
}
}

5 changes: 3 additions & 2 deletions tests/baselines/reference/nodeModulesAllowJsConditionalPackageExports(module=node16).js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,15 +112,16 @@ export const cjsSource = true;
"./types": {
"types": {
"import": "./index.d.mts",
"require": "./index.d.cts",
"require": "./index.d.cts"
},
"node": {
"import": "./index.mjs",
"require": "./index.cjs"
}
}
}
}
}


//// [index.mjs]
// esm format file
Expand Down
5 changes: 3 additions & 2 deletions ...baselines/reference/nodeModulesAllowJsConditionalPackageExports(module=node18).errors.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,12 +126,13 @@ node_modules/inner/index.d.ts(2,13): error TS2303: Circular definition of import
"./types": {
"types": {
"import": "./index.d.mts",
"require": "./index.d.cts",
"require": "./index.d.cts"
},
"node": {
"import": "./index.mjs",
"require": "./index.cjs"
}
}
}
}
}

5 changes: 3 additions & 2 deletions tests/baselines/reference/nodeModulesAllowJsConditionalPackageExports(module=node18).js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,15 +112,16 @@ export const cjsSource = true;
"./types": {
"types": {
"import": "./index.d.mts",
"require": "./index.d.cts",
"require": "./index.d.cts"
},
"node": {
"import": "./index.mjs",
"require": "./index.cjs"
}
}
}
}
}


//// [index.mjs]
// esm format file
Expand Down
5 changes: 3 additions & 2 deletions ...baselines/reference/nodeModulesAllowJsConditionalPackageExports(module=node20).errors.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,12 +120,13 @@ node_modules/inner/index.d.ts(2,13): error TS2303: Circular definition of import
"./types": {
"types": {
"import": "./index.d.mts",
"require": "./index.d.cts",
"require": "./index.d.cts"
},
"node": {
"import": "./index.mjs",
"require": "./index.cjs"
}
}
}
}
}

5 changes: 3 additions & 2 deletions tests/baselines/reference/nodeModulesAllowJsConditionalPackageExports(module=node20).js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,15 +112,16 @@ export const cjsSource = true;
"./types": {
"types": {
"import": "./index.d.mts",
"require": "./index.d.cts",
"require": "./index.d.cts"
},
"node": {
"import": "./index.mjs",
"require": "./index.cjs"
}
}
}
}
}


//// [index.mjs]
// esm format file
Expand Down
5 changes: 3 additions & 2 deletions ...selines/reference/nodeModulesAllowJsConditionalPackageExports(module=nodenext).errors.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,12 +120,13 @@ node_modules/inner/index.d.ts(2,13): error TS2303: Circular definition of import
"./types": {
"types": {
"import": "./index.d.mts",
"require": "./index.d.cts",
"require": "./index.d.cts"
},
"node": {
"import": "./index.mjs",
"require": "./index.cjs"
}
}
}
}
}

5 changes: 3 additions & 2 deletions tests/baselines/reference/nodeModulesAllowJsConditionalPackageExports(module=nodenext).js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,15 +112,16 @@ export const cjsSource = true;
"./types": {
"types": {
"import": "./index.d.mts",
"require": "./index.d.cts",
"require": "./index.d.cts"
},
"node": {
"import": "./index.mjs",
"require": "./index.cjs"
}
}
}
}
}


//// [index.mjs]
// esm format file
Expand Down
5 changes: 3 additions & 2 deletions tests/baselines/reference/nodeModulesAllowJsPackagePatternExports(module=node16).errors.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ node_modules/inner/index.d.ts(3,22): error TS1479: The current file is a CommonJ
{
"name": "package",
"private": true,
"type": "module",
"type": "module"
}
==== node_modules/inner/package.json (0 errors) ====
{
Expand All @@ -75,4 +75,5 @@ node_modules/inner/index.d.ts(3,22): error TS1479: The current file is a CommonJ
"./mjs/*": "./*.mjs",
"./js/*": "./*.js"
}
}
}

5 changes: 3 additions & 2 deletions tests/baselines/reference/nodeModulesAllowJsPackagePatternExports(module=node16).js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ export { type };
{
"name": "package",
"private": true,
"type": "module",
"type": "module"
}
//// [package.json]
{
Expand All @@ -63,7 +63,8 @@ export { type };
"./mjs/*": "./*.mjs",
"./js/*": "./*.js"
}
}
}


//// [index.js]
// esm format file
Expand Down
5 changes: 3 additions & 2 deletions tests/baselines/reference/nodeModulesAllowJsPackagePatternExports(module=node18).errors.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ node_modules/inner/index.d.ts(3,22): error TS1479: The current file is a CommonJ
{
"name": "package",
"private": true,
"type": "module",
"type": "module"
}
==== node_modules/inner/package.json (0 errors) ====
{
Expand All @@ -75,4 +75,5 @@ node_modules/inner/index.d.ts(3,22): error TS1479: The current file is a CommonJ
"./mjs/*": "./*.mjs",
"./js/*": "./*.js"
}
}
}

5 changes: 3 additions & 2 deletions tests/baselines/reference/nodeModulesAllowJsPackagePatternExports(module=node18).js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ export { type };
{
"name": "package",
"private": true,
"type": "module",
"type": "module"
}
//// [package.json]
{
Expand All @@ -63,7 +63,8 @@ export { type };
"./mjs/*": "./*.mjs",
"./js/*": "./*.js"
}
}
}


//// [index.js]
// esm format file
Expand Down
5 changes: 3 additions & 2 deletions tests/baselines/reference/nodeModulesAllowJsPackagePatternExports(module=node20).errors.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ node_modules/inner/index.d.ts(2,13): error TS2303: Circular definition of import
{
"name": "package",
"private": true,
"type": "module",
"type": "module"
}
==== node_modules/inner/package.json (0 errors) ====
{
Expand All @@ -66,4 +66,5 @@ node_modules/inner/index.d.ts(2,13): error TS2303: Circular definition of import
"./mjs/*": "./*.mjs",
"./js/*": "./*.js"
}
}
}

5 changes: 3 additions & 2 deletions tests/baselines/reference/nodeModulesAllowJsPackagePatternExports(module=node20).js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ export { type };
{
"name": "package",
"private": true,
"type": "module",
"type": "module"
}
//// [package.json]
{
Expand All @@ -63,7 +63,8 @@ export { type };
"./mjs/*": "./*.mjs",
"./js/*": "./*.js"
}
}
}


//// [index.js]
// esm format file
Expand Down
5 changes: 3 additions & 2 deletions ...s/baselines/reference/nodeModulesAllowJsPackagePatternExports(module=nodenext).errors.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ node_modules/inner/index.d.ts(2,13): error TS2303: Circular definition of import
{
"name": "package",
"private": true,
"type": "module",
"type": "module"
}
==== node_modules/inner/package.json (0 errors) ====
{
Expand All @@ -66,4 +66,5 @@ node_modules/inner/index.d.ts(2,13): error TS2303: Circular definition of import
"./mjs/*": "./*.mjs",
"./js/*": "./*.js"
}
}
}

5 changes: 3 additions & 2 deletions tests/baselines/reference/nodeModulesAllowJsPackagePatternExports(module=nodenext).js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ export { type };
{
"name": "package",
"private": true,
"type": "module",
"type": "module"
}
//// [package.json]
{
Expand All @@ -63,7 +63,8 @@ export { type };
"./mjs/*": "./*.mjs",
"./js/*": "./*.js"
}
}
}


//// [index.js]
// esm format file
Expand Down
5 changes: 3 additions & 2 deletions ...lines/reference/nodeModulesAllowJsPackagePatternExportsTrailers(module=node16).errors.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ node_modules/inner/index.d.ts(3,22): error TS1479: The current file is a CommonJ
{
"name": "package",
"private": true,
"type": "module",
"type": "module"
}
==== node_modules/inner/package.json (0 errors) ====
{
Expand All @@ -75,4 +75,5 @@ node_modules/inner/index.d.ts(3,22): error TS1479: The current file is a CommonJ
"./mjs/*.mjs": "./*.mjs",
"./js/*.js": "./*.js"
}
}
}

5 changes: 3 additions & 2 deletions tests/baselines/reference/nodeModulesAllowJsPackagePatternExportsTrailers(module=node16).js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ export { type };
{
"name": "package",
"private": true,
"type": "module",
"type": "module"
}
//// [package.json]
{
Expand All @@ -63,7 +63,8 @@ export { type };
"./mjs/*.mjs": "./*.mjs",
"./js/*.js": "./*.js"
}
}
}


//// [index.js]
// esm format file
Expand Down
Loading