shopify-cli 2.9.0 → 2.11.0

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

@@ -13,45 +13,53 @@ module Script
               .for(ctx, script_project.language, script_project.script_name)
 
             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

@@ -15,10 +15,11 @@ module Script
         end
 
         class MissingScriptConfigFieldError < ScriptProjectError
-          attr_reader :field
-          def initialize(field)
+          attr_reader :field, :filename
+          def initialize(field:, filename:)
             super()
             @field = field
+            @filename = filename
           end
         end
 
@@ -31,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_config.rb

@@ -4,13 +4,13 @@ module Script
   module Layers
     module Domain
       class ScriptConfig
-        attr_reader :content, :version, :title, :description, :configuration_ui, :configuration
+        attr_reader :content, :version, :title, :description, :configuration_ui, :configuration, :filename
 
         REQUIRED_FIELDS = %w(version title)
 
-        def initialize(content:)
+        def initialize(content:, filename:)
+          @filename = filename
           validate_content!(content)
-
           @content = content
           @version = @content["version"].to_s
           @title = @content["title"]
@@ -23,7 +23,9 @@ module Script
 
         def validate_content!(content)
           REQUIRED_FIELDS.each do |field|
-            raise Errors::MissingScriptConfigFieldError, field if content[field].nil?
+            if content[field].nil?
+              raise Errors::MissingScriptConfigFieldError.new(field: field, filename: filename)
+            end
           end
         end
       end

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

@@ -5,65 +5,79 @@ module Script
     module Infrastructure
       module Errors
         class BuildError < ScriptProjectError; end
-        class ScriptConfigSyntaxError < ScriptProjectError; end
+
+        class ScriptConfigurationDefinitionError < ScriptProjectError
+          attr_reader :filename, :messages
+          def initialize(messages:, filename:)
+            super()
+            @messages = messages
+            @filename = filename
+          end
+        end
+
+        class ScriptConfigSyntaxError < ScriptProjectError
+          attr_reader :filename
+          def initialize(filename)
+            @filename = filename
+            super()
+          end
+        end
 
         class ScriptConfigMissingKeysError < ScriptProjectError
-          attr_reader :missing_keys
-          def initialize(missing_keys)
+          attr_reader :missing_keys, :filename
+          def initialize(missing_keys:, filename:)
             super()
             @missing_keys = missing_keys
+            @filename = filename
           end
         end
 
         class ScriptConfigInvalidValueError < ScriptProjectError
-          attr_reader :valid_input_modes
-          def initialize(valid_input_modes)
+          attr_reader :valid_input_modes, :filename
+          def initialize(valid_input_modes:, filename:)
             super()
             @valid_input_modes = valid_input_modes
+            @filename = filename
           end
         end
 
         class ScriptConfigFieldsMissingKeysError < ScriptProjectError
-          attr_reader :missing_keys
-          def initialize(missing_keys)
+          attr_reader :missing_keys, :filename
+          def initialize(missing_keys:, filename:)
             super()
             @missing_keys = missing_keys
+            @filename = filename
           end
         end
 
         class ScriptConfigFieldsInvalidValueError < ScriptProjectError
-          attr_reader :valid_types
-          def initialize(valid_types)
+          attr_reader :valid_types, :filename
+          def initialize(valid_types:, filename:)
             super()
             @valid_types = valid_types
+            @filename = filename
           end
         end
 
         class ScriptEnvAppNotConnectedError < ScriptProjectError; end
 
-        class InvalidScriptConfigYmlDefinitionError < ScriptProjectError; end
-
-        class InvalidScriptJsonDefinitionError < ScriptProjectError; end
-
-        class MissingScriptConfigYmlFieldError < ScriptProjectError
-          attr_reader :field
-          def initialize(field)
+        class ScriptConfigParseError < ScriptProjectError
+          attr_reader :filename, :serialization_format
+          def initialize(filename:, serialization_format:)
             super()
-            @field = field
+            @filename = filename
+            @serialization_format = serialization_format
           end
         end
 
-        class MissingScriptJsonFieldError < ScriptProjectError
-          attr_reader :field
-          def initialize(field)
+        class NoScriptConfigFileError < ScriptProjectError
+          attr_reader :filename
+          def initialize(filename)
             super()
-            @field = field
+            @filename = filename
           end
         end
 
-        class NoScriptConfigYmlFileError < ScriptProjectError; end
-        class NoScriptConfigFileError < ScriptProjectError; end
-
         class APILibraryNotFoundError < ScriptProjectError
           attr_reader :library_name
           def initialize(library_name)
@@ -146,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

@@ -21,10 +21,6 @@ module Script
             bytecode
           end
 
-          def compiled_type
-            "wasm"
-          end
-
           def install_dependencies
             check_node_version!
 
@@ -37,14 +33,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

@@ -8,6 +8,7 @@ module Script
           TASK_RUNNERS = {
             "assemblyscript" => AssemblyScriptTaskRunner,
             "typescript" => TypeScriptTaskRunner,
+            "wasm" => WasmTaskRunner,
           }
 
           def self.for(ctx, language, script_name)

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

@@ -22,10 +22,6 @@ module Script
             bytecode
           end
 
-          def compiled_type
-            "wasm"
-          end
-
           def install_dependencies
             check_node_version!
 
@@ -38,14 +34,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,36 @@
+# frozen_string_literal: true
+
+module Script
+  module Layers
+    module Infrastructure
+      module Languages
+        class WasmTaskRunner
+          BYTECODE_FILE = "script.wasm"
+          attr_reader :ctx, :script_name
+
+          def initialize(ctx, script_name)
+            @ctx = ctx
+            @script_name = script_name
+          end
+
+          def dependencies_installed?
+            true
+          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