rbs-patch 0.1.3 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3a45288c145d3c26618712866de56ebeebabc1034e29960877834d5fc0518c58
-  data.tar.gz: 12ae5d9f8fcd5721f05bac232b9dd10b8de6a23c47c73eba19801e65b3b33143
+  metadata.gz: be7a77838d494748f9f51925c7d26a78a70aee45fb143942b71630c79fa31518
+  data.tar.gz: 67ad4d7de09a5a558924e609894dc19c9e2266f7b3f311008e8300f7d41c43e8
 SHA512:
-  metadata.gz: b939dc31112ba51d86e88c66b0000ac3abcf7baa9d5b57db79af3ee8003dc2cafbb90e2d6c4d08ffb53c3aebd8bb3c1d2b1bec7609911d03f7ed12105621a2b4
-  data.tar.gz: '00998b3ec8d70b87cf45177244ed9dc0e8bdb572f95eb33e07f422a137a67922a6add9ddb06a00777de1eb00aa69eb787930b2e6b33704b890064e4c1b2683c5'
+  metadata.gz: 632f15418e48dca1b7a4f5202665a1b9248720ea267b6f49de41e3b8c3696ac3bc23f6010e22b3e9be8a551b593db3310be8ce6a93b27170590fd83c3b814637
+  data.tar.gz: 86fda57bc6b66c158b7c67c9b58dcc9f9bb4d13433204e0587e60338f8220aea9a52b386025ca48ab20eee27954b5779a2b54ab9382a05ad243918c5281610bf

data/README.md

@@ -27,7 +27,160 @@ gem install rbs-patch
 
 ## Usage
 
-TODO: Write usage instructions here
+### Basic Usage
+
+```bash
+# Apply patches to RBS files
+rbs-patch base.rbs patch1.rbs patch2.rbs
+
+# Mix files and directories
+rbs-patch lib/types/ sig/patches/
+
+# Output goes to stdout - redirect to save
+rbs-patch base.rbs patch.rbs > output.rbs
+```
+
+### Programmatic Usage
+
+```ruby
+require 'rbs/patch'
+
+p = RBS::Patch.new
+
+# Load from a single file
+p.apply(path: Pathname("sig/user.rbs"))
+
+# Load from a directory (all .rbs files)
+p.apply(path: Pathname("sig/patches"))
+
+# Apply from string
+p.apply(<<~RBS)
+  class User
+    %a{patch:override}
+    def name: () -> String?
+  end
+RBS
+
+puts p.to_s
+```
+
+### Annotation Syntax
+
+All patch operations use RBS annotations with the format `%a{patch:operation}` or `%a{patch:operation:target}`.
+
+#### Method-level Operations
+
+##### `override` - Replace existing method signature
+
+```ruby
+class User
+  %a{patch:override}
+  def name: () -> String?  # Replaces existing method signature at the same position
+end
+```
+
+##### `delete` - Remove method signature
+
+```ruby
+class User
+  %a{patch:delete}
+  def email: () -> String  # Removes this method from the class
+end
+```
+
+##### `append_after(method_name)` - Insert method after specified method
+
+```ruby
+class User
+  %a{patch:append_after(name)}
+  def nickname: () -> String?  # Inserts after the 'name' method
+end
+```
+
+##### `prepend_before(method_name)` - Insert method before specified method
+
+```ruby
+class User
+  %a{patch:prepend_before(name)}
+  def id: () -> Integer  # Inserts before the 'name' method
+end
+```
+
+#### Class/Module-level Operations
+
+##### `override` - Replace entire class/module
+
+```ruby
+%a{patch:override}
+class User
+  def name: () -> String  # Completely replaces the User class definition
+end
+```
+
+##### `delete` - Remove class/module
+
+```ruby
+%a{patch:delete}
+class User
+end  # Removes the entire User class
+```
+
+##### `append_after(ClassName)` - Insert class/module after specified class
+
+```ruby
+%a{patch:append_after(User)}
+class Admin
+  def permissions: () -> Array[String]
+end  # Inserts Admin class after User class
+```
+
+##### `prepend_before(ClassName)` - Insert class/module before specified class
+
+```ruby
+%a{patch:prepend_before(User)}
+class Guest
+  def readonly: () -> bool
+end  # Inserts Guest class before User class
+```
+
+### Working with Nested Modules
+
+Operations work correctly within nested module structures:
+
+```ruby
+module MyApp
+  module Models
+    %a{patch:append_after(User)}
+    class Admin
+      def role: () -> String
+    end
+  end
+end
+```
+
+### Merging Multiple Definitions
+
+Without annotations, multiple class definitions are merged:
+
+```ruby
+p.apply(<<~RBS)
+  class User
+    def name: () -> String
+  end
+RBS
+
+p.apply(<<~RBS)
+  class User
+    def email: () -> String  # Adds to existing User class
+  end
+RBS
+
+# Result:
+# class User
+#   def name: () -> String
+#   def email: () -> String
+# end
+```
 
 ## Development
 

