tapioca 0.4.15 → 0.4.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 41fd25f2497122191c01ef7e9376d6d56e070e9ec5e7626fd1ace153a1b01fd5
-  data.tar.gz: 390bdd0023f086be720f722d530c00cee4eafd603052259331a353c4fa0d3a9b
+  metadata.gz: 80a1d62bade6d75e6ec3a7de5a06f96eb7bc4ea002a70a2503d74393e834e864
+  data.tar.gz: 235cd2477d3f07176bdbddd5653c7a5cff86516f81dd196a65043a5b2f7d68dc
 SHA512:
-  metadata.gz: 1f25290fb6e4544329b79b7eb20191126cddf1e9707f1aeb98b60d1dd24ea1f9c7df525ccfb5fd2b50fb12929b773b9adf9143b98da859903c29cdf3125484f6
-  data.tar.gz: 8c7adbe3d3881118487945b46638d5b0bdd29d732424f071c7efb39048db80c7cdd9601bc51e306742aaeae02b002661204e5c18eeb8162c138507269a794c01
+  metadata.gz: 23bc803e2b251dfb4ef4c82b0793336810ca9d551355ac1cd8d514c1484ef096d9b00a12cda214ce9b4b83ccf1620a32159035a5bf798a4c2d8a3e96b026e352
+  data.tar.gz: 606e2ad0e81c87e7f89b5933fa160d1b7825dee6f3f3451042ad2ec047a672041b559ed9cb79cf75aa0af7020b9aed2da85e1f52f36bb39b909f5037f8865717

data/lib/tapioca/compilers/sorbet.rb

@@ -8,6 +8,7 @@ module Tapioca
   module Compilers
     module Sorbet
       SORBET = Pathname.new(Gem::Specification.find_by_name("sorbet-static").full_gem_path) / "libexec" / "sorbet"
+      EXE_PATH_ENV_VAR = "TAPIOCA_SORBET_EXE"
 
       class << self
         extend(T::Sig)
@@ -26,7 +27,9 @@ module Tapioca
 
         sig { returns(String) }
         def sorbet_path
-          SORBET.to_s.shellescape
+          sorbet_path = ENV.fetch(EXE_PATH_ENV_VAR, SORBET)
+          sorbet_path = SORBET if sorbet_path.empty?
+          sorbet_path.to_s.shellescape
         end
       end
     end

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

@@ -95,6 +95,7 @@ module Tapioca
           return if alias_namespaced?(name)
           return if seen?(name)
           return unless parent_declares_constant?(name)
+          return if T::Enum === constant # T::Enum instances are defined via `compile_enums`
 
           mark_seen(name)
           compile_constant(name, constant)
@@ -183,6 +184,7 @@ module Tapioca
               compile_mixins(constant),
               compile_mixes_in_class_methods(constant),
               compile_props(constant),
+              compile_enums(constant),
               methods,
             ].select { |b| b != "" }.join("\n\n")
           end
@@ -217,6 +219,23 @@ module Tapioca
           end.join("\n")
         end
 
+        sig { params(constant: Module).returns(String) }
+        def compile_enums(constant)
+          return "" unless constant < T::Enum
+
+          enums = T.cast(constant, T::Enum).values.map do |enum_type|
+            enum_type.instance_variable_get(:@const_name).to_s
+          end
+
+          content = [
+            indented('enums do'),
+            *enums.map { |e| indented("  #{e} = new") }.join("\n"),
+            indented('end'),
+          ]
+
+          content.join("\n")
+        end
+
         sig { params(name: String, constant: Module).returns(T.nilable(String)) }
         def compile_subconstants(name, constant)
           output = constants_of(constant).sort.uniq.map do |constant_name|
@@ -345,9 +364,13 @@ module Tapioca
             end
 
             define_singleton_method(:include) do |mod|
-              before = singleton_class.ancestors
-              super(mod).tap do
-                mixins_from_modules[mod] = singleton_class.ancestors - before
+              begin
+                before = singleton_class.ancestors
+                super(mod).tap do
+                  mixins_from_modules[mod] = singleton_class.ancestors - before
+                end
+              rescue Exception # rubocop:disable Lint/RescueException
+                # this is a best effort, bail if we can't perform this
               end
             end
 

data/lib/tapioca/generator.rb

@@ -121,6 +121,8 @@ module Tapioca
       load_application(eager_load: requested_constants.empty?)
       load_dsl_generators
 
