typeprof 0.11.0 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 88521dfb48f311cdb5b651e88afc2627a28040a466a22b50303415531e663cfd
-  data.tar.gz: 4bd17f9d016d6e7a60ed72804eb050a5611af0869275e63d3486700a53befaaf
+  metadata.gz: 239b17dbe8d61c729346c5dde966f6abff491951c88bc33c57c4c34cc99dc497
+  data.tar.gz: 2696c83796a6af5c498cca59a3d98b7faccaf187fe60c0057ac3f052622009ff
 SHA512:
-  metadata.gz: f88b069345f02729a09c0516baf4ff31c8aef640adf5a2c53f62f72a9fb8b96b4309993ae79e37ece4ec33972f762005b3898ca7c894cda65c3727513b812b6b
-  data.tar.gz: aa5fec1acd9dd6395d3d16e044f08e7b72fac0f41dc6168683c631fcadca33daf2415b9956ba00cd22c573c6732719fad9eeef3d601a16943d59be6986703c20
+  metadata.gz: 23a7a3313dadd2d0c63a5d83a3afd112893134a049861e6a9e11cf5097aaa78c19494326b6a07b44cf4d93f5dec5a2c893b91fe2c4f5571726229d1e8dc13229
+  data.tar.gz: 3273f1bb24290af32db23aaae8cafa84905d4d2d576b5ab96178130fe843b73e4365827b60d47a022a2812621f7fe09a3801c32c205c9805516873ed9ac88659

data/.github/workflows/main.yml

@@ -7,7 +7,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby-version: [2.7.1, head]
+        ruby-version: [2.7, 3.0, head]
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    typeprof (0.11.0)
+    typeprof (0.12.0)
       rbs (>= 1.0.0)
 
 GEM
@@ -11,7 +11,7 @@ GEM
     docile (1.3.4)
     power_assert (1.2.0)
     rake (13.0.1)
-    rbs (1.0.0)
+    rbs (1.0.3)
     simplecov (0.20.0)
       docile (~> 1.1)
       simplecov-html (~> 0.11)

data/doc/demo.md

@@ -190,7 +190,7 @@ p [:a, :b, :c] #=> [:a, :b, :c]
 # A Hash is a "type-to-type" map
 h = { "int" => 1, "float" => 1.0 }
 p h        #=> {String=>Float | Integer}
-p h["int"] #=> Float | Intger
+p h["int"] #=> Float | Integer
 
 # Symbol-key hashes (a.k.a. records) can have distinct types for each key as Symbols are concrete
 h = { int: 1, float: 1.0 }

data/lib/typeprof/analyzer.rb

@@ -2192,10 +2192,13 @@ module TypeProf
       farg_tys = @method_signatures[ctx]
       ret_ty = @return_values[ctx] || Type.bot
 
+      untyped = farg_tys.include_untyped?(self) || ret_ty.include_untyped?(self)
+
       farg_tys = farg_tys.screen_name(ctx.iseq, self)
       ret_ty = ret_ty.screen_name(self)
       ret_ty = (ret_ty.include?("|") ? "(#{ ret_ty })" : ret_ty) # XXX?
