shale-builder 0.5.0 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: febc908c436d767296b5869c0f83de5192ebd2dea56649a68840f951ca61210e
-  data.tar.gz: 921efc21393a6a01516dc0954efe6f87fe74326d51d1969c00e985f3f8ad9824
+  metadata.gz: 8991027b587aeafbed207ac9cd822e41afebdfa569c024f6ed76bae038ea30b5
+  data.tar.gz: f61364b0035ff89ef1ad00daca3829fb1597600cd9a7c8d581e3a137984670d7
 SHA512:
-  metadata.gz: 315da1873bcba3a08cbf4a6d405b975a8c9be51442726faab0e886138be48b50fa6bec7c5367064d1d0cc731af17ec0c10bbe9cfb04716a5b1d0712de46244a5
-  data.tar.gz: 54df3a9708bc1e327ecb7f85338a1420cca5b98d82b754acbecd03417541951472b9f2d005035abe5fe1217bfd5db10d3730a1966043c65956b3cdb83d080299
+  metadata.gz: 1a929606c8017a98f0c30a54728bcf2d64ee6effa155a60c4a337fcc48360b98b82456d29530e2bcbecf9a31ca04281e8932db706972215ab2a36e7c354eed4c
+  data.tar.gz: 3b70d9301cb4633ee59c37f37afa9c0f977e3726914491d8632ec8f4c95b5b21f78882a290da7482c595bf8a603695ad758b04b8e6d5665a7414579701980e96

data/CHANGELOG.md

@@ -5,6 +5,13 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.5.1] - 2025-10-15
+
+[Diff](https://github.com/Verseth/ruby-shale-builder/compare/v0.5.0...v0.5.1)
+
+### Changes
+- Add `return_type` and `setter_type` overrides per attribute
+
 ## [0.5.0] - 2025-10-15
 
 [Diff](https://github.com/Verseth/ruby-shale-builder/compare/v0.4.1...v0.5.0)

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    shale-builder (0.5.0)
+    shale-builder (0.5.2)
       booleans (>= 0.1)
       shale (< 2.0)
       sorbet-runtime (> 0.5)

data/lib/shale/attribute.rb

@@ -7,6 +7,12 @@ module Shale
   class Attribute # rubocop:disable Style/Documentation
     extend T::Sig
 
+    #: untyped
+    attr_accessor :setter_type
+
+    #: untyped
+    attr_accessor :return_type
+
     # Contains the documentation comment for the shale attribute
     # in a Ruby String.
     #: String?

data/lib/shale/builder/version.rb

@@ -2,6 +2,6 @@
 
 module Shale
   module Builder
-    VERSION = '0.5.0'
+    VERSION = '0.5.2'
   end
 end

data/lib/shale/builder.rb

@@ -97,13 +97,34 @@ module Shale
       sig { abstract.returns(T::Hash[Symbol, Shale::Attribute]) }
       def attributes; end
 
-      #: ((String | Symbol) name, Class type, ?collection: bool, ?default: Proc?, ?doc: String?, **Object kwargs) ?{ -> void } -> void
-      def attribute(name, type, collection: false, default: nil, doc: nil, **kwargs, &block)
-        super(name, type, collection:, default:, **kwargs, &block)
+      #: (
+      #|  String | Symbol name,
+      #|  Class shale_mapper,
+      #|  ?collection: bool,
+      #|  ?default: Proc?,
+      #|  ?doc: String?,
+      #|  ?return_type: untyped,
+      #|  ?setter_type: untyped,
+      #|  **Object kwargs
+      #| ) ?{ -> void } -> void
+      def attribute(
+        name,
+        shale_mapper,
+        collection: false,
+        default: nil,
+        doc: nil,
+        return_type: nil,
+        setter_type: nil,
+        **kwargs,
+        &block
+      )
+        super(name, shale_mapper, collection:, default:, **kwargs, &block)
         if (attr_def = attributes[name.to_sym])
           attr_def.doc = doc
+          attr_def.return_type = return_type
+          attr_def.setter_type = setter_type
         end
-        return unless type < ::Shale::Mapper
+        return unless shale_mapper < ::Shale::Mapper
 
         if collection
           @builder_methods_module.class_eval <<~RUBY, __FILE__, __LINE__ + 1
@@ -111,7 +132,7 @@ module Shale
               return super unless block_given?    #   return super unless block_given?
                                                   #
               arr = self.#{name} ||= []           #   arr = self.clients ||= []
-              object = #{type}.new                #   object = Client.new
+              object = #{shale_mapper}.new                #   object = Client.new
               yield(object)                       #   yield(object)
               arr << object                       #   arr << object
               object                              #   object
@@ -124,7 +145,7 @@ module Shale
           def #{name}                                   # def amount
             return super unless block_given?            #   return super unless block_given?
                                                         #
-            object = #{type}.new                        #   object = Amount.new
+            object = #{shale_mapper}.new                        #   object = Amount.new
             yield(object)                               #   yield(object)
             self.#{name} = object                       #   self.amount = object
           end                                           # end

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

@@ -37,9 +37,14 @@ module Tapioca
           # For each attribute defined in the class
           attribute_names = constant.attributes.keys.sort
           attribute_names.each do |attribute_name|
-            attribute = T.let(constant.attributes[attribute_name], ::Shale::Attribute)
-            return_type, nilable = shale_type_to_sorbet_return_type(attribute)
-            comments = T.let([], T::Array[RBI::Comment])
+            attribute = constant.attributes[attribute_name] #: ::Shale::Attribute
+            if (type = attribute.return_type)
+              return_type = type
+              nilable = true
+            else
+              return_type, nilable = shale_type_to_sorbet_return_type(attribute)
+            end
+            comments = [] #: T::Array[RBI::Comment]
             if shale_builder_defined? && attribute.doc
               comments << RBI::Comment.new(T.must(attribute.doc))
             end
@@ -52,7 +57,12 @@ module Tapioca
               getter_without_block_type = return_type.to_s
             end
 
-            setter_type, nilable = shale_type_to_sorbet_setter_type(attribute)
+            if (type = attribute.return_type || attribute.setter_type)
+              setter_type = type
+              nilable = true
+            else
+              setter_type, nilable = shale_type_to_sorbet_setter_type(attribute)
+            end
             if attribute.collection?
               setter_type_str = "T.nilable(T::Array[#{setter_type}])"
             elsif nilable

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shale-builder
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.2
 platform: ruby
 authors:
 - Mateusz Drewniak