typeprof 0.30.0 → 0.30.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4faf061f0c69941bd42ce81df939d3204319da2891d175ac64b0165d4d660c18
-  data.tar.gz: 4cd3d5666361cfa335f2acc398e8571b8fc38c9ff2911fb55ce394f3df8d1fc9
+  metadata.gz: 5f42086b6df655b0df5ea0e11633500c15735fc81713833c477536138de6cd70
+  data.tar.gz: 8e2c1bbd37db3e87fea65136cdbb78c31853ed0db434aeee76e9066cb15c125a
 SHA512:
-  metadata.gz: af755e8f52cc2c315cb245083b2cef95741c5ccb8dfe98f47ef41e40fd087b6e641746f797d8bfaa68097bcb5aa6f52364e5e69651e7c368da4cd951a34a068c
-  data.tar.gz: ced1fc8642f7020340caac9de194d83c0cffc01515e020f126f081a9f9262ccb6bd522927ce90583415bdfdde5e167a84783c71b907cfaff1c3fac2cd74ed7f2
+  metadata.gz: 89feb1071cf88fb006b7c04312d2ef576e940023e096b0fed10178b1b89f70301cf50f8d53343983e33760f258d96e2c9244de44bec55e1437bf0857951d4b91
+  data.tar.gz: 4f63149902b7b926df8159a1d2dc18a7472d15e07df9a441483b1e401a313c9b0ddf201ffdaa8eaccda4115bf3ae88d1ec282e8c66a11230b342275842809ba4

data/doc/doc.ja.md

@@ -131,4 +131,4 @@ Procオブジェクトは、ラムダ式（`-> { ... }`）やブロック仮引
 これらは抽象化されず、コード片と結びついた具体的な値として扱われます。
 これらに渡された引数や返された値によってRBS出力されます。
 
-TBD
+TODO: write more

data/lib/typeprof/cli/cli.rb

@@ -1,5 +1,3 @@
-require "io/console"
-
 module TypeProf::CLI
   class CLI
     def initialize(argv)
@@ -49,7 +47,7 @@ module TypeProf::CLI
 
       opt.parse!(argv)
 
-      if cli_options[:lsp] && !lsp_options.empty?
+      if !cli_options[:lsp] && !lsp_options.empty?
         raise OptionParser::InvalidOption.new("lsp options with non-lsp mode")
       end
 

data/lib/typeprof/cli.rb

@@ -1,4 +1,5 @@
 require "optparse"
 require "pathname"
+require "io/console"
 
 require_relative "cli/cli"

data/lib/typeprof/core/ast/call.rb

@@ -124,7 +124,15 @@ module TypeProf::Core
 
         a_args = ActualArguments.new(positional_args, @splat_flags, keyword_args, blk_ty)
         box = @changes.add_method_call_box(genv, recv, @mid, a_args, !@recv)
-        box.ret
+
+        if @block_body && @block_body.lenv.break_vtx
+          ret = Vertex.new(self)
+          @changes.add_edge(genv, box.ret, ret)
+          @changes.add_edge(genv, @block_body.lenv.break_vtx, ret)
+          ret
+        else
+          box.ret
+        end
       end
 
       def block_last_stmt_code_range

data/lib/typeprof/core/ast/control.rb

@@ -176,7 +176,7 @@ module TypeProf::Core
     class BreakNode < Node
       def initialize(raw_node, lenv)
         super(raw_node, lenv)
-        @arg = raw_node.arguments ? AST.create_node(raw_node.arguments.arguments.first, lenv) : nil
+        @arg = AST.parse_return_arguments(raw_node, lenv, code_range)
       end
 
       attr_reader :arg
@@ -184,8 +184,9 @@ module TypeProf::Core
       def subnodes = { arg: }
 
       def install0(genv)
-        _arg = @arg ? @arg.install(genv) : Source.new(genv.nil_type)
-        # TODO: implement!
+        arg = @arg.install(genv)
+        @changes.add_edge(genv, arg, @lenv.get_break_vtx)
+        Source.new()
       end
     end
 
@@ -365,8 +366,8 @@ module TypeProf::Core
           end
           raw_res = raw_res.subsequent
         end
