Skip to content

Update submodule, fix JSON syntax problems #1285

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.

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
merged 6 commits into from
Jun 24, 2025
Merged

Conversation

jakebailey
Copy link
Member

Pulls in the type ordering change, as well as test fixes for invalid JSON.

Copy link
Contributor

@Copilot Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull Request Overview

This PR updates the submodule to accommodate the new type ordering changes and fixes test baselines for invalid JSON syntax. Key changes include removal of trailing commas and whitespace adjustments in JSON benchmark files as well as updates to the expected error and type outputs in several diff baselines.

Reviewed Changes

Copilot reviewed 110 out of 110 changed files in this pull request and generated no comments.

File Description
conformance/nodeModulesAllowJsPackagePatternExportsTrailers(module=nodenext).errors.txt.diff Removed a trailing comma from the package JSON to fix JSON syntax issues.
conformance/nodeModulesConditionalPackageExports(module=nodenext).types.diff Revised expected type outputs (e.g. switching from "any" to the correct inferred types) in alignment with the updated submodule logic.
Other diff files Similar minor formatting and output adjustments across error and types baseline files to reflect updated behavior.
Comments suppressed due to low confidence (2)

testdata/baselines/reference/submoduleAccepted/conformance/nodeModulesAllowJsPackagePatternExportsTrailers(module=nodenext).errors.txt.diff:61

  • The removal of the trailing comma in the package JSON fixes invalid syntax; please ensure that similar JSON files across the baselines remain consistent with this updated syntax.
-        "type": "module"

testdata/baselines/reference/submodule/conformance/nodeModulesConditionalPackageExports(module=nodenext).types.diff:1

  • The expected type outputs have been updated (e.g. from 'any' to the correct type), which is aligned with the submodule changes; please verify that these new baselines accurately reflect the intended behavior.
--- old.nodeModulesConditionalPackageExports(module=nodenext).types

>matches : Iterable<[id2: string, object]>
>x.get(id1) : Iterable<[id2: string, object]>
->x.get : <Key extends [id1: string, id2: string] | [id1: string] | []>(...key: Key) => GetResult<[id1: string, id2: string], Key, object>
+>x.get : <Key extends [] | [id1: string] | [id1: string, id2: string]>(...key: Key) => GetResult<[id1: string, id2: string], Key, object>
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For some reason the ordering I have in the submodule does not match for this one case. I'll have to recheck it for mistakes.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I found one bug, but it was benign. Not sure where this difference comes from.

@jakebailey jakebailey marked this pull request as draft June 24, 2025 22:13
@jakebailey jakebailey marked this pull request as ready for review June 24, 2025 22:26
@jakebailey jakebailey enabled auto-merge June 24, 2025 22:57
@jakebailey jakebailey added this pull request to the merge queue Jun 24, 2025
Merged via the queue into main with commit dea45fd Jun 24, 2025
22 checks passed
@jakebailey jakebailey deleted the jabaile/bump-tsgo-port branch June 24, 2025 23:33
zshannon added a commit to zshannon/typescript-go that referenced this pull request Jun 25, 2025
* Update submodule, fix JSON syntax problems (microsoft#1285)

* Pool EmitContext (microsoft#1287)

---------

Co-authored-by: Jake Bailey <5341706+jakebailey@users.noreply.github.com>
zshannon added a commit to zshannon/typescript-go that referenced this pull request Jul 2, 2025
* Update submodule, fix JSON syntax problems (microsoft#1285)

* Pool EmitContext (microsoft#1287)

---------

Co-authored-by: Jake Bailey <5341706+jakebailey@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants