sorbet-schema 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c06e03c3878ac6b3cf04305124e1d3786de57f0543ee320181565a8b59f8c4b3
-  data.tar.gz: 97d11102e65875b5f77f06095fdacf1dea0fabdd1fd1a91b5428a509dd6bac4b
+  metadata.gz: 32a23b4d9a5e1eda6fcf49b64428f55fbf1d89f63754de35bf2e0e3a875e018c
+  data.tar.gz: e76f273b8e566f78e6c18effa1699e3f6afa17311abee06a2183778e7a97f93a
 SHA512:
-  metadata.gz: 84e7f4308162784ee84b063ff743293cd6c72487479f23de3cf1ed31089f13ff8a148c4aad85854394343aa97eafbbab15551d54fd17ce8e390db343db5083c9
-  data.tar.gz: 37301dfecd29623d2f5be76220e70d0aa1a650dc2c792c3e01e15b4bce17abb2bf468f04dbfd5026686c11aa594590a91b369b49ef2a1de5393ff77af07d5d8b
+  metadata.gz: 5e7dcb508366dcda8311bf089ae6877c8ff5ba8fc41e0bec9adcd18ca8f3b3723693cd5139a1ee34d46dfcf0643d511edc04d689a93715e72aa33a2f764454e2
+  data.tar.gz: bf2c62a198b37caae70736bd1aa954476ef2697c44aa793381f91787b4ad6b78bad0e731a69c3dddb4c7398a3a07092cdebf779d95e27be1fbb68d43bf74958f

data/CHANGELOG.md

