shopify-cli 1.5.0 → 1.9.0

data/lib/project_types/rails/messages/messages.rb

@@ -30,16 +30,16 @@ module Rails
             Usage: {{command:%s create rails}}
             Options:
               {{command:--name=NAME}} App name. Any string.
-              {{command:--app_url=APPURL}} App URL. Must be a valid URL.
-              {{command:--organization_id=ID}} Partner organization ID. Must be an existing organization.
-              {{command:--shop_domain=MYSHOPIFYDOMAIN }} Development store URL. Must be an existing development store.
+              {{command:--app-url=APPURL}} App URL. Must be a valid URL.
+              {{command:--organization-id=ID}} Partner organization ID. Must be an existing organization.
+              {{command:--shop-domain=MYSHOPIFYDOMAIN }} Development store URL. Must be an existing development store.
               {{command:--db=DB}} Database type. Must be one of: mysql, postgresql, sqlite3, oracle, frontbase, ibm_db, sqlserver, jdbcmysql, jdbcsqlite3, jdbcpostgresql, jdbc.
-              {{command:--rails_opts=RAILSOPTS}} Additional options. Must be string containing one or more valid Rails options, separated by spaces.
+              {{command:--rails-opts=RAILSOPTS}} Additional options. Must be string containing one or more valid Rails options, separated by spaces.
           HELP
 
           error: {
             invalid_ruby_version: <<~MSG,
-            This project requires a ruby version ~> 2.5.
+            This project requires a Ruby version ~> 2.5 or Ruby 3.0
             See {{underline:https://github.com/Shopify/shopify-app-cli/blob/master/docs/installing-ruby.md}}
             for our recommended method of installing ruby.
             MSG
@@ -257,6 +257,7 @@ module Rails
         forms: {
           create: {
             error: {
+              invalid_app_name: "App name cannot contain 'Shopify'",
               invalid_app_type: "Invalid app type %s",
               invalid_db_type: "Invalid database type %s",
             },

data/lib/project_types/rails/ruby.rb

@@ -8,8 +8,8 @@ module Rails
 
     class << self
       def version(ctx)
-        require 'semantic/semantic'
-        out, _ = ctx.capture2('ruby', '-v')
+        require "semantic/semantic"
+        out, _ = ctx.capture2("ruby", "-v")
         Semantic::Version.new(VERSION_STRING.match(out)[1])
       end
     end

data/lib/project_types/script/cli.rb

@@ -3,74 +3,73 @@
 module Script
   class Project < ShopifyCli::ProjectType
     hidden_feature(feature_set: :script_project)
-    title('Script')
-    creator('Script::Commands::Create')
+    title("Script")
+    creator("Script::Commands::Create")
 
-    register_command('Script::Commands::Push', 'push')
-    register_command('Script::Commands::Disable', 'disable')
-    register_command('Script::Commands::Enable', 'enable')
+    register_command("Script::Commands::Push", "push")
 
-    require Project.project_filepath('messages/messages')
+    require Project.project_filepath("messages/messages")
     register_messages(Script::Messages::MESSAGES)
   end
 
   # define/autoload project specific Commands
   module Commands
-    autoload :Create, Project.project_filepath('commands/create')
-    autoload :Push, Project.project_filepath('commands/push')
-    autoload :Disable, Project.project_filepath('commands/disable')
-    autoload :Enable, Project.project_filepath('commands/enable')
+    autoload :Create, Project.project_filepath("commands/create")
+    autoload :Push, Project.project_filepath("commands/push")
   end
 
   # define/autoload project specific Forms
   module Forms
-    autoload :Create, Project.project_filepath('forms/create')
-    autoload :ScriptForm, Project.project_filepath('forms/script_form')
+    autoload :Create, Project.project_filepath("forms/create")
+    autoload :ScriptForm, Project.project_filepath("forms/script_form")
   end
 
   module Layers
     module Application
-      autoload :BuildScript, Project.project_filepath('layers/application/build_script')
-      autoload :CreateScript, Project.project_filepath('layers/application/create_script')
-      autoload :PushScript, Project.project_filepath('layers/application/push_script')
-      autoload :DisableScript, Project.project_filepath('layers/application/disable_script')
-      autoload :EnableScript, Project.project_filepath('layers/application/enable_script')
-      autoload :ExtensionPoints, Project.project_filepath('layers/application/extension_points')
-      autoload :ProjectDependencies, Project.project_filepath('layers/application/project_dependencies')
+      autoload :BuildScript, Project.project_filepath("layers/application/build_script")
+      autoload :CreateScript, Project.project_filepath("layers/application/create_script")
+      autoload :PushScript, Project.project_filepath("layers/application/push_script")
+      autoload :ExtensionPoints, Project.project_filepath("layers/application/extension_points")
+      autoload :ProjectDependencies, Project.project_filepath("layers/application/project_dependencies")
     end
 
     module Domain
-      autoload :Errors, Project.project_filepath('layers/domain/errors')
-      autoload :PushPackage, Project.project_filepath('layers/domain/push_package')
-      autoload :ExtensionPoint, Project.project_filepath('layers/domain/extension_point')
-      autoload :Script, Project.project_filepath('layers/domain/script')
+      autoload :Errors, Project.project_filepath("layers/domain/errors")
+      autoload :ConfigUi, Project.project_filepath("layers/domain/config_ui")
+      autoload :PushPackage, Project.project_filepath("layers/domain/push_package")
+      autoload :Metadata, Project.project_filepath("layers/domain/metadata")
+      autoload :ExtensionPoint, Project.project_filepath("layers/domain/extension_point")
+      autoload :ScriptProject, Project.project_filepath("layers/domain/script_project")
     end
 
     module Infrastructure
-      autoload :Errors, Project.project_filepath('layers/infrastructure/errors')
+      autoload :Errors, Project.project_filepath("layers/infrastructure/errors")
       autoload :AssemblyScriptDependencyManager,
-               Project.project_filepath('layers/infrastructure/assemblyscript_dependency_manager')
+        Project.project_filepath("layers/infrastructure/assemblyscript_dependency_manager")
       autoload :AssemblyScriptProjectCreator,
-               Project.project_filepath('layers/infrastructure/assemblyscript_project_creator')
-      autoload :AssemblyScriptTaskRunner, Project.project_filepath('layers/infrastructure/assemblyscript_task_runner')
-      autoload :AssemblyScriptTsConfig, Project.project_filepath('layers/infrastructure/assemblyscript_tsconfig')
-      autoload :PushPackageRepository, Project.project_filepath('layers/infrastructure/push_package_repository')
-      autoload :ExtensionPointRepository, Project.project_filepath('layers/infrastructure/extension_point_repository')
-      autoload :ProjectCreator, Project.project_filepath('layers/infrastructure/project_creator')
-      autoload :ScriptRepository, Project.project_filepath('layers/infrastructure/script_repository')
-      autoload :ScriptService, Project.project_filepath('layers/infrastructure/script_service')
-      autoload :TaskRunner, Project.project_filepath('layers/infrastructure/task_runner')
+        Project.project_filepath("layers/infrastructure/assemblyscript_project_creator")
+      autoload :AssemblyScriptTaskRunner, Project.project_filepath("layers/infrastructure/assemblyscript_task_runner")
+      autoload :AssemblyScriptTsConfig, Project.project_filepath("layers/infrastructure/assemblyscript_tsconfig")
+      autoload :RustProjectCreator,
+        Project.project_filepath("layers/infrastructure/rust_project_creator.rb")
+      autoload :RustTaskRunner, Project.project_filepath("layers/infrastructure/rust_task_runner")
+
+      autoload :PushPackageRepository, Project.project_filepath("layers/infrastructure/push_package_repository")
+      autoload :ExtensionPointRepository, Project.project_filepath("layers/infrastructure/extension_point_repository")
+      autoload :ProjectCreator, Project.project_filepath("layers/infrastructure/project_creator")
+      autoload :ScriptProjectRepository, Project.project_filepath("layers/infrastructure/script_project_repository")
+      autoload :ScriptService, Project.project_filepath("layers/infrastructure/script_service")
+      autoload :TaskRunner, Project.project_filepath("layers/infrastructure/task_runner")
     end
   end
 
   module UI
-    autoload :ErrorHandler, Project.project_filepath('ui/error_handler')
-    autoload :PrintingSpinner, Project.project_filepath('ui/printing_spinner')
-    autoload :StrictSpinner, Project.project_filepath('ui/strict_spinner')
+    autoload :ErrorHandler, Project.project_filepath("ui/error_handler")
+    autoload :PrintingSpinner, Project.project_filepath("ui/printing_spinner")
+    autoload :StrictSpinner, Project.project_filepath("ui/strict_spinner")
   end
 
-  autoload :ScriptProject, Project.project_filepath('script_project')
-  autoload :Errors, Project.project_filepath('errors')
+  autoload :Errors, Project.project_filepath("errors")
 
   class ScriptProjectError < StandardError; end
 end

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

@@ -4,38 +4,36 @@ module Script
   module Commands
     class Create < ShopifyCli::SubCommand
       options do |parser, flags|
-        parser.on('--name=NAME') { |name| flags[:name] = name }
-        parser.on('--extension_point=EP_NAME') { |ep_name| flags[:extension_point] = ep_name }
+        parser.on("--name=NAME") { |name| flags[:name] = name }
+        parser.on("--extension_point=EP_NAME") { |ep_name| flags[:extension_point] = ep_name }
+        parser.on("--extension-point=EP_NAME") { |ep_name| flags[:extension_point] = ep_name }
+        parser.on("--language=LANGUAGE") { |language| flags[:language] = language }
+        parser.on("--no-config-ui") { |no_config_ui| flags[:no_config_ui] = no_config_ui }
       end
 
       def call(args, _name)
-        language = 'ts'
-        cur_dir = @ctx.root
-
         form = Forms::Create.ask(@ctx, args, options.flags)
         return @ctx.puts(self.class.help) if form.nil?
 
-        unless !form.name.empty? && form.extension_point && ScriptProject::SUPPORTED_LANGUAGES.include?(language)
+        unless !form.name.empty? && form.extension_point && form.language
           return @ctx.puts(self.class.help)
         end
 
         project = Layers::Application::CreateScript.call(
           ctx: @ctx,
-          language: language,
+          language: form.language,
           script_name: form.name,
-          extension_point_type: form.extension_point
+          extension_point_type: form.extension_point,
+          no_config_ui: options.flags.key?(:no_config_ui)
         )
-        @ctx.puts(@ctx.message('script.create.change_directory_notice', project.script_name))
-      rescue Script::Errors::ScriptProjectAlreadyExistsError => e
-        UI::ErrorHandler.pretty_print_and_raise(e, failed_op: @ctx.message('script.create.error.operation_failed'))
+        @ctx.puts(@ctx.message("script.create.change_directory_notice", project.script_name))
       rescue StandardError => e
-        ScriptProject.cleanup(ctx: @ctx, script_name: form.name, root_dir: cur_dir) if form
-        UI::ErrorHandler.pretty_print_and_raise(e, failed_op: @ctx.message('script.create.error.operation_failed'))
+        UI::ErrorHandler.pretty_print_and_raise(e, failed_op: @ctx.message("script.create.error.operation_failed"))
       end
 
       def self.help
         allowed_values = Script::Layers::Application::ExtensionPoints.types.map { |type| "{{cyan:#{type}}}" }
-        ShopifyCli::Context.message('script.create.help', ShopifyCli::TOOL_NAME, allowed_values.join(', '))
+        ShopifyCli::Context.message("script.create.help", ShopifyCli::TOOL_NAME, allowed_values.join(", "))
       end
     end
   end

data/lib/project_types/script/commands/push.rb

@@ -4,31 +4,24 @@ module Script
   module Commands
     class Push < ShopifyCli::Command
       options do |parser, flags|
-        parser.on('--force') { |t| flags[:force] = t }
+        parser.on("--force") { |t| flags[:force] = t }
       end
 
       def call(_args, _name)
         ShopifyCli::Tasks::EnsureEnv.call(@ctx, required: [:api_key, :secret, :shop])
-        project = ScriptProject.current
-        api_key = project.env[:api_key]
-        return @ctx.puts(self.class.help) unless api_key &&
-          ScriptProject::SUPPORTED_LANGUAGES.include?(project.language)
-        Layers::Application::PushScript.call(
-          ctx: @ctx,
-          language: project.language,
-          extension_point_type: project.extension_point_type,
-          script_name: project.script_name,
-          source_file: project.source_file,
-          api_key: api_key,
-          force: options.flags.key?(:force)
-        )
-        @ctx.puts(@ctx.message('script.push.script_pushed', api_key: api_key))
+
+        api_key = Layers::Infrastructure::ScriptProjectRepository.new(ctx: @ctx).get.api_key
+        return @ctx.puts(self.class.help) unless api_key
+
+        Layers::Application::PushScript.call(ctx: @ctx, force: options.flags.key?(:force))
+        @ctx.puts(@ctx.message("script.push.script_pushed", api_key: api_key))
       rescue StandardError => e
-        UI::ErrorHandler.pretty_print_and_raise(e, failed_op: @ctx.message('script.push.error.operation_failed'))
+        msg = @ctx.message("script.push.error.operation_failed", api_key: api_key)
+        UI::ErrorHandler.pretty_print_and_raise(e, failed_op: msg)
       end
 
       def self.help
-        ShopifyCli::Context.message('script.push.help', ShopifyCli::TOOL_NAME)
+        ShopifyCli::Context.message("script.push.help", ShopifyCli::TOOL_NAME)
       end
     end
   end

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

@@ -1,25 +1,44 @@
 discount:
+  deprecated: true
   assemblyscript:
     package: "@shopify/extension-point-as-discount"
-    sdk-version: "^7.0.0"
-    toolchain-version: "^2.0.1"
+    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: "^2.0.1"
+    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: "^2.0.1"
+    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: "^2.0.1"
+    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: "^2.0.1"
+    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

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

@@ -3,31 +3,44 @@
 module Script
   module Forms
     class Create < ShopifyCli::Form
-      flag_arguments :extension_point, :name
+      flag_arguments :extension_point, :name, :language
 
       def ask
         self.name = valid_name
         self.extension_point ||= ask_extension_point
+        self.language = ask_language
       end
 
       private
 
       def ask_extension_point
         CLI::UI::Prompt.ask(
-          @ctx.message('script.forms.create.select_extension_point'),
-          options: Script::Layers::Application::ExtensionPoints.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'))
+        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
+        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"),
+          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,
+  $configUi: String,
   $sourceCode: String,
   $language: String,
-  $force: Boolean
+  $force: Boolean,
+  $schemaMajorVersion: String,
+  $schemaMinorVersion: String,
+  $useMsgpack: Boolean
 ) {
   appScriptUpdateOrCreate(
     extensionPointName: $extensionPointName
     title: $title
+    configUi: $configUi
     sourceCode: $sourceCode
     language: $language
     force: $force
+    schemaMajorVersion: $schemaMajorVersion
+    schemaMinorVersion: $schemaMinorVersion
+    useMsgpack: $useMsgpack
 ) {
     userErrors {
       field

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,14 +5,17 @@ module Script
     module Application
       class BuildScript
         class << self
-          def call(ctx:, task_runner:, script:)
-            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|
-                  Infrastructure::PushPackageRepository
-                    .new(ctx: ctx)
-                    .create_push_package(script, task_runner.build, task_runner.compiled_type)
-                  spinner.update_title(ctx.message('script.application.built'))
+                UI::StrictSpinner.spin(ctx.message("script.application.building_script")) do |spinner|
+                  Infrastructure::PushPackageRepository.new(ctx: ctx).create_push_package(
+                    script_project: script_project,
+                    script_content: task_runner.build,
+                    compiled_type: task_runner.compiled_type,
+                    metadata: task_runner.metadata,
+                  )
+                  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,40 +7,52 @@ module Script
     module Application
       class CreateScript
         class << self
-          def call(ctx:, language:, script_name:, extension_point_type:)
-            extension_point = ExtensionPoints.get(type: extension_point_type)
-            project = setup_project(ctx, script_name, extension_point)
-            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)
-            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, script_name, extension_point)
-            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
-            )
-            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)
-            UI::StrictSpinner.spin(ctx.message('script.create.creating')) do |spinner|
+          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
+
+          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