Sm/parking orbit

.circleci/config.yml

@@ -65,6 +65,7 @@ workflows:
           size: large
           requires:
             - release-management/test-package
+          no_output_timeout: 30m
           matrix:
             parameters:
               os:
@@ -75,7 +76,7 @@ workflows:
                 - 'yarn test:nuts:commands:other'
                 - 'yarn test:nuts:delete'
                 - 'yarn test:nuts:deploy'
-                - 'yarn test:nuts:deploy:async'
+                # - 'yarn test:nuts:deploy:async'
                 - 'yarn test:nuts:deploy:rest'
                 - 'yarn test:nuts:manifest:create'
                 - 'yarn test:nuts:retrieve'

bin/dev

@@ -0,0 +1,17 @@
+#!/usr/bin/env node
+
+const oclif = require('@oclif/core');
+
+const path = require('path');
+const project = path.join(__dirname, '..', 'tsconfig.json');
+
+// In dev mode -> use ts-node and dev plugins
+process.env.NODE_ENV = 'development';
+
+require('ts-node').register({ project });
+
+// In dev mode, always show stack traces
+oclif.settings.debug = true;
+
+// Start the CLI
+oclif.run().then(oclif.flush).catch(oclif.Errors.handle);

bin/dev.cmd

@@ -0,0 +1,4 @@
+@@ -0,0 +1,3 @@
+@echo off
+
+node "%~dp0\dev" %*

bin/run

@@ -1,4 +1,4 @@
 #!/usr/bin/env node
 
-require('@oclif/command').run()
-.catch(require('@oclif/errors/handle'))
+require('@oclif/core').run().then(require('@oclif/core/flush')).catch(require('@oclif/core/handle'));
+

command-snapshot.json

@@ -5,6 +5,95 @@
     "flags": ["json", "loglevel"],
     "alias": []
   },
+  {
+    "command": "force:mdapi:beta:convert",
+    "plugin": "@salesforce/plugin-source",
+    "flags": ["json", "loglevel", "manifest", "metadata", "metadatapath", "outputdir", "rootdir"],
+    "alias": ["force:mdapi:beta:convert"]
+  },
+  {
+    "command": "force:mdapi:beta:deploy",
+    "plugin": "@salesforce/plugin-source",
+    "flags": [
+      "apiversion",
+      "checkonly",
+      "concise",
+      "coverageformatters",
+      "deploydir",
+      "ignoreerrors",
+      "ignorewarnings",
+      "json",
+      "junit",
+      "loglevel",
+      "purgeondelete",
+      "resultsdir",
+      "runtests",
+      "singlepackage",
+      "soapdeploy",
+      "targetusername",
+      "testlevel",
+      "validateddeployrequestid",
+      "verbose",
+      "wait",
+      "zipfile"
+    ],
+    "alias": ["force:mdapi:beta:deploy"]
+  },
+  {
+    "command": "force:mdapi:beta:deploy:report",
+    "plugin": "@salesforce/plugin-source",
+    "flags": [
+      "apiversion",
+      "concise",
+      "coverageformatters",
+      "jobid",
+      "json",
+      "junit",
+      "loglevel",
+      "resultsdir",
+      "targetusername",
+      "verbose",
+      "wait"
+    ],
+    "alias": ["force:mdapi:beta:deploy:report"]
+  },
+  {
+    "command": "force:mdapi:beta:retrieve",
+    "plugin": "@salesforce/plugin-source",
+    "flags": [
+      "apiversion",
+      "json",
+      "loglevel",
+      "packagenames",
+      "retrievetargetdir",
+      "singlepackage",
+      "sourcedir",
+      "targetusername",
+      "unpackaged",
+      "unzip",
+      "verbose",
+      "wait",
+      "zipfilename"
+    ],
+    "alias": ["force:mdapi:beta:retrieve"]
+  },
+  {
+    "command": "force:mdapi:beta:retrieve:report",
+    "plugin": "@salesforce/plugin-source",
+    "flags": [
+      "apiversion",
+      "jobid",
+      "json",
+      "loglevel",
+      "retrievetargetdir",
+      "targetusername",
+      "unzip",
+      "verbose",
+      "wait",
+      "zipfilename"
+    ],
+    "alias": ["force:mdapi:beta:retrieve:report"]
+  },
   {
     "command": "force:mdapi:convert",
     "plugin": "@salesforce/plugin-source",
@@ -112,6 +201,36 @@
     ],
     "alias": ["force:mdapi:beta:retrieve:report"]
   },
