forest_liana 9.22.3 → 9.22.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 277b2499887f0ff82ea53ca55fc79843541cef4709f064c70f5efa55a4735d53
-  data.tar.gz: f0fbeb9771dae6c1db93581279e433815f47eca0e257543f24bf012057da51d3
+  metadata.gz: f8365b7c92d4157a34acd7f00af2c3d515976b96884eef48c0a0e72c775b1ea0
+  data.tar.gz: a61cfdd476921b56e293014854693c3aa39ffd6d8474544273be222f91c5d0db
 SHA512:
-  metadata.gz: 8e02b44b8348a306b0e7e60b44da087c0effb4ba538947e9165e6db2e156698b4a276a0288335ea8b7768454e0d4309ef4232e37c994abd2adffc04763f66f2b
-  data.tar.gz: 2be7bc1df7f51619407f1fe8f2b49a8e7b5629ada6151677e6f1f9a57a5548ffbeec5cfdb33f31cb8ca015a26937fb73e96f7decb9b63e959903e69497791f1b
+  metadata.gz: 8ee81334205b47404f4fc9349fcde08b8d38be877a525a1cfb8bc1481de1b435d88b0724d48552cbc111735a751b2f84c60a49cc4142a5a7c3a9fab6df201d49
+  data.tar.gz: dec06373edbb86308bb9577c0f20d61a747ad9fa0fac691b1f70fadada3d2e27406337b188eda61f10c5ad96405c6d65db77bd4e5144dd079e9445d1b1a13cc4

data/app/services/forest_liana/apimap_sorter.rb

@@ -110,15 +110,16 @@ module ForestLiana
     private
 
     def sort_array_of_objects(array)
-      array.sort! do |element1, element2|
-        [element1['type'], element1['id']] <=>  [element2['type'], element2['id']]
-      end
+      array.sort_by! { |element| [element['type'].to_s, element['id'].to_s] }
     end
 
+    # NOTICE: A field 'type' is a String ('String'), an Array (['String'] for an array column)
+    # or a Hash (a nested type), and those are not comparable with one another:
+    # `['String'] <=> 'String'` returns nil, which makes `sort` raise an ArgumentError as soon
+    # as two fields share a name. Only the tie-breaker ever needs to be total, so JSON-ifying
+    # that one alone keeps the primary key byte-for-byte identical and the apimap churn-free.
     def sort_array_of_fields(array)
-      array.sort do |field1, field2|
-        [field1['field'], field1['type']] <=>  [field2['field'], field2['type']]
-      end
+      array.sort_by { |field| [field['field'].to_s, field['type'].to_json] }
     end
 
     def reorder_keys_basic(object)

data/lib/forest_liana/version.rb

@@ -1,3 +1,3 @@
 module ForestLiana
-  VERSION = "9.22.3"
+  VERSION = "9.22.4"
 end

data/spec/services/forest_liana/apimap_sorter_spec.rb

@@ -171,6 +171,80 @@ module ForestLiana
           expect(apimap_sorted['meta']['stack'].keys).to eq(['database_type', 'orm_version'])
         end
       end
+
+      context 'on an apimap with fields sharing a name but not a comparable type' do
+        # NOTICE: a field 'type' is a String ('String'), an Array (['String'] for an array
+        # column) or a Hash (a nested type). The sort used to compare those values
+        # directly, so `['String'] <=> 'String'` returned nil and `sort` raised
+        # `ArgumentError: comparison of Hash with Hash failed`. The rescue in `perform`
+        # swallowed it and returned a half-processed apimap: collections that were never
+        # reached kept attributes outside KEYS_COLLECTION (such as 'search_fields'), and
+        # the Forest API rejects those with `HTTP 400 ValidationFailedError`.
+        let(:apimap) do
+          ActiveSupport::JSON.decode(ActiveSupport::JSON.encode({
+            'meta': {
+              stack: {
+                'orm_version': '4.34.9',
+                'database_type': 'postgresql',
+              },
+              liana: 'forest-rails',
+              'liana_version': '1.5.24',
+            },
+            'data': [{
+              id: 'posts',
+              type: 'collections',
+              attributes: {
+                name: 'posts',
+                fields: [
+                  { field: 'tags', type: ['String'] },
+                  { field: 'tags', type: 'String' },
+                  { field: 'meta', type: { fields: [{ field: 'locale', type: 'String' }] } },
+                  { field: 'meta', type: 'String' },
+                  { field: 'id', type: 'Number' },
+                ],
+              }
+            }, {
+              id: 'zebras',
+              type: 'collections',
+              attributes: {
+                'search_fields': ['name'],
+                fields: [
+                  { field: 'id', type: 'Number' },
+                ],
+                name: 'zebras',
+              }
+            }]
+          }))
+        end
+
+        let(:apimap_sorted) { ApimapSorter.new(apimap).perform }
+
+        it 'should reorder the whole apimap without bailing out' do
+          expect(FOREST_LOGGER).not_to receive(:warn)
+
+          apimap_sorted
+        end
+
+        it 'should sort the fields of the offending collection' do
+          expect(apimap_sorted['data'][0]['attributes']['fields'].map { |field| field['field'] })
+            .to eq(['id', 'meta', 'meta', 'tags', 'tags'])
+        end
+
+        it 'should keep a deterministic order between the non-comparable types' do
+          tag_types = apimap_sorted['data'][0]['attributes']['fields']
+            .select { |field| field['field'] == 'tags' }
+            .map { |field| field['type'] }
+          expect(tag_types).to eq(['String', ['String']])
+        end
+
+        it 'should keep processing the collections after the offending one' do
+          expect(apimap_sorted['data'][1]['attributes'].keys).to eq(['name', 'fields'])
+        end
+
+        it 'should not leak collection attributes that are not part of the schema' do
+          expect(apimap_sorted['data'][1]['attributes']).not_to have_key('search_fields')
+        end
+      end
     end
 
     describe 'a smart field dependencies key' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: forest_liana
 version: !ruby/object:Gem::Version
-  version: 9.22.3
+  version: 9.22.4
 platform: ruby
 authors:
 - Sandro Munda
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-09-25 00:00:00.000000000 Z
+date: 2026-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails