Merge branch 'fix/2674' of https://github.com/a-tarasyuk/typescript-go into fix/2674

Author: a-tarasyuk

.github/workflows/ci.yml

@@ -277,6 +277,8 @@ jobs:
           npx hereby test >/dev/null || true
           npx hereby baseline-accept || true
           npx hereby test || true
+          npx hereby baseline-accept || true
+          npx hereby test
 
       - run: git add .
       - run: git diff --staged --exit-code --stat
@@ -332,68 +334,10 @@ jobs:
 
       - run: go -C ./_tools run ./cmd/checkmodpaths $PWD
 
-  baselines:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: jlumbroso/free-disk-space@54081f138730dfa15788a46383842cd2f914a1be # v1.3.1
-        with:
-          large-packages: false
-          docker-images: false
-          swap-storage: false
-          dotnet: false
-      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
-        with:
-          submodules: true
-      - uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6.2.0
-      - uses: dtolnay/rust-toolchain@fcf085fcb4b4b8f63f96906cd713eb52181b5ea4 # stable
-      - uses: ./.github/actions/setup-go
-
-      - run: npm ci
-
-      - name: Remove all baselines
-        run: rm -rf testdata/baselines/reference
-
-      - name: Run tests
-        run: npx hereby test &> /dev/null || exit 0
-
-      - name: Accept baselines
-        run: |
-          npx hereby baseline-accept
-          git add testdata/baselines/reference
-
-      - name: Run tests
-        run: npx hereby test
-
-      - name: Check baselines
-        id: check-baselines
-        run: |
-          function print_diff() {
-            if ! git diff --staged --exit-code --quiet --diff-filter=$1; then
-              echo "$2:"
-              git diff --staged --name-only --diff-filter=$1
-            fi
-          }
-
-          if ! git diff --staged --exit-code --quiet; then
-            print_diff ACR "Missing baselines"
-            print_diff MTUXB "Modified baselines"
-            print_diff D "Unused baselines"
-            git diff --staged > fix_baselines.patch
-            exit 1
-          fi
-
-      - name: Upload baseline diff artifact
-        if: ${{ failure() && steps.check-baselines.conclusion == 'failure' }}
-        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
-        with:
-          name: fix_baselines.patch
-          path: fix_baselines.patch
-
   required:
     runs-on: ubuntu-latest
     if: ${{ always() }}
     needs:
-      - baselines
       - build
       - extension
       - format

Herebyfile.mjs

@@ -8,12 +8,13 @@ import { task } from "hereby";
 import assert from "node:assert";
 import crypto from "node:crypto";
 import fs from "node:fs";
+import os from "node:os";
 import path from "node:path";
 import url from "node:url";
 import { parseArgs } from "node:util";
-import os from "os";
 import pLimit from "p-limit";
 import pc from "picocolors";
+import tmp from "tmp";
 import which from "which";
 
 const __filename = url.fileURLToPath(new URL(import.meta.url));
@@ -302,11 +303,64 @@ const goTestEnv = {
     ...(process.platform === "win32" ? { GOFLAGS: "-count=1" } : {}),
 };
 
+const baselineTrackingEnabled = isTypeScriptSubmoduleCloned() && ![
+    options.tests,
+    options.noembed,
+    options.concurrentTestPrograms,
+    options.race,
+    options.dirty,
+].some(Boolean);
+
 const goTestSumFlags = [
     "--format-hide-empty-pkg",
     ...(!isCI ? ["--hide-summary", "skipped"] : []),
 ];
 
