shopify-cli 1.7.1 → 1.11.0

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

@@ -0,0 +1,14 @@
+require "semantic/semantic"
+
+module Extension
+  module Models
+    NpmPackage = Struct.new(:name, :version, keyword_init: true) do
+      include Comparable
+
+      def <=>(other)
+        return nil unless name == other.name
+        Semantic::Version.new(version) <=> Semantic::Version.new(other.version)
+      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,12 @@ 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: -> { [] }
+          property! :cli_package_name, accepts: String, converts: :to_str, default: ""
         end
 
         def self.build(feature_set_attributes)
@@ -18,14 +21,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/checkout_argo_extension.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module Extension
+  module Models
+    module SpecificationHandlers
+      class CheckoutArgoExtension < Default
+        PERMITTED_CONFIG_KEYS = [:metafields, :extension_points]
+
+        def config(context)
+          {
+            **Features::ArgoConfig.parse_yaml(context, PERMITTED_CONFIG_KEYS),
+            **argo.config(context),
+          }
+        end
+      end
+    end
+  end
+end

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,12 +42,45 @@ module Extension
           []
         end
 
+        def choose_port?(context)
+          argo_runtime(context).accepts_port?
+        end
+
+        def establish_tunnel?(context)
+          argo_runtime(context).accepts_tunnel_url?
+        end
+
+        def serve(context:, port:, tunnel_url:)
+          Features::ArgoServe.new(specification_handler: self, argo_runtime: argo_runtime(context),
+          context: context, port: port, tunnel_url: tunnel_url).call
+        end
+
+        def renderer_package(context)
+          argo.renderer_package(context)
+        end
+
+        def argo_runtime(context)
+          @argo_runtime ||= Features::ArgoRuntime.new(
+            renderer: renderer_package(context),
+            cli: cli_package(context)
+          )
+        end
+
+        def cli_package(context)
+          cli_package_name = specification.features.argo&.cli_package_name
+          return unless cli_package_name
+
+          js_system = ShopifyCli::JsSystem.new(ctx: context)
+          Tasks::FindNpmPackages.exactly_one_of(cli_package_name, js_system: js_system)
+            .unwrap { |_e| context.abort(context.message("errors.package_not_found", cli_package_name)) }
+        end
+
         protected
 
         def argo
           Features::Argo.new(
             git_template: specification.features.argo.git_template,
-            renderer_package_name: specification.features.argo.renderer_package_name,
+            renderer_package_name: specification.features.argo.renderer_package_name
           )
         end
 

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/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

@@ -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,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/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/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