shopify-cli 1.6.0 → 1.9.1

data/lib/project_types/extension/models/specification_handlers/checkout_post_purchase.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-require 'base64'
+require "base64"
 
 module Extension
   module Models

data/lib/project_types/extension/models/specification_handlers/default.rb

@@ -19,11 +19,11 @@ module Extension
         end
 
         def name
-          message('name')
+          message("name") || specification.name
         end
 
         def tagline
-          message('tagline') || ""
+          message("tagline") || ""
         end
 
         def config(context)
@@ -42,6 +42,14 @@ module Extension
           []
         end
 
+        def serve(context)
+          Features::ArgoServe.new(specification_handler: self, context: context).call
+        end
+
+        def renderer_package(context)
+          argo.renderer_package(context)
+        end
+
         protected
 
         def argo

data/lib/project_types/extension/models/specifications.rb

@@ -5,7 +5,7 @@ module Extension
 
       property! :custom_handler_root,
         accepts: ->(d) { File.directory?(d) },
-        default: -> { File.expand_path('lib/project_types/extension/models/specification_handlers', ShopifyCli::ROOT) }
+        default: -> { File.expand_path("lib/project_types/extension/models/specification_handlers", ShopifyCli::ROOT) }
 
       property! :custom_handler_namespace,
         accepts: ->(m) { m.respond_to?(:const_get) },
@@ -26,6 +26,10 @@ module Extension
         handlers.values.each(&block)
       end
 
+      def none?
+        each.none?
+      end
+
       protected
 
       def handlers
@@ -37,6 +41,8 @@ module Extension
       def fetch_specifications_and_build_handlers
         ShopifyCli::Result
           .call(&fetch_specifications)
+          .map(&ShopifyCli::TransformDataStructure.new(symbolize_keys: true, underscore_keys: true))
+          .then(&method(:select_cli_extensions))
           .then(&Tasks::ConfigureFeatures)
           .then(&method(:ensure_legacy_compatibility))
           .then(&method(:build_specifications))
@@ -64,14 +70,19 @@ module Extension
 
       def ensure_legacy_compatibility(specification_attribute_sets)
         specification_attribute_sets.each do |attributes|
-          next unless attributes.fetch(:identifier) == 'product_subscription'
-          attributes[:graphql_identifier] = 'SUBSCRIPTION_MANAGEMENT'
+          next unless attributes.fetch(:identifier) == "subscription_management"
+          attributes[:identifier] = "product_subscription"
+          attributes[:graphql_identifier] = "SUBSCRIPTION_MANAGEMENT"
         end
       end
 
       def build_specifications(specification_attribute_sets)
         specification_attribute_sets.map { |attributes| Models::Specification.new(**attributes) }
       end
+
+      def select_cli_extensions(specification_attribute_sets)
+        specification_attribute_sets.select { |attributes| attributes.dig(:options, :management_experience) == "cli" }
+      end
     end
   end
 end

data/lib/project_types/extension/models/version.rb

@@ -9,7 +9,7 @@ module Extension
       property! :last_user_interaction_at, accepts: Time
       property  :context, accepts: String
       property  :location, accepts: String
-      property :validation_errors, accepts: Models::ValidationError::IS_VALIDATION_ERROR_LIST, default: []
+      property :validation_errors, accepts: Models::ValidationError::IS_VALIDATION_ERROR_LIST, default: -> { [] }
     end
   end
 end

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

@@ -24,7 +24,7 @@ module Extension
       end
 
       def extract_surface_area(argo_configuration)
-        argo_configuration.fetch(:surface_area) do
+        argo_configuration.fetch(:surface) do
           raise UnspecifiedSurfaceArea, "Argo configuration does not specify surface area"
         end
       end
@@ -38,12 +38,14 @@ module Extension
       def surface_area_configurations
         {
           admin: {
-            git_template: 'https://github.com/Shopify/argo-admin-template.git',
-            renderer_package_name: '@shopify/argo-admin',
+            git_template: "https://github.com/Shopify/argo-admin-template.git",
+            renderer_package_name: "@shopify/argo-admin",
+            required_fields: [:shop, :api_key],
+            required_shop_beta_flags: [:argo_admin_beta],
           },
           checkout: {
-            git_template: 'https://github.com/Shopify/argo-checkout-template.git',
-            renderer_package_name: '@shopify/argo-checkout',
+            git_template: "https://github.com/Shopify/argo-checkout-template.git",
+            renderer_package_name: "@shopify/argo-checkout",
           },
         }
       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,20 +1,22 @@
 # 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"
+        UUID_FIELD = "uuid"
+        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,
+            uuid: hash[UUID_FIELD],
             type: hash[TYPE_FIELD],
             title: hash[TITLE_FIELD],
             draft_version: VersionConverter.from_hash(context, hash[DRAFT_VERSION_FIELD])

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

@@ -3,35 +3,15 @@ module Extension
     class FetchSpecifications
       include ShopifyCli::MethodObject
 
-      def call
-        [
-          product_subscription_specification,
-          checkout_post_purchase_specification,
-        ]
-      end
-
-      private
+      property :context
+      property :api_key
 
-      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',
-            },
-          },
-        }
+      def call
+        response = ShopifyCli::PartnersAPI
+          .query(context, "fetch_specifications", api_key: api_key)
+          .dig("data", "extensionSpecifications")
+        context.abort(context.message("tasks.errors.parse_error")) if response.nil?
+        response
       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,32 +1,32 @@
 # frozen_string_literal: true
 module Node
   class Project < ShopifyCli::ProjectType
-    title('Node.js App')
-    creator('Node::Commands::Create')
-    connector('Node::Commands::Connect')
+    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 :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')
+    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
@@ -35,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