shale-builder 0.1.9 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1ad79ec1b93dc534e3c8fb9b6b2a141bc186148b4ce21cbd3ce1f090b3445323
-  data.tar.gz: f9b8d364e8418d94b69046257d9470ff26596601fbffd5b3454f82ef152d98d7
+  metadata.gz: a1194476cdc1f12fedaee4208834a474caf3397d0b4cab907f20648d5e812394
+  data.tar.gz: ce1363ceced738925bbe89abc807daa9e7cc54099244181083e0c35364d5c76d
 SHA512:
-  metadata.gz: 96d7fcf6887a218e486fded1f9b0cee50cf275f0788482d4a2a1a0e5bc65712b86ea708d596d1b0b9c40dbb548091dc1324cb6c6dca567ae56f50a06d1222f2c
-  data.tar.gz: 1e861780af38b06aee8440419a7d67313f83d535954793362a27a7ae196c6bd49c0485369186655b11602194dcffea4ed6f6a7b8c16f64fa2a6b5ec3a256162d
+  metadata.gz: 8fb3b29c2765d93b8cbcdd35ec04085d50bbc918bb6c5e2bec62ce80cfeb75d2af3a815956b68d31b882e7c46db8929f48039cb8a0880b4b50766581de0a811d
+  data.tar.gz: 3e2c7f826e65b70ac6c2efca789b836ac476594bee5e93d265c56a88f9ec2921fdff7a5352baf33a2ca1a887efdb824d24b2335481fb9fb5bda64547e69c7b05

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## [0.2.0] - 2024-06-11
+
+- Add support for `return_type` and `setter_type` in custom primitive shale types
+- Add a more thorough description of sorbet and tapioca support in the README
+
 ## [0.1.9] - 2024-06-03
 
 - Fix the signature of `new` class method

data/Gemfile.lock

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

data/README.md

@@ -51,11 +51,7 @@ class Amount < Shale::Mapper
     include Shale::Builder
 
     attribute :value, Shale::Type::Float
-    attribute :currency, Shale::Type::String, doc: <<~DOC
-        This is some custom documentation that can be used by sorbet.
-        It will be used by the tapioca DSL compiler
-        to generate the RBI documentation for this attribute.
-    DOC
+    attribute :currency, Shale::Type::String
 end
 ```
 
@@ -74,36 +70,6 @@ amount = Amount.build do |a|
 end
 ```
 
-If you use sorbet and run `bundle exec tapioca dsl` you'll get the following RBI file.
-
-```rb
-# typed: true
-
-class Amount
-  include ShaleAttributeMethods
-
-  module ShaleAttributeMethods
-    sig { returns(T.nilable(Float)) }
-    def value; end
-
-    sig { params(value: T.nilable(Float)).returns(T.nilable(Float)) }
-    def value=(value); end
-
-    # This is some custom documentation that can be used by sorbet.
-    # It will be used by the tapioca DSL compiler
-    # to generate the RBI documentation for this attribute.
-    sig { returns(T.nilable(String)) }
-    def currency; end
-
-    # This is some custom documentation that can be used by sorbet.
-    # It will be used by the tapioca DSL compiler
-    # to generate the RBI documentation for this attribute.
-    sig { params(value: T.nilable(String)).returns(T.nilable(String)) }
-    def currency=(value); end
-  end
-end
-```
-
 ### Building nested objects
 
 It's kind of pointless when you've got a flat structure.
@@ -247,6 +213,145 @@ transaction = Transaction.build do |t|
 end
 ```
 
+### Sorbet support
+
+Shale-builder adds support for sorbet and tapioca.
+
+You can leverage an additional `doc` keyword argument in `attribute` definitions.
+It will be used to generate a comment in the RBI file.
+
+```rb
+require 'shale/builder'
+
+class Amount < Shale::Mapper
+    include Shale::Builder
+
+    attribute :value, Shale::Type::Float
+    attribute :currency, Shale::Type::String, doc: <<~DOC
+        This is some custom documentation that can be used by sorbet.
+        It will be used by the tapioca DSL compiler
+        to generate the RBI documentation for this attribute.
+    DOC
+end
+```
+
+If you use sorbet and run `bundle exec tapioca dsl` you'll get the following RBI file.
+
+```rb
+# typed: true
+
+# DO NOT EDIT MANUALLY
+# This is an autogenerated file for dynamic methods in `Amount`.
+# Please instead update this file by running `bin/tapioca dsl Amount`.
+
+class Amount
+  include ShaleAttributeMethods
+
+  module ShaleAttributeMethods
+    sig { returns(T.nilable(Float)) }
+    def value; end
+
+    sig { params(value: T.nilable(Float)).returns(T.nilable(Float)) }
+    def value=(value); end
+
+    # This is some custom documentation that can be used by sorbet.
+    # It will be used by the tapioca DSL compiler
+    # to generate the RBI documentation for this attribute.
+    sig { returns(T.nilable(String)) }
+    def currency; end
+
+    # This is some custom documentation that can be used by sorbet.
+    # It will be used by the tapioca DSL compiler
+    # to generate the RBI documentation for this attribute.
+    sig { params(value: T.nilable(String)).returns(T.nilable(String)) }
+    def currency=(value); end
+  end
+end
+```
+
+#### Primitive types
+
+If you define custom primitive types in Shale by inheriting from `Shale::Type::Value`
+you can describe the return type of the getter of the field that uses this primitive type by defining the `return_type` method that returns a sorbet type.
+
+```rb
+def self.return_type = T.nilable(String)
+```
+
+You can also describe the accepted argument type in the setter by defining the `setter_type` method that returns a sorbet type.
+
+```rb
+def self.setter_type = T.any(String, Float, Integer)
+```
+
+Here is a full example.
+
+```rb
+# typed: true
+require 'shale/builder'
+
+# Cast from XML string to BigDecimal.
+# And from BigDecimal to XML string.
+class BigDecimalShaleType < Shale::Type::Value
+    class << self
+        extend T::Sig
+
+        # the return type of the field that uses this class as its type
+        def return_type = T.nilable(BigDecimal)
+        # the type of the argument given to a setter of the field
+        # that uses this class as its type
+        def setter_type = T.any(BigDecimal, String, NilClass)
+
+        # Decode from XML.
+        sig { params(value: T.any(BigDecimal, String, NilClass)).returns(T.nilable(BigDecimal)) }
+        def cast(value)
+            return if value.nil?
+
+            BigDecimal(value)
+        end
+
+        # Encode to XML.
+        #
+        # @param value: Value to convert to XML
+        sig { params(value: T.nilable(BigDecimal)).returns(T.nilable(String)) }
+        def as_xml_value(value)
+            return if value.nil?
+
+            value.to_s('F')
+        end
+    end
+end
+
+class Amount < Shale::Mapper
+    include Shale::Builder
+
+    # `value` uses BigDecimalShaleType as its type
+    attribute :value, BigDecimalShaleType
+end
+```
+
+After running `bundle exec tapioca dsl` you'll get the following RBI file.
+
+```rb
+# typed: true
+
+# DO NOT EDIT MANUALLY
+# This is an autogenerated file for dynamic methods in `Amount`.
+# Please instead update this file by running `bin/tapioca dsl Amount`.
+
+class Amount
+  include ShaleAttributeMethods
+
+  module ShaleAttributeMethods
+    sig { returns(T.nilable(::BigDecimal)) }
+    def value; end
+
+    sig { params(value: T.nilable(T.any(::BigDecimal, ::String))).returns(T.nilable(T.any(::BigDecimal, ::String))) }
+    def value=(value); end
+  end
+end
+```
+
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake test` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.

