tapioca 0.6.4 → 0.7.2

data/lib/tapioca/sorbet_ext/generic_name_patch.rb

@@ -2,6 +2,7 @@
 # frozen_string_literal: true
 
 require "tapioca/sorbet_ext/name_patch"
+require "tapioca/helpers/sorbet_helper"
 
 module T
   module Generic
@@ -17,36 +18,52 @@ module T
         constant = super
         # `register_type` method builds and returns an instantiated clone of the generic type
         # so, we just return that from this method as well.
-        Tapioca::GenericTypeRegistry.register_type(constant, types)
+        Tapioca::Runtime::GenericTypeRegistry.register_type(constant, types)
       end
 
-      def type_member(variance = :invariant, fixed: nil, lower: T.untyped, upper: BasicObject)
+      def type_member(variance = :invariant, fixed: nil, lower: nil, upper: nil, &blk)
         # `T::Generic#type_member` just instantiates a `T::Type::TypeMember` instance and returns it.
         # We use that when registering the type member and then later return it from this method.
+        hash = if blk
+          blk.call
+        else
+          {
+            fixed: fixed,
+            lower: lower,
+            upper: upper,
+          }
+        end
+
         Tapioca::TypeVariableModule.new(
           T.cast(self, Module),
           Tapioca::TypeVariableModule::Type::Member,
           variance,
-          fixed,
-          lower,
-          upper
+          **hash,
         ).tap do |type_variable|
-          Tapioca::GenericTypeRegistry.register_type_variable(self, type_variable)
+          Tapioca::Runtime::GenericTypeRegistry.register_type_variable(self, type_variable)
         end
       end
 
-      def type_template(variance = :invariant, fixed: nil, lower: T.untyped, upper: BasicObject)
+      def type_template(variance = :invariant, fixed: nil, lower: nil, upper: nil, &blk)
         # `T::Generic#type_template` just instantiates a `T::Type::TypeTemplate` instance and returns it.
         # We use that when registering the type template and then later return it from this method.
+        hash = if blk
+          blk.call
+        else
+          {
+            fixed: fixed,
+            lower: lower,
+            upper: upper,
+          }
+        end
+
         Tapioca::TypeVariableModule.new(
           T.cast(self, Module),
           Tapioca::TypeVariableModule::Type::Template,
           variance,
-          fixed,
-          lower,
-          upper
+          **hash,
         ).tap do |type_variable|
-          Tapioca::GenericTypeRegistry.register_type_variable(self, type_variable)
+          Tapioca::Runtime::GenericTypeRegistry.register_type_variable(self, type_variable)
         end
       end
     end
@@ -57,18 +74,6 @@ module T
   module Types
     class Simple
       module GenericPatch
-        def valid?(obj)
-          # Since `Tapioca::TypeVariable` is a `Module`, it will be wrapped by a
-          # `Simple` type. We want to always make type variable types valid, so we
-          # need to explicitly check that `raw_type` is a `Tapioca::TypeVariable`
-          # and return `true`
-          if defined?(Tapioca::TypeVariableModule) && Tapioca::TypeVariableModule === @raw_type
-            return true
-          end
-
-          obj.is_a?(@raw_type)
-        end
-
         # This method intercepts calls to the `name` method for simple types, so that
         # it can ask the name to the type if the type is generic, since, by this point,
         # we've created a clone of that type with the `name` method returning the
@@ -88,9 +93,34 @@ module T
       prepend GenericPatch
     end
   end
+
+  module Utils
+    module CoercePatch
+      def coerce(val)
+        if val.is_a?(Tapioca::TypeVariableModule)
+          val.coerce_to_type_variable
+        else
+          super
+        end
+      end
+    end
+
+    class << self
+      prepend(CoercePatch)
+    end
+  end
 end
 
 module Tapioca
+  class TypeVariable < ::T::Types::TypeVariable
+    def initialize(name, variance)
+      @name = name
+      super(variance)
+    end
+
+    attr_reader :name
+  end
+
   # This is subclassing from `Module` so that instances of this type will be modules.
   # The reason why we want that is because that means those instances will automatically
   # get bound to the constant names they are assigned to by Ruby. As a result, we don't
@@ -109,7 +139,7 @@ module Tapioca
     sig do
       params(context: Module, type: Type, variance: Symbol, fixed: T.untyped, lower: T.untyped, upper: T.untyped).void
     end
-    def initialize(context, type, variance, fixed, lower, upper) # rubocop:disable Metrics/ParameterLists
+    def initialize(context, type, variance, fixed: nil, lower: nil, upper: nil)
       @context = context
       @type = type
       @variance = variance
