shopify-cli 1.6.0 → 1.9.1

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

@@ -2,28 +2,43 @@ discount:
   deprecated: true
   assemblyscript:
     package: "@shopify/extension-point-as-discount"
-    sdk-version: "^7.0.0"
-    toolchain-version: "^4.0.0"
+    sdk-version: "^9.0.0"
+    toolchain-version: "^5.0.0"
 unit_limit_per_order:
+  beta: true
   assemblyscript:
     package: "@shopify/extension-point-as-unit-limit-per-order"
-    sdk-version: "^7.0.0"
-    toolchain-version: "^4.0.0"
+    sdk-version: "^9.0.0"
+    toolchain-version: "^5.0.0"
 payment_filter:
   assemblyscript:
     package: "@shopify/extension-point-as-payment-filter"
-    sdk-version: "^7.0.0"
-    toolchain-version: "^4.0.0"
+    sdk-version: "^9.0.0"
+    toolchain-version: "^5.0.0"
   rust:
     beta: true
     package: "https://github.com/Shopify/scripts-apis-rs"
 shipping_filter:
   assemblyscript:
     package: "@shopify/extension-point-as-shipping-filter"
-    sdk-version: "^7.0.0"
-    toolchain-version: "^4.0.0"
+    sdk-version: "^9.0.0"
+    toolchain-version: "^5.0.0"
 tax_filter:
+  beta: true
   assemblyscript:
     package: "@shopify/extension-point-as-tax-filter"
-    sdk-version: "^7.0.0"
-    toolchain-version: "^4.0.0"
+    sdk-version: "^9.0.0"
+    toolchain-version: "^5.0.0"
+payment_methods:
+  domain: 'checkout'
+  assemblyscript:
+    package: "@shopify/scripts-checkout-apis"
+    toolchain-version: "^5.0.0"
+    sdk-version: "^9.0.0"
+shipping_methods:
+  domain: 'checkout'
+  assemblyscript:
+    package: "@shopify/scripts-checkout-apis"
+    sdk-version: "^9.0.0"
+    toolchain-version: "^5.0.0"
+

data/lib/project_types/script/errors.rb

@@ -2,8 +2,8 @@
 
 module Script
   module Errors
-    class InvalidContextError < ScriptProjectError; end
     class InvalidScriptNameError < ScriptProjectError; end
+
     class NoExistingAppsError < ScriptProjectError; end
     class NoExistingOrganizationsError < ScriptProjectError; end
 
@@ -15,7 +15,6 @@ module Script
       end
     end
 
-    class ScriptProjectAlreadyExistsError < ScriptProjectError; end
     class InvalidConfigProps < ScriptProjectError; end
 
     class InvalidConfigYAMLError < ScriptProjectError
@@ -25,22 +24,5 @@ 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,10 @@
 module Script
   module Forms
     class Create < ShopifyCli::Form
-      flag_arguments :extension_point, :name, :language, :description
+      flag_arguments :extension_point, :name, :language
 
       def ask
         self.name = valid_name
-        self.description ||= ask_description
         self.extension_point ||= ask_extension_point
         self.language = ask_language
       end
@@ -16,39 +15,29 @@ module Script
 
       def ask_extension_point
         CLI::UI::Prompt.ask(
-          @ctx.message('script.forms.create.select_extension_point'),
-          options: Layers::Application::ExtensionPoints.non_deprecated_types
+          @ctx.message("script.forms.create.select_extension_point"),
+          options: Layers::Application::ExtensionPoints.available_types
         )
       end
 
       def ask_name
-        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'))
+        CLI::UI::Prompt.ask(@ctx.message("script.forms.create.script_name"))
       end
 
       def valid_name
-        n = (name || ask_name).downcase.gsub(' ', '_')
+        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
+        return language.downcase if language
 
         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'),
+          ctx.message("script.forms.create.select_language"),
           options: all_languages
         )
       end

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

