mangrove 0.10.1 → 0.12.0

data/docs/method_list.html

@@ -318,48 +318,48 @@
 
   <li class="odd ">
     <div class="item">
-      <span class='object_link'><a href="Mangrove/Result.html#map_err-instance_method" title="Mangrove::Result#map_err (method)">#map_err</a></span>
-      <small>Mangrove::Result</small>
+      <span class='object_link'><a href="Mangrove/Option/Some.html#map-instance_method" title="Mangrove::Option::Some#map (method)">#map</a></span>
+      <small>Mangrove::Option::Some</small>
     </div>
   </li>
   
 
   <li class="even ">
     <div class="item">
-      <span class='object_link'><a href="Mangrove/Result/Ok.html#map_err-instance_method" title="Mangrove::Result::Ok#map_err (method)">#map_err</a></span>
-      <small>Mangrove::Result::Ok</small>
+      <span class='object_link'><a href="Mangrove/Option/None.html#map-instance_method" title="Mangrove::Option::None#map (method)">#map</a></span>
+      <small>Mangrove::Option::None</small>
     </div>
   </li>
   
 
   <li class="odd ">
     <div class="item">
-      <span class='object_link'><a href="Mangrove/Result/Err.html#map_err-instance_method" title="Mangrove::Result::Err#map_err (method)">#map_err</a></span>
-      <small>Mangrove::Result::Err</small>
+      <span class='object_link'><a href="Mangrove/Option.html#map-instance_method" title="Mangrove::Option#map (method)">#map</a></span>
+      <small>Mangrove::Option</small>
     </div>
   </li>
   
 
   <li class="even ">
     <div class="item">
-      <span class='object_link'><a href="Mangrove/Option/Some.html#map_none-instance_method" title="Mangrove::Option::Some#map_none (method)">#map_none</a></span>
-      <small>Mangrove::Option::Some</small>
+      <span class='object_link'><a href="Mangrove/Result.html#map_err-instance_method" title="Mangrove::Result#map_err (method)">#map_err</a></span>
+      <small>Mangrove::Result</small>
     </div>
   </li>
   
 
   <li class="odd ">
     <div class="item">
-      <span class='object_link'><a href="Mangrove/Option/None.html#map_none-instance_method" title="Mangrove::Option::None#map_none (method)">#map_none</a></span>
-      <small>Mangrove::Option::None</small>
+      <span class='object_link'><a href="Mangrove/Result/Ok.html#map_err-instance_method" title="Mangrove::Result::Ok#map_err (method)">#map_err</a></span>
+      <small>Mangrove::Result::Ok</small>
     </div>
   </li>
   
 
   <li class="even ">
     <div class="item">
-      <span class='object_link'><a href="Mangrove/Option.html#map_none-instance_method" title="Mangrove::Option#map_none (method)">#map_none</a></span>
-      <small>Mangrove::Option</small>
+      <span class='object_link'><a href="Mangrove/Result/Err.html#map_err-instance_method" title="Mangrove::Result::Err#map_err (method)">#map_err</a></span>
+      <small>Mangrove::Result::Err</small>
     </div>
   </li>
   
@@ -390,7 +390,7 @@
 
   <li class="even ">
     <div class="item">
-      <span class='object_link'><a href="Mangrove/Option/Some.html#map_some-instance_method" title="Mangrove::Option::Some#map_some (method)">#map_some</a></span>
+      <span class='object_link'><a href="Mangrove/Option/Some.html#none%3F-instance_method" title="Mangrove::Option::Some#none? (method)">#none?</a></span>
       <small>Mangrove::Option::Some</small>
     </div>
   </li>
@@ -398,7 +398,7 @@
 
   <li class="odd ">
     <div class="item">
-      <span class='object_link'><a href="Mangrove/Option/None.html#map_some-instance_method" title="Mangrove::Option::None#map_some (method)">#map_some</a></span>
+      <span class='object_link'><a href="Mangrove/Option/None.html#none%3F-instance_method" title="Mangrove::Option::None#none? (method)">#none?</a></span>
       <small>Mangrove::Option::None</small>
     </div>
   </li>
@@ -406,7 +406,7 @@
 
   <li class="even ">
     <div class="item">
-      <span class='object_link'><a href="Mangrove/Option.html#map_some-instance_method" title="Mangrove::Option#map_some (method)">#map_some</a></span>
+      <span class='object_link'><a href="Mangrove/Option.html#none%3F-instance_method" title="Mangrove::Option#none? (method)">#none?</a></span>
       <small>Mangrove::Option</small>
     </div>
   </li>
@@ -414,56 +414,56 @@
 
   <li class="odd ">
     <div class="item">
-      <span class='object_link'><a href="Mangrove/Option/Some.html#none%3F-instance_method" title="Mangrove::Option::Some#none? (method)">#none?</a></span>
-      <small>Mangrove::Option::Some</small>
+      <span class='object_link'><a href="Mangrove/Result.html#ok%3F-instance_method" title="Mangrove::Result#ok? (method)">#ok?</a></span>
+      <small>Mangrove::Result</small>
     </div>
   </li>
   
 
   <li class="even ">
     <div class="item">
