shopify-cli 1.0.2 → 1.1.1

data/lib/project_types/script/cli.rb

@@ -2,7 +2,7 @@
 
 module Script
   class Project < ShopifyCli::ProjectType
-    hidden_project_type
+    hidden_feature(feature_set: :script_project)
     creator 'Script', 'Script::Commands::Create'
 
     register_command('Script::Commands::Push', 'push')
@@ -24,8 +24,6 @@ module Script
   # define/autoload project specific Forms
   module Forms
     autoload :Create, Project.project_filepath('forms/create')
-    autoload :Push, Project.project_filepath('forms/push')
-    autoload :Enable, Project.project_filepath('forms/enable')
     autoload :ScriptForm, Project.project_filepath('forms/script_form')
   end
 
@@ -66,6 +64,7 @@ module Script
 
   module UI
     autoload :ErrorHandler, Project.project_filepath('ui/error_handler')
+    autoload :PrintingSpinner, Project.project_filepath('ui/printing_spinner')
     autoload :StrictSpinner, Project.project_filepath('ui/strict_spinner')
   end
 

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

@@ -19,27 +19,23 @@ module Script
           return @ctx.puts(self.class.help)
         end
 
-        Layers::Application::CreateScript.call(
+        project = Layers::Application::CreateScript.call(
           ctx: @ctx,
           language: language,
           script_name: form.name,
           extension_point_type: form.extension_point
         )
-        project = ScriptProject.current
-        @ctx.puts(@ctx.message('script.create.script_path', folder: project.script_name))
-        @ctx.puts(@ctx.message('script.create.script_created', script_id: project.source_file))
+        @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
 
       def self.help
-        ShopifyCli::Context.message('script.create.help', ShopifyCli::TOOL_NAME)
-      end
-
-      def self.extended_help
         allowed_values = Script::Layers::Application::ExtensionPoints.types.map { |type| "{{cyan:#{type}}}" }
-        ShopifyCli::Context.message('script.create.extended_help', ShopifyCli::TOOL_NAME, allowed_values.join(', '))
+        ShopifyCli::Context.message('script.create.help', ShopifyCli::TOOL_NAME, allowed_values.join(', '))
       end
     end
   end

data/lib/project_types/script/commands/disable.rb

@@ -3,20 +3,13 @@
 module Script
   module Commands
     class Disable < ShopifyCli::Command
-      options do |parser, flags|
-        parser.on('--api_key=APIKEY') { |t| flags[:api_key] = t }
-        parser.on('--shop_domain=MYSHOPIFYDOMAIN') { |t| flags[:shop_domain] = t }
-      end
-
-      def call(args, _name)
-        form = Forms::Enable.ask(@ctx, args, options.flags)
-        return @ctx.puts(self.class.help) unless form
-
+      def call(_args, _name)
+        ShopifyCli::Tasks::EnsureEnv.call(@ctx, required: [:api_key, :secret, :shop])
         project = ScriptProject.current
         Layers::Application::DisableScript.call(
           ctx: @ctx,
-          api_key: form.api_key,
-          shop_domain: form.shop_domain,
+          api_key: project.env[:api_key],
+          shop_domain: project.env[:shop],
           extension_point_type: project.extension_point_type
         )
         @ctx.puts(@ctx.message('script.disable.script_disabled'))
@@ -27,10 +20,6 @@ module Script
       def self.help
         ShopifyCli::Context.message('script.disable.help', ShopifyCli::TOOL_NAME)
       end
-
-      def self.extended_help
-        ShopifyCli::Context.message('script.disable.extended_help', ShopifyCli::TOOL_NAME)
-      end
     end
   end
 end

data/lib/project_types/script/commands/enable.rb

@@ -4,32 +4,36 @@ module Script
   module Commands
     class Enable < ShopifyCli::Command
       options do |parser, flags|
-        parser.on('--api_key=APIKEY') { |t| flags[:api_key] = t }
-        parser.on('--shop_domain=MYSHOPIFYDOMAIN') { |t| flags[:shop_domain] = t }
+        parser.on('--config_props=KEYVALUEPAIRS', Array) do |t|
+          flags[:config_props] = Hash[t.map { |s| s.split(':') }]
+        end
+        parser.on('--config_file=CONFIGFILEPATH') { |t| flags[:config_file] = t }
       end
 
-      def call(args, _name)
-        form = Forms::Enable.ask(@ctx, args, options.flags)
-        return @ctx.puts(self.class.help) unless form
-
+      def call(_args, _name)
+        ShopifyCli::Tasks::EnsureEnv.call(@ctx, required: [:api_key, :secret, :shop])
         project = ScriptProject.current
+        api_key = project.env[:api_key]
+        shop_domain = project.env[:shop]
 
         Layers::Application::EnableScript.call(
           ctx: @ctx,
-          api_key: form.api_key,
-          shop_domain: form.shop_domain,
-          configuration: { entries: [] },
+          api_key: api_key,
+          shop_domain: shop_domain,
+          configuration: acquire_configuration(**slice(options.flags, :config_file, :config_props)),
           extension_point_type: project.extension_point_type,
           title: project.script_name
         )
         @ctx.puts(@ctx.message(
           'script.enable.script_enabled',
-          api_key: form.api_key,
-          shop_domain: form.shop_domain,
+          api_key: api_key,
+          shop_domain: shop_domain,
           type: project.extension_point_type.capitalize,
           title: project.script_name
         ))
         @ctx.puts(@ctx.message('script.enable.info'))
+      rescue Errors::InvalidConfigYAMLError => e
+        UI::ErrorHandler.pretty_print_and_raise(e)
       rescue StandardError => e
         UI::ErrorHandler.pretty_print_and_raise(e, failed_op: @ctx.message('script.enable.error.operation_failed'))
       end
@@ -38,8 +42,28 @@ module Script
         ShopifyCli::Context.message('script.enable.help', ShopifyCli::TOOL_NAME)
       end
 
-      def self.extended_help
-        ShopifyCli::Context.message('script.enable.extended_help', ShopifyCli::TOOL_NAME)
+      private
+
+      def acquire_configuration(config_file: nil, config_props: nil)
+        properties = {}
+        properties = YAML.load(File.read(config_file)) unless config_file.nil?
+        properties = properties.merge(config_props) unless config_props.nil?
+
+        configuration = { entries: [] }
+        properties.each do |key, value|
+          configuration[:entries].push({
+            key: key,
+            value: value,
+          })
+        end
+        configuration
+      rescue Errno::ENOENT, Psych::SyntaxError
+        raise Errors::InvalidConfigYAMLError, options.flags[:config_file]
+      end
+
+      # No slice pre Ruby 2.5 so roll our own
+      def slice(hash, *keys)
+        Hash[hash.to_a - hash.select { |key, _value| !keys.include?(key) }.to_a]
       end
     end
   end

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

@@ -4,26 +4,25 @@ module Script
   module Commands
     class Push < ShopifyCli::Command
       options do |parser, flags|
-        parser.on('--api_key=APIKEY') { |t| flags[:api_key] = t }
         parser.on('--force') { |t| flags[:force] = t }
       end
 
-      def call(args, _name)
-        form = Forms::Push.ask(@ctx, args, options.flags)
+      def call(_args, _name)
+        ShopifyCli::Tasks::EnsureEnv.call(@ctx, required: [:api_key, :secret, :shop])
         project = ScriptProject.current
-
-        return @ctx.puts(self.class.help) unless form && ScriptProject::SUPPORTED_LANGUAGES.include?(project.language)
-
+        api_key = project.env[:api_key]
+        return @ctx.puts(self.class.help) unless api_key &&
+          ScriptProject::SUPPORTED_LANGUAGES.include?(project.language)
         Layers::Application::PushScript.call(
           ctx: @ctx,
           language: project.language,
           extension_point_type: project.extension_point_type,
           script_name: project.script_name,
           source_file: project.source_file,
-          api_key: form.api_key,
-          force: form.force
+          api_key: api_key,
+          force: options.flags.key?(:force)
         )
-        @ctx.puts(@ctx.message('script.push.script_pushed', api_key: form.api_key))
+        @ctx.puts(@ctx.message('script.push.script_pushed', api_key: api_key))
       rescue StandardError => e
         UI::ErrorHandler.pretty_print_and_raise(e, failed_op: @ctx.message('script.push.error.operation_failed'))
       end
@@ -31,10 +30,6 @@ module Script
       def self.help
         ShopifyCli::Context.message('script.push.help', ShopifyCli::TOOL_NAME)
       end
-
-      def self.extended_help
-        ShopifyCli::Context.message('script.push.extended_help', ShopifyCli::TOOL_NAME)
-      end
     end
   end
 end

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

@@ -1,18 +1,24 @@
 discount:
   assemblyscript:
     package: "@shopify/extension-point-as-discount"
-    version: "^0.2.3"
+    version: "^0.2.10"
     sdk-version: "^6.0.0"
     toolchain-version: "^1.1.0"
 unit_limit_per_order:
   assemblyscript:
     package: "@shopify/extension-point-as-unit-limit-per-order"
-    version: "^0.1.4"
+    version: "^0.1.12"
     sdk-version: "^6.0.0"
     toolchain-version: "^1.1.0"
 payment_filter:
   assemblyscript:
     package: "@shopify/extension-point-as-payment-filter"
-    version: "^0.2.1"
+    version: "^0.2.8"
+    sdk-version: "^6.0.0"
+    toolchain-version: "^1.1.0"
+shipping_filter:
+  assemblyscript:
+    package: "@shopify/extension-point-as-shipping-filter"
+    version: "^0.2.10"
     sdk-version: "^6.0.0"
     toolchain-version: "^1.1.0"

data/lib/project_types/script/errors.rb

@@ -9,9 +9,17 @@ module Script
     class NoExistingStoresError < ScriptProjectError
       attr_reader :organization_id
       def initialize(organization_id)
+        super()
         @organization_id = organization_id
       end
     end
     class ScriptProjectAlreadyExistsError < ScriptProjectError; end
+    class InvalidConfigYAMLError < ScriptProjectError
+      attr_reader :config_file
+      def initialize(config_file)
+        super()
+        @config_file = config_file
+      end
+    end
   end
 end

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

@@ -2,7 +2,7 @@
 
 module Script
   module Forms
-    class Create < ScriptForm
+    class Create < ShopifyCli::Form
       flag_arguments :extension_point, :name
 
       def ask

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

@@ -12,8 +12,9 @@ module Script
             project = setup_project(ctx, script_name, extension_point)
             project_creator = Infrastructure::ProjectCreator
               .for(ctx, language, extension_point, script_name, project.directory)
-            install_dependencies(ctx, language, script_name, project, project_creator)
-            bootstrap(ctx, project_creator)
+            install_dependencies(ctx, language, script_name, project.source_file, project_creator)
+            bootstrap(ctx, project.source_path, project_creator)
+            project
           end
 
           private
@@ -30,16 +31,16 @@ module Script
             ScriptProject.current
           end
 
-          def install_dependencies(ctx, language, script_name, project, project_creator)
-            task_runner = Infrastructure::TaskRunner.for(ctx, language, script_name, project.source_file)
+          def install_dependencies(ctx, language, script_name, source_file, project_creator)
+            task_runner = Infrastructure::TaskRunner.for(ctx, language, script_name, source_file)
             project_creator.setup_dependencies
             ProjectDependencies.install(ctx: ctx, task_runner: task_runner)
           end
 
-          def bootstrap(ctx, project_creator)
+          def bootstrap(ctx, source_path, project_creator)
             UI::StrictSpinner.spin(ctx.message('script.create.creating')) do |spinner|
               project_creator.bootstrap
-              spinner.update_title(ctx.message('script.create.created'))
+              spinner.update_title(ctx.message('script.create.created', source_path))
             end
           end
         end

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

@@ -5,13 +5,15 @@ module Script
     module Application
       class DisableScript
         def self.call(ctx:, api_key:, shop_domain:, extension_point_type:)
-          script_service = Infrastructure::ScriptService.new(ctx: ctx)
-          script_service.disable(
-            api_key: api_key,
-            shop_domain: shop_domain,
-            extension_point_type: extension_point_type,
-          )
-          ctx.puts(ctx.message('script.application.disabled'))
+          UI::PrintingSpinner.spin(ctx, ctx.message('script.application.disabling')) do |p_ctx, spinner|
+            script_service = Infrastructure::ScriptService.new(ctx: p_ctx)
+            script_service.disable(
+              api_key: api_key,
+              shop_domain: shop_domain,
+              extension_point_type: extension_point_type,
+            )
+            spinner.update_title(p_ctx.message('script.application.disabled'))
+          end
         end
       end
     end

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

@@ -5,15 +5,17 @@ module Script
     module Application
       class EnableScript
         def self.call(ctx:, api_key:, shop_domain:, configuration:, extension_point_type:, title:)
-          script_service = Infrastructure::ScriptService.new(ctx: ctx)
-          script_service.enable(
-            api_key: api_key,
-            shop_domain: shop_domain,
-            configuration: configuration,
-            extension_point_type: extension_point_type,
-            title: title
-          )
-          ctx.puts(ctx.message('script.application.enabled'))
+          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,
+              shop_domain: shop_domain,
+              configuration: configuration,
+              extension_point_type: extension_point_type,
+              title: title
+            )
+            spinner.update_title(p_ctx.message('script.application.enabled'))
+          end
         end
       end
     end

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

