sfdx-git-delta 6.41.1 → 6.41.2
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 +1 -2
- package/lib/adapter/GitAdapter.d.ts +3 -1
- package/lib/adapter/GitAdapter.js +62 -52
- package/lib/adapter/GitAdapter.js.map +1 -1
- package/lib/adapter/gitBatchCatFile.d.ts +4 -1
- package/lib/adapter/gitBatchCatFile.js +30 -8
- package/lib/adapter/gitBatchCatFile.js.map +1 -1
- package/lib/adapter/treeIndex.d.ts +18 -0
- package/lib/adapter/treeIndex.js +75 -0
- package/lib/adapter/treeIndex.js.map +1 -0
- package/lib/metadata/MetadataRepository.d.ts +1 -0
- package/lib/metadata/MetadataRepositoryImpl.d.ts +1 -0
- package/lib/metadata/MetadataRepositoryImpl.js +13 -12
- package/lib/metadata/MetadataRepositoryImpl.js.map +1 -1
- package/lib/metadata/metadataManager.js +22 -14
- package/lib/metadata/metadataManager.js.map +1 -1
- package/lib/post-processor/flowTranslationProcessor.d.ts +1 -1
- package/lib/post-processor/flowTranslationProcessor.js.map +1 -1
- package/lib/post-processor/packageGenerator.js +13 -4
- package/lib/post-processor/packageGenerator.js.map +1 -1
- package/lib/service/inBundleHandler.js +7 -1
- package/lib/service/inBundleHandler.js.map +1 -1
- package/lib/service/inResourceHandler.js +9 -1
- package/lib/service/inResourceHandler.js.map +1 -1
- package/lib/service/reportingFolderHandler.js +4 -0
- package/lib/service/reportingFolderHandler.js.map +1 -1
- package/lib/service/sharedFolderHandler.js +4 -0
- package/lib/service/sharedFolderHandler.js.map +1 -1
- package/lib/service/typeHandlerFactory.d.ts +1 -2
- package/lib/service/typeHandlerFactory.js +8 -9
- package/lib/service/typeHandlerFactory.js.map +1 -1
- package/lib/utils/LoggingDecorator.d.ts +1 -1
- package/lib/utils/LoggingDecorator.js +26 -10
- package/lib/utils/LoggingDecorator.js.map +1 -1
- package/lib/utils/configValidator.js +4 -6
- package/lib/utils/configValidator.js.map +1 -1
- package/lib/utils/fsHelper.d.ts +1 -0
- package/lib/utils/fsHelper.js +3 -0
- package/lib/utils/fsHelper.js.map +1 -1
- package/lib/utils/ignoreHelper.d.ts +2 -0
- package/lib/utils/ignoreHelper.js +21 -19
- package/lib/utils/ignoreHelper.js.map +1 -1
- package/lib/utils/metadataDiff.js +2 -1
- package/lib/utils/metadataDiff.js.map +1 -1
- package/lib/utils/metadataElement.js +1 -3
- package/lib/utils/metadataElement.js.map +1 -1
- package/lib/utils/packageHelper.js +7 -3
- package/lib/utils/packageHelper.js.map +1 -1
- package/lib/utils/repoGitDiff.js +3 -4
- package/lib/utils/repoGitDiff.js.map +1 -1
- package/lib/utils/xmlHelper.js +7 -5
- package/lib/utils/xmlHelper.js.map +1 -1
- package/npm-shrinkwrap.json +159 -166
- package/oclif.manifest.json +1 -1
- package/package.json +14 -11
|
@@ -1,10 +1,14 @@
|
|
|
1
1
|
'use strict';
|
|
2
2
|
import { __decorate } from "tslib";
|
|
3
|
-
import
|
|
3
|
+
import XMLBuilder from 'fast-xml-builder';
|
|
4
4
|
import { OBJECT_TYPE } from '../constant/metadataConstants.js';
|
|
5
5
|
import { log } from './LoggingDecorator.js';
|
|
6
6
|
import { ATTRIBUTE_PREFIX, XML_HEADER_ATTRIBUTE_KEY } from './xmlHelper.js';
|
|
7
7
|
const frLocale = 'fr';
|
|
8
|
+
const collator = new Intl.Collator(frLocale);
|
|
9
|
+
// processEntities is false to mirror xmlHelper: values flowing through this
|
|
10
|
+
// builder are metadata type/member strings that never contain XML entities,
|
|
11
|
+
// so re-encoding is a no-op at best and a double-encode risk at worst.
|
|
8
12
|
const xmlBuilder = new XMLBuilder({
|
|
9
13
|
ignoreAttributes: false,
|
|
10
14
|
format: true,
|
|
@@ -22,7 +26,7 @@ export default class PackageBuilder {
|
|
|
22
26
|
const types = Array.from(strucDiffPerType.keys())
|
|
23
27
|
.sort(this._sortTypesWithMetadata)
|
|
24
28
|
.map(metadataType => ({
|
|
25
|
-
members: [...strucDiffPerType.get(metadataType)].sort(
|
|
29
|
+
members: [...strucDiffPerType.get(metadataType)].sort(collator.compare),
|
|
26
30
|
name: metadataType,
|
|
27
31
|
}));
|
|
28
32
|
const jsonObj = {
|
|
@@ -44,7 +48,7 @@ export default class PackageBuilder {
|
|
|
44
48
|
// See: https://github.com/scolladon/sfdx-git-delta/wiki/Metadata-Specificities#customobject-ordering
|
|
45
49
|
if (x === OBJECT_TYPE)
|
|
46
50
|
return -1; // @deprecated To remove when the order will not impact the result of the deployment
|
|
47
|
-
return
|
|
51
|
+
return collator.compare(x, y);
|
|
48
52
|
};
|
|
49
53
|
}
|
|
50
54
|
__decorate([
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"packageHelper.js","sourceRoot":"","sources":["../../src/utils/packageHelper.ts"],"names":[],"mappings":"AAAA,YAAY,CAAA;;AACZ,OAAO,
|
|
1
|
+
{"version":3,"file":"packageHelper.js","sourceRoot":"","sources":["../../src/utils/packageHelper.ts"],"names":[],"mappings":"AAAA,YAAY,CAAA;;AACZ,OAAO,UAAU,MAAM,kBAAkB,CAAA;AAEzC,OAAO,EAAE,WAAW,EAAE,MAAM,kCAAkC,CAAA;AAG9D,OAAO,EAAE,GAAG,EAAE,MAAM,uBAAuB,CAAA;AAC3C,OAAO,EAAE,gBAAgB,EAAE,wBAAwB,EAAE,MAAM,gBAAgB,CAAA;AAE3E,MAAM,QAAQ,GAAG,IAAI,CAAA;AACrB,MAAM,QAAQ,GAAG,IAAI,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAA;AAC5C,4EAA4E;AAC5E,4EAA4E;AAC5E,uEAAuE;AACvE,MAAM,UAAU,GAAG,IAAI,UAAU,CAAC;IAChC,gBAAgB,EAAE,KAAK;IACvB,MAAM,EAAE,IAAI;IACZ,QAAQ,EAAE,MAAM;IAChB,iBAAiB,EAAE,KAAK;IACxB,yBAAyB,EAAE,KAAK;IAChC,eAAe,EAAE,KAAK;CACvB,CAAC,CAAA;AAEF,MAAM,CAAC,OAAO,OAAO,cAAc;IACF;IAA/B,YAA+B,MAAc;QAAd,WAAM,GAAN,MAAM,CAAQ;IAAG,CAAC;IAG1C,YAAY,CAAC,gBAA0B;QAC5C,MAAM,KAAK,GAAG,KAAK,CAAC,IAAI,CAAC,gBAAgB,CAAC,IAAI,EAAE,CAAC;aAC9C,IAAI,CAAC,IAAI,CAAC,sBAAsB,CAAC;aACjC,GAAG,CAAC,YAAY,CAAC,EAAE,CAAC,CAAC;YACpB,OAAO,EAAE,CAAC,GAAG,gBAAgB,CAAC,GAAG,CAAC,YAAY,CAAE,CAAC,CAAC,IAAI,CACpD,QAAQ,CAAC,OAAO,CACjB;YACD,IAAI,EAAE,YAAY;SACnB,CAAC,CAAC,CAAA;QAEL,MAAM,OAAO,GAAG;YACd,CAAC,wBAAwB,CAAC,EAAE;gBAC1B,CAAC,GAAG,gBAAgB,SAAS,CAAC,EAAE,KAAK;gBACrC,CAAC,GAAG,gBAAgB,UAAU,CAAC,EAAE,OAAO;aACzC;YACD,OAAO,EAAE;gBACP,CAAC,GAAG,gBAAgB,OAAO,CAAC,EAAE,yCAAyC;gBACvE,KAAK;gBACL,OAAO,EAAE,GAAG,IAAI,CAAC,MAAM,CAAC,UAAU,IAAI;aACvC;SACF,CAAA;QAED,OAAO,UAAU,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,CAAA;IAC5C,CAAC;IAED,sBAAsB,GAAG,CAAC,CAAS,EAAE,CAAS,EAAE,EAAE;QAChD,oEAAoE;QACpE,+EAA+E;QAC/E,qGAAqG;QACrG,IAAI,CAAC,KAAK,WAAW;YAAE,OAAO,CAAC,CAAC,CAAA,CAAC,oFAAoF;QACrH,OAAO,QAAQ,CAAC,OAAO,CAAC,CAAC,EAAE,CAAC,CAAC,CAAA;IAC/B,CAAC,CAAA;CACF;AAhCQ;IADN,GAAG;kDAwBH"}
|
package/lib/utils/repoGitDiff.js
CHANGED
|
@@ -19,10 +19,9 @@ export default class RepoGitDiff {
|
|
|
19
19
|
async _treatResult(lines) {
|
|
20
20
|
const renamedElements = this._getRenamedElements(lines);
|
|
21
21
|
const ignoreHelper = await buildIgnoreHelper(this.config);
|
|
22
|
-
return lines
|
|
23
|
-
.
|
|
24
|
-
.
|
|
25
|
-
.filter((line) => ignoreHelper.keep(line));
|
|
22
|
+
return lines.filter((line) => Boolean(line) &&
|
|
23
|
+
this._filterInternal(line, renamedElements) &&
|
|
24
|
+
ignoreHelper.keep(line));
|
|
26
25
|
}
|
|
27
26
|
_getRenamedElements(lines) {
|
|
28
27
|
const linesPerDiffType = this._spreadLinePerDiffType(lines);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"repoGitDiff.js","sourceRoot":"","sources":["../../src/utils/repoGitDiff.ts"],"names":[],"mappings":"AAAA,YAAY,CAAA;AACZ,OAAO,UAAU,MAAM,0BAA0B,CAAA;AACjD,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,6BAA6B,CAAA;AAIhE,OAAO,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAA;AAErD,MAAM,CAAC,OAAO,OAAO,WAAW;IAIT;IACA;IAJF,UAAU,CAAY;IAEzC,YACqB,MAAc,EACd,QAA4B;QAD5B,WAAM,GAAN,MAAM,CAAQ;QACd,aAAQ,GAAR,QAAQ,CAAoB;QAE/C,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC,WAAW,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;IACvD,CAAC;IAEM,KAAK,CAAC,QAAQ;QACnB,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,YAAY,EAAE,CAAA;QAClD,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,CAAA;QACnD,OAAO,YAAY,CAAA;IACrB,CAAC;IAES,KAAK,CAAC,YAAY,CAAC,KAAe;QAC1C,MAAM,eAAe,GAAG,IAAI,CAAC,mBAAmB,CAAC,KAAK,CAAC,CAAA;QAEvD,MAAM,YAAY,GAAG,MAAM,iBAAiB,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;QAEzD,OAAO,KAAK
|
|
1
|
+
{"version":3,"file":"repoGitDiff.js","sourceRoot":"","sources":["../../src/utils/repoGitDiff.ts"],"names":[],"mappings":"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"}
|
package/lib/utils/xmlHelper.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
'use strict';
|
|
2
2
|
import FlexXMLParser from '@nodable/flexible-xml-parser';
|
|
3
|
-
import
|
|
3
|
+
import XMLBuilder from 'fast-xml-builder';
|
|
4
4
|
import { readPathFromGit } from './fsHelper.js';
|
|
5
5
|
const XML_PARSER_OPTION = {
|
|
6
6
|
skip: {
|
|
@@ -20,6 +20,10 @@ const XML_PARSER_OPTION = {
|
|
|
20
20
|
valueParsers: ['trim'],
|
|
21
21
|
},
|
|
22
22
|
};
|
|
23
|
+
// processEntities MUST stay false: FlexXMLParser keeps XML entities raw in the
|
|
24
|
+
// parsed JSON (e.g. "a & b" → "a & b", not "a & b"). Flipping this to
|
|
25
|
+
// true makes XMLBuilder re-encode the already-raw entities, producing
|
|
26
|
+
// double-encoded output like "a & b". Parser-builder symmetry matters.
|
|
23
27
|
const JSON_PARSER_OPTION = {
|
|
24
28
|
commentPropName: '#comment',
|
|
25
29
|
ignoreAttributes: false,
|
|
@@ -35,6 +39,7 @@ const JSON_PARSER_OPTION = {
|
|
|
35
39
|
suppressEmptyNode: false,
|
|
36
40
|
};
|
|
37
41
|
const xmlParser = new FlexXMLParser(XML_PARSER_OPTION);
|
|
42
|
+
const xmlBuilder = new XMLBuilder(JSON_PARSER_OPTION);
|
|
38
43
|
export const xml2Json = (xmlContent) => {
|
|
39
44
|
if (!xmlContent) {
|
|
40
45
|
return {};
|
|
@@ -50,10 +55,7 @@ export const parseXmlFileToJson = async (forRef, config) => {
|
|
|
50
55
|
const xmlContent = await readPathFromGit(forRef, config);
|
|
51
56
|
return xml2Json(xmlContent);
|
|
52
57
|
};
|
|
53
|
-
export const convertJsonToXml = (jsonContent) =>
|
|
54
|
-
const xmlBuilder = new XMLBuilder(JSON_PARSER_OPTION);
|
|
55
|
-
return xmlBuilder.build(jsonContent);
|
|
56
|
-
};
|
|
58
|
+
export const convertJsonToXml = (jsonContent) => xmlBuilder.build(jsonContent);
|
|
57
59
|
export const ATTRIBUTE_PREFIX = '@_';
|
|
58
60
|
export const XML_HEADER_ATTRIBUTE_KEY = '?xml';
|
|
59
61
|
//# sourceMappingURL=xmlHelper.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"xmlHelper.js","sourceRoot":"","sources":["../../src/utils/xmlHelper.ts"],"names":[],"mappings":"AAAA,YAAY,CAAA;AAEZ,OAAO,aAAkC,MAAM,8BAA8B,CAAA;AAC7E,OAAO,
|
|
1
|
+
{"version":3,"file":"xmlHelper.js","sourceRoot":"","sources":["../../src/utils/xmlHelper.ts"],"names":[],"mappings":"AAAA,YAAY,CAAA;AAEZ,OAAO,aAAkC,MAAM,8BAA8B,CAAA;AAC7E,OAAO,UAAU,MAAM,kBAAkB,CAAA;AAKzC,OAAO,EAAE,eAAe,EAAE,MAAM,eAAe,CAAA;AAI/C,MAAM,iBAAiB,GAAe;IACpC,IAAI,EAAE;QACJ,UAAU,EAAE,KAAK;QACjB,QAAQ,EAAE,KAAK;QACf,OAAO,EAAE,KAAK;QACd,WAAW,EAAE,KAAK;KACnB;IACD,OAAO,EAAE;QACP,OAAO,EAAE,UAAU;KACpB;IACD,UAAU,EAAE;QACV,MAAM,EAAE,IAAI;QACZ,YAAY,EAAE,EAAe;KAC9B;IACD,IAAI,EAAE;QACJ,YAAY,EAAE,CAAC,MAAM,CAAc;KACpC;CACY,CAAA;AACf,+EAA+E;AAC/E,8EAA8E;AAC9E,sEAAsE;AACtE,+EAA+E;AAC/E,MAAM,kBAAkB,GAAG;IACzB,eAAe,EAAE,UAAU;IAC3B,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;IACtB,MAAM,EAAE,IAAI;IACZ,QAAQ,EAAE,MAAM;IAChB,yBAAyB,EAAE,KAAK;IAChC,iBAAiB,EAAE,KAAK;CACzB,CAAA;AAED,MAAM,SAAS,GAAG,IAAI,aAAa,CAAC,iBAAiB,CAAC,CAAA;AACtD,MAAM,UAAU,GAAG,IAAI,UAAU,CAAC,kBAAkB,CAAC,CAAA;AAErD,MAAM,CAAC,MAAM,QAAQ,GAAG,CAAC,UAAkB,EAAc,EAAE;IACzD,IAAI,CAAC,UAAU,EAAE,CAAC;QAChB,OAAO,EAAE,CAAA;IACX,CAAC;IACD,IAAI,CAAC;QACH,OAAO,SAAS,CAAC,KAAK,CAAC,UAAU,CAAe,CAAA;IAClD,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,EAAE,CAAA;IACX,CAAC;AACH,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,kBAAkB,GAAG,KAAK,EACrC,MAAkB,EAClB,MAAc,EACO,EAAE;IACvB,MAAM,UAAU,GAAG,MAAM,eAAe,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IACxD,OAAO,QAAQ,CAAC,UAAU,CAAC,CAAA;AAC7B,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAAC,WAAiC,EAAU,EAAE,CAC5E,UAAU,CAAC,KAAK,CAAC,WAAW,CAAC,CAAA;AAE/B,MAAM,CAAC,MAAM,gBAAgB,GAAG,IAAI,CAAA;AAEpC,MAAM,CAAC,MAAM,wBAAwB,GAAG,MAAM,CAAA"}
|