foobara-typescript-remote-command-generator 0.0.2 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 564885c648194cc9432cd96eafed5cf81109e389ce0bcd63057fb34722840f19
-  data.tar.gz: a6e684cc076048dd2fe3c1a63a3664d123b1465b267feb68bc53efceffd1d55a
+  metadata.gz: 69bd175fc5eecad6f5b353135377fcf15d164fa659e2ca130f641853f4b3c5e3
+  data.tar.gz: 38b135625b70aa997cd0744a5b7f1be524212a3257f61f108ed79ee29df6f85d
 SHA512:
-  metadata.gz: a8e276a525500326735c507dd78aec433bd14cf7a99a75a4f8f54560fc6fcc1a2dc45c878862549af0a2696bc9732a0a8dc93033fe840606e46cfa3d905dab71
-  data.tar.gz: 59a0dc1ff1dff0b929bea7896316b91bb2d3f3ac22492fd7b3315bdb5041bfa0941f1dcec9fd50b38f7b790631c31d42dfcd7d4be7071fc90e3e78f21ea4bb63
+  metadata.gz: 163591e591ca0094197ee34e5ad97b4ffde5f8ac122cbbeeb3d10fd460035607c32108935f6d144459d8442bfaac9dafe3fd4283753cf8a1c20d2786d1168fcc
+  data.tar.gz: 9af4d1233e5c649b8e8ced9a6063c9ba1dafb729279308b49bedb570e6ee996aa81feb55e9bd5e313e8a389ad679ea0c89be71024c8e4fc55f6f9e45758e8905

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## [0.0.4] - 2024-08-22
+
+- Add type generators to command result generator
+- Add type generators to domain generator
+- Attempt to fix botched nested type paths
+
 ## [0.0.2] - 2024-08-21
 
 - Add a TypeGenerator for custom non-model types

data/src/remote_generator/services/aggregate_entity_generator.rb

@@ -17,7 +17,7 @@ module Foobara
         end
 
         def target_path
-          [*domain.scoped_full_path, "types", entity_name, "Aggregate.ts"]
+          [*super[..-2], "Aggregate.ts"]
         end
 
         def template_path

data/src/remote_generator/services/aggregate_model_generator.rb

@@ -17,7 +17,7 @@ module Foobara
         end
 
         def target_path
-          [*domain.scoped_full_path, "types", model_name, "Aggregate.ts"]
+          [*super[..-2], "Aggregate.ts"]
         end
 
         def template_path

data/src/remote_generator/services/atom_entity_generator.rb

@@ -15,7 +15,7 @@ module Foobara
         end
 
         def target_path
-          [*domain.scoped_full_path, "types", entity_name, "Atom.ts"]
+          [*super[..-2], "Atom.ts"]
         end
 
         def template_path

data/src/remote_generator/services/atom_model_generator.rb

@@ -17,7 +17,7 @@ module Foobara
         end
 
         def target_path
-          [*domain.scoped_full_path, "types", model_name, "Atom.ts"]
+          [*super[..-2], "Atom.ts"]
         end
 
         def template_path

data/src/remote_generator/services/command_result_generator.rb

@@ -53,6 +53,22 @@ module Foobara
           end
         end
 
+        def type_generators
+          @type_generators ||= begin
+            type = result_type
+            type = type.to_type if result_type.is_a?(Manifest::TypeDeclaration)
+
+            if !type.builtin? && !type.model?
+              # TODO: Test this!!
+              # :nocov:
+              [TypeGenerator.new(type)]
+              # :nocov:
+            else
+              []
+            end
+          end
+        end
+
         def atom?
           serializers&.any? { |s| s == "Foobara::CommandConnectors::Serializers::AtomicSerializer" }
         end
@@ -72,7 +88,7 @@ module Foobara
         end
 
         def dependencies
-          model_generators
+          model_generators + type_generators
         end
       end
     end

data/src/remote_generator/services/domain_generator.rb

@@ -34,6 +34,18 @@ module Foobara
           end
         end
 
+        def type_generators
+          @type_generators ||= begin
+            # TODO: create a Manifest::Domain#custom_types
+            only_custom_types = domain_manifest.types.reject(&:model?)
+            only_custom_types.reject!(&:builtin?)
+
+            only_custom_types.map do |type|
+              TypeGenerator.new(type)
+            end
+          end
+        end
+
         def model_generators
           @model_generators ||= begin
             only_models = domain_manifest.models.reject(&:entity?)
@@ -45,7 +57,7 @@ module Foobara
         end
 
         def dependencies
