rbs_rails 0.4.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 16709127e339f2c71c00ad11ac8ed13fa0dae3090c2ee30105486acd2cde536e
-  data.tar.gz: 70464319628ea31b6ba77c958be4e335fcfefa6f55b3908ef168578a5bc4a03e
+  metadata.gz: 34709bd1892db293d9371b2574c97f5144d97f8b2de661072d7f65fb0616f971
+  data.tar.gz: 68f8207b59c550a6f5e6485ee322c38141154b47026c4d50c6bfe3cee9270494
 SHA512:
-  metadata.gz: 3a26bb616fd9ff5a174c089afdc2f5283c182abe3868dd6fab1b25ca16c7f447c21520915d131b84e00a25e800dca8ca3ff5b5d2c093ac65fab924dd5424221b
-  data.tar.gz: 52d257af8544a3639a3ffd98f3f0917fc5dd503e4682951cce3391ceed94bedf5d9eca1b0cd86b57e67fdc7d90093cf0a5acbc089c744e8bba5a49f38bd19364
+  metadata.gz: 01d91fa0f2aaeed8dd4614ec59f5604b125684ed63325f6edbb30c29db62e2ae60cffd450a28b0ef5ec44f32570bb1a25fdbb70230060def0a4ee73fb714ab0f
+  data.tar.gz: 535c957a38bc5644be6e83ccf1bf439a1830110a3355b4dfd4b84453f42d5975a506d85166ac53230d62af207765e1c4cab2f3de0b7564c97c084188e7726304

data/.gitattributes

