shopify-cli 1.9.0 → 1.13.0

data/lib/project_types/script/layers/infrastructure/languages/project_creator.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+module Script
+  module Layers
+    module Infrastructure
+      module Languages
+        class ProjectCreator
+          PROJECT_CREATORS = {
+            "assemblyscript" => AssemblyScriptProjectCreator,
+            "rust" => RustProjectCreator,
+          }
+
+          def self.for(ctx, language, extension_point, script_name, path_to_project)
+            raise Errors::ProjectCreatorNotFoundError unless PROJECT_CREATORS[language]
+            PROJECT_CREATORS[language].new(
+              ctx: ctx,
+              extension_point: extension_point,
+              script_name: script_name,
+              path_to_project: path_to_project
+            )
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,73 @@
+# frozen_string_literal: true
+
+module Script
+  module Layers
+    module Infrastructure
+      module Languages
+        class RustProjectCreator
+          include SmartProperties
+          property! :ctx, accepts: ShopifyCli::Context
+          property! :extension_point, accepts: Domain::ExtensionPoint
+          property! :script_name, accepts: String
+          property! :path_to_project, accepts: String
+
+          ORIGIN_BRANCH = "main"
+          SAMPLE_PATH = "default"
+
+          def setup_dependencies
+            git_init
+            setup_remote
+            setup_sparse_checkout
+            pull
+            clean
+            set_script_name
+          end
+
+          def bootstrap
+          end
+
+          private
+
+          def command_runner
+            @command_runner ||= CommandRunner.new(ctx: ctx)
+          end
+
+          def git_init
+            command_runner.call("git init")
+          end
+
+          def setup_remote
+            repo = extension_point.sdks.rust.package
+            command_runner.call("git remote add -f origin #{repo}")
+          end
+
+          def setup_sparse_checkout
+            type = extension_point.type
+            command_runner.call("git config core.sparsecheckout true")
+            command_runner.call("echo #{type}/#{SAMPLE_PATH} >> .git/info/sparse-checkout")
+          end
+
+          def pull
+            command_runner.call("git pull origin #{ORIGIN_BRANCH}")
+          end
+
+          def clean
+            type = extension_point.type
+            ctx.rm_rf(".git")
+            source = File.join(path_to_project, File.join(type, SAMPLE_PATH))
+            FileUtils.copy_entry(source, path_to_project)
+            ctx.rm_rf(type)
+          end
+
+          def set_script_name
+            config_file = "Cargo.toml"
+            upstream_name = "#{extension_point.type.gsub("_", "-")}-default"
+            contents = File.read(config_file)
+            new_contents = contents.sub(upstream_name, script_name)
+            File.write(config_file, new_contents)
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,60 @@
+# frozen_string_literal: true
+module Script
+  module Layers
+    module Infrastructure
+      module Languages
+        class RustTaskRunner
+          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, _)
+            @ctx = ctx
+          end
+
+          def dependencies_installed?
+            true
+          end
+
+          def install_dependencies
+          end
+
+          def build
+            compile
+            bytecode
+          end
+
+          def compiled_type
+            "wasm"
+          end
+
+          def metadata
+            unless @ctx.file_exist?(METADATA_FILE)
+              msg = @ctx.message("script.error.metadata_not_found_cause", METADATA_FILE)
+              raise Domain::Errors::MetadataNotFoundError, msg
+            end
+
+            raw_contents = File.read(METADATA_FILE)
+            Domain::Metadata.create_from_json(@ctx, raw_contents)
+          end
+
+          private
+
+          def compile
+            CommandRunner.new(ctx: ctx).call(CARGO_BUILD_CMD)
+          end
+
+          def bytecode
+            binary_name = "script.wasm"
+            binary_path = "target/#{BUILD_TARGET}/release/#{binary_name}"
+            raise Errors::WebAssemblyBinaryNotFoundError unless ctx.file_exist?(binary_path)
+
+            ctx.binread(binary_path)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/project_types/script/layers/infrastructure/languages/task_runner.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+module Script
+  module Layers
+    module Infrastructure
+      module Languages
+        class TaskRunner
+          TASK_RUNNERS = {
+            "assemblyscript" => AssemblyScriptTaskRunner,
+            "rust" => RustTaskRunner,
+          }
+
+          def self.for(ctx, language, script_name)
+            raise Errors::TaskRunnerNotFoundError unless TASK_RUNNERS[language]
+            TASK_RUNNERS[language].new(ctx, script_name)
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -8,11 +8,12 @@ module Script
         property! :ctx, accepts: ShopifyCli::Context
 
         def create_push_package(script_project:, script_content:, compiled_type:, metadata:)
