@salesforce/source-deploy-retrieve 10.5.5 → 10.6.0

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

@@ -0,0 +1,20 @@
+import { SourceComponent, ComponentLike } from '../resolve';
+import { ComponentStatus, DeployMessage, FileResponse, MetadataApiDeployStatus } from './types';
+type DeployMessageWithComponentType = DeployMessage & {
+    componentType: string;
+};
+/**
+ * Fix any issues with the deploy message returned by the api.
+ * TODO: remove cases if fixes are made in the api.
+ */
+export declare const sanitizeDeployMessage: (message: DeployMessage) => DeployMessageWithComponentType;
+export declare const createResponses: (component: SourceComponent, responseMessages: DeployMessage[]) => FileResponse[];
+/**
+ * Groups messages from the deploy result by component fullName and type
+ */
+export declare const getDeployMessages: (result: MetadataApiDeployStatus) => Map<string, DeployMessage[]>;
+export declare const getState: (message: DeployMessage) => ComponentStatus;
+export declare const isComponentNotFoundWarningMessage: (message: DeployMessage) => message is DeployMessage & Required<Pick<DeployMessage, "componentType" | "problem" | "problemType">>;
+export declare const toKey: (component: ComponentLike) => string;
+export declare const shouldConvertPaths: boolean;
+export {};

package/lib/src/client/deployMessages.js