-        @else_clause = raw_node.else_clause ? AST.create_node(raw_node.else_clause.statements, lenv) : DummyNilNode.new(code_range, lenv)
-        @ensure_clause = raw_node.ensure_clause ? AST.create_node(raw_node.ensure_clause.statements, lenv) : DummyNilNode.new(code_range, lenv)
+        @else_clause = raw_node.else_clause&.statements ? AST.create_node(raw_node.else_clause.statements, lenv) : DummyNilNode.new(code_range, lenv)
+        @ensure_clause = raw_node.ensure_clause&.statements ? AST.create_node(raw_node.ensure_clause.statements, lenv) : DummyNilNode.new(code_range, lenv)
       end
 
       attr_reader :body, :rescue_conds, :rescue_clauses, :else_clause, :ensure_clause

data/lib/typeprof/core/ast/method.rb

@@ -220,6 +220,10 @@ module TypeProf::Core
         rest_keywords = @rest_keywords ? @body.lenv.new_var(@rest_keywords, self) : nil
         block = @block ? @body.lenv.new_var(@block, self) : nil
 
+        if rest_positionals
+          @changes.add_edge(genv, Source.new(genv.gen_ary_type(Vertex.new(self))), rest_positionals)
+        end
+
         @opt_positional_defaults.zip(opt_positionals) do |expr, vtx|
           @changes.add_edge(genv, expr.install(genv), vtx)
         end

data/lib/typeprof/core/ast/value.rb

@@ -5,7 +5,7 @@ module TypeProf::Core
       when :string_node
         AST.create_node(raw_part, lenv)
       when :embedded_statements_node
-        AST.create_node(raw_part.statements, lenv)
+        raw_part.statements ? AST.create_node(raw_part.statements, lenv) : DummyNilNode.new(TypeProf::CodeRange.from_node(raw_part), lenv)
       when :embedded_variable_node
         AST.create_node(raw_part.variable, lenv)
       else

data/lib/typeprof/core/env.rb

@@ -282,11 +282,12 @@ module TypeProf::Core
       @cref = cref
       @locals = locals
       @return_boxes = return_boxes
+      @break_vtx = nil
       @next_boxes = []
       @filters = {}
     end
 
-    attr_reader :path, :cref, :locals, :return_boxes, :next_boxes
+    attr_reader :path, :cref, :locals, :return_boxes, :break_vtx, :next_boxes
 
     def new_var(name, node)
       @locals[name] = Vertex.new(node)
@@ -312,6 +313,11 @@ module TypeProf::Core
       @next_boxes << box
     end
 
+    def get_break_vtx
+      @break_vtx ||= Vertex.new(:break_vtx)
+    end
+
+
     def push_read_filter(name, type)
       (@filters[name] ||= []) << type
     end

data/lib/typeprof/core/graph/box.rb

@@ -485,7 +485,11 @@ module TypeProf::Core
 
         if @f_args.rest_positionals
           rest_vtxs.each do |vtx|
-            changes.add_edge(genv, vtx, @f_args.rest_positionals)
+            @f_args.rest_positionals.each_type do |ty|
+              if ty.is_a?(Type::Instance) && ty.mod == genv.mod_ary && ty.args[0]
+                changes.add_edge(genv, vtx, ty.args[0])
+              end
+            end
           end
         end
       else
@@ -519,9 +523,12 @@ module TypeProf::Core
 
         if start_rest < end_rest
           if @f_args.rest_positionals
-            f_arg = @f_args.rest_positionals
             (start_rest..end_rest-1).each do |i|
-              changes.add_edge(genv, a_args.positionals[i], f_arg)
+              @f_args.rest_positionals.each_type do |ty|
+                if ty.is_a?(Type::Instance) && ty.mod == genv.mod_ary && ty.args[0]
+                  changes.add_edge(genv, a_args.positionals[i], ty.args[0])
+                end
+              end
             end
           end
         end
@@ -569,7 +576,7 @@ module TypeProf::Core
         args << ("?" + Type.strip_parens(f_vtx.show))
       end
       if @f_args.rest_positionals
