shopify-cli 1.3.1 → 1.7.0

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

@@ -17,22 +17,29 @@ module Rails
           setting_gem_path: "GEM_PATH being set to %s",
         },
 
+        connect: {
+          connected: "Project now connected to {{green:%s}}",
+          production_warning: <<~MESSAGE,
+          {{yellow:! Warning: if you have connected to an {{bold:app in production}}, running {{command:serve}} may update the app URL and cause an outage.
+          MESSAGE
+        },
+
         create: {
           help: <<~HELP,
           {{command:%s create rails}}: Creates a ruby on rails app.
             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
@@ -48,10 +55,6 @@ module Rails
           },
 
           info: {
-            created: "{{v}} {{green:%s}} was created in your Partner Dashboard {{underline:%s}}",
-            serve: "{{*}} Change directories to your new project folder {{green:%s}} and run {{command:%s serve}} " \
-              "to start a local server",
-            install: "{{*}} Then, visit {{underline:%s/test}} to install {{green:%s}} on your Dev Store",
             open_new_shell: "{{*}} {{yellow:After installing %s, please open a new Command Prompt or PowerShell " \
               "window to continue.}}",
           },

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,73 +3,77 @@
 module Script
   class Project < ShopifyCli::ProjectType
     hidden_feature(feature_set: :script_project)
-    creator 'Script', '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")
+    register_command("Script::Commands::Disable", "disable")
+    register_command("Script::Commands::Enable", "enable")
 
-    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")
+    autoload :Disable, Project.project_filepath("commands/disable")
+    autoload :Enable, Project.project_filepath("commands/enable")
   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 :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")
     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 :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")
     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 :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 :ScriptProject, Project.project_filepath("script_project")
+  autoload :Errors, Project.project_filepath("errors")
 
   class ScriptProjectError < StandardError; end
 end

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

@@ -4,38 +4,41 @@ 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("--description=DESCRIPTION") { |description| flags[:description] = description }
+        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 }
       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,
+          description: form.description
         )
-        @ctx.puts(@ctx.message('script.create.change_directory_notice', project.script_name))
+        @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'))
+        UI::ErrorHandler.pretty_print_and_raise(e, failed_op: @ctx.message("script.create.error.operation_failed"))
       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/disable.rb

@@ -12,13 +12,13 @@ module Script
           shop_domain: project.env[:shop],
           extension_point_type: project.extension_point_type
         )
-        @ctx.puts(@ctx.message('script.disable.script_disabled'))
+        @ctx.puts(@ctx.message("script.disable.script_disabled"))
       rescue StandardError => e
-        UI::ErrorHandler.pretty_print_and_raise(e, failed_op: @ctx.message('script.disable.error.operation_failed'))
+        UI::ErrorHandler.pretty_print_and_raise(e, failed_op: @ctx.message("script.disable.error.operation_failed"))
       end
 
       def self.help
-        ShopifyCli::Context.message('script.disable.help', ShopifyCli::TOOL_NAME)
+        ShopifyCli::Context.message("script.disable.help", ShopifyCli::TOOL_NAME)
       end
     end
   end

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

@@ -4,10 +4,10 @@ module Script
   module Commands
     class Enable < ShopifyCli::Command
       options do |parser, flags|
-        parser.on('--config_props=KEYVALUEPAIRS', Array) do |t|
-          flags[:config_props] = Hash[t.map { |s| s.split(':') }]
-        end
-        parser.on('--config_file=CONFIGFILEPATH') { |t| flags[:config_file] = t }
+        parser.on("--config_props=KEYVALUEPAIRS", Array) { |t| flags[:config_props] = t }
+        parser.on("--config-props=KEYVALUEPAIRS", Array) { |t| flags[:config_props] = t }
+        parser.on("--config_file=CONFIGFILEPATH") { |t| flags[:config_file] = t }
+        parser.on("--config-file=CONFIGFILEPATH") { |t| flags[:config_file] = t }
       end
 
       def call(_args, _name)
@@ -25,21 +25,21 @@ module Script
           title: project.script_name
         )
         @ctx.puts(@ctx.message(
-          'script.enable.script_enabled',
+          "script.enable.script_enabled",
           api_key: api_key,
           shop_domain: shop_domain,
           type: project.extension_point_type.capitalize,
           title: project.script_name
         ))
-        @ctx.puts(@ctx.message('script.enable.info'))
+        @ctx.puts(@ctx.message("script.enable.info"))
       rescue Errors::InvalidConfigYAMLError => e
         UI::ErrorHandler.pretty_print_and_raise(e)
       rescue StandardError => e
-        UI::ErrorHandler.pretty_print_and_raise(e, failed_op: @ctx.message('script.enable.error.operation_failed'))
+        UI::ErrorHandler.pretty_print_and_raise(e, failed_op: @ctx.message("script.enable.error.operation_failed"))
       end
 
       def self.help
-        ShopifyCli::Context.message('script.enable.help', ShopifyCli::TOOL_NAME)
+        ShopifyCli::Context.message("script.enable.help", ShopifyCli::TOOL_NAME)
       end
 
       private
@@ -47,7 +47,7 @@ module Script
       def acquire_configuration(config_file: nil, config_props: nil)
         properties = {}
         properties = YAML.load(File.read(config_file)) unless config_file.nil?
-        properties = properties.merge(config_props) unless config_props.nil?
+        properties = properties.merge(parse_config_props(config_props)) unless config_props.nil?
 
         configuration = { entries: [] }
         properties.each do |key, value|
@@ -61,6 +61,16 @@ module Script
         raise Errors::InvalidConfigYAMLError, options.flags[:config_file]
       end
 
+      def parse_config_props(config_props)
+        Hash[
+          config_props.map do |s|
+            args = s.split(":").map(&:strip)
+            raise Errors::InvalidConfigProps unless args.size == 2
+            args
+          end
+        ]
+      end
+
       # No slice pre Ruby 2.5 so roll our own
       def slice(hash, *keys)
         Hash[hash.to_a - hash.select { |key, _value| !keys.include?(key) }.to_a]

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 = ScriptProject.current.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: ShopifyCli::Project.current.env.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,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

@@ -4,8 +4,26 @@ module Script
   module Errors
     class InvalidContextError < ScriptProjectError; end
     class InvalidScriptNameError < ScriptProjectError; 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 NoExistingAppsError < ScriptProjectError; end
     class NoExistingOrganizationsError < ScriptProjectError; end
+
     class NoExistingStoresError < ScriptProjectError
       attr_reader :organization_id
       def initialize(organization_id)
@@ -13,7 +31,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 +42,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