foobara-typescript-remote-command-generator 1.1.4 → 1.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5730e34976cb1769563181451bbde187218e84e4abbf6d48af05951dbab07b61
-  data.tar.gz: b97e1b7a5e7ccc4c136bc722f81ca694b40f954779b6ad1c6e980a2d2d10a8aa
+  metadata.gz: 4ded6d4d4e950f079230273d922ef380455597c4dd0fcf01005396156871291e
+  data.tar.gz: 9f2ff8044bd23a32c5db7768a4783e17c3be1742f43edf7d6c60664935e9ff1f
 SHA512:
-  metadata.gz: 67632d61f05b1a7613f40c22efbc90e77b828e3cbe89e9c1adaef4ff3627f645c3465714ddf9edb8e86853d762f0b5188ac7d6794d9eb0b6fc2d22aaf43c204c
-  data.tar.gz: 513ad99446b01309740aba890c8faa53cb4047becfbc5a81a466fd536b7543c8e2c3a8fcd926a835b0f5cb9f6801e29c78680da039f6237ad57a06fbb70a0751
+  metadata.gz: 4447f6d43c30e80f514c8db191bbf8bb115ded65df4febaa030c877bffd88db7820db66d637185353e7bb7aab81d666dc38002d5413d99358f5a07e217fdcbfc
+  data.tar.gz: 4929a9a0ccb737f0df18979adcfc7d3d223c272c810f44aef208441b01077b77fcde6a114e0f822347530a39774c5bd06b0d2463ddb6503835a18d3853ea7449

data/CHANGELOG.md

@@ -1,3 +1,16 @@
+## [1.1.6] - 2025-10-17
+
+- Dirty all queries on login/logout, not just GetCurrentUser
+- Remove no-longer needed /setup.ts file generation
+
+## [1.1.5] - 2025-10-15
+
+- Implement castJsonResult
+- Fix various problems with Model and subclass constructors
+- Memoize various #model_generators, #dependencies, #dependency_roots
+- Cache generator creation
+- Add ruby-prof and term trap spec support files
+
 ## [1.1.4] - 2025-10-02
 
 - Don't give warning about importing domain/setup.ts if it already has been added to index.tsx

data/src/remote_generator/services/aggregate_entity_generator.rb

@@ -25,7 +25,7 @@ module Foobara
         end
 
         def model_generators
-          types_depended_on.select(&:model?).map do |model|
+          @model_generators ||= types_depended_on.select(&:model?).map do |model|
             Services::AggregateModelGenerator.new(model)
           end
         end

data/src/remote_generator/services/aggregate_model_generator.rb

@@ -25,7 +25,7 @@ module Foobara
         end
 
         def model_generators
-          types_depended_on.select(&:model?).map do |model|
+          @model_generators ||= types_depended_on.select(&:model?).map do |model|
             if model.detached_entity?
               Services::AggregateEntityGenerator.new(model)
             else

data/src/remote_generator/services/atom_entity_generator.rb

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

data/src/remote_generator/services/atom_model_generator.rb

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

data/src/remote_generator/services/command_cast_result_generator.rb