@@ -0,0 +1,146 @@
+"use strict";
+/*
+ * Copyright (c) 2023, 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
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.shouldConvertPaths = exports.toKey = exports.isComponentNotFoundWarningMessage = exports.getState = exports.getDeployMessages = exports.createResponses = exports.sanitizeDeployMessage = void 0;
+const posix_1 = require("node:path/posix");
+const posix_2 = require("node:path/posix");
+const core_1 = require("@salesforce/core");
+const kit_1 = require("@salesforce/kit");
+const registry_1 = require("../registry/registry");
+const types_1 = require("./types");
+const diagnosticUtil_1 = require("./diagnosticUtil");
+/**
+ * Fix any issues with the deploy message returned by the api.
+ * TODO: remove cases if fixes are made in the api.
+ */
+const sanitizeDeployMessage = (message) => {
+    if (!hasComponentType(message)) {
+        throw new core_1.SfError(`Missing componentType in deploy message ${message.fullName} ${message.fileName}`);
+    }
+    // mdapi error messages have the type as "FooSettings" but SDR only recognizes "Settings"
+    if (message.componentType.endsWith('Settings') && message.fileName.endsWith('.settings')) {
+        return {
+            ...message,
+            componentType: 'Settings',
+        };
+    }
+    if (message.componentType === registry_1.registry.types.lightningcomponentbundle.name) {
+        return {
+            ...message,
+            fullName: message.fullName.replace(/markup:\/\/[a-z|0-9|_]+:/i, ''),
+        };
+    }
+    if (message.componentType === registry_1.registry.types.document.name) {
+        return {
+            ...message,
+            // strip document extension from fullName
+            fullName: (0, posix_1.join)((0, posix_1.dirname)(message.fullName), (0, posix_1.basename)(message.fullName, (0, posix_1.extname)(message.fullName))),
+        };
+    }
+    // Treat emailTemplateFolder as EmailFolder
+    if (message.componentType === registry_1.registry.types.emailtemplatefolder.name) {
+        return {
+            ...message,
+            // strip document extension from fullName
+            componentType: registry_1.registry.types.emailfolder.name,
+        };
+    }
+    return message;
+};
+exports.sanitizeDeployMessage = sanitizeDeployMessage;
+// components with children are already taken care of through the messages, so don't walk their content directories.
+const shouldWalkContent = (component) => typeof component.content === 'string' &&
+    (!component.type.children ||
+        Object.values(component.type.children.types).some((t) => t.unaddressableWithoutParent === true || t.isAddressable === false));
+const createResponses = (component, responseMessages) => {
+    const responses = responseMessages.flatMap((message) => {
+        const state = (0, exports.getState)(message);
+        const base = { fullName: component.fullName, type: component.type.name };
+        if (state === types_1.ComponentStatus.Failed) {
+            return [{ ...base, state, ...(0, diagnosticUtil_1.parseDeployDiagnostic)(component, message) }];
+        }
+        else {
+            return [
+                ...(shouldWalkContent(component)
+                    ? component.walkContent().map((filePath) => ({ ...base, state, filePath }))
+                    : []),
+                ...(component.xml ? [{ ...base, state, filePath: component.xml }] : []),
+            ];
+        }
+    });
+    return responses;
+};
+exports.createResponses = createResponses;
+/**
+ * Groups messages from the deploy result by component fullName and type
+ */
+const getDeployMessages = (result) => {
+    const messageMap = new Map();
+    const failedComponentKeys = new Set();
+    const failureMessages = (0, kit_1.ensureArray)(result.details.componentFailures);
+    const successMessages = (0, kit_1.ensureArray)(result.details.componentSuccesses);
+    for (const failure of failureMessages) {
+        const sanitized = (0, exports.sanitizeDeployMessage)(failure);
+        const componentLike = {
+            fullName: sanitized.fullName,
+            type: sanitized.componentType,
+        };
+        const key = (0, exports.toKey)(componentLike);
+        if (!messageMap.has(key)) {
+            messageMap.set(key, []);
+        }
+        messageMap.get(key)?.push(sanitized);
+        failedComponentKeys.add(key);
+    }
+    for (const success of successMessages) {
+        const sanitized = (0, exports.sanitizeDeployMessage)(success);
+        const componentLike = {
+            fullName: sanitized.fullName,
+            type: sanitized.componentType,
+        };
+        const key = (0, exports.toKey)(componentLike);
+        // this will ensure successes aren't reported if there is a failure for
+        // the same component. e.g. lwc returns failures and successes
+        if (!failedComponentKeys.has(key)) {
+            messageMap.set(key, [sanitized]);
+        }
+    }
+    return messageMap;
+};
+exports.getDeployMessages = getDeployMessages;
+const getState = (message) => {
+    if (isTrue(message.created)) {
+        return types_1.ComponentStatus.Created;
+    }
+    else if (isTrue(message.changed)) {
+        return types_1.ComponentStatus.Changed;
+    }
+    else if (isTrue(message.deleted)) {
+        return types_1.ComponentStatus.Deleted;
+    }
+    else if (!isTrue(message.success)) {
+        return types_1.ComponentStatus.Failed;
+    }
+    return types_1.ComponentStatus.Unchanged;
+};
+exports.getState = getState;
+/* Type guard for asserting that a DeployMessages has a componentType, problem, and problemType === Warning*/
+const isComponentNotFoundWarningMessage = (message) => hasComponentType(message) &&
+    message.problemType === 'Warning' &&
+    typeof message.problem === 'string' &&
+    message.problem?.startsWith(`No ${message.componentType} named: `);
+exports.isComponentNotFoundWarningMessage = isComponentNotFoundWarningMessage;
+const hasComponentType = (message) => typeof message.componentType === 'string';
+const toKey = (component) => {
+    const type = typeof component.type === 'string' ? component.type : component.type.name;
+    return `${type}#${exports.shouldConvertPaths ? component.fullName.split(posix_2.sep).join(posix_2.posix.sep) : component.fullName}`;
+};
+exports.toKey = toKey;
+const isTrue = (value) => value === 'true' || value === true;
+exports.shouldConvertPaths = posix_2.sep !== posix_2.posix.sep;
+//# sourceMappingURL=deployMessages.js.map

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

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

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

@@ -1,9 +1,5 @@
-import { SourceComponent } from '../resolve';
+import { SourceComponent } from '../resolve/sourceComponent';
 import { ComponentDiagnostic, DeployMessage } from './types';
-export declare class DiagnosticUtil {
-    private api;
-    constructor(api: 'metadata' | 'tooling');
-    parseDeployDiagnostic(component: SourceComponent, message: string | DeployMessage): ComponentDiagnostic;
-    private parseLwc;
-    private parseAura;
-}
+type RelevantMessageProps = Pick<DeployMessage, 'problem' | 'problemType' | 'fileName' | 'lineNumber' | 'columnNumber'>;
+export declare const parseDeployDiagnostic: (component: SourceComponent, message: string | RelevantMessageProps) => ComponentDiagnostic;
+export {};

package/lib/src/client/diagnosticUtil.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.DiagnosticUtil = void 0;
+exports.parseDeployDiagnostic = void 0;
 /*
  * Copyright (c) 2020, salesforce.com, inc.
  * All rights reserved.
@@ -9,123 +9,64 @@ exports.DiagnosticUtil = void 0;
  */
 const node_path_1 = require("node:path");
 const core_1 = require("@salesforce/core");