+  {
+    "command": "force:source:beta:pull",
+    "plugin": "@salesforce/plugin-source",
+    "flags": ["apiversion", "forceoverwrite", "json", "loglevel", "targetusername", "wait"],
+    "alias": ["force:source:beta:pull"]
+  },
+  {
+    "command": "force:source:beta:push",
+    "plugin": "@salesforce/plugin-source",
+    "flags": ["apiversion", "forceoverwrite", "ignorewarnings", "json", "loglevel", "quiet", "targetusername", "wait"],
+    "alias": ["force:source:beta:push"]
+  },
+  {
+    "command": "force:source:beta:status",
+    "plugin": "@salesforce/plugin-source",
+    "flags": ["apiversion", "concise", "json", "local", "loglevel", "remote", "targetusername"],
+    "alias": ["force:source:beta:status"]
+  },
+  {
+    "command": "force:source:beta:tracking:clear",
+    "plugin": "@salesforce/plugin-source",
+    "flags": ["apiversion", "json", "loglevel", "noprompt", "targetusername"],
+    "alias": ["force:source:beta:tracking:clear"]
+  },
+  {
+    "command": "force:source:beta:tracking:reset",
+    "plugin": "@salesforce/plugin-source",
+    "flags": ["apiversion", "json", "loglevel", "noprompt", "revision", "targetusername"],
+    "alias": ["force:source:beta:tracking:reset"]
+  },
   {
     "command": "force:source:convert",
     "plugin": "@salesforce/plugin-source",

messages/delete.json

@@ -42,5 +42,6 @@
   "localPrompt": "This operation will delete the following files on your computer and in your org: \n%s",
   "remotePrompt": "This operation will delete the following metadata in your org: \n%s",
   "deployPrompt": "This operation will deploy the following: \n%s",
-  "areYouSure": "\n\nAre you sure you want to proceed (y/n)?"
+  "areYouSure": "\n\nAre you sure you want to proceed (y/n)?",
+  "areYouSureCheckOnly": "\n\nAre you sure you want to proceed (this is only a check and won't actually delete anything) (y/n)?"
 }

messages/deploy.json

@@ -81,7 +81,8 @@
     ]
   },
   "checkOnlySuccess": "Successfully validated the deployment. %s components deployed and %s tests run.\nUse the --verbose parameter to see detailed output.",
-  "MissingDeployId": "No deploy ID was provided or found in deploy history.",
+  "checkOnlySuccessVerbose": "Successfully validated the deployment.",
+  "deploySuccess": "Deploy Succeeded.",
   "deployCanceled": "The deployment has been canceled by %s.",
   "deployFailed": "Deploy failed.",
   "asyncDeployQueued": "Deploy has been queued.",

messages/deployCommand.json

@@ -1,3 +1,5 @@
 {
-  "resultsDirMissing": "You must supply the --resultsdir parameter when choosing to produce code coverage or JUnit reports."
+  "resultsDirMissing": "You must supply the --resultsdir parameter when choosing to produce code coverage or JUnit reports.",
+  "MissingDeployId": "No deploy ID was provided or found in deploy history.",
+  "invalidDeployId": "The provided ID is invalid, deploy IDs must start with '0Af'."
 }

messages/md.cancel.json

@@ -6,7 +6,6 @@
     "waitLong": "Number of minutes to wait for the command to complete and display results to the terminal window. If the command continues to run after the wait period, the CLI returns control of the terminal window to you. The default is 33 minutes.",
     "jobid": "job ID of the deployment you want to cancel; defaults to your most recent CLI deployment if not specified"
   },
