foobara-typescript-remote-command-generator 0.0.7 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0e689d3af26a2cdbb1700275d5d1533f2830e906fa3da8902b8a8632a7fa233d
-  data.tar.gz: c4efa338d9bb3ee203a8fb00ec2a5191fd39f4164f85efee8af092af51d4e10e
+  metadata.gz: cc6158bda17aa24741a79802c5e0016120801eed6a7f73a4c26eb68040fbd0ed
+  data.tar.gz: 8803880e3bd4463b21be3a08b09d33387a43f5d6a497af42cc59b9aa5dd764bb
 SHA512:
-  metadata.gz: 55adef696b27cf8841be112e4b5988fa4610e3c859d7ce94522787f92592da1fa6a7c1826b5f79f2f59f90a5f206ad991ac3808cd6e0f8514fe3602eade0a5dc
-  data.tar.gz: 2a6603509a278a612c1494f6ae5158b138314a1fd7bf06caf7e3f3b7dd26c5c7ebb43cf4a3e8541c72f51b9039732146c603a9d16be31afba5a367a409834236
+  metadata.gz: 2c62a4e4597c9774b894747137a834d9a5aaff70269f322e20e93192ee6d34dff8bb88c0cd8a1fd488320eb373b9002d3523d6ee51b48f1887a5f4cedf4cb9ee
+  data.tar.gz: ec1a895e62d555c58b1ffe0a2161b4c422dc2222ae0d762da4adfb34631a7d8369a824021fd7fd36242101e281bbc5a7ac97d13fa5f48fdedf751836c905f4a6

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+## [0.0.9] - 2025-02-21
+
+- Fix a bug where we don't use the name of a custom type when we could
+
+## [0.0.8] - 2025-02-21
+
+- Make sure entity/detached_entity/model are used properly in several places
+
 ## [0.0.7] - 2025-01-06
 
 - Bump Ruby to 3.4.1

data/src/remote_generator/generate_typescript.rb

@@ -17,6 +17,7 @@ module Foobara
         include_non_templated_files
 
         add_root_manifest_to_set_of_elements_to_generate
+        # TODO: allow specifying subset of commands
         add_all_commands_to_set_of_elements_to_generate
 
         each_element_to_generate do

data/src/remote_generator/services/aggregate_model_generator.rb

@@ -6,7 +6,7 @@ module Foobara
           def new(relevant_manifest)
             return super unless self == AggregateModelGenerator
 
-            if relevant_manifest.entity?
+            if relevant_manifest.detached_entity?
               AggregateEntityGenerator.new(relevant_manifest)
             elsif relevant_manifest.has_associations?
               super
@@ -26,9 +26,7 @@ module Foobara
 
         def model_generators
           types_depended_on.select(&:model?).map do |model|
-            # TODO: what about detached_entity? What is the difference in this context between entity and model and
-            # which is detached_entity more like?
-            if model.entity?
+            if model.detached_entity?
               Services::AggregateEntityGenerator.new(model)
             else
               Services::AggregateModelGenerator.new(model)

data/src/remote_generator/services/atom_entity_generator.rb

@@ -24,7 +24,7 @@ module Foobara
 
         def model_generators
           types_depended_on.select(&:model?).map do |model|
-            if model.entity?
+            if model.detached_entity?
               Services::UnloadedEntityGenerator.new(model)
             else
               Services::AtomModelGenerator.new(model)

data/src/remote_generator/services/atom_model_generator.rb

@@ -6,7 +6,7 @@ module Foobara
           def new(relevant_manifest)
             return super unless self == AtomModelGenerator
 
-            if relevant_manifest.entity?
+            if relevant_manifest.detached_entity?
               AtomEntityGenerator.new(relevant_manifest)
             elsif relevant_manifest.has_associations?
               super
@@ -26,7 +26,7 @@ module Foobara
 
         def model_generators
           types_depended_on.select(&:model?).map do |model|
-            if model.entity?
+            if model.detached_entity?
               Services::UnloadedEntityGenerator.new(model)
             else
               Services::AtomModelGenerator.new(model)

data/src/remote_generator/services/command_result_generator.rb

@@ -19,7 +19,7 @@ module Foobara
         end
 
         def model_generators(type = result_type, initial = true)
-          if type.entity?
+          if type.detached_entity?
             generator_class = if atom?
                                 if initial
                                   AtomEntityGenerator
