@shopify/cli-kit 3.69.3 → 3.70.0

package/assets/cli-ruby/lib/shopify_cli/theme/extension/syncer/extension_serve_job.rb

@@ -1,120 +0,0 @@
-# frozen_string_literal: true
-require "project_types/extension/loaders/project"
-require "project_types/extension/loaders/specification_handler"
-require "shopify_cli/partners_api"
-require "shopify_cli/thread_pool/job"
-require "shopify_cli/theme/notifier"
-
-module ShopifyCLI
-  module Theme
-    module Extension
-      class Syncer
-        class ExtensionServeJob < ThreadPool::Job
-          POLL_FREQUENCY = 0.5 # second
-          PUSH_INTERVAL = 5 # seconds
-
-          RESPONSE_FIELD = %w(data extensionUpdateDraft)
-          VERSION_FIELD = "extensionVersion"
-          USER_ERRORS_FIELD = "userErrors"
-          ERROR_FILE_REGEX = /\[([^\]\[]*)\]/
-
-          def initialize(ctx, syncer:, extension:, project:, specification_handler:, notify:)
-            super(POLL_FREQUENCY)
-
-            @ctx = ctx
-            @extension = extension
-            @project = project
-            @specification_handler = specification_handler
-
-            @notifier = ShopifyCLI::Theme::Notifier.new(ctx, path: notify)
-            @syncer = syncer
-            @syncer_mutex = Mutex.new
-
-            @job_in_progress = false
-            @job_in_progress_mutex = Mutex.new
-
-            $stdout.sync = true
-          end
-
-          def perform!
-            return unless @syncer.any_operation?
-            return if job_in_progress?
-            return if recently_synced? && !@syncer.any_blocking_operation?
-
-            job_in_progress!
-
-            print_items({}.freeze)
-
-            files = @syncer.pending_files.map(&:relative_path)
-            # Notify changes after the sync is complete
-            @notifier.notify_updates(files)
-
-            @syncer_mutex.synchronize do
-              @syncer.pending_operations.clear
-              @syncer.latest_sync = Time.now
-            end
-
-          ensure
-            job_in_progress!(false)
-          end
-
-          private
-
-          def job_in_progress!(in_progress = true)
-            @job_in_progress_mutex.synchronize { @job_in_progress = in_progress }
-          end
-
-          def job_in_progress?
-            @job_in_progress
-          end
-
-          def recently_synced?
-            Time.now - @syncer.latest_sync < PUSH_INTERVAL
-          end
-
-          def success_message(project)
-            "{{green:Pushed}} {{>}} {{blue:'#{project}'}} to a draft"
-          end
-
-          def error_message(project)
-            "{{red:Error}}  {{>}} {{blue:'#{project}'}} could not be pushed:"
-          end
-
-          def print_file_success(file)
-            @ctx.puts("{{blue:- #{file.relative_path}}}")
-          end
-
-          def print_file_error(file, err)
-            @ctx.puts("{{red:- #{file.relative_path}}}")
-            @ctx.puts("{{red:  - Cause: #{err}}}")
-          end
-
-          def erroneous_files(errors)
-            files = {}
-            errors.each do |e|
-              path = e["message"][ERROR_FILE_REGEX, 1]
-              file = @extension[path]
-              files[file] = e["message"]
-            end
-            files
-          end
-
-          def print_items(erroneous_files)
-            @syncer.pending_files.each do |file|
-              err = erroneous_files.dig(file)
-              if err
-                print_file_error(file, err)
-                erroneous_files.delete(file)
-              else
-                print_file_success(file)
-              end
-            end
-            erroneous_files.each do |file, err|
-              print_file_error(file, err)
-            end
-          end
-        end
-      end
-    end
-  end
-end

package/assets/cli-ruby/lib/shopify_cli/theme/extension/syncer/operation.rb

@@ -1,25 +0,0 @@
-# frozen_string_literal: true
-
-require "pathname"
-
-module ShopifyCLI
-  module Theme
-    module Extension
-      class Syncer
-        class Operation < Struct.new(:file, :kind)
-          def delete?
-            kind == :delete
-          end
-
-          def create?
-            kind == :create
-          end
-
-          def file_path
-            file.relative_path
-          end
-        end
-      end
-    end
-  end
-end

package/assets/cli-ruby/lib/shopify_cli/theme/extension/syncer.rb

