orthoses 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0e53d784825b1c759916988c4aaca8e6942fd89e0de4c73dff022f40ca265027
-  data.tar.gz: 7e6fdb9ac599274b713a9930d15bb8b81267c3afcc4a7ed3a6c747a13c711201
+  metadata.gz: db149183688863139dfc513f92a150464497d1df409c495377817b4d3671db00
+  data.tar.gz: a02eb903127a7f6daf17750b9263ffee63a880b381ccfc47e76aa82e52252af3
 SHA512:
-  metadata.gz: 61b9855a1f2744de78e9993d4adb024133aa08eeefa4541f9371bbb9598c500b8e4af2618ff9904039bbb086a2fde61b714c6ae20bc466077b1b46601f9d6735
-  data.tar.gz: 6a2eaea1e8da4d1231dbcf4ebb4b4b92e228a03656a89385a439ff651b5dc204a9fb5071e8fb11a0fec35e95e85e6e1c332cc341ecb72302bd3d2623e3779585
+  metadata.gz: 0ada92bd790f9ff1fd4b4e1293c1d4dad77c08c3c2e39f4513655ce910db7239e2a9e34373395e5abb4025d341c3596ef48b5dd46c05312cf6e2e8ec92152558
+  data.tar.gz: cb126e961ab83cc8ce683aa852279bac3a8cd166d73cd9f28f9e13cb482f8949d4b2f48928d617c2e4804b558160aea2feb6b91e66d91bfc0de86822869ba030

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    orthoses (0.4.0)
+    orthoses (0.5.0)
       rbs (~> 2.0)
 
 GEM

data/examples/minitest/Rakefile

@@ -22,10 +22,12 @@ task :minitest => :src do
         !Orthoses::Utils.rbs_defined_const?("#{current}::#{const}")
       }
     use Orthoses::Mixin
+    use Orthoses::Attribute
     use Orthoses::RBSPrototypeRB,
       paths: Dir.glob('src/lib/minitest{.rb,/*.rb}'),
       constant_filter: ->(_) { false },
