shopify-cli 2.9.0 → 2.11.0

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
@@ -160,16 +147,23 @@ module Script
 
         def script_config_repository
           @script_config_repository ||= begin
+            script_config_yml_repo = ScriptConfigYmlRepository.new(ctx: ctx)
             supported_repos = [
-              ScriptConfigYmlRepository.new(ctx: ctx),
+              script_config_yml_repo,
               ScriptJsonRepository.new(ctx: ctx),
             ]
             repo = supported_repos.find(&:active?)
-            raise Infrastructure::Errors::NoScriptConfigYmlFileError if repo.nil?
+            if repo.nil?
+              raise Infrastructure::Errors::NoScriptConfigFileError, script_config_yml_repo.filename
+            end
             repo
           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
@@ -179,7 +173,7 @@ module Script
           end
 
           def get!
-            raise Infrastructure::Errors::NoScriptConfigFileError unless active?
+            raise Infrastructure::Errors::NoScriptConfigFileError, filename unless active?
 
             content = ctx.read(filename)
             hash = file_content_to_hash(content)
@@ -196,6 +190,10 @@ module Script
             from_h(hash)
           end
 
+          def filename
+            raise NotImplementedError
+          end
+
           private
 
           def update_hash(hash:, title:)
@@ -204,14 +202,7 @@ module Script
           end
 
           def from_h(hash)
-            Domain::ScriptConfig.new(content: hash)
-          rescue Domain::Errors::MissingScriptConfigFieldError => e
-            raise missing_field_error, e.field
-          end
-
-          # to be implemented by subclasses
-          def filename
-            raise NotImplementedError
+            Domain::ScriptConfig.new(content: hash, filename: filename)
           end
 
           def file_content_to_hash(file_content)
@@ -221,26 +212,22 @@ module Script
           def hash_to_file_content(hash)
             raise NotImplementedError
           end
-
-          def missing_field_error
-            raise NotImplementedError
-          end
         end
 
         class ScriptConfigYmlRepository < ScriptConfigRepository
-          private
-
           def filename
             "script.config.yml"
           end
 
+          private
+
           def file_content_to_hash(file_content)
             begin
               hash = YAML.load(file_content)
             rescue Psych::SyntaxError
-              raise Errors::InvalidScriptConfigYmlDefinitionError
+              raise parse_error
             end
-            raise Errors::InvalidScriptConfigYmlDefinitionError unless hash.is_a?(Hash)
+            raise parse_error unless hash.is_a?(Hash)
             hash
           end
 
@@ -248,30 +235,34 @@ module Script
             YAML.dump(hash)
           end
 
-          def missing_field_error
-            Errors::MissingScriptConfigYmlFieldError
+          def parse_error
+            Errors::ScriptConfigParseError.new(filename: filename, serialization_format: "YAML")
           end
         end
 
         class ScriptJsonRepository < ScriptConfigRepository
-          private
-
           def filename
             "script.json"
           end
 
+          private
+
           def file_content_to_hash(file_content)
-            JSON.parse(file_content)
-          rescue JSON::ParserError
-            raise Errors::InvalidScriptJsonDefinitionError
+            begin
+              hash = JSON.parse(file_content)
+            rescue JSON::ParserError
+              raise parse_error
+            end
+            raise parse_error unless hash.is_a?(Hash)
+            hash
           end
 
           def hash_to_file_content(hash)
             JSON.pretty_generate(hash)
           end
 
-          def missing_field_error
-            Errors::MissingScriptJsonFieldError
+          def parse_error
+            Errors::ScriptConfigParseError.new(filename: filename, serialization_format: "JSON")
           end
         end
       end

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,20 +50,37 @@ module Script
 
           if user_errors.any? { |e| e["tag"] == "already_exists_error" }
             raise Errors::ScriptRepushError, uuid
+          elsif (errors = user_errors.select { |err| err["tag"] == "configuration_definition_error" }).any?
+            raise Errors::ScriptConfigurationDefinitionError.new(
+              messages: errors.map { |e| e["message"] },
+              filename: script_config.filename,
+            )
           elsif (e = user_errors.any? { |err| err["tag"] == "configuration_definition_syntax_error" })
-            raise Errors::ScriptConfigSyntaxError
+            raise Errors::ScriptConfigSyntaxError, script_config.filename
           elsif (e = user_errors.find { |err| err["tag"] == "configuration_definition_missing_keys_error" })
-            raise Errors::ScriptConfigMissingKeysError, e["message"]
+            raise Errors::ScriptConfigMissingKeysError.new(
+              missing_keys: e["message"],
+              filename: script_config.filename,
+            )
           elsif (e = user_errors.find { |err| err["tag"] == "configuration_definition_invalid_value_error" })
-            raise Errors::ScriptConfigInvalidValueError, e["message"]
+            raise Errors::ScriptConfigInvalidValueError.new(
+              valid_input_modes: e["message"],
+              filename: script_config.filename,
+            )
           elsif (e = user_errors.find do |err|
                    err["tag"] == "configuration_definition_schema_field_missing_keys_error"
                  end)
-            raise Errors::ScriptConfigFieldsMissingKeysError, e["message"]
+            raise Errors::ScriptConfigFieldsMissingKeysError.new(
+              missing_keys: e["message"],
+              filename: script_config.filename,
+            )
           elsif (e = user_errors.find do |err|
                    err["tag"] == "configuration_definition_schema_field_invalid_value_error"
                  end)
-            raise Errors::ScriptConfigFieldsInvalidValueError, e["message"]
+            raise Errors::ScriptConfigFieldsInvalidValueError.new(
+              valid_types: e["message"],
+              filename: script_config.filename,
+            )
           elsif user_errors.find { |err| %w(not_use_msgpack_error schema_version_argument_error).include?(err["tag"]) }
             raise Domain::Errors::MetadataValidationError
           else
@@ -74,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