fix: reduce undefined in template literals (#1093)

salesforcecli · Jul 19, 2024 · f4a0384 · f4a0384
1 parent be53416
commit f4a0384
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 4 deletions.
diff --git a/src/commands/project/deploy/start.ts b/src/commands/project/deploy/start.ts
@@ -204,6 +204,8 @@ export default class DeployMetadata extends SfCommand<DeployResultJson> {
       this.log(
         messages.getMessage('apiVersionMsgDetailed', [
           action,
+          // technically manifestVersion can be undefined, but only on raw mdapi deployments.
+          // eslint-disable-next-line @typescript-eslint/restrict-template-expressions
           flags['metadata-dir'] ? '<version specified in manifest>' : `v${apiData.manifestVersion}`,
           username,
           apiData.apiVersion,

diff --git a/src/commands/project/deploy/validate.ts b/src/commands/project/deploy/validate.ts
@@ -169,6 +169,8 @@ export default class DeployMetadataValidate extends SfCommand<DeployResultJson>
       this.log(
         deployMessages.getMessage('apiVersionMsgDetailed', [
           'Validating Deployment of',
+          // technically manifestVersion can be undefined, but only on raw mdapi deployments.
+          // eslint-disable-next-line @typescript-eslint/restrict-template-expressions
           flags['metadata-dir'] ? '<version specified in manifest>' : `v${apiData.manifestVersion}`,
           username,
           apiData.apiVersion,

diff --git a/src/formatters/deleteResultFormatter.ts b/src/formatters/deleteResultFormatter.ts
@@ -69,7 +69,10 @@ export class DeleteResultFormatter extends TestResultsFormatter implements Forma
       if (deployMessages.length >= successes.length) {
         // if there's additional successes in the API response, find the success and add it to the output
         deployMessages.map((deployMessage) => {
-          if (!fileResponseSuccesses.has(`${deployMessage.componentType}#${deployMessage.fullName}`)) {
+          if (
+            deployMessage.componentType &&
+            !fileResponseSuccesses.has(`${deployMessage.componentType}#${deployMessage.fullName}`)
+          ) {
             successes.push(
               Object.assign(deployMessage, {
                 type: deployMessage.componentType,

diff --git a/src/formatters/deployResultFormatter.ts b/src/formatters/deployResultFormatter.ts
@@ -176,7 +176,7 @@ export class DeployResultFormatter extends TestResultsFormatter implements Forma
     // only generate reports if test results are presented
     if (this.coverageOptions.reportFormats?.length) {
       ux.log(
-        `Code Coverage formats, [${this.flags['coverage-formatters']?.join(', ')}], written to ${join(
+        `Code Coverage formats, [${(this.flags['coverage-formatters'] ?? []).join(', ')}], written to ${join(
           this.resultsDir,
           'coverage'
         )}/`
@@ -325,7 +325,7 @@ export class DeployResultFormatter extends TestResultsFormatter implements Forma
         problemType: f.problemType,
         fullName: f.fullName,
         error: f.error,
-        loc: f.lineNumber ? `${f.lineNumber}:${f.columnNumber}` : '',
+        loc: f.lineNumber ? `${f.lineNumber}:${f.columnNumber ?? ''}` : '',
       })),
       columns,
       options

diff --git a/src/formatters/testResultsFormatter.ts b/src/formatters/testResultsFormatter.ts
@@ -90,7 +90,7 @@ const displayVerboseTestFailures = (response: MetadataApiDeployStatus): void =>
   const failures = ensureArray(response.details.runTestResult?.failures).sort(testResultSort);
   const failureCount = response.details.runTestResult?.numFailures;
   ux.log();
-  ux.log(error(`Test Failures [${failureCount}]`));
+  ux.log(error(`Test Failures [${failureCount ?? 0}]`));
   for (const test of failures) {
     const testName = ansis.underline(`${test.name}.${test.methodName}`);
     ux.log(`• ${testName}`);

diff --git a/src/hooks/diagnostics.ts b/src/hooks/diagnostics.ts
@@ -138,6 +138,7 @@ const getMaxApiVersion = async (aggregator: ConfigAggregator, aliasOrUsername: s
 //   Comparing 55.0 with 55.0 would return false.
 //   Comparing 55.0 with 56.0 would return true.
 const diff = (version1: string | undefined, version2: string | undefined): boolean => {
+  // eslint-disable-next-line @typescript-eslint/restrict-template-expressions
   getLogger().debug(`Comparing API versions: [${version1},${version2}]`);
   return !!version1?.length && !!version2?.length && version1 !== version2;
 };