shopify-cli 2.7.3 → 2.7.4

data/lib/project_types/script/cli.rb

@@ -13,6 +13,7 @@ module Script
     hidden_feature(feature_set: :script_project)
     subcommand :Create, "create", Project.project_filepath("commands/create")
     subcommand :Push, "push", Project.project_filepath("commands/push")
+    subcommand :Connect, "connect", Project.project_filepath("commands/connect")
     subcommand :Javy, "javy", Project.project_filepath("commands/javy")
   end
   ShopifyCLI::Commands.register("Script::Command", "script")
@@ -24,6 +25,7 @@ module Script
     autoload :AskScriptUuid, Project.project_filepath("forms/ask_script_uuid")
     autoload :RunAgainstShopifyOrg, Project.project_filepath("forms/run_against_shopify_org")
     autoload :Create, Project.project_filepath("forms/create")
+    autoload :Connect, Project.project_filepath("forms/connect")
     autoload :ScriptForm, Project.project_filepath("forms/script_form")
   end
 

data/lib/project_types/script/commands/connect.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+module Script
+  class Command
+    class Connect < ShopifyCLI::Command::SubCommand
+      prerequisite_task :ensure_authenticated
+      prerequisite_task ensure_project_type: :script
+
+      def call(_args, _)
+        Layers::Application::ConnectApp.call(ctx: @ctx, force: true, strict: true)
+      rescue StandardError => e
+        UI::ErrorHandler.pretty_print_and_raise(e, failed_op: @ctx.message("script.connect.error.operation_failed"))
+      end
+
+      def self.help
+        ShopifyCLI::Context.new.message("connect.help", ShopifyCLI::TOOL_NAME, ShopifyCLI::TOOL_NAME)
+      end
+    end
+  end
+end

data/lib/project_types/script/layers/application/connect_app.rb

@@ -7,10 +7,11 @@ module Script
     module Application
       class ConnectApp
         class << self
-          def call(ctx:)
+          def call(ctx:, force: false, strict: false)
             script_project_repo = Layers::Infrastructure::ScriptProjectRepository.new(ctx: ctx)
             script_project = script_project_repo.get
-            return false if script_project.env_valid?
+
+            return false if script_project.env_valid? && !force
 
             if ShopifyCLI::Shopifolk.check && Forms::RunAgainstShopifyOrg.ask(ctx, nil, nil).response
               ShopifyCLI::Shopifolk.act_as_shopify_organization
@@ -37,13 +38,18 @@ module Script
             extension_point_type = script_project.extension_point_type
             scripts = script_service.get_app_scripts(extension_point_type: extension_point_type)
 
-            uuid = Forms::AskScriptUuid.ask(ctx, scripts, nil).uuid
+            uuid = Forms::AskScriptUuid.ask(ctx, scripts, nil)&.uuid
+
+            if strict && uuid.nil?
+              ctx.abort(ctx.message("script.connect.missing_script"))
+            end
 
             script_project_repo.create_env(
               api_key: app["apiKey"],
               secret: app["apiSecretKeys"].first["secret"],
               uuid: uuid
             )
+            ctx.done(ctx.message("script.connect.connected", app["title"]))
 
             true
           end

data/lib/project_types/script/layers/application/create_script.rb

@@ -8,11 +8,14 @@ module Script
       class CreateScript
         class << self
           def call(ctx:, language:, sparse_checkout_branch:, script_name:, extension_point_type:)
-            raise Infrastructure::Errors::ScriptProjectAlreadyExistsError, script_name if ctx.dir_exist?(script_name)
+            script_project_repo = Infrastructure::ScriptProjectRepository.new(
+              ctx: ctx,
+              directory: script_name,
+              initial_directory: ctx.root
+            )
 
-            in_new_directory_context(ctx, script_name) do
+            in_new_directory_context(script_project_repo) do
               extension_point = ExtensionPoints.get(type: extension_point_type)
