Add concept of collision winners since no need to qualify all of them

This fixes a bug when the superclass we import collides with dependencies

Author: azimux

src/remote_generator/services/aggregate_entity_generator.rb

@@ -30,6 +30,18 @@ def model_generators
           end
         end
 
+        def dependencies
+          [*super, superclass_generator]
+        end
+
+        def collision_winners
+          superclass_generator
+        end
+
+        def superclass_generator
+          @superclass_generator ||= LoadedEntityGenerator.new(relevant_manifest)
+        end
+
         def attributes_type_ts_type
           aggregate_attributes_ts_type
         end
@@ -38,10 +50,6 @@ def ts_instance_path
           [*model_prefix, generated_type]
         end
 
-        def import_destructure
-          "{ #{generated_type} }"
-        end
-
         def generated_type
           "#{scoped_short_name}Aggregate"
         end

src/remote_generator/services/atom_entity_generator.rb

@@ -36,10 +36,6 @@ def ts_instance_path
           [*model_prefix, generated_type]
         end
 
-        def import_destructure
-          "{ #{generated_type} }"
-        end
-
         def generated_type
           "#{scoped_short_name}Atom"
         end

src/remote_generator/services/dependency_group.rb

@@ -10,13 +10,14 @@ def collisions_for_points
           end
         end
 
-        attr_accessor :dependencies, :name, :will_define, :deps_are_for
+        attr_accessor :dependencies, :name, :will_define, :deps_are_for, :winners
 
-        def initialize(dependencies, name:, deps_are_for:, will_define:)
+        def initialize(dependencies, name:, deps_are_for:, will_define:, winners: nil)
           self.deps_are_for = deps_are_for
           self.will_define = will_define
           self.name = name
           self.dependencies = dependencies.to_set
+          self.winners = [*winners] if winners
 
           find_collisions
         end
@@ -69,7 +70,7 @@ def non_colliding_root(dep)
           root
         end
 
-        def points_for(dep)
+        def raw_points_for(dep)
           points = collision_data_for(dep).points
 
           unless points
@@ -81,6 +82,14 @@ def points_for(dep)
           points
         end
 
+        def points_for(dep)
+          if winners&.include?(dep)
+            0
+          else
+            raw_points_for(dep)
+          end
+        end
+
         def non_colliding_type_name(dep, points = points_for(dep))
           non_colliding_type_path(dep, points).join(".")
         end

src/remote_generator/services/loaded_entity_generator.rb

@@ -16,10 +16,6 @@ def ts_instance_path
           [*model_prefix, generated_type]
         end
 
-        def import_destructure
-          "{ #{generated_type} }"
-        end
-
         def generated_type
           "Loaded#{scoped_short_name}"
         end

src/remote_generator/services/model_generator.rb

@@ -50,6 +50,10 @@ def model_name_downcase
         def generated_type
           model_short_name
         end
+
+        def import_destructure
+          "{ #{generated_type} }"
+        end
       end
     end
   end

src/remote_generator/services/typescript_from_manifest_base_generator.rb

@@ -120,7 +120,11 @@ def dependency_group
               generator_for(dependency)
             end
 
-            DependencyGroup.new(generators, deps_are_for: self, name: scoped_full_path.join("."), will_define:)
+            DependencyGroup.new(generators,
+                                deps_are_for: self,
+                                name: scoped_full_path.join("."),
+                                will_define:,
+                                winners: collision_winners)
           end
         end
 
@@ -141,6 +145,8 @@ def dependency_roots
           @dependency_roots = dependency_group.non_colliding_dependency_roots.sort_by(&:scoped_full_name)
         end
 
+        def collision_winners = nil
+
         def ts_instance_path
           scoped_path
         end

src/remote_generator/services/unloaded_entity_generator.rb

@@ -14,10 +14,6 @@ def ts_instance_path
           [*model_prefix, generated_type]
         end
 
-        def import_destructure
-          "{ #{generated_type} }"
-        end
-
         def generated_type
           "Unloaded#{scoped_short_name}"
         end

templates/Entity/Aggregate.ts.erb

@@ -1,7 +1,7 @@
 import {
   <%= entity_short_name %>AttributesType
 } from "./Ambiguous"
-import { Loaded<%= entity_short_name %> } from "./Loaded"
+
 <% dependency_roots.each do |dependency_root| %>
 import <%= dependency_root.import_destructure %> from "<%= path_to_root %><%= dependency_root.import_path %>"
 <% end %>