tapioca 0.4.22 → 0.4.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8e3ea6e1fb437f52cfb699c43b4c3d46115592ac09a69aec5a8d0701906f42cd
-  data.tar.gz: 9fba45117a3f1f72ab8d3278838fb7d4a860eaa7cadc03535d99be618e8994c9
+  metadata.gz: 3fe702a52ed1226bf7c94e4288d722665e8444e89066a7cb9fda8066a2bebc3a
+  data.tar.gz: 1bb7b3bd18bf1b136b6c01afe6f27a82a49c31558a5298ebe2fb045476f7ec0d
 SHA512:
-  metadata.gz: 6519978a03ff03499f223d810a9f0d2bfd74e406017efb300a72fff0d95e1e08b64d2165ae1b54bad48f8767c5f831fe5f4398185282a5643224499355d7badc
-  data.tar.gz: 28ace672d799beb84aa802fe0773e574d3a827c53e15564d643dbe04e6330d6abb11d640a06b064641781258600ce73f3b5695915caaf9ce0813679dede867b2
+  metadata.gz: 75ba6fe1ba52763c5c31f6f792f2bc766d8874fbd4814bd16137e3238926c1efb35bb4663bdc8ae423bed1d489425b5f3a569e41b2e75d8318ab7cad800f597c
+  data.tar.gz: e15284dee1f66fca6a032194b359f54523bbc2c3981423268ffd3402e74bdd66403a08239c712145b0455fa7b0c4d7c5600d9d5ae398d9dd2b88cf4ddc3376c7

data/exe/tapioca

@@ -5,6 +5,8 @@ require 'sorbet-runtime'
 
 begin
   T::Configuration.default_checked_level = :never
+  # Suppresses call validation errors
+  T::Configuration.call_validation_error_handler = ->(*) {}
   # Suppresses errors caused by T.cast, T.let, T.must, etc.
   T::Configuration.inline_type_error_handler = ->(*) {}
   # Suppresses errors caused by incorrect parameter ordering

data/lib/tapioca/compilers/dsl/active_job.rb

@@ -19,6 +19,7 @@ module Tapioca
       #
       # ~~~rb
       # class NotifyUserJob < ActiveJob::Base
+      #   sig { params(user: User).returns(Mail) }
       #   def perform(user)
       #     # ...
       #   end
@@ -31,10 +32,10 @@ module Tapioca
       # # notify_user_job.rbi
       # # typed: true
       # class NotifyUserJob
-      #   sig { params(user: T.untyped).returns(NotifyUserJob) }
+      #   sig { params(user: User).returns(T.any(NotifyUserJob, FalseClass)) }
       #   def self.perform_later(user); end
       #
-      #   sig { params(user: T.untyped).returns(NotifyUserJob) }
+      #   sig { params(user: User).returns(Mail) }
       #   def self.perform_now(user); end
       # end
       # ~~~
@@ -48,16 +49,23 @@ module Tapioca
 
             method = constant.instance_method(:perform)
             parameters = compile_method_parameters_to_parlour(method)
+            return_type = compile_method_return_type_to_parlour(method)
 
-            %w[perform_later perform_now].each do |name|
-              create_method(
-                job,
-                name,
-                parameters: parameters,
-                return_type: constant.name,
-                class_method: true
-              )
-            end
+            create_method(
+              job,
+              "perform_later",
+              parameters: parameters,
+              return_type: "T.any(#{constant.name}, FalseClass)",
+              class_method: true
+            )
+
+            create_method(
+              job,
+              "perform_now",
+              parameters: parameters,
+              return_type: return_type,
+              class_method: true
+            )
           end
         end
 

data/lib/tapioca/compilers/symbol_table/symbol_generator.rb

@@ -145,7 +145,15 @@ module Tapioca
         def compile_object(tree, name, value)
           return if symbol_ignored?(name)
           klass = class_of(value)
-          klass_name = name_of(klass)
+
+          klass_name = if klass == ObjectSpace::WeakMap
+            # WeakMap is an implicit generic with one type variable
+            "ObjectSpace::WeakMap[T.untyped]"
+          elsif T::Generic === klass
+            generic_name_of(klass)
+          else
+            name_of(klass)
+          end
 
           if klass_name == "T::Private::Types::TypeAlias"
             tree << RBI::Const.new(name, "T.type_alias { #{T.unsafe(value).aliased_type} }")
