shopify-cli 2.6.6 → 2.7.3

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

@@ -5,8 +5,8 @@ module Rails
     MESSAGES = {
       rails: {
         help: <<~HELP,
-          Suite of commands for developing Ruby on Rails apps. See {{command:%1$s rails <command> --help}} for usage of each command.
-            Usage: {{command:%1$s rails [ %2$s ]}}
+          Suite of commands for developing Ruby on Rails apps. See {{command:%1$s app rails <command> --help}} for usage of each command.
+            Usage: {{command:%1$s app rails [ %2$s ]}}
         HELP
 
         error: {
@@ -21,117 +21,22 @@ module Rails
           setting_gem_home: "GEM_HOME being set to %s",
           setting_gem_path: "GEM_PATH being set to %s",
         },
-
-        connect: {
-          connected: "Project now connected to {{green:%s}}",
-          help: <<~HELP,
-            {{command:%s rails connect}}: Connects an existing Ruby on Rails app to Shopify CLI. Creates a config file.
-              Usage: {{command:%s rails connect}}
-          HELP
-          production_warning: <<~MESSAGE,
-            {{yellow:! Warning: if you have connected to an {{bold:app in production}}, running {{command:serve}} may update the app URL and cause an outage.
-          MESSAGE
-        },
-
-        create: {
-          help: <<~HELP,
-            {{command:%s rails create}}: Creates a ruby on rails app.
-              Usage: {{command:%s rails create}}
-              Options:
-                {{command:--name=NAME}} App name. Any string.
-                {{command:--organization-id=ID}} Partner organization ID. Must be an existing organization.
-                {{command:--store=MYSHOPIFYDOMAIN }} Development store URL. Must be an existing development store.
-                {{command:--db=DB}} Database type. Must be one of: mysql, postgresql, sqlite3, oracle, frontbase, ibm_db, sqlserver, jdbcmysql, jdbcsqlite3, jdbcpostgresql, jdbc.
-                {{command:--rails-opts=RAILSOPTS}} Additional options. Must be string containing one or more valid Rails options, separated by spaces.
-          HELP
-
-          error: {
-            invalid_ruby_version: "This project requires a Ruby version ~> 2.5 or Ruby 3.0.",
-            dir_exists: "Project directory %s already exists. Please use a different name.",
-            install_failure: "Error installing %s gem",
-            node_required: "node is required to create a rails project. Download at https://nodejs.org/en/download.",
-            node_version_failure: "Failed to get the current node version. Please make sure it is installed as " \
-              "per the instructions at https://nodejs.org/en.",
-            yarn_required: "yarn is required to create a rails project. Download at " \
-              "https://classic.yarnpkg.com/en/docs/install.",
-            yarn_version_failure: "Failed to get the current yarn version. Please make sure it is installed as per " \
-              "the instructions at https://classic.yarnpkg.com/en/docs/install.",
-          },
-
-          info: {
-            open_new_shell: "{{*}} {{yellow:After installing %s, please open a new Command Prompt or PowerShell " \
-              "window to continue.}}",
-          },
-          installing_bundler: "Installing bundler…",
-          generating_app: "Generating new rails app project in %s…",
-          adding_shopify_gem: "{{v}} Adding shopify_app gem…",
-          node_version: "node %s",
-          yarn_version: "yarn %s",
-          running_bundle_install: "Running bundle install…",
-          running_generator: "Running shopify_app generator…",
-          running_migrations: "Running migrations…",
-          running_webpacker_install: "Running webpacker:install…",
-        },
-
         deploy: {
           help: <<~HELP,
             Deploy the current Rails project to a hosting service. Heroku ({{underline:https://www.heroku.com}}) is currently the only option, but more will be added in the future.
-              Usage: {{command:%s rails deploy [ heroku ]}}
+              Usage: {{command:%s app rails deploy [ heroku ]}}
           HELP
           extended_help: <<~HELP,
             {{bold:Subcommands:}}
               {{cyan:heroku}}: Deploys the current Rails project to Heroku.
-                Usage: {{command:%s rails deploy heroku}}
+                Usage: {{command:%s app rails deploy heroku}}
           HELP
-
-          heroku: {
-            help: <<~HELP,
-              Deploy the current Rails project to Heroku
-              Usage: {{command:%s rails deploy heroku}}
-            HELP
-            downloading: "Downloading Heroku CLI…",
-            downloaded: "Downloaded Heroku CLI",
-            installing: "Installing Heroku CLI…",
-            installed: "Installed Heroku CLI",
-            authenticated_with_account: "{{v}} Authenticated with Heroku as {{green:%s}}",
-            authenticating: "Authenticating with Heroku…",
-            authenticated: "{{v}} Authenticated with Heroku",
-            deploying: "Deploying to Heroku…",
-            deployed: "{{v}} Deployed to Heroku",
-            db_check: {
-              validating: "Validating application…",
-              checking: "Checking database type…",
-              validated: "Database type \"%s\" validated for platform \"Heroku\"",
-              problem: "A problem was encountered while checking your database type.",
-              sqlite: <<~SQLITE,
-                Heroku does not support deployment using the SQLite database system.
-                Change the database type using {{command:rails db:system:change --to=[new_db_type]}}. For more info:
-                {{underline:https://gorails.com/episodes/rails-6-db-system-change-command}}
-              SQLITE
-            },
-            git: {
-              checking: "Checking git repo…",
-              initialized: "Git repo initialized",
-              what_branch: "What branch would you like to deploy?",
-              branch_selected: "{{v}} Git branch {{green:%s}} selected for deploy",
-            },
-            app: {
-              no_apps_found: "No existing Heroku app found. What would you like to do?",
-              name: "What is your Heroku app’s name?",
-              select: "Specify an existing Heroku app",
-              selecting: "Selecting Heroku app %s…",
-              selected: "{{v}} Heroku app {{green:%s}} selected",
-              create: "Create a new Heroku app",
-              creating: "Creating new Heroku app…",
-              created: "{{v}} New Heroku app created",
-            },
-          },
         },
 
         generate: {
           help: <<~HELP,
             Generate code in your Rails project. Currently supports generating new webhooks.
-              Usage: {{command:%s rails generate [ webhook ]}}
+              Usage: {{command:%s app rails generate [ webhook ]}}
           HELP
           extended_help: <<~EXAMPLES,
             {{bold:Examples:}}
@@ -147,63 +52,13 @@ module Rails
           webhook: {
             help: <<~HELP,
               Generate and register a new webhook that listens for the specified Shopify store event.
-                Usage: {{command:%s rails generate webhook <type>}}
+                Usage: {{command:%s app rails generate webhook <type>}}
             HELP
 
             select: "What type of webhook would you like to create?",
             selected: "Generating webhook: %s",
           },
         },
-
-        open: {
-          help: <<~HELP,
-            Open your local development app in the default browser.
-              Usage: {{command:%s rails open}}
-          HELP
-        },
-
-        serve: {
-          help: <<~HELP,
-            Start a local development rails server for your project, as well as a public ngrok tunnel to your localhost.
-              Usage: {{command:%s rails serve}}
-          HELP
-          extended_help: <<~HELP,
-            {{bold:Options:}}
-              {{cyan:--host=HOST}}: Bypass running tunnel and use custom host. HOST must be HTTPS url.
-              {{cyan:--port=PORT}}: Use custom port.
-          HELP
-
-          open_info: <<~MESSAGE,
-            {{*}} To install and start using your app, open this URL in your browser:
-            {{green:%s}}
-          MESSAGE
-          running_server: "Running server…",
-        },
-
-        tunnel: {
-          help: <<~HELP,
-            Start or stop an http tunnel to your local development app using ngrok.
-              Usage: {{command:%s rails tunnel [ auth | start | stop ]}}
-          HELP
-          extended_help: <<~HELP,
-            {{bold:Subcommands:}}
-
-              {{cyan:auth}}: Writes an ngrok auth token to ~/.ngrok2/ngrok.yml to connect with an ngrok account. Visit https://dashboard.ngrok.com/signup to sign up.
-                Usage: {{command:%1$s rails tunnel auth <token>}}
-
-              {{cyan:start}}: Starts an ngrok tunnel, will print the URL for an existing tunnel if already running.
-                Usage: {{command:%1$s rails tunnel start}}
-
-              {{cyan:stop}}: Stops the ngrok tunnel.
-                Usage: {{command:%1$s rails tunnel stop}}
-
-          HELP
-
-          error: {
-            token_argument_missing: "{{x}} {{red:auth requires a token argument}}\n\n",
-          },
-        },
-
         forms: {
           create: {
             error: {

data/lib/project_types/script/cli.rb

@@ -9,15 +9,20 @@ module Script
   end
 
   # define/autoload project specific Commands
-  class Command < ShopifyCLI::ProjectCommands
+  class Command < ShopifyCLI::Command::ProjectCommand
     hidden_feature(feature_set: :script_project)
     subcommand :Create, "create", Project.project_filepath("commands/create")
     subcommand :Push, "push", Project.project_filepath("commands/push")
+    subcommand :Javy, "javy", Project.project_filepath("commands/javy")
   end
   ShopifyCLI::Commands.register("Script::Command", "script")
 
   # define/autoload project specific Forms
   module Forms
+    autoload :AskOrg, Project.project_filepath("forms/ask_org")
+    autoload :AskApp, Project.project_filepath("forms/ask_app")
+    autoload :AskScriptUuid, Project.project_filepath("forms/ask_script_uuid")
+    autoload :RunAgainstShopifyOrg, Project.project_filepath("forms/run_against_shopify_org")
     autoload :Create, Project.project_filepath("forms/create")
     autoload :ScriptForm, Project.project_filepath("forms/script_form")
   end
@@ -29,6 +34,7 @@ module Script
   module Layers
     module Application
       autoload :BuildScript, Project.project_filepath("layers/application/build_script")
+      autoload :ConnectApp, Project.project_filepath("layers/application/connect_app")
       autoload :CreateScript, Project.project_filepath("layers/application/create_script")
       autoload :PushScript, Project.project_filepath("layers/application/push_script")
       autoload :ExtensionPoints, Project.project_filepath("layers/application/extension_points")
@@ -40,7 +46,7 @@ module Script
       autoload :PushPackage, Project.project_filepath("layers/domain/push_package")
       autoload :Metadata, Project.project_filepath("layers/domain/metadata")
       autoload :ExtensionPoint, Project.project_filepath("layers/domain/extension_point")
-      autoload :ScriptJson, Project.project_filepath("layers/domain/script_json")
+      autoload :ScriptConfig, Project.project_filepath("layers/domain/script_config")
       autoload :ScriptProject, Project.project_filepath("layers/domain/script_project")
     end
 

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

@@ -2,10 +2,8 @@
 
 module Script
   class Command
-    class Create < ShopifyCLI::SubCommand
-      unless ShopifyCLI::Environment.acceptance_test?
-        prerequisite_task :ensure_authenticated
-      end
+    class Create < ShopifyCLI::Command::SubCommand
+      prerequisite_task :ensure_authenticated
 
       options do |parser, flags|
         parser.on("--name=NAME") { |name| flags[:name] = name }

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

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+require "shopify_cli"
+require_relative "../../../../ext/javy/javy.rb"
+
+module Script
+  class Command
+    class Javy < ShopifyCLI::Command::SubCommand
+      hidden_feature
+
+      options do |parser, flags|
+        parser.on("--in=IN") { |in_file| flags[:in_file] = in_file }
+        parser.on("--out=OUT") { |out_file| flags[:out_file] = out_file }
+      end
+
+      def call(*)
+        source = options.flags[:in_file]
+        dest = options.flags[:out_file]
+
+        @ctx.abort(@ctx.message("script.javy.errors.invalid_arguments", ShopifyCLI::TOOL_NAME)) unless source
+
+        ::Javy.build(source: source, dest: dest).unwrap { |e| @ctx.abort(e.message) }
+      end
+
+      def self.help
+        ShopifyCLI::Context.message("script.javy.help", ShopifyCLI::TOOL_NAME)
+      end
+    end
+  end
+end

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

@@ -2,7 +2,7 @@
 
 module Script
   class Command
-    class Push < ShopifyCLI::SubCommand
+    class Push < ShopifyCLI::Command::SubCommand
       prerequisite_task ensure_project_type: :script
 
       options do |parser, flags|
@@ -10,7 +10,8 @@ module Script
       end
 
       def call(_args, _name)
-        fresh_env = Tasks::EnsureEnv.call(@ctx)
+        fresh_env = Layers::Application::ConnectApp.call(ctx: @ctx)
+
         force = options.flags.key?(:force) || !!fresh_env
 
         api_key = Layers::Infrastructure::ScriptProjectRepository.new(ctx: @ctx).get.api_key

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

@@ -1,29 +1,3 @@
-discount:
-  deprecated: true
-  libraries:
-    assemblyscript:
-      package: "@shopify/extension-point-as-discount"
-unit_limit_per_order:
-  beta: true
-  libraries:
-    assemblyscript:
-      package: "@shopify/extension-point-as-unit-limit-per-order"
-payment_filter:
-  deprecated: true
-  libraries:
-    assemblyscript:
-      package: "@shopify/extension-point-as-payment-filter"
-shipping_filter:
-  deprecated: true
-  libraries:
-    assemblyscript:
-      package: "@shopify/extension-point-as-shipping-filter"
-tax_filter:
-  beta: true
-  libraries:
-    assemblyscript:
-      repo: "https://github.com/Shopify/extension-points.git"
-      package: "@shopify/extension-point-as-tax-filter"
 payment_methods:
   domain: 'checkout'
   libraries:
@@ -32,7 +6,7 @@ payment_methods:
       package: "@shopify/scripts-checkout-apis"
     typescript:
       beta: true
-      package: "@shopify/scripts-checkout-apis-temp"
+      package: "@shopify/scripts-checkout-apis"
       repo: "https://github.com/Shopify/scripts-apis-examples"
 shipping_methods:
   domain: 'checkout'
@@ -42,13 +16,21 @@ shipping_methods:
       package: "@shopify/scripts-checkout-apis"
     typescript:
       beta: true
-      package: "@shopify/scripts-checkout-apis-temp"
+      package: "@shopify/scripts-checkout-apis"
+      repo: "https://github.com/Shopify/scripts-apis-examples"
+merchandise_discount_types:
+  beta: true
+  domain: 'discounts'
+  libraries:
+    typescript:
+      beta: true
+      package: "@shopify/scripts-discounts-apis"
       repo: "https://github.com/Shopify/scripts-apis-examples"
-discount_types:
+delivery_discount_types:
   beta: true
   domain: 'discounts'
   libraries:
     typescript:
       beta: true
-      package: "@shopify/scripts-discount-apis"
+      package: "@shopify/scripts-discounts-apis"
       repo: "https://github.com/Shopify/scripts-apis-examples"

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

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+module Script
+  module Forms
+    class AskApp < ShopifyCLI::Form
+      attr_reader :app
+
+      def ask
+        apps = @xargs.fetch(:apps)
+
+        unless @xargs[:acting_as_shopify_organization]
+          apps = apps.select { |app| app["appType"] == "custom" }
+        end
+
+        raise Errors::NoExistingAppsError if apps.empty?
+
+        @app =
+          if apps.count > 1
+            CLI::UI::Prompt.ask(ctx.message("script.application.ensure_env.app_select")) do |handler|
+              apps.each do |app|
+                handler.option(app["title"]) { app }
+              end
+            end
+          else
+            apps.first.tap do |app|
+              ctx.puts(ctx.message("script.application.ensure_env.app", app["title"]))
+            end
+          end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+module Script
+  module Forms
+    class AskOrg < ShopifyCLI::Form
+      attr_reader :org
+
+      BUSINESS_NAME = "businessName"
+      ID = "id"
+
+      def ask
+        orgs = @xargs
+        @org =
+          if orgs.count == 1
+            orgs.first.tap do |org|
+              ctx.puts(ctx.message("script.application.ensure_env.organization", org[BUSINESS_NAME], org[ID]))
+            end
+          elsif orgs.count > 0
+            CLI::UI::Prompt.ask(ctx.message("script.application.ensure_env.organization_select")) do |handler|
+              orgs.each do |org|
+                handler.option("#{org[BUSINESS_NAME]} (#{org[ID]})") { org }
+              end
+            end
+          else
+            raise Errors::NoExistingOrganizationsError
+          end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module Script
+  module Forms
+    class AskScriptUuid < ShopifyCLI::Form
+      attr_reader :uuid
+      def ask
+        scripts = @xargs
+
+        return if scripts.empty? ||
+          !CLI::UI::Prompt.confirm(ctx.message("script.application.ensure_env.ask_connect_to_existing_script"))
+
+        @uuid =
+          CLI::UI::Prompt.ask(ctx.message("script.application.ensure_env.ask_which_script_to_connect_to")) do |handler|
+            scripts.each do |script|
+              handler.option("#{script["title"]} (#{script["uuid"]})") { script["uuid"] }
+            end
+          end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module Script
+  module Forms
+    class RunAgainstShopifyOrg < ShopifyCLI::Form
+      attr_reader :response
+      def ask
+        @ctx.puts(@ctx.message("core.tasks.select_org_and_shop.identified_as_shopify"))
+        message = @ctx.message("core.tasks.select_org_and_shop.first_party")
+        @response = CLI::UI::Prompt.confirm(message, default: false)
+      end
+    end
+  end
+end

data/lib/project_types/script/graphql/app_script_set.graphql

@@ -6,7 +6,7 @@ mutation AppScriptSet(
   $force: Boolean,
   $schemaMajorVersion: String,
   $schemaMinorVersion: String,
-  $scriptJsonVersion: String!,
+  $scriptConfigVersion: String!,
   $configurationUi: Boolean!,
   $configurationDefinition: String!,
   $moduleUploadUrl: String!,
@@ -20,7 +20,7 @@ mutation AppScriptSet(
     force: $force
     schemaMajorVersion: $schemaMajorVersion
     schemaMinorVersion: $schemaMinorVersion,
-    scriptJsonVersion: $scriptJsonVersion,
+    scriptConfigVersion: $scriptConfigVersion,
     configurationUi: $configurationUi,
     configurationDefinition: $configurationDefinition,
     moduleUploadUrl: $moduleUploadUrl,

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

@@ -23,7 +23,6 @@ module Script
                   ctx.puts("\n{{red:#{e.message}}}")
                 end
                 errors = [
-                  Infrastructure::Errors::InvalidBuildScriptError,
                   Infrastructure::Errors::BuildScriptNotFoundError,
                   Infrastructure::Errors::WebAssemblyBinaryNotFoundError,
                 ]

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

@@ -0,0 +1,73 @@
+# frozen_string_literal: true
+
+require "shopify_cli"
+
+module Script
+  module Layers
+    module Application
+      class ConnectApp
+        class << self
+          def call(ctx:)
+            script_project_repo = Layers::Infrastructure::ScriptProjectRepository.new(ctx: ctx)
+            script_project = script_project_repo.get
+            return false if script_project.env_valid?
+
+            if ShopifyCLI::Shopifolk.check && Forms::RunAgainstShopifyOrg.ask(ctx, nil, nil).response
+              ShopifyCLI::Shopifolk.act_as_shopify_organization
+            end
+
+            org =
+              if partner_proxy_bypass
+                stubbed_org
+              else
+                orgs = ShopifyCLI::PartnersAPI::Organizations.fetch_with_app(ctx)
+                Forms::AskOrg.ask(ctx, orgs, nil).org
+              end
+
+            app = Forms::AskApp.ask(
+              ctx,
+              {
+                apps: org["apps"],
+                acting_as_shopify_organization: ShopifyCLI::Shopifolk.acting_as_shopify_organization?,
+              },
+              nil
+            ).app
+
+            script_service = Layers::Infrastructure::ServiceLocator.script_service(ctx: ctx, api_key: app["apiKey"])
+            extension_point_type = script_project.extension_point_type
+            scripts = script_service.get_app_scripts(extension_point_type: extension_point_type)
+
+            uuid = Forms::AskScriptUuid.ask(ctx, scripts, nil).uuid
+
+            script_project_repo.create_env(
+              api_key: app["apiKey"],
+              secret: app["apiSecretKeys"].first["secret"],
+              uuid: uuid
+            )
+
+            true
+          end
+
+          private
+
+          def partner_proxy_bypass
+            !ENV["BYPASS_PARTNERS_PROXY"].nil?
+          end
+
+          def stubbed_org
+            {
+              "apps" => [
+                {
+                  "appType" => "custom",
+                  "apiKey" => "stubbed-api-key",
+                  "apiSecretKeys" => [{ "secret" => "stubbed-api-secret" }],
+                  "title" => "Fake App (Not connected to Partners)",
+                },
+              ],
+            }
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -36,7 +36,7 @@ module Script
               )
 
               install_dependencies(ctx, language, script_name, project_creator)
-              script_project_repo.update_or_create_script_json(title: script_name)
+              script_project_repo.update_script_config(title: script_name)
               project
             end
           end

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

@@ -43,7 +43,7 @@ module Script
                 extension_point_type: package.extension_point_type,
                 force: force,
                 metadata: package.metadata,
-                script_json: package.script_json,
+                script_config: package.script_config,
                 module_upload_url: module_upload_url,
                 library: package.library,
               )

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

@@ -14,7 +14,7 @@ module Script
           end
         end
 
-        class MissingScriptJsonFieldError < ScriptProjectError
+        class MissingScriptConfigFieldError < ScriptProjectError
           attr_reader :field
           def initialize(field)
             super()
@@ -22,9 +22,6 @@ module Script
           end
         end
 
-        class InvalidScriptJsonDefinitionError < ScriptProjectError; end
-        class NoScriptJsonFile < ScriptProjectError; end
-
         class ScriptNotFoundError < ScriptProjectError
           attr_reader :script_name, :extension_point_type
           def initialize(extension_point_type, script_name)

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

@@ -7,7 +7,7 @@ module Script
         attr_reader :id,
           :uuid,
           :extension_point_type,
-          :script_json,
+          :script_config,
           :script_content,
           :compiled_type,
           :metadata,
@@ -20,7 +20,7 @@ module Script
           script_content:,
           compiled_type: nil,
           metadata:,
-          script_json:,
+          script_config:,
           library:
         )
           @id = id
@@ -29,7 +29,7 @@ module Script
           @script_content = script_content
           @compiled_type = compiled_type
           @metadata = metadata
-          @script_json = script_json
+          @script_config = script_config
           @library = library
         end
       end

data/lib/project_types/script/layers/domain/{script_json.rb → script_config.rb}

@@ -3,7 +3,7 @@
 module Script
   module Layers
     module Domain
-      class ScriptJson
+      class ScriptConfig
         attr_reader :content, :version, :title, :description, :configuration_ui, :configuration
 
         REQUIRED_FIELDS = %w(version title)
@@ -23,7 +23,7 @@ module Script
 
         def validate_content!(content)
           REQUIRED_FIELDS.each do |field|
-            raise Errors::MissingScriptJsonFieldError, field if content[field].nil?
+            raise Errors::MissingScriptConfigFieldError, field if content[field].nil?
           end
         end
       end

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

@@ -15,7 +15,7 @@ module Script
         property! :script_name, accepts: String
         property! :language, accepts: String
 
-        property :script_json, accepts: ScriptJson
+        property :script_config, accepts: ScriptConfig
 
         def initialize(*)
           super
@@ -43,6 +43,10 @@ module Script
           !raw_uuid.nil?
         end
 
+        def env_valid?
+          api_key && api_secret && uuid_defined?
+        end
+
         private
 
         def raw_uuid