-      mixin_filter: ->(_) { false }
+      mixin_filter: ->(_) { false },
+      attribute_filter: ->(_) { false }
     run ->(){
       require_relative 'src/lib/minitest'
       require_relative 'src/lib/minitest/test'
@@ -43,6 +45,12 @@ task :minitest => :src do
     dependencies:
       - name: mutex_m
   YAML
+  tmp = out.join("kernel.rbs").read
+  out.join("kernel.rbs").open("w") do |f|
+    f.puts "%a{annotate:rdoc:skip}"
+    f.write tmp
+  end
+  sh "rbs annotate --gems out"
 end
 
 task default: :minitest

data/lib/orthoses/attribute.rb

@@ -0,0 +1,98 @@
+module Orthoses
+  class Attribute
+    module Hook
+      def attr(*names)
+        super
+      end
+
+      def attr_accessor(*names)
+        super
+      end
+
+      def attr_reader(*names)
+        super
+      end
+
+      def attr_writer(*names)
+        super
+      end
+    end
+
+    def initialize(loader)
+      @loader = loader
+    end
+
+    def call
+      Module.prepend(Hook)
+
+      attr = CallTracer.new
+      attr_accessor = CallTracer.new
+      attr_reader = CallTracer.new
+      attr_writer = CallTracer.new
+
+      store = attr.trace(Hook.method(:attr)) do
+        attr_accessor.trace(Hook.method(:attr_accessor)) do
+          attr_reader.trace(Hook.method(:attr_reader)) do
+            attr_writer.trace(Hook.method(:attr_writer)) do
+              @loader.call
+            end
+          end
+        end
+      end
+
+      store["Module"].body.delete("prepend Orthoses::Attribute::Hook")
+
+      attr.result.each do |method, argument|
+        m = method.receiver.to_s.match(/#<Class:([\w:]+)>/)
+        if m && m[1]
+          receiver_name = m[1]
+          prefix = "self."
+        else
+          receiver_name = Utils.module_name(method.receiver) or next
+          prefix = nil
+        end
+        content = store[receiver_name]
+        if argument[:names][1].equal?(true)
+          content << "attr_accessor #{prefix}#{argument[:names][0]}: untyped"
+        elsif argument[:names][1].equal?(false)
+          content << "attr_reader #{prefix}#{argument[:names][0]}: untyped"
+        else
+          argument[:names].each do |name|
+            content << "attr_reader #{prefix}#{name}: untyped"
+          end
+        end
+      end
+
+      each_definition(attr_accessor) do |receiver_name, name|
+        store[receiver_name] << "attr_accessor #{name}: untyped"
+      end
+      each_definition(attr_reader) do |receiver_name, name|
+        store[receiver_name] << "attr_reader #{name}: untyped"
+      end
+      each_definition(attr_writer) do |receiver_name, name|
+        store[receiver_name] << "attr_writer #{name}: untyped"
+      end
+
+      store
+    end
+
+    private
+
+    def each_definition(call_tracer)
+      call_tracer.result.each do |method, argument|
+        m = method.receiver.to_s.match(/#<Class:([\w:]+)>/)
+        if m && m[1]
+          receiver_name = m[1]
+          argument[:names].each do |name|
+            yield [receiver_name, "self.#{name}"]
+          end
+        else
+          receiver_name = Utils.module_name(method.receiver) or next
+          argument[:names].each do |name|
+            yield [receiver_name, name]
+          end
+        end
+      end
+    end
+  end
+end

data/lib/orthoses/builder.rb

@@ -27,6 +27,7 @@ module Orthoses
     end
 
     def use(middleware, *args, **key, &block)
+      Orthoses.logger.debug("use #{middleware}")
       @use << proc do |loader|
         middleware.new(loader, *args, **key, &block).tap do |m|
           m.extend CallLogable

data/lib/orthoses/content/duplication_checker.rb

@@ -8,16 +8,16 @@ module Orthoses
 
       def update_decl
         uniq_map = {}
-        @decl.members.reverse_each do |member|
+        @decl.members.each do |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
+          drop_member = uniq_map[key]
+          uniq_map[key] = member
+          if drop_member
+            Orthoses.logger.warn("#{@decl.name}::#{drop_member} was droped since duplication")
           end
         end
         drop_known_method_definition(uniq_map)
-        @decl.members.replace(uniq_map.values.reverse)
+        @decl.members.replace(uniq_map.values)
       end
 
       private
@@ -26,11 +26,8 @@ module Orthoses
         env = Utils.rbs_environment(collection: true)
         if m_entry = env.class_decls[@decl.name.absolute!]
           m_entry.decls.each do |d|
-            d.decl.members.each do |member|
-              case member
-              when RBS::AST::Members::MethodDefinition, RBS::AST::Members::Alias
-                uniq_map.delete(member_key(member))
-              end
+            d.decl.members.grep_v(RBS::AST::Members::LocationOnly).each do |member|
+              uniq_map.delete(member_key(member))
             end
           end
         end
@@ -51,6 +48,13 @@ module Orthoses
           [member.class]
         when RBS::AST::Members::Alias
           [RBS::AST::Members::MethodDefinition, member.new_name, member.kind]
+        when RBS::AST::Members::AttrAccessor
+          # FIXME: how to check "#{member.name}=" ?
+          [RBS::AST::Members::MethodDefinition, member.name, member.kind]
+        when RBS::AST::Members::AttrReader
+          [RBS::AST::Members::MethodDefinition, member.name, member.kind]
+        when RBS::AST::Members::AttrWriter
+          [RBS::AST::Members::MethodDefinition, "#{member.name}=", member.kind]
         else
           [member.class, member.name]
         end

data/lib/orthoses/content/environment.rb

@@ -1,18 +1,31 @@
 module Orthoses
   class Content
     class Environment
-      def initialize(constant_filter: nil, mixin_filter: nil)
+      class << self
+        def load_from_paths(paths)
+          new.tap do |env|
+            paths.each do |path|
+              Orthoses.logger.debug("Load #{path}")
+              buffer = RBS::Buffer.new(name: path.to_s, content: File.read(path.to_s, encoding: "UTF-8"))
+              RBS::Parser.parse_signature(buffer).each do |decl|
+                env << decl
+              end
+            end
+          end
+        end
+      end
+
+      def initialize(constant_filter: nil, mixin_filter: nil, attribute_filter: nil)
         @load_env = RBS::Environment.new
-        @known_env = Utils.rbs_environment(collection: true)
+        @known_env = Utils.rbs_environment(collection: true, cache: false)
         @constant_filter = constant_filter
         @mixin_filter = mixin_filter
+        @attribute_filter = attribute_filter
       end
 
       def <<(decl)
-        if known_class_entry = @known_env.class_decls[decl.name.absolute!]
-          decl.type_params.replace(known_class_entry.primary.decl.type_params)
-        end
         @load_env << decl
+        @known_env << decl
       rescue RBS::DuplicatedDeclarationError => err
         Orthoses.logger.warn(err.inspect)
       end
@@ -20,13 +33,15 @@ module Orthoses
       def write_to(store:)
         each do |add_content|
           content = store[add_content.name]
-          content.header ||= add_content.header
+          content.header = add_content.header
           content.concat(add_content.body)
         end
       end
 
       def each
-        header_builder = HeaderBuilder.new(env: @load_env)
+        avoid_generic_parameter_mismatch_error
+
+        header_builder = HeaderBuilder.new(env: @known_env)
 
         @load_env.class_decls.each do |type_name, m_entry|
           name = type_name.relative!.to_s
@@ -49,6 +64,23 @@ module Orthoses
         end
       end
 
+      private
+
+      # Avoid `RBS::GenericParameterMismatchError` from like rbs_prototype_rb
+      #     class Array # <= RBS::GenericParameterMismatchError
+      #     end
+      def avoid_generic_parameter_mismatch_error
+        @known_env.class_decls.each do |type_name, m_entry|
+          tmp_primary_d = m_entry.decls.find { |d| !d.decl.type_params.empty? }
+          next unless tmp_primary_d
+          m_entry.decls.each do |d|
+            if d.decl.type_params.empty?
+              d.decl.type_params.replace(tmp_primary_d.decl.type_params)
+            end
+          end
+        end
+      end
+
       def decls_to_lines(decls)
         out = StringIO.new
         writer = RBS::Writer.new(out: out)
@@ -61,6 +93,8 @@ module Orthoses
               next unless @constant_filter.nil? || @constant_filter.call(member)
             when RBS::AST::Members::Mixin
               next unless @mixin_filter.nil? || @mixin_filter.call(member)
+            when RBS::AST::Members::Attribute
+              next unless @attribute_filter.nil? || @attribute_filter.call(member)
             end
             writer.write_member(member)
           end

data/lib/orthoses/content/header_builder.rb

@@ -48,10 +48,11 @@ module Orthoses
         context = primary.outer.length.times.map do |i|
           primary.outer[0, i + 1].map(&:name).inject(:+).to_namespace.absolute!
         end
+        context.push(RBS::Namespace.root)
 
         super_class_name = @resolver.resolve(primary.decl.super_class.name, context: context) || primary.decl.super_class.name
         if primary.decl.super_class.args.empty?
-          if super_class_entry = @env.class_decls[super_class_name.absolute!]
+          if super_class_entry = @env.class_decls[super_class_name]
             super_primary = super_class_entry.primary
             " < #{name_and_args(super_class_name, super_primary.decl.type_params.map { :untyped })}"
           else

data/lib/orthoses/load_rbs.rb

@@ -11,14 +11,7 @@ module Orthoses
 
     def call
       @loader.call.tap do |store|
-        env = Content::Environment.new
-        @paths.each do |path|
-          Orthoses.logger.debug("Load #{path}")
-          buffer = RBS::Buffer.new(name: path.to_s, content: File.read(path.to_s, encoding: "UTF-8"))
-          RBS::Parser.parse_signature(buffer).each do |decl|
-            env << decl
-          end
-        end
+        env = Content::Environment.load_from_paths(@paths)
         env.write_to(store: store)
       end
     end

data/lib/orthoses/rbs_prototype_rb.rb

@@ -3,11 +3,12 @@ module Orthoses
   #     use Orthoses::RBSPrototypeRB,
   #       paths: Dir.glob("lib/**/*.rb")
   class RBSPrototypeRB
-    def initialize(loader, paths:, constant_filter: nil, mixin_filter: nil)
+    def initialize(loader, paths:, constant_filter: nil, mixin_filter: nil, attribute_filter: nil)
       @loader = loader
       @paths = paths
       @constant_filter = constant_filter
       @mixin_filter = mixin_filter
+      @attribute_filter = attribute_filter
     end
 
     def call
@@ -24,6 +25,7 @@ module Orthoses
         env = Orthoses::Content::Environment.new(
           constant_filter: @constant_filter,
           mixin_filter: @mixin_filter,
+          attribute_filter: @attribute_filter,
         )
         parser.decls.each do |decl|
           env << decl

data/lib/orthoses/utils.rb

@@ -46,9 +46,9 @@ module Orthoses
       RBS::Namespace.parse(name).to_type_name
     end
 
-    def self.rbs_environment(library: nil, collection: false)
+    def self.rbs_environment(library: nil, collection: false, cache: true)
       @env_cache ||= {}
-      if hit = @env_cache[[library, collection]]
+      if cache && hit = @env_cache[[library, collection]]
         return hit
       end
 
@@ -71,8 +71,9 @@ module Orthoses
         end
       end
 
-      environment = RBS::Environment.from_loader(loader).resolve_type_names
-      @env_cache[[library, collection]] = environment
+      RBS::Environment.from_loader(loader).resolve_type_names.tap do |env|
+        @env_cache[[library, collection]] = env if cache
+      end
     end
 
     def self.object_to_rbs(object, strict:)
@@ -121,6 +122,9 @@ module Orthoses
             "Hash[#{keys.join(' | ')}, #{values.join(' | ')}]"
           end
         end
+      when Range
+        type = object_to_rbs(object.begin || object.end, strict: false)
+        "Range[#{type}]"
       when ARGF
         # see also https://github.com/ruby/rbs/pull/975
         'untyped'

data/lib/orthoses/version.rb

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

data/lib/orthoses.rb

@@ -3,6 +3,7 @@
 require 'rbs'
 require 'pathname'
 
+require_relative 'orthoses/attribute'
 require_relative 'orthoses/avoid_recursive_ancestor_error'
 require_relative 'orthoses/builder'
 require_relative 'orthoses/call_tracer'

data/sig/orthoses/attribute/hook.rbs

@@ -0,0 +1,4 @@
+# THIS IS GENERATED CODE from `$ rake generate_self_sig`
+
+module Orthoses::Attribute::Hook
+end

data/sig/orthoses/attribute.rbs

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

data/sig/orthoses/const_load_error.rbs

@@ -1,6 +1,6 @@
 # THIS IS GENERATED CODE from `$ rake generate_self_sig`
 
-class Orthoses::ConstLoadError < StandardError
+class Orthoses::ConstLoadError < ::StandardError
   attr_reader root: Module
   attr_reader const: Symbol
   attr_reader error: untyped

data/sig/orthoses/content/header_builder.rbs

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

data/sig/orthoses/name_space_error.rbs

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

data/sig/orthoses/utils.rbs

@@ -1,8 +1,6 @@
 # THIS IS GENERATED CODE from `$ rake generate_self_sig`
 
 module Orthoses::Utils
-  UNBOUND_NAME_METHOD: UnboundMethod
-
   def self.unautoload!: () -> void
 
   def self.each_const_recursive: (Module root, ?cache: Hash[untyped, true], ?on_error: ^(Orthoses::ConstLoadError) -> void?) ?{ (Module, Symbol, untyped) -> void } -> void
@@ -24,4 +22,6 @@ module Orthoses::Utils
   def self.known_type_params: (Module | String) -> Array[RBS::AST::TypeParam]
 
   def self.new_store: () -> Orthoses::store
+
+  UNBOUND_NAME_METHOD: UnboundMethod
 end

data/sig/orthoses.rbs

@@ -1,9 +1,9 @@
 # THIS IS GENERATED CODE from `$ rake generate_self_sig`
 
 module Orthoses
-  VERSION: String
-
   attr_accessor self.logger: ::Logger
 
   type store = Hash[String, Orthoses::Content]
+
+  VERSION: "0.4.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: orthoses
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - ksss
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-05-23 00:00:00.000000000 Z
+date: 2022-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rbs
@@ -40,6 +40,7 @@ files:
 - examples/simple_middleware.rb
 - examples/simple_middleware.rbs
 - lib/orthoses.rb
+- lib/orthoses/attribute.rb
 - lib/orthoses/avoid_recursive_ancestor_error.rb
 - lib/orthoses/builder.rb
 - lib/orthoses/call_tracer.rb
@@ -66,6 +67,8 @@ files:
 - sig/orthoses.rbs
 - sig/orthoses/_call.rbs
 - sig/orthoses/_middle_ware.rbs
+- sig/orthoses/attribute.rbs
+- sig/orthoses/attribute/hook.rbs
 - sig/orthoses/avoid_recursive_ancestor_error.rbs
 - sig/orthoses/builder.rbs
 - sig/orthoses/builder/call_logable.rbs
@@ -75,6 +78,7 @@ files:
 - sig/orthoses/content.rbs
 - sig/orthoses/content/duplication_checker.rbs
 - sig/orthoses/content/environment.rbs
+- sig/orthoses/content/header_builder.rbs
 - sig/orthoses/create_file_by_name.rbs
 - sig/orthoses/delegate_class.rbs
 - sig/orthoses/filter.rbs