orthoses 1.17.0 → 1.19.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e7d32af3f7ca57a532b811d511f214250dab712748f88602089d23349375c46d
-  data.tar.gz: 197966b36e96be58eb2aeea816090e2c24ebeec954175ee2d24a8cec07771b15
+  metadata.gz: 245f65c0f676602acf06354591c87ed0d5ed7cd39b997a4db2736004da99476f
+  data.tar.gz: b8f5ec5da61b79d5cc1994f94cd71c6e9da1b36679dd8aef3f6d7c5fcd88bf46
 SHA512:
-  metadata.gz: d70aeed9a896b32671d41f23c3bdba9efbb5679bd7c2c6bb0a3ead0976a26ee1a903a8b9ce1b748509efc94b6f8f1f66aea0e04a92d6efef8958b85785e81686
-  data.tar.gz: 8f186cc6a6ceeff80267d9dd6150e9d1d8cd96e5a37446314195a0b0f6adf7132356dbca50c61a275b0e16a33aac184b5969c8b39c2b49089d6998e98b491fea
+  metadata.gz: 9278d20b972e610772ca19fa849ea147564b49bacf5d0bd81854fe636be99eb2061482569b88370588424f4d3e6059ccb2530c896f8ce9bf921acfd675771153
+  data.tar.gz: 4c271a0f6a3105fe3bb9813c392d47965cb709e2c86e38db6cc9cc3be54a009210a0cdef693a3c6b6ad441b2da5546e7c4a2284d2a0a2fb8c2aee47ffb6373a3

data/README.md

@@ -189,6 +189,11 @@ If it is unknown whether it is a class or a module, it is defined as an empty mo
 You can specify that the specified RBS should not be intentionally generated.
 This is useful when you want to exclude handwritten RBS.
 
+### Orthoses::ResolveTypeNames
+
+Call `RBS::Environment#resolve_type_names` and output.
+Using this middleware improves the efficiency of loading files after they are generated.
+
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. You can also run `bin/console` for an interactive prompt that will allow you to experiment.

data/lib/orthoses/content/header_builder.rb

@@ -21,9 +21,15 @@ module Orthoses
 
       private
 
+      def resolve_full_name(entry:)
+        full_name = entry.decl.name.relative!
+        context = build_context(entry: entry)
+        @resolver.resolve(full_name, context: context) || full_name
+      end
+
       def build_module(entry:, name_hint: nil)
         primary = entry.primary
-        full_name = name_hint || primary.decl.name.relative!
+        full_name = name_hint || resolve_full_name(entry: primary).relative!
 
         self_types =
           if primary.decl.self_types.empty?
@@ -37,7 +43,7 @@ module Orthoses
 
       def build_class(entry:, name_hint: nil)
         primary = entry.primary
-        full_name = name_hint || primary.decl.name.relative!
+        full_name = name_hint || resolve_full_name(entry: primary).relative!
 
         "class #{name_and_params(full_name, primary.decl.type_params)}#{build_super_class(primary)}"
       end
@@ -60,10 +66,8 @@ module Orthoses
       end
 
       def build_interface(entry:, name_hint: nil)
-        full_name = name_hint || entry.decl.name.relative!
-        context = build_context(entry: entry)
-        resolved_name = @resolver.resolve(full_name, context: context) || full_name
-        "interface #{name_and_params(resolved_name.relative!, entry.decl.type_params)}"
+        full_name = name_hint || resolve_full_name(entry: entry).relative!
+        "interface #{name_and_params(full_name, entry.decl.type_params)}"
       end
 
       include RBS::Environment::ContextUtil

data/lib/orthoses/content.rb

@@ -86,7 +86,7 @@ module Orthoses
 
     def auto_header
       env = Utils.rbs_environment
-      if entry = env.class_decls[TypeName(name).absolute!]
+      if entry = env.class_decls[RBS::TypeName.parse(name).absolute!]
         @header = Content::HeaderBuilder.new(env: env).build(entry: entry)
         return
       end

data/lib/orthoses/create_file_by_name.rb

@@ -76,8 +76,8 @@ module Orthoses
       when Integer
         name.split('::')[0, @depth].join('::')
       when Hash
-        found_key, found_index = @depth.find do |n, _|
-          name.start_with?(n)
+        _, found_index = @depth.find do |n, _|
+          n == '*' || name.start_with?(n)
         end
         case found_index
         when nil

data/lib/orthoses/lazy_trace_point.rb

@@ -25,7 +25,7 @@ module Orthoses
               h[mod_name]&.call(self, id)
             end
           end
-        rescue TypeError => e
+        rescue TypeError
         end
         super
       end