+/**
+ * Collects all baseline files that were used during the test run.
+ * @param {string} trackingDir
+ * @returns {Promise<Set<string>>}
+ */
+async function collectUsedBaselines(trackingDir) {
+    /** @type {Set<string>} */
+    const usedBaselines = new Set();
+    if (!fs.existsSync(trackingDir)) {
+        return usedBaselines;
+    }
+
+    const trackingFiles = await fs.promises.readdir(trackingDir);
+    for (const file of trackingFiles) {
+        const content = await fs.promises.readFile(path.join(trackingDir, file), "utf-8");
+        for (const line of content.split("\n")) {
+            const trimmed = line.trim();
+            if (trimmed) {
+                usedBaselines.add(trimmed);
+            }
+        }
+    }
+    return usedBaselines;
+}
+
+/**
+ * Checks for unused baseline files and reports them.
+ * @param {string} trackingDir
+ * @returns {Promise<string[]>} List of unused baseline file paths.
+ */
+async function checkUnusedBaselines(trackingDir) {
+    const usedBaselines = await collectUsedBaselines(trackingDir);
+    if (usedBaselines.size === 0) {
+        // No baselines recorded - either no tests ran or tracking wasn't set up properly
+        return [];
+    }
+
+    const allBaselines = await glob(`${refBaseline}/**`, { nodir: true });
+    const unusedBaselines = allBaselines
+        .map(p => path.relative(refBaseline, p))
+        .filter(p => !usedBaselines.has(p));
+
+    return unusedBaselines;
+}
+
 const $test = $({ env: goTestEnv });
 
 /**
@@ -332,7 +386,55 @@ async function runTests() {
         await fs.promises.mkdir(localBaseline, { recursive: true });
     }
 
-    await $test`${gotestsum("tests")} ./... ${isCI ? ["--timeout=45m"] : []}`;
+    // Create a tmp directory for baseline tracking if enabled
+    /** @type {string | undefined} */
+    let trackingDir;
+    /** @type {(() => void) | undefined} */
+    let cleanupTracking;
+
+    if (baselineTrackingEnabled) {
+        const tmpDir = tmp.dirSync({ prefix: "tsgo-baseline-tracking-", unsafeCleanup: true });
+        trackingDir = tmpDir.name;
+        cleanupTracking = tmpDir.removeCallback;
+    }
+
+    try {
+        const testEnv = {
+            ...goTestEnv,
+            ...(trackingDir ? { TSGO_BASELINE_TRACKING_DIR: trackingDir } : {}),
+        };
+        const $testWithTracking = $({ env: testEnv });
+        await $testWithTracking`${gotestsum("tests")} ./... ${isCI ? ["--timeout=45m"] : []}`;
+
+        // Check for unused baselines after tests complete
+        if (trackingDir) {
+            const unusedBaselines = await checkUnusedBaselines(trackingDir);
+            if (unusedBaselines.length > 0) {
+                console.error(pc.red(`\nFound ${unusedBaselines.length} unused baseline file(s):`));
+                for (const baseline of unusedBaselines.slice(0, 20)) {
+                    console.error(pc.red(`  ${baseline}`));
+                }
+                if (unusedBaselines.length > 20) {
+                    console.error(pc.red(`  ... and ${unusedBaselines.length - 20} more`));
+                }
+
+                // Create .delete files for each unused baseline so baseline-accept can remove them
+                for (const baseline of unusedBaselines) {
+                    const deleteFilePath = path.join(localBaseline, baseline + ".delete");
+                    await fs.promises.mkdir(path.dirname(deleteFilePath), { recursive: true });
+                    await fs.promises.writeFile(deleteFilePath, "");
+                }
+                console.error(pc.red(`\nRun 'hereby baseline-accept' to delete them.`));
+
+                throw new Error(`Found ${unusedBaselines.length} unused baseline file(s). Run 'hereby baseline-accept' to delete them.`);
+            }
+        }
+    }
+    finally {
+        if (cleanupTracking) {
+            cleanupTracking();
+        }
+    }
 }
 
 export const test = task({

_packages/api/package.json

@@ -3,6 +3,9 @@
     "name": "@typescript/api",
     "version": "1.0.0",
     "type": "module",
+    "engines": {
+        "node": ">=20.19"
+    },
     "imports": {
         "#symbolFlags": {
             "@typescript/source": {
@@ -42,7 +45,7 @@
         "test": "node --test --experimental-strip-types --no-warnings --conditions @typescript/source ./test/**/*.test.ts"
     },
     "devDependencies": {
-        "tinybench": "^3.1.1"
+        "tinybench": "^6.0.0"
     },
     "dependencies": {
         "@typescript/ast": "1.0.0",

_packages/ast/package.json

@@ -4,6 +4,9 @@
     "version": "1.0.0",
     "description": "TypeScript AST definitions",
     "type": "module",
+    "engines": {
+        "node": ">=20.19"
+    },
     "imports": {
         "#syntaxKind": {
             "@typescript/source": {

internal/api/encoder/testmain_test.go

@@ -0,0 +1,12 @@
+package encoder_test
+
+import (
+	"testing"
+
+	"github.com/microsoft/typescript-go/internal/testutil/baseline"
+)
+
+func TestMain(m *testing.M) {
+	defer baseline.Track()()
+	m.Run()
+}

internal/astnav/testmain_test.go

@@ -0,0 +1,12 @@
+package astnav_test
+
+import (
+	"testing"
+
+	"github.com/microsoft/typescript-go/internal/testutil/baseline"
+)
+
+func TestMain(m *testing.M) {
+	defer baseline.Track()()
+	m.Run()
+}

internal/checker/utilities.go

@@ -491,7 +491,7 @@ func CompareTypes(t1, t2 *Type) int {
 		if c := CompareTypes(t1.AsIndexType().target, t2.AsIndexType().target); c != 0 {
 			return c
 		}
-		if c := int(t1.AsIndexType().flags) - int(t2.AsIndexType().flags); c != 0 {
+		if c := int(t1.AsIndexType().indexFlags) - int(t2.AsIndexType().indexFlags); c != 0 {
 			return c
 		}
 	case t1.flags&TypeFlagsIndexedAccess != 0:

internal/compiler/fileInclude.go

@@ -5,7 +5,6 @@ import (
 	"sync"
 
 	"github.com/microsoft/typescript-go/internal/ast"
-	"github.com/microsoft/typescript-go/internal/core"
 	"github.com/microsoft/typescript-go/internal/diagnostics"
 	"github.com/microsoft/typescript-go/internal/module"
 	"github.com/microsoft/typescript-go/internal/scanner"
@@ -23,8 +22,6 @@ const (
 	fileIncludeKindLibReferenceDirective
 
 	fileIncludeKindRootFile
-	fileIncludeKindSourceFromProjectReference
-	fileIncludeKindOutputFromProjectReference
 	fileIncludeKindLibFile
 	fileIncludeKindAutomaticTypeDirectiveFile
 )
@@ -192,15 +189,6 @@ func (r *FileIncludeReason) computeDiagnostic(program *Program, toFileName func(
 		} else {
 			return ast.NewCompilerDiagnostic(diagnostics.Root_file_specified_for_compilation)
 		}
-	case fileIncludeKindSourceFromProjectReference,
-		fileIncludeKindOutputFromProjectReference:
-		diag := core.IfElse(
-			r.kind == fileIncludeKindOutputFromProjectReference,
-			diagnostics.Output_from_referenced_project_0_included_because_module_is_specified_as_none,
-			diagnostics.Source_from_referenced_project_0_included_because_module_is_specified_as_none,
-		)
-		referencedResolvedRef := program.projectReferenceFileMapper.getResolvedProjectReferences()[r.asIndex()]
-		return ast.NewCompilerDiagnostic(diag, toFileName(referencedResolvedRef.ConfigName()))
 	case fileIncludeKindAutomaticTypeDirectiveFile:
 		data := r.asAutomaticTypeDirectiveFileData()
 		if program.Options().Types != nil {
@@ -288,16 +276,6 @@ func (r *FileIncludeReason) toRelatedInfo(program *Program) *ast.Diagnostic {
 				return tsoptions.CreateDiagnosticForNodeInSourceFile(config.ConfigFile.SourceFile, includeNode.AsNode(), diagnostics.File_is_matched_by_include_pattern_specified_here)
 			}
 		}
-	case fileIncludeKindSourceFromProjectReference,
-		fileIncludeKindOutputFromProjectReference:
-		return tsoptions.CreateDiagnosticAtReferenceSyntax(
-			config,
-			r.asIndex(),
-			core.IfElse(
-				r.kind == fileIncludeKindOutputFromProjectReference,
-				diagnostics.File_is_output_from_referenced_project_specified_here,
-				diagnostics.File_is_source_from_referenced_project_specified_here,
-			))
 	case fileIncludeKindAutomaticTypeDirectiveFile:
 		if program.Options().Types != nil {
 			data := r.asAutomaticTypeDirectiveFileData()

internal/compiler/fileloader.go

@@ -50,6 +50,24 @@ type fileLoader struct {
 	pathForLibFileResolutions collections.SyncMap[tspath.Path, *libResolution]
 }
 
+type redirectsFile struct {
+	// Index of file at which this redirect file needs to be iterated
+	index    int
+	fileName string
+	path     tspath.Path
+	target   tspath.Path
+}
+
+var _ ast.HasFileName = (*redirectsFile)(nil)
+
+func (r *redirectsFile) FileName() string {
+	return r.fileName
+}
+
+func (r *redirectsFile) Path() tspath.Path {
+	return r.path
+}
+
 type processedFiles struct {
 	resolver                      *module.Resolver
 	files                         []*ast.SourceFile
@@ -70,9 +88,9 @@ type processedFiles struct {
 	outputFileToProjectReferenceSource map[tspath.Path]string
 	// Key is a file path. Value is the list of files that redirect to it (same package, different install location)
 	redirectTargetsMap map[tspath.Path][]string
-	// Any paths involved in deduplication, including canonical paths and redirected paths
-	deduplicatedPaths  collections.Set[tspath.Path]
-	finishedProcessing bool
+	// filesByPath for redirect files
+	redirectFilesByPath map[tspath.Path]*redirectsFile
+	finishedProcessing  bool
 }
 
 type jsxRuntimeImportSpecifier struct {