shopify-cli 1.1.0 → 1.3.1

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

@@ -95,6 +95,15 @@ 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
+            yarn_install_error: "Something went wrong while running 'yarn install'. %s.",
+            yarn_run_script_error: 'Something went wrong while running script. %s.',
+          },
+          config: {
+            unpermitted_keys: '`%s` contains the following unpermitted keys: %s',
           },
         },
       },
@@ -109,8 +118,8 @@ module Extension
     }
 
     TYPES = {
-      subscription_management: {
-        name: 'Subscription Management',
+      product_subscription: {
+        name: 'Product Subscription',
         tagline: '(limit 1 per app)',
         overrides: {
           register: {

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

@@ -38,6 +38,10 @@ module Extension
         self.class::IDENTIFIER
       end
 
+      def graphql_identifier
+        identifier
+      end
+
       def name
         message('name')
       end

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

@@ -6,13 +6,16 @@ module Extension
     module Types
       class CheckoutPostPurchase < Models::Type
         IDENTIFIER = 'CHECKOUT_POST_PURCHASE'
-
+        PERMITTED_CONFIG_KEYS = [:metafields]
         def create(directory_name, context)
-          Features::Argo.checkout.create(directory_name, IDENTIFIER, context)
+          Features::Argo::Checkout.new.create(directory_name, IDENTIFIER, context)
         end
 
         def config(context)
-          Features::Argo.checkout.config(context)
+          {
+            **Features::ArgoConfig.parse_yaml(context, PERMITTED_CONFIG_KEYS),
+            **Features::Argo::Checkout.new.config(context),
+          }
         end
       end
     end

data/lib/project_types/extension/models/types/product_subscription.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+require 'base64'
+
+module Extension
+  module Models
+    module Types
+      class ProductSubscription < Models::Type
+        IDENTIFIER = 'PRODUCT_SUBSCRIPTION'
+
+        def graphql_identifier
+          'SUBSCRIPTION_MANAGEMENT'
+        end
+
+        def create(directory_name, context)
+          Features::Argo::Admin.new.create(directory_name, IDENTIFIER, context)
+        end
+
+        def config(context)
+          Features::Argo::Admin.new.config(context)
+        end
+      end
+    end
+  end
+end

data/lib/project_types/node/commands/generate/billing.rb

@@ -19,6 +19,7 @@ module Node
           end
           billing_type_name = BILLING_TYPES.key(selected_type)
           selected_type[0] = File.join(ShopifyCli::Project.current.directory, selected_type[0])
+          selected_type[0] = "\"#{selected_type[0]}\""
           selected_type = selected_type.join(' ')
 
           spin_group = CLI::UI::SpinGroup.new

data/lib/project_types/node/commands/generate/page.rb

@@ -39,6 +39,7 @@ module Node
           end
           page_type_name = PAGE_TYPES.key(selected_type)
           selected_type[0] = File.join(ShopifyCli::Project.current.directory, selected_type[0])
+          selected_type[0] = "\"#{selected_type[0]}\""
           selected_type = selected_type.join(' ')
 
           spin_group = CLI::UI::SpinGroup.new

data/lib/project_types/node/commands/generate/webhook.rb

@@ -17,6 +17,7 @@ module Node
           end
 
           generate_path = File.join(ShopifyCli::Project.current.directory, "node_modules/.bin/generate-node-app")
+          generate_path = "\"#{generate_path}\""
 
           spin_group = CLI::UI::SpinGroup.new
           spin_group.add(@ctx.message('node.generate.webhook.generating', selected_type)) do |spinner|

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

@@ -20,12 +20,12 @@ module Node
           url: url,
           callback_url: "/auth/callback",
         )
-        if @ctx.mac? && project.env.shop
-          @ctx.puts(@ctx.message('node.serve.open_info', project.env.shop))
-          @ctx.on_siginfo do
-            @ctx.open_url!("#{project.env.host}/auth?shop=#{project.env.shop}")
-          end
+
+        if project.env.shop
+          project_url = "#{project.env.host}/auth?shop=#{project.env.shop}"
+          @ctx.puts("\n" + @ctx.message('node.serve.open_info', project_url) + "\n")
         end
+
         CLI::UI::Frame.open(@ctx.message('node.serve.running_server')) do
           env = project.env.to_h
           env['PORT'] = ShopifyCli::Tunnel::PORT.to_s

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

@@ -202,7 +202,10 @@ module Node
             host_must_be_https: "HOST must be a HTTPS url.",
           },
 
-          open_info: "{{*}} Press {{yellow: Control-T}} to open this project in {{green:%s}} ",
+          open_info: <<~MESSAGE,
+            {{*}} To install and start using your app, open this URL in your browser:
+            {{green:%s}}
+          MESSAGE
           running_server: "Running server...",
         },
 

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

@@ -114,6 +114,9 @@ module Rails
         @ctx.abort(@ctx.message('rails.create.error.install_failure', 'bundler ~>2.0')) unless
           install_gem('bundler', '~>2.0')
 
+        full_path = File.join(@ctx.root, name)
+        @ctx.abort(@ctx.message('rails.create.error.dir_exists', name)) if Dir.exist?(full_path)
+
         CLI::UI::Frame.open(@ctx.message('rails.create.generating_app', name)) do
           new_command = %w(rails new)
           new_command += DEFAULT_RAILS_FLAGS
@@ -124,7 +127,7 @@ module Rails
           syscall(new_command)
         end
 
-        @ctx.root = File.join(@ctx.root, name)
+        @ctx.root = full_path
 
         File.open(File.join(@ctx.root, '.gitignore'), 'a') { |f| f.write('.env') }
 

data/lib/project_types/rails/commands/serve.rb

@@ -20,12 +20,12 @@ module Rails
           url: url,
           callback_url: "/auth/shopify/callback",
         )
-        if @ctx.mac? && project.env.shop
-          @ctx.puts(@ctx.message('rails.serve.open_info', project.env.shop))
-          @ctx.on_siginfo do
-            @ctx.open_url!("#{project.env.host}/login?shop=#{project.env.shop}")
-          end
+
+        if project.env.shop
+          project_url = "#{project.env.host}/login?shop=#{project.env.shop}"
+          @ctx.puts("\n" + @ctx.message('rails.serve.open_info', project_url) + "\n")
         end
+
         CLI::UI::Frame.open(@ctx.message('rails.serve.running_server')) do
           env = ShopifyCli::Project.current.env.to_h
           env.delete('HOST')

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

@@ -36,6 +36,7 @@ module Rails
             See {{underline:https://github.com/Shopify/shopify-app-cli/blob/master/docs/installing-ruby.md}}
             for our recommended method of installing ruby.
             MSG
+            dir_exists: "Project directory %s already exists. Please use a different name.",
             install_failure: "Error installing %s gem",
             node_required: "node is required to create a rails project. Download at https://nodejs.org/en/download.",
             node_version_failure: "Failed to get the current node version. Please make sure it is installed as " \
@@ -219,7 +220,10 @@ module Rails
             host_must_be_https: "{{red:HOST must be a HTTPS url.}}",
           },
 
-          open_info: "{{*}} Press {{yellow: Control-T}} to open this project in {{green:%s}} ",
+          open_info: <<~MESSAGE,
+            {{*}} To install and start using your app, open this URL in your browser:
+            {{green:%s}}
+          MESSAGE
           running_server: "Running server...",
         },
 

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

@@ -1,24 +1,24 @@
 discount:
   assemblyscript:
     package: "@shopify/extension-point-as-discount"
-    version: "^0.2.6"
+    version: "^0.2.10"
     sdk-version: "^6.0.0"
     toolchain-version: "^1.1.0"
 unit_limit_per_order:
   assemblyscript:
     package: "@shopify/extension-point-as-unit-limit-per-order"
-    version: "^0.1.8"
+    version: "^0.1.12"
     sdk-version: "^6.0.0"
     toolchain-version: "^1.1.0"
 payment_filter:
   assemblyscript:
     package: "@shopify/extension-point-as-payment-filter"
-    version: "^0.2.4"
+    version: "^0.2.8"
     sdk-version: "^6.0.0"
     toolchain-version: "^1.1.0"
 shipping_filter:
   assemblyscript:
     package: "@shopify/extension-point-as-shipping-filter"
-    version: "^0.2.6"
+    version: "^0.2.10"
     sdk-version: "^6.0.0"
     toolchain-version: "^1.1.0"

data/lib/project_types/script/layers/infrastructure/assemblyscript_task_runner.rb

@@ -34,7 +34,9 @@ module Script
 
         def dependencies_installed?
           # Assuming if node_modules folder exist at root of script folder, all deps are installed
-          ctx.dir_exist?("node_modules")
+          return false unless ctx.dir_exist?("node_modules")
+          check_if_ep_dependencies_up_to_date!
+          true
         end
 
         private
@@ -58,6 +60,39 @@ module Script
         def bytecode
           File.read(format(BYTECODE_FILE, name: script_name))
         end
+
+        def check_if_ep_dependencies_up_to_date!
+          return true if ENV['SHOPIFY_CLI_SCRIPTS_IGNORE_OUTDATED']
+
+          # ignore exit code since it will not be 0 unless every package is up to date which they probably won't be
+          out, _ = ctx.capture2e("npm", "outdated", "--json", "--depth", "0")
+          parsed_outdated_check = JSON.parse(out)
+          outdated_ep_packages = parsed_outdated_check
+            .select { |package_name, _| package_name.start_with?('@shopify/extension-point-as-') }
+            .select { |_, version_info| !package_is_up_to_date?(version_info) }
+            .keys
+          raise Errors::PackagesOutdatedError.new(outdated_ep_packages),
+            "NPM packages out of date: #{outdated_ep_packages.join(', ')}" unless outdated_ep_packages.empty?
+        end
+
+        def package_is_up_to_date?(version_info)
+          require 'semantic/semantic'
+          current_version = version_info['current']
+          latest_version = version_info['latest']
+
+          # making an assumption that the script developer knows what they're doing if they're not referencing a
+          # semver version
+          begin
+            current_version = ::Semantic::Version.new(current_version)
+            latest_version = ::Semantic::Version.new(latest_version)
+          rescue ArgumentError
+            return true
+          end
+
+          return false if current_version.major < latest_version.major
+          return false if latest_version.major == 0 && current_version.minor < latest_version.minor
+          true
+        end
       end
     end
   end

data/lib/project_types/script/layers/infrastructure/errors.rb

@@ -34,6 +34,13 @@ module Script
         class ShopScriptConflictError < ScriptProjectError; end
         class ShopScriptUndefinedError < ScriptProjectError; end
         class TaskRunnerNotFoundError < ScriptProjectError; end
+        class PackagesOutdatedError < ScriptProjectError
+          attr_reader :outdated_packages
+          def initialize(outdated_packages)
+            super("EP packages are outdated and need to be updated: #{outdated_packages.join(', ')}")
+            @outdated_packages = outdated_packages
+          end
+        end
       end
     end
   end

data/lib/project_types/script/layers/infrastructure/script_service.rb

@@ -49,7 +49,7 @@ module Script
           resp_hash = script_service_request(
             query_name: query_name,
             api_key: api_key,
-            shop_domain: shop_domain,
+            shop_domain: format_shop_domain(shop_domain),
             variables: variables,
           )
           user_errors = resp_hash["data"]["shopScriptUpdateOrCreate"]["userErrors"]
@@ -76,7 +76,7 @@ module Script
           resp_hash = script_service_request(
             query_name: query_name,
             api_key: api_key,
-            shop_domain: shop_domain,
+            shop_domain: format_shop_domain(shop_domain),
             variables: variables,
           )
           user_errors = resp_hash["data"]["shopScriptDelete"]["userErrors"]
@@ -91,6 +91,10 @@ module Script
 
         private
 
+        def format_shop_domain(shop_domain)
+          shop_domain.delete_suffix("/")
+        end
+
         class ScriptServiceAPI < ShopifyCli::API
           property(:api_key, accepts: String)
           property(:shop_id, accepts: Integer)

data/lib/project_types/script/messages/messages.rb

@@ -29,7 +29,7 @@ module Script
           no_existing_orgs_cause: "You don't have any partner organizations.",
           no_existing_orgs_help: "Please visit https://partners.shopify.com/ to create a partners account.",
 
-          no_existing_stores_cause: "You don't have any development stores.",
+          no_existing_stores_cause: "You don't have any stores.",
           no_existing_stores_help: "Visit https://partners.shopify.com/%{organization_id}/stores/ to create one.",
 
           project_exists_cause: "Directory with the same name as the script already exists.",
@@ -43,11 +43,9 @@ module Script
 
           script_not_found_cause: "Couldn't find script %s for extension point %s",
 
-          app_not_installed_cause: "App not installed on development store.",
+          app_not_installed_cause: "App not installed on store.",
 
-          app_script_not_pushed_help: "Push the script and then try this command again.",
-
-          app_script_undefined_help: "Push script to app.",
+          app_script_not_pushed_help: "Script isn't on the app. Run {{command:shopify push}}, and then try again.",
 
           build_error_cause: "Something went wrong while building the script.",
           build_error_help: "Correct the errors and try again.",
@@ -70,7 +68,10 @@ module Script
                                       "on this extension point.",
           shop_script_conflict_help: "Disable that script or uninstall that app and try again.",
 
-          shop_script_undefined_cause: "Script is already turned off in development store.",
+          shop_script_undefined_cause: "Script is already turned off in store.",
+
+          packages_outdated_cause: "The following npm packages are out of date: %s.",
+          packages_outdated_help: "Update them by running {{cyan:npm install --save-dev %s}}.",
         },
 
         create: {
@@ -100,7 +101,7 @@ module Script
           HELP
 
           error: {
-            operation_failed: "Script not pushed.",
+            operation_failed: "Couldn't push script to app.",
           },
 
           script_pushed: "{{v}} Script pushed to app (API key: %{api_key}).",
@@ -108,21 +109,20 @@ module Script
 
         disable: {
           help: <<~HELP,
-          Turn off script in development store.
+          Turn off script in store.
             Usage: {{command:%s disable}}
           HELP
 
           error: {
             operation_failed: "Can't disable script.",
-            not_pushed_to_app: "Can't disable the script because it hasn't been pushed to the app.",
           },
 
-          script_disabled: "{{v}} Script disabled. Script is turned off in development store.",
+          script_disabled: "{{v}} Script disabled. Script is turned off in store.",
         },
 
         enable: {
           help: <<~HELP,
-          Turn on script in development store.
+          Turn on script in store.
             Usage: {{command:%s enable}}
             Options:
               {{command:--config_props='name1:value1, name2:value2'}} Optional. Define the configuration of your script by passing individual name and value pairs. If used with --config_file, then matching values in --config_props will override those set in the file.
@@ -135,11 +135,10 @@ module Script
 
           error: {
             operation_failed: "Can't enable script.",
-            not_pushed_to_app: "Can't enable the script because it hasn't been pushed to the app.",
           },
 
           script_enabled: "{{v}} Script enabled. %{type} script %{title} in app (API key: %{api_key}) "\
-                          "is turned on in development store {{green:%{shop_domain}}}",
+                          "is turned on in store {{green:%{shop_domain}}}",
         },
 
         project_deps: {
@@ -149,35 +148,11 @@ module Script
           installed: "Missing dependencies installed",
         },
 
-        test: {
-          help: <<~HELP,
-          Runs unit tests on your script.
-            Usage: {{command:%s test}}
-          HELP
-
-          error: {
-            operation_failed: "Tests didn't run or they ran with failures.",
-          },
-
-          running: "Running tests",
-          success: "{{v}} Tests finished.",
-        },
-
         forms: {
           create: {
             select_extension_point: "Which extension point do you want to use?",
             script_name: "Script Name",
           },
-          script_form: {
-            ask_app_api_key_default: "Which app do you want this script to belong to?",
-            ask_shop_domain_default: "Select a development store",
-            fetching_organizations: "Fetching partner organizations",
-            fetched_organizations: "Fetched partner organizations",
-            select_organization: "Select partner organization.",
-            using_app: "Using app {{green:%{title} (%{api_key})}}.",
-            using_development_store: "Using development store {{green:%{domain}}}",
-            using_organization: "Partner organization {{green:%s}}.",
-          },
         },
 
         application: {

data/lib/project_types/script/ui/error_handler.rb

@@ -96,14 +96,11 @@ module Script
           {
             cause_of_error: ShopifyCli::Context.message('script.error.app_not_installed_cause'),
           }
-        when Layers::Infrastructure::Errors::AppScriptNotPushedError
+        when Layers::Infrastructure::Errors::AppScriptNotPushedError,
+          Layers::Infrastructure::Errors::AppScriptUndefinedError
           {
             cause_of_error: ShopifyCli::Context.message('script.error.app_script_not_pushed_help'),
           }
-        when Layers::Infrastructure::Errors::AppScriptUndefinedError
-          {
-            help_suggestion: ShopifyCli::Context.message('script.error.app_script_undefined_help'),
-          }
         when Layers::Infrastructure::Errors::BuildError
           {
             cause_of_error: ShopifyCli::Context.message('script.error.build_error_cause'),
@@ -142,6 +139,17 @@ module Script
           {
             cause_of_error: ShopifyCli::Context.message('script.error.shop_script_undefined_cause'),
           }
+        when Layers::Infrastructure::Errors::PackagesOutdatedError
+          {
+            cause_of_error: ShopifyCli::Context.message(
+              'script.error.packages_outdated_cause',
+              e.outdated_packages.join(', ')
+            ),
+            help_suggestion: ShopifyCli::Context.message(
+              'script.error.packages_outdated_help',
+              e.outdated_packages.collect { |package| "#{package}@latest" }.join(' ')
+            ),
+          }
         end
       end
     end