shopify-cli 1.10.0 → 1.11.0

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

@@ -27,28 +27,27 @@ module Script
 
         private
 
+        def command_runner
+          @command_runner ||= CommandRunner.new(ctx: ctx)
+        end
+
         def git_init
-          out, status = ctx.capture2e("git init")
-          raise Domain::Errors::ServiceFailureError, out unless status.success?
+          command_runner.call("git init")
         end
 
         def setup_remote
           repo = extension_point.sdks.rust.package
-          out, status = ctx.capture2e("git remote add -f origin #{repo}")
-          raise Domain::Errors::ServiceFailureError, out unless status.success?
+          command_runner.call("git remote add -f origin #{repo}")
         end
 
         def setup_sparse_checkout
           type = extension_point.type
-          out, status = ctx.capture2e("git config core.sparsecheckout true")
-          raise Domain::Errors::ServiceFailureError, out unless status.success?
-          out, status = ctx.capture2e("echo #{type}/#{SAMPLE_PATH} >> .git/info/sparse-checkout")
-          raise Domain::Errors::ServiceFailureError, out unless status.success?
+          command_runner.call("git config core.sparsecheckout true")
+          command_runner.call("echo #{type}/#{SAMPLE_PATH} >> .git/info/sparse-checkout")
         end
 
         def pull
-          out, status = ctx.capture2e("git pull origin #{ORIGIN_BRANCH}")
-          raise Domain::Errors::ServiceFailureError, out unless status.success?
+          command_runner.call("git pull origin #{ORIGIN_BRANCH}")
         end
 
         def clean

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

@@ -3,14 +3,14 @@ module Script
   module Layers
     module Infrastructure
       class RustTaskRunner
-        attr_reader :ctx, :script_name
+        attr_reader :ctx
 
         BUILD_TARGET = "wasm32-unknown-unknown"
         METADATA_FILE = "build/metadata.json"
+        CARGO_BUILD_CMD = "cargo build --target=#{BUILD_TARGET} --release"
 
-        def initialize(ctx, script_name)
+        def initialize(ctx, _)
           @ctx = ctx
-          @script_name = script_name
         end
 
         def dependencies_installed?
@@ -42,12 +42,11 @@ module Script
         private
 
         def compile
-          out, status = ctx.capture2e("cargo build --target=#{BUILD_TARGET} --release")
-          raise Domain::Errors::ServiceFailureError, out unless status.success?
+          CommandRunner.new(ctx: ctx).call(CARGO_BUILD_CMD)
         end
 
         def bytecode
-          binary_name = "#{script_name}.wasm"
+          binary_name = "script.wasm"
           binary_path = "target/#{BUILD_TARGET}/release/#{binary_name}"
           raise Errors::WebAssemblyBinaryNotFoundError unless ctx.file_exist?(binary_path)
 

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

@@ -13,15 +13,9 @@ module Script
         def create(script_name:, extension_point_type:, language:, no_config_ui:)
           validate_metadata!(extension_point_type, language)
 
-          optional_identifiers = {}
           config_ui_file = nil
