@shopify/cli-kit 3.45.0-pre.5 → 3.46.0-pre.0

package/assets/cli-ruby/Gemfile

@@ -17,7 +17,6 @@ group :development, :test do
   gem "rubocop-rake", require: false
   gem "iniparse", "~> 1.5"
   gem "colorize", "~> 0.8.1"
-  gem "octokit", "~> 4.0"
   gem "bundler", ">= 2.3.11"
   gem "rake", "~> 12.3", ">= 12.3.3"
   gem "minitest", "~> 5.0"

package/assets/cli-ruby/Rakefile

@@ -57,16 +57,12 @@ namespace :rdoc do
     "lib/shopify_cli/context.rb",
     "lib/shopify_cli/db.rb",
     "lib/shopify_cli/git.rb",
-    "lib/shopify_cli/heroku.rb",
-    "lib/shopify_cli/js_deps.rb",
     "lib/shopify_cli/lazy_delegator.rb",
     "lib/shopify_cli/method_object.rb",
     "lib/shopify_cli/partners_api.rb",
-    "lib/shopify_cli/process_supervision.rb",
     "lib/shopify_cli/project.rb",
     "lib/shopify_cli/result.rb",
     "lib/shopify_cli/transform_data_structure.rb",
-    "lib/shopify_cli/tunnel.rb",
   ]
 
   task all: [:markdown, :wiki, :cleanup]
@@ -105,78 +101,6 @@ end
 desc("Generate markdown documentation and update the wiki")
 task(rdoc: "rdoc:all")
 
-namespace :package do
-  require "shopify_cli/packager"
-
-  task all: [:debian, :rpm, :homebrew]
-
-  desc("Builds a Debian package of the CLI")
-  task :debian do
-    ShopifyCLI::Packager.new.build_debian
-  end
-
-  desc("Builds an RPM package of the CLI")
-  task :rpm do
-    ShopifyCLI::Packager.new.build_rpm
-  end
-
-  desc("Builds a Homebrew package of the CLI")
-  task :homebrew do
-    ShopifyCLI::Packager.new.build_homebrew
-  end
-end
-
-desc("Builds all distribution packages of the CLI")
-task(package: "package:all")
-
-namespace :changelog do
-  require "shopify_cli/changelog"
-
-  task :update do
-    ShopifyCLI::Changelog.new.update!
-  end
-end
-
-namespace :release do
-  require "shopify_cli/release"
-
-  task :prepare, [:new_version] do |_t, args|
-    new_version = args[:new_version]
-    unless new_version
-      raise <<~NO_NEW_VERSION
-        New version must be provided, e.g.:
-
-        $ GITHUB_ACCESS_TOKEN=abcdef rake "release:prepare[1.2.3]"
-
-      NO_NEW_VERSION
-    end
-    github_access_token = ENV["GITHUB_ACCESS_TOKEN"]
-    unless github_access_token
-      raise <<~NO_GITHUB_ACCESS_TOKEN
-        GitHub access token must be provided, e.g.:
-
-        $ GITHUB_ACCESS_TOKEN=abcdef rake "release:prepare[1.2.3]"
-      NO_GITHUB_ACCESS_TOKEN
-    end
-
-    ShopifyCLI::Release.new(new_version, github_access_token).prepare!
-    puts "Completed!"
-  end
-
-  task :package do
-    github_access_token = ENV["GITHUB_ACCESS_TOKEN"]
-    unless github_access_token
-      raise <<~NO_GITHUB_ACCESS_TOKEN
-        GitHub access token must be provided, e.g.:
-
-        $ GITHUB_ACCESS_TOKEN=abcdef rake release:package
-      NO_GITHUB_ACCESS_TOKEN
-    end
-    ShopifyCLI::Release.new(ShopifyCLI::VERSION, github_access_token).package!
-    puts "Completed!"
-  end
-end
-
 namespace :extensions do
   task :update do
     version = ENV.fetch("VERSION").strip

package/assets/cli-ruby/lib/project_types/extension/cli.rb

@@ -19,90 +19,27 @@ module Extension
   class Command < ShopifyCLI::Command::ProjectCommand
     autoload :ExtensionCommand, Project.project_filepath("commands/extension_command")
 
-    subcommand :Create, "create", Project.project_filepath("commands/create")
-    subcommand :Register, "register", Project.project_filepath("commands/register")
-    subcommand :Info, "info", Project.project_filepath("commands/info")
-    subcommand :Connect, "connect", Project.project_filepath("commands/connect")
-    subcommand :Build, "build", Project.project_filepath("commands/build")
     subcommand :Serve, "serve", Project.project_filepath("commands/serve")
-    subcommand :Push, "push", Project.project_filepath("commands/push")
-    subcommand :Tunnel, "tunnel", Project.project_filepath("commands/tunnel")
-    subcommand :Check, "check", Project.project_filepath("commands/check")
   end
   ShopifyCLI::Commands.register("Extension::Command", "extension")
 
   module Tasks
-    autoload :UserErrors, Project.project_filepath("tasks/user_errors")
-    autoload :GetApps, Project.project_filepath("tasks/get_apps")
-    autoload :GetApp, Project.project_filepath("tasks/get_app")
-    autoload :CreateExtension, Project.project_filepath("tasks/create_extension")
-    autoload :UpdateDraft, Project.project_filepath("tasks/update_draft")
-    autoload :FetchSpecifications, Project.project_filepath("tasks/fetch_specifications")
     autoload :ConfigureFeatures, Project.project_filepath("tasks/configure_features")
     autoload :ConfigureOptions, Project.project_filepath("tasks/configure_options")
-    autoload :ChooseNextAvailablePort, Project.project_filepath("tasks/choose_next_available_port")
-    autoload :FindNpmPackages, Project.project_filepath("tasks/find_npm_packages")
-    autoload :GetExtensions, Project.project_filepath("tasks/get_extensions")
-    autoload :GetProduct, Project.project_filepath("tasks/get_product")
-    autoload :MergeServerConfig, Project.project_filepath("tasks/merge_server_config")
-    autoload :FindPackageFromJson, Project.project_filepath("tasks/find_package_from_json.rb")
-    autoload :EnsureResourceUrl, Project.project_filepath("tasks/ensure_resource_url.rb")
-    autoload :ConvertServerConfig, Project.project_filepath("tasks/convert_server_config")
+    autoload :FetchSpecifications, Project.project_filepath("tasks/fetch_specifications")
 
     module Converters
