sf-git-merge-driver 1.0.0-dev-3.14261001105-1 → 1.0.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 +3 -3
- package/lib/constant/metadataConstant.d.ts +1 -4
- package/lib/constant/metadataConstant.js +1 -4
- package/lib/constant/metadataConstant.js.map +1 -1
- package/lib/merger/conflictMarker.js +5 -5
- package/lib/merger/conflictMarker.js.map +1 -1
- package/npm-shrinkwrap.json +2 -2
- package/oclif.manifest.json +1 -1
- package/package.json +1 -1
package/README.md
CHANGED
|
@@ -48,7 +48,7 @@ EXAMPLES
|
|
|
48
48
|
$ sf git merge driver install
|
|
49
49
|
```
|
|
50
50
|
|
|
51
|
-
_See code: [src/commands/git/merge/driver/install.ts](https://github.com/scolladon/sf-git-merge-driver/blob/v1.0.0
|
|
51
|
+
_See code: [src/commands/git/merge/driver/install.ts](https://github.com/scolladon/sf-git-merge-driver/blob/v1.0.0/src/commands/git/merge/driver/install.ts)_
|
|
52
52
|
|
|
53
53
|
## `sf git merge driver run`
|
|
54
54
|
|
|
@@ -92,7 +92,7 @@ EXAMPLES
|
|
|
92
92
|
- output-file is the path to the file where the merged content will be written
|
|
93
93
|
```
|
|
94
94
|
|
|
95
|
-
_See code: [src/commands/git/merge/driver/run.ts](https://github.com/scolladon/sf-git-merge-driver/blob/v1.0.0
|
|
95
|
+
_See code: [src/commands/git/merge/driver/run.ts](https://github.com/scolladon/sf-git-merge-driver/blob/v1.0.0/src/commands/git/merge/driver/run.ts)_
|
|
96
96
|
|
|
97
97
|
## `sf git merge driver uninstall`
|
|
98
98
|
|
|
@@ -119,7 +119,7 @@ EXAMPLES
|
|
|
119
119
|
$ sf git merge driver uninstall
|
|
120
120
|
```
|
|
121
121
|
|
|
122
|
-
_See code: [src/commands/git/merge/driver/uninstall.ts](https://github.com/scolladon/sf-git-merge-driver/blob/v1.0.0
|
|
122
|
+
_See code: [src/commands/git/merge/driver/uninstall.ts](https://github.com/scolladon/sf-git-merge-driver/blob/v1.0.0/src/commands/git/merge/driver/uninstall.ts)_
|
|
123
123
|
<!-- commandsstop -->
|
|
124
124
|
|
|
125
125
|
## How It Works
|
|
@@ -1,7 +1,4 @@
|
|
|
1
|
-
|
|
2
|
-
* Note: KEY_FIELD_METADATA has been moved to MetadataService
|
|
3
|
-
* @see MetadataService for key field extraction logic
|
|
4
|
-
*/
|
|
1
|
+
export const SALESFORCE_EOL = '\n';
|
|
5
2
|
export const METADATA_TYPES_PATTERNS = [
|
|
6
3
|
'labels', // CustomLabels
|
|
7
4
|
'label', // CustomLabels decomposed
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"metadataConstant.js","sourceRoot":"","sources":["../../src/constant/metadataConstant.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"metadataConstant.js","sourceRoot":"","sources":["../../src/constant/metadataConstant.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,cAAc,GAAG,IAAI,CAAA;AAElC,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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import { EOL } from 'node:os';
|
|
2
1
|
import { isEmpty } from 'lodash-es';
|
|
3
2
|
import { ANCESTOR_CONFLICT_MARKER, LOCAL_CONFLICT_MARKER, OTHER_CONFLICT_MARKER, SEPARATOR, } from '../constant/conflictConstant.js';
|
|
3
|
+
import { SALESFORCE_EOL } from '../constant/metadataConstant.js';
|
|
4
4
|
import { TEXT_TAG } from '../constant/parserConstant.js';
|
|
5
5
|
const buildMarker = (marker, size, tag) => {
|
|
6
6
|
return `${marker.repeat(size)} ${tag}`;
|
|
@@ -19,12 +19,12 @@ export class ConflictMarker {
|
|
|
19
19
|
}
|
|
20
20
|
static addConflictMarkers(acc, local, ancestor, other) {
|
|
21
21
|
ConflictMarker.hasConflict = true;
|
|
22
|
-
acc.push({ [TEXT_TAG]: `${
|
|
23
|
-
acc.push(isEmpty(local) ? { [TEXT_TAG]:
|
|
22
|
+
acc.push({ [TEXT_TAG]: `${SALESFORCE_EOL}${ConflictMarker.localMarker}` });
|
|
23
|
+
acc.push(isEmpty(local) ? { [TEXT_TAG]: SALESFORCE_EOL } : local);
|
|
24
24
|
acc.push({ [TEXT_TAG]: ConflictMarker.baseMarker });
|
|
25
|
-
acc.push(isEmpty(ancestor) ? { [TEXT_TAG]:
|
|
25
|
+
acc.push(isEmpty(ancestor) ? { [TEXT_TAG]: SALESFORCE_EOL } : ancestor);
|
|
26
26
|
acc.push({ [TEXT_TAG]: ConflictMarker.separatorMarker });
|
|
27
|
-
acc.push(isEmpty(other) ? { [TEXT_TAG]:
|
|
27
|
+
acc.push(isEmpty(other) ? { [TEXT_TAG]: SALESFORCE_EOL } : other);
|
|
28
28
|
acc.push({ [TEXT_TAG]: ConflictMarker.otherMarker });
|
|
29
29
|
}
|
|
30
30
|
static setConflictConfig(conflictConfig) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"conflictMarker.js","sourceRoot":"","sources":["../../src/merger/conflictMarker.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,
|
|
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,wBAAwB,EACxB,qBAAqB,EACrB,qBAAqB,EACrB,SAAS,GACV,MAAM,iCAAiC,CAAA;AACxC,OAAO,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAA;AAChE,OAAO,EAAE,QAAQ,EAAE,MAAM,+BAA+B,CAAA;AAIxD,MAAM,WAAW,GAAG,CAAC,MAAc,EAAE,IAAY,EAAE,GAAW,EAAU,EAAE;IACxE,OAAO,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,GAAG,EAAE,CAAA;AACxC,CAAC,CAAA;AAED,MAAM,cAAc,GAAG,CAAC,IAAY,EAAU,EAAE;IAC9C,OAAO,GAAG,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAA;AACpC,CAAC,CAAA;AAED,MAAM,OAAO,cAAc;IACjB,MAAM,CAAC,WAAW,GAAG,KAAK,CAAA;IAC1B,MAAM,CAAC,UAAU,CAAQ;IACzB,MAAM,CAAC,WAAW,CAAQ;IAC1B,MAAM,CAAC,WAAW,CAAQ;IAC1B,MAAM,CAAC,eAAe,CAAQ;IAE/B,MAAM,CAAC,iBAAiB;QAC7B,OAAO,cAAc,CAAC,WAAW,CAAA;IACnC,CAAC;IAEM,MAAM,CAAC,kBAAkB,CAC9B,GAAc,EACd,KAA6B,EAC7B,QAAgC,EAChC,KAA6B;QAE7B,cAAc,CAAC,WAAW,GAAG,IAAI,CAAA;QACjC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,QAAQ,CAAC,EAAE,GAAG,cAAc,GAAG,cAAc,CAAC,WAAW,EAAE,EAAE,CAAC,CAAA;QAC1E,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,QAAQ,CAAC,EAAE,cAAc,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,CAAA;QACjE,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,QAAQ,CAAC,EAAE,cAAc,CAAC,UAAU,EAAE,CAAC,CAAA;QACnD,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,QAAQ,CAAC,EAAE,cAAc,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAA;QACvE,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,QAAQ,CAAC,EAAE,cAAc,CAAC,eAAe,EAAE,CAAC,CAAA;QACxD,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,QAAQ,CAAC,EAAE,cAAc,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,CAAA;QACjE,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,QAAQ,CAAC,EAAE,cAAc,CAAC,WAAW,EAAE,CAAC,CAAA;IACtD,CAAC;IAEM,MAAM,CAAC,iBAAiB,CAAC,cAA6B;QAC3D,cAAc,CAAC,UAAU,GAAG,WAAW,CACrC,wBAAwB,EACxB,cAAc,CAAC,kBAAkB,EACjC,cAAc,CAAC,mBAAmB,CACnC,CAAA;QACD,cAAc,CAAC,WAAW,GAAG,WAAW,CACtC,qBAAqB,EACrB,cAAc,CAAC,kBAAkB,EACjC,cAAc,CAAC,gBAAgB,CAChC,CAAA;QACD,cAAc,CAAC,WAAW,GAAG,WAAW,CACtC,qBAAqB,EACrB,cAAc,CAAC,kBAAkB,EACjC,cAAc,CAAC,gBAAgB,CAChC,CAAA;QACD,cAAc,CAAC,eAAe,GAAG,cAAc,CAC7C,cAAc,CAAC,kBAAkB,CAClC,CAAA;IACH,CAAC"}
|
package/npm-shrinkwrap.json
CHANGED
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "sf-git-merge-driver",
|
|
3
|
-
"version": "1.0.0
|
|
3
|
+
"version": "1.0.0",
|
|
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
|
|
9
|
+
"version": "1.0.0",
|
|
10
10
|
"license": "MIT",
|
|
11
11
|
"dependencies": {
|
|
12
12
|
"@oclif/core": "^4.2.10",
|
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
|
|
4
|
+
"version": "1.0.0",
|
|
5
5
|
"exports": "./lib/driver/MergeDriver.js",
|
|
6
6
|
"type": "module",
|
|
7
7
|
"author": "Sébastien Colladon (colladonsebastien@gmail.com)",
|