sfdx-git-delta 6.32.2 → 6.32.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/README.md CHANGED
@@ -89,7 +89,7 @@ sf project deploy start -x package/package.xml --post-destructive-changes destru
89
89
 
90
90
  - **Automate destructive deployments**: build the destructiveChanges.xml from the deleted (or renamed) metadata
91
91
 
92
- Have a look at this post on the Salesforce Developers Blog to dive into it: [Optimizing Unpackaged Deployments Using a Delta Generation Tool](https://developer.salesforce.com/blogs/2021/01/optimizing-unpackaged-deployments-using-a-delta-generation-tool.html).
92
+ Have a look at this post on the Salesforce Developers Blog to dive into it: [Optimizing Unpackaged Deployments Using a Delta Generation Tool](https://developer.salesforce.com/blogs/2021/01/optimizing-unpackaged-deployments-using-a-delta-generation-tool).
93
93
 
94
94
  ![delta_principle](img/delta_principles.png)
95
95
 
@@ -200,7 +200,7 @@ FLAG DESCRIPTIONS
200
200
  of a diff, in which case changes may still be picked up.
201
201
  ```
202
202
 
203
- _See code: [src/commands/sgd/source/delta.ts](https://github.com/scolladon/sfdx-git-delta/blob/v6.32.2/src/commands/sgd/source/delta.ts)_
203
+ _See code: [src/commands/sgd/source/delta.ts](https://github.com/scolladon/sfdx-git-delta/blob/v6.32.3/src/commands/sgd/source/delta.ts)_
204
204
  <!-- commandsstop -->
205
205
 
206
206
  ### Windows users
@@ -37,10 +37,18 @@ export class SDRMetadataAdapter {
37
37
  getOrCreateCache() {
38
38
  let cache = SDRMetadataAdapter.registryCache.get(this.registry);
39
39
  if (!cache) {
40
+ const types = Object.values(this.registry.types);
41
+ const baseFolderTypeIds = new Set(types
42
+ .filter(t => t.inFolder && t.folderType)
43
+ .map(t => t.folderType));
44
+ const folderTypeIds = new Set(baseFolderTypeIds);
45
+ for (const t of types) {
46
+ if (t.aliasFor && baseFolderTypeIds.has(t.aliasFor)) {
47
+ folderTypeIds.add(t.id);
48
+ }
49
+ }
40
50
  cache = {
41
- folderTypeIds: new Set(Object.values(this.registry.types)
42
- .filter(t => t.inFolder && t.folderType)
43
- .map(t => t.folderType)),
51
+ folderTypeIds,
44
52
  metadata: [],
45
53
  };
46
54
  SDRMetadataAdapter.registryCache.set(this.registry, cache);
@@ -1 +1 @@
1
- {"version":3,"file":"sdrMetadataAdapter.js","sourceRoot":"","sources":["../../src/metadata/sdrMetadataAdapter.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"sdrMetadataAdapter.js","sourceRoot":"","sources":["../../src/metadata/sdrMetadataAdapter.ts"],"names":[],"mappings":"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"}