Type more things

.editorconfig

@@ -0,0 +1,10 @@
+root = true
+
+[*]
+end_of_line = lf
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+[*.yml]
+indent_style = space
+indent_size = 2

.github/workflows/check.yml

@@ -27,7 +27,7 @@ jobs:
       run: |
         bundle exec rbs collection install
         # TODO: swallowing result until types pass
-        bundle exec rake steep:check || true
+        bundle exec rake steep:check
     - name: Check generators
       run: |
         bundle exec rake docker:compose:generate[check]

.vscode/extensions.json

@@ -0,0 +1,8 @@
+{
+    "recommendations": [
+        "soutaro.rbs-syntax",
+        "shopify.ruby-lsp",
+        "soutaro.steep-vscode",
+        "editorconfig.editorconfig"
+    ]
+}

Steepfile

@@ -7,10 +7,12 @@ target :lib do
 
   check "lib"
 
+  # ignore per version dynamic definitions for old rubies
+  ignore "lib/**/*.ruby2.rb"
+
   configure_code_diagnostics do |hash|
-    hash[D::Ruby::UnknownInstanceVariable] = :warning
-    hash[D::Ruby::NoMethod] = :warning
-    hash[D::Ruby::MethodDefinitionMissing] = :warning
+    hash[D::Ruby::UnknownInstanceVariable] = :error
+    hash[D::Ruby::MethodDefinitionMissing] = :error
   end
 end
 

gemfiles/ruby-3.3.gemfile

@@ -14,10 +14,14 @@ group :debug do
   gem "irb"
 end
 
+group :ide do
+  gem "ruby-lsp"
+end
+
 group :check do
   gem "rubocop", "~> 1.62.1", require: false
   gem "rubocop-minitest", "~> 0.33.0", require: false
   gem "rubocop-rake", "~> 0.6.0", require: false
   gem "standard", "~> 1.0", require: false
-  gem "steep", "~> 1.6.0", require: false
+  gem "steep", "~> 1.7.0", require: false
 end

gemfiles/ruby-3.4.gemfile

@@ -19,5 +19,5 @@ group :check do
   gem "rubocop-minitest", "~> 0.33.0", require: false
   gem "rubocop-rake", "~> 0.6.0", require: false
   gem "standard", "~> 1.0", require: false
-  gem "steep", "~> 1.6.0", require: false
+  gem "steep", "~> 1.7.0", require: false
 end

lib/graft/callback.rb

@@ -1,7 +1,16 @@
 # frozen_string_literal: true
 
+if RUBY_VERSION < "3.0"
+  require_relative "callback/callable.ruby2"
+else
+  require_relative "callback/callable.ruby3"
+end
+
 module Graft
   class Callback
+    include Callable
+
+    # @dynamic name
     attr_reader :name
 
     # NOTE: opts is not used in the current implementation
@@ -12,20 +21,6 @@ def initialize(name = nil, opts = {}, &block)
       @enabled = true
     end
 
-    if RUBY_VERSION < "3.0"
-      def call(*args, &block)
-        return unless enabled?
-
-        @block.call(*args, &block)
-      end
-    else
-      def call(*args, **kwargs, &block)
-        return unless enabled?
-
-        @block.call(*args, **kwargs, &block)
-      end
-    end
-
     def disable
       @enabled = false
     end

lib/graft/callback/callable.ruby2.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module Graft
+  class Callback
+    module Callable
+      def call(*args, &block)
+        return unless enabled?
+
+        @block.call(*args, &block)
+      end
+    end
+  end
+end

lib/graft/callback/callable.ruby3.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module Graft
+  class Callback
+    module Callable
+      def call(*args, **kwargs, &block)
+        # TODO: should be useless, see `callable.rbs`
+        # @type self: Callback & Callable
+
+        return unless enabled?
+
+        @block.call(*args, **kwargs, &block)
+      end
+    end
+  end
+end

lib/graft/hook.rb

@@ -4,9 +4,16 @@
 require_relative "callback"
 require_relative "hook_point"
 
+if RUBY_VERSION < "3.0"
+  require_relative "hook/wrapper.ruby2"
+else
+  require_relative "hook/wrapper.ruby3"
+end
+
 module Graft
   class Hook
     DEFAULT_STRATEGY = HookPoint::DEFAULT_STRATEGY
