tapioca 0.14.4 → 0.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6f75efebcf13cb6839056d8869fe4d2d6e2051605a90edf517904d8a14a33913
-  data.tar.gz: 41fcfa1d3da8c919577146cbbc6a92ad07a62b9e7ac077642ac78290ffb2ecc2
+  metadata.gz: f93b130a7096e0712ccd91b8406d92ce537287afafc8aad7586e7f670d88a131
+  data.tar.gz: b2cc1e6d2658002600c1edd9c5c88b22704e3f4170ff19aff93bb9fc21df688e
 SHA512:
-  metadata.gz: ea78667fe6cf4f54a0b4dd004de2ab465548a231aa2b35d52de83d89e43a0cbd0b21989e249c90415f41dfb5ac8c5082b9a84575bc4eed83418eab9a4a4f33b1
-  data.tar.gz: 05ea62993f5983a3fb69285f13a07678ddc912e5b7aa5657e81e02906747ab19f17d63a26141deb764d217827ba8097643e3797acf98c31f2323390a52780659
+  metadata.gz: aa10ff7ffd4768cea802b63dc68273fa0abf7f69b61a83b1325669e97d706cb8afcc704093c93596a830662fe04b01ad2ded3c166abd69a5c69097bd28f586c9
+  data.tar.gz: 63499428de9374990372beb46ece3f98d0f446ba28ef02bfa181179113e37e587ff9867bbe0d729d67c03ddb2813943f6f04d14f2065589a603a766a06ce8096

data/lib/tapioca/commands/annotations.rb

@@ -46,22 +46,22 @@ module Tapioca
         GitAttributes.create_vendored_attribute_file(@outpath)
       end
 
-      sig { returns(T::Array[String]) }
+      sig { returns(T::Array[GemInfo]) }
       def list_gemfile_gems
         say("Listing gems from Gemfile.lock... ", [:blue, :bold])
         gemfile = Bundler.read_file("Gemfile.lock")
         parser = Bundler::LockfileParser.new(gemfile)
-        gem_names = parser.specs.map(&:name)
+        gem_info = parser.specs.map { |spec| GemInfo.from_spec(spec) }
         say("Done", :green)
-        gem_names
+        gem_info
       end
 
-      sig { params(project_gems: T::Array[String]).void }
+      sig { params(project_gems: T::Array[GemInfo]).void }
       def remove_expired_annotations(project_gems)
         say("Removing annotations for gems that have been removed... ", [:blue, :bold])
 
         annotations = Pathname.glob(@outpath.join("*.rbi")).map { |f| f.basename(".*").to_s }
-        expired = annotations - project_gems
+        expired = annotations - project_gems.map(&:name)
 
         if expired.empty?
           say(" Nothing to do")
@@ -109,14 +109,14 @@ module Tapioca
         index
       end
 
-      sig { params(gem_names: T::Array[String]).returns(T::Array[String]) }
-      def fetch_annotations(gem_names)
+      sig { params(project_gems: T::Array[GemInfo]).returns(T::Array[String]) }
+      def fetch_annotations(project_gems)
         say("Fetching gem annotations from central repository... ", [:blue, :bold])
-        fetchable_gems = T.let(Hash.new { |h, k| h[k] = [] }, T::Hash[String, T::Array[String]])
+        fetchable_gems = T.let(Hash.new { |h, k| h[k] = [] }, T::Hash[GemInfo, T::Array[String]])
 
-        gem_names.each_with_object(fetchable_gems) do |gem_name, hash|
+        project_gems.each_with_object(fetchable_gems) do |gem_info, hash|
           @indexes.each do |uri, index|
-            T.must(hash[gem_name]) << uri if index.has_gem?(gem_name)
+            T.must(hash[gem_info]) << uri if index.has_gem?(gem_info.name)
           end
         end
 
@@ -127,13 +127,16 @@ module Tapioca
         end
 
         say("\n")
-        fetched_gems = fetchable_gems.select { |gem_name, repo_uris| fetch_annotation(repo_uris, gem_name) }
+        fetched_gems = fetchable_gems.select { |gem_info, repo_uris| fetch_annotation(repo_uris, gem_info) }
         say("\nDone", :green)