-        args << ("*" + Type.strip_parens(@f_args.rest_positionals.show))
+        args << ("*" + Type.strip_array(Type.strip_parens(@f_args.rest_positionals.show)))
       end
       @f_args.post_positionals.each do |var|
         args << Type.strip_parens(var.show)

data/lib/typeprof/core/graph/vertex.rb

@@ -42,6 +42,7 @@ module TypeProf::Core
     end
 
     def show
+      Fiber[:show_rec] ||= Set[]
       if Fiber[:show_rec].include?(self)
         "untyped"
       else
@@ -117,6 +118,7 @@ module TypeProf::Core
     end
 
     def show
+      Fiber[:show_rec] ||= Set[]
       if Fiber[:show_rec].include?(self)
         "...(recursive)..."
       else
@@ -146,6 +148,7 @@ module TypeProf::Core
       when ValueEntity
       when ActualArguments
       when Array
+      when Symbol
       else
         raise "unknown class: #{ origin.class }"
       end

data/lib/typeprof/core/service.rb

@@ -3,7 +3,8 @@ module TypeProf::Core
     def initialize(options)
       @options = options
 
-      @text_nodes = {}
+      @rb_text_nodes = {}
+      @rbs_text_nodes = {}
 
       @genv = GlobalEnv.new
       @genv.load_core_rbs(load_rbs_declarations(@options[:rbs_collection]).declarations)
@@ -26,43 +27,39 @@ module TypeProf::Core
     attr_reader :genv
 
     def reset!
-      @text_nodes.each_value do |node|
-        if node.is_a?(Array)
-          node.each {|n| n.undefine(@genv) }
-        else
-          node.undefine(@genv)
-        end
-      end
+      @rb_text_nodes.each_value {|node| node.undefine(@genv) }
+      @rbs_text_nodes.each_value {|nodes| nodes.each {|n| n.undefine(@genv) } }
       @genv.define_all
-      @text_nodes.each_value do |node|
-        if node.is_a?(Array)
-          node.each {|n| n.uninstall(@genv) }
-        else
-          node.uninstall(@genv)
-        end
-      end
+      @rb_text_nodes.each_value {|node| node.uninstall(@genv) }
+      @rbs_text_nodes.each_value {|nodes| nodes.each {|n| n.uninstall(@genv) } }
       @genv.run_all
-      @text_nodes.clear
+      @rb_text_nodes.clear
+      @rbs_text_nodes.clear
     end
 
     def add_workspace(rb_folder, rbs_folder)
-      Dir.glob(File.expand_path(rb_folder + "/**/*.rb")) do |path|
-        update_rb_file(path, nil)
+      Dir.glob(File.expand_path(rb_folder + "/**/*.{rb,rbs}")) do |path|
+        update_file(path, nil)
       end
-      Dir.glob(File.expand_path(rbs_folder + "/**/*.rbs")) do |path|
-        update_rbs_file(path, nil)
+    end
+
+    def update_file(path, code)
+      if File.extname(path) == ".rbs"
+        update_rbs_file(path, code)
+      else
+        update_rb_file(path, code)
       end
     end
 
     def update_rb_file(path, code)
-      prev_node = @text_nodes[path]
+      prev_node = @rb_text_nodes[path]
 
       code = File.read(path) unless code
       node = AST.parse_rb(path, code)
       return false unless node
 
-      node.diff(@text_nodes[path]) if prev_node
-      @text_nodes[path] = node
+      node.diff(@rb_text_nodes[path]) if prev_node
+      @rb_text_nodes[path] = node
 
       node.define(@genv)
       prev_node.undefine(@genv) if prev_node
@@ -115,7 +112,7 @@ module TypeProf::Core
     end
 
     def update_rbs_file(path, code)
-      prev_decls = @text_nodes[path]
+      prev_decls = @rbs_text_nodes[path]
 
       code = File.read(path) unless code
       begin
@@ -125,7 +122,7 @@ module TypeProf::Core
       end
 
       # TODO: diff