@@ -140,17 +170,22 @@ module Tapioca
 
     sig { returns(String) }
     def serialize
-      parts = []
-      parts << ":#{@variance}" unless @variance == :invariant
-      parts << "fixed: #{@fixed}" if @fixed
-      parts << "lower: #{@lower}" unless @lower == T.untyped
-      parts << "upper: #{@upper}" unless @upper == BasicObject
-
-      parameters = parts.join(", ")
+      fixed = @fixed.to_s if @fixed
+      upper = @upper.to_s if @upper
+      lower = @lower.to_s if @lower
+
+      TypeVariableHelper.serialize_type_variable(
+        @type.serialize,
+        @variance,
+        fixed,
+        upper,
+        lower
+      )
+    end
 
-      serialized = @type.serialize.dup
-      serialized << "(#{parameters})" unless parameters.empty?
-      serialized
+    sig { returns(Tapioca::TypeVariable) }
+    def coerce_to_type_variable
+      TypeVariable.new(name, @variance)
     end
 
     private

data/lib/tapioca/sorbet_ext/name_patch.rb

@@ -1,12 +1,18 @@
 # typed: true
 # frozen_string_literal: true
 
+# We need sorbet to compile the signature for `qualified_name_of` before applying
+# the patch to avoid an infinite loop.
+T::Utils.signature_for_method(::Tapioca::Runtime::Reflection.method(:qualified_name_of))
+
 module T
   module Types
     class Simple
       module NamePatch
         def name
-          @name ||= ::Tapioca::Reflection.name_of(@raw_type).freeze
+          # Sorbet memoizes this method into the `@name` instance variable but
+          # doing so means that types get memoized before this patch is applied
+          ::Tapioca::Runtime::Reflection.qualified_name_of(@raw_type)
         end
       end
 

data/lib/tapioca/{compilers → static}/requires_compiler.rb

@@ -4,7 +4,7 @@
 require "spoom"
 
 module Tapioca
-  module Compilers
+  module Static
     class RequiresCompiler
       extend T::Sig
 
@@ -17,7 +17,7 @@ module Tapioca
       def compile
         config = Spoom::Sorbet::Config.parse_file(@sorbet_path)
         files = collect_files(config)
-        names_in_project = files.map { |file| [File.basename(file, ".rb"), true] }.to_h
+        names_in_project = files.to_h { |file| [File.basename(file, ".rb"), true] }
         files.flat_map do |file|
           collect_requires(file).reject { |req| names_in_project[req] }
         end.sort.uniq.map do |name|

data/lib/tapioca/static/symbol_loader.rb

@@ -0,0 +1,83 @@
+# typed: strict
+# frozen_string_literal: true
+
+require "json"
+require "tempfile"
+
+module Tapioca
+  module Static
+    module SymbolLoader
+      class << self
+        extend T::Sig
+        include SorbetHelper
+        include Runtime::Reflection
+
+        sig { returns(T::Set[String]) }
+        def payload_symbols
+          unless @payload_symbols
+            output = symbol_table_json_from("-e ''", table_type: "symbol-table-full-json")
+            @payload_symbols = T.let(SymbolTableParser.parse_json(output), T.nilable(T::Set[String]))
+          end
+
+          T.must(@payload_symbols)
+        end
+
+        sig { returns(T::Set[String]) }
+        def engine_symbols
+          unless @engine_symbols
+            @engine_symbols = T.let(load_engine_symbols, T.nilable(T::Set[String]))
+          end
+          T.must(@engine_symbols)
+        end
+
+        sig { params(gem: Gemfile::GemSpec).returns(T::Set[String]) }
+        def gem_symbols(gem)
+          symbols_from_paths(gem.files)
+        end
+
+        private
+
+        sig { params(input: String, table_type: String).returns(String) }
+        def symbol_table_json_from(input, table_type: "symbol-table-json")
+          sorbet("--no-config", "--quiet", "--print=#{table_type}", input).out
+        end
+
+        sig { returns(T::Set[String]) }
+        def load_engine_symbols
+          return Set.new unless Object.const_defined?("Rails::Engine")
+
+          engine = descendants_of(Object.const_get("Rails::Engine"))
+            .reject(&:abstract_railtie?)
+            .find do |klass|
+              name = name_of(klass)
+              !name.nil? && payload_symbols.include?(name)
+            end
+
+          return Set.new unless engine
+
+          paths = engine.config.eager_load_paths.flat_map do |load_path|
+            Pathname.glob("#{load_path}/**/*.rb")
+          end
+
+          symbols_from_paths(paths)
+        rescue
+          Set.new
+        end
+
+        sig { params(paths: T::Array[Pathname]).returns(T::Set[String]) }
+        def symbols_from_paths(paths)
+          output = T.cast(Tempfile.create("sorbet") do |file|
+            file.write(Array(paths).join("\n"))
+            file.flush
+
+            symbol_table_json_from("@#{file.path.shellescape}")
+          end, T.nilable(String))
+
+          return Set.new if output.nil? || output.empty?
+
+          SymbolTableParser.parse_json(output)
+        end
+      end
+    end
+  end
+end

