Fix circular dependency that happens if an item from this domain collides

Author: azimux

CHANGELOG.md

@@ -1,3 +1,7 @@
+## [1.2.5] - 2026-01-27
+
+- Fix circular dependency that happens if an item from this domain collides
+
 ## [1.2.4] - 2026-01-26
 
 - Fix bug where we include models/entities from command inputs

Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    foobara-typescript-remote-command-generator (1.2.4)
+    foobara-typescript-remote-command-generator (1.2.5)
       foobara (>= 0.1.16, < 2.0.0)
       foobara-files-generator (< 2.0.0)
 
@@ -17,7 +17,7 @@ GEM
     diff-lcs (1.6.2)
     docile (1.4.1)
     ffi (1.17.3-x86_64-linux-gnu)
-    foobara (0.4.5)
+    foobara (0.4.6)
       bigdecimal
       foobara-lru-cache (< 2.0.0)
       foobara-util (< 2.0.0)
@@ -101,15 +101,15 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
     rspec-support (3.13.6)
-    rubocop (1.82.1)
+    rubocop (1.84.0)
       json (~> 2.3)
       language_server-protocol (~> 3.17.0.2)
       lint_roller (~> 1.1.0)
       parallel (~> 1.10)
       parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 2.9.3, < 3.0)
-      rubocop-ast (>= 1.48.0, < 2.0)
+      rubocop-ast (>= 1.49.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 4.0)
     rubocop-ast (1.49.0)

src/remote_generator/services/aggregate_entity_generator.rb

@@ -34,10 +34,6 @@ def dependencies
           [*super, superclass_generator]
         end
 
-        def collision_winners
-          superclass_generator
-        end
-
         def superclass_generator
           @superclass_generator ||= LoadedEntityGenerator.new(relevant_manifest)
         end

src/remote_generator/services/typescript_from_manifest_base_generator.rb

@@ -145,7 +145,15 @@ def dependency_roots
           @dependency_roots = dependency_group.non_colliding_dependency_roots.sort_by(&:scoped_full_name)
         end
 
-        def collision_winners = nil
+        def collision_winners
+          # TODO: odd that root_manifest exists but isn't decorated. We need a decorated and undecorated method
+          root_manifest = Manifest::RootManifest.new(self.root_manifest)
+
+          [*dependencies].select do |dependency|
+            root_manifest.contains?(dependency.domain_reference, :domain) &&
+              dependency.domain == domain
+          end
+        end
 
         def ts_instance_path
           scoped_path

version.rb

@@ -1,7 +1,7 @@
 module Foobara
   module TypescriptRemoteCommandGenerator
     module Version
-      VERSION = "1.2.4".freeze
+      VERSION = "1.2.5".freeze
       MINIMUM_RUBY_VERSION = ">= 3.4.0".freeze
     end
   end