@@ -0,0 +1,313 @@
+require_relative "command_result_generator"
+
+module Foobara
+  module RemoteGenerator
+    class Services
+      class CommandCastResultGenerator < CommandResultGenerator
+        class CastTree
+          attr_accessor :children, :declaration_to_cast, :past_first_model
+
+          def initialize(children: nil, declaration_to_cast: nil, past_first_model: false)
+            self.children = children
+            self.declaration_to_cast = declaration_to_cast
+            self.past_first_model = past_first_model
+          end
+
+          def empty?
+            (children.nil? || children.empty?) && declaration_to_cast.nil?
+          end
+        end
+
+        alias command_manifest relevant_manifest
+
+        def result_type
+          command_manifest.result_type
+        end
+
+        def target_path
+          [*scoped_full_path, "castJsonResult.ts"]
+        end
+
+        def template_path
+          "Command/castJsonResult.ts.erb"
+        end
+
+        def applicable?
+          result_json_requires_cast?
+        end
+
+        def nested_model_generators
+          return @nested_model_generators if defined?(@nested_model_generators)
+
+          nested_model_generators = []
+
+          generators = model_generators
+
+          generators.each do |generator|
+            _models_reachable_from_declaration(
+              generator.relevant_manifest
+            )&.each do |(model, past_first)|
+              generator_class = if atom?
+                                  if model.detached_entity? && past_first
+                                    Services::UnloadedEntityGenerator
+                                  else
+                                    Services::AtomModelGenerator
+                                  end
+                                elsif aggregate?
+                                  Services::AggregateModelGenerator
+                                else
+                                  Services::ModelGenerator
+                                end
+
+              new_generator = generator_class.new(model)
+
+              unless generators.any? do |g|
+                g.relevant_manifest == model && g.class == new_generator.class
+              end
+                nested_model_generators << new_generator
+              end
+            end
+          end
+
+          @nested_model_generators = nested_model_generators
+        end
+
+        def atom?
+          serializers&.any? { |s| s == "Foobara::CommandConnectors::Serializers::AtomicSerializer" }
+        end
+
+        def aggregate?
+          serializers&.any? { |s| s == "Foobara::CommandConnectors::Serializers::AggregateSerializer" }
+        end
+
+        def dependencies
+          @dependencies ||= model_generators + nested_model_generators
+        end
+
+        def cast_json_result_function
+          "#{cast_json_result_function_body}\nreturn json"
+        end
+
+        private
+
+        # TODO: need to make use of initial?
+        def cast_json_result_function_body(
+          cast_tree = _construct_cast_tree(result_type),
+          parent: "json",
+          property: nil,
+          value: parent
+        )
+          if cast_tree.nil? || cast_tree.empty?
+            return
+          end
+
+          result = []
+
+          case cast_tree
+          when CastTree
+            result << cast_json_result_function_body(cast_tree.children, parent: value)
+            result << _ts_cast_expression(cast_tree, parent:, property:, value:)
+          when ::Hash
+            cast_tree.each_pair do |path_part, child_cast_tree|
+              if path_part == :"#"
+                result << "#{parent}?.forEach((element: any, index: number, array: any[]) => {"
+                result << cast_json_result_function_body(child_cast_tree,
+                                                         parent: "array",
+                                                         property: "index",
+                                                         value: "element")
+                result << "})"
+              elsif child_cast_tree.is_a?(::Hash)
+                # TODO: either test this codepath or delete it
+                # :nocov:
+                property = path_part =~ /\A\d+\z/ ? path_part.to_i : "\"#{path_part}\""
+
+                result << cast_json_result_function_body(child_cast_tree,
+                                                         parent:,
+                                                         property:,
+                                                         value: "#{parent}.#{path_part}")
+                # :nocov:
+              elsif child_cast_tree.is_a?(CastTree)
+                result << cast_json_result_function_body(child_cast_tree.children,
+                                                         parent: "#{parent}.#{path_part}")
+
+                property = path_part =~ /\A\d+\z/ ? path_part.to_i : "\"#{path_part}\""
+                result << _ts_cast_expression(child_cast_tree,
+                                              parent:,
+                                              property:,
+                                              value: "#{parent}.#{path_part}")
+              else
+                # :nocov:
+                raise "Not sure how to handle a #{cast_tree.class}: #{cast_tree}"
+                # :nocov:
+              end
+            end
+          else
+            # :nocov:
+            raise "Not sure how to handle a #{cast_tree.class}: #{cast_tree}"
+            # :nocov:
+          end
+
+          result.compact.join("\n")
+        end
+
+        def _ts_cast_expression(cast_tree, value:, parent: nil, property: nil)
+          unless cast_tree.is_a?(CastTree)
+            # :nocov:
+            raise "Expected a CastTree but got a #{cast_tree.class}: #{cast_tree}"
+            # :nocov:
+          end
+
+          type_declaration = cast_tree.declaration_to_cast
+
+          return unless type_declaration
+
+          lvalue = if parent
+                     if property.nil?
+                       parent
+                     elsif property =~ /\A"(.*)"\z/
+                       "#{parent}.#{$1}"
+                     else
+                       "#{parent}[#{property}]"
+                     end
+                   else
+                     # TODO: either test this path or raise
+                     # :nocov:
+                     value
+                     # :nocov:
+                   end
+
+          type = if type_declaration.is_a?(Manifest::TypeDeclaration)
+                   type_declaration.to_type
+                 else
+                   type_declaration
+                 end
+
+          type_symbol = type.type_symbol
+
+          value ||= lvalue
+
+          if type_symbol == :date || type_symbol == :datetime
+            "#{lvalue} = new Date(#{value})"
+          elsif type.model?
+            ts_model_name = model_to_ts_model_name(type, association_depth:,
+                                                         initial: !cast_tree.past_first_model)
+
+            "#{lvalue} = new #{ts_model_name}(#{value})"
+          else
+            # :nocov:
+            raise "Not sure how to cast type #{type} to a Typescript expression"
+            # :nocov:
+          end
+        end
+
+        def _construct_cast_tree(type_declaration, past_first_model: false)
+          if type_declaration.is_a?(Manifest::Attributes)
+            return unless type_declaration.has_attribute_declarations?
+            return if type_declaration.attribute_declarations.empty?
+
+            path_tree = {}
+
+            type_declaration.attribute_declarations.each_pair do |attribute_name, attribute_declaration|
+              if type_requires_cast?(attribute_declaration)
+                path_tree[attribute_name] = _construct_cast_tree(attribute_declaration, past_first_model:)
+              end
+            end
+
+            unless path_tree.empty?
+              CastTree.new(children: path_tree, past_first_model:)
+            end
+          elsif type_declaration.is_a?(Manifest::Array)
+            element_type = type_declaration.element_type
+
+            if element_type && type_requires_cast?(element_type)
+              CastTree.new(children: { "#": _construct_cast_tree(element_type, past_first_model:) })
+            end
+          elsif type_declaration.type.to_sym == :date || type_declaration.type.to_sym == :datetime
+            CastTree.new(declaration_to_cast: type_declaration, past_first_model:)
+          elsif type_declaration.model?
+            type_declaration = type_declaration.to_type
+
+            children = if type_declaration.detached_entity? && atom?
+                         nil
+                       else
+                         _construct_cast_tree(type_declaration.attributes_type, past_first_model: true)
+                       end
+
+            CastTree.new(children:, declaration_to_cast: type_declaration, past_first_model:)
+            # TODO: either test this code path or raise or delete it
+            # :nocov:
+          elsif type_declaration.custom?
+            if type_requires_cast?(type_declaration.base_type.to_type_declaration)
+              tree = _construct_cast_tree(type_declaration.base_type.to_type_declaration, past_first_model:)
+
+              if tree && !tree.empty?
+                CastTree.new(children: tree, past_first_model:)
+              end
+            end
+          end
+          # :nocov:
+        end
+
+        # TODO: Feels like similar complicated logic is popping up in many places? How to find/converge such logic
+        def _models_reachable_from_declaration(type_declaration, past_first_model: false)
+          if type_declaration.is_a?(Manifest::Attributes)
+            return unless type_declaration.has_attribute_declarations?
+            return if type_declaration.attribute_declarations.empty?
+
+            models = nil
+
+            type_declaration.attribute_declarations.each_value do |attribute_declaration|
+              if type_requires_cast?(attribute_declaration)
+                models ||= Set.new
+
+                _models_reachable_from_declaration(
+                  attribute_declaration,
+                  past_first_model:
+                )&.each do |pair|
+                  models << pair
+                end
+              end
+            end
+
+            models
+          elsif type_declaration.is_a?(Manifest::Array)
+            element_type = type_declaration.element_type
+
+            if element_type && type_requires_cast?(element_type)
+              _models_reachable_from_declaration(element_type, past_first_model:)
+            end
+          elsif type_declaration.model?
+            if type_declaration.is_a?(Manifest::TypeDeclaration)
+              type_declaration = type_declaration.to_type
+            end
+
+            models = Set[[type_declaration, past_first_model]]
+
+            if atom? && type_declaration.detached_entity?
+              return models
+            end
+
+            _models_reachable_from_declaration(
+              type_declaration.attributes_type,
+              past_first_model: true
+            )&.each do |pair|
+              models << pair
+            end
+
+            models
+          elsif type_declaration.custom?
+            # TODO: either test this code path or raise or delete it
+            # :nocov:
+            if type_requires_cast?(type_declaration.base_type.to_type_declaration)
+              _models_reachable_from_declaration(
+                type_declaration.base_type.to_type_declaration,
+                past_first_model:
+              )
+            end
+            # :nocov:
+          end
+        end
+      end
+    end
+  end
+end

