Fix bug where we don't use the name of a custom type when we could

Author: azimux

CHANGELOG.md

@@ -1,8 +1,8 @@
-## [0.0.5] - 2025-02-21
+## [0.0.6] - 2025-02-21
 
-- 
+- Fix a bug where we don't use the name of a custom type when we could
 
-## [0.0.4] - 2025-02-21
+## [0.0.5] - 2025-02-21
 
 - Bump Ruby to 3.4.2
 - Include custom types in form generator

Gemfile

@@ -8,7 +8,6 @@ gemspec
 gem "rake"
 
 # gem "foobara", path: "../foobara"
-# gem "foobara-files-generator", path: "../files-generator"
 # gem "foobara-typescript-remote-command-generator", path: "../typescript-remote-command-generator"
 
 group :development do

Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    foobara-typescript-react-command-form-generator (0.0.5)
+    foobara-typescript-react-command-form-generator (0.0.6)
       foobara
       foobara-files-generator
       foobara-typescript-remote-command-generator
@@ -16,7 +16,7 @@ GEM
     diff-lcs (1.6.0)
     docile (1.4.1)
     ffi (1.17.1-x86_64-linux-gnu)
-    foobara (0.0.61)
+    foobara (0.0.62)
       bigdecimal
       foobara-util
     foobara-files-generator (0.0.5)
@@ -26,7 +26,7 @@ GEM
       rubocop-rspec
     foobara-spec-helpers (0.0.4)
       foobara-util
-    foobara-typescript-remote-command-generator (0.0.8)
+    foobara-typescript-remote-command-generator (0.0.9)
       foobara
       foobara-files-generator
     foobara-util (0.0.11)

spec/generate_typescript_react_command_form_spec.rb

@@ -56,7 +56,13 @@
 
     it "is successful" do
       expect(outcome).to be_success
+
       expect(result.keys).to eq(["forms/Foobara/Ai/AnswerBot/AskForm.tsx"])
+
+      ask_form_text = result["forms/Foobara/Ai/AnswerBot/AskForm.tsx"]
+      expect(ask_form_text).to include("import { model } from")
+      expect(ask_form_text).to match(/setModel\(e.target.value as model/)
+      expect(ask_form_text).to match(/<select\s+value=\{model \?\? ""}/m)
     end
   end
 end

src/typescript_react_command_form_generator.rb

@@ -105,6 +105,7 @@ def non_colliding_inputs(type_declaration = inputs_type, result = [], path = [])
               non_colliding_inputs(type_declaration.to_type.attributes_type, result, path)
             elsif type_declaration.array?
               if type_declaration.element_type
+                # TODO: isn't this a no-op??
                 type_generators(type_declaration.element_type, false)
               end
             else
@@ -166,6 +167,25 @@ def initialize(generator, path, type_declaration)
               self.type_declaration = type_declaration
             end
 
+            def custom?
+              type_declaration.custom?
+            end
+
+            def one_of
+              real_type_declaration.one_of
+            end
+
+            # TODO: something feels kind of wrong here, hmmm
+            def real_type_declaration
+              @real_type_declaration ||= if custom?
+                                           # We are dealing with a reference to a registered type
+                                           # so we need the declaration this type name was registered to
+                                           type_declaration.to_type.to_type_declaration_from_declaration_data
+                                         else
+                                           type_declaration
+                                         end
+            end
+
             def name
               first, *rest = path
 
@@ -187,11 +207,11 @@ def ts_type
             end
 
             def has_default?
-              type_declaration.attribute? && default
+              real_type_declaration.attribute? && default
             end
 
             def default
-              type_declaration.default
+              real_type_declaration.default
             end
 
             def ts_default
@@ -204,8 +224,6 @@ def name_english
 
             def html_input
               # TODO: handle boolean, etc
-              one_of = type_declaration.one_of
-
               if one_of
                 ts_type = generator.foobara_type_to_ts_type(type_declaration)
 

version.rb

@@ -1,7 +1,7 @@
 module Foobara
   module Generators
     module TypescriptReactCommandFormGenerator
-      VERSION = "0.0.5".freeze
+      VERSION = "0.0.6".freeze
 
       local_ruby_version = File.read("#{__dir__}/.ruby-version").chomp
       local_ruby_version_minor = local_ruby_version[/\A(\d+\.\d+)\.\d+\z/, 1]