shopify-cli 1.13.0 → 2.0.2

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

@@ -0,0 +1,64 @@
+# frozen_string_literal: true
+require "shopify-cli/theme/theme"
+require "shopify-cli/theme/development_theme"
+
+module Theme
+  class Command
+    class Delete < ShopifyCli::SubCommand
+      options do |parser, flags|
+        parser.on("-d", "--development") { flags[:development] = true }
+        parser.on("-a", "--show-all") { flags[:show_all] = true }
+        parser.on("-f", "--force") { flags[:force] = true }
+      end
+
+      def call(args, _name)
+        themes = if options.flags[:development]
+          [ShopifyCli::Theme::DevelopmentTheme.new(@ctx)]
+        elsif args.any?
+          args.map { |id| ShopifyCli::Theme::Theme.new(@ctx, id: id) }
+        else
+          form = Forms::Select.ask(
+            @ctx,
+            [],
+            title: @ctx.message("theme.delete.select"),
+            exclude_roles: ["live"],
+            include_foreign_developments: options.flags[:show_all],
+          )
+          return unless form
+          [form.theme]
+        end
+
+        deleted = 0
+        themes.each do |theme|
+          if theme.live?
+            @ctx.puts(@ctx.message("theme.delete.live", theme.id))
+            next
+          elsif !confirm?(theme)
+            next
+          end
+          theme.delete
+          deleted += 1
+        rescue ShopifyCli::API::APIRequestNotFoundError
+          @ctx.puts(@ctx.message("theme.delete.not_found", theme.id))
+        end
+
+        @ctx.done(@ctx.message("theme.delete.done", deleted))
+      end
+
+      def self.help
+        ShopifyCli::Context.message("theme.delete.help", ShopifyCli::TOOL_NAME, ShopifyCli::TOOL_NAME)
+      end
+
+      private
+
+      def confirm?(theme)
+        Forms::ConfirmStore.ask(
+          @ctx,
+          [],
+          title: @ctx.message("theme.delete.confirm", theme.name, theme.shop),
+          force: options.flags[:force],
+        ).confirmed?
+      end
+    end
+  end
+end

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

@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+module Theme
+  class Command
+    class Init < ShopifyCli::SubCommand
+      options do |parser, flags|
+        parser.on("-u", "--clone-url URL") { |url| flags[:clone_url] = url }
+      end
+
+      DEFAULT_CLONE_URL = "https://github.com/Shopify/dawn.git"
+
+      def call(args, _name)
+        name = args.first || ask_name
+        clone_url = options.flags[:clone_url] || DEFAULT_CLONE_URL
+        clone(clone_url, name)
+      end
+
+      def self.help
+        ShopifyCli::Context.message("theme.init.help", ShopifyCli::TOOL_NAME, ShopifyCli::TOOL_NAME)
+      end
+
+      private
+
+      def ask_name
+        CLI::UI::Prompt.ask(@ctx.message("theme.init.ask_name"))
+      end
+
+      def clone(url, name)
+        ShopifyCli::Git.clone(url, name)
+
+        @ctx.root = File.join(@ctx.root, name)
+
+        begin
+          @ctx.rm_r(".git")
+          @ctx.rm_r(".github")
+        rescue Errno::ENOENT => e
+          @ctx.debug(e)
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+require "theme_check"
+
+module Theme
+  class Command
+    class LanguageServer < ShopifyCli::SubCommand
+      def call(*)
+        ThemeCheck::LanguageServer.start
+      end
+
+      def self.help
+        ShopifyCli::Context.message("theme.language_server.help", ShopifyCli::TOOL_NAME)
+      end
+    end
+  end
+end

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