@@ -1,24 +1,26 @@
 mutation AppScriptUpdateOrCreate(
   $extensionPointName: ExtensionPointName!,
   $title: String,
-  $description: String,
+  $configUi: String,
   $sourceCode: String,
   $language: String,
   $force: Boolean,
   $schemaMajorVersion: String,
   $schemaMinorVersion: String,
-  $useMsgpack: Boolean
+  $useMsgpack: Boolean,
+  $uuid: String
 ) {
   appScriptUpdateOrCreate(
     extensionPointName: $extensionPointName
     title: $title
-    description: $description
+    configUi: $configUi
     sourceCode: $sourceCode
     language: $language
     force: $force
     schemaMajorVersion: $schemaMajorVersion
     schemaMinorVersion: $schemaMinorVersion
-    useMsgpack: $useMsgpack
+    useMsgpack: $useMsgpack,
+    uuid: $uuid
 ) {
     userErrors {
       field
@@ -26,11 +28,11 @@ mutation AppScriptUpdateOrCreate(
       tag
     }
     appScript {
+      uuid
       appKey
       configSchema
       extensionPointName
       title
-      description
     }
   }
 }

data/lib/project_types/script/graphql/script_service_proxy.graphql

@@ -1,7 +1,6 @@
-query ProxyRequest($api_key: String, $shop_domain: String, $query: String!, $variables: String) {
+query ProxyRequest($api_key: String, $query: String!, $variables: String) {
   scriptServiceProxy(
     apiKey: $api_key
-    shopDomain: $shop_domain
     query: $query
     variables: $variables
   )

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

@@ -5,19 +5,17 @@ module Script
     module Application
       class BuildScript
         class << self
-          def call(ctx:, task_runner:, script_name:, description:, extension_point_type:)
-            CLI::UI::Frame.open(ctx.message('script.application.building')) do
+          def call(ctx:, task_runner:, script_project:)
+            CLI::UI::Frame.open(ctx.message("script.application.building")) do
               begin
-                UI::StrictSpinner.spin(ctx.message('script.application.building_script')) do |spinner|
+                UI::StrictSpinner.spin(ctx.message("script.application.building_script")) do |spinner|
                   Infrastructure::PushPackageRepository.new(ctx: ctx).create_push_package(
-                    extension_point_type: extension_point_type,
-                    script_name: script_name,
-                    description: description,
+                    script_project: script_project,
                     script_content: task_runner.build,
                     compiled_type: task_runner.compiled_type,
-                    metadata: task_runner.metadata
+                    metadata: task_runner.metadata,
                   )
-                  spinner.update_title(ctx.message('script.application.built'))
+                  spinner.update_title(ctx.message("script.application.built"))
                 end
               rescue StandardError => e
                 CLI::UI::Frame.with_frame_color_override(:red) do

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

@@ -7,32 +7,27 @@ module Script
     module Application
       class CreateScript
         class << self
-          def call(ctx:, language:, script_name:, extension_point_type:, description:)
-            extension_point = ExtensionPoints.get(type: extension_point_type)
-            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_creator)
-            bootstrap(ctx, project_creator)
-            project
+          def call(ctx:, language:, script_name:, extension_point_type:, no_config_ui:)
+            raise Infrastructure::Errors::ScriptProjectAlreadyExistsError, script_name if ctx.dir_exist?(script_name)
+
+            in_new_directory_context(ctx, script_name) do
+              extension_point = ExtensionPoints.get(type: extension_point_type)
+              project = Infrastructure::ScriptProjectRepository.new(ctx: ctx).create(
+                script_name: script_name,
+                extension_point_type: extension_point_type,
+                language: language,
+                no_config_ui: no_config_ui
+              )
+              project_creator = Infrastructure::ProjectCreator
+                .for(ctx, language, extension_point, script_name, project.id)
+              install_dependencies(ctx, language, script_name, project_creator)
+              bootstrap(ctx, project_creator)
+              project
+            end
           end
 
           private
 
-          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,
-              language: language,
-              description: description
-            )
-            ScriptProject.current
-          end
-
           def install_dependencies(ctx, language, script_name, project_creator)
             task_runner = Infrastructure::TaskRunner.for(ctx, language, script_name)
             project_creator.setup_dependencies
@@ -40,9 +35,24 @@ module Script
           end
 
           def bootstrap(ctx, project_creator)
-            UI::StrictSpinner.spin(ctx.message('script.create.creating')) do |spinner|
+            UI::StrictSpinner.spin(ctx.message("script.create.creating")) do |spinner|
               project_creator.bootstrap
-              spinner.update_title(ctx.message('script.create.created'))
+              spinner.update_title(ctx.message("script.create.created"))
+            end
+          end
+
+          def in_new_directory_context(ctx, directory)
+            initial_directory = ctx.root
+            begin
+              ctx.mkdir_p(directory)
+              ctx.chdir(directory)
+              yield
+            rescue
+              ctx.chdir(initial_directory)
+              ctx.rm_r(directory)
+              raise
+            ensure
+              ctx.chdir(initial_directory)
             end
           end
         end

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

@@ -12,9 +12,10 @@ module Script
           Infrastructure::ExtensionPointRepository.new.extension_point_types
         end
 
-        def self.non_deprecated_types
+        def self.available_types
           Infrastructure::ExtensionPointRepository.new.extension_points.select do |ep|
-            !ep.deprecated?
+            next false if ep.deprecated?
+            !ep.beta? || ShopifyCli::Feature.enabled?(:scripts_beta_extension_points)
           end.map(&:type)
         end
 

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

@@ -3,14 +3,14 @@ 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_with_npm")) do
             begin
               if task_runner.dependencies_installed?
-                ctx.puts(ctx.message('script.project_deps.none_required'))
+                ctx.puts(ctx.message("script.project_deps.none_required"))
               else
-                UI::StrictSpinner.spin(ctx.message('script.project_deps.installing')) do |spinner|
+                UI::StrictSpinner.spin(ctx.message("script.project_deps.installing")) do |spinner|
                   task_runner.install_dependencies
-                  spinner.update_title(ctx.message('script.project_deps.installed'))
+                  spinner.update_title(ctx.message("script.project_deps.installed"))
                 end
               end
               true

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

@@ -6,27 +6,22 @@ module Script
       class PushScript
         class << self
           def call(ctx:, force:)
-            script_project = ScriptProject.current
+            script_project_repo = Infrastructure::ScriptProjectRepository.new(ctx: ctx)
+            script_project = script_project_repo.get
             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,
-              extension_point_type: script_project.extension_point_type,
-              script_name: script_project.script_name,
-              description: script_project.description
-            )
+            BuildScript.call(ctx: ctx, task_runner: task_runner, script_project: script_project)
 
