feat: add missing methods, add Rakefile

Author: initdc

.github/workflows/matrix-test.yml

@@ -20,15 +20,17 @@ jobs:
       matrix:
         go:
           - "1.25"
-          - "1.18"
+          - "1.18.0"
 
     steps:
       - uses: actions/checkout@v5
       - name: Set up Golang
         uses: actions/setup-go@v5
         with:
           go-version: ${{ matrix.go }}
+      # - name: Install Rake
+      #   run: gem install rake
       - name: Test option
-        run: cd option && go test -v
+        run: rake test_option
       - name: Test result
-        run: cd result && go test -v
+        run: rake test_result

.gitignore

@@ -0,0 +1 @@
+/**/*.rs

README.md

@@ -1,17 +1,16 @@
-# type
+# types
 
-Bring the Rust [Result Option] type to Golang
+Bring the Rust [Result Option] types to Golang
 
 ## Installation
 
-  `go get github.com/initdc/type`
+  `go get github.com/initdc/types`
 
 ## Usage
 
 ```go
 import (
-  . "github.com/initdc/type/option"
-  . "github.com/initdc/type/result"
+  . "github.com/initdc/types"
 )
 
 // Option
@@ -36,4 +35,4 @@ e := Err[int, string]("error")
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/initdc/type.
+Bug reports and pull requests are welcome on GitHub at https://github.com/initdc/types.

Rakefile

@@ -0,0 +1,21 @@
+task default: %w[fmt vet test]
+
+task :fmt do
+  sh "go fmt ./..."
+end
+
+task :vet do
+  sh "go vet ./..."
+end
+
+task :test do
+  sh "go test -cover -v ./..."
+end
+
+task :test_result do
+  sh "go test -cover -v ./result"
+end
+
+task :test_option do
+  sh "go test -cover -v ./option"
+end

e2e_test.go

@@ -0,0 +1,38 @@
+package e2e_test
+
+import (
+	"fmt"
+	. "github.com/initdc/types"
+	"testing"
+)
+
+func TestE2E(t *testing.T) {
+	// Option
+	s1 := Some(1)
+
+	var s2 Option[int]
+	s2.None()
+
+	n1 := None[int]()
+
+
+	// Result
+	var r1 Result[int, string]
+	r1.Ok(1)
+
+	var e1 Result[int, string]
+	e1.Err("error")
+
+	r2 := Ok[int, string](1)
+	e2 := Err[int, string]("error")
+
+
+	fmt.Println("%v", s1)
+	fmt.Println("%v", s2)
+	fmt.Println("%v", n1)
+
+	fmt.Println("%v", r1)
+	fmt.Println("%v", e1)
+	fmt.Println("%v", r2)
+	fmt.Println("%v", e2)
+}

go.mod

@@ -1,3 +1,11 @@
-module github.com/initdc/type
+module github.com/initdc/types
 
-go 1.18
+go 1.18.0
+
+require github.com/stretchr/testify v1.11.1
+
+require (
+	github.com/davecgh/go-spew v1.1.1 // indirect
+	github.com/pmezard/go-difflib v1.0.0 // indirect
+	gopkg.in/yaml.v3 v3.0.1 // indirect
+)

go.sum

@@ -0,0 +1,9 @@
+github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
+github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
+github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U=
+github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
+gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

option/option.go

@@ -1,9 +1,13 @@
 package option
 
+import (
+	"github.com/initdc/types"
+)
+
 type Option[T any] struct {
-	value    T    `json:"value"`
-	some     bool `json:"some"`
-	assigned bool `json:"assigned"`
+	value    T
+	some     bool
+	assigned bool
 }
 
 func Some[T any](v T) Option[T] {
@@ -21,6 +25,7 @@ func None[T any]() Option[T] {
 	}
 }
 
+
 func (o *Option[T]) Some(v T) {
 	if o.assigned {
 		panic("Option already assigned")
@@ -38,60 +43,210 @@ func (o *Option[T]) None() {
 	o.assigned = true
 }
 
-func (o *Option[T]) IsSome() bool {
+func (o Option[T]) Valid() bool {
 	return o.some
 }
 
-func (o *Option[T]) IsSomeAnd(f func(T) bool) bool {
+func (o Option[T]) Assigned() bool {
+	return o.assigned
+}
+
+func (o Option[T]) IsSome() bool {
+	return o.some
+}
+
+func (o Option[T]) IsSomeAnd(f func(T) bool) bool {
 	if !o.some {
 		return false
 	}
 	return f(o.value)
 }
 
-func (o *Option[T]) IsNone() bool {
+func (o Option[T]) IsNone() bool {
 	return !o.some
 }
 
-func (o *Option[T]) IsNoneOr(f func(T) bool) bool {
+func (o Option[T]) IsNoneOr(f func(T) bool) bool {
 	if !o.some {
 		return true
 	}
 	return f(o.value)
 }
 
-func (o *Option[T]) Expect(msg string) T {
+func (o Option[T]) Expect(msg string) T {
 	if o.some {
 		return o.value
 	}
 	panic(msg)
 }
 
-func (o *Option[T]) Unwrap() T {
+func (o Option[T]) Unwrap() T {
 	if o.some {
 		return o.value
 	}
 	panic("called Option.Unwrap() on a None value")
 }
 
-func (o *Option[T]) UnwrapOr(def T) T {
+func (o Option[T]) UnwrapOr(def T) T {
 	if o.some {
 		return o.value
 	}
 	return def
 }
 
-func (o *Option[T]) UnwrapOrElse(f func() T) T {
+func (o Option[T]) UnwrapOrElse(f func() T) T {
 	if o.some {
 		return o.value
 	}
 	return f()
 }
 
-func (o *Option[T]) UnwrapOrDefault() T {
+func (o Option[T]) UnwrapOrDefault() T {
 	if o.some {
 		return o.value
 	}
 	var zero T
 	return zero
 }
+
+func Map[T, U any](o Option[T], f func(T) U) Option[U] {
+	if o.some {
+		return Some[U](f(o.value))
+	}
+	return None[U]()
+}
+
+func (o Option[T]) Inspect(f func(T)) Option[T] {
+	if o.some {
+		f(o.value)
+	}
+	return o
+}
+
+func MapOr[T, U any](o Option[T], def U, f func(T) U) U {
+	if o.some {
+		return f(o.value)
+	}
+	return def
+}
+
+func MapOrElse[T, U any](o Option[T], def func() U, f func(T) U) U {
+	if o.some {
+		return f(o.value)
+	}
+	return def()
+}
+
+func MapOrDefault[T, U any](o Option[T], f func(T) U) U {
+	if o.some {
+		return f(o.value)
+	}
+	var zero U
+	return zero
+}
+
+func OkOr[T, E any](o Option[T], err E) result.Result[T, E] {
+	if o.some {
+		return result.Ok[T, E](o.value)
+	}
+	return result.Err[T, E](err)
+}
+
+func OkOrElse[T, E any](o Option[T], err func() E) result.Result[T, E] {
+	if o.some {
+		return result.Ok[T, E](o.value)
+	}
+	return result.Err[T, E](err())
+}
+
+func And[T, U any](o Option[T], optb Option[U]) Option[U] {
+	if o.some {
+		return optb
+	}
+	return None[U]()
+}
+
+func AndThen[T, U any](o Option[T], f func(T) Option[U]) Option[U] {
+	if o.some {
+		return f(o.value)
+	}
+	return None[U]()
+}
+
+func (o Option[T]) Filter(predicate func(T) bool) Option[T] {
+	if o.some && predicate(o.value) {
+		return Some[T](o.value)
+	}
+	return None[T]()
+}
+
+func (o Option[T]) Or(optb Option[T]) Option[T] {
+	if o.some {
+		return o
+	}
+	return optb
+}
+
+func (o Option[T]) OrElse(f func() Option[T]) Option[T] {
+	if o.some {
+		return o
+	}
+	return f()
+}
+
+func (o Option[T]) Xor(optb Option[T]) Option[T] {
+	if o.some && !optb.some {
+		return o
+	}
+	if !o.some && optb.some {
+		return optb
+	}
+	return None[T]()
+}
+
+func (o *Option[T]) Insert(value T) *T {
+	o.value = value
+	o.some = true
+	o.assigned = true
+	return &o.value
+}
+
+func (o *Option[T]) GetOrInsert(value T) *T {
+	if !o.some {
+		o.value = value
+		o.some = true
+		o.assigned = true
+	}
+	return &o.value
+}
+
+func (o *Option[T]) GetOrInsertDefault() *T {
+	if !o.some {
+		var zero T
+		o.value = zero
+		o.some = true
+		o.assigned = true
+	}
+	return &o.value
+}
+
+func (o *Option[T]) GetOrInsertWith(f func() T) *T {
+	if !o.some {
+		o.value = f()
+		o.some = true
+		o.assigned = true
+	}
+	return &o.value
+}
+
+func (o *Option[T]) Take() Option[T] {
+	var cp = *o
+	*o = None[T]()
+	return cp
+}
+
+func (o *Option[T]) Replace(value T) Option[T] {
+	var cp = *o
+	*o = Some[T](value)
+	return cp
+}