foobara-typescript-remote-command-generator 0.0.12 → 0.0.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1104e4a22fbc43acc6eb9224e9e4a2e66c50a9de682ec7433869852d16fa5066
-  data.tar.gz: a3ac71e2f721f84fc3b939ab1bee3022c2db37aa69c6a315557e75470e5e0bcc
+  metadata.gz: d21e54189d68b7b93ec70507e3b0fa433a4a8a380fbbd4e1df92031aea3310d2
+  data.tar.gz: a465fae839c9f38e29908ef3145b9d4b4c0d1de4e37d004893e54653ee783c15
 SHA512:
-  metadata.gz: bfc502a91885feb02d56384ee7add5b7740dd22159b33eb2dd844283be6f8e77ed989a494218d72f2ce98d540a335a5fafef126e7770e0b33c9e2eed32a43511
-  data.tar.gz: 2f6a3fe9fa23fcd90014030b037f0e0eafb90b1011a795ac9755c0b9cbde88ea7bcfb56500254eb5b087bab1ec074b189887efaa94aaffbf25d17cd5158b24aa
+  metadata.gz: b4794d89263b06204d56d09a89ac110f5382e1f1d3fdc914e2fc9a2534c8b16dcec608205643f4fcd9c69ef9ec918610e3d803e3eef6663be3356dfd70b1baba
+  data.tar.gz: d4d2cd4b56df9f690e074695b07bda3dd7f5eb0499bf4060c8854225fb233389f75938d65a1a3134c83255988d660c288bdc8785001a2cc79c598b4397a54b00

data/CHANGELOG.md

@@ -1,3 +1,15 @@
+## [0.0.14] - 2025-03-29
+
+- Send credentials: 'include'
+
+## [0.0.13] - 2025-03-17
+
+- Fix bug incorrectly generating model typescript for detached entities
+- Fix bug preventing Loaded/Unloaded entity import from being destructured properly
+- Handle errors with prefixes
+- Include custom types and models in error generator dependencies
+- Fix bug preventing allow_nil from having an effect
+
 ## [0.0.12] - 2025-03-02
 
 - Add ability to ask RemoteCommand for its state and outcome

data/src/remote_generator/services/error_generator.rb

@@ -9,17 +9,17 @@ module Foobara
         def target_path
           p = parent
 
-          basename = "#{error_name}.ts"
+          basename = "#{error_name}.ts".split("::")
 
           case parent
           when OrganizationGenerator, DomainGenerator, CommandGenerator
-            [*p.target_dir, "errors", basename]
+            [*p.target_dir, "errors", *basename]
           when nil
             # :nocov:
             raise "Expected #{error_name} to have a parent but it did not"
             # :nocov:
           else
-            [*p.target_dir, basename]
+            [*p.target_dir, *basename]
           end
         end
 
@@ -50,8 +50,7 @@ module Foobara
         end
 
         def dependencies
-          # Why don't we need models and custom types?
-          types_depended_on.select(&:detached_entity?)
+          types_depended_on.select { |type| type.detached_entity? || type.custom? || type.model? }
         end
 
         def ts_type_full_path

data/src/remote_generator/services/loaded_entity_generator.rb

@@ -21,6 +21,10 @@ module Foobara
           *prefix, name = super
           [*prefix, "Loaded#{name}"]
         end
+
+        def import_destructure
+          "{ Loaded#{scoped_short_name} }"
+        end
       end
     end
   end

data/src/remote_generator/services/type_generator.rb

@@ -76,7 +76,7 @@ module Foobara
                    # :nocov:
                  end
 
-          if declaration_data["allows_nil"]
+          if declaration_data["allow_nil"]
             # TODO: add a custom type to the fixture manifest that includes allows_nil
             # :nocov:
             guts += " | undefined"

data/src/remote_generator/services/typescript_from_manifest_base_generator.rb

@@ -48,7 +48,7 @@ module Foobara
                 Services::OrganizationConfigGenerator,
                 Services::OrganizationManifestGenerator
               ]