data/lib/tapioca/static/symbol_table_parser.rb

@@ -0,0 +1,63 @@
+# typed: strict
+# frozen_string_literal: true
+
+require "json"
+require "tempfile"
+
+module Tapioca
+  module Static
+    class SymbolTableParser
+      extend T::Sig
+
+      sig { params(json_string: String).returns(T::Set[String]) }
+      def self.parse_json(json_string)
+        obj = JSON.parse(json_string)
+
+        parser = SymbolTableParser.new
+        parser.parse_object(obj)
+        parser.symbols
+      end
+
+      sig { returns(T::Set[String]) }
+      attr_reader :symbols
+
+      sig { void }
+      def initialize
+        @symbols = T.let(Set.new, T::Set[String])
+        @parents = T.let([], T::Array[String])
+      end
+
+      sig { params(object: T::Hash[String, T.untyped]).void }
+      def parse_object(object)
+        children = object.fetch("children", [])
+
+        children.each do |child|
+          kind = child.fetch("kind")
+          name = child.fetch("name")
+          name = name.fetch("name") if name.is_a?(Hash)
+
+          next if kind.nil? || name.nil?
+
+          # TODO: CLASS is removed since v0.4.4730 of Sorbet
+          # but keeping here for backward compatibility. Remove
+          # once the minimum version is moved past that.
+          next unless ["CLASS", "CLASS_OR_MODULE", "STATIC_FIELD"].include?(kind)
+          next if name =~ /[<>()$]/
+          next if name =~ /^[0-9]+$/
+          next if name == "T::Helpers"
+
+          @symbols.add(fully_qualified_name(name))
+
+          @parents << name
+          parse_object(child)
+          @parents.pop
+        end
+      end
+
+      sig { params(name: String).returns(String) }
+      def fully_qualified_name(name)
+        [*@parents, name].join("::")
+      end
+    end
+  end
+end

data/lib/tapioca/version.rb

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

data/lib/tapioca.rb

@@ -14,7 +14,7 @@ module Tapioca
   def self.silence_warnings(&blk)
     original_verbosity = $VERBOSE
     $VERBOSE = nil
-    Gem::DefaultUserInteraction.use_ui(Gem::SilentUI.new) do
+    ::Gem::DefaultUserInteraction.use_ui(::Gem::SilentUI.new) do
       blk.call
     end
   ensure
@@ -28,7 +28,7 @@ module Tapioca
   TAPIOCA_DIR = T.let("#{SORBET_DIR}/tapioca", String)
   TAPIOCA_CONFIG_FILE = T.let("#{TAPIOCA_DIR}/config.yml", String)
 
-  DEFAULT_COMMAND = T.let("bin/tapioca", String)
+  BINARY_FILE = T.let("bin/tapioca", String)
   DEFAULT_POSTREQUIRE_FILE = T.let("#{TAPIOCA_DIR}/require.rb", String)
   DEFAULT_RBI_DIR = T.let("#{SORBET_DIR}/rbi", String)
   DEFAULT_DSL_DIR = T.let("#{DEFAULT_RBI_DIR}/dsl", String)
@@ -43,9 +43,4 @@ module Tapioca
   }.freeze, T::Hash[String, String])
 end
 
-require "tapioca/reflection"
-require "tapioca/trackers"
-require "tapioca/compilers/dsl/base"
-require "tapioca/compilers/dynamic_mixin_compiler"
-require "tapioca/helpers/active_record_column_type_helper"
 require "tapioca/version"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tapioca
 version: !ruby/object:Gem::Version
-  version: 0.6.4
+  version: 0.7.2
 platform: ruby
 authors:
 - Ufuk Kayserilioglu
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-02-11 00:00:00.000000000 Z
+date: 2022-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -50,7 +50,7 @@ dependencies:
         version: 0.0.0
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.9
+        version: 0.0.14
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -60,9 +60,9 @@ dependencies:
         version: 0.0.0
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.9
+        version: 0.0.14
 - !ruby/object:Gem::Dependency
-  name: sorbet-static
+  name: sorbet-runtime
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -76,7 +76,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.5.9204
 - !ruby/object:Gem::Dependency
