shopify-cli 1.3.1 → 1.7.0

data/lib/project_types/extension/tasks/configure_features.rb

@@ -0,0 +1,52 @@
+module Extension
+  module Tasks
+    class ConfigureFeatures
+      include ShopifyCli::MethodObject
+
+      class Error < RuntimeError; end
+      class UnknownSurfaceArea < Error; end
+      class UnspecifiedSurfaceArea < Error; end
+
+      def call(specification_attribute_sets)
+        specification_attribute_sets.each do |attributes|
+          argo_configuration = extract_argo_configuration(attributes)
+          next if argo_configuration.nil?
+          surface_area = extract_surface_area(argo_configuration)
+          surface_area_configuration = fetch_surface_area_configuration(surface_area)
+          argo_configuration.merge!(surface_area_configuration)
+        end
+      end
+
+      private
+
+      def extract_argo_configuration(attributes)
+        attributes.dig(:features, :argo)
+      end
+
+      def extract_surface_area(argo_configuration)
+        argo_configuration.fetch(:surface_area) do
+          raise UnspecifiedSurfaceArea, "Argo configuration does not specify surface area"
+        end
+      end
+
+      def fetch_surface_area_configuration(surface_area)
+        surface_area_configurations.fetch(surface_area.to_sym) do
+          raise UnknownSurfaceArea, "Unknown surface area: #{surface_area}"
+        end
+      end
+
+      def surface_area_configurations
+        {
+          admin: {
+            git_template: "https://github.com/Shopify/argo-admin-template.git",
+            renderer_package_name: "@shopify/argo-admin",
+          },
+          checkout: {
+            git_template: "https://github.com/Shopify/argo-checkout-template.git",
+            renderer_package_name: "@shopify/argo-checkout",
+          },
+        }
+      end
+    end
+  end
+end

data/lib/project_types/extension/tasks/converters/app_converter.rb

@@ -1,15 +1,15 @@
 # frozen_string_literal: true
-require 'shopify_cli'
+require "shopify_cli"
 
 module Extension
   module Tasks
     module Converters
       module AppConverter
-        API_KEY_FIELD = 'apiKey'
-        API_SECRET_KEYS_FIELD = 'apiSecretKeys'
-        API_SECRET_FIELD = 'secret'
-        TITLE_FIELD = 'title'
-        ORGANIZATION_NAME_FIELD = 'businessName'
+        API_KEY_FIELD = "apiKey"
+        API_SECRET_KEYS_FIELD = "apiSecretKeys"
+        API_SECRET_FIELD = "secret"
+        TITLE_FIELD = "title"
+        ORGANIZATION_NAME_FIELD = "businessName"
 
         def self.from_hash(hash, organization = {})
           return nil if hash.nil?

data/lib/project_types/extension/tasks/converters/registration_converter.rb

@@ -1,17 +1,17 @@
 # frozen_string_literal: true
-require 'shopify_cli'
+require "shopify_cli"
 
 module Extension
   module Tasks
     module Converters
       module RegistrationConverter
-        ID_FIELD = 'id'
-        TYPE_FIELD = 'type'
-        TITLE_FIELD = 'title'
-        DRAFT_VERSION_FIELD = 'draftVersion'
+        ID_FIELD = "id"
+        TYPE_FIELD = "type"
+        TITLE_FIELD = "title"
+        DRAFT_VERSION_FIELD = "draftVersion"
 
         def self.from_hash(context, hash)
