Rename compiler package to program

Author: jakebailey

cmd/tsgo/main.go

@@ -13,9 +13,9 @@ import (
 
 	"github.com/microsoft/typescript-go/internal/ast"
 	"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/program"
 	"github.com/microsoft/typescript-go/internal/scanner"
 	"github.com/microsoft/typescript-go/internal/tspath"
 	"github.com/microsoft/typescript-go/internal/vfs"
@@ -86,7 +86,7 @@ func main() {
 
 	fs := bundled.WrapFS(vfs.FromOS())
 	useCaseSensitiveFileNames := fs.UseCaseSensitiveFileNames()
-	host := ts.NewCompilerHost(compilerOptions, currentDirectory, fs)
+	host := program.NewCompilerHost(compilerOptions, currentDirectory, fs)
 
 	normalizedRootPath := tspath.ResolvePath(currentDirectory, rootPath)
 	if !fs.DirectoryExists(normalizedRootPath) {
@@ -95,7 +95,7 @@ func main() {
 	}
 	compilerOptions.ConfigFilePath = normalizedRootPath // This matters for type reference directive resolution
 
-	programOptions := ts.ProgramOptions{
+	programOptions := program.ProgramOptions{
 		RootPath:           normalizedRootPath,
 		Options:            compilerOptions,
 		SingleThreaded:     singleThreaded,
@@ -109,24 +109,24 @@ func main() {
 	}
 
 	startTime := time.Now()
-	program := ts.NewProgram(programOptions)
-	diagnostics := program.GetSyntacticDiagnostics(nil)
+	prog := program.NewProgram(programOptions)
+	diagnostics := prog.GetSyntacticDiagnostics(nil)
 	if len(diagnostics) == 0 {
 		if parseAndBindOnly {
-			diagnostics = program.GetBindDiagnostics(nil)
+			diagnostics = prog.GetBindDiagnostics(nil)
 		} else {
 			if printTypes {
-				program.PrintSourceFileWithTypes()
+				prog.PrintSourceFileWithTypes()
 			} else {
-				diagnostics = program.GetSemanticDiagnostics(nil)
+				diagnostics = prog.GetSemanticDiagnostics(nil)
 			}
 		}
 	}
 	compileTime := time.Since(startTime)
 
 	startTime = time.Now()
 	if len(outDir) > 0 {
-		result := program.Emit(&ts.EmitOptions{})
+		result := prog.Emit(&program.EmitOptions{})
 		diagnostics = append(diagnostics, result.Diagnostics...)
 	}
 	emitTime := time.Since(startTime)
@@ -157,13 +157,13 @@ func main() {
 	}
 
 	if listFiles {
-		for _, file := range program.SourceFiles() {
+		for _, file := range prog.SourceFiles() {
 			fmt.Println(file.FileName())
 		}
 	}
 
-	fmt.Printf("Files:         %v\n", len(program.SourceFiles()))
-	fmt.Printf("Types:         %v\n", program.TypeCount())
+	fmt.Printf("Files:         %v\n", len(prog.SourceFiles()))
+	fmt.Printf("Types:         %v\n", prog.TypeCount())
 	fmt.Printf("Compile time:  %v\n", compileTime)
 	fmt.Printf("Emit time:     %v\n", emitTime)
 	fmt.Printf("Memory used:   %vK\n", memStats.Alloc/1024)

internal/checker/checker_test.go

@@ -6,7 +6,7 @@ import (
 
 	"github.com/microsoft/typescript-go/internal/ast"
 	"github.com/microsoft/typescript-go/internal/bundled"
-	"github.com/microsoft/typescript-go/internal/compiler"
+	"github.com/microsoft/typescript-go/internal/program"
 	"github.com/microsoft/typescript-go/internal/vfs/vfstest"
 )
 
@@ -26,13 +26,13 @@ foo.bar;`
 	fs = bundled.WrapFS(fs)
 
 	cd := "/"
-	host := compiler.NewCompilerHost(nil, "/", fs)
-	opts := compiler.ProgramOptions{
+	host := program.NewCompilerHost(nil, "/", fs)
+	opts := program.ProgramOptions{
 		Host:               host,
 		RootPath:           cd,
 		DefaultLibraryPath: bundled.LibPath(),
 	}
-	p := compiler.NewProgram(opts)
+	p := program.NewProgram(opts)
 	p.BindSourceFiles()
 	c := p.GetTypeChecker()
 	file := p.GetSourceFile("/foo.ts")

internal/compiler/pkg.go

@@ -1,4 +1,4 @@
-package compiler
+package program
 
 import (
 	"github.com/microsoft/typescript-go/internal/ast"

internal/compiler/emitHost.go renamed to internal/program/emitHost.go

@@ -1,4 +1,4 @@
-package compiler
+package program
 
 import (
 	"github.com/microsoft/typescript-go/internal/ast"

internal/compiler/emitter.go renamed to internal/program/emitter.go

@@ -1,4 +1,4 @@
-package compiler
+package program
 
 import (
 	"github.com/microsoft/typescript-go/internal/core"

internal/compiler/host.go renamed to internal/program/host.go

@@ -1,4 +1,4 @@
-package compiler
+package program
 
 import (
 	"cmp"

internal/compiler/program.go renamed to internal/program/program.go

@@ -1,4 +1,4 @@
-package compiler
+package program
 
 import (
 	"strings"

internal/compiler/program_test.go renamed to internal/program/program_test.go

@@ -12,8 +12,8 @@ import (
 
 	"github.com/microsoft/typescript-go/internal/ast"
 	"github.com/microsoft/typescript-go/internal/bundled"
-	"github.com/microsoft/typescript-go/internal/compiler"
 	"github.com/microsoft/typescript-go/internal/core"
+	"github.com/microsoft/typescript-go/internal/program"
 	"github.com/microsoft/typescript-go/internal/repo"
 	"github.com/microsoft/typescript-go/internal/tspath"
 	"github.com/microsoft/typescript-go/internal/vfs"
@@ -28,7 +28,7 @@ type TestFile struct {
 
 type CompileFilesResult struct {
 	Diagnostics []*ast.Diagnostic
-	Program     *compiler.Program
+	Program     *program.Program
 	// !!!
 }
 
@@ -170,12 +170,12 @@ func setCompilerOptionsFromHarnessConfig(harnessConfig TestConfiguration, option
 	}
 }
 
-func createCompilerHost(fs vfs.FS, options *core.CompilerOptions, currentDirectory string) compiler.CompilerHost {
-	return compiler.NewCompilerHost(options, currentDirectory, fs)
+func createCompilerHost(fs vfs.FS, options *core.CompilerOptions, currentDirectory string) program.CompilerHost {
+	return program.NewCompilerHost(options, currentDirectory, fs)
 }
 
 func compileFilesWithHost(
-	host compiler.CompilerHost,
+	host program.CompilerHost,
 	rootFiles []string,
 	options *core.CompilerOptions,
 	typescriptVersion string,
@@ -211,7 +211,7 @@ func compileFilesWithHost(
 	// pre-emit/post-emit error comparison requires declaration emit twice, which can be slow. If it's unlikely to flag any error consistency issues
 	// and if the test is running `skipLibCheck` - an indicator that we want the tets to run quickly - skip the before/after error comparison, too
 	// skipErrorComparison := len(rootFiles) >= 100 || options.SkipLibCheck == core.TSTrue && options.Declaration == core.TSTrue
-	// var preProgram *compiler.Program
+	// var preProgram *program.Program
 	// if !skipErrorComparison {
 	// !!! Need actual program for this
 	// preProgram = ts.createProgram({ rootNames: rootFiles || [], options: { ...compilerOptions, configFile: compilerOptions.configFile, traceResolution: false }, host, typeScriptVersion })
@@ -260,14 +260,14 @@ func compileFilesWithHost(
 }
 
 // !!! Temporary while we don't have the real `createProgram`
-func createProgram(host compiler.CompilerHost, options *core.CompilerOptions) *compiler.Program {
-	programOptions := compiler.ProgramOptions{
+func createProgram(host program.CompilerHost, options *core.CompilerOptions) *program.Program {
+	programOptions := program.ProgramOptions{
 		RootPath:           "/", // Include all files while we don't have a way to specify root files
 		Host:               host,
 		Options:            options,
 		DefaultLibraryPath: bundled.LibPath(),
 	}
-	program := compiler.NewProgram(programOptions)
+	program := program.NewProgram(programOptions)
 	return program
 }
 

internal/testutil/harnessutil/harnessutil.go

@@ -10,7 +10,7 @@ import (
 
 	"github.com/microsoft/typescript-go/internal/ast"
 	"github.com/microsoft/typescript-go/internal/checker"
-	"github.com/microsoft/typescript-go/internal/compiler"
+	"github.com/microsoft/typescript-go/internal/program"
 	"github.com/microsoft/typescript-go/internal/core"
 	"github.com/microsoft/typescript-go/internal/scanner"
 	"github.com/microsoft/typescript-go/internal/testutil/baseline"
@@ -28,7 +28,7 @@ func DoTypeAndSymbolBaseline(
 	t *testing.T,
 	baselinePath string,
 	header string,
-	program *compiler.Program,
+	program *program.Program,
 	allFiles []*harnessutil.TestFile,
 	opts baseline.Options,
 	skipTypeBaselines bool,
@@ -194,14 +194,14 @@ func iterateBaseline(allFiles []*harnessutil.TestFile, fullWalker *typeWriterWal
 }
 
 type typeWriterWalker struct {
-	program              *compiler.Program
+	program              *program.Program
 	checker              *checker.Checker
 	hadErrorBaseline     bool
 	currentSourceFile    *ast.SourceFile
 	declarationTextCache map[*ast.Node]string
 }
 
-func newTypeWriterWalker(program *compiler.Program, hadErrorBaseline bool) *typeWriterWalker {
+func newTypeWriterWalker(program *program.Program, hadErrorBaseline bool) *typeWriterWalker {
 	return &typeWriterWalker{
 		checker:              program.GetTypeChecker(),
 		program:              program,