shopify-cli 1.7.1 → 1.11.0

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

@@ -8,8 +8,8 @@ module Node
 
       def ask
         self.title ||= CLI::UI::Prompt.ask(ctx.message("node.forms.create.app_name"))
+        self.name = format_name
         self.type = ask_type
-        self.name = self.title.downcase.split(" ").join("_")
         res = ShopifyCli::Tasks::SelectOrgAndShop.call(ctx, organization_id: organization_id, shop_domain: shop_domain)
         self.organization_id = res[:organization_id]
         self.shop_domain = res[:shop_domain]
@@ -17,6 +17,15 @@ module Node
 
       private
 
+      def format_name
+        name = title.downcase.split(" ").join("_")
+
+        if name.include?("shopify")
+          ctx.abort(ctx.message("node.forms.create.error.invalid_app_name"))
+        end
+        name
+      end
+
       def ask_type
         if type.nil?
           return CLI::UI::Prompt.ask(ctx.message("node.forms.create.app_type.select")) do |handler|

data/lib/project_types/node/messages/messages.rb

@@ -59,21 +59,21 @@ module Node
             installed: "Installed Heroku CLI",
             authenticating: "Authenticating with Heroku…",
             authenticated: "{{v}} Authenticated with Heroku",
-            authenticated_with_account: "{{v}} Authenticated with Heroku as `%s`",
+            authenticated_with_account: "{{v}} Authenticated with Heroku as {{green:%s}}",
             deploying: "Deploying to Heroku…",
             deployed: "{{v}} Deployed to Heroku",
             git: {
               checking: "Checking git repo…",
               initialized: "Git repo initialized",
               what_branch: "What branch would you like to deploy?",
-              branch_selected: "{{v}} Git branch `%s` selected for deploy",
+              branch_selected: "{{v}} Git branch {{green:%s}} selected for deploy",
             },
             app: {
               no_apps_found: "No existing Heroku app found. What would you like to do?",
               name: "What is your Heroku app’s name?",
               select: "Specify an existing Heroku app",
-              selecting: "Selecting Heroku app `%s`…",
-              selected: "{{v}} Heroku app `%s` selected",
+              selecting: "Selecting Heroku app %s…",
+              selected: "{{v}} Heroku app {{green:%s}} selected",
               create: "Create a new Heroku app",
               creating: "Creating new Heroku app…",
               created: "{{v}} New Heroku app created",
@@ -202,6 +202,7 @@ module Node
         forms: {
           create: {
             error: {
+              invalid_app_name: "App name cannot contain 'Shopify'",
               invalid_app_type: "Invalid app type %s",
             },
             app_name: "App name",

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

@@ -20,8 +20,8 @@ module Rails
 
       def ask
         self.title ||= CLI::UI::Prompt.ask(ctx.message("rails.forms.create.app_name"))
+        self.name = format_name
         self.type = ask_type
-        self.name = self.title.downcase.split(" ").join("_")
         res = ShopifyCli::Tasks::SelectOrgAndShop.call(ctx, organization_id: organization_id, shop_domain: shop_domain)
         self.organization_id = res[:organization_id]
         self.shop_domain = res[:shop_domain]
@@ -30,6 +30,16 @@ module Rails
 
       private
 
+      def format_name
+        name = title.downcase.split(" ").join("_")
+
+        if name.include?("shopify")
+          ctx.abort(ctx.message("rails.forms.create.error.invalid_app_name"))
+        end
+
+        name
+      end
+
       def ask_type
         if type.nil?
           return CLI::UI::Prompt.ask(ctx.message("rails.forms.create.app_type.select")) do |handler|

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

@@ -89,7 +89,7 @@ module Rails
             downloaded: "Downloaded Heroku CLI",
             installing: "Installing Heroku CLI...",
             installed: "Installed Heroku CLI",
-            authenticated_with_account: "{{v}} Authenticated with Heroku as `%s`",
+            authenticated_with_account: "{{v}} Authenticated with Heroku as {{green:%s}}",
             authenticating: "Authenticating with Heroku...",
             authenticated: "{{v}} Authenticated with Heroku",
             deploying: "Deploying to Heroku...",
@@ -109,14 +109,14 @@ module Rails
               checking: "Checking git repo...",
               initialized: "Git repo initialized",
               what_branch: "What branch would you like to deploy?",
-              branch_selected: "{{v}} Git branch `%s` selected for deploy",
+              branch_selected: "{{v}} Git branch {{green:%s}} selected for deploy",
             },
             app: {
               no_apps_found: "No existing Heroku app found. What would you like to do?",
               name: "What is your Heroku app’s name?",
               select: "Specify an existing Heroku app",
-              selecting: "Selecting Heroku app `%s`...",
-              selected: "{{v}} Heroku app `%s` selected",
+              selecting: "Selecting Heroku app %s...",
+              selected: "{{v}} Heroku app {{green:%s}} selected",
               create: "Create a new Heroku app",
               creating: "Creating new Heroku app...",
               created: "{{v}} New Heroku app created",
@@ -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/script/cli.rb

@@ -7,8 +7,6 @@ module Script
     creator("Script::Commands::Create")
 
     register_command("Script::Commands::Push", "push")
-    register_command("Script::Commands::Disable", "disable")
-    register_command("Script::Commands::Enable", "enable")
 
     require Project.project_filepath("messages/messages")
     register_messages(Script::Messages::MESSAGES)
@@ -18,8 +16,6 @@ module Script
   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")
   end
 
   # define/autoload project specific Forms
@@ -28,13 +24,15 @@ module Script
     autoload :ScriptForm, Project.project_filepath("forms/script_form")
   end
 
+  module Tasks
+    autoload :EnsureEnv, Project.project_filepath("tasks/ensure_env")
+  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")
     end
@@ -45,6 +43,7 @@ module Script
       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
@@ -55,14 +54,15 @@ module Script
         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 :CommandRunner, Project.project_filepath("layers/infrastructure/command_runner")
       autoload :RustProjectCreator,
         Project.project_filepath("layers/infrastructure/rust_project_creator.rb")
       autoload :RustTaskRunner, Project.project_filepath("layers/infrastructure/rust_task_runner")
 
-      autoload :ConfigUiRepository, Project.project_filepath("layers/infrastructure/config_ui_repository")
       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
@@ -74,7 +74,6 @@ module Script
     autoload :StrictSpinner, Project.project_filepath("ui/strict_spinner")
   end
 
-  autoload :ScriptProject, Project.project_filepath("script_project")
   autoload :Errors, Project.project_filepath("errors")
 
   class ScriptProjectError < StandardError; end

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

@@ -5,7 +5,6 @@ module Script
     class Create < ShopifyCli::SubCommand
       options do |parser, flags|
         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 }
@@ -13,8 +12,6 @@ module Script
       end
 
       def call(args, _name)
-        cur_dir = @ctx.root
-
         form = Forms::Create.ask(@ctx, args, options.flags)
         return @ctx.puts(self.class.help) if form.nil?
 
@@ -27,14 +24,10 @@ module Script
           language: form.language,
           script_name: form.name,
           extension_point_type: form.extension_point,
-          description: form.description,
           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"))
       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"))
       end
 

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

@@ -8,15 +8,15 @@ module Script
       end
 
       def call(_args, _name)
-        ShopifyCli::Tasks::EnsureEnv.call(@ctx, required: [:api_key, :secret, :shop])
+        Tasks::EnsureEnv.call(@ctx)
 
-        api_key = ScriptProject.current.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
-        msg = @ctx.message("script.push.error.operation_failed", api_key: ShopifyCli::Project.current.env.api_key)
+        msg = @ctx.message("script.push.error.operation_failed", api_key: api_key)
         UI::ErrorHandler.pretty_print_and_raise(e, failed_op: msg)
       end
 

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

@@ -5,11 +5,13 @@ discount:
     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: "^9.0.0"
     toolchain-version: "^5.0.0"
 payment_filter:
+  deprecated: true
   assemblyscript:
     package: "@shopify/extension-point-as-payment-filter"
     sdk-version: "^9.0.0"
@@ -18,12 +20,27 @@ payment_filter:
     beta: true
     package: "https://github.com/Shopify/scripts-apis-rs"
 shipping_filter:
+  deprecated: true
   assemblyscript:
     package: "@shopify/extension-point-as-shipping-filter"
     sdk-version: "^9.0.0"
     toolchain-version: "^5.0.0"
 tax_filter:
+  beta: true
   assemblyscript:
     package: "@shopify/extension-point-as-tax-filter"
     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,7 +2,6 @@
 
 module Script
   module Errors
-    class InvalidContextError < ScriptProjectError; end
     class InvalidScriptNameError < ScriptProjectError; end
 
     class NoExistingAppsError < ScriptProjectError; end
@@ -16,7 +15,6 @@ module Script
       end
     end
 
-    class ScriptProjectAlreadyExistsError < ScriptProjectError; end
     class InvalidConfigProps < ScriptProjectError; end
 
     class InvalidConfigYAMLError < ScriptProjectError
@@ -26,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
@@ -17,7 +16,7 @@ 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
+          options: Layers::Application::ExtensionPoints.available_types
         )
       end
 
@@ -25,10 +24,6 @@ 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_-]*$/)
@@ -36,13 +31,7 @@ module Script
       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

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

@@ -1,26 +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
@@ -28,11 +28,11 @@ mutation AppScriptUpdateOrCreate(
       tag
     }
     appScript {
+      uuid
       appKey
       configSchema
       extensionPointName
       title
-      description
     }
   }
 }

data/lib/project_types/script/graphql/get_app_scripts.graphql

@@ -0,0 +1,6 @@
+query GetAppScripts($appKey: String!, $extensionPointName: ExtensionPointName!) {
+  appScripts(appKeys: [$appKey], extensionPointName: $extensionPointName) {
+    uuid
+    title
+  }
+}

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,7 +5,7 @@ module Script
     module Application
       class BuildScript
         class << self
-          def call(ctx:, task_runner:, script_project:, config_ui:)
+          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|
@@ -14,7 +14,6 @@ module Script
                     script_content: task_runner.build,
                     compiled_type: task_runner.compiled_type,
                     metadata: task_runner.metadata,
-                    config_ui: config_ui,
                   )
                   spinner.update_title(ctx.message("script.application.built"))
                 end