-              script_project_repo = Infrastructure::ScriptProjectRepository.new(ctx: ctx)
               project = script_project_repo.create(
                 script_name: script_name,
                 extension_point_type: extension_point_type,
@@ -62,19 +65,16 @@ module Script
             ProjectDependencies.install(ctx: ctx, task_runner: task_runner)
           end
 
-          def in_new_directory_context(ctx, directory)
-            initial_directory = ctx.root
-            begin
-              ctx.mkdir_p(directory)
-              ctx.chdir(directory)
-              yield
-            rescue
-              ctx.chdir(initial_directory)
-              ctx.rm_r(directory)
-              raise
-            ensure
-              ctx.chdir(initial_directory)
-            end
+          def in_new_directory_context(script_project_repo)
+            script_project_repo.create_project_directory
+            yield
+          rescue Infrastructure::Errors::ScriptProjectAlreadyExistsError
+            raise
+          rescue
+            script_project_repo.delete_project_directory
+            raise
+          ensure
+            script_project_repo.change_to_initial_directory
           end
         end
       end

data/lib/project_types/script/layers/infrastructure/script_project_repository.rb

@@ -6,9 +6,26 @@ module Script
       class ScriptProjectRepository
         include SmartProperties
         property! :ctx, accepts: ShopifyCLI::Context
+        property :directory, accepts: String
+        property :initial_directory, accepts: String
 
         MUTABLE_ENV_VALUES = %i(uuid)
 
+        def create_project_directory
+          raise Infrastructure::Errors::ScriptProjectAlreadyExistsError, directory if ctx.dir_exist?(directory)
+          ctx.mkdir_p(directory)
+          change_directory(directory: directory)
+        end
+
+        def delete_project_directory
+          change_to_initial_directory
+          ctx.rm_r(directory)
+        end
+
+        def change_to_initial_directory
+          change_directory(directory: initial_directory)
+        end
+
         def create(script_name:, extension_point_type:, language:)
           validate_metadata!(extension_point_type, language)
 
@@ -95,6 +112,10 @@ module Script
 
         private
 
+        def change_directory(directory:)
+          ctx.chdir(directory)
+        end
+
         def capture_io(&block)
           CLI::UI::StdoutRouter::Capture.new(&block).run
         end

data/lib/project_types/script/messages/messages.rb

@@ -144,6 +144,7 @@ module Script
 
           language_library_for_api_not_found_cause: "Script can’t be pushed because the %{language} library for API %{api} is missing.",
           language_library_for_api_not_found_help: "Make sure extension_point.yml contains the correct API library.",
+          no_scripts_found_in_app: "The selected apps have no scripts. Please, create them first on the partners' dashboard.",
         },
 
         create: {
@@ -179,7 +180,17 @@ module Script
 
           script_pushed: "{{v}} Script pushed to app (API key: %{api_key}).",
         },