@@ -41,7 +41,7 @@ module Orthoses
               h[mod_name]&.call(self, id)
             end
           end
-        rescue TypeError => e
+        rescue TypeError
         end
       end
     end

data/lib/orthoses/missing_name.rb

@@ -33,7 +33,7 @@ module Orthoses
         if content.header && content.header.include?("<")
           _, superclass = content.header.split(/\s*<\s*/, 2)
           superclass.sub!(/\[.*/, "")
-          new_name = TypeName(superclass).relative!.to_s
+          new_name = RBS::TypeName.parse(superclass).relative!.to_s
           recur(@store[new_name])
         end
       end
@@ -60,7 +60,7 @@ module Orthoses
       def split_name(key_name)
         ret = []
 
-        type_name = TypeName(key_name).relative!
+        type_name = RBS::TypeName.parse(key_name).relative!
         if !Utils.rbs_defined_class?(type_name.to_s) && !@store.has_key?(type_name.to_s)
           ret << type_name.to_s
         end

data/lib/orthoses/resolve_type_names.rb

@@ -0,0 +1,97 @@
+# frozen_string_literal: true
+
+module Orthoses
+  # use Orthoses::ResolveTypeNames
+  class ResolveTypeNames
+    def initialize(loader)
+      @loader = loader
+    end
+
+    def call
+      @loader.call.tap do |store|
+        env = Utils.rbs_environment(cache: false)
+
+        signatures = store.map do |name, content|
+          buffer = RBS::Buffer.new(content: content.to_rbs, name: "orthoses-resolve_type_names-#{name.downcase}.rbs")
+          decls = [content.to_decl]
+
+          # Add as known types
+          env.add_signature(buffer: buffer, directives: [], decls: decls)
+
+          # Will resolve names
+          [buffer, [[], decls]]
+        end.to_h
+
+        # Reduce resolving names
+        env.signatures.replace(signatures)
+        env = env.resolve_type_names
+
+        store.each do |name, content|
+          out = StringIO.new
+          writer = RBS::Writer.new(out: out)
+          type_name = RBS::TypeName.parse(content.name).absolute!
+          entry = env.class_decls[type_name] || raise
+          content.header = content_header(entry)
+          entry.decls.each do |decl|
+            decl.decl.members.each do |member|
+              writer.write_member(member)
+            end
+          end
+          content.body.replace(out.string.lines)
+        end
+      end
+    end
+
+    private
+
+    def content_header(entry)
+      case primary_decl = entry.primary.decl
+      when RBS::AST::Declarations::Class
+        class_header(primary_decl)
+      when RBS::AST::Declarations::Module
+        module_header(primary_decl)
+      else
+        raise "unexpected decl: #{primary_decl.class}"
+      end
+    end
+
+    def class_header(decl)
+      super_class = if super_class = decl.super_class
+        " < #{name_and_args(super_class.name, super_class.args)}"
+      end
+      "class #{name_and_params(decl.name, decl.type_params)}#{super_class}"
+    end
+
+    def module_header(decl)
+      self_type = unless decl.self_types.empty?
+        " : #{decl.self_types.join(", ")}"
+      end
+      "module #{name_and_params(decl.name, decl.type_params)}#{self_type}"
+    end
+
+    module WriterCopy
+      def name_and_args(name, args)
+        if name && args
+          if args.empty?
+            "#{name}"
+          else
+            "#{name}[#{args.join(", ")}]"
+          end
+        end
+      end
+
+      def name_and_params(name, params)
+        if params.empty?
+          "#{name}"
+        else
+          ps = params.each.map do |param|
+            param.to_s
+          end
+
+          "#{name}[#{ps.join(", ")}]"
+        end
+      end
+    end
+    include WriterCopy
+  end
+end

data/lib/orthoses/shims.rb

@@ -0,0 +1,18 @@
+# RBS 3.8
+unless RBS::TypeName.singleton_class.method_defined?(:parse)
+  module RBS
+    class TypeName
+      def self.parse(string)
+        absolute = string.start_with?("::")
+
+        *path, name = string.delete_prefix("::").split("::").map(&:to_sym)
+        raise unless name
+
+        TypeName.new(
+          name: name,
+          namespace: RBS::Namespace.new(path: path, absolute: absolute)
+        )
+      end
+    end
+  end
+end

data/lib/orthoses/utils.rb

@@ -61,12 +61,14 @@ module Orthoses
       if collection
         config_path = RBS::Collection::Config.find_config_path || RBS::Collection::Config::PATH || raise("needs rbs_collection.yaml")
         lock_path = RBS::Collection::Config.to_lockfile_path(config_path)
-        raise "needs rbs_collection.yaml file" unless lock_path.file?
-        lock = RBS::Collection::Config::Lockfile.from_lockfile(
-          lockfile_path: lock_path,
-          data: YAML.load_file(lock_path.to_s)
-        )
-        loader.add_collection(lock)
+        if lock_path.file?
+          loader.add_collection(RBS::Collection::Config::Lockfile.from_lockfile(
+            lockfile_path: lock_path,
+            data: YAML.load_file(lock_path.to_s)
+          ))
+        else
+          Orthoses.logger.debug("rbs_collection.lock.yaml not found in #{lock_path}")
+        end
       end
 
       case library
@@ -165,7 +167,7 @@ module Orthoses
     def self.module_to_type_name(mod)
       name = Utils.module_name(mod)
       if name && !name.empty?
-        TypeName(name)
+        RBS::TypeName.parse(name)
       else
         nil
       end
@@ -186,7 +188,7 @@ module Orthoses
       type_name =
         case name
         when String
-          TypeName(name).absolute!
+          RBS::TypeName.parse(name).absolute!
         when Module
           module_to_type_name(name).absolute!
         when RBS::TypeName

data/lib/orthoses/version.rb

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

data/lib/orthoses.rb

@@ -3,6 +3,7 @@
 require 'rbs'
 require 'pathname'
 require 'stringio'
+require_relative 'orthoses/shims'
 
 require 'orthoses/utils'
 
@@ -27,6 +28,7 @@ module Orthoses
   autoload :PP, 'orthoses/pp'
   autoload :RBSPrototypeRB, 'orthoses/rbs_prototype_rb'
   autoload :RBSPrototypeRuntime, 'orthoses/rbs_prototype_runtime'
+  autoload :ResolveTypeNames, 'orthoses/resolve_type_names'
   autoload :Sort, 'orthoses/sort'
   autoload :Store, 'orthoses/store'
   autoload :Tap, 'orthoses/tap'

data/sig/orthoses/content.rbs

@@ -86,6 +86,7 @@ class Orthoses::Content::HeaderBuilder
   @resolver: untyped
   def initialize: (env: untyped) -> void
   def build: (entry: untyped, ?name_hint: untyped?) -> untyped
+  private def resolve_full_name: (entry: untyped) -> untyped
   private def build_module: (entry: untyped, ?name_hint: untyped?) -> ::String
   private def build_class: (entry: untyped, ?name_hint: untyped?) -> ::String
   private def build_super_class: (untyped primary) -> (nil | untyped)

data/sig/orthoses/resolve_type_names.rbs

@@ -0,0 +1,17 @@
+# THIS IS GENERATED CODE from `$ rake sig`
+
+# use Orthoses::ResolveTypeNames
+class Orthoses::ResolveTypeNames
+  @loader: untyped
+  def initialize: (untyped loader) -> void
+  def call: () -> untyped
+  private def content_header: (untyped entry) -> untyped
+  private def class_header: (untyped decl) -> ::String
+  private def module_header: (untyped decl) -> ::String
+end
+
+module Orthoses::ResolveTypeNames::WriterCopy
+  def name_and_args: (untyped name, untyped args) -> (::String | nil)
+
+  def name_and_params: (untyped name, untyped params) -> ::String
+end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: orthoses
 version: !ruby/object:Gem::Version
-  version: 1.17.0
+  version: 1.19.0
 platform: ruby
 authors:
 - ksss
-autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-11-20 00:00:00.000000000 Z
+date: 2025-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rbs
@@ -64,6 +63,8 @@ files:
 - lib/orthoses/pp.rb
 - lib/orthoses/rbs_prototype_rb.rb
 - lib/orthoses/rbs_prototype_runtime.rb
+- lib/orthoses/resolve_type_names.rb
+- lib/orthoses/shims.rb
 - lib/orthoses/sort.rb
 - lib/orthoses/store.rb
 - lib/orthoses/tap.rb
@@ -103,6 +104,7 @@ files:
 - sig/orthoses/pp.rbs
 - sig/orthoses/rbs_prototype_rb.rbs
 - sig/orthoses/rbs_prototype_runtime.rbs
+- sig/orthoses/resolve_type_names.rbs
 - sig/orthoses/sort.rbs
 - sig/orthoses/store.rbs
 - sig/orthoses/tap.rbs
@@ -116,7 +118,6 @@ licenses:
 metadata:
   homepage_uri: https://github.com/ksss/orthoses
   source_code_uri: https://github.com/ksss/orthoses
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -131,8 +132,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.22
-signing_key:
+rubygems_version: 3.6.2
 specification_version: 4
 summary: Framework for Generate RBS
 test_files: []