dry-schema 1.13.2 → 1.13.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f38923174afc15c94df3839a0ab0501c8aecb4ebc5df7042edc6c6590744449b
-  data.tar.gz: 97183a67cd62d595ba32413708b99c6d4c3d6760414f846f9a2ee12a1fd15615
+  metadata.gz: 01ee230572b92457f6619423c9963be605d79e86cfb4cef112767eda78e5223d
+  data.tar.gz: e9584df52d3c640691168703536546654a97eec2960fc96d932ea69ba5cedc50
 SHA512:
-  metadata.gz: 70f7656a3c4af51c4d576d022ba552728831b35cadf29f2589706e979463a01d2a5eea1c5ed546759625431dc7114df41b2f1838e8bda2d1fa223c8573f5f8a1
-  data.tar.gz: 6b639a89fb5df82cfcb546649a5cc172456537e11944913a48df2b88b99a04b0b09be262ce55224a1fdc7d87916e5cd5f6b73bad761972b010ca2034f7b13e77
+  metadata.gz: b4fa2334f3093e9a18ecea268e8f977204d40104f93c3db75c23bd82001b8b0636f9d8a4053f101b94e7a73982b5bdee67e65b5de13e7709bc1893f3a6c01061
+  data.tar.gz: 2ae6ef323db1a53ae6c375d2bdf1986379aacf5627385394549d784463fc6ebe621bcaaf73b391aa719661e66d47a7a52fd90b5539fe68e681fa4d90e268f2ca

data/README.md

@@ -2,7 +2,7 @@
 [gem]: https://rubygems.org/gems/dry-schema
 [actions]: https://github.com/dry-rb/dry-schema/actions
 
-# dry-schema [![Gem Version](https://badge.fury.io/rb/dry-schema.svg)][gem] [![CI Status](https://github.com/dry-rb/dry-schema/workflows/ci/badge.svg)][actions]
+# dry-schema [![Gem Version](https://badge.fury.io/rb/dry-schema.svg)][gem] [![CI Status](https://github.com/dry-rb/dry-schema/workflows/CI/badge.svg)][actions]
 
 ## Links
 

data/lib/dry/schema/extensions/struct.rb

@@ -5,20 +5,42 @@ require "dry/struct"
 module Dry
   module Schema
     module Macros
+      class StructToSchema < ::Dry::Struct::Compiler
+        def call(struct)
+          visit(struct.to_ast)
+        end
+
+        # strip away structs from AST
+        def visit_struct(node)
+          _, ast = node
+          visit(ast)
+        end
+      end
+
+      Hash.option :struct_compiler, default: proc { StructToSchema.new(schema_dsl.config.types) }
+
       Hash.prepend(::Module.new {
         def call(*args)
-          if args.size >= 1 && args[0].is_a?(::Class) && args[0] <= ::Dry::Struct
+          if args.size >= 1 && struct?(args[0])
             if block_given?
               raise ArgumentError, "blocks are not supported when using "\
                                    "a struct class (#{name.inspect} => #{args[0]})"
             end
 
-            super(args[0].schema, *args.drop(1))
-            type(schema_dsl.types[name].constructor(args[0].schema))
+            schema = struct_compiler.(args[0])
+
+            super(schema, *args.drop(1))
+            type(schema_dsl.types[name].constructor(schema))
           else
             super
           end
         end
+
+        private
+
+        def struct?(type)
+          type.is_a?(::Class) && type <= ::Dry::Struct
+        end
       })
     end
 

data/lib/dry/schema/key_validator.rb

@@ -9,8 +9,8 @@ module Dry
     class KeyValidator
       extend Dry::Initializer
 
-      INDEX_REGEX = /\[\d+\]/.freeze
-      DIGIT_REGEX = /\A\d+\z/.freeze
+      INDEX_REGEX = /\[\d+\]/
+      DIGIT_REGEX = /\A\d+\z/
       BRACKETS = "[]"
 
       # @api private

data/lib/dry/schema/version.rb

@@ -2,6 +2,6 @@
 
 module Dry
   module Schema
-    VERSION = "1.13.2"
+    VERSION = "1.13.3"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dry-schema
 version: !ruby/object:Gem::Version
-  version: 1.13.2
+  version: 1.13.3
 platform: ruby
 authors:
 - Piotr Solnica
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-05-31 00:00:00.000000000 Z
+date: 2023-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby