shopify-cli 1.5.0 → 1.6.0

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

@@ -0,0 +1,72 @@
+# frozen_string_literal: true
+
+module Script
+  module Layers
+    module Infrastructure
+      class RustProjectCreator
+        include SmartProperties
+        property! :ctx, accepts: ShopifyCli::Context
+        property! :extension_point, accepts: Domain::ExtensionPoint
+        property! :script_name, accepts: String
+        property! :path_to_project, accepts: String
+
+        ORIGIN_BRANCH = 'main'
+        SAMPLE_PATH = 'default'
+
+        def setup_dependencies
+          git_init
+          setup_remote
+          setup_sparse_checkout
+          pull
+          clean
+          set_script_name
+        end
+
+        def bootstrap
+        end
+
+        private
+
+        def git_init
+          out, status = ctx.capture2e("git init")
+          raise Domain::Errors::ServiceFailureError, out unless status.success?
+        end
+
+        def setup_remote
+          repo = extension_point.sdks.rust.package
+          out, status = ctx.capture2e("git remote add -f origin #{repo}")
+          raise Domain::Errors::ServiceFailureError, out unless status.success?
+        end
+
+        def setup_sparse_checkout
+          type = extension_point.type
+          out, status = ctx.capture2e("git config core.sparsecheckout true")
+          raise Domain::Errors::ServiceFailureError, out unless status.success?
+          out, status = ctx.capture2e("echo #{type}/#{SAMPLE_PATH} >> .git/info/sparse-checkout")
+          raise Domain::Errors::ServiceFailureError, out unless status.success?
+        end
+
+        def pull
+          out, status = ctx.capture2e("git pull origin #{ORIGIN_BRANCH}")
+          raise Domain::Errors::ServiceFailureError, out unless status.success?
+        end
+
+        def clean
+          type = extension_point.type
+          ctx.rm_rf(".git")
+          source = File.join(path_to_project, File.join(type, SAMPLE_PATH))
+          FileUtils.copy_entry(source, path_to_project)
+          ctx.rm_rf(type)
+        end
+
+        def set_script_name
+          config_file = 'Cargo.toml'
+          upstream_name = "#{extension_point.type.gsub('_', '-')}-default"
+          contents = File.read(config_file)
+          new_contents = contents.sub(upstream_name, script_name)
+          File.write(config_file, new_contents)
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,59 @@
+# frozen_string_literal: true
+module Script
+  module Layers
+    module Infrastructure
+      class RustTaskRunner
+        attr_reader :ctx, :script_name
+
+        BUILD_TARGET = "wasm32-unknown-unknown"
+        METADATA_FILE = "build/metadata.json"
+
+        def initialize(ctx, script_name)
+          @ctx = ctx
+          @script_name = script_name
+        end
+
+        def dependencies_installed?
+          true
+        end
+
+        def install_dependencies
+        end
+
+        def build
+          compile
+          bytecode
+        end
+
+        def compiled_type
+          "wasm"
+        end
+
+        def metadata
+          unless @ctx.file_exist?(METADATA_FILE)
+            msg = @ctx.message('script.error.metadata_not_found_cause', METADATA_FILE)
+            raise Domain::Errors::MetadataNotFoundError, msg
+          end
+
+          raw_contents = File.read(METADATA_FILE)
+          Domain::Metadata.create_from_json(@ctx, raw_contents)
+        end
+
+        private
+
+        def compile
+          out, status = ctx.capture2e("cargo build --target=#{BUILD_TARGET} --release")
+          raise Domain::Errors::ServiceFailureError, out unless status.success?
+        end
+
+        def bytecode
+          binary_name = "#{script_name}.wasm"
+          binary_path = "target/#{BUILD_TARGET}/release/#{binary_name}"
+          raise Errors::WebAssemblyBinaryNotFoundError unless ctx.file_exist?(binary_path)
+
+          File.read(binary_path)
+        end
+      end
+    end
+  end
+end

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

@@ -15,16 +15,22 @@ module Script
           script_name:,
           script_content:,
           compiled_type:,
+          description: nil,
           api_key: nil,