-            UI::PrintingSpinner.spin(ctx, ctx.message('script.application.pushing')) do |p_ctx, spinner|
+            UI::PrintingSpinner.spin(ctx, ctx.message("script.application.pushing")) do |p_ctx, spinner|
               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,
+                script_project: script_project,
                 compiled_type: task_runner.compiled_type,
-                metadata: task_runner.metadata
+                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'))
+              uuid = package.push(Infrastructure::ScriptService.new(ctx: p_ctx), script_project.api_key, force)
+              script_project_repo.update_env(uuid: uuid)
+              spinner.update_title(p_ctx.message("script.application.pushed"))
             end
           end
         end

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

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module Script
+  module Layers
+    module Domain
+      class ConfigUi
+        attr_reader :filename, :content
+
+        def initialize(filename:, content:)
+          @filename = filename
+          @content = content
+        end
+      end
+    end
+  end
+end

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

@@ -14,6 +14,22 @@ module Script
           end
         end
 
+        class InvalidConfigUiDefinitionError < ScriptProjectError
+          attr_reader :filename
+          def initialize(filename)
+            super()
+            @filename = filename
+          end
+        end
+
+        class MissingSpecifiedConfigUiDefinitionError < ScriptProjectError
+          attr_reader :filename
+          def initialize(filename)
+            super()
+            @filename = filename
+          end
+        end
+
         class ScriptNotFoundError < ScriptProjectError
           attr_reader :script_name, :extension_point_type
           def initialize(extension_point_type, script_name)

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

@@ -4,79 +4,94 @@ module Script
   module Layers
     module Domain
       class ExtensionPoint
-        attr_reader :type, :deprecated, :sdks
+        attr_reader :type, :beta, :deprecated, :sdks, :domain
 
         def initialize(type, config)
           @type = type
+          @beta = config["beta"] || false
           @deprecated = config["deprecated"] || false
+          @domain = config["domain"] || nil
           @sdks = ExtensionPointSDKs.new(config)
         end
 
+        def beta?
+          @beta
+        end
+
         def deprecated?
           @deprecated
         end
-      end
 
-      class ExtensionPointSDKs
-        def initialize(config)
-          @config = config
+        def dasherize_type
+          @type.gsub("_", "-")
         end
 
-        def all
-          [assemblyscript, rust].compact
-        end
+        class ExtensionPointSDKs
+          def initialize(config)
+            @config = config
+          end
 
-        def assemblyscript
-          @assemblyscript ||= new_sdk(ExtensionPointAssemblyScriptSDK)
-        end
+          def all
+            [assemblyscript, rust].compact
+          end
 
-        def rust
-          @rust ||= new_sdk(ExtensionPointRustSDK)
-        end
+          def assemblyscript
+            @assemblyscript ||= new_sdk(ExtensionPointAssemblyScriptSDK)
+          end
+
+          def rust
+            @rust ||= new_sdk(ExtensionPointRustSDK)
+          end
 
-        private
+          private
 
-        def new_sdk(klass)
-          config = @config[klass.language]
-          return nil if config.nil?
-          klass.new(config)
+          def new_sdk(klass)
+            config = @config[klass.language]
+            return nil if config.nil?
+            klass.new(config)
+          end
         end
-      end
 
-      class ExtensionPointSDK
-        attr_reader :beta, :package
+        class ExtensionPointSDK
+          attr_reader :version, :beta, :package
 
-        def initialize(config)
-          @beta = config["beta"] || false
-          @package = config["package"]
-        end
+          def initialize(config)
+            @beta = config["beta"] || false
+            @package = config["package"]
+            @version = config["package-version"]
+          end
 
-        def beta?
-          @beta
-        end
+          def beta?
+            @beta
+          end
+
+          def versioned?
+            @version
+          end
 
-        def self.language
-          raise NotImplementedError
+          def self.language
+            raise NotImplementedError
+          end
         end
-      end
 
-      class ExtensionPointAssemblyScriptSDK < ExtensionPointSDK
-        attr_reader :sdk_version, :toolchain_version
+        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 initialize(config)
+            super
+            @sdk_version = config["sdk-version"]
+            @toolchain_version = config["toolchain-version"]
+          end
 
-        def self.language
-          "assemblyscript"
+          def self.language
+            "assemblyscript"
+          end
         end
-      end
 
-      class ExtensionPointRustSDK < ExtensionPointSDK
-        def self.language
-          "rust"
+        class ExtensionPointRustSDK < ExtensionPointSDK
+          def self.language
+            "rust"
+          end
         end
       end
     end