fix --watch crash if no tsconfig found (#841)

Author: iisaduan

internal/execute/export_test.go

@@ -17,6 +17,11 @@ func CommandLineTestWatch(sys System, cb cbType, commandLineArgs []string) (*tso
 	return parsedCommandLine, w
 }
 
+func StartForTest(w *watcher) {
+	// this function should perform any initializations before w.doCycle() in `start(watcher)`
+	w.initialize()
+}
+
 func RunWatchCycle(w *watcher) {
 	// this function should perform the same stuff as w.doCycle() without printing time-related output
 	if w.hasErrorsInTsConfig() {

internal/execute/verifytscwatch_test.go

@@ -27,6 +27,7 @@ func verifyWatch(t *testing.T, test *tscInput, scenario string, edits []*testTsc
 			baselineBuilder.WriteString("\n\n")
 
 			// build initial state
+			execute.StartForTest(watcher)
 			execute.RunWatchCycle(watcher)
 			test.sys.serializeState(baselineBuilder)
 
@@ -44,6 +45,29 @@ func verifyWatch(t *testing.T, test *tscInput, scenario string, edits []*testTsc
 	})
 }
 
+func TestWatch(t *testing.T) {
+	t.Parallel()
+	if !bundled.Embedded {
+		// Without embedding, we'd need to read all of the lib files out from disk into the MapFS.
+		// Just skip this for now.
+		t.Skip("bundled files are not embedded")
+	}
+
+	testCases := []*tscInput{
+		{
+			subScenario: "watch with no tsconfig",
+			sys: newTestSys(FileMap{
+				"/home/src/workspaces/project/index.ts": "",
+			}, "/home/src/workspaces/project"),
+			commandLineArgs: []string{"index.ts", "--watch"},
+		},
+	}
+
+	for _, test := range testCases {
+		verifyWatch(t, test, "commandLineWatch", nil)
+	}
+}
+
 func listToTsconfig(base string, tsconfigOpts ...string) (string, string) {
 	optionString := strings.Join(tsconfigOpts, ",\n            ")
 	tsconfigText := `{

internal/execute/watch.go

@@ -8,9 +8,8 @@ import (
 )
 
 func start(w *watcher) ExitStatus {
-	if w.configFileName == "" {
-		w.host = compiler.NewCompilerHost(w.options.CompilerOptions(), w.sys.GetCurrentDirectory(), w.sys.FS(), w.sys.DefaultLibraryPath())
-	}
+	w.initialize()
+
 	watchInterval := 1000 * time.Millisecond
 	if w.options.ParsedConfig.WatchOptions != nil {
 		watchInterval = time.Duration(*w.options.ParsedConfig.WatchOptions.Interval) * time.Millisecond
@@ -21,7 +20,16 @@ func start(w *watcher) ExitStatus {
 	}
 }
 
+func (w *watcher) initialize() {
+	// if this function is updated, make sure to update `StartForTest` in export_test.go as needed
+	if w.configFileName == "" {
+		w.host = compiler.NewCompilerHost(w.options.CompilerOptions(), w.sys.GetCurrentDirectory(), w.sys.FS(), w.sys.DefaultLibraryPath())
+	}
+}
+
 func (w *watcher) doCycle() {
+	// if this function is updated, make sure to update `RunWatchCycle` in export_test.go as needed
+
 	if w.hasErrorsInTsConfig() {
 		// these are unrecoverable errors--report them and do not build
 		return

internal/execute/watcher.go

@@ -23,13 +23,16 @@ type watcher struct {
 }
 
 func createWatcher(sys System, configParseResult *tsoptions.ParsedCommandLine, reportDiagnostic diagnosticReporter) *watcher {
-	return &watcher{
+	w := &watcher{
 		sys:              sys,
-		configFileName:   configParseResult.ConfigFile.SourceFile.FileName(),
 		options:          configParseResult,
 		reportDiagnostic: reportDiagnostic,
 		// reportWatchStatus: createWatchStatusReporter(sys, configParseResult.CompilerOptions().Pretty),
 	}
+	if configParseResult.ConfigFile != nil {
+		w.configFileName = configParseResult.ConfigFile.SourceFile.FileName()
+	}
+	return w
 }
 
 func (w *watcher) compileAndEmit() {

testdata/baselines/reference/tscWatch/commandLineWatch/watch-with-no-tsconfig.js

@@ -0,0 +1,19 @@
+
+currentDirectory::/home/src/workspaces/project
+useCaseSensitiveFileNames::true
+Input::index.ts --watch
+//// [/home/src/workspaces/project/index.ts] new file
+
+
+
+
+CompilerOptions::{
+    "watch": true
+}
+
+
+Output::
+No output
+//// [/home/src/workspaces/project/index.ts] new file
+
+