-      autoload :RegistrationConverter, Project.project_filepath("tasks/converters/registration_converter")
       autoload :VersionConverter, Project.project_filepath("tasks/converters/version_converter")
       autoload :ValidationErrorConverter, Project.project_filepath("tasks/converters/validation_error_converter")
-      autoload :AppConverter, Project.project_filepath("tasks/converters/app_converter")
-      autoload :ProductConverter, Project.project_filepath("tasks/converters/product_converter")
-      autoload :ExecuteCommands, Project.project_filepath("cli/execute_commands")
-    end
-
-    module ExecuteCommands
-      autoload :Base, Project.project_filepath("tasks/execute_commands/base")
-      autoload :Build, Project.project_filepath("tasks/execute_commands/build")
-      autoload :Create, Project.project_filepath("tasks/execute_commands/create")
-      autoload :Serve, Project.project_filepath("tasks/execute_commands/serve")
-      autoload :OutdatedExtensionDetection,
-        Project.project_filepath("tasks/execute_commands/outdated_extension_detection")
-
-      class << self
-        def build(*args)
-          Build.new(*args).call
-        end
-
-        def create(*args)
-          Create.new(*args).call
-        end
-
-        def serve(*args)
-          Serve.new(*args).call
-        end
-      end
-    end
-  end
-
-  module Forms
-    module Questions
-      autoload :AskApp, Project.project_filepath("forms/questions/ask_app")
-      autoload :AskName, Project.project_filepath("forms/questions/ask_name")
-      autoload :AskTemplate, Project.project_filepath("forms/questions/ask_template")
-      autoload :AskType, Project.project_filepath("forms/questions/ask_type")
-      autoload :AskRegistration, Project.project_filepath("forms/questions/ask_registration")
     end
-
-    autoload :Create, Project.project_filepath("forms/create")
-    autoload :Register, Project.project_filepath("forms/register")
-    autoload :Connect, Project.project_filepath("forms/connect")
   end
 
   module Features
     module Runtimes
-      autoload :Admin, Project.project_filepath("features/runtimes/admin")
       autoload :Base, Project.project_filepath("features/runtimes/base")
-      autoload :CheckoutPostPurchase, Project.project_filepath("features/runtimes/checkout_post_purchase")
       autoload :CheckoutUiExtension, Project.project_filepath("features/runtimes/checkout_ui_extension")
     end
+
     autoload :ArgoServe, Project.project_filepath("features/argo_serve")
     autoload :ArgoServeOptions, Project.project_filepath("features/argo_serve_options")
     autoload :ArgoSetup, Project.project_filepath("features/argo_setup")
@@ -119,30 +56,12 @@ module Extension
       autoload :Default, Project.project_filepath("models/specification_handlers/default")
     end
 
-    module ServerConfig
-      autoload :Base, Project.project_filepath("models/server_config/base")
-      autoload :App, Project.project_filepath("models/server_config/app")
-      autoload :Capabilities, Project.project_filepath("models/server_config/capabilities")
-      autoload :Development, Project.project_filepath("models/server_config/development")
-      autoload :DevelopmentEntries, Project.project_filepath("models/server_config/development_entries")
-      autoload :DevelopmentRenderer, Project.project_filepath("models/server_config/development_renderer")
-      autoload :DevelopmentResource, Project.project_filepath("models/server_config/development_resource")
-      autoload :Extension, Project.project_filepath("models/server_config/extension")
-      autoload :Root, Project.project_filepath("models/server_config/root")
-      autoload :User, Project.project_filepath("models/server_config/user")
-    end
-
     autoload :App, Project.project_filepath("models/app")
-    autoload :Registration, Project.project_filepath("models/registration")
-    autoload :Version, Project.project_filepath("models/version")
-    autoload :ValidationError, Project.project_filepath("models/validation_error")
+    autoload :LazySpecificationHandler, Project.project_filepath("models/lazy_specification_handler")
     autoload :Specification, Project.project_filepath("models/specification")
     autoload :Specifications, Project.project_filepath("models/specifications")
-    autoload :LazySpecificationHandler, Project.project_filepath("models/lazy_specification_handler")
-    autoload :NpmPackage, Project.project_filepath("models/npm_package")
-    autoload :Product, Project.project_filepath("models/product")
-    autoload :DevelopmentServer, Project.project_filepath("models/development_server")
-    autoload :DevelopmentServerRequirements, Project.project_filepath("models/development_server_requirements")
+    autoload :ValidationError, Project.project_filepath("models/validation_error")
+    autoload :Version, Project.project_filepath("models/version")
   end
 
   autoload :ExtensionProjectKeys, Project.project_filepath("extension_project_keys")

package/assets/cli-ruby/lib/shopify_cli/admin_api.rb

@@ -6,9 +6,6 @@ module ShopifyCLI
   # these concerns are taken care of.
   #
   class AdminAPI < API
-    autoload :PopulateResourceCommand, "shopify_cli/admin_api/populate_resource_command"
-    autoload :Schema, "shopify_cli/admin_api/schema"
-
     class << self
       ##
       # issues a graphql query or mutation to the Shopify Admin API. It loads a graphql

package/assets/cli-ruby/lib/shopify_cli/api.rb

@@ -55,7 +55,6 @@ module ShopifyCLI
         # we delay this require so as to avoid a performance hit on starting the CLI
         require "shopify_cli/http_request"
         headers = default_headers.merge(headers)
-        ctx.debug("#{method} #{uri} with X-Request-Id: #{headers["X-Request-Id"]}")
         response = if method == "POST"
           HttpRequest.post(uri, body, headers)
         elsif method == "PUT"
@@ -65,6 +64,7 @@ module ShopifyCLI
         elsif method == "DELETE"
           HttpRequest.delete(uri, body, headers)
         end
+        ctx.debug("#{method} #{uri} with request_id: #{response["x-request-id"]}")
         case response.code.to_i
         when 200..399
           [response.code.to_i, JSON.parse(response.body), response]
@@ -84,7 +84,7 @@ module ShopifyCLI
           raise APIRequestUnexpectedError.new("#{response.code}\n#{response.body}", response: response)
         end
       rescue Errno::ETIMEDOUT, Timeout::Error
-        ctx.debug("timeout in #{method} #{uri} with X-Request-Id: #{headers["X-Request-Id"]}")
+        ctx.debug("timeout in #{method} #{uri}")
         raise APIRequestTimeoutError, "Timeout"
       end.retry_after(APIRequestRetriableError, retries: 3) do |e|
         sleep(1) if e.is_a?(APIRequestThrottledError)