@@ -1,100 +0,0 @@
-# frozen_string_literal: true
-
-require_relative "syncer/extension_serve_job"
-require_relative "syncer/operation"
-require_relative "ignore_helper"
-
-require "shopify_cli/thread_pool"
-
-module ShopifyCLI
-  module Theme
-    module Extension
-      class Syncer
-        include ShopifyCLI::Theme::Extension::IgnoreHelper
-
-        attr_accessor :pending_operations, :latest_sync, :ignore_filter, :notify
-
-        def initialize(ctx, extension:, project:, specification_handler:, ignore_filter: nil, notify: nil)
-          @ctx = ctx
-          @extension = extension
-          @project = project
-          @specification_handler = specification_handler
-          @ignore_filter = ignore_filter
-          @notify = notify
-
-          @pool = ThreadPool.new(pool_size: 1)
-          @pending_operations = []
-
-          extension.extension_files.each do |file|
-            operation = Operation.new(file, :update)
-            @pending_operations << operation if enqueueable?(operation)
-          end
-
-          @pending_operations_mutex = Mutex.new
-          @latest_sync = Time.now - ExtensionServeJob::PUSH_INTERVAL
-        end
-
-        def enqueue_creates(files)
-          operations = files.map { |file| Operation.new(file, :create) }
-          enqueue_operations(operations)
-        end
-
-        def enqueue_updates(files)
-          operations = files.map { |file| Operation.new(file, :update) }
-          enqueue_operations(operations)
-        end
-
-        def enqueue_deletes(files)
-          operations = files.map { |file| Operation.new(file, :delete) }
-          enqueue_operations(operations)
-        end
-
-        def start
-          @pool.schedule(job)
-        end
-
-        def shutdown
-          @pool.shutdown
-        end
-
-        def pending_files
-          pending_operations.map(&:file)
-        end
-
-        def any_operation?
-          pending_operations.any?
-        end
-
-        def any_blocking_operation?
-          pending_operations.any? { |operation| operation.delete? || operation.create? }
-        end
-
-        private
-
-        def enqueueable?(operation)
-          # Already enqueued or ignored
-          return false if @pending_operations.include?(operation) || ignore_operation?(operation)
-
-          true
-        end
-
-        def enqueue_operations(operations)
-          @pending_operations_mutex.synchronize do
-            operations.each { |f| @pending_operations << f if enqueueable?(f) }
-          end
-        end
-
-        def job
-          ExtensionServeJob.new(
-            @ctx,
-            syncer: self,
-            extension: @extension,
-            project: @project,
-            specification_handler: @specification_handler,
-            notify: notify,
-          )
-        end
-      end
-    end
-  end
-end

package/assets/cli-ruby/lib/shopify_cli/theme/extension/ui/host_theme_progress_bar.rb

@@ -1,35 +0,0 @@
-
-module ShopifyCLI
-  module Theme
-    module Extension
-      module UI
-        class HostThemeProgressBar
-          GIT_CLONE_PROGRESS_SHARE = 0.2
-          SYNC_PROGRESS_SHARE = 0.8
-
-          def initialize(syncer, dir)
-            @syncer = syncer
-            @dir = dir
-          end
-
-          def progress(method, **args)
-            @syncer.lock_io!
-            CLI::UI::Progress.progress do |bar|
-              Git.public_send(:raw_clone, "https://github.com/Shopify/dawn.git", @dir) do |percent|
-                bar.tick(set_percent: percent * GIT_CLONE_PROGRESS_SHARE)
-              end
-
-              @syncer.public_send(method, **args) do |left, total|
-                next if total == 0
-                bar.tick(set_percent: (1 - left.to_f / total) * SYNC_PROGRESS_SHARE + GIT_CLONE_PROGRESS_SHARE)
-              end
-
-              bar.tick(set_percent: 1)
-            end
-            @syncer.unlock_io!
-          end
-        end
-      end
-    end
-  end
-end

package/assets/cli-ruby/lib/shopify_cli/theme/extension/ui/host_theme_raw_progress_bar.rb

@@ -1,40 +0,0 @@
-
-module ShopifyCLI
-  module Theme
-    module Extension
-      module UI
-        class HostThemeRawProgressBar
-          GIT_CLONE_PROGRESS_SHARE = 0.2
-          SYNC_PROGRESS_SHARE = 0.8
-
-          def initialize(syncer, dir)
-            @syncer = syncer
-            @dir = dir
-          end
-
-          def progress(method, **args)
-            @syncer.lock_io!
-            old_sync = $stdout.sync
-            $stdout.sync = true
-            CLI::UI::ProgressPlain.progress(prefix: "Pushing theme...") do |bar|
-              bar.tick(set_percent: 0)
-
-              Git.public_send(:raw_clone, "https://github.com/Shopify/dawn.git", @dir) do |percent|
-                bar.tick(set_percent: percent * GIT_CLONE_PROGRESS_SHARE)
-              end
-
-              @syncer.public_send(method, **args) do |left, total|
-                next if total == 0
-                bar.tick(set_percent: (1 - left.to_f / total) * SYNC_PROGRESS_SHARE + GIT_CLONE_PROGRESS_SHARE)
-              end
-
-              bar.tick(set_percent: 1)
-            end
-            $stdout.sync = old_sync
-            @syncer.unlock_io!
-          end
-        end
-      end
-    end
-  end
-end

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