-      @text_nodes[path] = decls
+      @rbs_text_nodes[path] = decls
 
       decls.each {|decl| decl.define(@genv) }
       prev_decls.each {|decl| decl.undefine(@genv) } if prev_decls
@@ -139,13 +136,12 @@ module TypeProf::Core
     end
 
     def diagnostics(path, &blk)
-      node = @text_nodes[path]
-      node.diagnostics(@genv, &blk) if node
+      @rb_text_nodes[path]&.diagnostics(@genv, &blk)
     end
 
     def definitions(path, pos)
       defs = []
-      @text_nodes[path].retrieve_at(pos) do |node|
+      @rb_text_nodes[path]&.retrieve_at(pos) do |node|
         node.boxes(:cread) do |box|
           if box.const_read && box.const_read.cdef
             box.const_read.cdef.defs.each do |cdef_node|
@@ -184,7 +180,7 @@ module TypeProf::Core
     end
 
     def type_definitions(path, pos)
-      @text_nodes[path].retrieve_at(pos) do |node|
+      @rb_text_nodes[path]&.retrieve_at(pos) do |node|
         if node.ret
           ty_defs = []
           node.ret.types.map do |ty, _source|
@@ -206,7 +202,7 @@ module TypeProf::Core
     #: (String, TypeProf::CodePosition) -> Array[[String?, TypeProf::CodeRange]]?
     def references(path, pos)
       refs = []
-      @text_nodes[path].retrieve_at(pos) do |node|
+      @rb_text_nodes[path]&.retrieve_at(pos) do |node|
         case node
         when AST::DefNode
           if node.mid_code_range.include?(pos)
@@ -246,7 +242,7 @@ module TypeProf::Core
     def rename(path, pos)
       mdefs = []
       cdefs = []
-      @text_nodes[path].retrieve_at(pos) do |node|
+      @rb_text_nodes[path]&.retrieve_at(pos) do |node|
         node.boxes(:mcall) do |box|
           box.resolve(genv, nil) do |me, _ty, _mid, _orig_ty|
             next unless me
@@ -298,7 +294,7 @@ module TypeProf::Core
     end
 
     def hover(path, pos)
-      @text_nodes[path].retrieve_at(pos) do |node|
+      @rb_text_nodes[path]&.retrieve_at(pos) do |node|
         node.boxes(:mcall) do |box|
           boxes = []
           box.changes.boxes.each do |key, box|
@@ -332,7 +328,7 @@ module TypeProf::Core
 
     def code_lens(path)
       cpaths = []
-      @text_nodes[path].traverse do |event, node|
+      @rb_text_nodes[path]&.traverse do |event, node|
         if node.is_a?(AST::ModuleBaseNode)
           if node.static_cpath
             if event == :enter
@@ -356,7 +352,7 @@ module TypeProf::Core
     end
 
     def completion(path, trigger, pos)
-      @text_nodes[path].retrieve_at(pos) do |node|
+      @rb_text_nodes[path]&.retrieve_at(pos) do |node|
         if node.code_range.last == pos.right
           node.ret.types.map do |ty, _source|
             base_ty = ty.base_type(genv)
@@ -386,7 +382,7 @@ module TypeProf::Core
     def dump_declarations(path)
       stack = []
       out = []
-      @text_nodes[path].traverse do |event, node|
+      @rb_text_nodes[path]&.traverse do |event, node|
         case node
         when AST::ModuleNode
           if node.static_cpath
@@ -481,11 +477,7 @@ module TypeProf::Core
           i += 1
         end
 
-        if File.extname(file) == ".rbs"
-          res = update_rbs_file(file, File.read(file))
-        else
-          res = update_rb_file(file, File.read(file))
-        end
+        res = update_file(file, File.read(file))
 
         if res
           true

data/lib/typeprof/core/type.rb

@@ -11,6 +11,10 @@ module TypeProf::Core
       s.start_with?("(") && s.end_with?(")") ? s[1..-2] || raise : s
     end
 
+    def self.strip_array(s)
+      s.start_with?("Array[") && s.end_with?("]") ? s[6..-2] || raise : s
+    end
+
     def self.default_param_map(genv, ty)
       ty = ty.base_type(genv)
       instance_ty = ty.is_a?(Type::Instance) ? ty : Type::Instance.new(genv, ty.mod, []) # TODO: type params

