shopify-cli 1.8.0 → 1.12.0

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/choose_next_available_port.rb

@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+require "shopify_cli"
+require "socket"
+
+module Extension
+  module Tasks
+    class ChooseNextAvailablePort
+      include ShopifyCli::MethodObject
+
+      property! :from
+      property! :to, default: -> { from + 10 }
+      property! :host, default: "localhost"
+
+      def call
+        available_port = port_range(from: from, to: to).find { |p| available?(host, p) }
+        raise ArgumentError, "Ports between #{from} and #{to} are unavailable" if available_port.nil?
+        available_port
+      end
+
+      private
+
+      def port_range(from:, to:)
+        (from..to)
+      end
+
+      def available?(host, port)
+        Socket.tcp(host, port, connect_timeout: 1) do |socket|
+          socket.close
+          false
+        end
+      rescue Errno::ECONNREFUSED
+        true
+      end
+    end
+  end
+end

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

@@ -40,10 +40,14 @@ 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],
+            cli_package_name: "@shopify/argo-admin-cli",
           },
           checkout: {
             git_template: "https://github.com/Shopify/argo-checkout-template.git",
             renderer_package_name: "@shopify/argo-checkout",
+            cli_package_name: "@shopify/argo-run",
           },
         }
       end

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/find_npm_packages.rb

