shopify-cli 2.7.1 → 2.8.0

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

@@ -6,7 +6,7 @@ module Extension
       include SmartProperties
 
       property! :api_key, accepts: String
-      property! :secret, accepts: String
+      property :secret, accepts: String
       property :title, accepts: String
       property :business_name, accepts: String
     end

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

@@ -33,8 +33,8 @@ module Extension
       end
 
       def build(server_config)
-        _, error, status = CLI::Kit::System.capture3(executable, "build", "-", stdin_data: server_config.to_yaml)
-        return if status.success?
+        output, error, status = CLI::Kit::System.capture3(executable, "build", "-", stdin_data: server_config.to_yaml)
+        return output if status.success?
         raise DevelopmentServerError, error
       end
 

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

@@ -103,6 +103,10 @@ module Extension
           raise NotImplementedError
         end
 
+        def server_config_path(base_dir = Dir.pwd)
+          File.join(base_dir, server_config_file)
+        end
+
         def server_config_file
           "shopifile.yml"
         end

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

@@ -9,11 +9,12 @@ module Extension
       property! :api_key, accepts: String
       property! :context, accepts: ShopifyCLI::Context
       property! :hash, accepts: Hash
+      property  :port, accepts: Integer, default: ShopifyCLI::Constants::Extension::DEFAULT_PORT
       property! :registration_uuid, accepts: String
       property  :resource_url, accepts: String
       property! :store, accepts: String
       property! :title, accepts: String
-      property :tunnel_url, accepts: String
+      property  :tunnel_url, accepts: String
       property! :type, accepts: String
 
       def self.call(*args)
@@ -46,6 +47,7 @@ module Extension
         end
         server_config = Models::ServerConfig::Root.new(
           extensions: [extension],
+          port: port,
           public_url: tunnel_url,
           store: store
         )

data/lib/project_types/extension/tasks/execute_commands/base.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+require "shopify_cli"
+
+module Extension
+  module Tasks
+    module ExecuteCommands
+      class Base
+        include SmartProperties
+        property! :type, accepts: Models::DevelopmentServerRequirements::SUPPORTED_EXTENSION_TYPES
+      end
+    end
+  end
+end

data/lib/project_types/extension/tasks/execute_commands/build.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+require "shopify_cli"
+
+module Extension
+  module Tasks
+    module ExecuteCommands
+      class Build < Base
+        property! :context, accepts: ShopifyCLI::Context
+        property! :config_file_path, accepts: String
+
+        def call
+          ShopifyCLI::Result
+            .call(&method(:merge_server_config))
+            .then { |server_config| Models::DevelopmentServer.new.build(server_config) }
+        end
+
+        private
+
+        def merge_server_config
+          Tasks::MergeServerConfig.call(
+            context: context,
+            file_path: config_file_path,
+            type: type
+          )
+        end
+      end
+    end
+  end
+end

data/lib/project_types/extension/tasks/execute_commands/create.rb

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+require "shopify_cli"
+
+module Extension
+  module Tasks
+    module ExecuteCommands
+      class Create < Base
+        property!  :template, accepts: Models::ServerConfig::Development::VALID_TEMPLATES
+        property!  :root_dir, accepts: String
+
+        def call
+          ShopifyCLI::Result.success(generate_config)
+            .then { |server_config| Models::DevelopmentServer.new.create(server_config) }
+            .unwrap do |error|
+              raise error unless error.nil?
+            end
+        end
+
+        private
+
+        def generate_config
+          extension = Models::ServerConfig::Extension.build(
+            template: template,
+            type: type,
+            root_dir: root_dir,
+          )
+
+          Models::ServerConfig::Root.new(extensions: [extension])
+        end
+      end
+    end
+  end
+end

data/lib/project_types/extension/tasks/execute_commands/serve.rb

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+require "shopify_cli"
+
+module Extension
+  module Tasks
+    module ExecuteCommands
+      class Serve < Base
+        property! :context, accepts: ShopifyCLI::Context
+        property! :config_file_path, accepts: String
+        property  :port, accepts: Integer, default: ShopifyCLI::Constants::Extension::DEFAULT_PORT
+        property  :resource_url, accepts: String
+        property! :tunnel_url, accepts: String
+
+        def call
+          ShopifyCLI::Result
+            .call(&method(:merge_server_config))
+            .then { |server_config| Models::DevelopmentServer.new.serve(context, server_config) }
+        end
+
+        private
+
+        def merge_server_config
+          Tasks::MergeServerConfig.call(
+            context: context,
+            file_path: config_file_path,
+            port: port,
+            resource_url: resource_url,
+            tunnel_url: tunnel_url,
+            type: type
+          )
+        end
+      end
+    end
+  end
+end

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