-
+        connect: {
+          connected: "Connected! Your project is now connected to {{green:%s}}",
+          missing_script: "No script has been selected.",
+          help: <<~HELP,
+            {{command:%s script connect}}: Connects an existing script to an app.
+              Usage: {{command:%s script connect}}
+          HELP
+          error: {
+            operation_failed: "Couldn't connect script to app.",
+          },
+        },
         javy: {
           help: <<~HELP,
             Compile the JavaScript code into WebAssembly.

data/lib/project_types/theme/commands/push.rb

@@ -51,7 +51,9 @@ module Theme
         end
 
         if theme.live? && !options.flags[:allow_live]
-          return unless CLI::UI::Prompt.confirm(@ctx.message("theme.push.live"))
+          question = @ctx.message("theme.push.live")
+          question += @ctx.message("theme.push.theme", theme.name, theme.id) if options.flags[:live]
+          return unless CLI::UI::Prompt.confirm(question)
         end
 
         ignore_filter = ShopifyCLI::Theme::IgnoreFilter.from_path(root)

data/lib/project_types/theme/messages/messages.rb

@@ -74,6 +74,7 @@ module Theme
           push: "Pushing theme files to Shopify",
           select: "Select theme to push to",
           live: "Are you sure you want to push to your live theme?",
+          theme: "\n  Theme: {{blue:%s #%s}} {{green:[live]}}",
           theme_not_found: "Theme #%s doesn't exist",
           done: <<~DONE,
             {{green:Your theme was pushed successfully}}

data/lib/shopify_cli/command.rb

@@ -29,6 +29,12 @@ module ShopifyCLI
           run_prerequisites
           cmd.call(args, command_name)
         end
+      rescue OptionParser::InvalidOption => error
+        arg = error.args.first
+        raise ShopifyCLI::Abort, @ctx.message("core.errors.option_parser.invalid_option", arg)
+      rescue OptionParser::MissingArgument => error
+        arg = error.args.first
+        raise ShopifyCLI::Abort, @ctx.message("core.errors.option_parser.missing_argument", arg)
       end
 
       def options(&block)

data/lib/shopify_cli/constants.rb

@@ -61,5 +61,9 @@ module ShopifyCLI
     module Links
       NEW_ISSUE = "https://github.com/Shopify/shopify-cli/issues/new"
     end
+
+    module Extension
+      DEFAULT_PORT = 39351
+    end
   end
 end

data/lib/shopify_cli/context.rb

@@ -90,7 +90,7 @@ module ShopifyCLI
 
     # will return true if being launched from a tty
     def tty?
-      $stdin.tty? && !testing?
+      !testing? && $stdin.tty?
     end
 
     # will return true if the cli is being run from an installation, and not a

data/lib/shopify_cli/form.rb

@@ -15,6 +15,8 @@ module ShopifyCLI
         rescue ShopifyCLI::Abort => err
           ctx.puts(err.message)
           nil
+        rescue ShopifyCLI::AbortSilent
+          nil
         end
       end
 

data/lib/shopify_cli/messages/messages.rb

@@ -14,6 +14,12 @@ module ShopifyCLI
         },
       },
       core: {
+        errors: {
+          option_parser: {
+            invalid_option: "The option {{command:%s}} is not supported.",
+            missing_argument: "The required argument {{command:%s}} is missing.",
+          },
+        },
         app: {
           help: <<~HELP,
           Suite of commands for developing apps. See {{command:%1$s app <command> --help}} for usage of each command.
@@ -719,7 +725,7 @@ module ShopifyCLI
           signup_suggestion: <<~MESSAGE,
             {{*}} To avoid tunnels that timeout, it is recommended to signup for a free ngrok
             account at {{underline:https://ngrok.com/signup}}. After you signup, install your
-            personalized authorization token using {{command:%s [ node | rails ] tunnel auth <token>}}.
+            personalized authorization token using {{command:%s app tunnel auth <token>}}.
           MESSAGE
           start: "{{v}} ngrok tunnel running at {{underline:%s}}",
           start_with_account: "{{v}} ngrok tunnel running at {{underline:%s}}, with account %s",

data/lib/shopify_cli/partners_api/app_extensions/job.rb

@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+require "shopify_cli/thread_pool/job"
+
+module ShopifyCLI
+  class PartnersAPI
+    class AppExtensions
+      class Job < ShopifyCLI::ThreadPool::Job
+        attr_reader :result
+
+        def initialize(ctx, app, type)
+          super()
+          @ctx = ctx
+          @app = app
+          @api_key = @app["apiKey"]
+          @type = type
+        end
+
+        def perform!
+          resp = PartnersAPI.query(@ctx, "get_extension_registrations", **params)
+          @result = resp&.dig("data", "app") || {}
+        end
+
+        def patch_app_with_extensions!
+          @app.merge!(result)
+        end
+
+        private
+
+        def params
+          { api_key: @api_key, type: @type }
+        end
+      end
+    end
+  end
+end

data/lib/shopify_cli/partners_api/app_extensions.rb

@@ -0,0 +1,46 @@
+# frozen_string_literal: true
+
+require "shopify_cli/thread_pool"
+
+require_relative "app_extensions/job"
+
+module ShopifyCLI
+  class PartnersAPI
+    class AppExtensions
+      class << self
+        def fetch_apps_extensions(ctx, orgs, type)
+          jobs = apps(orgs).map { |app| AppExtensions::Job.new(ctx, app, type) }
+
+          consume_jobs!(jobs)
+          patch_apps_with_extensions!(jobs)
+
+          orgs
+        end
+
+        private
+
+        def apps(orgs)
+          orgs.flat_map { |org| org["apps"] }
+        end
+
+        def consume_jobs!(jobs)
+          thread_pool = ShopifyCLI::ThreadPool.new
+          jobs.each do |job|
+            thread_pool.schedule(job)
+          end
+          thread_pool.shutdown
+
+          raise_if_any_error(jobs)
+        end
+
+        def patch_apps_with_extensions!(jobs)
+          jobs.each(&:patch_app_with_extensions!)
+        end
+
+        def raise_if_any_error(jobs)
+          jobs.find(&:error?).tap { |job| raise job.error if job }
+        end
+      end
+    end
+  end
+end

data/lib/shopify_cli/partners_api/organizations.rb

@@ -28,11 +28,8 @@ module ShopifyCLI
         end
 
         def fetch_with_extensions(ctx, type)
-          resp = PartnersAPI.query(ctx, "all_orgs_with_extensions", type: type)
-          (resp&.dig("data", "organizations", "nodes") || []).map do |org|
-            org["apps"] = (org.dig("apps", "nodes") || [])
-            org
-          end
+          orgs = fetch_with_app(ctx)
+          AppExtensions.fetch_apps_extensions(ctx, orgs, type)
         end
       end
     end

data/lib/shopify_cli/partners_api.rb

@@ -7,6 +7,7 @@ module ShopifyCLI
   #
   class PartnersAPI < API
     autoload :Organizations, "shopify_cli/partners_api/organizations"
+    autoload :AppExtensions, "shopify_cli/partners_api/app_extensions"
 
     class << self
       ##

data/lib/shopify_cli/project.rb

@@ -107,13 +107,6 @@ module ShopifyCLI
         @dir = nil
       end
 
-      private
-
-      def directory(dir)
-        @dir ||= Hash.new { |h, k| h[k] = __directory(k) }
-        @dir[dir]
-      end
-
       def at(dir)
         proj_dir = directory(dir)
         unless proj_dir
@@ -123,6 +116,13 @@ module ShopifyCLI
         @at[proj_dir]
       end
 
+      private
+
+      def directory(dir)
+        @dir ||= Hash.new { |h, k| h[k] = __directory(k) }
+        @dir[dir]
+      end
+
       def __directory(curr)
         loop do
           return nil if curr == "/" || /^[A-Z]:\/$/.match?(curr)
@@ -134,6 +134,7 @@ module ShopifyCLI
     end
 
     property :directory # :nodoc:
+    property :env # :nodoc:
 
     ##
     # will read, parse and return the envfile for the project

data/lib/shopify_cli/resources/env_file.rb

@@ -14,11 +14,15 @@ module ShopifyCLI
       }
 
       class << self
-        def read(_directory = Dir.pwd)
-          input = parse_external_env
+        def read(_directory = Dir.pwd, overrides: {})
+          input = parse_external_env(overrides: overrides)
           new(input)
         end
 
+        def from_hash(hash)
+          new(env_input(hash))
+        end
+
         def parse(directory)
           File.read(File.join(directory, FILENAME))
             .gsub("\r\n", "\n").split("\n").each_with_object({}) do |line, output|
@@ -37,10 +41,14 @@ module ShopifyCLI
           end
         end
 
-        def parse_external_env(directory = Dir.pwd)
+        def parse_external_env(directory = Dir.pwd, overrides: {})
+          env_input(parse(directory), overrides: overrides)
+        end
+
+        def env_input(parsed_source, overrides: {})
           env_details = {}
           extra = {}
-          parse(directory).each do |key, value|
+          parsed_source.merge(overrides).each do |key, value|
             if KEY_MAP[key]
               env_details[KEY_MAP[key]] = value
             else
@@ -53,7 +61,7 @@ module ShopifyCLI
       end
 
       property :api_key, required: true
-      property :secret, required: true
+      property :secret
       property :shop
       property :scopes
       property :host

data/lib/shopify_cli/theme/dev_server/hot-reload.js

@@ -33,7 +33,20 @@
     }
   }
 
-  function refreshPage() {
+  function setHotReloadCookie(files) {
+    var date = new Date();
+
+    // Hot reload cookie expires in 3 seconds
+    date.setSeconds(date.getSeconds() + 3);
+    
+    var sections = files.join(',');
+    var expires = date.toUTCString();
+
+    document.cookie = `hot_reload_sections=${sections}; expires=${expires}; path=/`;
+  }
+
+  function refreshPage(files) {
+    setHotReloadCookie(files);
     console.log('[HotReload] Refreshing entire page');
     window.location.reload();
   }
@@ -43,7 +56,7 @@
     var modifiedFiles = data.modified;
 
     if (isRefreshRequired(modifiedFiles)) {
-      refreshPage();
+      refreshPage(modifiedFiles);
     } else {
       modifiedFiles.forEach(refreshFile);
     }

data/lib/shopify_cli/theme/dev_server/proxy/template_param_builder.rb

@@ -0,0 +1,84 @@
+# frozen_string_literal: true
+
+require "cgi"
+
+module ShopifyCLI
+  module Theme
+    module DevServer
+      class Proxy
+        class TemplateParamBuilder
+          def build
+            # Core doesn't support replace_templates
+            return {} if core?(current_path)
+
+            (syncer_templates + request_templates)
+              .select { |file| file.liquid? || file.json? }
+              .uniq(&:relative_path)
+              .map { |file| as_param(file) }
+              .to_h
+          end
+
+          def with_core_endpoints(core_endpoints)
+            @core_endpoints = core_endpoints
+            self
+          end
+
+          def with_syncer(syncer)
+            @syncer = syncer
+            self
+          end
+
+          def with_rack_env(rack_env)
+            @rack_env = rack_env
+            self
+          end
+
+          def with_theme(theme)
+            @theme = theme
+            self
+          end
+
+          private
+
+          def as_param(file)
+            ["replace_templates[#{file.relative_path}]", file.read]
+          end
+
+          def syncer_templates
+            @syncer&.pending_updates || []
+          end
+
+          def request_templates
+            cookie_sections
+              .map { |section| @theme[section] unless @theme.nil? }
+              .compact
+          end
+
+          def cookie_sections
+            CGI::Cookie.parse(cookie)["hot_reload_sections"].join.split(",") || []
+          end
+
+          def core?(path)
+            core_endpoints.include?(path)
+          end
+
+          def current_path
+            rack_env["PATH_INFO"]
+          end
+
+          def cookie
+            rack_env["HTTP_COOKIE"]
+          end
+
+          def core_endpoints
+            @core_endpoints || []
+          end
+
+          def rack_env
+            @rack_env || {}
+          end
+        end
+      end
+    end
+  end
+end

data/lib/shopify_cli/theme/dev_server/proxy.rb

@@ -2,6 +2,9 @@
 require "net/http"
 require "stringio"
 require "time"
+require "cgi"
+
+require_relative "proxy/template_param_builder"
 
 module ShopifyCLI
   module Theme
@@ -112,21 +115,12 @@ module ShopifyCLI
         end
 
         def build_replace_templates_param(env)
-          params = {}
-
-          # Core doesn't support replace_templates
-          return params if @core_endpoints.include?(env["PATH_INFO"])
-
-          pending_templates = @syncer.pending_updates.select do |file|
-            # Only replace Liquid or JSON files
-            file.liquid? || file.json?
-          end
-
-          pending_templates.each do |path|
-            params["replace_templates[#{path.relative_path}]"] = path.read
-          end
-
-          params
+          TemplateParamBuilder.new
+            .with_core_endpoints(@core_endpoints)
+            .with_syncer(@syncer)
+            .with_theme(@theme)
+            .with_rack_env(env)
+            .build
         end
 
         def add_session_cookie(cookie_header)

data/lib/shopify_cli/thread_pool/job.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+module ShopifyCLI
+  class ThreadPool
+    class Job
+      attr_reader :error
+
+      def perform!
+        raise "`#{self.class.name}#perform!` must be defined"
+      end
+
+      def call
+        perform!
+      rescue StandardError => error
+        @error = error
+      end
+
+      def success?
+        !@error
+      end
+
+      def error?
+        !!@error
+      end
+    end
+  end
+end

data/lib/shopify_cli/thread_pool.rb

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+module ShopifyCLI
+  class ThreadPool
+    attr_reader :errors
+
+    def initialize(pool_size: 10)
+      @jobs = Queue.new
+      @pool = Array.new(pool_size) { spawn_thread }
+    end
+
+    def schedule(job)
+      @jobs << job
+    end
+
+    def shutdown
+      @pool.size.times do
+        schedule(-> { throw(:stop_thread) })
+      end
+      @pool.map(&:join)
+    ensure
+      @jobs.close
+    end
+
+    private
+
+    def spawn_thread
+      Thread.new do
+        catch(:stop_thread) do
+          loop do
+            @jobs.pop.call
+          end
+        end
+      end
+    end
+  end
+end