+      rbi_files_to_purge = existing_rbi_filenames(requested_constants)
+
       say("Compiling DSL RBI files...")
       say("")
 
@@ -133,7 +135,17 @@ module Tapioca
       )
 
       compiler.run do |constant, contents|
-        compile_dsl_rbi(constant, contents)
+        filename = compile_dsl_rbi(constant, contents)
+        rbi_files_to_purge.delete(filename) if filename
+      end
+
+      unless rbi_files_to_purge.empty?
+        say("")
+        say("Removing stale RBI files...")
+
+        rbi_files_to_purge.sort.each do |filename|
+          remove(filename)
+        end
       end
 
       say("")
@@ -253,13 +265,38 @@ module Tapioca
 
     sig { params(constant_names: T::Array[String]).returns(T::Array[Module]) }
     def constantize(constant_names)
-      constant_names.map do |name|
+      constant_map = constant_names.map do |name|
         begin
-          name.constantize
+          [name, name.constantize]
         rescue NameError
-          nil
+          [name, nil]
+        end
+      end.to_h
+
+      unprocessable_constants = constant_map.select { |_, v| v.nil? }
+      unless unprocessable_constants.empty?
+        unprocessable_constants.each do |name, _|
+          say("Error: Cannot find constant '#{name}'", :red)
+          remove(dsl_rbi_filename(name))
+        end
+
+        exit(1)
+      end
+
+      constant_map.values
+    end
+
+    sig { params(requested_constants: T::Array[String]).returns(T::Set[Pathname]) }
+    def existing_rbi_filenames(requested_constants)
+      filenames = if requested_constants.empty?
+        Pathname.glob(config.outpath / "**/*.rbi")
+      else
+        requested_constants.map do |constant_name|
+          dsl_rbi_filename(constant_name)
         end
-      end.compact
+      end
+
+      filenames.to_set
     end
 
     sig { returns(T::Hash[String, String]) }
@@ -277,6 +314,11 @@ module Tapioca
         .to_h
     end
 
+    sig { params(constant_name: String).returns(Pathname) }
+    def dsl_rbi_filename(constant_name)
+      config.outpath / "#{constant_name.underscore}.rbi"
+    end
+
     sig { params(gem_name: String, version: String).returns(Pathname) }
     def gem_rbi_filename(gem_name, version)
       config.outpath / "#{gem_name}@#{version}.rbi"
@@ -316,6 +358,7 @@ module Tapioca
 
     sig { params(filename: Pathname).void }
     def remove(filename)
+      return unless filename.exist?
       say("-- Removing: #{filename}")
       filename.unlink
     end
@@ -456,7 +499,7 @@ module Tapioca
       end
     end
 
-    sig { params(constant: Module, contents: String).void }
+    sig { params(constant: Module, contents: String).returns(T.nilable(Pathname)) }
     def compile_dsl_rbi(constant, contents)
       return if contents.nil?
 
@@ -476,6 +519,8 @@ module Tapioca
       File.write(filename, out)
       say("Wrote: ", [:green])
       say(filename)
+
+      filename
     end
   end
 end

data/lib/tapioca/loader.rb

@@ -99,17 +99,28 @@ module Tapioca
 
     sig { void }
     def eager_load_rails_app
+      rails = Object.const_get("Rails")
+      application = rails.application
+
       if Object.const_defined?("ActiveSupport")
         Object.const_get("ActiveSupport").run_load_hooks(
           :before_eager_load,
-          Object.const_get("Rails").application
+          application
         )
       end
+
       if Object.const_defined?("Zeitwerk::Loader")
         zeitwerk_loader = Object.const_get("Zeitwerk::Loader")
         zeitwerk_loader.eager_load_all
       end
-      Object.const_get("Rails").autoloaders.each(&:eager_load)
+
+      if rails.respond_to?(:autoloaders) && rails.autoloaders.zeitwerk_enabled?
+        rails.autoloaders.each(&:eager_load)
+      end
+
+      if application.config.respond_to?(:eager_load_namespaces)
+        application.config.eager_load_namespaces.each(&:eager_load!)
+      end
     end
 
     sig { void }

data/lib/tapioca/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tapioca
 version: !ruby/object:Gem::Version
-  version: 0.4.15
+  version: 0.4.16
 platform: ruby
 authors:
 - Ufuk Kayserilioglu
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-02-25 00:00:00.000000000 Z
+date: 2021-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler