shopify-cli 2.15.0 → 2.15.3

data/lib/project_types/extension/models/specification_handlers/beacon_extension_utils/script_config_repository.rb

@@ -0,0 +1,75 @@
+require_relative "script_config"
+module Extension
+  module Models
+    module SpecificationHandlers
+      module BeaconExtensionUtils
+        class ScriptConfigRepository
+          include SmartProperties
+          property! :ctx, accepts: ShopifyCLI::Context
+
+          def active?
+            ctx.file_exist?(filename)
+          end
+
+          def get!
+            raise RuntimeError.new("NoScriptConfigFile"), filename unless active?
+
+            content = ctx.read(filename)
+            hash = file_content_to_hash(content)
+
+            from_h(hash)
+          end
+
+          def filename
+            raise NotImplementedError
+          end
+
+          private
+
+          def from_h(hash)
+            Extension::Models::SpecificationHandlers::BeaconExtensionUtils::ScriptConfig.new(content: hash,
+              filename: filename)
+          end
+
+          def file_content_to_hash(file_content)
+            raise NotImplementedError
+          end
+
+          def hash_to_file_content(hash)
+            raise NotImplementedError
+          end
+        end
+
+        class ScriptConfigYmlRepository < ScriptConfigRepository
+          def self.filename
+            "extension.config.yml"
+          end
+
+          def filename
+            ScriptConfigYmlRepository.filename
+          end
+
+          private
+
+          def file_content_to_hash(file_content)
+            begin
+              hash = YAML.load(file_content)
+            rescue Psych::SyntaxError
+              raise parse_error
+            end
+            raise parse_error unless hash.is_a?(Hash)
+            hash
+          end
+
+          def hash_to_file_content(hash)
+            YAML.dump(hash)
+          end
+
+          def parse_error
+            RuntimeError.new("ScriptConfigParseError #{filename}, serialization_format: \"YAML\" ")
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -49,7 +49,7 @@ module Extension
 
             locale_filenames.map do |filename|
               locale = basename_for_locale_filename(filename)
-              [locale.to_sym, Base64.strict_encode64(File.read(filename, mode: "rt", encoding: "UTF-8").strip)]
+              [locale.to_sym, read_locale_file(filename)]
             end
               .yield_self do |encoded_files_by_locale|
               {
@@ -62,6 +62,14 @@ module Extension
           end
         end
 
+        def read_locale_file(filename)
+          content = File.read(filename, mode: "rt", encoding: "bom|utf-8").strip
+          raise_invalid_encoding_error(filename) unless content.valid_encoding?
+          Base64.strict_encode64(content)
+        rescue ArgumentError
+          raise_invalid_encoding_error(filename)
+        end
+
         def validate_no_duplicate_locale(locale_filenames)
           duplicate_locale = locale_filenames
             .map { |filename| basename_for_locale_filename(filename.downcase) }
@@ -149,6 +157,13 @@ module Extension
         def basename_for_locale_filename(filename)
           File.basename(File.basename(filename, ".json"), ".default")
         end
+
+        def raise_invalid_encoding_error(filename)
+          raise(
+            ShopifyCLI::Abort,
+            ShopifyCLI::Context.message("#{L10N_ERROR_PREFIX}.invalid_file_encoding", filename)
+          )
+        end
       end
     end
   end

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

@@ -13,7 +13,8 @@ module Extension
       private
 
       def configure_skip_build(attributes)
-        attributes[:options].merge!(skip_build: attributes[:identifier] == "theme_app_extension")
+        attributes[:options].merge!(skip_build: attributes[:identifier] == "theme_app_extension" ||
+         attributes[:identifier] == "beacon_extension")
       end
     end
   end

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

@@ -18,7 +18,6 @@ module Extension
       property! :type, accepts: String
 
       DEFAULT_BUILD_DIR = "build"
-      DEFAULT_MAIN = Dir["src/*"].lazy.grep(/index.[jt]sx?/).first
 
       def self.call(*args)
         new(*args).call
@@ -37,7 +36,7 @@ module Extension
             build_dir: hash.dig("development", "build_dir") || DEFAULT_BUILD_DIR,
             renderer: renderer,
             entries: Models::ServerConfig::DevelopmentEntries.new(
-              main: hash.dig("development", "entries", "main") || DEFAULT_MAIN
+              main: hash.dig("development", "entries", "main") || determine_default_entry_main(project_directory),
             )
           ),
           extension_points: hash.dig("extension_points"),
@@ -65,6 +64,18 @@ module Extension
       def version(renderer, context)
         Tasks::FindPackageFromJson.call(renderer, context: context).version
       end
+
+      private
+
+      def determine_default_entry_main(project_directory)
+        Dir.chdir(project_directory) do
+          Dir["src/*"].lazy.grep(/index.[jt]sx?/).first
+        end
+      end
+
+      def project_directory
+        ExtensionProject.current.directory
+      end
     end
   end
 end

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

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 require "shopify_cli"
 require "yaml"
+require "pathname"
 
 module Extension
   module Tasks
@@ -8,7 +9,7 @@ module Extension
       include SmartProperties
 
       property! :context, accepts: ShopifyCLI::Context
-      property! :file_path, accepts: ->(path) { Pathname(path).yield_self { |pn| pn.absolute? && pn.file? } }
+      property! :file_path, accepts: ->(path) { Pathname(path).yield_self(&:absolute?) }
       property  :port, accepts: Integer, default: ShopifyCLI::Constants::Extension::DEFAULT_PORT
       property  :resource_url, accepts: String
       property  :tunnel_url, accepts: String
@@ -19,7 +20,9 @@ module Extension
       end
 
       def call
-        config = YAML.load_file(file_path)
+        config = YAML.load_file(file_path) if File.file?(file_path)
+        config ||= {}
+
         project = ExtensionProject.current
         Tasks::ConvertServerConfig.call(
           api_key: project.env.api_key,

data/lib/project_types/script/cli.rb

@@ -62,6 +62,7 @@ module Script
       autoload :ScriptService, Project.project_filepath("layers/infrastructure/script_service")
       autoload :ScriptUploader, Project.project_filepath("layers/infrastructure/script_uploader")
       autoload :ServiceLocator, Project.project_filepath("layers/infrastructure/service_locator")
+      autoload :SparseCheckoutDetails, Project.project_filepath("layers/infrastructure/sparse_checkout_details")
 
       module Languages
         autoload :ProjectCreator, Project.project_filepath("layers/infrastructure/languages/project_creator")

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

@@ -36,3 +36,21 @@ delivery_discount_types:
       repo: "https://github.com/Shopify/scripts-apis-examples"
     wasm:
       repo: "https://github.com/Shopify/scripts-apis-examples"
+product_discount_type:
+  beta: true
+  domain: 'discounts'
+  libraries:
+    wasm:
+      repo: "https://github.com/Shopify/scripts-apis-examples"
+order_discount_type:
+  beta: true
+  domain: 'discounts'
+  libraries:
+    wasm:
+      repo: "https://github.com/Shopify/scripts-apis-examples"
+shipping_discount_type:
+  beta: true
+  domain: 'discounts'
+  libraries:
+    wasm:
+      repo: "https://github.com/Shopify/scripts-apis-examples"

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

@@ -23,19 +23,23 @@ module Script
               )
 
               # remove the need to pass the whole extension-point object to the infra layer
-              sparse_checkout_repo = extension_point.libraries.for(language).repo
               type = extension_point.dasherize_type
               domain = extension_point.domain
 
+              sparse_checkout_details = Infrastructure::SparseCheckoutDetails.new(
+                repo: extension_point.libraries.for(language).repo,
+                branch: sparse_checkout_branch,
+                path: "#{domain}/#{language}/#{type}/default",
+                input_queries_enabled: input_queries_enabled?,
+              )
+
               project_creator = Infrastructure::Languages::ProjectCreator.for(
                 ctx: ctx,
                 language: language,
                 type: type,
                 project_name: title,
                 path_to_project: project.id,
-                sparse_checkout_repo: sparse_checkout_repo,
-                sparse_checkout_branch: sparse_checkout_branch,
-                sparse_checkout_set_path: "#{domain}/#{language}/#{type}/default"
+                sparse_checkout_details: sparse_checkout_details,
               )
 
               install_dependencies(ctx, language, title, project_creator)
@@ -49,12 +53,12 @@ module Script
             task_runner = Infrastructure::Languages::TaskRunner.for(ctx, language)
             CLI::UI::Frame.open(ctx.message(
               "core.git.pulling_from_to",
-              project_creator.sparse_checkout_repo,
+              project_creator.sparse_checkout_details.repo,
               title,
             )) do
               UI::StrictSpinner.spin(ctx.message(
                 "core.git.pulling",
-                project_creator.sparse_checkout_repo,
+                project_creator.sparse_checkout_details.repo,
                 title,
               )) do |spinner|
                 project_creator.setup_dependencies
@@ -75,6 +79,10 @@ module Script
           ensure
             script_project_repo.change_to_initial_directory
           end
+
+          def input_queries_enabled?
+            ShopifyCLI::Feature.enabled?(:scripts_beta_input_queries)
+          end
         end
       end
     end

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

@@ -180,6 +180,23 @@ module Script
             @max_size = max_size
           end
         end
+
+        class InvalidInputQueryErrors < ScriptProjectError
+          attr_reader :messages
+
+          def initialize(messages)
+            @messages = messages
+            super()
+          end
+
+          def input_query_path
+            ScriptProjectRepository::INPUT_QUERY_PATH
+          end
+
+          def message
+            messages.join("\n")
+          end
+        end
       end
     end
   end

data/lib/project_types/script/layers/infrastructure/languages/project_creator.rb

@@ -10,9 +10,7 @@ module Script
           property! :type, accepts: String
           property! :project_name, accepts: String
           property! :path_to_project, accepts: String
-          property! :sparse_checkout_repo, accepts: String
-          property! :sparse_checkout_branch, accepts: String
-          property! :sparse_checkout_set_path, accepts: String
+          property! :sparse_checkout_details, accepts: SparseCheckoutDetails
 
           def self.for(
             ctx:,
@@ -20,9 +18,7 @@ module Script
             type:,
             project_name:,
             path_to_project:,
-            sparse_checkout_repo:,
-            sparse_checkout_branch:,
-            sparse_checkout_set_path:
+            sparse_checkout_details:
           )
 
             project_creators = {
@@ -36,33 +32,22 @@ module Script
               type: type,
               project_name: project_name,
               path_to_project: path_to_project,
-              sparse_checkout_repo: sparse_checkout_repo,
-              sparse_checkout_branch: sparse_checkout_branch,
-              sparse_checkout_set_path: sparse_checkout_set_path
+              sparse_checkout_details: sparse_checkout_details,
             )
           end
 
           # the sparse checkout process is common to all script types
           def setup_dependencies
-            setup_sparse_checkout
+            sparse_checkout_details.setup(ctx)
             clean
           end
 
           private
 
-          def setup_sparse_checkout
-            ShopifyCLI::Git.sparse_checkout(
-              sparse_checkout_repo,
-              sparse_checkout_set_path,
-              sparse_checkout_branch,
-              ctx
-            )
-          end
-
           def clean
-            source = File.join(path_to_project, sparse_checkout_set_path, ".")
+            source = File.join(path_to_project, sparse_checkout_details.path, ".")
             FileUtils.cp_r(source, path_to_project)
-            ctx.rm_rf(sparse_checkout_set_path.split("/")[0])
+            ctx.rm_rf(sparse_checkout_details.path.split("/")[0])
             ctx.rm_rf(".git")
           end
 

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

@@ -83,6 +83,8 @@ module Script
               valid_types: e["message"],
               filename: script_config.filename,
             )
+          elsif (errors = user_errors.filter { |err| err["tag"] == "input_query_validation_error" }).any?
+            raise Errors::InvalidInputQueryErrors, errors.map { |err| err["message"] }
           elsif user_errors.find { |err| %w(not_use_msgpack_error schema_version_argument_error).include?(err["tag"]) }
             raise Domain::Errors::MetadataValidationError
           else

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

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+module Script
+  module Layers
+    module Infrastructure
+      class SparseCheckoutDetails
+        include SmartProperties
+        property! :repo, accepts: String
+        property! :branch, accepts: String
+        property! :path, accepts: String
+        property! :input_queries_enabled, accepts: [true, false]
+
+        def ==(other)
+          self.class == other.class &&
+            self.class.properties.all? { |name, _| self[name] == other[name] }
+        end
+
+        def setup(ctx)
+          ShopifyCLI::Git.sparse_checkout(repo, patterns_to_checkout, branch, ctx)
+        end
+
+        private
+
+        def patterns_to_checkout
+          paths = [path]
+          unless input_queries_enabled
+            paths << "!#{path}/#{ScriptProjectRepository::INPUT_QUERY_PATH}"
+            paths << "!#{path}/schema.graphql"
+          end
+          paths.join(" ")
+        end
+      end
+    end
+  end
+end

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

@@ -86,6 +86,9 @@ module Script
                                                      "type(s): %{valid_types}.",
           configuration_schema_field_invalid_value_error_help: "Change the value of the type.",
 
+          input_query_error_cause: "Input query is invalid:\n%{messages}\n\n",
+          input_query_error_help: "Fix the query in the `%{input_query_path}` file.",
+
           script_not_found_cause: "Can't find script %s for Script API %s",
 
           system_call_failure_cause: "Something went wrong while running: {{command:%{cmd}}}.",

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

@@ -216,6 +216,17 @@ module Script
               "script.error.configuration_schema_field_invalid_value_error_help"
             ),
           }
