shopify-cli 1.8.0 → 1.9.0

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

@@ -42,6 +42,14 @@ module Extension
           []
         end
 
+        def serve(context)
+          Features::ArgoServe.new(specification_handler: self, context: context).call
+        end
+
+        def renderer_package(context)
+          argo.renderer_package(context)
+        end
+
         protected
 
         def argo

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

@@ -40,6 +40,8 @@ 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],
           },
           checkout: {
             git_template: "https://github.com/Shopify/argo-checkout-template.git",

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/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/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
@@ -33,8 +29,6 @@ module Script
       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 +39,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
@@ -59,10 +54,10 @@ module Script
         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 +69,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

@@ -10,13 +10,13 @@ module Script
       def call(_args, _name)
         ShopifyCli::Tasks::EnsureEnv.call(@ctx, required: [:api_key, :secret, :shop])
 
-        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,6 +5,7 @@ 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"
@@ -23,6 +24,7 @@ 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

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

@@ -3,11 +3,10 @@
 module Script
   module Forms
     class Create < ShopifyCli::Form
-      flag_arguments :extension_point, :name, :language, :description
+      flag_arguments :extension_point, :name, :language
 
       def ask
         self.name = valid_name
-        self.description ||= ask_description
         self.extension_point ||= ask_extension_point
         self.language = ask_language
       end
@@ -17,7 +16,7 @@ module Script
       def ask_extension_point
         CLI::UI::Prompt.ask(
           @ctx.message("script.forms.create.select_extension_point"),
-          options: Layers::Application::ExtensionPoints.non_deprecated_types
+          options: Layers::Application::ExtensionPoints.available_types
         )
       end
 
@@ -25,10 +24,6 @@ module Script
         CLI::UI::Prompt.ask(@ctx.message("script.forms.create.script_name"))
       end
 
-      def ask_description
-        CLI::UI::Prompt.ask(@ctx.message("script.forms.create.description"))
-      end
-
       def valid_name
         n = (name || ask_name).downcase.gsub(" ", "_")
         return n if n.match?(/^[0-9A-Za-z_-]*$/)
@@ -36,13 +31,7 @@ module Script
       end
 
       def ask_language
-        if language
-          if Layers::Application::ExtensionPoints.supported_language?(type: extension_point, language: language)
-            return language.downcase
-          else
-            raise Errors::InvalidLanguageError.new(language, extension_point)
-          end
-        end
+        return language.downcase if language
 
         all_languages = Layers::Application::ExtensionPoints.languages(type: extension_point)
         return all_languages.first if all_languages.count == 1

data/lib/project_types/script/graphql/app_script_update_or_create.graphql

@@ -1,7 +1,6 @@
 mutation AppScriptUpdateOrCreate(
   $extensionPointName: ExtensionPointName!,
   $title: String,
-  $description: String,
   $configUi: String,
   $sourceCode: String,
   $language: String,
@@ -13,7 +12,6 @@ mutation AppScriptUpdateOrCreate(
   appScriptUpdateOrCreate(
     extensionPointName: $extensionPointName
     title: $title
-    description: $description
     configUi: $configUi
     sourceCode: $sourceCode
     language: $language
@@ -32,7 +30,6 @@ mutation AppScriptUpdateOrCreate(
       configSchema
       extensionPointName
       title
-      description
     }
   }
 }

data/lib/project_types/script/graphql/script_service_proxy.graphql

@@ -1,7 +1,6 @@
-query ProxyRequest($api_key: String, $shop_domain: String, $query: String!, $variables: String) {
+query ProxyRequest($api_key: String, $query: String!, $variables: String) {
   scriptServiceProxy(
     apiKey: $api_key
-    shopDomain: $shop_domain
     query: $query
     variables: $variables
   )

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

@@ -5,7 +5,7 @@ module Script
     module Application
       class BuildScript
         class << self
-          def call(ctx:, task_runner:, script_project:, config_ui:)
+          def call(ctx:, task_runner:, script_project:)
             CLI::UI::Frame.open(ctx.message("script.application.building")) do
               begin
                 UI::StrictSpinner.spin(ctx.message("script.application.building_script")) do |spinner|
@@ -14,7 +14,6 @@ module Script
                     script_content: task_runner.build,
                     compiled_type: task_runner.compiled_type,
                     metadata: task_runner.metadata,
-                    config_ui: config_ui,
                   )
                   spinner.update_title(ctx.message("script.application.built"))
                 end

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

@@ -7,54 +7,27 @@ module Script
     module Application
       class CreateScript
         class << self
-          def call(ctx:, language:, script_name:, extension_point_type:, description:, no_config_ui:)
-            extension_point = ExtensionPoints.get(type: extension_point_type)
-            project = setup_project(
-              ctx: ctx,
-              language: language,
-              script_name: script_name,
-              extension_point: extension_point,
-              description: description,
-              no_config_ui: no_config_ui
-            )
-            project_creator = Infrastructure::ProjectCreator
-              .for(ctx, language, extension_point, script_name, project.directory)
-            install_dependencies(ctx, language, script_name, project_creator)
-            bootstrap(ctx, project_creator)
-            project
+          def call(ctx:, language:, script_name:, extension_point_type:, no_config_ui:)
+            raise Infrastructure::Errors::ScriptProjectAlreadyExistsError, script_name if ctx.dir_exist?(script_name)
+
+            in_new_directory_context(ctx, script_name) do
+              extension_point = ExtensionPoints.get(type: extension_point_type)
+              project = Infrastructure::ScriptProjectRepository.new(ctx: ctx).create(
+                script_name: script_name,
+                extension_point_type: extension_point_type,
+                language: language,
+                no_config_ui: no_config_ui
+              )
+              project_creator = Infrastructure::ProjectCreator
+                .for(ctx, language, extension_point, script_name, project.id)
+              install_dependencies(ctx, language, script_name, project_creator)
+              bootstrap(ctx, project_creator)
+              project
+            end
           end
 
           private
 
-          DEFAULT_CONFIG_UI_FILENAME = "config-ui.yml"
-
-          def setup_project(ctx:, language:, script_name:, extension_point:, description:, no_config_ui:)
-            ScriptProject.create(ctx, script_name)
-
-            identifiers = {
-              extension_point_type: extension_point.type,
-              script_name: script_name,
-              language: language,
-              description: description,
-            }
-
-            unless no_config_ui
-              require "yaml" # takes 20ms, so deferred as late as possible.
-              identifiers.merge!(config_ui_file: DEFAULT_CONFIG_UI_FILENAME)
-              Infrastructure::ConfigUiRepository
-                .new(ctx: ctx)
-                .create_config_ui(DEFAULT_CONFIG_UI_FILENAME, default_config_ui_content(script_name))
-            end
-
-            ScriptProject.write(
-              ctx,
-              project_type: :script,
-              organization_id: nil, # TODO: can you provide this at creation
-              **identifiers
-            )
-            ScriptProject.current
-          end
-
           def install_dependencies(ctx, language, script_name, project_creator)
             task_runner = Infrastructure::TaskRunner.for(ctx, language, script_name)
             project_creator.setup_dependencies
@@ -68,13 +41,19 @@ module Script
             end
           end
 
-          def default_config_ui_content(title)
-            YAML.dump({
-              "version" => 1,
-              "type" => "single",
-              "title" => title,
-              "fields" => [],
-            })
+          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
           end
         end
       end

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

@@ -12,9 +12,10 @@ module Script
           Infrastructure::ExtensionPointRepository.new.extension_point_types
         end
 
-        def self.non_deprecated_types
+        def self.available_types
           Infrastructure::ExtensionPointRepository.new.extension_points.select do |ep|
-            !ep.deprecated?
+            next false if ep.deprecated?
+            !ep.beta? || ShopifyCli::Feature.enabled?(:scripts_beta_extension_points)
           end.map(&:type)
         end