shopify-cli 1.11.0 → 2.0.0

data/lib/project_types/script/tasks/ensure_env.rb

@@ -11,7 +11,7 @@ module Script
         script_project_repo = Layers::Infrastructure::ScriptProjectRepository.new(ctx: ctx)
         script_project = script_project_repo.get
 
-        return if script_project.api_key && script_project.api_secret && script_project.uuid_defined?
+        return false if script_project.api_key && script_project.api_secret && script_project.uuid_defined?
 
         org = ask_org
         app = ask_app(org["apps"])
@@ -22,11 +22,15 @@ module Script
           secret: app["apiSecretKeys"].first["secret"],
           uuid: uuid
         )
+
+        true
       end
 
       private
 
       def ask_org
+        return stubbed_org if partner_proxy_bypass
+
         if ShopifyCli::Shopifolk.check && wants_to_run_against_shopify_org?
           ShopifyCli::Shopifolk.act_as_shopify_organization
         end
@@ -47,6 +51,23 @@ module Script
         end
       end
 
+      def stubbed_org
+        {
+          "apps" => [
+            {
+              "appType" => "custom",
+              "apiKey" => "stubbed-api-key",
+              "apiSecretKeys" => [{ "secret" => "stubbed-api-secret" }],
+              "title" => "Fake App (Not connected to Partners)",
+            },
+          ],
+        }
+      end
+
+      def partner_proxy_bypass
+        !ENV["BYPASS_PARTNERS_PROXY"].nil?
+      end
+
       def ask_app(apps)
         unless ShopifyCli::Shopifolk.acting_as_shopify_organization?
           apps = apps.select { |app| app["appType"] == "custom" }

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"),
@@ -120,17 +120,20 @@ module Script
             cause_of_error: ShopifyCli::Context.message("script.error.metadata_not_found_cause"),
             help_suggestion: ShopifyCli::Context.message("script.error.metadata_not_found_help"),
           }
-        when Layers::Domain::Errors::InvalidConfigUiDefinitionError
+        when Layers::Domain::Errors::MissingScriptJsonFieldError
           {
-            cause_of_error: ShopifyCli::Context
-              .message("script.error.invalid_config_ui_definition_cause", e.filename),
-            help_suggestion: ShopifyCli::Context.message("script.error.invalid_config_ui_definition_help"),
+            cause_of_error: ShopifyCli::Context.message("script.error.missing_script_json_field_cause", e.field),
+            help_suggestion: ShopifyCli::Context.message("script.error.missing_script_json_field_help"),
           }
-        when Layers::Domain::Errors::MissingSpecifiedConfigUiDefinitionError
+        when Layers::Domain::Errors::InvalidScriptJsonDefinitionError
           {
-            cause_of_error: ShopifyCli::Context
-              .message("script.error.missing_config_ui_definition_cause", e.filename),
-            help_suggestion: ShopifyCli::Context.message("script.error.missing_config_ui_definition_help"),
+            cause_of_error: ShopifyCli::Context.message("script.error.invalid_script_json_definition_cause"),
+            help_suggestion: ShopifyCli::Context.message("script.error.invalid_script_json_definition_help"),
+          }
+        when Layers::Domain::Errors::NoScriptJsonFile
+          {
+            cause_of_error: ShopifyCli::Context.message("script.error.no_script_json_file_cause"),
+            help_suggestion: ShopifyCli::Context.message("script.error.no_script_json_file_help"),
           }
         when Layers::Infrastructure::Errors::AppNotInstalledError
           {
@@ -141,49 +144,46 @@ module Script
             cause_of_error: ShopifyCli::Context.message("script.error.build_error_cause"),
             help_suggestion: ShopifyCli::Context.message("script.error.build_error_help"),
           }
-        when Layers::Infrastructure::Errors::ConfigUiSyntaxError
+        when Layers::Infrastructure::Errors::ScriptJsonSyntaxError
           {
-            cause_of_error: ShopifyCli::Context.message(
-              "script.error.config_ui_syntax_error_cause",
-              filename: e.message
-            ),
-            help_suggestion: ShopifyCli::Context.message("script.error.config_ui_syntax_error_help"),
+            cause_of_error: ShopifyCli::Context.message("script.error.configuration_syntax_error_cause"),
+            help_suggestion: ShopifyCli::Context.message("script.error.configuration_syntax_error_help"),
           }
-        when Layers::Infrastructure::Errors::ConfigUiMissingKeysError
+        when Layers::Infrastructure::Errors::ScriptJsonMissingKeysError
           {
             cause_of_error: ShopifyCli::Context.message(
-              "script.error.config_ui_missing_keys_error_cause",
-              filename: e.filename,
+              "script.error.configuration_missing_keys_error_cause",
               missing_keys: e.missing_keys
             ),
-            help_suggestion: ShopifyCli::Context.message("script.error.config_ui_missing_keys_error_help"),
+            help_suggestion: ShopifyCli::Context.message("script.error.configuration_missing_keys_error_help"),
           }
-        when Layers::Infrastructure::Errors::ConfigUiInvalidInputModeError
+        when Layers::Infrastructure::Errors::ScriptJsonInvalidValueError
           {
             cause_of_error: ShopifyCli::Context.message(
-              "script.error.config_ui_invalid_input_mode_error_cause",
-              filename: e.filename,
+              "script.error.configuration_invalid_value_error_cause",
               valid_input_modes: e.valid_input_modes
             ),
-            help_suggestion: ShopifyCli::Context.message("script.error.config_ui_invalid_input_mode_error_help"),
+            help_suggestion: ShopifyCli::Context.message("script.error.configuration_invalid_value_error_help"),
           }
-        when Layers::Infrastructure::Errors::ConfigUiFieldsMissingKeysError
+        when Layers::Infrastructure::Errors::ScriptJsonFieldsMissingKeysError
           {
             cause_of_error: ShopifyCli::Context.message(
-              "script.error.config_ui_fields_missing_keys_error_cause",
-              filename: e.filename,
+              "script.error.configuration_schema_field_missing_keys_error_cause",
               missing_keys: e.missing_keys
             ),
-            help_suggestion: ShopifyCli::Context.message("script.error.config_ui_fields_missing_keys_error_help"),
+            help_suggestion: ShopifyCli::Context.message(
+              "script.error.configuration_definition_schema_field_missing_keys_error_help"
+            ),
           }
-        when Layers::Infrastructure::Errors::ConfigUiFieldsInvalidTypeError
+        when Layers::Infrastructure::Errors::ScriptJsonFieldsInvalidValueError
           {
             cause_of_error: ShopifyCli::Context.message(
-              "script.error.config_ui_fields_invalid_type_error_cause",
-              filename: e.filename,
+              "script.error.configuration_schema_field_invalid_value_error_cause",
               valid_types: e.valid_types
             ),
-            help_suggestion: ShopifyCli::Context.message("script.error.config_ui_fields_invalid_type_error_help"),
+            help_suggestion: ShopifyCli::Context.message(
+              "script.error.configuration_schema_field_invalid_value_error_help"
+            ),
           }
         when Layers::Infrastructure::Errors::DependencyInstallError
           {
@@ -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