data/src/remote_generator/services/command_generator.rb

@@ -43,6 +43,42 @@ module Foobara
         def base_class_name
           base_class_path.split("/").last
         end
+
+        def result_json_requires_cast?
+          # What types require a cast?
+          # :date and :datetime, :model, custom type declaration (check #custom?)
+          result_type && type_requires_cast?(result_type)
+        end
+
+        private
+
+        def type_requires_cast?(type_declaration)
+          if type_declaration.is_a?(Manifest::Attributes)
+            return false unless type_declaration.has_attribute_declarations?
+            return false if type_declaration.attribute_declarations.empty?
+
+            type_declaration.attribute_declarations.values.any? do |attribute_declaration|
+              type_requires_cast?(attribute_declaration)
+            end
+          elsif type_declaration.is_a?(Manifest::Array)
+            element_type = type_declaration.element_type
+            element_type && type_requires_cast?(element_type)
+          else
+            return true if type_declaration.model?
+
+            type_symbol = type_declaration.type_symbol
+
+            if type_symbol == :date || type_symbol == :datetime
+              return true
+            end
+
+            if type_declaration.custom?
+              type_declaration = type_declaration.to_type if type_declaration.is_a?(Manifest::TypeDeclaration)
+              base_type = type_declaration.base_type
+              type_requires_cast?(base_type)
+            end
+          end
+        end
       end
     end
   end

