shopify-cli 2.10.0 → 2.11.1

data/lib/project_types/script/layers/application/project_dependencies.rb

@@ -3,7 +3,7 @@ module Script
     module Application
       class ProjectDependencies
         def self.install(ctx:, task_runner:)
-          CLI::UI::Frame.open(ctx.message("script.project_deps.checking_with_npm")) do
+          CLI::UI::Frame.open(ctx.message("script.project_deps.checking")) do
             begin
               if task_runner.dependencies_installed?
                 ctx.puts(ctx.message("script.project_deps.none_required"))

data/lib/project_types/script/layers/application/push_script.rb

@@ -10,48 +10,56 @@ module Script
             script_project = script_project_repo.get
             script_project.env = project.env
             task_runner = Infrastructure::Languages::TaskRunner
-              .for(ctx, script_project.language, script_project.script_name)
+              .for(ctx, script_project.language)
 
             extension_point = ExtensionPoints.get(type: script_project.extension_point_type)
-            library_name = extension_point.libraries.for(script_project.language)&.package
+
+            library = extension_point.libraries.for(script_project.language)
+
             raise Infrastructure::Errors::LanguageLibraryForAPINotFoundError.new(
               language: script_project.language,
               api: script_project.extension_point_type
-            ) unless library_name
+            ) if library.nil? && (script_project.language != "wasm")
 
-            library = {
+            library_name = library&.package
+            library_data = {
               language: script_project.language,
               version: task_runner.library_version(library_name),
-            }
+            } if library_name
 
             ProjectDependencies.install(ctx: ctx, task_runner: task_runner)
-            BuildScript.call(ctx: ctx, task_runner: task_runner, script_project: script_project, library: library)
-
-            UI::PrintingSpinner.spin(ctx, ctx.message("script.application.pushing")) do |p_ctx, spinner|
-              package = Infrastructure::PushPackageRepository.new(ctx: p_ctx).get_push_package(
-                script_project: script_project,
-                compiled_type: task_runner.compiled_type,
-                metadata: task_runner.metadata,
-                library: library,
-              )
-              script_service = Infrastructure::ServiceLocator.script_service(
-                ctx: p_ctx,
-                api_key: script_project.api_key
-              )
-              module_upload_url = Infrastructure::ScriptUploader.new(script_service).upload(package.script_content)
-              uuid = script_service.set_app_script(
-                uuid: package.uuid,
-                extension_point_type: package.extension_point_type,
-                force: force,
-                metadata: package.metadata,
-                script_config: package.script_config,
-                module_upload_url: module_upload_url,
-                library: package.library,
-              )
-              if ShopifyCLI::Environment.interactive?
-                script_project_repo.update_env(uuid: uuid)
+            BuildScript.call(ctx: ctx, task_runner: task_runner, script_project: script_project, library: library_data)
+
+            metadata_file_location = task_runner.metadata_file_location
+            metadata = Infrastructure::MetadataRepository.new(ctx: ctx).get_metadata(metadata_file_location)
+
+            CLI::UI::Frame.open(ctx.message("script.application.pushing")) do
+              UI::PrintingSpinner.spin(ctx, ctx.message("script.application.pushing_script")) do |p_ctx, spinner|
+                package = Infrastructure::PushPackageRepository.new(ctx: p_ctx).get_push_package(
+                  script_project: script_project,
+                  metadata: metadata,
+                  library: library_data,
+                )
+                script_service = Infrastructure::ServiceLocator.script_service(
+                  ctx: p_ctx,
+                  api_key: script_project.api_key
+                )
+                module_upload_url = Infrastructure::ScriptUploader.new(script_service).upload(package.script_content)
+                uuid = script_service.set_app_script(
+                  uuid: package.uuid,
+                  extension_point_type: package.extension_point_type,
+                  force: force,
+                  metadata: package.metadata,
+                  script_config: package.script_config,
+                  module_upload_url: module_upload_url,
+                  library: package.library,
+                  input_query: script_project.input_query,
+                )
+                if ShopifyCLI::Environment.interactive?
+                  script_project_repo.update_env(uuid: uuid)
+                end
+                spinner.update_title(p_ctx.message("script.application.pushed"))
               end
