shopify-cli 1.14.0 → 2.0.0

data/lib/project_types/script/ui/error_handler.rb

@@ -34,7 +34,7 @@ module Script
             cause_of_error: ShopifyCli::Context.message("script.error.enospc_cause"),
             help_suggestion: ShopifyCli::Context.message("script.error.enospc_help"),
           }
-        when ShopifyCli::OAuth::Error
+        when ShopifyCli::IdentityAuth::Error
           {
             cause_of_error: ShopifyCli::Context.message("script.error.oauth_cause"),
             help_suggestion: ShopifyCli::Context.message("script.error.oauth_help"),
@@ -214,7 +214,7 @@ module Script
           }
         when Layers::Infrastructure::Errors::ScriptRepushError
           {
-            cause_of_error: ShopifyCli::Context.message("script.error.script_repush_cause", e.uuid),
+            cause_of_error: ShopifyCli::Context.message("script.error.script_repush_cause"),
             help_suggestion: ShopifyCli::Context.message("script.error.script_repush_help"),
           }
         when Layers::Infrastructure::Errors::ShopAuthenticationError

data/lib/project_types/theme/cli.rb

@@ -1,40 +1,28 @@
 # frozen_string_literal: true
 module Theme
   class Project < ShopifyCli::ProjectType
-    hidden_feature
-
-    title("Theme")
-    creator("Theme::Commands::Create")
-    connector("Theme::Commands::Connect")
-
-    register_command("Theme::Commands::Deploy", "deploy")
-    register_command("Theme::Commands::Generate", "generate")
-    register_command("Theme::Commands::Push", "push")
-    register_command("Theme::Commands::Serve", "serve")
-
-    register_task("Theme::Tasks::EnsureThemekitInstalled", :ensure_themekit_installed)
-
     require Project.project_filepath("messages/messages")
     register_messages(Theme::Messages::MESSAGES)
   end
 
-  module Commands
-    autoload :Connect, Project.project_filepath("commands/connect")
-    autoload :Create, Project.project_filepath("commands/create")
-    autoload :Deploy, Project.project_filepath("commands/deploy")
-    autoload :Generate, Project.project_filepath("commands/generate")
-    autoload :Push, Project.project_filepath("commands/push")
-    autoload :Serve, Project.project_filepath("commands/serve")
-  end
-
-  module Tasks
-    autoload :EnsureThemekitInstalled, Project.project_filepath("tasks/ensure_themekit_installed")
+  class Command < ShopifyCli::ProjectCommands
+    subcommand :Serve, "serve", Project.project_filepath("commands/serve")
+    subcommand :Pull, "pull", Project.project_filepath("commands/pull")
+    subcommand :Push, "push", Project.project_filepath("commands/push")
+    subcommand :Delete, "delete", Project.project_filepath("commands/delete")
+    subcommand :Check, "check", Project.project_filepath("commands/check")
+    subcommand :Publish, "publish", Project.project_filepath("commands/publish")
+    subcommand :Package, "package", Project.project_filepath("commands/package")
+    subcommand :LanguageServer, "language-server", Project.project_filepath("commands/language_server")
   end
+  ShopifyCli::Commands.register("Theme::Command", "theme")
 
   module Forms
-    autoload :Create, Project.project_filepath("forms/create")
-    autoload :Connect, Project.project_filepath("forms/connect")
+    autoload :ConfirmStore, Project.project_filepath("forms/confirm_store")
+    autoload :Select, Project.project_filepath("forms/select")
   end
 
-  autoload :Themekit, Project.project_filepath("themekit")
+  module UI
+    autoload :SyncProgressBar, Project.project_filepath("ui/sync_progress_bar")
+  end
 end

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

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+require "theme_check"
+
+module Theme
+  class Command
+    class Check < ShopifyCli::SubCommand
+      class Options < ShopifyCli::Options
+        def initialize(theme_check)
+          super()
+          @theme_check = theme_check
+        end
+
+        def parse(_options_block, args)
+          @theme_check.parse(args)
+        end
+      end
+
+      def initialize(*)
+        super
+        @theme_check = ThemeCheck::Cli.new
+        self.options = Options.new(@theme_check)
+      end
+
+      def call(*)
+        @theme_check.run
+      end
+
+      def self.help
+        ShopifyCli::Context.message("theme.check.help", ShopifyCli::TOOL_NAME)
+      end
+    end
+  end
+end

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/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