sorbet-schema 0.6.0 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1b4040ccaa87f90e0d32acee9868fffb0f4d645e599fe29726738fdb54c4f1e6
-  data.tar.gz: b83d96b38d8b7d786a3e174e576053f531bf03e237d7c1f049e98b9c813dc117
+  metadata.gz: e46419810b44afbd517689ff86c8eb5af8a5b70ef8883ae94d5c9b2645d5b68d
+  data.tar.gz: 054a2bcef831395c8a4010099441bbf8ac661292812f078cfd595012f337ada9
 SHA512:
-  metadata.gz: 248121230fc7a86b616259a89db47c210360034aad0ec70a23e2b25d73b350e16eff09c09ea87efd0aa859ef86b6f5c7f7700043b2e0d3e1f570555e98baac31
-  data.tar.gz: 6f0c35a33ff1e84ebe704c30a6d0ba4b3520030c8ca59c897c33cc96f736c48c16e8672e7f4efef6f81f4a9816326db41c1cc625f49addd520a437066a04db1c
+  metadata.gz: de8f70512ab216e8cb937b0910b8f69ea9cd8028bb2fb8f1c881ff2a296131e4608d48f2e74306918a8ab876573aef75d8b821a783351dfc0657d7d33fb46764
+  data.tar.gz: ae7541ea2939e65524dfbf9940d8aad2fd5e743a01ab23c16d3ce0b8f151b47122e856ed2ec7864d06c24c89c9bb1bac35baa377e86c24dcb3d85efe21376424

data/.ruby-version

@@ -1 +1 @@
-3.3.0
+3.3.4

data/CHANGELOG.md