@@ -0,0 +1,55 @@
+# frozen_string_literal: true
+require "pathname"
+require "json"
+
+module Theme
+  class Command
+    class Package < ShopifyCli::SubCommand
+      THEME_DIRECTORIES = %w[
+        assets
+        config
+        layout
+        locales
+        sections
+        snippets
+        templates
+      ]
+
+      def call(args, _name)
+        path = args.first || "."
+
+        check_prereq_command("zip")
+        zip_name = theme_name(path) + ".zip"
+        zip(zip_name, path, THEME_DIRECTORIES)
+        @ctx.done(@ctx.message("theme.package.done", zip_name))
+      end
+
+      def self.help
+        ShopifyCli::Context.message("theme.package.help", ShopifyCli::TOOL_NAME, ShopifyCli::TOOL_NAME)
+      end
+
+      private
+
+      def check_prereq_command(command)
+        cmd_path = @ctx.which(command)
+        @ctx.abort(@ctx.message("theme.package.error.prereq_command_required", command)) if cmd_path.nil?
+      end
+
+      def zip(zip_name, path, files)
+        @ctx.system("zip", "-r", zip_name, *files, chdir: path)
+      end
+
+      def theme_name(path)
+        settings_schema = Pathname.new(path).join("config/settings_schema.json")
+        @ctx.abort(@ctx.message("theme.package.error.missing_config")) unless settings_schema.file?
+
+        content = settings_schema.read
+        theme_info = JSON.parse(content).find { |section| section["name"] == "theme_info" }
+        theme_name = theme_info&.dig("theme_name")
+        @ctx.abort(@ctx.message("theme.package.error.missing_theme_name")) unless theme_name
+
+        [theme_name, theme_info["theme_version"]].compact.join("-")
+      end
+    end
+  end
+end

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

@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+require "shopify-cli/theme/theme"
+
+module Theme
+  class Command
+    class Publish < ShopifyCli::SubCommand
+      options do |parser, flags|
+        parser.on("-f", "--force") { flags[:force] = true }
+      end
+
+      def call(args, *)
+        theme = if (theme_id = args.first)
+          ShopifyCli::Theme::Theme.new(@ctx, id: theme_id)
+        else
+          form = Forms::Select.ask(
+            @ctx,
+            [],
+            title: @ctx.message("theme.publish.select"),
+            exclude_roles: ["live", "development", "demo"],
+          )
+          return unless form
+          form.theme
+        end
+
+        return unless Forms::ConfirmStore.ask(
+          @ctx,
+          [],
+          title: @ctx.message("theme.publish.confirm", theme.name, theme.shop),
+          force: options.flags[:force],
+        ).confirmed?
+
+        theme.publish
+        @ctx.done(@ctx.message("theme.publish.done", theme.preview_url))
+      rescue ShopifyCli::API::APIRequestNotFoundError
+        @ctx.puts(@ctx.message("theme.publish.not_found", theme.id))
+      end
+
+      def self.help
+        ShopifyCli::Context.message("theme.publish.help", ShopifyCli::TOOL_NAME, ShopifyCli::TOOL_NAME)
+      end
+    end
+  end
+end

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

@@ -0,0 +1,51 @@
+# frozen_string_literal: true
+require "shopify-cli/theme/theme"
+require "shopify-cli/theme/ignore_filter"
+require "shopify-cli/theme/syncer"
+
+module Theme
+  class Command
+    class Pull < ShopifyCli::SubCommand
+      options do |parser, flags|
+        parser.on("-n", "--nodelete") { flags[:nodelete] = true }
+        parser.on("-i", "--themeid=ID") { |theme_id| flags[:theme_id] = theme_id }
+      end
+
+      def call(args, _name)
+        root = args.first || "."
+        delete = !options.flags[:nodelete]
+
+        theme = if (theme_id = options.flags[:theme_id])
+          ShopifyCli::Theme::Theme.new(@ctx, root: root, id: theme_id)
+        else
+          form = Forms::Select.ask(
+            @ctx,
+            [],
+            title: @ctx.message("theme.pull.select"),
+            root: root,
+          )
+          return unless form
+          form.theme
+        end
+
+        ignore_filter = ShopifyCli::Theme::IgnoreFilter.from_path(root)
+        syncer = ShopifyCli::Theme::Syncer.new(@ctx, theme: theme, ignore_filter: ignore_filter)
+        begin
+          syncer.start_threads
+          CLI::UI::Frame.open(@ctx.message("theme.pull.pulling", theme.name, theme.id, theme.shop)) do
+            UI::SyncProgressBar.new(syncer).progress(:download_theme!, delete: delete)
+          end
+          @ctx.done(@ctx.message("theme.pull.done"))
+        rescue ShopifyCli::API::APIRequestNotFoundError
+          @ctx.abort(@ctx.message("theme.pull.theme_not_found", theme.id))
+        ensure
+          syncer.shutdown
+        end
+      end
+
+      def self.help
+        ShopifyCli::Context.message("theme.pull.help", ShopifyCli::TOOL_NAME, ShopifyCli::TOOL_NAME)
+      end
+    end
+  end
+end

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

