shopify-cli 1.7.0 → 1.10.0

data/lib/project_types/extension/features/argo_renderer_package.rb

@@ -0,0 +1,47 @@
+module Extension
+  module Features
+    class ArgoRendererPackage
+      include SmartProperties
+
+      ARGO_CHECKOUT = "@shopify/argo-checkout"
+      ARGO_ADMIN = "@shopify/argo-admin"
+      ARGO_POST_PURCHASE = "@shopify/argo-post-purchase"
+
+      PACKAGE_NAMES = [
+        ARGO_CHECKOUT,
+        ARGO_ADMIN,
+        ARGO_POST_PURCHASE,
+      ].freeze
+      MINIMUM_ARGO_VERSION = "0.9.3".freeze
+
+      property! :package_name, accepts: PACKAGE_NAMES
+      property! :version, accepts: String
+
+      class << self
+        def from_package_manager(package_manager_output)
+          pattern = /(?<name>#{PACKAGE_NAMES.join("|")})@(?<version>\d.*)$/
+          match = package_manager_output.match(pattern)
+          raise PackageNotFound, package_manager_output if match.nil?
+          new(package_name: match[:name], version: match[:version].strip)
+        end
+      end
+
+      def checkout?
+        package_name == ARGO_CHECKOUT
+      end
+
+      def admin?
+        package_name == ARGO_ADMIN
+      end
+
+      ##
+      # Temporarily returns false in all cases as the argo webpack server is
+      # unable to handle the UUID flag.
+      def supports_uuid_flag?
+        false
+        # return false if checkout?
+        # Gem::Version.new(version) > Gem::Version.new(MINIMUM_ARGO_VERSION)
+      end
+    end
+  end
+end

data/lib/project_types/extension/features/argo_serve.rb

@@ -0,0 +1,69 @@
+module Extension
+  module Features
+    class ArgoServe
+      include SmartProperties
+
+      property! :specification_handler, accepts: Extension::Models::SpecificationHandlers::Default
+      property! :context, accepts: ShopifyCli::Context
+
+      YARN_SERVE_COMMAND = %w(server)
+      NPM_SERVE_COMMAND = %w(run-script server)
+
+      def call
+        validate_env!
+
+        CLI::UI::Frame.open(context.message("serve.frame_title")) do
+          success = ShopifyCli::JsSystem.call(context, yarn: yarn_serve_command, npm: npm_serve_command)
+          context.abort(context.message("serve.serve_failure_message")) unless success
+        end
+      end
+
+      private
+
+      def specification
+        specification_handler.specification
+      end
+
+      def validate_env!
+        ExtensionProject.reload
+
+        ShopifyCli::Shopifolk.check && ShopifyCli::Feature.enabled?(:argo_admin_beta)
+
+        required_fields = specification.features.argo.required_fields
+
+        return if required_fields.none?
+
+        ShopifyCli::Tasks::EnsureEnv.call(context, required: required_fields)
+        ShopifyCli::Tasks::EnsureDevStore.call(context) if required_fields.include?(:shop)
+
+        project = ExtensionProject.current
+
+        return if required_fields.all? do |field|
+          value = project.env.public_send(field)
+          value && !value.strip.empty?
+        end
+
+        context.abort(context.message("serve.serve_missing_information"))
+      end
+
+      def yarn_serve_command
+        YARN_SERVE_COMMAND + serve_options(specification.features.argo.required_fields)
+      end
+
+      def npm_serve_command
+        NPM_SERVE_COMMAND + ["--"] + serve_options(specification.features.argo.required_fields)
+      end
+
+      def serve_options(required_fields)
+        renderer_package = specification_handler.renderer_package(context)
+        project = ExtensionProject.current
+        @serve_options ||= [].tap do |options|
+          options << "--shop=#{project.env.shop}" if required_fields.include?(:shop)
+          options << "--apiKey=#{project.env.api_key}" if required_fields.include?(:api_key)
+          options << "--argoVersion=#{renderer_package.version}" if renderer_package.admin?
+          options << "--uuid=#{project.registration_uuid}" if renderer_package.supports_uuid_flag?
+        end
+      end
+    end
+  end
+end

data/lib/project_types/extension/features/argo_setup.rb

@@ -9,7 +9,7 @@ module Extension
       SCRIPTS_DIRECTORY = "scripts"
 
       property! :git_template, accepts: String
-      property! :dependency_checks, default: []
+      property! :dependency_checks, default: -> { [] }
 
       def call(directory_name, identifier, context)
         steps = [

data/lib/project_types/extension/forms/questions/ask_type.rb

@@ -11,25 +11,36 @@ module Extension
           default: -> { CLI::UI::Prompt.method(:ask) }
 
         def call(project_details)
+          specifications = Models::Specifications.new(
+            fetch_specifications: Tasks::FetchSpecifications.new(context: ctx, api_key: project_details.app.api_key)
+          )
+
           project_details.tap do |p|
-            p.type = type.nil? ? choose_type : validate_given_type(type)
+            p.type = type.nil? ? choose_type(specifications) : validate_given_type(specifications, type)
           end
         end
 
         private
 
-        def validate_given_type(type)
-          return Extension.specifications[type] if Extension.specifications.valid?(type)
+        def validate_given_type(specifications, type)
+          return specifications[type] if specifications.valid?(type)
           ctx.abort(ctx.message("create.invalid_type")) unless type.nil?
         end
 
-        def choose_type
+        def choose_type(specifications)
+          abort_due_to_missing_specifications if specifications.none?
+
           prompt.call(ctx.message("create.ask_type")) do |handler|
-            Extension.specifications.each do |type|
+            specifications.each do |type|
               handler.option("#{type.name} #{type.tagline}") { type }
             end
           end
         end
+
+        def abort_due_to_missing_specifications
+          ctx.puts(@ctx.message("create.no_available_extensions"))
+          raise ShopifyCli::AbortSilent
+        end
       end
     end
   end

data/lib/project_types/extension/messages/message_loading.rb

@@ -16,7 +16,9 @@ module Extension
 
       def self.load_current_type_messages
         return unless ShopifyCli::Project.has_current?
-        messages_for_type(ShopifyCli::Project.current.config[Extension::ExtensionProjectKeys::EXTENSION_TYPE_KEY])
+        messages_for_type(
+          ShopifyCli::Project.current.config[Extension::ExtensionProjectKeys::SPECIFICATION_IDENTIFIER_KEY]
+        )
       end
 
       def self.messages_for_type(type_identifier)

data/lib/project_types/extension/messages/messages.rb

@@ -30,6 +30,7 @@ module Extension
         learn_about_apps: "{{*}} Learn more about building apps at <https://shopify.dev/concepts/apps>, " \
           "or try creating a new app using {{command:shopify create}}.",
         loading_apps: "Loading your apps...",
+        no_available_extensions: "{{x}} There are no available extensions for this app.",
       },
       build: {
         frame_title: "Building extension with: %s...",
@@ -40,9 +41,9 @@ module Extension
         waiting_text: "Registering with Shopify...",
         already_registered: "Extension is already registered.",
         confirm_info: "This will create a new extension registration for %s, which can’t be undone.",
-        confirm_question: "Would you like to register this extension with {{green:%s}}? (y/n)",
+        confirm_question: "Would you like to register this extension? (y/n)",
         confirm_abort: "Extension was not registered.",
-        success: "{{v}} Registered {{green:%s}} with {{green:%s}}.",
+        success: "{{v}} Registered {{green:%s}}.",
         success_info: "{{*}} Run {{command:shopify push}} to push your extension to Shopify.",
       },
       push: {
@@ -56,6 +57,7 @@ module Extension
       serve: {
         frame_title: "Serving extension...",
         serve_failure_message: "Failed to run extension code.",
+        serve_missing_information: "Missing shop or api_key.",
       },
       tunnel: {
         missing_token: "{{x}} {{red:auth requires a token argument}}. "\
@@ -96,10 +98,8 @@ module Extension
               node_not_installed: "Node must be installed to create this extension.",
               version_too_low: "Your node version %s does not meet the minimum required version %s",
             },
-            argo_missing_renderer_package_error: "%s Install the missing package and try again.",
-            argo_renderer_package_invalid_version_error: <<~MESSAGE,
-              The renderer package version is not a valid SemVer Version (http://semver.org)
-            MESSAGE
+            argo_missing_renderer_package_error: "Extension template references invalid renderer package "\
+              "please contact Shopify for help.",
             yarn_install_error: "Something went wrong while running 'yarn install'. %s.",
             yarn_run_script_error: "Something went wrong while running script. %s.",
           },

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

@@ -7,6 +7,7 @@ module Extension
       include SmartProperties
 
       property! :id, accepts: Integer
+      property! :uuid, accepts: String
       property! :type, accepts: String
       property! :title, accepts: String
       property! :draft_version, accepts: Extension::Models::Version

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

@@ -7,9 +7,11 @@ module Extension
         class Argo
           include SmartProperties
 
-          property! :surface_area, converts: :to_str
+          property! :surface, converts: :to_str
           property! :renderer_package_name, converts: :to_str
           property! :git_template, converts: :to_str
+          property! :required_fields, accepts: Array, default: -> { [] }
+          property! :required_shop_beta_flags, accepts: Array, default: -> { [] }
         end
 
         def self.build(feature_set_attributes)
@@ -18,14 +20,16 @@ module Extension
               .call(identifier, namespace: Features)
               .rescue { OpenStruct }
               .then { |c| c.new(**feature_attributes) }
-              .unwrap { |error| raise error }
+              .unwrap { |error| raise(error) }
           end
         end
       end
 
       property! :identifier
+      property :name, converts: :to_str
       property :graphql_identifier, converts: :to_str
       property! :features, converts: Features.method(:build), default: -> { [] }
+      property! :options, converts: ->(options) { OpenStruct.new(options) }, default: -> { OpenStruct.new }
 
       def graphql_identifier
         super || identifier

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

@@ -19,7 +19,7 @@ module Extension
         end
 
         def name
-          message("name")
+          message("name") || specification.name
         end
 
         def tagline
@@ -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

@@ -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,7 +70,8 @@ module Extension
 
       def ensure_legacy_compatibility(specification_attribute_sets)
         specification_attribute_sets.each do |attributes|
-          next unless attributes.fetch(:identifier) == "product_subscription"
+          next unless attributes.fetch(:identifier) == "subscription_management"
+          attributes[:identifier] = "product_subscription"
           attributes[:graphql_identifier] = "SUBSCRIPTION_MANAGEMENT"
         end
       end
@@ -72,6 +79,10 @@ module Extension
       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
@@ -40,6 +40,8 @@ module Extension
           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",

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

@@ -6,6 +6,7 @@ module Extension
     module Converters
       module RegistrationConverter
         ID_FIELD = "id"
+        UUID_FIELD = "uuid"
         TYPE_FIELD = "type"
         TITLE_FIELD = "title"
         DRAFT_VERSION_FIELD = "draftVersion"
@@ -15,6 +16,7 @@ module Extension
 
           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/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/node/commands/generate.rb

@@ -4,10 +4,6 @@ require "shopify_cli"
 module Node
   module Commands
     class Generate < ShopifyCli::Command
-      subcommand :Page, "page", Project.project_filepath("commands/generate/page")
-      subcommand :Billing, "billing", Project.project_filepath("commands/generate/billing")
-      subcommand :Webhook, "webhook", Project.project_filepath("commands/generate/webhook")
-
       def call(*)
         @ctx.puts(self.class.help)
       end
@@ -19,24 +15,6 @@ module Node
       def self.extended_help
         help
       end
-
-      def self.run_generate(script, name, ctx)
-        stat = ctx.system(script)
-        unless stat.success?
-          ctx.abort(response(stat.exitstatus, name, ctx))
-        end
-      end
-
-      def self.response(code, name, ctx)
-        case code
-        when 1
-          ctx.message("node.generate.error.generic", name)
-        when 2
-          ctx.message("node.generate.error.name_exists", name)
-        else
-          ctx.message("node.error.generic")
-        end
-      end
     end
   end
 end