Do not include Model/Entity classes in command inputs to simplify things for now

Author: azimux

Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    foobara-typescript-react-command-form-generator (0.0.11)
+    foobara-typescript-react-command-form-generator (0.0.12)
       foobara-typescript-remote-command-generator (~> 0.0.1)
 
 GEM
@@ -13,11 +13,12 @@ GEM
     coderay (1.1.3)
     diff-lcs (1.6.1)
     docile (1.4.1)
-    ffi (1.17.1-x86_64-linux-gnu)
-    foobara (0.0.96)
+    ffi (1.17.2-x86_64-linux-gnu)
+    foobara (0.0.102)
       bigdecimal
       foobara-lru-cache (~> 0.0.2)
       foobara-util (~> 0.0.11)
+      inheritable-thread-vars (~> 0.0.1)
     foobara-files-generator (0.0.5)
       foobara
     foobara-lru-cache (0.0.2)
@@ -26,8 +27,7 @@ GEM
       rubocop-rspec
     foobara-spec-helpers (0.0.4)
       foobara-util
-    foobara-typescript-remote-command-generator (0.0.16)
-      foobara (~> 0.0.88)
+    foobara-typescript-remote-command-generator (0.0.18)
       foobara-files-generator (~> 0.0.1)
     foobara-util (0.0.11)
     formatador (1.1.0)
@@ -47,6 +47,7 @@ GEM
       guard (~> 2.1)
       guard-compat (~> 1.1)
       rspec (>= 2.99.0, < 4.0)
+    inheritable-thread-vars (0.0.2)
     json (2.10.2)
     language_server-protocol (3.17.0.4)
     lint_roller (1.1.0)
@@ -61,8 +62,8 @@ GEM
       nenv (~> 0.1)
       shellany (~> 0.0)
     ostruct (0.6.1)
-    parallel (1.26.3)
-    parser (3.3.7.4)
+    parallel (1.27.0)
+    parser (3.3.8.0)
       ast (~> 2.4.1)
       racc
     prism (1.4.0)
@@ -106,7 +107,7 @@ GEM
       rubocop-ast (>= 1.44.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 4.0)
-    rubocop-ast (1.44.0)
+    rubocop-ast (1.44.1)
       parser (>= 3.3.7.2)
       prism (~> 1.4)
     rubocop-rake (0.7.1)

src/typescript_react_command_form_generator.rb

@@ -36,11 +36,16 @@ def type_generators(type_declaration = inputs_type, initial = true)
             return @type_generators if defined?(@type_generators)
 
             generators = if type_declaration.entity?
-                           generator_class = RemoteGenerator::Services::UnloadedEntityGenerator
-                           [generator_class.new(type_declaration.to_entity)]
+                           # For now, we'll not bother with entity/model classes in the inputs.
+                           # This simplifies things a bit re: form generation and setting UI
+                           # inputs into the inputs value.
+                           type_generators(type_declaration.to_type.primary_key_type, false)
+                           # generator_class = RemoteGenerator::Services::UnloadedEntityGenerator
+                           # [generator_class.new(type_declaration.to_entity)]
                          elsif type_declaration.model?
-                           generator_class = RemoteGenerator::Services::AtomModelGenerator
-                           [generator_class.new(type_declaration.to_model)]
+                           type_generators(type_declaration.to_type.attributes_type, false)
+                           # generator_class = RemoteGenerator::Services::AtomModelGenerator
+                           # [generator_class.new(type_declaration.to_model)]
                          elsif type_declaration.type.to_sym == :attributes
                            type_declaration.attribute_declarations.values.map do |attribute_declaration|
                              type_generators(attribute_declaration, false)

templates/CommandForm.tsx.erb

@@ -6,6 +6,7 @@ import { <%= command_name %> } from "<%= path_to_root %><%= command_generator.im
 <% unless empty_inputs? %>
 import <%= inputs_class_name %> from "<%= path_to_root %><%= command_generator.import_path %>/Inputs"
 <% end %>
+<%# TODO: why isn't the result type handled via dependency_roots to avoid collisions with other types? %>
 import <%= result_class_name %> from "<%= path_to_root %><%= command_generator.import_path %>/Result"
 import { Error as <%= error_class_name %> } from "<%= path_to_root %><%= command_generator.import_path %>/Errors"