shopify-cli 1.4.0 → 1.7.1

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

@@ -5,7 +5,7 @@ module Script
     module Application
       class EnableScript
         def self.call(ctx:, api_key:, shop_domain:, configuration:, extension_point_type:, title:)
-          UI::PrintingSpinner.spin(ctx, ctx.message('script.application.enabling')) do |p_ctx, spinner|
+          UI::PrintingSpinner.spin(ctx, ctx.message("script.application.enabling")) do |p_ctx, spinner|
             script_service = Infrastructure::ScriptService.new(ctx: p_ctx)
             script_service.enable(
               api_key: api_key,
@@ -14,7 +14,7 @@ module Script
               extension_point_type: extension_point_type,
               title: title
             )
-            spinner.update_title(p_ctx.message('script.application.enabled'))
+            spinner.update_title(p_ctx.message("script.application.enabled"))
           end
         end
       end

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

@@ -11,6 +11,30 @@ module Script
         def self.types
           Infrastructure::ExtensionPointRepository.new.extension_point_types
         end
+
+        def self.non_deprecated_types
+          Infrastructure::ExtensionPointRepository.new.extension_points.select do |ep|
+            !ep.deprecated?
+          end.map(&:type)
+        end
+
+        def self.deprecated_types
+          Infrastructure::ExtensionPointRepository.new
+            .extension_points
+            .select(&:deprecated?)
+            .map(&:type)
+        end
+
+        def self.languages(type:)
+          get(type: type).sdks.all.map do |sdk|
+            next nil if sdk.beta? && !ShopifyCli::Feature.enabled?(:scripts_beta_languages)
+            sdk.class.language
+          end.compact
+        end
+
+        def self.supported_language?(type:, language:)
+          languages(type: type).include?(language.downcase)
+        end
       end
     end
   end

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

@@ -3,14 +3,14 @@ module Script
     module Application
       class ProjectDependencies
         def self.install(ctx:, task_runner:)
-          CLI::UI::Frame.open(ctx.message('script.project_deps.checking_with_npm')) do
+          CLI::UI::Frame.open(ctx.message("script.project_deps.checking_with_npm")) do
             begin
               if task_runner.dependencies_installed?
-                ctx.puts(ctx.message('script.project_deps.none_required'))
+                ctx.puts(ctx.message("script.project_deps.none_required"))
               else
-                UI::StrictSpinner.spin(ctx.message('script.project_deps.installing')) do |spinner|
+                UI::StrictSpinner.spin(ctx.message("script.project_deps.installing")) do |spinner|
                   task_runner.install_dependencies
-                  spinner.update_title(ctx.message('script.project_deps.installed'))
+                  spinner.update_title(ctx.message("script.project_deps.installed"))
                 end
               end
               true

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

@@ -5,26 +5,23 @@ module Script
     module Application
       class PushScript
         class << self
-          def call(ctx:, language:, extension_point_type:, script_name:, source_file:, api_key:, force:)
-            script = Infrastructure::ScriptRepository.new(ctx: ctx).get_script(
-              language,
-              extension_point_type,
-              script_name
-            )
-            task_runner = Infrastructure::TaskRunner.for(ctx, language, script_name, source_file)
-            ProjectDependencies.install(ctx: ctx, task_runner: task_runner)
-            BuildScript.call(ctx: ctx, task_runner: task_runner, script: script)
-            push_script(ctx, task_runner, script, api_key, force)
-          end
+          def call(ctx:, force:)
+            script_project = ScriptProject.current
+            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)
 
-          private
+            ProjectDependencies.install(ctx: ctx, task_runner: task_runner)
+            BuildScript.call(ctx: ctx, task_runner: task_runner, script_project: script_project, config_ui: config_ui)
 
-          def push_script(ctx, task_runner, script, api_key, force)
-            UI::PrintingSpinner.spin(ctx, ctx.message('script.application.pushing')) do |p_ctx, spinner|
-              Infrastructure::PushPackageRepository.new(ctx: p_ctx)
-                .get_push_package(script, task_runner.compiled_type)
-                .push(Infrastructure::ScriptService.new(ctx: p_ctx), api_key, force)
-              spinner.update_title(p_ctx.message('script.application.pushed'))
+            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)
+              spinner.update_title(p_ctx.message("script.application.pushed"))
             end
           end
         end

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

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module Script
+  module Layers
+    module Domain
+      class ConfigUi
+        attr_reader :filename, :content
+
+        def initialize(filename:, content:)
+          @filename = filename
+          @content = content
+        end
+      end
+    end
+  end
+end

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

@@ -5,6 +5,7 @@ module Script
     module Domain
       module Errors
         class PushPackageNotFoundError < ScriptProjectError; end
+
         class InvalidExtensionPointError < ScriptProjectError
           attr_reader :type
           def initialize(type)
