shopify-cli 0.9.1 → 1.0.2

data/lib/project_types/extension/commands/tunnel.rb

@@ -37,7 +37,7 @@ module Extension
       private
 
       def status
-        tunnel_url = Features::TunnelUrl.fetch
+        tunnel_url = ShopifyCli::Tunnel.urls.first
 
         if tunnel_url.nil?
           @ctx.puts(@ctx.message('tunnel.no_tunnel_running'))

data/lib/project_types/extension/forms/register.rb

@@ -16,13 +16,12 @@ module Extension
       attr_writer :app
 
       def ask_app
-        apps = load_apps
-
         if !api_key.nil?
-          found_app = apps.find { |app| app.api_key == api_key }
+          found_app = Tasks::GetApp.call(context: ctx, api_key: api_key)
           ctx.abort(ctx.message('register.invalid_api_key', api_key)) if found_app.nil?
           found_app
         else
+          apps = load_apps
           CLI::UI::Prompt.ask(ctx.message('register.ask_app')) do |handler|
             apps.each do |app|
               handler.option("#{app.title} by #{app.business_name}") { app }

data/lib/project_types/extension/graphql/get_app_by_api_key.graphql

@@ -0,0 +1,9 @@
+query getApp($api_key: String!) {
+  app(apiKey: $api_key) {
+    title
+    apiKey
+    apiSecretKeys{
+      secret
+    }
+  }
+}

data/lib/project_types/extension/tasks/converters/app_converter.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+require 'shopify_cli'
+
+module Extension
+  module Tasks
+    module Converters
+      module AppConverter
+        API_KEY_FIELD = 'apiKey'
+        API_SECRET_KEYS_FIELD = 'apiSecretKeys'
+        API_SECRET_FIELD = 'secret'
+        TITLE_FIELD = 'title'
+        ORGANIZATION_NAME_FIELD = 'businessName'
+
+        def self.from_hash(hash, organization = {})
+          return nil if hash.nil?
+
+          Models::App.new(
+            api_key: hash[API_KEY_FIELD],
+            secret: hash[API_SECRET_KEYS_FIELD].first[API_SECRET_FIELD],
+            title: hash[TITLE_FIELD],
+            business_name: organization[ORGANIZATION_NAME_FIELD]
+          )
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+require 'shopify_cli'
+
+module Extension
+  module Tasks
+    class GetApp < ShopifyCli::Task
+      GRAPHQL_FILE = 'get_app_by_api_key'
+
+      RESPONSE_FIELD = %w(data)
+      APP_FIELD = 'app'
+
+      def call(context:, api_key:)
+        input = { api_key: api_key }
+
+        response = ShopifyCli::PartnersAPI.query(context, GRAPHQL_FILE, input).dig(*RESPONSE_FIELD)
+        context.abort(context.message('tasks.errors.parse_error')) if response.nil?
+
+        Converters::AppConverter.from_hash(response.dig(APP_FIELD))
+      end
+    end
+  end
+end

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

@@ -21,12 +21,7 @@ module Extension
         return [] unless organization.key?('apps') && organization['apps'].any?
 
         organization['apps'].map do |app|
-          Models::App.new(
-            api_key: app['apiKey'],
-            secret: app["apiSecretKeys"].first["secret"],
-            title: app['title'],
-            business_name: organization['businessName']
-          )
+          Converters::AppConverter.from_hash(app, organization)
         end
       end
     end

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

@@ -10,8 +10,9 @@ module Node
         self.title ||= CLI::UI::Prompt.ask(ctx.message('node.forms.create.app_name'))
         self.type = ask_type
         self.name = self.title.downcase.split(" ").join("_")
-        self.organization_id ||= organization["id"].to_i
-        self.shop_domain ||= ask_shop_domain
+        res = ShopifyCli::Tasks::SelectOrgAndShop.call(ctx, organization_id: organization_id, shop_domain: shop_domain)
+        self.organization_id = res[:organization_id]
+        self.shop_domain = res[:shop_domain]
       end
 
       private
@@ -30,58 +31,6 @@ module Node
         ctx.puts(ctx.message('node.forms.create.app_type.selected', type))
         type
       end
