orthoses 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0520f0eccc23c9e57186592193f7c30175b59aa1364bcf5de49f1bcbff0a68d5
-  data.tar.gz: deaeb9dd3baed337b22a0b6990bbddd98df1c282c1dc6269edeb3a78060abae1
+  metadata.gz: 758b4661d8c0df218aa722a78505efee6dec692b601aad81e660c86444389f5e
+  data.tar.gz: bcfbe10b12f0d3ef2444a7461d2a5004410b89b8d88ef3c100fb6e88f3325e6d
 SHA512:
-  metadata.gz: 94037bb0ff51e74b055e8282048d818ca051a102fdcdb16f64dc00c1a83194bcd4a721d68c9dbf43e47a691b66ef7b992b319a69fff4b0afc9374cdf8001d0a2
-  data.tar.gz: 27611b811fead68b26ccd941d5111039ad7fddb0fdaad6d0509bf9b5d6bdfc29783daab517a959389a95890eba75ce57b5933a9c26158f17b3a2d8d0ab2948ff
+  metadata.gz: 3b8813677299e76fe253d87e0ab8460ba596c0c6805225767525c60c7f9845bc62cdd9e4f491cb8a2a6197ae473deacd15e78ce29f209305e7e3b1a86a391661
+  data.tar.gz: b3979ddfbc4f209ce221c2e93e0a80c7d7120d0ef541d6f0061777db7f30b290170fae324aa3d3c4e6d99fbbd37c96a166473aefcc10b404647a5b4bfa0250f3

data/Gemfile.lock

@@ -1,13 +1,13 @@
 PATH
   remote: .
   specs:
