shopify-cli 1.3.0 → 1.6.0

data/lib/project_types/script/config/extension_points.yml

@@ -1,24 +1,29 @@
 discount:
+  deprecated: true
   assemblyscript:
     package: "@shopify/extension-point-as-discount"
-    version: "^0.2.10"
-    sdk-version: "^6.0.0"
-    toolchain-version: "^1.1.0"
+    sdk-version: "^7.0.0"
+    toolchain-version: "^4.0.0"
 unit_limit_per_order:
   assemblyscript:
     package: "@shopify/extension-point-as-unit-limit-per-order"
-    version: "^0.1.12"
-    sdk-version: "^6.0.0"
-    toolchain-version: "^1.1.0"
+    sdk-version: "^7.0.0"
+    toolchain-version: "^4.0.0"
 payment_filter:
   assemblyscript:
     package: "@shopify/extension-point-as-payment-filter"
-    version: "^0.2.8"
-    sdk-version: "^6.0.0"
-    toolchain-version: "^1.1.0"
+    sdk-version: "^7.0.0"
+    toolchain-version: "^4.0.0"
+  rust:
+    beta: true
+    package: "https://github.com/Shopify/scripts-apis-rs"
 shipping_filter:
   assemblyscript:
     package: "@shopify/extension-point-as-shipping-filter"
-    version: "^0.2.10"
-    sdk-version: "^6.0.0"
-    toolchain-version: "^1.1.0"
+    sdk-version: "^7.0.0"
+    toolchain-version: "^4.0.0"
+tax_filter:
+  assemblyscript:
+    package: "@shopify/extension-point-as-tax-filter"
+    sdk-version: "^7.0.0"
+    toolchain-version: "^4.0.0"

data/lib/project_types/script/errors.rb

@@ -6,6 +6,7 @@ module Script
     class InvalidScriptNameError < ScriptProjectError; end
     class NoExistingAppsError < ScriptProjectError; end
     class NoExistingOrganizationsError < ScriptProjectError; end
+
     class NoExistingStoresError < ScriptProjectError
       attr_reader :organization_id
       def initialize(organization_id)
@@ -13,7 +14,10 @@ module Script
         @organization_id = organization_id
       end
     end
+
     class ScriptProjectAlreadyExistsError < ScriptProjectError; end
+    class InvalidConfigProps < ScriptProjectError; end
+
     class InvalidConfigYAMLError < ScriptProjectError
       attr_reader :config_file
       def initialize(config_file)
@@ -21,5 +25,22 @@ module Script
         @config_file = config_file
       end
     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 DeprecatedEPError < ScriptProjectError
+      attr_reader :ep
+      def initialize(ep)
+        super()
+        @ep = ep
+      end
+    end
   end
 end

data/lib/project_types/script/forms/create.rb

@@ -3,11 +3,13 @@
 module Script
   module Forms
     class Create < ShopifyCli::Form
-      flag_arguments :extension_point, :name
+      flag_arguments :extension_point, :name, :language, :description
 
       def ask
         self.name = valid_name
+        self.description ||= ask_description
         self.extension_point ||= ask_extension_point
+        self.language = ask_language
       end
 
       private
@@ -15,7 +17,7 @@ module Script
       def ask_extension_point
         CLI::UI::Prompt.ask(
           @ctx.message('script.forms.create.select_extension_point'),
-          options: Script::Layers::Application::ExtensionPoints.types
+          options: Layers::Application::ExtensionPoints.non_deprecated_types
         )
       end
 
@@ -23,11 +25,33 @@ module Script
         CLI::UI::Prompt.ask(@ctx.message('script.forms.create.script_name'))
       end
 
+      def ask_description
+        CLI::UI::Prompt.ask(@ctx.message('script.forms.create.description'))
+      end
+
       def valid_name
         n = (name || ask_name).downcase.gsub(' ', '_')
         return n if n.match?(/^[0-9A-Za-z_-]*$/)
         raise Errors::InvalidScriptNameError
       end
+
+      def ask_language
+        if language
+          if Layers::Application::ExtensionPoints.supported_language?(type: extension_point, language: language)
+            return language.downcase
+          else
+            raise Errors::InvalidLanguageError.new(language, extension_point)
+          end
+        end
+
+        all_languages = Layers::Application::ExtensionPoints.languages(type: extension_point)
+        return all_languages.first if all_languages.count == 1
+
+        CLI::UI::Prompt.ask(
+          ctx.message('script.forms.create.select_language'),
+          options: all_languages
+        )
+      end
     end
   end
 end

data/lib/project_types/script/graphql/app_script_update_or_create.graphql