@@ -1,49 +1,75 @@
 # frozen_string_literal: true
-module Theme
-  module Commands
-    class Push < ShopifyCli::Command
-      prerequisite_task :ensure_themekit_installed
+require "shopify-cli/theme/theme"
+require "shopify-cli/theme/development_theme"
+require "shopify-cli/theme/ignore_filter"
+require "shopify-cli/theme/syncer"
 
+module Theme
+  class Command
+    class Push < ShopifyCli::SubCommand
       options do |parser, flags|
-        parser.on("--remove") { flags["remove"] = true }
-        parser.on("--nodelete") { flags["nodelete"] = true }
-        parser.on("--allow-live") { flags["allow-live"] = true }
-        parser.on("--env=ENV") { |env| flags[:env] = env }
+        parser.on("-n", "--nodelete") { flags[:nodelete] = true }
+        parser.on("-i", "--themeid=ID") { |theme_id| flags[:theme_id] = theme_id }
+        parser.on("-d", "--development") { flags[:development] = true }
+        parser.on("-u", "--unpublished") { flags[:unpublished] = true }
+        parser.on("-j", "--json") { flags[:json] = true }
+        parser.on("-a", "--allow-live") { flags[:allow_live] = true }
+        parser.on("-p", "--publish") { flags[:publish] = true }
       end
 
       def call(args, _name)
-        if options.flags["remove"]
-          remove = true
-          options.flags.delete("remove")
-        end
+        root = args.first || "."
+        delete = !options.flags[:nodelete]
 
-        if options.flags[:env]
-          env = options.flags[:env]
-          options.flags.delete(:env)
+        theme = if (theme_id = options.flags[:theme_id])
+          ShopifyCli::Theme::Theme.new(@ctx, root: root, id: theme_id)
+        elsif options.flags[:development]
+          theme = ShopifyCli::Theme::DevelopmentTheme.new(@ctx, root: root)
+          theme.ensure_exists!
+          theme
+        elsif options.flags[:unpublished]
+          name = CLI::UI::Prompt.ask(@ctx.message("theme.push.name"), allow_empty: false)
+          theme = ShopifyCli::Theme::Theme.new(@ctx, root: root, name: name, role: "unpublished")
+          theme.create
+          theme
+        else
+          form = Forms::Select.ask(
+            @ctx,
+            [],
+            title: @ctx.message("theme.push.select"),
+            root: root,
+          )
+          return unless form
+          form.theme
         end
 
-        flags = Themekit.add_flags(options.flags)
-
-        if remove
-          CLI::UI::Frame.open(@ctx.message("theme.push.remove")) do
-            unless CLI::UI::Prompt.confirm(@ctx.message("theme.push.remove_confirm"))
-              @ctx.abort(@ctx.message("theme.push.remove_abort"))
-            end
+        if theme.live? && !options.flags[:allow_live]
+          return unless CLI::UI::Prompt.confirm(@ctx.message("theme.push.live"))
+        end
 
-            unless Themekit.push(@ctx, files: args, flags: flags, remove: remove, env: env)
-              @ctx.abort(@ctx.message("theme.push.error.remove_error"))
+        ignore_filter = ShopifyCli::Theme::IgnoreFilter.from_path(root)
+        syncer = ShopifyCli::Theme::Syncer.new(@ctx, theme: theme, ignore_filter: ignore_filter)
+        begin
+          syncer.start_threads
+          if options.flags[:json]
+            syncer.upload_theme!(delete: delete)
+            puts(JSON.generate(theme: theme.to_h))
+          else
+            CLI::UI::Frame.open(@ctx.message("theme.push.info.pushing", theme.name, theme.id, theme.shop)) do
+              UI::SyncProgressBar.new(syncer).progress(:upload_theme!, delete: delete)
             end
