foobara-typescript-remote-command-generator 1.3.1 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cf59c3786304e34b238364d087ca029225bd01bf158bf9ddb928112aa8e3a234
-  data.tar.gz: 6b3fdc12eb0c6d9f4391b12ea5ed9b351ef90a48cf0aad1e8fa30288f56c7163
+  metadata.gz: 16a68cb56fbf77e520f577b5ef5d0b6c677d6461fb69ce242906d608b6412e3f
+  data.tar.gz: 35dcccf09cff04cad00c02423b77ebecdebc3643080cc9e534bae8e957dd273c
 SHA512:
-  metadata.gz: 7c0b909fc48ecdeb842417d9b6b4f04ad556771c2dc949775e555ff6fd1f1f1f94b820e222246135abb51a5bcb737771028c5c2e68c160a6e1358e61e71dec20
-  data.tar.gz: 64881ffe38ce0ce810b73bdc7a6d71fce9c7400979da2794a550403c2c1f81c19df4b9810f2c99fd003803c09400c0b3cf2be9df5aa5ddf8db84e96f48a4852e
+  metadata.gz: 952c659c1ace30fbbd24f980c8382db56f95757ac5a802b25ed19e5c6faf276dd1647f6fe999cb3afc49c3bb35b90003e95765ad2363f1ce160846cd9d3100d3
+  data.tar.gz: 78c60b378c18f6786c9d6cd29db44d7c693c45c433977deedeaec79694ccb4f640f092159349758be3d1094d04c83f379e6caaea4c3e3bd4c9d5e820e4929fcc

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## [1.4.0] - 2026-03-19
+
+- Make things work with Vite instead of CRA
+
 ## [1.3.1] - 2026-02-28
 
 - Use a channel to make other tabs automatically reload their queries

data/src/generators/type_generator.rb

@@ -148,6 +148,10 @@ module Foobara
         def attribute_names
           attributes_type.attribute_names
         end
+
+        def import_destructure
+          "{ type #{scoped_short_name} }"
+        end
       end
     end
   end

data/templates/Command/Inputs.ts.erb

@@ -4,4 +4,4 @@
 
 type Inputs = <%= foobara_type_to_ts_type(inputs_type, dependency_group:, model_and_entity_free: true) %>
 
-export default Inputs
+export type { Inputs as default }

data/templates/Command/Result.ts.erb

@@ -6,4 +6,4 @@ type Result = <%=
 result_type.nil? ? "null" : foobara_type_to_ts_type(result_type, dependency_group:, association_depth:)
 %>
 
-export default Result
+export type { Result as default }

data/templates/Command/castJsonResult.ts.erb

@@ -1,4 +1,4 @@
-import Result from "./Result"
+import type Result from "./Result"
 
 <% dependency_roots.each do |dependency_root| %>
 import <%= dependency_root.import_destructure %> from "<%= path_to_root %><%= dependency_root.import_path %>"

data/templates/Command.ts.erb

@@ -2,9 +2,9 @@
 import <%= dependency_root.import_destructure %> from "<%= path_to_root %><%= dependency_root.import_path %>"
 <% end %>
 
-import Inputs from "./Inputs"
-import Result from "./Result"
-import { Error } from "./Errors"
+import type Inputs from "./Inputs"
+import type Result from "./Result"
+import { type Error } from "./Errors"
 <% if result_json_requires_cast? %>
 import castJsonResult from "./castJsonResult"
 <% end %>

data/templates/Domain/config.ts.erb

