sf-git-merge-driver 1.5.2 → 1.5.3
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 +3 -3
- package/lib/commands/git/merge/driver/run.js.map +1 -1
- package/lib/utils/LoggingDecorator.d.ts +0 -4
- package/lib/utils/LoggingDecorator.js +0 -31
- package/lib/utils/LoggingDecorator.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
|
@@ -330,7 +330,7 @@ EXAMPLES
|
|
|
330
330
|
$ sf git merge driver install
|
|
331
331
|
```
|
|
332
332
|
|
|
333
|
-
_See code: [src/commands/git/merge/driver/install.ts](https://github.com/scolladon/sf-git-merge-driver/blob/v1.5.
|
|
333
|
+
_See code: [src/commands/git/merge/driver/install.ts](https://github.com/scolladon/sf-git-merge-driver/blob/v1.5.3/src/commands/git/merge/driver/install.ts)_
|
|
334
334
|
|
|
335
335
|
## `sf git merge driver run`
|
|
336
336
|
|
|
@@ -374,7 +374,7 @@ EXAMPLES
|
|
|
374
374
|
- output-file is the path to the file where the merged content will be written
|
|
375
375
|
```
|
|
376
376
|
|
|
377
|
-
_See code: [src/commands/git/merge/driver/run.ts](https://github.com/scolladon/sf-git-merge-driver/blob/v1.5.
|
|
377
|
+
_See code: [src/commands/git/merge/driver/run.ts](https://github.com/scolladon/sf-git-merge-driver/blob/v1.5.3/src/commands/git/merge/driver/run.ts)_
|
|
378
378
|
|
|
379
379
|
## `sf git merge driver uninstall`
|
|
380
380
|
|
|
@@ -404,7 +404,7 @@ EXAMPLES
|
|
|
404
404
|
$ sf git merge driver uninstall
|
|
405
405
|
```
|
|
406
406
|
|
|
407
|
-
_See code: [src/commands/git/merge/driver/uninstall.ts](https://github.com/scolladon/sf-git-merge-driver/blob/v1.5.
|
|
407
|
+
_See code: [src/commands/git/merge/driver/uninstall.ts](https://github.com/scolladon/sf-git-merge-driver/blob/v1.5.3/src/commands/git/merge/driver/uninstall.ts)_
|
|
408
408
|
<!-- commandsstop -->
|
|
409
409
|
|
|
410
410
|
## Changelog
|
|
@@ -5,7 +5,7 @@ import { DEFAULT_ANCESTOR_CONFLICT_TAG, DEFAULT_CONFLICT_MARKER_SIZE, DEFAULT_LO
|
|
|
5
5
|
import { PLUGIN_NAME } from '../../../../constant/pluginConstant.js';
|
|
6
6
|
import { MergeDriver } from '../../../../driver/MergeDriver.js';
|
|
7
7
|
import { log } from '../../../../utils/LoggingDecorator.js';
|
|
8
|
-
import { Logger } from '../../../../utils/LoggingService.js';
|
|
8
|
+
import { Logger, lazy } from '../../../../utils/LoggingService.js';
|
|
9
9
|
Messages.importMessagesDirectoryFromMetaUrl(import.meta.url);
|
|
10
10
|
const messages = Messages.loadMessages(PLUGIN_NAME, 'run');
|
|
11
11
|
const ERROR_EXIT_CODE = 1;
|
|
@@ -70,8 +70,8 @@ export default class Run extends SfCommand {
|
|
|
70
70
|
localConflictTag: flags['local-conflict-tag'],
|
|
71
71
|
otherConflictTag: flags['other-conflict-tag'],
|
|
72
72
|
};
|
|
73
|
-
Logger.debug(`flags: ${JSON.stringify(flags)}`);
|
|
74
|
-
Logger.debug(`config: ${JSON.stringify(config)}`);
|
|
73
|
+
Logger.debug(lazy `flags: ${() => JSON.stringify(flags)}`);
|
|
74
|
+
Logger.debug(lazy `config: ${() => JSON.stringify(config)}`);
|
|
75
75
|
const mergeDriver = new MergeDriver(config);
|
|
76
76
|
const hasConflict = await mergeDriver.mergeFiles(flags['ancestor-file'], flags['local-file'], flags['other-file']);
|
|
77
77
|
Logger.info(`Merge completed with ${hasConflict ? 'conflicts' : 'no conflicts'}`);
|
|
@@ -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,EACL,6BAA6B,EAC7B,4BAA4B,EAC5B,0BAA0B,EAC1B,0BAA0B,GAC3B,MAAM,0CAA0C,CAAA;AACjD,OAAO,EAAE,WAAW,EAAE,MAAM,wCAAwC,CAAA;AACpE,OAAO,EAAE,WAAW,EAAE,MAAM,mCAAmC,CAAA;AAE/D,OAAO,EAAE,GAAG,EAAE,MAAM,uCAAuC,CAAA;AAC3D,OAAO,EAAE,MAAM,EAAE,MAAM,qCAAqC,CAAA;
|
|
1
|
+
{"version":3,"file":"run.js","sourceRoot":"","sources":["../../../../../src/commands/git/merge/driver/run.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,42 +1,11 @@
|
|
|
1
1
|
/** biome-ignore-all lint/suspicious/noExplicitAny: it is dynamic by definition */
|
|
2
2
|
import { Logger, lazy } from './LoggingService.js';
|
|
3
|
-
export function stringify(value) {
|
|
4
|
-
if (hasCustomToString(value)) {
|
|
5
|
-
return value.toString();
|
|
6
|
-
}
|
|
7
|
-
return JSON.stringify(value, replacer);
|
|
8
|
-
}
|
|
9
|
-
function replacer(_key, value) {
|
|
10
|
-
if (value instanceof Map) {
|
|
11
|
-
return Array.from(value.entries());
|
|
12
|
-
}
|
|
13
|
-
if (value instanceof Set) {
|
|
14
|
-
return Array.from(value);
|
|
15
|
-
}
|
|
16
|
-
return value;
|
|
17
|
-
}
|
|
18
|
-
export function hasCustomToString(obj) {
|
|
19
|
-
if (obj === null || typeof obj !== 'object')
|
|
20
|
-
return false;
|
|
21
|
-
const toStringFn = obj.toString;
|
|
22
|
-
if (typeof toStringFn !== 'function')
|
|
23
|
-
return false;
|
|
24
|
-
if (Object.hasOwn(obj, 'toString')) {
|
|
25
|
-
return toStringFn !== Object.prototype.toString;
|
|
26
|
-
}
|
|
27
|
-
const proto = Object.getPrototypeOf(obj);
|
|
28
|
-
const protoToString = proto.toString;
|
|
29
|
-
return (typeof protoToString === 'function' &&
|
|
30
|
-
protoToString !== Object.prototype.toString);
|
|
31
|
-
}
|
|
32
3
|
export function log(target, propertyKey, descriptor) {
|
|
33
4
|
const original = descriptor.value;
|
|
34
5
|
descriptor.value = function (...args) {
|
|
35
6
|
Logger.trace(lazy `${target.constructor.name}.${propertyKey}: entry`);
|
|
36
|
-
Logger.debug(lazy `${target.constructor.name}.${propertyKey}: arguments : ${stringify(args)}`);
|
|
37
7
|
const call = () => original.call(this, ...args);
|
|
38
8
|
const logResult = (result) => {
|
|
39
|
-
Logger.debug(lazy `${target.constructor.name}.${propertyKey}: result : ${stringify(result)}`);
|
|
40
9
|
Logger.trace(lazy `${target.constructor.name}.${propertyKey}: exit`);
|
|
41
10
|
return result;
|
|
42
11
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"LoggingDecorator.js","sourceRoot":"","sources":["../../src/utils/LoggingDecorator.ts"],"names":[],"mappings":"AAAA,kFAAkF;AAClF,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,qBAAqB,CAAA;AAElD,MAAM,UAAU,
|
|
1
|
+
{"version":3,"file":"LoggingDecorator.js","sourceRoot":"","sources":["../../src/utils/LoggingDecorator.ts"],"names":[],"mappings":"AAAA,kFAAkF;AAClF,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,qBAAqB,CAAA;AAElD,MAAM,UAAU,GAAG,CACjB,MAAW,EACX,WAAmB,EACnB,UAA8B;IAE9B,MAAM,QAAQ,GAAG,UAAU,CAAC,KAAK,CAAA;IAEjC,UAAU,CAAC,KAAK,GAAG,UAAU,GAAG,IAAW;QACzC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAA,GAAG,MAAM,CAAC,WAAW,CAAC,IAAI,IAAI,WAAW,SAAS,CAAC,CAAA;QAEpE,MAAM,IAAI,GAAG,GAAG,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,EAAE,GAAG,IAAI,CAAC,CAAA;QAE/C,MAAM,SAAS,GAAG,CAAC,MAAW,EAAE,EAAE;YAChC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAA,GAAG,MAAM,CAAC,WAAW,CAAC,IAAI,IAAI,WAAW,QAAQ,CAAC,CAAA;YACnE,OAAO,MAAM,CAAA;QACf,CAAC,CAAA;QAED,IAAI,QAAQ,CAAC,WAAW,CAAC,IAAI,KAAK,eAAe,EAAE,CAAC;YAClD,OAAO,IAAI,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,CAAA;QAC/B,CAAC;aAAM,CAAC;YACN,OAAO,SAAS,CAAC,IAAI,EAAE,CAAC,CAAA;QAC1B,CAAC;IACH,CAAC,CAAA;AACH,CAAC"}
|
package/npm-shrinkwrap.json
CHANGED
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "sf-git-merge-driver",
|
|
3
|
-
"version": "1.5.
|
|
3
|
+
"version": "1.5.3",
|
|
4
4
|
"lockfileVersion": 3,
|
|
5
5
|
"requires": true,
|
|
6
6
|
"packages": {
|
|
7
7
|
"": {
|
|
8
8
|
"name": "sf-git-merge-driver",
|
|
9
|
-
"version": "1.5.
|
|
9
|
+
"version": "1.5.3",
|
|
10
10
|
"license": "MIT",
|
|
11
11
|
"dependencies": {
|
|
12
12
|
"@oclif/core": "^4.8.0",
|
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 merge driver for Salesforce metadata XML files - automatically resolves merge conflicts in profiles, permission sets, and 50+ metadata types",
|
|
4
|
-
"version": "1.5.
|
|
4
|
+
"version": "1.5.3",
|
|
5
5
|
"exports": "./lib/driver/MergeDriver.js",
|
|
6
6
|
"type": "module",
|
|
7
7
|
"author": "Sébastien Colladon (colladonsebastien@gmail.com)",
|