use args struct for define implementation

evanw · Dec 29, 2020 · b26c0fa · b26c0fa
1 parent 36bb205
commit b26c0fa
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 22 deletions.
diff --git a/internal/bundler/bundler.go b/internal/bundler/bundler.go
@@ -1750,7 +1750,7 @@ func (cache *runtimeCache) processedDefines(key config.Platform) (defines *confi
 	}
 	result := config.ProcessDefines(map[string]config.DefineData{
 		"__platform": {
-			DefineFunc: func(logger.Loc, config.FindSymbol) js_ast.E {
+			DefineFunc: func(config.DefineArgs) js_ast.E {
 				return &js_ast.EString{Value: js_lexer.StringToUTF16(platform)}
 			},
 		},

diff --git a/internal/bundler/bundler_default_test.go b/internal/bundler/bundler_default_test.go
@@ -5,7 +5,6 @@ import (
 
 	"github.com/evanw/esbuild/internal/config"
 	"github.com/evanw/esbuild/internal/js_ast"
-	"github.com/evanw/esbuild/internal/logger"
 )
 
 var default_suite = suite{
@@ -3251,8 +3250,8 @@ func TestInjectDuplicate(t *testing.T) {
 func TestInject(t *testing.T) {
 	defines := config.ProcessDefines(map[string]config.DefineData{
 		"chain.prop": {
-			DefineFunc: func(loc logger.Loc, findSymbol config.FindSymbol) js_ast.E {
-				return &js_ast.EIdentifier{Ref: findSymbol(loc, "replace")}
+			DefineFunc: func(args config.DefineArgs) js_ast.E {
+				return &js_ast.EIdentifier{Ref: args.FindSymbol(args.Loc, "replace")}
 			},
 		},
 	})
@@ -3318,8 +3317,8 @@ func TestInject(t *testing.T) {
 func TestInjectNoBundle(t *testing.T) {
 	defines := config.ProcessDefines(map[string]config.DefineData{
 		"chain.prop": {
-			DefineFunc: func(loc logger.Loc, findSymbol config.FindSymbol) js_ast.E {
-				return &js_ast.EIdentifier{Ref: findSymbol(loc, "replace")}
+			DefineFunc: func(args config.DefineArgs) js_ast.E {
+				return &js_ast.EIdentifier{Ref: args.FindSymbol(args.Loc, "replace")}
 			},
 		},
 	})
@@ -3379,8 +3378,8 @@ func TestInjectNoBundle(t *testing.T) {
 func TestInjectJSX(t *testing.T) {
 	defines := config.ProcessDefines(map[string]config.DefineData{
 		"React.createElement": {
-			DefineFunc: func(loc logger.Loc, findSymbol config.FindSymbol) js_ast.E {
-				return &js_ast.EIdentifier{Ref: findSymbol(loc, "el")}
+			DefineFunc: func(args config.DefineArgs) js_ast.E {
+				return &js_ast.EIdentifier{Ref: args.FindSymbol(args.Loc, "el")}
 			},
 		},
 	})
@@ -3567,7 +3566,7 @@ func TestProcessEnvNodeEnvWarningNode(t *testing.T) {
 func TestProcessEnvNodeEnvWarningDefine(t *testing.T) {
 	defines := config.ProcessDefines(map[string]config.DefineData{
 		"process.env.NODE_ENV": {
-			DefineFunc: func(loc logger.Loc, findSymbol config.FindSymbol) js_ast.E {
+			DefineFunc: func(args config.DefineArgs) js_ast.E {
 				return &js_ast.ENull{}
 			},
 		},

diff --git a/internal/config/globals.go b/internal/config/globals.go
@@ -112,8 +112,12 @@ var knownGlobals = [][]string{
 	{"Math", "trunc"},
 }
 
-type FindSymbol func(logger.Loc, string) js_ast.Ref
-type DefineFunc func(logger.Loc, FindSymbol) js_ast.E
+type DefineArgs struct {
+	Loc        logger.Loc
+	FindSymbol func(logger.Loc, string) js_ast.Ref
+}
+
+type DefineFunc func(DefineArgs) js_ast.E
 
 type DefineData struct {
 	DefineFunc DefineFunc
@@ -193,13 +197,13 @@ func ProcessDefines(userDefines map[string]DefineData) ProcessedDefines {
 
 	// Swap in certain literal values because those can be constant folded
 	result.IdentifierDefines["undefined"] = DefineData{
-		DefineFunc: func(logger.Loc, FindSymbol) js_ast.E { return &js_ast.EUndefined{} },
+		DefineFunc: func(DefineArgs) js_ast.E { return &js_ast.EUndefined{} },
 	}
 	result.IdentifierDefines["NaN"] = DefineData{
-		DefineFunc: func(logger.Loc, FindSymbol) js_ast.E { return &js_ast.ENumber{Value: math.NaN()} },
+		DefineFunc: func(DefineArgs) js_ast.E { return &js_ast.ENumber{Value: math.NaN()} },
 	}
 	result.IdentifierDefines["Infinity"] = DefineData{
-		DefineFunc: func(logger.Loc, FindSymbol) js_ast.E { return &js_ast.ENumber{Value: math.Inf(1)} },
+		DefineFunc: func(DefineArgs) js_ast.E { return &js_ast.ENumber{Value: math.Inf(1)} },
 	}
 
 	// Warn about use of this without a define

diff --git a/internal/js_parser/js_parser.go b/internal/js_parser/js_parser.go
@@ -56,7 +56,7 @@ type parser struct {
 	moduleRef                js_ast.Ref
 	importMetaRef            js_ast.Ref
 	promiseRef               js_ast.Ref
-	findSymbolHelper         config.FindSymbol
+	findSymbolHelper         func(loc logger.Loc, name string) js_ast.Ref
 	symbolUses               map[js_ast.Ref]js_ast.SymbolUse
 	declaredSymbols          []js_ast.DeclaredSymbol
 	runtimeImports           map[string]js_ast.Ref
@@ -9986,7 +9986,10 @@ func (p *parser) visitExprInOut(expr js_ast.Expr, in exprIn) (js_ast.Expr, exprO
 }
 
 func (p *parser) valueForDefine(loc logger.Loc, assignTarget js_ast.AssignTarget, isDeleteTarget bool, defineFunc config.DefineFunc) js_ast.Expr {
-	expr := js_ast.Expr{Loc: loc, Data: defineFunc(loc, p.findSymbolHelper)}
+	expr := js_ast.Expr{Loc: loc, Data: defineFunc(config.DefineArgs{
+		Loc:        loc,
+		FindSymbol: p.findSymbolHelper,
+	})}
 	if id, ok := expr.Data.(*js_ast.EIdentifier); ok {
 		return p.handleIdentifier(loc, assignTarget, isDeleteTarget, id)
 	}

diff --git a/pkg/api/api_impl.go b/pkg/api/api_impl.go
@@ -337,8 +337,8 @@ func validateDefines(log logger.Log, defines map[string]string, pureFns []string
 			if _, ok := js_lexer.Keywords[value]; !ok {
 				name := value // The closure must close over a variable inside the loop
 				rawDefines[key] = config.DefineData{
-					DefineFunc: func(loc logger.Loc, findSymbol config.FindSymbol) js_ast.E {
-						return &js_ast.EIdentifier{Ref: findSymbol(loc, name)}
+					DefineFunc: func(args config.DefineArgs) js_ast.E {
+						return &js_ast.EIdentifier{Ref: args.FindSymbol(args.Loc, name)}
 					},
 				}
 
@@ -363,13 +363,13 @@ func validateDefines(log logger.Log, defines map[string]string, pureFns []string
 		var fn config.DefineFunc
 		switch e := expr.Data.(type) {
 		case *js_ast.ENull:
-			fn = func(logger.Loc, config.FindSymbol) js_ast.E { return &js_ast.ENull{} }
+			fn = func(config.DefineArgs) js_ast.E { return &js_ast.ENull{} }
 		case *js_ast.EBoolean:
-			fn = func(logger.Loc, config.FindSymbol) js_ast.E { return &js_ast.EBoolean{Value: e.Value} }
+			fn = func(config.DefineArgs) js_ast.E { return &js_ast.EBoolean{Value: e.Value} }
 		case *js_ast.EString:
-			fn = func(logger.Loc, config.FindSymbol) js_ast.E { return &js_ast.EString{Value: e.Value} }
+			fn = func(config.DefineArgs) js_ast.E { return &js_ast.EString{Value: e.Value} }
 		case *js_ast.ENumber:
-			fn = func(logger.Loc, config.FindSymbol) js_ast.E { return &js_ast.ENumber{Value: e.Value} }
+			fn = func(config.DefineArgs) js_ast.E { return &js_ast.ENumber{Value: e.Value} }
 		default:
 			log.AddError(nil, logger.Loc{}, fmt.Sprintf("Invalid define value: %q", value))
 			continue