data/lib/typeprof/core.rb

@@ -23,7 +23,6 @@ require_relative "core/env/type_alias_entity"
 require_relative "core/env/value_entity"
 require_relative "core/env/method"
 require_relative "core/env/static_read"
-require_relative "core/graph"
 require_relative "core/graph/change_set"
 require_relative "core/graph/vertex"
 require_relative "core/graph/filter"

data/lib/typeprof/lsp/messages.rb

@@ -28,21 +28,6 @@ module TypeProf::LSP
       @server.send_notification(method, **params)
     end
 
-    def publish_diagnostics(uri)
-      text = @server.open_texts[uri]
-      diags = []
-      if text
-        @server.core.diagnostics(text.path) do |diag|
-          diags << diag.to_lsp
-        end
-      end
-      notify(
-        "textDocument/publishDiagnostics",
-        uri: uri,
-        diagnostics: diags
-      )
-    end
-
     Classes = []
     def self.inherited(klass)
       Classes << klass
@@ -72,7 +57,7 @@ module TypeProf::LSP
     def run
       folders = @params[:workspaceFolders].map do |folder|
         folder => { uri:, }
-        TypeProf::LSP.file_uri_to_path(uri)
+        @server.uri_to_path(uri)
       end
 
       @server.add_workspaces(folders)
@@ -146,14 +131,14 @@ module TypeProf::LSP
     def run
       @params => { textDocument: { uri:, version:, text: } }
 
-      path = TypeProf::LSP.file_uri_to_path(uri)
+      path = @server.uri_to_path(uri)
       return unless @server.target_path?(path)
 
       text = Text.new(path, text, version)
       @server.open_texts[uri] = text
-      @server.core.update_rb_file(text.path, text.string)
+      @server.core.update_file(text.path, text.string)
       @server.send_request("workspace/codeLens/refresh")
-      publish_diagnostics(uri)
+      @server.publish_diagnostics(uri)
     end
   end
 
@@ -164,9 +149,9 @@ module TypeProf::LSP
       text = @server.open_texts[uri]
       return unless text
       text.apply_changes(changes, version)
-      @server.core.update_rb_file(text.path, text.string)
+      @server.core.update_file(text.path, text.string)
       @server.send_request("workspace/codeLens/refresh")
-      publish_diagnostics(uri)
+      @server.publish_diagnostics(uri)
     end
   end
 
@@ -180,7 +165,7 @@ module TypeProf::LSP
       @params => { textDocument: { uri: } }
       text = @server.open_texts.delete(uri)
       return unless text
-      @server.core.update_rb_file(text.path, nil)
+      @server.core.update_file(text.path, nil)
     end
   end
 
@@ -204,7 +189,7 @@ module TypeProf::LSP
       else
         respond(defs.map do |path, code_range|
           {
-            uri: "file://" + path,
+            uri: @server.path_to_uri(path),
             range: code_range.to_lsp,
           }
         end)
@@ -230,7 +215,7 @@ module TypeProf::LSP
       else
         respond(defs.map do |path, code_range|
           {
-            uri: "file://" + path,
+            uri: @server.path_to_uri(path),
             range: code_range.to_lsp,
           }
         end)
@@ -254,7 +239,7 @@ module TypeProf::LSP
       if callsites
         respond(callsites.map do |path, code_range|
           {
-            uri: "file://" + path,
+            uri: @server.path_to_uri(path),
             range: code_range.to_lsp,
           }
         end)
@@ -332,7 +317,7 @@ module TypeProf::LSP
       items = []
       sort = "aaaa"
       text.modify_for_completion(text, pos) do |string, trigger, pos|
-        @server.core.update_rb_file(text.path, string)
+        @server.core.update_file(text.path, string)
         pos = TypeProf::CodePosition.from_lsp(pos)
         @server.core.completion(text.path, trigger, pos) do |mid, hint|
           items << {
@@ -348,7 +333,7 @@ module TypeProf::LSP
         isIncomplete: false,
         items: items,
       )