@@ -4,28 +4,39 @@ require "yaml"
 
 module Extension
   module Tasks
-    class MergeServerConfig < ShopifyCLI::Task
-      class << self
-        def call(context:, file_name:, resource_url:, tunnel_url:, type:)
-          config = YAML.load_file(file_name)
-          project = ExtensionProject.current
-          Tasks::ConvertServerConfig.call(
-            api_key: project.env.api_key,
-            context: context,
-            hash: config,
-            registration_uuid: project.registration_uuid,
-            resource_url: resource_url || project.resource_url,
-            store: project.env.shop || "",
-            title: project.title,
-            tunnel_url: tunnel_url,
-            type: type
-          )
-        rescue Psych::SyntaxError => e
-          raise(
-            ShopifyCLI::Abort,
-            ShopifyCLI::Context.message("core.yaml.error.invalid", file_name, e.message)
-          )
-        end
+    class MergeServerConfig
+      include SmartProperties
+
+      property! :context, accepts: ShopifyCLI::Context
+      property! :file_path, accepts: ->(path) { Pathname(path).yield_self { |pn| pn.absolute? && pn.file? } }
+      property  :port, accepts: Integer, default: ShopifyCLI::Constants::Extension::DEFAULT_PORT
+      property  :resource_url, accepts: String
+      property  :tunnel_url, accepts: String
+      property! :type, accepts: Models::DevelopmentServerRequirements::SUPPORTED_EXTENSION_TYPES
+
+      def self.call(*args)
+        new(*args).call
+      end
+
+      def call
+        config = YAML.load_file(file_path)
+        project = ExtensionProject.current
+        Tasks::ConvertServerConfig.call(
+          api_key: project.env.api_key,
+          context: context,
+          hash: config,
+          registration_uuid: project.registration_uuid,
+          resource_url: resource_url || project.resource_url,
+          store: project.env.shop || "",
+          title: project.title,
+          tunnel_url: tunnel_url,
+          type: type
+        )
+      rescue Psych::SyntaxError => e
+        raise(
+          ShopifyCLI::Abort,
+          ShopifyCLI::Context.message("core.yaml.error.invalid", file_name, e.message)
+        )
       end
     end
   end

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

@@ -2,9 +2,7 @@
 module Rails
   class Command
     class Create < ShopifyCLI::Command::AppSubCommand
-      unless ShopifyCLI::Environment.acceptance_test?
-        prerequisite_task :ensure_authenticated
-      end
+      prerequisite_task :ensure_authenticated
 
       USER_AGENT_CODE = <<~USERAGENT
         module ShopifyAPI
@@ -158,10 +156,10 @@ module Rails
 
         CLI::UI::Frame.open(@ctx.message("rails.create.generating_app", name)) do
           new_command = %w(rails new)
+          new_command << name
           new_command += DEFAULT_RAILS_FLAGS
           new_command << "--database=#{db}"
           new_command += options.flags[:rails_opts].split unless options.flags[:rails_opts].nil?
-          new_command << name
 
           syscall(new_command)
         end

data/lib/project_types/script/cli.rb

@@ -13,13 +13,19 @@ module Script
     hidden_feature(feature_set: :script_project)
     subcommand :Create, "create", Project.project_filepath("commands/create")
     subcommand :Push, "push", Project.project_filepath("commands/push")
+    subcommand :Connect, "connect", Project.project_filepath("commands/connect")
     subcommand :Javy, "javy", Project.project_filepath("commands/javy")
   end
   ShopifyCLI::Commands.register("Script::Command", "script")
 
   # define/autoload project specific Forms
   module Forms
+    autoload :AskOrg, Project.project_filepath("forms/ask_org")
+    autoload :AskApp, Project.project_filepath("forms/ask_app")
+    autoload :AskScriptUuid, Project.project_filepath("forms/ask_script_uuid")
+    autoload :RunAgainstShopifyOrg, Project.project_filepath("forms/run_against_shopify_org")
     autoload :Create, Project.project_filepath("forms/create")
+    autoload :Connect, Project.project_filepath("forms/connect")
     autoload :ScriptForm, Project.project_filepath("forms/script_form")
   end
 