-
   "examples": [
     "Deploy a directory of files to the org",
     "  $ sfdx force:mdapi:deploy -d <directory>",
@@ -16,5 +15,6 @@
     "  $ sfdx force:mdapi:deploy:cancel -i <jobid>",
     "Check the status of the cancel job",
     "  $ sfdx force:mdapi:deploy:report"
-  ]
+  ],
+  "CancelFailed": "The cancel command failed due to: %s"
 }

messages/report.json

@@ -5,7 +5,6 @@
     " $ sfdx force:source:deploy -d <directory>",
     "Now cancel this deployment and wait two minutes",
     " $ sfdx force:source:deploy:cancel -w 2",
-
     "If you have multiple deployments in progress and want to cancel a specific one, specify the job ID",
     " $ sfdx force:source:deploy:cancel -i <jobid>",
     "Check the status of the cancel job",

messages/retrieve.json

@@ -50,6 +50,7 @@
   "columnNumberColumn": "COLUMN NUMBER",
   "lineNumberColumn": "LINE NUMBER",
   "errorColumn": "PROBLEM",
+  "nothingToRetrieve": "Specify a source path, manifest, metadata, or package names to retrieve.",
   "wantsToRetrieveCustomFields": "Because you're retrieving one or more CustomFields, we're also retrieving the CustomObject to which it's associated.",
   "retrieveWontDelete": "You currently have files deleted in your org.  The retrieve command will NOT delete them from your local project"
 }

messages/status.json

