shopify-cli 1.9.0 → 1.13.0

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

@@ -8,7 +8,7 @@ module Script
       end
 
       def call(_args, _name)
-        ShopifyCli::Tasks::EnsureEnv.call(@ctx, required: [:api_key, :secret, :shop])
+        Tasks::EnsureEnv.call(@ctx)
 
         api_key = Layers::Infrastructure::ScriptProjectRepository.new(ctx: @ctx).get.api_key
         return @ctx.puts(self.class.help) unless api_key

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

@@ -11,6 +11,7 @@ unit_limit_per_order:
     sdk-version: "^9.0.0"
     toolchain-version: "^5.0.0"
 payment_filter:
+  deprecated: true
   assemblyscript:
     package: "@shopify/extension-point-as-payment-filter"
     sdk-version: "^9.0.0"
@@ -19,6 +20,7 @@ payment_filter:
     beta: true
     package: "https://github.com/Shopify/scripts-apis-rs"
 shipping_filter:
+  deprecated: true
   assemblyscript:
     package: "@shopify/extension-point-as-shipping-filter"
     sdk-version: "^9.0.0"
@@ -34,11 +36,8 @@ payment_methods:
   assemblyscript:
     package: "@shopify/scripts-checkout-apis"
     toolchain-version: "^5.0.0"
-    sdk-version: "^9.0.0"
 shipping_methods:
   domain: 'checkout'
   assemblyscript:
     package: "@shopify/scripts-checkout-apis"
-    sdk-version: "^9.0.0"
     toolchain-version: "^5.0.0"
-

data/lib/project_types/script/graphql/app_script_update_or_create.graphql

