refactor(codegen): Move flow control of methods

Author: stroiman

internal/code-gen/script-wrappers/goja_generators.go

@@ -118,26 +118,6 @@ func (gen GojaTargetGenerators) CreatePrototypeInitializerBody(
 	return body
 }
 
-func (gen GojaTargetGenerators) CreateMethodCallback(
-	data ESConstructorData,
-	op ESOperation,
-) g.Generator {
-	naming := GojaNamingStrategy{data}
-	callArgument := g.Id("c")
-	return g.StatementList(
-		g.Line,
-		g.FunctionDefinition{
-			Receiver: g.FunctionArgument{
-				Name: g.Id(naming.ReceiverName()),
-				Type: g.Id(naming.PrototypeWrapperTypeName()),
-			},
-			Name:     op.CallbackMethodName(),
-			Args:     g.Arg(callArgument, gojaFc),
-			RtnTypes: g.List(gojaValue),
-			Body:     gen.CreateMethodCallbackBody(data, op),
-		})
-}
-
 func (gen GojaTargetGenerators) CreateMethodCallbackBody(
 	data ESConstructorData,
 	op ESOperation,
@@ -232,6 +212,15 @@ func (g GojaTargetGenerators) HostType() Generator {
 	return generators.NewType("GojaContext").Pointer()
 }
 
+func (g GojaTargetGenerators) CallbackMethodArgs() generators.FunctionArgumentList {
+	callArgument := generators.Id("c")
+	return generators.Arg(callArgument, gojaFc)
+}
+
+func (g GojaTargetGenerators) CallbackMethodRetTypes() []generators.Generator {
+	return []generators.Generator{gojaValue}
+}
+
 func panicOnNotNil(lhs g.Generator) g.Generator {
 	return g.IfStmt{
 		Condition: g.Neq{Lhs: lhs, Rhs: g.Nil},

internal/code-gen/script-wrappers/script_wrapper_module_generator.go

@@ -16,6 +16,8 @@ type PlatformWrapperStructGenerators interface {
 	WrapperStructConstructorRetType(interfaceName string) Generator
 	EmbeddedType(wrappedType Generator) Generator
 	EmbeddedTypeConstructor(wrappedType Generator) generators.Value
+	CallbackMethodArgs() generators.FunctionArgumentList
+	CallbackMethodRetTypes() []generators.Generator
 	HostArg() Generator
 	HostType() Generator
 }
@@ -38,10 +40,8 @@ type TargetGenerators interface {
 	// CreateConstructorCallback generates the function to be called whan
 	// JavaScript code constructs an instance.
 	CreateConstructorCallback(ESConstructorData) Generator
-	// CreateMethodCallback generates the function to be called when
-	// JavaScript code calls a method on an instance.
-	CreateMethodCallback(ESConstructorData, ESOperation) Generator
 
+	CreateMethodCallbackBody(ESConstructorData, ESOperation) Generator
 	WrapperStructGenerators() PlatformWrapperStructGenerators
 }
 
@@ -77,7 +77,30 @@ func (g PrototypeWrapperGenerator) Generate() *jen.Statement {
 func (g PrototypeWrapperGenerator) MethodCallbacks(data ESConstructorData) Generator {
 	list := generators.StatementList()
 	for op := range data.WrapperFunctionsToGenerate() {
-		list.Append(g.Platform.CreateMethodCallback(data, op))
+		list.Append(
+			generators.Line,
+			MethodCallback{data, op, g.Platform},
+		)
 	}
 	return list
 }
+
+type MethodCallback struct {
+	data     ESConstructorData
+	op       ESOperation
+	platform TargetGenerators
+}
+
+func (c MethodCallback) Generate() *jen.Statement {
+	typeGenerators := c.platform.WrapperStructGenerators()
+	return generators.FunctionDefinition{
+		Receiver: generators.FunctionArgument{
+			Name: generators.Id("w"),
+			Type: typeGenerators.WrapperStructType(c.data.Name()),
+		},
+		Name:     c.op.CallbackMethodName(),
+		Args:     typeGenerators.CallbackMethodArgs(), // generators.Arg(generators.Id("info"), v8FunctionCallbackInfoPtr),
+		RtnTypes: typeGenerators.CallbackMethodRetTypes(),
+		Body:     c.platform.CreateMethodCallbackBody(c.data, c.op),
+	}.Generate()
+}

internal/code-gen/script-wrappers/v8_generators.go

@@ -109,25 +109,6 @@ func (gen V8TargetGenerators) CreateConstructorCallback(data ESConstructorData)
 	)
 }
 
-func (gen V8TargetGenerators) CreateMethodCallback(
-	data ESConstructorData,
-	op ESOperation,
-) JenGenerator {
-	naming := V8NamingStrategy{data}
-	return g.StatementList(
-		g.Line,
-		g.FunctionDefinition{
-			Receiver: g.FunctionArgument{
-				Name: g.Id(naming.Receiver()),
-				Type: g.Id(naming.PrototypeWrapperName()),
-			},
-			Name:     op.CallbackMethodName(),
-			Args:     g.Arg(g.Id("info"), v8FunctionCallbackInfoPtr),
-			RtnTypes: g.List(v8Value, g.Id("error")),
-			Body:     gen.CreateMethodCallbackBody(data, op),
-		})
-}
-
 func (gen V8TargetGenerators) CreateMethodCallbackBody(
 	data ESConstructorData,
 	op ESOperation,

internal/code-gen/script-wrappers/v8_wrapper_struct_generators.go

@@ -38,3 +38,11 @@ func (g V8WrapperStructGenerators) HostArg() Generator {
 func (g V8WrapperStructGenerators) HostType() Generator {
 	return scriptHostPtr
 }
+
+func (g V8WrapperStructGenerators) CallbackMethodArgs() generators.FunctionArgumentList {
+	return generators.Arg(generators.Id("info"), v8FunctionCallbackInfoPtr)
+}
+
+func (g V8WrapperStructGenerators) CallbackMethodRetTypes() []generators.Generator {
+	return generators.List(v8Value, generators.Id("error"))
+}