-      <span class='object_link'><a href="Mangrove/Option/None.html#none%3F-instance_method" title="Mangrove::Option::None#none? (method)">#none?</a></span>
-      <small>Mangrove::Option::None</small>
+      <span class='object_link'><a href="Mangrove/Result/Ok.html#ok%3F-instance_method" title="Mangrove::Result::Ok#ok? (method)">#ok?</a></span>
+      <small>Mangrove::Result::Ok</small>
     </div>
   </li>
   
 
   <li class="odd ">
     <div class="item">
-      <span class='object_link'><a href="Mangrove/Option.html#none%3F-instance_method" title="Mangrove::Option#none? (method)">#none?</a></span>
-      <small>Mangrove::Option</small>
+      <span class='object_link'><a href="Mangrove/Result/Err.html#ok%3F-instance_method" title="Mangrove::Result::Err#ok? (method)">#ok?</a></span>
+      <small>Mangrove::Result::Err</small>
     </div>
   </li>
   
 
   <li class="even ">
     <div class="item">
-      <span class='object_link'><a href="Mangrove/Result.html#ok%3F-instance_method" title="Mangrove::Result#ok? (method)">#ok?</a></span>
-      <small>Mangrove::Result</small>
+      <span class='object_link'><a href="Mangrove/Result/Ok.html#ok_inner-instance_method" title="Mangrove::Result::Ok#ok_inner (method)">#ok_inner</a></span>
+      <small>Mangrove::Result::Ok</small>
     </div>
   </li>
   
 
   <li class="odd ">
     <div class="item">
-      <span class='object_link'><a href="Mangrove/Result/Ok.html#ok%3F-instance_method" title="Mangrove::Result::Ok#ok? (method)">#ok?</a></span>
-      <small>Mangrove::Result::Ok</small>
+      <span class='object_link'><a href="Mangrove/Option/Some.html#or-instance_method" title="Mangrove::Option::Some#or (method)">#or</a></span>
+      <small>Mangrove::Option::Some</small>
     </div>
   </li>
   
 
   <li class="even ">
     <div class="item">
-      <span class='object_link'><a href="Mangrove/Result/Err.html#ok%3F-instance_method" title="Mangrove::Result::Err#ok? (method)">#ok?</a></span>
-      <small>Mangrove::Result::Err</small>
+      <span class='object_link'><a href="Mangrove/Option/None.html#or-instance_method" title="Mangrove::Option::None#or (method)">#or</a></span>
+      <small>Mangrove::Option::None</small>
     </div>
   </li>
   
 
   <li class="odd ">
     <div class="item">
-      <span class='object_link'><a href="Mangrove/Result/Ok.html#ok_inner-instance_method" title="Mangrove::Result::Ok#ok_inner (method)">#ok_inner</a></span>
-      <small>Mangrove::Result::Ok</small>
+      <span class='object_link'><a href="Mangrove/Option.html#or-instance_method" title="Mangrove::Option#or (method)">#or</a></span>
+      <small>Mangrove::Option</small>
     </div>
   </li>
   

data/docs/top-level-namespace.html

@@ -100,7 +100,7 @@
 </div>
 
       <div id="footer">
-  Generated on Tue Oct 24 12:55:36 2023 by
+  Generated on Tue Oct 24 20:44:48 2023 by
   <a href="https://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.34 (ruby-3.1.2).
 </div>

data/lib/mangrove/option.rb

@@ -91,13 +91,13 @@ module Mangrove
       sig { override.returns(T::Boolean) }
       def none? = false
 
-      sig { override.params(block: T.proc.params(inner: InnerType).returns(Option[InnerType])).returns(Option[InnerType]) }
-      def map_some(&block)
+      sig { override.type_parameters(:NewInnerType).params(block: T.proc.params(inner: InnerType).returns(Option[T.type_parameter(:NewInnerType)])).returns(::Mangrove::Option[T.type_parameter(:NewInnerType)]) }
+      def map(&block)
         block.call(@inner)
       end
 
-      sig { override.params(_block: T.proc.returns(Option[InnerType])).returns(Option::Some[InnerType]) }
-      def map_none(&_block)
+      sig { override.params(_default: Option[InnerType]).returns(Option[InnerType]) }
+      def or(_default)
         self
       end
 
@@ -161,14 +161,14 @@ module Mangrove
       sig { override.returns(T::Boolean) }
       def none? = true
 
-      sig { override.params(_block: T.proc.params(inner: InnerType).returns(Option[InnerType])).returns(Option::None[InnerType]) }
-      def map_some(&_block)
-        self
+      sig { override.type_parameters(:NewInnerType).params(_block: T.proc.params(inner: InnerType).returns(Option[T.type_parameter(:NewInnerType)])).returns(Option[T.type_parameter(:NewInnerType)]) }
+      def map(&_block)
+        T.cast(self, Option[T.type_parameter(:NewInnerType)])
       end
 
