jbuilder-schema 2.6.2 → 2.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8ca9a375b705e699e2fd70f4e1b78b034b3d261b2b154edbf27115e726d5063a
-  data.tar.gz: 58b61b54f0fb57d79ec201d5fdae5e6f5fc55f34927e67bf11efa6fb0a5bc95b
+  metadata.gz: d3b0ea78dca91b88897944b81769f35798117c891702c585c6197a18c141736a
+  data.tar.gz: 668c8e606e9a52392114fb94dfe73f333ab7831dba7fd21c602fbcad1ee37c0c
 SHA512:
-  metadata.gz: 9a206a642fc33750c2b58b1ab2108a407bed1806158760aea112f6f8ddd6792a2b4be31102cf10ca68eacdafabdcf02bb193e98e6cf81d4e725511a4cfeb70ac
-  data.tar.gz: '078125afab38274a3bbaf13f9562f7f3be3e5497ef9fa26ebedf7c205ab77968f4a4c77b5f53e5f5aedee9f19f7dec6628708602875d2d7086f15c26d1f23e28'
+  metadata.gz: 7277d58ee426c5635adbbae4b1f8e2b68fc0b16aa6ab42653d1e7dc7ebb62c3f13e3917e767b57ee723f82d52043064db415690e18207820fa6036584b9b4faa
+  data.tar.gz: 1c8b45fcf22dd2a219fd22c3483c4d68fa05d0f519fa66eb5593a1476fe73e98bc2a0cb3f07635933890bb297d0183d5451c152d1e10a567b3797ad1deaff9f6

data/lib/jbuilder/schema/template.rb

@@ -63,7 +63,7 @@ class Jbuilder::Schema
 
       # Rails 7.1 calls `to_s` on our `target!` (the return value from our templates).
       # To get around that and let our inner Hash through, we add this override.
-      # `unwrap_target!` is added for backwardscompatibility so we get the inner Hash on Rails < 7.1.
+      # `unwrap_target!` is added for backwards compatibility so we get the inner Hash on Rails < 7.1.
       def to_s
         @object
       end
@@ -212,29 +212,63 @@ 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
+        {
+          type: type,
+          properties: _set_properties(key, value)
+        }
+      else
+        {type: type}
+      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
@@ -245,11 +279,22 @@ class Jbuilder::Schema
     end
 
     def _set_value(key, value)
+      value = _value(value)
       value = _schema(key, value) unless value.is_a?(::Hash) && (value.key?(:type) || value.key?(:allOf)) # rubocop:disable Style/UnlessLogicalOperators
       _set_description(key, value)
       super
     end
 
+    def _set_properties(key, value)
+      _value(value).each_with_object({}) do |(attr_name, attr_value), properties|
+        properties[attr_name] = _schema("#{key}.#{attr_name}", attr_value)
+      end
+    end
+
+    def _value(value)
+      value.respond_to?(:attributes) ? value.attributes : value
+    end
+
     def _required!(keys)
       presence_validated_attributes = @configuration.object&.class.try(:validators).to_a.flat_map { _1.attributes if _1.is_a?(::ActiveRecord::Validations::PresenceValidator) }
       keys & [_key(:id), *presence_validated_attributes.flat_map { [_key(_1), _key("#{_1}_id")] }]

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.2"
+JBUILDER_SCHEMA_VERSION = "2.6.4"

metadata

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