@@ -1,16 +1,24 @@
 mutation AppScriptUpdateOrCreate(
   $extensionPointName: ExtensionPointName!,
   $title: String,
+  $description: String,
   $sourceCode: String,
   $language: String,
-  $force: Boolean
+  $force: Boolean,
+  $schemaMajorVersion: String,
+  $schemaMinorVersion: String,
+  $useMsgpack: Boolean
 ) {
   appScriptUpdateOrCreate(
     extensionPointName: $extensionPointName
     title: $title
+    description: $description
     sourceCode: $sourceCode
     language: $language
     force: $force
+    schemaMajorVersion: $schemaMajorVersion
+    schemaMinorVersion: $schemaMinorVersion
+    useMsgpack: $useMsgpack
 ) {
     userErrors {
       field
@@ -22,6 +30,7 @@ mutation AppScriptUpdateOrCreate(
       configSchema
       extensionPointName
       title
+      description
     }
   }
 }

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

@@ -5,33 +5,34 @@ module Script
     module Application
       class BuildScript
         class << self
-          def call(ctx:, task_runner:, script:)
-            return if CLI::UI::Frame.open(ctx.message('script.application.building')) do
+          def call(ctx:, task_runner:, script_name:, description:, extension_point_type:)
+            CLI::UI::Frame.open(ctx.message('script.application.building')) do
               begin
                 UI::StrictSpinner.spin(ctx.message('script.application.building_script')) do |spinner|
-                  build(ctx, task_runner, script)
+                  Infrastructure::PushPackageRepository.new(ctx: ctx).create_push_package(
+                    extension_point_type: extension_point_type,
+                    script_name: script_name,
+                    description: description,
+                    script_content: task_runner.build,
+                    compiled_type: task_runner.compiled_type,
+                    metadata: task_runner.metadata
+                  )
                   spinner.update_title(ctx.message('script.application.built'))
                 end
-                true
               rescue StandardError => e
                 CLI::UI::Frame.with_frame_color_override(:red) do
                   ctx.puts("\n{{red:#{e.message}}}")
                 end
-                false
-              end
-            end
-            raise Infrastructure::Errors::BuildError
-          end
+                errors = [
+                  Infrastructure::Errors::InvalidBuildScriptError,
+                  Infrastructure::Errors::BuildScriptNotFoundError,
+                  Infrastructure::Errors::WebAssemblyBinaryNotFoundError,
+                ]
 
-          private
-
-          def build(ctx, task_runner, script)
-            script_repo = Infrastructure::ScriptRepository.new(ctx: ctx)
-            script_content = script_repo.with_temp_build_context do
-              task_runner.build
+                raise Infrastructure::Errors::BuildError unless errors.any? { |err| e.is_a?(err) }
+                raise
+              end
             end
-            Infrastructure::PushPackageRepository.new(ctx: ctx)
-              .create_push_package(script, script_content, task_runner.compiled_type)
           end
         end
       end

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

@@ -7,40 +7,42 @@ module Script
     module Application
       class CreateScript
         class << self
-          def call(ctx:, language:, script_name:, extension_point_type:)
+          def call(ctx:, language:, script_name:, extension_point_type:, description:)
             extension_point = ExtensionPoints.get(type: extension_point_type)
-            project = setup_project(ctx, script_name, extension_point)
+            project = setup_project(ctx, language, script_name, extension_point, description)
             project_creator = Infrastructure::ProjectCreator
               .for(ctx, language, extension_point, script_name, project.directory)
-            install_dependencies(ctx, language, script_name, project.source_file, project_creator)
-            bootstrap(ctx, project.source_path, project_creator)
+            install_dependencies(ctx, language, script_name, project_creator)
+            bootstrap(ctx, project_creator)
             project
           end
 
           private
 
-          def setup_project(ctx, script_name, extension_point)
+          def setup_project(ctx, language, script_name, extension_point, description)
             ScriptProject.create(ctx, script_name)
             ScriptProject.write(
               ctx,
               project_type: :script,
               organization_id: nil, # TODO: can you provide this at creation
               extension_point_type: extension_point.type,
-              script_name: script_name
+              script_name: script_name,
+              language: language,
+              description: description
             )
             ScriptProject.current
           end
 
-          def install_dependencies(ctx, language, script_name, source_file, project_creator)
-            task_runner = Infrastructure::TaskRunner.for(ctx, language, script_name, source_file)
+          def install_dependencies(ctx, language, script_name, project_creator)
+            task_runner = Infrastructure::TaskRunner.for(ctx, language, script_name)
             project_creator.setup_dependencies
             ProjectDependencies.install(ctx: ctx, task_runner: task_runner)
           end
 
-          def bootstrap(ctx, source_path, project_creator)
+          def bootstrap(ctx, project_creator)
             UI::StrictSpinner.spin(ctx.message('script.create.creating')) do |spinner|
               project_creator.bootstrap
-              spinner.update_title(ctx.message('script.create.created', source_path))
+              spinner.update_title(ctx.message('script.create.created'))
             end
           end
         end

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

@@ -11,6 +11,30 @@ module Script
         def self.types
           Infrastructure::ExtensionPointRepository.new.extension_point_types
         end
+
+        def self.non_deprecated_types
+          Infrastructure::ExtensionPointRepository.new.extension_points.select do |ep|
+            !ep.deprecated?
+          end.map(&:type)
+        end
+
+        def self.deprecated_types
+          Infrastructure::ExtensionPointRepository.new
+            .extension_points
+            .select(&:deprecated?)
+            .map(&:type)
+        end
+
+        def self.languages(type:)
+          get(type: type).sdks.all.map do |sdk|
+            next nil if sdk.beta? && !ShopifyCli::Feature.enabled?(:scripts_beta_languages)
+            sdk.class.language
+          end.compact
+        end
+
+        def self.supported_language?(type:, language:)
+          languages(type: type).include?(language.downcase)
+        end
       end
     end
   end

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

@@ -5,25 +5,27 @@ module Script
     module Application
       class PushScript
         class << self
-          def call(ctx:, language:, extension_point_type:, script_name:, source_file:, api_key:, force:)
-            script = Infrastructure::ScriptRepository.new(ctx: ctx).get_script(
-              language,
-              extension_point_type,
-              script_name
-            )
-            task_runner = Infrastructure::TaskRunner.for(ctx, language, script_name, source_file)
+          def call(ctx:, force:)
+            script_project = ScriptProject.current
+            task_runner = Infrastructure::TaskRunner.for(ctx, script_project.language, script_project.script_name)
             ProjectDependencies.install(ctx: ctx, task_runner: task_runner)
-            BuildScript.call(ctx: ctx, task_runner: task_runner, script: script)
-            push_script(ctx, task_runner, script, api_key, force)
-          end
-
-          private
+            BuildScript.call(
+              ctx: ctx,
+              task_runner: task_runner,
+              extension_point_type: script_project.extension_point_type,
+              script_name: script_project.script_name,
+              description: script_project.description
+            )
 
-          def push_script(ctx, task_runner, script, api_key, force)
             UI::PrintingSpinner.spin(ctx, ctx.message('script.application.pushing')) do |p_ctx, spinner|
-              Infrastructure::PushPackageRepository.new(ctx: p_ctx)
-                .get_push_package(script, task_runner.compiled_type)
-                .push(Infrastructure::ScriptService.new(ctx: p_ctx), api_key, force)
+              package = Infrastructure::PushPackageRepository.new(ctx: p_ctx).get_push_package(
+                extension_point_type: script_project.extension_point_type,
+                script_name: script_project.script_name,
+                description: script_project.description,
+                compiled_type: task_runner.compiled_type,
+                metadata: task_runner.metadata
+              )
+              package.push(Infrastructure::ScriptService.new(ctx: p_ctx), script_project.api_key, force)
               spinner.update_title(p_ctx.message('script.application.pushed'))
             end
           end

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

@@ -5,6 +5,7 @@ module Script
     module Domain
       module Errors
         class PushPackageNotFoundError < ScriptProjectError; end
+
         class InvalidExtensionPointError < ScriptProjectError
           attr_reader :type
           def initialize(type)
@@ -12,6 +13,7 @@ module Script
             @type = type
           end
         end
+
         class ScriptNotFoundError < ScriptProjectError
           attr_reader :script_name, :extension_point_type
           def initialize(extension_point_type, script_name)
@@ -20,7 +22,12 @@ module Script
             @extension_point_type = extension_point_type
           end
         end
+
         class ServiceFailureError < ScriptProjectError; end
+
+        class MetadataNotFoundError < ScriptProjectError; end
+
+        class MetadataValidationError < ScriptProjectError; end
       end
     end
   end

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

@@ -4,25 +4,80 @@ module Script
   module Layers
     module Domain
       class ExtensionPoint
-        attr_reader :type, :sdks
+        attr_reader :type, :deprecated, :sdks
 
         def initialize(type, config)
           @type = type
-          @sdks = {
-            ts: ExtensionPointAssemblyScriptSDK.new(config["assemblyscript"]),
-          }
+          @deprecated = config["deprecated"] || false
+          @sdks = ExtensionPointSDKs.new(config)
+        end
+
+        def deprecated?
+          @deprecated
+        end
+      end
+
+      class ExtensionPointSDKs
+        def initialize(config)
+          @config = config
+        end
+
+        def all
+          [assemblyscript, rust].compact
+        end
+
+        def assemblyscript
+          @assemblyscript ||= new_sdk(ExtensionPointAssemblyScriptSDK)
+        end
+
+        def rust
+          @rust ||= new_sdk(ExtensionPointRustSDK)
+        end
+
+        private
+
+        def new_sdk(klass)
+          config = @config[klass.language]
+          return nil if config.nil?
+          klass.new(config)
         end
       end
 
-      class ExtensionPointAssemblyScriptSDK
-        attr_reader :package, :version, :sdk_version, :toolchain_version
+      class ExtensionPointSDK
+        attr_reader :beta, :package
 
         def initialize(config)
+          @beta = config["beta"] || false
           @package = config["package"]
-          @version = config["version"]
+        end
+
+        def beta?
+          @beta
+        end
+
+        def self.language
+          raise NotImplementedError
+        end
+      end
+
+      class ExtensionPointAssemblyScriptSDK < ExtensionPointSDK
+        attr_reader :sdk_version, :toolchain_version
+
+        def initialize(config)
+          super
           @sdk_version = config["sdk-version"]
           @toolchain_version = config["toolchain-version"]
         end
+
+        def self.language
+          "assemblyscript"
+        end
+      end
+
+      class ExtensionPointRustSDK < ExtensionPointSDK
+        def self.language
+          "rust"
+        end
       end
     end
   end