Merge branch 'main' into tsconfigParsingImplementation

Author: andrewbranch

.github/workflows/ci.yml

@@ -73,14 +73,23 @@ jobs:
         # Installing gotestsum is super slow on Windows.
         if: ${{ matrix.os != 'windows-latest' }}
 
-      - run: npx hereby test:all ${RACE_FLAG:+"$RACE_FLAG"} ${NOEMBED_FLAG:+"$NOEMBED_FLAG"}
+      - name: Tests
+        id: test
+        run: npx hereby test:all ${RACE_FLAG:+"$RACE_FLAG"} ${NOEMBED_FLAG:+"$NOEMBED_FLAG"}
         env:
           RACE_FLAG: ${{ (matrix.race && '--race') || '' }}
           NOEMBED_FLAG: ${{ (matrix.noembed && '--noembed') || '' }}
 
       - run: git add .
       - run: git diff --staged --exit-code --stat
 
+      - name: Print baseline diff on failure
+        if: ${{ failure() && steps.test.conclusion == 'failure' }}
+        run: |
+          npx hereby baseline-accept
+          git add testdata/baselines/reference
+          git diff --staged --exit-code
+
   lint:
     runs-on: ubuntu-latest
     steps:

.gitignore

@@ -173,8 +173,12 @@ go.work.sum
 # Benchmarking results
 *.txt
 
+# Re-add baseline references
+!testdata/baselines/reference/**/*.txt
+
 # Local baselines
 testdata/baselines/local
+testdata/baselines/tmp
 
 custom-gcl
 custom-gcl.exe

cmd/tsgo/main.go