@@ -7,7 +7,8 @@ mutation AppScriptUpdateOrCreate(
   $force: Boolean,
   $schemaMajorVersion: String,
   $schemaMinorVersion: String,
-  $useMsgpack: Boolean
+  $useMsgpack: Boolean,
+  $uuid: String
 ) {
   appScriptUpdateOrCreate(
     extensionPointName: $extensionPointName
@@ -18,7 +19,8 @@ mutation AppScriptUpdateOrCreate(
     force: $force
     schemaMajorVersion: $schemaMajorVersion
     schemaMinorVersion: $schemaMinorVersion
-    useMsgpack: $useMsgpack
+    useMsgpack: $useMsgpack,
+    uuid: $uuid
 ) {
     userErrors {
       field
@@ -26,6 +28,7 @@ mutation AppScriptUpdateOrCreate(
       tag
     }
     appScript {
+      uuid
       appKey
       configSchema
       extensionPointName

data/lib/project_types/script/graphql/get_app_scripts.graphql

@@ -0,0 +1,6 @@
+query GetAppScripts($appKey: String!, $extensionPointName: ExtensionPointName!) {
+  appScripts(appKeys: [$appKey], extensionPointName: $extensionPointName) {
+    uuid
+    title
+  }
+}

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

@@ -18,7 +18,7 @@ module Script
                 language: language,
                 no_config_ui: no_config_ui
               )
-              project_creator = Infrastructure::ProjectCreator
+              project_creator = Infrastructure::Languages::ProjectCreator
                 .for(ctx, language, extension_point, script_name, project.id)
               install_dependencies(ctx, language, script_name, project_creator)
               bootstrap(ctx, project_creator)
@@ -29,7 +29,7 @@ module Script
           private
 
           def install_dependencies(ctx, language, script_name, project_creator)
-            task_runner = Infrastructure::TaskRunner.for(ctx, language, script_name)
+            task_runner = Infrastructure::Languages::TaskRunner.for(ctx, language, script_name)
             project_creator.setup_dependencies
             ProjectDependencies.install(ctx: ctx, task_runner: task_runner)
           end

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

@@ -6,8 +6,10 @@ module Script
       class PushScript
         class << self
           def call(ctx:, force:)
-            script_project = Infrastructure::ScriptProjectRepository.new(ctx: ctx).get
-            task_runner = Infrastructure::TaskRunner.for(ctx, script_project.language, script_project.script_name)
+            script_project_repo = Infrastructure::ScriptProjectRepository.new(ctx: ctx)
+            script_project = script_project_repo.get
+            task_runner = Infrastructure::Languages::TaskRunner
+              .for(ctx, script_project.language, script_project.script_name)
 
             ProjectDependencies.install(ctx: ctx, task_runner: task_runner)
             BuildScript.call(ctx: ctx, task_runner: task_runner, script_project: script_project)
@@ -18,7 +20,8 @@ module Script
                 compiled_type: task_runner.compiled_type,
                 metadata: task_runner.metadata,
               )
-              package.push(Infrastructure::ScriptService.new(ctx: p_ctx), script_project.api_key, force)
+              uuid = package.push(Infrastructure::ScriptService.new(ctx: p_ctx), script_project.api_key, force)
+              script_project_repo.update_env(uuid: uuid)
               spinner.update_title(p_ctx.message("script.application.pushed"))
             end
           end

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

@@ -39,8 +39,6 @@ module Script
           end
         end
 
-        class ServiceFailureError < ScriptProjectError; end
-
         class MetadataNotFoundError < ScriptProjectError; end
 
         class MetadataValidationError < ScriptProjectError; end

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

@@ -5,6 +5,7 @@ module Script
     module Domain
       class PushPackage
         attr_reader :id,
+          :uuid,
           :extension_point_type,
           :script_name,
           :config_ui,
@@ -14,6 +15,7 @@ module Script
 
         def initialize(
           id:,
+          uuid:,
           extension_point_type:,
           script_name:,
           script_content:,
@@ -22,6 +24,7 @@ module Script
           config_ui:
         )
           @id = id
+          @uuid = uuid
           @extension_point_type = extension_point_type
           @script_name = script_name
           @script_content = script_content
@@ -32,6 +35,7 @@ module Script
 
         def push(script_service, api_key, force)
           script_service.push(
+            uuid: @uuid,
             extension_point_type: @extension_point_type,
             script_name: @script_name,
             script_content: @script_content,

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

@@ -6,6 +6,8 @@ module Script
       class ScriptProject
         include SmartProperties
 
+        UUID_ENV_KEY = "UUID"
+
         property! :id, accepts: String
         property :env, accepts: ShopifyCli::Resources::EnvFile
 
@@ -26,7 +28,25 @@ module Script
         end
 
         def api_key
-          env[:api_key]
+          env&.api_key
+        end
+
+        def api_secret
+          env&.secret
+        end
+
+        def uuid
+          uuid_defined? && !raw_uuid.empty? ? raw_uuid : nil
+        end
+
+        def uuid_defined?
+          !raw_uuid.nil?
+        end
+
+        private
+
+        def raw_uuid
+          env&.extra&.[](UUID_ENV_KEY)
         end
       end
     end

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

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module Script
+  module Layers
+    module Infrastructure
+      class CommandRunner
+        include SmartProperties
+
+        property! :ctx, accepts: ShopifyCli::Context
+
+        def call(cmd)
+          out, status = ctx.capture2e(cmd)
+          raise Errors::SystemCallFailureError.new(out: out.chomp, cmd: cmd) unless status.success?
+          out
+        end
+      end
+    end
+  end
+end

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

@@ -17,6 +17,15 @@ module Script
           end
         end
 
+        class ConfigUiInvalidInputModeError < ScriptProjectError
+          attr_reader :filename, :valid_input_modes
+          def initialize(filename, valid_input_modes)
+            super()
+            @filename = filename
+            @valid_input_modes = valid_input_modes
+          end
+        end
+
         class ConfigUiFieldsMissingKeysError < ScriptProjectError
           attr_reader :filename, :missing_keys
           def initialize(filename, missing_keys)
@@ -26,6 +35,15 @@ module Script
           end
         end
 
+        class ConfigUiFieldsInvalidTypeError < ScriptProjectError
+          attr_reader :filename, :valid_types
+          def initialize(filename, valid_types)
+            super()
+            @filename = filename
+            @valid_types = valid_types
+          end
+        end
+
         class DependencyInstallError < ScriptProjectError; end
         class DeprecatedEPError < ScriptProjectError; end
         class EmptyResponseError < ScriptProjectError; end
@@ -51,11 +69,20 @@ module Script
 
         class ProjectCreatorNotFoundError < ScriptProjectError; end
 
+        class SystemCallFailureError < ScriptProjectError
+          attr_reader :out, :cmd
+          def initialize(out:, cmd:)
+            super(out)
+            @out = out
+            @cmd = cmd
+          end
+        end
+
         class ScriptRepushError < ScriptProjectError
-          attr_reader :api_key
-          def initialize(api_key)
+          attr_reader :uuid
+          def initialize(uuid)
             super()
-            @api_key = api_key
+            @uuid = uuid
           end
         end
 

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

@@ -0,0 +1,97 @@
+# frozen_string_literal: true
+
+module Script
+  module Layers
+    module Infrastructure
+      module Languages
+        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 = "npx --no-install shopify-scripts-toolchain-as bootstrap --from %{extension_point} --dest %{base}"
+          BUILD = "shopify-scripts-toolchain-as build --src src/shopify_main.ts " \
+          "--binary build/script.wasm --metadata build/metadata.json"
+          MIN_NODE_VERSION = "14.5.0"
+          ASC_ARGS = "-- --lib node_modules --optimize --use Date="
+
+          def setup_dependencies
+            write_npmrc
+            write_package_json
+          end
+
+          def bootstrap
+            command_runner.call(bootstap_command)
+          end
+
+          private
+
+          def command_runner
+            @command_runner ||= CommandRunner.new(ctx: ctx)
+          end
+
+          def write_npmrc
+            command_runner.call("npm --userconfig ./.npmrc config set @shopify:registry https://registry.npmjs.com")
+            command_runner.call("npm --userconfig ./.npmrc config set engine-strict true")
+          end
+
+          def extension_point_version
+            return extension_point.sdks.assemblyscript.version if extension_point.sdks.assemblyscript.versioned?
+
+            out = command_runner.call("npm show #{extension_point.sdks.assemblyscript.package} version --json")
+            "^#{JSON.parse(out)}"
+          end
+
+          def write_package_json
+            package_json = <<~HERE
+              {
+                "name": "#{script_name}",
+                "version": "1.0.0",
+                "devDependencies": {
+                  "@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 --summary --verbose",
+                  "build": "#{build_command}"
+                },
+                "engines": {
+                  "node": ">=#{MIN_NODE_VERSION}"
+                }
+              }
+            HERE
+            ctx.write("package.json", package_json)
+          end
+
+          def bootstap_command
+            type = extension_point.dasherize_type
+            base_command = format(BOOTSTRAP, extension_point: type, base: path_to_project)
+            domain = extension_point.domain
+
+            if domain.nil?
+              base_command
+            else
+              "#{base_command} --domain #{domain}"
+            end
+          end
+
+          def build_command
+            type = extension_point.dasherize_type
+            domain = extension_point.domain
+
+            if domain.nil?
+              "#{BUILD} #{ASC_ARGS}"
+            else
+              "#{BUILD} --domain #{domain} --ep #{type} #{ASC_ARGS}"
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,103 @@
+# frozen_string_literal: true
+
+module Script
+  module Layers
+    module Infrastructure
+      module Languages
+        class AssemblyScriptTaskRunner
+          BYTECODE_FILE = "build/%{name}.wasm"
+          METADATA_FILE = "build/metadata.json"
+          SCRIPT_SDK_BUILD = "npm run build"
+
+          attr_reader :ctx, :script_name
+
+          def initialize(ctx, script_name)
+            @ctx = ctx
+            @script_name = script_name
+          end
+
+          def build
+            compile
+            bytecode
+          end
+
+          def compiled_type
+            "wasm"
+          end
+
+          def install_dependencies
+            check_node_version!
+
+            output, status = ctx.capture2e("npm install --no-audit --no-optional --legacy-peer-deps --loglevel error")
+            raise Errors::DependencyInstallError, output unless status.success?
+          end
+
+          def dependencies_installed?
+            # Assuming if node_modules folder exist at root of script folder, all deps are installed
+            ctx.dir_exist?("node_modules")
+          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 check_node_version!
+            output, status = @ctx.capture2e("node", "--version")
+            raise Errors::DependencyInstallError, output unless status.success?
+
+            require "semantic/semantic"
+            version = ::Semantic::Version.new(output[1..-1])
+            unless version >= ::Semantic::Version.new(AssemblyScriptProjectCreator::MIN_NODE_VERSION)
+              raise Errors::DependencyInstallError,
+                "Node version must be >= v#{AssemblyScriptProjectCreator::MIN_NODE_VERSION}. "\
+                "Current version: #{output.strip}."
+            end
+          end
+
+          def compile
+            check_compilation_dependencies!
+            CommandRunner.new(ctx: ctx).call(SCRIPT_SDK_BUILD)
+          end
+
+          def check_compilation_dependencies!
+            pkg = JSON.parse(File.read("package.json"))
+            build_script = pkg.dig("scripts", "build")
+
+            raise Errors::BuildScriptNotFoundError,
+              "Build script not found" if build_script.nil?
+
+            unless build_script.start_with?("shopify-scripts")
+              raise Errors::InvalidBuildScriptError, "Invalid build script"
+            end
+          end
+
+          def bytecode
+            legacy_filename = format(BYTECODE_FILE, name: script_name)
+            filename = format(BYTECODE_FILE, name: "script")
+
+            bytecode_file = if ctx.file_exist?(filename)
+              filename
+            elsif ctx.file_exist?(legacy_filename)
+              legacy_filename
+            else
+              raise Errors::WebAssemblyBinaryNotFoundError
+            end
+
+            contents = ctx.binread(bytecode_file)
+            ctx.rm(bytecode_file)
+
+            contents
+          end
+        end
+      end
+    end
+  end
+end