-  name: sorbet-runtime
+  name: sorbet-static
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -98,7 +98,7 @@ dependencies:
         version: 1.1.0
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.4
+        version: 1.1.11
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -108,7 +108,7 @@ dependencies:
         version: 1.1.0
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.4
+        version: 1.1.11
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -151,72 +151,93 @@ files:
 - exe/tapioca
 - lib/tapioca.rb
 - lib/tapioca/cli.rb
-- lib/tapioca/compilers/dsl/aasm.rb
-- lib/tapioca/compilers/dsl/action_controller_helpers.rb
-- lib/tapioca/compilers/dsl/action_mailer.rb
-- lib/tapioca/compilers/dsl/active_job.rb
-- lib/tapioca/compilers/dsl/active_model_attributes.rb
-- lib/tapioca/compilers/dsl/active_model_secure_password.rb
-- lib/tapioca/compilers/dsl/active_record_associations.rb
-- lib/tapioca/compilers/dsl/active_record_columns.rb
-- lib/tapioca/compilers/dsl/active_record_enum.rb
-- lib/tapioca/compilers/dsl/active_record_fixtures.rb
-- lib/tapioca/compilers/dsl/active_record_relations.rb
-- lib/tapioca/compilers/dsl/active_record_scope.rb
-- lib/tapioca/compilers/dsl/active_record_typed_store.rb
-- lib/tapioca/compilers/dsl/active_resource.rb
-- lib/tapioca/compilers/dsl/active_storage.rb
-- lib/tapioca/compilers/dsl/active_support_concern.rb
-- lib/tapioca/compilers/dsl/active_support_current_attributes.rb
-- lib/tapioca/compilers/dsl/base.rb
-- lib/tapioca/compilers/dsl/config.rb
-- lib/tapioca/compilers/dsl/extensions/frozen_record.rb
-- lib/tapioca/compilers/dsl/frozen_record.rb
-- lib/tapioca/compilers/dsl/helper/active_record_constants.rb
-- lib/tapioca/compilers/dsl/identity_cache.rb
-- lib/tapioca/compilers/dsl/mixed_in_class_attributes.rb
-- lib/tapioca/compilers/dsl/param_helper.rb
-- lib/tapioca/compilers/dsl/protobuf.rb
-- lib/tapioca/compilers/dsl/rails_generators.rb
-- lib/tapioca/compilers/dsl/sidekiq_worker.rb
-- lib/tapioca/compilers/dsl/smart_properties.rb
-- lib/tapioca/compilers/dsl/state_machines.rb
-- lib/tapioca/compilers/dsl/url_helpers.rb
-- lib/tapioca/compilers/dsl_compiler.rb
-- lib/tapioca/compilers/dynamic_mixin_compiler.rb
-- lib/tapioca/compilers/requires_compiler.rb
-- lib/tapioca/compilers/sorbet.rb
-- lib/tapioca/compilers/symbol_table/symbol_generator.rb
-- lib/tapioca/compilers/symbol_table/symbol_loader.rb
-- lib/tapioca/compilers/symbol_table_compiler.rb
-- lib/tapioca/compilers/todos_compiler.rb
+- lib/tapioca/commands.rb
+- lib/tapioca/commands/command.rb
+- lib/tapioca/commands/dsl.rb
+- lib/tapioca/commands/gem.rb
+- lib/tapioca/commands/init.rb
+- lib/tapioca/commands/require.rb
+- lib/tapioca/commands/todo.rb
+- lib/tapioca/dsl/compiler.rb
+- lib/tapioca/dsl/compilers.rb
+- lib/tapioca/dsl/compilers/aasm.rb
+- lib/tapioca/dsl/compilers/action_controller_helpers.rb
+- lib/tapioca/dsl/compilers/action_mailer.rb
+- lib/tapioca/dsl/compilers/active_job.rb
+- lib/tapioca/dsl/compilers/active_model_attributes.rb
+- lib/tapioca/dsl/compilers/active_model_secure_password.rb
+- lib/tapioca/dsl/compilers/active_record_associations.rb
+- lib/tapioca/dsl/compilers/active_record_columns.rb
+- lib/tapioca/dsl/compilers/active_record_enum.rb
+- lib/tapioca/dsl/compilers/active_record_fixtures.rb
+- lib/tapioca/dsl/compilers/active_record_relations.rb
+- lib/tapioca/dsl/compilers/active_record_scope.rb
+- lib/tapioca/dsl/compilers/active_record_typed_store.rb
+- lib/tapioca/dsl/compilers/active_resource.rb
+- lib/tapioca/dsl/compilers/active_storage.rb
+- lib/tapioca/dsl/compilers/active_support_concern.rb
+- lib/tapioca/dsl/compilers/active_support_current_attributes.rb
+- lib/tapioca/dsl/compilers/config.rb
+- lib/tapioca/dsl/compilers/frozen_record.rb
+- lib/tapioca/dsl/compilers/identity_cache.rb
+- lib/tapioca/dsl/compilers/mixed_in_class_attributes.rb
+- lib/tapioca/dsl/compilers/protobuf.rb
+- lib/tapioca/dsl/compilers/rails_generators.rb
+- lib/tapioca/dsl/compilers/sidekiq_worker.rb
+- lib/tapioca/dsl/compilers/smart_properties.rb
+- lib/tapioca/dsl/compilers/state_machines.rb
+- lib/tapioca/dsl/compilers/url_helpers.rb
+- lib/tapioca/dsl/extensions/frozen_record.rb
+- lib/tapioca/dsl/helpers/active_record_column_type_helper.rb
+- lib/tapioca/dsl/helpers/active_record_constants_helper.rb
+- lib/tapioca/dsl/helpers/param_helper.rb
+- lib/tapioca/dsl/pipeline.rb
 - lib/tapioca/executor.rb
