tapioca 0.4.27 → 0.5.0

data/lib/tapioca/sorbet_ext/fixed_hash_patch.rb

@@ -13,7 +13,7 @@ module T
           end
         end
 
-        "{#{entries.join(', ')}}"
+        "{#{entries.join(", ")}}"
       end
     end
   end

data/lib/tapioca/sorbet_ext/generic_name_patch.rb

@@ -23,16 +23,16 @@ module T
       def type_member(variance = :invariant, fixed: nil, lower: T.untyped, upper: BasicObject)
         # `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.
-        type_member = super
-        Tapioca::GenericTypeRegistry.register_type_member(self, type_member, fixed, lower, upper)
+        type_member = Tapioca::TypeMember.new(variance, fixed, lower, upper)
+        Tapioca::GenericTypeRegistry.register_type_variable(self, type_member)
         type_member
       end
 
       def type_template(variance = :invariant, fixed: nil, lower: T.untyped, upper: BasicObject)
         # `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.
-        type_template = super
-        Tapioca::GenericTypeRegistry.register_type_template(self, type_template, fixed, lower, upper)
+        type_template = Tapioca::TypeTemplate.new(variance, fixed, lower, upper)
+        Tapioca::GenericTypeRegistry.register_type_variable(self, type_template)
         type_template
       end
     end
@@ -64,3 +64,71 @@ module T
     end
   end
 end
+
+module Tapioca
+  class TypeMember < T::Types::TypeMember
+    extend T::Sig
+
+    sig { returns(T.nilable(String)) }
+    attr_accessor :name
+
+    sig { returns(T.untyped) }
+    attr_reader :fixed, :lower, :upper
+
+    sig { params(variance: Symbol, fixed: T.untyped, lower: T.untyped, upper: T.untyped).void }
+    def initialize(variance, fixed, lower, upper)
+      super(variance)
+      @fixed = fixed
+      @lower = lower
+      @upper = upper
+    end
+
+    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(", ")
+
+      serialized = +"type_member"
+      serialized << "(#{parameters})" unless parameters.empty?
+      serialized
+    end
+  end
+
+  class TypeTemplate < T::Types::TypeTemplate
+    extend T::Sig
+
+    sig { returns(T.nilable(String)) }
+    attr_accessor :name
+
+    sig { returns(T.untyped) }
+    attr_reader :fixed, :lower, :upper
+
+    sig { params(variance: Symbol, fixed: T.untyped, lower: T.untyped, upper: T.untyped).void }
+    def initialize(variance, fixed, lower, upper)
+      super(variance)
+      @fixed = fixed
+      @lower = lower
+      @upper = upper
+    end
+
+    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(", ")
+
+      serialized = +"type_template"
+      serialized << "(#{parameters})" unless parameters.empty?
+      serialized
+    end
+  end
+end

data/lib/tapioca/sorbet_ext/name_patch.rb

@@ -6,7 +6,7 @@ module T
     class Simple
       module NamePatch
         def name
-          @name ||= Module.instance_method(:name).bind(@raw_type).call.freeze
+          @name ||= ::Tapioca::Reflection.name_of(@raw_type).freeze
         end
       end
 

data/lib/tapioca/version.rb

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

data/lib/tapioca.rb

@@ -17,6 +17,7 @@ module Tapioca
   class Error < StandardError; end
 end
 
-require "tapioca/constant_locator"
+require "tapioca/reflection"
 require "tapioca/compilers/dsl/base"
+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.4.27
+  version: 0.5.0
 platform: ruby
 authors:
 - Ufuk Kayserilioglu
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-09-16 00:00:00.000000000 Z
+date: 2021-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -42,47 +42,47 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.12.2
 - !ruby/object:Gem::Dependency
-  name: sorbet-static
+  name: rbi
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.4471
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.4471
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: sorbet-runtime
+  name: sorbet-static
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.4.4471
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.4.4471
 - !ruby/object:Gem::Dependency
-  name: parlour
+  name: sorbet-runtime
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: spoom
   requirement: !ruby/object:Gem::Requirement
@@ -111,6 +111,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.19.2
+- !ruby/object:Gem::Dependency
+  name: unparser
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
 email:
 - ruby@shopify.com
@@ -125,18 +139,22 @@ files:
 - exe/tapioca
 - lib/tapioca.rb
 - lib/tapioca/cli.rb
-- lib/tapioca/cli/main.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_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_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/frozen_record.rb
 - lib/tapioca/compilers/dsl/identity_cache.rb
 - lib/tapioca/compilers/dsl/protobuf.rb
@@ -154,20 +172,14 @@ files:
 - lib/tapioca/config.rb
 - lib/tapioca/config_builder.rb
 - lib/tapioca/constant_locator.rb
-- lib/tapioca/core_ext/class.rb
-- lib/tapioca/core_ext/string.rb
 - lib/tapioca/gemfile.rb
 - lib/tapioca/generator.rb
 - lib/tapioca/generic_type_registry.rb
+- lib/tapioca/helpers/active_record_column_type_helper.rb
 - lib/tapioca/internal.rb
 - lib/tapioca/loader.rb
-- lib/tapioca/rbi/model.rb
-- lib/tapioca/rbi/printer.rb
-- lib/tapioca/rbi/rewriters/group_nodes.rb
-- lib/tapioca/rbi/rewriters/nest_non_public_methods.rb
-- lib/tapioca/rbi/rewriters/nest_singleton_methods.rb
-- lib/tapioca/rbi/rewriters/sort_nodes.rb
-- lib/tapioca/rbi/visitor.rb
+- lib/tapioca/rbi_ext/model.rb
+- lib/tapioca/reflection.rb
 - lib/tapioca/sorbet_ext/fixed_hash_patch.rb
 - lib/tapioca/sorbet_ext/generic_name_patch.rb
 - lib/tapioca/sorbet_ext/name_patch.rb
