sfdx-hardis 6.10.0 → 6.10.1-alpha202511021043.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/CHANGELOG.md +7 -0
- package/lib/commands/hardis/doc/mkdocs-to-cf.js +38 -39
- package/lib/commands/hardis/doc/mkdocs-to-cf.js.map +1 -1
- package/lib/commands/hardis/project/deploy/notify.js +19 -23
- package/lib/commands/hardis/project/deploy/notify.js.map +1 -1
- package/lib/commands/hardis/project/deploy/quick.js +3 -2
- package/lib/commands/hardis/project/deploy/quick.js.map +1 -1
- package/lib/commands/hardis/project/deploy/start.js +4 -5
- package/lib/commands/hardis/project/deploy/start.js.map +1 -1
- package/lib/commands/hardis/project/deploy/validate.js +4 -3
- package/lib/commands/hardis/project/deploy/validate.js.map +1 -1
- package/lib/commands/hardis/source/deploy.js +4 -3
- package/lib/commands/hardis/source/deploy.js.map +1 -1
- package/lib/common/actionsProvider/actionsProvider.d.ts +41 -0
- package/lib/common/actionsProvider/actionsProvider.js +110 -0
- package/lib/common/actionsProvider/actionsProvider.js.map +1 -0
- package/lib/common/actionsProvider/apexAction.d.ts +6 -0
- package/lib/common/actionsProvider/apexAction.js +35 -0
- package/lib/common/actionsProvider/apexAction.js.map +1 -0
- package/lib/common/actionsProvider/commandAction.d.ts +6 -0
- package/lib/common/actionsProvider/commandAction.js +29 -0
- package/lib/common/actionsProvider/commandAction.js.map +1 -0
- package/lib/common/actionsProvider/dataAction.d.ts +6 -0
- package/lib/common/actionsProvider/dataAction.js +50 -0
- package/lib/common/actionsProvider/dataAction.js.map +1 -0
- package/lib/common/actionsProvider/manualAction.d.ts +6 -0
- package/lib/common/actionsProvider/manualAction.js +26 -0
- package/lib/common/actionsProvider/manualAction.js.map +1 -0
- package/lib/common/actionsProvider/publishCommunityAction.d.ts +6 -0
- package/lib/common/actionsProvider/publishCommunityAction.js +30 -0
- package/lib/common/actionsProvider/publishCommunityAction.js.map +1 -0
- package/lib/common/gitProvider/azureDevops.d.ts +1 -0
- package/lib/common/gitProvider/azureDevops.js +71 -3
- package/lib/common/gitProvider/azureDevops.js.map +1 -1
- package/lib/common/gitProvider/bitbucket.d.ts +1 -0
- package/lib/common/gitProvider/bitbucket.js +81 -2
- package/lib/common/gitProvider/bitbucket.js.map +1 -1
- package/lib/common/gitProvider/gitProviderRoot.d.ts +1 -0
- package/lib/common/gitProvider/gitProviderRoot.js +6 -0
- package/lib/common/gitProvider/gitProviderRoot.js.map +1 -1
- package/lib/common/gitProvider/github.d.ts +1 -0
- package/lib/common/gitProvider/github.js +74 -1
- package/lib/common/gitProvider/github.js.map +1 -1
- package/lib/common/gitProvider/gitlab.d.ts +3 -0
- package/lib/common/gitProvider/gitlab.js +110 -2
- package/lib/common/gitProvider/gitlab.js.map +1 -1
- package/lib/common/gitProvider/index.d.ts +1 -1
- package/lib/common/gitProvider/index.js +12 -5
- package/lib/common/gitProvider/index.js.map +1 -1
- package/lib/common/utils/authUtils.d.ts +15 -2
- package/lib/common/utils/authUtils.js +48 -29
- package/lib/common/utils/authUtils.js.map +1 -1
- package/lib/common/utils/dataUtils.d.ts +2 -2
- package/lib/common/utils/dataUtils.js +10 -2
- package/lib/common/utils/dataUtils.js.map +1 -1
- package/lib/common/utils/deployTips.js +2 -1
- package/lib/common/utils/deployTips.js.map +1 -1
- package/lib/common/utils/deployUtils.d.ts +0 -7
- package/lib/common/utils/deployUtils.js +28 -75
- package/lib/common/utils/deployUtils.js.map +1 -1
- package/lib/common/utils/gitUtils.d.ts +2 -0
- package/lib/common/utils/gitUtils.js +7 -1
- package/lib/common/utils/gitUtils.js.map +1 -1
- package/lib/common/utils/orgUtils.d.ts +1 -0
- package/lib/common/utils/orgUtils.js +12 -0
- package/lib/common/utils/orgUtils.js.map +1 -1
- package/lib/common/utils/prePostCommandUtils.d.ts +7 -0
- package/lib/common/utils/prePostCommandUtils.js +299 -0
- package/lib/common/utils/prePostCommandUtils.js.map +1 -0
- package/oclif.lock +17 -17
- package/oclif.manifest.json +1384 -1384
- package/package.json +6 -6
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"actionsProvider.js","sourceRoot":"","sources":["../../../src/common/actionsProvider/actionsProvider.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,6 @@
|
|
|
1
|
+
import { ActionsProvider, ActionResult, PrePostCommand } from './actionsProvider.js';
|
|
2
|
+
export declare class ApexAction extends ActionsProvider {
|
|
3
|
+
getLabel(): string;
|
|
4
|
+
checkParameters(cmd: PrePostCommand): Promise<ActionResult | null>;
|
|
5
|
+
run(cmd: PrePostCommand): Promise<ActionResult>;
|
|
6
|
+
}
|
|
@@ -0,0 +1,35 @@
|
|
|
1
|
+
import { ActionsProvider } from './actionsProvider.js';
|
|
2
|
+
import { execCommand, uxLog } from '../utils/index.js';
|
|
3
|
+
import fs from 'fs-extra';
|
|
4
|
+
import c from 'chalk';
|
|
5
|
+
export class ApexAction extends ActionsProvider {
|
|
6
|
+
getLabel() {
|
|
7
|
+
return 'ApexAction';
|
|
8
|
+
}
|
|
9
|
+
// eslint-disable-next-line @typescript-eslint/no-unused-vars
|
|
10
|
+
async checkParameters(cmd) {
|
|
11
|
+
const apexScript = cmd.parameters?.apexScript || '';
|
|
12
|
+
if (!apexScript) {
|
|
13
|
+
uxLog('error', this, c.red(`[DeploymentActions] No apexScript parameter provided for action [${cmd.id}]: ${cmd.label}`));
|
|
14
|
+
return { statusCode: 'failed', skippedReason: 'No apexScript parameter provided' };
|
|
15
|
+
}
|
|
16
|
+
if (!fs.existsSync(apexScript)) {
|
|
17
|
+
uxLog('error', this, c.red(`[DeploymentActions] Apex script file ${apexScript} does not exist for action [${cmd.id}]: ${cmd.label}`));
|
|
18
|
+
return { statusCode: 'failed', skippedReason: `Apex script file ${apexScript} does not exist` };
|
|
19
|
+
}
|
|
20
|
+
return null;
|
|
21
|
+
}
|
|
22
|
+
async run(cmd) {
|
|
23
|
+
const validity = await this.checkValidityIssues(cmd);
|
|
24
|
+
if (validity)
|
|
25
|
+
return validity;
|
|
26
|
+
const apexScript = cmd.parameters?.apexScript || '';
|
|
27
|
+
const apexCommand = `sf apex run --file ${apexScript}` + (this.customUsernameToUse ? ` --target-org ${this.customUsernameToUse}` : '');
|
|
28
|
+
const res = await execCommand(apexCommand, null, { fail: false, output: true });
|
|
29
|
+
if (res.status === 0) {
|
|
30
|
+
return { statusCode: 'success', output: (res.stdout || '') + '\n' + (res.stderr || '') };
|
|
31
|
+
}
|
|
32
|
+
return { statusCode: 'failed', output: (res.stdout || '') + '\n' + (res.stderr || '') };
|
|
33
|
+
}
|
|
34
|
+
}
|
|
35
|
+
//# sourceMappingURL=apexAction.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"apexAction.js","sourceRoot":"","sources":["../../../src/common/actionsProvider/apexAction.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAgC,MAAM,sBAAsB,CAAC;AACrF,OAAO,EAAE,WAAW,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;AACvD,OAAO,EAAE,MAAM,UAAU,CAAC;AAC1B,OAAO,CAAC,MAAM,OAAO,CAAC;AAEtB,MAAM,OAAO,UAAW,SAAQ,eAAe;IACtC,QAAQ;QACb,OAAO,YAAY,CAAC;IACtB,CAAC;IAED,6DAA6D;IACtD,KAAK,CAAC,eAAe,CAAC,GAAmB;QAC9C,MAAM,UAAU,GAAI,GAAG,CAAC,UAAU,EAAE,UAAqB,IAAI,EAAE,CAAC;QAChE,IAAI,CAAC,UAAU,EAAE,CAAC;YAChB,KAAK,CAAC,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,oEAAoE,GAAG,CAAC,EAAE,MAAM,GAAG,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;YACzH,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAE,aAAa,EAAE,kCAAkC,EAAE,CAAC;QACrF,CAAC;QACD,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,UAAU,CAAC,EAAE,CAAC;YAC/B,KAAK,CAAC,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,wCAAwC,UAAU,+BAA+B,GAAG,CAAC,EAAE,MAAM,GAAG,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;YACtI,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAE,aAAa,EAAE,oBAAoB,UAAU,iBAAiB,EAAE,CAAC;QAClG,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IAEM,KAAK,CAAC,GAAG,CAAC,GAAmB;QAClC,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAAC,GAAG,CAAC,CAAC;QACrD,IAAI,QAAQ;YAAE,OAAO,QAAQ,CAAC;QAC9B,MAAM,UAAU,GAAI,GAAG,CAAC,UAAU,EAAE,UAAqB,IAAI,EAAE,CAAC;QAChE,MAAM,WAAW,GAAG,sBAAsB,UAAU,EAAE,GAAG,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC,CAAC,iBAAiB,IAAI,CAAC,mBAAmB,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;QACvI,MAAM,GAAG,GAAG,MAAM,WAAW,CAAC,WAAW,EAAE,IAAI,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC;QAChF,IAAI,GAAG,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACrB,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,EAAE,CAAC,GAAG,CAAC,MAAM,IAAI,EAAE,CAAC,GAAG,IAAI,GAAG,CAAC,GAAG,CAAC,MAAM,IAAI,EAAE,CAAC,EAAE,CAAC;QAC3F,CAAC;QACD,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC,GAAG,CAAC,MAAM,IAAI,EAAE,CAAC,GAAG,IAAI,GAAG,CAAC,GAAG,CAAC,MAAM,IAAI,EAAE,CAAC,EAAE,CAAC;IAC1F,CAAC;CACF"}
|
|
@@ -0,0 +1,6 @@
|
|
|
1
|
+
import { ActionsProvider, ActionResult, PrePostCommand } from './actionsProvider.js';
|
|
2
|
+
export declare class CommandAction extends ActionsProvider {
|
|
3
|
+
getLabel(): string;
|
|
4
|
+
checkParameters(cmd: PrePostCommand): Promise<ActionResult | null>;
|
|
5
|
+
run(cmd: PrePostCommand): Promise<ActionResult>;
|
|
6
|
+
}
|
|
@@ -0,0 +1,29 @@
|
|
|
1
|
+
import { ActionsProvider } from './actionsProvider.js';
|
|
2
|
+
import { execCommand, uxLog } from '../utils/index.js';
|
|
3
|
+
import c from 'chalk';
|
|
4
|
+
export class CommandAction extends ActionsProvider {
|
|
5
|
+
getLabel() {
|
|
6
|
+
return 'CommandAction';
|
|
7
|
+
}
|
|
8
|
+
// eslint-disable-next-line @typescript-eslint/no-unused-vars
|
|
9
|
+
async checkParameters(cmd) {
|
|
10
|
+
const command = cmd.command;
|
|
11
|
+
if (!command) {
|
|
12
|
+
uxLog('error', this, c.red(`[DeploymentActions] No command provided for action [${cmd.id}]: ${cmd.label}`));
|
|
13
|
+
return { statusCode: 'failed', skippedReason: 'No command provided' };
|
|
14
|
+
}
|
|
15
|
+
return null;
|
|
16
|
+
}
|
|
17
|
+
async run(cmd) {
|
|
18
|
+
const validity = await this.checkValidityIssues(cmd);
|
|
19
|
+
if (validity)
|
|
20
|
+
return validity;
|
|
21
|
+
cmd.command = cmd.command + (this.customUsernameToUse ? ` --target-org ${this.customUsernameToUse}` : '');
|
|
22
|
+
const res = await execCommand(cmd.command, null, { fail: false, output: true });
|
|
23
|
+
if (res.status === 0) {
|
|
24
|
+
return { statusCode: 'success', output: (res.stdout || '') + '\n' + (res.stderr || '') };
|
|
25
|
+
}
|
|
26
|
+
return { statusCode: 'failed', output: (res.stdout || '') + '\n' + (res.stderr || '') };
|
|
27
|
+
}
|
|
28
|
+
}
|
|
29
|
+
//# sourceMappingURL=commandAction.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"commandAction.js","sourceRoot":"","sources":["../../../src/common/actionsProvider/commandAction.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAgC,MAAM,sBAAsB,CAAC;AACrF,OAAO,EAAE,WAAW,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;AACvD,OAAO,CAAC,MAAM,OAAO,CAAC;AAEtB,MAAM,OAAO,aAAc,SAAQ,eAAe;IACzC,QAAQ;QACb,OAAO,eAAe,CAAC;IACzB,CAAC;IAED,6DAA6D;IACtD,KAAK,CAAC,eAAe,CAAC,GAAmB;QAC9C,MAAM,OAAO,GAAG,GAAG,CAAC,OAAO,CAAC;QAC5B,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,KAAK,CAAC,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,uDAAuD,GAAG,CAAC,EAAE,MAAM,GAAG,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;YAC5G,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAE,aAAa,EAAE,qBAAqB,EAAkB,CAAC;QACxF,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IAEM,KAAK,CAAC,GAAG,CAAC,GAAmB;QAClC,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAAC,GAAG,CAAC,CAAC;QACrD,IAAI,QAAQ;YAAE,OAAO,QAAQ,CAAC;QAC9B,GAAG,CAAC,OAAO,GAAG,GAAG,CAAC,OAAO,GAAG,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC,CAAC,iBAAiB,IAAI,CAAC,mBAAmB,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;QAC1G,MAAM,GAAG,GAAG,MAAM,WAAW,CAAC,GAAG,CAAC,OAAO,EAAE,IAAI,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC;QAChF,IAAI,GAAG,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACrB,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,EAAE,CAAC,GAAG,CAAC,MAAM,IAAI,EAAE,CAAC,GAAG,IAAI,GAAG,CAAC,GAAG,CAAC,MAAM,IAAI,EAAE,CAAC,EAAE,CAAC;QAC3F,CAAC;QACD,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC,GAAG,CAAC,MAAM,IAAI,EAAE,CAAC,GAAG,IAAI,GAAG,CAAC,GAAG,CAAC,MAAM,IAAI,EAAE,CAAC,EAAE,CAAC;IAC1F,CAAC;CACF"}
|
|
@@ -0,0 +1,6 @@
|
|
|
1
|
+
import { ActionsProvider, ActionResult, PrePostCommand } from './actionsProvider.js';
|
|
2
|
+
export declare class DataAction extends ActionsProvider {
|
|
3
|
+
getLabel(): string;
|
|
4
|
+
checkParameters(cmd: PrePostCommand): Promise<ActionResult | null>;
|
|
5
|
+
run(cmd: PrePostCommand): Promise<ActionResult>;
|
|
6
|
+
}
|
|
@@ -0,0 +1,50 @@
|
|
|
1
|
+
import { ActionsProvider } from './actionsProvider.js';
|
|
2
|
+
import { uxLog } from '../utils/index.js';
|
|
3
|
+
import c from 'chalk';
|
|
4
|
+
import { findDataWorkspaceByName, importData } from '../utils/dataUtils.js';
|
|
5
|
+
export class DataAction extends ActionsProvider {
|
|
6
|
+
getLabel() {
|
|
7
|
+
return 'DataAction';
|
|
8
|
+
}
|
|
9
|
+
// eslint-disable-next-line @typescript-eslint/no-unused-vars
|
|
10
|
+
async checkParameters(cmd) {
|
|
11
|
+
const sfdmuProject = cmd.parameters?.sfdmuProject || '';
|
|
12
|
+
if (!sfdmuProject) {
|
|
13
|
+
uxLog('error', this, c.red(`[DeploymentActions] No sfdmuProject parameter provided for action ${cmd.label}`));
|
|
14
|
+
return { statusCode: 'failed', skippedReason: 'No sfdmuProject parameter provided' };
|
|
15
|
+
}
|
|
16
|
+
const sfdmuProjectPath = await findDataWorkspaceByName(sfdmuProject, false);
|
|
17
|
+
if (!sfdmuProjectPath) {
|
|
18
|
+
uxLog('error', this, c.red(`[DeploymentActions] Data workspace ${sfdmuProject} does not exist for action ${cmd.label}`));
|
|
19
|
+
return { statusCode: 'failed', skippedReason: `Data workspace ${sfdmuProject} does not exist` };
|
|
20
|
+
}
|
|
21
|
+
return null;
|
|
22
|
+
}
|
|
23
|
+
async run(cmd) {
|
|
24
|
+
const validity = await this.checkValidityIssues(cmd);
|
|
25
|
+
if (validity)
|
|
26
|
+
return validity;
|
|
27
|
+
const sfdmuProject = cmd.parameters?.sfdmuProject || '';
|
|
28
|
+
const sfdmuProjectPath = await findDataWorkspaceByName(sfdmuProject);
|
|
29
|
+
const importOptions = {
|
|
30
|
+
fail: false,
|
|
31
|
+
output: true
|
|
32
|
+
};
|
|
33
|
+
if (this.customUsernameToUse) {
|
|
34
|
+
importOptions.targetUsername = this.customUsernameToUse;
|
|
35
|
+
}
|
|
36
|
+
let res;
|
|
37
|
+
try {
|
|
38
|
+
res = await importData(sfdmuProjectPath, null, importOptions);
|
|
39
|
+
if (res.status === 0) {
|
|
40
|
+
return { statusCode: 'success', output: (res.stdout || '') + '\n' + (res.stderr || '') };
|
|
41
|
+
}
|
|
42
|
+
}
|
|
43
|
+
catch (error) {
|
|
44
|
+
uxLog('error', this, c.red(`[DeploymentActions] Error during data import for action ${cmd.label}: ${error}`));
|
|
45
|
+
return { statusCode: 'failed', output: `Error during data import: ${error}` };
|
|
46
|
+
}
|
|
47
|
+
return { statusCode: 'failed', output: (res.stdout || '') + '\n' + (res.stderr || '') };
|
|
48
|
+
}
|
|
49
|
+
}
|
|
50
|
+
//# sourceMappingURL=dataAction.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"dataAction.js","sourceRoot":"","sources":["../../../src/common/actionsProvider/dataAction.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAgC,MAAM,sBAAsB,CAAC;AACrF,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAC1C,OAAO,CAAC,MAAM,OAAO,CAAC;AACtB,OAAO,EAAE,uBAAuB,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AAE5E,MAAM,OAAO,UAAW,SAAQ,eAAe;IACtC,QAAQ;QACb,OAAO,YAAY,CAAC;IACtB,CAAC;IAED,6DAA6D;IACtD,KAAK,CAAC,eAAe,CAAC,GAAmB;QAC9C,MAAM,YAAY,GAAI,GAAG,CAAC,UAAU,EAAE,YAAuB,IAAI,EAAE,CAAC;QACpE,IAAI,CAAC,YAAY,EAAE,CAAC;YAClB,KAAK,CAAC,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,qEAAqE,GAAG,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;YAC9G,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAE,aAAa,EAAE,oCAAoC,EAAE,CAAC;QACvF,CAAC;QACD,MAAM,gBAAgB,GAAG,MAAM,uBAAuB,CAAC,YAAY,EAAE,KAAK,CAAC,CAAC;QAC5E,IAAI,CAAC,gBAAgB,EAAE,CAAC;YACtB,KAAK,CAAC,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,sCAAsC,YAAY,8BAA8B,GAAG,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;YACzH,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAE,aAAa,EAAE,kBAAkB,YAAY,iBAAiB,EAAE,CAAC;QAClG,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IAEM,KAAK,CAAC,GAAG,CAAC,GAAmB;QAClC,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAAC,GAAG,CAAC,CAAC;QACrD,IAAI,QAAQ;YAAE,OAAO,QAAQ,CAAC;QAC9B,MAAM,YAAY,GAAI,GAAG,CAAC,UAAU,EAAE,YAAuB,IAAI,EAAE,CAAC;QACpE,MAAM,gBAAgB,GAAG,MAAM,uBAAuB,CAAC,YAAY,CAAC,CAAC;QACrE,MAAM,aAAa,GAAQ;YACzB,IAAI,EAAE,KAAK;YACX,MAAM,EAAE,IAAI;SACb,CAAA;QACD,IAAI,IAAI,CAAC,mBAAmB,EAAE,CAAC;YAC7B,aAAa,CAAC,cAAc,GAAG,IAAI,CAAC,mBAAmB,CAAC;QAC1D,CAAC;QACD,IAAI,GAAQ,CAAC;QACb,IAAI,CAAC;YACH,GAAG,GAAG,MAAM,UAAU,CAAC,gBAAiB,EAAE,IAAI,EAAE,aAAa,CAAC,CAAC;YAC/D,IAAI,GAAG,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBACrB,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,EAAE,CAAC,GAAG,CAAC,MAAM,IAAI,EAAE,CAAC,GAAG,IAAI,GAAG,CAAC,GAAG,CAAC,MAAM,IAAI,EAAE,CAAC,EAAE,CAAC;YAC3F,CAAC;QACH,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,KAAK,CAAC,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,2DAA2D,GAAG,CAAC,KAAK,KAAK,KAAK,EAAE,CAAC,CAAC,CAAC;YAC9G,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,EAAE,6BAA6B,KAAK,EAAE,EAAE,CAAC;QAChF,CAAC;QACD,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC,GAAG,CAAC,MAAM,IAAI,EAAE,CAAC,GAAG,IAAI,GAAG,CAAC,GAAG,CAAC,MAAM,IAAI,EAAE,CAAC,EAAE,CAAC;IAC1F,CAAC;CACF"}
|
|
@@ -0,0 +1,6 @@
|
|
|
1
|
+
import { ActionsProvider, ActionResult, PrePostCommand } from './actionsProvider.js';
|
|
2
|
+
export declare class ManualAction extends ActionsProvider {
|
|
3
|
+
getLabel(): string;
|
|
4
|
+
checkParameters(cmd: PrePostCommand): Promise<ActionResult | null>;
|
|
5
|
+
run(cmd: PrePostCommand): Promise<ActionResult>;
|
|
6
|
+
}
|
|
@@ -0,0 +1,26 @@
|
|
|
1
|
+
import { ActionsProvider } from './actionsProvider.js';
|
|
2
|
+
import { uxLog } from '../utils/index.js';
|
|
3
|
+
import c from 'chalk';
|
|
4
|
+
export class ManualAction extends ActionsProvider {
|
|
5
|
+
getLabel() {
|
|
6
|
+
return 'ManualAction';
|
|
7
|
+
}
|
|
8
|
+
// eslint-disable-next-line @typescript-eslint/no-unused-vars
|
|
9
|
+
async checkParameters(cmd) {
|
|
10
|
+
const instructions = cmd.parameters?.instructions || '';
|
|
11
|
+
if (!instructions) {
|
|
12
|
+
uxLog('warning', this, c.yellow(`[DeploymentActions] No instructions for manual action [${cmd.id}]: ${cmd.label}`));
|
|
13
|
+
return { statusCode: 'skipped', skippedReason: 'No instructions provided' };
|
|
14
|
+
}
|
|
15
|
+
return null;
|
|
16
|
+
}
|
|
17
|
+
async run(cmd) {
|
|
18
|
+
const validity = await this.checkValidityIssues(cmd);
|
|
19
|
+
if (validity)
|
|
20
|
+
return validity;
|
|
21
|
+
const instructions = cmd.parameters?.instructions || '';
|
|
22
|
+
// Manual actions are not executed automatically. We just record the instructions.
|
|
23
|
+
return { statusCode: 'manual', skippedReason: 'Manual action - see output for instructions', output: instructions };
|
|
24
|
+
}
|
|
25
|
+
}
|
|
26
|
+
//# sourceMappingURL=manualAction.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"manualAction.js","sourceRoot":"","sources":["../../../src/common/actionsProvider/manualAction.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAgC,MAAM,sBAAsB,CAAC;AACrF,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAC1C,OAAO,CAAC,MAAM,OAAO,CAAC;AAEtB,MAAM,OAAO,YAAa,SAAQ,eAAe;IACxC,QAAQ;QACb,OAAO,cAAc,CAAC;IACxB,CAAC;IAED,6DAA6D;IACtD,KAAK,CAAC,eAAe,CAAC,GAAmB;QAC9C,MAAM,YAAY,GAAI,GAAG,CAAC,UAAU,EAAE,YAAuB,IAAI,EAAE,CAAC;QACpE,IAAI,CAAC,YAAY,EAAE,CAAC;YAClB,KAAK,CAAC,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,0DAA0D,GAAG,CAAC,EAAE,MAAM,GAAG,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;YACpH,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,aAAa,EAAE,0BAA0B,EAAE,CAAC;QAC9E,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IAEM,KAAK,CAAC,GAAG,CAAC,GAAmB;QAClC,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAAC,GAAG,CAAC,CAAC;QACrD,IAAI,QAAQ;YAAE,OAAO,QAAQ,CAAC;QAC9B,MAAM,YAAY,GAAI,GAAG,CAAC,UAAU,EAAE,YAAuB,IAAI,EAAE,CAAC;QACpE,kFAAkF;QAClF,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAE,aAAa,EAAE,6CAA6C,EAAE,MAAM,EAAE,YAAY,EAAE,CAAC;IACtH,CAAC;CACF"}
|
|
@@ -0,0 +1,6 @@
|
|
|
1
|
+
import { ActionsProvider, ActionResult, PrePostCommand } from './actionsProvider.js';
|
|
2
|
+
export declare class PublishCommunityAction extends ActionsProvider {
|
|
3
|
+
getLabel(): string;
|
|
4
|
+
checkParameters(cmd: PrePostCommand): Promise<ActionResult | null>;
|
|
5
|
+
run(cmd: PrePostCommand): Promise<ActionResult>;
|
|
6
|
+
}
|
|
@@ -0,0 +1,30 @@
|
|
|
1
|
+
import { ActionsProvider } from './actionsProvider.js';
|
|
2
|
+
import { execCommand, uxLog } from '../utils/index.js';
|
|
3
|
+
import c from 'chalk';
|
|
4
|
+
export class PublishCommunityAction extends ActionsProvider {
|
|
5
|
+
getLabel() {
|
|
6
|
+
return 'PublishCommunityAction';
|
|
7
|
+
}
|
|
8
|
+
// eslint-disable-next-line @typescript-eslint/no-unused-vars
|
|
9
|
+
async checkParameters(cmd) {
|
|
10
|
+
const communityName = cmd.parameters?.communityName || '';
|
|
11
|
+
if (!communityName) {
|
|
12
|
+
uxLog('error', this, c.red(`[DeploymentActions] No communityName parameter provided for action [${cmd.id}]: ${cmd.label}`));
|
|
13
|
+
return { statusCode: 'failed', skippedReason: 'No communityName parameter provided' };
|
|
14
|
+
}
|
|
15
|
+
return null;
|
|
16
|
+
}
|
|
17
|
+
async run(cmd) {
|
|
18
|
+
const validity = await this.checkValidityIssues(cmd);
|
|
19
|
+
if (validity)
|
|
20
|
+
return validity;
|
|
21
|
+
const communityName = cmd.parameters?.communityName || '';
|
|
22
|
+
const publishCmd = `sf community publish -n "${communityName}"` + (this.customUsernameToUse ? ` --target-org ${this.customUsernameToUse}` : '');
|
|
23
|
+
const res = await execCommand(publishCmd, null, { fail: false, output: true });
|
|
24
|
+
if (res.status === 0) {
|
|
25
|
+
return { statusCode: 'success', output: (res.stdout || '') + '\n' + (res.stderr || '') };
|
|
26
|
+
}
|
|
27
|
+
return { statusCode: 'failed', output: (res.stdout || '') + '\n' + (res.stderr || '') };
|
|
28
|
+
}
|
|
29
|
+
}
|
|
30
|
+
//# sourceMappingURL=publishCommunityAction.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"publishCommunityAction.js","sourceRoot":"","sources":["../../../src/common/actionsProvider/publishCommunityAction.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAgC,MAAM,sBAAsB,CAAC;AACrF,OAAO,EAAE,WAAW,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;AACvD,OAAO,CAAC,MAAM,OAAO,CAAC;AAEtB,MAAM,OAAO,sBAAuB,SAAQ,eAAe;IAClD,QAAQ;QACb,OAAO,wBAAwB,CAAC;IAClC,CAAC;IAED,6DAA6D;IACtD,KAAK,CAAC,eAAe,CAAC,GAAmB;QAC9C,MAAM,aAAa,GAAI,GAAG,CAAC,UAAU,EAAE,aAAwB,IAAI,EAAE,CAAC;QACtE,IAAI,CAAC,aAAa,EAAE,CAAC;YACnB,KAAK,CAAC,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,uEAAuE,GAAG,CAAC,EAAE,MAAM,GAAG,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;YAC5H,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAE,aAAa,EAAE,qCAAqC,EAAE,CAAC;QACxF,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IAEM,KAAK,CAAC,GAAG,CAAC,GAAmB;QAClC,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAAC,GAAG,CAAC,CAAC;QACrD,IAAI,QAAQ;YAAE,OAAO,QAAQ,CAAC;QAC9B,MAAM,aAAa,GAAI,GAAG,CAAC,UAAU,EAAE,aAAwB,IAAI,EAAE,CAAC;QACtE,MAAM,UAAU,GAAG,4BAA4B,aAAa,GAAG,GAAG,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC,CAAC,iBAAiB,IAAI,CAAC,mBAAmB,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;QAChJ,MAAM,GAAG,GAAG,MAAM,WAAW,CAAC,UAAU,EAAE,IAAI,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC;QAC/E,IAAI,GAAG,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACrB,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,EAAE,CAAC,GAAG,CAAC,MAAM,IAAI,EAAE,CAAC,GAAG,IAAI,GAAG,CAAC,GAAG,CAAC,MAAM,IAAI,EAAE,CAAC,EAAE,CAAC;QAC3F,CAAC;QACD,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC,GAAG,CAAC,MAAM,IAAI,EAAE,CAAC,GAAG,IAAI,GAAG,CAAC,GAAG,CAAC,MAAM,IAAI,EAAE,CAAC,EAAE,CAAC;IAC1F,CAAC;CACF"}
|
|
@@ -24,6 +24,7 @@ export declare class AzureDevopsProvider extends GitProviderRoot {
|
|
|
24
24
|
getBranchDeploymentCheckId(gitBranch: string): Promise<string | null>;
|
|
25
25
|
getPullRequestDeploymentCheckId(): Promise<string | null>;
|
|
26
26
|
private getDeploymentIdFromPullRequest;
|
|
27
|
+
listPullRequestsInBranchSinceLastMerge(currentBranchName: string, targetBranchName: string, childBranchesNames: string[]): Promise<CommonPullRequestInfo[]>;
|
|
27
28
|
postPullRequestMessage(prMessage: PullRequestMessageRequest): Promise<PullRequestMessageResult>;
|
|
28
29
|
private pullRequestStatusToAzureThreadStatus;
|
|
29
30
|
private completePullRequestInfo;
|
|
@@ -5,7 +5,7 @@ import fs from 'fs-extra';
|
|
|
5
5
|
import { getCurrentGitBranch, getGitRepoUrl, git, isGitRepo, uxLog } from "../utils/index.js";
|
|
6
6
|
import * as path from "path";
|
|
7
7
|
import { CommentThreadStatus, PullRequestAsyncStatus, PullRequestStatus } from "azure-devops-node-api/interfaces/GitInterfaces.js";
|
|
8
|
-
import { CONSTANTS } from "../../config/index.js";
|
|
8
|
+
import { CONSTANTS, getEnvVar } from "../../config/index.js";
|
|
9
9
|
import { SfError } from "@salesforce/core";
|
|
10
10
|
import { prompts } from "../utils/prompts.js";
|
|
11
11
|
export class AzureDevopsProvider extends GitProviderRoot {
|
|
@@ -280,13 +280,81 @@ ${this.getPipelineVariablesConfig()}
|
|
|
280
280
|
}
|
|
281
281
|
return deploymentCheckId;
|
|
282
282
|
}
|
|
283
|
+
async listPullRequestsInBranchSinceLastMerge(currentBranchName, targetBranchName, childBranchesNames) {
|
|
284
|
+
if (!this.azureApi || !process.env.SYSTEM_TEAMPROJECT || !process.env.BUILD_REPOSITORY_ID) {
|
|
285
|
+
return [];
|
|
286
|
+
}
|
|
287
|
+
try {
|
|
288
|
+
const gitApi = await this.azureApi.getGitApi();
|
|
289
|
+
// Step 1: Find the last completed PR from currentBranch to targetBranch
|
|
290
|
+
const lastMergePRs = await gitApi.getPullRequests(process.env.BUILD_REPOSITORY_ID, {
|
|
291
|
+
sourceRefName: `refs/heads/${currentBranchName}`,
|
|
292
|
+
targetRefName: `refs/heads/${targetBranchName}`,
|
|
293
|
+
status: PullRequestStatus.Completed,
|
|
294
|
+
}, process.env.SYSTEM_TEAMPROJECT);
|
|
295
|
+
const lastMergeToTarget = lastMergePRs && lastMergePRs.length > 0 ? lastMergePRs[0] : null;
|
|
296
|
+
// Step 2: Get commits between branches
|
|
297
|
+
const gitApiCommits = await gitApi.getCommitsBatch({
|
|
298
|
+
itemVersion: {
|
|
299
|
+
version: currentBranchName,
|
|
300
|
+
versionType: 0, // branch
|
|
301
|
+
},
|
|
302
|
+
compareVersion: {
|
|
303
|
+
version: lastMergeToTarget
|
|
304
|
+
? lastMergeToTarget.lastMergeSourceCommit?.commitId
|
|
305
|
+
: targetBranchName,
|
|
306
|
+
versionType: lastMergeToTarget ? 2 : 0, // commit or branch
|
|
307
|
+
},
|
|
308
|
+
}, process.env.BUILD_REPOSITORY_ID, process.env.SYSTEM_TEAMPROJECT);
|
|
309
|
+
if (!gitApiCommits || gitApiCommits.length === 0) {
|
|
310
|
+
return [];
|
|
311
|
+
}
|
|
312
|
+
const commitIds = new Set(gitApiCommits.map((c) => c.commitId));
|
|
313
|
+
// Step 3: Get all completed PRs targeting currentBranch and child branches (parallelized)
|
|
314
|
+
const allBranches = [currentBranchName, ...childBranchesNames];
|
|
315
|
+
const prPromises = allBranches.map(async (branchName) => {
|
|
316
|
+
try {
|
|
317
|
+
const prs = await gitApi.getPullRequests(process.env.BUILD_REPOSITORY_ID, {
|
|
318
|
+
targetRefName: `refs/heads/${branchName}`,
|
|
319
|
+
status: PullRequestStatus.Completed,
|
|
320
|
+
}, process.env.SYSTEM_TEAMPROJECT);
|
|
321
|
+
return prs || [];
|
|
322
|
+
}
|
|
323
|
+
catch (err) {
|
|
324
|
+
uxLog("warning", this, c.yellow(`Error fetching completed PRs for branch ${branchName}: ${String(err)}`));
|
|
325
|
+
return [];
|
|
326
|
+
}
|
|
327
|
+
});
|
|
328
|
+
const prResults = await Promise.all(prPromises);
|
|
329
|
+
const allMergedPRs = prResults.flat();
|
|
330
|
+
// Step 4: Filter PRs whose merge commit is in our commit list
|
|
331
|
+
const relevantPRs = allMergedPRs.filter((pr) => {
|
|
332
|
+
const mergeCommitId = pr.lastMergeSourceCommit?.commitId;
|
|
333
|
+
return mergeCommitId && commitIds.has(mergeCommitId);
|
|
334
|
+
});
|
|
335
|
+
// Step 5: Remove duplicates
|
|
336
|
+
const uniquePRsMap = new Map();
|
|
337
|
+
for (const pr of relevantPRs) {
|
|
338
|
+
if (!uniquePRsMap.has(pr.pullRequestId)) {
|
|
339
|
+
uniquePRsMap.set(pr.pullRequestId, pr);
|
|
340
|
+
}
|
|
341
|
+
}
|
|
342
|
+
// Step 6: Convert to CommonPullRequestInfo
|
|
343
|
+
return Array.from(uniquePRsMap.values()).map((pr) => this.completePullRequestInfo(pr));
|
|
344
|
+
}
|
|
345
|
+
catch (err) {
|
|
346
|
+
uxLog("warning", this, c.yellow(`Error in listPullRequestsInBranchSinceLastMerge: ${String(err)}`));
|
|
347
|
+
return [];
|
|
348
|
+
}
|
|
349
|
+
}
|
|
283
350
|
// Posts a note on the merge request
|
|
284
351
|
async postPullRequestMessage(prMessage) {
|
|
285
352
|
// Get CI variables
|
|
353
|
+
const prInfo = await this.getPullRequestInfo();
|
|
286
354
|
const repositoryId = process.env.BUILD_REPOSITORY_ID || null;
|
|
287
355
|
const buildId = process.env.BUILD_BUILD_ID || null;
|
|
288
356
|
const jobId = process.env.SYSTEM_JOB_ID || null;
|
|
289
|
-
const pullRequestIdStr =
|
|
357
|
+
const pullRequestIdStr = getEnvVar("SYSTEM_PULLREQUEST_PULLREQUESTID") || prInfo?.idStr || null;
|
|
290
358
|
if (repositoryId == null || pullRequestIdStr == null) {
|
|
291
359
|
uxLog("log", this, c.grey("[Azure integration] No project and pull request, so no note thread..."));
|
|
292
360
|
uxLog("warning", this, c.yellow(`Following variables should be defined when available:
|
|
@@ -301,7 +369,7 @@ ${this.getPipelineVariablesConfig()}
|
|
|
301
369
|
const azureBuildUri = `${SYSTEM_COLLECTIONURI}${encodeURIComponent(SYSTEM_TEAMPROJECT)}/_build/results?buildId=${buildId}&view=logs&j=${jobId}`;
|
|
302
370
|
// Build thread message
|
|
303
371
|
const messageKey = prMessage.messageKey + "-" + azureJobName + "-" + pullRequestId;
|
|
304
|
-
let messageBody =
|
|
372
|
+
let messageBody = `## ${prMessage.title || ""}
|
|
305
373
|
|
|
306
374
|
${prMessage.message}
|
|
307
375
|
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"azureDevops.js","sourceRoot":"","sources":["../../../src/common/gitProvider/azureDevops.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AACvD,OAAO,KAAK,KAAK,MAAM,uBAAuB,CAAC;AAC/C,OAAO,CAAC,MAAM,OAAO,CAAC;AACtB,OAAO,EAAE,MAAM,UAAU,CAAC;AAC1B,OAAO,EAAE,mBAAmB,EAAE,aAAa,EAAE,GAAG,EAAE,SAAS,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAC9F,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;AAE7B,OAAO,EAAE,mBAAmB,EAA6E,sBAAsB,EAAE,iBAAiB,EAAE,MAAM,mDAAmD,CAAC;AAC9M,OAAO,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAClD,OAAO,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAC3C,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAE9C,MAAM,OAAO,mBAAoB,SAAQ,eAAe;IAC9C,QAAQ,CAAoC;IAC7C,SAAS,CAAS;IAClB,KAAK,CAAS;IACd,qBAAqB,CAAS;IAC9B,wBAAwB,GAAW,OAAO,CAAC,GAAG,CAAC,iCAAiC,IAAI,8BAA8B,CAAA;IAEzH;QACE,KAAK,EAAE,CAAC;QACR,gGAAgG;QAChG,IAAI,CAAC,SAAS,GAAG,OAAO,CAAC,GAAG,CAAC,oBAAoB,IAAI,EAAE,CAAC;QACxD,0CAA0C;QAC1C,IAAI,CAAC,KAAK,GAAG,OAAO,CAAC,GAAG,CAAC,0BAA0B,IAAI,OAAO,CAAC,GAAG,CAAC,kBAAkB,IAAI,EAAE,CAAC;QAC5F,MAAM,WAAW,GAAG,KAAK,CAAC,mBAAmB,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAC1D,IAAI,CAAC,QAAQ,GAAG,IAAI,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,EAAE,WAAW,CAAC,CAAC;IAChE,CAAC;IAEM,MAAM,CAAC,KAAK,CAAC,yBAAyB;QAC3C,IAAI,CAAC,SAAS,EAAE,EAAE,CAAC;YACjB,KAAK,CAAC,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,6DAA6D,CAAC,CAAC,CAAC;YAChG,OAAO;QACT,CAAC;QACD,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,oBAAoB,EAAE,CAAC;YACtC,MAAM,OAAO,GAAG,MAAM,aAAa,EAAE,IAAI,EAAE,CAAC;YAC5C,IAAI,CAAC,OAAO,EAAE,CAAC;gBACb,KAAK,CAAC,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,+CAA+C,CAAC,CAAC,CAAC;gBAClF,OAAO;YACT,CAAC;YACD,MAAM,WAAW,GAAG,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAC;YACpD,IAAI,CAAC,WAAW,EAAE,CAAC;gBACjB,KAAK,CAAC,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,uCAAuC,OAAO,sDAAsD,CAAC,CAAC,CAAC;gBACvI,OAAO;YACT,CAAC;YACD,OAAO,CAAC,GAAG,CAAC,oBAAoB,GAAG,WAAW,CAAC,aAAa,CAAC;YAC7D,OAAO,CAAC,GAAG,CAAC,kBAAkB,GAAG,WAAW,CAAC,WAAW,CAAC;YACzD,OAAO,CAAC,GAAG,CAAC,mBAAmB,GAAG,WAAW,CAAC,YAAY,CAAC;QAC7D,CAAC;QACD,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,kBAAkB,EAAE,CAAC;YACpC,KAAK,CAAC,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,sOAAsO,CAAC,CAAC,CAAC;YACzQ,KAAK,CAAC,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,qDAAqD,CAAC,CAAC,CAAC;YACxF,MAAM,eAAe,GAAG,MAAM,OAAO,CAAC;gBACpC,IAAI,EAAE,OAAO;gBACb,OAAO,EAAE,6CAA6C;gBACtD,WAAW,EAAE,uGAAuG;gBACpH,IAAI,EAAE,MAAM;aACb,CAAC,CAAC;YACH,OAAO,CAAC,GAAG,CAAC,kBAAkB,GAAG,eAAe,CAAC,KAAK,CAAC;QACzD,CAAC;IACH,CAAC;IAEM,QAAQ;QACb,OAAO,oCAAoC,CAAC;IAC9C,CAAC;IAED,0BAA0B;IACnB,KAAK,CAAC,gBAAgB;QAC3B,IAAI,OAAO,CAAC,GAAG,CAAC,gBAAgB,EAAE,CAAC;YACjC,OAAO,OAAO,CAAC,GAAG,CAAC,gBAAgB,CAAC;QACtC,CAAC;QACD,IAAI,OAAO,CAAC,GAAG,CAAC,oBAAoB,IAAI,OAAO,CAAC,GAAG,CAAC,kBAAkB,IAAI,OAAO,CAAC,GAAG,CAAC,aAAa,EAAE,CAAC;YACpG,MAAM,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC,oBAAoB,GAAG,kBAAkB,CAAC,OAAO,CAAC,GAAG,CAAC,kBAAkB,CAAC,2BAA2B,OAAO,CAAC,GAAG,CAAC,aAC5I,EAAE,CAAC;YACL,OAAO,MAAM,CAAC;QAChB,CAAC;QACD,KAAK,CACH,SAAS,EACT,IAAI,EACJ,CAAC,CAAC,MAAM,CAAC;;;kBAGG,CAAC,CACd,CAAC;QACF,OAAO,IAAI,CAAC;IACd,CAAC;IAED,0BAA0B;IACnB,KAAK,CAAC,mBAAmB;QAC9B,IACE,OAAO,CAAC,GAAG,CAAC,oBAAoB;YAChC,OAAO,CAAC,GAAG,CAAC,kBAAkB;YAC9B,OAAO,CAAC,GAAG,CAAC,oBAAoB;YAChC,OAAO,CAAC,GAAG,CAAC,sBAAsB,EAClC,CAAC;YACD,MAAM,gBAAgB,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC,oBAAoB,GAAG,kBAAkB,CAAC,OAAO,CAAC,GAAG,CAAC,kBAAkB,CAAC,SAAS,kBAAkB,CAC1I,OAAO,CAAC,GAAG,CAAC,oBAAoB,CACjC,cAAc,OAAO,CAAC,GAAG,CAAC,sBAAsB,EAAE,CAAC;YACpD,OAAO,gBAAgB,CAAC;QAC1B,CAAC;QACD,KAAK,CACH,SAAS,EACT,IAAI,EACJ,CAAC,CAAC,MAAM,CAAC;EACb,IAAI,CAAC,0BAA0B,EAAE;CAClC,CAAC,CACG,CAAC;QACF,OAAO,IAAI,CAAC;IACd,CAAC;IAED,iDAAiD;IAC1C,KAAK,CAAC,2BAA2B;QACtC,OAAO,KAAK,CAAC;IACf,CAAC;IAED,yBAAyB;IAClB,KAAK,CAAC,kBAAkB;QAC7B,uCAAuC;QACvC,mBAAmB;QACnB,MAAM,YAAY,GAAG,OAAO,CAAC,GAAG,CAAC,mBAAmB,IAAI,IAAI,CAAC;QAC7D,MAAM,gBAAgB,GAAG,OAAO,CAAC,GAAG,CAAC,gCAAgC,IAAI,IAAI,CAAC;QAC9E,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,SAAS,EAAE,CAAC;QACpD,MAAM,gBAAgB,GAAG,MAAM,mBAAmB,EAAE,CAAC;QACrD,IACE,gBAAgB,KAAK,IAAI;YACzB,CAAC,CAAC,gBAAgB,IAAI,EAAE,CAAC,CAAC,QAAQ,CAAC,kCAAkC,CAAC;YACtE,CAAC,CAAC,gBAAgB,IAAI,EAAE,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,EACxC,CAAC;YACD,MAAM,aAAa,GAAG,MAAM,CAAC,gBAAgB,CAAC,CAAC;YAC/C,MAAM,WAAW,GAAG,MAAM,WAAW,CAAC,kBAAkB,CAAC,aAAa,CAAC,CAAC;YACxE,IAAI,WAAW,IAAI,WAAW,CAAC,aAAa,EAAE,CAAC;gBAC7C,4CAA4C;gBAC5C,MAAM,uBAAuB,GAAG,MAAM,WAAW,CAAC,0BAA0B,CAAC,YAAY,IAAI,EAAE,EAAE,aAAa,CAAC,CAAC;gBAChH,IAAI,CAAC,WAAW,CAAC,YAAY,EAAE,CAAC;oBAC9B,WAAW,CAAC,YAAY,GAAG,uBAAuB,CAAC;gBACrD,CAAC;gBACD,OAAO,IAAI,CAAC,uBAAuB,CAAC,WAAW,CAAC,CAAC;YACnD,CAAC;iBAAM,CAAC;gBACN,KAAK,CAAC,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,yDAAyD,gBAAgB,GAAG,CAAC,CAAC,CAAC;gBAC/G,KAAK,CAAC,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,WAAW,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;YAChE,CAAC;QACH,CAAC;QACD,qCAAqC;QACrC,MAAM,GAAG,GAAG,MAAM,GAAG,EAAE,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC;QAC3C,MAAM,0BAA0B,GAAG,MAAM,WAAW,CAAC,eAAe,CAAC,YAAY,IAAI,EAAE,EAAE;YACvF,aAAa,EAAE,cAAc,gBAAgB,EAAE;YAC/C,MAAM,EAAE,iBAAiB,CAAC,SAAS;SACpC,CAAC,CAAC;QACH,MAAM,+BAA+B,GAAG,0BAA0B,CAAC,MAAM,CACvE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,WAAW,KAAK,sBAAsB,CAAC,SAAS,IAAI,EAAE,CAAC,eAAe,EAAE,QAAQ,KAAK,GAAG,CACpG,CAAC;QACF,IAAI,+BAA+B,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC/C,MAAM,WAAW,GAAG,+BAA+B,CAAC,CAAC,CAAC,CAAC;YACvD,4CAA4C;YAC5C,MAAM,uBAAuB,GAAG,MAAM,WAAW,CAAC,0BAA0B,CAAC,YAAY,IAAI,EAAE,EAAE,WAAW,CAAC,aAAa,IAAI,CAAC,CAAC,CAAC;YACjI,IAAI,CAAC,WAAW,CAAC,YAAY,EAAE,CAAC;gBAC9B,WAAW,CAAC,YAAY,GAAG,uBAAuB,CAAC;YACrD,CAAC;YACD,OAAO,IAAI,CAAC,uBAAuB,CAAC,+BAA+B,CAAC,CAAC,CAAC,CAAC,CAAC;QAC1E,CAAC;QACD,KAAK,CAAC,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,8DAA8D,CAAC,CAAC,CAAC;QAC3F,OAAO,IAAI,CAAC;IACd,CAAC;IAEM,KAAK,CAAC,gBAAgB,CAAC,UAI1B,EAAE,EACJ,UAEI,EAAE,SAAS,EAAE,KAAK,EAAE;QAExB,oBAAoB;QACpB,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,SAAS,EAAE,CAAC;QACpD,MAAM,YAAY,GAAG,OAAO,CAAC,GAAG,CAAC,mBAAmB,IAAI,IAAI,CAAC;QAC7D,IAAI,YAAY,IAAI,IAAI,EAAE,CAAC;YACzB,KAAK,CAAC,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,wDAAwD,CAAC,CAAC,CAAC;YAC3F,OAAO,EAAE,CAAC;QACZ,CAAC;QACD,MAAM,WAAW,GAAG,OAAO,CAAC,GAAG,CAAC,kBAAkB,IAAI,IAAI,CAAC;QAC3D,IAAI,WAAW,IAAI,IAAI,EAAE,CAAC;YACxB,KAAK,CAAC,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,uDAAuD,CAAC,CAAC,CAAC;YAC1F,OAAO,EAAE,CAAC;QACZ,CAAC;QACD,wBAAwB;QACxB,MAAM,eAAe,GAAiC,EAAE,CAAC;QACzD,IAAI,OAAO,CAAC,iBAAiB,EAAE,CAAC;YAC9B,MAAM,kBAAkB,GACtB,OAAO,CAAC,iBAAiB,KAAK,MAAM,CAAC,CAAC,CAAC,iBAAiB,CAAC,MAAM,CAAC,CAAC;gBAC/D,OAAO,CAAC,iBAAiB,KAAK,WAAW,CAAC,CAAC,CAAC,iBAAiB,CAAC,SAAS,CAAC,CAAC;oBACvE,OAAO,CAAC,iBAAiB,KAAK,QAAQ,CAAC,CAAC,CAAC,iBAAiB,CAAC,SAAS,CAAC,CAAC;wBACpE,IAAI,CAAC;YACb,IAAI,kBAAkB,IAAI,IAAI,EAAE,CAAC;gBAC/B,MAAM,IAAI,OAAO,CAAC,8CAA8C,OAAO,CAAC,iBAAiB,OAAO,IAAI,CAAC,SAAS,CAAC,iBAAiB,CAAC,EAAE,CAAC,CAAC;YACvI,CAAC;YACD,eAAe,CAAC,MAAM,GAAG,kBAAkB,CAAA;QAC7C,CAAC;aACI,CAAC;YACJ,eAAe,CAAC,MAAM,GAAG,iBAAiB,CAAC,GAAG,CAAA;QAChD,CAAC;QACD,IAAI,OAAO,CAAC,YAAY,EAAE,CAAC;YACzB,eAAe,CAAC,aAAa,GAAG,cAAc,OAAO,CAAC,YAAY,EAAE,CAAA;QACtE,CAAC;QACD,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC;YACpB,eAAe,CAAC,OAAO,GAAG,OAAO,CAAC,OAAO,CAAA;QAC3C,CAAC;QACD,kBAAkB;QAClB,KAAK,CAAC,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,4CAA4C,CAAC,CAAC,CAAC;QAC5E,KAAK,CAAC,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,gBAAgB,IAAI,CAAC,SAAS,CAAC,eAAe,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;QAEvF,qBAAqB;QACrB,MAAM,YAAY,GAAG,MAAM,WAAW,CAAC,eAAe,CAAC,YAAY,EAAE,eAAe,EAAE,WAAW,CAAC,CAAC;QACnG,oCAAoC;QACpC,MAAM,wBAAwB,GAAgD,EAAE,CAAC;QACjF,KAAK,MAAM,WAAW,IAAI,YAAY,EAAE,CAAC;YACvC,MAAM,EAAE,GAAyC,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,WAAW,CAAC,CAAC;YAChF,KAAK,CAAC,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,0BAA0B,WAAW,CAAC,aAAa,KAAK,CAAC,CAAC,CAAC;YACrF,MAAM,eAAe,GAAG,MAAM,WAAW,CAAC,UAAU,CAAC,WAAW,CAAC,UAAU,EAAE,EAAE,IAAI,EAAE,EAAE,WAAW,CAAC,aAAa,IAAI,CAAC,EAAE,WAAW,CAAC,CAAC;YACpI,EAAE,CAAC,OAAO,GAAG,eAAe,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;YACjE,wBAAwB,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QACpC,CAAC;QAED,sBAAsB;QACtB,IAAI,OAAO,CAAC,SAAS,EAAE,CAAC;YACtB,KAAK,CAAC,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,cAAc,wBAAwB,CAAC,MAAM,aAAa,CAAC,CAAC,CAAC;YAC1F,MAAM,qBAAqB,GAAG,wBAAwB,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE;gBAC9D,MAAM,WAAW,GAAQ,EAAE,CAAC;gBAC5B,iFAAiF;gBACjF,IAAI,OAAO,GAAG,EAAE,CAAC;gBACjB,KAAK,MAAM,MAAM,IAAI,EAAE,CAAC,OAAO,IAAI,EAAE,EAAE,CAAC;oBACtC,KAAK,MAAM,OAAO,IAAI,MAAM,EAAE,QAAQ,IAAI,EAAE,EAAE,CAAC;wBAC7C,IAAI,CAAC,OAAO,EAAE,OAAO,IAAI,EAAE,CAAC,CAAC,QAAQ,CAAC,iCAAiC,CAAC,EAAE,CAAC;4BACzE,MAAM,YAAY,GAAG,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;4BACzD,IAAI,YAAY,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gCAC9B,OAAO,GAAG,YAAY,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,oBAAoB,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;4BAClE,CAAC;4BACD,MAAM;wBACR,CAAC;wBACD,IAAI,OAAO,KAAK,EAAE,EAAE,CAAC;4BACnB,MAAM;wBACR,CAAC;oBACH,CAAC;gBACH,CAAC;gBACD,WAAW,CAAC,aAAa,GAAG,EAAE,CAAC,aAAa,CAAC;gBAC7C,WAAW,CAAC,aAAa,GAAG,CAAC,EAAE,CAAC,aAAa,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,aAAa,EAAE,EAAE,CAAC,CAAC;gBAChF,WAAW,CAAC,aAAa,GAAG,CAAC,EAAE,CAAC,aAAa,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,aAAa,EAAE,EAAE,CAAC,CAAC;gBAChF,WAAW,CAAC,MAAM,GAAG,iBAAiB,CAAC,EAAE,CAAC,MAAM,IAAI,CAAC,CAAC,CAAA;gBACtD,WAAW,CAAC,WAAW,GAAG,sBAAsB,CAAC,EAAE,CAAC,WAAW,IAAI,CAAC,CAAC,CAAC;gBACtE,WAAW,CAAC,KAAK,GAAG,EAAE,CAAC,KAAK,CAAC;gBAC7B,WAAW,CAAC,WAAW,GAAG,EAAE,CAAC,WAAW,CAAC;gBACzC,WAAW,CAAC,OAAO,GAAG,OAAO,CAAC;gBAC9B,WAAW,CAAC,QAAQ,GAAG,EAAE,CAAC,QAAQ,EAAE,UAAU,IAAI,EAAE,CAAC,QAAQ,EAAE,WAAW,CAAC;gBAC3E,WAAW,CAAC,UAAU,GAAG,EAAE,CAAC,UAAU,CAAC;gBACvC,WAAW,CAAC,SAAS,GAAG,EAAE,CAAC,SAAS,EAAE,UAAU,IAAI,EAAE,CAAC,SAAS,EAAE,WAAW,CAAC;gBAC9E,WAAW,CAAC,YAAY,GAAG,EAAE,CAAC,YAAY,CAAC;gBAC3C,WAAW,CAAC,SAAS,GAAG,CAAC,EAAE,CAAC,SAAS,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE,CAAC,QAAQ,CAAC,UAAU,IAAI,QAAQ,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;gBACpH,OAAO,WAAW,CAAC;YACrB,CAAC,CAAC,CAAC;YACH,OAAO,qBAAqB,CAAC;QAC/B,CAAC;QACD,OAAO,wBAAwB,CAAC;IAClC,CAAC;IACM,KAAK,CAAC,0BAA0B,CAAC,SAAiB;QACvD,IAAI,iBAAiB,GAAkB,IAAI,CAAC;QAC5C,oBAAoB;QACpB,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,SAAS,EAAE,CAAC;QACpD,MAAM,YAAY,GAAG,OAAO,CAAC,GAAG,CAAC,mBAAmB,IAAI,IAAI,CAAC;QAC7D,IAAI,YAAY,IAAI,IAAI,EAAE,CAAC;YACzB,KAAK,CAAC,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,qCAAqC,CAAC,CAAC,CAAC;YACxE,OAAO,IAAI,CAAC;QACd,CAAC;QACD,MAAM,0BAA0B,GAAG,MAAM,WAAW,CAAC,eAAe,CAAC,YAAY,EAAE;YACjF,aAAa,EAAE,cAAc,SAAS,EAAE;YACxC,MAAM,EAAE,iBAAiB,CAAC,SAAS;SACpC,CAAC,CAAC;QACH,MAAM,+BAA+B,GAAG,0BAA0B,CAAC,MAAM,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,WAAW,KAAK,sBAAsB,CAAC,SAAS,CAAC,CAAC;QACvI,IAAI,+BAA+B,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC/C,MAAM,iBAAiB,GAAG,+BAA+B,CAAC,CAAC,CAAC,CAAC;YAC7D,MAAM,mBAAmB,GAAG,iBAAiB,CAAC,aAAa,CAAC;YAC5D,iBAAiB,GAAG,MAAM,IAAI,CAAC,8BAA8B,CAC3D,WAAW,EACX,YAAY,EACZ,mBAAmB,IAAI,CAAC,EACxB,iBAAiB,EACjB,iBAAiB,CAClB,CAAC;QACJ,CAAC;QACD,OAAO,iBAAiB,CAAC;IAC3B,CAAC;IAEM,KAAK,CAAC,+BAA+B;QAC1C,MAAM,eAAe,GAAG,MAAM,IAAI,CAAC,kBAAkB,EAAE,CAAC;QACxD,IAAI,eAAe,EAAE,CAAC;YACpB,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,SAAS,EAAE,CAAC;YACpD,MAAM,YAAY,GAAG,OAAO,CAAC,GAAG,CAAC,mBAAmB,IAAI,IAAI,CAAC;YAC7D,IAAI,YAAY,IAAI,IAAI,EAAE,CAAC;gBACzB,KAAK,CAAC,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,qCAAqC,CAAC,CAAC,CAAC;gBACxE,OAAO,IAAI,CAAC;YACd,CAAC;YACD,OAAO,MAAM,IAAI,CAAC,8BAA8B,CAAC,WAAW,EAAE,YAAY,EAAE,eAAe,CAAC,QAAQ,IAAI,CAAC,EAAE,IAAI,EAAE,eAAe,CAAC,CAAC;QACpI,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IACO,KAAK,CAAC,8BAA8B,CAC1C,WAAgB,EAChB,YAAoB,EACpB,mBAA2B,EAC3B,iBAAgC,EAChC,iBAAsB;QAEtB,MAAM,eAAe,GAAG,MAAM,WAAW,CAAC,UAAU,CAAC,YAAY,EAAE,mBAAmB,CAAC,CAAC;QACxF,KAAK,MAAM,cAAc,IAAI,eAAe,EAAE,CAAC;YAC7C,IAAI,cAAc,CAAC,SAAS,EAAE,CAAC;gBAC7B,SAAS;YACX,CAAC;YACD,KAAK,MAAM,OAAO,IAAI,cAAc,EAAE,QAAQ,IAAI,EAAE,EAAE,CAAC;gBACrD,IAAI,CAAC,OAAO,EAAE,OAAO,IAAI,EAAE,CAAC,CAAC,QAAQ,CAAC,iCAAiC,CAAC,EAAE,CAAC;oBACzE,MAAM,OAAO,GAAG,2CAA2C,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;oBAClF,IAAI,OAAO,EAAE,CAAC;wBACZ,iBAAiB,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;wBAC/B,KAAK,CAAC,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,uBAAuB,iBAAiB,WAAW,mBAAmB,IAAI,iBAAiB,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;wBAClI,MAAM;oBACR,CAAC;gBACH,CAAC;YACH,CAAC;YACD,IAAI,iBAAiB,EAAE,CAAC;gBACtB,MAAM;YACR,CAAC;QACH,CAAC;QACD,OAAO,iBAAiB,CAAC;IAC3B,CAAC;IAED,oCAAoC;IAC7B,KAAK,CAAC,sBAAsB,CAAC,SAAoC;QACtE,mBAAmB;QACnB,MAAM,YAAY,GAAG,OAAO,CAAC,GAAG,CAAC,mBAAmB,IAAI,IAAI,CAAC;QAC7D,MAAM,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC,cAAc,IAAI,IAAI,CAAC;QACnD,MAAM,KAAK,GAAG,OAAO,CAAC,GAAG,CAAC,aAAa,IAAI,IAAI,CAAC;QAChD,MAAM,gBAAgB,GAAG,OAAO,CAAC,GAAG,CAAC,gCAAgC,IAAI,IAAI,CAAC;QAC9E,IAAI,YAAY,IAAI,IAAI,IAAI,gBAAgB,IAAI,IAAI,EAAE,CAAC;YACrD,KAAK,CAAC,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,uEAAuE,CAAC,CAAC,CAAC;YACpG,KAAK,CACH,SAAS,EACT,IAAI,EACJ,CAAC,CAAC,MAAM,CAAC;EACf,IAAI,CAAC,0BAA0B,EAAE;OAC5B,CAAC,CACD,CAAC;YACF,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,cAAc,EAAE,EAAE,IAAI,EAAE,yBAAyB,EAAE,EAAE,CAAC;QAChF,CAAC;QACD,MAAM,aAAa,GAAG,MAAM,CAAC,gBAAgB,CAAC,CAAC;QAC/C,MAAM,YAAY,GAAG,OAAO,CAAC,GAAG,CAAC,uBAAuB,CAAC;QACzD,MAAM,oBAAoB,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,oBAAoB,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;QAC3F,MAAM,kBAAkB,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,kBAAkB,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;QACvF,MAAM,aAAa,GAAG,GAAG,oBAAoB,GAAG,kBAAkB,CAAC,kBAAkB,CAAC,2BAA2B,OAAO,gBAAgB,KAAK,EAAE,CAAC;QAChJ,uBAAuB;QACvB,MAAM,UAAU,GAAG,SAAS,CAAC,UAAU,GAAG,GAAG,GAAG,YAAY,GAAG,GAAG,GAAG,aAAa,CAAC;QACnF,IAAI,WAAW,GAAG,KAAK,SAAS,CAAC,KAAK,IAAI,EAAE;;EAE9C,SAAS,CAAC,OAAO;;;;4BAIS,SAAS,CAAC,YAAY,eAAe,YAAY,KAAK,aAAa;+BAChE,UAAU;CACxC,CAAC;QACE,+BAA+B;QAC/B,IAAI,UAAU,CAAC,uBAAuB,EAAE,CAAC;YACvC,WAAW,IAAI,oCAAoC,UAAU,CAAC,uBAAuB,MAAM,CAAC;QAC9F,CAAC;QACD,sCAAsC;QACtC,WAAW,GAAG,MAAM,IAAI,CAAC,+BAA+B,CAAC,WAAW,EAAE,SAAS,CAAC,UAAU,IAAI,EAAE,CAAC,CAAC;QAClG,oBAAoB;QACpB,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,SAAS,EAAE,CAAC;QACpD,iDAAiD;QACjD,KAAK,CAAC,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,wDAAwD,CAAC,CAAC,CAAC;QACrF,MAAM,eAAe,GAAG,MAAM,WAAW,CAAC,UAAU,CAAC,YAAY,EAAE,aAAa,CAAC,CAAC;QAClF,IAAI,gBAAgB,GAAkB,IAAI,CAAC;QAC3C,IAAI,qBAAqB,GAAuC,IAAI,CAAC;QACrE,IAAI,uBAAuB,GAA8B,IAAI,CAAC;QAC9D,KAAK,MAAM,cAAc,IAAI,eAAe,EAAE,CAAC;YAC7C,IAAI,cAAc,CAAC,SAAS,EAAE,CAAC;gBAC7B,SAAS;YACX,CAAC;YACD,KAAK,MAAM,OAAO,IAAI,cAAc,EAAE,QAAQ,IAAI,EAAE,EAAE,CAAC;gBACrD,IAAI,CAAC,OAAO,EAAE,OAAO,IAAI,EAAE,CAAC,CAAC,QAAQ,CAAC,gCAAgC,UAAU,MAAM,CAAC,EAAE,CAAC;oBACxF,qBAAqB,GAAG,cAAc,CAAC;oBACvC,uBAAuB,GAAG,CAAC,cAAc,CAAC,QAAQ,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;oBAChE,gBAAgB,GAAG,cAAc,CAAC,EAAE,IAAI,IAAI,CAAC;oBAC7C,MAAM;gBACR,CAAC;YACH,CAAC;YACD,IAAI,gBAAgB,EAAE,CAAC;gBACrB,MAAM;YACR,CAAC;QACH,CAAC;QAED,2BAA2B;QAC3B,IAAI,gBAAgB,EAAE,CAAC;YACrB,0BAA0B;YAC1B,KAAK,CAAC,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,8EAA8E,CAAC,CAAC,CAAC;YAC3G,MAAM,WAAW,CAAC,aAAa,CAAC,YAAY,EAAE,aAAa,EAAE,gBAAgB,EAAE,uBAAuB,IAAI,CAAC,CAAC,CAAC;YAC7G,qBAAqB,GAAG,MAAM,WAAW,CAAC,oBAAoB,CAAC,YAAY,EAAE,aAAa,EAAE,gBAAgB,CAAC,CAAC;YAC9G,yBAAyB;YACzB,qBAAqB,GAAG;gBACtB,EAAE,EAAE,qBAAqB,CAAC,EAAE;gBAC5B,MAAM,EAAE,mBAAmB,CAAC,MAAM;aACnC,CAAC;YACF,MAAM,WAAW,CAAC,YAAY,CAAC,qBAAqB,EAAE,YAAY,EAAE,aAAa,EAAE,gBAAgB,CAAC,CAAC;QACvG,CAAC;QAED,oBAAoB;QACpB,KAAK,CAAC,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,4DAA4D,CAAC,CAAC,CAAC;QACzF,MAAM,gBAAgB,GAAgC;YACpD,QAAQ,EAAE,CAAC,EAAE,OAAO,EAAE,WAAW,EAAE,CAAC;YACpC,MAAM,EAAE,IAAI,CAAC,oCAAoC,CAAC,SAAS,CAAC;SAC7D,CAAC;QACF,MAAM,qBAAqB,GAAG,MAAM,WAAW,CAAC,YAAY,CAAC,gBAAgB,EAAE,YAAY,EAAE,aAAa,CAAC,CAAC;QAC5G,MAAM,QAAQ,GAA6B;YACzC,MAAM,EAAE,CAAC,qBAAqB,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC;YAC5C,cAAc,EAAE,qBAAqB;SACtC,CAAC;QACF,KAAK,CAAC,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,kDAAkD,qBAAqB,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC;QACzG,OAAO,QAAQ,CAAC;IAClB,CAAC;IAED,6DAA6D;IACrD,oCAAoC,CAAC,SAAoC;QAC/E,OAAO,SAAS,CAAC,MAAM,KAAK,OAAO;YACjC,CAAC,CAAC,mBAAmB,CAAC,KAAK;YAC3B,CAAC,CAAC,SAAS,CAAC,MAAM,KAAK,SAAS;gBAC9B,CAAC,CAAC,mBAAmB,CAAC,MAAM;gBAC5B,CAAC,CAAC,mBAAmB,CAAC,OAAO,CAAC;IACpC,CAAC;IAEO,uBAAuB,CAAC,MAAsB;QACpD,MAAM,MAAM,GAA0B;YACpC,QAAQ,EAAE,MAAM,CAAC,aAAa,IAAI,CAAC;YACnC,KAAK,EAAE,MAAM,CAAC,MAAM,CAAC,aAAa,IAAI,CAAC,CAAC;YACxC,YAAY,EAAE,CAAC,MAAM,CAAC,aAAa,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,aAAa,EAAE,EAAE,CAAC;YACrE,YAAY,EAAE,CAAC,MAAM,CAAC,aAAa,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,aAAa,EAAE,EAAE,CAAC;YACrE,KAAK,EAAE,MAAM,CAAC,KAAK,IAAI,EAAE;YACzB,WAAW,EAAE,MAAM,CAAC,WAAW,IAAI,EAAE;YACrC,MAAM,EAAE,GAAG,OAAO,CAAC,GAAG,CAAC,oBAAoB,GAAG,kBAAkB,CAAC,OAAO,CAAC,GAAG,CAAC,kBAAkB,IAAI,EAAE,CAAC,SAAS,kBAAkB,CAC/H,OAAO,CAAC,GAAG,CAAC,oBAAoB,IAAI,EAAE,CACvC,gBAAgB,MAAM,CAAC,aAAa,EAAE;YACvC,UAAU,EAAE,MAAM,EAAE,SAAS,EAAE,WAAW,IAAI,EAAE;YAChD,YAAY,EAAE,MAAM;YACpB,eAAe,EAAE,EAAE;SACpB,CAAC;QACF,OAAO,IAAI,CAAC,2BAA2B,CAAC,MAAM,CAAC,CAAC;IAClD,CAAC;IAEO,0BAA0B;QAChC,OAAO;;;;;;;;;;;;;;;;;;;qCAmB0B,CAAC;IACpC,CAAC;IAED,iFAAiF;IAC1E,KAAK,CAAC,yBAAyB,CAAC,SAAoC;QACzE,IAAI,QAAQ,GAAoC,IAAI,CAAC;QACrD,IAAI,CAAC;YACH,QAAQ,GAAG,MAAM,IAAI,CAAC,sBAAsB,CAAC,SAAS,CAAC,CAAC;QAC1D,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,KAAK,CAAC,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,mEAAoE,CAAW,CAAC,OAAO,KAAM,CAAW,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;YACnJ,QAAQ,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,cAAc,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE,CAAC;QAC7D,CAAC;QACD,OAAO,QAAQ,CAAC;IAClB,CAAC;IAEM,MAAM,CAAC,iBAAiB,CAAC,SAAiB;QAK/C,IAAI,aAAqB,CAAC;QAC1B,IAAI,YAAoB,CAAC;QACzB,IAAI,WAAmB,CAAC;QAExB,IAAI,SAAS,CAAC,UAAU,CAAC,UAAU,CAAC,EAAE,CAAC;YACrC,4DAA4D;YAC5D,MAAM,aAAa,GAAG,uEAAuE,CAAC;YAC9F,MAAM,aAAa,GAAG,SAAS,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC;YACrD,IAAI,aAAa,EAAE,CAAC;gBAClB,MAAM,YAAY,GAAG,aAAa,CAAC,CAAC,CAAC,CAAC;gBACtC,WAAW,GAAG,kBAAkB,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,kCAAkC;gBACtF,YAAY,GAAG,kBAAkB,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,qCAAqC;gBAC1F,aAAa,GAAG,yBAAyB,YAAY,GAAG,CAAC;gBACzD,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,YAAY,EAAE,CAAC;YACtD,CAAC;YAED,sCAAsC;YACtC,0EAA0E;YAC1E,MAAM,OAAO,GAAG,0EAA0E,CAAC;YAC3F,MAAM,OAAO,GAAG,SAAS,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;YACzC,IAAI,OAAO,EAAE,CAAC;gBACZ,MAAM,YAAY,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;gBAChC,WAAW,GAAG,kBAAkB,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,kCAAkC;gBAChF,YAAY,GAAG,kBAAkB,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,qCAAqC;gBACpF,aAAa,GAAG,WAAW,YAAY,oBAAoB,CAAC;gBAC5D,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,YAAY,EAAE,CAAC;YACtD,CAAC;QACH,CAAC;aAAM,IAAI,SAAS,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,CAAC;YACxC,wBAAwB;YACxB,kBAAkB;YAClB,MAAM,QAAQ,GAAG,wDAAwD,CAAC;YAC1E,MAAM,KAAK,GAAG,SAAS,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;YACxC,IAAI,KAAK,EAAE,CAAC;gBACV,MAAM,YAAY,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;gBAC9B,WAAW,GAAG,kBAAkB,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,kCAAkC;gBAC9E,YAAY,GAAG,kBAAkB,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,qCAAqC;gBAClF,aAAa,GAAG,yBAAyB,YAAY,GAAG,CAAC;gBACzD,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,YAAY,EAAE,CAAC;YACtD,CAAC;YACD,sBAAsB;QACxB,CAAC;QAED,yDAAyD;QACzD,OAAO,IAAI,CAAC;IACd,CAAC;IAEM,KAAK,CAAC,WAAW,CAAC,cAAsB;QAC7C,IAAI,CAAC;YACH,mCAAmC;YACnC,MAAM,SAAS,GAAG,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAC;YAChD,MAAM,YAAY,GAAG,EAAE,CAAC,gBAAgB,CAAC,cAAc,CAAC,CAAC;YACzD,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,sBAAsB,EAAE,CAAC;YAC5D,MAAM,UAAU,GAAG,MAAM,MAAM,CAAC,gBAAgB,CAC9C,IAAI,EAAE,gCAAgC;YACtC,YAAY,EAAE,eAAe;YAC7B,SAAS,EAAE,YAAY;YACvB,QAAQ,EACR,OAAO,CAAC,GAAG,CAAC,kBAAkB,CAC/B,CAAC;YACF,IAAI,UAAU,IAAI,UAAU,CAAC,GAAG,EAAE,CAAC;gBACjC,KAAK,CAAC,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,mDAAmD,UAAU,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC;gBAChG,+BAA+B;gBAC/B,MAAM,cAAc,GAAG,MAAM,IAAI,CAAC,+BAA+B,EAAE,CAAC;gBACpE,IAAI,cAAc,EAAE,CAAC;oBACnB,MAAM,MAAM,CAAC,cAAc,CACzB,EAAE,EACF;wBACE;4BACE,EAAE,EAAE,KAAK;4BACT,IAAI,EAAE,cAAc;4BACpB,KAAK,EAAE;gCACL,GAAG,EAAE,cAAc;gCACnB,GAAG,EAAE,UAAU,CAAC,GAAG;gCACnB,UAAU,EAAE;oCACV,OAAO,EAAE,oDAAoD;iCAC9D;6BACF;yBACF;qBACF,EACD,cAAc,EACd,OAAO,CAAC,GAAG,CAAC,kBAAkB,CAC/B,CAAC;oBACF,KAAK,CAAC,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,sDAAsD,cAAc,EAAE,CAAC,CAAC,CAAC;gBACrG,CAAC;gBACD,OAAO,UAAU,CAAC,GAAG,CAAC;YACxB,CAAC;iBACI,CAAC;gBACJ,KAAK,CAAC,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,2EAA2E,IAAI,CAAC,SAAS,CAAC,UAAU,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;YACrJ,CAAC;QACH,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,KAAK,CAAC,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,mDAAmD,cAAc,KAAM,CAAW,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC;QACjI,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IAEM,KAAK,CAAC,+BAA+B;QAC1C,IAAI,IAAI,CAAC,qBAAqB,EAAE,CAAC;YAC/B,OAAO,IAAI,CAAC,qBAAqB,CAAC;QACpC,CAAC;QACD,MAAM,UAAU,GAAG,OAAO,CAAC,GAAG,CAAC,8BAA8B,CAAC;QAC9D,IAAI,UAAU,EAAE,CAAC;YACf,IAAI,CAAC,qBAAqB,GAAG,MAAM,CAAC,UAAU,CAAC,CAAC;YAChD,OAAO,IAAI,CAAC,qBAAqB,CAAC;QACpC,CAAC;QACD,4BAA4B;QAC5B,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,sBAAsB,EAAE,CAAC;QAC5D,MAAM,IAAI,GAAG;YACX,KAAK,EAAE;;;kCAGqB,IAAI,CAAC,wBAAwB;wCACvB,OAAO,CAAC,GAAG,CAAC,kBAAkB;OAC/D;SACF,CAAC;QACF,MAAM,WAAW,GAAG,MAAM,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;QACnD,MAAM,WAAW,GAAG,CAAC,WAAW,CAAC,SAAS,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QACvE,IAAI,WAAW,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC3B,IAAI,CAAC,qBAAqB,GAAG,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC;YACpD,qIAAqI;YACrI,MAAM,QAAQ,GAAG,MAAM,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,qBAAqB,EAAE,SAAS,EAAE,SAAS,EAAE,CAAC,CAAC,CAAC,CAAC,+BAA+B;YAC/H,MAAM,cAAc,GAAG,CAAC,QAAQ,CAAC,SAAS,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,GAAG,KAAK,cAAc,CAAC,CAAC;YAC5F,IAAI,cAAc,CAAC,MAAM,IAAI,EAAE,EAAE,CAAC;gBAChC,uBAAuB;gBACvB,MAAM,QAAQ,GAAG,IAAI,CAAC,wBAAwB,GAAG,SAAS,CAAC;gBAC3D,MAAM,MAAM,CAAC,cAAc,CACzB,EAAE,EACF;oBACE;wBACE,EAAE,EAAE,SAAS;wBACb,IAAI,EAAE,sBAAsB;wBAC5B,KAAK,EAAE,QAAQ;qBAChB;iBACF,EACD,IAAI,CAAC,qBAAqB,EAC1B,OAAO,CAAC,GAAG,CAAC,kBAAkB,CAC/B,CAAC;gBACF,KAAK,CAAC,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,yCAAyC,IAAI,CAAC,qBAAqB,QAAQ,QAAQ,GAAG,CAAC,CAAC,CAAC;gBAEnH,6DAA6D;gBAC7D,MAAM,WAAW,GAAG,MAAM,MAAM,CAAC,cAAc,CAC7C,EAAE,EACF;oBACE;wBACE,EAAE,EAAE,KAAK;wBACT,IAAI,EAAE,sBAAsB;wBAC5B,KAAK,EAAE,IAAI,CAAC,wBAAwB;qBACrC;oBACD;wBACE,EAAE,EAAE,KAAK;wBACT,IAAI,EAAE,6BAA6B;wBACnC,KAAK,EAAE,QAAQ,CAAC,MAAM,EAAE,CAAC,qBAAqB,CAAC,IAAI,MAAM;qBAC1D;oBACD;wBACE,EAAE,EAAE,KAAK;wBACT,IAAI,EAAE,4BAA4B;wBAClC,KAAK,EAAE,0EAA0E;qBAClF;iBACF,EACD,OAAO,CAAC,GAAG,CAAC,kBAAmB,EAC/B,QAAQ,CAAC,MAAM,EAAE,CAAC,qBAAqB,CAAC,IAAI,MAAM,CACnD,CAAC;gBAEF,IAAI,WAAW,IAAI,WAAW,CAAC,EAAE,EAAE,CAAC;oBAClC,IAAI,CAAC,qBAAqB,GAAG,WAAW,CAAC,EAAE,CAAC;oBAC5C,KAAK,CAAC,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,uDAAuD,IAAI,CAAC,qBAAqB,KAAK,IAAI,CAAC,wBAAwB,qDAAqD,CAAC,CAAC,CAAC;gBACvM,CAAC;YACH,CAAC;iBAAM,CAAC;gBACN,KAAK,CAAC,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,0DAA0D,IAAI,CAAC,qBAAqB,KAAK,IAAI,CAAC,wBAAwB,iCAAiC,CAAC,CAAC,CAAC;YACtL,CAAC;YACD,OAAO,IAAI,CAAC,qBAAqB,CAAC;QACpC,CAAC;QAED,uCAAuC;QACvC,KAAK,CAAC,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,gEAAgE,IAAI,CAAC,wBAAwB,yEAAyE,CAAC,CAAC,CAAC;QACnM,IAAI,CAAC;YACH,MAAM,WAAW,GAAG,MAAM,MAAM,CAAC,cAAc,CAC7C,EAAE,EACF;gBACE;oBACE,EAAE,EAAE,KAAK;oBACT,IAAI,EAAE,sBAAsB;oBAC5B,KAAK,EAAE,IAAI,CAAC,wBAAwB;iBACrC;gBACD;oBACE,EAAE,EAAE,KAAK;oBACT,IAAI,EAAE,6BAA6B;oBACnC,KAAK,EAAE,MAAM;iBACd;gBACD;oBACE,EAAE,EAAE,KAAK;oBACT,IAAI,EAAE,4BAA4B;oBAClC,KAAK,EAAE,yKAAyK;iBACjL;aACF,EACD,OAAO,CAAC,GAAG,CAAC,kBAAmB,EAC/B,MAAM,CACP,CAAC;YAEF,IAAI,WAAW,IAAI,WAAW,CAAC,EAAE,EAAE,CAAC;gBAClC,IAAI,CAAC,qBAAqB,GAAG,WAAW,CAAC,EAAE,CAAC;gBAC5C,KAAK,CAAC,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,gEAAgE,IAAI,CAAC,qBAAqB,KAAK,IAAI,CAAC,wBAAwB,8CAA8C,CAAC,CAAC,CAAC;gBACvM,OAAO,IAAI,CAAC,qBAAqB,CAAC;YACpC,CAAC;QACH,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,KAAK,CAAC,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,yGAA0G,CAAW,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC;YAClK,KAAK,CAAC,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,6FAA6F,IAAI,CAAC,wBAAwB,iBAAiB,OAAO,CAAC,GAAG,CAAC,kBAAkB,kGAAkG,CAAC,CAAC,CAAC;YAC9S,KAAK,CAAC,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,qHAAqH,CAAC,CAAC,CAAC;QAC1J,CAAC;QAED,KAAK,CAAC,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,4JAA4J,CAAC,CAAC,CAAC;QAC7L,OAAO,IAAI,CAAC;IACd,CAAC;CACF"}
|
|
1
|
+
{"version":3,"file":"azureDevops.js","sourceRoot":"","sources":["../../../src/common/gitProvider/azureDevops.ts"],"names":[],"mappings":"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"}
|
|
@@ -13,6 +13,7 @@ export declare class BitbucketProvider extends GitProviderRoot {
|
|
|
13
13
|
getBranchDeploymentCheckId(gitBranch: string): Promise<string | null>;
|
|
14
14
|
getPullRequestDeploymentCheckId(): Promise<string | null>;
|
|
15
15
|
private getDeploymentIdFromPullRequest;
|
|
16
|
+
listPullRequestsInBranchSinceLastMerge(currentBranchName: string, targetBranchName: string, childBranchesNames: string[]): Promise<CommonPullRequestInfo[]>;
|
|
16
17
|
postPullRequestMessage(prMessage: PullRequestMessageRequest): Promise<PullRequestMessageResult>;
|
|
17
18
|
private completePullRequestInfo;
|
|
18
19
|
uploadImage(localImagePath: string): Promise<string | null>;
|
|
@@ -141,8 +141,87 @@ export class BitbucketProvider extends GitProviderRoot {
|
|
|
141
141
|
}
|
|
142
142
|
return deploymentCheckId;
|
|
143
143
|
}
|
|
144
|
+
async listPullRequestsInBranchSinceLastMerge(currentBranchName, targetBranchName, childBranchesNames) {
|
|
145
|
+
if (!this.bitbucket || !process.env.BITBUCKET_WORKSPACE || !process.env.BITBUCKET_REPO_SLUG) {
|
|
146
|
+
return [];
|
|
147
|
+
}
|
|
148
|
+
try {
|
|
149
|
+
const workspace = process.env.BITBUCKET_WORKSPACE;
|
|
150
|
+
const repoSlug = process.env.BITBUCKET_REPO_SLUG;
|
|
151
|
+
// Step 1: Find the last merged PR from currentBranch to targetBranch
|
|
152
|
+
const lastMergeResponse = await this.bitbucket.pullrequests.list({
|
|
153
|
+
workspace,
|
|
154
|
+
repo_slug: repoSlug,
|
|
155
|
+
q: `source.branch.name = "${currentBranchName}" AND destination.branch.name = "${targetBranchName}" AND state = "MERGED"`,
|
|
156
|
+
});
|
|
157
|
+
const lastMergePRs = lastMergeResponse &&
|
|
158
|
+
lastMergeResponse.data &&
|
|
159
|
+
lastMergeResponse.data.values
|
|
160
|
+
? lastMergeResponse.data.values
|
|
161
|
+
: [];
|
|
162
|
+
const lastMergeToTarget = lastMergePRs.length > 0 ? lastMergePRs[0] : null;
|
|
163
|
+
// Step 2: Get commits between branches
|
|
164
|
+
const commitsResponse = await this.bitbucket.commits.list({
|
|
165
|
+
workspace,
|
|
166
|
+
repo_slug: repoSlug,
|
|
167
|
+
include: currentBranchName,
|
|
168
|
+
exclude: lastMergeToTarget
|
|
169
|
+
? lastMergeToTarget.merge_commit?.hash
|
|
170
|
+
: targetBranchName,
|
|
171
|
+
});
|
|
172
|
+
const commits = commitsResponse &&
|
|
173
|
+
commitsResponse.data &&
|
|
174
|
+
commitsResponse.data.values
|
|
175
|
+
? commitsResponse.data.values
|
|
176
|
+
: [];
|
|
177
|
+
if (commits.length === 0) {
|
|
178
|
+
return [];
|
|
179
|
+
}
|
|
180
|
+
const commitHashes = new Set(commits.map((c) => c.hash));
|
|
181
|
+
// Step 3: Get all merged PRs targeting currentBranch and child branches (parallelized)
|
|
182
|
+
const allBranches = [currentBranchName, ...childBranchesNames];
|
|
183
|
+
const prPromises = allBranches.map(async (branchName) => {
|
|
184
|
+
try {
|
|
185
|
+
const response = await this.bitbucket.pullrequests.list({
|
|
186
|
+
workspace,
|
|
187
|
+
repo_slug: repoSlug,
|
|
188
|
+
q: `destination.branch.name = "${branchName}" AND state = "MERGED"`,
|
|
189
|
+
});
|
|
190
|
+
const values = response && response.data && response.data.values
|
|
191
|
+
? response.data.values
|
|
192
|
+
: [];
|
|
193
|
+
return values;
|
|
194
|
+
}
|
|
195
|
+
catch (err) {
|
|
196
|
+
uxLog("warning", this, c.yellow(`Error fetching merged PRs for branch ${branchName}: ${String(err)}`));
|
|
197
|
+
return [];
|
|
198
|
+
}
|
|
199
|
+
});
|
|
200
|
+
const prResults = await Promise.all(prPromises);
|
|
201
|
+
const allMergedPRs = prResults.flat();
|
|
202
|
+
// Step 4: Filter PRs whose merge commit is in our commit list
|
|
203
|
+
const relevantPRs = allMergedPRs.filter((pr) => {
|
|
204
|
+
const mergeCommitHash = pr.merge_commit?.hash;
|
|
205
|
+
return mergeCommitHash && commitHashes.has(mergeCommitHash);
|
|
206
|
+
});
|
|
207
|
+
// Step 5: Remove duplicates
|
|
208
|
+
const uniquePRsMap = new Map();
|
|
209
|
+
for (const pr of relevantPRs) {
|
|
210
|
+
if (!uniquePRsMap.has(pr.id)) {
|
|
211
|
+
uniquePRsMap.set(pr.id, pr);
|
|
212
|
+
}
|
|
213
|
+
}
|
|
214
|
+
// Step 6: Convert to CommonPullRequestInfo
|
|
215
|
+
return Array.from(uniquePRsMap.values()).map((pr) => this.completePullRequestInfo(pr));
|
|
216
|
+
}
|
|
217
|
+
catch (err) {
|
|
218
|
+
uxLog("warning", this, c.yellow(`Error in listPullRequestsInBranchSinceLastMerge: ${String(err)}`));
|
|
219
|
+
return [];
|
|
220
|
+
}
|
|
221
|
+
}
|
|
144
222
|
async postPullRequestMessage(prMessage) {
|
|
145
|
-
const
|
|
223
|
+
const prInfo = await this.getPullRequestInfo();
|
|
224
|
+
const pullRequestIdStr = process.env.BITBUCKET_PR_ID || prInfo?.idStr || null;
|
|
146
225
|
const repoSlug = process.env.BITBUCKET_REPO_SLUG || null;
|
|
147
226
|
const workspace = process.env.BITBUCKET_WORKSPACE || null;
|
|
148
227
|
if (repoSlug == null || pullRequestIdStr == null) {
|
|
@@ -153,7 +232,7 @@ export class BitbucketProvider extends GitProviderRoot {
|
|
|
153
232
|
const bitbucketBuildNumber = process.env.BITBUCKET_BUILD_NUMBER || null;
|
|
154
233
|
const bitbucketJobUrl = await this.getCurrentJobUrl();
|
|
155
234
|
const messageKey = `${prMessage.messageKey}-${pullRequestId}`;
|
|
156
|
-
let messageBody =
|
|
235
|
+
let messageBody = `## ${prMessage.title || ''}
|
|
157
236
|
|
|
158
237
|
${prMessage.message}
|
|
159
238
|
|