-      "#{ (farg_tys.empty? ? "" : "#{ farg_tys } ") }-> #{ ret_ty }"
+
+      ["#{ (farg_tys.empty? ? "" : "#{ farg_tys } ") }-> #{ ret_ty }", untyped]
     end
   end
 end

data/lib/typeprof/builtin.rb

@@ -557,8 +557,6 @@ module TypeProf
     end
 
     def struct_s_new(recv, mid, aargs, ep, env, scratch, &ctn)
-      # TODO: keyword_init
-
       keyword_init = false
       if aargs.kw_tys && aargs.kw_tys[:keyword_init] # XXX: more canonical way to extract keyword...
         if aargs.kw_tys[:keyword_init] == Type::Instance.new(Type::Builtin[:true])

data/lib/typeprof/cli.rb

@@ -48,6 +48,8 @@ module TypeProf
         dir_filter ||= ConfigData::DEFAULT_DIR_FILTER
         dir_filter << [:exclude, File.expand_path(dir)]
       end
+      opt.on("--exclude-untyped", "Exclude (comment out) all entries including untyped") {|v| options[:exclude_untyped] = v }
+      opt.on("--[no-]show-typeprof-version", "Display TypeProf version in a header") {|v| options[:show_typeprof_version] = v }
       opt.on("--[no-]show-errors", "Display possible errors found during the analysis") {|v| options[:show_errors] = v }
       opt.on("--[no-]show-untyped", "Display \"Foo | untyped\" instead of \"Foo\"") {|v| options[:show_untyped] = v }
       opt.on("--[no-]show-parameter-names", "Display parameter names for methods") {|v| options[:show_parameter_names] = v }

data/lib/typeprof/config.rb

@@ -31,6 +31,8 @@ module TypeProf
       opt[:verbose] ||= 0
       opt[:options] ||= {}
       opt[:options] = {
+        exclude_untyped: false,
+        show_typeprof_version: true,
         show_indicator: true,
         show_untyped: false,
         show_errors: false,
@@ -93,13 +95,19 @@ module TypeProf
       scratch.add_callsite!(ep.ctx, prologue_ep, prologue_env) {|ty, ep| }
     end
 
+    rbs_files = []
+    rbs_codes = []
     Config.rbs_files.each do |rbs|
       if rbs.is_a?(Array) # [String name, String content]
-        Import.import_rbs_code(scratch, *rbs)
+        rbs_codes << rbs
       else
-        Import.import_rbs_file(scratch, rbs)
+        rbs_files << rbs
       end
     end
+    Import.import_rbs_files(scratch, rbs_files)
+    rbs_codes.each do |name, content|
+      Import.import_rbs_code(scratch, name, content)
+    end
 
     result = scratch.type_profile
 

data/lib/typeprof/container-type.rb

@@ -45,6 +45,12 @@ module TypeProf
           Type::Cell.new(Type::Cell::Elements.new([Type.bot] * klass.type_params.size), base_type)
         end
       end
+
+      def include_untyped?(scratch)
+        return true if @base_type.include_untyped?(scratch)
+        return true if @elems.include_untyped?(scratch)
+        false
+      end
     end
 
     # The most basic container type for default type parameter class
@@ -196,6 +202,10 @@ module TypeProf
           end
           Elements.new(elems)
         end
+
+        def include_untyped?(scratch)
+          return @elems.any? {|ty| ty.include_untyped?(scratch) }
+        end
       end
     end
 
@@ -531,6 +541,12 @@ module TypeProf
             return rest_ary_ty, following_tys
           end
         end
+
+        def include_untyped?(scratch)
+          return true if @lead_tys.any? {|ty| ty.include_untyped?(scratch) }
+          return true if @rest_ty.include_untyped?(scratch)
+          false
+        end
       end
     end
 
@@ -790,6 +806,14 @@ module TypeProf
           end
           kw_tys
         end
+
+        def include_untyped?(scratch)
+          @map_tys.each do |key, val|
+            return true if key.include_untyped?(scratch)
+            return true if val.include_untyped?(scratch)
+          end
+          false
+        end
       end
     end
 

data/lib/typeprof/export.rb

@@ -26,6 +26,10 @@ module TypeProf
     end
 
     def show_message(terminated, output)
+      if Config.options[:show_typeprof_version]
+        output.puts "# TypeProf #{ VERSION }"
+        output.puts
+      end
       if terminated
         output.puts "# CAUTION: Type profiling was terminated prematurely because of the limitation"
         output.puts
@@ -94,6 +98,10 @@ module TypeProf
       if class_def.klass_obj.superclass != :__root__ && class_def.klass_obj.superclass
         omit = class_def.klass_obj.superclass == Type::Builtin[:obj] || class_def.klass_obj == Type::Builtin[:obj]
         superclass = omit ? nil : @scratch.get_class_name(class_def.klass_obj.superclass)
+        type_args = class_def.klass_obj.superclass_type_args
+        if type_args && !type_args.empty?
+          superclass += "[#{ type_args.map {|ty| ty.screen_name(@scratch) }.join(", ") }]"
+        end
       end
 
       @scratch.namespace = class_def.name
@@ -169,7 +177,7 @@ module TypeProf
             else
               entry = ivars[[singleton, mdef.ivar]]
               ty = entry ? entry.type : Type.any
-              methods[key] = [mdef.kind, ty.screen_name(@scratch)]
+              methods[key] = [mdef.kind, ty.screen_name(@scratch), ty.include_untyped?(@scratch)]
             end
           when TypedMethodDef
             if mdef.rbs_source
@@ -336,14 +344,22 @@ module TypeProf
         type, (method_name, hidden) = key
         case type
         when :attr
-          kind, ty = *arg
-          lines << (indent + "  attr_#{ kind } #{ method_name }#{ hidden ? "()" : "" }: #{ ty }")
+          kind, ty, untyped = *arg
+          exclude = Config.options[:exclude_untyped] && untyped ? "#" : " " # XXX
+          lines << (indent + "#{ exclude } attr_#{ kind } #{ method_name }#{ hidden ? "()" : "" }: #{ ty }")
         when :rbs
           sigs = arg.sort.join("\n" + indent + "#" + " " * (method_name.size + 5) + "| ")
           lines << (indent + "# def #{ method_name }: #{ sigs }")
         when :iseq
-          sigs = arg.sort.join("\n" + indent + " " * (method_name.size + 6) + "| ")
-          lines << (indent + "  def #{ method_name }: #{ sigs }")
+          sigs = []
+          untyped = false
+          arg.each do |sig, untyped0|
+            sigs << sig
+            untyped ||= untyped0
+          end
+          sigs = sigs.sort.join("\n" + indent + " " * (method_name.size + 6) + "| ")
+          exclude = Config.options[:exclude_untyped] && untyped ? "#" : " " # XXX
+          lines << (indent + "#{ exclude } def #{ method_name }: #{ sigs }")
         when :alias
           orig_name = arg
           lines << (indent + "  alias #{ method_name } #{ orig_name }")

data/lib/typeprof/import.rb

@@ -32,18 +32,26 @@ module TypeProf
       loader.add(library: lib)
 
       case lib
+      when 'bigdecimal-math'
+        loader.add(library: 'bigdecimal')
       when "yaml"
         loader.add(library: "pstore")
         loader.add(library: "dbm")
+      when "logger"
+        loader.add(library: "monitor")
+      when "csv"
+        loader.add(library: "forwardable")
+      when "prime"
+        loader.add(library: "singleton")
       end
 
       new_decls = loader.load(env: @env).map {|decl,| decl }
       RBSReader.load_rbs(@env, new_decls)
     end
 
-    def load_path(path)
+    def load_paths(paths)
       loader = RBS::EnvironmentLoader.new(core_root: nil, repository: @repo)
-      loader.add(path: path)
+      paths.each {|path| loader.add(path: path) }
       new_decls = loader.load(env: @env).map {|decl,| decl }
       RBSReader.load_rbs(@env, new_decls)
     end
@@ -73,6 +81,7 @@ module TypeProf
   class RBS2JSON
     def initialize(all_env, cur_env)
       @all_env, @cur_env = all_env, cur_env
+      @alias_resolution_stack = {}
     end
 
     def dump_json
@@ -428,8 +437,17 @@ module TypeProf
           raise NotImplementedError
         end
       when RBS::Types::Alias
-        alias_decl = @all_env.alias_decls[ty.name]
-        alias_decl ? conv_type(alias_decl.decl.type) : [:any]
+        if @alias_resolution_stack[ty.name]
+          [:any]
+        else
+          begin
+            @alias_resolution_stack[ty.name] = true
+            alias_decl = @all_env.alias_decls[ty.name]
+            alias_decl ? conv_type(alias_decl.decl.type) : [:any]
+          ensure
+            @alias_resolution_stack.delete(ty.name)
+          end
+        end
       when RBS::Types::Union
         [:union, ty.types.map {|ty2| conv_type(ty2) }.compact]
       when RBS::Types::Optional
@@ -476,9 +494,9 @@ module TypeProf
       Import.new(scratch, json).import
     end
 
-    def self.import_rbs_file(scratch, rbs_path)
-      rbs_path = Pathname(rbs_path) unless rbs_path.is_a?(Pathname)
-      Import.new(scratch, scratch.rbs_reader.load_path(rbs_path)).import(true)
+    def self.import_rbs_files(scratch, rbs_paths)
+      rbs_paths = rbs_paths.map {|rbs_path| Pathname(rbs_path) }
+      Import.new(scratch, scratch.rbs_reader.load_paths(rbs_paths)).import(true)
     end
 
     def self.import_rbs_code(scratch, rbs_name, rbs_code)

data/lib/typeprof/type.rb

@@ -162,6 +162,10 @@ module TypeProf
       substitute(DummySubstitution, Config.options[:type_depth_limit])
     end
 
+    def include_untyped?(_scratch)
+      false
+    end
+
     class Any < Type
       def initialize
       end
@@ -185,6 +189,10 @@ module TypeProf
       def substitute(_subst, _depth)
         self
       end
+
+      def include_untyped?(_scratch)
+        true
+      end
     end
 
     class Void < Any
@@ -379,6 +387,17 @@ module TypeProf
         end
         ty
       end
+
+      def include_untyped?(scratch)
+        @types.each do |ty|
+          return true if ty.include_untyped?(scratch)
+        end
+        @elems&.each do |(container_kind, base_type), elems|
+          return true if base_type.include_untyped?(scratch)
+          return true if elems.include_untyped?(scratch)
+        end
+        false
+      end
     end
 
     def self.any
@@ -583,6 +602,10 @@ module TypeProf
       def screen_name(scratch)
         scratch.show_proc_signature([self])
       end
+
+      def include_untyped?(scratch)
+        false # XXX: need to check the block signatures recursively
+      end
     end
 
     class Symbol < Type
@@ -869,6 +892,17 @@ module TypeProf
       @blk_ty = blk_ty
     end
 
+    def include_untyped?(scratch)
+      return true if @lead_tys.any? {|ty| ty.include_untyped?(scratch) }
+      return true if @opt_tys.any? {|ty| ty.include_untyped?(scratch) }
+      return true if @rest_ty&.include_untyped?(scratch)
+      return true if @post_tys.any? {|ty| ty.include_untyped?(scratch) }
+      return true if @kw_tys&.any? {|_, _, ty| ty.include_untyped?(scratch) }
+      return true if @kw_rest_ty&.include_untyped?(scratch)
+      return true if @blk_ty&.include_untyped?(scratch)
+      false
+    end
+
     attr_reader :lead_tys, :opt_tys, :rest_ty, :post_tys, :kw_tys, :kw_rest_ty, :blk_ty
 
     def substitute(subst, depth)

data/lib/typeprof/version.rb

@@ -1,3 +1,3 @@
 module TypeProf
-  VERSION = "0.11.0"
+  VERSION = "0.12.0"
 end

data/smoke/struct-keyword_init.rb

@@ -3,7 +3,7 @@ Foo[a: 1, b: "str", c: 1.0]
 
 __END__
 # Classes
-class Foo < Struct
+class Foo < Struct[untyped]
   attr_accessor a(): Integer
   attr_accessor b(): String
   attr_accessor c(): Float

data/smoke/struct.rb

@@ -5,7 +5,7 @@ end
 Foo.new.a = 1
 __END__
 # Classes
-class AnonymousStruct_generated_1 < Struct
+class AnonymousStruct_generated_1 < Struct[untyped]
   attr_accessor a(): untyped
 end
 

data/smoke/struct2.rb

@@ -18,7 +18,7 @@ class Object
   def gen_foobar: -> FooBar
 end
 
-class FooBar < Struct
+class FooBar < Struct[untyped]
   attr_accessor foo(): Integer | String
   attr_accessor bar(): :sym?
   def my_foo: -> (Integer | String)

data/smoke/struct3.rb

@@ -7,7 +7,7 @@ App::FooBar.new(1, "str")
 __END__
 # Classes
 class App
-  class FooBar < Struct
+  class FooBar < Struct[untyped]
     attr_accessor foo(): Integer
     attr_accessor bar(): String
   end

data/smoke/struct4.rb

@@ -2,6 +2,6 @@ UndefinedConstant::Foo = Struct.new(:foo)
 
 __END__
 # Classes
-class AnonymousStruct_generated_1 < Struct
+class AnonymousStruct_generated_1 < Struct[untyped]
   attr_accessor foo(): untyped
 end

data/smoke/struct5.rb

@@ -10,7 +10,7 @@ Foo.new(42)
 
 __END__
 # Classes
-class Foo < Struct
+class Foo < Struct[untyped]
   attr_accessor foo(): String
   def initialize: (Integer foo) -> Foo
 end

data/smoke/struct6.rb

@@ -6,7 +6,7 @@ end
 
 __END__
 # Classes
-class AnonymousStruct_generated_1 < Struct
+class AnonymousStruct_generated_1 < Struct[untyped]
   attr_accessor foo(): untyped
 end
 

data/smoke/struct7.rb

@@ -12,6 +12,6 @@ end
 
 __END__
 # Classes
-class Foo < Struct
+class Foo < Struct[untyped]
   def initialize: -> Foo
 end

data/testbed/goodcheck-Gemfile.lock

@@ -21,7 +21,7 @@ GEM
     concurrent-ruby (1.1.7)
     i18n (1.8.5)
       concurrent-ruby (~> 1.0)
-    minitest (5.14.2)
+    minitest (5.14.3)
     minitest-reporters (1.4.2)
       ansi
       builder

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: typeprof
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.12.0
 platform: ruby
 authors:
 - Yusuke Endoh
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-12-24 00:00:00.000000000 Z
+date: 2021-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rbs