-
-      def organizations
-        @organizations ||= ShopifyCli::PartnersAPI::Organizations.fetch_all(ctx)
-      end
-
-      def organization
-        @organization ||= if !organization_id.nil?
-          org = ShopifyCli::PartnersAPI::Organizations.fetch(ctx, id: organization_id)
-          if org.nil?
-            ctx.puts(ctx.message('node.forms.create.authentication_issue', ShopifyCli::TOOL_NAME))
-            ctx.abort(ctx.message('node.forms.create.error.organization_not_found'))
-          end
-          org
-        elsif organizations.count == 0
-          ctx.puts(ctx.message('node.forms.create.partners_notice'))
-          ctx.puts(ctx.message('node.forms.create.authentication_issue', ShopifyCli::TOOL_NAME))
-          ctx.abort(ctx.message('node.forms.create.error.no_organizations'))
-        elsif organizations.count == 1
-          org = organizations.first
-          ctx.puts(ctx.message('node.forms.create.organization',
-            ctx.message('core.partners_api.org_name_and_id', org['businessName'], org['id'])))
-          org
-        else
-          org_id = CLI::UI::Prompt.ask(ctx.message('node.forms.create.organization_select')) do |handler|
-            organizations.each do |o|
-              handler.option(ctx.message('core.partners_api.org_name_and_id', o['businessName'], o['id'])) { o['id'] }
-            end
-          end
-          organizations.find { |o| o['id'] == org_id }
-        end
-      end
-
-      def ask_shop_domain
-        valid_stores = organization['stores'].select do |store|
-          store['transferDisabled'] == true || store['convertableToPartnerTest'] == true
-        end
-
-        if valid_stores.count == 0
-          ctx.puts(ctx.message('node.forms.create.no_development_stores'))
-          ctx.puts(ctx.message('node.forms.create.create_store', organization['id']))
-          ctx.puts(ctx.message('node.forms.create.authentication_issue', ShopifyCli::TOOL_NAME))
-        elsif valid_stores.count == 1
-          domain = valid_stores.first['shopDomain']
-          ctx.puts(ctx.message('node.forms.create.development_store', domain))
-          domain
-        else
-          CLI::UI::Prompt.ask(
-            ctx.message('node.forms.create.development_store_select'),
-            options: valid_stores.map { |s| s['shopDomain'] }
-          )
-        end
-      end
     end
   end
 end

data/lib/project_types/node/messages/messages.rb

@@ -28,8 +28,8 @@ module Node
           },
           info: {
             created: "{{v}} {{green:%s}} was created in your Partner Dashboard {{underline:%s}}",
-            serve: "{{*}} Change into your new project folder {{green:%s}} and run {{command:%s serve}} to start a " \
-              "local server",
+            serve: "{{*}} Change directories to your new project folder {{green:%s}} and run {{command:%s serve}} " \
+              "to start a local server",
             install: "{{*}} Then, visit {{underline:%s/test}} to install {{green:%s}} on your Dev Store",
           },
           node_version: "node %s",
@@ -233,25 +233,14 @@ module Node
           create: {
             error: {
               invalid_app_type: "Invalid app type %s",
-              organization_not_found: "Cannot find a partner organization with that ID",
-              no_organizations: "No partner organizations available.",
             },
-
-            authentication_issue: "For authentication issues, run {{command:%s logout}} to clear invalid credentials",
-            partners_notice: "Please visit https://partners.shopify.com/ to create a partners account",
-            no_development_stores: "{{x}} No Development Stores available.",
-            create_store: "Visit {{underline:https://partners.shopify.com/%s/stores}} to create one",
-            app_name: "App Name",
+            app_name: "App name",
             app_type: {
               select: "What type of app are you building?",
               select_public: "Public: An app built for a wide merchant audience.",
               select_custom: "Custom: An app custom built for a single client.",
               selected: "App type {{green:%s}}",
             },
-            organization_select: "Select partner organization",
-            organization: "Partner organization {{green:%s}}",
-            development_store_select: "Select a development store",
-            development_store: "Using development store {{green:%s}}",
           },
         },
       },

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

@@ -22,8 +22,9 @@ module Rails
         self.title ||= CLI::UI::Prompt.ask(ctx.message('rails.forms.create.app_name'))
         self.type = ask_type
         self.name = self.title.downcase.split(" ").join("_")
