sf-git-merge-driver 1.0.0-dev-3.14037427096-1 → 1.0.0-dev-3.14221786808-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/README.md +3 -3
- package/lib/commands/git/merge/driver/run.js +8 -1
- package/lib/commands/git/merge/driver/run.js.map +1 -1
- package/lib/constant/metadataConstant.js +45 -10
- package/lib/constant/metadataConstant.js.map +1 -1
- package/lib/driver/MergeDriver.d.ts +1 -1
- package/lib/driver/MergeDriver.js +2 -1
- package/lib/driver/MergeDriver.js.map +1 -1
- package/lib/merger/JsonMerger.d.ts +4 -1
- package/lib/merger/JsonMerger.js +10 -7
- package/lib/merger/JsonMerger.js.map +1 -1
- package/lib/merger/XmlMerger.d.ts +4 -1
- package/lib/merger/XmlMerger.js +8 -5
- package/lib/merger/XmlMerger.js.map +1 -1
- package/lib/merger/conflictMarker.d.ts +5 -1
- package/lib/merger/conflictMarker.js +16 -9
- package/lib/merger/conflictMarker.js.map +1 -1
- package/lib/merger/textAttribute.js +5 -5
- package/lib/merger/textAttribute.js.map +1 -1
- package/lib/service/MetadataService.js +117 -51
- package/lib/service/MetadataService.js.map +1 -1
- package/messages/run.md +8 -0
- package/npm-shrinkwrap.json +73 -59
- package/oclif.manifest.json +1 -1
- package/package.json +6 -6
package/README.md
CHANGED
|
@@ -47,7 +47,7 @@ EXAMPLES
|
|
|
47
47
|
$ sf git merge driver install
|
|
48
48
|
```
|
|
49
49
|
|
|
50
|
-
_See code: [src/commands/git/merge/driver/install.ts](https://github.com/scolladon/sf-git-merge-driver/blob/v1.0.0-dev-3.
|
|
50
|
+
_See code: [src/commands/git/merge/driver/install.ts](https://github.com/scolladon/sf-git-merge-driver/blob/v1.0.0-dev-3.14221786808-1/src/commands/git/merge/driver/install.ts)_
|
|
51
51
|
|
|
52
52
|
## `sf git merge driver run`
|
|
53
53
|
|
|
@@ -85,7 +85,7 @@ EXAMPLES
|
|
|
85
85
|
- output-file is the path to the file where the merged content will be written
|
|
86
86
|
```
|
|
87
87
|
|
|
88
|
-
_See code: [src/commands/git/merge/driver/run.ts](https://github.com/scolladon/sf-git-merge-driver/blob/v1.0.0-dev-3.
|
|
88
|
+
_See code: [src/commands/git/merge/driver/run.ts](https://github.com/scolladon/sf-git-merge-driver/blob/v1.0.0-dev-3.14221786808-1/src/commands/git/merge/driver/run.ts)_
|
|
89
89
|
|
|
90
90
|
## `sf git merge driver uninstall`
|
|
91
91
|
|
|
@@ -112,7 +112,7 @@ EXAMPLES
|
|
|
112
112
|
$ sf git merge driver uninstall
|
|
113
113
|
```
|
|
114
114
|
|
|
115
|
-
_See code: [src/commands/git/merge/driver/uninstall.ts](https://github.com/scolladon/sf-git-merge-driver/blob/v1.0.0-dev-3.
|
|
115
|
+
_See code: [src/commands/git/merge/driver/uninstall.ts](https://github.com/scolladon/sf-git-merge-driver/blob/v1.0.0-dev-3.14221786808-1/src/commands/git/merge/driver/uninstall.ts)_
|
|
116
116
|
<!-- commandsstop -->
|
|
117
117
|
|
|
118
118
|
## How It Works
|
|
@@ -36,7 +36,14 @@ export default class Run extends SfCommand {
|
|
|
36
36
|
async run() {
|
|
37
37
|
const { flags } = await this.parse(Run);
|
|
38
38
|
const mergeDriver = new MergeDriver();
|
|
39
|
-
await mergeDriver.mergeFiles(flags['ancestor-file'], flags['our-file'], flags['theirs-file'], flags['output-file']);
|
|
39
|
+
const hasConflict = await mergeDriver.mergeFiles(flags['ancestor-file'], flags['our-file'], flags['theirs-file'], flags['output-file']);
|
|
40
|
+
if (hasConflict) {
|
|
41
|
+
console.error(messages.getMessage('result.withconflict') + ' ' + flags['output-file']);
|
|
42
|
+
this.exit(1);
|
|
43
|
+
}
|
|
44
|
+
else {
|
|
45
|
+
console.info(messages.getMessage('result.successful') + ' ' + flags['output-file']);
|
|
46
|
+
}
|
|
40
47
|
}
|
|
41
48
|
}
|
|
42
49
|
//# sourceMappingURL=run.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"run.js","sourceRoot":"","sources":["../../../../../src/commands/git/merge/driver/run.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAA;AAC3C,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAA;AAC9D,OAAO,EAAE,WAAW,EAAE,MAAM,mCAAmC,CAAA;AAE/D,QAAQ,CAAC,kCAAkC,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;AAC5D,MAAM,QAAQ,GAAG,QAAQ,CAAC,YAAY,CAAC,qBAAqB,EAAE,KAAK,CAAC,CAAA;AAEpE,MAAM,CAAC,OAAO,OAAO,GAAI,SAAQ,SAAe;IACvC,MAAM,CAAmB,OAAO,GAAG,QAAQ,CAAC,UAAU,CAAC,SAAS,CAAC,CAAA;IACjE,MAAM,CAAmB,WAAW,GACzC,QAAQ,CAAC,UAAU,CAAC,aAAa,CAAC,CAAA;IAC7B,MAAM,CAAmB,QAAQ,GAAG,QAAQ,CAAC,WAAW,CAAC,UAAU,CAAC,CAAA;IAEpE,MAAM,CAAmB,KAAK,GAAG;QACtC,eAAe,EAAE,KAAK,CAAC,MAAM,CAAC;YAC5B,IAAI,EAAE,GAAG;YACT,OAAO,EAAE,QAAQ,CAAC,UAAU,CAAC,6BAA6B,CAAC;YAC3D,QAAQ,EAAE,IAAI;YACd,MAAM,EAAE,IAAI;SACb,CAAC;QACF,UAAU,EAAE,KAAK,CAAC,MAAM,CAAC;YACvB,IAAI,EAAE,GAAG;YACT,OAAO,EAAE,QAAQ,CAAC,UAAU,CAAC,wBAAwB,CAAC;YACtD,QAAQ,EAAE,IAAI;YACd,MAAM,EAAE,IAAI;SACb,CAAC;QACF,aAAa,EAAE,KAAK,CAAC,MAAM,CAAC;YAC1B,IAAI,EAAE,GAAG;YACT,OAAO,EAAE,QAAQ,CAAC,UAAU,CAAC,2BAA2B,CAAC;YACzD,QAAQ,EAAE,IAAI;YACd,MAAM,EAAE,IAAI;SACb,CAAC;QACF,aAAa,EAAE,KAAK,CAAC,MAAM,CAAC;YAC1B,IAAI,EAAE,GAAG;YACT,OAAO,EAAE,QAAQ,CAAC,UAAU,CAAC,2BAA2B,CAAC;YACzD,QAAQ,EAAE,IAAI;YACd,MAAM,EAAE,IAAI;SACb,CAAC;KACH,CAAA;IAEM,KAAK,CAAC,GAAG;QACd,MAAM,EAAE,KAAK,EAAE,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;QACvC,MAAM,WAAW,GAAG,IAAI,WAAW,EAAE,CAAA;QACrC,MAAM,WAAW,CAAC,UAAU,
|
|
1
|
+
{"version":3,"file":"run.js","sourceRoot":"","sources":["../../../../../src/commands/git/merge/driver/run.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAA;AAC3C,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAA;AAC9D,OAAO,EAAE,WAAW,EAAE,MAAM,mCAAmC,CAAA;AAE/D,QAAQ,CAAC,kCAAkC,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;AAC5D,MAAM,QAAQ,GAAG,QAAQ,CAAC,YAAY,CAAC,qBAAqB,EAAE,KAAK,CAAC,CAAA;AAEpE,MAAM,CAAC,OAAO,OAAO,GAAI,SAAQ,SAAe;IACvC,MAAM,CAAmB,OAAO,GAAG,QAAQ,CAAC,UAAU,CAAC,SAAS,CAAC,CAAA;IACjE,MAAM,CAAmB,WAAW,GACzC,QAAQ,CAAC,UAAU,CAAC,aAAa,CAAC,CAAA;IAC7B,MAAM,CAAmB,QAAQ,GAAG,QAAQ,CAAC,WAAW,CAAC,UAAU,CAAC,CAAA;IAEpE,MAAM,CAAmB,KAAK,GAAG;QACtC,eAAe,EAAE,KAAK,CAAC,MAAM,CAAC;YAC5B,IAAI,EAAE,GAAG;YACT,OAAO,EAAE,QAAQ,CAAC,UAAU,CAAC,6BAA6B,CAAC;YAC3D,QAAQ,EAAE,IAAI;YACd,MAAM,EAAE,IAAI;SACb,CAAC;QACF,UAAU,EAAE,KAAK,CAAC,MAAM,CAAC;YACvB,IAAI,EAAE,GAAG;YACT,OAAO,EAAE,QAAQ,CAAC,UAAU,CAAC,wBAAwB,CAAC;YACtD,QAAQ,EAAE,IAAI;YACd,MAAM,EAAE,IAAI;SACb,CAAC;QACF,aAAa,EAAE,KAAK,CAAC,MAAM,CAAC;YAC1B,IAAI,EAAE,GAAG;YACT,OAAO,EAAE,QAAQ,CAAC,UAAU,CAAC,2BAA2B,CAAC;YACzD,QAAQ,EAAE,IAAI;YACd,MAAM,EAAE,IAAI;SACb,CAAC;QACF,aAAa,EAAE,KAAK,CAAC,MAAM,CAAC;YAC1B,IAAI,EAAE,GAAG;YACT,OAAO,EAAE,QAAQ,CAAC,UAAU,CAAC,2BAA2B,CAAC;YACzD,QAAQ,EAAE,IAAI;YACd,MAAM,EAAE,IAAI;SACb,CAAC;KACH,CAAA;IAEM,KAAK,CAAC,GAAG;QACd,MAAM,EAAE,KAAK,EAAE,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;QACvC,MAAM,WAAW,GAAG,IAAI,WAAW,EAAE,CAAA;QACrC,MAAM,WAAW,GAAG,MAAM,WAAW,CAAC,UAAU,CAC9C,KAAK,CAAC,eAAe,CAAC,EACtB,KAAK,CAAC,UAAU,CAAC,EACjB,KAAK,CAAC,aAAa,CAAC,EACpB,KAAK,CAAC,aAAa,CAAC,CACrB,CAAA;QACD,IAAI,WAAW,EAAE,CAAC;YAChB,OAAO,CAAC,KAAK,CACX,QAAQ,CAAC,UAAU,CAAC,qBAAqB,CAAC,GAAG,GAAG,GAAG,KAAK,CAAC,aAAa,CAAC,CACxE,CAAA;YACD,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;QACd,CAAC;aAAM,CAAC;YACN,OAAO,CAAC,IAAI,CACV,QAAQ,CAAC,UAAU,CAAC,mBAAmB,CAAC,GAAG,GAAG,GAAG,KAAK,CAAC,aAAa,CAAC,CACtE,CAAA;QACH,CAAC;IACH,CAAC"}
|
|
@@ -3,17 +3,52 @@
|
|
|
3
3
|
* @see MetadataService for key field extraction logic
|
|
4
4
|
*/
|
|
5
5
|
export const METADATA_TYPES_PATTERNS = [
|
|
6
|
-
'
|
|
7
|
-
'
|
|
8
|
-
'
|
|
9
|
-
'
|
|
10
|
-
'
|
|
11
|
-
'
|
|
12
|
-
'
|
|
13
|
-
'
|
|
14
|
-
'
|
|
6
|
+
'labels', // CustomLabels
|
|
7
|
+
'label', // CustomLabels decomposed
|
|
8
|
+
'profile', // Profile
|
|
9
|
+
'permissionset', // PermissionSet
|
|
10
|
+
'applicationVisibility', // PermissionSet decomposed
|
|
11
|
+
'classAccess',
|
|
12
|
+
'customMetadataTypeAccess',
|
|
13
|
+
'customPermission',
|
|
14
|
+
'customSettingAccess',
|
|
15
|
+
'externalCredentialPrincipalAccess',
|
|
16
|
+
'externalDataSourceAccess',
|
|
17
|
+
'fieldPermission',
|
|
18
|
+
'flowAccess',
|
|
19
|
+
'objectPermission',
|
|
20
|
+
'pageAccess',
|
|
21
|
+
'recordTypeVisibility',
|
|
22
|
+
'tabSetting',
|
|
23
|
+
'userPermission',
|
|
24
|
+
'objectSettings',
|
|
25
|
+
'permissionsetgroup', // PermissionSetGroup
|
|
26
|
+
'permissionSetLicenseDefinition', // PermissionSetLicenseDefinition
|
|
27
|
+
'mutingpermissionset', // MutingPermissionSet
|
|
28
|
+
'sharingRules', // SharingRules
|
|
29
|
+
'sharingCriteriaRule', // SharingRules decomposed
|
|
30
|
+
'sharingGuestRule',
|
|
31
|
+
'sharingOwnerRule',
|
|
32
|
+
'sharingTerritoryRule',
|
|
33
|
+
'workflow', // Workflow
|
|
34
|
+
'workflowAlert', // Workflow decomposed
|
|
35
|
+
'workflowFieldUpdate',
|
|
36
|
+
'workflowFlowAction',
|
|
37
|
+
'workflowKnowledgePublish',
|
|
38
|
+
'workflowOutboundMessage',
|
|
39
|
+
'workflowRule',
|
|
40
|
+
'workflowSend',
|
|
41
|
+
'workflowTask',
|
|
42
|
+
'assignmentRules', // AssignmentRules
|
|
43
|
+
'autoResponseRules', // AutoResponseRules
|
|
44
|
+
'escalationRules', // EscalationRules
|
|
45
|
+
'marketingappextension', // MarketingAppExtension
|
|
46
|
+
'matchingRule', // MatchingRules
|
|
47
|
+
'globalValueSet', // ValueSets
|
|
15
48
|
'standardValueSet',
|
|
49
|
+
'globalValueSetTranslation', // ValueSets translation
|
|
16
50
|
'standardValueSetTranslation',
|
|
17
|
-
'
|
|
51
|
+
'translation', // Translations
|
|
52
|
+
'objectTranslation', // CustomObjectTranslation
|
|
18
53
|
];
|
|
19
54
|
//# sourceMappingURL=metadataConstant.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"metadataConstant.js","sourceRoot":"","sources":["../../src/constant/metadataConstant.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,MAAM,CAAC,MAAM,uBAAuB,GAAG;IACrC,
|
|
1
|
+
{"version":3,"file":"metadataConstant.js","sourceRoot":"","sources":["../../src/constant/metadataConstant.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,MAAM,CAAC,MAAM,uBAAuB,GAAG;IACrC,QAAQ,EAAE,eAAe;IACzB,OAAO,EAAE,0BAA0B;IACnC,SAAS,EAAE,UAAU;IACrB,eAAe,EAAE,gBAAgB;IACjC,uBAAuB,EAAE,2BAA2B;IACpD,aAAa;IACb,0BAA0B;IAC1B,kBAAkB;IAClB,qBAAqB;IACrB,mCAAmC;IACnC,0BAA0B;IAC1B,iBAAiB;IACjB,YAAY;IACZ,kBAAkB;IAClB,YAAY;IACZ,sBAAsB;IACtB,YAAY;IACZ,gBAAgB;IAChB,gBAAgB;IAChB,oBAAoB,EAAE,qBAAqB;IAC3C,gCAAgC,EAAE,iCAAiC;IACnE,qBAAqB,EAAE,sBAAsB;IAC7C,cAAc,EAAE,eAAe;IAC/B,qBAAqB,EAAE,0BAA0B;IACjD,kBAAkB;IAClB,kBAAkB;IAClB,sBAAsB;IACtB,UAAU,EAAE,WAAW;IACvB,eAAe,EAAE,sBAAsB;IACvC,qBAAqB;IACrB,oBAAoB;IACpB,0BAA0B;IAC1B,yBAAyB;IACzB,cAAc;IACd,cAAc;IACd,cAAc;IACd,iBAAiB,EAAE,kBAAkB;IACrC,mBAAmB,EAAE,oBAAoB;IACzC,iBAAiB,EAAE,kBAAkB;IACrC,uBAAuB,EAAE,wBAAwB;IACjD,cAAc,EAAE,gBAAgB;IAChC,gBAAgB,EAAE,YAAY;IAC9B,kBAAkB;IAClB,2BAA2B,EAAE,wBAAwB;IACrD,6BAA6B;IAC7B,aAAa,EAAE,eAAe;IAC9B,mBAAmB,EAAE,0BAA0B;CAChD,CAAA"}
|
|
@@ -11,7 +11,8 @@ export class MergeDriver {
|
|
|
11
11
|
const xmlMerger = new XmlMerger();
|
|
12
12
|
const mergedContent = xmlMerger.tripartXmlMerge(ancestorContent, ourContent, theirContent);
|
|
13
13
|
// Write the merged content to the output file
|
|
14
|
-
await writeFile(outputFile, mergedContent);
|
|
14
|
+
await writeFile(outputFile, mergedContent.output);
|
|
15
|
+
return mergedContent.hasConflict;
|
|
15
16
|
}
|
|
16
17
|
}
|
|
17
18
|
//# sourceMappingURL=MergeDriver.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MergeDriver.js","sourceRoot":"","sources":["../../src/driver/MergeDriver.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAA;AACtD,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAA;AAElD,MAAM,OAAO,WAAW;IACtB,KAAK,CAAC,UAAU,
|
|
1
|
+
{"version":3,"file":"MergeDriver.js","sourceRoot":"","sources":["../../src/driver/MergeDriver.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAA;AACtD,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAA;AAElD,MAAM,OAAO,WAAW;IACtB,KAAK,CAAC,UAAU,CACd,YAAoB,EACpB,OAAe,EACf,SAAiB,EACjB,UAAkB;QAElB,0BAA0B;QAC1B,MAAM,CAAC,eAAe,EAAE,UAAU,EAAE,YAAY,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;YACpE,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC;YAC9B,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;YACzB,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;SAC5B,CAAC,CAAA;QAEF,MAAM,SAAS,GAAG,IAAI,SAAS,EAAE,CAAA;QAEjC,MAAM,aAAa,GAAG,SAAS,CAAC,eAAe,CAC7C,eAAe,EACf,UAAU,EACV,YAAY,CACb,CAAA;QAED,8CAA8C;QAC9C,MAAM,SAAS,CAAC,UAAU,EAAE,aAAa,CAAC,MAAM,CAAC,CAAA;QACjD,OAAO,aAAa,CAAC,WAAW,CAAA;IAClC,CAAC;CACF"}
|
|
@@ -1,4 +1,7 @@
|
|
|
1
1
|
import type { JsonArray, JsonObject } from '../types/jsonTypes.js';
|
|
2
2
|
export declare class JsonMerger {
|
|
3
|
-
merge(ancestor: JsonObject | JsonArray, ours: JsonObject | JsonArray, theirs: JsonObject | JsonArray):
|
|
3
|
+
merge(ancestor: JsonObject | JsonArray, ours: JsonObject | JsonArray, theirs: JsonObject | JsonArray): {
|
|
4
|
+
output: JsonArray;
|
|
5
|
+
hasConflict: boolean;
|
|
6
|
+
};
|
|
4
7
|
}
|
package/lib/merger/JsonMerger.js
CHANGED
|
@@ -3,7 +3,7 @@ import { MetadataService } from '../service/MetadataService.js';
|
|
|
3
3
|
import { NamespaceHandler } from '../service/NamespaceHandler.js';
|
|
4
4
|
import { MergeScenario, getScenario } from '../types/mergeScenario.js';
|
|
5
5
|
import { ensureArray, getUniqueSortedProps, isObject, } from '../utils/mergeUtils.js';
|
|
6
|
-
import {
|
|
6
|
+
import { ConflictMarker } from './conflictMarker.js';
|
|
7
7
|
import { mergeTextAttribute } from './textAttribute.js';
|
|
8
8
|
export class JsonMerger {
|
|
9
9
|
merge(ancestor, ours, theirs) {
|
|
@@ -36,7 +36,10 @@ export class JsonMerger {
|
|
|
36
36
|
}
|
|
37
37
|
const result = acc.flat();
|
|
38
38
|
namespaceHandler.addNamespacesToResult(result, namespaces);
|
|
39
|
-
return
|
|
39
|
+
return {
|
|
40
|
+
output: result,
|
|
41
|
+
hasConflict: ConflictMarker.hasConflictMarker(),
|
|
42
|
+
};
|
|
40
43
|
}
|
|
41
44
|
}
|
|
42
45
|
const mergeMetadata = (ancestor, ours, theirs) => {
|
|
@@ -70,7 +73,7 @@ const handleOursAndTheirs = (key, ours, theirs) => {
|
|
|
70
73
|
const theirsProp = {
|
|
71
74
|
[key]: mergeMetadata({}, {}, theirs[key]),
|
|
72
75
|
};
|
|
73
|
-
addConflictMarkers(acc, obj, {}, theirsProp);
|
|
76
|
+
ConflictMarker.addConflictMarkers(acc, obj, {}, theirsProp);
|
|
74
77
|
}
|
|
75
78
|
else {
|
|
76
79
|
acc.push(obj);
|
|
@@ -86,7 +89,7 @@ const handleAncestorAndTheirs = (key, ancestor, theirs) => {
|
|
|
86
89
|
const theirsProp = {
|
|
87
90
|
[key]: mergeMetadata({}, {}, theirs[key]),
|
|
88
91
|
};
|
|
89
|
-
addConflictMarkers(acc, {}, ancestorProp, theirsProp);
|
|
92
|
+
ConflictMarker.addConflictMarkers(acc, {}, ancestorProp, theirsProp);
|
|
90
93
|
}
|
|
91
94
|
return acc;
|
|
92
95
|
};
|
|
@@ -99,7 +102,7 @@ const handleAncestorAndOurs = (key, ancestor, ours) => {
|
|
|
99
102
|
const ancestorProp = {
|
|
100
103
|
[key]: mergeMetadata({}, {}, ancestor[key]),
|
|
101
104
|
};
|
|
102
|
-
addConflictMarkers(acc, oursProp, ancestorProp, {});
|
|
105
|
+
ConflictMarker.addConflictMarkers(acc, oursProp, ancestorProp, {});
|
|
103
106
|
}
|
|
104
107
|
return acc;
|
|
105
108
|
};
|
|
@@ -147,7 +150,7 @@ const mergeByKeyField = (ancestor, ours, theirs, attribute) => {
|
|
|
147
150
|
const theirsProp = {
|
|
148
151
|
[attribute]: mergeMetadata({}, {}, theirsOfKey),
|
|
149
152
|
};
|
|
150
|
-
addConflictMarkers(acc, {}, ancestorProp, theirsProp);
|
|
153
|
+
ConflictMarker.addConflictMarkers(acc, {}, ancestorProp, theirsProp);
|
|
151
154
|
}
|
|
152
155
|
break;
|
|
153
156
|
case MergeScenario.ANCESTOR_AND_OURS:
|
|
@@ -158,7 +161,7 @@ const mergeByKeyField = (ancestor, ours, theirs, attribute) => {
|
|
|
158
161
|
const ancestorProp = {
|
|
159
162
|
[attribute]: mergeMetadata({}, ancestorOfKey, {}),
|
|
160
163
|
};
|
|
161
|
-
addConflictMarkers(acc, oursProp, ancestorProp, {});
|
|
164
|
+
ConflictMarker.addConflictMarkers(acc, oursProp, ancestorProp, {});
|
|
162
165
|
}
|
|
163
166
|
break;
|
|
164
167
|
case MergeScenario.ALL:
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"JsonMerger.js","sourceRoot":"","sources":["../../src/merger/JsonMerger.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,WAAW,CAAA;AAC9D,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAA;AAC/D,OAAO,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAA;AAEjE,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAA;AACtE,OAAO,EACL,WAAW,EACX,oBAAoB,EACpB,QAAQ,GACT,MAAM,wBAAwB,CAAA;AAC/B,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"JsonMerger.js","sourceRoot":"","sources":["../../src/merger/JsonMerger.ts"],"names":[],"mappings":"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"}
|
package/lib/merger/XmlMerger.js
CHANGED
|
@@ -39,17 +39,20 @@ export class XmlMerger {
|
|
|
39
39
|
// console.dir(ancestorObj, {depth:null})
|
|
40
40
|
// Perform deep merge of XML objects
|
|
41
41
|
const jsonMerger = new JsonMerger();
|
|
42
|
-
const
|
|
42
|
+
const mergedResult = jsonMerger.merge(ancestorObj, ourObj, theirObj);
|
|
43
43
|
// console.log('mergedObj')
|
|
44
44
|
// console.dir(mergedObj, {depth:null})
|
|
45
45
|
// Convert back to XML and format
|
|
46
46
|
const builder = new XMLBuilder(builderOptions);
|
|
47
|
-
const mergedXml = builder.build(
|
|
47
|
+
const mergedXml = builder.build(mergedResult.output);
|
|
48
48
|
// console.log('mergedXml')
|
|
49
49
|
// console.dir(mergedXml, {depth:null})
|
|
50
|
-
return
|
|
51
|
-
|
|
52
|
-
|
|
50
|
+
return {
|
|
51
|
+
output: mergedXml.length
|
|
52
|
+
? correctConflictIndent(correctComments(XML_DECL.concat(handleSpecialEntities(mergedXml))))
|
|
53
|
+
: '',
|
|
54
|
+
hasConflict: mergedResult.hasConflict,
|
|
55
|
+
};
|
|
53
56
|
}
|
|
54
57
|
}
|
|
55
58
|
//# sourceMappingURL=XmlMerger.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"XmlMerger.js","sourceRoot":"","sources":["../../src/merger/XmlMerger.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAA;AACvD,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAA;AAE5C,MAAM,QAAQ,GAAG,0CAA0C,CAAA;AAC3D,MAAM,qBAAqB,GAAG,eAAe,CAAA;AAE7C,MAAM,WAAW,GAAG;IAClB,aAAa,EAAE,SAAS;IACxB,eAAe,EAAE,qBAAqB;IACtC,gBAAgB,EAAE,KAAK;CACxB,CAAA;AAED,MAAM,aAAa,GAAG;IACpB,GAAG,WAAW;IACd,iBAAiB,EAAE,IAAI;IACvB,kBAAkB,EAAE,EAAE,YAAY,EAAE,KAAK,EAAE,GAAG,EAAE,KAAK,EAAE;IACvD,mBAAmB,EAAE,KAAK;IAC1B,aAAa,EAAE,KAAK;IACpB,uBAAuB;CACxB,CAAA;AAED,MAAM,cAAc,GAAG;IACrB,GAAG,WAAW;IACd,MAAM,EAAE,IAAI;IACZ,QAAQ,EAAE,MAAM;IAChB,aAAa,EAAE,IAAI;CACpB,CAAA;AAED,MAAM,eAAe,GAAG,CAAC,GAAW,EAAU,EAAE,CAC9C,GAAG,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,qBAAqB,EAAE,WAAW,CAAC,CAAC,CAAC,CAAC,GAAG,CAAA;AAE9E,MAAM,qBAAqB,GAAG,CAAC,GAAW,EAAU,EAAE,CACpD,GAAG;KACA,OAAO,CAAC,iDAAiD,EAAE,IAAI,CAAC;KAChE,OAAO,CAAC,kBAAkB,EAAE,EAAE,CAAC,CAAA;AAEpC,MAAM,qBAAqB,GAAG,CAAC,GAAW,EAAU,EAAE,CACpD,GAAG;KACA,UAAU,CAAC,YAAY,EAAE,QAAQ,CAAC;KAClC,UAAU,CAAC,8BAA8B,EAAE,SAAS,CAAC;KACrD,UAAU,CAAC,8BAA8B,EAAE,SAAS,CAAC,CAAA;AAE1D,MAAM,OAAO,SAAS;IACpB,eAAe,CACb,eAAuB,EACvB,UAAkB,EAClB,YAAoB;QAEpB,MAAM,MAAM,GAAG,IAAI,SAAS,CAAC,aAAa,CAAC,CAAA;QAE3C,MAAM,WAAW,GAAG,MAAM,CAAC,KAAK,CAAC,eAAe,CAAC,CAAA;QACjD,MAAM,MAAM,GAAG,MAAM,CAAC,KAAK,CAAC,UAAU,CAAC,CAAA;QACvC,MAAM,QAAQ,GAAG,MAAM,CAAC,KAAK,CAAC,YAAY,CAAC,CAAA;QAC3C,mDAAmD;QACnD,yCAAyC;QAEzC,oCAAoC;QAEpC,MAAM,UAAU,GAAG,IAAI,UAAU,EAAE,CAAA;QACnC,MAAM,
|
|
1
|
+
{"version":3,"file":"XmlMerger.js","sourceRoot":"","sources":["../../src/merger/XmlMerger.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAA;AACvD,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAA;AAE5C,MAAM,QAAQ,GAAG,0CAA0C,CAAA;AAC3D,MAAM,qBAAqB,GAAG,eAAe,CAAA;AAE7C,MAAM,WAAW,GAAG;IAClB,aAAa,EAAE,SAAS;IACxB,eAAe,EAAE,qBAAqB;IACtC,gBAAgB,EAAE,KAAK;CACxB,CAAA;AAED,MAAM,aAAa,GAAG;IACpB,GAAG,WAAW;IACd,iBAAiB,EAAE,IAAI;IACvB,kBAAkB,EAAE,EAAE,YAAY,EAAE,KAAK,EAAE,GAAG,EAAE,KAAK,EAAE;IACvD,mBAAmB,EAAE,KAAK;IAC1B,aAAa,EAAE,KAAK;IACpB,uBAAuB;CACxB,CAAA;AAED,MAAM,cAAc,GAAG;IACrB,GAAG,WAAW;IACd,MAAM,EAAE,IAAI;IACZ,QAAQ,EAAE,MAAM;IAChB,aAAa,EAAE,IAAI;CACpB,CAAA;AAED,MAAM,eAAe,GAAG,CAAC,GAAW,EAAU,EAAE,CAC9C,GAAG,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,qBAAqB,EAAE,WAAW,CAAC,CAAC,CAAC,CAAC,GAAG,CAAA;AAE9E,MAAM,qBAAqB,GAAG,CAAC,GAAW,EAAU,EAAE,CACpD,GAAG;KACA,OAAO,CAAC,iDAAiD,EAAE,IAAI,CAAC;KAChE,OAAO,CAAC,kBAAkB,EAAE,EAAE,CAAC,CAAA;AAEpC,MAAM,qBAAqB,GAAG,CAAC,GAAW,EAAU,EAAE,CACpD,GAAG;KACA,UAAU,CAAC,YAAY,EAAE,QAAQ,CAAC;KAClC,UAAU,CAAC,8BAA8B,EAAE,SAAS,CAAC;KACrD,UAAU,CAAC,8BAA8B,EAAE,SAAS,CAAC,CAAA;AAE1D,MAAM,OAAO,SAAS;IACpB,eAAe,CACb,eAAuB,EACvB,UAAkB,EAClB,YAAoB;QAEpB,MAAM,MAAM,GAAG,IAAI,SAAS,CAAC,aAAa,CAAC,CAAA;QAE3C,MAAM,WAAW,GAAG,MAAM,CAAC,KAAK,CAAC,eAAe,CAAC,CAAA;QACjD,MAAM,MAAM,GAAG,MAAM,CAAC,KAAK,CAAC,UAAU,CAAC,CAAA;QACvC,MAAM,QAAQ,GAAG,MAAM,CAAC,KAAK,CAAC,YAAY,CAAC,CAAA;QAC3C,mDAAmD;QACnD,yCAAyC;QAEzC,oCAAoC;QAEpC,MAAM,UAAU,GAAG,IAAI,UAAU,EAAE,CAAA;QACnC,MAAM,YAAY,GAAG,UAAU,CAAC,KAAK,CAAC,WAAW,EAAE,MAAM,EAAE,QAAQ,CAAC,CAAA;QACpE,2BAA2B;QAC3B,uCAAuC;QAEvC,iCAAiC;QACjC,MAAM,OAAO,GAAG,IAAI,UAAU,CAAC,cAAc,CAAC,CAAA;QAC9C,MAAM,SAAS,GAAW,OAAO,CAAC,KAAK,CAAC,YAAY,CAAC,MAAM,CAAC,CAAA;QAC5D,2BAA2B;QAC3B,uCAAuC;QACvC,OAAO;YACL,MAAM,EAAE,SAAS,CAAC,MAAM;gBACtB,CAAC,CAAC,qBAAqB,CACnB,eAAe,CAAC,QAAQ,CAAC,MAAM,CAAC,qBAAqB,CAAC,SAAS,CAAC,CAAC,CAAC,CACnE;gBACH,CAAC,CAAC,EAAE;YACN,WAAW,EAAE,YAAY,CAAC,WAAW;SACtC,CAAA;IACH,CAAC;CACF"}
|
|
@@ -1,2 +1,6 @@
|
|
|
1
1
|
import type { JsonArray, JsonObject } from '../types/jsonTypes.js';
|
|
2
|
-
export declare
|
|
2
|
+
export declare class ConflictMarker {
|
|
3
|
+
private static hasConflict;
|
|
4
|
+
static hasConflictMarker(): boolean;
|
|
5
|
+
static addConflictMarkers(acc: JsonArray, ours: JsonObject, ancestor: JsonObject, theirs: JsonObject): void;
|
|
6
|
+
}
|
|
@@ -1,12 +1,19 @@
|
|
|
1
1
|
import { isEmpty } from 'lodash-es';
|
|
2
2
|
import { BASE, LOCAL, NEWLINE, REMOTE, SEPARATOR, TEXT_TAG, } from '../constant/conflicConstant.js';
|
|
3
|
-
export
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
acc
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
};
|
|
3
|
+
export class ConflictMarker {
|
|
4
|
+
static hasConflict = false;
|
|
5
|
+
static hasConflictMarker() {
|
|
6
|
+
return ConflictMarker.hasConflict;
|
|
7
|
+
}
|
|
8
|
+
static addConflictMarkers(acc, ours, ancestor, theirs) {
|
|
9
|
+
ConflictMarker.hasConflict = true;
|
|
10
|
+
acc.push({ [TEXT_TAG]: `${NEWLINE}${LOCAL}` });
|
|
11
|
+
acc.push(isEmpty(ours) ? { [TEXT_TAG]: NEWLINE } : ours);
|
|
12
|
+
acc.push({ [TEXT_TAG]: BASE });
|
|
13
|
+
acc.push(isEmpty(ancestor) ? { [TEXT_TAG]: NEWLINE } : ancestor);
|
|
14
|
+
acc.push({ [TEXT_TAG]: SEPARATOR });
|
|
15
|
+
acc.push(isEmpty(theirs) ? { [TEXT_TAG]: NEWLINE } : theirs);
|
|
16
|
+
acc.push({ [TEXT_TAG]: REMOTE });
|
|
17
|
+
}
|
|
18
|
+
}
|
|
12
19
|
//# sourceMappingURL=conflictMarker.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"conflictMarker.js","sourceRoot":"","sources":["../../src/merger/conflictMarker.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AACnC,OAAO,EACL,IAAI,EACJ,KAAK,EACL,OAAO,EACP,MAAM,EACN,SAAS,EACT,QAAQ,GACT,MAAM,gCAAgC,CAAA;
|
|
1
|
+
{"version":3,"file":"conflictMarker.js","sourceRoot":"","sources":["../../src/merger/conflictMarker.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AACnC,OAAO,EACL,IAAI,EACJ,KAAK,EACL,OAAO,EACP,MAAM,EACN,SAAS,EACT,QAAQ,GACT,MAAM,gCAAgC,CAAA;AAGvC,MAAM,OAAO,cAAc;IACjB,MAAM,CAAC,WAAW,GAAG,KAAK,CAAA;IAE3B,MAAM,CAAC,iBAAiB;QAC7B,OAAO,cAAc,CAAC,WAAW,CAAA;IACnC,CAAC;IAEM,MAAM,CAAC,kBAAkB,CAC9B,GAAc,EACd,IAAgB,EAChB,QAAoB,EACpB,MAAkB;QAElB,cAAc,CAAC,WAAW,GAAG,IAAI,CAAA;QACjC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,QAAQ,CAAC,EAAE,GAAG,OAAO,GAAG,KAAK,EAAE,EAAE,CAAC,CAAA;QAC9C,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,QAAQ,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAA;QACxD,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,QAAQ,CAAC,EAAE,IAAI,EAAE,CAAC,CAAA;QAC9B,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,QAAQ,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAA;QAChE,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,QAAQ,CAAC,EAAE,SAAS,EAAE,CAAC,CAAA;QACnC,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,QAAQ,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,CAAA;QAC5D,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC,CAAA;IAClC,CAAC"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { isEqual, isNil } from 'lodash-es';
|
|
2
2
|
import { TEXT_TAG } from '../constant/conflicConstant.js';
|
|
3
3
|
import { MergeScenario, getScenario } from '../types/mergeScenario.js';
|
|
4
|
-
import {
|
|
4
|
+
import { ConflictMarker } from './conflictMarker.js';
|
|
5
5
|
export const mergeTextAttribute = (ancestor, ours, theirs, attrib) => {
|
|
6
6
|
const generateObj = (value) => {
|
|
7
7
|
return isNil(value) ? {} : { [attrib]: [{ [TEXT_TAG]: value }] };
|
|
@@ -26,16 +26,16 @@ export const mergeTextAttribute = (ancestor, ours, theirs, attrib) => {
|
|
|
26
26
|
acc.push(objOurs);
|
|
27
27
|
break;
|
|
28
28
|
case MergeScenario.OURS_AND_THEIRS:
|
|
29
|
-
addConflictMarkers(acc, objOurs, {}, objTheirs);
|
|
29
|
+
ConflictMarker.addConflictMarkers(acc, objOurs, {}, objTheirs);
|
|
30
30
|
break;
|
|
31
31
|
case MergeScenario.ANCESTOR_AND_THEIRS:
|
|
32
32
|
if (ancestor !== theirs) {
|
|
33
|
-
addConflictMarkers(acc, {}, objAnc, objTheirs);
|
|
33
|
+
ConflictMarker.addConflictMarkers(acc, {}, objAnc, objTheirs);
|
|
34
34
|
}
|
|
35
35
|
break;
|
|
36
36
|
case MergeScenario.ANCESTOR_AND_OURS:
|
|
37
37
|
if (ancestor !== ours) {
|
|
38
|
-
addConflictMarkers(acc, objOurs, objAnc, {});
|
|
38
|
+
ConflictMarker.addConflictMarkers(acc, objOurs, objAnc, {});
|
|
39
39
|
}
|
|
40
40
|
break;
|
|
41
41
|
case MergeScenario.ALL:
|
|
@@ -46,7 +46,7 @@ export const mergeTextAttribute = (ancestor, ours, theirs, attrib) => {
|
|
|
46
46
|
acc.push(objOurs);
|
|
47
47
|
}
|
|
48
48
|
else {
|
|
49
|
-
addConflictMarkers(acc, objOurs, objAnc, objTheirs);
|
|
49
|
+
ConflictMarker.addConflictMarkers(acc, objOurs, objAnc, objTheirs);
|
|
50
50
|
}
|
|
51
51
|
break;
|
|
52
52
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"textAttribute.js","sourceRoot":"","sources":["../../src/merger/textAttribute.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,WAAW,CAAA;AAC1C,OAAO,EAAE,QAAQ,EAAE,MAAM,gCAAgC,CAAA;AAEzD,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAA;AACtE,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"textAttribute.js","sourceRoot":"","sources":["../../src/merger/textAttribute.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,WAAW,CAAA;AAC1C,OAAO,EAAE,QAAQ,EAAE,MAAM,gCAAgC,CAAA;AAEzD,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAA;AACtE,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAA;AAEpD,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAChC,QAA0B,EAC1B,IAAsB,EACtB,MAAwB,EACxB,MAAc,EACH,EAAE;IACb,MAAM,WAAW,GAAG,CAAC,KAAuB,EAAc,EAAE;QAC1D,OAAO,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,MAAM,CAAC,EAAE,CAAC,EAAE,CAAC,QAAQ,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,CAAA;IAClE,CAAC,CAAA;IAED,MAAM,MAAM,GAAe,WAAW,CAAC,QAAQ,CAAC,CAAA;IAChD,MAAM,OAAO,GAAe,WAAW,CAAC,IAAI,CAAC,CAAA;IAC7C,MAAM,SAAS,GAAe,WAAW,CAAC,MAAM,CAAC,CAAA;IACjD,MAAM,QAAQ,GAAkB,WAAW,CAAC,MAAM,EAAE,OAAO,EAAE,SAAS,CAAC,CAAA;IACvE,MAAM,GAAG,GAAc,EAAE,CAAA;IAEzB,oCAAoC;IACpC,IACE,OAAO,CAAC,IAAI,EAAE,MAAM,CAAC;QACrB,CAAC,QAAQ,KAAK,aAAa,CAAC,eAAe;YACzC,QAAQ,KAAK,aAAa,CAAC,GAAG,CAAC,EACjC,CAAC;QACD,OAAO,CAAC,OAAO,CAAC,CAAA;IAClB,CAAC;IAED,kCAAkC;IAClC,QAAQ,QAAQ,EAAE,CAAC;QACjB,KAAK,aAAa,CAAC,WAAW;YAC5B,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,CAAA;YACnB,MAAK;QAEP,KAAK,aAAa,CAAC,SAAS;YAC1B,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;YACjB,MAAK;QAEP,KAAK,aAAa,CAAC,eAAe;YAChC,cAAc,CAAC,kBAAkB,CAAC,GAAG,EAAE,OAAO,EAAE,EAAE,EAAE,SAAS,CAAC,CAAA;YAC9D,MAAK;QAEP,KAAK,aAAa,CAAC,mBAAmB;YACpC,IAAI,QAAQ,KAAK,MAAM,EAAE,CAAC;gBACxB,cAAc,CAAC,kBAAkB,CAAC,GAAG,EAAE,EAAE,EAAE,MAAM,EAAE,SAAS,CAAC,CAAA;YAC/D,CAAC;YACD,MAAK;QAEP,KAAK,aAAa,CAAC,iBAAiB;YAClC,IAAI,QAAQ,KAAK,IAAI,EAAE,CAAC;gBACtB,cAAc,CAAC,kBAAkB,CAAC,GAAG,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE,CAAC,CAAA;YAC7D,CAAC;YACD,MAAK;QAEP,KAAK,aAAa,CAAC,GAAG;YACpB,IAAI,QAAQ,KAAK,IAAI,EAAE,CAAC;gBACtB,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,CAAA;YACrB,CAAC;iBAAM,IAAI,QAAQ,KAAK,MAAM,EAAE,CAAC;gBAC/B,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;YACnB,CAAC;iBAAM,CAAC;gBACN,cAAc,CAAC,kBAAkB,CAAC,GAAG,EAAE,OAAO,EAAE,MAAM,EAAE,SAAS,CAAC,CAAA;YACpE,CAAC;YACD,MAAK;IACT,CAAC;IAED,OAAO,GAAG,CAAA;AACZ,CAAC,CAAA"}
|
|
@@ -7,64 +7,130 @@ export class MetadataService {
|
|
|
7
7
|
}
|
|
8
8
|
const getPropertyValue = (el, property) => String(el[property]);
|
|
9
9
|
const METADATA_KEY_EXTRACTORS = {
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
sharingGuestRules: (el) => getPropertyValue(el, 'fullName'),
|
|
21
|
-
sharingOwnerRules: (el) => getPropertyValue(el, 'fullName'),
|
|
22
|
-
sharingTerritoryRules: (el) => getPropertyValue(el, 'fullName'),
|
|
23
|
-
assignmentRule: (el) => getPropertyValue(el, 'fullName'),
|
|
24
|
-
autoResponseRule: (el) => getPropertyValue(el, 'fullName'),
|
|
25
|
-
escalationRule: (el) => getPropertyValue(el, 'fullName'),
|
|
26
|
-
matchingRules: (el) => getPropertyValue(el, 'fullName'),
|
|
27
|
-
valueTranslation: (el) => getPropertyValue(el, 'masterLabel'),
|
|
28
|
-
categoryGroupVisibilities: (el) => getPropertyValue(el, 'dataCategoryGroup'),
|
|
29
|
-
applicationVisibilities: (el) => getPropertyValue(el, 'application'),
|
|
30
|
-
classAccesses: (el) => getPropertyValue(el, 'apexClass'),
|
|
31
|
-
customMetadataTypeAccesses: (el) => getPropertyValue(el, 'name'),
|
|
32
|
-
customPermissions: (el) => getPropertyValue(el, 'name'),
|
|
33
|
-
customSettingAccesses: (el) => getPropertyValue(el, 'name'),
|
|
34
|
-
externalDataSourceAccesses: (el) => getPropertyValue(el, 'externalDataSource'),
|
|
35
|
-
fieldPermissions: (el) => getPropertyValue(el, 'field'),
|
|
36
|
-
flowAccesses: (el) => getPropertyValue(el, 'flow'),
|
|
37
|
-
loginFlows: (el) => getPropertyValue(el, 'friendlyname'),
|
|
10
|
+
labels: (el) => getPropertyValue(el, 'fullName'), // CustomLabels
|
|
11
|
+
applicationVisibilities: (el) => getPropertyValue(el, 'application'), // Profile // PermissionSet
|
|
12
|
+
categoryGroupVisibilities: (el) => getPropertyValue(el, 'dataCategoryGroup'), // Profile
|
|
13
|
+
classAccesses: (el) => getPropertyValue(el, 'apexClass'), // Profile // PermissionSet
|
|
14
|
+
customMetadataTypeAccesses: (el) => getPropertyValue(el, 'name'), // Profile // PermissionSet
|
|
15
|
+
customPermissions: (el) => getPropertyValue(el, 'name'), // Profile // PermissionSet // PermissionSetLicenseDefinition
|
|
16
|
+
customSettingAccesses: (el) => getPropertyValue(el, 'name'), // Profile // PermissionSet
|
|
17
|
+
externalDataSourceAccesses: (el) => getPropertyValue(el, 'externalDataSource'), // Profile // PermissionSet
|
|
18
|
+
fieldPermissions: (el) => getPropertyValue(el, 'field'), // Profile // PermissionSet
|
|
19
|
+
flowAccesses: (el) => getPropertyValue(el, 'flow'), // Profile // PermissionSet
|
|
38
20
|
layoutAssignments: (el) => {
|
|
39
21
|
const layout = getPropertyValue(el, 'layout');
|
|
40
22
|
const recordType = getPropertyValue(el, 'recordType');
|
|
41
23
|
return [layout, recordType].filter(x => x !== String(undefined)).join('.');
|
|
42
|
-
},
|
|
43
|
-
|
|
24
|
+
}, // Profile
|
|
25
|
+
loginFlows: (el) => getPropertyValue(el, 'friendlyname'), // Profile
|
|
26
|
+
loginHours: (el) => Object.keys(el).join(','), // Profile
|
|
44
27
|
loginIpRanges: (el) => {
|
|
45
28
|
const startAddress = getPropertyValue(el, 'startAddress');
|
|
46
29
|
const endAddress = getPropertyValue(el, 'endAddress');
|
|
47
30
|
return `${startAddress}-${endAddress}`;
|
|
48
|
-
},
|
|
49
|
-
objectPermissions: (el) => getPropertyValue(el, 'object'),
|
|
50
|
-
pageAccesses: (el) => getPropertyValue(el, 'apexPage'),
|
|
51
|
-
profileActionOverrides: (el) => getPropertyValue(el, 'actionName'),
|
|
52
|
-
recordTypeVisibilities: (el) => getPropertyValue(el, 'recordType'),
|
|
53
|
-
tabVisibilities: (el) => getPropertyValue(el, 'tab'),
|
|
54
|
-
userPermissions: (el) => getPropertyValue(el, 'name'),
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
31
|
+
}, // Profile
|
|
32
|
+
objectPermissions: (el) => getPropertyValue(el, 'object'), // Profile // PermissionSet
|
|
33
|
+
pageAccesses: (el) => getPropertyValue(el, 'apexPage'), // Profile // PermissionSet
|
|
34
|
+
profileActionOverrides: (el) => getPropertyValue(el, 'actionName'), // Profile
|
|
35
|
+
recordTypeVisibilities: (el) => getPropertyValue(el, 'recordType'), // Profile // PermissionSet
|
|
36
|
+
tabVisibilities: (el) => getPropertyValue(el, 'tab'), // Profile // PermissionSet
|
|
37
|
+
userPermissions: (el) => getPropertyValue(el, 'name'), // Profile // PermissionSet
|
|
38
|
+
dataspaceScopes: (el) => getPropertyValue(el, 'dataspaceScope'), // PermissionSet
|
|
39
|
+
emailRoutingAddressAccesses: (el) => getPropertyValue(el, 'name'), // PermissionSet
|
|
40
|
+
externalCredentialPrincipalAccesses: (el) => getPropertyValue(el, 'externalCredentialPrincipal'), // PermissionSet
|
|
41
|
+
sharingCriteriaRules: (el) => getPropertyValue(el, 'fullName'), // SharingRules
|
|
42
|
+
sharingGuestRules: (el) => getPropertyValue(el, 'fullName'), // SharingRules
|
|
43
|
+
sharingOwnerRules: (el) => getPropertyValue(el, 'fullName'), // SharingRules
|
|
44
|
+
sharingTerritoryRules: (el) => getPropertyValue(el, 'fullName'), // SharingRules
|
|
45
|
+
criteriaItems: (el) => {
|
|
46
|
+
const field = getPropertyValue(el, 'field');
|
|
47
|
+
const operation = getPropertyValue(el, 'operation');
|
|
48
|
+
const value = getPropertyValue(el, 'value');
|
|
49
|
+
const valueField = getPropertyValue(el, 'valueField');
|
|
50
|
+
return [field, operation, value, valueField]
|
|
51
|
+
.filter(x => x !== String(undefined))
|
|
52
|
+
.join('.');
|
|
53
|
+
}, // SharingRules // AssignmentRules // AutoResponseRules // EscalationRules
|
|
54
|
+
// sharedTo: it should be a complete pure object compare and not an array comparison // SharingRules
|
|
55
|
+
// accountSettings: it should be a complete pure object compare and not an array comparison // SharingRules
|
|
56
|
+
alerts: (el) => getPropertyValue(el, 'fullName'), // Workflow
|
|
57
|
+
recipients: (el) => getPropertyValue(el, 'type'), // Workflow
|
|
58
|
+
fieldUpdates: (el) => getPropertyValue(el, 'fullName'), // Workflow
|
|
59
|
+
flowActions: (el) => getPropertyValue(el, 'fullName'), // Workflow
|
|
60
|
+
flowInputs: (el) => getPropertyValue(el, 'name'), // Workflow
|
|
61
|
+
flowAutomation: (el) => getPropertyValue(el, 'fullName'), // Workflow
|
|
62
|
+
knowledgePublishes: (el) => getPropertyValue(el, 'fullName'), // Workflow
|
|
63
|
+
outboundMessages: (el) => getPropertyValue(el, 'fullName'), // Workflow
|
|
64
|
+
rules: (el) => getPropertyValue(el, 'fullName'), // Workflow
|
|
65
|
+
actions: (el) => getPropertyValue(el, 'name'), // Workflow
|
|
66
|
+
//workflowTimeTriggers: it should be a complete pure object compare and not an array comparison // Workflow
|
|
67
|
+
send: (el) => getPropertyValue(el, 'fullName'), // Workflow
|
|
68
|
+
tasks: (el) => getPropertyValue(el, 'fullName'), // Workflow
|
|
69
|
+
assignmentRule: (el) => getPropertyValue(el, 'fullName'), // AssignmentRules
|
|
70
|
+
//ruleEntry: it should be a complete pure object compare and not an array comparison // AssignmentRules // AutoResponseRules // EscalationRules
|
|
71
|
+
autoResponseRule: (el) => getPropertyValue(el, 'fullName'), // AutoResponseRules
|
|
72
|
+
escalationRule: (el) => getPropertyValue(el, 'fullName'), // EscalationRules
|
|
73
|
+
marketingAppExtActions: (el) => getPropertyValue(el, 'apiName'), // MarketingAppExtension
|
|
74
|
+
marketingAppExtActivities: (el) => getPropertyValue(el, 'fullName'), // MarketingAppExtension
|
|
75
|
+
matchingRules: (el) => getPropertyValue(el, 'fullName'), // MatchingRules
|
|
76
|
+
matchingRuleItems: (el) => {
|
|
77
|
+
const fieldName = getPropertyValue(el, 'fieldName');
|
|
78
|
+
const matchingMethod = getPropertyValue(el, 'matchingMethod');
|
|
79
|
+
return `${fieldName}-${matchingMethod}`;
|
|
80
|
+
}, // MatchingRules
|
|
81
|
+
customValue: (el) => getPropertyValue(el, 'fullName'), // GlobalValueSet
|
|
82
|
+
standardValue: (el) => getPropertyValue(el, 'fullName'), // StandardValueSet
|
|
83
|
+
valueTranslation: (el) => getPropertyValue(el, 'masterLabel'), // GlobalValueSetTranslation // StandardValueSetTranslation
|
|
84
|
+
botBlocks: (el) => getPropertyValue(el, 'fullName'), // Translations
|
|
85
|
+
botBlockVersions: (el) => getPropertyValue(el, 'fullName'), // Translations
|
|
86
|
+
botDialogs: (el) => getPropertyValue(el, 'developerName'), // Translations
|
|
87
|
+
botSteps: (el) => getPropertyValue(el, 'stepIdentifier'), // Translations
|
|
88
|
+
botMessages: (el) => getPropertyValue(el, 'messageIdentifier'), // Translations
|
|
89
|
+
botVariableOperation: (el) => getPropertyValue(el, 'variableOperationIdentifier'), // Translations
|
|
90
|
+
botTemplates: (el) => getPropertyValue(el, 'fullName'), // Translations
|
|
91
|
+
bots: (el) => getPropertyValue(el, 'fullName'), // Translations
|
|
92
|
+
botVersions: (el) => getPropertyValue(el, 'fullName'), // Translations
|
|
93
|
+
conversationMessageDefinitions: (el) => getPropertyValue(el, 'name'), // Translations
|
|
94
|
+
constantValueTranslations: (el) => getPropertyValue(el, 'name'), // Translations
|
|
95
|
+
customApplications: (el) => getPropertyValue(el, 'name'), // Translations
|
|
96
|
+
customLabels: (el) => getPropertyValue(el, 'name'), // Translations
|
|
97
|
+
customPageWebLinks: (el) => getPropertyValue(el, 'name'), // Translations
|
|
98
|
+
customTabs: (el) => getPropertyValue(el, 'name'), // Translations
|
|
99
|
+
desFieldTemplateMessages: (el) => getPropertyValue(el, 'name'), // Translations
|
|
100
|
+
flowDefinitions: (el) => getPropertyValue(el, 'fullName'), // Translations
|
|
101
|
+
flows: (el) => getPropertyValue(el, 'fullName'), // Translations
|
|
102
|
+
identityVerificationCustomFieldLabels: (el) => getPropertyValue(el, 'name'), // Translations
|
|
103
|
+
pipelineInspMetricConfigs: (el) => getPropertyValue(el, 'name'), // Translations
|
|
104
|
+
prompts: (el) => getPropertyValue(el, 'name'), // Translations
|
|
105
|
+
promptVersions: (el) => getPropertyValue(el, 'name'), // Translations
|
|
106
|
+
quickActions: (el) => getPropertyValue(el, 'name'), // Translations
|
|
107
|
+
reportTypes: (el) => getPropertyValue(el, 'name'), // Translations
|
|
108
|
+
sections: (el) => {
|
|
109
|
+
const name = getPropertyValue(el, 'name'); // Translations
|
|
110
|
+
const section = getPropertyValue(el, 'section'); // CustomObjectTranslation
|
|
111
|
+
return [name, section].filter(x => x !== String(undefined))[0];
|
|
112
|
+
}, // Special thing because of types different// Translations // CustomObjectTranslation
|
|
113
|
+
columns: (el) => getPropertyValue(el, 'name'), // Translations
|
|
114
|
+
scontrols: (el) => getPropertyValue(el, 'name'), // Translations
|
|
115
|
+
caseValues: (el) => {
|
|
116
|
+
const article = getPropertyValue(el, 'article');
|
|
117
|
+
const caseType = getPropertyValue(el, 'caseType');
|
|
118
|
+
const plural = getPropertyValue(el, 'plural');
|
|
119
|
+
const possessive = getPropertyValue(el, 'possessive');
|
|
120
|
+
return [article, caseType, plural, possessive]
|
|
121
|
+
.filter(x => x !== String(undefined))
|
|
122
|
+
.join('.');
|
|
123
|
+
}, // CustomObjectTranslation
|
|
124
|
+
fieldSets: (el) => getPropertyValue(el, 'name'), // CustomObjectTranslation
|
|
125
|
+
fields: (el) => getPropertyValue(el, 'name'), // CustomObjectTranslation
|
|
126
|
+
picklistValues: (el) => getPropertyValue(el, 'masterLabel'), // CustomObjectTranslation
|
|
127
|
+
layouts: (el) => getPropertyValue(el, 'layout'), // CustomObjectTranslation
|
|
128
|
+
quickActionParametersTranslation: (el) => getPropertyValue(el, 'name'), // CustomObjectTranslation
|
|
129
|
+
recordTypes: (el) => getPropertyValue(el, 'name'), // CustomObjectTranslation
|
|
130
|
+
sharingReasons: (el) => getPropertyValue(el, 'name'), // CustomObjectTranslation
|
|
131
|
+
standardFields: (el) => getPropertyValue(el, 'name'), // CustomObjectTranslation
|
|
132
|
+
validationRules: (el) => getPropertyValue(el, 'name'), // CustomObjectTranslation
|
|
133
|
+
webLinks: (el) => getPropertyValue(el, 'name'), // CustomObjectTranslation
|
|
134
|
+
workflowTasks: (el) => getPropertyValue(el, 'name'), // CustomObjectTranslation
|
|
69
135
|
};
|
|
70
136
|
//# sourceMappingURL=MetadataService.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MetadataService.js","sourceRoot":"","sources":["../../src/service/MetadataService.ts"],"names":[],"mappings":"AAEA,MAAM,OAAO,eAAe;IACnB,MAAM,CAAC,oBAAoB,CAChC,YAAoB;QAEpB,OAAO,YAAY,IAAI,uBAAuB;YAC5C,CAAC,CAAC,uBAAuB,CACrB,YAAoD,CACrD;YACH,CAAC,CAAC,SAAS,CAAA;IACf,CAAC;CACF;AAED,MAAM,gBAAgB,GAAG,CAAC,EAAa,EAAE,QAAgB,EAAE,EAAE,CAC3D,MAAM,CAAE,EAA8B,CAAC,QAAQ,CAAC,CAAC,CAAA;
|
|
1
|
+
{"version":3,"file":"MetadataService.js","sourceRoot":"","sources":["../../src/service/MetadataService.ts"],"names":[],"mappings":"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"}
|
package/messages/run.md
CHANGED
package/npm-shrinkwrap.json
CHANGED
|
@@ -1,16 +1,16 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "sf-git-merge-driver",
|
|
3
|
-
"version": "1.0.0-dev-3.
|
|
3
|
+
"version": "1.0.0-dev-3.14221786808-1",
|
|
4
4
|
"lockfileVersion": 3,
|
|
5
5
|
"requires": true,
|
|
6
6
|
"packages": {
|
|
7
7
|
"": {
|
|
8
8
|
"name": "sf-git-merge-driver",
|
|
9
|
-
"version": "1.0.0-dev-3.
|
|
9
|
+
"version": "1.0.0-dev-3.14221786808-1",
|
|
10
10
|
"license": "MIT",
|
|
11
11
|
"dependencies": {
|
|
12
12
|
"@oclif/core": "^4.2.10",
|
|
13
|
-
"@salesforce/core": "^8.8.
|
|
13
|
+
"@salesforce/core": "^8.8.7",
|
|
14
14
|
"@salesforce/sf-plugins-core": "^12.2.1",
|
|
15
15
|
"fast-xml-parser": "^5.0.9",
|
|
16
16
|
"lodash-es": "^4.17.21",
|
|
@@ -22,17 +22,17 @@
|
|
|
22
22
|
"@oclif/plugin-help": "^6.2.27",
|
|
23
23
|
"@salesforce/cli-plugins-testkit": "^5.3.39",
|
|
24
24
|
"@salesforce/dev-config": "^4.3.1",
|
|
25
|
-
"@types/chai": "^5.2.
|
|
25
|
+
"@types/chai": "^5.2.1",
|
|
26
26
|
"@types/jest": "^29.5.14",
|
|
27
27
|
"chai": "^5.2.0",
|
|
28
28
|
"husky": "^9.1.7",
|
|
29
29
|
"jest": "^29.7.0",
|
|
30
|
-
"knip": "^5.46.
|
|
30
|
+
"knip": "^5.46.2",
|
|
31
31
|
"mocha": "^11.1.0",
|
|
32
32
|
"nyc": "^17.1.0",
|
|
33
|
-
"oclif": "^4.17.
|
|
33
|
+
"oclif": "^4.17.41",
|
|
34
34
|
"shx": "^0.4.0",
|
|
35
|
-
"ts-jest": "^29.
|
|
35
|
+
"ts-jest": "^29.3.0",
|
|
36
36
|
"ts-node": "^10.9.2",
|
|
37
37
|
"tslib": "^2.8.1",
|
|
38
38
|
"typescript": "^5.8.2",
|
|
@@ -3881,9 +3881,9 @@
|
|
|
3881
3881
|
}
|
|
3882
3882
|
},
|
|
3883
3883
|
"node_modules/@jsforce/jsforce-node": {
|
|
3884
|
-
"version": "3.
|
|
3885
|
-
"resolved": "https://registry.npmjs.org/@jsforce/jsforce-node/-/jsforce-node-3.
|
|
3886
|
-
"integrity": "sha512-
|
|
3884
|
+
"version": "3.7.0",
|
|
3885
|
+
"resolved": "https://registry.npmjs.org/@jsforce/jsforce-node/-/jsforce-node-3.7.0.tgz",
|
|
3886
|
+
"integrity": "sha512-v9pc3lPM5RMuB81Gasz5/NKcjktE1LLEACRFopB9LiXRafb4K9bStSMl3nLEHq7+OFdtxfQB3Sx2rYXJGG4DKw==",
|
|
3887
3887
|
"license": "MIT",
|
|
3888
3888
|
"dependencies": {
|
|
3889
3889
|
"@sindresorhus/is": "^4",
|
|
@@ -3913,31 +3913,6 @@
|
|
|
3913
3913
|
"url": "https://github.com/sindresorhus/is?sponsor=1"
|
|
3914
3914
|
}
|
|
3915
3915
|
},
|
|
3916
|
-
"node_modules/@jsforce/jsforce-node/node_modules/csv-parse": {
|
|
3917
|
-
"version": "5.6.0",
|
|
3918
|
-
"resolved": "https://registry.npmjs.org/csv-parse/-/csv-parse-5.6.0.tgz",
|
|
3919
|
-
"integrity": "sha512-l3nz3euub2QMg5ouu5U09Ew9Wf6/wQ8I++ch1loQ0ljmzhmfZYrH9fflS22i/PQEvsPvxCwxgz5q7UB8K1JO4Q==",
|
|
3920
|
-
"license": "MIT"
|
|
3921
|
-
},
|
|
3922
|
-
"node_modules/@jsforce/jsforce-node/node_modules/csv-stringify": {
|
|
3923
|
-
"version": "6.5.2",
|
|
3924
|
-
"resolved": "https://registry.npmjs.org/csv-stringify/-/csv-stringify-6.5.2.tgz",
|
|
3925
|
-
"integrity": "sha512-RFPahj0sXcmUyjrObAK+DOWtMvMIFV328n4qZJhgX3x2RqkQgOTU2mCUmiFR0CzM6AzChlRSUErjiJeEt8BaQA==",
|
|
3926
|
-
"license": "MIT"
|
|
3927
|
-
},
|
|
3928
|
-
"node_modules/@jsforce/jsforce-node/node_modules/xml2js": {
|
|
3929
|
-
"version": "0.6.2",
|
|
3930
|
-
"resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.6.2.tgz",
|
|
3931
|
-
"integrity": "sha512-T4rieHaC1EXcES0Kxxj4JWgaUQHDk+qwHcYOCFHfiwKz7tOVPLq7Hjq9dM1WCMhylqMEfP7hMcOIChvotiZegA==",
|
|
3932
|
-
"license": "MIT",
|
|
3933
|
-
"dependencies": {
|
|
3934
|
-
"sax": ">=0.6.0",
|
|
3935
|
-
"xmlbuilder": "~11.0.0"
|
|
3936
|
-
},
|
|
3937
|
-
"engines": {
|
|
3938
|
-
"node": ">=4.0.0"
|
|
3939
|
-
}
|
|
3940
|
-
},
|
|
3941
3916
|
"node_modules/@kwsites/file-exists": {
|
|
3942
3917
|
"version": "1.1.1",
|
|
3943
3918
|
"resolved": "https://registry.npmjs.org/@kwsites/file-exists/-/file-exists-1.1.1.tgz",
|
|
@@ -4248,12 +4223,12 @@
|
|
|
4248
4223
|
}
|
|
4249
4224
|
},
|
|
4250
4225
|
"node_modules/@salesforce/core": {
|
|
4251
|
-
"version": "8.8.
|
|
4252
|
-
"resolved": "https://registry.npmjs.org/@salesforce/core/-/core-8.8.
|
|
4253
|
-
"integrity": "sha512-
|
|
4226
|
+
"version": "8.8.7",
|
|
4227
|
+
"resolved": "https://registry.npmjs.org/@salesforce/core/-/core-8.8.7.tgz",
|
|
4228
|
+
"integrity": "sha512-AuPSmb/GZ7F8eV5GO6NcfFq3YSOVnPL4sssEQEvKduOSJMs8RTJ92kEefrId/tgFBYfw4b7UzndjFtdgrGGeoA==",
|
|
4254
4229
|
"license": "BSD-3-Clause",
|
|
4255
4230
|
"dependencies": {
|
|
4256
|
-
"@jsforce/jsforce-node": "^3.
|
|
4231
|
+
"@jsforce/jsforce-node": "^3.7.0",
|
|
4257
4232
|
"@salesforce/kit": "^3.2.2",
|
|
4258
4233
|
"@salesforce/schemas": "^1.9.0",
|
|
4259
4234
|
"@salesforce/ts-types": "^2.0.10",
|
|
@@ -5297,9 +5272,9 @@
|
|
|
5297
5272
|
}
|
|
5298
5273
|
},
|
|
5299
5274
|
"node_modules/@types/chai": {
|
|
5300
|
-
"version": "5.2.
|
|
5301
|
-
"resolved": "https://registry.npmjs.org/@types/chai/-/chai-5.2.
|
|
5302
|
-
"integrity": "sha512-
|
|
5275
|
+
"version": "5.2.1",
|
|
5276
|
+
"resolved": "https://registry.npmjs.org/@types/chai/-/chai-5.2.1.tgz",
|
|
5277
|
+
"integrity": "sha512-iu1JLYmGmITRzUgNiLMZD3WCoFzpYtueuyAgHTXqgwSRAMIlFTnZqG6/xenkpUGRJEzSfklUTI4GNSzks/dc0w==",
|
|
5303
5278
|
"dev": true,
|
|
5304
5279
|
"license": "MIT",
|
|
5305
5280
|
"dependencies": {
|
|
@@ -6813,6 +6788,18 @@
|
|
|
6813
6788
|
"integrity": "sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw==",
|
|
6814
6789
|
"license": "MIT"
|
|
6815
6790
|
},
|
|
6791
|
+
"node_modules/csv-parse": {
|
|
6792
|
+
"version": "5.6.0",
|
|
6793
|
+
"resolved": "https://registry.npmjs.org/csv-parse/-/csv-parse-5.6.0.tgz",
|
|
6794
|
+
"integrity": "sha512-l3nz3euub2QMg5ouu5U09Ew9Wf6/wQ8I++ch1loQ0ljmzhmfZYrH9fflS22i/PQEvsPvxCwxgz5q7UB8K1JO4Q==",
|
|
6795
|
+
"license": "MIT"
|
|
6796
|
+
},
|
|
6797
|
+
"node_modules/csv-stringify": {
|
|
6798
|
+
"version": "6.5.2",
|
|
6799
|
+
"resolved": "https://registry.npmjs.org/csv-stringify/-/csv-stringify-6.5.2.tgz",
|
|
6800
|
+
"integrity": "sha512-RFPahj0sXcmUyjrObAK+DOWtMvMIFV328n4qZJhgX3x2RqkQgOTU2mCUmiFR0CzM6AzChlRSUErjiJeEt8BaQA==",
|
|
6801
|
+
"license": "MIT"
|
|
6802
|
+
},
|
|
6816
6803
|
"node_modules/dateformat": {
|
|
6817
6804
|
"version": "4.6.3",
|
|
6818
6805
|
"resolved": "https://registry.npmjs.org/dateformat/-/dateformat-4.6.3.tgz",
|
|
@@ -10399,9 +10386,9 @@
|
|
|
10399
10386
|
}
|
|
10400
10387
|
},
|
|
10401
10388
|
"node_modules/knip": {
|
|
10402
|
-
"version": "5.46.
|
|
10403
|
-
"resolved": "https://registry.npmjs.org/knip/-/knip-5.46.
|
|
10404
|
-
"integrity": "sha512-
|
|
10389
|
+
"version": "5.46.2",
|
|
10390
|
+
"resolved": "https://registry.npmjs.org/knip/-/knip-5.46.2.tgz",
|
|
10391
|
+
"integrity": "sha512-QGVkUVUwNv1zDOmb9ob4jraWNZu06O5xPa5cl97wzHmGGqJHkLfuvAzGTpuVxgujq+FKOXTbD8vv1TfimKTPAQ==",
|
|
10405
10392
|
"dev": true,
|
|
10406
10393
|
"funding": [
|
|
10407
10394
|
{
|
|
@@ -11416,9 +11403,9 @@
|
|
|
11416
11403
|
}
|
|
11417
11404
|
},
|
|
11418
11405
|
"node_modules/oclif": {
|
|
11419
|
-
"version": "4.17.
|
|
11420
|
-
"resolved": "https://registry.npmjs.org/oclif/-/oclif-4.17.
|
|
11421
|
-
"integrity": "sha512-
|
|
11406
|
+
"version": "4.17.41",
|
|
11407
|
+
"resolved": "https://registry.npmjs.org/oclif/-/oclif-4.17.41.tgz",
|
|
11408
|
+
"integrity": "sha512-l1VlcXDOXXpMmClGmxJSyas/vMbq1XdyZsCGG7s83oNAIcEdZZFe5NPmxO2ZPRCPFhKy+zoV8f5/NpUuoc4H8Q==",
|
|
11422
11409
|
"dev": true,
|
|
11423
11410
|
"license": "MIT",
|
|
11424
11411
|
"dependencies": {
|
|
@@ -11427,7 +11414,7 @@
|
|
|
11427
11414
|
"@inquirer/confirm": "^3.1.22",
|
|
11428
11415
|
"@inquirer/input": "^2.2.4",
|
|
11429
11416
|
"@inquirer/select": "^2.5.0",
|
|
11430
|
-
"@oclif/core": "^4.2.
|
|
11417
|
+
"@oclif/core": "^4.2.10",
|
|
11431
11418
|
"@oclif/plugin-help": "^6.2.27",
|
|
11432
11419
|
"@oclif/plugin-not-found": "^3.2.46",
|
|
11433
11420
|
"@oclif/plugin-warn-if-update-available": "^3.1.31",
|
|
@@ -13496,21 +13483,21 @@
|
|
|
13496
13483
|
}
|
|
13497
13484
|
},
|
|
13498
13485
|
"node_modules/tldts": {
|
|
13499
|
-
"version": "6.1.
|
|
13500
|
-
"resolved": "https://registry.npmjs.org/tldts/-/tldts-6.1.
|
|
13501
|
-
"integrity": "sha512-
|
|
13486
|
+
"version": "6.1.85",
|
|
13487
|
+
"resolved": "https://registry.npmjs.org/tldts/-/tldts-6.1.85.tgz",
|
|
13488
|
+
"integrity": "sha512-gBdZ1RjCSevRPFix/hpaUWeak2/RNUZB4/8frF1r5uYMHjFptkiT0JXIebWvgI/0ZHXvxaUDDJshiA0j6GdL3w==",
|
|
13502
13489
|
"license": "MIT",
|
|
13503
13490
|
"dependencies": {
|
|
13504
|
-
"tldts-core": "^6.1.
|
|
13491
|
+
"tldts-core": "^6.1.85"
|
|
13505
13492
|
},
|
|
13506
13493
|
"bin": {
|
|
13507
13494
|
"tldts": "bin/cli.js"
|
|
13508
13495
|
}
|
|
13509
13496
|
},
|
|
13510
13497
|
"node_modules/tldts-core": {
|
|
13511
|
-
"version": "6.1.
|
|
13512
|
-
"resolved": "https://registry.npmjs.org/tldts-core/-/tldts-core-6.1.
|
|
13513
|
-
"integrity": "sha512-
|
|
13498
|
+
"version": "6.1.85",
|
|
13499
|
+
"resolved": "https://registry.npmjs.org/tldts-core/-/tldts-core-6.1.85.tgz",
|
|
13500
|
+
"integrity": "sha512-DTjUVvxckL1fIoPSb3KE7ISNtkWSawZdpfxGxwiIrZoO6EbHVDXXUIlIuWympPaeS+BLGyggozX/HTMsRAdsoA==",
|
|
13514
13501
|
"license": "MIT"
|
|
13515
13502
|
},
|
|
13516
13503
|
"node_modules/tmp": {
|
|
@@ -13564,9 +13551,9 @@
|
|
|
13564
13551
|
"license": "MIT"
|
|
13565
13552
|
},
|
|
13566
13553
|
"node_modules/ts-jest": {
|
|
13567
|
-
"version": "29.
|
|
13568
|
-
"resolved": "https://registry.npmjs.org/ts-jest/-/ts-jest-29.
|
|
13569
|
-
"integrity": "sha512-
|
|
13554
|
+
"version": "29.3.0",
|
|
13555
|
+
"resolved": "https://registry.npmjs.org/ts-jest/-/ts-jest-29.3.0.tgz",
|
|
13556
|
+
"integrity": "sha512-4bfGBX7Gd1Aqz3SyeDS9O276wEU/BInZxskPrbhZLyv+c1wskDCqDFMJQJLWrIr/fKoAH4GE5dKUlrdyvo+39A==",
|
|
13570
13557
|
"dev": true,
|
|
13571
13558
|
"license": "MIT",
|
|
13572
13559
|
"dependencies": {
|
|
@@ -13578,6 +13565,7 @@
|
|
|
13578
13565
|
"lodash.memoize": "^4.1.2",
|
|
13579
13566
|
"make-error": "^1.3.6",
|
|
13580
13567
|
"semver": "^7.7.1",
|
|
13568
|
+
"type-fest": "^4.37.0",
|
|
13581
13569
|
"yargs-parser": "^21.1.1"
|
|
13582
13570
|
},
|
|
13583
13571
|
"bin": {
|
|
@@ -13612,6 +13600,19 @@
|
|
|
13612
13600
|
}
|
|
13613
13601
|
}
|
|
13614
13602
|
},
|
|
13603
|
+
"node_modules/ts-jest/node_modules/type-fest": {
|
|
13604
|
+
"version": "4.38.0",
|
|
13605
|
+
"resolved": "https://registry.npmjs.org/type-fest/-/type-fest-4.38.0.tgz",
|
|
13606
|
+
"integrity": "sha512-2dBz5D5ycHIoliLYLi0Q2V7KRaDlH0uWIvmk7TYlAg5slqwiPv1ezJdZm1QEM0xgk29oYWMCbIG7E6gHpvChlg==",
|
|
13607
|
+
"dev": true,
|
|
13608
|
+
"license": "(MIT OR CC0-1.0)",
|
|
13609
|
+
"engines": {
|
|
13610
|
+
"node": ">=16"
|
|
13611
|
+
},
|
|
13612
|
+
"funding": {
|
|
13613
|
+
"url": "https://github.com/sponsors/sindresorhus"
|
|
13614
|
+
}
|
|
13615
|
+
},
|
|
13615
13616
|
"node_modules/ts-node": {
|
|
13616
13617
|
"version": "10.9.2",
|
|
13617
13618
|
"resolved": "https://registry.npmjs.org/ts-node/-/ts-node-10.9.2.tgz",
|
|
@@ -14126,6 +14127,19 @@
|
|
|
14126
14127
|
}
|
|
14127
14128
|
}
|
|
14128
14129
|
},
|
|
14130
|
+
"node_modules/xml2js": {
|
|
14131
|
+
"version": "0.6.2",
|
|
14132
|
+
"resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.6.2.tgz",
|
|
14133
|
+
"integrity": "sha512-T4rieHaC1EXcES0Kxxj4JWgaUQHDk+qwHcYOCFHfiwKz7tOVPLq7Hjq9dM1WCMhylqMEfP7hMcOIChvotiZegA==",
|
|
14134
|
+
"license": "MIT",
|
|
14135
|
+
"dependencies": {
|
|
14136
|
+
"sax": ">=0.6.0",
|
|
14137
|
+
"xmlbuilder": "~11.0.0"
|
|
14138
|
+
},
|
|
14139
|
+
"engines": {
|
|
14140
|
+
"node": ">=4.0.0"
|
|
14141
|
+
}
|
|
14142
|
+
},
|
|
14129
14143
|
"node_modules/xmlbuilder": {
|
|
14130
14144
|
"version": "11.0.1",
|
|
14131
14145
|
"resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-11.0.1.tgz",
|
package/oclif.manifest.json
CHANGED
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "sf-git-merge-driver",
|
|
3
3
|
"description": "git remote add origin git@github.com:scolladon/sf-git-merge-driver.git",
|
|
4
|
-
"version": "1.0.0-dev-3.
|
|
4
|
+
"version": "1.0.0-dev-3.14221786808-1",
|
|
5
5
|
"exports": "./lib/driver/MergeDriver.js",
|
|
6
6
|
"type": "module",
|
|
7
7
|
"author": "Sébastien Colladon (colladonsebastien@gmail.com)",
|
|
@@ -11,7 +11,7 @@
|
|
|
11
11
|
},
|
|
12
12
|
"dependencies": {
|
|
13
13
|
"@oclif/core": "^4.2.10",
|
|
14
|
-
"@salesforce/core": "^8.8.
|
|
14
|
+
"@salesforce/core": "^8.8.7",
|
|
15
15
|
"@salesforce/sf-plugins-core": "^12.2.1",
|
|
16
16
|
"fast-xml-parser": "^5.0.9",
|
|
17
17
|
"lodash-es": "^4.17.21",
|
|
@@ -23,17 +23,17 @@
|
|
|
23
23
|
"@oclif/plugin-help": "^6.2.27",
|
|
24
24
|
"@salesforce/cli-plugins-testkit": "^5.3.39",
|
|
25
25
|
"@salesforce/dev-config": "^4.3.1",
|
|
26
|
-
"@types/chai": "^5.2.
|
|
26
|
+
"@types/chai": "^5.2.1",
|
|
27
27
|
"@types/jest": "^29.5.14",
|
|
28
28
|
"chai": "^5.2.0",
|
|
29
29
|
"husky": "^9.1.7",
|
|
30
30
|
"jest": "^29.7.0",
|
|
31
|
-
"knip": "^5.46.
|
|
31
|
+
"knip": "^5.46.2",
|
|
32
32
|
"mocha": "^11.1.0",
|
|
33
33
|
"nyc": "^17.1.0",
|
|
34
|
-
"oclif": "^4.17.
|
|
34
|
+
"oclif": "^4.17.41",
|
|
35
35
|
"shx": "^0.4.0",
|
|
36
|
-
"ts-jest": "^29.
|
|
36
|
+
"ts-jest": "^29.3.0",
|
|
37
37
|
"ts-node": "^10.9.2",
|
|
38
38
|
"tslib": "^2.8.1",
|
|
39
39
|
"typescript": "^5.8.2",
|