@@ -20,10 +20,12 @@ module Script
           private
 
           def push_script(ctx, task_runner, script, api_key, force)
-            Infrastructure::PushPackageRepository.new(ctx: ctx)
-              .get_push_package(script, task_runner.compiled_type)
-              .push(Infrastructure::ScriptService.new(ctx: ctx), api_key, force)
-            ctx.puts(ctx.message('script.application.pushed'))
+            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'))
+            end
           end
         end
       end

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

@@ -8,12 +8,14 @@ module Script
         class InvalidExtensionPointError < ScriptProjectError
           attr_reader :type
           def initialize(type)
+            super()
             @type = type
           end
         end
         class ScriptNotFoundError < ScriptProjectError
           attr_reader :script_name, :extension_point_type
           def initialize(extension_point_type, script_name)
+            super()
             @script_name = script_name
             @extension_point_type = extension_point_type
           end

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

@@ -86,14 +86,14 @@ module Script
                 "@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.0.1",
+                "as-wasi": "^0.2.0",
                 "assemblyscript": "^0.12.0"
               },
               "scripts": {
                 "test": "asp --config test/as-pect.config.js --summary --verbose"
               },
               "engines": {
-                "node": ">=12.16"
+                "node": ">=14.5"
               }
             }
           HERE

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