@@ -117,7 +117,6 @@ module ShopifyCLI
         "User-Agent" => user_agent,
         "Sec-CH-UA" => sec_ch_ua,
         "Sec-CH-UA-PLATFORM" => ctx.os.to_s,
-        "X-Request-Id" => SecureRandom.uuid,
       }.tap do |headers|
         headers["X-Shopify-Cli-Employee"] = "1" if Shopifolk.acting_as_shopify_organization?
       end.merge(auth_headers(token))

package/assets/cli-ruby/lib/shopify_cli/command/sub_command.rb

@@ -5,10 +5,9 @@ module ShopifyCLI
   class Command
     class SubCommand < Command
       class << self
-        def call(args, command_name, parent_command)
+        def call(args, command_name, _parent_command)
           cmd = new(@ctx)
           args = cmd.options.parse(@_options, args || [])
-          return call_help(parent_command, command_name) if cmd.options.help
           check_ruby_version
           check_node_version
           run_prerequisites

package/assets/cli-ruby/lib/shopify_cli/command.rb

@@ -5,7 +5,6 @@ require "semantic/semantic"
 module ShopifyCLI
   class Command < CLI::Kit::BaseCommand
     autoload :SubCommand,     "shopify_cli/command/sub_command"
-    autoload :AppSubCommand,  "shopify_cli/command/app_sub_command"
     autoload :ProjectCommand, "shopify_cli/command/project_command"
 
     VersionRange = Struct.new(:from, :to, keyword_init: true)
@@ -28,7 +27,6 @@ module ShopifyCLI
         else
           cmd = new(@ctx)
           cmd.options.parse(@_options, args)
-          return call_help(command_name) if cmd.options.help
           check_ruby_version
           check_node_version
           run_prerequisites
@@ -149,11 +147,6 @@ module ShopifyCLI
         @task_registry || ShopifyCLI::Tasks::Registry
       end
 
-      def call_help(*cmds)
-        help = Commands::Help.new(@ctx)
-        help.call(cmds, nil)
-      end
-
       class PrerequisiteTask
         attr_reader :name, :args
 

package/assets/cli-ruby/lib/shopify_cli/commands.rb

@@ -17,20 +17,5 @@ module ShopifyCLI
     def self.core_command?(cmd)
       @core_commands.include?(cmd)
     end
-
-    register :Config, "config", "shopify_cli/commands/config", true
-    register :Help, "help", "shopify_cli/commands/help", true
-    register :Login, "login", "shopify_cli/commands/login", true
-    register :Logout, "logout", "shopify_cli/commands/logout", true
-    register :Populate, "populate", "shopify_cli/commands/populate", true
-    register :Reporting, "reporting", "shopify_cli/commands/reporting", true
-    register :Store, "store", "shopify_cli/commands/store", true
-    register :Switch, "switch", "shopify_cli/commands/switch", true
-    register :System, "system", "shopify_cli/commands/system", true
-    register :Version, "version", "shopify_cli/commands/version", true
-    register :Whoami, "whoami", "shopify_cli/commands/whoami", true
-    register :App, "app", "shopify_cli/commands/app", true
-
-    autoload :Connect, "shopify_cli/commands/connect"
   end
 end

package/assets/cli-ruby/lib/shopify_cli/context.rb

@@ -47,12 +47,14 @@ module ShopifyCLI
         str ? str % params : key
       end
 
-      # a wrapper around Kernel.puts to allow for easy formatting
+      # a wrapper around $stdout.puts to allow for easy formatting
       #
       # #### Parameters
       # * `text` - a string message to output
       def puts(*args)
-        Kernel.puts(CLI::UI.fmt(*args))
+        $stdout.puts(CLI::UI.fmt(*args)).tap do
+          $stdout.flush
+        end
       end
 
       # aborts the current running command and outputs an error message:

package/assets/cli-ruby/lib/shopify_cli/core.rb

@@ -2,7 +2,6 @@ module ShopifyCLI
   module Core
     autoload :EntryPoint, "shopify_cli/core/entry_point"
     autoload :Executor, "shopify_cli/core/executor"
-    autoload :HelpResolver, "shopify_cli/core/help_resolver"
     autoload :Monorail, "shopify_cli/core/monorail"
     autoload :CliVersion, "shopify_cli/core/cli_version"
   end

package/assets/cli-ruby/lib/shopify_cli/identity_auth.rb

@@ -12,7 +12,6 @@ module ShopifyCLI
   class IdentityAuth
     include SmartProperties
 
-    autoload :Servlet, "shopify_cli/identity_auth/servlet"
     autoload :EnvAuthToken, "shopify_cli/identity_auth/env_auth_token"
 
     class Error < StandardError; end

package/assets/cli-ruby/lib/shopify_cli/messages/messages.rb

@@ -485,7 +485,7 @@ module ShopifyCLI
           error: {
             timeout: "Timed out while waiting for response from Shopify",
             local_identity_not_running: "Identity needs to be running locally in order to proceed.",
-            reauthenticate: "Please login again with {{command:shopify login}}",
+            reauthenticate: "Please login again",
             invalid_destination: "The store %s doesn't exist. Please log out and try again.",
           },
 

package/assets/cli-ruby/lib/shopify_cli/theme/dev_server/proxy.rb

@@ -28,7 +28,12 @@ module ShopifyCLI
         SESSION_COOKIE_NAME = "_secure_session_id"
         SESSION_COOKIE_REGEXP = /#{SESSION_COOKIE_NAME}=(\h+)/
         SESSION_COOKIE_MAX_AGE = 60 * 60 * 23 # 1 day - leeway of 1h
-        IGNORED_ENDPOINTS = ["shopify/monorail", "mini-profiler-resources", "web-pixels-manager"]
+        IGNORED_ENDPOINTS = %w[
+          shopify/monorail
+          mini-profiler-resources
+          web-pixels-manager
+          wpm
+        ]
 
         def initialize(ctx, theme, param_builder)
           @ctx = ctx
@@ -205,7 +210,7 @@ module ShopifyCLI
         def request(method, path, headers: nil, query: [], form_data: nil, body_stream: nil)
           uri = URI.join("https://#{shop}", path)
 