+    KEY = "graft"
 
     @hooks = {}
 
@@ -44,6 +51,7 @@ def self.ignore
       Thread.current[:hook_entered] = false
     end
 
+    # @dynamic point, stack
     attr_reader :point, :stack
 
     # NOTE: Push logic upward ClassMethods
@@ -107,54 +115,15 @@ def enabled?
     def install
       return unless point.exist?
 
-      point.install("hook", &Hook.wrapper(self))
+      point.install(Hook::KEY, &Hook.wrapper(self))
     end
 
     def uninstall
       return unless point.exist?
 
-      point.uninstall("hook")
-    end
-
-    class << self
-      if RUBY_VERSION < "3.0"
-        def wrapper(hook)
-          proc do |*args, &block|
-            env = {
-              self: self,
-              args: args,
-              block: block
-            }
-            supa = proc { |*args, &block| super(*args, &block) }
-            mid = proc { |_, env| {return: supa.call(*env[:args], &env[:block])} }
-            stack = hook.stack.dup
-            stack << mid
-
-            stack.call(env)
-          end
-        end
-      else
-        def wrapper(hook)
-          proc do |*args, **kwargs, &block|
-            env = {
-              receiver: self,
-              method: hook.point.method_name,
-              kind: hook.point.method_kind,
-              strategy: hook.point.instance_variable_get(:@strategy),
-              args: args,
-              kwargs: kwargs,
-              block: block
-            }
-
-            supa = proc { |*args, **kwargs, &block| super(*args, **kwargs, &block) }
-            mid = proc { |_, env| {return: supa.call(*env[:args], **env[:kwargs], &env[:block])} }
-            stack = hook.stack.dup
-            stack << mid
-
-            stack.call(env)[:return]
-          end
-        end
-      end
+      point.uninstall(Hook::KEY)
     end
+
+    extend Hook::Wrapper
   end
 end

lib/graft/hook/wrapper.ruby2.rb

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+module Graft
+  class Hook
+    module Wrapper
+      def wrapper(hook)
+        proc do |*args, &block|
+          env = {
+            self: self,
+            args: args,
+            block: block
+          }
+          supa = case env[:strategy]
+          when :prepend
+            proc { |*args, &block| super(*args, &block) }
+          when :chain
+            proc { |*args, &block| hook.point.apply(env[:receiver], Hook::KEY, *args, **kwargs, &block) }
+          else
+            raise HookPointError, "unknown strategy: #{env[:strategy]}"
+          end
+          mid = proc { |_, env| {return: supa.call(*env[:args], &env[:block])} }
+          stack = hook.stack.dup
+          stack << mid
+
+          stack.call(env)
+        end
+      end
+    end
+  end
+end

lib/graft/hook/wrapper.ruby3.rb

@@ -0,0 +1,51 @@
+# frozen_string_literal: true
+
+module Graft
+  class Hook
+    module Wrapper
+      def wrapper(hook)
+        point = hook.point
+
+        p = proc do |*args, **kwargs, &block|
+          # @type self: Object
+
+          env = {
+            receiver: self,
+            method: point.method_name,
+            kind: point.method_kind,
+            strategy: point.instance_variable_get(:@strategy),
+            args: args,
+            kwargs: kwargs,
+            block: block
+          }
+
+          supa = case point
+          when HookPoint::Prepend
+            proc do |*args, **kwargs, &block|
+              # @type self: Object
+              super(*args, **kwargs, &block)
+            end
+          when HookPoint::Chain
+            proc do |*args, **kwargs, &block|
+              # @type point: HookPoint & HookPoint::Chain
+              point.apply(env[:receiver], Hook::KEY, *args, **kwargs, &block)
+            end
+          else
+            raise HookPointError, "unknown strategy: #{env[:strategy]}"
+          end
+
+          # TODO: `case` eats `supa`'s type
+          # @type var supa: ^(*untyped, **untyped) -> untyped
+          mid = Callback.new { |_, env| {return: supa.call(*env[:args], **env[:kwargs], &env[:block])} }
+          stack = hook.stack.dup
+          stack << mid
+
+          stack.call(env)[:return]
+        end
+
+        # erase type: `proc` returns a `::Proc` type, not `^() -> untyped`
+        _ = p
+      end
+    end
+  end
+end