@@ -0,0 +1 @@
+gem_rbs/gems/* linguist-generated=true

data/.github/workflows/ci.yml

@@ -0,0 +1,18 @@
+name: CI
+
+on: [push, pull_request]
+
+jobs:
+  test:
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby: [2.6, 2.7, '3.0']
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby }}
+        bundler-cache: true # runs 'bundle install' and caches installed gems automatically
+    - run: bundle exec rake

data/.gitignore

@@ -7,4 +7,6 @@
 /spec/reports/
 /tmp/
 /Gemfile.lock
-/test/sig
+/test/app/sig/rbs_rails
+/test/app/sig/app
+/test/app/sig/path_helpers.rbs

data/CHANGELOG.md

@@ -0,0 +1,13 @@
+# Change log
+
+## master (unreleased)
+
+## 0.8.0 (2020-12-31)
+
+* **[BREAKING]** Move RBS files that are copied by `rbs_rails:copy_signature_files` task to [ruby/gem_rbs](https://github.com/ruby/gem_rbs) repository [#90](https://github.com/pocke/rbs_rails/pull/90)
+* Allow all kinds of argument for scope [#89](https://github.com/pocke/rbs_rails/pull/89)
+
+## 0.7.0 (2020-12-28)
+
+* **[BREAKING]** Re-structure signature directory. [#86](https://github.com/pocke/rbs_rails/pull/86)
+* Generate ActiveRecord models with namespaces and superclasses. [#87](https://github.com/pocke/rbs_rails/pull/87)

data/Gemfile

@@ -4,6 +4,6 @@ source "https://rubygems.org"
 gemspec
 
 gem "rake", "~> 12.0"
-gem 'rbs', '>= 0.14.0'
-gem 'steep', '>= 0.34.0'
+gem 'rbs', '1.0.0'
+gem 'steep', '>= 0.34.0', git: 'https://github.com/soutaro/steep.git'
 gem 'minitest'

data/README.md

@@ -7,7 +7,7 @@ RBS files generator for Ruby on Rails.
 Add this line to your application's Gemfile:
 
 ```ruby
-gem 'rbs_rails'
+gem 'rbs_rails', require: false
 ```
 
 And then execute:
@@ -20,56 +20,22 @@ Or install it yourself as:
 
 ## Usage
 
-### For Active Record models
-
-It has two tasks.
-
-* `copy_signature_files`: Copy type definition files for Rails from rbs_rails.
-* `generate_rbs_for_model`: Generate RBS files from model classes.
+Put the following code to `lib/tasks/rbs.rake`.
 
 ```ruby
-# Rakefile
-
-task copy_signature_files: :environment do
-  require 'rbs_rails'
-
-  to = Rails.root.join('sig/rbs_rails/')
-  to.mkpath unless to.exist?
-  RbsRails.copy_signatures(to: to)
-end
-
-task generate_rbs_for_model: :environment do
-  require 'rbs_rails'
-
-  out_dir = Rails.root / 'sig'
-  out_dir.mkdir unless out_dir.exist?
-
-  Rails.application.eager_load!
+require 'rbs_rails/rake_task'
 
-  ActiveRecord::Base.descendants.each do |klass|
-    next if klass.abstract_class?
+RbsRails::RakeTask.new
+```
 
-    path = out_dir / "app/models/#{klass.name.underscore}.rbs"
-    FileUtils.mkdir_p(path.dirname)
+Then, the following three tasks are available.
 
-    sig = RbsRails::ActiveRecord.class_to_rbs(klass)
-    path.write sig
-  end
-end
-```
+* `rbs_rails:generate_rbs_for_models`: Generate RBS files for Active Record models
+* `rbs_rails:generate_rbs_for_path_helpers`: Generate RBS files for path helpers
+* `rbs_rails:all`: Execute all tasks of RBS Rails
 
-### For path helpers
 
-```ruby
-# Rakefile
 
-task generate_rbs_for_path_helpers: :environment do
-  require 'rbs_rails'
-  out_path = Rails.root.join 'sig/path_helpers.rbs'
-  rbs = RbsRails::PathHelpers.generate
-  out_path.write rbs
-end
-```
 
 ### Steep integration
 
@@ -83,13 +49,28 @@ target :app do
 
   check 'app'
 
+  repo_path "path/to/rbs_repo"
+
   library 'pathname'
   library 'logger'
   library 'mutex_m'
   library 'date'
+  library 'monitor'
+  library 'singleton'
+  library 'tsort'
+
+  library 'activesupport'
+  library 'actionpack'
+  library 'activejob'
+  library 'activemodel'
+  library 'actionview'
+  library 'activerecord'
+  library 'railties'
 end
 ```
 
+You need to put RBS repo to `path/to/rbs_repo`. See https://github.com/ruby/gem_rbs
+
 ## 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/Rakefile

@@ -9,7 +9,8 @@ task :steep do
 end
 
 task :rbs_validate do
-  sh 'bin/rbs validate --silent'
+  rbs = Pathname(__dir__).join('bin/rbs').to_s
+  sh "ruby #{rbs} validate --silent"
 end
 
 Rake::TestTask.new do |test|

data/Steepfile

@@ -3,10 +3,21 @@ target :lib do
   signature 'assets/sig'
 
   check "lib"                       # Directory name
+  repo_path ENV['RBS_REPO_DIR'] || './gem_rbs/gems'
 
   library "pathname"
   library "logger"
   library "mutex_m"
   library "date"
-  # library "strong_json"           # Gems
+  library 'monitor'
+  library 'singleton'
+  library 'tsort'
+
+  library 'activesupport'
+  library 'actionpack'
+  library 'activejob'
+  library 'activemodel'
+  library 'actionview'
+  library 'activerecord'
+  library 'railties'
 end

data/bin/add-type-params.rb

@@ -4,7 +4,7 @@ require 'bundler/inline'
 
 gemfile do
   source 'https://rubygems.org'
-  gem 'rbs', '>= 0.16'
+  gem 'rbs', '1.0.0'
 end
 
 require 'rbs'
@@ -16,6 +16,7 @@ end
 def env
   @env ||= begin
     loader = RBS::EnvironmentLoader.new()
+    loader.add(library: 'tsort')
     RBS::Environment.from_loader(loader).resolve_type_names
   end
 end

data/bin/gem_rbs

@@ -0,0 +1,94 @@
+#!ruby
+
+require 'net/http'
+require 'json'
+require 'securerandom'
+require 'pathname'
+
+TOKEN = ENV.fetch('GITHUB_ACCESS_TOKEN')
+VERSION = "6.0.3.2"
+
+def req(query)
+  http = Net::HTTP.new("api.github.com", 443)
+  http.use_ssl = true
+  header = {
+    "Authorization" => "Bearer #{TOKEN}",
+    'Content-Type' => 'application/json',
+    'User-Agent' => 'gem_rbs client',
+  }
+  resp = http.request_post('/graphql', JSON.generate(query), header)
+  JSON.parse(resp.body, symbolize_names: true).tap do |content|
+    raise content[:errors].inspect if content[:errors]
+  end
+end
+
+class QueryBuilder
+  attr_reader :variables
+
+  def initialize
+    @queries = []
+    @variables = {}
+  end
+
+  def add(query, variables)
+    query = query.dup
+    variables = variables.transform_keys do |key|
+      next key unless @variables.key?(key)
+
+      new_key = key + '_' + SecureRandom.hex(8)
+      query.gsub!(key, new_key)
+      new_key
+    end
+
+    @queries << query
+    @variables.merge!(variables)
+  end
+
+  def query
+    # TODO: Allow non-String type for variables
+    "query(#{variables.keys.map { |v| "$#{v}: String!" }.join(',')}) { #{@queries.join("\n")} }"
+  end
+end
+
+gems = %w[activesupport actionpack activejob activemodel actionview activerecord railties]
+
+builder = QueryBuilder.new
+gems.each do |gem|
+  path = "main:gems/#{gem}/#{VERSION}"
+  builder.add(<<~GRAPHQL, { 'path' => path })
+    #{gem}:repository(owner: "ruby", name: "gem_rbs") {
+      object(expression: $path) {
+        ... on Tree {
+          entries {
+            name
+            object {
+              ... on Blob {
+                isTruncated
+                text
+              }
+            }
+          }
+        }
+      }
+    }
+  GRAPHQL
+end
+
+resp = req(query: builder.query, variables: builder.variables)
+
+resp[:data].each do |gem_name, gem_value|
+  gem_value.dig(:object, :entries).each do |entry|
+    fname = entry[:name]
+    if fname.end_with?('.rbs')
+      content =
+        if entry.dig(:object, :isTruncated)
+          `curl -H 'Accept: application/vnd.github.v3.raw' -H Authorization: token #{TOKEN} https://api.github.com/repos/ruby/gem_rbs/contents/gems/#{gem_name}/#{VERSION}/#{fname}`
+        else
+          entry.dig(:object, :text)
+        end
+      dir = Pathname("gem_rbs/gems/#{gem_name}/#{VERSION}")
+      dir.mkpath
+      dir.join(fname).write(content)
+    end
+  end
+end

data/bin/postprocess.rb

@@ -6,7 +6,7 @@ require 'bundler/inline'
 
 gemfile do
   source 'https://rubygems.org'
-  gem 'rbs', '>= 0.16'
+  gem 'rbs', '1.0.0'
 end
 
 require 'rbs'

data/bin/rbs

@@ -1,3 +1,30 @@
-#!/bin/bash
+#!ruby
+
+require 'pathname'
+root = Pathname(__dir__) / '../'
+
+def v(require)
+  if v = ENV['RAILS_VERSION']
+    "#{require}:#{v}"
+  else
+    require
+  end
+end
+
+def repo
+  ENV['RBS_REPO_DIR'] || Pathname(__dir__).join('../gem_rbs/gems').to_s
+end
+
+exec(
+  'rbs',
+  # Require stdlibs
+  '-rlogger', '-rpathname', '-rmutex_m', '-rdate', '-rmonitor', '-rsingleton', '-rtsort',
+  "--repo=#{repo}",
+  # Require Rails libraries
+  v('-ractivesupport'), v('-ractionpack'), v('-ractivejob'), v('-ractivemodel'), v('-ractionview'), v('-ractiverecord'), v('-rrailties'),
+  # Load signatures that are bundled in rbs_rails
+  '-I' + root.join('sig').to_s, '-I' + root.join('assets/sig').to_s,
+  # Expand arguments
+  *ARGV,
+)
 
-rbs -rlogger -rpathname -rmutex_m -rdate -Isig -Iassets/sig $@

data/bin/rbs-prototype-rb.rb

@@ -17,7 +17,7 @@ using Module.new {
       end
     end
 
-    def process_class_methods(node, decls:, comments:, singleton:)
+    def process_class_methods(node, decls:, comments:, context:)
       return false unless node.type == :ITER
 
       fcall = node.children[0]
@@ -37,13 +37,13 @@ using Module.new {
       decls.push mod
 
       each_node [node.children[1]] do |child|
-        process child, decls: mod.members, comments: comments, singleton: false
+        process child, decls: mod.members, comments: comments, context: RBS::Prototype::RB::Context.initial
       end
 
       true
     end
 
-    def process_struct_new(node, decls:, comments:, singleton:)
+    def process_struct_new(node, decls:, comments:, context:)
       return unless node.type == :CDECL
 
       name, *_, rhs = node.children
@@ -68,6 +68,7 @@ using Module.new {
           kls.members << RBS::AST::Members::AttrAccessor.new(
             name: f.children.first,
             type: untyped,
+            kind: :instance,
             ivar_name: false,
             annotations: [],
             location: nil,
@@ -78,13 +79,65 @@ using Module.new {
 
       if body
         each_node [body] do |child|
-          process child, decls: kls.members, comments: comments, singleton: false
+          process child, decls: kls.members, comments: comments, context: RBS::Prototype::RB::Context.initial
         end
       end
 
       true
     end
 
+    def process_attr_internal(node, decls:, comments:, context:)
+      case node.type
+      when :FCALL, :VCALL
+        args = node.children[1]&.children || []
+
+        case node.children[0]
+        when :attr_internal_reader
+          args.each do |arg|
+            if arg && (name = literal_to_symbol(arg))
+              decls << RBS::AST::Members::AttrReader.new(
+                name: name,
+                ivar_name: :"@_#{name}",
+                type: RBS::Types::Bases::Any.new(location: nil),
+                kind: context.attribute_kind,
+                location: nil,
+                comment: comments[node.first_lineno - 1],
+                annotations: []
+              )
+            end
+          end
+        when :attr_internal_writer
+          args.each do |arg|
+            if arg && (name = literal_to_symbol(arg))
+              decls << RBS::AST::Members::AttrWriter.new(
+                name: name,
+                ivar_name: :"@_#{name}",
+                type: RBS::Types::Bases::Any.new(location: nil),
+                kind: context.attribute_kind,
+                location: nil,
+                comment: comments[node.first_lineno - 1],
+                annotations: []
+              )
+            end
+          end
+        when :attr_internal_accessor, :attr_internal
+          args.each do |arg|
+            if arg && (name = literal_to_symbol(arg))
+              decls << RBS::AST::Members::AttrAccessor.new(
+                name: name,
+                ivar_name: :"@_#{name}",
+                type: RBS::Types::Bases::Any.new(location: nil),
+                kind: context.attribute_kind,
+                location: nil,
+                comment: comments[node.first_lineno - 1],
+                annotations: []
+              )
+            end
+          end
+        end
+      end
+    end
+
     def class_new_method_to_type(node)
       case node.type
       when :CALL
@@ -122,14 +175,14 @@ using Module.new {
 
     def struct_as_superclass
       name = RBS::TypeName.new(name: 'Struct', namespace: RBS::Namespace.root)
-      RBS::AST::Declarations::Class::Super.new(name: name, args: ['untyped'])
+      RBS::AST::Declarations::Class::Super.new(name: name, args: ['untyped'], location: nil)
     end
   end
 }
 
 module PrototypeExt
   def process(...)
-    process_class_methods(...) || process_struct_new(...) || super
+    process_class_methods(...) || process_struct_new(...) || process_attr_internal(...) || super
   end
 
   def literal_to_type(node)