@@ -1,4 +1,4 @@
-let _urlBase = process.env.REACT_APP_FOOBARA_GLOBAL_URL_BASE
+let _urlBase = import.meta.env.REACT_APP_FOOBARA_GLOBAL_URL_BASE
 
 const config = {
   get urlBase(): string {

data/templates/Entity/Aggregate.ts.erb

@@ -1,5 +1,5 @@
 import {
-  <%= entity_short_name %>AttributesType
+  type <%= entity_short_name %>AttributesType
 } from "./Ambiguous"
 
 <% dependency_roots.each do |dependency_root| %>

data/templates/Entity/Atom.ts.erb

@@ -1,5 +1,5 @@
 import {
-  <%= entity_short_name %>AttributesType
+  type <%= entity_short_name %>AttributesType
 } from "./Ambiguous"
 import { Loaded<%= entity_short_name %> } from "./Loaded"
 <% dependency_roots.each do |dependency_root| %>

data/templates/Entity/Loaded.ts.erb

@@ -1,6 +1,6 @@
 import {
   <%= entity_short_name %>,
-  <%= entity_short_name %>AttributesType
+  type <%= entity_short_name %>AttributesType
 } from "./Ambiguous"
 
 export class Loaded<%= entity_short_name %><T extends <%= entity_short_name %>AttributesType = <%= entity_short_name %>AttributesType> extends <%= entity_short_name %><T> {

data/templates/Entity/Unloaded.ts.erb

@@ -1,8 +1,8 @@
-import { Never } from "<%= path_to_root %>base/Entity"
+import { type Never } from "<%= path_to_root %>base/Entity"
 import {
   <%= entity_short_name %>,
-  <%= entity_short_name %>PrimaryKeyType,
-  <%= entity_short_name %>AttributesType
+  type <%= entity_short_name %>PrimaryKeyType,
+  type <%= entity_short_name %>AttributesType
 } from "./Ambiguous"
 
 export type Unloaded<%= entity_short_name %>AttributesType = Never<<%= entity_short_name %>AttributesType>

data/templates/EntityVariants.ts.erb

@@ -1,12 +1,12 @@
 import {
   <%= entity_short_name %>,
-  <%= entity_short_name %>PrimaryKeyType,
+  type <%= entity_short_name %>PrimaryKeyType,
   <%= entity_name_downcase %>PrimaryKeyAttributeName,
-  <%= entity_short_name %>AttributesType
+  type <%= entity_short_name %>AttributesType
 } from "./<%= entity_short_name %>/Ambiguous"
 import {
   Unloaded<%= entity_short_name %>,
-  Unloaded<%= entity_short_name %>AttributesType
+  type Unloaded<%= entity_short_name %>AttributesType
 } from "./<%= entity_short_name %>/Unloaded"
 import {
   Loaded<%= entity_short_name %>
@@ -15,11 +15,11 @@ import {
 <% if has_associations? %>
 import {
   <%= entity_short_name %>Atom,
-  <%= entity_short_name %>AtomAttributesType
+  type <%= entity_short_name %>AtomAttributesType
 } from "./<%= entity_short_name %>/Atom"
 import {
   <%= entity_short_name %>Aggregate,
-  <%= entity_short_name %>AggregateAttributesType
+  type <%= entity_short_name %>AggregateAttributesType
 } from "./<%= entity_short_name %>/Aggregate"
 <% end %>
 

data/templates/Foobara/Auth/RequiresAuthCommand.ts.erb

@@ -2,6 +2,7 @@ import RemoteCommand from '../../base/RemoteCommand'
 import { type Outcome } from '../../base/Outcome'
 import { type FoobaraError } from '../../base/Error'
 import { tokenForUrl } from './utils/accessTokens'
+import { RefreshLogin } from './RefreshLogin'
 
 export default class RequiresAuthCommand<Inputs, Result, Error extends FoobaraError<any>>
   extends RemoteCommand<Inputs, Result, Error> {
@@ -27,7 +28,6 @@ export default class RequiresAuthCommand<Inputs, Result, Error extends FoobaraEr
     if (response.status === 401) {
       this.commandState = 'refreshing_authentication'
 
-      const { RefreshLogin } = await import('./RefreshLogin')
       // See if we can authenticate using the refresh token
       const refreshCommand = new RefreshLogin()
       const outcome = await refreshCommand.run()

data/templates/Model/Aggregate.ts.erb

@@ -1,6 +1,6 @@
 import {
   <%= model_short_name %>,
-  <%= model_short_name %>AttributesType
+  type <%= model_short_name %>AttributesType
 } from "./<%= model_short_name %>"
 <% dependency_roots.each do |dependency_root| %>
 import <%= dependency_root.import_destructure %> from "<%= path_to_root %><%= dependency_root.import_path %>"

data/templates/Model/Atom.ts.erb

@@ -1,6 +1,6 @@
 import {
   <%= model_short_name %>,
-  <%= model_short_name %>AttributesType
+  type <%= model_short_name %>AttributesType
 } from "./<%= model_short_name %>"
 <% dependency_roots.each do |dependency_root| %>
 import <%= dependency_root.import_destructure %> from "<%= path_to_root %><%= dependency_root.import_path %>"

data/templates/ModelVariants.ts.erb

@@ -1,16 +1,16 @@
 import {
   <%= model_short_name %>,
-  <%= model_short_name %>AttributesType
+  type <%= model_short_name %>AttributesType
 } from "./<%= model_short_name %>/<%= model_short_name %>"
 
 <% if has_associations? %>
 import {
   <%= model_short_name %>Atom,
-  <%= model_short_name %>AtomAttributesType
+  type <%= model_short_name %>AtomAttributesType
 } from "./<%= model_short_name %>/Atom"
 import {
   <%= model_short_name %>Aggregate,
-  <%= model_short_name %>AggregateAttributesType
+  type <%= model_short_name %>AggregateAttributesType
 } from "./<%= model_short_name %>/Aggregate"
 <% end %>
 

data/templates/Organization/config.ts.erb

@@ -1,4 +1,4 @@
-let _urlBase = process.env.REACT_APP_FOOBARA_GLOBAL_URL_BASE
+let _urlBase = import.meta.env.REACT_APP_FOOBARA_GLOBAL_URL_BASE
 
 const config = {
   get urlBase(): string {

data/templates/base/RemoteCommand.ts.erb

@@ -10,12 +10,12 @@ export default abstract class RemoteCommand<Inputs, Result, CommandError extends
   static organizationName: string
   static domainName: string
 
-  // TODO: make use of domain's config instead of process.env directly.
+  // TODO: make use of domain's config instead of import.meta.env directly.
   static get urlBase (): string {
     let base = this._urlBase
 
     if (base == null) {
-      base = process.env.REACT_APP_FOOBARA_GLOBAL_URL_BASE
+      base = import.meta.env.REACT_APP_FOOBARA_GLOBAL_URL_BASE
     }
 
     if (base == null) {

data/templates/hooks/useQuery.ts

@@ -4,7 +4,7 @@ import {
   type InputsOf, type ResultOf, type ErrorOf, type RemoteCommandConstructor
 } from '../base/RemoteCommandTypes'
 import type Query from '../base/Query'
-import { useState, useRef, useEffect } from 'react'
+import { useState, useEffect } from 'react'
 import { getQuery } from '../base/QueryCache'
 
 interface QueryState<CommandT extends RemoteCommand<any, any, any>> {
@@ -43,14 +43,7 @@ export default function useQuery<CommandT extends RemoteCommand<any, any, any>>
   CommandClass: RemoteCommandConstructor<CommandT>,
   inputs: InputsOf<CommandT> | undefined = undefined
 ): QueryState<CommandT> {
-  const queryRef = useRef<Query<CommandT>>(null)
-
-  let query = queryRef.current
-
-  if (query == null) {
-    query = getQuery(CommandClass, inputs)
-    queryRef.current = query
-  }
+  const [query] = useState<Query<CommandT>>(() => getQuery(CommandClass, inputs))
 
   const [queryState, setQueryState] = useState<QueryState<CommandT>>(
     queryToQueryState<CommandT>(query)

metadata

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