-          context.abort(context.message('tasks.errors.parse_error')) if hash.nil?
+          context.abort(context.message("tasks.errors.parse_error")) if hash.nil?
 
           Models::Registration.new(
             id: hash[ID_FIELD].to_i,

data/lib/project_types/extension/tasks/converters/validation_error_converter.rb

@@ -1,16 +1,16 @@
 # frozen_string_literal: true
-require 'shopify_cli'
+require "shopify_cli"
 
 module Extension
   module Tasks
     module Converters
       module ValidationErrorConverter
-        FIELD_FIELD = 'field'
-        MESSAGE_FIELD = 'message'
+        FIELD_FIELD = "field"
+        MESSAGE_FIELD = "message"
 
         def self.from_array(context, errors)
           return [] if errors.nil?
-          context.abort(context.message('tasks.errors.parse_error')) unless errors.is_a?(Array)
+          context.abort(context.message("tasks.errors.parse_error")) unless errors.is_a?(Array)
 
           errors.map do |error|
             Models::ValidationError.new(

data/lib/project_types/extension/tasks/converters/version_converter.rb

@@ -1,18 +1,18 @@
 # frozen_string_literal: true
-require 'shopify_cli'
+require "shopify_cli"
 
 module Extension
   module Tasks
     module Converters
       module VersionConverter
-        REGISTRATION_ID_FIELD = 'registrationId'
-        CONTEXT_FIELD = 'context'
-        LAST_USER_INTERACTION_AT_FIELD = 'lastUserInteractionAt'
-        LOCATION_FIELD = 'location'
-        VALIDATION_ERRORS_FIELD = 'validationErrors'
+        REGISTRATION_ID_FIELD = "registrationId"
+        CONTEXT_FIELD = "context"
+        LAST_USER_INTERACTION_AT_FIELD = "lastUserInteractionAt"
+        LOCATION_FIELD = "location"
+        VALIDATION_ERRORS_FIELD = "validationErrors"
 
         def self.from_hash(context, hash)
-          context.abort(context.message('tasks.errors.parse_error')) if hash.nil?
+          context.abort(context.message("tasks.errors.parse_error")) if hash.nil?
 
           Models::Version.new(
             registration_id: hash[REGISTRATION_ID_FIELD].to_i,

data/lib/project_types/extension/tasks/create_extension.rb

@@ -1,15 +1,15 @@
 # frozen_string_literal: true
-require 'shopify_cli'
+require "shopify_cli"
 
 module Extension
   module Tasks
     class CreateExtension < ShopifyCli::Task
       include UserErrors
 
-      GRAPHQL_FILE = 'extension_create'
+      GRAPHQL_FILE = "extension_create"
 
       RESPONSE_FIELD = %w(data extensionCreate)
-      REGISTRATION_FIELD = 'extensionRegistration'
+      REGISTRATION_FIELD = "extensionRegistration"
 
       def call(context:, api_key:, type:, title:, config:, extension_context: nil)
         input = {
@@ -21,7 +21,7 @@ module Extension
         }
 
         response = ShopifyCli::PartnersAPI.query(context, GRAPHQL_FILE, **input).dig(*RESPONSE_FIELD)
-        context.abort(context.message('tasks.errors.parse_error')) if response.nil?
+        context.abort(context.message("tasks.errors.parse_error")) if response.nil?
 
         abort_if_user_errors(context, response)
         Converters::RegistrationConverter.from_hash(context, response.dig(REGISTRATION_FIELD))

data/lib/project_types/extension/tasks/fetch_specifications.rb

@@ -0,0 +1,38 @@
+module Extension
+  module Tasks
+    class FetchSpecifications
+      include ShopifyCli::MethodObject
+
+      def call
+        [
+          product_subscription_specification,
+          checkout_post_purchase_specification,
+        ]
+      end
+
+      private
+
+      def product_subscription_specification
+        {
+          identifier: "product_subscription",
+          features: {
+            argo: {
+              surface_area: "admin",
+            },
+          },
+        }
+      end
+
+      def checkout_post_purchase_specification
+        {
+          identifier: "checkout_post_purchase",
+          features: {
+            argo: {
+              surface_area: "checkout",
+            },
+          },
+        }
+      end
+    end
+  end
+end

data/lib/project_types/extension/tasks/get_app.rb

@@ -1,19 +1,19 @@
 # frozen_string_literal: true
-require 'shopify_cli'
+require "shopify_cli"
 
 module Extension
   module Tasks
     class GetApp < ShopifyCli::Task
-      GRAPHQL_FILE = 'get_app_by_api_key'
+      GRAPHQL_FILE = "get_app_by_api_key"
 
       RESPONSE_FIELD = %w(data)
-      APP_FIELD = 'app'
+      APP_FIELD = "app"
 
       def call(context:, api_key:)
         input = { api_key: api_key }
 
         response = ShopifyCli::PartnersAPI.query(context, GRAPHQL_FILE, **input).dig(*RESPONSE_FIELD)
-        context.abort(context.message('tasks.errors.parse_error')) if response.nil?
+        context.abort(context.message("tasks.errors.parse_error")) if response.nil?
 
         Converters::AppConverter.from_hash(response.dig(APP_FIELD))
       end

data/lib/project_types/extension/tasks/get_apps.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-require 'shopify_cli'
+require "shopify_cli"
 
 module Extension
   module Tasks
@@ -18,9 +18,9 @@ module Extension
       end
 
       def apps_owned_by_organization(organization)
-        return [] unless organization.key?('apps') && organization['apps'].any?
+        return [] unless organization.key?("apps") && organization["apps"].any?
 
-        organization['apps'].map do |app|
+        organization["apps"].map do |app|
           Converters::AppConverter.from_hash(app, organization)
         end
       end

data/lib/project_types/extension/tasks/update_draft.rb

@@ -1,15 +1,15 @@
 # frozen_string_literal: true
-require 'shopify_cli'
+require "shopify_cli"
 
 module Extension
   module Tasks
     class UpdateDraft < ShopifyCli::Task
       include UserErrors
 
-      GRAPHQL_FILE = 'extension_update_draft'
+      GRAPHQL_FILE = "extension_update_draft"
 
       RESPONSE_FIELD = %w(data extensionUpdateDraft)
-      VERSION_FIELD = 'extensionVersion'
+      VERSION_FIELD = "extensionVersion"
 
       def call(context:, api_key:, registration_id:, config:, extension_context:)
         input = {
@@ -19,7 +19,7 @@ module Extension
           extension_context: extension_context,
         }
         response = ShopifyCli::PartnersAPI.query(context, GRAPHQL_FILE, **input).dig(*RESPONSE_FIELD)
-        context.abort(context.message('tasks.errors.parse_error')) if response.nil?
+        context.abort(context.message("tasks.errors.parse_error")) if response.nil?
 
         abort_if_user_errors(context, response)
         Converters::VersionConverter.from_hash(context, response.dig(VERSION_FIELD))

data/lib/project_types/extension/tasks/user_errors.rb

@@ -1,12 +1,12 @@
 # frozen_string_literal: true
-require 'shopify_cli'
+require "shopify_cli"
 
 module Extension
   module Tasks
     module UserErrors
-      USER_ERRORS_FIELD = 'userErrors'
-      MESSAGE_FIELD = 'message'
-      USER_ERRORS_PARSE_ERROR = 'Unable to parse errors from server.'
+      USER_ERRORS_FIELD = "userErrors"
+      MESSAGE_FIELD = "message"
+      USER_ERRORS_PARSE_ERROR = "Unable to parse errors from server."
 
       def abort_if_user_errors(context, response)
         return if response.nil?

data/lib/project_types/node/cli.rb

@@ -1,29 +1,32 @@
 # frozen_string_literal: true
 module Node
   class Project < ShopifyCli::ProjectType
-    creator 'Node.js App', 'Node::Commands::Create'
+    title("Node.js App")
+    creator("Node::Commands::Create")
+    connector("Node::Commands::Connect")
 
-    register_command('Node::Commands::Deploy', "deploy")
-    register_command('Node::Commands::Generate', "generate")
-    register_command('Node::Commands::Open', "open")
-    register_command('Node::Commands::Populate', "populate")
-    register_command('Node::Commands::Serve', "serve")
-    register_command('Node::Commands::Tunnel', "tunnel")
+    register_command("Node::Commands::Deploy", "deploy")
+    register_command("Node::Commands::Generate", "generate")
+    register_command("Node::Commands::Open", "open")
+    register_command("Node::Commands::Populate", "populate")
+    register_command("Node::Commands::Serve", "serve")
+    register_command("Node::Commands::Tunnel", "tunnel")
     # register_task('Node::Tasks::NodeTask', 'node_task')
 
-    require Project.project_filepath('messages/messages')
+    require Project.project_filepath("messages/messages")
     register_messages(Node::Messages::MESSAGES)
   end
 
   # define/autoload project specific Commands
   module Commands
-    autoload :Create, Project.project_filepath('commands/create')
-    autoload :Deploy, Project.project_filepath('commands/deploy')
-    autoload :Generate, Project.project_filepath('commands/generate')
-    autoload :Open, Project.project_filepath('commands/open')
-    autoload :Populate, Project.project_filepath('commands/populate')
-    autoload :Serve, Project.project_filepath('commands/serve')
-    autoload :Tunnel, Project.project_filepath('commands/tunnel')
+    autoload :Connect, Project.project_filepath("commands/connect")
+    autoload :Create, Project.project_filepath("commands/create")
+    autoload :Deploy, Project.project_filepath("commands/deploy")
+    autoload :Generate, Project.project_filepath("commands/generate")
+    autoload :Open, Project.project_filepath("commands/open")
+    autoload :Populate, Project.project_filepath("commands/populate")
+    autoload :Serve, Project.project_filepath("commands/serve")
+    autoload :Tunnel, Project.project_filepath("commands/tunnel")
   end
 
   # define/autoload project specific Tasks
@@ -32,6 +35,6 @@ module Node
 
   # define/autoload project specific Forms
   module Forms
-    autoload :Create, Project.project_filepath('forms/create')
+    autoload :Create, Project.project_filepath("forms/create")
   end
 end

data/lib/project_types/node/commands/connect.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+module Node
+  module Commands
+    class Connect < ShopifyCli::SubCommand
+      def call(*)
+        if ShopifyCli::Project.has_current? && ShopifyCli::Project.current.env
+          @ctx.puts(@ctx.message("node.connect.production_warning"))
+        end
+
+        app = ShopifyCli::Commands::Connect.new.default_connect("node")
+        @ctx.done(@ctx.message("node.connect.connected", app))
+      end
+    end
+  end
+end

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

@@ -4,12 +4,14 @@ module Node
     class Create < ShopifyCli::SubCommand
       options do |parser, flags|
         # backwards compatibility allow 'title' for now
-        parser.on('--title=TITLE') { |t| flags[:title] = t }
-        parser.on('--name=NAME') { |t| flags[:title] = t }
-        parser.on('--organization_id=ID') { |url| flags[:organization_id] = url }
-        parser.on('--shop_domain=MYSHOPIFYDOMAIN') { |url| flags[:shop_domain] = url }
-        parser.on('--type=APPTYPE') { |url| flags[:type] = url }
-        parser.on('--verbose') { flags[:verbose] = true }
+        parser.on("--title=TITLE") { |t| flags[:title] = t }
+        parser.on("--name=NAME") { |t| flags[:title] = t }
+        parser.on("--organization_id=ID") { |url| flags[:organization_id] = url }
+        parser.on("--organization-id=ID") { |url| flags[:organization_id] = url }
+        parser.on("--shop_domain=MYSHOPIFYDOMAIN") { |url| flags[:shop_domain] = url }
+        parser.on("--shop-domain=MYSHOPIFYDOMAIN") { |url| flags[:shop_domain] = url }
+        parser.on("--type=APPTYPE") { |url| flags[:type] = url }
+        parser.on("--verbose") { flags[:verbose] = true }
       end
 
       def call(args, _name)
@@ -22,7 +24,7 @@ module Node
 
         ShopifyCli::Project.write(
           @ctx,
-          project_type: 'node',
+          project_type: "node",
           organization_id: form.organization_id,
         )
 
@@ -37,63 +39,65 @@ module Node
           api_key: api_client["apiKey"],
           secret: api_client["apiSecretKeys"].first["secret"],
           shop: form.shop_domain,
-          scopes: 'write_products,write_customers,write_draft_orders',
+          scopes: "write_products,write_customers,write_draft_orders",
         ).write(@ctx)
 
-        partners_url = "https://partners.shopify.com/#{form.organization_id}/apps/#{api_client['id']}"
+        partners_url = ShopifyCli::PartnersAPI.partners_url_for(form.organization_id, api_client["id"], local_debug?)
 
-        @ctx.puts(@ctx.message('node.create.info.created', form.title, partners_url))
-        @ctx.puts(@ctx.message('node.create.info.serve', form.name, ShopifyCli::TOOL_NAME))
-        @ctx.puts(@ctx.message('node.create.info.install', partners_url, form.title))
+        @ctx.puts(@ctx.message("apps.create.info.created", form.title, partners_url))
+        @ctx.puts(@ctx.message("apps.create.info.serve", form.name, ShopifyCli::TOOL_NAME))
+        unless ShopifyCli::Shopifolk.acting_as_shopify_organization?
+          @ctx.puts(@ctx.message("apps.create.info.install", partners_url, form.title))
+        end
       end
 
       def self.help
-        ShopifyCli::Context.message('node.create.help', ShopifyCli::TOOL_NAME, ShopifyCli::TOOL_NAME)
+        ShopifyCli::Context.message("node.create.help", ShopifyCli::TOOL_NAME, ShopifyCli::TOOL_NAME)
       end
 
       private
 
       def check_node
-        cmd_path = @ctx.which('node')
-        @ctx.abort(@ctx.message('node.create.error.node_required')) if cmd_path.nil?
+        cmd_path = @ctx.which("node")
+        @ctx.abort(@ctx.message("node.create.error.node_required")) if cmd_path.nil?
 
-        version, stat = @ctx.capture2e('node', '-v')
-        @ctx.abort(@ctx.message('node.create.error.node_version_failure')) unless stat.success?
+        version, stat = @ctx.capture2e("node", "-v")
+        @ctx.abort(@ctx.message("node.create.error.node_version_failure")) unless stat.success?
 
-        @ctx.done(@ctx.message('node.create.node_version', version))
+        @ctx.done(@ctx.message("node.create.node_version", version))
       end
 
       def check_npm
-        cmd_path = @ctx.which('npm')
-        @ctx.abort(@ctx.message('node.create.error.npm_required')) if cmd_path.nil?
+        cmd_path = @ctx.which("npm")
+        @ctx.abort(@ctx.message("node.create.error.npm_required")) if cmd_path.nil?
 
-        version, stat = @ctx.capture2e('npm', '-v')
-        @ctx.abort(@ctx.message('node.create.error.npm_version_failure')) unless stat.success?
+        version, stat = @ctx.capture2e("npm", "-v")
+        @ctx.abort(@ctx.message("node.create.error.npm_version_failure")) unless stat.success?
 
-        @ctx.done(@ctx.message('node.create.npm_version', version))
+        @ctx.done(@ctx.message("node.create.npm_version", version))
       end
 
       def set_npm_config
         # check available npmrc (either user or system) for production registry
-        registry, _ = @ctx.capture2('npm config get @shopify:registry')
-        return if registry.include?('https://registry.yarnpkg.com')
+        registry, _ = @ctx.capture2("npm config get @shopify:registry")
+        return if registry.include?("https://registry.yarnpkg.com")
 
         # available npmrc doesn't have production registry =>
         # set a project-based .npmrc
         @ctx.system(
-          'npm',
-          '--userconfig',
-          './.npmrc',
-          'config',
-          'set',
-          '@shopify:registry',
-          'https://registry.yarnpkg.com',
+          "npm",
+          "--userconfig",
+          "./.npmrc",
+          "config",
+          "set",
+          "@shopify:registry",
+          "https://registry.yarnpkg.com",
           chdir: @ctx.root
         )
       end
 
       def build(name)
-        ShopifyCli::Git.clone('https://github.com/Shopify/shopify-app-node.git', name)
+        ShopifyCli::Git.clone("https://github.com/Shopify/shopify-app-node.git", name)
 
         @ctx.root = File.join(@ctx.root, name)
 
@@ -101,17 +105,21 @@ module Node
         ShopifyCli::JsDeps.install(@ctx, !options.flags[:verbose].nil?)
 
         begin
-          @ctx.rm_r('.git')
-          @ctx.rm_r('.github')
-          @ctx.rm(File.join('server', 'handlers', 'client.js'))
+          @ctx.rm_r(".git")
+          @ctx.rm_r(".github")
+          @ctx.rm(File.join("server", "handlers", "client.js"))
           @ctx.rename(
-            File.join('server', 'handlers', 'client.cli.js'),
-            File.join('server', 'handlers', 'client.js')
+            File.join("server", "handlers", "client.cli.js"),
+            File.join("server", "handlers", "client.js")
           )
         rescue Errno::ENOENT => e
           @ctx.debug(e)
         end
       end
+
+      def local_debug?
+        @ctx.getenv(ShopifyCli::PartnersAPI::LOCAL_DEBUG)
+      end
     end
   end
 end