-      sig { override.params(block: T.proc.returns(Option[InnerType])).returns(Option[InnerType]) }
-      def map_none(&block)
-        block.call
+      sig { override.params(default: Option[InnerType]).returns(Option[InnerType]) }
+      def or(default)
+        default
       end
 
       sig { override.type_parameters(:ErrType).params(err: T.type_parameter(:ErrType)).returns(Mangrove::Result[InnerType, T.type_parameter(:ErrType)]) }
@@ -198,11 +198,11 @@ module Mangrove
     sig { abstract.returns(T::Boolean) }
     def none?; end
 
-    sig { abstract.params(block: T.proc.params(inner: InnerType).returns(Option[InnerType])).returns(Option[InnerType]) }
-    def map_some(&block); end
+    sig { abstract.type_parameters(:NewInnerType).params(block: T.proc.params(inner: InnerType).returns(Option[T.type_parameter(:NewInnerType)])).returns(::Mangrove::Option[T.type_parameter(:NewInnerType)]) }
+    def map(&block); end
 
-    sig { abstract.params(block: T.proc.returns(Option[InnerType])).returns(Option[InnerType]) }
-    def map_none(&block); end
+    sig { abstract.params(default: Option[InnerType]).returns(Option[InnerType]) }
+    def or(default); end
 
     sig { abstract.type_parameters(:ErrType).params(err: T.type_parameter(:ErrType)).returns(Mangrove::Result[InnerType, T.type_parameter(:ErrType)]) }
     def transpose(err); end

data/lib/mangrove/result.rb

@@ -36,10 +36,10 @@ module Mangrove
     sig { abstract.params(block: T.proc.returns(T.untyped)).returns(OkType) }
     def expect_with!(&block); end
 
-    sig { abstract.params(block: T.proc.params(this: OkType).returns(Result[OkType, ErrType])).returns(Result[OkType, ErrType]) }
+    sig { abstract.type_parameters(:NewOkType).params(block: T.proc.params(this: OkType).returns(Result[T.type_parameter(:NewOkType), ErrType])).returns(Result[T.type_parameter(:NewOkType), ErrType]) }
     def map_ok(&block); end
 
-    sig { abstract.params(block: T.proc.params(this: ErrType).returns(Result[OkType, ErrType])).returns(Result[OkType, ErrType]) }
+      sig { abstract.type_parameters(:NewErrType).params(block: T.proc.params(this: ErrType).returns(Result[OkType, T.type_parameter(:NewErrType)])).returns(Result[OkType, T.type_parameter(:NewErrType)]) }
     def map_err(&block); end
 
     class << self
@@ -116,14 +116,14 @@ module Mangrove
       sig { override.returns(T::Boolean) }
       def err? = false
 
-      sig { override.params(block: T.proc.params(this: OkType).returns(Result[OkType, ErrType])).returns(Result[OkType, ErrType]) }
+      sig { override.type_parameters(:NewOkType).params(block: T.proc.params(this: OkType).returns(Result[T.type_parameter(:NewOkType), ErrType])).returns(Result[T.type_parameter(:NewOkType), ErrType]) }
       def map_ok(&block)
         block.call(@inner)
       end
 
-      sig { override.params(_block: T.proc.params(this: ErrType).returns(Result[OkType, ErrType])).returns(Result[OkType, ErrType]) }
+      sig { override.type_parameters(:NewErrType).params(_block: T.proc.params(this: ErrType).returns(Result[OkType, T.type_parameter(:NewErrType)])).returns(Result[OkType, T.type_parameter(:NewErrType)]) }
       def map_err(&_block)
-        self
+        T.cast(self, Result::Ok[OkType, T.type_parameter(:NewErrType)])
       end
 
       sig { returns(String) }
@@ -185,12 +185,12 @@ module Mangrove
       sig { override.returns(T::Boolean) }
       def err? = true
 
-      sig { override.params(_block: T.proc.params(this: OkType).returns(Result[OkType, ErrType])).returns(Result[OkType, ErrType]) }
+      sig { override.type_parameters(:NewOkType).params(_block: T.proc.params(this: OkType).returns(Result[T.type_parameter(:NewOkType), ErrType])).returns(Result[T.type_parameter(:NewOkType), ErrType]) }
       def map_ok(&_block)
-        self
+        T.cast(self, Result::Err[T.type_parameter(:NewOkType), ErrType])
       end
 
-      sig { override.params(block: T.proc.params(this: ErrType).returns(Result[OkType, ErrType])).returns(Result[OkType, ErrType]) }
+      sig { override.type_parameters(:NewErrType).params(block: T.proc.params(this: ErrType).returns(Result[OkType, T.type_parameter(:NewErrType)])).returns(Result[OkType, T.type_parameter(:NewErrType)]) }
       def map_err(&block)
         block.call(@inner)
       end

data/lib/mangrove/version.rb

@@ -2,5 +2,5 @@
 # frozen_string_literal: true
 
 module Mangrove
-  VERSION = "0.10.1"
+  VERSION = "0.12.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mangrove
 version: !ruby/object:Gem::Version
-  version: 0.10.1
+  version: 0.12.0
 platform: ruby
 authors:
 - Kazuma Murata