lib/jsi/schema/application/inplace_application/someof.rb in jsi-0.6.0 vs lib/jsi/schema/application/inplace_application/someof.rb in jsi-0.7.0

@@ -2,27 +2,42 @@
 
 module JSI
   module Schema::Application::InplaceApplication::SomeOf
     # @private
     def internal_applicate_someOf(instance, visited_refs, &block)
-      if schema_content['allOf'].respond_to?(:to_ary)
+      if keyword?('allOf') && schema_content['allOf'].respond_to?(:to_ary)
         schema_content['allOf'].each_index do |i|
           subschema(['allOf', i]).each_inplace_applicator_schema(instance, visited_refs: visited_refs, &block)
         end
       end
-      if schema_content['anyOf'].respond_to?(:to_ary)
-        schema_content['anyOf'].each_index do |i|
-          if subschema(['anyOf', i]).instance_valid?(instance)
-            subschema(['anyOf', i]).each_inplace_applicator_schema(instance, visited_refs: visited_refs, &block)
-          end
+      if keyword?('anyOf') && schema_content['anyOf'].respond_to?(:to_ary)
+        anyOf = schema_content['anyOf'].each_index.map { |i| subschema(['anyOf', i]) }
+        validOf = anyOf.select { |schema| schema.instance_valid?(instance) }
+        if !validOf.empty?
+          applicators = validOf
+        else
+          # invalid application: if none of the anyOf were valid, we apply them all
+          applicators = anyOf
         end
+
+        applicators.each do |applicator|
+          applicator.each_inplace_applicator_schema(instance, visited_refs: visited_refs, &block)
+        end
       end
-      if schema_content['oneOf'].respond_to?(:to_ary)
-        one_i = schema_content['oneOf'].each_index.detect do |i|
-          subschema(['oneOf', i]).instance_valid?(instance)
+      if keyword?('oneOf') && schema_content['oneOf'].respond_to?(:to_ary)
+        oneOf_idxs = schema_content['oneOf'].each_index
+        subschema_idx_valid = Hash.new { |h, i| h[i] = subschema(['oneOf', i]).instance_valid?(instance) }
+        # count up to 2 `oneOf` subschemas which `instance` validates against
+        nvalid = oneOf_idxs.inject(0) { |n, i| n > 1 ? n : subschema_idx_valid[i] ? n + 1 : n }
+        if nvalid == 1
+          applicator_idxs = oneOf_idxs.select { |i| subschema_idx_valid[i] }
+        else
+          # invalid application: if none or multiple of the oneOf were valid, we apply them all
+          applicator_idxs = oneOf_idxs
         end
-        if one_i
-          subschema(['oneOf', one_i]).each_inplace_applicator_schema(instance, visited_refs: visited_refs, &block)
+
+        applicator_idxs.each do |i|
+          subschema(['oneOf', i]).each_inplace_applicator_schema(instance, visited_refs: visited_refs, &block)
         end
       end
     end
   end
 end