jbuilder-schema 2.6.1 → 2.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3739c249efa5efeb070fb651dc9ae83cd6421078272997b34be154c5680a24a9
-  data.tar.gz: 18523b00d2de89fcf36dcb9306826985dad2d9bc72845cdf5c53a74536978bc1
+  metadata.gz: 3ece2220807094bf6da825da24512a4dabd0ce985aa935a16e9247c0e5d4c70e
+  data.tar.gz: f04dc67915f12690c7eca1efc2357f915351584061a6b0ece6598326606b0bbf
 SHA512:
-  metadata.gz: 24128255cc7873cdf4929ab24bd9f46819fe673cc5bf9c9a2cd9ec161e0a02b8910cb136d6e5410dd8fc9826679dd52d5a7f77ef99111a529bbe428bcc1c8361
-  data.tar.gz: 886edbbc3c763fea1fd312bb682b43884d8d8036d0de74245cef418bae81bbd1954c1efa28bfcaaff7c6a5c2a9d754fd5c9bc5f28dc004f945f9af7212f5eb95
+  metadata.gz: eb350992a61f92fbaee952b0167369caf119fd2d3f2695f647e1d774974e461e01e6a9cd1b7d5d4da2c19abe0658f8a74b601bedeff7d4e78de8365a6c61b02b
+  data.tar.gz: c9582ca4c80ba75106468c8b806cc443be3ee54a630afaa786524d249a4ef8d8bc5eeaef1f1beebb2b00c32e739cfe23be7734695cfff04a51f95de326a7fbd4

data/lib/jbuilder/schema/template.rb

@@ -117,8 +117,10 @@ class Jbuilder::Schema
           # Better would be not to set it if it's not needed, but I couldn't figure how,
           # as we have array of separate object partials hare, so each one of them would legally have allOf key.
           items = _scope { super(collection, *args, &block) }
-          items = items[:allOf].first if items.key?(:allOf)
-          items = _object(items, _required!(items.keys)) unless items.key?(:$ref) || items.key?(:object)
+          if items.is_a?(::Hash)
+            items = items[:allOf].first if items.key?(:allOf)
+            items = _object(items, _required!(items.keys)) unless items.key?(:$ref) || items.key?(:object)
+          end
           _attributes.merge! type: :array, items: items
         end
       end
@@ -210,29 +212,70 @@ class Jbuilder::Schema
     FORMATS = {::DateTime => "date-time", ::ActiveSupport::TimeWithZone => "date-time", ::Date => "date", ::Time => "time"}
 
     def _schema(key, value, **options)
+      within_array = options.delete(:within_array)
       options = @schema_overrides&.dig(key).to_h if options.empty?
 
       unless options[:type]
         options[:type] = _primitive_type value
 
-        if options[:type] == :array && (types = value.map { _primitive_type _1 }.uniq).any?
+        if options[:type] == :array && (types = value.map { _primitive_type _1 }).any?
           options[:minContains] = 0
-          options[:contains] = {type: types.many? ? types : types.first}
+
+          # Merge all arrays in one so we have all possible array items in one place
+          if types.include?(:array) && types.count(:array) > 1
+            array_indices = types.each_index.select { |i| types[i] == :array }
+            merged_array = array_indices.each_with_object([]) { |i, arr| arr.concat(value[i]) }
+            array_indices.each { |i| value[i] = merged_array }
+          end
+
+          options[:contains] = if types.uniq { |type| (type == :object) ? type.object_id : type }.many?
+            any_of = types.map.with_index do |type, index|
+              _fill_contains(key, value[index], type)
+            end
+
+            {anyOf: any_of.uniq}
+          else
+            _fill_contains(key, value[0], types.first)
+          end
+        elsif options[:type] == :object
+          options[:properties] = _set_properties(key, value)
         end
 
-        format = FORMATS[value.class] and options[:format] ||= format
+        (format = FORMATS[value.class]) and options[:format] ||= format
       end
 
       if (klass = @configuration.object&.class) && (defined_enum = klass.try(:defined_enums)&.dig(key.to_s))
         options[:enum] = defined_enum.keys
       end
 
-      _set_description key, options
+      _set_description key, options unless within_array
       options
     end
 
+    def _fill_contains(key, value, type)
+      case type
+      when :array
+        _schema(key, value, within_array: true)
+      when :object
+        value = value.attributes if value.is_a?(::ActiveRecord::Base)
+        {
+          type: type,
+          properties: _set_properties(key, value)
+        }
+      else
+        {type: type}
+      end
+    end
+
+    def _set_properties(key, value)
+      value.each_with_object({}) do |(attr_name, attr_value), properties|
+        properties[attr_name] = _schema("#{key}.#{attr_name}", attr_value)
+      end
+    end
+
     def _primitive_type(value)
       case value
+      when ::Hash, ::Struct, ::OpenStruct, ::ActiveRecord::Base then :object
       when ::Array then :array
       when ::Float, ::BigDecimal then :number
       when true, false then :boolean

data/lib/jbuilder/schema/version.rb

@@ -1,4 +1,4 @@
 # We can't use the standard `Jbuilder::Schema::VERSION =` because
 # `Jbuilder` isn't a regular module namespace, but a class …which also loads Active Support.
 # So we use trickery, and assign the proper version once `jbuilder/schema.rb` is loaded.
-JBUILDER_SCHEMA_VERSION = "2.6.1"
+JBUILDER_SCHEMA_VERSION = "2.6.3"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jbuilder-schema
 version: !ruby/object:Gem::Version
-  version: 2.6.1
+  version: 2.6.3
 platform: ruby
 authors:
 - Yuri Sidorov
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-10-31 00:00:00.000000000 Z
+date: 2023-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jbuilder