@@ -4,6 +4,24 @@ 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.7.1](https://github.com/maxveldink/sorbet-schema/compare/v0.7.0...v0.7.1) (2024-07-09)
+
+
+### Features
+
+* Add clearer message for CoercionNotSupportedError ([#113](https://github.com/maxveldink/sorbet-schema/issues/113)) ([0eff2f7](https://github.com/maxveldink/sorbet-schema/commit/0eff2f77d0ae3dfb9def11a696afd338df993a54))
+
+## [0.7.0](https://github.com/maxveldink/sorbet-schema/compare/v0.6.0...v0.7.0) (2024-07-08)
+
+
+### ⚠ BREAKING CHANGES
+
+* Fix mis-serializing hash keys that were suppose to be strings ([#111](https://github.com/maxveldink/sorbet-schema/issues/111))
+
+### Bug Fixes
+
+* Fix mis-serializing hash keys that were suppose to be strings ([#111](https://github.com/maxveldink/sorbet-schema/issues/111)) ([485a6c7](https://github.com/maxveldink/sorbet-schema/commit/485a6c7a83b9e70c731930d8406925304efa04a8))
+
 ## [0.6.0](https://github.com/maxveldink/sorbet-schema/compare/v0.5.1...v0.6.0) (2024-07-07)
 
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    sorbet-schema (0.6.0)
+    sorbet-schema (0.7.1)
       sorbet-result (~> 1.1)
       sorbet-runtime (~> 0.5)
       sorbet-struct-comparable (~> 1.3)
@@ -19,13 +19,13 @@ GEM
       reline (>= 0.3.8)
     erubi (1.13.0)
     io-console (0.7.2)
-    irb (1.13.2)
+    irb (1.14.0)
       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.24.0)
+    minitest (5.24.1)
     minitest-focus (1.4.0)
       minitest (>= 4, < 6)
     minitest-reporters (1.7.1)
@@ -52,7 +52,7 @@ GEM
     regexp_parser (2.9.2)
     reline (0.5.9)
       io-console (~> 0.5)
-    rexml (3.3.0)
+    rexml (3.3.1)
       strscan
     rubocop (1.64.1)
       json (~> 2.3)
@@ -73,24 +73,24 @@ GEM
     rubocop-sorbet (0.7.8)
       rubocop (>= 0.90.0)
     ruby-progressbar (1.13.0)
-    sorbet (0.5.11444)
-      sorbet-static (= 0.5.11444)
+    sorbet (0.5.11475)
+      sorbet-static (= 0.5.11475)
     sorbet-result (1.1.0)
       sorbet-runtime (~> 0.5)
-    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-runtime (0.5.11475)
+    sorbet-static (0.5.11475-universal-darwin)
+    sorbet-static (0.5.11475-x86_64-linux)
+    sorbet-static-and-runtime (0.5.11475)
+      sorbet (= 0.5.11475)
+      sorbet-runtime (= 0.5.11475)
     sorbet-struct-comparable (1.3.0)
       sorbet-runtime (>= 0.5)
-    spoom (1.3.2)
+    spoom (1.3.3)
       erubi (>= 1.10.0)
-      prism (>= 0.19.0)
+      prism (>= 0.28.0)
       sorbet-static-and-runtime (>= 0.5.10187)
       thor (>= 0.19.2)
-    standard (1.39.0)
+    standard (1.39.1)
       language_server-protocol (~> 3.17.0.2)
       lint_roller (~> 1.0)
       rubocop (~> 1.64.0)
@@ -107,7 +107,7 @@ GEM
       rubocop-sorbet (~> 0.7.0)
     stringio (3.1.1)
     strscan (3.1.0)
-    tapioca (0.14.4)
+    tapioca (0.15.0)
       bundler (>= 2.2.25)
       netrc (>= 0.11.0)
       parallel (>= 1.21.0)
@@ -119,9 +119,9 @@ GEM
     thor (1.3.1)
     unicode-display_width (2.5.0)
     yard (0.9.36)
-    yard-sorbet (0.8.1)
-      sorbet-runtime (>= 0.5)
-      yard (>= 0.9)
+    yard-sorbet (0.9.0)
+      sorbet-runtime
+      yard
     zeitwerk (2.6.16)
 
 PLATFORMS
@@ -145,4 +145,4 @@ DEPENDENCIES
   tapioca
 
 BUNDLED WITH
-   2.5.9
+   2.5.15

data/lib/sorbet-schema/hash_transformer.rb

@@ -4,44 +4,21 @@
 # This is a simplified version of ActiveSupport's Key Hash extension
 # https://github.com/rails/rails/blob/main/activesupport/lib/active_support/core_ext/hash/keys.rb
 class HashTransformer
-  extend T::Sig
+  class << self
+    extend T::Sig
 
-  sig { params(should_serialize_values: T::Boolean).void }
-  def initialize(should_serialize_values: false)
-    @should_serialize_values = should_serialize_values
-  end
-
-  sig { params(hash: T::Hash[T.untyped, T.untyped]).returns(T::Hash[Symbol, T.untyped]) }
-  def deep_symbolize_keys(hash)
-    hash.each_with_object({}) do |(key, value), result|
-      result[key.to_sym] = transform_value(value, hash_transformation_method: :deep_symbolize_keys)
-    end
-  end
-
-  sig { params(hash: T::Hash[T.untyped, T.untyped]).returns(T::Hash[String, T.untyped]) }
-  def deep_stringify_keys(hash)
-    hash.each_with_object({}) do |(key, value), result|
-      result[key.to_s] = transform_value(value, hash_transformation_method: :deep_stringify_keys)
+    sig { params(hash: T::Hash[T.untyped, T.untyped]).returns(T::Hash[Symbol, T.untyped]) }
+    def symbolize_keys(hash)
+      hash.each_with_object({}) do |(key, value), result|
+        result[key.to_sym] = value
+      end
     end
-  end
-
-  private
-
-  sig { returns(T::Boolean) }
-  attr_reader :should_serialize_values
 
-  sig { params(value: T.untyped, hash_transformation_method: Symbol).returns(T.untyped) }
-  def transform_value(value, hash_transformation_method:)
-    if value.is_a?(Hash)
-      send(hash_transformation_method, value)
-    elsif value.is_a?(Array)
-      value.map { |inner_val| transform_value(inner_val, hash_transformation_method: hash_transformation_method) }
-    elsif value.is_a?(T::Struct) && should_serialize_values
-      deep_symbolize_keys(value.serialize)
-    elsif value.respond_to?(:serialize) && should_serialize_values
-      value.serialize
-    else
-      value
+    sig { params(hash: T::Hash[T.untyped, T.untyped]).returns(T::Hash[T.untyped, T.untyped]) }
+    def serialize_values(hash)
+      hash.each_with_object({}) do |(key, value), result|
+        result[key] = SerializeValue.serialize(value)
+      end
     end
   end
 end

data/lib/sorbet-schema/serialize_value.rb

@@ -0,0 +1,20 @@
+# typed: strict
+
+class SerializeValue
+  extend T::Sig
+
+  sig { params(value: T.untyped).returns(T.untyped) }
+  def self.serialize(value)
+    if value.is_a?(Hash)
+      HashTransformer.serialize_values(value)
+    elsif value.is_a?(Array)
+      value.map { |item| serialize(item) }
+    elsif value.is_a?(T::Struct)
+      value.serialize_to(:hash).payload_or(value)
+    elsif value.respond_to?(:serialize)
+      value.serialize
+    else
+      value
+    end
+  end
+end

data/lib/sorbet-schema/version.rb

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

data/lib/sorbet-schema.rb

@@ -16,10 +16,11 @@ loader.inflector.inflect(
 )
 loader.setup
 
-# We don't want to place this in the `Typed` module.
+# We don't want to place these in the `Typed` module.
 # `sorbet-schema` is a directory that is not autoloaded
 # but contains extensions, so we need to manually require it.
 require_relative "sorbet-schema/hash_transformer"
+require_relative "sorbet-schema/serialize_value"
 
 # We want to add a default `schema` method to structs
 # that will guarentee a schema can be created for use

data/lib/typed/coercion/coercion_not_supported_error.rb

@@ -2,6 +2,13 @@
 
 module Typed
   module Coercion
-    class CoercionNotSupportedError < CoercionError; end
+    class CoercionNotSupportedError < CoercionError
+      extend T::Sig
+
+      sig { params(type: T::Types::Base).void }
+      def initialize(type:)
+        super("Coercer not found for type #{type}.")
+      end
+    end
   end
 end

data/lib/typed/coercion.rb

@@ -11,11 +11,11 @@ module Typed
 
     sig { type_parameters(:U).params(type: T::Types::Base, value: Value).returns(Result[Value, CoercionError]) }
     def self.coerce(type:, value:)
-      coercer = CoercerRegistry.instance.select_coercer_by(type: type)
+      coercer = CoercerRegistry.instance.select_coercer_by(type:)
 
-      return Failure.new(CoercionNotSupportedError.new) unless coercer
+      return Failure.new(CoercionNotSupportedError.new(type:)) unless coercer
 
-      coercer.new.coerce(type: type, value: value)
+      coercer.new.coerce(type:, value:)
     end
   end
 end

data/lib/typed/hash_serializer.rb

@@ -15,14 +15,14 @@ module Typed
 
     sig { override.params(source: Input).returns(Result[T::Struct, DeserializeError]) }
     def deserialize(source)
-      deserialize_from_creation_params(HashTransformer.new(should_serialize_values: should_serialize_values).deep_symbolize_keys(source))
+      deserialize_from_creation_params(HashTransformer.symbolize_keys(source))
     end
 
     sig { override.params(struct: T::Struct).returns(Result[Output, SerializeError]) }
     def serialize(struct)
       return Failure.new(SerializeError.new("'#{struct.class}' cannot be serialized to target type of '#{schema.target}'.")) if struct.class != schema.target
 
-      Success.new(serialize_from_struct(struct: struct, should_serialize_values: should_serialize_values))
+      Success.new(serialize_from_struct(struct:, should_serialize_values:))
     end
 
     private

data/lib/typed/json_serializer.rb

@@ -24,7 +24,7 @@ module Typed
     def serialize(struct)
       return Failure.new(SerializeError.new("'#{struct.class}' cannot be serialized to target type of '#{schema.target}'.")) if struct.class != schema.target
 
-      Success.new(JSON.generate(serialize_from_struct(struct: struct, should_serialize_values: true)))
+      Success.new(JSON.generate(serialize_from_struct(struct:, should_serialize_values: true)))
     end
   end
 end

data/lib/typed/serializer.rb

@@ -82,7 +82,11 @@ module Typed
     def serialize_from_struct(struct:, should_serialize_values: false)
       hsh = schema.fields.each_with_object({}) { |field, hsh| hsh[field.name] = field.serialize(struct.send(field.name)) }.compact
 
-      HashTransformer.new(should_serialize_values: should_serialize_values).deep_symbolize_keys(hsh)
+      if should_serialize_values
+        hsh = HashTransformer.serialize_values(hsh)
+      end
+
+      hsh
     end
   end
 end

data/sorbet/rbi/gems/minitest-focus@1.4.0.rbi

@@ -7,25 +7,25 @@
 
 # source://minitest-focus//lib/minitest/focus.rb#3
 class Minitest::Test < ::Minitest::Runnable
-  # source://minitest/5.23.1/lib/minitest/test.rb#191
+  # source://minitest/5.24.1/lib/minitest/test.rb#191
   def capture_exceptions; end
 
-  # source://minitest/5.23.1/lib/minitest/test.rb#15
+  # source://minitest/5.24.1/lib/minitest/test.rb#15
   def class_name; end
 
-  # source://minitest/5.23.1/lib/minitest/test.rb#208
+  # source://minitest/5.24.1/lib/minitest/test.rb#208
   def neuter_exception(e); end
 
-  # source://minitest/5.23.1/lib/minitest/test.rb#219
+  # source://minitest/5.24.1/lib/minitest/test.rb#219
   def new_exception(klass, msg, bt, kill = T.unsafe(nil)); end
 
-  # source://minitest/5.23.1/lib/minitest/test.rb#87
+  # source://minitest/5.24.1/lib/minitest/test.rb#87
   def run; end
 
-  # source://minitest/5.23.1/lib/minitest/test.rb#201
+  # source://minitest/5.24.1/lib/minitest/test.rb#201
   def sanitize_exception(e); end
 
-  # source://minitest/5.23.1/lib/minitest/test.rb#233
+  # source://minitest/5.24.1/lib/minitest/test.rb#233
   def with_info_handler(&block); end
 
   class << self
@@ -59,22 +59,22 @@ class Minitest::Test < ::Minitest::Runnable
     # source://minitest-focus//lib/minitest/focus.rb#40
     def focus(name = T.unsafe(nil)); end
 
-    # source://minitest/5.23.1/lib/minitest/test.rb#35
+    # source://minitest/5.24.1/lib/minitest/test.rb#35
     def i_suck_and_my_tests_are_order_dependent!; end
 
-    # source://minitest/5.23.1/lib/minitest/test.rb#26
+    # source://minitest/5.24.1/lib/minitest/test.rb#26
     def io_lock; end
 
-    # source://minitest/5.23.1/lib/minitest/test.rb#26
+    # source://minitest/5.24.1/lib/minitest/test.rb#26
     def io_lock=(_arg0); end
 
-    # source://minitest/5.23.1/lib/minitest/test.rb#48
+    # source://minitest/5.24.1/lib/minitest/test.rb#48
     def make_my_diffs_pretty!; end
 
-    # source://minitest/5.23.1/lib/minitest/test.rb#60
+    # source://minitest/5.24.1/lib/minitest/test.rb#60
     def parallelize_me!; end
 
-    # source://minitest/5.23.1/lib/minitest/test.rb#70
+    # source://minitest/5.24.1/lib/minitest/test.rb#70
     def runnable_methods; end
 
     # Sets a one-off method_added callback to set focus on the method

data/sorbet/rbi/gems/minitest-reporters@1.7.1.rbi

@@ -8,85 +8,85 @@
 # source://minitest-reporters//lib/minitest/reporters.rb#3
 module Minitest
   class << self
-    # source://minitest/5.24.0/lib/minitest.rb#323
+    # source://minitest/5.24.1/lib/minitest.rb#323
     def __run(reporter, options); end
 
-    # source://minitest/5.24.0/lib/minitest.rb#97
+    # source://minitest/5.24.1/lib/minitest.rb#97
     def after_run(&block); end
 
-    # source://minitest/5.24.0/lib/minitest.rb#19
+    # source://minitest/5.24.1/lib/minitest.rb#19
     def allow_fork; end
 
-    # source://minitest/5.24.0/lib/minitest.rb#19
+    # source://minitest/5.24.1/lib/minitest.rb#19
     def allow_fork=(_arg0); end
 
-    # source://minitest/5.24.0/lib/minitest.rb#69
+    # source://minitest/5.24.1/lib/minitest.rb#69
     def autorun; end
 
-    # source://minitest/5.24.0/lib/minitest.rb#19
+    # source://minitest/5.24.1/lib/minitest.rb#19
     def backtrace_filter; end
 
-    # source://minitest/5.24.0/lib/minitest.rb#19
+    # source://minitest/5.24.1/lib/minitest.rb#19
     def backtrace_filter=(_arg0); end
 
-    # source://minitest/5.24.0/lib/minitest.rb#18
+    # source://minitest/5.24.1/lib/minitest.rb#18
     def cattr_accessor(name); end
 
-    # source://minitest/5.24.0/lib/minitest.rb#1208
+    # source://minitest/5.24.1/lib/minitest.rb#1208
     def clock_time; end
 
-    # source://minitest/5.24.0/lib/minitest.rb#303
+    # source://minitest/5.24.1/lib/minitest.rb#303
     def empty_run!(options); end
 
-    # source://minitest/5.24.0/lib/minitest.rb#19
+    # source://minitest/5.24.1/lib/minitest.rb#19
     def extensions; end
 
-    # source://minitest/5.24.0/lib/minitest.rb#19
+    # source://minitest/5.24.1/lib/minitest.rb#19
     def extensions=(_arg0); end
 
-    # source://minitest/5.24.0/lib/minitest.rb#336
+    # source://minitest/5.24.1/lib/minitest.rb#336
     def filter_backtrace(bt); end
 
-    # source://minitest/5.24.0/lib/minitest.rb#19
+    # source://minitest/5.24.1/lib/minitest.rb#19
     def info_signal; end
 
-    # source://minitest/5.24.0/lib/minitest.rb#19
+    # source://minitest/5.24.1/lib/minitest.rb#19
     def info_signal=(_arg0); end
 
-    # source://minitest/5.24.0/lib/minitest.rb#125
+    # source://minitest/5.24.1/lib/minitest.rb#125
     def init_plugins(options); end
 
-    # source://minitest/5.24.0/lib/minitest.rb#109
+    # source://minitest/5.24.1/lib/minitest.rb#109
     def load_plugins; end
 
-    # source://minitest/5.24.0/lib/minitest.rb#19
+    # source://minitest/5.24.1/lib/minitest.rb#19
     def parallel_executor; end
 
-    # source://minitest/5.24.0/lib/minitest.rb#19
+    # source://minitest/5.24.1/lib/minitest.rb#19
     def parallel_executor=(_arg0); end
 
-    # source://minitest/5.24.0/lib/minitest.rb#143
+    # source://minitest/5.24.1/lib/minitest.rb#143
     def process_args(args = T.unsafe(nil)); end
 
-    # source://minitest/5.24.0/lib/minitest.rb#104
+    # source://minitest/5.24.1/lib/minitest.rb#104
     def register_plugin(name_or_mod); end
 
-    # source://minitest/5.24.0/lib/minitest.rb#19
+    # source://minitest/5.24.1/lib/minitest.rb#19
     def reporter; end
 
-    # source://minitest/5.24.0/lib/minitest.rb#19
+    # source://minitest/5.24.1/lib/minitest.rb#19
     def reporter=(_arg0); end
 
-    # source://minitest/5.24.0/lib/minitest.rb#269
+    # source://minitest/5.24.1/lib/minitest.rb#269
     def run(args = T.unsafe(nil)); end
 
-    # source://minitest/5.24.0/lib/minitest.rb#1199
+    # source://minitest/5.24.1/lib/minitest.rb#1199
     def run_one_method(klass, method_name); end
 
-    # source://minitest/5.24.0/lib/minitest.rb#19
+    # source://minitest/5.24.1/lib/minitest.rb#19
     def seed; end
 
-    # source://minitest/5.24.0/lib/minitest.rb#19
+    # source://minitest/5.24.1/lib/minitest.rb#19
     def seed=(_arg0); end
   end
 end