-
-          unless no_config_ui
-            optional_identifiers.merge!(config_ui_file: DEFAULT_CONFIG_UI_FILENAME)
-            config_ui_file = ConfigUiRepository
-              .new(ctx: ctx)
-              .create(DEFAULT_CONFIG_UI_FILENAME, default_config_ui_content(script_name))
-          end
+          optional_identifiers = {}
+          optional_identifiers.merge!(config_ui_file: DEFAULT_CONFIG_UI_FILENAME) unless no_config_ui
 
           ShopifyCli::Project.write(
             ctx,
@@ -131,17 +125,6 @@ module Script
           @project ||= ShopifyCli::Project.current(force_reload: true)
         end
 
-        def default_config_ui_content(title)
-          require "yaml" # takes 20ms, so deferred as late as possible.
-          YAML.dump({
-            "version" => 1,
-            "inputMode" => "single",
-            "title" => title,
-            "description" => "",
-            "fields" => [],
-          })
-        end
-
         def default_language
           Domain::ExtensionPoint::ExtensionPointAssemblyScriptSDK.language
         end
@@ -158,15 +141,6 @@ module Script
           include SmartProperties
           property! :ctx, accepts: ShopifyCli::Context
 
-          def create(filename, content)
-            File.write(filename, content)
-
-            Domain::ConfigUi.new(
-              filename: filename,
-              content: content,
-            )
-          end
-
           def get(filename)
             return nil unless filename
 

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

@@ -40,7 +40,7 @@ module Script
           return resp_hash["data"]["appScriptUpdateOrCreate"]["appScript"]["uuid"] if user_errors.empty?
 
           if user_errors.any? { |e| e["tag"] == "already_exists_error" }
-            raise Errors::ScriptRepushError, api_key
+            raise Errors::ScriptRepushError, uuid
           elsif (e = user_errors.any? { |err| err["tag"] == "config_ui_syntax_error" })
             raise Errors::ConfigUiSyntaxError, config_ui&.filename
           elsif (e = user_errors.find { |err| err["tag"] == "config_ui_missing_keys_error" })

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

@@ -78,8 +78,8 @@ module Script
 
           script_not_found_cause: "Couldn't find script %s for extension point %s",
 
-          service_failure_cause: "Internal service error.",
-          service_failure_help: "Ensure the 'shopify/scripts-toolchain-as' package is up to date.",
+          system_call_failure_cause: "An error was returned while running {{command:%{cmd}}}.",
+          system_call_failure_help: "Review the following error and try again.\n{{red:%{out}}}",
 
           metadata_validation_cause: "Invalid script extension metadata.",
           metadata_validation_help: "Ensure the 'shopify/scripts-toolchain-as' package is up to date.",
@@ -113,7 +113,7 @@ module Script
           graphql_error_cause: "An error was returned: %s.",
           graphql_error_help: "\nReview the error and try again.",
 
-          script_repush_cause: "A script with the same extension point already exists on app (API key: %s).",
+          script_repush_cause: "A script with this UUID already exists (UUID: %s).",
           script_repush_help: "Use {{cyan:--force}} to replace the existing script.",
 
           shop_auth_cause: "Unable to authenticate with the store.",
@@ -193,9 +193,11 @@ module Script
           enabling: "Enabling",
           enabled: "Enabled",
           ensure_env: {
+            organization: "Partner organization {{green:%s (%s)}}.",
             organization_select: "Which partner organization do you want to use?",
+            app: "Script will be pushed to app {{green:%s}}.",
             app_select: "Which app do you want to push this script to?",
-            ask_connect_to_existing_script: "This app has some scripts. Do you want to replace any of the "\
+            ask_connect_to_existing_script: "The selected app has some scripts. Do you want to replace any of the "\
               "existing scripts with the current script?",
             ask_which_script_to_connect_to: "Which script do you want to replace?",
           },

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

@@ -33,7 +33,9 @@ module Script
 
         orgs = ShopifyCli::PartnersAPI::Organizations.fetch_with_app(ctx)
         if orgs.count == 1
-          orgs.first
+          default = orgs.first
+          ctx.puts(ctx.message("script.application.ensure_env.organization", default["businessName"], default["id"]))
+          default
         elsif orgs.count > 0
           CLI::UI::Prompt.ask(ctx.message("script.application.ensure_env.organization_select")) do |handler|
             orgs.each do |org|
@@ -46,8 +48,14 @@ module Script
       end
 
       def ask_app(apps)
+        unless ShopifyCli::Shopifolk.acting_as_shopify_organization?
+          apps = apps.select { |app| app["appType"] == "custom" }
+        end
+
         if apps.count == 1
-          apps.first
+          default = apps.first
+          ctx.puts(ctx.message("script.application.ensure_env.app", default["title"]))
+          default
         elsif apps.count > 0
           CLI::UI::Prompt.ask(ctx.message("script.application.ensure_env.app_select")) do |handler|
             apps.each do |app|

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

@@ -110,11 +110,6 @@ module Script
               e.extension_point_type
             ),
           }
