shopify-cli 1.12.0 → 2.0.1

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

@@ -3,10 +3,12 @@
 require "shopify_cli"
 
 module Rails
-  module Commands
-    class Tunnel < ShopifyCli::Command
+  class Command
+    class Tunnel < ShopifyCli::SubCommand
       # subcommands :auth, :start, :stop
 
+      prerequisite_task ensure_project_type: :rails
+
       def call(args, _name)
         subcommand = args.shift
         case subcommand

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

@@ -4,6 +4,11 @@ module Rails
   module Messages
     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 ]}}
+        HELP
+
         error: {
           generic: "Error",
         },
@@ -19,30 +24,29 @@ module Rails
 
         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.
+            {{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 create rails}}: Creates a ruby on rails app.
-            Usage: {{command:%s create rails}}
-            Options:
-              {{command:--name=NAME}} App name. Any string.
-              {{command:--app-url=APPURL}} App URL. Must be a valid URL.
-              {{command:--organization-id=ID}} Partner organization ID. Must be an existing organization.
-              {{command:--shop-domain=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.
+            {{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: <<~MSG,
-            This project requires a Ruby version ~> 2.5 or Ruby 3.0
-            See {{underline:https://github.com/Shopify/shopify-app-cli/blob/master/docs/installing-ruby.md}}
-            for our recommended method of installing ruby.
-            MSG
+            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.",
@@ -71,19 +75,19 @@ module Rails
 
         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 deploy [ heroku ]}}
+            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 ]}}
           HELP
           extended_help: <<~HELP,
-          {{bold:Subcommands:}}
-            {{cyan:heroku}}: Deploys the current Rails project to Heroku.
-              Usage: {{command:%s deploy heroku}}
+            {{bold:Subcommands:}}
+              {{cyan:heroku}}: Deploys the current Rails project to Heroku.
+                Usage: {{command:%s rails deploy heroku}}
           HELP
 
           heroku: {
             help: <<~HELP,
-            Deploy the current Rails project to Heroku
-            Usage: {{command:%s deploy heroku}}
+              Deploy the current Rails project to Heroku
+              Usage: {{command:%s rails deploy heroku}}
             HELP
             downloading: "Downloading Heroku CLI...",
             downloaded: "Downloaded Heroku CLI",
@@ -100,9 +104,9 @@ module Rails
               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}}
