foobara-typescript-remote-command-generator 1.2.3 → 1.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a05ca67a91d4783f58462b104e7fe231916bbb7bb6b2d54138f5ea4a924c8653
-  data.tar.gz: b889694f3237d501fd5ff8a9504dbb70be5389f7b1223a0134dc4e76eb7ea1c2
+  metadata.gz: 36ad5c92589d7b37a31298d44d7b3f3ccd6b3537a90d96816d9c35eb8cf7730d
+  data.tar.gz: 1d9d7564f82a39eec11aa36d5f1270a569a2936501ec87694933b67a8aeb6699
 SHA512:
-  metadata.gz: 81e53ffa5b4dd3eed11873aead7ad5e7edfb76dcf8487525306a33e0e93692b8a525b46602634477e70798ea886a3990a5bd53c2d7a6013ded7c3dcff0dc1110
-  data.tar.gz: 9377c12ceea5f00184d8c0ca380b7be7a5d26c5dc79e25021a1c656f756a643542b6940edbfedcb25b7daffa202e610c6696f295d9b8500654bd41c44eee2fc6
+  metadata.gz: '0381acb1520c210bf2c3062c33841e2b90938877d3945b81130232c032f8c00798570bbb460fc48bc344920e4f50f0eb717481676335c063c0517824b2ebd964'
+  data.tar.gz: a51174dd6ef504fcb130c287281b1df30c0c0ffae7e651cc9d8b8718ac10b5d1c594d29e3194b934439c7a35700b2ae342542ab98f45a591c9d51640cd46a39a

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+## [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
+
 ## [1.2.3] - 2026-01-24
 
 - Default the project_directory to "." instead of the output_directory

data/src/remote_generator/services/aggregate_entity_generator.rb

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

data/src/remote_generator/services/domain_generator.rb

@@ -28,9 +28,9 @@ module Foobara
           end
         end
 
-        def entity_generators
-          @entity_generators ||= domain_manifest.entities.map do |entity_manifest|
-            EntityGenerator.new(entity_manifest)
+        def detached_entity_generators
+          @detached_entity_generators ||= domain_manifest.detached_entities.flat_map do |entity_manifest|
+            EntityVariantsGenerator.new(entity_manifest).dependencies.to_a
           end
         end
 
@@ -47,19 +47,55 @@ module Foobara
         end
 
         def model_generators
-          # HERE!!!
           @model_generators ||= begin
             only_models = domain_manifest.models.reject(&:detached_entity?)
 
-            only_models.map do |model_manifest|
-              ModelGenerator.new(model_manifest)
+            only_models.flat_map do |model_manifest|
+              ModelVariantsGenerator.new(model_manifest).dependencies.to_a
             end
           end
         end
 
+        def all_type_generators
+          all_type_generators = []
+
+          generators_allowed_for_inputs = [*type_generators, *model_generators]
+          generators_allowed_for_errors_or_result = [*generators_allowed_for_inputs, *detached_entity_generators]
+
+          Manifest::RootManifest.new(root_manifest).commands.each do |command_manifest|
+            command_generator = CommandGenerator.new(command_manifest)
+
+            command_generator.inputs_types_depended_on.each do |type_manifest|
+              next unless type_manifest.domain == relevant_manifest
+
+              generators_allowed_for_inputs.each do |generator|
+                if generator.relevant_manifest == type_manifest
+                  all_type_generators << generator
+                end
+              end
+            end
+
+            [
+              *command_generator.result_type&.to_type,
+              *command_generator.result_types_depended_on.each,
+              *command_generator.errors_types_depended_on
+            ].each do |type_manifest|
+              next unless type_manifest.domain == relevant_manifest
+
+              generators_allowed_for_errors_or_result.each do |generator|
+                if generator.relevant_manifest == type_manifest
+                  all_type_generators << generator
+                end
+              end
+            end
+          end
+
+          all_type_generators.uniq!
+          all_type_generators
+        end
+
         def dependencies
-          @dependencies ||= [*command_generators, *model_generators, *entity_generators, *type_generators,
-                             *organization]
+          @dependencies ||= [*command_generators, *all_type_generators, organization]
         end
 
         def domain_name

data/src/remote_generator/services/typescript_from_manifest_base_generator.rb

@@ -145,7 +145,15 @@ module Foobara
           @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

data/templates/Domain.ts.erb

@@ -12,6 +12,6 @@ export <%= command.command_errors_index_generator.import_destructure %> from "<%
 <% end %>
 
 // TODO: put these on an entities module so that commands can be the only top-level interface.
-<% entity_generators.each do |entity| %>
+<% all_type_generators.each do |entity| %>
 export <%= entity.import_destructure %> from "<%= path_to_root %><%= entity.import_path %>"
 <% end %>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foobara-typescript-remote-command-generator
 version: !ruby/object:Gem::Version
-  version: 1.2.3
+  version: 1.2.5
 platform: ruby
 authors:
 - Miles Georgi