mangrove 0.7.1 → 0.8.0

data/lib/mangrove/result.rb

@@ -33,6 +33,9 @@ module Mangrove
     sig { abstract.params(message: String).returns(OkType) }
     def expect!(message); end
 
+    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]) }
     def map_ok(&block); end
 
@@ -102,6 +105,11 @@ module Mangrove
         @inner
       end
 
+      sig { override.params(_block: T.proc.returns(T.untyped)).returns(OkType) }
+      def expect_with!(&_block)
+        @inner
+      end
+
       sig { override.returns(T::Boolean) }
       def ok? = true
 
@@ -117,6 +125,11 @@ module Mangrove
       def map_err(&_block)
         self
       end
+
+      sig { returns(String) }
+      def to_s
+        "#{super}: inner=`#{@inner}`"
+      end
     end
 
     class Err
@@ -161,6 +174,11 @@ module Mangrove
         raise Result::ControlSignal, message
       end
 
+      sig { override.params(block: T.proc.returns(T.untyped)).returns(OkType) }
+      def expect_with!(&block)
+        raise Result::ControlSignal, block.call
+      end
+
       sig { override.returns(T::Boolean) }
       def ok? = false
 
@@ -176,6 +194,11 @@ module Mangrove
       def map_err(&block)
         block.call(@inner)
       end
+
+      sig { returns(String) }
+      def to_s
+        "#{super}: inner=`#{@inner}`"
+      end
     end
   end
 end

data/lib/mangrove/version.rb

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

data/lib/mangrove.rb

@@ -7,7 +7,6 @@ require_relative "mangrove/version"
 require_relative "mangrove/option"
 require_relative "mangrove/result"
 require_relative "mangrove/control_flow/control_signal"
-require_relative "mangrove/control_flow/rewriter"
 
 # Mangrove
 module Mangrove; end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mangrove
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.8.0
 platform: ruby
 authors:
 - Kazuma Murata
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-09-12 00:00:00.000000000 Z
+date: 2023-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sorbet-runtime
@@ -108,7 +108,6 @@ files:
 - hooks/pre-push
 - lib/mangrove.rb
 - lib/mangrove/control_flow/control_signal.rb
-- lib/mangrove/control_flow/rewriter.rb
 - lib/mangrove/option.rb
 - lib/mangrove/option/control_signal.rb
 - lib/mangrove/result.rb

data/lib/mangrove/control_flow/rewriter.rb

