sfdx-hardis 5.45.0 → 5.45.1-beta202508100142.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 +8 -0
- package/lib/commands/hardis/auth/login.js +20 -6
- package/lib/commands/hardis/auth/login.js.map +1 -1
- package/lib/commands/hardis/cache/clear.d.ts +4 -1
- package/lib/commands/hardis/cache/clear.js +20 -2
- package/lib/commands/hardis/cache/clear.js.map +1 -1
- package/lib/commands/hardis/config/get.js +20 -1
- package/lib/commands/hardis/config/get.js.map +1 -1
- package/lib/commands/hardis/doc/extract/permsetgroups.js +25 -1
- package/lib/commands/hardis/doc/extract/permsetgroups.js.map +1 -1
- package/lib/commands/hardis/doc/fieldusage.js +21 -3
- package/lib/commands/hardis/doc/fieldusage.js.map +1 -1
- package/lib/commands/hardis/doc/flow2markdown.js +31 -4
- package/lib/commands/hardis/doc/flow2markdown.js.map +1 -1
- package/lib/commands/hardis/doc/mkdocs-to-cf.js +48 -28
- package/lib/commands/hardis/doc/mkdocs-to-cf.js.map +1 -1
- package/lib/commands/hardis/doc/mkdocs-to-salesforce.js +40 -17
- package/lib/commands/hardis/doc/mkdocs-to-salesforce.js.map +1 -1
- package/lib/commands/hardis/doc/override-prompts.js +43 -38
- package/lib/commands/hardis/doc/override-prompts.js.map +1 -1
- package/lib/commands/hardis/doc/packagexml2markdown.js +27 -1
- package/lib/commands/hardis/doc/packagexml2markdown.js.map +1 -1
- package/lib/commands/hardis/doc/plugin/generate.js +35 -7
- package/lib/commands/hardis/doc/plugin/generate.js.map +1 -1
- package/lib/commands/hardis/doc/project2markdown.js +11 -2
- package/lib/commands/hardis/doc/project2markdown.js.map +1 -1
- package/lib/commands/hardis/git/pull-requests/extract.js +27 -1
- package/lib/commands/hardis/git/pull-requests/extract.js.map +1 -1
- package/lib/commands/hardis/lint/access.js +37 -6
- package/lib/commands/hardis/lint/access.js.map +1 -1
- package/lib/commands/hardis/lint/metadatastatus.js +29 -10
- package/lib/commands/hardis/lint/metadatastatus.js.map +1 -1
- package/lib/commands/hardis/lint/missingattributes.js +25 -1
- package/lib/commands/hardis/lint/missingattributes.js.map +1 -1
- package/lib/commands/hardis/lint/unusedmetadatas.js +104 -49
- package/lib/commands/hardis/lint/unusedmetadatas.js.map +1 -1
- package/lib/commands/hardis/mdapi/deploy.d.ts +1 -1
- package/lib/commands/hardis/mdapi/deploy.js +24 -2
- package/lib/commands/hardis/mdapi/deploy.js.map +1 -1
- package/lib/commands/hardis/misc/custom-label-translations.js +38 -1
- package/lib/commands/hardis/misc/custom-label-translations.js.map +1 -1
- package/lib/commands/hardis/misc/purge-references.js +33 -3
- package/lib/commands/hardis/misc/purge-references.js.map +1 -1
- package/lib/commands/hardis/misc/servicenow-report.js +4 -0
- package/lib/commands/hardis/misc/servicenow-report.js.map +1 -1
- package/lib/commands/hardis/misc/toml2csv.js +39 -1
- package/lib/commands/hardis/misc/toml2csv.js.map +1 -1
- package/lib/commands/hardis/org/community/update.d.ts +1 -1
- package/lib/commands/hardis/org/community/update.js +28 -1
- package/lib/commands/hardis/org/community/update.js.map +1 -1
- package/lib/commands/hardis/org/configure/data.js +45 -10
- package/lib/commands/hardis/org/configure/data.js.map +1 -1
- package/lib/commands/hardis/org/configure/files.js +30 -2
- package/lib/commands/hardis/org/configure/files.js.map +1 -1
- package/lib/commands/hardis/org/configure/monitoring.js +41 -7
- package/lib/commands/hardis/org/configure/monitoring.js.map +1 -1
- package/lib/commands/hardis/org/connect.js +23 -2
- package/lib/commands/hardis/org/connect.js.map +1 -1
- package/lib/commands/hardis/org/create.js +31 -2
- package/lib/commands/hardis/org/create.js.map +1 -1
- package/lib/commands/hardis/org/data/delete.js +28 -6
- package/lib/commands/hardis/org/data/delete.js.map +1 -1
- package/lib/commands/hardis/org/data/export.js +28 -2
- package/lib/commands/hardis/org/data/export.js.map +1 -1
- package/lib/commands/hardis/org/diagnose/audittrail.js +18 -16
- package/lib/commands/hardis/org/diagnose/audittrail.js.map +1 -1
- package/lib/commands/hardis/org/diagnose/instanceupgrade.js +26 -2
- package/lib/commands/hardis/org/diagnose/instanceupgrade.js.map +1 -1
- package/lib/commands/hardis/org/diagnose/legacyapi.js +1 -2
- package/lib/commands/hardis/org/diagnose/legacyapi.js.map +1 -1
- package/lib/commands/hardis/org/diagnose/licenses.js +29 -1
- package/lib/commands/hardis/org/diagnose/licenses.js.map +1 -1
- package/lib/commands/hardis/org/diagnose/unused-apex-classes.js +5 -0
- package/lib/commands/hardis/org/diagnose/unused-apex-classes.js.map +1 -1
- package/lib/commands/hardis/org/diagnose/unused-connected-apps.js +35 -7
- package/lib/commands/hardis/org/diagnose/unused-connected-apps.js.map +1 -1
- package/lib/commands/hardis/org/diagnose/unusedlicenses.js +33 -10
- package/lib/commands/hardis/org/diagnose/unusedlicenses.js.map +1 -1
- package/lib/commands/hardis/org/diagnose/unusedusers.js +28 -7
- package/lib/commands/hardis/org/diagnose/unusedusers.js.map +1 -1
- package/lib/commands/hardis/org/files/export.js +25 -5
- package/lib/commands/hardis/org/files/export.js.map +1 -1
- package/lib/commands/hardis/org/files/import.js +23 -3
- package/lib/commands/hardis/org/files/import.js.map +1 -1
- package/lib/commands/hardis/org/generate/packagexmlfull.js +33 -2
- package/lib/commands/hardis/org/generate/packagexmlfull.js.map +1 -1
- package/lib/commands/hardis/org/monitor/backup.js +4 -3
- package/lib/commands/hardis/org/monitor/backup.js.map +1 -1
- package/lib/commands/hardis/org/monitor/limits.js +27 -1
- package/lib/commands/hardis/org/monitor/limits.js.map +1 -1
- package/lib/commands/hardis/org/multi-org-query.js +28 -4
- package/lib/commands/hardis/org/multi-org-query.js.map +1 -1
- package/lib/commands/hardis/org/purge/apexlog.js +27 -1
- package/lib/commands/hardis/org/purge/apexlog.js.map +1 -1
- package/lib/commands/hardis/org/purge/flow.js +56 -13
- package/lib/commands/hardis/org/purge/flow.js.map +1 -1
- package/lib/commands/hardis/org/retrieve/packageconfig.js +29 -3
- package/lib/commands/hardis/org/retrieve/packageconfig.js.map +1 -1
- package/lib/commands/hardis/org/retrieve/sources/analytics.js +24 -1
- package/lib/commands/hardis/org/retrieve/sources/analytics.js.map +1 -1
- package/lib/commands/hardis/org/retrieve/sources/dx.js +33 -2
- package/lib/commands/hardis/org/retrieve/sources/dx.js.map +1 -1
- package/lib/commands/hardis/org/retrieve/sources/dx2.js +28 -3
- package/lib/commands/hardis/org/retrieve/sources/dx2.js.map +1 -1
- package/lib/commands/hardis/org/retrieve/sources/metadata.js +28 -1
- package/lib/commands/hardis/org/retrieve/sources/metadata.js.map +1 -1
- package/lib/commands/hardis/org/select.js +24 -1
- package/lib/commands/hardis/org/select.js.map +1 -1
- package/lib/commands/hardis/org/test/apex.js +14 -3
- package/lib/commands/hardis/org/test/apex.js.map +1 -1
- package/lib/commands/hardis/org/user/activateinvalid.js +3 -0
- package/lib/commands/hardis/org/user/activateinvalid.js.map +1 -1
- package/lib/commands/hardis/org/user/freeze.js +29 -2
- package/lib/commands/hardis/org/user/freeze.js.map +1 -1
- package/lib/commands/hardis/org/user/unfreeze.js +29 -2
- package/lib/commands/hardis/org/user/unfreeze.js.map +1 -1
- package/lib/commands/hardis/package/create.js +30 -1
- package/lib/commands/hardis/package/create.js.map +1 -1
- package/lib/commands/hardis/package/install.js +6 -0
- package/lib/commands/hardis/package/install.js.map +1 -1
- package/lib/commands/hardis/package/mergexml.js +27 -1
- package/lib/commands/hardis/package/mergexml.js.map +1 -1
- package/lib/commands/hardis/package/version/create.js +33 -2
- package/lib/commands/hardis/package/version/create.js.map +1 -1
- package/lib/commands/hardis/package/version/list.js +20 -1
- package/lib/commands/hardis/package/version/list.js.map +1 -1
- package/lib/commands/hardis/package/version/promote.js +26 -1
- package/lib/commands/hardis/package/version/promote.js.map +1 -1
- package/lib/commands/hardis/packagexml/append.d.ts +1 -1
- package/lib/commands/hardis/packagexml/append.js +23 -1
- package/lib/commands/hardis/packagexml/append.js.map +1 -1
- package/lib/commands/hardis/packagexml/remove.d.ts +1 -1
- package/lib/commands/hardis/packagexml/remove.js +24 -1
- package/lib/commands/hardis/packagexml/remove.js.map +1 -1
- package/lib/commands/hardis/project/audit/apiversion.js +35 -24
- package/lib/commands/hardis/project/audit/apiversion.js.map +1 -1
- package/lib/commands/hardis/project/audit/callincallout.js +27 -1
- package/lib/commands/hardis/project/audit/callincallout.js.map +1 -1
- package/lib/commands/hardis/project/audit/duplicatefiles.js +35 -2
- package/lib/commands/hardis/project/audit/duplicatefiles.js.map +1 -1
- package/lib/commands/hardis/project/audit/remotesites.js +25 -1
- package/lib/commands/hardis/project/audit/remotesites.js.map +1 -1
- package/lib/commands/hardis/project/clean/emptyitems.js +25 -1
- package/lib/commands/hardis/project/clean/emptyitems.js.map +1 -1
- package/lib/commands/hardis/project/clean/filter-xml-content.d.ts +1 -1
- package/lib/commands/hardis/project/clean/filter-xml-content.js +28 -5
- package/lib/commands/hardis/project/clean/filter-xml-content.js.map +1 -1
- package/lib/commands/hardis/project/clean/hiddenitems.js +25 -1
- package/lib/commands/hardis/project/clean/hiddenitems.js.map +1 -1
- package/lib/commands/hardis/project/clean/manageditems.js +24 -1
- package/lib/commands/hardis/project/clean/manageditems.js.map +1 -1
- package/lib/commands/hardis/project/clean/minimizeprofiles.js +9 -6
- package/lib/commands/hardis/project/clean/minimizeprofiles.js.map +1 -1
- package/lib/commands/hardis/project/clean/orgmissingitems.js +30 -2
- package/lib/commands/hardis/project/clean/orgmissingitems.js.map +1 -1
- package/lib/commands/hardis/project/clean/references.js +30 -3
- package/lib/commands/hardis/project/clean/references.js.map +1 -1
- package/lib/commands/hardis/project/clean/retrievefolders.js +20 -1
- package/lib/commands/hardis/project/clean/retrievefolders.js.map +1 -1
- package/lib/commands/hardis/project/clean/standarditems.js +25 -1
- package/lib/commands/hardis/project/clean/standarditems.js.map +1 -1
- package/lib/commands/hardis/project/clean/systemdebug.js +28 -1
- package/lib/commands/hardis/project/clean/systemdebug.js.map +1 -1
- package/lib/commands/hardis/project/clean/xml.js +5 -4
- package/lib/commands/hardis/project/clean/xml.js.map +1 -1
- package/lib/commands/hardis/project/configure/auth.js +74 -8
- package/lib/commands/hardis/project/configure/auth.js.map +1 -1
- package/lib/commands/hardis/project/convert/profilestopermsets.js +22 -1
- package/lib/commands/hardis/project/convert/profilestopermsets.js.map +1 -1
- package/lib/commands/hardis/project/create.js +5 -1
- package/lib/commands/hardis/project/create.js.map +1 -1
- package/lib/commands/hardis/project/deploy/simulate.js +27 -4
- package/lib/commands/hardis/project/deploy/simulate.js.map +1 -1
- package/lib/commands/hardis/project/fix/profiletabs.js +30 -1
- package/lib/commands/hardis/project/fix/profiletabs.js.map +1 -1
- package/lib/commands/hardis/project/fix/v53flexipages.js +24 -2
- package/lib/commands/hardis/project/fix/v53flexipages.js.map +1 -1
- package/lib/commands/hardis/project/generate/bypass.js +58 -14
- package/lib/commands/hardis/project/generate/bypass.js.map +1 -1
- package/lib/commands/hardis/project/generate/flow-git-diff.js +4 -0
- package/lib/commands/hardis/project/generate/flow-git-diff.js.map +1 -1
- package/lib/commands/hardis/project/generate/gitdelta.js +42 -3
- package/lib/commands/hardis/project/generate/gitdelta.js.map +1 -1
- package/lib/commands/hardis/project/lint.js +23 -1
- package/lib/commands/hardis/project/lint.js.map +1 -1
- package/lib/commands/hardis/project/metadata/findduplicates.js +19 -7
- package/lib/commands/hardis/project/metadata/findduplicates.js.map +1 -1
- package/lib/commands/hardis/scratch/create.js +3 -2
- package/lib/commands/hardis/scratch/create.js.map +1 -1
- package/lib/commands/hardis/scratch/delete.js +24 -1
- package/lib/commands/hardis/scratch/delete.js.map +1 -1
- package/lib/commands/hardis/scratch/pool/create.js +4 -0
- package/lib/commands/hardis/scratch/pool/create.js.map +1 -1
- package/lib/commands/hardis/scratch/pool/localauth.js +22 -1
- package/lib/commands/hardis/scratch/pool/localauth.js.map +1 -1
- package/lib/commands/hardis/scratch/pool/refresh.js +25 -1
- package/lib/commands/hardis/scratch/pool/refresh.js.map +1 -1
- package/lib/commands/hardis/scratch/pool/reset.js +25 -1
- package/lib/commands/hardis/scratch/pool/reset.js.map +1 -1
- package/lib/commands/hardis/scratch/pool/view.js +22 -1
- package/lib/commands/hardis/scratch/pool/view.js.map +1 -1
- package/lib/commands/hardis/scratch/pull.js +28 -9
- package/lib/commands/hardis/scratch/pull.js.map +1 -1
- package/lib/commands/hardis/scratch/push.js +17 -2
- package/lib/commands/hardis/scratch/push.js.map +1 -1
- package/lib/commands/hardis/source/retrieve.d.ts +1 -1
- package/lib/commands/hardis/source/retrieve.js +22 -4
- package/lib/commands/hardis/source/retrieve.js.map +1 -1
- package/lib/commands/hardis/work/new.js +51 -88
- package/lib/commands/hardis/work/new.js.map +1 -1
- package/lib/commands/hardis/work/refresh.js +42 -1
- package/lib/commands/hardis/work/refresh.js.map +1 -1
- package/lib/commands/hardis/work/resetselection.js +28 -3
- package/lib/commands/hardis/work/resetselection.js.map +1 -1
- package/lib/commands/hardis/work/save.js +52 -30
- package/lib/commands/hardis/work/save.js.map +1 -1
- package/lib/commands/hardis/work/ws.d.ts +3 -0
- package/lib/commands/hardis/work/ws.js +23 -3
- package/lib/commands/hardis/work/ws.js.map +1 -1
- package/lib/commands/hello/world.d.ts +1 -1
- package/lib/commands/hello/world.js +20 -1
- package/lib/commands/hello/world.js.map +1 -1
- package/lib/common/aiProvider/index.js +1 -0
- package/lib/common/aiProvider/index.js.map +1 -1
- package/lib/common/gitProvider/azureDevops.js +2 -1
- package/lib/common/gitProvider/azureDevops.js.map +1 -1
- package/lib/common/gitProvider/index.js +1 -0
- package/lib/common/gitProvider/index.js.map +1 -1
- package/lib/common/metadata-utils/index.js +12 -4
- package/lib/common/metadata-utils/index.js.map +1 -1
- package/lib/common/utils/apiUtils.js +22 -9
- package/lib/common/utils/apiUtils.js.map +1 -1
- package/lib/common/utils/authUtils.js +3 -2
- package/lib/common/utils/authUtils.js.map +1 -1
- package/lib/common/utils/dataUtils.js +1 -0
- package/lib/common/utils/dataUtils.js.map +1 -1
- package/lib/common/utils/deployUtils.js +21 -2
- package/lib/common/utils/deployUtils.js.map +1 -1
- package/lib/common/utils/filesUtils.js +33 -9
- package/lib/common/utils/filesUtils.js.map +1 -1
- package/lib/common/utils/gitUtils.js +3 -1
- package/lib/common/utils/gitUtils.js.map +1 -1
- package/lib/common/utils/index.d.ts +1 -1
- package/lib/common/utils/index.js +104 -25
- package/lib/common/utils/index.js.map +1 -1
- package/lib/common/utils/mermaidUtils.js +2 -2
- package/lib/common/utils/orgUtils.js +31 -18
- package/lib/common/utils/orgUtils.js.map +1 -1
- package/lib/common/utils/poolUtils.js +1 -0
- package/lib/common/utils/poolUtils.js.map +1 -1
- package/lib/common/utils/prompts.d.ts +2 -0
- package/lib/common/utils/prompts.js +4 -0
- package/lib/common/utils/prompts.js.map +1 -1
- package/lib/common/utils/xmlUtils.js +1 -1
- package/lib/common/websocketClient.d.ts +15 -2
- package/lib/common/websocketClient.js +149 -10
- package/lib/common/websocketClient.js.map +1 -1
- package/lib/config/index.js +4 -1
- package/lib/config/index.js.map +1 -1
- package/lib/hooks/{postrun → finally}/notify.d.ts +1 -1
- package/lib/hooks/{postrun → finally}/notify.js +3 -1
- package/lib/hooks/finally/notify.js.map +1 -0
- package/lib/hooks/init/check-local-sfdx-hardis-files.js +3 -1
- package/lib/hooks/init/check-local-sfdx-hardis-files.js.map +1 -1
- package/oclif.lock +117 -60
- package/oclif.manifest.json +272 -266
- package/package.json +15 -11
- package/lib/hooks/postrun/notify.js.map +0 -1
|
@@ -16,94 +16,34 @@ Messages.importMessagesDirectoryFromMetaUrl(import.meta.url);
|
|
|
16
16
|
const messages = Messages.loadMessages('sfdx-hardis', 'org');
|
|
17
17
|
export default class NewTask extends SfCommand {
|
|
18
18
|
static title = 'New work task';
|
|
19
|
-
static description = `
|
|
19
|
+
static description = `
|
|
20
|
+
## Command Behavior
|
|
20
21
|
|
|
21
|
-
|
|
22
|
+
**Assisted menu to start working on a Salesforce task, streamlining the setup of your development environment.**
|
|
22
23
|
|
|
23
|
-
|
|
24
|
+
This command guides you through the process of preparing your local environment and a Salesforce org for a new development or configuration task. It automates several steps, ensuring consistency and adherence to project standards.
|
|
24
25
|
|
|
25
|
-
|
|
26
|
+
Key features include:
|
|
26
27
|
|
|
27
|
-
-
|
|
28
|
-
-
|
|
29
|
-
-
|
|
30
|
-
-
|
|
31
|
-
|
|
32
|
-
- Use property \`installedPackages\`
|
|
33
|
-
- **Push sources**
|
|
34
|
-
- **Assign permission sets**
|
|
35
|
-
- Use property \`initPermissionSets\`
|
|
36
|
-
- **Run apex initialization scripts**
|
|
37
|
-
- Use property \`scratchOrgInitApexScripts\`
|
|
38
|
-
- **Load data**
|
|
39
|
-
- Use property \`dataPackages\`
|
|
28
|
+
- **Git Branch Management:** Ensures your local Git repository is up-to-date with the target branch and creates a new Git branch with a formatted name based on your task details. Branch naming conventions can be customized via the \`branchPrefixChoices\` property in \`.sfdx-hardis.yml\`.
|
|
29
|
+
- **Org Provisioning & Initialization:** Facilitates the creation and initialization of either a scratch org or a source-tracked sandbox. The configuration for org initialization (e.g., package installation, source push, permission set assignments, Apex script execution, data loading) can be defined in \`config/.sfdx-hardis.yml\
|
|
30
|
+
- **Project-Specific Configuration:** Supports defining multiple target branches (\`availableTargetBranches\`) and projects (\`availableProjects\`) in \`.sfdx-hardis.yml\`, allowing for tailored task workflows.
|
|
31
|
+
- **Task Name Validation:** Enforces task name formatting using \`newTaskNameRegex\` and provides examples via \`newTaskNameRegexExample\
|
|
32
|
+
- **Shared Development Sandboxes:** Accounts for scenarios with shared development sandboxes, adjusting prompts to prevent accidental overwrites.
|
|
40
33
|
|
|
41
|
-
|
|
34
|
+
Advanced instructions are available in the [Create New Task documentation](${CONSTANTS.DOC_URL_ROOT}/salesforce-ci-cd-create-new-task/).
|
|
42
35
|
|
|
43
|
-
|
|
36
|
+
## Technical explanations
|
|
44
37
|
|
|
45
|
-
|
|
38
|
+
The command's logic orchestrates various underlying processes:
|
|
46
39
|
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
availableTargetBranches:
|
|
55
|
-
- integration
|
|
56
|
-
- preprod
|
|
57
|
-
\`\`\`
|
|
58
|
-
|
|
59
|
-
\`\`\`yaml
|
|
60
|
-
availableTargetBranches:
|
|
61
|
-
- integration,Select this to work from the integration branch (project stream)
|
|
62
|
-
- preprod,Select this to work from the preprod branch (run stream)
|
|
63
|
-
\`\`\`
|
|
64
|
-
|
|
65
|
-
### availableProjects
|
|
66
|
-
|
|
67
|
-
You can add a first question "What is the project your task is for" if you define a property **availableProjects**
|
|
68
|
-
|
|
69
|
-
The select will be used as first part of the git branch name. (ex: france/features/dev/JIRA123-webservice-get-account)
|
|
70
|
-
|
|
71
|
-
Examples:
|
|
72
|
-
|
|
73
|
-
\`\`\`yaml
|
|
74
|
-
availableProjects:
|
|
75
|
-
- build
|
|
76
|
-
- run
|
|
77
|
-
- some-big-project
|
|
78
|
-
- france
|
|
79
|
-
- uk
|
|
80
|
-
\`\`\`
|
|
81
|
-
|
|
82
|
-
\`\`\`yaml
|
|
83
|
-
availableProjects:
|
|
84
|
-
- build,Select this to work on the build project
|
|
85
|
-
- run,Select this to work on the run project
|
|
86
|
-
- some-big-project,Select this to work on the some big project
|
|
87
|
-
- france,Select this to work on the France project
|
|
88
|
-
- uk,Select this to work on the UK project
|
|
89
|
-
\`\`\`
|
|
90
|
-
|
|
91
|
-
### newTaskNameRegex
|
|
92
|
-
|
|
93
|
-
If you want to force a specific format for the task name, you can define a property **newTaskNameRegex** in your .sfdx-hardis.yml file.
|
|
94
|
-
|
|
95
|
-
Please also define a property **newTaskNameRegexExample** to give an example to the user.
|
|
96
|
-
|
|
97
|
-
Example:
|
|
98
|
-
|
|
99
|
-
\`\`\`yaml
|
|
100
|
-
newTaskNameRegex: '^[A-Z]+-[0-9]+ .*'
|
|
101
|
-
newTaskNameRegexExample: 'MYPROJECT-123 Update account status validation rule'
|
|
102
|
-
\`\`\`
|
|
103
|
-
|
|
104
|
-
### sharedDevSandboxes
|
|
105
|
-
|
|
106
|
-
If contributors can share dev sandboxes, let's not ask them if they want to overwrite their colleagues' changes when creating a new task :)
|
|
40
|
+
- **Git Operations:** Utilizes \`checkGitClean\`, \`ensureGitBranch\`, \`gitCheckOutRemote\`, and \`git().pull()\` to manage Git repository state and branches.
|
|
41
|
+
- **Interactive Prompts:** Leverages the \`prompts\` library to gather user input for task type, source types, and task names.
|
|
42
|
+
- **Configuration Management:** Reads and applies project-specific configurations from \`.sfdx-hardis.yml\` using \`getConfig\` and \`setConfig\
|
|
43
|
+
- **Org Initialization Utilities:** Calls a suite of utility functions for org setup, including \`initApexScripts\`, \`initOrgData\`, \`initOrgMetadatas\`, \`initPermissionSetAssignments\`, \`installPackages\`, and \`makeSureOrgIsConnected\
|
|
44
|
+
- **Salesforce CLI Interaction:** Executes Salesforce CLI commands (e.g., \`sf config set target-org\`, \`sf org open\`, \`sf project delete tracking\`) via \`execCommand\` and \`execSfdxJson\
|
|
45
|
+
- **Dynamic Org Selection:** Presents choices for scratch orgs or sandboxes based on project configuration and existing orgs, dynamically calling \`ScratchCreate.run\` or \`SandboxCreate.run\` as needed.
|
|
46
|
+
- **WebSocket Communication:** Sends refresh status messages via \`WebSocketClient.sendRefreshStatusMessage()\` to update connected VS Code clients.
|
|
107
47
|
`;
|
|
108
48
|
static examples = ['$ sf hardis:work:new'];
|
|
109
49
|
// public static args = [{name: 'file'}];
|
|
@@ -131,7 +71,7 @@ If contributors can share dev sandboxes, let's not ask them if they want to over
|
|
|
131
71
|
const { flags } = await this.parse(NewTask);
|
|
132
72
|
this.debugMode = flags.debug || false;
|
|
133
73
|
uxLog(this, c.cyan('This tool will assist you to create a new task (dev or config) with Hardis CI/CD'));
|
|
134
|
-
uxLog(this, c.
|
|
74
|
+
uxLog(this, c.grey("When you don't know what to answer, you can let the default value and push ENTER"));
|
|
135
75
|
// Make sure the git status is clean, to not delete uncommitted updates
|
|
136
76
|
await checkGitClean({ allowStash: true });
|
|
137
77
|
const config = await getConfig('project');
|
|
@@ -157,6 +97,8 @@ If contributors can share dev sandboxes, let's not ask them if they want to over
|
|
|
157
97
|
type: 'select',
|
|
158
98
|
name: 'project',
|
|
159
99
|
message: c.cyanBright('Please select the project your task is for'),
|
|
100
|
+
description: 'Choose which project this new work item belongs to',
|
|
101
|
+
placeholder: 'Select a project',
|
|
160
102
|
choices: availableProjects.map((project) => {
|
|
161
103
|
return {
|
|
162
104
|
title: project.includes(',') ? project.split(',').join(' - ') : project,
|
|
@@ -172,6 +114,8 @@ If contributors can share dev sandboxes, let's not ask them if they want to over
|
|
|
172
114
|
type: 'select',
|
|
173
115
|
name: 'branch',
|
|
174
116
|
message: c.cyanBright('What is the type of the task you want to do ?'),
|
|
117
|
+
description: 'Select the category of work that best describes your task',
|
|
118
|
+
placeholder: 'Select task type',
|
|
175
119
|
initial: 0,
|
|
176
120
|
choices: branchPrefixChoices,
|
|
177
121
|
},
|
|
@@ -179,6 +123,8 @@ If contributors can share dev sandboxes, let's not ask them if they want to over
|
|
|
179
123
|
type: 'select',
|
|
180
124
|
name: 'sources',
|
|
181
125
|
message: c.cyanBright('What type(s) of Salesforce updates will you have to perform for this task ?'),
|
|
126
|
+
description: 'Choose the type of changes you will make to help set up the appropriate development environment',
|
|
127
|
+
placeholder: 'Select update type',
|
|
182
128
|
initial: 0,
|
|
183
129
|
choices: [
|
|
184
130
|
{
|
|
@@ -216,6 +162,7 @@ If contributors can share dev sandboxes, let's not ask them if they want to over
|
|
|
216
162
|
type: 'confirm',
|
|
217
163
|
name: 'value',
|
|
218
164
|
message: c.cyanBright(`Do you want to update your default target git branch to ${c.green(this.targetBranch)} ?`),
|
|
165
|
+
description: 'Set this branch as your default target for future work items',
|
|
219
166
|
default: false,
|
|
220
167
|
});
|
|
221
168
|
if (updateDefaultBranchRes.value === true) {
|
|
@@ -262,6 +209,8 @@ If contributors can share dev sandboxes, let's not ask them if they want to over
|
|
|
262
209
|
type: 'select',
|
|
263
210
|
name: 'value',
|
|
264
211
|
message: c.cyanBright(`Do you want to use a scratch org or a tracked sandbox org ?`),
|
|
212
|
+
description: 'Choose the type of Salesforce org to use for your development work',
|
|
213
|
+
placeholder: 'Select org type',
|
|
265
214
|
initial: 0,
|
|
266
215
|
choices: orgTypeChoices,
|
|
267
216
|
});
|
|
@@ -289,7 +238,9 @@ If contributors can share dev sandboxes, let's not ask them if they want to over
|
|
|
289
238
|
const taskResponse = await prompts({
|
|
290
239
|
type: 'text',
|
|
291
240
|
name: 'taskName',
|
|
292
|
-
message: c.cyanBright(`What is the name of your new task ?
|
|
241
|
+
message: c.cyanBright(`What is the name of your new task ? Please avoid accents or special characters`),
|
|
242
|
+
description: 'Enter a descriptive name for your task that will be used in the git branch name',
|
|
243
|
+
placeholder: `Ex: ${taskNameExample}`,
|
|
293
244
|
});
|
|
294
245
|
const taskName = taskResponse.taskName.replace(/[^a-zA-Z0-9 -]|\s/g, '-');
|
|
295
246
|
if (validationRegex != null && !new RegExp(validationRegex).test(taskName)) {
|
|
@@ -321,6 +272,8 @@ If contributors can share dev sandboxes, let's not ask them if they want to over
|
|
|
321
272
|
type: 'select',
|
|
322
273
|
name: 'value',
|
|
323
274
|
message: c.cyanBright(`Please select a scratch org to use for your branch ${c.green(branchName)}`),
|
|
275
|
+
description: 'Choose whether to create a new scratch org or reuse an existing one',
|
|
276
|
+
placeholder: 'Select scratch org option',
|
|
324
277
|
initial: 0,
|
|
325
278
|
choices: [
|
|
326
279
|
...baseChoices,
|
|
@@ -359,13 +312,14 @@ If contributors can share dev sandboxes, let's not ask them if they want to over
|
|
|
359
312
|
});
|
|
360
313
|
uxLog(this, c.cyan(`Selected and opening scratch org ${c.green(scratchResponse.value.instanceUrl)} with user ${c.green(scratchResponse.value.username)}`));
|
|
361
314
|
// Open selected org
|
|
315
|
+
uxLog(this, c.cyan('Opening scratch org in browser...'));
|
|
362
316
|
await execSfdxJson('sf org open', this, {
|
|
363
317
|
fail: true,
|
|
364
318
|
output: false,
|
|
365
319
|
debug: this.debugMode,
|
|
366
320
|
});
|
|
367
321
|
// Trigger a status refresh on VsCode WebSocket Client
|
|
368
|
-
WebSocketClient.
|
|
322
|
+
WebSocketClient.sendRefreshStatusMessage();
|
|
369
323
|
}
|
|
370
324
|
}
|
|
371
325
|
// Select or create sandbox
|
|
@@ -387,7 +341,9 @@ If contributors can share dev sandboxes, let's not ask them if they want to over
|
|
|
387
341
|
const initSandboxResponse = await prompts({
|
|
388
342
|
type: 'select',
|
|
389
343
|
name: 'value',
|
|
390
|
-
message: c.cyanBright(`Do you want to update the sandbox according to git branch "${this.targetBranch}" current state
|
|
344
|
+
message: c.cyanBright(`Do you want to update the sandbox according to git branch "${this.targetBranch}" current state ?`),
|
|
345
|
+
description: 'Choose whether to sync your sandbox with the latest changes from the target branch (packages, sources, permission sets, apex scripts, initial data)',
|
|
346
|
+
placeholder: 'Select sync option',
|
|
391
347
|
choices: [
|
|
392
348
|
{
|
|
393
349
|
title: '🧑🤝🧑 No, continue working on my current sandbox state',
|
|
@@ -407,6 +363,7 @@ If contributors can share dev sandboxes, let's not ask them if they want to over
|
|
|
407
363
|
const promptConfirm = await prompts({
|
|
408
364
|
type: 'confirm',
|
|
409
365
|
message: c.cyanBright(`Are you really sure you want to update the dev sandbox with the state of git branch ${this.targetBranch} ? This will overwrite setup updates that you or other users have not committed yet`),
|
|
366
|
+
description: 'Confirm that you want to reset your sandbox to match the target branch state',
|
|
410
367
|
});
|
|
411
368
|
initSandbox = promptConfirm.value === true;
|
|
412
369
|
}
|
|
@@ -452,6 +409,7 @@ If contributors can share dev sandboxes, let's not ask them if they want to over
|
|
|
452
409
|
}
|
|
453
410
|
// Open of if not already open
|
|
454
411
|
if (openOrg === true) {
|
|
412
|
+
uxLog(this, c.cyan(`Opening sandbox org...`));
|
|
455
413
|
await execSfdxJson('sf org open', this, {
|
|
456
414
|
fail: true,
|
|
457
415
|
output: false,
|
|
@@ -459,16 +417,21 @@ If contributors can share dev sandboxes, let's not ask them if they want to over
|
|
|
459
417
|
});
|
|
460
418
|
}
|
|
461
419
|
// Trigger a status refresh on VsCode WebSocket Client
|
|
462
|
-
WebSocketClient.
|
|
420
|
+
WebSocketClient.sendRefreshStatusMessage();
|
|
463
421
|
}
|
|
464
422
|
async promptSandbox(flags, branchName) {
|
|
465
423
|
const hubOrgUsername = flags['target-dev-hub']?.getUsername();
|
|
466
424
|
const sandboxOrgList = await MetadataUtils.listLocalOrgs('devSandbox', { devHubUsername: hubOrgUsername });
|
|
425
|
+
const defaultSandbox = sandboxOrgList.find((org) => {
|
|
426
|
+
return org.username === flags['target-org']?.getUsername();
|
|
427
|
+
});
|
|
467
428
|
const sandboxResponse = await prompts({
|
|
468
429
|
type: 'select',
|
|
469
430
|
name: 'value',
|
|
470
431
|
message: c.cyanBright(`Please select a sandbox org to use for your branch ${c.green(branchName)} (if you want to avoid conflicts, you should often refresh your sandbox)`),
|
|
471
|
-
|
|
432
|
+
description: 'Choose an existing sandbox or connect to a new one for this branch',
|
|
433
|
+
placeholder: 'Select sandbox',
|
|
434
|
+
default: defaultSandbox ? defaultSandbox : undefined,
|
|
472
435
|
choices: [
|
|
473
436
|
...[
|
|
474
437
|
{
|
|
@@ -483,8 +446,8 @@ If contributors can share dev sandboxes, let's not ask them if they want to over
|
|
|
483
446
|
],
|
|
484
447
|
...sandboxOrgList.map((sandboxOrg) => {
|
|
485
448
|
return {
|
|
486
|
-
title:
|
|
487
|
-
description: sandboxOrg.
|
|
449
|
+
title: sandboxOrg.instanceUrl,
|
|
450
|
+
description: `☁️ Use sandbox org ${c.yellow(sandboxOrg.username || sandboxOrg.alias)}`,
|
|
488
451
|
value: sandboxOrg,
|
|
489
452
|
};
|
|
490
453
|
}),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"new.js","sourceRoot":"","sources":["../../../../src/commands/hardis/work/new.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"new.js","sourceRoot":"","sources":["../../../../src/commands/hardis/work/new.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,7 +10,42 @@ Messages.importMessagesDirectoryFromMetaUrl(import.meta.url);
|
|
|
10
10
|
const messages = Messages.loadMessages('sfdx-hardis', 'org');
|
|
11
11
|
export default class RefreshTask extends SfCommand {
|
|
12
12
|
static title = 'Refresh work task';
|
|
13
|
-
static description =
|
|
13
|
+
static description = `
|
|
14
|
+
## Command Behavior
|
|
15
|
+
|
|
16
|
+
**Refreshes your local Git branch and Salesforce org with the latest content from another Git branch.**
|
|
17
|
+
|
|
18
|
+
This command is designed to help developers keep their local development environment synchronized with changes made by other team members. It automates the process of pulling updates from a designated branch, merging them into your current working branch, and then pushing those changes to your scratch org or source-tracked sandbox.
|
|
19
|
+
|
|
20
|
+
Key functionalities:
|
|
21
|
+
|
|
22
|
+
- **Pre-Merge Check:** Prompts the user to confirm that they have saved their current work before proceeding with the merge, preventing accidental data loss.
|
|
23
|
+
- **Branch Selection:** Allows you to select a target Git branch (e.g., \`integration\`, \`preprod\`) from which to pull updates.
|
|
24
|
+
- **Git Operations:** Performs a series of Git operations:
|
|
25
|
+
- Pulls the latest version of the selected merge branch.
|
|
26
|
+
- Stashes your uncommitted local changes before merging.
|
|
27
|
+
- Merges the selected branch into your current local branch.
|
|
28
|
+
- Handles merge conflicts interactively, prompting the user to resolve them.
|
|
29
|
+
- Restores your stashed changes after the merge.
|
|
30
|
+
- **Org Synchronization:** Pushes the updated local branch content to your scratch org or source-tracked sandbox, ensuring your org reflects the latest merged code.
|
|
31
|
+
|
|
32
|
+
## Technical explanations
|
|
33
|
+
|
|
34
|
+
The command's technical implementation involves:
|
|
35
|
+
|
|
36
|
+
- **Configuration Loading:** It retrieves project configurations using \`getConfig\` to determine the default development branch.
|
|
37
|
+
- **Git Integration:** Extensively uses \`simple-git\` (\`git()\`) for various Git operations:
|
|
38
|
+
- \`git().branch()\`: Lists local and remote branches.
|
|
39
|
+
- \`git().stash()\`: Saves and restores uncommitted changes.
|
|
40
|
+
- \`git().fetch()\`: Fetches updates from remote repositories.
|
|
41
|
+
- \`git().checkout()\`: Switches between branches.
|
|
42
|
+
- \`git().pull()\`: Pulls changes from a remote branch.
|
|
43
|
+
- \`git().merge()\`: Merges one branch into another, handling conflicts.
|
|
44
|
+
- **Interactive Prompts:** Uses the \`prompts\` library to guide the user through confirmations (e.g., saving work) and branch selection.
|
|
45
|
+
- **Salesforce CLI Integration:** It uses \`forceSourcePull\` to pull changes from the scratch org and \`forceSourcePush\` to push changes to the scratch org.
|
|
46
|
+
- **Error Handling:** Includes robust error handling for Git operations (e.g., merge conflicts) and provides guidance to the user for resolution.
|
|
47
|
+
- **Environment Variable Check:** Checks for an \`EXPERIMENTAL\` environment variable to gate access to this command, indicating it might not be fully stable.
|
|
48
|
+
`;
|
|
14
49
|
static examples = ['$ sf hardis:work:refresh'];
|
|
15
50
|
// public static args = [{name: 'file'}];
|
|
16
51
|
static flags = {
|
|
@@ -52,6 +87,8 @@ export default class RefreshTask extends SfCommand {
|
|
|
52
87
|
type: 'select',
|
|
53
88
|
message: c.cyanBright(`This is a SENSITIVE OPERATION. Did you run ${c.green('hardis:work:save')} BEFORE running this command ?`),
|
|
54
89
|
name: 'value',
|
|
90
|
+
description: 'Confirm that you have saved your current work before proceeding with this sensitive operation',
|
|
91
|
+
placeholder: 'Select an option',
|
|
55
92
|
choices: [
|
|
56
93
|
{
|
|
57
94
|
title: 'Yes I did save my current updates before merging updates from others !',
|
|
@@ -82,6 +119,8 @@ export default class RefreshTask extends SfCommand {
|
|
|
82
119
|
type: 'select',
|
|
83
120
|
message: `Please select the branch that you want to merge in your current branch ${c.green(localBranch)}`,
|
|
84
121
|
name: 'value',
|
|
122
|
+
description: 'Choose which branch to merge into your current working branch',
|
|
123
|
+
placeholder: 'Select a branch to merge',
|
|
85
124
|
choices: branchChoices,
|
|
86
125
|
});
|
|
87
126
|
this.mergeBranch = branchRes.value;
|
|
@@ -135,6 +174,8 @@ export default class RefreshTask extends SfCommand {
|
|
|
135
174
|
type: 'select',
|
|
136
175
|
name: 'value',
|
|
137
176
|
message: c.cyanBright('There are merge conflicts, please solve them, then select YES here. Otherwise, exit the script and call a developer for help :)'),
|
|
177
|
+
description: 'Choose your next action after attempting to resolve merge conflicts',
|
|
178
|
+
placeholder: 'Select an option',
|
|
138
179
|
choices: [
|
|
139
180
|
{ value: true, title: 'If finished to merge conflicts' },
|
|
140
181
|
{
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"refresh.js","sourceRoot":"","sources":["../../../../src/commands/hardis/work/refresh.ts"],"names":[],"mappings":"AAAA,wBAAwB;AACxB,OAAO,EAAE,SAAS,EAAE,KAAK,EAAE,+BAA+B,EAAE,MAAM,6BAA6B,CAAC;AAChG,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAErD,OAAO,CAAC,MAAM,OAAO,CAAC;AACtB,OAAO,EAAE,WAAW,EAAE,mBAAmB,EAAE,GAAG,EAAE,KAAK,EAAE,MAAM,gCAAgC,CAAC;AAC9F,OAAO,EAAE,eAAe,EAAE,eAAe,EAAE,MAAM,sCAAsC,CAAC;AACxF,OAAO,EAAE,OAAO,EAAE,MAAM,kCAAkC,CAAC;AAC3D,OAAO,EAAE,SAAS,EAAE,MAAM,0BAA0B,CAAC;AAErD,QAAQ,CAAC,kCAAkC,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AAC7D,MAAM,QAAQ,GAAG,QAAQ,CAAC,YAAY,CAAC,aAAa,EAAE,KAAK,CAAC,CAAC;AAE7D,MAAM,CAAC,OAAO,OAAO,WAAY,SAAQ,SAAc;IAC9C,MAAM,CAAC,KAAK,GAAG,mBAAmB,CAAC;IAEnC,MAAM,CAAC,WAAW,GAAG,
|
|
1
|
+
{"version":3,"file":"refresh.js","sourceRoot":"","sources":["../../../../src/commands/hardis/work/refresh.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,9 +10,33 @@ Messages.importMessagesDirectoryFromMetaUrl(import.meta.url);
|
|
|
10
10
|
const messages = Messages.loadMessages('sfdx-hardis', 'org');
|
|
11
11
|
export default class RebuildSelection extends SfCommand {
|
|
12
12
|
static title = 'Select again';
|
|
13
|
-
static description = `
|
|
13
|
+
static description = `
|
|
14
|
+
## Command Behavior
|
|
14
15
|
|
|
15
|
-
|
|
16
|
+
**Resets the local Git repository to allow for a new selection of files to be included in a merge request.**
|
|
17
|
+
|
|
18
|
+
This command is designed to be used when you need to re-evaluate which changes should be part of your next merge request. It performs a soft Git reset, effectively unstaging all committed changes since the last merge with the target branch, and then cleans up any generated files.
|
|
19
|
+
|
|
20
|
+
Key functionalities:
|
|
21
|
+
|
|
22
|
+
- **Target Branch Selection:** Prompts you to select the target branch of your current or future merge request.
|
|
23
|
+
- **Soft Git Reset:** Performs a \`git reset --soft\` operation to uncommit changes, moving the HEAD pointer back but keeping the changes in your working directory.
|
|
24
|
+
- **Generated File Cleanup:** Resets and checks out \`manifest/package.xml\` and \`manifest/destructiveChanges.xml\` to their state before the reset, ensuring a clean slate for new selections.
|
|
25
|
+
- **Force Push Authorization:** Sets a flag in your user configuration (\`canForcePush: true\`) to allow a force push in the subsequent \`hardis:work:save\` command, as the history will have been rewritten.
|
|
26
|
+
|
|
27
|
+
## Technical explanations
|
|
28
|
+
|
|
29
|
+
The command's technical implementation involves:
|
|
30
|
+
|
|
31
|
+
- **Git Integration:** Uses \`simple-git\` (\`git()\`) to interact with the Git repository:
|
|
32
|
+
- \`git().branch()\`: Retrieves information about local and remote branches.
|
|
33
|
+
- \`git().log()\`: Fetches the commit history to determine which commits to reset.
|
|
34
|
+
- \`git().reset()\`: Performs the soft reset operation.
|
|
35
|
+
- \`git().checkout()\`: Resets specific files (\`package.xml\`, \`destructiveChanges.xml\`) to their previous state.
|
|
36
|
+
- \`git().status()\`: Displays the current status of the Git repository after the reset.
|
|
37
|
+
- **Interactive Prompts:** Uses the \`prompts\` library to confirm the reset operation with the user and to select the target branch.
|
|
38
|
+
- **Configuration Management:** Updates the user's configuration (\`.sfdx-hardis.yml\`) using \`setConfig\` to set the \`canForcePush\` flag.
|
|
39
|
+
- **Error Handling:** Includes a check to prevent resetting protected branches.
|
|
16
40
|
`;
|
|
17
41
|
static examples = ['$ sf hardis:work:resetsave'];
|
|
18
42
|
// public static args = [{name: 'file'}];
|
|
@@ -48,6 +72,7 @@ Calls a soft git reset behind the hood
|
|
|
48
72
|
const confirm = await prompts({
|
|
49
73
|
type: 'confirm',
|
|
50
74
|
message: `This command will git reset (soft) your branch ${currentGitBranch}. You will need to select and commit again your files. Are you sure ?`,
|
|
75
|
+
description: 'Confirm that you want to perform a soft git reset on your current branch',
|
|
51
76
|
});
|
|
52
77
|
if (confirm.value === false) {
|
|
53
78
|
throw new SfError(c.red('[sfdx-hardis] Cancelled by user'));
|
|
@@ -68,7 +93,7 @@ Calls a soft git reset behind the hood
|
|
|
68
93
|
await git({ output: true }).checkout(['--', 'manifest/package.xml']);
|
|
69
94
|
await git({ output: true }).checkout(['--', 'manifest/destructiveChanges.xml']);
|
|
70
95
|
await git({ output: true }).status();
|
|
71
|
-
uxLog(this, c.cyan('The following items are
|
|
96
|
+
uxLog(this, c.cyan('The following items are now available for selection'));
|
|
72
97
|
uxLog(this, c.cyan('Selection has been reset'));
|
|
73
98
|
// Return an object to be displayed with --json
|
|
74
99
|
return { outputString: 'Reset selection pocessed' };
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resetselection.js","sourceRoot":"","sources":["../../../../src/commands/hardis/work/resetselection.ts"],"names":[],"mappings":"AAAA,wBAAwB;AACxB,OAAO,EAAE,SAAS,EAAE,KAAK,EAAE,+BAA+B,EAAE,MAAM,6BAA6B,CAAC;AAChG,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAErD,OAAO,CAAC,MAAM,OAAO,CAAC;AACtB,OAAO,EAAE,WAAW,EAAE,mBAAmB,EAAE,GAAG,EAAE,KAAK,EAAE,MAAM,gCAAgC,CAAC;AAC9F,OAAO,EAAE,kBAAkB,EAAE,MAAM,mCAAmC,CAAC;AACvE,OAAO,EAAE,SAAS,EAAE,MAAM,0BAA0B,CAAC;AACrD,OAAO,EAAE,OAAO,EAAE,MAAM,kCAAkC,CAAC;AAE3D,QAAQ,CAAC,kCAAkC,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AAC7D,MAAM,QAAQ,GAAG,QAAQ,CAAC,YAAY,CAAC,aAAa,EAAE,KAAK,CAAC,CAAC;AAE7D,MAAM,CAAC,OAAO,OAAO,gBAAiB,SAAQ,SAAc;IACnD,MAAM,CAAC,KAAK,GAAG,cAAc,CAAC;IAE9B,MAAM,CAAC,WAAW,GAAG
|
|
1
|
+
{"version":3,"file":"resetselection.js","sourceRoot":"","sources":["../../../../src/commands/hardis/work/resetselection.ts"],"names":[],"mappings":"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"}
|