@jayree/sfdx-plugin-manifest 4.0.38 → 4.0.40
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/CHANGELOG.md +16 -0
- package/README.md +3 -3
- package/lib/SDR-extra/resolve/treeContainersExtra.js +12 -10
- package/lib/SDR-extra/resolve/treeContainersExtra.js.map +1 -1
- package/lib/SDR-extra/shared/gitComponentSetArray.js +30 -6
- package/lib/SDR-extra/shared/gitComponentSetArray.js.map +1 -1
- package/lib/tsconfig.tsbuildinfo +1 -1
- package/npm-shrinkwrap.json +655 -158
- package/oclif.lock +205 -143
- package/oclif.manifest.json +1 -1
- package/package.json +6 -6
package/CHANGELOG.md
CHANGED
|
@@ -1,3 +1,19 @@
|
|
|
1
|
+
## [4.0.40](https://github.com/jayree/sfdx-plugin-manifest/compare/4.0.39...4.0.40) (2025-07-24)
|
|
2
|
+
|
|
3
|
+
|
|
4
|
+
### Bug Fixes
|
|
5
|
+
|
|
6
|
+
* **deps:** bump @salesforce/core from 8.18.1 to 8.18.3 ([#1870](https://github.com/jayree/sfdx-plugin-manifest/issues/1870)) ([a742fd4](https://github.com/jayree/sfdx-plugin-manifest/commit/a742fd4961b5720ae8eb5f5ad7677d7d91d90e0d))
|
|
7
|
+
* package.json & yarn.lock to reduce vulnerabilities ([072f2cb](https://github.com/forcedotcom/sfdx-core/commit/072f2cbb05c7c14278c402bbcf17314ebc40b098))
|
|
8
|
+
* examples/package.json & examples/yarn.lock to reduce vulnerabilities ([e7a30b6](https://github.com/forcedotcom/sfdx-core/commit/e7a30b684adbc8f27f63327ea847f65463e6b881))
|
|
9
|
+
|
|
10
|
+
## [4.0.39](https://github.com/jayree/sfdx-plugin-manifest/compare/4.0.38...4.0.39) (2025-07-24)
|
|
11
|
+
|
|
12
|
+
|
|
13
|
+
### Bug Fixes
|
|
14
|
+
|
|
15
|
+
* align with module updates ([#1868](https://github.com/jayree/sfdx-plugin-manifest/issues/1868)) ([77ccf02](https://github.com/jayree/sfdx-plugin-manifest/commit/77ccf02836869222fd13f01f1d5f08b86a55ab43))
|
|
16
|
+
|
|
1
17
|
## [4.0.38](https://github.com/jayree/sfdx-plugin-manifest/compare/4.0.37...4.0.38) (2025-07-12)
|
|
2
18
|
|
|
3
19
|
|
package/README.md
CHANGED
|
@@ -112,7 +112,7 @@ EXAMPLES
|
|
|
112
112
|
$ sf jayree manifest cleanup --manifest=package.xml --file=packageignore.xml
|
|
113
113
|
```
|
|
114
114
|
|
|
115
|
-
_See code: [src/commands/jayree/manifest/cleanup.ts](https://github.com/jayree/sfdx-plugin-manifest/blob/4.0.
|
|
115
|
+
_See code: [src/commands/jayree/manifest/cleanup.ts](https://github.com/jayree/sfdx-plugin-manifest/blob/4.0.40/src/commands/jayree/manifest/cleanup.ts)_
|
|
116
116
|
|
|
117
117
|
### `sf jayree manifest generate`
|
|
118
118
|
|
|
@@ -150,7 +150,7 @@ EXAMPLES
|
|
|
150
150
|
<Package xmlns='http://soap.sforce.com/2006/04/metadata'>...</Package>
|
|
151
151
|
```
|
|
152
152
|
|
|
153
|
-
_See code: [src/commands/jayree/manifest/generate.ts](https://github.com/jayree/sfdx-plugin-manifest/blob/4.0.
|
|
153
|
+
_See code: [src/commands/jayree/manifest/generate.ts](https://github.com/jayree/sfdx-plugin-manifest/blob/4.0.40/src/commands/jayree/manifest/generate.ts)_
|
|
154
154
|
|
|
155
155
|
### `sf jayree manifest git diff REF1 [REF2]`
|
|
156
156
|
|
|
@@ -230,7 +230,7 @@ FLAG DESCRIPTIONS
|
|
|
230
230
|
Use this flag to create a 'destructiveChanges.xml' and a blank 'package.xml'.
|
|
231
231
|
```
|
|
232
232
|
|
|
233
|
-
_See code: [src/commands/jayree/manifest/git/diff.ts](https://github.com/jayree/sfdx-plugin-manifest/blob/4.0.
|
|
233
|
+
_See code: [src/commands/jayree/manifest/git/diff.ts](https://github.com/jayree/sfdx-plugin-manifest/blob/4.0.40/src/commands/jayree/manifest/git/diff.ts)_
|
|
234
234
|
<!-- commandsstop -->
|
|
235
235
|
|
|
236
236
|
## Performance Testing
|
|
@@ -36,23 +36,25 @@ export class VirtualTreeContainerExtra extends VirtualTreeContainer {
|
|
|
36
36
|
const oid = await localRepo.resolveRef(ref);
|
|
37
37
|
const virtualDirectoryByFullPath = new Map();
|
|
38
38
|
// eslint-disable-next-line @typescript-eslint/await-thenable
|
|
39
|
-
for await (const
|
|
40
|
-
|
|
39
|
+
for await (const filename of paths) {
|
|
40
|
+
const dirPath = path.dirname(filename);
|
|
41
41
|
virtualDirectoryByFullPath.set(dirPath, {
|
|
42
42
|
dirPath,
|
|
43
43
|
children: Array.from(new Set(virtualDirectoryByFullPath.get(dirPath)?.children ?? []).add({
|
|
44
|
-
name: path.basename(
|
|
45
|
-
data: parseMetadataXml(
|
|
46
|
-
? await localRepo.readBlob(
|
|
44
|
+
name: path.basename(filename),
|
|
45
|
+
data: parseMetadataXml(filename) && includeBufferForFiles.includes(filename)
|
|
46
|
+
? await localRepo.readBlob(filename, oid)
|
|
47
47
|
: Buffer.from(''),
|
|
48
48
|
})),
|
|
49
49
|
});
|
|
50
|
-
const splits =
|
|
50
|
+
const splits = filename.split(path.sep);
|
|
51
51
|
for (let i = 0; i < splits.length - 1; i++) {
|
|
52
|
-
|
|
53
|
-
virtualDirectoryByFullPath.
|
|
54
|
-
|
|
55
|
-
|
|
52
|
+
const fullPathSoFar = splits.slice(0, i + 1).join(path.sep);
|
|
53
|
+
const existing = virtualDirectoryByFullPath.get(fullPathSoFar);
|
|
54
|
+
virtualDirectoryByFullPath.set(fullPathSoFar, {
|
|
55
|
+
dirPath: fullPathSoFar,
|
|
56
|
+
// only add to children if we don't already have it
|
|
57
|
+
children: Array.from(new Set(existing?.children ?? []).add(splits[i + 1])),
|
|
56
58
|
});
|
|
57
59
|
}
|
|
58
60
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"treeContainersExtra.js","sourceRoot":"","sources":["../../../src/SDR-extra/resolve/treeContainersExtra.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AACH,gGAAgG;AAChG,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,oBAAoB,EAAoB,MAAM,oCAAoC,CAAC;AAC5F,OAAO,EAAE,gBAAgB,EAAE,MAAM,2DAA2D,CAAC;AAC7F,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AACtD,OAAO,EAAE,OAAO,EAAE,MAAM,iCAAiC,CAAC;AAE1D,MAAM,OAAO,yBAA0B,SAAQ,oBAAoB;IACjE;;;;;;;;OAQG;IACI,MAAM,CAAC,KAAK,CAAC,UAAU,CAC5B,GAAW,EACX,GAAW,EACX,qBAA+B;QAE/B,MAAM,MAAM,GAAG,WAAW,CAAC,IAAI,CAAC,8BAA8B,EAAE,sCAAsC,CAAC,CAAC;QAExG,MAAM,SAAS,GAAG,OAAO,CAAC,WAAW,CAAC,EAAE,GAAG,EAAE,CAAC,CAAC;QAC/C,MAAM,KAAK,GAAG,MAAM,SAAS,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;QAC7C,MAAM,GAAG,GAAG,MAAM,SAAS,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;QAC5C,MAAM,0BAA0B,GAAG,IAAI,GAAG,EAA4B,CAAC;QACvE,6DAA6D;QAC7D,IAAI,KAAK,EAAE,MAAM,QAAQ,IAAI,KAAK,EAAE,CAAC;YACnC,
|
|
1
|
+
{"version":3,"file":"treeContainersExtra.js","sourceRoot":"","sources":["../../../src/SDR-extra/resolve/treeContainersExtra.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AACH,gGAAgG;AAChG,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,oBAAoB,EAAoB,MAAM,oCAAoC,CAAC;AAC5F,OAAO,EAAE,gBAAgB,EAAE,MAAM,2DAA2D,CAAC;AAC7F,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AACtD,OAAO,EAAE,OAAO,EAAE,MAAM,iCAAiC,CAAC;AAE1D,MAAM,OAAO,yBAA0B,SAAQ,oBAAoB;IACjE;;;;;;;;OAQG;IACI,MAAM,CAAC,KAAK,CAAC,UAAU,CAC5B,GAAW,EACX,GAAW,EACX,qBAA+B;QAE/B,MAAM,MAAM,GAAG,WAAW,CAAC,IAAI,CAAC,8BAA8B,EAAE,sCAAsC,CAAC,CAAC;QAExG,MAAM,SAAS,GAAG,OAAO,CAAC,WAAW,CAAC,EAAE,GAAG,EAAE,CAAC,CAAC;QAC/C,MAAM,KAAK,GAAG,MAAM,SAAS,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;QAC7C,MAAM,GAAG,GAAG,MAAM,SAAS,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;QAC5C,MAAM,0BAA0B,GAAG,IAAI,GAAG,EAA4B,CAAC;QACvE,6DAA6D;QAC7D,IAAI,KAAK,EAAE,MAAM,QAAQ,IAAI,KAAK,EAAE,CAAC;YACnC,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;YACvC,0BAA0B,CAAC,GAAG,CAAC,OAAO,EAAE;gBACtC,OAAO;gBACP,QAAQ,EAAE,KAAK,CAAC,IAAI,CAClB,IAAI,GAAG,CAAC,0BAA0B,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,QAAQ,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC;oBACnE,IAAI,EAAE,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC;oBAC7B,IAAI,EACF,gBAAgB,CAAC,QAAQ,CAAC,IAAI,qBAAqB,CAAC,QAAQ,CAAC,QAAQ,CAAC;wBACpE,CAAC,CAAC,MAAM,SAAS,CAAC,QAAQ,CAAC,QAAQ,EAAE,GAAG,CAAC;wBACzC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC;iBACtB,CAAC,CACH;aACF,CAAC,CAAC;YACH,MAAM,MAAM,GAAG,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YACxC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;gBAC3C,MAAM,aAAa,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;gBAC5D,MAAM,QAAQ,GAAG,0BAA0B,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;gBAC/D,0BAA0B,CAAC,GAAG,CAAC,aAAa,EAAE;oBAC5C,OAAO,EAAE,aAAa;oBACtB,mDAAmD;oBACnD,QAAQ,EAAE,KAAK,CAAC,IAAI,CAAC,IAAI,GAAG,CAAC,QAAQ,EAAE,QAAQ,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;iBAC3E,CAAC,CAAC;YACL,CAAC;QACH,CAAC;QAED,MAAM,EAAE,IAAI,EAAE,CAAC;QAEf,OAAO,IAAI,oBAAoB,CAAC,KAAK,CAAC,IAAI,CAAC,0BAA0B,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;IACnF,CAAC;CACF"}
|
|
@@ -22,12 +22,36 @@ import { supportsPartialDelete, pathIsInFolder } from '@salesforce/source-tracki
|
|
|
22
22
|
import { isDefined } from '@salesforce/source-tracking/lib/shared/guards.js';
|
|
23
23
|
import { parseMetadataXml } from '@salesforce/source-deploy-retrieve/lib/src/utils/index.js';
|
|
24
24
|
export const getGroupedFiles = (input, byPackageDir = false) => (byPackageDir ? getSequential(input) : getNonSequential(input)).filter((group) => group.deletes.length || group.adds.length || group.modifies.length);
|
|
25
|
-
const getSequential = ({ packageDirs, adds, modifies, deletes }) =>
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
}
|
|
25
|
+
const getSequential = ({ packageDirs, adds, modifies, deletes }) => {
|
|
26
|
+
const addsByPkgDir = groupByPkgDir(adds, packageDirs);
|
|
27
|
+
const modifiesByPkgDir = groupByPkgDir(modifies, packageDirs);
|
|
28
|
+
const deletesByPkgDir = groupByPkgDir(deletes, packageDirs);
|
|
29
|
+
return packageDirs.map((pkgDir) => {
|
|
30
|
+
const { name } = pkgDir;
|
|
31
|
+
return {
|
|
32
|
+
path: name,
|
|
33
|
+
adds: addsByPkgDir.get(name) ?? [],
|
|
34
|
+
modifies: modifiesByPkgDir.get(name) ?? [],
|
|
35
|
+
deletes: deletesByPkgDir.get(name) ?? [],
|
|
36
|
+
};
|
|
37
|
+
});
|
|
38
|
+
};
|
|
39
|
+
const groupByPkgDir = (filePaths, pkgDirs) => {
|
|
40
|
+
const groups = new Map();
|
|
41
|
+
pkgDirs.forEach((pkgDir) => {
|
|
42
|
+
groups.set(pkgDir.name, []);
|
|
43
|
+
});
|
|
44
|
+
filePaths.forEach((filePath) => {
|
|
45
|
+
pkgDirs.forEach((pkgDir) => {
|
|
46
|
+
const { name } = pkgDir;
|
|
47
|
+
if (pathIsInFolder(name)(filePath)) {
|
|
48
|
+
groups.get(name)?.push(filePath);
|
|
49
|
+
return;
|
|
50
|
+
}
|
|
51
|
+
});
|
|
52
|
+
});
|
|
53
|
+
return groups;
|
|
54
|
+
};
|
|
31
55
|
const getNonSequential = ({ packageDirs, adds, modifies, deletes }) => [
|
|
32
56
|
{
|
|
33
57
|
adds,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"gitComponentSetArray.js","sourceRoot":"","sources":["../../../src/SDR-extra/shared/gitComponentSetArray.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AACH,gGAAgG;AAChG,OAAO,EACL,YAAY,EACZ,cAAc,EAGd,sBAAsB,GACvB,MAAM,oCAAoC,CAAC;AAC5C,OAAO,EAAE,MAAM,EAAmB,MAAM,kBAAkB,CAAC;AAC3D,OAAO,KAAK,MAAM,iBAAiB,CAAC;AACpC,OAAO,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AACjD,OAAO,EAAE,qBAAqB,EAAE,cAAc,EAAE,MAAM,qDAAqD,CAAC;AAC5G,OAAO,EAAE,SAAS,EAAE,MAAM,kDAAkD,CAAC;AAC7E,OAAO,EAAE,gBAAgB,EAAE,MAAM,2DAA2D,CAAC;AAgB7F,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC,KAAuB,EAAE,YAAY,GAAG,KAAK,EAAiB,EAAE,CAC9F,CAAC,YAAY,CAAC,CAAC,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,gBAAgB,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,CACpE,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,IAAI,KAAK,CAAC,IAAI,CAAC,MAAM,IAAI,KAAK,CAAC,QAAQ,CAAC,MAAM,CAC9E,CAAC;AAEJ,MAAM,aAAa,GAAG,CAAC,EAAE,WAAW,EAAE,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAoB,EAAiB,EAAE,
|
|
1
|
+
{"version":3,"file":"gitComponentSetArray.js","sourceRoot":"","sources":["../../../src/SDR-extra/shared/gitComponentSetArray.ts"],"names":[],"mappings":"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"}
|