-        when Layers::Domain::Errors::ServiceFailureError
-          {
-            cause_of_error: ShopifyCli::Context.message("script.error.service_failure_cause"),
-            help_suggestion: ShopifyCli::Context.message("script.error.service_failure_help"),
-          }
         when Layers::Domain::Errors::MetadataValidationError
           {
             cause_of_error: ShopifyCli::Context.message("script.error.metadata_validation_cause"),
@@ -211,9 +206,15 @@ module Script
             ),
             help_suggestion: ShopifyCli::Context.message("script.error.graphql_error_help"),
           }
+        when Layers::Infrastructure::Errors::SystemCallFailureError
+          {
+            cause_of_error: ShopifyCli::Context
+              .message("script.error.system_call_failure_cause", cmd: e.cmd),
+            help_suggestion: ShopifyCli::Context.message("script.error.system_call_failure_help", out: e.out),
+          }
         when Layers::Infrastructure::Errors::ScriptRepushError
           {
-            cause_of_error: ShopifyCli::Context.message("script.error.script_repush_cause", e.api_key),
+            cause_of_error: ShopifyCli::Context.message("script.error.script_repush_cause", e.uuid),
             help_suggestion: ShopifyCli::Context.message("script.error.script_repush_help"),
           }
         when Layers::Infrastructure::Errors::ShopAuthenticationError

data/lib/shopify-cli/messages/messages.rb