-              spinner.update_title(p_ctx.message("script.application.pushed"))
             end
           end
         end

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

@@ -32,7 +32,13 @@ module Script
           end
         end
 
-        class MetadataNotFoundError < ScriptProjectError; end
+        class MetadataNotFoundError < ScriptProjectError
+          attr_reader :filename
+          def initialize(filename)
+            super()
+            @filename = filename
+          end
+        end
 
         class MetadataValidationError < ScriptProjectError; end
       end

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

@@ -42,8 +42,8 @@ module Script
           end
 
           def all
-            @all ||= @config.map do |language, libray_config|
-              ExtensionPointLibrary.new(language, libray_config)
+            @all ||= @config.map do |language, library_config|
+              ExtensionPointLibrary.new(language, library_config)
             end
           end
 

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

@@ -9,7 +9,6 @@ module Script
           :extension_point_type,
           :script_config,
           :script_content,
-          :compiled_type,
           :metadata,
           :library
 
@@ -18,7 +17,6 @@ module Script
           uuid:,
           extension_point_type:,
           script_content:,
-          compiled_type: nil,
           metadata:,
           script_config:,
           library:
@@ -27,7 +25,6 @@ module Script
           @uuid = uuid
           @extension_point_type = extension_point_type
           @script_content = script_content
-          @compiled_type = compiled_type
           @metadata = metadata
           @script_config = script_config
           @library = library

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

@@ -16,6 +16,7 @@ module Script
         property! :language, accepts: String
 
         property :script_config, accepts: ScriptConfig
+        property :input_query, accepts: String
 
         def initialize(*)
           super

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

@@ -7,10 +7,11 @@ module Script
         class BuildError < ScriptProjectError; end
 
         class ScriptConfigurationDefinitionError < ScriptProjectError
-          attr_reader :filename
-          def initialize(message:, filename:)
+          attr_reader :filename, :messages
+          def initialize(messages:, filename:)
+            super()
+            @messages = messages
             @filename = filename
-            super(message)
           end
         end
 
@@ -159,6 +160,15 @@ module Script
         class ScriptUploadError < ScriptProjectError; end
         class ProjectConfigNotFoundError < ScriptProjectError; end
         class InvalidProjectConfigError < ScriptProjectError; end
+
+        class ScriptTooLargeError < ScriptProjectError
+          attr_reader :max_size
+
+          def initialize(max_size)
+            super()
+            @max_size = max_size
+          end
+        end
       end
     end
   end

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

@@ -4,27 +4,16 @@ module Script
   module Layers
     module Infrastructure
       module Languages
-        class AssemblyScriptTaskRunner
+        class AssemblyScriptTaskRunner < TaskRunner
           BYTECODE_FILE = "build/script.wasm"
           METADATA_FILE = "build/metadata.json"
           SCRIPT_SDK_BUILD = "npm run build"
 
-          attr_reader :ctx, :script_name
-
-          def initialize(ctx, script_name)
-            @ctx = ctx
-            @script_name = script_name
-          end
-
           def build
             compile
             bytecode
           end
 
-          def compiled_type
-            "wasm"
-          end
-
           def install_dependencies
             check_node_version!
 
@@ -37,14 +26,8 @@ module Script
             ctx.dir_exist?("node_modules")
           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)
+          def metadata_file_location
+            METADATA_FILE
           end
 
           def library_version(library_name)

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

@@ -28,6 +28,7 @@ module Script
             project_creators = {
               "assemblyscript" => AssemblyScriptProjectCreator,
               "typescript" => TypeScriptProjectCreator,
+              "wasm" => WasmProjectCreator,
             }
 
             raise Errors::ProjectCreatorNotFoundError unless project_creators[language]

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