-const registry_1 = require("../registry");
-class DiagnosticUtil {
-    constructor(api) {
-        this.api = api;
-    }
-    parseDeployDiagnostic(component, message) {
-        const { name: typeName } = component.type;
-        switch (typeName) {
-            case registry_1.registry.types.lightningcomponentbundle.name:
-                return this.parseLwc(component, message);
-            case registry_1.registry.types.auradefinitionbundle.name:
-                return this.parseAura(component, message);
-            default:
-                if (typeof message !== 'string') {
-                    return parseDefault(component, message);
-                }
-                throw new core_1.SfError(`Unable to parse deploy diagnostic with string message: ${message} for component ${component.fullName}`);
-        }
-    }
-    parseLwc(component, message) {
-        const problem = getProblemFromMessage(message, component);
-        const diagnostic = {
-            error: problem,
-            problemType: 'Error',
-        };
-        if (this.api === 'metadata') {
-            const deployMessage = message;
-            if (deployMessage.fileName) {
-                diagnostic.filePath = component.walkContent().find((f) => f.includes(message.fileName));
-            }
-            const matches = new RegExp(/(\[Line: (\d+), Col: (\d+)] )?(.*)/).exec(problem);
-            if (matches?.[2] && matches[3] && matches[4]) {
-                diagnostic.lineNumber = Number(matches[2]);
-                diagnostic.columnNumber = Number(matches[3]);
-                diagnostic.error = appendErrorWithLocation(matches[4], diagnostic.lineNumber, diagnostic.columnNumber);
-            }
-            else {
-                diagnostic.error = problem;
-            }
-        }
-        else {
-            try {
-                const pathParts = problem.split(/[\s\n\t]+/);
-                const msgStartIndex = pathParts.findIndex((part) => part.includes(':'));
-                const fileObject = pathParts[msgStartIndex];
-                const errLocation = fileObject.slice(fileObject.indexOf(':') + 1);
-                const fileName = fileObject.slice(0, fileObject.indexOf(':'));
-                diagnostic.error = pathParts.slice(msgStartIndex + 2).join(' ');
-                diagnostic.filePath = component.walkContent().find((f) => f.includes(fileName));
-                diagnostic.lineNumber = Number(errLocation.split(',')[0]);
-                diagnostic.columnNumber = Number(errLocation.split(',')[1]);
-                diagnostic.error = appendErrorWithLocation(diagnostic.error, diagnostic.lineNumber, diagnostic.columnNumber);
-            }
-            catch (e) {
-                // TODO: log error with parsing error message
-                diagnostic.error = problem;
-            }
-        }
-        return diagnostic;
-    }
-    parseAura(component, message) {
-        const problem = getProblemFromMessage(message, component);
-        const diagnostic = {
-            error: problem,
-            problemType: 'Error',
-        };
-        let filePath;
-        if (this.api === 'tooling') {
-            const errorParts = problem.split(' ');
-            const fileType = errorParts.find((part) => {
-                part = part.toLowerCase();
-                return part.includes('controller') || part.includes('renderer') || part.includes('helper');
-            });
-            filePath = fileType
-                ? component.walkContent().find((s) => s.toLowerCase().includes(fileType.toLowerCase()))
-                : undefined;
-        }
-        else {
-            const deployMessage = message;
-            if (deployMessage.fileName) {
-                filePath = component.walkContent().find((f) => f.endsWith((0, node_path_1.basename)(deployMessage.fileName)));
-            }
-        }
-        if (filePath) {
-            diagnostic.filePath = filePath;
-            const matches = new RegExp(/(\d+),\s?(\d+)/).exec(problem);
-            if (matches) {
-                const lineNumber = Number(matches[1]);
-                const columnNumber = Number(matches[2]);
-                diagnostic.lineNumber = lineNumber;
-                diagnostic.columnNumber = columnNumber;
-                diagnostic.error = appendErrorWithLocation(diagnostic.error, lineNumber, columnNumber);
+const registry_1 = require("../registry/registry");
+const parseDeployDiagnostic = (component, message) => {
+    const { name: typeName } = component.type;
+    const problem = getProblemFromMessage(message, component);
+    switch (typeName) {
+        case registry_1.registry.types.lightningcomponentbundle.name:
+            return parseLwc(component, message, problem);
+        case registry_1.registry.types.auradefinitionbundle.name:
+            return parseAura(component, message, problem);
+        default:
+            if (typeof message !== 'string') {
+                return parseDefault(component, message, problem);
             }
-        }
-        return diagnostic;
+            throw new core_1.SfError(`Unable to parse deploy diagnostic with string message: ${message} for component ${component.fullName}`);
     }
-}
-exports.DiagnosticUtil = DiagnosticUtil;
-const appendErrorWithLocation = (error, line, column) => `${error} (${line}:${column})`;
-const parseDefault = (component, message) => {
+};
+exports.parseDeployDiagnostic = parseDeployDiagnostic;
+const parseLwc = (component, message, problem) => {
+    const filePath = messageHasProblemAndFilename(message) ? getFileEndingWith(message.fileName)(component) : undefined;
+    const [line, col, lwcError] = (new RegExp(/(\[Line: (\d+), Col: (\d+)] )?(.*)/).exec(problem) ?? []).slice(2, 5);
+    const [lineNumber, columnNumber] = [line, col].map(Number);
+    return {
+        problemType: 'Error',
+        ...(filePath ? { filePath } : {}),
+        ...(lineNumber && columnNumber && lwcError
+            ? { lineNumber, columnNumber, error: appendErrorWithLocation(lwcError, lineNumber, columnNumber) }
+            : { error: problem }),
+    };
+};
+const parseAura = (component, message, problem) => {
+    const filePath = messageHasProblemAndFilename(message) ? getFileEndingWith(message.fileName)(component) : undefined;
+    const [lineNumber, columnNumber] = (new RegExp(/(\d+),\s?(\d+)/).exec(problem) ?? []).slice(1, 3).map(Number);
+    return {
+        problemType: 'Error',
+        ...(filePath ? { filePath } : {}),
+        ...(lineNumber >= 0 && columnNumber >= 0
+            ? { lineNumber, columnNumber, error: appendErrorWithLocation(problem, lineNumber, columnNumber) }
+            : { error: problem }),
+    };
+};
+const parseDefault = (component, message, problem) => {
     const { problemType, fileName, lineNumber, columnNumber } = message;
-    const problem = getProblemFromMessage(message, component);
-    const diagnostic = {
-        error: problem,
+    return {
         problemType: problemType ?? 'Error',
+        ...(fileName ? { filePath: getFileEndingWith(fileName)(component) } : {}),
+        ...(lineNumber && columnNumber
+            ? {
+                lineNumber: Number(lineNumber),
+                columnNumber: Number(columnNumber),
+                error: appendErrorWithLocation(problem, lineNumber, columnNumber),
+            }
+            : { error: problem }),
     };
-    if (fileName) {
-        const localProblemFile = component.walkContent().find((f) => f.endsWith((0, node_path_1.basename)(message.fileName)));
-        diagnostic.filePath = localProblemFile ?? component.xml;
-    }
-    if (lineNumber && columnNumber) {
-        diagnostic.lineNumber = Number(lineNumber);
-        diagnostic.columnNumber = Number(columnNumber);
-        diagnostic.error = appendErrorWithLocation(diagnostic.error, lineNumber, columnNumber);
-    }
-    return diagnostic;
 };
+const appendErrorWithLocation = (error, line, column) => `${error} (${line}:${column})`;
+const messageHasProblemAndFilename = (message) => typeof message === 'object' && 'problem' in message && 'fileName' in message;
+const getFileEndingWith = (fileName) => (component) => component.walkContent().find(endsWith((0, node_path_1.basename)(fileName))) ?? component.xml;
+const endsWith = (ending) => (f) => f.endsWith(ending);
 const getProblemFromMessage = (message, component) => {
     const problem = typeof message === 'string' ? message : message.problem;
     if (!problem) {

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,3 +1,3 @@
 export { MetadataApiDeploy, MetadataApiDeployOptions, DeployResult, ScopedPreDeploy, ScopedPostDeploy, } from './metadataApiDeploy';
-export { MetadataApiRetrieve, MetadataApiRetrieveOptions, RetrieveResult, ScopedPostRetrieve, ScopedPreRetrieve, } from './metadataApiRetrieve';
-export { ComponentDeployment, ComponentRetrieval, ComponentDiagnostic, FileResponse, FileResponseFailure, FileResponseSuccess, AsyncResult, RequestStatus, MetadataRequestStatus, RetrieveFailure, RetrieveSuccess, MetadataApiDeployStatus, DeployDetails, RunTestResult, CodeCoverage, LocationsNotCovered, CodeCoverageWarnings, Failures, Successes, DeployMessage, RetrieveRequest, RetrieveMessage, FileProperties, ComponentStatus, MetadataApiRetrieveStatus, PackageOption, PackageOptions, RetrieveOptions, DeployVersionData, RetrieveVersionData, } from './types';
+export { MetadataApiRetrieve, RetrieveResult, ScopedPostRetrieve, ScopedPreRetrieve } from './metadataApiRetrieve';
+export { ComponentDeployment, ComponentRetrieval, ComponentDiagnostic, FileResponse, FileResponseFailure, FileResponseSuccess, AsyncResult, RequestStatus, MetadataRequestStatus, RetrieveFailure, RetrieveSuccess, MetadataApiDeployStatus, DeployDetails, RunTestResult, CodeCoverage, LocationsNotCovered, CodeCoverageWarnings, Failures, Successes, DeployMessage, RetrieveRequest, RetrieveMessage, FileProperties, ComponentStatus, MetadataApiRetrieveStatus, PackageOption, PackageOptions, RetrieveOptions, DeployVersionData, RetrieveVersionData, MetadataApiRetrieveOptions, } from './types';

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,yDAM6B;AAL3B,sHAAA,iBAAiB,OAAA;AAEjB,iHAAA,YAAY,OAAA;AAId,6DAM+B;AAL7B,0HAAA,mBAAmB,OAAA;AAEnB,qHAAA,cAAc,OAAA;AAIhB,iCA+BiB;AAvBf,sGAAA,aAAa,OAAA;AAgBb,wGAAA,eAAe,OAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/client/index.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,yDAM6B;AAL3B,sHAAA,iBAAiB,OAAA;AAEjB,iHAAA,YAAY,OAAA;AAId,6DAAmH;AAA1G,0HAAA,mBAAmB,OAAA;AAAE,qHAAA,cAAc,OAAA;AAC5C,iCAgCiB;AAxBf,sGAAA,aAAa,OAAA;AAgBb,wGAAA,eAAe,OAAA"}

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

@@ -1,33 +1,14 @@
-import { ComponentSet } from '../collections';
+import { RegistryAccess } from '../registry/registryAccess';
+import { ComponentSet } from '../collections/componentSet';
 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 | undefined;
     readonly replacements: Map<string, string[]>;
-    private readonly diagnosticUtil;
     private fileResponses?;
-    private readonly shouldConvertPaths;
     constructor(response: MetadataApiDeployStatus, components?: ComponentSet | undefined, replacements?: Map<string, string[]>);
     getFileResponses(): FileResponse[];
-    private createResponses;
-    /**
-     * Groups messages from the deploy result by component fullName and type
-     */
-    private getDeployMessages;
-    /**
-     * If a component fails to delete because it doesn't exist in the org, you get a message like
-     * key: 'ApexClass#destructiveChanges.xml'
-     * value:[{
-     * fullName: 'destructiveChanges.xml',
-     * fileName: 'destructiveChanges.xml',
-     * componentType: 'ApexClass',
-     * problem: 'No ApexClass named: test1 found',
-     * problemType: 'Warning'
-     * }]
-     */
-    private deleteNotFoundToFileResponses;
-    private key;
 }
 export interface MetadataApiDeployOptions extends MetadataTransferOptions {
     apiOptions?: ApiOptions;
@@ -39,6 +20,7 @@ export interface MetadataApiDeployOptions extends MetadataTransferOptions {
      * Path to a directory containing mdapi-formatted code and a package.xml
      */
     mdapiPath?: string;
+    registry?: RegistryAccess;
 }
 export declare class MetadataApiDeploy extends MetadataTransfer<MetadataApiDeployStatus, DeployResult, MetadataApiDeployOptions> {
     static readonly DEFAULT_OPTIONS: Partial<MetadataApiDeployOptions>;
@@ -46,6 +28,7 @@ export declare class MetadataApiDeploy extends MetadataTransfer<MetadataApiDeplo
     private replacements;
     private orgId?;
     private isRestDeploy;
+    private registry;
     constructor(options: MetadataApiDeployOptions);
     /**
      * Deploy recently validated components without running Apex tests. Requires the operation to have been