@salesforce/source-deploy-retrieve 5.0.0-orb.2 → 5.0.2

package/lib/src/client/deployStrategies/index.js

@@ -1,17 +1,17 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getDeployStrategy = void 0;
+exports.getDeployStrategy = exports.LwcDeploy = exports.AuraDeploy = exports.ContainerDeploy = void 0;
+const registry_1 = require("../../registry");
 const containerDeploy_1 = require("./containerDeploy");
 const auraDeploy_1 = require("./auraDeploy");
 const lwcDeploy_1 = require("./lwcDeploy");
-const registry_1 = require("../../registry");
 var containerDeploy_2 = require("./containerDeploy");
 Object.defineProperty(exports, "ContainerDeploy", { enumerable: true, get: function () { return containerDeploy_2.ContainerDeploy; } });
 var auraDeploy_2 = require("./auraDeploy");
 Object.defineProperty(exports, "AuraDeploy", { enumerable: true, get: function () { return auraDeploy_2.AuraDeploy; } });
 var lwcDeploy_2 = require("./lwcDeploy");
 Object.defineProperty(exports, "LwcDeploy", { enumerable: true, get: function () { return lwcDeploy_2.LwcDeploy; } });
-exports.getDeployStrategy = (type, connection) => {
+const getDeployStrategy = (type, connection) => {
     switch (type) {
         case registry_1.registry.types.auradefinitionbundle.name:
             return new auraDeploy_1.AuraDeploy(connection);
@@ -21,4 +21,5 @@ exports.getDeployStrategy = (type, connection) => {
             return new containerDeploy_1.ContainerDeploy(connection);
     }
 };
+exports.getDeployStrategy = getDeployStrategy;
 //# sourceMappingURL=index.js.map

package/lib/src/client/deployStrategies/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/client/deployStrategies/index.ts"],"names":[],"mappings":";;;AAQA,uDAAoD;AACpD,6CAA0C;AAC1C,2CAAwC;AACxC,6CAA0C;AAE1C,qDAAoD;AAA3C,kHAAA,eAAe,OAAA;AACxB,2CAA0C;AAAjC,wGAAA,UAAU,OAAA;AACnB,yCAAwC;AAA/B,sGAAA,SAAS,OAAA;AAEL,QAAA,iBAAiB,GAAG,CAAC,IAAY,EAAE,UAAsB,EAAc,EAAE;IACpF,QAAQ,IAAI,EAAE;QACZ,KAAK,mBAAQ,CAAC,KAAK,CAAC,oBAAoB,CAAC,IAAI;YAC3C,OAAO,IAAI,uBAAU,CAAC,UAAU,CAAC,CAAC;QACpC,KAAK,mBAAQ,CAAC,KAAK,CAAC,wBAAwB,CAAC,IAAI;YAC/C,OAAO,IAAI,qBAAS,CAAC,UAAU,CAAC,CAAC;QACnC;YACE,OAAO,IAAI,iCAAe,CAAC,UAAU,CAAC,CAAC;KAC1C;AACH,CAAC,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/client/deployStrategies/index.ts"],"names":[],"mappings":";;;AAOA,6CAA0C;AAE1C,uDAAoD;AACpD,6CAA0C;AAC1C,2CAAwC;AAExC,qDAAoD;AAA3C,kHAAA,eAAe,OAAA;AACxB,2CAA0C;AAAjC,wGAAA,UAAU,OAAA;AACnB,yCAAwC;AAA/B,sGAAA,SAAS,OAAA;AAEX,MAAM,iBAAiB,GAAG,CAAC,IAAY,EAAE,UAAsB,EAAc,EAAE;IACpF,QAAQ,IAAI,EAAE;QACZ,KAAK,mBAAQ,CAAC,KAAK,CAAC,oBAAoB,CAAC,IAAI;YAC3C,OAAO,IAAI,uBAAU,CAAC,UAAU,CAAC,CAAC;QACpC,KAAK,mBAAQ,CAAC,KAAK,CAAC,wBAAwB,CAAC,IAAI;YAC/C,OAAO,IAAI,qBAAS,CAAC,UAAU,CAAC,CAAC;QACnC;YACE,OAAO,IAAI,iCAAe,CAAC,UAAU,CAAC,CAAC;KAC1C;AACH,CAAC,CAAC;AATW,QAAA,iBAAiB,qBAS5B"}

package/lib/src/client/deployStrategies/lwcDeploy.d.ts

@@ -1,6 +1,6 @@
-import { BaseDeploy } from './baseDeploy';
 import { SourceComponent } from '../..';
-import { SourceDeployResult, ComponentDeployment, LightningComponentResource } from '../types';
+import { ComponentDeployment, LightningComponentResource, SourceDeployResult } from '../types';
+import { BaseDeploy } from './baseDeploy';
 export declare class LwcDeploy extends BaseDeploy {
     deploy(component: SourceComponent, namespace: string): Promise<SourceDeployResult>;
     buildResourceList(): Promise<LightningComponentResource[]>;

package/lib/src/client/deployStrategies/lwcDeploy.js

@@ -5,131 +5,120 @@
  * 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
  */
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.LwcDeploy = void 0;
-const baseDeploy_1 = require("./baseDeploy");
+const path_1 = require("path");
+const graceful_fs_1 = require("graceful-fs");
 const types_1 = require("../types");
-const fs_1 = require("fs");
 const utils_1 = require("../../utils");
-const path_1 = require("path");
 const toolingApi_1 = require("../toolingApi");
 const diagnosticUtil_1 = require("../diagnosticUtil");
+const baseDeploy_1 = require("./baseDeploy");
 class LwcDeploy extends baseDeploy_1.BaseDeploy {
-    deploy(component, namespace) {
-        return __awaiter(this, void 0, void 0, function* () {
-            this.component = component;
-            this.namespace = namespace;
-            const lwcResources = yield this.buildResourceList();
-            const componentDeployment = yield this.upsert(lwcResources);
-            let status = "Completed" /* Completed */;
-            if (componentDeployment.diagnostics.length > 0) {
-                status =
-                    componentDeployment.status !== types_1.ComponentStatus.Failed
-                        ? "CompletedPartial" /* CompletedPartial */
-                        : "Failed" /* Failed */;
+    async deploy(component, namespace) {
+        this.component = component;
+        this.namespace = namespace;
+        const lwcResources = await this.buildResourceList();
+        const componentDeployment = await this.upsert(lwcResources);
+        let status = "Completed" /* Completed */;
+        if (componentDeployment.diagnostics.length > 0) {
+            status =
+                componentDeployment.status !== types_1.ComponentStatus.Failed
+                    ? "CompletedPartial" /* CompletedPartial */
+                    : "Failed" /* Failed */;
+        }
+        return {
+            id: undefined,
+            status,
+            success: status === "Completed" /* Completed */,
+            components: [componentDeployment],
+        };
+    }
+    async buildResourceList() {
+        const sourceFiles = this.component.walkContent();
+        sourceFiles.push(this.component.xml);
+        const lightningResources = [];
+        const existingResources = await this.findLightningResources();
+        const lightningBundle = existingResources[0]
+            ? await this.upsertBundle(existingResources[0].LightningComponentBundleId)
+            : await this.upsertBundle();
+        const bundleId = lightningBundle.id;
+        sourceFiles.forEach((sourceFile) => {
+            const source = (0, graceful_fs_1.readFileSync)(sourceFile, 'utf8');
+            const isMetaSource = sourceFile === this.component.xml;
+            const format = isMetaSource ? 'js' : (0, utils_1.extName)(sourceFile);
+            let match;
+            if (existingResources.length > 0) {
+                match = existingResources.find((resource) => sourceFile.endsWith((0, path_1.normalize)(resource.FilePath)));
             }
-            return {
-                id: undefined,
-                status,
-                success: status === "Completed" /* Completed */,
-                components: [componentDeployment],
+            // If resource exists in org, assign the matching Id
+            // else, assign the id of the bundle it's associated with
+            const lightningResource = {
+                FilePath: sourceFile,
+                Source: source,
+                Format: format,
+                ...(match ? { Id: match.Id } : { LightningComponentBundleId: bundleId }),
             };
+            // This is to ensure that the base file is deployed first for lwc
+            // otherwise there is a `no base file found` error
+            // eslint-disable-next-line no-unused-expressions
+            lightningResource.Format === 'js' && !isMetaSource
+                ? lightningResources.unshift(lightningResource)
+                : lightningResources.push(lightningResource);
         });
+        return lightningResources;
     }
-    buildResourceList() {
-        return __awaiter(this, void 0, void 0, function* () {
-            const sourceFiles = this.component.walkContent();
-            sourceFiles.push(this.component.xml);
-            const lightningResources = [];
-            const existingResources = yield this.findLightningResources();
-            const lightningBundle = existingResources[0]
-                ? yield this.upsertBundle(existingResources[0].LightningComponentBundleId)
-                : yield this.upsertBundle();
-            const bundleId = lightningBundle.id;
-            sourceFiles.forEach((sourceFile) => __awaiter(this, void 0, void 0, function* () {
-                const source = fs_1.readFileSync(sourceFile, 'utf8');
-                const isMetaSource = sourceFile === this.component.xml;
-                const format = isMetaSource ? 'js' : utils_1.extName(sourceFile);
-                let match;
-                if (existingResources.length > 0) {
-                    match = existingResources.find((resource) => sourceFile.endsWith(path_1.normalize(resource.FilePath)));
+    async upsert(lightningResources) {
+        const type = this.component.type.name;
+        const deployment = {
+            status: types_1.ComponentStatus.Unchanged,
+            component: this.component,
+            diagnostics: [],
+        };
+        const diagnosticUtil = new diagnosticUtil_1.DiagnosticUtil('tooling');
+        let partialSuccess = false;
+        let allCreate = true;
+        // first resource needs to be created first, so force sync
+        for (const resource of lightningResources) {
+            try {
+                if (resource.Id) {
+                    const formattedDef = {
+                        Source: resource.Source,
+                        Id: resource.Id,
+                    };
+                    await this.connection.tooling.update(toolingApi_1.deployTypes.get(type), formattedDef);
+                    allCreate = false;
+                    partialSuccess = true;
                 }
-                // If resource exists in org, assign the matching Id
-                // else, assign the id of the bundle it's associated with
-                const lightningResource = Object.assign({ FilePath: sourceFile, Source: source, Format: format }, (match ? { Id: match.Id } : { LightningComponentBundleId: bundleId }));
-                // This is to ensure that the base file is deployed first for lwc
-                // otherwise there is a `no base file found` error
-                lightningResource.Format === 'js' && !isMetaSource
-                    ? lightningResources.unshift(lightningResource)
-                    : lightningResources.push(lightningResource);
-            }));
-            return lightningResources;
-        });
-    }
-    upsert(lightningResources) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const type = this.component.type.name;
-            const deployment = {
-                status: types_1.ComponentStatus.Unchanged,
-                component: this.component,
-                diagnostics: [],
-            };
-            const diagnosticUtil = new diagnosticUtil_1.DiagnosticUtil('tooling');
-            let partialSuccess = false;
-            let allCreate = true;
-            // first resource needs to be created first, so force sync
-            for (const resource of lightningResources) {
-                try {
-                    if (resource.Id) {
-                        const formattedDef = {
-                            Source: resource.Source,
-                            Id: resource.Id,
-                        };
-                        yield this.connection.tooling.update(toolingApi_1.deployTypes.get(type), formattedDef);
-                        allCreate = false;
-                        partialSuccess = true;
-                    }
-                    else {
-                        const formattedDef = {
-                            LightningComponentBundleId: resource.LightningComponentBundleId,
-                            Format: resource.Format,
-                            Source: resource.Source,
-                            FilePath: this.getFormattedPaths(resource.FilePath)[0],
-                        };
-                        yield this.toolingCreate(toolingApi_1.deployTypes.get(type), formattedDef);
-                    }
-                }
-                catch (e) {
-                    const diagnostic = diagnosticUtil.parseDeployDiagnostic(this.component, e.message);
-                    deployment.diagnostics.push(diagnostic);
+                else {
+                    const formattedDef = {
+                        LightningComponentBundleId: resource.LightningComponentBundleId,
+                        Format: resource.Format,
+                        Source: resource.Source,
+                        FilePath: this.getFormattedPaths(resource.FilePath)[0],
+                    };
+                    await this.toolingCreate(toolingApi_1.deployTypes.get(type), formattedDef);
                 }
             }
-            if (deployment.diagnostics.length > 0) {
-                deployment.status = partialSuccess ? types_1.ComponentStatus.Changed : types_1.ComponentStatus.Failed;
-            }
-            else if (allCreate) {
-                deployment.status = types_1.ComponentStatus.Created;
+            catch (e) {
+                const diagnostic = diagnosticUtil.parseDeployDiagnostic(this.component, e.message);
+                deployment.diagnostics.push(diagnostic);
             }
-            else {
-                deployment.status = types_1.ComponentStatus.Changed;
-            }
-            return deployment;
-        });
+        }
+        if (deployment.diagnostics.length > 0) {
+            deployment.status = partialSuccess ? types_1.ComponentStatus.Changed : types_1.ComponentStatus.Failed;
+        }
+        else if (allCreate) {
+            deployment.status = types_1.ComponentStatus.Created;
+        }
+        else {
+            deployment.status = types_1.ComponentStatus.Changed;
+        }
+        return deployment;
     }
-    findLightningResources() {
-        return __awaiter(this, void 0, void 0, function* () {
-            const lightningResourceResult = yield this.connection.tooling.query(`Select LightningComponentBundleId, Id, Format, Source, FilePath from LightningComponentResource where LightningComponentBundle.DeveloperName = '${this.component.fullName}' and LightningComponentBundle.NamespacePrefix = '${this.namespace}'`);
-            return lightningResourceResult.records;
-        });
+    async findLightningResources() {
+        const lightningResourceResult = await this.connection.tooling.query(`Select LightningComponentBundleId, Id, Format, Source, FilePath from LightningComponentResource where LightningComponentBundle.DeveloperName = '${this.component.fullName}' and LightningComponentBundle.NamespacePrefix = '${this.namespace}'`);
+        return lightningResourceResult.records;
     }
 }
 exports.LwcDeploy = LwcDeploy;

package/lib/src/client/deployStrategies/lwcDeploy.js.map

@@ -1 +1 @@
-{"version":3,"file":"lwcDeploy.js","sourceRoot":"","sources":["../../../../src/client/deployStrategies/lwcDeploy.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"lwcDeploy.js","sourceRoot":"","sources":["../../../../src/client/deployStrategies/lwcDeploy.ts"],"names":[],"mappings":"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"}

package/lib/src/client/diagnosticUtil.d.ts

@@ -1,5 +1,5 @@
 import { SourceComponent } from '../resolve';
-import { DeployMessage, ComponentDiagnostic } from './types';
+import { ComponentDiagnostic, DeployMessage } from './types';
 export declare class DiagnosticUtil {
     private api;
     constructor(api: 'metadata' | 'tooling');

package/lib/src/client/diagnosticUtil.js

@@ -1,6 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DiagnosticUtil = void 0;
+/*
+ * Copyright (c) 2020, salesforce.com, inc.
+ * All rights reserved.
+ * 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
+ */
 const path_1 = require("path");
 const registry_1 = require("../registry");
 class DiagnosticUtil {
@@ -27,9 +33,7 @@ class DiagnosticUtil {
             problemType,
         };
         if (fileName) {
-            const localProblemFile = component
-                .walkContent()
-                .find((f) => f.endsWith(path_1.basename(message.fileName)));
+            const localProblemFile = component.walkContent().find((f) => f.endsWith((0, path_1.basename)(message.fileName)));
             diagnostic.filePath = localProblemFile !== null && localProblemFile !== void 0 ? localProblemFile : component.xml;
         }
         if (lineNumber && columnNumber) {
@@ -48,11 +52,9 @@ class DiagnosticUtil {
         if (this.api === 'metadata') {
             const deployMessage = message;
             if (deployMessage.fileName) {
-                diagnostic.filePath = component
-                    .walkContent()
-                    .find((f) => f.includes(message.fileName));
+                diagnostic.filePath = component.walkContent().find((f) => f.includes(message.fileName));
             }
-            const matches = problem.match(/(\[Line: (\d+), Col: (\d+)] )?(.*)/);
+            const matches = new RegExp(/(\[Line: (\d+), Col: (\d+)] )?(.*)/).exec(problem);
             if (matches && matches[2] && matches[3] && matches[4]) {
                 diagnostic.lineNumber = Number(matches[2]);
                 diagnostic.columnNumber = Number(matches[3]);
@@ -102,14 +104,12 @@ class DiagnosticUtil {
         else {
             const deployMessage = message;
             if (deployMessage.fileName) {
-                filePath = component
-                    .walkContent()
-                    .find((f) => f.endsWith(path_1.basename(deployMessage.fileName)));
+                filePath = component.walkContent().find((f) => f.endsWith((0, path_1.basename)(deployMessage.fileName)));
             }
         }
         if (filePath) {
             diagnostic.filePath = filePath;
-            const matches = problem.match(/(\d+),\s?(\d+)/);
+            const matches = new RegExp(/(\d+),\s?(\d+)/).exec(problem);
             if (matches) {
                 const lineNumber = Number(matches[1]);
                 const columnNumber = Number(matches[2]);

package/lib/src/client/diagnosticUtil.js.map

@@ -1 +1 @@
-{"version":3,"file":"diagnosticUtil.js","sourceRoot":"","sources":["../../../src/client/diagnosticUtil.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"diagnosticUtil.js","sourceRoot":"","sources":["../../../src/client/diagnosticUtil.ts"],"names":[],"mappings":"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"}

package/lib/src/client/index.d.ts

@@ -1,4 +1,4 @@
 export { MetadataApiDeploy, MetadataApiDeployOptions, DeployResult } from './metadataApiDeploy';
-export { MetadataApiRetrieve, MetadataApiRetrieveOptions, RetrieveResult, } from './metadataApiRetrieve';
+export { MetadataApiRetrieve, MetadataApiRetrieveOptions, RetrieveResult } from './metadataApiRetrieve';
 export { ToolingApi, ToolingDeployOptions, ToolingRetrieveOptions } from './toolingApi';
 export { ComponentDeployment, ComponentRetrieval, ComponentDiagnostic, FileResponse, SourceApiResult, AsyncResult, SourceDeployResult, RequestStatus, MetadataRequestStatus, RetrieveFailure, RetrieveSuccess, SourceRetrieveResult, MetadataApiDeployStatus, DeployDetails, RunTestResult, CodeCoverage, LocationsNotCovered, CodeCoverageWarnings, Failures, Successes, DeployMessage, RetrieveRequest, RetrieveMessage, FileProperties, ComponentStatus, MetadataApiRetrieveStatus, PackageOption, PackageOptions, RetrieveOptions, ContainerAsyncRequest, ToolingDeployStatus, QueryResult, ApexRecord, VFRecord, AuraRecord, LWCRecord, ToolingCreateResult, AuraDefinition, LightningComponentResource, } from './types';

package/lib/src/client/index.js

@@ -6,6 +6,7 @@
  * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
  */
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.ComponentStatus = exports.RequestStatus = exports.ToolingApi = exports.RetrieveResult = exports.MetadataApiRetrieve = exports.DeployResult = exports.MetadataApiDeploy = void 0;
 var metadataApiDeploy_1 = require("./metadataApiDeploy");
 Object.defineProperty(exports, "MetadataApiDeploy", { enumerable: true, get: function () { return metadataApiDeploy_1.MetadataApiDeploy; } });
 Object.defineProperty(exports, "DeployResult", { enumerable: true, get: function () { return metadataApiDeploy_1.DeployResult; } });
@@ -17,5 +18,4 @@ Object.defineProperty(exports, "ToolingApi", { enumerable: true, get: function (
 var types_1 = require("./types");
 Object.defineProperty(exports, "RequestStatus", { enumerable: true, get: function () { return types_1.RequestStatus; } });
 Object.defineProperty(exports, "ComponentStatus", { enumerable: true, get: function () { return types_1.ComponentStatus; } });
-Object.defineProperty(exports, "ToolingDeployStatus", { enumerable: true, get: function () { return types_1.ToolingDeployStatus; } });
 //# sourceMappingURL=index.js.map

package/lib/src/client/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/client/index.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;AAEH,yDAAgG;AAAvF,sHAAA,iBAAiB,OAAA;AAA4B,iHAAA,YAAY,OAAA;AAClE,6DAI+B;AAH7B,0HAAA,mBAAmB,OAAA;AAEnB,qHAAA,cAAc,OAAA;AAEhB,2CAAwF;AAA/E,wGAAA,UAAU,OAAA;AACnB,iCAwCiB;AAhCf,sGAAA,aAAa,OAAA;AAiBb,wGAAA,eAAe,OAAA;AAMf,4GAAA,mBAAmB,OAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/client/index.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,yDAAgG;AAAvF,sHAAA,iBAAiB,OAAA;AAA4B,iHAAA,YAAY,OAAA;AAClE,6DAAwG;AAA/F,0HAAA,mBAAmB,OAAA;AAA8B,qHAAA,cAAc,OAAA;AACxE,2CAAwF;AAA/E,wGAAA,UAAU,OAAA;AACnB,iCAwCiB;AAhCf,sGAAA,aAAa,OAAA;AAiBb,wGAAA,eAAe,OAAA"}

package/lib/src/client/metadataApiDeploy.d.ts

@@ -1,6 +1,6 @@
-import { AsyncResult, FileResponse, MetadataApiDeployOptions as ApiOptions, MetadataApiDeployStatus, MetadataTransferResult } from './types';
-import { MetadataTransfer, MetadataTransferOptions } from './metadataTransfer';
 import { ComponentSet } from '../collections';
+import { MetadataTransfer, MetadataTransferOptions } from './metadataTransfer';
+import { AsyncResult, FileResponse, MetadataApiDeployOptions as ApiOptions, MetadataApiDeployStatus, MetadataTransferResult } from './types';
 export declare class DeployResult implements MetadataTransferResult {
     readonly response: MetadataApiDeployStatus;
     readonly components: ComponentSet;
@@ -35,8 +35,8 @@ export declare class MetadataApiDeploy extends MetadataTransfer<MetadataApiDeplo
      * - The components have been validated successfully for the target environment within the last 10 days.
      * - As part of the validation, Apex tests in the target org have passed.
      * - Code coverage requirements are met.
-     *   - If all tests in the org or all local tests are run, overall code coverage is at least 75%, and Apex triggers have some coverage.
-     *   - If specific tests are run with the RunSpecifiedTests test level, each class and trigger that was deployed is covered by at least 75% individually.
+     * - If all tests in the org or all local tests are run, overall code coverage is at least 75%, and Apex triggers have some coverage.
+     * - If specific tests are run with the RunSpecifiedTests test level, each class and trigger that was deployed is covered by at least 75% individually.
      *
      * See [deployRecentValidation()](https://developer.salesforce.com/docs/atlas.en-us.api_meta.meta/api_meta/meta_deployRecentValidation.htm)
      *