-      @server.core.update_rb_file(text.path, text.string)
+      @server.core.update_file(text.path, text.string)
     end
   end
 
@@ -373,7 +358,7 @@ module TypeProf::LSP
       if renames
         changes = {}
         renames.each do |path, cr|
-          (changes["file://" + path] ||= []) << {
+          (changes[@server.path_to_uri(path)] ||= []) << {
             range: cr.to_lsp,
             newText: newName,
           }

data/lib/typeprof/lsp/server.rb

@@ -44,7 +44,7 @@ module TypeProf::LSP
       end
     end
 
-    def initialize(core, reader, writer)
+    def initialize(core, reader, writer, url_schema: nil, publish_all_diagnostics: false)
       @core = core
       @workspaces = {}
       @reader = reader
@@ -55,11 +55,21 @@ module TypeProf::LSP
       @open_texts = {}
       @exit = false
       @signature_enabled = true
+      @url_schema = url_schema || (File::ALT_SEPARATOR != "\\" ? "file://" : "file:///")
+      @publish_all_diagnostics = publish_all_diagnostics # TODO: implement more dedicated publish feature
     end
 
     attr_reader :core, :open_texts
     attr_accessor :signature_enabled
 
+    def path_to_uri(path)
+      @url_schema + File.expand_path(path)
+    end
+
+    def uri_to_path(url)
+      url.delete_prefix(@url_schema)
+    end
+
     def add_workspaces(folders)
       folders.each do |path|
         conf_path = File.join(path, "typeprof.conf.json")
@@ -136,6 +146,22 @@ module TypeProf::LSP
     def exit
       @exit = true
     end
+
+    def publish_diagnostics(uri)
+      (@publish_all_diagnostics ? @open_texts : [[uri, @open_texts[uri]]]).each do |uri, text|
+        diags = []
+        if text
+          @core.diagnostics(text.path) do |diag|
+            diags << diag.to_lsp
+          end
+        end
+        send_notification(
+          "textDocument/publishDiagnostics",
+          uri: uri,
+          diagnostics: diags
+        )
+      end
+    end
   end
 
   class Reader

data/lib/typeprof/lsp/util.rb

@@ -48,14 +48,4 @@ module TypeProf::LSP
 
     JSON.parse(json, **opts)
   end
-
-  FILE_URL_PREFIX = File::ALT_SEPARATOR != "\\" ? "file://" : "file:///"
-
-  def self.file_path_to_uri(path)
-    FILE_URL_PREFIX + File.expand_path(path)
-  end
-
-  def self.file_uri_to_path(url)
-    url.delete_prefix(FILE_URL_PREFIX)
-  end
 end

data/lib/typeprof/version.rb

@@ -1,3 +1,3 @@
 module TypeProf
-  VERSION = "0.30.0"
+  VERSION = "0.30.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: typeprof
 version: !ruby/object:Gem::Version
-  version: 0.30.0
+  version: 0.30.1
 platform: ruby
-original_platform: ''
 authors:
 - Yusuke Endoh
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-12-13 00:00:00.000000000 Z
+date: 2024-12-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rbs
@@ -67,7 +67,6 @@ files:
 - lib/typeprof/core/env/static_read.rb
 - lib/typeprof/core/env/type_alias_entity.rb
 - lib/typeprof/core/env/value_entity.rb
-- lib/typeprof/core/graph.rb
 - lib/typeprof/core/graph/box.rb
 - lib/typeprof/core/graph/change_set.rb
 - lib/typeprof/core/graph/filter.rb
@@ -89,6 +88,7 @@ licenses:
 metadata:
   homepage_uri: https://github.com/ruby/typeprof
   source_code_uri: https://github.com/ruby/typeprof
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -103,7 +103,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.0.dev
+rubygems_version: 3.5.22
+signing_key:
 specification_version: 4
 summary: TypeProf is a type analysis tool for Ruby code based on abstract interpretation
 test_files: []

data/lib/typeprof/core/graph.rb

@@ -1,3 +0,0 @@
-module TypeProf::Core
-  Fiber[:show_rec] = Set[]
-end