@@ -4,6 +4,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](https://github.com/maxveldink/sorbet-schema/compare/v0.5.0...v0.5.1) (2024-06-26)
+
+
+### Features
+
+* support nested structs ([#102](https://github.com/maxveldink/sorbet-schema/issues/102)) ([08428e1](https://github.com/maxveldink/sorbet-schema/commit/08428e18afdbb4121ef2f290e8a85651b2e13edf))
+
 ## [0.5.0](https://github.com/maxveldink/sorbet-schema/compare/v0.4.2...v0.5.0) (2024-04-19)
 
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    sorbet-schema (0.5.0)
+    sorbet-schema (0.5.1)
       sorbet-result (~> 1.1)
       sorbet-runtime (~> 0.5)
       sorbet-struct-comparable (~> 1.3)
@@ -13,32 +13,32 @@ GEM
     ansi (1.5.0)
     ast (2.4.2)
     bigdecimal (3.1.8)
-    builder (3.2.4)
+    builder (3.3.0)
     debug (1.9.2)
       irb (~> 1.10)
       reline (>= 0.3.8)
-    erubi (1.12.0)
+    erubi (1.13.0)
     io-console (0.7.2)
-    irb (1.13.1)
+    irb (1.13.2)
       rdoc (>= 4.0.0)
       reline (>= 0.4.2)
     json (2.7.2)
     language_server-protocol (3.17.0.3)
     lint_roller (1.1.0)
-    minitest (5.23.1)
+    minitest (5.24.0)
     minitest-focus (1.4.0)
       minitest (>= 4, < 6)
-    minitest-reporters (1.6.1)
+    minitest-reporters (1.7.1)
       ansi
       builder
       minitest (>= 5.0)
       ruby-progressbar
     netrc (0.11.0)
-    parallel (1.24.0)
-    parser (3.3.1.0)
+    parallel (1.25.1)
+    parser (3.3.3.0)
       ast (~> 2.4.1)
       racc
-    prism (0.29.0)
+    prism (0.30.0)
     psych (5.1.2)
       stringio
     racc (1.8.0)
@@ -50,11 +50,11 @@ GEM
     rdoc (6.7.0)
       psych (>= 4.0.0)
     regexp_parser (2.9.2)
-    reline (0.5.7)
+    reline (0.5.9)
       io-console (~> 0.5)
-    rexml (3.2.8)
-      strscan (>= 3.0.9)
-    rubocop (1.63.5)
+    rexml (3.3.0)
+      strscan
+    rubocop (1.64.1)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
@@ -67,22 +67,22 @@ GEM
       unicode-display_width (>= 2.4.0, < 3.0)
     rubocop-ast (1.31.3)
       parser (>= 3.3.1.0)
-    rubocop-performance (1.21.0)
+    rubocop-performance (1.21.1)
       rubocop (>= 1.48.1, < 2.0)
       rubocop-ast (>= 1.31.1, < 2.0)
     rubocop-sorbet (0.7.8)
       rubocop (>= 0.90.0)
     ruby-progressbar (1.13.0)
-    sorbet (0.5.11391)
-      sorbet-static (= 0.5.11391)
+    sorbet (0.5.11444)
+      sorbet-static (= 0.5.11444)
     sorbet-result (1.1.0)
       sorbet-runtime (~> 0.5)
-    sorbet-runtime (0.5.11391)
-    sorbet-static (0.5.11391-universal-darwin)
-    sorbet-static (0.5.11391-x86_64-linux)
-    sorbet-static-and-runtime (0.5.11391)
-      sorbet (= 0.5.11391)
-      sorbet-runtime (= 0.5.11391)
+    sorbet-runtime (0.5.11444)
+    sorbet-static (0.5.11444-universal-darwin)
+    sorbet-static (0.5.11444-x86_64-linux)
+    sorbet-static-and-runtime (0.5.11444)
+      sorbet (= 0.5.11444)
+      sorbet-runtime (= 0.5.11444)
     sorbet-struct-comparable (1.3.0)
       sorbet-runtime (>= 0.5)
     spoom (1.3.2)
@@ -90,10 +90,10 @@ GEM
       prism (>= 0.19.0)
       sorbet-static-and-runtime (>= 0.5.10187)
       thor (>= 0.19.2)
-    standard (1.36.0)
+    standard (1.39.0)
       language_server-protocol (~> 3.17.0.2)
       lint_roller (~> 1.0)
-      rubocop (~> 1.63.0)
+      rubocop (~> 1.64.0)
       standard-custom (~> 1.0.0)
       standard-performance (~> 1.4)
     standard-custom (1.0.2)
@@ -105,9 +105,9 @@ GEM
     standard-sorbet (0.0.2)
       lint_roller (~> 1.1)
       rubocop-sorbet (~> 0.7.0)
-    stringio (3.1.0)
+    stringio (3.1.1)
     strscan (3.1.0)
-    tapioca (0.14.2)
+    tapioca (0.14.4)
       bundler (>= 2.2.25)
       netrc (>= 0.11.0)
       parallel (>= 1.21.0)
@@ -122,7 +122,7 @@ GEM
     yard-sorbet (0.8.1)
       sorbet-runtime (>= 0.5)
       yard (>= 0.9)
-    zeitwerk (2.6.15)
+    zeitwerk (2.6.16)
 
 PLATFORMS
   arm64-darwin-22

data/lib/sorbet-schema/version.rb

@@ -1,5 +1,5 @@
 # typed: strict
 
 module SorbetSchema
-  VERSION = "0.5.0"
+  VERSION = "0.5.1"
 end

data/lib/typed/coercion/struct_coercer.rb

@@ -21,7 +21,41 @@ module Typed
 
         return Failure.new(CoercionError.new("Value of type '#{value.class}' cannot be coerced to #{type} Struct.")) unless value.is_a?(Hash)
 
-        Success.new(T.cast(type, T::Types::Simple).raw_type.from_hash!(HashTransformer.new.deep_stringify_keys(value)))
+        values = {}
+
+        type = T.cast(type, T::Types::Simple)
+
+        type.raw_type.props.each do |name, prop|
+          attribute_type = prop[:type_object]
+          value = HashTransformer.new.deep_symbolize_keys(value)
+
+          if value[name].nil?
+            # if the value is nil but the type is nilable, no need to coerce
+            next if attribute_type.respond_to?(:valid?) && attribute_type.valid?(value[name])
+
+            return Typed::Failure.new(CoercionError.new("#{name} is required but nil given"))
+          end
+
+          # now that we've done the nil check, we can unwrap the nilable type to get the raw type
+          simple_attribute_type = attribute_type.respond_to?(:unwrap_nilable) ? attribute_type.unwrap_nilable : attribute_type
+
+          # if the prop is a struct, we need to recursively coerce it
+          if simple_attribute_type.respond_to?(:raw_type) && simple_attribute_type.raw_type <= T::Struct
+            Typed::HashSerializer
+              .new(schema: simple_attribute_type.raw_type.schema)
+              .deserialize(value[name])
+              .and_then { |struct| Typed::Success.new(values[name] = struct) }
+              .on_error { |error| return Typed::Failure.new(CoercionError.new("Nested hash for #{type} could not be coerced to #{name}, error: #{error}")) }
+          else
+            value = HashTransformer.new.deep_symbolize_keys(value)
+
+            Coercion
+              .coerce(type: attribute_type, value: value[name])
+              .and_then { |coerced_value| Typed::Success.new(values[name] = coerced_value) }
+          end
+        end
+
+        Success.new(type.raw_type.new(values))
       rescue ArgumentError, RuntimeError
         Failure.new(CoercionError.new("Given hash could not be coerced to #{type}."))
       end

data/sorbet/rbi/gems/{builder@3.2.4.rbi → builder@3.3.0.rbi}

@@ -8,7 +8,7 @@
 # If the Builder::XChar module is not currently defined, fail on any
 # name clashes in standard library classes.
 #
-# source://builder//lib/builder/blankslate.rb#17
+# source://builder//lib/builder/xmlbase.rb#4
 module Builder
   class << self
     # source://builder//lib/builder/xchar.rb#13
@@ -16,12 +16,9 @@ module Builder
   end
 end
 
-# source://builder//lib/builder/blankslate.rb#19
-Builder::BlankSlate = BasicObject
-
 # Generic error for builder
 #
-# source://builder//lib/builder/xmlbase.rb#9
+# source://builder//lib/builder/xmlbase.rb#7
 class Builder::IllegalBlockError < ::RuntimeError; end
 
 # source://builder//lib/builder/xchar.rb#33
@@ -86,7 +83,7 @@ Builder::XChar::XML_PREDEFINED = T.let(T.unsafe(nil), Regexp)
 # XmlBase is a base class for building XML builders.  See
 # Builder::XmlMarkup and Builder::XmlEvents for examples.
 #
-# source://builder//lib/builder/xmlbase.rb#13
+# source://builder//lib/builder/xmlbase.rb#11
 class Builder::XmlBase < ::BasicObject
   # Create an XML markup builder.
   #
@@ -101,7 +98,7 @@ class Builder::XmlBase < ::BasicObject
   #
   # @return [XmlBase] a new instance of XmlBase
   #
-  # source://builder//lib/builder/xmlbase.rb#29
+  # source://builder//lib/builder/xmlbase.rb#27
   def initialize(indent = T.unsafe(nil), initial = T.unsafe(nil), encoding = T.unsafe(nil)); end
 
   # Append text to the output target without escaping any markup.
@@ -118,19 +115,19 @@ class Builder::XmlBase < ::BasicObject
   # method/operation builders can use other builders as their
   # targets.
   #
-  # source://builder//lib/builder/xmlbase.rb#118
+  # source://builder//lib/builder/xmlbase.rb#116
   def <<(text); end
 
   # @return [Boolean]
   #
-  # source://builder//lib/builder/xmlbase.rb#35
+  # source://builder//lib/builder/xmlbase.rb#33
   def explicit_nil_handling?; end
 
   # Create XML markup based on the name of the method.  This method
   # is never invoked directly, but is called for each markup method
   # in the markup block that isn't cached.
   #
-  # source://builder//lib/builder/xmlbase.rb#92
+  # source://builder//lib/builder/xmlbase.rb#90
   def method_missing(sym, *args, &block); end
 
   # For some reason, nil? is sent to the XmlMarkup object.  If nil?
@@ -142,14 +139,14 @@ class Builder::XmlBase < ::BasicObject
   #
   # @return [Boolean]
   #
-  # source://builder//lib/builder/xmlbase.rb#128
+  # source://builder//lib/builder/xmlbase.rb#126
   def nil?; end
 
   # Create a tag named +sym+.  Other than the first argument which
   # is the tag name, the arguments are the same as the tags
   # implemented via <tt>method_missing</tt>.
   #
-  # source://builder//lib/builder/xmlbase.rb#42
+  # source://builder//lib/builder/xmlbase.rb#40
   def tag!(sym, *args, &block); end
 
   # Append text to the output target.  Escape any markup.  May be
@@ -157,24 +154,24 @@ class Builder::XmlBase < ::BasicObject
   #
   #   builder.p { |b| b.br; b.text! "HI" }   #=>  <p><br/>HI</p>
   #
-  # source://builder//lib/builder/xmlbase.rb#101
+  # source://builder//lib/builder/xmlbase.rb#99
   def text!(text); end
 
   private
 
-  # source://builder//lib/builder/xmlbase.rb#136
+  # source://builder//lib/builder/xmlbase.rb#134
   def _escape(text); end
 
-  # source://builder//lib/builder/xmlbase.rb#159
+  # source://builder//lib/builder/xmlbase.rb#157
   def _escape_attribute(text); end
 
-  # source://builder//lib/builder/xmlbase.rb#169
+  # source://builder//lib/builder/xmlbase.rb#167
   def _indent; end
 
-  # source://builder//lib/builder/xmlbase.rb#174
+  # source://builder//lib/builder/xmlbase.rb#172
   def _nested_structures(block); end
 
-  # source://builder//lib/builder/xmlbase.rb#164
+  # source://builder//lib/builder/xmlbase.rb#162
   def _newline; end
 
   # If XmlBase.cache_method_calls = true, we dynamicly create the method
@@ -184,20 +181,20 @@ class Builder::XmlBase < ::BasicObject
   # method_missing is very slow, this speeds up document generation
   # significantly.
   #
-  # source://builder//lib/builder/xmlbase.rb#187
+  # source://builder//lib/builder/xmlbase.rb#185
   def cache_method_call(sym); end
 
   class << self
     # Returns the value of attribute cache_method_calls.
     #
-    # source://builder//lib/builder/xmlbase.rb#16
+    # source://builder//lib/builder/xmlbase.rb#14
     def cache_method_calls; end
 
     # Sets the attribute cache_method_calls
     #
     # @param value the value to set the attribute cache_method_calls to.
     #
-    # source://builder//lib/builder/xmlbase.rb#16
+    # source://builder//lib/builder/xmlbase.rb#14
     def cache_method_calls=(_arg0); end
   end
 end
@@ -348,15 +345,15 @@ end
 #
 #   Example:
 #
-#     xm = Builder.new(:indent=>2)
+#     xm = Builder::XmlMarkup.new(:indent=>2)
 #     # xm will produce nicely formatted and indented XML.
 #
-#     xm = Builder.new(:indent=>2, :margin=>4)
+#     xm = Builder::XmlMarkup.new(:indent=>2, :margin=>4)
 #     # xm will produce nicely formatted and indented XML with 2
 #     # spaces per indent and an over all indentation level of 4.
 #
 #     builder = Builder::XmlMarkup.new(:target=>$stdout, :indent=>2)
-#     builder.name { |b| b.first("Jim"); b.last("Weirich) }
+#     builder.name { |b| b.first("Jim"); b.last("Weirich") }
 #     # prints:
 #     #     <name>
 #     #       <first>Jim</first>
@@ -385,7 +382,7 @@ end
 #
 #     xml_builder = Builder::XmlMarkup.new
 #     xml_builder.div { |xml|
-#       xml.stong("text")
+#       xml.strong("text")
 #     }
 #
 # source://builder//lib/builder/xmlmarkup.rb#161

data/sorbet/rbi/gems/{erubi@1.12.0.rbi → erubi@1.13.0.rbi}

@@ -7,12 +7,16 @@
 
 # source://erubi//lib/erubi.rb#3
 module Erubi
+  private
+
+  def h(_arg0); end
+
   class << self
     def h(_arg0); end
   end
 end
 
-# source://erubi//lib/erubi.rb#54
+# source://erubi//lib/erubi.rb#51
 class Erubi::Engine
   # Initialize a new Erubi::Engine.  Options:
   # +:bufval+ :: The value to use for the buffer variable, as a string (default <tt>'::String.new'</tt>).
@@ -43,64 +47,64 @@ class Erubi::Engine
   #
   # @return [Engine] a new instance of Engine
   #
-  # source://erubi//lib/erubi.rb#94
+  # source://erubi//lib/erubi.rb#91
   def initialize(input, properties = T.unsafe(nil)); end
 
   # The variable name used for the buffer variable.
   #
-  # source://erubi//lib/erubi.rb#65
+  # source://erubi//lib/erubi.rb#62
   def bufvar; end
 
   # The filename of the template, if one was given.
   #
-  # source://erubi//lib/erubi.rb#62
+  # source://erubi//lib/erubi.rb#59
   def filename; end
 
   # The frozen ruby source code generated from the template, which can be evaled.
   #
-  # source://erubi//lib/erubi.rb#59
+  # source://erubi//lib/erubi.rb#56
   def src; end
 
   private
 
   # Add ruby code to the template
   #
-  # source://erubi//lib/erubi.rb#226
+  # source://erubi//lib/erubi.rb#223
   def add_code(code); end
 
   # Add the given ruby expression result to the template,
   # escaping it based on the indicator given and escape flag.
   #
-  # source://erubi//lib/erubi.rb#235
+  # source://erubi//lib/erubi.rb#232
   def add_expression(indicator, code); end
 
   # Add the result of Ruby expression to the template
   #
-  # source://erubi//lib/erubi.rb#244
+  # source://erubi//lib/erubi.rb#241
   def add_expression_result(code); end
 
   # Add the escaped result of Ruby expression to the template
   #
-  # source://erubi//lib/erubi.rb#249
+  # source://erubi//lib/erubi.rb#246
   def add_expression_result_escaped(code); end
 
   # Add the given postamble to the src.  Can be overridden in subclasses
   # to make additional changes to src that depend on the current state.
   #
-  # source://erubi//lib/erubi.rb#255
+  # source://erubi//lib/erubi.rb#252
   def add_postamble(postamble); end
 
   # Add raw text to the template.  Modifies argument if argument is mutable as a memory optimization.
   # Must be called with a string, cannot be called with nil (Rails's subclass depends on it).
   #
-  # source://erubi//lib/erubi.rb#213
+  # source://erubi//lib/erubi.rb#210
   def add_text(text); end
 
   # Raise an exception, as the base engine class does not support handling other indicators.
   #
   # @raise [ArgumentError]
   #
-  # source://erubi//lib/erubi.rb#261
+  # source://erubi//lib/erubi.rb#258
   def handle(indicator, code, tailch, rspace, lspace); end
 
   # Make sure that any current expression has been terminated.
@@ -108,7 +112,7 @@ class Erubi::Engine
   # the chain_appends option is used, expressions may not be
   # terminated.
   #
-  # source://erubi//lib/erubi.rb#289
+  # source://erubi//lib/erubi.rb#286
   def terminate_expression; end
 
   # Make sure the buffer variable is the target of the next append
@@ -118,13 +122,13 @@ class Erubi::Engine
   # This method should only be called if the block will result in
   # code where << will append to the bufvar.
   #
-  # source://erubi//lib/erubi.rb#271
+  # source://erubi//lib/erubi.rb#268
   def with_buffer; end
 end
 
 # The default regular expression used for scanning.
 #
-# source://erubi//lib/erubi.rb#56
+# source://erubi//lib/erubi.rb#53
 Erubi::Engine::DEFAULT_REGEXP = T.let(T.unsafe(nil), Regexp)
 
 # source://erubi//lib/erubi.rb#17