-          if Environment.theme_access_password?
+          if proxy_via_theme_access_app?(path)
             headers = headers ? headers.slice("ACCEPT", "CONTENT-TYPE", "CONTENT-LENGTH", "Cookie") : {}
             headers.merge!({
               "X-Shopify-Access-Token" => Environment.admin_auth_token,
@@ -244,6 +249,14 @@ module ShopifyCLI
             .with_rack_env(env)
             .build
         end
+
+        def proxy_via_theme_access_app?(path)
+          return false unless Environment.theme_access_password?
+          return false if path == "/localization"
+          return false if path.start_with?("/cart/")
+
+          true
+        end
       end
     end
   end

package/assets/cli-ruby/lib/shopify_cli.rb

@@ -84,7 +84,7 @@ module ShopifyCLI
   autocall(:Logger)   { CLI::Kit::Logger.new(debug_log_file: ShopifyCLI.debug_log_file) }
   # ShopifyCLI::Resolver
   autocall(:Resolver) do
-    ShopifyCLI::Core::HelpResolver.new(
+    CLI::Kit::Resolver.new(
       tool_name: TOOL_NAME,
       command_registry: ShopifyCLI::Commands::Registry
     )
@@ -99,11 +99,8 @@ module ShopifyCLI
 
   autoload :AdminAPI, "shopify_cli/admin_api"
   autoload :API, "shopify_cli/api"
-  autoload :AppTypeDetector, "shopify_cli/app_type_detector"
   autoload :Command, "shopify_cli/command"
-  autoload :CommandOptions, "shopify_cli/command_options"
   autoload :Commands, "shopify_cli/commands"
-  autoload :Connect, "shopify_cli/connect"
   autoload :Constants, "shopify_cli/constants"
   autoload :Context, "shopify_cli/context"
   autoload :Core, "shopify_cli/core"
@@ -114,28 +111,22 @@ module ShopifyCLI
   autoload :Git, "shopify_cli/git"
   autoload :GitHub, "shopify_cli/github"
   autoload :Helpers, "shopify_cli/helpers"
-  autoload :Heroku, "shopify_cli/heroku"
   autoload :IdentityAuth, "shopify_cli/identity_auth"
-  autoload :JsDeps, "shopify_cli/js_deps"
   autoload :JsSystem, "shopify_cli/js_system"
   autoload :LazyDelegator, "shopify_cli/lazy_delegator"
   autoload :MethodObject, "shopify_cli/method_object"
   autoload :Options, "shopify_cli/options"
   autoload :PartnersAPI, "shopify_cli/partners_api"
-  autoload :PHPDeps, "shopify_cli/php_deps"
-  autoload :ProcessSupervision, "shopify_cli/process_supervision"
   autoload :Project, "shopify_cli/project"
   autoload :ProjectType, "shopify_cli/project_type"
   autoload :ReportingConfigurationController, "shopify_cli/reporting_configuration_controller"
   autoload :ResolveConstant, "shopify_cli/resolve_constant"
   autoload :Resources, "shopify_cli/resources"
   autoload :Result, "shopify_cli/result"
-  autoload :Services, "shopify_cli/services"
   autoload :Shopifolk, "shopify_cli/shopifolk"
   autoload :Task, "shopify_cli/task"
   autoload :Tasks, "shopify_cli/tasks"
   autoload :TransformDataStructure, "shopify_cli/transform_data_structure"
-  autoload :Tunnel, "shopify_cli/tunnel"
   autoload :Utilities, "shopify_cli/utilities"
 
   require "shopify_cli/messages/messages"

package/assets/cli-ruby/test/test_helpers.rb

@@ -8,10 +8,8 @@ module TestHelpers
   autoload :FakeFS, "test_helpers/fake_fs"
   autoload :FakeProject, "test_helpers/fake_project"
   autoload :FakeUI, "test_helpers/fake_ui"
-  autoload :Heroku, "test_helpers/heroku"
   autoload :Partners, "test_helpers/partners"
   autoload :Project, "test_helpers/project"
-  autoload :Schema, "test_helpers/schema"
   autoload :Shopifolk, "test_helpers/shopifolk"
   autoload :Singleton, "test_helpers/singleton"
   autoload :TemporaryDirectory, "test_helpers/temporary_directory"

package/dist/private/node/api/graphql.d.ts

@@ -1,10 +1,5 @@
-import { rawRequest, RequestDocument, Variables } from 'graphql-request';
-export interface GraphQLVariables {
-    [key: string]: any;
-}
-export type GraphQLResponse<T> = Awaited<ReturnType<typeof rawRequest<T>>>;
-export interface GraphQLResponseOptions<T> {
-    handleErrors?: boolean;
-    onResponse?: (response: GraphQLResponse<T>) => void;
-}
-export declare function graphqlRequest<T>(query: RequestDocument, api: string, url: string, token: string, variables?: Variables, options?: GraphQLResponseOptions<T>): Promise<T>;
+import { RequestDocument, Variables } from 'graphql-request';
+export declare function debugLogRequestInfo<T>(api: string, query: RequestDocument, variables?: Variables, headers?: {
+    [key: string]: string;
+}): void;
+export declare function errorHandler<T>(api: string): (error: unknown) => Error | unknown;

package/dist/private/node/api/graphql.js

@@ -1,20 +1,8 @@
-import { buildHeaders, httpsAgent, RequestClientError, sanitizedHeadersOutput } from './headers.js';
+import { RequestClientError, sanitizedHeadersOutput } from './headers.js';
 import { stringifyMessage, outputContent, outputToken, outputDebug } from '../../../public/node/output.js';
 import { AbortError } from '../../../public/node/error.js';
-import { debugLogResponseInfo } from '../api.js';
-import { ClientError, GraphQLClient } from 'graphql-request';
-export async function graphqlRequest(query, api, url, token, variables, options) {
-    const headers = buildHeaders(token);
-    debugLogRequestInfo(api, query, variables, headers);
-    const clientOptions = { agent: await httpsAgent(), headers };
-    const client = new GraphQLClient(url, clientOptions);
-    const response = await debugLogResponseInfo({ request: client.rawRequest(query, variables), url }, options?.handleErrors === false ? undefined : errorHandler(api));
-    if (options?.onResponse) {
-        options.onResponse(response);
-    }
-    return response.data;
-}
-function debugLogRequestInfo(api, query, variables, headers = {}) {
+import { ClientError } from 'graphql-request';
+export function debugLogRequestInfo(api, query, variables, headers = {}) {
     outputDebug(outputContent `Sending ${outputToken.json(api)} GraphQL request:
   ${outputToken.raw(query.toString().trim())}
 ${variables ? `\nWith variables:\n${JSON.stringify(variables, null, 2)}\n` : ''}
@@ -22,7 +10,7 @@ With request headers:
 ${sanitizedHeadersOutput(headers)}
 `);
 }
-function errorHandler(api) {
+export function errorHandler(api) {
     return (error) => {
         if (error instanceof ClientError) {
             const errorMessage = stringifyMessage(outputContent `

package/dist/private/node/api/graphql.js.map

@@ -1 +1 @@
-{"version":3,"file":"graphql.js","sourceRoot":"","sources":["../../../../src/private/node/api/graphql.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,YAAY,EAAE,UAAU,EAAE,kBAAkB,EAAE,sBAAsB,EAAC,MAAM,cAAc,CAAA;AACjG,OAAO,EAAC,gBAAgB,EAAE,aAAa,EAAE,WAAW,EAAE,WAAW,EAAC,MAAM,gCAAgC,CAAA;AACxG,OAAO,EAAC,UAAU,EAAC,MAAM,+BAA+B,CAAA;AACxD,OAAO,EAAC,oBAAoB,EAAC,MAAM,WAAW,CAAA;AAC9C,OAAO,EAAC,WAAW,EAAE,aAAa,EAAyC,MAAM,iBAAiB,CAAA;AAclG,MAAM,CAAC,KAAK,UAAU,cAAc,CAClC,KAAsB,EACtB,GAAW,EACX,GAAW,EACX,KAAa,EACb,SAAqB,EACrB,OAAmC;IAEnC,MAAM,OAAO,GAAG,YAAY,CAAC,KAAK,CAAC,CAAA;IACnC,mBAAmB,CAAC,GAAG,EAAE,KAAK,EAAE,SAAS,EAAE,OAAO,CAAC,CAAA;IACnD,MAAM,aAAa,GAAG,EAAC,KAAK,EAAE,MAAM,UAAU,EAAE,EAAE,OAAO,EAAC,CAAA;IAC1D,MAAM,MAAM,GAAG,IAAI,aAAa,CAAC,GAAG,EAAE,aAAa,CAAC,CAAA;IACpD,MAAM,QAAQ,GAAG,MAAM,oBAAoB,CACzC,EAAC,OAAO,EAAE,MAAM,CAAC,UAAU,CAAI,KAAe,EAAE,SAAS,CAAC,EAAE,GAAG,EAAC,EAChE,OAAO,EAAE,YAAY,KAAK,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,YAAY,CAAC,GAAG,CAAC,CAChE,CAAA;IAED,IAAI,OAAO,EAAE,UAAU,EAAE;QACvB,OAAO,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAA;KAC7B;IAED,OAAO,QAAQ,CAAC,IAAI,CAAA;AACtB,CAAC;AAED,SAAS,mBAAmB,CAC1B,GAAW,EACX,KAAsB,EACtB,SAAqB,EACrB,UAAmC,EAAE;IAErC,WAAW,CAAC,aAAa,CAAA,WAAW,WAAW,CAAC,IAAI,CAAC,GAAG,CAAC;IACvD,WAAW,CAAC,GAAG,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC,IAAI,EAAE,CAAC;EAC1C,SAAS,CAAC,CAAC,CAAC,sBAAsB,IAAI,CAAC,SAAS,CAAC,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE;;EAE7E,sBAAsB,CAAC,OAAO,CAAC;CAChC,CAAC,CAAA;AACF,CAAC;AAED,SAAS,YAAY,CAAI,GAAW;IAClC,OAAO,CAAC,KAAc,EAAE,EAAE;QACxB,IAAI,KAAK,YAAY,WAAW,EAAE;YAChC,MAAM,YAAY,GAAG,gBAAgB,CAAC,aAAa,CAAA;QACjD,WAAW,CAAC,GAAG,CACnB,GAAG,CACJ,8DAA8D,GAAG,KAAK,CAAC,QAAQ,CAAC,MAAM,EAAE;;IAEvF,WAAW,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,MAAM,CAAC;OACpC,CAAC,CAAA;YACF,IAAI,WAAkB,CAAA;YACtB,IAAI,KAAK,CAAC,QAAQ,CAAC,MAAM,GAAG,GAAG,EAAE;gBAC/B,WAAW,GAAG,IAAI,kBAAkB,CAAC,YAAY,EAAE,KAAK,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAA;aAC1E;iBAAM;gBACL,WAAW,GAAG,IAAI,UAAU,CAAC,YAAY,CAAC,CAAA;aAC3C;YACD,WAAW,CAAC,KAAK,GAAG,KAAK,CAAC,KAAK,CAAA;YAC/B,OAAO,WAAW,CAAA;SACnB;aAAM;YACL,OAAO,KAAK,CAAA;SACb;IACH,CAAC,CAAA;AACH,CAAC","sourcesContent":["import {buildHeaders, httpsAgent, RequestClientError, sanitizedHeadersOutput} from './headers.js'\nimport {stringifyMessage, outputContent, outputToken, outputDebug} from '../../../public/node/output.js'\nimport {AbortError} from '../../../public/node/error.js'\nimport {debugLogResponseInfo} from '../api.js'\nimport {ClientError, GraphQLClient, rawRequest, RequestDocument, Variables} from 'graphql-request'\n\nexport interface GraphQLVariables {\n  // eslint-disable-next-line @typescript-eslint/no-explicit-any\n  [key: string]: any\n}\n\nexport type GraphQLResponse<T> = Awaited<ReturnType<typeof rawRequest<T>>>\n\nexport interface GraphQLResponseOptions<T> {\n  handleErrors?: boolean\n  onResponse?: (response: GraphQLResponse<T>) => void\n}\n\nexport async function graphqlRequest<T>(\n  query: RequestDocument,\n  api: string,\n  url: string,\n  token: string,\n  variables?: Variables,\n  options?: GraphQLResponseOptions<T>,\n): Promise<T> {\n  const headers = buildHeaders(token)\n  debugLogRequestInfo(api, query, variables, headers)\n  const clientOptions = {agent: await httpsAgent(), headers}\n  const client = new GraphQLClient(url, clientOptions)\n  const response = await debugLogResponseInfo(\n    {request: client.rawRequest<T>(query as string, variables), url},\n    options?.handleErrors === false ? undefined : errorHandler(api),\n  )\n\n  if (options?.onResponse) {\n    options.onResponse(response)\n  }\n\n  return response.data\n}\n\nfunction debugLogRequestInfo<T>(\n  api: string,\n  query: RequestDocument,\n  variables?: Variables,\n  headers: {[key: string]: string} = {},\n) {\n  outputDebug(outputContent`Sending ${outputToken.json(api)} GraphQL request:\n  ${outputToken.raw(query.toString().trim())}\n${variables ? `\\nWith variables:\\n${JSON.stringify(variables, null, 2)}\\n` : ''}\nWith request headers:\n${sanitizedHeadersOutput(headers)}\n`)\n}\n\nfunction errorHandler<T>(api: string): (error: unknown) => Error | unknown {\n  return (error: unknown) => {\n    if (error instanceof ClientError) {\n      const errorMessage = stringifyMessage(outputContent`\n  The ${outputToken.raw(\n    api,\n  )} GraphQL API responded unsuccessfully with the HTTP status ${`${error.response.status}`} and errors:\n\n  ${outputToken.json(error.response.errors)}\n      `)\n      let mappedError: Error\n      if (error.response.status < 500) {\n        mappedError = new RequestClientError(errorMessage, error.response.status)\n      } else {\n        mappedError = new AbortError(errorMessage)\n      }\n      mappedError.stack = error.stack\n      return mappedError\n    } else {\n      return error\n    }\n  }\n}\n"]}
+{"version":3,"file":"graphql.js","sourceRoot":"","sources":["../../../../src/private/node/api/graphql.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,kBAAkB,EAAE,sBAAsB,EAAC,MAAM,cAAc,CAAA;AACvE,OAAO,EAAC,gBAAgB,EAAE,aAAa,EAAE,WAAW,EAAE,WAAW,EAAC,MAAM,gCAAgC,CAAA;AACxG,OAAO,EAAC,UAAU,EAAC,MAAM,+BAA+B,CAAA;AACxD,OAAO,EAAC,WAAW,EAA6B,MAAM,iBAAiB,CAAA;AAEvE,MAAM,UAAU,mBAAmB,CACjC,GAAW,EACX,KAAsB,EACtB,SAAqB,EACrB,UAAmC,EAAE;IAErC,WAAW,CAAC,aAAa,CAAA,WAAW,WAAW,CAAC,IAAI,CAAC,GAAG,CAAC;IACvD,WAAW,CAAC,GAAG,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC,IAAI,EAAE,CAAC;EAC1C,SAAS,CAAC,CAAC,CAAC,sBAAsB,IAAI,CAAC,SAAS,CAAC,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE;;EAE7E,sBAAsB,CAAC,OAAO,CAAC;CAChC,CAAC,CAAA;AACF,CAAC;AAED,MAAM,UAAU,YAAY,CAAI,GAAW;IACzC,OAAO,CAAC,KAAc,EAAE,EAAE;QACxB,IAAI,KAAK,YAAY,WAAW,EAAE;YAChC,MAAM,YAAY,GAAG,gBAAgB,CAAC,aAAa,CAAA;QACjD,WAAW,CAAC,GAAG,CACnB,GAAG,CACJ,8DAA8D,GAAG,KAAK,CAAC,QAAQ,CAAC,MAAM,EAAE;;IAEvF,WAAW,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,MAAM,CAAC;OACpC,CAAC,CAAA;YACF,IAAI,WAAkB,CAAA;YACtB,IAAI,KAAK,CAAC,QAAQ,CAAC,MAAM,GAAG,GAAG,EAAE;gBAC/B,WAAW,GAAG,IAAI,kBAAkB,CAAC,YAAY,EAAE,KAAK,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAA;aAC1E;iBAAM;gBACL,WAAW,GAAG,IAAI,UAAU,CAAC,YAAY,CAAC,CAAA;aAC3C;YACD,WAAW,CAAC,KAAK,GAAG,KAAK,CAAC,KAAK,CAAA;YAC/B,OAAO,WAAW,CAAA;SACnB;aAAM;YACL,OAAO,KAAK,CAAA;SACb;IACH,CAAC,CAAA;AACH,CAAC","sourcesContent":["import {RequestClientError, sanitizedHeadersOutput} from './headers.js'\nimport {stringifyMessage, outputContent, outputToken, outputDebug} from '../../../public/node/output.js'\nimport {AbortError} from '../../../public/node/error.js'\nimport {ClientError, RequestDocument, Variables} from 'graphql-request'\n\nexport function debugLogRequestInfo<T>(\n  api: string,\n  query: RequestDocument,\n  variables?: Variables,\n  headers: {[key: string]: string} = {},\n) {\n  outputDebug(outputContent`Sending ${outputToken.json(api)} GraphQL request:\n  ${outputToken.raw(query.toString().trim())}\n${variables ? `\\nWith variables:\\n${JSON.stringify(variables, null, 2)}\\n` : ''}\nWith request headers:\n${sanitizedHeadersOutput(headers)}\n`)\n}\n\nexport function errorHandler<T>(api: string): (error: unknown) => Error | unknown {\n  return (error: unknown) => {\n    if (error instanceof ClientError) {\n      const errorMessage = stringifyMessage(outputContent`\n  The ${outputToken.raw(\n    api,\n  )} GraphQL API responded unsuccessfully with the HTTP status ${`${error.response.status}`} and errors:\n\n  ${outputToken.json(error.response.errors)}\n      `)\n      let mappedError: Error\n      if (error.response.status < 500) {\n        mappedError = new RequestClientError(errorMessage, error.response.status)\n      } else {\n        mappedError = new AbortError(errorMessage)\n      }\n      mappedError.stack = error.stack\n      return mappedError\n    } else {\n      return error\n    }\n  }\n}\n"]}

package/dist/private/node/conf-store.d.ts

@@ -33,7 +33,8 @@ type CacheValueForKey<TKey extends keyof Cache> = NonNullable<Cache[TKey]>['valu
  * before returning it.
  * @param key - The key to use for the cache.
  * @param fn - The function to run to get the value to cache, if a cache miss occurs.
- * @param timeout - The maximum valid age of a cached value, in milliseconds. If the cached value is older than this, it will be refreshed.
+ * @param timeout - The maximum valid age of a cached value, in milliseconds.
+ * If the cached value is older than this, it will be refreshed.
  * @returns The value from the cache or the result of the function.
  */
 export declare function cacheRetrieveOrRepopulate(key: keyof Cache, fn: () => Promise<CacheValueForKey<typeof key>>, timeout?: number, config?: LocalStorage<ConfSchema>): Promise<CacheValueForKey<typeof key>>;

package/dist/private/node/conf-store.js

@@ -42,13 +42,14 @@ export function removeSession(config = cliKitStore()) {
  * before returning it.
  * @param key - The key to use for the cache.
  * @param fn - The function to run to get the value to cache, if a cache miss occurs.
- * @param timeout - The maximum valid age of a cached value, in milliseconds. If the cached value is older than this, it will be refreshed.
+ * @param timeout - The maximum valid age of a cached value, in milliseconds.
+ * If the cached value is older than this, it will be refreshed.
  * @returns The value from the cache or the result of the function.
  */
 export async function cacheRetrieveOrRepopulate(key, fn, timeout, config = cliKitStore()) {
     const cache = config.get('cache') || {};
     const cached = cache[key];
-    if (cached && (timeout === undefined || Date.now() - cached.timestamp < timeout)) {
+    if (cached?.value !== undefined && (timeout === undefined || Date.now() - cached.timestamp < timeout)) {
         return cached.value;
     }
     const value = await fn();

package/dist/private/node/conf-store.js.map

@@ -1 +1 @@
-{"version":3,"file":"conf-store.js","sourceRoot":"","sources":["../../../src/private/node/conf-store.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,YAAY,EAAC,MAAM,oCAAoC,CAAA;AAC/D,OAAO,EAAC,aAAa,EAAE,WAAW,EAAC,MAAM,8BAA8B,CAAA;AAkBvE,IAAI,SAA+C,CAAA;AAEnD;;;;GAIG;AACH,SAAS,WAAW;IAClB,IAAI,CAAC,SAAS,EAAE;QACd,SAAS,GAAG,IAAI,YAAY,CAAa,EAAC,WAAW,EAAE,iBAAiB,EAAC,CAAC,CAAA;KAC3E;IACD,OAAO,SAAS,CAAA;AAClB,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,UAAU,CAAC,SAAmC,WAAW,EAAE;IACzE,WAAW,CAAC,aAAa,CAAA,0BAA0B,CAAC,CAAA;IACpD,OAAO,MAAM,CAAC,GAAG,CAAC,cAAc,CAAC,CAAA;AACnC,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,UAAU,CAAC,OAAe,EAAE,SAAmC,WAAW,EAAE;IAC1F,WAAW,CAAC,aAAa,CAAA,0BAA0B,CAAC,CAAA;IACpD,MAAM,CAAC,GAAG,CAAC,cAAc,EAAE,OAAO,CAAC,CAAA;AACrC,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,aAAa,CAAC,SAAmC,WAAW,EAAE;IAC5E,WAAW,CAAC,aAAa,CAAA,2BAA2B,CAAC,CAAA;IACrD,MAAM,CAAC,MAAM,CAAC,cAAc,CAAC,CAAA;AAC/B,CAAC;AAGD;;;;;;;GAOG;AACH,MAAM,CAAC,KAAK,UAAU,yBAAyB,CAC7C,GAAgB,EAChB,EAA+C,EAC/C,OAAgB,EAChB,MAAM,GAAG,WAAW,EAAE;IAEtB,MAAM,KAAK,GAAU,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,EAAE,CAAA;IAC9C,MAAM,MAAM,GAAG,KAAK,CAAC,GAAG,CAAC,CAAA;IAEzB,IAAI,MAAM,IAAI,CAAC,OAAO,KAAK,SAAS,IAAI,IAAI,CAAC,GAAG,EAAE,GAAG,MAAM,CAAC,SAAS,GAAG,OAAO,CAAC,EAAE;QAChF,OAAO,MAAM,CAAC,KAAK,CAAA;KACpB;IAED,MAAM,KAAK,GAAG,MAAM,EAAE,EAAE,CAAA;IACxB,KAAK,CAAC,GAAG,CAAC,GAAG,EAAC,KAAK,EAAE,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE,EAAC,CAAA;IAC3C,MAAM,CAAC,GAAG,CAAC,OAAO,EAAE,KAAK,CAAC,CAAA;IAC1B,OAAO,KAAK,CAAA;AACd,CAAC","sourcesContent":["import {LocalStorage} from '../../public/node/local-storage.js'\nimport {outputContent, outputDebug} from '@shopify/cli-kit/node/output'\n\ninterface CacheValue<T> {\n  value: T\n  timestamp: number\n}\n\nexport type IntrospectionUrlKey = `identity-introspection-url-${string}`\n\ninterface Cache {\n  [introspectionUrlKey: IntrospectionUrlKey]: CacheValue<string>\n}\n\nexport interface ConfSchema {\n  sessionStore: string\n  cache?: Cache\n}\n\nlet _instance: LocalStorage<ConfSchema> | undefined\n\n/**\n * CLIKIT Store.\n *\n * @returns CLIKitStore.\n */\nfunction cliKitStore() {\n  if (!_instance) {\n    _instance = new LocalStorage<ConfSchema>({projectName: 'shopify-cli-kit'})\n  }\n  return _instance\n}\n\n/**\n * Get session.\n *\n * @returns Session.\n */\nexport function getSession(config: LocalStorage<ConfSchema> = cliKitStore()): string | undefined {\n  outputDebug(outputContent`Getting session store...`)\n  return config.get('sessionStore')\n}\n\n/**\n * Set session.\n *\n * @param session - Session.\n */\nexport function setSession(session: string, config: LocalStorage<ConfSchema> = cliKitStore()): void {\n  outputDebug(outputContent`Setting session store...`)\n  config.set('sessionStore', session)\n}\n\n/**\n * Remove session.\n */\nexport function removeSession(config: LocalStorage<ConfSchema> = cliKitStore()): void {\n  outputDebug(outputContent`Removing session store...`)\n  config.delete('sessionStore')\n}\n\ntype CacheValueForKey<TKey extends keyof Cache> = NonNullable<Cache[TKey]>['value']\n/**\n * Fetch from cache, or run the provided function to get the value, and cache it\n * before returning it.\n * @param key - The key to use for the cache.\n * @param fn - The function to run to get the value to cache, if a cache miss occurs.\n * @param timeout - The maximum valid age of a cached value, in milliseconds. If the cached value is older than this, it will be refreshed.\n * @returns The value from the cache or the result of the function.\n */\nexport async function cacheRetrieveOrRepopulate(\n  key: keyof Cache,\n  fn: () => Promise<CacheValueForKey<typeof key>>,\n  timeout?: number,\n  config = cliKitStore(),\n): Promise<CacheValueForKey<typeof key>> {\n  const cache: Cache = config.get('cache') || {}\n  const cached = cache[key]\n\n  if (cached && (timeout === undefined || Date.now() - cached.timestamp < timeout)) {\n    return cached.value\n  }\n\n  const value = await fn()\n  cache[key] = {value, timestamp: Date.now()}\n  config.set('cache', cache)\n  return value\n}\n"]}
+{"version":3,"file":"conf-store.js","sourceRoot":"","sources":["../../../src/private/node/conf-store.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,YAAY,EAAC,MAAM,oCAAoC,CAAA;AAC/D,OAAO,EAAC,aAAa,EAAE,WAAW,EAAC,MAAM,8BAA8B,CAAA;AAkBvE,IAAI,SAA+C,CAAA;AAEnD;;;;GAIG;AACH,SAAS,WAAW;IAClB,IAAI,CAAC,SAAS,EAAE;QACd,SAAS,GAAG,IAAI,YAAY,CAAa,EAAC,WAAW,EAAE,iBAAiB,EAAC,CAAC,CAAA;KAC3E;IACD,OAAO,SAAS,CAAA;AAClB,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,UAAU,CAAC,SAAmC,WAAW,EAAE;IACzE,WAAW,CAAC,aAAa,CAAA,0BAA0B,CAAC,CAAA;IACpD,OAAO,MAAM,CAAC,GAAG,CAAC,cAAc,CAAC,CAAA;AACnC,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,UAAU,CAAC,OAAe,EAAE,SAAmC,WAAW,EAAE;IAC1F,WAAW,CAAC,aAAa,CAAA,0BAA0B,CAAC,CAAA;IACpD,MAAM,CAAC,GAAG,CAAC,cAAc,EAAE,OAAO,CAAC,CAAA;AACrC,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,aAAa,CAAC,SAAmC,WAAW,EAAE;IAC5E,WAAW,CAAC,aAAa,CAAA,2BAA2B,CAAC,CAAA;IACrD,MAAM,CAAC,MAAM,CAAC,cAAc,CAAC,CAAA;AAC/B,CAAC;AAGD;;;;;;;;GAQG;AACH,MAAM,CAAC,KAAK,UAAU,yBAAyB,CAC7C,GAAgB,EAChB,EAA+C,EAC/C,OAAgB,EAChB,MAAM,GAAG,WAAW,EAAE;IAEtB,MAAM,KAAK,GAAU,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,EAAE,CAAA;IAC9C,MAAM,MAAM,GAAG,KAAK,CAAC,GAAG,CAAC,CAAA;IAEzB,IAAI,MAAM,EAAE,KAAK,KAAK,SAAS,IAAI,CAAC,OAAO,KAAK,SAAS,IAAI,IAAI,CAAC,GAAG,EAAE,GAAG,MAAM,CAAC,SAAS,GAAG,OAAO,CAAC,EAAE;QACrG,OAAO,MAAM,CAAC,KAAK,CAAA;KACpB;IAED,MAAM,KAAK,GAAG,MAAM,EAAE,EAAE,CAAA;IACxB,KAAK,CAAC,GAAG,CAAC,GAAG,EAAC,KAAK,EAAE,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE,EAAC,CAAA;IAC3C,MAAM,CAAC,GAAG,CAAC,OAAO,EAAE,KAAK,CAAC,CAAA;IAC1B,OAAO,KAAK,CAAA;AACd,CAAC","sourcesContent":["import {LocalStorage} from '../../public/node/local-storage.js'\nimport {outputContent, outputDebug} from '@shopify/cli-kit/node/output'\n\ninterface CacheValue<T> {\n  value: T\n  timestamp: number\n}\n\nexport type IntrospectionUrlKey = `identity-introspection-url-${string}`\n\ninterface Cache {\n  [introspectionUrlKey: IntrospectionUrlKey]: CacheValue<string>\n}\n\nexport interface ConfSchema {\n  sessionStore: string\n  cache?: Cache\n}\n\nlet _instance: LocalStorage<ConfSchema> | undefined\n\n/**\n * CLIKIT Store.\n *\n * @returns CLIKitStore.\n */\nfunction cliKitStore() {\n  if (!_instance) {\n    _instance = new LocalStorage<ConfSchema>({projectName: 'shopify-cli-kit'})\n  }\n  return _instance\n}\n\n/**\n * Get session.\n *\n * @returns Session.\n */\nexport function getSession(config: LocalStorage<ConfSchema> = cliKitStore()): string | undefined {\n  outputDebug(outputContent`Getting session store...`)\n  return config.get('sessionStore')\n}\n\n/**\n * Set session.\n *\n * @param session - Session.\n */\nexport function setSession(session: string, config: LocalStorage<ConfSchema> = cliKitStore()): void {\n  outputDebug(outputContent`Setting session store...`)\n  config.set('sessionStore', session)\n}\n\n/**\n * Remove session.\n */\nexport function removeSession(config: LocalStorage<ConfSchema> = cliKitStore()): void {\n  outputDebug(outputContent`Removing session store...`)\n  config.delete('sessionStore')\n}\n\ntype CacheValueForKey<TKey extends keyof Cache> = NonNullable<Cache[TKey]>['value']\n/**\n * Fetch from cache, or run the provided function to get the value, and cache it\n * before returning it.\n * @param key - The key to use for the cache.\n * @param fn - The function to run to get the value to cache, if a cache miss occurs.\n * @param timeout - The maximum valid age of a cached value, in milliseconds.\n * If the cached value is older than this, it will be refreshed.\n * @returns The value from the cache or the result of the function.\n */\nexport async function cacheRetrieveOrRepopulate(\n  key: keyof Cache,\n  fn: () => Promise<CacheValueForKey<typeof key>>,\n  timeout?: number,\n  config = cliKitStore(),\n): Promise<CacheValueForKey<typeof key>> {\n  const cache: Cache = config.get('cache') || {}\n  const cached = cache[key]\n\n  if (cached?.value !== undefined && (timeout === undefined || Date.now() - cached.timestamp < timeout)) {\n    return cached.value\n  }\n\n  const value = await fn()\n  cache[key] = {value, timestamp: Date.now()}\n  config.set('cache', cache)\n  return value\n}\n"]}

package/dist/private/node/session.d.ts

@@ -48,9 +48,9 @@ export interface OAuthSession {
  * This method ensures that we have a valid session to authenticate against the given applications using the provided scopes.
  *
  * @param applications - An object containing the applications we need to be authenticated with.
- * @param env - Optional environment variables to use.
+ * @param _env - Optional environment variables to use.
  * @param forceRefresh - Optional flag to force a refresh of the token.
  * @returns An instance with the access tokens organized by application.
  */
-export declare function ensureAuthenticated(applications: OAuthApplications, env?: NodeJS.ProcessEnv, forceRefresh?: boolean): Promise<OAuthSession>;
+export declare function ensureAuthenticated(applications: OAuthApplications, _env?: NodeJS.ProcessEnv, forceRefresh?: boolean): Promise<OAuthSession>;
 export {};