forest_admin_datasource_mongoid 1.45.1 → 1.45.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5bf71405e1b5133a5adc5c52ba242fcd24fd553ff24d8f007e19617de75c6bb8
-  data.tar.gz: 1900293f2054d88ba1e191ddfa5fbcd92aa0c797cff39d21f98226caeaae224f
+  metadata.gz: de923427287155a0df371496903f860e8889430abf7aa1609bd4bf8f17f30b35
+  data.tar.gz: be3514f5c733a9593bbd1ebb4c09200f4567ce38a3dba131e7f91578efe6ad82
 SHA512:
-  metadata.gz: 96f85626b50cbd6a585ef988d700e66f22a15919723202dba6802bc7870a6960d27da243fc379d0d49caafd8b85093d6c0ac5599b07f93bf566ae731c0116d6d
-  data.tar.gz: bbb7fb6e6b4615502ff24112e3e566a9f5690bfb9ea60884889c328a34bc991e46a216d06184ab3a696eef42be2a216855a9f5c714c5d5f3b5e9fbd57ea4a1db
+  metadata.gz: 56e621caa5039afe72c1574bbf953621db94c901914d3a3a19c00f68afba0b1b638196f7287d1d3756ad103ba04ad012ff2db66c042919ca083bce8b1b6b554e
+  data.tar.gz: 4f87635abaef12140b87e6facaa0eb0fc7af1c6407a50d98cd1bb249977dc723939443fa03b7fe76a57cce249f4d4dc1d48270834428184316442c2f9d1d7cae

data/lib/forest_admin_datasource_mongoid/utils/add_null_values.rb

@@ -21,37 +21,44 @@ module ForestAdminDatasourceMongoid
       def add_null_values_on_record(record, projection)
         return nil if record.nil?
 
-        result = record.dup
+        fill_null_values(record, build_null_values_tree(projection))
+      end
 
-        projection.each do |field|
-          field_prefix = field.split(':').first
-          result[field_prefix] ||= nil
-        end
+      def add_null_values(records, projection)
+        return [] if records.empty?
 
-        nested_prefixes = projection.filter_map { |field| field.split(':').first if field.include?(':') }.uniq
+        tree = build_null_values_tree(projection)
+        records.filter_map { |record| fill_null_values(record, tree) }
+      end
 
-        nested_prefixes.each do |nested_prefix|
-          prefix_with_colon = "#{nested_prefix}:"
-          child_paths = projection.filter_map do |field|
-            field[(nested_prefix.size + 1)..] if field.start_with?(prefix_with_colon)
-          end
+      private
 
-          next unless result[nested_prefix] && !result[nested_prefix].nil?
+      def build_null_values_tree(paths)
+        paths.group_by { |path| path.split(':', 2).first }.to_h do |key, key_paths|
+          child_paths = key_paths.filter_map { |path| path.split(':', 2)[1] }
+          [key, child_paths.empty? ? nil : build_null_values_tree(child_paths)]
+        end
+      end
 
-          if result[nested_prefix].is_a?(Array)
-            result[nested_prefix] = result[nested_prefix].map do |child_record|
-              add_null_values_on_record(child_record, child_paths)
-            end
-          elsif result[nested_prefix].is_a?(Hash)
-            result[nested_prefix] = add_null_values_on_record(result[nested_prefix], child_paths)
-          end
+      def fill_null_values(record, tree)
+        return nil if record.nil?
+
+        result = record.dup
+
+        tree.each do |key, sub_tree|
+          result[key] ||= nil
+          result[key] = fill_nested_null_values(result[key], sub_tree) if sub_tree
         end
 
         remove_not_exist_record(result)
       end
 
-      def add_null_values(records, projection)
-        records.filter_map { |record| add_null_values_on_record(record, projection) }
+      def fill_nested_null_values(value, sub_tree)
+        case value
+        when Array then value.map { |item| item.is_a?(Hash) ? fill_null_values(item, sub_tree) : item }
+        when Hash then fill_null_values(value, sub_tree)
+        else value
+        end
       end
     end
   end

data/lib/forest_admin_datasource_mongoid/utils/mongoid_serializer.rb

@@ -1,5 +1,6 @@
 module ForestAdminDatasourceMongoid
   module Utils
+    # Unused internally; kept because it is a public constant of the published gem.
     MongoidSerializer = Struct.new(:object) do
       def to_hash(projection)
         hash_object(object, projection)

data/lib/forest_admin_datasource_mongoid/version.rb

@@ -1,3 +1,3 @@
 module ForestAdminDatasourceMongoid
-  VERSION = "1.45.1"
+  VERSION = "1.45.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: forest_admin_datasource_mongoid
 version: !ruby/object:Gem::Version
-  version: 1.45.1
+  version: 1.45.2
 platform: ruby
 authors:
 - Matthieu
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-10-10 00:00:00.000000000 Z
+date: 2026-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongoid