tapioca 0.15.0 → 0.15.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f93b130a7096e0712ccd91b8406d92ce537287afafc8aad7586e7f670d88a131
-  data.tar.gz: b2cc1e6d2658002600c1edd9c5c88b22704e3f4170ff19aff93bb9fc21df688e
+  metadata.gz: 12203d783fb506aff6b357dc3dc02fd7f9d9e7147fd2fb715329a5311ff96bf6
+  data.tar.gz: 0ac885bad578baec1701f6b2f46e48ca5f12e4c5d8fd9840d63195291400a430
 SHA512:
-  metadata.gz: aa10ff7ffd4768cea802b63dc68273fa0abf7f69b61a83b1325669e97d706cb8afcc704093c93596a830662fe04b01ad2ded3c166abd69a5c69097bd28f586c9
-  data.tar.gz: 63499428de9374990372beb46ece3f98d0f446ba28ef02bfa181179113e37e587ff9867bbe0d729d67c03ddb2813943f6f04d14f2065589a603a766a06ce8096
+  metadata.gz: f42230c7ca6b96bb6ed299faa2b4c8d8f87ae44244a6501006c55b22c6307b9a0b777cdbb8d713f6ee3320d44502428c17ddf86dd85929be842433557d3e3793
+  data.tar.gz: df6f57d7c1446e70bd759bc84c5fa06f5985e01783be8d8f7655e06e3045c5de17cc1e931d4f0b5d78bc19f867de61dc228c77eb2f4df325038e09d908e2efd0

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

@@ -147,7 +147,7 @@ module Tapioca
                 machine.create_method(
                   method,
                   parameters: [
-                    create_opt_param("symbol", type: "T.nilable(Symbol)", default: "nil"),
+                    create_rest_param("callbacks", type: "T.any(String, Symbol, T::Class[T.anything], Proc)"),
                     create_block_param("block", type: "T.nilable(T.proc.bind(#{constant_name}).void)"),
                   ],
                 )

data/lib/tapioca/dsl/helpers/active_record_column_type_helper.rb

@@ -104,7 +104,7 @@ module Tapioca
 
           column = @constant.columns_hash[column_name]
           column_type = @constant.attribute_types[column_name]
-          getter_type = type_for_activerecord_value(column_type)
+          getter_type = type_for_activerecord_value(column_type, column_nullability: !!column&.null)
           setter_type =
             case column_type
             when ActiveRecord::Enum::EnumType
@@ -121,8 +121,8 @@ module Tapioca
           end
         end
 
-        sig { params(column_type: T.untyped).returns(String) }
-        def type_for_activerecord_value(column_type)
+        sig { params(column_type: T.untyped, column_nullability: T::Boolean).returns(String) }
+        def type_for_activerecord_value(column_type, column_nullability:)
           case column_type
           when ->(type) { defined?(MoneyColumn) && MoneyColumn::ActiveRecordType === type }
             "::Money"
@@ -133,11 +133,12 @@ module Tapioca
                }
             # Reflect to see if `ActiveModel::Type::Value` is being used first.
             getter_type = Tapioca::Dsl::Helpers::ActiveModelTypeHelper.type_for(column_type)
-            return getter_type unless getter_type == "T.untyped"
 
-            # Otherwise fallback to String as `ActiveRecord::Encryption::EncryptedAttributeType` inherits from
+            # Fallback to String as `ActiveRecord::Encryption::EncryptedAttributeType` inherits from
             # `ActiveRecord::Type::Text` which inherits from `ActiveModel::Type::String`.
-            "::String"
+            return "::String" if getter_type == "T.untyped"
+
+            as_non_nilable_if_persisted_and_not_nullable(getter_type, column_nullability:)
           when ActiveRecord::Type::String
             "::String"
           when ActiveRecord::Type::Date
@@ -160,7 +161,7 @@ module Tapioca
                  defined?(ActiveRecord::Normalization::NormalizedValueType) &&
                    ActiveRecord::Normalization::NormalizedValueType === type
                }
