shopify-cli 1.8.0 → 1.12.0

data/lib/project_types/script/layers/domain/push_package.rb

@@ -5,9 +5,9 @@ module Script
     module Domain
       class PushPackage
         attr_reader :id,
+          :uuid,
           :extension_point_type,
           :script_name,
-          :description,
           :config_ui,
           :script_content,
           :compiled_type,
@@ -15,18 +15,18 @@ module Script
 
         def initialize(
           id:,
+          uuid:,
           extension_point_type:,
           script_name:,
-          description:,
           script_content:,
           compiled_type:,
           metadata:,
           config_ui:
         )
           @id = id
+          @uuid = uuid
           @extension_point_type = extension_point_type
           @script_name = script_name
-          @description = description
           @script_content = script_content
           @compiled_type = compiled_type
           @metadata = metadata
@@ -35,9 +35,9 @@ module Script
 
         def push(script_service, api_key, force)
           script_service.push(
+            uuid: @uuid,
             extension_point_type: @extension_point_type,
             script_name: @script_name,
-            description: @description,
             script_content: @script_content,
             compiled_type: @compiled_type,
             api_key: api_key,

data/lib/project_types/script/layers/domain/script_project.rb

@@ -0,0 +1,54 @@
+# frozen_string_literal: true
+
+module Script
+  module Layers
+    module Domain
+      class ScriptProject
+        include SmartProperties
+
+        UUID_ENV_KEY = "UUID"
+
+        property! :id, accepts: String
+        property :env, accepts: ShopifyCli::Resources::EnvFile
+
+        property! :extension_point_type, accepts: String
+        property! :script_name, accepts: String
+        property! :language, accepts: String
+
+        property :config_ui, accepts: ConfigUi
+
+        def initialize(*)
+          super
+
+          ShopifyCli::Core::Monorail.metadata = {
+            "script_name" => script_name,
+            "extension_point_type" => extension_point_type,
+            "language" => language,
+          }
+        end
+
+        def api_key
+          env&.api_key
+        end
+
+        def api_secret
+          env&.secret
+        end
+
+        def uuid
+          uuid_defined? && !raw_uuid.empty? ? raw_uuid : nil
+        end
+
+        def uuid_defined?
+          !raw_uuid.nil?
+        end
+
+        private
+
+        def raw_uuid
+          env&.extra&.[](UUID_ENV_KEY)
+        end
+      end
+    end
+  end
+end

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

@@ -12,7 +12,7 @@ module Script
 
         BOOTSTRAP = "npx --no-install shopify-scripts-toolchain-as bootstrap --from %{extension_point} --dest %{base}"
         BUILD = "shopify-scripts-toolchain-as build --src src/shopify_main.ts " \
-        "--binary build/%{script_name}.wasm --metadata build/metadata.json"
+        "--binary build/script.wasm --metadata build/metadata.json"
         MIN_NODE_VERSION = "14.5.0"
         ASC_ARGS = "-- --lib node_modules --optimize --use Date="
 
@@ -22,25 +22,25 @@ module Script
         end
 
         def bootstrap
-          out, status = ctx.capture2e(bootstap_command)
-          raise Domain::Errors::ServiceFailureError, out unless status.success?
+          command_runner.call(bootstap_command)
         end
 
         private
 
+        def command_runner
+          @command_runner ||= CommandRunner.new(ctx: ctx)
+        end
+
         def write_npmrc
-          ctx.system(
-            "npm", "--userconfig", "./.npmrc", "config", "set", "@shopify:registry", "https://registry.npmjs.com"
-          )
-          ctx.system(
-            "npm", "--userconfig", "./.npmrc", "config", "set", "engine-strict", "true"
-          )
+          command_runner.call("npm --userconfig ./.npmrc config set @shopify:registry https://registry.npmjs.com")
+          command_runner.call("npm --userconfig ./.npmrc config set engine-strict true")
         end
 
         def extension_point_version
-          out, status = ctx.capture2e("npm show #{extension_point.sdks.assemblyscript.package} version --json")
-          raise Domain::Errors::ServiceFailureError, out unless status.success?
-          JSON.parse(out)
+          return extension_point.sdks.assemblyscript.version if extension_point.sdks.assemblyscript.versioned?
+
+          out = command_runner.call("npm show #{extension_point.sdks.assemblyscript.package} version --json")
+          "^#{JSON.parse(out)}"
         end
 
         def write_package_json
@@ -51,7 +51,7 @@ module Script
               "devDependencies": {
                 "@shopify/scripts-sdk-as": "#{extension_point.sdks.assemblyscript.sdk_version}",
                 "@shopify/scripts-toolchain-as": "#{extension_point.sdks.assemblyscript.toolchain_version}",
-                "#{extension_point.sdks.assemblyscript.package}": "^#{extension_point_version}",
+                "#{extension_point.sdks.assemblyscript.package}": "#{extension_point_version}",
                 "@as-pect/cli": "^6.0.0",
                 "assemblyscript": "^0.18.13"
               },
@@ -81,13 +81,12 @@ module Script
 
         def build_command
           type = extension_point.dasherize_type
-          base_command = format(BUILD, script_name: script_name)
           domain = extension_point.domain
 
           if domain.nil?
-            "#{base_command} #{ASC_ARGS}"
+            "#{BUILD} #{ASC_ARGS}"
           else
-            "#{base_command} --domain #{domain} --ep #{type} #{ASC_ARGS}"
+            "#{BUILD} --domain #{domain} --ep #{type} #{ASC_ARGS}"
           end
         end
       end

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

@@ -63,9 +63,7 @@ module Script
 
         def compile
           check_compilation_dependencies!
-
-          out, status = ctx.capture2e(SCRIPT_SDK_BUILD)
-          raise Domain::Errors::ServiceFailureError, out unless status.success?
+          CommandRunner.new(ctx: ctx).call(SCRIPT_SDK_BUILD)
         end
 
         def check_compilation_dependencies!
@@ -81,11 +79,19 @@ module Script
         end
 
         def bytecode
-          blob = format(BYTECODE_FILE, name: script_name)
-          raise Errors::WebAssemblyBinaryNotFoundError unless @ctx.file_exist?(blob)
+          legacy_filename = format(BYTECODE_FILE, name: script_name)
+          filename = format(BYTECODE_FILE, name: "script")
+
+          bytecode_file = if ctx.file_exist?(filename)
+            filename
+          elsif ctx.file_exist?(legacy_filename)
+            legacy_filename
+          else
+            raise Errors::WebAssemblyBinaryNotFoundError
+          end
 
-          contents = File.read(blob)
-          @ctx.rm(blob)
+          contents = ctx.binread(bytecode_file)
+          ctx.rm(bytecode_file)
 
           contents
         end

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

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module Script
+  module Layers
+    module Infrastructure
+      class CommandRunner
+        include SmartProperties
+
+        property! :ctx, accepts: ShopifyCli::Context
+
+        def call(cmd)
+          out, status = ctx.capture2e(cmd)
+          raise Errors::SystemCallFailureError.new(out: out.chomp, cmd: cmd) unless status.success?
+          out
+        end
+      end
+    end
+  end
+end

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

@@ -5,8 +5,6 @@ module Script
     module Infrastructure
       module Errors
         class AppNotInstalledError < ScriptProjectError; end
-        class AppScriptNotPushedError < ScriptProjectError; end
-        class AppScriptUndefinedError < ScriptProjectError; end
         class BuildError < ScriptProjectError; end
         class ConfigUiSyntaxError < ScriptProjectError; end
 
@@ -19,6 +17,15 @@ module Script
           end
         end
 
+        class ConfigUiInvalidInputModeError < ScriptProjectError
+          attr_reader :filename, :valid_input_modes
+          def initialize(filename, valid_input_modes)
+            super()
+            @filename = filename
+            @valid_input_modes = valid_input_modes
+          end
+        end
+
         class ConfigUiFieldsMissingKeysError < ScriptProjectError
           attr_reader :filename, :missing_keys
           def initialize(filename, missing_keys)
@@ -28,9 +35,29 @@ module Script
           end
         end
 
+        class ConfigUiFieldsInvalidTypeError < ScriptProjectError
+          attr_reader :filename, :valid_types
+          def initialize(filename, valid_types)
+            super()
+            @filename = filename
+            @valid_types = valid_types
+          end
+        end
+
         class DependencyInstallError < ScriptProjectError; end
+        class DeprecatedEPError < ScriptProjectError; end
         class EmptyResponseError < ScriptProjectError; end
         class ForbiddenError < ScriptProjectError; end
+        class InvalidContextError < ScriptProjectError; end
+
+        class InvalidLanguageError < ScriptProjectError
+          attr_reader :language, :extension_point_type
+          def initialize(language, extension_point_type)
+            super()
+            @language = language
+            @extension_point_type = extension_point_type
+          end
+        end
 
         class GraphqlError < ScriptProjectError
           attr_reader :errors
@@ -42,23 +69,25 @@ module Script
 
         class ProjectCreatorNotFoundError < ScriptProjectError; end
 
-        class ScriptRepushError < ScriptProjectError
-          attr_reader :api_key
-          def initialize(api_key)
+        class SystemCallFailureError < ScriptProjectError
+          attr_reader :out, :cmd
+          def initialize(out:, cmd:)
             super()
-            @api_key = api_key
+            @out = out
+            @cmd = cmd
           end
         end
 
-        class ScriptServiceUserError < ScriptProjectError
-          def initialize(query_name, errors)
-            super("Failed performing #{query_name}. Errors: #{errors}.")
+        class ScriptRepushError < ScriptProjectError
+          attr_reader :uuid
+          def initialize(uuid)
+            super()
+            @uuid = uuid
           end
         end
 
+        class ScriptProjectAlreadyExistsError < ScriptProjectError; end
         class ShopAuthenticationError < ScriptProjectError; end
-        class ShopScriptConflictError < ScriptProjectError; end
-        class ShopScriptUndefinedError < ScriptProjectError; end
         class TaskRunnerNotFoundError < ScriptProjectError; end
         class BuildScriptNotFoundError < ScriptProjectError; end
         class InvalidBuildScriptError < ScriptProjectError; end

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

@@ -7,37 +7,36 @@ module Script
         include SmartProperties
         property! :ctx, accepts: ShopifyCli::Context
 
-        def create_push_package(script_project:, script_content:, compiled_type:, metadata:, config_ui:)
-          build_file_path = file_path(script_project.script_name, compiled_type)
+        def create_push_package(script_project:, script_content:, compiled_type:, metadata:)
+          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,
-            description: script_project.description,
             script_content: script_content,
             compiled_type: compiled_type,
             metadata: metadata,
-            config_ui: config_ui,
+            config_ui: script_project.config_ui,
           )
         end
 
-        def get_push_package(script_project:, compiled_type:, metadata:, config_ui:)
-          build_file_path = file_path(script_project.script_name, compiled_type)
+        def get_push_package(script_project:, compiled_type:, metadata:)
+          build_file_path = file_path(script_project.id, compiled_type)
           raise Domain::PushPackageNotFoundError unless ctx.file_exist?(build_file_path)
 
-          script_content = File.read(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,
-            description: script_project.description,
             script_content: script_content,
             compiled_type: compiled_type,
             metadata: metadata,
-            config_ui: config_ui,
+            config_ui: script_project.config_ui,
           )
         end
 
@@ -45,11 +44,11 @@ module Script
 
         def write_to_path(path, content)
           ctx.mkdir_p(File.dirname(path))
-          ctx.write(path, content)
+          ctx.binwrite(path, content)
         end
 
-        def file_path(script_name, compiled_type)
-          "#{ScriptProject.current.directory}/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/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,16 +42,15 @@ 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)
 
-          File.read(binary_path)
+          ctx.binread(binary_path)
         end
       end
     end