shopify-cli 2.8.0 → 2.10.2

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

@@ -18,6 +18,10 @@ module Script
           @beta
         end
 
+        def stable?
+          !beta?
+        end
+
         def deprecated?
           @deprecated
         end
@@ -26,14 +30,20 @@ module Script
           @type.gsub("_", "-")
         end
 
+        def library_languages(include_betas: false)
+          @libraries.all.map do |library|
+            include_betas || library.stable? ? library.language : nil
+          end.compact
+        end
+
         class ExtensionPointLibraries
           def initialize(config)
             @config = config
           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
 
@@ -57,6 +67,10 @@ module Script
             @beta
           end
 
+          def stable?
+            !beta?
+          end
+
           def versioned?
             @version
           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,63 +5,78 @@ module Script
     module Infrastructure
       module Errors
         class BuildError < ScriptProjectError; end
-        class ScriptConfigSyntaxError < ScriptProjectError; end
+
+        class ScriptConfigurationDefinitionError < ScriptProjectError
+          attr_reader :filename
+          def initialize(message:, filename:)
+            @filename = filename
+            super(message)
+          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 InvalidScriptConfigYmlDefinitionError < ScriptProjectError; end
+        class ScriptEnvAppNotConnectedError < 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)
@@ -144,6 +159,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

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