@salesforce/source-tracking 0.5.2 → 1.0.0

package/CHANGELOG.md

@@ -2,6 +2,15 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+## [1.0.0](https://github.com/forcedotcom/source-tracking/compare/v0.5.2...v1.0.0) (2022-01-20)
+
+### Bug Fixes
+
+- handle element count errors ([8817329](https://github.com/forcedotcom/source-tracking/commit/8817329f8198ce701aba22c7a4476ef31a4d73a4))
+- lightning EmailTemplateFolder ([554c766](https://github.com/forcedotcom/source-tracking/commit/554c76676a85c7a4b673879116912cde51dd1498))
+- remove emailtf attempt ([262839d](https://github.com/forcedotcom/source-tracking/commit/262839dc025c7094d8868d3ae9d769dd39ad5324))
+- sourceMember excepton for nondecomposed children ([05db59e](https://github.com/forcedotcom/source-tracking/commit/05db59e7a6e070224a45f5fbf08013565c9f2131))
+
 ### [0.5.2](https://github.com/forcedotcom/source-tracking/compare/v0.5.1...v0.5.2) (2022-01-05)
 
 ### Features

package/lib/shared/metadataKeys.d.ts

@@ -1,2 +1,3 @@
 import { RemoteSyncInput } from './types';
 export declare const getMetadataKeyFromFileResponse: (fileResponse: RemoteSyncInput) => string[];
+export declare const mappingsForSourceMemberTypesToMetadataType: Map<string, string>;

package/lib/shared/metadataKeys.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getMetadataKeyFromFileResponse = void 0;
+exports.mappingsForSourceMemberTypesToMetadataType = exports.getMetadataKeyFromFileResponse = void 0;
 /*
  * Copyright (c) 2020, salesforce.com, inc.
  * All rights reserved.
@@ -8,6 +8,7 @@ exports.getMetadataKeyFromFileResponse = void 0;
  * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
  */
 const path = require("path");
+const source_deploy_retrieve_1 = require("@salesforce/source-deploy-retrieve");
 const functions_1 = require("./functions");
 // LWC can have child folders (ex: dynamic templates like /templates/noDataIllustration.html
 const pathAfterFullName = (fileResponse) => fileResponse && fileResponse.filePath
@@ -38,8 +39,19 @@ const getMetadataKeyFromFileResponse = (fileResponse) => {
             (0, functions_1.getMetadataKey)(fileResponse.type, fileResponse.fullName),
         ];
     }
-    // standard key
+    // CustomLabels (file) => CustomLabel[] (how they're storedin SourceMembers)
+    if (fileResponse.type === 'CustomLabels' && fileResponse.filePath) {
+        return source_deploy_retrieve_1.ComponentSet.fromSource(fileResponse.filePath)
+            .getSourceComponents()
+            .toArray()
+            .flatMap((component) => component.getChildren().map((child) => (0, functions_1.getMetadataKey)('CustomLabel', child.fullName)));
+    }
+    // standard key for everything else
     return [(0, functions_1.getMetadataKey)(fileResponse.type, fileResponse.fullName)];
 };
 exports.getMetadataKeyFromFileResponse = getMetadataKeyFromFileResponse;
+exports.mappingsForSourceMemberTypesToMetadataType = new Map([
+    ['AuraDefinition', 'AuraDefinitionBundle'],
+    ['LightningComponentResource', 'LightningComponentBundle'],
+]);
 //# sourceMappingURL=metadataKeys.js.map

package/lib/shared/remoteSourceTrackingService.js

@@ -477,18 +477,14 @@ RemoteSourceTrackingService.remoteSourceTrackingServiceDictionary = {};
 const remoteChangeElementToChangeResult = (rce) => {
     return {
         ...rce,
-        ...(mappingsForSourceMemberTypesToMetadataType.has(rce.type)
+        ...(metadataKeys_1.mappingsForSourceMemberTypesToMetadataType.has(rce.type)
             ? {
                 name: rce.name.split('/')[0],
-                type: mappingsForSourceMemberTypesToMetadataType.get(rce.type),
+                type: metadataKeys_1.mappingsForSourceMemberTypesToMetadataType.get(rce.type),
             }
             : {}),
         origin: 'remote', // we know they're remote
     };
 };
 exports.remoteChangeElementToChangeResult = remoteChangeElementToChangeResult;
-const mappingsForSourceMemberTypesToMetadataType = new Map([
-    ['AuraDefinition', 'AuraDefinitionBundle'],
-    ['LightningComponentResource', 'LightningComponentBundle'],
-]);
 //# sourceMappingURL=remoteSourceTrackingService.js.map

package/lib/sourceTracking.js

@@ -18,6 +18,7 @@ const remoteSourceTrackingService_1 = require("./shared/remoteSourceTrackingServ
 const localShadowRepo_1 = require("./shared/localShadowRepo");
 const guards_1 = require("./shared/guards");
 const functions_1 = require("./shared/functions");
+const metadataKeys_1 = require("./shared/metadataKeys");
 /**
  * Manages source tracking files (remote and local)
  *
@@ -519,6 +520,9 @@ class SourceTracking extends kit_1.AsyncCreatable {
     }
     registrySupportsType(type) {
         try {
+            if (metadataKeys_1.mappingsForSourceMemberTypesToMetadataType.has(type)) {
+                return true;
+            }
             // this must use getTypeByName because findType doesn't support addressable child types (ex: customField!)
             this.registry.getTypeByName(type);
             return true;
@@ -551,11 +555,16 @@ class SourceTracking extends kit_1.AsyncCreatable {
         const remoteChangesAsComponentSet = new source_deploy_retrieve_1.ComponentSet(remoteChangesAsMetadataMember);
         this.logger.debug(` the generated component set has ${remoteChangesAsComponentSet.size.toString()} items`);
         if (remoteChangesAsComponentSet.size < elements.length) {
+            // there *could* be something missing
+            // some types (ex: LWC) show up as multiple files in the remote changes, but only one in the component set
             // iterate the elements to see which ones didn't make it into the component set
-            throw new Error(`unable to generate complete component set for ${elements
-                .filter((element) => !remoteChangesAsComponentSet.has({ type: element === null || element === void 0 ? void 0 : element.type, fullName: element === null || element === void 0 ? void 0 : element.name }))
-                .map((element) => `${element.name} (${element.type})`)
-                .join(os_1.EOL)}`);
+            const missingComponents = elements.filter((element) => !remoteChangesAsComponentSet.has({ type: element === null || element === void 0 ? void 0 : element.type, fullName: element === null || element === void 0 ? void 0 : element.name }));
+            // Throw if anything was actually missing
+            if (missingComponents.length > 0) {
+                throw new Error(`unable to generate complete component set for ${elements
+                    .map((element) => `${element.name} (${element.type})`)
+                    .join(os_1.EOL)}`);
+            }
         }
         const matchingLocalSourceComponentsSet = source_deploy_retrieve_1.ComponentSet.fromSource({
             fsPaths: this.packagesDirs.map((dir) => dir.path),

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@salesforce/source-tracking",
   "description": "API for tracking local and remote Salesforce metadata changes",
-  "version": "0.5.2",
+  "version": "1.0.0",
   "author": "Salesforce",
   "license": "BSD-3-Clause",
   "main": "lib/index.js",
@@ -25,7 +25,7 @@
     "prune:dead": "ts-prune | grep -v 'source-deploy-retrieve' | grep -v 'index.ts'",
     "test": "sf-test",
     "test:nuts": "nyc mocha \"**/*.nut.ts\" --slow 4500 --timeout 600000 --parallel",
-    "test:nuts:local": "mocha \"**/local*.nut.ts\" --slow 4500 --timeout 600000 --parallel"
+    "test:nuts:local": "mocha \"**/local/*.nut.ts\" --slow 4500 --timeout 600000 --parallel"
   },
   "keywords": [
     "force",
@@ -45,7 +45,7 @@
   "dependencies": {
     "@salesforce/core": "^2.33.1",
     "@salesforce/kit": "^1.5.17",
-    "@salesforce/source-deploy-retrieve": "^5.8.2",
+    "@salesforce/source-deploy-retrieve": "^5.9.3",
     "isomorphic-git": "^1.9.2",
     "ts-retry-promise": "^0.6.0"
   },
@@ -66,7 +66,7 @@
     "eslint-config-salesforce-license": "^0.1.6",
     "eslint-config-salesforce-typescript": "^0.2.7",
     "eslint-plugin-header": "^3.1.1",
-    "eslint-plugin-import": "2.24.2",
+    "eslint-plugin-import": "2.25.4",
     "eslint-plugin-jsdoc": "^37.0.1",
     "eslint-plugin-prettier": "^3.4.0",
     "husky": "^7.0.4",