@@ -30,6 +36,7 @@ module Script
   module Layers
     module Application
       autoload :BuildScript, Project.project_filepath("layers/application/build_script")
+      autoload :ConnectApp, Project.project_filepath("layers/application/connect_app")
       autoload :CreateScript, Project.project_filepath("layers/application/create_script")
       autoload :PushScript, Project.project_filepath("layers/application/push_script")
       autoload :ExtensionPoints, Project.project_filepath("layers/application/extension_points")
@@ -41,7 +48,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 :ScriptJson, Project.project_filepath("layers/domain/script_json")
+      autoload :ScriptConfig, Project.project_filepath("layers/domain/script_config")
       autoload :ScriptProject, Project.project_filepath("layers/domain/script_project")
     end
 

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

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+module Script
+  class Command
+    class Connect < ShopifyCLI::Command::SubCommand
+      prerequisite_task :ensure_authenticated
+      prerequisite_task ensure_project_type: :script
+
+      def call(_args, _)
+        Layers::Application::ConnectApp.call(ctx: @ctx, force: true, strict: true)
+      rescue StandardError => e
+        UI::ErrorHandler.pretty_print_and_raise(e, failed_op: @ctx.message("script.connect.error.operation_failed"))
+      end
+
+      def self.help
+        ShopifyCLI::Context.new.message("connect.help", ShopifyCLI::TOOL_NAME, ShopifyCLI::TOOL_NAME)
+      end
+    end
+  end
+end

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

@@ -3,9 +3,7 @@
 module Script
   class Command
     class Create < ShopifyCLI::Command::SubCommand
-      unless ShopifyCLI::Environment.acceptance_test?
-        prerequisite_task :ensure_authenticated
-      end
+      prerequisite_task :ensure_authenticated
 
       options do |parser, flags|
         parser.on("--name=NAME") { |name| flags[:name] = name }

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

@@ -7,8 +7,6 @@ module Script
     class Javy < ShopifyCLI::Command::SubCommand
       hidden_feature
 
-      prerequisite_task ensure_project_type: :script
-
       options do |parser, flags|
         parser.on("--in=IN") { |in_file| flags[:in_file] = in_file }
         parser.on("--out=OUT") { |out_file| flags[:out_file] = out_file }

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

@@ -10,7 +10,8 @@ module Script
       end
 
       def call(_args, _name)
-        fresh_env = Tasks::EnsureEnv.call(@ctx)
+        fresh_env = Layers::Application::ConnectApp.call(ctx: @ctx)
+
         force = options.flags.key?(:force) || !!fresh_env
 
         api_key = Layers::Infrastructure::ScriptProjectRepository.new(ctx: @ctx).get.api_key

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

@@ -1,29 +1,3 @@
-discount:
-  deprecated: true
-  libraries:
-    assemblyscript:
-      package: "@shopify/extension-point-as-discount"
-unit_limit_per_order:
-  beta: true
-  libraries:
-    assemblyscript:
-      package: "@shopify/extension-point-as-unit-limit-per-order"
-payment_filter:
-  deprecated: true
-  libraries:
-    assemblyscript:
-      package: "@shopify/extension-point-as-payment-filter"
-shipping_filter:
-  deprecated: true
-  libraries:
-    assemblyscript:
-      package: "@shopify/extension-point-as-shipping-filter"
-tax_filter:
-  beta: true
-  libraries:
-    assemblyscript:
-      repo: "https://github.com/Shopify/extension-points.git"
-      package: "@shopify/extension-point-as-tax-filter"
 payment_methods:
   domain: 'checkout'
   libraries:
@@ -44,11 +18,19 @@ shipping_methods:
       beta: true
       package: "@shopify/scripts-checkout-apis"
       repo: "https://github.com/Shopify/scripts-apis-examples"
-discount_types:
+merchandise_discount_types:
+  beta: true
+  domain: 'discounts'
+  libraries:
+    typescript:
+      beta: true
+      package: "@shopify/scripts-discounts-apis"
+      repo: "https://github.com/Shopify/scripts-apis-examples"
+delivery_discount_types:
   beta: true
   domain: 'discounts'
   libraries:
     typescript:
       beta: true
-      package: "@shopify/scripts-discount-apis"
+      package: "@shopify/scripts-discounts-apis"
       repo: "https://github.com/Shopify/scripts-apis-examples"

data/lib/project_types/script/forms/ask_app.rb

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+module Script
+  module Forms
+    class AskApp < ShopifyCLI::Form
+      attr_reader :app
+
+      def ask
+        apps = @xargs.fetch(:apps)
+
+        unless @xargs[:acting_as_shopify_organization]
+          apps = apps.select { |app| app["appType"] == "custom" }
+        end
+
+        raise Errors::NoExistingAppsError if apps.empty?
+
+        @app =
+          if apps.count > 1
+            CLI::UI::Prompt.ask(ctx.message("script.application.ensure_env.app_select")) do |handler|
+              apps.each do |app|
+                handler.option(app["title"]) { app }
+              end
+            end
+          else
+            apps.first.tap do |app|
+              ctx.puts(ctx.message("script.application.ensure_env.app", app["title"]))
+            end
+          end
+      end
+    end
+  end
+end

data/lib/project_types/script/forms/ask_org.rb

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+module Script
+  module Forms
+    class AskOrg < ShopifyCLI::Form
+      attr_reader :org
+
+      BUSINESS_NAME = "businessName"
+      ID = "id"
+
+      def ask
+        orgs = @xargs
+        @org =
+          if orgs.count == 1
+            orgs.first.tap do |org|
+              ctx.puts(ctx.message("script.application.ensure_env.organization", org[BUSINESS_NAME], org[ID]))
+            end
+          elsif orgs.count > 0
+            CLI::UI::Prompt.ask(ctx.message("script.application.ensure_env.organization_select")) do |handler|
+              orgs.each do |org|
+                handler.option("#{org[BUSINESS_NAME]} (#{org[ID]})") { org }
+              end
+            end
+          else
+            raise Errors::NoExistingOrganizationsError
+          end
+      end
+    end
+  end
+end

data/lib/project_types/script/forms/ask_script_uuid.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module Script
+  module Forms
+    class AskScriptUuid < ShopifyCLI::Form
+      attr_reader :uuid
+      def ask
+        scripts = @xargs
+
+        return if scripts.empty? ||
+          !CLI::UI::Prompt.confirm(ctx.message("script.application.ensure_env.ask_connect_to_existing_script"))
+
+        @uuid =
+          CLI::UI::Prompt.ask(ctx.message("script.application.ensure_env.ask_which_script_to_connect_to")) do |handler|
+            scripts.each do |script|
+              handler.option("#{script["title"]} (#{script["uuid"]})") { script["uuid"] }
+            end
+          end
+      end
+    end
+  end
+end

data/lib/project_types/script/forms/run_against_shopify_org.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module Script
+  module Forms
+    class RunAgainstShopifyOrg < ShopifyCLI::Form
+      attr_reader :response
+      def ask
+        @ctx.puts(@ctx.message("core.tasks.select_org_and_shop.identified_as_shopify"))
+        message = @ctx.message("core.tasks.select_org_and_shop.first_party")
+        @response = CLI::UI::Prompt.confirm(message, default: false)
+      end
+    end
+  end
+end

data/lib/project_types/script/graphql/app_script_set.graphql

