sf-git-merge-driver 1.1.0-dev-109.17681841243-1 → 1.1.0-dev-113.17771689333-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 +24 -3
- package/lib/commands/git/merge/driver/install.js +13 -3
- package/lib/commands/git/merge/driver/install.js.map +1 -1
- package/lib/commands/git/merge/driver/run.js +12 -1
- package/lib/commands/git/merge/driver/run.js.map +1 -1
- package/lib/commands/git/merge/driver/uninstall.js +9 -1
- package/lib/commands/git/merge/driver/uninstall.js.map +1 -1
- package/lib/constant/pluginConstant.d.ts +1 -0
- package/lib/constant/pluginConstant.js +2 -0
- package/lib/constant/pluginConstant.js.map +1 -0
- package/lib/driver/MergeDriver.js +9 -1
- package/lib/driver/MergeDriver.js.map +1 -1
- package/lib/merger/JsonMerger.js +5 -0
- package/lib/merger/JsonMerger.js.map +1 -1
- package/lib/merger/XmlMerger.js +5 -0
- package/lib/merger/XmlMerger.js.map +1 -1
- package/lib/service/NamespaceHandler.js +8 -0
- package/lib/service/NamespaceHandler.js.map +1 -1
- package/lib/service/installService.js +5 -0
- package/lib/service/installService.js.map +1 -1
- package/lib/service/uninstallService.js +9 -2
- package/lib/service/uninstallService.js.map +1 -1
- package/lib/utils/LoggingDecorator.d.ts +5 -0
- package/lib/utils/LoggingDecorator.js +51 -0
- package/lib/utils/LoggingDecorator.js.map +1 -0
- package/lib/utils/LoggingService.d.ts +11 -0
- package/lib/utils/LoggingService.js +52 -0
- package/lib/utils/LoggingService.js.map +1 -0
- package/npm-shrinkwrap.json +1453 -1445
- package/oclif.manifest.json +1 -1
- package/package.json +14 -14
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.1.0-dev-
|
|
51
|
+
_See code: [src/commands/git/merge/driver/install.ts](https://github.com/scolladon/sf-git-merge-driver/blob/v1.1.0-dev-113.17771689333-1/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.1.0-dev-
|
|
95
|
+
_See code: [src/commands/git/merge/driver/run.ts](https://github.com/scolladon/sf-git-merge-driver/blob/v1.1.0-dev-113.17771689333-1/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.1.0-dev-
|
|
122
|
+
_See code: [src/commands/git/merge/driver/uninstall.ts](https://github.com/scolladon/sf-git-merge-driver/blob/v1.1.0-dev-113.17771689333-1/src/commands/git/merge/driver/uninstall.ts)_
|
|
123
123
|
<!-- commandsstop -->
|
|
124
124
|
|
|
125
125
|
## How It Works
|
|
@@ -184,6 +184,27 @@ The driver is configured to work with `.xml` files by default. The installation
|
|
|
184
184
|
*.objectTranslation-meta.xml merge=salesforce-source
|
|
185
185
|
```
|
|
186
186
|
|
|
187
|
+
## Debugging
|
|
188
|
+
|
|
189
|
+
The plugin uses the [Salesforce CLI logging system](https://developer.salesforce.com/docs/atlas.en-us.sfdx_setup.meta/sfdx_setup/sfdx_dev_cli_log_messages.htm) to log information.
|
|
190
|
+
You can control the logging level by setting the `SF_LOG_LEVEL` environment variable.
|
|
191
|
+
You can redirect the logging in the terminal using `DEBUG=sf-git-merge-driver`.
|
|
192
|
+
|
|
193
|
+
You can also use `GIT_TRACE=1` to get more information about git operations.
|
|
194
|
+
You can also use `GIT_MERGE_VERBOSITY=5` to get more information about the merge process.
|
|
195
|
+
Git environment variables are detailed [here](https://git-scm.com/book/en/v2/Git-Internals-Environment-Variables).
|
|
196
|
+
|
|
197
|
+
Example:
|
|
198
|
+
|
|
199
|
+
```sh
|
|
200
|
+
DEBUG=sf-git-merge-driver
|
|
201
|
+
SF_LOG_LEVEL=trace # can be error | warn | info | debug | trace, default: warn
|
|
202
|
+
GIT_MERGE_VERBOSITY=5 # can be 0 to 5
|
|
203
|
+
GIT_TRACE=true
|
|
204
|
+
git merge ...
|
|
205
|
+
```
|
|
206
|
+
|
|
207
|
+
|
|
187
208
|
## Changelog
|
|
188
209
|
|
|
189
210
|
[changelog.md](CHANGELOG.md) is available for consultation.
|
|
@@ -1,9 +1,13 @@
|
|
|
1
|
+
import { __decorate } from "tslib";
|
|
1
2
|
import { Messages } from '@salesforce/core';
|
|
2
3
|
import { SfCommand } from '@salesforce/sf-plugins-core';
|
|
4
|
+
import { PLUGIN_NAME } from '../../../../constant/pluginConstant.js';
|
|
3
5
|
import { InstallService } from '../../../../service/installService.js';
|
|
4
6
|
import { UninstallService } from '../../../../service/uninstallService.js';
|
|
7
|
+
import { log } from '../../../../utils/LoggingDecorator.js';
|
|
8
|
+
import { Logger } from '../../../../utils/LoggingService.js';
|
|
5
9
|
Messages.importMessagesDirectoryFromMetaUrl(import.meta.url);
|
|
6
|
-
const messages = Messages.loadMessages(
|
|
10
|
+
const messages = Messages.loadMessages(PLUGIN_NAME, 'install');
|
|
7
11
|
export default class Install extends SfCommand {
|
|
8
12
|
static summary = messages.getMessage('summary');
|
|
9
13
|
static description = messages.getMessage('description');
|
|
@@ -12,10 +16,16 @@ export default class Install extends SfCommand {
|
|
|
12
16
|
async run() {
|
|
13
17
|
try {
|
|
14
18
|
await new UninstallService().uninstallMergeDriver();
|
|
15
|
-
|
|
19
|
+
Logger.info('Previous merge driver uninstalled successfully');
|
|
20
|
+
}
|
|
21
|
+
catch (error) {
|
|
22
|
+
Logger.warn('Previous merge driver uninstallation failed', error);
|
|
16
23
|
}
|
|
17
|
-
catch { }
|
|
18
24
|
await new InstallService().installMergeDriver();
|
|
25
|
+
Logger.info('Merge driver installed successfully');
|
|
19
26
|
}
|
|
20
27
|
}
|
|
28
|
+
__decorate([
|
|
29
|
+
log
|
|
30
|
+
], Install.prototype, "run", null);
|
|
21
31
|
//# sourceMappingURL=install.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"install.js","sourceRoot":"","sources":["../../../../../src/commands/git/merge/driver/install.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAA;AAC3C,OAAO,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAA;AACvD,OAAO,EAAE,cAAc,EAAE,MAAM,uCAAuC,CAAA;AACtE,OAAO,EAAE,gBAAgB,EAAE,MAAM,yCAAyC,CAAA;
|
|
1
|
+
{"version":3,"file":"install.js","sourceRoot":"","sources":["../../../../../src/commands/git/merge/driver/install.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAA;AAC3C,OAAO,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAA;AACvD,OAAO,EAAE,WAAW,EAAE,MAAM,wCAAwC,CAAA;AACpE,OAAO,EAAE,cAAc,EAAE,MAAM,uCAAuC,CAAA;AACtE,OAAO,EAAE,gBAAgB,EAAE,MAAM,yCAAyC,CAAA;AAC1E,OAAO,EAAE,GAAG,EAAE,MAAM,uCAAuC,CAAA;AAC3D,OAAO,EAAE,MAAM,EAAE,MAAM,qCAAqC,CAAA;AAE5D,QAAQ,CAAC,kCAAkC,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;AAC5D,MAAM,QAAQ,GAAG,QAAQ,CAAC,YAAY,CAAC,WAAW,EAAE,SAAS,CAAC,CAAA;AAE9D,MAAM,CAAC,OAAO,OAAO,OAAQ,SAAQ,SAAe;IAC3C,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,EAAE,CAAA;IAG7B,AAAN,KAAK,CAAC,GAAG;QACd,IAAI,CAAC;YACH,MAAM,IAAI,gBAAgB,EAAE,CAAC,oBAAoB,EAAE,CAAA;YACnD,MAAM,CAAC,IAAI,CAAC,gDAAgD,CAAC,CAAA;QAC/D,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,CAAC,IAAI,CAAC,6CAA6C,EAAE,KAAK,CAAC,CAAA;QACnE,CAAC;QACD,MAAM,IAAI,cAAc,EAAE,CAAC,kBAAkB,EAAE,CAAA;QAC/C,MAAM,CAAC,IAAI,CAAC,qCAAqC,CAAC,CAAA;IACpD,CAAC;;AATY;IADZ,GAAG;kCAUH"}
|
|
@@ -1,10 +1,14 @@
|
|
|
1
|
+
import { __decorate } from "tslib";
|
|
1
2
|
import { Messages } from '@salesforce/core';
|
|
2
3
|
import { Flags, SfCommand } from '@salesforce/sf-plugins-core';
|
|
3
4
|
import { DEFAULT_ANCESTOR_CONFLICT_TAG, DEFAULT_CONFLICT_MARKER_SIZE, DEFAULT_LOCAL_CONFLICT_TAG, DEFAULT_OTHER_CONFLICT_TAG, } from '../../../../constant/conflictConstant.js';
|
|
5
|
+
import { PLUGIN_NAME } from '../../../../constant/pluginConstant.js';
|
|
4
6
|
import { MergeDriver } from '../../../../driver/MergeDriver.js';
|
|
5
7
|
import { ConflictMarker } from '../../../../merger/conflictMarker.js';
|
|
8
|
+
import { log } from '../../../../utils/LoggingDecorator.js';
|
|
9
|
+
import { Logger } from '../../../../utils/LoggingService.js';
|
|
6
10
|
Messages.importMessagesDirectoryFromMetaUrl(import.meta.url);
|
|
7
|
-
const messages = Messages.loadMessages(
|
|
11
|
+
const messages = Messages.loadMessages(PLUGIN_NAME, 'run');
|
|
8
12
|
const ERROR_EXIT_CODE = 1;
|
|
9
13
|
const SUCCESS_EXIT_CODE = 0;
|
|
10
14
|
export default class Run extends SfCommand {
|
|
@@ -59,6 +63,7 @@ export default class Run extends SfCommand {
|
|
|
59
63
|
}),
|
|
60
64
|
};
|
|
61
65
|
async run() {
|
|
66
|
+
Logger.info('Merge starting');
|
|
62
67
|
const { flags } = await this.parse(Run);
|
|
63
68
|
const conflicConfig = {
|
|
64
69
|
conflictMarkerSize: flags['conflict-marker-size'],
|
|
@@ -67,9 +72,15 @@ export default class Run extends SfCommand {
|
|
|
67
72
|
otherConflictTag: flags['other-conflict-tag'],
|
|
68
73
|
};
|
|
69
74
|
ConflictMarker.setConflictConfig(conflicConfig);
|
|
75
|
+
Logger.debug(`flags: ${JSON.stringify(flags)}`);
|
|
76
|
+
Logger.debug(`conflicConfig: ${JSON.stringify(conflicConfig)}`);
|
|
70
77
|
const mergeDriver = new MergeDriver();
|
|
71
78
|
const hasConflict = await mergeDriver.mergeFiles(flags['ancestor-file'], flags['local-file'], flags['other-file']);
|
|
79
|
+
Logger.info(`Merge completed with ${hasConflict ? 'conflicts' : 'no conflicts'}`);
|
|
72
80
|
process.exitCode = hasConflict ? ERROR_EXIT_CODE : SUCCESS_EXIT_CODE;
|
|
73
81
|
}
|
|
74
82
|
}
|
|
83
|
+
__decorate([
|
|
84
|
+
log
|
|
85
|
+
], Run.prototype, "run", null);
|
|
75
86
|
//# 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,EACL,6BAA6B,EAC7B,4BAA4B,EAC5B,0BAA0B,EAC1B,0BAA0B,GAC3B,MAAM,0CAA0C,CAAA;AACjD,OAAO,EAAE,WAAW,EAAE,MAAM,mCAAmC,CAAA;AAC/D,OAAO,EAAE,cAAc,EAAE,MAAM,sCAAsC,CAAA;
|
|
1
|
+
{"version":3,"file":"run.js","sourceRoot":"","sources":["../../../../../src/commands/git/merge/driver/run.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,8 +1,12 @@
|
|
|
1
|
+
import { __decorate } from "tslib";
|
|
1
2
|
import { Messages } from '@salesforce/core';
|
|
2
3
|
import { SfCommand } from '@salesforce/sf-plugins-core';
|
|
4
|
+
import { PLUGIN_NAME } from '../../../../constant/pluginConstant.js';
|
|
3
5
|
import { UninstallService } from '../../../../service/uninstallService.js';
|
|
6
|
+
import { log } from '../../../../utils/LoggingDecorator.js';
|
|
7
|
+
import { Logger } from '../../../../utils/LoggingService.js';
|
|
4
8
|
Messages.importMessagesDirectoryFromMetaUrl(import.meta.url);
|
|
5
|
-
const messages = Messages.loadMessages(
|
|
9
|
+
const messages = Messages.loadMessages(PLUGIN_NAME, 'uninstall');
|
|
6
10
|
export default class Uninstall extends SfCommand {
|
|
7
11
|
static summary = messages.getMessage('summary');
|
|
8
12
|
static description = messages.getMessage('description');
|
|
@@ -10,6 +14,10 @@ export default class Uninstall extends SfCommand {
|
|
|
10
14
|
static flags = {};
|
|
11
15
|
async run() {
|
|
12
16
|
await new UninstallService().uninstallMergeDriver();
|
|
17
|
+
Logger.info('Merge driver uninstalled successfully');
|
|
13
18
|
}
|
|
14
19
|
}
|
|
20
|
+
__decorate([
|
|
21
|
+
log
|
|
22
|
+
], Uninstall.prototype, "run", null);
|
|
15
23
|
//# sourceMappingURL=uninstall.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"uninstall.js","sourceRoot":"","sources":["../../../../../src/commands/git/merge/driver/uninstall.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAA;AAC3C,OAAO,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAA;AACvD,OAAO,EAAE,gBAAgB,EAAE,MAAM,yCAAyC,CAAA;
|
|
1
|
+
{"version":3,"file":"uninstall.js","sourceRoot":"","sources":["../../../../../src/commands/git/merge/driver/uninstall.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAA;AAC3C,OAAO,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAA;AACvD,OAAO,EAAE,WAAW,EAAE,MAAM,wCAAwC,CAAA;AACpE,OAAO,EAAE,gBAAgB,EAAE,MAAM,yCAAyC,CAAA;AAC1E,OAAO,EAAE,GAAG,EAAE,MAAM,uCAAuC,CAAA;AAC3D,OAAO,EAAE,MAAM,EAAE,MAAM,qCAAqC,CAAA;AAE5D,QAAQ,CAAC,kCAAkC,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;AAC5D,MAAM,QAAQ,GAAG,QAAQ,CAAC,YAAY,CAAC,WAAW,EAAE,WAAW,CAAC,CAAA;AAEhE,MAAM,CAAC,OAAO,OAAO,SAAU,SAAQ,SAAe;IAC7C,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,EAAE,CAAA;IAG7B,AAAN,KAAK,CAAC,GAAG;QACd,MAAM,IAAI,gBAAgB,EAAE,CAAC,oBAAoB,EAAE,CAAA;QACnD,MAAM,CAAC,IAAI,CAAC,uCAAuC,CAAC,CAAA;IACtD,CAAC;;AAHY;IADZ,GAAG;oCAIH"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export declare const PLUGIN_NAME = "sf-git-merge-driver";
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"pluginConstant.js","sourceRoot":"","sources":["../../src/constant/pluginConstant.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,WAAW,GAAG,qBAAqB,CAAA"}
|
|
@@ -1,6 +1,9 @@
|
|
|
1
|
+
import { __decorate } from "tslib";
|
|
1
2
|
import { readFile, writeFile } from 'node:fs/promises';
|
|
2
3
|
import { normalize } from 'node:path';
|
|
3
4
|
import { XmlMerger } from '../merger/XmlMerger.js';
|
|
5
|
+
import { log } from '../utils/LoggingDecorator.js';
|
|
6
|
+
import { Logger } from '../utils/LoggingService.js';
|
|
4
7
|
import { detectEol, normalizeEol } from '../utils/mergeUtils.js';
|
|
5
8
|
export class MergeDriver {
|
|
6
9
|
async mergeFiles(ancestorFile, ourFile, theirFile) {
|
|
@@ -16,10 +19,15 @@ export class MergeDriver {
|
|
|
16
19
|
await writeFile(normalize(ourFile), resolvedContent);
|
|
17
20
|
return mergedContent.hasConflict;
|
|
18
21
|
}
|
|
19
|
-
catch {
|
|
22
|
+
catch (error) {
|
|
23
|
+
Logger.error('Merge failed', error);
|
|
24
|
+
Logger.info('Restore our file');
|
|
20
25
|
await writeFile(normalize(ourFile), ourContent);
|
|
21
26
|
return true;
|
|
22
27
|
}
|
|
23
28
|
}
|
|
24
29
|
}
|
|
30
|
+
__decorate([
|
|
31
|
+
log
|
|
32
|
+
], MergeDriver.prototype, "mergeFiles", null);
|
|
25
33
|
//# 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,WAAW,CAAA;AACrC,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAA;AAClD,OAAO,EAAE,SAAS,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAA;AAEhE,MAAM,OAAO,WAAW;
|
|
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,WAAW,CAAA;AACrC,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAA;AAClD,OAAO,EAAE,GAAG,EAAE,MAAM,8BAA8B,CAAA;AAClD,OAAO,EAAE,MAAM,EAAE,MAAM,4BAA4B,CAAA;AACnD,OAAO,EAAE,SAAS,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAA;AAEhE,MAAM,OAAO,WAAW;IAEhB,AAAN,KAAK,CAAC,UAAU,CACd,YAAoB,EACpB,OAAe,EACf,SAAiB;QAEjB,0BAA0B;QAC1B,MAAM,CAAC,eAAe,EAAE,UAAU,EAAE,YAAY,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CACnE,CAAC,YAAY,EAAE,OAAO,EAAE,SAAS,CAAC;aAC/B,GAAG,CAAC,SAAS,CAAC;aACd,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,CACvC,CAAA;QAED,MAAM,SAAS,GAAG,IAAI,SAAS,EAAE,CAAA;QAEjC,IAAI,CAAC;YACH,MAAM,aAAa,GAAG,SAAS,CAAC,aAAa,CAC3C,eAAe,EACf,UAAU,EACV,YAAY,CACb,CAAA;YAED,MAAM,SAAS,GAAG,SAAS,CAAC,UAAU,CAAC,CAAA;YACvC,MAAM,eAAe,GAAG,YAAY,CAAC,aAAa,CAAC,MAAM,EAAE,SAAS,CAAC,CAAA;YACrE,MAAM,SAAS,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE,eAAe,CAAC,CAAA;YAEpD,OAAO,aAAa,CAAC,WAAW,CAAA;QAClC,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,CAAC,KAAK,CAAC,cAAc,EAAE,KAAK,CAAC,CAAA;YACnC,MAAM,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAA;YAC/B,MAAM,SAAS,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE,UAAU,CAAC,CAAA;YAC/C,OAAO,IAAI,CAAA;QACb,CAAC;IACH,CAAC;CACF;AAjCO;IADL,GAAG;6CAiCH"}
|
package/lib/merger/JsonMerger.js
CHANGED
|
@@ -1,8 +1,10 @@
|
|
|
1
|
+
import { __decorate } from "tslib";
|
|
1
2
|
import { deepEqual } from 'fast-equals';
|
|
2
3
|
import { isEmpty, keyBy } from 'lodash-es';
|
|
3
4
|
import { MetadataService } from '../service/MetadataService.js';
|
|
4
5
|
import { NamespaceHandler } from '../service/NamespaceHandler.js';
|
|
5
6
|
import { getScenario, MergeScenario } from '../types/mergeScenario.js';
|
|
7
|
+
import { log } from '../utils/LoggingDecorator.js';
|
|
6
8
|
import { ensureArray, getUniqueSortedProps, isObject, } from '../utils/mergeUtils.js';
|
|
7
9
|
import { ConflictMarker } from './conflictMarker.js';
|
|
8
10
|
import { generateObj, mergeTextAttribute } from './textAttribute.js';
|
|
@@ -43,6 +45,9 @@ export class JsonMerger {
|
|
|
43
45
|
};
|
|
44
46
|
}
|
|
45
47
|
}
|
|
48
|
+
__decorate([
|
|
49
|
+
log
|
|
50
|
+
], JsonMerger.prototype, "mergeThreeWay", null);
|
|
46
51
|
function merge(ancestor, local, other) {
|
|
47
52
|
const acc = [];
|
|
48
53
|
const props = getUniqueSortedProps(ancestor, local, other);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"JsonMerger.js","sourceRoot":"","sources":["../../src/merger/JsonMerger.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAA;AACvC,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,WAAW,CAAA;AAC1C,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAA;AAC/D,OAAO,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAA;AAEjE,OAAO,EAAE,WAAW,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAA;AACtE,OAAO,EACL,WAAW,EACX,oBAAoB,EACpB,QAAQ,GACT,MAAM,wBAAwB,CAAA;AAC/B,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAA;AACpD,OAAO,EAAE,WAAW,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAA;AAEpE,MAAM,OAAO,UAAU;
|
|
1
|
+
{"version":3,"file":"JsonMerger.js","sourceRoot":"","sources":["../../src/merger/JsonMerger.ts"],"names":[],"mappings":"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"}
|
package/lib/merger/XmlMerger.js
CHANGED
|
@@ -1,4 +1,6 @@
|
|
|
1
|
+
import { __decorate } from "tslib";
|
|
1
2
|
import { XMLBuilder, XMLParser } from 'fast-xml-parser';
|
|
3
|
+
import { log } from '../utils/LoggingDecorator.js';
|
|
2
4
|
import { JsonMerger } from './JsonMerger.js';
|
|
3
5
|
const XML_DECL = '<?xml version="1.0" encoding="UTF-8"?>\n';
|
|
4
6
|
const XML_COMMENT_PROP_NAME = '#xml__comment';
|
|
@@ -50,4 +52,7 @@ export class XmlMerger {
|
|
|
50
52
|
};
|
|
51
53
|
}
|
|
52
54
|
}
|
|
55
|
+
__decorate([
|
|
56
|
+
log
|
|
57
|
+
], XmlMerger.prototype, "mergeThreeWay", null);
|
|
53
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;IACvB,eAAe,EAAE,KAAK;CACvB,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;
|
|
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,GAAG,EAAE,MAAM,8BAA8B,CAAA;AAClD,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;IACvB,eAAe,EAAE,KAAK;CACvB,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;IAEpB,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,oCAAoC;QACpC,MAAM,UAAU,GAAG,IAAI,UAAU,EAAE,CAAA;QACnC,MAAM,YAAY,GAAG,UAAU,CAAC,aAAa,CAAC,WAAW,EAAE,MAAM,EAAE,QAAQ,CAAC,CAAA;QAE5E,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,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;AA3BC;IADC,GAAG;8CA2BH"}
|
|
@@ -1,3 +1,5 @@
|
|
|
1
|
+
import { __decorate } from "tslib";
|
|
2
|
+
import { log } from '../utils/LoggingDecorator.js';
|
|
1
3
|
const NAMESPACE_PREFIX = '@_';
|
|
2
4
|
const NAMESPACE_ROOT = ':@';
|
|
3
5
|
export class NamespaceHandler {
|
|
@@ -32,4 +34,10 @@ export class NamespaceHandler {
|
|
|
32
34
|
}
|
|
33
35
|
}
|
|
34
36
|
}
|
|
37
|
+
__decorate([
|
|
38
|
+
log
|
|
39
|
+
], NamespaceHandler.prototype, "processNamespaces", null);
|
|
40
|
+
__decorate([
|
|
41
|
+
log
|
|
42
|
+
], NamespaceHandler.prototype, "addNamespacesToResult", null);
|
|
35
43
|
//# sourceMappingURL=NamespaceHandler.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"NamespaceHandler.js","sourceRoot":"","sources":["../../src/service/NamespaceHandler.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"NamespaceHandler.js","sourceRoot":"","sources":["../../src/service/NamespaceHandler.ts"],"names":[],"mappings":";AACA,OAAO,EAAE,GAAG,EAAE,MAAM,8BAA8B,CAAA;AAElD,MAAM,gBAAgB,GAAG,IAAI,CAAA;AAC7B,MAAM,cAAc,GAAG,IAAI,CAAA;AAE3B,MAAM,OAAO,gBAAgB;IAEpB,iBAAiB,CACtB,QAAgC,EAChC,KAA6B,EAC7B,KAA6B;QAE7B,MAAM,UAAU,GAAe,EAAE,CAAA;QAEjC,2DAA2D;QAC3D,KAAK,MAAM,GAAG,IAAI,CAAC,QAAQ,EAAE,KAAK,EAAE,KAAK,CAAC,EAAE,CAAC;YAC3C,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;gBACnC,iEAAiE;gBACjE,MAAM,QAAQ,GAAG,GAAG,CAAC,GAAG,CAAe,CAAA;gBACvC,KAAK,MAAM,QAAQ,IAAI,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC;oBAC7C,IAAI,QAAQ,CAAC,UAAU,CAAC,gBAAgB,CAAC,EAAE,CAAC;wBAC1C,UAAU,CAAC,QAAQ,CAAC,GAAG,QAAQ,CAAC,QAAQ,CAAC,CAAA;wBACzC,OAAO,QAAQ,CAAC,QAAQ,CAAC,CAAA,CAAC,8CAA8C;oBAC1E,CAAC;gBACH,CAAC;YACH,CAAC;QACH,CAAC;QAED,OAAO,UAAU,CAAA;IACnB,CAAC;IAGM,qBAAqB,CAAC,GAAc,EAAE,UAAsB;QACjE,IAAI,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,MAAM,GAAG,CAAC,IAAI,GAAG,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACzD,iCAAiC;YACjC,MAAM,UAAU,GAAG,GAAG,CAAC,CAAC,CAAe,CAAA;YAEvC,yDAAyD;YACzD,UAAU,CAAC,cAAc,CAAC,GAAG,EAAE,CAAA;YAE/B,0DAA0D;YAC1D,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC;gBAC1C,CAAC;gBAAC,UAAU,CAAC,cAAc,CAAgB,CAAC,GAAG,CAAC,GAAG,UAAU,CAAC,GAAG,CAAC,CAAA;YACpE,CAAC;QACH,CAAC;IACH,CAAC;CACF;AAvCQ;IADN,GAAG;yDAuBH;AAGM;IADN,GAAG;6DAcH"}
|
|
@@ -1,8 +1,10 @@
|
|
|
1
|
+
import { __decorate } from "tslib";
|
|
1
2
|
import { appendFile } from 'node:fs/promises';
|
|
2
3
|
import { simpleGit } from 'simple-git';
|
|
3
4
|
import { DRIVER_NAME, RUN_PLUGIN_COMMAND } from '../constant/driverConstant.js';
|
|
4
5
|
import { METADATA_TYPES_PATTERNS } from '../constant/metadataConstant.js';
|
|
5
6
|
import { getGitAttributesPath } from '../utils/gitUtils.js';
|
|
7
|
+
import { log } from '../utils/LoggingDecorator.js';
|
|
6
8
|
export class InstallService {
|
|
7
9
|
async installMergeDriver() {
|
|
8
10
|
const git = simpleGit();
|
|
@@ -16,4 +18,7 @@ export class InstallService {
|
|
|
16
18
|
await appendFile(gitAttributesPath, content, { flag: 'a' });
|
|
17
19
|
}
|
|
18
20
|
}
|
|
21
|
+
__decorate([
|
|
22
|
+
log
|
|
23
|
+
], InstallService.prototype, "installMergeDriver", null);
|
|
19
24
|
//# sourceMappingURL=installService.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"installService.js","sourceRoot":"","sources":["../../src/service/installService.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAA;AAC7C,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAA;AACtC,OAAO,EAAE,WAAW,EAAE,kBAAkB,EAAE,MAAM,+BAA+B,CAAA;AAC/E,OAAO,EAAE,uBAAuB,EAAE,MAAM,iCAAiC,CAAA;AACzE,OAAO,EAAE,oBAAoB,EAAE,MAAM,sBAAsB,CAAA;
|
|
1
|
+
{"version":3,"file":"installService.js","sourceRoot":"","sources":["../../src/service/installService.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAA;AAC7C,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAA;AACtC,OAAO,EAAE,WAAW,EAAE,kBAAkB,EAAE,MAAM,+BAA+B,CAAA;AAC/E,OAAO,EAAE,uBAAuB,EAAE,MAAM,iCAAiC,CAAA;AACzE,OAAO,EAAE,oBAAoB,EAAE,MAAM,sBAAsB,CAAA;AAC3D,OAAO,EAAE,GAAG,EAAE,MAAM,8BAA8B,CAAA;AAElD,MAAM,OAAO,cAAc;IAEZ,AAAN,KAAK,CAAC,kBAAkB;QAC7B,MAAM,GAAG,GAAG,SAAS,EAAE,CAAA;QACvB,MAAM,GAAG,CAAC,SAAS,CACjB,SAAS,WAAW,OAAO,EAC3B,gCAAgC,CACjC,CAAA;QACD,MAAM,GAAG,CAAC,SAAS,CACjB,SAAS,WAAW,SAAS,EAC7B,UAAU,kBAAkB,mFAAmF,CAChH,CAAA;QACD,MAAM,GAAG,CAAC,SAAS,CAAC,SAAS,WAAW,YAAY,EAAE,MAAM,CAAC,CAAA;QAE7D,wDAAwD;QACxD,MAAM,QAAQ,GAAG,uBAAuB,CAAC,GAAG,CAC1C,OAAO,CAAC,EAAE,CAAC,KAAK,OAAO,mBAAmB,WAAW,EAAE,CACxD,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;QACZ,MAAM,OAAO,GAAG,GAAG,QAAQ,IAAI,CAAA;QAE/B,MAAM,iBAAiB,GAAG,MAAM,oBAAoB,EAAE,CAAA;QAEtD,MAAM,UAAU,CAAC,iBAAiB,EAAE,OAAO,EAAE,EAAE,IAAI,EAAE,GAAG,EAAE,CAAC,CAAA;IAC7D,CAAC;CACF;AAtBc;IADZ,GAAG;wDAsBH"}
|
|
@@ -1,7 +1,10 @@
|
|
|
1
|
+
import { __decorate } from "tslib";
|
|
1
2
|
import { readFile, writeFile } from 'node:fs/promises';
|
|
2
3
|
import { simpleGit } from 'simple-git';
|
|
3
4
|
import { DRIVER_NAME } from '../constant/driverConstant.js';
|
|
4
5
|
import { getGitAttributesPath } from '../utils/gitUtils.js';
|
|
6
|
+
import { log } from '../utils/LoggingDecorator.js';
|
|
7
|
+
import { Logger } from '../utils/LoggingService.js';
|
|
5
8
|
// This match lines like: "*.profile-meta.xml merge=sf-git-merge-driver"
|
|
6
9
|
const MERGE_DRIVER_CONFIG = new RegExp(`.*\s+merge\s*=\s*${DRIVER_NAME}$`);
|
|
7
10
|
export class UninstallService {
|
|
@@ -19,9 +22,13 @@ export class UninstallService {
|
|
|
19
22
|
.split('\n')
|
|
20
23
|
.filter(line => !MERGE_DRIVER_CONFIG.test(line));
|
|
21
24
|
await writeFile(gitAttributesPath, filteredAttributes.join('\n'));
|
|
22
|
-
// biome-ignore lint/suspicious/noEmptyBlockStatements: fail silently
|
|
23
25
|
}
|
|
24
|
-
catch {
|
|
26
|
+
catch (error) {
|
|
27
|
+
Logger.error('Merge driver uninstallation failed', error);
|
|
28
|
+
}
|
|
25
29
|
}
|
|
26
30
|
}
|
|
31
|
+
__decorate([
|
|
32
|
+
log
|
|
33
|
+
], UninstallService.prototype, "uninstallMergeDriver", null);
|
|
27
34
|
//# sourceMappingURL=uninstallService.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"uninstallService.js","sourceRoot":"","sources":["../../src/service/uninstallService.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAA;AACtD,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAA;AACtC,OAAO,EAAE,WAAW,EAAE,MAAM,+BAA+B,CAAA;AAC3D,OAAO,EAAE,oBAAoB,EAAE,MAAM,sBAAsB,CAAA;
|
|
1
|
+
{"version":3,"file":"uninstallService.js","sourceRoot":"","sources":["../../src/service/uninstallService.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAA;AACtD,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAA;AACtC,OAAO,EAAE,WAAW,EAAE,MAAM,+BAA+B,CAAA;AAC3D,OAAO,EAAE,oBAAoB,EAAE,MAAM,sBAAsB,CAAA;AAC3D,OAAO,EAAE,GAAG,EAAE,MAAM,8BAA8B,CAAA;AAClD,OAAO,EAAE,MAAM,EAAE,MAAM,4BAA4B,CAAA;AAEnD,wEAAwE;AACxE,MAAM,mBAAmB,GAAG,IAAI,MAAM,CAAC,oBAAoB,WAAW,GAAG,CAAC,CAAA;AAE1E,MAAM,OAAO,gBAAgB;IAEd,AAAN,KAAK,CAAC,oBAAoB;QAC/B,MAAM,GAAG,GAAG,SAAS,EAAE,CAAA;QACvB,IAAI,CAAC;YACH,+CAA+C;YAC/C,MAAM,GAAG,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,kBAAkB,EAAE,SAAS,WAAW,EAAE,CAAC,CAAC,CAAA;YAErE,MAAM,iBAAiB,GAAG,MAAM,oBAAoB,EAAE,CAAA;YACtD,qCAAqC;YACrC,MAAM,aAAa,GAAG,MAAM,QAAQ,CAAC,iBAAiB,EAAE;gBACtD,QAAQ,EAAE,MAAM;aACjB,CAAC,CAAA;YACF,MAAM,kBAAkB,GAAG,aAAa;iBACrC,KAAK,CAAC,IAAI,CAAC;iBACX,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,mBAAmB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAA;YAClD,MAAM,SAAS,CAAC,iBAAiB,EAAE,kBAAkB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAA;QACnE,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,CAAC,KAAK,CAAC,oCAAoC,EAAE,KAAK,CAAC,CAAA;QAC3D,CAAC;IACH,CAAC;CACF;AAnBc;IADZ,GAAG;4DAmBH"}
|
|
@@ -0,0 +1,51 @@
|
|
|
1
|
+
/** biome-ignore-all lint/suspicious/noExplicitAny: it is dynamic by definition */
|
|
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
|
+
export function log(target, propertyKey, descriptor) {
|
|
33
|
+
const original = descriptor.value;
|
|
34
|
+
descriptor.value = function (...args) {
|
|
35
|
+
Logger.trace(lazy `${target.constructor.name}.${propertyKey}: entry`);
|
|
36
|
+
Logger.debug(lazy `${target.constructor.name}.${propertyKey}: arguments : ${stringify(args)}`);
|
|
37
|
+
const call = () => original.call(this, ...args);
|
|
38
|
+
const logResult = (result) => {
|
|
39
|
+
Logger.debug(lazy `${target.constructor.name}.${propertyKey}: result : ${stringify(result)}`);
|
|
40
|
+
Logger.trace(lazy `${target.constructor.name}.${propertyKey}: exit`);
|
|
41
|
+
return result;
|
|
42
|
+
};
|
|
43
|
+
if (original.constructor.name === 'AsyncFunction') {
|
|
44
|
+
return call().then(logResult);
|
|
45
|
+
}
|
|
46
|
+
else {
|
|
47
|
+
return logResult(call());
|
|
48
|
+
}
|
|
49
|
+
};
|
|
50
|
+
}
|
|
51
|
+
//# sourceMappingURL=LoggingDecorator.js.map
|
|
@@ -0,0 +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,SAAS,CAAC,KAAc;IACtC,IAAI,iBAAiB,CAAC,KAAK,CAAC,EAAE,CAAC;QAC7B,OAAO,KAAK,CAAC,QAAQ,EAAE,CAAA;IACzB,CAAC;IACD,OAAO,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAA;AACxC,CAAC;AAED,SAAS,QAAQ,CAAC,IAAY,EAAE,KAAc;IAC5C,IAAI,KAAK,YAAY,GAAG,EAAE,CAAC;QACzB,OAAO,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC,CAAA;IACpC,CAAC;IACD,IAAI,KAAK,YAAY,GAAG,EAAE,CAAC;QACzB,OAAO,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;IAC1B,CAAC;IACD,OAAO,KAAK,CAAA;AACd,CAAC;AAED,MAAM,UAAU,iBAAiB,CAC/B,GAAY;IAEZ,IAAI,GAAG,KAAK,IAAI,IAAI,OAAO,GAAG,KAAK,QAAQ;QAAE,OAAO,KAAK,CAAA;IAEzD,MAAM,UAAU,GAAI,GAAW,CAAC,QAAQ,CAAA;IACxC,IAAI,OAAO,UAAU,KAAK,UAAU;QAAE,OAAO,KAAK,CAAA;IAElD,IAAI,MAAM,CAAC,MAAM,CAAC,GAAG,EAAE,UAAU,CAAC,EAAE,CAAC;QACnC,OAAO,UAAU,KAAK,MAAM,CAAC,SAAS,CAAC,QAAQ,CAAA;IACjD,CAAC;IACD,MAAM,KAAK,GAAG,MAAM,CAAC,cAAc,CAAC,GAAG,CAAC,CAAA;IACxC,MAAM,aAAa,GAAG,KAAK,CAAC,QAAQ,CAAA;IACpC,OAAO,CACL,OAAO,aAAa,KAAK,UAAU;QACnC,aAAa,KAAK,MAAM,CAAC,SAAS,CAAC,QAAQ,CAC5C,CAAA;AACH,CAAC;AAED,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;QACpE,MAAM,CAAC,KAAK,CACV,IAAI,CAAA,GAAG,MAAM,CAAC,WAAW,CAAC,IAAI,IAAI,WAAW,iBAAiB,SAAS,CAAC,IAAI,CAAC,EAAE,CAChF,CAAA;QAED,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,CACV,IAAI,CAAA,GAAG,MAAM,CAAC,WAAW,CAAC,IAAI,IAAI,WAAW,cAAc,SAAS,CAAC,MAAM,CAAC,EAAE,CAC/E,CAAA;YACD,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"}
|
|
@@ -0,0 +1,11 @@
|
|
|
1
|
+
type LoggerMessage<T = string> = T | (() => T);
|
|
2
|
+
export declare function lazy(strings: TemplateStringsArray, ...exprs: any[]): () => string;
|
|
3
|
+
export declare class Logger {
|
|
4
|
+
private static coreLogger;
|
|
5
|
+
static debug<T = string>(message: LoggerMessage<T>, meta?: unknown): void;
|
|
6
|
+
static error<T = string>(message: LoggerMessage<T>, meta?: unknown): void;
|
|
7
|
+
static info<T = string>(message: LoggerMessage<T>, meta?: unknown): void;
|
|
8
|
+
static trace<T = string>(message: LoggerMessage<T>, meta?: unknown): void;
|
|
9
|
+
static warn<T = string>(message: LoggerMessage<T>, meta?: unknown): void;
|
|
10
|
+
}
|
|
11
|
+
export {};
|
|
@@ -0,0 +1,52 @@
|
|
|
1
|
+
import { Logger as CoreLogger, LoggerLevel } from '@salesforce/core';
|
|
2
|
+
import { PLUGIN_NAME } from '../constant/pluginConstant.js';
|
|
3
|
+
function resolveLoggerMessage(message) {
|
|
4
|
+
return typeof message === 'function' ? message() : message;
|
|
5
|
+
}
|
|
6
|
+
// biome-ignore lint/suspicious/noExplicitAny: Any is expected here
|
|
7
|
+
export function lazy(strings, ...exprs) {
|
|
8
|
+
const getters = exprs.map(expr => {
|
|
9
|
+
if (typeof expr === 'function')
|
|
10
|
+
return expr;
|
|
11
|
+
return () => expr;
|
|
12
|
+
});
|
|
13
|
+
return () => strings.reduce((acc, str, i) => acc + str + (i < getters.length ? getters[i]() : ''), '');
|
|
14
|
+
}
|
|
15
|
+
export class Logger {
|
|
16
|
+
static coreLogger = (() => {
|
|
17
|
+
const coreLogger = CoreLogger.childFromRoot(PLUGIN_NAME);
|
|
18
|
+
coreLogger.setLevel();
|
|
19
|
+
return coreLogger;
|
|
20
|
+
})();
|
|
21
|
+
static debug(message, meta) {
|
|
22
|
+
if (Logger.coreLogger.shouldLog(LoggerLevel.DEBUG)) {
|
|
23
|
+
const content = resolveLoggerMessage(message);
|
|
24
|
+
Logger.coreLogger.debug(content, meta);
|
|
25
|
+
}
|
|
26
|
+
}
|
|
27
|
+
static error(message, meta) {
|
|
28
|
+
if (Logger.coreLogger.shouldLog(LoggerLevel.ERROR)) {
|
|
29
|
+
const content = resolveLoggerMessage(message);
|
|
30
|
+
Logger.coreLogger.error(content, meta);
|
|
31
|
+
}
|
|
32
|
+
}
|
|
33
|
+
static info(message, meta) {
|
|
34
|
+
if (Logger.coreLogger.shouldLog(LoggerLevel.INFO)) {
|
|
35
|
+
const content = resolveLoggerMessage(message);
|
|
36
|
+
Logger.coreLogger.info(content, meta);
|
|
37
|
+
}
|
|
38
|
+
}
|
|
39
|
+
static trace(message, meta) {
|
|
40
|
+
if (Logger.coreLogger.shouldLog(LoggerLevel.TRACE)) {
|
|
41
|
+
const content = resolveLoggerMessage(message);
|
|
42
|
+
Logger.coreLogger.trace(content, meta);
|
|
43
|
+
}
|
|
44
|
+
}
|
|
45
|
+
static warn(message, meta) {
|
|
46
|
+
if (Logger.coreLogger.shouldLog(LoggerLevel.WARN)) {
|
|
47
|
+
const content = resolveLoggerMessage(message);
|
|
48
|
+
Logger.coreLogger.warn(content, meta);
|
|
49
|
+
}
|
|
50
|
+
}
|
|
51
|
+
}
|
|
52
|
+
//# sourceMappingURL=LoggingService.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"LoggingService.js","sourceRoot":"","sources":["../../src/utils/LoggingService.ts"],"names":[],"mappings":"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"}
|