-        self.organization_id ||= organization["id"].to_i
-        self.shop_domain ||= ask_shop_domain
+        res = ShopifyCli::Tasks::SelectOrgAndShop.call(ctx, organization_id: organization_id, shop_domain: shop_domain)
+        self.organization_id = res[:organization_id]
+        self.shop_domain = res[:shop_domain]
         self.db = ask_db
       end
 
@@ -44,56 +45,6 @@ module Rails
         type
       end
 
-      def organizations
-        @organizations ||= ShopifyCli::PartnersAPI::Organizations.fetch_all(ctx)
-      end
-
-      def organization
-        @organization ||= if !organization_id.nil?
-          org = ShopifyCli::PartnersAPI::Organizations.fetch(ctx, id: organization_id)
-          if org.nil?
-            ctx.puts(ctx.message('rails.forms.create.authentication_issue', ShopifyCli::TOOL_NAME))
-            ctx.abort(ctx.message('rails.forms.create.error.organization_not_found'))
-          end
-          org
-        elsif organizations.count == 0
-          ctx.puts(ctx.message('rails.forms.create.partners_notice'))
-          ctx.puts(ctx.message('rails.forms.create.authentication_issue', ShopifyCli::TOOL_NAME))
-          ctx.abort(ctx.message('rails.forms.create.error.no_organizations'))
-        elsif organizations.count == 1
-          org = organizations.first
-          ctx.puts(ctx.message('rails.forms.create.organization',
-            ctx.message('core.partners_api.org_name_and_id', org['businessName'], org['id'])))
-          org
-        else
-          org_id = CLI::UI::Prompt.ask(ctx.message('rails.forms.create.organization_select')) do |handler|
-            organizations.each { |o| handler.option(o['businessName']) { o['id'] } }
-          end
-          organizations.find { |o| o['id'] == org_id }
-        end
-      end
-
-      def ask_shop_domain
-        valid_stores = organization['stores'].select do |store|
-          store['transferDisabled'] == true || store['convertableToPartnerTest'] == true
-        end
-
-        if valid_stores.count == 0
-          ctx.puts(ctx.message('rails.forms.create.no_development_stores'))
-          ctx.puts(ctx.message('rails.forms.create.create_store', organization['id']))
-          ctx.puts(ctx.message('rails.forms.create.authentication_issue', ShopifyCli::TOOL_NAME))
-        elsif valid_stores.count == 1
-          domain = valid_stores.first['shopDomain']
-          ctx.puts(ctx.message('rails.forms.create.development_store', domain))
-          domain
-        else
-          CLI::UI::Prompt.ask(
-            ctx.message('rails.forms.create.development_store_select'),
-            options: valid_stores.map { |s| s['shopDomain'] }
-          )
-        end
-      end
-
       def ask_db
         if db.nil?
           return 'sqlite3' unless CLI::UI::Prompt.confirm(ctx.message('rails.forms.create.db.want_select'),

data/lib/project_types/rails/messages/messages.rb

@@ -37,8 +37,8 @@ module Rails
 
           info: {
             created: "{{v}} {{green:%s}} was created in your Partner Dashboard {{underline:%s}}",
-            serve: "{{*}} Change into your new project folder {{green:%s}} and run {{command:%s serve}} to start a " \
-              "local server",
+            serve: "{{*}} Change directories to your new project folder {{green:%s}} and run {{command:%s serve}} " \
+              "to start a local server",
             install: "{{*}} Then, visit {{underline:%s/test}} to install {{green:%s}} on your Dev Store",
           },
           installing_bundler: "Installing bundler…",
@@ -236,14 +236,7 @@ module Rails
             error: {
               invalid_app_type: "Invalid app type %s",
               invalid_db_type: "Invalid database type %s",
-              organization_not_found: "Cannot find a partner organization with that ID",
-              no_organizations: "No partner organizations available.",
             },
-
-            authentication_issue: "For authentication issues, run {{command:%s logout}} to clear invalid credentials",
-            partners_notice: "Please visit https://partners.shopify.com/ to create a partners account",
-            no_development_stores: "{{x}} No development stores available.",
-            create_store: "Visit {{underline:https://partners.shopify.com/%s/stores}} to create one",
             app_name: "App name",
             app_type: {
               select: "What type of app are you building?",
@@ -271,10 +264,6 @@ module Rails
               select_jdbc: "JDBC",
               selected: "Database Type {{green:%s}}",
             },
-            organization_select: "Select partner organization",
-            organization: "Partner organization {{green:%s}}",
-            development_store_select: "Select a development store",
-            development_store: "Using development store {{green:%s}}",
           },
         },
       },