-            when Manifest::Entity
+            when Manifest::Entity, Manifest::DetachedEntity
               [
                 Services::EntityGenerator,
                 Services::EntityVariantsGenerator,

data/src/remote_generator/services/unloaded_entity_generator.rb

@@ -14,6 +14,10 @@ module Foobara
           *prefix, name = super
           [*prefix, "Unloaded#{name}"]
         end
+
+        def import_destructure
+          "{ Unloaded#{scoped_short_name} }"
+        end
       end
     end
   end

data/templates/Error.ts.erb

@@ -4,5 +4,5 @@ import <%= dependency_root.import_destructure %> from "<%= path_to_root %><%= de
 
 import { <%= error_base_class %> } from "<%= path_to_root %>base/Error"
 
-export class <%= error_name %> extends <%= error_base_class %><<%= context_ts_type %>> {
+export class <%= short_error_name %> extends <%= error_base_class %><<%= context_ts_type %>> {
 }

data/templates/base/RemoteCommand.ts

@@ -1,13 +1,16 @@
 import { type Outcome, SuccessfulOutcome, ErrorOutcome } from './Outcome'
 import { type FoobaraError } from './Error'
 
-export type commandState = 'initialized' | 'executing' | 'succeeded' | 'errored' | 'failed'
+export type commandState = 'initialized' | 'executing' | 'refreshing_auth' | 'succeeded' | 'errored' | 'failed'
+
+const accessTokens: Record<string, string> = {}
 
 export default abstract class RemoteCommand<Inputs, Result, CommandError extends FoobaraError> {
   static _urlBase: string | undefined
   static commandName: string
   static organizationName: string
   static domainName: string
+  static authRequired: boolean = true // TODO: set this from generator
 
   // TODO: make use of domain's config instead of process.env directly.
   static get urlBase (): string {
@@ -73,19 +76,61 @@ export default abstract class RemoteCommand<Inputs, Result, CommandError extends
     return (this.constructor as typeof RemoteCommand<Inputs, Result, CommandError>).fullCommandName
   }
 
+  get commandPath (): string {
+    return this.fullCommandName.replace('::', '/')
+  }
+
   async run (): Promise<Outcome<Result, CommandError>> {
-    const url = `${this.urlBase}/run/${this.fullCommandName}`
+    const url = `${this.urlBase}/run/${this.commandPath}`
 
-    this.commandState = 'executing'
-    const response = await fetch(url, {
+    const bearerToken = accessTokens[this.urlBase]
+
+    const requestParams: RequestInit = {
       method: 'POST',
-      headers: { 'Content-Type': 'application/json' },
-      body: JSON.stringify(this.inputs)
-    })
+      body: JSON.stringify(this.inputs),
+      credentials: 'include'
+    }
+
+    requestParams.headers = { 'Content-Type': 'application/json' }
+
+    if (bearerToken != null) {
+      requestParams.headers.Authorization = `Bearer ${bearerToken}`
+    }
+
+    this.commandState = 'executing'
+    let response = await fetch(url, requestParams)
+
+    if ((this.constructor as typeof RemoteCommand<Inputs, Result, CommandError>).authRequired &&
+        response.status === 401) {
+      this.commandState = 'refreshing_auth'
+
+      // TODO: in generator make this conditional
+      const { RefreshLogin } = await import('../Foobara/Auth')
+      // See if we can authenticate using the refresh token
+      const refreshCommand = new RefreshLogin({})
+      const outcome = await refreshCommand.run()
+
+      if (outcome.isSuccess()) {
+        const bearerToken = accessTokens[this.urlBase]
+
+        if (bearerToken != null) {
+          requestParams.headers.Authorization = `Bearer ${bearerToken}`
+        }
+
+        this.commandState = 'executing'
+        response = await fetch(url, requestParams)
+      }
+    }
 
     const body = await response.json()
 
     if (response.ok) {
+      const accessToken: string | null = response.headers.get('X-Access-Token')
+
+      if (accessToken != null) {
+        accessTokens[this.urlBase] = accessToken
+      }
+
       this.commandState = 'succeeded'
       this.outcome = new SuccessfulOutcome<Result, CommandError>(body)
     } else if (response.status === 422) {

metadata

@@ -1,42 +1,42 @@
 --- !ruby/object:Gem::Specification
 name: foobara-typescript-remote-command-generator
 version: !ruby/object:Gem::Version
-  version: 0.0.12
+  version: 0.0.14
 platform: ruby
 authors:
 - Miles Georgi
 bindir: bin
 cert_chain: []
-date: 2025-03-02 00:00:00.000000000 Z
+date: 2025-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: foobara
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.0.88
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.0.88
 - !ruby/object:Gem::Dependency
   name: foobara-files-generator
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.0.1
 email:
 - azimux@gmail.com
 executables: []
@@ -134,7 +134,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.3
+rubygems_version: 3.6.6
 specification_version: 4
 summary: Generates remote commands for Typescript from a foobara manifest
 test_files: []