-          [*command_generators, *model_generators, *entity_generators, *organization]
+          [*command_generators, *model_generators, *entity_generators, *type_generators, *organization]
         end
 
         def domain_name

data/src/remote_generator/services/entity_generator.rb

@@ -7,7 +7,7 @@ module Foobara
         alias entity_manifest relevant_manifest
 
         def target_path
-          [*domain.scoped_full_path, "types", entity_name, "Ambiguous.ts"]
+          [*super[..-2], "Ambiguous.ts"]
         end
 
         def template_path
@@ -18,6 +18,10 @@ module Foobara
           model_name(...)
         end
 
+        def entity_short_name
+          model_short_name
+        end
+
         def primary_key_name
           primary_key_attribute
         end

data/src/remote_generator/services/entity_variants_generator.rb

@@ -5,7 +5,9 @@ module Foobara
     class Services
       class EntityVariantsGenerator < EntityGenerator
         def target_path
-          [*domain.scoped_full_path, "types", "#{model_name}.ts"]
+          *prefix, _entity_name, _file = super
+
+          [*prefix, "#{entity_short_name}.ts"]
         end
 
         def template_path

data/src/remote_generator/services/error_generator.rb

@@ -50,6 +50,7 @@ module Foobara
         end
 
         def dependencies
+          # Why don't we need models and custom types?
           types_depended_on.select(&:entity?)
         end
 

data/src/remote_generator/services/loaded_entity_generator.rb

@@ -5,7 +5,7 @@ module Foobara
     class Services
       class LoadedEntityGenerator < EntityGenerator
         def target_path
-          [*domain.scoped_full_path, "types", entity_name, "Loaded.ts"]
+          [*super[..-2], "Loaded.ts"]
         end
 
         def template_path

data/src/remote_generator/services/model_generator.rb

@@ -20,13 +20,21 @@ module Foobara
         alias model_manifest relevant_manifest
 
         def target_path
-          [*domain.scoped_full_path, "types", model_name, "#{model_name}.ts"]
+          [*domain.scoped_full_path, "Types", *model_prefix, model_short_name, "#{model_short_name}.ts"]
+        end
+
+        def model_short_name
+          type_short_name
         end
 
         def template_path
           ["Model", "Model.ts.erb"]
         end
 
+        def model_prefix
+          type_prefix
+        end
+
         def model_name(points = nil)
           type_name(points)
         end

data/src/remote_generator/services/model_manifest_generator.rb

@@ -3,7 +3,22 @@ module Foobara
     class Services
       class ModelManifestGenerator < ManifestGenerator
         def target_path
-          [*domain.scoped_full_path, "types", model_name, "manifest.json"]
+          [*domain.scoped_full_path, "Types", *model_prefix, scoped_short_name, "manifest.json"]
+        end
+
+        # TODO: DRY this up
+        def model_prefix
+          path = scoped_prefix
+
+          if path && !path.empty?
+            if path.first == "Types"
+              path[1..]
+            else
+              path
+            end
+          else
+            []
+          end
         end
       end
     end

data/src/remote_generator/services/model_variants_generator.rb

@@ -3,7 +3,7 @@ module Foobara
     class Services
       class ModelVariantsGenerator < ModelGenerator
         def target_path
-          [*domain.scoped_full_path, "types", "#{model_name}.ts"]
+          [*domain.scoped_full_path, "Types", *model_prefix, "#{scoped_short_name}.ts"]
         end
 
         def template_path

data/src/remote_generator/services/type_generator.rb

@@ -21,13 +21,31 @@ module Foobara
         alias type_manifest relevant_manifest
 
         def target_path
-          [*domain.scoped_full_path, "types", "#{type_name}.ts"]
+          [*domain.scoped_full_path, "Types", *type_prefix, "#{type_short_name}.ts"]
+        end
+
+        def type_short_name
+          scoped_short_name
         end
 
         def template_path
           ["Type", "Type.ts.erb"]
         end
 
+        def type_prefix
+          path = scoped_prefix
+
+          if path && !path.empty?
+            if path.first == "Types"
+              path[1..]
+            else
+              path
+            end
+          else
+            []
+          end
+        end
+
         def scoped_full_path(points = nil)
           full_path = type_manifest.scoped_full_path
 

data/src/remote_generator/services/unloaded_entity_generator.rb

@@ -3,7 +3,7 @@ module Foobara
     class Services
       class UnloadedEntityGenerator < EntityGenerator
         def target_path
-          [*domain.scoped_full_path, "types", entity_name, "Unloaded.ts"]
+          [*super[..-2], "Unloaded.ts"]
         end
 
         def template_path

metadata

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