@@ -5,14 +5,41 @@ module Script
     module Infrastructure
       module Languages
         class TaskRunner
-          TASK_RUNNERS = {
-            "assemblyscript" => AssemblyScriptTaskRunner,
-            "typescript" => TypeScriptTaskRunner,
-          }
-
-          def self.for(ctx, language, script_name)
-            raise Errors::TaskRunnerNotFoundError unless TASK_RUNNERS[language]
-            TASK_RUNNERS[language].new(ctx, script_name)
+          attr_reader :ctx
+
+          def self.for(ctx, language)
+            task_runners = {
+              "assemblyscript" => AssemblyScriptTaskRunner,
+              "typescript" => TypeScriptTaskRunner,
+              "wasm" => WasmTaskRunner,
+            }
+
+            raise Errors::TaskRunnerNotFoundError unless task_runners[language]
+            task_runners[language].new(ctx)
+          end
+
+          def initialize(ctx)
+            @ctx = ctx
+          end
+
+          def build
+            raise NotImplementedError
+          end
+
+          def dependencies_installed?
+            raise NotImplementedError
+          end
+
+          def install_dependencies
+            raise NotImplementedError
+          end
+
+          def metadata_file_location
+            raise NotImplementedError
+          end
+
+          def library_version(_library_name)
+            raise NotImplementedError
           end
         end
       end

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

@@ -4,28 +4,17 @@ module Script
   module Layers
     module Infrastructure
       module Languages
-        class TypeScriptTaskRunner
+        class TypeScriptTaskRunner < TaskRunner
           BYTECODE_FILE = "build/index.wasm"
           METADATA_FILE = "build/metadata.json"
           SCRIPT_SDK_BUILD = "npm run build"
           GEN_METADATA = "npm run gen-metadata"
 
-          attr_reader :ctx, :script_name
-
-          def initialize(ctx, script_name)
-            @ctx = ctx
-            @script_name = script_name
-          end
-
           def build
             compile
             bytecode
           end
 
-          def compiled_type
-            "wasm"
-          end
-
           def install_dependencies
             check_node_version!
 
@@ -38,14 +27,8 @@ module Script
             ctx.dir_exist?("node_modules")
           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)
+          def metadata_file_location
+            METADATA_FILE
           end
 
           def library_version(library_name)

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

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module Script
+  module Layers
+    module Infrastructure
+      module Languages
+        class WasmProjectCreator < ProjectCreator
+          def self.config_file
+            "script.config.yml"
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+module Script
+  module Layers
+    module Infrastructure
+      module Languages
+        class WasmTaskRunner < TaskRunner
+          BYTECODE_FILE = "script.wasm"
+
+          def dependencies_installed?
+            true
+          end
+
+          def install_dependencies; end
+
+          def library_version(_library_name)
+            nil
+          end
+
+          def metadata_file_location
+            "metadata.json"
+          end
+
+          def build
+            raise Errors::WebAssemblyBinaryNotFoundError unless ctx.file_exist?(BYTECODE_FILE)
+            ctx.binread(BYTECODE_FILE)
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,18 @@
+
+module Script
+  module Layers
+    module Infrastructure
+      class MetadataRepository
+        include SmartProperties
+        property! :ctx, accepts: ShopifyCLI::Context
+
+        def get_metadata(file_location)
+          raise Domain::Errors::MetadataNotFoundError, file_location unless ctx.file_exist?(file_location)
+
+          raw_contents = File.read(file_location)
+          Domain::Metadata.create_from_json(ctx, raw_contents)
+        end
+      end
+    end
+  end
+end

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

@@ -7,8 +7,8 @@ module Script
         include SmartProperties
         property! :ctx, accepts: ShopifyCLI::Context
 