@@ -16,8 +16,8 @@ module ShopifyCli
       core: {
         connect: {
           help: <<~HELP,
-          Connect (or re-connect) an existing project to a Shopify partner organization and/or a store. Creates or updates the {{green:.env}} file, and creates the {{green:.shopify-cli.yml}} file.
-            Usage: {{command:%s connect}}
+            Connect (or re-connect) an existing project to a Shopify partner organization and/or a store. Creates or updates the {{green:.env}} file, and creates the {{green:.shopify-cli.yml}} file.
+              Usage: {{command:%s connect}}
           HELP
 
           already_connected_warning: "{{yellow:! This app appears to be already connected}}",
@@ -27,15 +27,15 @@ module ShopifyCli
 
         context: {
           open_url: <<~OPEN,
-          Please open this URL in your browser:
-          {{green:%s}}
+            Please open this URL in your browser:
+            {{green:%s}}
           OPEN
         },
 
         create: {
           help: <<~HELP,
-          Create a new project.
-            Usage: {{command:%s create [ %s ]}}
+            Create a new project.
+              Usage: {{command:%s create [ %s ]}}
           HELP
 
           error: {
@@ -53,13 +53,13 @@ module ShopifyCli
 
         config: {
           help: <<~HELP,
-          Change configuration of how the CLI operates
-            Usage: {{command:%s config [ feature | analytics ] }}
+            Change configuration of how the CLI operates
+              Usage: {{command:%s config [ feature | analytics ] }}
           HELP
           feature: {
             help: <<~HELP,
-            Change configuration of various features
-              Usage: {{command:%s config [ feature ] [ feature_name ] }}
+              Change configuration of various features
+                Usage: {{command:%s config [ feature ] [ feature_name ] }}
             HELP
             enabled: "{{v}} feature {{green:%s}} has been enabled",
             disabled: "{{v}} feature {{green:%s}} has been disabled",
@@ -68,8 +68,8 @@ module ShopifyCli
           },
           analytics: {
             help: <<~HELP,
-            Opt in/out of anonymous usage reporting
-              Usage: {{command:%s config [ analytics ] }}
+              Opt in/out of anonymous usage reporting
+                Usage: {{command:%s config [ analytics ] }}
             HELP
             enabled: "{{v}} analytics have been enabled",
             disabled: "{{v}} analytics have been disabled",
@@ -97,9 +97,9 @@ module ShopifyCli
           },
 
           preamble: <<~MESSAGE,
-          Use {{command:%s help <command>}} to display detailed information about a specific command.
+            Use {{command:%s help <command>}} to display detailed information about a specific command.
 
-          {{bold:Available core commands:}}
+            {{bold:Available core commands:}}
 
           MESSAGE
         },
@@ -131,8 +131,8 @@ module ShopifyCli
 
         logout: {
           help: <<~HELP,
-          Log out of a currently authenticated partner organization and store, or clear invalid credentials
-            Usage: {{command:%s logout}}
+            Log out of a currently authenticated partner organization and store, or clear invalid credentials
+              Usage: {{command:%s logout}}
           HELP
 
           success: "Logged out of partner organization and store",
@@ -154,6 +154,7 @@ module ShopifyCli
           location: {
             admin: "development store",
             partner: "Shopify Partners account",
+            shopifolk: "{{green:Shopify Employee account}}",
           },
           authentication_required:
             "{{i}} Authentication required. Login to the URL below with your %s credentials to continue.",
@@ -175,8 +176,8 @@ module ShopifyCli
           org_name_and_id: "%s (%s)",
           error: {
             account_not_found: <<~MESSAGE,
-            {{x}} error: Your account was not found. Please sign up at https://partners.shopify.com/signup
-            For authentication issues, run {{command:%s logout}} to clear invalid credentials
+              {{x}} error: Your account was not found. Please sign up at https://partners.shopify.com/signup
+              For authentication issues, run {{command:%s logout}} to clear invalid credentials
             MESSAGE
           },
         },
@@ -196,16 +197,16 @@ module ShopifyCli
           },
           populating: "Populating %d %ss...",
           completion_message: <<~COMPLETION_MESSAGE,
-          Successfully added %d %s to {{green:%s}}
-          {{*}} View all %ss at {{underline:%s%ss}}
+            Successfully added %d %s to {{green:%s}}
+            {{*}} View all %ss at {{underline:%s%ss}}
           COMPLETION_MESSAGE
         },
 
         project: {
           error: {
             not_in_project: <<~MESSAGE,
-            {{x}} You are not in a Shopify app project
-            {{yellow:{{*}}}}{{reset: Run}}{{cyan: shopify create}}{{reset: to create your app}}
+              {{x}} You are not in a Shopify app project
+              {{yellow:{{*}}}}{{reset: Run}}{{cyan: shopify create}}{{reset: to create your app}}
             MESSAGE
           },
         },
@@ -226,10 +227,10 @@ module ShopifyCli
 
         system: {
           help: <<~HELP,
-          Print details about the development system.
-            Usage: {{command:%s system [all]}}
+            Print details about the development system.
+              Usage: {{command:%s system [all]}}
 
-          {{cyan:all}}: displays more details about development system and environment
+            {{cyan:all}}: displays more details about development system and environment
 
           HELP
 
@@ -240,8 +241,8 @@ module ShopifyCli
           header: "{{bold:Shopify App CLI}}",
           const: "%17s = %s",
           ruby_header: <<~RUBY_MESSAGE,
-          {{bold:Ruby (via RbConfig)}}
-            %s
+            {{bold:Ruby (via RbConfig)}}
+              %s
           RUBY_MESSAGE
           rb_config: "%-25s - RbConfig[\"%s\"]",
           command_header: "{{bold:Commands}}",
@@ -268,8 +269,8 @@ module ShopifyCli
           ensure_env: {
             organization_select: "To which partner organization does this project belong?",
             no_development_stores: <<~MESSAGE,
-            No development stores available.
-            Visit {{underline:https://partners.shopify.com/%d/stores}} to create one
+              No development stores available.
+              Visit {{underline:https://partners.shopify.com/%d/stores}} to create one
             MESSAGE
             development_store_select: "Which development store would you like to use?",
             app_select: "To which app does this project belong?",
@@ -306,7 +307,10 @@ module ShopifyCli
               no_development_stores: "{{x}} No Development Stores available.",
               no_organizations: "No partner organizations available.",
               organization_not_found: "Cannot find a partner organization with that ID",
-              partners_notice: "Please visit https://partners.shopify.com/ to create a partners account",
+              shopifolk_notice: <<~MESSAGE,
+                {{i}} As a {{green:Shopify}} employee, the authentication should take you to the Shopify Okta login,
+                NOT the Partner account login. Please run {{command:%s logout}} and try again.
+              MESSAGE
             },
             first_party: "Are you working on a 1P (1st Party) app?",
             identified_as_shopify: "We've identified you as a {{green:Shopify}} employee.",
@@ -327,9 +331,9 @@ module ShopifyCli
 
           not_running: "{{green:x}} ngrok tunnel not running",
           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 tunnel auth <token>}}.
+            {{*}} 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 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",
@@ -341,31 +345,31 @@ module ShopifyCli
 
         version: {
           help: <<~HELP,
-          Prints version number.
-            Usage: {{command:%s version}}
+            Prints version number.
+              Usage: {{command:%s version}}
           HELP
         },
 
         warning: {
           development_version: <<~DEVELOPMENT,
-          {{*}} {{yellow:You are running a development version of the CLI at:}}
-            {{yellow:%s}}
+            {{*}} {{yellow:You are running a development version of the CLI at:}}
+              {{yellow:%s}}
 
           DEVELOPMENT
 
           shell_shim: <<~MESSAGE,
-          {{x}} This version of Shopify App CLI is no longer supported. You’ll need to migrate to the new CLI version to continue.
+            {{x}} This version of Shopify App CLI is no longer supported. You’ll need to migrate to the new CLI version to continue.
 
-            Please visit this page for complete instructions:
-            {{underline:https://shopify.dev/tools/cli/troubleshooting#migrate-from-a-legacy-version}}
+              Please visit this page for complete instructions:
+              {{underline:https://shopify.dev/tools/cli/troubleshooting#migrate-from-a-legacy-version}}
 
           MESSAGE
 
           new_version: <<~MESSAGE,
-          {{*}} {{yellow:A new version of Shopify App CLI is available! You have version %s and the latest version is %s.
+            {{*}} {{yellow:A new version of Shopify App CLI is available! You have version %s and the latest version is %s.
 
-            To upgrade, follow the instructions for the package manager you’re using:
-            {{underline:https://shopify.dev/tools/cli/troubleshooting#upgrade-shopify-app-cli}}}}
+              To upgrade, follow the instructions for the package manager you’re using:
+              {{underline:https://shopify.dev/tools/cli/troubleshooting#upgrade-shopify-app-cli}}}}
 
           MESSAGE
         },

data/lib/shopify-cli/method_object.rb

@@ -52,8 +52,8 @@ module ShopifyCli
       # invokes the original `call` implementation and wraps its return value
       # into a result object.
       #
-      def call(*args, **kwargs)
-        Result.wrap { super(*args, **kwargs) }.call
+      def call(*args, **kwargs, &block)
+        Result.wrap { kwargs.any? ? super(*args, **kwargs, &block) : super(*args, &block) }.call
       end
     end
 
@@ -64,10 +64,10 @@ module ShopifyCli
       # initializer or to `call`. If the keyword argument matches the name of
       # property, it is forwarded to the initializer, otherwise to call.
       #
-      def call(*args, **kwargs)
+      def call(*args, **kwargs, &block)
         properties.keys.yield_self do |properties|
           new(**kwargs.slice(*properties))
-            .call(*args, **kwargs.slice(*(kwargs.keys - properties)))
+            .call(*args, **kwargs.slice(*(kwargs.keys - properties)), &block)
         end
       end