rails-on-sorbet 0.3.4 → 0.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f489d9f4fc449469fc2c648b63cce27cf7f6765cf119003037567414d8d82554
-  data.tar.gz: 16383eef9597808df2fe6e1b044ded34c3a3d1cbfcb26f0b029a30e0195171d1
+  metadata.gz: 3c69ce8e6ba929ec4b1b32e4c95a67a8ae725df81e960e0cccceb05472c114e5
+  data.tar.gz: b5736376c29c5a0d82275a5a82eb48743401293a4ed0cad2343d063abc9e1803
 SHA512:
-  metadata.gz: 3ad359e0b378b16ab174854a6a8d552d17b17eb82702c92e4fb06fb6919e42bc543141832c9d91b8be3faa9aa6dcd081e01060484fe4ffb80731d2542730431a
-  data.tar.gz: 3319c64c51f3002bed9d4016aef5c9d4d1216e508212b2eeee6d4190ee792aedbf470cc2caca698eb3dac232ded938fda41452d45a3076528ce98a73ee4b7bd5
+  metadata.gz: cd4ac3dc4916298efbee9e558750f52d848b438d9b89f0c0f4e5844d2ce0296e58608c4749b7efbe3fb870cd2783daa7a58dc5f878168aef2703aed62bb4c8f9
+  data.tar.gz: '0419b6a41c67225f443ab3b2575eee9d66009fc3f51fd2b41fcdcaa697118a8197db9fc6eeaa24803e7e2574e4e9a104d27f0f5cdef04a44992fd5fbc2da0bd3'

data/CHANGELOG.md

@@ -12,6 +12,20 @@ Add changes in new features here. Do not change the gem's version in pull/merge
 ### Changes
 -
 
