sf-git-merge-driver 1.5.4 → 1.6.0
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 +4 -3
- package/lib/merger/XmlMerger.d.ts +22 -0
- package/lib/merger/XmlMerger.js +2 -2
- package/lib/merger/XmlMerger.js.map +1 -1
- package/lib/merger/nodes/OrderedKeyedArrayMergeStrategy.js +7 -40
- package/lib/merger/nodes/OrderedKeyedArrayMergeStrategy.js.map +1 -1
- package/lib/merger/nodes/PropertyMergeNode.js +3 -3
- package/lib/merger/nodes/PropertyMergeNode.js.map +1 -1
- package/lib/merger/nodes/TextArrayMergeNode.js +1 -9
- package/lib/merger/nodes/TextArrayMergeNode.js.map +1 -1
- package/lib/merger/nodes/TextMergeNode.js +0 -7
- package/lib/merger/nodes/TextMergeNode.js.map +1 -1
- package/lib/types/mergeResult.js +0 -3
- package/lib/types/mergeResult.js.map +1 -1
- package/npm-shrinkwrap.json +7117 -8268
- package/oclif.manifest.json +1 -1
- package/package.json +88 -23
package/README.md
CHANGED
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
|
|
3
3
|
[]()
|
|
4
4
|
[]()
|
|
5
|
+
[](https://scolladon.github.io/sf-git-merge-driver/dev/bench/runtime/)
|
|
5
6
|
|
|
6
7
|
An intelligent Git merge driver specifically designed for Salesforce metadata files. **Eliminates hours** of manual merge conflicts resolution.
|
|
7
8
|
|
|
@@ -330,7 +331,7 @@ EXAMPLES
|
|
|
330
331
|
$ sf git merge driver install
|
|
331
332
|
```
|
|
332
333
|
|
|
333
|
-
_See code: [src/commands/git/merge/driver/install.ts](https://github.com/scolladon/sf-git-merge-driver/blob/v1.
|
|
334
|
+
_See code: [src/commands/git/merge/driver/install.ts](https://github.com/scolladon/sf-git-merge-driver/blob/v1.6.0/src/commands/git/merge/driver/install.ts)_
|
|
334
335
|
|
|
335
336
|
## `sf git merge driver run`
|
|
336
337
|
|
|
@@ -374,7 +375,7 @@ EXAMPLES
|
|
|
374
375
|
- output-file is the path to the file where the merged content will be written
|
|
375
376
|
```
|
|
376
377
|
|
|
377
|
-
_See code: [src/commands/git/merge/driver/run.ts](https://github.com/scolladon/sf-git-merge-driver/blob/v1.
|
|
378
|
+
_See code: [src/commands/git/merge/driver/run.ts](https://github.com/scolladon/sf-git-merge-driver/blob/v1.6.0/src/commands/git/merge/driver/run.ts)_
|
|
378
379
|
|
|
379
380
|
## `sf git merge driver uninstall`
|
|
380
381
|
|
|
@@ -404,7 +405,7 @@ EXAMPLES
|
|
|
404
405
|
$ sf git merge driver uninstall
|
|
405
406
|
```
|
|
406
407
|
|
|
407
|
-
_See code: [src/commands/git/merge/driver/uninstall.ts](https://github.com/scolladon/sf-git-merge-driver/blob/v1.
|
|
408
|
+
_See code: [src/commands/git/merge/driver/uninstall.ts](https://github.com/scolladon/sf-git-merge-driver/blob/v1.6.0/src/commands/git/merge/driver/uninstall.ts)_
|
|
408
409
|
<!-- commandsstop -->
|
|
409
410
|
|
|
410
411
|
## Changelog
|
|
@@ -1,4 +1,26 @@
|
|
|
1
1
|
import type { MergeConfig } from '../types/conflictTypes.js';
|
|
2
|
+
export declare const parserOptions: {
|
|
3
|
+
ignoreDeclaration: boolean;
|
|
4
|
+
numberParseOptions: {
|
|
5
|
+
leadingZeros: boolean;
|
|
6
|
+
hex: boolean;
|
|
7
|
+
};
|
|
8
|
+
parseAttributeValue: boolean;
|
|
9
|
+
parseTagValue: boolean;
|
|
10
|
+
cdataPropName: string;
|
|
11
|
+
commentPropName: string;
|
|
12
|
+
ignoreAttributes: boolean;
|
|
13
|
+
processEntities: boolean;
|
|
14
|
+
};
|
|
15
|
+
export declare const builderOptions: {
|
|
16
|
+
format: boolean;
|
|
17
|
+
indentBy: string;
|
|
18
|
+
preserveOrder: boolean;
|
|
19
|
+
cdataPropName: string;
|
|
20
|
+
commentPropName: string;
|
|
21
|
+
ignoreAttributes: boolean;
|
|
22
|
+
processEntities: boolean;
|
|
23
|
+
};
|
|
2
24
|
export declare class XmlMerger {
|
|
3
25
|
private readonly config;
|
|
4
26
|
private readonly formatter;
|
package/lib/merger/XmlMerger.js
CHANGED
|
@@ -10,14 +10,14 @@ const baseOptions = {
|
|
|
10
10
|
ignoreAttributes: false,
|
|
11
11
|
processEntities: false,
|
|
12
12
|
};
|
|
13
|
-
const parserOptions = {
|
|
13
|
+
export const parserOptions = {
|
|
14
14
|
...baseOptions,
|
|
15
15
|
ignoreDeclaration: true,
|
|
16
16
|
numberParseOptions: { leadingZeros: false, hex: false },
|
|
17
17
|
parseAttributeValue: false,
|
|
18
18
|
parseTagValue: false,
|
|
19
19
|
};
|
|
20
|
-
const builderOptions = {
|
|
20
|
+
export const builderOptions = {
|
|
21
21
|
...baseOptions,
|
|
22
22
|
format: true,
|
|
23
23
|
indentBy: XML_INDENT,
|
|
@@ -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,EACL,eAAe,EACf,qBAAqB,EACrB,QAAQ,EACR,UAAU,GACX,MAAM,+BAA+B,CAAA;AAEtC,OAAO,EAAE,GAAG,EAAE,MAAM,8BAA8B,CAAA;AAClD,OAAO,EAAE,uBAAuB,EAAE,MAAM,8BAA8B,CAAA;AACtE,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAA;AAE5C,MAAM,WAAW,GAAG;IAClB,aAAa,EAAE,eAAe;IAC9B,eAAe,EAAE,qBAAqB;IACtC,gBAAgB,EAAE,KAAK;IACvB,eAAe,EAAE,KAAK;CACvB,CAAA;AAED,MAAM,aAAa,GAAG;
|
|
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,EACL,eAAe,EACf,qBAAqB,EACrB,QAAQ,EACR,UAAU,GACX,MAAM,+BAA+B,CAAA;AAEtC,OAAO,EAAE,GAAG,EAAE,MAAM,8BAA8B,CAAA;AAClD,OAAO,EAAE,uBAAuB,EAAE,MAAM,8BAA8B,CAAA;AACtE,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAA;AAE5C,MAAM,WAAW,GAAG;IAClB,aAAa,EAAE,eAAe;IAC9B,eAAe,EAAE,qBAAqB;IACtC,gBAAgB,EAAE,KAAK;IACvB,eAAe,EAAE,KAAK;CACvB,CAAA;AAED,MAAM,CAAC,MAAM,aAAa,GAAG;IAC3B,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;CACrB,CAAA;AAED,MAAM,CAAC,MAAM,cAAc,GAAG;IAC5B,GAAG,WAAW;IACd,MAAM,EAAE,IAAI;IACZ,QAAQ,EAAE,UAAU;IACpB,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,OAAO,SAAS;IAGS;IAFZ,SAAS,CAAyB;IAEnD,YAA6B,MAAmB;QAAnB,WAAM,GAAN,MAAM,CAAa;QAC9C,IAAI,CAAC,SAAS,GAAG,IAAI,uBAAuB,CAAC,MAAM,CAAC,CAAA;IACtD,CAAC;IAGD,aAAa,CACX,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;QAE3C,MAAM,UAAU,GAAG,IAAI,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;QAC9C,MAAM,YAAY,GAAG,UAAU,CAAC,aAAa,CAAC,WAAW,EAAE,MAAM,EAAE,QAAQ,CAAC,CAAA;QAE5E,MAAM,OAAO,GAAG,IAAI,UAAU,CAAC,cAAc,CAAC,CAAA;QAC9C,MAAM,SAAS,GAAW,OAAO,CAAC,KAAK,CAAC,YAAY,CAAC,MAAM,CAAC,CAAA;QAC5D,OAAO;YACL,MAAM,EAAE,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,eAAe,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,EAAE;YAC/D,WAAW,EAAE,YAAY,CAAC,WAAW;SACtC,CAAA;IACH,CAAC;IAEO,eAAe,CAAC,GAAW;QACjC,IAAI,MAAM,GAAG,QAAQ,CAAC,MAAM,CAAC,GAAG,CAAC,CAAA;QACjC,MAAM,GAAG,IAAI,CAAC,SAAS,CAAC,qBAAqB,CAAC,MAAM,CAAC,CAAA;QACrD,MAAM,GAAG,eAAe,CAAC,MAAM,CAAC,CAAA;QAChC,MAAM,GAAG,IAAI,CAAC,SAAS,CAAC,qBAAqB,CAAC,MAAM,CAAC,CAAA;QACrD,OAAO,MAAM,CAAA;IACf,CAAC;CACF;AA7BC;IADC,GAAG;8CAqBH"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { deepEqual } from 'fast-equals';
|
|
2
2
|
import { isEmpty } from 'lodash-es';
|
|
3
|
-
import { combineResults,
|
|
3
|
+
import { combineResults, noConflict, withConflict, } from '../../types/mergeResult.js';
|
|
4
4
|
import { hasSameOrder, lcs, pushAll } from '../../utils/arrayUtils.js';
|
|
5
5
|
import { setsEqual, setsIntersect } from '../../utils/setUtils.js';
|
|
6
6
|
import { buildConflictMarkers } from '../ConflictMarkerBuilder.js';
|
|
@@ -135,28 +135,10 @@ export class OrderedKeyedArrayMergeStrategy {
|
|
|
135
135
|
*/
|
|
136
136
|
computeMergedKeyOrder(ctx, analysis) {
|
|
137
137
|
const { localMoved, otherMoved } = analysis;
|
|
138
|
-
|
|
139
|
-
const
|
|
140
|
-
const
|
|
141
|
-
const
|
|
142
|
-
const otherAdditions = [];
|
|
143
|
-
for (const key of ctx.localKeys) {
|
|
144
|
-
if (localMoved.has(key)) {
|
|
145
|
-
localMovedOrdered.push(key);
|
|
146
|
-
}
|
|
147
|
-
else if (!ctx.ancestorSet.has(key)) {
|
|
148
|
-
localAdditions.push(key);
|
|
149
|
-
}
|
|
150
|
-
}
|
|
151
|
-
for (const key of ctx.otherKeys) {
|
|
152
|
-
if (otherMoved.has(key)) {
|
|
153
|
-
otherMovedOrdered.push(key);
|
|
154
|
-
}
|
|
155
|
-
else if (!ctx.ancestorSet.has(key) && !ctx.localMap.has(key)) {
|
|
156
|
-
// Only add if not already added by local
|
|
157
|
-
otherAdditions.push(key);
|
|
158
|
-
}
|
|
159
|
-
}
|
|
138
|
+
const localMovedOrdered = ctx.localKeys.filter(k => localMoved.has(k));
|
|
139
|
+
const otherMovedOrdered = ctx.otherKeys.filter(k => otherMoved.has(k));
|
|
140
|
+
const localAdditions = ctx.localKeys.filter(k => !localMoved.has(k) && !ctx.ancestorSet.has(k));
|
|
141
|
+
const otherAdditions = ctx.otherKeys.filter(k => !otherMoved.has(k) && !ctx.ancestorSet.has(k) && !ctx.localMap.has(k));
|
|
160
142
|
// Conflict: both sides added different elements - ambiguous ordering
|
|
161
143
|
if (localAdditions.length > 0 && otherAdditions.length > 0) {
|
|
162
144
|
return null;
|
|
@@ -247,10 +229,7 @@ export class OrderedKeyedArrayMergeStrategy {
|
|
|
247
229
|
lIdx += gapL.length;
|
|
248
230
|
oIdx += gapO.length;
|
|
249
231
|
const gaps = { ancestor: gapA, local: gapL, other: gapO };
|
|
250
|
-
|
|
251
|
-
if (isNonEmpty(gapResult)) {
|
|
252
|
-
results.push(gapResult);
|
|
253
|
-
}
|
|
232
|
+
results.push(this.mergeGap(config, gaps, ctx));
|
|
254
233
|
results.push(this.mergeElement(config, anchor, ctx));
|
|
255
234
|
aIdx++;
|
|
256
235
|
lIdx++;
|
|
@@ -261,10 +240,7 @@ export class OrderedKeyedArrayMergeStrategy {
|
|
|
261
240
|
local: ctx.localKeys.slice(lIdx),
|
|
262
241
|
other: ctx.otherKeys.slice(oIdx),
|
|
263
242
|
};
|
|
264
|
-
|
|
265
|
-
if (isNonEmpty(finalResult)) {
|
|
266
|
-
results.push(finalResult);
|
|
267
|
-
}
|
|
243
|
+
results.push(this.mergeGap(config, finalGaps, ctx));
|
|
268
244
|
return combineResults(results);
|
|
269
245
|
}
|
|
270
246
|
collectUntil(keys, startIdx, anchor) {
|
|
@@ -276,11 +252,6 @@ export class OrderedKeyedArrayMergeStrategy {
|
|
|
276
252
|
}
|
|
277
253
|
// Gap merging
|
|
278
254
|
mergeGap(config, gaps, ctx) {
|
|
279
|
-
if (gaps.ancestor.length === 0 &&
|
|
280
|
-
gaps.local.length === 0 &&
|
|
281
|
-
gaps.other.length === 0) {
|
|
282
|
-
return noConflict([]);
|
|
283
|
-
}
|
|
284
255
|
const sets = computeGapSets(gaps.ancestor, gaps.local, gaps.other);
|
|
285
256
|
const gapConflict = this.detectGapConflict(config, gaps, sets, ctx);
|
|
286
257
|
if (gapConflict) {
|
|
@@ -356,10 +327,6 @@ export class OrderedKeyedArrayMergeStrategy {
|
|
|
356
327
|
const aVal = ctx.ancestorMap.get(key);
|
|
357
328
|
const lVal = ctx.localMap.get(key);
|
|
358
329
|
const oVal = ctx.otherMap.get(key);
|
|
359
|
-
// All equal
|
|
360
|
-
if (deepEqual(aVal, lVal) && deepEqual(lVal, oVal)) {
|
|
361
|
-
return noConflict([this.wrapElement(lVal)]);
|
|
362
|
-
}
|
|
363
330
|
// Other unchanged → take local
|
|
364
331
|
if (deepEqual(aVal, oVal) && lVal) {
|
|
365
332
|
return noConflict([this.wrapElement(lVal)]);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"OrderedKeyedArrayMergeStrategy.js","sourceRoot":"","sources":["../../../src/merger/nodes/OrderedKeyedArrayMergeStrategy.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"OrderedKeyedArrayMergeStrategy.js","sourceRoot":"","sources":["../../../src/merger/nodes/OrderedKeyedArrayMergeStrategy.ts"],"names":[],"mappings":"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"}
|
|
@@ -20,9 +20,9 @@ export class PropertyMergeNode {
|
|
|
20
20
|
const props = getUniqueSortedProps(this.ancestor, this.local, this.other);
|
|
21
21
|
const results = [];
|
|
22
22
|
for (const key of props) {
|
|
23
|
-
const ancestorOfKey = this.ancestor
|
|
24
|
-
const localOfKey = this.local
|
|
25
|
-
const otherOfKey = this.other
|
|
23
|
+
const ancestorOfKey = this.ancestor[key];
|
|
24
|
+
const localOfKey = this.local[key];
|
|
25
|
+
const otherOfKey = this.other[key];
|
|
26
26
|
const childNode = defaultNodeFactory.createNode(ancestorOfKey, localOfKey, otherOfKey, key);
|
|
27
27
|
const childResult = childNode.merge(config);
|
|
28
28
|
results.push(childResult);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PropertyMergeNode.js","sourceRoot":"","sources":["../../../src/merger/nodes/PropertyMergeNode.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,cAAc,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAA;AAEvE,OAAO,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAA;AAC1D,OAAO,EAAE,oBAAoB,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAA;AAEtE,gEAAgE;AAChE,oGAAoG;AACpG,gDAAgD;AAChD,+DAA+D;AAC/D,MAAM,OAAO,iBAAiB;IAET;IACA;IACA;IACA;IAJnB,YACmB,QAAgC,EAChC,KAA6B,EAC7B,KAA6B,EAC7B,SAAiB;QAHjB,aAAQ,GAAR,QAAQ,CAAwB;QAChC,UAAK,GAAL,KAAK,CAAwB;QAC7B,UAAK,GAAL,KAAK,CAAwB;QAC7B,cAAS,GAAT,SAAS,CAAQ;IACjC,CAAC;IAEJ,KAAK,CAAC,MAAmB;QACvB,MAAM,KAAK,GAAG,oBAAoB,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,CAAA;QACzE,MAAM,OAAO,GAAkB,EAAE,CAAA;QAEjC,KAAK,MAAM,GAAG,IAAI,KAAK,EAAE,CAAC;YACxB,MAAM,aAAa,GAAG,IAAI,CAAC,QAAQ,
|
|
1
|
+
{"version":3,"file":"PropertyMergeNode.js","sourceRoot":"","sources":["../../../src/merger/nodes/PropertyMergeNode.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,cAAc,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAA;AAEvE,OAAO,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAA;AAC1D,OAAO,EAAE,oBAAoB,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAA;AAEtE,gEAAgE;AAChE,oGAAoG;AACpG,gDAAgD;AAChD,+DAA+D;AAC/D,MAAM,OAAO,iBAAiB;IAET;IACA;IACA;IACA;IAJnB,YACmB,QAAgC,EAChC,KAA6B,EAC7B,KAA6B,EAC7B,SAAiB;QAHjB,aAAQ,GAAR,QAAQ,CAAwB;QAChC,UAAK,GAAL,KAAK,CAAwB;QAC7B,UAAK,GAAL,KAAK,CAAwB;QAC7B,cAAS,GAAT,SAAS,CAAQ;IACjC,CAAC;IAEJ,KAAK,CAAC,MAAmB;QACvB,MAAM,KAAK,GAAG,oBAAoB,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,CAAA;QACzE,MAAM,OAAO,GAAkB,EAAE,CAAA;QAEjC,KAAK,MAAM,GAAG,IAAI,KAAK,EAAE,CAAC;YACxB,MAAM,aAAa,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAA;YACxC,MAAM,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;YAClC,MAAM,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;YAElC,MAAM,SAAS,GAAG,kBAAkB,CAAC,UAAU,CAC7C,aAAa,EACb,UAAU,EACV,UAAU,EACV,GAAG,CACJ,CAAA;YACD,MAAM,WAAW,GAAG,SAAS,CAAC,KAAK,CAAC,MAAM,CAAC,CAAA;YAE3C,OAAO,CAAC,IAAI,CAAC,WAAW,CAAC,CAAA;QAC3B,CAAC;QAED,MAAM,QAAQ,GAAG,cAAc,CAAC,OAAO,CAAC,CAAA;QACxC,IAAI,QAAQ,CAAC,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACjC,OAAO,UAAU,CAAC,EAAE,CAAC,CAAA;QACvB,CAAC;QACD,OAAO,eAAe,CAAC,QAAQ,EAAE,IAAI,CAAC,SAAS,CAAC,CAAA;IAClD,CAAC;CACF"}
|
|
@@ -1,14 +1,6 @@
|
|
|
1
1
|
import { noConflict } from '../../types/mergeResult.js';
|
|
2
2
|
import { generateObj } from './nodeUtils.js';
|
|
3
|
-
const compareItems = (a, b) =>
|
|
4
|
-
const strA = String(a);
|
|
5
|
-
const strB = String(b);
|
|
6
|
-
if (strA < strB)
|
|
7
|
-
return -1;
|
|
8
|
-
if (strA > strB)
|
|
9
|
-
return 1;
|
|
10
|
-
return 0;
|
|
11
|
-
};
|
|
3
|
+
const compareItems = (a, b) => String(a).localeCompare(String(b));
|
|
12
4
|
export class TextArrayMergeNode {
|
|
13
5
|
ancestor;
|
|
14
6
|
local;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TextArrayMergeNode.js","sourceRoot":"","sources":["../../../src/merger/nodes/TextArrayMergeNode.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAA;AAEvD,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAA;AAE5C,MAAM,YAAY,GAAG,CAAC,CAAY,EAAE,CAAY,EAAU,EAAE
|
|
1
|
+
{"version":3,"file":"TextArrayMergeNode.js","sourceRoot":"","sources":["../../../src/merger/nodes/TextArrayMergeNode.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAA;AAEvD,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAA;AAE5C,MAAM,YAAY,GAAG,CAAC,CAAY,EAAE,CAAY,EAAU,EAAE,CAC1D,MAAM,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAA;AAEpC,MAAM,OAAO,kBAAkB;IAEV;IACA;IACA;IACA;IAJnB,YACmB,QAAmB,EACnB,KAAgB,EAChB,KAAgB,EAChB,SAAiB;QAHjB,aAAQ,GAAR,QAAQ,CAAW;QACnB,UAAK,GAAL,KAAK,CAAW;QAChB,UAAK,GAAL,KAAK,CAAW;QAChB,cAAS,GAAT,SAAS,CAAQ;IACjC,CAAC;IAEJ,KAAK,CAAC,OAAoB;QACxB,MAAM,QAAQ,GAAG,IAAI,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;QACpC,MAAM,QAAQ,GAAG,IAAI,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;QACpC,MAAM,WAAW,GAAG,IAAI,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;QAE1C,MAAM,WAAW,GAAG,IAAI,GAAG,CAAC;YAC1B,GAAG,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;YACzE,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,WAAW,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;YACpD,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,WAAW,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;SACrD,CAAC,CAAA;QAEF,MAAM,MAAM,GAAG,CAAC,GAAG,WAAW,CAAC;aAC5B,IAAI,CAAC,YAAY,CAAC;aAClB,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,WAAW,CAAC,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC,CAAA;QAEjD,OAAO,UAAU,CAAC,MAAM,CAAC,CAAA;IAC3B,CAAC;CACF"}
|
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
import { noConflict } from '../../types/mergeResult.js';
|
|
2
|
-
import { MergeScenario } from '../../types/mergeScenario.js';
|
|
3
1
|
import { getScenario } from '../MergeScenarioFactory.js';
|
|
4
2
|
import { getTextMergeStrategy } from '../strategies/TextMergeStrategy.js';
|
|
5
3
|
import { generateObj } from './nodeUtils.js';
|
|
@@ -19,11 +17,6 @@ export class TextMergeNode {
|
|
|
19
17
|
const objLocal = generateObj(this.local, this.attribute);
|
|
20
18
|
const objOther = generateObj(this.other, this.attribute);
|
|
21
19
|
const scenario = getScenario(objAncestor, objLocal, objOther);
|
|
22
|
-
if (this.local === this.other &&
|
|
23
|
-
(scenario === MergeScenario.LOCAL_AND_OTHER ||
|
|
24
|
-
scenario === MergeScenario.ALL)) {
|
|
25
|
-
return noConflict([objLocal]);
|
|
26
|
-
}
|
|
27
20
|
const strategy = getTextMergeStrategy(scenario);
|
|
28
21
|
return strategy.handle({
|
|
29
22
|
config,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TextMergeNode.js","sourceRoot":"","sources":["../../../src/merger/nodes/TextMergeNode.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"TextMergeNode.js","sourceRoot":"","sources":["../../../src/merger/nodes/TextMergeNode.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAA;AACxD,OAAO,EAAE,oBAAoB,EAAE,MAAM,oCAAoC,CAAA;AAEzE,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAA;AAE5C,MAAM,OAAO,aAAa;IAEL;IACA;IACA;IACA;IAJnB,YACmB,QAA0B,EAC1B,KAAuB,EACvB,KAAuB,EACvB,SAAiB;QAHjB,aAAQ,GAAR,QAAQ,CAAkB;QAC1B,UAAK,GAAL,KAAK,CAAkB;QACvB,UAAK,GAAL,KAAK,CAAkB;QACvB,cAAS,GAAT,SAAS,CAAQ;IACjC,CAAC;IAEJ,KAAK,CAAC,MAAmB;QACvB,MAAM,WAAW,GAAG,WAAW,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,SAAS,CAAC,CAAA;QAC9D,MAAM,QAAQ,GAAG,WAAW,CAAC,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,SAAS,CAAC,CAAA;QACxD,MAAM,QAAQ,GAAG,WAAW,CAAC,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,SAAS,CAAC,CAAA;QAExD,MAAM,QAAQ,GAAG,WAAW,CAAC,WAAW,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAA;QAC7D,MAAM,QAAQ,GAAG,oBAAoB,CAAC,QAAQ,CAAC,CAAA;QAC/C,OAAO,QAAQ,CAAC,MAAM,CAAC;YACrB,MAAM;YACN,WAAW;YACX,QAAQ;YACR,QAAQ;YACR,QAAQ,EAAE,IAAI,CAAC,QAAQ;YACvB,KAAK,EAAE,IAAI,CAAC,KAAK;YACjB,KAAK,EAAE,IAAI,CAAC,KAAK;SAClB,CAAC,CAAA;IACJ,CAAC;CACF"}
|
package/lib/types/mergeResult.js
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mergeResult.js","sourceRoot":"","sources":["../../src/types/mergeResult.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AAQnC,MAAM,WAAW,GAAc,EAAE,CAAA;AACjC,MAAM,iBAAiB,GAAgB;IACrC,MAAM,EAAE,WAAW;IACnB,WAAW,EAAE,KAAK;CACnB,CAAA;AAED,MAAM,CAAC,MAAM,cAAc,GAAG,CAAC,OAAsB,EAAe,EAAE;IACpE,IAAI,OAAO,CAAC,
|
|
1
|
+
{"version":3,"file":"mergeResult.js","sourceRoot":"","sources":["../../src/types/mergeResult.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AAQnC,MAAM,WAAW,GAAc,EAAE,CAAA;AACjC,MAAM,iBAAiB,GAAgB;IACrC,MAAM,EAAE,WAAW;IACnB,WAAW,EAAE,KAAK;CACnB,CAAA;AAED,MAAM,CAAC,MAAM,cAAc,GAAG,CAAC,OAAsB,EAAe,EAAE;IACpE,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACzB,OAAO,OAAO,CAAC,CAAC,CAAC,CAAA;IACnB,CAAC;IACD,OAAO;QACL,MAAM,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC;QACtC,WAAW,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,WAAW,CAAC;KAC9C,CAAA;AACH,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,UAAU,GAAG,CAAC,MAAiB,EAAe,EAAE;IAC3D,IAAI,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC;QACpB,OAAO,iBAAiB,CAAA;IAC1B,CAAC;IACD,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,KAAK,EAAE,CAAA;AACvC,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,YAAY,GAAG,CAAC,MAAiB,EAAe,EAAE,CAAC,CAAC;IAC/D,MAAM;IACN,WAAW,EAAE,IAAI;CAClB,CAAC,CAAA;AAEF,MAAM,CAAC,MAAM,UAAU,GAAG,CAAC,MAAmB,EAAW,EAAE,CACzD,MAAM,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,IAAI,MAAM,CAAC,WAAW,CAAA"}
|