Remove --lint-first flag and always do a blocking loop on linter issues

Author: Bruce Hill

pkg/cmd/dev.go

@@ -271,18 +271,16 @@ var devCommand = cli.Command{
 			Value:   false,
 			Usage:   "Only check for diagnostic errors without running a full build.",
 		},
-		&cli.BoolFlag{
-			Name:  "lint-first",
-			Value: false,
-			Usage: "Run linting before starting the build process.",
-		},
 	},
 	Action: runPreview,
 }
 
 func runPreview(ctx context.Context, cmd *cli.Command) error {
 	cc := getAPICommandContext(cmd)
 
+	openapiSpecPath := cmd.String("openapi-spec")
+	stainlessConfigPath := cmd.String("stainless-config")
+
 	// If only linting is requested, run in lint-only mode
 	if cmd.Bool("lint") {
 		return runLintLoop(ctx, cmd)
@@ -366,18 +364,29 @@ func runPreview(ctx context.Context, cmd *cli.Command) error {
 
 	// Phase 3: Start build and monitor progress in a loop
 	for {
-		// Check if we should run linting before building
-		if cmd.Bool("lint-first") {
-			diagnostics, err := getPreviewDiagnosticsJSON(ctx, cmd)
+		// Keep checking diagnostics until they're all fixed
+		for {
+			diagnostics, err := getPreviewDiagnostics(ctx, cmd)
 			if err != nil {
 				if errors.Is(err, ErrUserCancelled) {
 					return nil
 				}
 				return err
 			}
-			jsonObj := gjson.Parse(diagnostics.Raw)
-			transform := cmd.String("transform")
-			ShowJSON("Linting Results", jsonObj, cmd.String("format"), transform)
+
+			if len(diagnostics) > 0 {
+				fmt.Println(ViewDiagnosticsPrint(diagnostics, 10))
+			}
+
+			if hasBlockingDiagnostic(diagnostics) {
+				fmt.Println("\nDiagnostic checks will re-run once you edit your configuration files...")
+				if err := waitTillAnyFileChanged(ctx, []string{openapiSpecPath, stainlessConfigPath}); err != nil {
+					return err
+				}
+				continue
+			} else {
+				break
+			}
 		}
 
 		// Start the build process
@@ -401,16 +410,6 @@ func runLintLoop(ctx context.Context, cmd *cli.Command) error {
 	openapiSpecPath := cmd.String("openapi-spec")
 	stainlessConfigPath := cmd.String("stainless-config")
 
-	var openapiSpecLastModified, stainlessConfigLastModified time.Time
-
-	if openapiSpecStat, err := os.Stat(openapiSpecPath); err == nil {
-		openapiSpecLastModified = openapiSpecStat.ModTime()
-	}
-
-	if stainlessConfigStat, err := os.Stat(stainlessConfigPath); err == nil {
-		stainlessConfigLastModified = stainlessConfigStat.ModTime()
-	}
-
 	for {
 		diagnostics, err := getPreviewDiagnosticsJSON(ctx, cmd)
 		if err != nil {
@@ -426,31 +425,37 @@ func runLintLoop(ctx context.Context, cmd *cli.Command) error {
 			break
 		}
 
-		for {
-			time.Sleep(500 * time.Millisecond)
+		if err := waitTillAnyFileChanged(ctx, []string{openapiSpecPath, stainlessConfigPath}); err != nil {
+			return err
+		}
+	}
+	return nil
+}
 
-			if openapiSpecStat, err := os.Stat(openapiSpecPath); err == nil {
-				if openapiSpecStat.ModTime().After(openapiSpecLastModified) {
-					openapiSpecLastModified = openapiSpecStat.ModTime()
-					break // File changed, run linting again
-				}
-			}
+func waitTillAnyFileChanged(ctx context.Context, files []string) error {
+	lastModified := make(map[string]time.Time)
+	for _, file := range files {
+		if stat, err := os.Stat(file); err == nil {
+			lastModified[file] = stat.ModTime()
+		}
+	}
 
-			// Check Stainless config file
-			if stainlessConfigStat, err := os.Stat(stainlessConfigPath); err == nil {
-				if stainlessConfigStat.ModTime().After(stainlessConfigLastModified) {
-					stainlessConfigLastModified = stainlessConfigStat.ModTime()
-					break // File changed, run linting again
-				}
-			}
+	for {
+		time.Sleep(500 * time.Millisecond)
 
-			// Check for cancellation
-			select {
-			case <-ctx.Done():
-				return ctx.Err()
-			default:
+		for _, file := range files {
+			if stat, err := os.Stat(file); err == nil {
+				if stat.ModTime().After(lastModified[file]) {
+					return nil
+				}
 			}
 		}
+		// Check for cancellation
+		select {
+		case <-ctx.Done():
+			return ctx.Err()
+		default:
+		}
 	}
 	return nil
 }
@@ -547,7 +552,7 @@ func getPreviewDiagnosticsJSON(ctx context.Context, cmd *cli.Command) (*gjson.Re
 		return nil, err
 	}
 	json := gjson.ParseBytes(result)
-	diagnostics := json.Get("spec.diagnostics.@values.@flatten.#.{code,level,ignored,endpoint,message,more,language,location,stainlessPath,oasRef,configRef}")
+	diagnostics := json.Get("spec.diagnostics.@values.@flatten")
 	return &diagnostics, nil
 }
 
@@ -562,3 +567,19 @@ func getPreviewDiagnostics(ctx context.Context, cmd *cli.Command) ([]stainless.B
 	}
 	return diagnostics, err
 }
+
+func hasBlockingDiagnostic(diagnostics []stainless.BuildDiagnostic) bool {
+	for _, d := range diagnostics {
+		if !d.Ignored {
+			switch d.Level {
+			case stainless.BuildDiagnosticLevelFatal:
+			case stainless.BuildDiagnosticLevelError:
+			case stainless.BuildDiagnosticLevelWarning:
+				return true
+			case stainless.BuildDiagnosticLevelNote:
+				continue
+			}
+		}
+	}
+	return false
+}

pkg/cmd/dev_view.go

@@ -108,7 +108,7 @@ var parts = []struct {
 			if m.diagnostics == nil {
 				s.WriteString(SProperty(0, "diagnostics", "waiting for build to finish"))
 			} else {
-				s.WriteString(ViewDiagnosticsPrint(m.diagnostics))
+				s.WriteString(ViewDiagnosticsPrint(m.diagnostics, 10))
 			}
 		},
 	},
@@ -325,7 +325,7 @@ func countDiagnosticsBySeverity(diagnostics []stainless.BuildDiagnostic) (fatal,
 	return
 }
 
-func ViewDiagnosticsPrint(diagnostics []stainless.BuildDiagnostic) string {
+func ViewDiagnosticsPrint(diagnostics []stainless.BuildDiagnostic, maxDiagnostics int) string {
 	var s strings.Builder
 
 	if len(diagnostics) > 0 {
@@ -353,14 +353,13 @@ func ViewDiagnosticsPrint(diagnostics []stainless.BuildDiagnostic) string {
 		}
 
 		var sub strings.Builder
-		maxDiagnostics := 10
 
-		if len(diagnostics) > maxDiagnostics {
+		if maxDiagnostics >= 0 && len(diagnostics) > maxDiagnostics {
 			sub.WriteString(fmt.Sprintf("Showing first %d of %d diagnostics:\n", maxDiagnostics, len(diagnostics)))
 		}
 
 		for i, diag := range diagnostics {
-			if i >= maxDiagnostics {
+			if maxDiagnostics >= 0 && i >= maxDiagnostics {
 				break
 			}
 

pkg/cmd/lint.go

@@ -72,7 +72,14 @@ func runLinter(ctx context.Context, cmd *cli.Command) error {
 	jsonObj := gjson.Parse(string(result)).Get(transform)
 	var diagnostics []stainless.BuildDiagnostic
 	json.Unmarshal([]byte(jsonObj.Raw), &diagnostics)
-	fmt.Println(ViewDiagnosticsPrint(diagnostics))
+	if cmd.IsSet("format") {
+		if err := ShowJSON("Diagnostics", jsonObj, cmd.String("format"), ""); err != nil {
+			return err
+		}
+	} else {
+		fmt.Println(ViewDiagnosticsPrint(diagnostics, -1))
+	}
+
 	for _, d := range diagnostics {
 		if !d.Ignored {
 			switch d.Level {