From 7d11ef1e24a3f0981e45e37200957268c4e22619 Mon Sep 17 00:00:00 2001
From: Evan Wallace <evan.exe@gmail.com>
Date: Tue, 25 Apr 2023 07:28:04 -0400
Subject: [PATCH] fix for validation warnings

---
 pkg/api/api_impl.go     | 24 ++++++++++++++++++++++--
 scripts/js-api-tests.js | 16 +++++++++++++++-
 2 files changed, 37 insertions(+), 3 deletions(-)

diff --git a/pkg/api/api_impl.go b/pkg/api/api_impl.go
index 1efaeb83fb6..b0e9b77d4b2 100644
--- a/pkg/api/api_impl.go
+++ b/pkg/api/api_impl.go
@@ -903,7 +903,6 @@ func contextImpl(buildOpts BuildOptions) (*internalContext, []Message) {
 		LogLevel:      validateLogLevel(buildOpts.LogLevel),
 		Overrides:     validateLogOverrides(buildOpts.LogOverride),
 	}
-	log := logger.NewStderrLog(logOptions)
 
 	// Validate that the current working directory is an absolute path
 	absWorkingDir := buildOpts.AbsWorkingDir
@@ -916,6 +915,7 @@ func contextImpl(buildOpts BuildOptions) (*internalContext, []Message) {
 		DoNotCache: true,
 	})
 	if err != nil {
+		log := logger.NewStderrLog(logOptions)
 		log.AddError(nil, logger.Range{}, err.Error())
 		return nil, convertMessagesToPublic(logger.Error, log.Done())
 	}
@@ -924,6 +924,7 @@ func contextImpl(buildOpts BuildOptions) (*internalContext, []Message) {
 	// directory doesn't change, since breaking that invariant would break the
 	// validation that we just did above.
 	caches := cache.MakeCacheSet()
+	log := logger.NewDeferLog(logger.DeferLogNoVerboseOrDebug, logOptions.Overrides)
 	onEndCallbacks, onDisposeCallbacks, finalizeBuildOptions := loadPlugins(&buildOpts, realFS, log, caches)
 	options, entryPoints := validateBuildOptions(buildOpts, log, realFS)
 	finalizeBuildOptions(&options)
@@ -933,7 +934,19 @@ func contextImpl(buildOpts BuildOptions) (*internalContext, []Message) {
 
 	// If we have errors already, then refuse to build any further. This only
 	// happens when the build options themselves contain validation errors.
-	if msgs := log.Done(); log.HasErrors() {
+	msgs := log.Done()
+	if log.HasErrors() {
+		if logOptions.LogLevel < logger.LevelSilent {
+			// Print all deferred validation log messages to stderr. We defer all log
+			// messages that are generated above because warnings are re-printed for
+			// every rebuild and we don't want to double-print these warnings for the
+			// first build.
+			stderr := logger.NewStderrLog(logOptions)
+			for _, msg := range msgs {
+				stderr.AddMsg(msg)
+			}
+			stderr.Done()
+		}
 		return nil, convertMessagesToPublic(logger.Error, msgs)
 	}
 
@@ -942,6 +955,7 @@ func contextImpl(buildOpts BuildOptions) (*internalContext, []Message) {
 		onEndCallbacks:     onEndCallbacks,
 		onDisposeCallbacks: onDisposeCallbacks,
 		logOptions:         logOptions,
+		logWarnings:        msgs,
 		entryPoints:        entryPoints,
 		options:            options,
 		mangleCache:        buildOpts.MangleCache,
@@ -1423,6 +1437,7 @@ type rebuildArgs struct {
 	onEndCallbacks     []onEndCallback
 	onDisposeCallbacks []func()
 	logOptions         logger.OutputOptions
+	logWarnings        []logger.Msg
 	entryPoints        []bundler.EntryPoint
 	options            config.Options
 	mangleCache        map[string]interface{}
@@ -1440,6 +1455,11 @@ type rebuildState struct {
 func rebuildImpl(args rebuildArgs, oldSummary buildSummary) rebuildState {
 	log := logger.NewStderrLog(args.logOptions)
 
+	// All validation warnings are repeated for every rebuild
+	for _, msg := range args.logWarnings {
+		log.AddMsg(msg)
+	}
+
 	// Convert and validate the buildOpts
 	realFS, err := fs.RealFS(fs.RealFSOptions{
 		AbsWorkingDir: args.absWorkingDir,
diff --git a/scripts/js-api-tests.js b/scripts/js-api-tests.js
index 061c8c8d6f5..575ffee223f 100644
--- a/scripts/js-api-tests.js
+++ b/scripts/js-api-tests.js
@@ -5863,7 +5863,7 @@ let transformTests = {
     assert.strictEqual(code, `(() => {\n  const import_meta = {};\n  console.log(import_meta, import_meta.foo);\n})();\n`)
   },
 
-  async defineIdentifierVsStringWarningIssue466({ esbuild }) {
+  async defineIdentifierVsStringWarningIssue466Transform({ esbuild }) {
     const { warnings } = await esbuild.transform(``, { define: { 'process.env.NODE_ENV': 'production' } })
     const formatted = await esbuild.formatMessages(warnings, { kind: 'warning' })
     assert.strictEqual(formatted[0],
@@ -5874,6 +5874,20 @@ let transformTests = {
         │                                   ~~~~~~~~~~~~
         ╵                                   '"production"'
 
+`)
+  },
+
+  async defineIdentifierVsStringWarningIssue466Build({ esbuild }) {
+    const { warnings } = await esbuild.build({ define: { 'process.env.NODE_ENV': 'production' }, logLevel: 'silent' })
+    const formatted = await esbuild.formatMessages(warnings, { kind: 'warning' })
+    assert.strictEqual(formatted[0],
+      `▲ [WARNING] "process.env.NODE_ENV" is defined as an identifier instead of a string (surround "production" with quotes to get a string) [suspicious-define]
+
+    <js>:1:34:
+      1 │ define: { 'process.env.NODE_ENV': 'production' }
+        │                                   ~~~~~~~~~~~~
+        ╵                                   '"production"'
+
 `)
   },