+        when Layers::Infrastructure::Errors::InvalidInputQueryErrors
+          {
+            cause_of_error: ShopifyCLI::Context.message(
+              "script.error.input_query_error_cause",
+              messages: e.messages.map { |message| "  {{x}} #{message}." }.join("\n"),
+            ),
+            help_suggestion: ShopifyCLI::Context.message(
+              "script.error.input_query_error_help",
+              input_query_path: e.input_query_path,
+            ),
+          }
         when Layers::Infrastructure::Errors::DependencyInstallError
           {
             cause_of_error: ShopifyCLI::Context.message("script.error.dependency_install_cause"),

data/lib/project_types/theme/cli.rb

@@ -16,6 +16,7 @@ module Theme
     subcommand :Package, "package", Project.project_filepath("commands/package")
     subcommand :Open, "open", Project.project_filepath("commands/open")
     subcommand :List, "list", Project.project_filepath("commands/list")
+    subcommand :Share, "share", Project.project_filepath("commands/share")
     subcommand :LanguageServer, "language-server", Project.project_filepath("commands/language_server")
   end
   ShopifyCLI::Commands.register("Theme::Command", "theme")

data/lib/project_types/theme/commands/check.rb

@@ -24,7 +24,10 @@ module Theme
       end
 
       def call(*)
-        @theme_check.run
+        @theme_check.run!
+      rescue ThemeCheck::Cli::Abort, ThemeCheck::ThemeCheckError => e
+        raise ShopifyCLI::Abort,
+          ShopifyCLI::Context.message("theme.check.error", e.full_message)
       end
 
       def self.help

data/lib/project_types/theme/commands/open.rb

@@ -17,8 +17,8 @@ module Theme
       def call(_args, _name)
         theme = find_theme(**options.flags)
 
-        @ctx.puts(@ctx.message("theme.open.details", theme.name, theme.editor_url))
-        @ctx.open_url!(theme.preview_url)
+        @ctx.puts(@ctx.message("theme.open.details", theme.name, theme.preview_url, theme.editor_url))
+        @ctx.open_browser_url!(theme.preview_url)
       end
 
       def self.help

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

@@ -104,9 +104,7 @@ module Theme
 
         if unpublished
           name = theme || ask_theme_name
-          new_theme = ShopifyCLI::Theme::Theme.new(@ctx, root: root, name: name, role: "unpublished")
-          new_theme.create
-          return new_theme
+          return ShopifyCLI::Theme::Theme.create_unpublished(@ctx, root: root, name: name)
         end
 
         if theme

data/lib/project_types/theme/commands/serve.rb

@@ -16,6 +16,7 @@ module Theme
         parser.on("--port=PORT") { |port| flags[:port] = port.to_i }
         parser.on("--poll") { flags[:poll] = true }
         parser.on("--live-reload=MODE") { |mode| flags[:mode] = as_reload_mode(mode) }
+        parser.on("--theme-editor-sync") { flags[:editor_sync] = true }
       end
 
       def call(_args, name)

data/lib/project_types/theme/commands/share.rb

@@ -0,0 +1,56 @@
+# frozen_string_literal: true
+
+require "shopify_cli/theme/theme"
+require "shopify_cli/theme/syncer"
+require "project_types/theme/commands/common/root_helper"
+
+module Theme
+  class Command
+    class Share < ShopifyCLI::Command::SubCommand
+      include Common::RootHelper
+
+      recommend_default_ruby_range
+
+      def call(_args, name)
+        root = root_value(options, name)
+        theme = create_theme(root)
+
+        upload(theme)
+
+        @ctx.done(done_message(theme))
+      end
+
+      def self.help
+        tool = ShopifyCLI::TOOL_NAME
+        @ctx.message("theme.share.help", tool, tool)
+      end
+
+      private
+
+      def create_theme(root)
+        ShopifyCLI::Theme::Theme.create_unpublished(@ctx, root: root)
+      end
+
+      def upload(theme)
+        syncer = ShopifyCLI::Theme::Syncer.new(@ctx, theme: theme)
+        syncer.start_threads
+
+        CLI::UI::Frame.open(upload_message(theme)) do
+          UI::SyncProgressBar.new(syncer).progress(:upload_theme!)
+        end
+
+        raise ShopifyCLI::AbortSilent if syncer.has_any_error?
+      ensure
+        syncer.shutdown
+      end
+
+      def upload_message(theme)
+        @ctx.message("theme.share.upload", theme.name, theme.id, theme.shop)
+      end
+
+      def done_message(theme)
+        @ctx.message("theme.share.done", theme.name, theme.preview_url, theme.editor_url)
+      end
+    end
+  end
+end