-          build_file_path = file_path(script_project.id, script_project.script_name, compiled_type)
+          build_file_path = file_path(script_project.id, compiled_type)
           write_to_path(build_file_path, script_content)
 
           Domain::PushPackage.new(
             id: build_file_path,
+            uuid: script_project.uuid,
             extension_point_type: script_project.extension_point_type,
             script_name: script_project.script_name,
             script_content: script_content,
@@ -23,13 +24,13 @@ module Script
         end
 
         def get_push_package(script_project:, compiled_type:, metadata:)
-          build_file_path = file_path(script_project.id, script_project.script_name, compiled_type)
+          build_file_path = file_path(script_project.id, compiled_type)
           raise Domain::PushPackageNotFoundError unless ctx.file_exist?(build_file_path)
 
           script_content = ctx.binread(build_file_path)
-
           Domain::PushPackage.new(
             id: build_file_path,
+            uuid: script_project.uuid,
             extension_point_type: script_project.extension_point_type,
             script_name: script_project.script_name,
             script_content: script_content,
@@ -46,8 +47,8 @@ module Script
           ctx.binwrite(path, content)
         end
 
-        def file_path(path_to_script, script_name, compiled_type)
-          "#{path_to_script}/build/#{script_name}.#{compiled_type}"
+        def file_path(path_to_script, compiled_type)
+          "#{path_to_script}/build/script.#{compiled_type}"
         end
       end
     end

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

@@ -8,19 +8,14 @@ module Script
         property! :ctx, accepts: ShopifyCli::Context
 
         DEFAULT_CONFIG_UI_FILENAME = "config-ui.yml"
+        MUTABLE_ENV_VALUES = %i(uuid)
 
         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,
@@ -43,11 +38,6 @@ module Script
         end
 
         def get
-          extension_point_type = project_config_value!("extension_point_type")
-          script_name = project_config_value!("script_name")
-          config_ui_file = project_config_value("config_ui_file")
-          language = project_config_value("language")&.downcase || default_language
-
           validate_metadata!(extension_point_type, language)
 
           config_ui = ConfigUiRepository.new(ctx: ctx).get(config_ui_file)
@@ -62,8 +52,65 @@ module Script
           )
         end
 
+        def update_env(**args)
+          capture_io do
+            args.slice(*MUTABLE_ENV_VALUES).each do |key, value|
+              project.env.extra[key.to_s.upcase] = value
+              project.env.update(ctx, :extra, project.env.extra)
+            end
+          end
+
+          Domain::ScriptProject.new(
+            id: ctx.root,
+            env: project.env,
+            script_name: script_name,
+            extension_point_type: extension_point_type,
+            language: language,
+            config_ui: ConfigUiRepository.new(ctx: ctx).get(config_ui_file),
+          )
+        end
+
+        def create_env(api_key:, secret:, uuid:)
+          ShopifyCli::Resources::EnvFile.new(
+            api_key: api_key,
+            secret: secret,
+            extra: {
+              Domain::ScriptProject::UUID_ENV_KEY => uuid,
+            }
+          ).write(ctx)
+
+          Domain::ScriptProject.new(
+            id: ctx.root,
+            env: project.env,
+            script_name: script_name,
+            extension_point_type: extension_point_type,
+            language: language,
+            config_ui: ConfigUiRepository.new(ctx: ctx).get(config_ui_file),
+          )
+        end
+
         private
 
+        def capture_io(&block)
+          CLI::UI::StdoutRouter::Capture.new(&block).run
+        end
+
+        def extension_point_type
+          project_config_value!("extension_point_type")
+        end
+
+        def script_name
+          project_config_value!("script_name")
+        end
+
+        def config_ui_file
+          project_config_value("config_ui_file")
+        end
+
+        def language
+          project_config_value("language")&.downcase || default_language
+        end
+
         def project_config_value(key)
           return nil unless project.config.key?(key)
           project.config[key]
@@ -75,18 +122,7 @@ module Script
         end
 
         def project
-          ShopifyCli::Project.current
-        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" => [],
-          })
+          @project ||= ShopifyCli::Project.current(force_reload: true)
         end
 
         def default_language
