tapioca_dsl_compiler_store_model 0.1.2 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8695b3c4b636d2021926bf0c9c2e24214f187a51932082f2d707de39c77b7c1c
-  data.tar.gz: 88a4e945bfd61b5b18e4abec1a4fa985b3e8417b6f37d333d56ae7dd77323f22
+  metadata.gz: 9ca8704a96779f59a3ee54b8c42f056131e3eceb6268aeab78535498e54f7901
+  data.tar.gz: 5d6228ccffd7c51a8990bac5ce048b0d4deaed74b40d5c8d0a0de4d273cf1b45
 SHA512:
-  metadata.gz: 388d30a2d63a7300c8c10f6b3a8c1d84d8f32fdf699e937409e173f881fa06057f8be52904625c292f7081eb67d3ff7ed58d0eceff6708e3a8d7f7eb2ef70a1b
-  data.tar.gz: 8eeab3c0cc6465d334556892c77bd353cda98a032fa5e42650af3cb553ced879a4d62b1fc46b76f37bad29997b5abc872d900bfd746a1ff66006a26285429be8
+  metadata.gz: 19c5aa8f9e4fb258d6f1587596c0b45cc97e4a6529477cf01680248c2aaadf23e19610c39634d596afe57473db49b9e5fa5f67da4a9e419b441b13c5574b65c8
+  data.tar.gz: caf133e5473fc4e32a39aeaa8c49de518df0b88db1719fe60e4a050a37e2d806fbb3e11680c3b8314cae9e4751be5fc25cf89a25b515307ff952daeb8ac92869

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

@@ -118,59 +118,70 @@ module Tapioca
         sig { params(mod: T.untyped, attribute_name: String).void }
         def create_one_of_single_methods(mod, attribute_name)
           # OneOf types are dynamically resolved, so we use generic StoreModel::Model types
-          mod.create_method(
+          create_method_unless_overridden(
+            mod,
             attribute_name,
-            return_type: "T.nilable(StoreModel::Model)"
+            return_type: "T.nilable(::StoreModel::Model)"
           )
 
-          mod.create_method(
+          create_method_unless_overridden(
+            mod,
             "#{attribute_name}=",
             parameters: [create_param("value",
-                                      type: "T.nilable(T.any(StoreModel::Model, T::Hash[T.untyped, T.untyped]))")],
-            return_type: "T.nilable(StoreModel::Model)"
+                                      type: "T.nilable(T.any(::StoreModel::Model, T::Hash[T.untyped, T.untyped]))")],
+            return_type: "T.nilable(::StoreModel::Model)"
           )
 
-          mod.create_method(
+          create_method_unless_overridden(
+            mod,
             "build_#{attribute_name}",
             parameters: [create_kw_opt_param("attributes", type: "T::Hash[T.untyped, T.untyped]", default: "{}")],
-            return_type: "StoreModel::Model"
+            return_type: "::StoreModel::Model"
           )
         end
 
         sig { params(mod: T.untyped, attribute_name: String).void }
         def create_one_of_array_methods(mod, attribute_name)
           # OneOf array types are dynamically resolved
-          mod.create_method(
+          array_type = "T::Array[::StoreModel::Model]"
+          nilable_array_type = "T.nilable(#{array_type})"
+
+          create_method_unless_overridden(
+            mod,
             attribute_name,
-            return_type: "T::Array[StoreModel::Model]"
+            return_type: nilable_array_type
           )
 
-          mod.create_method(
+          create_method_unless_overridden(
+            mod,
             "#{attribute_name}=",
             parameters: [create_param("value",
-                                      type: "T.nilable(T.any(T::Array[StoreModel::Model], " \
+                                      type: "T.nilable(T.any(#{array_type}, " \
                                             "T::Array[T::Hash[T.untyped, T.untyped]]))")],
-            return_type: "T::Array[StoreModel::Model]"
+            return_type: nilable_array_type
           )
         end
 
         sig { params(mod: T.untyped, attribute_name: String, model_klass: T.untyped).void }
         def create_single_store_model_methods(mod, attribute_name, model_klass)
-          return_type = model_klass.name
+          return_type = "::#{model_klass.name}"
 
-          mod.create_method(
+          create_method_unless_overridden(
+            mod,
             attribute_name,
             return_type: "T.nilable(#{return_type})"
           )
 
-          mod.create_method(
+          create_method_unless_overridden(
+            mod,
             "#{attribute_name}=",
             parameters: [create_param("value",
                                       type: "T.nilable(T.any(#{return_type}, T::Hash[T.untyped, T.untyped]))")],
             return_type: "T.nilable(#{return_type})"
           )
 
-          mod.create_method(
+          create_method_unless_overridden(
+            mod,
             "build_#{attribute_name}",
             parameters: [create_kw_opt_param("attributes", type: "T::Hash[T.untyped, T.untyped]", default: "{}")],
             return_type: return_type
@@ -179,22 +190,45 @@ module Tapioca
 
         sig { params(mod: T.untyped, attribute_name: String, model_klass: T.untyped).void }
         def create_many_store_model_methods(mod, attribute_name, model_klass)
-          return_type = model_klass.name
+          return_type = "::#{model_klass.name}"
           array_type = "T::Array[#{return_type}]"
+          nilable_array_type = "T.nilable(#{array_type})"
 
-          mod.create_method(
+          create_method_unless_overridden(
+            mod,
             attribute_name,
-            return_type: array_type
+            return_type: nilable_array_type
           )
 
-          mod.create_method(
+          create_method_unless_overridden(
+            mod,
             "#{attribute_name}=",
             parameters: [create_param("value",
                                       type: "T.nilable(T.any(#{array_type}, " \
                                             "T::Array[T::Hash[T.untyped, T.untyped]]))")],
-            return_type: array_type
+            return_type: nilable_array_type
           )
         end
+
+        # Skip sig emission when the user has overridden the method (e.g. via
+        # `delegate`), as the arity mismatch causes Sorbet error 4010.
+        sig { params(mod: T.untyped, name: T.any(String, Symbol), kwargs: T.untyped).void }
+        def create_method_unless_overridden(mod, name, **kwargs) # rubocop:disable Style/ArgumentsForwarding
+          return if user_overridden?(name)
+
+          mod.create_method(name.to_s, **kwargs) # rubocop:disable Style/ArgumentsForwarding
+        end
+
+        sig { params(method_name: T.any(String, Symbol)).returns(T::Boolean) }
+        def user_overridden?(method_name)
+          name = method_name.to_sym
+          return false unless constant.method_defined?(name) ||
+                              constant.private_method_defined?(name)
+
+          constant.instance_method(name).owner == constant
+        rescue NameError
+          false
+        end
       end
     end
   end

data/lib/tapioca_dsl_compiler_store_model/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module TapiocaDslCompilerStoreModel
-  VERSION = "0.1.2"
+  VERSION = "0.1.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tapioca_dsl_compiler_store_model
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.4
 platform: ruby
 authors:
 - speria-jp
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-06-29 00:00:00.000000000 Z
+date: 2026-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: store_model