-            type_for_activerecord_value(column_type.cast_type)
+            type_for_activerecord_value(column_type.cast_type, column_nullability:)
           when ->(type) {
                  defined?(ActiveRecord::ConnectionAdapters::PostgreSQL::OID::Uuid) &&
                    ActiveRecord::ConnectionAdapters::PostgreSQL::OID::Uuid === type
@@ -180,12 +181,25 @@ module Tapioca
                  defined?(ActiveRecord::ConnectionAdapters::PostgreSQL::OID::Array) &&
                    ActiveRecord::ConnectionAdapters::PostgreSQL::OID::Array === type
                }
-            "T::Array[#{type_for_activerecord_value(column_type.subtype)}]"
+            "T::Array[#{type_for_activerecord_value(column_type.subtype, column_nullability:)}]"
           else
-            ActiveModelTypeHelper.type_for(column_type)
+            as_non_nilable_if_persisted_and_not_nullable(
+              ActiveModelTypeHelper.type_for(column_type),
+              column_nullability: column_nullability,
+            )
           end
         end
 
+        sig { params(base_type: String, column_nullability: T::Boolean).returns(String) }
+        def as_non_nilable_if_persisted_and_not_nullable(base_type, column_nullability:)
+          # It's possible that when ActiveModel::Type::Value is used, the signature being reflected on in
+          # ActiveModelTypeHelper.type_for(type_value) may say the type can be nilable. However, if the type is
+          # persisted and the column is not nullable, we can assume it's not nilable.
+          return as_non_nilable_type(base_type) if @column_type_option.persisted? && !column_nullability
+
+          base_type
+        end
+
         sig { params(column_type: ActiveRecord::Enum::EnumType).returns(String) }
         def enum_setter_type(column_type)
           # In Rails < 7 this method is private. When support for that is dropped we can call the method directly

data/lib/tapioca/internal.rb

@@ -19,24 +19,24 @@ require "netrc"
 require "parallel"
 require "pathname"
 require "shellwords"
-require "spoom"
 require "tempfile"
 require "thor"
 require "yaml"
 require "yard-sorbet"
 
 require "tapioca/runtime/dynamic_mixin_compiler"
-require "tapioca/helpers/gem_helper"
-
-require "tapioca/helpers/git_attributes"
-require "tapioca/helpers/sorbet_helper"
-require "tapioca/helpers/rbi_helper"
 require "tapioca/sorbet_ext/backcompat_patches"
 require "tapioca/sorbet_ext/name_patch"
 require "tapioca/sorbet_ext/generic_name_patch"
 require "tapioca/sorbet_ext/proc_bind_patch"
 require "tapioca/runtime/generic_type_registry"
 
+require "spoom"
+require "tapioca/helpers/gem_helper"
+require "tapioca/helpers/git_attributes"
+require "tapioca/helpers/sorbet_helper"
+require "tapioca/helpers/rbi_helper"
+
 require "tapioca/helpers/source_uri"
 require "tapioca/helpers/cli_helper"
 require "tapioca/helpers/config_helper"

data/lib/tapioca/version.rb

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

data/lib/tapioca.rb

@@ -2,6 +2,7 @@
 # frozen_string_literal: true
 
 require "sorbet-runtime"
+require "rubygems/user_interaction"
 
 module Tapioca
   extend T::Sig

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: tapioca
 version: !ruby/object:Gem::Version
-  version: 0.15.0
+  version: 0.15.1
 platform: ruby
 authors:
 - Ufuk Kayserilioglu
 - Alan Wu
 - Alexandre Terrasa
 - Peter Zhu
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-06-27 00:00:00.000000000 Z
+date: 2024-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -131,7 +131,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: 
+description:
 email:
 - ruby@shopify.com
 executables:
@@ -274,7 +274,7 @@ licenses:
 - MIT
 metadata:
   allowed_push_host: https://rubygems.org
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -289,8 +289,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.13
-signing_key: 
+rubygems_version: 3.5.14
+signing_key:
 specification_version: 4
 summary: A Ruby Interface file generator for gems, core types and the Ruby standard
   library