@@ -105,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

@@ -11,6 +11,7 @@ module Script
         property! :ctx, accepts: ShopifyCli::Context
 
         def push(
+          uuid:,
           extension_point_type:,
           script_name:,
           script_content:,
@@ -22,6 +23,7 @@ module Script
         )
           query_name = "app_script_update_or_create"
           variables = {
+            uuid: uuid,
             extensionPointName: extension_point_type.upcase,
             title: script_name,
             configUi: config_ui&.content,
@@ -35,16 +37,20 @@ module Script
           resp_hash = script_service_request(query_name: query_name, api_key: api_key, variables: variables)
           user_errors = resp_hash["data"]["appScriptUpdateOrCreate"]["userErrors"]
 
-          return resp_hash if user_errors.empty?
+          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" })
             raise Errors::ConfigUiMissingKeysError.new(config_ui&.filename, e["message"])
+          elsif (e = user_errors.find { |err| err["tag"] == "config_ui_invalid_input_mode_error" })
+            raise Errors::ConfigUiInvalidInputModeError.new(config_ui&.filename, e["message"])
           elsif (e = user_errors.find { |err| err["tag"] == "config_ui_fields_missing_keys_error" })
             raise Errors::ConfigUiFieldsMissingKeysError.new(config_ui&.filename, e["message"])
+          elsif (e = user_errors.find { |err| err["tag"] == "config_ui_fields_invalid_type_error" })
+            raise Errors::ConfigUiFieldsInvalidTypeError.new(config_ui&.filename, e["message"])
           elsif user_errors.find { |err| %w(not_use_msgpack_error schema_version_argument_error).include?(err["tag"]) }
             raise Domain::Errors::MetadataValidationError
           else
@@ -52,6 +58,12 @@ module Script
           end
         end
 
+        def get_app_scripts(api_key:, extension_point_type:)
+          query_name = "get_app_scripts"
+          variables = { appKey: api_key, extensionPointName: extension_point_type.upcase }
+          script_service_request(query_name: query_name, api_key: api_key, variables: variables)["data"]["appScripts"]
+        end
+
         private
 
         class ScriptServiceAPI < ShopifyCli::API

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

@@ -64,14 +64,22 @@ module Script
                                               "%{missing_keys}.",
           config_ui_missing_keys_error_help: "Add the keys and try again.",
 
+          config_ui_invalid_input_mode_error_cause: "The UI configuration file %{filename} only accept "\
+                                              "one of the following input mode(s): %{valid_input_modes}.",
+          config_ui_invalid_input_mode_error_help: "Change the input modes and try again.",
+
           config_ui_fields_missing_keys_error_cause: "A field entry in the UI configuration file %{filename} is "\
                                                      "missing required keys: %{missing_keys}.",
           config_ui_fields_missing_keys_error_help: "Add the keys and try again.",
 
+          config_ui_fields_invalid_type_error_cause: "The UI configuration file %{filename} fields only accept "\
+                                                     "one of the following type(s): %{valid_types}.",
+          config_ui_fields_invalid_type_error_help: "Change the types and try again.",
+
           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.",
@@ -105,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.",
@@ -184,6 +192,15 @@ module Script
           disabled: "Disabled",
           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: "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?",
+          },
         },
       },
     }.freeze