-        fetched_gems.keys.sort
+        fetched_gems.keys.map(&:name).sort
       end
 
-      sig { params(repo_uris: T::Array[String], gem_name: String).void }
-      def fetch_annotation(repo_uris, gem_name)
+      sig { params(repo_uris: T::Array[String], gem_info: GemInfo).void }
+      def fetch_annotation(repo_uris, gem_info)
+        gem_name = gem_info.name
+        gem_version = gem_info.version
+
         contents = repo_uris.map do |repo_uri|
           fetch_file(repo_uri, "#{CENTRAL_REPO_ANNOTATIONS_DIR}/#{gem_name}.rbi")
         end
@@ -142,6 +145,7 @@ module Tapioca
         return unless content
 
         content = apply_typed_override(gem_name, content)
+        content = filter_versions(gem_version, content)
         content = add_header(gem_name, content)
 
         say("\n  Fetched #{set_color(gem_name, :yellow, :bold)}", :green)
@@ -221,6 +225,14 @@ module Tapioca
         Spoom::Sorbet::Sigils.update_sigil(content, strictness)
       end
 
+      sig { params(gem_version: ::Gem::Version, content: String).returns(String) }
+      def filter_versions(gem_version, content)
+        rbi = RBI::Parser.parse_string(content)
+        rbi.filter_versions!(gem_version)
+
+        rbi.string
+      end
+
       sig { params(gem_name: String, contents: T::Array[String]).returns(T.nilable(String)) }
       def merge_files(gem_name, contents)
         return if contents.empty?

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

@@ -190,7 +190,7 @@ module Tapioca
             # Grab all Spawn methods
             query_methods |= ActiveRecord::SpawnMethods.instance_methods(false)
             # Remove the ones we know are private API
-            query_methods -= [:arel, :build_subquery, :construct_join_dependency, :extensions, :spawn]
+            query_methods -= [:all, :arel, :build_subquery, :construct_join_dependency, :extensions, :spawn]
             # Remove "group" which needs a custom return type for GroupChains
             query_methods -= [:group]
             # Remove "where" which needs a custom return type for WhereChains

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

@@ -231,7 +231,7 @@ module Tapioca
             "fetch_#{suffix}",
             class_method: true,
             parameters: parameters,
-            return_type: type,
+            return_type: field.unique ? type : COLLECTION_TYPE.call(type),
           )
 
           klass.create_method(

data/lib/tapioca/gem_info.rb

@@ -0,0 +1,18 @@
+# typed: strict
+# frozen_string_literal: true
+
+module Tapioca
+  class GemInfo < T::Struct
+    const :name, String
+    const :version, ::Gem::Version
+
+    class << self
+      extend(T::Sig)
+
+      sig { params(spec: Bundler::LazySpecification).returns(GemInfo) }
+      def from_spec(spec)
+        new(name: spec.name, version: spec.version)
+      end
+    end
+  end
+end

data/lib/tapioca/internal.rb

@@ -45,6 +45,7 @@ require "tapioca/helpers/env_helper"
 
 require "tapioca/repo_index"
 require "tapioca/gemfile"
+require "tapioca/gem_info"
 require "tapioca/executor"
 
 require "tapioca/static/symbol_table_parser"

data/lib/tapioca/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tapioca
 version: !ruby/object:Gem::Version
-  version: 0.14.4
+  version: 0.15.0
 platform: ruby
 authors:
 - Ufuk Kayserilioglu
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-06-20 00:00:00.000000000 Z
+date: 2024-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -228,6 +228,7 @@ files:
 - lib/tapioca/gem/listeners/subconstants.rb
 - lib/tapioca/gem/listeners/yard_doc.rb
 - lib/tapioca/gem/pipeline.rb
+- lib/tapioca/gem_info.rb
 - lib/tapioca/gemfile.rb
 - lib/tapioca/helpers/cli_helper.rb
 - lib/tapioca/helpers/config_helper.rb