shopify-cli 1.6.0 → 1.9.1

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

@@ -3,50 +3,44 @@
 module Extension
   module Forms
     class Create < ShopifyCli::Form
-      flag_arguments :name, :type
+      flag_arguments :name, :type, :api_key
 
-      def ask
-        self.type = ask_type
-        self.name = ask_name
-      end
+      attr_reader :app
 
-      def directory_name
-        @directory_name ||= name.strip.gsub(/( )/, '_').downcase
-      end
+      class ExtensionProjectDetails
+        include SmartProperties
 
-      private
+        property :app, accepts: Models::App
+        property :name, accepts: String
+        property :type, accepts: Models::SpecificationHandlers::Default
 
-      def ask_name
-        ask_with_reprompt(
-          initial_value: name,
-          break_condition: -> (current_name) { Models::Registration.valid_title?(current_name) },
-          prompt_message: ctx.message('create.ask_name'),
-          reprompt_message: ctx.message('create.invalid_name', Models::Registration::MAX_TITLE_LENGTH)
-        )
+        def complete?
+          !!(app && name && type)
+        end
       end
 
-      def ask_type
-        return Extension.specifications[type] if Extension.specifications.valid?(type)
-        ctx.puts(ctx.message('create.invalid_type')) unless type.nil?
-
-        CLI::UI::Prompt.ask(ctx.message('create.ask_type')) do |handler|
-          Extension.specifications.each do |type|
-            handler.option("#{type.name} #{type.tagline}") { type }
+      def ask
+        ShopifyCli::Result.wrap(ExtensionProjectDetails.new)
+          .then(&Questions::AskApp.new(ctx: ctx, api_key: api_key))
+          .then(&Questions::AskType.new(ctx: ctx, type: type))
+          .then(&Questions::AskName.new(ctx: ctx, name: name))
+          .unwrap { |e| raise e }
+          .tap do |project_details|
+            ctx.abort(ctx.message("create.incomplete_configuration")) unless project_details.complete?
+
+            self.app = project_details.app
+            self.type = project_details.type
+            self.name = project_details.name
           end
-        end
       end
 
-      def ask_with_reprompt(initial_value:, break_condition:, prompt_message:, reprompt_message:)
-        value = initial_value
-        reprompt = false
-
-        until break_condition.call(value)
-          ctx.puts(reprompt_message) if reprompt
-          value = CLI::UI::Prompt.ask(prompt_message)&.strip
-          reprompt = true
-        end
-        value
+      def directory_name
+        name.strip.gsub(/( )/, "_").downcase
       end
+
+      private
+
+      attr_writer :app
     end
   end
 end

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

@@ -0,0 +1,53 @@
+module Extension
+  module Forms
+    module Questions
+      class AskApp
+        include ShopifyCli::MethodObject
+
+        property! :ctx
+        property :api_key
+        property! :prompt,
+          converts: :to_proc,
+          default: -> { CLI::UI::Prompt.method(:ask) }
+
+        def call(project_details)
+          project_details.tap(&method(:prompt_for_app))
+        end
+
+        private
+
+        def prompt_for_app(project_details)
+          project_details.app =
+            api_key.nil? ? choose_interactively(load_apps) : validate_app_ownership(api_key)
+        end
+
+        def validate_app_ownership(api_key)
+          found_app = Tasks::GetApp.call(context: ctx, api_key: api_key)
+          ctx.abort(ctx.message("create.invalid_api_key", api_key)) if found_app.nil?
+          found_app
+        end
+
+        def choose_interactively(apps)
+          prompt.call(ctx.message("create.ask_app")) do |handler|
+            apps.each do |app|
+              handler.option("#{app.title} by #{app.business_name}") { app }
+            end
+          end
+        end
+
+        def load_apps
+          ctx.puts(@ctx.message("create.loading_apps"))
+          apps = Tasks::GetApps.call(context: ctx)
+
+          apps.empty? ? abort_no_apps : apps
+        end
+
+        def abort_no_apps
+          ctx.puts(@ctx.message("create.no_apps"))
+          ctx.puts(@ctx.message("create.learn_about_apps"))
+          raise ShopifyCli::AbortSilent
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,40 @@
+module Extension
+  module Forms
+    module Questions
+      class AskName
+        include ShopifyCli::MethodObject
+
+        property! :ctx
+        property :name
+        property :prompt,
+          accepts: ->(prompt) { prompt.respond_to?(:call) },
+          default: -> { CLI::UI::Prompt.method(:ask) }
+
+        def call(project_details)
+          project_details.name = ask_with_reprompt(
+            initial_value: name,
+            break_condition: -> (current_name) { Models::Registration.valid_title?(current_name) },
+            prompt_message: ctx.message("create.ask_name"),
+            reprompt_message: ctx.message("create.invalid_name", Models::Registration::MAX_TITLE_LENGTH)
+          )
+          project_details
+        end
+
+        private
+
+        def ask_with_reprompt(initial_value:, break_condition:, prompt_message:, reprompt_message:)
+          value = initial_value
+          reprompt = false
+
+          until break_condition.call(value)
+            ctx.puts(reprompt_message) if reprompt
+            value = prompt.call(prompt_message)&.strip
+            reprompt = true
+          end
+
+          value
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,47 @@
+module Extension
+  module Forms
+    module Questions
+      class AskType
+        include ShopifyCli::MethodObject
+
+        property! :ctx
+        property :type
+        property :prompt,
+          converts: :to_proc,
+          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(specifications) : validate_given_type(specifications, type)
+          end
+        end
+
+        private
+
+        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(specifications)
+          abort_due_to_missing_specifications if specifications.none?
+
+          prompt.call(ctx.message("create.ask_type")) do |handler|
+            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
+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

