Clean up generated text helpers

internal/generatedtext/tomorrow.go

@@ -1,10 +1,7 @@
 package generatedtext
 
 import (
-	"bytes"
-	"encoding/json"
 	"fmt"
-	"io"
 	"strings"
 )
 
@@ -16,20 +13,9 @@ type Tomorrow struct {
 }
 
 func ValidateTomorrow(data []byte) (Tomorrow, []byte, error) {
-	decoder := json.NewDecoder(bytes.NewReader(data))
-	decoder.DisallowUnknownFields()
-
-	var value Tomorrow
-	if err := decoder.Decode(&value); err != nil {
-		return Tomorrow{}, nil, fmt.Errorf("decode tomorrow generated text: %w", err)
-	}
-	var extra any
-	if err := decoder.Decode(&extra); err != nil {
-		if err != io.EOF {
-			return Tomorrow{}, nil, fmt.Errorf("decode tomorrow generated text: %w", err)
-		}
-	} else {
-		return Tomorrow{}, nil, fmt.Errorf("decode tomorrow generated text: multiple JSON values")
+	value, err := decodeGeneratedText[Tomorrow](data, "tomorrow")
+	if err != nil {
+		return Tomorrow{}, nil, err
 	}
 
 	value.Summary = strings.TrimSpace(value.Summary)
@@ -43,9 +29,9 @@ func ValidateTomorrow(data []byte) (Tomorrow, []byte, error) {
 		return Tomorrow{}, nil, fmt.Errorf("tomorrow generated text forecast discussion is required")
 	}
 
-	normalized, err := json.Marshal(value)
+	normalized, err := normalizeGeneratedText(value, "tomorrow")
 	if err != nil {
-		return Tomorrow{}, nil, fmt.Errorf("normalize tomorrow generated text: %w", err)
+		return Tomorrow{}, nil, err
 	}
 	return value, normalized, nil
 }