@@ -6,7 +6,7 @@ module Script
       class AssemblyScriptTaskRunner
         BYTECODE_FILE = "%{name}.wasm"
         SCRIPT_SDK_BUILD = "npx --no-install shopify-scripts-build --src=../%{source} --binary=#{BYTECODE_FILE} "\
-                           "-- --lib=../node_modules --validate --optimize"
+                           "-- --lib=../node_modules --optimize --use Date="
 
         attr_reader :ctx, :script_name, :script_source_file
 

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

@@ -5,6 +5,7 @@ module Script
     module Infrastructure
       module Errors
         class AppNotInstalledError < ScriptProjectError; end
+        class AppScriptNotPushedError < ScriptProjectError; end
         class AppScriptUndefinedError < ScriptProjectError; end
         class BuildError < ScriptProjectError; end
         class DependencyInstallError < ScriptProjectError; end
@@ -20,6 +21,7 @@ module Script
         class ScriptRepushError < ScriptProjectError
           attr_reader :api_key
           def initialize(api_key)
+            super()
             @api_key = api_key
           end
         end

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

@@ -49,7 +49,7 @@ module Script
           resp_hash = script_service_request(
             query_name: query_name,
             api_key: api_key,
-            shop_domain: shop_domain,
+            shop_domain: format_shop_domain(shop_domain),
             variables: variables,
           )
           user_errors = resp_hash["data"]["shopScriptUpdateOrCreate"]["userErrors"]
@@ -60,6 +60,8 @@ module Script
             raise Errors::AppScriptUndefinedError, api_key
           elsif user_errors.any? { |e| e['tag'] == 'shop_script_conflict' }
             raise Errors::ShopScriptConflictError
+          elsif user_errors.any? { |e| e['tag'] == 'app_script_not_pushed' }
+            raise Errors::AppScriptNotPushedError
           else
             raise Errors::ScriptServiceUserError.new(query_name, user_errors.to_s)
           end
@@ -74,7 +76,7 @@ module Script
           resp_hash = script_service_request(
             query_name: query_name,
             api_key: api_key,
-            shop_domain: shop_domain,
+            shop_domain: format_shop_domain(shop_domain),
             variables: variables,
           )
           user_errors = resp_hash["data"]["shopScriptDelete"]["userErrors"]
@@ -89,6 +91,10 @@ module Script
 
         private
 
+        def format_shop_domain(shop_domain)
+          shop_domain.delete_suffix("/")
+        end
+
         class ScriptServiceAPI < ShopifyCli::API
           property(:api_key, accepts: String)
           property(:shop_id, accepts: Integer)