@@ -12,6 +13,23 @@ module Script
             @type = type
           end
         end
+
+        class InvalidConfigUiDefinitionError < ScriptProjectError
+          attr_reader :filename
+          def initialize(filename)
+            super()
+            @filename = filename
+          end
+        end
+
+        class MissingSpecifiedConfigUiDefinitionError < ScriptProjectError
+          attr_reader :filename
+          def initialize(filename)
+            super()
+            @filename = filename
+          end
+        end
+
         class ScriptNotFoundError < ScriptProjectError
           attr_reader :script_name, :extension_point_type
           def initialize(extension_point_type, script_name)
@@ -20,7 +38,12 @@ module Script
             @extension_point_type = extension_point_type
           end
         end
+
         class ServiceFailureError < ScriptProjectError; end
+
+        class MetadataNotFoundError < ScriptProjectError; end
+
+        class MetadataValidationError < ScriptProjectError; end
       end
     end
   end

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

@@ -4,25 +4,80 @@ module Script
   module Layers
     module Domain
       class ExtensionPoint
-        attr_reader :type, :sdks
+        attr_reader :type, :deprecated, :sdks
 
         def initialize(type, config)
           @type = type
-          @sdks = {
-            ts: ExtensionPointAssemblyScriptSDK.new(config["assemblyscript"]),
-          }
+          @deprecated = config["deprecated"] || false
+          @sdks = ExtensionPointSDKs.new(config)
+        end
+
+        def deprecated?
+          @deprecated
+        end
+      end
+
+      class ExtensionPointSDKs
+        def initialize(config)
+          @config = config
+        end
+
+        def all
+          [assemblyscript, rust].compact
+        end
+
+        def assemblyscript
+          @assemblyscript ||= new_sdk(ExtensionPointAssemblyScriptSDK)
+        end
+
+        def rust
+          @rust ||= new_sdk(ExtensionPointRustSDK)
+        end
+
+        private
+
+        def new_sdk(klass)
+          config = @config[klass.language]
+          return nil if config.nil?
+          klass.new(config)
         end
       end
 
-      class ExtensionPointAssemblyScriptSDK
-        attr_reader :package, :version, :sdk_version, :toolchain_version
+      class ExtensionPointSDK
+        attr_reader :beta, :package
 
         def initialize(config)
+          @beta = config["beta"] || false
           @package = config["package"]
-          @version = config["version"]
+        end
+
+        def beta?
+          @beta
+        end
+
+        def self.language
+          raise NotImplementedError
+        end
+      end
+
+      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 self.language
+          "assemblyscript"
+        end
+      end
+
+      class ExtensionPointRustSDK < ExtensionPointSDK
+        def self.language
+          "rust"
+        end
       end
     end
   end

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

@@ -0,0 +1,55 @@
+# frozen_string_literal: true
+
+module Script
+  module Layers
+    module Domain
+      class Metadata
+        attr_reader :schema_major_version, :schema_minor_version, :use_msgpack
+
+        def initialize(schema_major_version, schema_minor_version, use_msgpack)
+          @schema_major_version = schema_major_version
+          @schema_minor_version = schema_minor_version
+          @use_msgpack = use_msgpack
+        end
+
+        class << self
+          def create_from_json(ctx, metadata_json)
+            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
+            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)
+            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)
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -4,23 +4,46 @@ module Script
   module Layers
     module Domain
       class PushPackage
-        attr_reader :id, :script, :script_content, :compiled_type
+        attr_reader :id,
+          :extension_point_type,
+          :script_name,
+          :description,
+          :config_ui,
+          :script_content,
+          :compiled_type,
+          :metadata
 
-        def initialize(id, script, script_content, compiled_type)
+        def initialize(
+          id:,
+          extension_point_type:,
+          script_name:,
+          description:,
+          script_content:,
+          compiled_type:,
+          metadata:,
+          config_ui:
+        )
           @id = id
-          @script = script
+          @extension_point_type = extension_point_type
+          @script_name = script_name
+          @description = description
           @script_content = script_content
           @compiled_type = compiled_type
+          @metadata = metadata
+          @config_ui = config_ui
         end
 
         def push(script_service, api_key, force)
           script_service.push(
-            extension_point_type: @script.extension_point_type,
-            script_name: @script.name,
+            extension_point_type: @extension_point_type,
+            script_name: @script_name,
+            description: @description,
             script_content: @script_content,
             compiled_type: @compiled_type,
             api_key: api_key,
-            force: force
+            force: force,
+            metadata: @metadata,
+            config_ui: @config_ui,
           )
         end
       end

data/lib/project_types/script/layers/infrastructure/assemblyscript_project_creator.rb

@@ -10,11 +10,8 @@ module Script
         property! :script_name, accepts: String
         property! :path_to_project, accepts: String
 