@@ -155,8 +163,6 @@ module Tapioca
           return if klass_name&.start_with?("T::Types::", "T::Private::")
 
           type_name = klass_name || "T.untyped"
-          # TODO: Do this in a more generic and clean way.
-          type_name = "#{type_name}[T.untyped]" if type_name == "ObjectSpace::WeakMap"
 
           tree << RBI::Const.new(name, "T.let(T.unsafe(nil), #{type_name})")
         end
@@ -774,6 +780,19 @@ module Tapioca
           name
         end
 
+        sig { params(constant: T.all(Module, T::Generic)).returns(String) }
+        def generic_name_of(constant)
+          type_name = T.must(constant.name)
+          return type_name if type_name =~ /\[.*\]$/
+
+          type_variables = Tapioca::GenericTypeRegistry.lookup_type_variables(constant)
+          return type_name unless type_variables
+
+          type_variable_names = type_variables.map { "T.untyped" }.join(", ")
+
+          "#{type_name}[#{type_variable_names}]"
+        end
+
         sig { params(constant: Module).returns(T.nilable(String)) }
         def name_of_proxy_target(constant)
           klass = class_of(constant)

data/lib/tapioca/gemfile.rb

@@ -108,8 +108,14 @@ module Tapioca
 
       sig { returns(T::Array[Pathname]) }
       def files
-        @spec.full_require_paths.flat_map do |path|
-          Pathname.glob((Pathname.new(path) / "**/*.rb").to_s)
+        if default_gem?
+          @spec.files.map do |file|
+            ruby_lib_dir.join(file)
+          end
+        else
+          @spec.full_require_paths.flat_map do |path|
+            Pathname.glob((Pathname.new(path) / "**/*.rb").to_s)
+          end
         end
       end
 
@@ -125,11 +131,25 @@ module Tapioca
 
       sig { params(path: String).returns(T::Boolean) }
       def contains_path?(path)
-        to_realpath(path).start_with?(full_gem_path) || has_parent_gemspec?(path)
+        if default_gem?
+          files.any? { |file| file.to_s == to_realpath(path) }
+        else
+          to_realpath(path).start_with?(full_gem_path) || has_parent_gemspec?(path)
+        end
       end
 
       private
 
+      sig { returns(T::Boolean) }
+      def default_gem?
+        @spec.respond_to?(:default_gem?) && @spec.default_gem?
+      end
+
+      sig { returns(Pathname) }
+      def ruby_lib_dir
+        Pathname.new(RbConfig::CONFIG["rubylibdir"])
+      end
+
       sig { returns(String) }
       def version_string
         version = @spec.version.to_s

data/lib/tapioca/internal.rb

@@ -6,6 +6,7 @@ require "tapioca/loader"
 require "tapioca/constant_locator"
 require "tapioca/generic_type_registry"
 require "tapioca/sorbet_ext/generic_name_patch"
+require "tapioca/sorbet_ext/fixed_hash_patch"
 require "tapioca/config"
 require "tapioca/config_builder"
 require "tapioca/generator"

data/lib/tapioca/sorbet_ext/fixed_hash_patch.rb

@@ -0,0 +1,20 @@
+# typed: true
+# frozen_string_literal: true
+
+module T
+  module Types
+    class FixedHash
+      def name
+        entries = @types.map do |(k, v)|
+          if Symbol === k && ":#{k}" == k.inspect
+            "#{k}: #{v}"
+          else
+            "#{k.inspect} => #{v}"
+          end
+        end
+
+        "{#{entries.join(', ')}}"
+      end
+    end
+  end
+end

data/lib/tapioca/version.rb

@@ -2,5 +2,5 @@
 # frozen_string_literal: true
 
 module Tapioca
-  VERSION = "0.4.22"
+  VERSION = "0.4.23"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tapioca
 version: !ruby/object:Gem::Version
-  version: 0.4.22
+  version: 0.4.23
 platform: ruby
 authors:
 - Ufuk Kayserilioglu
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-05-19 00:00:00.000000000 Z
+date: 2021-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -168,6 +168,7 @@ files:
 - lib/tapioca/rbi/rewriters/nest_singleton_methods.rb
 - lib/tapioca/rbi/rewriters/sort_nodes.rb
 - lib/tapioca/rbi/visitor.rb
+- lib/tapioca/sorbet_ext/fixed_hash_patch.rb
 - lib/tapioca/sorbet_ext/generic_name_patch.rb
 - lib/tapioca/sorbet_ext/name_patch.rb
 - lib/tapioca/version.rb