data/lib/rbs/patch/version.rb

@@ -2,6 +2,6 @@
 
 module RBS
   class Patch
-    VERSION = "0.1.3"
+    VERSION = "0.1.6"
   end
 end

data/lib/rbs/patch.rb

@@ -8,8 +8,8 @@ module RBS
   class Patch # rubocop:disable Style/Documentation
     ANNOTATION_OVERRIDE       = "patch:override"
     ANNOTATION_DELETE         = "patch:delete"
-    ANNOTATION_APPEND_AFTER   = /\Apatch:append_after:(.*)\Z/
-    ANNOTATION_PREPEND_BEFORE = /\Apatch:prepend_before:(.*)\Z/
+    ANNOTATION_APPEND_AFTER   = /\Apatch:append_after\((.*)\)\Z/
+    ANNOTATION_PREPEND_BEFORE = /\Apatch:prepend_before\((.*)\)\Z/
 
     def initialize
       @decls = []
@@ -55,27 +55,72 @@ module RBS
 
     private
 
+    def extract_name(decl)
+      if decl.is_a?(::RBS::AST::Declarations::AliasDecl) # rubocop:disable Style/CaseLikeIf
+        decl.new_name.to_s
+      elsif decl.is_a?(::RBS::AST::Declarations::Base)
+        decl.name.to_s
+      elsif decl.is_a?(::RBS::AST::Members::LocationOnly)
+        ""
+      elsif decl.is_a?(::RBS::AST::Members::Alias) # rubocop:disable Lint/DuplicateBranch
+        decl.new_name.to_s
+      else # rubocop:disable Lint/DuplicateBranch
+        # ::RBS::AST::Members::t
+        decl.name.to_s
+      end
+    end
+
+    def extract_members(decl)
+      decl.members if decl.is_a?(::RBS::AST::Declarations::NestedDeclarationHelper)
+    end
+
+    def update(decl, location:)
+      if decl.respond_to?(:update)
+        # steep:ignore:start
+        decl.update(location:)
+        # steep:ignore:end
+      elsif decl.is_a?(AST::Declarations::Constant)
+        AST::Declarations::Constant.new(
+          name: decl.name, type: decl.type, location: location, comment: decl.comment, annotations: decl.annotations
+        )
+      elsif decl.is_a?(AST::Declarations::Global)
+        AST::Declarations::Global.new(
+          name: decl.name, type: decl.type, location: location, comment: decl.comment, annotations: decl.annotations
+        )
+      elsif decl.is_a?(AST::Declarations::TypeAlias)
+        AST::Declarations::TypeAlias.new(
+          name: decl.name, type_params: decl.type_params, type: decl.type, annotations: decl.annotations,
+          location: location, comment: decl.comment
+        )
+      elsif decl.is_a?(AST::Declarations::AliasDecl)
+        decl.class.new(
+          new_name: decl.new_name, old_name: decl.old_name, location: location, comment: decl.comment,
+          annotations: decl.annotations
+        )
+      elsif decl.is_a?(AST::Members::Mixin)
+        decl.class.new(
+          name: decl.name, args: decl.args, annotations: decl.annotations, location: location, comment: decl.comment
+        )
+      elsif decl.is_a?(AST::Members::Alias)
+        decl.class.new(
+          new_name: decl.new_name, old_name: decl.old_name, kind: decl.kind, annotations: decl.annotations,
+          location: location, comment: decl.comment
+        )
+      else
+        decl
+      end
+    end
+
     def walk(decls, name_stack = [], &block)
       decls.each do |decl|
-        name = if decl.is_a?(::RBS::AST::Declarations::AliasDecl) # rubocop:disable Style/CaseLikeIf
-                 decl.new_name.to_s
-               elsif decl.is_a?(::RBS::AST::Declarations::Base)
-                 decl.name.to_s
-               elsif decl.is_a?(::RBS::AST::Members::LocationOnly)
-                 ""
-               elsif decl.is_a?(::RBS::AST::Members::Alias) # rubocop:disable Lint/DuplicateBranch
-                 decl.new_name.to_s
-               else # rubocop:disable Lint/DuplicateBranch
-                 # ::RBS::AST::Members::t
-                 decl.name.to_s
-               end
-        name_stack << name
+        name_stack << extract_name(decl)
         if decl.is_a?(::RBS::AST::Members::Base)
           yield decl, "#{name_stack[..-2]&.join("::")}##{name_stack[-1]}"
         else
           yield decl, name_stack.join("::")
         end