-        def create_push_package(script_project:, script_content:, compiled_type:, metadata:, library:)
-          build_file_path = file_path(script_project.id, compiled_type)
+        def create_push_package(script_project:, script_content:, metadata:, library:)
+          build_file_path = file_path(script_project.id)
           write_to_path(build_file_path, script_content)
 
           Domain::PushPackage.new(
@@ -16,16 +16,15 @@ module Script
             uuid: script_project.uuid,
             extension_point_type: script_project.extension_point_type,
             script_content: script_content,
-            compiled_type: compiled_type,
             metadata: metadata,
             script_config: script_project.script_config,
             library: library
           )
         end
 
-        def get_push_package(script_project:, compiled_type:, metadata:, library:)
-          build_file_path = file_path(script_project.id, compiled_type)
-          raise Domain::PushPackageNotFoundError unless ctx.file_exist?(build_file_path)
+        def get_push_package(script_project:, metadata:, library:)
+          build_file_path = file_path(script_project.id)
+          raise Domain::Errors::PushPackageNotFoundError unless ctx.file_exist?(build_file_path)
 
           script_content = ctx.binread(build_file_path)
           Domain::PushPackage.new(
@@ -46,8 +45,8 @@ module Script
           ctx.binwrite(path, content)
         end
 
-        def file_path(path_to_script, compiled_type)
-          "#{path_to_script}/build/script.#{compiled_type}"
+        def file_path(path_to_script)
+          "#{path_to_script}/build/script.wasm"
         end
       end
     end

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

@@ -10,6 +10,7 @@ module Script
         property :initial_directory, accepts: String
 
         MUTABLE_ENV_VALUES = %i(uuid)
+        INPUT_QUERY_PATH = "input.graphql"
 
         def create_project_directory
           raise Infrastructure::Errors::ScriptProjectAlreadyExistsError, directory if ctx.dir_exist?(directory)
@@ -38,13 +39,7 @@ module Script
             language: language
           )
 
-          Domain::ScriptProject.new(
-            id: ctx.root,
-            env: project.env,
-            script_name: script_name,
-            extension_point_type: extension_point_type,
-            language: language
-          )
+          build_script_project(script_config: nil)
         end
 
         def get
@@ -56,7 +51,8 @@ module Script
             script_name: script_name,
             extension_point_type: extension_point_type,
             language: language,
-            script_config: script_config_repository.get!
+            script_config: script_config_repository.get!,
+            input_query: read_input_query,
           )
         end
 
@@ -68,14 +64,7 @@ module Script
             end
           end
 
-          Domain::ScriptProject.new(
-            id: ctx.root,
-            env: project.env,
-            script_name: script_name,
-            extension_point_type: extension_point_type,
-            language: language,
-            script_config: script_config_repository.get!,
-          )
+          build_script_project
         end
 
         def create_env(api_key:, secret:, uuid:)
@@ -87,19 +76,19 @@ module Script
             }
           ).write(ctx)
 
-          Domain::ScriptProject.new(
-            id: ctx.root,
-            env: project.env,
-            script_name: script_name,
-            extension_point_type: extension_point_type,
-            language: language,
-            script_config: script_config_repository.get!,
-          )
+          build_script_project
         end
 
         def update_script_config(title:)
           script_config = script_config_repository.update!(title: title)
+          build_script_project(script_config: script_config)
+        end
+
+        private
 
+        def build_script_project(
+          script_config: script_config_repository.get!
+        )
           Domain::ScriptProject.new(
             id: ctx.root,
             env: project.env,
@@ -110,8 +99,6 @@ module Script
           )
         end
 
-        private
-
         def change_directory(directory:)
           ctx.chdir(directory)
         end
@@ -173,6 +160,10 @@ module Script
           end
         end
 
+        def read_input_query
+          ctx.read(INPUT_QUERY_PATH) if ctx.file_exist?(INPUT_QUERY_PATH)
+        end
+
         class ScriptConfigRepository
           include SmartProperties
           property! :ctx, accepts: ShopifyCLI::Context

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

