orthoses 1.20.0 → 1.20.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f3191a7b9ea732c52cbdcab6eb33dbee32226ddf1925fb4544bfb007f7a8d89a
-  data.tar.gz: 20194fdf983090f7aa1e1bb45931679d0297ac7c4b322022fdf3734c626012bb
+  metadata.gz: 4afc081ffb25e92f7bc87870c966ba41ed2d148ecf545f66630568d796383b5d
+  data.tar.gz: d374c8117a5b795ef7c60f8096e97b610b76ea61c108f5b1695be571020b973c
 SHA512:
-  metadata.gz: e88b8032acd8a05caa7061b115c443d0128285919573ecd511cb180f2f3ae7099887095135597512106536f005a5a7e633b6a8fa66ce5b99f91e46820b7fe3b8
-  data.tar.gz: 5ea08ec94757c04b17658eee9aef976cd40f5dbc7174e3f30e399e053caa2c3f5f44db6ade7a079d13a86c3b7e9c9345a7d139ac627656ec27a9cd6b5bc17937
+  metadata.gz: 0e7514a41e28c172c32bfe54859ed43ddc389bc345087ed1f18a963c1975fb595c3378ecc8ca614d1c4ee406b10a0072fab0f0a81a2e534541b614ada07cff11
+  data.tar.gz: 9f173a3a93eb3e38aeac71f456fe0c20cf2cf5f8bd8daa360f1e5df496162c1796d647de8c3ab2217bb55d2235813bf8aff453f1f7d2050252cc8fbc6d85e6cb

data/lib/orthoses/outputable/resolve_type_names.rb

@@ -31,6 +31,7 @@ module Orthoses
             writer = RBS::Writer.new(out: out)
             type_name = RBS::TypeName.parse(content.name).absolute!
             entry, members = entry_and_members(env, type_name)
+            raise "Cannot fetch entry for #{type_name}" unless entry && members
             content.header = content_header(entry)
             members.each do |member|
               writer.write_member(member)
@@ -44,19 +45,11 @@ module Orthoses
 
       def entry_and_members(env, type_name)
         if type_name.class?
-          env.class_decls[type_name]&.then do |entry|
-            [entry, entry.decls.flat_map { |decl| decl.decl.members }]
-          end
+          entry = env.class_decls[type_name] or return
+          [entry, entry.decls.flat_map { |decl| decl.decl.members }]
         elsif type_name.interface?
-          env.interface_decls[type_name]&.then do |entry|
-            [entry, [entry.decl.members]]
-          end
-        end.then do |entry, members|
-          unless entry
-            Orthoses.logger.warn "No entry for #{type_name}"
-            return
-          end
-          [entry, members]
+          entry = env.interface_decls[type_name] or return
+          [entry, entry.decl.members]
         end
       end
 
@@ -93,12 +86,10 @@ module Orthoses
 
       module WriterCopy
         def name_and_args(name, args)
-          if name && args
-            if args.empty?
-              "#{name}"
-            else
-              "#{name}[#{args.join(", ")}]"
-            end
+          if args.empty?
+            "#{name}"
+          else
+            "#{name}[#{args.join(", ")}]"
           end
         end
 

data/lib/orthoses/version.rb

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

data/sig/orthoses/outputable.rbs

@@ -28,20 +28,22 @@ class Orthoses::Outputable::ConstantizableFilter
 end
 
 class Orthoses::Outputable::ResolveTypeNames
-  @loader: untyped
-  def initialize: (untyped loader) -> void
-  def call: () -> untyped
-  private def entry_and_members: (untyped env, untyped type_name) -> untyped
-  private def content_header: (untyped entry) -> untyped
-  private def class_header: (untyped decl) -> ::String
-  private def module_header: (untyped decl) -> ::String
-  private def interface_header: (untyped decl) -> ::String
+  @loader: Orthoses::_Call
+  def initialize: (Orthoses::_Call loader) -> void
+  def call: () -> Orthoses::store
+  private def entry_and_members: (RBS::Environment, RBS::TypeName) -> ([ RBS::Environment::ModuleEntry | RBS::Environment::ClassEntry, ::Array[::RBS::AST::Members::t | ::RBS::AST::Declarations::t] ] | [ RBS::Environment::InterfaceEntry, ::Array[::RBS::AST::Declarations::Interface::member] ] | nil)
+  private def content_header: (entry) -> String
+  private def class_header: (::RBS::AST::Declarations::Class) -> String
+  private def module_header: (::RBS::AST::Declarations::Module) -> String
+  private def interface_header: (::RBS::AST::Declarations::Interface) -> String
+  type entry = RBS::Environment::ModuleEntry | RBS::Environment::ClassEntry | RBS::Environment::InterfaceEntry
+  include WriterCopy
 end
 
 module Orthoses::Outputable::ResolveTypeNames::WriterCopy
-  def name_and_args: (untyped name, untyped args) -> (::String | nil)
+  def name_and_args: (::RBS::TypeName, ::Array[::RBS::Types::t]) -> String
 
-  def name_and_params: (untyped name, untyped params) -> ::String
+  def name_and_params: (::RBS::TypeName, ::Array[::RBS::AST::TypeParam]) -> String
 end
 
 # UniqContentBody is an internal middleware

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: orthoses
 version: !ruby/object:Gem::Version
-  version: 1.20.0
+  version: 1.20.1
 platform: ruby
 authors:
 - ksss
 bindir: exe
 cert_chain: []
-date: 2025-04-01 00:00:00.000000000 Z
+date: 2025-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rbs