-        walk(decl.members, name_stack, &block) if decl.is_a?(::RBS::AST::Declarations::NestedDeclarationHelper)
+        members = extract_members(decl)
+        walk(members, name_stack, &block) if members
         name_stack.pop
       end
     end
@@ -94,24 +139,46 @@ module RBS
       sep = decl.is_a?(::RBS::AST::Members::Base) ? "#" : "::"
       namespace, = to.rpartition(sep)
 
-      target = namespace.empty? ? @decls : map[namespace]&.members # steep:ignore
+      target = namespace.empty? ? @decls : extract_members(map[namespace])
 
-      # steep:ignore:start
-      if target
+      unless target
+        @decls << decl # steep:ignore
+        return
+      end
+
+      if decl.is_a?(AST::Members::Var)
+        # AST::Members::Var does not support annotations.
+        index = target.rindex { |m| m.is_a?(decl.class) }
+        if index
+          decl = update(decl, location: target[index].location.dup)
+          target.insert(index + 1, decl)
+        else
+          index = target.find_index { |m| m.is_a?(AST::Members::MethodDefinition) }
+          if index
+            decl = update(decl, location: target[index].location.dup)
+            target.insert(index, decl)
+          else
+            target << decl
+          end
+        end
+      else
+        decl.annotations.delete_if { |a| process_annotations([a]) } # steep:ignore
         if after
-          index = target.find_index { |m| m.name.to_s == after }
-          target.insert(index + 1, decl) if index
+          index = target.find_index { |m| extract_name(m) == after }
+          return unless index
+
+          decl = update(decl, location: target[index].location.dup)
+          target.insert(index + 1, decl)
         elsif before
-          index = target.find_index { |m| m.name.to_s == before }
-          target.insert(index, decl) if index
+          index = target.find_index { |m| extract_name(m) == before }
+          return unless index
+
+          decl = update(decl, location: target[index].location.dup)
+          target.insert(index, decl)
         else
           target << decl
         end
-        decl.annotations.delete_if { |a| process_annotations([a]) }
-      else
-        @decls << decl
       end
-      # steep:ignore:end
     end
 
     def override(name, with:)
@@ -121,19 +188,18 @@ module RBS
       sep = with.is_a?(::RBS::AST::Members::Base) ? "#" : "::"
       namespace, _, name = name.rpartition(sep)
 
-      # steep:ignore:start
       if namespace.empty?
         # top level decl
-        index = @decls.find_index { |d| d.name.to_s == name }
-        @decls[index] = with
+        index = @decls.find_index { |d| extract_name(d) == name }
+        @decls[index] = with # steep:ignore
       else
-        index = map[namespace].members.find_index do |m|
-          m.name.to_s == name
+        members = extract_members(map[namespace])
+        index = members.find_index do |m| # steep:ignore
+          extract_name(m) == name
         end
-        map[namespace].members[index] = with
+        members[index] = with # steep:ignore
       end
-      with.annotations.delete_if { |a| process_annotations([a]) }
-      # steep:ignore:end
+      with.annotations.delete_if { |a| process_annotations([a]) } # steep:ignore
     end
 
     def delete(name)
@@ -143,14 +209,12 @@ module RBS
       sep = name.index("#") ? "#" : "::"
       namespace, _, name = name.rpartition(sep)
 
-      # steep:ignore:start
       if namespace.empty?
         # top level decl
-        @decls.delete_if { |d| d.name.to_s == name }
+        @decls.delete_if { |d| extract_name(d) == name }
       else
-        map[namespace].members.delete_if { |m| m.name.to_s == name }
+        extract_members(map[namespace])&.delete_if { |m| extract_name(m) == name }
       end
-      # steep:ignore:end
     end
 
     def process_annotations(annotations) # steep:ignore

data/sig/rbs/patch.rbs

@@ -22,7 +22,13 @@ module RBS
 
     private
 
-    def walk: (Array[t] decls, ?Array[String] name_stack) { (::RBS::AST::Declarations::t | ::RBS::AST::Members::t, String) -> void } -> void
+    def extract_name: (t decl) -> String
+
+    def extract_members: (t decl) -> (Array[::RBS::AST::Declarations::Class::member] | Array[::RBS::AST::Declarations::Module::member] | nil)
+
+    def update: (t decl, location: untyped) -> t
+
+    def walk: (Array[t] decls, ?Array[String] name_stack) { (t, String) -> void } -> void
 
     def decl_map: () -> Hash[String, t]
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rbs-patch
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.6
 platform: ruby
 authors:
 - Koji NAKAMURA