work on evanw#184: --instrument flag is read into options by validate…

…Loader
stoand · Mar 13, 2023 · b44572d · b44572d
1 parent 2088bb9
commit b44572d
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 0 deletions.
diff --git a/internal/config/config.go b/internal/config/config.go
@@ -350,6 +350,7 @@ type Options struct {
 	KeepNames               bool
 	IgnoreDCEAnnotations    bool
 	TreeShaking             bool
+	Instrument              bool
 	DropDebugger            bool
 	MangleQuoted            bool
 	Platform                Platform

diff --git a/internal/js_printer/js_printer.go b/internal/js_printer/js_printer.go
@@ -4553,6 +4553,8 @@ func (p *printer) printStmt(stmt js_ast.Stmt, flags printStmtFlags) {
 }
 
 type Options struct {
+    Instrument bool
+
 	RequireOrImportMetaForSource func(uint32) RequireOrImportMeta
 
 	// Cross-module inlining of TypeScript enums is actually done during printing

diff --git a/internal/linker/linker.go b/internal/linker/linker.go
@@ -4093,6 +4093,7 @@ func (c *linkerContext) generateCodeForFileInChunkJS(
 
 	// Convert the AST to JavaScript code
 	printOptions := js_printer.Options{
+    	Instrument:					  c.options.Instrument,
 		Indent:                       indent,
 		OutputFormat:                 c.options.OutputFormat,
 		MinifyIdentifiers:            c.options.MinifyIdentifiers,
@@ -4114,6 +4115,9 @@ func (c *linkerContext) generateCodeForFileInChunkJS(
 		MangledProps:                 c.mangledProps,
 		NeedsMetafile:                c.options.NeedsMetafile,
 	}
+
+	fmt.Printf("%b is active", c.options.Instrument)
+
 	tree := repr.AST
 	tree.Directive = "" // This is handled elsewhere
 	tree.Parts = []js_ast.Part{{Stmts: stmts}}

diff --git a/pkg/api/api_impl.go b/pkg/api/api_impl.go
@@ -232,6 +232,19 @@ func validateTreeShaking(value TreeShaking, bundle bool, format Format) bool {
 	}
 }
 
+func validateInstrument(value Instrument) bool {
+	switch value {
+	case InstrumentDefault:
+    	return false
+	case InstrumentFalse:
+		return false
+	case InstrumentTrue:
+		return true
+	default:
+		panic("Invalid tree shaking")
+	}
+}
+
 func validateLoader(value Loader) config.Loader {
 	switch value {
 	case LoaderBase64:
@@ -1229,6 +1242,7 @@ func validateBuildOptions(
 		ASCIIOnly:             validateASCIIOnly(buildOpts.Charset),
 		IgnoreDCEAnnotations:  buildOpts.IgnoreAnnotations,
 		TreeShaking:           validateTreeShaking(buildOpts.TreeShaking, buildOpts.Bundle, buildOpts.Format),
+		Instrument:            validateInstrument(buildOpts.Instrument),
 		GlobalName:            validateGlobalName(log, buildOpts.GlobalName),
 		CodeSplitting:         buildOpts.Splitting,
 		OutputFormat:          validateFormat(buildOpts.Format),