fix: update to latest dev-scripts (#323)

Co-authored-by: Cristian Dominguez <cdominguez@salesforce.com>

Author: mdonnalley

.gitignore

@@ -30,6 +30,11 @@ docs
 *.sig
 package.json.bak.
 
+
+npm-shrinkwrap.json
+oclif.manifest.json
+oclif.lock
+
 # -- CLEAN ALL
 *.tsbuildinfo
 .eslintcache
@@ -43,6 +48,5 @@ node_modules
 .DS_Store
 .idea
 
-oclif.manifest.json
+
 tsconfig.tsbuildinfo
-oclif.lock

package.json

@@ -5,25 +5,27 @@
   "author": "Salesforce",
   "bugs": "https://github.com/forcedotcom/cli/issues",
   "dependencies": {
-    "@oclif/core": "^2.15.0",
-    "@salesforce/core": "^5.3.20",
-    "@salesforce/kit": "^3.0.9",
-    "@salesforce/sf-plugins-core": "^3.1.25",
+    "@oclif/core": "^3",
+    "@salesforce/core": "^6.4.2",
+    "@salesforce/kit": "^3.0.15",
+    "@salesforce/sf-plugins-core": "^5.0.1",
+    "@salesforce/ts-types": "^2.0.9",
+    "chalk": "^4",
+    "jsforce": "^2.0.0-beta.29",
     "tslib": "^2"
   },
   "devDependencies": {
-    "@oclif/plugin-command-snapshot": "^4.0.14",
-    "@oclif/test": "^2.4.2",
-    "@salesforce/cli-plugins-testkit": "^4.4.12",
-    "@salesforce/dev-scripts": "^6.0.4",
+    "@oclif/plugin-command-snapshot": "^5",
+    "@oclif/test": "^3",
+    "@salesforce/cli-plugins-testkit": "^5",
+    "@salesforce/dev-scripts": "^8",
     "@salesforce/plugin-command-reference": "^3.0.68",
     "@salesforce/ts-sinon": "^1.4.19",
-    "@swc/cli": "^0.3.10",
-    "@swc/core": "1.3.39",
+    "@swc/cli": "^0.3.9",
+    "@swc/core": "^1.3.39",
     "eslint-plugin-sf-plugin": "^1.17.4",
-    "oclif": "^3.17.2",
-    "shx": "0.3.4",
-    "ts-node": "^10.9.1",
+    "oclif": "^4",
+    "ts-node": "^10.9.2",
     "typescript": "^4.9.5"
   },
   "engines": {
@@ -32,9 +34,10 @@
   "files": [
     "/lib",
     "/messages",
+    "/npm-shrinkwrap.json",
+    "/oclif.lock",
     "/oclif.manifest.json",
-    "/schemas",
-    "/oclif.lock"
+    "/schemas"
   ],
   "homepage": "https://github.com/salesforcecli/plugin-devops-center",
   "keywords": [
@@ -79,12 +82,12 @@
     "build": "wireit",
     "clean": "sf-clean",
     "clean-all": "sf-clean all",
-    "clean:lib": "shx rm -rf lib && shx rm -rf coverage && shx rm -rf .nyc_output && shx rm -f oclif.manifest.json",
     "compile": "wireit",
     "docs": "sf-docs",
     "format": "wireit",
+    "link-check": "wireit",
     "lint": "wireit",
-    "postpack": "shx rm -f oclif.manifest.json",
+    "postpack": "sf-clean --ignore-signing-artifacts",
     "prepack": "sf-prepack",
     "prepare": "sf-install",
     "test": "wireit",
@@ -152,7 +155,8 @@
         "test:command-reference",
         "test:deprecation-policy",
         "lint",
-        "test:json-schema"
+        "test:json-schema",
+        "link-check"
       ]
     },
     "test:only": {
@@ -198,6 +202,15 @@
         "schemas"
       ],
       "output": []
+    },
+    "link-check": {
+      "command": "node -e \"process.exit(process.env.CI ? 0 : 1)\" || linkinator \"**/*.md\" --skip \"CHANGELOG.md|node_modules|test/|confluence.internal.salesforce.com|my.salesforce.com|%s\" --markdown --retry --directory-listing --verbosity error",
+      "files": [
+        "./*.md",
+        "./!(CHANGELOG).md",
+        "messages/**/*.md"
+      ],
+      "output": []
     }
   }
 }

src/common/base/abstractAsyncOperation.ts