data/lib/project_types/script/cli.rb

@@ -51,16 +51,16 @@ module Script
       autoload :Errors, Project.project_filepath('layers/infrastructure/errors')
       autoload :AssemblyScriptDependencyManager,
                Project.project_filepath('layers/infrastructure/assemblyscript_dependency_manager')
+      autoload :AssemblyScriptProjectCreator,
+               Project.project_filepath('layers/infrastructure/assemblyscript_project_creator')
+      autoload :AssemblyScriptTaskRunner, Project.project_filepath('layers/infrastructure/assemblyscript_task_runner')
       autoload :AssemblyScriptTsConfig, Project.project_filepath('layers/infrastructure/assemblyscript_tsconfig')
-      autoload :AssemblyScriptWasmBuilder,
-               Project.project_filepath('layers/infrastructure/assemblyscript_wasm_builder')
-      autoload :DependencyManager, Project.project_filepath('layers/infrastructure/dependency_manager')
       autoload :PushPackageRepository, Project.project_filepath('layers/infrastructure/push_package_repository')
       autoload :ExtensionPointRepository, Project.project_filepath('layers/infrastructure/extension_point_repository')
-      autoload :ScriptBuilder, Project.project_filepath('layers/infrastructure/script_builder')
+      autoload :ProjectCreator, Project.project_filepath('layers/infrastructure/project_creator')
       autoload :ScriptRepository, Project.project_filepath('layers/infrastructure/script_repository')
       autoload :ScriptService, Project.project_filepath('layers/infrastructure/script_service')
-      autoload :TestSuiteRepository, Project.project_filepath('layers/infrastructure/test_suite_repository')
+      autoload :TaskRunner, Project.project_filepath('layers/infrastructure/task_runner')
     end
   end
 

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

@@ -19,16 +19,17 @@ module Script
           return @ctx.puts(self.class.help)
         end
 
-        script = Layers::Application::CreateScript.call(
+        Layers::Application::CreateScript.call(
           ctx: @ctx,
           language: language,
           script_name: form.name,
           extension_point_type: form.extension_point
         )
-        @ctx.puts(@ctx.message('script.create.script_path', folder: script.name))
-        @ctx.puts(@ctx.message('script.create.script_created', script_id: File.join(script.name, script.id)))
+        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))
       rescue StandardError => e
-        ScriptProject.cleanup(ctx: @ctx, script_name: form.name, root_dir: cur_dir)
+        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
 

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

@@ -19,6 +19,7 @@ module Script
           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
         )

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

@@ -1,18 +1,18 @@
 discount:
   assemblyscript:
     package: "@shopify/extension-point-as-discount"
-    version: "^0.2.2"
+    version: "^0.2.3"
     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.4"
     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.1"
     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/layers/application/build_script.rb

@@ -5,11 +5,11 @@ module Script
     module Application
       class BuildScript
         class << self
-          def call(ctx:, script:)
+          def call(ctx:, task_runner:, script:)
             return if CLI::UI::Frame.open(ctx.message('script.application.building')) do
               begin
                 UI::StrictSpinner.spin(ctx.message('script.application.building_script')) do |spinner|
-                  build(script)
+                  build(ctx, task_runner, script)
                   spinner.update_title(ctx.message('script.application.built'))
                 end
                 true
@@ -25,16 +25,13 @@ module Script
 
           private
 
-          def build(script)
-            script_repo = Infrastructure::ScriptRepository.new
-            script_builder = Infrastructure::ScriptBuilder.for(script)
-            compiled_type = script_builder.compiled_type
+          def build(ctx, task_runner, script)
+            script_repo = Infrastructure::ScriptRepository.new(ctx: ctx)
             script_content = script_repo.with_temp_build_context do
-              script_builder.build
+              task_runner.build
             end
-
-            Infrastructure::PushPackageRepository.new
-              .create_push_package(script, script_content, compiled_type)
+            Infrastructure::PushPackageRepository.new(ctx: ctx)
+              .create_push_package(script, script_content, task_runner.compiled_type)
           end
         end
       end