+## [0.3.6] - 21.10.2025
+
+[Diff](https://github.com/espago/rails-on-sorbet/compare/v0.3.5...v0.3.6)
+
+### Changes
+- Another fix for  `TypedRelation` tapioca compiler (type member declarations)
+
+## [0.3.5] - 21.10.2025
+
+[Diff](https://github.com/espago/rails-on-sorbet/compare/v0.3.4...v0.3.5)
+
+### Changes
+- Fix `TypedRelation` RBI and tapioca compiler
+
 ## [0.3.4] - 21.10.2025
 
 [Diff](https://github.com/espago/rails-on-sorbet/compare/v0.3.3...v0.3.4)

data/lib/rails/on/sorbet/version.rb

@@ -3,7 +3,7 @@
 module Rails
   module On
     module Sorbet
-      VERSION = '0.3.4'
+      VERSION = '0.3.6'
     end
   end
 end

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

@@ -22,28 +22,39 @@ module Tapioca
         root.create_path(constant) do |klass|
           private_relation = klass.create_class('PrivateRelation', superclass_name: '::ActiveRecord::Relation')
           private_relation.create_include('::TypedRelation')
+          private_relation.create_type_variable('Elem', type: 'type_member', fixed: klass.fully_qualified_name)
 
           private_relation_group_chain = klass.create_class('PrivateRelationGroupChain',
                                                             superclass_name: 'PrivateRelation',)
           private_relation_group_chain.create_include('::TypedRelation::GroupChain')
+          private_relation_group_chain.create_type_variable('Elem', type:  'type_member',
+                                                                    fixed: klass.fully_qualified_name,)
 
           private_relation_where_chain = klass.create_class('PrivateRelationWhereChain', superclass_name: '::ActiveRecord::QueryMethods::WhereChain')
           private_relation_where_chain.create_include('::TypedRelation::WhereChain')
-
+          private_relation_where_chain.create_type_variable('Elem', type:  'type_member',
+                                                                    fixed: klass.fully_qualified_name,)
 
           private_association_relation = klass.create_class('PrivateAssociationRelation', superclass_name: '::ActiveRecord::AssociationRelation')
           private_association_relation.create_include('::TypedAssociation::Relation')
+          private_association_relation.create_type_variable('Elem', type:  'type_member',
+                                                                    fixed: klass.fully_qualified_name,)
 
           private_relation_group_chain = klass.create_class('PrivateAssociationRelationGroupChain',
                                                             superclass_name: 'PrivateAssociationRelation',)
           private_relation_group_chain.create_include('::TypedAssociation::Relation::GroupChain')
+          private_relation_group_chain.create_type_variable('Elem', type:  'type_member',
+                                                                    fixed: klass.fully_qualified_name,)
 
           private_relation_where_chain = klass.create_class('PrivateAssociationRelationWhereChain',
                                                             superclass_name: '::ActiveRecord::QueryMethods::WhereChain',)
           private_relation_where_chain.create_include('::TypedAssociation::Relation::WhereChain')
+          private_relation_where_chain.create_type_variable('Elem', type:  'type_member',
+                                                                    fixed: klass.fully_qualified_name,)
 
           private_collection_proxy = klass.create_class('PrivateCollectionProxy', superclass_name: '::ActiveRecord::Associations::CollectionProxy')
           private_collection_proxy.create_include('::TypedAssociation::CollectionProxy')
+          private_collection_proxy.create_type_variable('Elem', type: 'type_member', fixed: klass.fully_qualified_name)
         end
       end
 

data/rbi/typed_relation.rbi

@@ -425,9 +425,9 @@ module TypedRelation
   Elem = type_member(:out)
 
   class << self
-    #: (ActiveRecord::Relation) -> GroupChain[untyped]
+    #: (ActiveRecord::Relation) -> TypedRelation::GroupChain[untyped]
     def GroupChain(val); end
-    #: (ActiveRecord::QueryMethods::WhereChain) -> WhereChain[untyped]
+    #: (ActiveRecord::QueryMethods::WhereChain) -> TypedRelation::WhereChain[untyped]
     def WhereChain(val); end
   end
 
@@ -807,7 +807,7 @@ end
 
 module TypedAssociation
   class << self
-    #: (::ActiveRecord::Relation) -> Relation[untyped]
+    #: (::ActiveRecord::Relation) -> TypedAssociation::Relation[untyped]
     def Relation(val); end
     #: (::ActiveRecord::Associations::CollectionProxy) -> CollectionProxy[untyped]
     def CollectionProxy(val); end
@@ -822,9 +822,9 @@ module TypedAssociation
     Elem = type_member(:out)
 
     class << self
-      #: (ActiveRecord::Relation) -> GroupChain[untyped]
+      #: (ActiveRecord::Relation) -> TypedAssociation::Relation::GroupChain[untyped]
       def GroupChain(val); end
-      #: (ActiveRecord::QueryMethods::WhereChain) -> WhereChain[untyped]
+      #: (ActiveRecord::QueryMethods::WhereChain) -> TypedAssociation::Relation::WhereChain[untyped]
       def WhereChain(val); end
     end
 
@@ -833,20 +833,20 @@ module TypedAssociation
       extend T::Generic
       Elem = type_member(:out)
 
-      sig { abstract.params(args: T.untyped).returns(Relation[Elem]) }
+      sig { abstract.params(args: T.untyped).returns(TypedAssociation::Relation[Elem]) }
       def associated(*args); end
 
-      sig { abstract.params(args: T.untyped).returns(Relation[Elem]) }
+      sig { abstract.params(args: T.untyped).returns(TypedAssociation::Relation[Elem]) }
       def missing(*args); end
 
-      sig { abstract.params(opts: T.untyped, rest: T.untyped).returns(Relation[Elem]) }
+      sig { abstract.params(opts: T.untyped, rest: T.untyped).returns(TypedAssociation::Relation[Elem]) }
       def not(opts, *rest); end
     end
 
     # @abstract
     module GroupChain
       extend T::Generic
-      include Relation
+      include TypedAssociation::Relation
 
       Elem = type_member(:out)
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rails-on-sorbet
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.6
 platform: ruby
 authors:
 - Mateusz Drewniak