-          end
 
-          @ctx.done(@ctx.message("theme.push.info.remove", @ctx.root))
-        else
-          CLI::UI::Frame.open(@ctx.message("theme.push.push")) do
-            unless Themekit.push(@ctx, files: args, flags: flags, remove: remove, env: env)
-              @ctx.abort(@ctx.message("theme.push.error.push_error"))
+            if options.flags[:publish]
+              theme.publish
+              @ctx.done(@ctx.message("theme.publish.done", theme.preview_url))
+            else
+              @ctx.done(@ctx.message("theme.push.done", theme.preview_url, theme.editor_url))
             end
           end
-
-          @ctx.done(@ctx.message("theme.push.info.push", @ctx.root))
+        rescue ShopifyCli::API::APIRequestNotFoundError
+          @ctx.abort(@ctx.message("theme.push.theme_not_found", theme.id))
+        ensure
+          syncer.shutdown
         end
       end
 

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

@@ -1,25 +1,17 @@
 # frozen_string_literal: true
-module Theme
-  module Commands
-    class Serve < ShopifyCli::Command
-      prerequisite_task :ensure_themekit_installed
+require "shopify-cli/theme/dev_server"
 
+module Theme
+  class Command
+    class Serve < ShopifyCli::SubCommand
       options do |parser, flags|
-        parser.on("--env=ENV") { |env| flags[:env] = env }
-        parser.on("--allow-live") { flags["allow-live"] = true }
-        parser.on("--notify=FILES") { |files| flags["notify"] = files }
+        parser.on("--port=PORT") { |port| flags[:port] = port.to_i }
       end
 
       def call(*)
-        if options.flags[:env]
-          env = options.flags[:env]
-          options.flags.delete(:env)
-        end
-
-        flags = Themekit.add_flags(options.flags)
-
-        CLI::UI::Frame.open(@ctx.message("theme.serve.serve")) do
-          Themekit.serve(@ctx, flags: flags, env: env)
+        flags = options.flags.dup
+        ShopifyCli::Theme::DevServer.start(@ctx, ".", **flags) do |syncer|
+          UI::SyncProgressBar.new(syncer).progress(:upload_theme!, delay_low_priority_files: true)
         end
       end
 

data/lib/project_types/theme/forms/confirm_store.rb

@@ -0,0 +1,15 @@
+module Theme
+  module Forms
+    class ConfirmStore < ShopifyCli::Form
+      flag_arguments :title, :force
+
+      def ask
+        @confirmed = force || CLI::UI::Prompt.confirm(title, default: false)
+      end
+
+      def confirmed?
+        @confirmed
+      end
+    end
+  end
+end

data/lib/project_types/theme/forms/select.rb

@@ -0,0 +1,59 @@
+module Theme
+  module Forms
+    class Select < ShopifyCli::Form
+      attr_accessor :theme
+      flag_arguments :root, :title, :exclude_roles, :include_foreign_developments
+
+      def ask
+        self.theme = CLI::UI::Prompt.ask(title, allow_empty: false) do |handler|
+          themes.each do |theme|
+            next if exclude_roles&.include?(theme.role)
+            next if !include_foreign_developments && theme.foreign_development?
+            handler.option("#{theme.name} #{theme_tags(theme)}") { theme }
+          end
+        end
+      end
+
+      private
+
+      def themes
+        @themes ||= ShopifyCli::Theme::Theme.all(@ctx, root: root)
+          .sort_by { |theme| theme_sort_order(theme) }
+      end
+
+      def theme_sort_order(theme)
+        case theme.role
+        when "live"
+          0
+        when "unpublished"
+          1
+        when "development"
+          2
+        else
+          3
+        end
+      end
+
+      def theme_tags(theme)
+        color = case theme.role
+        when "live"
+          "green"
+        when "unpublished"
+          "yellow"
+        when "development"
+          "blue"
+        else
+          "grey"
+        end
+
+        tags = ["{{#{color}:[#{theme.role}]}}"]
+
+        if theme.current_development?
+          tags << "{{cyan:[yours]}}}}"
+        end
+
+        tags.join(" ")
+      end
+    end
+  end
+end