orthoses 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 64cbbb058a7d4dc7c5f6f0d8cc66a23a1b2026253ad20add3cc63777a1c42227
-  data.tar.gz: 15742e8389d7fc4e129bca6ab48203f13dad5b2338eff73a2b4c530ba239d327
+  metadata.gz: c2fbbb509545bf6efd770838fff4ac02168f0352f0f2e2561ed927eb3479a4bb
+  data.tar.gz: 259b1cf53cc3b2ea17ec3d6088260131ccd9d8562ec002b0d515cb817b96d228
 SHA512:
-  metadata.gz: 276874fcb60ce45b3b2ffe3388e963b596f65a466c4f36f5b3986b561f756f721d797e8217a27b6a292f988343fe8f4209886b876ba03e4512466b51903e4996
-  data.tar.gz: 73b2a614b599980d20d2d0334d87f4f508b163beff9a766979d67f39f49213a634c9e907725efd1f7a51e1552b5db90e80f3d766bba024ff050d50c5d5522b5c
+  metadata.gz: 50aceef69e828e6fbd90cbb23813bd66676b399d4a5551728eebf9ae8c24544aeda11c7d57810826575c53b215da541d232eb5a8ecb26fb9cf2d5a99822c7a91
+  data.tar.gz: 36972f90ecdf75efa516c2fb576ea616f2b949a5930463f01ff9046335ae6571d7e98f9c33593bee21397cd29754da4abdfea038c956eaaa74d92deded56ba71

data/README.md

@@ -31,7 +31,7 @@ Orthoses::Builder.new do
       %r{app/models}.match?(path)
     }
   use YourCustom::Middleware
-  use Orthoses::IncludeExtendPrepend
+  use Orthoses::Mixin
   use Orthoses::Constant
   use Orthoses::Walk,
     root: "Foo"
@@ -48,7 +48,7 @@ end.call
 Add constant signature to class/module.
 Signatures are predicted from constant values.
 
-### Orthoses::IncludeExtendPrepend
+### Orthoses::Mixin
 
 Add module include/extend/prepend definition.
 It use `Module#{includeed,extended,prepended}` for capture.

data/lib/orthoses/builder.rb

@@ -5,7 +5,7 @@ module Orthoses
   #   Builder.new do
   #     use Orthoses::CreateFileByName
   #     use Orthoses::Constant
-  #     use Orthoses::IncludeExtendPrepend
+  #     use Orthoses::Mixin
   #     use Orthoses::Walk,
   #       root: "Foo"
   #     run ->() { require 'foo' }

data/lib/orthoses/content/duplication_checker.rb

@@ -0,0 +1,46 @@
+module Orthoses
+  class Content
+    # Check and drop duplication method, const etc...
+    class DuplicationChecker
+      def initialize(decl)
+        @decl = decl
+        @uniq_map = {}
+      end
+
+      def <<(member)
+        key = member_key(member)
+        if @uniq_map.key?(key)
+          Orthoses.logger.warn("#{@decl.name}::#{member_to_s(member)} was droped since duplication")
+        else
+          @uniq_map[key] = member
+        end
+      end
+
+      def uniq_members
+        @uniq_map.values
+      end
+
+      private
+
+      def member_to_s(member)
+        out = StringIO.new
+        RBS::Writer.new(out: out).write_member(member)
+        out.string.chomp
+      end
+
+      def member_key(member)
+        case member
+        when RBS::AST::Members::MethodDefinition
+          # member.types.hash is different
+          [member.class, member.name, member.kind]
+        when RBS::AST::Members::LocationOnly
+          [member.class]
+        when RBS::AST::Members::Alias
+          [member.class, member.new_name, member.old_name, member.kind]
+        else
+          [member.class, member.name]
+        end
+      end
+    end
+  end
+end

data/lib/orthoses/content.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'orthoses/content/duplication_checker'
+
 module Orthoses
   # Common interface for output.
   # Orthoses::Content expect to use result of middleware.
@@ -94,19 +96,18 @@ module Orthoses
       out = StringIO.new
       writer = RBS::Writer.new(out: out)
       decls = RBS::Parser.parse_signature(buffer).map do |parsed_decl|
