shopify-cli 0.9.2 → 1.0.3

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

@@ -3,27 +3,27 @@
 module Script
   module Commands
     class Push < ShopifyCli::Command
+      prerequisite_task :ensure_env
+
       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)
         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

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

@@ -1,18 +1,24 @@
 discount:
   assemblyscript:
     package: "@shopify/extension-point-as-discount"
-    version: "^0.2.2"
+    version: "^0.2.4"
     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.2"
+    version: "^0.1.6"
     sdk-version: "^6.0.0"
     toolchain-version: "^1.1.0"
 payment_filter:
   assemblyscript:
     package: "@shopify/extension-point-as-payment-filter"
-    version: "^0.1.2"
+    version: "^0.2.2"
+    sdk-version: "^6.0.0"
+    toolchain-version: "^1.1.0"
+shipping_filter:
+  assemblyscript:
+    package: "@shopify/extension-point-as-shipping-filter"
+    version: "^0.2.4"
     sdk-version: "^6.0.0"
     toolchain-version: "^1.1.0"

data/lib/project_types/script/errors.rb

@@ -3,6 +3,7 @@
 module Script
   module Errors
     class InvalidContextError < ScriptProjectError; end
+    class InvalidScriptNameError < ScriptProjectError; end
     class NoExistingAppsError < ScriptProjectError; end
     class NoExistingOrganizationsError < ScriptProjectError; end
     class NoExistingStoresError < ScriptProjectError

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

@@ -6,7 +6,7 @@ module Script
       flag_arguments :extension_point, :name
 
       def ask
-        self.name = (name || ask_name).downcase.gsub(' ', '_')
+        self.name = valid_name
         self.extension_point ||= ask_extension_point
       end
 
@@ -20,9 +20,13 @@ module Script
       end
 
       def ask_name
-        name = CLI::UI::Prompt.ask(@ctx.message('script.forms.create.script_name'))
-        return name if name.match?(/^[0-9A-Za-z _-]*$/)
-        @ctx.abort(@ctx.message('script.forms.create.error.invalid_name'))
+        CLI::UI::Prompt.ask(@ctx.message('script.forms.create.script_name'))
+      end
+
+      def valid_name
+        n = (name || ask_name).downcase.gsub(' ', '_')
+        return n if n.match?(/^[0-9A-Za-z_-]*$/)
+        raise Errors::InvalidScriptNameError
       end
     end
   end

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

@@ -11,8 +11,11 @@ module Script
 
       def organizations
         return @organizations if defined?(@organizations)
-        ctx.puts(ctx.message('script.forms.script_form.fetching_organizations'))
-        @organizations = ShopifyCli::PartnersAPI::Organizations.fetch_with_app(ctx)
+        UI::PrintingSpinner.spin(ctx, ctx.message('script.forms.script_form.fetching_organizations')) do |ctx, spinner|
+          @organizations = ShopifyCli::PartnersAPI::Organizations.fetch_with_app(ctx)
+          spinner.update_title(ctx.message('script.forms.script_form.fetched_organizations'))
+        end
+        @organizations
       end
 
       def ask_app_api_key(apps, message: ctx.message('script.forms.script_form.ask_app_api_key_default'))

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

@@ -9,14 +9,17 @@ module Script
         class << self
           def call(ctx:, language:, script_name:, extension_point_type:)
             extension_point = ExtensionPoints.get(type: extension_point_type)
-            project = create_project(ctx, script_name, extension_point)
-            install_dependencies(ctx, language, script_name, extension_point, project)
-            create_definition(ctx, language, extension_point, script_name)
+            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.source_file, project_creator)
+            bootstrap(ctx, project.source_path, project_creator)
+            project
           end
 
           private
 
-          def create_project(ctx, script_name, extension_point)
+          def setup_project(ctx, script_name, extension_point)
             ScriptProject.create(ctx, script_name)
             ScriptProject.write(
               ctx,
@@ -28,26 +31,17 @@ module Script
             ScriptProject.current
           end
 
-          def install_dependencies(ctx, language, script_name, extension_point, project)
-            task_runner = Infrastructure::TaskRunner.for(ctx, language, script_name, project.source_file)
-            ProjectDependencies
-              .bootstrap(ctx: ctx, language: language, extension_point: extension_point, script_name: script_name)
-            ProjectDependencies
-              .install(ctx: ctx, task_runner: task_runner)
+          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 create_definition(ctx, language, extension_point, script_name)
-            script = nil
+          def bootstrap(ctx, source_path, project_creator)
             UI::StrictSpinner.spin(ctx.message('script.create.creating')) do |spinner|
-              script = Infrastructure::ScriptRepository.new(ctx: ctx).create_script(
-                language,
-                extension_point,
-                script_name
-              )
-              Infrastructure::TestSuiteRepository.new(ctx: ctx).create_test_suite(script)
-              spinner.update_title(ctx.message('script.create.created'))
+              project_creator.bootstrap
+              spinner.update_title(ctx.message('script.create.created', source_path))
             end
-            script
           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/project_dependencies.rb

@@ -2,11 +2,6 @@ module Script
   module Layers
     module Application
       class ProjectDependencies
-        def self.bootstrap(ctx:, language:, extension_point:, script_name:)
-          dep_manager = Infrastructure::DependencyManager.for(ctx, language, extension_point, script_name)
-          dep_manager.bootstrap
-        end
-
         def self.install(ctx:, task_runner:)
           CLI::UI::Frame.open(ctx.message('script.project_deps.checking_with_npm')) do
             begin

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/infrastructure/assemblyscript_project_creator.rb

@@ -0,0 +1,106 @@
+# frozen_string_literal: true
+
+module Script
+  module Layers
+    module Infrastructure
+      class AssemblyScriptProjectCreator
+        include SmartProperties
+        property! :ctx, accepts: ShopifyCli::Context
+        property! :extension_point, accepts: Domain::ExtensionPoint
+        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"
+
+        def setup_dependencies
+          write_npmrc
+          write_package_json
+        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))
+          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
+
+        def write_npmrc
+          ctx.system(
+            'npm', '--userconfig', './.npmrc', 'config', 'set', '@shopify:registry', 'https://registry.npmjs.com'
+          )
+          ctx.system(
+            '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
+        end
+
+        def write_package_json
+          package_json = <<~HERE
+            {
+              "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.0",
+                "assemblyscript": "^0.12.0"
+              },
+              "scripts": {
+                "test": "asp --config test/as-pect.config.js --summary --verbose"
+              },
+              "engines": {
+                "node": ">=14.5"
+              }
+            }
+          HERE
+
+          ctx.write("package.json", package_json)
+        end
+      end
+    end
+  end
+end

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
 
