context with dataset fixed

raoptimus · Mar 28, 2024 · 19e74ae · 19e74ae
1 parent 314ef29
commit 19e74ae
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/validator.go b/validator.go
@@ -13,12 +13,13 @@ func ValidateValue(ctx context.Context, value any, rules ...Rule) error {
 		return nil
 	}
 
-	dataSet, err := normalizeDataSet(value)
-	if err != nil {
-		return err
-	}
-
 	if extDS, ok := ExtractDataSet[DataSet](ctx); !ok || value != extDS {
+		ctx = withDataSet(ctx, extDS)
+	} else {
+		dataSet, err := normalizeDataSet(value)
+		if err != nil {
+			return err
+		}
 		ctx = withDataSet(ctx, dataSet)
 	}