tapioca 0.6.2 → 0.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: df803cbfcb6a400e88175b21c0bfd3d5c8089853d5ca09cf8f7b7d0076ce201f
-  data.tar.gz: fc580b1ae8202f4d94a45d75665c07a072c7ffde6652aaa3580dd1e8a196288c
+  metadata.gz: cc4a2a8ab8f9e4f81b9e600e00c689bc79578aa6267a9f99d44eefab1b6b6316
+  data.tar.gz: 16c553d22afbf5bbc0fb8d366fb95e41be55f436253d7161dece29577ea7e586
 SHA512:
-  metadata.gz: a36a8f3dc321ce2cf8f5402f3b00aee7ef9e6ea2748ee95371b64dceec217df218fd8dc6ca786cfce90478c9c0db7c14bde1f43276f76a65b4ed2d6fa7093672
-  data.tar.gz: f688b633d7e0ed4627a5929aef8293619641609c143c43082b291330f9fe5fb2c5a72e9e70be0f2d57274908b4f1fc48dd6ff8dcb4d7d815c894af9567a21417
+  metadata.gz: 35ae53d442a9b2342d44f0bfe4889ed8cd59dbae526468947674a4ed1c9ceaecd84b2cedb61e997ca9b2f5481e335e61678a3be04f6f93e8f8ab14396db99030
+  data.tar.gz: e95259f37e07b7a9de62ebdd9c620ab75f6e4e07695a757608172016948f8fc6b22b5847759f12f69eeceb56f80dacd84bc3b4dc6c1e11a09c32764d33970a4d

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

@@ -109,7 +109,7 @@ module Tapioca
             return "T.untyped"
           end
 
-          "T.nilable(#{type})"
+          as_nilable_type(type)
         end
 
         sig { params(klass: RBI::Scope, method: String, type: String).void }

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

@@ -184,7 +184,7 @@ module Tapioca
         end
         def populate_single_assoc_getter_setter(klass, constant, association_name, reflection)
           association_class = type_for(constant, reflection)
-          association_type = "T.nilable(#{association_class})"
+          association_type = as_nilable_type(association_class)
 
           klass.create_method(
             association_name.to_s,

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

@@ -293,12 +293,6 @@ module Tapioca
             return_type: "T::Boolean"
           )
         end
-
-        sig { params(type: String).returns(String) }
-        def as_nilable_type(type)
-          return type if type.start_with?("T.nilable(") || type == "T.untyped"
-          "T.nilable(#{type})"
-        end
       end
     end
   end

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

@@ -250,6 +250,15 @@ module Tapioca
           sig { returns(String) }
           attr_reader :constant_name
 
+          sig { params(type: String).returns(String) }
+          def as_nilable_type(type)
+            if type.start_with?("T.nilable(", "::T.nilable(") || type == "T.untyped" || type == "::T.untyped"
+              type
+            else
+              "T.nilable(#{type})"
+            end
+          end
+
           sig { void }
           def create_classes_and_includes
             model.create_extend(CommonRelationMethodsModuleName)
@@ -546,7 +555,7 @@ module Tapioca
                   parameters: [
                     create_rest_param("args", type: "T.untyped"),
                   ],
-                  return_type: "T.nilable(#{constant_name})"
+                  return_type: as_nilable_type(constant_name)
                 )
               when :find_by!
                 create_common_method(
@@ -570,7 +579,7 @@ module Tapioca
                 return_type = if method_name.end_with?("!")
                   constant_name
                 else
-                  "T.nilable(#{constant_name})"
+                  as_nilable_type(constant_name)
                 end
 
                 create_common_method(

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

@@ -107,7 +107,7 @@ module Tapioca
               store_data.accessors.each do |accessor|
                 field = store_data.fields[accessor]
                 type = type_for(field.type_sym)
-                type = "T.nilable(#{type})" if field.null && type != "T.untyped"
+                type = as_nilable_type(type) if field.null
 
                 store_accessors_module = model.create_module("StoreAccessors")
                 generate_methods(store_accessors_module, field.name.to_s, type)

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

@@ -176,6 +176,15 @@ module Tapioca
           return_type
         end
 
+        sig { params(type: String).returns(String) }
+        def as_nilable_type(type)
+          if type.start_with?("T.nilable(", "::T.nilable(") || type == "T.untyped" || type == "::T.untyped"
+            type
+          else
+            "T.nilable(#{type})"
+          end
+        end
+
         sig { params(name: String).returns(T::Boolean) }
         def valid_parameter_name?(name)
           name.match?(/^[[[:alnum:]]_]+$/)

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

@@ -116,7 +116,7 @@ module Tapioca
           if returns_collection
             COLLECTION_TYPE.call(cache_type)
           else
-            "T.nilable(::#{cache_type})"
+            as_nilable_type(T.must(qualified_name_of(cache_type)))
           end
         rescue ArgumentError
           "T.untyped"
@@ -175,18 +175,20 @@ module Tapioca
           parameters << create_kw_opt_param("includes", default: "nil", type: "T.untyped")
 
           if field.unique
+            type = T.must(qualified_name_of(constant))
+
             klass.create_method(
               "#{name}!",
               class_method: true,
               parameters: parameters,
-              return_type: "::#{constant}"
+              return_type: type
             )
 
             klass.create_method(
               name,
               class_method: true,
               parameters: parameters,
-              return_type: "T.nilable(::#{constant})"
+              return_type: as_nilable_type(type)
             )
           else
             klass.create_method(

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

@@ -111,7 +111,7 @@ module Tapioca
           if arg.required || arg.default
             type
           else
-            "T.nilable(#{type})"
+            as_nilable_type(type)
           end
         end
       end

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

@@ -143,11 +143,8 @@ module Tapioca
             "T.untyped"
           end
 
-          # Early return for "T.untyped", nothing more to do.
-          return type if type == "T.untyped"
-
           might_be_optional = Proc === required || !required
-          type = "T.nilable(#{type})" if might_be_optional
+          type = as_nilable_type(type) if might_be_optional
 
           type
         end

data/lib/tapioca/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tapioca
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.6.3
 platform: ruby
 authors:
 - Ufuk Kayserilioglu
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-01-20 00:00:00.000000000 Z
+date: 2022-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -115,14 +115,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.19.2
+        version: 1.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.19.2
+        version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: yard-sorbet
   requirement: !ruby/object:Gem::Requirement