@@ -19,7 +19,8 @@ module Script
           metadata:,
           script_config:,
           module_upload_url:,
-          library:
+          library:,
+          input_query: nil
         )
           query_name = "app_script_set"
           variables = {
@@ -34,11 +35,14 @@ module Script
             configurationUi: script_config.configuration_ui,
             configurationDefinition: script_config.configuration&.to_json,
             moduleUploadUrl: module_upload_url,
-            library: {
-              language: library[:language],
-              version: library[:version],
-            },
+            inputQuery: input_query,
           }
+
+          variables[:library] = {
+            language: library[:language],
+            version: library[:version],
+          }  if library
+
           resp_hash = make_request(query_name: query_name, variables: variables)
           user_errors = resp_hash["data"]["appScriptSet"]["userErrors"]
 
@@ -46,9 +50,9 @@ module Script
 
           if user_errors.any? { |e| e["tag"] == "already_exists_error" }
             raise Errors::ScriptRepushError, uuid
-          elsif (e = user_errors.find { |err| err["tag"] == "configuration_definition_error" })
+          elsif (errors = user_errors.select { |err| err["tag"] == "configuration_definition_error" }).any?
             raise Errors::ScriptConfigurationDefinitionError.new(
-              message: e["message"],
+              messages: errors.map { |e| e["message"] },
               filename: script_config.filename,
             )
           elsif (e = user_errors.any? { |err| err["tag"] == "configuration_definition_syntax_error" })
@@ -91,14 +95,16 @@ module Script
           response["data"]["appScripts"]
         end
 
-        def generate_module_upload_url
+        def generate_module_upload_details
           query_name = "module_upload_url_generate"
           variables = {}
           response = make_request(query_name: query_name, variables: variables)
           user_errors = response["data"]["moduleUploadUrlGenerate"]["userErrors"]
 
           raise Errors::GraphqlError, user_errors if user_errors.any?
-          response["data"]["moduleUploadUrlGenerate"]["url"]
+
+          data = response["data"]["moduleUploadUrlGenerate"]["details"]
+          { url: data["url"], headers: data["headers"], max_size: data["humanizedMaxSize"] }
         end
 
         private

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

@@ -7,19 +7,32 @@ module Script
         end
 
         def upload(script_content)
-          @script_service.generate_module_upload_url.tap do |url|
-            url = URI(url)
+          upload_details = @script_service.generate_module_upload_details
+          url = URI(upload_details[:url])
 
-            https = Net::HTTP.new(url.host, url.port)
-            https.use_ssl = true
+          https = Net::HTTP.new(url.host, url.port)
+          https.use_ssl = true
 
-            request = Net::HTTP::Put.new(url)
-            request["Content-Type"] = "application/wasm"
-            request.body = script_content
+          request = Net::HTTP::Put.new(url)
+          request["Content-Type"] = "application/wasm"
 
-            response = https.request(request)
-            raise Errors::ScriptUploadError unless response.code == "200"
+          upload_details[:headers].each do |header, value|
+            request[header] = value
           end
+
+          request.body = script_content
+
+          response = https.request(request)
+          raise Errors::ScriptTooLargeError, upload_details[:max_size] if script_too_large?(response)
+          raise Errors::ScriptUploadError unless response.code == "200"
+
+          upload_details[:url]
+        end
+
+        private
+
+        def script_too_large?(response)
+          response.code == "400" && response.body.include?("EntityTooLarge")
         end
       end
     end

data/lib/project_types/script/loaders/project.rb

@@ -32,7 +32,8 @@ module Script
         else
           properties_hash = { api_key: "--api-key", secret: "--api-secret" }
           missing_options = error.properties.map { |p| properties_hash[p.name] }.compact.join(", ")
-          raise ShopifyCLI::Abort, context.message("script.error.missing_push_options", missing_options)
+          raise ShopifyCLI::Abort, context.message("script.error.missing_push_options", missing_options,
+            ShopifyCli::TOOL_NAME)
         end
       end