@@ -1,133 +0,0 @@
-# frozen_string_literal: true
-require_relative "mime_type"
-
-module ShopifyCLI
-  module Theme
-    class File < Struct.new(:path)
-      attr_accessor :remote_checksum
-      attr_writer :warnings
-
-      def initialize(path, root)
-        super(Pathname.new(path))
-
-        # Path may be relative or absolute depending on the source.
-        # By converting both the path and the root to absolute paths, we
-        # can safely fetch a relative path.
-        @relative_path = self.path.expand_path.relative_path_from(root.expand_path)
-      end
-
-      def read
-        if text?
-          path.read(universal_newline: true)
-        else
-          path.read(mode: "rb")
-        end
-      end
-
-      def write(content)
-        path.parent.mkpath unless path.parent.directory?
-        if text?
-          path.write(content, universal_newline: true)
-        else
-          path.write(content, 0, mode: "wb")
-        end
-      rescue Encoding::UndefinedConversionError
-        ##
-        # The CLI tries to write the file and normalize EOL characters to avoid
-        # errors on Windows when files are shared across different operational systems.
-        #
-        # The CLI fallbacks any error during the conversion by writing the file
-        # in binary mode when the normalization fails (e.g., ASCII files), so no data is lost.
-        #
-        path.write(content, 0, mode: "wb")
-      end
-
-      def delete
-        path.delete
-      end
-
-      def exist?
-        path.exist?
-      end
-
-      def mime_type
-        @mime_type ||= MimeType.by_filename(@relative_path)
-      end
-
-      def text?
-        mime_type.text?
-      end
-
-      def liquid?
-        path.extname == ".liquid"
-      end
-
-      def liquid_css?
-        relative_path.end_with?(".css.liquid")
-      end
-
-      def json?
-        path.extname == ".json"
-      end
-
-      def static_json?
-        json? && relative_path.start_with?("assets/")
-      end
-
-      def template?
-        relative_path.start_with?("templates/")
-      end
-
-      def checksum
-        content = read
-
-        if mime_type.json? && !settings_schema? && !static_json?
-          # Normalize JSON to match backend
-          begin
-            content = normalize_json(content)
-          rescue JSON::JSONError
-            # Fallback to using the raw content
-          end
-        end
-
-        Digest::MD5.hexdigest(content)
-      end
-
-      # Make it possible to check whether a given File is within a list of Files with `include?`,
-      # some of which may be relative paths while others are absolute paths.
-      def ==(other)
-        relative_path == other.relative_path
-      end
-
-      def name(*args)
-        ::File.basename(path, *args)
-      end
-
-      def absolute_path
-        path.realpath.to_s
-      end
-
-      def relative_path
-        @relative_path.to_s
-      end
-
-      def warnings
-        @warnings || []
-      end
-
-      private
-
-      def settings_schema?
-        relative_path.end_with?("config/settings_schema.json")
-      end
-
-      def normalize_json(content)
-        normalized = JSON.generate(JSON.parse(content))
-
-        # Backend escapes forward slashes
-        normalized.gsub!(/\//, "\\/")
-        normalized
-      end
-    end
-  end
-end

package/assets/cli-ruby/lib/shopify_cli/theme/filter/path_matcher.rb

@@ -1,38 +0,0 @@
-# frozen_string_literal: true
-
-module ShopifyCLI
-  module Theme
-    module Filter
-      module PathMatcher
-        def regex_match?(regex, path)
-          regex.match?(path)
-        rescue StandardError
-          false
-        end
-
-        def glob_match?(glob, path)
-          !!::File.fnmatch?(glob, path)
-        end
-
-        def regex?(pattern)
-          pattern.start_with?("/") && pattern.end_with?("/")
-        end
-
-        def as_regex(pattern)
-          Regexp.new(pattern.gsub(%r{^\/|\/$}, ""))
-        end
-
-        def as_glob(pattern)
-          # if specifying a directory, match everything below it
-          pattern += "*" if pattern.end_with?("/")
-
-          # The pattern will be scoped to root directory, so it should match anything
-          # within that space
-          pattern.prepend("*") unless pattern.start_with?("*")
-
-          pattern
-        end
-      end
-    end
-  end
-end

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

@@ -1,112 +0,0 @@
-# frozen_string_literal: true
-
-require_relative "filter/path_matcher"
-
-module ShopifyCLI
-  module Theme
-    class IgnoreFilter
-      include Filter::PathMatcher
-
-      FILE = ".shopifyignore"
-
-      DEFAULT_REGEXES = [
-        /\.git/,
-        /\.hg/,
-        /\.bzr/,
-        /\.svn/,
-        /_darcs/,
-        /CVS/,
-        /\.sublime-(project|workspace)/,
-        /\.DS_Store/,
-        /\.sass-cache/,
-        /Thumbs\.db/,
-        /desktop\.ini/,
-        /config.yml/,
-        /node_modules/,
-      ].freeze
-
-      DEFAULT_GLOBS = [].freeze
-
-      attr_reader :root, :globs, :regexes
-
-      def self.from_path(root)
-        root = Pathname.new(root)
-        ignore_file = root.join(FILE)
-        patterns = if ignore_file.file?
-          parse_ignore_file(ignore_file)
-        else
-          []
-        end
-        new(root, patterns: patterns)
-      end
-
-      def self.parse_ignore_file(file)
-        patterns = []
-
-        file.each_line do |line|
-          line.strip!
-
-          next if line.empty? || line.start_with?("#")
-
-          patterns << line
-        end
-
-        patterns
-      end
-
-      def initialize(root, patterns: [])
-        @root = root
-
-        regexes, globs = patterns_to_regexes_and_globs(patterns)
-
-        @regexes = regexes
-        @globs = globs
-      end
-
-      def add_patterns(patterns)
-        regexes, globs = patterns_to_regexes_and_globs(patterns)
-
-        @regexes += regexes
-        @globs += globs
-      end
-
-      def match?(path)
-        path = path.to_s
-
-        return true if path.empty?
-
-        regexes.each do |regex|
-          return true if regex_match?(regex, path)
-        end
-
-        globs.each do |glob|
-          return true if glob_match?(glob, path)
-        end
-
-        false
-      end
-      alias_method :ignore?, :match?
-
-      private
-
-      # Take in string patterns and convert them to either
-      # regex patterns or glob patterns so that they are handled in an expected manner.
-      def patterns_to_regexes_and_globs(patterns)
-        new_regexes = DEFAULT_REGEXES.dup
-        new_globs = DEFAULT_GLOBS.dup
-
-        patterns
-          .map(&:strip)
-          .each do |pattern|
-            if regex?(pattern)
-              new_regexes << as_regex(pattern)
-            else
-              new_globs << as_glob(pattern)
-            end
-          end
-
-        [new_regexes, new_globs]
-      end
-    end
-  end
-end

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

@@ -1,37 +0,0 @@
-# frozen_string_literal: true
-
-module ShopifyCLI
-  module Theme
-    module IgnoreHelper
-      def ignore_operation?(operation)
-        path = operation.file_path
-        ignore_path?(path)
-      end
-
-      def ignore_file?(file)
-        path = file.relative_path
-        ignore_path?(path)
-      end
-
-      def ignore_path?(path)
-        is_ignored = ignored_by_ignore_filter?(path) || ignored_by_include_filter?(path)
-
-        if is_ignored && @ctx
-          @ctx.debug("ignore #{path}")
-        end
-
-        is_ignored
-      end
-
-      private
-
-      def ignored_by_ignore_filter?(path)
-        ignore_filter&.ignore?(path)
-      end
-
-      def ignored_by_include_filter?(path)
-        !!include_filter && !include_filter.match?(path)
-      end
-    end
-  end
-end

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

@@ -1,67 +0,0 @@
-# frozen_string_literal: true
-
-require_relative "filter/path_matcher"
-
-module ShopifyCLI
-  module Theme
-    class IncludeFilter
-      include Filter::PathMatcher
-
-      attr_reader :globs, :regexes
-
-      def initialize(root, patterns = [])
-        @root = Pathname.new(root)
-        @patterns = patterns.nil? ? [] : patterns.compact.reject(&:empty?)
-
-        regexes, globs = patterns_to_regexes_and_globs(@patterns)
-
-        @regexes = regexes
-        @globs = globs
-      end
-
-      def match?(path)
-        return true unless present?(@patterns)
-
-        path = path.to_s
-        return true if path.empty?
-
-        path = @root.join(path).to_s
-
-        regexes.each do |regex|
-          return true if regex_match?(regex, path)
-        end
-
-        globs.each do |glob|
-          return true if glob_match?(glob, path)
-        end
-
-        false
-      end
-
-      private
-
-      def present?(patterns)
-        !patterns.nil? && !patterns.empty?
-      end
-
-      # Take in string patterns and convert them to either
-      # regex patterns or glob patterns so that they are handled in an expected manner.
-      def patterns_to_regexes_and_globs(patterns)
-        new_regexes = []
-        new_globs = []
-
-        patterns
-          .map(&:strip)
-          .each do |pattern|
-            if regex?(pattern)
-              new_regexes << as_regex(pattern)
-            else
-              new_globs << as_glob(pattern)
-            end
-          end
-
-        [new_regexes, new_globs]
-      end
-    end
-  end
-end