Merge branch 'main' into copilot/fix-1011

Author: jakebailey

.dprint.jsonc

@@ -59,7 +59,7 @@
     // Note: if adding new languages, make sure settings.template.json is updated too.
     // Also, if updating typescript, update the one in package.json.
     "plugins": [
-        "https://plugins.dprint.dev/typescript-0.95.5.wasm",
+        "https://plugins.dprint.dev/typescript-0.95.7.wasm",
         "https://plugins.dprint.dev/json-0.20.0.wasm",
         "https://plugins.dprint.dev/g-plane/pretty_yaml-v0.5.1.wasm",
         "https://plugins.dprint.dev/exec-0.5.1.json@492414e39dea4dccc07b4af796d2f4efdb89e84bae2bd4e1e924c0cc050855bf"

.github/workflows/ci.yml

@@ -176,8 +176,9 @@ jobs:
             main: true
           - os: windows-latest
             skip: ${{ github.event_name == 'merge_group' }}
-          - os: macos-latest
-            skip: ${{ github.event_name == 'merge_group' }}
+          # Skip macOS; we do not have any build tag'd files that require checking.
+          # - os: macos-latest
+          #   skip: ${{ github.event_name == 'merge_group' }}
           - os: ubuntu-latest
             name: 'noembed'
             noembed: true
@@ -235,6 +236,8 @@ jobs:
         with:
           submodules: true
       - uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
+        with:
+          node-version: '>=22.16.0'
       - uses: dtolnay/rust-toolchain@fcf085fcb4b4b8f63f96906cd713eb52181b5ea4 # stable
       - uses: ./.github/actions/setup-go
         with:
@@ -247,6 +250,12 @@ jobs:
       - run: node ./internal/lsp/lsproto/_generate/fetchModel.mjs
       - run: node ./internal/lsp/lsproto/_generate/generate.mjs
 
+      - name: Remove all converted fourslash tests
+        run: rm -rf internal/fourslash/tests/gen
+
+      - name: Regenerate fourslash tests
+        run: npm run convertfourslash
+
       - run: git add .
       - run: git diff --staged --exit-code --stat
 

.github/workflows/copilot-setup-steps.yml

@@ -0,0 +1,28 @@
+name: 'Copilot Setup Steps'
+
+on: workflow_dispatch
+
+jobs:
+  # The job MUST be called `copilot-setup-steps` or it will not be picked up by Copilot.
+  copilot-setup-steps:
+    runs-on: ubuntu-latest
+
+    # Set the permissions to the lowest permissions possible needed for your steps.
+    # Copilot will be given its own token for its operations.
+    permissions:
+      # If you want to clone the repository as part of your setup steps, for example to install dependencies, you'll need the `contents: read` permission. If you don't clone the repository in your setup steps, Copilot will do this for you automatically after the steps complete.
+      contents: read
+
+    # You can define any steps you want, and they will run before the agent starts.
+    # If you do not check out your code, Copilot will do this for you.
+    steps:
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        with:
+          submodules: true
+      - uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
+      - uses: dtolnay/rust-toolchain@fcf085fcb4b4b8f63f96906cd713eb52181b5ea4 # stable
+      - uses: ./.github/actions/setup-go
+        with:
+          cache-name: copilot-setup-steps
+      - run: npm i -g @playwright/mcp@0.0.28
+      - run: npm ci

NOTICE.txt

@@ -264,7 +264,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 ---------------------------------------------------------
 
-golang.org/x/sync v0.14.0 - BSD-3-Clause
+golang.org/x/sync v0.15.0 - BSD-3-Clause
 
 Copyright 2009 The Go Authors.
 

README.md

@@ -4,7 +4,7 @@
 
 ## Preview
 
-A preview build is available on npm as `@typescript/native-preview`.
+A preview build is available on npm as [`@typescript/native-preview`](https://www.npmjs.com/package/@typescript/native-preview).
 
 ```sh
 npm install @typescript/native-preview

_packages/api/package.json

@@ -46,6 +46,6 @@
     },
     "dependencies": {
         "@typescript/ast": "1.0.0",
-        "libsyncrpc": "github:microsoft/libsyncrpc#bb02d84"
+        "@typescript/libsyncrpc": "github:microsoft/libsyncrpc#8cdae454cc482536c5844bef83b796f95464da85"
     }
 }

_packages/api/src/client.ts

@@ -1,4 +1,4 @@
-import { SyncRpcChannel } from "libsyncrpc";
+import { SyncRpcChannel } from "@typescript/libsyncrpc";
 import type { FileSystem } from "./fs.ts";
 
 export interface ClientOptions {

_submodules/TypeScript

@@ -3,13 +3,13 @@ module github.com/microsoft/typescript-go/_tools
 go 1.24.0
 
 require (
-	github.com/golangci/plugin-module-register v0.1.2-0.20250519122030-95854f10c778
-	golang.org/x/mod v0.24.0
-	golang.org/x/tools v0.33.0
+	github.com/golangci/plugin-module-register v0.1.2
+	golang.org/x/mod v0.25.0
+	golang.org/x/tools v0.34.0
 	gotest.tools/v3 v3.5.2
 )
 
 require (
 	github.com/google/go-cmp v0.6.0 // indirect
-	golang.org/x/sync v0.14.0 // indirect
+	golang.org/x/sync v0.15.0 // indirect
 )

_tools/go.mod

@@ -1,12 +1,12 @@
-github.com/golangci/plugin-module-register v0.1.2-0.20250519122030-95854f10c778 h1:a5T2fJwhfuTPuhCau4IPP4ZGGndS/ysLzDorg1mA2P4=
-github.com/golangci/plugin-module-register v0.1.2-0.20250519122030-95854f10c778/go.mod h1:1+QGTsKBvAIvPvoY/os+G5eoqxWn70HYDm2uvUyGuVw=
+github.com/golangci/plugin-module-register v0.1.2 h1:e5WM6PO6NIAEcij3B053CohVp3HIYbzSuP53UAYgOpg=
+github.com/golangci/plugin-module-register v0.1.2/go.mod h1:1+QGTsKBvAIvPvoY/os+G5eoqxWn70HYDm2uvUyGuVw=
 github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
 github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
-golang.org/x/mod v0.24.0 h1:ZfthKaKaT4NrhGVZHO1/WDTwGES4De8KtWO0SIbNJMU=
-golang.org/x/mod v0.24.0/go.mod h1:IXM97Txy2VM4PJ3gI61r1YEk/gAj6zAHN3AdZt6S9Ww=
-golang.org/x/sync v0.14.0 h1:woo0S4Yywslg6hp4eUFjTVOyKt0RookbpAHG4c1HmhQ=
-golang.org/x/sync v0.14.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
-golang.org/x/tools v0.33.0 h1:4qz2S3zmRxbGIhDIAgjxvFutSvH5EfnsYrRBj0UI0bc=
-golang.org/x/tools v0.33.0/go.mod h1:CIJMaWEY88juyUfo7UbgPqbC8rU2OqfAV1h2Qp0oMYI=
+golang.org/x/mod v0.25.0 h1:n7a+ZbQKQA/Ysbyb0/6IbB1H/X41mKgbhfv7AfG/44w=
+golang.org/x/mod v0.25.0/go.mod h1:IXM97Txy2VM4PJ3gI61r1YEk/gAj6zAHN3AdZt6S9Ww=
+golang.org/x/sync v0.15.0 h1:KWH3jNZsfyT6xfAfKiz6MRNmd46ByHDYaZ7KSkCtdW8=
+golang.org/x/sync v0.15.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
+golang.org/x/tools v0.34.0 h1:qIpSLOxeCYGg9TrcJokLBG4KFA6d795g0xkBkiESGlo=
+golang.org/x/tools v0.34.0/go.mod h1:pAP9OwEaY1CAW3HOmg3hLZC5Z0CCmzjAF2UQMSqNARg=
 gotest.tools/v3 v3.5.2 h1:7koQfIKdy+I8UTetycgUqXWSDwpgv193Ka+qRsmBY8Q=
 gotest.tools/v3 v3.5.2/go.mod h1:LtdLGcnqToBH83WByAAi/wiwSFCArdFIUV/xxN4pcjA=

_tools/go.sum

@@ -7,7 +7,7 @@ require (
 	github.com/go-json-experiment/json v0.0.0-20250517221953-25912455fbc8
 	github.com/google/go-cmp v0.7.0
 	github.com/peter-evans/patience v0.3.0
-	golang.org/x/sync v0.14.0
+	golang.org/x/sync v0.15.0
 	golang.org/x/sys v0.33.0
 	gotest.tools/v3 v3.5.2
 )

go.mod

@@ -20,8 +20,8 @@ github.com/rogpeppe/go-internal v1.14.1 h1:UQB4HGPB6osV0SQTLymcB4TgvyWu6ZyliaW0t
 github.com/rogpeppe/go-internal v1.14.1/go.mod h1:MaRKkUm5W0goXpeCfT7UZI6fk/L7L7so1lCWt35ZSgc=
 golang.org/x/mod v0.24.0 h1:ZfthKaKaT4NrhGVZHO1/WDTwGES4De8KtWO0SIbNJMU=
 golang.org/x/mod v0.24.0/go.mod h1:IXM97Txy2VM4PJ3gI61r1YEk/gAj6zAHN3AdZt6S9Ww=
-golang.org/x/sync v0.14.0 h1:woo0S4Yywslg6hp4eUFjTVOyKt0RookbpAHG4c1HmhQ=
-golang.org/x/sync v0.14.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
+golang.org/x/sync v0.15.0 h1:KWH3jNZsfyT6xfAfKiz6MRNmd46ByHDYaZ7KSkCtdW8=
+golang.org/x/sync v0.15.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
 golang.org/x/sys v0.33.0 h1:q3i8TbbEz+JRD9ywIRlyRAQbM0qF7hu24q3teo2hbuw=
 golang.org/x/sys v0.33.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
 golang.org/x/tools v0.32.0 h1:Q7N1vhpkQv7ybVzLFtTjvQya2ewbwNDZzUgfXGqtMWU=

go.sum

@@ -29,9 +29,8 @@ type API struct {
 	host    APIHost
 	options APIOptions
 
-	documentRegistry *project.DocumentRegistry
-	scriptInfosMu    sync.RWMutex
-	scriptInfos      map[tspath.Path]*project.ScriptInfo
+	documentStore      *project.DocumentStore
+	configFileRegistry *project.ConfigFileRegistry
 
 	projects  handleMap[project.Project]
 	filesMu   sync.Mutex
@@ -46,16 +45,16 @@ var _ project.ProjectHost = (*API)(nil)
 
 func NewAPI(host APIHost, options APIOptions) *API {
 	api := &API{
-		host:        host,
-		options:     options,
-		scriptInfos: make(map[tspath.Path]*project.ScriptInfo),
-		projects:    make(handleMap[project.Project]),
-		files:       make(handleMap[ast.SourceFile]),
-		symbols:     make(handleMap[ast.Symbol]),
-		types:       make(handleMap[checker.Type]),
+		host:     host,
+		options:  options,
+		projects: make(handleMap[project.Project]),
+		files:    make(handleMap[ast.SourceFile]),
+		symbols:  make(handleMap[ast.Symbol]),
+		types:    make(handleMap[checker.Type]),
 	}
-	api.documentRegistry = &project.DocumentRegistry{
-		Options: tspath.ComparePathsOptions{
+
+	api.documentStore = project.NewDocumentStore(project.DocumentStoreOptions{
+		ComparePathsOptions: tspath.ComparePathsOptions{
 			UseCaseSensitiveFileNames: host.FS().UseCaseSensitiveFileNames(),
 			CurrentDirectory:          host.GetCurrentDirectory(),
 		},
@@ -64,6 +63,10 @@ func NewAPI(host APIHost, options APIOptions) *API {
 				_ = api.releaseHandle(string(FileHandle(file)))
 			},
 		},
+	})
+
+	api.configFileRegistry = &project.ConfigFileRegistry{
+		Host: api,
 	}
 	return api
 }
@@ -78,9 +81,14 @@ func (api *API) TypingsInstaller() *project.TypingsInstaller {
 	return nil
 }
 
-// DocumentRegistry implements ProjectHost.
-func (api *API) DocumentRegistry() *project.DocumentRegistry {
-	return api.documentRegistry
+// DocumentStore implements ProjectHost.
+func (api *API) DocumentStore() *project.DocumentStore {
+	return api.documentStore
+}
+
+// ConfigFileRegistry implements ProjectHost.
+func (api *API) ConfigFileRegistry() *project.ConfigFileRegistry {
+	return api.configFileRegistry
 }
 
 // FS implements ProjectHost.
@@ -93,23 +101,6 @@ func (api *API) GetCurrentDirectory() string {
 	return api.host.GetCurrentDirectory()
 }
 
-// GetOrCreateScriptInfoForFile implements ProjectHost.
-func (api *API) GetOrCreateScriptInfoForFile(fileName string, path tspath.Path, scriptKind core.ScriptKind) *project.ScriptInfo {
-	return api.getOrCreateScriptInfo(fileName, path, scriptKind)
-}
-
-// GetScriptInfoByPath implements ProjectHost.
-func (api *API) GetScriptInfoByPath(path tspath.Path) *project.ScriptInfo {
-	api.scriptInfosMu.RLock()
-	defer api.scriptInfosMu.RUnlock()
-	return api.scriptInfos[path]
-}
-
-// OnDiscoveredSymlink implements ProjectHost.
-func (api *API) OnDiscoveredSymlink(info *project.ScriptInfo) {
-	// !!!
-}
-
 // Log implements ProjectHost.
 func (api *API) Log(s string) {
 	api.options.Logger.Info(s)
@@ -366,26 +357,6 @@ func (api *API) releaseHandle(handle string) error {
 	return nil
 }
 
-func (api *API) getOrCreateScriptInfo(fileName string, path tspath.Path, scriptKind core.ScriptKind) *project.ScriptInfo {
-	api.scriptInfosMu.RLock()
-	info, ok := api.scriptInfos[path]
-	api.scriptInfosMu.RUnlock()
-	if ok {
-		return info
-	}
-
-	content, ok := api.host.FS().ReadFile(fileName)
-	if !ok {
-		return nil
-	}
-	info = project.NewScriptInfo(fileName, path, scriptKind, api.host.FS())
-	info.SetTextFromDisk(content)
-	api.scriptInfosMu.Lock()
-	defer api.scriptInfosMu.Unlock()
-	api.scriptInfos[path] = info
-	return info
-}
-
 func (api *API) toAbsoluteFileName(fileName string) string {
 	return tspath.GetNormalizedAbsolutePath(fileName, api.host.GetCurrentDirectory())
 }

internal/api/api.go

@@ -686,7 +686,7 @@ func getChildrenPropertyMask(node *ast.Node) uint8 {
 		return (boolToByte(n.TagName != nil) << 0) | (boolToByte(n.TypeExpression != nil) << 1) | (boolToByte(n.Name() != nil) << 2) | (boolToByte(n.Comment != nil) << 3)
 	case ast.KindJSDocSignature:
 		n := node.AsJSDocSignature()
-		return (boolToByte(n.TypeParameters() != nil) << 0) | (boolToByte(n.Parameters != nil) << 1) | (boolToByte(n.Type != nil) << 2)
+		return (boolToByte(n.TypeParameters != nil) << 0) | (boolToByte(n.Parameters != nil) << 1) | (boolToByte(n.Type != nil) << 2)
 	case ast.KindClassStaticBlockDeclaration:
 		n := node.AsClassStaticBlockDeclaration()
 		return (boolToByte(n.Modifiers() != nil) << 0) | (boolToByte(n.Body != nil) << 1)

internal/api/encoder/encoder.go

@@ -13,14 +13,16 @@ import (
 	"github.com/microsoft/typescript-go/internal/core"
 	"github.com/microsoft/typescript-go/internal/parser"
 	"github.com/microsoft/typescript-go/internal/repo"
-	"github.com/microsoft/typescript-go/internal/scanner"
 	"github.com/microsoft/typescript-go/internal/testutil/baseline"
 	"gotest.tools/v3/assert"
 )
 
 func TestEncodeSourceFile(t *testing.T) {
 	t.Parallel()
-	sourceFile := parser.ParseSourceFile("/test.ts", "/test.ts", "import { bar } from \"bar\";\nexport function foo<T, U>(a: string, b: string): any {}\nfoo();", core.ScriptTargetESNext, scanner.JSDocParsingModeParseAll)
+	sourceFile := parser.ParseSourceFile(ast.SourceFileParseOptions{
+		FileName: "/test.ts",
+		Path:     "/test.ts",
+	}, "import { bar } from \"bar\";\nexport function foo<T, U>(a: string, b: string): any {}\nfoo();", core.ScriptKindTS)
 	t.Run("baseline", func(t *testing.T) {
 		t.Parallel()
 		buf, err := encoder.EncodeSourceFile(sourceFile, "")
@@ -38,13 +40,10 @@ func BenchmarkEncodeSourceFile(b *testing.B) {
 	filePath := filepath.Join(repo.TypeScriptSubmodulePath, "src/compiler/checker.ts")
 	fileContent, err := os.ReadFile(filePath)
 	assert.NilError(b, err)
-	sourceFile := parser.ParseSourceFile(
-		"/checker.ts",
-		"/checker.ts",
-		string(fileContent),
-		core.ScriptTargetESNext,
-		scanner.JSDocParsingModeParseAll,
-	)
+	sourceFile := parser.ParseSourceFile(ast.SourceFileParseOptions{
+		FileName: "/checker.ts",
+		Path:     "/checker.ts",
+	}, string(fileContent), core.ScriptKindTS)
 
 	for b.Loop() {
 		_, err := encoder.EncodeSourceFile(sourceFile, "")