@@ -0,0 +1,106 @@
+module Extension
+  module Tasks
+    class FindNpmPackages
+      include ShopifyCli::MethodObject
+
+      property! :js_system, accepts: ShopifyCli::JsSystem
+      property! :production_only, accepts: [true, false], default: false, reader: :production_only?
+
+      def self.at_least_one_of(*package_names, **config)
+        new(**config).at_least_one_of(*package_names)
+      end
+
+      def self.all(*package_names, **config)
+        new(**config).all(*package_names)
+      end
+
+      def self.exactly_one_of(*package_names, **config)
+        new(**config).exactly_one_of(*package_names)
+      end
+
+      def all(*package_names)
+        call(*package_names) do |found_packages|
+          found_package_names = found_packages.map(&:name)
+          next found_packages if Set.new(found_package_names) == Set.new(package_names)
+          raise PackageResolutionFailed, format(
+            "Missing packages: %s",
+            (package_names - found_package_names).join(", ")
+          )
+        end
+      end
+
+      def at_least_one_of(*package_names)
+        call(*package_names) do |found_packages|
+          found_package_names = found_packages.map(&:name)
+          next found_packages unless (found_package_names & package_names).empty?
+          raise PackageResolutionFailed, format(
+            "Expected at least one of the following packages: %s",
+            package_names.join(", ")
+          )
+        end
+      end
+
+      def exactly_one_of(*package_names)
+        call(*package_names) do |found_packages|
+          case found_packages.count
+          when 0
+            raise PackageResolutionFailed, format(
+              "Expected one of the following packages: %s",
+              package_names.join(", ")
+            )
+          when 1
+            found_packages.first.tap do |found_package|
+              next found_package if package_names.include?(found_package.name)
+              raise PackageResolutionFailed, format(
+                "Expected the following package: %s",
+                found_package.name
+              )
+            end
+          else
+            raise PackageResolutionFailed, "Found more than one package"
+          end
+        end
+      end
+
+      def call(*package_names, &validate)
+        validate ||= ->(found_packages) { found_packages }
+
+        unless package_names.all? { |name| name.is_a?(String) }
+          raise ArgumentError, "Expected a list of package names"
+        end
+
+        ShopifyCli::Result
+          .call(&method(:list_packages))
+          .then(&method(:search_packages).curry[package_names])
+          .then(&method(:filter_duplicates))
+          .then(&validate)
+      end
+
+      def list_packages
+        result, error, status =
+          js_system.call(yarn: yarn_list, npm: npm_list, capture_response: true)
+        raise error unless status.success?
+        result
+      end
+
+      def yarn_list
+        production_only? ? %w[list --production] : %w[list]
+      end
+
+      def npm_list
+        production_only? ? %w[list --prod --depth=1] : %w[list --depth=1]
+      end
+
+      def search_packages(packages, package_list)
+        pattern = /(#{packages.join("|")})@(\d.*)$/
+        package_list.scan(pattern).map do |(name, version)|
+          Models::NpmPackage.new(name: name, version: version.strip)
+        end
+      end
+
+      def filter_duplicates(packages)
+        packages.reject { |p| p.version.match(/deduped/) }.uniq
+      end
+    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

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

@@ -59,21 +59,21 @@ module Node
             installed: "Installed Heroku CLI",
             authenticating: "Authenticating with Heroku…",
             authenticated: "{{v}} Authenticated with Heroku",
-            authenticated_with_account: "{{v}} Authenticated with Heroku as `%s`",
+            authenticated_with_account: "{{v}} Authenticated with Heroku as {{green:%s}}",
             deploying: "Deploying to Heroku…",
             deployed: "{{v}} Deployed to Heroku",
             git: {
               checking: "Checking git repo…",
               initialized: "Git repo initialized",
               what_branch: "What branch would you like to deploy?",
-              branch_selected: "{{v}} Git branch `%s` selected for deploy",
+              branch_selected: "{{v}} Git branch {{green:%s}} selected for deploy",
             },
             app: {
               no_apps_found: "No existing Heroku app found. What would you like to do?",
               name: "What is your Heroku app’s name?",
               select: "Specify an existing Heroku app",
-              selecting: "Selecting Heroku app `%s`…",
-              selected: "{{v}} Heroku app `%s` selected",
+              selecting: "Selecting Heroku app %s…",
+              selected: "{{v}} Heroku app {{green:%s}} selected",
               create: "Create a new Heroku app",
               creating: "Creating new Heroku app…",
               created: "{{v}} New Heroku app created",

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

@@ -89,7 +89,7 @@ module Rails
             downloaded: "Downloaded Heroku CLI",
             installing: "Installing Heroku CLI...",
             installed: "Installed Heroku CLI",
-            authenticated_with_account: "{{v}} Authenticated with Heroku as `%s`",
+            authenticated_with_account: "{{v}} Authenticated with Heroku as {{green:%s}}",
             authenticating: "Authenticating with Heroku...",
             authenticated: "{{v}} Authenticated with Heroku",
             deploying: "Deploying to Heroku...",
@@ -109,14 +109,14 @@ module Rails
               checking: "Checking git repo...",
               initialized: "Git repo initialized",
               what_branch: "What branch would you like to deploy?",
-              branch_selected: "{{v}} Git branch `%s` selected for deploy",
+              branch_selected: "{{v}} Git branch {{green:%s}} selected for deploy",
             },
             app: {
               no_apps_found: "No existing Heroku app found. What would you like to do?",
               name: "What is your Heroku app’s name?",
               select: "Specify an existing Heroku app",
-              selecting: "Selecting Heroku app `%s`...",
-              selected: "{{v}} Heroku app `%s` selected",
+              selecting: "Selecting Heroku app %s...",
+              selected: "{{v}} Heroku app {{green:%s}} selected",
               create: "Create a new Heroku app",
               creating: "Creating new Heroku app...",
               created: "{{v}} New Heroku app created",

data/lib/project_types/script/cli.rb

@@ -7,8 +7,6 @@ module Script
     creator("Script::Commands::Create")
 
     register_command("Script::Commands::Push", "push")
-    register_command("Script::Commands::Disable", "disable")
-    register_command("Script::Commands::Enable", "enable")
 
     require Project.project_filepath("messages/messages")
     register_messages(Script::Messages::MESSAGES)
@@ -18,8 +16,6 @@ module Script
   module Commands
     autoload :Create, Project.project_filepath("commands/create")
     autoload :Push, Project.project_filepath("commands/push")
-    autoload :Disable, Project.project_filepath("commands/disable")
-    autoload :Enable, Project.project_filepath("commands/enable")
   end
 
   # define/autoload project specific Forms
@@ -28,13 +24,15 @@ module Script
     autoload :ScriptForm, Project.project_filepath("forms/script_form")
   end
 
+  module Tasks
+    autoload :EnsureEnv, Project.project_filepath("tasks/ensure_env")
+  end
+
   module Layers
     module Application
       autoload :BuildScript, Project.project_filepath("layers/application/build_script")
       autoload :CreateScript, Project.project_filepath("layers/application/create_script")
       autoload :PushScript, Project.project_filepath("layers/application/push_script")
-      autoload :DisableScript, Project.project_filepath("layers/application/disable_script")
-      autoload :EnableScript, Project.project_filepath("layers/application/enable_script")
       autoload :ExtensionPoints, Project.project_filepath("layers/application/extension_points")
       autoload :ProjectDependencies, Project.project_filepath("layers/application/project_dependencies")
     end
@@ -45,6 +43,7 @@ module Script
       autoload :PushPackage, Project.project_filepath("layers/domain/push_package")
       autoload :Metadata, Project.project_filepath("layers/domain/metadata")
       autoload :ExtensionPoint, Project.project_filepath("layers/domain/extension_point")
+      autoload :ScriptProject, Project.project_filepath("layers/domain/script_project")
     end
 
     module Infrastructure
@@ -55,14 +54,15 @@ module Script
         Project.project_filepath("layers/infrastructure/assemblyscript_project_creator")
       autoload :AssemblyScriptTaskRunner, Project.project_filepath("layers/infrastructure/assemblyscript_task_runner")
       autoload :AssemblyScriptTsConfig, Project.project_filepath("layers/infrastructure/assemblyscript_tsconfig")
+      autoload :CommandRunner, Project.project_filepath("layers/infrastructure/command_runner")
       autoload :RustProjectCreator,
         Project.project_filepath("layers/infrastructure/rust_project_creator.rb")
       autoload :RustTaskRunner, Project.project_filepath("layers/infrastructure/rust_task_runner")
 
-      autoload :ConfigUiRepository, Project.project_filepath("layers/infrastructure/config_ui_repository")
       autoload :PushPackageRepository, Project.project_filepath("layers/infrastructure/push_package_repository")
       autoload :ExtensionPointRepository, Project.project_filepath("layers/infrastructure/extension_point_repository")
       autoload :ProjectCreator, Project.project_filepath("layers/infrastructure/project_creator")
+      autoload :ScriptProjectRepository, Project.project_filepath("layers/infrastructure/script_project_repository")
       autoload :ScriptService, Project.project_filepath("layers/infrastructure/script_service")
       autoload :TaskRunner, Project.project_filepath("layers/infrastructure/task_runner")
     end
@@ -74,7 +74,6 @@ module Script
     autoload :StrictSpinner, Project.project_filepath("ui/strict_spinner")
   end
 
-  autoload :ScriptProject, Project.project_filepath("script_project")
   autoload :Errors, Project.project_filepath("errors")
 
   class ScriptProjectError < StandardError; end

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

@@ -5,7 +5,6 @@ module Script
     class Create < ShopifyCli::SubCommand
       options do |parser, flags|
         parser.on("--name=NAME") { |name| flags[:name] = name }
-        parser.on("--description=DESCRIPTION") { |description| flags[:description] = description }
         parser.on("--extension_point=EP_NAME") { |ep_name| flags[:extension_point] = ep_name }
         parser.on("--extension-point=EP_NAME") { |ep_name| flags[:extension_point] = ep_name }
         parser.on("--language=LANGUAGE") { |language| flags[:language] = language }
@@ -13,8 +12,6 @@ module Script
       end
 
       def call(args, _name)
-        cur_dir = @ctx.root
-
         form = Forms::Create.ask(@ctx, args, options.flags)
         return @ctx.puts(self.class.help) if form.nil?
 
@@ -27,14 +24,10 @@ module Script
           language: form.language,
           script_name: form.name,
           extension_point_type: form.extension_point,
-          description: form.description,
           no_config_ui: options.flags.key?(:no_config_ui)
         )
         @ctx.puts(@ctx.message("script.create.change_directory_notice", project.script_name))
-      rescue Script::Errors::ScriptProjectAlreadyExistsError => e
-        UI::ErrorHandler.pretty_print_and_raise(e, failed_op: @ctx.message("script.create.error.operation_failed"))
       rescue StandardError => e
-        ScriptProject.cleanup(ctx: @ctx, script_name: form.name, root_dir: cur_dir) if form
         UI::ErrorHandler.pretty_print_and_raise(e, failed_op: @ctx.message("script.create.error.operation_failed"))
       end
 

data/lib/project_types/script/commands/push.rb

@@ -8,15 +8,15 @@ module Script
       end
 
       def call(_args, _name)
-        ShopifyCli::Tasks::EnsureEnv.call(@ctx, required: [:api_key, :secret, :shop])
+        Tasks::EnsureEnv.call(@ctx)
 
-        api_key = ScriptProject.current.api_key
+        api_key = Layers::Infrastructure::ScriptProjectRepository.new(ctx: @ctx).get.api_key
         return @ctx.puts(self.class.help) unless api_key
 
         Layers::Application::PushScript.call(ctx: @ctx, force: options.flags.key?(:force))
         @ctx.puts(@ctx.message("script.push.script_pushed", api_key: api_key))
       rescue StandardError => e
-        msg = @ctx.message("script.push.error.operation_failed", api_key: ShopifyCli::Project.current.env.api_key)
+        msg = @ctx.message("script.push.error.operation_failed", api_key: api_key)
         UI::ErrorHandler.pretty_print_and_raise(e, failed_op: msg)
       end
 

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

@@ -5,11 +5,13 @@ discount:
     sdk-version: "^9.0.0"
     toolchain-version: "^5.0.0"
 unit_limit_per_order:
+  beta: true
   assemblyscript:
     package: "@shopify/extension-point-as-unit-limit-per-order"
     sdk-version: "^9.0.0"
     toolchain-version: "^5.0.0"
 payment_filter:
+  deprecated: true
   assemblyscript:
     package: "@shopify/extension-point-as-payment-filter"
     sdk-version: "^9.0.0"
@@ -18,11 +20,13 @@ payment_filter:
     beta: true
     package: "https://github.com/Shopify/scripts-apis-rs"
 shipping_filter:
+  deprecated: true
   assemblyscript:
     package: "@shopify/extension-point-as-shipping-filter"
     sdk-version: "^9.0.0"
     toolchain-version: "^5.0.0"
 tax_filter:
+  beta: true
   assemblyscript:
     package: "@shopify/extension-point-as-tax-filter"
     sdk-version: "^9.0.0"

data/lib/project_types/script/errors.rb

@@ -2,7 +2,6 @@
 
 module Script
   module Errors
-    class InvalidContextError < ScriptProjectError; end
     class InvalidScriptNameError < ScriptProjectError; end
 
     class NoExistingAppsError < ScriptProjectError; end
@@ -16,7 +15,6 @@ module Script
       end
     end
 
-    class ScriptProjectAlreadyExistsError < ScriptProjectError; end
     class InvalidConfigProps < ScriptProjectError; end
 
     class InvalidConfigYAMLError < ScriptProjectError
@@ -26,22 +24,5 @@ module Script
         @config_file = config_file
       end
     end
-
-    class InvalidLanguageError < ScriptProjectError
-      attr_reader :language, :extension_point_type
-      def initialize(language, extension_point_type)
-        super()
-        @language = language
-        @extension_point_type = extension_point_type
-      end
-    end
-
-    class DeprecatedEPError < ScriptProjectError
-      attr_reader :ep
-      def initialize(ep)
-        super()
-        @ep = ep
-      end
-    end
   end
 end