foobara-typescript-remote-command-generator 1.2.2 → 1.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 267ff33f2580961f0aae6027f8b986587950b26e5866297af2d2a461e3b8e954
-  data.tar.gz: e61dedc94508e92667d75d3b9bb35d2eab25b9d4a9485ad2a40e571417744039
+  metadata.gz: 7d547512385bac27319b644bb141ab01c46a53020b10e8aaf59f97f281733bc4
+  data.tar.gz: 0b5156e84353c299cd9b9076ad416f420306993181d9984e01b62fbbb2b4dbbe
 SHA512:
-  metadata.gz: 4de3ce62b189e7696e63a10940325ec2a6bf1fed29a13b1c0b3087fb9ac30e8be82c16cf5102bf31d2ae945b5abdec888dbf0a4093d582d5ca2d2634a955054b
-  data.tar.gz: 2ff54bbac0ad37b6b29814f07226260ab732e02c73f25df1e9ed7b2950439ceeaf3aaff70d93ebc599672256eefdc057dbc710168715e1ca370132d645047529
+  metadata.gz: 076de1fb493fa9ad32f00fce13fef08f92da9dd9864efb17dd9137ea939737ada06485c0de0552d4d6ef59b7e4c5ae5ea541d3bc122bd8a088dbdfcd510efd42
+  data.tar.gz: 378f783a3dba0e843b5409414f2eb553aab1099555a9443c48d2ccdd3c8d67ef54b8d473c780bc83c44a469250445f9a624546915cde317d5ffc3fd6fc2d2e15

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+## [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
+
 ## [1.2.2] - 2026-01-24
 
 - Add support for an app model named Model, which collide's with Foobara's Model

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/write_typescript_to_disk.rb

@@ -9,7 +9,9 @@ module Foobara
         raw_manifest :associative_array, :allow_nil
         manifest_url :string, :allow_nil
         # TODO: should be able to delete this and inherit it
-        project_directory :string, :allow_nil, "This lets you specify a directory to run the linter or npm run build in"
+        project_directory :string,
+                          default: ".",
+                          description: "This lets you specify a directory to run the linter or npm run build in"
         output_directory :string, default: "src/domains"
         fail_if_does_not_pass_linter :boolean, default: false
       end

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.2
+  version: 1.2.4
 platform: ruby
 authors:
 - Miles Georgi