@@ -17,6 +17,7 @@ Messages.importMessagesDirectory(__dirname);
 const messages = Messages.loadMessages('@salesforce/plugin-devops-center', 'commonErrors');
 
 export abstract class AsyncCommand extends SfCommand<AsyncOperationResultJson> {
+  public static readonly enableJsonFlag = true;
   protected targetOrg: Org;
   private asyncOperationId: string;
   private outputService: PromoteOutputService;

src/common/base/abstractPromote.ts

@@ -4,9 +4,8 @@
  * Licensed under the BSD 3-Clause license.
  * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
  */
-import { Org } from '@salesforce/core';
 import { SfCommand } from '@salesforce/sf-plugins-core';
-import { Flags, Interfaces } from '@oclif/core';
+import { Interfaces } from '@oclif/core';
 import { HttpRequest } from 'jsforce';
 import { fetchAndValidatePipelineStage, PipelineStage, PromoteOptions, validateTestFlags } from '..';
 import { devopsCenterProjectName, requiredDoceOrgFlag, wait, verbose, concise } from '../flags/flags';
@@ -29,6 +28,7 @@ export type Flags<T extends typeof SfCommand> = Interfaces.InferredFlags<
 >;
 
 export abstract class PromoteCommand<T extends typeof SfCommand> extends AsyncCommand {
+  public static readonly enableJsonFlag = true;
   // common flags that can be inherited by any command that extends PromoteCommand
   public static baseFlags = {
     'branch-name': branchName,
@@ -56,10 +56,11 @@ export abstract class PromoteCommand<T extends typeof SfCommand> extends AsyncCo
     const { flags } = await this.parse({
       flags: this.ctor.flags,
       baseFlags: (super.ctor as typeof PromoteCommand).baseFlags,
+      enableJsonFlag: this.ctor.enableJsonFlag,
     });
     // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
     this.flags = flags as Flags<T>;
-    this.targetOrg = this.flags['devops-center-username'] as Org;
+    this.targetOrg = this.flags['devops-center-username'];
     this.setOutputService(new OutputServiceFactory().forDeployment(this.flags, this.targetOrg.getConnection()));
   }
 

src/common/base/abstractQuick.ts

@@ -5,8 +5,8 @@
  * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
  */
 import { Interfaces } from '@oclif/core';
-import { Messages, Org } from '@salesforce/core';
-import { Flags, SfCommand } from '@salesforce/sf-plugins-core';
+import { Messages } from '@salesforce/core';
+import { Flags as SfFlags, SfCommand } from '@salesforce/sf-plugins-core';
 import { HttpRequest } from 'jsforce';
 import { ApiPromoteResponse, AsyncOperationStatus, PipelineStage, PromoteOptions } from '..';
 import { REST_PROMOTE_BASE_URL } from '../constants';
@@ -30,19 +30,20 @@ Messages.importMessagesDirectory(__dirname);
 const messages = Messages.loadMessages('@salesforce/plugin-devops-center', 'project.deploy.pipeline.quick');
 
 export default abstract class QuickPromotionCommand<T extends typeof SfCommand> extends AsyncCommand {
+  public static readonly enableJsonFlag = true;
   public static baseFlags = {
     async,
     concise,
     verbose,
     wait,
     'devops-center-username': requiredDoceOrgFlag(),
-    'job-id': Flags.salesforceId({
+    'job-id': SfFlags.salesforceId({
       char: 'i',
       description: messages.getMessage('flags.job-id.description'),
       summary: messages.getMessage('flags.job-id.summary'),
       exactlyOne: ['use-most-recent', 'job-id'],
     }),
-    'use-most-recent': Flags.boolean({
+    'use-most-recent': SfFlags.boolean({
       char: 'r',
       description: messages.getMessage('flags.use-most-recent.description'),
       summary: messages.getMessage('flags.use-most-recent.summary'),
@@ -59,9 +60,10 @@ export default abstract class QuickPromotionCommand<T extends typeof SfCommand>
     const { flags } = await this.parse({
       flags: this.ctor.flags,
       baseFlags: (super.ctor as typeof QuickPromotionCommand).baseFlags,
+      enableJsonFlag: this.ctor.enableJsonFlag,
     });
     this.flags = flags as Flags<T>;
-    this.targetOrg = this.flags['devops-center-username'] as Org;
+    this.targetOrg = this.flags['devops-center-username'];
   }
 
   /**
@@ -79,7 +81,7 @@ export default abstract class QuickPromotionCommand<T extends typeof SfCommand>
     this.setOutputService(
       new OutputServiceFactory().forQuickDeployment(
         this.flags,
-        (this.flags['devops-center-username'] as Org).getConnection(),
+        this.flags['devops-center-username'].getConnection(),
         this.targetStage.sf_devops__Branch__r.sf_devops__Name__c
       )
     );

src/common/base/abstractReportOnPromote.ts

@@ -4,9 +4,9 @@
  * Licensed under the BSD 3-Clause license.
  * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
  */
-import { Messages, Org } from '@salesforce/core';
+import { Messages } from '@salesforce/core';
 import { SfCommand } from '@salesforce/sf-plugins-core';
-import { Flags, Interfaces } from '@oclif/core';
+import { Interfaces } from '@oclif/core';
 import { DeployPipelineCache } from '../../common/deployPipelineCache';
 import { PromotePipelineResult } from '../../common';
 import { requiredDoceOrgFlag } from '../../common/flags/flags';
@@ -23,6 +23,7 @@ export type Flags<T extends typeof SfCommand> = Interfaces.InferredFlags<
 >;
 
 export abstract class ReportOnPromoteCommand<T extends typeof SfCommand> extends SfCommand<PromotePipelineResult> {
+  public static readonly enableJsonFlag = true;
   public static baseFlags = {
     'devops-center-username': requiredDoceOrgFlag(),
   };
@@ -35,6 +36,7 @@ export abstract class ReportOnPromoteCommand<T extends typeof SfCommand> extends
     const { flags } = await this.parse({
       flags: this.ctor.flags,
       baseFlags: (super.ctor as typeof ReportOnPromoteCommand).baseFlags,
+      enableJsonFlag: this.ctor.enableJsonFlag,
     });
     // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
     this.flags = flags as Flags<T>;
@@ -47,7 +49,7 @@ export abstract class ReportOnPromoteCommand<T extends typeof SfCommand> extends
     const asyncJobId = this.flags['use-most-recent']
       ? (await DeployPipelineCache.create()).getLatestKeyOrThrow()
       : (this.flags['job-id'] as string);
-    const org = this.flags['devops-center-username'] as Org;
+    const org = this.flags['devops-center-username'];
 
     // query the deployment result related to the promote operation.
     const operationResult: DeploymentResult | null = await selectOneDeploymentResultByAsyncJobId(

src/common/base/abstractResume.ts

@@ -4,7 +4,7 @@
  * Licensed under the BSD 3-Clause license.
  * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
  */
-import { Messages, Org } from '@salesforce/core';
+import { Messages } from '@salesforce/core';
 import { SfCommand } from '@salesforce/sf-plugins-core';
 import { Flags, Interfaces } from '@oclif/core';
 import {
@@ -37,10 +37,11 @@ export type Flags<T extends typeof SfCommand> = Interfaces.InferredFlags<
 
 /**
  *
- * Base class with the common logic to resume an in progress opeation
+ * Base class with the common logic to resume an in progress operation
  */
 
 export abstract class ResumeCommand<T extends typeof SfCommand> extends AsyncCommand {
+  public static readonly enableJsonFlag = true;
   // common flags that can be inherited by any command that extends ResumeCommand
   public static baseFlags = {
     'devops-center-username': requiredDoceOrgFlag(),
@@ -67,7 +68,7 @@ export abstract class ResumeCommand<T extends typeof SfCommand> extends AsyncCom
       new OutputServiceFactory().forResume(
         this.flags,
         this.operationType,
-        (this.flags['devops-center-username'] as Org).getConnection()
+        this.flags['devops-center-username'].getConnection()
       )
     );
   }
@@ -78,7 +79,7 @@ export abstract class ResumeCommand<T extends typeof SfCommand> extends AsyncCom
       : (this.flags['job-id'] as string);
 
     // get the latest state of the async job and validate that it's resumable
-    this.targetOrg = this.flags['devops-center-username'] as Org;
+    this.targetOrg = this.flags['devops-center-username'];
     const asyncJob: AsyncOperationResult = await fetchAsyncOperationResult(this.targetOrg.getConnection(), asyncJobId);
     if (asyncJob.sf_devops__Status__c && isNotResumable(asyncJob.sf_devops__Status__c)) {
       throw messages.createError('error.JobNotResumable', [asyncJobId, asyncJob.sf_devops__Status__c]);

src/common/deployPipelineCache.ts

@@ -7,7 +7,6 @@
 
 import { Global, Messages, TTLConfig } from '@salesforce/core';
 import { Duration } from '@salesforce/kit';
-import { JsonMap } from '@salesforce/ts-types';
 
 Messages.importMessagesDirectory(__dirname);
 const cacheMessages = Messages.loadMessages('@salesforce/plugin-devops-center', 'cache');
@@ -63,7 +62,7 @@ export class DeployPipelineCache extends TTLConfig<TTLConfig.Options, AsyncOpera
    * Updates the aorId with the data sent
    * Merges the data sent with the existing one
    */
-  public static async update(aorId: string, data: JsonMap): Promise<void> {
+  public static async update(aorId: string, data: Partial<TTLConfig.Entry<AsyncOperationData>>): Promise<void> {
     const cache = await DeployPipelineCache.create();
     cache.update(aorId, data);
     await cache.write();

src/common/selectors/selectorUtils.ts

@@ -27,7 +27,7 @@ export async function runSafeQuery<T extends Record>(
   // Run the query and verify for results
   try {
     // We query for 10000 results and we use autoFetch to queryMore automatically.
-    const result: QueryResult<T> = await con.query(queryStr, { autoFetch: true, maxFetch: 10000 });
+    const result: QueryResult<T> = await con.query(queryStr, { autoFetch: true, maxFetch: 10_000 });
     if ((result.totalSize > 0 && result.records) || (result.totalSize === 0 && allowNullResults)) {
       return result;
     }