@@ -32,7 +32,13 @@ module Foobara
                                 EntityGenerator
                               end
 
-            [generator_class.new(type.to_entity)]
+            entity = if type.entity?
+                       type.to_entity
+                     else
+                       type.to_detached_entity
+                     end
+
+            [generator_class.new(entity)]
           elsif type.model?
             generator_class = if atom?
                                 AtomModelGenerator

data/src/remote_generator/services/domain_generator.rb

@@ -47,8 +47,9 @@ module Foobara
         end
 
         def model_generators
+          # HERE!!!
           @model_generators ||= begin
-            only_models = domain_manifest.models.reject(&:entity?)
+            only_models = domain_manifest.models.reject(&:detached_entity?)
 
             only_models.map do |model_manifest|
               ModelGenerator.new(model_manifest)

data/src/remote_generator/services/error_generator.rb

@@ -51,8 +51,7 @@ module Foobara
 
         def dependencies
           # Why don't we need models and custom types?
-          # what about detached_entity types?
-          types_depended_on.select(&:entity?)
+          types_depended_on.select(&:detached_entity?)
         end
 
         def ts_type_full_path

data/src/remote_generator/services/model_generator.rb

@@ -9,7 +9,7 @@ module Foobara
           def new(relevant_manifest)
             return super unless self == ModelGenerator
 
-            if relevant_manifest.entity?
+            if relevant_manifest.detached_entity?
               EntityGenerator.new(relevant_manifest)
             else
               super

data/src/remote_generator/services/type_generator.rb

@@ -8,7 +8,7 @@ module Foobara
           def new(relevant_manifest)
             return super unless self == TypeGenerator
 
-            if relevant_manifest.entity?
+            if relevant_manifest.detached_entity?
               EntityGenerator.new(relevant_manifest)
             elsif relevant_manifest.model?
               ModelGenerator.new(relevant_manifest)
@@ -87,7 +87,7 @@ module Foobara
         end
 
         def model_generators
-          @model_generators ||= types_depended_on.select(&:model?).map do |model|
+          @model_generators ||= types_depended_on.select(&:model?).reject(&:builtin?).map do |model|
             Services::ModelGenerator.new(model)
           end
         end

data/src/remote_generator/services/typescript_from_manifest_base_generator.rb

@@ -222,10 +222,8 @@ module Foobara
                           else
                             if type_declaration.model?
                               model_to_ts_model_name(type_declaration, association_depth:, initial:)
-                            elsif can_convert_type_declaration_to_ts_type?(type_declaration)
-                              type = type_declaration.to_type
-
-                              custom_type_to_ts_type_name(type)
+                            elsif type_declaration.custom?
+                              custom_type_to_ts_type_name(type_declaration)
                             end
                           end
                         end
@@ -247,22 +245,6 @@ module Foobara
           end
         end
 
-        def can_convert_type_declaration_to_ts_type?(type_declaration)
-          type = type_declaration.to_type
-
-          return false if BuiltinTypes.builtin_reference?(type.reference)
-
-          allowed_keys = %w[type one_of allows_nil]
-
-          declaration_data = type.declaration_data
-
-          bad_keys = declaration_data.keys - allowed_keys
-
-          return false unless bad_keys.empty?
-
-          BuiltinTypes.builtin_reference?(declaration_data["type"])
-        end
-
         def attributes_to_ts_type(attributes, dependency_group:, association_depth: AssociationDepth::AMBIGUOUS)
           guts = attributes.attribute_declarations.map do |attribute_name, attribute_declaration|
             "  #{attribute_name}#{"?" unless attributes.required?(attribute_name)}: #{
@@ -280,7 +262,7 @@ module Foobara
                             when AssociationDepth::AMBIGUOUS
                               Services::ModelGenerator
                             when AssociationDepth::ATOM
-                              if !initial && model.entity?
+                              if !initial && model.detached_entity?
                                 Services::UnloadedEntityGenerator
                               else
                                 Services::AtomModelGenerator

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: foobara-typescript-remote-command-generator
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.9
 platform: ruby
 authors:
 - Miles Georgi
 bindir: bin
 cert_chain: []
-date: 2025-01-06 00:00:00.000000000 Z
+date: 2025-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: foobara
@@ -134,7 +134,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.2
+rubygems_version: 3.6.3
 specification_version: 4
 summary: Generates remote commands for Typescript from a foobara manifest
 test_files: []