@@ -4,8 +4,8 @@
   "examples": [
     "$ sfdx force:source:status -l",
     "$ sfdx force:source:status -r",
-    "$ sfdx force:source:status -a",
-    "$ sfdx force:source:status -a -u me@example.com --json"
+    "$ sfdx force:source:status",
+    "$ sfdx force:source:status -u me@example.com --json"
   ],
   "flags": {
     "all": "list all the changes that have been made",

package.json

@@ -1,41 +1,40 @@
 {
   "name": "@salesforce/plugin-source",
   "description": "Commands to interact with source formatted metadata",
-  "version": "1.10.2",
+  "version": "2.0.0",
   "author": "Salesforce",
   "main": "lib/index.js",
   "bugs": "https://github.com/forcedotcom/cli/issues",
   "dependencies": {
-    "@oclif/config": "^1.18.3",
+    "@oclif/core": "^1.9.0",
     "@oclif/plugin-help": "^3.3.1",
     "@salesforce/apex-node": "^0.13.0",
-    "@salesforce/command": "^4.2.2",
-    "@salesforce/core": "^2.35.0",
-    "@salesforce/source-deploy-retrieve": "^5.12.14",
-    "@salesforce/source-tracking": "^1.4.2",
+    "@salesforce/command": "^5.1.2",
+    "@salesforce/core": "^3.20.1",
+    "@salesforce/kit": "^1.5.41",
+    "@salesforce/source-deploy-retrieve": "^6.0.3",
+    "@salesforce/source-tracking": "^2.0.0",
     "chalk": "^4.1.2",
-    "cli-ux": "^5.6.3",
     "got": "^11.8.3",
+    "jsforce": "2.0.0-beta.10",
     "open": "^8.4.0",
     "proxy-agent": "^5.0.0",
     "proxy-from-env": "^1.1.0",
     "tslib": "^2"
   },
   "devDependencies": {
-    "@oclif/dev-cli": "^1",
     "@oclif/plugin-command-snapshot": "^3.1.2",
-    "@salesforce/cli-plugins-testkit": "^1.5.28",
+    "@salesforce/cli-plugins-testkit": "^2.2.0",
     "@salesforce/dev-config": "^3.0.1",
     "@salesforce/dev-scripts": "^2.0.0",
     "@salesforce/plugin-command-reference": "^1.3.18",
-    "@salesforce/plugin-config": "^1.3.30",
-    "@salesforce/plugin-user": "^1.7.1",
+    "@salesforce/plugin-config": "^2.3.2",
+    "@salesforce/plugin-user": "^2.0.2",
     "@salesforce/prettier-config": "^0.0.2",
-    "@salesforce/source-testkit": "^0.0.16",
+    "@salesforce/source-testkit": "^1.2.0",
     "@salesforce/ts-sinon": "1.3.21",
     "@types/archiver": "^5.1.1",
     "@types/debug": "^4.1.7",
-    "@types/jsforce": "^1.9.39",
     "@types/proxy-from-env": "^1.0.1",
     "@types/shelljs": "^0.8.11",
     "@typescript-eslint/eslint-plugin": "^4.33.0",
@@ -57,9 +56,9 @@
     "eslint-plugin-prettier": "^4.0.0",
     "fast-glob": "^3.2.7",
     "husky": "^7.0.4",
-    "lint-staged": "^12.3.2",
     "mocha": "^9.1.3",
     "nyc": "^15.1.0",
+    "oclif": "^3.0.1",
     "prettier": "^2.5.1",
     "pretty-quick": "^3.1.3",
     "salesforcedx-templates": "^49.8.0",
@@ -151,8 +150,8 @@
     "prepare": "sf-install",
     "pretest": "sf-compile-test",
     "test": "sf-test",
-    "test:command-reference": "./bin/run commandreference:generate --erroronwarnings",
-    "test:deprecation-policy": "./bin/run snapshot:compare",
+    "test:command-reference": "./bin/dev commandreference:generate --erroronwarnings",
+    "test:deprecation-policy": "./bin/dev snapshot:compare",
     "test:nuts": "ts-node ./test/nuts/generateNuts.ts && nyc mocha \"**/*.nut.ts\"  --slow 4500 --timeout 600000 --parallel --retries 0",
     "test:nuts:commands:other": "mocha \"test/nuts/open.nut.ts\" \"test/nuts/ignored_list.nut.ts\" --slow 4500 --timeout 600000 --retries 0 --parallel",
     "test:nuts:convert": "cross-env PLUGIN_SOURCE_SEED_FILTER=convert ts-node ./test/nuts/generateNuts.ts && mocha \"test/nuts/generated/*.nut.ts\" --slow 4500 --timeout 600000 --parallel --retries 0",
@@ -166,25 +165,25 @@
     "test:nuts:deploy:rest": "mocha \"test/nuts/REST/*.nut.ts\" --slow 3000 --timeout 600000 --retries 0 --parallel",
     "test:nuts:deploy:sourcepath": "cross-env PLUGIN_SOURCE_SEED_FILTER=deploy.sourcepath ts-node ./test/nuts/generateNuts.ts && mocha \"test/nuts/generated/*.nut.ts\" --slow 4500 --timeout 600000 --parallel --retries 0",
     "test:nuts:deploy:testlevel": "cross-env PLUGIN_SOURCE_SEED_FILTER=deploy.testlevel ts-node ./test/nuts/generateNuts.ts && mocha \"test/nuts/generated/*.nut.ts\" --slow 4500 --timeout 600000 --parallel --retries 0",
-    "test:nuts:folders": "mocha \"test/nuts/folderTypes.nut.ts\" --slow 4500 --timeout 600000",
     "test:nuts:manifest:create": "mocha \"test/nuts/create.nut.ts\" --slow 4500 --timeout 600000 --retries 0",
     "test:nuts:mdapi": "mocha \"test/nuts/mdapi.nut.ts\" --slow 3000 --timeout 600000 --retries 0",
-    "test:nuts:nestedLwc": "mocha \"test/nuts/nestedLwc.nut.ts\" --slow 3000 --timeout 600000 --retries 0",
     "test:nuts:retrieve": "cross-env PLUGIN_SOURCE_SEED_FILTER=retrieve ts-node ./test/nuts/generateNuts.ts && mocha \"test/nuts/generated/*.nut.ts\" --slow 4500 --timeout 600000 --parallel --retries 0",
     "test:nuts:specialTypes": "mocha \"test/nuts/territory2.nut.ts\" \"test/nuts/folderTypes.nut.ts\" \"test/nuts/translation.nut.ts\" \"test/nuts/nestedLwc.nut.ts\" --slow 4500 --timeout 600000 --retries 0 --parallel",
-    "test:nuts:territory2": "mocha \"test/nuts/territory2.nut.ts\" --slow 4500 --timeout 600000 --retries 0",
+    "test:nuts:specialTypes:folders": "mocha \"test/nuts/folderTypes.nut.ts\" --slow 4500 --timeout 600000",
+    "test:nuts:specialTypes:nestedLwc": "mocha \"test/nuts/nestedLwc.nut.ts\" --slow 3000 --timeout 600000 --retries 0",
+    "test:nuts:specialTypes:territory2": "mocha \"test/nuts/territory2.nut.ts\" --slow 4500 --timeout 600000 --retries 0",
+    "test:nuts:specialTypes:translations": "mocha \"test/nuts/translation.nut.ts\" --slow 4500 --timeout 600000 --retries 0",
     "test:nuts:tracking": "mocha \"test/nuts/trackingCommands/*.nut.ts\" --slow 3000 --timeout 600000 --parallel --retries 0",
     "test:nuts:tracking:basics": "mocha \"test/nuts/trackingCommands/basics.nut.ts\" --slow 3000 --timeout 600000 --retries 0",
     "test:nuts:tracking:conflicts": "mocha \"test/nuts/trackingCommands/conflicts.nut.ts\" --slow 3000 --timeout 600000 --retries 0",
     "test:nuts:tracking:flag": "mocha \"test/nuts/trackingCommands/deployRetrieveDelete.nut.ts\" --slow 3000 --timeout 600000 --retries 0",
     "test:nuts:tracking:forceignore": "mocha \"test/nuts/trackingCommands/forceIgnore.nut.ts\" --slow 3000 --timeout 600000 --retries 0",
     "test:nuts:tracking:lwc": "mocha \"test/nuts/trackingCommands/lwc.nut.ts\" --slow 3000 --timeout 600000 --retries 0",
-    "test:nuts:tracking:mpd": "mocha \"test/nuts/trackingCommands/mpd*\" --slow 3000 --timeout 600000 --retries 0",
+    "test:nuts:tracking:mpd": "mocha \"test/nuts/trackingCommands/mpd*\" --slow 3000 --timeout 600000 --retries 0 -parallel",
     "test:nuts:tracking:remote": "mocha \"test/nuts/trackingCommands/remoteChanges.nut.ts\" --slow 3000 --timeout 600000 --retries 0",
     "test:nuts:tracking:resetClear": "mocha \"test/nuts/trackingCommands/resetClear.nut.ts\" --slow 3000 --timeout 600000 --retries 0",
-    "test:nuts:translations": "mocha \"test/nuts/translation.nut.ts\" --slow 4500 --timeout 600000 --retries 0",
     "test:watch": "mocha --watch \"./test/**/*.test.ts\"",
-    "version": "oclif-dev readme"
+    "version": "oclif readme"
   },
   "publishConfig": {
     "access": "public"

src/commands/force.ts

@@ -10,7 +10,7 @@
 
 import { SfdxCommand } from '@salesforce/command';
 import got from 'got';
-import { Help } from '@oclif/plugin-help';
+import { Help } from '@oclif/core';
 import * as ProxyAgent from 'proxy-agent';
 import { getProxyForUrl } from 'proxy-from-env';
 import { ConfigAggregator } from '@salesforce/core';
@@ -80,10 +80,10 @@ export class ForceCommand extends SfdxCommand {
   }
 
   // overrides the help so that it shows the help for the `force` topic and not "help" for this command
-  protected _help(): never {
+  protected _help(): void {
     const help = new Help(this.config);
     // We need to include force in the args for topics to be shown
-    help.showHelp(process.argv.slice(2));
+    void help.showHelp(process.argv.slice(2));
     return this.exit(0);
   }
 }

src/commands/force/mdapi/deploy.ts

@@ -173,10 +173,10 @@ export class Deploy extends DeployCommand {
 
   protected formatResult(): MdDeployResult | DeployCommandAsyncResult {
     this.resultsDir = this.resolveOutputDir(
-      this.flags.coverageformatters,
-      this.flags.junit,
-      this.flags.resultsdir,
-      this.deployResult?.response.id,
+      this.getFlag<string[]>('coverageformatters', undefined),
+      this.getFlag<boolean>('junit'),
+      this.getFlag<string>('resultsdir'),
+      this.deployResult?.response?.id,
       true
     );