@@ -15,6 +15,7 @@ import (
 	"github.com/microsoft/typescript-go/internal/bundled"
 	ts "github.com/microsoft/typescript-go/internal/compiler"
 	"github.com/microsoft/typescript-go/internal/core"
+	"github.com/microsoft/typescript-go/internal/diagnosticwriter"
 	"github.com/microsoft/typescript-go/internal/scanner"
 	"github.com/microsoft/typescript-go/internal/tspath"
 	"github.com/microsoft/typescript-go/internal/vfs"
@@ -92,6 +93,7 @@ func main() {
 		fmt.Fprintf(os.Stderr, "Error: The directory %v does not exist.\n", normalizedRootPath)
 		os.Exit(1)
 	}
+	compilerOptions.ConfigFilePath = normalizedRootPath // This matters for type reference directive resolution
 
 	programOptions := ts.ProgramOptions{
 		RootPath:           normalizedRootPath,
@@ -140,13 +142,13 @@ func main() {
 			UseCaseSensitiveFileNames: useCaseSensitiveFileNames,
 		}
 		if pretty {
-			formatOpts := ts.DiagnosticsFormattingOptions{
+			formatOpts := diagnosticwriter.FormattingOptions{
 				NewLine:             "\n",
 				ComparePathsOptions: comparePathOptions,
 			}
-			ts.FormatDiagnosticsWithColorAndContext(os.Stdout, diagnostics, &formatOpts)
+			diagnosticwriter.FormatDiagnosticsWithColorAndContext(os.Stdout, diagnostics, &formatOpts)
 			fmt.Fprintln(os.Stdout)
-			ts.WriteErrorSummaryText(os.Stdout, diagnostics, &formatOpts)
+			diagnosticwriter.WriteErrorSummaryText(os.Stdout, diagnostics, &formatOpts)
 		} else {
 			for _, diagnostic := range diagnostics {
 				printDiagnostic(diagnostic, 0, comparePathOptions)

internal/compiler/program.go

@@ -275,6 +275,13 @@ func (p *Program) startParseTask(fileName string, wg *core.WorkGroup, isLib bool
 			filesToParse = append(filesToParse, toParse{p: resolvedPath})
 		}
 
+		for _, ref := range file.TypeReferenceDirectives {
+			resolved := p.resolver.ResolveTypeReferenceDirective(ref.FileName, file.FileName(), core.ModuleKindNodeNext, nil)
+			if resolved.IsResolved() {
+				filesToParse = append(filesToParse, toParse{p: resolved.ResolvedFileName})
+			}
+		}
+
 		if p.compilerOptions.NoLib != core.TSTrue {
 			for _, lib := range file.LibReferenceDirectives {
 				name, ok := tsoptions.GetLibFileName(lib.FileName)

internal/core/compileroptions.go

@@ -20,6 +20,7 @@ type CompilerOptions struct {
 	EmitDeclarationOnly                Tristate             `json:"emitDeclarationOnly"`
 	EmitBOM                            Tristate             `json:"emitBOM"`
 	DownlevelIteration                 Tristate             `json:"downlevelIteration"`
+	Declaration                        Tristate             `json:"declaration"`
 	DeclarationDir                     string               `json:"declarationDir"`
 	DeclarationMap                     Tristate             `json:"declarationMap"`
 	ESModuleInterop                    Tristate             `json:"esModuleInterop"`
@@ -35,6 +36,7 @@ type CompilerOptions struct {
 	ModuleDetection                    ModuleDetectionKind  `json:"moduleDetectionKind"`
 	NewLine                            NewLineKind          `json:"newLine"`
 	NoEmit                             Tristate             `json:"noEmit"`
+	NoErrorTruncation                  Tristate             `json:"noErrorTruncation"`
 	NoFallthroughCasesInSwitch         Tristate             `json:"noFallthroughCasesInSwitch"`
 	NoImplicitAny                      Tristate             `json:"noImplicitAny"`
 	NoImplicitThis                     Tristate             `json:"noImplicitThis"`
@@ -49,6 +51,7 @@ type CompilerOptions struct {
 	ResolvePackageJsonExports          Tristate             `json:"resolvePackageJsonExports"`
 	ResolvePackageJsonImports          Tristate             `json:"resolvePackageJsonImports"`
 	RewriteRelativeImportExtensions    Tristate             `json:"rewriteRelativeImportExtensions"`
+	SkipLibCheck                       Tristate             `json:"skipLibCheck"`
 	Strict                             Tristate             `json:"strict"`
 	StrictBindCallApply                Tristate             `json:"strictBindCallApply"`
 	StrictBuiltinIteratorReturn        Tristate             `json:"strictBuiltinIteratorReturn"`
@@ -63,7 +66,6 @@ type CompilerOptions struct {
 	UseUnknownInCatchVariables         Tristate             `json:"useUnknownInCatchVariables"`
 	VerbatimModuleSyntax               Tristate             `json:"verbatimModuleSyntax"`
 	MaxNodeModuleJsDepth               Tristate             `json:"maxNodeModuleJsDepth"`
-	SkipLibCheck                       Tristate             `json:"skipLibCheck"`
 
 	// Internal fields
 	ConfigFilePath  string   `json:"configFilePath"`
@@ -257,8 +259,9 @@ func (m ModuleResolutionKind) String() string {
 type NewLineKind int32
 
 const (
-	NewLineKindCRLF NewLineKind = 0
-	NewLineKindLF   NewLineKind = 1
+	NewLineKindNone NewLineKind = 0
+	NewLineKindCRLF NewLineKind = 1
+	NewLineKindLF   NewLineKind = 2
 )
 
 func (newLine NewLineKind) GetNewLineCharacter() string {

internal/compiler/error_reporting.go renamed to internal/diagnosticwriter/diagnosticwriter.go

@@ -1,4 +1,4 @@
-package compiler
+package diagnosticwriter
 
 import (
 	"fmt"
@@ -15,7 +15,7 @@ import (
 	"github.com/microsoft/typescript-go/internal/tspath"
 )
 
-type DiagnosticsFormattingOptions struct {
+type FormattingOptions struct {
 	tspath.ComparePathsOptions
 	NewLine string
 }
@@ -35,7 +35,7 @@ const (
 	ellipsis            = "..."
 )
 
-func FormatDiagnosticsWithColorAndContext(output io.Writer, diags []*ast.Diagnostic, formatOpts *DiagnosticsFormattingOptions) {
+func FormatDiagnosticsWithColorAndContext(output io.Writer, diags []*ast.Diagnostic, formatOpts *FormattingOptions) {
 	if len(diags) == 0 {
 		return
 	}
@@ -80,7 +80,7 @@ func FormatDiagnosticsWithColorAndContext(output io.Writer, diags []*ast.Diagnos
 	}
 }
 
-func writeCodeSnippet(writer io.Writer, sourceFile *ast.SourceFile, start int, length int, squiggleColor string, formatOpts *DiagnosticsFormattingOptions) {
+func writeCodeSnippet(writer io.Writer, sourceFile *ast.SourceFile, start int, length int, squiggleColor string, formatOpts *FormattingOptions) {
 	firstLine, firstLineChar := scanner.GetLineAndCharacterOfPosition(sourceFile, start)
 	lastLine, lastLineChar := scanner.GetLineAndCharacterOfPosition(sourceFile, start+length)
 
@@ -196,7 +196,7 @@ func writeWithStyleAndReset(output io.Writer, text string, formatStyle string) {
 	fmt.Fprint(output, resetEscapeSequence)
 }
 
-func WriteLocation(output io.Writer, file *ast.SourceFile, pos int, formatOpts *DiagnosticsFormattingOptions, writeWithStyleAndReset FormattedWriter) {
+func WriteLocation(output io.Writer, file *ast.SourceFile, pos int, formatOpts *FormattingOptions, writeWithStyleAndReset FormattedWriter) {
 	firstLine, firstChar := scanner.GetLineAndCharacterOfPosition(file, pos)
 	var relativeFileName string
 	if formatOpts != nil {
@@ -221,7 +221,7 @@ type ErrorSummary struct {
 	SortedFileList  []*ast.SourceFile
 }
 
-func WriteErrorSummaryText(output io.Writer, allDiagnostics []*ast.Diagnostic, formatOpts *DiagnosticsFormattingOptions) {
+func WriteErrorSummaryText(output io.Writer, allDiagnostics []*ast.Diagnostic, formatOpts *FormattingOptions) {
 	// Roughly corresponds to 'getErrorSummaryText' from watch.ts
 
 	errorSummary := getErrorSummary(allDiagnostics)
@@ -299,7 +299,7 @@ func getErrorSummary(diags []*ast.Diagnostic) *ErrorSummary {
 	}
 }
 
-func writeTabularErrorsDisplay(output io.Writer, errorSummary *ErrorSummary, formatOpts *DiagnosticsFormattingOptions) {
+func writeTabularErrorsDisplay(output io.Writer, errorSummary *ErrorSummary, formatOpts *FormattingOptions) {
 	sortedFiles := errorSummary.SortedFileList
 
 	maxErrors := 0
@@ -330,7 +330,7 @@ func writeTabularErrorsDisplay(output io.Writer, errorSummary *ErrorSummary, for
 	}
 }
 
-func prettyPathForFileError(file *ast.SourceFile, fileErrors []*ast.Diagnostic, formatOpts *DiagnosticsFormattingOptions) string {
+func prettyPathForFileError(file *ast.SourceFile, fileErrors []*ast.Diagnostic, formatOpts *FormattingOptions) string {
 	line, _ := scanner.GetLineAndCharacterOfPosition(file, fileErrors[0].Loc().Pos())
 	fileName := file.FileName()
 	if tspath.PathIsAbsolute(fileName) && tspath.PathIsAbsolute(formatOpts.CurrentDirectory) {
@@ -344,21 +344,21 @@ func prettyPathForFileError(file *ast.SourceFile, fileErrors []*ast.Diagnostic,
 	)
 }
 
-func WriteFormatDiagnostics(output io.Writer, diagnostics []*ast.Diagnostic, formatOpts *DiagnosticsFormattingOptions) {
+func WriteFormatDiagnostics(output io.Writer, diagnostics []*ast.Diagnostic, formatOpts *FormattingOptions) {
 	for _, diagnostic := range diagnostics {
 		WriteFormatDiagnostic(output, diagnostic, formatOpts)
 	}
 }
 
-func WriteFormatDiagnostic(output io.Writer, diagnostic *ast.Diagnostic, formatOpts *DiagnosticsFormattingOptions) {
+func WriteFormatDiagnostic(output io.Writer, diagnostic *ast.Diagnostic, formatOpts *FormattingOptions) {
 	if diagnostic.File() != nil {
 		line, character := scanner.GetLineAndCharacterOfPosition(diagnostic.File(), diagnostic.Loc().Pos())
 		fileName := diagnostic.File().FileName()
 		relativeFileName := tspath.ConvertToRelativePath(fileName, formatOpts.ComparePathsOptions)
 		fmt.Fprintf(output, "%s(%d,%d): ", relativeFileName, line+1, character+1)
 	}
 
-	fmt.Fprintf(output, "%s TS%d: ", diagnostic.Category().String(), diagnostic.Code())
+	fmt.Fprintf(output, "%s TS%d: ", diagnostic.Category().Name(), diagnostic.Code())
 	WriteFlattenedDiagnosticMessage(output, diagnostic, formatOpts.NewLine)
 	fmt.Fprint(output, formatOpts.NewLine)
 }

internal/testutil/baseline/baseline.go

@@ -16,21 +16,35 @@ type Options struct {
 const NoContent = "<no content>"
 
 func Run(t *testing.T, fileName string, actual string, opts Options) {
-	writeComparison(t, actual, fileName, opts)
+	writeComparison(t, actual, fileName, false /*useSubmodule*/, opts)
 }
 
-func writeComparison(t *testing.T, actual string, relativeFileName string, opts Options) {
+func RunAgainstSubmodule(t *testing.T, fileName string, actual string, opts Options) {
+	writeComparison(t, actual, fileName, true /*useSubmodule*/, opts)
+}
+
+func writeComparison(t *testing.T, actual string, relativeFileName string, useSubmodule bool, opts Options) {
 	if actual == "" {
-		panic("The generated content was \"\". Return 'baseline.NoContent' if no baselining is required.")
+		panic("the generated content was \"\". Return 'baseline.NoContent' if no baselining is required.")
 	}
 	var (
 		localFileName     string
 		referenceFileName string
 	)
 
-	localFileName = localPath(relativeFileName, opts.Subfolder)
-	referenceFileName = referencePath(relativeFileName, opts.Subfolder)
-	expected := getExpectedContent(relativeFileName, opts)
+	if useSubmodule {
+		localFileName = submoduleLocalPath(relativeFileName, opts.Subfolder)
+		referenceFileName = submoduleReferencePath(relativeFileName, opts.Subfolder)
+	} else {
+		localFileName = localPath(relativeFileName, opts.Subfolder)
+		referenceFileName = referencePath(relativeFileName, opts.Subfolder)
+	}
+
+	expected := NoContent
+	if content, err := os.ReadFile(referenceFileName); err == nil {
+		expected = string(content)
+	}
+
 	if _, err := os.Stat(localFileName); err == nil {
 		if err := os.Remove(localFileName); err != nil {
 			t.Fatal(fmt.Errorf("failed to remove the local baseline file %s: %w", localFileName, err))
@@ -49,26 +63,31 @@ func writeComparison(t *testing.T, actual string, relativeFileName string, opts
 		}
 
 		if _, err := os.Stat(referenceFileName); err != nil {
-			t.Errorf("New baseline created at %s.", localFileName)
+			if useSubmodule {
+				t.Errorf("the baseline file %s does not exist in the TypeScript submodule", referenceFileName)
+			} else {
+				t.Errorf("new baseline created at %s.", localFileName)
+			}
+		} else if useSubmodule {
+			t.Errorf("the baseline file %s does not match the reference in the TypeScript submodule", relativeFileName)
 		} else {
-			t.Errorf("The baseline file %s has changed. (Run `hereby baseline-accept` if the new baseline is correct.)", relativeFileName)
+			t.Errorf("the baseline file %s has changed. (Run `hereby baseline-accept` if the new baseline is correct.)", relativeFileName)
 		}
 	}
 }
 
-func getExpectedContent(relativeFileName string, opts Options) string {
-	refFileName := referencePath(relativeFileName, opts.Subfolder)
-	expected := NoContent
-	if content, err := os.ReadFile(refFileName); err == nil {
-		expected = string(content)
-	}
-	return expected
-}
-
 func localPath(fileName string, subfolder string) string {
 	return filepath.Join(repo.TestDataPath, "baselines", "local", subfolder, fileName)
 }
 
+func submoduleLocalPath(fileName string, subfolder string) string {
+	return filepath.Join(repo.TestDataPath, "baselines", "tmp", subfolder, fileName)
+}
+
 func referencePath(fileName string, subfolder string) string {
 	return filepath.Join(repo.TestDataPath, "baselines", "reference", subfolder, fileName)
 }
+
+func submoduleReferencePath(fileName string, subfolder string) string {
+	return filepath.Join(repo.TypeScriptSubmodulePath, "tests", "baselines", "reference", subfolder, fileName)
+}