@@ -1,158 +0,0 @@
-# typed: true
-# frozen_string_literal: true
-
-require "parser"
-require "parser/current"
-require "unparser"
-require "method_source"
-require "sorbet-runtime"
-
-module Mangrove
-  module ControlFlow
-    class << self
-      extend T::Sig
-
-      sig { params(method_to_be_rewritten: T.any(Method, UnboundMethod)).returns(String) }
-      def impl!(method_to_be_rewritten)
-        filename, line_number = method_to_be_rewritten.source_location
-
-        source = method_to_be_rewritten.source
-        ast = Parser::CurrentRuby.parse(source)
-        source_buffer = Parser::Source::Buffer.new("#{filename}:#{line_number}", source:)
-        rewriter = Rewriter.new
-        rewriter.rewrite(source_buffer, ast)
-      end
-    end
-
-    class Rewriter < Parser::TreeRewriter
-      CONTROL_SIGNAL = Mangrove::ControlFlow::ControlSignal
-
-      def on_def(node)
-        indent = node.location.expression.begin.column
-        code = Unparser.unparse(with_rescue(node))
-        indented_code = code.lines.map.with_index { |line, index| index.zero? ? line : (" " * indent) + line }
-        replace(node.location.expression, indented_code)
-      end
-
-      def on_defs(node)
-        indent = node.location.expression.begin.column
-        code = Unparser.unparse(with_rescue(node))
-        indented_code = code.lines.map.with_index { |line, index| index.zero? ? line : (" " * indent) + line }
-        replace(node.location.expression, indented_code)
-      end
-
-      def on_block(node)
-        indent = node.location.expression.begin.column
-        code = Unparser.unparse(with_rescue(node))
-        indented_code = code.lines.map.with_index { |line, index| index.zero? ? line : (" " * indent) + line }
-        replace(node.location.expression, indented_code)
-      end
-
-      private
-
-      def rescue_node(body)
-        ::Parser::AST::Node.new(:rescue, [
-          body,
-          nil
-        ])
-      end
-
-      def add_rescue_node(parent)
-        children = parent.children.dup
-        # nilの場合はblockをこちらで包む必要がある
-        # nilではない場合はすでに包まれているのでこちらで包む必要はない
-        method_body_index = children.length - 1
-        method_body = children[method_body_index]
-
-        children[method_body_index] = rescue_node(method_body)
-        parent.updated(nil, children)
-      end
-
-      def use_rescue_node(parent)
-        children = parent.children.dup
-
-        rescue_index = children.find_index { _1.respond_to?(:type) && _1.type == :rescue }
-
-        rescue_node_on_ast = children[rescue_index]
-        updated_rescue_node_on_ast = insert_rescue_body_node(rescue_node_on_ast)
-        children[rescue_index] = updated_rescue_node_on_ast
-
-        parent.updated(nil, children)
-      end
-
-      def insert_rescue_body_node(rescue_node)
-        rescue_node_children = rescue_node.children.dup
-        rescue_body_node_index = rescue_node_children.find_index { _1.respond_to?(:type) && _1.type == :resbody }
-
-        # when rescue is newly inserted
-        if rescue_body_node_index.nil?
-          rescue_body_node_index = rescue_node_children.length - 1
-        end
-
-        rescue_node_children.insert(rescue_body_node_index, rescue_body_node)
-        rescue_node.updated(nil, rescue_node_children)
-      end
-
-      def use_ensure_node(ensure_node)
-        # ensureのchildrenの最後から2番目（最後のrescue）に追加する
-
-        ensure_node_children = ensure_node.children.dup
-
-        rescue_index = ensure_node_children.find_index { _1.respond_to?(:type) && _1.type == :rescue }
-
-        if rescue_index.nil?
-          ensure_node = add_rescue_node(ensure_node)
-        end
-
-        use_rescue_node(ensure_node)
-      end
-
-      def with_rescue(parent)
-        children = parent.children.dup
-        ensure_index = children.find_index { _1.respond_to?(:type) && _1.type == :ensure }
-
-        if ensure_index.nil?
-          rescue_index = children.find_index { _1.respond_to?(:type) && _1.type == :rescue }
-
-          if rescue_index.nil?
-            parent = add_rescue_node(parent)
-          end
-
-          use_rescue_node(parent)
-        else
-          updated_ensure_node = use_ensure_node(children[ensure_index])
-          children[ensure_index] = updated_ensure_node
-          parent.updated(nil, children)
-        end
-      end
-
-      def rescue_body_node
-        control_flow = Mangrove::ControlFlow::ControlSignal
-
-        ::Parser::AST::Node.new(:resbody, [
-          ::Parser::AST::Node.new(:array, [
-            ::Parser::AST::Node.new(:const, [nil, control_flow.to_s])
-          ]),
-          ::Parser::AST::Node.new(:lvasgn, [:exception]),
-          ::Parser::AST::Node.new(:send, [
-            ::Parser::AST::Node.new(:const, [
-              ::Parser::AST::Node.new(:const, [
-                ::Parser::AST::Node.new(:const, %i[
-                  cbase
-                  Mangrove
-                ]),
-                :Result
-              ]),
-              :Err
-            ]),
-            :new,
-            ::Parser::AST::Node.new(:send, [
-              ::Parser::AST::Node.new(:lvar, [:exception]),
-              :inner_value
-            ])
-          ])
-        ])
-      end
-    end
-  end
-end