forest_admin_rpc_agent 1.19.3 → 1.20.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 416dd9578ae36c3482bf3081fff87c72b8eb06791f246a5a2928206fad40f156
-  data.tar.gz: fab6c60878ef057982046d42c9b41440eb92e678d789a93ca34fc0c1d1917716
+  metadata.gz: bc8cccff4fd75ea7fe14273663c7dec3b6abdc72dc79e9b479a9f5b5934f58e5
+  data.tar.gz: 85c668c4227e6eb22bbbc374b205c3951928b79a8b805690a91b36c25ebd441b
 SHA512:
-  metadata.gz: 4feb1d324fafb38102285485d1c4b12ceb81193ec909ed10f004d2fd37b40a2ca068ce5a344d03b63880825e513ca5e671896042fb4a84636f53ca897a81c150
-  data.tar.gz: f8ca445560335e20fd50c97a73c78d65d8a80ff959bcf5cd3ac9ef9fe280b824e27fdb0c0461bc9d16e11730a9edbd016b0d964fc48a5e84ba9d2af1a111ab0c
+  metadata.gz: 43dd1d0a2195cb331d3762ac0f48db95ba8f98ebbb87a7b501cb818805a747502cb63b14d8602e71759534780f47e7b37cf6e30f677aa00d2e6889eb9f5f8599
+  data.tar.gz: 2809c3c0153087f4c8e3d4ecac42d94ae63cdf325bba34dc825ca07c444bf7609e600dd31dc999671791435e63086ac82a6186f194ed2986074107f7eedd48c2

data/lib/forest_admin_rpc_agent/agent.rb

@@ -45,15 +45,6 @@ module ForestAdminRpcAgent
       self
     end
 
-    # Returns the cached schema for the /rpc-schema route
-    # Falls back to building schema from datasource if not cached
-    def rpc_schema
-      return @cached_schema if @cached_schema
-
-      build_and_cache_rpc_schema_from_datasource
-      @cached_schema
-    end
-
     # Check if provided hash matches the cached schema hash
     def schema_hash_matches?(provided_hash)
       return false unless @cached_schema_hash && provided_hash
@@ -84,19 +75,49 @@ module ForestAdminRpcAgent
       )
     end
 
-    def build_and_cache_rpc_schema_from_datasource
-      datasource = @container.resolve(:datasource)
-
-      @cached_schema = build_rpc_schema_from_datasource(datasource)
-      compute_and_cache_hash
-    end
-
     def build_rpc_schema_from_datasource(datasource)
       schema = customizer.schema
 
-      schema[:collections] = datasource.collections
-                                       .map { |_name, collection| serialize_collection_schema(collection) }
-                                       .sort_by { |c| c[:name] }
+      rpc_relations = {}
+      collections = []
+
+      datasource.collections.each_value do |collection|
+        relations = {}
+
+        if @rpc_collections.include?(collection.name)
+          # RPC collection → extract relations to non-RPC collections
+          collection.schema[:fields].each do |field_name, field|
+            next if field.type == 'Column'
+            next if @rpc_collections.include?(field.foreign_collection)
+
+            relations[field_name] = field
+          end
+        else
+          fields = {}
+
+          collection.schema[:fields].each do |field_name, field|
+            if field.type != 'Column' && @rpc_collections.include?(field.foreign_collection)
+              relations[field_name] = field
+            else
+              if field.type == 'Column'
+                field.filter_operators = ForestAdminAgent::Utils::Schema::FrontendFilterable.sort_operators(
+                  field.filter_operators
+                )
+              end
+
+              fields[field_name] = field
+            end
+          end
+
+          # Normal collection → include in schema
+          collections << collection.schema.merge({ name: collection.name, fields: fields })
+        end
+
+        rpc_relations[collection.name] = relations unless relations.empty?
+      end
+
+      schema[:collections] = collections.sort_by { |c| c[:name] }
+      schema[:rpc_relations] = rpc_relations
 
       schema[:native_query_connections] = datasource.live_query_connections.keys
                                                     .map { |connection_name| { name: connection_name } }
@@ -104,31 +125,6 @@ module ForestAdminRpcAgent
       schema
     end
 
-    # Serialize collection schema, converting field objects to plain hashes
-    def serialize_collection_schema(collection)
-      schema = collection.schema.dup
-      schema[:name] = collection.name
-      schema[:fields] = schema[:fields].transform_values { |field| object_to_hash(field) }
-      schema
-    end
-
-    # Convert any object to a hash using its instance variables
-    def object_to_hash(obj)
-      return obj if obj.is_a?(Hash) || obj.is_a?(Array) || obj.is_a?(String) || obj.is_a?(Numeric) || obj.nil?
-
-      hash = obj.instance_variables.to_h do |var|
-        [var.to_s.delete('@').to_sym, obj.instance_variable_get(var)]
-      end
-
-      if hash[:filter_operators].is_a?(Array)
-        hash[:filter_operators] = ForestAdminAgent::Utils::Schema::FrontendFilterable.sort_operators(
-          hash[:filter_operators]
-        )
-      end
-
-      hash
-    end
-
     def compute_and_cache_hash
       return unless @cached_schema
 

data/lib/forest_admin_rpc_agent/routes/schema.rb

@@ -27,7 +27,7 @@ module ForestAdminRpcAgent
         end
 
         # Get schema from cache (or build from datasource if not cached)
-        schema = agent.rpc_schema
+        schema = agent.cached_schema
         etag = agent.cached_schema_hash
 
         # Return schema with ETag header

data/lib/forest_admin_rpc_agent/version.rb

@@ -1,3 +1,3 @@
 module ForestAdminRpcAgent
-  VERSION = "1.19.3"
+  VERSION = "1.20.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: forest_admin_rpc_agent
 version: !ruby/object:Gem::Version
-  version: 1.19.3
+  version: 1.20.0
 platform: ruby
 authors:
 - Matthieu
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-01-05 00:00:00.000000000 Z
+date: 2026-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: base64