fix bug where generation function was not restting after function holder was copied

Author: MartinSimango

dstruct.generated.struct.go

@@ -339,12 +339,21 @@ func (gs *DStructGeneratedStruct[T]) createGeneratedField(
 	field *Node[structField],
 	kind reflect.Kind,
 ) *core.GeneratedField {
-	return core.NewGeneratedField(field.data.fullyQualifiedName,
+	v := core.NewGeneratedField(field.data.fullyQualifiedName,
 		field.data.value,
 		field.data.tag,
 		gs.structConfig.Copy(kind),
 		gs.customTypes,
 		field.data.goType)
+	fmt.Printf(
+		"\nStruct Config address: %p\n",
+		gs.structConfig.GenerationFunctions[reflect.Int].GetConfig().Number(),
+	)
+	fmt.Printf(
+		"\nConfig address: %p\n",
+		v.Config.GenerationFunctions[reflect.Int].GetConfig().Number(),
+	)
+	return v
 }
 
 func (gs *DStructGeneratedStruct[T]) populateGeneratedFields(node *Node[structField]) {

generator/config/dstruct.config.go

@@ -5,6 +5,7 @@ type DstructConfig struct {
 	SliceConfig  SliceConfig
 	NumberConfig NumberRangeConfig
 	DateConfig   DateRangeConfig
+	children     []Config
 }
 
 // NewDstructConfig is a constructor for DstructConfig.
@@ -51,6 +52,9 @@ func (c *DstructConfig) Number() NumberRangeConfig {
 // SetSliceLength implements Config.SetSliceLength.
 func (c *DstructConfig) SetSliceLength(min, max int) Config {
 	c.SliceConfig.SetLengthRange(min, max)
+	for _, sub := range c.children {
+		sub.SetSliceLength(min, max)
+	}
 	return c
 }
 

generator/config/dstruct.number.range.config.go

@@ -1,9 +1,5 @@
 package config
 
-import (
-	"fmt"
-)
-
 // DstructNumberRangeConfig implements NumberRangeConfig.
 type DstructNumberRangeConfig struct {
 	IntConfig     NumberRange[int]
@@ -109,8 +105,6 @@ func (nc *DstructNumberRangeConfig) UIntPtr() *NumberRange[uintptr] {
 
 // Copy implements NumberConfig.Copy.
 func (nc *DstructNumberRangeConfig) Copy() NumberRangeConfig {
-	fmt.Println("Copying DstructNumberRangeConfig ")
-	fmt.Println(nc.Int().RangeRef())
 	numberConfigCopy := new(DstructNumberRangeConfig)
 	*numberConfigCopy = *nc
 	return numberConfigCopy

generator/core/function.holder.go

@@ -16,10 +16,13 @@ type FunctionHolder interface {
 	Kind() reflect.Kind
 }
 
+type ResetFunction func(config config.Config) generator.GenerationFunction
+
 type BaseFunctionHolder struct {
 	config             config.Config
 	generationFunction generator.GenerationFunction
 	fun                any
+	resetFunction      ResetFunction
 }
 
 func (c *BaseFunctionHolder) SetFunction(generationFunction generator.GenerationFunction) {
@@ -35,8 +38,8 @@ func (c *BaseFunctionHolder) GetConfig() config.Config {
 }
 
 func (c *BaseFunctionHolder) SetConfig(cfg config.Config) {
-	c.generationFunction = nil // new config recreate generation function
 	c.config = cfg
+	c.generationFunction = c.resetFunction(cfg)
 }
 
 func (c *BaseFunctionHolder) Copy() BaseFunctionHolder {
@@ -49,7 +52,7 @@ func (c *BaseFunctionHolder) Copy() BaseFunctionHolder {
 	return BaseFunctionHolder{
 		fun:                c.fun,
 		config:             configCopy,
-		generationFunction: c.generationFunction,
+		generationFunction: c.resetFunction(configCopy),
 	}
 }
 

generator/core/generated.field.go

@@ -289,5 +289,9 @@ func (field *GeneratedField) getGenerationFunction() generator.GenerationFunctio
 
 	// if we get no match, we default to the default generation function for the kind
 	// kidds of type Slice will be handled here as their default generation function for a slice will be overwritten when the generated field is created.
+	fmt.Printf(
+		"Returning function ref: %p\n",
+		field.Config.GenerationFunctions[kind].GetConfig().Number(),
+	)
 	return field.Config.GenerationFunctions[kind].GetFunction()
 }

generator/core/number.function.holder.go

@@ -5,7 +5,6 @@ import (
 	"github.com/MartinSimango/dstruct/generator/config"
 )
 
-// TODO: rename to NumberFunctionHolderFunc?
 type NumberFunctionHolderFunc func(config.NumberRangeConfig) generator.GenerationFunction
 
 type NumberFunctionHolder struct {
@@ -18,27 +17,23 @@ func NewNumberFunctionHolder(
 	f NumberFunctionHolderFunc,
 	cfg config.NumberRangeConfig,
 ) *NumberFunctionHolder {
-	return &NumberFunctionHolder{
+	nfh := &NumberFunctionHolder{
 		BaseFunctionHolder: BaseFunctionHolder{
-			config:             config.NewDstructConfigBuilder().WithNumberConfig(cfg).Build(),
-			fun:                f,
+			config: config.NewDstructConfigBuilder().WithNumberConfig(cfg).Build(),
+			fun:    f,
+			resetFunction: func(cfg config.Config) generator.GenerationFunction {
+				return f(cfg.Number())
+			},
 			generationFunction: f(cfg),
 		},
 	}
-}
-
-// Override
-func (c *NumberFunctionHolder) GetFunction() generator.GenerationFunction {
-	if c.generationFunction != nil {
-		return c.generationFunction
-	}
-	c.generationFunction = c.fun.(NumberFunctionHolderFunc)(c.config.Number())
 
-	return c.generationFunction
+	return nfh
 }
 
 func (c *NumberFunctionHolder) Copy() FunctionHolder {
-	return &NumberFunctionHolder{
+	nf := &NumberFunctionHolder{
 		BaseFunctionHolder: c.BaseFunctionHolder.Copy(),
 	}
+	return nf
 }

generator/core/number.go

@@ -18,8 +18,11 @@ func GenerateNumberFunc[n config.Number](
 ) generator.GenerationFunction {
 	// get reference to min and max so when the function is called, it will use the current value
 	min, max := getNumberRange[n](cfg)
+
 	return &coreGenerationFunction{
 		_func: func(parameters ...any) any {
+			fmt.Println("Refernece to min and max: ", min, max)
+			fmt.Printf("Cfg: %p\n", cfg)
 			return generateNum(*min, *max)
 		},
 		kind: reflect.ValueOf(*new(n)).Kind(),