dry-schema 1.9.2 → 1.9.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c27dabeb33b1644739f90d7bbac22dfe85ae79d742da8376cad64bdfff46c514
-  data.tar.gz: 5b4df5b8215933c70fd3c04fd3a8cd74c0ff7bdfe4919110f95753348ce28726
+  metadata.gz: c2dead9a036c0d9322c68b50938417ebe12a4b62ed2f99a8ae6d4f49f894dabd
+  data.tar.gz: ac3b386e3266e8498aa62549cddfbaece9414281beee5710c1930b062eaacde8
 SHA512:
-  metadata.gz: 9111228ae652344f54044d93fd7516d67cdefa0789587b786d58291d40f9c61c009207c5b3ef68d7302e8e889a125e51fbd4bfa3a5ee6b8b2629a2e06cf7a538
-  data.tar.gz: bc1701018a9c35fb618c92a50fb4d68f24957f3d22431e343457dba65645d6476a5c7378620fe934b8520cfd20d62a2d2de1ac5c04af1f0130dfba5de86cb2f9
+  metadata.gz: '0831055ac93da2898c55b6194703e87bda1c27040ac23965c5f261c2e59387888f679b9dcd967a4a0665cef220b7c97db823670067267b34b40ed09a3c315b81'
+  data.tar.gz: d82ee10469742e83ee412ebe6c06593a86c44c1e0f01fd29067700d9a37ecc461dc3e4ad6e2a09bfe4694d1e95b6c28132810bf243d27338257f66e0c50cc98e

data/CHANGELOG.md

@@ -1,5 +1,19 @@
 <!--- DO NOT EDIT THIS FILE - IT'S AUTOMATICALLY GENERATED VIA DEVTOOLS --->
 
+## 1.9.3 2022-06-23
+
+
+### Added
+
+- Support `anyOf` composition in JSON schema output (@robhanlon22)
+
+### Fixed
+
+- Allow composition of multiple ors (issue #307 fixed via #409) (@robhanlon22)
+
+
+[Compare v1.9.2...v1.9.3](https://github.com/dry-rb/dry-schema/compare/v1.9.2...v1.9.3)
+
 ## 1.9.2 2022-05-28
 
 

data/lib/dry/schema/extensions/json_schema/schema_compiler.rb

@@ -114,6 +114,18 @@ module Dry
           end
         end
 
+        # @api private
+        def visit_or(node, opts = EMPTY_HASH)
+          node.each do |child|
+            c = self.class.new(loose: loose?)
+            c.keys.update(subschema: {})
+            c.visit(child, opts.merge(key: :subschema))
+
+            any_of = (keys[opts[:key]][:anyOf] ||= [])
+            any_of << c.keys[:subschema]
+          end
+        end
+
         # @api private
         def visit_implication(node, opts = EMPTY_HASH)
           node.each do |el|

data/lib/dry/schema/message/or/multi_path.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require "dry/core/equalizer"
-
 require "dry/schema/message/or/abstract"
 require "dry/schema/path"
 
@@ -14,23 +12,85 @@ module Dry
         # @api public
         class MultiPath < Abstract
           # @api private
-          attr_reader :root
+          class MessageArray
+            # @api private
+            def initialize(messages)
+              @messages = messages.flatten
+            end
+
+            # @api private
+            def _paths
+              @messages.map(&:_path)
+            end
+
+            # @api private
+            def to_or(root)
+              self.class.new(@messages.map { _1.to_or(root) })
+            end
+
+            # @api private
+            def to_h
+              MessageSet.new(@messages).to_h
+            end
+          end
+
+          # @api private
+          def self.handler(message)
+            handlers.find { |k,| message.is_a?(k) }&.last
+          end
 
           # @api private
-          def initialize(...)
-            super
-            flat_left = left.flatten
-            flat_right = right.flatten
-            @root = [*flat_left, *flat_right].map(&:_path).reduce(:&)
-            @left = flat_left.map { _1.to_or(root) }
-            @right = flat_right.map { _1.to_or(root) }
+          private_class_method def self.handlers
+            @handlers ||= {
+              self => -> { _1 },
+              Array => -> { MessageArray.new(_1) }
+            }.freeze
           end
 
           # @api public
           def to_h
-            @to_h ||= Path[[*root, :or]].to_h(
-              [MessageSet.new(left).to_h, MessageSet.new(right).to_h]
-            )
+            @to_h ||= Path[[*root, :or]].to_h(messages.map(&:to_h))
+          end
+
+          # @api private
+          def messages
+            @messages ||= _messages.flat_map { _1.to_or(root) }
+          end
+
+          # @api private
+          def root
+            @root ||= _messages.flat_map(&:_paths).reduce(:&)
+          end
+
+          # @api private
+          def path
+            root
+          end
+
+          # @api private
+          def _paths
+            @paths ||= [Path[root]]
+          end
+
+          # @api private
+          def to_or(root)
+            self.root == root ? messages : [self]
+          end
+
+          private
+
+          # @api private
+          def _messages
+            @_messages ||= [left, right].map do |message|
+              handler = self.class.handler(message)
+
+              unless handler
+                raise ArgumentError,
+                      "#{message.inspect} is of unknown type #{message.class.inspect}"
+              end
+
+              handler.(message)
+            end
           end
         end
       end

data/lib/dry/schema/message/or.rb

@@ -17,8 +17,8 @@ module Dry
 
           if paths.uniq.size == 1
             SinglePath.new(left, right, messages)
-          elsif right.is_a?(Array)
-            if left.is_a?(Array) && paths.uniq.size > 1
+          elsif MultiPath.handler(right)
+            if MultiPath.handler(left) && paths.uniq.size > 1
               MultiPath.new(left, right)
             else
               right

data/lib/dry/schema/version.rb

@@ -2,6 +2,6 @@
 
 module Dry
   module Schema
-    VERSION = "1.9.2"
+    VERSION = "1.9.3"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dry-schema
 version: !ruby/object:Gem::Version
-  version: 1.9.2
+  version: 1.9.3
 platform: ruby
 authors:
 - Piotr Solnica
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-05-28 00:00:00.000000000 Z
+date: 2022-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -240,7 +240,7 @@ metadata:
   changelog_uri: https://github.com/dry-rb/dry-schema/blob/main/CHANGELOG.md
   source_code_uri: https://github.com/dry-rb/dry-schema
   bug_tracker_uri: https://github.com/dry-rb/dry-schema/issues
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -255,9 +255,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.32
-signing_key:
+rubygems_version: 3.1.6
+signing_key: 
 specification_version: 4
 summary: Coercion and validation for data structures
 test_files: []
-...