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

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e8215d8808315c6f8fd3d1e630ce0e580a6a577c5b1c70a417347ee2dc334998
-  data.tar.gz: 9cda7eed3bea9cd2dadb446857d1fb4c133e0b35cbad491c7c1527d49d682d1a
+  metadata.gz: 4ded6d4d4e950f079230273d922ef380455597c4dd0fcf01005396156871291e
+  data.tar.gz: 9f2ff8044bd23a32c5db7768a4783e17c3be1742f43edf7d6c60664935e9ff1f
 SHA512:
-  metadata.gz: 83ce0b3291adbc9bff8e6328f7f7c2a7bd386fb46aae876282ed4f7ee88bb401148cd99720f38fdbbf31d5bf73df3e5a9167a0830a120409a38cd4a5f8e90f8d
-  data.tar.gz: 829447664b106704867d6c4345d677a6f252b2ffe730a4f54719ffa37b7998a6ec8385f7a22abf3ac57e2a5f8b2e0841b14fdc6ade33415adf80cb8fe76048b7
+  metadata.gz: 4447f6d43c30e80f514c8db191bbf8bb115ded65df4febaa030c877bffd88db7820db66d637185353e7bb7aab81d666dc38002d5413d99358f5a07e217fdcbfc
+  data.tar.gz: 4929a9a0ccb737f0df18979adcfc7d3d223c272c810f44aef208441b01077b77fcde6a114e0f822347530a39774c5bd06b0d2463ddb6503835a18d3853ea7449

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## [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

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
@@ -383,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/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/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/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.5
+  version: 1.1.6
 platform: ruby
 authors:
 - Miles Georgi
@@ -70,7 +70,6 @@ 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
@@ -136,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))