-    orthoses (1.2.0)
+    orthoses (1.3.0)
       rbs (~> 2.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (7.0.3.1)
+    activesupport (7.0.4)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
@@ -17,7 +17,7 @@ GEM
     ffi (1.15.5)
     i18n (1.12.0)
       concurrent-ruby (~> 1.0)
-    language_server-protocol (3.17.0.0)
+    language_server-protocol (3.17.0.1)
     listen (3.7.1)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
@@ -27,25 +27,27 @@ GEM
       ast (~> 2.4.1)
     rainbow (3.1.1)
     rake (13.0.6)
-    rb-fsevent (0.11.1)
+    rb-fsevent (0.11.2)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
-    rbs (2.6.0)
+    rbs (2.7.0)
     rgot (1.1.0)
-    steep (1.1.1)
+    securerandom (0.2.0)
+    steep (1.2.0)
       activesupport (>= 5.1)
       language_server-protocol (>= 3.15, < 4.0)
       listen (~> 3.0)
       parallel (>= 1.0.0)
       parser (>= 3.1)
       rainbow (>= 2.2.2, < 4.0)
-      rbs (>= 2.3.2)
+      rbs (>= 2.7.0)
+      securerandom (>= 0.1)
       terminal-table (>= 2, < 4)
     terminal-table (3.0.2)
       unicode-display_width (>= 1.1.1, < 3)
     tzinfo (2.0.5)
       concurrent-ruby (~> 1.0)
-    unicode-display_width (2.2.0)
+    unicode-display_width (2.3.0)
 
 PLATFORMS
   ruby

data/lib/orthoses/content.rb

@@ -27,13 +27,16 @@ module Orthoses
       @body = []
       @header = nil
       @comment = nil
+      @uniq = false
     end
 
     def <<(line)
+      @uniq = false
       @body << line
     end
 
     def concat(other)
+      @uniq = false
       @body.concat(other)
     end
 
@@ -41,7 +44,12 @@ module Orthoses
       @body.empty?
     end
 
+    def interface?
+      @name.split('::').last.start_with?('_')
+    end
+
     def delete(val)
+      @uniq = false
       @body.delete(val)
     end
 
@@ -107,7 +115,10 @@ module Orthoses
       end
       parsed_decl = parsed_decls.first or raise
       parsed_decl.tap do |decl|
-        DuplicationChecker.new(decl).update_decl
+        if !@uniq
+          DuplicationChecker.new(decl).update_decl
+          @uniq = true
+        end
       end
     rescue RBS::ParsingError
       Orthoses.logger.error "```rbs\n#{original_rbs}```"
@@ -123,7 +134,7 @@ module Orthoses
 
       return unless @header.nil?
 
-      if name.split('::').last.start_with?('_')
+      if interface?
         self.header = "interface #{name}"
         return
       end

data/lib/orthoses/create_file_by_name.rb

@@ -28,7 +28,7 @@ module Orthoses
             out.puts @header
             out.puts
           end
-          out.puts content.original_rbs
+          out.puts content.to_rbs
         end
         Orthoses.logger.info("Generate file to #{file_path.to_s}")
       end

data/lib/orthoses/outputable/constantizable_filter.rb

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+module Orthoses
+  module Outputable
+    # Constantizable is an internal middleware
+    # It's using on orthoses/outputable.rb
+    class ConstantizableFilter
+      def initialize(loader)
+        @loader = loader
+      end
+
+      def call
+        @loader.call.tap do |store|
+          failures = []
+          store.each do |name, content|
+            next if content.header
+            next if content.interface?
+
+            begin
+              Object.const_get(name)
+            rescue NameError, LoadError => err
+              Orthoses.logger.error(err.inspect)
+              failures << name
+              next
+            end
+          end
+          failures.each { |name| store.delete(name) }
+        end
+      end
+    end
+  end
+end

data/lib/orthoses/outputable/uniq_content_body.rb

@@ -12,12 +12,7 @@ module Orthoses
       def call
         @loader.call.tap do |store|
           store.each do |name, content|
-            begin
-              content.uniq!
-            rescue NameError, LoadError => err
-              Orthoses.logger.error(err.inspect)
-              next
-            end
+            content.uniq!
           end
         end
       end

data/lib/orthoses/outputable.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'orthoses/outputable/avoid_recursive_ancestor_error'
+require 'orthoses/outputable/constantizable_filter'
 require 'orthoses/outputable/uniq_content_body'
 
 module Orthoses
@@ -16,6 +17,7 @@ module Orthoses
   module Outputable
     def call
       @loader = AvoidRecursiveAncestorError.new(@loader)
+      @loader = ConstantizableFilter.new(@loader)
       @loader = UniqContentBody.new(@loader)
       super
     end

data/lib/orthoses/version.rb

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

data/sig/orthoses/attribute/hook.rbs

@@ -2,7 +2,10 @@
 
 module Orthoses::Attribute::Hook
   def attr: (*untyped names) -> untyped
+
   def attr_accessor: (*untyped names) -> untyped
+
   def attr_reader: (*untyped names) -> untyped
+
   def attr_writer: (*untyped names) -> untyped
 end

data/sig/orthoses/call_tracer/capturable.rbs

@@ -2,6 +2,8 @@
 
 module Orthoses::CallTracer::Capturable
   def build_capture: (untyped tp) -> untyped
+
   private def build_method: (untyped tp) -> untyped
+
   private def build_argument: (untyped tp) -> untyped
 end

data/sig/orthoses/content.rbs

@@ -5,6 +5,7 @@ class Orthoses::Content
   def <<: (String) -> void
   def concat: (Array[String]) -> void
   def empty?: () -> untyped
+  def interface?: () -> untyped
   def delete: (untyped val) -> untyped
   def to_rbs: () -> String
   def to_decl: () -> untyped

data/sig/orthoses/mixin/hook.rbs

@@ -2,6 +2,8 @@
 
 module Orthoses::Mixin::Hook
   def include: (*untyped modules) -> untyped
+
   def extend: (*untyped modules) -> untyped
+
   def prepend: (*untyped modules) -> untyped
 end

data/sig/orthoses/outputable/constantizable_filter.rbs

@@ -0,0 +1,6 @@
+# THIS IS GENERATED CODE from `$ rake generate_self_sig`
+
+class Orthoses::Outputable::ConstantizableFilter
+  def initialize: (untyped loader) -> void
+  def call: () -> untyped
+end

data/sig/orthoses/utils.rbs

@@ -2,16 +2,28 @@
 
 module Orthoses::Utils
   def self.unautoload!: () -> untyped
+
   def self.each_const_recursive: (Module root, ?cache: Hash[untyped, true], ?on_error: ^(Orthoses::ConstLoadError) -> void) ?{ (Module, Symbol, untyped) -> void } -> void
+
   def self.rbs_defined_const?: (String name, ?library: (String | Array[String])?, ?collection: boolish) -> bool
+
   def self.rbs_defined_class?: (String name, ?library: (String | Array[String])?, ?collection: boolish) -> bool
+
   def self.rbs_type_name: (String) -> RBS::TypeName
+
   def self.rbs_environment: (?library: String | Array[String] | nil, ?collection: boolish, ?cache: boolish) -> RBS::Environment
+
   def self.object_to_rbs: (untyped object, strict: bool) -> String
+
   def self.module_name: (Module mod) -> String?
+
   def self.module_to_type_name: (Module) -> RBS::TypeName?
+
   def self.known_type_params: (Module | String) -> Array[RBS::AST::TypeParam]?
+
   def self.new_store: () -> Orthoses::store
+
   UNBOUND_NAME_METHOD: UnboundMethod
+
   attr_accessor self.rbs_collection_pathname: Pathname
 end

data/sig/orthoses.rbs

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: orthoses
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - ksss
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-10-08 00:00:00.000000000 Z
+date: 2022-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rbs
@@ -60,6 +60,7 @@ files:
 - lib/orthoses/object_space_all.rb
 - lib/orthoses/outputable.rb
 - lib/orthoses/outputable/avoid_recursive_ancestor_error.rb
+- lib/orthoses/outputable/constantizable_filter.rb
 - lib/orthoses/outputable/uniq_content_body.rb
 - lib/orthoses/path_helper.rb
 - lib/orthoses/pp.rb
@@ -105,6 +106,7 @@ files:
 - sig/orthoses/object_space_all.rbs
 - sig/orthoses/outputable.rbs
 - sig/orthoses/outputable/avoid_recursive_ancestor_error.rbs
+- sig/orthoses/outputable/constantizable_filter.rbs
 - sig/orthoses/outputable/uniq_content_body.rbs
 - sig/orthoses/path_helper.rbs
 - sig/orthoses/pp.rbs