-          force: false
+          force: false,
+          metadata:
         )
           query_name = "app_script_update_or_create"
           variables = {
             extensionPointName: extension_point_type.upcase,
             title: script_name,
+            description: description,
             sourceCode: Base64.encode64(script_content),
             language: compiled_type,
             force: force,
+            schemaMajorVersion: metadata.schema_major_version.to_s, # API expects string value
+            schemaMinorVersion: metadata.schema_minor_version.to_s, # API expects string value
+            useMsgpack: metadata.use_msgpack,
           }
           resp_hash = script_service_request(query_name: query_name, api_key: api_key, variables: variables)
           user_errors = resp_hash["data"]["appScriptUpdateOrCreate"]["userErrors"]

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

@@ -5,12 +5,13 @@ module Script
     module Infrastructure
       class TaskRunner
         TASK_RUNNERS = {
-          "ts" => Infrastructure::AssemblyScriptTaskRunner,
+          "assemblyscript" => Infrastructure::AssemblyScriptTaskRunner,
+          "rust" => Infrastructure::RustTaskRunner,
         }
 
-        def self.for(ctx, language, script_name, script_source_file)
+        def self.for(ctx, language, script_name)
           raise Errors::TaskRunnerNotFoundError unless TASK_RUNNERS[language]
-          TASK_RUNNERS[language].new(ctx, script_name, script_source_file)
+          TASK_RUNNERS[language].new(ctx, script_name)
         end
       end
     end

data/lib/project_types/script/messages/messages.rb

@@ -5,6 +5,9 @@ module Script
     MESSAGES = {
       script: {
         error: {
+          deprecated_ep: "This project uses an extension point %s which has been deprecated. "\
+                         "This Script will no longer function in production.",
+          deprecated_ep_cause: "Try using a different extension point.",
           generic: "{{red:{{x}} Error}}",
           eacces_cause: "You don't have permission to write to this directory.",
           eacces_help: "Change your directory permissions and try again.",
@@ -39,14 +42,39 @@ module Script
           project_exists_cause: "Directory with the same name as the script already exists.",
           project_exists_help: "Use different script name and try again.",
 
-          invalid_extension_cause: "Invalid extension point %s",
+          invalid_extension_cause: "Invalid extension point %s.",
           invalid_extension_help: "Allowed values: %s.",
 
+          invalid_language_cause: "Invalid language %s.",
+          invalid_language_help: "Allowed values: %s.",
+
           invalid_config: "Can't change the configuration values because %1$s is missing or "\
                           "it is not formatted properly.",
 
           script_not_found_cause: "Couldn't find script %s for extension point %s",
 
+          service_failure_cause: "Internal service error.",
+          service_failure_help: "Ensure the 'shopify/scripts-toolchain-as' package is up to date.",
+
+          user_error_cause: "Invalid script extension metadata.",
+          user_error_help: "Ensure the 'shopify/scripts-toolchain-as' package is up to date.",
+
+          metadata_validation_cause: "Invalid script extension metadata.",
+          metadata_validation_help: "Ensure the 'shopify/scripts-toolchain-as' package is up to date.",
+
+          metadata_schema_versions_missing: "Invalid script metadata:" \
+                                            " 'schemaVersions' field is missing",
+          metadata_schema_versions_single_key: "Invalid script extension metadata:" \
+                                               " 'schemaVersions' can have only one extension point name.",
+          metadata_schema_versions_missing_major: "Invalid script extension metadata:" \
+                                                  " 'schemaVersions' is missing the 'major' field",
+          metadata_schema_versions_missing_minor: "Invalid script extension metadata:" \
+                                                  " 'schemaVersions' is missing the 'minor' field",
+
+          metadata_not_found_cause: "Script version file (%s) cannot be found.",
+          metadata_not_found_help: "Ensure the 'shopify/scripts-toolchain-as' package is up to date and " \
+                                     "'package.json' contains a 'scripts/build' entry with a " \
+                                     "'--metadata build/metadata.json' argument",
           app_not_installed_cause: "App not installed on store.",
 
           app_script_not_pushed_help: "Script isn't on the app. Run {{command:shopify push}}, and then try again.",
@@ -80,13 +108,13 @@ module Script
           packages_outdated_cause: "These npm packages are out of date: %s.",
           packages_outdated_help: "To update them, run {{cyan:npm install --save-dev %s}}.",
 
-          invalid_build_script: "Invalid build script.",
-          build_script_not_found: "Build script not found.",
+          invalid_build_script: "The root package.json contains an invalid build command that " \
+                                "is needed to compile your script to WebAssembly.",
+          build_script_not_found: "The root package.json is missing the build command that " \
+                                  "is needed to compile your script to WebAssembly.",
           # rubocop:disable Layout/LineLength
-          build_script_suggestion: "Root package.json needs a script named build, which" \
-            "uses @shopify/scripts-toolchain-as to compile to WebAssembly.\n" \
-            "Example:\n" \
-            "build: npx shopify-scripts-toolchain-as build --src src/script.ts --binary <script_name>.wasm -- --lib node_modules --optimize --use Date=",
+          build_script_suggestion: "\n\nFor example, your package.json needs the following command:" \
+            "\nbuild: npx shopify-scripts-toolchain-as build --src src/script.ts --binary build/<script_name>.wasm --metadata build/metadata.json -- --lib node_modules --optimize --use Date=",
 
           web_assembly_binary_not_found: "WebAssembly binary not found.",
           web_assembly_binary_not_found_suggestion: "No WebAssembly binary found." \
@@ -100,6 +128,7 @@ module Script
             Usage: {{command:%1$s create script}}
             Options:
               {{command:--name=NAME}} Script project name. Use any string.
+              {{command:--description=DESCRIPTION}} Description of the project. Use any string.
               {{command:--extension_point=TYPE}} Extension point name. Allowed values: %2$s.
           HELP
 
@@ -109,7 +138,7 @@ module Script
 
           change_directory_notice: "{{*}} Change directories to {{green:%s}} to run script commands",
           creating: "Creating script",
-          created: "Created script: {{green:%s}}",
+          created: "Created script",
         },
 
         push: {
@@ -171,7 +200,9 @@ module Script
         forms: {
           create: {
             select_extension_point: "Which extension point do you want to use?",
+            select_language: "Which language do you want to use?",
             script_name: "Script Name",
+            description: "Description",
           },
         },
 

data/lib/project_types/script/script_project.rb

@@ -2,16 +2,15 @@
 
 module Script
   class ScriptProject < ShopifyCli::Project
-    SUPPORTED_LANGUAGES = %w(ts)
-    SOURCE_DIR = "src"
-
-    attr_reader :extension_point_type, :script_name, :language
+    attr_reader :extension_point_type, :script_name, :language, :description
 
     def initialize(*args)
       super
-      @extension_point_type = lookup_config('extension_point_type')
-      @script_name = lookup_config('script_name')
-      @language = 'ts'
+      @extension_point_type = lookup_config!('extension_point_type')
+      raise Errors::DeprecatedEPError, @extension_point_type if deprecated?(@extension_point_type)
+      @script_name = lookup_config!('script_name')
+      @description = lookup_config('description')
+      @language = lookup_language
       ShopifyCli::Core::Monorail.metadata = {
         "script_name" => @script_name,
         "extension_point_type" => @extension_point_type,
@@ -19,25 +18,35 @@ module Script
       }
     end
 
-    def file_name
-      "script.#{language}"
+    def api_key
+      env[:api_key]
     end
 
-    def source_file
-      "#{SOURCE_DIR}/#{file_name}"
-    end
+    private
 
-    def source_path
-      "#{script_name}/#{source_file}"
+    def deprecated?(ep)
+      Script::Layers::Application::ExtensionPoints.deprecated_types.include?(ep)
     end
 
-    private
-
     def lookup_config(key)
+      return nil unless config.key?(key)
+      config[key]
+    end
+
+    def lookup_config!(key)
       raise Errors::InvalidContextError, key unless config.key?(key)
       config[key]
     end
 
+    def lookup_language
+      lang = lookup_config('language')&.downcase || Layers::Domain::ExtensionPointAssemblyScriptSDK.language
+      if Layers::Application::ExtensionPoints.supported_language?(type: extension_point_type, language: lang)
+        lang
+      else
+        raise Errors::InvalidLanguageError.new(lang, extension_point_type)
+      end
+    end
+
     class << self
       def create(ctx, dir)
         raise Errors::ScriptProjectAlreadyExistsError, dir if ctx.dir_exist?(dir)

data/lib/project_types/script/ui/error_handler.rb

@@ -53,6 +53,14 @@ module Script
           {
             cause_of_error: ShopifyCli::Context.message('script.error.invalid_config', e.config_file),
           }
+        when Errors::InvalidLanguageError
+          {
+            cause_of_error: ShopifyCli::Context.message('script.error.invalid_language_cause', e.language),
+            help_suggestion: ShopifyCli::Context.message(
+              'script.error.invalid_language_help',
+              Script::Layers::Application::ExtensionPoints.languages(type: e.extension_point_type).join(', ')
+            ),
+          }
         when Errors::InvalidScriptNameError
           {
             cause_of_error: ShopifyCli::Context.message('script.error.invalid_script_name_cause'),
@@ -81,12 +89,17 @@ module Script
             cause_of_error: ShopifyCli::Context.message('script.error.project_exists_cause'),
             help_suggestion: ShopifyCli::Context.message('script.error.project_exists_help'),
           }
+        when Errors::DeprecatedEPError
+          {
+            cause_of_error: ShopifyCli::Context.message('script.error.deprecated_ep', e.ep),
+            help_suggestion: ShopifyCli::Context.message('script.error.deprecated_ep_cause'),
+          }
         when Layers::Domain::Errors::InvalidExtensionPointError
           {
             cause_of_error: ShopifyCli::Context.message('script.error.invalid_extension_cause', e.type),
             help_suggestion: ShopifyCli::Context.message(
               'script.error.invalid_extension_help',
-             Script::Layers::Application::ExtensionPoints.types.join(', ')
+              Script::Layers::Application::ExtensionPoints.types.join(', ')
             ),
           }
         when Layers::Domain::Errors::ScriptNotFoundError
@@ -97,6 +110,21 @@ module Script
               e.extension_point_type
             ),
           }
+        when Layers::Domain::Errors::ServiceFailureError
+          {
+            cause_of_error: ShopifyCli::Context.message('script.error.service_failure_cause'),
+            help_suggestion: ShopifyCli::Context.message('script.error.service_failure_help'),
+          }
+        when Layers::Domain::Errors::MetadataValidationError
+          {
+            cause_of_error: ShopifyCli::Context.message('script.error.metadata_validation_cause'),
+            help_suggestion: ShopifyCli::Context.message('script.error.metadata_validation_help'),
+          }
+        when Layers::Domain::Errors::MetadataNotFoundError
+          {
+            cause_of_error: ShopifyCli::Context.message('script.error.metadata_not_found_cause'),
+            help_suggestion: ShopifyCli::Context.message('script.error.metadata_not_found_help'),
+          }
         when Layers::Infrastructure::Errors::AppNotInstalledError
           {
             cause_of_error: ShopifyCli::Context.message('script.error.app_not_installed_cause'),
@@ -135,6 +163,11 @@ module Script
             cause_of_error: ShopifyCli::Context.message('script.error.script_repush_cause', e.api_key),
             help_suggestion: ShopifyCli::Context.message('script.error.script_repush_help'),
           }
+        when Layers::Infrastructure::Errors::ScriptServiceUserError
+          {
+            cause_of_error: ShopifyCli::Context.message('script.error.user_error_cause'),
+            help_suggestion: ShopifyCli::Context.message('script.error.user_error_help'),
+          }
         when Layers::Infrastructure::Errors::ShopAuthenticationError
           {
             cause_of_error: ShopifyCli::Context.message('script.error.shop_auth_cause'),

data/lib/project_types/theme/cli.rb

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+module Theme
+  class Project < ShopifyCli::ProjectType
+    hidden_feature
+
+    title('Theme')
+    creator('Theme::Commands::Create')
+    connector('Theme::Commands::Connect')
+
+    register_command('Theme::Commands::Deploy', 'deploy')
+    register_command('Theme::Commands::Generate', 'generate')
+    register_command('Theme::Commands::Push', 'push')
+    register_command('Theme::Commands::Serve', 'serve')
+
+    register_task('Theme::Tasks::EnsureThemekitInstalled', :ensure_themekit_installed)
+
+    require Project.project_filepath('messages/messages')
+    register_messages(Theme::Messages::MESSAGES)
+  end
+
+  module Commands
+    autoload :Connect, Project.project_filepath('commands/connect')
+    autoload :Create, Project.project_filepath('commands/create')
+    autoload :Deploy, Project.project_filepath('commands/deploy')
+    autoload :Generate, Project.project_filepath('commands/generate')
+    autoload :Push, Project.project_filepath('commands/push')
+    autoload :Serve, Project.project_filepath('commands/serve')
+  end
+
+  module Tasks
+    autoload :EnsureThemekitInstalled, Project.project_filepath('tasks/ensure_themekit_installed')
+  end
+
+  module Forms
+    autoload :Create, Project.project_filepath('forms/create')
+    autoload :Connect, Project.project_filepath('forms/connect')
+  end
+
+  autoload :Themekit, Project.project_filepath('themekit')
+end