@@ -6,7 +6,7 @@ mutation AppScriptSet(
   $force: Boolean,
   $schemaMajorVersion: String,
   $schemaMinorVersion: String,
-  $scriptJsonVersion: String!,
+  $scriptConfigVersion: String!,
   $configurationUi: Boolean!,
   $configurationDefinition: String!,
   $moduleUploadUrl: String!,
@@ -20,7 +20,7 @@ mutation AppScriptSet(
     force: $force
     schemaMajorVersion: $schemaMajorVersion
     schemaMinorVersion: $schemaMinorVersion,
-    scriptJsonVersion: $scriptJsonVersion,
+    scriptConfigVersion: $scriptConfigVersion,
     configurationUi: $configurationUi,
     configurationDefinition: $configurationDefinition,
     moduleUploadUrl: $moduleUploadUrl,

data/lib/project_types/script/layers/application/build_script.rb

@@ -23,7 +23,6 @@ module Script
                   ctx.puts("\n{{red:#{e.message}}}")
                 end
                 errors = [
-                  Infrastructure::Errors::InvalidBuildScriptError,
                   Infrastructure::Errors::BuildScriptNotFoundError,
                   Infrastructure::Errors::WebAssemblyBinaryNotFoundError,
                 ]

data/lib/project_types/script/layers/application/connect_app.rb

@@ -0,0 +1,79 @@
+# frozen_string_literal: true
+
+require "shopify_cli"
+
+module Script
+  module Layers
+    module Application
+      class ConnectApp
+        class << self
+          def call(ctx:, force: false, strict: false)
+            script_project_repo = Layers::Infrastructure::ScriptProjectRepository.new(ctx: ctx)
+            script_project = script_project_repo.get
+
+            return false if script_project.env_valid? && !force
+
+            if ShopifyCLI::Shopifolk.check && Forms::RunAgainstShopifyOrg.ask(ctx, nil, nil).response
+              ShopifyCLI::Shopifolk.act_as_shopify_organization
+            end
+
+            org =
+              if partner_proxy_bypass
+                stubbed_org
+              else
+                orgs = ShopifyCLI::PartnersAPI::Organizations.fetch_with_app(ctx)
+                Forms::AskOrg.ask(ctx, orgs, nil).org
+              end
+
+            app = Forms::AskApp.ask(
+              ctx,
+              {
+                apps: org["apps"],
+                acting_as_shopify_organization: ShopifyCLI::Shopifolk.acting_as_shopify_organization?,
+              },
+              nil
+            ).app
+
+            script_service = Layers::Infrastructure::ServiceLocator.script_service(ctx: ctx, api_key: app["apiKey"])
+            extension_point_type = script_project.extension_point_type
+            scripts = script_service.get_app_scripts(extension_point_type: extension_point_type)
+
+            uuid = Forms::AskScriptUuid.ask(ctx, scripts, nil)&.uuid
+
+            if strict && uuid.nil?
+              ctx.abort(ctx.message("script.connect.missing_script"))
+            end
+
+            script_project_repo.create_env(
+              api_key: app["apiKey"],
+              secret: app["apiSecretKeys"].first["secret"],
+              uuid: uuid
+            )
+            ctx.done(ctx.message("script.connect.connected", app["title"]))
+
+            true
+          end
+
+          private
+
+          def partner_proxy_bypass
+            !ENV["BYPASS_PARTNERS_PROXY"].nil?
+          end
+
+          def stubbed_org
+            {
+              "apps" => [
+                {
+                  "appType" => "custom",
+                  "apiKey" => "stubbed-api-key",
+                  "apiSecretKeys" => [{ "secret" => "stubbed-api-secret" }],
+                  "title" => "Fake App (Not connected to Partners)",
+                },
+              ],
+            }
+          end
+        end
+      end
+    end
+  end
+end

data/lib/project_types/script/layers/application/create_script.rb

@@ -8,11 +8,14 @@ module Script
       class CreateScript
         class << self
           def call(ctx:, language:, sparse_checkout_branch:, script_name:, extension_point_type:)
-            raise Infrastructure::Errors::ScriptProjectAlreadyExistsError, script_name if ctx.dir_exist?(script_name)
+            script_project_repo = Infrastructure::ScriptProjectRepository.new(
+              ctx: ctx,
+              directory: script_name,
+              initial_directory: ctx.root
+            )
 
-            in_new_directory_context(ctx, script_name) do
+            in_new_directory_context(script_project_repo) do
               extension_point = ExtensionPoints.get(type: extension_point_type)
-              script_project_repo = Infrastructure::ScriptProjectRepository.new(ctx: ctx)
               project = script_project_repo.create(
                 script_name: script_name,
                 extension_point_type: extension_point_type,
@@ -36,7 +39,7 @@ module Script
               )
 
               install_dependencies(ctx, language, script_name, project_creator)
-              script_project_repo.update_or_create_script_json(title: script_name)
+              script_project_repo.update_script_config(title: script_name)
               project
             end
           end
@@ -62,19 +65,16 @@ module Script
             ProjectDependencies.install(ctx: ctx, task_runner: task_runner)
           end
 
-          def in_new_directory_context(ctx, directory)
-            initial_directory = ctx.root
-            begin
-              ctx.mkdir_p(directory)
-              ctx.chdir(directory)
-              yield
-            rescue
-              ctx.chdir(initial_directory)
-              ctx.rm_r(directory)
-              raise
-            ensure
-              ctx.chdir(initial_directory)
-            end
+          def in_new_directory_context(script_project_repo)
+            script_project_repo.create_project_directory
+            yield
+          rescue Infrastructure::Errors::ScriptProjectAlreadyExistsError
+            raise
+          rescue
+            script_project_repo.delete_project_directory
+            raise
+          ensure
+            script_project_repo.change_to_initial_directory
           end
         end
       end