@@ -1,15 +1,15 @@
 # frozen_string_literal: true
-require 'shopify_cli'
+require "shopify_cli"
 
 module Extension
   module Messages
     MESSAGES = {
       create: {
-        ask_name: 'Extension name',
-        invalid_name: 'Extension name must be under %s characters',
-        ask_type: 'What type of extension are you creating?',
-        invalid_type: 'Extension type is invalid.',
-        setup_project_frame_title: 'Initializing project',
+        ask_name: "Extension name",
+        invalid_name: "Extension name must be under %s characters",
+        ask_type: "What type of extension are you creating?",
+        invalid_type: "Extension type is invalid.",
+        setup_project_frame_title: "Initializing project",
         ready_to_start: <<~MESSAGE,
           {{v}} A new folder was generated at {{green:./%s}}.
           {{*}} You’re ready to start building {{green:%s}}!
@@ -19,49 +19,52 @@ module Extension
           {{*}} Once you're ready to version and publish your extension,
           run {{command:shopify register}} to register this extension with one of your apps.
         MESSAGE
-        try_again: '{{*}} Fix the errors and run {{command:shopify create extension}} again.',
+        try_again: "{{*}} Fix the errors and run {{command:shopify create extension}} again.",
         errors: {
-          directory_exists: 'Directory ‘%s’ already exists. Please remove it or choose a new name for your project.',
+          directory_exists: "Directory ‘%s’ already exists. Please remove it or choose a new name for your project.",
         },
+        incomplete_configuration: "Cannot create extension due to missing configuration information",
+        invalid_api_key: "The API key %s does not match any of your apps.",
+        ask_app: "Which app would you like to register this extension with?",
+        no_apps: "{{x}} You don’t have any apps.",
+        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...',
-        build_failure_message: 'Failed to build extension code.',
+        frame_title: "Building extension with: %s...",
+        build_failure_message: "Failed to build extension code.",
       },
       register: {
-        frame_title: 'Registering Extension',
-        waiting_text: 'Registering with Shopify...',
-        already_registered: 'Extension is already registered.',
-        loading_apps: 'Loading your apps...',
-        ask_app: 'Which app would you like to register this extension with?',
-        no_apps: '{{x}} You don’t have any apps.',
-        learn_about_apps: '{{*}} Learn more about building apps at <https://shopify.dev/concepts/apps>, ' \
-          'or try creating a new app using {{command:shopify create}}.',
-        invalid_api_key: 'The API key %s does not match any of your apps.',
-        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_abort: 'Extension was not registered.',
-        success: '{{v}} Registered {{green:%s}} with {{green:%s}}.',
-        success_info: '{{*}} Run {{command:shopify push}} to push your extension to Shopify.',
+        frame_title: "Registering 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? (y/n)",
+        confirm_abort: "Extension was not registered.",
+        success: "{{v}} Registered {{green:%s}}.",
+        success_info: "{{*}} Run {{command:shopify push}} to push your extension to Shopify.",
       },
       push: {
-        frame_title: 'Pushing your extension to Shopify',
-        waiting_text: 'Pushing code to Shopify...',
-        pushed_with_errors: '{{x}} Code pushed to Shopify with errors on %s.',
-        push_with_errors_info: '{{*}} Fix these errors and run {{command:shopify push}} to revalidate your extension.',
-        success_confirmation: '{{v}} Pushed {{green:%s}} to a draft on %s.',
-        success_info: '{{*}} Visit %s to version and publish your extension.',
+        frame_title: "Pushing your extension to Shopify",
+        waiting_text: "Pushing code to Shopify...",
+        pushed_with_errors: "{{x}} Code pushed to Shopify with errors on %s.",
+        push_with_errors_info: "{{*}} Fix these errors and run {{command:shopify push}} to revalidate your extension.",
+        success_confirmation: "{{v}} Pushed {{green:%s}} to a draft on %s.",
+        success_info: "{{*}} Visit %s to version and publish your extension.",
       },
       serve: {
-        frame_title: 'Serving extension...',
-        serve_failure_message: 'Failed to run extension code.',
+        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}}. '\
-          'Find it on your ngrok dashboard: {{underline:https://dashboard.ngrok.com/auth/your-authtoken}}.',
-        invalid_port: '%s is not a valid port.',
-        no_tunnel_running: 'No tunnel running.',
-        tunnel_running_at: 'Tunnel running at: {{underline:%s}}',
+        missing_token: "{{x}} {{red:auth requires a token argument}}. "\
+          "Find it on your ngrok dashboard: {{underline:https://dashboard.ngrok.com/auth/your-authtoken}}.",
+        invalid_port: "%s is not a valid port.",
+        no_tunnel_running: "No tunnel running.",
+        tunnel_running_at: "Tunnel running at: {{underline:%s}}",
         help: <<~HELP,
           Start or stop an http tunnel to your local development extension using ngrok.
             Usage: {{command:%s tunnel [ auth | start | stop | status ]}}
@@ -69,7 +72,7 @@ module Extension
         extended_help: <<~HELP,
           {{bold:Subcommands:}}
 
-            {{cyan:auth}}: Writes an ngrok auth token to ~/.ngrok2/ngrok.yml to connect with an ngrok account. 
+            {{cyan:auth}}: Writes an ngrok auth token to ~/.ngrok2/ngrok.yml to connect with an ngrok account.
             Visit https://dashboard.ngrok.com/signup to sign up.
               Usage: {{command:%1$s tunnel auth <token>}}
 
@@ -87,48 +90,45 @@ module Extension
       },
       features: {
         argo: {
-          missing_file_error: 'Could not find built extension file.',
-          script_prepare_error: 'An error occurred while attempting to prepare your script.',
-          initialization_error: '{{x}} There was an error while initializing the project.',
+          missing_file_error: "Could not find built extension file.",
+          script_prepare_error: "An error occurred while attempting to prepare your script.",
+          initialization_error: "{{x}} There was an error while initializing the project.",
           dependencies: {
             node: {
-              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',
+              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.',
+            yarn_run_script_error: "Something went wrong while running script. %s.",
           },
           config: {
-            unpermitted_keys: '`%s` contains the following unpermitted keys: %s',
+            unpermitted_keys: "`%s` contains the following unpermitted keys: %s",
           },
         },
       },
       tasks: {
         errors: {
-          parse_error: 'Unable to parse response from Partners Dashboard.',
+          parse_error: "Unable to parse response from Partners Dashboard.",
         },
       },
       errors: {
-        unknown_type: 'Unknown extension type %s',
+        unknown_type: "Unknown extension type %s",
       },
     }
 
     TYPES = {
       product_subscription: {
-        name: 'Product Subscription',
-        tagline: '(limit 1 per app)',
+        name: "Product Subscription",
+        tagline: "(limit 1 per app)",
         overrides: {
           register: {
-            confirm_info: 'You can only create one %s extension per app, which can’t be undone.',
+            confirm_info: "You can only create one %s extension per app, which can’t be undone.",
           },
         },
       },
       checkout_post_purchase: {
-        name: 'Checkout Post Purchase',
+        name: "Checkout Post Purchase",
       },
     }
   end

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

@@ -0,0 +1,12 @@
+module Extension
+  module Models
+    class LazySpecificationHandler < ShopifyCli::LazyDelegator
+      attr_reader :identifier
+
+      def initialize(identifier, &specification_handler_initializer)
+        super(&specification_handler_initializer)
+        @identifier = identifier
+      end
+    end
+  end
+end

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