data/src/remote_generator/services/command_result_generator.rb

@@ -3,7 +3,7 @@ require_relative "typescript_from_manifest_base_generator"
 module Foobara
   module RemoteGenerator
     class Services
-      class CommandResultGenerator < TypescriptFromManifestBaseGenerator
+      class CommandResultGenerator < CommandGenerator
         alias command_manifest relevant_manifest
 
         def result_type
@@ -18,10 +18,20 @@ module Foobara
           "Command/Result.ts.erb"
         end
 
-        def model_generators(type = result_type, initial = true)
-          return [] if type.nil?
+        def model_generators(*args)
+          type, initial = if args.empty?
+                            return @model_generators if defined?(@model_generators)
 
-          if type.detached_entity?
+                            use_cache = true
+
+                            [result_type, true]
+                          else
+                            args
+                          end
+
+          if type.nil?
+            []
+          elsif type.detached_entity?
             generator_class = if atom?
                                 if initial
                                   AtomEntityGenerator
@@ -57,9 +67,15 @@ module Foobara
             end.flatten.uniq
           elsif type.array?
             model_generators(type.element_type, false)
+            # rubocop:disable Lint/DuplicateBranch
           else
             # TODO: handle tuples, associative arrays
             []
+            # rubocop:enable Lint/DuplicateBranch
+          end.tap do |result|
+            if use_cache
+              @model_generators = result
+            end
           end
         end
 

data/src/remote_generator/services/dependency_group.rb

@@ -16,16 +16,6 @@ module Foobara
           self.name = name
           self.dependencies = dependencies.to_set
 
-          dependencies.each do |dep|
-            if dep.belongs_to_dependency_group
-              # :nocov:
-              raise "Dependency group #{dep} already belongs to dependency group #{dep.dependency_group}"
-              # :nocov:
-            end
-
-            dep.belongs_to_dependency_group = self
-          end
-
           find_collisions
         end
 

data/src/remote_generator/services/domain_generator.rb

@@ -58,7 +58,8 @@ module Foobara
         end
 
         def dependencies
-          [*command_generators, *model_generators, *entity_generators, *type_generators, *organization]
+          @dependencies ||= [*command_generators, *model_generators, *entity_generators, *type_generators,
+                             *organization]
         end
 
         def domain_name

data/src/remote_generator/services/entity_variants_generator.rb

@@ -35,7 +35,7 @@ module Foobara
         end
 
         def dependencies
-          Set[
+          @dependencies ||= Set[
            entity_generator,
            unloaded_entity_generator,
            loaded_entity_generator,

data/src/remote_generator/services/error_generator.rb

@@ -54,7 +54,7 @@ module Foobara
         end
 
         def dependencies
-          types_depended_on.select { |type| type.detached_entity? || type.custom? || type.model? }
+          @dependencies ||= types_depended_on.select { |type| type.detached_entity? || type.custom? || type.model? }
         end
 
         def ts_type_full_path

data/src/remote_generator/services/model_variants_generator.rb

@@ -23,11 +23,11 @@ module Foobara
         end
 
         def dependencies
-          if has_associations?
-            [model_generator, atom_model_generator, aggregate_model_generator]
-          else
-            [model_generator]
-          end
+          @dependencies ||= if has_associations?
+                              [model_generator, atom_model_generator, aggregate_model_generator]
+                            else
+                              [model_generator]
+                            end
         end
       end
     end

data/src/remote_generator/services/type_generator.rb

@@ -5,15 +5,27 @@ module Foobara
     class Services
       class TypeGenerator < TypescriptFromManifestBaseGenerator
         class << self
+          def lru_cache
+            @lru_cache ||= LruCache.new(1000)
+          end
+
           def new(relevant_manifest)
-            return super unless self == TypeGenerator
+            unless self == TypeGenerator
+              generator = lru_cache.cached([self, relevant_manifest]) do
+                super
+              end
+
+              return generator
+            end
 
             if relevant_manifest.detached_entity?
               EntityGenerator.new(relevant_manifest)
             elsif relevant_manifest.model?
               ModelGenerator.new(relevant_manifest)
             else
-              super
+              lru_cache.cached([self, relevant_manifest]) do
+                super
+              end
             end
           end
         end
@@ -99,7 +111,7 @@ module Foobara
         end
 
         def dependencies
-          custom_type_generators + model_generators
+          @dependencies ||= custom_type_generators + model_generators
         end
 
         def type_name_downcase

data/src/remote_generator/services/typescript_from_manifest_base_generator.rb

@@ -36,10 +36,7 @@ module Foobara
                                   when "Foobara::Auth::Logout"
                                     Services::Auth::LogoutGenerator
                                   when /\bGetCurrentUser$/
-                                    [
-                                      Services::Auth::RequiresAuthGenerator,
-                                      Services::Auth::SetupGenerator
-                                    ]
+                                    Services::Auth::RequiresAuthGenerator
                                   else
                                     if manifest.requires_authentication?
                                       Services::Auth::RequiresAuthGenerator
@@ -52,6 +49,7 @@ module Foobara
                 *generator_classes,
                 Services::CommandInputsGenerator,
                 Services::CommandResultGenerator,
+                Services::CommandCastResultGenerator,
                 Services::CommandErrorsGenerator,
                 Services::CommandErrorsIndexGenerator,
                 Services::CommandManifestGenerator
@@ -127,6 +125,8 @@ module Foobara
         end
 
         def dependency_roots
+          return @dependency_roots if defined?(@dependency_roots)
+
           unless dependency_group
             # :nocov:
             raise "This generator was created without a " \
@@ -134,7 +134,7 @@ module Foobara
             # :nocov:
           end
 
-          dependency_group.non_colliding_dependency_roots.sort_by(&:scoped_full_name)
+          @dependency_roots = dependency_group.non_colliding_dependency_roots.sort_by(&:scoped_full_name)
         end
 
         def ts_instance_path
@@ -380,12 +380,7 @@ module Foobara
 
         def path_to_root
           path = super
-
-          if path.empty?
-            "./"
-          else
-            path
-          end
+          path.empty? ? "./" : path
         end
       end
     end

data/src/remote_generator/write_typescript_to_disk.rb

@@ -59,7 +59,6 @@ module Foobara
 
       def run_post_generation_tasks
         eslint_fix
-        warn_about_adding_setup_to_index
       end
 
       def eslint_fix
@@ -74,24 +73,6 @@ module Foobara
           end
         end
       end
-
-      def warn_about_adding_setup_to_index
-        if paths_to_source_code.key?("setup.ts")
-          index_tsx_path = "#{output_directory}/../index.tsx"
-
-          if File.exist?(index_tsx_path)
-            unless File.read(index_tsx_path) =~ /import.*domains\/setup/
-              warn "WARNING: you should add the following to src/index.tsx:\n\n" \
-                   "import './domains/setup'"
-            end
-          else
-            # :nocov:
-            warn "WARNING: Make sure you add the following somewhere:\n\n" \
-                 "import './domains/setup'"
-            # :nocov:
-          end
-        end
-      end
     end
   end
 end

data/templates/Command/castJsonResult.ts.erb

@@ -0,0 +1,9 @@
+import Result from "./Result"
+
+<% dependency_roots.each do |dependency_root| %>
+import <%= dependency_root.import_destructure %> from "<%= path_to_root %><%= dependency_root.import_path %>"
+<% end %>
+
+export default function castJsonResult (json: any): Result {
+  <%= cast_json_result_function %>
+}

data/templates/Command.ts.erb

@@ -3,9 +3,18 @@ import <%= base_class_name %> from "<%= path_to_root %><%= base_class_path %>"
 import Inputs from "./Inputs"
 import Result from "./Result"
 import { Error } from "./Errors"
+<% if result_json_requires_cast? %>
+import castJsonResult from "./castJsonResult"
+<% end %>
 
 export class <%= command_name %> extends <%= base_class_name %><Inputs, Result, Error> {
   static readonly organizationName = "<%= organization_name %>"
   static readonly domainName = "<%= domain_name %>"
   static readonly commandName = "<%= command_name %>"
+
+<% if result_json_requires_cast? %>
+  castJsonResult(json: any): Result {
+    return castJsonResult(json)
+  }
+<% end %>
 }

data/templates/Entity/Loaded.ts.erb

@@ -5,6 +5,12 @@ import {
 
 export class Loaded<%= entity_short_name %><T extends <%= entity_short_name %>AttributesType = <%= entity_short_name %>AttributesType> extends <%= entity_short_name %><T> {
   readonly isLoaded: true = true
+
+  // eslint-disable-next-line @typescript-eslint/no-useless-constructor
+  constructor(attributes: T) {
+    super(attributes)
+  }
+
   <% unless has_associations? %>
 /* eslint-disable @typescript-eslint/class-literal-property-style */
   get isAtom (): true { return true }

data/templates/Entity/Unloaded.ts.erb

@@ -1,18 +1,17 @@
 import { Never } from "<%= path_to_root %>base/Entity"
 import {
   <%= entity_short_name %>,
-  //<%= entity_short_name %>PrimaryKeyType
+  <%= entity_short_name %>PrimaryKeyType,
   <%= entity_short_name %>AttributesType
 } from "./Ambiguous"
 
 export type Unloaded<%= entity_short_name %>AttributesType = Never<<%= entity_short_name %>AttributesType>
 
 export class Unloaded<%= entity_short_name %> extends <%= entity_short_name %><Unloaded<%= entity_short_name %>AttributesType> {
-  /*
-  constructor(id: <%= entity_short_name %>PrimaryKeyType) {
-    super(id, {})
+  // eslint-disable-next-line @typescript-eslint/no-useless-constructor
+  constructor(primaryKey: <%= entity_short_name %>PrimaryKeyType) {
+    super(primaryKey)
   }
-  */
 
   readonly isLoaded: false = false
 }

data/templates/Foobara/Auth/utils/accessTokens.ts.erb

@@ -1,31 +1,25 @@
 import type Query from '../../../base/Query'
 import type RemoteCommand from '../../../base/RemoteCommand'
+import { forEachQuery } from '../../../base/QueryCache'
 
-let getCurrentUserQuery: Query<RemoteCommand<any, any, any>> | undefined
-
-export function setGetCurrentUserQuery (query: Query<RemoteCommand<any, any, any>>): void {
-  getCurrentUserQuery = query
-}
-
-function setCurrentUserDirty () {
-  console.log('setCurrentUserDirty')
-  if (getCurrentUserQuery != null) {
-    getCurrentUserQuery.setDirty()
-  }
+function dirtyAllQueries () {
+  forEachQuery((query: Query<RemoteCommand<any, any, any>>) => {
+    query.setDirty()
+  })
 }
 
 const accessTokens = new Map<string, string>()
 
 const logout = (urlBase: string): void => {
   accessTokens.delete(urlBase)
-  setCurrentUserDirty()
+  dirtyAllQueries()
 }
 let handleLogout: (baseUrl: string) => void = logout
 
 const tokenForUrl = (baseUrl: string): string | undefined => accessTokens.get(baseUrl)
 const handleLogin: (baseUrl: string, accessToken: string) => void = (baseUrl, accessToken) => {
   accessTokens.set(baseUrl, accessToken)
-  setCurrentUserDirty()
+  dirtyAllQueries()
 }
 
 if (typeof BroadcastChannel !== 'undefined') {

data/templates/base/Entity.ts

@@ -17,10 +17,22 @@ export abstract class Entity<PrimaryKeyType extends EntityPrimaryKeyType, Attrib
   abstract get hasAssociations(): boolean
   abstract get associationPropertyPaths (): string[][]
 
-  constructor(primaryKey: PrimaryKeyType, attributes: AttributesType) {
-    super(attributes)
-    this.primaryKey = primaryKey
-    this.isLoaded = attributes !== undefined
+  constructor(primaryKeyOrAttributes: PrimaryKeyType | AttributesType) {
+    let attributes: AttributesType | undefined
+
+    const klass = new.target as typeof Entity<PrimaryKeyType, AttributesType>
+
+    if (typeof primaryKeyOrAttributes === "object") {
+      attributes = primaryKeyOrAttributes
+      super(attributes)
+      this.isLoaded = true
+      this.primaryKey = this.attributes[klass.primaryKeyAttributeName as keyof AttributesType] as PrimaryKeyType
+    } else {
+      // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
+      super({[klass.primaryKeyAttributeName]: primaryKeyOrAttributes} as AttributesType)
+      this.isLoaded = false
+      this.primaryKey = primaryKeyOrAttributes as PrimaryKeyType
+    }
   }
 
   /* Can we make this work or not?

data/templates/base/QueryCache.ts

@@ -33,6 +33,10 @@ export function getQuery<CommandT extends RemoteCommand<any, any, any>> (
   return query
 }
 
+export function forEachQuery (callback: (query: Query<RemoteCommand<any, any, any>>) => void): void {
+  queryCache.forEach(callback)
+}
+
 function toKey<CommandT extends RemoteCommand<any, any, any>> (
   CommandClass: RemoteCommandConstructor<CommandT>,
   inputs: InputsOf<CommandT> | undefined

data/templates/base/RemoteCommand.ts

@@ -101,13 +101,19 @@ export default abstract class RemoteCommand<Inputs, Result, CommandError extends
     return await fetch(this._buildUrl(), this._buildRequestParams())
   }
 
+  castJsonResult (json: any): Result {
+    return json
+  }
+
   async _handleResponse (response: Response): Promise<Outcome<Result, CommandError>> {
     const text = await response.text()
     const body = JSON.parse(text)
 
     if (response.ok) {
+      const result = this.castJsonResult(body)
+
+      this.outcome = new SuccessfulOutcome<Result, CommandError>(result)
       this.commandState = 'succeeded'
-      this.outcome = new SuccessfulOutcome<Result, CommandError>(body)
     } else if (response.status === 422 || response.status === 401 || response.status === 403) {
       this.commandState = 'errored'
       this.outcome = new ErrorOutcome<Result, CommandError>(body)

data/templates/hooks/useQuery.ts

@@ -57,19 +57,23 @@ export default function useQuery<CommandT extends RemoteCommand<any, any, any>>
     queryRef.current = query
   }
 
+  const [queryState, setQueryState] = useState<QueryState<CommandT>>(
+    queryToQueryState<CommandT>(query)
+  )
+
   useEffect(() => {
-    const unsubscribe = query?.onChange(() => {
-      if (query != null) { // just here to satisfy type checker
+    if (query == null) {
+      return undefined
+    }
+
+    const removeListener = query.onChange(() => {
+      if (query != null) { // Just here to satisfy type check
         setQueryState(queryToQueryState<CommandT>(query))
       }
     })
 
-    return unsubscribe
+    return removeListener
   }, [query])
 
-  const [queryState, setQueryState] = useState<QueryState<CommandT>>(
-    queryToQueryState<CommandT>(query)
-  )
-
   return queryState
 }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foobara-typescript-remote-command-generator
 version: !ruby/object:Gem::Version
-  version: 1.1.4
+  version: 1.1.6
 platform: ruby
 authors:
 - Miles Georgi
@@ -15,7 +15,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.14
+        version: 0.1.16
     - - "<"
       - !ruby/object:Gem::Version
         version: 2.0.0
@@ -25,7 +25,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.14
+        version: 0.1.16
     - - "<"
       - !ruby/object:Gem::Version
         version: 2.0.0
@@ -70,7 +70,7 @@ files:
 - src/remote_generator/services/auth/refresh_login_generator.rb
 - src/remote_generator/services/auth/requires_auth_command_generator.rb
 - src/remote_generator/services/auth/requires_auth_generator.rb
-- src/remote_generator/services/auth/setup_generator.rb
+- src/remote_generator/services/command_cast_result_generator.rb
 - src/remote_generator/services/command_errors_generator.rb
 - src/remote_generator/services/command_errors_index_generator.rb
 - src/remote_generator/services/command_generator.rb
@@ -103,6 +103,7 @@ files:
 - templates/Command/Errors.ts.erb
 - templates/Command/Inputs.ts.erb
 - templates/Command/Result.ts.erb
+- templates/Command/castJsonResult.ts.erb
 - templates/Command/errors/index.ts.erb
 - templates/Domain.ts.erb
 - templates/Domain/config.ts.erb
@@ -134,7 +135,6 @@ files:
 - templates/base/RemoteCommand.ts
 - templates/base/RemoteCommandTypes.ts
 - templates/hooks/useQuery.ts
-- templates/setup.ts.erb
 homepage: https://github.com/foobara/typescript-remote-command-generator
 licenses:
 - Apache-2.0

data/src/remote_generator/services/auth/setup_generator.rb

@@ -1,25 +0,0 @@
-module Foobara
-  module RemoteGenerator
-    class Services
-      module Auth
-        class SetupGenerator < CommandGenerator
-          def template_path
-            "setup.ts.erb"
-          end
-
-          def target_path
-            ["setup.ts"]
-          end
-
-          def command_generator
-            generator_for(command_manifest)
-          end
-
-          def dependencies
-            [command_generator]
-          end
-        end
-      end
-    end
-  end
-end

data/templates/setup.ts.erb

@@ -1,6 +0,0 @@
-import { getQuery } from './base/QueryCache'
-import { setGetCurrentUserQuery } from './Foobara/Auth/utils/accessTokens'
-
-import <%= command_generator.import_destructure %> from "<%= path_to_root %><%= command_generator.import_path %>"
-
-setGetCurrentUserQuery(getQuery(<%= dependency_group.non_colliding_type(command_generator) %>, undefined))