sfdx-git-delta 5.25.0 → 5.25.1
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 +7 -0
- package/README.md +1 -1
- package/lib/service/ObjectTranslationHandler.js +1 -1
- package/lib/service/ObjectTranslationHandler.js.map +1 -1
- package/lib/service/inFileHandler.d.ts +0 -1
- package/lib/service/inFileHandler.js +2 -3
- package/lib/service/inFileHandler.js.map +1 -1
- package/lib/utils/fxpHelper.d.ts +1 -0
- package/lib/utils/fxpHelper.js +1 -0
- package/lib/utils/fxpHelper.js.map +1 -1
- package/lib/utils/metadataDiff.d.ts +4 -2
- package/lib/utils/metadataDiff.js +12 -5
- package/lib/utils/metadataDiff.js.map +1 -1
- package/oclif.manifest.json +1 -1
- package/package.json +3 -3
package/CHANGELOG.md
CHANGED
|
@@ -4,6 +4,13 @@
|
|
|
4
4
|
|
|
5
5
|
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.
|
|
6
6
|
|
|
7
|
+
## [5.25.1](https://github.com/scolladon/sfdx-git-delta/compare/v5.25.0...v5.25.1) (2023-08-30)
|
|
8
|
+
|
|
9
|
+
|
|
10
|
+
### Bug Fixes
|
|
11
|
+
|
|
12
|
+
* empty inFile metadata file generation when nothing scopable changed ([#680](https://github.com/scolladon/sfdx-git-delta/issues/680)) ([0b3413c](https://github.com/scolladon/sfdx-git-delta/commit/0b3413c0b54795dd259d5ee4f03e72bdc81054dc))
|
|
13
|
+
|
|
7
14
|
## [5.25.0](https://github.com/scolladon/sfdx-git-delta/compare/v5.24.2...v5.25.0) (2023-08-28)
|
|
8
15
|
|
|
9
16
|
|
package/README.md
CHANGED
|
@@ -187,7 +187,7 @@ OPTIONS
|
|
|
187
187
|
this command invocation
|
|
188
188
|
```
|
|
189
189
|
|
|
190
|
-
_See code: [src/commands/sgd/source/delta.ts](https://github.com/scolladon/sfdx-git-delta/blob/v5.25.
|
|
190
|
+
_See code: [src/commands/sgd/source/delta.ts](https://github.com/scolladon/sfdx-git-delta/blob/v5.25.1/src/commands/sgd/source/delta.ts)_
|
|
191
191
|
<!-- commandsstop -->
|
|
192
192
|
|
|
193
193
|
### Windows users
|
|
@@ -18,7 +18,7 @@ class ObjectTranslationHandler extends ResourceHandler {
|
|
|
18
18
|
const inFileMetadata = getInFileAttributes(this.metadata);
|
|
19
19
|
const metadataDiff = new MetadataDiff(this.config, this.metadata, inFileMetadata);
|
|
20
20
|
await metadataDiff.compare(path);
|
|
21
|
-
const xmlContent = metadataDiff.prune();
|
|
21
|
+
const { xmlContent } = metadataDiff.prune();
|
|
22
22
|
await writeFile(path, xmlContent, this.config);
|
|
23
23
|
}
|
|
24
24
|
getObjectTranslationPath() {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ObjectTranslationHandler.js","sourceRoot":"","sources":["../../src/service/ObjectTranslationHandler.js"],"names":[],"mappings":"AAAA,YAAY,CAAA;AACZ,MAAM,eAAe,GAAG,OAAO,CAAC,qBAAqB,CAAC,CAAA;AACtD,MAAM,eAAe,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAAA;AACpD,MAAM,EAAE,mBAAmB,EAAE,GAAG,OAAO,CAAC,6BAA6B,CAAC,CAAA;AACtE,MAAM,EACJ,kCAAkC,GACnC,GAAG,OAAO,CAAC,4BAA4B,CAAC,CAAA;AACzC,MAAM,EAAE,SAAS,EAAE,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAAA;AAClD,MAAM,EAAE,KAAK,EAAE,GAAG,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC,CAAA;AACtC,MAAM,YAAY,GAAG,OAAO,CAAC,uBAAuB,CAAC,CAAA;AAErD,MAAM,wBAAyB,SAAQ,eAAe;IACpD,KAAK,CAAC,cAAc;QAClB,MAAM,eAAe,CAAC,SAAS,CAAC,cAAc,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;QAC1D,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,aAAa;YAAE,OAAM;QAEtC,MAAM,qBAAqB,GAAG,IAAI,CAAC,wBAAwB,EAAE,CAAA;QAC7D,MAAM,IAAI,CAAC,sBAAsB,CAAC,qBAAqB,CAAC,CAAA;IAC1D,CAAC;IAED,KAAK,CAAC,sBAAsB,CAAC,IAAI;QAC/B,MAAM,cAAc,GAAG,mBAAmB,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;QACzD,MAAM,YAAY,GAAG,IAAI,YAAY,CACnC,IAAI,CAAC,MAAM,EACX,IAAI,CAAC,QAAQ,EACb,cAAc,CACf,CAAA;QACD,MAAM,YAAY,CAAC,OAAO,CAAC,IAAI,CAAC,CAAA;QAChC,MAAM,UAAU,GAAG,YAAY,CAAC,KAAK,EAAE,CAAA;
|
|
1
|
+
{"version":3,"file":"ObjectTranslationHandler.js","sourceRoot":"","sources":["../../src/service/ObjectTranslationHandler.js"],"names":[],"mappings":"AAAA,YAAY,CAAA;AACZ,MAAM,eAAe,GAAG,OAAO,CAAC,qBAAqB,CAAC,CAAA;AACtD,MAAM,eAAe,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAAA;AACpD,MAAM,EAAE,mBAAmB,EAAE,GAAG,OAAO,CAAC,6BAA6B,CAAC,CAAA;AACtE,MAAM,EACJ,kCAAkC,GACnC,GAAG,OAAO,CAAC,4BAA4B,CAAC,CAAA;AACzC,MAAM,EAAE,SAAS,EAAE,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAAA;AAClD,MAAM,EAAE,KAAK,EAAE,GAAG,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC,CAAA;AACtC,MAAM,YAAY,GAAG,OAAO,CAAC,uBAAuB,CAAC,CAAA;AAErD,MAAM,wBAAyB,SAAQ,eAAe;IACpD,KAAK,CAAC,cAAc;QAClB,MAAM,eAAe,CAAC,SAAS,CAAC,cAAc,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;QAC1D,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,aAAa;YAAE,OAAM;QAEtC,MAAM,qBAAqB,GAAG,IAAI,CAAC,wBAAwB,EAAE,CAAA;QAC7D,MAAM,IAAI,CAAC,sBAAsB,CAAC,qBAAqB,CAAC,CAAA;IAC1D,CAAC;IAED,KAAK,CAAC,sBAAsB,CAAC,IAAI;QAC/B,MAAM,cAAc,GAAG,mBAAmB,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;QACzD,MAAM,YAAY,GAAG,IAAI,YAAY,CACnC,IAAI,CAAC,MAAM,EACX,IAAI,CAAC,QAAQ,EACb,cAAc,CACf,CAAA;QACD,MAAM,YAAY,CAAC,OAAO,CAAC,IAAI,CAAC,CAAA;QAChC,MAAM,EAAE,UAAU,EAAE,GAAG,YAAY,CAAC,KAAK,EAAE,CAAA;QAC3C,MAAM,SAAS,CAAC,IAAI,EAAE,UAAU,EAAE,IAAI,CAAC,MAAM,CAAC,CAAA;IAChD,CAAC;IAED,wBAAwB;QACtB,iFAAiF;QACjF,sKAAsK;QACtK,OAAO,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,GAAG,GAAG,GAAG,GAClC,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,YAAY,CAAC,MAAM,GAAG,CAAC,CAChD,IAAI,kCAAkC,EAAE,CAAA;IAC1C,CAAC;IAED,iBAAiB;QACf,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,kCAAkC,CAAC,CAAA;IAChE,CAAC;CACF;AAED,MAAM,CAAC,OAAO,GAAG,wBAAwB,CAAA"}
|
|
@@ -3,7 +3,6 @@ declare class InFileHandler extends StandardHandler {
|
|
|
3
3
|
metadataDiff: MetadataDiff;
|
|
4
4
|
handleDeletion(): Promise<void>;
|
|
5
5
|
_compareRevision(): Promise<void>;
|
|
6
|
-
_addedMembers: any;
|
|
7
6
|
_writeScopedContent(): Promise<void>;
|
|
8
7
|
_storeComparison(store: any, content: any): void;
|
|
9
8
|
_fillPackage(store: any, subType: any, member: any, ...args: any[]): void;
|
|
@@ -34,13 +34,12 @@ class InFileHandler extends StandardHandler {
|
|
|
34
34
|
}
|
|
35
35
|
async _compareRevision() {
|
|
36
36
|
const { added, deleted } = await this.metadataDiff.compare(this.line);
|
|
37
|
-
this._addedMembers = added;
|
|
38
37
|
this._storeComparison(this.diffs.destructiveChanges, deleted);
|
|
39
38
|
this._storeComparison(this.diffs.package, added);
|
|
40
39
|
}
|
|
41
40
|
async _writeScopedContent() {
|
|
42
|
-
|
|
43
|
-
|
|
41
|
+
const { xmlContent, isEmpty } = this.metadataDiff.prune();
|
|
42
|
+
if (!isEmpty) {
|
|
44
43
|
await writeFile(this.line, xmlContent, this.config);
|
|
45
44
|
}
|
|
46
45
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"inFileHandler.js","sourceRoot":"","sources":["../../src/service/inFileHandler.js"],"names":[],"mappings":"AAAA,YAAY,CAAA;AACZ,MAAM,EACJ,eAAe,EACf,cAAc,GACf,GAAG,OAAO,CAAC,4BAA4B,CAAC,CAAA;AACzC,MAAM,eAAe,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAAA;AACpD,MAAM,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC,CAAA;AACpC,MAAM,EAAE,SAAS,EAAE,GAAG,EAAE,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAAA;AACvD,MAAM,EACJ,mBAAmB,EACnB,UAAU,GACX,GAAG,OAAO,CAAC,6BAA6B,CAAC,CAAA;AAC1C,MAAM,YAAY,GAAG,OAAO,CAAC,uBAAuB,CAAC,CAAA;AACrD,MAAM,EACJ,oBAAoB,EACpB,wBAAwB,GACzB,GAAG,OAAO,CAAC,wBAAwB,CAAC,CAAA;AAErC,MAAM,WAAW,GAAG,IAAI,CAAC,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAA;AACxD,MAAM,aAAa,GAAG,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,EAAE,EAAE,CAC1C,OAAO,KAAK,cAAc,CAAC,CAAC,CAAC,GAAG,WAAW,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAA;AAE3D,MAAM,aAAc,SAAQ,eAAe;IACzC,YAAY,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,QAAQ;QACpC,KAAK,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,QAAQ,CAAC,CAAA;QACjC,MAAM,cAAc,GAAG,mBAAmB,CAAC,QAAQ,CAAC,CAAA;QACpD,IAAI,CAAC,YAAY,GAAG,IAAI,YAAY,CAAC,IAAI,CAAC,MAAM,EAAE,QAAQ,EAAE,cAAc,CAAC,CAAA;IAC7E,CAAC;IAED,KAAK,CAAC,cAAc;QAClB,MAAM,KAAK,CAAC,cAAc,EAAE,CAAA;QAC5B,MAAM,IAAI,CAAC,gBAAgB,EAAE,CAAA;QAE7B,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,aAAa;YAAE,OAAM;QACtC,MAAM,IAAI,CAAC,mBAAmB,EAAE,CAAA;IAClC,CAAC;IAED,KAAK,CAAC,cAAc;QAClB,IAAI,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,SAAS,EAAE;YAC1C,MAAM,KAAK,CAAC,cAAc,EAAE,CAAA;SAC7B;aAAM;YACL,MAAM,IAAI,CAAC,gBAAgB,EAAE,CAAA;SAC9B;IACH,CAAC;IAED,KAAK,CAAC,kBAAkB;QACtB,MAAM,IAAI,CAAC,cAAc,EAAE,CAAA;IAC7B,CAAC;IAED,KAAK,CAAC,gBAAgB;QACpB,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;QACrE,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"inFileHandler.js","sourceRoot":"","sources":["../../src/service/inFileHandler.js"],"names":[],"mappings":"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"}
|
package/lib/utils/fxpHelper.d.ts
CHANGED
package/lib/utils/fxpHelper.js
CHANGED
|
@@ -37,4 +37,5 @@ module.exports.asArray = asArray;
|
|
|
37
37
|
module.exports.convertJsonToXml = convertJsonToXml;
|
|
38
38
|
module.exports.parseXmlFileToJson = parseXmlFileToJson;
|
|
39
39
|
module.exports.xml2Json = xml2Json;
|
|
40
|
+
module.exports.ATTRIBUTE_PREFIX = '@_';
|
|
40
41
|
//# sourceMappingURL=fxpHelper.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fxpHelper.js","sourceRoot":"","sources":["../../src/utils/fxpHelper.js"],"names":[],"mappings":"AAAA,YAAY,CAAA;AAEZ,MAAM,EAAE,UAAU,EAAE,SAAS,EAAE,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAAA;AAC5D,MAAM,EAAE,eAAe,EAAE,GAAG,OAAO,CAAC,YAAY,CAAC,CAAA;AACjD,MAAM,EAAE,kBAAkB,EAAE,GAAG,OAAO,CAAC,qBAAqB,CAAC,CAAA;AAE7D,MAAM,iBAAiB,GAAG;IACxB,gBAAgB,EAAE,KAAK;IACvB,eAAe,EAAE,KAAK;IACtB,aAAa,EAAE,KAAK;IACpB,cAAc,EAAE,KAAK;IACrB,mBAAmB,EAAE,KAAK;IAC1B,UAAU,EAAE,IAAI;IAChB,eAAe,EAAE,KAAK;CACvB,CAAA;AACD,MAAM,kBAAkB,GAAG;IACzB,GAAG,iBAAiB;IACpB,MAAM,EAAE,IAAI;IACZ,QAAQ,EAAE,MAAM;CACjB,CAAA;AAED,MAAM,OAAO,GAAG,IAAI,CAAC,EAAE;IACrB,OAAO,IAAI,IAAI,IAAI,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAA;AAClE,CAAC,CAAA;AAED,MAAM,QAAQ,GAAG,UAAU,CAAC,EAAE;IAC5B,MAAM,SAAS,GAAG,IAAI,SAAS,CAAC,iBAAiB,CAAC,CAAA;IAClD,OAAO,SAAS,CAAC,KAAK,CAAC,UAAU,CAAC,CAAA;AACpC,CAAC,CAAA;AAED,MAAM,kBAAkB,GAAG,KAAK,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE;IAChD,MAAM,UAAU,GAAG,MAAM,eAAe,CAAC,IAAI,EAAE,MAAM,CAAC,CAAA;IACtD,OAAO,QAAQ,CAAC,UAAU,CAAC,CAAA;AAC7B,CAAC,CAAA;AAED,MAAM,gBAAgB,GAAG,WAAW,CAAC,EAAE;IACrC,MAAM,UAAU,GAAG,IAAI,UAAU,CAAC,kBAAkB,CAAC,CAAA;IACrD,OAAO,UAAU;SACd,KAAK,CAAC,WAAW,CAAC;SAClB,OAAO,CAAC,kBAAkB,EAAE,GAAG,kBAAkB,EAAE,CAAC,CAAA;AACzD,CAAC,CAAA;AAED,MAAM,CAAC,OAAO,CAAC,OAAO,GAAG,OAAO,CAAA;AAChC,MAAM,CAAC,OAAO,CAAC,gBAAgB,GAAG,gBAAgB,CAAA;AAClD,MAAM,CAAC,OAAO,CAAC,kBAAkB,GAAG,kBAAkB,CAAA;AACtD,MAAM,CAAC,OAAO,CAAC,QAAQ,GAAG,QAAQ,CAAA"}
|
|
1
|
+
{"version":3,"file":"fxpHelper.js","sourceRoot":"","sources":["../../src/utils/fxpHelper.js"],"names":[],"mappings":"AAAA,YAAY,CAAA;AAEZ,MAAM,EAAE,UAAU,EAAE,SAAS,EAAE,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAAA;AAC5D,MAAM,EAAE,eAAe,EAAE,GAAG,OAAO,CAAC,YAAY,CAAC,CAAA;AACjD,MAAM,EAAE,kBAAkB,EAAE,GAAG,OAAO,CAAC,qBAAqB,CAAC,CAAA;AAE7D,MAAM,iBAAiB,GAAG;IACxB,gBAAgB,EAAE,KAAK;IACvB,eAAe,EAAE,KAAK;IACtB,aAAa,EAAE,KAAK;IACpB,cAAc,EAAE,KAAK;IACrB,mBAAmB,EAAE,KAAK;IAC1B,UAAU,EAAE,IAAI;IAChB,eAAe,EAAE,KAAK;CACvB,CAAA;AACD,MAAM,kBAAkB,GAAG;IACzB,GAAG,iBAAiB;IACpB,MAAM,EAAE,IAAI;IACZ,QAAQ,EAAE,MAAM;CACjB,CAAA;AAED,MAAM,OAAO,GAAG,IAAI,CAAC,EAAE;IACrB,OAAO,IAAI,IAAI,IAAI,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAA;AAClE,CAAC,CAAA;AAED,MAAM,QAAQ,GAAG,UAAU,CAAC,EAAE;IAC5B,MAAM,SAAS,GAAG,IAAI,SAAS,CAAC,iBAAiB,CAAC,CAAA;IAClD,OAAO,SAAS,CAAC,KAAK,CAAC,UAAU,CAAC,CAAA;AACpC,CAAC,CAAA;AAED,MAAM,kBAAkB,GAAG,KAAK,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE;IAChD,MAAM,UAAU,GAAG,MAAM,eAAe,CAAC,IAAI,EAAE,MAAM,CAAC,CAAA;IACtD,OAAO,QAAQ,CAAC,UAAU,CAAC,CAAA;AAC7B,CAAC,CAAA;AAED,MAAM,gBAAgB,GAAG,WAAW,CAAC,EAAE;IACrC,MAAM,UAAU,GAAG,IAAI,UAAU,CAAC,kBAAkB,CAAC,CAAA;IACrD,OAAO,UAAU;SACd,KAAK,CAAC,WAAW,CAAC;SAClB,OAAO,CAAC,kBAAkB,EAAE,GAAG,kBAAkB,EAAE,CAAC,CAAA;AACzD,CAAC,CAAA;AAED,MAAM,CAAC,OAAO,CAAC,OAAO,GAAG,OAAO,CAAA;AAChC,MAAM,CAAC,OAAO,CAAC,gBAAgB,GAAG,gBAAgB,CAAA;AAClD,MAAM,CAAC,OAAO,CAAC,kBAAkB,GAAG,kBAAkB,CAAA;AACtD,MAAM,CAAC,OAAO,CAAC,QAAQ,GAAG,QAAQ,CAAA;AAClC,MAAM,CAAC,OAAO,CAAC,gBAAgB,GAAG,IAAI,CAAA"}
|
|
@@ -15,9 +15,11 @@ declare class MetadataDiff {
|
|
|
15
15
|
compare(path: any): Promise<{
|
|
16
16
|
added: any;
|
|
17
17
|
deleted: any;
|
|
18
|
-
jsonContent: any;
|
|
19
18
|
}>;
|
|
20
19
|
toContent: any;
|
|
21
20
|
add: any;
|
|
22
|
-
prune(
|
|
21
|
+
prune(): {
|
|
22
|
+
xmlContent: any;
|
|
23
|
+
isEmpty: boolean;
|
|
24
|
+
};
|
|
23
25
|
}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
'use strict';
|
|
2
|
-
const { asArray, parseXmlFileToJson, convertJsonToXml } = require('./fxpHelper');
|
|
2
|
+
const { asArray, parseXmlFileToJson, convertJsonToXml, ATTRIBUTE_PREFIX, } = require('./fxpHelper');
|
|
3
3
|
const { isEqual } = require('lodash');
|
|
4
4
|
const { fillPackageWithParameter } = require('./packageHelper');
|
|
5
5
|
// Store functional area
|
|
@@ -14,6 +14,11 @@ const selectKey = attributes => type => elem => elem[attributes.get(type).key];
|
|
|
14
14
|
const getRootMetadata = fileContent => Object.values(fileContent)?.[1] ?? {};
|
|
15
15
|
const getSubTypeTags = attributes => fileContent => Object.keys(getRootMetadata(fileContent)).filter(tag => attributes.has(tag));
|
|
16
16
|
const extractMetadataForSubtype = fileContent => subType => asArray(getRootMetadata(fileContent)?.[subType]);
|
|
17
|
+
const isEmpty = fileContent => Object.entries(getRootMetadata(fileContent))
|
|
18
|
+
.filter(([key]) => !key.startsWith(ATTRIBUTE_PREFIX))
|
|
19
|
+
.every(value => value === null ||
|
|
20
|
+
value === undefined ||
|
|
21
|
+
(Array.isArray(value) && value.length === 0));
|
|
17
22
|
// Diff processing functional area
|
|
18
23
|
const compareContent = attributes => (contentAtRef, otherContent, predicat) => getSubTypeTags(attributes)(contentAtRef)
|
|
19
24
|
.flatMap(processMetadataForSubType(contentAtRef, otherContent, predicat, attributes))
|
|
@@ -79,12 +84,14 @@ class MetadataDiff {
|
|
|
79
84
|
return {
|
|
80
85
|
added: this.add,
|
|
81
86
|
deleted: del,
|
|
82
|
-
jsonContent: this.toContent,
|
|
83
87
|
};
|
|
84
88
|
}
|
|
85
|
-
prune(
|
|
86
|
-
const prunedContent = generatePartialJSON(this.attributes)(
|
|
87
|
-
return
|
|
89
|
+
prune() {
|
|
90
|
+
const prunedContent = generatePartialJSON(this.attributes)(this.toContent)(this.add);
|
|
91
|
+
return {
|
|
92
|
+
xmlContent: convertJsonToXml(prunedContent),
|
|
93
|
+
isEmpty: isEmpty(prunedContent),
|
|
94
|
+
};
|
|
88
95
|
}
|
|
89
96
|
}
|
|
90
97
|
module.exports = MetadataDiff;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"metadataDiff.js","sourceRoot":"","sources":["../../src/utils/metadataDiff.js"],"names":[],"mappings":"AAAA,YAAY,CAAA;AAEZ,MAAM,
|
|
1
|
+
{"version":3,"file":"metadataDiff.js","sourceRoot":"","sources":["../../src/utils/metadataDiff.js"],"names":[],"mappings":"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"}
|
package/oclif.manifest.json
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":"5.25.
|
|
1
|
+
{"version":"5.25.1","commands":{"sgd:source:delta":{"id":"sgd:source:delta","description":"Generate the sfdx content in source format and destructive change from two git commits","usage":"<%= command.id %> -f <string> [-t <string>] [-r <filepath>] [-i <filepath>] [-D <filepath>] [-s <filepath>] [-W] [-o <filepath>] [-a <number>] [-d] [-n <filepath>] [-N <filepath>] [--json] [--loglevel trace|debug|info|warn|error|fatal|TRACE|DEBUG|INFO|WARN|ERROR|FATAL]","pluginName":"sfdx-git-delta","pluginType":"core","aliases":[],"flags":{"json":{"name":"json","type":"boolean","description":"format output as json","allowNo":false},"loglevel":{"name":"loglevel","type":"option","description":"logging level for this command invocation","required":false,"helpValue":"(trace|debug|info|warn|error|fatal|TRACE|DEBUG|INFO|WARN|ERROR|FATAL)","options":["trace","debug","info","warn","error","fatal","TRACE","DEBUG","INFO","WARN","ERROR","FATAL"],"default":"warn"},"to":{"name":"to","type":"option","char":"t","description":"commit sha to where the diff is done","default":"HEAD"},"from":{"name":"from","type":"option","char":"f","description":"commit sha from where the diff is done","required":true},"repo":{"name":"repo","type":"option","char":"r","description":"git repository location","default":"./"},"ignore":{"name":"ignore","type":"option","char":"i","description":"file listing paths to explicitly ignore for any diff actions"},"ignore-destructive":{"name":"ignore-destructive","type":"option","char":"D","description":"file listing paths to explicitly ignore for any destructive actions"},"source":{"name":"source","type":"option","char":"s","description":"source folder focus location related to --repo","default":"./"},"ignore-whitespace":{"name":"ignore-whitespace","type":"boolean","char":"W","description":"ignore git diff whitespace (space, tab, eol) changes","allowNo":false},"output":{"name":"output","type":"option","char":"o","description":"source package specific output","default":"./output"},"api-version":{"name":"api-version","type":"option","char":"a","description":"salesforce metadata API version, default to sfdx-project.json \"sourceApiVersion\" attribute or latest version"},"generate-delta":{"name":"generate-delta","type":"boolean","char":"d","description":"generate delta files in [--output] folder","allowNo":false},"include":{"name":"include","type":"option","char":"n","description":"file listing paths to explicitly include for any diff actions"},"include-destructive":{"name":"include-destructive","type":"option","char":"N","description":"file listing paths to explicitly include for any destructive actions"}},"args":[]}}}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "sfdx-git-delta",
|
|
3
|
-
"version": "5.25.
|
|
3
|
+
"version": "5.25.1",
|
|
4
4
|
"description": "Generate the sfdx content in source format and destructive change from two git commits",
|
|
5
5
|
"keyword": [
|
|
6
6
|
"salesforce",
|
|
@@ -74,7 +74,7 @@
|
|
|
74
74
|
"@swc/core": "^1.3.80",
|
|
75
75
|
"@types/mocha": "^10.0.1",
|
|
76
76
|
"@types/node": "^20.5.7",
|
|
77
|
-
"@typescript-eslint/parser": "^6.
|
|
77
|
+
"@typescript-eslint/parser": "^6.5.0",
|
|
78
78
|
"benchmark": "^2.1.4",
|
|
79
79
|
"chai": "^4.3.8",
|
|
80
80
|
"depcheck": "^1.4.5",
|
|
@@ -86,7 +86,7 @@
|
|
|
86
86
|
"lint-staged": "^14.0.1",
|
|
87
87
|
"mocha": "^10.2.0",
|
|
88
88
|
"nyc": "^15.1.0",
|
|
89
|
-
"prettier": "^3.0.
|
|
89
|
+
"prettier": "^3.0.3",
|
|
90
90
|
"shx": "^0.3.4",
|
|
91
91
|
"sinon": "^15.2.0",
|
|
92
92
|
"ts-node": "^10.9.1",
|