-        BOOTSTRAP_SRC = "npx --no-install shopify-scripts-bootstrap src %{src_base}"
-        BOOTSTRAP_TEST = "npx --no-install shopify-scripts-bootstrap test %{test_base}"
-        SOURCE_DIR = "src"
-        TEST_DIR = "test"
-        LANGUAGE = "ts"
+        BOOTSTRAP = "npx --no-install shopify-scripts-toolchain-as bootstrap --from %{extension_point} --dest %{base}"
+        MIN_NODE_VERSION = "14.5.0"
 
         def setup_dependencies
           write_npmrc
@@ -22,58 +19,26 @@ module Script
         end
 
         def bootstrap
-          create_src_folder
-          create_test_folder
-        end
-
-        private
-
-        def create_src_folder
-          ctx.mkdir_p(src_base)
-          out, status = ctx.capture2e(format(BOOTSTRAP_SRC, src_base: src_base))
+          type = extension_point.type.gsub("_", "-")
+          out, status = ctx.capture2e(format(BOOTSTRAP, extension_point: type, base: path_to_project))
           raise Domain::Errors::ServiceFailureError, out unless status.success?
-
-          write_tsconfig_file(SOURCE_DIR, ".")
-        end
-
-        def create_test_folder
-          ctx.mkdir_p(test_base)
-          out, status = ctx.capture2e(format(BOOTSTRAP_TEST, test_base: test_base))
-          raise Domain::Errors::ServiceFailureError, out unless status.success?
-
-          copy_template_file(test_base, 'as-pect.config.js')
-          copy_template_file(test_base, 'as-pect.d.ts')
-          write_tsconfig_file(TEST_DIR, "../#{SOURCE_DIR}")
         end
 
-        def test_base
-          "#{path_to_project}/#{TEST_DIR}"
-        end
-
-        def src_base
-          "#{path_to_project}/#{SOURCE_DIR}"
-        end
-
-        def copy_template_file(destination, name)
-          template_file = Project.project_filepath("templates/#{LANGUAGE}/#{name}")
-          ctx.cp(template_file, "#{destination}/#{name}")
-        end
+        private
 
         def write_npmrc
           ctx.system(
-            'npm', '--userconfig', './.npmrc', 'config', 'set', '@shopify:registry', 'https://registry.npmjs.com'
+            "npm", "--userconfig", "./.npmrc", "config", "set", "@shopify:registry", "https://registry.npmjs.com"
           )
           ctx.system(
-            'npm', '--userconfig', './.npmrc', 'config', 'set', 'engine-strict', 'true'
+            "npm", "--userconfig", "./.npmrc", "config", "set", "engine-strict", "true"
           )
         end
 
-        def write_tsconfig_file(dir, path_to_source)
-          AssemblyScriptTsConfig
-            .new(dir_to_write_in: dir)
-            .with_extends_assemblyscript_config(relative_path_to_node_modules: ".")
-            .with_module_resolution_paths(paths: { "*": ["#{path_to_source}/*.ts"] })
-            .write
+        def extension_point_version
+          out, status = ctx.capture2e("npm show #{extension_point.sdks.assemblyscript.package} version --json")
+          raise Domain::Errors::ServiceFailureError, out unless status.success?
+          JSON.parse(out)
         end
 
         def write_package_json
@@ -82,22 +47,21 @@ module Script
               "name": "#{script_name}",
               "version": "1.0.0",
               "devDependencies": {
-                "@shopify/scripts-sdk-as": "#{extension_point.sdks[:ts].sdk_version}",
-                "@shopify/scripts-toolchain-as": "#{extension_point.sdks[:ts].toolchain_version}",
-                "#{extension_point.sdks[:ts].package}": "#{extension_point.sdks[:ts].version}",
-                "@as-pect/cli": "4.0.0",
-                "as-wasi": "^0.2.1",
-                "assemblyscript": "^0.14.0"
+                "@shopify/scripts-sdk-as": "#{extension_point.sdks.assemblyscript.sdk_version}",
+                "@shopify/scripts-toolchain-as": "#{extension_point.sdks.assemblyscript.toolchain_version}",
+                "#{extension_point.sdks.assemblyscript.package}": "^#{extension_point_version}",
+                "@as-pect/cli": "^6.0.0",
+                "assemblyscript": "^0.18.13"
               },
               "scripts": {
-                "test": "asp --config test/as-pect.config.js --summary --verbose"
+                "test": "asp --summary --verbose",
+                "build": "shopify-scripts-toolchain-as build --src src/shopify_main.ts --binary build/#{script_name}.wasm --metadata build/metadata.json -- --lib node_modules --optimize --use Date="
               },
               "engines": {
-                "node": ">=14.5"
+                "node": ">=#{MIN_NODE_VERSION}"
               }
             }
           HERE
-
           ctx.write("package.json", package_json)
         end
       end