Fixes (#37)

* fixes

* Code fixes and regeneration

* formatting

Author: zarldev

generator/gofile/gofile_parser.go

@@ -190,14 +190,14 @@ func (p *Parser) getEnums(node *ast.File, enumIota *enum.EnumIota) []enum.Enum {
 		// Check if this const block contains iota with the target type
 		blockHasIota := false
 		blockHasTargetType := false
-		
+
 		// First pass: check if this const block has both iota and the target type
 		for _, spec := range t.Specs {
 			vs, ok := spec.(*ast.ValueSpec)
 			if !ok {
 				continue
 			}
-			
+
 			// Check for iota in values
 			if vs.Values != nil {
 				for _, v := range vs.Values {
@@ -212,20 +212,20 @@ func (p *Parser) getEnums(node *ast.File, enumIota *enum.EnumIota) []enum.Enum {
 					}
 				}
 			}
-			
+
 			// Check if this spec has the target type
 			if vs.Type != nil {
 				if typeIdent, ok := vs.Type.(*ast.Ident); ok && typeIdent.Name == enumIota.Type {
 					blockHasTargetType = true
 				}
 			}
 		}
-		
+
 		// Only process this const block if it has both iota and the target type
 		if !blockHasIota || !blockHasTargetType {
 			continue
 		}
-		
+
 		// Second pass: collect enums from this const block
 		idx := 0
 		constBlockIotaFound := false

internal/testdata/aliases/orders_test.go

@@ -27,7 +27,7 @@ func TestOrdersIteration(t *testing.T) {
 
 	// Verify expected order sequence
 	expected := []orders.Order{
-		orders.Orders.CREATED, orders.Orders.APPROVED, orders.Orders.PROCESSING, orders.Orders.READYTOSHIP, 
+		orders.Orders.CREATED, orders.Orders.APPROVED, orders.Orders.PROCESSING, orders.Orders.READYTOSHIP,
 		orders.Orders.SHIPPED, orders.Orders.DELIVERED, orders.Orders.CANCELLED,
 	}
 	for i, order := range collected {
@@ -51,7 +51,7 @@ func TestOrdersStringParsing(t *testing.T) {
 		{"SHIPPED", orders.Orders.SHIPPED, false},
 		{"DELIVERED", orders.Orders.DELIVERED, false},
 		{"CANCELLED", orders.Orders.CANCELLED, false},
-		
+
 		// Non-existent should fail
 		{"InvalidOrder", orders.Order{}, true},
 	}
@@ -77,10 +77,10 @@ func TestOrdersValidity(t *testing.T) {
 		orders.Orders.CREATED, orders.Orders.APPROVED, orders.Orders.PROCESSING, orders.Orders.READYTOSHIP,
 		orders.Orders.SHIPPED, orders.Orders.DELIVERED, orders.Orders.CANCELLED,
 	}
-	
+
 	for _, order := range validOrders {
 		if !order.IsValid() {
 			t.Errorf("Order %v should be valid", order)
 		}
 	}
-}
+}

internal/testdata/enum_validation_test.go

@@ -34,7 +34,7 @@ func TestGeneratedEnumsExist(t *testing.T) {
 	for _, tc := range testCases {
 		t.Run(tc.dir+"/"+tc.expectedFile, func(t *testing.T) {
 			filePath := filepath.Join(tc.dir, tc.expectedFile)
-			
+
 			// Check file exists
 			if _, err := os.Stat(filePath); os.IsNotExist(err) {
 				t.Errorf("Expected generated file %s does not exist", filePath)
@@ -66,21 +66,21 @@ func TestGeneratedEnumsExist(t *testing.T) {
 // validateEnumFileStructure checks that the generated file has the expected enum components
 func validateEnumFileStructure(t *testing.T, content, filePath string) error {
 	requiredPatterns := []string{
-		"// DO NOT EDIT.",                    // Generated file header
-		"code generated by goenums",          // Generator attribution
-		"type .* struct {",                   // Enum wrapper type
-		"Container struct {",                 // Container type
-		"func Parse.*\\(input any\\)",       // Parse function
-		"func .*\\.String\\(\\) string",     // String method
-		"func .*\\.IsValid\\(\\) bool",      // IsValid method
-		"func .*\\.MarshalJSON\\(\\)",       // JSON marshaling
-		"func .*\\.UnmarshalJSON\\(",        // JSON unmarshaling
-		"func .*\\.MarshalText\\(\\)",       // Text marshaling
-		"func .*\\.UnmarshalText\\(",        // Text unmarshaling
-		"func .*\\.MarshalBinary\\(\\)",     // Binary marshaling
-		"func .*\\.UnmarshalBinary\\(",      // Binary unmarshaling
-		"func .*\\.Scan\\(",                 // SQL Scanner
-		"func .*\\.Value\\(\\)",             // SQL Valuer
+		"// DO NOT EDIT.",               // Generated file header
+		"code generated by goenums",     // Generator attribution
+		"type .* struct {",              // Enum wrapper type
+		"Container struct {",            // Container type
+		"func Parse.*\\(input any\\)",   // Parse function
+		"func .*\\.String\\(\\) string", // String method
+		"func .*\\.IsValid\\(\\) bool",  // IsValid method
+		"func .*\\.MarshalJSON\\(\\)",   // JSON marshaling
+		"func .*\\.UnmarshalJSON\\(",    // JSON unmarshaling
+		"func .*\\.MarshalText\\(\\)",   // Text marshaling
+		"func .*\\.UnmarshalText\\(",    // Text unmarshaling
+		"func .*\\.MarshalBinary\\(\\)", // Binary marshaling
+		"func .*\\.UnmarshalBinary\\(",  // Binary unmarshaling
+		"func .*\\.Scan\\(",             // SQL Scanner
+		"func .*\\.Value\\(\\)",         // SQL Valuer
 	}
 
 	for _, pattern := range requiredPatterns {
@@ -90,7 +90,7 @@ func validateEnumFileStructure(t *testing.T, content, filePath string) error {
 			simplePattern = strings.ReplaceAll(simplePattern, "\\(", "(")
 			simplePattern = strings.ReplaceAll(simplePattern, "\\)", ")")
 			simplePattern = strings.ReplaceAll(simplePattern, "\\\\", "")
-			
+
 			if !strings.Contains(content, simplePattern) {
 				t.Logf("Missing pattern in %s: %s", filePath, pattern)
 			}
@@ -104,7 +104,7 @@ func validateEnumFileStructure(t *testing.T, content, filePath string) error {
 func TestGeneratedEnumsAreValidJSONMarshalable(t *testing.T) {
 	// This is a compile-time test - if any enum doesn't implement json.Marshaler properly,
 	// the compilation will fail when we try to marshal it
-	
+
 	testData := []interface{}{
 		map[string]interface{}{"test": "value"},
 	}
@@ -152,7 +152,7 @@ func TestParsePointerFix(t *testing.T) {
 					found = true
 					break
 				}
-				
+
 				// Also check for the new number type format
 				if tc.content == "func numberToAlgorithm[T constraints.Integer | constraints.Float](num T) *Algorithm" {
 					// Check for the new format
@@ -170,7 +170,7 @@ func TestParsePointerFix(t *testing.T) {
 	}
 }
 
-// TestValidityMapFix tests that the validity map fix works correctly  
+// TestValidityMapFix tests that the validity map fix works correctly
 func TestValidityMapFix(t *testing.T) {
 	// Test that invalid package correctly marks only FAILED as invalid
 	content, err := os.ReadFile("invalid/statuses_enums.go")
@@ -180,7 +180,7 @@ func TestValidityMapFix(t *testing.T) {
 
 	contentStr := string(content)
 
-	// Should have FAILED: false (invalid) 
+	// Should have FAILED: false (invalid)
 	if !strings.Contains(contentStr, "Statuses.FAILED") || !strings.Contains(contentStr, "false") {
 		t.Error("FAILED should be marked as invalid (false) in validity map")
 	}
@@ -211,12 +211,12 @@ func TestNegativePackageCompiles(t *testing.T) {
 
 	// Check validity markers: NONE should be invalid, others should be valid
 	contentStr := string(content)
-	
+
 	// NONE should be invalid due to "// invalid" comment
 	if !strings.Contains(contentStr, "Algorithms.NONE:") || !strings.Contains(contentStr, "false,") {
 		t.Errorf("NONE should be marked as invalid (false) in validity map")
 	}
-	
+
 	// AES256 and CHACHA20 should be valid
 	validEnums := []string{"AES256", "CHACHA20"}
 	for _, enum := range validEnums {
@@ -229,7 +229,7 @@ func TestNegativePackageCompiles(t *testing.T) {
 // TestMultiplePackageCompiles tests that the multiple package compiles correctly
 func TestMultiplePackageCompiles(t *testing.T) {
 	files := []string{"multiple/statuses_enums.go", "multiple/orders_enums.go"}
-	
+
 	for _, file := range files {
 		t.Run(file, func(t *testing.T) {
 			content, err := os.ReadFile(file)
@@ -260,4 +260,4 @@ func TestTimePackageFloatIssue(t *testing.T) {
 	if err != nil {
 		t.Errorf("time/sales_enums.go should compile without errors: %v", err)
 	}
-}
+}

internal/testdata/invalid/statuses_test.go

@@ -27,7 +27,7 @@ func TestStatusIteration(t *testing.T) {
 
 	// Verify expected valid statuses are present
 	expected := []validation.Status{
-		validation.Statuses.PASSED, validation.Statuses.SKIPPED, validation.Statuses.SCHEDULED, 
+		validation.Statuses.PASSED, validation.Statuses.SKIPPED, validation.Statuses.SCHEDULED,
 		validation.Statuses.RUNNING, validation.Statuses.BOOKED,
 	}
 	for i, status := range collected {
@@ -49,10 +49,10 @@ func TestStatusStringParsing(t *testing.T) {
 		{"scheduled", validation.Statuses.SCHEDULED, false},
 		{"running", validation.Statuses.RUNNING, false},
 		{"booked", validation.Statuses.BOOKED, false},
-		
+
 		// Failed status should also parse (but will be marked as invalid)
 		{"failed", validation.Statuses.FAILED, false},
-		
+
 		// Non-existent should fail
 		{"NonExistent", validation.Status{}, true},
 	}
@@ -78,7 +78,7 @@ func TestStatusValidity(t *testing.T) {
 		validation.Statuses.PASSED, validation.Statuses.SKIPPED, validation.Statuses.SCHEDULED,
 		validation.Statuses.RUNNING, validation.Statuses.BOOKED,
 	}
-	
+
 	for _, status := range validStatuses {
 		if !status.IsValid() {
 			t.Errorf("Status %v should be valid", status)
@@ -89,4 +89,4 @@ func TestStatusValidity(t *testing.T) {
 	if validation.Statuses.FAILED.IsValid() {
 		t.Error("FAILED status should be invalid")
 	}
-}
+}

internal/testdata/invalid_alias/statuses_test.go

@@ -38,10 +38,10 @@ func TestStatusAliasStringParsing(t *testing.T) {
 		{"SCHEDULED", validationstrings.Statuses.SCHEDULED, false},
 		{"RUNNING", validationstrings.Statuses.RUNNING, false},
 		{"BOOKED", validationstrings.Statuses.BOOKED, false},
-		
+
 		// Failed status should also parse
 		{"FAILED", validationstrings.Statuses.FAILED, false},
-		
+
 		// Non-existent should fail
 		{"NonExistent", validationstrings.Status{}, true},
 	}
@@ -67,7 +67,7 @@ func TestStatusAliasValidity(t *testing.T) {
 		validationstrings.Statuses.PASSED, validationstrings.Statuses.SKIPPED, validationstrings.Statuses.SCHEDULED,
 		validationstrings.Statuses.RUNNING, validationstrings.Statuses.BOOKED,
 	}
-	
+
 	for _, status := range validStatuses {
 		if !status.IsValid() {
 			t.Errorf("Status %v should be valid", status)
@@ -78,4 +78,4 @@ func TestStatusAliasValidity(t *testing.T) {
 	if validationstrings.Statuses.FAILED.IsValid() {
 		t.Error("FAILED status should be invalid")
 	}
-}
+}

internal/testdata/multiple/multiple_test.go

@@ -13,11 +13,11 @@ func TestMultipleEnumsNotMixed(t *testing.T) {
 		orderEnums = append(orderEnums, e)
 	}
 	orderCount := 7 // created, approved, processing, readyToShip, shipped, delivered, cancelled
-	
+
 	if len(orderEnums) != orderCount {
 		t.Errorf("Expected %d order enums, got %d", orderCount, len(orderEnums))
 	}
-	
+
 	// Check that no status constants are in the order container
 	for _, e := range orderEnums {
 		name := e.String()
@@ -28,18 +28,18 @@ func TestMultipleEnumsNotMixed(t *testing.T) {
 			}
 		}
 	}
-	
+
 	// Test that status enums only contain status constants
 	var statusEnums []multipleenums.Status
 	for e := range multipleenums.Statuses.All() {
 		statusEnums = append(statusEnums, e)
 	}
 	statusCount := 6 // failed, passed, skipped, scheduled, running, booked
-	
+
 	if len(statusEnums) != statusCount {
 		t.Errorf("Expected %d status enums, got %d", statusCount, len(statusEnums))
 	}
-	
+
 	// Check that no order constants are in the status container
 	for _, e := range statusEnums {
 		name := e.String()
@@ -50,4 +50,4 @@ func TestMultipleEnumsNotMixed(t *testing.T) {
 			}
 		}
 	}
-}
+}

internal/testdata/negative/algorithms_test.go

@@ -43,10 +43,10 @@ func TestAlgorithmsStringParsing(t *testing.T) {
 		// Valid algorithms should parse successfully
 		{"AES256", crypto.Algorithms.AES256, false},
 		{"ChaCha20", crypto.Algorithms.CHACHA20, false},
-		
+
 		// Invalid algorithm should also parse (but will be marked as invalid)
 		{"None", crypto.Algorithms.NONE, false},
-		
+
 		// Non-existent should fail
 		{"InvalidAlgorithm", crypto.Algorithm{}, true},
 	}
@@ -69,7 +69,7 @@ func TestAlgorithmsStringParsing(t *testing.T) {
 func TestAlgorithmsValidity(t *testing.T) {
 	// Valid algorithms should return true
 	validAlgorithms := []crypto.Algorithm{crypto.Algorithms.AES256, crypto.Algorithms.CHACHA20}
-	
+
 	for _, alg := range validAlgorithms {
 		if !alg.IsValid() {
 			t.Errorf("Algorithm %v should be valid", alg)
@@ -108,10 +108,10 @@ func TestAlgorithmsNumericParsing(t *testing.T) {
 		// Numeric parsing based on valid algorithm indices (not enum values)
 		{1, crypto.Algorithms.AES256, false},   // First valid algorithm
 		{2, crypto.Algorithms.CHACHA20, false}, // Second valid algorithm
-		
+
 		// Out of bounds should fail
-		{0, crypto.Algorithm{}, true},  // Invalid index
-		{3, crypto.Algorithm{}, true},  // Out of bounds
+		{0, crypto.Algorithm{}, true}, // Invalid index
+		{3, crypto.Algorithm{}, true}, // Out of bounds
 		{999, crypto.Algorithm{}, true},
 	}
 
@@ -128,4 +128,4 @@ func TestAlgorithmsNumericParsing(t *testing.T) {
 			t.Errorf("ParseAlgorithm(%d): expected %v, got %v", test.input, test.expected, got)
 		}
 	}
-}
+}

internal/testdata/plural/discounttypes_test.go

@@ -27,7 +27,7 @@ func TestDiscountTypesIteration(t *testing.T) {
 
 	// Verify expected discount type sequence
 	expected := []sale.DiscountType{
-		sale.DiscountTypes.SALE, sale.DiscountTypes.PERCENTAGE, 
+		sale.DiscountTypes.SALE, sale.DiscountTypes.PERCENTAGE,
 		sale.DiscountTypes.AMOUNT, sale.DiscountTypes.GIVEAWAY,
 	}
 	for i, discountType := range collected {
@@ -48,7 +48,7 @@ func TestDiscountTypesStringParsing(t *testing.T) {
 		{"percentage", sale.DiscountTypes.PERCENTAGE, false},
 		{"amount", sale.DiscountTypes.AMOUNT, false},
 		{"giveaway", sale.DiscountTypes.GIVEAWAY, false},
-		
+
 		// Non-existent should fail
 		{"invalid", sale.DiscountType{}, true},
 	}
@@ -74,10 +74,10 @@ func TestDiscountTypesValidity(t *testing.T) {
 		sale.DiscountTypes.SALE, sale.DiscountTypes.PERCENTAGE,
 		sale.DiscountTypes.AMOUNT, sale.DiscountTypes.GIVEAWAY,
 	}
-	
+
 	for _, discountType := range validDiscountTypes {
 		if !discountType.IsValid() {
 			t.Errorf("DiscountType %v should be valid", discountType)
 		}
 	}
-}
+}