+- lib/tapioca/gem/events.rb
+- lib/tapioca/gem/listeners.rb
+- lib/tapioca/gem/listeners/base.rb
+- lib/tapioca/gem/listeners/dynamic_mixins.rb
+- lib/tapioca/gem/listeners/methods.rb
+- lib/tapioca/gem/listeners/mixins.rb
+- lib/tapioca/gem/listeners/remove_empty_payload_scopes.rb
+- lib/tapioca/gem/listeners/sorbet_enums.rb
+- lib/tapioca/gem/listeners/sorbet_helpers.rb
+- lib/tapioca/gem/listeners/sorbet_props.rb
+- lib/tapioca/gem/listeners/sorbet_required_ancestors.rb
+- lib/tapioca/gem/listeners/sorbet_signatures.rb
+- lib/tapioca/gem/listeners/sorbet_type_variables.rb
+- lib/tapioca/gem/listeners/subconstants.rb
+- lib/tapioca/gem/listeners/yard_doc.rb
+- lib/tapioca/gem/pipeline.rb
 - lib/tapioca/gemfile.rb
-- lib/tapioca/generators.rb
-- lib/tapioca/generators/base.rb
-- lib/tapioca/generators/dsl.rb
-- lib/tapioca/generators/gem.rb
-- lib/tapioca/generators/init.rb
-- lib/tapioca/generators/require.rb
-- lib/tapioca/generators/todo.rb
-- lib/tapioca/generic_type_registry.rb
-- lib/tapioca/helpers/active_record_column_type_helper.rb
 - lib/tapioca/helpers/cli_helper.rb
 - lib/tapioca/helpers/config_helper.rb
+- lib/tapioca/helpers/shims_helper.rb
+- lib/tapioca/helpers/signatures_helper.rb
+- lib/tapioca/helpers/sorbet_helper.rb
 - lib/tapioca/helpers/test/content.rb
+- lib/tapioca/helpers/test/dsl_compiler.rb
 - lib/tapioca/helpers/test/isolation.rb
 - lib/tapioca/helpers/test/template.rb
+- lib/tapioca/helpers/type_variable_helper.rb
 - lib/tapioca/internal.rb
-- lib/tapioca/loader.rb
 - lib/tapioca/rbi_ext/model.rb
-- lib/tapioca/reflection.rb
+- lib/tapioca/rbi_formatter.rb
+- lib/tapioca/runtime/dynamic_mixin_compiler.rb
+- lib/tapioca/runtime/generic_type_registry.rb
+- lib/tapioca/runtime/loader.rb
+- lib/tapioca/runtime/reflection.rb
+- lib/tapioca/runtime/trackers.rb
+- lib/tapioca/runtime/trackers/autoload.rb
+- lib/tapioca/runtime/trackers/constant_definition.rb
+- lib/tapioca/runtime/trackers/mixin.rb
+- lib/tapioca/runtime/trackers/required_ancestor.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/trackers.rb
-- lib/tapioca/trackers/autoload.rb
-- lib/tapioca/trackers/constant_definition.rb
-- lib/tapioca/trackers/mixin.rb
+- lib/tapioca/static/requires_compiler.rb
+- lib/tapioca/static/symbol_loader.rb
+- lib/tapioca/static/symbol_table_parser.rb
 - lib/tapioca/version.rb
 homepage: https://github.com/Shopify/tapioca
 licenses: