typeprof 0.21.4 → 0.21.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c0f10007471912f793ce801817a088aa794bc4baeb15e5179362521f55e41ec0
-  data.tar.gz: ed61a2b2f4b9800cfb9c9e75d7aa0d0a5690ec1660e509dd4da456b60d1d03e7
+  metadata.gz: 1d207fe000797f7326bd569640296801ff8047d8261b2461f22c744899753641
+  data.tar.gz: ec87c3c228fc1326739f11fc6aaa63c4d5db46ad66bec55aab46d11d09953a50
 SHA512:
-  metadata.gz: 218064fc39d5eeacfe48c8babb28cfade5a069703d71ec4fb45f1a436491596006a01e46b63a14a25c611924176e7bc7aa5131a687c48f9c35b9d84e03e044e8
-  data.tar.gz: 61cca1138af6ab08bb91b9e05cd03a27de7c43bd13a36b9aa5522dffb1a118cb67f4494b0f109097572aa787a334be822773c6fedd87b3f1bcce1d7d221d7eba
+  metadata.gz: b6acf621b74c3468b14986c8c8616d0d6fc30a4e610dcf817ef550cc302d008cf916ea34f721a7e06038b48c77097e83a16f2e27233e93b18465f69288da4561
+  data.tar.gz: 1c80d8d54c9cda86819eac0aec7b47393f01423a6506946240ebdef40b02ad90bae4c69c43ced7906ecc60945b85fee2baefc8c0aa717a8b95c570f9c25adcf4

data/.github/workflows/main.yml

@@ -1,32 +1,39 @@
 name: Ruby
 
-on: [push,pull_request]
+on:
+  push:
+  pull_request:
+  workflow_dispatch:
+  schedule:
+    #  # This job runs at 00:00 on Friday.
+    - cron: '0 15 * * 5'
 
 jobs:
+  ruby-versions:
+    uses: ruby/actions/.github/workflows/ruby_versions.yml@master
+    with:
+      engine: cruby-truffleruby
+      min_version: 2.7
+
   build:
+    needs: ruby-versions
+    name: build (${{ matrix.ruby }})
     strategy:
       fail-fast: false
       matrix:
-        ruby-version: [2.7, 3.0, 3.1, 3.2, head]
+        ruby: ${{ fromJson(needs.ruby-versions.outputs.versions) }}
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v3
     - name: Set up Ruby
       uses: ruby/setup-ruby@v1
       with:
-        ruby-version: ${{ matrix.ruby-version }}
-        bundler-cache: true
+        ruby-version: ${{ matrix.ruby }}
+    - name: Bundle install
+      run: |
+        bundle install
+    - run: bundle exec typeprof --version
     - name: Run the test suite
       run: |
         bundle exec rake TESTOPT=-v
-
-  truffleruby:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v3
-    - name: Set up Ruby
-      uses: ruby/setup-ruby@v1
-      with:
-        ruby-version: truffleruby
-        bundler-cache: true
-    - run: bundle exec typeprof --version
+      if: ${{ !startsWith(matrix.ruby, 'truffle') }}

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    typeprof (0.21.3)
+    typeprof (0.21.6)
       rbs (>= 1.8.1)
 
 GEM
@@ -11,7 +11,7 @@ GEM
     docile (1.4.0)
     power_assert (2.0.1)
     rake (13.0.1)
-    rbs (2.8.3)
+    rbs (3.0.1)
     simplecov (0.21.2)
       docile (~> 1.1)
       simplecov-html (~> 0.11)

data/lib/typeprof/import.rb

@@ -6,8 +6,13 @@ module TypeProf
       @repo = RBS::Repository.new
       collection_path = Config.current.collection_path
       if collection_path&.exist?
-        collection_lock = RBS::Collection::Config.lockfile_of(collection_path)
-        @repo.add(collection_lock.repo_path)
+        lock_path = RBS::Collection::Config.to_lockfile_path(collection_path)
+        if lock_path.exist?
+          collection_lock = RBS::Collection::Config.from_path(lock_path)
+          @repo.add(collection_lock.repo_path)
+        else
+          raise "Please execute 'rbs collection install'"
+        end
       end
       @env, @loaded_gems, @builtin_env_json = RBSReader.get_builtin_env
     end
@@ -23,9 +28,14 @@ module TypeProf
         # TODO: invalidate this cache when rbs_collection.yml was changed
         collection_path = Config.current.collection_path
         if collection_path&.exist?
-          collection_lock = RBS::Collection::Config.lockfile_of(collection_path)
-          collection_lock.gems.each {|gem| @loaded_gems << gem["name"] }
-          loader.add_collection(collection_lock)
+          lock_path = RBS::Collection::Config.to_lockfile_path(collection_path)
+          if lock_path.exist?
+            collection_lock = RBS::Collection::Config::Lockfile.from_lockfile(lockfile_path: lock_path, data: YAML.load_file(lock_path.to_s))
+            collection_lock.gems.each {|gem| @loaded_gems << gem["name"] }
+            loader.add_collection(collection_lock)
+          else
+            raise "Please execute 'rbs collection install'"
+          end
         end
 
         new_decls = loader.load(env: @builtin_env).map {|decl,| decl }
@@ -77,19 +87,37 @@ module TypeProf
     def load_rbs_string(name, content)
       buffer = RBS::Buffer.new(name: name, content: content)
       new_decls = []
-      RBS::Parser.parse_signature(buffer).each do |decl|
-        @env << decl
-        new_decls << decl
+      ret = RBS::Parser.parse_signature(buffer)
+      if ret[0].is_a?(RBS::Buffer)
+        # rbs 3.0
+        buffer, directives, decls = ret
+        @env.add_signature(buffer: buffer, directives: directives, decls: decls)
+        new_decls.concat(decls)
+      else
+        ret.each do |decl|
+          @env << decl
+          new_decls << decl
+        end
       end
       RBSReader.load_rbs(@env, new_decls)
     end
 
     def self.load_rbs(env, new_decls)
       all_env = env.resolve_type_names
-      resolver = RBS::TypeNameResolver.from_env(all_env)
       cur_env = RBS::Environment.new
-      new_decls.each do |decl|
-        cur_env << env.resolve_declaration(resolver, decl, outer: [], prefix: RBS::Namespace.root)
+      if defined?(RBS::TypeNameResolver)
+        resolver = RBS::TypeNameResolver.from_env(all_env)
+        new_decls.each do |decl|
+          cur_env << env.resolve_declaration(resolver, decl, outer: [], prefix: RBS::Namespace.root)
+        end
+      else
+        resolver = RBS::Resolver::TypeNameResolver.new(all_env)
+        table = RBS::Environment::UseMap::Table.new()
+        table.compute_children
+        map = RBS::Environment::UseMap.new(table: table)
+        new_decls.each do |decl|
+          cur_env << s = env.resolve_declaration(resolver, map, decl, outer: [], prefix: RBS::Namespace.root)
+        end
       end
 
       RBS2JSON.new(all_env, cur_env).dump_json
@@ -134,6 +162,9 @@ module TypeProf
       gvars
     end
 
+    AliasDecl = defined?(RBS::AST::Declarations::Alias) ? RBS::AST::Declarations::Alias : RBS::AST::Declarations::AliasDecl
+    TypeAlias = defined?(RBS::AST::Declarations::TypeAlias) ? RBS::AST::Declarations::TypeAlias : nil
+
     def conv_classes
       json = {}
 
@@ -265,9 +296,10 @@ module TypeProf
 
             # The following declarations are ignoreable because they are handled in other level
             when RBS::AST::Declarations::Constant
-            when RBS::AST::Declarations::Alias # type alias
+            when AliasDecl # type alias
             when RBS::AST::Declarations::Class, RBS::AST::Declarations::Module
             when RBS::AST::Declarations::Interface
+            when TypeAlias
 
             else
               warn "Importing #{ member.class.name } is not supported yet"
@@ -492,7 +524,7 @@ module TypeProf
         else
           begin
             @alias_resolution_stack[ty.name] = true
-            alias_decl = @all_env.alias_decls[ty.name]
+            alias_decl = (@all_env.respond_to?(:alias_decls) ? @all_env.alias_decls : @all_env.type_alias_decls)[ty.name]
             alias_decl ? conv_type(alias_decl.decl.type) : [:any]
           ensure
             @alias_resolution_stack.delete(ty.name)

data/lib/typeprof/version.rb

@@ -1,3 +1,3 @@
 module TypeProf
-  VERSION = "0.21.4"
+  VERSION = "0.21.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: typeprof
 version: !ruby/object:Gem::Version
-  version: 0.21.4
+  version: 0.21.6
 platform: ruby
 authors:
 - Yusuke Endoh
-autorequire:
+autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-01-12 00:00:00.000000000 Z
+date: 2023-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rbs
@@ -74,7 +74,7 @@ licenses:
 metadata:
   homepage_uri: https://github.com/ruby/typeprof
   source_code_uri: https://github.com/ruby/typeprof
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -89,8 +89,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.26
-signing_key:
+rubygems_version: 3.5.0.dev
+signing_key: 
 specification_version: 4
 summary: TypeProf is a type analysis tool for Ruby code based on abstract interpretation
 test_files: []