refactor: Make Option immutable (#769)

* Make HasValue immutable

* Make Value immutable

client/option.go

@@ -14,21 +14,33 @@ package client
 type Option[T any] struct {
 	// If HasValue is true, this Option contains a value, if
 	// it is false it contains no value.
-	HasValue bool
+	hasValue bool
 
 	// The Value of this Option. Should be ignored if HasValue is false.
-	Value T
+	value T
 }
 
 // Some returns an `Option` of type `T` with the given value.
 func Some[T any](value T) Option[T] {
 	return Option[T]{
-		HasValue: true,
-		Value:    value,
+		hasValue: true,
+		value:    value,
 	}
 }
 
 // Some returns an `Option` of type `T` with no value.
 func None[T any]() Option[T] {
 	return Option[T]{}
 }
+
+// HasValue returns a boolean indicating whether or not this optino contains a value. If
+// it returns true, this Option contains a value, if it is false it contains no value.
+func (o Option[T]) HasValue() bool {
+	return o.hasValue
+}
+
+// Value returns the Value of this Option. Value returned is invalid HasValue() is false
+// and should be ignored.
+func (o Option[T]) Value() T {
+	return o.value
+}

connor/eq.go

@@ -26,28 +26,28 @@ func eq(condition, data interface{}) (bool, error) {
 		return false, nil
 
 	case client.Option[bool]:
-		if !arr.HasValue {
+		if !arr.HasValue() {
 			return condition == nil, nil
 		}
-		data = arr.Value
+		data = arr.Value()
 
 	case client.Option[int64]:
-		if !arr.HasValue {
+		if !arr.HasValue() {
 			return condition == nil, nil
 		}
-		data = arr.Value
+		data = arr.Value()
 
 	case client.Option[float64]:
-		if !arr.HasValue {
+		if !arr.HasValue() {
 			return condition == nil, nil
 		}
-		data = arr.Value
+		data = arr.Value()
 
 	case client.Option[string]:
-		if !arr.HasValue {
+		if !arr.HasValue() {
 			return condition == nil, nil
 		}
-		data = arr.Value
+		data = arr.Value()
 	}
 
 	switch cn := condition.(type) {

query/graphql/planner/sum.go

@@ -225,10 +225,10 @@ func (n *sumNode) Next() (bool, error) {
 
 		case []client.Option[int64]:
 			collectionSum, err = sumItems(childCollection, source.Filter, func(childItem client.Option[int64]) float64 {
-				if !childItem.HasValue {
+				if !childItem.HasValue() {
 					return 0
 				}
-				return float64(childItem.Value)
+				return float64(childItem.Value())
 			})
 
 		case []float64:
@@ -238,10 +238,10 @@ func (n *sumNode) Next() (bool, error) {
 
 		case []client.Option[float64]:
 			collectionSum, err = sumItems(childCollection, source.Filter, func(childItem client.Option[float64]) float64 {
-				if !childItem.HasValue {
+				if !childItem.HasValue() {
 					return 0
 				}
-				return childItem.Value
+				return childItem.Value()
 			})
 		}
 		if err != nil {