shopify-cli 1.8.0 → 1.12.0

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,26 +1,26 @@
 mutation AppScriptUpdateOrCreate(
   $extensionPointName: ExtensionPointName!,
   $title: String,
-  $description: String,
   $configUi: String,
   $sourceCode: String,
   $language: String,
   $force: Boolean,
   $schemaMajorVersion: String,
   $schemaMinorVersion: String,
-  $useMsgpack: Boolean
+  $useMsgpack: Boolean,
+  $uuid: String
 ) {
   appScriptUpdateOrCreate(
     extensionPointName: $extensionPointName
     title: $title
-    description: $description
     configUi: $configUi
     sourceCode: $sourceCode
     language: $language
     force: $force
     schemaMajorVersion: $schemaMajorVersion
     schemaMinorVersion: $schemaMinorVersion
-    useMsgpack: $useMsgpack
+    useMsgpack: $useMsgpack,
+    uuid: $uuid
 ) {
     userErrors {
       field
@@ -28,11 +28,11 @@ mutation AppScriptUpdateOrCreate(
       tag
     }
     appScript {
+      uuid
       appKey
       configSchema
       extensionPointName
       title
-      description
     }
   }
 }

data/lib/project_types/script/graphql/get_app_scripts.graphql

@@ -0,0 +1,6 @@
+query GetAppScripts($appKey: String!, $extensionPointName: ExtensionPointName!) {
+  appScripts(appKeys: [$appKey], extensionPointName: $extensionPointName) {
+    uuid
+    title
+  }
+}

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
 

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

@@ -6,21 +6,21 @@ module Script
       class PushScript
         class << self
           def call(ctx:, force:)
-            script_project = ScriptProject.current
+            script_project_repo = Infrastructure::ScriptProjectRepository.new(ctx: ctx)
+            script_project = script_project_repo.get
             task_runner = Infrastructure::TaskRunner.for(ctx, script_project.language, script_project.script_name)
-            config_ui = Infrastructure::ConfigUiRepository.new(ctx: ctx).get_config_ui(script_project.config_ui_file)
 
             ProjectDependencies.install(ctx: ctx, task_runner: task_runner)
-            BuildScript.call(ctx: ctx, task_runner: task_runner, script_project: script_project, config_ui: config_ui)
+            BuildScript.call(ctx: ctx, task_runner: task_runner, script_project: script_project)
 
             UI::PrintingSpinner.spin(ctx, ctx.message("script.application.pushing")) do |p_ctx, spinner|
               package = Infrastructure::PushPackageRepository.new(ctx: p_ctx).get_push_package(
                 script_project: script_project,
                 compiled_type: task_runner.compiled_type,
                 metadata: task_runner.metadata,
-                config_ui: config_ui,
               )
-              package.push(Infrastructure::ScriptService.new(ctx: p_ctx), script_project.api_key, force)
+              uuid = package.push(Infrastructure::ScriptService.new(ctx: p_ctx), script_project.api_key, force)
+              script_project_repo.update_env(uuid: uuid)
               spinner.update_title(p_ctx.message("script.application.pushed"))
             end
           end

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

@@ -39,8 +39,6 @@ module Script
           end
         end
 
-        class ServiceFailureError < ScriptProjectError; end
-
         class MetadataNotFoundError < ScriptProjectError; end
 
         class MetadataValidationError < ScriptProjectError; end

data/lib/project_types/script/layers/domain/extension_point.rb

@@ -4,15 +4,20 @@ module Script
   module Layers
     module Domain
       class ExtensionPoint
-        attr_reader :type, :deprecated, :sdks, :domain
+        attr_reader :type, :beta, :deprecated, :sdks, :domain
 
         def initialize(type, config)
           @type = type
+          @beta = config["beta"] || false
           @deprecated = config["deprecated"] || false
           @domain = config["domain"] || nil
           @sdks = ExtensionPointSDKs.new(config)
         end
 
+        def beta?
+          @beta
+        end
+
         def deprecated?
           @deprecated
         end
@@ -20,68 +25,73 @@ module Script
         def dasherize_type
           @type.gsub("_", "-")
         end
-      end
 
-      class ExtensionPointSDKs
-        def initialize(config)
-          @config = config
-        end
+        class ExtensionPointSDKs
+          def initialize(config)
+            @config = config
+          end
 
-        def all
-          [assemblyscript, rust].compact
-        end
+          def all
+            [assemblyscript, rust].compact
+          end
 
-        def assemblyscript
-          @assemblyscript ||= new_sdk(ExtensionPointAssemblyScriptSDK)
-        end
+          def assemblyscript
+            @assemblyscript ||= new_sdk(ExtensionPointAssemblyScriptSDK)
+          end
 
-        def rust
-          @rust ||= new_sdk(ExtensionPointRustSDK)
-        end
+          def rust
+            @rust ||= new_sdk(ExtensionPointRustSDK)
+          end
 
-        private
+          private
 
-        def new_sdk(klass)
-          config = @config[klass.language]
-          return nil if config.nil?
-          klass.new(config)
+          def new_sdk(klass)
+            config = @config[klass.language]
+            return nil if config.nil?
+            klass.new(config)
+          end
         end
-      end
 
-      class ExtensionPointSDK
-        attr_reader :beta, :package
+        class ExtensionPointSDK
+          attr_reader :version, :beta, :package
 
-        def initialize(config)
-          @beta = config["beta"] || false
-          @package = config["package"]
-        end
+          def initialize(config)
+            @beta = config["beta"] || false
+            @package = config["package"]
+            @version = config["package-version"]
+          end
 
-        def beta?
-          @beta
-        end
+          def beta?
+            @beta
+          end
+
+          def versioned?
+            @version
+          end
 
-        def self.language
-          raise NotImplementedError
+          def self.language
+            raise NotImplementedError
+          end
         end
-      end
 
-      class ExtensionPointAssemblyScriptSDK < ExtensionPointSDK
-        attr_reader :sdk_version, :toolchain_version
+        class ExtensionPointAssemblyScriptSDK < ExtensionPointSDK
+          attr_reader :sdk_version, :toolchain_version
 
-        def initialize(config)
-          super
-          @sdk_version = config["sdk-version"]
-          @toolchain_version = config["toolchain-version"]
-        end
+          def initialize(config)
+            super
+            @sdk_version = config["sdk-version"]
+            @toolchain_version = config["toolchain-version"]
+          end
 
-        def self.language
-          "assemblyscript"
+          def self.language
+            "assemblyscript"
+          end
         end
-      end
 
-      class ExtensionPointRustSDK < ExtensionPointSDK
-        def self.language
-          "rust"
+        class ExtensionPointRustSDK < ExtensionPointSDK
+          def self.language
+            "rust"
+          end
         end
       end
     end

data/lib/project_types/script/layers/domain/metadata.rb

@@ -14,39 +14,32 @@ module Script
 
         class << self
           def create_from_json(ctx, metadata_json)
+            err_tag = nil
             metadata_hash = JSON.parse(metadata_json)
-            schema_versions = metadata_hash["schemaVersions"]
-            if schema_versions.nil?
-              err_msg = "script.error.metadata_schema_versions_missing"
-              raise ::Script::Layers::Domain::Errors::MetadataValidationError, ctx.message(err_msg)
-            end
-            # Scripts may be attached to more than one EP in the future but not right now
-            unless schema_versions.count == 1
-              err_msg = "script.error.metadata_schema_versions_single_key"
-              raise ::Script::Layers::Domain::Errors::MetadataValidationError, ctx.message(err_msg)
-            end
 
-            _, version = schema_versions.first
+            use_msgpack = !!metadata_hash.dig("flags", "use_msgpack")
+            schema_versions = metadata_hash["schemaVersions"] || {}
+
+            version = schema_versions.values.first || {}
             schema_major_version = version["major"]
             schema_minor_version = version["minor"]
-            if schema_major_version.nil?
-              err_msg = "script.error.metadata_schema_versions_missing_major"
-              raise ::Script::Layers::Domain::Errors::MetadataValidationError, ctx.message(err_msg)
-            end
 
-            if schema_minor_version.nil?
-              err_msg = "script.error.metadata_schema_versions_missing_minor"
-              raise ::Script::Layers::Domain::Errors::MetadataValidationError, ctx.message(err_msg)
+            if schema_versions.empty?
+              err_tag = "script.error.metadata_schema_versions_missing"
+            elsif schema_versions.count != 1
+              # Scripts may be attached to more than one EP in the future but not right now
+              err_tag = "script.error.metadata_schema_versions_single_key"
+            elsif schema_major_version.nil?
+              err_tag = "script.error.metadata_schema_versions_missing_major"
+            elsif schema_minor_version.nil?
+              err_tag = "script.error.metadata_schema_versions_missing_minor"
             end
 
-            use_msgpack = !!metadata_hash.dig("flags", "use_msgpack")
-
             Metadata.new(schema_major_version, schema_minor_version, use_msgpack)
-          rescue ::Script::Layers::Domain::Errors::MetadataValidationError
-            raise
-          rescue
-            err_msg = "script.error.metadata_validation_cause"
-            raise ::Script::Layers::Domain::Errors::MetadataValidationError, ctx.message(err_msg)
+          rescue JSON::ParserError
+            err_tag = "script.error.metadata_validation_cause"
+          ensure
+            raise Errors::MetadataValidationError, ctx.message(err_tag) if err_tag
           end
         end
       end