@@ -185,7 +197,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.4'
+      version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="

data/lib/tapioca/cli/main.rb

@@ -1,146 +0,0 @@
-# typed: true
-# frozen_string_literal: true
-
-module Tapioca
-  module Cli
-    class Main < Thor
-      include(Thor::Actions)
-
-      class_option :prerequire,
-                    aliases: ["--pre", "-b"],
-                    banner: "file",
-                    desc: "A file to be required before Bundler.require is called"
-      class_option :postrequire,
-                    aliases: ["--post", "-a"],
-                    banner: "file",
-                    desc: "A file to be required after Bundler.require is called"
-      class_option :outdir,
-                    aliases: ["--out", "-o"],
-                    banner: "directory",
-                    desc: "The output directory for generated RBI files"
-      class_option :generate_command,
-                    aliases: ["--cmd", "-c"],
-                    banner: "command",
-                    desc: "The command to run to regenerate RBI files"
-      class_option :exclude,
-                    aliases: ["-x"],
-                    type: :array,
-                    banner: "gem [gem ...]",
-                    desc: "Excludes the given gem(s) from RBI generation"
-      class_option :typed_overrides,
-                    aliases: ["--typed", "-t"],
-                    type: :hash,
-                    banner: "gem:level [gem:level ...]",
-                    desc: "Overrides for typed sigils for generated gem RBIs"
-
-      map T.unsafe(%w[--version -v] => :__print_version)
-
-      desc "init", "initializes folder structure"
-      def init
-        create_config
-        create_post_require
-        generate_binstub
-      end
-
-      desc "require", "generate the list of files to be required by tapioca"
-      def require
-        Tapioca.silence_warnings do
-          generator.build_requires
-        end
-      end
-
-      desc "todo", "generate the list of unresolved constants"
-      def todo
-        Tapioca.silence_warnings do
-          generator.build_todos
-        end
-      end
-
-      desc "dsl [constant...]", "generate RBIs for dynamic methods"
-      option :generators,
-        type: :array,
-        aliases: ["--gen", "-g"],
-        banner: "generator [generator ...]",
-        desc: "Only run supplied DSL generators"
-      option :verify,
-        type: :boolean,
-        default: false,
-        desc: "Verifies RBIs are up-to-date"
-      option :quiet,
-        aliases: ["-q"],
-        type: :boolean,
-        desc: "Supresses file creation output"
-      def dsl(*constants)
-        Tapioca.silence_warnings do
-          generator.build_dsl(constants, should_verify: options[:verify], quiet: options[:quiet])
-        end
-      end
-
-      desc "generate [gem...]", "generate RBIs from gems"
-      def generate(*gems)
-        Tapioca.silence_warnings do
-          generator.build_gem_rbis(gems)
-        end
-      end
-
-      desc "sync", "sync RBIs to Gemfile"
-      def sync
-        Tapioca.silence_warnings do
-          generator.sync_rbis_with_gemfile
-        end
-      end
-
-      desc "--version, -v", "show version"
-      def __print_version
-        puts "Tapioca v#{Tapioca::VERSION}"
-      end
-
-      private
-
-      def create_config
-        create_file(Config::SORBET_CONFIG, skip: true) do
-          <<~CONTENT
-            --dir
-            .
-          CONTENT
-        end
-      end
-
-      def create_post_require
-        create_file(Config::DEFAULT_POSTREQUIRE, skip: true) do
-          <<~CONTENT
-            # typed: false
-            # frozen_string_literal: true
-
-            # Add your extra requires here
-          CONTENT
-        end
-      end
-
-      def generate_binstub
-        bin_stub_exists = File.exist?("bin/tapioca")
-        installer = Bundler::Installer.new(Bundler.root, Bundler.definition)
-        spec = Bundler.definition.specs.find { |s| s.name == "tapioca" }
-        installer.generate_bundler_executable_stubs(spec, { force: true })
-        if bin_stub_exists
-          shell.say_status(:force, "bin/tapioca", :yellow)
-        else
-          shell.say_status(:create, "bin/tapioca", :green)
-        end
-      end
-
-      no_commands do
-        def self.exit_on_failure?
-          true
-        end
-
-        def generator
-          current_command = T.must(current_command_chain.first)
-          @generator ||= Generator.new(
-            ConfigBuilder.from_options(current_command, options)
-          )
-        end
-      end
-    end
-  end
-end

data/lib/tapioca/core_ext/class.rb

@@ -1,28 +0,0 @@
-# typed: strict
-# frozen_string_literal: true
-
-class Class
-  extend T::Sig
-
-  # Returns an array with all classes that are < than its receiver.
-  #
-  #   class C; end
-  #   C.descendants # => []
-  #
-  #   class B < C; end
-  #   C.descendants # => [B]
-  #
-  #   class A < B; end
-  #   C.descendants # => [B, A]
-  #
-  #   class D < C; end
-  #   C.descendants # => [B, A, D]
-  sig { returns(T::Array[Class]) }
-  def descendants
-    result = ObjectSpace.each_object(singleton_class).reject do |k|
-      T.cast(k, Module).singleton_class? || k == self
-    end
-
-    T.cast(result, T::Array[Class])
-  end
-end