+                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: {
@@ -126,13 +130,13 @@ module Rails
 
         generate: {
           help: <<~HELP,
-          Generate code in your Rails project. Currently supports generating new webhooks.
-            Usage: {{command:%s generate [ webhook ]}}
+            Generate code in your Rails project. Currently supports generating new webhooks.
+              Usage: {{command:%s rails generate [ webhook ]}}
           HELP
           extended_help: <<~EXAMPLES,
-          {{bold:Examples:}}
-            {{cyan:%s generate webhook PRODUCTS_CREATE}}
-              Generate and register a new webhook that will be called every time a new product is created on your store.
+            {{bold:Examples:}}
+              {{cyan:%s generate webhook PRODUCTS_CREATE}}
+                Generate and register a new webhook that will be called every time a new product is created on your store.
           EXAMPLES
 
           error: {
@@ -142,8 +146,8 @@ module Rails
 
           webhook: {
             help: <<~HELP,
-            Generate and register a new webhook that listens for the specified Shopify store event.
-              Usage: {{command:%s generate webhook <type>}}
+              Generate and register a new webhook that listens for the specified Shopify store event.
+                Usage: {{command:%s rails generate webhook <type>}}
             HELP
 
             select: "What type of webhook would you like to create?",
@@ -153,70 +157,19 @@ module Rails
 
         open: {
           help: <<~HELP,
-          Open your local development app in the default browser.
-            Usage: {{command:%s open}}
-          HELP
-        },
-
-        populate: {
-          help: <<~HELP,
-          Populate your Shopify development store with example customers, orders, or products.
-            Usage: {{command:%s populate [ customers | draftorders | products ]}}
+            Open your local development app in the default browser.
+              Usage: {{command:%s rails open}}
           HELP
-          extended_help: <<~HELP,
-          {{bold:Subcommands:}}
-
-            {{cyan:customers [options]}}: Add dummy customers to the specified development store.
-              Usage: {{command:%1$s populate customers}}
-
-            {{cyan:draftorders [options]}}: Add dummy orders to the specified development store.
-              Usage: {{command:%1$s populate draftorders}}
-
-            {{cyan:products [options]}}: Add dummy products to the specified development store.
-              Usage: {{command:%1$s populate products}}
-
-          {{bold:Options:}}
-
-            {{cyan:--count [integer]}}: The number of dummy items to populate. Defaults to 5.
-            {{cyan:--silent}}: Silence the populate output.
-            {{cyan:--help}}: Display more options specific to each subcommand.
-
-          {{bold:Examples:}}
-
-            {{command:%1$s populate products}}
-              Populate your development store with 5 additional products.
-
-            {{command:%1$s populate customers --count 30}}
-              Populate your development store with 30 additional customers.
-
-            {{command:%1$s populate draftorders}}
-              Populate your development store with 5 additional orders.
-
-            {{command:%1$s populate products --help}}
-              Display the list of options available to customize the {{command:%1$s populate products}} command.
-          HELP
-
-          customer: {
-            added: "%s added to {{green:%s}} at {{underline:%scustomers/%d}}",
-          },
-
-          draft_order: {
-            added: "DraftOrder added to {{green:%s}} at {{underline:%sdraft_orders/%d}}",
-          },
-
-          product: {
-            added: "%s added to {{green:%s}} at {{underline:%sproducts/%d}}",
-          },
         },
 
         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 serve}}
+            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.
+            {{bold:Options:}}
+              {{cyan:--host=HOST}}: Bypass running tunnel and use custom host. HOST must be HTTPS url.
           HELP
 
           error: {
@@ -232,20 +185,20 @@ module Rails
 
         tunnel: {
           help: <<~HELP,
-          Start or stop an http tunnel to your local development app using ngrok.
-            Usage: {{command:%s tunnel [ auth | start | stop ]}}
+            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:}}
+            {{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 tunnel auth <token>}}
+              {{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 tunnel start}}
+              {{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 tunnel stop}}
+              {{cyan:stop}}: Stops the ngrok tunnel.
+                Usage: {{command:%1$s rails tunnel stop}}
 
           HELP
 
@@ -270,9 +223,9 @@ module Rails
             },
             db: {
               want_select: <<~WANT_SELECT,
-              Would you like to select what database type to use now? (SQLite is the default)
-              If you want to change this in the future, run {{command:rails db:system:change --to=[new_db_type]}}. For more info:
-              {{underline:https://gorails.com/episodes/rails-6-db-system-change-command}}
+                Would you like to select what database type to use now? (SQLite is the default)
+                If you want to change this in the future, run {{command:rails db:system:change --to=[new_db_type]}}. For more info:
+                {{underline:https://gorails.com/episodes/rails-6-db-system-change-command}}
               WANT_SELECT
               select: "What database type would you like to use? Please ensure the database is installed.",
               select_sqlite3: "SQLite (default)",

data/lib/project_types/script/cli.rb

@@ -3,20 +3,18 @@
 module Script
   class Project < ShopifyCli::ProjectType
     hidden_feature(feature_set: :script_project)
-    title("Script")
-    creator("Script::Commands::Create")
-
-    register_command("Script::Commands::Push", "push")
 
     require Project.project_filepath("messages/messages")
     register_messages(Script::Messages::MESSAGES)
   end
 
   # define/autoload project specific Commands
-  module Commands
-    autoload :Create, Project.project_filepath("commands/create")
-    autoload :Push, Project.project_filepath("commands/push")
+  class Command < ShopifyCli::ProjectCommands
+    hidden_feature(feature_set: :script_project)
+    subcommand :Create, "create", Project.project_filepath("commands/create")
+    subcommand :Push, "push", Project.project_filepath("commands/push")
   end
+  ShopifyCli::Commands.register("Script::Command", "script")
 
   # define/autoload project specific Forms
   module Forms
@@ -39,32 +37,32 @@ module Script
 
     module Domain
       autoload :Errors, Project.project_filepath("layers/domain/errors")
-      autoload :ConfigUi, Project.project_filepath("layers/domain/config_ui")
       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 :ScriptProject, Project.project_filepath("layers/domain/script_project")
     end
 
     module Infrastructure
       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 :CommandRunner, Project.project_filepath("layers/infrastructure/command_runner")
-      autoload :RustProjectCreator,
-        Project.project_filepath("layers/infrastructure/rust_project_creator.rb")
-      autoload :RustTaskRunner, Project.project_filepath("layers/infrastructure/rust_task_runner")
-
       autoload :PushPackageRepository, Project.project_filepath("layers/infrastructure/push_package_repository")
       autoload :ExtensionPointRepository, Project.project_filepath("layers/infrastructure/extension_point_repository")
-      autoload :ProjectCreator, Project.project_filepath("layers/infrastructure/project_creator")
       autoload :ScriptProjectRepository, Project.project_filepath("layers/infrastructure/script_project_repository")
       autoload :ScriptService, Project.project_filepath("layers/infrastructure/script_service")
-      autoload :TaskRunner, Project.project_filepath("layers/infrastructure/task_runner")
+
+      module Languages
+        autoload :AssemblyScriptProjectCreator,
+          Project.project_filepath("layers/infrastructure/languages/assemblyscript_project_creator")
+        autoload :AssemblyScriptTaskRunner,
+          Project.project_filepath("layers/infrastructure/languages/assemblyscript_task_runner")
+        autoload :ProjectCreator, Project.project_filepath("layers/infrastructure/languages/project_creator")
+        autoload :RustProjectCreator,
+          Project.project_filepath("layers/infrastructure/languages/rust_project_creator.rb")
+        autoload :RustTaskRunner, Project.project_filepath("layers/infrastructure/languages/rust_task_runner")
+        autoload :TaskRunner, Project.project_filepath("layers/infrastructure/languages/task_runner")
+      end
     end
   end
 

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

@@ -1,8 +1,10 @@
 # frozen_string_literal: true
 
 module Script
-  module Commands
+  class Command
     class Create < ShopifyCli::SubCommand
+      prerequisite_task :ensure_authenticated
+
       options do |parser, flags|
         parser.on("--name=NAME") { |name| flags[:name] = name }
         parser.on("--extension_point=EP_NAME") { |ep_name| flags[:extension_point] = ep_name }

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

@@ -1,22 +1,29 @@
 # frozen_string_literal: true
 
 module Script
-  module Commands
-    class Push < ShopifyCli::Command
+  class Command
+    class Push < ShopifyCli::SubCommand
+      prerequisite_task ensure_project_type: :script
+
       options do |parser, flags|
         parser.on("--force") { |t| flags[:force] = t }
       end
 
       def call(_args, _name)
-        Tasks::EnsureEnv.call(@ctx)
+        fresh_env = Tasks::EnsureEnv.call(@ctx)
+        force = options.flags.key?(:force) || !!fresh_env
 
         api_key = Layers::Infrastructure::ScriptProjectRepository.new(ctx: @ctx).get.api_key
         return @ctx.puts(self.class.help) unless api_key
 
-        Layers::Application::PushScript.call(ctx: @ctx, force: options.flags.key?(:force))
+        Layers::Application::PushScript.call(ctx: @ctx, force: force)
         @ctx.puts(@ctx.message("script.push.script_pushed", api_key: api_key))
       rescue StandardError => e
-        msg = @ctx.message("script.push.error.operation_failed", api_key: api_key)
+        msg = if api_key
+          @ctx.message("script.push.error.operation_failed_with_api_key", api_key: api_key)
+        else
+          @ctx.message("script.push.error.operation_failed_no_api_key")
+        end
         UI::ErrorHandler.pretty_print_and_raise(e, failed_op: msg)
       end
 

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

@@ -36,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

@@ -1,19 +1,22 @@
 mutation AppScriptUpdateOrCreate(
   $extensionPointName: ExtensionPointName!,
   $title: String,
-  $configUi: String,
+  $description: String,
   $sourceCode: String,
   $language: String,
   $force: Boolean,
   $schemaMajorVersion: String,
   $schemaMinorVersion: String,
   $useMsgpack: Boolean,
-  $uuid: String
+  $uuid: String,
+  $configurationUi: Boolean,
+  $scriptJsonVersion: String,
+  $configurationDefinition: String,
 ) {
   appScriptUpdateOrCreate(
     extensionPointName: $extensionPointName
     title: $title
-    configUi: $configUi
+    description: $description
     sourceCode: $sourceCode
     language: $language
     force: $force
@@ -21,6 +24,9 @@ mutation AppScriptUpdateOrCreate(
     schemaMinorVersion: $schemaMinorVersion
     useMsgpack: $useMsgpack,
     uuid: $uuid
+    configurationUi: $configurationUi
+    scriptJsonVersion: $scriptJsonVersion
+    configurationDefinition: $configurationDefinition
 ) {
     userErrors {
       field

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

@@ -12,16 +12,17 @@ module Script
 
             in_new_directory_context(ctx, script_name) do
               extension_point = ExtensionPoints.get(type: extension_point_type)
-              project = Infrastructure::ScriptProjectRepository.new(ctx: ctx).create(
+              script_project_repo = Infrastructure::ScriptProjectRepository.new(ctx: ctx)
+              project = script_project_repo.create(
                 script_name: script_name,
                 extension_point_type: extension_point_type,
-                language: language,
-                no_config_ui: no_config_ui
+                language: language
               )
-              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)
+              script_project_repo.update_or_create_script_json(title: script_name, configuration_ui: !no_config_ui)
               project
             end
           end
@@ -29,7 +30,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