foobara-typescript-remote-command-generator 1.5.0 → 1.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3665400333aa868dea13a4812bfc7cfbaf13e1475d3823eac5824566b4e4bb2b
-  data.tar.gz: 764d0161640c99f2b5bfbe8f92f985455509c4a211e15703eb0bbfe1d38b043e
+  metadata.gz: 3ea5e21e87c906d2b3605a56ef2a49245d7eb47266909cd6763c3272872e3ce3
+  data.tar.gz: 02fb6e36dce4acd76a517f42c6950617a80350bd570708321877daf7d523005e
 SHA512:
-  metadata.gz: aa6643f0ff7c9661cc37f9294b50fbe28d52de56b8c2a34e4b549f085d026e76c3f38a84b42ee9004e1d911b7c7f302961999a819e3e796905330fa046f247e1
-  data.tar.gz: 70ec01c2a3664fcd68a973baa7b2ae5c9e5a519b0aac8067aade428307911bf035e388f84b249f4ac66486f5dc8867c2f1bb34f935e3ff8a04eed88fe815fcbf
+  metadata.gz: c73ce6914c21030225dc6b29a27c49e9e0828e6dcb4c6e0ff96c66c63a50b989480dd66bbb67d5f982c84934057cd5ee6024893a1cf36125f82a3aa9f997f7eb
+  data.tar.gz: 75a7d0058162533cce17ec2a3b8693bbd19c2f9f30f7cb43dbd960dfdf19aa5c6cb83dceb15c6e5882c80e9a7adc4ff995cc5233a2e79ea69c31402d2c156a69

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## [1.5.1] - 2026-08-22
+
+- Allow setting the env expression to either import.meta.env or process.env with --env-expression
+
 ## [1.5.0] - 2026-08-06
 
 - Only generate RequiresAuthCommand when its imports will exist

data/src/generate_typescript.rb

@@ -1,6 +1,8 @@
 require "net/http"
 require "uri"
 
+require_relative "remote_generator"
+
 module Foobara
   module RemoteGenerator
     class GenerateTypescript < Foobara::Generators::Generate
@@ -16,10 +18,11 @@ module Foobara
                         default: false,
                         description: "Never generate Foobara::Auth's RequiresAuthCommand, even if the " \
                                      "manifest contains that domain. For apps that import it from elsewhere."
+        env_expression :env_expression, default: "import.meta.env"
       end
 
       def execute
-        RemoteGenerator.no_foobara_auth(no_foobara_auth) do
+        apply_remote_generator_config do
           load_manifest_if_needed
 
           include_non_templated_files
@@ -36,6 +39,16 @@ module Foobara
         paths_to_source_code
       end
 
+      def apply_remote_generator_config
+        RemoteGenerator.no_foobara_auth(no_foobara_auth) do
+          RemoteGenerator.auto_dirty_queries(auto_dirty_queries) do
+            RemoteGenerator.with_env_expression(env_expression) do
+              yield
+            end
+          end
+        end
+      end
+
       def validate
         if raw_manifest.nil? && manifest_url.nil?
           # simplecov:disable
@@ -83,12 +96,6 @@ module Foobara
         end
       end
 
-      def generate_element
-        RemoteGenerator.auto_dirty_queries(auto_dirty_queries) do
-          super
-        end
-      end
-
       def add_root_manifest_to_set_of_elements_to_generate
         elements_to_generate << manifest
       end

data/src/generators/typescript_from_manifest_base_generator.rb

@@ -454,6 +454,8 @@ module Foobara
         def auto_dirty_queries?
           RemoteGenerator.auto_dirty_queries?
         end
+
+        def env_expression = RemoteGenerator.env_expression
       end
     end
   end

data/src/remote_generator.rb

@@ -2,6 +2,8 @@ module Foobara
   module RemoteGenerator
     foobara_domain!
 
+    foobara_register_type(:env_expression, :string, one_of: ["import.meta.env", "process.env"])
+
     class << self
       def auto_dirty_queries(auto_dirty_queries)
         if auto_dirty_queries == @auto_dirty_queries
@@ -35,6 +37,19 @@ module Foobara
       def no_foobara_auth?
         @no_foobara_auth
       end
+
+      def with_env_expression(env_expression)
+        old = @env_expression
+
+        begin
+          @env_expression = env_expression
+          yield
+        ensure
+          @env_expression = old
+        end
+      end
+
+      attr_reader :env_expression
     end
   end
 end

data/src/write_typescript_to_disk.rb

@@ -19,6 +19,7 @@ module Foobara
                         default: false,
                         description: "Never generate Foobara::Auth's RequiresAuthCommand, even if the " \
                                      "manifest contains that domain. For apps that import it from elsewhere."
+        env_expression :env_expression, default: "import.meta.env"
       end
 
       possible_error :missing_manifest
@@ -56,6 +57,7 @@ module Foobara
 
         inputs[:auto_dirty_queries] = auto_dirty_queries
         inputs[:no_foobara_auth] = no_foobara_auth
+        inputs[:env_expression] = env_expression
 
         self.paths_to_source_code = run_subcommand!(GenerateTypescript, inputs)
       end

data/templates/Domain/config.ts.erb

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

data/templates/Organization/config.ts.erb

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

data/templates/base/RemoteCommand.ts.erb

@@ -15,7 +15,7 @@ export default abstract class RemoteCommand<Inputs, Result, CommandError extends
     let base = this._urlBase
 
     if (base == null) {
-      base = import.meta.env.REACT_APP_FOOBARA_GLOBAL_URL_BASE
+      base = <%= env_expression %>.REACT_APP_FOOBARA_GLOBAL_URL_BASE
     }
 
     if (base == null) {

metadata

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