@@ -34,7 +34,7 @@ module Script
 
         def dependencies_installed?
           # Assuming if node_modules folder exist at root of script folder, all deps are installed
-          ctx.exist?("node_modules")
+          ctx.dir_exist?("node_modules")
         end
 
         private

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

@@ -5,9 +5,9 @@ module Script
     module Infrastructure
       module Errors
         class AppNotInstalledError < ScriptProjectError; end
+        class AppScriptNotPushedError < ScriptProjectError; end
         class AppScriptUndefinedError < ScriptProjectError; end
         class BuildError < ScriptProjectError; end
-        class DependencyError < ScriptProjectError; end
         class DependencyInstallError < ScriptProjectError; end
         class ForbiddenError < ScriptProjectError; end
         class GraphqlError < ScriptProjectError
@@ -17,6 +17,7 @@ module Script
             super("GraphQL failed with errors: #{errors}")
           end
         end
+        class ProjectCreatorNotFoundError < ScriptProjectError; end
         class ScriptRepushError < ScriptProjectError
           attr_reader :api_key
           def initialize(api_key)

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

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+module Script
+  module Layers
+    module Infrastructure
+      class ProjectCreator
+        PROJECT_CREATORS = {
+          "ts" => Infrastructure::AssemblyScriptProjectCreator,
+        }
+
+        def self.for(ctx, language, extension_point, script_name, path_to_project)
+          raise Errors::ProjectCreatorNotFoundError unless PROJECT_CREATORS[language]
+          PROJECT_CREATORS[language].new(
+            ctx: ctx,
+            extension_point: extension_point,
+            script_name: script_name,
+            path_to_project: path_to_project
+          )
+        end
+      end
+    end
+  end
+end

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

@@ -22,7 +22,7 @@ module Script
         def get_push_package(script, compiled_type)
           build_file_path = file_path(script.name, compiled_type)
 
-          raise Domain::PushPackageNotFoundError unless File.exist?(build_file_path)
+          raise Domain::PushPackageNotFoundError unless ctx.file_exist?(build_file_path)
 
           script_content = File.read(build_file_path)
 

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

@@ -7,26 +7,9 @@ module Script
         include SmartProperties
         property! :ctx, accepts: ShopifyCli::Context
 
-        BOOTSTRAP_SRC = "npx --no-install shopify-scripts-bootstrap src %{src_base}"
-
-        def create_script(language, extension_point, script_name)
-          ctx.mkdir_p(src_base)
-          out, status = CLI::Kit::System.capture2e(format(BOOTSTRAP_SRC, src_base: src_base))
-          raise Domain::Errors::ServiceFailureError, out unless status.success?
-
-          write_tsconfig if language == "ts"
-
-          Domain::Script.new(
-            script_id(language),
-            script_name,
-            extension_point.type,
-            language
-          )
-        end
-
         def get_script(language, extension_point_type, script_name)
           source_file_path = src_code_file(language)
-          unless File.exist?(source_file_path)
+          unless ctx.file_exist?(source_file_path)
             raise Domain::Errors::ScriptNotFoundError.new(extension_point_type, source_file_path)
           end
 
@@ -51,18 +34,6 @@ module Script
 
         private
 
-        def write_sdk(extension_point_type, language, sdk_types)
-          return unless language == "ts"
-          File.write(sdk_types_file(extension_point_type, language), sdk_types)
-        end
-
-        def write_tsconfig
-          AssemblyScriptTsConfig
-            .new(dir_to_write_in: relative_path_to_src)
-            .with_extends_assemblyscript_config(relative_path_to_node_modules: ".")
-            .write
-        end
-
         def project_base
           ScriptProject.current.directory
         end
@@ -82,10 +53,6 @@ module Script
         def file_name(language)
           "script.#{language}"
         end
-
-        def sdk_types_file(extension_point_type, language)
-          "#{src_base}/#{extension_point_type}.#{language}"
-        end
       end
     end
   end