data/lib/shale/builder/version.rb

@@ -2,6 +2,6 @@
 
 module Shale
   module Builder
-    VERSION = '0.1.9'
+    VERSION = '0.2.0'
   end
 end

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

@@ -37,7 +37,7 @@ module Tapioca
           attribute_names = constant.attributes.keys.sort
           attribute_names.each do |attribute_name|
             attribute = T.let(constant.attributes[attribute_name], ::Shale::Attribute)
-            non_nilable_type, nilable_type = shale_type_to_sorbet_type(attribute)
+            non_nilable_type, nilable_type = shale_type_to_sorbet_return_type(attribute)
             type = nilable_type
             if attribute.collection?
               type = "T.nilable(T::Array[#{non_nilable_type}])"
@@ -69,6 +69,12 @@ module Tapioca
               mod.create_method(attribute.name, return_type: type, comments: comments)
             end
 
+            non_nilable_type, nilable_type = shale_type_to_sorbet_setter_type(attribute)
+            type = nilable_type
+            if attribute.collection?
+              type = "T.nilable(T::Array[#{non_nilable_type}])"
+            end
+
             # setter
             mod.create_method(
               "#{attribute.name}=",
@@ -106,22 +112,44 @@ module Tapioca
       )
 
       sig { params(attribute: ::Shale::Attribute).returns([String, String]) }
-      def shale_type_to_sorbet_type(attribute)
+      def shale_type_to_sorbet_return_type(attribute)
         return_type = SHALE_TYPES_MAP[attribute.type]
-        return complex_shale_type_to_sorbet_type(attribute) unless return_type
+        return complex_shale_type_to_sorbet_return_type(attribute) unless return_type
         return [T.must(return_type.name), T.must(return_type.name)] if attribute.collection? || attribute.default.is_a?(return_type)
 
         [T.must(return_type.name), "T.nilable(#{return_type.name})"]
       end
 
       sig { params(attribute: ::Shale::Attribute).returns([String, String]) }
-      def complex_shale_type_to_sorbet_type(attribute)
+      def complex_shale_type_to_sorbet_return_type(attribute)
         return [T.cast(attribute.type.to_s, String), "T.nilable(#{attribute.type})"] unless attribute.type.respond_to?(:return_type)
 
         return_type_string = attribute.type.return_type.to_s
         [return_type_string, return_type_string]
       end
 
+      sig { params(attribute: ::Shale::Attribute).returns([String, String]) }
+      def shale_type_to_sorbet_setter_type(attribute)
+        setter_type = SHALE_TYPES_MAP[attribute.type]
+        return complex_shale_type_to_sorbet_setter_type(attribute) unless setter_type
+        return [T.must(setter_type.name), T.must(setter_type.name)] if attribute.collection? || attribute.default.is_a?(setter_type)
+
+        [T.must(setter_type.name), "T.nilable(#{setter_type.name})"]
+      end
+
+      sig { params(attribute: ::Shale::Attribute).returns([String, String]) }
+      def complex_shale_type_to_sorbet_setter_type(attribute)
+        if attribute.type.respond_to?(:setter_type)
+          setter_type_string = attribute.type.setter_type.to_s
+          [setter_type_string, setter_type_string]
+        elsif attribute.type.respond_to?(:return_type)
+          return_type_string = attribute.type.return_type.to_s
+          [return_type_string, return_type_string]
+        else
+          [T.cast(attribute.type.to_s, String), "T.nilable(#{attribute.type})"]
+        end
+      end
+
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shale-builder
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.2.0
 platform: ruby
 authors:
 - Mateusz Drewniak
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-06-03 00:00:00.000000000 Z
+date: 2024-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: booleans