-        before_members = parsed_decl.members.dup
-        parsed_decl.members.uniq! { |m| [m.class, m.respond_to?(:name) ? m.name : nil] }
-        (before_members - parsed_decl.members).each do |droped_member|
-          Orthoses.logger.warn("#{parsed_decl.name}::#{droped_member.name.to_s}: #{droped_member.to_s} was droped since duplication")
+        parsed_decl.tap do |decl|
+          duplicate_checker = DuplicationChecker.new(decl)
+          decl.members.each do |member|
+            duplicate_checker << member
+          end
+          decl.members.replace(duplicate_checker.uniq_members)
         end
-        parsed_decl
       end
       writer.write(decls)
       out.string
     rescue RBS::ParsingError
-      puts "```rbs"
-      puts rbs
-      puts "```"
+      Orthoses.logger.error "```rbs\n#{rbs}```"
       raise
     end
   end

data/lib/orthoses/delegate_class.rb

@@ -29,17 +29,23 @@ module Orthoses
           next unless subclass_name
           delegate_to_class_name = Utils.module_name(delegate_to_class)
           next unless delegate_to_class_name
-          store[subclass_name].header = "class #{subclass_name} < #{delegate_to_class_name}"
+          next unless store[subclass_name].header.nil?
+
+          header = "class #{subclass_name} < ::#{delegate_to_class_name}#{temporary_type_params(delegate_to_class_name)}"
+          store[subclass_name].header = header
         end
       end
       store
     end
 
-    def from_DelegateClass?(klass)
-      klass.name.nil? &&
-        klass.superclass == Delegator &&
-        klass.instance_methods.include?(:__setobj__) &&
-        klass.instance_method(:__setobj__).source_location.first.end_with?("delegate.rb")
+    def temporary_type_params(name)
+      Utils.known_type_params(name)&.then do |params|
+        if params.empty?
+          nil
+        else
+          "[#{params.map { :untyped }.join(', ')}]"
+        end
+      end
     end
   end
 end

data/lib/orthoses/{include_extend_prepend.rb → mixin.rb}

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Orthoses
-  class IncludeExtendPrepend
+  class Mixin
     def initialize(loader, if: nil)
       @loader = loader
       @if = binding.local_variable_get(:if)

data/lib/orthoses/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Orthoses
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

data/lib/orthoses.rb

@@ -10,7 +10,7 @@ require_relative 'orthoses/content'
 require_relative 'orthoses/create_file_by_name'
 require_relative 'orthoses/delegate_class'
 require_relative 'orthoses/filter'
-require_relative 'orthoses/include_extend_prepend'
+require_relative 'orthoses/mixin'
 require_relative 'orthoses/load_rbs'
 require_relative 'orthoses/object_space_all'
 require_relative 'orthoses/pp'

data/sig/orthoses/content/duplication_checker.rbs

@@ -0,0 +1,4 @@
+# THIS IS GENERATED CODE from `$ rake generate_self_sig`
+
+class Orthoses::Content::DuplicationChecker
+end

data/sig/orthoses/{include_extend_prepend.rbs → mixin.rbs}

@@ -1,4 +1,4 @@
 # THIS IS GENERATED CODE from `$ rake generate_self_sig`
 
-class Orthoses::IncludeExtendPrepend
+class Orthoses::Mixin
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: orthoses
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - ksss
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-05-08 00:00:00.000000000 Z
+date: 2022-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rbs
@@ -40,11 +40,12 @@ files:
 - lib/orthoses/call_tracer.rb
 - lib/orthoses/constant.rb
 - lib/orthoses/content.rb
+- lib/orthoses/content/duplication_checker.rb
 - lib/orthoses/create_file_by_name.rb
 - lib/orthoses/delegate_class.rb
 - lib/orthoses/filter.rb
-- lib/orthoses/include_extend_prepend.rb
 - lib/orthoses/load_rbs.rb
+- lib/orthoses/mixin.rb
 - lib/orthoses/object_space_all.rb
 - lib/orthoses/pp.rb
 - lib/orthoses/store.rb
@@ -62,11 +63,12 @@ files:
 - sig/orthoses/const_load_error.rbs
 - sig/orthoses/constant.rbs
 - sig/orthoses/content.rbs
+- sig/orthoses/content/duplication_checker.rbs
 - sig/orthoses/create_file_by_name.rbs
 - sig/orthoses/delegate_class.rbs
 - sig/orthoses/filter.rbs
-- sig/orthoses/include_extend_prepend.rbs
 - sig/orthoses/load_rbs.rbs
+- sig/orthoses/mixin.rbs
 - sig/orthoses/name_space_error.rbs
 - sig/orthoses/object_space_all.rbs
 - sig/orthoses/pp.rbs