From 061437f7c179de8b462955bba6f00cad71e81e97 Mon Sep 17 00:00:00 2001 From: aykl Date: Fri, 3 Sep 2021 12:55:41 +0200 Subject: [PATCH 001/431] Project Detail View updated --- .../project/project-detail.component.html | 174 ++++++++-------- .../project/project-detail.component.scss | 197 ++---------------- 2 files changed, 102 insertions(+), 269 deletions(-) diff --git a/src/main/webapp/app/entities/project/project-detail.component.html b/src/main/webapp/app/entities/project/project-detail.component.html index 10cae045f..653a05d51 100644 --- a/src/main/webapp/app/entities/project/project-detail.component.html +++ b/src/main/webapp/app/entities/project/project-detail.component.html @@ -1,96 +1,92 @@ -
- +
+

+
+
+ {{g}} + +
+
+
+
+ + +
+ + +
+
diff --git a/src/main/webapp/app/entities/project/project-dialog.component.scss b/src/main/webapp/app/entities/project/project-dialog.component.scss index 3baec4efc..6b9457f7d 100644 --- a/src/main/webapp/app/entities/project/project-dialog.component.scss +++ b/src/main/webapp/app/entities/project/project-dialog.component.scss @@ -6,3 +6,20 @@ .dropdown-menu.show { display: block; } + +.project-dialog__existing-groups:not(:empty) { + padding: 8px; + margin-bottom: 8px; +} +.project-dialog__existing-groups > .badge { + margin: 2px; + cursor: pointer; +} +.project-dialog__new-group { + display: flex; + align-items: flex-end; +} +.project-dialog__new-group > *:first-child { + flex-grow: 1; + margin-right: 16px; +} diff --git a/src/main/webapp/app/entities/project/project-dialog.component.ts b/src/main/webapp/app/entities/project/project-dialog.component.ts index 9d9efea31..808449c66 100644 --- a/src/main/webapp/app/entities/project/project-dialog.component.ts +++ b/src/main/webapp/app/entities/project/project-dialog.component.ts @@ -37,6 +37,8 @@ export class ProjectDialogComponent implements OnInit { return this.sourceTypes.filter(t => !selectedTypeIds.includes(t.id)); } + newGroupInputText: string; + attributeComponentEventPrefix: 'projectAttributes'; getMatchingSourceTypes = (text$: Observable) => { @@ -130,6 +132,18 @@ export class ProjectDialogComponent implements OnInit { formatSourceTypeOption(t: SourceType) { return `${t.producer}_${t.model}_${t.catalogVersion}`; } + + addGroup() { + // TODO implement group name validation + let currentGroups = this.project.groups || []; + this.project.groups = [ ...currentGroups, this.newGroupInputText ]; + this.newGroupInputText = ''; + } + + removeGroups(groupName: string) { + // TODO warn if it will affect existing subjects (on save, expect HTTP 409) + this.project.groups = this.project.groups.filter(g => g !== groupName); + } } @Component({ diff --git a/src/main/webapp/i18n/en/project.json b/src/main/webapp/i18n/en/project.json index 00acdb173..304014bcc 100644 --- a/src/main/webapp/i18n/en/project.json +++ b/src/main/webapp/i18n/en/project.json @@ -25,6 +25,11 @@ "endDate": "End Date", "projectAdmin": "Project Admin", "sourceType": "Source Type", + "groups": "Groups", + "newGroup": { + "label": "New group", + "button": "Add group" + }, "attributeDataKey" : "Tag", "attributeDataValue" : "Value", "prettyProjectName" : "Human readable project Name", diff --git a/src/main/webapp/i18n/nl/project.json b/src/main/webapp/i18n/nl/project.json index 21bd3b821..3936a314d 100644 --- a/src/main/webapp/i18n/nl/project.json +++ b/src/main/webapp/i18n/nl/project.json @@ -25,6 +25,11 @@ "endDate": "Einddatum", "projectAdmin": "Project Admin", "sourceType": "Source Type", + "groups": "Groepen", + "newGroup": { + "label": "Nieuwe groep", + "button": "Groep toevogen" + }, "attributeDataKey" : "Tag", "attributeDataValue" : "Waarde", "prettyProjectName" : "Leesbare projectnaam", From 73398dd9406b5828fa68b8754f85ba46afb3e334 Mon Sep 17 00:00:00 2001 From: aykl Date: Fri, 3 Sep 2021 18:46:46 +0200 Subject: [PATCH 003/431] Delete&Discontinue Buttons moved to Subject Detail --- .../app/shared/project/project.model.ts | 1 + .../subject/subject-detail.component.html | 45 ++++++++++++++----- .../subject/subject-detail.component.scss | 4 ++ .../subject/subject-detail.component.ts | 1 + .../app/shared/subject/subject.component.html | 18 -------- 5 files changed, 41 insertions(+), 28 deletions(-) create mode 100644 src/main/webapp/app/shared/subject/subject-detail.component.scss diff --git a/src/main/webapp/app/shared/project/project.model.ts b/src/main/webapp/app/shared/project/project.model.ts index 23c12942f..24edad188 100644 --- a/src/main/webapp/app/shared/project/project.model.ts +++ b/src/main/webapp/app/shared/project/project.model.ts @@ -18,6 +18,7 @@ export class Project { public endDate?: any, public attributes ?: any, public sourceTypes?: SourceType[], + public groups?: string[], public humanReadableProjectName ?: string, public persistentTokenTimeout?: number ) { diff --git a/src/main/webapp/app/shared/subject/subject-detail.component.html b/src/main/webapp/app/shared/subject/subject-detail.component.html index 8dc0c6c89..72f19c6e2 100644 --- a/src/main/webapp/app/shared/subject/subject-detail.component.html +++ b/src/main/webapp/app/shared/subject/subject-detail.component.html @@ -47,14 +47,39 @@

{{sub - - +
+ + + + +
diff --git a/src/main/webapp/app/shared/subject/subject-detail.component.scss b/src/main/webapp/app/shared/subject/subject-detail.component.scss new file mode 100644 index 000000000..6375e2238 --- /dev/null +++ b/src/main/webapp/app/shared/subject/subject-detail.component.scss @@ -0,0 +1,4 @@ + +.subject-detail__actions > button:not(:first-child) { + margin-left: 8px; +} diff --git a/src/main/webapp/app/shared/subject/subject-detail.component.ts b/src/main/webapp/app/shared/subject/subject-detail.component.ts index 377588f15..34e54113e 100644 --- a/src/main/webapp/app/shared/subject/subject-detail.component.ts +++ b/src/main/webapp/app/shared/subject/subject-detail.component.ts @@ -9,6 +9,7 @@ import { SubjectService } from './subject.service'; @Component({ selector: 'jhi-subject-detail', templateUrl: './subject-detail.component.html', + styleUrls: ['./subject-detail.component.scss'], }) export class SubjectDetailComponent implements OnInit, OnDestroy { diff --git a/src/main/webapp/app/shared/subject/subject.component.html b/src/main/webapp/app/shared/subject/subject.component.html index def4d619f..783dd10b8 100644 --- a/src/main/webapp/app/shared/subject/subject.component.html +++ b/src/main/webapp/app/shared/subject/subject.component.html @@ -114,24 +114,6 @@

class="btn btn-primary btn-sm">   - - From 93a64e838efc96d36f9d956e472c7f412904abc8 Mon Sep 17 00:00:00 2001 From: aykl Date: Fri, 3 Sep 2021 19:19:01 +0200 Subject: [PATCH 004/431] Table Layout updated --- .../app/shared/subject/subject.component.html | 197 +++++++++++------- .../app/shared/subject/subject.component.scss | 41 ++++ .../app/shared/subject/subject.component.ts | 1 + 3 files changed, 162 insertions(+), 77 deletions(-) create mode 100644 src/main/webapp/app/shared/subject/subject.component.scss diff --git a/src/main/webapp/app/shared/subject/subject.component.html b/src/main/webapp/app/shared/subject/subject.component.html index 783dd10b8..56da5b50d 100644 --- a/src/main/webapp/app/shared/subject/subject.component.html +++ b/src/main/webapp/app/shared/subject/subject.component.html @@ -37,88 +37,131 @@

- - {{subject.login}} - - {{subject.externalId}} - {{subject.externalId}} - - - DEACTIVATED - ACTIVATED - DISCONTINUED - INVALID - - - - - {{role.projectName}} - {{role.projectName}} + + +
+
+ +
+ - - -
- {{entry.key}}: {{entry.value}} +
+ + {{subject.externalId}} + + + {{subject.externalId}} + + + N/A +
- - -
- - +
+
+ + +
+ DEACTIVATED + ACTIVATED + DISCONTINUED + INVALID
- - -
- - - +
+
+ + + - - - - +
+
+ + +
+ + N/A + + + {{sources.sourceTypeModel}}: {{sources.sourceName}}{{last ? '' : ', '}} + +
+
+
+ + +
+ + N/A + +
+ {{entry.key}}: {{entry.value}} +
+
+
+
+
+ + + + + +
+
diff --git a/src/main/webapp/app/shared/subject/subject.component.scss b/src/main/webapp/app/shared/subject/subject.component.scss new file mode 100644 index 000000000..bf9d4e1ea --- /dev/null +++ b/src/main/webapp/app/shared/subject/subject.component.scss @@ -0,0 +1,41 @@ + + +.subject-row { + display: flex; + justify-content: space-between; + padding: 8px 16px; +} +.subject-row:nth-child(even) { + border-top: #eceeef; + background-color: #eceeef; +} +.subject-row__content { + display: flex; + flex-grow: 1; + flex-wrap: wrap; +} +.subject-row__content > * { + flex-basis: 80px; + flex-grow: 1; +} + +.subject-row__field-label { + position: relative; + font-weight: bold; + font-size: 12px; + line-height: 12px; + color: #5e5e5e; +} + + +.subject-row__actions { + display: flex; + flex-direction: column; + flex-basis: unset; + flex-grow: 0 !important; + margin-left: 16px; +} +.subject-row__actions > *:not(:last-child) { + width: 100%; + margin-bottom: 4px; +} diff --git a/src/main/webapp/app/shared/subject/subject.component.ts b/src/main/webapp/app/shared/subject/subject.component.ts index 3c65aceb7..d2a41ec0d 100644 --- a/src/main/webapp/app/shared/subject/subject.component.ts +++ b/src/main/webapp/app/shared/subject/subject.component.ts @@ -23,6 +23,7 @@ import { parseLinks } from '../util/parse-links-util'; @Component({ selector: 'jhi-subjects', templateUrl: './subject.component.html', + styleUrls: ['./subject.component.scss'], }) export class SubjectComponent implements OnInit, OnDestroy, OnChanges { pagingParams$: Observable; From b63b9ca14e80a02931dd657b9201df1d6d100aee Mon Sep 17 00:00:00 2001 From: aykl Date: Sat, 4 Sep 2021 00:43:36 +0200 Subject: [PATCH 005/431] Load More Button added --- .../app/shared/subject/subject.component.html | 21 ++++++++++++------- .../app/shared/subject/subject.component.scss | 20 ++++++++++++++++++ .../app/shared/subject/subject.component.ts | 6 +++++- src/main/webapp/i18n/en/subject.json | 2 ++ src/main/webapp/i18n/nl/subject.json | 2 ++ 5 files changed, 43 insertions(+), 8 deletions(-) diff --git a/src/main/webapp/app/shared/subject/subject.component.html b/src/main/webapp/app/shared/subject/subject.component.html index 56da5b50d..fcb3454b2 100644 --- a/src/main/webapp/app/shared/subject/subject.component.html +++ b/src/main/webapp/app/shared/subject/subject.component.html @@ -163,12 +163,19 @@

-
-
- -
-
- -
+
+ +
diff --git a/src/main/webapp/app/shared/subject/subject.component.scss b/src/main/webapp/app/shared/subject/subject.component.scss index bf9d4e1ea..3eaeb19d1 100644 --- a/src/main/webapp/app/shared/subject/subject.component.scss +++ b/src/main/webapp/app/shared/subject/subject.component.scss @@ -39,3 +39,23 @@ width: 100%; margin-bottom: 4px; } + +.subject-pagination { + display: flex; + margin-top: 8px; +} +.subject-pagination > * { + text-align: center; + flex-grow: 1; + padding: 16px; +} +.subject-pagination__all-loaded { + color: #dadada; + cursor: not-allowed; +} +.subject-pagination__load-more:hover { + background: rgba(169, 209, 255, 0.3); +} +.subject-pagination__load-more:active { + background: rgba(0, 120, 255, 0.15); +} diff --git a/src/main/webapp/app/shared/subject/subject.component.ts b/src/main/webapp/app/shared/subject/subject.component.ts index d2a41ec0d..1d0ccffa8 100644 --- a/src/main/webapp/app/shared/subject/subject.component.ts +++ b/src/main/webapp/app/shared/subject/subject.component.ts @@ -144,11 +144,15 @@ export class SubjectComponent implements OnInit, OnDestroy, OnChanges { private onSuccess(data, headers) { this.links = parseLinks(headers.get('link')); - this.totalItems = headers.get('X-Total-Count'); + this.totalItems = +headers.get('X-Total-Count'); this.queryCount = this.totalItems; this.subjects = data; } + loadMore() { + // TODO implement loading + } + loadPage(page) { if (page !== this.previousPage) { this.previousPage = page; diff --git a/src/main/webapp/i18n/en/subject.json b/src/main/webapp/i18n/en/subject.json index 408a46d81..b2887c2ba 100644 --- a/src/main/webapp/i18n/en/subject.json +++ b/src/main/webapp/i18n/en/subject.json @@ -70,6 +70,8 @@ "tokenTimeoutMinutes": "{{minutes}} minutes", "validUntil": "Valid until", "validity": "Validity", + "loadMore": "Load more ({{shown}}/{{total}} shown)", + "allLoaded": "All {{total}} subjects loaded", "generateToken": "Generate QR code", "generatePersistentToken": "Generate persistent QR code" } diff --git a/src/main/webapp/i18n/nl/subject.json b/src/main/webapp/i18n/nl/subject.json index 584d7006e..8e5664faa 100644 --- a/src/main/webapp/i18n/nl/subject.json +++ b/src/main/webapp/i18n/nl/subject.json @@ -70,6 +70,8 @@ "tokenTimeoutDays": "{{days}} dagen", "validUntil": "Geldig tot", "validity": "Geldigheidsduur", + "loadMore": "Meer laden ({{shown}}/{{total}} getoond)", + "allLoaded": "Alle {{total}} subjects geladen", "generateToken": "Genereer QR code", "generatePersistentToken": "Genereer blijvende QR code" } From 3d0674c7ae650a7203155e79fb07fbd0c3052b22 Mon Sep 17 00:00:00 2001 From: aykl Date: Sat, 4 Sep 2021 01:06:06 +0200 Subject: [PATCH 006/431] Sorting Dropdown added --- .../app/shared/subject/subject.component.html | 48 +++++++++++-------- .../app/shared/subject/subject.component.ts | 13 +++++ src/main/webapp/i18n/en/subject.json | 9 ++++ src/main/webapp/i18n/nl/subject.json | 9 ++++ 4 files changed, 59 insertions(+), 20 deletions(-) diff --git a/src/main/webapp/app/shared/subject/subject.component.html b/src/main/webapp/app/shared/subject/subject.component.html index fcb3454b2..9bb5a6bdb 100644 --- a/src/main/webapp/app/shared/subject/subject.component.html +++ b/src/main/webapp/app/shared/subject/subject.component.html @@ -1,6 +1,32 @@

- +
+ +
+ + + + +
+

-
-
-
+
- - - - - - - - - - - - - - - -
diff --git a/src/main/webapp/app/shared/subject/subject.component.ts b/src/main/webapp/app/shared/subject/subject.component.ts index 1d0ccffa8..0c412ad20 100644 --- a/src/main/webapp/app/shared/subject/subject.component.ts +++ b/src/main/webapp/app/shared/subject/subject.component.ts @@ -26,6 +26,11 @@ import { parseLinks } from '../util/parse-links-util'; styleUrls: ['./subject.component.scss'], }) export class SubjectComponent implements OnInit, OnDestroy, OnChanges { + sortingOptions = [ + 'user.login', + 'externalId', + 'user.activated', + ]; pagingParams$: Observable; project$ = new BehaviorSubject(null); @Input() @@ -160,6 +165,14 @@ export class SubjectComponent implements OnInit, OnDestroy, OnChanges { } } + updateSorting(predicate, direction) { + // TODO consider removing the page altogether + this.predicate = predicate; + this.ascending = direction === 'asc'; + this.page = 1; + this.transition(); + } + transition() { if (!this.isProjectSpecific) { this.router.navigate(['/subject'], { diff --git a/src/main/webapp/i18n/en/subject.json b/src/main/webapp/i18n/en/subject.json index b2887c2ba..4671384a3 100644 --- a/src/main/webapp/i18n/en/subject.json +++ b/src/main/webapp/i18n/en/subject.json @@ -61,6 +61,15 @@ "question" : "Are you sure you want to discontinue Subject {{ id }}?" }, "discontinued": "A Subject is discontinued with identifier {{ param }}", + "sorting": { + "label": "Sort by", + "externalId.asc": "External Id - A to Z", + "externalId.desc": "External Id - Z to A", + "user.login.asc": "Subject Id - A to Z", + "user.login.desc": "Subject Id - Z to A", + "user.activated.asc": "Status - Active first", + "user.activated.desc": "Status - Active last" + }, "subjectId" : "Subject Id", "baseUrl" : "Base Url", "tokenName" : "Token Name", diff --git a/src/main/webapp/i18n/nl/subject.json b/src/main/webapp/i18n/nl/subject.json index 8e5664faa..4d930d708 100644 --- a/src/main/webapp/i18n/nl/subject.json +++ b/src/main/webapp/i18n/nl/subject.json @@ -61,6 +61,15 @@ "question" : "Weet u zeker dat u het onderwerp wilt stoppen {{ id }}?" }, "discontinued": "Een onderwerp wordt beƫindigd met een identificatiecode {{ param }}", + "sorting": { + "label": "Sorteren op", + "externalId.asc": "External Id - A tot Z", + "externalId.desc": "External Id - Z tot A", + "user.login.asc": "Subject Id - A tot Z", + "user.login.desc": "Subject Id - Z tot A", + "user.activated.asc": "Status - Eerst geactiveerd", + "user.activated.desc": "Status - Eerst gedeactiveerd" + }, "subjectId" : "Subject Id", "baseUrl" : "Base Url", "tokenName" : "Token naam", From 6cccb633fe5d858a6e352351bd055622d770cf13 Mon Sep 17 00:00:00 2001 From: aykl Date: Sat, 4 Sep 2021 01:24:36 +0200 Subject: [PATCH 007/431] Selection Checkboxes added to Subjects --- .../app/shared/subject/subject.component.html | 18 +++++++++++++++++- .../app/shared/subject/subject.component.scss | 15 +++++++++++++++ .../app/shared/subject/subject.component.ts | 8 ++++++++ src/main/webapp/i18n/en/subject.json | 2 ++ src/main/webapp/i18n/nl/subject.json | 2 ++ 5 files changed, 44 insertions(+), 1 deletion(-) diff --git a/src/main/webapp/app/shared/subject/subject.component.html b/src/main/webapp/app/shared/subject/subject.component.html index 9bb5a6bdb..08b507f68 100644 --- a/src/main/webapp/app/shared/subject/subject.component.html +++ b/src/main/webapp/app/shared/subject/subject.component.html @@ -46,8 +46,24 @@

-
+
+
+ + +
+
+ +
:not(:first-child) { + margin-left: 8px; +} +.subject-row__select-row { + display: flex; + flex-direction: column; + flex-grow: 0; + padding-top: 28px; + margin-right: 16px; +} + + .subject-row__actions { display: flex; flex-direction: column; diff --git a/src/main/webapp/app/shared/subject/subject.component.ts b/src/main/webapp/app/shared/subject/subject.component.ts index 0c412ad20..9639de6df 100644 --- a/src/main/webapp/app/shared/subject/subject.component.ts +++ b/src/main/webapp/app/shared/subject/subject.component.ts @@ -173,6 +173,14 @@ export class SubjectComponent implements OnInit, OnDestroy, OnChanges { this.transition(); } + selectAll() { + // TODO implement subject selection + } + + addSelectedToGroup() { + // TODO + } + transition() { if (!this.isProjectSpecific) { this.router.navigate(['/subject'], { diff --git a/src/main/webapp/i18n/en/subject.json b/src/main/webapp/i18n/en/subject.json index 4671384a3..463e43601 100644 --- a/src/main/webapp/i18n/en/subject.json +++ b/src/main/webapp/i18n/en/subject.json @@ -79,6 +79,8 @@ "tokenTimeoutMinutes": "{{minutes}} minutes", "validUntil": "Valid until", "validity": "Validity", + "selectAll": "Select all", + "addSelectedToGroup": "Add to group", "loadMore": "Load more ({{shown}}/{{total}} shown)", "allLoaded": "All {{total}} subjects loaded", "generateToken": "Generate QR code", diff --git a/src/main/webapp/i18n/nl/subject.json b/src/main/webapp/i18n/nl/subject.json index 4d930d708..1fce8fe19 100644 --- a/src/main/webapp/i18n/nl/subject.json +++ b/src/main/webapp/i18n/nl/subject.json @@ -79,6 +79,8 @@ "tokenTimeoutDays": "{{days}} dagen", "validUntil": "Geldig tot", "validity": "Geldigheidsduur", + "selectAll": "Selecteer alles", + "addSelectedToGroup": "Aan groep toevoegen", "loadMore": "Meer laden ({{shown}}/{{total}} getoond)", "allLoaded": "Alle {{total}} subjects geladen", "generateToken": "Genereer QR code", From 22ae512c58abb3293694ccb9e41c5f2fec3ccb8b Mon Sep 17 00:00:00 2001 From: aykl Date: Sat, 4 Sep 2021 01:30:48 +0200 Subject: [PATCH 008/431] Group added to Subject Model --- .../app/shared/subject/subject-dialog.component.html | 11 +++++++++++ src/main/webapp/app/shared/subject/subject.model.ts | 3 +++ src/main/webapp/i18n/en/subject.json | 1 + src/main/webapp/i18n/nl/subject.json | 1 + 4 files changed, 16 insertions(+) diff --git a/src/main/webapp/app/shared/subject/subject-dialog.component.html b/src/main/webapp/app/shared/subject/subject-dialog.component.html index d0ed8bd6b..d18d2f942 100644 --- a/src/main/webapp/app/shared/subject/subject-dialog.component.html +++ b/src/main/webapp/app/shared/subject/subject-dialog.component.html @@ -33,6 +33,17 @@ [(ngModel)]="subject.externalId" />
+
+ + +
diff --git a/src/main/webapp/app/shared/subject/subject.model.ts b/src/main/webapp/app/shared/subject/subject.model.ts index c9492a5a3..0305f45c0 100644 --- a/src/main/webapp/app/shared/subject/subject.model.ts +++ b/src/main/webapp/app/shared/subject/subject.model.ts @@ -12,6 +12,7 @@ export class Subject { public createdDate?: Date; public lastModifiedBy?: string; public lastModifiedDate?: Date; + public group?: string; public password?: string; public project?: Project; public sources?: MinimalSource[]; @@ -29,6 +30,7 @@ export class Subject { createdDate?: Date, lastModifiedBy?: string, lastModifiedDate?: Date, + group?: string, password?: string, project?: Project, sources?: MinimalSource[], @@ -42,6 +44,7 @@ export class Subject { this.createdDate = createdDate ? createdDate : null; this.lastModifiedBy = lastModifiedBy ? lastModifiedBy : null; this.lastModifiedDate = lastModifiedDate ? lastModifiedDate : null; + this.group = group ? group : null; this.password = password ? password : null; this.project = project ? project : null; this.sources = sources ? sources : []; diff --git a/src/main/webapp/i18n/en/subject.json b/src/main/webapp/i18n/en/subject.json index 463e43601..a58c07997 100644 --- a/src/main/webapp/i18n/en/subject.json +++ b/src/main/webapp/i18n/en/subject.json @@ -81,6 +81,7 @@ "validity": "Validity", "selectAll": "Select all", "addSelectedToGroup": "Add to group", + "group": "Group", "loadMore": "Load more ({{shown}}/{{total}} shown)", "allLoaded": "All {{total}} subjects loaded", "generateToken": "Generate QR code", diff --git a/src/main/webapp/i18n/nl/subject.json b/src/main/webapp/i18n/nl/subject.json index 1fce8fe19..3846239d5 100644 --- a/src/main/webapp/i18n/nl/subject.json +++ b/src/main/webapp/i18n/nl/subject.json @@ -81,6 +81,7 @@ "validity": "Geldigheidsduur", "selectAll": "Selecteer alles", "addSelectedToGroup": "Aan groep toevoegen", + "group": "Groep", "loadMore": "Meer laden ({{shown}}/{{total}} getoond)", "allLoaded": "Alle {{total}} subjects geladen", "generateToken": "Genereer QR code", From 181f427cff6c22d05e86d2f0e62ad72349d2fa21 Mon Sep 17 00:00:00 2001 From: aykl Date: Sat, 4 Sep 2021 01:47:34 +0200 Subject: [PATCH 009/431] Filter Panel added --- .../app/shared/subject/subject.component.html | 21 +++++++++++++++++- .../app/shared/subject/subject.component.scss | 22 +++++++++++++++++++ src/main/webapp/i18n/en/subject.json | 4 ++++ src/main/webapp/i18n/nl/subject.json | 4 ++++ 4 files changed, 50 insertions(+), 1 deletion(-) diff --git a/src/main/webapp/app/shared/subject/subject.component.html b/src/main/webapp/app/shared/subject/subject.component.html index 08b507f68..e116d12d7 100644 --- a/src/main/webapp/app/shared/subject/subject.component.html +++ b/src/main/webapp/app/shared/subject/subject.component.html @@ -1,4 +1,22 @@ -
+
+
+

+ + + + +
+

+

diff --git a/src/main/webapp/app/shared/subject/subject.component.scss b/src/main/webapp/app/shared/subject/subject.component.scss index d9b89b223..765738695 100644 --- a/src/main/webapp/app/shared/subject/subject.component.scss +++ b/src/main/webapp/app/shared/subject/subject.component.scss @@ -1,4 +1,26 @@ +.subject-wrapper { + display: flex; +} +.subject-filter { + flex-grow: 0; + max-width: 200px; + display: flex; + flex-direction: column; + padding: 8px 16px; + border-right: 1px solid #dadada; +} +.subject-filter input { + max-width: 100%; +} +.subject-filter > button { + margin-top: 16px +} + +.subject-wrapper > section { + flex-grow: 1; + padding-left: 16px; +} .subject-row { display: flex; diff --git a/src/main/webapp/i18n/en/subject.json b/src/main/webapp/i18n/en/subject.json index a58c07997..d2e505619 100644 --- a/src/main/webapp/i18n/en/subject.json +++ b/src/main/webapp/i18n/en/subject.json @@ -16,6 +16,10 @@ "detail": { "title": "Subject" }, + "filter": { + "title": "Filter", + "applyButton": "Apply filter" + }, "login": "Login", "email": "Email", "externalLink": "External Link", diff --git a/src/main/webapp/i18n/nl/subject.json b/src/main/webapp/i18n/nl/subject.json index 3846239d5..b78594b67 100644 --- a/src/main/webapp/i18n/nl/subject.json +++ b/src/main/webapp/i18n/nl/subject.json @@ -16,6 +16,10 @@ "detail": { "title": "Subject" }, + "filter": { + "title": "Filter", + "applyButton": "Filter toepassen" + }, "login": "Login", "email": "Email", "externalLink": "External Link", From 8949bc1c7adb51867beaa97d44bfe243a5b958f0 Mon Sep 17 00:00:00 2001 From: aykl Date: Sat, 4 Sep 2021 01:52:00 +0200 Subject: [PATCH 010/431] Heading added to General Subject Page --- .../webapp/app/entities/subject/general.subject.component.html | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/webapp/app/entities/subject/general.subject.component.html b/src/main/webapp/app/entities/subject/general.subject.component.html index 3245f8692..15b5bd8ad 100644 --- a/src/main/webapp/app/entities/subject/general.subject.component.html +++ b/src/main/webapp/app/entities/subject/general.subject.component.html @@ -1 +1,2 @@ +

From 39ccbad13bd68a5dac2bcc552de44776a0f3fb00 Mon Sep 17 00:00:00 2001 From: aykl Date: Wed, 22 Sep 2021 14:05:33 +0200 Subject: [PATCH 011/431] Group Entity added --- .../radarbase/management/domain/Group.java | 113 ++++++++++++++++++ .../radarbase/management/domain/Project.java | 13 ++ .../management/service/dto/GroupDTO.java | 63 ++++++++++ .../management/service/dto/ProjectDTO.java | 10 ++ .../decorator/ProjectMapperDecorator.java | 5 + .../changelog/20210920101000_add_groups.xml | 79 ++++++++++++ .../resources/config/liquibase/master.xml | 1 + .../project/project-dialog.component.html | 4 +- .../project/project-dialog.component.ts | 8 +- .../app/shared/project/project.model.ts | 3 +- .../app/shared/subject/subject.model.ts | 5 + 11 files changed, 298 insertions(+), 6 deletions(-) create mode 100644 src/main/java/org/radarbase/management/domain/Group.java create mode 100644 src/main/java/org/radarbase/management/service/dto/GroupDTO.java create mode 100644 src/main/resources/config/liquibase/changelog/20210920101000_add_groups.xml diff --git a/src/main/java/org/radarbase/management/domain/Group.java b/src/main/java/org/radarbase/management/domain/Group.java new file mode 100644 index 000000000..b63eb4fe3 --- /dev/null +++ b/src/main/java/org/radarbase/management/domain/Group.java @@ -0,0 +1,113 @@ +/* + * Copyright (c) 2021 The Hyve and respective contributors. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * See the file LICENSE in the root of this repository. + */ + +package org.radarbase.management.domain; + +import com.fasterxml.jackson.annotation.JsonIgnore; +import javax.persistence.FetchType; + +import org.hibernate.annotations.Cache; +import org.hibernate.annotations.CacheConcurrencyStrategy; +import org.hibernate.envers.Audited; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; +import javax.persistence.SequenceGenerator; +import javax.persistence.Table; +import javax.validation.constraints.NotNull; +import javax.validation.constraints.Size; + +import java.io.Serializable; +import java.util.Objects; + +/** + * A Group. + */ +@Entity +@Audited +@Table(name = "radar_group") +@Cache(usage = CacheConcurrencyStrategy.NONSTRICT_READ_WRITE) +public class Group extends AbstractEntity implements Serializable { + + private static final long serialVersionUID = 1L; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "sequenceGenerator") + @SequenceGenerator(name = "sequenceGenerator", initialValue = 1000) + private Long id; + + @NotNull + @Size(min = 1, max = 50) + @Column(name = "group_name", length = 50, nullable = false, unique = false) + private String groupName; + + @JsonIgnore + @ManyToOne(fetch = FetchType.EAGER, optional = false) + @JoinColumn(name = "project_id") + @Cache(usage = CacheConcurrencyStrategy.NONSTRICT_READ_WRITE) + private Project project; + + @Override + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getGroupName() { + return groupName; + } + + public void setGroupName(String groupName) { + this.groupName = groupName; + } + + public Project getProject() { + return project; + } + + public void setProject(Project project) { + this.project = project; + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + Group group = (Group) o; + if (group.id == null || id == null) { + return false; + } + return Objects.equals(id, group.id); + } + + @Override + public int hashCode() { + return Objects.hashCode(id); + } + + @Override + public String toString() { + return "Group{" + + "id=" + id + ", " + + "groupName=" + groupName + ", " + + "project='" + project.getProjectName() + "', " + + "}"; + } + +} diff --git a/src/main/java/org/radarbase/management/domain/Project.java b/src/main/java/org/radarbase/management/domain/Project.java index 83e96f859..b97274303 100644 --- a/src/main/java/org/radarbase/management/domain/Project.java +++ b/src/main/java/org/radarbase/management/domain/Project.java @@ -100,6 +100,10 @@ public class Project extends AbstractEntity implements Serializable { @CollectionTable(name = "project_metadata", joinColumns = @JoinColumn(name = "id")) private Map attributes = new HashMap<>(); + @OneToMany(mappedBy = "project", fetch = FetchType.LAZY, orphanRemoval = true) + @Cascade(org.hibernate.annotations.CascadeType.ALL) + private Set groups = new HashSet<>(); + @Override public Long getId() { return id; @@ -256,6 +260,15 @@ public void setAttributes(Map attributes) { this.attributes = attributes; } + public Set getGroups() { + return groups; + } + + @JsonSetter(nulls = Nulls.AS_EMPTY) + public void setGroups(Set groups) { + this.groups = groups; + } + @Override public boolean equals(Object o) { if (this == o) { diff --git a/src/main/java/org/radarbase/management/service/dto/GroupDTO.java b/src/main/java/org/radarbase/management/service/dto/GroupDTO.java new file mode 100644 index 000000000..336d03dc5 --- /dev/null +++ b/src/main/java/org/radarbase/management/service/dto/GroupDTO.java @@ -0,0 +1,63 @@ +package org.radarbase.management.service.dto; + +import java.io.Serializable; +import java.util.Objects; + +/** + * A DTO for the Group entity. + */ +public class GroupDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + private Long id; + + private String groupName; + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getGroupName() { + return groupName; + } + + public void setGroupName(String groupName) { + this.groupName = groupName; + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + + GroupDTO groupDto = (GroupDTO) o; + + if (id == null || groupDto.id == null) { + return false; + } + + return Objects.equals(id, groupDto.id); + } + + @Override + public int hashCode() { + return Objects.hashCode(id); + } + + @Override + public String toString() { + return "GroupDTO{" + + "id=" + id + + ", groupName='" + groupName + "'" + + '}'; + } +} diff --git a/src/main/java/org/radarbase/management/service/dto/ProjectDTO.java b/src/main/java/org/radarbase/management/service/dto/ProjectDTO.java index 4765d8ccd..b5722004e 100644 --- a/src/main/java/org/radarbase/management/service/dto/ProjectDTO.java +++ b/src/main/java/org/radarbase/management/service/dto/ProjectDTO.java @@ -50,6 +50,8 @@ public class ProjectDTO implements Serializable { private Map attributes; + private Set groups; + private Long persistentTokenTimeout; public Long getId() { @@ -132,6 +134,14 @@ public void setAttributes(Map attributes) { this.attributes = attributes; } + public Set getGroups() { + return groups; + } + + public void setGroups(Set groups) { + this.groups = groups; + } + public String getHumanReadableProjectName() { return humanReadableProjectName; } diff --git a/src/main/java/org/radarbase/management/service/mapper/decorator/ProjectMapperDecorator.java b/src/main/java/org/radarbase/management/service/mapper/decorator/ProjectMapperDecorator.java index 1c8c0188a..34c8f3c98 100644 --- a/src/main/java/org/radarbase/management/service/mapper/decorator/ProjectMapperDecorator.java +++ b/src/main/java/org/radarbase/management/service/mapper/decorator/ProjectMapperDecorator.java @@ -2,6 +2,7 @@ import static org.radarbase.management.service.dto.ProjectDTO.HUMAN_READABLE_PROJECT_NAME; +import org.radarbase.management.domain.Group; import org.radarbase.management.domain.Project; import org.radarbase.management.repository.ProjectRepository; import org.radarbase.management.service.OAuthClientService; @@ -69,6 +70,10 @@ public Project projectDTOToProject(ProjectDTO projectDto) { if (projectName != null && !projectName.isEmpty()) { project.getAttributes().put(HUMAN_READABLE_PROJECT_NAME, projectName); } + // Ensure that project_id will be set on each group + for (Group g : project.getGroups()) { + g.setProject(project); + } return project; } diff --git a/src/main/resources/config/liquibase/changelog/20210920101000_add_groups.xml b/src/main/resources/config/liquibase/changelog/20210920101000_add_groups.xml new file mode 100644 index 000000000..42c5cd720 --- /dev/null +++ b/src/main/resources/config/liquibase/changelog/20210920101000_add_groups.xml @@ -0,0 +1,79 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/resources/config/liquibase/master.xml b/src/main/resources/config/liquibase/master.xml index 496e84bc9..6b71a65f8 100644 --- a/src/main/resources/config/liquibase/master.xml +++ b/src/main/resources/config/liquibase/master.xml @@ -33,5 +33,6 @@ + diff --git a/src/main/webapp/app/entities/project/project-dialog.component.html b/src/main/webapp/app/entities/project/project-dialog.component.html index 5334bd0c0..d6ff6b5ed 100644 --- a/src/main/webapp/app/entities/project/project-dialog.component.html +++ b/src/main/webapp/app/entities/project/project-dialog.component.html @@ -154,9 +154,9 @@

- {{g}} + {{g.groupName}}
diff --git a/src/main/webapp/app/entities/project/project-dialog.component.ts b/src/main/webapp/app/entities/project/project-dialog.component.ts index 808449c66..5c7b47012 100644 --- a/src/main/webapp/app/entities/project/project-dialog.component.ts +++ b/src/main/webapp/app/entities/project/project-dialog.component.ts @@ -136,13 +136,15 @@ export class ProjectDialogComponent implements OnInit { addGroup() { // TODO implement group name validation let currentGroups = this.project.groups || []; - this.project.groups = [ ...currentGroups, this.newGroupInputText ]; + let newGroup = { groupName: this.newGroupInputText }; + this.project.groups = [ ...currentGroups, newGroup ]; this.newGroupInputText = ''; } - removeGroups(groupName: string) { + removeGroup(groupName: string) { // TODO warn if it will affect existing subjects (on save, expect HTTP 409) - this.project.groups = this.project.groups.filter(g => g !== groupName); + let oldGroups = this.project.groups; + this.project.groups = oldGroups.filter(g => g.groupName !== groupName); } } diff --git a/src/main/webapp/app/shared/project/project.model.ts b/src/main/webapp/app/shared/project/project.model.ts index 24edad188..3d2b2b590 100644 --- a/src/main/webapp/app/shared/project/project.model.ts +++ b/src/main/webapp/app/shared/project/project.model.ts @@ -1,4 +1,5 @@ import {SourceType} from '../../entities/source-type'; +import { Group } from '../subject'; export const enum ProjectStatus { 'PLANNING', @@ -18,7 +19,7 @@ export class Project { public endDate?: any, public attributes ?: any, public sourceTypes?: SourceType[], - public groups?: string[], + public groups?: Group[], public humanReadableProjectName ?: string, public persistentTokenTimeout?: number ) { diff --git a/src/main/webapp/app/shared/subject/subject.model.ts b/src/main/webapp/app/shared/subject/subject.model.ts index 0305f45c0..4318d6c14 100644 --- a/src/main/webapp/app/shared/subject/subject.model.ts +++ b/src/main/webapp/app/shared/subject/subject.model.ts @@ -59,3 +59,8 @@ export const enum SubjectStatus { 'DISCONTINUED', 'INVALID' } + +export class Group { + public id?: any; + public groupName?: string; +} From f573e1b9e1fb77866ff115b78eb4c20538a5b60c Mon Sep 17 00:00:00 2001 From: nivethika Date: Mon, 27 Sep 2021 13:52:32 +0200 Subject: [PATCH 012/431] minor updates to README.md --- README.md | 47 +++++++++-------------------------------------- 1 file changed, 9 insertions(+), 38 deletions(-) diff --git a/README.md b/README.md index 3c3a66dc8..18a62935f 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ [![Codacy Badge](https://api.codacy.com/project/badge/Grade/d6945ebd1eba4a3fbb55882cda33655e)](https://www.codacy.com/app/RADAR-base/ManagementPortal?utm_source=github.com&utm_medium=referral&utm_content=RADAR-base/ManagementPortal&utm_campaign=Badge_Grade) [![Codacy Badge](https://api.codacy.com/project/badge/Coverage/d6945ebd1eba4a3fbb55882cda33655e)](https://www.codacy.com/app/RADAR-base/ManagementPortal?utm_source=github.com&utm_medium=referral&utm_content=RADAR-base/ManagementPortal&utm_campaign=Badge_Coverage) -ManagementPortal is an application which is used to manage pilot studies for [RADAR-base](http://www.radar-base.org/). +Management Portal is an application which is used to manage clinical studies for [RADAR-base](http://www.radar-base.org/) platform. ## Table of contents @@ -32,7 +32,7 @@ ManagementPortal is an application which is used to manage pilot studies for [RA Management Portal can be easily run either by running from source or by using the provided `docker-compose` file. ### Using Docker-Compose -The quickest way to get ManagementPortal up and running in production mode is by using the included +The quickest way to get Management Portal up and running in production mode is by using the included docker-compose files. 1. Make sure [Docker][] and [Docker-Compose][] are installed on your system. 2. Generate a key pair for signing JWT tokens as follows: @@ -57,7 +57,7 @@ you must install and configure the following dependencies on your machine to run **Make sure the key password and store password are the same!** This is a requirement for Spring Security. 4. **Profile configurations :** ManagementPortal can be run with either `development` or `production` profile. The table below lists the -main differences between the profiles are mentioned in the table below. Configure the application using the property file at `src/main/resources/config/application-.yml`.Read more about configurations [here](#configuration) +main differences between the profiles. Configure the application using the property file at `src/main/resources/config/application-.yml`.Read more about configurations [here](#configuration) 5. Run ManagementPortal by running `./gradlew bootRun -Pprod` or `./gradlew bootRun -Pdev`. Development mode will start an in memory database and ManagementPortal. @@ -73,7 +73,7 @@ memory database and ManagementPortal. -The docker image can be pulled by running `docker pull radarbase/management-portal`. +The docker image can be pulled by running `docker pull radarbase/management-portal:latest`. ## Configuration @@ -217,39 +217,13 @@ auto-refreshes when files change on your hard drive. ./gradlew yarn start -Then open to start the interface and sign in with admin/admin. +Then open to start the interface and sign in with admin/admin. [Yarn][] is also used to manage CSS and JavaScript dependencies used in this application. You can upgrade dependencies by specifying a newer version in [package.json](package.json). You can also run `yarn update` and `yarn install` to manage dependencies. Add the `help` flag on any command to see how you can use it. For example, `yarn help update`. -The `yarn run` command will list all of the scripts available to run for this project. - -### Managing dependencies - -For example, to add [Leaflet][] library as a runtime dependency of your application, you would run following command: - - yarn add --exact leaflet - -To benefit from TypeScript type definitions from [DefinitelyTyped][] repository in development, you would run following command: - - yarn add --dev --exact @types/leaflet - -Then you would import the JS and CSS files specified in library's installation instructions so that [Webpack][] knows about them: - -Edit [src/main/webapp/app/vendor.ts](src/main/webapp/app/vendor.ts) file: -~~~ -import 'leaflet/dist/leaflet.js'; -~~~ - -Edit [src/main/webapp/content/css/vendor.css](src/main/webapp/content/css/vendor.css) file: -~~~ -@import '~leaflet/dist/leaflet.css'; -~~~ - -Note: there are still few other things remaining to do for Leaflet that we won't detail here. - -For further instructions on how to develop with JHipster, have a look at [Using JHipster in development][]. +The `yarn run` command will list all the scripts available to run for this project. ### Using angular-cli @@ -281,7 +255,6 @@ To ensure everything worked, run: Then navigate to [http://localhost:8080](http://localhost:8080) in your browser. -Refer to [Using JHipster in production][] for more details. ## Testing @@ -295,7 +268,7 @@ Unit tests are run by [Karma][] and written with [Jasmine][]. They're located in yarn test -UI end-to-end tests are powered by [Protractor][], which is built on top of WebDriverJS. They're located in [src/test/javascript/e2e](src/test/javascript/e2e) +UI end-to-end tests are powered by [Cypress][], which is built on top of WebDriverJS. They're located in [src/test/javascript/e2e](src/test/javascript/e2e) and can be run by starting Spring Boot in one terminal (`./gradlew bootRun`) and running the tests (`yarn run e2e`) in a second one. ### Other tests @@ -332,13 +305,12 @@ Then run: For more information refer to [Using Docker and Docker-Compose][], this page also contains information on the docker-compose sub-generator (`yo jhipster:docker-compose`), which is able to generate docker configurations for one or several JHipster applications. ## Documentation -Visit our [Github pages](https://radar-base.github.io/ManagementPortal) site to find links to the -Javadoc and API docs. +Please find the links for some of the documentation per category/component * [management-portal-javadoc](https://radar-base.github.io/ManagementPortal/management-portal-javadoc/) * [oauth-client-util-javadoc](https://radar-base.github.io/ManagementPortal/oauth-client-util-javadoc/) * [radar-auth-javadoc](https://radar-base.github.io/ManagementPortal/radar-auth-javadoc/) * [managementportal-client-javadoc](https://radar-base.github.io/ManagementPortal/managementportal-client-javadoc/) -* [apidoc](https://radar-base.github.io/ManagementPortal/apidoc/swagger.json) +* [Swagger 2.0 apidoc](https://radar-base.github.io/ManagementPortal/apidoc/swagger.json) The pages site is published from the `gh-pages` branch, which has its own history. If you want to contribute to the documentation, it is probably more convenient to clone a separate copy of this @@ -361,7 +333,6 @@ The resulting file can be imported into the [Swagger editor], or used with [Swag [Using JHipster in development]: https://jhipster.github.io/documentation-archive/v4.3.0/development/ [Using Docker and Docker-Compose]: https://jhipster.github.io/documentation-archive/v4.3.0/docker-compose -[Using JHipster in production]: https://jhipster.github.io/documentation-archive/v4.3.0/production/ [Running tests page]: https://jhipster.github.io/documentation-archive/v4.3.0/running-tests/ [Setting up Continuous Integration]: https://jhipster.github.io/documentation-archive/v4.3.0/setting-up-ci/ From dc5c97f6a2f02ea156e41149f6ac93d2c97b366b Mon Sep 17 00:00:00 2001 From: aykl Date: Tue, 28 Sep 2021 08:24:03 +0200 Subject: [PATCH 013/431] Group Mapping fixed --- .../service/mapper/decorator/ProjectMapperDecorator.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/main/java/org/radarbase/management/service/mapper/decorator/ProjectMapperDecorator.java b/src/main/java/org/radarbase/management/service/mapper/decorator/ProjectMapperDecorator.java index 34c8f3c98..1b21b60e4 100644 --- a/src/main/java/org/radarbase/management/service/mapper/decorator/ProjectMapperDecorator.java +++ b/src/main/java/org/radarbase/management/service/mapper/decorator/ProjectMapperDecorator.java @@ -2,6 +2,8 @@ import static org.radarbase.management.service.dto.ProjectDTO.HUMAN_READABLE_PROJECT_NAME; +import java.util.HashSet; + import org.radarbase.management.domain.Group; import org.radarbase.management.domain.Project; import org.radarbase.management.repository.ProjectRepository; @@ -70,6 +72,9 @@ public Project projectDTOToProject(ProjectDTO projectDto) { if (projectName != null && !projectName.isEmpty()) { project.getAttributes().put(HUMAN_READABLE_PROJECT_NAME, projectName); } + if (project.getGroups() == null) { + project.setGroups(new HashSet<>()); + } // Ensure that project_id will be set on each group for (Group g : project.getGroups()) { g.setProject(project); From 38d3e3e6da3b65d5d5d013e089439d02d6f6458d Mon Sep 17 00:00:00 2001 From: aykl Date: Tue, 28 Sep 2021 09:12:39 +0200 Subject: [PATCH 014/431] SubjectFilter implemented --- .../repository/SubjectRepository.java | 18 +- .../repository/filters/SubjectFilter.java | 215 ++++++++++++++++++ .../management/service/SubjectService.java | 24 +- .../management/web/rest/ProjectResource.java | 46 ++-- .../management/web/rest/SubjectResource.java | 29 +-- .../app/shared/subject/subject.component.ts | 27 +-- .../app/shared/subject/subject.service.ts | 26 ++- src/main/webapp/i18n/en/subject.json | 2 + src/main/webapp/i18n/nl/subject.json | 2 + 9 files changed, 296 insertions(+), 93 deletions(-) create mode 100644 src/main/java/org/radarbase/management/repository/filters/SubjectFilter.java diff --git a/src/main/java/org/radarbase/management/repository/SubjectRepository.java b/src/main/java/org/radarbase/management/repository/SubjectRepository.java index 1888ba602..2911b09bc 100644 --- a/src/main/java/org/radarbase/management/repository/SubjectRepository.java +++ b/src/main/java/org/radarbase/management/repository/SubjectRepository.java @@ -5,9 +5,11 @@ import java.util.UUID; import org.radarbase.management.domain.Source; import org.radarbase.management.domain.Subject; +import org.radarbase.management.repository.filters.SubjectFilter; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.JpaSpecificationExecutor; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.RepositoryDefinition; import org.springframework.data.repository.history.RevisionRepository; @@ -19,19 +21,9 @@ @SuppressWarnings("unused") @RepositoryDefinition(domainClass = Subject.class, idClass = Long.class) public interface SubjectRepository extends JpaRepository, - RevisionRepository { - - @Query(value = "select distinct subject from Subject subject left join fetch subject.sources", - countQuery = "select distinct count(subject) from Subject subject") - Page findAllWithEagerRelationships(Pageable pageable); - - @Query(value = "select distinct subject from Subject subject left join fetch subject.sources " - + "left join fetch subject.user user " - + "join user.roles roles where roles.project.projectName = :projectName", - countQuery = "select distinct count(subject) from Subject subject " - + "left join subject.user user left join user.roles roles " - + "where roles.project.projectName = :projectName") - Page findAllByProjectName(Pageable pageable, @Param("projectName") String projectName); + RevisionRepository, + JpaSpecificationExecutor +{ @Query(value = "select distinct subject from Subject subject left join fetch subject.sources " + "left join fetch subject.user user " diff --git a/src/main/java/org/radarbase/management/repository/filters/SubjectFilter.java b/src/main/java/org/radarbase/management/repository/filters/SubjectFilter.java new file mode 100644 index 000000000..857292e1c --- /dev/null +++ b/src/main/java/org/radarbase/management/repository/filters/SubjectFilter.java @@ -0,0 +1,215 @@ +package org.radarbase.management.repository.filters; + +import static org.radarbase.auth.authorization.AuthoritiesConstants.INACTIVE_PARTICIPANT; +import static org.radarbase.auth.authorization.AuthoritiesConstants.PARTICIPANT; + +import org.apache.commons.lang3.StringUtils; +import org.radarbase.management.domain.Role; +import org.radarbase.management.domain.Subject; +import org.radarbase.management.domain.User; +import org.springframework.data.jpa.domain.Specification; + +import javax.persistence.criteria.CriteriaBuilder; +import javax.persistence.criteria.CriteriaQuery; +import javax.persistence.criteria.Join; +import javax.persistence.criteria.JoinType; +import javax.persistence.criteria.Order; +import javax.persistence.criteria.Path; +import javax.persistence.criteria.Predicate; +import javax.persistence.criteria.Root; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.List; + + +public class SubjectFilter implements Specification { + private boolean includeInactive = false; + private Long lastLoadedId = null; + private Integer pageSize = 10; + private String projectName = null; + private SubjectSortBy sortBy = SubjectSortBy.ID; + private SubjectSortDirection sortDirection = SubjectSortDirection.ASC; + + @Override + public Predicate toPredicate(Root root, CriteriaQuery query, CriteriaBuilder builder) { + System.out.println("Include inactive: " + includeInactive); + System.out.println("Project name: " + projectName); + System.out.println("Subject sort by: " + sortBy); + System.out.println("Subject sort direction: " + sortDirection); + query.distinct(true); + + root.alias("subject"); + Class queryResult = query.getResultType(); + boolean isCountQuery = queryResult == Long.class || queryResult == long.class; + if (!isCountQuery) { + root.fetch("sources", JoinType.LEFT); + root.fetch("user", JoinType.LEFT); + } + Join userJoin = root.join("user"); + userJoin.alias("user"); + Join rolesJoin = userJoin.join("roles"); + rolesJoin.alias("roles"); + + List predicates = new ArrayList<>(); + if (StringUtils.isNotEmpty(projectName)) { + Predicate filterProject = builder.equal( + rolesJoin.get("project").get("projectName"), + projectName); + predicates.add(filterProject); + } + List authorities = includeInactive + ? Arrays.asList(PARTICIPANT, INACTIVE_PARTICIPANT) + : Collections.singletonList(PARTICIPANT); + Predicate filterAuthorities = + rolesJoin.get("authority").get("name").in(authorities); + predicates.add(filterAuthorities); + + if (lastLoadedId != null) { + if (sortBy == SubjectSortBy.ID && sortDirection == SubjectSortDirection.DESC) { + predicates.add(builder.lessThan(root.get("id"), lastLoadedId)); + } else { + predicates.add(builder.greaterThan(root.get("id"), lastLoadedId)); + } + } + + List orderList = new ArrayList<>(); + + Path sortingPath = null; + switch (sortBy) { + case ID: + sortingPath = root.get("id"); + break; + case EXTERNAL_ID: + sortingPath = root.get("externalId"); + break; + case USER_ACTIVATED: + sortingPath = root.get("user").get("activated"); + break; + case USER_LOGIN: + sortingPath = root.get("user").get("login"); + break; + case UNKNOWN: + throw new IllegalStateException("BUG: filter was not validated"); + default: + throw new IllegalStateException("BUG: sortBy was not initalized"); + } + if (sortDirection == SubjectSortDirection.DESC) { + orderList.add(builder.desc(sortingPath)); + } else { + orderList.add(builder.asc(sortingPath)); + } + // We need to guarantee that the sorting is stable to make pagination work + if (sortBy != SubjectSortBy.ID) { + orderList.add(builder.asc(root.get("id"))); + } + + query.orderBy(orderList); + + return builder.and(predicates.toArray(new Predicate[0])); + } + + public Boolean getWithInactiveParticipants() { + return this.includeInactive; + } + + public void setWithInactiveParticipants(Boolean value) { + this.includeInactive = Boolean.TRUE.equals(value); + } + + public void setLastLoadedId(Long lastLoadedId) { + this.lastLoadedId = lastLoadedId; + } + + public String getProjectName() { + return this.projectName; + } + + public Integer getPageSize() { + return this.pageSize; + } + + public void setPageSize(Integer pageSize) { + this.pageSize = pageSize; + } + + public void setProjectName(String projectName) { + this.projectName = projectName; + } + + public void setSortBy(String sortBy) { + this.sortBy = SubjectSortBy.fromString(sortBy); + } + + public void setSortDirection(String sortDirection) { + this.sortDirection = SubjectSortDirection.fromString(sortDirection); + } + + /** + * Return an error message to be used for a 404 response + * in case of e.g. an unknown sortBy key. + */ + public String getFilterValidationError() { + if (pageSize == null || pageSize <= 0) { + return "Unexpected pageSize value"; + } + if (sortBy == SubjectSortBy.UNKNOWN) { + return "Unexpected sortBy value"; + } + if (sortDirection == SubjectSortDirection.UNKNOWN) { + return "Unexpected sortDirection value"; + } + return null; + } + + private enum SubjectSortBy { + ID("id"), + EXTERNAL_ID("externalId"), + USER_LOGIN("user.login"), + USER_ACTIVATED("user.activated"), + UNKNOWN(null); + + private final String key; + + SubjectSortBy(String key) { + this.key = key; + } + + public static SubjectSortBy fromString(String text) { + if (StringUtils.isEmpty(text)) { + return ID; + } + for (SubjectSortBy s : SubjectSortBy.values()) { + if (s.key.equalsIgnoreCase(text)) { + return s; + } + } + return UNKNOWN; + } + } + + private enum SubjectSortDirection { + ASC("asc"), + DESC("desc"), + UNKNOWN(null); + + private final String key; + + SubjectSortDirection(String key) { + this.key = key; + } + + public static SubjectSortDirection fromString(String text) { + if (StringUtils.isEmpty(text)) { + return ASC; + } + for (SubjectSortDirection d : SubjectSortDirection.values()) { + if (d.key.equalsIgnoreCase(text)) { + return d; + } + } + return UNKNOWN; + } + } +} diff --git a/src/main/java/org/radarbase/management/service/SubjectService.java b/src/main/java/org/radarbase/management/service/SubjectService.java index b57ec9d60..56097d519 100644 --- a/src/main/java/org/radarbase/management/service/SubjectService.java +++ b/src/main/java/org/radarbase/management/service/SubjectService.java @@ -39,6 +39,7 @@ import org.radarbase.management.repository.RoleRepository; import org.radarbase.management.repository.SourceRepository; import org.radarbase.management.repository.SubjectRepository; +import org.radarbase.management.repository.filters.SubjectFilter; import org.radarbase.management.service.dto.MinimalSourceDetailsDTO; import org.radarbase.management.service.dto.SubjectDTO; import org.radarbase.management.service.dto.UserDTO; @@ -55,6 +56,7 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Page; +import org.springframework.data.domain.PageRequest; import org.springframework.data.domain.Pageable; import org.springframework.data.history.Revisions; import org.springframework.security.crypto.password.PasswordEncoder; @@ -195,18 +197,6 @@ private Set updateParticipantRoles(Subject subject, SubjectDTO subjectDto) return managedRoles; } - - /** - * Get a page of subjects. - * - * @param pageable the page information - * @return the requested page of subjects - */ - public Page findAll(Pageable pageable) { - return subjectRepository.findAllWithEagerRelationships(pageable) - .map(subjectMapper::subjectToSubjectReducedProjectDTO); - } - /** * Discontinue the given subject. * @@ -455,6 +445,16 @@ public Subject findOneByLogin(String login) { ); } + public Page findAll(SubjectFilter filter) { + // Pageable is required to set the page limit, + // but the page should always be zero + // since the lastLoadedId param defines the offset + // within the query specification + Pageable pageable = PageRequest.of(0, filter.getPageSize()); + return subjectRepository.findAll(filter, pageable) + .map(subjectMapper::subjectToSubjectWithoutProjectDTO); + } + /** * Gets relevant privacy-policy-url for this subject. *

diff --git a/src/main/java/org/radarbase/management/web/rest/ProjectResource.java b/src/main/java/org/radarbase/management/web/rest/ProjectResource.java index 0666533dd..92196c6ea 100644 --- a/src/main/java/org/radarbase/management/web/rest/ProjectResource.java +++ b/src/main/java/org/radarbase/management/web/rest/ProjectResource.java @@ -6,18 +6,19 @@ import org.radarbase.auth.exception.NotAuthorizedException; import org.radarbase.auth.token.RadarToken; import org.radarbase.management.repository.ProjectRepository; -import org.radarbase.management.repository.SubjectRepository; +import org.radarbase.management.repository.filters.SubjectFilter; import org.radarbase.management.service.ProjectService; import org.radarbase.management.service.ResourceUriService; import org.radarbase.management.service.RoleService; import org.radarbase.management.service.SourceService; +import org.radarbase.management.service.SubjectService; import org.radarbase.management.service.dto.MinimalSourceDetailsDTO; import org.radarbase.management.service.dto.ProjectDTO; import org.radarbase.management.service.dto.RoleDTO; import org.radarbase.management.service.dto.SourceDTO; import org.radarbase.management.service.dto.SourceTypeDTO; import org.radarbase.management.service.dto.SubjectDTO; -import org.radarbase.management.service.mapper.SubjectMapper; +import org.radarbase.management.web.rest.errors.BadRequestException; import org.radarbase.management.web.rest.errors.ErrorVM; import org.radarbase.management.web.rest.util.HeaderUtil; import org.radarbase.management.web.rest.util.PaginationUtil; @@ -44,12 +45,9 @@ import javax.servlet.http.HttpServletRequest; import javax.validation.Valid; import java.net.URISyntaxException; -import java.util.Arrays; -import java.util.Collections; import java.util.List; import java.util.Objects; -import static org.radarbase.auth.authorization.AuthoritiesConstants.INACTIVE_PARTICIPANT; import static org.radarbase.auth.authorization.AuthoritiesConstants.PARTICIPANT; import static org.radarbase.auth.authorization.Permission.PROJECT_CREATE; import static org.radarbase.auth.authorization.Permission.PROJECT_DELETE; @@ -61,6 +59,8 @@ import static org.radarbase.auth.authorization.RadarAuthorization.checkPermission; import static org.radarbase.auth.authorization.RadarAuthorization.checkPermissionOnProject; import static org.radarbase.management.security.SecurityUtils.getJWT; +import static org.radarbase.management.web.rest.errors.EntityName.SOURCE_TYPE; +import static org.radarbase.management.web.rest.errors.ErrorConstants.ERR_VALIDATION; import static org.radarbase.management.web.rest.errors.ErrorConstants.ERR_PROJECT_NOT_EMPTY; /** @@ -87,10 +87,7 @@ public class ProjectResource { private RoleService roleService; @Autowired - private SubjectRepository subjectRepository; - - @Autowired - private SubjectMapper subjectMapper; + private SubjectService subjectService; @Autowired private SourceService sourceService; @@ -302,10 +299,10 @@ public ResponseEntity getAllSourcesForProject(@ApiParam Pageable pageable, */ @GetMapping("/projects/{projectName:" + Constants.ENTITY_ID_REGEX + "}/subjects") @Timed - public ResponseEntity> getAllSubjects(@ApiParam Pageable pageable, - @PathVariable String projectName, - @RequestParam(value = "withInactiveParticipants", required = false) - Boolean inactiveParticipantsParam) throws NotAuthorizedException { + public ResponseEntity> getAllSubjects( + SubjectFilter subjectFilter + ) throws NotAuthorizedException { + String projectName = subjectFilter.getProjectName(); // this checks if the project exists projectService.findOneByName(projectName); RadarToken jwt = getJWT(servletRequest); @@ -313,25 +310,16 @@ public ResponseEntity> getAllSubjects(@ApiParam Pageable pageab if (!jwt.isClientCredentials() && jwt.hasAuthority(PARTICIPANT)) { throw new NotAuthorizedException("Cannot list all project subjects as a participant."); } + String filterError = subjectFilter.getFilterValidationError(); + if (filterError != null) { + throw new BadRequestException(filterError, SOURCE_TYPE, ERR_VALIDATION); + } log.debug("REST request to get all subjects for project {}", projectName); - Page page; - boolean includeInactiveParticipants = inactiveParticipantsParam != null - && inactiveParticipantsParam; - if (includeInactiveParticipants) { - page = subjectRepository.findAllByProjectNameAndAuthoritiesIn(pageable, projectName, - Arrays.asList(PARTICIPANT, INACTIVE_PARTICIPANT)) - .map(subjectMapper::subjectToSubjectWithoutProjectDTO); + Page page = subjectService.findAll(subjectFilter); - } else { - page = subjectRepository.findAllByProjectNameAndAuthoritiesIn(pageable, projectName, - Collections.singletonList(PARTICIPANT)) - .map(subjectMapper::subjectToSubjectWithoutProjectDTO); - } - - HttpHeaders headers = PaginationUtil - .generatePaginationHttpHeaders(page, HeaderUtil.buildPath("api", - "projects", projectName, "subjects")); + String baseUri = HeaderUtil.buildPath("api", "projects", projectName, "subjects"); + HttpHeaders headers = PaginationUtil.generatePaginationHttpHeaders(page, baseUri); return new ResponseEntity<>(page.getContent(), headers, HttpStatus.OK); } } diff --git a/src/main/java/org/radarbase/management/web/rest/SubjectResource.java b/src/main/java/org/radarbase/management/web/rest/SubjectResource.java index 53c0438f5..2bc0c8015 100644 --- a/src/main/java/org/radarbase/management/web/rest/SubjectResource.java +++ b/src/main/java/org/radarbase/management/web/rest/SubjectResource.java @@ -43,6 +43,7 @@ import org.radarbase.management.domain.Subject; import org.radarbase.management.repository.ProjectRepository; import org.radarbase.management.repository.SubjectRepository; +import org.radarbase.management.repository.filters.SubjectFilter; import org.radarbase.management.security.SecurityUtils; import org.radarbase.management.service.ResourceUriService; import org.radarbase.management.service.RevisionService; @@ -241,22 +242,23 @@ public ResponseEntity discontinueSubject(@RequestBody SubjectDTO sub @GetMapping("/subjects") @Timed public ResponseEntity> getAllSubjects( - @PageableDefault(page = 0, size = Integer.MAX_VALUE) Pageable pageable, - @RequestParam(value = "projectName", required = false) String projectName, @RequestParam(value = "externalId", required = false) String externalId, - @RequestParam(value = "withInactiveParticipants", required = false) - Boolean withInactiveParticipantsParam) - throws NotAuthorizedException { + SubjectFilter subjectFilter + ) throws NotAuthorizedException { RadarToken jwt = getJWT(servletRequest); + String projectName = subjectFilter.getProjectName(); checkPermissionOnProject(jwt, SUBJECT_READ, projectName); if (!jwt.isClientCredentials() && jwt.hasAuthority(PARTICIPANT)) { throw new NotAuthorizedException("Cannot list subjects as a participant."); } + String filterError = subjectFilter.getFilterValidationError(); + if (filterError != null) { + throw new BadRequestException(filterError, SOURCE_TYPE, ERR_VALIDATION); + } log.debug("ProjectName {} and external {}", projectName, externalId); // if not specified do not include inactive patients - boolean withInactive = withInactiveParticipantsParam != null - && withInactiveParticipantsParam; + boolean withInactive = subjectFilter.getWithInactiveParticipants(); List authoritiesToInclude = withInactive ? Arrays.asList(PARTICIPANT, INACTIVE_PARTICIPANT) : Collections.singletonList(PARTICIPANT); @@ -273,18 +275,9 @@ public ResponseEntity> getAllSubjects( .findAllByExternalIdAndAuthoritiesIn(externalId, authoritiesToInclude); List dto = subjectMapper.subjectsToSubjectReducedProjectDTOs(subjects); return ResponseEntity.ok(dto); - } else if (projectName != null) { - Page page = subjectRepository - .findAllByProjectNameAndAuthoritiesIn(pageable, projectName, - authoritiesToInclude) - .map(subjectMapper::subjectToSubjectWithoutProjectDTO); - - HttpHeaders headers = PaginationUtil - .generatePaginationHttpHeaders(page, "/api/subjects"); - return new ResponseEntity<>(page.getContent(), headers, HttpStatus.OK); } else { - log.debug("REST request to get all Subjects"); - Page page = subjectService.findAll(pageable); + Page page = subjectService.findAll(subjectFilter); + HttpHeaders headers = PaginationUtil .generatePaginationHttpHeaders(page, "/api/subjects"); return new ResponseEntity<>(page.getContent(), headers, HttpStatus.OK); diff --git a/src/main/webapp/app/shared/subject/subject.component.ts b/src/main/webapp/app/shared/subject/subject.component.ts index 9639de6df..540d7ef3e 100644 --- a/src/main/webapp/app/shared/subject/subject.component.ts +++ b/src/main/webapp/app/shared/subject/subject.component.ts @@ -14,7 +14,7 @@ import { map } from 'rxjs/operators'; import { ITEMS_PER_PAGE, Project } from '..'; import { Subject } from './subject.model'; -import { SubjectService } from './subject.service'; +import { SubjectService, SubjectsPaginationParams } from './subject.service'; import { PagingParams } from '../commons'; import { AlertService } from '../util/alert.service'; import { EventManager } from '../util/event-manager.service'; @@ -80,11 +80,9 @@ export class SubjectComponent implements OnInit, OnDestroy, OnChanges { } private loadAllFromProject() { - this.subjectService.findAllByProject(this.project.projectName, { - page: this.page - 1, - size: this.itemsPerPage, - sort: this.sort(), - }).subscribe( + this.subjectService.findAllByProject(this.project.projectName, + this.queryPaginationParams, + ).subscribe( (res: HttpResponse) => { this.onSuccess(res.body, res.headers); }, @@ -93,13 +91,7 @@ export class SubjectComponent implements OnInit, OnDestroy, OnChanges { } loadAll() { - this.subjectService.query( - { - page: this.page - 1, - size: this.itemsPerPage, - sort: this.sort(), - }, - ).subscribe( + this.subjectService.query(this.queryPaginationParams).subscribe( (res: HttpResponse) => this.onSuccess(res.body, res.headers), (res: HttpErrorResponse) => this.onError(res), ); @@ -143,8 +135,13 @@ export class SubjectComponent implements OnInit, OnDestroy, OnChanges { } } - sort() { - return [this.predicate + ',' + (this.ascending ? 'asc' : 'desc')]; + get queryPaginationParams(): SubjectsPaginationParams { + return { + lastLoadedId: undefined, + pageSize: this.itemsPerPage, + sortBy: this.predicate, + sortDirection: this.ascending ? 'asc' : 'desc', + }; } private onSuccess(data, headers) { diff --git a/src/main/webapp/app/shared/subject/subject.service.ts b/src/main/webapp/app/shared/subject/subject.service.ts index 12c55bfac..cb597537a 100644 --- a/src/main/webapp/app/shared/subject/subject.service.ts +++ b/src/main/webapp/app/shared/subject/subject.service.ts @@ -43,17 +43,31 @@ export class SubjectService { } - query(req?: any): Observable> { - const params = createRequestOption(req); - return this.http.get(this.resourceUrl, {params, observe: 'response'}); + query(paginationParams: SubjectsPaginationParams): Observable> { + return this.http.get(this.resourceUrl, { + params: createRequestOption(paginationParams), + observe: 'response', + }); } delete(login: string): Observable { return this.http.delete(`${this.resourceUrl}/${encodeURIComponent(login)}`); } - findAllByProject(projectName: string, req ?: any): Observable> { - const params = createRequestOption(req); - return this.http.get(`${this.projectResourceUrl}/${projectName}/subjects`, {params, observe: 'response'}); + findAllByProject( + projectName: string, paginationParams: SubjectsPaginationParams + ): Observable> { + let url = `${this.projectResourceUrl}/${projectName}/subjects`; + return this.http.get(url, { + params: createRequestOption(paginationParams), + observe: 'response', + }); } } + +export interface SubjectsPaginationParams { + lastLoadedId?: number, + pageSize?: number, + sortBy?: string, + sortDirection?: 'asc' | 'desc', +} diff --git a/src/main/webapp/i18n/en/subject.json b/src/main/webapp/i18n/en/subject.json index d2e505619..8194f08c3 100644 --- a/src/main/webapp/i18n/en/subject.json +++ b/src/main/webapp/i18n/en/subject.json @@ -67,6 +67,8 @@ "discontinued": "A Subject is discontinued with identifier {{ param }}", "sorting": { "label": "Sort by", + "id.asc": "Id - Ascending", + "id.desc": "Id - Descending", "externalId.asc": "External Id - A to Z", "externalId.desc": "External Id - Z to A", "user.login.asc": "Subject Id - A to Z", diff --git a/src/main/webapp/i18n/nl/subject.json b/src/main/webapp/i18n/nl/subject.json index b78594b67..b60a2ced5 100644 --- a/src/main/webapp/i18n/nl/subject.json +++ b/src/main/webapp/i18n/nl/subject.json @@ -67,6 +67,8 @@ "discontinued": "Een onderwerp wordt beƫindigd met een identificatiecode {{ param }}", "sorting": { "label": "Sorteren op", + "id.asc": "Id - Oplopend", + "id.desc": "Id - Aflopend", "externalId.asc": "External Id - A tot Z", "externalId.desc": "External Id - Z tot A", "user.login.asc": "Subject Id - A tot Z", From e902e8c09a6d5ba7fc9ea376660b8d739a881f7b Mon Sep 17 00:00:00 2001 From: aykl Date: Tue, 28 Sep 2021 09:59:52 +0200 Subject: [PATCH 015/431] SubjectId Filtering implemented --- .../repository/filters/SubjectFilter.java | 23 ++++++++++--- .../app/shared/subject/subject.component.html | 5 +-- .../app/shared/subject/subject.component.ts | 33 ++++++++++++++++--- .../app/shared/subject/subject.service.ts | 18 +++++++--- 4 files changed, 64 insertions(+), 15 deletions(-) diff --git a/src/main/java/org/radarbase/management/repository/filters/SubjectFilter.java b/src/main/java/org/radarbase/management/repository/filters/SubjectFilter.java index 857292e1c..76391c1d0 100644 --- a/src/main/java/org/radarbase/management/repository/filters/SubjectFilter.java +++ b/src/main/java/org/radarbase/management/repository/filters/SubjectFilter.java @@ -29,15 +29,13 @@ public class SubjectFilter implements Specification { private Long lastLoadedId = null; private Integer pageSize = 10; private String projectName = null; + private String externalId = null; + private String subjectId = null; private SubjectSortBy sortBy = SubjectSortBy.ID; private SubjectSortDirection sortDirection = SubjectSortDirection.ASC; @Override public Predicate toPredicate(Root root, CriteriaQuery query, CriteriaBuilder builder) { - System.out.println("Include inactive: " + includeInactive); - System.out.println("Project name: " + projectName); - System.out.println("Subject sort by: " + sortBy); - System.out.println("Subject sort direction: " + sortDirection); query.distinct(true); root.alias("subject"); @@ -66,7 +64,14 @@ public Predicate toPredicate(Root root, CriteriaQuery query, Criteri rolesJoin.get("authority").get("name").in(authorities); predicates.add(filterAuthorities); - if (lastLoadedId != null) { + if (StringUtils.isNotEmpty(externalId)) { + predicates.add(builder.equal(root.get("externalId"), externalId)); + } + if (StringUtils.isNotEmpty(subjectId)) { + predicates.add(builder.equal(userJoin.get("login"), subjectId)); + } + + if (!isCountQuery && lastLoadedId != null) { if (sortBy == SubjectSortBy.ID && sortDirection == SubjectSortDirection.DESC) { predicates.add(builder.lessThan(root.get("id"), lastLoadedId)); } else { @@ -130,6 +135,14 @@ public Integer getPageSize() { return this.pageSize; } + public void setExternalId(String externalId) { + this.externalId = externalId; + } + + public void setSubjectId(String subjectId) { + this.subjectId = subjectId; + } + public void setPageSize(Integer pageSize) { this.pageSize = pageSize; } diff --git a/src/main/webapp/app/shared/subject/subject.component.html b/src/main/webapp/app/shared/subject/subject.component.html index e116d12d7..5fabe97fc 100644 --- a/src/main/webapp/app/shared/subject/subject.component.html +++ b/src/main/webapp/app/shared/subject/subject.component.html @@ -4,14 +4,15 @@

diff --git a/src/main/webapp/app/shared/subject/subject.component.ts b/src/main/webapp/app/shared/subject/subject.component.ts index 540d7ef3e..278ff3d93 100644 --- a/src/main/webapp/app/shared/subject/subject.component.ts +++ b/src/main/webapp/app/shared/subject/subject.component.ts @@ -14,7 +14,11 @@ import { map } from 'rxjs/operators'; import { ITEMS_PER_PAGE, Project } from '..'; import { Subject } from './subject.model'; -import { SubjectService, SubjectsPaginationParams } from './subject.service'; +import { + SubjectService, + SubjectFilterParams, + SubjectsPaginationParams, +} from './subject.service'; import { PagingParams } from '../commons'; import { AlertService } from '../util/alert.service'; import { EventManager } from '../util/event-manager.service'; @@ -48,6 +52,9 @@ export class SubjectComponent implements OnInit, OnDestroy, OnChanges { routeData: any; previousPage: any; + filterExternalId = ''; + filterSubjectId = ''; + @Input() isProjectSpecific: boolean; constructor( @@ -80,7 +87,9 @@ export class SubjectComponent implements OnInit, OnDestroy, OnChanges { } private loadAllFromProject() { - this.subjectService.findAllByProject(this.project.projectName, + this.subjectService.findAllByProject( + this.project.projectName, + this.queryFilterParams, this.queryPaginationParams, ).subscribe( (res: HttpResponse) => { @@ -91,7 +100,10 @@ export class SubjectComponent implements OnInit, OnDestroy, OnChanges { } loadAll() { - this.subjectService.query(this.queryPaginationParams).subscribe( + this.subjectService.query( + this.queryFilterParams, + this.queryPaginationParams, + ).subscribe( (res: HttpResponse) => this.onSuccess(res.body, res.headers), (res: HttpErrorResponse) => this.onError(res), ); @@ -135,9 +147,17 @@ export class SubjectComponent implements OnInit, OnDestroy, OnChanges { } } + get queryFilterParams(): SubjectFilterParams { + return { + subjectId: this.filterSubjectId.trim() || undefined, + externalId: this.filterExternalId.trim() || undefined, + }; + } + get queryPaginationParams(): SubjectsPaginationParams { + let subjects = this.subjects || []; return { - lastLoadedId: undefined, + lastLoadedId: subjects[subjects.length - 1]?.id, pageSize: this.itemsPerPage, sortBy: this.predicate, sortDirection: this.ascending ? 'asc' : 'desc', @@ -151,6 +171,11 @@ export class SubjectComponent implements OnInit, OnDestroy, OnChanges { this.subjects = data; } + applyFilter() { + this.subjects = []; + this.loadSubjects(); + } + loadMore() { // TODO implement loading } diff --git a/src/main/webapp/app/shared/subject/subject.service.ts b/src/main/webapp/app/shared/subject/subject.service.ts index cb597537a..cb90e11d0 100644 --- a/src/main/webapp/app/shared/subject/subject.service.ts +++ b/src/main/webapp/app/shared/subject/subject.service.ts @@ -43,9 +43,12 @@ export class SubjectService { } - query(paginationParams: SubjectsPaginationParams): Observable> { + query( + filterParams: SubjectFilterParams, + paginationParams: SubjectsPaginationParams, + ): Observable> { return this.http.get(this.resourceUrl, { - params: createRequestOption(paginationParams), + params: createRequestOption({ ...paginationParams, ...filterParams }), observe: 'response', }); } @@ -55,16 +58,23 @@ export class SubjectService { } findAllByProject( - projectName: string, paginationParams: SubjectsPaginationParams + projectName: string, + filterParams: SubjectFilterParams, + paginationParams: SubjectsPaginationParams, ): Observable> { let url = `${this.projectResourceUrl}/${projectName}/subjects`; return this.http.get(url, { - params: createRequestOption(paginationParams), + params: createRequestOption({ ...paginationParams, ...filterParams }), observe: 'response', }); } } +export interface SubjectFilterParams { + subjectId?: string, + externalId?: string, +} + export interface SubjectsPaginationParams { lastLoadedId?: number, pageSize?: number, From 4ac93099f719a434c54feaf63b03ab79550462c7 Mon Sep 17 00:00:00 2001 From: aykl Date: Fri, 1 Oct 2021 11:11:45 +0200 Subject: [PATCH 016/431] Group Name added to Subject Entity --- .../org/radarbase/management/domain/Subject.java | 12 ++++++++++++ .../management/repository/ProjectRepository.java | 7 +++++-- .../radarbase/management/service/dto/SubjectDTO.java | 10 ++++++++++ .../changelog/20210920101000_add_groups.xml | 12 ++++++++++++ .../app/shared/subject/subject-detail.component.html | 4 ++++ .../app/shared/subject/subject-dialog.component.html | 11 ++++++++--- src/main/webapp/i18n/en/subject.json | 1 + src/main/webapp/i18n/nl/subject.json | 1 + 8 files changed, 53 insertions(+), 5 deletions(-) diff --git a/src/main/java/org/radarbase/management/domain/Subject.java b/src/main/java/org/radarbase/management/domain/Subject.java index e272d94e8..0dee34629 100644 --- a/src/main/java/org/radarbase/management/domain/Subject.java +++ b/src/main/java/org/radarbase/management/domain/Subject.java @@ -85,6 +85,9 @@ public class Subject extends AbstractEntity implements Serializable { @JsonIgnore private final Set metaTokens = new HashSet<>(); + @Column(name = "group_name") + private String group; + @Override public Long getId() { return id; @@ -172,6 +175,14 @@ public Set getMetaTokens() { return metaTokens; } + public void setGroup(String group) { + this.group = group; + } + + public String getGroup() { + return this.group; + } + /** * Gets the active project of subject. * @@ -217,6 +228,7 @@ public String toString() { + ", user=" + user + ", sources=" + sources + ", attributes=" + attributes + + ", group=" + group + "}"; } } diff --git a/src/main/java/org/radarbase/management/repository/ProjectRepository.java b/src/main/java/org/radarbase/management/repository/ProjectRepository.java index 4b3df771f..07fb0ee0b 100644 --- a/src/main/java/org/radarbase/management/repository/ProjectRepository.java +++ b/src/main/java/org/radarbase/management/repository/ProjectRepository.java @@ -25,8 +25,11 @@ public interface ProjectRepository extends JpaRepository, countQuery = "select distinct count(project) from Project project") Page findAllWithEagerRelationships(Pageable pageable); - @Query("select project from Project project left join fetch " - + "project.sourceTypes s left join fetch s.sourceData where project.id =:id") + @Query("select project from Project project " + + "left join fetch project.groups " + + "left join fetch project.sourceTypes s " + + "left join fetch s.sourceData " + + "where project.id =:id") Optional findOneWithEagerRelationships(@Param("id") Long id); @Query("select project from Project project left join fetch " diff --git a/src/main/java/org/radarbase/management/service/dto/SubjectDTO.java b/src/main/java/org/radarbase/management/service/dto/SubjectDTO.java index 894571d80..7ddcd166a 100644 --- a/src/main/java/org/radarbase/management/service/dto/SubjectDTO.java +++ b/src/main/java/org/radarbase/management/service/dto/SubjectDTO.java @@ -58,6 +58,8 @@ public enum SubjectStatus { @JsonInclude(Include.NON_NULL) private ProjectDTO project; + private String group; + private List roles = new ArrayList<>(); private Set sources = new HashSet<>(); @@ -89,6 +91,14 @@ public void setProject(ProjectDTO project) { this.project = project; } + public String getGroup() { + return group; + } + + public void setGroup(String group) { + this.group = group; + } + public Long getId() { return id; } diff --git a/src/main/resources/config/liquibase/changelog/20210920101000_add_groups.xml b/src/main/resources/config/liquibase/changelog/20210920101000_add_groups.xml index 42c5cd720..ca7933aa9 100644 --- a/src/main/resources/config/liquibase/changelog/20210920101000_add_groups.xml +++ b/src/main/resources/config/liquibase/changelog/20210920101000_add_groups.xml @@ -76,4 +76,16 @@ + + + + + + + + + + + + diff --git a/src/main/webapp/app/shared/subject/subject-detail.component.html b/src/main/webapp/app/shared/subject/subject-detail.component.html index 72f19c6e2..47adcb9c6 100644 --- a/src/main/webapp/app/shared/subject/subject-detail.component.html +++ b/src/main/webapp/app/shared/subject/subject-detail.component.html @@ -22,6 +22,10 @@

{{sub {{subject.project?.projectName}} +
+
+ {{subject.group || '-'}} +
diff --git a/src/main/webapp/app/shared/subject/subject-dialog.component.html b/src/main/webapp/app/shared/subject/subject-dialog.component.html index d18d2f942..1df5ebd94 100644 --- a/src/main/webapp/app/shared/subject/subject-dialog.component.html +++ b/src/main/webapp/app/shared/subject/subject-dialog.component.html @@ -33,15 +33,20 @@ [(ngModel)]="subject.externalId" />

-
+
-
diff --git a/src/main/webapp/i18n/en/subject.json b/src/main/webapp/i18n/en/subject.json index 8194f08c3..afef158a8 100644 --- a/src/main/webapp/i18n/en/subject.json +++ b/src/main/webapp/i18n/en/subject.json @@ -27,6 +27,7 @@ "removed": "Removed", "activated": "Activated", "langKey": "Language", + "group": "Group", "project": "Project", "sources": "Sources", "createdBy": "Created By", diff --git a/src/main/webapp/i18n/nl/subject.json b/src/main/webapp/i18n/nl/subject.json index b60a2ced5..34bcc2463 100644 --- a/src/main/webapp/i18n/nl/subject.json +++ b/src/main/webapp/i18n/nl/subject.json @@ -27,6 +27,7 @@ "removed": "Removed", "activated": "Activated", "langKey": "Taal", + "group": "Groep", "project": "Project", "sources": "Sources", "createdBy": "Aanmaak door", From 09b356e70b8c63b9181018ad2a5184bae814cf63 Mon Sep 17 00:00:00 2001 From: aykl Date: Fri, 1 Oct 2021 11:24:27 +0200 Subject: [PATCH 017/431] DateOfBirth added to Subject --- .../radarbase/management/domain/Subject.java | 12 ++++++ .../management/service/dto/SubjectDTO.java | 10 +++++ .../changelog/20210920101000_add_groups.xml | 2 +- .../20210929120000_add_date_of_birth.xml | 37 +++++++++++++++++++ src/main/webapp/i18n/en/subject.json | 1 - src/main/webapp/i18n/nl/subject.json | 1 - 6 files changed, 60 insertions(+), 3 deletions(-) create mode 100644 src/main/resources/config/liquibase/changelog/20210929120000_add_date_of_birth.xml diff --git a/src/main/java/org/radarbase/management/domain/Subject.java b/src/main/java/org/radarbase/management/domain/Subject.java index 0dee34629..8f482f993 100644 --- a/src/main/java/org/radarbase/management/domain/Subject.java +++ b/src/main/java/org/radarbase/management/domain/Subject.java @@ -29,6 +29,7 @@ import javax.persistence.Table; import javax.validation.constraints.NotNull; import java.io.Serializable; +import java.time.ZonedDateTime; import java.util.HashMap; import java.util.HashSet; import java.util.Map; @@ -88,6 +89,9 @@ public class Subject extends AbstractEntity implements Serializable { @Column(name = "group_name") private String group; + @Column(name = "date_of_birth") + private ZonedDateTime dateOfBirth; + @Override public Long getId() { return id; @@ -183,6 +187,14 @@ public String getGroup() { return this.group; } + public void setDateOfBirth(ZonedDateTime dateOfBirth) { + this.dateOfBirth = dateOfBirth; + } + + public ZonedDateTime getDateOfBirth() { + return this.dateOfBirth; + } + /** * Gets the active project of subject. * diff --git a/src/main/java/org/radarbase/management/service/dto/SubjectDTO.java b/src/main/java/org/radarbase/management/service/dto/SubjectDTO.java index 7ddcd166a..88beea753 100644 --- a/src/main/java/org/radarbase/management/service/dto/SubjectDTO.java +++ b/src/main/java/org/radarbase/management/service/dto/SubjectDTO.java @@ -60,6 +60,8 @@ public enum SubjectStatus { private String group; + private ZonedDateTime dateOfBirth; + private List roles = new ArrayList<>(); private Set sources = new HashSet<>(); @@ -99,6 +101,14 @@ public void setGroup(String group) { this.group = group; } + public ZonedDateTime getDateOfBirth() { + return this.dateOfBirth; + } + + public void setDateOfBirth(ZonedDateTime dateOfBirth) { + this.dateOfBirth = dateOfBirth; + } + public Long getId() { return id; } diff --git a/src/main/resources/config/liquibase/changelog/20210920101000_add_groups.xml b/src/main/resources/config/liquibase/changelog/20210920101000_add_groups.xml index ca7933aa9..36bdf8b55 100644 --- a/src/main/resources/config/liquibase/changelog/20210920101000_add_groups.xml +++ b/src/main/resources/config/liquibase/changelog/20210920101000_add_groups.xml @@ -1,6 +1,6 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/webapp/i18n/en/subject.json b/src/main/webapp/i18n/en/subject.json index afef158a8..8194f08c3 100644 --- a/src/main/webapp/i18n/en/subject.json +++ b/src/main/webapp/i18n/en/subject.json @@ -27,7 +27,6 @@ "removed": "Removed", "activated": "Activated", "langKey": "Language", - "group": "Group", "project": "Project", "sources": "Sources", "createdBy": "Created By", diff --git a/src/main/webapp/i18n/nl/subject.json b/src/main/webapp/i18n/nl/subject.json index 34bcc2463..b60a2ced5 100644 --- a/src/main/webapp/i18n/nl/subject.json +++ b/src/main/webapp/i18n/nl/subject.json @@ -27,7 +27,6 @@ "removed": "Removed", "activated": "Activated", "langKey": "Taal", - "group": "Groep", "project": "Project", "sources": "Sources", "createdBy": "Aanmaak door", From 28620e2a6d47502f95c2ec1a4198e69e38db9679 Mon Sep 17 00:00:00 2001 From: aykl Date: Fri, 1 Oct 2021 12:02:54 +0200 Subject: [PATCH 018/431] Date of Birth added to Subject View --- src/main/resources/config/liquibase/master.xml | 1 + .../webapp/app/shared/subject/subject-detail.component.html | 2 ++ src/main/webapp/app/shared/subject/subject.model.ts | 3 +++ src/main/webapp/i18n/en/subject.json | 1 + src/main/webapp/i18n/nl/subject.json | 1 + 5 files changed, 8 insertions(+) diff --git a/src/main/resources/config/liquibase/master.xml b/src/main/resources/config/liquibase/master.xml index 6b71a65f8..7f6cbff3c 100644 --- a/src/main/resources/config/liquibase/master.xml +++ b/src/main/resources/config/liquibase/master.xml @@ -34,5 +34,6 @@ + diff --git a/src/main/webapp/app/shared/subject/subject-detail.component.html b/src/main/webapp/app/shared/subject/subject-detail.component.html index 47adcb9c6..96dedf984 100644 --- a/src/main/webapp/app/shared/subject/subject-detail.component.html +++ b/src/main/webapp/app/shared/subject/subject-detail.component.html @@ -40,6 +40,8 @@

{{sub

+
+
{{subject.dateOfBirth | date:'dd/MM/yy HH:mm' }}
{{subject.createdBy}}
diff --git a/src/main/webapp/app/shared/subject/subject.model.ts b/src/main/webapp/app/shared/subject/subject.model.ts index 4318d6c14..51b127b1d 100644 --- a/src/main/webapp/app/shared/subject/subject.model.ts +++ b/src/main/webapp/app/shared/subject/subject.model.ts @@ -10,6 +10,7 @@ export class Subject { public externalId?: string; public createdBy?: string; public createdDate?: Date; + public dateOfBirth?: Date; public lastModifiedBy?: string; public lastModifiedDate?: Date; public group?: string; @@ -28,6 +29,7 @@ export class Subject { status?: SubjectStatus, createdBy?: string, createdDate?: Date, + dateOfBirth?: Date, lastModifiedBy?: string, lastModifiedDate?: Date, group?: string, @@ -42,6 +44,7 @@ export class Subject { this.externalId = externalId ? externalId : null; this.createdBy = createdBy ? createdBy : null; this.createdDate = createdDate ? createdDate : null; + this.dateOfBirth = dateOfBirth ? dateOfBirth : null; this.lastModifiedBy = lastModifiedBy ? lastModifiedBy : null; this.lastModifiedDate = lastModifiedDate ? lastModifiedDate : null; this.group = group ? group : null; diff --git a/src/main/webapp/i18n/en/subject.json b/src/main/webapp/i18n/en/subject.json index 8194f08c3..ee160533b 100644 --- a/src/main/webapp/i18n/en/subject.json +++ b/src/main/webapp/i18n/en/subject.json @@ -31,6 +31,7 @@ "sources": "Sources", "createdBy": "Created By", "createdDate": "Created Date", + "dateOfBirth": "Date of Birth", "lastModifiedBy": "Last Modified By", "lastModifiedDate": "Last Modified Date", "pairing": "Pairing", diff --git a/src/main/webapp/i18n/nl/subject.json b/src/main/webapp/i18n/nl/subject.json index b60a2ced5..c548d198f 100644 --- a/src/main/webapp/i18n/nl/subject.json +++ b/src/main/webapp/i18n/nl/subject.json @@ -31,6 +31,7 @@ "sources": "Sources", "createdBy": "Aanmaak door", "createdDate": "Aanmaak datum", + "dateOfBirth": "Geboortedatum", "lastModifiedBy": "Laatst aangepast door", "lastModifiedDate": "Laatst aangepast datum", "pairing": "Koppelen", From 74bde248c945e3319bbf7ea5d825c875adc3a92b Mon Sep 17 00:00:00 2001 From: Peyman Mohtashami Date: Fri, 1 Oct 2021 21:31:42 +0200 Subject: [PATCH 019/431] Modify Subjects page title --- .../app/entities/subject/general.subject.component.html | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/webapp/app/entities/subject/general.subject.component.html b/src/main/webapp/app/entities/subject/general.subject.component.html index 15b5bd8ad..424bb2006 100644 --- a/src/main/webapp/app/entities/subject/general.subject.component.html +++ b/src/main/webapp/app/entities/subject/general.subject.component.html @@ -1,2 +1,4 @@ -

+

+ +

From 14742c1785779b2b825fcb3c9c9202c89535247c Mon Sep 17 00:00:00 2001 From: Peyman Mohtashami Date: Fri, 1 Oct 2021 21:42:09 +0200 Subject: [PATCH 020/431] Add DOB and Name to subject model and dialog --- .../subject/subject-detail.component.html | 14 ++++++++++++++ .../subject/subject-dialog.component.html | 18 ++++++++++++++++++ .../webapp/app/shared/subject/subject.model.ts | 2 ++ src/main/webapp/i18n/en/subject.json | 2 ++ src/main/webapp/i18n/nl/subject.json | 2 ++ 5 files changed, 38 insertions(+) diff --git a/src/main/webapp/app/shared/subject/subject-detail.component.html b/src/main/webapp/app/shared/subject/subject-detail.component.html index 72f19c6e2..5736bcffe 100644 --- a/src/main/webapp/app/shared/subject/subject-detail.component.html +++ b/src/main/webapp/app/shared/subject/subject-detail.component.html @@ -22,6 +22,20 @@

{{sub {{subject.project?.projectName}} +
+
+ {{subject.name || 'N/A'}} +
+
+
+ {{subject.dob || 'N/A'}} +
+
+
+ + + +
diff --git a/src/main/webapp/app/shared/subject/subject-dialog.component.html b/src/main/webapp/app/shared/subject/subject-dialog.component.html index d18d2f942..19ab21426 100644 --- a/src/main/webapp/app/shared/subject/subject-dialog.component.html +++ b/src/main/webapp/app/shared/subject/subject-dialog.component.html @@ -44,6 +44,24 @@

+
+ + +
+ +
+ +
+ +
+
diff --git a/src/main/webapp/app/shared/subject/subject.model.ts b/src/main/webapp/app/shared/subject/subject.model.ts index 4318d6c14..8ae35378c 100644 --- a/src/main/webapp/app/shared/subject/subject.model.ts +++ b/src/main/webapp/app/shared/subject/subject.model.ts @@ -8,6 +8,8 @@ export class Subject { public login?: string; public externalLink?: string; public externalId?: string; + public name?: String; + public dob?: Date; public createdBy?: string; public createdDate?: Date; public lastModifiedBy?: string; diff --git a/src/main/webapp/i18n/en/subject.json b/src/main/webapp/i18n/en/subject.json index 8194f08c3..5086a17f0 100644 --- a/src/main/webapp/i18n/en/subject.json +++ b/src/main/webapp/i18n/en/subject.json @@ -24,6 +24,8 @@ "email": "Email", "externalLink": "External Link", "externalId": "External Id", + "name": "Name", + "dob": "Date of Birth", "removed": "Removed", "activated": "Activated", "langKey": "Language", diff --git a/src/main/webapp/i18n/nl/subject.json b/src/main/webapp/i18n/nl/subject.json index b60a2ced5..91b32a170 100644 --- a/src/main/webapp/i18n/nl/subject.json +++ b/src/main/webapp/i18n/nl/subject.json @@ -24,6 +24,8 @@ "email": "Email", "externalLink": "External Link", "externalId": "External Id", + "name": "Naam", + "dob": "Geboortedatum", "removed": "Removed", "activated": "Activated", "langKey": "Taal", From 5af3e931e537395a1381e03981f930fcfcc0a0d5 Mon Sep 17 00:00:00 2001 From: Peyman Mohtashami Date: Fri, 1 Oct 2021 22:04:36 +0200 Subject: [PATCH 021/431] Add advanced filter ui --- .../app/shared/subject/subject.component.html | 320 ++++++++++-------- .../app/shared/subject/subject.component.scss | 4 + .../app/shared/subject/subject.component.ts | 14 +- .../app/shared/subject/subject.service.ts | 4 + 4 files changed, 198 insertions(+), 144 deletions(-) diff --git a/src/main/webapp/app/shared/subject/subject.component.html b/src/main/webapp/app/shared/subject/subject.component.html index 5fabe97fc..84b0e5852 100644 --- a/src/main/webapp/app/shared/subject/subject.component.html +++ b/src/main/webapp/app/shared/subject/subject.component.html @@ -1,6 +1,6 @@
-

+

+ + +
+ + + +
+ +
+ + +
+ +
+
+

> -
-

+
-

- -
-
- - -
-
-
- + +
+
+ +
-
-
- - - +
+
+
-
- - +
- - {{subject.externalId}} - - - {{subject.externalId}} - - - N/A + +
-
-
- -
- DEACTIVATED - ACTIVATED - DISCONTINUED - INVALID + + +
+ + {{subject.externalId}} + + + {{subject.externalId}} + + + N/A + +
-
-
- -
- - N/A + - - {{role.projectName}} - {{role.projectName}} +
+ DEACTIVATED + ACTIVATED + DISCONTINUED + INVALID +
+
+
+ +
-
-
- -
- - N/A - - - {{sources.sourceTypeModel}}: {{sources.sourceName}}{{last ? '' : ', '}} + +
+ + N/A + + + {{sources.sourceTypeModel}}: {{sources.sourceName}}{{last ? '' : ', '}} + +
-
-
- -
- - N/A + -
- {{entry.key}}: {{entry.value}} +
+ + N/A + +
+ {{entry.key}}: {{entry.value}} +
-
-
- - - - - +
+ + + + + +
-
-
- - -
-
+
+ + +
+ diff --git a/src/main/webapp/app/shared/subject/subject.component.scss b/src/main/webapp/app/shared/subject/subject.component.scss index 765738695..56e77f614 100644 --- a/src/main/webapp/app/shared/subject/subject.component.scss +++ b/src/main/webapp/app/shared/subject/subject.component.scss @@ -16,6 +16,10 @@ .subject-filter > button { margin-top: 16px } +.subject-filter label{ + width: 100%; +} + .subject-wrapper > section { flex-grow: 1; diff --git a/src/main/webapp/app/shared/subject/subject.component.ts b/src/main/webapp/app/shared/subject/subject.component.ts index 278ff3d93..24a58271d 100644 --- a/src/main/webapp/app/shared/subject/subject.component.ts +++ b/src/main/webapp/app/shared/subject/subject.component.ts @@ -52,8 +52,14 @@ export class SubjectComponent implements OnInit, OnDestroy, OnChanges { routeData: any; previousPage: any; - filterExternalId = ''; + filterSubjectExternalId = ''; filterSubjectId = ''; + filterSubjectHumanReadableId = ''; + filterSubjectEnrolmentDate = ''; + filterSubjectName = ''; + filterSubjectDOB = ''; + + isAdvancedFilterCollapsed = true; @Input() isProjectSpecific: boolean; @@ -150,7 +156,11 @@ export class SubjectComponent implements OnInit, OnDestroy, OnChanges { get queryFilterParams(): SubjectFilterParams { return { subjectId: this.filterSubjectId.trim() || undefined, - externalId: this.filterExternalId.trim() || undefined, + externalId: this.filterSubjectExternalId.trim() || undefined, + humanReadableId: this.filterSubjectHumanReadableId.trim() || undefined, + enrolmentDate: this.filterSubjectEnrolmentDate.trim() || undefined, + subjectName: this.filterSubjectName.trim() || undefined, + subjectDOB: this.filterSubjectDOB.trim() || undefined, }; } diff --git a/src/main/webapp/app/shared/subject/subject.service.ts b/src/main/webapp/app/shared/subject/subject.service.ts index cb90e11d0..b2887a676 100644 --- a/src/main/webapp/app/shared/subject/subject.service.ts +++ b/src/main/webapp/app/shared/subject/subject.service.ts @@ -73,6 +73,10 @@ export class SubjectService { export interface SubjectFilterParams { subjectId?: string, externalId?: string, + humanReadableId?: string, + enrolmentDate?: string, + subjectName?: string, + subjectDOB?: string, } export interface SubjectsPaginationParams { From dee351c30d6cf61677860a506d33ffaff35fafbd Mon Sep 17 00:00:00 2001 From: Peyman Mohtashami Date: Fri, 1 Oct 2021 22:08:09 +0200 Subject: [PATCH 022/431] Add translations for advanced filter fields --- src/main/webapp/i18n/en/subject.json | 2 ++ src/main/webapp/i18n/nl/subject.json | 2 ++ 2 files changed, 4 insertions(+) diff --git a/src/main/webapp/i18n/en/subject.json b/src/main/webapp/i18n/en/subject.json index 5086a17f0..a75dab332 100644 --- a/src/main/webapp/i18n/en/subject.json +++ b/src/main/webapp/i18n/en/subject.json @@ -26,6 +26,8 @@ "externalId": "External Id", "name": "Name", "dob": "Date of Birth", + "humanReadableId": "Human Readable ID", + "enrolmentDate": "Enrolment Date", "removed": "Removed", "activated": "Activated", "langKey": "Language", diff --git a/src/main/webapp/i18n/nl/subject.json b/src/main/webapp/i18n/nl/subject.json index 91b32a170..f6da316f4 100644 --- a/src/main/webapp/i18n/nl/subject.json +++ b/src/main/webapp/i18n/nl/subject.json @@ -26,6 +26,8 @@ "externalId": "External Id", "name": "Naam", "dob": "Geboortedatum", + "humanReadableId": "Leesbare ID", + "enrolmentDate": "Inschrijvingsdatum", "removed": "Removed", "activated": "Activated", "langKey": "Taal", From 8e0310d0ebf803b564e9224afb6a1ed92b6e2674 Mon Sep 17 00:00:00 2001 From: Peyman Mohtashami Date: Fri, 1 Oct 2021 22:20:07 +0200 Subject: [PATCH 023/431] Add selection function --- .../app/shared/subject/subject.component.html | 7 +++--- .../app/shared/subject/subject.component.ts | 24 ++++++++++++++++++- src/main/webapp/i18n/en/subject.json | 1 + src/main/webapp/i18n/nl/subject.json | 1 + 4 files changed, 29 insertions(+), 4 deletions(-) diff --git a/src/main/webapp/app/shared/subject/subject.component.html b/src/main/webapp/app/shared/subject/subject.component.html index 84b0e5852..fa5617793 100644 --- a/src/main/webapp/app/shared/subject/subject.component.html +++ b/src/main/webapp/app/shared/subject/subject.component.html @@ -105,8 +105,8 @@

- +
diff --git a/src/main/webapp/app/shared/subject/subject.component.ts b/src/main/webapp/app/shared/subject/subject.component.ts index 24a58271d..5ba3d857d 100644 --- a/src/main/webapp/app/shared/subject/subject.component.ts +++ b/src/main/webapp/app/shared/subject/subject.component.ts @@ -61,6 +61,9 @@ export class SubjectComponent implements OnInit, OnDestroy, OnChanges { isAdvancedFilterCollapsed = true; + checked = false; + setOfCheckedId = new Set(); + @Input() isProjectSpecific: boolean; constructor( @@ -205,8 +208,27 @@ export class SubjectComponent implements OnInit, OnDestroy, OnChanges { this.transition(); } - selectAll() { + selectAll(checked: boolean = true): void { // TODO implement subject selection + this.subjects.forEach(({ id }) => this.updateCheckedSet(id, checked)); + this.refreshCheckedStatus(); + } + + onItemChecked(id: number, checked: boolean): void { + this.updateCheckedSet(id, checked); + this.refreshCheckedStatus(); + } + + refreshCheckedStatus(): void { + this.checked = this.subjects.every(({ id }) => this.setOfCheckedId.has(id)) && (this.subjects.length > 0); + } + + updateCheckedSet(id: number, checked: boolean): void { + if (checked) { + this.setOfCheckedId.add(id); + } else { + this.setOfCheckedId.delete(id); + } } addSelectedToGroup() { diff --git a/src/main/webapp/i18n/en/subject.json b/src/main/webapp/i18n/en/subject.json index a75dab332..e62ee482c 100644 --- a/src/main/webapp/i18n/en/subject.json +++ b/src/main/webapp/i18n/en/subject.json @@ -90,6 +90,7 @@ "validUntil": "Valid until", "validity": "Validity", "selectAll": "Select all", + "clearSelectedItems": "Clear selected items", "addSelectedToGroup": "Add to group", "group": "Group", "loadMore": "Load more ({{shown}}/{{total}} shown)", diff --git a/src/main/webapp/i18n/nl/subject.json b/src/main/webapp/i18n/nl/subject.json index f6da316f4..a1238b4c7 100644 --- a/src/main/webapp/i18n/nl/subject.json +++ b/src/main/webapp/i18n/nl/subject.json @@ -90,6 +90,7 @@ "validUntil": "Geldig tot", "validity": "Geldigheidsduur", "selectAll": "Selecteer alles", + "clearSelectedItems": "Geselecteerde items wissen", "addSelectedToGroup": "Aan groep toevoegen", "group": "Groep", "loadMore": "Meer laden ({{shown}}/{{total}} getoond)", From 33e621baf4870c8cfb1c455048e3e67127e11b11 Mon Sep 17 00:00:00 2001 From: Peyman Mohtashami Date: Sat, 2 Oct 2021 12:26:47 +0200 Subject: [PATCH 024/431] Remove source tab from project detail page --- .../app/entities/project/project-detail.component.html | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/main/webapp/app/entities/project/project-detail.component.html b/src/main/webapp/app/entities/project/project-detail.component.html index 653a05d51..7a3e34e6b 100644 --- a/src/main/webapp/app/entities/project/project-detail.component.html +++ b/src/main/webapp/app/entities/project/project-detail.component.html @@ -64,11 +64,6 @@

Subjects -
  • - - Sources - -
  • Admins From 0863dc5316f24b9ef8a88e0940b16da8aa77a65d Mon Sep 17 00:00:00 2001 From: Peyman Mohtashami Date: Sat, 2 Oct 2021 12:34:40 +0200 Subject: [PATCH 025/431] Modify e2e subject test --- .../integration/entities/subject.spec.ts | 67 ++++++++++++++++--- 1 file changed, 56 insertions(+), 11 deletions(-) diff --git a/src/test/javascript/e2e/cypress/integration/entities/subject.spec.ts b/src/test/javascript/e2e/cypress/integration/entities/subject.spec.ts index ca8cadefd..bbbc2dd46 100644 --- a/src/test/javascript/e2e/cypress/integration/entities/subject.spec.ts +++ b/src/test/javascript/e2e/cypress/integration/entities/subject.spec.ts @@ -16,7 +16,7 @@ describe('Subject e2e test', () => { navBarPage.clickOnEntityMenu(); navBarPage.clickOnEntity('subject'); - cy.get('h4 span').first().should('have.text', 'Subjects'); + cy.get('h2 span').first().should('have.text', 'Subjects'); }); it('should load create Subject dialog', () => { @@ -36,28 +36,73 @@ describe('Subject e2e test', () => { cy.get('[name=project]').select('radar'); cy.get('button.btn-primary').contains('Save').click(); - cy.get('jhi-subjects tbody tr').should('have.length', 5); + cy.get('jhi-subjects .subjects .subject-row').should('have.length', 5); }); it('should be able to edit a subject', () => { cy.wait(1000); - cy.get('jhi-subjects tbody tr td').contains('test-subject1') - .parents('tr') - .get('jhi-subjects tbody tr button').contains('Edit') - .first().click(); + cy.get('jhi-subjects .subjects .subject-row .subject-row__external-id div span').contains('test-subject1') + .parents('.subject-row') + .get('.subject-row__actions button span.hidden-md-down').contains('Edit') + .first().click(); cy.get('[name=externalLink]').type('www.radar-base.org'); cy.get('button.btn-primary').contains('Save').click(); - cy.get('jhi-subjects tbody tr').should('have.length', 5); + cy.get('jhi-subjects .subjects .subject-row').should('have.length', 5); }); it('should be able to delete a subject without source', () => { - cy.get('jhi-subjects tbody tr td').contains('test-subject1') - .parents('tr').find('button').contains('Delete').click(); + cy.get('jhi-subjects .subjects .subject-row .subject-row__external-id div span').contains('test-subject1') + .parents('.subject-row').find('button').contains('View').click(); + cy.get('jhi-subject-detail button span.hidden-md-down').contains('Delete').click(); cy.get('jhi-subject-delete-dialog button.btn-danger') - .contains('Delete').click(); - cy.get('jhi-subjects tbody tr').should('have.length', 4); + .contains('Delete').click(); + cy.get('jhi-subjects .subjects .subject-row').should('have.length', 4); }); + it('should have load subject row with subject-id, external-id, status, project, sources and attributes columns', () => { + cy.get('jhi-subjects .subjects .subject-row').first().find('.subject-row__select-row input') + .invoke('attr', 'type') + .should('eq', 'checkbox') + + cy.get('jhi-subjects .subjects .subject-row').first().find('.subject-row__content .subject-row__subject-id .subject-row__field-label') + .should('have.text', 'Subject Id') + cy.get('jhi-subjects .subjects .subject-row').first().find('.subject-row__content .subject-row__subject-id a') + .should('have.text','sub-1') + .invoke('attr', 'href') + .should('eq', '#/subject/sub-1') + + cy.get('jhi-subjects .subjects .subject-row').first().find('.subject-row__content .subject-row__external-id .subject-row__field-label') + .should('have.text', 'External Id') + cy.get('jhi-subjects .subjects .subject-row').first().find('.subject-row__content .subject-row__external-id a') + .should('have.text','sub-1') + .invoke('attr', 'href') + .should('eq', 'www.radar-base.org') + + cy.get('jhi-subjects .subjects .subject-row').first().find('.subject-row__content .subject-row__status .subject-row__field-label') + .should('have.text', 'Status') + cy.get('jhi-subjects .subjects .subject-row').first().find('.subject-row__content .subject-row__status span.badge') + .should('have.text','ACTIVATED') + + cy.get('jhi-subjects .subjects .subject-row').first().find('.subject-row__content .subject-row__project .subject-row__field-label') + .should('have.text', 'Project') + cy.get('jhi-subjects .subjects .subject-row').first().find('.subject-row__content .subject-row__project a.badge') + .should('have.text','radar') + .invoke('attr', 'href') + .should('eq', '#/project/radar') + + cy.get('jhi-subjects .subjects .subject-row').first().find('.subject-row__content .subject-row__sources .subject-row__field-label') + .should('have.text', 'Sources') + cy.get('jhi-subjects .subjects .subject-row').first().find('.subject-row__content .subject-row__sources a.form-control-static') + .should('have.text','E4: source-1') + .invoke('attr', 'href') + .should('eq', '#/source/source-1') + + cy.get('jhi-subjects .subjects .subject-row').first().find('.subject-row__content .subject-row__attribute-data .subject-row__field-label') + .should('have.text', 'Attributes') + cy.get('jhi-subjects .subjects .subject-row').first().find('.subject-row__content .subject-row__attribute-data div span') + .should('have.text',' N/A ') + }) + }); From b9784b1d2ea33f6848aec95f9d6c441852bdc049 Mon Sep 17 00:00:00 2001 From: Peyman Mohtashami Date: Sat, 2 Oct 2021 18:24:05 +0200 Subject: [PATCH 026/431] Add load more function --- .../app/shared/subject/subject.component.html | 6 ++--- .../app/shared/subject/subject.component.ts | 26 +++++++++---------- 2 files changed, 15 insertions(+), 17 deletions(-) diff --git a/src/main/webapp/app/shared/subject/subject.component.html b/src/main/webapp/app/shared/subject/subject.component.html index fa5617793..dc9c6a3cb 100644 --- a/src/main/webapp/app/shared/subject/subject.component.html +++ b/src/main/webapp/app/shared/subject/subject.component.html @@ -246,13 +246,13 @@

    - { - this.loadSubjects(); - }); } ngOnDestroy() { @@ -149,6 +144,7 @@ export class SubjectComponent implements OnInit, OnDestroy, OnChanges { } ngOnChanges(changes: SimpleChanges) { + this.subjects = []; const project: SimpleChange = changes.project ? changes.project : null; if (project) { this.project = project.currentValue; @@ -169,9 +165,11 @@ export class SubjectComponent implements OnInit, OnDestroy, OnChanges { get queryPaginationParams(): SubjectsPaginationParams { let subjects = this.subjects || []; + const lastLoadedId = subjects[subjects.length - 1]?.id; + const pageSize = lastLoadedId? this.itemsPerPage : this.page*this.itemsPerPage; return { - lastLoadedId: subjects[subjects.length - 1]?.id, - pageSize: this.itemsPerPage, + lastLoadedId, + pageSize, sortBy: this.predicate, sortDirection: this.ascending ? 'asc' : 'desc', }; @@ -181,7 +179,7 @@ export class SubjectComponent implements OnInit, OnDestroy, OnChanges { this.links = parseLinks(headers.get('link')); this.totalItems = +headers.get('X-Total-Count'); this.queryCount = this.totalItems; - this.subjects = data; + this.subjects = [...this.subjects, ...data]; } applyFilter() { @@ -190,7 +188,8 @@ export class SubjectComponent implements OnInit, OnDestroy, OnChanges { } loadMore() { - // TODO implement loading + this.page = this.page + 1; + this.transition(); } loadPage(page) { @@ -238,11 +237,10 @@ export class SubjectComponent implements OnInit, OnDestroy, OnChanges { transition() { if (!this.isProjectSpecific) { this.router.navigate(['/subject'], { - queryParams: - { - page: this.page, - sort: this.predicate + ',' + (this.ascending ? 'asc' : 'desc'), - }, + queryParams: { + page: this.page, + sort: this.predicate + ',' + (this.ascending ? 'asc' : 'desc'), + }, }); } this.loadSubjects(); From d12ebe51fdce02dcdaaf4aad87ea733f60de05e0 Mon Sep 17 00:00:00 2001 From: Peyman Mohtashami Date: Sat, 2 Oct 2021 18:33:21 +0200 Subject: [PATCH 027/431] Modify sorting function --- .../webapp/app/shared/subject/subject.component.ts | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/src/main/webapp/app/shared/subject/subject.component.ts b/src/main/webapp/app/shared/subject/subject.component.ts index b55277b26..8c8609afe 100644 --- a/src/main/webapp/app/shared/subject/subject.component.ts +++ b/src/main/webapp/app/shared/subject/subject.component.ts @@ -101,10 +101,10 @@ export class SubjectComponent implements OnInit, OnDestroy, OnChanges { this.queryFilterParams, this.queryPaginationParams, ).subscribe( - (res: HttpResponse) => { - this.onSuccess(res.body, res.headers); - }, - (res: HttpErrorResponse) => this.onError(res), + (res: HttpResponse) => { + this.onSuccess(res.body, res.headers); + }, + (res: HttpErrorResponse) => this.onError(res), ); } @@ -119,6 +119,9 @@ export class SubjectComponent implements OnInit, OnDestroy, OnChanges { } ngOnInit() { + if (!this.isProjectSpecific) { + this.loadAll(); + } this.registerChangeInSubjects(); } @@ -200,7 +203,7 @@ export class SubjectComponent implements OnInit, OnDestroy, OnChanges { } updateSorting(predicate, direction) { - // TODO consider removing the page altogether + this.subjects = []; this.predicate = predicate; this.ascending = direction === 'asc'; this.page = 1; From e70292843149b26b6d96589842d0c32ae8d366a7 Mon Sep 17 00:00:00 2001 From: Peyman Mohtashami Date: Sun, 3 Oct 2021 13:52:25 +0200 Subject: [PATCH 028/431] Separate sortBy and sortOrder dropdowns --- .../app/shared/subject/subject.component.html | 43 +++++++++++++------ .../app/shared/subject/subject.component.scss | 5 +++ .../app/shared/subject/subject.component.ts | 15 ++++--- src/main/webapp/i18n/en/subject.json | 17 ++++---- src/main/webapp/i18n/nl/subject.json | 17 ++++---- 5 files changed, 60 insertions(+), 37 deletions(-) diff --git a/src/main/webapp/app/shared/subject/subject.component.html b/src/main/webapp/app/shared/subject/subject.component.html index dc9c6a3cb..fc49c3e60 100644 --- a/src/main/webapp/app/shared/subject/subject.component.html +++ b/src/main/webapp/app/shared/subject/subject.component.html @@ -56,33 +56,48 @@

    -
    +
    -
    +
    + +
    + + +
    +
    -
    +

    • (change)="onItemChecked(subject.id, true)">
    - -
    +
    -
    +
    @@ -171,7 +171,7 @@

    INVALID
    -
    +
    @@ -189,7 +189,7 @@

    -
    +
    @@ -202,7 +202,7 @@

    -
    +
    diff --git a/src/test/javascript/e2e/cypress/integration/entities/subject.spec.ts b/src/test/javascript/e2e/cypress/integration/entities/subject.spec.ts index bbbc2dd46..bd1503019 100644 --- a/src/test/javascript/e2e/cypress/integration/entities/subject.spec.ts +++ b/src/test/javascript/e2e/cypress/integration/entities/subject.spec.ts @@ -76,7 +76,7 @@ describe('Subject e2e test', () => { cy.get('jhi-subjects .subjects .subject-row').first().find('.subject-row__content .subject-row__external-id .subject-row__field-label') .should('have.text', 'External Id') cy.get('jhi-subjects .subjects .subject-row').first().find('.subject-row__content .subject-row__external-id a') - .should('have.text','sub-1') + .should('contain.text','www.radar-base.org') .invoke('attr', 'href') .should('eq', 'www.radar-base.org') From 33e24b1e4b0b4fe4586fd748635b44ca6b9fd661 Mon Sep 17 00:00:00 2001 From: aykl Date: Wed, 6 Oct 2021 14:26:56 +0200 Subject: [PATCH 035/431] Group Name added to Subject Filter --- .../management/repository/filters/SubjectFilter.java | 12 ++++++++++++ .../management/web/rest/util/PaginationUtil.java | 1 + 2 files changed, 13 insertions(+) diff --git a/src/main/java/org/radarbase/management/repository/filters/SubjectFilter.java b/src/main/java/org/radarbase/management/repository/filters/SubjectFilter.java index 831b8b2de..dc352f944 100644 --- a/src/main/java/org/radarbase/management/repository/filters/SubjectFilter.java +++ b/src/main/java/org/radarbase/management/repository/filters/SubjectFilter.java @@ -26,6 +26,7 @@ public class SubjectFilter implements Specification { private boolean includeInactive = false; + private String groupName = null; private Long lastLoadedId = null; private Integer pageSize = 10; private String projectName = null; @@ -67,6 +68,9 @@ public Predicate toPredicate(Root root, CriteriaQuery query, Criteri if (StringUtils.isNotEmpty(externalId)) { predicates.add(builder.equal(root.get("externalId"), externalId)); } + if (StringUtils.isNotEmpty(groupName)) { + predicates.add(builder.equal(root.get("group"), groupName)); + } if (StringUtils.isNotEmpty(subjectId)) { predicates.add(builder.equal(userJoin.get("login"), subjectId)); } @@ -115,6 +119,14 @@ public Predicate toPredicate(Root root, CriteriaQuery query, Criteri return builder.and(predicates.toArray(new Predicate[0])); } + public String getGroupName() { + return this.groupName; + } + + public void setGroupName(String groupName) { + this.groupName = groupName; + } + public Boolean getWithInactiveParticipants() { return this.includeInactive; } diff --git a/src/main/java/org/radarbase/management/web/rest/util/PaginationUtil.java b/src/main/java/org/radarbase/management/web/rest/util/PaginationUtil.java index 9f260c7e3..abfdd0a09 100644 --- a/src/main/java/org/radarbase/management/web/rest/util/PaginationUtil.java +++ b/src/main/java/org/radarbase/management/web/rest/util/PaginationUtil.java @@ -79,6 +79,7 @@ private static String generateUri(String baseUrl, int page, int size) { private static String generateUri(String baseUrl, SubjectFilter filter) { return UriComponentsBuilder.fromUriString(baseUrl) .queryParam("externalId", filter.getExternalId()) + .queryParam("groupName", filter.getGroupName()) .queryParam("lastLoadedId", filter.getLastLoadedId()) .queryParam("pageSize", filter.getPageSize()) .queryParam("projectName", filter.getProjectName()) From b9ef580c3b0fceb3f02c595fe5a2dc1ddf6f2e2a Mon Sep 17 00:00:00 2001 From: aykl Date: Wed, 6 Oct 2021 17:27:10 +0200 Subject: [PATCH 036/431] DateOfBirth added to SubjectFilter --- .../repository/filters/SubjectFilter.java | 27 +++++++++++++++++++ .../web/rest/util/PaginationUtil.java | 2 ++ 2 files changed, 29 insertions(+) diff --git a/src/main/java/org/radarbase/management/repository/filters/SubjectFilter.java b/src/main/java/org/radarbase/management/repository/filters/SubjectFilter.java index dc352f944..0161315f6 100644 --- a/src/main/java/org/radarbase/management/repository/filters/SubjectFilter.java +++ b/src/main/java/org/radarbase/management/repository/filters/SubjectFilter.java @@ -18,6 +18,7 @@ import javax.persistence.criteria.Predicate; import javax.persistence.criteria.Root; +import java.time.ZonedDateTime; import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; @@ -26,6 +27,8 @@ public class SubjectFilter implements Specification { private boolean includeInactive = false; + private ZonedDateTime dateOfBirthFrom = null; + private ZonedDateTime dateOfBirthTo = null; private String groupName = null; private Long lastLoadedId = null; private Integer pageSize = 10; @@ -71,6 +74,14 @@ public Predicate toPredicate(Root root, CriteriaQuery query, Criteri if (StringUtils.isNotEmpty(groupName)) { predicates.add(builder.equal(root.get("group"), groupName)); } + if (dateOfBirthFrom != null) { + predicates.add(builder + .greaterThanOrEqualTo(root.get("dateOfBirth"), dateOfBirthFrom)); + } + if (dateOfBirthTo != null) { + predicates.add(builder + .lessThan(root.get("dateOfBirth"), dateOfBirthTo)); + } if (StringUtils.isNotEmpty(subjectId)) { predicates.add(builder.equal(userJoin.get("login"), subjectId)); } @@ -119,6 +130,22 @@ public Predicate toPredicate(Root root, CriteriaQuery query, Criteri return builder.and(predicates.toArray(new Predicate[0])); } + public ZonedDateTime getDateOfBirthTo() { + return dateOfBirthTo; + } + + public void setDateOfBirthTo(ZonedDateTime dateOfBirthTo) { + this.dateOfBirthTo = dateOfBirthTo; + } + + public ZonedDateTime getDateOfBirthFrom() { + return dateOfBirthFrom; + } + + public void setDateOfBirthFrom(ZonedDateTime dateOfBirthFrom) { + this.dateOfBirthFrom = dateOfBirthFrom; + } + public String getGroupName() { return this.groupName; } diff --git a/src/main/java/org/radarbase/management/web/rest/util/PaginationUtil.java b/src/main/java/org/radarbase/management/web/rest/util/PaginationUtil.java index abfdd0a09..0ec2796e2 100644 --- a/src/main/java/org/radarbase/management/web/rest/util/PaginationUtil.java +++ b/src/main/java/org/radarbase/management/web/rest/util/PaginationUtil.java @@ -78,6 +78,8 @@ private static String generateUri(String baseUrl, int page, int size) { private static String generateUri(String baseUrl, SubjectFilter filter) { return UriComponentsBuilder.fromUriString(baseUrl) + .queryParam("dateOfBirthFrom", filter.getDateOfBirthFrom()) + .queryParam("dateOfBirthTo", filter.getDateOfBirthTo()) .queryParam("externalId", filter.getExternalId()) .queryParam("groupName", filter.getGroupName()) .queryParam("lastLoadedId", filter.getLastLoadedId()) From 79b77e35cd4b9c91b44f127f8faf99dbe42973e2 Mon Sep 17 00:00:00 2001 From: aykl Date: Wed, 6 Oct 2021 18:14:49 +0200 Subject: [PATCH 037/431] Person Name added to Subject --- .../radarbase/management/domain/Subject.java | 11 +++++++ .../repository/filters/SubjectFilter.java | 13 ++++++++ .../management/service/dto/SubjectDTO.java | 10 ++++++ .../web/rest/util/PaginationUtil.java | 1 + .../20210929120000_add_date_of_birth.xml | 4 --- .../20211006150000_add_person_name.xml | 33 +++++++++++++++++++ .../resources/config/liquibase/master.xml | 1 + .../subject/subject-detail.component.html | 2 ++ .../app/shared/subject/subject.model.ts | 3 ++ .../app/shared/subject/subject.service.ts | 3 ++ src/main/webapp/i18n/en/subject.json | 1 + src/main/webapp/i18n/nl/subject.json | 1 + 12 files changed, 79 insertions(+), 4 deletions(-) create mode 100644 src/main/resources/config/liquibase/changelog/20211006150000_add_person_name.xml diff --git a/src/main/java/org/radarbase/management/domain/Subject.java b/src/main/java/org/radarbase/management/domain/Subject.java index 8f482f993..9a7b8b869 100644 --- a/src/main/java/org/radarbase/management/domain/Subject.java +++ b/src/main/java/org/radarbase/management/domain/Subject.java @@ -92,6 +92,9 @@ public class Subject extends AbstractEntity implements Serializable { @Column(name = "date_of_birth") private ZonedDateTime dateOfBirth; + @Column(name = "person_name") + private String personName; + @Override public Long getId() { return id; @@ -195,6 +198,14 @@ public ZonedDateTime getDateOfBirth() { return this.dateOfBirth; } + public void setPersonName(String personName) { + this.personName = personName; + } + + public String getPersonName() { + return this.personName; + } + /** * Gets the active project of subject. * diff --git a/src/main/java/org/radarbase/management/repository/filters/SubjectFilter.java b/src/main/java/org/radarbase/management/repository/filters/SubjectFilter.java index 0161315f6..7d42d7fa6 100644 --- a/src/main/java/org/radarbase/management/repository/filters/SubjectFilter.java +++ b/src/main/java/org/radarbase/management/repository/filters/SubjectFilter.java @@ -32,6 +32,7 @@ public class SubjectFilter implements Specification { private String groupName = null; private Long lastLoadedId = null; private Integer pageSize = 10; + private String personName = null; private String projectName = null; private String externalId = null; private String subjectId = null; @@ -82,6 +83,10 @@ public Predicate toPredicate(Root root, CriteriaQuery query, Criteri predicates.add(builder .lessThan(root.get("dateOfBirth"), dateOfBirthTo)); } + if (StringUtils.isNotEmpty(personName)) { + predicates.add(builder + .like(root.get("personName"), "%" + personName + "%")); + } if (StringUtils.isNotEmpty(subjectId)) { predicates.add(builder.equal(userJoin.get("login"), subjectId)); } @@ -130,6 +135,14 @@ public Predicate toPredicate(Root root, CriteriaQuery query, Criteri return builder.and(predicates.toArray(new Predicate[0])); } + public String getPersonName() { + return personName; + } + + public void setPersonName(String personName) { + this.personName = personName; + } + public ZonedDateTime getDateOfBirthTo() { return dateOfBirthTo; } diff --git a/src/main/java/org/radarbase/management/service/dto/SubjectDTO.java b/src/main/java/org/radarbase/management/service/dto/SubjectDTO.java index 88beea753..85e347b20 100644 --- a/src/main/java/org/radarbase/management/service/dto/SubjectDTO.java +++ b/src/main/java/org/radarbase/management/service/dto/SubjectDTO.java @@ -62,6 +62,8 @@ public enum SubjectStatus { private ZonedDateTime dateOfBirth; + private String personName; + private List roles = new ArrayList<>(); private Set sources = new HashSet<>(); @@ -72,6 +74,14 @@ public SubjectStatus getStatus() { return status; } + public String getPersonName() { + return personName; + } + + public void setPersonName(String personName) { + this.personName = personName; + } + public void setStatus(SubjectStatus status) { this.status = status; } diff --git a/src/main/java/org/radarbase/management/web/rest/util/PaginationUtil.java b/src/main/java/org/radarbase/management/web/rest/util/PaginationUtil.java index 0ec2796e2..81d6923c7 100644 --- a/src/main/java/org/radarbase/management/web/rest/util/PaginationUtil.java +++ b/src/main/java/org/radarbase/management/web/rest/util/PaginationUtil.java @@ -84,6 +84,7 @@ private static String generateUri(String baseUrl, SubjectFilter filter) { .queryParam("groupName", filter.getGroupName()) .queryParam("lastLoadedId", filter.getLastLoadedId()) .queryParam("pageSize", filter.getPageSize()) + .queryParam("personName", filter.getPersonName()) .queryParam("projectName", filter.getProjectName()) .queryParam("sortBy", filter.getSortBy().getKey()) .queryParam("sortDirection", filter.getSortDirection().getKey()) diff --git a/src/main/resources/config/liquibase/changelog/20210929120000_add_date_of_birth.xml b/src/main/resources/config/liquibase/changelog/20210929120000_add_date_of_birth.xml index 2c40a42e6..0bb3000ef 100644 --- a/src/main/resources/config/liquibase/changelog/20210929120000_add_date_of_birth.xml +++ b/src/main/resources/config/liquibase/changelog/20210929120000_add_date_of_birth.xml @@ -16,10 +16,6 @@ xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.4.xsd http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd"> - - - - diff --git a/src/main/resources/config/liquibase/changelog/20211006150000_add_person_name.xml b/src/main/resources/config/liquibase/changelog/20211006150000_add_person_name.xml new file mode 100644 index 000000000..a565522c2 --- /dev/null +++ b/src/main/resources/config/liquibase/changelog/20211006150000_add_person_name.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + diff --git a/src/main/resources/config/liquibase/master.xml b/src/main/resources/config/liquibase/master.xml index 7f6cbff3c..f322ced2b 100644 --- a/src/main/resources/config/liquibase/master.xml +++ b/src/main/resources/config/liquibase/master.xml @@ -35,5 +35,6 @@ + diff --git a/src/main/webapp/app/shared/subject/subject-detail.component.html b/src/main/webapp/app/shared/subject/subject-detail.component.html index 96dedf984..3e44b434e 100644 --- a/src/main/webapp/app/shared/subject/subject-detail.component.html +++ b/src/main/webapp/app/shared/subject/subject-detail.component.html @@ -40,6 +40,8 @@

    {{sub

    +
    +
    {{subject.personName}}
    {{subject.dateOfBirth | date:'dd/MM/yy HH:mm' }}
    diff --git a/src/main/webapp/app/shared/subject/subject.model.ts b/src/main/webapp/app/shared/subject/subject.model.ts index 51b127b1d..2f76d01d5 100644 --- a/src/main/webapp/app/shared/subject/subject.model.ts +++ b/src/main/webapp/app/shared/subject/subject.model.ts @@ -15,6 +15,7 @@ export class Subject { public lastModifiedDate?: Date; public group?: string; public password?: string; + public personName?: string; public project?: Project; public sources?: MinimalSource[]; public attributes: Dictionary; @@ -34,6 +35,7 @@ export class Subject { lastModifiedDate?: Date, group?: string, password?: string, + personName?: string, project?: Project, sources?: MinimalSource[], roles?: Role[], @@ -49,6 +51,7 @@ export class Subject { this.lastModifiedDate = lastModifiedDate ? lastModifiedDate : null; this.group = group ? group : null; this.password = password ? password : null; + this.personName = personName ? personName : null; this.project = project ? project : null; this.sources = sources ? sources : []; this.status = status ? status : SubjectStatus.DEACTIVATED; diff --git a/src/main/webapp/app/shared/subject/subject.service.ts b/src/main/webapp/app/shared/subject/subject.service.ts index cb90e11d0..a29c1fd89 100644 --- a/src/main/webapp/app/shared/subject/subject.service.ts +++ b/src/main/webapp/app/shared/subject/subject.service.ts @@ -73,6 +73,9 @@ export class SubjectService { export interface SubjectFilterParams { subjectId?: string, externalId?: string, + dateTimeFrom?: string, + dateTimeTo?: string, + personName?: string, } export interface SubjectsPaginationParams { diff --git a/src/main/webapp/i18n/en/subject.json b/src/main/webapp/i18n/en/subject.json index ee160533b..d9c4b8ee3 100644 --- a/src/main/webapp/i18n/en/subject.json +++ b/src/main/webapp/i18n/en/subject.json @@ -34,6 +34,7 @@ "dateOfBirth": "Date of Birth", "lastModifiedBy": "Last Modified By", "lastModifiedDate": "Last Modified Date", + "personName": "Name", "pairing": "Pairing", "actions": "Actions", "pairApp": "Pair App", diff --git a/src/main/webapp/i18n/nl/subject.json b/src/main/webapp/i18n/nl/subject.json index c548d198f..94d68ef2b 100644 --- a/src/main/webapp/i18n/nl/subject.json +++ b/src/main/webapp/i18n/nl/subject.json @@ -34,6 +34,7 @@ "dateOfBirth": "Geboortedatum", "lastModifiedBy": "Laatst aangepast door", "lastModifiedDate": "Laatst aangepast datum", + "personName": "Naam", "pairing": "Koppelen", "actions": "Acties", "pairApp": "App koppelen", From 44fc7e301976a4bc163911c3d1ffe9553103ca89 Mon Sep 17 00:00:00 2001 From: aykl Date: Thu, 7 Oct 2021 10:37:08 +0200 Subject: [PATCH 038/431] Sources are soft-deleted when unassigned --- .../radarbase/management/domain/Source.java | 19 ++++++++++ .../management/service/SubjectService.java | 3 +- ...20211006160000_add_source_deleted_flag.xml | 35 +++++++++++++++++++ .../resources/config/liquibase/master.xml | 1 + 4 files changed, 57 insertions(+), 1 deletion(-) create mode 100644 src/main/resources/config/liquibase/changelog/20211006160000_add_source_deleted_flag.xml diff --git a/src/main/java/org/radarbase/management/domain/Source.java b/src/main/java/org/radarbase/management/domain/Source.java index 9d1b0f7e1..f05448789 100644 --- a/src/main/java/org/radarbase/management/domain/Source.java +++ b/src/main/java/org/radarbase/management/domain/Source.java @@ -5,6 +5,7 @@ import com.fasterxml.jackson.annotation.Nulls; import org.hibernate.annotations.Cache; import org.hibernate.annotations.CacheConcurrencyStrategy; +import org.hibernate.annotations.Where; import org.hibernate.envers.Audited; import org.radarbase.auth.config.Constants; import org.radarbase.management.domain.support.AbstractEntityListener; @@ -38,6 +39,7 @@ @Entity @Audited @Table(name = "radar_source") +@Where(clause = "deleted=false") @Cache(usage = CacheConcurrencyStrategy.NONSTRICT_READ_WRITE) @EntityListeners({AbstractEntityListener.class}) public class Source extends AbstractEntity implements Serializable { @@ -65,6 +67,10 @@ public class Source extends AbstractEntity implements Serializable { @Column(name = "assigned", nullable = false) private Boolean assigned; + @NotNull + @Column(name = "deleted", nullable = false) + private Boolean deleted = false; + @ManyToOne(fetch = FetchType.EAGER) @JoinColumn(name = "subject_id") @JsonIgnore @@ -153,6 +159,19 @@ public void setAssigned(Boolean assigned) { this.assigned = assigned; } + public Boolean isDeleted() { + return deleted; + } + + public Source deleted(Boolean deleted) { + this.deleted = deleted; + return this; + } + + public void setDeleted(Boolean deleted) { + this.deleted = deleted; + } + public void setSourceType(SourceType sourceType) { this.sourceType = sourceType; } diff --git a/src/main/java/org/radarbase/management/service/SubjectService.java b/src/main/java/org/radarbase/management/service/SubjectService.java index 1be7b4a90..3d3dfd6d2 100644 --- a/src/main/java/org/radarbase/management/service/SubjectService.java +++ b/src/main/java/org/radarbase/management/service/SubjectService.java @@ -169,7 +169,7 @@ public SubjectDTO updateSubject(SubjectDTO newSubjectDto) { Subject subjectFromDb = subjectRepository.findById(newSubjectDto.getId()).get(); //reset all the sources assigned to a subject to unassigned Set sourcesToUpdate = subjectFromDb.getSources(); - sourcesToUpdate.forEach(s -> s.subject(null).assigned(false)); + sourcesToUpdate.forEach(s -> s.subject(null).assigned(false).deleted(true)); //set only the devices assigned to a subject as assigned subjectMapper.safeUpdateSubjectFromDTO(newSubjectDto, subjectFromDb); sourcesToUpdate.addAll(subjectFromDb.getSources()); @@ -228,6 +228,7 @@ private void unassignAllSources(Subject subject) { subject.getSources().forEach(source -> { source.setAssigned(false); source.setSubject(null); + source.setDeleted(true); sourceRepository.save(source); }); subject.getSources().clear(); diff --git a/src/main/resources/config/liquibase/changelog/20211006160000_add_source_deleted_flag.xml b/src/main/resources/config/liquibase/changelog/20211006160000_add_source_deleted_flag.xml new file mode 100644 index 000000000..ca5f42c19 --- /dev/null +++ b/src/main/resources/config/liquibase/changelog/20211006160000_add_source_deleted_flag.xml @@ -0,0 +1,35 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/resources/config/liquibase/master.xml b/src/main/resources/config/liquibase/master.xml index f322ced2b..a42aa8bc0 100644 --- a/src/main/resources/config/liquibase/master.xml +++ b/src/main/resources/config/liquibase/master.xml @@ -36,5 +36,6 @@ + From d70d5b1189511ca2a45224ec660533d0efec5904 Mon Sep 17 00:00:00 2001 From: aykl Date: Thu, 7 Oct 2021 12:44:43 +0200 Subject: [PATCH 039/431] GroupName -> Name on Group Entity --- .../org/radarbase/management/domain/Group.java | 14 +++++++------- .../management/service/SubjectService.java | 3 ++- .../radarbase/management/service/dto/GroupDTO.java | 12 ++++++------ .../changelog/20210920101000_add_groups.xml | 2 +- .../entities/project/project-dialog.component.html | 4 ++-- .../entities/project/project-dialog.component.ts | 4 ++-- .../shared/subject/subject-dialog.component.html | 4 ++-- .../webapp/app/shared/subject/subject.model.ts | 2 +- 8 files changed, 23 insertions(+), 22 deletions(-) diff --git a/src/main/java/org/radarbase/management/domain/Group.java b/src/main/java/org/radarbase/management/domain/Group.java index d2726b066..d7cff101e 100644 --- a/src/main/java/org/radarbase/management/domain/Group.java +++ b/src/main/java/org/radarbase/management/domain/Group.java @@ -45,8 +45,8 @@ public class Group extends AbstractEntity implements Serializable { @NotNull @Size(min = 1, max = 50) - @Column(name = "group_name", length = 50, nullable = false, unique = false) - private String groupName; + @Column(name = "name", length = 50, nullable = false, unique = false) + private String name; @JsonIgnore @ManyToOne(fetch = FetchType.EAGER, optional = false) @@ -63,12 +63,12 @@ public void setId(Long id) { this.id = id; } - public String getGroupName() { - return groupName; + public String getName() { + return name; } - public void setGroupName(String groupName) { - this.groupName = groupName; + public void setName(String name) { + this.name = name; } public Project getProject() { @@ -103,7 +103,7 @@ public int hashCode() { public String toString() { return "Group{" + "id=" + id + ", " - + "groupName=" + groupName + ", " + + "name=" + name + ", " + "project='" + project.getProjectName() + "', " + "}"; } diff --git a/src/main/java/org/radarbase/management/service/SubjectService.java b/src/main/java/org/radarbase/management/service/SubjectService.java index 3d3dfd6d2..0e5bc0572 100644 --- a/src/main/java/org/radarbase/management/service/SubjectService.java +++ b/src/main/java/org/radarbase/management/service/SubjectService.java @@ -173,7 +173,8 @@ public SubjectDTO updateSubject(SubjectDTO newSubjectDto) { //set only the devices assigned to a subject as assigned subjectMapper.safeUpdateSubjectFromDTO(newSubjectDto, subjectFromDb); sourcesToUpdate.addAll(subjectFromDb.getSources()); - subjectFromDb.getSources().forEach(s -> s.subject(subjectFromDb).assigned(true)); + subjectFromDb.getSources() + .forEach(s -> s.subject(subjectFromDb).assigned(true).deleted(false)); sourceRepository.saveAll(sourcesToUpdate); // update participant role subjectFromDb.getUser().setRoles(updateParticipantRoles(subjectFromDb, newSubjectDto)); diff --git a/src/main/java/org/radarbase/management/service/dto/GroupDTO.java b/src/main/java/org/radarbase/management/service/dto/GroupDTO.java index 336d03dc5..589595222 100644 --- a/src/main/java/org/radarbase/management/service/dto/GroupDTO.java +++ b/src/main/java/org/radarbase/management/service/dto/GroupDTO.java @@ -12,7 +12,7 @@ public class GroupDTO implements Serializable { private Long id; - private String groupName; + private String name; public Long getId() { return id; @@ -22,12 +22,12 @@ public void setId(Long id) { this.id = id; } - public String getGroupName() { - return groupName; + public String getName() { + return name; } - public void setGroupName(String groupName) { - this.groupName = groupName; + public void setName(String name) { + this.name = name; } @Override @@ -57,7 +57,7 @@ public int hashCode() { public String toString() { return "GroupDTO{" + "id=" + id - + ", groupName='" + groupName + "'" + + ", name='" + name + "'" + '}'; } } diff --git a/src/main/resources/config/liquibase/changelog/20210920101000_add_groups.xml b/src/main/resources/config/liquibase/changelog/20210920101000_add_groups.xml index 20dd451a3..8af4a2e69 100644 --- a/src/main/resources/config/liquibase/changelog/20210920101000_add_groups.xml +++ b/src/main/resources/config/liquibase/changelog/20210920101000_add_groups.xml @@ -31,7 +31,7 @@ - + diff --git a/src/main/webapp/app/entities/project/project-dialog.component.html b/src/main/webapp/app/entities/project/project-dialog.component.html index d6ff6b5ed..ffe9e4f19 100644 --- a/src/main/webapp/app/entities/project/project-dialog.component.html +++ b/src/main/webapp/app/entities/project/project-dialog.component.html @@ -154,9 +154,9 @@

    - {{g.groupName}} + {{g.name}}
    diff --git a/src/main/webapp/app/entities/project/project-dialog.component.ts b/src/main/webapp/app/entities/project/project-dialog.component.ts index 5c7b47012..633175099 100644 --- a/src/main/webapp/app/entities/project/project-dialog.component.ts +++ b/src/main/webapp/app/entities/project/project-dialog.component.ts @@ -136,7 +136,7 @@ export class ProjectDialogComponent implements OnInit { addGroup() { // TODO implement group name validation let currentGroups = this.project.groups || []; - let newGroup = { groupName: this.newGroupInputText }; + let newGroup = { name: this.newGroupInputText }; this.project.groups = [ ...currentGroups, newGroup ]; this.newGroupInputText = ''; } @@ -144,7 +144,7 @@ export class ProjectDialogComponent implements OnInit { removeGroup(groupName: string) { // TODO warn if it will affect existing subjects (on save, expect HTTP 409) let oldGroups = this.project.groups; - this.project.groups = oldGroups.filter(g => g.groupName !== groupName); + this.project.groups = oldGroups.filter(g => g.name !== groupName); } } diff --git a/src/main/webapp/app/shared/subject/subject-dialog.component.html b/src/main/webapp/app/shared/subject/subject-dialog.component.html index 1df5ebd94..5b139b018 100644 --- a/src/main/webapp/app/shared/subject/subject-dialog.component.html +++ b/src/main/webapp/app/shared/subject/subject-dialog.component.html @@ -44,8 +44,8 @@ [(ngModel)]="subject.group" > -
    diff --git a/src/main/webapp/app/shared/subject/subject.model.ts b/src/main/webapp/app/shared/subject/subject.model.ts index 2f76d01d5..4c06098c2 100644 --- a/src/main/webapp/app/shared/subject/subject.model.ts +++ b/src/main/webapp/app/shared/subject/subject.model.ts @@ -68,5 +68,5 @@ export const enum SubjectStatus { export class Group { public id?: any; - public groupName?: string; + public name?: string; } From 00762ac18310713e157a485d777d0b7bcc90da9e Mon Sep 17 00:00:00 2001 From: aykl Date: Thu, 7 Oct 2021 12:51:42 +0200 Subject: [PATCH 040/431] Date Format updated on Subject Details Page --- .../webapp/app/shared/subject/subject-detail.component.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/webapp/app/shared/subject/subject-detail.component.html b/src/main/webapp/app/shared/subject/subject-detail.component.html index 3e44b434e..8ede719df 100644 --- a/src/main/webapp/app/shared/subject/subject-detail.component.html +++ b/src/main/webapp/app/shared/subject/subject-detail.component.html @@ -43,15 +43,15 @@

    {{sub
    {{subject.personName}}
    -
    {{subject.dateOfBirth | date:'dd/MM/yy HH:mm' }}
    +
    {{subject.dateOfBirth | date:'yyyy-MM-dd HH:mm' }}
    {{subject.createdBy}}
    -
    {{subject.createdDate | date:'dd/MM/yy HH:mm' }}
    +
    {{subject.createdDate | date:'yyyy-MM-dd HH:mm' }}
    {{subject.lastModifiedBy}}
    -
    {{subject.lastModifiedDate | date:'dd/MM/yy HH:mm'}}
    +
    {{subject.lastModifiedDate | date:'yyyy-MM-dd HH:mm'}}
    From 0620799298e2e2555f37d59802bc903754849d16 Mon Sep 17 00:00:00 2001 From: aykl Date: Thu, 7 Oct 2021 16:10:30 +0200 Subject: [PATCH 041/431] DOB Field Name fixed in SubjectFilterParams --- src/main/webapp/app/shared/subject/subject.service.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/webapp/app/shared/subject/subject.service.ts b/src/main/webapp/app/shared/subject/subject.service.ts index a29c1fd89..65b3a81e2 100644 --- a/src/main/webapp/app/shared/subject/subject.service.ts +++ b/src/main/webapp/app/shared/subject/subject.service.ts @@ -73,8 +73,8 @@ export class SubjectService { export interface SubjectFilterParams { subjectId?: string, externalId?: string, - dateTimeFrom?: string, - dateTimeTo?: string, + dateOfBirthFrom?: string, + dateOfBirthTo?: string, personName?: string, } From fabd0f0376bd96ae2849b4e4c00b8a57423d2a98 Mon Sep 17 00:00:00 2001 From: aykl Date: Thu, 7 Oct 2021 17:17:21 +0200 Subject: [PATCH 042/431] ZonedDateTime -> LocalDate for Subject DOB --- .../org/radarbase/management/domain/Subject.java | 7 ++++--- .../repository/filters/SubjectFilter.java | 13 +++++++------ .../management/service/dto/SubjectDTO.java | 7 ++++--- .../changelog/20210929120000_add_date_of_birth.xml | 4 ++-- 4 files changed, 17 insertions(+), 14 deletions(-) diff --git a/src/main/java/org/radarbase/management/domain/Subject.java b/src/main/java/org/radarbase/management/domain/Subject.java index 9a7b8b869..be361092e 100644 --- a/src/main/java/org/radarbase/management/domain/Subject.java +++ b/src/main/java/org/radarbase/management/domain/Subject.java @@ -29,6 +29,7 @@ import javax.persistence.Table; import javax.validation.constraints.NotNull; import java.io.Serializable; +import java.time.LocalDate; import java.time.ZonedDateTime; import java.util.HashMap; import java.util.HashSet; @@ -90,7 +91,7 @@ public class Subject extends AbstractEntity implements Serializable { private String group; @Column(name = "date_of_birth") - private ZonedDateTime dateOfBirth; + private LocalDate dateOfBirth; @Column(name = "person_name") private String personName; @@ -190,11 +191,11 @@ public String getGroup() { return this.group; } - public void setDateOfBirth(ZonedDateTime dateOfBirth) { + public void setDateOfBirth(LocalDate dateOfBirth) { this.dateOfBirth = dateOfBirth; } - public ZonedDateTime getDateOfBirth() { + public LocalDate getDateOfBirth() { return this.dateOfBirth; } diff --git a/src/main/java/org/radarbase/management/repository/filters/SubjectFilter.java b/src/main/java/org/radarbase/management/repository/filters/SubjectFilter.java index 7d42d7fa6..883a13846 100644 --- a/src/main/java/org/radarbase/management/repository/filters/SubjectFilter.java +++ b/src/main/java/org/radarbase/management/repository/filters/SubjectFilter.java @@ -18,6 +18,7 @@ import javax.persistence.criteria.Predicate; import javax.persistence.criteria.Root; +import java.time.LocalDate; import java.time.ZonedDateTime; import java.util.ArrayList; import java.util.Arrays; @@ -27,8 +28,8 @@ public class SubjectFilter implements Specification { private boolean includeInactive = false; - private ZonedDateTime dateOfBirthFrom = null; - private ZonedDateTime dateOfBirthTo = null; + private LocalDate dateOfBirthFrom = null; + private LocalDate dateOfBirthTo = null; private String groupName = null; private Long lastLoadedId = null; private Integer pageSize = 10; @@ -143,19 +144,19 @@ public void setPersonName(String personName) { this.personName = personName; } - public ZonedDateTime getDateOfBirthTo() { + public LocalDate getDateOfBirthTo() { return dateOfBirthTo; } - public void setDateOfBirthTo(ZonedDateTime dateOfBirthTo) { + public void setDateOfBirthTo(LocalDate dateOfBirthTo) { this.dateOfBirthTo = dateOfBirthTo; } - public ZonedDateTime getDateOfBirthFrom() { + public LocalDate getDateOfBirthFrom() { return dateOfBirthFrom; } - public void setDateOfBirthFrom(ZonedDateTime dateOfBirthFrom) { + public void setDateOfBirthFrom(LocalDate dateOfBirthFrom) { this.dateOfBirthFrom = dateOfBirthFrom; } diff --git a/src/main/java/org/radarbase/management/service/dto/SubjectDTO.java b/src/main/java/org/radarbase/management/service/dto/SubjectDTO.java index 85e347b20..6cc3a8ee4 100644 --- a/src/main/java/org/radarbase/management/service/dto/SubjectDTO.java +++ b/src/main/java/org/radarbase/management/service/dto/SubjectDTO.java @@ -7,6 +7,7 @@ import com.fasterxml.jackson.annotation.Nulls; import java.io.Serializable; +import java.time.LocalDate; import java.time.ZonedDateTime; import java.util.HashMap; import java.util.HashSet; @@ -60,7 +61,7 @@ public enum SubjectStatus { private String group; - private ZonedDateTime dateOfBirth; + private LocalDate dateOfBirth; private String personName; @@ -111,11 +112,11 @@ public void setGroup(String group) { this.group = group; } - public ZonedDateTime getDateOfBirth() { + public LocalDate getDateOfBirth() { return this.dateOfBirth; } - public void setDateOfBirth(ZonedDateTime dateOfBirth) { + public void setDateOfBirth(LocalDate dateOfBirth) { this.dateOfBirth = dateOfBirth; } diff --git a/src/main/resources/config/liquibase/changelog/20210929120000_add_date_of_birth.xml b/src/main/resources/config/liquibase/changelog/20210929120000_add_date_of_birth.xml index 0bb3000ef..98f304474 100644 --- a/src/main/resources/config/liquibase/changelog/20210929120000_add_date_of_birth.xml +++ b/src/main/resources/config/liquibase/changelog/20210929120000_add_date_of_birth.xml @@ -21,12 +21,12 @@ --> - + - + From ccab1cdcb5230e015d2b6412c1831c269aa6e505 Mon Sep 17 00:00:00 2001 From: aykl Date: Thu, 7 Oct 2021 17:19:51 +0200 Subject: [PATCH 043/431] Subject Enrollment Date added --- .../radarbase/management/domain/Subject.java | 11 +++++++ .../repository/filters/SubjectFilter.java | 26 +++++++++++++++ .../management/service/dto/SubjectDTO.java | 10 ++++++ .../web/rest/util/PaginationUtil.java | 2 ++ .../20211006170000_add_enrollment_date.xml | 33 +++++++++++++++++++ .../resources/config/liquibase/master.xml | 1 + .../subject/subject-detail.component.html | 2 ++ .../app/shared/subject/subject.model.ts | 3 ++ .../app/shared/subject/subject.service.ts | 2 ++ src/main/webapp/i18n/en/subject.json | 1 + src/main/webapp/i18n/nl/subject.json | 1 + 11 files changed, 92 insertions(+) create mode 100644 src/main/resources/config/liquibase/changelog/20211006170000_add_enrollment_date.xml diff --git a/src/main/java/org/radarbase/management/domain/Subject.java b/src/main/java/org/radarbase/management/domain/Subject.java index be361092e..ba774a7f3 100644 --- a/src/main/java/org/radarbase/management/domain/Subject.java +++ b/src/main/java/org/radarbase/management/domain/Subject.java @@ -93,6 +93,9 @@ public class Subject extends AbstractEntity implements Serializable { @Column(name = "date_of_birth") private LocalDate dateOfBirth; + @Column(name = "enrollment_date") + private ZonedDateTime enrollmentDate; + @Column(name = "person_name") private String personName; @@ -199,6 +202,14 @@ public LocalDate getDateOfBirth() { return this.dateOfBirth; } + public void setEnrollmentDate(ZonedDateTime enrollmentDate) { + this.enrollmentDate = enrollmentDate; + } + + public ZonedDateTime getEnrollmentDate() { + return this.enrollmentDate; + } + public void setPersonName(String personName) { this.personName = personName; } diff --git a/src/main/java/org/radarbase/management/repository/filters/SubjectFilter.java b/src/main/java/org/radarbase/management/repository/filters/SubjectFilter.java index 883a13846..a6d106633 100644 --- a/src/main/java/org/radarbase/management/repository/filters/SubjectFilter.java +++ b/src/main/java/org/radarbase/management/repository/filters/SubjectFilter.java @@ -30,6 +30,8 @@ public class SubjectFilter implements Specification { private boolean includeInactive = false; private LocalDate dateOfBirthFrom = null; private LocalDate dateOfBirthTo = null; + private ZonedDateTime enrollmentDateFrom = null; + private ZonedDateTime enrollmentDateTo = null; private String groupName = null; private Long lastLoadedId = null; private Integer pageSize = 10; @@ -84,6 +86,14 @@ public Predicate toPredicate(Root root, CriteriaQuery query, Criteri predicates.add(builder .lessThan(root.get("dateOfBirth"), dateOfBirthTo)); } + if (enrollmentDateFrom != null) { + predicates.add(builder + .greaterThanOrEqualTo(root.get("enrollmentDate"), enrollmentDateFrom)); + } + if (enrollmentDateTo != null) { + predicates.add(builder + .lessThan(root.get("enrollmentDate"), enrollmentDateTo)); + } if (StringUtils.isNotEmpty(personName)) { predicates.add(builder .like(root.get("personName"), "%" + personName + "%")); @@ -160,6 +170,22 @@ public void setDateOfBirthFrom(LocalDate dateOfBirthFrom) { this.dateOfBirthFrom = dateOfBirthFrom; } + public ZonedDateTime getEnrollmentDateTo() { + return enrollmentDateTo; + } + + public void setEnrollmentDateTo(ZonedDateTime enrollmentDateTo) { + this.enrollmentDateTo = enrollmentDateTo; + } + + public ZonedDateTime getEnrollmentDateFrom() { + return enrollmentDateFrom; + } + + public void setEnrollmentDateFrom(ZonedDateTime enrollmentDateFrom) { + this.enrollmentDateFrom = enrollmentDateFrom; + } + public String getGroupName() { return this.groupName; } diff --git a/src/main/java/org/radarbase/management/service/dto/SubjectDTO.java b/src/main/java/org/radarbase/management/service/dto/SubjectDTO.java index 6cc3a8ee4..4c5eeb39d 100644 --- a/src/main/java/org/radarbase/management/service/dto/SubjectDTO.java +++ b/src/main/java/org/radarbase/management/service/dto/SubjectDTO.java @@ -63,6 +63,8 @@ public enum SubjectStatus { private LocalDate dateOfBirth; + private ZonedDateTime enrollmentDate; + private String personName; private List roles = new ArrayList<>(); @@ -120,6 +122,14 @@ public void setDateOfBirth(LocalDate dateOfBirth) { this.dateOfBirth = dateOfBirth; } + public void setEnrollmentDate(ZonedDateTime enrollmentDate) { + this.enrollmentDate = enrollmentDate; + } + + public ZonedDateTime getEnrollmentDate() { + return this.enrollmentDate; + } + public Long getId() { return id; } diff --git a/src/main/java/org/radarbase/management/web/rest/util/PaginationUtil.java b/src/main/java/org/radarbase/management/web/rest/util/PaginationUtil.java index 81d6923c7..b6d9e28a8 100644 --- a/src/main/java/org/radarbase/management/web/rest/util/PaginationUtil.java +++ b/src/main/java/org/radarbase/management/web/rest/util/PaginationUtil.java @@ -80,6 +80,8 @@ private static String generateUri(String baseUrl, SubjectFilter filter) { return UriComponentsBuilder.fromUriString(baseUrl) .queryParam("dateOfBirthFrom", filter.getDateOfBirthFrom()) .queryParam("dateOfBirthTo", filter.getDateOfBirthTo()) + .queryParam("enrollmentDateFrom", filter.getEnrollmentDateFrom()) + .queryParam("enrollmentDateTo", filter.getEnrollmentDateTo()) .queryParam("externalId", filter.getExternalId()) .queryParam("groupName", filter.getGroupName()) .queryParam("lastLoadedId", filter.getLastLoadedId()) diff --git a/src/main/resources/config/liquibase/changelog/20211006170000_add_enrollment_date.xml b/src/main/resources/config/liquibase/changelog/20211006170000_add_enrollment_date.xml new file mode 100644 index 000000000..cc2a26363 --- /dev/null +++ b/src/main/resources/config/liquibase/changelog/20211006170000_add_enrollment_date.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + diff --git a/src/main/resources/config/liquibase/master.xml b/src/main/resources/config/liquibase/master.xml index a42aa8bc0..b7ddba162 100644 --- a/src/main/resources/config/liquibase/master.xml +++ b/src/main/resources/config/liquibase/master.xml @@ -37,5 +37,6 @@ + diff --git a/src/main/webapp/app/shared/subject/subject-detail.component.html b/src/main/webapp/app/shared/subject/subject-detail.component.html index 8ede719df..fd0342440 100644 --- a/src/main/webapp/app/shared/subject/subject-detail.component.html +++ b/src/main/webapp/app/shared/subject/subject-detail.component.html @@ -44,6 +44,8 @@

    {{sub
    {{subject.personName}}
    {{subject.dateOfBirth | date:'yyyy-MM-dd HH:mm' }}
    +
    +
    {{subject.enrollmentDate | date:'yyyy-MM-dd HH:mm' }}
    {{subject.createdBy}}
    diff --git a/src/main/webapp/app/shared/subject/subject.model.ts b/src/main/webapp/app/shared/subject/subject.model.ts index 4c06098c2..a3042460d 100644 --- a/src/main/webapp/app/shared/subject/subject.model.ts +++ b/src/main/webapp/app/shared/subject/subject.model.ts @@ -11,6 +11,7 @@ export class Subject { public createdBy?: string; public createdDate?: Date; public dateOfBirth?: Date; + public enrollmentDate?: Date; public lastModifiedBy?: string; public lastModifiedDate?: Date; public group?: string; @@ -31,6 +32,7 @@ export class Subject { createdBy?: string, createdDate?: Date, dateOfBirth?: Date, + enrollmentDate?: Date, lastModifiedBy?: string, lastModifiedDate?: Date, group?: string, @@ -47,6 +49,7 @@ export class Subject { this.createdBy = createdBy ? createdBy : null; this.createdDate = createdDate ? createdDate : null; this.dateOfBirth = dateOfBirth ? dateOfBirth : null; + this.enrollmentDate = enrollmentDate ? enrollmentDate : null; this.lastModifiedBy = lastModifiedBy ? lastModifiedBy : null; this.lastModifiedDate = lastModifiedDate ? lastModifiedDate : null; this.group = group ? group : null; diff --git a/src/main/webapp/app/shared/subject/subject.service.ts b/src/main/webapp/app/shared/subject/subject.service.ts index 65b3a81e2..ea5505d1d 100644 --- a/src/main/webapp/app/shared/subject/subject.service.ts +++ b/src/main/webapp/app/shared/subject/subject.service.ts @@ -75,6 +75,8 @@ export interface SubjectFilterParams { externalId?: string, dateOfBirthFrom?: string, dateOfBirthTo?: string, + enrollmentDateFrom?: string, + enrollmentDateTo?: string, personName?: string, } diff --git a/src/main/webapp/i18n/en/subject.json b/src/main/webapp/i18n/en/subject.json index d9c4b8ee3..6501f7e56 100644 --- a/src/main/webapp/i18n/en/subject.json +++ b/src/main/webapp/i18n/en/subject.json @@ -32,6 +32,7 @@ "createdBy": "Created By", "createdDate": "Created Date", "dateOfBirth": "Date of Birth", + "enrollmentDate": "Enrollment Date", "lastModifiedBy": "Last Modified By", "lastModifiedDate": "Last Modified Date", "personName": "Name", diff --git a/src/main/webapp/i18n/nl/subject.json b/src/main/webapp/i18n/nl/subject.json index 94d68ef2b..cd9470d1d 100644 --- a/src/main/webapp/i18n/nl/subject.json +++ b/src/main/webapp/i18n/nl/subject.json @@ -32,6 +32,7 @@ "createdBy": "Aanmaak door", "createdDate": "Aanmaak datum", "dateOfBirth": "Geboortedatum", + "enrollmentDate": "Inschrijvingsdatum", "lastModifiedBy": "Laatst aangepast door", "lastModifiedDate": "Laatst aangepast datum", "personName": "Naam", From df045eba696dadc707195e51abea600247f44feb Mon Sep 17 00:00:00 2001 From: aykl Date: Thu, 7 Oct 2021 18:20:59 +0200 Subject: [PATCH 044/431] Filter Date Parsing made more Client-friendly --- .../repository/filters/SubjectFilter.java | 51 ++++++++++++++++--- 1 file changed, 43 insertions(+), 8 deletions(-) diff --git a/src/main/java/org/radarbase/management/repository/filters/SubjectFilter.java b/src/main/java/org/radarbase/management/repository/filters/SubjectFilter.java index a6d106633..f9259d8bf 100644 --- a/src/main/java/org/radarbase/management/repository/filters/SubjectFilter.java +++ b/src/main/java/org/radarbase/management/repository/filters/SubjectFilter.java @@ -3,6 +3,11 @@ import static org.radarbase.auth.authorization.AuthoritiesConstants.INACTIVE_PARTICIPANT; import static org.radarbase.auth.authorization.AuthoritiesConstants.PARTICIPANT; +import static java.time.temporal.ChronoField.HOUR_OF_DAY; +import static java.time.temporal.ChronoField.MINUTE_OF_HOUR; +import static java.time.temporal.ChronoField.SECOND_OF_MINUTE; +import static java.time.temporal.ChronoField.NANO_OF_SECOND; + import org.apache.commons.lang3.StringUtils; import org.radarbase.management.domain.Role; import org.radarbase.management.domain.Subject; @@ -19,7 +24,11 @@ import javax.persistence.criteria.Root; import java.time.LocalDate; +import java.time.ZoneId; import java.time.ZonedDateTime; +import java.time.format.DateTimeFormatter; +import java.time.format.DateTimeFormatterBuilder; +import java.time.format.ResolverStyle; import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; @@ -158,32 +167,32 @@ public LocalDate getDateOfBirthTo() { return dateOfBirthTo; } - public void setDateOfBirthTo(LocalDate dateOfBirthTo) { - this.dateOfBirthTo = dateOfBirthTo; + public void setDateOfBirthTo(String date) { + this.dateOfBirthTo = LocalDate.parse(date, dateTimeFormatter); } public LocalDate getDateOfBirthFrom() { return dateOfBirthFrom; } - public void setDateOfBirthFrom(LocalDate dateOfBirthFrom) { - this.dateOfBirthFrom = dateOfBirthFrom; + public void setDateOfBirthFrom(String date) { + this.dateOfBirthFrom = LocalDate.parse(date, dateTimeFormatter); } public ZonedDateTime getEnrollmentDateTo() { return enrollmentDateTo; } - public void setEnrollmentDateTo(ZonedDateTime enrollmentDateTo) { - this.enrollmentDateTo = enrollmentDateTo; + public void setEnrollmentDateTo(String datetime) { + this.enrollmentDateTo = ZonedDateTime.parse(datetime, dateTimeFormatter); } public ZonedDateTime getEnrollmentDateFrom() { return enrollmentDateFrom; } - public void setEnrollmentDateFrom(ZonedDateTime enrollmentDateFrom) { - this.enrollmentDateFrom = enrollmentDateFrom; + public void setEnrollmentDateFrom(String datetime) { + this.enrollmentDateFrom = ZonedDateTime.parse(datetime, dateTimeFormatter); } public String getGroupName() { @@ -275,6 +284,32 @@ public String getFilterValidationError() { return null; } + private static DateTimeFormatter dateTimeFormatter; + static { + // This lenient formatter handles + // both date and datetime strings (zoned and unzoned) + // in order to be easy for JS clients + // (i.e. it accepts ISO-formatted dates, unlike default LocalDate parser) + // and for humans (i.e. you can type '2020-10-10') to use. + dateTimeFormatter = new DateTimeFormatterBuilder() + .parseCaseInsensitive() + .append(DateTimeFormatter.ISO_LOCAL_DATE) + .optionalStart() + .appendLiteral('T') + .append(DateTimeFormatter.ISO_LOCAL_TIME) + .optionalStart() + .appendOffsetId() + .optionalEnd() + .optionalEnd() + .parseDefaulting(HOUR_OF_DAY, HOUR_OF_DAY.range().getMinimum()) + .parseDefaulting(MINUTE_OF_HOUR, MINUTE_OF_HOUR.range().getMinimum()) + .parseDefaulting(SECOND_OF_MINUTE, SECOND_OF_MINUTE.range().getMinimum()) + .parseDefaulting(NANO_OF_SECOND, NANO_OF_SECOND.range().getMinimum()) + .toFormatter() + .withZone(ZoneId.of("UTC")) + .withResolverStyle(ResolverStyle.LENIENT); + } + public enum SubjectSortBy { ID("id"), EXTERNAL_ID("externalId"), From 31e4e293d77e327bc3ca2f7843c55d5be7ff0c2e Mon Sep 17 00:00:00 2001 From: aykl Date: Thu, 7 Oct 2021 19:33:32 +0200 Subject: [PATCH 045/431] HumanReadableIdentifier Filter added --- .../repository/filters/SubjectFilter.java | 17 +++++++++++++++++ .../app/shared/subject/subject.service.ts | 1 + 2 files changed, 18 insertions(+) diff --git a/src/main/java/org/radarbase/management/repository/filters/SubjectFilter.java b/src/main/java/org/radarbase/management/repository/filters/SubjectFilter.java index f9259d8bf..b8ded1298 100644 --- a/src/main/java/org/radarbase/management/repository/filters/SubjectFilter.java +++ b/src/main/java/org/radarbase/management/repository/filters/SubjectFilter.java @@ -18,6 +18,7 @@ import javax.persistence.criteria.CriteriaQuery; import javax.persistence.criteria.Join; import javax.persistence.criteria.JoinType; +import javax.persistence.criteria.MapJoin; import javax.persistence.criteria.Order; import javax.persistence.criteria.Path; import javax.persistence.criteria.Predicate; @@ -42,6 +43,7 @@ public class SubjectFilter implements Specification { private ZonedDateTime enrollmentDateFrom = null; private ZonedDateTime enrollmentDateTo = null; private String groupName = null; + private String humanReadableIdentifier = null; private Long lastLoadedId = null; private Integer pageSize = 10; private String personName = null; @@ -66,6 +68,8 @@ public Predicate toPredicate(Root root, CriteriaQuery query, Criteri userJoin.alias("user"); Join rolesJoin = userJoin.join("roles"); rolesJoin.alias("roles"); + MapJoin attributesJoin = + root.joinMap("attributes", JoinType.LEFT); List predicates = new ArrayList<>(); if (StringUtils.isNotEmpty(projectName)) { @@ -81,6 +85,11 @@ public Predicate toPredicate(Root root, CriteriaQuery query, Criteri rolesJoin.get("authority").get("name").in(authorities); predicates.add(filterAuthorities); + if (StringUtils.isNotEmpty(humanReadableIdentifier)) { + predicates.add(builder.and( + builder.equal(attributesJoin.key(), "Human-readable-identifier"), + builder.like(attributesJoin.value(), "%" + humanReadableIdentifier + "%"))); + } if (StringUtils.isNotEmpty(externalId)) { predicates.add(builder.equal(root.get("externalId"), externalId)); } @@ -155,6 +164,14 @@ public Predicate toPredicate(Root root, CriteriaQuery query, Criteri return builder.and(predicates.toArray(new Predicate[0])); } + public String getHumanReadableIdentifier() { + return humanReadableIdentifier; + } + + public void setHumanReadableIdentifier(String humanReadableIdentifier) { + this.humanReadableIdentifier = humanReadableIdentifier; + } + public String getPersonName() { return personName; } diff --git a/src/main/webapp/app/shared/subject/subject.service.ts b/src/main/webapp/app/shared/subject/subject.service.ts index ea5505d1d..c08a6636a 100644 --- a/src/main/webapp/app/shared/subject/subject.service.ts +++ b/src/main/webapp/app/shared/subject/subject.service.ts @@ -77,6 +77,7 @@ export interface SubjectFilterParams { dateOfBirthTo?: string, enrollmentDateFrom?: string, enrollmentDateTo?: string, + humanReadableIdentifier?: string, personName?: string, } From 0439a1dde9a02aa8aa6039e1d18cc152d2fd72ec Mon Sep 17 00:00:00 2001 From: Joris Borgdorff Date: Mon, 11 Oct 2021 11:54:49 +0200 Subject: [PATCH 046/431] Add unique contraints to group --- .../liquibase/changelog/20210920101000_add_groups.xml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/main/resources/config/liquibase/changelog/20210920101000_add_groups.xml b/src/main/resources/config/liquibase/changelog/20210920101000_add_groups.xml index 8af4a2e69..b8f64d45d 100644 --- a/src/main/resources/config/liquibase/changelog/20210920101000_add_groups.xml +++ b/src/main/resources/config/liquibase/changelog/20210920101000_add_groups.xml @@ -13,8 +13,8 @@ xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.4.xsd - http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd"> + xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog https://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.4.xsd + http://www.liquibase.org/xml/ns/dbchangelog-ext https://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd"> @@ -61,4 +61,9 @@ + + + From 88cf95392dff6b2ba0264c3331115faba8e6f529 Mon Sep 17 00:00:00 2001 From: Joris Borgdorff Date: Mon, 11 Oct 2021 12:00:53 +0200 Subject: [PATCH 047/431] Fix DoB printing --- .../webapp/app/shared/subject/subject-detail.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/webapp/app/shared/subject/subject-detail.component.html b/src/main/webapp/app/shared/subject/subject-detail.component.html index fd0342440..8be4a0639 100644 --- a/src/main/webapp/app/shared/subject/subject-detail.component.html +++ b/src/main/webapp/app/shared/subject/subject-detail.component.html @@ -43,7 +43,7 @@

    {{sub
    {{subject.personName}}
    -
    {{subject.dateOfBirth | date:'yyyy-MM-dd HH:mm' }}
    +
    {{subject.dateOfBirth | date:'yyyy-MM-dd' }}
    {{subject.enrollmentDate | date:'yyyy-MM-dd HH:mm' }}
    From efbbac008e99dfede2a354340ab1a94f0ab584d2 Mon Sep 17 00:00:00 2001 From: Joris Borgdorff Date: Mon, 11 Oct 2021 14:25:15 +0200 Subject: [PATCH 048/431] Fix Group association to Subject --- .../radarbase/management/domain/Group.java | 2 +- .../radarbase/management/domain/Subject.java | 10 +++--- .../repository/GroupRepository.java | 34 +++++++++++++++++++ .../repository/ProjectRepository.java | 9 ++--- .../management/service/SubjectService.java | 30 ++++++++++++++-- .../service/mapper/SubjectMapper.java | 4 +++ .../web/rest/errors/EntityName.java | 1 + .../web/rest/errors/ErrorConstants.java | 1 + .../changelog/20210920101000_add_groups.xml | 20 ++++++++--- 9 files changed, 96 insertions(+), 15 deletions(-) create mode 100644 src/main/java/org/radarbase/management/repository/GroupRepository.java diff --git a/src/main/java/org/radarbase/management/domain/Group.java b/src/main/java/org/radarbase/management/domain/Group.java index d7cff101e..f9e816c43 100644 --- a/src/main/java/org/radarbase/management/domain/Group.java +++ b/src/main/java/org/radarbase/management/domain/Group.java @@ -45,7 +45,7 @@ public class Group extends AbstractEntity implements Serializable { @NotNull @Size(min = 1, max = 50) - @Column(name = "name", length = 50, nullable = false, unique = false) + @Column(name = "name", length = 50, nullable = false) private String name; @JsonIgnore diff --git a/src/main/java/org/radarbase/management/domain/Subject.java b/src/main/java/org/radarbase/management/domain/Subject.java index ba774a7f3..ebe76f89e 100644 --- a/src/main/java/org/radarbase/management/domain/Subject.java +++ b/src/main/java/org/radarbase/management/domain/Subject.java @@ -22,6 +22,7 @@ import javax.persistence.GenerationType; import javax.persistence.Id; import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; import javax.persistence.MapKeyColumn; import javax.persistence.OneToMany; import javax.persistence.OneToOne; @@ -87,8 +88,9 @@ public class Subject extends AbstractEntity implements Serializable { @JsonIgnore private final Set metaTokens = new HashSet<>(); - @Column(name = "group_name") - private String group; + @ManyToOne(fetch = FetchType.EAGER) + @JoinColumn(name = "group_id") + private Group group; @Column(name = "date_of_birth") private LocalDate dateOfBirth; @@ -186,11 +188,11 @@ public Set getMetaTokens() { return metaTokens; } - public void setGroup(String group) { + public void setGroup(Group group) { this.group = group; } - public String getGroup() { + public Group getGroup() { return this.group; } diff --git a/src/main/java/org/radarbase/management/repository/GroupRepository.java b/src/main/java/org/radarbase/management/repository/GroupRepository.java new file mode 100644 index 000000000..0d525b4c3 --- /dev/null +++ b/src/main/java/org/radarbase/management/repository/GroupRepository.java @@ -0,0 +1,34 @@ +/* + * Copyright (c) 2021. The Hyve + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * + * See the file LICENSE in the root of this repository. + */ + +package org.radarbase.management.repository; + +import org.radarbase.management.domain.Group; +import org.radarbase.management.domain.Project; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Query; +import org.springframework.data.repository.RepositoryDefinition; +import org.springframework.data.repository.history.RevisionRepository; +import org.springframework.data.repository.query.Param; + +import java.util.List; +import java.util.Optional; + +@RepositoryDefinition(domainClass = Group.class, idClass = Long.class) +public interface GroupRepository extends JpaRepository, + RevisionRepository { + @Query("SELECT group FROM Group group WHERE group.project_id = :project_id") + public List findByProjectId(@Param("project_id") Long id); + + @Query("SELECT group FROM Group group LEFT JOIN Project project ON group.project_id = project.project_id WHERE project.project_name = :project_name") + public List findByProjectName(@Param("project_name") String projectName); + + @Query("SELECT group FROM Group group WHERE group.project_id = :project_id AND group.name = :group_name") + public Optional findByProjectIdAndName(@Param("project_id") Long id, @Param("group_name") String groupName); +} diff --git a/src/main/java/org/radarbase/management/repository/ProjectRepository.java b/src/main/java/org/radarbase/management/repository/ProjectRepository.java index 07fb0ee0b..9738910be 100644 --- a/src/main/java/org/radarbase/management/repository/ProjectRepository.java +++ b/src/main/java/org/radarbase/management/repository/ProjectRepository.java @@ -26,14 +26,15 @@ public interface ProjectRepository extends JpaRepository, Page findAllWithEagerRelationships(Pageable pageable); @Query("select project from Project project " - + "left join fetch project.groups " + "left join fetch project.sourceTypes s " - + "left join fetch s.sourceData " + + "left join fetch project.groups " + "where project.id =:id") Optional findOneWithEagerRelationships(@Param("id") Long id); - @Query("select project from Project project left join fetch " - + "project.sourceTypes where project.projectName =:name") + @Query("select project from Project project " + + "left join fetch project.sourceTypes " + + "left join fetch project.groups " + + "where project.projectName =:name") Optional findOneWithEagerRelationshipsByName(@Param("name") String name); @Query("select project.sourceTypes from Project project WHERE project.id = :id") diff --git a/src/main/java/org/radarbase/management/service/SubjectService.java b/src/main/java/org/radarbase/management/service/SubjectService.java index 0e5bc0572..aa99e80df 100644 --- a/src/main/java/org/radarbase/management/service/SubjectService.java +++ b/src/main/java/org/radarbase/management/service/SubjectService.java @@ -3,9 +3,11 @@ import static org.radarbase.auth.authorization.AuthoritiesConstants.INACTIVE_PARTICIPANT; import static org.radarbase.auth.authorization.AuthoritiesConstants.PARTICIPANT; import static org.radarbase.management.service.dto.ProjectDTO.PRIVACY_POLICY_URL; +import static org.radarbase.management.web.rest.errors.EntityName.GROUP; import static org.radarbase.management.web.rest.errors.EntityName.OAUTH_CLIENT; import static org.radarbase.management.web.rest.errors.EntityName.SOURCE_TYPE; import static org.radarbase.management.web.rest.errors.EntityName.SUBJECT; +import static org.radarbase.management.web.rest.errors.ErrorConstants.ERR_GROUP_NOT_FOUND; import static org.radarbase.management.web.rest.errors.ErrorConstants.ERR_NO_VALID_PRIVACY_POLICY_URL_CONFIGURED; import static org.radarbase.management.web.rest.errors.ErrorConstants.ERR_SOURCE_NOT_FOUND; import static org.radarbase.management.web.rest.errors.ErrorConstants.ERR_SUBJECT_NOT_FOUND; @@ -29,6 +31,7 @@ import javax.annotation.Nonnull; import org.hibernate.envers.query.AuditEntity; import org.radarbase.management.config.ManagementPortalProperties; +import org.radarbase.management.domain.Group; import org.radarbase.management.domain.Project; import org.radarbase.management.domain.Role; import org.radarbase.management.domain.Source; @@ -36,6 +39,7 @@ import org.radarbase.management.domain.Subject; import org.radarbase.management.domain.User; import org.radarbase.management.repository.AuthorityRepository; +import org.radarbase.management.repository.GroupRepository; import org.radarbase.management.repository.RoleRepository; import org.radarbase.management.repository.SourceRepository; import org.radarbase.management.repository.SubjectRepository; @@ -96,6 +100,9 @@ public class SubjectService { @Autowired private PasswordEncoder passwordEncoder; + @Autowired + private GroupRepository groupRepository; + @Autowired private RevisionService revisionService; @@ -118,6 +125,9 @@ public SubjectDTO createSubject(SubjectDTO subjectDto) { Set roles = user.getRoles(); roles.add(projectParticipantRole); + // Set group + subject.setGroup(getSubjectGroup(project, subjectDto.getGroup())); + // set password and reset keys String encryptedPassword = passwordEncoder.encode(RandomUtil.generatePassword()); user.setPassword(encryptedPassword); @@ -135,6 +145,19 @@ public SubjectDTO createSubject(SubjectDTO subjectDto) { return subjectMapper.subjectToSubjectReducedProjectDTO(subjectRepository.save(subject)); } + private Group getSubjectGroup(Project project, String groupName) { + if (project == null || groupName == null) { + return null; + } + return groupRepository.findByProjectIdAndName(project.getId(), groupName) + .orElseThrow(() -> new BadRequestException( + "Group " + groupName + " does not exist in project " + + project.getProjectName(), + GROUP, + ERR_GROUP_NOT_FOUND) + ); + } + /** * Fetch Participant role of the project if available, otherwise create a new Role and assign. * @@ -174,10 +197,14 @@ public SubjectDTO updateSubject(SubjectDTO newSubjectDto) { subjectMapper.safeUpdateSubjectFromDTO(newSubjectDto, subjectFromDb); sourcesToUpdate.addAll(subjectFromDb.getSources()); subjectFromDb.getSources() - .forEach(s -> s.subject(subjectFromDb).assigned(true).deleted(false)); + .forEach(s -> s.subject(subjectFromDb).assigned(true).deleted(false)); sourceRepository.saveAll(sourcesToUpdate); // update participant role subjectFromDb.getUser().setRoles(updateParticipantRoles(subjectFromDb, newSubjectDto)); + // Set group + subjectFromDb.setGroup(getSubjectGroup( + subjectFromDb.getActiveProject().orElse(null), + newSubjectDto.getGroup())); return subjectMapper.subjectToSubjectReducedProjectDTO( subjectRepository.save(subjectFromDb)); } @@ -373,7 +400,6 @@ public void deleteSubject(String login) { * @return list of {@link MinimalSourceDetailsDTO} of sources. */ public List findSubjectSourcesFromRevisions(Subject subject) { - Revisions revisions = subjectRepository.findRevisions(subject.getId()); // collect distinct sources in a set Set sources = revisions diff --git a/src/main/java/org/radarbase/management/service/mapper/SubjectMapper.java b/src/main/java/org/radarbase/management/service/mapper/SubjectMapper.java index ef4e07520..a8ca9a588 100644 --- a/src/main/java/org/radarbase/management/service/mapper/SubjectMapper.java +++ b/src/main/java/org/radarbase/management/service/mapper/SubjectMapper.java @@ -22,6 +22,7 @@ public interface SubjectMapper { @Mapping(source = "user.login", target = "login") @Mapping(target = "status", ignore = true) @Mapping(target = "project", ignore = true) + @Mapping(source = "group.name", target = "group") @Mapping(target = "createdBy", ignore = true) @Mapping(target = "createdDate", ignore = true) @Mapping(target = "lastModifiedBy", ignore = true) @@ -30,6 +31,7 @@ public interface SubjectMapper { SubjectDTO subjectToSubjectDTO(Subject subject); @Mapping(source = "user.login", target = "login") + @Mapping(source = "group.name", target = "group") @Mapping(target = "status", ignore = true) @Mapping(target = "project", ignore = true) @Mapping(target = "createdBy", ignore = true) @@ -41,6 +43,7 @@ public interface SubjectMapper { @Named(value = "subjectReducedProjectDTO") @Mapping(source = "user.login", target = "login") + @Mapping(source = "group.name", target = "group") @Mapping(target = "status", ignore = true) @Mapping(target = "project", ignore = true) @Mapping(target = "createdBy", ignore = true) @@ -54,6 +57,7 @@ public interface SubjectMapper { List subjectsToSubjectReducedProjectDTOs(List subjects); @Mapping(source = "login", target = "user.login") + @Mapping(source = "group.name", target = "group") @Mapping(target = "user.email", ignore = true) @Mapping(target = "user.activated", ignore = true) @Mapping(target = "removed", ignore = true) diff --git a/src/main/java/org/radarbase/management/web/rest/errors/EntityName.java b/src/main/java/org/radarbase/management/web/rest/errors/EntityName.java index f4a783225..e94be6a2d 100644 --- a/src/main/java/org/radarbase/management/web/rest/errors/EntityName.java +++ b/src/main/java/org/radarbase/management/web/rest/errors/EntityName.java @@ -11,5 +11,6 @@ public interface EntityName { String META_TOKEN = "meta-token"; String PROJECT = "project"; String REVISION = "revision"; + String GROUP = "group"; } diff --git a/src/main/java/org/radarbase/management/web/rest/errors/ErrorConstants.java b/src/main/java/org/radarbase/management/web/rest/errors/ErrorConstants.java index 32d55a607..50b082d44 100644 --- a/src/main/java/org/radarbase/management/web/rest/errors/ErrorConstants.java +++ b/src/main/java/org/radarbase/management/web/rest/errors/ErrorConstants.java @@ -14,6 +14,7 @@ public final class ErrorConstants { public static final String ERR_OAUTH_CLIENT_ALREADY_EXISTS = "error.oAuthClientExists"; public static final String ERR_OAUTH_CLIENT_ID_NOT_FOUND = "error.oAuthClientIdNotFound"; public static final String ERR_SUBJECT_NOT_FOUND = "error.subjectNotFound"; + public static final String ERR_GROUP_NOT_FOUND = "error.groupNotFound"; public static final String ERR_SOURCE_NAME_EXISTS = "error.sourceNameExists"; public static final String ERR_SOURCE_NOT_FOUND = "error.sourceNotFound"; public static final String ERR_SOURCE_TYPE_IN_USE = "error.sourceTypeInUse"; diff --git a/src/main/resources/config/liquibase/changelog/20210920101000_add_groups.xml b/src/main/resources/config/liquibase/changelog/20210920101000_add_groups.xml index b8f64d45d..4fbe5b480 100644 --- a/src/main/resources/config/liquibase/changelog/20210920101000_add_groups.xml +++ b/src/main/resources/config/liquibase/changelog/20210920101000_add_groups.xml @@ -40,7 +40,8 @@ baseTableName="radar_group" constraintName="fk_group_project_id" referencedColumnNames="id" - referencedTableName="project"/> + referencedTableName="project" + onDelete="CASCADE"/> @@ -49,14 +50,25 @@ - + - + + + + + - + + + From 76fa927b2437ccbe0109dd2de443d85dc5cf3e65 Mon Sep 17 00:00:00 2001 From: Joris Borgdorff Date: Mon, 11 Oct 2021 14:28:26 +0200 Subject: [PATCH 049/431] Ensure validity group name --- src/main/java/org/radarbase/management/domain/Group.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/main/java/org/radarbase/management/domain/Group.java b/src/main/java/org/radarbase/management/domain/Group.java index f9e816c43..d9659f061 100644 --- a/src/main/java/org/radarbase/management/domain/Group.java +++ b/src/main/java/org/radarbase/management/domain/Group.java @@ -12,6 +12,7 @@ import org.hibernate.annotations.Cache; import org.hibernate.annotations.CacheConcurrencyStrategy; +import org.radarbase.auth.config.Constants; import javax.persistence.Column; import javax.persistence.Entity; @@ -23,6 +24,7 @@ import javax.persistence.SequenceGenerator; import javax.persistence.Table; import javax.validation.constraints.NotNull; +import javax.validation.constraints.Pattern; import javax.validation.constraints.Size; import java.io.Serializable; @@ -44,6 +46,7 @@ public class Group extends AbstractEntity implements Serializable { private Long id; @NotNull + @Pattern(regexp = Constants.ENTITY_ID_REGEX) @Size(min = 1, max = 50) @Column(name = "name", length = 50, nullable = false) private String name; From 5c6d0a6b1977b564777da48d0826457d6a8a3049 Mon Sep 17 00:00:00 2001 From: Joris Borgdorff Date: Mon, 11 Oct 2021 17:23:38 +0200 Subject: [PATCH 050/431] Proper Group support --- .../radarbase/management/domain/Project.java | 8 +- .../repository/GroupRepository.java | 32 +++++-- .../repository/ProjectRepository.java | 5 ++ .../management/service/GroupService.java | 87 +++++++++++++++++++ .../management/service/ProjectService.java | 1 + .../management/service/dto/GroupDTO.java | 10 +++ .../service/mapper/GroupMapper.java | 36 ++++++++ .../service/mapper/ProjectMapper.java | 2 +- .../management/web/rest/GroupResource.java | 78 +++++++++++++++++ .../web/rest/errors/ErrorConstants.java | 3 +- 10 files changed, 251 insertions(+), 11 deletions(-) create mode 100644 src/main/java/org/radarbase/management/service/GroupService.java create mode 100644 src/main/java/org/radarbase/management/service/mapper/GroupMapper.java create mode 100644 src/main/java/org/radarbase/management/web/rest/GroupResource.java diff --git a/src/main/java/org/radarbase/management/domain/Project.java b/src/main/java/org/radarbase/management/domain/Project.java index 220fec5fb..e62d2cab0 100644 --- a/src/main/java/org/radarbase/management/domain/Project.java +++ b/src/main/java/org/radarbase/management/domain/Project.java @@ -12,6 +12,7 @@ import org.radarbase.management.domain.enumeration.ProjectStatus; import org.radarbase.management.domain.support.AbstractEntityListener; +import javax.persistence.CascadeType; import javax.persistence.CollectionTable; import javax.persistence.Column; import javax.persistence.ElementCollection; @@ -28,6 +29,7 @@ import javax.persistence.ManyToMany; import javax.persistence.MapKeyColumn; import javax.persistence.OneToMany; +import javax.persistence.OrderBy; import javax.persistence.SequenceGenerator; import javax.persistence.Table; import javax.validation.constraints.NotNull; @@ -102,8 +104,10 @@ public class Project extends AbstractEntity implements Serializable { private Map attributes = new HashMap<>(); @NotAudited - @OneToMany(mappedBy = "project", fetch = FetchType.LAZY, orphanRemoval = true) - @Cascade(org.hibernate.annotations.CascadeType.ALL) + @OneToMany(fetch = FetchType.LAZY, orphanRemoval = true, + cascade = CascadeType.ALL) + @JoinColumn("project_id") + @OrderBy("name ASC") private Set groups = new HashSet<>(); @Override diff --git a/src/main/java/org/radarbase/management/repository/GroupRepository.java b/src/main/java/org/radarbase/management/repository/GroupRepository.java index 0d525b4c3..808306895 100644 --- a/src/main/java/org/radarbase/management/repository/GroupRepository.java +++ b/src/main/java/org/radarbase/management/repository/GroupRepository.java @@ -10,8 +10,8 @@ package org.radarbase.management.repository; import org.radarbase.management.domain.Group; -import org.radarbase.management.domain.Project; import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Modifying; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.RepositoryDefinition; import org.springframework.data.repository.history.RevisionRepository; @@ -23,12 +23,30 @@ @RepositoryDefinition(domainClass = Group.class, idClass = Long.class) public interface GroupRepository extends JpaRepository, RevisionRepository { - @Query("SELECT group FROM Group group WHERE group.project_id = :project_id") - public List findByProjectId(@Param("project_id") Long id); + @Query("SELECT group FROM Group group " + + "WHERE group.project_id = :project_id") + List findByProjectId(@Param("project_id") Long id); - @Query("SELECT group FROM Group group LEFT JOIN Project project ON group.project_id = project.project_id WHERE project.project_name = :project_name") - public List findByProjectName(@Param("project_name") String projectName); + @Query("SELECT group FROM Group group " + + "LEFT JOIN Project project ON group.project_id = project.project_id " + + "WHERE project.project_name = :project_name") + List findByProjectName(@Param("project_name") String projectName); - @Query("SELECT group FROM Group group WHERE group.project_id = :project_id AND group.name = :group_name") - public Optional findByProjectIdAndName(@Param("project_id") Long id, @Param("group_name") String groupName); + @Query("SELECT group FROM Group group " + + "WHERE group.project_id = :project_id " + + "AND group.name = :group_name") + Optional findByProjectIdAndName(@Param("project_id") Long id, @Param("group_name") String groupName); + + @Query("SELECT group FROM Group group " + + "LEFT JOIN Project project ON group.project_id = project.project_id " + + "WHERE project.project_name = :project_name " + + "AND group.name = :group_name") + Optional findByProjectNameAndName(@Param("project_name") String projectName, @Param("group_name") String groupName); + + @Modifying + @Query("DELETE FROM Group group " + + "LEFT JOIN Project project ON group.project_id = project.project_id " + + "WHERE project.project_name = :project_name " + + "AND group.name = :group_name") + int deleteByProjectNameAndName(@Param("project_name") String projectName, @Param("group_name") String groupName); } diff --git a/src/main/java/org/radarbase/management/repository/ProjectRepository.java b/src/main/java/org/radarbase/management/repository/ProjectRepository.java index 9738910be..468d8934b 100644 --- a/src/main/java/org/radarbase/management/repository/ProjectRepository.java +++ b/src/main/java/org/radarbase/management/repository/ProjectRepository.java @@ -37,6 +37,11 @@ public interface ProjectRepository extends JpaRepository, + "where project.projectName =:name") Optional findOneWithEagerRelationshipsByName(@Param("name") String name); + @Query("select project from Project project " + + "left join fetch project.groups " + + "where project.projectName =:name") + Optional findOneWithGroupsByName(@Param("name") String name); + @Query("select project.sourceTypes from Project project WHERE project.id = :id") List findSourceTypesByProjectId(@Param("id") Long id); diff --git a/src/main/java/org/radarbase/management/service/GroupService.java b/src/main/java/org/radarbase/management/service/GroupService.java new file mode 100644 index 000000000..8566b91ef --- /dev/null +++ b/src/main/java/org/radarbase/management/service/GroupService.java @@ -0,0 +1,87 @@ +/* + * Copyright (c) 2021. The Hyve + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * + * See the file LICENSE in the root of this repository. + */ + +package org.radarbase.management.service; + +import org.radarbase.management.domain.Group; +import org.radarbase.management.domain.Project; +import org.radarbase.management.repository.GroupRepository; +import org.radarbase.management.repository.ProjectRepository; +import org.radarbase.management.service.dto.GroupDTO; +import org.radarbase.management.service.mapper.GroupMapper; +import org.radarbase.management.web.rest.errors.ConflictException; +import org.radarbase.management.web.rest.errors.NotFoundException; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import javax.transaction.Transactional; + +import java.util.List; + +import static org.radarbase.management.web.rest.errors.EntityName.GROUP; +import static org.radarbase.management.web.rest.errors.EntityName.PROJECT; +import static org.radarbase.management.web.rest.errors.ErrorConstants.ERR_GROUP_EXISTS; +import static org.radarbase.management.web.rest.errors.ErrorConstants.ERR_GROUP_NOT_FOUND; +import static org.radarbase.management.web.rest.errors.ErrorConstants.ERR_PROJECT_NAME_NOT_FOUND; + +@Service +public class GroupService { + @Autowired + private GroupRepository groupRepository; + + @Autowired + private ProjectRepository projectRepository; + + @Autowired + private GroupMapper groupMapper; + + @Transactional + public GroupDTO getGroup(String projectName, String groupName) { + return groupMapper.groupToGroupDTOFull(groupRepository.findByProjectNameAndName(projectName, groupName) + .orElseThrow(() -> new NotFoundException( + "Group " + groupName + " not found in project " + projectName, + GROUP, ERR_GROUP_NOT_FOUND))); + } + + @Transactional + public void deleteGroup(String projectName, String groupName) { + int deletedRows = groupRepository.deleteByProjectNameAndName(projectName, groupName); + if (deletedRows < 1) { + throw new NotFoundException( + "Group " + groupName + " not found in project " + projectName, + GROUP, ERR_GROUP_NOT_FOUND); + } + } + + @Transactional + public GroupDTO createGroup(String projectName, GroupDTO groupDTO) { + Project project = projectRepository.findOneWithGroupsByName(projectName) + .orElseThrow(() -> new NotFoundException( + "Project with name " + projectName + " not found", + PROJECT, ERR_PROJECT_NAME_NOT_FOUND)); + + if (project.getGroups().stream() + .anyMatch(g -> g.getName().equals(groupDTO.getName()))) { + throw new ConflictException( + "Group " + groupDTO.getName() + " already exists in project " + projectName, + GROUP, ERR_GROUP_EXISTS); + } + Group group = groupMapper.groupDTOToGroup(groupDTO); + group.setProject(project); + return groupMapper.groupToGroupDTOFull(groupRepository.save(group)); + } + + public List listGroups(String projectName) { + Project project = projectRepository.findOneWithGroupsByName(projectName) + .orElseThrow(() -> new NotFoundException( + "Project with name " + projectName + " not found", + PROJECT, ERR_PROJECT_NAME_NOT_FOUND)); + return groupMapper.groupToGroupDTOs(project.getGroups()); + } +} diff --git a/src/main/java/org/radarbase/management/service/ProjectService.java b/src/main/java/org/radarbase/management/service/ProjectService.java index 7726698ff..8817b6e92 100644 --- a/src/main/java/org/radarbase/management/service/ProjectService.java +++ b/src/main/java/org/radarbase/management/service/ProjectService.java @@ -5,6 +5,7 @@ import org.radarbase.management.domain.Project; import org.radarbase.management.domain.SourceType; +import org.radarbase.management.repository.GroupRepository; import org.radarbase.management.repository.ProjectRepository; import org.radarbase.management.service.dto.ProjectDTO; import org.radarbase.management.service.dto.SourceTypeDTO; diff --git a/src/main/java/org/radarbase/management/service/dto/GroupDTO.java b/src/main/java/org/radarbase/management/service/dto/GroupDTO.java index 589595222..658267a42 100644 --- a/src/main/java/org/radarbase/management/service/dto/GroupDTO.java +++ b/src/main/java/org/radarbase/management/service/dto/GroupDTO.java @@ -12,6 +12,8 @@ public class GroupDTO implements Serializable { private Long id; + private Long projectId; + private String name; public Long getId() { @@ -22,6 +24,14 @@ public void setId(Long id) { this.id = id; } + public Long getProjectId() { + return projectId; + } + + public void setProjectId(Long projectId) { + this.projectId = projectId; + } + public String getName() { return name; } diff --git a/src/main/java/org/radarbase/management/service/mapper/GroupMapper.java b/src/main/java/org/radarbase/management/service/mapper/GroupMapper.java new file mode 100644 index 000000000..d5e02c68b --- /dev/null +++ b/src/main/java/org/radarbase/management/service/mapper/GroupMapper.java @@ -0,0 +1,36 @@ +/* + * Copyright (c) 2021. The Hyve + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * + * See the file LICENSE in the root of this repository. + */ + +package org.radarbase.management.service.mapper; + +import org.mapstruct.IterableMapping; +import org.mapstruct.Mapper; +import org.mapstruct.Mapping; +import org.radarbase.management.domain.Group; +import org.radarbase.management.service.dto.GroupDTO; + +import java.util.Collection; +import java.util.List; + +@Mapper(componentModel = "spring") +public interface GroupMapper { + @Mapping(target = "id", ignore = true) + @Mapping(target = "projectId", ignore = true) + GroupDTO groupToGroupDTO(Group group); + + @Mapping(source = "project.id", target = "projectId") + GroupDTO groupToGroupDTOFull(Group group); + + @Mapping(target = "id", ignore = true) + @Mapping(target = "project.id", ignore = true) + Group groupDTOToGroup(GroupDTO groupDTO); + + @IterableMapping(qualifiedByName = "groupToGroupDTO") + List groupToGroupDTOs(Collection groups); +} diff --git a/src/main/java/org/radarbase/management/service/mapper/ProjectMapper.java b/src/main/java/org/radarbase/management/service/mapper/ProjectMapper.java index 4b1f0e06a..ea82ccfa7 100644 --- a/src/main/java/org/radarbase/management/service/mapper/ProjectMapper.java +++ b/src/main/java/org/radarbase/management/service/mapper/ProjectMapper.java @@ -14,7 +14,7 @@ /** * Mapper for the entity Project and its DTO ProjectDTO. */ -@Mapper(componentModel = "spring", uses = {SourceTypeMapper.class,}) +@Mapper(componentModel = "spring", uses = {GroupMapper.class, SourceTypeMapper.class,}) @DecoratedWith(ProjectMapperDecorator.class) public interface ProjectMapper { diff --git a/src/main/java/org/radarbase/management/web/rest/GroupResource.java b/src/main/java/org/radarbase/management/web/rest/GroupResource.java new file mode 100644 index 000000000..1178b73f4 --- /dev/null +++ b/src/main/java/org/radarbase/management/web/rest/GroupResource.java @@ -0,0 +1,78 @@ +/* + * Copyright (c) 2021. The Hyve + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * + * See the file LICENSE in the root of this repository. + */ + +package org.radarbase.management.web.rest; + +import org.radarbase.auth.config.Constants; +import org.radarbase.auth.exception.NotAuthorizedException; +import org.radarbase.management.service.GroupService; +import org.radarbase.management.service.ProjectService; +import org.radarbase.management.service.dto.GroupDTO; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.ServletRequest; +import javax.ws.rs.PathParam; +import javax.ws.rs.core.Response; +import java.net.URI; +import java.util.List; + +import static org.radarbase.auth.authorization.Permission.PROJECT_READ; +import static org.radarbase.auth.authorization.Permission.PROJECT_UPDATE; +import static org.radarbase.auth.authorization.RadarAuthorization.checkPermissionOnProject; +import static org.radarbase.management.security.SecurityUtils.getJWT; + +@RestController +@RequestMapping("/api/projects/{projectName:" + Constants.ENTITY_ID_REGEX + "}/groups") +public class GroupResource { + @Autowired + private GroupService groupService; + + @Autowired + private ProjectService projectService; + + @Autowired + private ServletRequest servletRequest; + + @PostMapping + public Response createGroup( + @PathParam("projectName") String projectName, + GroupDTO groupDto) throws NotAuthorizedException { + checkPermissionOnProject(getJWT(servletRequest), PROJECT_UPDATE, projectName); + groupService.createGroup(projectName, groupDto); + return Response.created(URI.create(groupDto.getName())).build(); + } + + @GetMapping + public List listGroups( + @PathParam("projectName") String projectName) throws NotAuthorizedException { + checkPermissionOnProject(getJWT(servletRequest), PROJECT_READ, projectName); + return groupService.listGroups(projectName); + } + + @GetMapping("{groupName:" + Constants.ENTITY_ID_REGEX + "}") + public GroupDTO getGroup( + @PathParam("projectName") String projectName, + @PathParam("groupName") String groupName) throws NotAuthorizedException { + checkPermissionOnProject(getJWT(servletRequest), PROJECT_READ, projectName); + return groupService.getGroup(projectName, groupName); + } + + @DeleteMapping + public void deleteGroup( + @PathParam("projectName") String projectName, + @PathParam("groupName") String groupName) throws NotAuthorizedException { + checkPermissionOnProject(getJWT(servletRequest), PROJECT_UPDATE, projectName); + groupService.deleteGroup(projectName, groupName); + } +} diff --git a/src/main/java/org/radarbase/management/web/rest/errors/ErrorConstants.java b/src/main/java/org/radarbase/management/web/rest/errors/ErrorConstants.java index 50b082d44..cf8069ed8 100644 --- a/src/main/java/org/radarbase/management/web/rest/errors/ErrorConstants.java +++ b/src/main/java/org/radarbase/management/web/rest/errors/ErrorConstants.java @@ -14,11 +14,12 @@ public final class ErrorConstants { public static final String ERR_OAUTH_CLIENT_ALREADY_EXISTS = "error.oAuthClientExists"; public static final String ERR_OAUTH_CLIENT_ID_NOT_FOUND = "error.oAuthClientIdNotFound"; public static final String ERR_SUBJECT_NOT_FOUND = "error.subjectNotFound"; - public static final String ERR_GROUP_NOT_FOUND = "error.groupNotFound"; public static final String ERR_SOURCE_NAME_EXISTS = "error.sourceNameExists"; public static final String ERR_SOURCE_NOT_FOUND = "error.sourceNotFound"; public static final String ERR_SOURCE_TYPE_IN_USE = "error.sourceTypeInUse"; public static final String ERR_SOURCE_TYPE_NOT_FOUND = "error.sourceTypeNotFound"; + public static final String ERR_GROUP_NOT_FOUND = "error.groupNotFound"; + public static final String ERR_GROUP_EXISTS = "error.groupExists"; public static final String ERR_INVALID_AUTHORITY = "error.invalidAuthority"; public static final String ERR_PROJECT_ID_NOT_FOUND = "error.projectIdNotFound"; public static final String ERR_PROJECT_NAME_NOT_FOUND = "error.projectNameNotFound"; From 441589c352125cf66251a7d29d0c1f1a18ad4089 Mon Sep 17 00:00:00 2001 From: Joris Borgdorff Date: Mon, 11 Oct 2021 17:24:05 +0200 Subject: [PATCH 051/431] Remove unused projectservice --- .../java/org/radarbase/management/web/rest/GroupResource.java | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/main/java/org/radarbase/management/web/rest/GroupResource.java b/src/main/java/org/radarbase/management/web/rest/GroupResource.java index 1178b73f4..554598218 100644 --- a/src/main/java/org/radarbase/management/web/rest/GroupResource.java +++ b/src/main/java/org/radarbase/management/web/rest/GroupResource.java @@ -12,7 +12,6 @@ import org.radarbase.auth.config.Constants; import org.radarbase.auth.exception.NotAuthorizedException; import org.radarbase.management.service.GroupService; -import org.radarbase.management.service.ProjectService; import org.radarbase.management.service.dto.GroupDTO; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.DeleteMapping; @@ -38,9 +37,6 @@ public class GroupResource { @Autowired private GroupService groupService; - @Autowired - private ProjectService projectService; - @Autowired private ServletRequest servletRequest; From 2e4c1b05bdf1a68320b9887e6e91edf8b437fe88 Mon Sep 17 00:00:00 2001 From: Joris Borgdorff Date: Tue, 12 Oct 2021 14:24:56 +0200 Subject: [PATCH 052/431] Fix gradle style checks --- .../radarbase/management/domain/Project.java | 26 +- .../management/domain/SourceType.java | 24 -- .../radarbase/management/domain/Subject.java | 2 + .../repository/GroupRepository.java | 35 +- .../repository/ProjectRepository.java | 4 + .../repository/SubjectRepository.java | 11 +- .../repository/filters/SubjectFilter.java | 389 ------------------ .../filters/SubjectSpecification.java | 230 +++++++++++ .../management/service/GroupService.java | 50 ++- .../management/service/ProjectService.java | 1 - .../management/service/SubjectService.java | 14 +- .../service/mapper/GroupMapper.java | 4 +- .../service/mapper/ProjectMapper.java | 1 + .../service/mapper/SourceMapper.java | 2 + .../service/mapper/SubjectMapper.java | 3 +- .../decorator/SubjectMapperDecorator.java | 36 ++ .../management/web/rest/GroupResource.java | 26 ++ .../management/web/rest/ProjectResource.java | 30 +- .../management/web/rest/SubjectResource.java | 74 ++-- .../web/rest/criteria/SortDirection.java | 25 ++ .../rest/criteria/SortDirectionConverter.java | 42 ++ .../web/rest/criteria/SubjectCriteria.java | 148 +++++++ .../web/rest/criteria/SubjectSortBy.java | 27 ++ .../rest/criteria/SubjectSortByConverter.java | 42 ++ .../web/rest/util/PaginationUtil.java | 47 ++- .../web/rest/GroupResourceIntTest.java | 364 ++++++++++++++++ 26 files changed, 1100 insertions(+), 557 deletions(-) delete mode 100644 src/main/java/org/radarbase/management/repository/filters/SubjectFilter.java create mode 100644 src/main/java/org/radarbase/management/repository/filters/SubjectSpecification.java create mode 100644 src/main/java/org/radarbase/management/web/rest/criteria/SortDirection.java create mode 100644 src/main/java/org/radarbase/management/web/rest/criteria/SortDirectionConverter.java create mode 100644 src/main/java/org/radarbase/management/web/rest/criteria/SubjectCriteria.java create mode 100644 src/main/java/org/radarbase/management/web/rest/criteria/SubjectSortBy.java create mode 100644 src/main/java/org/radarbase/management/web/rest/criteria/SubjectSortByConverter.java create mode 100644 src/test/java/org/radarbase/management/web/rest/GroupResourceIntTest.java diff --git a/src/main/java/org/radarbase/management/domain/Project.java b/src/main/java/org/radarbase/management/domain/Project.java index e62d2cab0..28cbcb6db 100644 --- a/src/main/java/org/radarbase/management/domain/Project.java +++ b/src/main/java/org/radarbase/management/domain/Project.java @@ -106,7 +106,7 @@ public class Project extends AbstractEntity implements Serializable { @NotAudited @OneToMany(fetch = FetchType.LAZY, orphanRemoval = true, cascade = CascadeType.ALL) - @JoinColumn("project_id") + @JoinColumn(name = "project_id") @OrderBy("name ASC") private Set groups = new HashSet<>(); @@ -228,30 +228,6 @@ public Project sourceTypes(Set sourceTypes) { return this; } - /** - * Add a source type to this project. - * - * @param sourceType the source type to add - * @return this project - */ - public Project addSourceType(SourceType sourceType) { - this.sourceTypes.add(sourceType); - sourceType.getProjects().add(this); - return this; - } - - /** - * Remove a source type from this project. - * - * @param sourceType the source type to remove - * @return this project - */ - public Project removeSourceType(SourceType sourceType) { - this.sourceTypes.remove(sourceType); - sourceType.getProjects().remove(this); - return this; - } - @JsonSetter(nulls = Nulls.AS_EMPTY) public void setSourceTypes(Set sourceTypes) { this.sourceTypes = sourceTypes; diff --git a/src/main/java/org/radarbase/management/domain/SourceType.java b/src/main/java/org/radarbase/management/domain/SourceType.java index 47b07bd15..cc56ba39f 100644 --- a/src/main/java/org/radarbase/management/domain/SourceType.java +++ b/src/main/java/org/radarbase/management/domain/SourceType.java @@ -162,30 +162,6 @@ public SourceType sourceData(Set sourceData) { return this; } - /** - * Add source data to this source type. - * - * @param sourceData the source data to add - * @return this source type - */ - public SourceType addSourceData(SourceData sourceData) { - this.sourceData.add(sourceData); - sourceData.setSourceType(this); - return this; - } - - /** - * Remove source data from this source type. - * - * @param sourceData the source data to remove - * @return this source type - */ - public SourceType removeSourceData(SourceData sourceData) { - this.sourceData.remove(sourceData); - sourceData.setSourceType(null); - return this; - } - @JsonSetter(nulls = Nulls.AS_EMPTY) public void setSourceData(Set sourceData) { this.sourceData = sourceData; diff --git a/src/main/java/org/radarbase/management/domain/Subject.java b/src/main/java/org/radarbase/management/domain/Subject.java index ebe76f89e..d8d1d12dd 100644 --- a/src/main/java/org/radarbase/management/domain/Subject.java +++ b/src/main/java/org/radarbase/management/domain/Subject.java @@ -10,6 +10,7 @@ import org.hibernate.annotations.Cascade; import org.hibernate.annotations.CascadeType; import org.hibernate.envers.Audited; +import org.hibernate.envers.RelationTargetAuditMode; import org.radarbase.management.domain.support.AbstractEntityListener; import javax.persistence.CollectionTable; @@ -90,6 +91,7 @@ public class Subject extends AbstractEntity implements Serializable { @ManyToOne(fetch = FetchType.EAGER) @JoinColumn(name = "group_id") + @Audited(targetAuditMode = RelationTargetAuditMode.NOT_AUDITED) private Group group; @Column(name = "date_of_birth") diff --git a/src/main/java/org/radarbase/management/repository/GroupRepository.java b/src/main/java/org/radarbase/management/repository/GroupRepository.java index 808306895..084abb197 100644 --- a/src/main/java/org/radarbase/management/repository/GroupRepository.java +++ b/src/main/java/org/radarbase/management/repository/GroupRepository.java @@ -17,36 +17,31 @@ import org.springframework.data.repository.history.RevisionRepository; import org.springframework.data.repository.query.Param; -import java.util.List; import java.util.Optional; @RepositoryDefinition(domainClass = Group.class, idClass = Long.class) public interface GroupRepository extends JpaRepository, RevisionRepository { @Query("SELECT group FROM Group group " - + "WHERE group.project_id = :project_id") - List findByProjectId(@Param("project_id") Long id); - - @Query("SELECT group FROM Group group " - + "LEFT JOIN Project project ON group.project_id = project.project_id " - + "WHERE project.project_name = :project_name") - List findByProjectName(@Param("project_name") String projectName); - - @Query("SELECT group FROM Group group " - + "WHERE group.project_id = :project_id " + + "WHERE group.project.id = :project_id " + "AND group.name = :group_name") - Optional findByProjectIdAndName(@Param("project_id") Long id, @Param("group_name") String groupName); + Optional findByProjectIdAndName( + @Param("project_id") Long id, + @Param("group_name") String groupName); @Query("SELECT group FROM Group group " - + "LEFT JOIN Project project ON group.project_id = project.project_id " - + "WHERE project.project_name = :project_name " + + "LEFT JOIN Project project " + + "WHERE project.projectName = :project_name " + "AND group.name = :group_name") - Optional findByProjectNameAndName(@Param("project_name") String projectName, @Param("group_name") String groupName); + Optional findByProjectNameAndName( + @Param("project_name") String projectName, + @Param("group_name") String groupName); @Modifying - @Query("DELETE FROM Group group " - + "LEFT JOIN Project project ON group.project_id = project.project_id " - + "WHERE project.project_name = :project_name " - + "AND group.name = :group_name") - int deleteByProjectNameAndName(@Param("project_name") String projectName, @Param("group_name") String groupName); + @Query("DELETE FROM Group " + + "WHERE project_id = :project_id " + + "AND name = :group_name") + int deleteByProjectNameAndName( + @Param("project_id") Long projectId, + @Param("group_name") String groupName); } diff --git a/src/main/java/org/radarbase/management/repository/ProjectRepository.java b/src/main/java/org/radarbase/management/repository/ProjectRepository.java index 468d8934b..d132c2802 100644 --- a/src/main/java/org/radarbase/management/repository/ProjectRepository.java +++ b/src/main/java/org/radarbase/management/repository/ProjectRepository.java @@ -37,6 +37,10 @@ public interface ProjectRepository extends JpaRepository, + "where project.projectName =:name") Optional findOneWithEagerRelationshipsByName(@Param("name") String name); + @Query("select project.id from Project project " + + "where project.projectName =:name") + Optional findProjectIdByName(@Param("name") String name); + @Query("select project from Project project " + "left join fetch project.groups " + "where project.projectName =:name") diff --git a/src/main/java/org/radarbase/management/repository/SubjectRepository.java b/src/main/java/org/radarbase/management/repository/SubjectRepository.java index cd2a55070..4fb71b4ce 100644 --- a/src/main/java/org/radarbase/management/repository/SubjectRepository.java +++ b/src/main/java/org/radarbase/management/repository/SubjectRepository.java @@ -1,11 +1,7 @@ package org.radarbase.management.repository; -import java.util.List; -import java.util.Optional; -import java.util.UUID; import org.radarbase.management.domain.Source; import org.radarbase.management.domain.Subject; -import org.radarbase.management.repository.filters.SubjectFilter; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.data.jpa.repository.JpaRepository; @@ -15,6 +11,10 @@ import org.springframework.data.repository.history.RevisionRepository; import org.springframework.data.repository.query.Param; +import java.util.List; +import java.util.Optional; +import java.util.UUID; + /** * Spring Data JPA repository for the Subject entity. */ @@ -22,8 +22,7 @@ @RepositoryDefinition(domainClass = Subject.class, idClass = Long.class) public interface SubjectRepository extends JpaRepository, RevisionRepository, - JpaSpecificationExecutor -{ + JpaSpecificationExecutor { @Query(value = "select distinct subject from Subject subject left join fetch subject.sources " + "left join fetch subject.user user " diff --git a/src/main/java/org/radarbase/management/repository/filters/SubjectFilter.java b/src/main/java/org/radarbase/management/repository/filters/SubjectFilter.java deleted file mode 100644 index b8ded1298..000000000 --- a/src/main/java/org/radarbase/management/repository/filters/SubjectFilter.java +++ /dev/null @@ -1,389 +0,0 @@ -package org.radarbase.management.repository.filters; - -import static org.radarbase.auth.authorization.AuthoritiesConstants.INACTIVE_PARTICIPANT; -import static org.radarbase.auth.authorization.AuthoritiesConstants.PARTICIPANT; - -import static java.time.temporal.ChronoField.HOUR_OF_DAY; -import static java.time.temporal.ChronoField.MINUTE_OF_HOUR; -import static java.time.temporal.ChronoField.SECOND_OF_MINUTE; -import static java.time.temporal.ChronoField.NANO_OF_SECOND; - -import org.apache.commons.lang3.StringUtils; -import org.radarbase.management.domain.Role; -import org.radarbase.management.domain.Subject; -import org.radarbase.management.domain.User; -import org.springframework.data.jpa.domain.Specification; - -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.Join; -import javax.persistence.criteria.JoinType; -import javax.persistence.criteria.MapJoin; -import javax.persistence.criteria.Order; -import javax.persistence.criteria.Path; -import javax.persistence.criteria.Predicate; -import javax.persistence.criteria.Root; - -import java.time.LocalDate; -import java.time.ZoneId; -import java.time.ZonedDateTime; -import java.time.format.DateTimeFormatter; -import java.time.format.DateTimeFormatterBuilder; -import java.time.format.ResolverStyle; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collections; -import java.util.List; - - -public class SubjectFilter implements Specification { - private boolean includeInactive = false; - private LocalDate dateOfBirthFrom = null; - private LocalDate dateOfBirthTo = null; - private ZonedDateTime enrollmentDateFrom = null; - private ZonedDateTime enrollmentDateTo = null; - private String groupName = null; - private String humanReadableIdentifier = null; - private Long lastLoadedId = null; - private Integer pageSize = 10; - private String personName = null; - private String projectName = null; - private String externalId = null; - private String subjectId = null; - private SubjectSortBy sortBy = SubjectSortBy.ID; - private SubjectSortDirection sortDirection = SubjectSortDirection.ASC; - - @Override - public Predicate toPredicate(Root root, CriteriaQuery query, CriteriaBuilder builder) { - query.distinct(true); - - root.alias("subject"); - Class queryResult = query.getResultType(); - boolean isCountQuery = queryResult == Long.class || queryResult == long.class; - if (!isCountQuery) { - root.fetch("sources", JoinType.LEFT); - root.fetch("user", JoinType.LEFT); - } - Join userJoin = root.join("user"); - userJoin.alias("user"); - Join rolesJoin = userJoin.join("roles"); - rolesJoin.alias("roles"); - MapJoin attributesJoin = - root.joinMap("attributes", JoinType.LEFT); - - List predicates = new ArrayList<>(); - if (StringUtils.isNotEmpty(projectName)) { - Predicate filterProject = builder.equal( - rolesJoin.get("project").get("projectName"), - projectName); - predicates.add(filterProject); - } - List authorities = includeInactive - ? Arrays.asList(PARTICIPANT, INACTIVE_PARTICIPANT) - : Collections.singletonList(PARTICIPANT); - Predicate filterAuthorities = - rolesJoin.get("authority").get("name").in(authorities); - predicates.add(filterAuthorities); - - if (StringUtils.isNotEmpty(humanReadableIdentifier)) { - predicates.add(builder.and( - builder.equal(attributesJoin.key(), "Human-readable-identifier"), - builder.like(attributesJoin.value(), "%" + humanReadableIdentifier + "%"))); - } - if (StringUtils.isNotEmpty(externalId)) { - predicates.add(builder.equal(root.get("externalId"), externalId)); - } - if (StringUtils.isNotEmpty(groupName)) { - predicates.add(builder.equal(root.get("group"), groupName)); - } - if (dateOfBirthFrom != null) { - predicates.add(builder - .greaterThanOrEqualTo(root.get("dateOfBirth"), dateOfBirthFrom)); - } - if (dateOfBirthTo != null) { - predicates.add(builder - .lessThan(root.get("dateOfBirth"), dateOfBirthTo)); - } - if (enrollmentDateFrom != null) { - predicates.add(builder - .greaterThanOrEqualTo(root.get("enrollmentDate"), enrollmentDateFrom)); - } - if (enrollmentDateTo != null) { - predicates.add(builder - .lessThan(root.get("enrollmentDate"), enrollmentDateTo)); - } - if (StringUtils.isNotEmpty(personName)) { - predicates.add(builder - .like(root.get("personName"), "%" + personName + "%")); - } - if (StringUtils.isNotEmpty(subjectId)) { - predicates.add(builder.equal(userJoin.get("login"), subjectId)); - } - - if (!isCountQuery && lastLoadedId != null) { - if (sortBy == SubjectSortBy.ID && sortDirection == SubjectSortDirection.DESC) { - predicates.add(builder.lessThan(root.get("id"), lastLoadedId)); - } else { - predicates.add(builder.greaterThan(root.get("id"), lastLoadedId)); - } - } - - List orderList = new ArrayList<>(); - - Path sortingPath = null; - switch (sortBy) { - case ID: - sortingPath = root.get("id"); - break; - case EXTERNAL_ID: - sortingPath = root.get("externalId"); - break; - case USER_ACTIVATED: - sortingPath = root.get("user").get("activated"); - break; - case USER_LOGIN: - sortingPath = root.get("user").get("login"); - break; - case UNKNOWN: - throw new IllegalStateException("BUG: filter was not validated"); - default: - throw new IllegalStateException("BUG: sortBy was not initalized"); - } - if (sortDirection == SubjectSortDirection.DESC) { - orderList.add(builder.desc(sortingPath)); - } else { - orderList.add(builder.asc(sortingPath)); - } - // We need to guarantee that the sorting is stable to make pagination work - if (sortBy != SubjectSortBy.ID) { - orderList.add(builder.asc(root.get("id"))); - } - - query.orderBy(orderList); - - return builder.and(predicates.toArray(new Predicate[0])); - } - - public String getHumanReadableIdentifier() { - return humanReadableIdentifier; - } - - public void setHumanReadableIdentifier(String humanReadableIdentifier) { - this.humanReadableIdentifier = humanReadableIdentifier; - } - - public String getPersonName() { - return personName; - } - - public void setPersonName(String personName) { - this.personName = personName; - } - - public LocalDate getDateOfBirthTo() { - return dateOfBirthTo; - } - - public void setDateOfBirthTo(String date) { - this.dateOfBirthTo = LocalDate.parse(date, dateTimeFormatter); - } - - public LocalDate getDateOfBirthFrom() { - return dateOfBirthFrom; - } - - public void setDateOfBirthFrom(String date) { - this.dateOfBirthFrom = LocalDate.parse(date, dateTimeFormatter); - } - - public ZonedDateTime getEnrollmentDateTo() { - return enrollmentDateTo; - } - - public void setEnrollmentDateTo(String datetime) { - this.enrollmentDateTo = ZonedDateTime.parse(datetime, dateTimeFormatter); - } - - public ZonedDateTime getEnrollmentDateFrom() { - return enrollmentDateFrom; - } - - public void setEnrollmentDateFrom(String datetime) { - this.enrollmentDateFrom = ZonedDateTime.parse(datetime, dateTimeFormatter); - } - - public String getGroupName() { - return this.groupName; - } - - public void setGroupName(String groupName) { - this.groupName = groupName; - } - - public Boolean getWithInactiveParticipants() { - return this.includeInactive; - } - - public void setWithInactiveParticipants(Boolean value) { - this.includeInactive = Boolean.TRUE.equals(value); - } - - public void setLastLoadedId(Long lastLoadedId) { - this.lastLoadedId = lastLoadedId; - } - - public Long getLastLoadedId() { - return this.lastLoadedId; - } - - public String getProjectName() { - return this.projectName; - } - - public Integer getPageSize() { - return this.pageSize; - } - - public void setExternalId(String externalId) { - this.externalId = externalId; - } - - public String getExternalId() { - return this.externalId; - } - - public void setSubjectId(String subjectId) { - this.subjectId = subjectId; - } - - public String getSubjectId() { - return this.subjectId; - } - - public void setPageSize(Integer pageSize) { - this.pageSize = pageSize; - } - - public void setProjectName(String projectName) { - this.projectName = projectName; - } - - public void setSortBy(String sortBy) { - this.sortBy = SubjectSortBy.fromString(sortBy); - } - - public SubjectSortBy getSortBy() { - return this.sortBy; - } - - public void setSortDirection(String sortDirection) { - this.sortDirection = SubjectSortDirection.fromString(sortDirection); - } - - public SubjectSortDirection getSortDirection() { - return this.sortDirection; - } - - /** - * Return an error message to be used for a 404 response - * in case of e.g. an unknown sortBy key. - */ - public String getFilterValidationError() { - if (pageSize == null || pageSize <= 0) { - return "Unexpected pageSize value"; - } - if (sortBy == SubjectSortBy.UNKNOWN) { - return "Unexpected sortBy value"; - } - if (sortDirection == SubjectSortDirection.UNKNOWN) { - return "Unexpected sortDirection value"; - } - return null; - } - - private static DateTimeFormatter dateTimeFormatter; - static { - // This lenient formatter handles - // both date and datetime strings (zoned and unzoned) - // in order to be easy for JS clients - // (i.e. it accepts ISO-formatted dates, unlike default LocalDate parser) - // and for humans (i.e. you can type '2020-10-10') to use. - dateTimeFormatter = new DateTimeFormatterBuilder() - .parseCaseInsensitive() - .append(DateTimeFormatter.ISO_LOCAL_DATE) - .optionalStart() - .appendLiteral('T') - .append(DateTimeFormatter.ISO_LOCAL_TIME) - .optionalStart() - .appendOffsetId() - .optionalEnd() - .optionalEnd() - .parseDefaulting(HOUR_OF_DAY, HOUR_OF_DAY.range().getMinimum()) - .parseDefaulting(MINUTE_OF_HOUR, MINUTE_OF_HOUR.range().getMinimum()) - .parseDefaulting(SECOND_OF_MINUTE, SECOND_OF_MINUTE.range().getMinimum()) - .parseDefaulting(NANO_OF_SECOND, NANO_OF_SECOND.range().getMinimum()) - .toFormatter() - .withZone(ZoneId.of("UTC")) - .withResolverStyle(ResolverStyle.LENIENT); - } - - public enum SubjectSortBy { - ID("id"), - EXTERNAL_ID("externalId"), - USER_LOGIN("user.login"), - USER_ACTIVATED("user.activated"), - UNKNOWN(null); - - private final String key; - - SubjectSortBy(String key) { - this.key = key; - } - - public String getKey() { - return this.key; - } - - public static SubjectSortBy fromString(String text) { - if (StringUtils.isEmpty(text)) { - return ID; - } - for (SubjectSortBy s : SubjectSortBy.values()) { - if (s == UNKNOWN) continue; - if (s.key.equalsIgnoreCase(text)) { - return s; - } - } - return UNKNOWN; - } - } - - public enum SubjectSortDirection { - ASC("asc"), - DESC("desc"), - UNKNOWN(null); - - private final String key; - - SubjectSortDirection(String key) { - this.key = key; - } - - public String getKey() { - return this.key; - } - - public static SubjectSortDirection fromString(String text) { - if (StringUtils.isEmpty(text)) { - return ASC; - } - for (SubjectSortDirection d : SubjectSortDirection.values()) { - if (d == UNKNOWN) continue; - if (d.key.equalsIgnoreCase(text)) { - return d; - } - } - return UNKNOWN; - } - } -} diff --git a/src/main/java/org/radarbase/management/repository/filters/SubjectSpecification.java b/src/main/java/org/radarbase/management/repository/filters/SubjectSpecification.java new file mode 100644 index 000000000..8a429e274 --- /dev/null +++ b/src/main/java/org/radarbase/management/repository/filters/SubjectSpecification.java @@ -0,0 +1,230 @@ +package org.radarbase.management.repository.filters; + +import org.apache.commons.lang3.StringUtils; +import org.radarbase.management.domain.Role; +import org.radarbase.management.domain.Subject; +import org.radarbase.management.domain.User; +import org.radarbase.management.web.rest.criteria.SortDirection; +import org.radarbase.management.web.rest.criteria.SubjectCriteria; +import org.radarbase.management.web.rest.criteria.SubjectSortBy; +import org.radarbase.management.web.rest.errors.BadRequestException; +import org.springframework.data.jpa.domain.Specification; + +import javax.annotation.Nullable; +import javax.persistence.criteria.CriteriaBuilder; +import javax.persistence.criteria.CriteriaQuery; +import javax.persistence.criteria.Join; +import javax.persistence.criteria.JoinType; +import javax.persistence.criteria.MapJoin; +import javax.persistence.criteria.Order; +import javax.persistence.criteria.Path; +import javax.persistence.criteria.Predicate; +import javax.persistence.criteria.Root; +import java.time.LocalDate; +import java.time.ZonedDateTime; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + +import static org.radarbase.auth.authorization.AuthoritiesConstants.PARTICIPANT; +import static org.radarbase.management.web.rest.errors.EntityName.SUBJECT; +import static org.radarbase.management.web.rest.errors.ErrorConstants.ERR_VALIDATION; + + +public class SubjectSpecification implements Specification { + private final boolean includeInactive; + private final LocalDate dateOfBirthFrom; + private final LocalDate dateOfBirthTo; + private final ZonedDateTime enrollmentDateFrom; + private final ZonedDateTime enrollmentDateTo; + private final String groupName; + private final String humanReadableIdentifier; + private final Long lastLoadedId; + private final String personName; + private final String projectName; + private final String externalId; + private final String subjectId; + private final SubjectSortBy sortBy; + private final SortDirection sortDirection; + + /** + * Subject specification based on criteria. + * @param criteria criteria to use for the specification. + */ + public SubjectSpecification(SubjectCriteria criteria) { + this.includeInactive = criteria.isIncludeInactive(); + this.dateOfBirthFrom = criteria.getDateOfBirthFrom(); + this.dateOfBirthTo = criteria.getDateOfBirthTo(); + this.enrollmentDateFrom = criteria.getEnrollmentDateFrom(); + this.enrollmentDateTo = criteria.getEnrollmentDateTo(); + this.groupName = criteria.getGroupName(); + this.humanReadableIdentifier = criteria.getHumanReadableIdentifier(); + this.lastLoadedId = criteria.getLastLoadedId(); + this.personName = criteria.getPersonName(); + this.projectName = criteria.getProjectName(); + this.externalId = criteria.getExternalId(); + this.subjectId = criteria.getSubjectId(); + this.sortBy = criteria.getSortBy(); + this.sortDirection = criteria.getSortDirection(); + } + + @Override + public Predicate toPredicate(@Nullable Root root, @Nullable CriteriaQuery query, + @Nullable CriteriaBuilder builder) { + if (root == null || query == null || builder == null) { + return null; + } + query.distinct(true); + + root.alias("subject"); + Join userJoin = root.join("user"); + userJoin.alias("user"); + List predicates = new ArrayList<>(); + + addRolePredicates(builder, userJoin, predicates); + + if (StringUtils.isNotEmpty(humanReadableIdentifier)) { + MapJoin attributesJoin = + root.joinMap("attributes", JoinType.LEFT); + predicates.add(builder.and( + builder.equal(attributesJoin.key(), "Human-readable-identifier"), + builder.like(attributesJoin.value(), + "%" + humanReadableIdentifier + "%"))); + } + if (StringUtils.isNotEmpty(externalId)) { + predicates.add(builder.like(root.get("externalId"), "%" + externalId + "%")); + } + if (StringUtils.isNotEmpty(groupName)) { + predicates.add(builder.equal(root.get("group"), groupName)); + } + + addDateOfBirthPredicates(root, builder, predicates); + addEnrollmentDatePredicates(root, builder, predicates); + + if (StringUtils.isNotEmpty(personName)) { + predicates.add(builder + .like(root.get("personName"), "%" + personName + "%")); + } + if (StringUtils.isNotEmpty(subjectId)) { + predicates.add(builder.like(userJoin.get("login"), "%" + subjectId + "%")); + } + + addContentPredicates(root, builder, query.getResultType(), predicates); + + query.orderBy(getSortOrder(root, builder)); + + return builder.and(predicates.toArray(new Predicate[0])); + } + + private void addContentPredicates(Root root, CriteriaBuilder builder, + Class queryResult, List predicates) { + if (queryResult == Long.class || queryResult == long.class) { + return; + } + root.fetch("sources", JoinType.LEFT); + root.fetch("user", JoinType.LEFT); + + if (lastLoadedId != null) { + if (sortBy == SubjectSortBy.ID && sortDirection == SortDirection.DESC) { + predicates.add(builder.lessThan(root.get("id"), lastLoadedId)); + } else { + predicates.add(builder.greaterThan(root.get("id"), lastLoadedId)); + } + } + } + + private void addRolePredicates(CriteriaBuilder builder, Join userJoin, + List predicates) { + Join rolesJoin = userJoin.join("roles"); + rolesJoin.alias("roles"); + + if (StringUtils.isNotEmpty(projectName)) { + predicates.add(builder.equal( + rolesJoin.get("project").get("projectName"), + projectName)); + } + if (!includeInactive) { + predicates.add(rolesJoin.get("authority").get("name") + .in(Collections.singletonList(PARTICIPANT))); + } + } + + private void addDateOfBirthPredicates( + Root root, + CriteriaBuilder builder, + List predicates) { + if (dateOfBirthFrom != null + && dateOfBirthFrom.equals(dateOfBirthTo)) { + predicates.add(builder.equal(root.get("dateOfBirth"), dateOfBirthTo)); + } else { + if (dateOfBirthFrom != null + && dateOfBirthTo != null + && dateOfBirthFrom.compareTo(dateOfBirthTo) < 0) { + throw new BadRequestException( + "Date of birth start range may not precede date of birth end range.", + SUBJECT, ERR_VALIDATION); + } + if (dateOfBirthFrom != null) { + predicates.add(builder + .greaterThanOrEqualTo(root.get("dateOfBirth"), dateOfBirthFrom)); + } + if (dateOfBirthTo != null) { + predicates.add(builder + .lessThanOrEqualTo(root.get("dateOfBirth"), dateOfBirthTo)); + } + } + } + + private void addEnrollmentDatePredicates( + Root root, + CriteriaBuilder builder, + List predicates) { + if (enrollmentDateFrom != null + && enrollmentDateTo != null + && enrollmentDateFrom.compareTo(enrollmentDateTo) < 0) { + throw new BadRequestException( + "Enrollment date start range may not precede enrollment date end range.", + SUBJECT, ERR_VALIDATION); + } + if (enrollmentDateFrom != null) { + predicates.add(builder + .greaterThanOrEqualTo(root.get("enrollmentDate"), enrollmentDateFrom)); + } + if (enrollmentDateTo != null) { + predicates.add(builder + .lessThan(root.get("enrollmentDate"), enrollmentDateTo)); + } + } + + private List getSortOrder(Root root, CriteriaBuilder builder) { + Path sortingPath; + switch (sortBy) { + case ID: + sortingPath = root.get("id"); + break; + case EXTERNAL_ID: + sortingPath = root.get("externalId"); + break; + case USER_ACTIVATED: + sortingPath = root.get("user").get("activated"); + break; + case USER_LOGIN: + sortingPath = root.get("user").get("login"); + break; + default: + throw new IllegalStateException("Cannot sort on unknown sort parameter " + sortBy); + } + + List orderList = new ArrayList<>(); + if (sortDirection == SortDirection.DESC) { + orderList.add(builder.desc(sortingPath)); + } else { + orderList.add(builder.asc(sortingPath)); + } + // We need to guarantee that the sorting is stable to make pagination work + if (sortBy != SubjectSortBy.ID) { + orderList.add(builder.asc(root.get("id"))); + } + return orderList; + } +} diff --git a/src/main/java/org/radarbase/management/service/GroupService.java b/src/main/java/org/radarbase/management/service/GroupService.java index 8566b91ef..9daab77da 100644 --- a/src/main/java/org/radarbase/management/service/GroupService.java +++ b/src/main/java/org/radarbase/management/service/GroupService.java @@ -30,6 +30,9 @@ import static org.radarbase.management.web.rest.errors.ErrorConstants.ERR_GROUP_NOT_FOUND; import static org.radarbase.management.web.rest.errors.ErrorConstants.ERR_PROJECT_NAME_NOT_FOUND; +/** + * Service to manage project groups. + */ @Service public class GroupService { @Autowired @@ -41,42 +44,67 @@ public class GroupService { @Autowired private GroupMapper groupMapper; + /** + * Get the group by name. + * @param projectName project name + * @param groupName group name + * @return group + * @throws NotFoundException if the project or group is not found. + */ @Transactional public GroupDTO getGroup(String projectName, String groupName) { - return groupMapper.groupToGroupDTOFull(groupRepository.findByProjectNameAndName(projectName, groupName) + return groupMapper.groupToGroupDTOFull(groupRepository.findByProjectNameAndName(projectName, + groupName) .orElseThrow(() -> new NotFoundException( "Group " + groupName + " not found in project " + projectName, GROUP, ERR_GROUP_NOT_FOUND))); } + /** + * Delete the group by name. + * @param projectName project name + * @param groupName group name + * @throws NotFoundException if the project or group is not found. + */ @Transactional public void deleteGroup(String projectName, String groupName) { - int deletedRows = groupRepository.deleteByProjectNameAndName(projectName, groupName); - if (deletedRows < 1) { - throw new NotFoundException( - "Group " + groupName + " not found in project " + projectName, - GROUP, ERR_GROUP_NOT_FOUND); - } + Long projectId = projectRepository.findProjectIdByName(projectName) + .orElseThrow(() -> new NotFoundException( + "Project " + projectName + " not found.", + PROJECT, ERR_PROJECT_NAME_NOT_FOUND)); + groupRepository.deleteByProjectNameAndName(projectId, groupName); } + /** + * Create the group. + * @param projectName project name + * @param groupDto group values + * @throws NotFoundException if the project is not found. + * @throws ConflictException if the group name already exists. + */ @Transactional - public GroupDTO createGroup(String projectName, GroupDTO groupDTO) { + public GroupDTO createGroup(String projectName, GroupDTO groupDto) { Project project = projectRepository.findOneWithGroupsByName(projectName) .orElseThrow(() -> new NotFoundException( "Project with name " + projectName + " not found", PROJECT, ERR_PROJECT_NAME_NOT_FOUND)); if (project.getGroups().stream() - .anyMatch(g -> g.getName().equals(groupDTO.getName()))) { + .anyMatch(g -> g.getName().equals(groupDto.getName()))) { throw new ConflictException( - "Group " + groupDTO.getName() + " already exists in project " + projectName, + "Group " + groupDto.getName() + " already exists in project " + projectName, GROUP, ERR_GROUP_EXISTS); } - Group group = groupMapper.groupDTOToGroup(groupDTO); + Group group = groupMapper.groupDTOToGroup(groupDto); group.setProject(project); return groupMapper.groupToGroupDTOFull(groupRepository.save(group)); } + /** + * List all groups in a project. + * @param projectName project name + * @throws NotFoundException if the project is not found. + */ public List listGroups(String projectName) { Project project = projectRepository.findOneWithGroupsByName(projectName) .orElseThrow(() -> new NotFoundException( diff --git a/src/main/java/org/radarbase/management/service/ProjectService.java b/src/main/java/org/radarbase/management/service/ProjectService.java index 8817b6e92..7726698ff 100644 --- a/src/main/java/org/radarbase/management/service/ProjectService.java +++ b/src/main/java/org/radarbase/management/service/ProjectService.java @@ -5,7 +5,6 @@ import org.radarbase.management.domain.Project; import org.radarbase.management.domain.SourceType; -import org.radarbase.management.repository.GroupRepository; import org.radarbase.management.repository.ProjectRepository; import org.radarbase.management.service.dto.ProjectDTO; import org.radarbase.management.service.dto.SourceTypeDTO; diff --git a/src/main/java/org/radarbase/management/service/SubjectService.java b/src/main/java/org/radarbase/management/service/SubjectService.java index aa99e80df..9705af7b1 100644 --- a/src/main/java/org/radarbase/management/service/SubjectService.java +++ b/src/main/java/org/radarbase/management/service/SubjectService.java @@ -43,7 +43,7 @@ import org.radarbase.management.repository.RoleRepository; import org.radarbase.management.repository.SourceRepository; import org.radarbase.management.repository.SubjectRepository; -import org.radarbase.management.repository.filters.SubjectFilter; +import org.radarbase.management.repository.filters.SubjectSpecification; import org.radarbase.management.service.dto.MinimalSourceDetailsDTO; import org.radarbase.management.service.dto.SubjectDTO; import org.radarbase.management.service.dto.UserDTO; @@ -51,6 +51,7 @@ import org.radarbase.management.service.mapper.SourceMapper; import org.radarbase.management.service.mapper.SubjectMapper; import org.radarbase.management.service.util.RandomUtil; +import org.radarbase.management.web.rest.criteria.SubjectCriteria; import org.radarbase.management.web.rest.errors.BadRequestException; import org.radarbase.management.web.rest.errors.ConflictException; import org.radarbase.management.web.rest.errors.ErrorConstants; @@ -473,13 +474,18 @@ public Subject findOneByLogin(String login) { ); } - public Page findAll(SubjectFilter filter) { + /** + * Find all subjects matching given filter. + * @param criteria filter and sort for subjects. + * @return page of subjects matching filter. + */ + public Page findAll(SubjectCriteria criteria) { // Pageable is required to set the page limit, // but the page should always be zero // since the lastLoadedId param defines the offset // within the query specification - Pageable pageable = PageRequest.of(0, filter.getPageSize()); - return subjectRepository.findAll(filter, pageable); + Pageable pageable = PageRequest.of(0, criteria.getPageSize()); + return subjectRepository.findAll(new SubjectSpecification(criteria), pageable); } /** diff --git a/src/main/java/org/radarbase/management/service/mapper/GroupMapper.java b/src/main/java/org/radarbase/management/service/mapper/GroupMapper.java index d5e02c68b..aee2caf91 100644 --- a/src/main/java/org/radarbase/management/service/mapper/GroupMapper.java +++ b/src/main/java/org/radarbase/management/service/mapper/GroupMapper.java @@ -12,6 +12,7 @@ import org.mapstruct.IterableMapping; import org.mapstruct.Mapper; import org.mapstruct.Mapping; +import org.mapstruct.Named; import org.radarbase.management.domain.Group; import org.radarbase.management.service.dto.GroupDTO; @@ -20,6 +21,7 @@ @Mapper(componentModel = "spring") public interface GroupMapper { + @Named("groupToGroupDTO") @Mapping(target = "id", ignore = true) @Mapping(target = "projectId", ignore = true) GroupDTO groupToGroupDTO(Group group); @@ -29,7 +31,7 @@ public interface GroupMapper { @Mapping(target = "id", ignore = true) @Mapping(target = "project.id", ignore = true) - Group groupDTOToGroup(GroupDTO groupDTO); + Group groupDTOToGroup(GroupDTO groupDto); @IterableMapping(qualifiedByName = "groupToGroupDTO") List groupToGroupDTOs(Collection groups); diff --git a/src/main/java/org/radarbase/management/service/mapper/ProjectMapper.java b/src/main/java/org/radarbase/management/service/mapper/ProjectMapper.java index ea82ccfa7..1b7196886 100644 --- a/src/main/java/org/radarbase/management/service/mapper/ProjectMapper.java +++ b/src/main/java/org/radarbase/management/service/mapper/ProjectMapper.java @@ -49,6 +49,7 @@ public interface ProjectMapper { @Mapping(target = "projectStatus", ignore = true) @Mapping(target = "sourceTypes", ignore = true) @Mapping(target = "attributes", ignore = true) + @Mapping(target = "groups", ignore = true) Project descriptiveDTOToProject(MinimalProjectDetailsDTO minimalProjectDetailsDto); List descriptiveDTOsToProjects( diff --git a/src/main/java/org/radarbase/management/service/mapper/SourceMapper.java b/src/main/java/org/radarbase/management/service/mapper/SourceMapper.java index 0eb7a8282..6f5d883e4 100644 --- a/src/main/java/org/radarbase/management/service/mapper/SourceMapper.java +++ b/src/main/java/org/radarbase/management/service/mapper/SourceMapper.java @@ -42,8 +42,10 @@ public interface SourceMapper { @Mapping(target = "sourceType", ignore = true) @Mapping(target = "project", ignore = true) @Mapping(target = "subject", ignore = true) + @Mapping(target = "deleted", constant = "false") Source descriptiveDTOToSource(MinimalSourceDetailsDTO minimalSourceDetailsDto); @Mapping(target = "subject", ignore = true) + @Mapping(target = "deleted", constant = "false") Source sourceDTOToSource(SourceDTO sourceDto); } diff --git a/src/main/java/org/radarbase/management/service/mapper/SubjectMapper.java b/src/main/java/org/radarbase/management/service/mapper/SubjectMapper.java index a8ca9a588..14a1fd3e1 100644 --- a/src/main/java/org/radarbase/management/service/mapper/SubjectMapper.java +++ b/src/main/java/org/radarbase/management/service/mapper/SubjectMapper.java @@ -57,7 +57,7 @@ public interface SubjectMapper { List subjectsToSubjectReducedProjectDTOs(List subjects); @Mapping(source = "login", target = "user.login") - @Mapping(source = "group.name", target = "group") + @Mapping(target = "group", ignore = true) @Mapping(target = "user.email", ignore = true) @Mapping(target = "user.activated", ignore = true) @Mapping(target = "removed", ignore = true) @@ -68,6 +68,7 @@ public interface SubjectMapper { @Mapping(target = "user", ignore = true) @Mapping(target = "removed", ignore = true) @Mapping(target = "metaTokens", ignore = true) + @Mapping(target = "group", ignore = true) Subject safeUpdateSubjectFromDTO(SubjectDTO subjectDto, @MappingTarget Subject subject); /** diff --git a/src/main/java/org/radarbase/management/service/mapper/decorator/SubjectMapperDecorator.java b/src/main/java/org/radarbase/management/service/mapper/decorator/SubjectMapperDecorator.java index 34de6df4d..0d52e8024 100644 --- a/src/main/java/org/radarbase/management/service/mapper/decorator/SubjectMapperDecorator.java +++ b/src/main/java/org/radarbase/management/service/mapper/decorator/SubjectMapperDecorator.java @@ -1,18 +1,24 @@ package org.radarbase.management.service.mapper.decorator; import org.mapstruct.MappingTarget; +import org.radarbase.management.domain.Group; import org.radarbase.management.domain.Project; import org.radarbase.management.domain.Subject; import org.radarbase.management.domain.audit.EntityAuditInfo; +import org.radarbase.management.repository.GroupRepository; import org.radarbase.management.repository.ProjectRepository; import org.radarbase.management.service.RevisionService; import org.radarbase.management.service.dto.SubjectDTO; import org.radarbase.management.service.dto.SubjectDTO.SubjectStatus; import org.radarbase.management.service.mapper.ProjectMapper; import org.radarbase.management.service.mapper.SubjectMapper; +import org.radarbase.management.web.rest.errors.BadRequestException; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; +import static org.radarbase.management.web.rest.errors.EntityName.SUBJECT; +import static org.radarbase.management.web.rest.errors.ErrorConstants.ERR_GROUP_NOT_FOUND; + /** * Created by nivethika on 30-8-17. */ @@ -31,6 +37,9 @@ public abstract class SubjectMapperDecorator implements SubjectMapper { @Autowired private ProjectRepository projectRepository; + @Autowired + private GroupRepository groupRepository; + @Override public SubjectDTO subjectToSubjectDTO(Subject subject) { if (subject == null) { @@ -90,13 +99,40 @@ public Subject subjectDTOToSubject(SubjectDTO subjectDto) { Subject subject = delegate.subjectDTOToSubject(subjectDto); setSubjectStatus(subjectDto, subject); + subject.setGroup(getGroup(subjectDto)); + return subject; } + private Group getGroup(SubjectDTO subjectDto) { + if (subjectDto.getGroup() == null) { + return null; + } else if (subjectDto.getProject().getId() != null) { + return groupRepository.findByProjectIdAndName( + subjectDto.getProject().getId(), subjectDto.getGroup()) + .orElseThrow(() -> new BadRequestException( + "Group " + subjectDto.getGroup() + " not found in project " + + subjectDto.getProject().getId(), + SUBJECT, ERR_GROUP_NOT_FOUND)); + } else if (subjectDto.getProject().getProjectName() != null) { + return groupRepository.findByProjectNameAndName( + subjectDto.getProject().getProjectName(), subjectDto.getGroup()) + .orElseThrow(() -> new BadRequestException( + "Group " + subjectDto.getGroup() + " not found in project " + + subjectDto.getProject().getProjectName(), + SUBJECT, ERR_GROUP_NOT_FOUND)); + } else { + throw new BadRequestException( + "Group " + subjectDto.getGroup() + " cannot be found without a project", + SUBJECT, ERR_GROUP_NOT_FOUND); + } + } + @Override public Subject safeUpdateSubjectFromDTO(SubjectDTO subjectDto, @MappingTarget Subject subject) { Subject subjectRetrieved = delegate.safeUpdateSubjectFromDTO(subjectDto, subject); setSubjectStatus(subjectDto, subjectRetrieved); + subject.setGroup(getGroup(subjectDto)); return subjectRetrieved; } diff --git a/src/main/java/org/radarbase/management/web/rest/GroupResource.java b/src/main/java/org/radarbase/management/web/rest/GroupResource.java index 554598218..878cdff99 100644 --- a/src/main/java/org/radarbase/management/web/rest/GroupResource.java +++ b/src/main/java/org/radarbase/management/web/rest/GroupResource.java @@ -40,6 +40,13 @@ public class GroupResource { @Autowired private ServletRequest servletRequest; + /** + * Create group. + * @param projectName project name + * @param groupDto group specification + * @return created response + * @throws NotAuthorizedException if PROJECT_UPDATE permissions are not present. + */ @PostMapping public Response createGroup( @PathParam("projectName") String projectName, @@ -49,6 +56,12 @@ public Response createGroup( return Response.created(URI.create(groupDto.getName())).build(); } + /** + * List groups. + * @param projectName project name + * @return list of groups + * @throws NotAuthorizedException if PROJECT_READ permissions are not present. + */ @GetMapping public List listGroups( @PathParam("projectName") String projectName) throws NotAuthorizedException { @@ -56,6 +69,13 @@ public List listGroups( return groupService.listGroups(projectName); } + /** + * Get a single group. + * @param projectName project name + * @param groupName group name + * @return group + * @throws NotAuthorizedException if PROJECT_READ permissions are not present. + */ @GetMapping("{groupName:" + Constants.ENTITY_ID_REGEX + "}") public GroupDTO getGroup( @PathParam("projectName") String projectName, @@ -64,6 +84,12 @@ public GroupDTO getGroup( return groupService.getGroup(projectName, groupName); } + /** + * Delete a single group. + * @param projectName project name + * @param groupName group name + * @throws NotAuthorizedException if PROJECT_UPDATE permissions are not present. + */ @DeleteMapping public void deleteGroup( @PathParam("projectName") String projectName, diff --git a/src/main/java/org/radarbase/management/web/rest/ProjectResource.java b/src/main/java/org/radarbase/management/web/rest/ProjectResource.java index ab5f24af7..2a82468b4 100644 --- a/src/main/java/org/radarbase/management/web/rest/ProjectResource.java +++ b/src/main/java/org/radarbase/management/web/rest/ProjectResource.java @@ -6,7 +6,6 @@ import org.radarbase.auth.exception.NotAuthorizedException; import org.radarbase.auth.token.RadarToken; import org.radarbase.management.repository.ProjectRepository; -import org.radarbase.management.repository.filters.SubjectFilter; import org.radarbase.management.service.ProjectService; import org.radarbase.management.service.ResourceUriService; import org.radarbase.management.service.RoleService; @@ -19,7 +18,7 @@ import org.radarbase.management.service.dto.SourceTypeDTO; import org.radarbase.management.service.dto.SubjectDTO; import org.radarbase.management.service.mapper.SubjectMapper; -import org.radarbase.management.web.rest.errors.BadRequestException; +import org.radarbase.management.web.rest.criteria.SubjectCriteria; import org.radarbase.management.web.rest.errors.ErrorVM; import org.radarbase.management.web.rest.util.HeaderUtil; import org.radarbase.management.web.rest.util.PaginationUtil; @@ -45,6 +44,7 @@ import javax.servlet.http.HttpServletRequest; import javax.validation.Valid; +import javax.ws.rs.PathParam; import java.net.URISyntaxException; import java.util.List; import java.util.Objects; @@ -60,8 +60,6 @@ import static org.radarbase.auth.authorization.RadarAuthorization.checkPermission; import static org.radarbase.auth.authorization.RadarAuthorization.checkPermissionOnProject; import static org.radarbase.management.security.SecurityUtils.getJWT; -import static org.radarbase.management.web.rest.errors.EntityName.SOURCE_TYPE; -import static org.radarbase.management.web.rest.errors.ErrorConstants.ERR_VALIDATION; import static org.radarbase.management.web.rest.errors.ErrorConstants.ERR_PROJECT_NOT_EMPTY; /** @@ -117,7 +115,7 @@ public ResponseEntity createProject(@Valid @RequestBody ProjectDTO p if (projectRepository.findOneWithEagerRelationshipsByName(projectDto.getProjectName()) .isPresent()) { return ResponseEntity.badRequest().headers(HeaderUtil.createFailureAlert( - ENTITY_NAME, "nameexists", "A project with this name already exists")) + ENTITY_NAME, "nameexists", "A project with this name already exists")) .body(null); } ProjectDTO result = projectService.save(projectDto); @@ -160,7 +158,7 @@ public ResponseEntity updateProject(@Valid @RequestBody ProjectDTO p @GetMapping("/projects") @Timed public ResponseEntity getAllProjects( - @PageableDefault(page = 0, size = Integer.MAX_VALUE) Pageable pageable, + @PageableDefault(size = Integer.MAX_VALUE) Pageable pageable, @RequestParam(name = "minimized", required = false, defaultValue = "false") Boolean minimized) throws NotAuthorizedException { log.debug("REST request to get Projects"); @@ -304,28 +302,26 @@ public ResponseEntity getAllSourcesForProject(@ApiParam Pageable pageable, @GetMapping("/projects/{projectName:" + Constants.ENTITY_ID_REGEX + "}/subjects") @Timed public ResponseEntity> getAllSubjects( - SubjectFilter subjectFilter + @PathParam("projectName") String projectName, + @Valid SubjectCriteria subjectCriteria ) throws NotAuthorizedException { - String projectName = subjectFilter.getProjectName(); - // this checks if the project exists - projectService.findOneByName(projectName); RadarToken jwt = getJWT(servletRequest); checkPermissionOnProject(jwt, SUBJECT_READ, projectName); if (!jwt.isClientCredentials() && jwt.hasAuthority(PARTICIPANT)) { throw new NotAuthorizedException("Cannot list all project subjects as a participant."); } - String filterError = subjectFilter.getFilterValidationError(); - if (filterError != null) { - throw new BadRequestException(filterError, SOURCE_TYPE, ERR_VALIDATION); - } + + // this checks if the project exists + projectService.findOneByName(projectName); + subjectCriteria.setProjectName(projectName); log.debug("REST request to get all subjects for project {}", projectName); - Page page = subjectService.findAll(subjectFilter) - .map(subjectMapper::subjectToSubjectWithoutProjectDTO); + Page page = subjectService.findAll(subjectCriteria) + .map(subjectMapper::subjectToSubjectWithoutProjectDTO); String baseUri = HeaderUtil.buildPath("api", "projects", projectName, "subjects"); HttpHeaders headers = PaginationUtil.generateSubjectPaginationHttpHeaders( - page, baseUri, subjectFilter); + page, baseUri, subjectCriteria); return new ResponseEntity<>(page.getContent(), headers, HttpStatus.OK); } } diff --git a/src/main/java/org/radarbase/management/web/rest/SubjectResource.java b/src/main/java/org/radarbase/management/web/rest/SubjectResource.java index b20f9e898..fe0a80fed 100644 --- a/src/main/java/org/radarbase/management/web/rest/SubjectResource.java +++ b/src/main/java/org/radarbase/management/web/rest/SubjectResource.java @@ -29,6 +29,7 @@ import java.util.Optional; import java.util.stream.Stream; import javax.servlet.http.HttpServletRequest; +import javax.validation.Valid; import com.codahale.metrics.annotation.Timed; import io.swagger.annotations.ApiParam; @@ -43,7 +44,6 @@ import org.radarbase.management.domain.Subject; import org.radarbase.management.repository.ProjectRepository; import org.radarbase.management.repository.SubjectRepository; -import org.radarbase.management.repository.filters.SubjectFilter; import org.radarbase.management.security.SecurityUtils; import org.radarbase.management.service.ResourceUriService; import org.radarbase.management.service.RevisionService; @@ -54,6 +54,7 @@ import org.radarbase.management.service.dto.RevisionDTO; import org.radarbase.management.service.dto.SubjectDTO; import org.radarbase.management.service.mapper.SubjectMapper; +import org.radarbase.management.web.rest.criteria.SubjectCriteria; import org.radarbase.management.web.rest.errors.BadRequestException; import org.radarbase.management.web.rest.errors.ErrorConstants; import org.radarbase.management.web.rest.errors.InvalidRequestException; @@ -67,7 +68,6 @@ import org.springframework.boot.actuate.audit.AuditEventRepository; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; -import org.springframework.data.web.PageableDefault; import org.springframework.http.HttpHeaders; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; @@ -145,16 +145,17 @@ public ResponseEntity createSubject(@RequestBody SubjectDTO subjectD } if (subjectDto.getLogin() == null) { return ResponseEntity.badRequest().headers(HeaderUtil - .createFailureAlert(SUBJECT, "loginrequired", - "A subject login is required")) + .createFailureAlert(SUBJECT, "loginrequired", + "A subject login is required")) .build(); } if (subjectDto.getExternalId() != null && !subjectDto.getExternalId().isEmpty() && subjectRepository.findOneByProjectNameAndExternalId(subjectDto.getProject() .getProjectName(), subjectDto.getExternalId()).isPresent()) { return ResponseEntity.badRequest().headers(HeaderUtil - .createFailureAlert(SUBJECT, "subjectExists", - "A subject with given project-id and external-id already exists")) + .createFailureAlert(SUBJECT, "subjectExists", + "A subject with given project-id and" + + "external-id already exists")) .build(); } @@ -211,7 +212,7 @@ public ResponseEntity discontinueSubject(@RequestBody SubjectDTO sub log.debug("REST request to update Subject : {}", subjectDto); if (subjectDto.getId() == null) { return ResponseEntity.badRequest().headers(HeaderUtil - .createFailureAlert(SUBJECT, "subjectNotAvailable", "No subject found")) + .createFailureAlert(SUBJECT, "subjectNotAvailable", "No subject found")) .body(null); } @@ -242,26 +243,21 @@ public ResponseEntity discontinueSubject(@RequestBody SubjectDTO sub @GetMapping("/subjects") @Timed public ResponseEntity> getAllSubjects( - SubjectFilter subjectFilter + @Valid SubjectCriteria subjectCriteria ) throws NotAuthorizedException { RadarToken jwt = getJWT(servletRequest); - String projectName = subjectFilter.getProjectName(); + String projectName = subjectCriteria.getProjectName(); checkPermissionOnProject(jwt, SUBJECT_READ, projectName); if (!jwt.isClientCredentials() && jwt.hasAuthority(PARTICIPANT)) { throw new NotAuthorizedException("Cannot list subjects as a participant."); } - String filterError = subjectFilter.getFilterValidationError(); - if (filterError != null) { - throw new BadRequestException(filterError, SOURCE_TYPE, ERR_VALIDATION); - } - String externalId = subjectFilter.getExternalId(); + String externalId = subjectCriteria.getExternalId(); log.debug("ProjectName {} and external {}", projectName, externalId); // if not specified do not include inactive patients - boolean withInactive = subjectFilter.getWithInactiveParticipants(); - - List authoritiesToInclude = withInactive ? Arrays.asList(PARTICIPANT, - INACTIVE_PARTICIPANT) : Collections.singletonList(PARTICIPANT); + List authoritiesToInclude = subjectCriteria.isIncludeInactive() + ? Arrays.asList(PARTICIPANT, INACTIVE_PARTICIPANT) + : Collections.singletonList(PARTICIPANT); if (projectName != null && externalId != null) { Optional> subject = subjectRepository @@ -271,19 +267,19 @@ public ResponseEntity> getAllSubjects( subjectMapper.subjectToSubjectReducedProjectDTO(s))); return wrapOrNotFound(subject); } else if (projectName == null && externalId != null) { - Page page = subjectService.findAll(subjectFilter); + Page page = subjectService.findAll(subjectCriteria); List items = subjectMapper - .subjectsToSubjectReducedProjectDTOs(page.getContent()); - + .subjectsToSubjectReducedProjectDTOs(page.getContent()); + HttpHeaders headers = PaginationUtil.generateSubjectPaginationHttpHeaders( - page, "/api/subjects", subjectFilter); + page, "/api/subjects", subjectCriteria); return new ResponseEntity<>(items, headers, HttpStatus.OK); } else { - Page page = subjectService.findAll(subjectFilter) - .map(subjectMapper::subjectToSubjectWithoutProjectDTO); + Page page = subjectService.findAll(subjectCriteria) + .map(subjectMapper::subjectToSubjectWithoutProjectDTO); HttpHeaders headers = PaginationUtil.generateSubjectPaginationHttpHeaders( - page, "/api/subjects", subjectFilter); + page, "/api/subjects", subjectCriteria); return new ResponseEntity<>(page.getContent(), headers, HttpStatus.OK); } } @@ -423,13 +419,13 @@ public ResponseEntity assignSources(@PathVariable Strin || sourceDto.getSourceTypeModel() == null || sourceDto.getSourceTypeCatalogVersion() == null) { throw new BadRequestException("Producer or model or version value for the " - + "source-type is null" , SOURCE_TYPE, ERR_VALIDATION); + + "source-type is null" , SOURCE_TYPE, ERR_VALIDATION); } sourceTypeId = sourceTypeService .findByProducerAndModelAndVersion( - sourceDto.getSourceTypeProducer(), - sourceDto.getSourceTypeModel(), - sourceDto.getSourceTypeCatalogVersion()).getId(); + sourceDto.getSourceTypeProducer(), + sourceDto.getSourceTypeModel(), + sourceDto.getSourceTypeCatalogVersion()).getId(); // also update the sourceDto, since we pass it on to SubjectService later sourceDto.setSourceTypeId(sourceTypeId); } @@ -441,23 +437,25 @@ public ResponseEntity assignSources(@PathVariable Strin Project currentProject = sub.getActiveProject() .orElseThrow(() -> - new InvalidRequestException("Requested subject does not have an active project", - SUBJECT, ERR_ACTIVE_PARTICIPANT_PROJECT_NOT_FOUND)); + new InvalidRequestException( + "Requested subject does not have an active project", + SUBJECT, ERR_ACTIVE_PARTICIPANT_PROJECT_NOT_FOUND)); // find whether the relevant source-type is available in the subject's project SourceType sourceType = projectRepository .findSourceTypeByProjectIdAndSourceTypeId(currentProject.getId(), sourceTypeId) .orElseThrow(() -> new BadRequestException("No valid source-type found for project." - + " You must provide either valid source-type id or producer, model, version of a " - + "source-type that is assigned to project", SUBJECT, ERR_SOURCE_TYPE_NOT_PROVIDED) - ); + + " You must provide either valid source-type id or producer, model," + + " version of a source-type that is assigned to project", + SUBJECT, ERR_SOURCE_TYPE_NOT_PROVIDED) + ); checkPermissionOnSubject(getJWT(servletRequest), SUBJECT_UPDATE, currentProject .getProjectName(), sub.getUser().getLogin()); // check if any of id, sourceID, sourceName were non-null boolean existing = Stream.of(sourceDto.getId(), sourceDto.getSourceName(), - sourceDto.getSourceId()) + sourceDto.getSourceId()) .map(Objects::nonNull).reduce(false, (r1, r2) -> r1 || r2); // handle the source registration @@ -470,11 +468,11 @@ public ResponseEntity assignSources(@PathVariable Strin if (!existing) { return ResponseEntity.created(ResourceUriService.getUri(sourceRegistered)) .headers(HeaderUtil.createEntityCreationAlert(SOURCE, - sourceRegistered.getSourceName())) + sourceRegistered.getSourceName())) .body(sourceRegistered); } else { return ResponseEntity.ok().headers(HeaderUtil.createEntityUpdateAlert(SOURCE, - sourceRegistered.getSourceName())).body(sourceRegistered); + sourceRegistered.getSourceName())).body(sourceRegistered); } } @@ -543,7 +541,7 @@ public ResponseEntity updateSubjectSource(@PathVariable Optional subjectOptional = subjectRepository.findOneWithEagerBySubjectLogin(login); if (!subjectOptional.isPresent()) { throw new NotFoundException("Subject ID not found", SUBJECT, ErrorConstants - .ERR_SUBJECT_NOT_FOUND, Collections.singletonMap("subjectLogin", login)); + .ERR_SUBJECT_NOT_FOUND, Collections.singletonMap("subjectLogin", login)); } // check the permission to update source Subject subject = subjectOptional.get(); diff --git a/src/main/java/org/radarbase/management/web/rest/criteria/SortDirection.java b/src/main/java/org/radarbase/management/web/rest/criteria/SortDirection.java new file mode 100644 index 000000000..24f0e208b --- /dev/null +++ b/src/main/java/org/radarbase/management/web/rest/criteria/SortDirection.java @@ -0,0 +1,25 @@ +/* + * Copyright (c) 2021. The Hyve + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * + * See the file LICENSE in the root of this repository. + */ + +package org.radarbase.management.web.rest.criteria; + +public enum SortDirection { + ASC("asc"), + DESC("desc"); + + private final String key; + + SortDirection(String key) { + this.key = key; + } + + public String getKey() { + return this.key; + } +} diff --git a/src/main/java/org/radarbase/management/web/rest/criteria/SortDirectionConverter.java b/src/main/java/org/radarbase/management/web/rest/criteria/SortDirectionConverter.java new file mode 100644 index 000000000..134d802c8 --- /dev/null +++ b/src/main/java/org/radarbase/management/web/rest/criteria/SortDirectionConverter.java @@ -0,0 +1,42 @@ +/* + * Copyright (c) 2021. The Hyve + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * + * See the file LICENSE in the root of this repository. + */ + +package org.radarbase.management.web.rest.criteria; + +import org.apache.commons.lang3.StringUtils; +import org.springframework.core.convert.converter.Converter; +import org.springframework.stereotype.Component; + +import javax.annotation.Nullable; + +import static org.radarbase.management.web.rest.criteria.SortDirection.ASC; + +@Component +public class SortDirectionConverter implements Converter { + /** + * Parse sort direction from string. + * + * @param value user provided text + * @return ASC for empty strings, ASC or DESC for corresponding strings, and UNKNOWN + * otherwise. + */ + @Override + @Nullable + public SortDirection convert(@Nullable String value) { + if (StringUtils.isEmpty(value)) { + return ASC; + } + for (SortDirection d : SortDirection.values()) { + if (d.getKey().equalsIgnoreCase(value)) { + return d; + } + } + return null; + } +} diff --git a/src/main/java/org/radarbase/management/web/rest/criteria/SubjectCriteria.java b/src/main/java/org/radarbase/management/web/rest/criteria/SubjectCriteria.java new file mode 100644 index 000000000..83fa97e54 --- /dev/null +++ b/src/main/java/org/radarbase/management/web/rest/criteria/SubjectCriteria.java @@ -0,0 +1,148 @@ +package org.radarbase.management.web.rest.criteria; + +import javax.validation.constraints.Min; +import javax.validation.constraints.NotNull; +import java.time.LocalDate; +import java.time.ZonedDateTime; + +public class SubjectCriteria { + private boolean includeInactive = false; + private LocalDate dateOfBirthFrom = null; + private LocalDate dateOfBirthTo = null; + private ZonedDateTime enrollmentDateFrom = null; + private ZonedDateTime enrollmentDateTo = null; + private String groupName = null; + private String humanReadableIdentifier = null; + private Long lastLoadedId = null; + @NotNull + @Min(1) + private Integer pageSize = 10; + private String personName = null; + private String projectName = null; + private String externalId = null; + private String subjectId = null; + @NotNull + private SubjectSortBy sortBy = SubjectSortBy.ID; + @NotNull + private SortDirection sortDirection = SortDirection.ASC; + + public boolean isIncludeInactive() { + return includeInactive; + } + + public void setIncludeInactive(boolean includeInactive) { + this.includeInactive = includeInactive; + } + + public LocalDate getDateOfBirthFrom() { + return dateOfBirthFrom; + } + + public void setDateOfBirthFrom(LocalDate dateOfBirthFrom) { + this.dateOfBirthFrom = dateOfBirthFrom; + } + + public LocalDate getDateOfBirthTo() { + return dateOfBirthTo; + } + + public void setDateOfBirthTo(LocalDate dateOfBirthTo) { + this.dateOfBirthTo = dateOfBirthTo; + } + + public ZonedDateTime getEnrollmentDateFrom() { + return enrollmentDateFrom; + } + + public void setEnrollmentDateFrom(ZonedDateTime enrollmentDateFrom) { + this.enrollmentDateFrom = enrollmentDateFrom; + } + + public ZonedDateTime getEnrollmentDateTo() { + return enrollmentDateTo; + } + + public void setEnrollmentDateTo(ZonedDateTime enrollmentDateTo) { + this.enrollmentDateTo = enrollmentDateTo; + } + + public String getGroupName() { + return groupName; + } + + public void setGroupName(String groupName) { + this.groupName = groupName; + } + + public String getHumanReadableIdentifier() { + return humanReadableIdentifier; + } + + public void setHumanReadableIdentifier(String humanReadableIdentifier) { + this.humanReadableIdentifier = humanReadableIdentifier; + } + + public Long getLastLoadedId() { + return lastLoadedId; + } + + public void setLastLoadedId(Long lastLoadedId) { + this.lastLoadedId = lastLoadedId; + } + + public Integer getPageSize() { + return pageSize; + } + + public void setPageSize(Integer pageSize) { + this.pageSize = pageSize; + } + + public String getPersonName() { + return personName; + } + + public void setPersonName(String personName) { + this.personName = personName; + } + + public String getProjectName() { + return projectName; + } + + public void setProjectName(String projectName) { + this.projectName = projectName; + } + + public String getExternalId() { + return externalId; + } + + public void setExternalId(String externalId) { + this.externalId = externalId; + } + + public String getSubjectId() { + return subjectId; + } + + public void setSubjectId(String subjectId) { + this.subjectId = subjectId; + } + + public SubjectSortBy getSortBy() { + return sortBy; + } + + public void setSortBy(SubjectSortBy sortBy) { + this.sortBy = sortBy; + } + + public SortDirection getSortDirection() { + return sortDirection; + } + + public void setSortDirection(SortDirection sortDirection) { + this.sortDirection = sortDirection; + } +} diff --git a/src/main/java/org/radarbase/management/web/rest/criteria/SubjectSortBy.java b/src/main/java/org/radarbase/management/web/rest/criteria/SubjectSortBy.java new file mode 100644 index 000000000..c750896fd --- /dev/null +++ b/src/main/java/org/radarbase/management/web/rest/criteria/SubjectSortBy.java @@ -0,0 +1,27 @@ +/* + * Copyright (c) 2021. The Hyve + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * + * See the file LICENSE in the root of this repository. + */ + +package org.radarbase.management.web.rest.criteria; + +public enum SubjectSortBy { + ID("id"), + EXTERNAL_ID("externalId"), + USER_LOGIN("user.login"), + USER_ACTIVATED("user.activated"); + + private final String key; + + SubjectSortBy(String key) { + this.key = key; + } + + public String getKey() { + return this.key; + } +} diff --git a/src/main/java/org/radarbase/management/web/rest/criteria/SubjectSortByConverter.java b/src/main/java/org/radarbase/management/web/rest/criteria/SubjectSortByConverter.java new file mode 100644 index 000000000..d6c6ca422 --- /dev/null +++ b/src/main/java/org/radarbase/management/web/rest/criteria/SubjectSortByConverter.java @@ -0,0 +1,42 @@ +/* + * Copyright (c) 2021. The Hyve + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * + * See the file LICENSE in the root of this repository. + */ + +package org.radarbase.management.web.rest.criteria; + +import org.apache.commons.lang3.StringUtils; +import org.springframework.core.convert.converter.Converter; +import org.springframework.stereotype.Component; + +import javax.annotation.Nullable; + +import static org.radarbase.management.web.rest.criteria.SubjectSortBy.ID; + +@Component +public class SubjectSortByConverter implements Converter { + /** + * Parse sort direction from string. + * + * @param value user provided text + * @return ASC for empty strings, ASC or DESC for corresponding strings, and UNKNOWN + * otherwise. + */ + @Nullable + @Override + public SubjectSortBy convert(@Nullable String value) { + if (StringUtils.isEmpty(value)) { + return ID; + } + for (SubjectSortBy s : SubjectSortBy.values()) { + if (s.getKey().equalsIgnoreCase(value)) { + return s; + } + } + return null; + } +} diff --git a/src/main/java/org/radarbase/management/web/rest/util/PaginationUtil.java b/src/main/java/org/radarbase/management/web/rest/util/PaginationUtil.java index b6d9e28a8..e9dc33082 100644 --- a/src/main/java/org/radarbase/management/web/rest/util/PaginationUtil.java +++ b/src/main/java/org/radarbase/management/web/rest/util/PaginationUtil.java @@ -1,6 +1,6 @@ package org.radarbase.management.web.rest.util; -import org.radarbase.management.repository.filters.SubjectFilter; +import org.radarbase.management.web.rest.criteria.SubjectCriteria; import org.springframework.data.domain.Page; import org.springframework.http.HttpHeaders; import org.springframework.web.util.UriComponentsBuilder; @@ -55,15 +55,22 @@ public static HttpHeaders generatePaginationHttpHeaders(Page page, String bas headers.add(HttpHeaders.LINK, link.toString()); return headers; } - + + /** + * Generate pagination HTTP headers for subjects given a subject filter. + * @param page the page + * @param baseUrl the base URL + * @param criteria subject criteria + * @return the {@link HttpHeaders} + */ public static HttpHeaders generateSubjectPaginationHttpHeaders( - Page page, String baseUrl, SubjectFilter filter + Page page, String baseUrl, SubjectCriteria criteria ) { HttpHeaders headers = new HttpHeaders(); headers.add("X-Total-Count", Long.toString(page.getTotalElements())); StringBuilder link = new StringBuilder(256); link.append('<') - .append(generateUri(baseUrl, filter)) + .append(generateUri(baseUrl, criteria)) .append(">; rel=\"first\""); headers.add(HttpHeaders.LINK, link.toString()); return headers; @@ -76,22 +83,22 @@ private static String generateUri(String baseUrl, int page, int size) { .toUriString(); } - private static String generateUri(String baseUrl, SubjectFilter filter) { + private static String generateUri(String baseUrl, SubjectCriteria criteria) { return UriComponentsBuilder.fromUriString(baseUrl) - .queryParam("dateOfBirthFrom", filter.getDateOfBirthFrom()) - .queryParam("dateOfBirthTo", filter.getDateOfBirthTo()) - .queryParam("enrollmentDateFrom", filter.getEnrollmentDateFrom()) - .queryParam("enrollmentDateTo", filter.getEnrollmentDateTo()) - .queryParam("externalId", filter.getExternalId()) - .queryParam("groupName", filter.getGroupName()) - .queryParam("lastLoadedId", filter.getLastLoadedId()) - .queryParam("pageSize", filter.getPageSize()) - .queryParam("personName", filter.getPersonName()) - .queryParam("projectName", filter.getProjectName()) - .queryParam("sortBy", filter.getSortBy().getKey()) - .queryParam("sortDirection", filter.getSortDirection().getKey()) - .queryParam("subjectId", filter.getSubjectId()) - .queryParam("withInactiveParticipants", filter.getWithInactiveParticipants()) - .toUriString(); + .queryParam("dateOfBirthFrom", criteria.getDateOfBirthFrom()) + .queryParam("dateOfBirthTo", criteria.getDateOfBirthTo()) + .queryParam("enrollmentDateFrom", criteria.getEnrollmentDateFrom()) + .queryParam("enrollmentDateTo", criteria.getEnrollmentDateTo()) + .queryParam("externalId", criteria.getExternalId()) + .queryParam("groupName", criteria.getGroupName()) + .queryParam("lastLoadedId", criteria.getLastLoadedId()) + .queryParam("pageSize", criteria.getPageSize()) + .queryParam("personName", criteria.getPersonName()) + .queryParam("projectName", criteria.getProjectName()) + .queryParam("sortBy", criteria.getSortBy().getKey()) + .queryParam("sortDirection", criteria.getSortDirection().getKey()) + .queryParam("subjectId", criteria.getSubjectId()) + .queryParam("includeInactive", criteria.isIncludeInactive()) + .toUriString(); } } diff --git a/src/test/java/org/radarbase/management/web/rest/GroupResourceIntTest.java b/src/test/java/org/radarbase/management/web/rest/GroupResourceIntTest.java new file mode 100644 index 000000000..756d4b7d9 --- /dev/null +++ b/src/test/java/org/radarbase/management/web/rest/GroupResourceIntTest.java @@ -0,0 +1,364 @@ +package org.radarbase.management.web.rest; + +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.mockito.MockitoAnnotations; +import org.radarbase.auth.authentication.OAuthHelper; +import org.radarbase.management.ManagementPortalTestApp; +import org.radarbase.management.domain.Group; +import org.radarbase.management.domain.Project; +import org.radarbase.management.repository.GroupRepository; +import org.radarbase.management.repository.ProjectRepository; +import org.radarbase.management.security.JwtAuthenticationFilter; +import org.radarbase.management.service.GroupService; +import org.radarbase.management.service.dto.GroupDTO; +import org.radarbase.management.service.mapper.GroupMapper; +import org.radarbase.management.web.rest.errors.ExceptionTranslator; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.data.web.PageableHandlerMethodArgumentResolver; +import org.springframework.http.MediaType; +import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter; +import org.springframework.mock.web.MockFilterConfig; +import org.springframework.security.test.context.support.WithMockUser; +import org.springframework.test.context.junit.jupiter.SpringExtension; +import org.springframework.test.util.ReflectionTestUtils; +import org.springframework.test.web.servlet.MockMvc; +import org.springframework.test.web.servlet.setup.MockMvcBuilders; +import org.springframework.transaction.annotation.Transactional; + +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import java.util.List; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.hamcrest.Matchers.hasItem; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.delete; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; + +/** + * Test class for the ProjectResource REST controller. + * + * @see ProjectResource + */ +@ExtendWith(SpringExtension.class) +@SpringBootTest(classes = ManagementPortalTestApp.class) +@WithMockUser +class GroupResourceIntTest { + + private static final String DEFAULT_PROJECT_NAME = "AAAAAAAAAA"; + + @Autowired + private GroupService groupService; + + @Autowired + private MappingJackson2HttpMessageConverter jacksonMessageConverter; + + @Autowired + private ProjectRepository projectRepository; + + @Autowired + private GroupMapper groupMapper; + + @Autowired + private PageableHandlerMethodArgumentResolver pageableArgumentResolver; + + @Autowired + private ExceptionTranslator exceptionTranslator; + + @Autowired + private GroupRepository groupRepository; + + @Autowired + private HttpServletRequest servletRequest; + + private MockMvc restProjectMockMvc; + + private Group group; + + private Project project; + + @BeforeEach + @Transactional + public void setUp() throws ServletException { + MockitoAnnotations.initMocks(this); + GroupResource projectResource = new GroupResource(); + ReflectionTestUtils.setField(projectResource, "groupService", groupService); + ReflectionTestUtils.setField(projectResource, "servletRequest", servletRequest); + + JwtAuthenticationFilter filter = OAuthHelper.createAuthenticationFilter(); + filter.init(new MockFilterConfig()); + + this.restProjectMockMvc = MockMvcBuilders.standaloneSetup(projectResource) + .setCustomArgumentResolvers(pageableArgumentResolver) + .setControllerAdvice(exceptionTranslator) + .setMessageConverters(jacksonMessageConverter) + .addFilter(filter) + .defaultRequest(get("/").with(OAuthHelper.bearerToken())).build(); + project = ProjectResourceIntTest.createEntity(); + projectRepository.save(project); + group = createEntity(); + } + + @AfterEach + @Transactional + public void tearDown() { + groupRepository.deleteAll(); + projectRepository.delete(project); + } + + /** + * Create an entity for this test. + * + *

    This is a static method, as tests for other entities might also need it, + * if they test an entity which requires the current entity.

    + */ + private Group createEntity() { + Group group = new Group(); + group.setName("group1"); + group.setProject(project); + return group; + } + + @BeforeEach + public void initTest() { + group = createEntity(); + } + + @Test + @Transactional + void createGroup() throws Exception { + assertThat(groupRepository.findAll().size()).isEqualTo(0); + + // Create the Project + GroupDTO groupDto = groupMapper.groupToGroupDTO(group); + restProjectMockMvc.perform(post("/api/projects/{projectName}/groups", + project.getProjectName()) + .contentType(TestUtil.APPLICATION_JSON_UTF8) + .content(TestUtil.convertObjectToJsonBytes(groupDto))) + .andExpect(status().isCreated()); + + // Validate the Project in the database + List groupList = groupRepository.findAll(); + assertThat(groupList).hasSize(1); + Group testGroup = groupList.get(groupList.size() - 1); + assertThat(testGroup.getProject().getId()).isEqualTo(project.getId()); + assertThat(testGroup.getName()).isEqualTo("group1"); + } + + + @Test + @Transactional + void createGroupNonExistingProject() throws Exception { + assertThat(groupRepository.findAll().size()).isEqualTo(0); + projectRepository.delete(project); + + // Create the Project + GroupDTO groupDto = groupMapper.groupToGroupDTO(group); + restProjectMockMvc.perform(post("/api/projects/{projectName}/groups", + project.getProjectName()) + .contentType(TestUtil.APPLICATION_JSON_UTF8) + .content(TestUtil.convertObjectToJsonBytes(groupDto))) + .andExpect(status().isNotFound()); + + // Validate the Project in the database + assertThat(groupRepository.findAll()).hasSize(0); + } + + @Test + @Transactional + void createGroupWithExistingName() throws Exception { + assertThat(groupRepository.findAll().size()).isEqualTo(0); + + // Create the Project + GroupDTO groupDto = groupMapper.groupToGroupDTO(group); + restProjectMockMvc.perform(post("/api/projects/{projectName}/groups", + project.getProjectName()) + .contentType(TestUtil.APPLICATION_JSON_UTF8) + .content(TestUtil.convertObjectToJsonBytes(groupDto))) + .andExpect(status().isCreated()); + + restProjectMockMvc.perform(post("/api/projects/{projectName}/groups", + project.getProjectName()) + .contentType(TestUtil.APPLICATION_JSON_UTF8) + .content(TestUtil.convertObjectToJsonBytes(groupDto))) + .andExpect(status().isConflict()); + + // Validate the Alice in the database + List groupList = groupRepository.findAll(); + assertThat(groupList).hasSize(1); + } + + + @Test + @Transactional + void createGroupWithExistingNameInDifferentProject() throws Exception { + assertThat(groupRepository.findAll().size()).isEqualTo(0); + + Project project2 = ProjectResourceIntTest.createEntity() + .projectName(project.getProjectName() + "2"); + + + projectRepository.saveAndFlush(project2); + Group group2 = new Group(); + group2.setName(group.getName()); + group2.setProject(project2); + groupRepository.saveAndFlush(group2); + + // Create the Project + GroupDTO groupDto = groupMapper.groupToGroupDTO(group); + restProjectMockMvc.perform(post("/api/projects/{projectName}/groups", + project.getProjectName()) + .contentType(TestUtil.APPLICATION_JSON_UTF8) + .content(TestUtil.convertObjectToJsonBytes(groupDto))) + .andExpect(status().isCreated()); + + GroupDTO group2Dto = groupMapper.groupToGroupDTO(group2); + restProjectMockMvc.perform(post("/api/projects/{projectName}/groups", + project2.getProjectName()) + .contentType(TestUtil.APPLICATION_JSON_UTF8) + .content(TestUtil.convertObjectToJsonBytes(group2Dto))) + .andExpect(status().isCreated()); + + // Validate the Alice in the database + List groupList = groupRepository.findAll(); + assertThat(groupList).hasSize(2); + assertThat(groupList).hasOnlyOneElementSatisfying(g -> + assertThat(g.getProject().getId()).isEqualTo(project.getId())); + assertThat(groupList).hasOnlyOneElementSatisfying(g -> + assertThat(g.getProject().getId()).isEqualTo(project2.getId())); + assertThat(groupList).allSatisfy(g -> assertThat(g.getName()).isEqualTo(group.getName())); + + projectRepository.delete(project2); + } + + @Test + @Transactional + void checkGroupNameIsRequired() throws Exception { + assertThat(groupRepository.findAll().size()).isEqualTo(0); + + group.setName(null); + + // Create the Project + GroupDTO groupDto = groupMapper.groupToGroupDTO(group); + restProjectMockMvc.perform(post("/api/projects/{projectName}/groups", + project.getProjectName()) + .contentType(TestUtil.APPLICATION_JSON_UTF8) + .content(TestUtil.convertObjectToJsonBytes(groupDto))) + .andExpect(status().isBadRequest()); + + // Validate the Project in the database + assertThat(groupRepository.findAll()).hasSize(0); + } + + @Test + @Transactional + void getAllProjects() throws Exception { + // Initialize the database + groupRepository.saveAndFlush(group); + + // Get all the projectList + restProjectMockMvc.perform(get("/api/projects/{projectName}/groups", + project.getProjectName())) + .andExpect(status().isOk()) + .andExpect(content().contentType(MediaType.APPLICATION_JSON)) + .andExpect(jsonPath("$.[*].id").value(hasItem(group.getId().intValue()))) + .andExpect(jsonPath("$.[*].projectId").value(hasItem(DEFAULT_PROJECT_NAME))) + .andExpect(jsonPath("$.[*].name").value(hasItem("group1"))); + } + + @Test + @Transactional + void getProject() throws Exception { + // Initialize the database + groupRepository.saveAndFlush(group); + + // Get the project + restProjectMockMvc.perform(get("/api/projects/{projectName}/groups/{groupName}", + project.getProjectName(), group.getName())) + .andExpect(status().isOk()) + .andExpect(content().contentType(MediaType.APPLICATION_JSON)) + .andExpect(jsonPath("$.id").value(group.getId().intValue())) + .andExpect(jsonPath("$.name").value("group1")) + .andExpect(jsonPath("$.projectId").value(project.getId().intValue())); + } + + @Test + @Transactional + void getNonExistingGroup() throws Exception { + // Get the project + restProjectMockMvc.perform(get("/api/projects/{projectName}/groups/{groupName}", + project.getProjectName(), group.getName())) + .andExpect(status().isNotFound()); + } + + @Test + @Transactional + void deleteGroup() throws Exception { + assertThat(groupRepository.findAll().size()).isEqualTo(0); + + // Initialize the database + groupRepository.saveAndFlush(group); + + assertThat(groupRepository.findAll().size()).isEqualTo(1); + + // Get the project + restProjectMockMvc.perform(delete( + "/api/projects/{projectName}/groups/{groupName}", + project.getProjectName(), group.getName()) + .accept(TestUtil.APPLICATION_JSON_UTF8)) + .andExpect(status().isOk()); + + // Validate the database is empty + assertThat(groupRepository.findAll().size()).isEqualTo(0); + } + + @Test + @Transactional + void deleteGroupNonExisting() throws Exception { + assertThat(groupRepository.findAll().size()).isEqualTo(0); + + // Initialize the database + groupRepository.saveAndFlush(group); + + assertThat(groupRepository.findAll().size()).isEqualTo(1); + + // Get the project + restProjectMockMvc.perform(delete( + "/api/projects/{projectName}/groups/{groupName}", + project.getProjectName(), group.getName() + "2") + .accept(TestUtil.APPLICATION_JSON_UTF8)) + .andExpect(status().isNotFound()); + + // Validate the database is empty + assertThat(groupRepository.findAll().size()).isEqualTo(1); + } + + + @Test + @Transactional + void deleteGroupNonExistingProject() throws Exception { + assertThat(groupRepository.findAll().size()).isEqualTo(0); + + // Initialize the database + groupRepository.saveAndFlush(group); + + assertThat(groupRepository.findAll().size()).isEqualTo(1); + + // Get the project + restProjectMockMvc.perform(delete( + "/api/projects/{projectName}/groups/{groupName}", + project.getProjectName() + "2", group.getName()) + .accept(TestUtil.APPLICATION_JSON_UTF8)) + .andExpect(status().isNotFound()); + + // Validate the database is empty + assertThat(groupRepository.findAll().size()).isEqualTo(1); + } +} From c82534ad03761b62077060a82ed03681a429f638 Mon Sep 17 00:00:00 2001 From: Joris Borgdorff Date: Wed, 13 Oct 2021 14:25:21 +0200 Subject: [PATCH 053/431] Fix all group integration tests --- .../repository/GroupRepository.java | 13 +--- .../repository/ProjectRepository.java | 6 +- .../management/service/GroupService.java | 16 +++-- .../management/service/ProjectService.java | 3 +- .../management/service/dto/GroupDTO.java | 7 +-- .../service/mapper/ClientDetailsMapper.java | 2 +- .../service/mapper/GroupMapper.java | 6 +- .../service/mapper/ProjectMapper.java | 3 +- .../decorator/SourceMapperDecorator.java | 14 ++++- .../management/web/rest/GroupResource.java | 39 +++++++----- .../management/web/rest/ProjectResource.java | 4 +- .../web/rest/GroupResourceIntTest.java | 59 ++++++++----------- .../web/rest/SubjectResourceIntTest.java | 1 - 13 files changed, 87 insertions(+), 86 deletions(-) diff --git a/src/main/java/org/radarbase/management/repository/GroupRepository.java b/src/main/java/org/radarbase/management/repository/GroupRepository.java index 084abb197..538286b9d 100644 --- a/src/main/java/org/radarbase/management/repository/GroupRepository.java +++ b/src/main/java/org/radarbase/management/repository/GroupRepository.java @@ -11,7 +11,6 @@ import org.radarbase.management.domain.Group; import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.data.jpa.repository.Modifying; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.RepositoryDefinition; import org.springframework.data.repository.history.RevisionRepository; @@ -30,18 +29,10 @@ Optional findByProjectIdAndName( @Param("group_name") String groupName); @Query("SELECT group FROM Group group " - + "LEFT JOIN Project project " - + "WHERE project.projectName = :project_name " + + "LEFT JOIN Project project on group.project = project " + + "WHERE group.project.projectName = :project_name " + "AND group.name = :group_name") Optional findByProjectNameAndName( @Param("project_name") String projectName, @Param("group_name") String groupName); - - @Modifying - @Query("DELETE FROM Group " - + "WHERE project_id = :project_id " - + "AND name = :group_name") - int deleteByProjectNameAndName( - @Param("project_id") Long projectId, - @Param("group_name") String groupName); } diff --git a/src/main/java/org/radarbase/management/repository/ProjectRepository.java b/src/main/java/org/radarbase/management/repository/ProjectRepository.java index d132c2802..8f6ad8c58 100644 --- a/src/main/java/org/radarbase/management/repository/ProjectRepository.java +++ b/src/main/java/org/radarbase/management/repository/ProjectRepository.java @@ -28,13 +28,13 @@ public interface ProjectRepository extends JpaRepository, @Query("select project from Project project " + "left join fetch project.sourceTypes s " + "left join fetch project.groups " - + "where project.id =:id") + + "where project.id = :id") Optional findOneWithEagerRelationships(@Param("id") Long id); @Query("select project from Project project " + "left join fetch project.sourceTypes " + "left join fetch project.groups " - + "where project.projectName =:name") + + "where project.projectName = :name") Optional findOneWithEagerRelationshipsByName(@Param("name") String name); @Query("select project.id from Project project " @@ -43,7 +43,7 @@ public interface ProjectRepository extends JpaRepository, @Query("select project from Project project " + "left join fetch project.groups " - + "where project.projectName =:name") + + "where project.projectName = :name") Optional findOneWithGroupsByName(@Param("name") String name); @Query("select project.sourceTypes from Project project WHERE project.id = :id") diff --git a/src/main/java/org/radarbase/management/service/GroupService.java b/src/main/java/org/radarbase/management/service/GroupService.java index 9daab77da..49a0a1439 100644 --- a/src/main/java/org/radarbase/management/service/GroupService.java +++ b/src/main/java/org/radarbase/management/service/GroupService.java @@ -21,7 +21,6 @@ import org.springframework.stereotype.Service; import javax.transaction.Transactional; - import java.util.List; import static org.radarbase.management.web.rest.errors.EntityName.GROUP; @@ -68,11 +67,12 @@ public GroupDTO getGroup(String projectName, String groupName) { */ @Transactional public void deleteGroup(String projectName, String groupName) { - Long projectId = projectRepository.findProjectIdByName(projectName) + Group group = groupRepository.findByProjectNameAndName(projectName, groupName) .orElseThrow(() -> new NotFoundException( - "Project " + projectName + " not found.", - PROJECT, ERR_PROJECT_NAME_NOT_FOUND)); - groupRepository.deleteByProjectNameAndName(projectId, groupName); + "Group " + groupName + " not found in project " + projectName, + GROUP, ERR_GROUP_NOT_FOUND)); + + groupRepository.delete(group); } /** @@ -97,7 +97,11 @@ public GroupDTO createGroup(String projectName, GroupDTO groupDto) { } Group group = groupMapper.groupDTOToGroup(groupDto); group.setProject(project); - return groupMapper.groupToGroupDTOFull(groupRepository.save(group)); + + GroupDTO groupDtoResult = groupMapper.groupToGroupDTOFull(groupRepository.save(group)); + project.getGroups().add(group); + projectRepository.save(project); + return groupDtoResult; } /** diff --git a/src/main/java/org/radarbase/management/service/ProjectService.java b/src/main/java/org/radarbase/management/service/ProjectService.java index 7726698ff..138e7f3d4 100644 --- a/src/main/java/org/radarbase/management/service/ProjectService.java +++ b/src/main/java/org/radarbase/management/service/ProjectService.java @@ -97,7 +97,8 @@ public ProjectDTO findOneByName(String name) { log.debug("Request to get Project by name: {}", name); return projectRepository.findOneWithEagerRelationshipsByName(name) .map(projectMapper::projectToProjectDTO) - .orElseThrow(() -> new NotFoundException("Project not found with projectName", + .orElseThrow(() -> new NotFoundException( + "Project not found with projectName " + name, PROJECT, ErrorConstants.ERR_PROJECT_NAME_NOT_FOUND, Collections.singletonMap("projectName", name))); } diff --git a/src/main/java/org/radarbase/management/service/dto/GroupDTO.java b/src/main/java/org/radarbase/management/service/dto/GroupDTO.java index 658267a42..e5460080c 100644 --- a/src/main/java/org/radarbase/management/service/dto/GroupDTO.java +++ b/src/main/java/org/radarbase/management/service/dto/GroupDTO.java @@ -1,19 +1,18 @@ package org.radarbase.management.service.dto; -import java.io.Serializable; +import javax.validation.constraints.NotNull; import java.util.Objects; /** * A DTO for the Group entity. */ -public class GroupDTO implements Serializable { - - private static final long serialVersionUID = 1L; +public class GroupDTO { private Long id; private Long projectId; + @NotNull private String name; public Long getId() { diff --git a/src/main/java/org/radarbase/management/service/mapper/ClientDetailsMapper.java b/src/main/java/org/radarbase/management/service/mapper/ClientDetailsMapper.java index 96b027c62..eb81e2ddb 100644 --- a/src/main/java/org/radarbase/management/service/mapper/ClientDetailsMapper.java +++ b/src/main/java/org/radarbase/management/service/mapper/ClientDetailsMapper.java @@ -70,6 +70,6 @@ default Map map(Map additionalInformation) { return Collections.emptyMap(); } return additionalInformation.entrySet().stream().collect( - Collectors.toMap(e -> e.getKey(), e -> e.getValue().toString())); + Collectors.toMap(Map.Entry::getKey, e -> e.getValue().toString())); } } diff --git a/src/main/java/org/radarbase/management/service/mapper/GroupMapper.java b/src/main/java/org/radarbase/management/service/mapper/GroupMapper.java index aee2caf91..a4c70d071 100644 --- a/src/main/java/org/radarbase/management/service/mapper/GroupMapper.java +++ b/src/main/java/org/radarbase/management/service/mapper/GroupMapper.java @@ -24,15 +24,19 @@ public interface GroupMapper { @Named("groupToGroupDTO") @Mapping(target = "id", ignore = true) @Mapping(target = "projectId", ignore = true) + @Mapping(target = "name", source = "name") GroupDTO groupToGroupDTO(Group group); + @Named("groupToGroupDTOFull") @Mapping(source = "project.id", target = "projectId") + @Mapping(target = "name", source = "name") GroupDTO groupToGroupDTOFull(Group group); @Mapping(target = "id", ignore = true) @Mapping(target = "project.id", ignore = true) + @Mapping(target = "name", source = "name") Group groupDTOToGroup(GroupDTO groupDto); - @IterableMapping(qualifiedByName = "groupToGroupDTO") + @IterableMapping(qualifiedByName = "groupToGroupDTOFull") List groupToGroupDTOs(Collection groups); } diff --git a/src/main/java/org/radarbase/management/service/mapper/ProjectMapper.java b/src/main/java/org/radarbase/management/service/mapper/ProjectMapper.java index 1b7196886..445c918a9 100644 --- a/src/main/java/org/radarbase/management/service/mapper/ProjectMapper.java +++ b/src/main/java/org/radarbase/management/service/mapper/ProjectMapper.java @@ -17,15 +17,16 @@ @Mapper(componentModel = "spring", uses = {GroupMapper.class, SourceTypeMapper.class,}) @DecoratedWith(ProjectMapperDecorator.class) public interface ProjectMapper { - @Mapping(target = "humanReadableProjectName", ignore = true) @Mapping(target = "persistentTokenTimeout", ignore = true) + @Mapping(target = "groups", qualifiedByName = "groupToGroupDTO") ProjectDTO projectToProjectDTO(Project project); @Named(value = "projectReducedDTO") @Mapping(target = "humanReadableProjectName", ignore = true) @Mapping(target = "sourceTypes", ignore = true) @Mapping(target = "persistentTokenTimeout", ignore = true) + @Mapping(target = "groups", qualifiedByName = "groupToGroupDTO") ProjectDTO projectToProjectDTOReduced(Project project); @IterableMapping(qualifiedByName = "projectReducedDTO") diff --git a/src/main/java/org/radarbase/management/service/mapper/decorator/SourceMapperDecorator.java b/src/main/java/org/radarbase/management/service/mapper/decorator/SourceMapperDecorator.java index d7856804e..01d8ded9e 100644 --- a/src/main/java/org/radarbase/management/service/mapper/decorator/SourceMapperDecorator.java +++ b/src/main/java/org/radarbase/management/service/mapper/decorator/SourceMapperDecorator.java @@ -7,9 +7,13 @@ import org.radarbase.management.service.dto.MinimalSourceDetailsDTO; import org.radarbase.management.service.dto.SourceDTO; import org.radarbase.management.service.mapper.SourceMapper; +import org.radarbase.management.web.rest.errors.NotFoundException; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; +import static org.radarbase.management.web.rest.errors.EntityName.SOURCE; +import static org.radarbase.management.web.rest.errors.ErrorConstants.ERR_SOURCE_NOT_FOUND; + /** * Created by nivethika on 13-6-17. */ @@ -30,8 +34,9 @@ public abstract class SourceMapperDecorator implements SourceMapper { public Source descriptiveDTOToSource(MinimalSourceDetailsDTO minimalSource) { Source source = sourceRepository .findOneBySourceId(minimalSource.getSourceId()) - .orElseThrow(() -> new IllegalArgumentException( - "Source ID " + minimalSource.getSourceId() + " not found")); + .orElseThrow(() -> new NotFoundException( + "Source ID " + minimalSource.getSourceId() + " not found", + SOURCE, ERR_SOURCE_NOT_FOUND)); source.setAssigned(minimalSource.isAssigned()); return source; } @@ -40,7 +45,10 @@ public Source descriptiveDTOToSource(MinimalSourceDetailsDTO minimalSource) { public Source sourceDTOToSource(SourceDTO sourceDto) { Source source = delegate.sourceDTOToSource(sourceDto); if (sourceDto.getId() != null) { - Source existingSource = sourceRepository.findById(sourceDto.getId()).get(); + Source existingSource = sourceRepository.findById(sourceDto.getId()) + .orElseThrow(() -> new NotFoundException( + "Source ID " + sourceDto.getId() + " not found", + SOURCE, ERR_SOURCE_NOT_FOUND)); if (sourceDto.getSubjectLogin() == null) { source.setSubject(existingSource.getSubject()); } else { diff --git a/src/main/java/org/radarbase/management/web/rest/GroupResource.java b/src/main/java/org/radarbase/management/web/rest/GroupResource.java index 878cdff99..219fa81c0 100644 --- a/src/main/java/org/radarbase/management/web/rest/GroupResource.java +++ b/src/main/java/org/radarbase/management/web/rest/GroupResource.java @@ -14,15 +14,18 @@ import org.radarbase.management.service.GroupService; import org.radarbase.management.service.dto.GroupDTO; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.servlet.mvc.method.annotation.MvcUriComponentsBuilder; import javax.servlet.ServletRequest; -import javax.ws.rs.PathParam; -import javax.ws.rs.core.Response; +import javax.validation.Valid; import java.net.URI; import java.util.List; @@ -48,12 +51,17 @@ public class GroupResource { * @throws NotAuthorizedException if PROJECT_UPDATE permissions are not present. */ @PostMapping - public Response createGroup( - @PathParam("projectName") String projectName, - GroupDTO groupDto) throws NotAuthorizedException { + public ResponseEntity createGroup( + @PathVariable String projectName, + @Valid @RequestBody GroupDTO groupDto) throws NotAuthorizedException { checkPermissionOnProject(getJWT(servletRequest), PROJECT_UPDATE, projectName); - groupService.createGroup(projectName, groupDto); - return Response.created(URI.create(groupDto.getName())).build(); + GroupDTO groupDtoResult = groupService.createGroup(projectName, groupDto); + URI location = MvcUriComponentsBuilder.fromController(getClass()) + .path("/{groupName}") + .buildAndExpand(projectName, groupDtoResult.getName()) + .toUri(); + return ResponseEntity.created(location) + .body(groupDtoResult); } /** @@ -64,7 +72,7 @@ public Response createGroup( */ @GetMapping public List listGroups( - @PathParam("projectName") String projectName) throws NotAuthorizedException { + @PathVariable String projectName) throws NotAuthorizedException { checkPermissionOnProject(getJWT(servletRequest), PROJECT_READ, projectName); return groupService.listGroups(projectName); } @@ -76,10 +84,10 @@ public List listGroups( * @return group * @throws NotAuthorizedException if PROJECT_READ permissions are not present. */ - @GetMapping("{groupName:" + Constants.ENTITY_ID_REGEX + "}") + @GetMapping("/{groupName:" + Constants.ENTITY_ID_REGEX + "}") public GroupDTO getGroup( - @PathParam("projectName") String projectName, - @PathParam("groupName") String groupName) throws NotAuthorizedException { + @PathVariable String projectName, + @PathVariable String groupName) throws NotAuthorizedException { checkPermissionOnProject(getJWT(servletRequest), PROJECT_READ, projectName); return groupService.getGroup(projectName, groupName); } @@ -90,11 +98,12 @@ public GroupDTO getGroup( * @param groupName group name * @throws NotAuthorizedException if PROJECT_UPDATE permissions are not present. */ - @DeleteMapping - public void deleteGroup( - @PathParam("projectName") String projectName, - @PathParam("groupName") String groupName) throws NotAuthorizedException { + @DeleteMapping("/{groupName:" + Constants.ENTITY_ID_REGEX + "}") + public ResponseEntity deleteGroup( + @PathVariable String projectName, + @PathVariable String groupName) throws NotAuthorizedException { checkPermissionOnProject(getJWT(servletRequest), PROJECT_UPDATE, projectName); groupService.deleteGroup(projectName, groupName); + return ResponseEntity.noContent().build(); } } diff --git a/src/main/java/org/radarbase/management/web/rest/ProjectResource.java b/src/main/java/org/radarbase/management/web/rest/ProjectResource.java index 2a82468b4..ce17f8df9 100644 --- a/src/main/java/org/radarbase/management/web/rest/ProjectResource.java +++ b/src/main/java/org/radarbase/management/web/rest/ProjectResource.java @@ -44,7 +44,6 @@ import javax.servlet.http.HttpServletRequest; import javax.validation.Valid; -import javax.ws.rs.PathParam; import java.net.URISyntaxException; import java.util.List; import java.util.Objects; @@ -296,15 +295,14 @@ public ResponseEntity getAllSourcesForProject(@ApiParam Pageable pageable, /** * Get /projects/{projectName}/subjects : get all subjects for a given project. * - * @param projectName The name of the project * @return The subjects in the project or 404 if there is no such project */ @GetMapping("/projects/{projectName:" + Constants.ENTITY_ID_REGEX + "}/subjects") @Timed public ResponseEntity> getAllSubjects( - @PathParam("projectName") String projectName, @Valid SubjectCriteria subjectCriteria ) throws NotAuthorizedException { + String projectName = subjectCriteria.getProjectName(); RadarToken jwt = getJWT(servletRequest); checkPermissionOnProject(jwt, SUBJECT_READ, projectName); if (!jwt.isClientCredentials() && jwt.hasAuthority(PARTICIPANT)) { diff --git a/src/test/java/org/radarbase/management/web/rest/GroupResourceIntTest.java b/src/test/java/org/radarbase/management/web/rest/GroupResourceIntTest.java index 756d4b7d9..f16bdb7d1 100644 --- a/src/test/java/org/radarbase/management/web/rest/GroupResourceIntTest.java +++ b/src/test/java/org/radarbase/management/web/rest/GroupResourceIntTest.java @@ -1,5 +1,6 @@ package org.radarbase.management.web.rest; +import org.assertj.core.api.Condition; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -27,7 +28,6 @@ import org.springframework.test.util.ReflectionTestUtils; import org.springframework.test.web.servlet.MockMvc; import org.springframework.test.web.servlet.setup.MockMvcBuilders; -import org.springframework.transaction.annotation.Transactional; import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; @@ -52,8 +52,6 @@ @WithMockUser class GroupResourceIntTest { - private static final String DEFAULT_PROJECT_NAME = "AAAAAAAAAA"; - @Autowired private GroupService groupService; @@ -85,7 +83,6 @@ class GroupResourceIntTest { private Project project; @BeforeEach - @Transactional public void setUp() throws ServletException { MockitoAnnotations.initMocks(this); GroupResource projectResource = new GroupResource(); @@ -107,7 +104,6 @@ public void setUp() throws ServletException { } @AfterEach - @Transactional public void tearDown() { groupRepository.deleteAll(); projectRepository.delete(project); @@ -132,7 +128,6 @@ public void initTest() { } @Test - @Transactional void createGroup() throws Exception { assertThat(groupRepository.findAll().size()).isEqualTo(0); @@ -154,7 +149,6 @@ void createGroup() throws Exception { @Test - @Transactional void createGroupNonExistingProject() throws Exception { assertThat(groupRepository.findAll().size()).isEqualTo(0); projectRepository.delete(project); @@ -172,7 +166,6 @@ void createGroupNonExistingProject() throws Exception { } @Test - @Transactional void createGroupWithExistingName() throws Exception { assertThat(groupRepository.findAll().size()).isEqualTo(0); @@ -197,19 +190,16 @@ void createGroupWithExistingName() throws Exception { @Test - @Transactional void createGroupWithExistingNameInDifferentProject() throws Exception { assertThat(groupRepository.findAll().size()).isEqualTo(0); Project project2 = ProjectResourceIntTest.createEntity() .projectName(project.getProjectName() + "2"); - projectRepository.saveAndFlush(project2); Group group2 = new Group(); group2.setName(group.getName()); group2.setProject(project2); - groupRepository.saveAndFlush(group2); // Create the Project GroupDTO groupDto = groupMapper.groupToGroupDTO(group); @@ -229,17 +219,16 @@ void createGroupWithExistingNameInDifferentProject() throws Exception { // Validate the Alice in the database List groupList = groupRepository.findAll(); assertThat(groupList).hasSize(2); - assertThat(groupList).hasOnlyOneElementSatisfying(g -> - assertThat(g.getProject().getId()).isEqualTo(project.getId())); - assertThat(groupList).hasOnlyOneElementSatisfying(g -> - assertThat(g.getProject().getId()).isEqualTo(project2.getId())); + assertThat(groupList).haveAtLeastOne(new Condition<>( + g -> project.getId().equals(g.getProject().getId()), "use project 1")); + assertThat(groupList).haveAtLeastOne(new Condition<>( + g -> project2.getId().equals(g.getProject().getId()), "use project 2")); assertThat(groupList).allSatisfy(g -> assertThat(g.getName()).isEqualTo(group.getName())); projectRepository.delete(project2); } @Test - @Transactional void checkGroupNameIsRequired() throws Exception { assertThat(groupRepository.findAll().size()).isEqualTo(0); @@ -258,39 +247,37 @@ void checkGroupNameIsRequired() throws Exception { } @Test - @Transactional - void getAllProjects() throws Exception { + void getAllGroups() throws Exception { // Initialize the database - groupRepository.saveAndFlush(group); + project.getGroups().add(group); + projectRepository.saveAndFlush(project); // Get all the projectList restProjectMockMvc.perform(get("/api/projects/{projectName}/groups", project.getProjectName())) .andExpect(status().isOk()) .andExpect(content().contentType(MediaType.APPLICATION_JSON)) - .andExpect(jsonPath("$.[*].id").value(hasItem(group.getId().intValue()))) - .andExpect(jsonPath("$.[*].projectId").value(hasItem(DEFAULT_PROJECT_NAME))) + .andExpect(jsonPath("$.[*].projectId").value( + hasItem(project.getId().intValue()))) .andExpect(jsonPath("$.[*].name").value(hasItem("group1"))); } @Test - @Transactional - void getProject() throws Exception { + void getGroup() throws Exception { // Initialize the database - groupRepository.saveAndFlush(group); + project.getGroups().add(group); + projectRepository.saveAndFlush(project); // Get the project restProjectMockMvc.perform(get("/api/projects/{projectName}/groups/{groupName}", project.getProjectName(), group.getName())) .andExpect(status().isOk()) .andExpect(content().contentType(MediaType.APPLICATION_JSON)) - .andExpect(jsonPath("$.id").value(group.getId().intValue())) .andExpect(jsonPath("$.name").value("group1")) .andExpect(jsonPath("$.projectId").value(project.getId().intValue())); } @Test - @Transactional void getNonExistingGroup() throws Exception { // Get the project restProjectMockMvc.perform(get("/api/projects/{projectName}/groups/{groupName}", @@ -299,33 +286,33 @@ void getNonExistingGroup() throws Exception { } @Test - @Transactional void deleteGroup() throws Exception { - assertThat(groupRepository.findAll().size()).isEqualTo(0); + assertThat(groupRepository.findAll()).hasSize(0); // Initialize the database - groupRepository.saveAndFlush(group); + project.getGroups().add(group); + projectRepository.saveAndFlush(project); - assertThat(groupRepository.findAll().size()).isEqualTo(1); + assertThat(groupRepository.findAll()).hasSize(1); // Get the project restProjectMockMvc.perform(delete( "/api/projects/{projectName}/groups/{groupName}", project.getProjectName(), group.getName()) .accept(TestUtil.APPLICATION_JSON_UTF8)) - .andExpect(status().isOk()); + .andExpect(status().isNoContent()); // Validate the database is empty - assertThat(groupRepository.findAll().size()).isEqualTo(0); + assertThat(groupRepository.findAll()).hasSize(0); } @Test - @Transactional void deleteGroupNonExisting() throws Exception { assertThat(groupRepository.findAll().size()).isEqualTo(0); // Initialize the database - groupRepository.saveAndFlush(group); + project.getGroups().add(group); + projectRepository.saveAndFlush(project); assertThat(groupRepository.findAll().size()).isEqualTo(1); @@ -342,12 +329,12 @@ void deleteGroupNonExisting() throws Exception { @Test - @Transactional void deleteGroupNonExistingProject() throws Exception { assertThat(groupRepository.findAll().size()).isEqualTo(0); // Initialize the database - groupRepository.saveAndFlush(group); + project.getGroups().add(group); + projectRepository.saveAndFlush(project); assertThat(groupRepository.findAll().size()).isEqualTo(1); diff --git a/src/test/java/org/radarbase/management/web/rest/SubjectResourceIntTest.java b/src/test/java/org/radarbase/management/web/rest/SubjectResourceIntTest.java index 84c3c868a..6f942840e 100644 --- a/src/test/java/org/radarbase/management/web/rest/SubjectResourceIntTest.java +++ b/src/test/java/org/radarbase/management/web/rest/SubjectResourceIntTest.java @@ -537,7 +537,6 @@ void getInactiveSubjectSourcesWithQueryParam() throws Exception { private SourceDTO createSource() { SourceDTO sourceDto = new SourceDTO(); - sourceDto.setId(1L); sourceDto.setAssigned(false); sourceDto.setSourceId(UUID.randomUUID()); sourceDto.setSourceType(sourceTypeService.findAll().get(0)); From 4e0035dded950518e58bde0a899508d9140a4306 Mon Sep 17 00:00:00 2001 From: Joris Borgdorff Date: Wed, 13 Oct 2021 14:36:25 +0200 Subject: [PATCH 054/431] Disable artifact uploads --- .github/workflows/main.yml | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index a43a71ba3..1aa6a8977 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -82,18 +82,6 @@ jobs: yarn e2e kill $BOOTRUN_PROCESS - - uses: actions/upload-artifact@v2 - if: steps.e2e.outcome == 'success' || steps.e2e.outcome == 'failure' - with: - name: openapi-spec - path: build/swagger-spec/swagger.json - - - uses: actions/upload-artifact@v2 - if: steps.e2e.outcome == 'success' || steps.e2e.outcome == 'failure' - with: - name: managementportal-logs - path: mp.log - - name: Has SNAPSHOT version id: is-snapshot if: github.ref == 'refs/heads/dev' From 3b9e7106539a5d3ca1448cb73e0ab88b913db482 Mon Sep 17 00:00:00 2001 From: Joris Borgdorff Date: Wed, 13 Oct 2021 15:45:26 +0200 Subject: [PATCH 055/431] Fix subject test --- .../radarbase/management/web/rest/SourceResourceIntTest.java | 3 +-- .../radarbase/management/web/rest/SubjectResourceIntTest.java | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/test/java/org/radarbase/management/web/rest/SourceResourceIntTest.java b/src/test/java/org/radarbase/management/web/rest/SourceResourceIntTest.java index fd48d7c52..ed9ef853b 100644 --- a/src/test/java/org/radarbase/management/web/rest/SourceResourceIntTest.java +++ b/src/test/java/org/radarbase/management/web/rest/SourceResourceIntTest.java @@ -130,10 +130,9 @@ public void setUp() throws ServletException { * if they test an entity which requires the current entity.

    */ public static Source createEntity() { - Source source = new Source() + return new Source() .assigned(DEFAULT_ASSIGNED) .sourceName(DEFAULT_SOURCE_NAME); - return source; } @BeforeEach diff --git a/src/test/java/org/radarbase/management/web/rest/SubjectResourceIntTest.java b/src/test/java/org/radarbase/management/web/rest/SubjectResourceIntTest.java index 6f942840e..21931eb5c 100644 --- a/src/test/java/org/radarbase/management/web/rest/SubjectResourceIntTest.java +++ b/src/test/java/org/radarbase/management/web/rest/SubjectResourceIntTest.java @@ -33,6 +33,7 @@ import java.util.stream.Collectors; import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; + import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -133,7 +134,6 @@ public void setUp() throws ServletException { .defaultRequest(get("/").with(OAuthHelper.bearerToken())).build(); } - @Test @Transactional void createSubject() throws Exception { @@ -540,7 +540,7 @@ private SourceDTO createSource() { sourceDto.setAssigned(false); sourceDto.setSourceId(UUID.randomUUID()); sourceDto.setSourceType(sourceTypeService.findAll().get(0)); - sourceDto.setSourceName("something"); + sourceDto.setSourceName("something" + UUID.randomUUID()); return sourceDto; } From c91834802803d8434f23dad946d86e02bb546765 Mon Sep 17 00:00:00 2001 From: Joris Borgdorff Date: Wed, 13 Oct 2021 16:38:17 +0200 Subject: [PATCH 056/431] Reduce data mapping needed and added some TODO's --- .../java/org/radarbase/management/domain/Group.java | 2 +- .../management/service/mapper/ProjectMapper.java | 2 ++ .../management/service/mapper/SourceTypeMapper.java | 11 ++++++++++- .../app/entities/project/project-dialog.component.ts | 4 +++- 4 files changed, 16 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/radarbase/management/domain/Group.java b/src/main/java/org/radarbase/management/domain/Group.java index d9659f061..d4e499b2a 100644 --- a/src/main/java/org/radarbase/management/domain/Group.java +++ b/src/main/java/org/radarbase/management/domain/Group.java @@ -53,7 +53,7 @@ public class Group extends AbstractEntity implements Serializable { @JsonIgnore @ManyToOne(fetch = FetchType.EAGER, optional = false) - @JoinColumn(name = "project_id") + @JoinColumn(name = "project_id", nullable = false) @Cache(usage = CacheConcurrencyStrategy.NONSTRICT_READ_WRITE) private Project project; diff --git a/src/main/java/org/radarbase/management/service/mapper/ProjectMapper.java b/src/main/java/org/radarbase/management/service/mapper/ProjectMapper.java index 445c918a9..e79eb012d 100644 --- a/src/main/java/org/radarbase/management/service/mapper/ProjectMapper.java +++ b/src/main/java/org/radarbase/management/service/mapper/ProjectMapper.java @@ -20,6 +20,7 @@ public interface ProjectMapper { @Mapping(target = "humanReadableProjectName", ignore = true) @Mapping(target = "persistentTokenTimeout", ignore = true) @Mapping(target = "groups", qualifiedByName = "groupToGroupDTO") + @Mapping(target = "sourceTypes", qualifiedByName = "sourceTypeToSourceTypeDTOReduced") ProjectDTO projectToProjectDTO(Project project); @Named(value = "projectReducedDTO") @@ -33,6 +34,7 @@ public interface ProjectMapper { List projectsToProjectDTOs(List projects); @Mapping(target = "roles", ignore = true) + @Mapping(target = "groups", ignore = true) Project projectDTOToProject(ProjectDTO projectDto); List projectDTOsToProjects(List projectDtos); diff --git a/src/main/java/org/radarbase/management/service/mapper/SourceTypeMapper.java b/src/main/java/org/radarbase/management/service/mapper/SourceTypeMapper.java index 5d22cee0d..f4b9e0a4a 100644 --- a/src/main/java/org/radarbase/management/service/mapper/SourceTypeMapper.java +++ b/src/main/java/org/radarbase/management/service/mapper/SourceTypeMapper.java @@ -5,6 +5,7 @@ import org.mapstruct.IterableMapping; import org.mapstruct.Mapper; import org.mapstruct.Mapping; +import org.mapstruct.Named; import org.radarbase.management.domain.SourceData; import org.radarbase.management.domain.SourceType; import org.radarbase.management.service.dto.MinimalSourceTypeDTO; @@ -16,9 +17,17 @@ */ @Mapper(componentModel = "spring", uses = {SourceDataMapper.class,}) public interface SourceTypeMapper { - + @Named("sourceTypeToSourceTypeDTO") SourceTypeDTO sourceTypeToSourceTypeDTO(SourceType sourceType); + @Named("sourceTypeToSourceTypeDTOReduced") + @Mapping(target = "sourceData", ignore = true) + @Mapping(target = "assessmentType", ignore = true) + @Mapping(target = "appProvider", ignore = true) + @Mapping(target = "description", ignore = true) + SourceTypeDTO sourceTypeToSourceTypeDTOReduced(SourceType sourceType); + + @IterableMapping(qualifiedByName = "sourceTypeToSourceTypeDTOReduced") List sourceTypesToSourceTypeDTOs(List sourceTypes); @Mapping(target = "projects", ignore = true) diff --git a/src/main/webapp/app/entities/project/project-dialog.component.ts b/src/main/webapp/app/entities/project/project-dialog.component.ts index 633175099..92b170a78 100644 --- a/src/main/webapp/app/entities/project/project-dialog.component.ts +++ b/src/main/webapp/app/entities/project/project-dialog.component.ts @@ -137,13 +137,15 @@ export class ProjectDialogComponent implements OnInit { // TODO implement group name validation let currentGroups = this.project.groups || []; let newGroup = { name: this.newGroupInputText }; + // TODO actually perform the group POST resource this.project.groups = [ ...currentGroups, newGroup ]; this.newGroupInputText = ''; } removeGroup(groupName: string) { - // TODO warn if it will affect existing subjects (on save, expect HTTP 409) + // TODO warn that this may affect existing subjects let oldGroups = this.project.groups; + // TODO: actually perform group DELETE resource this.project.groups = oldGroups.filter(g => g.name !== groupName); } } From 8a46917d8a10349a87451afae01146874d9da5a1 Mon Sep 17 00:00:00 2001 From: Peyman Mohtashami Date: Wed, 13 Oct 2021 21:31:45 +0200 Subject: [PATCH 057/431] Modify subject and add dateTo, dateFrom and personName --- .../general.subject-dialog.component.html | 36 +++++++++++++++++++ .../app/shared/subject/subject.component.ts | 6 ++++ .../app/shared/subject/subject.service.ts | 4 +++ 3 files changed, 46 insertions(+) diff --git a/src/main/webapp/app/entities/subject/general.subject-dialog.component.html b/src/main/webapp/app/entities/subject/general.subject-dialog.component.html index b2e1bc9c7..7bd5c7879 100644 --- a/src/main/webapp/app/entities/subject/general.subject-dialog.component.html +++ b/src/main/webapp/app/entities/subject/general.subject-dialog.component.html @@ -49,6 +49,42 @@

    +
    + + +
    + +
    + + +
    + +
    + +
    + +
    +
    +
    diff --git a/src/main/webapp/app/shared/subject/subject.component.ts b/src/main/webapp/app/shared/subject/subject.component.ts index 35ec6c37a..3ffd595ed 100644 --- a/src/main/webapp/app/shared/subject/subject.component.ts +++ b/src/main/webapp/app/shared/subject/subject.component.ts @@ -58,6 +58,9 @@ export class SubjectComponent implements OnInit, OnDestroy, OnChanges { filterSubjectEnrolmentDate = ''; filterSubjectName = ''; filterSubjectDOB = ''; + filterPersonName = ''; + filterSubjectDOBFrom = ''; + filterSubjectDOBTo = ''; isAdvancedFilterCollapsed = true; @@ -159,6 +162,9 @@ export class SubjectComponent implements OnInit, OnDestroy, OnChanges { return { subjectId: this.filterSubjectId.trim() || undefined, externalId: this.filterSubjectExternalId.trim() || undefined, + personName: this.filterPersonName.trim() || undefined, + dateTimeFrom: this.filterSubjectDOBFrom.trim() || undefined, + dateTimeTo: this.filterSubjectDOBTo.trim() || undefined, humanReadableId: this.filterSubjectHumanReadableId.trim() || undefined, enrolmentDate: this.filterSubjectEnrolmentDate.trim() || undefined, subjectName: this.filterSubjectName.trim() || undefined, diff --git a/src/main/webapp/app/shared/subject/subject.service.ts b/src/main/webapp/app/shared/subject/subject.service.ts index a29c1fd89..456c8ec28 100644 --- a/src/main/webapp/app/shared/subject/subject.service.ts +++ b/src/main/webapp/app/shared/subject/subject.service.ts @@ -76,6 +76,10 @@ export interface SubjectFilterParams { dateTimeFrom?: string, dateTimeTo?: string, personName?: string, + subjectName?: string, + subjectDOB?: string, + humanReadableId?: string, + enrolmentDate?: string, } export interface SubjectsPaginationParams { From c8a778aa5375ac8341f523ea1de053bd86d31974 Mon Sep 17 00:00:00 2001 From: Peyman Mohtashami Date: Wed, 13 Oct 2021 21:47:22 +0200 Subject: [PATCH 058/431] Modify personName and dateOfBirth --- .../app/shared/subject/subject-dialog.component.html | 12 ++++++------ .../webapp/app/shared/subject/subject.component.ts | 4 ++-- src/main/webapp/app/shared/subject/subject.model.ts | 2 -- 3 files changed, 8 insertions(+), 10 deletions(-) diff --git a/src/main/webapp/app/shared/subject/subject-dialog.component.html b/src/main/webapp/app/shared/subject/subject-dialog.component.html index 1a3dd6952..a50370c4f 100644 --- a/src/main/webapp/app/shared/subject/subject-dialog.component.html +++ b/src/main/webapp/app/shared/subject/subject-dialog.component.html @@ -51,19 +51,19 @@
    - +
    -
    diff --git a/src/main/webapp/app/shared/subject/subject.component.ts b/src/main/webapp/app/shared/subject/subject.component.ts index 3ffd595ed..5a6baf9ff 100644 --- a/src/main/webapp/app/shared/subject/subject.component.ts +++ b/src/main/webapp/app/shared/subject/subject.component.ts @@ -163,8 +163,8 @@ export class SubjectComponent implements OnInit, OnDestroy, OnChanges { subjectId: this.filterSubjectId.trim() || undefined, externalId: this.filterSubjectExternalId.trim() || undefined, personName: this.filterPersonName.trim() || undefined, - dateTimeFrom: this.filterSubjectDOBFrom.trim() || undefined, - dateTimeTo: this.filterSubjectDOBTo.trim() || undefined, + dateOfBirthFrom: this.filterSubjectDOBFrom.trim() || undefined, + dateOfBirthTo: this.filterSubjectDOBTo.trim() || undefined, humanReadableId: this.filterSubjectHumanReadableId.trim() || undefined, enrolmentDate: this.filterSubjectEnrolmentDate.trim() || undefined, subjectName: this.filterSubjectName.trim() || undefined, diff --git a/src/main/webapp/app/shared/subject/subject.model.ts b/src/main/webapp/app/shared/subject/subject.model.ts index 487dc0288..a3042460d 100644 --- a/src/main/webapp/app/shared/subject/subject.model.ts +++ b/src/main/webapp/app/shared/subject/subject.model.ts @@ -8,8 +8,6 @@ export class Subject { public login?: string; public externalLink?: string; public externalId?: string; - public name?: String; - public dob?: Date; public createdBy?: string; public createdDate?: Date; public dateOfBirth?: Date; From c4405cc176020a95d6899a6ab80c48109f81e694 Mon Sep 17 00:00:00 2001 From: Joris Borgdorff Date: Thu, 14 Oct 2021 12:30:13 +0200 Subject: [PATCH 059/431] More consistent project group updates --- gradle.properties | 2 +- .../radarbase/management/ManagementPortalApp.java | 12 +++++------- .../management/ManagementPortalTestApp.java | 12 +++++------- .../management/config/WebConfigurer.java | 8 +++++--- .../org/radarbase/management/domain/Group.java | 2 +- .../org/radarbase/management/domain/Project.java | 13 ++++++++----- .../management/service/dto/GroupDTO.java | 3 +++ .../management/service/dto/ProjectDTO.java | 4 +++- .../management/service/dto/SourceTypeDTO.java | 3 +++ .../mapper/decorator/ProjectMapperDecorator.java | 14 ++------------ .../management/web/rest/GroupResourceIntTest.java | 15 +++++---------- 11 files changed, 41 insertions(+), 47 deletions(-) diff --git a/gradle.properties b/gradle.properties index 46d79f5d6..73b9c9adb 100644 --- a/gradle.properties +++ b/gradle.properties @@ -53,7 +53,7 @@ org.gradle.vfs.watch=true ## Default value: -Xmx1024m -XX:MaxPermSize=256m ## un comment the below line to override the daemon defaults -org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 +org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8 ## When configured, Gradle will run in incubating parallel mode. ## This option should only be used with decoupled projects. More details, visit diff --git a/src/main/java/org/radarbase/management/ManagementPortalApp.java b/src/main/java/org/radarbase/management/ManagementPortalApp.java index 3b3c03239..b25ce8757 100644 --- a/src/main/java/org/radarbase/management/ManagementPortalApp.java +++ b/src/main/java/org/radarbase/management/ManagementPortalApp.java @@ -3,8 +3,6 @@ import io.github.jhipster.config.JHipsterConstants; import java.net.InetAddress; import java.net.UnknownHostException; -import java.util.Arrays; -import java.util.Collection; import javax.annotation.PostConstruct; import org.radarbase.management.config.ApplicationProperties; import org.radarbase.management.config.DefaultProfileUtil; @@ -18,6 +16,7 @@ import org.springframework.cloud.netflix.zuul.EnableZuulProxy; import org.springframework.context.annotation.ComponentScan; import org.springframework.core.env.Environment; +import org.springframework.core.env.Profiles; @ComponentScan({ "org.radarbase.management.config", @@ -55,14 +54,13 @@ public ManagementPortalApp(Environment env) { */ @PostConstruct public void initApplication() { - Collection activeProfiles = Arrays.asList(env.getActiveProfiles()); - if (activeProfiles.contains(JHipsterConstants.SPRING_PROFILE_DEVELOPMENT) && activeProfiles - .contains(JHipsterConstants.SPRING_PROFILE_PRODUCTION)) { + if (env.acceptsProfiles(Profiles.of(JHipsterConstants.SPRING_PROFILE_DEVELOPMENT)) + && env.acceptsProfiles(Profiles.of(JHipsterConstants.SPRING_PROFILE_PRODUCTION))) { log.error("You have misconfigured your application! It should not run " + "with both the 'dev' and 'prod' profiles at the same time."); } - if (activeProfiles.contains(JHipsterConstants.SPRING_PROFILE_DEVELOPMENT) && activeProfiles - .contains(JHipsterConstants.SPRING_PROFILE_CLOUD)) { + if (env.acceptsProfiles(Profiles.of(JHipsterConstants.SPRING_PROFILE_DEVELOPMENT)) + && env.acceptsProfiles(Profiles.of(JHipsterConstants.SPRING_PROFILE_CLOUD))) { log.error("You have misconfigured your application! It should not" + "run with both the 'dev' and 'cloud' profiles at the same time."); } diff --git a/src/main/java/org/radarbase/management/ManagementPortalTestApp.java b/src/main/java/org/radarbase/management/ManagementPortalTestApp.java index 1cbd4c3bc..ae35c9cbb 100644 --- a/src/main/java/org/radarbase/management/ManagementPortalTestApp.java +++ b/src/main/java/org/radarbase/management/ManagementPortalTestApp.java @@ -3,8 +3,6 @@ import io.github.jhipster.config.JHipsterConstants; import java.net.InetAddress; import java.net.UnknownHostException; -import java.util.Arrays; -import java.util.Collection; import javax.annotation.PostConstruct; import org.radarbase.management.config.ApplicationProperties; import org.radarbase.management.config.DefaultProfileUtil; @@ -20,6 +18,7 @@ import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.FilterType; import org.springframework.core.env.Environment; +import org.springframework.core.env.Profiles; /** * This is the application configuration that excludes CommandLineRunner(i.e the sourceTypeLoader). @@ -54,14 +53,13 @@ public ManagementPortalTestApp(Environment env) { */ @PostConstruct public void initApplication() { - Collection activeProfiles = Arrays.asList(env.getActiveProfiles()); - if (activeProfiles.contains(JHipsterConstants.SPRING_PROFILE_DEVELOPMENT) && activeProfiles - .contains(JHipsterConstants.SPRING_PROFILE_PRODUCTION)) { + if (env.acceptsProfiles(Profiles.of(JHipsterConstants.SPRING_PROFILE_DEVELOPMENT)) + && env.acceptsProfiles(Profiles.of(JHipsterConstants.SPRING_PROFILE_PRODUCTION))) { log.error("You have misconfigured your application! It should not run " + "with both the 'dev' and 'prod' profiles at the same time."); } - if (activeProfiles.contains(JHipsterConstants.SPRING_PROFILE_DEVELOPMENT) && activeProfiles - .contains(JHipsterConstants.SPRING_PROFILE_CLOUD)) { + if (env.acceptsProfiles(Profiles.of(JHipsterConstants.SPRING_PROFILE_DEVELOPMENT)) + && env.acceptsProfiles(Profiles.of(JHipsterConstants.SPRING_PROFILE_CLOUD))) { log.error("You have misconfigured your application! It should not" + "run with both the 'dev' and 'cloud' profiles at the same time."); } diff --git a/src/main/java/org/radarbase/management/config/WebConfigurer.java b/src/main/java/org/radarbase/management/config/WebConfigurer.java index 07e2ed338..e2fe8f8af 100644 --- a/src/main/java/org/radarbase/management/config/WebConfigurer.java +++ b/src/main/java/org/radarbase/management/config/WebConfigurer.java @@ -9,6 +9,7 @@ import io.undertow.UndertowOptions; import java.io.File; import java.nio.file.Paths; +import java.util.Arrays; import java.util.EnumSet; import javax.servlet.DispatcherType; import javax.servlet.FilterRegistration; @@ -26,6 +27,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.core.env.Environment; +import org.springframework.core.env.Profiles; import org.springframework.web.cors.CorsConfiguration; import org.springframework.web.cors.UrlBasedCorsConfigurationSource; import org.springframework.web.filter.CorsFilter; @@ -52,15 +54,15 @@ public class WebConfigurer implements ServletContextInitializer, public void onStartup(ServletContext servletContext) throws ServletException { if (env.getActiveProfiles().length != 0) { log.info("Web application configuration, using profiles: {}", - (Object[]) env.getActiveProfiles()); + Arrays.asList(env.getActiveProfiles())); } EnumSet disps = EnumSet .of(DispatcherType.REQUEST, DispatcherType.FORWARD, DispatcherType.ASYNC); initMetrics(servletContext, disps); - if (env.acceptsProfiles(JHipsterConstants.SPRING_PROFILE_PRODUCTION)) { + if (env.acceptsProfiles(Profiles.of(JHipsterConstants.SPRING_PROFILE_PRODUCTION))) { initCachingHttpHeadersFilter(servletContext, disps); } - if (env.acceptsProfiles(JHipsterConstants.SPRING_PROFILE_DEVELOPMENT)) { + if (env.acceptsProfiles(Profiles.of(JHipsterConstants.SPRING_PROFILE_DEVELOPMENT))) { initH2Console(servletContext); } log.info("Web application fully configured"); diff --git a/src/main/java/org/radarbase/management/domain/Group.java b/src/main/java/org/radarbase/management/domain/Group.java index d4e499b2a..d071c8d59 100644 --- a/src/main/java/org/radarbase/management/domain/Group.java +++ b/src/main/java/org/radarbase/management/domain/Group.java @@ -8,7 +8,6 @@ package org.radarbase.management.domain; import com.fasterxml.jackson.annotation.JsonIgnore; -import javax.persistence.FetchType; import org.hibernate.annotations.Cache; import org.hibernate.annotations.CacheConcurrencyStrategy; @@ -16,6 +15,7 @@ import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.FetchType; import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; diff --git a/src/main/java/org/radarbase/management/domain/Project.java b/src/main/java/org/radarbase/management/domain/Project.java index 28cbcb6db..dff771d5f 100644 --- a/src/main/java/org/radarbase/management/domain/Project.java +++ b/src/main/java/org/radarbase/management/domain/Project.java @@ -6,13 +6,13 @@ import org.hibernate.annotations.Cache; import org.hibernate.annotations.CacheConcurrencyStrategy; import org.hibernate.annotations.Cascade; +import org.hibernate.annotations.CascadeType; import org.hibernate.envers.Audited; import org.hibernate.envers.NotAudited; import org.radarbase.auth.config.Constants; import org.radarbase.management.domain.enumeration.ProjectStatus; import org.radarbase.management.domain.support.AbstractEntityListener; -import javax.persistence.CascadeType; import javax.persistence.CollectionTable; import javax.persistence.Column; import javax.persistence.ElementCollection; @@ -42,6 +42,10 @@ import java.util.Objects; import java.util.Set; +import static javax.persistence.CascadeType.DETACH; +import static javax.persistence.CascadeType.REFRESH; +import static javax.persistence.CascadeType.REMOVE; + /** * A Project. */ @@ -87,7 +91,7 @@ public class Project extends AbstractEntity implements Serializable { @JsonIgnore @OneToMany(mappedBy = "project", fetch = FetchType.LAZY) - @Cascade(org.hibernate.annotations.CascadeType.ALL) + @Cascade(CascadeType.ALL) private Set roles = new HashSet<>(); @ManyToMany(fetch = FetchType.LAZY) @@ -104,9 +108,8 @@ public class Project extends AbstractEntity implements Serializable { private Map attributes = new HashMap<>(); @NotAudited - @OneToMany(fetch = FetchType.LAZY, orphanRemoval = true, - cascade = CascadeType.ALL) - @JoinColumn(name = "project_id") + @OneToMany(mappedBy = "project", fetch = FetchType.LAZY, orphanRemoval = true, + cascade = {REMOVE, REFRESH, DETACH}) @OrderBy("name ASC") private Set groups = new HashSet<>(); diff --git a/src/main/java/org/radarbase/management/service/dto/GroupDTO.java b/src/main/java/org/radarbase/management/service/dto/GroupDTO.java index e5460080c..66e426ee9 100644 --- a/src/main/java/org/radarbase/management/service/dto/GroupDTO.java +++ b/src/main/java/org/radarbase/management/service/dto/GroupDTO.java @@ -1,11 +1,14 @@ package org.radarbase.management.service.dto; +import com.fasterxml.jackson.annotation.JsonInclude; + import javax.validation.constraints.NotNull; import java.util.Objects; /** * A DTO for the Group entity. */ +@JsonInclude(JsonInclude.Include.NON_NULL) public class GroupDTO { private Long id; diff --git a/src/main/java/org/radarbase/management/service/dto/ProjectDTO.java b/src/main/java/org/radarbase/management/service/dto/ProjectDTO.java index b5722004e..0ffddc658 100644 --- a/src/main/java/org/radarbase/management/service/dto/ProjectDTO.java +++ b/src/main/java/org/radarbase/management/service/dto/ProjectDTO.java @@ -14,6 +14,7 @@ /** * A DTO for the Project entity. */ +@JsonInclude(JsonInclude.Include.NON_NULL) public class ProjectDTO implements Serializable { private static final long serialVersionUID = 1L; @@ -45,11 +46,12 @@ public class ProjectDTO implements Serializable { private ZonedDateTime endDate; - @JsonInclude(Include.NON_NULL) + @JsonInclude(Include.NON_EMPTY) private Set sourceTypes; private Map attributes; + @JsonInclude(Include.NON_EMPTY) private Set groups; private Long persistentTokenTimeout; diff --git a/src/main/java/org/radarbase/management/service/dto/SourceTypeDTO.java b/src/main/java/org/radarbase/management/service/dto/SourceTypeDTO.java index dfece47a8..16ca3da5b 100644 --- a/src/main/java/org/radarbase/management/service/dto/SourceTypeDTO.java +++ b/src/main/java/org/radarbase/management/service/dto/SourceTypeDTO.java @@ -7,12 +7,14 @@ import java.util.Set; import javax.validation.constraints.NotNull; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonSetter; import com.fasterxml.jackson.annotation.Nulls; /** * A DTO for the SourceType entity. */ +@JsonInclude(JsonInclude.Include.NON_NULL) public class SourceTypeDTO implements Serializable { private static final long serialVersionUID = 1L; @@ -42,6 +44,7 @@ public class SourceTypeDTO implements Serializable { private String appProvider; + @JsonInclude(JsonInclude.Include.NON_EMPTY) private Set sourceData = new HashSet<>(); public Long getId() { diff --git a/src/main/java/org/radarbase/management/service/mapper/decorator/ProjectMapperDecorator.java b/src/main/java/org/radarbase/management/service/mapper/decorator/ProjectMapperDecorator.java index 1b21b60e4..596a96002 100644 --- a/src/main/java/org/radarbase/management/service/mapper/decorator/ProjectMapperDecorator.java +++ b/src/main/java/org/radarbase/management/service/mapper/decorator/ProjectMapperDecorator.java @@ -1,10 +1,5 @@ package org.radarbase.management.service.mapper.decorator; -import static org.radarbase.management.service.dto.ProjectDTO.HUMAN_READABLE_PROJECT_NAME; - -import java.util.HashSet; - -import org.radarbase.management.domain.Group; import org.radarbase.management.domain.Project; import org.radarbase.management.repository.ProjectRepository; import org.radarbase.management.service.OAuthClientService; @@ -15,6 +10,8 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; +import static org.radarbase.management.service.dto.ProjectDTO.HUMAN_READABLE_PROJECT_NAME; + /** * Created by nivethika on 30-8-17. */ @@ -72,13 +69,6 @@ public Project projectDTOToProject(ProjectDTO projectDto) { if (projectName != null && !projectName.isEmpty()) { project.getAttributes().put(HUMAN_READABLE_PROJECT_NAME, projectName); } - if (project.getGroups() == null) { - project.setGroups(new HashSet<>()); - } - // Ensure that project_id will be set on each group - for (Group g : project.getGroups()) { - g.setProject(project); - } return project; } diff --git a/src/test/java/org/radarbase/management/web/rest/GroupResourceIntTest.java b/src/test/java/org/radarbase/management/web/rest/GroupResourceIntTest.java index f16bdb7d1..c7169bdbc 100644 --- a/src/test/java/org/radarbase/management/web/rest/GroupResourceIntTest.java +++ b/src/test/java/org/radarbase/management/web/rest/GroupResourceIntTest.java @@ -249,8 +249,7 @@ void checkGroupNameIsRequired() throws Exception { @Test void getAllGroups() throws Exception { // Initialize the database - project.getGroups().add(group); - projectRepository.saveAndFlush(project); + groupRepository.saveAndFlush(group); // Get all the projectList restProjectMockMvc.perform(get("/api/projects/{projectName}/groups", @@ -265,8 +264,7 @@ void getAllGroups() throws Exception { @Test void getGroup() throws Exception { // Initialize the database - project.getGroups().add(group); - projectRepository.saveAndFlush(project); + groupRepository.saveAndFlush(group); // Get the project restProjectMockMvc.perform(get("/api/projects/{projectName}/groups/{groupName}", @@ -290,8 +288,7 @@ void deleteGroup() throws Exception { assertThat(groupRepository.findAll()).hasSize(0); // Initialize the database - project.getGroups().add(group); - projectRepository.saveAndFlush(project); + groupRepository.saveAndFlush(group); assertThat(groupRepository.findAll()).hasSize(1); @@ -311,8 +308,7 @@ void deleteGroupNonExisting() throws Exception { assertThat(groupRepository.findAll().size()).isEqualTo(0); // Initialize the database - project.getGroups().add(group); - projectRepository.saveAndFlush(project); + groupRepository.saveAndFlush(group); assertThat(groupRepository.findAll().size()).isEqualTo(1); @@ -333,8 +329,7 @@ void deleteGroupNonExistingProject() throws Exception { assertThat(groupRepository.findAll().size()).isEqualTo(0); // Initialize the database - project.getGroups().add(group); - projectRepository.saveAndFlush(project); + groupRepository.saveAndFlush(group); assertThat(groupRepository.findAll().size()).isEqualTo(1); From f9b5ade21004c47b2e6c85ee6d9b136c22da7f57 Mon Sep 17 00:00:00 2001 From: Peyman Mohtashami Date: Tue, 19 Oct 2021 09:20:33 +0200 Subject: [PATCH 060/431] Modify subject component --- .../app/shared/subject/subject.component.html | 32 ++++++++++---- .../app/shared/subject/subject.component.ts | 42 ++++++++++++++++--- .../app/shared/subject/subject.service.ts | 9 ++-- src/main/webapp/i18n/en/subject.json | 7 ++-- 4 files changed, 70 insertions(+), 20 deletions(-) diff --git a/src/main/webapp/app/shared/subject/subject.component.html b/src/main/webapp/app/shared/subject/subject.component.html index fbf6f013c..4c3726b09 100644 --- a/src/main/webapp/app/shared/subject/subject.component.html +++ b/src/main/webapp/app/shared/subject/subject.component.html @@ -15,8 +15,8 @@

    class="btn btn-outline-primary" (click)="collapse.toggle()" [attr.aria-expanded]="!isAdvancedFilterCollapsed" - aria-controls="collapseExample"> - Advanced Filter + aria-controls="collapseExample" + [translate]="'managementPortalApp.subject.filter.advancedFilter'">
    + + + +
    + +
    - +
    + + + +
    + +
    - +
    diff --git a/src/main/webapp/app/shared/subject/subject.component.ts b/src/main/webapp/app/shared/subject/subject.component.ts index 5a6baf9ff..9d4fc4222 100644 --- a/src/main/webapp/app/shared/subject/subject.component.ts +++ b/src/main/webapp/app/shared/subject/subject.component.ts @@ -57,10 +57,15 @@ export class SubjectComponent implements OnInit, OnDestroy, OnChanges { filterSubjectHumanReadableId = ''; filterSubjectEnrolmentDate = ''; filterSubjectName = ''; - filterSubjectDOB = ''; + filterDateOfBirthFrom = ''; + filterDateOfBirthTo = ''; filterPersonName = ''; filterSubjectDOBFrom = ''; filterSubjectDOBTo = ''; + filterEnrollmentDateFrom = ''; + filterEnrollmentDateTo = ''; + filterCreatedDateFrom = ''; + filterCreatedDateTo = ''; isAdvancedFilterCollapsed = true; @@ -91,6 +96,7 @@ export class SubjectComponent implements OnInit, OnDestroy, OnChanges { } loadSubjects() { + console.log('loadSubjects', this.isProjectSpecific); if (this.isProjectSpecific) { this.loadAllFromProject(); } else { @@ -99,6 +105,9 @@ export class SubjectComponent implements OnInit, OnDestroy, OnChanges { } private loadAllFromProject() { + console.log('loadAllFromProject',this.project.projectName, + this.queryFilterParams, + this.queryPaginationParams); this.subjectService.findAllByProject( this.project.projectName, this.queryFilterParams, @@ -112,6 +121,8 @@ export class SubjectComponent implements OnInit, OnDestroy, OnChanges { } loadAll() { + console.log('loadAll',this.queryFilterParams, + this.queryPaginationParams) this.subjectService.query( this.queryFilterParams, this.queryPaginationParams, @@ -122,6 +133,13 @@ export class SubjectComponent implements OnInit, OnDestroy, OnChanges { } ngOnInit() { + console.log('ngOnInit'); + // this.loadSubjects(); + // if(this.isProjectSpecific){ + // this.loadAllFromProject(); + // } else { + // this.loadAll(); + // } if (!this.isProjectSpecific) { this.loadAll(); } @@ -142,6 +160,7 @@ export class SubjectComponent implements OnInit, OnDestroy, OnChanges { } registerChangeInSubjects() { + console.log('registerChangeInSubjects'); this.eventSubscriber = this.eventManager.subscribe('subjectListModification', () => this.loadSubjects()); } @@ -163,19 +182,26 @@ export class SubjectComponent implements OnInit, OnDestroy, OnChanges { subjectId: this.filterSubjectId.trim() || undefined, externalId: this.filterSubjectExternalId.trim() || undefined, personName: this.filterPersonName.trim() || undefined, - dateOfBirthFrom: this.filterSubjectDOBFrom.trim() || undefined, - dateOfBirthTo: this.filterSubjectDOBTo.trim() || undefined, + // dateOfBirthFrom: this.filterSubjectDOBFrom.trim() || undefined, + // dateOfBirthTo: this.filterSubjectDOBTo.trim() || undefined, humanReadableId: this.filterSubjectHumanReadableId.trim() || undefined, - enrolmentDate: this.filterSubjectEnrolmentDate.trim() || undefined, - subjectName: this.filterSubjectName.trim() || undefined, - subjectDOB: this.filterSubjectDOB.trim() || undefined, + // enrolmentDate: this.filterSubjectEnrolmentDate.trim() || undefined, + // subjectName: this.filterSubjectName.trim() || undefined, + dateOfBirthFrom: this.filterDateOfBirthFrom.trim() || undefined, + dateOfBirthTo: this.filterDateOfBirthTo.trim() || undefined, + enrollmentDateFrom: this.filterEnrollmentDateFrom.trim() || undefined, + enrollmentDateTo: this.filterEnrollmentDateTo.trim() || undefined, + createdDateFrom: this.filterCreatedDateFrom.trim() || undefined, + createdDateTo: this.filterCreatedDateTo.trim() || undefined, }; } get queryPaginationParams(): SubjectsPaginationParams { let subjects = this.subjects || []; const lastLoadedId = subjects[subjects.length - 1]?.id; + // const lastLoadedId = undefined; //subjects[subjects.length - 1]?.id; const pageSize = lastLoadedId? this.itemsPerPage : this.page*this.itemsPerPage; + // const pageSize = this.itemsPerPage; // : this.page*this.itemsPerPage; return { lastLoadedId, pageSize, @@ -185,10 +211,13 @@ export class SubjectComponent implements OnInit, OnDestroy, OnChanges { } private onSuccess(data, headers) { + console.log(this.subjects, data, headers); this.links = parseLinks(headers.get('link')); this.totalItems = +headers.get('X-Total-Count'); this.queryCount = this.totalItems; this.subjects = [...this.subjects, ...data]; + console.log('lastLoaded Subject', this.subjects[this.subjects.length - 1]?.id) + console.log('lastLoaded Data', data[data.length - 1]?.id); } applyFilter() { @@ -249,6 +278,7 @@ export class SubjectComponent implements OnInit, OnDestroy, OnChanges { } transition() { + console.log('transition'); if (!this.isProjectSpecific) { this.router.navigate(['/subject'], { queryParams: { diff --git a/src/main/webapp/app/shared/subject/subject.service.ts b/src/main/webapp/app/shared/subject/subject.service.ts index 01ba4407c..e2fabf41a 100644 --- a/src/main/webapp/app/shared/subject/subject.service.ts +++ b/src/main/webapp/app/shared/subject/subject.service.ts @@ -77,12 +77,15 @@ export interface SubjectFilterParams { dateOfBirthTo?: string, enrollmentDateFrom?: string, enrollmentDateTo?: string, + createdDateFrom?: string, + createdDateTo?: string, humanReadableIdentifier?: string, + personName?: string, - subjectName?: string, - subjectDOB?: string, + // subjectName?: string, + // subjectDOB?: string, humanReadableId?: string, - enrolmentDate?: string, + // enrolmentDate?: string, } export interface SubjectsPaginationParams { diff --git a/src/main/webapp/i18n/en/subject.json b/src/main/webapp/i18n/en/subject.json index 1b1a333fc..9313d07c5 100644 --- a/src/main/webapp/i18n/en/subject.json +++ b/src/main/webapp/i18n/en/subject.json @@ -18,14 +18,15 @@ }, "filter": { "title": "Filter", - "applyButton": "Apply filter" + "applyButton": "Apply filter", + "advancedFilter": "Advanced Filter", + "dateOfBirthFrom": "From", + "dateOfBirthTo": "To" }, "login": "Login", "email": "Email", "externalLink": "External Link", "externalId": "External Id", - "name": "Name", - "dob": "Date of Birth", "humanReadableId": "Human Readable ID", "enrolmentDate": "Enrolment Date", "removed": "Removed", From 4c9354a226eb0c4f7fdceb625aaf8103fe7b74f0 Mon Sep 17 00:00:00 2001 From: Peyman Mohtashami Date: Tue, 19 Oct 2021 15:25:29 +0200 Subject: [PATCH 061/431] Fix subject e2e test for project/subjects --- .../app/shared/subject/subject.component.html | 16 +- .../app/shared/subject/subject.component.ts | 34 +-- .../app/shared/subject/subject.service.ts | 3 - .../integration/entities/subject.spec.ts | 197 ++++++++++++------ 4 files changed, 152 insertions(+), 98 deletions(-) diff --git a/src/main/webapp/app/shared/subject/subject.component.html b/src/main/webapp/app/shared/subject/subject.component.html index 4c3726b09..173eb7da6 100644 --- a/src/main/webapp/app/shared/subject/subject.component.html +++ b/src/main/webapp/app/shared/subject/subject.component.html @@ -4,15 +4,16 @@

    -
    +
    -
    +
    diff --git a/src/main/webapp/app/shared/subject/subject.component.ts b/src/main/webapp/app/shared/subject/subject.component.ts index 9d4fc4222..04db9ac8d 100644 --- a/src/main/webapp/app/shared/subject/subject.component.ts +++ b/src/main/webapp/app/shared/subject/subject.component.ts @@ -55,13 +55,9 @@ export class SubjectComponent implements OnInit, OnDestroy, OnChanges { filterSubjectExternalId = ''; filterSubjectId = ''; filterSubjectHumanReadableId = ''; - filterSubjectEnrolmentDate = ''; - filterSubjectName = ''; filterDateOfBirthFrom = ''; filterDateOfBirthTo = ''; filterPersonName = ''; - filterSubjectDOBFrom = ''; - filterSubjectDOBTo = ''; filterEnrollmentDateFrom = ''; filterEnrollmentDateTo = ''; filterCreatedDateFrom = ''; @@ -96,7 +92,6 @@ export class SubjectComponent implements OnInit, OnDestroy, OnChanges { } loadSubjects() { - console.log('loadSubjects', this.isProjectSpecific); if (this.isProjectSpecific) { this.loadAllFromProject(); } else { @@ -105,9 +100,6 @@ export class SubjectComponent implements OnInit, OnDestroy, OnChanges { } private loadAllFromProject() { - console.log('loadAllFromProject',this.project.projectName, - this.queryFilterParams, - this.queryPaginationParams); this.subjectService.findAllByProject( this.project.projectName, this.queryFilterParams, @@ -121,8 +113,6 @@ export class SubjectComponent implements OnInit, OnDestroy, OnChanges { } loadAll() { - console.log('loadAll',this.queryFilterParams, - this.queryPaginationParams) this.subjectService.query( this.queryFilterParams, this.queryPaginationParams, @@ -133,14 +123,9 @@ export class SubjectComponent implements OnInit, OnDestroy, OnChanges { } ngOnInit() { - console.log('ngOnInit'); - // this.loadSubjects(); - // if(this.isProjectSpecific){ - // this.loadAllFromProject(); - // } else { - // this.loadAll(); - // } - if (!this.isProjectSpecific) { + if(this.isProjectSpecific){ + this.loadAllFromProject(); + } else { this.loadAll(); } this.registerChangeInSubjects(); @@ -160,7 +145,6 @@ export class SubjectComponent implements OnInit, OnDestroy, OnChanges { } registerChangeInSubjects() { - console.log('registerChangeInSubjects'); this.eventSubscriber = this.eventManager.subscribe('subjectListModification', () => this.loadSubjects()); } @@ -182,11 +166,7 @@ export class SubjectComponent implements OnInit, OnDestroy, OnChanges { subjectId: this.filterSubjectId.trim() || undefined, externalId: this.filterSubjectExternalId.trim() || undefined, personName: this.filterPersonName.trim() || undefined, - // dateOfBirthFrom: this.filterSubjectDOBFrom.trim() || undefined, - // dateOfBirthTo: this.filterSubjectDOBTo.trim() || undefined, humanReadableId: this.filterSubjectHumanReadableId.trim() || undefined, - // enrolmentDate: this.filterSubjectEnrolmentDate.trim() || undefined, - // subjectName: this.filterSubjectName.trim() || undefined, dateOfBirthFrom: this.filterDateOfBirthFrom.trim() || undefined, dateOfBirthTo: this.filterDateOfBirthTo.trim() || undefined, enrollmentDateFrom: this.filterEnrollmentDateFrom.trim() || undefined, @@ -199,9 +179,7 @@ export class SubjectComponent implements OnInit, OnDestroy, OnChanges { get queryPaginationParams(): SubjectsPaginationParams { let subjects = this.subjects || []; const lastLoadedId = subjects[subjects.length - 1]?.id; - // const lastLoadedId = undefined; //subjects[subjects.length - 1]?.id; - const pageSize = lastLoadedId? this.itemsPerPage : this.page*this.itemsPerPage; - // const pageSize = this.itemsPerPage; // : this.page*this.itemsPerPage; + const pageSize = this.itemsPerPage; return { lastLoadedId, pageSize, @@ -211,13 +189,10 @@ export class SubjectComponent implements OnInit, OnDestroy, OnChanges { } private onSuccess(data, headers) { - console.log(this.subjects, data, headers); this.links = parseLinks(headers.get('link')); this.totalItems = +headers.get('X-Total-Count'); this.queryCount = this.totalItems; this.subjects = [...this.subjects, ...data]; - console.log('lastLoaded Subject', this.subjects[this.subjects.length - 1]?.id) - console.log('lastLoaded Data', data[data.length - 1]?.id); } applyFilter() { @@ -278,7 +253,6 @@ export class SubjectComponent implements OnInit, OnDestroy, OnChanges { } transition() { - console.log('transition'); if (!this.isProjectSpecific) { this.router.navigate(['/subject'], { queryParams: { diff --git a/src/main/webapp/app/shared/subject/subject.service.ts b/src/main/webapp/app/shared/subject/subject.service.ts index e2fabf41a..9c02bc5b3 100644 --- a/src/main/webapp/app/shared/subject/subject.service.ts +++ b/src/main/webapp/app/shared/subject/subject.service.ts @@ -82,10 +82,7 @@ export interface SubjectFilterParams { humanReadableIdentifier?: string, personName?: string, - // subjectName?: string, - // subjectDOB?: string, humanReadableId?: string, - // enrolmentDate?: string, } export interface SubjectsPaginationParams { diff --git a/src/test/javascript/e2e/cypress/integration/entities/subject.spec.ts b/src/test/javascript/e2e/cypress/integration/entities/subject.spec.ts index bd1503019..55c84251f 100644 --- a/src/test/javascript/e2e/cypress/integration/entities/subject.spec.ts +++ b/src/test/javascript/e2e/cypress/integration/entities/subject.spec.ts @@ -1,5 +1,4 @@ import { login } from '../util/login'; -import * as navBarPage from '../util/nav-bar'; describe('Subject e2e test', () => { before(() => { @@ -13,96 +12,176 @@ describe('Subject e2e test', () => { }); it('should load Subjects', () => { - navBarPage.clickOnEntityMenu(); - navBarPage.clickOnEntity('subject'); - - cy.get('h2 span').first().should('have.text', 'Subjects'); + cy.contains('jhi-home .card-title', 'radar').click(); + cy.get('jhi-subjects .subject-row').should('have.length', 3); }); it('should load create Subject dialog', () => { - cy.get('button.create-subject').click(); - - cy.get('h4.modal-title').first() - .should('have.text', 'Create or edit a Subject'); - - cy.get('button.close').click(); + cy.get('jhi-subjects button.create-subject').click(); + cy.get('jhi-subject-dialog h4.modal-title').first().should('have.text', 'Create or edit a Subject'); + cy.get('jhi-subject-dialog button.close').click(); }); it('should be able to create new subject', () => { - cy.get('button.btn-primary').contains('Create a new Subject').click(); - cy.wait(1000); - - cy.get('[name=externalId]').type('test-subject1'); - cy.get('[name=project]').select('radar'); - - cy.get('button.btn-primary').contains('Save').click(); - cy.get('jhi-subjects .subjects .subject-row').should('have.length', 5); + cy.get('jhi-subjects button.create-subject').click(); + // cy.wait(1000); + cy.get('[name=externalLink]').type('https://radar-base-test.org'); + cy.get('[name=externalId]').type('test-subject-1'); + cy.get('[name=personName]').type('Test Subject 1'); + cy.get('[name=dateOfBirth]').type('1980-01-01'); + cy.get('jhi-dictionary-mapper select').first().select('Human-readable-identifier'); + cy.get('jhi-dictionary-mapper input').first().type('Test Subject 1'); + cy.contains('jhi-dictionary-mapper button', 'Add').click() + cy.contains('jhi-subject-dialog button.btn-primary', 'Save').click(); + cy.get('jhi-subjects .subject-row').should('have.length', 4); }); it('should be able to edit a subject', () => { - cy.wait(1000); - cy.get('jhi-subjects .subjects .subject-row .subject-row__external-id div span').contains('test-subject1') - .parents('.subject-row') - .get('.subject-row__actions button span.hidden-md-down').contains('Edit') - .first().click(); - cy.get('[name=externalLink]').type('www.radar-base.org'); - cy.get('button.btn-primary').contains('Save').click(); - - cy.get('jhi-subjects .subjects .subject-row').should('have.length', 5); - }); - - it('should be able to delete a subject without source', () => { - cy.get('jhi-subjects .subjects .subject-row .subject-row__external-id div span').contains('test-subject1') - .parents('.subject-row').find('button').contains('View').click(); - - cy.get('jhi-subject-detail button span.hidden-md-down').contains('Delete').click(); - cy.get('jhi-subject-delete-dialog button.btn-danger') - .contains('Delete').click(); - cy.get('jhi-subjects .subjects .subject-row').should('have.length', 4); + // cy.wait(1000); + cy.contains('jhi-subjects .subject-row', 'test-subject-1').contains('button', 'Edit').click(); + // cy.wait(1000); + cy.get('[name=externalLink]').clear().type('https://radar-base-test-edited.org'); + cy.contains('jhi-subject-dialog button.btn-primary', 'Save').click(); + cy.get('jhi-subjects .subject-row').should('have.length', 4); }); it('should have load subject row with subject-id, external-id, status, project, sources and attributes columns', () => { - cy.get('jhi-subjects .subjects .subject-row').first().find('.subject-row__select-row input') + cy.get('jhi-subjects .subject-row').first().find('.subject-row__select-row input') .invoke('attr', 'type') .should('eq', 'checkbox') - cy.get('jhi-subjects .subjects .subject-row').first().find('.subject-row__content .subject-row__subject-id .subject-row__field-label') + cy.get('jhi-subjects .subject-row').first().find('.subject-row__content .subject-row__subject-id .subject-row__field-label') .should('have.text', 'Subject Id') - cy.get('jhi-subjects .subjects .subject-row').first().find('.subject-row__content .subject-row__subject-id a') + + cy.get('jhi-subjects .subject-row').first().find('.subject-row__content .subject-row__subject-id a') .should('have.text','sub-1') .invoke('attr', 'href') .should('eq', '#/subject/sub-1') - cy.get('jhi-subjects .subjects .subject-row').first().find('.subject-row__content .subject-row__external-id .subject-row__field-label') + cy.get('jhi-subjects .subject-row').first().find('.subject-row__content .subject-row__external-id .subject-row__field-label') .should('have.text', 'External Id') - cy.get('jhi-subjects .subjects .subject-row').first().find('.subject-row__content .subject-row__external-id a') - .should('contain.text','www.radar-base.org') - .invoke('attr', 'href') - .should('eq', 'www.radar-base.org') - cy.get('jhi-subjects .subjects .subject-row').first().find('.subject-row__content .subject-row__status .subject-row__field-label') + cy.get('jhi-subjects .subject-row').first().find('.subject-row__content .subject-row__status .subject-row__field-label') .should('have.text', 'Status') - cy.get('jhi-subjects .subjects .subject-row').first().find('.subject-row__content .subject-row__status span.badge') - .should('have.text','ACTIVATED') - cy.get('jhi-subjects .subjects .subject-row').first().find('.subject-row__content .subject-row__project .subject-row__field-label') - .should('have.text', 'Project') - cy.get('jhi-subjects .subjects .subject-row').first().find('.subject-row__content .subject-row__project a.badge') - .should('have.text','radar') - .invoke('attr', 'href') - .should('eq', '#/project/radar') + cy.get('jhi-subjects .subject-row').first().find('.subject-row__content .subject-row__status span.badge') + .should('have.text','ACTIVATED') - cy.get('jhi-subjects .subjects .subject-row').first().find('.subject-row__content .subject-row__sources .subject-row__field-label') + cy.get('jhi-subjects .subject-row').first().find('.subject-row__content .subject-row__sources .subject-row__field-label') .should('have.text', 'Sources') - cy.get('jhi-subjects .subjects .subject-row').first().find('.subject-row__content .subject-row__sources a.form-control-static') + + cy.get('jhi-subjects .subject-row').first().find('.subject-row__content .subject-row__sources a.form-control-static') .should('have.text','E4: source-1') .invoke('attr', 'href') .should('eq', '#/source/source-1') - cy.get('jhi-subjects .subjects .subject-row').first().find('.subject-row__content .subject-row__attribute-data .subject-row__field-label') + cy.get('jhi-subjects .subject-row').first().find('.subject-row__content .subject-row__attribute-data .subject-row__field-label') .should('have.text', 'Attributes') - cy.get('jhi-subjects .subjects .subject-row').first().find('.subject-row__content .subject-row__attribute-data div span') + + cy.get('jhi-subjects .subject-row').first().find('.subject-row__content .subject-row__attribute-data div span') .should('have.text',' N/A ') }) + it('should be able to filter subjects by subject id', () => { + cy.get('#field-subject-id').type('b-1'); + cy.get('#apply-filter').click(); + cy.get('jhi-subjects .subject-row').should('have.length', 1); + cy.get('#field-subject-id').clear(); + cy.get('#apply-filter').click(); + cy.get('jhi-subjects .subject-row').should('have.length', 4); + }); + + it('should be able to filter subjects by subject external id', () => { + cy.get('#field-subject-external-id').type('test-subject-1'); + cy.get('#apply-filter').click(); + cy.get('jhi-subjects .subject-row').should('have.length', 1); + cy.get('#field-subject-external-id').clear(); + cy.get('#apply-filter').click(); + cy.get('jhi-subjects .subject-row').should('have.length', 4); + }); + + xit('should be able to filter subjects by human readable id', () => { + cy.get('#advanced-filter').click(); + cy.get('#field-human-readable-id').type('Test'); + cy.get('#apply-filter').click(); + cy.get('jhi-subjects .subject-row').should('have.length', 1); + cy.get('#field-human-readable-id').clear(); + cy.get('#apply-filter').click(); + cy.get('jhi-subjects .subject-row').should('have.length', 4); + cy.get('#advanced-filter').click(); + }); + + it('should be able to filter subjects by person name', () => { + cy.get('#advanced-filter').click(); + cy.get('#field-person-name').type('Test'); + cy.get('#apply-filter').click(); + cy.get('jhi-subjects .subject-row').should('have.length', 1); + cy.get('#field-person-name').clear(); + cy.get('#apply-filter').click(); + cy.get('jhi-subjects .subject-row').should('have.length', 4); + cy.get('#advanced-filter').click(); + }); + + it('should be able to filter subjects by date of birth from', () => { + cy.get('#advanced-filter').click(); + cy.get('#field_date_of_birth_from').type('1979-01-01'); + cy.get('#apply-filter').click(); + cy.get('jhi-subjects .subject-row').should('have.length', 1); + cy.get('#field_date_of_birth_from').type('1981-01-01'); + cy.get('#apply-filter').click(); + cy.get('jhi-subjects .subject-row').should('have.length', 0); + cy.get('#field_date_of_birth_from').clear(); + cy.get('#apply-filter').click(); + cy.get('jhi-subjects .subject-row').should('have.length', 4); + cy.get('#advanced-filter').click(); + }); + + it('should be able to filter subjects by date of birth to', () => { + cy.get('#advanced-filter').click(); + cy.get('#field_date_of_birth_to').type('1981-01-01'); + cy.get('#apply-filter').click(); + cy.get('jhi-subjects .subject-row').should('have.length', 1); + cy.get('#field_date_of_birth_to').type('1979-01-01'); + cy.get('#apply-filter').click(); + cy.get('jhi-subjects .subject-row').should('have.length', 0); + cy.get('#field_date_of_birth_to').clear(); + cy.get('#apply-filter').click(); + cy.get('jhi-subjects .subject-row').should('have.length', 4); + cy.get('#advanced-filter').click(); + }); + + xit('should be able to filter subjects by date of birth from and to', () => { + cy.get('#advanced-filter').click(); + cy.get('#field_date_of_birth_from').type('1979-01-01'); + cy.get('#field_date_of_birth_to').type('1981-01-01'); + cy.get('#apply-filter').click(); + cy.get('jhi-subjects .subject-row').should('have.length', 1); + cy.get('#field_date_of_birth_from').type('1981-01-01'); + cy.get('#field_date_of_birth_to').type('1982-01-01'); + cy.get('#apply-filter').click(); + cy.get('jhi-subjects .subject-row').should('have.length', 0); + cy.get('#field_date_of_birth_from').clear(); + cy.get('#field_date_of_birth_to').clear(); + cy.get('#apply-filter').click(); + cy.get('jhi-subjects .subject-row').should('have.length', 4); + cy.get('#advanced-filter').click(); + }); + + // TODO Filter by Enrollment Date + + it('should be able to delete a subject without source', () => { + cy.contains('jhi-subjects .subject-row', 'test-subject-1').find('a').first().click(); + cy.contains('jhi-subject-detail button', 'Delete').click(); + cy.contains('jhi-subject-delete-dialog button', 'Delete').click(); + cy.get('jhi-subjects .subject-row').should('have.length', 3); + }); + + it('should be able to sort subjects by subject id in asc/desc order', () => { + cy.get('jhi-subjects #field-order-by').click(); + cy.get('jhi-subjects #order-by-desc').click(); + cy.get('jhi-subjects .subject-row').first().should('contain.text', 'sub-3'); + cy.get('jhi-subjects #field-order-by').click(); + cy.get('jhi-subjects #order-by-asc').click(); + cy.get('jhi-subjects .subject-row').first().should('contain.text', 'sub-1'); + }); }); From 9cdabbef11e1ade344235ac5b9a1f0ef4752d381 Mon Sep 17 00:00:00 2001 From: Joris Borgdorff Date: Tue, 19 Oct 2021 20:30:04 +0200 Subject: [PATCH 062/431] Fixing sorting --- .../filters/SubjectSpecification.java | 253 +++++++++++------- .../management/service/SubjectService.java | 58 ++-- .../management/web/rest/ProjectResource.java | 3 +- .../management/web/rest/SubjectResource.java | 12 +- .../web/rest/criteria/CriteriaRange.java | 72 +++++ .../rest/criteria/SortDirectionConverter.java | 42 --- ...rtDirection.java => SubjectAuthority.java} | 16 +- .../web/rest/criteria/SubjectCriteria.java | 169 +++++++----- .../rest/criteria/SubjectCriteriaLast.java | 49 ++++ .../web/rest/criteria/SubjectSortBy.java | 16 +- .../rest/criteria/SubjectSortByConverter.java | 42 --- .../web/rest/criteria/SubjectSortOrder.java | 43 +++ .../criteria/SubjectSortOrderConverter.java | 54 ++++ .../web/rest/util/PaginationUtil.java | 74 +++-- .../project/project-dialog.component.ts | 35 ++- .../webapp/app/shared/group/group.model.ts | 5 + .../webapp/app/shared/group/group.service.ts | 31 +++ src/main/webapp/app/shared/group/index.ts | 2 + src/main/webapp/app/shared/index.ts | 1 + .../app/shared/project/project.model.ts | 2 +- .../app/shared/subject/subject.model.ts | 5 - 21 files changed, 649 insertions(+), 335 deletions(-) create mode 100644 src/main/java/org/radarbase/management/web/rest/criteria/CriteriaRange.java delete mode 100644 src/main/java/org/radarbase/management/web/rest/criteria/SortDirectionConverter.java rename src/main/java/org/radarbase/management/web/rest/criteria/{SortDirection.java => SubjectAuthority.java} (57%) create mode 100644 src/main/java/org/radarbase/management/web/rest/criteria/SubjectCriteriaLast.java delete mode 100644 src/main/java/org/radarbase/management/web/rest/criteria/SubjectSortByConverter.java create mode 100644 src/main/java/org/radarbase/management/web/rest/criteria/SubjectSortOrder.java create mode 100644 src/main/java/org/radarbase/management/web/rest/criteria/SubjectSortOrderConverter.java create mode 100644 src/main/webapp/app/shared/group/group.model.ts create mode 100644 src/main/webapp/app/shared/group/group.service.ts create mode 100644 src/main/webapp/app/shared/group/index.ts diff --git a/src/main/java/org/radarbase/management/repository/filters/SubjectSpecification.java b/src/main/java/org/radarbase/management/repository/filters/SubjectSpecification.java index 8a429e274..a7685ef41 100644 --- a/src/main/java/org/radarbase/management/repository/filters/SubjectSpecification.java +++ b/src/main/java/org/radarbase/management/repository/filters/SubjectSpecification.java @@ -4,10 +4,12 @@ import org.radarbase.management.domain.Role; import org.radarbase.management.domain.Subject; import org.radarbase.management.domain.User; -import org.radarbase.management.web.rest.criteria.SortDirection; +import org.radarbase.management.web.rest.criteria.CriteriaRange; +import org.radarbase.management.web.rest.criteria.SubjectAuthority; import org.radarbase.management.web.rest.criteria.SubjectCriteria; +import org.radarbase.management.web.rest.criteria.SubjectCriteriaLast; import org.radarbase.management.web.rest.criteria.SubjectSortBy; -import org.radarbase.management.web.rest.errors.BadRequestException; +import org.radarbase.management.web.rest.criteria.SubjectSortOrder; import org.springframework.data.jpa.domain.Specification; import javax.annotation.Nullable; @@ -23,49 +25,70 @@ import java.time.LocalDate; import java.time.ZonedDateTime; import java.util.ArrayList; -import java.util.Collections; import java.util.List; - -import static org.radarbase.auth.authorization.AuthoritiesConstants.PARTICIPANT; -import static org.radarbase.management.web.rest.errors.EntityName.SUBJECT; -import static org.radarbase.management.web.rest.errors.ErrorConstants.ERR_VALIDATION; - +import java.util.Objects; +import java.util.Set; +import java.util.stream.Collectors; public class SubjectSpecification implements Specification { - private final boolean includeInactive; - private final LocalDate dateOfBirthFrom; - private final LocalDate dateOfBirthTo; - private final ZonedDateTime enrollmentDateFrom; - private final ZonedDateTime enrollmentDateTo; + private final CriteriaRange dateOfBirth; + private final CriteriaRange enrollmentDate; private final String groupName; private final String humanReadableIdentifier; - private final Long lastLoadedId; + private final SubjectCriteriaLast last; private final String personName; private final String projectName; private final String externalId; private final String subjectId; - private final SubjectSortBy sortBy; - private final SortDirection sortDirection; + private final List sort; + private final Set authority; /** * Subject specification based on criteria. * @param criteria criteria to use for the specification. */ public SubjectSpecification(SubjectCriteria criteria) { - this.includeInactive = criteria.isIncludeInactive(); - this.dateOfBirthFrom = criteria.getDateOfBirthFrom(); - this.dateOfBirthTo = criteria.getDateOfBirthTo(); - this.enrollmentDateFrom = criteria.getEnrollmentDateFrom(); - this.enrollmentDateTo = criteria.getEnrollmentDateTo(); + this.authority = criteria.getAuthority().stream() + .map(SubjectAuthority::name) + .collect(Collectors.toSet()); + this.dateOfBirth = criteria.getDateOfBirth(); + this.enrollmentDate = criteria.getEnrollmentDate(); this.groupName = criteria.getGroupName(); this.humanReadableIdentifier = criteria.getHumanReadableIdentifier(); - this.lastLoadedId = criteria.getLastLoadedId(); + this.last = criteria.getLast(); this.personName = criteria.getPersonName(); this.projectName = criteria.getProjectName(); this.externalId = criteria.getExternalId(); - this.subjectId = criteria.getSubjectId(); - this.sortBy = criteria.getSortBy(); - this.sortDirection = criteria.getSortDirection(); + this.subjectId = criteria.getLogin(); + if (criteria.getSort() != null) { + List sortInput = new ArrayList<>(criteria.getParsedSort()); + int uniqueSort = -1; + for (int i = 0; i < sortInput.size(); i++) { + SubjectSortBy sortProperty = sortInput.get(i).getSortBy(); + if (last != null) { + getLastValue(sortProperty); + } + if (sortProperty.isUnique()) { + uniqueSort = i; + break; + } + } + if (uniqueSort != -1) { + this.sort = sortInput.subList(0, uniqueSort + 1); + } else { + if (last != null) { + getLastValue(SubjectSortBy.ID); + } + sortInput.add(new SubjectSortOrder(SubjectSortBy.ID)); + this.sort = sortInput; + } + } else { + if (last != null) { + getLastValue(SubjectSortBy.ID); + } + this.sort = List.of(new SubjectSortOrder(SubjectSortBy.ID)); + } + } @Override @@ -98,8 +121,8 @@ public Predicate toPredicate(@Nullable Root root, @Nullable CriteriaQue predicates.add(builder.equal(root.get("group"), groupName)); } - addDateOfBirthPredicates(root, builder, predicates); - addEnrollmentDatePredicates(root, builder, predicates); + addCriteriaRangePredicates(root.get("dateOfBirth"), builder, predicates, dateOfBirth); + addCriteriaRangePredicates(root.get("enrollmentDate"), builder, predicates, enrollmentDate); if (StringUtils.isNotEmpty(personName)) { predicates.add(builder @@ -124,12 +147,84 @@ private void addContentPredicates(Root root, CriteriaBuilder builder, root.fetch("sources", JoinType.LEFT); root.fetch("user", JoinType.LEFT); - if (lastLoadedId != null) { - if (sortBy == SubjectSortBy.ID && sortDirection == SortDirection.DESC) { - predicates.add(builder.lessThan(root.get("id"), lastLoadedId)); + if (last != null) { + predicates.add(filterLastValues(root, builder)); + } + } + + private Predicate filterLastValues(Root root, CriteriaBuilder builder) { + Predicate[] lastPredicates = new Predicate[sort.size()]; + List> paths = new ArrayList<>(sort.size()); + List values = new ArrayList<>(sort.size()); + for (SubjectSortOrder order : sort) { + paths.add(getPropertyPath(order.getSortBy(), root)); + values.add(getLastValue(order.getSortBy())); + } + for (int i = 0; i < sort.size(); i++) { + Predicate[] lastAndPredicates = i > 0 ? new Predicate[i + 1] : null; + for (int j = 0; j < i; j++) { + lastAndPredicates[j] = builder.equal(paths.get(j), values.get(j)); + } + + SubjectSortOrder order = sort.get(i); + Predicate currentSort; + if (order.getDirection().isAscending()) { + currentSort = builder.greaterThan(paths.get(i), values.get(i)); } else { - predicates.add(builder.greaterThan(root.get("id"), lastLoadedId)); + currentSort = builder.lessThan(paths.get(i), values.get(i)); } + + if (lastAndPredicates != null) { + lastAndPredicates[i] = currentSort; + lastPredicates[i] = builder.and(lastAndPredicates); + } else { + lastPredicates[i] = currentSort; + } + } + if (lastPredicates.length > 1) { + return builder.or(lastPredicates); + } else { + return lastPredicates[0]; + } + } + + private String getLastValue(SubjectSortBy property) { + String result; + switch (property) { + case ID: + result = last.getId(); + break; + case USER_LOGIN: + result = last.getLogin(); + break; + case EXTERNAL_ID: + result = last.getExternalId(); + break; + case USER_AUTHORITY: + result = Objects.toString(last.getAuthority(), null); + break; + default: + throw new IllegalArgumentException("Unknown sort property " + property); + } + if (result == null) { + throw new IllegalArgumentException("No last value given for sort property " + property); + } + return result; + } + + + private Path getPropertyPath(SubjectSortBy property, Root root) { + switch (property) { + case ID: + return root.get("id"); + case USER_LOGIN: + return root.get("user").get("login"); + case EXTERNAL_ID: + return root.get("externalId"); + case USER_AUTHORITY: + return root.get("user").get("authority").get("name"); + default: + throw new IllegalArgumentException("Unknown sort property " + property); } } @@ -143,88 +238,44 @@ private void addRolePredicates(CriteriaBuilder builder, Join user rolesJoin.get("project").get("projectName"), projectName)); } - if (!includeInactive) { - predicates.add(rolesJoin.get("authority").get("name") - .in(Collections.singletonList(PARTICIPANT))); + if (!authority.isEmpty() && authority.size() != SubjectAuthority.values().length) { + predicates.add(rolesJoin.get("authority").get("name").in(authority)); } } - private void addDateOfBirthPredicates( - Root root, + private > void addCriteriaRangePredicates( + Path path, CriteriaBuilder builder, - List predicates) { - if (dateOfBirthFrom != null - && dateOfBirthFrom.equals(dateOfBirthTo)) { - predicates.add(builder.equal(root.get("dateOfBirth"), dateOfBirthTo)); + List predicates, + CriteriaRange range) { + if (range == null || range.isEmpty()) { + return; + } + range.validate(); + if (range.getIs() != null) { + predicates.add(builder.equal(path, range.getIs())); } else { - if (dateOfBirthFrom != null - && dateOfBirthTo != null - && dateOfBirthFrom.compareTo(dateOfBirthTo) < 0) { - throw new BadRequestException( - "Date of birth start range may not precede date of birth end range.", - SUBJECT, ERR_VALIDATION); - } - if (dateOfBirthFrom != null) { + if (range.getFrom() != null) { predicates.add(builder - .greaterThanOrEqualTo(root.get("dateOfBirth"), dateOfBirthFrom)); + .greaterThanOrEqualTo(path, range.getFrom())); } - if (dateOfBirthTo != null) { + if (range.getTo() != null) { predicates.add(builder - .lessThanOrEqualTo(root.get("dateOfBirth"), dateOfBirthTo)); + .lessThanOrEqualTo(path, range.getTo())); } } } - private void addEnrollmentDatePredicates( - Root root, - CriteriaBuilder builder, - List predicates) { - if (enrollmentDateFrom != null - && enrollmentDateTo != null - && enrollmentDateFrom.compareTo(enrollmentDateTo) < 0) { - throw new BadRequestException( - "Enrollment date start range may not precede enrollment date end range.", - SUBJECT, ERR_VALIDATION); - } - if (enrollmentDateFrom != null) { - predicates.add(builder - .greaterThanOrEqualTo(root.get("enrollmentDate"), enrollmentDateFrom)); - } - if (enrollmentDateTo != null) { - predicates.add(builder - .lessThan(root.get("enrollmentDate"), enrollmentDateTo)); - } - } - private List getSortOrder(Root root, CriteriaBuilder builder) { - Path sortingPath; - switch (sortBy) { - case ID: - sortingPath = root.get("id"); - break; - case EXTERNAL_ID: - sortingPath = root.get("externalId"); - break; - case USER_ACTIVATED: - sortingPath = root.get("user").get("activated"); - break; - case USER_LOGIN: - sortingPath = root.get("user").get("login"); - break; - default: - throw new IllegalStateException("Cannot sort on unknown sort parameter " + sortBy); - } - - List orderList = new ArrayList<>(); - if (sortDirection == SortDirection.DESC) { - orderList.add(builder.desc(sortingPath)); - } else { - orderList.add(builder.asc(sortingPath)); - } - // We need to guarantee that the sorting is stable to make pagination work - if (sortBy != SubjectSortBy.ID) { - orderList.add(builder.asc(root.get("id"))); - } - return orderList; + return sort.stream() + .map(order -> { + Path path = getPropertyPath(order.getSortBy(), root); + if (order.getDirection().isAscending()) { + return builder.asc(path); + } else { + return builder.desc(path); + } + }) + .collect(Collectors.toList()); } } diff --git a/src/main/java/org/radarbase/management/service/SubjectService.java b/src/main/java/org/radarbase/management/service/SubjectService.java index 9705af7b1..3c38d6d01 100644 --- a/src/main/java/org/radarbase/management/service/SubjectService.java +++ b/src/main/java/org/radarbase/management/service/SubjectService.java @@ -15,7 +15,6 @@ import java.net.MalformedURLException; import java.net.URL; import java.time.ZonedDateTime; -import java.util.Arrays; import java.util.Collections; import java.util.HashMap; import java.util.HashSet; @@ -61,8 +60,6 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Page; -import org.springframework.data.domain.PageRequest; -import org.springframework.data.domain.Pageable; import org.springframework.data.history.Revisions; import org.springframework.security.crypto.password.PasswordEncoder; import org.springframework.stereotype.Service; @@ -190,7 +187,7 @@ public SubjectDTO updateSubject(SubjectDTO newSubjectDto) { if (newSubjectDto.getId() == null) { return createSubject(newSubjectDto); } - Subject subjectFromDb = subjectRepository.findById(newSubjectDto.getId()).get(); + Subject subjectFromDb = ensureSubject(newSubjectDto); //reset all the sources assigned to a subject to unassigned Set sourcesToUpdate = subjectFromDb.getSources(); sourcesToUpdate.forEach(s -> s.subject(null).assigned(false).deleted(true)); @@ -236,7 +233,7 @@ private Set updateParticipantRoles(Subject subject, SubjectDTO subjectDto) * @return the discontinued subject */ public SubjectDTO discontinueSubject(SubjectDTO subjectDto) { - Subject subject = subjectRepository.findById(subjectDto.getId()).get(); + Subject subject = ensureSubject(subjectDto); // reset all the sources assigned to a subject to unassigned unassignAllSources(subject); @@ -247,6 +244,13 @@ public SubjectDTO discontinueSubject(SubjectDTO subjectDto) { return subjectMapper.subjectToSubjectReducedProjectDTO(subjectRepository.save(subject)); } + private Subject ensureSubject(SubjectDTO subjectDto) { + return subjectRepository.findById(subjectDto.getId()) + .orElseThrow(() -> new NotFoundException( + "Subject with ID " + subjectDto.getId() + " not found.", + SUBJECT, ERR_SUBJECT_NOT_FOUND)); + } + /** * Unassign all sources from a subject. This method saves the unassigned sources, but does NOT * save the subject in question. This is the responsibility of the caller. @@ -272,7 +276,7 @@ private void unassignAllSources(Subject subject) { @Transactional public MinimalSourceDetailsDTO assignOrUpdateSource(Subject subject, SourceType sourceType, Project project, MinimalSourceDetailsDTO sourceRegistrationDto) { - Source assignedSource = null; + Source assignedSource; if (sourceRegistrationDto.getSourceId() != null) { // update meta-data and source-name for existing sources @@ -347,26 +351,25 @@ private static Map sourceTypeAttributes(SourceType sourceType, private Source updateSourceAssignedSubject(Subject subject, MinimalSourceDetailsDTO sourceRegistrationDto) { // for manually registered devices only add meta-data - Optional sourceToUpdate = subjectRepository.findSubjectSourcesBySourceId( - subject.getUser().getLogin(), sourceRegistrationDto.getSourceId()); - - if (sourceToUpdate.isPresent()) { - Source source = sourceToUpdate.get(); - if (sourceRegistrationDto.getSourceName() != null) { - source.setSourceName(sourceRegistrationDto.getSourceName()); - } - source.getAttributes().putAll(sourceRegistrationDto.getAttributes()); - source.setAssigned(true); - source.setSubject(subject); + Source source = subjectRepository.findSubjectSourcesBySourceId( + subject.getUser().getLogin(), sourceRegistrationDto.getSourceId()) + .orElseThrow(() -> { + Map errorParams = new HashMap<>(); + errorParams.put("sourceId", sourceRegistrationDto.getSourceId().toString()); + errorParams.put("subject-login", subject.getUser().getLogin()); + return new NotFoundException( "No source with source-id to assigned to the " + + "subject with subject-login", SUBJECT, ERR_SOURCE_NOT_FOUND, + errorParams); + }); - return sourceRepository.save(source); - } else { - Map errorParams = new HashMap<>(); - errorParams.put("sourceId", sourceRegistrationDto.getSourceId().toString()); - errorParams.put("subject-login", subject.getUser().getLogin()); - throw new NotFoundException( "No source with source-id to assigned to the subject" - + " with subject-login", SUBJECT, ERR_SOURCE_NOT_FOUND, errorParams); + if (sourceRegistrationDto.getSourceName() != null) { + source.setSourceName(sourceRegistrationDto.getSourceName()); } + source.getAttributes().putAll(sourceRegistrationDto.getAttributes()); + source.setAssigned(true); + source.setSubject(subject); + + return sourceRepository.save(source); } /** @@ -443,12 +446,12 @@ public SubjectDTO findRevision(String login, Integer revision) throws NotFoundEx */ public SubjectDTO getLatestRevision(String login) throws NotFoundException { UserDTO user = (UserDTO) revisionService.getLatestRevisionForEntity(User.class, - Arrays.asList(AuditEntity.property("login").eq(login))) + List.of(AuditEntity.property("login").eq(login))) .orElseThrow(() -> new NotFoundException("Subject latest revision not found " + "for login" , SUBJECT, ERR_SUBJECT_NOT_FOUND, Collections.singletonMap("subjectLogin", login))); return (SubjectDTO) revisionService.getLatestRevisionForEntity(Subject.class, - Arrays.asList(AuditEntity.property("user").eq(user))) + List.of(AuditEntity.property("user").eq(user))) .orElseThrow(() -> new NotFoundException("Subject latest revision not found " + "for login" , SUBJECT, ERR_SUBJECT_NOT_FOUND, Collections.singletonMap("subjectLogin", login))); @@ -484,8 +487,7 @@ public Page findAll(SubjectCriteria criteria) { // but the page should always be zero // since the lastLoadedId param defines the offset // within the query specification - Pageable pageable = PageRequest.of(0, criteria.getPageSize()); - return subjectRepository.findAll(new SubjectSpecification(criteria), pageable); + return subjectRepository.findAll(new SubjectSpecification(criteria), criteria.getPageable()); } /** diff --git a/src/main/java/org/radarbase/management/web/rest/ProjectResource.java b/src/main/java/org/radarbase/management/web/rest/ProjectResource.java index ce17f8df9..6c66707c2 100644 --- a/src/main/java/org/radarbase/management/web/rest/ProjectResource.java +++ b/src/main/java/org/radarbase/management/web/rest/ProjectResource.java @@ -313,7 +313,8 @@ public ResponseEntity> getAllSubjects( projectService.findOneByName(projectName); subjectCriteria.setProjectName(projectName); - log.debug("REST request to get all subjects for project {}", projectName); + log.debug("REST request to get all subjects for project {} using criteria {}", projectName, + subjectCriteria); Page page = subjectService.findAll(subjectCriteria) .map(subjectMapper::subjectToSubjectWithoutProjectDTO); diff --git a/src/main/java/org/radarbase/management/web/rest/SubjectResource.java b/src/main/java/org/radarbase/management/web/rest/SubjectResource.java index fe0a80fed..521ad209d 100644 --- a/src/main/java/org/radarbase/management/web/rest/SubjectResource.java +++ b/src/main/java/org/radarbase/management/web/rest/SubjectResource.java @@ -1,7 +1,6 @@ package org.radarbase.management.web.rest; import static io.github.jhipster.web.util.ResponseUtil.wrapOrNotFound; -import static org.radarbase.auth.authorization.AuthoritiesConstants.INACTIVE_PARTICIPANT; import static org.radarbase.auth.authorization.AuthoritiesConstants.PARTICIPANT; import static org.radarbase.auth.authorization.Permission.SUBJECT_CREATE; import static org.radarbase.auth.authorization.Permission.SUBJECT_DELETE; @@ -19,7 +18,6 @@ import static org.radarbase.management.web.rest.errors.ErrorConstants.ERR_VALIDATION; import java.net.URISyntaxException; -import java.util.Arrays; import java.util.Collections; import java.util.HashMap; import java.util.List; @@ -27,6 +25,7 @@ import java.util.NoSuchElementException; import java.util.Objects; import java.util.Optional; +import java.util.stream.Collectors; import java.util.stream.Stream; import javax.servlet.http.HttpServletRequest; import javax.validation.Valid; @@ -208,7 +207,7 @@ public ResponseEntity updateSubject(@RequestBody SubjectDTO subjectD @PutMapping("/subjects/discontinue") @Timed public ResponseEntity discontinueSubject(@RequestBody SubjectDTO subjectDto) - throws URISyntaxException, NotAuthorizedException { + throws NotAuthorizedException { log.debug("REST request to update Subject : {}", subjectDto); if (subjectDto.getId() == null) { return ResponseEntity.badRequest().headers(HeaderUtil @@ -255,9 +254,10 @@ public ResponseEntity> getAllSubjects( String externalId = subjectCriteria.getExternalId(); log.debug("ProjectName {} and external {}", projectName, externalId); // if not specified do not include inactive patients - List authoritiesToInclude = subjectCriteria.isIncludeInactive() - ? Arrays.asList(PARTICIPANT, INACTIVE_PARTICIPANT) - : Collections.singletonList(PARTICIPANT); + List authoritiesToInclude = subjectCriteria.getAuthority().stream() + .filter(Objects::nonNull) + .map(Enum::toString) + .collect(Collectors.toList()); if (projectName != null && externalId != null) { Optional> subject = subjectRepository diff --git a/src/main/java/org/radarbase/management/web/rest/criteria/CriteriaRange.java b/src/main/java/org/radarbase/management/web/rest/criteria/CriteriaRange.java new file mode 100644 index 000000000..08bc8049a --- /dev/null +++ b/src/main/java/org/radarbase/management/web/rest/criteria/CriteriaRange.java @@ -0,0 +1,72 @@ +/* + * Copyright (c) 2021. The Hyve + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * + * See the file LICENSE in the root of this repository. + */ + +package org.radarbase.management.web.rest.criteria; + +public class CriteriaRange> { + private T from = null; + private T to = null; + private T is = null; + + public T getFrom() { + return getIs() == null ? from : null; + } + + public void setFrom(T from) { + this.from = from; + } + + public T getTo() { + return getIs() == null ? to : null; + } + + public void setTo(T to) { + this.to = to; + } + + public void setIs(T is) { + this.is = is; + } + + /** Whether the criteria is equal to this value. */ + public T getIs() { + if (is != null) { + return is; + } else if (from != null && from.equals(to)) { + return from; + } else { + return null; + } + } + + /** + * Whether the criteria range contains any values at all. + */ + public boolean isEmpty() { + return from == null && to == null && is == null; + } + + /** + * Validate this criteria range whether the from and to ranges are in order. + */ + public void validate() { + if (is == null && from != null && to != null && from.compareTo(to) > 0) { + throw new IllegalArgumentException( + "CriteriaRange must have a from range that is smaller then the to range."); + } + } + + @Override + public String toString() { + return "CriteriaRange{" + "from=" + getFrom() + + ", to=" + getTo() + + ", is=" + getIs() + + '}'; + } +} diff --git a/src/main/java/org/radarbase/management/web/rest/criteria/SortDirectionConverter.java b/src/main/java/org/radarbase/management/web/rest/criteria/SortDirectionConverter.java deleted file mode 100644 index 134d802c8..000000000 --- a/src/main/java/org/radarbase/management/web/rest/criteria/SortDirectionConverter.java +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Copyright (c) 2021. The Hyve - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * - * See the file LICENSE in the root of this repository. - */ - -package org.radarbase.management.web.rest.criteria; - -import org.apache.commons.lang3.StringUtils; -import org.springframework.core.convert.converter.Converter; -import org.springframework.stereotype.Component; - -import javax.annotation.Nullable; - -import static org.radarbase.management.web.rest.criteria.SortDirection.ASC; - -@Component -public class SortDirectionConverter implements Converter { - /** - * Parse sort direction from string. - * - * @param value user provided text - * @return ASC for empty strings, ASC or DESC for corresponding strings, and UNKNOWN - * otherwise. - */ - @Override - @Nullable - public SortDirection convert(@Nullable String value) { - if (StringUtils.isEmpty(value)) { - return ASC; - } - for (SortDirection d : SortDirection.values()) { - if (d.getKey().equalsIgnoreCase(value)) { - return d; - } - } - return null; - } -} diff --git a/src/main/java/org/radarbase/management/web/rest/criteria/SortDirection.java b/src/main/java/org/radarbase/management/web/rest/criteria/SubjectAuthority.java similarity index 57% rename from src/main/java/org/radarbase/management/web/rest/criteria/SortDirection.java rename to src/main/java/org/radarbase/management/web/rest/criteria/SubjectAuthority.java index 24f0e208b..964674766 100644 --- a/src/main/java/org/radarbase/management/web/rest/criteria/SortDirection.java +++ b/src/main/java/org/radarbase/management/web/rest/criteria/SubjectAuthority.java @@ -9,17 +9,7 @@ package org.radarbase.management.web.rest.criteria; -public enum SortDirection { - ASC("asc"), - DESC("desc"); - - private final String key; - - SortDirection(String key) { - this.key = key; - } - - public String getKey() { - return this.key; - } +public enum SubjectAuthority { + ROLE_PARTICIPANT, + ROLE_INACTIVE_PARTICIPANT; } diff --git a/src/main/java/org/radarbase/management/web/rest/criteria/SubjectCriteria.java b/src/main/java/org/radarbase/management/web/rest/criteria/SubjectCriteria.java index 83fa97e54..2e75a98d5 100644 --- a/src/main/java/org/radarbase/management/web/rest/criteria/SubjectCriteria.java +++ b/src/main/java/org/radarbase/management/web/rest/criteria/SubjectCriteria.java @@ -1,69 +1,62 @@ package org.radarbase.management.web.rest.criteria; +import org.radarbase.management.web.rest.errors.BadRequestException; +import org.springframework.data.domain.PageRequest; +import org.springframework.data.domain.Pageable; +import org.springframework.data.domain.Sort; + import javax.validation.constraints.Min; import javax.validation.constraints.NotNull; import java.time.LocalDate; import java.time.ZonedDateTime; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import java.util.Optional; +import java.util.stream.Collectors; + +import static org.radarbase.management.web.rest.errors.EntityName.SUBJECT; +import static org.radarbase.management.web.rest.errors.ErrorConstants.ERR_VALIDATION; public class SubjectCriteria { - private boolean includeInactive = false; - private LocalDate dateOfBirthFrom = null; - private LocalDate dateOfBirthTo = null; - private ZonedDateTime enrollmentDateFrom = null; - private ZonedDateTime enrollmentDateTo = null; + private List authority = List.of(SubjectAuthority.ROLE_PARTICIPANT); + private CriteriaRange dateOfBirth = null; + private CriteriaRange enrollmentDate = null; private String groupName = null; private String humanReadableIdentifier = null; - private Long lastLoadedId = null; - @NotNull + private SubjectCriteriaLast last = null; + @Min(0) + private int page = 0; @Min(1) - private Integer pageSize = 10; + private int size = 20; + private List sort; private String personName = null; private String projectName = null; private String externalId = null; - private String subjectId = null; - @NotNull - private SubjectSortBy sortBy = SubjectSortBy.ID; - @NotNull - private SortDirection sortDirection = SortDirection.ASC; - - public boolean isIncludeInactive() { - return includeInactive; - } - - public void setIncludeInactive(boolean includeInactive) { - this.includeInactive = includeInactive; - } - - public LocalDate getDateOfBirthFrom() { - return dateOfBirthFrom; - } - - public void setDateOfBirthFrom(LocalDate dateOfBirthFrom) { - this.dateOfBirthFrom = dateOfBirthFrom; - } + private String login = null; - public LocalDate getDateOfBirthTo() { - return dateOfBirthTo; + public List getAuthority() { + return authority; } - public void setDateOfBirthTo(LocalDate dateOfBirthTo) { - this.dateOfBirthTo = dateOfBirthTo; + public void setAuthority(List authority) { + this.authority = authority; } - public ZonedDateTime getEnrollmentDateFrom() { - return enrollmentDateFrom; + public CriteriaRange getDateOfBirth() { + return dateOfBirth; } - public void setEnrollmentDateFrom(ZonedDateTime enrollmentDateFrom) { - this.enrollmentDateFrom = enrollmentDateFrom; + public void setDateOfBirth(CriteriaRange dateOfBirth) { + this.dateOfBirth = dateOfBirth; } - public ZonedDateTime getEnrollmentDateTo() { - return enrollmentDateTo; + public CriteriaRange getEnrollmentDate() { + return enrollmentDate; } - public void setEnrollmentDateTo(ZonedDateTime enrollmentDateTo) { - this.enrollmentDateTo = enrollmentDateTo; + public void setEnrollmentDate(CriteriaRange enrollmentDate) { + this.enrollmentDate = enrollmentDate; } public String getGroupName() { @@ -82,20 +75,33 @@ public void setHumanReadableIdentifier(String humanReadableIdentifier) { this.humanReadableIdentifier = humanReadableIdentifier; } - public Long getLastLoadedId() { - return lastLoadedId; + public SubjectCriteriaLast getLast() { + return last; } - public void setLastLoadedId(Long lastLoadedId) { - this.lastLoadedId = lastLoadedId; + public void setLast(SubjectCriteriaLast last) { + this.last = last; } - public Integer getPageSize() { - return pageSize; + @NotNull + public Pageable getPageable() { + return PageRequest.of(page, size); + } + + public int getPage() { + return page; + } + + public void setPage(int page) { + this.page = page; + } + + public int getSize() { + return size; } - public void setPageSize(Integer pageSize) { - this.pageSize = pageSize; + public void setSize(int size) { + this.size = size; } public String getPersonName() { @@ -122,27 +128,68 @@ public void setExternalId(String externalId) { this.externalId = externalId; } - public String getSubjectId() { - return subjectId; + public String getLogin() { + return login; } - public void setSubjectId(String subjectId) { - this.subjectId = subjectId; + public void setLogin(String login) { + this.login = login; } - public SubjectSortBy getSortBy() { - return sortBy; + public List getSort() { + return sort; } + public List getParsedSort() { + List parsedSort = new ArrayList<>(sort.size()); + + List flatSort = sort.stream() + .flatMap(s -> Arrays.stream(s.split(","))) + .collect(Collectors.toList()); + + int index = 0; + + while (index < flatSort.size()) { + String part = flatSort.get(index); + SubjectSortBy sortBy = Arrays.stream(SubjectSortBy.values()) + .filter(s -> s.getKey().equalsIgnoreCase(part)) + .findAny() + .orElseThrow(() -> new BadRequestException("Cannot convert sort property " + + part + " to subject property", SUBJECT, ERR_VALIDATION)); + + Optional direction = (index + 1 < flatSort.size()) + ? Sort.Direction.fromOptionalString(flatSort.get(index + 1)) + : Optional.empty(); + + if (direction.isPresent()) { + index += 2; + parsedSort.add(new SubjectSortOrder(sortBy, direction.get())); + } else { + index++; + parsedSort.add(new SubjectSortOrder(sortBy)); + } + } - public void setSortBy(SubjectSortBy sortBy) { - this.sortBy = sortBy; + return parsedSort; } - public SortDirection getSortDirection() { - return sortDirection; + public void setSort(List sort) { + this.sort = sort; } - public void setSortDirection(SortDirection sortDirection) { - this.sortDirection = sortDirection; + @Override + public String toString() { + return "SubjectCriteria{" + "authority=" + authority + + ", dateOfBirth=" + dateOfBirth + + ", enrollmentDate=" + enrollmentDate + + ", groupName='" + groupName + '\'' + + ", humanReadableIdentifier='" + humanReadableIdentifier + '\'' + + ", last=" + last + + ", page=" + page + + ", sort=" + sort + + ", personName='" + personName + '\'' + + ", projectName='" + projectName + '\'' + + ", externalId='" + externalId + '\'' + + ", login='" + login + '\'' + + '}'; } } diff --git a/src/main/java/org/radarbase/management/web/rest/criteria/SubjectCriteriaLast.java b/src/main/java/org/radarbase/management/web/rest/criteria/SubjectCriteriaLast.java new file mode 100644 index 000000000..fde0bd62e --- /dev/null +++ b/src/main/java/org/radarbase/management/web/rest/criteria/SubjectCriteriaLast.java @@ -0,0 +1,49 @@ +/* + * Copyright (c) 2021. The Hyve + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * + * See the file LICENSE in the root of this repository. + */ + +package org.radarbase.management.web.rest.criteria; + +public class SubjectCriteriaLast { + private String id = null; + private String externalId = null; + private String login = null; + private SubjectAuthority authority = null; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getExternalId() { + return externalId; + } + + public void setExternalId(String externalId) { + this.externalId = externalId; + } + + public String getLogin() { + return login; + } + + public void setLogin(String login) { + this.login = login; + } + + public SubjectAuthority getAuthority() { + return authority; + } + + public void setAuthority(SubjectAuthority authority) { + this.authority = authority; + } +} diff --git a/src/main/java/org/radarbase/management/web/rest/criteria/SubjectSortBy.java b/src/main/java/org/radarbase/management/web/rest/criteria/SubjectSortBy.java index c750896fd..e76195ed6 100644 --- a/src/main/java/org/radarbase/management/web/rest/criteria/SubjectSortBy.java +++ b/src/main/java/org/radarbase/management/web/rest/criteria/SubjectSortBy.java @@ -10,18 +10,24 @@ package org.radarbase.management.web.rest.criteria; public enum SubjectSortBy { - ID("id"), - EXTERNAL_ID("externalId"), - USER_LOGIN("user.login"), - USER_ACTIVATED("user.activated"); + ID("id", true), + EXTERNAL_ID("externalId", false), + USER_LOGIN("login", true), + USER_AUTHORITY("authority", false); private final String key; + private final boolean isUnique; - SubjectSortBy(String key) { + SubjectSortBy(String key, boolean isUnique) { this.key = key; + this.isUnique = isUnique; } public String getKey() { return this.key; } + + public boolean isUnique() { + return isUnique; + } } diff --git a/src/main/java/org/radarbase/management/web/rest/criteria/SubjectSortByConverter.java b/src/main/java/org/radarbase/management/web/rest/criteria/SubjectSortByConverter.java deleted file mode 100644 index d6c6ca422..000000000 --- a/src/main/java/org/radarbase/management/web/rest/criteria/SubjectSortByConverter.java +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Copyright (c) 2021. The Hyve - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * - * See the file LICENSE in the root of this repository. - */ - -package org.radarbase.management.web.rest.criteria; - -import org.apache.commons.lang3.StringUtils; -import org.springframework.core.convert.converter.Converter; -import org.springframework.stereotype.Component; - -import javax.annotation.Nullable; - -import static org.radarbase.management.web.rest.criteria.SubjectSortBy.ID; - -@Component -public class SubjectSortByConverter implements Converter { - /** - * Parse sort direction from string. - * - * @param value user provided text - * @return ASC for empty strings, ASC or DESC for corresponding strings, and UNKNOWN - * otherwise. - */ - @Nullable - @Override - public SubjectSortBy convert(@Nullable String value) { - if (StringUtils.isEmpty(value)) { - return ID; - } - for (SubjectSortBy s : SubjectSortBy.values()) { - if (s.getKey().equalsIgnoreCase(value)) { - return s; - } - } - return null; - } -} diff --git a/src/main/java/org/radarbase/management/web/rest/criteria/SubjectSortOrder.java b/src/main/java/org/radarbase/management/web/rest/criteria/SubjectSortOrder.java new file mode 100644 index 000000000..3d840b74d --- /dev/null +++ b/src/main/java/org/radarbase/management/web/rest/criteria/SubjectSortOrder.java @@ -0,0 +1,43 @@ +/* + * Copyright (c) 2021. The Hyve + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * + * See the file LICENSE in the root of this repository. + */ + +package org.radarbase.management.web.rest.criteria; + +import org.springframework.data.domain.Sort; + +import javax.validation.constraints.NotNull; + +public class SubjectSortOrder { + @NotNull + private final Sort.Direction direction; + @NotNull + private final SubjectSortBy sortBy; + + public SubjectSortOrder(SubjectSortBy sortBy, Sort.Direction direction) { + this.direction = direction; + this.sortBy = sortBy; + } + + public SubjectSortOrder(SubjectSortBy sortBy) { + this(sortBy, Sort.Direction.ASC); + } + + public Sort.Direction getDirection() { + return direction; + } + + public SubjectSortBy getSortBy() { + return sortBy; + } + + @Override + public String toString() { + return sortBy.name() + ',' + direction.name(); + } +} diff --git a/src/main/java/org/radarbase/management/web/rest/criteria/SubjectSortOrderConverter.java b/src/main/java/org/radarbase/management/web/rest/criteria/SubjectSortOrderConverter.java new file mode 100644 index 000000000..77e5ef744 --- /dev/null +++ b/src/main/java/org/radarbase/management/web/rest/criteria/SubjectSortOrderConverter.java @@ -0,0 +1,54 @@ +/* + * Copyright (c) 2021. The Hyve + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * + * See the file LICENSE in the root of this repository. + */ + +package org.radarbase.management.web.rest.criteria; + +import org.radarbase.management.web.rest.errors.BadRequestException; +import org.springframework.core.convert.converter.Converter; +import org.springframework.data.domain.Sort; +import org.springframework.stereotype.Component; + +import javax.annotation.Nullable; +import java.util.Arrays; + +import static org.radarbase.management.web.rest.errors.EntityName.SUBJECT; +import static org.radarbase.management.web.rest.errors.ErrorConstants.ERR_VALIDATION; + +@Component +public class SubjectSortOrderConverter implements Converter { + /** + * Parse sort direction from string. + * + * @param value user provided text + * @return ASC for empty strings, ASC or DESC for corresponding strings, and UNKNOWN + * otherwise. + */ + @Override + @Nullable + public SubjectSortOrder convert(@Nullable String value) { + if (value == null || value.isEmpty()) { + return null; + } + + String[] subValues = value.split(":", 2); + + SubjectSortBy sortBy = Arrays.stream(SubjectSortBy.values()) + .filter(s -> s.getKey().equalsIgnoreCase(subValues[0])) + .findAny() + .orElseThrow(() -> new BadRequestException("Cannot convert sort property " + + subValues[0] + " to subject property", SUBJECT, ERR_VALIDATION)); + + if (subValues.length == 2) { + Sort.Direction direction = Sort.Direction.fromString(subValues[1]); + return new SubjectSortOrder(sortBy, direction); + } else { + return new SubjectSortOrder(sortBy); + } + } +} diff --git a/src/main/java/org/radarbase/management/web/rest/util/PaginationUtil.java b/src/main/java/org/radarbase/management/web/rest/util/PaginationUtil.java index e9dc33082..5e721a7e8 100644 --- a/src/main/java/org/radarbase/management/web/rest/util/PaginationUtil.java +++ b/src/main/java/org/radarbase/management/web/rest/util/PaginationUtil.java @@ -1,10 +1,14 @@ package org.radarbase.management.web.rest.util; +import org.radarbase.management.web.rest.criteria.CriteriaRange; import org.radarbase.management.web.rest.criteria.SubjectCriteria; import org.springframework.data.domain.Page; import org.springframework.http.HttpHeaders; import org.springframework.web.util.UriComponentsBuilder; +import javax.annotation.Nullable; +import java.util.Locale; + /** * Utility class for handling pagination. * @@ -68,11 +72,10 @@ public static HttpHeaders generateSubjectPaginationHttpHeaders( ) { HttpHeaders headers = new HttpHeaders(); headers.add("X-Total-Count", Long.toString(page.getTotalElements())); - StringBuilder link = new StringBuilder(256); - link.append('<') - .append(generateUri(baseUrl, criteria)) - .append(">; rel=\"first\""); - headers.add(HttpHeaders.LINK, link.toString()); + String link = '<' + + generateUri(baseUrl, criteria) + + ">; rel=\"first\""; + headers.add(HttpHeaders.LINK, link); return headers; } @@ -84,21 +87,50 @@ private static String generateUri(String baseUrl, int page, int size) { } private static String generateUri(String baseUrl, SubjectCriteria criteria) { - return UriComponentsBuilder.fromUriString(baseUrl) - .queryParam("dateOfBirthFrom", criteria.getDateOfBirthFrom()) - .queryParam("dateOfBirthTo", criteria.getDateOfBirthTo()) - .queryParam("enrollmentDateFrom", criteria.getEnrollmentDateFrom()) - .queryParam("enrollmentDateTo", criteria.getEnrollmentDateTo()) - .queryParam("externalId", criteria.getExternalId()) - .queryParam("groupName", criteria.getGroupName()) - .queryParam("lastLoadedId", criteria.getLastLoadedId()) - .queryParam("pageSize", criteria.getPageSize()) - .queryParam("personName", criteria.getPersonName()) - .queryParam("projectName", criteria.getProjectName()) - .queryParam("sortBy", criteria.getSortBy().getKey()) - .queryParam("sortDirection", criteria.getSortDirection().getKey()) - .queryParam("subjectId", criteria.getSubjectId()) - .queryParam("includeInactive", criteria.isIncludeInactive()) - .toUriString(); + UriComponentsBuilder builder = UriComponentsBuilder.fromUriString(baseUrl); + generateUriCriteriaRange(builder, "dateOfBirth", criteria.getDateOfBirth()); + generateUriCriteriaRange(builder, "enrollmentDate", criteria.getEnrollmentDate()); + generateUriParam(builder, "externalId", criteria.getExternalId()); + generateUriParam(builder, "groupName", criteria.getGroupName()); + generateUriParam(builder, "personName", criteria.getPersonName()); + generateUriParam(builder, "humanReadableIdentifier", + criteria.getHumanReadableIdentifier()); + generateUriParam(builder, "projectName", criteria.getProjectName()); + generateUriParam(builder, "login", criteria.getLogin()); + if (criteria.getAuthority() != null) { + criteria.getAuthority().forEach(a -> generateUriParam(builder, + "authority", a)); + } + generateUriParam(builder, "size", criteria.getSize()); + generateUriParam(builder, "page", criteria.getPage()); + if (criteria.getSort() != null) { + criteria.getParsedSort().forEach(order -> generateUriParam(builder, "sort", + order.getSortBy().getKey() + ',' + + order.getDirection().name().toLowerCase(Locale.ROOT))); + } + if (criteria.getLast() != null) { + generateUriParam(builder, "last.id", criteria.getLast().getId()); + generateUriParam(builder, "last.login", criteria.getLast().getLogin()); + generateUriParam(builder, "last.externalId", criteria.getLast().getExternalId()); + generateUriParam(builder, "last.authority", criteria.getLast().getAuthority()); + } + return builder.toUriString(); + } + + private static void generateUriCriteriaRange(UriComponentsBuilder builder, String prefix, + CriteriaRange range) { + if (range == null) { + return; + } + generateUriParam(builder, prefix + ".is", range.getIs()); + generateUriParam(builder, prefix + ".from", range.getFrom()); + generateUriParam(builder, prefix + ".to", range.getTo()); + } + + private static void generateUriParam(UriComponentsBuilder builder, String name, + @Nullable Object value) { + if (value != null) { + builder.queryParam(name, value); + } } } diff --git a/src/main/webapp/app/entities/project/project-dialog.component.ts b/src/main/webapp/app/entities/project/project-dialog.component.ts index 92b170a78..88f8553e1 100644 --- a/src/main/webapp/app/entities/project/project-dialog.component.ts +++ b/src/main/webapp/app/entities/project/project-dialog.component.ts @@ -10,7 +10,7 @@ import { EventManager } from '../../shared/util/event-manager.service'; import { SourceType, SourceTypeService } from '../source-type'; import { ProjectPopupService } from './project-popup.service'; -import { Project, ProjectService } from '../../shared/project'; +import { GroupService, Project, ProjectService } from '../../shared'; import { HttpErrorResponse, HttpResponse } from '@angular/common/http'; @Component({ @@ -63,6 +63,7 @@ export class ProjectDialogComponent implements OnInit { private projectService: ProjectService, private sourceTypeService: SourceTypeService, private eventManager: EventManager, + private groupService: GroupService, ) { this.isSaving = false; this.authorities = ['ROLE_USER', 'ROLE_SYS_ADMIN', 'ROLE_PROJECT_ADMIN']; @@ -134,19 +135,35 @@ export class ProjectDialogComponent implements OnInit { } addGroup() { - // TODO implement group name validation let currentGroups = this.project.groups || []; let newGroup = { name: this.newGroupInputText }; - // TODO actually perform the group POST resource - this.project.groups = [ ...currentGroups, newGroup ]; - this.newGroupInputText = ''; + if (newGroup.name.length == 0 || newGroup.name.length > 50) { + // TODO: actually show error + return; + } + if (currentGroups.some(g => g.name === newGroup.name)) { + // TODO: actually show error + return; + } + this.groupService.create(this.project.projectName, newGroup).toPromise() + .then(g => { + this.project.groups = [ ...currentGroups, g]; + this.newGroupInputText = ''; + }) + .catch(reason => { + // TODO: actually show error + }) } removeGroup(groupName: string) { - // TODO warn that this may affect existing subjects - let oldGroups = this.project.groups; - // TODO: actually perform group DELETE resource - this.project.groups = oldGroups.filter(g => g.name !== groupName); + // TODO: warn that this may affect existing subjects + this.groupService.delete(this.project.projectName, groupName).toPromise() + .then(() => { + this.project.groups = this.project.groups.filter(g => g.name !== groupName); + }) + .catch(() => { + // TODO: actually show error + }); } } diff --git a/src/main/webapp/app/shared/group/group.model.ts b/src/main/webapp/app/shared/group/group.model.ts new file mode 100644 index 000000000..2ea6f5136 --- /dev/null +++ b/src/main/webapp/app/shared/group/group.model.ts @@ -0,0 +1,5 @@ +export class Group { + public id?: number; + public name: string; + public projectId?: number; +} diff --git a/src/main/webapp/app/shared/group/group.service.ts b/src/main/webapp/app/shared/group/group.service.ts new file mode 100644 index 000000000..3d5a0bd72 --- /dev/null +++ b/src/main/webapp/app/shared/group/group.service.ts @@ -0,0 +1,31 @@ +import { Injectable } from '@angular/core'; +import { HttpClient } from '@angular/common/http'; +import { Observable } from 'rxjs'; +import { Group } from "./group.model"; + +@Injectable({ providedIn: 'root' }) +export class GroupService { + constructor(private http: HttpClient) { + } + + private resourceUrl(projectName: string, groupName?: string): string { + let url = 'api/projects/' + encodeURIComponent(projectName) + '/groups'; + if (groupName) { + url += '/' + encodeURIComponent(groupName); + } + return url; + } + + list(projectName: string): Observable { + return this.http.get(this.resourceUrl(projectName)); + } + + create(projectName: string, group: Group): Observable { + const copy: Group = Object.assign({}, group); + return this.http.post(this.resourceUrl(projectName), copy); + } + + delete(projectName: string, groupName: string): Observable { + return this.http.delete(this.resourceUrl(projectName, groupName)); + } +} diff --git a/src/main/webapp/app/shared/group/index.ts b/src/main/webapp/app/shared/group/index.ts new file mode 100644 index 000000000..3b3687e59 --- /dev/null +++ b/src/main/webapp/app/shared/group/index.ts @@ -0,0 +1,2 @@ +export * from './group.model'; +export * from './group.service'; diff --git a/src/main/webapp/app/shared/index.ts b/src/main/webapp/app/shared/index.ts index e4c61e013..ec51b60c7 100644 --- a/src/main/webapp/app/shared/index.ts +++ b/src/main/webapp/app/shared/index.ts @@ -23,3 +23,4 @@ export * from './shared-common.module'; export * from './shared.module'; export * from './auth/user-route-access-service'; export * from './project'; +export * from './group'; diff --git a/src/main/webapp/app/shared/project/project.model.ts b/src/main/webapp/app/shared/project/project.model.ts index 3d2b2b590..9c25763fc 100644 --- a/src/main/webapp/app/shared/project/project.model.ts +++ b/src/main/webapp/app/shared/project/project.model.ts @@ -1,5 +1,5 @@ import {SourceType} from '../../entities/source-type'; -import { Group } from '../subject'; +import { Group } from '../group'; export const enum ProjectStatus { 'PLANNING', diff --git a/src/main/webapp/app/shared/subject/subject.model.ts b/src/main/webapp/app/shared/subject/subject.model.ts index a3042460d..4eae77c66 100644 --- a/src/main/webapp/app/shared/subject/subject.model.ts +++ b/src/main/webapp/app/shared/subject/subject.model.ts @@ -68,8 +68,3 @@ export const enum SubjectStatus { 'DISCONTINUED', 'INVALID' } - -export class Group { - public id?: any; - public name?: string; -} From f6c1142d968b11322cbf1a6749d0711a0e7a9aed Mon Sep 17 00:00:00 2001 From: Joris Borgdorff Date: Wed, 20 Oct 2021 09:50:36 +0200 Subject: [PATCH 063/431] Update subject.json --- src/main/webapp/i18n/en/subject.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/webapp/i18n/en/subject.json b/src/main/webapp/i18n/en/subject.json index 9313d07c5..862ee6179 100644 --- a/src/main/webapp/i18n/en/subject.json +++ b/src/main/webapp/i18n/en/subject.json @@ -80,8 +80,8 @@ "user.login": "Subject Id", "externalId": "External Id", "user.activated": "Status", - "asc": "Ascendant", - "desc": "Descendant" + "asc": "Ascending", + "desc": "Descending" }, "subjectId" : "Subject Id", "baseUrl" : "Base Url", From 674347e982112bddf853e94fe1a1e874465b5b22 Mon Sep 17 00:00:00 2001 From: Joris Borgdorff Date: Wed, 20 Oct 2021 11:19:56 +0200 Subject: [PATCH 064/431] Fix language file --- src/main/webapp/i18n/nl/subject.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/main/webapp/i18n/nl/subject.json b/src/main/webapp/i18n/nl/subject.json index 3d2fcaafc..7a9917daa 100644 --- a/src/main/webapp/i18n/nl/subject.json +++ b/src/main/webapp/i18n/nl/subject.json @@ -18,7 +18,10 @@ }, "filter": { "title": "Filter", - "applyButton": "Filter toepassen" + "applyButton": "Filter toepassen", + "dateOfBirthFrom": "Geboortedatum vanaf", + "dateOfBirthTo": "Geboortedatum tot", + "advancedFilter": "Uitgebreid filter" }, "login": "Login", "email": "Email", From f38fca3de0fd4c616df5e92cdc138ffc7151f691 Mon Sep 17 00:00:00 2001 From: Joris Borgdorff Date: Wed, 20 Oct 2021 11:22:00 +0200 Subject: [PATCH 065/431] Simplify sorting and fix date generics --- .../config/DateTimeFormatConfiguration.java | 42 +++++++- .../filters/SubjectSpecification.java | 47 +------- .../management/service/SubjectService.java | 3 +- .../rest/criteria/LocalDateCriteriaRange.java | 15 +++ .../web/rest/criteria/SubjectCriteria.java | 100 ++++++++++++------ .../web/rest/criteria/SubjectSortBy.java | 27 +++-- .../criteria/SubjectSortOrderConverter.java | 54 ---------- .../criteria/ZonedDateTimeCriteriaRange.java | 15 +++ .../web/rest/util/PaginationUtil.java | 2 +- .../webapp/CheckTranslationsUnitTest.java | 22 ++-- 10 files changed, 168 insertions(+), 159 deletions(-) create mode 100644 src/main/java/org/radarbase/management/web/rest/criteria/LocalDateCriteriaRange.java delete mode 100644 src/main/java/org/radarbase/management/web/rest/criteria/SubjectSortOrderConverter.java create mode 100644 src/main/java/org/radarbase/management/web/rest/criteria/ZonedDateTimeCriteriaRange.java diff --git a/src/main/java/org/radarbase/management/config/DateTimeFormatConfiguration.java b/src/main/java/org/radarbase/management/config/DateTimeFormatConfiguration.java index df24e259a..e8f2996a6 100644 --- a/src/main/java/org/radarbase/management/config/DateTimeFormatConfiguration.java +++ b/src/main/java/org/radarbase/management/config/DateTimeFormatConfiguration.java @@ -3,15 +3,51 @@ import org.springframework.context.annotation.Configuration; import org.springframework.format.FormatterRegistry; import org.springframework.format.datetime.standard.DateTimeFormatterRegistrar; -import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter; +import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; + +import javax.annotation.Nonnull; +import java.time.ZoneId; +import java.time.format.DateTimeFormatter; +import java.time.format.DateTimeFormatterBuilder; +import java.time.format.ResolverStyle; + +import static java.time.temporal.ChronoField.HOUR_OF_DAY; +import static java.time.temporal.ChronoField.MINUTE_OF_HOUR; +import static java.time.temporal.ChronoField.NANO_OF_SECOND; +import static java.time.temporal.ChronoField.SECOND_OF_MINUTE; @Configuration -public class DateTimeFormatConfiguration extends WebMvcConfigurerAdapter { +public class DateTimeFormatConfiguration implements WebMvcConfigurer { @Override - public void addFormatters(FormatterRegistry registry) { + public void addFormatters(@Nonnull FormatterRegistry registry) { DateTimeFormatterRegistrar registrar = new DateTimeFormatterRegistrar(); registrar.setUseIsoFormat(true); + registrar.setDateTimeFormatter(new DateTimeFormatterBuilder() + .parseCaseInsensitive() + .append(DateTimeFormatter.ISO_LOCAL_DATE) + .optionalStart() + .appendLiteral('T') + .append(DateTimeFormatter.ISO_LOCAL_TIME) + .optionalStart() + .parseLenient() + .appendOffsetId() + .parseStrict() + .optionalEnd() + .optionalStart() + .appendLiteral('[') + .parseCaseSensitive() + .appendZoneRegionId() + .appendLiteral(']') + .optionalEnd() + .optionalEnd() + .parseDefaulting(HOUR_OF_DAY, HOUR_OF_DAY.range().getMinimum()) + .parseDefaulting(MINUTE_OF_HOUR, MINUTE_OF_HOUR.range().getMinimum()) + .parseDefaulting(SECOND_OF_MINUTE, SECOND_OF_MINUTE.range().getMinimum()) + .parseDefaulting(NANO_OF_SECOND, NANO_OF_SECOND.range().getMinimum()) + .toFormatter() + .withZone(ZoneId.of("UTC")) + .withResolverStyle(ResolverStyle.LENIENT)); registrar.registerFormatters(registry); } } diff --git a/src/main/java/org/radarbase/management/repository/filters/SubjectSpecification.java b/src/main/java/org/radarbase/management/repository/filters/SubjectSpecification.java index a7685ef41..01289d258 100644 --- a/src/main/java/org/radarbase/management/repository/filters/SubjectSpecification.java +++ b/src/main/java/org/radarbase/management/repository/filters/SubjectSpecification.java @@ -18,7 +18,6 @@ import javax.persistence.criteria.Join; import javax.persistence.criteria.JoinType; import javax.persistence.criteria.MapJoin; -import javax.persistence.criteria.Order; import javax.persistence.criteria.Path; import javax.persistence.criteria.Predicate; import javax.persistence.criteria.Root; @@ -60,35 +59,12 @@ public SubjectSpecification(SubjectCriteria criteria) { this.projectName = criteria.getProjectName(); this.externalId = criteria.getExternalId(); this.subjectId = criteria.getLogin(); - if (criteria.getSort() != null) { - List sortInput = new ArrayList<>(criteria.getParsedSort()); - int uniqueSort = -1; - for (int i = 0; i < sortInput.size(); i++) { - SubjectSortBy sortProperty = sortInput.get(i).getSortBy(); - if (last != null) { - getLastValue(sortProperty); - } - if (sortProperty.isUnique()) { - uniqueSort = i; - break; - } - } - if (uniqueSort != -1) { - this.sort = sortInput.subList(0, uniqueSort + 1); - } else { - if (last != null) { - getLastValue(SubjectSortBy.ID); - } - sortInput.add(new SubjectSortOrder(SubjectSortBy.ID)); - this.sort = sortInput; - } - } else { - if (last != null) { - getLastValue(SubjectSortBy.ID); + this.sort = criteria.getParsedSort(); + if (last != null) { + for (SubjectSortOrder subjectSortOrder : this.sort) { + getLastValue(subjectSortOrder.getSortBy()); } - this.sort = List.of(new SubjectSortOrder(SubjectSortBy.ID)); } - } @Override @@ -134,8 +110,6 @@ public Predicate toPredicate(@Nullable Root root, @Nullable CriteriaQue addContentPredicates(root, builder, query.getResultType(), predicates); - query.orderBy(getSortOrder(root, builder)); - return builder.and(predicates.toArray(new Predicate[0])); } @@ -265,17 +239,4 @@ private > void addCriteriaRangePredicates( } } } - - private List getSortOrder(Root root, CriteriaBuilder builder) { - return sort.stream() - .map(order -> { - Path path = getPropertyPath(order.getSortBy(), root); - if (order.getDirection().isAscending()) { - return builder.asc(path); - } else { - return builder.desc(path); - } - }) - .collect(Collectors.toList()); - } } diff --git a/src/main/java/org/radarbase/management/service/SubjectService.java b/src/main/java/org/radarbase/management/service/SubjectService.java index 3c38d6d01..e6794a18b 100644 --- a/src/main/java/org/radarbase/management/service/SubjectService.java +++ b/src/main/java/org/radarbase/management/service/SubjectService.java @@ -487,7 +487,8 @@ public Page findAll(SubjectCriteria criteria) { // but the page should always be zero // since the lastLoadedId param defines the offset // within the query specification - return subjectRepository.findAll(new SubjectSpecification(criteria), criteria.getPageable()); + return subjectRepository.findAll(new SubjectSpecification(criteria), + criteria.getPageable()); } /** diff --git a/src/main/java/org/radarbase/management/web/rest/criteria/LocalDateCriteriaRange.java b/src/main/java/org/radarbase/management/web/rest/criteria/LocalDateCriteriaRange.java new file mode 100644 index 000000000..ca032efef --- /dev/null +++ b/src/main/java/org/radarbase/management/web/rest/criteria/LocalDateCriteriaRange.java @@ -0,0 +1,15 @@ +/* + * Copyright (c) 2021. The Hyve + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * + * See the file LICENSE in the root of this repository. + */ + +package org.radarbase.management.web.rest.criteria; + +import java.time.LocalDate; + +public class LocalDateCriteriaRange extends CriteriaRange { +} diff --git a/src/main/java/org/radarbase/management/web/rest/criteria/SubjectCriteria.java b/src/main/java/org/radarbase/management/web/rest/criteria/SubjectCriteria.java index 2e75a98d5..735e191a5 100644 --- a/src/main/java/org/radarbase/management/web/rest/criteria/SubjectCriteria.java +++ b/src/main/java/org/radarbase/management/web/rest/criteria/SubjectCriteria.java @@ -1,6 +1,7 @@ package org.radarbase.management.web.rest.criteria; import org.radarbase.management.web.rest.errors.BadRequestException; +import org.springframework.data.annotation.Transient; import org.springframework.data.domain.PageRequest; import org.springframework.data.domain.Pageable; import org.springframework.data.domain.Sort; @@ -11,6 +12,7 @@ import java.time.ZonedDateTime; import java.util.ArrayList; import java.util.Arrays; +import java.util.Collections; import java.util.List; import java.util.Optional; import java.util.stream.Collectors; @@ -20,8 +22,8 @@ public class SubjectCriteria { private List authority = List.of(SubjectAuthority.ROLE_PARTICIPANT); - private CriteriaRange dateOfBirth = null; - private CriteriaRange enrollmentDate = null; + private LocalDateCriteriaRange dateOfBirth = null; + private ZonedDateTimeCriteriaRange enrollmentDate = null; private String groupName = null; private String humanReadableIdentifier = null; private SubjectCriteriaLast last = null; @@ -35,6 +37,9 @@ public class SubjectCriteria { private String externalId = null; private String login = null; + @Transient + private List parsedSort = null; + public List getAuthority() { return authority; } @@ -47,7 +52,7 @@ public CriteriaRange getDateOfBirth() { return dateOfBirth; } - public void setDateOfBirth(CriteriaRange dateOfBirth) { + public void setDateOfBirth(LocalDateCriteriaRange dateOfBirth) { this.dateOfBirth = dateOfBirth; } @@ -55,7 +60,7 @@ public CriteriaRange getEnrollmentDate() { return enrollmentDate; } - public void setEnrollmentDate(CriteriaRange enrollmentDate) { + public void setEnrollmentDate(ZonedDateTimeCriteriaRange enrollmentDate) { this.enrollmentDate = enrollmentDate; } @@ -83,9 +88,16 @@ public void setLast(SubjectCriteriaLast last) { this.last = last; } + /** Get the criteria paging settings, including sorting. */ @NotNull public Pageable getPageable() { - return PageRequest.of(page, size); + Sort sort = Sort.unsorted(); + + for (SubjectSortOrder order : getParsedSort()) { + sort = sort.and(Sort.by(order.getDirection(), order.getSortBy().getDbField())); + } + + return PageRequest.of(page, size, sort); } public int getPage() { @@ -139,40 +151,64 @@ public void setLogin(String login) { public List getSort() { return sort; } - public List getParsedSort() { - List parsedSort = new ArrayList<>(sort.size()); - - List flatSort = sort.stream() - .flatMap(s -> Arrays.stream(s.split(","))) - .collect(Collectors.toList()); - - int index = 0; - while (index < flatSort.size()) { - String part = flatSort.get(index); - SubjectSortBy sortBy = Arrays.stream(SubjectSortBy.values()) - .filter(s -> s.getKey().equalsIgnoreCase(part)) - .findAny() - .orElseThrow(() -> new BadRequestException("Cannot convert sort property " - + part + " to subject property", SUBJECT, ERR_VALIDATION)); - - Optional direction = (index + 1 < flatSort.size()) - ? Sort.Direction.fromOptionalString(flatSort.get(index + 1)) - : Optional.empty(); - - if (direction.isPresent()) { - index += 2; - parsedSort.add(new SubjectSortOrder(sortBy, direction.get())); + /** Parse the sort criteria. */ + public List getParsedSort() { + if (this.parsedSort == null) { + boolean hasUniqueField = false; + List parsedSort; + + if (sort != null) { + parsedSort = new ArrayList<>(sort.size()); + + List flatSort = sort.stream() + .flatMap(s -> Arrays.stream(s.split(","))) + .collect(Collectors.toList()); + + int index = 0; + + while (index < flatSort.size()) { + String part = flatSort.get(index); + SubjectSortBy sortBy = Arrays.stream(SubjectSortBy.values()) + .filter(s -> s.getQueryParam().equalsIgnoreCase(part)) + .findAny() + .orElseThrow(() -> new BadRequestException( + "Cannot convert sort property " + part + + " to subject property", SUBJECT, ERR_VALIDATION)); + + Optional direction = (index + 1 < flatSort.size()) + ? Sort.Direction.fromOptionalString(flatSort.get(index + 1)) + : Optional.empty(); + + if (direction.isPresent()) { + index += 2; + parsedSort.add(new SubjectSortOrder(sortBy, direction.get())); + } else { + index++; + parsedSort.add(new SubjectSortOrder(sortBy)); + } + // No need to sort beyond a unique element: the order will not change. + if (sortBy.isUnique()) { + hasUniqueField = true; + break; + } + } } else { - index++; - parsedSort.add(new SubjectSortOrder(sortBy)); + parsedSort = new ArrayList<>(1); } - } - return parsedSort; + // Ensure that the result has a fully defined order. + if (!hasUniqueField) { + parsedSort.add(new SubjectSortOrder(SubjectSortBy.ID)); + } + + this.parsedSort = Collections.unmodifiableList(parsedSort); + } + return this.parsedSort; } public void setSort(List sort) { + this.parsedSort = null; this.sort = sort; } diff --git a/src/main/java/org/radarbase/management/web/rest/criteria/SubjectSortBy.java b/src/main/java/org/radarbase/management/web/rest/criteria/SubjectSortBy.java index e76195ed6..3964fcc7a 100644 --- a/src/main/java/org/radarbase/management/web/rest/criteria/SubjectSortBy.java +++ b/src/main/java/org/radarbase/management/web/rest/criteria/SubjectSortBy.java @@ -10,23 +10,32 @@ package org.radarbase.management.web.rest.criteria; public enum SubjectSortBy { - ID("id", true), - EXTERNAL_ID("externalId", false), - USER_LOGIN("login", true), - USER_AUTHORITY("authority", false); + ID("id", "id", true), + EXTERNAL_ID("externalId", "externalId", false), + USER_LOGIN("login", "user.login", true), + USER_AUTHORITY("authority", "user.authority.name", false); - private final String key; + private final String queryParam; + private final String dbField; private final boolean isUnique; - SubjectSortBy(String key, boolean isUnique) { - this.key = key; + SubjectSortBy(String queryParam, String dbField, boolean isUnique) { + this.queryParam = queryParam; + this.dbField = dbField; this.isUnique = isUnique; } - public String getKey() { - return this.key; + /** Query parameter name. */ + public String getQueryParam() { + return this.queryParam; } + /** Database field relative to the Subject entity. */ + public String getDbField() { + return dbField; + } + + /** Whether this property is unique across all subjects. */ public boolean isUnique() { return isUnique; } diff --git a/src/main/java/org/radarbase/management/web/rest/criteria/SubjectSortOrderConverter.java b/src/main/java/org/radarbase/management/web/rest/criteria/SubjectSortOrderConverter.java deleted file mode 100644 index 77e5ef744..000000000 --- a/src/main/java/org/radarbase/management/web/rest/criteria/SubjectSortOrderConverter.java +++ /dev/null @@ -1,54 +0,0 @@ -/* - * Copyright (c) 2021. The Hyve - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * - * See the file LICENSE in the root of this repository. - */ - -package org.radarbase.management.web.rest.criteria; - -import org.radarbase.management.web.rest.errors.BadRequestException; -import org.springframework.core.convert.converter.Converter; -import org.springframework.data.domain.Sort; -import org.springframework.stereotype.Component; - -import javax.annotation.Nullable; -import java.util.Arrays; - -import static org.radarbase.management.web.rest.errors.EntityName.SUBJECT; -import static org.radarbase.management.web.rest.errors.ErrorConstants.ERR_VALIDATION; - -@Component -public class SubjectSortOrderConverter implements Converter { - /** - * Parse sort direction from string. - * - * @param value user provided text - * @return ASC for empty strings, ASC or DESC for corresponding strings, and UNKNOWN - * otherwise. - */ - @Override - @Nullable - public SubjectSortOrder convert(@Nullable String value) { - if (value == null || value.isEmpty()) { - return null; - } - - String[] subValues = value.split(":", 2); - - SubjectSortBy sortBy = Arrays.stream(SubjectSortBy.values()) - .filter(s -> s.getKey().equalsIgnoreCase(subValues[0])) - .findAny() - .orElseThrow(() -> new BadRequestException("Cannot convert sort property " - + subValues[0] + " to subject property", SUBJECT, ERR_VALIDATION)); - - if (subValues.length == 2) { - Sort.Direction direction = Sort.Direction.fromString(subValues[1]); - return new SubjectSortOrder(sortBy, direction); - } else { - return new SubjectSortOrder(sortBy); - } - } -} diff --git a/src/main/java/org/radarbase/management/web/rest/criteria/ZonedDateTimeCriteriaRange.java b/src/main/java/org/radarbase/management/web/rest/criteria/ZonedDateTimeCriteriaRange.java new file mode 100644 index 000000000..33275bec6 --- /dev/null +++ b/src/main/java/org/radarbase/management/web/rest/criteria/ZonedDateTimeCriteriaRange.java @@ -0,0 +1,15 @@ +/* + * Copyright (c) 2021. The Hyve + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * + * See the file LICENSE in the root of this repository. + */ + +package org.radarbase.management.web.rest.criteria; + +import java.time.ZonedDateTime; + +public class ZonedDateTimeCriteriaRange extends CriteriaRange { +} diff --git a/src/main/java/org/radarbase/management/web/rest/util/PaginationUtil.java b/src/main/java/org/radarbase/management/web/rest/util/PaginationUtil.java index 5e721a7e8..f8cb743b5 100644 --- a/src/main/java/org/radarbase/management/web/rest/util/PaginationUtil.java +++ b/src/main/java/org/radarbase/management/web/rest/util/PaginationUtil.java @@ -105,7 +105,7 @@ private static String generateUri(String baseUrl, SubjectCriteria criteria) { generateUriParam(builder, "page", criteria.getPage()); if (criteria.getSort() != null) { criteria.getParsedSort().forEach(order -> generateUriParam(builder, "sort", - order.getSortBy().getKey() + ',' + order.getSortBy().getQueryParam() + ',' + order.getDirection().name().toLowerCase(Locale.ROOT))); } if (criteria.getLast() != null) { diff --git a/src/test/java/org/radarbase/management/webapp/CheckTranslationsUnitTest.java b/src/test/java/org/radarbase/management/webapp/CheckTranslationsUnitTest.java index 53b72549d..39f198525 100644 --- a/src/test/java/org/radarbase/management/webapp/CheckTranslationsUnitTest.java +++ b/src/test/java/org/radarbase/management/webapp/CheckTranslationsUnitTest.java @@ -19,8 +19,8 @@ import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; + +import static org.junit.jupiter.api.Assertions.assertEquals; /** * Test class for checking that the i18n JSON files in all languages have the same fields. This @@ -31,14 +31,11 @@ class CheckTranslationsUnitTest { private static final String PATH = "src/main/webapp/i18n"; private static final String BASE_LANG = "en"; - private static File baseLangPath; private static Map> baseDictionary; - private static final Logger log = LoggerFactory.getLogger(CheckTranslationsUnitTest.class); - @BeforeAll public static void loadBaseDictionary() { - baseLangPath = new File(PATH, BASE_LANG); + File baseLangPath = new File(PATH, BASE_LANG); baseDictionary = loadJsonKeysFromDirectory(baseLangPath); } @@ -55,17 +52,10 @@ void testLanguages() { .stream() .collect(Collectors.toMap( e -> String.join("/", path.getName(), e.getKey()), - e -> e.getValue()))); + Map.Entry::getValue))); }); - // If there were missing elements, first print out all of them and only then fail the - // test, so we can fix all translations at once. - if (!differencesFound.isEmpty()) { - for (String key : differencesFound.keySet()) { - log.error("Missing translations in {}: {}", key, - String.join(", ", differencesFound.get(key))); - } - Assertions.fail("There were missing keys in some of the translations."); - } + assertEquals(Map.of(), differencesFound, + "There were missing keys in some of the translations."); } /** From e8236e7a8dffb9edcd130c5972b8addc5c7699ee Mon Sep 17 00:00:00 2001 From: Joris Borgdorff Date: Wed, 20 Oct 2021 11:31:48 +0200 Subject: [PATCH 066/431] Fix translations references --- src/main/webapp/app/shared/subject/subject.component.html | 8 ++++---- src/main/webapp/i18n/en/subject.json | 4 ++-- src/main/webapp/i18n/nl/subject.json | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/main/webapp/app/shared/subject/subject.component.html b/src/main/webapp/app/shared/subject/subject.component.html index 173eb7da6..aa67a7c18 100644 --- a/src/main/webapp/app/shared/subject/subject.component.html +++ b/src/main/webapp/app/shared/subject/subject.component.html @@ -34,13 +34,13 @@

    @@ -52,13 +52,13 @@

    diff --git a/src/main/webapp/i18n/en/subject.json b/src/main/webapp/i18n/en/subject.json index 862ee6179..4fdb7798d 100644 --- a/src/main/webapp/i18n/en/subject.json +++ b/src/main/webapp/i18n/en/subject.json @@ -20,8 +20,8 @@ "title": "Filter", "applyButton": "Apply filter", "advancedFilter": "Advanced Filter", - "dateOfBirthFrom": "From", - "dateOfBirthTo": "To" + "from": "From", + "to": "To" }, "login": "Login", "email": "Email", diff --git a/src/main/webapp/i18n/nl/subject.json b/src/main/webapp/i18n/nl/subject.json index 7a9917daa..f4db8ff30 100644 --- a/src/main/webapp/i18n/nl/subject.json +++ b/src/main/webapp/i18n/nl/subject.json @@ -19,8 +19,8 @@ "filter": { "title": "Filter", "applyButton": "Filter toepassen", - "dateOfBirthFrom": "Geboortedatum vanaf", - "dateOfBirthTo": "Geboortedatum tot", + "from": "Vanaf", + "to": "Tot en met", "advancedFilter": "Uitgebreid filter" }, "login": "Login", From 42a1b15634f5618fb594d57dcedaa2a91a7bc4a0 Mon Sep 17 00:00:00 2001 From: Joris Borgdorff Date: Wed, 20 Oct 2021 11:54:35 +0200 Subject: [PATCH 067/431] Fix filtering --- .../app/shared/subject/subject.component.html | 15 ++----- .../app/shared/subject/subject.component.ts | 41 +++++++++++-------- 2 files changed, 29 insertions(+), 27 deletions(-) diff --git a/src/main/webapp/app/shared/subject/subject.component.html b/src/main/webapp/app/shared/subject/subject.component.html index aa67a7c18..b31f39f92 100644 --- a/src/main/webapp/app/shared/subject/subject.component.html +++ b/src/main/webapp/app/shared/subject/subject.component.html @@ -37,31 +37,24 @@

    - +
    - +
    - -
    - -
    -
    - +
    diff --git a/src/main/webapp/app/shared/subject/subject.component.ts b/src/main/webapp/app/shared/subject/subject.component.ts index 04db9ac8d..43a33a3cf 100644 --- a/src/main/webapp/app/shared/subject/subject.component.ts +++ b/src/main/webapp/app/shared/subject/subject.component.ts @@ -55,13 +55,10 @@ export class SubjectComponent implements OnInit, OnDestroy, OnChanges { filterSubjectExternalId = ''; filterSubjectId = ''; filterSubjectHumanReadableId = ''; - filterDateOfBirthFrom = ''; - filterDateOfBirthTo = ''; + filterDateOfBirth = ''; filterPersonName = ''; filterEnrollmentDateFrom = ''; filterEnrollmentDateTo = ''; - filterCreatedDateFrom = ''; - filterCreatedDateTo = ''; isAdvancedFilterCollapsed = true; @@ -162,18 +159,30 @@ export class SubjectComponent implements OnInit, OnDestroy, OnChanges { } get queryFilterParams(): SubjectFilterParams { - return { - subjectId: this.filterSubjectId.trim() || undefined, + const params = { + login: this.filterSubjectId.trim() || undefined, externalId: this.filterSubjectExternalId.trim() || undefined, personName: this.filterPersonName.trim() || undefined, humanReadableId: this.filterSubjectHumanReadableId.trim() || undefined, - dateOfBirthFrom: this.filterDateOfBirthFrom.trim() || undefined, - dateOfBirthTo: this.filterDateOfBirthTo.trim() || undefined, - enrollmentDateFrom: this.filterEnrollmentDateFrom.trim() || undefined, - enrollmentDateTo: this.filterEnrollmentDateTo.trim() || undefined, - createdDateFrom: this.filterCreatedDateFrom.trim() || undefined, - createdDateTo: this.filterCreatedDateTo.trim() || undefined, + dateOfBirth: undefined, + enrollmentDate: undefined, }; + let enrollmentDateFrom = this.filterEnrollmentDateFrom.trim(); + let enrollmentDateTo = this.filterEnrollmentDateTo.trim(); + if (enrollmentDateFrom || enrollmentDateTo) { + const timeZone = Intl.DateTimeFormat().resolvedOptions().timeZone; + params.enrollmentDate = { + from: enrollmentDateFrom ? enrollmentDateFrom + '[' + timeZone + ']' : undefined, + to: enrollmentDateTo ? enrollmentDateTo + '[' + timeZone + ']' : undefined, + }; + } + if (this.filterDateOfBirth) { + params.dateOfBirth = { + is: this.filterDateOfBirth, + }; + } + + return params; } get queryPaginationParams(): SubjectsPaginationParams { @@ -253,15 +262,15 @@ export class SubjectComponent implements OnInit, OnDestroy, OnChanges { } transition() { - if (!this.isProjectSpecific) { + if (this.isProjectSpecific) { + this.loadSubjects(); + } else { this.router.navigate(['/subject'], { queryParams: { page: this.page, sort: this.predicate + ',' + (this.ascending ? 'asc' : 'desc'), }, - }); + }).then(() => this.loadSubjects()); } - this.loadSubjects(); } - } From bb7eb4766d40462698c77b23262990ee2f47a64a Mon Sep 17 00:00:00 2001 From: Joris Borgdorff Date: Wed, 20 Oct 2021 14:31:06 +0200 Subject: [PATCH 068/431] Remove broken sort on authority name --- .../filters/SubjectSpecification.java | 51 +++++++++++++------ .../web/rest/criteria/SubjectCriteria.java | 26 +++++----- .../web/rest/criteria/SubjectSortBy.java | 16 ++---- .../app/shared/subject/subject.component.ts | 33 +++++++----- .../app/shared/subject/subject.service.ts | 36 +++++++------ .../app/shared/util/parse-links-util.ts | 6 +-- src/main/webapp/i18n/en/subject.json | 4 +- 7 files changed, 98 insertions(+), 74 deletions(-) diff --git a/src/main/java/org/radarbase/management/repository/filters/SubjectSpecification.java b/src/main/java/org/radarbase/management/repository/filters/SubjectSpecification.java index 01289d258..1817cbec3 100644 --- a/src/main/java/org/radarbase/management/repository/filters/SubjectSpecification.java +++ b/src/main/java/org/radarbase/management/repository/filters/SubjectSpecification.java @@ -10,6 +10,7 @@ import org.radarbase.management.web.rest.criteria.SubjectCriteriaLast; import org.radarbase.management.web.rest.criteria.SubjectSortBy; import org.radarbase.management.web.rest.criteria.SubjectSortOrder; +import org.radarbase.management.web.rest.errors.BadRequestException; import org.springframework.data.jpa.domain.Specification; import javax.annotation.Nullable; @@ -18,6 +19,7 @@ import javax.persistence.criteria.Join; import javax.persistence.criteria.JoinType; import javax.persistence.criteria.MapJoin; +import javax.persistence.criteria.Order; import javax.persistence.criteria.Path; import javax.persistence.criteria.Predicate; import javax.persistence.criteria.Root; @@ -29,6 +31,9 @@ import java.util.Set; import java.util.stream.Collectors; +import static org.radarbase.management.web.rest.errors.EntityName.SUBJECT; +import static org.radarbase.management.web.rest.errors.ErrorConstants.ERR_VALIDATION; + public class SubjectSpecification implements Specification { private final CriteriaRange dateOfBirth; private final CriteriaRange enrollmentDate; @@ -41,6 +46,7 @@ public class SubjectSpecification implements Specification { private final String subjectId; private final List sort; private final Set authority; + private final List sortLastValues; /** * Subject specification based on criteria. @@ -61,9 +67,11 @@ public SubjectSpecification(SubjectCriteria criteria) { this.subjectId = criteria.getLogin(); this.sort = criteria.getParsedSort(); if (last != null) { - for (SubjectSortOrder subjectSortOrder : this.sort) { - getLastValue(subjectSortOrder.getSortBy()); - } + this.sortLastValues = this.sort.stream() + .map(o -> getLastValue(o.getSortBy())) + .collect(Collectors.toList()); + } else { + this.sortLastValues = null; } } @@ -110,16 +118,19 @@ public Predicate toPredicate(@Nullable Root root, @Nullable CriteriaQue addContentPredicates(root, builder, query.getResultType(), predicates); + query.orderBy(getSortOrder(root, builder)); + return builder.and(predicates.toArray(new Predicate[0])); } private void addContentPredicates(Root root, CriteriaBuilder builder, Class queryResult, List predicates) { + // Don't add content for count queries. if (queryResult == Long.class || queryResult == long.class) { return; } root.fetch("sources", JoinType.LEFT); - root.fetch("user", JoinType.LEFT); + root.fetch("user", JoinType.INNER); if (last != null) { predicates.add(filterLastValues(root, builder)); @@ -129,23 +140,21 @@ private void addContentPredicates(Root root, CriteriaBuilder builder, private Predicate filterLastValues(Root root, CriteriaBuilder builder) { Predicate[] lastPredicates = new Predicate[sort.size()]; List> paths = new ArrayList<>(sort.size()); - List values = new ArrayList<>(sort.size()); for (SubjectSortOrder order : sort) { paths.add(getPropertyPath(order.getSortBy(), root)); - values.add(getLastValue(order.getSortBy())); } for (int i = 0; i < sort.size(); i++) { Predicate[] lastAndPredicates = i > 0 ? new Predicate[i + 1] : null; for (int j = 0; j < i; j++) { - lastAndPredicates[j] = builder.equal(paths.get(j), values.get(j)); + lastAndPredicates[j] = builder.equal(paths.get(j), sortLastValues.get(j)); } SubjectSortOrder order = sort.get(i); Predicate currentSort; if (order.getDirection().isAscending()) { - currentSort = builder.greaterThan(paths.get(i), values.get(i)); + currentSort = builder.greaterThan(paths.get(i), sortLastValues.get(i)); } else { - currentSort = builder.lessThan(paths.get(i), values.get(i)); + currentSort = builder.lessThan(paths.get(i), sortLastValues.get(i)); } if (lastAndPredicates != null) { @@ -174,14 +183,12 @@ private String getLastValue(SubjectSortBy property) { case EXTERNAL_ID: result = last.getExternalId(); break; - case USER_AUTHORITY: - result = Objects.toString(last.getAuthority(), null); - break; default: throw new IllegalArgumentException("Unknown sort property " + property); } - if (result == null) { - throw new IllegalArgumentException("No last value given for sort property " + property); + if (property.isUnique() && result == null) { + throw new BadRequestException("No last value given for sort property " + property, + SUBJECT, ERR_VALIDATION); } return result; } @@ -195,8 +202,6 @@ private Path getPropertyPath(SubjectSortBy property, Root root) return root.get("user").get("login"); case EXTERNAL_ID: return root.get("externalId"); - case USER_AUTHORITY: - return root.get("user").get("authority").get("name"); default: throw new IllegalArgumentException("Unknown sort property " + property); } @@ -239,4 +244,18 @@ private > void addCriteriaRangePredicates( } } } + + private List getSortOrder(Root root, + CriteriaBuilder builder) { + return sort.stream() + .map(order -> { + Path path = getPropertyPath(order.getSortBy(), root); + if (order.getDirection().isAscending()) { + return builder.asc(path); + } else { + return builder.desc(path); + } + }) + .collect(Collectors.toList()); + } } diff --git a/src/main/java/org/radarbase/management/web/rest/criteria/SubjectCriteria.java b/src/main/java/org/radarbase/management/web/rest/criteria/SubjectCriteria.java index 735e191a5..5965a7c81 100644 --- a/src/main/java/org/radarbase/management/web/rest/criteria/SubjectCriteria.java +++ b/src/main/java/org/radarbase/management/web/rest/criteria/SubjectCriteria.java @@ -88,16 +88,10 @@ public void setLast(SubjectCriteriaLast last) { this.last = last; } - /** Get the criteria paging settings, including sorting. */ + /** Get the criteria paging settings, excluding sorting. */ @NotNull public Pageable getPageable() { - Sort sort = Sort.unsorted(); - - for (SubjectSortOrder order : getParsedSort()) { - sort = sort.and(Sort.by(order.getDirection(), order.getSortBy().getDbField())); - } - - return PageRequest.of(page, size, sort); + return PageRequest.of(page, size); } public int getPage() { @@ -180,17 +174,21 @@ public List getParsedSort() { ? Sort.Direction.fromOptionalString(flatSort.get(index + 1)) : Optional.empty(); + SubjectSortOrder order; if (direction.isPresent()) { index += 2; - parsedSort.add(new SubjectSortOrder(sortBy, direction.get())); + order = new SubjectSortOrder(sortBy, direction.get()); } else { index++; - parsedSort.add(new SubjectSortOrder(sortBy)); + order = new SubjectSortOrder(sortBy); } - // No need to sort beyond a unique element: the order will not change. - if (sortBy.isUnique()) { - hasUniqueField = true; - break; + if (parsedSort.stream().noneMatch(o -> o.getSortBy() == sortBy)) { + parsedSort.add(order); + // No need to sort beyond a unique element: the order will not change. + if (sortBy.isUnique()) { + hasUniqueField = true; + break; + } } } } else { diff --git a/src/main/java/org/radarbase/management/web/rest/criteria/SubjectSortBy.java b/src/main/java/org/radarbase/management/web/rest/criteria/SubjectSortBy.java index 3964fcc7a..0294239b3 100644 --- a/src/main/java/org/radarbase/management/web/rest/criteria/SubjectSortBy.java +++ b/src/main/java/org/radarbase/management/web/rest/criteria/SubjectSortBy.java @@ -10,18 +10,15 @@ package org.radarbase.management.web.rest.criteria; public enum SubjectSortBy { - ID("id", "id", true), - EXTERNAL_ID("externalId", "externalId", false), - USER_LOGIN("login", "user.login", true), - USER_AUTHORITY("authority", "user.authority.name", false); + ID("id", true), + EXTERNAL_ID("externalId", false), + USER_LOGIN("login", true); private final String queryParam; - private final String dbField; private final boolean isUnique; - SubjectSortBy(String queryParam, String dbField, boolean isUnique) { + SubjectSortBy(String queryParam, boolean isUnique) { this.queryParam = queryParam; - this.dbField = dbField; this.isUnique = isUnique; } @@ -30,11 +27,6 @@ public String getQueryParam() { return this.queryParam; } - /** Database field relative to the Subject entity. */ - public String getDbField() { - return dbField; - } - /** Whether this property is unique across all subjects. */ public boolean isUnique() { return isUnique; diff --git a/src/main/webapp/app/shared/subject/subject.component.ts b/src/main/webapp/app/shared/subject/subject.component.ts index 43a33a3cf..b6e806238 100644 --- a/src/main/webapp/app/shared/subject/subject.component.ts +++ b/src/main/webapp/app/shared/subject/subject.component.ts @@ -17,7 +17,7 @@ import { Subject } from './subject.model'; import { SubjectService, SubjectFilterParams, - SubjectsPaginationParams, + SubjectPaginationParams, SubjectLastParams, } from './subject.service'; import { PagingParams } from '../commons'; import { AlertService } from '../util/alert.service'; @@ -31,9 +31,8 @@ import { parseLinks } from '../util/parse-links-util'; }) export class SubjectComponent implements OnInit, OnDestroy, OnChanges { sortingOptions = [ - 'user.login', + 'login', 'externalId', - 'user.activated', ]; pagingParams$: Observable; project$ = new BehaviorSubject(null); @@ -77,7 +76,7 @@ export class SubjectComponent implements OnInit, OnDestroy, OnChanges { this.subjects = []; this.itemsPerPage = ITEMS_PER_PAGE; this.pagingParams$ = this.activatedRoute.data.pipe(map(data => { - const fallback = { page: 1, predicate: 'user.login', ascending: true }; + const fallback = { page: 1, predicate: 'login', ascending: true }; return data['pagingParams'] || fallback; })); this.routeData = this.pagingParams$.subscribe(params => { @@ -185,15 +184,25 @@ export class SubjectComponent implements OnInit, OnDestroy, OnChanges { return params; } - get queryPaginationParams(): SubjectsPaginationParams { - let subjects = this.subjects || []; - const lastLoadedId = subjects[subjects.length - 1]?.id; - const pageSize = this.itemsPerPage; + get queryPaginationParams(): SubjectPaginationParams { + const subjects = this.subjects || []; + + let last: SubjectLastParams | null; + if (subjects.length > 0) { + const lastSubject = subjects[subjects.length - 1] + last = { + id: lastSubject.id, + login: lastSubject.login, + externalId: lastSubject.externalId, + } + } else { + last = null; + } + return { - lastLoadedId, - pageSize, - sortBy: this.predicate, - sortDirection: this.ascending ? 'asc' : 'desc', + last, + size: this.itemsPerPage, + sort: [this.predicate + ',' + (this.ascending ? 'asc' : 'desc')], }; } diff --git a/src/main/webapp/app/shared/subject/subject.service.ts b/src/main/webapp/app/shared/subject/subject.service.ts index 9c02bc5b3..61090074f 100644 --- a/src/main/webapp/app/shared/subject/subject.service.ts +++ b/src/main/webapp/app/shared/subject/subject.service.ts @@ -45,7 +45,7 @@ export class SubjectService { query( filterParams: SubjectFilterParams, - paginationParams: SubjectsPaginationParams, + paginationParams: SubjectPaginationParams, ): Observable> { return this.http.get(this.resourceUrl, { params: createRequestOption({ ...paginationParams, ...filterParams }), @@ -60,7 +60,7 @@ export class SubjectService { findAllByProject( projectName: string, filterParams: SubjectFilterParams, - paginationParams: SubjectsPaginationParams, + paginationParams: SubjectPaginationParams, ): Observable> { let url = `${this.projectResourceUrl}/${projectName}/subjects`; return this.http.get(url, { @@ -71,23 +71,29 @@ export class SubjectService { } export interface SubjectFilterParams { - subjectId?: string, + login?: string, externalId?: string, - dateOfBirthFrom?: string, - dateOfBirthTo?: string, - enrollmentDateFrom?: string, - enrollmentDateTo?: string, - createdDateFrom?: string, - createdDateTo?: string, + dateOfBirth?: SubjectFilterRange, + enrollmentDate?: SubjectFilterRange, humanReadableIdentifier?: string, - personName?: string, humanReadableId?: string, } -export interface SubjectsPaginationParams { - lastLoadedId?: number, - pageSize?: number, - sortBy?: string, - sortDirection?: 'asc' | 'desc', +export interface SubjectFilterRange { + from?: string, + to?: string, + is?: string, +} + +export interface SubjectPaginationParams { + last?: SubjectLastParams, + size?: number, + sort?: [string], +} + +export interface SubjectLastParams { + id?: number, + login?: string, + externalId?: string, } diff --git a/src/main/webapp/app/shared/util/parse-links-util.ts b/src/main/webapp/app/shared/util/parse-links-util.ts index 416e57152..2befe72cd 100644 --- a/src/main/webapp/app/shared/util/parse-links-util.ts +++ b/src/main/webapp/app/shared/util/parse-links-util.ts @@ -6,7 +6,7 @@ export function parseLinks(header: string): { [name: string]: any; } { } // Split parts by comma - const parts: string[] = header.split(','); + const parts: string[] = header.split(/,\s+/, '$1').trim(); + const url: string = section[0].replace(//, '$1').trim(); const queryString: any = {}; url.replace( - new RegExp('([^?=&]+)(=([^&]*))?', 'g'), + /([^?=&]+)(=([^&]*))?/g, ($0, $1, $2, $3) => queryString[$1] = $3 ); diff --git a/src/main/webapp/i18n/en/subject.json b/src/main/webapp/i18n/en/subject.json index 4fdb7798d..73a2ed6a2 100644 --- a/src/main/webapp/i18n/en/subject.json +++ b/src/main/webapp/i18n/en/subject.json @@ -77,9 +77,9 @@ "sortByLabel": "Sort by", "sortOrderLabel": "Order", "id": "Id", - "user.login": "Subject Id", + "login": "Subject Id", "externalId": "External Id", - "user.activated": "Status", + "authority": "Status", "asc": "Ascending", "desc": "Descending" }, From 02a5a146d3f5c665790d8536b93af887b6166c77 Mon Sep 17 00:00:00 2001 From: Joris Borgdorff Date: Wed, 20 Oct 2021 14:53:11 +0200 Subject: [PATCH 069/431] Fixed link parsing --- src/main/webapp/app/shared/util/parse-links-util.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/webapp/app/shared/util/parse-links-util.ts b/src/main/webapp/app/shared/util/parse-links-util.ts index 2befe72cd..c52aea287 100644 --- a/src/main/webapp/app/shared/util/parse-links-util.ts +++ b/src/main/webapp/app/shared/util/parse-links-util.ts @@ -6,7 +6,7 @@ export function parseLinks(header: string): { [name: string]: any; } { } // Split parts by comma - const parts: string[] = header.split(/,\s+ Date: Wed, 20 Oct 2021 15:25:17 +0200 Subject: [PATCH 070/431] Fixed human readable identifier --- src/main/webapp/app/shared/subject/subject.component.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/webapp/app/shared/subject/subject.component.ts b/src/main/webapp/app/shared/subject/subject.component.ts index b6e806238..b8f1316ab 100644 --- a/src/main/webapp/app/shared/subject/subject.component.ts +++ b/src/main/webapp/app/shared/subject/subject.component.ts @@ -162,7 +162,7 @@ export class SubjectComponent implements OnInit, OnDestroy, OnChanges { login: this.filterSubjectId.trim() || undefined, externalId: this.filterSubjectExternalId.trim() || undefined, personName: this.filterPersonName.trim() || undefined, - humanReadableId: this.filterSubjectHumanReadableId.trim() || undefined, + humanReadableIdentifier: this.filterSubjectHumanReadableId.trim() || undefined, dateOfBirth: undefined, enrollmentDate: undefined, }; From ee5240e64433d1b7487de65bdf1a204e513f85c3 Mon Sep 17 00:00:00 2001 From: Joris Borgdorff Date: Wed, 20 Oct 2021 16:23:12 +0200 Subject: [PATCH 071/431] Fix query parameter parsing --- .../webapp/app/shared/model/request.utils.ts | 31 ++++++++++++------- 1 file changed, 19 insertions(+), 12 deletions(-) diff --git a/src/main/webapp/app/shared/model/request.utils.ts b/src/main/webapp/app/shared/model/request.utils.ts index c10b23bec..4200432bf 100644 --- a/src/main/webapp/app/shared/model/request.utils.ts +++ b/src/main/webapp/app/shared/model/request.utils.ts @@ -1,22 +1,29 @@ import { HttpParams } from '@angular/common/http'; +const addRequestOptions = (options: HttpParams, key: string, value?: any): HttpParams => { + if (typeof value === 'undefined' || value === null || value === '') { + // do nothing + } else if (Array.isArray(value)) { + value.forEach((v) => { + options = addRequestOptions(options, key, v); + }); + } else if (typeof value === 'object') { + Object.keys(value).forEach((k) => { + options = addRequestOptions(options, key + '.' + k, value[k]); + }) + } else { + options = options.append(key, value); + } + return options; +} + export const createRequestOption = (req?: any): HttpParams => { let options: HttpParams = new HttpParams(); if (req) { Object.keys(req).forEach((key) => { - if (key !== 'sort' && req[key]) { - options = options.set(key, req[key]); - } + options = addRequestOptions(options, key, req[key]); }); - if (req.sort) { - req.sort.forEach((val) => { - options = options.append('sort', val); - }); - } } + console.log(options); return options; }; - -interface RequestOptions { - [key: string]: string | [string]; -} From ec280cf039be0ebceb4de0324998af8234330ef6 Mon Sep 17 00:00:00 2001 From: Joris Borgdorff Date: Wed, 20 Oct 2021 16:23:37 +0200 Subject: [PATCH 072/431] Fix return value of link --- .../management/web/rest/SubjectResource.java | 22 +++++++-------- .../web/rest/util/PaginationUtil.java | 27 ++++++++++--------- 2 files changed, 24 insertions(+), 25 deletions(-) diff --git a/src/main/java/org/radarbase/management/web/rest/SubjectResource.java b/src/main/java/org/radarbase/management/web/rest/SubjectResource.java index 521ad209d..6ecf47289 100644 --- a/src/main/java/org/radarbase/management/web/rest/SubjectResource.java +++ b/src/main/java/org/radarbase/management/web/rest/SubjectResource.java @@ -15,6 +15,7 @@ import static org.radarbase.management.web.rest.errors.EntityName.PROJECT; import static org.radarbase.management.web.rest.errors.ErrorConstants.ERR_ACTIVE_PARTICIPANT_PROJECT_NOT_FOUND; import static org.radarbase.management.web.rest.errors.ErrorConstants.ERR_SOURCE_TYPE_NOT_PROVIDED; +import static org.radarbase.management.web.rest.errors.ErrorConstants.ERR_SUBJECT_NOT_FOUND; import static org.radarbase.management.web.rest.errors.ErrorConstants.ERR_VALIDATION; import java.net.URISyntaxException; @@ -202,7 +203,6 @@ public ResponseEntity updateSubject(@RequestBody SubjectDTO subjectD * @return the ResponseEntity with status 200 (OK) and with body the updated subjectDto, or with * status 400 (Bad Request) if the subjectDto is not valid, or with status 500 (Internal * Server Error) if the subjectDto couldnt be updated - * @throws URISyntaxException if the Location URI syntax is incorrect */ @PutMapping("/subjects/discontinue") @Timed @@ -267,13 +267,12 @@ public ResponseEntity> getAllSubjects( subjectMapper.subjectToSubjectReducedProjectDTO(s))); return wrapOrNotFound(subject); } else if (projectName == null && externalId != null) { - Page page = subjectService.findAll(subjectCriteria); - List items = subjectMapper - .subjectsToSubjectReducedProjectDTOs(page.getContent()); + Page page = subjectService.findAll(subjectCriteria) + .map(s -> subjectMapper.subjectToSubjectWithoutProjectDTO(s)); HttpHeaders headers = PaginationUtil.generateSubjectPaginationHttpHeaders( page, "/api/subjects", subjectCriteria); - return new ResponseEntity<>(items, headers, HttpStatus.OK); + return new ResponseEntity<>(page.getContent(), headers, HttpStatus.OK); } else { Page page = subjectService.findAll(subjectCriteria) .map(subjectMapper::subjectToSubjectWithoutProjectDTO); @@ -538,13 +537,10 @@ public ResponseEntity updateSubjectSource(@PathVariable throws NotFoundException, NotAuthorizedException, URISyntaxException { // check the subject id - Optional subjectOptional = subjectRepository.findOneWithEagerBySubjectLogin(login); - if (!subjectOptional.isPresent()) { - throw new NotFoundException("Subject ID not found", SUBJECT, ErrorConstants - .ERR_SUBJECT_NOT_FOUND, Collections.singletonMap("subjectLogin", login)); - } - // check the permission to update source - Subject subject = subjectOptional.get(); + Subject subject = subjectRepository.findOneWithEagerBySubjectLogin(login) + .orElseThrow(() -> new NotFoundException("Subject ID not found", + SUBJECT, ERR_SUBJECT_NOT_FOUND, + Collections.singletonMap("subjectLogin", login))); String projectName = subject.getActiveProject() .map(Project::getProjectName) @@ -560,7 +556,7 @@ public ResponseEntity updateSubjectSource(@PathVariable errorParams.put("subjectLogin", login); errorParams.put("sourceName", sourceName); return new NotFoundException("Source not found under assigned sources of " - + "subject", SUBJECT, ErrorConstants.ERR_SUBJECT_NOT_FOUND, + + "subject", SUBJECT, ERR_SUBJECT_NOT_FOUND, errorParams); }); diff --git a/src/main/java/org/radarbase/management/web/rest/util/PaginationUtil.java b/src/main/java/org/radarbase/management/web/rest/util/PaginationUtil.java index f8cb743b5..3a163ffff 100644 --- a/src/main/java/org/radarbase/management/web/rest/util/PaginationUtil.java +++ b/src/main/java/org/radarbase/management/web/rest/util/PaginationUtil.java @@ -1,5 +1,6 @@ package org.radarbase.management.web.rest.util; +import org.radarbase.management.service.dto.SubjectDTO; import org.radarbase.management.web.rest.criteria.CriteriaRange; import org.radarbase.management.web.rest.criteria.SubjectCriteria; import org.springframework.data.domain.Page; @@ -30,7 +31,6 @@ private PaginationUtil() { * @return the {@link HttpHeaders} */ public static HttpHeaders generatePaginationHttpHeaders(Page page, String baseUrl) { - HttpHeaders headers = new HttpHeaders(); headers.add("X-Total-Count", Long.toString(page.getTotalElements())); @@ -68,14 +68,16 @@ public static HttpHeaders generatePaginationHttpHeaders(Page page, String bas * @return the {@link HttpHeaders} */ public static HttpHeaders generateSubjectPaginationHttpHeaders( - Page page, String baseUrl, SubjectCriteria criteria + Page page, String baseUrl, SubjectCriteria criteria ) { HttpHeaders headers = new HttpHeaders(); headers.add("X-Total-Count", Long.toString(page.getTotalElements())); - String link = '<' - + generateUri(baseUrl, criteria) - + ">; rel=\"first\""; - headers.add(HttpHeaders.LINK, link); + if (!page.isEmpty()) { + String link = '<' + + generateUri(page, baseUrl, criteria) + + ">; rel=\"next\""; + headers.add(HttpHeaders.LINK, link); + } return headers; } @@ -86,7 +88,8 @@ private static String generateUri(String baseUrl, int page, int size) { .toUriString(); } - private static String generateUri(String baseUrl, SubjectCriteria criteria) { + private static String generateUri(Page page, String baseUrl, + SubjectCriteria criteria) { UriComponentsBuilder builder = UriComponentsBuilder.fromUriString(baseUrl); generateUriCriteriaRange(builder, "dateOfBirth", criteria.getDateOfBirth()); generateUriCriteriaRange(builder, "enrollmentDate", criteria.getEnrollmentDate()); @@ -108,11 +111,11 @@ private static String generateUri(String baseUrl, SubjectCriteria criteria) { order.getSortBy().getQueryParam() + ',' + order.getDirection().name().toLowerCase(Locale.ROOT))); } - if (criteria.getLast() != null) { - generateUriParam(builder, "last.id", criteria.getLast().getId()); - generateUriParam(builder, "last.login", criteria.getLast().getLogin()); - generateUriParam(builder, "last.externalId", criteria.getLast().getExternalId()); - generateUriParam(builder, "last.authority", criteria.getLast().getAuthority()); + SubjectDTO lastSubject = page.getContent().get(page.getNumberOfElements() - 1); + generateUriParam(builder, "last.id", lastSubject.getId()); + generateUriParam(builder, "last.login", lastSubject.getLogin()); + if (lastSubject.getExternalId() != null && !lastSubject.getExternalId().isEmpty()) { + generateUriParam(builder, "last.externalId", lastSubject.getExternalId()); } return builder.toUriString(); } From 61827dc330a1f708dc93ec6a6df363f78cc02b8e Mon Sep 17 00:00:00 2001 From: Joris Borgdorff Date: Thu, 21 Oct 2021 12:07:55 +0200 Subject: [PATCH 073/431] Update gradle --- build.gradle | 11 +- gradle.properties | 2 +- gradle/gatling.gradle | 8 +- gradle/liquibase.gradle | 2 +- gradle/profile_dev.gradle | 2 +- gradle/profile_prod.gradle | 2 +- gradle/style.gradle | 8 +- gradle/wrapper/gradle-wrapper.jar | Bin 59203 -> 59536 bytes gradle/wrapper/gradle-wrapper.properties | 3 +- gradlew | 257 ++++++++++++++--------- managementportal-client/build.gradle | 4 +- radar-auth/build.gradle | 5 +- 12 files changed, 174 insertions(+), 130 deletions(-) diff --git a/build.gradle b/build.gradle index 37ff781f8..813e37e32 100644 --- a/build.gradle +++ b/build.gradle @@ -4,7 +4,6 @@ import java.util.concurrent.TimeUnit buildscript { repositories { mavenCentral() - jcenter() } dependencies { @@ -14,7 +13,7 @@ buildscript { plugins { id 'org.springframework.boot' version "${spring_boot_version}" - id "com.moowork.node" version "1.2.0" + id "com.github.node-gradle.node" version "3.1.1" id "io.spring.dependency-management" version "1.0.10.RELEASE" id 'de.undercouch.download' version '4.1.1' apply false id "io.github.gradle-nexus.publish-plugin" version "1.0.0" @@ -22,12 +21,11 @@ plugins { apply plugin: 'org.springframework.boot' apply plugin: 'war' -apply plugin: 'com.moowork.node' +apply plugin: 'com.github.node-gradle.node' apply plugin: 'io.spring.dependency-management' repositories { mavenCentral() - jcenter() } allprojects { @@ -260,7 +258,7 @@ task cleanResources(type: Delete) { } wrapper { - gradleVersion '6.7.1' + gradleVersion '7.2' } task stage(dependsOn: 'bootWar') { @@ -333,9 +331,6 @@ class TimingsListener implements TaskExecutionListener, BuildListener { } } - @Override - void buildStarted(Gradle gradle) {} - @Override void projectsEvaluated(Gradle gradle) {} diff --git a/gradle.properties b/gradle.properties index 46d79f5d6..73b9c9adb 100644 --- a/gradle.properties +++ b/gradle.properties @@ -53,7 +53,7 @@ org.gradle.vfs.watch=true ## Default value: -Xmx1024m -XX:MaxPermSize=256m ## un comment the below line to override the daemon defaults -org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 +org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8 ## When configured, Gradle will run in incubating parallel mode. ## This option should only be used with decoupled projects. More details, visit diff --git a/gradle/gatling.gradle b/gradle/gatling.gradle index 9c3a49e93..ab8421d62 100644 --- a/gradle/gatling.gradle +++ b/gradle/gatling.gradle @@ -12,21 +12,21 @@ sourceSets { } dependencies { - gatlingCompile "io.gatling.highcharts:gatling-charts-highcharts:${gatling_version}" + gatlingImplementation "io.gatling.highcharts:gatling-charts-highcharts:${gatling_version}" } //noinspection GroovyAssignabilityCheck tasks.withType(ScalaCompile) { - scalaClasspath = scalaRuntime.inferScalaClasspath(configurations.gatlingCompile) + scalaClasspath = scalaRuntime.inferScalaClasspath(configurations.gatlingCompileClasspath) } task manifestJar(type: Jar) { - from configurations.gatlingCompile + from configurations.gatlingRuntimeClasspath archiveFileName.set 'gatlingBooter.jar' doFirst { manifest { // uri is just needed for Windows-compatibility - attributes 'Class-Path': configurations.gatlingCompile.files.collect{ project.uri(it) }.join(' ') + attributes 'Class-Path': configurations.gatlingCompileClasspath.files.collect{ project.uri(it) }.join(' ') } } } diff --git a/gradle/liquibase.gradle b/gradle/liquibase.gradle index 777795037..0c8d54f91 100644 --- a/gradle/liquibase.gradle +++ b/gradle/liquibase.gradle @@ -36,7 +36,7 @@ task liquibaseDiffChangelog(dependsOn: compileJava, type: JavaExec) { classpath sourceSets.main.runtimeClasspath classpath configurations.liquibase } - main = "liquibase.integration.commandline.Main" + mainClass.set('liquibase.integration.commandline.Main') args "--changeLogFile=src/main/resources/config/liquibase/changelog/" + buildTimestamp() +"_changelog.xml" args "--referenceUrl=hibernate:spring:org.radarbase.management.domain?dialect=org.hibernate.dialect.PostgreSQLDialect&hibernate.physical_naming_strategy=org.springframework.boot.orm.jpa.hibernate.SpringPhysicalNamingStrategy&hibernate.implicit_naming_strategy=org.springframework.boot.orm.jpa.hibernate.SpringImplicitNamingStrategy" diff --git a/gradle/profile_dev.gradle b/gradle/profile_dev.gradle index 508a864ff..e8ade7d46 100644 --- a/gradle/profile_dev.gradle +++ b/gradle/profile_dev.gradle @@ -1,5 +1,5 @@ apply plugin: 'org.springframework.boot' -apply plugin: 'com.moowork.node' +apply plugin: 'com.github.node-gradle.node' ext.logbackLoglevel = 'DEBUG' diff --git a/gradle/profile_prod.gradle b/gradle/profile_prod.gradle index 5f33f41be..1764745ee 100644 --- a/gradle/profile_prod.gradle +++ b/gradle/profile_prod.gradle @@ -1,5 +1,5 @@ apply plugin: 'org.springframework.boot' -apply plugin: 'com.moowork.node' +apply plugin: 'com.github.node-gradle.node' ext.logbackLoglevel = 'INFO' diff --git a/gradle/style.gradle b/gradle/style.gradle index 5808f1d2a..fb705c758 100644 --- a/gradle/style.gradle +++ b/gradle/style.gradle @@ -34,15 +34,15 @@ pmdTest { jacocoTestReport { reports { - xml.enabled true - csv.enabled false - html.enabled true + xml.required = true + csv.required = false + html.required = true } dependsOn test } task sendCoverageToCodacy(type: JavaExec, dependsOn: jacocoTestReport) { - main = 'com.codacy.CodacyCoverageReporter' + mainClass.set('com.codacy.CodacyCoverageReporter') classpath = configurations.codacy args = ['report', '-l', 'Java', '-r', "${buildDir}/reports/jacoco/test/jacocoTestReport.xml"] } diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index e708b1c023ec8b20f512888fe07c5bd3ff77bb8f..7454180f2ae8848c63b8b4dea2cb829da983f2fa 100644 GIT binary patch delta 18435 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 B8dv}T delta 17845 zcmV)CK*GO}(F4QI1F(Jx4W$DjNjn4p0N4ir06~)x5+0MO2`GQvQyWzj|J`gh3(E#l zNGO!HfVMRRN~%`0q^)g%XlN*vP!O#;m*h5VyX@j-1N|HN;8S1vqEAj=eCdn`)tUB9 zXZjcT^`bL6qvL}gvXj%9vrOD+x!Gc_0{$Zg+6lTXG$bmoEBV z*%y^c-mV0~Rjzv%e6eVI)yl>h;TMG)Ft8lqpR`>&IL&`>KDi5l$AavcVh9g;CF0tY zw_S0eIzKD?Nj~e4raA8wxiiImTRzv6;b6|LFmw)!E4=CiJ4I%&axSey4zE-MIh@*! z*P;K2Mx{xVYPLeagKA}Hj=N=1VrWU`ukuBnc14iBG?B}Uj>?=2UMk4|42=()8KOnc zrJzAxxaEIfjw(CKV6F$35u=1qyf(%cY8fXaS9iS?yetY{mQ#Xyat*7sSoM9fJlZqq zyasQ3>D>6p^`ck^Y|kYYZB*G})uAbQ#7)Jeb~glGz@2rPu}zBWDzo5K$tP<|meKV% z{Swf^eq6NBioF)v&~9NLIxHMTKe6gJ@QQ^A6fA!n#u1C&n`aG7TDXKM1Jly-DwTB` z+6?=Y)}hj;C#r5>&x;MCM4U13nuXVK*}@yRY~W3X%>U>*CB2C^K6_OZsXD!nG2RSX zQg*0)$G3%Es$otA@p_1N!hIPT(iSE=8OPZG+t)oFyD~{nevj0gZen$p>U<7}uRE`t5Mk1f4M0K*5 zbn@3IG5I2mk;8K>*RZ zPV6iL006)S001s%0eYj)9hu1 z9o)iQT9(v*sAuZ|ot){RrZ0Qw4{E0A+!Yx_M~#Pj&OPUM&i$RU=Uxu}e*6Sr2ror= z&?lmvFCO$)BY+^+21E>ENWe`I0{02H<-lz&?})gIVFyMWxX0B|0b?S6?qghp3lDgz z2?0|ALJU=7s-~Lb3>9AA5`#UYCl!Xeh^i@bxs5f&SdiD!WN}CIgq&WI4VCW;M!UJL zX2};d^sVj5oVl)OrkapV-C&SrG)*x=X*ru!2s04TjZ`pY$jP)4+%)7&MlpiZ`lgoF zo_p>^4qGz^(Y*uB10dY2kcIbt=$FIdYNqk;~47wf@)6|nJp z1cocL3zDR9N2Pxkw)dpi&_rvMW&Dh0@T*_}(1JFSc0S~Ph2Sr=vy)u*=TY$i_IHSo zR+&dtWFNxHE*!miRJ%o5@~GK^G~4$LzEYR-(B-b(L*3jyTq}M3d0g6sdx!X3-m&O% zK5g`P179KHJKXpIAAX`A2MFUA;`nXx^b?mboVbQgigIHTU8FI>`q53AjWaD&aowtj z{XyIX>c)*nLO~-WZG~>I)4S1d2q@&?nwL)CVSWqWi&m1&#K1!gt`g%O4s$u^->Dwq ziKc&0O9KQ7000OG0000%03-m(e&Y`S09YWC4iYDSty&3q8^?8ij|8zxaCt!zCFq1@ z9TX4Hl68`nY>}cQNW4Ullqp$~SHO~l1!CdFLKK}ij_t^a?I?C^CvlvnZkwiVn>dl2 z2$V(JN{`5`-8ShF_ek6HNRPBlPuIPYu>TAeAV5O2)35r3*_k(Q-h1+h5pb(Zu%oJ__pBsW0n5ILw`!&QR&YV`g0Fe z(qDM!FX_7;`U3rxX#QHT{f%h;)Eursw=*#qvV)~y%^Uo^% zi-%sMe^uz;#Pe;@{JUu05zT*i=u7mU9{MkT`ft(vPdQZoK&2mg=tnf8FsaNQ+QcPg zB>vP8Rd6Z0JoH5_Q`zldg;hx4azQCq*rRZThqlqTRMzn1O3_rQTrHk8LQ<{5UYN~` zM6*~lOGHyAnx&#yCK{i@%N1Us@=6cw=UQxpSE;<(LnnES%6^q^QhBYQ-VCSmIu8wh z@_LmwcFDfAhIn>`%h7L{)iGBzu`Md4dj-m3C8mA9+BL*<>q z#$7^ttIBOE-=^|zmG`K8yUKT{yjLu2SGYsreN0*~9yhFxn4U};Nv1XXj1fH*v-g=3 z@tCPc`YdzQGLp%zXwo*o$m9j-+~nSWls#s|?PyrHO%SUGdk**X9_=|b)Y%^j_V$3S z>mL2A-V)Q}qb(uZipEFVm?}HWc+%G6_K+S+87g-&RkRQ8-{0APDil115eG|&>WQhU zufO*|e`hFks^cJJmx_qNx{ltSp3aT|XgD5-VxGGXb7gkiOG$w^qMVBDjR8%!Sbh72niHRDV* ziFy8LE+*$j?t^6aZP9qt-ow;hzkmhvy*Hn-X^6?yVMbtNbyqZQ^rXg58`gk+I%Wv} zn_)dRq+3xjc8D%}EQ%nnTF7L7m}o9&*^jf`_qvUhVKY7w9Zgxr-0YHWFRd3$l_6UX zpXt^U&TiC*qZWx#pOG6k?3Tg)pra*fw(O6_45>lUBN1U5Qmc>^DHt)5b~Ntjsw!NI z1n4{$HWFeIi)*qvgK^ui;(81VQc1(wJ8C#tjR>Dkjf{xYC^_B^#qrdCc)uZxtgua6 zk98UGQF|;;k`c+0_z)tQ&9DwLB~&12@D1!*mTz_!3Mp=cg;B7Oq4cKN>5v&dW7q@H zal=g6Ipe`siZN4NZiBrkJCU*x216gmbV(FymgHuG@%%|8sgD?gR&0*{y4n=pukZnd z4=Nl~_>jVfbIehu)pG)WvuUpLR}~OKlW|)=S738Wh^a&L+Vx~KJU25o6%G7+Cy5mB zgmYsgkBC|@K4Jm_PwPoz`_|5QSk}^p`XV`649#jr4Lh^Q>Ne~#6Cqxn$7dNMF=%Va z%z9Ef6QmfoXAlQ3)PF8#3Y% zadcE<1`fd1&Q9fMZZnyI;&L;YPuy#TQ8b>AnXr*SGY&xUb>2678A+Y z8K%HOdgq_4LRFu_M>Ou|kj4W%sPPaV)#zDzN~25klE!!PFz_>5wCxglj7WZI13U5| zEq_YLKPH;v8sEhyG`dV_jozR);a6dBvkauhC;1dk%mr+J*Z6MMH9jqxFk@)&h{mHl zrf^i_d-#mTF=6-T8Rk?(1+rPGgl$9=j%#dkf@x6>czSc`jk7$f!9SrV{do%m!t8{? z_iAi$Qe&GDR#Nz^#uJ>-_?(E$ns)(3)X3cYY)?gFvU+N>nnCoBSmwB2<4L|xH19+4 z`$u#*Gt%mRw=*&|em}h_Y`Pzno?k^8e*hEwfM`A_yz-#vJtUfkGb=s>-!6cHfR$Mz z`*A8jVcz7T{n8M>ZTb_sl{EZ9Ctau4naX7TX?&g^VLE?wZ+}m)=YW4ODRy*lV4%-0 zG1XrPs($mVVfpnqoSihnIFkLdxG9um&n-U|`47l{bnr(|8dmglO7H~yeK7-wDwZXq zaHT($Qy2=MMuj@lir(iyxI1HnMlaJwpX86je}e=2n|Esb6hB?SmtDH3 z2qH6o`33b{;M{mDa5@@~1or8+Zcio*97pi1Jkx6v5MXCaYsb~Ynq)eWpKnF{n)FXZ z?Xd;o7ESu&rtMFr5(yJ(B7V>&0gnDdL*4MZH&eO+r*t!TR98ssbMRaw`7;`SLI8mT z=)hSAt~F=mz;JbDI6g~J%w!;QI(X14AnOu;uve^4wyaP3>(?jSLp+LQ7uU(iib%IyB(d&g@+hg;78M>h7yAeq$ALRoHGkKXA+E z$Sk-hd$Fs2nL4w9p@O*Y$c;U)W#d~)&8Js;i^Dp^* z0*7*zEGj~VehF4sRqSGny*K_CxeF=T^8;^lb}HF125G{kMRV?+hYktZWfNA^Mp7y8 zK~Q?ycf%rr+wgLaHQ|_<6z^eTG7izr@99SG9Q{$PCjJabSz`6L_QJJe7{LzTc$P&pwTy<&3RRUlSHmK;?}=QAhQaDW3#VWcNAH3 zeBPRTDf3?3mfdI$&WOg(nr9Gyzg`&u^o!f2rKJ57D_>p z6|?Vg?h(@(*X=o071{g^le>*>qSbVam`o}sAK8>b|11%e&;%`~b2OP7--q%0^2YDS z`2M`{2QYr1VC)sIW9WOu8<~7Q>^$*Og{KF+kI;wFegvaIDkB%3*%PWtWKSq7l`1YcDxQQ2@nv{J!xWV?G+w6C zhUUxUYVf%(Q(40_xrZB@rbxL=Dj3RV^{*yHd>4n-TOoHVRnazDOxxkS9kiZyN}IN3 zB^5N=* zRSTO+rA<{*P8-$GZdyUNOB=MzddG$*@q>mM;pUIiQ_z)hbE#Ze-IS)9G}Rt$5PSB{ zZZ;#h9nS7Rf1ecW&n(Gpu9}{vXQZ-f`UHIvD?cTbF`YvH*{rgE(zE22pLAQfhg-`U zuh612EpByB(~{w7svCylrBk%5$LCIyuhrGi=yOfca`=8ltKxHcSNfDRt@62QH^R_0 z&eQL6rRk>Dvf6rjMQv5ZXzg}S`HqV69hJT^pPHtdhqsrPJWs|IT9>BvpQa@*(FX6v zG}TYjreQCnH(slMt5{NgUf)qsS1F&Bb(M>$X}tWI&yt2I&-rJbqveuj?5J$`Dyfa2 z)m6Mq0XH@K)Y2v8X=-_4=4niodT&Y7W?$KLQhjA<+R}WTdYjX9>kD+SRS^oOY1{A= zZTId-(@wF^UEWso($wZtrs%e7t<}YaC_;#@`r0LUzKY&|qPJz*y~RHG`E6bypP5AX zN!p0^AUu8uDR>xM-ALFzBxXM~Q3z=}fHWCIG>0&I6x2Iu7&U)49j7qeMI&?qb$=4I zdMmhAJrO%@0f%YW! z^gLByEGSk+R0v4*d4w*N$Ju6z#j%HBI}6y$2en=-@S3=6+yZX94m&1j@s- z7T6|#0$c~dYq9IkA!P)AGkp~S$zYJ1SXZ#RM0|E~Q0PSm?DsT4N3f^)b#h(u9%_V5 zX*&EIX|gD~P!vtx?ra71pl%v)F!W~X2hcE!h8cu@6uKURdmo1-7icN4)ej4H1N~-C zjXgOK+mi#aJv4;`DZ%QUbVVZclkx;9`2kgbAhL^d{@etnm+5N8pB#fyH)bxtZGCAv z(%t0kPgBS{Q2HtjrfI0B$$M0c?{r~2T=zeXo7V&&aprCzww=i*}Atu7g^(*ivauMz~kkB%Vt{Wydlz%%2c26%>0PAbZO zVHx%tK(uzDl#ZZK`cW8TD2)eD77wB@gum{B2bO_jnqGl~01EF_^jx4Uqu1yfA~*&g zXJ`-N?D-n~5_QNF_5+Un-4&l$1b zVlHFqtluoN85b^C{A==lp#hS9J(npJ#6P4aY41r) zzCmv~c77X5L}H%sj>5t&@0heUDy;S1gSOS>JtH1v-k5l}z2h~i3^4NF6&iMb;ZYVE zMw*0%-9GdbpF1?HHim|4+)Zed=Fk<2Uz~GKc^P(Ig@x0&XuX0<-K(gA*KkN&lY2Xu zG054Q8wbK~$jE32#Ba*Id2vkqmfV{U$Nx9vJ;jeI`X+j1kh7hB8$CBTe@ANmT^tI8 z%U>zrTKuECin-M|B*gy(SPd`(_xvxjUL?s137KOyH>U{z01cBcFFt=Fp%d+BK4U;9 zQG_W5i)JASNpK)Q0wQpL<+Ml#cei41kCHe&P9?>p+KJN>I~`I^vK1h`IKB7k^xi`f z$H_mtr_+@M>C5+_xt%v}{#WO{86J83;VS@Ei3JLtp<*+hsY1oGzo z0?$?OJO$79;{|@aP!fO6t9TJ!?8i&|c&UPWRMbkwT3nEeFH`Yyyh6b%Rm^nBuTt@9 z+$&-4lf!G|@LCo3<8=yN@5dYbc%uq|Hz|0tiiLQKiUoM9g14zyECKGv0}3AWv2WJ zUAXGUhvkNk`0-H%ACsRSmy4fJ@kxBD3ZKSj6g(n1KPw?g{v19phcBr3BEF>J%lL|d zud3LNuL;cR*xS+;X+N^Br+x2{&hDMhb-$6_fKU(Pt0FQUXgNrZvzsVCnsFqv?#L z4-FYsQ-?D>;LdjHu_TT1CHN~aGkmDjWJkJg4G^!+V_APd%_48tErDv6BW5;ji^UDD zRu5Sw7wwplk`w{OGEKWJM&61c-AWn!SeUP8G#+beH4_Ov*)NUV?eGw&GHNDI6G(1Y zTfCv?T*@{QyK|!Q09wbk5koPD>=@(cA<~i4pSO?f(^5sSbdhUc+K$DW#_7^d7i%At z?KBg#vm$?P4h%?T=XymU;w*AsO_tJr)`+HUll+Uk_zx6vNw>G3jT){w3ck+Z=>7f0 zZVkM*!k^Z_E@_pZK6uH#|vzoL{-j1VFlUHP&5~q?j=UvJJNQG ztQdiCF$8_EaN_Pu8+afN6n8?m5UeR_p_6Log$5V(n9^W)-_vS~Ws`RJhQNPb1$C?| zd9D_ePe*`aI9AZ~Ltbg)DZ;JUo@-tu*O7CJ=T)ZI1&tn%#cisS85EaSvpS~c#CN9B z#Bx$vw|E@gm{;cJOuDi3F1#fxWZ9+5JCqVRCz5o`EDW890NUfNCuBn)3!&vFQE{E$L`Cf7FMSSX%ppLH+Z}#=p zSow$)$z3IL7frW#M>Z4|^9T!=Z8}B0h*MrWXXiVschEA=$a|yX9T~o!=%C?T+l^Cc zJx&MB$me(a*@lLLWZ=>PhKs!}#!ICa0! zq%jNgnF$>zrBZ3z%)Y*yOqHbKzEe_P=@<5$u^!~9G2OAzi#}oP&UL9JljG!zf{JIK z++G*8j)K=$#57N)hj_gSA8golO7xZP|KM?elUq)qLS)i(?&lk{oGMJh{^*FgklBY@Xfl<_Q zXP~(}ST6V01$~VfOmD6j!Hi}lsE}GQikW1YmBH)`f_+)KI!t#~B7=V;{F*`umxy#2Wt8(EbQ~ks9wZS(KV5#5Tn3Ia90r{}fI%pfbqBAG zhZ)E7)ZzqA672%@izC5sBpo>dCcpXi$VNFztSQnmI&u`@zQ#bqFd9d&ls?RomgbSh z9a2rjfNiKl2bR!$Y1B*?3Ko@s^L5lQN|i6ZtiZL|w5oq%{Fb@@E*2%%j=bcma{K~9 z*g1%nEZ;0g;S84ZZ$+Rfurh;Nhq0;{t~(EIRt}D@(Jb7fbe+_@H=t&)I)gPCtj*xI z9S>k?WEAWBmJZ|gs}#{3*pR`-`!HJ)1Dkx8vAM6Tv1bHZhH=MLI;iC#Y!$c|$*R>h zjP{ETat(izXB{@tTOAC4nWNhh1_%7AVaf!kVI5D=Jf5I1!?}stbx_Yv23hLf$iUTb z-)WrTtd2X+;vBW_q*Z6}B!10fs=2FA=3gy*dljsE43!G*3Uw(Is>(-a*5E!T4}b-Y zfvOC)-HYjNfcpi`=kG%(X3XcP?;p&=pz+F^6LKqRom~pA}O* zitR+Np{QZ(D2~p_Jh-k|dL!LPmexLM?tEqI^qRDq9Mg z5XBftj3z}dFir4oScbB&{m5>s{v&U=&_trq#7i&yQN}Z~OIu0}G)>RU*`4<}@7bB% zKYxGx0#L#u199YKSWZwV$nZd>D>{mDTs4qDNyi$4QT6z~D_%Bgf?>3L#NTtvX;?2D zS3IT*2i$Snp4fjDzR#<)A``4|dA(}wv^=L?rB!;kiotwU_gma`w+@AUtkSyhwp{M} z!e`jbUR3AG4XvnBVcyIZht6Vi~?pCC!$XF2 z*V~)DBVm8H7$*OZQJYl3482hadhsI2NCz~_NINtpC?|KI6H3`SG@1d%PsDdw{u}hq zN;OU~F7L1jT&KAitilb&Fl3X12zfSuFm;X)xQWOHL&7d)Q5wgn{78QJ6k5J;is+XP zCPO8_rlGMJB-kuQ*_=Yo1TswG4xnZd&eTjc8=-$6J^8TAa~kEnRQ@Zp-_W&B(4r@F zA==}0vBzsF1mB~743XqBmL9=0RSkGn$cvHf*hyc{<2{@hW+jKjbC|y%CNupHY_NC% zivz^btBLP-cDyV8j>u)=loBs>HoI5ME)xg)oK-Q0wAy|8WD$fm>K{-`0|W{H00;;G z000j`0OWQ8aHA9e04^;603eeQIvtaXMG=2tcr1y8Fl-J;AS+=<0%DU8Bp3oEEDhA^ zOY)M8%o5+cF$rC?trfMcty*f)R;^v=f~}||Xe!#;T3eTDZELN&-50xk+J1heP5AQ>h5O#S_uO;O@;~REd*_G$x$hVeE#bchX)otXQy|S5(oB)2a2%Sc(iDHm z=d>V|a!BLp9^#)o7^EQ2kg=K4%nI^sK2w@-kmvB+ARXYdq?xC2age6)e4$^UaY=wn zgLD^{X0A+{ySY+&7RpldwpC6=E zSPq?y(rl8ZN%(A*sapd4PU+dIakIwT0=zxIJEUW0kZSo|(zFEWdETY*ZjIk9uNMUA ze11=mHu8lUUlgRx!hItf0dAF#HfdIB+#aOuY--#QN9Ry zbx|XkG?PrBb@l6Owl{9Oa9w{x^R}%GwcEEfY;L-6OU8|9RXvu`-ECS`jcO1x1MP{P zcr;Bw##*Dod9K@pEx9z9G~MiNi>8v1OU-}vk*HbI)@CM? zn~b=jWUF%HP=CS+VCP>GiAU_UOz$aq3%%Z2laq^Gx`WAEmuNScCN)OlW>YHGYFgV2 z42lO5ZANs5VMXLS-RZTvBJkWy*OeV#L;7HwWg51*E|RpFR=H}h(|N+79g)tIW!RBK ze08bg^hlygY$C2`%N>7bDm`UZ(5M~DTanh3d~dg+OcNdUanr8azO?})g}EfnUB;5- zE1FX=ru?X=zAk4_6@__o1fE+ml1r&u^f1Kb24Jf-)zKla%-dbd>UZ1 zrj3!RR!Jg`ZnllKJ)4Yfg)@z>(fFepeOcp=F-^VHv?3jSxfa}-NB~*qkJ5Uq(yn+( z<8)qbZh{C!xnO@-XC~XMNVnr-Z+paowv!$H7>`ypMwA(X4(knx7z{UcWWe-wXM!d? zYT}xaVy|7T@yCbNOoy)$D=E%hUNTm(lPZqL)?$v+-~^-1P8m@Jm2t^L%4#!JK#Vtg zyUjM+Y*!$);1<)0MUqL00L0*EZcsE&usAK-?|{l|-)b7|PBKl}?TM6~#j9F+eZq25_L&oSl}DOMv^-tacpDI)l*Ws3u+~jO@;t(T)P=HCEZ#s_5q=m zOsVY!QsOJn)&+Ge6Tm)Ww_Bd@0PY(78ZJ)7_eP-cnXYk`>j9q`x2?Xc6O@55wF+6R zUPdIX!2{VGA;FSivN@+;GNZ7H2(pTDnAOKqF*ARg+C54vZ@Ve`i?%nDDvQRh?m&`1 zq46gH)wV=;UrwfCT3F(m!Q5qYpa!#f6qr0wF=5b9rk%HF(ITc!*R3wIFaCcftGwPt z(kzx{$*>g5L<;u}HzS4XD%ml zmdStbJcY@pn`!fUmkzJ8N>*8Y+DOO^r}1f4ix-`?x|khoRvF%jiA)8)P{?$8j2_qN zcl3Lm9-s$xdYN9)>3j6BPFK)Jbovl|Sf_p((CHe!4hx@F)hd&&*Xb&{TBj>%pT;-n z{3+hA^QZYnjXxtF2XwxPZ`S#J8h>5qLwtwM-{5abbEnRS z`9_`Zq8FJiI#0syE_V_3M&trw$P=ezkHosV$8&I5c0(*-9KBE5DJOC-Xv zw}1bq~AD0_Xerm`%ryiG9_$S z5G|btfiAUNdV09SO2l9v+e#(H6HYOdQs=^ z@xwZQU)~;p1L*~ciC}9ao{nQ-@B>rpUzKBxv=cUusOP5Trs3QnvHxGh9e>s7AM{V1|HfYe z3QwH;nHHR49fYzuGc3W3l5xrDAI392SFXx>lWE3V9Ds9il3PyZaN5>oC3>9W-^7vC z3~KZ-@iD?tIkhg+6t{m;RGk2%>@I0&kf)o$+-^ls0(YABNbM(=l#ad@nKp_j=b~Xs ziR;xu_+)lxy6|+af!@}gO2H_x)p;nZ-tYxW5Omq=l`GzMp*GTLr>vZN1?e}^C$t*Z zvzEdIc2|HA2RFN_4#EkzMqKnbbw!?!?%B@M0^^5Z;K?x-%lg?Z>}wMV8zEqHZ$cr~Y#Wv>9+)KMUZatUqbRU8 z8t9qrek(H^C0Tuzq|cP2$WL7tzj+Dj5y^2SF1D154CnsB$xbz`$wV||n-cG%rsT$p z+3RHdadK(3-noj(2L#8c5lODg)V8pv(GEnNb@F>dEHQr>!qge@L>#qg)RAUtiOYqF ziiV_ETExwD)bQ<))?-9$)E(FiRBYyC@}issHS!j9n)~I1tarxnQ2LfjdIJ)*jp{0E z&1oTd%!Qbw$W58s!6ms>F z=p0!~_Mv~8jyaicOS*t(ntw`5uFi0Bc4*mH8kSkk$>!f0;FM zX_t14I55!ZVsg0O$D2iuEDb7(J>5|NKW^Z~kzm@dax z9(|As$U7^}LF%#`6r&UPB*6`!Rf74h~*C=ami6xUxYCwiJxdr$+`z zKSC4A%8!s%R&j*2si(OEc*fy!q)?%=TjDZJ2}O zxT6o>jlKXz_7_Y$N})}IG`*#KfMzs#R(SI#)3*ZEzCv%_tu(VTZ5J| zw2$5kK)xTa>xGFgS0?X(NecjzFVKG%VVn?neu=&eQ+DJ1APlY1E?Q1s!Kk=yf7Uho z>8mg_!U{cKqpvI3ucSkC2V`!d^XMDk;>GG~>6>&X_z75-kv0UjevS5ORHV^e8r{tr z-9z*y&0eq3k-&c_AKw~<`8dtjsP0XgFv6AnG?0eo5P14T{xW#b*Hn2gEnt5-KvN1z zy!TUSi>IRbD3u+h@;fn7fy{F&hAKx7dG4i!c?5_GnvYV|_d&F16p;)pzEjB{zL-zr z(0&AZUkQ!(A>ghC5U-)t7(EXb-3)tNgb=z`>8m8n+N?vtl-1i&*ftMbE~0zsKG^I$ zSbh+rUiucsb!Ax@yB}j>yGeiKIZk1Xj!i#K^I*LZW_bWQIA-}FmJ~^}>p=K$bX9F{}z{s^KWc~OK(zl_X57aB^J9v}yQ5h#BE$+C)WOglV)nd0WWtaF{7`_Ur`my>4*NleQG#xae4fIo(b zW(&|g*#YHZNvDtE|6}yHvu(hDekJ-t*f!2RK;FZHRMb*l@Qwkh*~CqQRNLaepXypX z1?%ATf_nHIu3z6gK<7Dmd;{`0a!|toT0ck|TL$U;7Wr-*piO@R)KrbUz8SXO0vr1K z>76arfrqImq!ny+VkH!4?x*IR$d6*;ZA}Mhro(mzUa?agrFZpHi*)P~4~4N;XoIvH z9N%4VK|j4mV2DRQUD!_-9fmfA2(YVYyL#S$B;vqu7fnTbAFMqH``wS7^B5=|1O&fL z)qq(oV6_u4x(I(**#mD}MnAy(C&B4a1n6V%$&=vrIDq^F_KhE5Uw8_@{V`_#M0vCu zaNUXB=n0HT@D+ppDXi8-vp{tj)?7+k>1j}VvEKRgQ~DWva}8*pp`W8~KRo*kJ*&X} zP!~2fxQr@dM*q0dI|)Fux=pZWBk==RI7i{^BQf`kWlD2%|@R9!JA7& zLbM$uJ12y}_62$|T|{)@OJZtzfpL^t@1nMTYHutrF#D+^?~CN~9`YQ@#&&@c_Zf)( zbC~y8!2LO8jHwQXv>G~1q?c68ipT*%dY&c{8wd_!Y#~tMJ7yk!F8| zt?m_CLVw6cU@@p(#h4cY&Qsfz2Xp3w^4Cg%m03Tmq~9n%hyoMH^KY7{(QkRyn_!YB zzZa!Tgr~5$MAG$x)Fs71#6j}Kvcv3=9VUX8CH< zbP3|fY8f#$K*<5JQ7whM(v=GN2k26Xsh)#0!HKS(koLgAp-;)8z0w&_Z=nG4v6n8u z&Tm0Fi){4_!Y5Kp?!zv$FKfUifQ{%c82uYfrvE{%ejUd72aNYmI*0z3-a-EYr+bB->oH3#t(AY3 zV{Z=(SJr;D#0(`u*dc*~9T7D8Pudw894%!>c4wU&V1m<~0InidR6fbi?yPl(z+sKa zdF*kS>_4^1UO>y4T%Ar>epSr5&vp`$KdY7B(F%P0@VyHk@1fJ=6X0=aGjD-)BrOJD zW}IU@hg~^2r>a1fQvjTtvL*mKJ7q;pfP*U2=URL`VB_Y_JojbZ+MS=vaVN0C6L_MV zG1#5=35-E`KsD%r>-Q_ndvJ2tOYcMMP9f*t0iJ`(Z`^+YP)h>@lR(@Wvrt-`0tHG+ zuP2R@@mx=T@fPoQ1s`e^1I0H*kQPBGDky@!ZQG@8jY-+2ihreG5q$6i{3vmDTg0j$ zzRb*-nKN@{_wD`V6+i*YS)?$XfrA-sW?js?SYU8#vXxxQCc|*K!EbpWfu)3~jwq6_@KC0m;3A%jH^18_a0;ksC2DEwa@2{9@{ z9@T??<4QwR69zk{UvcHHX;`ICOwrF;@U;etd@YE)4MzI1WCsadP=`%^B>xPS-{`=~ zZ+2im8meb#4p~XIL9}ZOBg7D8R=PC8V}ObDcxEEK(4yGKcyCQWUe{9jCs+@k!_y|I z%s{W(&>P4w@hjQ>PQL$zY+=&aDU6cWr#hG)BVCyfP)h>@3IG5I2mk;8K>)Ppba*!h z005B=001VF5fT=Y4_ytCUk`sv8hJckqSy&Gc2Jx^WJ$J~08N{il-M$fz_ML$)Cpil z(nOv_nlZB^c4s&&O3h=OLiCz&(|f0 zxWU_-JZy>hxP*gvR>CLnNeQ1~g;6{g#-}AbkIzWR;j=8=6!AHpKQCbjFYxf9h%bov zVi;eNa1>t-<14KERUW>^KwoF+8zNo`Y*WiQwq}3m0_2RYtL9Wmu`JaRaQMQ)`Si^6+VbM`!rH~T?DX2=(n4nT zf`G`(Rpq*pDk*v~wMYPZ@vMNZDMPnxMYmU!lA{Xfo?n=Ibb4y3eyY1@Dut4|Y^ml& zqs$r}jAo=B(Ml>ogeEjyv(E`=kBzPf2uv9TQtO$~bamD#=Tv`lNy(K|w$J2O6jS51 zzZtOCHDWz7W0=L1XDW5WR5mtLGc~W+>*vX5{e~U@rE~?7e>vKU-v8bj;F4#abtcV(3ZtwXo9ia93HiETyQXwW4a-0){;$OU*l` zW^bjkyZTJ6_DL^0}`*)#EZ|2nvKRzMLH9-~@Z6$v#t8Dm%(qpP+DgzNe6d)1q zBqhyF$jJTyYFvl_=a>#I8jhJ)d6SBNPg#xg2^kZ3NX8kQ74ah(Y5Z8mlXyzTD&}Q8 ziY(pj-N-V2f>&hZQJ`Di%wp2fN(I%F@l)3M8GcSdNy+#HuO{$I8NXubRlFkL)cY@b z#`v{}-^hRXEq*8B_cG=%PZvI$eo(|8Wc(2o8L#0_GX9L$1@yV>%7mGk)QTD1R*OvS z4OW;ym1)%k9Bfem0tOqq3yyAUWp&q|LsN!RDnxa|j;>R|Mm2rIv7=tej5GFaa+`#| z;7u9Z_^XV+vD@2hF8Xe63+Qd`oig6S9jX(*DbjzPb*K-H7c^7E-(~!R6E%TrgW;RvG;WS{Ziv*W*a*`9Bb;$Er3?MyF~5GcXv`k>U)n}lwv$Sp+H@IKA5$mKk0g*4Ln{!tfvITeY zzr%8JJ5BdcEYsR9eGzJ4B&$}4FMmbRU6{8{_w7Kl77@PNe7|Bc#c?5(C5&Z=kJ#(oM90D4`rh2S!|^L!P#e#1hkD5@~-- z`63GV0~*rOZSqw7k^#-Y$Q4z3Oa2SPRURqEahB1B^h{7~+p03SwzqL9QU#$3-X zdYtQ?-K5xDAdfomEd6(yPtZ!yY_<35bMedeq`z2JWorljz5-f9<^93HM-$#+acw%9r!JOM%O<|BR`W& zd-%j_?b^q7Kl6{q^N{cg2u;11rFB5EP+oqG9&pHD#_Mo@aNMj;LUvsl&nK(ca(hT( zzFc2oHC6WQv8g7jo+3ZSwK+9G$cvfRnql)?g=XeQ3+LTh3)79nhEle8OqS3T$qn(> z(=5Bg?EWq-ldEywgzXW965%H(9^ik*rH(8dNdkbcS9|ow&_r`X~R^R?B+(oTiMzzlx8KnHqUi z8Rh-)VAnS-CO+3}yxqm8)X+N+uzieFVm-F#syP#M1p5&$wX3MJ8 z+R@grZ*5G^Uh4I@VT=>C4RJNc^~3mx$kS1F{L?3)BzdduD2MZKdu#jNno&f2&d{?` zW(>$oktzY@GO{|Ln~Bt^A4)(%?l-&(Dm!iL#$K_xOyhwAf=K2<+Bom zw7|hl6E5}B$d%n0sfZvfQRy9Fyz2~ z83#=#LaHnf1th^k*p|ux8!!8pfHE!)x*%=_hAddl)P%4h4%&8!5-W#xqqb}c=H(i|wqcIS&oDQ{ zhI7N-$f$ra3=RjPmMh?-IEkJYQ<}R9Z!}wmp$#~Uc%u1oh#TP}wF*kJJmQX2#27kL z_dz(yKufo<=m71bZfLp^Ll#t3(IHkrgMcvx@~om%Ib(h(<$Da7urTI`x|%`wD--sN zJEEa>4DGSEG?0ulkosfj8IMNN4)B=ZtvGG{|4Fp=Xhg!wPNgYzS>{Bp%%Qa+624X@ X49Luk)baa85H9$5YCsTPT`SVRWMtMW diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 966055ef8..ffed3a254 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -org.gradle.parallel=true diff --git a/gradlew b/gradlew index 4f906e0c8..1b6c78733 100755 --- a/gradlew +++ b/gradlew @@ -1,7 +1,7 @@ -#!/usr/bin/env sh +#!/bin/sh # -# Copyright 2015 the original author or authors. +# Copyright Ā© 2015-2021 the original authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -17,67 +17,101 @@ # ############################################################################## -## -## Gradle start up script for UN*X -## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions Ā«$varĀ», Ā«${var}Ā», Ā«${var:-default}Ā», Ā«${var+SET}Ā», +# Ā«${var#prefix}Ā», Ā«${var%suffix}Ā», and Ā«$( cmd )Ā»; +# * compound commands having a testable exit status, especially Ā«caseĀ»; +# * various built-in commands including Ā«commandĀ», Ā«setĀ», and Ā«ulimitĀ». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# ############################################################################## # Attempt to set APP_HOME + # Resolve links: $0 may be a link -PRG="$0" -# Need this for relative symlinks. -while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null + +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` +APP_BASE_NAME=${0##*/} # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' # Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" +MAX_FD=maximum warn () { echo "$*" -} +} >&2 die () { echo echo "$*" echo exit 1 -} +} >&2 # OS specific support (must be 'true' or 'false'). cygwin=false msys=false darwin=false nonstop=false -case "`uname`" in - CYGWIN* ) - cygwin=true - ;; - Darwin* ) - darwin=true - ;; - MINGW* ) - msys=true - ;; - NONSTOP* ) - nonstop=true - ;; +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; esac CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar @@ -87,9 +121,9 @@ CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar if [ -n "$JAVA_HOME" ] ; then if [ -x "$JAVA_HOME/jre/sh/java" ] ; then # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" + JAVACMD=$JAVA_HOME/jre/sh/java else - JAVACMD="$JAVA_HOME/bin/java" + JAVACMD=$JAVA_HOME/bin/java fi if [ ! -x "$JAVACMD" ] ; then die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME @@ -98,7 +132,7 @@ Please set the JAVA_HOME variable in your environment to match the location of your Java installation." fi else - JAVACMD="java" + JAVACMD=java which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the @@ -106,80 +140,95 @@ location of your Java installation." fi # Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then - MAX_FD_LIMIT=`ulimit -H -n` - if [ $? -eq 0 ] ; then - if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then - MAX_FD="$MAX_FD_LIMIT" - fi - ulimit -n $MAX_FD - if [ $? -ne 0 ] ; then - warn "Could not set maximum file descriptor limit: $MAX_FD" - fi - else - warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" - fi +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac fi -# For Darwin, add options to specify how the application appears in the dock -if $darwin; then - GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" -fi +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. # For Cygwin or MSYS, switch paths to Windows format before running java -if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then - APP_HOME=`cygpath --path --mixed "$APP_HOME"` - CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` - - JAVACMD=`cygpath --unix "$JAVACMD"` - - # We build the pattern for arguments to be converted via cygpath - ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` - SEP="" - for dir in $ROOTDIRSRAW ; do - ROOTDIRS="$ROOTDIRS$SEP$dir" - SEP="|" - done - OURCYGPATTERN="(^($ROOTDIRS))" - # Add a user-defined pattern to the cygpath arguments - if [ "$GRADLE_CYGPATTERN" != "" ] ; then - OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" - fi +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + # Now convert the arguments - kludge to limit ourselves to /bin/sh - i=0 - for arg in "$@" ; do - CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` - CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option - - if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition - eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` - else - eval `echo args$i`="\"$arg\"" + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) fi - i=`expr $i + 1` + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg done - case $i in - 0) set -- ;; - 1) set -- "$args0" ;; - 2) set -- "$args0" "$args1" ;; - 3) set -- "$args0" "$args1" "$args2" ;; - 4) set -- "$args0" "$args1" "$args2" "$args3" ;; - 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; - esac fi -# Escape application args -save () { - for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done - echo " " -} -APP_ARGS=`save "$@"` +# Collect all arguments for the java command; +# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of +# shell script including quotes and variable substitutions, so put them in +# double quotes to make sure that they get re-expanded; and +# * put everything else in single quotes, so that it's not re-expanded. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# -# Collect all arguments for the java command, following the shell quoting and substitution rules -eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' exec "$JAVACMD" "$@" diff --git a/managementportal-client/build.gradle b/managementportal-client/build.gradle index ecaa47d3c..388cfd07f 100644 --- a/managementportal-client/build.gradle +++ b/managementportal-client/build.gradle @@ -1,3 +1,5 @@ +import org.jetbrains.kotlin.gradle.tasks.KotlinCompile + /* * Copyright (c) 2020. The Hyve * @@ -50,7 +52,7 @@ dependencies { dokkaHtmlPlugin("org.jetbrains.dokka:kotlin-as-java-plugin:1.5.0") } -compileKotlin { +tasks.withType(KotlinCompile) { kotlinOptions { jvmTarget = "11" apiVersion = "1.5" diff --git a/radar-auth/build.gradle b/radar-auth/build.gradle index 1d25bed3f..147386835 100644 --- a/radar-auth/build.gradle +++ b/radar-auth/build.gradle @@ -8,7 +8,7 @@ ext { jacksonVersion = '2.11.4' jacksonYamlVersion = '2.11.4' okhttpVersion = '4.9.1' - oauthJwtVersion = '3.12.0' + oauthJwtVersion = '3.18.2' commonsCodecVersion = '1.15' slf4jVersion = '1.7.30' junitVersion ='5.6.3' @@ -20,8 +20,7 @@ targetCompatibility = JavaVersion.VERSION_1_8 description = 'Library for authentication and authorization of JWT tokens issued by the RADAR platform' repositories { - jcenter() - mavenLocal() + mavenCentral() } configurations { From f424fe0972c47cbed1845471bde498d959c05fd1 Mon Sep 17 00:00:00 2001 From: Peyman Mohtashami Date: Thu, 21 Oct 2021 17:52:28 +0200 Subject: [PATCH 074/431] Fix first page loading and load more --- .../subject/subject-dialog.component.ts | 2 +- .../app/shared/subject/subject.component.ts | 25 +++++++++++++++---- 2 files changed, 21 insertions(+), 6 deletions(-) diff --git a/src/main/webapp/app/shared/subject/subject-dialog.component.ts b/src/main/webapp/app/shared/subject/subject-dialog.component.ts index a6c5303ca..45f33b892 100644 --- a/src/main/webapp/app/shared/subject/subject-dialog.component.ts +++ b/src/main/webapp/app/shared/subject/subject-dialog.component.ts @@ -58,7 +58,7 @@ export class SubjectDialogComponent implements OnInit { } private onSaveSuccess(result: Subject) { - this.eventManager.broadcast({name: 'subjectListModification', content: 'OK'}); + this.eventManager.broadcast({name: 'subjectListModification', content: result}); this.isSaving = false; this.activeModal.dismiss(result); } diff --git a/src/main/webapp/app/shared/subject/subject.component.ts b/src/main/webapp/app/shared/subject/subject.component.ts index b8f1316ab..d37931beb 100644 --- a/src/main/webapp/app/shared/subject/subject.component.ts +++ b/src/main/webapp/app/shared/subject/subject.component.ts @@ -119,9 +119,7 @@ export class SubjectComponent implements OnInit, OnDestroy, OnChanges { } ngOnInit() { - if(this.isProjectSpecific){ - this.loadAllFromProject(); - } else { + if(!this.isProjectSpecific){ this.loadAll(); } this.registerChangeInSubjects(); @@ -141,7 +139,16 @@ export class SubjectComponent implements OnInit, OnDestroy, OnChanges { } registerChangeInSubjects() { - this.eventSubscriber = this.eventManager.subscribe('subjectListModification', () => this.loadSubjects()); + this.eventSubscriber = this.eventManager.subscribe('subjectListModification', (result) => { + const modifiedSubject = result.content; + const subjectIndex = this.subjects.findIndex((s => s.id == modifiedSubject.id)); + if (subjectIndex < 0) { + this.totalItems++; + this.subjects = [modifiedSubject, ...this.subjects]; + } else { + this.subjects[subjectIndex] = modifiedSubject; + } + }); } private onError(error) { @@ -207,10 +214,18 @@ export class SubjectComponent implements OnInit, OnDestroy, OnChanges { } private onSuccess(data, headers) { - this.links = parseLinks(headers.get('link')); + console.log(data, headers) + if(headers.get('link')){ + this.links = parseLinks(headers.get('link')); + } this.totalItems = +headers.get('X-Total-Count'); this.queryCount = this.totalItems; + // remove redundant subjects from the list this.subjects = [...this.subjects, ...data]; + this.subjects = Array.from(new Set(this.subjects.map(a => a.id))) + .map(id => { + return this.subjects.find(a => a.id === id) + }) } applyFilter() { From 1864be0bbe5692337b35b98a8502dc40dab16483 Mon Sep 17 00:00:00 2001 From: Peyman Mohtashami Date: Thu, 21 Oct 2021 17:52:57 +0200 Subject: [PATCH 075/431] Fix subject e2e test --- .../integration/entities/subject.spec.ts | 88 ++++++------------- 1 file changed, 27 insertions(+), 61 deletions(-) diff --git a/src/test/javascript/e2e/cypress/integration/entities/subject.spec.ts b/src/test/javascript/e2e/cypress/integration/entities/subject.spec.ts index 55c84251f..067db88c4 100644 --- a/src/test/javascript/e2e/cypress/integration/entities/subject.spec.ts +++ b/src/test/javascript/e2e/cypress/integration/entities/subject.spec.ts @@ -25,13 +25,13 @@ describe('Subject e2e test', () => { it('should be able to create new subject', () => { cy.get('jhi-subjects button.create-subject').click(); // cy.wait(1000); - cy.get('[name=externalLink]').type('https://radar-base-test.org'); - cy.get('[name=externalId]').type('test-subject-1'); - cy.get('[name=personName]').type('Test Subject 1'); - cy.get('[name=dateOfBirth]').type('1980-01-01'); - cy.get('jhi-dictionary-mapper select').first().select('Human-readable-identifier'); - cy.get('jhi-dictionary-mapper input').first().type('Test Subject 1'); - cy.contains('jhi-dictionary-mapper button', 'Add').click() + cy.get('jhi-subject-dialog input[name=externalLink]').type('https://radar-base-test.org'); + cy.get('jhi-subject-dialog input[name=externalId]').type('test-subject-1'); + cy.get('jhi-subject-dialog input[name=personName]').type('Test Subject 1'); + cy.get('jhi-subject-dialog input[name=dateOfBirth]').type('1980-01-01'); + cy.get('jhi-subject-dialog jhi-dictionary-mapper select').first().select('Human-readable-identifier'); + cy.get('jhi-subject-dialog jhi-dictionary-mapper input').first().type('Test Subject 1'); + cy.contains('jhi-subject-dialog jhi-dictionary-mapper button', 'Add').click() cy.contains('jhi-subject-dialog button.btn-primary', 'Save').click(); cy.get('jhi-subjects .subject-row').should('have.length', 4); }); @@ -40,45 +40,45 @@ describe('Subject e2e test', () => { // cy.wait(1000); cy.contains('jhi-subjects .subject-row', 'test-subject-1').contains('button', 'Edit').click(); // cy.wait(1000); - cy.get('[name=externalLink]').clear().type('https://radar-base-test-edited.org'); + cy.get('jhi-subject-dialog input[name=externalLink]').clear().type('https://radar-base-test-edited.org'); cy.contains('jhi-subject-dialog button.btn-primary', 'Save').click(); cy.get('jhi-subjects .subject-row').should('have.length', 4); }); it('should have load subject row with subject-id, external-id, status, project, sources and attributes columns', () => { - cy.get('jhi-subjects .subject-row').first().find('.subject-row__select-row input') + cy.get('jhi-subjects .subject-row').last().find('.subject-row__select-row input') .invoke('attr', 'type') .should('eq', 'checkbox') - cy.get('jhi-subjects .subject-row').first().find('.subject-row__content .subject-row__subject-id .subject-row__field-label') + cy.get('jhi-subjects .subject-row').last().find('.subject-row__content .subject-row__subject-id .subject-row__field-label') .should('have.text', 'Subject Id') - cy.get('jhi-subjects .subject-row').first().find('.subject-row__content .subject-row__subject-id a') - .should('have.text','sub-1') + cy.get('jhi-subjects .subject-row').last().find('.subject-row__content .subject-row__subject-id a') + .should('have.text','sub-3') .invoke('attr', 'href') - .should('eq', '#/subject/sub-1') + .should('eq', '#/subject/sub-3') - cy.get('jhi-subjects .subject-row').first().find('.subject-row__content .subject-row__external-id .subject-row__field-label') + cy.get('jhi-subjects .subject-row').last().find('.subject-row__content .subject-row__external-id .subject-row__field-label') .should('have.text', 'External Id') - cy.get('jhi-subjects .subject-row').first().find('.subject-row__content .subject-row__status .subject-row__field-label') + cy.get('jhi-subjects .subject-row').last().find('.subject-row__content .subject-row__status .subject-row__field-label') .should('have.text', 'Status') - cy.get('jhi-subjects .subject-row').first().find('.subject-row__content .subject-row__status span.badge') + cy.get('jhi-subjects .subject-row').last().find('.subject-row__content .subject-row__status span.badge') .should('have.text','ACTIVATED') - cy.get('jhi-subjects .subject-row').first().find('.subject-row__content .subject-row__sources .subject-row__field-label') + cy.get('jhi-subjects .subject-row').last().find('.subject-row__content .subject-row__sources .subject-row__field-label') .should('have.text', 'Sources') - cy.get('jhi-subjects .subject-row').first().find('.subject-row__content .subject-row__sources a.form-control-static') - .should('have.text','E4: source-1') - .invoke('attr', 'href') - .should('eq', '#/source/source-1') + // cy.get('jhi-subjects .subject-row').first().find('.subject-row__content .subject-row__sources a.form-control-static') + // .should('have.text','E4: source-1') + // .invoke('attr', 'href') + // .should('eq', '#/source/source-1') - cy.get('jhi-subjects .subject-row').first().find('.subject-row__content .subject-row__attribute-data .subject-row__field-label') + cy.get('jhi-subjects .subject-row').last().find('.subject-row__content .subject-row__attribute-data .subject-row__field-label') .should('have.text', 'Attributes') - cy.get('jhi-subjects .subject-row').first().find('.subject-row__content .subject-row__attribute-data div span') + cy.get('jhi-subjects .subject-row').last().find('.subject-row__content .subject-row__attribute-data div span') .should('have.text',' N/A ') }) @@ -100,7 +100,7 @@ describe('Subject e2e test', () => { cy.get('jhi-subjects .subject-row').should('have.length', 4); }); - xit('should be able to filter subjects by human readable id', () => { + it('should be able to filter subjects by human readable id', () => { cy.get('#advanced-filter').click(); cy.get('#field-human-readable-id').type('Test'); cy.get('#apply-filter').click(); @@ -122,46 +122,12 @@ describe('Subject e2e test', () => { cy.get('#advanced-filter').click(); }); - it('should be able to filter subjects by date of birth from', () => { - cy.get('#advanced-filter').click(); - cy.get('#field_date_of_birth_from').type('1979-01-01'); - cy.get('#apply-filter').click(); - cy.get('jhi-subjects .subject-row').should('have.length', 1); - cy.get('#field_date_of_birth_from').type('1981-01-01'); - cy.get('#apply-filter').click(); - cy.get('jhi-subjects .subject-row').should('have.length', 0); - cy.get('#field_date_of_birth_from').clear(); - cy.get('#apply-filter').click(); - cy.get('jhi-subjects .subject-row').should('have.length', 4); - cy.get('#advanced-filter').click(); - }); - - it('should be able to filter subjects by date of birth to', () => { + it('should be able to filter subjects by date of birth', () => { cy.get('#advanced-filter').click(); - cy.get('#field_date_of_birth_to').type('1981-01-01'); + cy.get('#field_date_of_birth').type('1980-01-01'); cy.get('#apply-filter').click(); cy.get('jhi-subjects .subject-row').should('have.length', 1); - cy.get('#field_date_of_birth_to').type('1979-01-01'); - cy.get('#apply-filter').click(); - cy.get('jhi-subjects .subject-row').should('have.length', 0); - cy.get('#field_date_of_birth_to').clear(); - cy.get('#apply-filter').click(); - cy.get('jhi-subjects .subject-row').should('have.length', 4); - cy.get('#advanced-filter').click(); - }); - - xit('should be able to filter subjects by date of birth from and to', () => { - cy.get('#advanced-filter').click(); - cy.get('#field_date_of_birth_from').type('1979-01-01'); - cy.get('#field_date_of_birth_to').type('1981-01-01'); - cy.get('#apply-filter').click(); - cy.get('jhi-subjects .subject-row').should('have.length', 1); - cy.get('#field_date_of_birth_from').type('1981-01-01'); - cy.get('#field_date_of_birth_to').type('1982-01-01'); - cy.get('#apply-filter').click(); - cy.get('jhi-subjects .subject-row').should('have.length', 0); - cy.get('#field_date_of_birth_from').clear(); - cy.get('#field_date_of_birth_to').clear(); + cy.get('#field_date_of_birth').clear(); cy.get('#apply-filter').click(); cy.get('jhi-subjects .subject-row').should('have.length', 4); cy.get('#advanced-filter').click(); From e60a16102448039a4af44d49f6706443e307a361 Mon Sep 17 00:00:00 2001 From: Peyman Mohtashami Date: Tue, 26 Oct 2021 14:51:52 +0200 Subject: [PATCH 076/431] Add empty value to request options --- .../group/group-delete-dialog.component.html | 36 +++ .../group/group-delete-dialog.component.ts | 80 +++++ .../shared/group/group-dialog.component.html | 81 +++++ .../shared/group/group-dialog.component.ts | 103 ++++++ .../app/shared/group/group-popup.service.ts | 54 ++++ .../app/shared/group/group.component.html | 290 +++++++++++++++++ .../app/shared/group/group.component.scss | 107 +++++++ .../app/shared/group/group.component.ts | 300 ++++++++++++++++++ .../webapp/app/shared/group/group.module.ts | 67 ++++ .../webapp/app/shared/group/group.route.ts | 109 +++++++ .../webapp/app/shared/model/request.utils.ts | 3 +- src/main/webapp/i18n/en/group.json | 117 +++++++ .../integration/entities/group.spec.ts | 196 ++++++++++++ .../integration/entities/subject.spec.ts | 57 +++- 14 files changed, 1591 insertions(+), 9 deletions(-) create mode 100644 src/main/webapp/app/shared/group/group-delete-dialog.component.html create mode 100644 src/main/webapp/app/shared/group/group-delete-dialog.component.ts create mode 100644 src/main/webapp/app/shared/group/group-dialog.component.html create mode 100644 src/main/webapp/app/shared/group/group-dialog.component.ts create mode 100644 src/main/webapp/app/shared/group/group-popup.service.ts create mode 100644 src/main/webapp/app/shared/group/group.component.html create mode 100644 src/main/webapp/app/shared/group/group.component.scss create mode 100644 src/main/webapp/app/shared/group/group.component.ts create mode 100644 src/main/webapp/app/shared/group/group.module.ts create mode 100644 src/main/webapp/app/shared/group/group.route.ts create mode 100644 src/main/webapp/i18n/en/group.json create mode 100644 src/test/javascript/e2e/cypress/integration/entities/group.spec.ts diff --git a/src/main/webapp/app/shared/group/group-delete-dialog.component.html b/src/main/webapp/app/shared/group/group-delete-dialog.component.html new file mode 100644 index 000000000..bff23400d --- /dev/null +++ b/src/main/webapp/app/shared/group/group-delete-dialog.component.html @@ -0,0 +1,36 @@ +
    +
    +

    +

    +

    +

    + +
    +
    + +

    +

    +

    +

    +
    +
    + + + +
    +
    diff --git a/src/main/webapp/app/shared/group/group-delete-dialog.component.ts b/src/main/webapp/app/shared/group/group-delete-dialog.component.ts new file mode 100644 index 000000000..840d2b8fd --- /dev/null +++ b/src/main/webapp/app/shared/group/group-delete-dialog.component.ts @@ -0,0 +1,80 @@ +import { Component, OnDestroy, OnInit } from '@angular/core'; +import { ActivatedRoute } from '@angular/router'; + +import { NgbActiveModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap'; + +import { EventManager } from '../util/event-manager.service'; +import { SubjectPopupService } from './subject-popup.service'; + +import { Subject } from './subject.model'; +import { SubjectService } from './subject.service'; + +@Component({ + selector: 'jhi-subject-delete-dialog', + templateUrl: './subject-delete-dialog.component.html', +}) +export class SubjectDeleteDialogComponent { + + subject: Subject; + isDelete: boolean; + + constructor( + private subjectService: SubjectService, + public activeModal: NgbActiveModal, + private eventManager: EventManager, + ) { + } + + clear() { + this.activeModal.dismiss('cancel'); + } + + confirmDelete(login: string) { + if (this.isDelete) { + this.subjectService.delete(login).subscribe(() => { + this.activeModal.dismiss(true); + window.history.back(); + }); + } else { + this.subjectService.discontinue(this.subject).subscribe(() => { + this.eventManager.broadcast({name: 'subjectListModification', content: 'OK'}); + this.activeModal.dismiss(true); + window.history.back(); + }); + } + } +} + +@Component({ + selector: 'jhi-subject-delete-popup', + template: '', +}) +export class SubjectDeletePopupComponent implements OnInit, OnDestroy { + + modalRef: NgbModalRef; + routeSub: any; + + constructor( + private route: ActivatedRoute, + private subjectPopupService: SubjectPopupService, + ) { + } + + ngOnInit() { + this.routeSub = this.route.params.subscribe((params) => { + this.route.url.subscribe(url => { + if ('discontinue' === url[2].path) { + this.modalRef = this.subjectPopupService + .open(SubjectDeleteDialogComponent, params['login'], false); + } else if ('delete' === url[2].path) { + this.modalRef = this.subjectPopupService + .open(SubjectDeleteDialogComponent, params['login'], true); + } + }); + }); + } + + ngOnDestroy() { + this.routeSub.unsubscribe(); + } +} diff --git a/src/main/webapp/app/shared/group/group-dialog.component.html b/src/main/webapp/app/shared/group/group-dialog.component.html new file mode 100644 index 000000000..a50370c4f --- /dev/null +++ b/src/main/webapp/app/shared/group/group-dialog.component.html @@ -0,0 +1,81 @@ +
    + +
    + + +
    +
    + +
    + + +
    + +
    + + +
    +
    + + +
    +
    + + +
    +
    + + +
    + +
    + +
    + +
    +
    + + +
    +
    + + +
    +
    diff --git a/src/main/webapp/app/shared/group/group-dialog.component.ts b/src/main/webapp/app/shared/group/group-dialog.component.ts new file mode 100644 index 000000000..45f33b892 --- /dev/null +++ b/src/main/webapp/app/shared/group/group-dialog.component.ts @@ -0,0 +1,103 @@ +import { Component, OnDestroy, OnInit } from '@angular/core'; +import { ActivatedRoute } from '@angular/router'; + +import { NgbActiveModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap'; + +import { AlertService } from '../util/alert.service'; +import { EventManager } from '../util/event-manager.service'; +import { MinimalSource } from '../source'; +import { SubjectPopupService } from './subject-popup.service'; + +import { Subject } from './subject.model'; +import { SubjectService } from './subject.service'; + +@Component({ + selector: 'jhi-subject-dialog', + templateUrl: './subject-dialog.component.html', +}) +export class SubjectDialogComponent implements OnInit { + + readonly authorities: string[]; + readonly options: string[]; + + subject: Subject; + isSaving: boolean; + + attributeComponentEventPrefix: 'subjectAttributes'; + + constructor(public activeModal: NgbActiveModal, + private alertService: AlertService, + private subjectService: SubjectService, + private eventManager: EventManager) { + this.isSaving = false; + this.authorities = ['ROLE_USER', 'ROLE_SYS_ADMIN']; + this.options = ['Human-readable-identifier']; + } + + ngOnInit() { + this.eventManager.subscribe(this.attributeComponentEventPrefix + 'ListModification', (response) => { + this.subject.attributes = response.content; + }); + } + + clear() { + this.activeModal.dismiss('cancel'); + } + + save() { + this.isSaving = true; + if (this.subject.id !== null) { + this.subjectService.update(this.subject) + .subscribe((res: Subject) => + this.onSaveSuccess(res), (res: any) => this.onSaveError(res)); + } else { + this.subjectService.create(this.subject) + .subscribe((res: Subject) => + this.onSaveSuccess(res), (res: any) => this.onSaveError(res)); + } + } + + private onSaveSuccess(result: Subject) { + this.eventManager.broadcast({name: 'subjectListModification', content: result}); + this.isSaving = false; + this.activeModal.dismiss(result); + } + + private onSaveError(error) { + this.isSaving = false; + this.onError(error); + } + + private onError(error) { + this.alertService.error(error.message, null, null); + } + + trackDeviceById(index: number, item: MinimalSource) { + return item.id; + } +} + +@Component({ + selector: 'jhi-subject-popup', + template: '', +}) +export class SubjectPopupComponent implements OnInit, OnDestroy { + + modalRef: NgbModalRef; + routeSub: any; + + constructor(private route: ActivatedRoute, + private subjectPopupService: SubjectPopupService) { + } + + ngOnInit() { + this.routeSub = this.route.params.subscribe((params) => { + this.modalRef = this.subjectPopupService + .open(SubjectDialogComponent, params['login'], false, params['projectName']); + }); + } + + ngOnDestroy() { + this.routeSub.unsubscribe(); + } +} diff --git a/src/main/webapp/app/shared/group/group-popup.service.ts b/src/main/webapp/app/shared/group/group-popup.service.ts new file mode 100644 index 000000000..9fe9d02e9 --- /dev/null +++ b/src/main/webapp/app/shared/group/group-popup.service.ts @@ -0,0 +1,54 @@ +import { Injectable } from '@angular/core'; +import { Router } from '@angular/router'; +import { NgbModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap'; + +import { ProjectService } from '../project/project.service'; +import { Subject } from './subject.model'; +import { SubjectService } from './subject.service'; + +@Injectable({ providedIn: 'root' }) +export class SubjectPopupService { + private isOpen = false; + login ? = 'xxxyxxxx'; + + constructor( + private modalService: NgbModal, + private router: Router, + private subjectService: SubjectService, + private projectService: ProjectService, + ) { + } + + open(component: any, login?: string, isDelete?: boolean, projectName?: string): NgbModalRef { + if (this.isOpen) { + return; + } + this.isOpen = true; + + if (login) { + this.subjectService.find(login).subscribe((subject: Subject) => { + this.subjectModalRef(component, subject, isDelete); + }); + } else if (projectName) { + this.projectService.find(projectName).subscribe((project) => { + const subject = new Subject(); + subject.project = project; + return this.subjectModalRef(component, subject, isDelete); + }); + } + } + + subjectModalRef(component: any, subject: Subject, isDelete?: boolean): NgbModalRef { + const modalRef = this.modalService.open(component, {size: 'lg', backdrop: 'static'}); + modalRef.componentInstance.subject = subject; + modalRef.componentInstance.isDelete = isDelete; + modalRef.result.then(() => { + this.router.navigate([{outlets: {popup: null}}], {replaceUrl: true}); + this.isOpen = false; + }, () => { + this.router.navigate([{outlets: {popup: null}}], {replaceUrl: true}); + this.isOpen = false; + }); + return modalRef; + } +} diff --git a/src/main/webapp/app/shared/group/group.component.html b/src/main/webapp/app/shared/group/group.component.html new file mode 100644 index 000000000..b31f39f92 --- /dev/null +++ b/src/main/webapp/app/shared/group/group.component.html @@ -0,0 +1,290 @@ +     diff --git a/src/main/webapp/app/shared/group/group.component.scss b/src/main/webapp/app/shared/group/group.component.scss new file mode 100644 index 000000000..7e2b5702d --- /dev/null +++ b/src/main/webapp/app/shared/group/group.component.scss @@ -0,0 +1,107 @@ + +.subject-wrapper { + display: flex; +} +.subject-filter { + flex-grow: 0; + max-width: 200px; + display: flex; + flex-direction: column; + padding: 8px 16px; + border-right: 1px solid #dadada; +} +.subject-filter input { + max-width: 100%; +} +.subject-filter > button { + margin-top: 16px +} +.subject-filter label{ + width: 100%; +} + + +.subject-wrapper > section { + flex-grow: 1; + padding-left: 16px; +} + +.subject-sorting-action { + margin-right: 8px; + margin-bottom: 8px; +} + +.subject-row { + display: flex; + justify-content: space-between; + padding: 8px 16px; +} +.subject-row:nth-child(even) { + border-top: #eceeef; + background-color: #eceeef; +} +.subject-row__content { + display: flex; + flex-grow: 1; + flex-wrap: wrap; +} +.subject-row__content > * { + flex-basis: 80px; + flex-grow: 1; +} + +.subject-row__field-label { + position: relative; + font-weight: bold; + font-size: 12px; + line-height: 12px; + color: #5e5e5e; +} + + +.subject-list-actions { + margin-bottom: 8px; +} +.subject-list-actions > :not(:first-child) { + margin-left: 8px; +} +.subject-row__select-row { + display: flex; + flex-direction: column; + flex-grow: 0; + padding-top: 28px; + margin-right: 16px; +} + + +.subject-row__actions { + display: flex; + flex-direction: column; + flex-basis: unset; + flex-grow: 0 !important; + margin-left: 16px; +} +.subject-row__actions > *:not(:last-child) { + width: 100%; + margin-bottom: 4px; +} + +.subject-pagination { + display: flex; + margin-top: 8px; +} +.subject-pagination > * { + text-align: center; + flex-grow: 1; + padding: 16px; +} +.subject-pagination__all-loaded { + color: #dadada; + cursor: not-allowed; +} +.subject-pagination__load-more:hover { + background: rgba(169, 209, 255, 0.3); +} +.subject-pagination__load-more:active { + background: rgba(0, 120, 255, 0.15); +} diff --git a/src/main/webapp/app/shared/group/group.component.ts b/src/main/webapp/app/shared/group/group.component.ts new file mode 100644 index 000000000..d37931beb --- /dev/null +++ b/src/main/webapp/app/shared/group/group.component.ts @@ -0,0 +1,300 @@ +import { + Component, + Input, + OnChanges, + OnDestroy, + OnInit, + SimpleChange, + SimpleChanges, +} from '@angular/core'; +import { HttpErrorResponse, HttpResponse } from '@angular/common/http'; +import { ActivatedRoute, Router } from '@angular/router'; +import { BehaviorSubject, Observable, Subscription } from 'rxjs'; +import { map } from 'rxjs/operators'; + +import { ITEMS_PER_PAGE, Project } from '..'; +import { Subject } from './subject.model'; +import { + SubjectService, + SubjectFilterParams, + SubjectPaginationParams, SubjectLastParams, +} from './subject.service'; +import { PagingParams } from '../commons'; +import { AlertService } from '../util/alert.service'; +import { EventManager } from '../util/event-manager.service'; +import { parseLinks } from '../util/parse-links-util'; + +@Component({ + selector: 'jhi-subjects', + templateUrl: './subject.component.html', + styleUrls: ['./subject.component.scss'], +}) +export class SubjectComponent implements OnInit, OnDestroy, OnChanges { + sortingOptions = [ + 'login', + 'externalId', + ]; + pagingParams$: Observable; + project$ = new BehaviorSubject(null); + @Input() + get project() { return this.project$.value; } + set project(v: Project) { this.project$.next(v); } + subjects: Subject[]; + eventSubscriber: Subscription; + itemsPerPage: number; + links: any; + page: any; + predicate: any; + queryCount: any; + ascending: any; + totalItems: number; + routeData: any; + previousPage: any; + + filterSubjectExternalId = ''; + filterSubjectId = ''; + filterSubjectHumanReadableId = ''; + filterDateOfBirth = ''; + filterPersonName = ''; + filterEnrollmentDateFrom = ''; + filterEnrollmentDateTo = ''; + + isAdvancedFilterCollapsed = true; + + checked = false; + setOfCheckedId = new Set(); + + @Input() isProjectSpecific: boolean; + + constructor( + private subjectService: SubjectService, + private alertService: AlertService, + private eventManager: EventManager, + private activatedRoute: ActivatedRoute, + private router: Router, + ) { + this.subjects = []; + this.itemsPerPage = ITEMS_PER_PAGE; + this.pagingParams$ = this.activatedRoute.data.pipe(map(data => { + const fallback = { page: 1, predicate: 'login', ascending: true }; + return data['pagingParams'] || fallback; + })); + this.routeData = this.pagingParams$.subscribe(params => { + this.page = params.page; + this.previousPage = params.page; + this.ascending = params.ascending; + this.predicate = params.predicate; + }); + } + + loadSubjects() { + if (this.isProjectSpecific) { + this.loadAllFromProject(); + } else { + this.loadAll(); + } + } + + private loadAllFromProject() { + this.subjectService.findAllByProject( + this.project.projectName, + this.queryFilterParams, + this.queryPaginationParams, + ).subscribe( + (res: HttpResponse) => { + this.onSuccess(res.body, res.headers); + }, + (res: HttpErrorResponse) => this.onError(res), + ); + } + + loadAll() { + this.subjectService.query( + this.queryFilterParams, + this.queryPaginationParams, + ).subscribe( + (res: HttpResponse) => this.onSuccess(res.body, res.headers), + (res: HttpErrorResponse) => this.onError(res), + ); + } + + ngOnInit() { + if(!this.isProjectSpecific){ + this.loadAll(); + } + this.registerChangeInSubjects(); + } + + ngOnDestroy() { + this.eventManager.destroy(this.eventSubscriber); + this.routeData.unsubscribe(); + } + + trackLogin(index: number, item: Subject) { + return item.login; + } + + trackKey(index: number, item: any) { + return item.key; + } + + registerChangeInSubjects() { + this.eventSubscriber = this.eventManager.subscribe('subjectListModification', (result) => { + const modifiedSubject = result.content; + const subjectIndex = this.subjects.findIndex((s => s.id == modifiedSubject.id)); + if (subjectIndex < 0) { + this.totalItems++; + this.subjects = [modifiedSubject, ...this.subjects]; + } else { + this.subjects[subjectIndex] = modifiedSubject; + } + }); + } + + private onError(error) { + this.alertService.error(error.message, null, null); + } + + ngOnChanges(changes: SimpleChanges) { + this.subjects = []; + const project: SimpleChange = changes.project ? changes.project : null; + if (project) { + this.project = project.currentValue; + this.loadAllFromProject(); + } + } + + get queryFilterParams(): SubjectFilterParams { + const params = { + login: this.filterSubjectId.trim() || undefined, + externalId: this.filterSubjectExternalId.trim() || undefined, + personName: this.filterPersonName.trim() || undefined, + humanReadableIdentifier: this.filterSubjectHumanReadableId.trim() || undefined, + dateOfBirth: undefined, + enrollmentDate: undefined, + }; + let enrollmentDateFrom = this.filterEnrollmentDateFrom.trim(); + let enrollmentDateTo = this.filterEnrollmentDateTo.trim(); + if (enrollmentDateFrom || enrollmentDateTo) { + const timeZone = Intl.DateTimeFormat().resolvedOptions().timeZone; + params.enrollmentDate = { + from: enrollmentDateFrom ? enrollmentDateFrom + '[' + timeZone + ']' : undefined, + to: enrollmentDateTo ? enrollmentDateTo + '[' + timeZone + ']' : undefined, + }; + } + if (this.filterDateOfBirth) { + params.dateOfBirth = { + is: this.filterDateOfBirth, + }; + } + + return params; + } + + get queryPaginationParams(): SubjectPaginationParams { + const subjects = this.subjects || []; + + let last: SubjectLastParams | null; + if (subjects.length > 0) { + const lastSubject = subjects[subjects.length - 1] + last = { + id: lastSubject.id, + login: lastSubject.login, + externalId: lastSubject.externalId, + } + } else { + last = null; + } + + return { + last, + size: this.itemsPerPage, + sort: [this.predicate + ',' + (this.ascending ? 'asc' : 'desc')], + }; + } + + private onSuccess(data, headers) { + console.log(data, headers) + if(headers.get('link')){ + this.links = parseLinks(headers.get('link')); + } + this.totalItems = +headers.get('X-Total-Count'); + this.queryCount = this.totalItems; + // remove redundant subjects from the list + this.subjects = [...this.subjects, ...data]; + this.subjects = Array.from(new Set(this.subjects.map(a => a.id))) + .map(id => { + return this.subjects.find(a => a.id === id) + }) + } + + applyFilter() { + this.subjects = []; + this.loadSubjects(); + } + + loadMore() { + this.page = this.page + 1; + this.transition(); + } + + loadPage(page) { + if (page !== this.previousPage) { + this.previousPage = page; + this.transition(); + } + } + + updateSortingSortBy(predicate) { + this.subjects = []; + this.predicate = predicate; + this.page = 1; + this.transition(); + } + + updateSortingOrder(direction) { + this.subjects = []; + this.ascending = direction === 'asc'; + this.page = 1; + this.transition(); + } + + selectAll(checked: boolean = true): void { + this.subjects.forEach(({ id }) => this.updateCheckedSet(id, checked)); + this.refreshCheckedStatus(); + } + + onItemChecked(id: number, checked: boolean): void { + this.updateCheckedSet(id, checked); + this.refreshCheckedStatus(); + } + + refreshCheckedStatus(): void { + this.checked = this.subjects.every(({ id }) => this.setOfCheckedId.has(id)) && (this.subjects.length > 0); + } + + updateCheckedSet(id: number, checked: boolean): void { + if (checked) { + this.setOfCheckedId.add(id); + } else { + this.setOfCheckedId.delete(id); + } + } + + addSelectedToGroup() { + // TODO implement function + } + + transition() { + if (this.isProjectSpecific) { + this.loadSubjects(); + } else { + this.router.navigate(['/subject'], { + queryParams: { + page: this.page, + sort: this.predicate + ',' + (this.ascending ? 'asc' : 'desc'), + }, + }).then(() => this.loadSubjects()); + } + } +} diff --git a/src/main/webapp/app/shared/group/group.module.ts b/src/main/webapp/app/shared/group/group.module.ts new file mode 100644 index 000000000..f2b3f4010 --- /dev/null +++ b/src/main/webapp/app/shared/group/group.module.ts @@ -0,0 +1,67 @@ +import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core'; +import { RouterModule } from '@angular/router'; +import { QRCodeModule } from 'angularx-qrcode'; + +import { ManagementPortalSharedModule } from '../../shared'; +import { + SubjectComponent, + SubjectDeleteDialogComponent, + SubjectDeletePopupComponent, + SubjectDetailComponent, + SubjectDialogComponent, + SubjectPairDialogComponent, + SubjectPairPopupComponent, + SubjectPopupComponent, + subjectPopupRoute, + SubjectRevisionComponent, + SubjectRevisionListComponent, + subjectRoute, +} from './'; +import { + SubjectSourceAssignerDialogComponent, + SubjectSourceAssignerPopupComponent, +} from './source-assigner/source-assigner.component'; + +const ENTITY_STATES = [ + ...subjectRoute, + ...subjectPopupRoute, +]; + +@NgModule({ + imports: [ + ManagementPortalSharedModule, + RouterModule.forRoot(ENTITY_STATES, {useHash: true}), + QRCodeModule, + ], + declarations: [ + SubjectComponent, + SubjectDetailComponent, + SubjectRevisionComponent, + SubjectRevisionListComponent, + SubjectDialogComponent, + SubjectDeleteDialogComponent, + SubjectPairDialogComponent, + SubjectPopupComponent, + SubjectDeletePopupComponent, + SubjectPairPopupComponent, + SubjectSourceAssignerDialogComponent, + SubjectSourceAssignerPopupComponent, + ], + entryComponents: [ + SubjectComponent, + SubjectDialogComponent, + SubjectPopupComponent, + SubjectDeleteDialogComponent, + SubjectDeletePopupComponent, + SubjectPairDialogComponent, + SubjectPairPopupComponent, + SubjectSourceAssignerDialogComponent, + SubjectSourceAssignerPopupComponent, + ], + schemas: [CUSTOM_ELEMENTS_SCHEMA], + exports: [ + SubjectComponent, + ], +}) +export class ManagementPortalSharedSubjectModule { +} diff --git a/src/main/webapp/app/shared/group/group.route.ts b/src/main/webapp/app/shared/group/group.route.ts new file mode 100644 index 000000000..dbd3c54de --- /dev/null +++ b/src/main/webapp/app/shared/group/group.route.ts @@ -0,0 +1,109 @@ +import { Routes } from '@angular/router'; + +import { UserRouteAccessService } from '../../shared'; + +import { PROJECT_ADMIN, SYSTEM_ADMIN } from '../constants/common.constants'; +import { SubjectSourceAssignerPopupComponent } from './source-assigner/source-assigner.component'; +import { SubjectDeletePopupComponent } from './subject-delete-dialog.component'; +import { SubjectDetailComponent } from './subject-detail.component'; +import { SubjectPopupComponent } from './subject-dialog.component'; +import { SubjectPairPopupComponent } from './subject-pair-dialog.component'; +import { SubjectRevisionListComponent } from './subject-revision-list.component'; +import { SubjectRevisionComponent } from './subject-revision.component'; +import { ResolvePagingParams } from '../commons'; + +export const subjectRoute: Routes = [ + { + path: 'subject/:login', + component: SubjectDetailComponent, + data: { + authorities: [SYSTEM_ADMIN, PROJECT_ADMIN], + pageTitle: 'managementPortalApp.subject.home.title', + }, + canActivate: [UserRouteAccessService], + }, + { + path: 'subject/:login/revisions', + component: SubjectRevisionListComponent, + resolve: { + 'pagingParams': ResolvePagingParams, + }, + data: { + authorities: [SYSTEM_ADMIN, PROJECT_ADMIN], + pageTitle: 'managementPortalApp.subject.home.title', + }, + canActivate: [UserRouteAccessService], + }, + { + path: 'subject/:login/revisions/:revisionNb', + component: SubjectRevisionComponent, + data: { + authorities: [SYSTEM_ADMIN, PROJECT_ADMIN], + pageTitle: 'managementPortalApp.subject.home.title', + }, + canActivate: [UserRouteAccessService], + }, +]; + +export const subjectPopupRoute: Routes = [ + { + path: 'project-subject-new/:projectName', + component: SubjectPopupComponent, + data: { + authorities: [SYSTEM_ADMIN, PROJECT_ADMIN], + pageTitle: 'managementPortalApp.subject.home.title', + }, + canActivate: [UserRouteAccessService], + outlet: 'popup', + }, + { + path: 'project-subject/:projectName/:login/edit', + component: SubjectPopupComponent, + data: { + authorities: [SYSTEM_ADMIN, PROJECT_ADMIN], + pageTitle: 'managementPortalApp.subject.home.title', + }, + canActivate: [UserRouteAccessService], + outlet: 'popup', + }, + { + path: 'subject/:login/delete', + component: SubjectDeletePopupComponent, + data: { + authorities: [SYSTEM_ADMIN], + pageTitle: 'managementPortalApp.subject.home.title', + }, + canActivate: [UserRouteAccessService], + outlet: 'popup', + }, + { + path: 'subject/:login/pairApp', + component: SubjectPairPopupComponent, + data: { + authorities: [SYSTEM_ADMIN, PROJECT_ADMIN], + pageTitle: 'managementPortalApp.subject.home.title', + }, + canActivate: [UserRouteAccessService], + outlet: 'popup', + }, + { + path: 'subject/:login/sources', + component: SubjectSourceAssignerPopupComponent, + data: { + authorities: [SYSTEM_ADMIN, PROJECT_ADMIN], + pageTitle: 'managementPortalApp.subject.home.title', + }, + canActivate: [UserRouteAccessService], + outlet: 'popup', + }, + { + path: 'subject/:login/discontinue', + component: SubjectDeletePopupComponent, + data: { + authorities: [SYSTEM_ADMIN, PROJECT_ADMIN], + pageTitle: 'managementPortalApp.subject.home.title', + }, + canActivate: [UserRouteAccessService], + outlet: 'popup', + }, +]; diff --git a/src/main/webapp/app/shared/model/request.utils.ts b/src/main/webapp/app/shared/model/request.utils.ts index 4200432bf..c7a0d80d8 100644 --- a/src/main/webapp/app/shared/model/request.utils.ts +++ b/src/main/webapp/app/shared/model/request.utils.ts @@ -1,7 +1,7 @@ import { HttpParams } from '@angular/common/http'; const addRequestOptions = (options: HttpParams, key: string, value?: any): HttpParams => { - if (typeof value === 'undefined' || value === null || value === '') { + if (typeof value === 'undefined' || value === null) { // || value === '' // do nothing } else if (Array.isArray(value)) { value.forEach((v) => { @@ -24,6 +24,5 @@ export const createRequestOption = (req?: any): HttpParams => { options = addRequestOptions(options, key, req[key]); }); } - console.log(options); return options; }; diff --git a/src/main/webapp/i18n/en/group.json b/src/main/webapp/i18n/en/group.json new file mode 100644 index 000000000..73a2ed6a2 --- /dev/null +++ b/src/main/webapp/i18n/en/group.json @@ -0,0 +1,117 @@ +{ + "managementPortalApp": { + "subject" : { + "home": { + "title": "Subjects", + "createLabel": "Create a new Subject", + "createOrEditLabel": "Create or edit a Subject", + "pairAppLabel": "Pair an application" + }, + "created": "A new Subject is created with identifier {{ param }}", + "updated": "A Subject is updated with identifier {{ param }}", + "deleted": "A Subject is deleted with identifier {{ param }}", + "delete": { + "question": "Are you sure you want to delete Subject {{ id }}?" + }, + "detail": { + "title": "Subject" + }, + "filter": { + "title": "Filter", + "applyButton": "Apply filter", + "advancedFilter": "Advanced Filter", + "from": "From", + "to": "To" + }, + "login": "Login", + "email": "Email", + "externalLink": "External Link", + "externalId": "External Id", + "humanReadableId": "Human Readable ID", + "enrolmentDate": "Enrolment Date", + "removed": "Removed", + "activated": "Activated", + "langKey": "Language", + "project": "Project", + "sources": "Sources", + "createdBy": "Created By", + "createdDate": "Created Date", + "dateOfBirth": "Date of Birth", + "enrollmentDate": "Enrollment Date", + "lastModifiedBy": "Last Modified By", + "lastModifiedDate": "Last Modified Date", + "personName": "Name", + "pairing": "Pairing", + "actions": "Actions", + "pairApp": "Pair App", + "pairSources": { + "button" : "Pair Sources", + "title" : "Assign or Remove sources ", + "Id" : "Id", + "sourceDescription" : "Source Description", + "remove" : "Remove", + "assignedSources" : "Assigned sources", + "availableSources" : "Available sources", + "sourceType": "Device type", + "sourceId": "Source ID", + "sourceName": "Source Name", + "expectedSourceName": "Physical ID" + }, + "clientApp": "Client app", + "resource": "Protected resource", + "attributeData" : "Attributes", + "status" : { + "title" : "Status", + "discontinued" : "DISCONTINUED", + "active" : "ACTIVATED", + "deactivated" : "DEACTIVATED", + "invalid": "INVALID" + }, + "discontinue" : { + "operation" : "Discontinue", + "title" : "Confirm discontinue operation", + "question" : "Are you sure you want to discontinue Subject {{ id }}?" + }, + "discontinued": "A Subject is discontinued with identifier {{ param }}", + "sorting": { + "sortByLabel": "Sort by", + "sortOrderLabel": "Order", + "id": "Id", + "login": "Subject Id", + "externalId": "External Id", + "authority": "Status", + "asc": "Ascending", + "desc": "Descending" + }, + "subjectId" : "Subject Id", + "baseUrl" : "Base Url", + "tokenName" : "Token Name", + "tokenTimeoutHour": "1 hour", + "tokenTimeoutHours": "{{hours}} hours", + "tokenTimeoutDays": "{{days}} days", + "tokenTimeoutMinutes": "{{minutes}} minutes", + "validUntil": "Valid until", + "validity": "Validity", + "selectAll": "Select all", + "clearSelectedItems": "Clear selected items", + "addSelectedToGroup": "Add to group", + "group": "Group", + "loadMore": "Load more ({{shown}}/{{total}} shown)", + "allLoaded": "All {{total}} subjects loaded", + "generateToken": "Generate QR code", + "generatePersistentToken": "Generate persistent QR code" + } + }, + "error": { + "patientEmailRequired": "A valid email is required to activate the subject account", + "subjectExists" : "A subject with given project-id and external-id already exists", + "validation": "Validation error, check the entered values in the fields.", + "loginNotParticipant": "Supplied login is not a participant in any study", + "loginRequired": "A subject login is required", + "sourceNotFound": "A source with that sourceName is not assigned to the subject.", + "sourceNameExists": "A source with that name already exists.", + "sourceTypeExists": "The subject has already been assigned a source of this type.", + "activeParticipantProjectNotFound": "The subject does not have an active participant project", + "sourceTypeNotProvided": "The request does not include valid source-type properties" + } +} diff --git a/src/test/javascript/e2e/cypress/integration/entities/group.spec.ts b/src/test/javascript/e2e/cypress/integration/entities/group.spec.ts new file mode 100644 index 000000000..b92d3c0b6 --- /dev/null +++ b/src/test/javascript/e2e/cypress/integration/entities/group.spec.ts @@ -0,0 +1,196 @@ +import { login } from '../util/login'; + +describe('Subject e2e test', () => { + before(() => { + login(); + cy.visit('./'); + }); + + beforeEach(() => { + cy.wait(100); + Cypress.Cookies.preserveOnce('oAtkn'); + }); + + it('should load Subjects', () => { + cy.contains('jhi-home .card-title', 'radar').click(); + cy.get('jhi-subjects .subject-row').should('have.length', 3); + }); + + it('should load create Subject dialog', () => { + cy.get('jhi-subjects button.create-subject').click(); + cy.get('jhi-subject-dialog h4.modal-title').first().should('have.text', 'Create or edit a Subject'); + cy.get('jhi-subject-dialog button.close').click(); + }); + + it('should be able to create new subject', () => { + cy.get('jhi-subjects button.create-subject').click(); + // cy.wait(1000); + cy.get('jhi-subject-dialog input[name=externalLink]').type('https://radar-base-test.org'); + cy.get('jhi-subject-dialog input[name=externalId]').type('test-subject-1'); + cy.get('jhi-subject-dialog input[name=personName]').type('Test Subject 1'); + cy.get('jhi-subject-dialog input[name=dateOfBirth]').type('1980-01-01'); + cy.get('jhi-subject-dialog jhi-dictionary-mapper select').first().select('Human-readable-identifier'); + cy.get('jhi-subject-dialog jhi-dictionary-mapper input').first().type('Test Subject 1'); + cy.contains('jhi-subject-dialog jhi-dictionary-mapper button', 'Add').click() + cy.contains('jhi-subject-dialog button.btn-primary', 'Save').click(); + cy.get('jhi-subjects .subject-row').should('have.length', 4); + }); + + it('should be able to edit a subject', () => { + // cy.wait(1000); + cy.contains('jhi-subjects .subject-row', 'test-subject-1').contains('button', 'Edit').click(); + // cy.wait(1000); + cy.get('jhi-subject-dialog input[name=externalLink]').clear().type('https://radar-base-test-edited.org'); + cy.contains('jhi-subject-dialog button.btn-primary', 'Save').click(); + cy.get('jhi-subjects .subject-row').should('have.length', 4); + }); + + it('should have load subject row with subject-id, external-id, status, project, sources and attributes columns', () => { + + // TODO better to test first with all added props + cy.get('jhi-subjects .subject-row').last().find('.subject-row__select-row input') + .invoke('attr', 'type') + .should('eq', 'checkbox') + + cy.get('jhi-subjects .subject-row').last().find('.subject-row__content .subject-row__subject-id .subject-row__field-label') + .should('have.text', 'Subject Id') + + cy.get('jhi-subjects .subject-row').last().find('.subject-row__content .subject-row__subject-id a') + .should('have.text','sub-3') + .invoke('attr', 'href') + .should('eq', '#/subject/sub-3') + + cy.get('jhi-subjects .subject-row').last().find('.subject-row__content .subject-row__external-id .subject-row__field-label') + .should('have.text', 'External Id') + + cy.get('jhi-subjects .subject-row').last().find('.subject-row__content .subject-row__status .subject-row__field-label') + .should('have.text', 'Status') + + cy.get('jhi-subjects .subject-row').last().find('.subject-row__content .subject-row__status span.badge') + .should('have.text','ACTIVATED') + + cy.get('jhi-subjects .subject-row').last().find('.subject-row__content .subject-row__sources .subject-row__field-label') + .should('have.text', 'Sources') + + // cy.get('jhi-subjects .subject-row').first().find('.subject-row__content .subject-row__sources a.form-control-static') + // .should('have.text','E4: source-1') + // .invoke('attr', 'href') + // .should('eq', '#/source/source-1') + + cy.get('jhi-subjects .subject-row').last().find('.subject-row__content .subject-row__attribute-data .subject-row__field-label') + .should('have.text', 'Attributes') + + cy.get('jhi-subjects .subject-row').last().find('.subject-row__content .subject-row__attribute-data div span') + .should('have.text',' N/A ') + }) + + it('should be able to filter subjects by subject id', () => { + cy.get('#field-subject-id').type('b-1'); + cy.get('#apply-filter').click(); + cy.get('jhi-subjects .subject-row').should('have.length', 1); + cy.get('#field-subject-id').clear(); + cy.get('#apply-filter').click(); + cy.get('jhi-subjects .subject-row').should('have.length', 4); + }); + + it('should be able to filter subjects by subject external id', () => { + cy.get('#field-subject-external-id').type('test-subject-1'); + cy.get('#apply-filter').click(); + cy.get('jhi-subjects .subject-row').should('have.length', 1); + cy.get('#field-subject-external-id').clear(); + cy.get('#apply-filter').click(); + cy.get('jhi-subjects .subject-row').should('have.length', 4); + }); + + it('should be able to filter subjects by human readable id', () => { + cy.get('#advanced-filter').click(); + cy.get('#field-human-readable-id').type('Test'); + cy.get('#apply-filter').click(); + cy.get('jhi-subjects .subject-row').should('have.length', 1); + cy.get('#field-human-readable-id').clear(); + cy.get('#apply-filter').click(); + cy.get('jhi-subjects .subject-row').should('have.length', 4); + cy.get('#advanced-filter').click(); + }); + + it('should be able to filter subjects by person name', () => { + cy.get('#advanced-filter').click(); + cy.get('#field-person-name').type('Test'); + cy.get('#apply-filter').click(); + cy.get('jhi-subjects .subject-row').should('have.length', 1); + cy.get('#field-person-name').clear(); + cy.get('#apply-filter').click(); + cy.get('jhi-subjects .subject-row').should('have.length', 4); + cy.get('#advanced-filter').click(); + }); + + // TODO Filter by group + + it('should be able to filter subjects by date of birth', () => { + cy.get('#advanced-filter').click(); + cy.get('#field_date_of_birth').type('1980-01-01'); + cy.get('#apply-filter').click(); + cy.get('jhi-subjects .subject-row').should('have.length', 1); + cy.get('#field_date_of_birth').clear(); + cy.get('#apply-filter').click(); + cy.get('jhi-subjects .subject-row').should('have.length', 4); + cy.get('#advanced-filter').click(); + }); + + // TODO Filter by Enrollment Date + + // TODO one of them doesn't work + it('should be able to sort subjects by subject id in asc/desc order', () => { + cy.get('jhi-subjects #field-order-by').click(); + cy.get('jhi-subjects #order-by-desc').click(); + cy.get('jhi-subjects .subject-row').first().should('contain.text', 'sub-3'); + cy.get('jhi-subjects #field-order-by').click(); + cy.get('jhi-subjects #order-by-asc').click(); + cy.get('jhi-subjects .subject-row').first().should('contain.text', 'sub-1'); + }); + + + it('should be able to sort subjects by external id in asc/desc order', () => { + // cy.get('jhi-subjects #field-order-by').click(); + // cy.get('jhi-subjects #order-by-desc').click(); + // cy.get('jhi-subjects .subject-row').first().should('contain.text', 'sub-3'); + // cy.get('jhi-subjects #field-order-by').click(); + // cy.get('jhi-subjects #order-by-asc').click(); + // cy.get('jhi-subjects .subject-row').first().should('contain.text', 'sub-1'); + }); + + it('should be able to delete a subject without source', () => { + cy.contains('jhi-subjects .subject-row', 'test-subject-1').find('a').first().click(); + cy.contains('jhi-subject-detail button', 'Delete').click(); + cy.contains('jhi-subject-delete-dialog button', 'Delete').click(); + cy.get('jhi-subjects .subject-row').should('have.length', 3); + }); + + // it('should be able to create 20 new subject', () => { + // for(let i = 0; i < 20; i++) { + // cy.get('jhi-subjects button.create-subject').click(); + // // cy.wait(1000); + // cy.get('jhi-subject-dialog input[name=externalLink]').type('https://radar-base-test.org'); + // cy.get('jhi-subject-dialog input[name=externalId]').type('test-subject-'+ i); + // cy.get('jhi-subject-dialog input[name=personName]').type('Test Subject '+ i); + // cy.get('jhi-subject-dialog input[name=dateOfBirth]').type('1980-01-01'); + // cy.get('jhi-subject-dialog jhi-dictionary-mapper select').first().select('Human-readable-identifier'); + // cy.get('jhi-subject-dialog jhi-dictionary-mapper input').first().type('Test Subject '+ i); + // cy.contains('jhi-subject-dialog jhi-dictionary-mapper button', 'Add').click() + // cy.contains('jhi-subject-dialog button.btn-primary', 'Save').click(); + // cy.get('jhi-subjects .subject-row').should('have.length', 4 + i); + // } + // }); + + // it('should be able to delete all created subjects', () => { + // for(let i = 5; i < 20; i++) { + // cy.contains('jhi-subjects .subject-row', 'test-subject-' + i ).find('a').first().click(); + // cy.contains('jhi-subject-detail button', 'Delete').click(); + // cy.contains('jhi-subject-delete-dialog button', 'Delete').click(); + // // cy.get('jhi-subjects .subject-row').should('have.length', 3); + // } + // cy.get('jhi-subjects .subject-row').should('have.length', 3); + // + // }); + +}); diff --git a/src/test/javascript/e2e/cypress/integration/entities/subject.spec.ts b/src/test/javascript/e2e/cypress/integration/entities/subject.spec.ts index 067db88c4..b92d3c0b6 100644 --- a/src/test/javascript/e2e/cypress/integration/entities/subject.spec.ts +++ b/src/test/javascript/e2e/cypress/integration/entities/subject.spec.ts @@ -46,6 +46,8 @@ describe('Subject e2e test', () => { }); it('should have load subject row with subject-id, external-id, status, project, sources and attributes columns', () => { + + // TODO better to test first with all added props cy.get('jhi-subjects .subject-row').last().find('.subject-row__select-row input') .invoke('attr', 'type') .should('eq', 'checkbox') @@ -122,6 +124,8 @@ describe('Subject e2e test', () => { cy.get('#advanced-filter').click(); }); + // TODO Filter by group + it('should be able to filter subjects by date of birth', () => { cy.get('#advanced-filter').click(); cy.get('#field_date_of_birth').type('1980-01-01'); @@ -135,13 +139,7 @@ describe('Subject e2e test', () => { // TODO Filter by Enrollment Date - it('should be able to delete a subject without source', () => { - cy.contains('jhi-subjects .subject-row', 'test-subject-1').find('a').first().click(); - cy.contains('jhi-subject-detail button', 'Delete').click(); - cy.contains('jhi-subject-delete-dialog button', 'Delete').click(); - cy.get('jhi-subjects .subject-row').should('have.length', 3); - }); - + // TODO one of them doesn't work it('should be able to sort subjects by subject id in asc/desc order', () => { cy.get('jhi-subjects #field-order-by').click(); cy.get('jhi-subjects #order-by-desc').click(); @@ -150,4 +148,49 @@ describe('Subject e2e test', () => { cy.get('jhi-subjects #order-by-asc').click(); cy.get('jhi-subjects .subject-row').first().should('contain.text', 'sub-1'); }); + + + it('should be able to sort subjects by external id in asc/desc order', () => { + // cy.get('jhi-subjects #field-order-by').click(); + // cy.get('jhi-subjects #order-by-desc').click(); + // cy.get('jhi-subjects .subject-row').first().should('contain.text', 'sub-3'); + // cy.get('jhi-subjects #field-order-by').click(); + // cy.get('jhi-subjects #order-by-asc').click(); + // cy.get('jhi-subjects .subject-row').first().should('contain.text', 'sub-1'); + }); + + it('should be able to delete a subject without source', () => { + cy.contains('jhi-subjects .subject-row', 'test-subject-1').find('a').first().click(); + cy.contains('jhi-subject-detail button', 'Delete').click(); + cy.contains('jhi-subject-delete-dialog button', 'Delete').click(); + cy.get('jhi-subjects .subject-row').should('have.length', 3); + }); + + // it('should be able to create 20 new subject', () => { + // for(let i = 0; i < 20; i++) { + // cy.get('jhi-subjects button.create-subject').click(); + // // cy.wait(1000); + // cy.get('jhi-subject-dialog input[name=externalLink]').type('https://radar-base-test.org'); + // cy.get('jhi-subject-dialog input[name=externalId]').type('test-subject-'+ i); + // cy.get('jhi-subject-dialog input[name=personName]').type('Test Subject '+ i); + // cy.get('jhi-subject-dialog input[name=dateOfBirth]').type('1980-01-01'); + // cy.get('jhi-subject-dialog jhi-dictionary-mapper select').first().select('Human-readable-identifier'); + // cy.get('jhi-subject-dialog jhi-dictionary-mapper input').first().type('Test Subject '+ i); + // cy.contains('jhi-subject-dialog jhi-dictionary-mapper button', 'Add').click() + // cy.contains('jhi-subject-dialog button.btn-primary', 'Save').click(); + // cy.get('jhi-subjects .subject-row').should('have.length', 4 + i); + // } + // }); + + // it('should be able to delete all created subjects', () => { + // for(let i = 5; i < 20; i++) { + // cy.contains('jhi-subjects .subject-row', 'test-subject-' + i ).find('a').first().click(); + // cy.contains('jhi-subject-detail button', 'Delete').click(); + // cy.contains('jhi-subject-delete-dialog button', 'Delete').click(); + // // cy.get('jhi-subjects .subject-row').should('have.length', 3); + // } + // cy.get('jhi-subjects .subject-row').should('have.length', 3); + // + // }); + }); From a505ba391c800637de37b6e101d4caa65374e6e9 Mon Sep 17 00:00:00 2001 From: Peyman Mohtashami Date: Tue, 26 Oct 2021 14:55:21 +0200 Subject: [PATCH 077/431] Add group tab, filter by group, group module and group dialog components --- .../project/project-detail.component.html | 7 +- .../project/project-detail.component.ts | 14 + .../app/entities/project/project.module.ts | 2 + .../group/group-delete-dialog.component.html | 28 +- .../group/group-delete-dialog.component.ts | 64 ++-- .../shared/group/group-dialog.component.html | 64 +--- .../shared/group/group-dialog.component.ts | 69 ++-- .../app/shared/group/group-popup.service.ts | 42 +-- .../app/shared/group/group.component.html | 299 ++---------------- .../app/shared/group/group.component.scss | 72 +---- .../app/shared/group/group.component.ts | 275 ++-------------- .../webapp/app/shared/group/group.model.ts | 1 + .../webapp/app/shared/group/group.module.ts | 63 ++-- .../webapp/app/shared/group/group.route.ts | 103 +----- .../webapp/app/shared/group/group.service.ts | 12 +- .../app/shared/subject/subject.component.html | 23 +- .../app/shared/subject/subject.component.ts | 18 +- 17 files changed, 263 insertions(+), 893 deletions(-) diff --git a/src/main/webapp/app/entities/project/project-detail.component.html b/src/main/webapp/app/entities/project/project-detail.component.html index 7a3e34e6b..3e61a07bb 100644 --- a/src/main/webapp/app/entities/project/project-detail.component.html +++ b/src/main/webapp/app/entities/project/project-detail.component.html @@ -64,6 +64,11 @@

    Subjects +
  • + + Groups + +
  • Admins @@ -80,7 +85,7 @@

    - +

    • +
    +

    + + + + + +
    + + + + + +
    + +
    + +
    + +
    + + + +
    + +
    +
    + + +
    +
    +
    + +
    + + + +
    +
    +
    + +
    + + +
    +
    + + + + +
    +
    + + +
    +
    +
    + +
    +
    +
    + + + +
    +
    + + +
    + + {{subject.externalId || subject.externalLink}} + + + {{subject.externalId}} + + + N/A + +
    +
    +
    + + +
    + DEACTIVATED + ACTIVATED + DISCONTINUED + INVALID +
    +
    +
    + + + +
    +
    + + +
    + + N/A + + + {{sources.sourceTypeModel}}: {{sources.sourceName}}{{last ? '' : ', '}} + +
    +
    +
    + + +
    + + N/A + +
    + {{entry.key}}: {{entry.value}} +
    +
    +
    +
    +
    + + + + + +
    +
    +
    +
    + + +
    +
    +
    diff --git a/src/main/webapp/app/entities/project/project-detail.component.ts b/src/main/webapp/app/entities/project/project-detail.component.ts index 2cc234b85..7c3c4797f 100644 --- a/src/main/webapp/app/entities/project/project-detail.component.ts +++ b/src/main/webapp/app/entities/project/project-detail.component.ts @@ -21,6 +21,7 @@ export class ProjectDetailComponent implements OnInit, OnDestroy { showSources: boolean; showSubjects: boolean; + showProjectGroups: boolean; showSourceTypes: boolean; showProjectAdmins: boolean; showProjectAnalysts: boolean; @@ -63,6 +64,7 @@ export class ProjectDetailComponent implements OnInit, OnDestroy { viewSources() { this.showSources = true; this.showSubjects = false; + this.showProjectGroups = false; this.showSourceTypes = false; this.showProjectAdmins = false; this.showProjectAnalysts = false; @@ -71,6 +73,16 @@ export class ProjectDetailComponent implements OnInit, OnDestroy { viewSubjects() { this.showSources = false; this.showSubjects = true; + this.showProjectGroups = false; + this.showSourceTypes = false; + this.showProjectAdmins = false; + this.showProjectAnalysts = false; + } + + viewProjectGroups() { + this.showSources = false; + this.showSubjects = false; + this.showProjectGroups = true; this.showSourceTypes = false; this.showProjectAdmins = false; this.showProjectAnalysts = false; @@ -79,6 +91,7 @@ export class ProjectDetailComponent implements OnInit, OnDestroy { viewProjectAdmins() { this.showSources = false; this.showSubjects = false; + this.showProjectGroups = false; this.showSourceTypes = false; this.showProjectAdmins = true; this.showProjectAnalysts = false; @@ -87,6 +100,7 @@ export class ProjectDetailComponent implements OnInit, OnDestroy { viewProjectAnalysts() { this.showSources = false; this.showSubjects = false; + this.showProjectGroups = false; this.showSourceTypes = false; this.showProjectAdmins = false; this.showProjectAnalysts = true; diff --git a/src/main/webapp/app/entities/project/project.module.ts b/src/main/webapp/app/entities/project/project.module.ts index 12784a420..e6341fe5e 100644 --- a/src/main/webapp/app/entities/project/project.module.ts +++ b/src/main/webapp/app/entities/project/project.module.ts @@ -14,6 +14,7 @@ import { projectPopupRoute, projectRoute, } from './'; +import {ManagementPortalSharedGroupModule} from "../../shared/group/group.module"; const ENTITY_STATES = [ ...projectRoute, @@ -25,6 +26,7 @@ const ENTITY_STATES = [ ManagementPortalSharedModule, ManagementPortalSharedSourceModule, ManagementPortalSharedSubjectModule, + ManagementPortalSharedGroupModule, RouterModule.forRoot(ENTITY_STATES, {useHash: true}), ], declarations: [ diff --git a/src/main/webapp/app/shared/group/group-delete-dialog.component.html b/src/main/webapp/app/shared/group/group-delete-dialog.component.html index bff23400d..503dc5547 100644 --- a/src/main/webapp/app/shared/group/group-delete-dialog.component.html +++ b/src/main/webapp/app/shared/group/group-delete-dialog.component.html @@ -1,36 +1,20 @@ -
    +
    -

    -

    -

    -

    - +

    +
    -

    -

    -

    +

    - -
    diff --git a/src/main/webapp/app/shared/group/group-delete-dialog.component.ts b/src/main/webapp/app/shared/group/group-delete-dialog.component.ts index 840d2b8fd..bacd16c1f 100644 --- a/src/main/webapp/app/shared/group/group-delete-dialog.component.ts +++ b/src/main/webapp/app/shared/group/group-delete-dialog.component.ts @@ -4,72 +4,58 @@ import { ActivatedRoute } from '@angular/router'; import { NgbActiveModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap'; import { EventManager } from '../util/event-manager.service'; -import { SubjectPopupService } from './subject-popup.service'; - -import { Subject } from './subject.model'; -import { SubjectService } from './subject.service'; +import {GroupService} from "./group.service"; +import {Group} from "./group.model"; +import {GroupPopupService} from "./group-popup.service"; @Component({ - selector: 'jhi-subject-delete-dialog', - templateUrl: './subject-delete-dialog.component.html', + selector: 'jhi-group-delete-dialog', + templateUrl: './group-delete-dialog.component.html', }) -export class SubjectDeleteDialogComponent { +export class GroupDeleteDialogComponent { - subject: Subject; - isDelete: boolean; + group: Group; constructor( - private subjectService: SubjectService, + private groupService: GroupService, public activeModal: NgbActiveModal, private eventManager: EventManager, - ) { - } + ) {} clear() { this.activeModal.dismiss('cancel'); } - confirmDelete(login: string) { - if (this.isDelete) { - this.subjectService.delete(login).subscribe(() => { - this.activeModal.dismiss(true); - window.history.back(); - }); - } else { - this.subjectService.discontinue(this.subject).subscribe(() => { - this.eventManager.broadcast({name: 'subjectListModification', content: 'OK'}); - this.activeModal.dismiss(true); - window.history.back(); - }); - } + confirmDelete() { + this.groupService.delete(this.group.projectName, this.group.name).subscribe( + () => { + this.eventManager.broadcast({name: 'groupListModification', content: null}); + this.activeModal.dismiss(true); + window.history.back(); + } + ); } } @Component({ - selector: 'jhi-subject-delete-popup', + selector: 'jhi-group-delete-popup', template: '', }) -export class SubjectDeletePopupComponent implements OnInit, OnDestroy { +export class GroupDeletePopupComponent implements OnInit, OnDestroy { modalRef: NgbModalRef; routeSub: any; constructor( - private route: ActivatedRoute, - private subjectPopupService: SubjectPopupService, - ) { - } + private route: ActivatedRoute, + private groupPopupService: GroupPopupService, + ) {} ngOnInit() { this.routeSub = this.route.params.subscribe((params) => { - this.route.url.subscribe(url => { - if ('discontinue' === url[2].path) { - this.modalRef = this.subjectPopupService - .open(SubjectDeleteDialogComponent, params['login'], false); - } else if ('delete' === url[2].path) { - this.modalRef = this.subjectPopupService - .open(SubjectDeleteDialogComponent, params['login'], true); - } + this.route.url.subscribe(_ => { + this.modalRef = this.groupPopupService + .open(GroupDeleteDialogComponent, params['id'], true, params['projectName']); }); }); } diff --git a/src/main/webapp/app/shared/group/group-dialog.component.html b/src/main/webapp/app/shared/group/group-dialog.component.html index a50370c4f..e15a6ceef 100644 --- a/src/main/webapp/app/shared/group/group-dialog.component.html +++ b/src/main/webapp/app/shared/group/group-dialog.component.html @@ -1,74 +1,34 @@
    -
    -
    -
    +
    + [(ngModel)]="group.id" readonly />
    -
    -
    - - -
    -
    - - -
    -
    - - -
    -
    - -
    - -
    +
    + +
    - -
    -
    - - - - - -
    - -
    - -
    - -
    - - - -
    - -
    -
    - - -
    -
    -
    - -
    - - - -
    -
    -
    - -
    - - -
    -
    - - - + +
    +
    +
    -
    -
    - - -
    -
    -
    - -
    -
    -
    - - - -
    -
    - - -
    - - {{subject.externalId || subject.externalLink}} - - - {{subject.externalId}} - - - N/A - -
    -
    -
    - - -
    - DEACTIVATED - ACTIVATED - DISCONTINUED - INVALID -
    -
    -
    - +
    +
    +
    +
    +
    - - N/A - - - {{role.projectName}} - {{role.projectName}} - + {{group.id}}
    -
    - +
    +
    - - N/A - - - {{sources.sourceTypeModel}}: {{sources.sourceName}}{{last ? '' : ', '}} + + {{group.name}}
    -
    - +
    +
    - - N/A - -
    - {{entry.key}}: {{entry.value}} -
    + {{project.projectName}}
    -
    - - - - -
    -
    - - +
    +
    diff --git a/src/main/webapp/app/shared/group/group.component.scss b/src/main/webapp/app/shared/group/group.component.scss index 7e2b5702d..c1857f0da 100644 --- a/src/main/webapp/app/shared/group/group.component.scss +++ b/src/main/webapp/app/shared/group/group.component.scss @@ -1,56 +1,36 @@ -.subject-wrapper { +.group-wrapper { display: flex; } -.subject-filter { - flex-grow: 0; - max-width: 200px; - display: flex; - flex-direction: column; - padding: 8px 16px; - border-right: 1px solid #dadada; -} -.subject-filter input { - max-width: 100%; -} -.subject-filter > button { - margin-top: 16px -} -.subject-filter label{ - width: 100%; -} - -.subject-wrapper > section { +.group-wrapper > section { flex-grow: 1; padding-left: 16px; } -.subject-sorting-action { - margin-right: 8px; - margin-bottom: 8px; -} - -.subject-row { +.group-row { display: flex; justify-content: space-between; padding: 8px 16px; } -.subject-row:nth-child(even) { + +.group-row:nth-child(even) { border-top: #eceeef; background-color: #eceeef; } -.subject-row__content { + +.group-row__content { display: flex; flex-grow: 1; flex-wrap: wrap; } -.subject-row__content > * { + +.group-row__content > * { flex-basis: 80px; flex-grow: 1; } -.subject-row__field-label { +.group-row__field-label { position: relative; font-weight: bold; font-size: 12px; @@ -58,14 +38,13 @@ color: #5e5e5e; } - -.subject-list-actions { +.group-list-actions { margin-bottom: 8px; } -.subject-list-actions > :not(:first-child) { +.group-list-actions > :not(:first-child) { margin-left: 8px; } -.subject-row__select-row { +.group-row__select-row { display: flex; flex-direction: column; flex-grow: 0; @@ -73,35 +52,18 @@ margin-right: 16px; } - -.subject-row__actions { +.group-row__actions { display: flex; flex-direction: column; flex-basis: unset; flex-grow: 0 !important; margin-left: 16px; } -.subject-row__actions > *:not(:last-child) { +.group-row__actions > *:not(:last-child) { width: 100%; margin-bottom: 4px; } - -.subject-pagination { +.create-group-wrapper{ display: flex; - margin-top: 8px; -} -.subject-pagination > * { - text-align: center; - flex-grow: 1; - padding: 16px; -} -.subject-pagination__all-loaded { - color: #dadada; - cursor: not-allowed; -} -.subject-pagination__load-more:hover { - background: rgba(169, 209, 255, 0.3); -} -.subject-pagination__load-more:active { - background: rgba(0, 120, 255, 0.15); + justify-content: end; } diff --git a/src/main/webapp/app/shared/group/group.component.ts b/src/main/webapp/app/shared/group/group.component.ts index d37931beb..cdc956efe 100644 --- a/src/main/webapp/app/shared/group/group.component.ts +++ b/src/main/webapp/app/shared/group/group.component.ts @@ -7,294 +7,69 @@ import { SimpleChange, SimpleChanges, } from '@angular/core'; -import { HttpErrorResponse, HttpResponse } from '@angular/common/http'; -import { ActivatedRoute, Router } from '@angular/router'; -import { BehaviorSubject, Observable, Subscription } from 'rxjs'; -import { map } from 'rxjs/operators'; +import { HttpErrorResponse } from '@angular/common/http'; +import { BehaviorSubject, Subscription } from 'rxjs'; -import { ITEMS_PER_PAGE, Project } from '..'; -import { Subject } from './subject.model'; -import { - SubjectService, - SubjectFilterParams, - SubjectPaginationParams, SubjectLastParams, -} from './subject.service'; -import { PagingParams } from '../commons'; +import {Group, GroupService, Project} from '..'; import { AlertService } from '../util/alert.service'; import { EventManager } from '../util/event-manager.service'; -import { parseLinks } from '../util/parse-links-util'; @Component({ - selector: 'jhi-subjects', - templateUrl: './subject.component.html', - styleUrls: ['./subject.component.scss'], + selector: 'jhi-groups', + templateUrl: './group.component.html', + styleUrls: ['./group.component.scss'], }) -export class SubjectComponent implements OnInit, OnDestroy, OnChanges { - sortingOptions = [ - 'login', - 'externalId', - ]; - pagingParams$: Observable; +export class GroupComponent implements OnInit, OnDestroy, OnChanges { project$ = new BehaviorSubject(null); + @Input() get project() { return this.project$.value; } set project(v: Project) { this.project$.next(v); } - subjects: Subject[]; - eventSubscriber: Subscription; - itemsPerPage: number; - links: any; - page: any; - predicate: any; - queryCount: any; - ascending: any; - totalItems: number; - routeData: any; - previousPage: any; - - filterSubjectExternalId = ''; - filterSubjectId = ''; - filterSubjectHumanReadableId = ''; - filterDateOfBirth = ''; - filterPersonName = ''; - filterEnrollmentDateFrom = ''; - filterEnrollmentDateTo = ''; - isAdvancedFilterCollapsed = true; - - checked = false; - setOfCheckedId = new Set(); - - @Input() isProjectSpecific: boolean; + groups: Group[]; + eventSubscriber: Subscription; constructor( - private subjectService: SubjectService, + private groupService: GroupService, private alertService: AlertService, private eventManager: EventManager, - private activatedRoute: ActivatedRoute, - private router: Router, ) { - this.subjects = []; - this.itemsPerPage = ITEMS_PER_PAGE; - this.pagingParams$ = this.activatedRoute.data.pipe(map(data => { - const fallback = { page: 1, predicate: 'login', ascending: true }; - return data['pagingParams'] || fallback; - })); - this.routeData = this.pagingParams$.subscribe(params => { - this.page = params.page; - this.previousPage = params.page; - this.ascending = params.ascending; - this.predicate = params.predicate; - }); - } - - loadSubjects() { - if (this.isProjectSpecific) { - this.loadAllFromProject(); - } else { - this.loadAll(); - } - } - - private loadAllFromProject() { - this.subjectService.findAllByProject( - this.project.projectName, - this.queryFilterParams, - this.queryPaginationParams, - ).subscribe( - (res: HttpResponse) => { - this.onSuccess(res.body, res.headers); - }, - (res: HttpErrorResponse) => this.onError(res), - ); + this.groups = []; } - loadAll() { - this.subjectService.query( - this.queryFilterParams, - this.queryPaginationParams, - ).subscribe( - (res: HttpResponse) => this.onSuccess(res.body, res.headers), - (res: HttpErrorResponse) => this.onError(res), + loadGroups() { + this.groupService.list(this.project.projectName).subscribe( + (res: Group[]) => this.groups = res, + (res: HttpErrorResponse) => this.alertService.error(res.message, null, null), ); } ngOnInit() { - if(!this.isProjectSpecific){ - this.loadAll(); - } - this.registerChangeInSubjects(); + this.loadGroups(); + this.registerChangeInGroups(); } ngOnDestroy() { this.eventManager.destroy(this.eventSubscriber); - this.routeData.unsubscribe(); - } - - trackLogin(index: number, item: Subject) { - return item.login; } - trackKey(index: number, item: any) { - return item.key; + trackId(index: number, item: Group) { + return item.id; } - registerChangeInSubjects() { - this.eventSubscriber = this.eventManager.subscribe('subjectListModification', (result) => { - const modifiedSubject = result.content; - const subjectIndex = this.subjects.findIndex((s => s.id == modifiedSubject.id)); - if (subjectIndex < 0) { - this.totalItems++; - this.subjects = [modifiedSubject, ...this.subjects]; - } else { - this.subjects[subjectIndex] = modifiedSubject; - } + registerChangeInGroups() { + this.eventSubscriber = this.eventManager.subscribe('groupListModification', (_) => { + this.loadGroups() }); } - private onError(error) { - this.alertService.error(error.message, null, null); - } - ngOnChanges(changes: SimpleChanges) { - this.subjects = []; + this.groups = []; const project: SimpleChange = changes.project ? changes.project : null; if (project) { this.project = project.currentValue; - this.loadAllFromProject(); - } - } - - get queryFilterParams(): SubjectFilterParams { - const params = { - login: this.filterSubjectId.trim() || undefined, - externalId: this.filterSubjectExternalId.trim() || undefined, - personName: this.filterPersonName.trim() || undefined, - humanReadableIdentifier: this.filterSubjectHumanReadableId.trim() || undefined, - dateOfBirth: undefined, - enrollmentDate: undefined, - }; - let enrollmentDateFrom = this.filterEnrollmentDateFrom.trim(); - let enrollmentDateTo = this.filterEnrollmentDateTo.trim(); - if (enrollmentDateFrom || enrollmentDateTo) { - const timeZone = Intl.DateTimeFormat().resolvedOptions().timeZone; - params.enrollmentDate = { - from: enrollmentDateFrom ? enrollmentDateFrom + '[' + timeZone + ']' : undefined, - to: enrollmentDateTo ? enrollmentDateTo + '[' + timeZone + ']' : undefined, - }; - } - if (this.filterDateOfBirth) { - params.dateOfBirth = { - is: this.filterDateOfBirth, - }; - } - - return params; - } - - get queryPaginationParams(): SubjectPaginationParams { - const subjects = this.subjects || []; - - let last: SubjectLastParams | null; - if (subjects.length > 0) { - const lastSubject = subjects[subjects.length - 1] - last = { - id: lastSubject.id, - login: lastSubject.login, - externalId: lastSubject.externalId, - } - } else { - last = null; + this.loadGroups(); } - - return { - last, - size: this.itemsPerPage, - sort: [this.predicate + ',' + (this.ascending ? 'asc' : 'desc')], - }; - } - - private onSuccess(data, headers) { - console.log(data, headers) - if(headers.get('link')){ - this.links = parseLinks(headers.get('link')); - } - this.totalItems = +headers.get('X-Total-Count'); - this.queryCount = this.totalItems; - // remove redundant subjects from the list - this.subjects = [...this.subjects, ...data]; - this.subjects = Array.from(new Set(this.subjects.map(a => a.id))) - .map(id => { - return this.subjects.find(a => a.id === id) - }) - } - - applyFilter() { - this.subjects = []; - this.loadSubjects(); - } - - loadMore() { - this.page = this.page + 1; - this.transition(); - } - - loadPage(page) { - if (page !== this.previousPage) { - this.previousPage = page; - this.transition(); - } - } - - updateSortingSortBy(predicate) { - this.subjects = []; - this.predicate = predicate; - this.page = 1; - this.transition(); - } - - updateSortingOrder(direction) { - this.subjects = []; - this.ascending = direction === 'asc'; - this.page = 1; - this.transition(); - } - - selectAll(checked: boolean = true): void { - this.subjects.forEach(({ id }) => this.updateCheckedSet(id, checked)); - this.refreshCheckedStatus(); - } - - onItemChecked(id: number, checked: boolean): void { - this.updateCheckedSet(id, checked); - this.refreshCheckedStatus(); - } - - refreshCheckedStatus(): void { - this.checked = this.subjects.every(({ id }) => this.setOfCheckedId.has(id)) && (this.subjects.length > 0); } - updateCheckedSet(id: number, checked: boolean): void { - if (checked) { - this.setOfCheckedId.add(id); - } else { - this.setOfCheckedId.delete(id); - } - } - - addSelectedToGroup() { - // TODO implement function - } - - transition() { - if (this.isProjectSpecific) { - this.loadSubjects(); - } else { - this.router.navigate(['/subject'], { - queryParams: { - page: this.page, - sort: this.predicate + ',' + (this.ascending ? 'asc' : 'desc'), - }, - }).then(() => this.loadSubjects()); - } - } } diff --git a/src/main/webapp/app/shared/group/group.model.ts b/src/main/webapp/app/shared/group/group.model.ts index 2ea6f5136..596e14e12 100644 --- a/src/main/webapp/app/shared/group/group.model.ts +++ b/src/main/webapp/app/shared/group/group.model.ts @@ -2,4 +2,5 @@ export class Group { public id?: number; public name: string; public projectId?: number; + public projectName?: string; } diff --git a/src/main/webapp/app/shared/group/group.module.ts b/src/main/webapp/app/shared/group/group.module.ts index f2b3f4010..1af5f1828 100644 --- a/src/main/webapp/app/shared/group/group.module.ts +++ b/src/main/webapp/app/shared/group/group.module.ts @@ -1,67 +1,40 @@ import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; -import { QRCodeModule } from 'angularx-qrcode'; import { ManagementPortalSharedModule } from '../../shared'; -import { - SubjectComponent, - SubjectDeleteDialogComponent, - SubjectDeletePopupComponent, - SubjectDetailComponent, - SubjectDialogComponent, - SubjectPairDialogComponent, - SubjectPairPopupComponent, - SubjectPopupComponent, - subjectPopupRoute, - SubjectRevisionComponent, - SubjectRevisionListComponent, - subjectRoute, -} from './'; -import { - SubjectSourceAssignerDialogComponent, - SubjectSourceAssignerPopupComponent, -} from './source-assigner/source-assigner.component'; +import {GroupComponent} from "./group.component"; +import {GroupDialogComponent, GroupPopupComponent} from "./group-dialog.component"; +import {GroupDeleteDialogComponent, GroupDeletePopupComponent} from "./group-delete-dialog.component"; +import {groupPopupRoute, groupRoute} from "./group.route"; const ENTITY_STATES = [ - ...subjectRoute, - ...subjectPopupRoute, + ...groupRoute, + ...groupPopupRoute, ]; @NgModule({ imports: [ ManagementPortalSharedModule, RouterModule.forRoot(ENTITY_STATES, {useHash: true}), - QRCodeModule, ], declarations: [ - SubjectComponent, - SubjectDetailComponent, - SubjectRevisionComponent, - SubjectRevisionListComponent, - SubjectDialogComponent, - SubjectDeleteDialogComponent, - SubjectPairDialogComponent, - SubjectPopupComponent, - SubjectDeletePopupComponent, - SubjectPairPopupComponent, - SubjectSourceAssignerDialogComponent, - SubjectSourceAssignerPopupComponent, + GroupComponent, + GroupDialogComponent, + GroupDeleteDialogComponent, + GroupPopupComponent, + GroupDeletePopupComponent, ], entryComponents: [ - SubjectComponent, - SubjectDialogComponent, - SubjectPopupComponent, - SubjectDeleteDialogComponent, - SubjectDeletePopupComponent, - SubjectPairDialogComponent, - SubjectPairPopupComponent, - SubjectSourceAssignerDialogComponent, - SubjectSourceAssignerPopupComponent, + GroupComponent, + GroupDialogComponent, + GroupDeleteDialogComponent, + GroupPopupComponent, + GroupDeletePopupComponent, ], schemas: [CUSTOM_ELEMENTS_SCHEMA], exports: [ - SubjectComponent, + GroupComponent, ], }) -export class ManagementPortalSharedSubjectModule { +export class ManagementPortalSharedGroupModule { } diff --git a/src/main/webapp/app/shared/group/group.route.ts b/src/main/webapp/app/shared/group/group.route.ts index dbd3c54de..6fe9f79e8 100644 --- a/src/main/webapp/app/shared/group/group.route.ts +++ b/src/main/webapp/app/shared/group/group.route.ts @@ -1,107 +1,28 @@ import { Routes } from '@angular/router'; +import {UserRouteAccessService} from "../auth/user-route-access-service"; +import {GroupPopupComponent} from "./group-dialog.component"; +import {GroupDeletePopupComponent} from "./group-delete-dialog.component"; +import {PROJECT_ADMIN, SYSTEM_ADMIN} from "../constants/common.constants"; -import { UserRouteAccessService } from '../../shared'; +export const groupRoute: Routes = []; -import { PROJECT_ADMIN, SYSTEM_ADMIN } from '../constants/common.constants'; -import { SubjectSourceAssignerPopupComponent } from './source-assigner/source-assigner.component'; -import { SubjectDeletePopupComponent } from './subject-delete-dialog.component'; -import { SubjectDetailComponent } from './subject-detail.component'; -import { SubjectPopupComponent } from './subject-dialog.component'; -import { SubjectPairPopupComponent } from './subject-pair-dialog.component'; -import { SubjectRevisionListComponent } from './subject-revision-list.component'; -import { SubjectRevisionComponent } from './subject-revision.component'; -import { ResolvePagingParams } from '../commons'; - -export const subjectRoute: Routes = [ - { - path: 'subject/:login', - component: SubjectDetailComponent, - data: { - authorities: [SYSTEM_ADMIN, PROJECT_ADMIN], - pageTitle: 'managementPortalApp.subject.home.title', - }, - canActivate: [UserRouteAccessService], - }, - { - path: 'subject/:login/revisions', - component: SubjectRevisionListComponent, - resolve: { - 'pagingParams': ResolvePagingParams, - }, - data: { - authorities: [SYSTEM_ADMIN, PROJECT_ADMIN], - pageTitle: 'managementPortalApp.subject.home.title', - }, - canActivate: [UserRouteAccessService], - }, - { - path: 'subject/:login/revisions/:revisionNb', - component: SubjectRevisionComponent, - data: { - authorities: [SYSTEM_ADMIN, PROJECT_ADMIN], - pageTitle: 'managementPortalApp.subject.home.title', - }, - canActivate: [UserRouteAccessService], - }, -]; - -export const subjectPopupRoute: Routes = [ - { - path: 'project-subject-new/:projectName', - component: SubjectPopupComponent, - data: { - authorities: [SYSTEM_ADMIN, PROJECT_ADMIN], - pageTitle: 'managementPortalApp.subject.home.title', - }, - canActivate: [UserRouteAccessService], - outlet: 'popup', - }, +export const groupPopupRoute: Routes = [ { - path: 'project-subject/:projectName/:login/edit', - component: SubjectPopupComponent, + path: 'project-group-new/:projectName', + component: GroupPopupComponent, data: { authorities: [SYSTEM_ADMIN, PROJECT_ADMIN], - pageTitle: 'managementPortalApp.subject.home.title', + pageTitle: 'managementPortalApp.group.home.title', }, canActivate: [UserRouteAccessService], outlet: 'popup', }, { - path: 'subject/:login/delete', - component: SubjectDeletePopupComponent, + path: 'project-group/:projectName/:id/delete', + component: GroupDeletePopupComponent, data: { authorities: [SYSTEM_ADMIN], - pageTitle: 'managementPortalApp.subject.home.title', - }, - canActivate: [UserRouteAccessService], - outlet: 'popup', - }, - { - path: 'subject/:login/pairApp', - component: SubjectPairPopupComponent, - data: { - authorities: [SYSTEM_ADMIN, PROJECT_ADMIN], - pageTitle: 'managementPortalApp.subject.home.title', - }, - canActivate: [UserRouteAccessService], - outlet: 'popup', - }, - { - path: 'subject/:login/sources', - component: SubjectSourceAssignerPopupComponent, - data: { - authorities: [SYSTEM_ADMIN, PROJECT_ADMIN], - pageTitle: 'managementPortalApp.subject.home.title', - }, - canActivate: [UserRouteAccessService], - outlet: 'popup', - }, - { - path: 'subject/:login/discontinue', - component: SubjectDeletePopupComponent, - data: { - authorities: [SYSTEM_ADMIN, PROJECT_ADMIN], - pageTitle: 'managementPortalApp.subject.home.title', + pageTitle: 'managementPortalApp.group.home.title', }, canActivate: [UserRouteAccessService], outlet: 'popup', diff --git a/src/main/webapp/app/shared/group/group.service.ts b/src/main/webapp/app/shared/group/group.service.ts index 3d5a0bd72..5cde24abb 100644 --- a/src/main/webapp/app/shared/group/group.service.ts +++ b/src/main/webapp/app/shared/group/group.service.ts @@ -2,13 +2,14 @@ import { Injectable } from '@angular/core'; import { HttpClient } from '@angular/common/http'; import { Observable } from 'rxjs'; import { Group } from "./group.model"; +import {map} from "rxjs/operators"; @Injectable({ providedIn: 'root' }) export class GroupService { constructor(private http: HttpClient) { } - private resourceUrl(projectName: string, groupName?: string): string { + protected resourceUrl(projectName: string, groupName?: string): string { let url = 'api/projects/' + encodeURIComponent(projectName) + '/groups'; if (groupName) { url += '/' + encodeURIComponent(groupName); @@ -20,6 +21,15 @@ export class GroupService { return this.http.get(this.resourceUrl(projectName)); } + find(id: number, projectName: string): Observable { + return this.list(projectName).pipe( + map(groups => { + console.log(groups, id) + return groups.filter(g => g.id == id)[0] + }) + ) + } + create(projectName: string, group: Group): Observable { const copy: Group = Object.assign({}, group); return this.http.post(this.resourceUrl(projectName), copy); diff --git a/src/main/webapp/app/shared/subject/subject.component.html b/src/main/webapp/app/shared/subject/subject.component.html index b31f39f92..d2de1d229 100644 --- a/src/main/webapp/app/shared/subject/subject.component.html +++ b/src/main/webapp/app/shared/subject/subject.component.html @@ -26,9 +26,15 @@

    @@ -79,6 +85,7 @@

    +
    + + +
    + + {{subject.group || 'N/A'}} + +
    +
    +
    - +
    - - - - - + + + + + - - - - - - + + + + + +
    Service NameStatusDetails
    {{'health.indicator.' + baseName(health.name) | translate}} {{subSystemName(health.name)}} - - - - - - -
    + {{ 'health.indicator.' + componentHealth.key | translate }} + + + {{ componentHealth.value!.status }} + + + + + +
    diff --git a/src/main/webapp/app/admin/health/health.component.spec.ts b/src/main/webapp/app/admin/health/health.component.spec.ts index 00eca60d7..a87b2f0f6 100644 --- a/src/main/webapp/app/admin/health/health.component.spec.ts +++ b/src/main/webapp/app/admin/health/health.component.spec.ts @@ -1,319 +1,77 @@ +/* + * Copyright (c) 2021. The Hyve + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * + * See the file LICENSE in the root of this repository. + */ + import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; -import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; +import { HttpErrorResponse } from '@angular/common/http'; +import { HttpClientTestingModule } from '@angular/common/http/testing'; +import { of, throwError } from 'rxjs'; -import { ManagementPortalTestModule } from '../../shared/util/test/test.module'; import { JhiHealthCheckComponent } from './health.component'; import { JhiHealthService } from './health.service'; +import { Health } from './health.model'; -describe('Component Tests', () => { - - describe('JhiHealthCheckComponent', () => { +describe('HealthComponent', () => { + let comp: JhiHealthCheckComponent; + let fixture: ComponentFixture; + let service: JhiHealthService; - let comp: JhiHealthCheckComponent; - let fixture: ComponentFixture; - let service: JhiHealthService; + beforeEach( + waitForAsync(() => { + TestBed.configureTestingModule({ + imports: [HttpClientTestingModule], + declarations: [JhiHealthCheckComponent], + }) + .overrideTemplate(JhiHealthCheckComponent, '') + .compileComponents(); + }) + ); - beforeEach(waitForAsync(() => { - TestBed.configureTestingModule({ - imports: [ManagementPortalTestModule], - declarations: [JhiHealthCheckComponent], - providers: [ - JhiHealthService, - { - provide: NgbModal, - useValue: null - } - ] - }) - .overrideTemplate(JhiHealthCheckComponent, '') - .compileComponents(); - })); + beforeEach(() => { + fixture = TestBed.createComponent(JhiHealthCheckComponent); + comp = fixture.componentInstance; + service = TestBed.inject(JhiHealthService); + }); - beforeEach(() => { - fixture = TestBed.createComponent(JhiHealthCheckComponent); - comp = fixture.componentInstance; - service = fixture.debugElement.injector.get(JhiHealthService); + describe('getBadgeClass', () => { + it('should get badge class', () => { + const upBadgeClass = comp.getBadgeClass('UP'); + const downBadgeClass = comp.getBadgeClass('DOWN'); + expect(upBadgeClass).toEqual('badge-success'); + expect(downBadgeClass).toEqual('badge-danger'); }); + }); - describe('baseName and subSystemName', () => { - it('should return the basename when it has no sub system', () => { - expect(comp.baseName('base')).toBe('base'); - }); - - it('should return the basename when it has sub systems', () => { - expect(comp.baseName('base.subsystem.system')).toBe('base'); - }); - - it('should return the sub system name', () => { - expect(comp.subSystemName('subsystem')).toBe(''); - }); - - it('should return the subsystem when it has multiple options', () => { - expect(comp.subSystemName('subsystem.subsystem.system')).toBe(' - subsystem.system'); - }); - }); + describe('refresh', () => { + it('should call refresh on init', () => { + // GIVEN + const health: Health = { status: 'UP', components: { mail: { status: 'UP', details: { mailDetail: 'mail' } } } }; + spyOn(service, 'checkHealth').and.returnValue(of(health)); - describe('transformHealthData', () => { - it('should flatten empty health data', () => { - const data = {}; - const expected = []; - expect(service.transformHealthData(data)).toEqual(expected); - }); - }); + // WHEN + comp.ngOnInit(); - it('should flatten health data with no subsystems', () => { - const data = { - 'status': 'UP', - 'components': { - 'db': { - 'status': 'UP', - 'details': { - 'database': 'H2', - 'hello': '1' - } - }, - 'mail': { - 'status': 'UP', - 'error': 'mail.a.b.c' - } - } - }; - const expected = [ - { - 'name': 'db', - 'status': 'UP', - 'details': { - 'database': 'H2', - 'hello': '1' - } - }, - { - 'name': 'mail', - 'error': 'mail.a.b.c', - 'status': 'UP' - } - ]; - expect(service.transformHealthData(data)).toEqual(expected); + // THEN + expect(service.checkHealth).toHaveBeenCalled(); + expect(comp.health).toEqual(health); }); - it('should flatten health data with subsystems at level 1, main system has no additional information', () => { - const data = { - 'status': 'UP', - 'components': { - 'db': { - 'status': 'UP', - 'details': { - 'database': 'H2', - 'hello': '1' - } - }, - 'mail': { - 'status': 'UP', - 'error': 'mail.a.b.c' - }, - 'system': { - 'status': 'DOWN', - 'components': { - 'subsystem1': { - 'status': 'UP', - 'details': { - 'property1': 'system.subsystem1.property1' - } - }, - 'subsystem2': { - 'status': 'DOWN', - 'error': 'system.subsystem1.error', - 'details': { - 'property2': 'system.subsystem2.property2' - } - } - } - } - } - }; - const expected = [ - { - 'name': 'db', - 'status': 'UP', - 'details': { - 'database': 'H2', - 'hello': '1' - } - }, - { - 'name': 'mail', - 'error': 'mail.a.b.c', - 'status': 'UP' - }, - { - 'name': 'system.subsystem1', - 'status': 'UP', - 'details': { - 'property1': 'system.subsystem1.property1' - } - }, - { - 'name': 'system.subsystem2', - 'error': 'system.subsystem1.error', - 'status': 'DOWN', - 'details': { - 'property2': 'system.subsystem2.property2' - } - } - ]; - expect(service.transformHealthData(data)).toEqual(expected); - }); + it('should handle a 503 on refreshing health data', () => { + // GIVEN + const health: Health = { status: 'DOWN', components: { mail: { status: 'DOWN' } } }; + spyOn(service, 'checkHealth').and.returnValue(throwError(new HttpErrorResponse({ status: 503, error: health }))); - it('should flatten health data with subsystems at level 1, main system has additional information', () => { - const data = { - 'status': 'UP', - 'components': { - 'db': { - 'status': 'UP', - 'details': { - 'database': 'H2', - 'hello': '1' - } - }, - 'mail': { - 'status': 'UP', - 'error': 'mail.a.b.c' - }, - 'system': { - 'status': 'DOWN', - 'details': { - 'property1': 'system.property1', - }, - 'components': { - 'subsystem1': { - 'status': 'UP', - 'details': { - 'property1': 'system.subsystem1.property1' - } - }, - 'subsystem2': { - 'status': 'DOWN', - 'error': 'system.subsystem1.error', - 'details': { - 'property2': 'system.subsystem2.property2' - } - } - } - } - } - }; - const expected = [ - { - 'name': 'db', - 'status': 'UP', - 'details': { - 'database': 'H2', - 'hello': '1' - } - }, - { - 'name': 'mail', - 'error': 'mail.a.b.c', - 'status': 'UP' - }, - { - 'name': 'system', - 'status': 'DOWN', - 'details': { - 'property1': 'system.property1' - } - }, - { - 'name': 'system.subsystem1', - 'status': 'UP', - 'details': { - 'property1': 'system.subsystem1.property1' - } - }, - { - 'name': 'system.subsystem2', - 'error': 'system.subsystem1.error', - 'status': 'DOWN', - 'details': { - 'property2': 'system.subsystem2.property2' - } - } - ]; - expect(service.transformHealthData(data)).toEqual(expected); - }); + // WHEN + comp.refresh(); - it('should flatten health data with subsystems at level 1, main system has additional error', () => { - const data = { - 'status': 'UP', - 'components': { - 'db': { - 'status': 'UP', - 'details': { - 'database': 'H2', - 'hello': '1' - } - }, - 'mail': { - 'status': 'UP', - 'error': 'mail.a.b.c' - }, - 'system': { - 'status': 'DOWN', - 'error': 'show me', - 'components': { - 'subsystem1': { - 'status': 'UP', - 'details': { - 'property1': 'system.subsystem1.property1' - } - }, - 'subsystem2': { - 'status': 'DOWN', - 'error': 'system.subsystem1.error', - 'details': { - 'property2': 'system.subsystem2.property2' - } - } - } - } - } - }; - const expected = [ - { - 'name': 'db', - 'status': 'UP', - 'details': { - 'database': 'H2', - 'hello': '1' - } - }, - { - 'name': 'mail', - 'error': 'mail.a.b.c', - 'status': 'UP' - }, - { - 'name': 'system', - 'error': 'show me', - 'status': 'DOWN' - }, - { - 'name': 'system.subsystem1', - 'status': 'UP', - 'details': { - 'property1': 'system.subsystem1.property1' - } - }, - { - 'name': 'system.subsystem2', - 'error': 'system.subsystem1.error', - 'status': 'DOWN', - 'details': { - 'property2': 'system.subsystem2.property2' - } - } - ]; - expect(service.transformHealthData(data)).toEqual(expected); + // THEN + expect(service.checkHealth).toHaveBeenCalled(); + expect(comp.health).toEqual(health); }); }); }); diff --git a/src/main/webapp/app/admin/health/health.component.ts b/src/main/webapp/app/admin/health/health.component.ts index 3cc6b95cb..c24c8dd00 100644 --- a/src/main/webapp/app/admin/health/health.component.ts +++ b/src/main/webapp/app/admin/health/health.component.ts @@ -3,58 +3,42 @@ import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; import { JhiHealthModalComponent } from './health-modal.component'; import { JhiHealthService } from './health.service'; +import { Health, HealthDetails, HealthStatus } from "./health.model"; +import { HttpErrorResponse } from "@angular/common/http"; @Component({ selector: 'jhi-health', templateUrl: './health.component.html', }) export class JhiHealthCheckComponent implements OnInit { - healthData: any; + health?: Health; - constructor( - private modalService: NgbModal, - private healthService: JhiHealthService, - ) { - } + constructor(private modalService: NgbModal, private healthService: JhiHealthService) {} - ngOnInit() { + ngOnInit(): void { this.refresh(); } - baseName(name: string) { - return this.healthService.getBaseName(name); - } - - getBadgeClass(statusState) { + getBadgeClass(statusState: HealthStatus): string { if (statusState === 'UP') { return 'badge-success'; - } else { - return 'badge-danger'; } + return 'badge-danger'; } - refresh() { - this.healthService.checkHealth().subscribe((health) => { - this.healthData = this.healthService.transformHealthData(health); - }, (error) => { - if (error.status === 503) { - this.healthData = this.healthService.transformHealthData(error.json()); - } - }); + refresh(): void { + this.healthService.checkHealth().subscribe( + health => (this.health = health), + (error: HttpErrorResponse) => { + if (error.status === 503) { + this.health = error.error; + } + } + ); } - showHealth(health: any) { + showHealth(health: { key: string; value: HealthDetails }): void { const modalRef = this.modalService.open(JhiHealthModalComponent); - modalRef.componentInstance.currentHealth = health; - modalRef.result.then((result) => { - // Left blank intentionally, nothing to do here - }, (reason) => { - // Left blank intentionally, nothing to do here - }); + modalRef.componentInstance.health = health; } - - subSystemName(name: string) { - return this.healthService.getSubSystemName(name); - } - } diff --git a/src/main/webapp/app/admin/health/health.model.ts b/src/main/webapp/app/admin/health/health.model.ts new file mode 100644 index 000000000..71b09e190 --- /dev/null +++ b/src/main/webapp/app/admin/health/health.model.ts @@ -0,0 +1,30 @@ +/* + * Copyright (c) 2021. The Hyve + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * + * See the file LICENSE in the root of this repository. + */ + +export type HealthStatus = 'UP' | 'DOWN' | 'UNKNOWN' | 'OUT_OF_SERVICE'; + +export type HealthKey = + 'diskSpace' + | 'mail' + | 'ping' + | 'livenessState' + | 'readinessState' + | 'db'; + +export interface Health { + status: HealthStatus; + components: { + [key in HealthKey]?: HealthDetails; + }; +} + +export interface HealthDetails { + status: HealthStatus; + details?: { [key: string]: unknown }; +} diff --git a/src/main/webapp/app/admin/health/health.service.ts b/src/main/webapp/app/admin/health/health.service.ts index 7034876ad..643d801cd 100644 --- a/src/main/webapp/app/admin/health/health.service.ts +++ b/src/main/webapp/app/admin/health/health.service.ts @@ -1,6 +1,7 @@ import { Injectable } from '@angular/core'; import { Observable } from 'rxjs'; import { HttpClient } from '@angular/common/http'; +import { Health } from "./health.model"; @Injectable({ providedIn: 'root' }) export class JhiHealthService { @@ -11,8 +12,8 @@ export class JhiHealthService { this.separator = '.'; } - checkHealth(): Observable { - return this.http.get('management/health'); + checkHealth(): Observable { + return this.http.get('management/health'); } transformHealthData(data): any { diff --git a/src/main/webapp/app/admin/index.ts b/src/main/webapp/app/admin/index.ts index 71418e8e9..84af3fecd 100644 --- a/src/main/webapp/app/admin/index.ts +++ b/src/main/webapp/app/admin/index.ts @@ -13,7 +13,6 @@ export * from './logs/logs.service'; export * from './logs/logs.route'; export * from './logs/log.model'; export * from './metrics/metrics.component'; -export * from './metrics/metrics-modal.component'; export * from './metrics/metrics.service'; export * from './metrics/metrics.route'; export * from './user-management/user-management-dialog.component'; diff --git a/src/main/webapp/app/admin/metrics/blocks/jvm-memory/jvm-memory.component.html b/src/main/webapp/app/admin/metrics/blocks/jvm-memory/jvm-memory.component.html new file mode 100644 index 000000000..c60f138ac --- /dev/null +++ b/src/main/webapp/app/admin/metrics/blocks/jvm-memory/jvm-memory.component.html @@ -0,0 +1,33 @@ + + +

    Memory

    + +
    +
    + + {{ entry.key }} + ({{ entry.value.used / 1048576 | number: '1.0-0' }}M / {{ entry.value.max / 1048576 | number: '1.0-0' }}M) + + +
    Committed : {{ entry.value.committed / 1048576 | number: '1.0-0' }}M
    + + {{ entry.key }} {{ entry.value.used / 1048576 | number: '1.0-0' }}M + + + {{ (entry.value.used * 100) / entry.value.max | number: '1.0-0' }}% + +
    +
    diff --git a/src/main/webapp/app/admin/metrics/blocks/jvm-memory/jvm-memory.component.ts b/src/main/webapp/app/admin/metrics/blocks/jvm-memory/jvm-memory.component.ts new file mode 100644 index 000000000..1fc0f2c9a --- /dev/null +++ b/src/main/webapp/app/admin/metrics/blocks/jvm-memory/jvm-memory.component.ts @@ -0,0 +1,28 @@ +/* + * Copyright (c) 2021. The Hyve + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * + * See the file LICENSE in the root of this repository. + */ + +import { Component, Input } from '@angular/core'; + +import { JvmMetrics } from '../../metrics.model'; + +@Component({ + selector: 'jhi-jvm-memory', + templateUrl: './jvm-memory.component.html', +}) +export class JvmMemoryComponent { + /** + * object containing all jvm memory metrics + */ + @Input() jvmMemoryMetrics?: { [key: string]: JvmMetrics }; + + /** + * boolean field saying if the metrics are in the process of being updated + */ + @Input() updating?: boolean; +} diff --git a/src/main/webapp/app/admin/metrics/blocks/jvm-threads/jvm-threads.component.html b/src/main/webapp/app/admin/metrics/blocks/jvm-threads/jvm-threads.component.html new file mode 100644 index 000000000..b17d20eb2 --- /dev/null +++ b/src/main/webapp/app/admin/metrics/blocks/jvm-threads/jvm-threads.component.html @@ -0,0 +1,64 @@ + + +

    Threads

    + +Runnable {{ threadStats.threadDumpRunnable }} + + + {{ (threadStats.threadDumpRunnable * 100) / threadStats.threadDumpAll | number: '1.0-0' }}% + + +Timed Waiting ({{ threadStats.threadDumpTimedWaiting }}) + + + {{ (threadStats.threadDumpTimedWaiting * 100) / threadStats.threadDumpAll | number: '1.0-0' }}% + + +Waiting ({{ threadStats.threadDumpWaiting }}) + + + {{ (threadStats.threadDumpWaiting * 100) / threadStats.threadDumpAll | number: '1.0-0' }}% + + +Blocked ({{ threadStats.threadDumpBlocked }}) + + + {{ (threadStats.threadDumpBlocked * 100) / threadStats.threadDumpAll | number: '1.0-0' }}% + + +
    Total: {{ threadStats.threadDumpAll }}
    + + diff --git a/src/main/webapp/app/admin/metrics/blocks/jvm-threads/jvm-threads.component.ts b/src/main/webapp/app/admin/metrics/blocks/jvm-threads/jvm-threads.component.ts new file mode 100644 index 000000000..659372ed6 --- /dev/null +++ b/src/main/webapp/app/admin/metrics/blocks/jvm-threads/jvm-threads.component.ts @@ -0,0 +1,64 @@ +/* + * Copyright (c) 2021. The Hyve + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * + * See the file LICENSE in the root of this repository. + */ + +import { Component, Input } from '@angular/core'; +import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; + +import { Thread, ThreadState } from 'app/admin/metrics/metrics.model'; +import { MetricsModalThreadsComponent } from '../metrics-modal-threads/metrics-modal-threads.component'; + +@Component({ + selector: 'jhi-jvm-threads', + templateUrl: './jvm-threads.component.html', +}) +export class JvmThreadsComponent { + threadStats = { + threadDumpAll: 0, + threadDumpRunnable: 0, + threadDumpTimedWaiting: 0, + threadDumpWaiting: 0, + threadDumpBlocked: 0, + }; + + @Input() + set threads(threads: Thread[] | undefined) { + this._threads = threads; + + threads?.forEach(thread => { + if (thread.threadState === ThreadState.Runnable) { + this.threadStats.threadDumpRunnable += 1; + } else if (thread.threadState === ThreadState.Waiting) { + this.threadStats.threadDumpWaiting += 1; + } else if (thread.threadState === ThreadState.TimedWaiting) { + this.threadStats.threadDumpTimedWaiting += 1; + } else if (thread.threadState === ThreadState.Blocked) { + this.threadStats.threadDumpBlocked += 1; + } + }); + + this.threadStats.threadDumpAll = + this.threadStats.threadDumpRunnable + + this.threadStats.threadDumpWaiting + + this.threadStats.threadDumpTimedWaiting + + this.threadStats.threadDumpBlocked; + } + + get threads(): Thread[] | undefined { + return this._threads; + } + + private _threads: Thread[] | undefined; + + constructor(private modalService: NgbModal) {} + + open(): void { + const modalRef = this.modalService.open(MetricsModalThreadsComponent); + modalRef.componentInstance.threads = this.threads; + } +} diff --git a/src/main/webapp/app/admin/metrics/blocks/metrics-cache/metrics-cache.component.html b/src/main/webapp/app/admin/metrics/blocks/metrics-cache/metrics-cache.component.html new file mode 100644 index 000000000..8424b9bb0 --- /dev/null +++ b/src/main/webapp/app/admin/metrics/blocks/metrics-cache/metrics-cache.component.html @@ -0,0 +1,51 @@ + + +

    Cache statistics

    + +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    Cache nameCache HitsCache MissesCache GetsCache PutsCache RemovalsCache EvictionsCache Hit %Cache Miss %
    {{ entry.key }}{{ entry.value['cache.gets.hit'] }}{{ entry.value['cache.gets.miss'] }}{{ entry.value['cache.gets.hit'] + entry.value['cache.gets.miss'] }}{{ entry.value['cache.puts'] }}{{ entry.value['cache.removals'] }}{{ entry.value['cache.evictions'] }} + {{ + filterNaN((100 * entry.value['cache.gets.hit']) / (entry.value['cache.gets.hit'] + entry.value['cache.gets.miss'])) + | number: '1.0-4' + }} + + {{ + filterNaN((100 * entry.value['cache.gets.miss']) / (entry.value['cache.gets.hit'] + entry.value['cache.gets.miss'])) + | number: '1.0-4' + }} +
    +
    diff --git a/src/main/webapp/app/admin/metrics/blocks/metrics-cache/metrics-cache.component.ts b/src/main/webapp/app/admin/metrics/blocks/metrics-cache/metrics-cache.component.ts new file mode 100644 index 000000000..eba92d6a6 --- /dev/null +++ b/src/main/webapp/app/admin/metrics/blocks/metrics-cache/metrics-cache.component.ts @@ -0,0 +1,32 @@ +/* + * Copyright (c) 2021. The Hyve + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * + * See the file LICENSE in the root of this repository. + */ + +import { ChangeDetectionStrategy, Component, Input } from '@angular/core'; + +import { CacheMetrics } from 'app/admin/metrics/metrics.model'; +import { filterNaN } from 'app/core/util/operators'; + +@Component({ + selector: 'jhi-metrics-cache', + templateUrl: './metrics-cache.component.html', + changeDetection: ChangeDetectionStrategy.OnPush, +}) +export class MetricsCacheComponent { + /** + * object containing all cache related metrics + */ + @Input() cacheMetrics?: { [key: string]: CacheMetrics }; + + /** + * boolean field saying if the metrics are in the process of being updated + */ + @Input() updating?: boolean; + + filterNaN = (input: number): number => filterNaN(input); +} diff --git a/src/main/webapp/app/admin/metrics/blocks/metrics-datasource/metrics-datasource.component.html b/src/main/webapp/app/admin/metrics/blocks/metrics-datasource/metrics-datasource.component.html new file mode 100644 index 000000000..d1025b0b3 --- /dev/null +++ b/src/main/webapp/app/admin/metrics/blocks/metrics-datasource/metrics-datasource.component.html @@ -0,0 +1,66 @@ + + +

    DataSource statistics (time in millisecond)

    + +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    + Connection Pool Usage (active: {{ datasourceMetrics.active.value }}, + min: {{ datasourceMetrics.min.value }}, max: {{ datasourceMetrics.max.value }}, idle: {{ datasourceMetrics.idle.value }}) + CountMeanMinp50p75p95p99Max
    Acquire{{ datasourceMetrics.acquire.count }}{{ filterNaN(datasourceMetrics.acquire.mean) | number: '1.0-2' }}{{ datasourceMetrics.acquire['0.0'] | number: '1.0-3' }}{{ datasourceMetrics.acquire['0.5'] | number: '1.0-3' }}{{ datasourceMetrics.acquire['0.75'] | number: '1.0-3' }}{{ datasourceMetrics.acquire['0.95'] | number: '1.0-3' }}{{ datasourceMetrics.acquire['0.99'] | number: '1.0-3' }}{{ filterNaN(datasourceMetrics.acquire.max) | number: '1.0-2' }}
    Creation{{ datasourceMetrics.creation.count }}{{ filterNaN(datasourceMetrics.creation.mean) | number: '1.0-2' }}{{ datasourceMetrics.creation['0.0'] | number: '1.0-3' }}{{ datasourceMetrics.creation['0.5'] | number: '1.0-3' }}{{ datasourceMetrics.creation['0.75'] | number: '1.0-3' }}{{ datasourceMetrics.creation['0.95'] | number: '1.0-3' }}{{ datasourceMetrics.creation['0.99'] | number: '1.0-3' }}{{ filterNaN(datasourceMetrics.creation.max) | number: '1.0-2' }}
    Usage{{ datasourceMetrics.usage.count }}{{ filterNaN(datasourceMetrics.usage.mean) | number: '1.0-2' }}{{ datasourceMetrics.usage['0.0'] | number: '1.0-3' }}{{ datasourceMetrics.usage['0.5'] | number: '1.0-3' }}{{ datasourceMetrics.usage['0.75'] | number: '1.0-3' }}{{ datasourceMetrics.usage['0.95'] | number: '1.0-3' }}{{ datasourceMetrics.usage['0.99'] | number: '1.0-3' }}{{ filterNaN(datasourceMetrics.usage.max) | number: '1.0-2' }}
    +
    diff --git a/src/main/webapp/app/admin/metrics/blocks/metrics-datasource/metrics-datasource.component.ts b/src/main/webapp/app/admin/metrics/blocks/metrics-datasource/metrics-datasource.component.ts new file mode 100644 index 000000000..dbf60d40d --- /dev/null +++ b/src/main/webapp/app/admin/metrics/blocks/metrics-datasource/metrics-datasource.component.ts @@ -0,0 +1,32 @@ +/* + * Copyright (c) 2021. The Hyve + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * + * See the file LICENSE in the root of this repository. + */ + +import { ChangeDetectionStrategy, Component, Input } from '@angular/core'; + +import { Databases } from 'app/admin/metrics/metrics.model'; +import { filterNaN } from 'app/core/util/operators'; + +@Component({ + selector: 'jhi-metrics-datasource', + templateUrl: './metrics-datasource.component.html', + changeDetection: ChangeDetectionStrategy.OnPush, +}) +export class MetricsDatasourceComponent { + /** + * object containing all datasource related metrics + */ + @Input() datasourceMetrics?: Databases; + + /** + * boolean field saying if the metrics are in the process of being updated + */ + @Input() updating?: boolean; + + filterNaN = (input: number): number => filterNaN(input); +} diff --git a/src/main/webapp/app/admin/metrics/blocks/metrics-endpoints-requests/metrics-endpoints-requests.component.html b/src/main/webapp/app/admin/metrics/blocks/metrics-endpoints-requests/metrics-endpoints-requests.component.html new file mode 100644 index 000000000..551c9fe8e --- /dev/null +++ b/src/main/webapp/app/admin/metrics/blocks/metrics-endpoints-requests/metrics-endpoints-requests.component.html @@ -0,0 +1,33 @@ + + +

    Endpoints requests (time in millisecond)

    + +
    + + + + + + + + + + + + + + + + + + + +
    MethodEndpoint urlCountMean
    {{ method.key }}{{ entry.key }}{{ method.value!.count }}{{ method.value!.mean | number: '1.0-3' }}
    +
    diff --git a/src/main/webapp/app/admin/metrics/blocks/metrics-endpoints-requests/metrics-endpoints-requests.component.ts b/src/main/webapp/app/admin/metrics/blocks/metrics-endpoints-requests/metrics-endpoints-requests.component.ts new file mode 100644 index 000000000..78f81fdef --- /dev/null +++ b/src/main/webapp/app/admin/metrics/blocks/metrics-endpoints-requests/metrics-endpoints-requests.component.ts @@ -0,0 +1,28 @@ +/* + * Copyright (c) 2021. The Hyve + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * + * See the file LICENSE in the root of this repository. + */ + +import { Component, Input } from '@angular/core'; + +import { Services } from 'app/admin/metrics/metrics.model'; + +@Component({ + selector: 'jhi-metrics-endpoints-requests', + templateUrl: './metrics-endpoints-requests.component.html', +}) +export class MetricsEndpointsRequestsComponent { + /** + * object containing service related metrics + */ + @Input() endpointsRequestsMetrics?: Services; + + /** + * boolean field saying if the metrics are in the process of being updated + */ + @Input() updating?: boolean; +} diff --git a/src/main/webapp/app/admin/metrics/blocks/metrics-garbagecollector/metrics-garbagecollector.component.html b/src/main/webapp/app/admin/metrics/blocks/metrics-garbagecollector/metrics-garbagecollector.component.html new file mode 100644 index 000000000..6a9fa39e7 --- /dev/null +++ b/src/main/webapp/app/admin/metrics/blocks/metrics-garbagecollector/metrics-garbagecollector.component.html @@ -0,0 +1,101 @@ + + +

    Garbage collector statistics

    + +
    +
    +
    + + GC Live Data Size/GC Max Data Size ({{ garbageCollectorMetrics['jvm.gc.live.data.size'] / 1048576 | number: '1.0-0' }}M / + {{ garbageCollectorMetrics['jvm.gc.max.data.size'] / 1048576 | number: '1.0-0' }}M) + + + + + {{ + (100 * garbageCollectorMetrics['jvm.gc.live.data.size']) / garbageCollectorMetrics['jvm.gc.max.data.size'] | number: '1.0-2' + }}% + + +
    +
    + +
    +
    + + GC Memory Promoted/GC Memory Allocated ({{ garbageCollectorMetrics['jvm.gc.memory.promoted'] / 1048576 | number: '1.0-0' }}M / + {{ garbageCollectorMetrics['jvm.gc.memory.allocated'] / 1048576 | number: '1.0-0' }}M) + + + + + {{ + (100 * garbageCollectorMetrics['jvm.gc.memory.promoted']) / garbageCollectorMetrics['jvm.gc.memory.allocated'] + | number: '1.0-2' + }}% + + +
    +
    + +
    +
    +
    Classes loaded
    +
    {{ garbageCollectorMetrics.classesLoaded }}
    +
    +
    +
    Classes unloaded
    +
    {{ garbageCollectorMetrics.classesUnloaded }}
    +
    +
    + +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    CountMeanMinp50p75p95p99Max
    jvm.gc.pause{{ garbageCollectorMetrics['jvm.gc.pause'].count }}{{ garbageCollectorMetrics['jvm.gc.pause'].mean | number: '1.0-3' }}{{ garbageCollectorMetrics['jvm.gc.pause']['0.0'] | number: '1.0-3' }}{{ garbageCollectorMetrics['jvm.gc.pause']['0.5'] | number: '1.0-3' }}{{ garbageCollectorMetrics['jvm.gc.pause']['0.75'] | number: '1.0-3' }}{{ garbageCollectorMetrics['jvm.gc.pause']['0.95'] | number: '1.0-3' }}{{ garbageCollectorMetrics['jvm.gc.pause']['0.99'] | number: '1.0-3' }}{{ garbageCollectorMetrics['jvm.gc.pause'].max | number: '1.0-3' }}
    +
    +
    diff --git a/src/main/webapp/app/admin/metrics/blocks/metrics-garbagecollector/metrics-garbagecollector.component.ts b/src/main/webapp/app/admin/metrics/blocks/metrics-garbagecollector/metrics-garbagecollector.component.ts new file mode 100644 index 000000000..cdc9dfa0e --- /dev/null +++ b/src/main/webapp/app/admin/metrics/blocks/metrics-garbagecollector/metrics-garbagecollector.component.ts @@ -0,0 +1,28 @@ +/* + * Copyright (c) 2021. The Hyve + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * + * See the file LICENSE in the root of this repository. + */ + +import { Component, Input } from '@angular/core'; + +import { GarbageCollector } from 'app/admin/metrics/metrics.model'; + +@Component({ + selector: 'jhi-metrics-garbagecollector', + templateUrl: './metrics-garbagecollector.component.html', +}) +export class MetricsGarbageCollectorComponent { + /** + * object containing garbage collector related metrics + */ + @Input() garbageCollectorMetrics?: GarbageCollector; + + /** + * boolean field saying if the metrics are in the process of being updated + */ + @Input() updating?: boolean; +} diff --git a/src/main/webapp/app/admin/metrics/blocks/metrics-modal-threads/metrics-modal-threads.component.html b/src/main/webapp/app/admin/metrics/blocks/metrics-modal-threads/metrics-modal-threads.component.html new file mode 100644 index 000000000..f27f59081 --- /dev/null +++ b/src/main/webapp/app/admin/metrics/blocks/metrics-modal-threads/metrics-modal-threads.component.html @@ -0,0 +1,91 @@ + + +
    +

    Threads dump

    + + +
    + +
    +
    + + + All {{ threadDumpAll }} + + + + + Runnable {{ threadDumpRunnable }} + + + + + Waiting {{ threadDumpWaiting }} + + + + + Timed Waiting {{ threadDumpTimedWaiting }} + + + + + Blocked {{ threadDumpBlocked }} + +
    + +
    +
    + {{ thread.threadState }} + +  {{ thread.threadName }} (ID {{ thread.threadId }}) + + + Show StackTrace + Hide StackTrace + +
    + +
    +
    +
    + {{ st.className }}.{{ st.methodName }}({{ st.fileName }}:{{ st.lineNumber }}) + +
    +
    +
    + + + + + + + + + + + + + + + + + + + + +
    Threads dump: {{ thread.threadName }}
    Blocked TimeBlocked CountWaited TimeWaited CountLock Name
    {{ thread.blockedTime }}{{ thread.blockedCount }}{{ thread.waitedTime }}{{ thread.waitedCount }} + {{ thread.lockName }} +
    +
    +
    +
    + +
    diff --git a/src/main/webapp/app/admin/metrics/blocks/metrics-modal-threads/metrics-modal-threads.component.ts b/src/main/webapp/app/admin/metrics/blocks/metrics-modal-threads/metrics-modal-threads.component.ts new file mode 100644 index 000000000..d1a793687 --- /dev/null +++ b/src/main/webapp/app/admin/metrics/blocks/metrics-modal-threads/metrics-modal-threads.component.ts @@ -0,0 +1,68 @@ +/* + * Copyright (c) 2021. The Hyve + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * + * See the file LICENSE in the root of this repository. + */ + +import { ChangeDetectionStrategy, Component, OnInit } from '@angular/core'; +import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; + +import { Thread, ThreadState } from 'app/admin/metrics/metrics.model'; + +@Component({ + selector: 'jhi-thread-modal', + templateUrl: './metrics-modal-threads.component.html', + changeDetection: ChangeDetectionStrategy.OnPush, +}) +export class MetricsModalThreadsComponent implements OnInit { + ThreadState = ThreadState; + threadStateFilter?: ThreadState; + threads?: Thread[]; + threadDumpAll = 0; + threadDumpBlocked = 0; + threadDumpRunnable = 0; + threadDumpTimedWaiting = 0; + threadDumpWaiting = 0; + + constructor(private activeModal: NgbActiveModal) {} + + ngOnInit(): void { + this.threads?.forEach(thread => { + if (thread.threadState === ThreadState.Runnable) { + this.threadDumpRunnable += 1; + } else if (thread.threadState === ThreadState.Waiting) { + this.threadDumpWaiting += 1; + } else if (thread.threadState === ThreadState.TimedWaiting) { + this.threadDumpTimedWaiting += 1; + } else if (thread.threadState === ThreadState.Blocked) { + this.threadDumpBlocked += 1; + } + }); + + this.threadDumpAll = this.threadDumpRunnable + this.threadDumpWaiting + this.threadDumpTimedWaiting + this.threadDumpBlocked; + } + + getBadgeClass(threadState: ThreadState): string { + if (threadState === ThreadState.Runnable) { + return 'badge-success'; + } else if (threadState === ThreadState.Waiting) { + return 'badge-info'; + } else if (threadState === ThreadState.TimedWaiting) { + return 'badge-warning'; + } else if (threadState === ThreadState.Blocked) { + return 'badge-danger'; + } + return ''; + } + + getThreads(): Thread[] { + return this.threads?.filter(thread => !this.threadStateFilter || thread.threadState === this.threadStateFilter) ?? []; + } + + dismiss(): void { + this.activeModal.dismiss(); + } +} diff --git a/src/main/webapp/app/admin/metrics/blocks/metrics-request/metrics-request.component.html b/src/main/webapp/app/admin/metrics/blocks/metrics-request/metrics-request.component.html new file mode 100644 index 000000000..acb7f442a --- /dev/null +++ b/src/main/webapp/app/admin/metrics/blocks/metrics-request/metrics-request.component.html @@ -0,0 +1,35 @@ + + +

    HTTP requests (time in millisecond)

    + + + + + + + + + + + + + + + + + + +
    CodeCountMeanMax
    {{ entry.key }} + + {{ entry.value.count }} + + + {{ filterNaN(entry.value.mean) | number: '1.0-2' }} + {{ entry.value.max | number: '1.0-2' }}
    diff --git a/src/main/webapp/app/admin/metrics/blocks/metrics-request/metrics-request.component.ts b/src/main/webapp/app/admin/metrics/blocks/metrics-request/metrics-request.component.ts new file mode 100644 index 000000000..044ed2eee --- /dev/null +++ b/src/main/webapp/app/admin/metrics/blocks/metrics-request/metrics-request.component.ts @@ -0,0 +1,32 @@ +/* + * Copyright (c) 2021. The Hyve + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * + * See the file LICENSE in the root of this repository. + */ + +import { ChangeDetectionStrategy, Component, Input } from '@angular/core'; + +import { HttpServerRequests } from 'app/admin/metrics/metrics.model'; +import { filterNaN } from 'app/core/util/operators'; + +@Component({ + selector: 'jhi-metrics-request', + templateUrl: './metrics-request.component.html', + changeDetection: ChangeDetectionStrategy.OnPush, +}) +export class MetricsRequestComponent { + /** + * object containing http request related metrics + */ + @Input() requestMetrics?: HttpServerRequests; + + /** + * boolean field saying if the metrics are in the process of being updated + */ + @Input() updating?: boolean; + + filterNaN = (input: number): number => filterNaN(input); +} diff --git a/src/main/webapp/app/admin/metrics/blocks/metrics-system/metrics-system.component.html b/src/main/webapp/app/admin/metrics/blocks/metrics-system/metrics-system.component.html new file mode 100644 index 000000000..6274a375f --- /dev/null +++ b/src/main/webapp/app/admin/metrics/blocks/metrics-system/metrics-system.component.html @@ -0,0 +1,60 @@ + + +

    System

    + + +
    +
    Uptime
    +
    {{ convertMillisecondsToDuration(systemMetrics['process.uptime']) }}
    +
    + +
    +
    Start time
    +
    {{ systemMetrics['process.start.time'] | date: 'full' }}
    +
    + +
    +
    Process CPU usage
    +
    {{ 100 * systemMetrics['process.cpu.usage'] | number: '1.0-2' }} %
    +
    + + + {{ 100 * systemMetrics['process.cpu.usage'] | number: '1.0-2' }} % + + +
    +
    System CPU usage
    +
    {{ 100 * systemMetrics['system.cpu.usage'] | number: '1.0-2' }} %
    +
    + + + {{ 100 * systemMetrics['system.cpu.usage'] | number: '1.0-2' }} % + + +
    +
    System CPU count
    +
    {{ systemMetrics['system.cpu.count'] }}
    +
    + +
    +
    System 1m Load average
    +
    {{ systemMetrics['system.load.average.1m'] | number: '1.0-2' }}
    +
    + +
    +
    Process files max
    +
    {{ systemMetrics['process.files.max'] | number: '1.0-0' }}
    +
    + +
    +
    Process files open
    +
    {{ systemMetrics['process.files.open'] | number: '1.0-0' }}
    +
    +     diff --git a/src/main/webapp/app/admin/metrics/blocks/metrics-system/metrics-system.component.ts b/src/main/webapp/app/admin/metrics/blocks/metrics-system/metrics-system.component.ts new file mode 100644 index 000000000..235a99ba2 --- /dev/null +++ b/src/main/webapp/app/admin/metrics/blocks/metrics-system/metrics-system.component.ts @@ -0,0 +1,52 @@ +/* + * Copyright (c) 2021. The Hyve + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * + * See the file LICENSE in the root of this repository. + */ + +import { ChangeDetectionStrategy, Component, Input } from '@angular/core'; + +import { ProcessMetrics } from 'app/admin/metrics/metrics.model'; + +@Component({ + selector: 'jhi-metrics-system', + templateUrl: './metrics-system.component.html', + changeDetection: ChangeDetectionStrategy.OnPush, +}) +export class MetricsSystemComponent { + /** + * object containing thread related metrics + */ + @Input() systemMetrics?: ProcessMetrics; + + /** + * boolean field saying if the metrics are in the process of being updated + */ + @Input() updating?: boolean; + + convertMillisecondsToDuration(ms: number): string { + const times = { + year: 31557600000, + month: 2629746000, + day: 86400000, + hour: 3600000, + minute: 60000, + second: 1000, + }; + let timeString = ''; + for (const [key, value] of Object.entries(times)) { + if (Math.floor(ms / value) > 0) { + let plural = ''; + if (Math.floor(ms / value) > 1) { + plural = 's'; + } + timeString += `${Math.floor(ms / value).toString()} ${key.toString()}${plural} `; + ms = ms - value * Math.floor(ms / value); + } + } + return timeString; + } +} diff --git a/src/main/webapp/app/admin/metrics/metrics-modal.component.html b/src/main/webapp/app/admin/metrics/metrics-modal.component.html deleted file mode 100644 index e5dfb326b..000000000 --- a/src/main/webapp/app/admin/metrics/metrics-modal.component.html +++ /dev/null @@ -1,54 +0,0 @@ - -
    -

    - -
    -
    - All {{threadDumpAll}}  - Runnable {{threadDumpRunnable}}  - Waiting {{threadDumpWaiting}}  - Timed Waiting {{threadDumpTimedWaiting}}  - Blocked {{threadDumpBlocked}}  -
     
    -
    -
    - {{thread.threadState}} {{thread.threadName}} (ID {{thread.threadId}}) - - - - -
    -
    -
    -
    - {{st.className}}.{{st.methodName}}({{st.fileName}}:{{st.lineNumber}}) - -
    -
    -
    - - - - - - - - - - - - - - - - - - - -
    {{thread.blockedTime}}{{thread.blockedCount}}{{thread.waitedTime}}{{thread.waitedCount}}{{thread.lockName}}
    - -
    -
    -
    - -
    diff --git a/src/main/webapp/app/admin/metrics/metrics-modal.component.ts b/src/main/webapp/app/admin/metrics/metrics-modal.component.ts deleted file mode 100644 index d824a5a2a..000000000 --- a/src/main/webapp/app/admin/metrics/metrics-modal.component.ts +++ /dev/null @@ -1,55 +0,0 @@ -import { Component, OnInit } from '@angular/core'; -import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; - -@Component({ - selector: 'jhi-metrics-modal', - templateUrl: './metrics-modal.component.html', -}) -export class JhiMetricsMonitoringModalComponent implements OnInit { - - threadDumpFilter: any; - threadDump: any; - threadDumpAll = 0; - threadDumpBlocked = 0; - threadDumpRunnable = 0; - threadDumpTimedWaiting = 0; - threadDumpWaiting = 0; - - constructor( - public activeModal: NgbActiveModal, - ) { - } - - ngOnInit() { - this.threadDump.forEach((value) => { - if (value.threadState === 'RUNNABLE') { - this.threadDumpRunnable += 1; - } else if (value.threadState === 'WAITING') { - this.threadDumpWaiting += 1; - } else if (value.threadState === 'TIMED_WAITING') { - this.threadDumpTimedWaiting += 1; - } else if (value.threadState === 'BLOCKED') { - this.threadDumpBlocked += 1; - } - }); - this.threadDumpAll = this.threadDumpRunnable + this.threadDumpWaiting + - this.threadDumpTimedWaiting + this.threadDumpBlocked; - } - - getBadgeClass(threadState) { - if (threadState === 'RUNNABLE') { - return 'badge-success'; - } else if (threadState === 'WAITING') { - return 'badge-info'; - } else if (threadState === 'TIMED_WAITING') { - return 'badge-warning'; - } else if (threadState === 'BLOCKED') { - return 'badge-danger'; - } - } - - get threads(): any[] { - let state = this.threadDumpFilter && this.threadDumpFilter.threadState; - return this.threadDump.filter(t => !state || t.threadState === state); - } -} diff --git a/src/main/webapp/app/admin/metrics/metrics.component.html b/src/main/webapp/app/admin/metrics/metrics.component.html index 7c1779cce..e338fcf65 100644 --- a/src/main/webapp/app/admin/metrics/metrics.component.html +++ b/src/main/webapp/app/admin/metrics/metrics.component.html @@ -1,215 +1,51 @@

    - + Application Metrics +

    -

    -
    -
    - -

    ({{metrics.gauges['jvm.memory.total.used'].value / 1000000 | number:'1.0-0'}}M / {{metrics.gauges['jvm.memory.total.max'].value / 1000000 | number:'1.0-0'}}M)

    - - {{metrics.gauges['jvm.memory.total.used'].value * 100 / metrics.gauges['jvm.memory.total.max'].value | number:'1.0-0'}}% - -

    ({{metrics.gauges['jvm.memory.heap.used'].value / 1000000 | number:'1.0-0'}}M / {{metrics.gauges['jvm.memory.heap.max'].value / 1000000 | number:'1.0-0'}}M)

    - - {{metrics.gauges['jvm.memory.heap.used'].value * 100 / metrics.gauges['jvm.memory.heap.max'].value | number:'1.0-0'}}% - -

    ({{metrics.gauges['jvm.memory.non-heap.used'].value / 1000000 | number:'1.0-0'}}M / {{metrics.gauges['jvm.memory.non-heap.committed'].value / 1000000 | number:'1.0-0'}}M)

    - - {{metrics.gauges['jvm.memory.non-heap.used'].value * 100 / metrics.gauges['jvm.memory.non-heap.committed'].value | number:'1.0-0'}}% - -
    -
    - (Total: {{metrics.gauges['jvm.threads.count'].value}}) -

    {{metrics.gauges['jvm.threads.runnable.count'].value}}

    - - {{metrics.gauges['jvm.threads.runnable.count'].value * 100 / metrics.gauges['jvm.threads.count'].value | number:'1.0-0'}}% - -

    ({{metrics.gauges['jvm.threads.timed_waiting.count'].value}})

    - - {{metrics.gauges['jvm.threads.timed_waiting.count'].value * 100 / metrics.gauges['jvm.threads.count'].value | number:'1.0-0'}}% - -

    ({{metrics.gauges['jvm.threads.waiting.count'].value}})

    - - {{metrics.gauges['jvm.threads.waiting.count'].value * 100 / metrics.gauges['jvm.threads.count'].value | number:'1.0-0'}}% - -

    ({{metrics.gauges['jvm.threads.blocked.count'].value}})

    - - {{metrics.gauges['jvm.threads.blocked.count'].value * 100 / metrics.gauges['jvm.threads.count'].value | number:'1.0-0'}}% - -
    -
    - -
    -
    -
    {{metrics.gauges['jvm.garbage.PS-MarkSweep.count'].value}}
    -
    -
    -
    -
    {{metrics.gauges['jvm.garbage.PS-MarkSweep.time'].value}}ms
    -
    -
    -
    -
    {{metrics.gauges['jvm.garbage.PS-Scavenge.count'].value}}
    -
    -
    -
    -
    {{metrics.gauges['jvm.garbage.PS-Scavenge.time'].value}}ms
    -
    -
    -
    -
    +

    JVM Metrics

    + +
    + + + + + +
    + + + +
    Updating...
    + + + + -

    -

    - {{metrics.counters['com.codahale.metrics.servlet.InstrumentedFilter.activeRequests'].count | number:'1.0-0'}} - {{metrics.timers['com.codahale.metrics.servlet.InstrumentedFilter.requests'].count | number:'1.0-0'}} -

    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    (1 min) (5 min) (15 min)
    - - {{metrics.meters['com.codahale.metrics.servlet.InstrumentedFilter.responseCodes.ok'].count}} - - - {{metrics.meters['com.codahale.metrics.servlet.InstrumentedFilter.responseCodes.ok'].mean_rate | number:'1.0-2'}} - {{metrics.meters['com.codahale.metrics.servlet.InstrumentedFilter.responseCodes.ok'].m1_rate | number:'1.0-2'}} - {{metrics.meters['com.codahale.metrics.servlet.InstrumentedFilter.responseCodes.ok'].m5_rate | number:'1.0-2'}} - - {{metrics.meters['com.codahale.metrics.servlet.InstrumentedFilter.responseCodes.ok'].m15_rate | number:'1.0-2'}} -
    - - {{metrics.meters['com.codahale.metrics.servlet.InstrumentedFilter.responseCodes.notFound'].count}} - - - {{metrics.meters['com.codahale.metrics.servlet.InstrumentedFilter.responseCodes.notFound'].mean_rate | number:'1.0-2'}} - - {{metrics.meters['com.codahale.metrics.servlet.InstrumentedFilter.responseCodes.notFound'].m1_rate | number:'1.0-2'}} - - {{metrics.meters['com.codahale.metrics.servlet.InstrumentedFilter.responseCodes.notFound'].m5_rate | number:'1.0-2'}} - - {{metrics.meters['com.codahale.metrics.servlet.InstrumentedFilter.responseCodes.notFound'].m15_rate | number:'1.0-2'}} -
    - - {{metrics.meters['com.codahale.metrics.servlet.InstrumentedFilter.responseCodes.serverError'].count}} - - - {{metrics.meters['com.codahale.metrics.servlet.InstrumentedFilter.responseCodes.serverError'].mean_rate | number:'1.0-2'}} - - {{metrics.meters['com.codahale.metrics.servlet.InstrumentedFilter.responseCodes.serverError'].m1_rate | number:'1.0-2'}} - - {{metrics.meters['com.codahale.metrics.servlet.InstrumentedFilter.responseCodes.serverError'].m5_rate | number:'1.0-2'}} - - {{metrics.meters['com.codahale.metrics.servlet.InstrumentedFilter.responseCodes.serverError'].m15_rate | number:'1.0-2'}} -
    -
    + -

    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    {{entry.key}}{{entry.value.count}}{{entry.value.mean * 1000 | number:'1.0-0'}}{{entry.value.min * 1000 | number:'1.0-0'}}{{entry.value.p50 * 1000 | number:'1.0-0'}}{{entry.value.p75 * 1000 | number:'1.0-0'}}{{entry.value.p95 * 1000 | number:'1.0-0'}}{{entry.value.p99 * 1000 | number:'1.0-0'}}{{entry.value.max * 1000 | number:'1.0-0'}}
    -
    - -

    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    ({{metrics.gauges['HikariPool-1.pool.ActiveConnections'].value}} / {{metrics.gauges['HikariPool-1.pool.TotalConnections'].value}})
    -
    - - {{metrics.gauges['HikariPool-1.pool.ActiveConnections'].value * 100 / metrics.gauges['HikariPool-1.pool.TotalConnections'].value | number:'1.0-0'}}% - -
    -     		{{metrics.histograms['HikariPool-1.pool.Usage'].count}}{{metrics.histograms['HikariPool-1.pool.Usage'].mean | number:'1.0-2'}}{{metrics.histograms['HikariPool-1.pool.Usage'].min | number:'1.0-2'}}{{metrics.histograms['HikariPool-1.pool.Usage'].p50 | number:'1.0-2'}}{{metrics.histograms['HikariPool-1.pool.Usage'].p75 | number:'1.0-2'}}{{metrics.histograms['HikariPool-1.pool.Usage'].p95 | number:'1.0-2'}}{{metrics.histograms['HikariPool-1.pool.Usage'].p99 | number:'1.0-2'}}{{metrics.histograms['HikariPool-1.pool.Usage'].max | number:'1.0-2'}}
    -
    +
    diff --git a/src/main/webapp/app/admin/metrics/metrics.component.ts b/src/main/webapp/app/admin/metrics/metrics.component.ts index 83d052ccd..2c18eb508 100644 --- a/src/main/webapp/app/admin/metrics/metrics.component.ts +++ b/src/main/webapp/app/admin/metrics/metrics.component.ts @@ -1,72 +1,39 @@ -import { Component, OnInit } from '@angular/core'; -import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; +import { Component, OnInit, ChangeDetectorRef } from '@angular/core'; +import { combineLatest } from 'rxjs'; -import { JhiMetricsMonitoringModalComponent } from './metrics-modal.component'; import { JhiMetricsService } from './metrics.service'; -import { HttpResponse } from '@angular/common/http'; +import { Metrics, Thread } from './metrics.model'; @Component({ selector: 'jhi-metrics', templateUrl: './metrics.component.html', }) export class JhiMetricsMonitoringComponent implements OnInit { - metrics: any = {}; - cachesStats: any = {}; - servicesStats: any = {}; + metrics?: Metrics; + threads?: Thread[]; updatingMetrics = true; - JCACHE_KEY: string; - constructor( - private modalService: NgbModal, - private metricsService: JhiMetricsService, - ) { - this.JCACHE_KEY = 'jcache.statistics'; - } + constructor(private metricsService: JhiMetricsService, private changeDetector: ChangeDetectorRef) {} - ngOnInit() { + ngOnInit(): void { this.refresh(); } - refresh() { + refresh(): void { this.updatingMetrics = true; - this.metricsService.getMetrics().subscribe((response: HttpResponse) => { - this.metrics = response.body; + combineLatest([this.metricsService.getMetrics(), this.metricsService.threadDump()]).subscribe(([metrics, threadDump]) => { + this.metrics = metrics; + this.threads = threadDump.threads; this.updatingMetrics = false; - this.servicesStats = {}; - this.cachesStats = {}; - Object.keys(this.metrics.timers).forEach((key) => { - const value = this.metrics.timers[key]; - if (key.indexOf('web.rest') !== -1 || key.indexOf('service') !== -1) { - this.servicesStats[key] = value; - } - }); - Object.keys(this.metrics.gauges).forEach((key) => { - if (key.indexOf('jcache.statistics') !== -1) { - const value = this.metrics.gauges[key].value; - // remove gets or puts - const index = key.lastIndexOf('.'); - const newKey = key.substr(0, index); - - // Keep the name of the domain - this.cachesStats[newKey] = { - 'name': this.JCACHE_KEY.length, - 'value': value, - }; - } - }); + this.changeDetector.markForCheck(); }); } - refreshThreadDumpData() { - this.metricsService.threadDump().subscribe((data) => { - const modalRef = this.modalService.open(JhiMetricsMonitoringModalComponent, {size: 'lg'}); - modalRef.componentInstance.threadDump = data; - modalRef.result.then((result) => { - // Left blank intentionally, nothing to do here - }, (reason) => { - // Left blank intentionally, nothing to do here - }); - }); + metricsKeyExists(key: keyof Metrics): boolean { + return Boolean(this.metrics?.[key]); } + metricsKeyExistsAndObjectNotEmpty(key: keyof Metrics): boolean { + return Boolean(this.metrics?.[key] && JSON.stringify(this.metrics[key]) !== '{}'); + } } diff --git a/src/main/webapp/app/admin/metrics/metrics.model.ts b/src/main/webapp/app/admin/metrics/metrics.model.ts new file mode 100644 index 000000000..6d88be1f3 --- /dev/null +++ b/src/main/webapp/app/admin/metrics/metrics.model.ts @@ -0,0 +1,168 @@ +/* + * Copyright (c) 2021. The Hyve + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * + * See the file LICENSE in the root of this repository. + */ + +export interface Metrics { + jvm: { [key: string]: JvmMetrics }; + databases: Databases; + 'http.server.requests': HttpServerRequests; + cache: { [key: string]: CacheMetrics }; + garbageCollector: GarbageCollector; + services: Services; + processMetrics: ProcessMetrics; +} + +export interface JvmMetrics { + committed: number; + max: number; + used: number; +} + +export interface Databases { + min: Value; + idle: Value; + max: Value; + usage: MetricsWithPercentile; + pending: Value; + active: Value; + acquire: MetricsWithPercentile; + creation: MetricsWithPercentile; + connections: Value; +} + +export interface Value { + value: number; +} + +export interface MetricsWithPercentile { + '0.0': number; + '1.0': number; + max: number; + totalTime: number; + mean: number; + '0.5': number; + count: number; + '0.99': number; + '0.75': number; + '0.95': number; +} + +export interface HttpServerRequests { + all: { + count: number; + }; + percode: { [key: string]: MaxMeanCount }; +} + +export interface MaxMeanCount { + max: number; + mean: number; + count: number; +} + +export interface CacheMetrics { + 'cache.gets.miss': number; + 'cache.puts': number; + 'cache.gets.hit': number; + 'cache.removals': number; + 'cache.evictions': number; +} + +export interface GarbageCollector { + 'jvm.gc.max.data.size': number; + 'jvm.gc.pause': MetricsWithPercentile; + 'jvm.gc.memory.promoted': number; + 'jvm.gc.memory.allocated': number; + classesLoaded: number; + 'jvm.gc.live.data.size': number; + classesUnloaded: number; +} + +export interface Services { + [key: string]: { + [key in HttpMethod]?: MaxMeanCount; + }; +} + +export enum HttpMethod { + Post = 'POST', + Get = 'GET', + Put = 'PUT', + Patch = 'PATCH', + Delete = 'DELETE', +} + +export interface ProcessMetrics { + 'system.cpu.usage': number; + 'system.cpu.count': number; + 'system.load.average.1m'?: number; + 'process.cpu.usage': number; + 'process.files.max'?: number; + 'process.files.open'?: number; + 'process.start.time': number; + 'process.uptime': number; +} + +export interface ThreadDump { + threads: Thread[]; +} + +export interface Thread { + threadName: string; + threadId: number; + blockedTime: number; + blockedCount: number; + waitedTime: number; + waitedCount: number; + lockName: string | null; + lockOwnerId: number; + lockOwnerName: string | null; + daemon: boolean; + inNative: boolean; + suspended: boolean; + threadState: ThreadState; + priority: number; + stackTrace: StackTrace[]; + lockedMonitors: LockedMonitor[]; + lockedSynchronizers: string[]; + lockInfo: LockInfo | null; + // custom field for showing-hiding thread dump + showThreadDump?: boolean; +} + +export interface LockInfo { + className: string; + identityHashCode: number; +} + +export interface LockedMonitor { + className: string; + identityHashCode: number; + lockedStackDepth: number; + lockedStackFrame: StackTrace; +} + +export interface StackTrace { + classLoaderName: string | null; + moduleName: string | null; + moduleVersion: string | null; + methodName: string; + fileName: string; + lineNumber: number; + className: string; + nativeMethod: boolean; +} + +export enum ThreadState { + Runnable = 'RUNNABLE', + TimedWaiting = 'TIMED_WAITING', + Waiting = 'WAITING', + Blocked = 'BLOCKED', + New = 'NEW', + Terminated = 'TERMINATED', +} diff --git a/src/main/webapp/app/admin/metrics/metrics.module.ts b/src/main/webapp/app/admin/metrics/metrics.module.ts new file mode 100644 index 000000000..f5ec7e268 --- /dev/null +++ b/src/main/webapp/app/admin/metrics/metrics.module.ts @@ -0,0 +1,41 @@ +/* + * Copyright (c) 2021. The Hyve + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * + * See the file LICENSE in the root of this repository. + */ + +import { NgModule } from '@angular/core'; +import { RouterModule } from '@angular/router'; + +import { ManagementPortalSharedModule } from 'app/shared/shared.module'; +import { JhiMetricsMonitoringComponent } from './metrics.component'; +import { metricsRoute } from './metrics.route'; +import { JvmMemoryComponent } from './blocks/jvm-memory/jvm-memory.component'; +import { JvmThreadsComponent } from './blocks/jvm-threads/jvm-threads.component'; +import { MetricsCacheComponent } from './blocks/metrics-cache/metrics-cache.component'; +import { MetricsDatasourceComponent } from './blocks/metrics-datasource/metrics-datasource.component'; +import { MetricsEndpointsRequestsComponent } from './blocks/metrics-endpoints-requests/metrics-endpoints-requests.component'; +import { MetricsGarbageCollectorComponent } from './blocks/metrics-garbagecollector/metrics-garbagecollector.component'; +import { MetricsModalThreadsComponent } from './blocks/metrics-modal-threads/metrics-modal-threads.component'; +import { MetricsRequestComponent } from './blocks/metrics-request/metrics-request.component'; +import { MetricsSystemComponent } from './blocks/metrics-system/metrics-system.component'; + +@NgModule({ + imports: [ManagementPortalSharedModule, RouterModule.forChild([metricsRoute])], + declarations: [ + JhiMetricsMonitoringComponent, + JvmMemoryComponent, + JvmThreadsComponent, + MetricsCacheComponent, + MetricsDatasourceComponent, + MetricsEndpointsRequestsComponent, + MetricsGarbageCollectorComponent, + MetricsModalThreadsComponent, + MetricsRequestComponent, + MetricsSystemComponent, + ], +}) +export class MetricsModule {} diff --git a/src/main/webapp/app/admin/metrics/metrics.service.ts b/src/main/webapp/app/admin/metrics/metrics.service.ts index 932f08485..b4d95f8b4 100644 --- a/src/main/webapp/app/admin/metrics/metrics.service.ts +++ b/src/main/webapp/app/admin/metrics/metrics.service.ts @@ -1,6 +1,7 @@ import { Injectable } from '@angular/core'; import { HttpClient, HttpResponse } from '@angular/common/http'; import { Observable } from 'rxjs'; +import { Metrics, ThreadDump } from "./metrics.model"; @Injectable({ providedIn: 'root' }) export class JhiMetricsService { @@ -8,11 +9,11 @@ export class JhiMetricsService { constructor(private http: HttpClient) { } - getMetrics(): Observable> { - return this.http.get('management/metrics', { observe: 'response'}) as Observable>; + getMetrics(): Observable { + return this.http.get('management/jhimetrics'); } - threadDump(): Observable { - return this.http.get('management/dump'); + threadDump(): Observable { + return this.http.get('management/threaddump'); } } diff --git a/src/main/webapp/app/app.module.ts b/src/main/webapp/app/app.module.ts index 5f8b4a9e7..85f7f4450 100644 --- a/src/main/webapp/app/app.module.ts +++ b/src/main/webapp/app/app.module.ts @@ -13,7 +13,7 @@ import { ManagementPortalAccountModule } from './account/account.module'; import { ManagementPortalAdminModule } from './admin/admin.module'; import { PaginationConfig } from './blocks/config/uib-pagination.config'; import { ManagementPortalEntityModule } from './entities/entity.module'; -import { ManagementPortalHomeModule } from './home/home.module'; +import { ManagementPortalHomeModule } from './home'; import { ActiveMenuDirective, @@ -26,10 +26,13 @@ import { } from './layouts'; import { LANGUAGES, ManagementPortalSharedModule } from './shared'; -// import { AuthInterceptor } from './blocks/interceptor/auth.interceptor'; -// import { AuthExpiredInterceptor } from './blocks/interceptor/auth-expired.interceptor'; import { ErrorHandlerInterceptor } from './blocks/interceptor/errorhandler.interceptor'; import { NotificationInterceptor } from './blocks/interceptor/notification.interceptor'; +import { APP_BASE_HREF, PlatformLocation } from "@angular/common"; + +export function getBaseHref(platformLocation: PlatformLocation): string { + return platformLocation.getBaseHrefFromDOM(); +} @NgModule({ imports: [ @@ -71,6 +74,11 @@ import { NotificationInterceptor } from './blocks/interceptor/notification.inter useClass: NotificationInterceptor, multi: true, }, + { + provide: APP_BASE_HREF, + useFactory: getBaseHref, + deps: [PlatformLocation] + } ], bootstrap: [JhiMainComponent], }) diff --git a/src/main/webapp/app/core/util/operators.ts b/src/main/webapp/app/core/util/operators.ts new file mode 100644 index 000000000..2e00cea38 --- /dev/null +++ b/src/main/webapp/app/core/util/operators.ts @@ -0,0 +1,18 @@ +/* + * Copyright (c) 2021. The Hyve + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * + * See the file LICENSE in the root of this repository. + */ + +/* + * Function used to workaround https://github.com/microsoft/TypeScript/issues/16069 + * es2019 alternative `const filteredArr = myArr.flatMap((x) => x ? x : []);` + */ +export function isPresent(t: T | undefined | null | void): t is T { + return t !== undefined && t !== null; +} + +export const filterNaN = (input: number): number => isNaN(input) ? 0 : input; diff --git a/tsconfig.json b/tsconfig.json index 5e1eb191b..1a53116f8 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -1,11 +1,11 @@ /* To learn more about this file see: https://angular.io/config/tsconfig. */ { - "compileOnSave": false, + "compileOnSave": true, "compilerOptions": { "target": "es2017", "module": "es2020", "moduleResolution": "node", - "baseUrl": "./", + "baseUrl": "src/main/webapp", "forceConsistentCasingInFileNames": true, "noFallthroughCasesInSwitch": true, "sourceMap": true, From f9687483f77ae7a9142ced77a1e055178c5c6cd1 Mon Sep 17 00:00:00 2001 From: Joris Borgdorff Date: Fri, 29 Oct 2021 15:42:27 +0200 Subject: [PATCH 092/431] Removed some more dependencies --- build.gradle | 47 +++---- gradle.properties | 21 +-- .../radarbase/auth/util/TokenTestUtils.java | 4 +- .../config/LoggingConfiguration.java | 124 ++++-------------- .../config/ThymeleafConfiguration.java | 5 +- .../management/service/MailService.java | 4 +- .../management/service/PasswordService.java | 107 +++++++++++++++ .../management/service/SubjectService.java | 13 +- .../management/service/UserService.java | 53 ++++---- .../management/service/util/PasswordUtil.java | 31 ----- .../management/service/util/RandomUtil.java | 41 ------ .../management/web/rest/AccountResource.java | 25 +--- .../web/rest/OAuthClientsResource.java | 3 +- .../web/rest/errors/BadRequestException.java | 7 +- .../web/rest/errors/ConflictException.java | 7 +- .../rest/errors/InvalidRequestException.java | 7 +- .../rest/errors/InvalidStateException.java | 7 +- .../web/rest/errors/NotFoundException.java | 7 +- .../errors/RadarWebApplicationException.java | 10 +- .../web/rest/errors/RequestGoneException.java | 7 +- .../service/UserServiceIntTest.java | 19 +-- .../web/rest/UserResourceIntTest.java | 15 ++- 22 files changed, 248 insertions(+), 316 deletions(-) create mode 100644 src/main/java/org/radarbase/management/service/PasswordService.java delete mode 100644 src/main/java/org/radarbase/management/service/util/PasswordUtil.java delete mode 100644 src/main/java/org/radarbase/management/service/util/RandomUtil.java diff --git a/build.gradle b/build.gradle index de1f8029b..3a2c5b13c 100644 --- a/build.gradle +++ b/build.gradle @@ -163,12 +163,7 @@ ext.findbugAnnotationVersion = '3.0.2' dependencies { implementation("tech.jhipster:jhipster-framework:${jhipster_server_version}") - implementation("tech.jhipster:jhipster-dependencies:${jhipster_server_version}") { - exclude group: "org.springframework.boot", module: "spring-boot-autoconfigure" - } - implementation("net.logstash.logback:logstash-logback-encoder:${logstash_logback_encoder_version}") { - exclude(group: 'ch.qos.logback') - } + implementation("tech.jhipster:jhipster-dependencies:${jhipster_server_version}") implementation("io.micrometer:micrometer-core") implementation "com.fasterxml.jackson.datatype:jackson-datatype-json-org:${jackson_dataformat_version}" implementation "com.fasterxml.jackson.datatype:jackson-datatype-hppc:${jackson_dataformat_version}" @@ -178,62 +173,51 @@ dependencies { implementation "com.fasterxml.jackson.core:jackson-annotations:${jackson_dataformat_version}" implementation "com.fasterxml.jackson.core:jackson-databind:${jackson_version}" implementation "com.hazelcast:hazelcast:${hazelcast_version}" - implementation "com.hazelcast:hazelcast-hibernate53:${hazelcast_hibernate53_version}" implementation "com.hazelcast:hazelcast-spring:${hazelcast_version}" implementation "javax.cache:cache-api" - implementation "org.hibernate:hibernate-core:${hibernate_version}" implementation("com.zaxxer:HikariCP:${hikaricp_version}") - implementation "org.apache.commons:commons-lang3:${commons_lang_version}" - implementation "commons-io:commons-io:${commons_io_version}" implementation "javax.transaction:javax.transaction-api" - implementation group: 'javax.ws.rs', name: 'jsr311-api', version: '1.1.1' implementation group: 'com.google.code.findbugs', name: 'jsr305', version: findbugAnnotationVersion - implementation "org.hibernate:hibernate-envers:${hibernate_version}" - implementation "org.hibernate:hibernate-validator:7.0.1.Final" implementation("org.liquibase:liquibase-core:${liquibase_version}") implementation "com.mattbertolini:liquibase-slf4j:${liquibase_slf4j_version}" implementation "org.springframework.boot:spring-boot-starter-actuator" implementation "org.springframework.boot:spring-boot-autoconfigure" - implementation "org.springframework.boot:spring-boot-loader-tools" implementation "org.springframework.boot:spring-boot-starter-mail" implementation "org.springframework.boot:spring-boot-starter-logging" - implementation "org.springframework.boot:spring-boot-starter-aop" implementation ("org.springframework.boot:spring-boot-starter-data-jpa") { exclude group: 'org.hibernate', module: 'hibernate-entitymanager' } + implementation "org.hibernate:hibernate-core" + implementation "org.hibernate:hibernate-envers" + implementation "org.hibernate:hibernate-validator:7.0.1.Final" + + implementation "org.postgresql:postgresql:${postgresql_version}" + implementation "com.h2database:h2" + implementation "org.springframework.boot:spring-boot-starter-security" + implementation "org.springframework.security:spring-security-data" + implementation("org.springframework.boot:spring-boot-starter-web") { exclude module: 'spring-boot-starter-tomcat' } implementation "org.springframework.boot:spring-boot-starter-undertow" implementation "org.springframework.boot:spring-boot-starter-thymeleaf" implementation("org.springframework:spring-context-support") - implementation("org.springframework:spring-jdbc") - implementation "org.springframework.security:spring-security-config" - implementation "org.springframework.security:spring-security-data" - implementation ("org.springframework.security:spring-security-web") { - exclude group: 'com.fasterxml.jackson.core', module: 'jackson-databind' - } implementation("org.springframework.session:spring-session-hazelcast") implementation("org.springframework.security.oauth:spring-security-oauth2:2.5.1.RELEASE") - implementation("org.springframework.security:spring-security-oauth2-resource-server") - implementation("org.springframework.security:spring-security-oauth2-jose") - implementation 'org.springdoc:springdoc-openapi-ui:1.5.2' + implementation "org.springdoc:springdoc-openapi-ui:${springdoc_version}" implementation("javax.inject:javax.inject:1") - implementation "org.postgresql:postgresql:${postgresql_version}" - implementation "com.h2database:h2" implementation project(path: ':radar-auth', configuration: 'shadow') implementation project(path: ':radar-auth:deprecated-auth0', configuration: 'shadow') - implementation "org.springframework.data:spring-data-envers:${spring_data_envers_version}" + implementation "org.springframework.data:spring-data-envers" + runtimeOnly("jakarta.xml.bind:jakarta.xml.bind-api:${javax_xml_bind_version}") runtimeOnly("org.glassfish.jaxb:jaxb-core:${javax_jaxb_core_version}") runtimeOnly("org.glassfish.jaxb:jaxb-runtime:${javax_jaxb_runtime_version}") runtimeOnly("javax.activation:activation:${javax_activation}") + runtimeOnly 'org.javassist:javassist:3.28.0-GA' - implementation 'org.javassist:javassist:3.28.0-GA' - - testImplementation "org.awaitility:awaitility:${awaitility_version}" testImplementation "com.jayway.jsonpath:json-path" testImplementation ("org.springframework.boot:spring-boot-starter-test") { exclude group: "com.vaadin.external.google", module:"android-json" @@ -254,6 +238,9 @@ dependencies { dependencyManagement { imports { + mavenBom "org.springframework:spring-framework-bom:5.3.12" + mavenBom "org.springframework.boot:spring-boot-dependencies:2.5.6" + mavenBom 'org.springframework.data:spring-data-bom:2021.0.6' mavenBom "org.springframework.session:spring-session-bom:2021.0.2" } } diff --git a/gradle.properties b/gradle.properties index 515e446e3..126cffa2a 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,36 +1,21 @@ rootProject.name=management-portal profile=dev assertj_version=3.6.2 -awaitility_version=2.0.0 -commons_lang_version=3.7 -commons_io_version=2.6 -# Overridden to get metrics-jcache -dropwizard_metrics_version=3.2.2 -logstash_logback_encoder_version=4.9 -javax_transaction_version=3.9.1 -jaxb_version=2.3.4 -json_path_version=0.9.1 jhipster_server_version=7.3.1 -hazelcast_hibernate53_version=2.2.1 hazelcast_version=4.2.2 -hibernate_version=5.4.32.Final hikaricp_version=5.0.0 liquibase_slf4j_version=4.0.0 liquibase_version=4.5.0 -metrics_spring_version=3.1.3 node_version=16.11.1 npm_version=8.0.0 -prometheus_simpleclient_version=0.0.20 postgresql_version=42.2.14 springdoc_version=1.5.2 -spring_boot_version=2.5.5 +spring_boot_version=2.5.6 gatling_version=3.6.1 mapstruct_version=1.4.2.Final -undertow_version=1.4.10.Final yarn_version=1.22.15 -spring_data_envers_version=2.5.6 -jackson_version=2.12.4 -jackson_dataformat_version=2.12.4 +jackson_version=2.12.5 +jackson_dataformat_version=2.12.5 javax_xml_bind_version=2.3.3 javax_jaxb_core_version=2.3.0.1 javax_jaxb_runtime_version=2.3.4 diff --git a/radar-auth/src/test/java/org/radarbase/auth/util/TokenTestUtils.java b/radar-auth/src/test/java/org/radarbase/auth/util/TokenTestUtils.java index a3e7a828f..6113427a5 100644 --- a/radar-auth/src/test/java/org/radarbase/auth/util/TokenTestUtils.java +++ b/radar-auth/src/test/java/org/radarbase/auth/util/TokenTestUtils.java @@ -6,13 +6,13 @@ import java.security.interfaces.RSAPrivateKey; import java.security.interfaces.RSAPublicKey; import java.time.Instant; +import java.util.Base64; import java.util.Date; import java.util.stream.Collectors; import com.auth0.jwt.JWT; import com.auth0.jwt.algorithms.Algorithm; import com.auth0.jwt.interfaces.DecodedJWT; -import org.apache.commons.codec.binary.Base64; import org.radarbase.auth.authorization.Permission; /** @@ -62,7 +62,7 @@ public static void setUp() throws Exception { "radarbase".toCharArray()); Certificate cert = ks.getCertificate("selfsigned"); RSAPublicKey publicKey = (RSAPublicKey) cert.getPublicKey(); - PUBLIC_KEY_STRING = new String(new Base64().encode(publicKey.getEncoded())); + PUBLIC_KEY_STRING = new String(Base64.getEncoder().encode(publicKey.getEncoded())); initVars(PUBLIC_KEY_STRING, Algorithm.RSA256(publicKey, privateKey)); } diff --git a/src/main/java/org/radarbase/management/config/LoggingConfiguration.java b/src/main/java/org/radarbase/management/config/LoggingConfiguration.java index 502665b6c..1899a111e 100644 --- a/src/main/java/org/radarbase/management/config/LoggingConfiguration.java +++ b/src/main/java/org/radarbase/management/config/LoggingConfiguration.java @@ -1,114 +1,46 @@ package org.radarbase.management.config; -import ch.qos.logback.classic.AsyncAppender; -import ch.qos.logback.classic.Level; import ch.qos.logback.classic.LoggerContext; -import ch.qos.logback.classic.spi.LoggerContextListener; -import ch.qos.logback.core.spi.ContextAwareBase; -import tech.jhipster.config.JHipsterProperties; -import javax.annotation.PostConstruct; -import net.logstash.logback.appender.LogstashSocketAppender; -import net.logstash.logback.stacktrace.ShortenedThrowableConverter; -import org.slf4j.Logger; +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.ObjectMapper; import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Configuration; +import tech.jhipster.config.JHipsterProperties; -@Configuration -public class LoggingConfiguration { - - private static final Logger log = LoggerFactory.getLogger(LoggingConfiguration.class); - - private final LoggerContext context = (LoggerContext) LoggerFactory.getILoggerFactory(); - - @Value("${spring.application.name}") - private String appName; - - @Value("${server.port}") - private String serverPort; - - @Autowired - private JHipsterProperties jHipsterProperties; - - @PostConstruct - public void setUpLogstash() { - if (jHipsterProperties.getLogging().getLogstash().isEnabled()) { - addLogstashAppender(context); - - // Add context listener - LogbackLoggerContextListener loggerContextListener = new LogbackLoggerContextListener(); - loggerContextListener.setContext(context); - context.addListener(loggerContextListener); - } - } - - private void addLogstashAppender(LoggerContext context) { - log.info("Initializing Logstash logging"); - - LogstashSocketAppender logstashAppender = new LogstashSocketAppender(); - logstashAppender.setName("LOGSTASH"); - logstashAppender.setContext(context); - String customFields = - "{\"app_name\":\"" + appName + "\",\"app_port\":\"" + serverPort + "\"}"; - - // Set the Logstash appender config from JHipster properties - logstashAppender.setSyslogHost(jHipsterProperties.getLogging().getLogstash().getHost()); - logstashAppender.setPort(jHipsterProperties.getLogging().getLogstash().getPort()); - logstashAppender.setCustomFields(customFields); - - // Limit the maximum length of the forwarded stacktrace so that it won't exceed the 8KB - // UDP limit of logstash - ShortenedThrowableConverter throwableConverter = new ShortenedThrowableConverter(); - throwableConverter.setMaxLength(7500); - throwableConverter.setRootCauseFirst(true); - logstashAppender.setThrowableConverter(throwableConverter); - - logstashAppender.start(); +import java.util.HashMap; +import java.util.Map; - // Wrap the appender in an Async appender for performance - AsyncAppender asyncLogstashAppender = new AsyncAppender(); - asyncLogstashAppender.setContext(context); - asyncLogstashAppender.setName("ASYNC_LOGSTASH"); - asyncLogstashAppender - .setQueueSize(jHipsterProperties.getLogging().getLogstash().getQueueSize()); - asyncLogstashAppender.addAppender(logstashAppender); - asyncLogstashAppender.start(); +import static tech.jhipster.config.logging.LoggingUtils.addContextListener; +import static tech.jhipster.config.logging.LoggingUtils.addJsonConsoleAppender; +import static tech.jhipster.config.logging.LoggingUtils.addLogstashTcpSocketAppender; - context.getLogger("ROOT").addAppender(asyncLogstashAppender); - } +@Configuration +public class LoggingConfiguration { + /** Logging configuration for JHipster. */ + public LoggingConfiguration(@Value("${spring.application.name}") String appName, + @Value("${server.port}") String serverPort, + JHipsterProperties jHipsterProperties, + ObjectMapper mapper) throws JsonProcessingException { + LoggerContext context = (LoggerContext) LoggerFactory.getILoggerFactory(); - /** - * Logback configuration is achieved by configuration file and API. When configuration file - * change is detected, the configuration is reset. This listener ensures that the programmatic - * configuration is also re-applied after reset. - */ - class LogbackLoggerContextListener extends ContextAwareBase implements LoggerContextListener { + Map map = new HashMap<>(); + map.put("app_name", appName); + map.put("app_port", serverPort); - @Override - public boolean isResetResistant() { - return true; - } + String customFields = mapper.writeValueAsString(map); - @Override - public void onStart(LoggerContext context) { - addLogstashAppender(context); - } + JHipsterProperties.Logging loggingProperties = jHipsterProperties.getLogging(); + JHipsterProperties.Logging.Logstash logstashProperties = loggingProperties.getLogstash(); - @Override - public void onReset(LoggerContext context) { - addLogstashAppender(context); + if (loggingProperties.isUseJsonFormat()) { + addJsonConsoleAppender(context, customFields); } - - @Override - public void onStop(LoggerContext context) { - // Nothing to do. + if (logstashProperties.isEnabled()) { + addLogstashTcpSocketAppender(context, customFields, logstashProperties); } - - @Override - public void onLevelChange(ch.qos.logback.classic.Logger logger, Level level) { - // Nothing to do. + if (loggingProperties.isUseJsonFormat() || logstashProperties.isEnabled()) { + addContextListener(context, customFields, loggingProperties); } } - } diff --git a/src/main/java/org/radarbase/management/config/ThymeleafConfiguration.java b/src/main/java/org/radarbase/management/config/ThymeleafConfiguration.java index 6cebf816b..a7f77132d 100644 --- a/src/main/java/org/radarbase/management/config/ThymeleafConfiguration.java +++ b/src/main/java/org/radarbase/management/config/ThymeleafConfiguration.java @@ -1,11 +1,12 @@ package org.radarbase.management.config; -import org.apache.commons.lang3.CharEncoding; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Description; import org.thymeleaf.templateresolver.ClassLoaderTemplateResolver; +import java.nio.charset.StandardCharsets; + @Configuration public class ThymeleafConfiguration { @Bean @@ -15,7 +16,7 @@ public ClassLoaderTemplateResolver emailTemplateResolver() { emailTemplateResolver.setPrefix("templates/"); emailTemplateResolver.setSuffix(".html"); emailTemplateResolver.setTemplateMode("HTML"); - emailTemplateResolver.setCharacterEncoding(CharEncoding.UTF_8); + emailTemplateResolver.setCharacterEncoding(StandardCharsets.UTF_8.name()); emailTemplateResolver.setOrder(1); return emailTemplateResolver; } diff --git a/src/main/java/org/radarbase/management/service/MailService.java b/src/main/java/org/radarbase/management/service/MailService.java index 8999a9aeb..5dbcb30d6 100644 --- a/src/main/java/org/radarbase/management/service/MailService.java +++ b/src/main/java/org/radarbase/management/service/MailService.java @@ -1,10 +1,10 @@ package org.radarbase.management.service; +import java.nio.charset.StandardCharsets; import java.time.Duration; import java.util.Locale; import javax.mail.internet.MimeMessage; -import org.apache.commons.lang3.CharEncoding; import org.radarbase.management.config.ManagementPortalProperties; import org.radarbase.management.domain.User; import org.slf4j.Logger; @@ -63,7 +63,7 @@ public void sendEmail(String to, String subject, String content, boolean isMulti MimeMessage mimeMessage = javaMailSender.createMimeMessage(); try { MimeMessageHelper message = new MimeMessageHelper(mimeMessage, isMultipart, - CharEncoding.UTF_8); + StandardCharsets.UTF_8.name()); message.setTo(to); message.setFrom(managementPortalProperties.getMail().getFrom()); message.setSubject(subject); diff --git a/src/main/java/org/radarbase/management/service/PasswordService.java b/src/main/java/org/radarbase/management/service/PasswordService.java new file mode 100644 index 000000000..a4299cd23 --- /dev/null +++ b/src/main/java/org/radarbase/management/service/PasswordService.java @@ -0,0 +1,107 @@ +/* + * Copyright (c) 2021. The Hyve + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * + * See the file LICENSE in the root of this repository. + */ + +package org.radarbase.management.service; + +import org.radarbase.management.web.rest.errors.BadRequestException; +import org.springframework.security.crypto.password.PasswordEncoder; +import org.springframework.stereotype.Service; + +import java.security.SecureRandom; +import java.util.Locale; +import java.util.Random; + +import static org.radarbase.management.web.rest.errors.EntityName.USER; +import static org.radarbase.management.web.rest.errors.ErrorConstants.ERR_PASSWORD_TOO_LONG; +import static org.radarbase.management.web.rest.errors.ErrorConstants.ERR_PASSWORD_TOO_WEAK; + +@Service +public class PasswordService { + public static final int[] NUMERIC; + public static final int[] ALPHANUMERIC; + private static final int[] LOWER; + private static final int[] UPPER; + + static { + String upper = "ABCDEFGHIJKLMNOPQRSTUVWXYZ"; + String lower = upper.toLowerCase(Locale.ROOT); + String digits = "0123456789"; + UPPER = upper.chars().toArray(); + LOWER = lower.chars().toArray(); + NUMERIC = digits.chars().toArray(); + ALPHANUMERIC = (upper + lower + digits).chars().toArray(); + } + + private final PasswordEncoder passwordEncoder; + private final Random random = new SecureRandom(); + + public PasswordService(PasswordEncoder passwordEncoder) { + this.passwordEncoder = passwordEncoder; + } + + /** + * Encodes a plaintext password. + * @param password password to encode. + * @return encoded password. + */ + public String encode(String password) { + return passwordEncoder.encode(password); + } + + /** + * Generates a random password that is already encoded. + * @return encoded password. + */ + public String generateEncodedPassword() { + return encode(generateString(ALPHANUMERIC, 30)); + } + + /** + * Generates a random numeric reset key. + * @return reset key. + */ + public String generateResetKey() { + return generateString(NUMERIC, 20); + } + + private String generateString(int[] allowedCharacters, int length) { + return random.ints(0, allowedCharacters.length) + .map(i -> allowedCharacters[i]) + .limit(length) + .collect(() -> new StringBuilder(length), + StringBuilder::appendCodePoint, StringBuilder::append) + .toString(); + } + + /** + * Check that given password is strong enough, based on complexity and length. + * @param password password to check. + * @throws BadRequestException if the password is too weak or too long. + */ + public void checkPasswordStrength(String password) { + if (isPasswordWeak(password)) { + throw new BadRequestException("Weak password. Use a password with more variety of" + + "numeric, alphabetical and symbol characters.", USER, ERR_PASSWORD_TOO_WEAK); + } else if (password.length() > 100) { + throw new BadRequestException("Password too long", USER, ERR_PASSWORD_TOO_LONG); + } + } + + /** Check whether given password is too weak. */ + private boolean isPasswordWeak(String password) { + return password.length() < 8 + || noneInRange(password, UPPER[0], UPPER[UPPER.length - 1]) + || noneInRange(password, LOWER[0], LOWER[LOWER.length - 1]) + || noneInRange(password, NUMERIC[0], NUMERIC[NUMERIC.length - 1]); + } + + private boolean noneInRange(String str, int startInclusive, int endInclusive) { + return str.chars().noneMatch(c -> c >= startInclusive && c < endInclusive); + } +} diff --git a/src/main/java/org/radarbase/management/service/SubjectService.java b/src/main/java/org/radarbase/management/service/SubjectService.java index b57ec9d60..e1470c3f9 100644 --- a/src/main/java/org/radarbase/management/service/SubjectService.java +++ b/src/main/java/org/radarbase/management/service/SubjectService.java @@ -45,7 +45,6 @@ import org.radarbase.management.service.mapper.ProjectMapper; import org.radarbase.management.service.mapper.SourceMapper; import org.radarbase.management.service.mapper.SubjectMapper; -import org.radarbase.management.service.util.RandomUtil; import org.radarbase.management.web.rest.errors.BadRequestException; import org.radarbase.management.web.rest.errors.ConflictException; import org.radarbase.management.web.rest.errors.ErrorConstants; @@ -57,7 +56,6 @@ import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.data.history.Revisions; -import org.springframework.security.crypto.password.PasswordEncoder; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -91,15 +89,15 @@ public class SubjectService { @Autowired private RoleRepository roleRepository; - @Autowired - private PasswordEncoder passwordEncoder; - @Autowired private RevisionService revisionService; @Autowired private ManagementPortalProperties managementPortalProperties; + @Autowired + private PasswordService passwordService; + /** * Create a new subject. * @@ -117,9 +115,8 @@ public SubjectDTO createSubject(SubjectDTO subjectDto) { roles.add(projectParticipantRole); // set password and reset keys - String encryptedPassword = passwordEncoder.encode(RandomUtil.generatePassword()); - user.setPassword(encryptedPassword); - user.setResetKey(RandomUtil.generateResetKey()); + user.setPassword(passwordService.generateEncodedPassword()); + user.setResetKey(passwordService.generateResetKey()); // setting default language key to "en", required to set email context, Find a workaround user.setLangKey("en"); user.setResetDate(ZonedDateTime.now()); diff --git a/src/main/java/org/radarbase/management/service/UserService.java b/src/main/java/org/radarbase/management/service/UserService.java index 94d8ad443..788425a26 100644 --- a/src/main/java/org/radarbase/management/service/UserService.java +++ b/src/main/java/org/radarbase/management/service/UserService.java @@ -1,23 +1,5 @@ package org.radarbase.management.service; -import static org.radarbase.auth.authorization.AuthoritiesConstants.INACTIVE_PARTICIPANT; -import static org.radarbase.auth.authorization.AuthoritiesConstants.PARTICIPANT; -import static org.radarbase.management.web.rest.errors.EntityName.USER; -import static org.radarbase.management.web.rest.errors.ErrorConstants.ERR_EMAIL_EXISTS; -import static org.radarbase.management.web.rest.errors.ErrorConstants.ERR_ENTITY_NOT_FOUND; - -import java.time.Period; -import java.time.ZonedDateTime; -import java.util.Arrays; -import java.util.Collections; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Objects; -import java.util.Optional; -import java.util.Set; - -import java.util.stream.Collectors; import org.radarbase.auth.authorization.AuthoritiesConstants; import org.radarbase.auth.config.Constants; import org.radarbase.management.config.ManagementPortalProperties; @@ -35,7 +17,6 @@ import org.radarbase.management.service.dto.UserDTO; import org.radarbase.management.service.mapper.ProjectMapper; import org.radarbase.management.service.mapper.UserMapper; -import org.radarbase.management.service.util.RandomUtil; import org.radarbase.management.web.rest.errors.ConflictException; import org.radarbase.management.web.rest.errors.ErrorConstants; import org.radarbase.management.web.rest.errors.NotFoundException; @@ -46,10 +27,27 @@ import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.scheduling.annotation.Scheduled; -import org.springframework.security.crypto.password.PasswordEncoder; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.time.Period; +import java.time.ZonedDateTime; +import java.util.Arrays; +import java.util.Collections; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.Optional; +import java.util.Set; +import java.util.stream.Collectors; + +import static org.radarbase.auth.authorization.AuthoritiesConstants.INACTIVE_PARTICIPANT; +import static org.radarbase.auth.authorization.AuthoritiesConstants.PARTICIPANT; +import static org.radarbase.management.web.rest.errors.EntityName.USER; +import static org.radarbase.management.web.rest.errors.ErrorConstants.ERR_EMAIL_EXISTS; +import static org.radarbase.management.web.rest.errors.ErrorConstants.ERR_ENTITY_NOT_FOUND; + /** * Service class for managing users. */ @@ -66,7 +64,7 @@ public class UserService { private ProjectRepository projectRepository; @Autowired - private PasswordEncoder passwordEncoder; + private PasswordService passwordService; @Autowired private RoleRepository roleRepository; @@ -122,7 +120,7 @@ public Optional completePasswordReset(String newPassword, String key) { return user.getResetDate().isAfter(oneDayAgo); }) .map(user -> { - user.setPassword(passwordEncoder.encode(newPassword)); + user.setPassword(passwordService.encode(newPassword)); user.setResetKey(null); user.setResetDate(null); user.setActivated(true); @@ -143,7 +141,7 @@ public Optional requestActivationReset(String login) { return userRepository.findOneByLogin(login) .filter((p) -> !p.getActivated()) .map(user -> { - user.setResetKey(RandomUtil.generateResetKey()); + user.setResetKey(passwordService.generateResetKey()); user.setResetDate(ZonedDateTime.now()); return user; }); @@ -159,7 +157,7 @@ public Optional requestPasswordReset(String mail) { return userRepository.findOneByEmail(mail) .filter(User::getActivated) .map(user -> { - user.setResetKey(RandomUtil.generateResetKey()); + user.setResetKey(passwordService.generateResetKey()); user.setResetDate(ZonedDateTime.now()); return user; }); @@ -185,9 +183,8 @@ public User createUser(UserDTO userDto) { } else { user.setLangKey(userDto.getLangKey()); } - String encryptedPassword = passwordEncoder.encode(RandomUtil.generatePassword()); - user.setPassword(encryptedPassword); - user.setResetKey(RandomUtil.generateResetKey()); + user.setPassword(passwordService.generateEncodedPassword()); + user.setResetKey(passwordService.generateResetKey()); user.setResetDate(ZonedDateTime.now()); user.setActivated(false); @@ -309,7 +306,7 @@ public void changePassword(String password) { */ public void changePassword(String login, String password) { userRepository.findOneByLogin(login).ifPresent(user -> { - String encryptedPassword = passwordEncoder.encode(password); + String encryptedPassword = passwordService.encode(password); user.setPassword(encryptedPassword); log.debug("Changed password for User: {}", user); }); diff --git a/src/main/java/org/radarbase/management/service/util/PasswordUtil.java b/src/main/java/org/radarbase/management/service/util/PasswordUtil.java deleted file mode 100644 index f56476bf7..000000000 --- a/src/main/java/org/radarbase/management/service/util/PasswordUtil.java +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Copyright (c) 2021. The Hyve - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * - * See the file LICENSE in the root of this repository. - */ - -package org.radarbase.management.service.util; - -import java.util.Arrays; -import java.util.regex.Pattern; - -/** Password utility. */ -public class PasswordUtil { - private final Pattern[] patterns = { - // numeric - Pattern.compile("[0-9]"), - // letter - Pattern.compile("[a-zA-Z]"), - // symbol - Pattern.compile("[^a-zA-Z0-9]") - }; - - /** Check whether given password is too weak. */ - public boolean isPasswordWeak(String password) { - return !Arrays.stream(patterns).allMatch(p -> p.matcher(password).find()) - || password.length() < 8; - } -} diff --git a/src/main/java/org/radarbase/management/service/util/RandomUtil.java b/src/main/java/org/radarbase/management/service/util/RandomUtil.java deleted file mode 100644 index b14abf090..000000000 --- a/src/main/java/org/radarbase/management/service/util/RandomUtil.java +++ /dev/null @@ -1,41 +0,0 @@ -package org.radarbase.management.service.util; - -import org.apache.commons.lang3.RandomStringUtils; - -/** - * Utility class for generating random Strings. - */ -public final class RandomUtil { - - private static final int DEF_COUNT = 20; - - private RandomUtil() { - } - - /** - * Generate a password. - * - * @return the generated password - */ - public static String generatePassword() { - return RandomStringUtils.randomAlphanumeric(DEF_COUNT); - } - - /** - * Generate an activation key. - * - * @return the generated activation key - */ - public static String generateActivationKey() { - return RandomStringUtils.randomNumeric(DEF_COUNT); - } - - /** - * Generate a reset key. - * - * @return the generated reset key - */ - public static String generateResetKey() { - return RandomStringUtils.randomNumeric(DEF_COUNT); - } -} diff --git a/src/main/java/org/radarbase/management/web/rest/AccountResource.java b/src/main/java/org/radarbase/management/web/rest/AccountResource.java index 7ab990d36..bb90e289b 100644 --- a/src/main/java/org/radarbase/management/web/rest/AccountResource.java +++ b/src/main/java/org/radarbase/management/web/rest/AccountResource.java @@ -6,10 +6,10 @@ import org.radarbase.management.domain.User; import org.radarbase.management.security.SessionRadarToken; import org.radarbase.management.service.MailService; +import org.radarbase.management.service.PasswordService; import org.radarbase.management.service.UserService; import org.radarbase.management.service.dto.UserDTO; import org.radarbase.management.service.mapper.UserMapper; -import org.radarbase.management.service.util.PasswordUtil; import org.radarbase.management.web.rest.errors.BadRequestException; import org.radarbase.management.web.rest.errors.RadarWebApplicationException; import org.radarbase.management.web.rest.vm.KeyAndPasswordVM; @@ -30,15 +30,12 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpSession; import javax.validation.Valid; -import javax.ws.rs.core.Response; import java.util.Optional; import static org.radarbase.management.security.JwtAuthenticationFilter.TOKEN_ATTRIBUTE; import static org.radarbase.management.web.rest.errors.EntityName.USER; import static org.radarbase.management.web.rest.errors.ErrorConstants.ERR_ACCESS_DENIED; import static org.radarbase.management.web.rest.errors.ErrorConstants.ERR_EMAIL_NOT_REGISTERED; -import static org.radarbase.management.web.rest.errors.ErrorConstants.ERR_PASSWORD_TOO_LONG; -import static org.radarbase.management.web.rest.errors.ErrorConstants.ERR_PASSWORD_TOO_WEAK; /** * REST controller for managing the current user's account. @@ -64,7 +61,8 @@ public class AccountResource { @Autowired(required = false) private RadarToken token; - private final PasswordUtil passwordUtil = new PasswordUtil(); + @Autowired + private PasswordService passwordService; /** * GET /activate : activate the registered user. @@ -124,7 +122,7 @@ public ResponseEntity logout(HttpServletRequest request) { public ResponseEntity getAccount() { return Optional.ofNullable(userService.getUserWithAuthorities()) .map(user -> new ResponseEntity<>(userMapper.userToUserDTO(user), HttpStatus.OK)) - .orElseThrow(() -> new RadarWebApplicationException(Response.Status.FORBIDDEN, + .orElseThrow(() -> new RadarWebApplicationException(HttpStatus.FORBIDDEN, "Cannot get account without user", USER, ERR_ACCESS_DENIED)); } @@ -140,7 +138,7 @@ public ResponseEntity getAccount() { public ResponseEntity saveAccount(@Valid @RequestBody UserDTO userDto, Authentication authentication) { if (authentication.getPrincipal() == null) { - throw new RadarWebApplicationException(Response.Status.FORBIDDEN, + throw new RadarWebApplicationException(HttpStatus.FORBIDDEN, "Cannot update account without user", USER, ERR_ACCESS_DENIED); } @@ -161,7 +159,7 @@ public ResponseEntity saveAccount(@Valid @RequestBody UserDTO userDto, produces = MediaType.TEXT_PLAIN_VALUE) @Timed public ResponseEntity changePassword(@RequestBody String password) { - checkPasswordLength(password); + passwordService.checkPasswordStrength(password); userService.changePassword(password); return new ResponseEntity<>(HttpStatus.NO_CONTENT); } @@ -218,19 +216,10 @@ public ResponseEntity requestPasswordReset(@RequestBody String mail) { @Timed public ResponseEntity finishPasswordReset( @RequestBody KeyAndPasswordVM keyAndPassword) { - checkPasswordLength(keyAndPassword.getNewPassword()); + passwordService.checkPasswordStrength(keyAndPassword.getNewPassword()); return userService .completePasswordReset(keyAndPassword.getNewPassword(), keyAndPassword.getKey()) .map(user -> new ResponseEntity(HttpStatus.NO_CONTENT)) .orElse(new ResponseEntity<>(HttpStatus.INTERNAL_SERVER_ERROR)); } - - private void checkPasswordLength(String password) { - if (passwordUtil.isPasswordWeak(password)) { - throw new BadRequestException("Weak password. Use a password with more variety of" - + "numeric, alphabetical and symbol characters.", USER, ERR_PASSWORD_TOO_WEAK); - } else if (password.length() > 100) { - throw new BadRequestException("Password too long", USER, ERR_PASSWORD_TOO_LONG); - } - } } diff --git a/src/main/java/org/radarbase/management/web/rest/OAuthClientsResource.java b/src/main/java/org/radarbase/management/web/rest/OAuthClientsResource.java index b51012a90..906cd54a0 100644 --- a/src/main/java/org/radarbase/management/web/rest/OAuthClientsResource.java +++ b/src/main/java/org/radarbase/management/web/rest/OAuthClientsResource.java @@ -16,7 +16,6 @@ import javax.validation.Valid; import io.micrometer.core.annotation.Timed; -import javax.ws.rs.DefaultValue; import org.radarbase.auth.config.Constants; import org.radarbase.auth.exception.NotAuthorizedException; import org.radarbase.auth.token.RadarToken; @@ -189,7 +188,7 @@ public ResponseEntity createOAuthClient(@Valid @RequestBody Cl @Timed public ResponseEntity getRefreshToken(@RequestParam String login, @RequestParam(value = "clientId") String clientId, - @RequestParam(value = "persistent") @DefaultValue("false") Boolean persistent) + @RequestParam(value = "persistent", defaultValue = "false") Boolean persistent) throws NotAuthorizedException, URISyntaxException, MalformedURLException { User currentUser = userService.getUserWithAuthorities(); if (currentUser == null) { diff --git a/src/main/java/org/radarbase/management/web/rest/errors/BadRequestException.java b/src/main/java/org/radarbase/management/web/rest/errors/BadRequestException.java index e18d05c49..840c3e27e 100644 --- a/src/main/java/org/radarbase/management/web/rest/errors/BadRequestException.java +++ b/src/main/java/org/radarbase/management/web/rest/errors/BadRequestException.java @@ -1,7 +1,8 @@ package org.radarbase.management.web.rest.errors; +import org.springframework.http.HttpStatus; + import java.util.Map; -import javax.ws.rs.core.Response; /** * The request could not be understood by the server due to malformed syntax. @@ -19,7 +20,7 @@ public class BadRequestException extends RadarWebApplicationException { * @param errorCode errorCode from {@link ErrorConstants} */ public BadRequestException(String message, String entityName, String errorCode) { - super(Response.Status.BAD_REQUEST, message, entityName, errorCode); + super(HttpStatus.BAD_REQUEST, message, entityName, errorCode); } /** @@ -32,6 +33,6 @@ public BadRequestException(String message, String entityName, String errorCode) */ public BadRequestException(String message, String entityName, String errorCode, Map paramMap) { - super(Response.Status.BAD_REQUEST, message, entityName, errorCode, paramMap); + super(HttpStatus.BAD_REQUEST, message, entityName, errorCode, paramMap); } } diff --git a/src/main/java/org/radarbase/management/web/rest/errors/ConflictException.java b/src/main/java/org/radarbase/management/web/rest/errors/ConflictException.java index c5bc7e9e4..b1a3c457b 100644 --- a/src/main/java/org/radarbase/management/web/rest/errors/ConflictException.java +++ b/src/main/java/org/radarbase/management/web/rest/errors/ConflictException.java @@ -1,7 +1,8 @@ package org.radarbase.management.web.rest.errors; +import org.springframework.http.HttpStatus; + import java.util.Map; -import javax.ws.rs.core.Response; /** @@ -25,7 +26,7 @@ public class ConflictException extends RadarWebApplicationException { * @param errorCode errorCode from {@link ErrorConstants} */ public ConflictException(String message, String entityName, String errorCode) { - super(Response.Status.CONFLICT, message, entityName, errorCode); + super(HttpStatus.CONFLICT, message, entityName, errorCode); } /** @@ -38,6 +39,6 @@ public ConflictException(String message, String entityName, String errorCode) { */ public ConflictException(String message, String entityName, String errorCode, Map paramMap) { - super(Response.Status.CONFLICT, message, entityName, errorCode, paramMap); + super(HttpStatus.CONFLICT, message, entityName, errorCode, paramMap); } } diff --git a/src/main/java/org/radarbase/management/web/rest/errors/InvalidRequestException.java b/src/main/java/org/radarbase/management/web/rest/errors/InvalidRequestException.java index 4ad7a1839..75c5420be 100644 --- a/src/main/java/org/radarbase/management/web/rest/errors/InvalidRequestException.java +++ b/src/main/java/org/radarbase/management/web/rest/errors/InvalidRequestException.java @@ -1,7 +1,8 @@ package org.radarbase.management.web.rest.errors; +import org.springframework.http.HttpStatus; + import java.util.Map; -import javax.ws.rs.core.Response; /** * The server understood the request, but is refusing to fulfill it. @@ -17,7 +18,7 @@ public class InvalidRequestException extends RadarWebApplicationException { * @param errorCode errorCode from {@link ErrorConstants} */ public InvalidRequestException(String message, String entityName, String errorCode) { - super(Response.Status.FORBIDDEN, message, entityName, errorCode); + super(HttpStatus.FORBIDDEN, message, entityName, errorCode); } /** @@ -30,7 +31,7 @@ public InvalidRequestException(String message, String entityName, String errorCo */ public InvalidRequestException(String message, String entityName, String errorCode, Map params) { - super(Response.Status.FORBIDDEN, message, entityName, errorCode, params); + super(HttpStatus.FORBIDDEN, message, entityName, errorCode, params); } } diff --git a/src/main/java/org/radarbase/management/web/rest/errors/InvalidStateException.java b/src/main/java/org/radarbase/management/web/rest/errors/InvalidStateException.java index e4239a95f..f547e1d06 100644 --- a/src/main/java/org/radarbase/management/web/rest/errors/InvalidStateException.java +++ b/src/main/java/org/radarbase/management/web/rest/errors/InvalidStateException.java @@ -1,8 +1,9 @@ package org.radarbase.management.web.rest.errors; +import org.springframework.http.HttpStatus; + import java.util.Map; -import javax.ws.rs.core.Response; /** * The server encountered an unexpected condition which prevented it from fulfilling the request. @@ -17,7 +18,7 @@ public class InvalidStateException extends RadarWebApplicationException { * @param errorCode errorCode from {@link ErrorConstants} */ public InvalidStateException(String message, String entityName, String errorCode) { - super(Response.Status.INTERNAL_SERVER_ERROR, message, entityName, errorCode); + super(HttpStatus.INTERNAL_SERVER_ERROR, message, entityName, errorCode); } /** @@ -30,6 +31,6 @@ public InvalidStateException(String message, String entityName, String errorCode */ public InvalidStateException(String message, String entityName, String errorCode, Map params) { - super(Response.Status.INTERNAL_SERVER_ERROR, message, entityName, errorCode, params); + super(HttpStatus.INTERNAL_SERVER_ERROR, message, entityName, errorCode, params); } } diff --git a/src/main/java/org/radarbase/management/web/rest/errors/NotFoundException.java b/src/main/java/org/radarbase/management/web/rest/errors/NotFoundException.java index ef128b8a2..0c2330b24 100644 --- a/src/main/java/org/radarbase/management/web/rest/errors/NotFoundException.java +++ b/src/main/java/org/radarbase/management/web/rest/errors/NotFoundException.java @@ -1,7 +1,8 @@ package org.radarbase.management.web.rest.errors; +import org.springframework.http.HttpStatus; + import java.util.Map; -import javax.ws.rs.core.Response; /** * Created by dverbeec on 7/09/2017. @@ -20,7 +21,7 @@ public class NotFoundException extends RadarWebApplicationException { * @param errorCode errorCode from {@link ErrorConstants} */ public NotFoundException(String message, String entityName, String errorCode) { - super(Response.Status.NOT_FOUND, message, entityName, errorCode); + super(HttpStatus.NOT_FOUND, message, entityName, errorCode); } /** @@ -33,6 +34,6 @@ public NotFoundException(String message, String entityName, String errorCode) { */ public NotFoundException(String message, String entityName, String errorCode, Map paramMap) { - super(Response.Status.NOT_FOUND, message, entityName, errorCode, paramMap); + super(HttpStatus.NOT_FOUND, message, entityName, errorCode, paramMap); } } diff --git a/src/main/java/org/radarbase/management/web/rest/errors/RadarWebApplicationException.java b/src/main/java/org/radarbase/management/web/rest/errors/RadarWebApplicationException.java index d8bde6cea..9c2ac3a87 100644 --- a/src/main/java/org/radarbase/management/web/rest/errors/RadarWebApplicationException.java +++ b/src/main/java/org/radarbase/management/web/rest/errors/RadarWebApplicationException.java @@ -1,8 +1,8 @@ package org.radarbase.management.web.rest.errors; +import org.springframework.http.HttpStatus; import org.springframework.web.server.ResponseStatusException; -import javax.ws.rs.core.Response.Status; import java.text.SimpleDateFormat; import java.util.Date; import java.util.HashMap; @@ -41,7 +41,7 @@ public class RadarWebApplicationException extends ResponseStatusException { * @param entityName Entity related to the exception * @param errorCode error code defined in MP if relevant. */ - public RadarWebApplicationException(Status status, String message, String entityName, + public RadarWebApplicationException(HttpStatus status, String message, String entityName, String errorCode) { this(status, message, entityName, errorCode, emptyMap()); } @@ -49,15 +49,15 @@ public RadarWebApplicationException(Status status, String message, String entity /** * A base parameterized exception, which can be translated on the client side. - * @param status {@link javax.ws.rs.core.Response.Status} code. + * @param status {@link HttpStatus} code. * @param message message to client. * @param entityName entityRelated from {@link EntityName} * @param errorCode errorCode from {@link ErrorConstants} * @param params map of optional information. */ - public RadarWebApplicationException(Status status, String message, String entityName, + public RadarWebApplicationException(HttpStatus status, String message, String entityName, String errorCode, Map params) { - super(status.getStatusCode(), message, null); + super(status, message, null); // add default timestamp first, so a timestamp key in the paramMap will overwrite it this.paramMap.put("timestamp", new SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.US) diff --git a/src/main/java/org/radarbase/management/web/rest/errors/RequestGoneException.java b/src/main/java/org/radarbase/management/web/rest/errors/RequestGoneException.java index a2b46c1a1..c9cf2aa39 100644 --- a/src/main/java/org/radarbase/management/web/rest/errors/RequestGoneException.java +++ b/src/main/java/org/radarbase/management/web/rest/errors/RequestGoneException.java @@ -1,7 +1,8 @@ package org.radarbase.management.web.rest.errors; +import org.springframework.http.HttpStatus; + import java.util.Map; -import javax.ws.rs.core.Response; /** * Throw when the requested resource is no longer available at the server and no forwarding @@ -18,7 +19,7 @@ public class RequestGoneException extends RadarWebApplicationException { * @param errorCode errorCode from {@link ErrorConstants} */ public RequestGoneException(String message, String entityName, String errorCode) { - super(Response.Status.GONE, message, entityName, errorCode); + super(HttpStatus.GONE, message, entityName, errorCode); } @@ -32,6 +33,6 @@ public RequestGoneException(String message, String entityName, String errorCode) */ public RequestGoneException(String message, String entityName, String errorCode, Map paramMap) { - super(Response.Status.GONE, message, entityName, errorCode, paramMap); + super(HttpStatus.GONE, message, entityName, errorCode, paramMap); } } diff --git a/src/test/java/org/radarbase/management/service/UserServiceIntTest.java b/src/test/java/org/radarbase/management/service/UserServiceIntTest.java index 24006f39b..dbe21f318 100644 --- a/src/test/java/org/radarbase/management/service/UserServiceIntTest.java +++ b/src/test/java/org/radarbase/management/service/UserServiceIntTest.java @@ -1,7 +1,6 @@ package org.radarbase.management.service; import javax.persistence.EntityManager; -import org.apache.commons.lang3.RandomStringUtils; import org.hibernate.envers.AuditReader; import org.hibernate.envers.AuditReaderFactory; import org.hibernate.envers.query.AuditEntity; @@ -19,7 +18,6 @@ import org.radarbase.management.repository.filters.UserFilter; import org.radarbase.management.service.dto.UserDTO; import org.radarbase.management.service.mapper.UserMapper; -import org.radarbase.management.service.util.RandomUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.data.domain.Page; @@ -86,6 +84,9 @@ public class UserServiceIntTest { @Autowired private EntityManagerFactory entityManagerFactory; + @Autowired + private PasswordService passwordService; + private EntityManager entityManager; private UserDTO userDto; @@ -94,7 +95,7 @@ public class UserServiceIntTest { public void setUp() { entityManager = entityManagerFactory.createEntityManager( entityManagerFactory.getProperties()); - userDto = userMapper.userToUserDTO(createEntity()); + userDto = userMapper.userToUserDTO(createEntity(passwordService)); ReflectionTestUtils.setField(revisionService, "revisionEntityRepository", revisionEntityRepository); ReflectionTestUtils.setField(revisionService, "entityManager", entityManager); @@ -108,10 +109,10 @@ public void setUp() { *

    This is a static method, as tests for other entities might also need it, * if they test an entity which has a required relationship to the User entity.

    */ - public static User createEntity() { + public static User createEntity(PasswordService passwordService) { User user = new User(); user.setLogin(DEFAULT_LOGIN); - user.setPassword(RandomStringUtils.random(60)); + user.setPassword(passwordService.generateEncodedPassword()); user.setActivated(true); user.setEmail(DEFAULT_EMAIL); user.setFirstName(DEFAULT_FIRSTNAME); @@ -146,7 +147,7 @@ void assertThatResetKeyMustNotBeOlderThan24Hours() { User user = userService.createUser(userDto); ZonedDateTime daysAgo = ZonedDateTime.now().minusHours(25); - String resetKey = RandomUtil.generateResetKey(); + String resetKey = passwordService.generateResetKey(); user.setActivated(true); user.setResetDate(daysAgo); user.setResetKey(resetKey); @@ -180,7 +181,7 @@ void assertThatUserCanResetPassword() { User user = userService.createUser(userDto); final String oldPassword = user.getPassword(); ZonedDateTime daysAgo = ZonedDateTime.now().minusHours(2); - String resetKey = RandomUtil.generateResetKey(); + String resetKey = passwordService.generateResetKey(); user.setActivated(true); user.setResetDate(daysAgo); user.setResetKey(resetKey); @@ -249,7 +250,7 @@ void assertThatAnonymousUserIsNotGet() { * @param userRepository The UserRepository that will be used to save the object * @return the saved object */ - public static User addExpiredUser(UserRepository userRepository) { + public User addExpiredUser(UserRepository userRepository) { Role adminRole = new Role(); adminRole.setId(1L); @@ -263,7 +264,7 @@ public static User addExpiredUser(UserRepository userRepository) { user.setLastName("pired"); user.setRoles(Collections.singleton(adminRole)); user.setActivated(false); - user.setPassword(RandomStringUtils.random(60)); + user.setPassword(passwordService.generateEncodedPassword()); return userRepository.save(user); } diff --git a/src/test/java/org/radarbase/management/web/rest/UserResourceIntTest.java b/src/test/java/org/radarbase/management/web/rest/UserResourceIntTest.java index aa85fa7b8..18359649b 100644 --- a/src/test/java/org/radarbase/management/web/rest/UserResourceIntTest.java +++ b/src/test/java/org/radarbase/management/web/rest/UserResourceIntTest.java @@ -1,6 +1,5 @@ package org.radarbase.management.web.rest; -import org.apache.commons.lang3.RandomStringUtils; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -16,6 +15,7 @@ import org.radarbase.management.repository.UserRepository; import org.radarbase.management.security.JwtAuthenticationFilter; import org.radarbase.management.service.MailService; +import org.radarbase.management.service.PasswordService; import org.radarbase.management.service.UserService; import org.radarbase.management.service.dto.RoleDTO; import org.radarbase.management.web.rest.errors.ExceptionTranslator; @@ -54,8 +54,8 @@ import static org.radarbase.management.service.UserServiceIntTest.UPDATED_LASTNAME; import static org.radarbase.management.service.UserServiceIntTest.UPDATED_LOGIN; import static org.radarbase.management.service.UserServiceIntTest.UPDATED_PASSWORD; -import static org.radarbase.management.service.UserServiceIntTest.createEntity; import static org.radarbase.auth.authorization.AuthoritiesConstants.SYS_ADMIN; +import static org.radarbase.management.service.UserServiceIntTest.createEntity; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.delete; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; @@ -101,6 +101,9 @@ class UserResourceIntTest { @Autowired private RadarToken radarToken; + @Autowired + private PasswordService passwordService; + private MockMvc restUserMockMvc; private User user; @@ -131,7 +134,7 @@ public void setUp() throws ServletException { @BeforeEach public void initTest() { - user = createEntity(); + user = createEntity(passwordService); } @Test @@ -248,7 +251,7 @@ void getAllUsers() throws Exception { User userWithRole = new User(); userWithRole.setLogin(DEFAULT_LOGIN); - userWithRole.setPassword(RandomStringUtils.random(60)); + userWithRole.setPassword(passwordService.generateEncodedPassword()); userWithRole.setActivated(true); userWithRole.setEmail(DEFAULT_EMAIL); userWithRole.setFirstName(DEFAULT_FIRSTNAME); @@ -384,7 +387,7 @@ void updateUserExistingEmail() throws Exception { User anotherUser = new User(); anotherUser.setLogin("jhipster"); - anotherUser.setPassword(RandomStringUtils.random(60)); + anotherUser.setPassword(passwordService.generateEncodedPassword()); anotherUser.setActivated(true); anotherUser.setEmail("jhipster@localhost"); anotherUser.setFirstName("java"); @@ -424,7 +427,7 @@ void updateUserExistingLogin() throws Exception { User anotherUser = new User(); anotherUser.setLogin("jhipster"); - anotherUser.setPassword(RandomStringUtils.random(60)); + anotherUser.setPassword(passwordService.generateEncodedPassword()); anotherUser.setActivated(true); anotherUser.setEmail("jhipster@localhost"); anotherUser.setFirstName("java"); From 3fc04de05f1a3da5147bf2f0de781147e698b07a Mon Sep 17 00:00:00 2001 From: Joris Borgdorff Date: Fri, 29 Oct 2021 15:53:50 +0200 Subject: [PATCH 093/431] Actually test password service --- .../management/ManagementPortalTestApp.java | 0 .../service/PasswordServiceTest.java | 65 +++++++++++++++++++ 2 files changed, 65 insertions(+) rename src/{main => test}/java/org/radarbase/management/ManagementPortalTestApp.java (100%) create mode 100644 src/test/java/org/radarbase/management/service/PasswordServiceTest.java diff --git a/src/main/java/org/radarbase/management/ManagementPortalTestApp.java b/src/test/java/org/radarbase/management/ManagementPortalTestApp.java similarity index 100% rename from src/main/java/org/radarbase/management/ManagementPortalTestApp.java rename to src/test/java/org/radarbase/management/ManagementPortalTestApp.java diff --git a/src/test/java/org/radarbase/management/service/PasswordServiceTest.java b/src/test/java/org/radarbase/management/service/PasswordServiceTest.java new file mode 100644 index 000000000..1fb9d2157 --- /dev/null +++ b/src/test/java/org/radarbase/management/service/PasswordServiceTest.java @@ -0,0 +1,65 @@ +/* + * Copyright (c) 2021. The Hyve + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * + * See the file LICENSE in the root of this repository. + */ + +package org.radarbase.management.service; + +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.radarbase.management.ManagementPortalTestApp; +import org.radarbase.management.web.rest.errors.BadRequestException; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.context.junit.jupiter.SpringExtension; + +import java.util.Arrays; + +import static org.junit.jupiter.api.Assertions.*; + +@ExtendWith(SpringExtension.class) +@SpringBootTest(classes = ManagementPortalTestApp.class) +class PasswordServiceTest { + @Autowired + private PasswordService passwordService; + + @Test + void encode() { + assertNotEquals("abc", passwordService.encode("abc")); + } + + @Test + void generateEncodedPassword() { + String pass = passwordService.generateEncodedPassword(); + assertTrue(pass.length() >= 30); + assertTrue(pass.length() < 100); + assertDoesNotThrow(() -> passwordService.checkPasswordStrength(pass)); + } + + @Test + void generateResetKey() { + String resetKey = passwordService.generateResetKey(); + assertTrue(resetKey.length() > 16); + assertTrue(resetKey.length() < 100); + } + + @Test + void checkPasswordStrength() { + assertDoesNotThrow(() -> passwordService.checkPasswordStrength("aA1aaaaaaaa")); + assertThrows(BadRequestException.class, () -> passwordService.checkPasswordStrength("a")); + byte[] tooLong = new byte[101]; + Arrays.fill(tooLong, (byte)'A'); + assertThrows(BadRequestException.class, () -> + passwordService.checkPasswordStrength("aA1" + new String(tooLong))); + assertThrows(BadRequestException.class, () -> + passwordService.checkPasswordStrength("aAaaaaaaaaa")); + assertThrows(BadRequestException.class, () -> + passwordService.checkPasswordStrength("a1aaaaaaaaa")); + assertThrows(BadRequestException.class, () -> + passwordService.checkPasswordStrength("aAaaaaaaaaa")); + } +} From c19ca3c954fca90251bb8efd78c72226e8a34bb0 Mon Sep 17 00:00:00 2001 From: Joris Borgdorff Date: Fri, 29 Oct 2021 15:54:55 +0200 Subject: [PATCH 094/431] Remove unused file --- .../management/ApplicationWebXml.java | 21 ------------------- 1 file changed, 21 deletions(-) delete mode 100644 src/main/java/org/radarbase/management/ApplicationWebXml.java diff --git a/src/main/java/org/radarbase/management/ApplicationWebXml.java b/src/main/java/org/radarbase/management/ApplicationWebXml.java deleted file mode 100644 index 94b27fb01..000000000 --- a/src/main/java/org/radarbase/management/ApplicationWebXml.java +++ /dev/null @@ -1,21 +0,0 @@ -package org.radarbase.management; - -import org.radarbase.management.config.DefaultProfileUtil; -import org.springframework.boot.builder.SpringApplicationBuilder; -import org.springframework.boot.web.servlet.support.SpringBootServletInitializer; - -/** - * This is a helper Java class that provides an alternative to creating a web.xml. This will be - * invoked only when the application is deployed to a servlet container like Tomcat, JBoss etc. - */ -public class ApplicationWebXml extends SpringBootServletInitializer { - - @Override - protected SpringApplicationBuilder configure(SpringApplicationBuilder application) { - /** - * set a default to use when no profile is configured. - */ - DefaultProfileUtil.addDefaultProfile(application.application()); - return application.sources(ManagementPortalApp.class); - } -} From 1df74dc0aca609e09ed558a29f7894670c878746 Mon Sep 17 00:00:00 2001 From: Joris Borgdorff Date: Fri, 29 Oct 2021 16:06:25 +0200 Subject: [PATCH 095/431] Fix tests --- build.gradle | 3 +-- .../radarbase/management/service/PasswordServiceTest.java | 5 ++++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index 3a2c5b13c..d4f0fd5b1 100644 --- a/build.gradle +++ b/build.gradle @@ -174,9 +174,8 @@ dependencies { implementation "com.fasterxml.jackson.core:jackson-databind:${jackson_version}" implementation "com.hazelcast:hazelcast:${hazelcast_version}" implementation "com.hazelcast:hazelcast-spring:${hazelcast_version}" - implementation "javax.cache:cache-api" + implementation "com.hazelcast:hazelcast-hibernate53" implementation("com.zaxxer:HikariCP:${hikaricp_version}") - implementation "javax.transaction:javax.transaction-api" implementation group: 'com.google.code.findbugs', name: 'jsr305', version: findbugAnnotationVersion implementation("org.liquibase:liquibase-core:${liquibase_version}") implementation "com.mattbertolini:liquibase-slf4j:${liquibase_slf4j_version}" diff --git a/src/test/java/org/radarbase/management/service/PasswordServiceTest.java b/src/test/java/org/radarbase/management/service/PasswordServiceTest.java index 1fb9d2157..a7e0e66e9 100644 --- a/src/test/java/org/radarbase/management/service/PasswordServiceTest.java +++ b/src/test/java/org/radarbase/management/service/PasswordServiceTest.java @@ -19,7 +19,10 @@ import java.util.Arrays; -import static org.junit.jupiter.api.Assertions.*; +import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; +import static org.junit.jupiter.api.Assertions.assertNotEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; @ExtendWith(SpringExtension.class) @SpringBootTest(classes = ManagementPortalTestApp.class) From b6479ac27a2a4e0884322e5267dc87906e93525b Mon Sep 17 00:00:00 2001 From: Joris Borgdorff Date: Fri, 29 Oct 2021 16:12:58 +0200 Subject: [PATCH 096/431] Do not use unused cypress feature --- cypress.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cypress.json b/cypress.json index 26cb909e8..15ba0427d 100644 --- a/cypress.json +++ b/cypress.json @@ -1,7 +1,7 @@ { "integrationFolder": "src/test/javascript/e2e/cypress/integration", "supportFile": false, - "videosFolder": "src/test/javascript/e2e/cypress/videos", + "video": false, "screenshotsFolder": "src/test/javascript/e2e/cypress/screenshots", "pluginsFile": false, "fixturesFolder": false, From 1d558081828731cc3a7129b3af7b7a9fbc4bea84 Mon Sep 17 00:00:00 2001 From: Joris Borgdorff Date: Fri, 29 Oct 2021 17:03:30 +0200 Subject: [PATCH 097/431] Speed up docker build --- Dockerfile | 45 +++++++++++++---------------------------- build.gradle | 4 ---- gradle/graphite.gradle | 3 --- gradle/liquibase.gradle | 6 ++---- package.json | 2 +- 5 files changed, 17 insertions(+), 43 deletions(-) delete mode 100644 gradle/graphite.gradle diff --git a/Dockerfile b/Dockerfile index 0946e9199..cd8f81aa4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,58 +1,41 @@ # Build stage -FROM azul/zulu-openjdk:11 as builder +FROM gradle:7.2-jdk11 as builder -# Install cURL... -RUN apt-get update && \ - apt-get install --no-install-recommends -yq curl && \ - curl -sL https://deb.nodesource.com/setup_14.x | bash - && \ -# ...then install NodeJS +# Install NodeJS and Yarn +RUN curl -sL https://deb.nodesource.com/setup_16.x | bash - && \ apt-get install --no-install-recommends -yq nodejs build-essential && \ - npm install -g npm && \ npm install -g yarn && \ -# ...then install everything needed for Headless Chrome to work - apt-get install --no-install-recommends -yq \ - ca-certificates fonts-liberation libappindicator3-1 libasound2 \ - libatk-bridge2.0-0 libatk1.0-0 libc6 libcairo2 libcups2 libdbus-1-3 \ - libexpat1 libfontconfig1 libgbm1 libgcc1 libglib2.0-0 libgtk-3-0 libnspr4 \ - libnss3 libpango-1.0-0 libpangocairo-1.0-0 libstdc++6 libx11-6 \ - libx11-xcb1 libxcb1 libxcomposite1 libxcursor1 libxdamage1 libxext6 \ - libxfixes3 libxi6 libxrandr2 libxrender1 libxss1 libxtst6 libxshmfence1 \ - lsb-release \ - wget xdg-utils && \ # ...and clean up the dependencies apt autoremove && \ rm -rf /var/lib/apt/lists/* # installing the node and java packages before adding the src directory # will allow us to re-use these image layers when only the souce code changes -WORKDIR /app +WORKDIR /code -ENV GRADLE_OPTS="-Dorg.gradle.daemon=false -Dorg.gradle.project.prod=true" +ENV GRADLE_OPTS="-Dorg.gradle.daemon=false -Dorg.gradle.project.prod=true" \ + GRADLE_USER_HOME=/code/.gradlecache -COPY package.json yarn.lock /app/ +COPY package.json yarn.lock /code/ RUN yarn install -COPY gradlew /app/ -COPY gradle/wrapper gradle/wrapper -RUN ./gradlew --version - -COPY gradle gradle -COPY build.gradle gradle.properties settings.gradle /app/ +COPY gradle/*.gradle gradle/ +COPY build.gradle gradle.properties settings.gradle /code/ COPY radar-auth/build.gradle radar-auth/ COPY radar-auth/deprecated-auth0/build.gradle radar-auth/deprecated-auth0/ COPY oauth-client-util/build.gradle oauth-client-util/ -RUN ./gradlew downloadDependencies :radar-auth:shadowJar +RUN gradle downloadDependencies :radar-auth:shadowJar --no-watch-fs # now we copy our application source code and build it COPY angular.json proxy.conf.json tsconfig.app.json \ - tsconfig.spec.json tsconfig.json tslint.json /app/ + tsconfig.spec.json tsconfig.json tslint.json /code/ COPY webpack webpack COPY radar-auth radar-auth COPY src src -RUN ./gradlew -s bootWar +RUN gradle -s bootWar --no-watch-fs # Run stage FROM azul/zulu-openjdk-alpine:11-jre-headless @@ -64,8 +47,8 @@ ENV SPRING_OUTPUT_ANSI_ENABLED=ALWAYS \ RUN apk --no-cache add curl # Add the war and changelogs files from build stage -COPY --from=builder /app/build/libs/*.war /app.war -COPY --from=builder /app/src/main/docker/etc /mp-includes +COPY --from=builder /code/build/libs/*.war /app.war +COPY --from=builder /code/src/main/docker/etc /mp-includes EXPOSE 8080 5701/udp CMD echo "The application will start in ${JHIPSTER_SLEEP}s..." && \ diff --git a/build.gradle b/build.gradle index d4f0fd5b1..7d9af937f 100644 --- a/build.gradle +++ b/build.gradle @@ -154,10 +154,6 @@ if (project.hasProperty('prod')) { apply from: 'gradle/profile_dev.gradle' } -if (project.hasProperty('graphite')) { - apply from: 'gradle/graphite.gradle' -} - //ext.moduleDescription = 'Management Portal application' ext.findbugAnnotationVersion = '3.0.2' diff --git a/gradle/graphite.gradle b/gradle/graphite.gradle deleted file mode 100644 index 975b5493e..000000000 --- a/gradle/graphite.gradle +++ /dev/null @@ -1,3 +0,0 @@ -dependencies { - implementation "io.dropwizard.metrics:metrics-graphite" -} diff --git a/gradle/liquibase.gradle b/gradle/liquibase.gradle index dd6bcdc30..0d16cec86 100644 --- a/gradle/liquibase.gradle +++ b/gradle/liquibase.gradle @@ -53,8 +53,6 @@ task liquibaseDiffChangelog(dependsOn: compileJava, type: JavaExec) { args "--excludeObjects=oauth_access_token, oauth_approvals, oauth_client_details, oauth_client_token, oauth_code, oauth_refresh_token" } -def buildTimestamp() { - def date = new Date() - def formattedDate = date.format('yyyyMMddHHmmss') - return formattedDate +static def buildTimestamp() { + return new Date().format('yyyyMMddHHmmss') } diff --git a/package.json b/package.json index 4ed62f165..cd21eb1cf 100644 --- a/package.json +++ b/package.json @@ -63,7 +63,7 @@ "lint:fix": "ng lint --fix=true", "cleanup": "rimraf build/", "start": "ng serve", - "build:prod": "yarn test && ng build --base-href /managementportal/", + "build:prod": "ng build --base-href /managementportal/ --configuration production", "build:dev": "ng build --configuration development", "test": "ng test --no-watch --no-progress --browsers=ChromeHeadlessCI", "test:watch": "ng test --watch --browsers=Chrome", From 89c3cdb5b87976a1dfe0d2a969d12cb7e9704f9e Mon Sep 17 00:00:00 2001 From: Joris Borgdorff Date: Mon, 1 Nov 2021 11:36:13 +0100 Subject: [PATCH 098/431] Update yarn dependencies --- .github/workflows/main.yml | 6 +- .github/workflows/pre-release.yml | 6 +- .github/workflows/release.yml | 6 +- .gitignore | 9 + .yarn/releases/yarn-3.1.0.cjs | 768 + .yarnrc.yml | 3 + Dockerfile | 3 +- angular.json | 5 +- package.json | 38 +- .../subject/general.subject.module.ts | 4 +- src/main/webapp/app/home/home.component.ts | 1 - .../app/layouts/navbar/navbar.component.ts | 1 - .../subject-pair-dialog.component.html | 3 +- .../app/shared/subject/subject.module.ts | 4 +- tsconfig.json | 2 +- yarn.lock | 21049 +++++++++------- 16 files changed, 13143 insertions(+), 8765 deletions(-) create mode 100755 .yarn/releases/yarn-3.1.0.cjs create mode 100644 .yarnrc.yml diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 3e2b26007..30a57b71f 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -21,14 +21,14 @@ jobs: # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it - uses: actions/checkout@v2 - - name: Use Node.js 15 + - name: Use Node.js 16 uses: actions/setup-node@v1 with: - node-version: 15 + node-version: 16 - name: Get yarn cache directory path id: yarn-cache-dir-path - run: echo "::set-output name=dir::$(yarn cache dir)" + run: echo "::set-output name=dir::.yarn/cache" - uses: actions/setup-java@v1 with: diff --git a/.github/workflows/pre-release.yml b/.github/workflows/pre-release.yml index a78c288fa..8398af4ad 100644 --- a/.github/workflows/pre-release.yml +++ b/.github/workflows/pre-release.yml @@ -19,14 +19,14 @@ jobs: # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it - uses: actions/checkout@v2 - - name: Use Node.js 15 + - name: Use Node.js 16 uses: actions/setup-node@v1 with: - node-version: 15 + node-version: 16 - name: Get yarn cache directory path id: yarn-cache-dir-path - run: echo "::set-output name=dir::$(yarn cache dir)" + run: echo "::set-output name=dir::.yarn" - uses: actions/setup-java@v1 with: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 0ac2d1839..6d188fe90 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -18,14 +18,14 @@ jobs: # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it - uses: actions/checkout@v2 - - name: Use Node.js 15 + - name: Use Node.js 16 uses: actions/setup-node@v1 with: - node-version: 15 + node-version: 16 - name: Get yarn cache directory path id: yarn-cache-dir-path - run: echo "::set-output name=dir::$(yarn cache dir)" + run: echo "::set-output name=dir::.yarn" - uses: actions/setup-java@v1 with: diff --git a/.gitignore b/.gitignore index 22a13467e..29dfc0065 100644 --- a/.gitignore +++ b/.gitignore @@ -165,3 +165,12 @@ Desktop.ini !/libs/**/*.jar /public + +## Yarn 2 +.yarn/* +!.yarn/patches +!.yarn/releases +!.yarn/plugins +!.yarn/sdks +!.yarn/versions +.pnp.* diff --git a/.yarn/releases/yarn-3.1.0.cjs b/.yarn/releases/yarn-3.1.0.cjs new file mode 100755 index 000000000..8584827cd --- /dev/null +++ b/.yarn/releases/yarn-3.1.0.cjs @@ -0,0 +1,768 @@ +#!/usr/bin/env node +/* eslint-disable */ +//prettier-ignore +(()=>{var Mfe=Object.create,Vf=Object.defineProperty,Ofe=Object.defineProperties,Kfe=Object.getOwnPropertyDescriptor,Ufe=Object.getOwnPropertyDescriptors,Hfe=Object.getOwnPropertyNames,hI=Object.getOwnPropertySymbols,Gfe=Object.getPrototypeOf,eb=Object.prototype.hasOwnProperty,lO=Object.prototype.propertyIsEnumerable;var cO=(t,e,r)=>e in t?Vf(t,e,{enumerable:!0,configurable:!0,writable:!0,value:r}):t[e]=r,P=(t,e)=>{for(var r in e||(e={}))eb.call(e,r)&&cO(t,r,e[r]);if(hI)for(var r of hI(e))lO.call(e,r)&&cO(t,r,e[r]);return t},_=(t,e)=>Ofe(t,Ufe(e)),jfe=t=>Vf(t,"__esModule",{value:!0});var qr=(t,e)=>{var r={};for(var i in t)eb.call(t,i)&&e.indexOf(i)<0&&(r[i]=t[i]);if(t!=null&&hI)for(var i of hI(t))e.indexOf(i)<0&&lO.call(t,i)&&(r[i]=t[i]);return r},Yfe=(t,e)=>()=>(t&&(e=t(t=0)),e),I=(t,e)=>()=>(e||t((e={exports:{}}).exports,e),e.exports),it=(t,e)=>{for(var r in e)Vf(t,r,{get:e[r],enumerable:!0})},qfe=(t,e,r)=>{if(e&&typeof e=="object"||typeof e=="function")for(let i of Hfe(e))!eb.call(t,i)&&i!=="default"&&Vf(t,i,{get:()=>e[i],enumerable:!(r=Kfe(e,i))||r.enumerable});return t},ie=t=>qfe(jfe(Vf(t!=null?Mfe(Gfe(t)):{},"default",t&&t.__esModule&&"default"in t?{get:()=>t.default,enumerable:!0}:{value:t,enumerable:!0})),t);var MO=I((i$e,FO)=>{FO.exports=NO;NO.sync=Ahe;var LO=require("fs");function lhe(t,e){var r=e.pathExt!==void 0?e.pathExt:process.env.PATHEXT;if(!r||(r=r.split(";"),r.indexOf("")!==-1))return!0;for(var i=0;i{OO.exports=KO;KO.sync=che;var UO=require("fs");function KO(t,e,r){UO.stat(t,function(i,n){r(i,i?!1:HO(n,e))})}function che(t,e){return HO(UO.statSync(t),e)}function HO(t,e){return t.isFile()&&uhe(t,e)}function uhe(t,e){var r=t.mode,i=t.uid,n=t.gid,s=e.uid!==void 0?e.uid:process.getuid&&process.getuid(),o=e.gid!==void 0?e.gid:process.getgid&&process.getgid(),a=parseInt("100",8),l=parseInt("010",8),c=parseInt("001",8),u=a|l,g=r&c||r&l&&n===o||r&a&&i===s||r&u&&s===0;return g}});var YO=I((o$e,jO)=>{var s$e=require("fs"),xI;process.platform==="win32"||global.TESTING_WINDOWS?xI=MO():xI=GO();jO.exports=db;db.sync=ghe;function db(t,e,r){if(typeof e=="function"&&(r=e,e={}),!r){if(typeof Promise!="function")throw new TypeError("callback not provided");return new Promise(function(i,n){db(t,e||{},function(s,o){s?n(s):i(o)})})}xI(t,e||{},function(i,n){i&&(i.code==="EACCES"||e&&e.ignoreErrors)&&(i=null,n=!1),r(i,n)})}function ghe(t,e){try{return xI.sync(t,e||{})}catch(r){if(e&&e.ignoreErrors||r.code==="EACCES")return!1;throw r}}});var XO=I((a$e,qO)=>{var eu=process.platform==="win32"||process.env.OSTYPE==="cygwin"||process.env.OSTYPE==="msys",JO=require("path"),fhe=eu?";":":",WO=YO(),zO=t=>Object.assign(new Error(`not found: ${t}`),{code:"ENOENT"}),VO=(t,e)=>{let r=e.colon||fhe,i=t.match(/\//)||eu&&t.match(/\\/)?[""]:[...eu?[process.cwd()]:[],...(e.path||process.env.PATH||"").split(r)],n=eu?e.pathExt||process.env.PATHEXT||".EXE;.CMD;.BAT;.COM":"",s=eu?n.split(r):[""];return eu&&t.indexOf(".")!==-1&&s[0]!==""&&s.unshift(""),{pathEnv:i,pathExt:s,pathExtExe:n}},_O=(t,e,r)=>{typeof e=="function"&&(r=e,e={}),e||(e={});let{pathEnv:i,pathExt:n,pathExtExe:s}=VO(t,e),o=[],a=c=>new Promise((u,g)=>{if(c===i.length)return e.all&&o.length?u(o):g(zO(t));let f=i[c],h=/^".*"$/.test(f)?f.slice(1,-1):f,p=JO.join(h,t),d=!h&&/^\.[\\\/]/.test(t)?t.slice(0,2)+p:p;u(l(d,c,0))}),l=(c,u,g)=>new Promise((f,h)=>{if(g===n.length)return f(a(u+1));let p=n[g];WO(c+p,{pathExt:s},(d,m)=>{if(!d&&m)if(e.all)o.push(c+p);else return f(c+p);return f(l(c,u,g+1))})});return r?a(0).then(c=>r(null,c),r):a(0)},hhe=(t,e)=>{e=e||{};let{pathEnv:r,pathExt:i,pathExtExe:n}=VO(t,e),s=[];for(let o=0;o{"use strict";var ZO=(t={})=>{let e=t.env||process.env;return(t.platform||process.platform)!=="win32"?"PATH":Object.keys(e).reverse().find(i=>i.toUpperCase()==="PATH")||"Path"};Cb.exports=ZO;Cb.exports.default=ZO});var iK=I((l$e,eK)=>{"use strict";var tK=require("path"),phe=XO(),dhe=$O();function rK(t,e){let r=t.options.env||process.env,i=process.cwd(),n=t.options.cwd!=null,s=n&&process.chdir!==void 0&&!process.chdir.disabled;if(s)try{process.chdir(t.options.cwd)}catch(a){}let o;try{o=phe.sync(t.command,{path:r[dhe({env:r})],pathExt:e?tK.delimiter:void 0})}catch(a){}finally{s&&process.chdir(i)}return o&&(o=tK.resolve(n?t.options.cwd:"",o)),o}function Che(t){return rK(t)||rK(t,!0)}eK.exports=Che});var nK=I((c$e,mb)=>{"use strict";var Ib=/([()\][%!^"`<>&|;, *?])/g;function mhe(t){return t=t.replace(Ib,"^$1"),t}function Ihe(t,e){return t=`${t}`,t=t.replace(/(\\*)"/g,'$1$1\\"'),t=t.replace(/(\\*)$/,"$1$1"),t=`"${t}"`,t=t.replace(Ib,"^$1"),e&&(t=t.replace(Ib,"^$1")),t}mb.exports.command=mhe;mb.exports.argument=Ihe});var oK=I((u$e,sK)=>{"use strict";sK.exports=/^#!(.*)/});var AK=I((g$e,aK)=>{"use strict";var Ehe=oK();aK.exports=(t="")=>{let e=t.match(Ehe);if(!e)return null;let[r,i]=e[0].replace(/#! ?/,"").split(" "),n=r.split("/").pop();return n==="env"?i:i?`${n} ${i}`:n}});var cK=I((f$e,lK)=>{"use strict";var Eb=require("fs"),yhe=AK();function whe(t){let e=150,r=Buffer.alloc(e),i;try{i=Eb.openSync(t,"r"),Eb.readSync(i,r,0,e,0),Eb.closeSync(i)}catch(n){}return yhe(r.toString())}lK.exports=whe});var hK=I((h$e,uK)=>{"use strict";var Bhe=require("path"),gK=iK(),fK=nK(),Qhe=cK(),bhe=process.platform==="win32",vhe=/\.(?:com|exe)$/i,She=/node_modules[\\/].bin[\\/][^\\/]+\.cmd$/i;function xhe(t){t.file=gK(t);let e=t.file&&Qhe(t.file);return e?(t.args.unshift(t.file),t.command=e,gK(t)):t.file}function khe(t){if(!bhe)return t;let e=xhe(t),r=!vhe.test(e);if(t.options.forceShell||r){let i=She.test(e);t.command=Bhe.normalize(t.command),t.command=fK.command(t.command),t.args=t.args.map(s=>fK.argument(s,i));let n=[t.command].concat(t.args).join(" ");t.args=["/d","/s","/c",`"${n}"`],t.command=process.env.comspec||"cmd.exe",t.options.windowsVerbatimArguments=!0}return t}function Phe(t,e,r){e&&!Array.isArray(e)&&(r=e,e=null),e=e?e.slice(0):[],r=Object.assign({},r);let i={command:t,args:e,options:r,file:void 0,original:{command:t,args:e}};return r.shell?i:khe(i)}uK.exports=Phe});var CK=I((p$e,pK)=>{"use strict";var yb=process.platform==="win32";function wb(t,e){return Object.assign(new Error(`${e} ${t.command} ENOENT`),{code:"ENOENT",errno:"ENOENT",syscall:`${e} ${t.command}`,path:t.command,spawnargs:t.args})}function Dhe(t,e){if(!yb)return;let r=t.emit;t.emit=function(i,n){if(i==="exit"){let s=dK(n,e,"spawn");if(s)return r.call(t,"error",s)}return r.apply(t,arguments)}}function dK(t,e){return yb&&t===1&&!e.file?wb(e.original,"spawn"):null}function Rhe(t,e){return yb&&t===1&&!e.file?wb(e.original,"spawnSync"):null}pK.exports={hookChildProcess:Dhe,verifyENOENT:dK,verifyENOENTSync:Rhe,notFoundError:wb}});var bb=I((d$e,tu)=>{"use strict";var mK=require("child_process"),Bb=hK(),Qb=CK();function IK(t,e,r){let i=Bb(t,e,r),n=mK.spawn(i.command,i.args,i.options);return Qb.hookChildProcess(n,i),n}function Fhe(t,e,r){let i=Bb(t,e,r),n=mK.spawnSync(i.command,i.args,i.options);return n.error=n.error||Qb.verifyENOENTSync(n.status,i),n}tu.exports=IK;tu.exports.spawn=IK;tu.exports.sync=Fhe;tu.exports._parse=Bb;tu.exports._enoent=Qb});var yK=I((y$e,EK)=>{"use strict";EK.exports={aliceblue:[240,248,255],antiquewhite:[250,235,215],aqua:[0,255,255],aquamarine:[127,255,212],azure:[240,255,255],beige:[245,245,220],bisque:[255,228,196],black:[0,0,0],blanchedalmond:[255,235,205],blue:[0,0,255],blueviolet:[138,43,226],brown:[165,42,42],burlywood:[222,184,135],cadetblue:[95,158,160],chartreuse:[127,255,0],chocolate:[210,105,30],coral:[255,127,80],cornflowerblue:[100,149,237],cornsilk:[255,248,220],crimson:[220,20,60],cyan:[0,255,255],darkblue:[0,0,139],darkcyan:[0,139,139],darkgoldenrod:[184,134,11],darkgray:[169,169,169],darkgreen:[0,100,0],darkgrey:[169,169,169],darkkhaki:[189,183,107],darkmagenta:[139,0,139],darkolivegreen:[85,107,47],darkorange:[255,140,0],darkorchid:[153,50,204],darkred:[139,0,0],darksalmon:[233,150,122],darkseagreen:[143,188,143],darkslateblue:[72,61,139],darkslategray:[47,79,79],darkslategrey:[47,79,79],darkturquoise:[0,206,209],darkviolet:[148,0,211],deeppink:[255,20,147],deepskyblue:[0,191,255],dimgray:[105,105,105],dimgrey:[105,105,105],dodgerblue:[30,144,255],firebrick:[178,34,34],floralwhite:[255,250,240],forestgreen:[34,139,34],fuchsia:[255,0,255],gainsboro:[220,220,220],ghostwhite:[248,248,255],gold:[255,215,0],goldenrod:[218,165,32],gray:[128,128,128],green:[0,128,0],greenyellow:[173,255,47],grey:[128,128,128],honeydew:[240,255,240],hotpink:[255,105,180],indianred:[205,92,92],indigo:[75,0,130],ivory:[255,255,240],khaki:[240,230,140],lavender:[230,230,250],lavenderblush:[255,240,245],lawngreen:[124,252,0],lemonchiffon:[255,250,205],lightblue:[173,216,230],lightcoral:[240,128,128],lightcyan:[224,255,255],lightgoldenrodyellow:[250,250,210],lightgray:[211,211,211],lightgreen:[144,238,144],lightgrey:[211,211,211],lightpink:[255,182,193],lightsalmon:[255,160,122],lightseagreen:[32,178,170],lightskyblue:[135,206,250],lightslategray:[119,136,153],lightslategrey:[119,136,153],lightsteelblue:[176,196,222],lightyellow:[255,255,224],lime:[0,255,0],limegreen:[50,205,50],linen:[250,240,230],magenta:[255,0,255],maroon:[128,0,0],mediumaquamarine:[102,205,170],mediumblue:[0,0,205],mediumorchid:[186,85,211],mediumpurple:[147,112,219],mediumseagreen:[60,179,113],mediumslateblue:[123,104,238],mediumspringgreen:[0,250,154],mediumturquoise:[72,209,204],mediumvioletred:[199,21,133],midnightblue:[25,25,112],mintcream:[245,255,250],mistyrose:[255,228,225],moccasin:[255,228,181],navajowhite:[255,222,173],navy:[0,0,128],oldlace:[253,245,230],olive:[128,128,0],olivedrab:[107,142,35],orange:[255,165,0],orangered:[255,69,0],orchid:[218,112,214],palegoldenrod:[238,232,170],palegreen:[152,251,152],paleturquoise:[175,238,238],palevioletred:[219,112,147],papayawhip:[255,239,213],peachpuff:[255,218,185],peru:[205,133,63],pink:[255,192,203],plum:[221,160,221],powderblue:[176,224,230],purple:[128,0,128],rebeccapurple:[102,51,153],red:[255,0,0],rosybrown:[188,143,143],royalblue:[65,105,225],saddlebrown:[139,69,19],salmon:[250,128,114],sandybrown:[244,164,96],seagreen:[46,139,87],seashell:[255,245,238],sienna:[160,82,45],silver:[192,192,192],skyblue:[135,206,235],slateblue:[106,90,205],slategray:[112,128,144],slategrey:[112,128,144],snow:[255,250,250],springgreen:[0,255,127],steelblue:[70,130,180],tan:[210,180,140],teal:[0,128,128],thistle:[216,191,216],tomato:[255,99,71],turquoise:[64,224,208],violet:[238,130,238],wheat:[245,222,179],white:[255,255,255],whitesmoke:[245,245,245],yellow:[255,255,0],yellowgreen:[154,205,50]}});var Nb=I((w$e,wK)=>{var gh=yK(),BK={};for(let t of Object.keys(gh))BK[gh[t]]=t;var Xe={rgb:{channels:3,labels:"rgb"},hsl:{channels:3,labels:"hsl"},hsv:{channels:3,labels:"hsv"},hwb:{channels:3,labels:"hwb"},cmyk:{channels:4,labels:"cmyk"},xyz:{channels:3,labels:"xyz"},lab:{channels:3,labels:"lab"},lch:{channels:3,labels:"lch"},hex:{channels:1,labels:["hex"]},keyword:{channels:1,labels:["keyword"]},ansi16:{channels:1,labels:["ansi16"]},ansi256:{channels:1,labels:["ansi256"]},hcg:{channels:3,labels:["h","c","g"]},apple:{channels:3,labels:["r16","g16","b16"]},gray:{channels:1,labels:["gray"]}};wK.exports=Xe;for(let t of Object.keys(Xe)){if(!("channels"in Xe[t]))throw new Error("missing channels property: "+t);if(!("labels"in Xe[t]))throw new Error("missing channel labels property: "+t);if(Xe[t].labels.length!==Xe[t].channels)throw new Error("channel and label counts mismatch: "+t);let{channels:e,labels:r}=Xe[t];delete Xe[t].channels,delete Xe[t].labels,Object.defineProperty(Xe[t],"channels",{value:e}),Object.defineProperty(Xe[t],"labels",{value:r})}Xe.rgb.hsl=function(t){let e=t[0]/255,r=t[1]/255,i=t[2]/255,n=Math.min(e,r,i),s=Math.max(e,r,i),o=s-n,a,l;s===n?a=0:e===s?a=(r-i)/o:r===s?a=2+(i-e)/o:i===s&&(a=4+(e-r)/o),a=Math.min(a*60,360),a<0&&(a+=360);let c=(n+s)/2;return s===n?l=0:c<=.5?l=o/(s+n):l=o/(2-s-n),[a,l*100,c*100]};Xe.rgb.hsv=function(t){let e,r,i,n,s,o=t[0]/255,a=t[1]/255,l=t[2]/255,c=Math.max(o,a,l),u=c-Math.min(o,a,l),g=function(f){return(c-f)/6/u+1/2};return u===0?(n=0,s=0):(s=u/c,e=g(o),r=g(a),i=g(l),o===c?n=i-r:a===c?n=1/3+e-i:l===c&&(n=2/3+r-e),n<0?n+=1:n>1&&(n-=1)),[n*360,s*100,c*100]};Xe.rgb.hwb=function(t){let e=t[0],r=t[1],i=t[2],n=Xe.rgb.hsl(t)[0],s=1/255*Math.min(e,Math.min(r,i));return i=1-1/255*Math.max(e,Math.max(r,i)),[n,s*100,i*100]};Xe.rgb.cmyk=function(t){let e=t[0]/255,r=t[1]/255,i=t[2]/255,n=Math.min(1-e,1-r,1-i),s=(1-e-n)/(1-n)||0,o=(1-r-n)/(1-n)||0,a=(1-i-n)/(1-n)||0;return[s*100,o*100,a*100,n*100]};function The(t,e){return(t[0]-e[0])**2+(t[1]-e[1])**2+(t[2]-e[2])**2}Xe.rgb.keyword=function(t){let e=BK[t];if(e)return e;let r=Infinity,i;for(let n of Object.keys(gh)){let s=gh[n],o=The(t,s);o.04045?((e+.055)/1.055)**2.4:e/12.92,r=r>.04045?((r+.055)/1.055)**2.4:r/12.92,i=i>.04045?((i+.055)/1.055)**2.4:i/12.92;let n=e*.4124+r*.3576+i*.1805,s=e*.2126+r*.7152+i*.0722,o=e*.0193+r*.1192+i*.9505;return[n*100,s*100,o*100]};Xe.rgb.lab=function(t){let e=Xe.rgb.xyz(t),r=e[0],i=e[1],n=e[2];r/=95.047,i/=100,n/=108.883,r=r>.008856?r**(1/3):7.787*r+16/116,i=i>.008856?i**(1/3):7.787*i+16/116,n=n>.008856?n**(1/3):7.787*n+16/116;let s=116*i-16,o=500*(r-i),a=200*(i-n);return[s,o,a]};Xe.hsl.rgb=function(t){let e=t[0]/360,r=t[1]/100,i=t[2]/100,n,s,o;if(r===0)return o=i*255,[o,o,o];i<.5?n=i*(1+r):n=i+r-i*r;let a=2*i-n,l=[0,0,0];for(let c=0;c<3;c++)s=e+1/3*-(c-1),s<0&&s++,s>1&&s--,6*s<1?o=a+(n-a)*6*s:2*s<1?o=n:3*s<2?o=a+(n-a)*(2/3-s)*6:o=a,l[c]=o*255;return l};Xe.hsl.hsv=function(t){let e=t[0],r=t[1]/100,i=t[2]/100,n=r,s=Math.max(i,.01);i*=2,r*=i<=1?i:2-i,n*=s<=1?s:2-s;let o=(i+r)/2,a=i===0?2*n/(s+n):2*r/(i+r);return[e,a*100,o*100]};Xe.hsv.rgb=function(t){let e=t[0]/60,r=t[1]/100,i=t[2]/100,n=Math.floor(e)%6,s=e-Math.floor(e),o=255*i*(1-r),a=255*i*(1-r*s),l=255*i*(1-r*(1-s));switch(i*=255,n){case 0:return[i,l,o];case 1:return[a,i,o];case 2:return[o,i,l];case 3:return[o,a,i];case 4:return[l,o,i];case 5:return[i,o,a]}};Xe.hsv.hsl=function(t){let e=t[0],r=t[1]/100,i=t[2]/100,n=Math.max(i,.01),s,o;o=(2-r)*i;let a=(2-r)*n;return s=r*n,s/=a<=1?a:2-a,s=s||0,o/=2,[e,s*100,o*100]};Xe.hwb.rgb=function(t){let e=t[0]/360,r=t[1]/100,i=t[2]/100,n=r+i,s;n>1&&(r/=n,i/=n);let o=Math.floor(6*e),a=1-i;s=6*e-o,(o&1)!=0&&(s=1-s);let l=r+s*(a-r),c,u,g;switch(o){default:case 6:case 0:c=a,u=l,g=r;break;case 1:c=l,u=a,g=r;break;case 2:c=r,u=a,g=l;break;case 3:c=r,u=l,g=a;break;case 4:c=l,u=r,g=a;break;case 5:c=a,u=r,g=l;break}return[c*255,u*255,g*255]};Xe.cmyk.rgb=function(t){let e=t[0]/100,r=t[1]/100,i=t[2]/100,n=t[3]/100,s=1-Math.min(1,e*(1-n)+n),o=1-Math.min(1,r*(1-n)+n),a=1-Math.min(1,i*(1-n)+n);return[s*255,o*255,a*255]};Xe.xyz.rgb=function(t){let e=t[0]/100,r=t[1]/100,i=t[2]/100,n,s,o;return n=e*3.2406+r*-1.5372+i*-.4986,s=e*-.9689+r*1.8758+i*.0415,o=e*.0557+r*-.204+i*1.057,n=n>.0031308?1.055*n**(1/2.4)-.055:n*12.92,s=s>.0031308?1.055*s**(1/2.4)-.055:s*12.92,o=o>.0031308?1.055*o**(1/2.4)-.055:o*12.92,n=Math.min(Math.max(0,n),1),s=Math.min(Math.max(0,s),1),o=Math.min(Math.max(0,o),1),[n*255,s*255,o*255]};Xe.xyz.lab=function(t){let e=t[0],r=t[1],i=t[2];e/=95.047,r/=100,i/=108.883,e=e>.008856?e**(1/3):7.787*e+16/116,r=r>.008856?r**(1/3):7.787*r+16/116,i=i>.008856?i**(1/3):7.787*i+16/116;let n=116*r-16,s=500*(e-r),o=200*(r-i);return[n,s,o]};Xe.lab.xyz=function(t){let e=t[0],r=t[1],i=t[2],n,s,o;s=(e+16)/116,n=r/500+s,o=s-i/200;let a=s**3,l=n**3,c=o**3;return s=a>.008856?a:(s-16/116)/7.787,n=l>.008856?l:(n-16/116)/7.787,o=c>.008856?c:(o-16/116)/7.787,n*=95.047,s*=100,o*=108.883,[n,s,o]};Xe.lab.lch=function(t){let e=t[0],r=t[1],i=t[2],n;n=Math.atan2(i,r)*360/2/Math.PI,n<0&&(n+=360);let o=Math.sqrt(r*r+i*i);return[e,o,n]};Xe.lch.lab=function(t){let e=t[0],r=t[1],n=t[2]/360*2*Math.PI,s=r*Math.cos(n),o=r*Math.sin(n);return[e,s,o]};Xe.rgb.ansi16=function(t,e=null){let[r,i,n]=t,s=e===null?Xe.rgb.hsv(t)[2]:e;if(s=Math.round(s/50),s===0)return 30;let o=30+(Math.round(n/255)<<2|Math.round(i/255)<<1|Math.round(r/255));return s===2&&(o+=60),o};Xe.hsv.ansi16=function(t){return Xe.rgb.ansi16(Xe.hsv.rgb(t),t[2])};Xe.rgb.ansi256=function(t){let e=t[0],r=t[1],i=t[2];return e===r&&r===i?e<8?16:e>248?231:Math.round((e-8)/247*24)+232:16+36*Math.round(e/255*5)+6*Math.round(r/255*5)+Math.round(i/255*5)};Xe.ansi16.rgb=function(t){let e=t%10;if(e===0||e===7)return t>50&&(e+=3.5),e=e/10.5*255,[e,e,e];let r=(~~(t>50)+1)*.5,i=(e&1)*r*255,n=(e>>1&1)*r*255,s=(e>>2&1)*r*255;return[i,n,s]};Xe.ansi256.rgb=function(t){if(t>=232){let s=(t-232)*10+8;return[s,s,s]}t-=16;let e,r=Math.floor(t/36)/5*255,i=Math.floor((e=t%36)/6)/5*255,n=e%6/5*255;return[r,i,n]};Xe.rgb.hex=function(t){let r=(((Math.round(t[0])&255)<<16)+((Math.round(t[1])&255)<<8)+(Math.round(t[2])&255)).toString(16).toUpperCase();return"000000".substring(r.length)+r};Xe.hex.rgb=function(t){let e=t.toString(16).match(/[a-f0-9]{6}|[a-f0-9]{3}/i);if(!e)return[0,0,0];let r=e[0];e[0].length===3&&(r=r.split("").map(a=>a+a).join(""));let i=parseInt(r,16),n=i>>16&255,s=i>>8&255,o=i&255;return[n,s,o]};Xe.rgb.hcg=function(t){let e=t[0]/255,r=t[1]/255,i=t[2]/255,n=Math.max(Math.max(e,r),i),s=Math.min(Math.min(e,r),i),o=n-s,a,l;return o<1?a=s/(1-o):a=0,o<=0?l=0:n===e?l=(r-i)/o%6:n===r?l=2+(i-e)/o:l=4+(e-r)/o,l/=6,l%=1,[l*360,o*100,a*100]};Xe.hsl.hcg=function(t){let e=t[1]/100,r=t[2]/100,i=r<.5?2*e*r:2*e*(1-r),n=0;return i<1&&(n=(r-.5*i)/(1-i)),[t[0],i*100,n*100]};Xe.hsv.hcg=function(t){let e=t[1]/100,r=t[2]/100,i=e*r,n=0;return i<1&&(n=(r-i)/(1-i)),[t[0],i*100,n*100]};Xe.hcg.rgb=function(t){let e=t[0]/360,r=t[1]/100,i=t[2]/100;if(r===0)return[i*255,i*255,i*255];let n=[0,0,0],s=e%1*6,o=s%1,a=1-o,l=0;switch(Math.floor(s)){case 0:n[0]=1,n[1]=o,n[2]=0;break;case 1:n[0]=a,n[1]=1,n[2]=0;break;case 2:n[0]=0,n[1]=1,n[2]=o;break;case 3:n[0]=0,n[1]=a,n[2]=1;break;case 4:n[0]=o,n[1]=0,n[2]=1;break;default:n[0]=1,n[1]=0,n[2]=a}return l=(1-r)*i,[(r*n[0]+l)*255,(r*n[1]+l)*255,(r*n[2]+l)*255]};Xe.hcg.hsv=function(t){let e=t[1]/100,r=t[2]/100,i=e+r*(1-e),n=0;return i>0&&(n=e/i),[t[0],n*100,i*100]};Xe.hcg.hsl=function(t){let e=t[1]/100,i=t[2]/100*(1-e)+.5*e,n=0;return i>0&&i<.5?n=e/(2*i):i>=.5&&i<1&&(n=e/(2*(1-i))),[t[0],n*100,i*100]};Xe.hcg.hwb=function(t){let e=t[1]/100,r=t[2]/100,i=e+r*(1-e);return[t[0],(i-e)*100,(1-i)*100]};Xe.hwb.hcg=function(t){let e=t[1]/100,r=t[2]/100,i=1-r,n=i-e,s=0;return n<1&&(s=(i-n)/(1-n)),[t[0],n*100,s*100]};Xe.apple.rgb=function(t){return[t[0]/65535*255,t[1]/65535*255,t[2]/65535*255]};Xe.rgb.apple=function(t){return[t[0]/255*65535,t[1]/255*65535,t[2]/255*65535]};Xe.gray.rgb=function(t){return[t[0]/100*255,t[0]/100*255,t[0]/100*255]};Xe.gray.hsl=function(t){return[0,0,t[0]]};Xe.gray.hsv=Xe.gray.hsl;Xe.gray.hwb=function(t){return[0,100,t[0]]};Xe.gray.cmyk=function(t){return[0,0,0,t[0]]};Xe.gray.lab=function(t){return[t[0],0,0]};Xe.gray.hex=function(t){let e=Math.round(t[0]/100*255)&255,i=((e<<16)+(e<<8)+e).toString(16).toUpperCase();return"000000".substring(i.length)+i};Xe.rgb.gray=function(t){return[(t[0]+t[1]+t[2])/3/255*100]}});var bK=I((B$e,QK)=>{var kI=Nb();function Mhe(){let t={},e=Object.keys(kI);for(let r=e.length,i=0;i{var Lb=Nb(),Hhe=bK(),ru={},Ghe=Object.keys(Lb);function jhe(t){let e=function(...r){let i=r[0];return i==null?i:(i.length>1&&(r=i),t(r))};return"conversion"in t&&(e.conversion=t.conversion),e}function Yhe(t){let e=function(...r){let i=r[0];if(i==null)return i;i.length>1&&(r=i);let n=t(r);if(typeof n=="object")for(let s=n.length,o=0;o{ru[t]={},Object.defineProperty(ru[t],"channels",{value:Lb[t].channels}),Object.defineProperty(ru[t],"labels",{value:Lb[t].labels});let e=Hhe(t);Object.keys(e).forEach(i=>{let n=e[i];ru[t][i]=Yhe(n),ru[t][i].raw=jhe(n)})});vK.exports=ru});var FK=I((b$e,xK)=>{"use strict";var kK=(t,e)=>(...r)=>`[${t(...r)+e}m`,PK=(t,e)=>(...r)=>{let i=t(...r);return`[${38+e};5;${i}m`},DK=(t,e)=>(...r)=>{let i=t(...r);return`[${38+e};2;${i[0]};${i[1]};${i[2]}m`},PI=t=>t,RK=(t,e,r)=>[t,e,r],iu=(t,e,r)=>{Object.defineProperty(t,e,{get:()=>{let i=r();return Object.defineProperty(t,e,{value:i,enumerable:!0,configurable:!0}),i},enumerable:!0,configurable:!0})},Tb,nu=(t,e,r,i)=>{Tb===void 0&&(Tb=SK());let n=i?10:0,s={};for(let[o,a]of Object.entries(Tb)){let l=o==="ansi16"?"ansi":o;o===e?s[l]=t(r,n):typeof a=="object"&&(s[l]=t(a[e],n))}return s};function qhe(){let t=new Map,e={modifier:{reset:[0,0],bold:[1,22],dim:[2,22],italic:[3,23],underline:[4,24],inverse:[7,27],hidden:[8,28],strikethrough:[9,29]},color:{black:[30,39],red:[31,39],green:[32,39],yellow:[33,39],blue:[34,39],magenta:[35,39],cyan:[36,39],white:[37,39],blackBright:[90,39],redBright:[91,39],greenBright:[92,39],yellowBright:[93,39],blueBright:[94,39],magentaBright:[95,39],cyanBright:[96,39],whiteBright:[97,39]},bgColor:{bgBlack:[40,49],bgRed:[41,49],bgGreen:[42,49],bgYellow:[43,49],bgBlue:[44,49],bgMagenta:[45,49],bgCyan:[46,49],bgWhite:[47,49],bgBlackBright:[100,49],bgRedBright:[101,49],bgGreenBright:[102,49],bgYellowBright:[103,49],bgBlueBright:[104,49],bgMagentaBright:[105,49],bgCyanBright:[106,49],bgWhiteBright:[107,49]}};e.color.gray=e.color.blackBright,e.bgColor.bgGray=e.bgColor.bgBlackBright,e.color.grey=e.color.blackBright,e.bgColor.bgGrey=e.bgColor.bgBlackBright;for(let[r,i]of Object.entries(e)){for(let[n,s]of Object.entries(i))e[n]={open:`[${s[0]}m`,close:`[${s[1]}m`},i[n]=e[n],t.set(s[0],s[1]);Object.defineProperty(e,r,{value:i,enumerable:!1})}return Object.defineProperty(e,"codes",{value:t,enumerable:!1}),e.color.close="",e.bgColor.close="",iu(e.color,"ansi",()=>nu(kK,"ansi16",PI,!1)),iu(e.color,"ansi256",()=>nu(PK,"ansi256",PI,!1)),iu(e.color,"ansi16m",()=>nu(DK,"rgb",RK,!1)),iu(e.bgColor,"ansi",()=>nu(kK,"ansi16",PI,!0)),iu(e.bgColor,"ansi256",()=>nu(PK,"ansi256",PI,!0)),iu(e.bgColor,"ansi16m",()=>nu(DK,"rgb",RK,!0)),e}Object.defineProperty(xK,"exports",{enumerable:!0,get:qhe})});var LK=I((v$e,NK)=>{"use strict";NK.exports=(t,e=process.argv)=>{let r=t.startsWith("-")?"":t.length===1?"-":"--",i=e.indexOf(r+t),n=e.indexOf("--");return i!==-1&&(n===-1||i{"use strict";var Jhe=require("os"),MK=require("tty"),Wn=LK(),{env:Wr}=process,tA;Wn("no-color")||Wn("no-colors")||Wn("color=false")||Wn("color=never")?tA=0:(Wn("color")||Wn("colors")||Wn("color=true")||Wn("color=always"))&&(tA=1);"FORCE_COLOR"in Wr&&(Wr.FORCE_COLOR==="true"?tA=1:Wr.FORCE_COLOR==="false"?tA=0:tA=Wr.FORCE_COLOR.length===0?1:Math.min(parseInt(Wr.FORCE_COLOR,10),3));function Mb(t){return t===0?!1:{level:t,hasBasic:!0,has256:t>=2,has16m:t>=3}}function Ob(t,e){if(tA===0)return 0;if(Wn("color=16m")||Wn("color=full")||Wn("color=truecolor"))return 3;if(Wn("color=256"))return 2;if(t&&!e&&tA===void 0)return 0;let r=tA||0;if(Wr.TERM==="dumb")return r;if(process.platform==="win32"){let i=Jhe.release().split(".");return Number(i[0])>=10&&Number(i[2])>=10586?Number(i[2])>=14931?3:2:1}if("CI"in Wr)return["TRAVIS","CIRCLECI","APPVEYOR","GITLAB_CI"].some(i=>i in Wr)||Wr.CI_NAME==="codeship"?1:r;if("TEAMCITY_VERSION"in Wr)return/^(9\.(0*[1-9]\d*)\.|\d{2,}\.)/.test(Wr.TEAMCITY_VERSION)?1:0;if("GITHUB_ACTIONS"in Wr)return 1;if(Wr.COLORTERM==="truecolor")return 3;if("TERM_PROGRAM"in Wr){let i=parseInt((Wr.TERM_PROGRAM_VERSION||"").split(".")[0],10);switch(Wr.TERM_PROGRAM){case"iTerm.app":return i>=3?3:2;case"Apple_Terminal":return 2}}return/-256(color)?$/i.test(Wr.TERM)?2:/^screen|^xterm|^vt100|^vt220|^rxvt|color|ansi|cygwin|linux/i.test(Wr.TERM)||"COLORTERM"in Wr?1:r}function Whe(t){let e=Ob(t,t&&t.isTTY);return Mb(e)}TK.exports={supportsColor:Whe,stdout:Mb(Ob(!0,MK.isatty(1))),stderr:Mb(Ob(!0,MK.isatty(2)))}});var UK=I((x$e,KK)=>{"use strict";var zhe=(t,e,r)=>{let i=t.indexOf(e);if(i===-1)return t;let n=e.length,s=0,o="";do o+=t.substr(s,i-s)+e+r,s=i+n,i=t.indexOf(e,s);while(i!==-1);return o+=t.substr(s),o},Vhe=(t,e,r,i)=>{let n=0,s="";do{let o=t[i-1]==="\r";s+=t.substr(n,(o?i-1:i)-n)+e+(o?`\r +`:` +`)+r,n=i+1,i=t.indexOf(` +`,n)}while(i!==-1);return s+=t.substr(n),s};KK.exports={stringReplaceAll:zhe,stringEncaseCRLFWithFirstIndex:Vhe}});var qK=I((k$e,HK)=>{"use strict";var _he=/(?:\\(u(?:[a-f\d]{4}|\{[a-f\d]{1,6}\})|x[a-f\d]{2}|.))|(?:\{(~)?(\w+(?:\([^)]*\))?(?:\.\w+(?:\([^)]*\))?)*)(?:[ \t]|(?=\r?\n)))|(\})|((?:.|[\r\n\f])+?)/gi,GK=/(?:^|\.)(\w+)(?:\(([^)]*)\))?/g,Xhe=/^(['"])((?:\\.|(?!\1)[^\\])*)\1$/,Zhe=/\\(u(?:[a-f\d]{4}|\{[a-f\d]{1,6}\})|x[a-f\d]{2}|.)|([^\\])/gi,$he=new Map([["n",` +`],["r","\r"],["t"," "],["b","\b"],["f","\f"],["v","\v"],["0","\0"],["\\","\\"],["e",""],["a","\x07"]]);function jK(t){let e=t[0]==="u",r=t[1]==="{";return e&&!r&&t.length===5||t[0]==="x"&&t.length===3?String.fromCharCode(parseInt(t.slice(1),16)):e&&r?String.fromCodePoint(parseInt(t.slice(2,-1),16)):$he.get(t)||t}function epe(t,e){let r=[],i=e.trim().split(/\s*,\s*/g),n;for(let s of i){let o=Number(s);if(!Number.isNaN(o))r.push(o);else if(n=s.match(Xhe))r.push(n[2].replace(Zhe,(a,l,c)=>l?jK(l):c));else throw new Error(`Invalid Chalk template style argument: ${s} (in style '${t}')`)}return r}function tpe(t){GK.lastIndex=0;let e=[],r;for(;(r=GK.exec(t))!==null;){let i=r[1];if(r[2]){let n=epe(i,r[2]);e.push([i].concat(n))}else e.push([i])}return e}function YK(t,e){let r={};for(let n of e)for(let s of n.styles)r[s[0]]=n.inverse?null:s.slice(1);let i=t;for(let[n,s]of Object.entries(r))if(!!Array.isArray(s)){if(!(n in i))throw new Error(`Unknown Chalk style: ${n}`);i=s.length>0?i[n](...s):i[n]}return i}HK.exports=(t,e)=>{let r=[],i=[],n=[];if(e.replace(_he,(s,o,a,l,c,u)=>{if(o)n.push(jK(o));else if(l){let g=n.join("");n=[],i.push(r.length===0?g:YK(t,r)(g)),r.push({inverse:a,styles:tpe(l)})}else if(c){if(r.length===0)throw new Error("Found extraneous } in Chalk template literal");i.push(YK(t,r)(n.join(""))),n=[],r.pop()}else n.push(u)}),i.push(n.join("")),r.length>0){let s=`Chalk template literal is missing ${r.length} closing bracket${r.length===1?"":"s"} (\`}\`)`;throw new Error(s)}return i.join("")}});var jb=I((P$e,JK)=>{"use strict";var fh=FK(),{stdout:Kb,stderr:Ub}=OK(),{stringReplaceAll:rpe,stringEncaseCRLFWithFirstIndex:ipe}=UK(),WK=["ansi","ansi","ansi256","ansi16m"],su=Object.create(null),npe=(t,e={})=>{if(e.level>3||e.level<0)throw new Error("The `level` option should be an integer from 0 to 3");let r=Kb?Kb.level:0;t.level=e.level===void 0?r:e.level},zK=class{constructor(e){return VK(e)}},VK=t=>{let e={};return npe(e,t),e.template=(...r)=>spe(e.template,...r),Object.setPrototypeOf(e,DI.prototype),Object.setPrototypeOf(e.template,e),e.template.constructor=()=>{throw new Error("`chalk.constructor()` is deprecated. Use `new chalk.Instance()` instead.")},e.template.Instance=zK,e.template};function DI(t){return VK(t)}for(let[t,e]of Object.entries(fh))su[t]={get(){let r=RI(this,Hb(e.open,e.close,this._styler),this._isEmpty);return Object.defineProperty(this,t,{value:r}),r}};su.visible={get(){let t=RI(this,this._styler,!0);return Object.defineProperty(this,"visible",{value:t}),t}};var _K=["rgb","hex","keyword","hsl","hsv","hwb","ansi","ansi256"];for(let t of _K)su[t]={get(){let{level:e}=this;return function(...r){let i=Hb(fh.color[WK[e]][t](...r),fh.color.close,this._styler);return RI(this,i,this._isEmpty)}}};for(let t of _K){let e="bg"+t[0].toUpperCase()+t.slice(1);su[e]={get(){let{level:r}=this;return function(...i){let n=Hb(fh.bgColor[WK[r]][t](...i),fh.bgColor.close,this._styler);return RI(this,n,this._isEmpty)}}}}var ope=Object.defineProperties(()=>{},_(P({},su),{level:{enumerable:!0,get(){return this._generator.level},set(t){this._generator.level=t}}})),Hb=(t,e,r)=>{let i,n;return r===void 0?(i=t,n=e):(i=r.openAll+t,n=e+r.closeAll),{open:t,close:e,openAll:i,closeAll:n,parent:r}},RI=(t,e,r)=>{let i=(...n)=>ape(i,n.length===1?""+n[0]:n.join(" "));return i.__proto__=ope,i._generator=t,i._styler=e,i._isEmpty=r,i},ape=(t,e)=>{if(t.level<=0||!e)return t._isEmpty?"":e;let r=t._styler;if(r===void 0)return e;let{openAll:i,closeAll:n}=r;if(e.indexOf("")!==-1)for(;r!==void 0;)e=rpe(e,r.close,r.open),r=r.parent;let s=e.indexOf(` +`);return s!==-1&&(e=ipe(e,n,i,s)),i+e+n},Gb,spe=(t,...e)=>{let[r]=e;if(!Array.isArray(r))return e.join(" ");let i=e.slice(1),n=[r.raw[0]];for(let s=1;s{XK.exports=[{name:"AppVeyor",constant:"APPVEYOR",env:"APPVEYOR",pr:"APPVEYOR_PULL_REQUEST_NUMBER"},{name:"Azure Pipelines",constant:"AZURE_PIPELINES",env:"SYSTEM_TEAMFOUNDATIONCOLLECTIONURI",pr:"SYSTEM_PULLREQUEST_PULLREQUESTID"},{name:"Appcircle",constant:"APPCIRCLE",env:"AC_APPCIRCLE"},{name:"Bamboo",constant:"BAMBOO",env:"bamboo_planKey"},{name:"Bitbucket Pipelines",constant:"BITBUCKET",env:"BITBUCKET_COMMIT",pr:"BITBUCKET_PR_ID"},{name:"Bitrise",constant:"BITRISE",env:"BITRISE_IO",pr:"BITRISE_PULL_REQUEST"},{name:"Buddy",constant:"BUDDY",env:"BUDDY_WORKSPACE_ID",pr:"BUDDY_EXECUTION_PULL_REQUEST_ID"},{name:"Buildkite",constant:"BUILDKITE",env:"BUILDKITE",pr:{env:"BUILDKITE_PULL_REQUEST",ne:"false"}},{name:"CircleCI",constant:"CIRCLE",env:"CIRCLECI",pr:"CIRCLE_PULL_REQUEST"},{name:"Cirrus CI",constant:"CIRRUS",env:"CIRRUS_CI",pr:"CIRRUS_PR"},{name:"AWS CodeBuild",constant:"CODEBUILD",env:"CODEBUILD_BUILD_ARN"},{name:"Codefresh",constant:"CODEFRESH",env:"CF_BUILD_ID",pr:{any:["CF_PULL_REQUEST_NUMBER","CF_PULL_REQUEST_ID"]}},{name:"Codeship",constant:"CODESHIP",env:{CI_NAME:"codeship"}},{name:"Drone",constant:"DRONE",env:"DRONE",pr:{DRONE_BUILD_EVENT:"pull_request"}},{name:"dsari",constant:"DSARI",env:"DSARI"},{name:"GitHub Actions",constant:"GITHUB_ACTIONS",env:"GITHUB_ACTIONS",pr:{GITHUB_EVENT_NAME:"pull_request"}},{name:"GitLab CI",constant:"GITLAB",env:"GITLAB_CI",pr:"CI_MERGE_REQUEST_ID"},{name:"GoCD",constant:"GOCD",env:"GO_PIPELINE_LABEL"},{name:"LayerCI",constant:"LAYERCI",env:"LAYERCI",pr:"LAYERCI_PULL_REQUEST"},{name:"Hudson",constant:"HUDSON",env:"HUDSON_URL"},{name:"Jenkins",constant:"JENKINS",env:["JENKINS_URL","BUILD_ID"],pr:{any:["ghprbPullId","CHANGE_ID"]}},{name:"Magnum CI",constant:"MAGNUM",env:"MAGNUM"},{name:"Netlify CI",constant:"NETLIFY",env:"NETLIFY",pr:{env:"PULL_REQUEST",ne:"false"}},{name:"Nevercode",constant:"NEVERCODE",env:"NEVERCODE",pr:{env:"NEVERCODE_PULL_REQUEST",ne:"false"}},{name:"Render",constant:"RENDER",env:"RENDER",pr:{IS_PULL_REQUEST:"true"}},{name:"Sail CI",constant:"SAIL",env:"SAILCI",pr:"SAIL_PULL_REQUEST_NUMBER"},{name:"Semaphore",constant:"SEMAPHORE",env:"SEMAPHORE",pr:"PULL_REQUEST_NUMBER"},{name:"Screwdriver",constant:"SCREWDRIVER",env:"SCREWDRIVER",pr:{env:"SD_PULL_REQUEST",ne:"false"}},{name:"Shippable",constant:"SHIPPABLE",env:"SHIPPABLE",pr:{IS_PULL_REQUEST:"true"}},{name:"Solano CI",constant:"SOLANO",env:"TDDIUM",pr:"TDDIUM_PR_ID"},{name:"Strider CD",constant:"STRIDER",env:"STRIDER"},{name:"TaskCluster",constant:"TASKCLUSTER",env:["TASK_ID","RUN_ID"]},{name:"TeamCity",constant:"TEAMCITY",env:"TEAMCITY_VERSION"},{name:"Travis CI",constant:"TRAVIS",env:"TRAVIS",pr:{env:"TRAVIS_PULL_REQUEST",ne:"false"}},{name:"Vercel",constant:"VERCEL",env:"NOW_BUILDER"},{name:"Visual Studio App Center",constant:"APPCENTER",env:"APPCENTER_BUILD_ID"}]});var ml=I(Dn=>{"use strict";var $K=ZK(),ro=process.env;Object.defineProperty(Dn,"_vendors",{value:$K.map(function(t){return t.constant})});Dn.name=null;Dn.isPR=null;$K.forEach(function(t){let r=(Array.isArray(t.env)?t.env:[t.env]).every(function(i){return e1(i)});if(Dn[t.constant]=r,r)switch(Dn.name=t.name,typeof t.pr){case"string":Dn.isPR=!!ro[t.pr];break;case"object":"env"in t.pr?Dn.isPR=t.pr.env in ro&&ro[t.pr.env]!==t.pr.ne:"any"in t.pr?Dn.isPR=t.pr.any.some(function(i){return!!ro[i]}):Dn.isPR=e1(t.pr);break;default:Dn.isPR=null}});Dn.isCI=!!(ro.CI||ro.CONTINUOUS_INTEGRATION||ro.BUILD_NUMBER||ro.RUN_ID||Dn.name);function e1(t){return typeof t=="string"?!!ro[t]:Object.keys(t).every(function(e){return ro[e]===t[e]})}});var FI=I(zn=>{"use strict";zn.isInteger=t=>typeof t=="number"?Number.isInteger(t):typeof t=="string"&&t.trim()!==""?Number.isInteger(Number(t)):!1;zn.find=(t,e)=>t.nodes.find(r=>r.type===e);zn.exceedsLimit=(t,e,r=1,i)=>i===!1||!zn.isInteger(t)||!zn.isInteger(e)?!1:(Number(e)-Number(t))/Number(r)>=i;zn.escapeNode=(t,e=0,r)=>{let i=t.nodes[e];!i||(r&&i.type===r||i.type==="open"||i.type==="close")&&i.escaped!==!0&&(i.value="\\"+i.value,i.escaped=!0)};zn.encloseBrace=t=>t.type!=="brace"?!1:t.commas>>0+t.ranges>>0==0?(t.invalid=!0,!0):!1;zn.isInvalidBrace=t=>t.type!=="brace"?!1:t.invalid===!0||t.dollar?!0:t.commas>>0+t.ranges>>0==0||t.open!==!0||t.close!==!0?(t.invalid=!0,!0):!1;zn.isOpenOrClose=t=>t.type==="open"||t.type==="close"?!0:t.open===!0||t.close===!0;zn.reduce=t=>t.reduce((e,r)=>(r.type==="text"&&e.push(r.value),r.type==="range"&&(r.type="text"),e),[]);zn.flatten=(...t)=>{let e=[],r=i=>{for(let n=0;n{"use strict";var r1=FI();t1.exports=(t,e={})=>{let r=(i,n={})=>{let s=e.escapeInvalid&&r1.isInvalidBrace(n),o=i.invalid===!0&&e.escapeInvalid===!0,a="";if(i.value)return(s||o)&&r1.isOpenOrClose(i)?"\\"+i.value:i.value;if(i.value)return i.value;if(i.nodes)for(let l of i.nodes)a+=r(l);return a};return r(t)}});var n1=I((L$e,i1)=>{"use strict";i1.exports=function(t){return typeof t=="number"?t-t==0:typeof t=="string"&&t.trim()!==""?Number.isFinite?Number.isFinite(+t):isFinite(+t):!1}});var f1=I((T$e,s1)=>{"use strict";var o1=n1(),Il=(t,e,r)=>{if(o1(t)===!1)throw new TypeError("toRegexRange: expected the first argument to be a number");if(e===void 0||t===e)return String(t);if(o1(e)===!1)throw new TypeError("toRegexRange: expected the second argument to be a number.");let i=P({relaxZeros:!0},r);typeof i.strictZeros=="boolean"&&(i.relaxZeros=i.strictZeros===!1);let n=String(i.relaxZeros),s=String(i.shorthand),o=String(i.capture),a=String(i.wrap),l=t+":"+e+"="+n+s+o+a;if(Il.cache.hasOwnProperty(l))return Il.cache[l].result;let c=Math.min(t,e),u=Math.max(t,e);if(Math.abs(c-u)===1){let d=t+"|"+e;return i.capture?`(${d})`:i.wrap===!1?d:`(?:${d})`}let g=A1(t)||A1(e),f={min:t,max:e,a:c,b:u},h=[],p=[];if(g&&(f.isPadded=g,f.maxLen=String(f.max).length),c<0){let d=u<0?Math.abs(u):1;p=a1(d,Math.abs(c),f,i),c=f.a=0}return u>=0&&(h=a1(c,u,f,i)),f.negatives=p,f.positives=h,f.result=Ape(p,h,i),i.capture===!0?f.result=`(${f.result})`:i.wrap!==!1&&h.length+p.length>1&&(f.result=`(?:${f.result})`),Il.cache[l]=f,f.result};function Ape(t,e,r){let i=Yb(t,e,"-",!1,r)||[],n=Yb(e,t,"",!1,r)||[],s=Yb(t,e,"-?",!0,r)||[];return i.concat(s).concat(n).join("|")}function cpe(t,e){let r=1,i=1,n=l1(t,r),s=new Set([e]);for(;t<=n&&n<=e;)s.add(n),r+=1,n=l1(t,r);for(n=c1(e+1,i)-1;t1&&a.count.pop(),a.count.push(u.count[0]),a.string=a.pattern+u1(a.count),o=c+1;continue}r.isPadded&&(g=hpe(c,r,i)),u.string=g+u.pattern+u1(u.count),s.push(u),o=c+1,a=u}return s}function Yb(t,e,r,i,n){let s=[];for(let o of t){let{string:a}=o;!i&&!g1(e,"string",a)&&s.push(r+a),i&&g1(e,"string",a)&&s.push(r+a)}return s}function upe(t,e){let r=[];for(let i=0;ie?1:e>t?-1:0}function g1(t,e,r){return t.some(i=>i[e]===r)}function l1(t,e){return Number(String(t).slice(0,-e)+"9".repeat(e))}function c1(t,e){return t-t%Math.pow(10,e)}function u1(t){let[e=0,r=""]=t;return r||e>1?`{${e+(r?","+r:"")}}`:""}function gpe(t,e,r){return`[${t}${e-t==1?"":"-"}${e}]`}function A1(t){return/^-?(0+)\d/.test(t)}function hpe(t,e,r){if(!e.isPadded)return t;let i=Math.abs(e.maxLen-String(t).length),n=r.relaxZeros!==!1;switch(i){case 0:return"";case 1:return n?"0?":"0";case 2:return n?"0{0,2}":"00";default:return n?`0{0,${i}}`:`0{${i}}`}}Il.cache={};Il.clearCache=()=>Il.cache={};s1.exports=Il});var Wb=I((M$e,h1)=>{"use strict";var ppe=require("util"),p1=f1(),d1=t=>t!==null&&typeof t=="object"&&!Array.isArray(t),dpe=t=>e=>t===!0?Number(e):String(e),qb=t=>typeof t=="number"||typeof t=="string"&&t!=="",ph=t=>Number.isInteger(+t),Jb=t=>{let e=`${t}`,r=-1;if(e[0]==="-"&&(e=e.slice(1)),e==="0")return!1;for(;e[++r]==="0";);return r>0},Cpe=(t,e,r)=>typeof t=="string"||typeof e=="string"?!0:r.stringify===!0,mpe=(t,e,r)=>{if(e>0){let i=t[0]==="-"?"-":"";i&&(t=t.slice(1)),t=i+t.padStart(i?e-1:e,"0")}return r===!1?String(t):t},C1=(t,e)=>{let r=t[0]==="-"?"-":"";for(r&&(t=t.slice(1),e--);t.length{t.negatives.sort((o,a)=>oa?1:0),t.positives.sort((o,a)=>oa?1:0);let r=e.capture?"":"?:",i="",n="",s;return t.positives.length&&(i=t.positives.join("|")),t.negatives.length&&(n=`-(${r}${t.negatives.join("|")})`),i&&n?s=`${i}|${n}`:s=i||n,e.wrap?`(${r}${s})`:s},m1=(t,e,r,i)=>{if(r)return p1(t,e,P({wrap:!1},i));let n=String.fromCharCode(t);if(t===e)return n;let s=String.fromCharCode(e);return`[${n}-${s}]`},I1=(t,e,r)=>{if(Array.isArray(t)){let i=r.wrap===!0,n=r.capture?"":"?:";return i?`(${n}${t.join("|")})`:t.join("|")}return p1(t,e,r)},E1=(...t)=>new RangeError("Invalid range arguments: "+ppe.inspect(...t)),y1=(t,e,r)=>{if(r.strictRanges===!0)throw E1([t,e]);return[]},Epe=(t,e)=>{if(e.strictRanges===!0)throw new TypeError(`Expected step "${t}" to be a number`);return[]},ype=(t,e,r=1,i={})=>{let n=Number(t),s=Number(e);if(!Number.isInteger(n)||!Number.isInteger(s)){if(i.strictRanges===!0)throw E1([t,e]);return[]}n===0&&(n=0),s===0&&(s=0);let o=n>s,a=String(t),l=String(e),c=String(r);r=Math.max(Math.abs(r),1);let u=Jb(a)||Jb(l)||Jb(c),g=u?Math.max(a.length,l.length,c.length):0,f=u===!1&&Cpe(t,e,i)===!1,h=i.transform||dpe(f);if(i.toRegex&&r===1)return m1(C1(t,g),C1(e,g),!0,i);let p={negatives:[],positives:[]},d=B=>p[B<0?"negatives":"positives"].push(Math.abs(B)),m=[],E=0;for(;o?n>=s:n<=s;)i.toRegex===!0&&r>1?d(n):m.push(mpe(h(n,E),g,f)),n=o?n-r:n+r,E++;return i.toRegex===!0?r>1?Ipe(p,i):I1(m,null,P({wrap:!1},i)):m},wpe=(t,e,r=1,i={})=>{if(!ph(t)&&t.length>1||!ph(e)&&e.length>1)return y1(t,e,i);let n=i.transform||(f=>String.fromCharCode(f)),s=`${t}`.charCodeAt(0),o=`${e}`.charCodeAt(0),a=s>o,l=Math.min(s,o),c=Math.max(s,o);if(i.toRegex&&r===1)return m1(l,c,!1,i);let u=[],g=0;for(;a?s>=o:s<=o;)u.push(n(s,g)),s=a?s-r:s+r,g++;return i.toRegex===!0?I1(u,null,{wrap:!1,options:i}):u},LI=(t,e,r,i={})=>{if(e==null&&qb(t))return[t];if(!qb(t)||!qb(e))return y1(t,e,i);if(typeof r=="function")return LI(t,e,1,{transform:r});if(d1(r))return LI(t,e,0,r);let n=P({},i);return n.capture===!0&&(n.wrap=!0),r=r||n.step||1,ph(r)?ph(t)&&ph(e)?ype(t,e,r,n):wpe(t,e,Math.max(Math.abs(r),1),n):r!=null&&!d1(r)?Epe(r,n):LI(t,e,1,r)};h1.exports=LI});var Q1=I((O$e,w1)=>{"use strict";var Bpe=Wb(),B1=FI(),Qpe=(t,e={})=>{let r=(i,n={})=>{let s=B1.isInvalidBrace(n),o=i.invalid===!0&&e.escapeInvalid===!0,a=s===!0||o===!0,l=e.escapeInvalid===!0?"\\":"",c="";if(i.isOpen===!0||i.isClose===!0)return l+i.value;if(i.type==="open")return a?l+i.value:"(";if(i.type==="close")return a?l+i.value:")";if(i.type==="comma")return i.prev.type==="comma"?"":a?i.value:"|";if(i.value)return i.value;if(i.nodes&&i.ranges>0){let u=B1.reduce(i.nodes),g=Bpe(...u,_(P({},e),{wrap:!1,toRegex:!0}));if(g.length!==0)return u.length>1&&g.length>1?`(${g})`:g}if(i.nodes)for(let u of i.nodes)c+=r(u,i);return c};return r(t)};w1.exports=Qpe});var S1=I((K$e,b1)=>{"use strict";var bpe=Wb(),v1=NI(),ou=FI(),El=(t="",e="",r=!1)=>{let i=[];if(t=[].concat(t),e=[].concat(e),!e.length)return t;if(!t.length)return r?ou.flatten(e).map(n=>`{${n}}`):e;for(let n of t)if(Array.isArray(n))for(let s of n)i.push(El(s,e,r));else for(let s of e)r===!0&&typeof s=="string"&&(s=`{${s}}`),i.push(Array.isArray(s)?El(n,s,r):n+s);return ou.flatten(i)},vpe=(t,e={})=>{let r=e.rangeLimit===void 0?1e3:e.rangeLimit,i=(n,s={})=>{n.queue=[];let o=s,a=s.queue;for(;o.type!=="brace"&&o.type!=="root"&&o.parent;)o=o.parent,a=o.queue;if(n.invalid||n.dollar){a.push(El(a.pop(),v1(n,e)));return}if(n.type==="brace"&&n.invalid!==!0&&n.nodes.length===2){a.push(El(a.pop(),["{}"]));return}if(n.nodes&&n.ranges>0){let g=ou.reduce(n.nodes);if(ou.exceedsLimit(...g,e.step,r))throw new RangeError("expanded array length exceeds range limit. Use options.rangeLimit to increase or disable the limit.");let f=bpe(...g,e);f.length===0&&(f=v1(n,e)),a.push(El(a.pop(),f)),n.nodes=[];return}let l=ou.encloseBrace(n),c=n.queue,u=n;for(;u.type!=="brace"&&u.type!=="root"&&u.parent;)u=u.parent,c=u.queue;for(let g=0;g{"use strict";x1.exports={MAX_LENGTH:1024*64,CHAR_0:"0",CHAR_9:"9",CHAR_UPPERCASE_A:"A",CHAR_LOWERCASE_A:"a",CHAR_UPPERCASE_Z:"Z",CHAR_LOWERCASE_Z:"z",CHAR_LEFT_PARENTHESES:"(",CHAR_RIGHT_PARENTHESES:")",CHAR_ASTERISK:"*",CHAR_AMPERSAND:"&",CHAR_AT:"@",CHAR_BACKSLASH:"\\",CHAR_BACKTICK:"`",CHAR_CARRIAGE_RETURN:"\r",CHAR_CIRCUMFLEX_ACCENT:"^",CHAR_COLON:":",CHAR_COMMA:",",CHAR_DOLLAR:"$",CHAR_DOT:".",CHAR_DOUBLE_QUOTE:'"',CHAR_EQUAL:"=",CHAR_EXCLAMATION_MARK:"!",CHAR_FORM_FEED:"\f",CHAR_FORWARD_SLASH:"/",CHAR_HASH:"#",CHAR_HYPHEN_MINUS:"-",CHAR_LEFT_ANGLE_BRACKET:"<",CHAR_LEFT_CURLY_BRACE:"{",CHAR_LEFT_SQUARE_BRACKET:"[",CHAR_LINE_FEED:` +`,CHAR_NO_BREAK_SPACE:"\xA0",CHAR_PERCENT:"%",CHAR_PLUS:"+",CHAR_QUESTION_MARK:"?",CHAR_RIGHT_ANGLE_BRACKET:">",CHAR_RIGHT_CURLY_BRACE:"}",CHAR_RIGHT_SQUARE_BRACKET:"]",CHAR_SEMICOLON:";",CHAR_SINGLE_QUOTE:"'",CHAR_SPACE:" ",CHAR_TAB:" ",CHAR_UNDERSCORE:"_",CHAR_VERTICAL_LINE:"|",CHAR_ZERO_WIDTH_NOBREAK_SPACE:"\uFEFF"}});var N1=I((H$e,P1)=>{"use strict";var Spe=NI(),{MAX_LENGTH:D1,CHAR_BACKSLASH:zb,CHAR_BACKTICK:xpe,CHAR_COMMA:kpe,CHAR_DOT:Ppe,CHAR_LEFT_PARENTHESES:Dpe,CHAR_RIGHT_PARENTHESES:Rpe,CHAR_LEFT_CURLY_BRACE:Fpe,CHAR_RIGHT_CURLY_BRACE:Npe,CHAR_LEFT_SQUARE_BRACKET:R1,CHAR_RIGHT_SQUARE_BRACKET:F1,CHAR_DOUBLE_QUOTE:Lpe,CHAR_SINGLE_QUOTE:Tpe,CHAR_NO_BREAK_SPACE:Mpe,CHAR_ZERO_WIDTH_NOBREAK_SPACE:Ope}=k1(),Kpe=(t,e={})=>{if(typeof t!="string")throw new TypeError("Expected a string");let r=e||{},i=typeof r.maxLength=="number"?Math.min(D1,r.maxLength):D1;if(t.length>i)throw new SyntaxError(`Input length (${t.length}), exceeds max characters (${i})`);let n={type:"root",input:t,nodes:[]},s=[n],o=n,a=n,l=0,c=t.length,u=0,g=0,f,h={},p=()=>t[u++],d=m=>{if(m.type==="text"&&a.type==="dot"&&(a.type="text"),a&&a.type==="text"&&m.type==="text"){a.value+=m.value;return}return o.nodes.push(m),m.parent=o,m.prev=a,a=m,m};for(d({type:"bos"});u0){if(o.ranges>0){o.ranges=0;let m=o.nodes.shift();o.nodes=[m,{type:"text",value:Spe(o)}]}d({type:"comma",value:f}),o.commas++;continue}if(f===Ppe&&g>0&&o.commas===0){let m=o.nodes;if(g===0||m.length===0){d({type:"text",value:f});continue}if(a.type==="dot"){if(o.range=[],a.value+=f,a.type="range",o.nodes.length!==3&&o.nodes.length!==5){o.invalid=!0,o.ranges=0,a.type="text";continue}o.ranges++,o.args=[];continue}if(a.type==="range"){m.pop();let E=m[m.length-1];E.value+=a.value+f,a=E,o.ranges--;continue}d({type:"dot",value:f});continue}d({type:"text",value:f})}do if(o=s.pop(),o.type!=="root"){o.nodes.forEach(B=>{B.nodes||(B.type==="open"&&(B.isOpen=!0),B.type==="close"&&(B.isClose=!0),B.nodes||(B.type="text"),B.invalid=!0)});let m=s[s.length-1],E=m.nodes.indexOf(o);m.nodes.splice(E,1,...o.nodes)}while(s.length>0);return d({type:"eos"}),n};P1.exports=Kpe});var M1=I((G$e,L1)=>{"use strict";var T1=NI(),Upe=Q1(),Hpe=S1(),Gpe=N1(),Rn=(t,e={})=>{let r=[];if(Array.isArray(t))for(let i of t){let n=Rn.create(i,e);Array.isArray(n)?r.push(...n):r.push(n)}else r=[].concat(Rn.create(t,e));return e&&e.expand===!0&&e.nodupes===!0&&(r=[...new Set(r)]),r};Rn.parse=(t,e={})=>Gpe(t,e);Rn.stringify=(t,e={})=>typeof t=="string"?T1(Rn.parse(t,e),e):T1(t,e);Rn.compile=(t,e={})=>(typeof t=="string"&&(t=Rn.parse(t,e)),Upe(t,e));Rn.expand=(t,e={})=>{typeof t=="string"&&(t=Rn.parse(t,e));let r=Hpe(t,e);return e.noempty===!0&&(r=r.filter(Boolean)),e.nodupes===!0&&(r=[...new Set(r)]),r};Rn.create=(t,e={})=>t===""||t.length<3?[t]:e.expand!==!0?Rn.compile(t,e):Rn.expand(t,e);L1.exports=Rn});var dh=I((j$e,O1)=>{"use strict";var jpe=require("path"),io="\\\\/",K1=`[^${io}]`,ea="\\.",Ype="\\+",qpe="\\?",TI="\\/",Jpe="(?=.)",U1="[^/]",Vb=`(?:${TI}|$)`,H1=`(?:^|${TI})`,_b=`${ea}{1,2}${Vb}`,Wpe=`(?!${ea})`,zpe=`(?!${H1}${_b})`,Vpe=`(?!${ea}{0,1}${Vb})`,_pe=`(?!${_b})`,Xpe=`[^.${TI}]`,Zpe=`${U1}*?`,G1={DOT_LITERAL:ea,PLUS_LITERAL:Ype,QMARK_LITERAL:qpe,SLASH_LITERAL:TI,ONE_CHAR:Jpe,QMARK:U1,END_ANCHOR:Vb,DOTS_SLASH:_b,NO_DOT:Wpe,NO_DOTS:zpe,NO_DOT_SLASH:Vpe,NO_DOTS_SLASH:_pe,QMARK_NO_DOT:Xpe,STAR:Zpe,START_ANCHOR:H1},$pe=_(P({},G1),{SLASH_LITERAL:`[${io}]`,QMARK:K1,STAR:`${K1}*?`,DOTS_SLASH:`${ea}{1,2}(?:[${io}]|$)`,NO_DOT:`(?!${ea})`,NO_DOTS:`(?!(?:^|[${io}])${ea}{1,2}(?:[${io}]|$))`,NO_DOT_SLASH:`(?!${ea}{0,1}(?:[${io}]|$))`,NO_DOTS_SLASH:`(?!${ea}{1,2}(?:[${io}]|$))`,QMARK_NO_DOT:`[^.${io}]`,START_ANCHOR:`(?:^|[${io}])`,END_ANCHOR:`(?:[${io}]|$)`}),ede={alnum:"a-zA-Z0-9",alpha:"a-zA-Z",ascii:"\\x00-\\x7F",blank:" \\t",cntrl:"\\x00-\\x1F\\x7F",digit:"0-9",graph:"\\x21-\\x7E",lower:"a-z",print:"\\x20-\\x7E ",punct:"\\-!\"#$%&'()\\*+,./:;<=>?@[\\]^_`{|}~",space:" \\t\\r\\n\\v\\f",upper:"A-Z",word:"A-Za-z0-9_",xdigit:"A-Fa-f0-9"};O1.exports={MAX_LENGTH:1024*64,POSIX_REGEX_SOURCE:ede,REGEX_BACKSLASH:/\\(?![*+?^${}(|)[\]])/g,REGEX_NON_SPECIAL_CHARS:/^[^@![\].,$*+?^{}()|\\/]+/,REGEX_SPECIAL_CHARS:/[-*+?.^${}(|)[\]]/,REGEX_SPECIAL_CHARS_BACKREF:/(\\?)((\W)(\3*))/g,REGEX_SPECIAL_CHARS_GLOBAL:/([-*+?.^${}(|)[\]])/g,REGEX_REMOVE_BACKSLASH:/(?:\[.*?[^\\]\]|\\(?=.))/g,REPLACEMENTS:{"***":"*","**/**":"**","**/**/**":"**"},CHAR_0:48,CHAR_9:57,CHAR_UPPERCASE_A:65,CHAR_LOWERCASE_A:97,CHAR_UPPERCASE_Z:90,CHAR_LOWERCASE_Z:122,CHAR_LEFT_PARENTHESES:40,CHAR_RIGHT_PARENTHESES:41,CHAR_ASTERISK:42,CHAR_AMPERSAND:38,CHAR_AT:64,CHAR_BACKWARD_SLASH:92,CHAR_CARRIAGE_RETURN:13,CHAR_CIRCUMFLEX_ACCENT:94,CHAR_COLON:58,CHAR_COMMA:44,CHAR_DOT:46,CHAR_DOUBLE_QUOTE:34,CHAR_EQUAL:61,CHAR_EXCLAMATION_MARK:33,CHAR_FORM_FEED:12,CHAR_FORWARD_SLASH:47,CHAR_GRAVE_ACCENT:96,CHAR_HASH:35,CHAR_HYPHEN_MINUS:45,CHAR_LEFT_ANGLE_BRACKET:60,CHAR_LEFT_CURLY_BRACE:123,CHAR_LEFT_SQUARE_BRACKET:91,CHAR_LINE_FEED:10,CHAR_NO_BREAK_SPACE:160,CHAR_PERCENT:37,CHAR_PLUS:43,CHAR_QUESTION_MARK:63,CHAR_RIGHT_ANGLE_BRACKET:62,CHAR_RIGHT_CURLY_BRACE:125,CHAR_RIGHT_SQUARE_BRACKET:93,CHAR_SEMICOLON:59,CHAR_SINGLE_QUOTE:39,CHAR_SPACE:32,CHAR_TAB:9,CHAR_UNDERSCORE:95,CHAR_VERTICAL_LINE:124,CHAR_ZERO_WIDTH_NOBREAK_SPACE:65279,SEP:jpe.sep,extglobChars(t){return{"!":{type:"negate",open:"(?:(?!(?:",close:`))${t.STAR})`},"?":{type:"qmark",open:"(?:",close:")?"},"+":{type:"plus",open:"(?:",close:")+"},"*":{type:"star",open:"(?:",close:")*"},"@":{type:"at",open:"(?:",close:")"}}},globChars(t){return t===!0?$pe:G1}}});var Ch=I(cn=>{"use strict";var tde=require("path"),rde=process.platform==="win32",{REGEX_BACKSLASH:ide,REGEX_REMOVE_BACKSLASH:nde,REGEX_SPECIAL_CHARS:sde,REGEX_SPECIAL_CHARS_GLOBAL:ode}=dh();cn.isObject=t=>t!==null&&typeof t=="object"&&!Array.isArray(t);cn.hasRegexChars=t=>sde.test(t);cn.isRegexChar=t=>t.length===1&&cn.hasRegexChars(t);cn.escapeRegex=t=>t.replace(ode,"\\$1");cn.toPosixSlashes=t=>t.replace(ide,"/");cn.removeBackslashes=t=>t.replace(nde,e=>e==="\\"?"":e);cn.supportsLookbehinds=()=>{let t=process.version.slice(1).split(".").map(Number);return t.length===3&&t[0]>=9||t[0]===8&&t[1]>=10};cn.isWindows=t=>t&&typeof t.windows=="boolean"?t.windows:rde===!0||tde.sep==="\\";cn.escapeLast=(t,e,r)=>{let i=t.lastIndexOf(e,r);return i===-1?t:t[i-1]==="\\"?cn.escapeLast(t,e,i-1):`${t.slice(0,i)}\\${t.slice(i)}`};cn.removePrefix=(t,e={})=>{let r=t;return r.startsWith("./")&&(r=r.slice(2),e.prefix="./"),r};cn.wrapOutput=(t,e={},r={})=>{let i=r.contains?"":"^",n=r.contains?"":"$",s=`${i}(?:${t})${n}`;return e.negated===!0&&(s=`(?:^(?!${s}).*$)`),s}});var X1=I((q$e,j1)=>{"use strict";var Y1=Ch(),{CHAR_ASTERISK:Xb,CHAR_AT:ade,CHAR_BACKWARD_SLASH:mh,CHAR_COMMA:Ade,CHAR_DOT:Zb,CHAR_EXCLAMATION_MARK:q1,CHAR_FORWARD_SLASH:J1,CHAR_LEFT_CURLY_BRACE:$b,CHAR_LEFT_PARENTHESES:ev,CHAR_LEFT_SQUARE_BRACKET:lde,CHAR_PLUS:cde,CHAR_QUESTION_MARK:W1,CHAR_RIGHT_CURLY_BRACE:ude,CHAR_RIGHT_PARENTHESES:z1,CHAR_RIGHT_SQUARE_BRACKET:gde}=dh(),V1=t=>t===J1||t===mh,_1=t=>{t.isPrefix!==!0&&(t.depth=t.isGlobstar?Infinity:1)},fde=(t,e)=>{let r=e||{},i=t.length-1,n=r.parts===!0||r.scanToEnd===!0,s=[],o=[],a=[],l=t,c=-1,u=0,g=0,f=!1,h=!1,p=!1,d=!1,m=!1,E=!1,B=!1,b=!1,R=!1,H=0,L,K,J={value:"",depth:0,isGlob:!1},ne=()=>c>=i,q=()=>l.charCodeAt(c+1),A=()=>(L=K,l.charCodeAt(++c));for(;c0&&(W=l.slice(0,u),l=l.slice(u),g-=u),V&&p===!0&&g>0?(V=l.slice(0,g),X=l.slice(g)):p===!0?(V="",X=l):V=l,V&&V!==""&&V!=="/"&&V!==l&&V1(V.charCodeAt(V.length-1))&&(V=V.slice(0,-1)),r.unescape===!0&&(X&&(X=Y1.removeBackslashes(X)),V&&B===!0&&(V=Y1.removeBackslashes(V)));let F={prefix:W,input:t,start:u,base:V,glob:X,isBrace:f,isBracket:h,isGlob:p,isExtglob:d,isGlobstar:m,negated:b};if(r.tokens===!0&&(F.maxDepth=0,V1(K)||o.push(J),F.tokens=o),r.parts===!0||r.tokens===!0){let D;for(let he=0;he{"use strict";var MI=dh(),Fn=Ch(),{MAX_LENGTH:OI,POSIX_REGEX_SOURCE:hde,REGEX_NON_SPECIAL_CHARS:pde,REGEX_SPECIAL_CHARS_BACKREF:dde,REPLACEMENTS:$1}=MI,Cde=(t,e)=>{if(typeof e.expandRange=="function")return e.expandRange(...t,e);t.sort();let r=`[${t.join("-")}]`;try{new RegExp(r)}catch(i){return t.map(n=>Fn.escapeRegex(n)).join("..")}return r},au=(t,e)=>`Missing ${t}: "${e}" - use "\\\\${e}" to match literal characters`,eU=(t,e)=>{if(typeof t!="string")throw new TypeError("Expected a string");t=$1[t]||t;let r=P({},e),i=typeof r.maxLength=="number"?Math.min(OI,r.maxLength):OI,n=t.length;if(n>i)throw new SyntaxError(`Input length: ${n}, exceeds maximum allowed length: ${i}`);let s={type:"bos",value:"",output:r.prepend||""},o=[s],a=r.capture?"":"?:",l=Fn.isWindows(e),c=MI.globChars(l),u=MI.extglobChars(c),{DOT_LITERAL:g,PLUS_LITERAL:f,SLASH_LITERAL:h,ONE_CHAR:p,DOTS_SLASH:d,NO_DOT:m,NO_DOT_SLASH:E,NO_DOTS_SLASH:B,QMARK:b,QMARK_NO_DOT:R,STAR:H,START_ANCHOR:L}=c,K=G=>`(${a}(?:(?!${L}${G.dot?d:g}).)*?)`,J=r.dot?"":m,ne=r.dot?b:R,q=r.bash===!0?K(r):H;r.capture&&(q=`(${q})`),typeof r.noext=="boolean"&&(r.noextglob=r.noext);let A={input:t,index:-1,start:0,dot:r.dot===!0,consumed:"",output:"",prefix:"",backtrack:!1,negated:!1,brackets:0,braces:0,parens:0,quotes:0,globstar:!1,tokens:o};t=Fn.removePrefix(t,A),n=t.length;let V=[],W=[],X=[],F=s,D,he=()=>A.index===n-1,pe=A.peek=(G=1)=>t[A.index+G],Ne=A.advance=()=>t[++A.index],Pe=()=>t.slice(A.index+1),qe=(G="",Ce=0)=>{A.consumed+=G,A.index+=Ce},re=G=>{A.output+=G.output!=null?G.output:G.value,qe(G.value)},se=()=>{let G=1;for(;pe()==="!"&&(pe(2)!=="("||pe(3)==="?");)Ne(),A.start++,G++;return G%2==0?!1:(A.negated=!0,A.start++,!0)},be=G=>{A[G]++,X.push(G)},ae=G=>{A[G]--,X.pop()},Ae=G=>{if(F.type==="globstar"){let Ce=A.braces>0&&(G.type==="comma"||G.type==="brace"),ee=G.extglob===!0||V.length&&(G.type==="pipe"||G.type==="paren");G.type!=="slash"&&G.type!=="paren"&&!Ce&&!ee&&(A.output=A.output.slice(0,-F.output.length),F.type="star",F.value="*",F.output=q,A.output+=F.output)}if(V.length&&G.type!=="paren"&&!u[G.value]&&(V[V.length-1].inner+=G.value),(G.value||G.output)&&re(G),F&&F.type==="text"&&G.type==="text"){F.value+=G.value,F.output=(F.output||"")+G.value;return}G.prev=F,o.push(G),F=G},De=(G,Ce)=>{let ee=_(P({},u[Ce]),{conditions:1,inner:""});ee.prev=F,ee.parens=A.parens,ee.output=A.output;let Ue=(r.capture?"(":"")+ee.open;be("parens"),Ae({type:G,value:Ce,output:A.output?"":p}),Ae({type:"paren",extglob:!0,value:Ne(),output:Ue}),V.push(ee)},$=G=>{let Ce=G.close+(r.capture?")":"");if(G.type==="negate"){let ee=q;G.inner&&G.inner.length>1&&G.inner.includes("/")&&(ee=K(r)),(ee!==q||he()||/^\)+$/.test(Pe()))&&(Ce=G.close=`)$))${ee}`),G.prev.type==="bos"&&(A.negatedExtglob=!0)}Ae({type:"paren",extglob:!0,value:D,output:Ce}),ae("parens")};if(r.fastpaths!==!1&&!/(^[*!]|[/()[\]{}"])/.test(t)){let G=!1,Ce=t.replace(dde,(ee,Ue,Oe,vt,dt,ri)=>vt==="\\"?(G=!0,ee):vt==="?"?Ue?Ue+vt+(dt?b.repeat(dt.length):""):ri===0?ne+(dt?b.repeat(dt.length):""):b.repeat(Oe.length):vt==="."?g.repeat(Oe.length):vt==="*"?Ue?Ue+vt+(dt?q:""):q:Ue?ee:`\\${ee}`);return G===!0&&(r.unescape===!0?Ce=Ce.replace(/\\/g,""):Ce=Ce.replace(/\\+/g,ee=>ee.length%2==0?"\\\\":ee?"\\":"")),Ce===t&&r.contains===!0?(A.output=t,A):(A.output=Fn.wrapOutput(Ce,A,e),A)}for(;!he();){if(D=Ne(),D==="\0")continue;if(D==="\\"){let ee=pe();if(ee==="/"&&r.bash!==!0||ee==="."||ee===";")continue;if(!ee){D+="\\",Ae({type:"text",value:D});continue}let Ue=/^\\+/.exec(Pe()),Oe=0;if(Ue&&Ue[0].length>2&&(Oe=Ue[0].length,A.index+=Oe,Oe%2!=0&&(D+="\\")),r.unescape===!0?D=Ne()||"":D+=Ne()||"",A.brackets===0){Ae({type:"text",value:D});continue}}if(A.brackets>0&&(D!=="]"||F.value==="["||F.value==="[^")){if(r.posix!==!1&&D===":"){let ee=F.value.slice(1);if(ee.includes("[")&&(F.posix=!0,ee.includes(":"))){let Ue=F.value.lastIndexOf("["),Oe=F.value.slice(0,Ue),vt=F.value.slice(Ue+2),dt=hde[vt];if(dt){F.value=Oe+dt,A.backtrack=!0,Ne(),!s.output&&o.indexOf(F)===1&&(s.output=p);continue}}}(D==="["&&pe()!==":"||D==="-"&&pe()==="]")&&(D=`\\${D}`),D==="]"&&(F.value==="["||F.value==="[^")&&(D=`\\${D}`),r.posix===!0&&D==="!"&&F.value==="["&&(D="^"),F.value+=D,re({value:D});continue}if(A.quotes===1&&D!=='"'){D=Fn.escapeRegex(D),F.value+=D,re({value:D});continue}if(D==='"'){A.quotes=A.quotes===1?0:1,r.keepQuotes===!0&&Ae({type:"text",value:D});continue}if(D==="("){be("parens"),Ae({type:"paren",value:D});continue}if(D===")"){if(A.parens===0&&r.strictBrackets===!0)throw new SyntaxError(au("opening","("));let ee=V[V.length-1];if(ee&&A.parens===ee.parens+1){$(V.pop());continue}Ae({type:"paren",value:D,output:A.parens?")":"\\)"}),ae("parens");continue}if(D==="["){if(r.nobracket===!0||!Pe().includes("]")){if(r.nobracket!==!0&&r.strictBrackets===!0)throw new SyntaxError(au("closing","]"));D=`\\${D}`}else be("brackets");Ae({type:"bracket",value:D});continue}if(D==="]"){if(r.nobracket===!0||F&&F.type==="bracket"&&F.value.length===1){Ae({type:"text",value:D,output:`\\${D}`});continue}if(A.brackets===0){if(r.strictBrackets===!0)throw new SyntaxError(au("opening","["));Ae({type:"text",value:D,output:`\\${D}`});continue}ae("brackets");let ee=F.value.slice(1);if(F.posix!==!0&&ee[0]==="^"&&!ee.includes("/")&&(D=`/${D}`),F.value+=D,re({value:D}),r.literalBrackets===!1||Fn.hasRegexChars(ee))continue;let Ue=Fn.escapeRegex(F.value);if(A.output=A.output.slice(0,-F.value.length),r.literalBrackets===!0){A.output+=Ue,F.value=Ue;continue}F.value=`(${a}${Ue}|${F.value})`,A.output+=F.value;continue}if(D==="{"&&r.nobrace!==!0){be("braces");let ee={type:"brace",value:D,output:"(",outputIndex:A.output.length,tokensIndex:A.tokens.length};W.push(ee),Ae(ee);continue}if(D==="}"){let ee=W[W.length-1];if(r.nobrace===!0||!ee){Ae({type:"text",value:D,output:D});continue}let Ue=")";if(ee.dots===!0){let Oe=o.slice(),vt=[];for(let dt=Oe.length-1;dt>=0&&(o.pop(),Oe[dt].type!=="brace");dt--)Oe[dt].type!=="dots"&&vt.unshift(Oe[dt].value);Ue=Cde(vt,r),A.backtrack=!0}if(ee.comma!==!0&&ee.dots!==!0){let Oe=A.output.slice(0,ee.outputIndex),vt=A.tokens.slice(ee.tokensIndex);ee.value=ee.output="\\{",D=Ue="\\}",A.output=Oe;for(let dt of vt)A.output+=dt.output||dt.value}Ae({type:"brace",value:D,output:Ue}),ae("braces"),W.pop();continue}if(D==="|"){V.length>0&&V[V.length-1].conditions++,Ae({type:"text",value:D});continue}if(D===","){let ee=D,Ue=W[W.length-1];Ue&&X[X.length-1]==="braces"&&(Ue.comma=!0,ee="|"),Ae({type:"comma",value:D,output:ee});continue}if(D==="/"){if(F.type==="dot"&&A.index===A.start+1){A.start=A.index+1,A.consumed="",A.output="",o.pop(),F=s;continue}Ae({type:"slash",value:D,output:h});continue}if(D==="."){if(A.braces>0&&F.type==="dot"){F.value==="."&&(F.output=g);let ee=W[W.length-1];F.type="dots",F.output+=D,F.value+=D,ee.dots=!0;continue}if(A.braces+A.parens===0&&F.type!=="bos"&&F.type!=="slash"){Ae({type:"text",value:D,output:g});continue}Ae({type:"dot",value:D,output:g});continue}if(D==="?"){if(!(F&&F.value==="(")&&r.noextglob!==!0&&pe()==="("&&pe(2)!=="?"){De("qmark",D);continue}if(F&&F.type==="paren"){let Ue=pe(),Oe=D;if(Ue==="<"&&!Fn.supportsLookbehinds())throw new Error("Node.js v10 or higher is required for regex lookbehinds");(F.value==="("&&!/[!=<:]/.test(Ue)||Ue==="<"&&!/<([!=]|\w+>)/.test(Pe()))&&(Oe=`\\${D}`),Ae({type:"text",value:D,output:Oe});continue}if(r.dot!==!0&&(F.type==="slash"||F.type==="bos")){Ae({type:"qmark",value:D,output:R});continue}Ae({type:"qmark",value:D,output:b});continue}if(D==="!"){if(r.noextglob!==!0&&pe()==="("&&(pe(2)!=="?"||!/[!=<:]/.test(pe(3)))){De("negate",D);continue}if(r.nonegate!==!0&&A.index===0){se();continue}}if(D==="+"){if(r.noextglob!==!0&&pe()==="("&&pe(2)!=="?"){De("plus",D);continue}if(F&&F.value==="("||r.regex===!1){Ae({type:"plus",value:D,output:f});continue}if(F&&(F.type==="bracket"||F.type==="paren"||F.type==="brace")||A.parens>0){Ae({type:"plus",value:D});continue}Ae({type:"plus",value:f});continue}if(D==="@"){if(r.noextglob!==!0&&pe()==="("&&pe(2)!=="?"){Ae({type:"at",extglob:!0,value:D,output:""});continue}Ae({type:"text",value:D});continue}if(D!=="*"){(D==="$"||D==="^")&&(D=`\\${D}`);let ee=pde.exec(Pe());ee&&(D+=ee[0],A.index+=ee[0].length),Ae({type:"text",value:D});continue}if(F&&(F.type==="globstar"||F.star===!0)){F.type="star",F.star=!0,F.value+=D,F.output=q,A.backtrack=!0,A.globstar=!0,qe(D);continue}let G=Pe();if(r.noextglob!==!0&&/^\([^?]/.test(G)){De("star",D);continue}if(F.type==="star"){if(r.noglobstar===!0){qe(D);continue}let ee=F.prev,Ue=ee.prev,Oe=ee.type==="slash"||ee.type==="bos",vt=Ue&&(Ue.type==="star"||Ue.type==="globstar");if(r.bash===!0&&(!Oe||G[0]&&G[0]!=="/")){Ae({type:"star",value:D,output:""});continue}let dt=A.braces>0&&(ee.type==="comma"||ee.type==="brace"),ri=V.length&&(ee.type==="pipe"||ee.type==="paren");if(!Oe&&ee.type!=="paren"&&!dt&&!ri){Ae({type:"star",value:D,output:""});continue}for(;G.slice(0,3)==="/**";){let ii=t[A.index+4];if(ii&&ii!=="/")break;G=G.slice(3),qe("/**",3)}if(ee.type==="bos"&&he()){F.type="globstar",F.value+=D,F.output=K(r),A.output=F.output,A.globstar=!0,qe(D);continue}if(ee.type==="slash"&&ee.prev.type!=="bos"&&!vt&&he()){A.output=A.output.slice(0,-(ee.output+F.output).length),ee.output=`(?:${ee.output}`,F.type="globstar",F.output=K(r)+(r.strictSlashes?")":"|$)"),F.value+=D,A.globstar=!0,A.output+=ee.output+F.output,qe(D);continue}if(ee.type==="slash"&&ee.prev.type!=="bos"&&G[0]==="/"){let ii=G[1]!==void 0?"|$":"";A.output=A.output.slice(0,-(ee.output+F.output).length),ee.output=`(?:${ee.output}`,F.type="globstar",F.output=`${K(r)}${h}|${h}${ii})`,F.value+=D,A.output+=ee.output+F.output,A.globstar=!0,qe(D+Ne()),Ae({type:"slash",value:"/",output:""});continue}if(ee.type==="bos"&&G[0]==="/"){F.type="globstar",F.value+=D,F.output=`(?:^|${h}|${K(r)}${h})`,A.output=F.output,A.globstar=!0,qe(D+Ne()),Ae({type:"slash",value:"/",output:""});continue}A.output=A.output.slice(0,-F.output.length),F.type="globstar",F.output=K(r),F.value+=D,A.output+=F.output,A.globstar=!0,qe(D);continue}let Ce={type:"star",value:D,output:q};if(r.bash===!0){Ce.output=".*?",(F.type==="bos"||F.type==="slash")&&(Ce.output=J+Ce.output),Ae(Ce);continue}if(F&&(F.type==="bracket"||F.type==="paren")&&r.regex===!0){Ce.output=D,Ae(Ce);continue}(A.index===A.start||F.type==="slash"||F.type==="dot")&&(F.type==="dot"?(A.output+=E,F.output+=E):r.dot===!0?(A.output+=B,F.output+=B):(A.output+=J,F.output+=J),pe()!=="*"&&(A.output+=p,F.output+=p)),Ae(Ce)}for(;A.brackets>0;){if(r.strictBrackets===!0)throw new SyntaxError(au("closing","]"));A.output=Fn.escapeLast(A.output,"["),ae("brackets")}for(;A.parens>0;){if(r.strictBrackets===!0)throw new SyntaxError(au("closing",")"));A.output=Fn.escapeLast(A.output,"("),ae("parens")}for(;A.braces>0;){if(r.strictBrackets===!0)throw new SyntaxError(au("closing","}"));A.output=Fn.escapeLast(A.output,"{"),ae("braces")}if(r.strictSlashes!==!0&&(F.type==="star"||F.type==="bracket")&&Ae({type:"maybe_slash",value:"",output:`${h}?`}),A.backtrack===!0){A.output="";for(let G of A.tokens)A.output+=G.output!=null?G.output:G.value,G.suffix&&(A.output+=G.suffix)}return A};eU.fastpaths=(t,e)=>{let r=P({},e),i=typeof r.maxLength=="number"?Math.min(OI,r.maxLength):OI,n=t.length;if(n>i)throw new SyntaxError(`Input length: ${n}, exceeds maximum allowed length: ${i}`);t=$1[t]||t;let s=Fn.isWindows(e),{DOT_LITERAL:o,SLASH_LITERAL:a,ONE_CHAR:l,DOTS_SLASH:c,NO_DOT:u,NO_DOTS:g,NO_DOTS_SLASH:f,STAR:h,START_ANCHOR:p}=MI.globChars(s),d=r.dot?g:u,m=r.dot?f:u,E=r.capture?"":"?:",B={negated:!1,prefix:""},b=r.bash===!0?".*?":h;r.capture&&(b=`(${b})`);let R=J=>J.noglobstar===!0?b:`(${E}(?:(?!${p}${J.dot?c:o}).)*?)`,H=J=>{switch(J){case"*":return`${d}${l}${b}`;case".*":return`${o}${l}${b}`;case"*.*":return`${d}${b}${o}${l}${b}`;case"*/*":return`${d}${b}${a}${l}${m}${b}`;case"**":return d+R(r);case"**/*":return`(?:${d}${R(r)}${a})?${m}${l}${b}`;case"**/*.*":return`(?:${d}${R(r)}${a})?${m}${b}${o}${l}${b}`;case"**/.*":return`(?:${d}${R(r)}${a})?${o}${l}${b}`;default:{let ne=/^(.*?)\.(\w+)$/.exec(J);if(!ne)return;let q=H(ne[1]);return q?q+o+ne[2]:void 0}}},L=Fn.removePrefix(t,B),K=H(L);return K&&r.strictSlashes!==!0&&(K+=`${a}?`),K};Z1.exports=eU});var iU=I((W$e,rU)=>{"use strict";var mde=require("path"),Ide=X1(),tv=tU(),rv=Ch(),Ede=dh(),yde=t=>t&&typeof t=="object"&&!Array.isArray(t),Dr=(t,e,r=!1)=>{if(Array.isArray(t)){let u=t.map(f=>Dr(f,e,r));return f=>{for(let h of u){let p=h(f);if(p)return p}return!1}}let i=yde(t)&&t.tokens&&t.input;if(t===""||typeof t!="string"&&!i)throw new TypeError("Expected pattern to be a non-empty string");let n=e||{},s=rv.isWindows(e),o=i?Dr.compileRe(t,e):Dr.makeRe(t,e,!1,!0),a=o.state;delete o.state;let l=()=>!1;if(n.ignore){let u=_(P({},e),{ignore:null,onMatch:null,onResult:null});l=Dr(n.ignore,u,r)}let c=(u,g=!1)=>{let{isMatch:f,match:h,output:p}=Dr.test(u,o,e,{glob:t,posix:s}),d={glob:t,state:a,regex:o,posix:s,input:u,output:p,match:h,isMatch:f};return typeof n.onResult=="function"&&n.onResult(d),f===!1?(d.isMatch=!1,g?d:!1):l(u)?(typeof n.onIgnore=="function"&&n.onIgnore(d),d.isMatch=!1,g?d:!1):(typeof n.onMatch=="function"&&n.onMatch(d),g?d:!0)};return r&&(c.state=a),c};Dr.test=(t,e,r,{glob:i,posix:n}={})=>{if(typeof t!="string")throw new TypeError("Expected input to be a string");if(t==="")return{isMatch:!1,output:""};let s=r||{},o=s.format||(n?rv.toPosixSlashes:null),a=t===i,l=a&&o?o(t):t;return a===!1&&(l=o?o(t):t,a=l===i),(a===!1||s.capture===!0)&&(s.matchBase===!0||s.basename===!0?a=Dr.matchBase(t,e,r,n):a=e.exec(l)),{isMatch:Boolean(a),match:a,output:l}};Dr.matchBase=(t,e,r,i=rv.isWindows(r))=>(e instanceof RegExp?e:Dr.makeRe(e,r)).test(mde.basename(t));Dr.isMatch=(t,e,r)=>Dr(e,r)(t);Dr.parse=(t,e)=>Array.isArray(t)?t.map(r=>Dr.parse(r,e)):tv(t,_(P({},e),{fastpaths:!1}));Dr.scan=(t,e)=>Ide(t,e);Dr.compileRe=(t,e,r=!1,i=!1)=>{if(r===!0)return t.output;let n=e||{},s=n.contains?"":"^",o=n.contains?"":"$",a=`${s}(?:${t.output})${o}`;t&&t.negated===!0&&(a=`^(?!${a}).*$`);let l=Dr.toRegex(a,e);return i===!0&&(l.state=t),l};Dr.makeRe=(t,e,r=!1,i=!1)=>{if(!t||typeof t!="string")throw new TypeError("Expected a non-empty string");let n=e||{},s={negated:!1,fastpaths:!0},o="",a;return t.startsWith("./")&&(t=t.slice(2),o=s.prefix="./"),n.fastpaths!==!1&&(t[0]==="."||t[0]==="*")&&(a=tv.fastpaths(t,e)),a===void 0?(s=tv(t,e),s.prefix=o+(s.prefix||"")):s.output=a,Dr.compileRe(s,e,r,i)};Dr.toRegex=(t,e)=>{try{let r=e||{};return new RegExp(t,r.flags||(r.nocase?"i":""))}catch(r){if(e&&e.debug===!0)throw r;return/$^/}};Dr.constants=Ede;rU.exports=Dr});var iv=I((z$e,nU)=>{"use strict";nU.exports=iU()});var Nn=I((V$e,sU)=>{"use strict";var oU=require("util"),aU=M1(),no=iv(),nv=Ch(),AU=t=>typeof t=="string"&&(t===""||t==="./"),pr=(t,e,r)=>{e=[].concat(e),t=[].concat(t);let i=new Set,n=new Set,s=new Set,o=0,a=u=>{s.add(u.output),r&&r.onResult&&r.onResult(u)};for(let u=0;u!i.has(u));if(r&&c.length===0){if(r.failglob===!0)throw new Error(`No matches found for "${e.join(", ")}"`);if(r.nonull===!0||r.nullglob===!0)return r.unescape?e.map(u=>u.replace(/\\/g,"")):e}return c};pr.match=pr;pr.matcher=(t,e)=>no(t,e);pr.isMatch=(t,e,r)=>no(e,r)(t);pr.any=pr.isMatch;pr.not=(t,e,r={})=>{e=[].concat(e).map(String);let i=new Set,n=[],s=a=>{r.onResult&&r.onResult(a),n.push(a.output)},o=pr(t,e,_(P({},r),{onResult:s}));for(let a of n)o.includes(a)||i.add(a);return[...i]};pr.contains=(t,e,r)=>{if(typeof t!="string")throw new TypeError(`Expected a string: "${oU.inspect(t)}"`);if(Array.isArray(e))return e.some(i=>pr.contains(t,i,r));if(typeof e=="string"){if(AU(t)||AU(e))return!1;if(t.includes(e)||t.startsWith("./")&&t.slice(2).includes(e))return!0}return pr.isMatch(t,e,_(P({},r),{contains:!0}))};pr.matchKeys=(t,e,r)=>{if(!nv.isObject(t))throw new TypeError("Expected the first argument to be an object");let i=pr(Object.keys(t),e,r),n={};for(let s of i)n[s]=t[s];return n};pr.some=(t,e,r)=>{let i=[].concat(t);for(let n of[].concat(e)){let s=no(String(n),r);if(i.some(o=>s(o)))return!0}return!1};pr.every=(t,e,r)=>{let i=[].concat(t);for(let n of[].concat(e)){let s=no(String(n),r);if(!i.every(o=>s(o)))return!1}return!0};pr.all=(t,e,r)=>{if(typeof t!="string")throw new TypeError(`Expected a string: "${oU.inspect(t)}"`);return[].concat(e).every(i=>no(i,r)(t))};pr.capture=(t,e,r)=>{let i=nv.isWindows(r),s=no.makeRe(String(t),_(P({},r),{capture:!0})).exec(i?nv.toPosixSlashes(e):e);if(s)return s.slice(1).map(o=>o===void 0?"":o)};pr.makeRe=(...t)=>no.makeRe(...t);pr.scan=(...t)=>no.scan(...t);pr.parse=(t,e)=>{let r=[];for(let i of[].concat(t||[]))for(let n of aU(String(i),e))r.push(no.parse(n,e));return r};pr.braces=(t,e)=>{if(typeof t!="string")throw new TypeError("Expected a string");return e&&e.nobrace===!0||!/\{.*\}/.test(t)?[t]:aU(t,e)};pr.braceExpand=(t,e)=>{if(typeof t!="string")throw new TypeError("Expected a string");return pr.braces(t,_(P({},e),{expand:!0}))};sU.exports=pr});var cU=I((_$e,lU)=>{"use strict";lU.exports=({onlyFirst:t=!1}={})=>{let e=["[\\u001B\\u009B][[\\]()#;?]*(?:(?:(?:[a-zA-Z\\d]*(?:;[-a-zA-Z\\d\\/#&.:=?%@~_]*)*)?\\u0007)","(?:(?:\\d{1,4}(?:;\\d{0,4})*)?[\\dA-PR-TZcf-ntqry=><~]))"].join("|");return new RegExp(e,t?void 0:"g")}});var gU=I((X$e,uU)=>{"use strict";var wde=cU();uU.exports=t=>typeof t=="string"?t.replace(wde(),""):t});var lu={};it(lu,{KeyRelationship:()=>Bl,applyCascade:()=>fv,base64RegExp:()=>CU,colorStringAlphaRegExp:()=>dU,colorStringRegExp:()=>pU,computeKey:()=>rA,getPrintable:()=>Mr,hasExactLength:()=>wU,hasForbiddenKeys:()=>eCe,hasKeyRelationship:()=>pv,hasMaxLength:()=>Mde,hasMinLength:()=>Tde,hasMutuallyExclusiveKeys:()=>tCe,hasRequiredKeys:()=>$de,hasUniqueItems:()=>Ode,isArray:()=>xde,isAtLeast:()=>Hde,isAtMost:()=>Gde,isBase64:()=>Xde,isBoolean:()=>bde,isDate:()=>Sde,isDict:()=>Pde,isEnum:()=>Yi,isHexColor:()=>_de,isISO8601:()=>Vde,isInExclusiveRange:()=>Yde,isInInclusiveRange:()=>jde,isInstanceOf:()=>Rde,isInteger:()=>qde,isJSON:()=>Zde,isLiteral:()=>Bde,isLowerCase:()=>Jde,isNegative:()=>Kde,isNullable:()=>Lde,isNumber:()=>vde,isObject:()=>Dde,isOneOf:()=>Fde,isOptional:()=>Nde,isPositive:()=>Ude,isString:()=>gv,isTuple:()=>kde,isUUID4:()=>zde,isUnknown:()=>yU,isUpperCase:()=>Wde,iso8601RegExp:()=>uv,makeCoercionFn:()=>wl,makeSetter:()=>EU,makeTrait:()=>IU,makeValidator:()=>Ct,matchesRegExp:()=>hv,plural:()=>GI,pushError:()=>at,simpleKeyRegExp:()=>hU,uuid4RegExp:()=>mU});function Ct({test:t}){return IU(t)()}function Mr(t){return t===null?"null":t===void 0?"undefined":t===""?"an empty string":JSON.stringify(t)}function rA(t,e){var r,i,n;return typeof e=="number"?`${(r=t==null?void 0:t.p)!==null&&r!==void 0?r:"."}[${e}]`:hU.test(e)?`${(i=t==null?void 0:t.p)!==null&&i!==void 0?i:""}.${e}`:`${(n=t==null?void 0:t.p)!==null&&n!==void 0?n:"."}[${JSON.stringify(e)}]`}function wl(t,e){return r=>{let i=t[e];return t[e]=r,wl(t,e).bind(null,i)}}function EU(t,e){return r=>{t[e]=r}}function GI(t,e,r){return t===1?e:r}function at({errors:t,p:e}={},r){return t==null||t.push(`${e!=null?e:"."}: ${r}`),!1}function Bde(t){return Ct({test:(e,r)=>e!==t?at(r,`Expected a literal (got ${Mr(t)})`):!0})}function Yi(t){let e=Array.isArray(t)?t:Object.values(t),r=new Set(e);return Ct({test:(i,n)=>r.has(i)?!0:at(n,`Expected a valid enumeration value (got ${Mr(i)})`)})}var hU,pU,dU,CU,mU,uv,IU,yU,gv,Qde,bde,vde,Sde,xde,kde,Pde,Dde,Rde,Fde,fv,Nde,Lde,Tde,Mde,wU,Ode,Kde,Ude,Hde,Gde,jde,Yde,qde,hv,Jde,Wde,zde,Vde,_de,Xde,Zde,$de,eCe,tCe,Bl,rCe,pv,Ss=Yfe(()=>{hU=/^[a-zA-Z_][a-zA-Z0-9_]*$/,pU=/^#[0-9a-f]{6}$/i,dU=/^#[0-9a-f]{6}([0-9a-f]{2})?$/i,CU=/^(?:[A-Za-z0-9+/]{4})*(?:[A-Za-z0-9+/]{2}==|[A-Za-z0-9+/]{3}=)?$/,mU=/^[a-f0-9]{8}-[a-f0-9]{4}-4[a-f0-9]{3}-[89aAbB][a-f0-9]{3}-[a-f0-9]{12}$/i,uv=/^(?:[1-9]\d{3}(-?)(?:(?:0[1-9]|1[0-2])\1(?:0[1-9]|1\d|2[0-8])|(?:0[13-9]|1[0-2])\1(?:29|30)|(?:0[13578]|1[02])(?:\1)31|00[1-9]|0[1-9]\d|[12]\d{2}|3(?:[0-5]\d|6[0-5]))|(?:[1-9]\d(?:0[48]|[2468][048]|[13579][26])|(?:[2468][048]|[13579][26])00)(?:(-?)02(?:\2)29|-?366))T(?:[01]\d|2[0-3])(:?)[0-5]\d(?:\3[0-5]\d)?(?:Z|[+-][01]\d(?:\3[0-5]\d)?)$/,IU=t=>()=>t;yU=()=>Ct({test:(t,e)=>!0});gv=()=>Ct({test:(t,e)=>typeof t!="string"?at(e,`Expected a string (got ${Mr(t)})`):!0});Qde=new Map([["true",!0],["True",!0],["1",!0],[1,!0],["false",!1],["False",!1],["0",!1],[0,!1]]),bde=()=>Ct({test:(t,e)=>{var r;if(typeof t!="boolean"){if(typeof(e==null?void 0:e.coercions)!="undefined"){if(typeof(e==null?void 0:e.coercion)=="undefined")return at(e,"Unbound coercion result");let i=Qde.get(t);if(typeof i!="undefined")return e.coercions.push([(r=e.p)!==null&&r!==void 0?r:".",e.coercion.bind(null,i)]),!0}return at(e,`Expected a boolean (got ${Mr(t)})`)}return!0}}),vde=()=>Ct({test:(t,e)=>{var r;if(typeof t!="number"){if(typeof(e==null?void 0:e.coercions)!="undefined"){if(typeof(e==null?void 0:e.coercion)=="undefined")return at(e,"Unbound coercion result");let i;if(typeof t=="string"){let n;try{n=JSON.parse(t)}catch(s){}if(typeof n=="number")if(JSON.stringify(n)===t)i=n;else return at(e,`Received a number that can't be safely represented by the runtime (${t})`)}if(typeof i!="undefined")return e.coercions.push([(r=e.p)!==null&&r!==void 0?r:".",e.coercion.bind(null,i)]),!0}return at(e,`Expected a number (got ${Mr(t)})`)}return!0}}),Sde=()=>Ct({test:(t,e)=>{var r;if(!(t instanceof Date)){if(typeof(e==null?void 0:e.coercions)!="undefined"){if(typeof(e==null?void 0:e.coercion)=="undefined")return at(e,"Unbound coercion result");let i;if(typeof t=="string"&&uv.test(t))i=new Date(t);else{let n;if(typeof t=="string"){let s;try{s=JSON.parse(t)}catch(o){}typeof s=="number"&&(n=s)}else typeof t=="number"&&(n=t);if(typeof n!="undefined")if(Number.isSafeInteger(n)||!Number.isSafeInteger(n*1e3))i=new Date(n*1e3);else return at(e,`Received a timestamp that can't be safely represented by the runtime (${t})`)}if(typeof i!="undefined")return e.coercions.push([(r=e.p)!==null&&r!==void 0?r:".",e.coercion.bind(null,i)]),!0}return at(e,`Expected a date (got ${Mr(t)})`)}return!0}}),xde=(t,{delimiter:e}={})=>Ct({test:(r,i)=>{var n;if(typeof r=="string"&&typeof e!="undefined"&&typeof(i==null?void 0:i.coercions)!="undefined"){if(typeof(i==null?void 0:i.coercion)=="undefined")return at(i,"Unbound coercion result");r=r.split(e),i.coercions.push([(n=i.p)!==null&&n!==void 0?n:".",i.coercion.bind(null,r)])}if(!Array.isArray(r))return at(i,`Expected an array (got ${Mr(r)})`);let s=!0;for(let o=0,a=r.length;o{let r=wU(t.length);return Ct({test:(i,n)=>{var s;if(typeof i=="string"&&typeof e!="undefined"&&typeof(n==null?void 0:n.coercions)!="undefined"){if(typeof(n==null?void 0:n.coercion)=="undefined")return at(n,"Unbound coercion result");i=i.split(e),n.coercions.push([(s=n.p)!==null&&s!==void 0?s:".",n.coercion.bind(null,i)])}if(!Array.isArray(i))return at(n,`Expected a tuple (got ${Mr(i)})`);let o=r(i,Object.assign({},n));for(let a=0,l=i.length;aCt({test:(r,i)=>{if(typeof r!="object"||r===null)return at(i,`Expected an object (got ${Mr(r)})`);let n=Object.keys(r),s=!0;for(let o=0,a=n.length;o{let r=Object.keys(t);return Ct({test:(i,n)=>{if(typeof i!="object"||i===null)return at(n,`Expected an object (got ${Mr(i)})`);let s=new Set([...r,...Object.keys(i)]),o={},a=!0;for(let l of s){if(l==="constructor"||l==="__proto__")a=at(Object.assign(Object.assign({},n),{p:rA(n,l)}),"Unsafe property name");else{let c=Object.prototype.hasOwnProperty.call(t,l)?t[l]:void 0,u=Object.prototype.hasOwnProperty.call(i,l)?i[l]:void 0;typeof c!="undefined"?a=c(u,Object.assign(Object.assign({},n),{p:rA(n,l),coercion:wl(i,l)}))&&a:e===null?a=at(Object.assign(Object.assign({},n),{p:rA(n,l)}),`Extraneous property (got ${Mr(u)})`):Object.defineProperty(o,l,{enumerable:!0,get:()=>u,set:EU(i,l)})}if(!a&&(n==null?void 0:n.errors)==null)break}return e!==null&&(a||(n==null?void 0:n.errors)!=null)&&(a=e(o,n)&&a),a}})},Rde=t=>Ct({test:(e,r)=>e instanceof t?!0:at(r,`Expected an instance of ${t.name} (got ${Mr(e)})`)}),Fde=(t,{exclusive:e=!1}={})=>Ct({test:(r,i)=>{var n,s,o;let a=[],l=typeof(i==null?void 0:i.errors)!="undefined"?[]:void 0;for(let c=0,u=t.length;c1?at(i,`Expected to match exactly a single predicate (matched ${a.join(", ")})`):(o=i==null?void 0:i.errors)===null||o===void 0||o.push(...l),!1}}),fv=(t,e)=>Ct({test:(r,i)=>{var n,s;let o={value:r},a=typeof(i==null?void 0:i.coercions)!="undefined"?wl(o,"value"):void 0,l=typeof(i==null?void 0:i.coercions)!="undefined"?[]:void 0;if(!t(r,Object.assign(Object.assign({},i),{coercion:a,coercions:l})))return!1;let c=[];if(typeof l!="undefined")for(let[,u]of l)c.push(u());try{if(typeof(i==null?void 0:i.coercions)!="undefined"){if(o.value!==r){if(typeof(i==null?void 0:i.coercion)=="undefined")return at(i,"Unbound coercion result");i.coercions.push([(n=i.p)!==null&&n!==void 0?n:".",i.coercion.bind(null,o.value)])}(s=i==null?void 0:i.coercions)===null||s===void 0||s.push(...l)}return e.every(u=>u(o.value,i))}finally{for(let u of c)u()}}}),Nde=t=>Ct({test:(e,r)=>typeof e=="undefined"?!0:t(e,r)}),Lde=t=>Ct({test:(e,r)=>e===null?!0:t(e,r)}),Tde=t=>Ct({test:(e,r)=>e.length>=t?!0:at(r,`Expected to have a length of at least ${t} elements (got ${e.length})`)}),Mde=t=>Ct({test:(e,r)=>e.length<=t?!0:at(r,`Expected to have a length of at most ${t} elements (got ${e.length})`)}),wU=t=>Ct({test:(e,r)=>e.length!==t?at(r,`Expected to have a length of exactly ${t} elements (got ${e.length})`):!0}),Ode=({map:t}={})=>Ct({test:(e,r)=>{let i=new Set,n=new Set;for(let s=0,o=e.length;sCt({test:(t,e)=>t<=0?!0:at(e,`Expected to be negative (got ${t})`)}),Ude=()=>Ct({test:(t,e)=>t>=0?!0:at(e,`Expected to be positive (got ${t})`)}),Hde=t=>Ct({test:(e,r)=>e>=t?!0:at(r,`Expected to be at least ${t} (got ${e})`)}),Gde=t=>Ct({test:(e,r)=>e<=t?!0:at(r,`Expected to be at most ${t} (got ${e})`)}),jde=(t,e)=>Ct({test:(r,i)=>r>=t&&r<=e?!0:at(i,`Expected to be in the [${t}; ${e}] range (got ${r})`)}),Yde=(t,e)=>Ct({test:(r,i)=>r>=t&&rCt({test:(e,r)=>e!==Math.round(e)?at(r,`Expected to be an integer (got ${e})`):Number.isSafeInteger(e)?!0:at(r,`Expected to be a safe integer (got ${e})`)}),hv=t=>Ct({test:(e,r)=>t.test(e)?!0:at(r,`Expected to match the pattern ${t.toString()} (got ${Mr(e)})`)}),Jde=()=>Ct({test:(t,e)=>t!==t.toLowerCase()?at(e,`Expected to be all-lowercase (got ${t})`):!0}),Wde=()=>Ct({test:(t,e)=>t!==t.toUpperCase()?at(e,`Expected to be all-uppercase (got ${t})`):!0}),zde=()=>Ct({test:(t,e)=>mU.test(t)?!0:at(e,`Expected to be a valid UUID v4 (got ${Mr(t)})`)}),Vde=()=>Ct({test:(t,e)=>uv.test(t)?!1:at(e,`Expected to be a valid ISO 8601 date string (got ${Mr(t)})`)}),_de=({alpha:t=!1})=>Ct({test:(e,r)=>(t?pU.test(e):dU.test(e))?!0:at(r,`Expected to be a valid hexadecimal color string (got ${Mr(e)})`)}),Xde=()=>Ct({test:(t,e)=>CU.test(t)?!0:at(e,`Expected to be a valid base 64 string (got ${Mr(t)})`)}),Zde=(t=yU())=>Ct({test:(e,r)=>{let i;try{i=JSON.parse(e)}catch(n){return at(r,`Expected to be a valid JSON string (got ${Mr(e)})`)}return t(i,r)}}),$de=t=>{let e=new Set(t);return Ct({test:(r,i)=>{let n=new Set(Object.keys(r)),s=[];for(let o of e)n.has(o)||s.push(o);return s.length>0?at(i,`Missing required ${GI(s.length,"property","properties")} ${s.map(o=>`"${o}"`).join(", ")}`):!0}})},eCe=t=>{let e=new Set(t);return Ct({test:(r,i)=>{let n=new Set(Object.keys(r)),s=[];for(let o of e)n.has(o)&&s.push(o);return s.length>0?at(i,`Forbidden ${GI(s.length,"property","properties")} ${s.map(o=>`"${o}"`).join(", ")}`):!0}})},tCe=t=>{let e=new Set(t);return Ct({test:(r,i)=>{let n=new Set(Object.keys(r)),s=[];for(let o of e)n.has(o)&&s.push(o);return s.length>1?at(i,`Mutually exclusive properties ${s.map(o=>`"${o}"`).join(", ")}`):!0}})};(function(t){t.Forbids="Forbids",t.Requires="Requires"})(Bl||(Bl={}));rCe={[Bl.Forbids]:{expect:!1,message:"forbids using"},[Bl.Requires]:{expect:!0,message:"requires using"}},pv=(t,e,r,{ignore:i=[]}={})=>{let n=new Set(i),s=new Set(r),o=rCe[e];return Ct({test:(a,l)=>{let c=new Set(Object.keys(a));if(!c.has(t)||n.has(a[t]))return!0;let u=[];for(let g of s)(c.has(g)&&!n.has(a[g]))!==o.expect&&u.push(g);return u.length>=1?at(l,`Property "${t}" ${o.message} ${GI(u.length,"property","properties")} ${u.map(g=>`"${g}"`).join(", ")}`):!0}})}});var Sh=I(($et,OU)=>{var mCe="2.0.0",ICe=256,ECe=Number.MAX_SAFE_INTEGER||9007199254740991,yCe=16;OU.exports={SEMVER_SPEC_VERSION:mCe,MAX_LENGTH:ICe,MAX_SAFE_INTEGER:ECe,MAX_SAFE_COMPONENT_LENGTH:yCe}});var xh=I((ett,KU)=>{var wCe=typeof process=="object"&&process.env&&process.env.NODE_DEBUG&&/\bsemver\b/i.test(process.env.NODE_DEBUG)?(...t)=>console.error("SEMVER",...t):()=>{};KU.exports=wCe});var Ql=I((iA,UU)=>{var{MAX_SAFE_COMPONENT_LENGTH:yv}=Sh(),BCe=xh();iA=UU.exports={};var QCe=iA.re=[],Je=iA.src=[],We=iA.t={},bCe=0,mt=(t,e,r)=>{let i=bCe++;BCe(i,e),We[t]=i,Je[i]=e,QCe[i]=new RegExp(e,r?"g":void 0)};mt("NUMERICIDENTIFIER","0|[1-9]\\d*");mt("NUMERICIDENTIFIERLOOSE","[0-9]+");mt("NONNUMERICIDENTIFIER","\\d*[a-zA-Z-][a-zA-Z0-9-]*");mt("MAINVERSION",`(${Je[We.NUMERICIDENTIFIER]})\\.(${Je[We.NUMERICIDENTIFIER]})\\.(${Je[We.NUMERICIDENTIFIER]})`);mt("MAINVERSIONLOOSE",`(${Je[We.NUMERICIDENTIFIERLOOSE]})\\.(${Je[We.NUMERICIDENTIFIERLOOSE]})\\.(${Je[We.NUMERICIDENTIFIERLOOSE]})`);mt("PRERELEASEIDENTIFIER",`(?:${Je[We.NUMERICIDENTIFIER]}|${Je[We.NONNUMERICIDENTIFIER]})`);mt("PRERELEASEIDENTIFIERLOOSE",`(?:${Je[We.NUMERICIDENTIFIERLOOSE]}|${Je[We.NONNUMERICIDENTIFIER]})`);mt("PRERELEASE",`(?:-(${Je[We.PRERELEASEIDENTIFIER]}(?:\\.${Je[We.PRERELEASEIDENTIFIER]})*))`);mt("PRERELEASELOOSE",`(?:-?(${Je[We.PRERELEASEIDENTIFIERLOOSE]}(?:\\.${Je[We.PRERELEASEIDENTIFIERLOOSE]})*))`);mt("BUILDIDENTIFIER","[0-9A-Za-z-]+");mt("BUILD",`(?:\\+(${Je[We.BUILDIDENTIFIER]}(?:\\.${Je[We.BUILDIDENTIFIER]})*))`);mt("FULLPLAIN",`v?${Je[We.MAINVERSION]}${Je[We.PRERELEASE]}?${Je[We.BUILD]}?`);mt("FULL",`^${Je[We.FULLPLAIN]}$`);mt("LOOSEPLAIN",`[v=\\s]*${Je[We.MAINVERSIONLOOSE]}${Je[We.PRERELEASELOOSE]}?${Je[We.BUILD]}?`);mt("LOOSE",`^${Je[We.LOOSEPLAIN]}$`);mt("GTLT","((?:<|>)?=?)");mt("XRANGEIDENTIFIERLOOSE",`${Je[We.NUMERICIDENTIFIERLOOSE]}|x|X|\\*`);mt("XRANGEIDENTIFIER",`${Je[We.NUMERICIDENTIFIER]}|x|X|\\*`);mt("XRANGEPLAIN",`[v=\\s]*(${Je[We.XRANGEIDENTIFIER]})(?:\\.(${Je[We.XRANGEIDENTIFIER]})(?:\\.(${Je[We.XRANGEIDENTIFIER]})(?:${Je[We.PRERELEASE]})?${Je[We.BUILD]}?)?)?`);mt("XRANGEPLAINLOOSE",`[v=\\s]*(${Je[We.XRANGEIDENTIFIERLOOSE]})(?:\\.(${Je[We.XRANGEIDENTIFIERLOOSE]})(?:\\.(${Je[We.XRANGEIDENTIFIERLOOSE]})(?:${Je[We.PRERELEASELOOSE]})?${Je[We.BUILD]}?)?)?`);mt("XRANGE",`^${Je[We.GTLT]}\\s*${Je[We.XRANGEPLAIN]}$`);mt("XRANGELOOSE",`^${Je[We.GTLT]}\\s*${Je[We.XRANGEPLAINLOOSE]}$`);mt("COERCE",`(^|[^\\d])(\\d{1,${yv}})(?:\\.(\\d{1,${yv}}))?(?:\\.(\\d{1,${yv}}))?(?:$|[^\\d])`);mt("COERCERTL",Je[We.COERCE],!0);mt("LONETILDE","(?:~>?)");mt("TILDETRIM",`(\\s*)${Je[We.LONETILDE]}\\s+`,!0);iA.tildeTrimReplace="$1~";mt("TILDE",`^${Je[We.LONETILDE]}${Je[We.XRANGEPLAIN]}$`);mt("TILDELOOSE",`^${Je[We.LONETILDE]}${Je[We.XRANGEPLAINLOOSE]}$`);mt("LONECARET","(?:\\^)");mt("CARETTRIM",`(\\s*)${Je[We.LONECARET]}\\s+`,!0);iA.caretTrimReplace="$1^";mt("CARET",`^${Je[We.LONECARET]}${Je[We.XRANGEPLAIN]}$`);mt("CARETLOOSE",`^${Je[We.LONECARET]}${Je[We.XRANGEPLAINLOOSE]}$`);mt("COMPARATORLOOSE",`^${Je[We.GTLT]}\\s*(${Je[We.LOOSEPLAIN]})$|^$`);mt("COMPARATOR",`^${Je[We.GTLT]}\\s*(${Je[We.FULLPLAIN]})$|^$`);mt("COMPARATORTRIM",`(\\s*)${Je[We.GTLT]}\\s*(${Je[We.LOOSEPLAIN]}|${Je[We.XRANGEPLAIN]})`,!0);iA.comparatorTrimReplace="$1$2$3";mt("HYPHENRANGE",`^\\s*(${Je[We.XRANGEPLAIN]})\\s+-\\s+(${Je[We.XRANGEPLAIN]})\\s*$`);mt("HYPHENRANGELOOSE",`^\\s*(${Je[We.XRANGEPLAINLOOSE]})\\s+-\\s+(${Je[We.XRANGEPLAINLOOSE]})\\s*$`);mt("STAR","(<|>)?=?\\s*\\*");mt("GTE0","^\\s*>=\\s*0.0.0\\s*$");mt("GTE0PRE","^\\s*>=\\s*0.0.0-0\\s*$")});var kh=I((ttt,HU)=>{var vCe=["includePrerelease","loose","rtl"],SCe=t=>t?typeof t!="object"?{loose:!0}:vCe.filter(e=>t[e]).reduce((e,r)=>(e[r]=!0,e),{}):{};HU.exports=SCe});var zI=I((rtt,GU)=>{var jU=/^[0-9]+$/,YU=(t,e)=>{let r=jU.test(t),i=jU.test(e);return r&&i&&(t=+t,e=+e),t===e?0:r&&!i?-1:i&&!r?1:tYU(e,t);GU.exports={compareIdentifiers:YU,rcompareIdentifiers:xCe}});var bi=I((itt,qU)=>{var VI=xh(),{MAX_LENGTH:JU,MAX_SAFE_INTEGER:_I}=Sh(),{re:WU,t:zU}=Ql(),kCe=kh(),{compareIdentifiers:Ph}=zI(),_n=class{constructor(e,r){if(r=kCe(r),e instanceof _n){if(e.loose===!!r.loose&&e.includePrerelease===!!r.includePrerelease)return e;e=e.version}else if(typeof e!="string")throw new TypeError(`Invalid Version: ${e}`);if(e.length>JU)throw new TypeError(`version is longer than ${JU} characters`);VI("SemVer",e,r),this.options=r,this.loose=!!r.loose,this.includePrerelease=!!r.includePrerelease;let i=e.trim().match(r.loose?WU[zU.LOOSE]:WU[zU.FULL]);if(!i)throw new TypeError(`Invalid Version: ${e}`);if(this.raw=e,this.major=+i[1],this.minor=+i[2],this.patch=+i[3],this.major>_I||this.major<0)throw new TypeError("Invalid major version");if(this.minor>_I||this.minor<0)throw new TypeError("Invalid minor version");if(this.patch>_I||this.patch<0)throw new TypeError("Invalid patch version");i[4]?this.prerelease=i[4].split(".").map(n=>{if(/^[0-9]+$/.test(n)){let s=+n;if(s>=0&&s<_I)return s}return n}):this.prerelease=[],this.build=i[5]?i[5].split("."):[],this.format()}format(){return this.version=`${this.major}.${this.minor}.${this.patch}`,this.prerelease.length&&(this.version+=`-${this.prerelease.join(".")}`),this.version}toString(){return this.version}compare(e){if(VI("SemVer.compare",this.version,this.options,e),!(e instanceof _n)){if(typeof e=="string"&&e===this.version)return 0;e=new _n(e,this.options)}return e.version===this.version?0:this.compareMain(e)||this.comparePre(e)}compareMain(e){return e instanceof _n||(e=new _n(e,this.options)),Ph(this.major,e.major)||Ph(this.minor,e.minor)||Ph(this.patch,e.patch)}comparePre(e){if(e instanceof _n||(e=new _n(e,this.options)),this.prerelease.length&&!e.prerelease.length)return-1;if(!this.prerelease.length&&e.prerelease.length)return 1;if(!this.prerelease.length&&!e.prerelease.length)return 0;let r=0;do{let i=this.prerelease[r],n=e.prerelease[r];if(VI("prerelease compare",r,i,n),i===void 0&&n===void 0)return 0;if(n===void 0)return 1;if(i===void 0)return-1;if(i===n)continue;return Ph(i,n)}while(++r)}compareBuild(e){e instanceof _n||(e=new _n(e,this.options));let r=0;do{let i=this.build[r],n=e.build[r];if(VI("prerelease compare",r,i,n),i===void 0&&n===void 0)return 0;if(n===void 0)return 1;if(i===void 0)return-1;if(i===n)continue;return Ph(i,n)}while(++r)}inc(e,r){switch(e){case"premajor":this.prerelease.length=0,this.patch=0,this.minor=0,this.major++,this.inc("pre",r);break;case"preminor":this.prerelease.length=0,this.patch=0,this.minor++,this.inc("pre",r);break;case"prepatch":this.prerelease.length=0,this.inc("patch",r),this.inc("pre",r);break;case"prerelease":this.prerelease.length===0&&this.inc("patch",r),this.inc("pre",r);break;case"major":(this.minor!==0||this.patch!==0||this.prerelease.length===0)&&this.major++,this.minor=0,this.patch=0,this.prerelease=[];break;case"minor":(this.patch!==0||this.prerelease.length===0)&&this.minor++,this.patch=0,this.prerelease=[];break;case"patch":this.prerelease.length===0&&this.patch++,this.prerelease=[];break;case"pre":if(this.prerelease.length===0)this.prerelease=[0];else{let i=this.prerelease.length;for(;--i>=0;)typeof this.prerelease[i]=="number"&&(this.prerelease[i]++,i=-2);i===-1&&this.prerelease.push(0)}r&&(this.prerelease[0]===r?isNaN(this.prerelease[1])&&(this.prerelease=[r,0]):this.prerelease=[r,0]);break;default:throw new Error(`invalid increment argument: ${e}`)}return this.format(),this.raw=this.version,this}};qU.exports=_n});var bl=I((ntt,VU)=>{var{MAX_LENGTH:PCe}=Sh(),{re:_U,t:XU}=Ql(),ZU=bi(),DCe=kh(),RCe=(t,e)=>{if(e=DCe(e),t instanceof ZU)return t;if(typeof t!="string"||t.length>PCe||!(e.loose?_U[XU.LOOSE]:_U[XU.FULL]).test(t))return null;try{return new ZU(t,e)}catch(i){return null}};VU.exports=RCe});var e2=I((stt,$U)=>{var FCe=bl(),NCe=(t,e)=>{let r=FCe(t,e);return r?r.version:null};$U.exports=NCe});var r2=I((ott,t2)=>{var LCe=bl(),TCe=(t,e)=>{let r=LCe(t.trim().replace(/^[=v]+/,""),e);return r?r.version:null};t2.exports=TCe});var n2=I((att,i2)=>{var MCe=bi(),OCe=(t,e,r,i)=>{typeof r=="string"&&(i=r,r=void 0);try{return new MCe(t,r).inc(e,i).version}catch(n){return null}};i2.exports=OCe});var Xn=I((Att,s2)=>{var o2=bi(),KCe=(t,e,r)=>new o2(t,r).compare(new o2(e,r));s2.exports=KCe});var XI=I((ltt,a2)=>{var UCe=Xn(),HCe=(t,e,r)=>UCe(t,e,r)===0;a2.exports=HCe});var c2=I((ctt,A2)=>{var l2=bl(),GCe=XI(),jCe=(t,e)=>{if(GCe(t,e))return null;{let r=l2(t),i=l2(e),n=r.prerelease.length||i.prerelease.length,s=n?"pre":"",o=n?"prerelease":"";for(let a in r)if((a==="major"||a==="minor"||a==="patch")&&r[a]!==i[a])return s+a;return o}};A2.exports=jCe});var g2=I((utt,u2)=>{var YCe=bi(),qCe=(t,e)=>new YCe(t,e).major;u2.exports=qCe});var h2=I((gtt,f2)=>{var JCe=bi(),WCe=(t,e)=>new JCe(t,e).minor;f2.exports=WCe});var d2=I((ftt,p2)=>{var zCe=bi(),VCe=(t,e)=>new zCe(t,e).patch;p2.exports=VCe});var m2=I((htt,C2)=>{var _Ce=bl(),XCe=(t,e)=>{let r=_Ce(t,e);return r&&r.prerelease.length?r.prerelease:null};C2.exports=XCe});var E2=I((ptt,I2)=>{var ZCe=Xn(),$Ce=(t,e,r)=>ZCe(e,t,r);I2.exports=$Ce});var w2=I((dtt,y2)=>{var eme=Xn(),tme=(t,e)=>eme(t,e,!0);y2.exports=tme});var ZI=I((Ctt,B2)=>{var Q2=bi(),rme=(t,e,r)=>{let i=new Q2(t,r),n=new Q2(e,r);return i.compare(n)||i.compareBuild(n)};B2.exports=rme});var v2=I((mtt,b2)=>{var ime=ZI(),nme=(t,e)=>t.sort((r,i)=>ime(r,i,e));b2.exports=nme});var x2=I((Itt,S2)=>{var sme=ZI(),ome=(t,e)=>t.sort((r,i)=>sme(i,r,e));S2.exports=ome});var Dh=I((Ett,k2)=>{var ame=Xn(),Ame=(t,e,r)=>ame(t,e,r)>0;k2.exports=Ame});var $I=I((ytt,P2)=>{var lme=Xn(),cme=(t,e,r)=>lme(t,e,r)<0;P2.exports=cme});var wv=I((wtt,D2)=>{var ume=Xn(),gme=(t,e,r)=>ume(t,e,r)!==0;D2.exports=gme});var eE=I((Btt,R2)=>{var fme=Xn(),hme=(t,e,r)=>fme(t,e,r)>=0;R2.exports=hme});var tE=I((Qtt,F2)=>{var pme=Xn(),dme=(t,e,r)=>pme(t,e,r)<=0;F2.exports=dme});var Bv=I((btt,N2)=>{var Cme=XI(),mme=wv(),Ime=Dh(),Eme=eE(),yme=$I(),wme=tE(),Bme=(t,e,r,i)=>{switch(e){case"===":return typeof t=="object"&&(t=t.version),typeof r=="object"&&(r=r.version),t===r;case"!==":return typeof t=="object"&&(t=t.version),typeof r=="object"&&(r=r.version),t!==r;case"":case"=":case"==":return Cme(t,r,i);case"!=":return mme(t,r,i);case">":return Ime(t,r,i);case">=":return Eme(t,r,i);case"<":return yme(t,r,i);case"<=":return wme(t,r,i);default:throw new TypeError(`Invalid operator: ${e}`)}};N2.exports=Bme});var T2=I((vtt,L2)=>{var Qme=bi(),bme=bl(),{re:rE,t:iE}=Ql(),vme=(t,e)=>{if(t instanceof Qme)return t;if(typeof t=="number"&&(t=String(t)),typeof t!="string")return null;e=e||{};let r=null;if(!e.rtl)r=t.match(rE[iE.COERCE]);else{let i;for(;(i=rE[iE.COERCERTL].exec(t))&&(!r||r.index+r[0].length!==t.length);)(!r||i.index+i[0].length!==r.index+r[0].length)&&(r=i),rE[iE.COERCERTL].lastIndex=i.index+i[1].length+i[2].length;rE[iE.COERCERTL].lastIndex=-1}return r===null?null:bme(`${r[2]}.${r[3]||"0"}.${r[4]||"0"}`,e)};L2.exports=vme});var O2=I((Stt,M2)=>{"use strict";M2.exports=function(t){t.prototype[Symbol.iterator]=function*(){for(let e=this.head;e;e=e.next)yield e.value}}});var Rh=I((xtt,K2)=>{"use strict";K2.exports=Pt;Pt.Node=vl;Pt.create=Pt;function Pt(t){var e=this;if(e instanceof Pt||(e=new Pt),e.tail=null,e.head=null,e.length=0,t&&typeof t.forEach=="function")t.forEach(function(n){e.push(n)});else if(arguments.length>0)for(var r=0,i=arguments.length;r1)r=e;else if(this.head)i=this.head.next,r=this.head.value;else throw new TypeError("Reduce of empty list with no initial value");for(var n=0;i!==null;n++)r=t(r,i.value,n),i=i.next;return r};Pt.prototype.reduceReverse=function(t,e){var r,i=this.tail;if(arguments.length>1)r=e;else if(this.tail)i=this.tail.prev,r=this.tail.value;else throw new TypeError("Reduce of empty list with no initial value");for(var n=this.length-1;i!==null;n--)r=t(r,i.value,n),i=i.prev;return r};Pt.prototype.toArray=function(){for(var t=new Array(this.length),e=0,r=this.head;r!==null;e++)t[e]=r.value,r=r.next;return t};Pt.prototype.toArrayReverse=function(){for(var t=new Array(this.length),e=0,r=this.tail;r!==null;e++)t[e]=r.value,r=r.prev;return t};Pt.prototype.slice=function(t,e){e=e||this.length,e<0&&(e+=this.length),t=t||0,t<0&&(t+=this.length);var r=new Pt;if(ethis.length&&(e=this.length);for(var i=0,n=this.head;n!==null&&ithis.length&&(e=this.length);for(var i=this.length,n=this.tail;n!==null&&i>e;i--)n=n.prev;for(;n!==null&&i>t;i--,n=n.prev)r.push(n.value);return r};Pt.prototype.splice=function(t,e,...r){t>this.length&&(t=this.length-1),t<0&&(t=this.length+t);for(var i=0,n=this.head;n!==null&&i{"use strict";var Pme=Rh(),Sl=Symbol("max"),ra=Symbol("length"),uu=Symbol("lengthCalculator"),Fh=Symbol("allowStale"),xl=Symbol("maxAge"),ia=Symbol("dispose"),H2=Symbol("noDisposeOnSet"),si=Symbol("lruList"),ks=Symbol("cache"),G2=Symbol("updateAgeOnGet"),Qv=()=>1,j2=class{constructor(e){if(typeof e=="number"&&(e={max:e}),e||(e={}),e.max&&(typeof e.max!="number"||e.max<0))throw new TypeError("max must be a non-negative number");let r=this[Sl]=e.max||Infinity,i=e.length||Qv;if(this[uu]=typeof i!="function"?Qv:i,this[Fh]=e.stale||!1,e.maxAge&&typeof e.maxAge!="number")throw new TypeError("maxAge must be a number");this[xl]=e.maxAge||0,this[ia]=e.dispose,this[H2]=e.noDisposeOnSet||!1,this[G2]=e.updateAgeOnGet||!1,this.reset()}set max(e){if(typeof e!="number"||e<0)throw new TypeError("max must be a non-negative number");this[Sl]=e||Infinity,Nh(this)}get max(){return this[Sl]}set allowStale(e){this[Fh]=!!e}get allowStale(){return this[Fh]}set maxAge(e){if(typeof e!="number")throw new TypeError("maxAge must be a non-negative number");this[xl]=e,Nh(this)}get maxAge(){return this[xl]}set lengthCalculator(e){typeof e!="function"&&(e=Qv),e!==this[uu]&&(this[uu]=e,this[ra]=0,this[si].forEach(r=>{r.length=this[uu](r.value,r.key),this[ra]+=r.length})),Nh(this)}get lengthCalculator(){return this[uu]}get length(){return this[ra]}get itemCount(){return this[si].length}rforEach(e,r){r=r||this;for(let i=this[si].tail;i!==null;){let n=i.prev;q2(this,e,i,r),i=n}}forEach(e,r){r=r||this;for(let i=this[si].head;i!==null;){let n=i.next;q2(this,e,i,r),i=n}}keys(){return this[si].toArray().map(e=>e.key)}values(){return this[si].toArray().map(e=>e.value)}reset(){this[ia]&&this[si]&&this[si].length&&this[si].forEach(e=>this[ia](e.key,e.value)),this[ks]=new Map,this[si]=new Pme,this[ra]=0}dump(){return this[si].map(e=>nE(this,e)?!1:{k:e.key,v:e.value,e:e.now+(e.maxAge||0)}).toArray().filter(e=>e)}dumpLru(){return this[si]}set(e,r,i){if(i=i||this[xl],i&&typeof i!="number")throw new TypeError("maxAge must be a number");let n=i?Date.now():0,s=this[uu](r,e);if(this[ks].has(e)){if(s>this[Sl])return gu(this,this[ks].get(e)),!1;let l=this[ks].get(e).value;return this[ia]&&(this[H2]||this[ia](e,l.value)),l.now=n,l.maxAge=i,l.value=r,this[ra]+=s-l.length,l.length=s,this.get(e),Nh(this),!0}let o=new Y2(e,r,s,n,i);return o.length>this[Sl]?(this[ia]&&this[ia](e,r),!1):(this[ra]+=o.length,this[si].unshift(o),this[ks].set(e,this[si].head),Nh(this),!0)}has(e){if(!this[ks].has(e))return!1;let r=this[ks].get(e).value;return!nE(this,r)}get(e){return bv(this,e,!0)}peek(e){return bv(this,e,!1)}pop(){let e=this[si].tail;return e?(gu(this,e),e.value):null}del(e){gu(this,this[ks].get(e))}load(e){this.reset();let r=Date.now();for(let i=e.length-1;i>=0;i--){let n=e[i],s=n.e||0;if(s===0)this.set(n.k,n.v);else{let o=s-r;o>0&&this.set(n.k,n.v,o)}}}prune(){this[ks].forEach((e,r)=>bv(this,r,!1))}},bv=(t,e,r)=>{let i=t[ks].get(e);if(i){let n=i.value;if(nE(t,n)){if(gu(t,i),!t[Fh])return}else r&&(t[G2]&&(i.value.now=Date.now()),t[si].unshiftNode(i));return n.value}},nE=(t,e)=>{if(!e||!e.maxAge&&!t[xl])return!1;let r=Date.now()-e.now;return e.maxAge?r>e.maxAge:t[xl]&&r>t[xl]},Nh=t=>{if(t[ra]>t[Sl])for(let e=t[si].tail;t[ra]>t[Sl]&&e!==null;){let r=e.prev;gu(t,e),e=r}},gu=(t,e)=>{if(e){let r=e.value;t[ia]&&t[ia](r.key,r.value),t[ra]-=r.length,t[ks].delete(r.key),t[si].removeNode(e)}},Y2=class{constructor(e,r,i,n,s){this.key=e,this.value=r,this.length=i,this.now=n,this.maxAge=s||0}},q2=(t,e,r,i)=>{let n=r.value;nE(t,n)&&(gu(t,r),t[Fh]||(n=void 0)),n&&e.call(i,n.value,n.key,t)};U2.exports=j2});var Zn=I((Ptt,W2)=>{var fu=class{constructor(e,r){if(r=Dme(r),e instanceof fu)return e.loose===!!r.loose&&e.includePrerelease===!!r.includePrerelease?e:new fu(e.raw,r);if(e instanceof vv)return this.raw=e.value,this.set=[[e]],this.format(),this;if(this.options=r,this.loose=!!r.loose,this.includePrerelease=!!r.includePrerelease,this.raw=e,this.set=e.split(/\s*\|\|\s*/).map(i=>this.parseRange(i.trim())).filter(i=>i.length),!this.set.length)throw new TypeError(`Invalid SemVer Range: ${e}`);if(this.set.length>1){let i=this.set[0];if(this.set=this.set.filter(n=>!V2(n[0])),this.set.length===0)this.set=[i];else if(this.set.length>1){for(let n of this.set)if(n.length===1&&Tme(n[0])){this.set=[n];break}}}this.format()}format(){return this.range=this.set.map(e=>e.join(" ").trim()).join("||").trim(),this.range}toString(){return this.range}parseRange(e){e=e.trim();let i=`parseRange:${Object.keys(this.options).join(",")}:${e}`,n=z2.get(i);if(n)return n;let s=this.options.loose,o=s?vi[di.HYPHENRANGELOOSE]:vi[di.HYPHENRANGE];e=e.replace(o,Kme(this.options.includePrerelease)),Rr("hyphen replace",e),e=e.replace(vi[di.COMPARATORTRIM],Fme),Rr("comparator trim",e,vi[di.COMPARATORTRIM]),e=e.replace(vi[di.TILDETRIM],Nme),e=e.replace(vi[di.CARETTRIM],Lme),e=e.split(/\s+/).join(" ");let a=s?vi[di.COMPARATORLOOSE]:vi[di.COMPARATOR],l=e.split(" ").map(f=>Mme(f,this.options)).join(" ").split(/\s+/).map(f=>Ome(f,this.options)).filter(this.options.loose?f=>!!f.match(a):()=>!0).map(f=>new vv(f,this.options)),c=l.length,u=new Map;for(let f of l){if(V2(f))return[f];u.set(f.value,f)}u.size>1&&u.has("")&&u.delete("");let g=[...u.values()];return z2.set(i,g),g}intersects(e,r){if(!(e instanceof fu))throw new TypeError("a Range is required");return this.set.some(i=>_2(i,r)&&e.set.some(n=>_2(n,r)&&i.every(s=>n.every(o=>s.intersects(o,r)))))}test(e){if(!e)return!1;if(typeof e=="string")try{e=new Rme(e,this.options)}catch(r){return!1}for(let r=0;rt.value==="<0.0.0-0",Tme=t=>t.value==="",_2=(t,e)=>{let r=!0,i=t.slice(),n=i.pop();for(;r&&i.length;)r=i.every(s=>n.intersects(s,e)),n=i.pop();return r},Mme=(t,e)=>(Rr("comp",t,e),t=jme(t,e),Rr("caret",t),t=Gme(t,e),Rr("tildes",t),t=Yme(t,e),Rr("xrange",t),t=qme(t,e),Rr("stars",t),t),Ji=t=>!t||t.toLowerCase()==="x"||t==="*",Gme=(t,e)=>t.trim().split(/\s+/).map(r=>Jme(r,e)).join(" "),Jme=(t,e)=>{let r=e.loose?vi[di.TILDELOOSE]:vi[di.TILDE];return t.replace(r,(i,n,s,o,a)=>{Rr("tilde",t,i,n,s,o,a);let l;return Ji(n)?l="":Ji(s)?l=`>=${n}.0.0 <${+n+1}.0.0-0`:Ji(o)?l=`>=${n}.${s}.0 <${n}.${+s+1}.0-0`:a?(Rr("replaceTilde pr",a),l=`>=${n}.${s}.${o}-${a} <${n}.${+s+1}.0-0`):l=`>=${n}.${s}.${o} <${n}.${+s+1}.0-0`,Rr("tilde return",l),l})},jme=(t,e)=>t.trim().split(/\s+/).map(r=>Wme(r,e)).join(" "),Wme=(t,e)=>{Rr("caret",t,e);let r=e.loose?vi[di.CARETLOOSE]:vi[di.CARET],i=e.includePrerelease?"-0":"";return t.replace(r,(n,s,o,a,l)=>{Rr("caret",t,n,s,o,a,l);let c;return Ji(s)?c="":Ji(o)?c=`>=${s}.0.0${i} <${+s+1}.0.0-0`:Ji(a)?s==="0"?c=`>=${s}.${o}.0${i} <${s}.${+o+1}.0-0`:c=`>=${s}.${o}.0${i} <${+s+1}.0.0-0`:l?(Rr("replaceCaret pr",l),s==="0"?o==="0"?c=`>=${s}.${o}.${a}-${l} <${s}.${o}.${+a+1}-0`:c=`>=${s}.${o}.${a}-${l} <${s}.${+o+1}.0-0`:c=`>=${s}.${o}.${a}-${l} <${+s+1}.0.0-0`):(Rr("no pr"),s==="0"?o==="0"?c=`>=${s}.${o}.${a}${i} <${s}.${o}.${+a+1}-0`:c=`>=${s}.${o}.${a}${i} <${s}.${+o+1}.0-0`:c=`>=${s}.${o}.${a} <${+s+1}.0.0-0`),Rr("caret return",c),c})},Yme=(t,e)=>(Rr("replaceXRanges",t,e),t.split(/\s+/).map(r=>zme(r,e)).join(" ")),zme=(t,e)=>{t=t.trim();let r=e.loose?vi[di.XRANGELOOSE]:vi[di.XRANGE];return t.replace(r,(i,n,s,o,a,l)=>{Rr("xRange",t,i,n,s,o,a,l);let c=Ji(s),u=c||Ji(o),g=u||Ji(a),f=g;return n==="="&&f&&(n=""),l=e.includePrerelease?"-0":"",c?n===">"||n==="<"?i="<0.0.0-0":i="*":n&&f?(u&&(o=0),a=0,n===">"?(n=">=",u?(s=+s+1,o=0,a=0):(o=+o+1,a=0)):n==="<="&&(n="<",u?s=+s+1:o=+o+1),n==="<"&&(l="-0"),i=`${n+s}.${o}.${a}${l}`):u?i=`>=${s}.0.0${l} <${+s+1}.0.0-0`:g&&(i=`>=${s}.${o}.0${l} <${s}.${+o+1}.0-0`),Rr("xRange return",i),i})},qme=(t,e)=>(Rr("replaceStars",t,e),t.trim().replace(vi[di.STAR],"")),Ome=(t,e)=>(Rr("replaceGTE0",t,e),t.trim().replace(vi[e.includePrerelease?di.GTE0PRE:di.GTE0],"")),Kme=t=>(e,r,i,n,s,o,a,l,c,u,g,f,h)=>(Ji(i)?r="":Ji(n)?r=`>=${i}.0.0${t?"-0":""}`:Ji(s)?r=`>=${i}.${n}.0${t?"-0":""}`:o?r=`>=${r}`:r=`>=${r}${t?"-0":""}`,Ji(c)?l="":Ji(u)?l=`<${+c+1}.0.0-0`:Ji(g)?l=`<${c}.${+u+1}.0-0`:f?l=`<=${c}.${u}.${g}-${f}`:t?l=`<${c}.${u}.${+g+1}-0`:l=`<=${l}`,`${r} ${l}`.trim()),Ume=(t,e,r)=>{for(let i=0;i0){let n=t[i].semver;if(n.major===e.major&&n.minor===e.minor&&n.patch===e.patch)return!0}return!1}return!0}});var Lh=I((Dtt,X2)=>{var Th=Symbol("SemVer ANY"),Mh=class{static get ANY(){return Th}constructor(e,r){if(r=Vme(r),e instanceof Mh){if(e.loose===!!r.loose)return e;e=e.value}xv("comparator",e,r),this.options=r,this.loose=!!r.loose,this.parse(e),this.semver===Th?this.value="":this.value=this.operator+this.semver.version,xv("comp",this)}parse(e){let r=this.options.loose?Z2[$2.COMPARATORLOOSE]:Z2[$2.COMPARATOR],i=e.match(r);if(!i)throw new TypeError(`Invalid comparator: ${e}`);this.operator=i[1]!==void 0?i[1]:"",this.operator==="="&&(this.operator=""),i[2]?this.semver=new eH(i[2],this.options.loose):this.semver=Th}toString(){return this.value}test(e){if(xv("Comparator.test",e,this.options.loose),this.semver===Th||e===Th)return!0;if(typeof e=="string")try{e=new eH(e,this.options)}catch(r){return!1}return Sv(e,this.operator,this.semver,this.options)}intersects(e,r){if(!(e instanceof Mh))throw new TypeError("a Comparator is required");if((!r||typeof r!="object")&&(r={loose:!!r,includePrerelease:!1}),this.operator==="")return this.value===""?!0:new tH(e.value,r).test(this.value);if(e.operator==="")return e.value===""?!0:new tH(this.value,r).test(e.semver);let i=(this.operator===">="||this.operator===">")&&(e.operator===">="||e.operator===">"),n=(this.operator==="<="||this.operator==="<")&&(e.operator==="<="||e.operator==="<"),s=this.semver.version===e.semver.version,o=(this.operator===">="||this.operator==="<=")&&(e.operator===">="||e.operator==="<="),a=Sv(this.semver,"<",e.semver,r)&&(this.operator===">="||this.operator===">")&&(e.operator==="<="||e.operator==="<"),l=Sv(this.semver,">",e.semver,r)&&(this.operator==="<="||this.operator==="<")&&(e.operator===">="||e.operator===">");return i||n||s&&o||a||l}};X2.exports=Mh;var Vme=kh(),{re:Z2,t:$2}=Ql(),Sv=Bv(),xv=xh(),eH=bi(),tH=Zn()});var Oh=I((Rtt,rH)=>{var _me=Zn(),Xme=(t,e,r)=>{try{e=new _me(e,r)}catch(i){return!1}return e.test(t)};rH.exports=Xme});var nH=I((Ftt,iH)=>{var Zme=Zn(),$me=(t,e)=>new Zme(t,e).set.map(r=>r.map(i=>i.value).join(" ").trim().split(" "));iH.exports=$me});var oH=I((Ntt,sH)=>{var eIe=bi(),tIe=Zn(),rIe=(t,e,r)=>{let i=null,n=null,s=null;try{s=new tIe(e,r)}catch(o){return null}return t.forEach(o=>{s.test(o)&&(!i||n.compare(o)===-1)&&(i=o,n=new eIe(i,r))}),i};sH.exports=rIe});var AH=I((Ltt,aH)=>{var iIe=bi(),nIe=Zn(),sIe=(t,e,r)=>{let i=null,n=null,s=null;try{s=new nIe(e,r)}catch(o){return null}return t.forEach(o=>{s.test(o)&&(!i||n.compare(o)===1)&&(i=o,n=new iIe(i,r))}),i};aH.exports=sIe});var uH=I((Ttt,lH)=>{var kv=bi(),oIe=Zn(),cH=Dh(),aIe=(t,e)=>{t=new oIe(t,e);let r=new kv("0.0.0");if(t.test(r)||(r=new kv("0.0.0-0"),t.test(r)))return r;r=null;for(let i=0;i{let a=new kv(o.semver.version);switch(o.operator){case">":a.prerelease.length===0?a.patch++:a.prerelease.push(0),a.raw=a.format();case"":case">=":(!s||cH(a,s))&&(s=a);break;case"<":case"<=":break;default:throw new Error(`Unexpected operation: ${o.operator}`)}}),s&&(!r||cH(r,s))&&(r=s)}return r&&t.test(r)?r:null};lH.exports=aIe});var fH=I((Mtt,gH)=>{var AIe=Zn(),lIe=(t,e)=>{try{return new AIe(t,e).range||"*"}catch(r){return null}};gH.exports=lIe});var sE=I((Ott,hH)=>{var cIe=bi(),pH=Lh(),{ANY:uIe}=pH,gIe=Zn(),fIe=Oh(),dH=Dh(),CH=$I(),hIe=tE(),pIe=eE(),dIe=(t,e,r,i)=>{t=new cIe(t,i),e=new gIe(e,i);let n,s,o,a,l;switch(r){case">":n=dH,s=hIe,o=CH,a=">",l=">=";break;case"<":n=CH,s=pIe,o=dH,a="<",l="<=";break;default:throw new TypeError('Must provide a hilo val of "<" or ">"')}if(fIe(t,e,i))return!1;for(let c=0;c{h.semver===uIe&&(h=new pH(">=0.0.0")),g=g||h,f=f||h,n(h.semver,g.semver,i)?g=h:o(h.semver,f.semver,i)&&(f=h)}),g.operator===a||g.operator===l||(!f.operator||f.operator===a)&&s(t,f.semver))return!1;if(f.operator===l&&o(t,f.semver))return!1}return!0};hH.exports=dIe});var IH=I((Ktt,mH)=>{var CIe=sE(),mIe=(t,e,r)=>CIe(t,e,">",r);mH.exports=mIe});var yH=I((Utt,EH)=>{var IIe=sE(),EIe=(t,e,r)=>IIe(t,e,"<",r);EH.exports=EIe});var QH=I((Htt,wH)=>{var BH=Zn(),yIe=(t,e,r)=>(t=new BH(t,r),e=new BH(e,r),t.intersects(e));wH.exports=yIe});var vH=I((Gtt,bH)=>{var wIe=Oh(),BIe=Xn();bH.exports=(t,e,r)=>{let i=[],n=null,s=null,o=t.sort((u,g)=>BIe(u,g,r));for(let u of o)wIe(u,e,r)?(s=u,n||(n=u)):(s&&i.push([n,s]),s=null,n=null);n&&i.push([n,null]);let a=[];for(let[u,g]of i)u===g?a.push(u):!g&&u===o[0]?a.push("*"):g?u===o[0]?a.push(`<=${g}`):a.push(`${u} - ${g}`):a.push(`>=${u}`);let l=a.join(" || "),c=typeof e.raw=="string"?e.raw:String(e);return l.length{var xH=Zn(),oE=Lh(),{ANY:Pv}=oE,Kh=Oh(),Dv=Xn(),bIe=(t,e,r={})=>{if(t===e)return!0;t=new xH(t,r),e=new xH(e,r);let i=!1;e:for(let n of t.set){for(let s of e.set){let o=QIe(n,s,r);if(i=i||o!==null,o)continue e}if(i)return!1}return!0},QIe=(t,e,r)=>{if(t===e)return!0;if(t.length===1&&t[0].semver===Pv){if(e.length===1&&e[0].semver===Pv)return!0;r.includePrerelease?t=[new oE(">=0.0.0-0")]:t=[new oE(">=0.0.0")]}if(e.length===1&&e[0].semver===Pv){if(r.includePrerelease)return!0;e=[new oE(">=0.0.0")]}let i=new Set,n,s;for(let h of t)h.operator===">"||h.operator===">="?n=kH(n,h,r):h.operator==="<"||h.operator==="<="?s=PH(s,h,r):i.add(h.semver);if(i.size>1)return null;let o;if(n&&s){if(o=Dv(n.semver,s.semver,r),o>0)return null;if(o===0&&(n.operator!==">="||s.operator!=="<="))return null}for(let h of i){if(n&&!Kh(h,String(n),r)||s&&!Kh(h,String(s),r))return null;for(let p of e)if(!Kh(h,String(p),r))return!1;return!0}let a,l,c,u,g=s&&!r.includePrerelease&&s.semver.prerelease.length?s.semver:!1,f=n&&!r.includePrerelease&&n.semver.prerelease.length?n.semver:!1;g&&g.prerelease.length===1&&s.operator==="<"&&g.prerelease[0]===0&&(g=!1);for(let h of e){if(u=u||h.operator===">"||h.operator===">=",c=c||h.operator==="<"||h.operator==="<=",n){if(f&&h.semver.prerelease&&h.semver.prerelease.length&&h.semver.major===f.major&&h.semver.minor===f.minor&&h.semver.patch===f.patch&&(f=!1),h.operator===">"||h.operator===">="){if(a=kH(n,h,r),a===h&&a!==n)return!1}else if(n.operator===">="&&!Kh(n.semver,String(h),r))return!1}if(s){if(g&&h.semver.prerelease&&h.semver.prerelease.length&&h.semver.major===g.major&&h.semver.minor===g.minor&&h.semver.patch===g.patch&&(g=!1),h.operator==="<"||h.operator==="<="){if(l=PH(s,h,r),l===h&&l!==s)return!1}else if(s.operator==="<="&&!Kh(s.semver,String(h),r))return!1}if(!h.operator&&(s||n)&&o!==0)return!1}return!(n&&c&&!s&&o!==0||s&&u&&!n&&o!==0||f||g)},kH=(t,e,r)=>{if(!t)return e;let i=Dv(t.semver,e.semver,r);return i>0?t:i<0||e.operator===">"&&t.operator===">="?e:t},PH=(t,e,r)=>{if(!t)return e;let i=Dv(t.semver,e.semver,r);return i<0?t:i>0||e.operator==="<"&&t.operator==="<="?e:t};SH.exports=bIe});var Or=I((Ytt,RH)=>{var Rv=Ql();RH.exports={re:Rv.re,src:Rv.src,tokens:Rv.t,SEMVER_SPEC_VERSION:Sh().SEMVER_SPEC_VERSION,SemVer:bi(),compareIdentifiers:zI().compareIdentifiers,rcompareIdentifiers:zI().rcompareIdentifiers,parse:bl(),valid:e2(),clean:r2(),inc:n2(),diff:c2(),major:g2(),minor:h2(),patch:d2(),prerelease:m2(),compare:Xn(),rcompare:E2(),compareLoose:w2(),compareBuild:ZI(),sort:v2(),rsort:x2(),gt:Dh(),lt:$I(),eq:XI(),neq:wv(),gte:eE(),lte:tE(),cmp:Bv(),coerce:T2(),Comparator:Lh(),Range:Zn(),satisfies:Oh(),toComparators:nH(),maxSatisfying:oH(),minSatisfying:AH(),minVersion:uH(),validRange:fH(),outside:sE(),gtr:IH(),ltr:yH(),intersects:QH(),simplifyRange:vH(),subset:DH()}});var Uv=I(AE=>{"use strict";Object.defineProperty(AE,"__esModule",{value:!0});AE.VERSION=void 0;AE.VERSION="9.1.0"});var Dt=I((exports,module)=>{"use strict";var __spreadArray=exports&&exports.__spreadArray||function(t,e,r){if(r||arguments.length===2)for(var i=0,n=e.length,s;i{(function(t,e){typeof define=="function"&&define.amd?define([],e):typeof lE=="object"&&lE.exports?lE.exports=e():t.regexpToAst=e()})(typeof self!="undefined"?self:YH,function(){function t(){}t.prototype.saveState=function(){return{idx:this.idx,input:this.input,groupIdx:this.groupIdx}},t.prototype.restoreState=function(p){this.idx=p.idx,this.input=p.input,this.groupIdx=p.groupIdx},t.prototype.pattern=function(p){this.idx=0,this.input=p,this.groupIdx=0,this.consumeChar("/");var d=this.disjunction();this.consumeChar("/");for(var m={type:"Flags",loc:{begin:this.idx,end:p.length},global:!1,ignoreCase:!1,multiLine:!1,unicode:!1,sticky:!1};this.isRegExpFlag();)switch(this.popChar()){case"g":o(m,"global");break;case"i":o(m,"ignoreCase");break;case"m":o(m,"multiLine");break;case"u":o(m,"unicode");break;case"y":o(m,"sticky");break}if(this.idx!==this.input.length)throw Error("Redundant input: "+this.input.substring(this.idx));return{type:"Pattern",flags:m,value:d,loc:this.loc(0)}},t.prototype.disjunction=function(){var p=[],d=this.idx;for(p.push(this.alternative());this.peekChar()==="|";)this.consumeChar("|"),p.push(this.alternative());return{type:"Disjunction",value:p,loc:this.loc(d)}},t.prototype.alternative=function(){for(var p=[],d=this.idx;this.isTerm();)p.push(this.term());return{type:"Alternative",value:p,loc:this.loc(d)}},t.prototype.term=function(){return this.isAssertion()?this.assertion():this.atom()},t.prototype.assertion=function(){var p=this.idx;switch(this.popChar()){case"^":return{type:"StartAnchor",loc:this.loc(p)};case"$":return{type:"EndAnchor",loc:this.loc(p)};case"\\":switch(this.popChar()){case"b":return{type:"WordBoundary",loc:this.loc(p)};case"B":return{type:"NonWordBoundary",loc:this.loc(p)}}throw Error("Invalid Assertion Escape");case"(":this.consumeChar("?");var d;switch(this.popChar()){case"=":d="Lookahead";break;case"!":d="NegativeLookahead";break}a(d);var m=this.disjunction();return this.consumeChar(")"),{type:d,value:m,loc:this.loc(p)}}l()},t.prototype.quantifier=function(p){var d,m=this.idx;switch(this.popChar()){case"*":d={atLeast:0,atMost:Infinity};break;case"+":d={atLeast:1,atMost:Infinity};break;case"?":d={atLeast:0,atMost:1};break;case"{":var E=this.integerIncludingZero();switch(this.popChar()){case"}":d={atLeast:E,atMost:E};break;case",":var B;this.isDigit()?(B=this.integerIncludingZero(),d={atLeast:E,atMost:B}):d={atLeast:E,atMost:Infinity},this.consumeChar("}");break}if(p===!0&&d===void 0)return;a(d);break}if(!(p===!0&&d===void 0))return a(d),this.peekChar(0)==="?"?(this.consumeChar("?"),d.greedy=!1):d.greedy=!0,d.type="Quantifier",d.loc=this.loc(m),d},t.prototype.atom=function(){var p,d=this.idx;switch(this.peekChar()){case".":p=this.dotAll();break;case"\\":p=this.atomEscape();break;case"[":p=this.characterClass();break;case"(":p=this.group();break}return p===void 0&&this.isPatternCharacter()&&(p=this.patternCharacter()),a(p),p.loc=this.loc(d),this.isQuantifier()&&(p.quantifier=this.quantifier()),p},t.prototype.dotAll=function(){return this.consumeChar("."),{type:"Set",complement:!0,value:[n(` +`),n("\r"),n("\u2028"),n("\u2029")]}},t.prototype.atomEscape=function(){switch(this.consumeChar("\\"),this.peekChar()){case"1":case"2":case"3":case"4":case"5":case"6":case"7":case"8":case"9":return this.decimalEscapeAtom();case"d":case"D":case"s":case"S":case"w":case"W":return this.characterClassEscape();case"f":case"n":case"r":case"t":case"v":return this.controlEscapeAtom();case"c":return this.controlLetterEscapeAtom();case"0":return this.nulCharacterAtom();case"x":return this.hexEscapeSequenceAtom();case"u":return this.regExpUnicodeEscapeSequenceAtom();default:return this.identityEscapeAtom()}},t.prototype.decimalEscapeAtom=function(){var p=this.positiveInteger();return{type:"GroupBackReference",value:p}},t.prototype.characterClassEscape=function(){var p,d=!1;switch(this.popChar()){case"d":p=u;break;case"D":p=u,d=!0;break;case"s":p=f;break;case"S":p=f,d=!0;break;case"w":p=g;break;case"W":p=g,d=!0;break}return a(p),{type:"Set",value:p,complement:d}},t.prototype.controlEscapeAtom=function(){var p;switch(this.popChar()){case"f":p=n("\f");break;case"n":p=n(` +`);break;case"r":p=n("\r");break;case"t":p=n(" ");break;case"v":p=n("\v");break}return a(p),{type:"Character",value:p}},t.prototype.controlLetterEscapeAtom=function(){this.consumeChar("c");var p=this.popChar();if(/[a-zA-Z]/.test(p)===!1)throw Error("Invalid ");var d=p.toUpperCase().charCodeAt(0)-64;return{type:"Character",value:d}},t.prototype.nulCharacterAtom=function(){return this.consumeChar("0"),{type:"Character",value:n("\0")}},t.prototype.hexEscapeSequenceAtom=function(){return this.consumeChar("x"),this.parseHexDigits(2)},t.prototype.regExpUnicodeEscapeSequenceAtom=function(){return this.consumeChar("u"),this.parseHexDigits(4)},t.prototype.identityEscapeAtom=function(){var p=this.popChar();return{type:"Character",value:n(p)}},t.prototype.classPatternCharacterAtom=function(){switch(this.peekChar()){case` +`:case"\r":case"\u2028":case"\u2029":case"\\":case"]":throw Error("TBD");default:var p=this.popChar();return{type:"Character",value:n(p)}}},t.prototype.characterClass=function(){var p=[],d=!1;for(this.consumeChar("["),this.peekChar(0)==="^"&&(this.consumeChar("^"),d=!0);this.isClassAtom();){var m=this.classAtom(),E=m.type==="Character";if(E&&this.isRangeDash()){this.consumeChar("-");var B=this.classAtom(),b=B.type==="Character";if(b){if(B.value=this.input.length)throw Error("Unexpected end of input");this.idx++},t.prototype.loc=function(p){return{begin:p,end:this.idx}};var e=/[0-9a-fA-F]/,r=/[0-9]/,i=/[1-9]/;function n(p){return p.charCodeAt(0)}function s(p,d){p.length!==void 0?p.forEach(function(m){d.push(m)}):d.push(p)}function o(p,d){if(p[d]===!0)throw"duplicate flag "+d;p[d]=!0}function a(p){if(p===void 0)throw Error("Internal Error - Should never get here!")}function l(){throw Error("Internal Error - Should never get here!")}var c,u=[];for(c=n("0");c<=n("9");c++)u.push(c);var g=[n("_")].concat(u);for(c=n("a");c<=n("z");c++)g.push(c);for(c=n("A");c<=n("Z");c++)g.push(c);var f=[n(" "),n("\f"),n(` +`),n("\r"),n(" "),n("\v"),n(" "),n("\xA0"),n("\u1680"),n("\u2000"),n("\u2001"),n("\u2002"),n("\u2003"),n("\u2004"),n("\u2005"),n("\u2006"),n("\u2007"),n("\u2008"),n("\u2009"),n("\u200A"),n("\u2028"),n("\u2029"),n("\u202F"),n("\u205F"),n("\u3000"),n("\uFEFF")];function h(){}return h.prototype.visitChildren=function(p){for(var d in p){var m=p[d];p.hasOwnProperty(d)&&(m.type!==void 0?this.visit(m):Array.isArray(m)&&m.forEach(function(E){this.visit(E)},this))}},h.prototype.visit=function(p){switch(p.type){case"Pattern":this.visitPattern(p);break;case"Flags":this.visitFlags(p);break;case"Disjunction":this.visitDisjunction(p);break;case"Alternative":this.visitAlternative(p);break;case"StartAnchor":this.visitStartAnchor(p);break;case"EndAnchor":this.visitEndAnchor(p);break;case"WordBoundary":this.visitWordBoundary(p);break;case"NonWordBoundary":this.visitNonWordBoundary(p);break;case"Lookahead":this.visitLookahead(p);break;case"NegativeLookahead":this.visitNegativeLookahead(p);break;case"Character":this.visitCharacter(p);break;case"Set":this.visitSet(p);break;case"Group":this.visitGroup(p);break;case"GroupBackReference":this.visitGroupBackReference(p);break;case"Quantifier":this.visitQuantifier(p);break}this.visitChildren(p)},h.prototype.visitPattern=function(p){},h.prototype.visitFlags=function(p){},h.prototype.visitDisjunction=function(p){},h.prototype.visitAlternative=function(p){},h.prototype.visitStartAnchor=function(p){},h.prototype.visitEndAnchor=function(p){},h.prototype.visitWordBoundary=function(p){},h.prototype.visitNonWordBoundary=function(p){},h.prototype.visitLookahead=function(p){},h.prototype.visitNegativeLookahead=function(p){},h.prototype.visitCharacter=function(p){},h.prototype.visitSet=function(p){},h.prototype.visitGroup=function(p){},h.prototype.visitGroupBackReference=function(p){},h.prototype.visitQuantifier=function(p){},{RegExpParser:t,BaseRegExpVisitor:h,VERSION:"0.5.0"}})});var gE=I(Iu=>{"use strict";Object.defineProperty(Iu,"__esModule",{value:!0});Iu.clearRegExpParserCache=Iu.getRegExpAst=void 0;var FIe=cE(),uE={},NIe=new FIe.RegExpParser;function LIe(t){var e=t.toString();if(uE.hasOwnProperty(e))return uE[e];var r=NIe.pattern(e);return uE[e]=r,r}Iu.getRegExpAst=LIe;function TIe(){uE={}}Iu.clearRegExpParserCache=TIe});var VH=I(fn=>{"use strict";var MIe=fn&&fn.__extends||function(){var t=function(e,r){return t=Object.setPrototypeOf||{__proto__:[]}instanceof Array&&function(i,n){i.__proto__=n}||function(i,n){for(var s in n)Object.prototype.hasOwnProperty.call(n,s)&&(i[s]=n[s])},t(e,r)};return function(e,r){if(typeof r!="function"&&r!==null)throw new TypeError("Class extends value "+String(r)+" is not a constructor or null");t(e,r);function i(){this.constructor=e}e.prototype=r===null?Object.create(r):(i.prototype=r.prototype,new i)}}();Object.defineProperty(fn,"__esModule",{value:!0});fn.canMatchCharCode=fn.firstCharOptimizedIndices=fn.getOptimizedStartCodesIndices=fn.failedOptimizationPrefixMsg=void 0;var qH=cE(),$n=Dt(),JH=gE(),sa=Hv(),WH="Complement Sets are not supported for first char optimization";fn.failedOptimizationPrefixMsg=`Unable to use "first char" lexer optimizations: +`;function OIe(t,e){e===void 0&&(e=!1);try{var r=(0,JH.getRegExpAst)(t),i=fE(r.value,{},r.flags.ignoreCase);return i}catch(s){if(s.message===WH)e&&(0,$n.PRINT_WARNING)(""+fn.failedOptimizationPrefixMsg+(" Unable to optimize: < "+t.toString()+` > +`)+` Complement Sets cannot be automatically optimized. + This will disable the lexer's first char optimizations. + See: https://chevrotain.io/docs/guide/resolving_lexer_errors.html#COMPLEMENT for details.`);else{var n="";e&&(n=` + This will disable the lexer's first char optimizations. + See: https://chevrotain.io/docs/guide/resolving_lexer_errors.html#REGEXP_PARSING for details.`),(0,$n.PRINT_ERROR)(fn.failedOptimizationPrefixMsg+` +`+(" Failed parsing: < "+t.toString()+` > +`)+(" Using the regexp-to-ast library version: "+qH.VERSION+` +`)+" Please open an issue at: https://github.com/bd82/regexp-to-ast/issues"+n)}}return[]}fn.getOptimizedStartCodesIndices=OIe;function fE(t,e,r){switch(t.type){case"Disjunction":for(var i=0;i=sa.minOptimizationVal)for(var f=u.from>=sa.minOptimizationVal?u.from:sa.minOptimizationVal,h=u.to,p=(0,sa.charCodeToOptimizedIndex)(f),d=(0,sa.charCodeToOptimizedIndex)(h),m=p;m<=d;m++)e[m]=m}}});break;case"Group":fE(o.value,e,r);break;default:throw Error("Non Exhaustive Match")}var a=o.quantifier!==void 0&&o.quantifier.atLeast===0;if(o.type==="Group"&&Gv(o)===!1||o.type!=="Group"&&a===!1)break}break;default:throw Error("non exhaustive match!")}return(0,$n.values)(e)}fn.firstCharOptimizedIndices=fE;function hE(t,e,r){var i=(0,sa.charCodeToOptimizedIndex)(t);e[i]=i,r===!0&&KIe(t,e)}function KIe(t,e){var r=String.fromCharCode(t),i=r.toUpperCase();if(i!==r){var n=(0,sa.charCodeToOptimizedIndex)(i.charCodeAt(0));e[n]=n}else{var s=r.toLowerCase();if(s!==r){var n=(0,sa.charCodeToOptimizedIndex)(s.charCodeAt(0));e[n]=n}}}function zH(t,e){return(0,$n.find)(t.value,function(r){if(typeof r=="number")return(0,$n.contains)(e,r);var i=r;return(0,$n.find)(e,function(n){return i.from<=n&&n<=i.to})!==void 0})}function Gv(t){return t.quantifier&&t.quantifier.atLeast===0?!0:t.value?(0,$n.isArray)(t.value)?(0,$n.every)(t.value,Gv):Gv(t.value):!1}var UIe=function(t){MIe(e,t);function e(r){var i=t.call(this)||this;return i.targetCharCodes=r,i.found=!1,i}return e.prototype.visitChildren=function(r){if(this.found!==!0){switch(r.type){case"Lookahead":this.visitLookahead(r);return;case"NegativeLookahead":this.visitNegativeLookahead(r);return}t.prototype.visitChildren.call(this,r)}},e.prototype.visitCharacter=function(r){(0,$n.contains)(this.targetCharCodes,r.value)&&(this.found=!0)},e.prototype.visitSet=function(r){r.complement?zH(r,this.targetCharCodes)===void 0&&(this.found=!0):zH(r,this.targetCharCodes)!==void 0&&(this.found=!0)},e}(qH.BaseRegExpVisitor);function HIe(t,e){if(e instanceof RegExp){var r=(0,JH.getRegExpAst)(e),i=new UIe(t);return i.visit(r),i.found}else return(0,$n.find)(e,function(n){return(0,$n.contains)(t,n.charCodeAt(0))})!==void 0}fn.canMatchCharCode=HIe});var Hv=I(je=>{"use strict";var _H=je&&je.__extends||function(){var t=function(e,r){return t=Object.setPrototypeOf||{__proto__:[]}instanceof Array&&function(i,n){i.__proto__=n}||function(i,n){for(var s in n)Object.prototype.hasOwnProperty.call(n,s)&&(i[s]=n[s])},t(e,r)};return function(e,r){if(typeof r!="function"&&r!==null)throw new TypeError("Class extends value "+String(r)+" is not a constructor or null");t(e,r);function i(){this.constructor=e}e.prototype=r===null?Object.create(r):(i.prototype=r.prototype,new i)}}();Object.defineProperty(je,"__esModule",{value:!0});je.charCodeToOptimizedIndex=je.minOptimizationVal=je.buildLineBreakIssueMessage=je.LineTerminatorOptimizedTester=je.isShortPattern=je.isCustomPattern=je.cloneEmptyGroups=je.performWarningRuntimeChecks=je.performRuntimeChecks=je.addStickyFlag=je.addStartOfInput=je.findUnreachablePatterns=je.findModesThatDoNotExist=je.findInvalidGroupType=je.findDuplicatePatterns=je.findUnsupportedFlags=je.findStartOfInputAnchor=je.findEmptyMatchRegExps=je.findEndOfInputAnchor=je.findInvalidPatterns=je.findMissingPatterns=je.validatePatterns=je.analyzeTokenTypes=je.enableSticky=je.disableSticky=je.SUPPORT_STICKY=je.MODES=je.DEFAULT_MODE=void 0;var XH=cE(),zt=Gh(),Ee=Dt(),Eu=VH(),ZH=gE(),ao="PATTERN";je.DEFAULT_MODE="defaultMode";je.MODES="modes";je.SUPPORT_STICKY=typeof new RegExp("(?:)").sticky=="boolean";function GIe(){je.SUPPORT_STICKY=!1}je.disableSticky=GIe;function jIe(){je.SUPPORT_STICKY=!0}je.enableSticky=jIe;function qIe(t,e){e=(0,Ee.defaults)(e,{useSticky:je.SUPPORT_STICKY,debug:!1,safeMode:!1,positionTracking:"full",lineTerminatorCharacters:["\r",` +`],tracer:function(B,b){return b()}});var r=e.tracer;r("initCharCodeToOptimizedIndexMap",function(){YIe()});var i;r("Reject Lexer.NA",function(){i=(0,Ee.reject)(t,function(B){return B[ao]===zt.Lexer.NA})});var n=!1,s;r("Transform Patterns",function(){n=!1,s=(0,Ee.map)(i,function(B){var b=B[ao];if((0,Ee.isRegExp)(b)){var R=b.source;return R.length===1&&R!=="^"&&R!=="$"&&R!=="."&&!b.ignoreCase?R:R.length===2&&R[0]==="\\"&&!(0,Ee.contains)(["d","D","s","S","t","r","n","t","0","c","b","B","f","v","w","W"],R[1])?R[1]:e.useSticky?Yv(b):jv(b)}else{if((0,Ee.isFunction)(b))return n=!0,{exec:b};if((0,Ee.has)(b,"exec"))return n=!0,b;if(typeof b=="string"){if(b.length===1)return b;var H=b.replace(/[\\^$.*+?()[\]{}|]/g,"\\$&"),L=new RegExp(H);return e.useSticky?Yv(L):jv(L)}else throw Error("non exhaustive match")}})});var o,a,l,c,u;r("misc mapping",function(){o=(0,Ee.map)(i,function(B){return B.tokenTypeIdx}),a=(0,Ee.map)(i,function(B){var b=B.GROUP;if(b!==zt.Lexer.SKIPPED){if((0,Ee.isString)(b))return b;if((0,Ee.isUndefined)(b))return!1;throw Error("non exhaustive match")}}),l=(0,Ee.map)(i,function(B){var b=B.LONGER_ALT;if(b){var R=(0,Ee.isArray)(b)?(0,Ee.map)(b,function(H){return(0,Ee.indexOf)(i,H)}):[(0,Ee.indexOf)(i,b)];return R}}),c=(0,Ee.map)(i,function(B){return B.PUSH_MODE}),u=(0,Ee.map)(i,function(B){return(0,Ee.has)(B,"POP_MODE")})});var g;r("Line Terminator Handling",function(){var B=tG(e.lineTerminatorCharacters);g=(0,Ee.map)(i,function(b){return!1}),e.positionTracking!=="onlyOffset"&&(g=(0,Ee.map)(i,function(b){if((0,Ee.has)(b,"LINE_BREAKS"))return b.LINE_BREAKS;if(eG(b,B)===!1)return(0,Eu.canMatchCharCode)(B,b.PATTERN)}))});var f,h,p,d;r("Misc Mapping #2",function(){f=(0,Ee.map)(i,qv),h=(0,Ee.map)(s,$H),p=(0,Ee.reduce)(i,function(B,b){var R=b.GROUP;return(0,Ee.isString)(R)&&R!==zt.Lexer.SKIPPED&&(B[R]=[]),B},{}),d=(0,Ee.map)(s,function(B,b){return{pattern:s[b],longerAlt:l[b],canLineTerminator:g[b],isCustom:f[b],short:h[b],group:a[b],push:c[b],pop:u[b],tokenTypeIdx:o[b],tokenType:i[b]}})});var m=!0,E=[];return e.safeMode||r("First Char Optimization",function(){E=(0,Ee.reduce)(i,function(B,b,R){if(typeof b.PATTERN=="string"){var H=b.PATTERN.charCodeAt(0),L=Wv(H);Jv(B,L,d[R])}else if((0,Ee.isArray)(b.START_CHARS_HINT)){var K;(0,Ee.forEach)(b.START_CHARS_HINT,function(ne){var q=typeof ne=="string"?ne.charCodeAt(0):ne,A=Wv(q);K!==A&&(K=A,Jv(B,A,d[R]))})}else if((0,Ee.isRegExp)(b.PATTERN))if(b.PATTERN.unicode)m=!1,e.ensureOptimizations&&(0,Ee.PRINT_ERROR)(""+Eu.failedOptimizationPrefixMsg+(" Unable to analyze < "+b.PATTERN.toString()+` > pattern. +`)+` The regexp unicode flag is not currently supported by the regexp-to-ast library. + This will disable the lexer's first char optimizations. + For details See: https://chevrotain.io/docs/guide/resolving_lexer_errors.html#UNICODE_OPTIMIZE`);else{var J=(0,Eu.getOptimizedStartCodesIndices)(b.PATTERN,e.ensureOptimizations);(0,Ee.isEmpty)(J)&&(m=!1),(0,Ee.forEach)(J,function(ne){Jv(B,ne,d[R])})}else e.ensureOptimizations&&(0,Ee.PRINT_ERROR)(""+Eu.failedOptimizationPrefixMsg+(" TokenType: <"+b.name+`> is using a custom token pattern without providing parameter. +`)+` This will disable the lexer's first char optimizations. + For details See: https://chevrotain.io/docs/guide/resolving_lexer_errors.html#CUSTOM_OPTIMIZE`),m=!1;return B},[])}),r("ArrayPacking",function(){E=(0,Ee.packArray)(E)}),{emptyGroups:p,patternIdxToConfig:d,charCodeToPatternIdxToConfig:E,hasCustom:n,canBeOptimized:m}}je.analyzeTokenTypes=qIe;function WIe(t,e){var r=[],i=rG(t);r=r.concat(i.errors);var n=iG(i.valid),s=n.valid;return r=r.concat(n.errors),r=r.concat(JIe(s)),r=r.concat(nG(s)),r=r.concat(sG(s,e)),r=r.concat(oG(s)),r}je.validatePatterns=WIe;function JIe(t){var e=[],r=(0,Ee.filter)(t,function(i){return(0,Ee.isRegExp)(i[ao])});return e=e.concat(aG(r)),e=e.concat(lG(r)),e=e.concat(cG(r)),e=e.concat(uG(r)),e=e.concat(AG(r)),e}function rG(t){var e=(0,Ee.filter)(t,function(n){return!(0,Ee.has)(n,ao)}),r=(0,Ee.map)(e,function(n){return{message:"Token Type: ->"+n.name+"<- missing static 'PATTERN' property",type:zt.LexerDefinitionErrorType.MISSING_PATTERN,tokenTypes:[n]}}),i=(0,Ee.difference)(t,e);return{errors:r,valid:i}}je.findMissingPatterns=rG;function iG(t){var e=(0,Ee.filter)(t,function(n){var s=n[ao];return!(0,Ee.isRegExp)(s)&&!(0,Ee.isFunction)(s)&&!(0,Ee.has)(s,"exec")&&!(0,Ee.isString)(s)}),r=(0,Ee.map)(e,function(n){return{message:"Token Type: ->"+n.name+"<- static 'PATTERN' can only be a RegExp, a Function matching the {CustomPatternMatcherFunc} type or an Object matching the {ICustomPattern} interface.",type:zt.LexerDefinitionErrorType.INVALID_PATTERN,tokenTypes:[n]}}),i=(0,Ee.difference)(t,e);return{errors:r,valid:i}}je.findInvalidPatterns=iG;var zIe=/[^\\][\$]/;function aG(t){var e=function(n){_H(s,n);function s(){var o=n!==null&&n.apply(this,arguments)||this;return o.found=!1,o}return s.prototype.visitEndAnchor=function(o){this.found=!0},s}(XH.BaseRegExpVisitor),r=(0,Ee.filter)(t,function(n){var s=n[ao];try{var o=(0,ZH.getRegExpAst)(s),a=new e;return a.visit(o),a.found}catch(l){return zIe.test(s.source)}}),i=(0,Ee.map)(r,function(n){return{message:`Unexpected RegExp Anchor Error: + Token Type: ->`+n.name+`<- static 'PATTERN' cannot contain end of input anchor '$' + See chevrotain.io/docs/guide/resolving_lexer_errors.html#ANCHORS for details.`,type:zt.LexerDefinitionErrorType.EOI_ANCHOR_FOUND,tokenTypes:[n]}});return i}je.findEndOfInputAnchor=aG;function AG(t){var e=(0,Ee.filter)(t,function(i){var n=i[ao];return n.test("")}),r=(0,Ee.map)(e,function(i){return{message:"Token Type: ->"+i.name+"<- static 'PATTERN' must not match an empty string",type:zt.LexerDefinitionErrorType.EMPTY_MATCH_PATTERN,tokenTypes:[i]}});return r}je.findEmptyMatchRegExps=AG;var VIe=/[^\\[][\^]|^\^/;function lG(t){var e=function(n){_H(s,n);function s(){var o=n!==null&&n.apply(this,arguments)||this;return o.found=!1,o}return s.prototype.visitStartAnchor=function(o){this.found=!0},s}(XH.BaseRegExpVisitor),r=(0,Ee.filter)(t,function(n){var s=n[ao];try{var o=(0,ZH.getRegExpAst)(s),a=new e;return a.visit(o),a.found}catch(l){return VIe.test(s.source)}}),i=(0,Ee.map)(r,function(n){return{message:`Unexpected RegExp Anchor Error: + Token Type: ->`+n.name+`<- static 'PATTERN' cannot contain start of input anchor '^' + See https://chevrotain.io/docs/guide/resolving_lexer_errors.html#ANCHORS for details.`,type:zt.LexerDefinitionErrorType.SOI_ANCHOR_FOUND,tokenTypes:[n]}});return i}je.findStartOfInputAnchor=lG;function cG(t){var e=(0,Ee.filter)(t,function(i){var n=i[ao];return n instanceof RegExp&&(n.multiline||n.global)}),r=(0,Ee.map)(e,function(i){return{message:"Token Type: ->"+i.name+"<- static 'PATTERN' may NOT contain global('g') or multiline('m')",type:zt.LexerDefinitionErrorType.UNSUPPORTED_FLAGS_FOUND,tokenTypes:[i]}});return r}je.findUnsupportedFlags=cG;function uG(t){var e=[],r=(0,Ee.map)(t,function(s){return(0,Ee.reduce)(t,function(o,a){return s.PATTERN.source===a.PATTERN.source&&!(0,Ee.contains)(e,a)&&a.PATTERN!==zt.Lexer.NA&&(e.push(a),o.push(a)),o},[])});r=(0,Ee.compact)(r);var i=(0,Ee.filter)(r,function(s){return s.length>1}),n=(0,Ee.map)(i,function(s){var o=(0,Ee.map)(s,function(l){return l.name}),a=(0,Ee.first)(s).PATTERN;return{message:"The same RegExp pattern ->"+a+"<-"+("has been used in all of the following Token Types: "+o.join(", ")+" <-"),type:zt.LexerDefinitionErrorType.DUPLICATE_PATTERNS_FOUND,tokenTypes:s}});return n}je.findDuplicatePatterns=uG;function nG(t){var e=(0,Ee.filter)(t,function(i){if(!(0,Ee.has)(i,"GROUP"))return!1;var n=i.GROUP;return n!==zt.Lexer.SKIPPED&&n!==zt.Lexer.NA&&!(0,Ee.isString)(n)}),r=(0,Ee.map)(e,function(i){return{message:"Token Type: ->"+i.name+"<- static 'GROUP' can only be Lexer.SKIPPED/Lexer.NA/A String",type:zt.LexerDefinitionErrorType.INVALID_GROUP_TYPE_FOUND,tokenTypes:[i]}});return r}je.findInvalidGroupType=nG;function sG(t,e){var r=(0,Ee.filter)(t,function(n){return n.PUSH_MODE!==void 0&&!(0,Ee.contains)(e,n.PUSH_MODE)}),i=(0,Ee.map)(r,function(n){var s="Token Type: ->"+n.name+"<- static 'PUSH_MODE' value cannot refer to a Lexer Mode ->"+n.PUSH_MODE+"<-which does not exist";return{message:s,type:zt.LexerDefinitionErrorType.PUSH_MODE_DOES_NOT_EXIST,tokenTypes:[n]}});return i}je.findModesThatDoNotExist=sG;function oG(t){var e=[],r=(0,Ee.reduce)(t,function(i,n,s){var o=n.PATTERN;return o===zt.Lexer.NA||((0,Ee.isString)(o)?i.push({str:o,idx:s,tokenType:n}):(0,Ee.isRegExp)(o)&&XIe(o)&&i.push({str:o.source,idx:s,tokenType:n})),i},[]);return(0,Ee.forEach)(t,function(i,n){(0,Ee.forEach)(r,function(s){var o=s.str,a=s.idx,l=s.tokenType;if(n"+i.name+"<-")+`in the lexer's definition. +See https://chevrotain.io/docs/guide/resolving_lexer_errors.html#UNREACHABLE`;e.push({message:c,type:zt.LexerDefinitionErrorType.UNREACHABLE_PATTERN,tokenTypes:[i,l]})}})}),e}je.findUnreachablePatterns=oG;function _Ie(t,e){if((0,Ee.isRegExp)(e)){var r=e.exec(t);return r!==null&&r.index===0}else{if((0,Ee.isFunction)(e))return e(t,0,[],{});if((0,Ee.has)(e,"exec"))return e.exec(t,0,[],{});if(typeof e=="string")return e===t;throw Error("non exhaustive match")}}function XIe(t){var e=[".","\\","[","]","|","^","$","(",")","?","*","+","{"];return(0,Ee.find)(e,function(r){return t.source.indexOf(r)!==-1})===void 0}function jv(t){var e=t.ignoreCase?"i":"";return new RegExp("^(?:"+t.source+")",e)}je.addStartOfInput=jv;function Yv(t){var e=t.ignoreCase?"iy":"y";return new RegExp(""+t.source,e)}je.addStickyFlag=Yv;function ZIe(t,e,r){var i=[];return(0,Ee.has)(t,je.DEFAULT_MODE)||i.push({message:"A MultiMode Lexer cannot be initialized without a <"+je.DEFAULT_MODE+`> property in its definition +`,type:zt.LexerDefinitionErrorType.MULTI_MODE_LEXER_WITHOUT_DEFAULT_MODE}),(0,Ee.has)(t,je.MODES)||i.push({message:"A MultiMode Lexer cannot be initialized without a <"+je.MODES+`> property in its definition +`,type:zt.LexerDefinitionErrorType.MULTI_MODE_LEXER_WITHOUT_MODES_PROPERTY}),(0,Ee.has)(t,je.MODES)&&(0,Ee.has)(t,je.DEFAULT_MODE)&&!(0,Ee.has)(t.modes,t.defaultMode)&&i.push({message:"A MultiMode Lexer cannot be initialized with a "+je.DEFAULT_MODE+": <"+t.defaultMode+`>which does not exist +`,type:zt.LexerDefinitionErrorType.MULTI_MODE_LEXER_DEFAULT_MODE_VALUE_DOES_NOT_EXIST}),(0,Ee.has)(t,je.MODES)&&(0,Ee.forEach)(t.modes,function(n,s){(0,Ee.forEach)(n,function(o,a){(0,Ee.isUndefined)(o)&&i.push({message:"A Lexer cannot be initialized using an undefined Token Type. Mode:"+("<"+s+"> at index: <"+a+`> +`),type:zt.LexerDefinitionErrorType.LEXER_DEFINITION_CANNOT_CONTAIN_UNDEFINED})})}),i}je.performRuntimeChecks=ZIe;function $Ie(t,e,r){var i=[],n=!1,s=(0,Ee.compact)((0,Ee.flatten)((0,Ee.mapValues)(t.modes,function(l){return l}))),o=(0,Ee.reject)(s,function(l){return l[ao]===zt.Lexer.NA}),a=tG(r);return e&&(0,Ee.forEach)(o,function(l){var c=eG(l,a);if(c!==!1){var u=gG(l,c),g={message:u,type:c.issue,tokenType:l};i.push(g)}else(0,Ee.has)(l,"LINE_BREAKS")?l.LINE_BREAKS===!0&&(n=!0):(0,Eu.canMatchCharCode)(a,l.PATTERN)&&(n=!0)}),e&&!n&&i.push({message:`Warning: No LINE_BREAKS Found. + This Lexer has been defined to track line and column information, + But none of the Token Types can be identified as matching a line terminator. + See https://chevrotain.io/docs/guide/resolving_lexer_errors.html#LINE_BREAKS + for details.`,type:zt.LexerDefinitionErrorType.NO_LINE_BREAKS_FLAGS}),i}je.performWarningRuntimeChecks=$Ie;function eEe(t){var e={},r=(0,Ee.keys)(t);return(0,Ee.forEach)(r,function(i){var n=t[i];if((0,Ee.isArray)(n))e[i]=[];else throw Error("non exhaustive match")}),e}je.cloneEmptyGroups=eEe;function qv(t){var e=t.PATTERN;if((0,Ee.isRegExp)(e))return!1;if((0,Ee.isFunction)(e))return!0;if((0,Ee.has)(e,"exec"))return!0;if((0,Ee.isString)(e))return!1;throw Error("non exhaustive match")}je.isCustomPattern=qv;function $H(t){return(0,Ee.isString)(t)&&t.length===1?t.charCodeAt(0):!1}je.isShortPattern=$H;je.LineTerminatorOptimizedTester={test:function(t){for(var e=t.length,r=this.lastIndex;r Token Type +`)+(" Root cause: "+e.errMsg+`. +`)+" For details See: https://chevrotain.io/docs/guide/resolving_lexer_errors.html#IDENTIFY_TERMINATOR";if(e.issue===zt.LexerDefinitionErrorType.CUSTOM_LINE_BREAK)return`Warning: A Custom Token Pattern should specify the option. +`+(" The problem is in the <"+t.name+`> Token Type +`)+" For details See: https://chevrotain.io/docs/guide/resolving_lexer_errors.html#CUSTOM_LINE_BREAK";throw Error("non exhaustive match")}je.buildLineBreakIssueMessage=gG;function tG(t){var e=(0,Ee.map)(t,function(r){return(0,Ee.isString)(r)&&r.length>0?r.charCodeAt(0):r});return e}function Jv(t,e,r){t[e]===void 0?t[e]=[r]:t[e].push(r)}je.minOptimizationVal=256;var pE=[];function Wv(t){return t255?255+~~(t/255):t}}});var yu=I(Bt=>{"use strict";Object.defineProperty(Bt,"__esModule",{value:!0});Bt.isTokenType=Bt.hasExtendingTokensTypesMapProperty=Bt.hasExtendingTokensTypesProperty=Bt.hasCategoriesProperty=Bt.hasShortKeyProperty=Bt.singleAssignCategoriesToksMap=Bt.assignCategoriesMapProp=Bt.assignCategoriesTokensProp=Bt.assignTokenDefaultProps=Bt.expandCategories=Bt.augmentTokenTypes=Bt.tokenIdxToClass=Bt.tokenShortNameIdx=Bt.tokenStructuredMatcherNoCategories=Bt.tokenStructuredMatcher=void 0;var Kr=Dt();function tEe(t,e){var r=t.tokenTypeIdx;return r===e.tokenTypeIdx?!0:e.isParent===!0&&e.categoryMatchesMap[r]===!0}Bt.tokenStructuredMatcher=tEe;function rEe(t,e){return t.tokenTypeIdx===e.tokenTypeIdx}Bt.tokenStructuredMatcherNoCategories=rEe;Bt.tokenShortNameIdx=1;Bt.tokenIdxToClass={};function iEe(t){var e=fG(t);hG(e),dG(e),pG(e),(0,Kr.forEach)(e,function(r){r.isParent=r.categoryMatches.length>0})}Bt.augmentTokenTypes=iEe;function fG(t){for(var e=(0,Kr.cloneArr)(t),r=t,i=!0;i;){r=(0,Kr.compact)((0,Kr.flatten)((0,Kr.map)(r,function(s){return s.CATEGORIES})));var n=(0,Kr.difference)(r,e);e=e.concat(n),(0,Kr.isEmpty)(n)?i=!1:r=n}return e}Bt.expandCategories=fG;function hG(t){(0,Kr.forEach)(t,function(e){CG(e)||(Bt.tokenIdxToClass[Bt.tokenShortNameIdx]=e,e.tokenTypeIdx=Bt.tokenShortNameIdx++),zv(e)&&!(0,Kr.isArray)(e.CATEGORIES)&&(e.CATEGORIES=[e.CATEGORIES]),zv(e)||(e.CATEGORIES=[]),mG(e)||(e.categoryMatches=[]),IG(e)||(e.categoryMatchesMap={})})}Bt.assignTokenDefaultProps=hG;function pG(t){(0,Kr.forEach)(t,function(e){e.categoryMatches=[],(0,Kr.forEach)(e.categoryMatchesMap,function(r,i){e.categoryMatches.push(Bt.tokenIdxToClass[i].tokenTypeIdx)})})}Bt.assignCategoriesTokensProp=pG;function dG(t){(0,Kr.forEach)(t,function(e){Vv([],e)})}Bt.assignCategoriesMapProp=dG;function Vv(t,e){(0,Kr.forEach)(t,function(r){e.categoryMatchesMap[r.tokenTypeIdx]=!0}),(0,Kr.forEach)(e.CATEGORIES,function(r){var i=t.concat(e);(0,Kr.contains)(i,r)||Vv(i,r)})}Bt.singleAssignCategoriesToksMap=Vv;function CG(t){return(0,Kr.has)(t,"tokenTypeIdx")}Bt.hasShortKeyProperty=CG;function zv(t){return(0,Kr.has)(t,"CATEGORIES")}Bt.hasCategoriesProperty=zv;function mG(t){return(0,Kr.has)(t,"categoryMatches")}Bt.hasExtendingTokensTypesProperty=mG;function IG(t){return(0,Kr.has)(t,"categoryMatchesMap")}Bt.hasExtendingTokensTypesMapProperty=IG;function nEe(t){return(0,Kr.has)(t,"tokenTypeIdx")}Bt.isTokenType=nEe});var _v=I(dE=>{"use strict";Object.defineProperty(dE,"__esModule",{value:!0});dE.defaultLexerErrorProvider=void 0;dE.defaultLexerErrorProvider={buildUnableToPopLexerModeMessage:function(t){return"Unable to pop Lexer Mode after encountering Token ->"+t.image+"<- The Mode Stack is empty"},buildUnexpectedCharactersMessage:function(t,e,r,i,n){return"unexpected character: ->"+t.charAt(e)+"<- at offset: "+e+","+(" skipped "+r+" characters.")}}});var Gh=I(Rl=>{"use strict";Object.defineProperty(Rl,"__esModule",{value:!0});Rl.Lexer=Rl.LexerDefinitionErrorType=void 0;var Ps=Hv(),Vt=Dt(),sEe=yu(),oEe=_v(),aEe=gE(),AEe;(function(t){t[t.MISSING_PATTERN=0]="MISSING_PATTERN",t[t.INVALID_PATTERN=1]="INVALID_PATTERN",t[t.EOI_ANCHOR_FOUND=2]="EOI_ANCHOR_FOUND",t[t.UNSUPPORTED_FLAGS_FOUND=3]="UNSUPPORTED_FLAGS_FOUND",t[t.DUPLICATE_PATTERNS_FOUND=4]="DUPLICATE_PATTERNS_FOUND",t[t.INVALID_GROUP_TYPE_FOUND=5]="INVALID_GROUP_TYPE_FOUND",t[t.PUSH_MODE_DOES_NOT_EXIST=6]="PUSH_MODE_DOES_NOT_EXIST",t[t.MULTI_MODE_LEXER_WITHOUT_DEFAULT_MODE=7]="MULTI_MODE_LEXER_WITHOUT_DEFAULT_MODE",t[t.MULTI_MODE_LEXER_WITHOUT_MODES_PROPERTY=8]="MULTI_MODE_LEXER_WITHOUT_MODES_PROPERTY",t[t.MULTI_MODE_LEXER_DEFAULT_MODE_VALUE_DOES_NOT_EXIST=9]="MULTI_MODE_LEXER_DEFAULT_MODE_VALUE_DOES_NOT_EXIST",t[t.LEXER_DEFINITION_CANNOT_CONTAIN_UNDEFINED=10]="LEXER_DEFINITION_CANNOT_CONTAIN_UNDEFINED",t[t.SOI_ANCHOR_FOUND=11]="SOI_ANCHOR_FOUND",t[t.EMPTY_MATCH_PATTERN=12]="EMPTY_MATCH_PATTERN",t[t.NO_LINE_BREAKS_FLAGS=13]="NO_LINE_BREAKS_FLAGS",t[t.UNREACHABLE_PATTERN=14]="UNREACHABLE_PATTERN",t[t.IDENTIFY_TERMINATOR=15]="IDENTIFY_TERMINATOR",t[t.CUSTOM_LINE_BREAK=16]="CUSTOM_LINE_BREAK"})(AEe=Rl.LexerDefinitionErrorType||(Rl.LexerDefinitionErrorType={}));var jh={deferDefinitionErrorsHandling:!1,positionTracking:"full",lineTerminatorsPattern:/\n|\r\n?/g,lineTerminatorCharacters:[` +`,"\r"],ensureOptimizations:!1,safeMode:!1,errorMessageProvider:oEe.defaultLexerErrorProvider,traceInitPerf:!1,skipValidations:!1};Object.freeze(jh);var lEe=function(){function t(e,r){var i=this;if(r===void 0&&(r=jh),this.lexerDefinition=e,this.lexerDefinitionErrors=[],this.lexerDefinitionWarning=[],this.patternIdxToConfig={},this.charCodeToPatternIdxToConfig={},this.modes=[],this.emptyGroups={},this.config=void 0,this.trackStartLines=!0,this.trackEndLines=!0,this.hasCustom=!1,this.canModeBeOptimized={},typeof r=="boolean")throw Error(`The second argument to the Lexer constructor is now an ILexerConfig Object. +a boolean 2nd argument is no longer supported`);this.config=(0,Vt.merge)(jh,r);var n=this.config.traceInitPerf;n===!0?(this.traceInitMaxIdent=Infinity,this.traceInitPerf=!0):typeof n=="number"&&(this.traceInitMaxIdent=n,this.traceInitPerf=!0),this.traceInitIndent=-1,this.TRACE_INIT("Lexer Constructor",function(){var s,o=!0;i.TRACE_INIT("Lexer Config handling",function(){if(i.config.lineTerminatorsPattern===jh.lineTerminatorsPattern)i.config.lineTerminatorsPattern=Ps.LineTerminatorOptimizedTester;else if(i.config.lineTerminatorCharacters===jh.lineTerminatorCharacters)throw Error(`Error: Missing property on the Lexer config. + For details See: https://chevrotain.io/docs/guide/resolving_lexer_errors.html#MISSING_LINE_TERM_CHARS`);if(r.safeMode&&r.ensureOptimizations)throw Error('"safeMode" and "ensureOptimizations" flags are mutually exclusive.');i.trackStartLines=/full|onlyStart/i.test(i.config.positionTracking),i.trackEndLines=/full/i.test(i.config.positionTracking),(0,Vt.isArray)(e)?(s={modes:{}},s.modes[Ps.DEFAULT_MODE]=(0,Vt.cloneArr)(e),s[Ps.DEFAULT_MODE]=Ps.DEFAULT_MODE):(o=!1,s=(0,Vt.cloneObj)(e))}),i.config.skipValidations===!1&&(i.TRACE_INIT("performRuntimeChecks",function(){i.lexerDefinitionErrors=i.lexerDefinitionErrors.concat((0,Ps.performRuntimeChecks)(s,i.trackStartLines,i.config.lineTerminatorCharacters))}),i.TRACE_INIT("performWarningRuntimeChecks",function(){i.lexerDefinitionWarning=i.lexerDefinitionWarning.concat((0,Ps.performWarningRuntimeChecks)(s,i.trackStartLines,i.config.lineTerminatorCharacters))})),s.modes=s.modes?s.modes:{},(0,Vt.forEach)(s.modes,function(u,g){s.modes[g]=(0,Vt.reject)(u,function(f){return(0,Vt.isUndefined)(f)})});var a=(0,Vt.keys)(s.modes);if((0,Vt.forEach)(s.modes,function(u,g){i.TRACE_INIT("Mode: <"+g+"> processing",function(){if(i.modes.push(g),i.config.skipValidations===!1&&i.TRACE_INIT("validatePatterns",function(){i.lexerDefinitionErrors=i.lexerDefinitionErrors.concat((0,Ps.validatePatterns)(u,a))}),(0,Vt.isEmpty)(i.lexerDefinitionErrors)){(0,sEe.augmentTokenTypes)(u);var f;i.TRACE_INIT("analyzeTokenTypes",function(){f=(0,Ps.analyzeTokenTypes)(u,{lineTerminatorCharacters:i.config.lineTerminatorCharacters,positionTracking:r.positionTracking,ensureOptimizations:r.ensureOptimizations,safeMode:r.safeMode,tracer:i.TRACE_INIT.bind(i)})}),i.patternIdxToConfig[g]=f.patternIdxToConfig,i.charCodeToPatternIdxToConfig[g]=f.charCodeToPatternIdxToConfig,i.emptyGroups=(0,Vt.merge)(i.emptyGroups,f.emptyGroups),i.hasCustom=f.hasCustom||i.hasCustom,i.canModeBeOptimized[g]=f.canBeOptimized}})}),i.defaultMode=s.defaultMode,!(0,Vt.isEmpty)(i.lexerDefinitionErrors)&&!i.config.deferDefinitionErrorsHandling){var l=(0,Vt.map)(i.lexerDefinitionErrors,function(u){return u.message}),c=l.join(`----------------------- +`);throw new Error(`Errors detected in definition of Lexer: +`+c)}(0,Vt.forEach)(i.lexerDefinitionWarning,function(u){(0,Vt.PRINT_WARNING)(u.message)}),i.TRACE_INIT("Choosing sub-methods implementations",function(){if(Ps.SUPPORT_STICKY?(i.chopInput=Vt.IDENTITY,i.match=i.matchWithTest):(i.updateLastIndex=Vt.NOOP,i.match=i.matchWithExec),o&&(i.handleModes=Vt.NOOP),i.trackStartLines===!1&&(i.computeNewColumn=Vt.IDENTITY),i.trackEndLines===!1&&(i.updateTokenEndLineColumnLocation=Vt.NOOP),/full/i.test(i.config.positionTracking))i.createTokenInstance=i.createFullToken;else if(/onlyStart/i.test(i.config.positionTracking))i.createTokenInstance=i.createStartOnlyToken;else if(/onlyOffset/i.test(i.config.positionTracking))i.createTokenInstance=i.createOffsetOnlyToken;else throw Error('Invalid config option: "'+i.config.positionTracking+'"');i.hasCustom?(i.addToken=i.addTokenUsingPush,i.handlePayload=i.handlePayloadWithCustom):(i.addToken=i.addTokenUsingMemberAccess,i.handlePayload=i.handlePayloadNoCustom)}),i.TRACE_INIT("Failed Optimization Warnings",function(){var u=(0,Vt.reduce)(i.canModeBeOptimized,function(g,f,h){return f===!1&&g.push(h),g},[]);if(r.ensureOptimizations&&!(0,Vt.isEmpty)(u))throw Error("Lexer Modes: < "+u.join(", ")+` > cannot be optimized. + Disable the "ensureOptimizations" lexer config flag to silently ignore this and run the lexer in an un-optimized mode. + Or inspect the console log for details on how to resolve these issues.`)}),i.TRACE_INIT("clearRegExpParserCache",function(){(0,aEe.clearRegExpParserCache)()}),i.TRACE_INIT("toFastProperties",function(){(0,Vt.toFastProperties)(i)})})}return t.prototype.tokenize=function(e,r){if(r===void 0&&(r=this.defaultMode),!(0,Vt.isEmpty)(this.lexerDefinitionErrors)){var i=(0,Vt.map)(this.lexerDefinitionErrors,function(o){return o.message}),n=i.join(`----------------------- +`);throw new Error(`Unable to Tokenize because Errors detected in definition of Lexer: +`+n)}var s=this.tokenizeInternal(e,r);return s},t.prototype.tokenizeInternal=function(e,r){var i=this,n,s,o,a,l,c,u,g,f,h,p,d,m,E,B,b,R=e,H=R.length,L=0,K=0,J=this.hasCustom?0:Math.floor(e.length/10),ne=new Array(J),q=[],A=this.trackStartLines?1:void 0,V=this.trackStartLines?1:void 0,W=(0,Ps.cloneEmptyGroups)(this.emptyGroups),X=this.trackStartLines,F=this.config.lineTerminatorsPattern,D=0,he=[],pe=[],Ne=[],Pe=[];Object.freeze(Pe);var qe=void 0;function re(){return he}function se(wr){var Ui=(0,Ps.charCodeToOptimizedIndex)(wr),ws=pe[Ui];return ws===void 0?Pe:ws}var be=function(wr){if(Ne.length===1&&wr.tokenType.PUSH_MODE===void 0){var Ui=i.config.errorMessageProvider.buildUnableToPopLexerModeMessage(wr);q.push({offset:wr.startOffset,line:wr.startLine!==void 0?wr.startLine:void 0,column:wr.startColumn!==void 0?wr.startColumn:void 0,length:wr.image.length,message:Ui})}else{Ne.pop();var ws=(0,Vt.last)(Ne);he=i.patternIdxToConfig[ws],pe=i.charCodeToPatternIdxToConfig[ws],D=he.length;var Tf=i.canModeBeOptimized[ws]&&i.config.safeMode===!1;pe&&Tf?qe=se:qe=re}};function ae(wr){Ne.push(wr),pe=this.charCodeToPatternIdxToConfig[wr],he=this.patternIdxToConfig[wr],D=he.length,D=he.length;var Ui=this.canModeBeOptimized[wr]&&this.config.safeMode===!1;pe&&Ui?qe=se:qe=re}ae.call(this,r);for(var Ae;Lc.length){c=a,u=g,Ae=Oe;break}}}break}}if(c!==null){if(f=c.length,h=Ae.group,h!==void 0&&(p=Ae.tokenTypeIdx,d=this.createTokenInstance(c,L,p,Ae.tokenType,A,V,f),this.handlePayload(d,u),h===!1?K=this.addToken(ne,K,d):W[h].push(d)),e=this.chopInput(e,f),L=L+f,V=this.computeNewColumn(V,f),X===!0&&Ae.canLineTerminator===!0){var dt=0,ri=void 0,ii=void 0;F.lastIndex=0;do ri=F.test(c),ri===!0&&(ii=F.lastIndex-1,dt++);while(ri===!0);dt!==0&&(A=A+dt,V=f-ii,this.updateTokenEndLineColumnLocation(d,h,ii,dt,A,V,f))}this.handleModes(Ae,be,ae,d)}else{for(var an=L,yr=A,Ki=V,Qi=!1;!Qi&&L <"+e+">");var n=(0,Vt.timer)(r),s=n.time,o=n.value,a=s>10?console.warn:console.log;return this.traceInitIndent time: "+s+"ms"),this.traceInitIndent--,o}else return r()},t.SKIPPED="This marks a skipped Token pattern, this means each token identified by it willbe consumed and then thrown into oblivion, this can be used to for example to completely ignore whitespace.",t.NA=/NOT_APPLICABLE/,t}();Rl.Lexer=lEe});var nA=I(Ci=>{"use strict";Object.defineProperty(Ci,"__esModule",{value:!0});Ci.tokenMatcher=Ci.createTokenInstance=Ci.EOF=Ci.createToken=Ci.hasTokenLabel=Ci.tokenName=Ci.tokenLabel=void 0;var Ds=Dt(),cEe=Gh(),Xv=yu();function uEe(t){return EG(t)?t.LABEL:t.name}Ci.tokenLabel=uEe;function gEe(t){return t.name}Ci.tokenName=gEe;function EG(t){return(0,Ds.isString)(t.LABEL)&&t.LABEL!==""}Ci.hasTokenLabel=EG;var fEe="parent",yG="categories",wG="label",BG="group",QG="push_mode",bG="pop_mode",vG="longer_alt",SG="line_breaks",xG="start_chars_hint";function kG(t){return hEe(t)}Ci.createToken=kG;function hEe(t){var e=t.pattern,r={};if(r.name=t.name,(0,Ds.isUndefined)(e)||(r.PATTERN=e),(0,Ds.has)(t,fEe))throw`The parent property is no longer supported. +See: https://github.com/chevrotain/chevrotain/issues/564#issuecomment-349062346 for details.`;return(0,Ds.has)(t,yG)&&(r.CATEGORIES=t[yG]),(0,Xv.augmentTokenTypes)([r]),(0,Ds.has)(t,wG)&&(r.LABEL=t[wG]),(0,Ds.has)(t,BG)&&(r.GROUP=t[BG]),(0,Ds.has)(t,bG)&&(r.POP_MODE=t[bG]),(0,Ds.has)(t,QG)&&(r.PUSH_MODE=t[QG]),(0,Ds.has)(t,vG)&&(r.LONGER_ALT=t[vG]),(0,Ds.has)(t,SG)&&(r.LINE_BREAKS=t[SG]),(0,Ds.has)(t,xG)&&(r.START_CHARS_HINT=t[xG]),r}Ci.EOF=kG({name:"EOF",pattern:cEe.Lexer.NA});(0,Xv.augmentTokenTypes)([Ci.EOF]);function pEe(t,e,r,i,n,s,o,a){return{image:e,startOffset:r,endOffset:i,startLine:n,endLine:s,startColumn:o,endColumn:a,tokenTypeIdx:t.tokenTypeIdx,tokenType:t}}Ci.createTokenInstance=pEe;function dEe(t,e){return(0,Xv.tokenStructuredMatcher)(t,e)}Ci.tokenMatcher=dEe});var hn=I(Tt=>{"use strict";var oa=Tt&&Tt.__extends||function(){var t=function(e,r){return t=Object.setPrototypeOf||{__proto__:[]}instanceof Array&&function(i,n){i.__proto__=n}||function(i,n){for(var s in n)Object.prototype.hasOwnProperty.call(n,s)&&(i[s]=n[s])},t(e,r)};return function(e,r){if(typeof r!="function"&&r!==null)throw new TypeError("Class extends value "+String(r)+" is not a constructor or null");t(e,r);function i(){this.constructor=e}e.prototype=r===null?Object.create(r):(i.prototype=r.prototype,new i)}}();Object.defineProperty(Tt,"__esModule",{value:!0});Tt.serializeProduction=Tt.serializeGrammar=Tt.Terminal=Tt.Alternation=Tt.RepetitionWithSeparator=Tt.Repetition=Tt.RepetitionMandatoryWithSeparator=Tt.RepetitionMandatory=Tt.Option=Tt.Alternative=Tt.Rule=Tt.NonTerminal=Tt.AbstractProduction=void 0;var $t=Dt(),CEe=nA(),Ao=function(){function t(e){this._definition=e}return Object.defineProperty(t.prototype,"definition",{get:function(){return this._definition},set:function(e){this._definition=e},enumerable:!1,configurable:!0}),t.prototype.accept=function(e){e.visit(this),(0,$t.forEach)(this.definition,function(r){r.accept(e)})},t}();Tt.AbstractProduction=Ao;var PG=function(t){oa(e,t);function e(r){var i=t.call(this,[])||this;return i.idx=1,(0,$t.assign)(i,(0,$t.pick)(r,function(n){return n!==void 0})),i}return Object.defineProperty(e.prototype,"definition",{get:function(){return this.referencedRule!==void 0?this.referencedRule.definition:[]},set:function(r){},enumerable:!1,configurable:!0}),e.prototype.accept=function(r){r.visit(this)},e}(Ao);Tt.NonTerminal=PG;var DG=function(t){oa(e,t);function e(r){var i=t.call(this,r.definition)||this;return i.orgText="",(0,$t.assign)(i,(0,$t.pick)(r,function(n){return n!==void 0})),i}return e}(Ao);Tt.Rule=DG;var RG=function(t){oa(e,t);function e(r){var i=t.call(this,r.definition)||this;return i.ignoreAmbiguities=!1,(0,$t.assign)(i,(0,$t.pick)(r,function(n){return n!==void 0})),i}return e}(Ao);Tt.Alternative=RG;var FG=function(t){oa(e,t);function e(r){var i=t.call(this,r.definition)||this;return i.idx=1,(0,$t.assign)(i,(0,$t.pick)(r,function(n){return n!==void 0})),i}return e}(Ao);Tt.Option=FG;var NG=function(t){oa(e,t);function e(r){var i=t.call(this,r.definition)||this;return i.idx=1,(0,$t.assign)(i,(0,$t.pick)(r,function(n){return n!==void 0})),i}return e}(Ao);Tt.RepetitionMandatory=NG;var LG=function(t){oa(e,t);function e(r){var i=t.call(this,r.definition)||this;return i.idx=1,(0,$t.assign)(i,(0,$t.pick)(r,function(n){return n!==void 0})),i}return e}(Ao);Tt.RepetitionMandatoryWithSeparator=LG;var TG=function(t){oa(e,t);function e(r){var i=t.call(this,r.definition)||this;return i.idx=1,(0,$t.assign)(i,(0,$t.pick)(r,function(n){return n!==void 0})),i}return e}(Ao);Tt.Repetition=TG;var MG=function(t){oa(e,t);function e(r){var i=t.call(this,r.definition)||this;return i.idx=1,(0,$t.assign)(i,(0,$t.pick)(r,function(n){return n!==void 0})),i}return e}(Ao);Tt.RepetitionWithSeparator=MG;var OG=function(t){oa(e,t);function e(r){var i=t.call(this,r.definition)||this;return i.idx=1,i.ignoreAmbiguities=!1,i.hasPredicates=!1,(0,$t.assign)(i,(0,$t.pick)(r,function(n){return n!==void 0})),i}return Object.defineProperty(e.prototype,"definition",{get:function(){return this._definition},set:function(r){this._definition=r},enumerable:!1,configurable:!0}),e}(Ao);Tt.Alternation=OG;var CE=function(){function t(e){this.idx=1,(0,$t.assign)(this,(0,$t.pick)(e,function(r){return r!==void 0}))}return t.prototype.accept=function(e){e.visit(this)},t}();Tt.Terminal=CE;function mEe(t){return(0,$t.map)(t,Yh)}Tt.serializeGrammar=mEe;function Yh(t){function e(s){return(0,$t.map)(s,Yh)}if(t instanceof PG){var r={type:"NonTerminal",name:t.nonTerminalName,idx:t.idx};return(0,$t.isString)(t.label)&&(r.label=t.label),r}else{if(t instanceof RG)return{type:"Alternative",definition:e(t.definition)};if(t instanceof FG)return{type:"Option",idx:t.idx,definition:e(t.definition)};if(t instanceof NG)return{type:"RepetitionMandatory",idx:t.idx,definition:e(t.definition)};if(t instanceof LG)return{type:"RepetitionMandatoryWithSeparator",idx:t.idx,separator:Yh(new CE({terminalType:t.separator})),definition:e(t.definition)};if(t instanceof MG)return{type:"RepetitionWithSeparator",idx:t.idx,separator:Yh(new CE({terminalType:t.separator})),definition:e(t.definition)};if(t instanceof TG)return{type:"Repetition",idx:t.idx,definition:e(t.definition)};if(t instanceof OG)return{type:"Alternation",idx:t.idx,definition:e(t.definition)};if(t instanceof CE){var i={type:"Terminal",name:t.terminalType.name,label:(0,CEe.tokenLabel)(t.terminalType),idx:t.idx};(0,$t.isString)(t.label)&&(i.terminalLabel=t.label);var n=t.terminalType.PATTERN;return t.terminalType.PATTERN&&(i.pattern=(0,$t.isRegExp)(n)?n.source:n),i}else{if(t instanceof DG)return{type:"Rule",name:t.name,orgText:t.orgText,definition:e(t.definition)};throw Error("non exhaustive match")}}}Tt.serializeProduction=Yh});var IE=I(mE=>{"use strict";Object.defineProperty(mE,"__esModule",{value:!0});mE.RestWalker=void 0;var Zv=Dt(),pn=hn(),IEe=function(){function t(){}return t.prototype.walk=function(e,r){var i=this;r===void 0&&(r=[]),(0,Zv.forEach)(e.definition,function(n,s){var o=(0,Zv.drop)(e.definition,s+1);if(n instanceof pn.NonTerminal)i.walkProdRef(n,o,r);else if(n instanceof pn.Terminal)i.walkTerminal(n,o,r);else if(n instanceof pn.Alternative)i.walkFlat(n,o,r);else if(n instanceof pn.Option)i.walkOption(n,o,r);else if(n instanceof pn.RepetitionMandatory)i.walkAtLeastOne(n,o,r);else if(n instanceof pn.RepetitionMandatoryWithSeparator)i.walkAtLeastOneSep(n,o,r);else if(n instanceof pn.RepetitionWithSeparator)i.walkManySep(n,o,r);else if(n instanceof pn.Repetition)i.walkMany(n,o,r);else if(n instanceof pn.Alternation)i.walkOr(n,o,r);else throw Error("non exhaustive match")})},t.prototype.walkTerminal=function(e,r,i){},t.prototype.walkProdRef=function(e,r,i){},t.prototype.walkFlat=function(e,r,i){var n=r.concat(i);this.walk(e,n)},t.prototype.walkOption=function(e,r,i){var n=r.concat(i);this.walk(e,n)},t.prototype.walkAtLeastOne=function(e,r,i){var n=[new pn.Option({definition:e.definition})].concat(r,i);this.walk(e,n)},t.prototype.walkAtLeastOneSep=function(e,r,i){var n=KG(e,r,i);this.walk(e,n)},t.prototype.walkMany=function(e,r,i){var n=[new pn.Option({definition:e.definition})].concat(r,i);this.walk(e,n)},t.prototype.walkManySep=function(e,r,i){var n=KG(e,r,i);this.walk(e,n)},t.prototype.walkOr=function(e,r,i){var n=this,s=r.concat(i);(0,Zv.forEach)(e.definition,function(o){var a=new pn.Alternative({definition:[o]});n.walk(a,s)})},t}();mE.RestWalker=IEe;function KG(t,e,r){var i=[new pn.Option({definition:[new pn.Terminal({terminalType:t.separator})].concat(t.definition)})],n=i.concat(e,r);return n}});var wu=I(EE=>{"use strict";Object.defineProperty(EE,"__esModule",{value:!0});EE.GAstVisitor=void 0;var lo=hn(),EEe=function(){function t(){}return t.prototype.visit=function(e){var r=e;switch(r.constructor){case lo.NonTerminal:return this.visitNonTerminal(r);case lo.Alternative:return this.visitAlternative(r);case lo.Option:return this.visitOption(r);case lo.RepetitionMandatory:return this.visitRepetitionMandatory(r);case lo.RepetitionMandatoryWithSeparator:return this.visitRepetitionMandatoryWithSeparator(r);case lo.RepetitionWithSeparator:return this.visitRepetitionWithSeparator(r);case lo.Repetition:return this.visitRepetition(r);case lo.Alternation:return this.visitAlternation(r);case lo.Terminal:return this.visitTerminal(r);case lo.Rule:return this.visitRule(r);default:throw Error("non exhaustive match")}},t.prototype.visitNonTerminal=function(e){},t.prototype.visitAlternative=function(e){},t.prototype.visitOption=function(e){},t.prototype.visitRepetition=function(e){},t.prototype.visitRepetitionMandatory=function(e){},t.prototype.visitRepetitionMandatoryWithSeparator=function(e){},t.prototype.visitRepetitionWithSeparator=function(e){},t.prototype.visitAlternation=function(e){},t.prototype.visitTerminal=function(e){},t.prototype.visitRule=function(e){},t}();EE.GAstVisitor=EEe});var Jh=I(Si=>{"use strict";var yEe=Si&&Si.__extends||function(){var t=function(e,r){return t=Object.setPrototypeOf||{__proto__:[]}instanceof Array&&function(i,n){i.__proto__=n}||function(i,n){for(var s in n)Object.prototype.hasOwnProperty.call(n,s)&&(i[s]=n[s])},t(e,r)};return function(e,r){if(typeof r!="function"&&r!==null)throw new TypeError("Class extends value "+String(r)+" is not a constructor or null");t(e,r);function i(){this.constructor=e}e.prototype=r===null?Object.create(r):(i.prototype=r.prototype,new i)}}();Object.defineProperty(Si,"__esModule",{value:!0});Si.collectMethods=Si.DslMethodsCollectorVisitor=Si.getProductionDslName=Si.isBranchingProd=Si.isOptionalProd=Si.isSequenceProd=void 0;var qh=Dt(),dr=hn(),wEe=wu();function BEe(t){return t instanceof dr.Alternative||t instanceof dr.Option||t instanceof dr.Repetition||t instanceof dr.RepetitionMandatory||t instanceof dr.RepetitionMandatoryWithSeparator||t instanceof dr.RepetitionWithSeparator||t instanceof dr.Terminal||t instanceof dr.Rule}Si.isSequenceProd=BEe;function $v(t,e){e===void 0&&(e=[]);var r=t instanceof dr.Option||t instanceof dr.Repetition||t instanceof dr.RepetitionWithSeparator;return r?!0:t instanceof dr.Alternation?(0,qh.some)(t.definition,function(i){return $v(i,e)}):t instanceof dr.NonTerminal&&(0,qh.contains)(e,t)?!1:t instanceof dr.AbstractProduction?(t instanceof dr.NonTerminal&&e.push(t),(0,qh.every)(t.definition,function(i){return $v(i,e)})):!1}Si.isOptionalProd=$v;function QEe(t){return t instanceof dr.Alternation}Si.isBranchingProd=QEe;function bEe(t){if(t instanceof dr.NonTerminal)return"SUBRULE";if(t instanceof dr.Option)return"OPTION";if(t instanceof dr.Alternation)return"OR";if(t instanceof dr.RepetitionMandatory)return"AT_LEAST_ONE";if(t instanceof dr.RepetitionMandatoryWithSeparator)return"AT_LEAST_ONE_SEP";if(t instanceof dr.RepetitionWithSeparator)return"MANY_SEP";if(t instanceof dr.Repetition)return"MANY";if(t instanceof dr.Terminal)return"CONSUME";throw Error("non exhaustive match")}Si.getProductionDslName=bEe;var UG=function(t){yEe(e,t);function e(){var r=t!==null&&t.apply(this,arguments)||this;return r.separator="-",r.dslMethods={option:[],alternation:[],repetition:[],repetitionWithSeparator:[],repetitionMandatory:[],repetitionMandatoryWithSeparator:[]},r}return e.prototype.reset=function(){this.dslMethods={option:[],alternation:[],repetition:[],repetitionWithSeparator:[],repetitionMandatory:[],repetitionMandatoryWithSeparator:[]}},e.prototype.visitTerminal=function(r){var i=r.terminalType.name+this.separator+"Terminal";(0,qh.has)(this.dslMethods,i)||(this.dslMethods[i]=[]),this.dslMethods[i].push(r)},e.prototype.visitNonTerminal=function(r){var i=r.nonTerminalName+this.separator+"Terminal";(0,qh.has)(this.dslMethods,i)||(this.dslMethods[i]=[]),this.dslMethods[i].push(r)},e.prototype.visitOption=function(r){this.dslMethods.option.push(r)},e.prototype.visitRepetitionWithSeparator=function(r){this.dslMethods.repetitionWithSeparator.push(r)},e.prototype.visitRepetitionMandatory=function(r){this.dslMethods.repetitionMandatory.push(r)},e.prototype.visitRepetitionMandatoryWithSeparator=function(r){this.dslMethods.repetitionMandatoryWithSeparator.push(r)},e.prototype.visitRepetition=function(r){this.dslMethods.repetition.push(r)},e.prototype.visitAlternation=function(r){this.dslMethods.alternation.push(r)},e}(wEe.GAstVisitor);Si.DslMethodsCollectorVisitor=UG;var yE=new UG;function vEe(t){yE.reset(),t.accept(yE);var e=yE.dslMethods;return yE.reset(),e}Si.collectMethods=vEe});var tS=I(co=>{"use strict";Object.defineProperty(co,"__esModule",{value:!0});co.firstForTerminal=co.firstForBranching=co.firstForSequence=co.first=void 0;var wE=Dt(),HG=hn(),eS=Jh();function BE(t){if(t instanceof HG.NonTerminal)return BE(t.referencedRule);if(t instanceof HG.Terminal)return YG(t);if((0,eS.isSequenceProd)(t))return GG(t);if((0,eS.isBranchingProd)(t))return jG(t);throw Error("non exhaustive match")}co.first=BE;function GG(t){for(var e=[],r=t.definition,i=0,n=r.length>i,s,o=!0;n&&o;)s=r[i],o=(0,eS.isOptionalProd)(s),e=e.concat(BE(s)),i=i+1,n=r.length>i;return(0,wE.uniq)(e)}co.firstForSequence=GG;function jG(t){var e=(0,wE.map)(t.definition,function(r){return BE(r)});return(0,wE.uniq)((0,wE.flatten)(e))}co.firstForBranching=jG;function YG(t){return[t.terminalType]}co.firstForTerminal=YG});var rS=I(QE=>{"use strict";Object.defineProperty(QE,"__esModule",{value:!0});QE.IN=void 0;QE.IN="_~IN~_"});var VG=I(es=>{"use strict";var SEe=es&&es.__extends||function(){var t=function(e,r){return t=Object.setPrototypeOf||{__proto__:[]}instanceof Array&&function(i,n){i.__proto__=n}||function(i,n){for(var s in n)Object.prototype.hasOwnProperty.call(n,s)&&(i[s]=n[s])},t(e,r)};return function(e,r){if(typeof r!="function"&&r!==null)throw new TypeError("Class extends value "+String(r)+" is not a constructor or null");t(e,r);function i(){this.constructor=e}e.prototype=r===null?Object.create(r):(i.prototype=r.prototype,new i)}}();Object.defineProperty(es,"__esModule",{value:!0});es.buildInProdFollowPrefix=es.buildBetweenProdsFollowPrefix=es.computeAllProdsFollows=es.ResyncFollowsWalker=void 0;var xEe=IE(),kEe=tS(),qG=Dt(),JG=rS(),PEe=hn(),zG=function(t){SEe(e,t);function e(r){var i=t.call(this)||this;return i.topProd=r,i.follows={},i}return e.prototype.startWalking=function(){return this.walk(this.topProd),this.follows},e.prototype.walkTerminal=function(r,i,n){},e.prototype.walkProdRef=function(r,i,n){var s=WG(r.referencedRule,r.idx)+this.topProd.name,o=i.concat(n),a=new PEe.Alternative({definition:o}),l=(0,kEe.first)(a);this.follows[s]=l},e}(xEe.RestWalker);es.ResyncFollowsWalker=zG;function DEe(t){var e={};return(0,qG.forEach)(t,function(r){var i=new zG(r).startWalking();(0,qG.assign)(e,i)}),e}es.computeAllProdsFollows=DEe;function WG(t,e){return t.name+e+JG.IN}es.buildBetweenProdsFollowPrefix=WG;function REe(t){var e=t.terminalType.name;return e+t.idx+JG.IN}es.buildInProdFollowPrefix=REe});var Wh=I(aa=>{"use strict";Object.defineProperty(aa,"__esModule",{value:!0});aa.defaultGrammarValidatorErrorProvider=aa.defaultGrammarResolverErrorProvider=aa.defaultParserErrorProvider=void 0;var Bu=nA(),FEe=Dt(),Rs=Dt(),iS=hn(),_G=Jh();aa.defaultParserErrorProvider={buildMismatchTokenMessage:function(t){var e=t.expected,r=t.actual,i=t.previous,n=t.ruleName,s=(0,Bu.hasTokenLabel)(e),o=s?"--> "+(0,Bu.tokenLabel)(e)+" <--":"token of type --> "+e.name+" <--",a="Expecting "+o+" but found --> '"+r.image+"' <--";return a},buildNotAllInputParsedMessage:function(t){var e=t.firstRedundant,r=t.ruleName;return"Redundant input, expecting EOF but found: "+e.image},buildNoViableAltMessage:function(t){var e=t.expectedPathsPerAlt,r=t.actual,i=t.previous,n=t.customUserDescription,s=t.ruleName,o="Expecting: ",a=(0,Rs.first)(r).image,l=` +but found: '`+a+"'";if(n)return o+n+l;var c=(0,Rs.reduce)(e,function(h,p){return h.concat(p)},[]),u=(0,Rs.map)(c,function(h){return"["+(0,Rs.map)(h,function(p){return(0,Bu.tokenLabel)(p)}).join(", ")+"]"}),g=(0,Rs.map)(u,function(h,p){return" "+(p+1)+". "+h}),f=`one of these possible Token sequences: +`+g.join(` +`);return o+f+l},buildEarlyExitMessage:function(t){var e=t.expectedIterationPaths,r=t.actual,i=t.customUserDescription,n=t.ruleName,s="Expecting: ",o=(0,Rs.first)(r).image,a=` +but found: '`+o+"'";if(i)return s+i+a;var l=(0,Rs.map)(e,function(u){return"["+(0,Rs.map)(u,function(g){return(0,Bu.tokenLabel)(g)}).join(",")+"]"}),c=`expecting at least one iteration which starts with one of these possible Token sequences:: + `+("<"+l.join(" ,")+">");return s+c+a}};Object.freeze(aa.defaultParserErrorProvider);aa.defaultGrammarResolverErrorProvider={buildRuleNotFoundError:function(t,e){var r="Invalid grammar, reference to a rule which is not defined: ->"+e.nonTerminalName+`<- +inside top level rule: ->`+t.name+"<-";return r}};aa.defaultGrammarValidatorErrorProvider={buildDuplicateFoundError:function(t,e){function r(u){return u instanceof iS.Terminal?u.terminalType.name:u instanceof iS.NonTerminal?u.nonTerminalName:""}var i=t.name,n=(0,Rs.first)(e),s=n.idx,o=(0,_G.getProductionDslName)(n),a=r(n),l=s>0,c="->"+o+(l?s:"")+"<- "+(a?"with argument: ->"+a+"<-":"")+` + appears more than once (`+e.length+" times) in the top level rule: ->"+i+`<-. + For further details see: https://chevrotain.io/docs/FAQ.html#NUMERICAL_SUFFIXES + `;return c=c.replace(/[ \t]+/g," "),c=c.replace(/\s\s+/g,` +`),c},buildNamespaceConflictError:function(t){var e=`Namespace conflict found in grammar. +`+("The grammar has both a Terminal(Token) and a Non-Terminal(Rule) named: <"+t.name+`>. +`)+`To resolve this make sure each Terminal and Non-Terminal names are unique +This is easy to accomplish by using the convention that Terminal names start with an uppercase letter +and Non-Terminal names start with a lower case letter.`;return e},buildAlternationPrefixAmbiguityError:function(t){var e=(0,Rs.map)(t.prefixPath,function(n){return(0,Bu.tokenLabel)(n)}).join(", "),r=t.alternation.idx===0?"":t.alternation.idx,i="Ambiguous alternatives: <"+t.ambiguityIndices.join(" ,")+`> due to common lookahead prefix +`+("in inside <"+t.topLevelRule.name+`> Rule, +`)+("<"+e+`> may appears as a prefix path in all these alternatives. +`)+`See: https://chevrotain.io/docs/guide/resolving_grammar_errors.html#COMMON_PREFIX +For Further details.`;return i},buildAlternationAmbiguityError:function(t){var e=(0,Rs.map)(t.prefixPath,function(n){return(0,Bu.tokenLabel)(n)}).join(", "),r=t.alternation.idx===0?"":t.alternation.idx,i="Ambiguous Alternatives Detected: <"+t.ambiguityIndices.join(" ,")+"> in "+(" inside <"+t.topLevelRule.name+`> Rule, +`)+("<"+e+`> may appears as a prefix path in all these alternatives. +`);return i=i+`See: https://chevrotain.io/docs/guide/resolving_grammar_errors.html#AMBIGUOUS_ALTERNATIVES +For Further details.`,i},buildEmptyRepetitionError:function(t){var e=(0,_G.getProductionDslName)(t.repetition);t.repetition.idx!==0&&(e+=t.repetition.idx);var r="The repetition <"+e+"> within Rule <"+t.topLevelRule.name+`> can never consume any tokens. +This could lead to an infinite loop.`;return r},buildTokenNameError:function(t){return"deprecated"},buildEmptyAlternationError:function(t){var e="Ambiguous empty alternative: <"+(t.emptyChoiceIdx+1)+">"+(" in inside <"+t.topLevelRule.name+`> Rule. +`)+"Only the last alternative may be an empty alternative.";return e},buildTooManyAlternativesError:function(t){var e=`An Alternation cannot have more than 256 alternatives: +`+(" inside <"+t.topLevelRule.name+`> Rule. + has `+(t.alternation.definition.length+1)+" alternatives.");return e},buildLeftRecursionError:function(t){var e=t.topLevelRule.name,r=FEe.map(t.leftRecursionPath,function(s){return s.name}),i=e+" --> "+r.concat([e]).join(" --> "),n=`Left Recursion found in grammar. +`+("rule: <"+e+`> can be invoked from itself (directly or indirectly) +`)+(`without consuming any Tokens. The grammar path that causes this is: + `+i+` +`)+` To fix this refactor your grammar to remove the left recursion. +see: https://en.wikipedia.org/wiki/LL_parser#Left_Factoring.`;return n},buildInvalidRuleNameError:function(t){return"deprecated"},buildDuplicateRuleNameError:function(t){var e;t.topLevelRule instanceof iS.Rule?e=t.topLevelRule.name:e=t.topLevelRule;var r="Duplicate definition, rule: ->"+e+"<- is already defined in the grammar: ->"+t.grammarName+"<-";return r}}});var $G=I(sA=>{"use strict";var NEe=sA&&sA.__extends||function(){var t=function(e,r){return t=Object.setPrototypeOf||{__proto__:[]}instanceof Array&&function(i,n){i.__proto__=n}||function(i,n){for(var s in n)Object.prototype.hasOwnProperty.call(n,s)&&(i[s]=n[s])},t(e,r)};return function(e,r){if(typeof r!="function"&&r!==null)throw new TypeError("Class extends value "+String(r)+" is not a constructor or null");t(e,r);function i(){this.constructor=e}e.prototype=r===null?Object.create(r):(i.prototype=r.prototype,new i)}}();Object.defineProperty(sA,"__esModule",{value:!0});sA.GastRefResolverVisitor=sA.resolveGrammar=void 0;var LEe=Tn(),XG=Dt(),TEe=wu();function MEe(t,e){var r=new ZG(t,e);return r.resolveRefs(),r.errors}sA.resolveGrammar=MEe;var ZG=function(t){NEe(e,t);function e(r,i){var n=t.call(this)||this;return n.nameToTopRule=r,n.errMsgProvider=i,n.errors=[],n}return e.prototype.resolveRefs=function(){var r=this;(0,XG.forEach)((0,XG.values)(this.nameToTopRule),function(i){r.currTopLevel=i,i.accept(r)})},e.prototype.visitNonTerminal=function(r){var i=this.nameToTopRule[r.nonTerminalName];if(i)r.referencedRule=i;else{var n=this.errMsgProvider.buildRuleNotFoundError(this.currTopLevel,r);this.errors.push({message:n,type:LEe.ParserDefinitionErrorType.UNRESOLVED_SUBRULE_REF,ruleName:this.currTopLevel.name,unresolvedRefName:r.nonTerminalName})}},e}(TEe.GAstVisitor);sA.GastRefResolverVisitor=ZG});var Vh=I(Br=>{"use strict";var Fl=Br&&Br.__extends||function(){var t=function(e,r){return t=Object.setPrototypeOf||{__proto__:[]}instanceof Array&&function(i,n){i.__proto__=n}||function(i,n){for(var s in n)Object.prototype.hasOwnProperty.call(n,s)&&(i[s]=n[s])},t(e,r)};return function(e,r){if(typeof r!="function"&&r!==null)throw new TypeError("Class extends value "+String(r)+" is not a constructor or null");t(e,r);function i(){this.constructor=e}e.prototype=r===null?Object.create(r):(i.prototype=r.prototype,new i)}}();Object.defineProperty(Br,"__esModule",{value:!0});Br.nextPossibleTokensAfter=Br.possiblePathsFrom=Br.NextTerminalAfterAtLeastOneSepWalker=Br.NextTerminalAfterAtLeastOneWalker=Br.NextTerminalAfterManySepWalker=Br.NextTerminalAfterManyWalker=Br.AbstractNextTerminalAfterProductionWalker=Br.NextAfterTokenWalker=Br.AbstractNextPossibleTokensWalker=void 0;var ej=IE(),xt=Dt(),OEe=tS(),Et=hn(),tj=function(t){Fl(e,t);function e(r,i){var n=t.call(this)||this;return n.topProd=r,n.path=i,n.possibleTokTypes=[],n.nextProductionName="",n.nextProductionOccurrence=0,n.found=!1,n.isAtEndOfPath=!1,n}return e.prototype.startWalking=function(){if(this.found=!1,this.path.ruleStack[0]!==this.topProd.name)throw Error("The path does not start with the walker's top Rule!");return this.ruleStack=(0,xt.cloneArr)(this.path.ruleStack).reverse(),this.occurrenceStack=(0,xt.cloneArr)(this.path.occurrenceStack).reverse(),this.ruleStack.pop(),this.occurrenceStack.pop(),this.updateExpectedNext(),this.walk(this.topProd),this.possibleTokTypes},e.prototype.walk=function(r,i){i===void 0&&(i=[]),this.found||t.prototype.walk.call(this,r,i)},e.prototype.walkProdRef=function(r,i,n){if(r.referencedRule.name===this.nextProductionName&&r.idx===this.nextProductionOccurrence){var s=i.concat(n);this.updateExpectedNext(),this.walk(r.referencedRule,s)}},e.prototype.updateExpectedNext=function(){(0,xt.isEmpty)(this.ruleStack)?(this.nextProductionName="",this.nextProductionOccurrence=0,this.isAtEndOfPath=!0):(this.nextProductionName=this.ruleStack.pop(),this.nextProductionOccurrence=this.occurrenceStack.pop())},e}(ej.RestWalker);Br.AbstractNextPossibleTokensWalker=tj;var KEe=function(t){Fl(e,t);function e(r,i){var n=t.call(this,r,i)||this;return n.path=i,n.nextTerminalName="",n.nextTerminalOccurrence=0,n.nextTerminalName=n.path.lastTok.name,n.nextTerminalOccurrence=n.path.lastTokOccurrence,n}return e.prototype.walkTerminal=function(r,i,n){if(this.isAtEndOfPath&&r.terminalType.name===this.nextTerminalName&&r.idx===this.nextTerminalOccurrence&&!this.found){var s=i.concat(n),o=new Et.Alternative({definition:s});this.possibleTokTypes=(0,OEe.first)(o),this.found=!0}},e}(tj);Br.NextAfterTokenWalker=KEe;var zh=function(t){Fl(e,t);function e(r,i){var n=t.call(this)||this;return n.topRule=r,n.occurrence=i,n.result={token:void 0,occurrence:void 0,isEndOfRule:void 0},n}return e.prototype.startWalking=function(){return this.walk(this.topRule),this.result},e}(ej.RestWalker);Br.AbstractNextTerminalAfterProductionWalker=zh;var UEe=function(t){Fl(e,t);function e(){return t!==null&&t.apply(this,arguments)||this}return e.prototype.walkMany=function(r,i,n){if(r.idx===this.occurrence){var s=(0,xt.first)(i.concat(n));this.result.isEndOfRule=s===void 0,s instanceof Et.Terminal&&(this.result.token=s.terminalType,this.result.occurrence=s.idx)}else t.prototype.walkMany.call(this,r,i,n)},e}(zh);Br.NextTerminalAfterManyWalker=UEe;var HEe=function(t){Fl(e,t);function e(){return t!==null&&t.apply(this,arguments)||this}return e.prototype.walkManySep=function(r,i,n){if(r.idx===this.occurrence){var s=(0,xt.first)(i.concat(n));this.result.isEndOfRule=s===void 0,s instanceof Et.Terminal&&(this.result.token=s.terminalType,this.result.occurrence=s.idx)}else t.prototype.walkManySep.call(this,r,i,n)},e}(zh);Br.NextTerminalAfterManySepWalker=HEe;var GEe=function(t){Fl(e,t);function e(){return t!==null&&t.apply(this,arguments)||this}return e.prototype.walkAtLeastOne=function(r,i,n){if(r.idx===this.occurrence){var s=(0,xt.first)(i.concat(n));this.result.isEndOfRule=s===void 0,s instanceof Et.Terminal&&(this.result.token=s.terminalType,this.result.occurrence=s.idx)}else t.prototype.walkAtLeastOne.call(this,r,i,n)},e}(zh);Br.NextTerminalAfterAtLeastOneWalker=GEe;var jEe=function(t){Fl(e,t);function e(){return t!==null&&t.apply(this,arguments)||this}return e.prototype.walkAtLeastOneSep=function(r,i,n){if(r.idx===this.occurrence){var s=(0,xt.first)(i.concat(n));this.result.isEndOfRule=s===void 0,s instanceof Et.Terminal&&(this.result.token=s.terminalType,this.result.occurrence=s.idx)}else t.prototype.walkAtLeastOneSep.call(this,r,i,n)},e}(zh);Br.NextTerminalAfterAtLeastOneSepWalker=jEe;function rj(t,e,r){r===void 0&&(r=[]),r=(0,xt.cloneArr)(r);var i=[],n=0;function s(c){return c.concat((0,xt.drop)(t,n+1))}function o(c){var u=rj(s(c),e,r);return i.concat(u)}for(;r.length=0;W--){var X=E.definition[W],F={idx:p,def:X.definition.concat((0,xt.drop)(h)),ruleStack:d,occurrenceStack:m};g.push(F),g.push(o)}else if(E instanceof Et.Alternative)g.push({idx:p,def:E.definition.concat((0,xt.drop)(h)),ruleStack:d,occurrenceStack:m});else if(E instanceof Et.Rule)g.push(YEe(E,p,d,m));else throw Error("non exhaustive match")}}return u}Br.nextPossibleTokensAfter=qEe;function YEe(t,e,r,i){var n=(0,xt.cloneArr)(r);n.push(t.name);var s=(0,xt.cloneArr)(i);return s.push(1),{idx:e,def:t.definition,ruleStack:n,occurrenceStack:s}}});var _h=I(Gt=>{"use strict";var ij=Gt&&Gt.__extends||function(){var t=function(e,r){return t=Object.setPrototypeOf||{__proto__:[]}instanceof Array&&function(i,n){i.__proto__=n}||function(i,n){for(var s in n)Object.prototype.hasOwnProperty.call(n,s)&&(i[s]=n[s])},t(e,r)};return function(e,r){if(typeof r!="function"&&r!==null)throw new TypeError("Class extends value "+String(r)+" is not a constructor or null");t(e,r);function i(){this.constructor=e}e.prototype=r===null?Object.create(r):(i.prototype=r.prototype,new i)}}();Object.defineProperty(Gt,"__esModule",{value:!0});Gt.areTokenCategoriesNotUsed=Gt.isStrictPrefixOfPath=Gt.containsPath=Gt.getLookaheadPathsForOptionalProd=Gt.getLookaheadPathsForOr=Gt.lookAheadSequenceFromAlternatives=Gt.buildSingleAlternativeLookaheadFunction=Gt.buildAlternativesLookAheadFunc=Gt.buildLookaheadFuncForOptionalProd=Gt.buildLookaheadFuncForOr=Gt.getProdType=Gt.PROD_TYPE=void 0;var _t=Dt(),nj=Vh(),JEe=IE(),bE=yu(),oA=hn(),WEe=wu(),zr;(function(t){t[t.OPTION=0]="OPTION",t[t.REPETITION=1]="REPETITION",t[t.REPETITION_MANDATORY=2]="REPETITION_MANDATORY",t[t.REPETITION_MANDATORY_WITH_SEPARATOR=3]="REPETITION_MANDATORY_WITH_SEPARATOR",t[t.REPETITION_WITH_SEPARATOR=4]="REPETITION_WITH_SEPARATOR",t[t.ALTERNATION=5]="ALTERNATION"})(zr=Gt.PROD_TYPE||(Gt.PROD_TYPE={}));function zEe(t){if(t instanceof oA.Option)return zr.OPTION;if(t instanceof oA.Repetition)return zr.REPETITION;if(t instanceof oA.RepetitionMandatory)return zr.REPETITION_MANDATORY;if(t instanceof oA.RepetitionMandatoryWithSeparator)return zr.REPETITION_MANDATORY_WITH_SEPARATOR;if(t instanceof oA.RepetitionWithSeparator)return zr.REPETITION_WITH_SEPARATOR;if(t instanceof oA.Alternation)return zr.ALTERNATION;throw Error("non exhaustive match")}Gt.getProdType=zEe;function VEe(t,e,r,i,n,s){var o=sj(t,e,r),a=nS(o)?bE.tokenStructuredMatcherNoCategories:bE.tokenStructuredMatcher;return s(o,i,a,n)}Gt.buildLookaheadFuncForOr=VEe;function _Ee(t,e,r,i,n,s){var o=oj(t,e,n,r),a=nS(o)?bE.tokenStructuredMatcherNoCategories:bE.tokenStructuredMatcher;return s(o[0],a,i)}Gt.buildLookaheadFuncForOptionalProd=_Ee;function XEe(t,e,r,i){var n=t.length,s=(0,_t.every)(t,function(l){return(0,_t.every)(l,function(c){return c.length===1})});if(e)return function(l){for(var c=(0,_t.map)(l,function(b){return b.GATE}),u=0;u{"use strict";var aS=Mt&&Mt.__extends||function(){var t=function(e,r){return t=Object.setPrototypeOf||{__proto__:[]}instanceof Array&&function(i,n){i.__proto__=n}||function(i,n){for(var s in n)Object.prototype.hasOwnProperty.call(n,s)&&(i[s]=n[s])},t(e,r)};return function(e,r){if(typeof r!="function"&&r!==null)throw new TypeError("Class extends value "+String(r)+" is not a constructor or null");t(e,r);function i(){this.constructor=e}e.prototype=r===null?Object.create(r):(i.prototype=r.prototype,new i)}}();Object.defineProperty(Mt,"__esModule",{value:!0});Mt.checkPrefixAlternativesAmbiguities=Mt.validateSomeNonEmptyLookaheadPath=Mt.validateTooManyAlts=Mt.RepetionCollector=Mt.validateAmbiguousAlternationAlternatives=Mt.validateEmptyOrAlternative=Mt.getFirstNoneTerminal=Mt.validateNoLeftRecursion=Mt.validateRuleIsOverridden=Mt.validateRuleDoesNotAlreadyExist=Mt.OccurrenceValidationCollector=Mt.identifyProductionForDuplicates=Mt.validateGrammar=void 0;var jt=Dt(),Cr=Dt(),uo=Tn(),AS=Jh(),Qu=_h(),rye=Vh(),Fs=hn(),lS=wu();function sye(t,e,r,i,n){var s=jt.map(t,function(h){return iye(h,i)}),o=jt.map(t,function(h){return cS(h,h,i)}),a=[],l=[],c=[];(0,Cr.every)(o,Cr.isEmpty)&&(a=(0,Cr.map)(t,function(h){return uj(h,i)}),l=(0,Cr.map)(t,function(h){return gj(h,e,i)}),c=hj(t,e,i));var u=nye(t,r,i),g=(0,Cr.map)(t,function(h){return fj(h,i)}),f=(0,Cr.map)(t,function(h){return cj(h,t,n,i)});return jt.flatten(s.concat(c,o,a,l,u,g,f))}Mt.validateGrammar=sye;function iye(t,e){var r=new Cj;t.accept(r);var i=r.allProductions,n=jt.groupBy(i,pj),s=jt.pick(n,function(a){return a.length>1}),o=jt.map(jt.values(s),function(a){var l=jt.first(a),c=e.buildDuplicateFoundError(t,a),u=(0,AS.getProductionDslName)(l),g={message:c,type:uo.ParserDefinitionErrorType.DUPLICATE_PRODUCTIONS,ruleName:t.name,dslName:u,occurrence:l.idx},f=dj(l);return f&&(g.parameter=f),g});return o}function pj(t){return(0,AS.getProductionDslName)(t)+"_#_"+t.idx+"_#_"+dj(t)}Mt.identifyProductionForDuplicates=pj;function dj(t){return t instanceof Fs.Terminal?t.terminalType.name:t instanceof Fs.NonTerminal?t.nonTerminalName:""}var Cj=function(t){aS(e,t);function e(){var r=t!==null&&t.apply(this,arguments)||this;return r.allProductions=[],r}return e.prototype.visitNonTerminal=function(r){this.allProductions.push(r)},e.prototype.visitOption=function(r){this.allProductions.push(r)},e.prototype.visitRepetitionWithSeparator=function(r){this.allProductions.push(r)},e.prototype.visitRepetitionMandatory=function(r){this.allProductions.push(r)},e.prototype.visitRepetitionMandatoryWithSeparator=function(r){this.allProductions.push(r)},e.prototype.visitRepetition=function(r){this.allProductions.push(r)},e.prototype.visitAlternation=function(r){this.allProductions.push(r)},e.prototype.visitTerminal=function(r){this.allProductions.push(r)},e}(lS.GAstVisitor);Mt.OccurrenceValidationCollector=Cj;function cj(t,e,r,i){var n=[],s=(0,Cr.reduce)(e,function(a,l){return l.name===t.name?a+1:a},0);if(s>1){var o=i.buildDuplicateRuleNameError({topLevelRule:t,grammarName:r});n.push({message:o,type:uo.ParserDefinitionErrorType.DUPLICATE_RULE_NAME,ruleName:t.name})}return n}Mt.validateRuleDoesNotAlreadyExist=cj;function oye(t,e,r){var i=[],n;return jt.contains(e,t)||(n="Invalid rule override, rule: ->"+t+"<- cannot be overridden in the grammar: ->"+r+"<-as it is not defined in any of the super grammars ",i.push({message:n,type:uo.ParserDefinitionErrorType.INVALID_RULE_OVERRIDE,ruleName:t})),i}Mt.validateRuleIsOverridden=oye;function cS(t,e,r,i){i===void 0&&(i=[]);var n=[],s=Xh(e.definition);if(jt.isEmpty(s))return[];var o=t.name,a=jt.contains(s,t);a&&n.push({message:r.buildLeftRecursionError({topLevelRule:t,leftRecursionPath:i}),type:uo.ParserDefinitionErrorType.LEFT_RECURSION,ruleName:o});var l=jt.difference(s,i.concat([t])),c=jt.map(l,function(u){var g=jt.cloneArr(i);return g.push(u),cS(t,u,r,g)});return n.concat(jt.flatten(c))}Mt.validateNoLeftRecursion=cS;function Xh(t){var e=[];if(jt.isEmpty(t))return e;var r=jt.first(t);if(r instanceof Fs.NonTerminal)e.push(r.referencedRule);else if(r instanceof Fs.Alternative||r instanceof Fs.Option||r instanceof Fs.RepetitionMandatory||r instanceof Fs.RepetitionMandatoryWithSeparator||r instanceof Fs.RepetitionWithSeparator||r instanceof Fs.Repetition)e=e.concat(Xh(r.definition));else if(r instanceof Fs.Alternation)e=jt.flatten(jt.map(r.definition,function(o){return Xh(o.definition)}));else if(!(r instanceof Fs.Terminal))throw Error("non exhaustive match");var i=(0,AS.isOptionalProd)(r),n=t.length>1;if(i&&n){var s=jt.drop(t);return e.concat(Xh(s))}else return e}Mt.getFirstNoneTerminal=Xh;var uS=function(t){aS(e,t);function e(){var r=t!==null&&t.apply(this,arguments)||this;return r.alternations=[],r}return e.prototype.visitAlternation=function(r){this.alternations.push(r)},e}(lS.GAstVisitor);function uj(t,e){var r=new uS;t.accept(r);var i=r.alternations,n=jt.reduce(i,function(s,o){var a=jt.dropRight(o.definition),l=jt.map(a,function(c,u){var g=(0,rye.nextPossibleTokensAfter)([c],[],null,1);return jt.isEmpty(g)?{message:e.buildEmptyAlternationError({topLevelRule:t,alternation:o,emptyChoiceIdx:u}),type:uo.ParserDefinitionErrorType.NONE_LAST_EMPTY_ALT,ruleName:t.name,occurrence:o.idx,alternative:u+1}:null});return s.concat(jt.compact(l))},[]);return n}Mt.validateEmptyOrAlternative=uj;function gj(t,e,r){var i=new uS;t.accept(i);var n=i.alternations;n=(0,Cr.reject)(n,function(o){return o.ignoreAmbiguities===!0});var s=jt.reduce(n,function(o,a){var l=a.idx,c=a.maxLookahead||e,u=(0,Qu.getLookaheadPathsForOr)(l,t,c,a),g=aye(u,a,t,r),f=mj(u,a,t,r);return o.concat(g,f)},[]);return s}Mt.validateAmbiguousAlternationAlternatives=gj;var Ij=function(t){aS(e,t);function e(){var r=t!==null&&t.apply(this,arguments)||this;return r.allProductions=[],r}return e.prototype.visitRepetitionWithSeparator=function(r){this.allProductions.push(r)},e.prototype.visitRepetitionMandatory=function(r){this.allProductions.push(r)},e.prototype.visitRepetitionMandatoryWithSeparator=function(r){this.allProductions.push(r)},e.prototype.visitRepetition=function(r){this.allProductions.push(r)},e}(lS.GAstVisitor);Mt.RepetionCollector=Ij;function fj(t,e){var r=new uS;t.accept(r);var i=r.alternations,n=jt.reduce(i,function(s,o){return o.definition.length>255&&s.push({message:e.buildTooManyAlternativesError({topLevelRule:t,alternation:o}),type:uo.ParserDefinitionErrorType.TOO_MANY_ALTS,ruleName:t.name,occurrence:o.idx}),s},[]);return n}Mt.validateTooManyAlts=fj;function hj(t,e,r){var i=[];return(0,Cr.forEach)(t,function(n){var s=new Ij;n.accept(s);var o=s.allProductions;(0,Cr.forEach)(o,function(a){var l=(0,Qu.getProdType)(a),c=a.maxLookahead||e,u=a.idx,g=(0,Qu.getLookaheadPathsForOptionalProd)(u,n,l,c),f=g[0];if((0,Cr.isEmpty)((0,Cr.flatten)(f))){var h=r.buildEmptyRepetitionError({topLevelRule:n,repetition:a});i.push({message:h,type:uo.ParserDefinitionErrorType.NO_NON_EMPTY_LOOKAHEAD,ruleName:n.name})}})}),i}Mt.validateSomeNonEmptyLookaheadPath=hj;function aye(t,e,r,i){var n=[],s=(0,Cr.reduce)(t,function(a,l,c){return e.definition[c].ignoreAmbiguities===!0||(0,Cr.forEach)(l,function(u){var g=[c];(0,Cr.forEach)(t,function(f,h){c!==h&&(0,Qu.containsPath)(f,u)&&e.definition[h].ignoreAmbiguities!==!0&&g.push(h)}),g.length>1&&!(0,Qu.containsPath)(n,u)&&(n.push(u),a.push({alts:g,path:u}))}),a},[]),o=jt.map(s,function(a){var l=(0,Cr.map)(a.alts,function(u){return u+1}),c=i.buildAlternationAmbiguityError({topLevelRule:r,alternation:e,ambiguityIndices:l,prefixPath:a.path});return{message:c,type:uo.ParserDefinitionErrorType.AMBIGUOUS_ALTS,ruleName:r.name,occurrence:e.idx,alternatives:[a.alts]}});return o}function mj(t,e,r,i){var n=[],s=(0,Cr.reduce)(t,function(o,a,l){var c=(0,Cr.map)(a,function(u){return{idx:l,path:u}});return o.concat(c)},[]);return(0,Cr.forEach)(s,function(o){var a=e.definition[o.idx];if(a.ignoreAmbiguities!==!0){var l=o.idx,c=o.path,u=(0,Cr.findAll)(s,function(f){return e.definition[f.idx].ignoreAmbiguities!==!0&&f.idx{"use strict";Object.defineProperty(bu,"__esModule",{value:!0});bu.validateGrammar=bu.resolveGrammar=void 0;var fS=Dt(),Aye=$G(),lye=gS(),Ej=Wh();function cye(t){t=(0,fS.defaults)(t,{errMsgProvider:Ej.defaultGrammarResolverErrorProvider});var e={};return(0,fS.forEach)(t.rules,function(r){e[r.name]=r}),(0,Aye.resolveGrammar)(e,t.errMsgProvider)}bu.resolveGrammar=cye;function uye(t){return t=(0,fS.defaults)(t,{errMsgProvider:Ej.defaultGrammarValidatorErrorProvider}),(0,lye.validateGrammar)(t.rules,t.maxLookahead,t.tokenTypes,t.errMsgProvider,t.grammarName)}bu.validateGrammar=uye});var vu=I(dn=>{"use strict";var Zh=dn&&dn.__extends||function(){var t=function(e,r){return t=Object.setPrototypeOf||{__proto__:[]}instanceof Array&&function(i,n){i.__proto__=n}||function(i,n){for(var s in n)Object.prototype.hasOwnProperty.call(n,s)&&(i[s]=n[s])},t(e,r)};return function(e,r){if(typeof r!="function"&&r!==null)throw new TypeError("Class extends value "+String(r)+" is not a constructor or null");t(e,r);function i(){this.constructor=e}e.prototype=r===null?Object.create(r):(i.prototype=r.prototype,new i)}}();Object.defineProperty(dn,"__esModule",{value:!0});dn.EarlyExitException=dn.NotAllInputParsedException=dn.NoViableAltException=dn.MismatchedTokenException=dn.isRecognitionException=void 0;var gye=Dt(),wj="MismatchedTokenException",Bj="NoViableAltException",Qj="EarlyExitException",bj="NotAllInputParsedException",vj=[wj,Bj,Qj,bj];Object.freeze(vj);function fye(t){return(0,gye.contains)(vj,t.name)}dn.isRecognitionException=fye;var vE=function(t){Zh(e,t);function e(r,i){var n=this.constructor,s=t.call(this,r)||this;return s.token=i,s.resyncedTokens=[],Object.setPrototypeOf(s,n.prototype),Error.captureStackTrace&&Error.captureStackTrace(s,s.constructor),s}return e}(Error),hye=function(t){Zh(e,t);function e(r,i,n){var s=t.call(this,r,i)||this;return s.previousToken=n,s.name=wj,s}return e}(vE);dn.MismatchedTokenException=hye;var pye=function(t){Zh(e,t);function e(r,i,n){var s=t.call(this,r,i)||this;return s.previousToken=n,s.name=Bj,s}return e}(vE);dn.NoViableAltException=pye;var dye=function(t){Zh(e,t);function e(r,i){var n=t.call(this,r,i)||this;return n.name=bj,n}return e}(vE);dn.NotAllInputParsedException=dye;var Cye=function(t){Zh(e,t);function e(r,i,n){var s=t.call(this,r,i)||this;return s.previousToken=n,s.name=Qj,s}return e}(vE);dn.EarlyExitException=Cye});var pS=I(xi=>{"use strict";Object.defineProperty(xi,"__esModule",{value:!0});xi.attemptInRepetitionRecovery=xi.Recoverable=xi.InRuleRecoveryException=xi.IN_RULE_RECOVERY_EXCEPTION=xi.EOF_FOLLOW_KEY=void 0;var SE=nA(),ts=Dt(),mye=vu(),Iye=rS(),Eye=Tn();xi.EOF_FOLLOW_KEY={};xi.IN_RULE_RECOVERY_EXCEPTION="InRuleRecoveryException";function hS(t){this.name=xi.IN_RULE_RECOVERY_EXCEPTION,this.message=t}xi.InRuleRecoveryException=hS;hS.prototype=Error.prototype;var yye=function(){function t(){}return t.prototype.initRecoverable=function(e){this.firstAfterRepMap={},this.resyncFollows={},this.recoveryEnabled=(0,ts.has)(e,"recoveryEnabled")?e.recoveryEnabled:Eye.DEFAULT_PARSER_CONFIG.recoveryEnabled,this.recoveryEnabled&&(this.attemptInRepetitionRecovery=Sj)},t.prototype.getTokenToInsert=function(e){var r=(0,SE.createTokenInstance)(e,"",NaN,NaN,NaN,NaN,NaN,NaN);return r.isInsertedInRecovery=!0,r},t.prototype.canTokenTypeBeInsertedInRecovery=function(e){return!0},t.prototype.tryInRepetitionRecovery=function(e,r,i,n){for(var s=this,o=this.findReSyncTokenType(),a=this.exportLexerState(),l=[],c=!1,u=this.LA(1),g=this.LA(1),f=function(){var h=s.LA(0),p=s.errorMessageProvider.buildMismatchTokenMessage({expected:n,actual:u,previous:h,ruleName:s.getCurrRuleFullName()}),d=new mye.MismatchedTokenException(p,u,s.LA(0));d.resyncedTokens=(0,ts.dropRight)(l),s.SAVE_ERROR(d)};!c;)if(this.tokenMatcher(g,n)){f();return}else if(i.call(this)){f(),e.apply(this,r);return}else this.tokenMatcher(g,o)?c=!0:(g=this.SKIP_TOKEN(),this.addToResyncTokens(g,l));this.importLexerState(a)},t.prototype.shouldInRepetitionRecoveryBeTried=function(e,r,i){return!(i===!1||e===void 0||r===void 0||this.tokenMatcher(this.LA(1),e)||this.isBackTracking()||this.canPerformInRuleRecovery(e,this.getFollowsForInRuleRecovery(e,r)))},t.prototype.getFollowsForInRuleRecovery=function(e,r){var i=this.getCurrentGrammarPath(e,r),n=this.getNextPossibleTokenTypes(i);return n},t.prototype.tryInRuleRecovery=function(e,r){if(this.canRecoverWithSingleTokenInsertion(e,r)){var i=this.getTokenToInsert(e);return i}if(this.canRecoverWithSingleTokenDeletion(e)){var n=this.SKIP_TOKEN();return this.consumeToken(),n}throw new hS("sad sad panda")},t.prototype.canPerformInRuleRecovery=function(e,r){return this.canRecoverWithSingleTokenInsertion(e,r)||this.canRecoverWithSingleTokenDeletion(e)},t.prototype.canRecoverWithSingleTokenInsertion=function(e,r){var i=this;if(!this.canTokenTypeBeInsertedInRecovery(e)||(0,ts.isEmpty)(r))return!1;var n=this.LA(1),s=(0,ts.find)(r,function(o){return i.tokenMatcher(n,o)})!==void 0;return s},t.prototype.canRecoverWithSingleTokenDeletion=function(e){var r=this.tokenMatcher(this.LA(2),e);return r},t.prototype.isInCurrentRuleReSyncSet=function(e){var r=this.getCurrFollowKey(),i=this.getFollowSetFromFollowKey(r);return(0,ts.contains)(i,e)},t.prototype.findReSyncTokenType=function(){for(var e=this.flattenFollowSet(),r=this.LA(1),i=2;;){var n=r.tokenType;if((0,ts.contains)(e,n))return n;r=this.LA(i),i++}},t.prototype.getCurrFollowKey=function(){if(this.RULE_STACK.length===1)return xi.EOF_FOLLOW_KEY;var e=this.getLastExplicitRuleShortName(),r=this.getLastExplicitRuleOccurrenceIndex(),i=this.getPreviousExplicitRuleShortName();return{ruleName:this.shortRuleNameToFullName(e),idxInCallingRule:r,inRule:this.shortRuleNameToFullName(i)}},t.prototype.buildFullFollowKeyStack=function(){var e=this,r=this.RULE_STACK,i=this.RULE_OCCURRENCE_STACK;return(0,ts.map)(r,function(n,s){return s===0?xi.EOF_FOLLOW_KEY:{ruleName:e.shortRuleNameToFullName(n),idxInCallingRule:i[s],inRule:e.shortRuleNameToFullName(r[s-1])}})},t.prototype.flattenFollowSet=function(){var e=this,r=(0,ts.map)(this.buildFullFollowKeyStack(),function(i){return e.getFollowSetFromFollowKey(i)});return(0,ts.flatten)(r)},t.prototype.getFollowSetFromFollowKey=function(e){if(e===xi.EOF_FOLLOW_KEY)return[SE.EOF];var r=e.ruleName+e.idxInCallingRule+Iye.IN+e.inRule;return this.resyncFollows[r]},t.prototype.addToResyncTokens=function(e,r){return this.tokenMatcher(e,SE.EOF)||r.push(e),r},t.prototype.reSyncTo=function(e){for(var r=[],i=this.LA(1);this.tokenMatcher(i,e)===!1;)i=this.SKIP_TOKEN(),this.addToResyncTokens(i,r);return(0,ts.dropRight)(r)},t.prototype.attemptInRepetitionRecovery=function(e,r,i,n,s,o,a){},t.prototype.getCurrentGrammarPath=function(e,r){var i=this.getHumanReadableRuleStack(),n=(0,ts.cloneArr)(this.RULE_OCCURRENCE_STACK),s={ruleStack:i,occurrenceStack:n,lastTok:e,lastTokOccurrence:r};return s},t.prototype.getHumanReadableRuleStack=function(){var e=this;return(0,ts.map)(this.RULE_STACK,function(r){return e.shortRuleNameToFullName(r)})},t}();xi.Recoverable=yye;function Sj(t,e,r,i,n,s,o){var a=this.getKeyForAutomaticLookahead(i,n),l=this.firstAfterRepMap[a];if(l===void 0){var c=this.getCurrRuleFullName(),u=this.getGAstProductions()[c],g=new s(u,n);l=g.startWalking(),this.firstAfterRepMap[a]=l}var f=l.token,h=l.occurrence,p=l.isEndOfRule;this.RULE_STACK.length===1&&p&&f===void 0&&(f=SE.EOF,h=1),this.shouldInRepetitionRecoveryBeTried(f,h,o)&&this.tryInRepetitionRecovery(t,e,r,f)}xi.attemptInRepetitionRecovery=Sj});var xE=I(Nt=>{"use strict";Object.defineProperty(Nt,"__esModule",{value:!0});Nt.getKeyForAutomaticLookahead=Nt.AT_LEAST_ONE_SEP_IDX=Nt.MANY_SEP_IDX=Nt.AT_LEAST_ONE_IDX=Nt.MANY_IDX=Nt.OPTION_IDX=Nt.OR_IDX=Nt.BITS_FOR_ALT_IDX=Nt.BITS_FOR_RULE_IDX=Nt.BITS_FOR_OCCURRENCE_IDX=Nt.BITS_FOR_METHOD_TYPE=void 0;Nt.BITS_FOR_METHOD_TYPE=4;Nt.BITS_FOR_OCCURRENCE_IDX=8;Nt.BITS_FOR_RULE_IDX=12;Nt.BITS_FOR_ALT_IDX=8;Nt.OR_IDX=1<{"use strict";Object.defineProperty(kE,"__esModule",{value:!0});kE.LooksAhead=void 0;var Aa=_h(),Ns=Dt(),xj=Tn(),la=xE(),Nl=Jh(),Bye=function(){function t(){}return t.prototype.initLooksAhead=function(e){this.dynamicTokensEnabled=(0,Ns.has)(e,"dynamicTokensEnabled")?e.dynamicTokensEnabled:xj.DEFAULT_PARSER_CONFIG.dynamicTokensEnabled,this.maxLookahead=(0,Ns.has)(e,"maxLookahead")?e.maxLookahead:xj.DEFAULT_PARSER_CONFIG.maxLookahead,this.lookAheadFuncsCache=(0,Ns.isES2015MapSupported)()?new Map:[],(0,Ns.isES2015MapSupported)()?(this.getLaFuncFromCache=this.getLaFuncFromMap,this.setLaFuncCache=this.setLaFuncCacheUsingMap):(this.getLaFuncFromCache=this.getLaFuncFromObj,this.setLaFuncCache=this.setLaFuncUsingObj)},t.prototype.preComputeLookaheadFunctions=function(e){var r=this;(0,Ns.forEach)(e,function(i){r.TRACE_INIT(i.name+" Rule Lookahead",function(){var n=(0,Nl.collectMethods)(i),s=n.alternation,o=n.repetition,a=n.option,l=n.repetitionMandatory,c=n.repetitionMandatoryWithSeparator,u=n.repetitionWithSeparator;(0,Ns.forEach)(s,function(g){var f=g.idx===0?"":g.idx;r.TRACE_INIT(""+(0,Nl.getProductionDslName)(g)+f,function(){var h=(0,Aa.buildLookaheadFuncForOr)(g.idx,i,g.maxLookahead||r.maxLookahead,g.hasPredicates,r.dynamicTokensEnabled,r.lookAheadBuilderForAlternatives),p=(0,la.getKeyForAutomaticLookahead)(r.fullRuleNameToShort[i.name],la.OR_IDX,g.idx);r.setLaFuncCache(p,h)})}),(0,Ns.forEach)(o,function(g){r.computeLookaheadFunc(i,g.idx,la.MANY_IDX,Aa.PROD_TYPE.REPETITION,g.maxLookahead,(0,Nl.getProductionDslName)(g))}),(0,Ns.forEach)(a,function(g){r.computeLookaheadFunc(i,g.idx,la.OPTION_IDX,Aa.PROD_TYPE.OPTION,g.maxLookahead,(0,Nl.getProductionDslName)(g))}),(0,Ns.forEach)(l,function(g){r.computeLookaheadFunc(i,g.idx,la.AT_LEAST_ONE_IDX,Aa.PROD_TYPE.REPETITION_MANDATORY,g.maxLookahead,(0,Nl.getProductionDslName)(g))}),(0,Ns.forEach)(c,function(g){r.computeLookaheadFunc(i,g.idx,la.AT_LEAST_ONE_SEP_IDX,Aa.PROD_TYPE.REPETITION_MANDATORY_WITH_SEPARATOR,g.maxLookahead,(0,Nl.getProductionDslName)(g))}),(0,Ns.forEach)(u,function(g){r.computeLookaheadFunc(i,g.idx,la.MANY_SEP_IDX,Aa.PROD_TYPE.REPETITION_WITH_SEPARATOR,g.maxLookahead,(0,Nl.getProductionDslName)(g))})})})},t.prototype.computeLookaheadFunc=function(e,r,i,n,s,o){var a=this;this.TRACE_INIT(""+o+(r===0?"":r),function(){var l=(0,Aa.buildLookaheadFuncForOptionalProd)(r,e,s||a.maxLookahead,a.dynamicTokensEnabled,n,a.lookAheadBuilderForOptional),c=(0,la.getKeyForAutomaticLookahead)(a.fullRuleNameToShort[e.name],i,r);a.setLaFuncCache(c,l)})},t.prototype.lookAheadBuilderForOptional=function(e,r,i){return(0,Aa.buildSingleAlternativeLookaheadFunction)(e,r,i)},t.prototype.lookAheadBuilderForAlternatives=function(e,r,i,n){return(0,Aa.buildAlternativesLookAheadFunc)(e,r,i,n)},t.prototype.getKeyForAutomaticLookahead=function(e,r){var i=this.getLastExplicitRuleShortName();return(0,la.getKeyForAutomaticLookahead)(i,e,r)},t.prototype.getLaFuncFromCache=function(e){},t.prototype.getLaFuncFromMap=function(e){return this.lookAheadFuncsCache.get(e)},t.prototype.getLaFuncFromObj=function(e){return this.lookAheadFuncsCache[e]},t.prototype.setLaFuncCache=function(e,r){},t.prototype.setLaFuncCacheUsingMap=function(e,r){this.lookAheadFuncsCache.set(e,r)},t.prototype.setLaFuncUsingObj=function(e,r){this.lookAheadFuncsCache[e]=r},t}();kE.LooksAhead=Bye});var Pj=I(go=>{"use strict";Object.defineProperty(go,"__esModule",{value:!0});go.addNoneTerminalToCst=go.addTerminalToCst=go.setNodeLocationFull=go.setNodeLocationOnlyOffset=void 0;function Qye(t,e){isNaN(t.startOffset)===!0?(t.startOffset=e.startOffset,t.endOffset=e.endOffset):t.endOffset{"use strict";Object.defineProperty(aA,"__esModule",{value:!0});aA.defineNameProp=aA.functionName=aA.classNameFromInstance=void 0;var xye=Dt();function kye(t){return Dj(t.constructor)}aA.classNameFromInstance=kye;var Rj="name";function Dj(t){var e=t.name;return e||"anonymous"}aA.functionName=Dj;function Pye(t,e){var r=Object.getOwnPropertyDescriptor(t,Rj);return(0,xye.isUndefined)(r)||r.configurable?(Object.defineProperty(t,Rj,{enumerable:!1,configurable:!0,writable:!1,value:e}),!0):!1}aA.defineNameProp=Pye});var Mj=I(mi=>{"use strict";Object.defineProperty(mi,"__esModule",{value:!0});mi.validateRedundantMethods=mi.validateMissingCstMethods=mi.validateVisitor=mi.CstVisitorDefinitionError=mi.createBaseVisitorConstructorWithDefaults=mi.createBaseSemanticVisitorConstructor=mi.defaultVisit=void 0;var rs=Dt(),$h=dS();function Fj(t,e){for(var r=(0,rs.keys)(t),i=r.length,n=0;n: + `+(""+s.join(` + +`).replace(/\n/g,` + `)))}}};return r.prototype=i,r.prototype.constructor=r,r._RULE_NAMES=e,r}mi.createBaseSemanticVisitorConstructor=Dye;function Rye(t,e,r){var i=function(){};(0,$h.defineNameProp)(i,t+"BaseSemanticsWithDefaults");var n=Object.create(r.prototype);return(0,rs.forEach)(e,function(s){n[s]=Fj}),i.prototype=n,i.prototype.constructor=i,i}mi.createBaseVisitorConstructorWithDefaults=Rye;var CS;(function(t){t[t.REDUNDANT_METHOD=0]="REDUNDANT_METHOD",t[t.MISSING_METHOD=1]="MISSING_METHOD"})(CS=mi.CstVisitorDefinitionError||(mi.CstVisitorDefinitionError={}));function Nj(t,e){var r=Lj(t,e),i=Tj(t,e);return r.concat(i)}mi.validateVisitor=Nj;function Lj(t,e){var r=(0,rs.map)(e,function(i){if(!(0,rs.isFunction)(t[i]))return{msg:"Missing visitor method: <"+i+"> on "+(0,$h.functionName)(t.constructor)+" CST Visitor.",type:CS.MISSING_METHOD,methodName:i}});return(0,rs.compact)(r)}mi.validateMissingCstMethods=Lj;var Fye=["constructor","visit","validateVisitor"];function Tj(t,e){var r=[];for(var i in t)(0,rs.isFunction)(t[i])&&!(0,rs.contains)(Fye,i)&&!(0,rs.contains)(e,i)&&r.push({msg:"Redundant visitor method: <"+i+"> on "+(0,$h.functionName)(t.constructor)+` CST Visitor +There is no Grammar Rule corresponding to this method's name. +`,type:CS.REDUNDANT_METHOD,methodName:i});return r}mi.validateRedundantMethods=Tj});var Kj=I(PE=>{"use strict";Object.defineProperty(PE,"__esModule",{value:!0});PE.TreeBuilder=void 0;var Su=Pj(),Ur=Dt(),Oj=Mj(),Nye=Tn(),Lye=function(){function t(){}return t.prototype.initTreeBuilder=function(e){if(this.CST_STACK=[],this.outputCst=e.outputCst,this.nodeLocationTracking=(0,Ur.has)(e,"nodeLocationTracking")?e.nodeLocationTracking:Nye.DEFAULT_PARSER_CONFIG.nodeLocationTracking,!this.outputCst)this.cstInvocationStateUpdate=Ur.NOOP,this.cstFinallyStateUpdate=Ur.NOOP,this.cstPostTerminal=Ur.NOOP,this.cstPostNonTerminal=Ur.NOOP,this.cstPostRule=Ur.NOOP;else if(/full/i.test(this.nodeLocationTracking))this.recoveryEnabled?(this.setNodeLocationFromToken=Su.setNodeLocationFull,this.setNodeLocationFromNode=Su.setNodeLocationFull,this.cstPostRule=Ur.NOOP,this.setInitialNodeLocation=this.setInitialNodeLocationFullRecovery):(this.setNodeLocationFromToken=Ur.NOOP,this.setNodeLocationFromNode=Ur.NOOP,this.cstPostRule=this.cstPostRuleFull,this.setInitialNodeLocation=this.setInitialNodeLocationFullRegular);else if(/onlyOffset/i.test(this.nodeLocationTracking))this.recoveryEnabled?(this.setNodeLocationFromToken=Su.setNodeLocationOnlyOffset,this.setNodeLocationFromNode=Su.setNodeLocationOnlyOffset,this.cstPostRule=Ur.NOOP,this.setInitialNodeLocation=this.setInitialNodeLocationOnlyOffsetRecovery):(this.setNodeLocationFromToken=Ur.NOOP,this.setNodeLocationFromNode=Ur.NOOP,this.cstPostRule=this.cstPostRuleOnlyOffset,this.setInitialNodeLocation=this.setInitialNodeLocationOnlyOffsetRegular);else if(/none/i.test(this.nodeLocationTracking))this.setNodeLocationFromToken=Ur.NOOP,this.setNodeLocationFromNode=Ur.NOOP,this.cstPostRule=Ur.NOOP,this.setInitialNodeLocation=Ur.NOOP;else throw Error('Invalid config option: "'+e.nodeLocationTracking+'"')},t.prototype.setInitialNodeLocationOnlyOffsetRecovery=function(e){e.location={startOffset:NaN,endOffset:NaN}},t.prototype.setInitialNodeLocationOnlyOffsetRegular=function(e){e.location={startOffset:this.LA(1).startOffset,endOffset:NaN}},t.prototype.setInitialNodeLocationFullRecovery=function(e){e.location={startOffset:NaN,startLine:NaN,startColumn:NaN,endOffset:NaN,endLine:NaN,endColumn:NaN}},t.prototype.setInitialNodeLocationFullRegular=function(e){var r=this.LA(1);e.location={startOffset:r.startOffset,startLine:r.startLine,startColumn:r.startColumn,endOffset:NaN,endLine:NaN,endColumn:NaN}},t.prototype.cstInvocationStateUpdate=function(e,r){var i={name:e,children:{}};this.setInitialNodeLocation(i),this.CST_STACK.push(i)},t.prototype.cstFinallyStateUpdate=function(){this.CST_STACK.pop()},t.prototype.cstPostRuleFull=function(e){var r=this.LA(0),i=e.location;i.startOffset<=r.startOffset?(i.endOffset=r.endOffset,i.endLine=r.endLine,i.endColumn=r.endColumn):(i.startOffset=NaN,i.startLine=NaN,i.startColumn=NaN)},t.prototype.cstPostRuleOnlyOffset=function(e){var r=this.LA(0),i=e.location;i.startOffset<=r.startOffset?i.endOffset=r.endOffset:i.startOffset=NaN},t.prototype.cstPostTerminal=function(e,r){var i=this.CST_STACK[this.CST_STACK.length-1];(0,Su.addTerminalToCst)(i,r,e),this.setNodeLocationFromToken(i.location,r)},t.prototype.cstPostNonTerminal=function(e,r){var i=this.CST_STACK[this.CST_STACK.length-1];(0,Su.addNoneTerminalToCst)(i,r,e),this.setNodeLocationFromNode(i.location,e.location)},t.prototype.getBaseCstVisitorConstructor=function(){if((0,Ur.isUndefined)(this.baseCstVisitorConstructor)){var e=(0,Oj.createBaseSemanticVisitorConstructor)(this.className,(0,Ur.keys)(this.gastProductionsCache));return this.baseCstVisitorConstructor=e,e}return this.baseCstVisitorConstructor},t.prototype.getBaseCstVisitorConstructorWithDefaults=function(){if((0,Ur.isUndefined)(this.baseCstVisitorWithDefaultsConstructor)){var e=(0,Oj.createBaseVisitorConstructorWithDefaults)(this.className,(0,Ur.keys)(this.gastProductionsCache),this.getBaseCstVisitorConstructor());return this.baseCstVisitorWithDefaultsConstructor=e,e}return this.baseCstVisitorWithDefaultsConstructor},t.prototype.getLastExplicitRuleShortName=function(){var e=this.RULE_STACK;return e[e.length-1]},t.prototype.getPreviousExplicitRuleShortName=function(){var e=this.RULE_STACK;return e[e.length-2]},t.prototype.getLastExplicitRuleOccurrenceIndex=function(){var e=this.RULE_OCCURRENCE_STACK;return e[e.length-1]},t}();PE.TreeBuilder=Lye});var Hj=I(DE=>{"use strict";Object.defineProperty(DE,"__esModule",{value:!0});DE.LexerAdapter=void 0;var Uj=Tn(),Tye=function(){function t(){}return t.prototype.initLexerAdapter=function(){this.tokVector=[],this.tokVectorLength=0,this.currIdx=-1},Object.defineProperty(t.prototype,"input",{get:function(){return this.tokVector},set:function(e){if(this.selfAnalysisDone!==!0)throw Error("Missing invocation at the end of the Parser's constructor.");this.reset(),this.tokVector=e,this.tokVectorLength=e.length},enumerable:!1,configurable:!0}),t.prototype.SKIP_TOKEN=function(){return this.currIdx<=this.tokVector.length-2?(this.consumeToken(),this.LA(1)):Uj.END_OF_FILE},t.prototype.LA=function(e){var r=this.currIdx+e;return r<0||this.tokVectorLength<=r?Uj.END_OF_FILE:this.tokVector[r]},t.prototype.consumeToken=function(){this.currIdx++},t.prototype.exportLexerState=function(){return this.currIdx},t.prototype.importLexerState=function(e){this.currIdx=e},t.prototype.resetLexerState=function(){this.currIdx=-1},t.prototype.moveToTerminatedState=function(){this.currIdx=this.tokVector.length-1},t.prototype.getLexerPosition=function(){return this.exportLexerState()},t}();DE.LexerAdapter=Tye});var jj=I(RE=>{"use strict";Object.defineProperty(RE,"__esModule",{value:!0});RE.RecognizerApi=void 0;var Gj=Dt(),Mye=vu(),mS=Tn(),Oye=Wh(),Kye=gS(),Uye=hn(),Hye=function(){function t(){}return t.prototype.ACTION=function(e){return e.call(this)},t.prototype.consume=function(e,r,i){return this.consumeInternal(r,e,i)},t.prototype.subrule=function(e,r,i){return this.subruleInternal(r,e,i)},t.prototype.option=function(e,r){return this.optionInternal(r,e)},t.prototype.or=function(e,r){return this.orInternal(r,e)},t.prototype.many=function(e,r){return this.manyInternal(e,r)},t.prototype.atLeastOne=function(e,r){return this.atLeastOneInternal(e,r)},t.prototype.CONSUME=function(e,r){return this.consumeInternal(e,0,r)},t.prototype.CONSUME1=function(e,r){return this.consumeInternal(e,1,r)},t.prototype.CONSUME2=function(e,r){return this.consumeInternal(e,2,r)},t.prototype.CONSUME3=function(e,r){return this.consumeInternal(e,3,r)},t.prototype.CONSUME4=function(e,r){return this.consumeInternal(e,4,r)},t.prototype.CONSUME5=function(e,r){return this.consumeInternal(e,5,r)},t.prototype.CONSUME6=function(e,r){return this.consumeInternal(e,6,r)},t.prototype.CONSUME7=function(e,r){return this.consumeInternal(e,7,r)},t.prototype.CONSUME8=function(e,r){return this.consumeInternal(e,8,r)},t.prototype.CONSUME9=function(e,r){return this.consumeInternal(e,9,r)},t.prototype.SUBRULE=function(e,r){return this.subruleInternal(e,0,r)},t.prototype.SUBRULE1=function(e,r){return this.subruleInternal(e,1,r)},t.prototype.SUBRULE2=function(e,r){return this.subruleInternal(e,2,r)},t.prototype.SUBRULE3=function(e,r){return this.subruleInternal(e,3,r)},t.prototype.SUBRULE4=function(e,r){return this.subruleInternal(e,4,r)},t.prototype.SUBRULE5=function(e,r){return this.subruleInternal(e,5,r)},t.prototype.SUBRULE6=function(e,r){return this.subruleInternal(e,6,r)},t.prototype.SUBRULE7=function(e,r){return this.subruleInternal(e,7,r)},t.prototype.SUBRULE8=function(e,r){return this.subruleInternal(e,8,r)},t.prototype.SUBRULE9=function(e,r){return this.subruleInternal(e,9,r)},t.prototype.OPTION=function(e){return this.optionInternal(e,0)},t.prototype.OPTION1=function(e){return this.optionInternal(e,1)},t.prototype.OPTION2=function(e){return this.optionInternal(e,2)},t.prototype.OPTION3=function(e){return this.optionInternal(e,3)},t.prototype.OPTION4=function(e){return this.optionInternal(e,4)},t.prototype.OPTION5=function(e){return this.optionInternal(e,5)},t.prototype.OPTION6=function(e){return this.optionInternal(e,6)},t.prototype.OPTION7=function(e){return this.optionInternal(e,7)},t.prototype.OPTION8=function(e){return this.optionInternal(e,8)},t.prototype.OPTION9=function(e){return this.optionInternal(e,9)},t.prototype.OR=function(e){return this.orInternal(e,0)},t.prototype.OR1=function(e){return this.orInternal(e,1)},t.prototype.OR2=function(e){return this.orInternal(e,2)},t.prototype.OR3=function(e){return this.orInternal(e,3)},t.prototype.OR4=function(e){return this.orInternal(e,4)},t.prototype.OR5=function(e){return this.orInternal(e,5)},t.prototype.OR6=function(e){return this.orInternal(e,6)},t.prototype.OR7=function(e){return this.orInternal(e,7)},t.prototype.OR8=function(e){return this.orInternal(e,8)},t.prototype.OR9=function(e){return this.orInternal(e,9)},t.prototype.MANY=function(e){this.manyInternal(0,e)},t.prototype.MANY1=function(e){this.manyInternal(1,e)},t.prototype.MANY2=function(e){this.manyInternal(2,e)},t.prototype.MANY3=function(e){this.manyInternal(3,e)},t.prototype.MANY4=function(e){this.manyInternal(4,e)},t.prototype.MANY5=function(e){this.manyInternal(5,e)},t.prototype.MANY6=function(e){this.manyInternal(6,e)},t.prototype.MANY7=function(e){this.manyInternal(7,e)},t.prototype.MANY8=function(e){this.manyInternal(8,e)},t.prototype.MANY9=function(e){this.manyInternal(9,e)},t.prototype.MANY_SEP=function(e){this.manySepFirstInternal(0,e)},t.prototype.MANY_SEP1=function(e){this.manySepFirstInternal(1,e)},t.prototype.MANY_SEP2=function(e){this.manySepFirstInternal(2,e)},t.prototype.MANY_SEP3=function(e){this.manySepFirstInternal(3,e)},t.prototype.MANY_SEP4=function(e){this.manySepFirstInternal(4,e)},t.prototype.MANY_SEP5=function(e){this.manySepFirstInternal(5,e)},t.prototype.MANY_SEP6=function(e){this.manySepFirstInternal(6,e)},t.prototype.MANY_SEP7=function(e){this.manySepFirstInternal(7,e)},t.prototype.MANY_SEP8=function(e){this.manySepFirstInternal(8,e)},t.prototype.MANY_SEP9=function(e){this.manySepFirstInternal(9,e)},t.prototype.AT_LEAST_ONE=function(e){this.atLeastOneInternal(0,e)},t.prototype.AT_LEAST_ONE1=function(e){return this.atLeastOneInternal(1,e)},t.prototype.AT_LEAST_ONE2=function(e){this.atLeastOneInternal(2,e)},t.prototype.AT_LEAST_ONE3=function(e){this.atLeastOneInternal(3,e)},t.prototype.AT_LEAST_ONE4=function(e){this.atLeastOneInternal(4,e)},t.prototype.AT_LEAST_ONE5=function(e){this.atLeastOneInternal(5,e)},t.prototype.AT_LEAST_ONE6=function(e){this.atLeastOneInternal(6,e)},t.prototype.AT_LEAST_ONE7=function(e){this.atLeastOneInternal(7,e)},t.prototype.AT_LEAST_ONE8=function(e){this.atLeastOneInternal(8,e)},t.prototype.AT_LEAST_ONE9=function(e){this.atLeastOneInternal(9,e)},t.prototype.AT_LEAST_ONE_SEP=function(e){this.atLeastOneSepFirstInternal(0,e)},t.prototype.AT_LEAST_ONE_SEP1=function(e){this.atLeastOneSepFirstInternal(1,e)},t.prototype.AT_LEAST_ONE_SEP2=function(e){this.atLeastOneSepFirstInternal(2,e)},t.prototype.AT_LEAST_ONE_SEP3=function(e){this.atLeastOneSepFirstInternal(3,e)},t.prototype.AT_LEAST_ONE_SEP4=function(e){this.atLeastOneSepFirstInternal(4,e)},t.prototype.AT_LEAST_ONE_SEP5=function(e){this.atLeastOneSepFirstInternal(5,e)},t.prototype.AT_LEAST_ONE_SEP6=function(e){this.atLeastOneSepFirstInternal(6,e)},t.prototype.AT_LEAST_ONE_SEP7=function(e){this.atLeastOneSepFirstInternal(7,e)},t.prototype.AT_LEAST_ONE_SEP8=function(e){this.atLeastOneSepFirstInternal(8,e)},t.prototype.AT_LEAST_ONE_SEP9=function(e){this.atLeastOneSepFirstInternal(9,e)},t.prototype.RULE=function(e,r,i){if(i===void 0&&(i=mS.DEFAULT_RULE_CONFIG),(0,Gj.contains)(this.definedRulesNames,e)){var n=Oye.defaultGrammarValidatorErrorProvider.buildDuplicateRuleNameError({topLevelRule:e,grammarName:this.className}),s={message:n,type:mS.ParserDefinitionErrorType.DUPLICATE_RULE_NAME,ruleName:e};this.definitionErrors.push(s)}this.definedRulesNames.push(e);var o=this.defineRule(e,r,i);return this[e]=o,o},t.prototype.OVERRIDE_RULE=function(e,r,i){i===void 0&&(i=mS.DEFAULT_RULE_CONFIG);var n=[];n=n.concat((0,Kye.validateRuleIsOverridden)(e,this.definedRulesNames,this.className)),this.definitionErrors=this.definitionErrors.concat(n);var s=this.defineRule(e,r,i);return this[e]=s,s},t.prototype.BACKTRACK=function(e,r){return function(){this.isBackTrackingStack.push(1);var i=this.saveRecogState();try{return e.apply(this,r),!0}catch(n){if((0,Mye.isRecognitionException)(n))return!1;throw n}finally{this.reloadRecogState(i),this.isBackTrackingStack.pop()}}},t.prototype.getGAstProductions=function(){return this.gastProductionsCache},t.prototype.getSerializedGastProductions=function(){return(0,Uye.serializeGrammar)((0,Gj.values)(this.gastProductionsCache))},t}();RE.RecognizerApi=Hye});var Wj=I(FE=>{"use strict";Object.defineProperty(FE,"__esModule",{value:!0});FE.RecognizerEngine=void 0;var Ir=Dt(),Mn=xE(),NE=vu(),Yj=_h(),xu=Vh(),qj=Tn(),Gye=pS(),Jj=nA(),ep=yu(),jye=dS(),Yye=function(){function t(){}return t.prototype.initRecognizerEngine=function(e,r){if(this.className=(0,jye.classNameFromInstance)(this),this.shortRuleNameToFull={},this.fullRuleNameToShort={},this.ruleShortNameIdx=256,this.tokenMatcher=ep.tokenStructuredMatcherNoCategories,this.definedRulesNames=[],this.tokensMap={},this.isBackTrackingStack=[],this.RULE_STACK=[],this.RULE_OCCURRENCE_STACK=[],this.gastProductionsCache={},(0,Ir.has)(r,"serializedGrammar"))throw Error(`The Parser's configuration can no longer contain a property. + See: https://chevrotain.io/docs/changes/BREAKING_CHANGES.html#_6-0-0 + For Further details.`);if((0,Ir.isArray)(e)){if((0,Ir.isEmpty)(e))throw Error(`A Token Vocabulary cannot be empty. + Note that the first argument for the parser constructor + is no longer a Token vector (since v4.0).`);if(typeof e[0].startOffset=="number")throw Error(`The Parser constructor no longer accepts a token vector as the first argument. + See: https://chevrotain.io/docs/changes/BREAKING_CHANGES.html#_4-0-0 + For Further details.`)}if((0,Ir.isArray)(e))this.tokensMap=(0,Ir.reduce)(e,function(o,a){return o[a.name]=a,o},{});else if((0,Ir.has)(e,"modes")&&(0,Ir.every)((0,Ir.flatten)((0,Ir.values)(e.modes)),ep.isTokenType)){var i=(0,Ir.flatten)((0,Ir.values)(e.modes)),n=(0,Ir.uniq)(i);this.tokensMap=(0,Ir.reduce)(n,function(o,a){return o[a.name]=a,o},{})}else if((0,Ir.isObject)(e))this.tokensMap=(0,Ir.cloneObj)(e);else throw new Error(" argument must be An Array of Token constructors, A dictionary of Token constructors or an IMultiModeLexerDefinition");this.tokensMap.EOF=Jj.EOF;var s=(0,Ir.every)((0,Ir.values)(e),function(o){return(0,Ir.isEmpty)(o.categoryMatches)});this.tokenMatcher=s?ep.tokenStructuredMatcherNoCategories:ep.tokenStructuredMatcher,(0,ep.augmentTokenTypes)((0,Ir.values)(this.tokensMap))},t.prototype.defineRule=function(e,r,i){if(this.selfAnalysisDone)throw Error("Grammar rule <"+e+`> may not be defined after the 'performSelfAnalysis' method has been called' +Make sure that all grammar rule definitions are done before 'performSelfAnalysis' is called.`);var n=(0,Ir.has)(i,"resyncEnabled")?i.resyncEnabled:qj.DEFAULT_RULE_CONFIG.resyncEnabled,s=(0,Ir.has)(i,"recoveryValueFunc")?i.recoveryValueFunc:qj.DEFAULT_RULE_CONFIG.recoveryValueFunc,o=this.ruleShortNameIdx<r},t.prototype.orInternal=function(e,r){var i=this.getKeyForAutomaticLookahead(Mn.OR_IDX,r),n=(0,Ir.isArray)(e)?e:e.DEF,s=this.getLaFuncFromCache(i),o=s.call(this,n);if(o!==void 0){var a=n[o];return a.ALT.call(this)}this.raiseNoAltException(r,e.ERR_MSG)},t.prototype.ruleFinallyStateUpdate=function(){if(this.RULE_STACK.pop(),this.RULE_OCCURRENCE_STACK.pop(),this.cstFinallyStateUpdate(),this.RULE_STACK.length===0&&this.isAtEndOfInput()===!1){var e=this.LA(1),r=this.errorMessageProvider.buildNotAllInputParsedMessage({firstRedundant:e,ruleName:this.getCurrRuleFullName()});this.SAVE_ERROR(new NE.NotAllInputParsedException(r,e))}},t.prototype.subruleInternal=function(e,r,i){var n;try{var s=i!==void 0?i.ARGS:void 0;return n=e.call(this,r,s),this.cstPostNonTerminal(n,i!==void 0&&i.LABEL!==void 0?i.LABEL:e.ruleName),n}catch(o){this.subruleInternalError(o,i,e.ruleName)}},t.prototype.subruleInternalError=function(e,r,i){throw(0,NE.isRecognitionException)(e)&&e.partialCstResult!==void 0&&(this.cstPostNonTerminal(e.partialCstResult,r!==void 0&&r.LABEL!==void 0?r.LABEL:i),delete e.partialCstResult),e},t.prototype.consumeInternal=function(e,r,i){var n;try{var s=this.LA(1);this.tokenMatcher(s,e)===!0?(this.consumeToken(),n=s):this.consumeInternalError(e,s,i)}catch(o){n=this.consumeInternalRecovery(e,r,o)}return this.cstPostTerminal(i!==void 0&&i.LABEL!==void 0?i.LABEL:e.name,n),n},t.prototype.consumeInternalError=function(e,r,i){var n,s=this.LA(0);throw i!==void 0&&i.ERR_MSG?n=i.ERR_MSG:n=this.errorMessageProvider.buildMismatchTokenMessage({expected:e,actual:r,previous:s,ruleName:this.getCurrRuleFullName()}),this.SAVE_ERROR(new NE.MismatchedTokenException(n,r,s))},t.prototype.consumeInternalRecovery=function(e,r,i){if(this.recoveryEnabled&&i.name==="MismatchedTokenException"&&!this.isBackTracking()){var n=this.getFollowsForInRuleRecovery(e,r);try{return this.tryInRuleRecovery(e,n)}catch(s){throw s.name===Gye.IN_RULE_RECOVERY_EXCEPTION?i:s}}else throw i},t.prototype.saveRecogState=function(){var e=this.errors,r=(0,Ir.cloneArr)(this.RULE_STACK);return{errors:e,lexerState:this.exportLexerState(),RULE_STACK:r,CST_STACK:this.CST_STACK}},t.prototype.reloadRecogState=function(e){this.errors=e.errors,this.importLexerState(e.lexerState),this.RULE_STACK=e.RULE_STACK},t.prototype.ruleInvocationStateUpdate=function(e,r,i){this.RULE_OCCURRENCE_STACK.push(i),this.RULE_STACK.push(e),this.cstInvocationStateUpdate(r,e)},t.prototype.isBackTracking=function(){return this.isBackTrackingStack.length!==0},t.prototype.getCurrRuleFullName=function(){var e=this.getLastExplicitRuleShortName();return this.shortRuleNameToFull[e]},t.prototype.shortRuleNameToFullName=function(e){return this.shortRuleNameToFull[e]},t.prototype.isAtEndOfInput=function(){return this.tokenMatcher(this.LA(1),Jj.EOF)},t.prototype.reset=function(){this.resetLexerState(),this.isBackTrackingStack=[],this.errors=[],this.RULE_STACK=[],this.CST_STACK=[],this.RULE_OCCURRENCE_STACK=[]},t}();FE.RecognizerEngine=Yye});var Vj=I(LE=>{"use strict";Object.defineProperty(LE,"__esModule",{value:!0});LE.ErrorHandler=void 0;var IS=vu(),ES=Dt(),zj=_h(),qye=Tn(),Jye=function(){function t(){}return t.prototype.initErrorHandler=function(e){this._errors=[],this.errorMessageProvider=(0,ES.has)(e,"errorMessageProvider")?e.errorMessageProvider:qye.DEFAULT_PARSER_CONFIG.errorMessageProvider},t.prototype.SAVE_ERROR=function(e){if((0,IS.isRecognitionException)(e))return e.context={ruleStack:this.getHumanReadableRuleStack(),ruleOccurrenceStack:(0,ES.cloneArr)(this.RULE_OCCURRENCE_STACK)},this._errors.push(e),e;throw Error("Trying to save an Error which is not a RecognitionException")},Object.defineProperty(t.prototype,"errors",{get:function(){return(0,ES.cloneArr)(this._errors)},set:function(e){this._errors=e},enumerable:!1,configurable:!0}),t.prototype.raiseEarlyExitException=function(e,r,i){for(var n=this.getCurrRuleFullName(),s=this.getGAstProductions()[n],o=(0,zj.getLookaheadPathsForOptionalProd)(e,s,r,this.maxLookahead),a=o[0],l=[],c=1;c<=this.maxLookahead;c++)l.push(this.LA(c));var u=this.errorMessageProvider.buildEarlyExitMessage({expectedIterationPaths:a,actual:l,previous:this.LA(0),customUserDescription:i,ruleName:n});throw this.SAVE_ERROR(new IS.EarlyExitException(u,this.LA(1),this.LA(0)))},t.prototype.raiseNoAltException=function(e,r){for(var i=this.getCurrRuleFullName(),n=this.getGAstProductions()[i],s=(0,zj.getLookaheadPathsForOr)(e,n,this.maxLookahead),o=[],a=1;a<=this.maxLookahead;a++)o.push(this.LA(a));var l=this.LA(0),c=this.errorMessageProvider.buildNoViableAltMessage({expectedPathsPerAlt:s,actual:o,previous:l,customUserDescription:r,ruleName:this.getCurrRuleFullName()});throw this.SAVE_ERROR(new IS.NoViableAltException(c,this.LA(1),l))},t}();LE.ErrorHandler=Jye});var Zj=I(TE=>{"use strict";Object.defineProperty(TE,"__esModule",{value:!0});TE.ContentAssist=void 0;var _j=Vh(),Xj=Dt(),Wye=function(){function t(){}return t.prototype.initContentAssist=function(){},t.prototype.computeContentAssist=function(e,r){var i=this.gastProductionsCache[e];if((0,Xj.isUndefined)(i))throw Error("Rule ->"+e+"<- does not exist in this grammar.");return(0,_j.nextPossibleTokensAfter)([i],r,this.tokenMatcher,this.maxLookahead)},t.prototype.getNextPossibleTokenTypes=function(e){var r=(0,Xj.first)(e.ruleStack),i=this.getGAstProductions(),n=i[r],s=new _j.NextAfterTokenWalker(n,e).startWalking();return s},t}();TE.ContentAssist=Wye});var oY=I(ME=>{"use strict";Object.defineProperty(ME,"__esModule",{value:!0});ME.GastRecorder=void 0;var Cn=Dt(),fo=hn(),zye=Gh(),$j=yu(),eY=nA(),Vye=Tn(),_ye=xE(),OE={description:"This Object indicates the Parser is during Recording Phase"};Object.freeze(OE);var tY=!0,rY=Math.pow(2,_ye.BITS_FOR_OCCURRENCE_IDX)-1,iY=(0,eY.createToken)({name:"RECORDING_PHASE_TOKEN",pattern:zye.Lexer.NA});(0,$j.augmentTokenTypes)([iY]);var nY=(0,eY.createTokenInstance)(iY,`This IToken indicates the Parser is in Recording Phase + See: https://chevrotain.io/docs/guide/internals.html#grammar-recording for details`,-1,-1,-1,-1,-1,-1);Object.freeze(nY);var Xye={name:`This CSTNode indicates the Parser is in Recording Phase + See: https://chevrotain.io/docs/guide/internals.html#grammar-recording for details`,children:{}},$ye=function(){function t(){}return t.prototype.initGastRecorder=function(e){this.recordingProdStack=[],this.RECORDING_PHASE=!1},t.prototype.enableRecording=function(){var e=this;this.RECORDING_PHASE=!0,this.TRACE_INIT("Enable Recording",function(){for(var r=function(n){var s=n>0?n:"";e["CONSUME"+s]=function(o,a){return this.consumeInternalRecord(o,n,a)},e["SUBRULE"+s]=function(o,a){return this.subruleInternalRecord(o,n,a)},e["OPTION"+s]=function(o){return this.optionInternalRecord(o,n)},e["OR"+s]=function(o){return this.orInternalRecord(o,n)},e["MANY"+s]=function(o){this.manyInternalRecord(n,o)},e["MANY_SEP"+s]=function(o){this.manySepFirstInternalRecord(n,o)},e["AT_LEAST_ONE"+s]=function(o){this.atLeastOneInternalRecord(n,o)},e["AT_LEAST_ONE_SEP"+s]=function(o){this.atLeastOneSepFirstInternalRecord(n,o)}},i=0;i<10;i++)r(i);e.consume=function(n,s,o){return this.consumeInternalRecord(s,n,o)},e.subrule=function(n,s,o){return this.subruleInternalRecord(s,n,o)},e.option=function(n,s){return this.optionInternalRecord(s,n)},e.or=function(n,s){return this.orInternalRecord(s,n)},e.many=function(n,s){this.manyInternalRecord(n,s)},e.atLeastOne=function(n,s){this.atLeastOneInternalRecord(n,s)},e.ACTION=e.ACTION_RECORD,e.BACKTRACK=e.BACKTRACK_RECORD,e.LA=e.LA_RECORD})},t.prototype.disableRecording=function(){var e=this;this.RECORDING_PHASE=!1,this.TRACE_INIT("Deleting Recording methods",function(){for(var r=0;r<10;r++){var i=r>0?r:"";delete e["CONSUME"+i],delete e["SUBRULE"+i],delete e["OPTION"+i],delete e["OR"+i],delete e["MANY"+i],delete e["MANY_SEP"+i],delete e["AT_LEAST_ONE"+i],delete e["AT_LEAST_ONE_SEP"+i]}delete e.consume,delete e.subrule,delete e.option,delete e.or,delete e.many,delete e.atLeastOne,delete e.ACTION,delete e.BACKTRACK,delete e.LA})},t.prototype.ACTION_RECORD=function(e){},t.prototype.BACKTRACK_RECORD=function(e,r){return function(){return!0}},t.prototype.LA_RECORD=function(e){return Vye.END_OF_FILE},t.prototype.topLevelRuleRecord=function(e,r){try{var i=new fo.Rule({definition:[],name:e});return i.name=e,this.recordingProdStack.push(i),r.call(this),this.recordingProdStack.pop(),i}catch(n){if(n.KNOWN_RECORDER_ERROR!==!0)try{n.message=n.message+` + This error was thrown during the "grammar recording phase" For more info see: + https://chevrotain.io/docs/guide/internals.html#grammar-recording`}catch(s){throw n}throw n}},t.prototype.optionInternalRecord=function(e,r){return tp.call(this,fo.Option,e,r)},t.prototype.atLeastOneInternalRecord=function(e,r){tp.call(this,fo.RepetitionMandatory,r,e)},t.prototype.atLeastOneSepFirstInternalRecord=function(e,r){tp.call(this,fo.RepetitionMandatoryWithSeparator,r,e,tY)},t.prototype.manyInternalRecord=function(e,r){tp.call(this,fo.Repetition,r,e)},t.prototype.manySepFirstInternalRecord=function(e,r){tp.call(this,fo.RepetitionWithSeparator,r,e,tY)},t.prototype.orInternalRecord=function(e,r){return Zye.call(this,e,r)},t.prototype.subruleInternalRecord=function(e,r,i){if(KE(r),!e||(0,Cn.has)(e,"ruleName")===!1){var n=new Error(" argument is invalid"+(" expecting a Parser method reference but got: <"+JSON.stringify(e)+">")+(` + inside top level rule: <`+this.recordingProdStack[0].name+">"));throw n.KNOWN_RECORDER_ERROR=!0,n}var s=(0,Cn.peek)(this.recordingProdStack),o=e.ruleName,a=new fo.NonTerminal({idx:r,nonTerminalName:o,label:i==null?void 0:i.LABEL,referencedRule:void 0});return s.definition.push(a),this.outputCst?Xye:OE},t.prototype.consumeInternalRecord=function(e,r,i){if(KE(r),!(0,$j.hasShortKeyProperty)(e)){var n=new Error(" argument is invalid"+(" expecting a TokenType reference but got: <"+JSON.stringify(e)+">")+(` + inside top level rule: <`+this.recordingProdStack[0].name+">"));throw n.KNOWN_RECORDER_ERROR=!0,n}var s=(0,Cn.peek)(this.recordingProdStack),o=new fo.Terminal({idx:r,terminalType:e,label:i==null?void 0:i.LABEL});return s.definition.push(o),nY},t}();ME.GastRecorder=$ye;function tp(t,e,r,i){i===void 0&&(i=!1),KE(r);var n=(0,Cn.peek)(this.recordingProdStack),s=(0,Cn.isFunction)(e)?e:e.DEF,o=new t({definition:[],idx:r});return i&&(o.separator=e.SEP),(0,Cn.has)(e,"MAX_LOOKAHEAD")&&(o.maxLookahead=e.MAX_LOOKAHEAD),this.recordingProdStack.push(o),s.call(this),n.definition.push(o),this.recordingProdStack.pop(),OE}function Zye(t,e){var r=this;KE(e);var i=(0,Cn.peek)(this.recordingProdStack),n=(0,Cn.isArray)(t)===!1,s=n===!1?t:t.DEF,o=new fo.Alternation({definition:[],idx:e,ignoreAmbiguities:n&&t.IGNORE_AMBIGUITIES===!0});(0,Cn.has)(t,"MAX_LOOKAHEAD")&&(o.maxLookahead=t.MAX_LOOKAHEAD);var a=(0,Cn.some)(s,function(l){return(0,Cn.isFunction)(l.GATE)});return o.hasPredicates=a,i.definition.push(o),(0,Cn.forEach)(s,function(l){var c=new fo.Alternative({definition:[]});o.definition.push(c),(0,Cn.has)(l,"IGNORE_AMBIGUITIES")?c.ignoreAmbiguities=l.IGNORE_AMBIGUITIES:(0,Cn.has)(l,"GATE")&&(c.ignoreAmbiguities=!0),r.recordingProdStack.push(c),l.ALT.call(r),r.recordingProdStack.pop()}),OE}function sY(t){return t===0?"":""+t}function KE(t){if(t<0||t>rY){var e=new Error("Invalid DSL Method idx value: <"+t+`> + `+("Idx value must be a none negative value smaller than "+(rY+1)));throw e.KNOWN_RECORDER_ERROR=!0,e}}});var AY=I(UE=>{"use strict";Object.defineProperty(UE,"__esModule",{value:!0});UE.PerformanceTracer=void 0;var aY=Dt(),ewe=Tn(),twe=function(){function t(){}return t.prototype.initPerformanceTracer=function(e){if((0,aY.has)(e,"traceInitPerf")){var r=e.traceInitPerf,i=typeof r=="number";this.traceInitMaxIdent=i?r:Infinity,this.traceInitPerf=i?r>0:r}else this.traceInitMaxIdent=0,this.traceInitPerf=ewe.DEFAULT_PARSER_CONFIG.traceInitPerf;this.traceInitIndent=-1},t.prototype.TRACE_INIT=function(e,r){if(this.traceInitPerf===!0){this.traceInitIndent++;var i=new Array(this.traceInitIndent+1).join(" ");this.traceInitIndent <"+e+">");var n=(0,aY.timer)(r),s=n.time,o=n.value,a=s>10?console.warn:console.log;return this.traceInitIndent time: "+s+"ms"),this.traceInitIndent--,o}else return r()},t}();UE.PerformanceTracer=twe});var lY=I(HE=>{"use strict";Object.defineProperty(HE,"__esModule",{value:!0});HE.applyMixins=void 0;function rwe(t,e){e.forEach(function(r){var i=r.prototype;Object.getOwnPropertyNames(i).forEach(function(n){if(n!=="constructor"){var s=Object.getOwnPropertyDescriptor(i,n);s&&(s.get||s.set)?Object.defineProperty(t.prototype,n,s):t.prototype[n]=r.prototype[n]}})})}HE.applyMixins=rwe});var Tn=I(or=>{"use strict";var cY=or&&or.__extends||function(){var t=function(e,r){return t=Object.setPrototypeOf||{__proto__:[]}instanceof Array&&function(i,n){i.__proto__=n}||function(i,n){for(var s in n)Object.prototype.hasOwnProperty.call(n,s)&&(i[s]=n[s])},t(e,r)};return function(e,r){if(typeof r!="function"&&r!==null)throw new TypeError("Class extends value "+String(r)+" is not a constructor or null");t(e,r);function i(){this.constructor=e}e.prototype=r===null?Object.create(r):(i.prototype=r.prototype,new i)}}();Object.defineProperty(or,"__esModule",{value:!0});or.EmbeddedActionsParser=or.CstParser=or.Parser=or.EMPTY_ALT=or.ParserDefinitionErrorType=or.DEFAULT_RULE_CONFIG=or.DEFAULT_PARSER_CONFIG=or.END_OF_FILE=void 0;var Wi=Dt(),iwe=VG(),uY=nA(),gY=Wh(),fY=yj(),nwe=pS(),swe=kj(),owe=Kj(),awe=Hj(),Awe=jj(),lwe=Wj(),cwe=Vj(),uwe=Zj(),gwe=oY(),fwe=AY(),hwe=lY();or.END_OF_FILE=(0,uY.createTokenInstance)(uY.EOF,"",NaN,NaN,NaN,NaN,NaN,NaN);Object.freeze(or.END_OF_FILE);or.DEFAULT_PARSER_CONFIG=Object.freeze({recoveryEnabled:!1,maxLookahead:3,dynamicTokensEnabled:!1,outputCst:!0,errorMessageProvider:gY.defaultParserErrorProvider,nodeLocationTracking:"none",traceInitPerf:!1,skipValidations:!1});or.DEFAULT_RULE_CONFIG=Object.freeze({recoveryValueFunc:function(){},resyncEnabled:!0});var pwe;(function(t){t[t.INVALID_RULE_NAME=0]="INVALID_RULE_NAME",t[t.DUPLICATE_RULE_NAME=1]="DUPLICATE_RULE_NAME",t[t.INVALID_RULE_OVERRIDE=2]="INVALID_RULE_OVERRIDE",t[t.DUPLICATE_PRODUCTIONS=3]="DUPLICATE_PRODUCTIONS",t[t.UNRESOLVED_SUBRULE_REF=4]="UNRESOLVED_SUBRULE_REF",t[t.LEFT_RECURSION=5]="LEFT_RECURSION",t[t.NONE_LAST_EMPTY_ALT=6]="NONE_LAST_EMPTY_ALT",t[t.AMBIGUOUS_ALTS=7]="AMBIGUOUS_ALTS",t[t.CONFLICT_TOKENS_RULES_NAMESPACE=8]="CONFLICT_TOKENS_RULES_NAMESPACE",t[t.INVALID_TOKEN_NAME=9]="INVALID_TOKEN_NAME",t[t.NO_NON_EMPTY_LOOKAHEAD=10]="NO_NON_EMPTY_LOOKAHEAD",t[t.AMBIGUOUS_PREFIX_ALTS=11]="AMBIGUOUS_PREFIX_ALTS",t[t.TOO_MANY_ALTS=12]="TOO_MANY_ALTS"})(pwe=or.ParserDefinitionErrorType||(or.ParserDefinitionErrorType={}));function dwe(t){return t===void 0&&(t=void 0),function(){return t}}or.EMPTY_ALT=dwe;var GE=function(){function t(e,r){this.definitionErrors=[],this.selfAnalysisDone=!1;var i=this;if(i.initErrorHandler(r),i.initLexerAdapter(),i.initLooksAhead(r),i.initRecognizerEngine(e,r),i.initRecoverable(r),i.initTreeBuilder(r),i.initContentAssist(),i.initGastRecorder(r),i.initPerformanceTracer(r),(0,Wi.has)(r,"ignoredIssues"))throw new Error(`The IParserConfig property has been deprecated. + Please use the flag on the relevant DSL method instead. + See: https://chevrotain.io/docs/guide/resolving_grammar_errors.html#IGNORING_AMBIGUITIES + For further details.`);this.skipValidations=(0,Wi.has)(r,"skipValidations")?r.skipValidations:or.DEFAULT_PARSER_CONFIG.skipValidations}return t.performSelfAnalysis=function(e){throw Error("The **static** `performSelfAnalysis` method has been deprecated. \nUse the **instance** method with the same name instead.")},t.prototype.performSelfAnalysis=function(){var e=this;this.TRACE_INIT("performSelfAnalysis",function(){var r;e.selfAnalysisDone=!0;var i=e.className;e.TRACE_INIT("toFastProps",function(){(0,Wi.toFastProperties)(e)}),e.TRACE_INIT("Grammar Recording",function(){try{e.enableRecording(),(0,Wi.forEach)(e.definedRulesNames,function(s){var o=e[s],a=o.originalGrammarAction,l=void 0;e.TRACE_INIT(s+" Rule",function(){l=e.topLevelRuleRecord(s,a)}),e.gastProductionsCache[s]=l})}finally{e.disableRecording()}});var n=[];if(e.TRACE_INIT("Grammar Resolving",function(){n=(0,fY.resolveGrammar)({rules:(0,Wi.values)(e.gastProductionsCache)}),e.definitionErrors=e.definitionErrors.concat(n)}),e.TRACE_INIT("Grammar Validations",function(){if((0,Wi.isEmpty)(n)&&e.skipValidations===!1){var s=(0,fY.validateGrammar)({rules:(0,Wi.values)(e.gastProductionsCache),maxLookahead:e.maxLookahead,tokenTypes:(0,Wi.values)(e.tokensMap),errMsgProvider:gY.defaultGrammarValidatorErrorProvider,grammarName:i});e.definitionErrors=e.definitionErrors.concat(s)}}),(0,Wi.isEmpty)(e.definitionErrors)&&(e.recoveryEnabled&&e.TRACE_INIT("computeAllProdsFollows",function(){var s=(0,iwe.computeAllProdsFollows)((0,Wi.values)(e.gastProductionsCache));e.resyncFollows=s}),e.TRACE_INIT("ComputeLookaheadFunctions",function(){e.preComputeLookaheadFunctions((0,Wi.values)(e.gastProductionsCache))})),!t.DEFER_DEFINITION_ERRORS_HANDLING&&!(0,Wi.isEmpty)(e.definitionErrors))throw r=(0,Wi.map)(e.definitionErrors,function(s){return s.message}),new Error(`Parser Definition Errors detected: + `+r.join(` +------------------------------- +`))})},t.DEFER_DEFINITION_ERRORS_HANDLING=!1,t}();or.Parser=GE;(0,hwe.applyMixins)(GE,[nwe.Recoverable,swe.LooksAhead,owe.TreeBuilder,awe.LexerAdapter,lwe.RecognizerEngine,Awe.RecognizerApi,cwe.ErrorHandler,uwe.ContentAssist,gwe.GastRecorder,fwe.PerformanceTracer]);var Cwe=function(t){cY(e,t);function e(r,i){i===void 0&&(i=or.DEFAULT_PARSER_CONFIG);var n=this,s=(0,Wi.cloneObj)(i);return s.outputCst=!0,n=t.call(this,r,s)||this,n}return e}(GE);or.CstParser=Cwe;var mwe=function(t){cY(e,t);function e(r,i){i===void 0&&(i=or.DEFAULT_PARSER_CONFIG);var n=this,s=(0,Wi.cloneObj)(i);return s.outputCst=!1,n=t.call(this,r,s)||this,n}return e}(GE);or.EmbeddedActionsParser=mwe});var pY=I(jE=>{"use strict";Object.defineProperty(jE,"__esModule",{value:!0});jE.createSyntaxDiagramsCode=void 0;var hY=Uv();function Iwe(t,e){var r=e===void 0?{}:e,i=r.resourceBase,n=i===void 0?"https://unpkg.com/chevrotain@"+hY.VERSION+"/diagrams/":i,s=r.css,o=s===void 0?"https://unpkg.com/chevrotain@"+hY.VERSION+"/diagrams/diagrams.css":s,a=` + + + + + +`,l=` + +`,c=` + + + + +`,u=` +
    +`,g=` + +`,f=` + +`;return a+l+c+u+g+f}jE.createSyntaxDiagramsCode=Iwe});var mY=I(He=>{"use strict";Object.defineProperty(He,"__esModule",{value:!0});He.Parser=He.createSyntaxDiagramsCode=He.clearCache=He.GAstVisitor=He.serializeProduction=He.serializeGrammar=He.Terminal=He.Rule=He.RepetitionWithSeparator=He.RepetitionMandatoryWithSeparator=He.RepetitionMandatory=He.Repetition=He.Option=He.NonTerminal=He.Alternative=He.Alternation=He.defaultLexerErrorProvider=He.NoViableAltException=He.NotAllInputParsedException=He.MismatchedTokenException=He.isRecognitionException=He.EarlyExitException=He.defaultParserErrorProvider=He.tokenName=He.tokenMatcher=He.tokenLabel=He.EOF=He.createTokenInstance=He.createToken=He.LexerDefinitionErrorType=He.Lexer=He.EMPTY_ALT=He.ParserDefinitionErrorType=He.EmbeddedActionsParser=He.CstParser=He.VERSION=void 0;var Ewe=Uv();Object.defineProperty(He,"VERSION",{enumerable:!0,get:function(){return Ewe.VERSION}});var YE=Tn();Object.defineProperty(He,"CstParser",{enumerable:!0,get:function(){return YE.CstParser}});Object.defineProperty(He,"EmbeddedActionsParser",{enumerable:!0,get:function(){return YE.EmbeddedActionsParser}});Object.defineProperty(He,"ParserDefinitionErrorType",{enumerable:!0,get:function(){return YE.ParserDefinitionErrorType}});Object.defineProperty(He,"EMPTY_ALT",{enumerable:!0,get:function(){return YE.EMPTY_ALT}});var dY=Gh();Object.defineProperty(He,"Lexer",{enumerable:!0,get:function(){return dY.Lexer}});Object.defineProperty(He,"LexerDefinitionErrorType",{enumerable:!0,get:function(){return dY.LexerDefinitionErrorType}});var ku=nA();Object.defineProperty(He,"createToken",{enumerable:!0,get:function(){return ku.createToken}});Object.defineProperty(He,"createTokenInstance",{enumerable:!0,get:function(){return ku.createTokenInstance}});Object.defineProperty(He,"EOF",{enumerable:!0,get:function(){return ku.EOF}});Object.defineProperty(He,"tokenLabel",{enumerable:!0,get:function(){return ku.tokenLabel}});Object.defineProperty(He,"tokenMatcher",{enumerable:!0,get:function(){return ku.tokenMatcher}});Object.defineProperty(He,"tokenName",{enumerable:!0,get:function(){return ku.tokenName}});var ywe=Wh();Object.defineProperty(He,"defaultParserErrorProvider",{enumerable:!0,get:function(){return ywe.defaultParserErrorProvider}});var rp=vu();Object.defineProperty(He,"EarlyExitException",{enumerable:!0,get:function(){return rp.EarlyExitException}});Object.defineProperty(He,"isRecognitionException",{enumerable:!0,get:function(){return rp.isRecognitionException}});Object.defineProperty(He,"MismatchedTokenException",{enumerable:!0,get:function(){return rp.MismatchedTokenException}});Object.defineProperty(He,"NotAllInputParsedException",{enumerable:!0,get:function(){return rp.NotAllInputParsedException}});Object.defineProperty(He,"NoViableAltException",{enumerable:!0,get:function(){return rp.NoViableAltException}});var wwe=_v();Object.defineProperty(He,"defaultLexerErrorProvider",{enumerable:!0,get:function(){return wwe.defaultLexerErrorProvider}});var ho=hn();Object.defineProperty(He,"Alternation",{enumerable:!0,get:function(){return ho.Alternation}});Object.defineProperty(He,"Alternative",{enumerable:!0,get:function(){return ho.Alternative}});Object.defineProperty(He,"NonTerminal",{enumerable:!0,get:function(){return ho.NonTerminal}});Object.defineProperty(He,"Option",{enumerable:!0,get:function(){return ho.Option}});Object.defineProperty(He,"Repetition",{enumerable:!0,get:function(){return ho.Repetition}});Object.defineProperty(He,"RepetitionMandatory",{enumerable:!0,get:function(){return ho.RepetitionMandatory}});Object.defineProperty(He,"RepetitionMandatoryWithSeparator",{enumerable:!0,get:function(){return ho.RepetitionMandatoryWithSeparator}});Object.defineProperty(He,"RepetitionWithSeparator",{enumerable:!0,get:function(){return ho.RepetitionWithSeparator}});Object.defineProperty(He,"Rule",{enumerable:!0,get:function(){return ho.Rule}});Object.defineProperty(He,"Terminal",{enumerable:!0,get:function(){return ho.Terminal}});var CY=hn();Object.defineProperty(He,"serializeGrammar",{enumerable:!0,get:function(){return CY.serializeGrammar}});Object.defineProperty(He,"serializeProduction",{enumerable:!0,get:function(){return CY.serializeProduction}});var Bwe=wu();Object.defineProperty(He,"GAstVisitor",{enumerable:!0,get:function(){return Bwe.GAstVisitor}});function Qwe(){console.warn(`The clearCache function was 'soft' removed from the Chevrotain API. + It performs no action other than printing this message. + Please avoid using it as it will be completely removed in the future`)}He.clearCache=Qwe;var bwe=pY();Object.defineProperty(He,"createSyntaxDiagramsCode",{enumerable:!0,get:function(){return bwe.createSyntaxDiagramsCode}});var vwe=function(){function t(){throw new Error(`The Parser class has been deprecated, use CstParser or EmbeddedActionsParser instead. +See: https://chevrotain.io/docs/changes/BREAKING_CHANGES.html#_7-0-0`)}return t}();He.Parser=vwe});var yY=I((Trt,IY)=>{var qE=mY(),ca=qE.createToken,EY=qE.tokenMatcher,yS=qE.Lexer,Swe=qE.EmbeddedActionsParser;IY.exports=t=>{let e=ca({name:"LogicalOperator",pattern:yS.NA}),r=ca({name:"Or",pattern:/\|/,categories:e}),i=ca({name:"Xor",pattern:/\^/,categories:e}),n=ca({name:"And",pattern:/&/,categories:e}),s=ca({name:"Not",pattern:/!/}),o=ca({name:"LParen",pattern:/\(/}),a=ca({name:"RParen",pattern:/\)/}),l=ca({name:"Query",pattern:t}),u=[ca({name:"WhiteSpace",pattern:/\s+/,group:yS.SKIPPED}),r,i,n,o,a,s,e,l],g=new yS(u);class f extends Swe{constructor(p){super(u);this.RULE("expression",()=>this.SUBRULE(this.logicalExpression)),this.RULE("logicalExpression",()=>{let m=this.SUBRULE(this.atomicExpression);return this.MANY(()=>{let E=m,B=this.CONSUME(e),b=this.SUBRULE2(this.atomicExpression);EY(B,r)?m=R=>E(R)||b(R):EY(B,i)?m=R=>!!(E(R)^b(R)):m=R=>E(R)&&b(R)}),m}),this.RULE("atomicExpression",()=>this.OR([{ALT:()=>this.SUBRULE(this.parenthesisExpression)},{ALT:()=>{let{image:d}=this.CONSUME(l);return m=>m(d)}},{ALT:()=>{this.CONSUME(s);let d=this.SUBRULE(this.atomicExpression);return m=>!d(m)}}])),this.RULE("parenthesisExpression",()=>{let d;return this.CONSUME(o),d=this.SUBRULE(this.expression),this.CONSUME(a),d}),this.performSelfAnalysis()}}return{TinylogicLexer:g,TinylogicParser:f}}});var wY=I(JE=>{var xwe=yY();JE.makeParser=(t=/[a-z]+/)=>{let{TinylogicLexer:e,TinylogicParser:r}=xwe(t),i=new r;return(n,s)=>{let o=e.tokenize(n);return i.input=o.tokens,i.expression()(s)}};JE.parse=JE.makeParser()});var QY=I((Ort,BY)=>{"use strict";BY.exports=(...t)=>[...new Set([].concat(...t))]});var wS=I((Krt,bY)=>{"use strict";var kwe=require("stream"),vY=kwe.PassThrough,Pwe=Array.prototype.slice;bY.exports=Dwe;function Dwe(){let t=[],e=!1,r=Pwe.call(arguments),i=r[r.length-1];i&&!Array.isArray(i)&&i.pipe==null?r.pop():i={};let n=i.end!==!1;i.objectMode==null&&(i.objectMode=!0),i.highWaterMark==null&&(i.highWaterMark=64*1024);let s=vY(i);function o(){for(let c=0,u=arguments.length;c0||(e=!1,a())}function f(h){function p(){h.removeListener("merge2UnpipeEnd",p),h.removeListener("end",p),g()}if(h._readableState.endEmitted)return g();h.on("merge2UnpipeEnd",p),h.on("end",p),h.pipe(s,{end:!1}),h.resume()}for(let h=0;h{"use strict";Object.defineProperty(WE,"__esModule",{value:!0});function Rwe(t){return t.reduce((e,r)=>[].concat(e,r),[])}WE.flatten=Rwe;function Fwe(t,e){let r=[[]],i=0;for(let n of t)e(n)?(i++,r[i]=[]):r[i].push(n);return r}WE.splitWhen=Fwe});var kY=I(BS=>{"use strict";Object.defineProperty(BS,"__esModule",{value:!0});function Nwe(t){return t.code==="ENOENT"}BS.isEnoentCodeError=Nwe});var DY=I(QS=>{"use strict";Object.defineProperty(QS,"__esModule",{value:!0});var PY=class{constructor(e,r){this.name=e,this.isBlockDevice=r.isBlockDevice.bind(r),this.isCharacterDevice=r.isCharacterDevice.bind(r),this.isDirectory=r.isDirectory.bind(r),this.isFIFO=r.isFIFO.bind(r),this.isFile=r.isFile.bind(r),this.isSocket=r.isSocket.bind(r),this.isSymbolicLink=r.isSymbolicLink.bind(r)}};function Lwe(t,e){return new PY(t,e)}QS.createDirentFromStats=Lwe});var RY=I(Pu=>{"use strict";Object.defineProperty(Pu,"__esModule",{value:!0});var Twe=require("path"),Mwe=2,Owe=/(\\?)([()*?[\]{|}]|^!|[!+@](?=\())/g;function Kwe(t){return t.replace(/\\/g,"/")}Pu.unixify=Kwe;function Uwe(t,e){return Twe.resolve(t,e)}Pu.makeAbsolute=Uwe;function Hwe(t){return t.replace(Owe,"\\$2")}Pu.escape=Hwe;function Gwe(t){if(t.charAt(0)==="."){let e=t.charAt(1);if(e==="/"||e==="\\")return t.slice(Mwe)}return t}Pu.removeLeadingDotSegment=Gwe});var NY=I((Yrt,FY)=>{FY.exports=function(e){if(typeof e!="string"||e==="")return!1;for(var r;r=/(\\).|([@?!+*]\(.*\))/g.exec(e);){if(r[2])return!0;e=e.slice(r.index+r[0].length)}return!1}});var TY=I((qrt,LY)=>{var jwe=NY(),Ywe={"{":"}","(":")","[":"]"},qwe=/\\(.)|(^!|\*|[\].+)]\?|\[[^\\\]]+\]|\{[^\\}]+\}|\(\?[:!=][^\\)]+\)|\([^|]+\|[^\\)]+\))/,Jwe=/\\(.)|(^!|[*?{}()[\]]|\(\?)/;LY.exports=function(e,r){if(typeof e!="string"||e==="")return!1;if(jwe(e))return!0;var i=qwe,n;for(r&&r.strict===!1&&(i=Jwe);n=i.exec(e);){if(n[2])return!0;var s=n.index+n[0].length,o=n[1],a=o?Ywe[o]:null;if(o&&a){var l=e.indexOf(a,s);l!==-1&&(s=l+1)}e=e.slice(s)}return!1}});var OY=I((Jrt,MY)=>{"use strict";var Wwe=TY(),zwe=require("path").posix.dirname,Vwe=require("os").platform()==="win32",bS="/",_we=/\\/g,Xwe=/[\{\[].*[\}\]]$/,Zwe=/(^|[^\\])([\{\[]|\([^\)]+$)/,$we=/\\([\!\*\?\|\[\]\(\)\{\}])/g;MY.exports=function(e,r){var i=Object.assign({flipBackslashes:!0},r);i.flipBackslashes&&Vwe&&e.indexOf(bS)<0&&(e=e.replace(_we,bS)),Xwe.test(e)&&(e+=bS),e+="a";do e=zwe(e);while(Wwe(e)||Zwe.test(e));return e.replace($we,"$1")}});var WY=I(Hr=>{"use strict";Object.defineProperty(Hr,"__esModule",{value:!0});var eBe=require("path"),tBe=OY(),KY=Nn(),rBe=iv(),UY="**",iBe="\\",nBe=/[*?]|^!/,sBe=/\[.*]/,oBe=/(?:^|[^!*+?@])\(.*\|.*\)/,aBe=/[!*+?@]\(.*\)/,ABe=/{.*(?:,|\.\.).*}/;function GY(t,e={}){return!HY(t,e)}Hr.isStaticPattern=GY;function HY(t,e={}){return!!(e.caseSensitiveMatch===!1||t.includes(iBe)||nBe.test(t)||sBe.test(t)||oBe.test(t)||e.extglob!==!1&&aBe.test(t)||e.braceExpansion!==!1&&ABe.test(t))}Hr.isDynamicPattern=HY;function lBe(t){return zE(t)?t.slice(1):t}Hr.convertToPositivePattern=lBe;function cBe(t){return"!"+t}Hr.convertToNegativePattern=cBe;function zE(t){return t.startsWith("!")&&t[1]!=="("}Hr.isNegativePattern=zE;function jY(t){return!zE(t)}Hr.isPositivePattern=jY;function uBe(t){return t.filter(zE)}Hr.getNegativePatterns=uBe;function gBe(t){return t.filter(jY)}Hr.getPositivePatterns=gBe;function fBe(t){return tBe(t,{flipBackslashes:!1})}Hr.getBaseDirectory=fBe;function hBe(t){return t.includes(UY)}Hr.hasGlobStar=hBe;function YY(t){return t.endsWith("/"+UY)}Hr.endsWithSlashGlobStar=YY;function pBe(t){let e=eBe.basename(t);return YY(t)||GY(e)}Hr.isAffectDepthOfReadingPattern=pBe;function dBe(t){return t.reduce((e,r)=>e.concat(qY(r)),[])}Hr.expandPatternsWithBraceExpansion=dBe;function qY(t){return KY.braces(t,{expand:!0,nodupes:!0})}Hr.expandBraceExpansion=qY;function CBe(t,e){let r=rBe.scan(t,Object.assign(Object.assign({},e),{parts:!0}));return r.parts.length===0?[t]:r.parts}Hr.getPatternParts=CBe;function JY(t,e){return KY.makeRe(t,e)}Hr.makeRe=JY;function mBe(t,e){return t.map(r=>JY(r,e))}Hr.convertPatternsToRe=mBe;function IBe(t,e){return e.some(r=>r.test(t))}Hr.matchAny=IBe});var VY=I(vS=>{"use strict";Object.defineProperty(vS,"__esModule",{value:!0});var EBe=wS();function yBe(t){let e=EBe(t);return t.forEach(r=>{r.once("error",i=>e.emit("error",i))}),e.once("close",()=>zY(t)),e.once("end",()=>zY(t)),e}vS.merge=yBe;function zY(t){t.forEach(e=>e.emit("close"))}});var _Y=I(VE=>{"use strict";Object.defineProperty(VE,"__esModule",{value:!0});function wBe(t){return typeof t=="string"}VE.isString=wBe;function BBe(t){return t===""}VE.isEmpty=BBe});var ga=I(ua=>{"use strict";Object.defineProperty(ua,"__esModule",{value:!0});var QBe=xY();ua.array=QBe;var bBe=kY();ua.errno=bBe;var vBe=DY();ua.fs=vBe;var SBe=RY();ua.path=SBe;var xBe=WY();ua.pattern=xBe;var kBe=VY();ua.stream=kBe;var PBe=_Y();ua.string=PBe});var tq=I(fa=>{"use strict";Object.defineProperty(fa,"__esModule",{value:!0});var Ll=ga();function DBe(t,e){let r=XY(t),i=ZY(t,e.ignore),n=r.filter(l=>Ll.pattern.isStaticPattern(l,e)),s=r.filter(l=>Ll.pattern.isDynamicPattern(l,e)),o=SS(n,i,!1),a=SS(s,i,!0);return o.concat(a)}fa.generate=DBe;function SS(t,e,r){let i=$Y(t);return"."in i?[xS(".",t,e,r)]:eq(i,e,r)}fa.convertPatternsToTasks=SS;function XY(t){return Ll.pattern.getPositivePatterns(t)}fa.getPositivePatterns=XY;function ZY(t,e){return Ll.pattern.getNegativePatterns(t).concat(e).map(Ll.pattern.convertToPositivePattern)}fa.getNegativePatternsAsPositive=ZY;function $Y(t){let e={};return t.reduce((r,i)=>{let n=Ll.pattern.getBaseDirectory(i);return n in r?r[n].push(i):r[n]=[i],r},e)}fa.groupPatternsByBaseDirectory=$Y;function eq(t,e,r){return Object.keys(t).map(i=>xS(i,t[i],e,r))}fa.convertPatternGroupsToTasks=eq;function xS(t,e,r,i){return{dynamic:i,positive:e,negative:r,base:t,patterns:[].concat(e,r.map(Ll.pattern.convertToNegativePattern))}}fa.convertPatternGroupToTask=xS});var iq=I(_E=>{"use strict";Object.defineProperty(_E,"__esModule",{value:!0});_E.read=void 0;function RBe(t,e,r){e.fs.lstat(t,(i,n)=>{if(i!==null){rq(r,i);return}if(!n.isSymbolicLink()||!e.followSymbolicLink){kS(r,n);return}e.fs.stat(t,(s,o)=>{if(s!==null){if(e.throwErrorOnBrokenSymbolicLink){rq(r,s);return}kS(r,n);return}e.markSymbolicLink&&(o.isSymbolicLink=()=>!0),kS(r,o)})})}_E.read=RBe;function rq(t,e){t(e)}function kS(t,e){t(null,e)}});var nq=I(XE=>{"use strict";Object.defineProperty(XE,"__esModule",{value:!0});XE.read=void 0;function FBe(t,e){let r=e.fs.lstatSync(t);if(!r.isSymbolicLink()||!e.followSymbolicLink)return r;try{let i=e.fs.statSync(t);return e.markSymbolicLink&&(i.isSymbolicLink=()=>!0),i}catch(i){if(!e.throwErrorOnBrokenSymbolicLink)return r;throw i}}XE.read=FBe});var sq=I(AA=>{"use strict";Object.defineProperty(AA,"__esModule",{value:!0});AA.createFileSystemAdapter=AA.FILE_SYSTEM_ADAPTER=void 0;var ZE=require("fs");AA.FILE_SYSTEM_ADAPTER={lstat:ZE.lstat,stat:ZE.stat,lstatSync:ZE.lstatSync,statSync:ZE.statSync};function NBe(t){return t===void 0?AA.FILE_SYSTEM_ADAPTER:Object.assign(Object.assign({},AA.FILE_SYSTEM_ADAPTER),t)}AA.createFileSystemAdapter=NBe});var aq=I(PS=>{"use strict";Object.defineProperty(PS,"__esModule",{value:!0});var LBe=sq(),oq=class{constructor(e={}){this._options=e,this.followSymbolicLink=this._getValue(this._options.followSymbolicLink,!0),this.fs=LBe.createFileSystemAdapter(this._options.fs),this.markSymbolicLink=this._getValue(this._options.markSymbolicLink,!1),this.throwErrorOnBrokenSymbolicLink=this._getValue(this._options.throwErrorOnBrokenSymbolicLink,!0)}_getValue(e,r){return e!=null?e:r}};PS.default=oq});var Tl=I(lA=>{"use strict";Object.defineProperty(lA,"__esModule",{value:!0});lA.statSync=lA.stat=lA.Settings=void 0;var Aq=iq(),TBe=nq(),DS=aq();lA.Settings=DS.default;function MBe(t,e,r){if(typeof e=="function"){Aq.read(t,RS(),e);return}Aq.read(t,RS(e),r)}lA.stat=MBe;function OBe(t,e){let r=RS(e);return TBe.read(t,r)}lA.statSync=OBe;function RS(t={}){return t instanceof DS.default?t:new DS.default(t)}});var cq=I((iit,lq)=>{lq.exports=KBe;function KBe(t,e){var r,i,n,s=!0;Array.isArray(t)?(r=[],i=t.length):(n=Object.keys(t),r={},i=n.length);function o(l){function c(){e&&e(l,r),e=null}s?process.nextTick(c):c()}function a(l,c,u){r[l]=u,(--i==0||c)&&o(c)}i?n?n.forEach(function(l){t[l](function(c,u){a(l,c,u)})}):t.forEach(function(l,c){l(function(u,g){a(c,u,g)})}):o(null),s=!1}});var FS=I($E=>{"use strict";Object.defineProperty($E,"__esModule",{value:!0});$E.IS_SUPPORT_READDIR_WITH_FILE_TYPES=void 0;var ey=process.versions.node.split(".");if(ey[0]===void 0||ey[1]===void 0)throw new Error(`Unexpected behavior. The 'process.versions.node' variable has invalid value: ${process.versions.node}`);var uq=Number.parseInt(ey[0],10),UBe=Number.parseInt(ey[1],10),gq=10,HBe=10,GBe=uq>gq,jBe=uq===gq&&UBe>=HBe;$E.IS_SUPPORT_READDIR_WITH_FILE_TYPES=GBe||jBe});var hq=I(ty=>{"use strict";Object.defineProperty(ty,"__esModule",{value:!0});ty.createDirentFromStats=void 0;var fq=class{constructor(e,r){this.name=e,this.isBlockDevice=r.isBlockDevice.bind(r),this.isCharacterDevice=r.isCharacterDevice.bind(r),this.isDirectory=r.isDirectory.bind(r),this.isFIFO=r.isFIFO.bind(r),this.isFile=r.isFile.bind(r),this.isSocket=r.isSocket.bind(r),this.isSymbolicLink=r.isSymbolicLink.bind(r)}};function YBe(t,e){return new fq(t,e)}ty.createDirentFromStats=YBe});var NS=I(ry=>{"use strict";Object.defineProperty(ry,"__esModule",{value:!0});ry.fs=void 0;var qBe=hq();ry.fs=qBe});var LS=I(iy=>{"use strict";Object.defineProperty(iy,"__esModule",{value:!0});iy.joinPathSegments=void 0;function JBe(t,e,r){return t.endsWith(r)?t+e:t+r+e}iy.joinPathSegments=JBe});var Eq=I(cA=>{"use strict";Object.defineProperty(cA,"__esModule",{value:!0});cA.readdir=cA.readdirWithFileTypes=cA.read=void 0;var WBe=Tl(),pq=cq(),zBe=FS(),dq=NS(),Cq=LS();function VBe(t,e,r){if(!e.stats&&zBe.IS_SUPPORT_READDIR_WITH_FILE_TYPES){mq(t,e,r);return}Iq(t,e,r)}cA.read=VBe;function mq(t,e,r){e.fs.readdir(t,{withFileTypes:!0},(i,n)=>{if(i!==null){ny(r,i);return}let s=n.map(a=>({dirent:a,name:a.name,path:Cq.joinPathSegments(t,a.name,e.pathSegmentSeparator)}));if(!e.followSymbolicLinks){TS(r,s);return}let o=s.map(a=>_Be(a,e));pq(o,(a,l)=>{if(a!==null){ny(r,a);return}TS(r,l)})})}cA.readdirWithFileTypes=mq;function _Be(t,e){return r=>{if(!t.dirent.isSymbolicLink()){r(null,t);return}e.fs.stat(t.path,(i,n)=>{if(i!==null){if(e.throwErrorOnBrokenSymbolicLink){r(i);return}r(null,t);return}t.dirent=dq.fs.createDirentFromStats(t.name,n),r(null,t)})}}function Iq(t,e,r){e.fs.readdir(t,(i,n)=>{if(i!==null){ny(r,i);return}let s=n.map(o=>{let a=Cq.joinPathSegments(t,o,e.pathSegmentSeparator);return l=>{WBe.stat(a,e.fsStatSettings,(c,u)=>{if(c!==null){l(c);return}let g={name:o,path:a,dirent:dq.fs.createDirentFromStats(o,u)};e.stats&&(g.stats=u),l(null,g)})}});pq(s,(o,a)=>{if(o!==null){ny(r,o);return}TS(r,a)})})}cA.readdir=Iq;function ny(t,e){t(e)}function TS(t,e){t(null,e)}});var bq=I(uA=>{"use strict";Object.defineProperty(uA,"__esModule",{value:!0});uA.readdir=uA.readdirWithFileTypes=uA.read=void 0;var XBe=Tl(),ZBe=FS(),yq=NS(),wq=LS();function $Be(t,e){return!e.stats&&ZBe.IS_SUPPORT_READDIR_WITH_FILE_TYPES?Bq(t,e):Qq(t,e)}uA.read=$Be;function Bq(t,e){return e.fs.readdirSync(t,{withFileTypes:!0}).map(i=>{let n={dirent:i,name:i.name,path:wq.joinPathSegments(t,i.name,e.pathSegmentSeparator)};if(n.dirent.isSymbolicLink()&&e.followSymbolicLinks)try{let s=e.fs.statSync(n.path);n.dirent=yq.fs.createDirentFromStats(n.name,s)}catch(s){if(e.throwErrorOnBrokenSymbolicLink)throw s}return n})}uA.readdirWithFileTypes=Bq;function Qq(t,e){return e.fs.readdirSync(t).map(i=>{let n=wq.joinPathSegments(t,i,e.pathSegmentSeparator),s=XBe.statSync(n,e.fsStatSettings),o={name:i,path:n,dirent:yq.fs.createDirentFromStats(i,s)};return e.stats&&(o.stats=s),o})}uA.readdir=Qq});var vq=I(gA=>{"use strict";Object.defineProperty(gA,"__esModule",{value:!0});gA.createFileSystemAdapter=gA.FILE_SYSTEM_ADAPTER=void 0;var Du=require("fs");gA.FILE_SYSTEM_ADAPTER={lstat:Du.lstat,stat:Du.stat,lstatSync:Du.lstatSync,statSync:Du.statSync,readdir:Du.readdir,readdirSync:Du.readdirSync};function e0e(t){return t===void 0?gA.FILE_SYSTEM_ADAPTER:Object.assign(Object.assign({},gA.FILE_SYSTEM_ADAPTER),t)}gA.createFileSystemAdapter=e0e});var xq=I(MS=>{"use strict";Object.defineProperty(MS,"__esModule",{value:!0});var t0e=require("path"),r0e=Tl(),i0e=vq(),Sq=class{constructor(e={}){this._options=e,this.followSymbolicLinks=this._getValue(this._options.followSymbolicLinks,!1),this.fs=i0e.createFileSystemAdapter(this._options.fs),this.pathSegmentSeparator=this._getValue(this._options.pathSegmentSeparator,t0e.sep),this.stats=this._getValue(this._options.stats,!1),this.throwErrorOnBrokenSymbolicLink=this._getValue(this._options.throwErrorOnBrokenSymbolicLink,!0),this.fsStatSettings=new r0e.Settings({followSymbolicLink:this.followSymbolicLinks,fs:this.fs,throwErrorOnBrokenSymbolicLink:this.throwErrorOnBrokenSymbolicLink})}_getValue(e,r){return e!=null?e:r}};MS.default=Sq});var sy=I(fA=>{"use strict";Object.defineProperty(fA,"__esModule",{value:!0});fA.Settings=fA.scandirSync=fA.scandir=void 0;var kq=Eq(),n0e=bq(),OS=xq();fA.Settings=OS.default;function s0e(t,e,r){if(typeof e=="function"){kq.read(t,KS(),e);return}kq.read(t,KS(e),r)}fA.scandir=s0e;function o0e(t,e){let r=KS(e);return n0e.read(t,r)}fA.scandirSync=o0e;function KS(t={}){return t instanceof OS.default?t:new OS.default(t)}});var Dq=I((fit,Pq)=>{"use strict";function a0e(t){var e=new t,r=e;function i(){var s=e;return s.next?e=s.next:(e=new t,r=e),s.next=null,s}function n(s){r.next=s,r=s}return{get:i,release:n}}Pq.exports=a0e});var Fq=I((hit,US)=>{"use strict";var A0e=Dq();function Rq(t,e,r){if(typeof t=="function"&&(r=e,e=t,t=null),r<1)throw new Error("fastqueue concurrency must be greater than 1");var i=A0e(l0e),n=null,s=null,o=0,a=null,l={push:d,drain:po,saturated:po,pause:u,paused:!1,concurrency:r,running:c,resume:h,idle:p,length:g,getQueue:f,unshift:m,empty:po,kill:B,killAndDrain:b,error:R};return l;function c(){return o}function u(){l.paused=!0}function g(){for(var H=n,L=0;H;)H=H.next,L++;return L}function f(){for(var H=n,L=[];H;)L.push(H.value),H=H.next;return L}function h(){if(!!l.paused){l.paused=!1;for(var H=0;H{"use strict";Object.defineProperty(Co,"__esModule",{value:!0});Co.joinPathSegments=Co.replacePathSegmentSeparator=Co.isAppliedFilter=Co.isFatalError=void 0;function u0e(t,e){return t.errorFilter===null?!0:!t.errorFilter(e)}Co.isFatalError=u0e;function g0e(t,e){return t===null||t(e)}Co.isAppliedFilter=g0e;function f0e(t,e){return t.split(/[/\\]/).join(e)}Co.replacePathSegmentSeparator=f0e;function h0e(t,e,r){return t===""?e:t.endsWith(r)?t+e:t+r+e}Co.joinPathSegments=h0e});var GS=I(HS=>{"use strict";Object.defineProperty(HS,"__esModule",{value:!0});var p0e=oy(),Nq=class{constructor(e,r){this._root=e,this._settings=r,this._root=p0e.replacePathSegmentSeparator(e,r.pathSegmentSeparator)}};HS.default=Nq});var YS=I(jS=>{"use strict";Object.defineProperty(jS,"__esModule",{value:!0});var d0e=require("events"),C0e=sy(),m0e=Fq(),ay=oy(),I0e=GS(),Lq=class extends I0e.default{constructor(e,r){super(e,r);this._settings=r,this._scandir=C0e.scandir,this._emitter=new d0e.EventEmitter,this._queue=m0e(this._worker.bind(this),this._settings.concurrency),this._isFatalError=!1,this._isDestroyed=!1,this._queue.drain=()=>{this._isFatalError||this._emitter.emit("end")}}read(){return this._isFatalError=!1,this._isDestroyed=!1,setImmediate(()=>{this._pushToQueue(this._root,this._settings.basePath)}),this._emitter}get isDestroyed(){return this._isDestroyed}destroy(){if(this._isDestroyed)throw new Error("The reader is already destroyed");this._isDestroyed=!0,this._queue.killAndDrain()}onEntry(e){this._emitter.on("entry",e)}onError(e){this._emitter.once("error",e)}onEnd(e){this._emitter.once("end",e)}_pushToQueue(e,r){let i={directory:e,base:r};this._queue.push(i,n=>{n!==null&&this._handleError(n)})}_worker(e,r){this._scandir(e.directory,this._settings.fsScandirSettings,(i,n)=>{if(i!==null){r(i,void 0);return}for(let s of n)this._handleEntry(s,e.base);r(null,void 0)})}_handleError(e){this._isDestroyed||!ay.isFatalError(this._settings,e)||(this._isFatalError=!0,this._isDestroyed=!0,this._emitter.emit("error",e))}_handleEntry(e,r){if(this._isDestroyed||this._isFatalError)return;let i=e.path;r!==void 0&&(e.path=ay.joinPathSegments(r,e.name,this._settings.pathSegmentSeparator)),ay.isAppliedFilter(this._settings.entryFilter,e)&&this._emitEntry(e),e.dirent.isDirectory()&&ay.isAppliedFilter(this._settings.deepFilter,e)&&this._pushToQueue(i,e.path)}_emitEntry(e){this._emitter.emit("entry",e)}};jS.default=Lq});var Mq=I(qS=>{"use strict";Object.defineProperty(qS,"__esModule",{value:!0});var E0e=YS(),Tq=class{constructor(e,r){this._root=e,this._settings=r,this._reader=new E0e.default(this._root,this._settings),this._storage=new Set}read(e){this._reader.onError(r=>{y0e(e,r)}),this._reader.onEntry(r=>{this._storage.add(r)}),this._reader.onEnd(()=>{w0e(e,[...this._storage])}),this._reader.read()}};qS.default=Tq;function y0e(t,e){t(e)}function w0e(t,e){t(null,e)}});var Kq=I(JS=>{"use strict";Object.defineProperty(JS,"__esModule",{value:!0});var B0e=require("stream"),Q0e=YS(),Oq=class{constructor(e,r){this._root=e,this._settings=r,this._reader=new Q0e.default(this._root,this._settings),this._stream=new B0e.Readable({objectMode:!0,read:()=>{},destroy:()=>{this._reader.isDestroyed||this._reader.destroy()}})}read(){return this._reader.onError(e=>{this._stream.emit("error",e)}),this._reader.onEntry(e=>{this._stream.push(e)}),this._reader.onEnd(()=>{this._stream.push(null)}),this._reader.read(),this._stream}};JS.default=Oq});var Hq=I(WS=>{"use strict";Object.defineProperty(WS,"__esModule",{value:!0});var b0e=sy(),Ay=oy(),v0e=GS(),Uq=class extends v0e.default{constructor(){super(...arguments);this._scandir=b0e.scandirSync,this._storage=new Set,this._queue=new Set}read(){return this._pushToQueue(this._root,this._settings.basePath),this._handleQueue(),[...this._storage]}_pushToQueue(e,r){this._queue.add({directory:e,base:r})}_handleQueue(){for(let e of this._queue.values())this._handleDirectory(e.directory,e.base)}_handleDirectory(e,r){try{let i=this._scandir(e,this._settings.fsScandirSettings);for(let n of i)this._handleEntry(n,r)}catch(i){this._handleError(i)}}_handleError(e){if(!!Ay.isFatalError(this._settings,e))throw e}_handleEntry(e,r){let i=e.path;r!==void 0&&(e.path=Ay.joinPathSegments(r,e.name,this._settings.pathSegmentSeparator)),Ay.isAppliedFilter(this._settings.entryFilter,e)&&this._pushToStorage(e),e.dirent.isDirectory()&&Ay.isAppliedFilter(this._settings.deepFilter,e)&&this._pushToQueue(i,e.path)}_pushToStorage(e){this._storage.add(e)}};WS.default=Uq});var jq=I(zS=>{"use strict";Object.defineProperty(zS,"__esModule",{value:!0});var S0e=Hq(),Gq=class{constructor(e,r){this._root=e,this._settings=r,this._reader=new S0e.default(this._root,this._settings)}read(){return this._reader.read()}};zS.default=Gq});var qq=I(VS=>{"use strict";Object.defineProperty(VS,"__esModule",{value:!0});var x0e=require("path"),k0e=sy(),Yq=class{constructor(e={}){this._options=e,this.basePath=this._getValue(this._options.basePath,void 0),this.concurrency=this._getValue(this._options.concurrency,Number.POSITIVE_INFINITY),this.deepFilter=this._getValue(this._options.deepFilter,null),this.entryFilter=this._getValue(this._options.entryFilter,null),this.errorFilter=this._getValue(this._options.errorFilter,null),this.pathSegmentSeparator=this._getValue(this._options.pathSegmentSeparator,x0e.sep),this.fsScandirSettings=new k0e.Settings({followSymbolicLinks:this._options.followSymbolicLinks,fs:this._options.fs,pathSegmentSeparator:this._options.pathSegmentSeparator,stats:this._options.stats,throwErrorOnBrokenSymbolicLink:this._options.throwErrorOnBrokenSymbolicLink})}_getValue(e,r){return e!=null?e:r}};VS.default=Yq});var XS=I(mo=>{"use strict";Object.defineProperty(mo,"__esModule",{value:!0});mo.Settings=mo.walkStream=mo.walkSync=mo.walk=void 0;var Jq=Mq(),P0e=Kq(),D0e=jq(),_S=qq();mo.Settings=_S.default;function R0e(t,e,r){if(typeof e=="function"){new Jq.default(t,ly()).read(e);return}new Jq.default(t,ly(e)).read(r)}mo.walk=R0e;function F0e(t,e){let r=ly(e);return new D0e.default(t,r).read()}mo.walkSync=F0e;function N0e(t,e){let r=ly(e);return new P0e.default(t,r).read()}mo.walkStream=N0e;function ly(t={}){return t instanceof _S.default?t:new _S.default(t)}});var $S=I(ZS=>{"use strict";Object.defineProperty(ZS,"__esModule",{value:!0});var L0e=require("path"),T0e=Tl(),Wq=ga(),zq=class{constructor(e){this._settings=e,this._fsStatSettings=new T0e.Settings({followSymbolicLink:this._settings.followSymbolicLinks,fs:this._settings.fs,throwErrorOnBrokenSymbolicLink:this._settings.followSymbolicLinks})}_getFullEntryPath(e){return L0e.resolve(this._settings.cwd,e)}_makeEntry(e,r){let i={name:r,path:r,dirent:Wq.fs.createDirentFromStats(r,e)};return this._settings.stats&&(i.stats=e),i}_isFatalError(e){return!Wq.errno.isEnoentCodeError(e)&&!this._settings.suppressErrors}};ZS.default=zq});var tx=I(ex=>{"use strict";Object.defineProperty(ex,"__esModule",{value:!0});var M0e=require("stream"),O0e=Tl(),K0e=XS(),U0e=$S(),Vq=class extends U0e.default{constructor(){super(...arguments);this._walkStream=K0e.walkStream,this._stat=O0e.stat}dynamic(e,r){return this._walkStream(e,r)}static(e,r){let i=e.map(this._getFullEntryPath,this),n=new M0e.PassThrough({objectMode:!0});n._write=(s,o,a)=>this._getEntry(i[s],e[s],r).then(l=>{l!==null&&r.entryFilter(l)&&n.push(l),s===i.length-1&&n.end(),a()}).catch(a);for(let s=0;sthis._makeEntry(n,r)).catch(n=>{if(i.errorFilter(n))return null;throw n})}_getStat(e){return new Promise((r,i)=>{this._stat(e,this._fsStatSettings,(n,s)=>n===null?r(s):i(n))})}};ex.default=Vq});var Xq=I(rx=>{"use strict";Object.defineProperty(rx,"__esModule",{value:!0});var Ru=ga(),_q=class{constructor(e,r,i){this._patterns=e,this._settings=r,this._micromatchOptions=i,this._storage=[],this._fillStorage()}_fillStorage(){let e=Ru.pattern.expandPatternsWithBraceExpansion(this._patterns);for(let r of e){let i=this._getPatternSegments(r),n=this._splitSegmentsIntoSections(i);this._storage.push({complete:n.length<=1,pattern:r,segments:i,sections:n})}}_getPatternSegments(e){return Ru.pattern.getPatternParts(e,this._micromatchOptions).map(i=>Ru.pattern.isDynamicPattern(i,this._settings)?{dynamic:!0,pattern:i,patternRe:Ru.pattern.makeRe(i,this._micromatchOptions)}:{dynamic:!1,pattern:i})}_splitSegmentsIntoSections(e){return Ru.array.splitWhen(e,r=>r.dynamic&&Ru.pattern.hasGlobStar(r.pattern))}};rx.default=_q});var $q=I(ix=>{"use strict";Object.defineProperty(ix,"__esModule",{value:!0});var H0e=Xq(),Zq=class extends H0e.default{match(e){let r=e.split("/"),i=r.length,n=this._storage.filter(s=>!s.complete||s.segments.length>i);for(let s of n){let o=s.sections[0];if(!s.complete&&i>o.length||r.every((l,c)=>{let u=s.segments[c];return!!(u.dynamic&&u.patternRe.test(l)||!u.dynamic&&u.pattern===l)}))return!0}return!1}};ix.default=Zq});var tJ=I(nx=>{"use strict";Object.defineProperty(nx,"__esModule",{value:!0});var cy=ga(),G0e=$q(),eJ=class{constructor(e,r){this._settings=e,this._micromatchOptions=r}getFilter(e,r,i){let n=this._getMatcher(r),s=this._getNegativePatternsRe(i);return o=>this._filter(e,o,n,s)}_getMatcher(e){return new G0e.default(e,this._settings,this._micromatchOptions)}_getNegativePatternsRe(e){let r=e.filter(cy.pattern.isAffectDepthOfReadingPattern);return cy.pattern.convertPatternsToRe(r,this._micromatchOptions)}_filter(e,r,i,n){let s=this._getEntryLevel(e,r.path);if(this._isSkippedByDeep(s)||this._isSkippedSymbolicLink(r))return!1;let o=cy.path.removeLeadingDotSegment(r.path);return this._isSkippedByPositivePatterns(o,i)?!1:this._isSkippedByNegativePatterns(o,n)}_isSkippedByDeep(e){return e>=this._settings.deep}_isSkippedSymbolicLink(e){return!this._settings.followSymbolicLinks&&e.dirent.isSymbolicLink()}_getEntryLevel(e,r){let i=e.split("/").length;return r.split("/").length-(e===""?0:i)}_isSkippedByPositivePatterns(e,r){return!this._settings.baseNameMatch&&!r.match(e)}_isSkippedByNegativePatterns(e,r){return!cy.pattern.matchAny(e,r)}};nx.default=eJ});var iJ=I(sx=>{"use strict";Object.defineProperty(sx,"__esModule",{value:!0});var ip=ga(),rJ=class{constructor(e,r){this._settings=e,this._micromatchOptions=r,this.index=new Map}getFilter(e,r){let i=ip.pattern.convertPatternsToRe(e,this._micromatchOptions),n=ip.pattern.convertPatternsToRe(r,this._micromatchOptions);return s=>this._filter(s,i,n)}_filter(e,r,i){if(this._settings.unique){if(this._isDuplicateEntry(e))return!1;this._createIndexRecord(e)}if(this._onlyFileFilter(e)||this._onlyDirectoryFilter(e)||this._isSkippedByAbsoluteNegativePatterns(e,i))return!1;let n=this._settings.baseNameMatch?e.name:e.path;return this._isMatchToPatterns(n,r)&&!this._isMatchToPatterns(e.path,i)}_isDuplicateEntry(e){return this.index.has(e.path)}_createIndexRecord(e){this.index.set(e.path,void 0)}_onlyFileFilter(e){return this._settings.onlyFiles&&!e.dirent.isFile()}_onlyDirectoryFilter(e){return this._settings.onlyDirectories&&!e.dirent.isDirectory()}_isSkippedByAbsoluteNegativePatterns(e,r){if(!this._settings.absolute)return!1;let i=ip.path.makeAbsolute(this._settings.cwd,e.path);return this._isMatchToPatterns(i,r)}_isMatchToPatterns(e,r){let i=ip.path.removeLeadingDotSegment(e);return ip.pattern.matchAny(i,r)}};sx.default=rJ});var sJ=I(ox=>{"use strict";Object.defineProperty(ox,"__esModule",{value:!0});var j0e=ga(),nJ=class{constructor(e){this._settings=e}getFilter(){return e=>this._isNonFatalError(e)}_isNonFatalError(e){return j0e.errno.isEnoentCodeError(e)||this._settings.suppressErrors}};ox.default=nJ});var AJ=I(ax=>{"use strict";Object.defineProperty(ax,"__esModule",{value:!0});var oJ=ga(),aJ=class{constructor(e){this._settings=e}getTransformer(){return e=>this._transform(e)}_transform(e){let r=e.path;return this._settings.absolute&&(r=oJ.path.makeAbsolute(this._settings.cwd,r),r=oJ.path.unixify(r)),this._settings.markDirectories&&e.dirent.isDirectory()&&(r+="/"),this._settings.objectMode?Object.assign(Object.assign({},e),{path:r}):r}};ax.default=aJ});var uy=I(Ax=>{"use strict";Object.defineProperty(Ax,"__esModule",{value:!0});var Y0e=require("path"),q0e=tJ(),J0e=iJ(),W0e=sJ(),z0e=AJ(),lJ=class{constructor(e){this._settings=e,this.errorFilter=new W0e.default(this._settings),this.entryFilter=new J0e.default(this._settings,this._getMicromatchOptions()),this.deepFilter=new q0e.default(this._settings,this._getMicromatchOptions()),this.entryTransformer=new z0e.default(this._settings)}_getRootDirectory(e){return Y0e.resolve(this._settings.cwd,e.base)}_getReaderOptions(e){let r=e.base==="."?"":e.base;return{basePath:r,pathSegmentSeparator:"/",concurrency:this._settings.concurrency,deepFilter:this.deepFilter.getFilter(r,e.positive,e.negative),entryFilter:this.entryFilter.getFilter(e.positive,e.negative),errorFilter:this.errorFilter.getFilter(),followSymbolicLinks:this._settings.followSymbolicLinks,fs:this._settings.fs,stats:this._settings.stats,throwErrorOnBrokenSymbolicLink:this._settings.throwErrorOnBrokenSymbolicLink,transform:this.entryTransformer.getTransformer()}}_getMicromatchOptions(){return{dot:this._settings.dot,matchBase:this._settings.baseNameMatch,nobrace:!this._settings.braceExpansion,nocase:!this._settings.caseSensitiveMatch,noext:!this._settings.extglob,noglobstar:!this._settings.globstar,posix:!0,strictSlashes:!1}}};Ax.default=lJ});var uJ=I(lx=>{"use strict";Object.defineProperty(lx,"__esModule",{value:!0});var V0e=tx(),_0e=uy(),cJ=class extends _0e.default{constructor(){super(...arguments);this._reader=new V0e.default(this._settings)}read(e){let r=this._getRootDirectory(e),i=this._getReaderOptions(e),n=[];return new Promise((s,o)=>{let a=this.api(r,e,i);a.once("error",o),a.on("data",l=>n.push(i.transform(l))),a.once("end",()=>s(n))})}api(e,r,i){return r.dynamic?this._reader.dynamic(e,i):this._reader.static(r.patterns,i)}};lx.default=cJ});var fJ=I(cx=>{"use strict";Object.defineProperty(cx,"__esModule",{value:!0});var X0e=require("stream"),Z0e=tx(),$0e=uy(),gJ=class extends $0e.default{constructor(){super(...arguments);this._reader=new Z0e.default(this._settings)}read(e){let r=this._getRootDirectory(e),i=this._getReaderOptions(e),n=this.api(r,e,i),s=new X0e.Readable({objectMode:!0,read:()=>{}});return n.once("error",o=>s.emit("error",o)).on("data",o=>s.emit("data",i.transform(o))).once("end",()=>s.emit("end")),s.once("close",()=>n.destroy()),s}api(e,r,i){return r.dynamic?this._reader.dynamic(e,i):this._reader.static(r.patterns,i)}};cx.default=gJ});var pJ=I(ux=>{"use strict";Object.defineProperty(ux,"__esModule",{value:!0});var eQe=Tl(),tQe=XS(),rQe=$S(),hJ=class extends rQe.default{constructor(){super(...arguments);this._walkSync=tQe.walkSync,this._statSync=eQe.statSync}dynamic(e,r){return this._walkSync(e,r)}static(e,r){let i=[];for(let n of e){let s=this._getFullEntryPath(n),o=this._getEntry(s,n,r);o===null||!r.entryFilter(o)||i.push(o)}return i}_getEntry(e,r,i){try{let n=this._getStat(e);return this._makeEntry(n,r)}catch(n){if(i.errorFilter(n))return null;throw n}}_getStat(e){return this._statSync(e,this._fsStatSettings)}};ux.default=hJ});var CJ=I(gx=>{"use strict";Object.defineProperty(gx,"__esModule",{value:!0});var iQe=pJ(),nQe=uy(),dJ=class extends nQe.default{constructor(){super(...arguments);this._reader=new iQe.default(this._settings)}read(e){let r=this._getRootDirectory(e),i=this._getReaderOptions(e);return this.api(r,e,i).map(i.transform)}api(e,r,i){return r.dynamic?this._reader.dynamic(e,i):this._reader.static(r.patterns,i)}};gx.default=dJ});var IJ=I(np=>{"use strict";Object.defineProperty(np,"__esModule",{value:!0});var Fu=require("fs"),sQe=require("os"),oQe=sQe.cpus().length;np.DEFAULT_FILE_SYSTEM_ADAPTER={lstat:Fu.lstat,lstatSync:Fu.lstatSync,stat:Fu.stat,statSync:Fu.statSync,readdir:Fu.readdir,readdirSync:Fu.readdirSync};var mJ=class{constructor(e={}){this._options=e,this.absolute=this._getValue(this._options.absolute,!1),this.baseNameMatch=this._getValue(this._options.baseNameMatch,!1),this.braceExpansion=this._getValue(this._options.braceExpansion,!0),this.caseSensitiveMatch=this._getValue(this._options.caseSensitiveMatch,!0),this.concurrency=this._getValue(this._options.concurrency,oQe),this.cwd=this._getValue(this._options.cwd,process.cwd()),this.deep=this._getValue(this._options.deep,Infinity),this.dot=this._getValue(this._options.dot,!1),this.extglob=this._getValue(this._options.extglob,!0),this.followSymbolicLinks=this._getValue(this._options.followSymbolicLinks,!0),this.fs=this._getFileSystemMethods(this._options.fs),this.globstar=this._getValue(this._options.globstar,!0),this.ignore=this._getValue(this._options.ignore,[]),this.markDirectories=this._getValue(this._options.markDirectories,!1),this.objectMode=this._getValue(this._options.objectMode,!1),this.onlyDirectories=this._getValue(this._options.onlyDirectories,!1),this.onlyFiles=this._getValue(this._options.onlyFiles,!0),this.stats=this._getValue(this._options.stats,!1),this.suppressErrors=this._getValue(this._options.suppressErrors,!1),this.throwErrorOnBrokenSymbolicLink=this._getValue(this._options.throwErrorOnBrokenSymbolicLink,!1),this.unique=this._getValue(this._options.unique,!0),this.onlyDirectories&&(this.onlyFiles=!1),this.stats&&(this.objectMode=!0)}_getValue(e,r){return e===void 0?r:e}_getFileSystemMethods(e={}){return Object.assign(Object.assign({},np.DEFAULT_FILE_SYSTEM_ADAPTER),e)}};np.default=mJ});var gy=I((Oit,EJ)=>{"use strict";var yJ=tq(),aQe=uJ(),AQe=fJ(),lQe=CJ(),fx=IJ(),Ml=ga();async function px(t,e){Nu(t);let r=hx(t,aQe.default,e),i=await Promise.all(r);return Ml.array.flatten(i)}(function(t){function e(o,a){Nu(o);let l=hx(o,lQe.default,a);return Ml.array.flatten(l)}t.sync=e;function r(o,a){Nu(o);let l=hx(o,AQe.default,a);return Ml.stream.merge(l)}t.stream=r;function i(o,a){Nu(o);let l=[].concat(o),c=new fx.default(a);return yJ.generate(l,c)}t.generateTasks=i;function n(o,a){Nu(o);let l=new fx.default(a);return Ml.pattern.isDynamicPattern(o,l)}t.isDynamicPattern=n;function s(o){return Nu(o),Ml.path.escape(o)}t.escapePath=s})(px||(px={}));function hx(t,e,r){let i=[].concat(t),n=new fx.default(r),s=yJ.generate(i,n),o=new e(n);return s.map(o.read,o)}function Nu(t){if(![].concat(t).every(i=>Ml.string.isString(i)&&!Ml.string.isEmpty(i)))throw new TypeError("Patterns must be a string (non empty) or an array of strings")}EJ.exports=px});var BJ=I(Ol=>{"use strict";var{promisify:cQe}=require("util"),wJ=require("fs");async function dx(t,e,r){if(typeof r!="string")throw new TypeError(`Expected a string, got ${typeof r}`);try{return(await cQe(wJ[t])(r))[e]()}catch(i){if(i.code==="ENOENT")return!1;throw i}}function Cx(t,e,r){if(typeof r!="string")throw new TypeError(`Expected a string, got ${typeof r}`);try{return wJ[t](r)[e]()}catch(i){if(i.code==="ENOENT")return!1;throw i}}Ol.isFile=dx.bind(null,"stat","isFile");Ol.isDirectory=dx.bind(null,"stat","isDirectory");Ol.isSymlink=dx.bind(null,"lstat","isSymbolicLink");Ol.isFileSync=Cx.bind(null,"statSync","isFile");Ol.isDirectorySync=Cx.bind(null,"statSync","isDirectory");Ol.isSymlinkSync=Cx.bind(null,"lstatSync","isSymbolicLink")});var xJ=I((Uit,mx)=>{"use strict";var Kl=require("path"),QJ=BJ(),bJ=t=>t.length>1?`{${t.join(",")}}`:t[0],vJ=(t,e)=>{let r=t[0]==="!"?t.slice(1):t;return Kl.isAbsolute(r)?r:Kl.join(e,r)},uQe=(t,e)=>Kl.extname(t)?`**/${t}`:`**/${t}.${bJ(e)}`,SJ=(t,e)=>{if(e.files&&!Array.isArray(e.files))throw new TypeError(`Expected \`files\` to be of type \`Array\` but received type \`${typeof e.files}\``);if(e.extensions&&!Array.isArray(e.extensions))throw new TypeError(`Expected \`extensions\` to be of type \`Array\` but received type \`${typeof e.extensions}\``);return e.files&&e.extensions?e.files.map(r=>Kl.posix.join(t,uQe(r,e.extensions))):e.files?e.files.map(r=>Kl.posix.join(t,`**/${r}`)):e.extensions?[Kl.posix.join(t,`**/*.${bJ(e.extensions)}`)]:[Kl.posix.join(t,"**")]};mx.exports=async(t,e)=>{if(e=P({cwd:process.cwd()},e),typeof e.cwd!="string")throw new TypeError(`Expected \`cwd\` to be of type \`string\` but received type \`${typeof e.cwd}\``);let r=await Promise.all([].concat(t).map(async i=>await QJ.isDirectory(vJ(i,e.cwd))?SJ(i,e):i));return[].concat.apply([],r)};mx.exports.sync=(t,e)=>{if(e=P({cwd:process.cwd()},e),typeof e.cwd!="string")throw new TypeError(`Expected \`cwd\` to be of type \`string\` but received type \`${typeof e.cwd}\``);let r=[].concat(t).map(i=>QJ.isDirectorySync(vJ(i,e.cwd))?SJ(i,e):i);return[].concat.apply([],r)}});var TJ=I((Hit,kJ)=>{function PJ(t){return Array.isArray(t)?t:[t]}var gQe=/^\s+$/,fQe=/^\\!/,hQe=/^\\#/,pQe=/\r?\n/g,dQe=/^\.*\/|^\.+$/,Ix="/",DJ=typeof Symbol!="undefined"?Symbol.for("node-ignore"):"node-ignore",CQe=(t,e,r)=>Object.defineProperty(t,e,{value:r}),mQe=/([0-z])-([0-z])/g,IQe=t=>t.replace(mQe,(e,r,i)=>r.charCodeAt(0)<=i.charCodeAt(0)?e:""),EQe=[[/\\?\s+$/,t=>t.indexOf("\\")===0?" ":""],[/\\\s/g,()=>" "],[/[\\^$.|*+(){]/g,t=>`\\${t}`],[/\[([^\]/]*)($|\])/g,(t,e,r)=>r==="]"?`[${IQe(e)}]`:`\\${t}`],[/(?!\\)\?/g,()=>"[^/]"],[/^\//,()=>"^"],[/\//g,()=>"\\/"],[/^\^*\\\*\\\*\\\//,()=>"^(?:.*\\/)?"],[/(?:[^*])$/,t=>/\/$/.test(t)?`${t}$`:`${t}(?=$|\\/$)`],[/^(?=[^^])/,function(){return/\/(?!$)/.test(this)?"^":"(?:^|\\/)"}],[/\\\/\\\*\\\*(?=\\\/|$)/g,(t,e,r)=>e+6`${e}[^\\/]*`],[/(\^|\\\/)?\\\*$/,(t,e)=>`${e?`${e}[^/]+`:"[^/]*"}(?=$|\\/$)`],[/\\\\\\/g,()=>"\\"]],RJ=Object.create(null),yQe=(t,e,r)=>{let i=RJ[t];if(i)return i;let n=EQe.reduce((s,o)=>s.replace(o[0],o[1].bind(t)),t);return RJ[t]=r?new RegExp(n,"i"):new RegExp(n)},Ex=t=>typeof t=="string",wQe=t=>t&&Ex(t)&&!gQe.test(t)&&t.indexOf("#")!==0,BQe=t=>t.split(pQe),FJ=class{constructor(e,r,i,n){this.origin=e,this.pattern=r,this.negative=i,this.regex=n}},QQe=(t,e)=>{let r=t,i=!1;t.indexOf("!")===0&&(i=!0,t=t.substr(1)),t=t.replace(fQe,"!").replace(hQe,"#");let n=yQe(t,i,e);return new FJ(r,t,i,n)},bQe=(t,e)=>{throw new e(t)},ha=(t,e,r)=>Ex(t)?t?ha.isNotRelative(t)?r(`path should be a \`path.relative()\`d string, but got "${e}"`,RangeError):!0:r("path must not be empty",TypeError):r(`path must be a string, but got \`${e}\``,TypeError),NJ=t=>dQe.test(t);ha.isNotRelative=NJ;ha.convert=t=>t;var LJ=class{constructor({ignorecase:e=!0}={}){this._rules=[],this._ignorecase=e,CQe(this,DJ,!0),this._initCache()}_initCache(){this._ignoreCache=Object.create(null),this._testCache=Object.create(null)}_addPattern(e){if(e&&e[DJ]){this._rules=this._rules.concat(e._rules),this._added=!0;return}if(wQe(e)){let r=QQe(e,this._ignorecase);this._added=!0,this._rules.push(r)}}add(e){return this._added=!1,PJ(Ex(e)?BQe(e):e).forEach(this._addPattern,this),this._added&&this._initCache(),this}addPattern(e){return this.add(e)}_testOne(e,r){let i=!1,n=!1;return this._rules.forEach(s=>{let{negative:o}=s;if(n===o&&i!==n||o&&!i&&!n&&!r)return;s.regex.test(e)&&(i=!o,n=o)}),{ignored:i,unignored:n}}_test(e,r,i,n){let s=e&&ha.convert(e);return ha(s,e,bQe),this._t(s,r,i,n)}_t(e,r,i,n){if(e in r)return r[e];if(n||(n=e.split(Ix)),n.pop(),!n.length)return r[e]=this._testOne(e,i);let s=this._t(n.join(Ix)+Ix,r,i,n);return r[e]=s.ignored?s:this._testOne(e,i)}ignores(e){return this._test(e,this._ignoreCache,!1).ignored}createFilter(){return e=>!this.ignores(e)}filter(e){return PJ(e).filter(this.createFilter())}test(e){return this._test(e,this._testCache,!0)}},fy=t=>new LJ(t),vQe=()=>!1,SQe=t=>ha(t&&ha.convert(t),t,vQe);fy.isPathValid=SQe;fy.default=fy;kJ.exports=fy;if(typeof process!="undefined"&&(process.env&&process.env.IGNORE_TEST_WIN32||process.platform==="win32")){let t=r=>/^\\\\\?\\/.test(r)||/["<>|\u0000-\u001F]+/u.test(r)?r:r.replace(/\\/g,"/");ha.convert=t;let e=/^[a-z]:\//i;ha.isNotRelative=r=>e.test(r)||NJ(r)}});var OJ=I((Git,MJ)=>{"use strict";MJ.exports=t=>{let e=/^\\\\\?\\/.test(t),r=/[^\u0000-\u0080]+/.test(t);return e||r?t:t.replace(/\\/g,"/")}});var qJ=I((jit,yx)=>{"use strict";var{promisify:xQe}=require("util"),KJ=require("fs"),pa=require("path"),UJ=gy(),kQe=TJ(),sp=OJ(),HJ=["**/node_modules/**","**/flow-typed/**","**/coverage/**","**/.git"],PQe=xQe(KJ.readFile),DQe=t=>e=>e.startsWith("!")?"!"+pa.posix.join(t,e.slice(1)):pa.posix.join(t,e),RQe=(t,e)=>{let r=sp(pa.relative(e.cwd,pa.dirname(e.fileName)));return t.split(/\r?\n/).filter(Boolean).filter(i=>!i.startsWith("#")).map(DQe(r))},GJ=t=>{let e=kQe();for(let r of t)e.add(RQe(r.content,{cwd:r.cwd,fileName:r.filePath}));return e},FQe=(t,e)=>{if(t=sp(t),pa.isAbsolute(e)){if(sp(e).startsWith(t))return e;throw new Error(`Path ${e} is not in cwd ${t}`)}return pa.join(t,e)},jJ=(t,e)=>r=>t.ignores(sp(pa.relative(e,FQe(e,r.path||r)))),NQe=async(t,e)=>{let r=pa.join(e,t),i=await PQe(r,"utf8");return{cwd:e,filePath:r,content:i}},LQe=(t,e)=>{let r=pa.join(e,t),i=KJ.readFileSync(r,"utf8");return{cwd:e,filePath:r,content:i}},YJ=({ignore:t=[],cwd:e=sp(process.cwd())}={})=>({ignore:t,cwd:e});yx.exports=async t=>{t=YJ(t);let e=await UJ("**/.gitignore",{ignore:HJ.concat(t.ignore),cwd:t.cwd}),r=await Promise.all(e.map(n=>NQe(n,t.cwd))),i=GJ(r);return jJ(i,t.cwd)};yx.exports.sync=t=>{t=YJ(t);let r=UJ.sync("**/.gitignore",{ignore:HJ.concat(t.ignore),cwd:t.cwd}).map(n=>LQe(n,t.cwd)),i=GJ(r);return jJ(i,t.cwd)}});var VJ=I((Yit,JJ)=>{"use strict";var{Transform:TQe}=require("stream"),wx=class extends TQe{constructor(){super({objectMode:!0})}},WJ=class extends wx{constructor(e){super();this._filter=e}_transform(e,r,i){this._filter(e)&&this.push(e),i()}},zJ=class extends wx{constructor(){super();this._pushed=new Set}_transform(e,r,i){this._pushed.has(e)||(this.push(e),this._pushed.add(e)),i()}};JJ.exports={FilterStream:WJ,UniqueStream:zJ}});var vx=I((qit,Ul)=>{"use strict";var _J=require("fs"),hy=QY(),MQe=wS(),py=gy(),dy=xJ(),Bx=qJ(),{FilterStream:OQe,UniqueStream:KQe}=VJ(),XJ=()=>!1,ZJ=t=>t[0]==="!",UQe=t=>{if(!t.every(e=>typeof e=="string"))throw new TypeError("Patterns must be a string or an array of strings")},HQe=(t={})=>{if(!t.cwd)return;let e;try{e=_J.statSync(t.cwd)}catch{return}if(!e.isDirectory())throw new Error("The `cwd` option must be a path to a directory")},GQe=t=>t.stats instanceof _J.Stats?t.path:t,Cy=(t,e)=>{t=hy([].concat(t)),UQe(t),HQe(e);let r=[];e=P({ignore:[],expandDirectories:!0},e);for(let[i,n]of t.entries()){if(ZJ(n))continue;let s=t.slice(i).filter(a=>ZJ(a)).map(a=>a.slice(1)),o=_(P({},e),{ignore:e.ignore.concat(s)});r.push({pattern:n,options:o})}return r},jQe=(t,e)=>{let r={};return t.options.cwd&&(r.cwd=t.options.cwd),Array.isArray(t.options.expandDirectories)?r=_(P({},r),{files:t.options.expandDirectories}):typeof t.options.expandDirectories=="object"&&(r=P(P({},r),t.options.expandDirectories)),e(t.pattern,r)},Qx=(t,e)=>t.options.expandDirectories?jQe(t,e):[t.pattern],$J=t=>t&&t.gitignore?Bx.sync({cwd:t.cwd,ignore:t.ignore}):XJ,bx=t=>e=>{let{options:r}=t;return r.ignore&&Array.isArray(r.ignore)&&r.expandDirectories&&(r.ignore=dy.sync(r.ignore)),{pattern:e,options:r}};Ul.exports=async(t,e)=>{let r=Cy(t,e),i=async()=>e&&e.gitignore?Bx({cwd:e.cwd,ignore:e.ignore}):XJ,n=async()=>{let l=await Promise.all(r.map(async c=>{let u=await Qx(c,dy);return Promise.all(u.map(bx(c)))}));return hy(...l)},[s,o]=await Promise.all([i(),n()]),a=await Promise.all(o.map(l=>py(l.pattern,l.options)));return hy(...a).filter(l=>!s(GQe(l)))};Ul.exports.sync=(t,e)=>{let r=Cy(t,e),i=[];for(let o of r){let a=Qx(o,dy.sync).map(bx(o));i.push(...a)}let n=$J(e),s=[];for(let o of i)s=hy(s,py.sync(o.pattern,o.options));return s.filter(o=>!n(o))};Ul.exports.stream=(t,e)=>{let r=Cy(t,e),i=[];for(let a of r){let l=Qx(a,dy.sync).map(bx(a));i.push(...l)}let n=$J(e),s=new OQe(a=>!n(a)),o=new KQe;return MQe(i.map(a=>py.stream(a.pattern,a.options))).pipe(s).pipe(o)};Ul.exports.generateGlobTasks=Cy;Ul.exports.hasMagic=(t,e)=>[].concat(t).some(r=>py.isDynamicPattern(r,e));Ul.exports.gitignore=Bx});var Ca=I((da,Dy)=>{"use strict";Object.defineProperty(da,"__esModule",{value:!0});var A3=["Int8Array","Uint8Array","Uint8ClampedArray","Int16Array","Uint16Array","Int32Array","Uint32Array","Float32Array","Float64Array","BigInt64Array","BigUint64Array"];function ibe(t){return A3.includes(t)}var nbe=["Function","Generator","AsyncGenerator","GeneratorFunction","AsyncGeneratorFunction","AsyncFunction","Observable","Array","Buffer","Object","RegExp","Date","Error","Map","Set","WeakMap","WeakSet","ArrayBuffer","SharedArrayBuffer","DataView","Promise","URL","FormData","URLSearchParams","HTMLElement",...A3];function sbe(t){return nbe.includes(t)}var obe=["null","undefined","string","number","bigint","boolean","symbol"];function abe(t){return obe.includes(t)}function Hu(t){return e=>typeof e===t}var{toString:l3}=Object.prototype,mp=t=>{let e=l3.call(t).slice(8,-1);if(/HTML\w+Element/.test(e)&&j.domElement(t))return"HTMLElement";if(sbe(e))return e},er=t=>e=>mp(e)===t;function j(t){if(t===null)return"null";switch(typeof t){case"undefined":return"undefined";case"string":return"string";case"number":return"number";case"boolean":return"boolean";case"function":return"Function";case"bigint":return"bigint";case"symbol":return"symbol";default:}if(j.observable(t))return"Observable";if(j.array(t))return"Array";if(j.buffer(t))return"Buffer";let e=mp(t);if(e)return e;if(t instanceof String||t instanceof Boolean||t instanceof Number)throw new TypeError("Please don't use object wrappers for primitive types");return"Object"}j.undefined=Hu("undefined");j.string=Hu("string");var Abe=Hu("number");j.number=t=>Abe(t)&&!j.nan(t);j.bigint=Hu("bigint");j.function_=Hu("function");j.null_=t=>t===null;j.class_=t=>j.function_(t)&&t.toString().startsWith("class ");j.boolean=t=>t===!0||t===!1;j.symbol=Hu("symbol");j.numericString=t=>j.string(t)&&!j.emptyStringOrWhitespace(t)&&!Number.isNaN(Number(t));j.array=(t,e)=>Array.isArray(t)?j.function_(e)?t.every(e):!0:!1;j.buffer=t=>{var e,r,i,n;return(n=(i=(r=(e=t)===null||e===void 0?void 0:e.constructor)===null||r===void 0?void 0:r.isBuffer)===null||i===void 0?void 0:i.call(r,t))!==null&&n!==void 0?n:!1};j.nullOrUndefined=t=>j.null_(t)||j.undefined(t);j.object=t=>!j.null_(t)&&(typeof t=="object"||j.function_(t));j.iterable=t=>{var e;return j.function_((e=t)===null||e===void 0?void 0:e[Symbol.iterator])};j.asyncIterable=t=>{var e;return j.function_((e=t)===null||e===void 0?void 0:e[Symbol.asyncIterator])};j.generator=t=>j.iterable(t)&&j.function_(t.next)&&j.function_(t.throw);j.asyncGenerator=t=>j.asyncIterable(t)&&j.function_(t.next)&&j.function_(t.throw);j.nativePromise=t=>er("Promise")(t);var lbe=t=>{var e,r;return j.function_((e=t)===null||e===void 0?void 0:e.then)&&j.function_((r=t)===null||r===void 0?void 0:r.catch)};j.promise=t=>j.nativePromise(t)||lbe(t);j.generatorFunction=er("GeneratorFunction");j.asyncGeneratorFunction=t=>mp(t)==="AsyncGeneratorFunction";j.asyncFunction=t=>mp(t)==="AsyncFunction";j.boundFunction=t=>j.function_(t)&&!t.hasOwnProperty("prototype");j.regExp=er("RegExp");j.date=er("Date");j.error=er("Error");j.map=t=>er("Map")(t);j.set=t=>er("Set")(t);j.weakMap=t=>er("WeakMap")(t);j.weakSet=t=>er("WeakSet")(t);j.int8Array=er("Int8Array");j.uint8Array=er("Uint8Array");j.uint8ClampedArray=er("Uint8ClampedArray");j.int16Array=er("Int16Array");j.uint16Array=er("Uint16Array");j.int32Array=er("Int32Array");j.uint32Array=er("Uint32Array");j.float32Array=er("Float32Array");j.float64Array=er("Float64Array");j.bigInt64Array=er("BigInt64Array");j.bigUint64Array=er("BigUint64Array");j.arrayBuffer=er("ArrayBuffer");j.sharedArrayBuffer=er("SharedArrayBuffer");j.dataView=er("DataView");j.directInstanceOf=(t,e)=>Object.getPrototypeOf(t)===e.prototype;j.urlInstance=t=>er("URL")(t);j.urlString=t=>{if(!j.string(t))return!1;try{return new URL(t),!0}catch(e){return!1}};j.truthy=t=>Boolean(t);j.falsy=t=>!t;j.nan=t=>Number.isNaN(t);j.primitive=t=>j.null_(t)||abe(typeof t);j.integer=t=>Number.isInteger(t);j.safeInteger=t=>Number.isSafeInteger(t);j.plainObject=t=>{if(l3.call(t)!=="[object Object]")return!1;let e=Object.getPrototypeOf(t);return e===null||e===Object.getPrototypeOf({})};j.typedArray=t=>ibe(mp(t));var cbe=t=>j.safeInteger(t)&&t>=0;j.arrayLike=t=>!j.nullOrUndefined(t)&&!j.function_(t)&&cbe(t.length);j.inRange=(t,e)=>{if(j.number(e))return t>=Math.min(0,e)&&t<=Math.max(e,0);if(j.array(e)&&e.length===2)return t>=Math.min(...e)&&t<=Math.max(...e);throw new TypeError(`Invalid range: ${JSON.stringify(e)}`)};var ube=1,gbe=["innerHTML","ownerDocument","style","attributes","nodeValue"];j.domElement=t=>j.object(t)&&t.nodeType===ube&&j.string(t.nodeName)&&!j.plainObject(t)&&gbe.every(e=>e in t);j.observable=t=>{var e,r,i,n;return t?t===((r=(e=t)[Symbol.observable])===null||r===void 0?void 0:r.call(e))||t===((n=(i=t)["@@observable"])===null||n===void 0?void 0:n.call(i)):!1};j.nodeStream=t=>j.object(t)&&j.function_(t.pipe)&&!j.observable(t);j.infinite=t=>t===Infinity||t===-Infinity;var c3=t=>e=>j.integer(e)&&Math.abs(e%2)===t;j.evenInteger=c3(0);j.oddInteger=c3(1);j.emptyArray=t=>j.array(t)&&t.length===0;j.nonEmptyArray=t=>j.array(t)&&t.length>0;j.emptyString=t=>j.string(t)&&t.length===0;j.nonEmptyString=t=>j.string(t)&&t.length>0;var fbe=t=>j.string(t)&&!/\S/.test(t);j.emptyStringOrWhitespace=t=>j.emptyString(t)||fbe(t);j.emptyObject=t=>j.object(t)&&!j.map(t)&&!j.set(t)&&Object.keys(t).length===0;j.nonEmptyObject=t=>j.object(t)&&!j.map(t)&&!j.set(t)&&Object.keys(t).length>0;j.emptySet=t=>j.set(t)&&t.size===0;j.nonEmptySet=t=>j.set(t)&&t.size>0;j.emptyMap=t=>j.map(t)&&t.size===0;j.nonEmptyMap=t=>j.map(t)&&t.size>0;j.propertyKey=t=>j.any([j.string,j.number,j.symbol],t);j.formData=t=>er("FormData")(t);j.urlSearchParams=t=>er("URLSearchParams")(t);var u3=(t,e,r)=>{if(!j.function_(e))throw new TypeError(`Invalid predicate: ${JSON.stringify(e)}`);if(r.length===0)throw new TypeError("Invalid number of values");return t.call(r,e)};j.any=(t,...e)=>(j.array(t)?t:[t]).some(i=>u3(Array.prototype.some,i,e));j.all=(t,...e)=>u3(Array.prototype.every,t,e);var Te=(t,e,r,i={})=>{if(!t){let{multipleValues:n}=i,s=n?`received values of types ${[...new Set(r.map(o=>`\`${j(o)}\``))].join(", ")}`:`received value of type \`${j(r)}\``;throw new TypeError(`Expected value which is \`${e}\`, ${s}.`)}};da.assert={undefined:t=>Te(j.undefined(t),"undefined",t),string:t=>Te(j.string(t),"string",t),number:t=>Te(j.number(t),"number",t),bigint:t=>Te(j.bigint(t),"bigint",t),function_:t=>Te(j.function_(t),"Function",t),null_:t=>Te(j.null_(t),"null",t),class_:t=>Te(j.class_(t),"Class",t),boolean:t=>Te(j.boolean(t),"boolean",t),symbol:t=>Te(j.symbol(t),"symbol",t),numericString:t=>Te(j.numericString(t),"string with a number",t),array:(t,e)=>{Te(j.array(t),"Array",t),e&&t.forEach(e)},buffer:t=>Te(j.buffer(t),"Buffer",t),nullOrUndefined:t=>Te(j.nullOrUndefined(t),"null or undefined",t),object:t=>Te(j.object(t),"Object",t),iterable:t=>Te(j.iterable(t),"Iterable",t),asyncIterable:t=>Te(j.asyncIterable(t),"AsyncIterable",t),generator:t=>Te(j.generator(t),"Generator",t),asyncGenerator:t=>Te(j.asyncGenerator(t),"AsyncGenerator",t),nativePromise:t=>Te(j.nativePromise(t),"native Promise",t),promise:t=>Te(j.promise(t),"Promise",t),generatorFunction:t=>Te(j.generatorFunction(t),"GeneratorFunction",t),asyncGeneratorFunction:t=>Te(j.asyncGeneratorFunction(t),"AsyncGeneratorFunction",t),asyncFunction:t=>Te(j.asyncFunction(t),"AsyncFunction",t),boundFunction:t=>Te(j.boundFunction(t),"Function",t),regExp:t=>Te(j.regExp(t),"RegExp",t),date:t=>Te(j.date(t),"Date",t),error:t=>Te(j.error(t),"Error",t),map:t=>Te(j.map(t),"Map",t),set:t=>Te(j.set(t),"Set",t),weakMap:t=>Te(j.weakMap(t),"WeakMap",t),weakSet:t=>Te(j.weakSet(t),"WeakSet",t),int8Array:t=>Te(j.int8Array(t),"Int8Array",t),uint8Array:t=>Te(j.uint8Array(t),"Uint8Array",t),uint8ClampedArray:t=>Te(j.uint8ClampedArray(t),"Uint8ClampedArray",t),int16Array:t=>Te(j.int16Array(t),"Int16Array",t),uint16Array:t=>Te(j.uint16Array(t),"Uint16Array",t),int32Array:t=>Te(j.int32Array(t),"Int32Array",t),uint32Array:t=>Te(j.uint32Array(t),"Uint32Array",t),float32Array:t=>Te(j.float32Array(t),"Float32Array",t),float64Array:t=>Te(j.float64Array(t),"Float64Array",t),bigInt64Array:t=>Te(j.bigInt64Array(t),"BigInt64Array",t),bigUint64Array:t=>Te(j.bigUint64Array(t),"BigUint64Array",t),arrayBuffer:t=>Te(j.arrayBuffer(t),"ArrayBuffer",t),sharedArrayBuffer:t=>Te(j.sharedArrayBuffer(t),"SharedArrayBuffer",t),dataView:t=>Te(j.dataView(t),"DataView",t),urlInstance:t=>Te(j.urlInstance(t),"URL",t),urlString:t=>Te(j.urlString(t),"string with a URL",t),truthy:t=>Te(j.truthy(t),"truthy",t),falsy:t=>Te(j.falsy(t),"falsy",t),nan:t=>Te(j.nan(t),"NaN",t),primitive:t=>Te(j.primitive(t),"primitive",t),integer:t=>Te(j.integer(t),"integer",t),safeInteger:t=>Te(j.safeInteger(t),"integer",t),plainObject:t=>Te(j.plainObject(t),"plain object",t),typedArray:t=>Te(j.typedArray(t),"TypedArray",t),arrayLike:t=>Te(j.arrayLike(t),"array-like",t),domElement:t=>Te(j.domElement(t),"HTMLElement",t),observable:t=>Te(j.observable(t),"Observable",t),nodeStream:t=>Te(j.nodeStream(t),"Node.js Stream",t),infinite:t=>Te(j.infinite(t),"infinite number",t),emptyArray:t=>Te(j.emptyArray(t),"empty array",t),nonEmptyArray:t=>Te(j.nonEmptyArray(t),"non-empty array",t),emptyString:t=>Te(j.emptyString(t),"empty string",t),nonEmptyString:t=>Te(j.nonEmptyString(t),"non-empty string",t),emptyStringOrWhitespace:t=>Te(j.emptyStringOrWhitespace(t),"empty string or whitespace",t),emptyObject:t=>Te(j.emptyObject(t),"empty object",t),nonEmptyObject:t=>Te(j.nonEmptyObject(t),"non-empty object",t),emptySet:t=>Te(j.emptySet(t),"empty set",t),nonEmptySet:t=>Te(j.nonEmptySet(t),"non-empty set",t),emptyMap:t=>Te(j.emptyMap(t),"empty map",t),nonEmptyMap:t=>Te(j.nonEmptyMap(t),"non-empty map",t),propertyKey:t=>Te(j.propertyKey(t),"PropertyKey",t),formData:t=>Te(j.formData(t),"FormData",t),urlSearchParams:t=>Te(j.urlSearchParams(t),"URLSearchParams",t),evenInteger:t=>Te(j.evenInteger(t),"even integer",t),oddInteger:t=>Te(j.oddInteger(t),"odd integer",t),directInstanceOf:(t,e)=>Te(j.directInstanceOf(t,e),"T",t),inRange:(t,e)=>Te(j.inRange(t,e),"in range",t),any:(t,...e)=>Te(j.any(t,...e),"predicate returns truthy for any value",e,{multipleValues:!0}),all:(t,...e)=>Te(j.all(t,...e),"predicate returns truthy for all values",e,{multipleValues:!0})};Object.defineProperties(j,{class:{value:j.class_},function:{value:j.function_},null:{value:j.null_}});Object.defineProperties(da.assert,{class:{value:da.assert.class_},function:{value:da.assert.function_},null:{value:da.assert.null_}});da.default=j;Dy.exports=j;Dy.exports.default=j;Dy.exports.assert=da.assert});var g3=I((gnt,Ux)=>{"use strict";var Hx=class extends Error{constructor(e){super(e||"Promise was canceled");this.name="CancelError"}get isCanceled(){return!0}},Ip=class{static fn(e){return(...r)=>new Ip((i,n,s)=>{r.push(s),e(...r).then(i,n)})}constructor(e){this._cancelHandlers=[],this._isPending=!0,this._isCanceled=!1,this._rejectOnCancel=!0,this._promise=new Promise((r,i)=>{this._reject=i;let n=a=>{this._isPending=!1,r(a)},s=a=>{this._isPending=!1,i(a)},o=a=>{if(!this._isPending)throw new Error("The `onCancel` handler was attached after the promise settled.");this._cancelHandlers.push(a)};return Object.defineProperties(o,{shouldReject:{get:()=>this._rejectOnCancel,set:a=>{this._rejectOnCancel=a}}}),e(n,s,o)})}then(e,r){return this._promise.then(e,r)}catch(e){return this._promise.catch(e)}finally(e){return this._promise.finally(e)}cancel(e){if(!(!this._isPending||this._isCanceled)){if(this._cancelHandlers.length>0)try{for(let r of this._cancelHandlers)r()}catch(r){this._reject(r)}this._isCanceled=!0,this._rejectOnCancel&&this._reject(new Hx(e))}}get isCanceled(){return this._isCanceled}};Object.setPrototypeOf(Ip.prototype,Promise.prototype);Ux.exports=Ip;Ux.exports.CancelError=Hx});var f3=I((Gx,jx)=>{"use strict";Object.defineProperty(Gx,"__esModule",{value:!0});var hbe=require("tls"),Yx=(t,e)=>{let r;typeof e=="function"?r={connect:e}:r=e;let i=typeof r.connect=="function",n=typeof r.secureConnect=="function",s=typeof r.close=="function",o=()=>{i&&r.connect(),t instanceof hbe.TLSSocket&&n&&(t.authorized?r.secureConnect():t.authorizationError||t.once("secureConnect",r.secureConnect)),s&&t.once("close",r.close)};t.writable&&!t.connecting?o():t.connecting?t.once("connect",o):t.destroyed&&s&&r.close(t._hadError)};Gx.default=Yx;jx.exports=Yx;jx.exports.default=Yx});var h3=I((qx,Jx)=>{"use strict";Object.defineProperty(qx,"__esModule",{value:!0});var pbe=f3(),dbe=Number(process.versions.node.split(".")[0]),Wx=t=>{let e={start:Date.now(),socket:void 0,lookup:void 0,connect:void 0,secureConnect:void 0,upload:void 0,response:void 0,end:void 0,error:void 0,abort:void 0,phases:{wait:void 0,dns:void 0,tcp:void 0,tls:void 0,request:void 0,firstByte:void 0,download:void 0,total:void 0}};t.timings=e;let r=o=>{let a=o.emit.bind(o);o.emit=(l,...c)=>(l==="error"&&(e.error=Date.now(),e.phases.total=e.error-e.start,o.emit=a),a(l,...c))};r(t),t.prependOnceListener("abort",()=>{e.abort=Date.now(),(!e.response||dbe>=13)&&(e.phases.total=Date.now()-e.start)});let i=o=>{e.socket=Date.now(),e.phases.wait=e.socket-e.start;let a=()=>{e.lookup=Date.now(),e.phases.dns=e.lookup-e.socket};o.prependOnceListener("lookup",a),pbe.default(o,{connect:()=>{e.connect=Date.now(),e.lookup===void 0&&(o.removeListener("lookup",a),e.lookup=e.connect,e.phases.dns=e.lookup-e.socket),e.phases.tcp=e.connect-e.lookup},secureConnect:()=>{e.secureConnect=Date.now(),e.phases.tls=e.secureConnect-e.connect}})};t.socket?i(t.socket):t.prependOnceListener("socket",i);let n=()=>{var o;e.upload=Date.now(),e.phases.request=e.upload-(o=e.secureConnect,o!=null?o:e.connect)};return(()=>typeof t.writableFinished=="boolean"?t.writableFinished:t.finished&&t.outputSize===0&&(!t.socket||t.socket.writableLength===0))()?n():t.prependOnceListener("finish",n),t.prependOnceListener("response",o=>{e.response=Date.now(),e.phases.firstByte=e.response-e.upload,o.timings=e,r(o),o.prependOnceListener("end",()=>{e.end=Date.now(),e.phases.download=e.end-e.response,e.phases.total=e.end-e.start})}),e};qx.default=Wx;Jx.exports=Wx;Jx.exports.default=Wx});var y3=I((fnt,zx)=>{"use strict";var{V4MAPPED:Cbe,ADDRCONFIG:mbe,ALL:p3,promises:{Resolver:d3},lookup:Ibe}=require("dns"),{promisify:Vx}=require("util"),Ebe=require("os"),Gu=Symbol("cacheableLookupCreateConnection"),_x=Symbol("cacheableLookupInstance"),C3=Symbol("expires"),ybe=typeof p3=="number",m3=t=>{if(!(t&&typeof t.createConnection=="function"))throw new Error("Expected an Agent instance as the first argument")},wbe=t=>{for(let e of t)e.family!==6&&(e.address=`::ffff:${e.address}`,e.family=6)},I3=()=>{let t=!1,e=!1;for(let r of Object.values(Ebe.networkInterfaces()))for(let i of r)if(!i.internal&&(i.family==="IPv6"?e=!0:t=!0,t&&e))return{has4:t,has6:e};return{has4:t,has6:e}},Bbe=t=>Symbol.iterator in t,E3={ttl:!0},Qbe={all:!0},Xx=class{constructor({cache:e=new Map,maxTtl:r=Infinity,fallbackDuration:i=3600,errorTtl:n=.15,resolver:s=new d3,lookup:o=Ibe}={}){if(this.maxTtl=r,this.errorTtl=n,this._cache=e,this._resolver=s,this._dnsLookup=Vx(o),this._resolver instanceof d3?(this._resolve4=this._resolver.resolve4.bind(this._resolver),this._resolve6=this._resolver.resolve6.bind(this._resolver)):(this._resolve4=Vx(this._resolver.resolve4.bind(this._resolver)),this._resolve6=Vx(this._resolver.resolve6.bind(this._resolver))),this._iface=I3(),this._pending={},this._nextRemovalTime=!1,this._hostnamesToFallback=new Set,i<1)this._fallback=!1;else{this._fallback=!0;let a=setInterval(()=>{this._hostnamesToFallback.clear()},i*1e3);a.unref&&a.unref()}this.lookup=this.lookup.bind(this),this.lookupAsync=this.lookupAsync.bind(this)}set servers(e){this.clear(),this._resolver.setServers(e)}get servers(){return this._resolver.getServers()}lookup(e,r,i){if(typeof r=="function"?(i=r,r={}):typeof r=="number"&&(r={family:r}),!i)throw new Error("Callback must be a function.");this.lookupAsync(e,r).then(n=>{r.all?i(null,n):i(null,n.address,n.family,n.expires,n.ttl)},i)}async lookupAsync(e,r={}){typeof r=="number"&&(r={family:r});let i=await this.query(e);if(r.family===6){let n=i.filter(s=>s.family===6);r.hints&Cbe&&(ybe&&r.hints&p3||n.length===0)?wbe(i):i=n}else r.family===4&&(i=i.filter(n=>n.family===4));if(r.hints&mbe){let{_iface:n}=this;i=i.filter(s=>s.family===6?n.has6:n.has4)}if(i.length===0){let n=new Error(`cacheableLookup ENOTFOUND ${e}`);throw n.code="ENOTFOUND",n.hostname=e,n}return r.all?i:i[0]}async query(e){let r=await this._cache.get(e);if(!r){let i=this._pending[e];if(i)r=await i;else{let n=this.queryAndCache(e);this._pending[e]=n,r=await n}}return r=r.map(i=>P({},i)),r}async _resolve(e){let r=async c=>{try{return await c}catch(u){if(u.code==="ENODATA"||u.code==="ENOTFOUND")return[];throw u}},[i,n]=await Promise.all([this._resolve4(e,E3),this._resolve6(e,E3)].map(c=>r(c))),s=0,o=0,a=0,l=Date.now();for(let c of i)c.family=4,c.expires=l+c.ttl*1e3,s=Math.max(s,c.ttl);for(let c of n)c.family=6,c.expires=l+c.ttl*1e3,o=Math.max(o,c.ttl);return i.length>0?n.length>0?a=Math.min(s,o):a=s:a=o,{entries:[...i,...n],cacheTtl:a}}async _lookup(e){try{return{entries:await this._dnsLookup(e,{all:!0}),cacheTtl:0}}catch(r){return{entries:[],cacheTtl:0}}}async _set(e,r,i){if(this.maxTtl>0&&i>0){i=Math.min(i,this.maxTtl)*1e3,r[C3]=Date.now()+i;try{await this._cache.set(e,r,i)}catch(n){this.lookupAsync=async()=>{let s=new Error("Cache Error. Please recreate the CacheableLookup instance.");throw s.cause=n,s}}Bbe(this._cache)&&this._tick(i)}}async queryAndCache(e){if(this._hostnamesToFallback.has(e))return this._dnsLookup(e,Qbe);try{let r=await this._resolve(e);r.entries.length===0&&this._fallback&&(r=await this._lookup(e),r.entries.length!==0&&this._hostnamesToFallback.add(e));let i=r.entries.length===0?this.errorTtl:r.cacheTtl;return await this._set(e,r.entries,i),delete this._pending[e],r.entries}catch(r){throw delete this._pending[e],r}}_tick(e){let r=this._nextRemovalTime;(!r||e{this._nextRemovalTime=!1;let i=Infinity,n=Date.now();for(let[s,o]of this._cache){let a=o[C3];n>=a?this._cache.delete(s):a("lookup"in r||(r.lookup=this.lookup),e[Gu](r,i))}uninstall(e){if(m3(e),e[Gu]){if(e[_x]!==this)throw new Error("The agent is not owned by this CacheableLookup instance");e.createConnection=e[Gu],delete e[Gu],delete e[_x]}}updateInterfaceInfo(){let{_iface:e}=this;this._iface=I3(),(e.has4&&!this._iface.has4||e.has6&&!this._iface.has6)&&this._cache.clear()}clear(e){if(e){this._cache.delete(e);return}this._cache.clear()}};zx.exports=Xx;zx.exports.default=Xx});var Q3=I((hnt,Zx)=>{"use strict";var bbe=typeof URL=="undefined"?require("url").URL:URL,vbe="text/plain",Sbe="us-ascii",w3=(t,e)=>e.some(r=>r instanceof RegExp?r.test(t):r===t),xbe=(t,{stripHash:e})=>{let r=t.match(/^data:([^,]*?),([^#]*?)(?:#(.*))?$/);if(!r)throw new Error(`Invalid URL: ${t}`);let i=r[1].split(";"),n=r[2],s=e?"":r[3],o=!1;i[i.length-1]==="base64"&&(i.pop(),o=!0);let a=(i.shift()||"").toLowerCase(),c=[...i.map(u=>{let[g,f=""]=u.split("=").map(h=>h.trim());return g==="charset"&&(f=f.toLowerCase(),f===Sbe)?"":`${g}${f?`=${f}`:""}`}).filter(Boolean)];return o&&c.push("base64"),(c.length!==0||a&&a!==vbe)&&c.unshift(a),`data:${c.join(";")},${o?n.trim():n}${s?`#${s}`:""}`},B3=(t,e)=>{if(e=P({defaultProtocol:"http:",normalizeProtocol:!0,forceHttp:!1,forceHttps:!1,stripAuthentication:!0,stripHash:!1,stripWWW:!0,removeQueryParameters:[/^utm_\w+/i],removeTrailingSlash:!0,removeDirectoryIndex:!1,sortQueryParameters:!0},e),Reflect.has(e,"normalizeHttps"))throw new Error("options.normalizeHttps is renamed to options.forceHttp");if(Reflect.has(e,"normalizeHttp"))throw new Error("options.normalizeHttp is renamed to options.forceHttps");if(Reflect.has(e,"stripFragment"))throw new Error("options.stripFragment is renamed to options.stripHash");if(t=t.trim(),/^data:/i.test(t))return xbe(t,e);let r=t.startsWith("//");!r&&/^\.*\//.test(t)||(t=t.replace(/^(?!(?:\w+:)?\/\/)|^\/\//,e.defaultProtocol));let n=new bbe(t);if(e.forceHttp&&e.forceHttps)throw new Error("The `forceHttp` and `forceHttps` options cannot be used together");if(e.forceHttp&&n.protocol==="https:"&&(n.protocol="http:"),e.forceHttps&&n.protocol==="http:"&&(n.protocol="https:"),e.stripAuthentication&&(n.username="",n.password=""),e.stripHash&&(n.hash=""),n.pathname&&(n.pathname=n.pathname.replace(/((?!:).|^)\/{2,}/g,(s,o)=>/^(?!\/)/g.test(o)?`${o}/`:"/")),n.pathname&&(n.pathname=decodeURI(n.pathname)),e.removeDirectoryIndex===!0&&(e.removeDirectoryIndex=[/^index\.[a-z]+$/]),Array.isArray(e.removeDirectoryIndex)&&e.removeDirectoryIndex.length>0){let s=n.pathname.split("/"),o=s[s.length-1];w3(o,e.removeDirectoryIndex)&&(s=s.slice(0,s.length-1),n.pathname=s.slice(1).join("/")+"/")}if(n.hostname&&(n.hostname=n.hostname.replace(/\.$/,""),e.stripWWW&&/^www\.([a-z\-\d]{2,63})\.([a-z.]{2,5})$/.test(n.hostname)&&(n.hostname=n.hostname.replace(/^www\./,""))),Array.isArray(e.removeQueryParameters))for(let s of[...n.searchParams.keys()])w3(s,e.removeQueryParameters)&&n.searchParams.delete(s);return e.sortQueryParameters&&n.searchParams.sort(),e.removeTrailingSlash&&(n.pathname=n.pathname.replace(/\/$/,"")),t=n.toString(),(e.removeTrailingSlash||n.pathname==="/")&&n.hash===""&&(t=t.replace(/\/$/,"")),r&&!e.normalizeProtocol&&(t=t.replace(/^http:\/\//,"//")),e.stripProtocol&&(t=t.replace(/^(?:https?:)?\/\//,"")),t};Zx.exports=B3;Zx.exports.default=B3});var S3=I((pnt,b3)=>{b3.exports=v3;function v3(t,e){if(t&&e)return v3(t)(e);if(typeof t!="function")throw new TypeError("need wrapper function");return Object.keys(t).forEach(function(i){r[i]=t[i]}),r;function r(){for(var i=new Array(arguments.length),n=0;n{var x3=S3();$x.exports=x3(Ry);$x.exports.strict=x3(k3);Ry.proto=Ry(function(){Object.defineProperty(Function.prototype,"once",{value:function(){return Ry(this)},configurable:!0}),Object.defineProperty(Function.prototype,"onceStrict",{value:function(){return k3(this)},configurable:!0})});function Ry(t){var e=function(){return e.called?e.value:(e.called=!0,e.value=t.apply(this,arguments))};return e.called=!1,e}function k3(t){var e=function(){if(e.called)throw new Error(e.onceError);return e.called=!0,e.value=t.apply(this,arguments)},r=t.name||"Function wrapped with `once`";return e.onceError=r+" shouldn't be called more than once",e.called=!1,e}});var tk=I((Cnt,P3)=>{var kbe=ek(),Pbe=function(){},Dbe=function(t){return t.setHeader&&typeof t.abort=="function"},Rbe=function(t){return t.stdio&&Array.isArray(t.stdio)&&t.stdio.length===3},D3=function(t,e,r){if(typeof e=="function")return D3(t,null,e);e||(e={}),r=kbe(r||Pbe);var i=t._writableState,n=t._readableState,s=e.readable||e.readable!==!1&&t.readable,o=e.writable||e.writable!==!1&&t.writable,a=function(){t.writable||l()},l=function(){o=!1,s||r.call(t)},c=function(){s=!1,o||r.call(t)},u=function(p){r.call(t,p?new Error("exited with error code: "+p):null)},g=function(p){r.call(t,p)},f=function(){if(s&&!(n&&n.ended))return r.call(t,new Error("premature close"));if(o&&!(i&&i.ended))return r.call(t,new Error("premature close"))},h=function(){t.req.on("finish",l)};return Dbe(t)?(t.on("complete",l),t.on("abort",f),t.req?h():t.on("request",h)):o&&!i&&(t.on("end",a),t.on("close",a)),Rbe(t)&&t.on("exit",u),t.on("end",c),t.on("finish",l),e.error!==!1&&t.on("error",g),t.on("close",f),function(){t.removeListener("complete",l),t.removeListener("abort",f),t.removeListener("request",h),t.req&&t.req.removeListener("finish",l),t.removeListener("end",a),t.removeListener("close",a),t.removeListener("finish",l),t.removeListener("exit",u),t.removeListener("end",c),t.removeListener("error",g),t.removeListener("close",f)}};P3.exports=D3});var N3=I((mnt,R3)=>{var Fbe=ek(),Nbe=tk(),rk=require("fs"),Ep=function(){},Lbe=/^v?\.0/.test(process.version),Fy=function(t){return typeof t=="function"},Tbe=function(t){return!Lbe||!rk?!1:(t instanceof(rk.ReadStream||Ep)||t instanceof(rk.WriteStream||Ep))&&Fy(t.close)},Mbe=function(t){return t.setHeader&&Fy(t.abort)},Obe=function(t,e,r,i){i=Fbe(i);var n=!1;t.on("close",function(){n=!0}),Nbe(t,{readable:e,writable:r},function(o){if(o)return i(o);n=!0,i()});var s=!1;return function(o){if(!n&&!s){if(s=!0,Tbe(t))return t.close(Ep);if(Mbe(t))return t.abort();if(Fy(t.destroy))return t.destroy();i(o||new Error("stream was destroyed"))}}},F3=function(t){t()},Kbe=function(t,e){return t.pipe(e)},Ube=function(){var t=Array.prototype.slice.call(arguments),e=Fy(t[t.length-1]||Ep)&&t.pop()||Ep;if(Array.isArray(t[0])&&(t=t[0]),t.length<2)throw new Error("pump requires two streams per minimum");var r,i=t.map(function(n,s){var o=s0;return Obe(n,o,a,function(l){r||(r=l),l&&i.forEach(F3),!o&&(i.forEach(F3),e(r))})});return t.reduce(Kbe)};R3.exports=Ube});var T3=I((Int,L3)=>{"use strict";var{PassThrough:Hbe}=require("stream");L3.exports=t=>{t=P({},t);let{array:e}=t,{encoding:r}=t,i=r==="buffer",n=!1;e?n=!(r||i):r=r||"utf8",i&&(r=null);let s=new Hbe({objectMode:n});r&&s.setEncoding(r);let o=0,a=[];return s.on("data",l=>{a.push(l),n?o=a.length:o+=l.length}),s.getBufferedValue=()=>e?a:i?Buffer.concat(a,o):a.join(""),s.getBufferedLength=()=>o,s}});var M3=I((Ent,ju)=>{"use strict";var Gbe=N3(),jbe=T3(),ik=class extends Error{constructor(){super("maxBuffer exceeded");this.name="MaxBufferError"}};async function Ny(t,e){if(!t)return Promise.reject(new Error("Expected a stream"));e=P({maxBuffer:Infinity},e);let{maxBuffer:r}=e,i;return await new Promise((n,s)=>{let o=a=>{a&&(a.bufferedData=i.getBufferedValue()),s(a)};i=Gbe(t,jbe(e),a=>{if(a){o(a);return}n()}),i.on("data",()=>{i.getBufferedLength()>r&&o(new ik)})}),i.getBufferedValue()}ju.exports=Ny;ju.exports.default=Ny;ju.exports.buffer=(t,e)=>Ny(t,_(P({},e),{encoding:"buffer"}));ju.exports.array=(t,e)=>Ny(t,_(P({},e),{array:!0}));ju.exports.MaxBufferError=ik});var K3=I((wnt,O3)=>{"use strict";var Ybe=[200,203,204,206,300,301,404,405,410,414,501],qbe=[200,203,204,300,301,302,303,307,308,404,405,410,414,501],Jbe={date:!0,connection:!0,"keep-alive":!0,"proxy-authenticate":!0,"proxy-authorization":!0,te:!0,trailer:!0,"transfer-encoding":!0,upgrade:!0},Wbe={"content-length":!0,"content-encoding":!0,"transfer-encoding":!0,"content-range":!0};function nk(t){let e={};if(!t)return e;let r=t.trim().split(/\s*,\s*/);for(let i of r){let[n,s]=i.split(/\s*=\s*/,2);e[n]=s===void 0?!0:s.replace(/^"|"$/g,"")}return e}function zbe(t){let e=[];for(let r in t){let i=t[r];e.push(i===!0?r:r+"="+i)}if(!!e.length)return e.join(", ")}O3.exports=class{constructor(e,r,{shared:i,cacheHeuristic:n,immutableMinTimeToLive:s,ignoreCargoCult:o,trustServerDate:a,_fromObject:l}={}){if(l){this._fromObject(l);return}if(!r||!r.headers)throw Error("Response headers missing");this._assertRequestHasHeaders(e),this._responseTime=this.now(),this._isShared=i!==!1,this._trustServerDate=a!==void 0?a:!0,this._cacheHeuristic=n!==void 0?n:.1,this._immutableMinTtl=s!==void 0?s:24*3600*1e3,this._status="status"in r?r.status:200,this._resHeaders=r.headers,this._rescc=nk(r.headers["cache-control"]),this._method="method"in e?e.method:"GET",this._url=e.url,this._host=e.headers.host,this._noAuthorization=!e.headers.authorization,this._reqHeaders=r.headers.vary?e.headers:null,this._reqcc=nk(e.headers["cache-control"]),o&&"pre-check"in this._rescc&&"post-check"in this._rescc&&(delete this._rescc["pre-check"],delete this._rescc["post-check"],delete this._rescc["no-cache"],delete this._rescc["no-store"],delete this._rescc["must-revalidate"],this._resHeaders=Object.assign({},this._resHeaders,{"cache-control":zbe(this._rescc)}),delete this._resHeaders.expires,delete this._resHeaders.pragma),!r.headers["cache-control"]&&/no-cache/.test(r.headers.pragma)&&(this._rescc["no-cache"]=!0)}now(){return Date.now()}storable(){return!!(!this._reqcc["no-store"]&&(this._method==="GET"||this._method==="HEAD"||this._method==="POST"&&this._hasExplicitExpiration())&&qbe.indexOf(this._status)!==-1&&!this._rescc["no-store"]&&(!this._isShared||!this._rescc.private)&&(!this._isShared||this._noAuthorization||this._allowsStoringAuthenticated())&&(this._resHeaders.expires||this._rescc.public||this._rescc["max-age"]||this._rescc["s-maxage"]||Ybe.indexOf(this._status)!==-1))}_hasExplicitExpiration(){return this._isShared&&this._rescc["s-maxage"]||this._rescc["max-age"]||this._resHeaders.expires}_assertRequestHasHeaders(e){if(!e||!e.headers)throw Error("Request headers missing")}satisfiesWithoutRevalidation(e){this._assertRequestHasHeaders(e);let r=nk(e.headers["cache-control"]);return r["no-cache"]||/no-cache/.test(e.headers.pragma)||r["max-age"]&&this.age()>r["max-age"]||r["min-fresh"]&&this.timeToLive()<1e3*r["min-fresh"]||this.stale()&&!(r["max-stale"]&&!this._rescc["must-revalidate"]&&(r["max-stale"]===!0||r["max-stale"]>this.age()-this.maxAge()))?!1:this._requestMatches(e,!1)}_requestMatches(e,r){return(!this._url||this._url===e.url)&&this._host===e.headers.host&&(!e.method||this._method===e.method||r&&e.method==="HEAD")&&this._varyMatches(e)}_allowsStoringAuthenticated(){return this._rescc["must-revalidate"]||this._rescc.public||this._rescc["s-maxage"]}_varyMatches(e){if(!this._resHeaders.vary)return!0;if(this._resHeaders.vary==="*")return!1;let r=this._resHeaders.vary.trim().toLowerCase().split(/\s*,\s*/);for(let i of r)if(e.headers[i]!==this._reqHeaders[i])return!1;return!0}_copyWithoutHopByHopHeaders(e){let r={};for(let i in e)Jbe[i]||(r[i]=e[i]);if(e.connection){let i=e.connection.trim().split(/\s*,\s*/);for(let n of i)delete r[n]}if(r.warning){let i=r.warning.split(/,/).filter(n=>!/^\s*1[0-9][0-9]/.test(n));i.length?r.warning=i.join(",").trim():delete r.warning}return r}responseHeaders(){let e=this._copyWithoutHopByHopHeaders(this._resHeaders),r=this.age();return r>3600*24&&!this._hasExplicitExpiration()&&this.maxAge()>3600*24&&(e.warning=(e.warning?`${e.warning}, `:"")+'113 - "rfc7234 5.5.4"'),e.age=`${Math.round(r)}`,e.date=new Date(this.now()).toUTCString(),e}date(){return this._trustServerDate?this._serverDate():this._responseTime}_serverDate(){let e=Date.parse(this._resHeaders.date);if(isFinite(e)){let r=8*3600*1e3;if(Math.abs(this._responseTime-e)e&&(e=i)}let r=(this.now()-this._responseTime)/1e3;return e+r}_ageValue(){let e=parseInt(this._resHeaders.age);return isFinite(e)?e:0}maxAge(){if(!this.storable()||this._rescc["no-cache"]||this._isShared&&this._resHeaders["set-cookie"]&&!this._rescc.public&&!this._rescc.immutable||this._resHeaders.vary==="*")return 0;if(this._isShared){if(this._rescc["proxy-revalidate"])return 0;if(this._rescc["s-maxage"])return parseInt(this._rescc["s-maxage"],10)}if(this._rescc["max-age"])return parseInt(this._rescc["max-age"],10);let e=this._rescc.immutable?this._immutableMinTtl:0,r=this._serverDate();if(this._resHeaders.expires){let i=Date.parse(this._resHeaders.expires);return Number.isNaN(i)||ii)return Math.max(e,(r-i)/1e3*this._cacheHeuristic)}return e}timeToLive(){return Math.max(0,this.maxAge()-this.age())*1e3}stale(){return this.maxAge()<=this.age()}static fromObject(e){return new this(void 0,void 0,{_fromObject:e})}_fromObject(e){if(this._responseTime)throw Error("Reinitialized");if(!e||e.v!==1)throw Error("Invalid serialization");this._responseTime=e.t,this._isShared=e.sh,this._cacheHeuristic=e.ch,this._immutableMinTtl=e.imm!==void 0?e.imm:24*3600*1e3,this._status=e.st,this._resHeaders=e.resh,this._rescc=e.rescc,this._method=e.m,this._url=e.u,this._host=e.h,this._noAuthorization=e.a,this._reqHeaders=e.reqh,this._reqcc=e.reqcc}toObject(){return{v:1,t:this._responseTime,sh:this._isShared,ch:this._cacheHeuristic,imm:this._immutableMinTtl,st:this._status,resh:this._resHeaders,rescc:this._rescc,m:this._method,u:this._url,h:this._host,a:this._noAuthorization,reqh:this._reqHeaders,reqcc:this._reqcc}}revalidationHeaders(e){this._assertRequestHasHeaders(e);let r=this._copyWithoutHopByHopHeaders(e.headers);if(delete r["if-range"],!this._requestMatches(e,!0)||!this.storable())return delete r["if-none-match"],delete r["if-modified-since"],r;if(this._resHeaders.etag&&(r["if-none-match"]=r["if-none-match"]?`${r["if-none-match"]}, ${this._resHeaders.etag}`:this._resHeaders.etag),r["accept-ranges"]||r["if-match"]||r["if-unmodified-since"]||this._method&&this._method!="GET"){if(delete r["if-modified-since"],r["if-none-match"]){let n=r["if-none-match"].split(/,/).filter(s=>!/^\s*W\//.test(s));n.length?r["if-none-match"]=n.join(",").trim():delete r["if-none-match"]}}else this._resHeaders["last-modified"]&&!r["if-modified-since"]&&(r["if-modified-since"]=this._resHeaders["last-modified"]);return r}revalidatedPolicy(e,r){if(this._assertRequestHasHeaders(e),!r||!r.headers)throw Error("Response headers missing");let i=!1;if(r.status!==void 0&&r.status!=304?i=!1:r.headers.etag&&!/^\s*W\//.test(r.headers.etag)?i=this._resHeaders.etag&&this._resHeaders.etag.replace(/^\s*W\//,"")===r.headers.etag:this._resHeaders.etag&&r.headers.etag?i=this._resHeaders.etag.replace(/^\s*W\//,"")===r.headers.etag.replace(/^\s*W\//,""):this._resHeaders["last-modified"]?i=this._resHeaders["last-modified"]===r.headers["last-modified"]:!this._resHeaders.etag&&!this._resHeaders["last-modified"]&&!r.headers.etag&&!r.headers["last-modified"]&&(i=!0),!i)return{policy:new this.constructor(e,r),modified:r.status!=304,matches:!1};let n={};for(let o in this._resHeaders)n[o]=o in r.headers&&!Wbe[o]?r.headers[o]:this._resHeaders[o];let s=Object.assign({},r,{status:this._status,method:this._method,headers:n});return{policy:new this.constructor(e,s,{shared:this._isShared,cacheHeuristic:this._cacheHeuristic,immutableMinTimeToLive:this._immutableMinTtl,trustServerDate:this._trustServerDate}),modified:!1,matches:!0}}}});var Ly=I((Bnt,U3)=>{"use strict";U3.exports=t=>{let e={};for(let[r,i]of Object.entries(t))e[r.toLowerCase()]=i;return e}});var j3=I((Qnt,H3)=>{"use strict";var Vbe=require("stream").Readable,_be=Ly(),G3=class extends Vbe{constructor(e,r,i,n){if(typeof e!="number")throw new TypeError("Argument `statusCode` should be a number");if(typeof r!="object")throw new TypeError("Argument `headers` should be an object");if(!(i instanceof Buffer))throw new TypeError("Argument `body` should be a buffer");if(typeof n!="string")throw new TypeError("Argument `url` should be a string");super();this.statusCode=e,this.headers=_be(r),this.body=i,this.url=n}_read(){this.push(this.body),this.push(null)}};H3.exports=G3});var q3=I((bnt,Y3)=>{"use strict";var Xbe=["destroy","setTimeout","socket","headers","trailers","rawHeaders","statusCode","httpVersion","httpVersionMinor","httpVersionMajor","rawTrailers","statusMessage"];Y3.exports=(t,e)=>{let r=new Set(Object.keys(t).concat(Xbe));for(let i of r)i in e||(e[i]=typeof t[i]=="function"?t[i].bind(t):t[i])}});var W3=I((vnt,J3)=>{"use strict";var Zbe=require("stream").PassThrough,$be=q3(),eve=t=>{if(!(t&&t.pipe))throw new TypeError("Parameter `response` must be a response stream.");let e=new Zbe;return $be(t,e),t.pipe(e)};J3.exports=eve});var z3=I(sk=>{sk.stringify=function t(e){if(typeof e=="undefined")return e;if(e&&Buffer.isBuffer(e))return JSON.stringify(":base64:"+e.toString("base64"));if(e&&e.toJSON&&(e=e.toJSON()),e&&typeof e=="object"){var r="",i=Array.isArray(e);r=i?"[":"{";var n=!0;for(var s in e){var o=typeof e[s]=="function"||!i&&typeof e[s]=="undefined";Object.hasOwnProperty.call(e,s)&&!o&&(n||(r+=","),n=!1,i?e[s]==null?r+="null":r+=t(e[s]):e[s]!==void 0&&(r+=t(s)+":"+t(e[s])))}return r+=i?"]":"}",r}else return typeof e=="string"?JSON.stringify(/^:/.test(e)?":"+e:e):typeof e=="undefined"?"null":JSON.stringify(e)};sk.parse=function(t){return JSON.parse(t,function(e,r){return typeof r=="string"?/^:base64:/.test(r)?Buffer.from(r.substring(8),"base64"):/^:/.test(r)?r.substring(1):r:r})}});var Z3=I((xnt,V3)=>{"use strict";var tve=require("events"),_3=z3(),rve=t=>{let e={redis:"@keyv/redis",mongodb:"@keyv/mongo",mongo:"@keyv/mongo",sqlite:"@keyv/sqlite",postgresql:"@keyv/postgres",postgres:"@keyv/postgres",mysql:"@keyv/mysql"};if(t.adapter||t.uri){let r=t.adapter||/^[^:]*/.exec(t.uri)[0];return new(require(e[r]))(t)}return new Map},X3=class extends tve{constructor(e,r){super();if(this.opts=Object.assign({namespace:"keyv",serialize:_3.stringify,deserialize:_3.parse},typeof e=="string"?{uri:e}:e,r),!this.opts.store){let i=Object.assign({},this.opts);this.opts.store=rve(i)}typeof this.opts.store.on=="function"&&this.opts.store.on("error",i=>this.emit("error",i)),this.opts.store.namespace=this.opts.namespace}_getKeyPrefix(e){return`${this.opts.namespace}:${e}`}get(e,r){e=this._getKeyPrefix(e);let{store:i}=this.opts;return Promise.resolve().then(()=>i.get(e)).then(n=>typeof n=="string"?this.opts.deserialize(n):n).then(n=>{if(n!==void 0){if(typeof n.expires=="number"&&Date.now()>n.expires){this.delete(e);return}return r&&r.raw?n:n.value}})}set(e,r,i){e=this._getKeyPrefix(e),typeof i=="undefined"&&(i=this.opts.ttl),i===0&&(i=void 0);let{store:n}=this.opts;return Promise.resolve().then(()=>{let s=typeof i=="number"?Date.now()+i:null;return r={value:r,expires:s},this.opts.serialize(r)}).then(s=>n.set(e,s,i)).then(()=>!0)}delete(e){e=this._getKeyPrefix(e);let{store:r}=this.opts;return Promise.resolve().then(()=>r.delete(e))}clear(){let{store:e}=this.opts;return Promise.resolve().then(()=>e.clear())}};V3.exports=X3});var tW=I((knt,$3)=>{"use strict";var ive=require("events"),Ty=require("url"),nve=Q3(),sve=M3(),ok=K3(),eW=j3(),ove=Ly(),ave=W3(),Ave=Z3(),yo=class{constructor(e,r){if(typeof e!="function")throw new TypeError("Parameter `request` must be a function");return this.cache=new Ave({uri:typeof r=="string"&&r,store:typeof r!="string"&&r,namespace:"cacheable-request"}),this.createCacheableRequest(e)}createCacheableRequest(e){return(r,i)=>{let n;if(typeof r=="string")n=ak(Ty.parse(r)),r={};else if(r instanceof Ty.URL)n=ak(Ty.parse(r.toString())),r={};else{let[g,...f]=(r.path||"").split("?"),h=f.length>0?`?${f.join("?")}`:"";n=ak(_(P({},r),{pathname:g,search:h}))}r=P(P({headers:{},method:"GET",cache:!0,strictTtl:!1,automaticFailover:!1},r),lve(n)),r.headers=ove(r.headers);let s=new ive,o=nve(Ty.format(n),{stripWWW:!1,removeTrailingSlash:!1,stripAuthentication:!1}),a=`${r.method}:${o}`,l=!1,c=!1,u=g=>{c=!0;let f=!1,h,p=new Promise(m=>{h=()=>{f||(f=!0,m())}}),d=m=>{if(l&&!g.forceRefresh){m.status=m.statusCode;let B=ok.fromObject(l.cachePolicy).revalidatedPolicy(g,m);if(!B.modified){let b=B.policy.responseHeaders();m=new eW(l.statusCode,b,l.body,l.url),m.cachePolicy=B.policy,m.fromCache=!0}}m.fromCache||(m.cachePolicy=new ok(g,m,g),m.fromCache=!1);let E;g.cache&&m.cachePolicy.storable()?(E=ave(m),(async()=>{try{let B=sve.buffer(m);if(await Promise.race([p,new Promise(L=>m.once("end",L))]),f)return;let b=await B,R={cachePolicy:m.cachePolicy.toObject(),url:m.url,statusCode:m.fromCache?l.statusCode:m.statusCode,body:b},H=g.strictTtl?m.cachePolicy.timeToLive():void 0;g.maxTtl&&(H=H?Math.min(H,g.maxTtl):g.maxTtl),await this.cache.set(a,R,H)}catch(B){s.emit("error",new yo.CacheError(B))}})()):g.cache&&l&&(async()=>{try{await this.cache.delete(a)}catch(B){s.emit("error",new yo.CacheError(B))}})(),s.emit("response",E||m),typeof i=="function"&&i(E||m)};try{let m=e(g,d);m.once("error",h),m.once("abort",h),s.emit("request",m)}catch(m){s.emit("error",new yo.RequestError(m))}};return(async()=>{let g=async h=>{await Promise.resolve();let p=h.cache?await this.cache.get(a):void 0;if(typeof p=="undefined")return u(h);let d=ok.fromObject(p.cachePolicy);if(d.satisfiesWithoutRevalidation(h)&&!h.forceRefresh){let m=d.responseHeaders(),E=new eW(p.statusCode,m,p.body,p.url);E.cachePolicy=d,E.fromCache=!0,s.emit("response",E),typeof i=="function"&&i(E)}else l=p,h.headers=d.revalidationHeaders(h),u(h)},f=h=>s.emit("error",new yo.CacheError(h));this.cache.once("error",f),s.on("response",()=>this.cache.removeListener("error",f));try{await g(r)}catch(h){r.automaticFailover&&!c&&u(r),s.emit("error",new yo.CacheError(h))}})(),s}}};function lve(t){let e=P({},t);return e.path=`${t.pathname||"/"}${t.search||""}`,delete e.pathname,delete e.search,e}function ak(t){return{protocol:t.protocol,auth:t.auth,hostname:t.hostname||t.host||"localhost",port:t.port,pathname:t.pathname,search:t.search}}yo.RequestError=class extends Error{constructor(t){super(t.message);this.name="RequestError",Object.assign(this,t)}};yo.CacheError=class extends Error{constructor(t){super(t.message);this.name="CacheError",Object.assign(this,t)}};$3.exports=yo});var iW=I((Pnt,rW)=>{"use strict";var cve=["aborted","complete","headers","httpVersion","httpVersionMinor","httpVersionMajor","method","rawHeaders","rawTrailers","setTimeout","socket","statusCode","statusMessage","trailers","url"];rW.exports=(t,e)=>{if(e._readableState.autoDestroy)throw new Error("The second stream must have the `autoDestroy` option set to `false`");let r=new Set(Object.keys(t).concat(cve)),i={};for(let n of r)n in e||(i[n]={get(){let s=t[n];return typeof s=="function"?s.bind(t):s},set(s){t[n]=s},enumerable:!0,configurable:!1});return Object.defineProperties(e,i),t.once("aborted",()=>{e.destroy(),e.emit("aborted")}),t.once("close",()=>{t.complete&&e.readable?e.once("end",()=>{e.emit("close")}):e.emit("close")}),e}});var sW=I((Dnt,nW)=>{"use strict";var{Transform:uve,PassThrough:gve}=require("stream"),Ak=require("zlib"),fve=iW();nW.exports=t=>{let e=(t.headers["content-encoding"]||"").toLowerCase();if(!["gzip","deflate","br"].includes(e))return t;let r=e==="br";if(r&&typeof Ak.createBrotliDecompress!="function")return t.destroy(new Error("Brotli is not supported on Node.js < 12")),t;let i=!0,n=new uve({transform(a,l,c){i=!1,c(null,a)},flush(a){a()}}),s=new gve({autoDestroy:!1,destroy(a,l){t.destroy(),l(a)}}),o=r?Ak.createBrotliDecompress():Ak.createUnzip();return o.once("error",a=>{if(i&&!t.readable){s.end();return}s.destroy(a)}),fve(t,s),t.pipe(n).pipe(o).pipe(s),s}});var lk=I((Rnt,oW)=>{"use strict";var aW=class{constructor(e={}){if(!(e.maxSize&&e.maxSize>0))throw new TypeError("`maxSize` must be a number greater than 0");this.maxSize=e.maxSize,this.onEviction=e.onEviction,this.cache=new Map,this.oldCache=new Map,this._size=0}_set(e,r){if(this.cache.set(e,r),this._size++,this._size>=this.maxSize){if(this._size=0,typeof this.onEviction=="function")for(let[i,n]of this.oldCache.entries())this.onEviction(i,n);this.oldCache=this.cache,this.cache=new Map}}get(e){if(this.cache.has(e))return this.cache.get(e);if(this.oldCache.has(e)){let r=this.oldCache.get(e);return this.oldCache.delete(e),this._set(e,r),r}}set(e,r){return this.cache.has(e)?this.cache.set(e,r):this._set(e,r),this}has(e){return this.cache.has(e)||this.oldCache.has(e)}peek(e){if(this.cache.has(e))return this.cache.get(e);if(this.oldCache.has(e))return this.oldCache.get(e)}delete(e){let r=this.cache.delete(e);return r&&this._size--,this.oldCache.delete(e)||r}clear(){this.cache.clear(),this.oldCache.clear(),this._size=0}*keys(){for(let[e]of this)yield e}*values(){for(let[,e]of this)yield e}*[Symbol.iterator](){for(let e of this.cache)yield e;for(let e of this.oldCache){let[r]=e;this.cache.has(r)||(yield e)}}get size(){let e=0;for(let r of this.oldCache.keys())this.cache.has(r)||e++;return Math.min(this._size+e,this.maxSize)}};oW.exports=aW});var uk=I((Fnt,AW)=>{"use strict";var hve=require("events"),pve=require("tls"),dve=require("http2"),Cve=lk(),_i=Symbol("currentStreamsCount"),lW=Symbol("request"),ns=Symbol("cachedOriginSet"),Yu=Symbol("gracefullyClosing"),mve=["maxDeflateDynamicTableSize","maxSessionMemory","maxHeaderListPairs","maxOutstandingPings","maxReservedRemoteStreams","maxSendHeaderBlockLength","paddingStrategy","localAddress","path","rejectUnauthorized","minDHSize","ca","cert","clientCertEngine","ciphers","key","pfx","servername","minVersion","maxVersion","secureProtocol","crl","honorCipherOrder","ecdhCurve","dhparam","secureOptions","sessionIdContext"],Ive=(t,e,r)=>{let i=0,n=t.length;for(;i>>1;r(t[s],e)?i=s+1:n=s}return i},Eve=(t,e)=>t.remoteSettings.maxConcurrentStreams>e.remoteSettings.maxConcurrentStreams,ck=(t,e)=>{for(let r of t)r[ns].lengthe[ns].includes(i))&&r[_i]+e[_i]<=e.remoteSettings.maxConcurrentStreams&&cW(r)},yve=(t,e)=>{for(let r of t)e[ns].lengthr[ns].includes(i))&&e[_i]+r[_i]<=r.remoteSettings.maxConcurrentStreams&&cW(e)},uW=({agent:t,isFree:e})=>{let r={};for(let i in t.sessions){let s=t.sessions[i].filter(o=>{let a=o[ma.kCurrentStreamsCount]{t[Yu]=!0,t[_i]===0&&t.close()},ma=class extends hve{constructor({timeout:e=6e4,maxSessions:r=Infinity,maxFreeSessions:i=10,maxCachedTlsSessions:n=100}={}){super();this.sessions={},this.queue={},this.timeout=e,this.maxSessions=r,this.maxFreeSessions=i,this._freeSessionsCount=0,this._sessionsCount=0,this.settings={enablePush:!1},this.tlsSessionCache=new Cve({maxSize:n})}static normalizeOrigin(e,r){return typeof e=="string"&&(e=new URL(e)),r&&e.hostname!==r&&(e.hostname=r),e.origin}normalizeOptions(e){let r="";if(e)for(let i of mve)e[i]&&(r+=`:${e[i]}`);return r}_tryToCreateNewSession(e,r){if(!(e in this.queue)||!(r in this.queue[e]))return;let i=this.queue[e][r];this._sessionsCount{Array.isArray(i)?(i=[...i],n()):i=[{resolve:n,reject:s}];let o=this.normalizeOptions(r),a=ma.normalizeOrigin(e,r&&r.servername);if(a===void 0){for(let{reject:u}of i)u(new TypeError("The `origin` argument needs to be a string or an URL object"));return}if(o in this.sessions){let u=this.sessions[o],g=-1,f=-1,h;for(let p of u){let d=p.remoteSettings.maxConcurrentStreams;if(d=d||p[Yu]||p.destroyed)continue;h||(g=d),m>f&&(h=p,f=m)}}if(h){if(i.length!==1){for(let{reject:p}of i){let d=new Error(`Expected the length of listeners to be 1, got ${i.length}. +Please report this to https://github.com/szmarczak/http2-wrapper/`);p(d)}return}i[0].resolve(h);return}}if(o in this.queue){if(a in this.queue[o]){this.queue[o][a].listeners.push(...i),this._tryToCreateNewSession(o,a);return}}else this.queue[o]={};let l=()=>{o in this.queue&&this.queue[o][a]===c&&(delete this.queue[o][a],Object.keys(this.queue[o]).length===0&&delete this.queue[o])},c=()=>{let u=`${a}:${o}`,g=!1;try{let f=dve.connect(e,P({createConnection:this.createConnection,settings:this.settings,session:this.tlsSessionCache.get(u)},r));f[_i]=0,f[Yu]=!1;let h=()=>f[_i]{this.tlsSessionCache.set(u,m)}),f.once("error",m=>{for(let{reject:E}of i)E(m);this.tlsSessionCache.delete(u)}),f.setTimeout(this.timeout,()=>{f.destroy()}),f.once("close",()=>{if(g){p&&this._freeSessionsCount--,this._sessionsCount--;let m=this.sessions[o];m.splice(m.indexOf(f),1),m.length===0&&delete this.sessions[o]}else{let m=new Error("Session closed without receiving a SETTINGS frame");m.code="HTTP2WRAPPER_NOSETTINGS";for(let{reject:E}of i)E(m);l()}this._tryToCreateNewSession(o,a)});let d=()=>{if(!(!(o in this.queue)||!h())){for(let m of f[ns])if(m in this.queue[o]){let{listeners:E}=this.queue[o][m];for(;E.length!==0&&h();)E.shift().resolve(f);let B=this.queue[o];if(B[m].listeners.length===0&&(delete B[m],Object.keys(B).length===0)){delete this.queue[o];break}if(!h())break}}};f.on("origin",()=>{f[ns]=f.originSet,!!h()&&(d(),ck(this.sessions[o],f))}),f.once("remoteSettings",()=>{if(f.ref(),f.unref(),this._sessionsCount++,c.destroyed){let m=new Error("Agent has been destroyed");for(let E of i)E.reject(m);f.destroy();return}f[ns]=f.originSet;{let m=this.sessions;if(o in m){let E=m[o];E.splice(Ive(E,f,Eve),0,f)}else m[o]=[f]}this._freeSessionsCount+=1,g=!0,this.emit("session",f),d(),l(),f[_i]===0&&this._freeSessionsCount>this.maxFreeSessions&&f.close(),i.length!==0&&(this.getSession(a,r,i),i.length=0),f.on("remoteSettings",()=>{d(),ck(this.sessions[o],f)})}),f[lW]=f.request,f.request=(m,E)=>{if(f[Yu])throw new Error("The session is gracefully closing. No new streams are allowed.");let B=f[lW](m,E);return f.ref(),++f[_i],f[_i]===f.remoteSettings.maxConcurrentStreams&&this._freeSessionsCount--,B.once("close",()=>{if(p=h(),--f[_i],!f.destroyed&&!f.closed&&(yve(this.sessions[o],f),h()&&!f.closed)){p||(this._freeSessionsCount++,p=!0);let b=f[_i]===0;b&&f.unref(),b&&(this._freeSessionsCount>this.maxFreeSessions||f[Yu])?f.close():(ck(this.sessions[o],f),d())}}),B}}catch(f){for(let h of i)h.reject(f);l()}};c.listeners=i,c.completed=!1,c.destroyed=!1,this.queue[o][a]=c,this._tryToCreateNewSession(o,a)})}request(e,r,i,n){return new Promise((s,o)=>{this.getSession(e,r,[{reject:o,resolve:a=>{try{s(a.request(i,n))}catch(l){o(l)}}}])})}createConnection(e,r){return ma.connect(e,r)}static connect(e,r){r.ALPNProtocols=["h2"];let i=e.port||443,n=e.hostname||e.host;return typeof r.servername=="undefined"&&(r.servername=n),pve.connect(i,n,r)}closeFreeSessions(){for(let e of Object.values(this.sessions))for(let r of e)r[_i]===0&&r.close()}destroy(e){for(let r of Object.values(this.sessions))for(let i of r)i.destroy(e);for(let r of Object.values(this.queue))for(let i of Object.values(r))i.destroyed=!0;this.queue={}}get freeSessions(){return uW({agent:this,isFree:!0})}get busySessions(){return uW({agent:this,isFree:!1})}};ma.kCurrentStreamsCount=_i;ma.kGracefullyClosing=Yu;AW.exports={Agent:ma,globalAgent:new ma}});var gk=I((Nnt,gW)=>{"use strict";var{Readable:wve}=require("stream"),fW=class extends wve{constructor(e,r){super({highWaterMark:r,autoDestroy:!1});this.statusCode=null,this.statusMessage="",this.httpVersion="2.0",this.httpVersionMajor=2,this.httpVersionMinor=0,this.headers={},this.trailers={},this.req=null,this.aborted=!1,this.complete=!1,this.upgrade=null,this.rawHeaders=[],this.rawTrailers=[],this.socket=e,this.connection=e,this._dumped=!1}_destroy(e){this.req._request.destroy(e)}setTimeout(e,r){return this.req.setTimeout(e,r),this}_dump(){this._dumped||(this._dumped=!0,this.removeAllListeners("data"),this.resume())}_read(){this.req&&this.req._request.resume()}};gW.exports=fW});var fk=I((Lnt,hW)=>{"use strict";hW.exports=t=>{let e={protocol:t.protocol,hostname:typeof t.hostname=="string"&&t.hostname.startsWith("[")?t.hostname.slice(1,-1):t.hostname,host:t.host,hash:t.hash,search:t.search,pathname:t.pathname,href:t.href,path:`${t.pathname||""}${t.search||""}`};return typeof t.port=="string"&&t.port.length!==0&&(e.port=Number(t.port)),(t.username||t.password)&&(e.auth=`${t.username||""}:${t.password||""}`),e}});var dW=I((Tnt,pW)=>{"use strict";pW.exports=(t,e,r)=>{for(let i of r)t.on(i,(...n)=>e.emit(i,...n))}});var mW=I((Mnt,CW)=>{"use strict";CW.exports=t=>{switch(t){case":method":case":scheme":case":authority":case":path":return!0;default:return!1}}});var EW=I((Knt,IW)=>{"use strict";var qu=(t,e,r)=>{IW.exports[e]=class extends t{constructor(...n){super(typeof r=="string"?r:r(n));this.name=`${super.name} [${e}]`,this.code=e}}};qu(TypeError,"ERR_INVALID_ARG_TYPE",t=>{let e=t[0].includes(".")?"property":"argument",r=t[1],i=Array.isArray(r);return i&&(r=`${r.slice(0,-1).join(", ")} or ${r.slice(-1)}`),`The "${t[0]}" ${e} must be ${i?"one of":"of"} type ${r}. Received ${typeof t[2]}`});qu(TypeError,"ERR_INVALID_PROTOCOL",t=>`Protocol "${t[0]}" not supported. Expected "${t[1]}"`);qu(Error,"ERR_HTTP_HEADERS_SENT",t=>`Cannot ${t[0]} headers after they are sent to the client`);qu(TypeError,"ERR_INVALID_HTTP_TOKEN",t=>`${t[0]} must be a valid HTTP token [${t[1]}]`);qu(TypeError,"ERR_HTTP_INVALID_HEADER_VALUE",t=>`Invalid value "${t[0]} for header "${t[1]}"`);qu(TypeError,"ERR_INVALID_CHAR",t=>`Invalid character in ${t[0]} [${t[1]}]`)});var Ck=I((Unt,yW)=>{"use strict";var Bve=require("http2"),{Writable:Qve}=require("stream"),{Agent:wW,globalAgent:bve}=uk(),vve=gk(),Sve=fk(),xve=dW(),kve=mW(),{ERR_INVALID_ARG_TYPE:hk,ERR_INVALID_PROTOCOL:Pve,ERR_HTTP_HEADERS_SENT:BW,ERR_INVALID_HTTP_TOKEN:Dve,ERR_HTTP_INVALID_HEADER_VALUE:Rve,ERR_INVALID_CHAR:Fve}=EW(),{HTTP2_HEADER_STATUS:QW,HTTP2_HEADER_METHOD:bW,HTTP2_HEADER_PATH:vW,HTTP2_METHOD_CONNECT:Nve}=Bve.constants,Pi=Symbol("headers"),pk=Symbol("origin"),dk=Symbol("session"),SW=Symbol("options"),My=Symbol("flushedHeaders"),yp=Symbol("jobs"),Lve=/^[\^`\-\w!#$%&*+.|~]+$/,Tve=/[^\t\u0020-\u007E\u0080-\u00FF]/,xW=class extends Qve{constructor(e,r,i){super({autoDestroy:!1});let n=typeof e=="string"||e instanceof URL;if(n&&(e=Sve(e instanceof URL?e:new URL(e))),typeof r=="function"||r===void 0?(i=r,r=n?e:P({},e)):r=P(P({},e),r),r.h2session)this[dk]=r.h2session;else if(r.agent===!1)this.agent=new wW({maxFreeSessions:0});else if(typeof r.agent=="undefined"||r.agent===null)typeof r.createConnection=="function"?(this.agent=new wW({maxFreeSessions:0}),this.agent.createConnection=r.createConnection):this.agent=bve;else if(typeof r.agent.request=="function")this.agent=r.agent;else throw new hk("options.agent",["Agent-like Object","undefined","false"],r.agent);if(r.protocol&&r.protocol!=="https:")throw new Pve(r.protocol,"https:");let s=r.port||r.defaultPort||this.agent&&this.agent.defaultPort||443,o=r.hostname||r.host||"localhost";delete r.hostname,delete r.host,delete r.port;let{timeout:a}=r;if(r.timeout=void 0,this[Pi]=Object.create(null),this[yp]=[],this.socket=null,this.connection=null,this.method=r.method||"GET",this.path=r.path,this.res=null,this.aborted=!1,this.reusedSocket=!1,r.headers)for(let[l,c]of Object.entries(r.headers))this.setHeader(l,c);r.auth&&!("authorization"in this[Pi])&&(this[Pi].authorization="Basic "+Buffer.from(r.auth).toString("base64")),r.session=r.tlsSession,r.path=r.socketPath,this[SW]=r,s===443?(this[pk]=`https://${o}`,":authority"in this[Pi]||(this[Pi][":authority"]=o)):(this[pk]=`https://${o}:${s}`,":authority"in this[Pi]||(this[Pi][":authority"]=`${o}:${s}`)),a&&this.setTimeout(a),i&&this.once("response",i),this[My]=!1}get method(){return this[Pi][bW]}set method(e){e&&(this[Pi][bW]=e.toUpperCase())}get path(){return this[Pi][vW]}set path(e){e&&(this[Pi][vW]=e)}get _mustNotHaveABody(){return this.method==="GET"||this.method==="HEAD"||this.method==="DELETE"}_write(e,r,i){if(this._mustNotHaveABody){i(new Error("The GET, HEAD and DELETE methods must NOT have a body"));return}this.flushHeaders();let n=()=>this._request.write(e,r,i);this._request?n():this[yp].push(n)}_final(e){if(this.destroyed)return;this.flushHeaders();let r=()=>{if(this._mustNotHaveABody){e();return}this._request.end(e)};this._request?r():this[yp].push(r)}abort(){this.res&&this.res.complete||(this.aborted||process.nextTick(()=>this.emit("abort")),this.aborted=!0,this.destroy())}_destroy(e,r){this.res&&this.res._dump(),this._request&&this._request.destroy(),r(e)}async flushHeaders(){if(this[My]||this.destroyed)return;this[My]=!0;let e=this.method===Nve,r=i=>{if(this._request=i,this.destroyed){i.destroy();return}e||xve(i,this,["timeout","continue","close","error"]);let n=o=>(...a)=>{!this.writable&&!this.destroyed?o(...a):this.once("finish",()=>{o(...a)})};i.once("response",n((o,a,l)=>{let c=new vve(this.socket,i.readableHighWaterMark);this.res=c,c.req=this,c.statusCode=o[QW],c.headers=o,c.rawHeaders=l,c.once("end",()=>{this.aborted?(c.aborted=!0,c.emit("aborted")):(c.complete=!0,c.socket=null,c.connection=null)}),e?(c.upgrade=!0,this.emit("connect",c,i,Buffer.alloc(0))?this.emit("close"):i.destroy()):(i.on("data",u=>{!c._dumped&&!c.push(u)&&i.pause()}),i.once("end",()=>{c.push(null)}),this.emit("response",c)||c._dump())})),i.once("headers",n(o=>this.emit("information",{statusCode:o[QW]}))),i.once("trailers",n((o,a,l)=>{let{res:c}=this;c.trailers=o,c.rawTrailers=l}));let{socket:s}=i.session;this.socket=s,this.connection=s;for(let o of this[yp])o();this.emit("socket",this.socket)};if(this[dk])try{r(this[dk].request(this[Pi]))}catch(i){this.emit("error",i)}else{this.reusedSocket=!0;try{r(await this.agent.request(this[pk],this[SW],this[Pi]))}catch(i){this.emit("error",i)}}}getHeader(e){if(typeof e!="string")throw new hk("name","string",e);return this[Pi][e.toLowerCase()]}get headersSent(){return this[My]}removeHeader(e){if(typeof e!="string")throw new hk("name","string",e);if(this.headersSent)throw new BW("remove");delete this[Pi][e.toLowerCase()]}setHeader(e,r){if(this.headersSent)throw new BW("set");if(typeof e!="string"||!Lve.test(e)&&!kve(e))throw new Dve("Header name",e);if(typeof r=="undefined")throw new Rve(r,e);if(Tve.test(r))throw new Fve("header content",e);this[Pi][e.toLowerCase()]=r}setNoDelay(){}setSocketKeepAlive(){}setTimeout(e,r){let i=()=>this._request.setTimeout(e,r);return this._request?i():this[yp].push(i),this}get maxHeadersCount(){if(!this.destroyed&&this._request)return this._request.session.localSettings.maxHeaderListSize}set maxHeadersCount(e){}};yW.exports=xW});var PW=I((Hnt,kW)=>{"use strict";var Mve=require("tls");kW.exports=(t={})=>new Promise((e,r)=>{let i=Mve.connect(t,()=>{t.resolveSocket?(i.off("error",r),e({alpnProtocol:i.alpnProtocol,socket:i})):(i.destroy(),e({alpnProtocol:i.alpnProtocol}))});i.on("error",r)})});var RW=I((Gnt,DW)=>{"use strict";var Ove=require("net");DW.exports=t=>{let e=t.host,r=t.headers&&t.headers.host;return r&&(r.startsWith("[")?r.indexOf("]")===-1?e=r:e=r.slice(1,-1):e=r.split(":",1)[0]),Ove.isIP(e)?"":e}});var LW=I((jnt,mk)=>{"use strict";var FW=require("http"),Ik=require("https"),Kve=PW(),Uve=lk(),Hve=Ck(),Gve=RW(),jve=fk(),Oy=new Uve({maxSize:100}),wp=new Map,NW=(t,e,r)=>{e._httpMessage={shouldKeepAlive:!0};let i=()=>{t.emit("free",e,r)};e.on("free",i);let n=()=>{t.removeSocket(e,r)};e.on("close",n);let s=()=>{t.removeSocket(e,r),e.off("close",n),e.off("free",i),e.off("agentRemove",s)};e.on("agentRemove",s),t.emit("free",e,r)},Yve=async t=>{let e=`${t.host}:${t.port}:${t.ALPNProtocols.sort()}`;if(!Oy.has(e)){if(wp.has(e))return(await wp.get(e)).alpnProtocol;let{path:r,agent:i}=t;t.path=t.socketPath;let n=Kve(t);wp.set(e,n);try{let{socket:s,alpnProtocol:o}=await n;if(Oy.set(e,o),t.path=r,o==="h2")s.destroy();else{let{globalAgent:a}=Ik,l=Ik.Agent.prototype.createConnection;i?i.createConnection===l?NW(i,s,t):s.destroy():a.createConnection===l?NW(a,s,t):s.destroy()}return wp.delete(e),o}catch(s){throw wp.delete(e),s}}return Oy.get(e)};mk.exports=async(t,e,r)=>{if((typeof t=="string"||t instanceof URL)&&(t=jve(new URL(t))),typeof e=="function"&&(r=e,e=void 0),e=_(P(P({ALPNProtocols:["h2","http/1.1"]},t),e),{resolveSocket:!0}),!Array.isArray(e.ALPNProtocols)||e.ALPNProtocols.length===0)throw new Error("The `ALPNProtocols` option must be an Array with at least one entry");e.protocol=e.protocol||"https:";let i=e.protocol==="https:";e.host=e.hostname||e.host||"localhost",e.session=e.tlsSession,e.servername=e.servername||Gve(e),e.port=e.port||(i?443:80),e._defaultAgent=i?Ik.globalAgent:FW.globalAgent;let n=e.agent;if(n){if(n.addRequest)throw new Error("The `options.agent` object can contain only `http`, `https` or `http2` properties");e.agent=n[i?"https":"http"]}return i&&await Yve(e)==="h2"?(n&&(e.agent=n.http2),new Hve(e,r)):FW.request(e,r)};mk.exports.protocolCache=Oy});var MW=I((Ynt,TW)=>{"use strict";var qve=require("http2"),Jve=uk(),Ek=Ck(),Wve=gk(),zve=LW(),Vve=(t,e,r)=>new Ek(t,e,r),_ve=(t,e,r)=>{let i=new Ek(t,e,r);return i.end(),i};TW.exports=_(P(_(P({},qve),{ClientRequest:Ek,IncomingMessage:Wve}),Jve),{request:Vve,get:_ve,auto:zve})});var wk=I(yk=>{"use strict";Object.defineProperty(yk,"__esModule",{value:!0});var OW=Ca();yk.default=t=>OW.default.nodeStream(t)&&OW.default.function_(t.getBoundary)});var GW=I(Bk=>{"use strict";Object.defineProperty(Bk,"__esModule",{value:!0});var KW=require("fs"),UW=require("util"),HW=Ca(),Xve=wk(),Zve=UW.promisify(KW.stat);Bk.default=async(t,e)=>{if(e&&"content-length"in e)return Number(e["content-length"]);if(!t)return 0;if(HW.default.string(t))return Buffer.byteLength(t);if(HW.default.buffer(t))return t.length;if(Xve.default(t))return UW.promisify(t.getLength.bind(t))();if(t instanceof KW.ReadStream){let{size:r}=await Zve(t.path);return r===0?void 0:r}}});var bk=I(Qk=>{"use strict";Object.defineProperty(Qk,"__esModule",{value:!0});function $ve(t,e,r){let i={};for(let n of r)i[n]=(...s)=>{e.emit(n,...s)},t.on(n,i[n]);return()=>{for(let n of r)t.off(n,i[n])}}Qk.default=$ve});var jW=I(vk=>{"use strict";Object.defineProperty(vk,"__esModule",{value:!0});vk.default=()=>{let t=[];return{once(e,r,i){e.once(r,i),t.push({origin:e,event:r,fn:i})},unhandleAll(){for(let e of t){let{origin:r,event:i,fn:n}=e;r.removeListener(i,n)}t.length=0}}}});var qW=I(Bp=>{"use strict";Object.defineProperty(Bp,"__esModule",{value:!0});Bp.TimeoutError=void 0;var eSe=require("net"),tSe=jW(),YW=Symbol("reentry"),rSe=()=>{},Sk=class extends Error{constructor(e,r){super(`Timeout awaiting '${r}' for ${e}ms`);this.event=r,this.name="TimeoutError",this.code="ETIMEDOUT"}};Bp.TimeoutError=Sk;Bp.default=(t,e,r)=>{if(YW in t)return rSe;t[YW]=!0;let i=[],{once:n,unhandleAll:s}=tSe.default(),o=(g,f,h)=>{var p;let d=setTimeout(f,g,g,h);(p=d.unref)===null||p===void 0||p.call(d);let m=()=>{clearTimeout(d)};return i.push(m),m},{host:a,hostname:l}=r,c=(g,f)=>{t.destroy(new Sk(g,f))},u=()=>{for(let g of i)g();s()};if(t.once("error",g=>{if(u(),t.listenerCount("error")===0)throw g}),t.once("close",u),n(t,"response",g=>{n(g,"end",u)}),typeof e.request!="undefined"&&o(e.request,c,"request"),typeof e.socket!="undefined"){let g=()=>{c(e.socket,"socket")};t.setTimeout(e.socket,g),i.push(()=>{t.removeListener("timeout",g)})}return n(t,"socket",g=>{var f;let{socketPath:h}=t;if(g.connecting){let p=Boolean(h!=null?h:eSe.isIP((f=l!=null?l:a)!==null&&f!==void 0?f:"")!==0);if(typeof e.lookup!="undefined"&&!p&&typeof g.address().address=="undefined"){let d=o(e.lookup,c,"lookup");n(g,"lookup",d)}if(typeof e.connect!="undefined"){let d=()=>o(e.connect,c,"connect");p?n(g,"connect",d()):n(g,"lookup",m=>{m===null&&n(g,"connect",d())})}typeof e.secureConnect!="undefined"&&r.protocol==="https:"&&n(g,"connect",()=>{let d=o(e.secureConnect,c,"secureConnect");n(g,"secureConnect",d)})}if(typeof e.send!="undefined"){let p=()=>o(e.send,c,"send");g.connecting?n(g,"connect",()=>{n(t,"upload-complete",p())}):n(t,"upload-complete",p())}}),typeof e.response!="undefined"&&n(t,"upload-complete",()=>{let g=o(e.response,c,"response");n(t,"response",g)}),u}});var WW=I(xk=>{"use strict";Object.defineProperty(xk,"__esModule",{value:!0});var JW=Ca();xk.default=t=>{t=t;let e={protocol:t.protocol,hostname:JW.default.string(t.hostname)&&t.hostname.startsWith("[")?t.hostname.slice(1,-1):t.hostname,host:t.host,hash:t.hash,search:t.search,pathname:t.pathname,href:t.href,path:`${t.pathname||""}${t.search||""}`};return JW.default.string(t.port)&&t.port.length>0&&(e.port=Number(t.port)),(t.username||t.password)&&(e.auth=`${t.username||""}:${t.password||""}`),e}});var zW=I(kk=>{"use strict";Object.defineProperty(kk,"__esModule",{value:!0});var iSe=require("url"),nSe=["protocol","host","hostname","port","pathname","search"];kk.default=(t,e)=>{var r,i;if(e.path){if(e.pathname)throw new TypeError("Parameters `path` and `pathname` are mutually exclusive.");if(e.search)throw new TypeError("Parameters `path` and `search` are mutually exclusive.");if(e.searchParams)throw new TypeError("Parameters `path` and `searchParams` are mutually exclusive.")}if(e.search&&e.searchParams)throw new TypeError("Parameters `search` and `searchParams` are mutually exclusive.");if(!t){if(!e.protocol)throw new TypeError("No URL protocol specified");t=`${e.protocol}//${(i=(r=e.hostname)!==null&&r!==void 0?r:e.host)!==null&&i!==void 0?i:""}`}let n=new iSe.URL(t);if(e.path){let s=e.path.indexOf("?");s===-1?e.pathname=e.path:(e.pathname=e.path.slice(0,s),e.search=e.path.slice(s+1)),delete e.path}for(let s of nSe)e[s]&&(n[s]=e[s].toString());return n}});var _W=I(Pk=>{"use strict";Object.defineProperty(Pk,"__esModule",{value:!0});var VW=class{constructor(){this.weakMap=new WeakMap,this.map=new Map}set(e,r){typeof e=="object"?this.weakMap.set(e,r):this.map.set(e,r)}get(e){return typeof e=="object"?this.weakMap.get(e):this.map.get(e)}has(e){return typeof e=="object"?this.weakMap.has(e):this.map.has(e)}};Pk.default=VW});var Rk=I(Dk=>{"use strict";Object.defineProperty(Dk,"__esModule",{value:!0});var sSe=async t=>{let e=[],r=0;for await(let i of t)e.push(i),r+=Buffer.byteLength(i);return Buffer.isBuffer(e[0])?Buffer.concat(e,r):Buffer.from(e.join(""))};Dk.default=sSe});var ZW=I(ql=>{"use strict";Object.defineProperty(ql,"__esModule",{value:!0});ql.dnsLookupIpVersionToFamily=ql.isDnsLookupIpVersion=void 0;var XW={auto:0,ipv4:4,ipv6:6};ql.isDnsLookupIpVersion=t=>t in XW;ql.dnsLookupIpVersionToFamily=t=>{if(ql.isDnsLookupIpVersion(t))return XW[t];throw new Error("Invalid DNS lookup IP version")}});var Fk=I(Ky=>{"use strict";Object.defineProperty(Ky,"__esModule",{value:!0});Ky.isResponseOk=void 0;Ky.isResponseOk=t=>{let{statusCode:e}=t,r=t.request.options.followRedirect?299:399;return e>=200&&e<=r||e===304}});var e8=I(Nk=>{"use strict";Object.defineProperty(Nk,"__esModule",{value:!0});var $W=new Set;Nk.default=t=>{$W.has(t)||($W.add(t),process.emitWarning(`Got: ${t}`,{type:"DeprecationWarning"}))}});var t8=I(Lk=>{"use strict";Object.defineProperty(Lk,"__esModule",{value:!0});var ar=Ca(),oSe=(t,e)=>{if(ar.default.null_(t.encoding))throw new TypeError("To get a Buffer, set `options.responseType` to `buffer` instead");ar.assert.any([ar.default.string,ar.default.undefined],t.encoding),ar.assert.any([ar.default.boolean,ar.default.undefined],t.resolveBodyOnly),ar.assert.any([ar.default.boolean,ar.default.undefined],t.methodRewriting),ar.assert.any([ar.default.boolean,ar.default.undefined],t.isStream),ar.assert.any([ar.default.string,ar.default.undefined],t.responseType),t.responseType===void 0&&(t.responseType="text");let{retry:r}=t;if(e?t.retry=P({},e.retry):t.retry={calculateDelay:i=>i.computedValue,limit:0,methods:[],statusCodes:[],errorCodes:[],maxRetryAfter:void 0},ar.default.object(r)?(t.retry=P(P({},t.retry),r),t.retry.methods=[...new Set(t.retry.methods.map(i=>i.toUpperCase()))],t.retry.statusCodes=[...new Set(t.retry.statusCodes)],t.retry.errorCodes=[...new Set(t.retry.errorCodes)]):ar.default.number(r)&&(t.retry.limit=r),ar.default.undefined(t.retry.maxRetryAfter)&&(t.retry.maxRetryAfter=Math.min(...[t.timeout.request,t.timeout.connect].filter(ar.default.number))),ar.default.object(t.pagination)){e&&(t.pagination=P(P({},e.pagination),t.pagination));let{pagination:i}=t;if(!ar.default.function_(i.transform))throw new Error("`options.pagination.transform` must be implemented");if(!ar.default.function_(i.shouldContinue))throw new Error("`options.pagination.shouldContinue` must be implemented");if(!ar.default.function_(i.filter))throw new TypeError("`options.pagination.filter` must be implemented");if(!ar.default.function_(i.paginate))throw new Error("`options.pagination.paginate` must be implemented")}return t.responseType==="json"&&t.headers.accept===void 0&&(t.headers.accept="application/json"),t};Lk.default=oSe});var r8=I(Qp=>{"use strict";Object.defineProperty(Qp,"__esModule",{value:!0});Qp.retryAfterStatusCodes=void 0;Qp.retryAfterStatusCodes=new Set([413,429,503]);var aSe=({attemptCount:t,retryOptions:e,error:r,retryAfter:i})=>{if(t>e.limit)return 0;let n=e.methods.includes(r.options.method),s=e.errorCodes.includes(r.code),o=r.response&&e.statusCodes.includes(r.response.statusCode);if(!n||!s&&!o)return 0;if(r.response){if(i)return e.maxRetryAfter===void 0||i>e.maxRetryAfter?0:i;if(r.response.statusCode===413)return 0}let a=Math.random()*100;return 2**(t-1)*1e3+a};Qp.default=aSe});var vp=I(Rt=>{"use strict";Object.defineProperty(Rt,"__esModule",{value:!0});Rt.UnsupportedProtocolError=Rt.ReadError=Rt.TimeoutError=Rt.UploadError=Rt.CacheError=Rt.HTTPError=Rt.MaxRedirectsError=Rt.RequestError=Rt.setNonEnumerableProperties=Rt.knownHookEvents=Rt.withoutBody=Rt.kIsNormalizedAlready=void 0;var i8=require("util"),n8=require("stream"),ASe=require("fs"),dA=require("url"),s8=require("http"),Tk=require("http"),lSe=require("https"),cSe=h3(),uSe=y3(),o8=tW(),gSe=sW(),fSe=MW(),hSe=Ly(),ce=Ca(),pSe=GW(),a8=wk(),dSe=bk(),A8=qW(),CSe=WW(),l8=zW(),mSe=_W(),ISe=Rk(),c8=ZW(),ESe=Fk(),CA=e8(),ySe=t8(),wSe=r8(),Mk,Ii=Symbol("request"),Uy=Symbol("response"),Ju=Symbol("responseSize"),Wu=Symbol("downloadedSize"),zu=Symbol("bodySize"),Vu=Symbol("uploadedSize"),Hy=Symbol("serverResponsesPiped"),u8=Symbol("unproxyEvents"),g8=Symbol("isFromCache"),Ok=Symbol("cancelTimeouts"),f8=Symbol("startedReading"),_u=Symbol("stopReading"),Gy=Symbol("triggerRead"),mA=Symbol("body"),bp=Symbol("jobs"),h8=Symbol("originalResponse"),p8=Symbol("retryTimeout");Rt.kIsNormalizedAlready=Symbol("isNormalizedAlready");var BSe=ce.default.string(process.versions.brotli);Rt.withoutBody=new Set(["GET","HEAD"]);Rt.knownHookEvents=["init","beforeRequest","beforeRedirect","beforeError","beforeRetry","afterResponse"];function QSe(t){for(let e in t){let r=t[e];if(!ce.default.string(r)&&!ce.default.number(r)&&!ce.default.boolean(r)&&!ce.default.null_(r)&&!ce.default.undefined(r))throw new TypeError(`The \`searchParams\` value '${String(r)}' must be a string, number, boolean or null`)}}function bSe(t){return ce.default.object(t)&&!("statusCode"in t)}var Kk=new mSe.default,vSe=async t=>new Promise((e,r)=>{let i=n=>{r(n)};t.pending||e(),t.once("error",i),t.once("ready",()=>{t.off("error",i),e()})}),SSe=new Set([300,301,302,303,304,307,308]),xSe=["context","body","json","form"];Rt.setNonEnumerableProperties=(t,e)=>{let r={};for(let i of t)if(!!i)for(let n of xSe)n in i&&(r[n]={writable:!0,configurable:!0,enumerable:!1,value:i[n]});Object.defineProperties(e,r)};var _r=class extends Error{constructor(e,r,i){var n;super(e);if(Error.captureStackTrace(this,this.constructor),this.name="RequestError",this.code=r.code,i instanceof Uk?(Object.defineProperty(this,"request",{enumerable:!1,value:i}),Object.defineProperty(this,"response",{enumerable:!1,value:i[Uy]}),Object.defineProperty(this,"options",{enumerable:!1,value:i.options})):Object.defineProperty(this,"options",{enumerable:!1,value:i}),this.timings=(n=this.request)===null||n===void 0?void 0:n.timings,ce.default.string(r.stack)&&ce.default.string(this.stack)){let s=this.stack.indexOf(this.message)+this.message.length,o=this.stack.slice(s).split(` +`).reverse(),a=r.stack.slice(r.stack.indexOf(r.message)+r.message.length).split(` +`).reverse();for(;a.length!==0&&a[0]===o[0];)o.shift();this.stack=`${this.stack.slice(0,s)}${o.reverse().join(` +`)}${a.reverse().join(` +`)}`}}};Rt.RequestError=_r;var Hk=class extends _r{constructor(e){super(`Redirected ${e.options.maxRedirects} times. Aborting.`,{},e);this.name="MaxRedirectsError"}};Rt.MaxRedirectsError=Hk;var Gk=class extends _r{constructor(e){super(`Response code ${e.statusCode} (${e.statusMessage})`,{},e.request);this.name="HTTPError"}};Rt.HTTPError=Gk;var jk=class extends _r{constructor(e,r){super(e.message,e,r);this.name="CacheError"}};Rt.CacheError=jk;var Yk=class extends _r{constructor(e,r){super(e.message,e,r);this.name="UploadError"}};Rt.UploadError=Yk;var qk=class extends _r{constructor(e,r,i){super(e.message,e,i);this.name="TimeoutError",this.event=e.event,this.timings=r}};Rt.TimeoutError=qk;var jy=class extends _r{constructor(e,r){super(e.message,e,r);this.name="ReadError"}};Rt.ReadError=jy;var Jk=class extends _r{constructor(e){super(`Unsupported protocol "${e.url.protocol}"`,{},e);this.name="UnsupportedProtocolError"}};Rt.UnsupportedProtocolError=Jk;var kSe=["socket","connect","continue","information","upgrade","timeout"],Uk=class extends n8.Duplex{constructor(e,r={},i){super({autoDestroy:!1,highWaterMark:0});this[Wu]=0,this[Vu]=0,this.requestInitialized=!1,this[Hy]=new Set,this.redirects=[],this[_u]=!1,this[Gy]=!1,this[bp]=[],this.retryCount=0,this._progressCallbacks=[];let n=()=>this._unlockWrite(),s=()=>this._lockWrite();this.on("pipe",c=>{c.prependListener("data",n),c.on("data",s),c.prependListener("end",n),c.on("end",s)}),this.on("unpipe",c=>{c.off("data",n),c.off("data",s),c.off("end",n),c.off("end",s)}),this.on("pipe",c=>{c instanceof Tk.IncomingMessage&&(this.options.headers=P(P({},c.headers),this.options.headers))});let{json:o,body:a,form:l}=r;if((o||a||l)&&this._lockWrite(),Rt.kIsNormalizedAlready in r)this.options=r;else try{this.options=this.constructor.normalizeArguments(e,r,i)}catch(c){ce.default.nodeStream(r.body)&&r.body.destroy(),this.destroy(c);return}(async()=>{var c;try{this.options.body instanceof ASe.ReadStream&&await vSe(this.options.body);let{url:u}=this.options;if(!u)throw new TypeError("Missing `url` property");if(this.requestUrl=u.toString(),decodeURI(this.requestUrl),await this._finalizeBody(),await this._makeRequest(),this.destroyed){(c=this[Ii])===null||c===void 0||c.destroy();return}for(let g of this[bp])g();this[bp].length=0,this.requestInitialized=!0}catch(u){if(u instanceof _r){this._beforeError(u);return}this.destroyed||this.destroy(u)}})()}static normalizeArguments(e,r,i){var n,s,o,a,l;let c=r;if(ce.default.object(e)&&!ce.default.urlInstance(e))r=P(P(P({},i),e),r);else{if(e&&r&&r.url!==void 0)throw new TypeError("The `url` option is mutually exclusive with the `input` argument");r=P(P({},i),r),e!==void 0&&(r.url=e),ce.default.urlInstance(r.url)&&(r.url=new dA.URL(r.url.toString()))}if(r.cache===!1&&(r.cache=void 0),r.dnsCache===!1&&(r.dnsCache=void 0),ce.assert.any([ce.default.string,ce.default.undefined],r.method),ce.assert.any([ce.default.object,ce.default.undefined],r.headers),ce.assert.any([ce.default.string,ce.default.urlInstance,ce.default.undefined],r.prefixUrl),ce.assert.any([ce.default.object,ce.default.undefined],r.cookieJar),ce.assert.any([ce.default.object,ce.default.string,ce.default.undefined],r.searchParams),ce.assert.any([ce.default.object,ce.default.string,ce.default.undefined],r.cache),ce.assert.any([ce.default.object,ce.default.number,ce.default.undefined],r.timeout),ce.assert.any([ce.default.object,ce.default.undefined],r.context),ce.assert.any([ce.default.object,ce.default.undefined],r.hooks),ce.assert.any([ce.default.boolean,ce.default.undefined],r.decompress),ce.assert.any([ce.default.boolean,ce.default.undefined],r.ignoreInvalidCookies),ce.assert.any([ce.default.boolean,ce.default.undefined],r.followRedirect),ce.assert.any([ce.default.number,ce.default.undefined],r.maxRedirects),ce.assert.any([ce.default.boolean,ce.default.undefined],r.throwHttpErrors),ce.assert.any([ce.default.boolean,ce.default.undefined],r.http2),ce.assert.any([ce.default.boolean,ce.default.undefined],r.allowGetBody),ce.assert.any([ce.default.string,ce.default.undefined],r.localAddress),ce.assert.any([c8.isDnsLookupIpVersion,ce.default.undefined],r.dnsLookupIpVersion),ce.assert.any([ce.default.object,ce.default.undefined],r.https),ce.assert.any([ce.default.boolean,ce.default.undefined],r.rejectUnauthorized),r.https&&(ce.assert.any([ce.default.boolean,ce.default.undefined],r.https.rejectUnauthorized),ce.assert.any([ce.default.function_,ce.default.undefined],r.https.checkServerIdentity),ce.assert.any([ce.default.string,ce.default.object,ce.default.array,ce.default.undefined],r.https.certificateAuthority),ce.assert.any([ce.default.string,ce.default.object,ce.default.array,ce.default.undefined],r.https.key),ce.assert.any([ce.default.string,ce.default.object,ce.default.array,ce.default.undefined],r.https.certificate),ce.assert.any([ce.default.string,ce.default.undefined],r.https.passphrase),ce.assert.any([ce.default.string,ce.default.buffer,ce.default.array,ce.default.undefined],r.https.pfx)),ce.assert.any([ce.default.object,ce.default.undefined],r.cacheOptions),ce.default.string(r.method)?r.method=r.method.toUpperCase():r.method="GET",r.headers===(i==null?void 0:i.headers)?r.headers=P({},r.headers):r.headers=hSe(P(P({},i==null?void 0:i.headers),r.headers)),"slashes"in r)throw new TypeError("The legacy `url.Url` has been deprecated. Use `URL` instead.");if("auth"in r)throw new TypeError("Parameter `auth` is deprecated. Use `username` / `password` instead.");if("searchParams"in r&&r.searchParams&&r.searchParams!==(i==null?void 0:i.searchParams)){let h;if(ce.default.string(r.searchParams)||r.searchParams instanceof dA.URLSearchParams)h=new dA.URLSearchParams(r.searchParams);else{QSe(r.searchParams),h=new dA.URLSearchParams;for(let p in r.searchParams){let d=r.searchParams[p];d===null?h.append(p,""):d!==void 0&&h.append(p,d)}}(n=i==null?void 0:i.searchParams)===null||n===void 0||n.forEach((p,d)=>{h.has(d)||h.append(d,p)}),r.searchParams=h}if(r.username=(s=r.username)!==null&&s!==void 0?s:"",r.password=(o=r.password)!==null&&o!==void 0?o:"",ce.default.undefined(r.prefixUrl)?r.prefixUrl=(a=i==null?void 0:i.prefixUrl)!==null&&a!==void 0?a:"":(r.prefixUrl=r.prefixUrl.toString(),r.prefixUrl!==""&&!r.prefixUrl.endsWith("/")&&(r.prefixUrl+="/")),ce.default.string(r.url)){if(r.url.startsWith("/"))throw new Error("`input` must not start with a slash when using `prefixUrl`");r.url=l8.default(r.prefixUrl+r.url,r)}else(ce.default.undefined(r.url)&&r.prefixUrl!==""||r.protocol)&&(r.url=l8.default(r.prefixUrl,r));if(r.url){"port"in r&&delete r.port;let{prefixUrl:h}=r;Object.defineProperty(r,"prefixUrl",{set:d=>{let m=r.url;if(!m.href.startsWith(d))throw new Error(`Cannot change \`prefixUrl\` from ${h} to ${d}: ${m.href}`);r.url=new dA.URL(d+m.href.slice(h.length)),h=d},get:()=>h});let{protocol:p}=r.url;if(p==="unix:"&&(p="http:",r.url=new dA.URL(`http://unix${r.url.pathname}${r.url.search}`)),r.searchParams&&(r.url.search=r.searchParams.toString()),p!=="http:"&&p!=="https:")throw new Jk(r);r.username===""?r.username=r.url.username:r.url.username=r.username,r.password===""?r.password=r.url.password:r.url.password=r.password}let{cookieJar:u}=r;if(u){let{setCookie:h,getCookieString:p}=u;ce.assert.function_(h),ce.assert.function_(p),h.length===4&&p.length===0&&(h=i8.promisify(h.bind(r.cookieJar)),p=i8.promisify(p.bind(r.cookieJar)),r.cookieJar={setCookie:h,getCookieString:p})}let{cache:g}=r;if(g&&(Kk.has(g)||Kk.set(g,new o8((h,p)=>{let d=h[Ii](h,p);return ce.default.promise(d)&&(d.once=(m,E)=>{if(m==="error")d.catch(E);else if(m==="abort")(async()=>{try{(await d).once("abort",E)}catch(B){}})();else throw new Error(`Unknown HTTP2 promise event: ${m}`);return d}),d},g))),r.cacheOptions=P({},r.cacheOptions),r.dnsCache===!0)Mk||(Mk=new uSe.default),r.dnsCache=Mk;else if(!ce.default.undefined(r.dnsCache)&&!r.dnsCache.lookup)throw new TypeError(`Parameter \`dnsCache\` must be a CacheableLookup instance or a boolean, got ${ce.default(r.dnsCache)}`);ce.default.number(r.timeout)?r.timeout={request:r.timeout}:i&&r.timeout!==i.timeout?r.timeout=P(P({},i.timeout),r.timeout):r.timeout=P({},r.timeout),r.context||(r.context={});let f=r.hooks===(i==null?void 0:i.hooks);r.hooks=P({},r.hooks);for(let h of Rt.knownHookEvents)if(h in r.hooks)if(ce.default.array(r.hooks[h]))r.hooks[h]=[...r.hooks[h]];else throw new TypeError(`Parameter \`${h}\` must be an Array, got ${ce.default(r.hooks[h])}`);else r.hooks[h]=[];if(i&&!f)for(let h of Rt.knownHookEvents)i.hooks[h].length>0&&(r.hooks[h]=[...i.hooks[h],...r.hooks[h]]);if("family"in r&&CA.default('"options.family" was never documented, please use "options.dnsLookupIpVersion"'),(i==null?void 0:i.https)&&(r.https=P(P({},i.https),r.https)),"rejectUnauthorized"in r&&CA.default('"options.rejectUnauthorized" is now deprecated, please use "options.https.rejectUnauthorized"'),"checkServerIdentity"in r&&CA.default('"options.checkServerIdentity" was never documented, please use "options.https.checkServerIdentity"'),"ca"in r&&CA.default('"options.ca" was never documented, please use "options.https.certificateAuthority"'),"key"in r&&CA.default('"options.key" was never documented, please use "options.https.key"'),"cert"in r&&CA.default('"options.cert" was never documented, please use "options.https.certificate"'),"passphrase"in r&&CA.default('"options.passphrase" was never documented, please use "options.https.passphrase"'),"pfx"in r&&CA.default('"options.pfx" was never documented, please use "options.https.pfx"'),"followRedirects"in r)throw new TypeError("The `followRedirects` option does not exist. Use `followRedirect` instead.");if(r.agent){for(let h in r.agent)if(h!=="http"&&h!=="https"&&h!=="http2")throw new TypeError(`Expected the \`options.agent\` properties to be \`http\`, \`https\` or \`http2\`, got \`${h}\``)}return r.maxRedirects=(l=r.maxRedirects)!==null&&l!==void 0?l:0,Rt.setNonEnumerableProperties([i,c],r),ySe.default(r,i)}_lockWrite(){let e=()=>{throw new TypeError("The payload has been already provided")};this.write=e,this.end=e}_unlockWrite(){this.write=super.write,this.end=super.end}async _finalizeBody(){let{options:e}=this,{headers:r}=e,i=!ce.default.undefined(e.form),n=!ce.default.undefined(e.json),s=!ce.default.undefined(e.body),o=i||n||s,a=Rt.withoutBody.has(e.method)&&!(e.method==="GET"&&e.allowGetBody);if(this._cannotHaveBody=a,o){if(a)throw new TypeError(`The \`${e.method}\` method cannot be used with a body`);if([s,i,n].filter(l=>l).length>1)throw new TypeError("The `body`, `json` and `form` options are mutually exclusive");if(s&&!(e.body instanceof n8.Readable)&&!ce.default.string(e.body)&&!ce.default.buffer(e.body)&&!a8.default(e.body))throw new TypeError("The `body` option must be a stream.Readable, string or Buffer");if(i&&!ce.default.object(e.form))throw new TypeError("The `form` option must be an Object");{let l=!ce.default.string(r["content-type"]);s?(a8.default(e.body)&&l&&(r["content-type"]=`multipart/form-data; boundary=${e.body.getBoundary()}`),this[mA]=e.body):i?(l&&(r["content-type"]="application/x-www-form-urlencoded"),this[mA]=new dA.URLSearchParams(e.form).toString()):(l&&(r["content-type"]="application/json"),this[mA]=e.stringifyJson(e.json));let c=await pSe.default(this[mA],e.headers);ce.default.undefined(r["content-length"])&&ce.default.undefined(r["transfer-encoding"])&&!a&&!ce.default.undefined(c)&&(r["content-length"]=String(c))}}else a?this._lockWrite():this._unlockWrite();this[zu]=Number(r["content-length"])||void 0}async _onResponseBase(e){let{options:r}=this,{url:i}=r;this[h8]=e,r.decompress&&(e=gSe(e));let n=e.statusCode,s=e;s.statusMessage=s.statusMessage?s.statusMessage:s8.STATUS_CODES[n],s.url=r.url.toString(),s.requestUrl=this.requestUrl,s.redirectUrls=this.redirects,s.request=this,s.isFromCache=e.fromCache||!1,s.ip=this.ip,s.retryCount=this.retryCount,this[g8]=s.isFromCache,this[Ju]=Number(e.headers["content-length"])||void 0,this[Uy]=e,e.once("end",()=>{this[Ju]=this[Wu],this.emit("downloadProgress",this.downloadProgress)}),e.once("error",a=>{e.destroy(),this._beforeError(new jy(a,this))}),e.once("aborted",()=>{this._beforeError(new jy({name:"Error",message:"The server aborted pending request",code:"ECONNRESET"},this))}),this.emit("downloadProgress",this.downloadProgress);let o=e.headers["set-cookie"];if(ce.default.object(r.cookieJar)&&o){let a=o.map(async l=>r.cookieJar.setCookie(l,i.toString()));r.ignoreInvalidCookies&&(a=a.map(async l=>l.catch(()=>{})));try{await Promise.all(a)}catch(l){this._beforeError(l);return}}if(r.followRedirect&&e.headers.location&&SSe.has(n)){if(e.resume(),this[Ii]&&(this[Ok](),delete this[Ii],this[u8]()),(n===303&&r.method!=="GET"&&r.method!=="HEAD"||!r.methodRewriting)&&(r.method="GET","body"in r&&delete r.body,"json"in r&&delete r.json,"form"in r&&delete r.form,this[mA]=void 0,delete r.headers["content-length"]),this.redirects.length>=r.maxRedirects){this._beforeError(new Hk(this));return}try{let l=Buffer.from(e.headers.location,"binary").toString(),c=new dA.URL(l,i),u=c.toString();decodeURI(u),c.hostname!==i.hostname||c.port!==i.port?("host"in r.headers&&delete r.headers.host,"cookie"in r.headers&&delete r.headers.cookie,"authorization"in r.headers&&delete r.headers.authorization,(r.username||r.password)&&(r.username="",r.password="")):(c.username=r.username,c.password=r.password),this.redirects.push(u),r.url=c;for(let g of r.hooks.beforeRedirect)await g(r,s);this.emit("redirect",s,r),await this._makeRequest()}catch(l){this._beforeError(l);return}return}if(r.isStream&&r.throwHttpErrors&&!ESe.isResponseOk(s)){this._beforeError(new Gk(s));return}e.on("readable",()=>{this[Gy]&&this._read()}),this.on("resume",()=>{e.resume()}),this.on("pause",()=>{e.pause()}),e.once("end",()=>{this.push(null)}),this.emit("response",e);for(let a of this[Hy])if(!a.headersSent){for(let l in e.headers){let c=r.decompress?l!=="content-encoding":!0,u=e.headers[l];c&&a.setHeader(l,u)}a.statusCode=n}}async _onResponse(e){try{await this._onResponseBase(e)}catch(r){this._beforeError(r)}}_onRequest(e){let{options:r}=this,{timeout:i,url:n}=r;cSe.default(e),this[Ok]=A8.default(e,i,n);let s=r.cache?"cacheableResponse":"response";e.once(s,l=>{this._onResponse(l)}),e.once("error",l=>{var c;e.destroy(),(c=e.res)===null||c===void 0||c.removeAllListeners("end"),l=l instanceof A8.TimeoutError?new qk(l,this.timings,this):new _r(l.message,l,this),this._beforeError(l)}),this[u8]=dSe.default(e,this,kSe),this[Ii]=e,this.emit("uploadProgress",this.uploadProgress);let o=this[mA],a=this.redirects.length===0?this:e;ce.default.nodeStream(o)?(o.pipe(a),o.once("error",l=>{this._beforeError(new Yk(l,this))})):(this._unlockWrite(),ce.default.undefined(o)?(this._cannotHaveBody||this._noPipe)&&(a.end(),this._lockWrite()):(this._writeRequest(o,void 0,()=>{}),a.end(),this._lockWrite())),this.emit("request",e)}async _createCacheableRequest(e,r){return new Promise((i,n)=>{Object.assign(r,CSe.default(e)),delete r.url;let s,o=Kk.get(r.cache)(r,async a=>{a._readableState.autoDestroy=!1,s&&(await s).emit("cacheableResponse",a),i(a)});r.url=e,o.once("error",n),o.once("request",async a=>{s=a,i(s)})})}async _makeRequest(){var e,r,i,n,s;let{options:o}=this,{headers:a}=o;for(let E in a)if(ce.default.undefined(a[E]))delete a[E];else if(ce.default.null_(a[E]))throw new TypeError(`Use \`undefined\` instead of \`null\` to delete the \`${E}\` header`);if(o.decompress&&ce.default.undefined(a["accept-encoding"])&&(a["accept-encoding"]=BSe?"gzip, deflate, br":"gzip, deflate"),o.cookieJar){let E=await o.cookieJar.getCookieString(o.url.toString());ce.default.nonEmptyString(E)&&(o.headers.cookie=E)}for(let E of o.hooks.beforeRequest){let B=await E(o);if(!ce.default.undefined(B)){o.request=()=>B;break}}o.body&&this[mA]!==o.body&&(this[mA]=o.body);let{agent:l,request:c,timeout:u,url:g}=o;if(o.dnsCache&&!("lookup"in o)&&(o.lookup=o.dnsCache.lookup),g.hostname==="unix"){let E=/(?.+?):(?.+)/.exec(`${g.pathname}${g.search}`);if(E==null?void 0:E.groups){let{socketPath:B,path:b}=E.groups;Object.assign(o,{socketPath:B,path:b,host:""})}}let f=g.protocol==="https:",h;o.http2?h=fSe.auto:h=f?lSe.request:s8.request;let p=(e=o.request)!==null&&e!==void 0?e:h,d=o.cache?this._createCacheableRequest:p;l&&!o.http2&&(o.agent=l[f?"https":"http"]),o[Ii]=p,delete o.request,delete o.timeout;let m=o;if(m.shared=(r=o.cacheOptions)===null||r===void 0?void 0:r.shared,m.cacheHeuristic=(i=o.cacheOptions)===null||i===void 0?void 0:i.cacheHeuristic,m.immutableMinTimeToLive=(n=o.cacheOptions)===null||n===void 0?void 0:n.immutableMinTimeToLive,m.ignoreCargoCult=(s=o.cacheOptions)===null||s===void 0?void 0:s.ignoreCargoCult,o.dnsLookupIpVersion!==void 0)try{m.family=c8.dnsLookupIpVersionToFamily(o.dnsLookupIpVersion)}catch(E){throw new Error("Invalid `dnsLookupIpVersion` option value")}o.https&&("rejectUnauthorized"in o.https&&(m.rejectUnauthorized=o.https.rejectUnauthorized),o.https.checkServerIdentity&&(m.checkServerIdentity=o.https.checkServerIdentity),o.https.certificateAuthority&&(m.ca=o.https.certificateAuthority),o.https.certificate&&(m.cert=o.https.certificate),o.https.key&&(m.key=o.https.key),o.https.passphrase&&(m.passphrase=o.https.passphrase),o.https.pfx&&(m.pfx=o.https.pfx));try{let E=await d(g,m);ce.default.undefined(E)&&(E=h(g,m)),o.request=c,o.timeout=u,o.agent=l,o.https&&("rejectUnauthorized"in o.https&&delete m.rejectUnauthorized,o.https.checkServerIdentity&&delete m.checkServerIdentity,o.https.certificateAuthority&&delete m.ca,o.https.certificate&&delete m.cert,o.https.key&&delete m.key,o.https.passphrase&&delete m.passphrase,o.https.pfx&&delete m.pfx),bSe(E)?this._onRequest(E):this.writable?(this.once("finish",()=>{this._onResponse(E)}),this._unlockWrite(),this.end(),this._lockWrite()):this._onResponse(E)}catch(E){throw E instanceof o8.CacheError?new jk(E,this):new _r(E.message,E,this)}}async _error(e){try{for(let r of this.options.hooks.beforeError)e=await r(e)}catch(r){e=new _r(r.message,r,this)}this.destroy(e)}_beforeError(e){if(this[_u])return;let{options:r}=this,i=this.retryCount+1;this[_u]=!0,e instanceof _r||(e=new _r(e.message,e,this));let n=e,{response:s}=n;(async()=>{if(s&&!s.body){s.setEncoding(this._readableState.encoding);try{s.rawBody=await ISe.default(s),s.body=s.rawBody.toString()}catch(o){}}if(this.listenerCount("retry")!==0){let o;try{let a;s&&"retry-after"in s.headers&&(a=Number(s.headers["retry-after"]),Number.isNaN(a)?(a=Date.parse(s.headers["retry-after"])-Date.now(),a<=0&&(a=1)):a*=1e3),o=await r.retry.calculateDelay({attemptCount:i,retryOptions:r.retry,error:n,retryAfter:a,computedValue:wSe.default({attemptCount:i,retryOptions:r.retry,error:n,retryAfter:a,computedValue:0})})}catch(a){this._error(new _r(a.message,a,this));return}if(o){let a=async()=>{try{for(let l of this.options.hooks.beforeRetry)await l(this.options,n,i)}catch(l){this._error(new _r(l.message,e,this));return}this.destroyed||(this.destroy(),this.emit("retry",i,e))};this[p8]=setTimeout(a,o);return}}this._error(n)})()}_read(){this[Gy]=!0;let e=this[Uy];if(e&&!this[_u]){e.readableLength&&(this[Gy]=!1);let r;for(;(r=e.read())!==null;){this[Wu]+=r.length,this[f8]=!0;let i=this.downloadProgress;i.percent<1&&this.emit("downloadProgress",i),this.push(r)}}}_write(e,r,i){let n=()=>{this._writeRequest(e,r,i)};this.requestInitialized?n():this[bp].push(n)}_writeRequest(e,r,i){this[Ii].destroyed||(this._progressCallbacks.push(()=>{this[Vu]+=Buffer.byteLength(e,r);let n=this.uploadProgress;n.percent<1&&this.emit("uploadProgress",n)}),this[Ii].write(e,r,n=>{!n&&this._progressCallbacks.length>0&&this._progressCallbacks.shift()(),i(n)}))}_final(e){let r=()=>{for(;this._progressCallbacks.length!==0;)this._progressCallbacks.shift()();if(!(Ii in this)){e();return}if(this[Ii].destroyed){e();return}this[Ii].end(i=>{i||(this[zu]=this[Vu],this.emit("uploadProgress",this.uploadProgress),this[Ii].emit("upload-complete")),e(i)})};this.requestInitialized?r():this[bp].push(r)}_destroy(e,r){var i;this[_u]=!0,clearTimeout(this[p8]),Ii in this&&(this[Ok](),((i=this[Uy])===null||i===void 0?void 0:i.complete)||this[Ii].destroy()),e!==null&&!ce.default.undefined(e)&&!(e instanceof _r)&&(e=new _r(e.message,e,this)),r(e)}get _isAboutToError(){return this[_u]}get ip(){var e;return(e=this.socket)===null||e===void 0?void 0:e.remoteAddress}get aborted(){var e,r,i;return((r=(e=this[Ii])===null||e===void 0?void 0:e.destroyed)!==null&&r!==void 0?r:this.destroyed)&&!((i=this[h8])===null||i===void 0?void 0:i.complete)}get socket(){var e,r;return(r=(e=this[Ii])===null||e===void 0?void 0:e.socket)!==null&&r!==void 0?r:void 0}get downloadProgress(){let e;return this[Ju]?e=this[Wu]/this[Ju]:this[Ju]===this[Wu]?e=1:e=0,{percent:e,transferred:this[Wu],total:this[Ju]}}get uploadProgress(){let e;return this[zu]?e=this[Vu]/this[zu]:this[zu]===this[Vu]?e=1:e=0,{percent:e,transferred:this[Vu],total:this[zu]}}get timings(){var e;return(e=this[Ii])===null||e===void 0?void 0:e.timings}get isFromCache(){return this[g8]}pipe(e,r){if(this[f8])throw new Error("Failed to pipe. The response has been emitted already.");return e instanceof Tk.ServerResponse&&this[Hy].add(e),super.pipe(e,r)}unpipe(e){return e instanceof Tk.ServerResponse&&this[Hy].delete(e),super.unpipe(e),this}};Rt.default=Uk});var Sp=I(Ms=>{"use strict";var PSe=Ms&&Ms.__createBinding||(Object.create?function(t,e,r,i){i===void 0&&(i=r),Object.defineProperty(t,i,{enumerable:!0,get:function(){return e[r]}})}:function(t,e,r,i){i===void 0&&(i=r),t[i]=e[r]}),DSe=Ms&&Ms.__exportStar||function(t,e){for(var r in t)r!=="default"&&!Object.prototype.hasOwnProperty.call(e,r)&&PSe(e,t,r)};Object.defineProperty(Ms,"__esModule",{value:!0});Ms.CancelError=Ms.ParseError=void 0;var d8=vp(),C8=class extends d8.RequestError{constructor(e,r){let{options:i}=r.request;super(`${e.message} in "${i.url.toString()}"`,e,r.request);this.name="ParseError"}};Ms.ParseError=C8;var m8=class extends d8.RequestError{constructor(e){super("Promise was canceled",{},e);this.name="CancelError"}get isCanceled(){return!0}};Ms.CancelError=m8;DSe(vp(),Ms)});var E8=I(Wk=>{"use strict";Object.defineProperty(Wk,"__esModule",{value:!0});var I8=Sp(),RSe=(t,e,r,i)=>{let{rawBody:n}=t;try{if(e==="text")return n.toString(i);if(e==="json")return n.length===0?"":r(n.toString());if(e==="buffer")return n;throw new I8.ParseError({message:`Unknown body type '${e}'`,name:"Error"},t)}catch(s){throw new I8.ParseError(s,t)}};Wk.default=RSe});var zk=I(IA=>{"use strict";var FSe=IA&&IA.__createBinding||(Object.create?function(t,e,r,i){i===void 0&&(i=r),Object.defineProperty(t,i,{enumerable:!0,get:function(){return e[r]}})}:function(t,e,r,i){i===void 0&&(i=r),t[i]=e[r]}),NSe=IA&&IA.__exportStar||function(t,e){for(var r in t)r!=="default"&&!Object.prototype.hasOwnProperty.call(e,r)&&FSe(e,t,r)};Object.defineProperty(IA,"__esModule",{value:!0});var LSe=require("events"),TSe=Ca(),MSe=g3(),Yy=Sp(),y8=E8(),w8=vp(),OSe=bk(),KSe=Rk(),B8=Fk(),USe=["request","response","redirect","uploadProgress","downloadProgress"];function Q8(t){let e,r,i=new LSe.EventEmitter,n=new MSe((o,a,l)=>{let c=u=>{let g=new w8.default(void 0,t);g.retryCount=u,g._noPipe=!0,l(()=>g.destroy()),l.shouldReject=!1,l(()=>a(new Yy.CancelError(g))),e=g,g.once("response",async p=>{var d;if(p.retryCount=u,p.request.aborted)return;let m;try{m=await KSe.default(g),p.rawBody=m}catch(R){return}if(g._isAboutToError)return;let E=((d=p.headers["content-encoding"])!==null&&d!==void 0?d:"").toLowerCase(),B=["gzip","deflate","br"].includes(E),{options:b}=g;if(B&&!b.decompress)p.body=m;else try{p.body=y8.default(p,b.responseType,b.parseJson,b.encoding)}catch(R){if(p.body=m.toString(),B8.isResponseOk(p)){g._beforeError(R);return}}try{for(let[R,H]of b.hooks.afterResponse.entries())p=await H(p,async L=>{let K=w8.default.normalizeArguments(void 0,_(P({},L),{retry:{calculateDelay:()=>0},throwHttpErrors:!1,resolveBodyOnly:!1}),b);K.hooks.afterResponse=K.hooks.afterResponse.slice(0,R);for(let ne of K.hooks.beforeRetry)await ne(K);let J=Q8(K);return l(()=>{J.catch(()=>{}),J.cancel()}),J})}catch(R){g._beforeError(new Yy.RequestError(R.message,R,g));return}if(!B8.isResponseOk(p)){g._beforeError(new Yy.HTTPError(p));return}r=p,o(g.options.resolveBodyOnly?p.body:p)});let f=p=>{if(n.isCanceled)return;let{options:d}=g;if(p instanceof Yy.HTTPError&&!d.throwHttpErrors){let{response:m}=p;o(g.options.resolveBodyOnly?m.body:m);return}a(p)};g.once("error",f);let h=g.options.body;g.once("retry",(p,d)=>{var m,E;if(h===((m=d.request)===null||m===void 0?void 0:m.options.body)&&TSe.default.nodeStream((E=d.request)===null||E===void 0?void 0:E.options.body)){f(d);return}c(p)}),OSe.default(g,i,USe)};c(0)});n.on=(o,a)=>(i.on(o,a),n);let s=o=>{let a=(async()=>{await n;let{options:l}=r.request;return y8.default(r,o,l.parseJson,l.encoding)})();return Object.defineProperties(a,Object.getOwnPropertyDescriptors(n)),a};return n.json=()=>{let{headers:o}=e.options;return!e.writableFinished&&o.accept===void 0&&(o.accept="application/json"),s("json")},n.buffer=()=>s("buffer"),n.text=()=>s("text"),n}IA.default=Q8;NSe(Sp(),IA)});var b8=I(Vk=>{"use strict";Object.defineProperty(Vk,"__esModule",{value:!0});var HSe=Sp();function GSe(t,...e){let r=(async()=>{if(t instanceof HSe.RequestError)try{for(let n of e)if(n)for(let s of n)t=await s(t)}catch(n){t=n}throw t})(),i=()=>r;return r.json=i,r.text=i,r.buffer=i,r.on=i,r}Vk.default=GSe});var x8=I(_k=>{"use strict";Object.defineProperty(_k,"__esModule",{value:!0});var v8=Ca();function S8(t){for(let e of Object.values(t))(v8.default.plainObject(e)||v8.default.array(e))&&S8(e);return Object.freeze(t)}_k.default=S8});var P8=I(k8=>{"use strict";Object.defineProperty(k8,"__esModule",{value:!0})});var Xk=I(ss=>{"use strict";var jSe=ss&&ss.__createBinding||(Object.create?function(t,e,r,i){i===void 0&&(i=r),Object.defineProperty(t,i,{enumerable:!0,get:function(){return e[r]}})}:function(t,e,r,i){i===void 0&&(i=r),t[i]=e[r]}),YSe=ss&&ss.__exportStar||function(t,e){for(var r in t)r!=="default"&&!Object.prototype.hasOwnProperty.call(e,r)&&jSe(e,t,r)};Object.defineProperty(ss,"__esModule",{value:!0});ss.defaultHandler=void 0;var D8=Ca(),os=zk(),qSe=b8(),qy=vp(),JSe=x8(),WSe={RequestError:os.RequestError,CacheError:os.CacheError,ReadError:os.ReadError,HTTPError:os.HTTPError,MaxRedirectsError:os.MaxRedirectsError,TimeoutError:os.TimeoutError,ParseError:os.ParseError,CancelError:os.CancelError,UnsupportedProtocolError:os.UnsupportedProtocolError,UploadError:os.UploadError},zSe=async t=>new Promise(e=>{setTimeout(e,t)}),{normalizeArguments:Jy}=qy.default,R8=(...t)=>{let e;for(let r of t)e=Jy(void 0,r,e);return e},VSe=t=>t.isStream?new qy.default(void 0,t):os.default(t),_Se=t=>"defaults"in t&&"options"in t.defaults,XSe=["get","post","put","patch","head","delete"];ss.defaultHandler=(t,e)=>e(t);var F8=(t,e)=>{if(t)for(let r of t)r(e)},N8=t=>{t._rawHandlers=t.handlers,t.handlers=t.handlers.map(i=>(n,s)=>{let o,a=i(n,l=>(o=s(l),o));if(a!==o&&!n.isStream&&o){let l=a,{then:c,catch:u,finally:g}=l;Object.setPrototypeOf(l,Object.getPrototypeOf(o)),Object.defineProperties(l,Object.getOwnPropertyDescriptors(o)),l.then=c,l.catch=u,l.finally=g}return a});let e=(i,n={},s)=>{var o,a;let l=0,c=u=>t.handlers[l++](u,l===t.handlers.length?VSe:c);if(D8.default.plainObject(i)){let u=P(P({},i),n);qy.setNonEnumerableProperties([i,n],u),n=u,i=void 0}try{let u;try{F8(t.options.hooks.init,n),F8((o=n.hooks)===null||o===void 0?void 0:o.init,n)}catch(f){u=f}let g=Jy(i,n,s!=null?s:t.options);if(g[qy.kIsNormalizedAlready]=!0,u)throw new os.RequestError(u.message,u,g);return c(g)}catch(u){if(n.isStream)throw u;return qSe.default(u,t.options.hooks.beforeError,(a=n.hooks)===null||a===void 0?void 0:a.beforeError)}};e.extend=(...i)=>{let n=[t.options],s=[...t._rawHandlers],o;for(let a of i)_Se(a)?(n.push(a.defaults.options),s.push(...a.defaults._rawHandlers),o=a.defaults.mutableDefaults):(n.push(a),"handlers"in a&&s.push(...a.handlers),o=a.mutableDefaults);return s=s.filter(a=>a!==ss.defaultHandler),s.length===0&&s.push(ss.defaultHandler),N8({options:R8(...n),handlers:s,mutableDefaults:Boolean(o)})};let r=async function*(i,n){let s=Jy(i,n,t.options);s.resolveBodyOnly=!1;let o=s.pagination;if(!D8.default.object(o))throw new TypeError("`options.pagination` must be implemented");let a=[],{countLimit:l}=o,c=0;for(;c{let s=[];for await(let o of r(i,n))s.push(o);return s},e.paginate.each=r,e.stream=(i,n)=>e(i,_(P({},n),{isStream:!0}));for(let i of XSe)e[i]=(n,s)=>e(n,_(P({},s),{method:i})),e.stream[i]=(n,s)=>e(n,_(P({},s),{method:i,isStream:!0}));return Object.assign(e,WSe),Object.defineProperty(e,"defaults",{value:t.mutableDefaults?t:JSe.default(t),writable:t.mutableDefaults,configurable:t.mutableDefaults,enumerable:!0}),e.mergeOptions=R8,e};ss.default=N8;YSe(P8(),ss)});var zy=I((Ia,Wy)=>{"use strict";var ZSe=Ia&&Ia.__createBinding||(Object.create?function(t,e,r,i){i===void 0&&(i=r),Object.defineProperty(t,i,{enumerable:!0,get:function(){return e[r]}})}:function(t,e,r,i){i===void 0&&(i=r),t[i]=e[r]}),L8=Ia&&Ia.__exportStar||function(t,e){for(var r in t)r!=="default"&&!Object.prototype.hasOwnProperty.call(e,r)&&ZSe(e,t,r)};Object.defineProperty(Ia,"__esModule",{value:!0});var $Se=require("url"),T8=Xk(),exe={options:{method:"GET",retry:{limit:2,methods:["GET","PUT","HEAD","DELETE","OPTIONS","TRACE"],statusCodes:[408,413,429,500,502,503,504,521,522,524],errorCodes:["ETIMEDOUT","ECONNRESET","EADDRINUSE","ECONNREFUSED","EPIPE","ENOTFOUND","ENETUNREACH","EAI_AGAIN"],maxRetryAfter:void 0,calculateDelay:({computedValue:t})=>t},timeout:{},headers:{"user-agent":"got (https://github.com/sindresorhus/got)"},hooks:{init:[],beforeRequest:[],beforeRedirect:[],beforeRetry:[],beforeError:[],afterResponse:[]},cache:void 0,dnsCache:void 0,decompress:!0,throwHttpErrors:!0,followRedirect:!0,isStream:!1,responseType:"text",resolveBodyOnly:!1,maxRedirects:10,prefixUrl:"",methodRewriting:!0,ignoreInvalidCookies:!1,context:{},http2:!1,allowGetBody:!1,https:void 0,pagination:{transform:t=>t.request.options.responseType==="json"?t.body:JSON.parse(t.body),paginate:t=>{if(!Reflect.has(t.headers,"link"))return!1;let e=t.headers.link.split(","),r;for(let i of e){let n=i.split(";");if(n[1].includes("next")){r=n[0].trimStart().trim(),r=r.slice(1,-1);break}}return r?{url:new $Se.URL(r)}:!1},filter:()=>!0,shouldContinue:()=>!0,countLimit:Infinity,backoff:0,requestLimit:1e4,stackAllItems:!0},parseJson:t=>JSON.parse(t),stringifyJson:t=>JSON.stringify(t),cacheOptions:{}},handlers:[T8.defaultHandler],mutableDefaults:!1},Zk=T8.default(exe);Ia.default=Zk;Wy.exports=Zk;Wy.exports.default=Zk;Wy.exports.__esModule=!0;L8(Xk(),Ia);L8(zk(),Ia)});var U8=I(Xu=>{"use strict";var fst=require("net"),txe=require("tls"),$k=require("http"),M8=require("https"),rxe=require("events"),hst=require("assert"),ixe=require("util");Xu.httpOverHttp=nxe;Xu.httpsOverHttp=sxe;Xu.httpOverHttps=oxe;Xu.httpsOverHttps=axe;function nxe(t){var e=new Ea(t);return e.request=$k.request,e}function sxe(t){var e=new Ea(t);return e.request=$k.request,e.createSocket=O8,e.defaultPort=443,e}function oxe(t){var e=new Ea(t);return e.request=M8.request,e}function axe(t){var e=new Ea(t);return e.request=M8.request,e.createSocket=O8,e.defaultPort=443,e}function Ea(t){var e=this;e.options=t||{},e.proxyOptions=e.options.proxy||{},e.maxSockets=e.options.maxSockets||$k.Agent.defaultMaxSockets,e.requests=[],e.sockets=[],e.on("free",function(i,n,s,o){for(var a=K8(n,s,o),l=0,c=e.requests.length;l=this.maxSockets){s.requests.push(o);return}s.createSocket(o,function(a){a.on("free",l),a.on("close",c),a.on("agentRemove",c),e.onSocket(a);function l(){s.emit("free",a,o)}function c(u){s.removeSocket(a),a.removeListener("free",l),a.removeListener("close",c),a.removeListener("agentRemove",c)}})};Ea.prototype.createSocket=function(e,r){var i=this,n={};i.sockets.push(n);var s=eP({},i.proxyOptions,{method:"CONNECT",path:e.host+":"+e.port,agent:!1,headers:{host:e.host+":"+e.port}});e.localAddress&&(s.localAddress=e.localAddress),s.proxyAuth&&(s.headers=s.headers||{},s.headers["Proxy-Authorization"]="Basic "+new Buffer(s.proxyAuth).toString("base64")),EA("making CONNECT request");var o=i.request(s);o.useChunkedEncodingByDefault=!1,o.once("response",a),o.once("upgrade",l),o.once("connect",c),o.once("error",u),o.end();function a(g){g.upgrade=!0}function l(g,f,h){process.nextTick(function(){c(g,f,h)})}function c(g,f,h){if(o.removeAllListeners(),f.removeAllListeners(),g.statusCode!==200){EA("tunneling socket could not be established, statusCode=%d",g.statusCode),f.destroy();var p=new Error("tunneling socket could not be established, statusCode="+g.statusCode);p.code="ECONNRESET",e.request.emit("error",p),i.removeSocket(n);return}if(h.length>0){EA("got illegal response body from proxy"),f.destroy();var p=new Error("got illegal response body from proxy");p.code="ECONNRESET",e.request.emit("error",p),i.removeSocket(n);return}return EA("tunneling connection has established"),i.sockets[i.sockets.indexOf(n)]=f,r(f)}function u(g){o.removeAllListeners(),EA(`tunneling socket could not be established, cause=%s +`,g.message,g.stack);var f=new Error("tunneling socket could not be established, cause="+g.message);f.code="ECONNRESET",e.request.emit("error",f),i.removeSocket(n)}};Ea.prototype.removeSocket=function(e){var r=this.sockets.indexOf(e);if(r!==-1){this.sockets.splice(r,1);var i=this.requests.shift();i&&this.createSocket(i,function(n){i.request.onSocket(n)})}};function O8(t,e){var r=this;Ea.prototype.createSocket.call(r,t,function(i){var n=t.request.getHeader("host"),s=eP({},r.options,{socket:i,servername:n?n.replace(/:.*$/,""):t.host}),o=txe.connect(0,s);r.sockets[r.sockets.indexOf(i)]=o,e(o)})}function K8(t,e,r){return typeof t=="string"?{host:t,port:e,localAddress:r}:t}function eP(t){for(var e=1,r=arguments.length;e{H8.exports=U8()});var bz=I((xot,sP)=>{var ez=Object.assign({},require("fs")),oe=typeof oe!="undefined"?oe:{},kp={},wA;for(wA in oe)oe.hasOwnProperty(wA)&&(kp[wA]=oe[wA]);var oP=[],tz="./this.program",rz=function(t,e){throw e},iz=!1,Wl=!0,Pp="";function dxe(t){return oe.locateFile?oe.locateFile(t,Pp):Pp+t}var Xy,aP,Zy,AP;Wl&&(iz?Pp=require("path").dirname(Pp)+"/":Pp=__dirname+"/",Xy=function(e,r){var i=sz(e);return i?r?i:i.toString():(Zy||(Zy=ez),AP||(AP=require("path")),e=AP.normalize(e),Zy.readFileSync(e,r?null:"utf8"))},aP=function(e){var r=Xy(e,!0);return r.buffer||(r=new Uint8Array(r)),nz(r.buffer),r},process.argv.length>1&&(tz=process.argv[1].replace(/\\/g,"/")),oP=process.argv.slice(2),typeof sP!="undefined"&&(sP.exports=oe),rz=function(t){process.exit(t)},oe.inspect=function(){return"[Emscripten Module object]"});var $y=oe.print||console.log.bind(console),Di=oe.printErr||console.warn.bind(console);for(wA in kp)kp.hasOwnProperty(wA)&&(oe[wA]=kp[wA]);kp=null;oe.arguments&&(oP=oe.arguments);oe.thisProgram&&(tz=oe.thisProgram);oe.quit&&(rz=oe.quit);var Cxe=16;function mxe(t,e){return e||(e=Cxe),Math.ceil(t/e)*e}var Ixe=0,Exe=function(t){Ixe=t},lP;oe.wasmBinary&&(lP=oe.wasmBinary);var Pst=oe.noExitRuntime||!0;typeof WebAssembly!="object"&&Gr("no native wasm support detected");function yxe(t,e,r){switch(e=e||"i8",e.charAt(e.length-1)==="*"&&(e="i32"),e){case"i1":return Zi[t>>0];case"i8":return Zi[t>>0];case"i16":return cP[t>>1];case"i32":return _e[t>>2];case"i64":return _e[t>>2];case"float":return oz[t>>2];case"double":return az[t>>3];default:Gr("invalid type for getValue: "+e)}return null}var ew,Az=!1,wxe;function nz(t,e){t||Gr("Assertion failed: "+e)}function lz(t){var e=oe["_"+t];return nz(e,"Cannot call unknown function "+t+", make sure it is exported"),e}function vxe(t,e,r,i,n){var s={string:function(h){var p=0;if(h!=null&&h!==0){var d=(h.length<<2)+1;p=gz(d),uz(h,p,d)}return p},array:function(h){var p=gz(h.length);return Bxe(h,p),p}};function o(h){return e==="string"?cz(h):e==="boolean"?Boolean(h):h}var a=lz(t),l=[],c=0;if(i)for(var u=0;u=i);)++n;if(n-e>16&&t.subarray&&fz)return fz.decode(t.subarray(e,n));for(var s="";e>10,56320|c&1023)}}return s}function cz(t,e){return t?Zu($u,t,e):""}function tw(t,e,r,i){if(!(i>0))return 0;for(var n=r,s=r+i-1,o=0;o=55296&&a<=57343){var l=t.charCodeAt(++o);a=65536+((a&1023)<<10)|l&1023}if(a<=127){if(r>=s)break;e[r++]=a}else if(a<=2047){if(r+1>=s)break;e[r++]=192|a>>6,e[r++]=128|a&63}else if(a<=65535){if(r+2>=s)break;e[r++]=224|a>>12,e[r++]=128|a>>6&63,e[r++]=128|a&63}else{if(r+3>=s)break;e[r++]=240|a>>18,e[r++]=128|a>>12&63,e[r++]=128|a>>6&63,e[r++]=128|a&63}}return e[r]=0,r-n}function uz(t,e,r){return tw(t,$u,e,r)}function rw(t){for(var e=0,r=0;r=55296&&i<=57343&&(i=65536+((i&1023)<<10)|t.charCodeAt(++r)&1023),i<=127?++e:i<=2047?e+=2:i<=65535?e+=3:e+=4}return e}function uP(t){var e=rw(t)+1,r=hz(e);return r&&tw(t,Zi,r,e),r}function Bxe(t,e){Zi.set(t,e)}function xxe(t,e){return t%e>0&&(t+=e-t%e),t}var gP,Zi,$u,cP,kxe,_e,Pxe,oz,az;function pz(t){gP=t,oe.HEAP8=Zi=new Int8Array(t),oe.HEAP16=cP=new Int16Array(t),oe.HEAP32=_e=new Int32Array(t),oe.HEAPU8=$u=new Uint8Array(t),oe.HEAPU16=kxe=new Uint16Array(t),oe.HEAPU32=Pxe=new Uint32Array(t),oe.HEAPF32=oz=new Float32Array(t),oe.HEAPF64=az=new Float64Array(t)}var Dst=oe.INITIAL_MEMORY||16777216,fP,dz=[],Cz=[],mz=[],Dxe=!1;function Fxe(){if(oe.preRun)for(typeof oe.preRun=="function"&&(oe.preRun=[oe.preRun]);oe.preRun.length;)Rxe(oe.preRun.shift());hP(dz)}function Nxe(){Dxe=!0,!oe.noFSInit&&!y.init.initialized&&y.init(),BA.init(),hP(Cz)}function Txe(){if(oe.postRun)for(typeof oe.postRun=="function"&&(oe.postRun=[oe.postRun]);oe.postRun.length;)Lxe(oe.postRun.shift());hP(mz)}function Rxe(t){dz.unshift(t)}function Mxe(t){Cz.unshift(t)}function Lxe(t){mz.unshift(t)}var zl=0,pP=null,Dp=null;function Oxe(t){return t}function Iz(t){zl++,oe.monitorRunDependencies&&oe.monitorRunDependencies(zl)}function dP(t){if(zl--,oe.monitorRunDependencies&&oe.monitorRunDependencies(zl),zl==0&&(pP!==null&&(clearInterval(pP),pP=null),Dp)){var e=Dp;Dp=null,e()}}oe.preloadedImages={};oe.preloadedAudios={};function Gr(t){oe.onAbort&&oe.onAbort(t),t+="",Di(t),Az=!0,wxe=1,t="abort("+t+"). Build with -s ASSERTIONS=1 for more info.";var e=new WebAssembly.RuntimeError(t);throw e}var Ez="data:application/octet-stream;base64,";function yz(t){return t.startsWith(Ez)}var Rp="data:application/octet-stream;base64,AGFzbQEAAAABlAInYAF/AX9gA39/fwF/YAF/AGACf38Bf2ACf38AYAV/f39/fwF/YAR/f39/AX9gA39/fwBgBH9+f38Bf2AAAX9gBX9/f35/AX5gA39+fwF/YAF/AX5gAn9+AX9gBH9/fn8BfmADf35/AX5gA39/fgF/YAR/f35/AX9gBn9/f39/fwF/YAR/f39/AGADf39+AX5gAn5/AX9gA398fwBgBH9/f38BfmADf39/AX5gBn98f39/fwF/YAV/f35/fwF/YAV/fn9/fwF/YAV/f39/fwBgAn9+AGACf38BfmACf3wAYAh/fn5/f39+fwF/YAV/f39+fwBgAABgBX5+f35/AX5gAnx/AXxgAn9+AX5gBX9/f39/AX4CeRQBYQFhAAIBYQFiAAABYQFjAAMBYQFkAAYBYQFlAAEBYQFmAAABYQFnAAYBYQFoAAABYQFpAAMBYQFqAAMBYQFrAAMBYQFsAAMBYQFtAAABYQFuAAUBYQFvAAEBYQFwAAMBYQFxAAEBYQFyAAABYQFzAAEBYQF0AAADggKAAgcCAgQAAQECAgANBAQOBwICAhwLEw0AAA0dFAwMAAcCDBAeAgMCAwIAAgEABwgUBBUIBgADAAwABAgIAgEGBgABAB8XAQEDAhMCAwUFEQICIA8GAgMYAQgCAQAABwUBGAAaAxIBAAcEAyERCCIHAQsVAQMABQMDAwAFBAACIwYAAQEAGw0bFw0BBAALCwMDDAwAAwAHJAMBBAgaAQECBQMBAwMABwcHAgICAiURCwgICwEmCQkAAAAKAAIABQAGBgUFBQEDBgYGBRISBgQBAQEAAAIJBgABAA4AAQEPCQABBBkJCQkAAAADCgoBAQIQAAAAAgEDAwkEAQoABQ4AAAkEBQFwAR8fBQcBAYACgIACBgkBfwFB0KDBAgsHvgI8AXUCAAF2AIABAXcAkwIBeADxAQF5AM8BAXoAzQEBQQDLAQFCAMoBAUMAyQEBRADIAQFFAMcBAUYAkgIBRwCRAgFIAI4CAUkA6QEBSgDiAQFLAOEBAUwAPQFNAOABAU4A+gEBTwD5AQFQAPIBAVEA+wEBUgDfAQFTAN4BAVQA3QEBVQDcAQFWAOMBAVcA2wEBWADaAQFZANkBAVoA2AEBXwDXAQEkAOoBAmFhAJwBAmJhANYBAmNhANUBAmRhANQBAmVhADECZmEA6wECZ2EAGwJoYQDOAQJpYQBJAmphANMBAmthANIBAmxhAGgCbWEA0QECbmEA6AECb2EA0AECcGEA5AECcWEAigICcmEA+AECc2EA9wECdGEA9gECdWEA5wECdmEA5gECd2EA5QECeGEAGAJ5YQAVAnphAQAJQQEAQQELHswBkAKNAo8CjAKLArYBiQKIAocChgKFAoQCgwKCAoECgAL/Af4B/QH8AVr1AfQB8wHwAe8B7gHtAewBCq2RCYACQAEBfyMAQRBrIgMgADYCDCADIAE2AgggAyACNgIEIAMoAgwEQCADKAIMIAMoAgg2AgAgAygCDCADKAIENgIECwvMDAEHfwJAIABFDQAgAEEIayIDIABBBGsoAgAiAUF4cSIAaiEFAkAgAUEBcQ0AIAFBA3FFDQEgAyADKAIAIgFrIgNByJsBKAIASQ0BIAAgAWohACADQcybASgCAEcEQCABQf8BTQRAIAMoAggiAiABQQN2IgRBA3RB4JsBakYaIAIgAygCDCIBRgRAQbibAUG4mwEoAgBBfiAEd3E2AgAMAwsgAiABNgIMIAEgAjYCCAwCCyADKAIYIQYCQCADIAMoAgwiAUcEQCADKAIIIgIgATYCDCABIAI2AggMAQsCQCADQRRqIgIoAgAiBA0AIANBEGoiAigCACIEDQBBACEBDAELA0AgAiEHIAQiAUEUaiICKAIAIgQNACABQRBqIQIgASgCECIEDQALIAdBADYCAAsgBkUNAQJAIAMgAygCHCICQQJ0QeidAWoiBCgCAEYEQCAEIAE2AgAgAQ0BQbybAUG8mwEoAgBBfiACd3E2AgAMAwsgBkEQQRQgBigCECADRhtqIAE2AgAgAUUNAgsgASAGNgIYIAMoAhAiAgRAIAEgAjYCECACIAE2AhgLIAMoAhQiAkUNASABIAI2AhQgAiABNgIYDAELIAUoAgQiAUEDcUEDRw0AQcCbASAANgIAIAUgAUF+cTYCBCADIABBAXI2AgQgACADaiAANgIADwsgAyAFTw0AIAUoAgQiAUEBcUUNAAJAIAFBAnFFBEAgBUHQmwEoAgBGBEBB0JsBIAM2AgBBxJsBQcSbASgCACAAaiIANgIAIAMgAEEBcjYCBCADQcybASgCAEcNA0HAmwFBADYCAEHMmwFBADYCAA8LIAVBzJsBKAIARgRAQcybASADNgIAQcCbAUHAmwEoAgAgAGoiADYCACADIABBAXI2AgQgACADaiAANgIADwsgAUF4cSAAaiEAAkAgAUH/AU0EQCAFKAIIIgIgAUEDdiIEQQN0QeCbAWpGGiACIAUoAgwiAUYEQEG4mwFBuJsBKAIAQX4gBHdxNgIADAILIAIgATYCDCABIAI2AggMAQsgBSgCGCEGAkAgBSAFKAIMIgFHBEAgBSgCCCICQcibASgCAEkaIAIgATYCDCABIAI2AggMAQsCQCAFQRRqIgIoAgAiBA0AIAVBEGoiAigCACIEDQBBACEBDAELA0AgAiEHIAQiAUEUaiICKAIAIgQNACABQRBqIQIgASgCECIEDQALIAdBADYCAAsgBkUNAAJAIAUgBSgCHCICQQJ0QeidAWoiBCgCAEYEQCAEIAE2AgAgAQ0BQbybAUG8mwEoAgBBfiACd3E2AgAMAgsgBkEQQRQgBigCECAFRhtqIAE2AgAgAUUNAQsgASAGNgIYIAUoAhAiAgRAIAEgAjYCECACIAE2AhgLIAUoAhQiAkUNACABIAI2AhQgAiABNgIYCyADIABBAXI2AgQgACADaiAANgIAIANBzJsBKAIARw0BQcCbASAANgIADwsgBSABQX5xNgIEIAMgAEEBcjYCBCAAIANqIAA2AgALIABB/wFNBEAgAEEDdiIBQQN0QeCbAWohAAJ/QbibASgCACICQQEgAXQiAXFFBEBBuJsBIAEgAnI2AgAgAAwBCyAAKAIICyECIAAgAzYCCCACIAM2AgwgAyAANgIMIAMgAjYCCA8LQR8hAiADQgA3AhAgAEH///8HTQRAIABBCHYiASABQYD+P2pBEHZBCHEiAXQiAiACQYDgH2pBEHZBBHEiAnQiBCAEQYCAD2pBEHZBAnEiBHRBD3YgASACciAEcmsiAUEBdCAAIAFBFWp2QQFxckEcaiECCyADIAI2AhwgAkECdEHonQFqIQECQAJAAkBBvJsBKAIAIgRBASACdCIHcUUEQEG8mwEgBCAHcjYCACABIAM2AgAgAyABNgIYDAELIABBAEEZIAJBAXZrIAJBH0YbdCECIAEoAgAhAQNAIAEiBCgCBEF4cSAARg0CIAJBHXYhASACQQF0IQIgBCABQQRxaiIHQRBqKAIAIgENAAsgByADNgIQIAMgBDYCGAsgAyADNgIMIAMgAzYCCAwBCyAEKAIIIgAgAzYCDCAEIAM2AgggA0EANgIYIAMgBDYCDCADIAA2AggLQdibAUHYmwEoAgBBAWsiAEF/IAAbNgIACwtCAQF/IwBBEGsiASQAIAEgADYCDCABKAIMBEAgASgCDC0AAUEBcQRAIAEoAgwoAgQQFQsgASgCDBAVCyABQRBqJAALQwEBfyMAQRBrIgIkACACIAA2AgwgAiABNgIIIAIoAgwCfyMAQRBrIgAgAigCCDYCDCAAKAIMQQxqCxBDIAJBEGokAAuiLgEMfyMAQRBrIgwkAAJAAkACQAJAAkACQAJAAkACQAJAAkACQCAAQfQBTQRAQbibASgCACIFQRAgAEELakF4cSAAQQtJGyIIQQN2IgJ2IgFBA3EEQCABQX9zQQFxIAJqIgNBA3QiAUHomwFqKAIAIgRBCGohAAJAIAQoAggiAiABQeCbAWoiAUYEQEG4mwEgBUF+IAN3cTYCAAwBCyACIAE2AgwgASACNgIICyAEIANBA3QiAUEDcjYCBCABIARqIgEgASgCBEEBcjYCBAwNCyAIQcCbASgCACIKTQ0BIAEEQAJAQQIgAnQiAEEAIABrciABIAJ0cSIAQQAgAGtxQQFrIgAgAEEMdkEQcSICdiIBQQV2QQhxIgAgAnIgASAAdiIBQQJ2QQRxIgByIAEgAHYiAUEBdkECcSIAciABIAB2IgFBAXZBAXEiAHIgASAAdmoiA0EDdCIAQeibAWooAgAiBCgCCCIBIABB4JsBaiIARgRAQbibASAFQX4gA3dxIgU2AgAMAQsgASAANgIMIAAgATYCCAsgBEEIaiEAIAQgCEEDcjYCBCAEIAhqIgIgA0EDdCIBIAhrIgNBAXI2AgQgASAEaiADNgIAIAoEQCAKQQN2IgFBA3RB4JsBaiEHQcybASgCACEEAn8gBUEBIAF0IgFxRQRAQbibASABIAVyNgIAIAcMAQsgBygCCAshASAHIAQ2AgggASAENgIMIAQgBzYCDCAEIAE2AggLQcybASACNgIAQcCbASADNgIADA0LQbybASgCACIGRQ0BIAZBACAGa3FBAWsiACAAQQx2QRBxIgJ2IgFBBXZBCHEiACACciABIAB2IgFBAnZBBHEiAHIgASAAdiIBQQF2QQJxIgByIAEgAHYiAUEBdkEBcSIAciABIAB2akECdEHonQFqKAIAIgEoAgRBeHEgCGshAyABIQIDQAJAIAIoAhAiAEUEQCACKAIUIgBFDQELIAAoAgRBeHEgCGsiAiADIAIgA0kiAhshAyAAIAEgAhshASAAIQIMAQsLIAEgCGoiCSABTQ0CIAEoAhghCyABIAEoAgwiBEcEQCABKAIIIgBByJsBKAIASRogACAENgIMIAQgADYCCAwMCyABQRRqIgIoAgAiAEUEQCABKAIQIgBFDQQgAUEQaiECCwNAIAIhByAAIgRBFGoiAigCACIADQAgBEEQaiECIAQoAhAiAA0ACyAHQQA2AgAMCwtBfyEIIABBv39LDQAgAEELaiIAQXhxIQhBvJsBKAIAIglFDQBBACAIayEDAkACQAJAAn9BACAIQYACSQ0AGkEfIAhB////B0sNABogAEEIdiIAIABBgP4/akEQdkEIcSICdCIAIABBgOAfakEQdkEEcSIBdCIAIABBgIAPakEQdkECcSIAdEEPdiABIAJyIAByayIAQQF0IAggAEEVanZBAXFyQRxqCyIFQQJ0QeidAWooAgAiAkUEQEEAIQAMAQtBACEAIAhBAEEZIAVBAXZrIAVBH0YbdCEBA0ACQCACKAIEQXhxIAhrIgcgA08NACACIQQgByIDDQBBACEDIAIhAAwDCyAAIAIoAhQiByAHIAIgAUEddkEEcWooAhAiAkYbIAAgBxshACABQQF0IQEgAg0ACwsgACAEckUEQEECIAV0IgBBACAAa3IgCXEiAEUNAyAAQQAgAGtxQQFrIgAgAEEMdkEQcSICdiIBQQV2QQhxIgAgAnIgASAAdiIBQQJ2QQRxIgByIAEgAHYiAUEBdkECcSIAciABIAB2IgFBAXZBAXEiAHIgASAAdmpBAnRB6J0BaigCACEACyAARQ0BCwNAIAAoAgRBeHEgCGsiASADSSECIAEgAyACGyEDIAAgBCACGyEEIAAoAhAiAQR/IAEFIAAoAhQLIgANAAsLIARFDQAgA0HAmwEoAgAgCGtPDQAgBCAIaiIGIARNDQEgBCgCGCEFIAQgBCgCDCIBRwRAIAQoAggiAEHImwEoAgBJGiAAIAE2AgwgASAANgIIDAoLIARBFGoiAigCACIARQRAIAQoAhAiAEUNBCAEQRBqIQILA0AgAiEHIAAiAUEUaiICKAIAIgANACABQRBqIQIgASgCECIADQALIAdBADYCAAwJCyAIQcCbASgCACICTQRAQcybASgCACEDAkAgAiAIayIBQRBPBEBBwJsBIAE2AgBBzJsBIAMgCGoiADYCACAAIAFBAXI2AgQgAiADaiABNgIAIAMgCEEDcjYCBAwBC0HMmwFBADYCAEHAmwFBADYCACADIAJBA3I2AgQgAiADaiIAIAAoAgRBAXI2AgQLIANBCGohAAwLCyAIQcSbASgCACIGSQRAQcSbASAGIAhrIgE2AgBB0JsBQdCbASgCACICIAhqIgA2AgAgACABQQFyNgIEIAIgCEEDcjYCBCACQQhqIQAMCwtBACEAIAhBL2oiCQJ/QZCfASgCAARAQZifASgCAAwBC0GcnwFCfzcCAEGUnwFCgKCAgICABDcCAEGQnwEgDEEMakFwcUHYqtWqBXM2AgBBpJ8BQQA2AgBB9J4BQQA2AgBBgCALIgFqIgVBACABayIHcSICIAhNDQpB8J4BKAIAIgQEQEHongEoAgAiAyACaiIBIANNDQsgASAESw0LC0H0ngEtAABBBHENBQJAAkBB0JsBKAIAIgMEQEH4ngEhAANAIAMgACgCACIBTwRAIAEgACgCBGogA0sNAwsgACgCCCIADQALC0EAEDwiAUF/Rg0GIAIhBUGUnwEoAgAiA0EBayIAIAFxBEAgAiABayAAIAFqQQAgA2txaiEFCyAFIAhNDQYgBUH+////B0sNBkHwngEoAgAiBARAQeieASgCACIDIAVqIgAgA00NByAAIARLDQcLIAUQPCIAIAFHDQEMCAsgBSAGayAHcSIFQf7///8HSw0FIAUQPCIBIAAoAgAgACgCBGpGDQQgASEACwJAIABBf0YNACAIQTBqIAVNDQBBmJ8BKAIAIgEgCSAFa2pBACABa3EiAUH+////B0sEQCAAIQEMCAsgARA8QX9HBEAgASAFaiEFIAAhAQwIC0EAIAVrEDwaDAULIAAiAUF/Rw0GDAQLAAtBACEEDAcLQQAhAQwFCyABQX9HDQILQfSeAUH0ngEoAgBBBHI2AgALIAJB/v///wdLDQEgAhA8IQFBABA8IQAgAUF/Rg0BIABBf0YNASAAIAFNDQEgACABayIFIAhBKGpNDQELQeieAUHongEoAgAgBWoiADYCAEHsngEoAgAgAEkEQEHsngEgADYCAAsCQAJAAkBB0JsBKAIAIgcEQEH4ngEhAANAIAEgACgCACIDIAAoAgQiAmpGDQIgACgCCCIADQALDAILQcibASgCACIAQQAgACABTRtFBEBByJsBIAE2AgALQQAhAEH8ngEgBTYCAEH4ngEgATYCAEHYmwFBfzYCAEHcmwFBkJ8BKAIANgIAQYSfAUEANgIAA0AgAEEDdCIDQeibAWogA0HgmwFqIgI2AgAgA0HsmwFqIAI2AgAgAEEBaiIAQSBHDQALQcSbASAFQShrIgNBeCABa0EHcUEAIAFBCGpBB3EbIgBrIgI2AgBB0JsBIAAgAWoiADYCACAAIAJBAXI2AgQgASADakEoNgIEQdSbAUGgnwEoAgA2AgAMAgsgAC0ADEEIcQ0AIAMgB0sNACABIAdNDQAgACACIAVqNgIEQdCbASAHQXggB2tBB3FBACAHQQhqQQdxGyIAaiICNgIAQcSbAUHEmwEoAgAgBWoiASAAayIANgIAIAIgAEEBcjYCBCABIAdqQSg2AgRB1JsBQaCfASgCADYCAAwBC0HImwEoAgAgAUsEQEHImwEgATYCAAsgASAFaiECQfieASEAAkACQAJAAkACQAJAA0AgAiAAKAIARwRAIAAoAggiAA0BDAILCyAALQAMQQhxRQ0BC0H4ngEhAANAIAcgACgCACICTwRAIAIgACgCBGoiBCAHSw0DCyAAKAIIIQAMAAsACyAAIAE2AgAgACAAKAIEIAVqNgIEIAFBeCABa0EHcUEAIAFBCGpBB3EbaiIJIAhBA3I2AgQgAkF4IAJrQQdxQQAgAkEIakEHcRtqIgUgCCAJaiIGayECIAUgB0YEQEHQmwEgBjYCAEHEmwFBxJsBKAIAIAJqIgA2AgAgBiAAQQFyNgIEDAMLIAVBzJsBKAIARgRAQcybASAGNgIAQcCbAUHAmwEoAgAgAmoiADYCACAGIABBAXI2AgQgACAGaiAANgIADAMLIAUoAgQiAEEDcUEBRgRAIABBeHEhBwJAIABB/wFNBEAgBSgCCCIDIABBA3YiAEEDdEHgmwFqRhogAyAFKAIMIgFGBEBBuJsBQbibASgCAEF+IAB3cTYCAAwCCyADIAE2AgwgASADNgIIDAELIAUoAhghCAJAIAUgBSgCDCIBRwRAIAUoAggiACABNgIMIAEgADYCCAwBCwJAIAVBFGoiACgCACIDDQAgBUEQaiIAKAIAIgMNAEEAIQEMAQsDQCAAIQQgAyIBQRRqIgAoAgAiAw0AIAFBEGohACABKAIQIgMNAAsgBEEANgIACyAIRQ0AAkAgBSAFKAIcIgNBAnRB6J0BaiIAKAIARgRAIAAgATYCACABDQFBvJsBQbybASgCAEF+IAN3cTYCAAwCCyAIQRBBFCAIKAIQIAVGG2ogATYCACABRQ0BCyABIAg2AhggBSgCECIABEAgASAANgIQIAAgATYCGAsgBSgCFCIARQ0AIAEgADYCFCAAIAE2AhgLIAUgB2ohBSACIAdqIQILIAUgBSgCBEF+cTYCBCAGIAJBAXI2AgQgAiAGaiACNgIAIAJB/wFNBEAgAkEDdiIAQQN0QeCbAWohAgJ/QbibASgCACIBQQEgAHQiAHFFBEBBuJsBIAAgAXI2AgAgAgwBCyACKAIICyEAIAIgBjYCCCAAIAY2AgwgBiACNgIMIAYgADYCCAwDC0EfIQAgAkH///8HTQRAIAJBCHYiACAAQYD+P2pBEHZBCHEiA3QiACAAQYDgH2pBEHZBBHEiAXQiACAAQYCAD2pBEHZBAnEiAHRBD3YgASADciAAcmsiAEEBdCACIABBFWp2QQFxckEcaiEACyAGIAA2AhwgBkIANwIQIABBAnRB6J0BaiEEAkBBvJsBKAIAIgNBASAAdCIBcUUEQEG8mwEgASADcjYCACAEIAY2AgAgBiAENgIYDAELIAJBAEEZIABBAXZrIABBH0YbdCEAIAQoAgAhAQNAIAEiAygCBEF4cSACRg0DIABBHXYhASAAQQF0IQAgAyABQQRxaiIEKAIQIgENAAsgBCAGNgIQIAYgAzYCGAsgBiAGNgIMIAYgBjYCCAwCC0HEmwEgBUEoayIDQXggAWtBB3FBACABQQhqQQdxGyIAayICNgIAQdCbASAAIAFqIgA2AgAgACACQQFyNgIEIAEgA2pBKDYCBEHUmwFBoJ8BKAIANgIAIAcgBEEnIARrQQdxQQAgBEEna0EHcRtqQS9rIgAgACAHQRBqSRsiAkEbNgIEIAJBgJ8BKQIANwIQIAJB+J4BKQIANwIIQYCfASACQQhqNgIAQfyeASAFNgIAQfieASABNgIAQYSfAUEANgIAIAJBGGohAANAIABBBzYCBCAAQQhqIQEgAEEEaiEAIAEgBEkNAAsgAiAHRg0DIAIgAigCBEF+cTYCBCAHIAIgB2siBEEBcjYCBCACIAQ2AgAgBEH/AU0EQCAEQQN2IgBBA3RB4JsBaiECAn9BuJsBKAIAIgFBASAAdCIAcUUEQEG4mwEgACABcjYCACACDAELIAIoAggLIQAgAiAHNgIIIAAgBzYCDCAHIAI2AgwgByAANgIIDAQLQR8hACAHQgA3AhAgBEH///8HTQRAIARBCHYiACAAQYD+P2pBEHZBCHEiAnQiACAAQYDgH2pBEHZBBHEiAXQiACAAQYCAD2pBEHZBAnEiAHRBD3YgASACciAAcmsiAEEBdCAEIABBFWp2QQFxckEcaiEACyAHIAA2AhwgAEECdEHonQFqIQMCQEG8mwEoAgAiAkEBIAB0IgFxRQRAQbybASABIAJyNgIAIAMgBzYCACAHIAM2AhgMAQsgBEEAQRkgAEEBdmsgAEEfRht0IQAgAygCACEBA0AgASICKAIEQXhxIARGDQQgAEEddiEBIABBAXQhACACIAFBBHFqIgMoAhAiAQ0ACyADIAc2AhAgByACNgIYCyAHIAc2AgwgByAHNgIIDAMLIAMoAggiACAGNgIMIAMgBjYCCCAGQQA2AhggBiADNgIMIAYgADYCCAsgCUEIaiEADAULIAIoAggiACAHNgIMIAIgBzYCCCAHQQA2AhggByACNgIMIAcgADYCCAtBxJsBKAIAIgAgCE0NAEHEmwEgACAIayIBNgIAQdCbAUHQmwEoAgAiAiAIaiIANgIAIAAgAUEBcjYCBCACIAhBA3I2AgQgAkEIaiEADAMLQbSbAUEwNgIAQQAhAAwCCwJAIAVFDQACQCAEKAIcIgJBAnRB6J0BaiIAKAIAIARGBEAgACABNgIAIAENAUG8mwEgCUF+IAJ3cSIJNgIADAILIAVBEEEUIAUoAhAgBEYbaiABNgIAIAFFDQELIAEgBTYCGCAEKAIQIgAEQCABIAA2AhAgACABNgIYCyAEKAIUIgBFDQAgASAANgIUIAAgATYCGAsCQCADQQ9NBEAgBCADIAhqIgBBA3I2AgQgACAEaiIAIAAoAgRBAXI2AgQMAQsgBCAIQQNyNgIEIAYgA0EBcjYCBCADIAZqIAM2AgAgA0H/AU0EQCADQQN2IgBBA3RB4JsBaiECAn9BuJsBKAIAIgFBASAAdCIAcUUEQEG4mwEgACABcjYCACACDAELIAIoAggLIQAgAiAGNgIIIAAgBjYCDCAGIAI2AgwgBiAANgIIDAELQR8hACADQf///wdNBEAgA0EIdiIAIABBgP4/akEQdkEIcSICdCIAIABBgOAfakEQdkEEcSIBdCIAIABBgIAPakEQdkECcSIAdEEPdiABIAJyIAByayIAQQF0IAMgAEEVanZBAXFyQRxqIQALIAYgADYCHCAGQgA3AhAgAEECdEHonQFqIQICQAJAIAlBASAAdCIBcUUEQEG8mwEgASAJcjYCACACIAY2AgAgBiACNgIYDAELIANBAEEZIABBAXZrIABBH0YbdCEAIAIoAgAhCANAIAgiASgCBEF4cSADRg0CIABBHXYhAiAAQQF0IQAgASACQQRxaiICKAIQIggNAAsgAiAGNgIQIAYgATYCGAsgBiAGNgIMIAYgBjYCCAwBCyABKAIIIgAgBjYCDCABIAY2AgggBkEANgIYIAYgATYCDCAGIAA2AggLIARBCGohAAwBCwJAIAtFDQACQCABKAIcIgJBAnRB6J0BaiIAKAIAIAFGBEAgACAENgIAIAQNAUG8mwEgBkF+IAJ3cTYCAAwCCyALQRBBFCALKAIQIAFGG2ogBDYCACAERQ0BCyAEIAs2AhggASgCECIABEAgBCAANgIQIAAgBDYCGAsgASgCFCIARQ0AIAQgADYCFCAAIAQ2AhgLAkAgA0EPTQRAIAEgAyAIaiIAQQNyNgIEIAAgAWoiACAAKAIEQQFyNgIEDAELIAEgCEEDcjYCBCAJIANBAXI2AgQgAyAJaiADNgIAIAoEQCAKQQN2IgBBA3RB4JsBaiEEQcybASgCACECAn9BASAAdCIAIAVxRQRAQbibASAAIAVyNgIAIAQMAQsgBCgCCAshACAEIAI2AgggACACNgIMIAIgBDYCDCACIAA2AggLQcybASAJNgIAQcCbASADNgIACyABQQhqIQALIAxBEGokACAAC4MEAQN/IAJBgARPBEAgACABIAIQEhogAA8LIAAgAmohAwJAIAAgAXNBA3FFBEACQCAAQQNxRQRAIAAhAgwBCyACQQFIBEAgACECDAELIAAhAgNAIAIgAS0AADoAACABQQFqIQEgAkEBaiICQQNxRQ0BIAIgA0kNAAsLAkAgA0F8cSIEQcAASQ0AIAIgBEFAaiIFSw0AA0AgAiABKAIANgIAIAIgASgCBDYCBCACIAEoAgg2AgggAiABKAIMNgIMIAIgASgCEDYCECACIAEoAhQ2AhQgAiABKAIYNgIYIAIgASgCHDYCHCACIAEoAiA2AiAgAiABKAIkNgIkIAIgASgCKDYCKCACIAEoAiw2AiwgAiABKAIwNgIwIAIgASgCNDYCNCACIAEoAjg2AjggAiABKAI8NgI8IAFBQGshASACQUBrIgIgBU0NAAsLIAIgBE8NAQNAIAIgASgCADYCACABQQRqIQEgAkEEaiICIARJDQALDAELIANBBEkEQCAAIQIMAQsgACADQQRrIgRLBEAgACECDAELIAAhAgNAIAIgAS0AADoAACACIAEtAAE6AAEgAiABLQACOgACIAIgAS0AAzoAAyABQQRqIQEgAkEEaiICIARNDQALCyACIANJBEADQCACIAEtAAA6AAAgAUEBaiEBIAJBAWoiAiADRw0ACwsgAAu4GAECfyMAQRBrIgQkACAEIAA2AgwgBCABNgIIIAQgAjYCBCAEKAIMIQAgBCgCCCECIAQoAgQhAyMAQSBrIgEkACABIAA2AhggASACNgIUIAEgAzYCEAJAIAEoAhRFBEAgAUEANgIcDAELIAFBATYCDCABLQAMBEAgASgCFCECIAEoAhAhAyMAQSBrIgAgASgCGDYCHCAAIAI2AhggACADNgIUIAAgACgCHDYCECAAIAAoAhBBf3M2AhADQCAAKAIUBH8gACgCGEEDcUEARwVBAAtBAXEEQCAAKAIQIQIgACAAKAIYIgNBAWo2AhggACADLQAAIAJzQf8BcUECdEGQFWooAgAgACgCEEEIdnM2AhAgACAAKAIUQQFrNgIUDAELCyAAIAAoAhg2AgwDQCAAKAIUQSBPBEAgACAAKAIMIgJBBGo2AgwgACACKAIAIAAoAhBzNgIQIAAgACgCEEEYdkECdEGQFWooAgAgACgCEEEQdkH/AXFBAnRBkB1qKAIAIAAoAhBB/wFxQQJ0QZAtaigCACAAKAIQQQh2Qf8BcUECdEGQJWooAgBzc3M2AhAgACAAKAIMIgJBBGo2AgwgACACKAIAIAAoAhBzNgIQIAAgACgCEEEYdkECdEGQFWooAgAgACgCEEEQdkH/AXFBAnRBkB1qKAIAIAAoAhBB/wFxQQJ0QZAtaigCACAAKAIQQQh2Qf8BcUECdEGQJWooAgBzc3M2AhAgACAAKAIMIgJBBGo2AgwgACACKAIAIAAoAhBzNgIQIAAgACgCEEEYdkECdEGQFWooAgAgACgCEEEQdkH/AXFBAnRBkB1qKAIAIAAoAhBB/wFxQQJ0QZAtaigCACAAKAIQQQh2Qf8BcUECdEGQJWooAgBzc3M2AhAgACAAKAIMIgJBBGo2AgwgACACKAIAIAAoAhBzNgIQIAAgACgCEEEYdkECdEGQFWooAgAgACgCEEEQdkH/AXFBAnRBkB1qKAIAIAAoAhBB/wFxQQJ0QZAtaigCACAAKAIQQQh2Qf8BcUECdEGQJWooAgBzc3M2AhAgACAAKAIMIgJBBGo2AgwgACACKAIAIAAoAhBzNgIQIAAgACgCEEEYdkECdEGQFWooAgAgACgCEEEQdkH/AXFBAnRBkB1qKAIAIAAoAhBB/wFxQQJ0QZAtaigCACAAKAIQQQh2Qf8BcUECdEGQJWooAgBzc3M2AhAgACAAKAIMIgJBBGo2AgwgACACKAIAIAAoAhBzNgIQIAAgACgCEEEYdkECdEGQFWooAgAgACgCEEEQdkH/AXFBAnRBkB1qKAIAIAAoAhBB/wFxQQJ0QZAtaigCACAAKAIQQQh2Qf8BcUECdEGQJWooAgBzc3M2AhAgACAAKAIMIgJBBGo2AgwgACACKAIAIAAoAhBzNgIQIAAgACgCEEEYdkECdEGQFWooAgAgACgCEEEQdkH/AXFBAnRBkB1qKAIAIAAoAhBB/wFxQQJ0QZAtaigCACAAKAIQQQh2Qf8BcUECdEGQJWooAgBzc3M2AhAgACAAKAIMIgJBBGo2AgwgACACKAIAIAAoAhBzNgIQIAAgACgCEEEYdkECdEGQFWooAgAgACgCEEEQdkH/AXFBAnRBkB1qKAIAIAAoAhBB/wFxQQJ0QZAtaigCACAAKAIQQQh2Qf8BcUECdEGQJWooAgBzc3M2AhAgACAAKAIUQSBrNgIUDAELCwNAIAAoAhRBBE8EQCAAIAAoAgwiAkEEajYCDCAAIAIoAgAgACgCEHM2AhAgACAAKAIQQRh2QQJ0QZAVaigCACAAKAIQQRB2Qf8BcUECdEGQHWooAgAgACgCEEH/AXFBAnRBkC1qKAIAIAAoAhBBCHZB/wFxQQJ0QZAlaigCAHNzczYCECAAIAAoAhRBBGs2AhQMAQsLIAAgACgCDDYCGCAAKAIUBEADQCAAKAIQIQIgACAAKAIYIgNBAWo2AhggACADLQAAIAJzQf8BcUECdEGQFWooAgAgACgCEEEIdnM2AhAgACAAKAIUQQFrIgI2AhQgAg0ACwsgACAAKAIQQX9zNgIQIAEgACgCEDYCHAwBCyABKAIUIQIgASgCECEDIwBBIGsiACABKAIYNgIcIAAgAjYCGCAAIAM2AhQgACAAKAIcQQh2QYD+A3EgACgCHEEYdmogACgCHEGA/gNxQQh0aiAAKAIcQf8BcUEYdGo2AhAgACAAKAIQQX9zNgIQA0AgACgCFAR/IAAoAhhBA3FBAEcFQQALQQFxBEAgACgCEEEYdiECIAAgACgCGCIDQQFqNgIYIAAgAy0AACACc0ECdEGQNWooAgAgACgCEEEIdHM2AhAgACAAKAIUQQFrNgIUDAELCyAAIAAoAhg2AgwDQCAAKAIUQSBPBEAgACAAKAIMIgJBBGo2AgwgACACKAIAIAAoAhBzNgIQIAAgACgCEEEYdkECdEGQzQBqKAIAIAAoAhBBEHZB/wFxQQJ0QZDFAGooAgAgACgCEEH/AXFBAnRBkDVqKAIAIAAoAhBBCHZB/wFxQQJ0QZA9aigCAHNzczYCECAAIAAoAgwiAkEEajYCDCAAIAIoAgAgACgCEHM2AhAgACAAKAIQQRh2QQJ0QZDNAGooAgAgACgCEEEQdkH/AXFBAnRBkMUAaigCACAAKAIQQf8BcUECdEGQNWooAgAgACgCEEEIdkH/AXFBAnRBkD1qKAIAc3NzNgIQIAAgACgCDCICQQRqNgIMIAAgAigCACAAKAIQczYCECAAIAAoAhBBGHZBAnRBkM0AaigCACAAKAIQQRB2Qf8BcUECdEGQxQBqKAIAIAAoAhBB/wFxQQJ0QZA1aigCACAAKAIQQQh2Qf8BcUECdEGQPWooAgBzc3M2AhAgACAAKAIMIgJBBGo2AgwgACACKAIAIAAoAhBzNgIQIAAgACgCEEEYdkECdEGQzQBqKAIAIAAoAhBBEHZB/wFxQQJ0QZDFAGooAgAgACgCEEH/AXFBAnRBkDVqKAIAIAAoAhBBCHZB/wFxQQJ0QZA9aigCAHNzczYCECAAIAAoAgwiAkEEajYCDCAAIAIoAgAgACgCEHM2AhAgACAAKAIQQRh2QQJ0QZDNAGooAgAgACgCEEEQdkH/AXFBAnRBkMUAaigCACAAKAIQQf8BcUECdEGQNWooAgAgACgCEEEIdkH/AXFBAnRBkD1qKAIAc3NzNgIQIAAgACgCDCICQQRqNgIMIAAgAigCACAAKAIQczYCECAAIAAoAhBBGHZBAnRBkM0AaigCACAAKAIQQRB2Qf8BcUECdEGQxQBqKAIAIAAoAhBB/wFxQQJ0QZA1aigCACAAKAIQQQh2Qf8BcUECdEGQPWooAgBzc3M2AhAgACAAKAIMIgJBBGo2AgwgACACKAIAIAAoAhBzNgIQIAAgACgCEEEYdkECdEGQzQBqKAIAIAAoAhBBEHZB/wFxQQJ0QZDFAGooAgAgACgCEEH/AXFBAnRBkDVqKAIAIAAoAhBBCHZB/wFxQQJ0QZA9aigCAHNzczYCECAAIAAoAgwiAkEEajYCDCAAIAIoAgAgACgCEHM2AhAgACAAKAIQQRh2QQJ0QZDNAGooAgAgACgCEEEQdkH/AXFBAnRBkMUAaigCACAAKAIQQf8BcUECdEGQNWooAgAgACgCEEEIdkH/AXFBAnRBkD1qKAIAc3NzNgIQIAAgACgCFEEgazYCFAwBCwsDQCAAKAIUQQRPBEAgACAAKAIMIgJBBGo2AgwgACACKAIAIAAoAhBzNgIQIAAgACgCEEEYdkECdEGQzQBqKAIAIAAoAhBBEHZB/wFxQQJ0QZDFAGooAgAgACgCEEH/AXFBAnRBkDVqKAIAIAAoAhBBCHZB/wFxQQJ0QZA9aigCAHNzczYCECAAIAAoAhRBBGs2AhQMAQsLIAAgACgCDDYCGCAAKAIUBEADQCAAKAIQQRh2IQIgACAAKAIYIgNBAWo2AhggACADLQAAIAJzQQJ0QZA1aigCACAAKAIQQQh0czYCECAAIAAoAhRBAWsiAjYCFCACDQALCyAAIAAoAhBBf3M2AhAgASAAKAIQQQh2QYD+A3EgACgCEEEYdmogACgCEEGA/gNxQQh0aiAAKAIQQf8BcUEYdGo2AhwLIAEoAhwhACABQSBqJAAgBEEQaiQAIAAL7AIBAn8jAEEQayIBJAAgASAANgIMAkAgASgCDEUNACABKAIMKAIwBEAgASgCDCIAIAAoAjBBAWs2AjALIAEoAgwoAjANACABKAIMKAIgBEAgASgCDEEBNgIgIAEoAgwQMRoLIAEoAgwoAiRBAUYEQCABKAIMEGcLAkAgASgCDCgCLEUNACABKAIMLQAoQQFxDQAgASgCDCECIwBBEGsiACABKAIMKAIsNgIMIAAgAjYCCCAAQQA2AgQDQCAAKAIEIAAoAgwoAkRJBEAgACgCDCgCTCAAKAIEQQJ0aigCACAAKAIIRgRAIAAoAgwoAkwgACgCBEECdGogACgCDCgCTCAAKAIMKAJEQQFrQQJ0aigCADYCACAAKAIMIgAgACgCREEBazYCRAUgACAAKAIEQQFqNgIEDAILCwsLIAEoAgxBAEIAQQUQIRogASgCDCgCAARAIAEoAgwoAgAQGwsgASgCDBAVCyABQRBqJAALnwIBAn8jAEEQayIBJAAgASAANgIMIAEgASgCDCgCHDYCBCABKAIEIQIjAEEQayIAJAAgACACNgIMIAAoAgwQuwEgAEEQaiQAIAEgASgCBCgCFDYCCCABKAIIIAEoAgwoAhBLBEAgASABKAIMKAIQNgIICwJAIAEoAghFDQAgASgCDCgCDCABKAIEKAIQIAEoAggQGRogASgCDCIAIAEoAgggACgCDGo2AgwgASgCBCIAIAEoAgggACgCEGo2AhAgASgCDCIAIAEoAgggACgCFGo2AhQgASgCDCIAIAAoAhAgASgCCGs2AhAgASgCBCIAIAAoAhQgASgCCGs2AhQgASgCBCgCFA0AIAEoAgQgASgCBCgCCDYCEAsgAUEQaiQAC2ABAX8jAEEQayIBJAAgASAANgIIIAEgASgCCEICEB42AgQCQCABKAIERQRAIAFBADsBDgwBCyABIAEoAgQtAAAgASgCBC0AAUEIdGo7AQ4LIAEvAQ4hACABQRBqJAAgAAvpAQEBfyMAQSBrIgIkACACIAA2AhwgAiABNwMQIAIpAxAhASMAQSBrIgAgAigCHDYCGCAAIAE3AxACQAJAAkAgACgCGC0AAEEBcUUNACAAKQMQIAAoAhgpAxAgACkDEHxWDQAgACgCGCkDCCAAKAIYKQMQIAApAxB8Wg0BCyAAKAIYQQA6AAAgAEEANgIcDAELIAAgACgCGCgCBCAAKAIYKQMQp2o2AgwgACAAKAIMNgIcCyACIAAoAhw2AgwgAigCDARAIAIoAhwiACACKQMQIAApAxB8NwMQCyACKAIMIQAgAkEgaiQAIAALbwEBfyMAQRBrIgIkACACIAA2AgggAiABOwEGIAIgAigCCEICEB42AgACQCACKAIARQRAIAJBfzYCDAwBCyACKAIAIAIvAQY6AAAgAigCACACLwEGQQh2OgABIAJBADYCDAsgAigCDBogAkEQaiQAC48BAQF/IwBBEGsiAiQAIAIgADYCCCACIAE2AgQgAiACKAIIQgQQHjYCAAJAIAIoAgBFBEAgAkF/NgIMDAELIAIoAgAgAigCBDoAACACKAIAIAIoAgRBCHY6AAEgAigCACACKAIEQRB2OgACIAIoAgAgAigCBEEYdjoAAyACQQA2AgwLIAIoAgwaIAJBEGokAAu2AgEBfyMAQTBrIgQkACAEIAA2AiQgBCABNgIgIAQgAjcDGCAEIAM2AhQCQCAEKAIkKQMYQgEgBCgCFK2Gg1AEQCAEKAIkQQxqQRxBABAUIARCfzcDKAwBCwJAIAQoAiQoAgBFBEAgBCAEKAIkKAIIIAQoAiAgBCkDGCAEKAIUIAQoAiQoAgQRDgA3AwgMAQsgBCAEKAIkKAIAIAQoAiQoAgggBCgCICAEKQMYIAQoAhQgBCgCJCgCBBEKADcDCAsgBCkDCEIAUwRAAkAgBCgCFEEERg0AIAQoAhRBDkYNAAJAIAQoAiQgBEIIQQQQIUIAUwRAIAQoAiRBDGpBFEEAEBQMAQsgBCgCJEEMaiAEKAIAIAQoAgQQFAsLCyAEIAQpAwg3AygLIAQpAyghAiAEQTBqJAAgAgsXACAALQAAQSBxRQRAIAEgAiAAEHIaCwtQAQF/IwBBEGsiASQAIAEgADYCDANAIAEoAgwEQCABIAEoAgwoAgA2AgggASgCDCgCDBAVIAEoAgwQFSABIAEoAgg2AgwMAQsLIAFBEGokAAt9AQF/IwBBEGsiASQAIAEgADYCDCABKAIMBEAgAUIANwMAA0AgASkDACABKAIMKQMIWkUEQCABKAIMKAIAIAEpAwCnQQR0ahBiIAEgASkDAEIBfDcDAAwBCwsgASgCDCgCABAVIAEoAgwoAigQJSABKAIMEBULIAFBEGokAAs+AQF/IwBBEGsiASQAIAEgADYCDCABKAIMBEAgASgCDCgCABAVIAEoAgwoAgwQFSABKAIMEBULIAFBEGokAAtuAQF/IwBBgAJrIgUkAAJAIARBgMAEcQ0AIAIgA0wNACAFIAFB/wFxIAIgA2siAkGAAiACQYACSSIBGxAyIAFFBEADQCAAIAVBgAIQIiACQYACayICQf8BSw0ACwsgACAFIAIQIgsgBUGAAmokAAvRAQEBfyMAQTBrIgMkACADIAA2AiggAyABNwMgIAMgAjYCHAJAIAMoAigtAChBAXEEQCADQX82AiwMAQsCQCADKAIoKAIgBEAgAygCHEUNASADKAIcQQFGDQEgAygCHEECRg0BCyADKAIoQQxqQRJBABAUIANBfzYCLAwBCyADIAMpAyA3AwggAyADKAIcNgIQIAMoAiggA0EIakIQQQYQIUIAUwRAIANBfzYCLAwBCyADKAIoQQA6ADQgA0EANgIsCyADKAIsIQAgA0EwaiQAIAALmBcBAn8jAEEwayIEJAAgBCAANgIsIAQgATYCKCAEIAI2AiQgBCADNgIgIARBADYCFAJAIAQoAiwoAoQBQQBKBEAgBCgCLCgCACgCLEECRgRAIwBBEGsiACAEKAIsNgIIIABB/4D/n382AgQgAEEANgIAAkADQCAAKAIAQR9MBEACQCAAKAIEQQFxRQ0AIAAoAghBlAFqIAAoAgBBAnRqLwEARQ0AIABBADYCDAwDCyAAIAAoAgBBAWo2AgAgACAAKAIEQQF2NgIEDAELCwJAAkAgACgCCC8BuAENACAAKAIILwG8AQ0AIAAoAggvAcgBRQ0BCyAAQQE2AgwMAQsgAEEgNgIAA0AgACgCAEGAAkgEQCAAKAIIQZQBaiAAKAIAQQJ0ai8BAARAIABBATYCDAwDBSAAIAAoAgBBAWo2AgAMAgsACwsgAEEANgIMCyAAKAIMIQAgBCgCLCgCACAANgIsCyAEKAIsIAQoAixBmBZqEHsgBCgCLCAEKAIsQaQWahB7IAQoAiwhASMAQRBrIgAkACAAIAE2AgwgACgCDCAAKAIMQZQBaiAAKAIMKAKcFhC5ASAAKAIMIAAoAgxBiBNqIAAoAgwoAqgWELkBIAAoAgwgACgCDEGwFmoQeyAAQRI2AggDQAJAIAAoAghBA0gNACAAKAIMQfwUaiAAKAIILQDgbEECdGovAQINACAAIAAoAghBAWs2AggMAQsLIAAoAgwiASABKAKoLSAAKAIIQQNsQRFqajYCqC0gACgCCCEBIABBEGokACAEIAE2AhQgBCAEKAIsKAKoLUEKakEDdjYCHCAEIAQoAiwoAqwtQQpqQQN2NgIYIAQoAhggBCgCHE0EQCAEIAQoAhg2AhwLDAELIAQgBCgCJEEFaiIANgIYIAQgADYCHAsCQAJAIAQoAhwgBCgCJEEEakkNACAEKAIoRQ0AIAQoAiwgBCgCKCAEKAIkIAQoAiAQXAwBCwJAAkAgBCgCLCgCiAFBBEcEQCAEKAIYIAQoAhxHDQELIARBAzYCEAJAIAQoAiwoArwtQRAgBCgCEGtKBEAgBCAEKAIgQQJqNgIMIAQoAiwiACAALwG4LSAEKAIMQf//A3EgBCgCLCgCvC10cjsBuC0gBCgCLC8BuC1B/wFxIQEgBCgCLCgCCCECIAQoAiwiAygCFCEAIAMgAEEBajYCFCAAIAJqIAE6AAAgBCgCLC8BuC1BCHYhASAEKAIsKAIIIQIgBCgCLCIDKAIUIQAgAyAAQQFqNgIUIAAgAmogAToAACAEKAIsIAQoAgxB//8DcUEQIAQoAiwoArwta3U7AbgtIAQoAiwiACAAKAK8LSAEKAIQQRBrajYCvC0MAQsgBCgCLCIAIAAvAbgtIAQoAiBBAmpB//8DcSAEKAIsKAK8LXRyOwG4LSAEKAIsIgAgBCgCECAAKAK8LWo2ArwtCyAEKAIsQZDgAEGQ6QAQugEMAQsgBEEDNgIIAkAgBCgCLCgCvC1BECAEKAIIa0oEQCAEIAQoAiBBBGo2AgQgBCgCLCIAIAAvAbgtIAQoAgRB//8DcSAEKAIsKAK8LXRyOwG4LSAEKAIsLwG4LUH/AXEhASAEKAIsKAIIIQIgBCgCLCIDKAIUIQAgAyAAQQFqNgIUIAAgAmogAToAACAEKAIsLwG4LUEIdiEBIAQoAiwoAgghAiAEKAIsIgMoAhQhACADIABBAWo2AhQgACACaiABOgAAIAQoAiwgBCgCBEH//wNxQRAgBCgCLCgCvC1rdTsBuC0gBCgCLCIAIAAoArwtIAQoAghBEGtqNgK8LQwBCyAEKAIsIgAgAC8BuC0gBCgCIEEEakH//wNxIAQoAiwoArwtdHI7AbgtIAQoAiwiACAEKAIIIAAoArwtajYCvC0LIAQoAiwhASAEKAIsKAKcFkEBaiECIAQoAiwoAqgWQQFqIQMgBCgCFEEBaiEFIwBBQGoiACQAIAAgATYCPCAAIAI2AjggACADNgI0IAAgBTYCMCAAQQU2AigCQCAAKAI8KAK8LUEQIAAoAihrSgRAIAAgACgCOEGBAms2AiQgACgCPCIBIAEvAbgtIAAoAiRB//8DcSAAKAI8KAK8LXRyOwG4LSAAKAI8LwG4LUH/AXEhAiAAKAI8KAIIIQMgACgCPCIFKAIUIQEgBSABQQFqNgIUIAEgA2ogAjoAACAAKAI8LwG4LUEIdiECIAAoAjwoAgghAyAAKAI8IgUoAhQhASAFIAFBAWo2AhQgASADaiACOgAAIAAoAjwgACgCJEH//wNxQRAgACgCPCgCvC1rdTsBuC0gACgCPCIBIAEoArwtIAAoAihBEGtqNgK8LQwBCyAAKAI8IgEgAS8BuC0gACgCOEGBAmtB//8DcSAAKAI8KAK8LXRyOwG4LSAAKAI8IgEgACgCKCABKAK8LWo2ArwtCyAAQQU2AiACQCAAKAI8KAK8LUEQIAAoAiBrSgRAIAAgACgCNEEBazYCHCAAKAI8IgEgAS8BuC0gACgCHEH//wNxIAAoAjwoArwtdHI7AbgtIAAoAjwvAbgtQf8BcSECIAAoAjwoAgghAyAAKAI8IgUoAhQhASAFIAFBAWo2AhQgASADaiACOgAAIAAoAjwvAbgtQQh2IQIgACgCPCgCCCEDIAAoAjwiBSgCFCEBIAUgAUEBajYCFCABIANqIAI6AAAgACgCPCAAKAIcQf//A3FBECAAKAI8KAK8LWt1OwG4LSAAKAI8IgEgASgCvC0gACgCIEEQa2o2ArwtDAELIAAoAjwiASABLwG4LSAAKAI0QQFrQf//A3EgACgCPCgCvC10cjsBuC0gACgCPCIBIAAoAiAgASgCvC1qNgK8LQsgAEEENgIYAkAgACgCPCgCvC1BECAAKAIYa0oEQCAAIAAoAjBBBGs2AhQgACgCPCIBIAEvAbgtIAAoAhRB//8DcSAAKAI8KAK8LXRyOwG4LSAAKAI8LwG4LUH/AXEhAiAAKAI8KAIIIQMgACgCPCIFKAIUIQEgBSABQQFqNgIUIAEgA2ogAjoAACAAKAI8LwG4LUEIdiECIAAoAjwoAgghAyAAKAI8IgUoAhQhASAFIAFBAWo2AhQgASADaiACOgAAIAAoAjwgACgCFEH//wNxQRAgACgCPCgCvC1rdTsBuC0gACgCPCIBIAEoArwtIAAoAhhBEGtqNgK8LQwBCyAAKAI8IgEgAS8BuC0gACgCMEEEa0H//wNxIAAoAjwoArwtdHI7AbgtIAAoAjwiASAAKAIYIAEoArwtajYCvC0LIABBADYCLANAIAAoAiwgACgCMEgEQCAAQQM2AhACQCAAKAI8KAK8LUEQIAAoAhBrSgRAIAAgACgCPEH8FGogACgCLC0A4GxBAnRqLwECNgIMIAAoAjwiASABLwG4LSAAKAIMQf//A3EgACgCPCgCvC10cjsBuC0gACgCPC8BuC1B/wFxIQIgACgCPCgCCCEDIAAoAjwiBSgCFCEBIAUgAUEBajYCFCABIANqIAI6AAAgACgCPC8BuC1BCHYhAiAAKAI8KAIIIQMgACgCPCIFKAIUIQEgBSABQQFqNgIUIAEgA2ogAjoAACAAKAI8IAAoAgxB//8DcUEQIAAoAjwoArwta3U7AbgtIAAoAjwiASABKAK8LSAAKAIQQRBrajYCvC0MAQsgACgCPCIBIAEvAbgtIAAoAjxB/BRqIAAoAiwtAOBsQQJ0ai8BAiAAKAI8KAK8LXRyOwG4LSAAKAI8IgEgACgCECABKAK8LWo2ArwtCyAAIAAoAixBAWo2AiwMAQsLIAAoAjwgACgCPEGUAWogACgCOEEBaxC4ASAAKAI8IAAoAjxBiBNqIAAoAjRBAWsQuAEgAEFAayQAIAQoAiwgBCgCLEGUAWogBCgCLEGIE2oQugELCyAEKAIsEL0BIAQoAiAEQCAEKAIsELwBCyAEQTBqJAAL1AEBAX8jAEEgayICJAAgAiAANgIYIAIgATcDECACIAIoAhhFOgAPAkAgAigCGEUEQCACIAIpAxCnEBgiADYCGCAARQRAIAJBADYCHAwCCwsgAkEYEBgiADYCCCAARQRAIAItAA9BAXEEQCACKAIYEBULIAJBADYCHAwBCyACKAIIQQE6AAAgAigCCCACKAIYNgIEIAIoAgggAikDEDcDCCACKAIIQgA3AxAgAigCCCACLQAPQQFxOgABIAIgAigCCDYCHAsgAigCHCEAIAJBIGokACAAC3gBAX8jAEEQayIBJAAgASAANgIIIAEgASgCCEIEEB42AgQCQCABKAIERQRAIAFBADYCDAwBCyABIAEoAgQtAAAgASgCBC0AASABKAIELQACIAEoAgQtAANBCHRqQQh0akEIdGo2AgwLIAEoAgwhACABQRBqJAAgAAt/AQN/IAAhAQJAIABBA3EEQANAIAEtAABFDQIgAUEBaiIBQQNxDQALCwNAIAEiAkEEaiEBIAIoAgAiA0F/cyADQYGChAhrcUGAgYKEeHFFDQALIANB/wFxRQRAIAIgAGsPCwNAIAItAAEhAyACQQFqIgEhAiADDQALCyABIABrC2EBAX8jAEEQayICIAA2AgggAiABNwMAAkAgAikDACACKAIIKQMIVgRAIAIoAghBADoAACACQX82AgwMAQsgAigCCEEBOgAAIAIoAgggAikDADcDECACQQA2AgwLIAIoAgwL7wEBAX8jAEEgayICJAAgAiAANgIYIAIgATcDECACIAIoAhhCCBAeNgIMAkAgAigCDEUEQCACQX82AhwMAQsgAigCDCACKQMQQv8BgzwAACACKAIMIAIpAxBCCIhC/wGDPAABIAIoAgwgAikDEEIQiEL/AYM8AAIgAigCDCACKQMQQhiIQv8BgzwAAyACKAIMIAIpAxBCIIhC/wGDPAAEIAIoAgwgAikDEEIoiEL/AYM8AAUgAigCDCACKQMQQjCIQv8BgzwABiACKAIMIAIpAxBCOIhC/wGDPAAHIAJBADYCHAsgAigCHBogAkEgaiQAC4cDAQF/IwBBMGsiAyQAIAMgADYCJCADIAE2AiAgAyACNwMYAkAgAygCJC0AKEEBcQRAIANCfzcDKAwBCwJAAkAgAygCJCgCIEUNACADKQMYQv///////////wBWDQAgAykDGFANASADKAIgDQELIAMoAiRBDGpBEkEAEBQgA0J/NwMoDAELIAMoAiQtADVBAXEEQCADQn83AygMAQsCfyMAQRBrIgAgAygCJDYCDCAAKAIMLQA0QQFxCwRAIANCADcDKAwBCyADKQMYUARAIANCADcDKAwBCyADQgA3AxADQCADKQMQIAMpAxhUBEAgAyADKAIkIAMoAiAgAykDEKdqIAMpAxggAykDEH1BARAhIgI3AwggAkIAUwRAIAMoAiRBAToANSADKQMQUARAIANCfzcDKAwECyADIAMpAxA3AygMAwsgAykDCFAEQCADKAIkQQE6ADQFIAMgAykDCCADKQMQfDcDEAwCCwsLIAMgAykDEDcDKAsgAykDKCECIANBMGokACACCzYBAX8jAEEQayIBIAA2AgwCfiABKAIMLQAAQQFxBEAgASgCDCkDCCABKAIMKQMQfQwBC0IACwuyAQIBfwF+IwBBEGsiASQAIAEgADYCBCABIAEoAgRC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AkEBNgIQIAJBADYCCANAAkAgAigCCCACKAIYLwEETw0AAkAgAigCDCACKAIIai0AAEEfSwRAIAIoAgwgAigCCGotAABBgAFJDQELIAIoAgwgAigCCGotAABBDUYNACACKAIMIAIoAghqLQAAQQpGDQAgAigCDCACKAIIai0AAEEJRgRADAELIAJBAzYCEAJAIAIoAgwgAigCCGotAABB4AFxQcABRgRAIAJBATYCAAwBCwJAIAIoAgwgAigCCGotAABB8AFxQeABRgRAIAJBAjYCAAwBCwJAIAIoAgwgAigCCGotAABB+AFxQfABRgRAIAJBAzYCAAwBCyACQQQ2AhAMBAsLCyACKAIYLwEEIAIoAgggAigCAGpNBEAgAkEENgIQDAILIAJBATYCBANAIAIoAgQgAigCAE0EQCACKAIMIAIoAgggAigCBGpqLQAAQcABcUGAAUcEQCACQQQ2AhAMBgUgAiACKAIEQQFqNgIEDAILAAsLIAIgAigCACACKAIIajYCCAsgAiACKAIIQQFqNgIIDAELCwsgAigCGCACKAIQNgIIIAIoAhQEQAJAIAIoAhRBAkcNACACKAIQQQNHDQAgAkECNgIQIAIoAhhBAjYCCAsCQCACKAIUIAIoAhBGDQAgAigCEEEBRg0AIAJBBTYCHAwCCwsgAiACKAIQNgIcCyACKAIcC2oBAX8jAEEQayIBIAA2AgwgASgCDEIANwMAIAEoAgxBADYCCCABKAIMQn83AxAgASgCDEEANgIsIAEoAgxBfzYCKCABKAIMQgA3AxggASgCDEIANwMgIAEoAgxBADsBMCABKAIMQQA7ATILUgECf0GQlwEoAgAiASAAQQNqQXxxIgJqIQACQCACQQAgACABTRsNACAAPwBBEHRLBEAgABATRQ0BC0GQlwEgADYCACABDwtBtJsBQTA2AgBBfwuNBQEDfyMAQRBrIgEkACABIAA2AgwgASgCDARAIAEoAgwoAgAEQCABKAIMKAIAEDEaIAEoAgwoAgAQGwsgASgCDCgCHBAVIAEoAgwoAiAQJSABKAIMKAIkECUgASgCDCgCUCECIwBBEGsiACQAIAAgAjYCDCAAKAIMBEAgACgCDCgCEARAIABBADYCCANAIAAoAgggACgCDCgCAEkEQCAAKAIMKAIQIAAoAghBAnRqKAIABEAgACgCDCgC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A3EQHwsgAygCpAEoAhQgA0GeAWogA0GcAWoQgQEgAygCTCADLwGeARAfIAMoAkwgAy8BnAEQHwJAAkAgAy0AhQFBAXFFDQAgAygCpAEpAyhCFFoNACADKAJMQQAQIAwBCyADKAJMIAMoAqQBKAIYECALAkACQCADKAKgAUGAAnFBgAJHDQAgAygCpAEpAyBC/////w9UBEAgAygCpAEpAyhC/////w9UDQELIAMoAkxBfxAgIAMoAkxBfxAgDAELAkAgAygCpAEpAyBC/////w9UBEAgAygCTCADKAKkASkDIKcQIAwBCyADKAJMQX8QIAsCQCADKAKkASkDKEL/////D1QEQCADKAJMIAMoAqQBKQMopxAgDAELIAMoAkxBfxAgCwsgAygCTCADKAKkASgCMBBTQf//A3EQHyADIAMoAqQBKAI0IAMoAqABEIYBQf//A3EgAygCkAFBgAYQhgFB//8DcWo2AogBIAMoAkwgAygCiAFB//8DcRAfIAMoAqABQYACcUUEQCADKAJMIAMoAqQBKAI4EFNB//8DcRAfIAMoAkwgAygCpAEoAjxB//8DcRAfIAMoAkwgAygCpAEvAUAQHyADKAJMIAMoAqQBKAJEECACQCADKAKkASkDSEL/////D1QEQCADKAJMIAMoAqQBKQNIpxAgDAELIAMoAkxBfxAgCwsCfyMAQRBrIgAgAygCTDYCDCAAKAIMLQAAQQFxRQsEQCADKAKoAUEIakEUQQAQFCADKAJMEBYgAygCkAEQIyADQX82AqwBDAELIAMoAqgBIANB0ABqAn4jAEEQayIAIAMoAkw2AgwCfiAAKAIMLQAAQQFxBEAgACgCDCkDEAwBC0IACwsQNUEASARAIAMoAkwQFiADKAKQARAjIANBfzYCrAEMAQsgAygCTBAWIAMoAqQBKAIwBEAgAygCqAEgAygCpAEoAjAQigFBAEgEQCADKAKQARAjIANBfzYCrAEMAgsLIAMoApABBEAgAygCqAEgAygCkAFBgAYQhQFBAEgEQCADKAKQARAjIANBfzYCrAEMAgsLIAMoApABECMgAygCpAEoAjQEQCADKAKoASADKAKkASgCNCADKAKgARCFAUEASARAIANBfzYCrAEMAgsLIAMoAqABQYACcUUEQCADKAKkASgCOARAIAMoAqgBIAMoAqQBKAI4EIoB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HCAAIAAoAhRBAWo2AhQMAQsLIAAoAggQR0EBcUUEQCAAKAIgQRRBABAUIAAoAggQFiAAQX82AiwMAQsgACgCCBAWIAAgACgCHDYCLAsgACgCLCECIABBMGokACADIAIiADYCBCAAQQBIBEAgA0IANwMoDAELIAMpAwggAygCBK18Qv///////////wBWBEAgAygCFEEEQRYQFCADQgA3AygMAQsgAyADKQMIIAMoAgStfDcDKAsgAykDKCEBIANBMGokACABC20BAX8jAEEgayIEJAAgBCAANgIYIAQgATYCFCAEIAI2AhAgBCADNgIMAkAgBCgCGEUEQCAEQQA2AhwMAQsgBCAEKAIUIAQoAhAgBCgCDCAEKAIYQQhqEJIBNgIcCyAEKAIcIQAgBEEgaiQAIAALVQEBfyMAQRBrIgEkACABIAA2AgwCQAJAIAEoAgwoAiRBAUYNACABKAIMKAIkQQJGDQAMAQsgASgCDEEAQgBBChAhGiABKAIMQQA2AiQLIAFBEGokAAumAQEBfyMAQRBrIgIkACACIAA2AgggAiABNgIEAkAgAigCCC0AKEEBcQRAIAJBfzYCDAwBCyACKAIIKAIABEAgAigCCCgCACACKAIEEGhBAEgEQCACKAIIQQxqIAIoAggoAgAQFyACQX82AgwMAgsLIAIoAgggAkEEakIEQRMQIUIAUwRAIAJBfzYCDAwBCyACQQA2AgwLIAIoAgwhACACQRBqJAAgAAuNCAIBfwF+IwBBkAFrIgMkACADIAA2AoQBIAMgATYCgAEgAyACNgJ8IAMQTwJAIAMoAoABKQMIQgBSBEAgAyADKAKAASgCACgCACkDSDcDYCADIAMoAoABKAIAKAIAKQNINwNoDAELIANCADcDYCADQgA3A2gLIANCADcDcAJAA0AgAykDcCADKAKAASkDCFQEQCADKAKAASgCACADKQNwp0EEdGooAgApA0ggAykDaFQEQCADIAMoAoABKAIAIAMpA3CnQQR0aigCACkDSDcDaAsgAykDaCADKAKAASkDIFYEQCADKAJ8QRNBABAUIANCfzcDiAEMAwsgAyADKAKAASgCACADKQNwp0EEdGooAgApA0ggAygCgAEoAgAgAykDcKdBBHRqKAIAKQMgfCADKAKAASgCACADKQNwp0EEdGooAgAoAjAQU0H//wNxrXxC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DEECdGooAgBBAnRqLwEASA0AAkAgAygCGCADKAIQQQJ0ai8BACADKAIYIAMoAhxB3BZqIAMoAgxBAnRqKAIAQQJ0ai8BAEcNACADKAIQIAMoAhxB2Chqai0AACADKAIcQdwWaiADKAIMQQJ0aigCACADKAIcQdgoamotAABKDQAMAQsgAygCHEHcFmogAygCFEECdGogAygCHEHcFmogAygCDEECdGooAgA2AgAgAyADKAIMNgIUIAMgAygCDEEBdDYCDAwBCwsgAygCHEHcFmogAygCFEECdGogAygCEDYCAAvXEwEDfyMAQTBrIgIkACACIAA2AiwgAiABNgIoIAIgAigCKCgCADYCJCACIAIoAigoAggoAgA2AiAgAiACKAIoKAIIKAIMNgIcIAJBfzYCECACKAIsQQA2AtAoIAIoAixBvQQ2AtQoIAJBADYCGANAIAIoAhggAigCHEgEQAJAIAIoAiQgAigCGEECdGovAQAEQCACIAIoAhgiATYCECACKAIsQdwWaiEDIAIoAiwiBCgC0ChBAWohACAEIAA2AtAoIABBAnQgA2ogATYCACACKAIYIAIoAixB2ChqakEAOgAADAELIAIoAiQgAigCGEECdGpBADsBAgsgAiACKAIYQQFqNgIYDAELCwNAIAIoAiwoAtAoQQJIBEACQCACKAIQQQJIBEAgAiACKAIQQQFqIgA2AhAMAQtBACEACyACKAIsQdwWaiEDIAIoAiwiBCgC0ChBAWohASAEIAE2AtAoIAFBAnQgA2ogADYCACACIAA2AgwgAigCJCACKAIMQQJ0akEBOwEAIAIoAgwgAigCLEHYKGpqQQA6AAAgAigCLCIAIAAoAqgtQQFrNgKoLSACKAIgBEAgAigCLCIAIAAoAqwtIAIoAiAgAigCDEECdGovAQJrNgKsLQsMAQsLIAIoAiggAigCEDYCBCACIAIoAiwoAtAoQQJtNgIYA0AgAigCGEEBTgRAIAIoAiwgAigCJCACKAIYEHogAiACKAIYQQFrNgIYDAELCyACIAIoAhw2AgwDQCACIAIoAiwoAuAWNgIYIAIoAixB3BZqIQEgAigCLCIDKALQKCEAIAMgAEEBazYC0CggAigCLCAAQQJ0IAFqKAIANgLgFiACKAIsIAIoAiRBARB6IAIgAigCLCgC4BY2AhQgAigCGCEBIAIoAixB3BZqIQMgAigCLCIEKALUKEEBayEAIAQgADYC1CggAEECdCADaiABNgIAIAIoAhQhASACKAIsQdwWaiEDIAIoAiwiBCgC1ChBAWshACAEIAA2AtQoIABBAnQgA2ogATYCACACKAIkIAIoAgxBAnRqIAIoAiQgAigCGEECdGovAQAgAigCJCACKAIUQQJ0ai8BAGo7AQAgAigCDCACKAIsQdgoamoCfyACKAIYIAIoAixB2Chqai0AACACKAIUIAIoAixB2Chqai0AAE4EQCACKAIYIAIoAixB2Chqai0AAAwBCyACKAIUIAIoAixB2Chqai0AAAtBAWo6AAAgAigCJCACKAIUQQJ0aiACKAIMIgA7AQIgAigCJCACKAIYQQJ0aiAAOwECIAIgAigCDCIAQQFqNgIMIAIoAiwgADYC4BYgAigCLCACKAIkQQEQeiACKAIsKALQKEECTg0ACyACKAIsKALgFiEBIAIoAixB3BZqIQMgAigCLCIEKALUKEEBayEAIAQgADYC1CggAEECdCADaiABNgIAIAIoAighASMAQUBqIgAgAigCLDYCPCAAIAE2AjggACAAKAI4KAIANgI0IAAgACgCOCgCBDYCMCAAIAAoAjgoAggoAgA2AiwgACAAKAI4KAIIKAIENgIoIAAgACgCOCgCCCgCCDYCJCAAIAAoAjgoAggoAhA2AiAgAEEANgIEIABBADYCEANAIAAoAhBBD0wEQCAAKAI8QbwWaiAAKAIQQQF0akEAOwEAIAAgACgCEEEBajYCEAwBCwsgACgCNCAAKAI8QdwWaiAAKAI8KALUKEECdGooAgBBAnRqQQA7AQIgACAAKAI8KALUKEEBajYCHANAIAAoAhxBvQRIBEAgACAAKAI8QdwWaiAAKAIcQQJ0aigCADYCGCAAIAAoAjQgACgCNCAAKAIYQQJ0ai8BAkECdGovAQJBAWo2AhAgACgCECAAKAIgSgRAIAAgACgCIDYCECAAIAAoAgRBAWo2AgQLIAAoAjQgACgCGEECdGogACgCEDsBAiAAKAIYIAAoAjBMBEAgACgCPCAAKAIQQQF0akG8FmoiASABLwEAQQFqOwEAIABBADYCDCAAKAIYIAAoAiROBEAgACAAKAIoIAAoAhggACgCJGtBAnRqKAIANgIMCyAAIAAoAjQgACgCGEECdGovAQA7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EANAIAMpAxAgAykDCFpFBEAgAygCKCgCACADKQMQp0EEdGoQkAEgAyADKQMQQgF8NwMQDAELCyADKAIoIAMpAwgiATcDECADKAIoIAE3AwggA0EBOgAvCyADLQAvQQFxIQAgA0EwaiQAIAALzAEBAX8jAEEgayICJAAgAiAANwMQIAIgATYCDCACQTAQGCIBNgIIAkAgAUUEQCACKAIMQQ5BABAUIAJBADYCHAwBCyACKAIIQQA2AgAgAigCCEIANwMQIAIoAghCADcDCCACKAIIQgA3AyAgAigCCEIANwMYIAIoAghBADYCKCACKAIIQQA6ACwgAigCCCACKQMQIAIoAgwQgwFBAXFFBEAgAigCCBAkIAJBADYCHAwBCyACIAIoAgg2AhwLIAIoAhwhASACQSBqJAAgAQvWAgEBfyMAQSBrIgMkACADIAA2AhggAyABNgIUIAMgAjYCECADIANBDGpCBBApNgIIAkAgAygCCEUEQCADQX82AhwMAQsDQCADKAIUBEAgAygCFCgCBCADKAIQcUGABnEEQCADKAIIQgAQLBogAygCCCADKAIULwEIEB8gAygCCCADKAIULwEKEB8CfyMAQRBrIgAgAygCCDYCDCAAKAIMLQAAQQFxRQsEQCADKAIYQQhqQRRBABAUIAMoAggQFiADQX82AhwMBAsgAygCGCADQQxqQgQQNUEASARAIAMoAggQFiADQX82AhwMBAsgAygCFC8BCgRAIAMoAhggAygCFCgCDCADKAIULwEKrRA1QQBIBEAgAygCCBAWIANBfzYCHAwFCwsLIAMgAygCFCgCADYCFAwBCwsgAygCCBAWIANBADYCHAsgAygCHCEAIANBIGokACAAC2gBAX8jAEEQayICIAA2AgwgAiABNgIIIAJBADsBBgNAIAIoAgwEQCACKAIMKAIEIAIoAghxQYAGcQRAIAIgAigCDC8BCiACLwEGQQRqajsBBgsgAiACKAIMKAIANgIMDAELCyACLwEGC/ABAQF/IwBBEGsiASQAIAEgADYCDCABIAEoAgw2AgggAUEANgIEA0AgASgCDARAAkACQCABKAIMLwEIQfXGAUYNACABKAIMLwEIQfXgAUYNACABKAIMLwEIQYGyAkYNACABKAIMLwEIQQFHDQELIAEgASgCDCgCADYCACABKAIIIAEoAgxGBEAgASABKAIANgIICyABKAIMQQA2AgAgASgCDBAjIAEoAgQEQCABKAIEIAEoAgA2AgALIAEgASgCADYCDAwCCyABIAEoAgw2AgQgASABKAIMKAIANgIMDAELCyABKAIIIQAgAUEQaiQAIAALswQBAX8jAEFAaiIFJAAgBSAANgI4IAUgATsBNiAFIAI2AjAgBSADNgIsIAUgBDYCKCAFIAUoAjggBS8BNq0QKSIANgIkAkAgAEUEQCAFKAIoQQ5BABAUIAVBADoAPwwBCyAFQQA2AiAgBUEANgIYA0ACfyMAQRBrIgAgBSgCJDYCDCAAKAIMLQAAQQFxCwR/IAUoAiQQL0IEWgVBAAtBAXEEQCAFIAUoAiQQHTsBFiAFIAUoAiQQHTsBFCAFIAUoAiQgBS8BFK0QHjYCECAFKAIQRQRAIAUoAihBFUEAEBQgBSgCJBAWIAUoAhgQIyAFQQA6AD8MAwsgBSAFLwEWIAUvARQgBSgCECAFKAIwEFEiADYCHCAARQRAIAUoAihBDkEAEBQgBSgCJBAWIAUoAhgQIyAFQQA6AD8MAwsCQCAFKAIYBEAgBSgCICAFKAIcNgIAIAUgBSgCHDYCIAwBCyAFIAUoAhwiADYCICAFIAA2AhgLDAELCyAFKAIkEEdBAXFFBEAgBSAFKAIkEC8+AgwgBSAFKAIkIAUoAgytEB42AggCQAJAIAUoAgxBBE8NACAFKAIIRQ0AIAUoAghBktkAIAUoAgwQVEUNAQsgBSgCKEEVQQAQFCAFKAIkEBYgBSgCGBAjIAVBADoAPwwCCwsgBSgCJBAWAkAgBSgCLARAIAUoAiwgBSgCGDYCAAwBCyAFKAIYECMLIAVBAToAPwsgBS0AP0EBcSEAIAVBQGskACAAC+8CAQF/IwBBIGsiAiQAIAIgADYCGCACIAE2AhQCQCACKAIYRQRAIAIgAigCFDYCHAwBCyACIAIoAhg2AggDQCACKAIIKAIABEAgAiACKAIIKAIANgIIDAELCwNAIAIoAhQEQCACIAIoAhQoAgA2AhAgAkEANgIEIAIgAigCGDYCDANAAkAgAigCDEUNAAJAIAIoAgwvAQggAigCFC8BCEcNACACKAIMLwEKIAIoAhQvAQpHDQAgAigCDC8BCgRAIAIoAgwoAgwgAigCFCgCDCACKAIMLwEKEFQNAQsgAigCDCIAIAAoAgQgAigCFCgCBEGABnFyNgIEIAJBATYCBAwBCyACIAIoAgwoAgA2AgwMAQsLIAIoAhRBADYCAAJAIAIoAgQEQCACKAIUECMMAQsgAigCCCACKAIUIgA2AgAgAiAANgIICyACIAIoAhA2AhQMAQsLIAIgAigCGDYCHAsgAigCHCEAIAJBIGokACAAC10BAX8jAEEQayICJAAgAiAANgIIIAIgATYCBAJAIAIoAgRFBEAgAkEANgIMDAELIAIgAigCCCACKAIEKAIAIAIoAgQvAQStEDU2AgwLIAIoAgwhACACQRBqJAAgAAuPAQEBfyMAQRBrIgIkACACIAA2AgggAiABNgIEAkACQCACKAIIBEAgAigCBA0BCyACIAIoAgggAigCBEY2AgwMAQsgAigCCC8BBCACKAIELwEERwRAIAJBADYCDAwBCyACIAIoAggoAgAgAigCBCgCACACKAIILwEEEFRFNgIMCyACKAIMIQAgAkEQaiQAIAALVQEBfyMAQRBrIgEkACABIAA2AgwgAUEAQQBBABAaNgIIIAEoAgwEQCABIAEoAgggASgCDCgCACABKAIMLwEEEBo2AggLIAEoAgghACABQRBqJAAgAAugAQEBfyMAQSBrIgUkACAFIAA2AhggBSABNgIUIAUgAjsBEiAFIAM6ABEgBSAENgIMIAUgBSgCGCAFKAIUIAUvARIgBS0AEUEBcSAFKAIMEGAiADYCCAJAIABFBEAgBUEANgIcDAELIAUgBSgCCCAFLwESQQAgBSgCDBBSNgIEIAUoAggQFSAFIAUoAgQ2AhwLIAUoAhwhACAFQSBqJAAgAAtfAQF/IwBBEGsiAiQAIAIgADYCCCACIAE6AAcgAiACKAIIQgEQHjYCAAJAIAIoAgBFBEAgAkF/NgIMDAELIAIoAgAgAi0ABzoAACACQQA2AgwLIAIoAgwaIAJBEGokAAtUAQF/IwBBEGsiASQAIAEgADYCCCABIAEoAghCARAeNgIEAkAgASgCBEUEQCABQQA6AA8MAQsgASABKAIELQAAOgAPCyABLQAPIQAgAUEQaiQAIAALOAEBfyMAQRBrIgEgADYCDCABKAIMQQA2AgAgASgCDEEANgIEIAEoAgxBADYCCCABKAIMQQA6AAwLnwIBAX8jAEFAaiIFJAAgBSAANwMwIAUgATcDKCAFIAI2AiQgBSADNwMYIAUgBDYCFCAFAn8gBSkDGEIQVARAIAUoAhRBEkEAEBRBAAwBCyAFKAIkCzYCBAJAIAUoAgRFBEAgBUJ/NwM4DAELAkACQAJAAkACQCAFKAIEKAIIDgMCAAEDCyAFIAUpAzAgBSgCBCkDAHw3AwgMAwsgBSAFKQMoIAUoAgQpAwB8NwMIDAILIAUgBSgCBCkDADcDCAwBCyAFKAIUQRJBABAUIAVCfzcDOAwBCwJAIAUpAwhCAFkEQCAFKQMIIAUpAyhYDQELIAUoAhRBEkEAEBQgBUJ/NwM4DAELIAUgBSkDCDcDOAsgBSkDOCEAIAVBQGskACAAC+oBAgF/AX4jAEEgayIEJAAgBCAANgIYIAQgATYCFCAEIAI2AhAgBCADNgIMIAQgBCgCDBCTASIANgIIAkAgAEUEQCAEQQA2AhwMAQsjAEEQayIAIAQoAhg2AgwgACgCDCIAIAAoAjBBAWo2AjAgBCgCCCAEKAIYNgIAIAQoAgggBCgCFDYCBCAEKAIIIAQoAhA2AgggBCgCGCAEKAIQQQBCAEEOIAQoAhQRCgAhBSAEKAIIIAU3AxggBCgCCCkDGEIAUwRAIAQoAghCPzcDGAsgBCAEKAIINgIcCyAEKAIcIQAgBEEgaiQAIAAL6gEBAX8jAEEQayIBJAAgASAANgIIIAFBOBAYIgA2AgQCQCAARQRAIAEoAghBDkEAEBQgAUEANgIMDAELIAEoAgRBADYCACABKAIEQQA2AgQgASgCBEEANgIIIAEoAgRBADYCICABKAIEQQA2AiQgASgCBEEAOgAoIAEoAgRBADYCLCABKAIEQQE2AjAjAEEQayIAIAEoAgRBDGo2AgwgACgCDEEANgIAIAAoAgxBADYCBCAAKAIMQQA2AgggASgCBEEAOgA0IAEoAgRBADoANSABIAEoAgQ2AgwLIAEoAgwhACABQRBqJAAgAAuwAQIBfwF+IwBBIGsiAyQAIAMgADYCGCADIAE2AhQgAyACNgIQIAMgAygCEBCTASIANgIMAkAgAEUEQCADQQA2AhwMAQsgAygCDCADKAIYNgIEIAMoAgwgAygCFDYCCCADKAIUQQBCAEEOIAMoAhgRDgAhBCADKAIMIAQ3AxggAygCDCkDGEIAUwRAIAMoAgxCPzcDGAsgAyADKAIMNgIcCyADKAIcIQAgA0EgaiQAIAALwwIBAX8jAEEQayIDIAA2AgwgAyABNgIIIAMgAjYCBCADKAIIKQMAQgKDQgBSBEAgAygCDCADKAIIKQMQNwMQCyADKAIIKQMAQgSDQgBSBEAgAygCDCADKAIIKQMYNwMYCyADKAIIKQMAQgiDQgBSBEAgAygCDCADKAIIKQMgNwMgCyADKAIIKQMAQhCDQgBSBEAgAygCDCADKAIIKAIoNgIoCyADKAIIKQMAQiCDQgBSBEAgAygCDCADKAIIKAIsNgIsCyADKAIIKQMAQsAAg0IAUgRAIAMoAgwgAygCCC8BMDsBMAsgAygCCCkDAEKAAYNCAFIEQCADKAIMIAMoAggvATI7ATILIAMoAggpAwBCgAKDQgBSBEAgAygCDCADKAIIKAI0NgI0CyADKAIMIgAgAygCCCkDACAAKQMAhDcDAEEAC1oBAX8jAEEQayIBIAA2AggCQAJAIAEoAggoAgBBAE4EQCABKAIIKAIAQYAUKAIASA0BCyABQQA2AgwMAQsgASABKAIIKAIAQQJ0QZAUaigCADYCDAsgASgCDAumAQEBfyMAQSBrIgUkACAFIAA2AhggBSABNwMQIAUgAjYCDCAFIAM2AgggBSAENgIEIAUgBSgCGCAFKQMQIAUoAgxBABBFIgA2AgACQCAARQRAIAVBfzYCHAwBCyAFKAIIBEAgBSgCCCAFKAIALwEIQQh2OgAACyAFKAIEBEAgBSgCBCAFKAIAKAJENgIACyAFQQA2AhwLIAUoAhwhACAFQSBqJAAgAAucBgECfyMAQSBrIgIkACACIAA2AhggAiABNwMQAkAgAikDECACKAIYKQMwWgRAIAIoAhhBCGpBEkEAEBQgAkF/NgIcDAELIAIoAhgoAhhBAnEEQCACKAIYQQhqQRlBABAUIAJBfzYCHAwBCyACIAIoAhggAikDEEEAIAIoAhhBCGoQTiIANgIMIABFBEAgAkF/NgIcDAELIAIoAhgoAlAgAigCDCACKAIYQQhqEFhBAXFFBEAgAkF/NgIcDAELAn8gAigCGCEDIAIpAxAhASMAQTBrIgAkACAAIAM2AiggACABNwMgIABBATYCHAJAIAApAyAgACgCKCkDMFoEQCAAKAIoQQhqQRJBABAUIABBfzYCLAwBCwJAIAAoAhwNACAAKAIoKAJAIAApAyCnQQR0aigCBEUNACAAKAIoKAJAIAApAyCnQQR0aigCBCgCAEECcUUNAAJAIAAoAigoAkAgACkDIKdBBHRqKAIABEAgACAAKAIoIAApAyBBCCAAKAIoQQhqEE4iAzYCDCADRQRAIABBfzYCLAwECyAAIAAoAiggACgCDEEAQQAQVzcDEAJAIAApAxBCAFMNACAAKQMQIAApAyBRDQAgACgCKEEIakEKQQAQFCAAQX82AiwMBAsMAQsgAEEANgIMCyAAIAAoAiggACkDIEEAIAAoAihBCGoQTiIDNgIIIANFBEAgAEF/NgIsDAILIAAoAgwEQCAAKAIoKAJQIAAoAgwgACkDIEEAIAAoAihBCGoQdUEBcUUEQCAAQX82AiwMAwsLIAAoAigoAlAgACgCCCAAKAIoQQhqEFhBAXFFBEAgACgCKCgCUCAAKAIMQQAQWBogAEF/NgIsDAILCyAAKAIoKAJAIAApAyCnQQR0aigCBBA5IAAoAigoAkAgACkDIKdBBHRqQQA2AgQgACgCKCgCQCAAKQMgp0EEdGoQYyAAQQA2AiwLIAAoAiwhAyAAQTBqJAAgAwsEQCACQX82AhwMAQsgAigCGCgCQCACKQMQp0EEdGpBAToADCACQQA2AhwLIAIoAhwhACACQSBqJAAgAAulBAEBfyMAQTBrIgUkACAFIAA2AiggBSABNwMgIAUgAjYCHCAFIAM6ABsgBSAENgIUAkAgBSgCKCAFKQMgQQBBABBFRQRAIAVBfzYCLAwBCyAFKAIoKAIYQQJxBEAgBSgCKEEIakEZQQAQFCAFQX82AiwMAQsgBSAFKAIoKAJAIAUpAyCnQQR0ajYCECAFAn8gBSgCECgCAARAIAUoAhAoAgAvAQhBCHYMAQtBAws6AAsgBQJ/IAUoAhAoAgAEQCAFKAIQKAIAKAJEDAELQYCA2I14CzYCBEEBIQAgBSAFLQAbIAUtAAtGBH8gBSgCFCAFKAIERwVBAQtBAXE2AgwCQCAFKAIMBEAgBSgCECgCBEUEQCAFKAIQKAIAED8hACAFKAIQIAA2AgQgAEUEQCAFKAIoQQhqQQ5BABAUIAVBfzYCLAwECwsgBSgCECgCBCAFKAIQKAIELwEIQf8BcSAFLQAbQQh0cjsBCCAFKAIQKAIEIAUoAhQ2AkQgBSgCECgCBCIAIAAoAgBBEHI2AgAMAQsgBSgCECgCBARAIAUoAhAoAgQiACAAKAIAQW9xNgIAAkAgBSgCECgCBCgCAEUEQCAFKAIQKAIEEDkgBSgCEEEANgIEDAELIAUoAhAoAgQgBSgCECgCBC8BCEH/AXEgBS0AC0EIdHI7AQggBSgCECgCBCAFKAIENgJECwsLIAVBADYCLAsgBSgCLCEAIAVBMGokACAAC90PAgF/AX4jAEFAaiIEJAAgBCAANgI0IARCfzcDKCAEIAE2AiQgBCACNgIgIAQgAzYCHAJAIAQoAjQoAhhBAnEEQCAEKAI0QQhqQRlBABAUIARCfzcDOAwBCyAEIAQoAjQpAzA3AxAgBCkDKEJ/UQRAIARCfzcDCCAEKAIcQYDAAHEEQCAEIAQoAjQgBCgCJCAEKAIcQQAQVzcDCAsgBCkDCEJ/UQRAIAQoAjQhASMAQUBqIgAkACAAIAE2AjQCQCAAKAI0KQM4IAAoAjQpAzBCAXxYBEAgACAAKAI0KQM4NwMYIAAgACkDGEIBhjcDEAJAIAApAxBCEFQEQCAAQhA3AxAMAQsgACkDEEKACFYEQCAAQoAINwMQCwsgACAAKQMQIAApAxh8NwMYIAAgACkDGKdBBHStNwMIIAApAwggACgCNCkDOKdBBHStVARAIAAoAjRBCGpBDkEAEBQgAEJ/NwM4DAILIAAgACgCNCgCQCAAKQMYp0EEdBBINgIkIAAoAiRFBEAgACgCNEEIakEOQQAQFCAAQn83AzgMAgsgACgCNCAAKAIkNgJAIAAoAjQgACkDGDcDOAsgACgCNCIBKQMwIQUgASAFQgF8NwMwIAAgBTcDKCAAKAI0KAJAIAApAyinQQR0ahCQASAAIAApAyg3AzgLIAApAzghBSAAQUBrJAAgBCAFNwMIIAVCAFMEQCAEQn83AzgMAwsLIAQgBCkDCDcDKAsCQCAEKAIkRQ0AIAQoAjQhASAEKQMoIQUgBCgCJCECIAQoAhwhAyMAQUBqIgAkACAAIAE2AjggACAFNwMwIAAgAjYCLCAAIAM2AigCQCAAKQMwIAAoAjgpAzBaBEAgACgCOEEIakESQQAQFCAAQX82AjwMAQsgACgCOCgCGEECcQRAIAAoAjhBCGpBGUEAEBQgAEF/NgI8DAELAkACQCAAKAIsRQ0AIAAoAiwsAABFDQAgACAAKAIsIAAoAiwQK0H//wNxIAAoAiggACgCOEEIahBSIgE2AiAgAUUEQCAAQX82AjwMAwsCQCAAKAIoQYAwcQ0AIAAoAiBBABA6QQNHDQAgACgCIEECNgIICwwBCyAAQQA2AiALIAAgACgCOCAAKAIsQQBBABBXIgU3AxACQCAFQgBTDQAgACkDECAAKQMwUQ0AIAAoAiAQJSAAKAI4QQhqQQpBABAUIABBfzYCPAwBCwJAIAApAxBCAFMNACAAKQMQIAApAzBSDQAgACgCIBAlIABBADYCPAwBCyAAIAAoAjgoAkAgACkDMKdBBHRqNgIkAkAgACgCJCgCAARAIAAgACgCJCgCACgCMCAAKAIgEIsBQQBHOgAfDAELIABBADoAHwsCQCAALQAfQQFxDQAgACgCJCgCBA0AIAAoAiQoAgAQPyEBIAAoAiQgATYCBCABRQRAIAAoAjhBCGpBDkEAEBQgACgCIBAlIABBfzYCPAwCCwsgAAJ/IAAtAB9BAXEEQCAAKAIkKAIAKAIwDAELIAAoAiALQQBBACAAKAI4QQhqEEYiATYCCCABRQRAIAAoAiAQJSAAQX82AjwMAQsCQCAAKAIkKAIEBEAgACAAKAIkKAIEKAIwNgIEDAELAkAgACgCJCgCAARAIAAgACgCJCgCACgCMDYCBAwBCyAAQQA2AgQLCwJAIAAoAgQEQCAAIAAoAgRBAEEAIAAoAjhBCGoQRiIBNgIMIAFFBEAgACgCIBAlIABBfzYCPAwDCwwBCyAAQQA2AgwLIAAoAjgoAlAgACgCCCAAKQMwQQAgACgCOEEIahB1QQFxRQRAIAAoAiAQJSAAQX82AjwMAQsgACgCDARAIAAoAjgoAlAgACgCDEEAEFgaCwJAIAAtAB9BAXEEQCAAKAIkKAIEBEAgACgCJCgCBCgCAEECcQRAIAAoAiQoAgQoAjAQJSAAKAIkKAIEIgEgASgCAEF9cTYCAAJAIAAoAiQoAgQoAgBFBEAgACgCJCgCBBA5IAAoAiRBADYCBAwBCyAAKAIkKAIEIAAoAiQoAgAoAjA2AjALCwsgACgCIBAlDAELIAAoAiQoAgQoAgBBAnEEQCAAKAIkKAIEKAIwECULIAAoAiQoAgQiASABKAIAQQJyNgIAIAAoAiQoAgQgACgCIDYCMAsgAEEANgI8CyAAKAI8IQEgAEFAayQAIAFFDQAgBCgCNCkDMCAEKQMQUgRAIAQoAjQoAkAgBCkDKKdBBHRqEGIgBCgCNCAEKQMQNwMwCyAEQn83AzgMAQsgBCgCNCgCQCAEKQMop0EEdGoQYwJAIAQoAjQoAkAgBCkDKKdBBHRqKAIARQ0AIAQoAjQoAkAgBCkDKKdBBHRqKAIEBEAgBCgCNCgCQCAEKQMop0EEdGooAgQoAgBBAXENAQsgBCgCNCgCQCAEKQMop0EEdGooAgRFBEAgBCgCNCgCQCAEKQMop0EEdGooAgAQPyEAIAQoAjQoAkAgBCkDKKdBBHRqIAA2AgQgAEUEQCAEKAI0QQhqQQ5BABAUIARCfzcDOAwDCwsgBCgCNCgCQCAEKQMop0EEdGooAgRBfjYCECAEKAI0KAJAIAQpAyinQQR0aigCBCIAIAAoAgBBAXI2AgALIAQoAjQoAkAgBCkDKKdBBHRqIAQoAiA2AgggBCAEKQMoNwM4CyAEKQM4IQUgBEFAayQAIAULqgEBAX8jAEEwayICJAAgAiAANgIoIAIgATcDICACQQA2AhwCQAJAIAIoAigoAiRBAUYEQCACKAIcRQ0BIAIoAhxBAUYNASACKAIcQQJGDQELIAIoAihBDGpBEkEAEBQgAkF/NgIsDAELIAIgAikDIDcDCCACIAIoAhw2AhAgAkF/QQAgAigCKCACQQhqQhBBDBAhQgBTGzYCLAsgAigCLCEAIAJBMGokACAAC6UyAwZ/AX4BfCMAQeAAayIEJAAgBCAANgJYIAQgATYCVCAEIAI2AlACQAJAIAQoAlRBAE4EQCAEKAJYDQELIAQoAlBBEkEAEBQgBEEANgJcDAELIAQgBCgCVDYCTCMAQRBrIgAgBCgCWDYCDCAEIAAoAgwpAxg3A0BB4JoBKQMAQn9RBEAgBEF/NgIUIARBAzYCECAEQQc2AgwgBEEGNgIIIARBAjYCBCAEQQE2AgBB4JoBQQAgBBA2NwMAIARBfzYCNCAEQQ82AjAgBEENNgIsIARBDDYCKCAEQQo2AiQgBEEJNgIgQeiaAUEIIARBIGoQNjcDAAtB4JoBKQMAIAQpA0BB4JoBKQMAg1IEQCAEKAJQQRxBABAUIARBADYCXAwBC0HomgEpAwAgBCkDQEHomgEpAwCDUgRAIAQgBCgCTEEQcjYCTAsgBCgCTEEYcUEYRgRAIAQoAlBBGUEAEBQgBEEANgJcDAELIAQoAlghASAEKAJQIQIjAEHQAGsiACQAIAAgATYCSCAAIAI2AkQgAEEIahA7AkAgACgCSCAAQQhqEDgEQCMAQRBrIgEgACgCSDYCDCAAIAEoAgxBDGo2AgQjAEEQayIBIAAoAgQ2AgwCQCABKAIMKAIAQQVHDQAjAEEQayIBIAAoAgQ2AgwgASgCDCgCBEEsRw0AIABBADYCTAwCCyAAKAJEIAAoAgQQQyAAQX82AkwMAQsgAEEBNgJMCyAAKAJMIQEgAEHQAGokACAEIAE2AjwCQAJAAkAgBCgCPEEBag4CAAECCyAEQQA2AlwMAgsgBCgCTEEBcUUEQCAEKAJQQQlBABAUIARBADYCXAwCCyAEIAQoAlggBCgCTCAEKAJQEGo2AlwMAQsgBCgCTEECcQRAIAQoAlBBCkEAEBQgBEEANgJcDAELIAQoAlgQSUEASARAIAQoAlAgBCgCWBAXIARBADYCXAwBCwJAIAQoAkxBCHEEQCAEIAQoAlggBCgCTCAEKAJQEGo2AjgMAQsgBCgCWCEAIAQoAkwhASAEKAJQIQIjAEHwAGsiAyQAIAMgADYCaCADIAE2AmQgAyACNgJgIANBIGoQOwJAIAMoAmggA0EgahA4QQBIBEAgAygCYCADKAJoEBcgA0EANgJsDAELIAMpAyBCBINQBEAgAygCYEEEQYoBEBQgA0EANgJsDAELIAMgAykDODcDGCADIAMoAmggAygCZCADKAJgEGoiADYCXCAARQRAIANBADYCbAwBCwJAIAMpAxhQRQ0AIAMoAmgQngFBAXFFDQAgAyADKAJcNgJsDAELIAMoAlwhACADKQMYIQkjAEHgAGsiAiQAIAIgADYCWCACIAk3A1ACQCACKQNQQhZUBEAgAigCWEEIakETQQAQFCACQQA2AlwMAQsgAgJ+IAIpA1BCqoAEVARAIAIpA1AMAQtCqoAECzcDMCACKAJYKAIAQgAgAikDMH1BAhAnQQBIBEAjAEEQayIAIAIoAlgoAgA2AgwgAiAAKAIMQQxqNgIIAkACfyMAQRBrIgAgAigCCDYCDCAAKAIMKAIAQQRGCwRAIwBBEGsiACACKAIINgIMIAAoAgwoAgRBFkYNAQsgAigCWEEIaiACKAIIEEMgAkEANgJcDAILCyACIAIoAlgoAgAQSiIJNwM4IAlCAFMEQCACKAJYQQhqIAIoAlgoAgAQFyACQQA2AlwMAQsgAiACKAJYKAIAIAIpAzBBACACKAJYQQhqEEEiADYCDCAARQRAIAJBADYCXAwBCyACQn83AyAgAkEANgJMIAIpAzBCqoAEWgRAIAIoAgxCFBAsGgsgAkEQakETQQAQFCACIAIoAgxCABAeNgJEA0ACQCACKAJEIQEgAigCDBAvQhJ9pyEFIwBBIGsiACQAIAAgATYCGCAAIAU2AhQgAEHsEjYCECAAQQQ2AgwCQAJAIAAoAhQgACgCDE8EQCAAKAIMDQELIABBADYCHAwBCyAAIAAoAhhBAWs2AggDQAJAIAAgACgCCEEBaiAAKAIQLQAAIAAoAhggACgCCGsgACgCFCAAKAIMa2oQqwEiATYCCCABRQ0AIAAoAghBAWogACgCEEEBaiAAKAIMQQFrEFQNASAAIAAoAgg2AhwMAgsLIABBADYCHAsgACgCHCEBIABBIGokACACIAE2AkQgAUUNACACKAIMIAIoAkQCfyMAQRBrIgAgAigCDDYCDCAAKAIMKAIEC2usECwaIAIoAlghASACKAIMIQUgAikDOCEJIwBB8ABrIgAkACAAIAE2AmggACAFNgJkIAAgCTcDWCAAIAJBEGo2AlQjAEEQayIBIAAoAmQ2AgwgAAJ+IAEoAgwtAABBAXEEQCABKAIMKQMQDAELQgALNwMwAkAgACgCZBAvQhZUBEAgACgCVEETQQAQFCAAQQA2AmwMAQsgACgCZEIEEB4oAABB0JaVMEcEQCAAKAJUQRNBABAUIABBADYCbAwBCwJAAkAgACkDMEIUVA0AIwBBEGsiASAAKAJkNgIMIAEoAgwoAgQgACkDMKdqQRRrKAAAQdCWmThHDQAgACgCZCAAKQMwQhR9ECwaIAAoAmgoAgAhBSAAKAJkIQYgACkDWCEJIAAoAmgoAhQhByAAKAJUIQgjAEGwAWsiASQAIAEgBTYCqAEgASAGNgKkASABIAk3A5gBIAEgBzYClAEgASAINgKQASMAQRBrIgUgASgCpAE2AgwgAQJ+IAUoAgwtAABBAXEEQCAFKAIMKQMQDAELQgALNwMYIAEoAqQBQgQQHhogASABKAKkARAdQf//A3E2AhAgASABKAKkARAdQf//A3E2AgggASABKAKkARAwNwM4AkAgASkDOEL///////////8AVgRAIAEoApABQQRBFhAUIAFBADYCrAEMAQsgASkDOEI4fCABKQMYIAEpA5gBfFYEQCABKAKQAUEVQQAQFCABQQA2AqwBDAELAkACQCABKQM4IAEpA5gBVA0AIAEpAzhCOHwgASkDmAECfiMAQRBrIgUgASgCpAE2AgwgBSgCDCkDCAt8Vg0AIAEoAqQBIAEpAzggASkDmAF9ECwaIAFBADoAFwwBCyABKAKoASABKQM4QQAQJ0EASARAIAEoApABIAEoAqgBEBcgAUEANgKsAQwCCyABIAEoAqgBQjggAUFAayABKAKQARBBIgU2AqQBIAVFBEAgAUEANgKsAQwCCyABQQE6ABcLIAEoAqQBQgQQHigAAEHQlpkwRwRAIAEoApABQRVBABAUIAEtABdBAXEEQCABKAKkARAWCyABQQA2AqwBDAELIAEgASgCpAEQMDcDMAJAIAEoApQBQQRxRQ0AIAEpAzAgASkDOHxCDHwgASkDmAEgASkDGHxRDQAgASgCkAFBFUEAEBQgAS0AF0EBcQRAIAEoAqQBEBYLIAFBADYCrAEMAQsgASgCpAFCBBAeGiABIAEoAqQBECo2AgwgASABKAKkARAqNgIEIAEoAhBB//8DRgRAIAEgASgCDDYCEAsgASgCCEH//wNGBEAgASABKAIENgIICwJAIAEoApQBQQRxRQ0AIAEoAgggASgCBEYEQCABKAIQIAEoAgxGDQELIAEoApABQRVBABAUIAEtABdBAXEEQCABKAKkARAWCyABQQA2AqwBDAELAkAgASgCEEUEQCABKAIIRQ0BCyABKAKQAUEBQQAQFCABLQAXQQFxBEAgASgCpAEQFgsgAUEANgKsAQwBCyABIAEoAqQBEDA3AyggASABKAKkARAwNwMgIAEpAyggASkDIFIEQCABKAKQAUEBQQAQFCABLQAXQQFxBEAgASgCpAEQFgsgAUEANgKsAQwBCyABIAEoAqQBEDA3AzAgASABKAKkARAwNwOAAQJ/IwBBEGsiBSABKAKkATYCDCAFKAIMLQAAQQFxRQsEQCABKAKQAUEUQQAQFCABLQAXQQFxBEAgASgCpAEQFgsgAUEANgKsAQwBCyABLQAXQQFxBEAgASgCpAEQFgsCQCABKQOAAUL///////////8AWARAIAEpA4ABIAEpA4ABIAEpAzB8WA0BCyABKAKQAUEEQRYQFCABQQA2AqwBDAELIAEpA4ABIAEpAzB8IAEpA5gBIAEpAzh8VgRAIAEoApABQRVBABAUIAFBADYCrAEMAQsCQCABKAKUAUEEcUUNACABKQOAASABKQMwfCABKQOYASABKQM4fFENACABKAKQAUEVQQAQFCABQQA2AqwBDAELIAEpAyggASkDMEIugFYEQCABKAKQAUEVQQAQFCABQQA2AqwBDAELIAEgASkDKCABKAKQARCEASIFNgKMASAFRQRAIAFBADYCrAEMAQsgASgCjAFBAToALCABKAKMASABKQMwNwMYIAEoAowBIAEpA4ABNwMgIAEgASgCjAE2AqwBCyABKAKsASEFIAFBsAFqJAAgACAFNgJQDAELIAAoAmQgACkDMBAsGiAAKAJkIQUgACkDWCEJIAAoAmgoAhQhBiAAKAJUIQcjAEHQAGsiASQAIAEgBTYCSCABIAk3A0AgASAGNgI8IAEgBzYCOAJAIAEoAkgQL0IWVARAIAEoAjhBFUEAEBQgAUEANgJMDAELIwBBEGsiBSABKAJINgIMIAECfiAFKAIMLQAAQQFxBEAgBSgCDCkDEAwBC0IACzcDCCABKAJIQgQQHhogASgCSBAqBEAgASgCOEEBQQAQFCABQQA2AkwMAQsgASABKAJIEB1B//8Dca03AyggASABKAJIEB1B//8Dca03AyAgASkDICABKQMoUgRAIAEoAjhBE0EAEBQgAUEANgJMDAELIAEgASgCSBAqrTcDGCABIAEoAkgQKq03AxAgASkDECABKQMQIAEpAxh8VgRAIAEoAjhBBEEWEBQgAUEANgJMDAELIAEpAxAgASkDGHwgASkDQCABKQMIfFYEQCABKAI4QRVBABAUIAFBADYCTAwBCwJAIAEoAjxBBHFFDQAgASkDECABKQMYfCABKQNAIAEpAwh8UQ0AIAEoAjhBFUEAEBQgAUEANgJMDAELIAEgASkDICABKAI4EIQBIgU2AjQgBUUEQCABQQA2AkwMAQsgASgCNEEAOgAsIAEoAjQgASkDGDcDGCABKAI0IAEpAxA3AyAgASABKAI0NgJMCyABKAJMIQUgAUHQAGokACAAIAU2AlALIAAoAlBFBEAgAEEANgJsDAELIAAoAmQgACkDMEIUfBAsGiAAIAAoAmQQHTsBTiAAKAJQKQMgIAAoAlApAxh8IAApA1ggACkDMHxWBEAg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IAIgAigCLCIAQQFqNgIsIAAtAAEhASACIAIoAigiAEEBajYCKEEAIAAtAAEgAUcNABogAiACKAIsIgBBAWo2AiwgAC0AASEBIAIgAigCKCIAQQFqNgIoQQAgAC0AASABRw0AGiACIAIoAiwiAEEBajYCLCAALQABIQEgAiACKAIoIgBBAWo2AihBACAALQABIAFHDQAaIAIgAigCLCIAQQFqNgIsIAAtAAEhASACIAIoAigiAEEBajYCKEEAIAAtAAEgAUcNABogAiACKAIsIgBBAWo2AiwgAC0AASEBIAIgAigCKCIAQQFqNgIoQQAgAC0AASABRw0AGiACKAIsIAIoAgxJC0EBcQ0ACyACQYICIAIoAgwgAigCLGtrNgIkIAIgAigCDEGCAms2AiwgAigCJCACKAIgSgRAIAIoAjggAigCNDYCcCACIAIoAiQ2AiAgAigCJCACKAIcTg0CIAIgAigCLCACKAIgQQFrai0AADoACyACIAIoAiwgAigCIGotAAA6AAoLCyACIAIoAhQgAigCNCACKAIQcUEBdGovAQAiATYCNEEAIQAgASACKAIYSwR/IAIgAigCMEEBayIANgIwIABBAEcFQQALQQFxDQELCwJAIAIoAiAgAigCOCgCdE0EQCACIAIoAiA2AjwMAQsgAiACKAI4KAJ0NgI8CyACKAI8C5IQAQF/IwBBMGsiAiQAIAIgADYCKCACIAE2AiQgAgJ/IAIoAigoAiwgAigCKCgCDEEFa0kEQCACKAIoKAIsDAELIAIoAigoAgxBBWsLNgIgIAJBADYCECACIAIoAigoAgAoAgQ2AgwDQAJAIAJB//8DNgIcIAIgAigCKCgCvC1BKmpBA3U2AhQgAigCKCgCACgCECACKAIUSQ0AIAIgAigCKCgCACgCECACKAIUazYCFCACIAIoAigoAmwgAigCKCgCXGs2AhggAigCHCACKAIYIAIoAigoAgAoAgRqSwRAIAIgAigCGCACKAIoKAIAKAIEajYCHAsgAigCHCACKAIUSwRAIAIgAigCFDYCHAsCQCACKAIcIAIoAiBPDQACQCACKAIcRQRAIAIoAiRBBEcNAQsgAigCJEUNACACKAIcIAIoAhggAigCKCgCACgCBGpGDQELDAELQQAhACACIAIoAiRBBEYEfyACKAIcIAIoAhggAigCKCgCACgCBGpGBUEAC0EBcTYCECACKAIoQQBBACACKAIQEFwgAigCKCgCCCACKAIoKAIUQQRraiACKAIcOgAAIAIoAigoAgggAigCKCgCFEEDa2ogAigCHEEIdjoAACACKAIoKAIIIAIoAigoAhRBAmtqIAIoAhxBf3M6AAAgAigCKCgCCCACKAIoKAIUQQFraiACKAIcQX9zQQh2OgAAIAIoAigoAgAQHCACKAIYBEAgAigCGCACKAIcSwRAIAIgAigCHDYCGAsgAigCKCgCACgCDCACKAIoKAI4IAIoAigoAlxqIAIoAhgQGRogAigCKCgCACIAIAIoAhggACgCDGo2AgwgAigCKCgCACIAIAAoAhAgAigCGGs2AhAgAigCKCgCACIAIAIoAhggACgCFGo2AhQgAigCKCIAIAIoAhggACgCXGo2AlwgAiACKAIcIAIoAhhrNgIcCyACKAIcBEAgAigCKCgCACACKAIoKAIAKAIMIAIoAhwQeBogAigCKCgCACIAIAIoAhwgACgCDGo2AgwgAigCKCgCACIAIAAoAhAgAigCHGs2AhAgAigCKCgCACIAIAIoAhwgACgCFGo2AhQLIAIoAhBFDQELCyACIAIoAgwgAigCKCgCACgCBGs2AgwgAigCDARAAkAgAigCDCACKAIoKAIsTwRAIAIoAihBAjYCsC0gAigCKCgCOCACKAIoKAIAKAIAIAIoAigoAixrIAIoAigoAiwQGRogAigCKCACKAIoKAIsNgJsDAELIAIoAgwgAigCKCgCPCACKAIoKAJsa08EQCACKAIoIgAgACgCbCACKAIoKAIsazYCbCACKAIoKAI4IAIoAigoAjggAigCKCgCLGogAigCKCgCbBAZGiACKAIoKAKwLUECSQRAIAIoAigiACAAKAKwLUEBajYCsC0LCyACKAIoKAI4IAIoAigoAmxqIAIoAigoAgAoAgAgAigCDGsgAigCDBAZGiACKAIoIgAgAigCDCAAKAJsajYCbAsgAigCKCACKAIoKAJsNgJcIAIoAigiAQJ/IAIoAgwgAigCKCgCLCACKAIoKAK0LWtLBEAgAigCKCgCLCACKAIoKAK0LWsMAQsgAigCDAsgASgCtC1qNgK0LQsgAigCKCgCwC0gAigCKCgCbEkEQCACKAIoIAIoAigoAmw2AsAtCwJAIAIoAhAEQCACQQM2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mwFCADcDAEGYmwFCADcDAEGQmwFCADcDAEGImwFCADcDAEGAmwFCADcDAEH4mgFCADcDAEHwmgFCADcDAEHwmgEL1QQBBX8jAEGwAWsiASQAIAEgADYCqAEgASgCqAEQNwJAAkAgASgCqAEoAgBBAE4EQCABKAKoASgCAEGAFCgCAEgNAQsgASABKAKoASgCADYCECABQSBqQY8SIAFBEGoQcCABQQA2AqQBIAEgAUEgajYCoAEMAQsgASABKAKoASgCAEECdEGAE2ooAgA2AqQBAkACQAJAAkAgASgCqAEoAgBBAnRBkBRqKAIAQQFrDgIAAQILIAEoAqgBKAIEIQJBkJkBKAIAIQRBACEAAkACQANAIAIgAEGgiAFqLQAARwRAQdcAIQMgAEEBaiIAQdcARw0BDAILCyAAIgMNAEGAiQEhAgwBC0GAiQEhAANAIAAtAAAhBSAAQQFqIgIhACAFDQAgAiEAIANBAWsiAw0ACwsgBCgCFBogASACNgKgAQwCCyMAQRBrIgAgASgCqAEoAgQ2AgwgAUEAIAAoAgxrQQJ0QajZAGooAgA2AqABDAELIAFBADYCoAELCwJAIAEoAqABRQRAIAEgASgCpAE2AqwBDAELIAEgASgCoAEQKwJ/IAEoAqQBBEAgASgCpAEQK0ECagwBC0EAC2pBAWoQGCIANgIcIABFBEAgAUG4EygCADYCrAEMAQsgASgCHCEAAn8gASgCpAEEQCABKAKkAQwBC0H6EgshA0HfEkH6EiABKAKkARshAiABIAEoAqABNgIIIAEgAjYCBCABIAM2AgAgAEG+CiABEHAgASgCqAEgASgCHDYCCCABIAEoAhw2AqwBCyABKAKsASEAIAFBsAFqJAAgAAszAQF/IAAoAhQiAyABIAIgACgCECADayIBIAEgAksbIgEQGRogACAAKAIUIAFqNgIUIAILjwUCBn4BfyABIAEoAgBBD2pBcHEiAUEQajYCACAAAnwgASkDACEDIAEpAwghBiMAQSBrIggkAAJAIAZC////////////AIMiBEKAgICAgIDAgDx9IARCgICAgICAwP/DAH1UBEAgBkIEhiADQjyIhCEEIANC//////////8PgyIDQoGAgICAgICACFoEQCAEQoGAgICAgICAwAB8IQIMAgsgBEKAgICAgICAgEB9IQIgA0KAgICAgICAgAiFQgBSDQEgAiAEQgGDfCECDAELIANQIARCgICAgICAwP//AFQgBEKAgICAgIDA//8AURtFBEAgBkIEhiADQjyIhEL/////////A4NCgICAgICAgPz/AIQhAgwBC0KAgICAgICA+P8AIQIgBEL///////+//8MAVg0AQgAhAiAEQjCIpyIAQZH3AEkNACADIQIgBkL///////8/g0KAgICAgIDAAIQiBSEHAkAgAEGB9wBrIgFBwABxBEAgAiABQUBqrYYhB0IAIQIMAQsgAUUNACAHIAGtIgSGIAJBwAAgAWutiIQhByACIASGIQILIAggAjcDECAIIAc3AxgCQEGB+AAgAGsiAEHAAHEEQCAFIABBQGqtiCEDQgAhBQwBCyAARQ0AIAVBwAAgAGuthiADIACtIgKIhCEDIAUgAoghBQsgCCADNwMAIAggBTcDCCAIKQMIQgSGIAgpAwAiA0I8iIQhAiAIKQMQIAgpAxiEQgBSrSADQv//////////D4OEIgNCgYCAgICAgIAIWgRAIAJCAXwhAgwBCyADQoCAgICAgICACIVCAFINACACQgGDIAJ8IQILIAhBIGokACACIAZCgICAgICAgICAf4OEvws5AwALrRcDEn8CfgF8IwBBsARrIgkkACAJQQA2AiwCQCABvSIYQn9XBEBBASESQa4IIRMgAZoiAb0hGAwBCyAEQYAQcQRAQQEhEkGxCCETDAELQbQIQa8IIARBAXEiEhshEyASRSEXCwJAIBhCgICAgICAgPj/AINCgICAgICAgPj/AFEEQCAAQSAgAiASQQNqIg0gBEH//3txECYgACATIBIQIiAAQeQLQbUSIAVBIHEiAxtBjw1BuRIgAxsgASABYhtBAxAiDAELIAlBEGohEAJAAn8CQCABIAlBLGoQqQEiASABoCIBRAAAAAAAAAAAYgRAIAkgCSgCLCIGQQFrNgIsIAVBIHIiFEHhAEcNAQwDCyAFQSByIhRB4QBGDQIgCSgCLCELQQYgAyADQQBIGwwBCyAJIAZBHWsiCzYCLCABRAAAAAAAALBBoiEBQQYgAyADQQBIGwshCiAJQTBqIAlB0AJqIAtBAEgbIg4hBwNAIAcCfyABRAAAAAAAAPBBYyABRAAAAAAAAAAAZnEEQCABqwwBC0EACyIDNgIAIAdBBGohByABIAO4oUQA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HCECIAEgASgCGCIDQQFqNgIYQQAgAy0AASACRw0AGiABKAIcIQIgASABKAIYIgNBAWo2AhhBACADLQABIAJHDQAaIAEoAhwhAiABIAEoAhgiA0EBajYCGEEAIAMtAAEgAkcNABogASgCHCECIAEgASgCGCIDQQFqNgIYQQAgAy0AASACRw0AGiABKAIcIQIgASABKAIYIgNBAWo2AhhBACADLQABIAJHDQAaIAEoAhwhAiABIAEoAhgiA0EBajYCGEEAIAMtAAEgAkcNABogASgCGCABKAIUSQtBAXENAAsgASgCKEGCAiABKAIUIAEoAhhrazYCYCABKAIoKAJgIAEoAigoAnRLBEAgASgCKCABKAIoKAJ0NgJgCwsLAkAgASgCKCgCYEEDTwRAIAEgASgCKCgCYEEDazoAEyABQQE7ARAgASgCKCICKAKkLSACKAKgLUEBdGogAS8BEDsBACABLQATIQMgASgCKCICKAKYLSEEIAIgAigCoC0iAkEBajYCoC0gAiAEaiADOgAAIAEgAS8BEEEBazsBECABKAIoIAEtABNB0N0Aai0AAEECdGpBmAlqIgIgAi8BAEEBajsBACABKAIoQYgTagJ/IAEvARBBgAJJBEAgAS8BEC0A0FkMAQsgAS8BEEEHdkGAAmotANBZC0ECdGoiAiACLwEAQQFqOwEAIAEgASgCKCgCoC0gASgCKCgCnC1BAWtGNgIgIAEoAigiAiACKAJ0IAEoAigoAmBrNgJ0IAEoAigiAiABKAIoKAJgIAIoAmxqNgJsIAEoAihBADYCYAwBCyABIAEoAigiAigCOCACKAJsai0AADoADyABKAIoIgIoAqQtIAIoAqAtQQF0akEAOwEAIAEtAA8hAyABKAIoIgIoApgtIQQgAiACKAKgLSICQQFqNgKgLSACIARqIAM6AAAgASgCKCABLQAPQQJ0aiICIAIvAZQBQQFqOwGUASABIAEoAigoAqAtIAEoAigoApwtQQFrRjYCICABKAIoIgIgAigCdEEBazYCdCABKAIoIgIgAigCbEEBajYCbAsgASgCIARAIAEoAigCfyABKAIoKAJcQQBOBEAgASgCKCgCOCABKAIoKAJcagwBC0EACyABKAIoKAJsIAEoAigoAlxrQQAQKCABKAIoIAEoAigoAmw2AlwgASgCKCgCABAcIAEoAigo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QCABKAIoQQ9JBEAgASABKAJQIgJBAWo2AlAgASABKAIsIAItAAAgASgCKHRqNgIsIAEgASgCKEEIajYCKCABIAEoAlAiAkEBajYCUCABIAEoAiwgAi0AACABKAIodGo2AiwgASABKAIoQQhqNgIoCyABIAEoAiQgASgCLCABKAIccUECdGooAQA2ARACQAJAA0AgASABLQARNgIMIAEgASgCLCABKAIMdjYCLCABIAEoAiggASgCDGs2AiggASABLQAQNgIMIAEoAgxFBEAgAS8BEiECIAEgASgCSCIDQQFqNgJIIAMgAjoAAAwCCyABKAIMQRBxBEAgASABLwESNgIIIAEgASgCDEEPcTYCDCABKAIMBEAgASgCKCABKAIMSQRAIAEgASgCUCICQQFqNgJQIAEgASgCLCACLQAAIAEoAih0ajYCLCABIAEoAihBCGo2AigLIAEgASgCCCABKAIsQQEgASgCDHRBAWtxajYCCCABIAEoAiwgASgCDHY2AiwgASABKAIoIAEoAgxrNgIoCyABKAIoQQ9JBEAgASABKAJQIgJBAWo2AlAgASABKAIsIAItAAAgASgCKHRqNgIsIAEgASgCKEEIajYCKCABIAEoAlAiAkEBajYCUCABIAEoAiwgAi0AACABKAIodGo2AiwgASABKAIoQQhqNgIoCyABIAEoAiAgASgCLCABKAIYcUECdGooAQA2ARACQANAIAEgAS0AETYCDCABIAEoAiwgASgCDHY2AiwgASABKAIoIAEoAgxrNgIoIAEgAS0AEDYCDCABKAIMQRBxBEAgASABLwESNgIEIAEgASgCDEEPcTYCDCABKAIoIAEoAgxJBEAgASABKAJQIgJBAWo2AlAgASABKAIsIAItAAAgASgCKHRqNgIsIAEgASgCKEEIajYCKCABKAIoIAEoAgxJBEAgASABKAJQIgJBAWo2AlAgASABKAIsIAItAAAgASgCKHRqNgIsIAEgASgCKEEIajYCKAsLIAEgASgCBCABKAIsQQEgASgCDHRBAWtxajYCBCABIAEoAiwgASgCDHY2AiwgASABKAIoIAEoAgxrNgIoIAEgASgCSCABKAJEazYCDAJAIAEoAgQgASgCDEsEQCABIAEoAgQgASgCDGs2AgwgASgCDCABKAI4SwRAIAEoAlQoAsQ3BEAgASgCXEHdDDYCGCABKAJUQdH+ADYCBAwKCwsgASABKAIwNgIAAkAgASgCNEUEQCABIAEoAgAgASgCPCABKAIMa2o2AgAgASgCDCABKAIISQRAIAEgASgCCCABKAIMazYCCANAIAEgASgCACICQQFqNgIAIAItAAAhAiABIAEoAkgiA0EBajYCSCADIAI6AAAgASABKAIMQQFrIgI2AgwgAg0ACyABIAEoAkggASgCBGs2AgALDAELAkAgASgCNCABKAIMSQRAIAEgASgCACABKAI8IAEoAjRqIAEoAgxrajYCACABIAEoAgwgASgCNGs2AgwgASgCDCABKAIISQRAIAEgASgCCCABKAIMazYCCANAIAEgASgCACICQQFqNgIAIAItAAAhAiABIAEoAkgiA0EBajYCSCADIAI6AAAgASABKAIMQQFrIgI2AgwgAg0ACyABIAEoAjA2AgAgASgCNCABKAIISQRAIAEgASgCNDYCDCABIAEoAgggASgCDGs2AggDQCABIAEoAgAiAkEBajYCACACLQAAIQIgASABKAJIIgNBAWo2AkggAyACOgAAIAEgASgCDEEBayICNgIMIAINAAsgASABKAJIIAEoAgRrNgIACwsMAQsgASABKAIAIAEoAjQgASgCDGtqNgIAIAEoAgwgASgCCEkEQCABIAEoAgggASgCDGs2AggDQCABIAEoAgAiAkEBajYCACACLQAAIQIgASABKAJIIgNBAWo2AkggAyACOgAAIAEgASgCDEEBayICNgIMIAINAAsgASABKAJIIAEoAgRrNgIACwsLA0AgASgCCEECSwRAIAEgASgCACICQQFqNgIAIAItAAAhAiABIAEoAkgiA0EBajYCSCADIAI6AAAgASABKAIAIgJBAWo2AgAgAi0AACECIAEgASgCSCIDQQFqNgJIIAMgAjoAACABIAEoAgAiAkEBajYCACACLQAAIQIgASABKAJIIgNBAWo2AkggAyACOgAAIAEgASgCCEEDazYCCAwBCwsMAQsgASABKAJIIAEoAgRrNgIAA0AgASABKAIAIgJBAWo2AgAgAi0AACECIAEgASgCSCIDQQFqNgJIIAMgAjoAACABIAEoAgAiAkEBajYCACACLQAAIQIgASABKAJIIgNBAWo2AkggAyACOgAAIAEgASgCACICQQFqNgIAIAItAAAhAiABIAEoAkgi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ZWFkIGVycm9yAFpsaWIgZXJyb3IAZGF0YSBlcnJvcgBDUkMgZXJyb3IAaW5jb21wYXRpYmxlIHZlcnNpb24AbmFuAC9kZXYvdXJhbmRvbQBpbnZhbGlkIGNvZGUgLS0gbWlzc2luZyBlbmQtb2YtYmxvY2sAaW5jb3JyZWN0IGhlYWRlciBjaGVjawBpbmNvcnJlY3QgbGVuZ3RoIGNoZWNrAGluY29ycmVjdCBkYXRhIGNoZWNrAGludmFsaWQgZGlzdGFuY2UgdG9vIGZhciBiYWNrAGhlYWRlciBjcmMgbWlzbWF0Y2gAaW5mAGludmFsaWQgd2luZG93IHNpemUAUmVhZC1vbmx5IGFyY2hpdmUATm90IGEgemlwIGFyY2hpdmUAUmVzb3VyY2Ugc3RpbGwgaW4gdXNlAE1hbGxvYyBmYWlsdXJlAGludmFsaWQgYmxvY2sgdHlwZQBGYWlsdXJlIHRvIGNyZWF0ZSB0ZW1wb3JhcnkgZmlsZQBDYW4ndCBvcGVuIGZpbGUATm8gc3VjaCBmaWxlAFByZW1hdHVyZSBlbmQgb2YgZmlsZQBDYW4ndCByZW1vdmUgZmlsZQBpbnZhbGlkIGxpdGVyYWwvbGVuZ3RoIGNvZGUAaW52YWxpZCBkaXN0YW5jZSBjb2RlAHVua25vd24gY29tcHJlc3Npb24gbWV0aG9kAHN0cmVhbSBlbmQAQ29tcHJlc3NlZCBkYXRhIGludmFsaWQATXVsdGktZGlzayB6aXAgYXJjaGl2ZXMgbm90IHN1cHBvcnRlZABPcGVyYXRpb24gbm90IHN1cHBvcnRlZABFbmNyeXB0aW9uIG1ldGhvZCBub3Qgc3VwcG9ydGVkAENvbXByZXNzaW9uIG1ldGhvZCBub3Qgc3VwcG9ydGVkAEVudHJ5IGhhcyBiZWVuIGRlbGV0ZWQAQ29udGFpbmluZyB6aXAgYXJjaGl2ZSB3YXMgY2xvc2VkAENsb3NpbmcgemlwIGFyY2hpdmUgZmFpbGVkAFJlbmFtaW5nIHRlbXBvcmFyeSBmaWxlIGZhaWxlZABFbnRyeSBoYXMgYmVlbiBjaGFuZ2VkAE5vIHBhc3N3b3JkIHByb3ZpZGVkAFdyb25nIHBhc3N3b3JkIHByb3ZpZGVkAFVua25vd24gZXJyb3IgJWQAcmIAcitiAHJ3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CADcAAgAPAAIALwACAB8AAgA/AAIAAIACACCAAgAQgAIAMIACAAiAAgAogAIAGIACADiAAgAEgAIAJIACABSAAgA0gAIADIACACyAAgAcgAIAPIACAAKAAgAigAIAEoACADKAAgAKgAIAKoACABqAAgA6gAIABoACACaAAgAWgAIANoACAA6AAgAugAIAHoACAD6AAgABgAIAIYACABGAAgAxgAIACYACACmAAgAZgAIAOYACAAWAAgAlgAIAFYACADWAAgANgAIALYACAB2AAgA9gAIAA4ACACOAAgATgAIAM4ACAAuAAgArgAIAG4ACADuAAgAHgAIAJ4ACABeAAgA3gAIAD4ACAC+AAgAfgAIAP4ACAABAAgAgQAIAEEACADBAAgAIQAIAKEACABhAAgA4QAIABEACACRAAgAUQAIANEACAAxAAgAsQAIAHEACADxAAgACQAIAIkACABJAAgAyQAIACkACACpAAgAaQAIAOkACAAZAAgAmQAIAFkACADZAAgAOQAIALkACAB5AAgA+QAIAAUACACFAAgARQAIAMUACAAlAAgApQAIAGUACADlAAgAFQAIAJUACABVAAgA1QAIADUACAC1AAgAdQAIAPUACAANAAgAjQAIAE0ACADNAAgALQAIAK0ACABtAAgA7QAIAB0ACACdAAgAXQAIAN0ACAA9AAgAvQAIAH0ACAD9AAgAEwAJABMBCQCTAAkAkwEJAFMACQBTAQkA0wAJANMBCQAzAAkAMwEJALMACQCzAQkAcwAJAHMBCQDzAAkA8wEJAAsACQALAQkAiwAJAIsBCQBLAAkASwEJAMsACQDLAQkAKwAJACsBCQCrAAkAqwEJAGsACQBrAQkA6wAJAOsBCQAbAAkAGwEJAJsACQCbAQkAWwAJAFsBCQDbAAkA2wEJADsACQA7AQkAuwAJALsBCQB7AAkAewEJAPsACQD7AQkABwAJAAcBCQCHAAkAhwEJAEcACQBHAQkAxwAJAMcBCQAnAAkAJwEJAKcACQCnAQkAZwAJAGcBCQDnAAkA5wEJABcACQAXAQkAlwAJAJcBCQBXAAkAVwEJANcACQDXAQkANwAJADcBCQC3AAkAtwEJAHcACQB3AQkA9wAJAPcBCQAPAAkADwEJAI8ACQCPAQkATwAJAE8BCQDPAAkAzwEJAC8ACQAvAQkArwAJAK8BCQBvAAkAbwEJAO8ACQDvAQkAHwAJAB8BCQCfAAkAnwEJAF8ACQBfAQkA3wAJAN8BCQA/AAkAPwEJAL8ACQC/AQkAfwAJAH8BCQD/AAkA/wEJAAAABwBAAAcAIAAHAGAABwAQAAcAUAAHADAABwBwAAcACAAHAEgABwAoAAcAaAAHABgABwBYAAcAOAAHAHgABwAEAAcARAAHACQABwBkAAcAFAAHAFQABwA0AAcAdAAHAAMACACDAAgAQwAIAMMACAAjAAgAowAIAGMACADjAAgAAAAFABAABQAIAAUAGAAFAAQABQAUAAUADAAFABwABQACAAUAEgAFAAoABQAaAAUABgAFABYABQAOAAUAHgAFAAEABQARAAUACQAFABkABQAFAAUAFQAFAA0ABQAdAAUAAwAFABMABQALAAUAGwAFAAcABQAXAAUAQbDqAAtNAQAAAAEAAAABAAAAAQAAAAIAAAACAAAAAgAAAAIAAAADAAAAAwAAAAMAAAADAAAABAAAAAQAAAAEAAAABAAAAAUAAAAFAAAABQAAAAUAQaDrAAtlAQAAAAEAAAACAAAAAgAAAAMAAAADAAAABAAAAAQAAAAFAAAABQAAAAYAAAAGAAAABwAAAAcAAAAIAAAACAAAAAkAAAAJAAAACgAAAAoAAAALAAAACwAAAAwAAAAMAAAADQAAAA0AQdDsAAsjAgAAAAMAAAAHAAAAAAAAABAREgAIBwkGCgULBAwDDQIOAQ8AQYTtAAtpAQAAAAIAAAADAAAABAAAAAUAAAAGAAAABwAAAAgAAAAKAAAADAAAAA4AAAAQAAAAFAAAABgAAAAcAAAAIAAAACgAAAAwAAAAOAAAAEAAAABQAAAAYAAAAHAAAACAAAAAoAAAAMAAAADgAEGE7gALegEAAAACAAAAAwAAAAQAAAAGAAAACAAAAAwAAAAQAAAAGAAAACAAAAAwAAAAQAAAAGAAAACAAAAAwAAAAAABAACAAQAAAAIAAAADAAAABAAAAAYAAAAIAAAADAAAABAAAAAYAAAAIAAAADAAAABAAAAAYAAAMS4yLjExAEGI7wALbQcAAAAEAAQACAAEAAgAAAAEAAUAEAAIAAgAAAAEAAYAIAAgAAgAAAAEAAQAEAAQAAkAAAAIABAAIAAgAAkAAAAIABAAgACAAAkAAAAIACAAgAAAAQkAAAAgAIAAAgEABAkAAAAgAAIBAgEAEAkAQYDwAAulAgMABAAFAAYABwAIAAkACgALAA0ADwARABMAFwAbAB8AIwArADMAOwBDAFMAYwBzAIMAowDDAOMAAgEAAAAAAAAQABAAEAAQABAAEAAQABAAEQARABEAEQASABIAEgASABMAEwATABMAFAAUABQAFAAVABUAFQAVABAATQDKAAAAAQACAAMABAAFAAcACQANABEAGQAhADEAQQBhAIEAwQABAYEBAQIBAwEEAQYBCAEMARABGAEgATABQAFgAAAAABAAEAAQABAAEQARABIAEgATABMAFAAUABUAFQAWABYAFwAXABgAGAAZABkAGgAaABsAGwAcABwAHQAdAEAAQAAQABEAEgAAAAgABwAJAAYACgAFAAsABAAMAAMADQACAA4AAQAPAEGw8gALwRFgBwAAAAhQAAAIEAAUCHMAEgcfAAAIcAAACDAAAAnAABAHCgAACGAAAAggAAAJoAAACAAAAAiAAAAIQAAACeAAEAcGAAAIWAAACBgAAAmQABMHOwAACHgAAAg4AAAJ0AARBxEAAAhoAAAIKAAACbAAAAgIAAAIiAAACEgAAAnwABAHBAAACFQAAAgUABUI4wATBysAAAh0AAAINAAACcgAEQcNAAAIZAAACCQAAAmoAAAIBAAACIQAAAhEAAAJ6AAQBwgAAAhcAAAIHAAACZgAFAdTAAAIfAAACDwAAAnYABIHFwAACGwAAAgsAAAJuAAACAwAAAiMAAAITAAACfgAEAcDAAAIUgAACBIAFQijABMHIwAACHIAAAgyAAAJxAARBwsAAAhiAAAIIgAACaQAAAgCAAAIggAACEIAAAnkABAHBwAACFoAAAgaAAAJlAAUB0MAAAh6AAAIOgAACdQAEgcTAAAIagAACCoAAAm0AAAICgAACIoAAAhKAAAJ9AAQBwUAAAhWAAAIFgBACAAAEwczAAAIdgAACDYAAAnMABEHDwAACGYAAAgmAAAJrAAACAYAAAiGAAAIRgAACewAEAcJAAAIXgAACB4AAAmcABQHYwAACH4AAAg+AAAJ3AASBxsAAAhuAAAILgAACbwAAAgOAAAIjgAACE4AAAn8AGAHAAAACFEAAAgRABUIgwASBx8AAAhxAAAIMQAACcIAEAcKAAAIYQAACCEAAAmiAAAIAQAACIEAAAhBAAAJ4gAQBwYAAAhZAAAIGQAACZIAEwc7AAAIeQAACDkAAAnSABEHEQAACGkAAAgpAAAJsgAACAkAAAiJAAAISQAACfIAEAcEAAAIVQAACBUAEAgCARMHKwAACHUAAAg1AAAJygARBw0AAAhlAAAIJQAACaoAAAgFAAAIhQAACEUAAAnqABAHCAAACF0AAAgdAAAJmgAUB1MAAAh9AAAIPQAACdoAEgcXAAAIbQAACC0AAAm6AAAIDQAACI0AAAhNAAAJ+gAQBwMAAAhTAAAIEwAVCMMAEwcjAAAIcwAACDMAAAnGABEHCwAACGMAAAgjAAAJpgAACAMAAAiDAAAIQwAACeYAEAcHAAAIWwAACBsAAAmWABQHQwAACHsAAAg7AAAJ1gASBxMAAAhrAAAIKwAACbYAAAgLAAAIiwAACEsAAAn2ABAHBQAACFcAAAgXAEAIAAATBzMAAAh3AAAINwAACc4AEQcPAAAIZwAACCcAAAmuAAAIBwAACIcAAAhHAAAJ7gAQBwkAAAhfAAAIHwAACZ4AFAdjAAAIfwAACD8AAAneABIHGwAACG8AAAgvAAAJvgAACA8AAAiPAAAITwAACf4AYAcAAAAIUAAACBAAFAhzABIHHwAACHAAAAgwAAAJwQAQBwoAAAhgAAAIIAAACaEAAAgAAAAIgAAACEAAAAnhABAHBgAACFgAAAgYAAAJkQATBzsAAAh4AAAIOAAACdEAEQcRAAAIaAAACCgAAAmxAAAICAAACIgAAAhIAAAJ8QAQBwQAAAhUAAAIFAAVCOMAEwcrAAAIdAAACDQAAAnJABEHDQAACGQAAAgkAAAJqQAACAQAAAiEAAAIRAAACekAEAcIAAAIXAAACBwAAAmZABQHUwAACHwAAAg8AAAJ2QASBxcAAAhsAAAILAAACbkAAAgMAAAIjAAACEwAAAn5ABAHAwAACFIAAAgSABUIowATByMAAAhyAAAIMgAACcUAEQcLAAAIYgAACCIAAAmlAAAIAgAACIIAAAhCAAAJ5QAQBwcAAAhaAAAIGgAACZUAFAdDAAAIegAACDoAAAnVABIHEwAACGoAAAgqAAAJtQAACAoAAAiKAAAISgAACfUAEAcFAAAIVgAACBYAQAgAABMHMwAACHYAAAg2AAAJzQARBw8AAAhmAAAIJgAACa0AAAgGAAAIhgAACEYAAAntABAHCQAACF4AAAgeAAAJnQAUB2MAAAh+AAAIPgAACd0AEgcbAAAIbgAACC4AAAm9AAAIDgAACI4AAAhOAAAJ/QBgBwAAAAhRAAAIEQAVCIMAEgcfAAAIcQAACDEAAAnDABAHCgAACGEAAAghAAAJowAACAEAAAiBAAAIQQAACeMAEAcGAAAIWQAACBkAAAmTABMHOwAACHkAAAg5AAAJ0wARBxEAAAhpAAAIKQAACbMAAAgJAAAIiQAACEkAAAnzABAHBAAACFUAAAgVABAIAgETBysAAAh1AAAINQAACcsAEQcNAAAIZQAACCUAAAmrAAAIBQAACIUAAAhFAAAJ6wAQBwgAAAhdAAAIHQAACZsAFAdTAAAIfQAACD0AAAnbABIHFwAACG0AAAgtAAAJuwAACA0AAAiNAAAITQAACfsAEAcDAAAIUwAACBMAFQjDABMHIwAACHMAAAgzAAAJxwARBwsAAAhjAAAIIwAACacAAAgDAAAIgwAACEMAAAnnABAHBwAACFsAAAgbAAAJlwAUB0MAAAh7AAAIOwAACdcAEgcTAAAIawAACCsAAAm3AAAICwAACIsAAAhLAAAJ9wAQBwUAAAhXAAAIFwBACAAAEwczAAAIdwAACDcAAAnPABEHDwAACGcAAAgnAAAJrwAACAcAAAiHAAAIRwAACe8AEAcJAAAIXwAACB8AAAmfABQHYwAACH8AAAg/AAAJ3wASBxsAAAhvAAAILwAACb8AAAgPAAAIjwAACE8AAAn/ABAFAQAXBQEBEwURABsFARARBQUAGQUBBBUFQQAdBQFAEAUDABgFAQIUBSEAHAUBIBIFCQAaBQEIFgWBAEAFAAAQBQIAFwWBARMFGQAbBQEYEQUHABkFAQYVBWEAHQUBYBAFBAAYBQEDFAUxABwFATASBQ0AGgUBDBYFwQBABQAAEQAKABEREQAAAAAFAAAAAAAACQAAAAALAAAAAAAAAAARAA8KERERAwoHAAEACQsLAAAJBgsAAAsABhEAAAAREREAQYGEAQshCwAAAAAAAAAAEQAKChEREQAKAAACAAkLAAAACQALAAALAEG7hAELAQwAQceEAQsVDAAAAAAMAAAAAAkMAAAAAAAMAAAMAEH1hAELAQ4AQYGFAQsVDQAAAAQNAAAAAAkOAAAAAAAOAAAOAEGvhQELARAAQbuFAQseDwAAAAAPAAAAAAkQAAAAAAAQAAAQAAASAAAAEhISAEHyhQELDhIAAAASEhIAAAAAAAAJAEGjhgELAQsAQa+GAQsVCgAAAAAKAAAAAAkLAAAAAAALAAALAEHdhgELAQwAQemGAQsnDAAAAAAMAAAAAAkMAAAAAAAMAAAMAAAwMTIzNDU2Nzg5QUJDREVGAEG0hwELARkAQduHAQsF//////8AQaCIAQtXGRJEOwI/LEcUPTMwChsGRktFNw9JDo4XA0AdPGkrNh9KLRwBICUpIQgMFRYiLhA4Pgs0MRhkdHV2L0EJfzkRI0MyQomKiwUEJignDSoeNYwHGkiTE5SVAEGAiQELig5JbGxlZ2FsIGJ5dGUgc2VxdWVuY2UARG9tYWluIGVycm9yAFJlc3VsdCBub3QgcmVwcmVzZW50YWJsZQBOb3QgYSB0dHkAUGVybWlzc2lvbiBkZW5pZWQAT3BlcmF0aW9uIG5vdCBwZXJtaXR0ZWQATm8gc3VjaCBmaWxlIG9yIGRpcmVjdG9yeQBObyBzdWNoIHByb2Nlc3MARmlsZSBleGlzdHMAVmFsdWUgdG9vIGxhcmdlIGZvciBkYXRhIHR5cGUATm8gc3BhY2UgbGVmdCBvbiBkZXZpY2UAT3V0IG9mIG1lbW9yeQBSZXNvdXJjZSBidXN5AEludGVycnVwdGVkIHN5c3RlbSBjYWxsAFJlc291cmNlIHRlbXBvcmFyaWx5IHVuYXZhaWxhYmxlAEludmFsaWQgc2VlawBDcm9zcy1kZXZpY2UgbGluawBSZWFkLW9ubHkgZmlsZSBzeXN0ZW0ARGlyZWN0b3J5IG5vdCBlbXB0eQBDb25uZWN0aW9uIHJlc2V0IGJ5IHBlZXIAT3BlcmF0aW9uIHRpbWVkIG91dABDb25uZWN0aW9uIHJlZnVzZWQASG9zdCBpcyBkb3duAEhvc3QgaXMgdW5yZWFjaGFibGUAQWRkcmVzcyBpbiB1c2UAQnJva2VuIHBpcGUASS9PIGVycm9yAE5vIHN1Y2ggZGV2aWNlIG9yIGFkZHJlc3MAQmxvY2sgZGV2aWNlIHJlcXVpcmVkAE5vIHN1Y2ggZGV2aWNlAE5vdCBhIGRpcmVjdG9yeQBJcyBhIGRpcmVjdG9yeQBUZXh0IGZpbGUgYnVzeQBFeGVjIGZvcm1hdCBlcnJvcgBJbnZhbGlkIGFyZ3VtZW50AEFyZ3VtZW50IGxpc3QgdG9vIGxvbmcAU3ltYm9saWMgbGluayBsb29wAEZpbGVuYW1lIHRvbyBsb25nAFRvbyBtYW55IG9wZW4gZmlsZXMgaW4gc3lzdGVtAE5vIGZpbGUgZGVzY3JpcHRvcnMgYXZhaWxhYmxlAEJhZCBmaWxlIGRlc2NyaXB0b3IATm8gY2hpbGQgcHJvY2VzcwBCYWQgYWRkcmVzcwBGaWxlIHRvbyBsYXJnZQBUb28gbWFueSBsaW5rcwBObyBsb2NrcyBhdmFpbGFibGUAUmVzb3VyY2UgZGVhZGxvY2sgd291bGQgb2NjdXIAU3RhdGUgbm90IHJlY292ZXJhYmxlAFByZXZpb3VzIG93bmVyIGRpZWQAT3BlcmF0aW9uIGNhbmNlbGVkAEZ1bmN0aW9uIG5vdCBpbXBsZW1lbnRlZABObyBtZXNzYWdlIG9mIGRlc2lyZWQgdHlwZQBJZGVudGlmaWVyIHJlbW92ZWQARGV2aWNlIG5vdCBhIHN0cmVhbQBObyBkYXRhIGF2YWlsYWJsZQBEZXZpY2UgdGltZW91dABPdXQgb2Ygc3RyZWFtcyByZXNvdXJjZXMATGluayBoYXMgYmVlbiBzZXZlcmVkAFByb3RvY29sIGVycm9yAEJhZCBtZXNzYWdlAEZpbGUgZGVzY3JpcHRvciBpbiBiYWQgc3RhdGUATm90IGEgc29ja2V0AERlc3RpbmF0aW9uIGFkZHJlc3MgcmVxdWlyZWQATWVzc2FnZSB0b28gbGFyZ2UAUHJvdG9jb2wgd3JvbmcgdHlwZSBmb3Igc29ja2V0AFByb3RvY29sIG5vdCBhdmFpbGFibGUAUHJvdG9jb2wgbm90IHN1cHBvcnRlZABTb2NrZXQgdHlwZSBub3Qgc3VwcG9ydGVkAE5vdCBzdXBwb3J0ZWQAUHJvdG9jb2wgZmFtaWx5IG5vdCBzdXBwb3J0ZWQAQWRkcmVzcyBmYW1pbHkgbm90IHN1cHBvcnRlZCBieSBwcm90b2NvbABBZGRyZXNzIG5vdCBhdmFpbGFibGUATmV0d29yayBpcyBkb3duAE5ldHdvcmsgdW5yZWFjaGFibGUAQ29ubmVjdGlvbiByZXNldCBieSBuZXR3b3JrAENvbm5lY3Rpb24gYWJvcnRlZABObyBidWZmZXIgc3BhY2UgYXZhaWxhYmxlAFNvY2tldCBpcyBjb25uZWN0ZWQAU29ja2V0IG5vdCBjb25uZWN0ZWQAQ2Fubm90IHNlbmQgYWZ0ZXIgc29ja2V0IHNodXRkb3duAE9wZXJhdGlvbiBhbHJlYWR5IGluIHByb2dyZXNzAE9wZXJhdGlvbiBpbiBwcm9ncmVzcwBTdGFsZSBmaWxlIGhhbmRsZQBSZW1vdGUgSS9PIGVycm9yAFF1b3RhIGV4Y2VlZGVkAE5vIG1lZGl1bSBmb3VuZABXcm9uZyBtZWRpdW0gdHlwZQBObyBlcnJvciBpbmZvcm1hdGlvbgBBkJcBC1JQUFAACgAAAAsAAAAMAAAADQAAAA4AAAAPAAAAEAAAABEAAAASAAAACwAAAAwAAAANAAAADgAAAA8AAAAQAAAAEQAAAAEAAAAIAAAAlEsAALRLAEGQmQELAgxQAEHImQELCR8AAADkTAAAAwBB5JkBC4wBLfRRWM+MscBG9rXLKTEDxwRbcDC0Xf0geH+LmthZKVBoSImrp1YDbP+3zYg/1He0K6WjcPG65Kj8QYP92W/hinovLXSWBx8NCV4Ddixw90ClLKdvV0GoqnTfoFhkA0rHxDxTrq9fGAQVseNtKIarDKS/Q/DpUIE5VxZSN/////////////////////8=";yz(Rp)||(Rp=dxe(Rp));function Kxe(t){try{if(t==Rp&&lP)return new Uint8Array(lP);var e=sz(t);if(e)return e;if(aP)return aP(t);throw"sync fetching of the wasm failed: you can preload it to Module['wasmBinary'] manually, or emcc.py will do that for you when generating HTML (but not JS)"}catch(r){Gr(r)}}function Uxe(t,e){var r,i,n;try{n=Kxe(t),i=new WebAssembly.Module(n),r=new WebAssembly.Instance(i,e)}catch(o){var s=o.toString();throw Di("failed to compile wasm module: "+s),(s.includes("imported Memory")||s.includes("memory import"))&&Di("Memory size incompatibility issues may be due to changing INITIAL_MEMORY at runtime to something too large. Use ALLOW_MEMORY_GROWTH to allow any size memory (and also make sure not to set INITIAL_MEMORY at runtime to something smaller than it was at compile time)."),o}return[r,i]}function Gxe(){var t={a:Hxe};function e(n,s){var o=n.exports;oe.asm=o,ew=oe.asm.u,pz(ew.buffer),fP=oe.asm.za,Mxe(oe.asm.v),dP("wasm-instantiate")}if(Iz("wasm-instantiate"),oe.instantiateWasm)try{var r=oe.instantiateWasm(t,e);return r}catch(n){return Di("Module.instantiateWasm callback failed with error: "+n),!1}var i=Uxe(Rp,t);return e(i[0]),oe.asm}var ai,ya;function hP(t){for(;t.length>0;){var e=t.shift();if(typeof e=="function"){e(oe);continue}var r=e.func;typeof r=="number"?e.arg===void 0?fP.get(r)():fP.get(r)(e.arg):r(e.arg===void 0?null:e.arg)}}function iw(t,e){var r=new Date(_e[t>>2]*1e3);_e[e>>2]=r.getUTCSeconds(),_e[e+4>>2]=r.getUTCMinutes(),_e[e+8>>2]=r.getUTCHours(),_e[e+12>>2]=r.getUTCDate(),_e[e+16>>2]=r.getUTCMonth(),_e[e+20>>2]=r.getUTCFullYear()-1900,_e[e+24>>2]=r.getUTCDay(),_e[e+36>>2]=0,_e[e+32>>2]=0;var i=Date.UTC(r.getUTCFullYear(),0,1,0,0,0,0),n=(r.getTime()-i)/(1e3*60*60*24)|0;return _e[e+28>>2]=n,iw.GMTString||(iw.GMTString=uP("GMT")),_e[e+40>>2]=iw.GMTString,e}function jxe(t,e){return iw(t,e)}var yt={splitPath:function(t){var e=/^(\/?|)([\s\S]*?)((?:\.{1,2}|[^\/]+?|)(\.[^.\/]*|))(?:[\/]*)$/;return e.exec(t).slice(1)},normalizeArray:function(t,e){for(var r=0,i=t.length-1;i>=0;i--){var n=t[i];n==="."?t.splice(i,1):n===".."?(t.splice(i,1),r++):r&&(t.splice(i,1),r--)}if(e)for(;r;r--)t.unshift("..");return t},normalize:function(t){var e=t.charAt(0)==="/",r=t.substr(-1)==="/";return t=yt.normalizeArray(t.split("/").filter(function(i){return!!i}),!e).join("/"),!t&&!e&&(t="."),t&&r&&(t+="/"),(e?"/":"")+t},dirname:function(t){var e=yt.splitPath(t),r=e[0],i=e[1];return!r&&!i?".":(i&&(i=i.substr(0,i.length-1)),r+i)},basename:function(t){if(t==="/")return"/";t=yt.normalize(t),t=t.replace(/\/$/,"");var e=t.lastIndexOf("/");return e===-1?t:t.substr(e+1)},extname:function(t){return yt.splitPath(t)[3]},join:function(){var t=Array.prototype.slice.call(arguments,0);return yt.normalize(t.join("/"))},join2:function(t,e){return yt.normalize(t+"/"+e)}};function Yxe(){if(typeof crypto=="object"&&typeof crypto.getRandomValues=="function"){var t=new Uint8Array(1);return function(){return crypto.getRandomValues(t),t[0]}}else if(Wl)try{var e=require("crypto");return function(){return e.randomBytes(1)[0]}}catch(r){}return function(){Gr("randomDevice")}}var wa={resolve:function(){for(var t="",e=!1,r=arguments.length-1;r>=-1&&!e;r--){var i=r>=0?arguments[r]:y.cwd();if(typeof i!="string")throw new TypeError("Arguments to path.resolve must be strings");if(!i)return"";t=i+"/"+t,e=i.charAt(0)==="/"}return t=yt.normalizeArray(t.split("/").filter(function(n){return!!n}),!e).join("/"),(e?"/":"")+t||"."},relative:function(t,e){t=wa.resolve(t).substr(1),e=wa.resolve(e).substr(1);function r(c){for(var u=0;u=0&&c[g]==="";g--);return u>g?[]:c.slice(u,g-u+1)}for(var i=r(t.split("/")),n=r(e.split("/")),s=Math.min(i.length,n.length),o=s,a=0;a0?e=i.slice(0,n).toString("utf-8"):e=null}else typeof window!="undefined"&&typeof window.prompt=="function"?(e=window.prompt("Input: "),e!==null&&(e+=` +`)):typeof readline=="function"&&(e=readline(),e!==null&&(e+=` +`));if(!e)return null;t.input=CP(e,!0)}return t.input.shift()},put_char:function(t,e){e===null||e===10?($y(Zu(t.output,0)),t.output=[]):e!=0&&t.output.push(e)},flush:function(t){t.output&&t.output.length>0&&($y(Zu(t.output,0)),t.output=[])}},default_tty1_ops:{put_char:function(t,e){e===null||e===10?(Di(Zu(t.output,0)),t.output=[]):e!=0&&t.output.push(e)},flush:function(t){t.output&&t.output.length>0&&(Di(Zu(t.output,0)),t.output=[])}}};function mP(t){for(var e=mxe(t,65536),r=hz(e);t=e)){var i=1024*1024;e=Math.max(e,r*(r>>0),r!=0&&(e=Math.max(e,256));var n=t.contents;t.contents=new Uint8Array(e),t.usedBytes>0&&t.contents.set(n.subarray(0,t.usedBytes),0)}},resizeFileStorage:function(t,e){if(t.usedBytes!=e)if(e==0)t.contents=null,t.usedBytes=0;else{var r=t.contents;t.contents=new Uint8Array(e),r&&t.contents.set(r.subarray(0,Math.min(e,t.usedBytes))),t.usedBytes=e}},node_ops:{getattr:function(t){var e={};return e.dev=y.isChrdev(t.mode)?t.id:1,e.ino=t.id,e.mode=t.mode,e.nlink=1,e.uid=0,e.gid=0,e.rdev=t.rdev,y.isDir(t.mode)?e.size=4096:y.isFile(t.mode)?e.size=t.usedBytes:y.isLink(t.mode)?e.size=t.link.length:e.size=0,e.atime=new Date(t.timestamp),e.mtime=new Date(t.timestamp),e.ctime=new Date(t.timestamp),e.blksize=4096,e.blocks=Math.ceil(e.size/e.blksize),e},setattr:function(t,e){e.mode!==void 0&&(t.mode=e.mode),e.timestamp!==void 0&&(t.timestamp=e.timestamp),e.size!==void 0&&pt.resizeFileStorage(t,e.size)},lookup:function(t,e){throw y.genericErrors[44]},mknod:function(t,e,r,i){return pt.createNode(t,e,r,i)},rename:function(t,e,r){if(y.isDir(t.mode)){var i;try{i=y.lookupNode(e,r)}catch(s){}if(i)for(var n in i.contents)throw new y.ErrnoError(55)}delete t.parent.contents[t.name],t.parent.timestamp=Date.now(),t.name=r,e.contents[r]=t,e.timestamp=t.parent.timestamp,t.parent=e},unlink:function(t,e){delete t.contents[e],t.timestamp=Date.now()},rmdir:function(t,e){var r=y.lookupNode(t,e);for(var i in r.contents)throw new y.ErrnoError(55);delete t.contents[e],t.timestamp=Date.now()},readdir:function(t){var e=[".",".."];for(var r in t.contents)!t.contents.hasOwnProperty(r)||e.push(r);return e},symlink:function(t,e,r){var i=pt.createNode(t,e,511|40960,0);return i.link=r,i},readlink:function(t){if(!y.isLink(t.mode))throw new y.ErrnoError(28);return t.link}},stream_ops:{read:function(t,e,r,i,n){var s=t.node.contents;if(n>=t.node.usedBytes)return 0;var o=Math.min(t.node.usedBytes-n,i);if(o>8&&s.subarray)e.set(s.subarray(n,n+o),r);else for(var a=0;a0||i+r>2)}catch(r){throw r.code?new y.ErrnoError(tt.convertNodeCode(r)):r}return e.mode},realPath:function(t){for(var e=[];t.parent!==t;)e.push(t.name),t=t.parent;return e.push(t.mount.opts.root),e.reverse(),yt.join.apply(null,e)},flagsForNode:function(t){t&=~2097152,t&=~2048,t&=~32768,t&=~524288;var e=0;for(var r in tt.flagsForNodeMap)t&r&&(e|=tt.flagsForNodeMap[r],t^=r);if(t)throw new y.ErrnoError(28);return e},node_ops:{getattr:function(t){var e=tt.realPath(t),r;try{r=ft.lstatSync(e)}catch(i){throw i.code?new y.ErrnoError(tt.convertNodeCode(i)):i}return tt.isWindows&&!r.blksize&&(r.blksize=4096),tt.isWindows&&!r.blocks&&(r.blocks=(r.size+r.blksize-1)/r.blksize|0),{dev:r.dev,ino:r.ino,mode:r.mode,nlink:r.nlink,uid:r.uid,gid:r.gid,rdev:r.rdev,size:r.size,atime:r.atime,mtime:r.mtime,ctime:r.ctime,blksize:r.blksize,blocks:r.blocks}},setattr:function(t,e){var r=tt.realPath(t);try{if(e.mode!==void 0&&(ft.chmodSync(r,e.mode),t.mode=e.mode),e.timestamp!==void 0){var i=new Date(e.timestamp);ft.utimesSync(r,i,i)}e.size!==void 0&&ft.truncateSync(r,e.size)}catch(n){throw n.code?new y.ErrnoError(tt.convertNodeCode(n)):n}},lookup:function(t,e){var r=yt.join2(tt.realPath(t),e),i=tt.getMode(r);return tt.createNode(t,e,i)},mknod:function(t,e,r,i){var n=tt.createNode(t,e,r,i),s=tt.realPath(n);try{y.isDir(n.mode)?ft.mkdirSync(s,n.mode):ft.writeFileSync(s,"",{mode:n.mode})}catch(o){throw o.code?new y.ErrnoError(tt.convertNodeCode(o)):o}return n},rename:function(t,e,r){var i=tt.realPath(t),n=yt.join2(tt.realPath(e),r);try{ft.renameSync(i,n)}catch(s){throw s.code?new y.ErrnoError(tt.convertNodeCode(s)):s}t.name=r},unlink:function(t,e){var r=yt.join2(tt.realPath(t),e);try{ft.unlinkSync(r)}catch(i){throw i.code?new y.ErrnoError(tt.convertNodeCode(i)):i}},rmdir:function(t,e){var r=yt.join2(tt.realPath(t),e);try{ft.rmdirSync(r)}catch(i){throw i.code?new y.ErrnoError(tt.convertNodeCode(i)):i}},readdir:function(t){var e=tt.realPath(t);try{return ft.readdirSync(e)}catch(r){throw r.code?new y.ErrnoError(tt.convertNodeCode(r)):r}},symlink:function(t,e,r){var i=yt.join2(tt.realPath(t),e);try{ft.symlinkSync(r,i)}catch(n){throw n.code?new y.ErrnoError(tt.convertNodeCode(n)):n}},readlink:function(t){var e=tt.realPath(t);try{return e=ft.readlinkSync(e),e=IP.relative(IP.resolve(t.mount.opts.root),e),e}catch(r){throw r.code?new y.ErrnoError(tt.convertNodeCode(r)):r}}},stream_ops:{open:function(t){var e=tt.realPath(t.node);try{y.isFile(t.node.mode)&&(t.nfd=ft.openSync(e,tt.flagsForNode(t.flags)))}catch(r){throw r.code?new y.ErrnoError(tt.convertNodeCode(r)):r}},close:function(t){try{y.isFile(t.node.mode)&&t.nfd&&ft.closeSync(t.nfd)}catch(e){throw e.code?new y.ErrnoError(tt.convertNodeCode(e)):e}},read:function(t,e,r,i,n){if(i===0)return 0;try{return ft.readSync(t.nfd,tt.bufferFrom(e.buffer),r,i,n)}catch(s){throw new y.ErrnoError(tt.convertNodeCode(s))}},write:function(t,e,r,i,n){try{return ft.writeSync(t.nfd,tt.bufferFrom(e.buffer),r,i,n)}catch(s){throw new y.ErrnoError(tt.convertNodeCode(s))}},llseek:function(t,e,r){var i=e;if(r===1)i+=t.position;else if(r===2&&y.isFile(t.node.mode))try{var n=ft.fstatSync(t.nfd);i+=n.size}catch(s){throw new y.ErrnoError(tt.convertNodeCode(s))}if(i<0)throw new y.ErrnoError(28);return i},mmap:function(t,e,r,i,n,s){if(e!==0)throw new y.ErrnoError(28);if(!y.isFile(t.node.mode))throw new y.ErrnoError(43);var o=mP(r);return tt.stream_ops.read(t,Zi,o,r,i),{ptr:o,allocated:!0}},msync:function(t,e,r,i,n){if(!y.isFile(t.node.mode))throw new y.ErrnoError(43);if(n&2)return 0;var s=tt.stream_ops.write(t,e,0,i,r,!1);return 0}}},wz={lookupPath:function(t){return{path:t,node:{mode:tt.getMode(t)}}},createStandardStreams:function(){y.streams[0]={fd:0,nfd:0,position:0,path:"",flags:0,tty:!0,seekable:!1};for(var t=1;t<3;t++)y.streams[t]={fd:t,nfd:t,position:0,path:"",flags:577,tty:!0,seekable:!1}},cwd:function(){return process.cwd()},chdir:function(){process.chdir.apply(void 0,arguments)},mknod:function(t,e){y.isDir(t)?ft.mkdirSync(t,e):ft.writeFileSync(t,"",{mode:e})},mkdir:function(){ft.mkdirSync.apply(void 0,arguments)},symlink:function(){ft.symlinkSync.apply(void 0,arguments)},rename:function(){ft.renameSync.apply(void 0,arguments)},rmdir:function(){ft.rmdirSync.apply(void 0,arguments)},readdir:function(){ft.readdirSync.apply(void 0,arguments)},unlink:function(){ft.unlinkSync.apply(void 0,arguments)},readlink:function(){return ft.readlinkSync.apply(void 0,arguments)},stat:function(){return ft.statSync.apply(void 0,arguments)},lstat:function(){return ft.lstatSync.apply(void 0,arguments)},chmod:function(){ft.chmodSync.apply(void 0,arguments)},fchmod:function(){ft.fchmodSync.apply(void 0,arguments)},chown:function(){ft.chownSync.apply(void 0,arguments)},fchown:function(){ft.fchownSync.apply(void 0,arguments)},truncate:function(){ft.truncateSync.apply(void 0,arguments)},ftruncate:function(t,e){if(e<0)throw new y.ErrnoError(28);ft.ftruncateSync.apply(void 0,arguments)},utime:function(){ft.utimesSync.apply(void 0,arguments)},open:function(t,e,r,i){typeof e=="string"&&(e=Vl.modeStringToFlags(e));var n=ft.openSync(t,tt.flagsForNode(e),r),s=i!=null?i:y.nextfd(n),o={fd:s,nfd:n,position:0,path:t,flags:e,seekable:!0};return y.streams[s]=o,o},close:function(t){t.stream_ops||ft.closeSync(t.nfd),y.closeStream(t.fd)},llseek:function(t,e,r){if(t.stream_ops)return Vl.llseek(t,e,r);var i=e;if(r===1)i+=t.position;else if(r===2)i+=ft.fstatSync(t.nfd).size;else if(r!==0)throw new y.ErrnoError(eg.EINVAL);if(i<0)throw new y.ErrnoError(eg.EINVAL);return t.position=i,i},read:function(t,e,r,i,n){if(t.stream_ops)return Vl.read(t,e,r,i,n);var s=typeof n!="undefined";!s&&t.seekable&&(n=t.position);var o=ft.readSync(t.nfd,tt.bufferFrom(e.buffer),r,i,n);return s||(t.position+=o),o},write:function(t,e,r,i,n){if(t.stream_ops)return Vl.write(t,e,r,i,n);t.flags&+"1024"&&y.llseek(t,0,+"2");var s=typeof n!="undefined";!s&&t.seekable&&(n=t.position);var o=ft.writeSync(t.nfd,tt.bufferFrom(e.buffer),r,i,n);return s||(t.position+=o),o},allocate:function(){throw new y.ErrnoError(eg.EOPNOTSUPP)},mmap:function(t,e,r,i,n,s){if(t.stream_ops)return Vl.mmap(t,e,r,i,n,s);if(e!==0)throw new y.ErrnoError(28);var o=mP(r);return y.read(t,Zi,o,r,i),{ptr:o,allocated:!0}},msync:function(t,e,r,i,n){return t.stream_ops?Vl.msync(t,e,r,i,n):(n&2||y.write(t,e,0,i,r),0)},munmap:function(){return 0},ioctl:function(){throw new y.ErrnoError(eg.ENOTTY)}},y={root:null,mounts:[],devices:{},streams:[],nextInode:1,nameTable:null,currentPath:"/",initialized:!1,ignorePermissions:!0,trackingDelegate:{},tracking:{openFlags:{READ:1,WRITE:2}},ErrnoError:null,genericErrors:{},filesystems:null,syncFSRequests:0,lookupPath:function(t,e){if(t=wa.resolve(y.cwd(),t),e=e||{},!t)return{path:"",node:null};var r={follow_mount:!0,recurse_count:0};for(var i in r)e[i]===void 0&&(e[i]=r[i]);if(e.recurse_count>8)throw new y.ErrnoError(32);for(var n=yt.normalizeArray(t.split("/").filter(function(f){return!!f}),!1),s=y.root,o="/",a=0;a40)throw new y.ErrnoError(32)}}return{path:o,node:s}},getPath:function(t){for(var e;;){if(y.isRoot(t)){var r=t.mount.mountpoint;return e?r[r.length-1]!=="/"?r+"/"+e:r+e:r}e=e?t.name+"/"+e:t.name,t=t.parent}},hashName:function(t,e){for(var r=0,i=0;i>>0)%y.nameTable.length},hashAddNode:function(t){var e=y.hashName(t.parent.id,t.name);t.name_next=y.nameTable[e],y.nameTable[e]=t},hashRemoveNode:function(t){var e=y.hashName(t.parent.id,t.name);if(y.nameTable[e]===t)y.nameTable[e]=t.name_next;else for(var r=y.nameTable[e];r;){if(r.name_next===t){r.name_next=t.name_next;break}r=r.name_next}},lookupNode:function(t,e){var r=y.mayLookup(t);if(r)throw new y.ErrnoError(r,t);for(var i=y.hashName(t.id,e),n=y.nameTable[i];n;n=n.name_next){var s=n.name;if(n.parent.id===t.id&&s===e)return n}return y.lookup(t,e)},createNode:function(t,e,r,i){var n=new y.FSNode(t,e,r,i);return y.hashAddNode(n),n},destroyNode:function(t){y.hashRemoveNode(t)},isRoot:function(t){return t===t.parent},isMountpoint:function(t){return!!t.mounted},isFile:function(t){return(t&61440)==32768},isDir:function(t){return(t&61440)==16384},isLink:function(t){return(t&61440)==40960},isChrdev:function(t){return(t&61440)==8192},isBlkdev:function(t){return(t&61440)==24576},isFIFO:function(t){return(t&61440)==4096},isSocket:function(t){return(t&49152)==49152},flagModes:{r:0,"r+":2,w:577,"w+":578,a:1089,"a+":1090},modeStringToFlags:function(t){var e=y.flagModes[t];if(typeof e=="undefined")throw new Error("Unknown file open mode: "+t);return e},flagsToPermissionString:function(t){var e=["r","w","rw"][t&3];return t&512&&(e+="w"),e},nodePermissions:function(t,e){return y.ignorePermissions?0:e.includes("r")&&!(t.mode&292)||e.includes("w")&&!(t.mode&146)||e.includes("x")&&!(t.mode&73)?2:0},mayLookup:function(t){var e=y.nodePermissions(t,"x");return e||(t.node_ops.lookup?0:2)},mayCreate:function(t,e){try{var r=y.lookupNode(t,e);return 20}catch(i){}return y.nodePermissions(t,"wx")},mayDelete:function(t,e,r){var i;try{i=y.lookupNode(t,e)}catch(s){return s.errno}var n=y.nodePermissions(t,"wx");if(n)return n;if(r){if(!y.isDir(i.mode))return 54;if(y.isRoot(i)||y.getPath(i)===y.cwd())return 10}else if(y.isDir(i.mode))return 31;return 0},mayOpen:function(t,e){return t?y.isLink(t.mode)?32:y.isDir(t.mode)&&(y.flagsToPermissionString(e)!=="r"||e&512)?31:y.nodePermissions(t,y.flagsToPermissionString(e)):44},MAX_OPEN_FDS:4096,nextfd:function(t,e){t=t||0,e=e||y.MAX_OPEN_FDS;for(var r=t;r<=e;r++)if(!y.streams[r])return r;throw new y.ErrnoError(33)},getStream:function(t){return y.streams[t]},createStream:function(t,e,r){y.FSStream||(y.FSStream=function(){},y.FSStream.prototype={object:{get:function(){return this.node},set:function(o){this.node=o}},isRead:{get:function(){return(this.flags&2097155)!=1}},isWrite:{get:function(){return(this.flags&2097155)!=0}},isAppend:{get:function(){return this.flags&1024}}});var i=new y.FSStream;for(var n in t)i[n]=t[n];t=i;var s=y.nextfd(e,r);return t.fd=s,y.streams[s]=t,t},closeStream:function(t){y.streams[t]=null},chrdev_stream_ops:{open:function(t){var e=y.getDevice(t.node.rdev);t.stream_ops=e.stream_ops,t.stream_ops.open&&t.stream_ops.open(t)},llseek:function(){throw new y.ErrnoError(70)}},major:function(t){return t>>8},minor:function(t){return t&255},makedev:function(t,e){return t<<8|e},registerDevice:function(t,e){y.devices[t]={stream_ops:e}},getDevice:function(t){return y.devices[t]},getMounts:function(t){for(var e=[],r=[t];r.length;){var i=r.pop();e.push(i),r.push.apply(r,i.mounts)}return e},syncfs:function(t,e){typeof t=="function"&&(e=t,t=!1),y.syncFSRequests++,y.syncFSRequests>1&&Di("warning: "+y.syncFSRequests+" FS.syncfs operations in flight at once, probably just doing extra work");var r=y.getMounts(y.root.mount),i=0;function n(o){return y.syncFSRequests--,e(o)}function s(o){if(o)return s.errored?void 0:(s.errored=!0,n(o));++i>=r.length&&n(null)}r.forEach(function(o){if(!o.type.syncfs)return s(null);o.type.syncfs(o,t,s)})},mount:function(t,e,r){var i=r==="/",n=!r,s;if(i&&y.root)throw new y.ErrnoError(10);if(!i&&!n){var o=y.lookupPath(r,{follow_mount:!1});if(r=o.path,s=o.node,y.isMountpoint(s))throw new y.ErrnoError(10);if(!y.isDir(s.mode))throw new y.ErrnoError(54)}var a={type:t,opts:e,mountpoint:r,mounts:[]},l=t.mount(a);return l.mount=a,a.root=l,i?y.root=l:s&&(s.mounted=a,s.mount&&s.mount.mounts.push(a)),l},unmount:function(t){var e=y.lookupPath(t,{follow_mount:!1});if(!y.isMountpoint(e.node))throw new y.ErrnoError(28);var r=e.node,i=r.mounted,n=y.getMounts(i);Object.keys(y.nameTable).forEach(function(o){for(var a=y.nameTable[o];a;){var l=a.name_next;n.includes(a.mount)&&y.destroyNode(a),a=l}}),r.mounted=null;var s=r.mount.mounts.indexOf(i);r.mount.mounts.splice(s,1)},lookup:function(t,e){return t.node_ops.lookup(t,e)},mknod:function(t,e,r){var i=y.lookupPath(t,{parent:!0}),n=i.node,s=yt.basename(t);if(!s||s==="."||s==="..")throw new y.ErrnoError(28);var o=y.mayCreate(n,s);if(o)throw new y.ErrnoError(o);if(!n.node_ops.mknod)throw new y.ErrnoError(63);return n.node_ops.mknod(n,s,e,r)},create:function(t,e){return e=e!==void 0?e:438,e&=4095,e|=32768,y.mknod(t,e,0)},mkdir:function(t,e){return e=e!==void 0?e:511,e&=511|512,e|=16384,y.mknod(t,e,0)},mkdirTree:function(t,e){for(var r=t.split("/"),i="",n=0;nthis.length-1||f<0)){var h=f%this.chunkSize,p=f/this.chunkSize|0;return this.getter(p)[h]}},s.prototype.setDataGetter=function(f){this.getter=f},s.prototype.cacheLength=function(){var f=new XMLHttpRequest;if(f.open("HEAD",r,!1),f.send(null),!(f.status>=200&&f.status<300||f.status===304))throw new Error("Couldn't load "+r+". Status: "+f.status);var h=Number(f.getResponseHeader("Content-length")),p,d=(p=f.getResponseHeader("Accept-Ranges"))&&p==="bytes",m=(p=f.getResponseHeader("Content-Encoding"))&&p==="gzip",E=1024*1024;d||(E=h);var B=function(R,H){if(R>H)throw new Error("invalid range ("+R+", "+H+") or no bytes requested!");if(H>h-1)throw new Error("only "+h+" bytes available! programmer error!");var L=new XMLHttpRequest;if(L.open("GET",r,!1),h!==E&&L.setRequestHeader("Range","bytes="+R+"-"+H),typeof Uint8Array!="undefined"&&(L.responseType="arraybuffer"),L.overrideMimeType&&L.overrideMimeType("text/plain; charset=x-user-defined"),L.send(null),!(L.status>=200&&L.status<300||L.status===304))throw new Error("Couldn't load "+r+". Status: "+L.status);return L.response!==void 0?new Uint8Array(L.response||[]):CP(L.responseText||"",!0)},b=this;b.setDataGetter(function(R){var H=R*E,L=(R+1)*E-1;if(L=Math.min(L,h-1),typeof b.chunks[R]=="undefined"&&(b.chunks[R]=B(H,L)),typeof b.chunks[R]=="undefined")throw new Error("doXHR failed!");return b.chunks[R]}),(m||!h)&&(E=h=1,h=this.getter(0).length,E=h,$y("LazyFiles on gzip forces download of the whole file when length is accessed")),this._length=h,this._chunkSize=E,this.lengthKnown=!0},typeof XMLHttpRequest!="undefined"){if(!iz)throw"Cannot do synchronous binary XHRs outside webworkers in modern browsers. Use --embed-file or --preload-file in emcc";var o=new s;Object.defineProperties(o,{length:{get:function(){return this.lengthKnown||this.cacheLength(),this._length}},chunkSize:{get:function(){return this.lengthKnown||this.cacheLength(),this._chunkSize}}});var a={isDevice:!1,contents:o}}else var a={isDevice:!1,url:r};var l=y.createFile(t,e,a,i,n);a.contents?l.contents=a.contents:a.url&&(l.contents=null,l.url=a.url),Object.defineProperties(l,{usedBytes:{get:function(){return this.contents.length}}});var c={},u=Object.keys(l.stream_ops);return u.forEach(function(g){var f=l.stream_ops[g];c[g]=function(){return y.forceLoadFile(l),f.apply(null,arguments)}}),c.read=function(f,h,p,d,m){y.forceLoadFile(l);var E=f.node.contents;if(m>=E.length)return 0;var B=Math.min(E.length-m,d);if(E.slice)for(var b=0;b>2]=i.dev,_e[r+4>>2]=0,_e[r+8>>2]=i.ino,_e[r+12>>2]=i.mode,_e[r+16>>2]=i.nlink,_e[r+20>>2]=i.uid,_e[r+24>>2]=i.gid,_e[r+28>>2]=i.rdev,_e[r+32>>2]=0,ya=[i.size>>>0,(ai=i.size,+Math.abs(ai)>=1?ai>0?(Math.min(+Math.floor(ai/4294967296),4294967295)|0)>>>0:~~+Math.ceil((ai-+(~~ai>>>0))/4294967296)>>>0:0)],_e[r+40>>2]=ya[0],_e[r+44>>2]=ya[1],_e[r+48>>2]=4096,_e[r+52>>2]=i.blocks,_e[r+56>>2]=i.atime.getTime()/1e3|0,_e[r+60>>2]=0,_e[r+64>>2]=i.mtime.getTime()/1e3|0,_e[r+68>>2]=0,_e[r+72>>2]=i.ctime.getTime()/1e3|0,_e[r+76>>2]=0,ya=[i.ino>>>0,(ai=i.ino,+Math.abs(ai)>=1?ai>0?(Math.min(+Math.floor(ai/4294967296),4294967295)|0)>>>0:~~+Math.ceil((ai-+(~~ai>>>0))/4294967296)>>>0:0)],_e[r+80>>2]=ya[0],_e[r+84>>2]=ya[1],0},doMsync:function(t,e,r,i,n){var s=$u.slice(t,t+r);y.msync(e,s,n,r,i)},doMkdir:function(t,e){return t=yt.normalize(t),t[t.length-1]==="/"&&(t=t.substr(0,t.length-1)),y.mkdir(t,e,0),0},doMknod:function(t,e,r){switch(e&61440){case 32768:case 8192:case 24576:case 4096:case 49152:break;default:return-28}return y.mknod(t,e,r),0},doReadlink:function(t,e,r){if(r<=0)return-28;var i=y.readlink(t),n=Math.min(r,rw(i)),s=Zi[e+n];return uz(i,e,r+1),Zi[e+n]=s,n},doAccess:function(t,e){if(e&~7)return-28;var r,i=y.lookupPath(t,{follow:!0});if(r=i.node,!r)return-44;var n="";return e&4&&(n+="r"),e&2&&(n+="w"),e&1&&(n+="x"),n&&y.nodePermissions(r,n)?-2:0},doDup:function(t,e,r){var i=y.getStream(r);return i&&y.close(i),y.open(t,e,0,r,r).fd},doReadv:function(t,e,r,i){for(var n=0,s=0;s>2],a=_e[e+(s*8+4)>>2],l=y.read(t,Zi,o,a,i);if(l<0)return-1;if(n+=l,l>2],a=_e[e+(s*8+4)>>2],l=y.write(t,Zi,o,a,i);if(l<0)return-1;n+=l}return n},varargs:void 0,get:function(){Ot.varargs+=4;var t=_e[Ot.varargs-4>>2];return t},getStr:function(t){var e=cz(t);return e},getStreamFromFD:function(t){var e=y.getStream(t);if(!e)throw new y.ErrnoError(8);return e},get64:function(t,e){return t}};function qxe(t,e){try{return t=Ot.getStr(t),y.chmod(t,e),0}catch(r){return(typeof y=="undefined"||!(r instanceof y.ErrnoError))&&Gr(r),-r.errno}}function Wxe(t){return _e[Jxe()>>2]=t,t}function zxe(t,e,r){Ot.varargs=r;try{var i=Ot.getStreamFromFD(t);switch(e){case 0:{var n=Ot.get();if(n<0)return-28;var s;return s=y.open(i.path,i.flags,0,n),s.fd}case 1:case 2:return 0;case 3:return i.flags;case 4:{var n=Ot.get();return i.flags|=n,0}case 12:{var n=Ot.get(),o=0;return cP[n+o>>1]=2,0}case 13:case 14:return 0;case 16:case 8:return-28;case 9:return Wxe(28),-1;default:return-28}}catch(a){return(typeof y=="undefined"||!(a instanceof y.ErrnoError))&&Gr(a),-a.errno}}function Vxe(t,e){try{var r=Ot.getStreamFromFD(t);return Ot.doStat(y.stat,r.path,e)}catch(i){return(typeof y=="undefined"||!(i instanceof y.ErrnoError))&&Gr(i),-i.errno}}function _xe(t,e,r){Ot.varargs=r;try{var i=Ot.getStreamFromFD(t);switch(e){case 21509:case 21505:return i.tty?0:-59;case 21510:case 21511:case 21512:case 21506:case 21507:case 21508:return i.tty?0:-59;case 21519:{if(!i.tty)return-59;var n=Ot.get();return _e[n>>2]=0,0}case 21520:return i.tty?-28:-59;case 21531:{var n=Ot.get();return y.ioctl(i,e,n)}case 21523:return i.tty?0:-59;case 21524:return i.tty?0:-59;default:Gr("bad ioctl syscall "+e)}}catch(s){return(typeof y=="undefined"||!(s instanceof y.ErrnoError))&&Gr(s),-s.errno}}function Xxe(t,e,r){Ot.varargs=r;try{var i=Ot.getStr(t),n=r?Ot.get():0,s=y.open(i,e,n);return s.fd}catch(o){return(typeof y=="undefined"||!(o instanceof y.ErrnoError))&&Gr(o),-o.errno}}function Zxe(t,e){try{return t=Ot.getStr(t),e=Ot.getStr(e),y.rename(t,e),0}catch(r){return(typeof y=="undefined"||!(r instanceof y.ErrnoError))&&Gr(r),-r.errno}}function $xe(t){try{return t=Ot.getStr(t),y.rmdir(t),0}catch(e){return(typeof y=="undefined"||!(e instanceof y.ErrnoError))&&Gr(e),-e.errno}}function eke(t,e){try{return t=Ot.getStr(t),Ot.doStat(y.stat,t,e)}catch(r){return(typeof y=="undefined"||!(r instanceof y.ErrnoError))&&Gr(r),-r.errno}}function tke(t){try{return t=Ot.getStr(t),y.unlink(t),0}catch(e){return(typeof y=="undefined"||!(e instanceof y.ErrnoError))&&Gr(e),-e.errno}}function rke(t,e,r){$u.copyWithin(t,e,e+r)}function ike(t){try{return ew.grow(t-gP.byteLength+65535>>>16),pz(ew.buffer),1}catch(e){}}function nke(t){var e=$u.length;t=t>>>0;var r=2147483648;if(t>r)return!1;for(var i=1;i<=4;i*=2){var n=e*(1+.2/i);n=Math.min(n,t+100663296);var s=Math.min(r,xxe(Math.max(t,n),65536)),o=ike(s);if(o)return!0}return!1}function ske(t){try{var e=Ot.getStreamFromFD(t);return y.close(e),0}catch(r){return(typeof y=="undefined"||!(r instanceof y.ErrnoError))&&Gr(r),r.errno}}function oke(t,e){try{var r=Ot.getStreamFromFD(t),i=r.tty?2:y.isDir(r.mode)?3:y.isLink(r.mode)?7:4;return Zi[e>>0]=i,0}catch(n){return(typeof y=="undefined"||!(n instanceof y.ErrnoError))&&Gr(n),n.errno}}function ake(t,e,r,i){try{var n=Ot.getStreamFromFD(t),s=Ot.doReadv(n,e,r);return _e[i>>2]=s,0}catch(o){return(typeof y=="undefined"||!(o instanceof y.ErrnoError))&&Gr(o),o.errno}}function Ake(t,e,r,i,n){try{var s=Ot.getStreamFromFD(t),o=4294967296,a=r*o+(e>>>0),l=9007199254740992;return a<=-l||a>=l?-61:(y.llseek(s,a,i),ya=[s.position>>>0,(ai=s.position,+Math.abs(ai)>=1?ai>0?(Math.min(+Math.floor(ai/4294967296),4294967295)|0)>>>0:~~+Math.ceil((ai-+(~~ai>>>0))/4294967296)>>>0:0)],_e[n>>2]=ya[0],_e[n+4>>2]=ya[1],s.getdents&&a===0&&i===0&&(s.getdents=null),0)}catch(c){return(typeof y=="undefined"||!(c instanceof y.ErrnoError))&&Gr(c),c.errno}}function lke(t,e,r,i){try{var n=Ot.getStreamFromFD(t),s=Ot.doWritev(n,e,r);return _e[i>>2]=s,0}catch(o){return(typeof y=="undefined"||!(o instanceof y.ErrnoError))&&Gr(o),o.errno}}function cke(t){Exe(t)}function uke(t){var e=Date.now()/1e3|0;return t&&(_e[t>>2]=e),e}function EP(){if(EP.called)return;EP.called=!0;var t=new Date().getFullYear(),e=new Date(t,0,1),r=new Date(t,6,1),i=e.getTimezoneOffset(),n=r.getTimezoneOffset(),s=Math.max(i,n);_e[fke()>>2]=s*60,_e[gke()>>2]=Number(i!=n);function o(g){var f=g.toTimeString().match(/\(([A-Za-z ]+)\)$/);return f?f[1]:"GMT"}var a=o(e),l=o(r),c=uP(a),u=uP(l);n>2]=c,_e[nw()+4>>2]=u):(_e[nw()>>2]=u,_e[nw()+4>>2]=c)}function hke(t){EP();var e=Date.UTC(_e[t+20>>2]+1900,_e[t+16>>2],_e[t+12>>2],_e[t+8>>2],_e[t+4>>2],_e[t>>2],0),r=new Date(e);_e[t+24>>2]=r.getUTCDay();var i=Date.UTC(r.getUTCFullYear(),0,1,0,0,0,0),n=(r.getTime()-i)/(1e3*60*60*24)|0;return _e[t+28>>2]=n,r.getTime()/1e3|0}var Bz=function(t,e,r,i){t||(t=this),this.parent=t,this.mount=t.mount,this.mounted=null,this.id=y.nextInode++,this.name=e,this.mode=r,this.node_ops={},this.stream_ops={},this.rdev=i},sw=292|73,ow=146;Object.defineProperties(Bz.prototype,{read:{get:function(){return(this.mode&sw)===sw},set:function(t){t?this.mode|=sw:this.mode&=~sw}},write:{get:function(){return(this.mode&ow)===ow},set:function(t){t?this.mode|=ow:this.mode&=~ow}},isFolder:{get:function(){return y.isDir(this.mode)}},isDevice:{get:function(){return y.isChrdev(this.mode)}}});y.FSNode=Bz;y.staticInit();Wl&&(ft=ez,IP=require("path"),tt.staticInit());var ft,IP;if(Wl){Qz=function(t){return function(){try{return t.apply(this,arguments)}catch(e){throw e.code?new y.ErrnoError(eg[e.code]):e}}},Vl=Object.assign({},y);for(yP in wz)y[yP]=Qz(wz[yP])}else throw new Error("NODERAWFS is currently only supported on Node.js environment.");var Qz,Vl,yP;function CP(t,e,r){var i=r>0?r:rw(t)+1,n=new Array(i),s=tw(t,n,0,n.length);return e&&(n.length=s),n}var pke=typeof atob=="function"?atob:function(t){var e="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=",r="",i,n,s,o,a,l,c,u=0;t=t.replace(/[^A-Za-z0-9\+\/\=]/g,"");do o=e.indexOf(t.charAt(u++)),a=e.indexOf(t.charAt(u++)),l=e.indexOf(t.charAt(u++)),c=e.indexOf(t.charAt(u++)),i=o<<2|a>>4,n=(a&15)<<4|l>>2,s=(l&3)<<6|c,r=r+String.fromCharCode(i),l!==64&&(r=r+String.fromCharCode(n)),c!==64&&(r=r+String.fromCharCode(s));while(u0||(Fxe(),zl>0))return;function e(){aw||(aw=!0,oe.calledRun=!0,!Az&&(Nxe(),oe.onRuntimeInitialized&&oe.onRuntimeInitialized(),Txe()))}oe.setStatus?(oe.setStatus("Running..."),setTimeout(function(){setTimeout(function(){oe.setStatus("")},1),e()},1)):e()}oe.run=wP;if(oe.preInit)for(typeof oe.preInit=="function"&&(oe.preInit=[oe.preInit]);oe.preInit.length>0;)oe.preInit.pop()();wP()});var xz=I((Dot,Sz)=>{"use strict";function Cke(t,e){function r(){this.constructor=t}r.prototype=e.prototype,t.prototype=new r}function _l(t,e,r,i){this.message=t,this.expected=e,this.found=r,this.location=i,this.name="SyntaxError",typeof Error.captureStackTrace=="function"&&Error.captureStackTrace(this,_l)}Cke(_l,Error);_l.buildMessage=function(t,e){var r={literal:function(c){return'"'+n(c.text)+'"'},class:function(c){var u="",g;for(g=0;g0){for(g=1,f=1;g>",ee=At(">>",!1),Ue=">&",Oe=At(">&",!1),vt=">",dt=At(">",!1),ri="<<<",ii=At("<<<",!1),an="<&",yr=At("<&",!1),Ki="<",Qi=At("<",!1),Go=function(C){return{type:"argument",segments:[].concat(...C)}},wr=function(C){return C},Ui="'",ws=At("'",!1),Tf=function(C){return[{type:"text",text:C}]},Mf='"',Rm=At('"',!1),Fm=function(C){return C},Nm=function(C){return{type:"arithmetic",arithmetic:C,quoted:!0}},DQ=function(C){return{type:"shell",shell:C,quoted:!0}},RQ=function(C){return _(P({type:"variable"},C),{quoted:!0})},Of=function(C){return{type:"text",text:C}},FQ=function(C){return{type:"arithmetic",arithmetic:C,quoted:!1}},NQ=function(C){return{type:"shell",shell:C,quoted:!1}},Lm=function(C){return _(P({type:"variable"},C),{quoted:!1})},LQ=function(C){return{type:"glob",pattern:C}},Va="\\",jo=At("\\",!1),Tm=/^[\\']/,Mm=Qs(["\\","'"],!1,!1),te=function(C){return C},Om=/^[^']/,Km=Qs(["'"],!0,!1),il=function(C){return C.join("")},Um=/^[\\$"]/,Hm=Qs(["\\","$",'"'],!1,!1),Kf=/^[^$"]/,Gm=Qs(["$",'"'],!0,!1),jm="\\0",TQ=At("\\0",!1),MQ=function(){return"\0"},Ym="\\a",qm=At("\\a",!1),Jm=function(){return"a"},Wm="\\b",zm=At("\\b",!1),Vm=function(){return"\b"},Uf="\\e",OQ=At("\\e",!1),KQ=function(){return""},_m="\\f",UQ=At("\\f",!1),HQ=function(){return"\f"},O="\\n",ht=At("\\n",!1),Vc=function(){return` +`},xn="\\r",Hf=At("\\r",!1),Ye=function(){return"\r"},nl="\\t",Xm=At("\\t",!1),MM=function(){return" "},GQ="\\v",OM=At("\\v",!1),fr=function(){return"\v"},Bs="\\x",jQ=At("\\x",!1),Zm=function(C){return String.fromCharCode(parseInt(C,16))},Yo="\\u",$m=At("\\u",!1),_a="\\U",et=At("\\U",!1),YQ=function(C){return String.fromCodePoint(parseInt(C,16))},eI=/^[0-9a-fA-f]/,tI=Qs([["0","9"],["a","f"],["A","f"]],!1,!1),Xa=Cfe(),sl="-",ol=At("-",!1),al="+",qo=At("+",!1),Al=".",qQ=At(".",!1),rI=function(C,Q,k){return{type:"number",value:(C==="-"?-1:1)*parseFloat(Q.join("")+"."+k.join(""))}},iI=function(C,Q){return{type:"number",value:(C==="-"?-1:1)*parseInt(Q.join(""))}},JQ=function(C){return P({type:"variable"},C)},ll=function(C){return{type:"variable",name:C}},WQ=function(C){return C},nI="*",Gf=At("*",!1),_c="/",jf=At("/",!1),sI=function(C,Q,k){return{type:Q==="*"?"multiplication":"division",right:k}},cl=function(C,Q){return Q.reduce((k,N)=>P({left:k},N),C)},oI=function(C,Q,k){return{type:Q==="+"?"addition":"subtraction",right:k}},Yf="$((",Xc=At("$((",!1),xr="))",KM=At("))",!1),Jo=function(C){return C},Zs="$(",aI=At("$(",!1),Zc=function(C){return C},x="${",U=At("${",!1),le=":-",xe=At(":-",!1),Qe=function(C,Q){return{name:C,defaultValue:Q}},Ge=":-}",ct=At(":-}",!1),sr=function(C){return{name:C,defaultValue:[]}},Wo=function(C){return{name:C}},Afe="$",lfe=At("$",!1),cfe=function(C){return e.isGlobPattern(C)},ufe=function(C){return C},UM=/^[a-zA-Z0-9_]/,HM=Qs([["a","z"],["A","Z"],["0","9"],"_"],!1,!1),GM=function(){return dfe()},jM=/^[$@*?#a-zA-Z0-9_\-]/,YM=Qs(["$","@","*","?","#",["a","z"],["A","Z"],["0","9"],"_","-"],!1,!1),gfe=/^[(){}<>$|&; \t"']/,ffe=Qs(["(",")","{","}","<",">","$","|","&",";"," "," ",'"',"'"],!1,!1),hfe=/^[<>&; \t"']/,pfe=Qs(["<",">","&",";"," "," ",'"',"'"],!1,!1),qM=/^[ \t]/,JM=Qs([" "," "],!1,!1),w=0,Re=0,AI=[{line:1,column:1}],$s=0,zQ=[],we=0,lI;if("startRule"in e){if(!(e.startRule in i))throw new Error(`Can't start parsing from rule "`+e.startRule+'".');n=i[e.startRule]}function dfe(){return t.substring(Re,w)}function P_e(){return qf(Re,w)}function D_e(C,Q){throw Q=Q!==void 0?Q:qf(Re,w),zM([Ife(C)],t.substring(Re,w),Q)}function R_e(C,Q){throw Q=Q!==void 0?Q:qf(Re,w),Efe(C,Q)}function At(C,Q){return{type:"literal",text:C,ignoreCase:Q}}function Qs(C,Q,k){return{type:"class",parts:C,inverted:Q,ignoreCase:k}}function Cfe(){return{type:"any"}}function mfe(){return{type:"end"}}function Ife(C){return{type:"other",description:C}}function WM(C){var Q=AI[C],k;if(Q)return Q;for(k=C-1;!AI[k];)k--;for(Q=AI[k],Q={line:Q.line,column:Q.column};k$s&&($s=w,zQ=[]),zQ.push(C))}function Efe(C,Q){return new _l(C,null,null,Q)}function zM(C,Q,k){return new _l(_l.buildMessage(C,Q),C,Q,k)}function VM(){var C,Q;return C=w,Q=Jf(),Q===r&&(Q=null),Q!==r&&(Re=C,Q=s(Q)),C=Q,C}function Jf(){var C,Q,k,N,Z;if(C=w,Q=VQ(),Q!==r){for(k=[],N=ke();N!==r;)k.push(N),N=ke();k!==r?(N=_M(),N!==r?(Z=yfe(),Z===r&&(Z=null),Z!==r?(Re=C,Q=o(Q,N,Z),C=Q):(w=C,C=r)):(w=C,C=r)):(w=C,C=r)}else w=C,C=r;if(C===r)if(C=w,Q=VQ(),Q!==r){for(k=[],N=ke();N!==r;)k.push(N),N=ke();k!==r?(N=_M(),N===r&&(N=null),N!==r?(Re=C,Q=a(Q,N),C=Q):(w=C,C=r)):(w=C,C=r)}else w=C,C=r;return C}function yfe(){var C,Q,k,N,Z;for(C=w,Q=[],k=ke();k!==r;)Q.push(k),k=ke();if(Q!==r)if(k=Jf(),k!==r){for(N=[],Z=ke();Z!==r;)N.push(Z),Z=ke();N!==r?(Re=C,Q=l(k),C=Q):(w=C,C=r)}else w=C,C=r;else w=C,C=r;return C}function _M(){var C;return t.charCodeAt(w)===59?(C=c,w++):(C=r,we===0&&ve(u)),C===r&&(t.charCodeAt(w)===38?(C=g,w++):(C=r,we===0&&ve(f))),C}function VQ(){var C,Q,k;return C=w,Q=XM(),Q!==r?(k=wfe(),k===r&&(k=null),k!==r?(Re=C,Q=h(Q,k),C=Q):(w=C,C=r)):(w=C,C=r),C}function wfe(){var C,Q,k,N,Z,Ie,ot;for(C=w,Q=[],k=ke();k!==r;)Q.push(k),k=ke();if(Q!==r)if(k=Bfe(),k!==r){for(N=[],Z=ke();Z!==r;)N.push(Z),Z=ke();if(N!==r)if(Z=VQ(),Z!==r){for(Ie=[],ot=ke();ot!==r;)Ie.push(ot),ot=ke();Ie!==r?(Re=C,Q=p(k,Z),C=Q):(w=C,C=r)}else w=C,C=r;else w=C,C=r}else w=C,C=r;else w=C,C=r;return C}function Bfe(){var C;return t.substr(w,2)===d?(C=d,w+=2):(C=r,we===0&&ve(m)),C===r&&(t.substr(w,2)===E?(C=E,w+=2):(C=r,we===0&&ve(B))),C}function XM(){var C,Q,k;return C=w,Q=vfe(),Q!==r?(k=Qfe(),k===r&&(k=null),k!==r?(Re=C,Q=b(Q,k),C=Q):(w=C,C=r)):(w=C,C=r),C}function Qfe(){var C,Q,k,N,Z,Ie,ot;for(C=w,Q=[],k=ke();k!==r;)Q.push(k),k=ke();if(Q!==r)if(k=bfe(),k!==r){for(N=[],Z=ke();Z!==r;)N.push(Z),Z=ke();if(N!==r)if(Z=XM(),Z!==r){for(Ie=[],ot=ke();ot!==r;)Ie.push(ot),ot=ke();Ie!==r?(Re=C,Q=R(k,Z),C=Q):(w=C,C=r)}else w=C,C=r;else w=C,C=r}else w=C,C=r;else w=C,C=r;return C}function bfe(){var C;return t.substr(w,2)===H?(C=H,w+=2):(C=r,we===0&&ve(L)),C===r&&(t.charCodeAt(w)===124?(C=K,w++):(C=r,we===0&&ve(J))),C}function cI(){var C,Q,k,N,Z,Ie;if(C=w,Q=oO(),Q!==r)if(t.charCodeAt(w)===61?(k=ne,w++):(k=r,we===0&&ve(q)),k!==r)if(N=$M(),N!==r){for(Z=[],Ie=ke();Ie!==r;)Z.push(Ie),Ie=ke();Z!==r?(Re=C,Q=A(Q,N),C=Q):(w=C,C=r)}else w=C,C=r;else w=C,C=r;else w=C,C=r;if(C===r)if(C=w,Q=oO(),Q!==r)if(t.charCodeAt(w)===61?(k=ne,w++):(k=r,we===0&&ve(q)),k!==r){for(N=[],Z=ke();Z!==r;)N.push(Z),Z=ke();N!==r?(Re=C,Q=V(Q),C=Q):(w=C,C=r)}else w=C,C=r;else w=C,C=r;return C}function vfe(){var C,Q,k,N,Z,Ie,ot,ut,Tr,ni,Yn;for(C=w,Q=[],k=ke();k!==r;)Q.push(k),k=ke();if(Q!==r)if(t.charCodeAt(w)===40?(k=W,w++):(k=r,we===0&&ve(X)),k!==r){for(N=[],Z=ke();Z!==r;)N.push(Z),Z=ke();if(N!==r)if(Z=Jf(),Z!==r){for(Ie=[],ot=ke();ot!==r;)Ie.push(ot),ot=ke();if(Ie!==r)if(t.charCodeAt(w)===41?(ot=F,w++):(ot=r,we===0&&ve(D)),ot!==r){for(ut=[],Tr=ke();Tr!==r;)ut.push(Tr),Tr=ke();if(ut!==r){for(Tr=[],ni=Wf();ni!==r;)Tr.push(ni),ni=Wf();if(Tr!==r){for(ni=[],Yn=ke();Yn!==r;)ni.push(Yn),Yn=ke();ni!==r?(Re=C,Q=he(Z,Tr),C=Q):(w=C,C=r)}else w=C,C=r}else w=C,C=r}else w=C,C=r;else w=C,C=r}else w=C,C=r;else w=C,C=r}else w=C,C=r;else w=C,C=r;if(C===r){for(C=w,Q=[],k=ke();k!==r;)Q.push(k),k=ke();if(Q!==r)if(t.charCodeAt(w)===123?(k=pe,w++):(k=r,we===0&&ve(Ne)),k!==r){for(N=[],Z=ke();Z!==r;)N.push(Z),Z=ke();if(N!==r)if(Z=Jf(),Z!==r){for(Ie=[],ot=ke();ot!==r;)Ie.push(ot),ot=ke();if(Ie!==r)if(t.charCodeAt(w)===125?(ot=Pe,w++):(ot=r,we===0&&ve(qe)),ot!==r){for(ut=[],Tr=ke();Tr!==r;)ut.push(Tr),Tr=ke();if(ut!==r){for(Tr=[],ni=Wf();ni!==r;)Tr.push(ni),ni=Wf();if(Tr!==r){for(ni=[],Yn=ke();Yn!==r;)ni.push(Yn),Yn=ke();ni!==r?(Re=C,Q=re(Z,Tr),C=Q):(w=C,C=r)}else w=C,C=r}else w=C,C=r}else w=C,C=r;else w=C,C=r}else w=C,C=r;else w=C,C=r}else w=C,C=r;else w=C,C=r;if(C===r){for(C=w,Q=[],k=ke();k!==r;)Q.push(k),k=ke();if(Q!==r){for(k=[],N=cI();N!==r;)k.push(N),N=cI();if(k!==r){for(N=[],Z=ke();Z!==r;)N.push(Z),Z=ke();if(N!==r){if(Z=[],Ie=ZM(),Ie!==r)for(;Ie!==r;)Z.push(Ie),Ie=ZM();else Z=r;if(Z!==r){for(Ie=[],ot=ke();ot!==r;)Ie.push(ot),ot=ke();Ie!==r?(Re=C,Q=se(k,Z),C=Q):(w=C,C=r)}else w=C,C=r}else w=C,C=r}else w=C,C=r}else w=C,C=r;if(C===r){for(C=w,Q=[],k=ke();k!==r;)Q.push(k),k=ke();if(Q!==r){if(k=[],N=cI(),N!==r)for(;N!==r;)k.push(N),N=cI();else k=r;if(k!==r){for(N=[],Z=ke();Z!==r;)N.push(Z),Z=ke();N!==r?(Re=C,Q=be(k),C=Q):(w=C,C=r)}else w=C,C=r}else w=C,C=r}}}return C}function Sfe(){var C,Q,k,N,Z;for(C=w,Q=[],k=ke();k!==r;)Q.push(k),k=ke();if(Q!==r){if(k=[],N=uI(),N!==r)for(;N!==r;)k.push(N),N=uI();else k=r;if(k!==r){for(N=[],Z=ke();Z!==r;)N.push(Z),Z=ke();N!==r?(Re=C,Q=ae(k),C=Q):(w=C,C=r)}else w=C,C=r}else w=C,C=r;return C}function ZM(){var C,Q,k;for(C=w,Q=[],k=ke();k!==r;)Q.push(k),k=ke();if(Q!==r?(k=Wf(),k!==r?(Re=C,Q=Ae(k),C=Q):(w=C,C=r)):(w=C,C=r),C===r){for(C=w,Q=[],k=ke();k!==r;)Q.push(k),k=ke();Q!==r?(k=uI(),k!==r?(Re=C,Q=Ae(k),C=Q):(w=C,C=r)):(w=C,C=r)}return C}function Wf(){var C,Q,k,N,Z;for(C=w,Q=[],k=ke();k!==r;)Q.push(k),k=ke();return Q!==r?(De.test(t.charAt(w))?(k=t.charAt(w),w++):(k=r,we===0&&ve($)),k===r&&(k=null),k!==r?(N=xfe(),N!==r?(Z=uI(),Z!==r?(Re=C,Q=G(k,N,Z),C=Q):(w=C,C=r)):(w=C,C=r)):(w=C,C=r)):(w=C,C=r),C}function xfe(){var C;return t.substr(w,2)===Ce?(C=Ce,w+=2):(C=r,we===0&&ve(ee)),C===r&&(t.substr(w,2)===Ue?(C=Ue,w+=2):(C=r,we===0&&ve(Oe)),C===r&&(t.charCodeAt(w)===62?(C=vt,w++):(C=r,we===0&&ve(dt)),C===r&&(t.substr(w,3)===ri?(C=ri,w+=3):(C=r,we===0&&ve(ii)),C===r&&(t.substr(w,2)===an?(C=an,w+=2):(C=r,we===0&&ve(yr)),C===r&&(t.charCodeAt(w)===60?(C=Ki,w++):(C=r,we===0&&ve(Qi))))))),C}function uI(){var C,Q,k;for(C=w,Q=[],k=ke();k!==r;)Q.push(k),k=ke();return Q!==r?(k=$M(),k!==r?(Re=C,Q=Ae(k),C=Q):(w=C,C=r)):(w=C,C=r),C}function $M(){var C,Q,k;if(C=w,Q=[],k=eO(),k!==r)for(;k!==r;)Q.push(k),k=eO();else Q=r;return Q!==r&&(Re=C,Q=Go(Q)),C=Q,C}function eO(){var C,Q;return C=w,Q=kfe(),Q!==r&&(Re=C,Q=wr(Q)),C=Q,C===r&&(C=w,Q=Pfe(),Q!==r&&(Re=C,Q=wr(Q)),C=Q,C===r&&(C=w,Q=Dfe(),Q!==r&&(Re=C,Q=wr(Q)),C=Q)),C}function kfe(){var C,Q,k,N;return C=w,t.charCodeAt(w)===39?(Q=Ui,w++):(Q=r,we===0&&ve(ws)),Q!==r?(k=Rfe(),k!==r?(t.charCodeAt(w)===39?(N=Ui,w++):(N=r,we===0&&ve(ws)),N!==r?(Re=C,Q=Tf(k),C=Q):(w=C,C=r)):(w=C,C=r)):(w=C,C=r),C}function Pfe(){var C,Q,k,N;if(C=w,t.charCodeAt(w)===34?(Q=Mf,w++):(Q=r,we===0&&ve(Rm)),Q!==r){for(k=[],N=tO();N!==r;)k.push(N),N=tO();k!==r?(t.charCodeAt(w)===34?(N=Mf,w++):(N=r,we===0&&ve(Rm)),N!==r?(Re=C,Q=Fm(k),C=Q):(w=C,C=r)):(w=C,C=r)}else w=C,C=r;return C}function Dfe(){var C,Q,k;if(C=w,Q=[],k=rO(),k!==r)for(;k!==r;)Q.push(k),k=rO();else Q=r;return Q!==r&&(Re=C,Q=Fm(Q)),C=Q,C}function tO(){var C,Q;return C=w,Q=nO(),Q!==r&&(Re=C,Q=Nm(Q)),C=Q,C===r&&(C=w,Q=sO(),Q!==r&&(Re=C,Q=DQ(Q)),C=Q,C===r&&(C=w,Q=ZQ(),Q!==r&&(Re=C,Q=RQ(Q)),C=Q,C===r&&(C=w,Q=Ffe(),Q!==r&&(Re=C,Q=Of(Q)),C=Q))),C}function rO(){var C,Q;return C=w,Q=nO(),Q!==r&&(Re=C,Q=FQ(Q)),C=Q,C===r&&(C=w,Q=sO(),Q!==r&&(Re=C,Q=NQ(Q)),C=Q,C===r&&(C=w,Q=ZQ(),Q!==r&&(Re=C,Q=Lm(Q)),C=Q,C===r&&(C=w,Q=Lfe(),Q!==r&&(Re=C,Q=LQ(Q)),C=Q,C===r&&(C=w,Q=Nfe(),Q!==r&&(Re=C,Q=Of(Q)),C=Q)))),C}function Rfe(){var C,Q,k,N,Z;for(C=w,Q=[],k=gI(),k===r&&(k=fI(),k===r&&(k=w,t.charCodeAt(w)===92?(N=Va,w++):(N=r,we===0&&ve(jo)),N!==r?(Tm.test(t.charAt(w))?(Z=t.charAt(w),w++):(Z=r,we===0&&ve(Mm)),Z!==r?(Re=k,N=te(Z),k=N):(w=k,k=r)):(w=k,k=r),k===r&&(Om.test(t.charAt(w))?(k=t.charAt(w),w++):(k=r,we===0&&ve(Km)))));k!==r;)Q.push(k),k=gI(),k===r&&(k=fI(),k===r&&(k=w,t.charCodeAt(w)===92?(N=Va,w++):(N=r,we===0&&ve(jo)),N!==r?(Tm.test(t.charAt(w))?(Z=t.charAt(w),w++):(Z=r,we===0&&ve(Mm)),Z!==r?(Re=k,N=te(Z),k=N):(w=k,k=r)):(w=k,k=r),k===r&&(Om.test(t.charAt(w))?(k=t.charAt(w),w++):(k=r,we===0&&ve(Km)))));return Q!==r&&(Re=C,Q=il(Q)),C=Q,C}function Ffe(){var C,Q,k,N,Z;if(C=w,Q=[],k=gI(),k===r&&(k=fI(),k===r&&(k=w,t.charCodeAt(w)===92?(N=Va,w++):(N=r,we===0&&ve(jo)),N!==r?(Um.test(t.charAt(w))?(Z=t.charAt(w),w++):(Z=r,we===0&&ve(Hm)),Z!==r?(Re=k,N=te(Z),k=N):(w=k,k=r)):(w=k,k=r),k===r&&(Kf.test(t.charAt(w))?(k=t.charAt(w),w++):(k=r,we===0&&ve(Gm))))),k!==r)for(;k!==r;)Q.push(k),k=gI(),k===r&&(k=fI(),k===r&&(k=w,t.charCodeAt(w)===92?(N=Va,w++):(N=r,we===0&&ve(jo)),N!==r?(Um.test(t.charAt(w))?(Z=t.charAt(w),w++):(Z=r,we===0&&ve(Hm)),Z!==r?(Re=k,N=te(Z),k=N):(w=k,k=r)):(w=k,k=r),k===r&&(Kf.test(t.charAt(w))?(k=t.charAt(w),w++):(k=r,we===0&&ve(Gm)))));else Q=r;return Q!==r&&(Re=C,Q=il(Q)),C=Q,C}function gI(){var C,Q;return C=w,t.substr(w,2)===jm?(Q=jm,w+=2):(Q=r,we===0&&ve(TQ)),Q!==r&&(Re=C,Q=MQ()),C=Q,C===r&&(C=w,t.substr(w,2)===Ym?(Q=Ym,w+=2):(Q=r,we===0&&ve(qm)),Q!==r&&(Re=C,Q=Jm()),C=Q,C===r&&(C=w,t.substr(w,2)===Wm?(Q=Wm,w+=2):(Q=r,we===0&&ve(zm)),Q!==r&&(Re=C,Q=Vm()),C=Q,C===r&&(C=w,t.substr(w,2)===Uf?(Q=Uf,w+=2):(Q=r,we===0&&ve(OQ)),Q!==r&&(Re=C,Q=KQ()),C=Q,C===r&&(C=w,t.substr(w,2)===_m?(Q=_m,w+=2):(Q=r,we===0&&ve(UQ)),Q!==r&&(Re=C,Q=HQ()),C=Q,C===r&&(C=w,t.substr(w,2)===O?(Q=O,w+=2):(Q=r,we===0&&ve(ht)),Q!==r&&(Re=C,Q=Vc()),C=Q,C===r&&(C=w,t.substr(w,2)===xn?(Q=xn,w+=2):(Q=r,we===0&&ve(Hf)),Q!==r&&(Re=C,Q=Ye()),C=Q,C===r&&(C=w,t.substr(w,2)===nl?(Q=nl,w+=2):(Q=r,we===0&&ve(Xm)),Q!==r&&(Re=C,Q=MM()),C=Q,C===r&&(C=w,t.substr(w,2)===GQ?(Q=GQ,w+=2):(Q=r,we===0&&ve(OM)),Q!==r&&(Re=C,Q=fr()),C=Q)))))))),C}function fI(){var C,Q,k,N,Z,Ie,ot,ut,Tr,ni,Yn,$Q;return C=w,t.substr(w,2)===Bs?(Q=Bs,w+=2):(Q=r,we===0&&ve(jQ)),Q!==r?(k=w,N=w,Z=An(),Z!==r?(Ie=An(),Ie!==r?(Z=[Z,Ie],N=Z):(w=N,N=r)):(w=N,N=r),N!==r?k=t.substring(k,w):k=N,k!==r?(Re=C,Q=Zm(k),C=Q):(w=C,C=r)):(w=C,C=r),C===r&&(C=w,t.substr(w,2)===Yo?(Q=Yo,w+=2):(Q=r,we===0&&ve($m)),Q!==r?(k=w,N=w,Z=An(),Z!==r?(Ie=An(),Ie!==r?(ot=An(),ot!==r?(ut=An(),ut!==r?(Z=[Z,Ie,ot,ut],N=Z):(w=N,N=r)):(w=N,N=r)):(w=N,N=r)):(w=N,N=r),N!==r?k=t.substring(k,w):k=N,k!==r?(Re=C,Q=Zm(k),C=Q):(w=C,C=r)):(w=C,C=r),C===r&&(C=w,t.substr(w,2)===_a?(Q=_a,w+=2):(Q=r,we===0&&ve(et)),Q!==r?(k=w,N=w,Z=An(),Z!==r?(Ie=An(),Ie!==r?(ot=An(),ot!==r?(ut=An(),ut!==r?(Tr=An(),Tr!==r?(ni=An(),ni!==r?(Yn=An(),Yn!==r?($Q=An(),$Q!==r?(Z=[Z,Ie,ot,ut,Tr,ni,Yn,$Q],N=Z):(w=N,N=r)):(w=N,N=r)):(w=N,N=r)):(w=N,N=r)):(w=N,N=r)):(w=N,N=r)):(w=N,N=r)):(w=N,N=r),N!==r?k=t.substring(k,w):k=N,k!==r?(Re=C,Q=YQ(k),C=Q):(w=C,C=r)):(w=C,C=r))),C}function An(){var C;return eI.test(t.charAt(w))?(C=t.charAt(w),w++):(C=r,we===0&&ve(tI)),C}function Nfe(){var C,Q,k,N,Z;if(C=w,Q=[],k=w,t.charCodeAt(w)===92?(N=Va,w++):(N=r,we===0&&ve(jo)),N!==r?(t.length>w?(Z=t.charAt(w),w++):(Z=r,we===0&&ve(Xa)),Z!==r?(Re=k,N=te(Z),k=N):(w=k,k=r)):(w=k,k=r),k===r&&(k=w,N=w,we++,Z=aO(),we--,Z===r?N=void 0:(w=N,N=r),N!==r?(t.length>w?(Z=t.charAt(w),w++):(Z=r,we===0&&ve(Xa)),Z!==r?(Re=k,N=te(Z),k=N):(w=k,k=r)):(w=k,k=r)),k!==r)for(;k!==r;)Q.push(k),k=w,t.charCodeAt(w)===92?(N=Va,w++):(N=r,we===0&&ve(jo)),N!==r?(t.length>w?(Z=t.charAt(w),w++):(Z=r,we===0&&ve(Xa)),Z!==r?(Re=k,N=te(Z),k=N):(w=k,k=r)):(w=k,k=r),k===r&&(k=w,N=w,we++,Z=aO(),we--,Z===r?N=void 0:(w=N,N=r),N!==r?(t.length>w?(Z=t.charAt(w),w++):(Z=r,we===0&&ve(Xa)),Z!==r?(Re=k,N=te(Z),k=N):(w=k,k=r)):(w=k,k=r));else Q=r;return Q!==r&&(Re=C,Q=il(Q)),C=Q,C}function _Q(){var C,Q,k,N,Z,Ie;if(C=w,t.charCodeAt(w)===45?(Q=sl,w++):(Q=r,we===0&&ve(ol)),Q===r&&(t.charCodeAt(w)===43?(Q=al,w++):(Q=r,we===0&&ve(qo))),Q===r&&(Q=null),Q!==r){if(k=[],De.test(t.charAt(w))?(N=t.charAt(w),w++):(N=r,we===0&&ve($)),N!==r)for(;N!==r;)k.push(N),De.test(t.charAt(w))?(N=t.charAt(w),w++):(N=r,we===0&&ve($));else k=r;if(k!==r)if(t.charCodeAt(w)===46?(N=Al,w++):(N=r,we===0&&ve(qQ)),N!==r){if(Z=[],De.test(t.charAt(w))?(Ie=t.charAt(w),w++):(Ie=r,we===0&&ve($)),Ie!==r)for(;Ie!==r;)Z.push(Ie),De.test(t.charAt(w))?(Ie=t.charAt(w),w++):(Ie=r,we===0&&ve($));else Z=r;Z!==r?(Re=C,Q=rI(Q,k,Z),C=Q):(w=C,C=r)}else w=C,C=r;else w=C,C=r}else w=C,C=r;if(C===r){if(C=w,t.charCodeAt(w)===45?(Q=sl,w++):(Q=r,we===0&&ve(ol)),Q===r&&(t.charCodeAt(w)===43?(Q=al,w++):(Q=r,we===0&&ve(qo))),Q===r&&(Q=null),Q!==r){if(k=[],De.test(t.charAt(w))?(N=t.charAt(w),w++):(N=r,we===0&&ve($)),N!==r)for(;N!==r;)k.push(N),De.test(t.charAt(w))?(N=t.charAt(w),w++):(N=r,we===0&&ve($));else k=r;k!==r?(Re=C,Q=iI(Q,k),C=Q):(w=C,C=r)}else w=C,C=r;if(C===r&&(C=w,Q=ZQ(),Q!==r&&(Re=C,Q=JQ(Q)),C=Q,C===r&&(C=w,Q=zf(),Q!==r&&(Re=C,Q=ll(Q)),C=Q,C===r)))if(C=w,t.charCodeAt(w)===40?(Q=W,w++):(Q=r,we===0&&ve(X)),Q!==r){for(k=[],N=ke();N!==r;)k.push(N),N=ke();if(k!==r)if(N=iO(),N!==r){for(Z=[],Ie=ke();Ie!==r;)Z.push(Ie),Ie=ke();Z!==r?(t.charCodeAt(w)===41?(Ie=F,w++):(Ie=r,we===0&&ve(D)),Ie!==r?(Re=C,Q=WQ(N),C=Q):(w=C,C=r)):(w=C,C=r)}else w=C,C=r;else w=C,C=r}else w=C,C=r}return C}function XQ(){var C,Q,k,N,Z,Ie,ot,ut;if(C=w,Q=_Q(),Q!==r){for(k=[],N=w,Z=[],Ie=ke();Ie!==r;)Z.push(Ie),Ie=ke();if(Z!==r)if(t.charCodeAt(w)===42?(Ie=nI,w++):(Ie=r,we===0&&ve(Gf)),Ie===r&&(t.charCodeAt(w)===47?(Ie=_c,w++):(Ie=r,we===0&&ve(jf))),Ie!==r){for(ot=[],ut=ke();ut!==r;)ot.push(ut),ut=ke();ot!==r?(ut=_Q(),ut!==r?(Re=N,Z=sI(Q,Ie,ut),N=Z):(w=N,N=r)):(w=N,N=r)}else w=N,N=r;else w=N,N=r;for(;N!==r;){for(k.push(N),N=w,Z=[],Ie=ke();Ie!==r;)Z.push(Ie),Ie=ke();if(Z!==r)if(t.charCodeAt(w)===42?(Ie=nI,w++):(Ie=r,we===0&&ve(Gf)),Ie===r&&(t.charCodeAt(w)===47?(Ie=_c,w++):(Ie=r,we===0&&ve(jf))),Ie!==r){for(ot=[],ut=ke();ut!==r;)ot.push(ut),ut=ke();ot!==r?(ut=_Q(),ut!==r?(Re=N,Z=sI(Q,Ie,ut),N=Z):(w=N,N=r)):(w=N,N=r)}else w=N,N=r;else w=N,N=r}k!==r?(Re=C,Q=cl(Q,k),C=Q):(w=C,C=r)}else w=C,C=r;return C}function iO(){var C,Q,k,N,Z,Ie,ot,ut;if(C=w,Q=XQ(),Q!==r){for(k=[],N=w,Z=[],Ie=ke();Ie!==r;)Z.push(Ie),Ie=ke();if(Z!==r)if(t.charCodeAt(w)===43?(Ie=al,w++):(Ie=r,we===0&&ve(qo)),Ie===r&&(t.charCodeAt(w)===45?(Ie=sl,w++):(Ie=r,we===0&&ve(ol))),Ie!==r){for(ot=[],ut=ke();ut!==r;)ot.push(ut),ut=ke();ot!==r?(ut=XQ(),ut!==r?(Re=N,Z=oI(Q,Ie,ut),N=Z):(w=N,N=r)):(w=N,N=r)}else w=N,N=r;else w=N,N=r;for(;N!==r;){for(k.push(N),N=w,Z=[],Ie=ke();Ie!==r;)Z.push(Ie),Ie=ke();if(Z!==r)if(t.charCodeAt(w)===43?(Ie=al,w++):(Ie=r,we===0&&ve(qo)),Ie===r&&(t.charCodeAt(w)===45?(Ie=sl,w++):(Ie=r,we===0&&ve(ol))),Ie!==r){for(ot=[],ut=ke();ut!==r;)ot.push(ut),ut=ke();ot!==r?(ut=XQ(),ut!==r?(Re=N,Z=oI(Q,Ie,ut),N=Z):(w=N,N=r)):(w=N,N=r)}else w=N,N=r;else w=N,N=r}k!==r?(Re=C,Q=cl(Q,k),C=Q):(w=C,C=r)}else w=C,C=r;return C}function nO(){var C,Q,k,N,Z,Ie;if(C=w,t.substr(w,3)===Yf?(Q=Yf,w+=3):(Q=r,we===0&&ve(Xc)),Q!==r){for(k=[],N=ke();N!==r;)k.push(N),N=ke();if(k!==r)if(N=iO(),N!==r){for(Z=[],Ie=ke();Ie!==r;)Z.push(Ie),Ie=ke();Z!==r?(t.substr(w,2)===xr?(Ie=xr,w+=2):(Ie=r,we===0&&ve(KM)),Ie!==r?(Re=C,Q=Jo(N),C=Q):(w=C,C=r)):(w=C,C=r)}else w=C,C=r;else w=C,C=r}else w=C,C=r;return C}function sO(){var C,Q,k,N;return C=w,t.substr(w,2)===Zs?(Q=Zs,w+=2):(Q=r,we===0&&ve(aI)),Q!==r?(k=Jf(),k!==r?(t.charCodeAt(w)===41?(N=F,w++):(N=r,we===0&&ve(D)),N!==r?(Re=C,Q=Zc(k),C=Q):(w=C,C=r)):(w=C,C=r)):(w=C,C=r),C}function ZQ(){var C,Q,k,N,Z,Ie;return C=w,t.substr(w,2)===x?(Q=x,w+=2):(Q=r,we===0&&ve(U)),Q!==r?(k=zf(),k!==r?(t.substr(w,2)===le?(N=le,w+=2):(N=r,we===0&&ve(xe)),N!==r?(Z=Sfe(),Z!==r?(t.charCodeAt(w)===125?(Ie=Pe,w++):(Ie=r,we===0&&ve(qe)),Ie!==r?(Re=C,Q=Qe(k,Z),C=Q):(w=C,C=r)):(w=C,C=r)):(w=C,C=r)):(w=C,C=r)):(w=C,C=r),C===r&&(C=w,t.substr(w,2)===x?(Q=x,w+=2):(Q=r,we===0&&ve(U)),Q!==r?(k=zf(),k!==r?(t.substr(w,3)===Ge?(N=Ge,w+=3):(N=r,we===0&&ve(ct)),N!==r?(Re=C,Q=sr(k),C=Q):(w=C,C=r)):(w=C,C=r)):(w=C,C=r),C===r&&(C=w,t.substr(w,2)===x?(Q=x,w+=2):(Q=r,we===0&&ve(U)),Q!==r?(k=zf(),k!==r?(t.charCodeAt(w)===125?(N=Pe,w++):(N=r,we===0&&ve(qe)),N!==r?(Re=C,Q=Wo(k),C=Q):(w=C,C=r)):(w=C,C=r)):(w=C,C=r),C===r&&(C=w,t.charCodeAt(w)===36?(Q=Afe,w++):(Q=r,we===0&&ve(lfe)),Q!==r?(k=zf(),k!==r?(Re=C,Q=Wo(k),C=Q):(w=C,C=r)):(w=C,C=r)))),C}function Lfe(){var C,Q,k;return C=w,Q=Tfe(),Q!==r?(Re=w,k=cfe(Q),k?k=void 0:k=r,k!==r?(Re=C,Q=ufe(Q),C=Q):(w=C,C=r)):(w=C,C=r),C}function Tfe(){var C,Q,k,N,Z;if(C=w,Q=[],k=w,N=w,we++,Z=AO(),we--,Z===r?N=void 0:(w=N,N=r),N!==r?(t.length>w?(Z=t.charAt(w),w++):(Z=r,we===0&&ve(Xa)),Z!==r?(Re=k,N=te(Z),k=N):(w=k,k=r)):(w=k,k=r),k!==r)for(;k!==r;)Q.push(k),k=w,N=w,we++,Z=AO(),we--,Z===r?N=void 0:(w=N,N=r),N!==r?(t.length>w?(Z=t.charAt(w),w++):(Z=r,we===0&&ve(Xa)),Z!==r?(Re=k,N=te(Z),k=N):(w=k,k=r)):(w=k,k=r);else Q=r;return Q!==r&&(Re=C,Q=il(Q)),C=Q,C}function oO(){var C,Q,k;if(C=w,Q=[],UM.test(t.charAt(w))?(k=t.charAt(w),w++):(k=r,we===0&&ve(HM)),k!==r)for(;k!==r;)Q.push(k),UM.test(t.charAt(w))?(k=t.charAt(w),w++):(k=r,we===0&&ve(HM));else Q=r;return Q!==r&&(Re=C,Q=GM()),C=Q,C}function zf(){var C,Q,k;if(C=w,Q=[],jM.test(t.charAt(w))?(k=t.charAt(w),w++):(k=r,we===0&&ve(YM)),k!==r)for(;k!==r;)Q.push(k),jM.test(t.charAt(w))?(k=t.charAt(w),w++):(k=r,we===0&&ve(YM));else Q=r;return Q!==r&&(Re=C,Q=GM()),C=Q,C}function aO(){var C;return gfe.test(t.charAt(w))?(C=t.charAt(w),w++):(C=r,we===0&&ve(ffe)),C}function AO(){var C;return hfe.test(t.charAt(w))?(C=t.charAt(w),w++):(C=r,we===0&&ve(pfe)),C}function ke(){var C,Q;if(C=[],qM.test(t.charAt(w))?(Q=t.charAt(w),w++):(Q=r,we===0&&ve(JM)),Q!==r)for(;Q!==r;)C.push(Q),qM.test(t.charAt(w))?(Q=t.charAt(w),w++):(Q=r,we===0&&ve(JM));else C=r;return C}if(lI=n(),lI!==r&&w===t.length)return lI;throw lI!==r&&w{"use strict";function Ike(t,e){function r(){this.constructor=t}r.prototype=e.prototype,t.prototype=new r}function Xl(t,e,r,i){this.message=t,this.expected=e,this.found=r,this.location=i,this.name="SyntaxError",typeof Error.captureStackTrace=="function"&&Error.captureStackTrace(this,Xl)}Ike(Xl,Error);Xl.buildMessage=function(t,e){var r={literal:function(c){return'"'+n(c.text)+'"'},class:function(c){var u="",g;for(g=0;g0){for(g=1,f=1;gH&&(H=B,L=[]),L.push($))}function qe($,G){return new Xl($,null,null,G)}function re($,G,Ce){return new Xl(Xl.buildMessage($,G),$,G,Ce)}function se(){var $,G,Ce,ee;return $=B,G=be(),G!==r?(t.charCodeAt(B)===47?(Ce=s,B++):(Ce=r,K===0&&Pe(o)),Ce!==r?(ee=be(),ee!==r?(b=$,G=a(G,ee),$=G):(B=$,$=r)):(B=$,$=r)):(B=$,$=r),$===r&&($=B,G=be(),G!==r&&(b=$,G=l(G)),$=G),$}function be(){var $,G,Ce,ee;return $=B,G=ae(),G!==r?(t.charCodeAt(B)===64?(Ce=c,B++):(Ce=r,K===0&&Pe(u)),Ce!==r?(ee=De(),ee!==r?(b=$,G=g(G,ee),$=G):(B=$,$=r)):(B=$,$=r)):(B=$,$=r),$===r&&($=B,G=ae(),G!==r&&(b=$,G=f(G)),$=G),$}function ae(){var $,G,Ce,ee,Ue;return $=B,t.charCodeAt(B)===64?(G=c,B++):(G=r,K===0&&Pe(u)),G!==r?(Ce=Ae(),Ce!==r?(t.charCodeAt(B)===47?(ee=s,B++):(ee=r,K===0&&Pe(o)),ee!==r?(Ue=Ae(),Ue!==r?(b=$,G=h(),$=G):(B=$,$=r)):(B=$,$=r)):(B=$,$=r)):(B=$,$=r),$===r&&($=B,G=Ae(),G!==r&&(b=$,G=h()),$=G),$}function Ae(){var $,G,Ce;if($=B,G=[],p.test(t.charAt(B))?(Ce=t.charAt(B),B++):(Ce=r,K===0&&Pe(d)),Ce!==r)for(;Ce!==r;)G.push(Ce),p.test(t.charAt(B))?(Ce=t.charAt(B),B++):(Ce=r,K===0&&Pe(d));else G=r;return G!==r&&(b=$,G=h()),$=G,$}function De(){var $,G,Ce;if($=B,G=[],m.test(t.charAt(B))?(Ce=t.charAt(B),B++):(Ce=r,K===0&&Pe(E)),Ce!==r)for(;Ce!==r;)G.push(Ce),m.test(t.charAt(B))?(Ce=t.charAt(B),B++):(Ce=r,K===0&&Pe(E));else G=r;return G!==r&&(b=$,G=h()),$=G,$}if(J=n(),J!==r&&B===t.length)return J;throw J!==r&&B{"use strict";function Fz(t){return typeof t=="undefined"||t===null}function yke(t){return typeof t=="object"&&t!==null}function wke(t){return Array.isArray(t)?t:Fz(t)?[]:[t]}function Bke(t,e){var r,i,n,s;if(e)for(s=Object.keys(e),r=0,i=s.length;r{"use strict";function Lp(t,e){Error.call(this),this.name="YAMLException",this.reason=t,this.mark=e,this.message=(this.reason||"(unknown reason)")+(this.mark?" "+this.mark.toString():""),Error.captureStackTrace?Error.captureStackTrace(this,this.constructor):this.stack=new Error().stack||""}Lp.prototype=Object.create(Error.prototype);Lp.prototype.constructor=Lp;Lp.prototype.toString=function(e){var r=this.name+": ";return r+=this.reason||"(unknown reason)",!e&&this.mark&&(r+=" "+this.mark.toString()),r};Nz.exports=Lp});var Mz=I((Vot,Lz)=>{"use strict";var Tz=$l();function kP(t,e,r,i,n){this.name=t,this.buffer=e,this.position=r,this.line=i,this.column=n}kP.prototype.getSnippet=function(e,r){var i,n,s,o,a;if(!this.buffer)return null;for(e=e||4,r=r||75,i="",n=this.position;n>0&&`\0\r +\x85\u2028\u2029`.indexOf(this.buffer.charAt(n-1))===-1;)if(n-=1,this.position-n>r/2-1){i=" ... ",n+=5;break}for(s="",o=this.position;or/2-1){s=" ... ",o-=5;break}return a=this.buffer.slice(n,o),Tz.repeat(" ",e)+i+a+s+` +`+Tz.repeat(" ",e+this.position-n+i.length)+"^"};kP.prototype.toString=function(e){var r,i="";return this.name&&(i+='in "'+this.name+'" '),i+="at line "+(this.line+1)+", column "+(this.column+1),e||(r=this.getSnippet(),r&&(i+=`: +`+r)),i};Lz.exports=kP});var Xr=I((_ot,Oz)=>{"use strict";var Kz=ng(),vke=["kind","resolve","construct","instanceOf","predicate","represent","defaultStyle","styleAliases"],Ske=["scalar","sequence","mapping"];function xke(t){var e={};return t!==null&&Object.keys(t).forEach(function(r){t[r].forEach(function(i){e[String(i)]=r})}),e}function kke(t,e){if(e=e||{},Object.keys(e).forEach(function(r){if(vke.indexOf(r)===-1)throw new Kz('Unknown option "'+r+'" is met in definition of "'+t+'" YAML type.')}),this.tag=t,this.kind=e.kind||null,this.resolve=e.resolve||function(){return!0},this.construct=e.construct||function(r){return r},this.instanceOf=e.instanceOf||null,this.predicate=e.predicate||null,this.represent=e.represent||null,this.defaultStyle=e.defaultStyle||null,this.styleAliases=xke(e.styleAliases||null),Ske.indexOf(this.kind)===-1)throw new Kz('Unknown kind "'+this.kind+'" is specified for "'+t+'" YAML type.')}Oz.exports=kke});var ec=I((Xot,Uz)=>{"use strict";var Hz=$l(),hw=ng(),Pke=Xr();function PP(t,e,r){var i=[];return t.include.forEach(function(n){r=PP(n,e,r)}),t[e].forEach(function(n){r.forEach(function(s,o){s.tag===n.tag&&s.kind===n.kind&&i.push(o)}),r.push(n)}),r.filter(function(n,s){return i.indexOf(s)===-1})}function Dke(){var t={scalar:{},sequence:{},mapping:{},fallback:{}},e,r;function i(n){t[n.kind][n.tag]=t.fallback[n.tag]=n}for(e=0,r=arguments.length;e{"use strict";var Rke=Xr();Gz.exports=new Rke("tag:yaml.org,2002:str",{kind:"scalar",construct:function(t){return t!==null?t:""}})});var qz=I(($ot,Yz)=>{"use strict";var Fke=Xr();Yz.exports=new Fke("tag:yaml.org,2002:seq",{kind:"sequence",construct:function(t){return t!==null?t:[]}})});var Wz=I((eat,Jz)=>{"use strict";var Nke=Xr();Jz.exports=new Nke("tag:yaml.org,2002:map",{kind:"mapping",construct:function(t){return t!==null?t:{}}})});var pw=I((tat,zz)=>{"use strict";var Lke=ec();zz.exports=new Lke({explicit:[jz(),qz(),Wz()]})});var _z=I((rat,Vz)=>{"use strict";var Tke=Xr();function Mke(t){if(t===null)return!0;var e=t.length;return e===1&&t==="~"||e===4&&(t==="null"||t==="Null"||t==="NULL")}function Oke(){return null}function Kke(t){return t===null}Vz.exports=new Tke("tag:yaml.org,2002:null",{kind:"scalar",resolve:Mke,construct:Oke,predicate:Kke,represent:{canonical:function(){return"~"},lowercase:function(){return"null"},uppercase:function(){return"NULL"},camelcase:function(){return"Null"}},defaultStyle:"lowercase"})});var Zz=I((iat,Xz)=>{"use strict";var Uke=Xr();function Hke(t){if(t===null)return!1;var e=t.length;return e===4&&(t==="true"||t==="True"||t==="TRUE")||e===5&&(t==="false"||t==="False"||t==="FALSE")}function Gke(t){return t==="true"||t==="True"||t==="TRUE"}function jke(t){return Object.prototype.toString.call(t)==="[object Boolean]"}Xz.exports=new Uke("tag:yaml.org,2002:bool",{kind:"scalar",resolve:Hke,construct:Gke,predicate:jke,represent:{lowercase:function(t){return t?"true":"false"},uppercase:function(t){return t?"TRUE":"FALSE"},camelcase:function(t){return t?"True":"False"}},defaultStyle:"lowercase"})});var e4=I((nat,$z)=>{"use strict";var Yke=$l(),qke=Xr();function Jke(t){return 48<=t&&t<=57||65<=t&&t<=70||97<=t&&t<=102}function Wke(t){return 48<=t&&t<=55}function zke(t){return 48<=t&&t<=57}function Vke(t){if(t===null)return!1;var e=t.length,r=0,i=!1,n;if(!e)return!1;if(n=t[r],(n==="-"||n==="+")&&(n=t[++r]),n==="0"){if(r+1===e)return!0;if(n=t[++r],n==="b"){for(r++;r=0?"0b"+t.toString(2):"-0b"+t.toString(2).slice(1)},octal:function(t){return t>=0?"0"+t.toString(8):"-0"+t.toString(8).slice(1)},decimal:function(t){return t.toString(10)},hexadecimal:function(t){return t>=0?"0x"+t.toString(16).toUpperCase():"-0x"+t.toString(16).toUpperCase().slice(1)}},defaultStyle:"decimal",styleAliases:{binary:[2,"bin"],octal:[8,"oct"],decimal:[10,"dec"],hexadecimal:[16,"hex"]}})});var i4=I((sat,t4)=>{"use strict";var r4=$l(),Zke=Xr(),$ke=new RegExp("^(?:[-+]?(?:0|[1-9][0-9_]*)(?:\\.[0-9_]*)?(?:[eE][-+]?[0-9]+)?|\\.[0-9_]+(?:[eE][-+]?[0-9]+)?|[-+]?[0-9][0-9_]*(?::[0-5]?[0-9])+\\.[0-9_]*|[-+]?\\.(?:inf|Inf|INF)|\\.(?:nan|NaN|NAN))$");function ePe(t){return!(t===null||!$ke.test(t)||t[t.length-1]==="_")}function tPe(t){var e,r,i,n;return e=t.replace(/_/g,"").toLowerCase(),r=e[0]==="-"?-1:1,n=[],"+-".indexOf(e[0])>=0&&(e=e.slice(1)),e===".inf"?r===1?Number.POSITIVE_INFINITY:Number.NEGATIVE_INFINITY:e===".nan"?NaN:e.indexOf(":")>=0?(e.split(":").forEach(function(s){n.unshift(parseFloat(s,10))}),e=0,i=1,n.forEach(function(s){e+=s*i,i*=60}),r*e):r*parseFloat(e,10)}var rPe=/^[-+]?[0-9]+e/;function iPe(t,e){var r;if(isNaN(t))switch(e){case"lowercase":return".nan";case"uppercase":return".NAN";case"camelcase":return".NaN"}else if(Number.POSITIVE_INFINITY===t)switch(e){case"lowercase":return".inf";case"uppercase":return".INF";case"camelcase":return".Inf"}else if(Number.NEGATIVE_INFINITY===t)switch(e){case"lowercase":return"-.inf";case"uppercase":return"-.INF";case"camelcase":return"-.Inf"}else if(r4.isNegativeZero(t))return"-0.0";return r=t.toString(10),rPe.test(r)?r.replace("e",".e"):r}function nPe(t){return Object.prototype.toString.call(t)==="[object Number]"&&(t%1!=0||r4.isNegativeZero(t))}t4.exports=new Zke("tag:yaml.org,2002:float",{kind:"scalar",resolve:ePe,construct:tPe,predicate:nPe,represent:iPe,defaultStyle:"lowercase"})});var DP=I((oat,n4)=>{"use strict";var sPe=ec();n4.exports=new sPe({include:[pw()],implicit:[_z(),Zz(),e4(),i4()]})});var RP=I((aat,s4)=>{"use strict";var oPe=ec();s4.exports=new oPe({include:[DP()]})});var l4=I((Aat,o4)=>{"use strict";var aPe=Xr(),a4=new RegExp("^([0-9][0-9][0-9][0-9])-([0-9][0-9])-([0-9][0-9])$"),A4=new RegExp("^([0-9][0-9][0-9][0-9])-([0-9][0-9]?)-([0-9][0-9]?)(?:[Tt]|[ \\t]+)([0-9][0-9]?):([0-9][0-9]):([0-9][0-9])(?:\\.([0-9]*))?(?:[ \\t]*(Z|([-+])([0-9][0-9]?)(?::([0-9][0-9]))?))?$");function APe(t){return t===null?!1:a4.exec(t)!==null||A4.exec(t)!==null}function lPe(t){var e,r,i,n,s,o,a,l=0,c=null,u,g,f;if(e=a4.exec(t),e===null&&(e=A4.exec(t)),e===null)throw new Error("Date resolve error");if(r=+e[1],i=+e[2]-1,n=+e[3],!e[4])return new Date(Date.UTC(r,i,n));if(s=+e[4],o=+e[5],a=+e[6],e[7]){for(l=e[7].slice(0,3);l.length<3;)l+="0";l=+l}return e[9]&&(u=+e[10],g=+(e[11]||0),c=(u*60+g)*6e4,e[9]==="-"&&(c=-c)),f=new Date(Date.UTC(r,i,n,s,o,a,l)),c&&f.setTime(f.getTime()-c),f}function cPe(t){return t.toISOString()}o4.exports=new aPe("tag:yaml.org,2002:timestamp",{kind:"scalar",resolve:APe,construct:lPe,instanceOf:Date,represent:cPe})});var u4=I((lat,c4)=>{"use strict";var uPe=Xr();function gPe(t){return t==="<<"||t===null}c4.exports=new uPe("tag:yaml.org,2002:merge",{kind:"scalar",resolve:gPe})});var h4=I((cat,g4)=>{"use strict";var tc;try{f4=require,tc=f4("buffer").Buffer}catch(t){}var f4,fPe=Xr(),FP=`ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/= +\r`;function hPe(t){if(t===null)return!1;var e,r,i=0,n=t.length,s=FP;for(r=0;r64)){if(e<0)return!1;i+=6}return i%8==0}function pPe(t){var e,r,i=t.replace(/[\r\n=]/g,""),n=i.length,s=FP,o=0,a=[];for(e=0;e>16&255),a.push(o>>8&255),a.push(o&255)),o=o<<6|s.indexOf(i.charAt(e));return r=n%4*6,r===0?(a.push(o>>16&255),a.push(o>>8&255),a.push(o&255)):r===18?(a.push(o>>10&255),a.push(o>>2&255)):r===12&&a.push(o>>4&255),tc?tc.from?tc.from(a):new tc(a):a}function dPe(t){var e="",r=0,i,n,s=t.length,o=FP;for(i=0;i>18&63],e+=o[r>>12&63],e+=o[r>>6&63],e+=o[r&63]),r=(r<<8)+t[i];return n=s%3,n===0?(e+=o[r>>18&63],e+=o[r>>12&63],e+=o[r>>6&63],e+=o[r&63]):n===2?(e+=o[r>>10&63],e+=o[r>>4&63],e+=o[r<<2&63],e+=o[64]):n===1&&(e+=o[r>>2&63],e+=o[r<<4&63],e+=o[64],e+=o[64]),e}function CPe(t){return tc&&tc.isBuffer(t)}g4.exports=new fPe("tag:yaml.org,2002:binary",{kind:"scalar",resolve:hPe,construct:pPe,predicate:CPe,represent:dPe})});var d4=I((uat,p4)=>{"use strict";var mPe=Xr(),IPe=Object.prototype.hasOwnProperty,EPe=Object.prototype.toString;function yPe(t){if(t===null)return!0;var e=[],r,i,n,s,o,a=t;for(r=0,i=a.length;r{"use strict";var BPe=Xr(),QPe=Object.prototype.toString;function bPe(t){if(t===null)return!0;var e,r,i,n,s,o=t;for(s=new Array(o.length),e=0,r=o.length;e{"use strict";var SPe=Xr(),xPe=Object.prototype.hasOwnProperty;function kPe(t){if(t===null)return!0;var e,r=t;for(e in r)if(xPe.call(r,e)&&r[e]!==null)return!1;return!0}function PPe(t){return t!==null?t:{}}I4.exports=new SPe("tag:yaml.org,2002:set",{kind:"mapping",resolve:kPe,construct:PPe})});var og=I((hat,y4)=>{"use strict";var DPe=ec();y4.exports=new DPe({include:[RP()],implicit:[l4(),u4()],explicit:[h4(),d4(),m4(),E4()]})});var B4=I((pat,w4)=>{"use strict";var RPe=Xr();function FPe(){return!0}function NPe(){}function LPe(){return""}function TPe(t){return typeof t=="undefined"}w4.exports=new RPe("tag:yaml.org,2002:js/undefined",{kind:"scalar",resolve:FPe,construct:NPe,predicate:TPe,represent:LPe})});var b4=I((dat,Q4)=>{"use strict";var MPe=Xr();function OPe(t){if(t===null||t.length===0)return!1;var e=t,r=/\/([gim]*)$/.exec(t),i="";return!(e[0]==="/"&&(r&&(i=r[1]),i.length>3||e[e.length-i.length-1]!=="/"))}function KPe(t){var e=t,r=/\/([gim]*)$/.exec(t),i="";return e[0]==="/"&&(r&&(i=r[1]),e=e.slice(1,e.length-i.length-1)),new RegExp(e,i)}function UPe(t){var e="/"+t.source+"/";return t.global&&(e+="g"),t.multiline&&(e+="m"),t.ignoreCase&&(e+="i"),e}function HPe(t){return Object.prototype.toString.call(t)==="[object RegExp]"}Q4.exports=new MPe("tag:yaml.org,2002:js/regexp",{kind:"scalar",resolve:OPe,construct:KPe,predicate:HPe,represent:UPe})});var x4=I((Cat,v4)=>{"use strict";var dw;try{S4=require,dw=S4("esprima")}catch(t){typeof window!="undefined"&&(dw=window.esprima)}var S4,GPe=Xr();function jPe(t){if(t===null)return!1;try{var e="("+t+")",r=dw.parse(e,{range:!0});return!(r.type!=="Program"||r.body.length!==1||r.body[0].type!=="ExpressionStatement"||r.body[0].expression.type!=="ArrowFunctionExpression"&&r.body[0].expression.type!=="FunctionExpression")}catch(i){return!1}}function YPe(t){var e="("+t+")",r=dw.parse(e,{range:!0}),i=[],n;if(r.type!=="Program"||r.body.length!==1||r.body[0].type!=="ExpressionStatement"||r.body[0].expression.type!=="ArrowFunctionExpression"&&r.body[0].expression.type!=="FunctionExpression")throw new Error("Failed to resolve function");return r.body[0].expression.params.forEach(function(s){i.push(s.name)}),n=r.body[0].expression.body.range,r.body[0].expression.body.type==="BlockStatement"?new Function(i,e.slice(n[0]+1,n[1]-1)):new Function(i,"return "+e.slice(n[0],n[1]))}function qPe(t){return t.toString()}function JPe(t){return Object.prototype.toString.call(t)==="[object Function]"}v4.exports=new GPe("tag:yaml.org,2002:js/function",{kind:"scalar",resolve:jPe,construct:YPe,predicate:JPe,represent:qPe})});var Tp=I((mat,k4)=>{"use strict";var P4=ec();k4.exports=P4.DEFAULT=new P4({include:[og()],explicit:[B4(),b4(),x4()]})});var V4=I((Iat,Mp)=>{"use strict";var Ba=$l(),D4=ng(),WPe=Mz(),R4=og(),zPe=Tp(),QA=Object.prototype.hasOwnProperty,Cw=1,F4=2,N4=3,mw=4,NP=1,VPe=2,L4=3,_Pe=/[\x00-\x08\x0B\x0C\x0E-\x1F\x7F-\x84\x86-\x9F\uFFFE\uFFFF]|[\uD800-\uDBFF](?![\uDC00-\uDFFF])|(?:[^\uD800-\uDBFF]|^)[\uDC00-\uDFFF]/,XPe=/[\x85\u2028\u2029]/,ZPe=/[,\[\]\{\}]/,T4=/^(?:!|!!|![a-z\-]+!)$/i,M4=/^(?:!|[^,\[\]\{\}])(?:%[0-9a-f]{2}|[0-9a-z\-#;\/\?:@&=\+\$,_\.!~\*'\(\)\[\]])*$/i;function O4(t){return Object.prototype.toString.call(t)}function wo(t){return t===10||t===13}function rc(t){return t===9||t===32}function yn(t){return t===9||t===32||t===10||t===13}function ag(t){return t===44||t===91||t===93||t===123||t===125}function $Pe(t){var e;return 48<=t&&t<=57?t-48:(e=t|32,97<=e&&e<=102?e-97+10:-1)}function eDe(t){return t===120?2:t===117?4:t===85?8:0}function tDe(t){return 48<=t&&t<=57?t-48:-1}function K4(t){return t===48?"\0":t===97?"\x07":t===98?"\b":t===116||t===9?" ":t===110?` +`:t===118?"\v":t===102?"\f":t===114?"\r":t===101?"":t===32?" ":t===34?'"':t===47?"/":t===92?"\\":t===78?"\x85":t===95?"\xA0":t===76?"\u2028":t===80?"\u2029":""}function rDe(t){return t<=65535?String.fromCharCode(t):String.fromCharCode((t-65536>>10)+55296,(t-65536&1023)+56320)}var U4=new Array(256),H4=new Array(256);for(var Ag=0;Ag<256;Ag++)U4[Ag]=K4(Ag)?1:0,H4[Ag]=K4(Ag);function iDe(t,e){this.input=t,this.filename=e.filename||null,this.schema=e.schema||zPe,this.onWarning=e.onWarning||null,this.legacy=e.legacy||!1,this.json=e.json||!1,this.listener=e.listener||null,this.implicitTypes=this.schema.compiledImplicit,this.typeMap=this.schema.compiledTypeMap,this.length=t.length,this.position=0,this.line=0,this.lineStart=0,this.lineIndent=0,this.documents=[]}function G4(t,e){return new D4(e,new WPe(t.filename,t.input,t.position,t.line,t.position-t.lineStart))}function st(t,e){throw G4(t,e)}function Iw(t,e){t.onWarning&&t.onWarning.call(null,G4(t,e))}var j4={YAML:function(e,r,i){var n,s,o;e.version!==null&&st(e,"duplication of %YAML directive"),i.length!==1&&st(e,"YAML directive accepts exactly one argument"),n=/^([0-9]+)\.([0-9]+)$/.exec(i[0]),n===null&&st(e,"ill-formed argument of the YAML directive"),s=parseInt(n[1],10),o=parseInt(n[2],10),s!==1&&st(e,"unacceptable YAML version of the document"),e.version=i[0],e.checkLineBreaks=o<2,o!==1&&o!==2&&Iw(e,"unsupported YAML version of the document")},TAG:function(e,r,i){var n,s;i.length!==2&&st(e,"TAG directive accepts exactly two arguments"),n=i[0],s=i[1],T4.test(n)||st(e,"ill-formed tag handle (first argument) of the TAG directive"),QA.call(e.tagMap,n)&&st(e,'there is a previously declared suffix for "'+n+'" tag handle'),M4.test(s)||st(e,"ill-formed tag prefix (second argument) of the TAG directive"),e.tagMap[n]=s}};function bA(t,e,r,i){var n,s,o,a;if(e1&&(t.result+=Ba.repeat(` +`,e-1))}function nDe(t,e,r){var i,n,s,o,a,l,c,u,g=t.kind,f=t.result,h;if(h=t.input.charCodeAt(t.position),yn(h)||ag(h)||h===35||h===38||h===42||h===33||h===124||h===62||h===39||h===34||h===37||h===64||h===96||(h===63||h===45)&&(n=t.input.charCodeAt(t.position+1),yn(n)||r&&ag(n)))return!1;for(t.kind="scalar",t.result="",s=o=t.position,a=!1;h!==0;){if(h===58){if(n=t.input.charCodeAt(t.position+1),yn(n)||r&&ag(n))break}else if(h===35){if(i=t.input.charCodeAt(t.position-1),yn(i))break}else{if(t.position===t.lineStart&&Ew(t)||r&&ag(h))break;if(wo(h))if(l=t.line,c=t.lineStart,u=t.lineIndent,jr(t,!1,-1),t.lineIndent>=e){a=!0,h=t.input.charCodeAt(t.position);continue}else{t.position=o,t.line=l,t.lineStart=c,t.lineIndent=u;break}}a&&(bA(t,s,o,!1),TP(t,t.line-l),s=o=t.position,a=!1),rc(h)||(o=t.position+1),h=t.input.charCodeAt(++t.position)}return bA(t,s,o,!1),t.result?!0:(t.kind=g,t.result=f,!1)}function sDe(t,e){var r,i,n;if(r=t.input.charCodeAt(t.position),r!==39)return!1;for(t.kind="scalar",t.result="",t.position++,i=n=t.position;(r=t.input.charCodeAt(t.position))!==0;)if(r===39)if(bA(t,i,t.position,!0),r=t.input.charCodeAt(++t.position),r===39)i=t.position,t.position++,n=t.position;else return!0;else wo(r)?(bA(t,i,n,!0),TP(t,jr(t,!1,e)),i=n=t.position):t.position===t.lineStart&&Ew(t)?st(t,"unexpected end of the document within a single quoted scalar"):(t.position++,n=t.position);st(t,"unexpected end of the stream within a single quoted scalar")}function oDe(t,e){var r,i,n,s,o,a;if(a=t.input.charCodeAt(t.position),a!==34)return!1;for(t.kind="scalar",t.result="",t.position++,r=i=t.position;(a=t.input.charCodeAt(t.position))!==0;){if(a===34)return bA(t,r,t.position,!0),t.position++,!0;if(a===92){if(bA(t,r,t.position,!0),a=t.input.charCodeAt(++t.position),wo(a))jr(t,!1,e);else if(a<256&&U4[a])t.result+=H4[a],t.position++;else if((o=eDe(a))>0){for(n=o,s=0;n>0;n--)a=t.input.charCodeAt(++t.position),(o=$Pe(a))>=0?s=(s<<4)+o:st(t,"expected hexadecimal character");t.result+=rDe(s),t.position++}else st(t,"unknown escape sequence");r=i=t.position}else wo(a)?(bA(t,r,i,!0),TP(t,jr(t,!1,e)),r=i=t.position):t.position===t.lineStart&&Ew(t)?st(t,"unexpected end of the document within a double quoted scalar"):(t.position++,i=t.position)}st(t,"unexpected end of the stream within a double quoted scalar")}function aDe(t,e){var r=!0,i,n=t.tag,s,o=t.anchor,a,l,c,u,g,f={},h,p,d,m;if(m=t.input.charCodeAt(t.position),m===91)l=93,g=!1,s=[];else if(m===123)l=125,g=!0,s={};else return!1;for(t.anchor!==null&&(t.anchorMap[t.anchor]=s),m=t.input.charCodeAt(++t.position);m!==0;){if(jr(t,!0,e),m=t.input.charCodeAt(t.position),m===l)return t.position++,t.tag=n,t.anchor=o,t.kind=g?"mapping":"sequence",t.result=s,!0;r||st(t,"missed comma between flow collection entries"),p=h=d=null,c=u=!1,m===63&&(a=t.input.charCodeAt(t.position+1),yn(a)&&(c=u=!0,t.position++,jr(t,!0,e))),i=t.line,cg(t,e,Cw,!1,!0),p=t.tag,h=t.result,jr(t,!0,e),m=t.input.charCodeAt(t.position),(u||t.line===i)&&m===58&&(c=!0,m=t.input.charCodeAt(++t.position),jr(t,!0,e),cg(t,e,Cw,!1,!0),d=t.result),g?lg(t,s,f,p,h,d):c?s.push(lg(t,null,f,p,h,d)):s.push(h),jr(t,!0,e),m=t.input.charCodeAt(t.position),m===44?(r=!0,m=t.input.charCodeAt(++t.position)):r=!1}st(t,"unexpected end of the stream within a flow collection")}function ADe(t,e){var r,i,n=NP,s=!1,o=!1,a=e,l=0,c=!1,u,g;if(g=t.input.charCodeAt(t.position),g===124)i=!1;else if(g===62)i=!0;else return!1;for(t.kind="scalar",t.result="";g!==0;)if(g=t.input.charCodeAt(++t.position),g===43||g===45)NP===n?n=g===43?L4:VPe:st(t,"repeat of a chomping mode identifier");else if((u=tDe(g))>=0)u===0?st(t,"bad explicit indentation width of a block scalar; it cannot be less than one"):o?st(t,"repeat of an indentation width identifier"):(a=e+u-1,o=!0);else break;if(rc(g)){do g=t.input.charCodeAt(++t.position);while(rc(g));if(g===35)do g=t.input.charCodeAt(++t.position);while(!wo(g)&&g!==0)}for(;g!==0;){for(LP(t),t.lineIndent=0,g=t.input.charCodeAt(t.position);(!o||t.lineIndenta&&(a=t.lineIndent),wo(g)){l++;continue}if(t.lineIndente)&&l!==0)st(t,"bad indentation of a sequence entry");else if(t.lineIndente)&&(cg(t,e,mw,!0,n)&&(p?f=t.result:h=t.result),p||(lg(t,c,u,g,f,h,s,o),g=f=h=null),jr(t,!0,-1),m=t.input.charCodeAt(t.position)),t.lineIndent>e&&m!==0)st(t,"bad indentation of a mapping entry");else if(t.lineIndente?l=1:t.lineIndent===e?l=0:t.lineIndente?l=1:t.lineIndent===e?l=0:t.lineIndent tag; it should be "scalar", not "'+t.kind+'"'),g=0,f=t.implicitTypes.length;g tag; it should be "'+h.kind+'", not "'+t.kind+'"'),h.resolve(t.result)?(t.result=h.construct(t.result),t.anchor!==null&&(t.anchorMap[t.anchor]=t.result)):st(t,"cannot resolve a node with !<"+t.tag+"> explicit tag")):st(t,"unknown tag !<"+t.tag+">");return t.listener!==null&&t.listener("close",t),t.tag!==null||t.anchor!==null||u}function fDe(t){var e=t.position,r,i,n,s=!1,o;for(t.version=null,t.checkLineBreaks=t.legacy,t.tagMap={},t.anchorMap={};(o=t.input.charCodeAt(t.position))!==0&&(jr(t,!0,-1),o=t.input.charCodeAt(t.position),!(t.lineIndent>0||o!==37));){for(s=!0,o=t.input.charCodeAt(++t.position),r=t.position;o!==0&&!yn(o);)o=t.input.charCodeAt(++t.position);for(i=t.input.slice(r,t.position),n=[],i.length<1&&st(t,"directive name must not be less than one character in length");o!==0;){for(;rc(o);)o=t.input.charCodeAt(++t.position);if(o===35){do o=t.input.charCodeAt(++t.position);while(o!==0&&!wo(o));break}if(wo(o))break;for(r=t.position;o!==0&&!yn(o);)o=t.input.charCodeAt(++t.position);n.push(t.input.slice(r,t.position))}o!==0&&LP(t),QA.call(j4,i)?j4[i](t,i,n):Iw(t,'unknown document directive "'+i+'"')}if(jr(t,!0,-1),t.lineIndent===0&&t.input.charCodeAt(t.position)===45&&t.input.charCodeAt(t.position+1)===45&&t.input.charCodeAt(t.position+2)===45?(t.position+=3,jr(t,!0,-1)):s&&st(t,"directives end mark is expected"),cg(t,t.lineIndent-1,mw,!1,!0),jr(t,!0,-1),t.checkLineBreaks&&XPe.test(t.input.slice(e,t.position))&&Iw(t,"non-ASCII line breaks are interpreted as content"),t.documents.push(t.result),t.position===t.lineStart&&Ew(t)){t.input.charCodeAt(t.position)===46&&(t.position+=3,jr(t,!0,-1));return}if(t.position{"use strict";var Op=$l(),Kp=ng(),dDe=Tp(),CDe=og(),_4=Object.prototype.toString,X4=Object.prototype.hasOwnProperty,mDe=9,Up=10,IDe=13,EDe=32,yDe=33,wDe=34,Z4=35,BDe=37,QDe=38,bDe=39,vDe=42,$4=44,SDe=45,e5=58,xDe=61,kDe=62,PDe=63,DDe=64,t5=91,r5=93,RDe=96,i5=123,FDe=124,n5=125,Ri={};Ri[0]="\\0";Ri[7]="\\a";Ri[8]="\\b";Ri[9]="\\t";Ri[10]="\\n";Ri[11]="\\v";Ri[12]="\\f";Ri[13]="\\r";Ri[27]="\\e";Ri[34]='\\"';Ri[92]="\\\\";Ri[133]="\\N";Ri[160]="\\_";Ri[8232]="\\L";Ri[8233]="\\P";var NDe=["y","Y","yes","Yes","YES","on","On","ON","n","N","no","No","NO","off","Off","OFF"];function LDe(t,e){var r,i,n,s,o,a,l;if(e===null)return{};for(r={},i=Object.keys(e),n=0,s=i.length;n0?t.charCodeAt(s-1):null,f=f&&a5(o,a)}else{for(s=0;si&&t[g+1]!==" ",g=s);else if(!ug(o))return yw;a=s>0?t.charCodeAt(s-1):null,f=f&&a5(o,a)}c=c||u&&s-g-1>i&&t[g+1]!==" "}return!l&&!c?f&&!n(t)?l5:c5:r>9&&A5(t)?yw:c?g5:u5}function jDe(t,e,r,i){t.dump=function(){if(e.length===0)return"''";if(!t.noCompatMode&&NDe.indexOf(e)!==-1)return"'"+e+"'";var n=t.indent*Math.max(1,r),s=t.lineWidth===-1?-1:Math.max(Math.min(t.lineWidth,40),t.lineWidth-n),o=i||t.flowLevel>-1&&r>=t.flowLevel;function a(l){return MDe(t,l)}switch(UDe(e,o,t.indent,s,a)){case l5:return e;case c5:return"'"+e.replace(/'/g,"''")+"'";case u5:return"|"+f5(e,t.indent)+h5(o5(e,n));case g5:return">"+f5(e,t.indent)+h5(o5(HDe(e,s),n));case yw:return'"'+GDe(e,s)+'"';default:throw new Kp("impossible error: invalid scalar style")}}()}function f5(t,e){var r=A5(t)?String(e):"",i=t[t.length-1]===` +`,n=i&&(t[t.length-2]===` +`||t===` +`),s=n?"+":i?"":"-";return r+s+` +`}function h5(t){return t[t.length-1]===` +`?t.slice(0,-1):t}function HDe(t,e){for(var r=/(\n+)([^\n]*)/g,i=function(){var c=t.indexOf(` +`);return c=c!==-1?c:t.length,r.lastIndex=c,p5(t.slice(0,c),e)}(),n=t[0]===` +`||t[0]===" ",s,o;o=r.exec(t);){var a=o[1],l=o[2];s=l[0]===" ",i+=a+(!n&&!s&&l!==""?` +`:"")+p5(l,e),n=s}return i}function p5(t,e){if(t===""||t[0]===" ")return t;for(var r=/ [^ ]/g,i,n=0,s,o=0,a=0,l="";i=r.exec(t);)a=i.index,a-n>e&&(s=o>n?o:a,l+=` +`+t.slice(n,s),n=s+1),o=a;return l+=` +`,t.length-n>e&&o>n?l+=t.slice(n,o)+` +`+t.slice(o+1):l+=t.slice(n),l.slice(1)}function GDe(t){for(var e="",r,i,n,s=0;s=55296&&r<=56319&&(i=t.charCodeAt(s+1),i>=56320&&i<=57343)){e+=s5((r-55296)*1024+i-56320+65536),s++;continue}n=Ri[r],e+=!n&&ug(r)?t[s]:n||s5(r)}return e}function YDe(t,e,r){var i="",n=t.tag,s,o;for(s=0,o=r.length;s1024&&(u+="? "),u+=t.dump+(t.condenseFlow?'"':"")+":"+(t.condenseFlow?"":" "),!!ic(t,e,c,!1,!1)&&(u+=t.dump,i+=u));t.tag=n,t.dump="{"+i+"}"}function WDe(t,e,r,i){var n="",s=t.tag,o=Object.keys(r),a,l,c,u,g,f;if(t.sortKeys===!0)o.sort();else if(typeof t.sortKeys=="function")o.sort(t.sortKeys);else if(t.sortKeys)throw new Kp("sortKeys must be a boolean or a function");for(a=0,l=o.length;a1024,g&&(t.dump&&Up===t.dump.charCodeAt(0)?f+="?":f+="? "),f+=t.dump,g&&(f+=OP(t,e)),!!ic(t,e+1,u,!0,g)&&(t.dump&&Up===t.dump.charCodeAt(0)?f+=":":f+=": ",f+=t.dump,n+=f));t.tag=s,t.dump=n||"{}"}function d5(t,e,r){var i,n,s,o,a,l;for(n=r?t.explicitTypes:t.implicitTypes,s=0,o=n.length;s tag resolver accepts not "'+l+'" style');t.dump=i}return!0}return!1}function ic(t,e,r,i,n,s){t.tag=null,t.dump=r,d5(t,r,!1)||d5(t,r,!0);var o=_4.call(t.dump);i&&(i=t.flowLevel<0||t.flowLevel>e);var a=o==="[object Object]"||o==="[object Array]",l,c;if(a&&(l=t.duplicates.indexOf(r),c=l!==-1),(t.tag!==null&&t.tag!=="?"||c||t.indent!==2&&e>0)&&(n=!1),c&&t.usedDuplicates[l])t.dump="*ref_"+l;else{if(a&&c&&!t.usedDuplicates[l]&&(t.usedDuplicates[l]=!0),o==="[object Object]")i&&Object.keys(t.dump).length!==0?(WDe(t,e,t.dump,n),c&&(t.dump="&ref_"+l+t.dump)):(JDe(t,e,t.dump),c&&(t.dump="&ref_"+l+" "+t.dump));else if(o==="[object Array]"){var u=t.noArrayIndent&&e>0?e-1:e;i&&t.dump.length!==0?(qDe(t,u,t.dump,n),c&&(t.dump="&ref_"+l+t.dump)):(YDe(t,u,t.dump),c&&(t.dump="&ref_"+l+" "+t.dump))}else if(o==="[object String]")t.tag!=="?"&&jDe(t,t.dump,e,s);else{if(t.skipInvalid)return!1;throw new Kp("unacceptable kind of an object to dump "+o)}t.tag!==null&&t.tag!=="?"&&(t.dump="!<"+t.tag+"> "+t.dump)}return!0}function zDe(t,e){var r=[],i=[],n,s;for(UP(t,r,i),n=0,s=i.length;n{"use strict";var ww=V4(),I5=m5();function Bw(t){return function(){throw new Error("Function "+t+" is deprecated and cannot be used.")}}Qr.exports.Type=Xr();Qr.exports.Schema=ec();Qr.exports.FAILSAFE_SCHEMA=pw();Qr.exports.JSON_SCHEMA=DP();Qr.exports.CORE_SCHEMA=RP();Qr.exports.DEFAULT_SAFE_SCHEMA=og();Qr.exports.DEFAULT_FULL_SCHEMA=Tp();Qr.exports.load=ww.load;Qr.exports.loadAll=ww.loadAll;Qr.exports.safeLoad=ww.safeLoad;Qr.exports.safeLoadAll=ww.safeLoadAll;Qr.exports.dump=I5.dump;Qr.exports.safeDump=I5.safeDump;Qr.exports.YAMLException=ng();Qr.exports.MINIMAL_SCHEMA=pw();Qr.exports.SAFE_SCHEMA=og();Qr.exports.DEFAULT_SCHEMA=Tp();Qr.exports.scan=Bw("scan");Qr.exports.parse=Bw("parse");Qr.exports.compose=Bw("compose");Qr.exports.addConstructor=Bw("addConstructor")});var w5=I((wat,y5)=>{"use strict";var _De=E5();y5.exports=_De});var Q5=I((Bat,B5)=>{"use strict";function XDe(t,e){function r(){this.constructor=t}r.prototype=e.prototype,t.prototype=new r}function nc(t,e,r,i){this.message=t,this.expected=e,this.found=r,this.location=i,this.name="SyntaxError",typeof Error.captureStackTrace=="function"&&Error.captureStackTrace(this,nc)}XDe(nc,Error);nc.buildMessage=function(t,e){var r={literal:function(c){return'"'+n(c.text)+'"'},class:function(c){var u="",g;for(g=0;g0){for(g=1,f=1;g({[xe]:le})))},H=function(x){return x},L=function(x){return x},K=Yo("correct indentation"),J=" ",ne=fr(" ",!1),q=function(x){return x.length===Zc*aI},A=function(x){return x.length===(Zc+1)*aI},V=function(){return Zc++,!0},W=function(){return Zc--,!0},X=function(){return Xm()},F=Yo("pseudostring"),D=/^[^\r\n\t ?:,\][{}#&*!|>'"%@`\-]/,he=Bs(["\r",` +`," "," ","?",":",",","]","[","{","}","#","&","*","!","|",">","'",'"',"%","@","`","-"],!0,!1),pe=/^[^\r\n\t ,\][{}:#"']/,Ne=Bs(["\r",` +`," "," ",",","]","[","{","}",":","#",'"',"'"],!0,!1),Pe=function(){return Xm().replace(/^ *| *$/g,"")},qe="--",re=fr("--",!1),se=/^[a-zA-Z\/0-9]/,be=Bs([["a","z"],["A","Z"],"/",["0","9"]],!1,!1),ae=/^[^\r\n\t :,]/,Ae=Bs(["\r",` +`," "," ",":",","],!0,!1),De="null",$=fr("null",!1),G=function(){return null},Ce="true",ee=fr("true",!1),Ue=function(){return!0},Oe="false",vt=fr("false",!1),dt=function(){return!1},ri=Yo("string"),ii='"',an=fr('"',!1),yr=function(){return""},Ki=function(x){return x},Qi=function(x){return x.join("")},Go=/^[^"\\\0-\x1F\x7F]/,wr=Bs(['"',"\\",["\0",""],"\x7F"],!0,!1),Ui='\\"',ws=fr('\\"',!1),Tf=function(){return'"'},Mf="\\\\",Rm=fr("\\\\",!1),Fm=function(){return"\\"},Nm="\\/",DQ=fr("\\/",!1),RQ=function(){return"/"},Of="\\b",FQ=fr("\\b",!1),NQ=function(){return"\b"},Lm="\\f",LQ=fr("\\f",!1),Va=function(){return"\f"},jo="\\n",Tm=fr("\\n",!1),Mm=function(){return` +`},te="\\r",Om=fr("\\r",!1),Km=function(){return"\r"},il="\\t",Um=fr("\\t",!1),Hm=function(){return" "},Kf="\\u",Gm=fr("\\u",!1),jm=function(x,U,le,xe){return String.fromCharCode(parseInt(`0x${x}${U}${le}${xe}`))},TQ=/^[0-9a-fA-F]/,MQ=Bs([["0","9"],["a","f"],["A","F"]],!1,!1),Ym=Yo("blank space"),qm=/^[ \t]/,Jm=Bs([" "," "],!1,!1),Wm=Yo("white space"),zm=/^[ \t\n\r]/,Vm=Bs([" "," ",` +`,"\r"],!1,!1),Uf=`\r +`,OQ=fr(`\r +`,!1),KQ=` +`,_m=fr(` +`,!1),UQ="\r",HQ=fr("\r",!1),O=0,ht=0,Vc=[{line:1,column:1}],xn=0,Hf=[],Ye=0,nl;if("startRule"in e){if(!(e.startRule in i))throw new Error(`Can't start parsing from rule "`+e.startRule+'".');n=i[e.startRule]}function Xm(){return t.substring(ht,O)}function MM(){return _a(ht,O)}function GQ(x,U){throw U=U!==void 0?U:_a(ht,O),eI([Yo(x)],t.substring(ht,O),U)}function OM(x,U){throw U=U!==void 0?U:_a(ht,O),YQ(x,U)}function fr(x,U){return{type:"literal",text:x,ignoreCase:U}}function Bs(x,U,le){return{type:"class",parts:x,inverted:U,ignoreCase:le}}function jQ(){return{type:"any"}}function Zm(){return{type:"end"}}function Yo(x){return{type:"other",description:x}}function $m(x){var U=Vc[x],le;if(U)return U;for(le=x-1;!Vc[le];)le--;for(U=Vc[le],U={line:U.line,column:U.column};lexn&&(xn=O,Hf=[]),Hf.push(x))}function YQ(x,U){return new nc(x,null,null,U)}function eI(x,U,le){return new nc(nc.buildMessage(x,U),x,U,le)}function tI(){var x;return x=ol(),x}function Xa(){var x,U,le;for(x=O,U=[],le=sl();le!==r;)U.push(le),le=sl();return U!==r&&(ht=x,U=s(U)),x=U,x}function sl(){var x,U,le,xe,Qe;return x=O,U=Al(),U!==r?(t.charCodeAt(O)===45?(le=o,O++):(le=r,Ye===0&&et(a)),le!==r?(xe=xr(),xe!==r?(Qe=qo(),Qe!==r?(ht=x,U=l(Qe),x=U):(O=x,x=r)):(O=x,x=r)):(O=x,x=r)):(O=x,x=r),x}function ol(){var x,U,le;for(x=O,U=[],le=al();le!==r;)U.push(le),le=al();return U!==r&&(ht=x,U=c(U)),x=U,x}function al(){var x,U,le,xe,Qe,Ge,ct,sr,Wo;if(x=O,U=xr(),U===r&&(U=null),U!==r){if(le=O,t.charCodeAt(O)===35?(xe=u,O++):(xe=r,Ye===0&&et(g)),xe!==r){if(Qe=[],Ge=O,ct=O,Ye++,sr=Zs(),Ye--,sr===r?ct=void 0:(O=ct,ct=r),ct!==r?(t.length>O?(sr=t.charAt(O),O++):(sr=r,Ye===0&&et(f)),sr!==r?(ct=[ct,sr],Ge=ct):(O=Ge,Ge=r)):(O=Ge,Ge=r),Ge!==r)for(;Ge!==r;)Qe.push(Ge),Ge=O,ct=O,Ye++,sr=Zs(),Ye--,sr===r?ct=void 0:(O=ct,ct=r),ct!==r?(t.length>O?(sr=t.charAt(O),O++):(sr=r,Ye===0&&et(f)),sr!==r?(ct=[ct,sr],Ge=ct):(O=Ge,Ge=r)):(O=Ge,Ge=r);else Qe=r;Qe!==r?(xe=[xe,Qe],le=xe):(O=le,le=r)}else O=le,le=r;if(le===r&&(le=null),le!==r){if(xe=[],Qe=Jo(),Qe!==r)for(;Qe!==r;)xe.push(Qe),Qe=Jo();else xe=r;xe!==r?(ht=x,U=h(),x=U):(O=x,x=r)}else O=x,x=r}else O=x,x=r;if(x===r&&(x=O,U=Al(),U!==r?(le=JQ(),le!==r?(xe=xr(),xe===r&&(xe=null),xe!==r?(t.charCodeAt(O)===58?(Qe=p,O++):(Qe=r,Ye===0&&et(d)),Qe!==r?(Ge=xr(),Ge===r&&(Ge=null),Ge!==r?(ct=qo(),ct!==r?(ht=x,U=m(le,ct),x=U):(O=x,x=r)):(O=x,x=r)):(O=x,x=r)):(O=x,x=r)):(O=x,x=r)):(O=x,x=r),x===r&&(x=O,U=Al(),U!==r?(le=ll(),le!==r?(xe=xr(),xe===r&&(xe=null),xe!==r?(t.charCodeAt(O)===58?(Qe=p,O++):(Qe=r,Ye===0&&et(d)),Qe!==r?(Ge=xr(),Ge===r&&(Ge=null),Ge!==r?(ct=qo(),ct!==r?(ht=x,U=m(le,ct),x=U):(O=x,x=r)):(O=x,x=r)):(O=x,x=r)):(O=x,x=r)):(O=x,x=r)):(O=x,x=r),x===r))){if(x=O,U=Al(),U!==r)if(le=ll(),le!==r)if(xe=xr(),xe!==r)if(Qe=nI(),Qe!==r){if(Ge=[],ct=Jo(),ct!==r)for(;ct!==r;)Ge.push(ct),ct=Jo();else Ge=r;Ge!==r?(ht=x,U=m(le,Qe),x=U):(O=x,x=r)}else O=x,x=r;else O=x,x=r;else O=x,x=r;else O=x,x=r;if(x===r)if(x=O,U=Al(),U!==r)if(le=ll(),le!==r){if(xe=[],Qe=O,Ge=xr(),Ge===r&&(Ge=null),Ge!==r?(t.charCodeAt(O)===44?(ct=E,O++):(ct=r,Ye===0&&et(B)),ct!==r?(sr=xr(),sr===r&&(sr=null),sr!==r?(Wo=ll(),Wo!==r?(ht=Qe,Ge=b(le,Wo),Qe=Ge):(O=Qe,Qe=r)):(O=Qe,Qe=r)):(O=Qe,Qe=r)):(O=Qe,Qe=r),Qe!==r)for(;Qe!==r;)xe.push(Qe),Qe=O,Ge=xr(),Ge===r&&(Ge=null),Ge!==r?(t.charCodeAt(O)===44?(ct=E,O++):(ct=r,Ye===0&&et(B)),ct!==r?(sr=xr(),sr===r&&(sr=null),sr!==r?(Wo=ll(),Wo!==r?(ht=Qe,Ge=b(le,Wo),Qe=Ge):(O=Qe,Qe=r)):(O=Qe,Qe=r)):(O=Qe,Qe=r)):(O=Qe,Qe=r);else xe=r;xe!==r?(Qe=xr(),Qe===r&&(Qe=null),Qe!==r?(t.charCodeAt(O)===58?(Ge=p,O++):(Ge=r,Ye===0&&et(d)),Ge!==r?(ct=xr(),ct===r&&(ct=null),ct!==r?(sr=qo(),sr!==r?(ht=x,U=R(le,xe,sr),x=U):(O=x,x=r)):(O=x,x=r)):(O=x,x=r)):(O=x,x=r)):(O=x,x=r)}else O=x,x=r;else O=x,x=r}return x}function qo(){var x,U,le,xe,Qe,Ge,ct;if(x=O,U=O,Ye++,le=O,xe=Zs(),xe!==r?(Qe=qQ(),Qe!==r?(t.charCodeAt(O)===45?(Ge=o,O++):(Ge=r,Ye===0&&et(a)),Ge!==r?(ct=xr(),ct!==r?(xe=[xe,Qe,Ge,ct],le=xe):(O=le,le=r)):(O=le,le=r)):(O=le,le=r)):(O=le,le=r),Ye--,le!==r?(O=U,U=void 0):U=r,U!==r?(le=Jo(),le!==r?(xe=rI(),xe!==r?(Qe=Xa(),Qe!==r?(Ge=iI(),Ge!==r?(ht=x,U=H(Qe),x=U):(O=x,x=r)):(O=x,x=r)):(O=x,x=r)):(O=x,x=r)):(O=x,x=r),x===r&&(x=O,U=Zs(),U!==r?(le=rI(),le!==r?(xe=ol(),xe!==r?(Qe=iI(),Qe!==r?(ht=x,U=H(xe),x=U):(O=x,x=r)):(O=x,x=r)):(O=x,x=r)):(O=x,x=r),x===r))if(x=O,U=WQ(),U!==r){if(le=[],xe=Jo(),xe!==r)for(;xe!==r;)le.push(xe),xe=Jo();else le=r;le!==r?(ht=x,U=L(U),x=U):(O=x,x=r)}else O=x,x=r;return x}function Al(){var x,U,le;for(Ye++,x=O,U=[],t.charCodeAt(O)===32?(le=J,O++):(le=r,Ye===0&&et(ne));le!==r;)U.push(le),t.charCodeAt(O)===32?(le=J,O++):(le=r,Ye===0&&et(ne));return U!==r?(ht=O,le=q(U),le?le=void 0:le=r,le!==r?(U=[U,le],x=U):(O=x,x=r)):(O=x,x=r),Ye--,x===r&&(U=r,Ye===0&&et(K)),x}function qQ(){var x,U,le;for(x=O,U=[],t.charCodeAt(O)===32?(le=J,O++):(le=r,Ye===0&&et(ne));le!==r;)U.push(le),t.charCodeAt(O)===32?(le=J,O++):(le=r,Ye===0&&et(ne));return U!==r?(ht=O,le=A(U),le?le=void 0:le=r,le!==r?(U=[U,le],x=U):(O=x,x=r)):(O=x,x=r),x}function rI(){var x;return ht=O,x=V(),x?x=void 0:x=r,x}function iI(){var x;return ht=O,x=W(),x?x=void 0:x=r,x}function JQ(){var x;return x=cl(),x===r&&(x=Gf()),x}function ll(){var x,U,le;if(x=cl(),x===r){if(x=O,U=[],le=_c(),le!==r)for(;le!==r;)U.push(le),le=_c();else U=r;U!==r&&(ht=x,U=X()),x=U}return x}function WQ(){var x;return x=jf(),x===r&&(x=sI(),x===r&&(x=cl(),x===r&&(x=Gf()))),x}function nI(){var x;return x=jf(),x===r&&(x=cl(),x===r&&(x=_c())),x}function Gf(){var x,U,le,xe,Qe,Ge;if(Ye++,x=O,D.test(t.charAt(O))?(U=t.charAt(O),O++):(U=r,Ye===0&&et(he)),U!==r){for(le=[],xe=O,Qe=xr(),Qe===r&&(Qe=null),Qe!==r?(pe.test(t.charAt(O))?(Ge=t.charAt(O),O++):(Ge=r,Ye===0&&et(Ne)),Ge!==r?(Qe=[Qe,Ge],xe=Qe):(O=xe,xe=r)):(O=xe,xe=r);xe!==r;)le.push(xe),xe=O,Qe=xr(),Qe===r&&(Qe=null),Qe!==r?(pe.test(t.charAt(O))?(Ge=t.charAt(O),O++):(Ge=r,Ye===0&&et(Ne)),Ge!==r?(Qe=[Qe,Ge],xe=Qe):(O=xe,xe=r)):(O=xe,xe=r);le!==r?(ht=x,U=Pe(),x=U):(O=x,x=r)}else O=x,x=r;return Ye--,x===r&&(U=r,Ye===0&&et(F)),x}function _c(){var x,U,le,xe,Qe;if(x=O,t.substr(O,2)===qe?(U=qe,O+=2):(U=r,Ye===0&&et(re)),U===r&&(U=null),U!==r)if(se.test(t.charAt(O))?(le=t.charAt(O),O++):(le=r,Ye===0&&et(be)),le!==r){for(xe=[],ae.test(t.charAt(O))?(Qe=t.charAt(O),O++):(Qe=r,Ye===0&&et(Ae));Qe!==r;)xe.push(Qe),ae.test(t.charAt(O))?(Qe=t.charAt(O),O++):(Qe=r,Ye===0&&et(Ae));xe!==r?(ht=x,U=Pe(),x=U):(O=x,x=r)}else O=x,x=r;else O=x,x=r;return x}function jf(){var x,U;return x=O,t.substr(O,4)===De?(U=De,O+=4):(U=r,Ye===0&&et($)),U!==r&&(ht=x,U=G()),x=U,x}function sI(){var x,U;return x=O,t.substr(O,4)===Ce?(U=Ce,O+=4):(U=r,Ye===0&&et(ee)),U!==r&&(ht=x,U=Ue()),x=U,x===r&&(x=O,t.substr(O,5)===Oe?(U=Oe,O+=5):(U=r,Ye===0&&et(vt)),U!==r&&(ht=x,U=dt()),x=U),x}function cl(){var x,U,le,xe;return Ye++,x=O,t.charCodeAt(O)===34?(U=ii,O++):(U=r,Ye===0&&et(an)),U!==r?(t.charCodeAt(O)===34?(le=ii,O++):(le=r,Ye===0&&et(an)),le!==r?(ht=x,U=yr(),x=U):(O=x,x=r)):(O=x,x=r),x===r&&(x=O,t.charCodeAt(O)===34?(U=ii,O++):(U=r,Ye===0&&et(an)),U!==r?(le=oI(),le!==r?(t.charCodeAt(O)===34?(xe=ii,O++):(xe=r,Ye===0&&et(an)),xe!==r?(ht=x,U=Ki(le),x=U):(O=x,x=r)):(O=x,x=r)):(O=x,x=r)),Ye--,x===r&&(U=r,Ye===0&&et(ri)),x}function oI(){var x,U,le;if(x=O,U=[],le=Yf(),le!==r)for(;le!==r;)U.push(le),le=Yf();else U=r;return U!==r&&(ht=x,U=Qi(U)),x=U,x}function Yf(){var x,U,le,xe,Qe,Ge;return Go.test(t.charAt(O))?(x=t.charAt(O),O++):(x=r,Ye===0&&et(wr)),x===r&&(x=O,t.substr(O,2)===Ui?(U=Ui,O+=2):(U=r,Ye===0&&et(ws)),U!==r&&(ht=x,U=Tf()),x=U,x===r&&(x=O,t.substr(O,2)===Mf?(U=Mf,O+=2):(U=r,Ye===0&&et(Rm)),U!==r&&(ht=x,U=Fm()),x=U,x===r&&(x=O,t.substr(O,2)===Nm?(U=Nm,O+=2):(U=r,Ye===0&&et(DQ)),U!==r&&(ht=x,U=RQ()),x=U,x===r&&(x=O,t.substr(O,2)===Of?(U=Of,O+=2):(U=r,Ye===0&&et(FQ)),U!==r&&(ht=x,U=NQ()),x=U,x===r&&(x=O,t.substr(O,2)===Lm?(U=Lm,O+=2):(U=r,Ye===0&&et(LQ)),U!==r&&(ht=x,U=Va()),x=U,x===r&&(x=O,t.substr(O,2)===jo?(U=jo,O+=2):(U=r,Ye===0&&et(Tm)),U!==r&&(ht=x,U=Mm()),x=U,x===r&&(x=O,t.substr(O,2)===te?(U=te,O+=2):(U=r,Ye===0&&et(Om)),U!==r&&(ht=x,U=Km()),x=U,x===r&&(x=O,t.substr(O,2)===il?(U=il,O+=2):(U=r,Ye===0&&et(Um)),U!==r&&(ht=x,U=Hm()),x=U,x===r&&(x=O,t.substr(O,2)===Kf?(U=Kf,O+=2):(U=r,Ye===0&&et(Gm)),U!==r?(le=Xc(),le!==r?(xe=Xc(),xe!==r?(Qe=Xc(),Qe!==r?(Ge=Xc(),Ge!==r?(ht=x,U=jm(le,xe,Qe,Ge),x=U):(O=x,x=r)):(O=x,x=r)):(O=x,x=r)):(O=x,x=r)):(O=x,x=r)))))))))),x}function Xc(){var x;return TQ.test(t.charAt(O))?(x=t.charAt(O),O++):(x=r,Ye===0&&et(MQ)),x}function xr(){var x,U;if(Ye++,x=[],qm.test(t.charAt(O))?(U=t.charAt(O),O++):(U=r,Ye===0&&et(Jm)),U!==r)for(;U!==r;)x.push(U),qm.test(t.charAt(O))?(U=t.charAt(O),O++):(U=r,Ye===0&&et(Jm));else x=r;return Ye--,x===r&&(U=r,Ye===0&&et(Ym)),x}function KM(){var x,U;if(Ye++,x=[],zm.test(t.charAt(O))?(U=t.charAt(O),O++):(U=r,Ye===0&&et(Vm)),U!==r)for(;U!==r;)x.push(U),zm.test(t.charAt(O))?(U=t.charAt(O),O++):(U=r,Ye===0&&et(Vm));else x=r;return Ye--,x===r&&(U=r,Ye===0&&et(Wm)),x}function Jo(){var x,U,le,xe,Qe,Ge;if(x=O,U=Zs(),U!==r){for(le=[],xe=O,Qe=xr(),Qe===r&&(Qe=null),Qe!==r?(Ge=Zs(),Ge!==r?(Qe=[Qe,Ge],xe=Qe):(O=xe,xe=r)):(O=xe,xe=r);xe!==r;)le.push(xe),xe=O,Qe=xr(),Qe===r&&(Qe=null),Qe!==r?(Ge=Zs(),Ge!==r?(Qe=[Qe,Ge],xe=Qe):(O=xe,xe=r)):(O=xe,xe=r);le!==r?(U=[U,le],x=U):(O=x,x=r)}else O=x,x=r;return x}function Zs(){var x;return t.substr(O,2)===Uf?(x=Uf,O+=2):(x=r,Ye===0&&et(OQ)),x===r&&(t.charCodeAt(O)===10?(x=KQ,O++):(x=r,Ye===0&&et(_m)),x===r&&(t.charCodeAt(O)===13?(x=UQ,O++):(x=r,Ye===0&&et(HQ)))),x}let aI=2,Zc=0;if(nl=n(),nl!==r&&O===t.length)return nl;throw nl!==r&&O{var fRe=typeof global=="object"&&global&&global.Object===Object&&global;V5.exports=fRe});var Ks=I((Zat,_5)=>{var hRe=WP(),pRe=typeof self=="object"&&self&&self.Object===Object&&self,dRe=hRe||pRe||Function("return this")();_5.exports=dRe});var ac=I(($at,X5)=>{var CRe=Ks(),mRe=CRe.Symbol;X5.exports=mRe});var $5=I((eAt,Z5)=>{function IRe(t,e){for(var r=-1,i=t==null?0:t.length,n=Array(i);++r{var ERe=Array.isArray;e6.exports=ERe});var n6=I((rAt,t6)=>{var r6=ac(),i6=Object.prototype,yRe=i6.hasOwnProperty,wRe=i6.toString,Jp=r6?r6.toStringTag:void 0;function BRe(t){var e=yRe.call(t,Jp),r=t[Jp];try{t[Jp]=void 0;var i=!0}catch(s){}var n=wRe.call(t);return i&&(e?t[Jp]=r:delete t[Jp]),n}t6.exports=BRe});var o6=I((iAt,s6)=>{var QRe=Object.prototype,bRe=QRe.toString;function vRe(t){return bRe.call(t)}s6.exports=vRe});var Ac=I((nAt,a6)=>{var A6=ac(),SRe=n6(),xRe=o6(),kRe="[object Null]",PRe="[object Undefined]",l6=A6?A6.toStringTag:void 0;function DRe(t){return t==null?t===void 0?PRe:kRe:l6&&l6 in Object(t)?SRe(t):xRe(t)}a6.exports=DRe});var Qo=I((sAt,c6)=>{function RRe(t){return t!=null&&typeof t=="object"}c6.exports=RRe});var Nw=I((oAt,u6)=>{var FRe=Ac(),NRe=Qo(),LRe="[object Symbol]";function TRe(t){return typeof t=="symbol"||NRe(t)&&FRe(t)==LRe}u6.exports=TRe});var C6=I((aAt,g6)=>{var f6=ac(),MRe=$5(),ORe=As(),KRe=Nw(),URe=1/0,h6=f6?f6.prototype:void 0,p6=h6?h6.toString:void 0;function d6(t){if(typeof t=="string")return t;if(ORe(t))return MRe(t,d6)+"";if(KRe(t))return p6?p6.call(t):"";var e=t+"";return e=="0"&&1/t==-URe?"-0":e}g6.exports=d6});var gg=I((AAt,m6)=>{var HRe=C6();function GRe(t){return t==null?"":HRe(t)}m6.exports=GRe});var zP=I((lAt,I6)=>{function jRe(t,e,r){var i=-1,n=t.length;e<0&&(e=-e>n?0:n+e),r=r>n?n:r,r<0&&(r+=n),n=e>r?0:r-e>>>0,e>>>=0;for(var s=Array(n);++i{var YRe=zP();function qRe(t,e,r){var i=t.length;return r=r===void 0?i:r,!e&&r>=i?t:YRe(t,e,r)}E6.exports=qRe});var VP=I((uAt,w6)=>{var JRe="\\ud800-\\udfff",WRe="\\u0300-\\u036f",zRe="\\ufe20-\\ufe2f",VRe="\\u20d0-\\u20ff",_Re=WRe+zRe+VRe,XRe="\\ufe0e\\ufe0f",ZRe="\\u200d",$Re=RegExp("["+ZRe+JRe+_Re+XRe+"]");function eFe(t){return $Re.test(t)}w6.exports=eFe});var Q6=I((gAt,B6)=>{function tFe(t){return t.split("")}B6.exports=tFe});var R6=I((fAt,b6)=>{var v6="\\ud800-\\udfff",rFe="\\u0300-\\u036f",iFe="\\ufe20-\\ufe2f",nFe="\\u20d0-\\u20ff",sFe=rFe+iFe+nFe,oFe="\\ufe0e\\ufe0f",aFe="["+v6+"]",_P="["+sFe+"]",XP="\\ud83c[\\udffb-\\udfff]",AFe="(?:"+_P+"|"+XP+")",S6="[^"+v6+"]",x6="(?:\\ud83c[\\udde6-\\uddff]){2}",k6="[\\ud800-\\udbff][\\udc00-\\udfff]",lFe="\\u200d",P6=AFe+"?",D6="["+oFe+"]?",cFe="(?:"+lFe+"(?:"+[S6,x6,k6].join("|")+")"+D6+P6+")*",uFe=D6+P6+cFe,gFe="(?:"+[S6+_P+"?",_P,x6,k6,aFe].join("|")+")",fFe=RegExp(XP+"(?="+XP+")|"+gFe+uFe,"g");function hFe(t){return t.match(fFe)||[]}b6.exports=hFe});var N6=I((hAt,F6)=>{var pFe=Q6(),dFe=VP(),CFe=R6();function mFe(t){return dFe(t)?CFe(t):pFe(t)}F6.exports=mFe});var T6=I((pAt,L6)=>{var IFe=y6(),EFe=VP(),yFe=N6(),wFe=gg();function BFe(t){return function(e){e=wFe(e);var r=EFe(e)?yFe(e):void 0,i=r?r[0]:e.charAt(0),n=r?IFe(r,1).join(""):e.slice(1);return i[t]()+n}}L6.exports=BFe});var O6=I((dAt,M6)=>{var QFe=T6(),bFe=QFe("toUpperCase");M6.exports=bFe});var ZP=I((CAt,K6)=>{var vFe=gg(),SFe=O6();function xFe(t){return SFe(vFe(t).toLowerCase())}K6.exports=xFe});var H6=I((mAt,U6)=>{"use strict";U6.exports=(t,...e)=>new Promise(r=>{r(t(...e))})});var Wp=I((IAt,$P)=>{"use strict";var kFe=H6(),G6=t=>{if(t<1)throw new TypeError("Expected `concurrency` to be a number from 1 and up");let e=[],r=0,i=()=>{r--,e.length>0&&e.shift()()},n=(a,l,...c)=>{r++;let u=kFe(a,...c);l(u),u.then(i,i)},s=(a,l,...c)=>{rnew Promise(c=>s(a,c,...l));return Object.defineProperties(o,{activeCount:{get:()=>r},pendingCount:{get:()=>e.length}}),o};$P.exports=G6;$P.exports.default=G6});var X6=I((FAt,Mw)=>{function PFe(){var t=0,e=1,r=2,i=3,n=4,s=5,o=6,a=7,l=8,c=9,u=10,g=11,f=12,h=13,p=14,d=15,m=16,E=17,B=0,b=1,R=2,H=3,L=4;function K(A,V){return 55296<=A.charCodeAt(V)&&A.charCodeAt(V)<=56319&&56320<=A.charCodeAt(V+1)&&A.charCodeAt(V+1)<=57343}function J(A,V){V===void 0&&(V=0);var W=A.charCodeAt(V);if(55296<=W&&W<=56319&&V=1){var X=A.charCodeAt(V-1),F=W;return 55296<=X&&X<=56319?(X-55296)*1024+(F-56320)+65536:F}return W}function ne(A,V,W){var X=[A].concat(V).concat([W]),F=X[X.length-2],D=W,he=X.lastIndexOf(p);if(he>1&&X.slice(1,he).every(function(Pe){return Pe==i})&&[i,h,E].indexOf(A)==-1)return R;var pe=X.lastIndexOf(n);if(pe>0&&X.slice(1,pe).every(function(Pe){return Pe==n})&&[f,n].indexOf(F)==-1)return X.filter(function(Pe){return Pe==n}).length%2==1?H:L;if(F==t&&D==e)return B;if(F==r||F==t||F==e)return D==p&&V.every(function(Pe){return Pe==i})?R:b;if(D==r||D==t||D==e)return b;if(F==o&&(D==o||D==a||D==c||D==u))return B;if((F==c||F==a)&&(D==a||D==l))return B;if((F==u||F==l)&&D==l)return B;if(D==i||D==d)return B;if(D==s)return B;if(F==f)return B;var Ne=X.indexOf(i)!=-1?X.lastIndexOf(i)-1:X.length-2;return[h,E].indexOf(X[Ne])!=-1&&X.slice(Ne+1,-1).every(function(Pe){return Pe==i})&&D==p||F==d&&[m,E].indexOf(D)!=-1?B:V.indexOf(n)!=-1?R:F==n&&D==n?B:b}this.nextBreak=function(A,V){if(V===void 0&&(V=0),V<0)return 0;if(V>=A.length-1)return A.length;for(var W=q(J(A,V)),X=[],F=V+1;F{var DFe=X6(),RFe=/^(.*?)(\x1b\[[^m]+m|\x1b\]8;;.*?(\x1b\\|\u0007))/,FFe=new DFe;Z6.exports=(t,e=0,r=t.length)=>{if(e<0||r<0)throw new RangeError("Negative indices aren't supported by this implementation");let i=r-e,n="",s=0,o=0;for(;t.length>0;){let a=t.match(RFe)||[t,t,void 0],l=FFe.splitGraphemes(a[1]),c=Math.min(e-s,l.length);l=l.slice(c);let u=Math.min(i-o,l.length);n+=l.slice(0,u).join(""),s+=c,o+=u,typeof a[2]!="undefined"&&(n+=a[2]),t=t.slice(a[0].length)}return n}});var fg=I((alt,f9)=>{"use strict";var h9=new Map([["C","cwd"],["f","file"],["z","gzip"],["P","preservePaths"],["U","unlink"],["strip-components","strip"],["stripComponents","strip"],["keep-newer","newer"],["keepNewer","newer"],["keep-newer-files","newer"],["keepNewerFiles","newer"],["k","keep"],["keep-existing","keep"],["keepExisting","keep"],["m","noMtime"],["no-mtime","noMtime"],["p","preserveOwner"],["L","follow"],["h","follow"]]),olt=f9.exports=t=>t?Object.keys(t).map(e=>[h9.has(e)?h9.get(e):e,t[e]]).reduce((e,r)=>(e[r[0]]=r[1],e),Object.create(null)):{}});var hg=I((Alt,p9)=>{"use strict";var JFe=require("events"),d9=require("stream"),_p=Rh(),C9=require("string_decoder").StringDecoder,va=Symbol("EOF"),Xp=Symbol("maybeEmitEnd"),xA=Symbol("emittedEnd"),Gw=Symbol("emittingEnd"),jw=Symbol("closed"),m9=Symbol("read"),iD=Symbol("flush"),I9=Symbol("flushChunk"),Bn=Symbol("encoding"),Sa=Symbol("decoder"),Yw=Symbol("flowing"),Zp=Symbol("paused"),$p=Symbol("resume"),rn=Symbol("bufferLength"),E9=Symbol("bufferPush"),nD=Symbol("bufferShift"),Ni=Symbol("objectMode"),Li=Symbol("destroyed"),y9=global._MP_NO_ITERATOR_SYMBOLS_!=="1",WFe=y9&&Symbol.asyncIterator||Symbol("asyncIterator not implemented"),zFe=y9&&Symbol.iterator||Symbol("iterator not implemented"),w9=t=>t==="end"||t==="finish"||t==="prefinish",VFe=t=>t instanceof ArrayBuffer||typeof t=="object"&&t.constructor&&t.constructor.name==="ArrayBuffer"&&t.byteLength>=0,_Fe=t=>!Buffer.isBuffer(t)&&ArrayBuffer.isView(t);p9.exports=class B9 extends d9{constructor(e){super();this[Yw]=!1,this[Zp]=!1,this.pipes=new _p,this.buffer=new _p,this[Ni]=e&&e.objectMode||!1,this[Ni]?this[Bn]=null:this[Bn]=e&&e.encoding||null,this[Bn]==="buffer"&&(this[Bn]=null),this[Sa]=this[Bn]?new C9(this[Bn]):null,this[va]=!1,this[xA]=!1,this[Gw]=!1,this[jw]=!1,this.writable=!0,this.readable=!0,this[rn]=0,this[Li]=!1}get bufferLength(){return this[rn]}get encoding(){return this[Bn]}set encoding(e){if(this[Ni])throw new Error("cannot set encoding in objectMode");if(this[Bn]&&e!==this[Bn]&&(this[Sa]&&this[Sa].lastNeed||this[rn]))throw new Error("cannot change encoding");this[Bn]!==e&&(this[Sa]=e?new C9(e):null,this.buffer.length&&(this.buffer=this.buffer.map(r=>this[Sa].write(r)))),this[Bn]=e}setEncoding(e){this.encoding=e}get objectMode(){return this[Ni]}set objectMode(e){this[Ni]=this[Ni]||!!e}write(e,r,i){if(this[va])throw new Error("write after end");return this[Li]?(this.emit("error",Object.assign(new Error("Cannot call write after a stream was destroyed"),{code:"ERR_STREAM_DESTROYED"})),!0):(typeof r=="function"&&(i=r,r="utf8"),r||(r="utf8"),!this[Ni]&&!Buffer.isBuffer(e)&&(_Fe(e)?e=Buffer.from(e.buffer,e.byteOffset,e.byteLength):VFe(e)?e=Buffer.from(e):typeof e!="string"&&(this.objectMode=!0)),!this.objectMode&&!e.length?(this[rn]!==0&&this.emit("readable"),i&&i(),this.flowing):(typeof e=="string"&&!this[Ni]&&!(r===this[Bn]&&!this[Sa].lastNeed)&&(e=Buffer.from(e,r)),Buffer.isBuffer(e)&&this[Bn]&&(e=this[Sa].write(e)),this.flowing?(this[rn]!==0&&this[iD](!0),this.emit("data",e)):this[E9](e),this[rn]!==0&&this.emit("readable"),i&&i(),this.flowing))}read(e){if(this[Li])return null;try{return this[rn]===0||e===0||e>this[rn]?null:(this[Ni]&&(e=null),this.buffer.length>1&&!this[Ni]&&(this.encoding?this.buffer=new _p([Array.from(this.buffer).join("")]):this.buffer=new _p([Buffer.concat(Array.from(this.buffer),this[rn])])),this[m9](e||null,this.buffer.head.value))}finally{this[Xp]()}}[m9](e,r){return e===r.length||e===null?this[nD]():(this.buffer.head.value=r.slice(e),r=r.slice(0,e),this[rn]-=e),this.emit("data",r),!this.buffer.length&&!this[va]&&this.emit("drain"),r}end(e,r,i){return typeof e=="function"&&(i=e,e=null),typeof r=="function"&&(i=r,r="utf8"),e&&this.write(e,r),i&&this.once("end",i),this[va]=!0,this.writable=!1,(this.flowing||!this[Zp])&&this[Xp](),this}[$p](){this[Li]||(this[Zp]=!1,this[Yw]=!0,this.emit("resume"),this.buffer.length?this[iD]():this[va]?this[Xp]():this.emit("drain"))}resume(){return this[$p]()}pause(){this[Yw]=!1,this[Zp]=!0}get destroyed(){return this[Li]}get flowing(){return this[Yw]}get paused(){return this[Zp]}[E9](e){return this[Ni]?this[rn]+=1:this[rn]+=e.length,this.buffer.push(e)}[nD](){return this.buffer.length&&(this[Ni]?this[rn]-=1:this[rn]-=this.buffer.head.value.length),this.buffer.shift()}[iD](e){do;while(this[I9](this[nD]()));!e&&!this.buffer.length&&!this[va]&&this.emit("drain")}[I9](e){return e?(this.emit("data",e),this.flowing):!1}pipe(e,r){if(this[Li])return;let i=this[xA];r=r||{},e===process.stdout||e===process.stderr?r.end=!1:r.end=r.end!==!1;let n={dest:e,opts:r,ondrain:s=>this[$p]()};return this.pipes.push(n),e.on("drain",n.ondrain),this[$p](),i&&n.opts.end&&n.dest.end(),e}addListener(e,r){return this.on(e,r)}on(e,r){try{return super.on(e,r)}finally{e==="data"&&!this.pipes.length&&!this.flowing?this[$p]():w9(e)&&this[xA]&&(super.emit(e),this.removeAllListeners(e))}}get emittedEnd(){return this[xA]}[Xp](){!this[Gw]&&!this[xA]&&!this[Li]&&this.buffer.length===0&&this[va]&&(this[Gw]=!0,this.emit("end"),this.emit("prefinish"),this.emit("finish"),this[jw]&&this.emit("close"),this[Gw]=!1)}emit(e,r){if(e!=="error"&&e!=="close"&&e!==Li&&this[Li])return;if(e==="data"){if(!r)return;this.pipes.length&&this.pipes.forEach(n=>n.dest.write(r)===!1&&this.pause())}else if(e==="end"){if(this[xA]===!0)return;this[xA]=!0,this.readable=!1,this[Sa]&&(r=this[Sa].end(),r&&(this.pipes.forEach(n=>n.dest.write(r)),super.emit("data",r))),this.pipes.forEach(n=>{n.dest.removeListener("drain",n.ondrain),n.opts.end&&n.dest.end()})}else if(e==="close"&&(this[jw]=!0,!this[xA]&&!this[Li]))return;let i=new Array(arguments.length);if(i[0]=e,i[1]=r,arguments.length>2)for(let n=2;n{e.push(i),this[Ni]||(e.dataLength+=i.length)}),r.then(()=>e)}concat(){return this[Ni]?Promise.reject(new Error("cannot concat in objectMode")):this.collect().then(e=>this[Ni]?Promise.reject(new Error("cannot concat in objectMode")):this[Bn]?e.join(""):Buffer.concat(e,e.dataLength))}promise(){return new Promise((e,r)=>{this.on(Li,()=>r(new Error("stream destroyed"))),this.on("end",()=>e()),this.on("error",i=>r(i))})}[WFe](){return{next:()=>{let r=this.read();if(r!==null)return Promise.resolve({done:!1,value:r});if(this[va])return Promise.resolve({done:!0});let i=null,n=null,s=c=>{this.removeListener("data",o),this.removeListener("end",a),n(c)},o=c=>{this.removeListener("error",s),this.removeListener("end",a),this.pause(),i({value:c,done:!!this[va]})},a=()=>{this.removeListener("error",s),this.removeListener("data",o),i({done:!0})},l=()=>s(new Error("stream destroyed"));return new Promise((c,u)=>{n=u,i=c,this.once(Li,l),this.once("error",s),this.once("end",a),this.once("data",o)})}}}[zFe](){return{next:()=>{let r=this.read();return{value:r,done:r===null}}}}destroy(e){return this[Li]?(e?this.emit("error",e):this.emit(Li),this):(this[Li]=!0,this.buffer=new _p,this[rn]=0,typeof this.close=="function"&&!this[jw]&&this.close(),e?this.emit("error",e):this.emit(Li),this)}static isStream(e){return!!e&&(e instanceof B9||e instanceof d9||e instanceof JFe&&(typeof e.pipe=="function"||typeof e.write=="function"&&typeof e.end=="function"))}}});var b9=I((llt,Q9)=>{var XFe=require("zlib").constants||{ZLIB_VERNUM:4736};Q9.exports=Object.freeze(Object.assign(Object.create(null),{Z_NO_FLUSH:0,Z_PARTIAL_FLUSH:1,Z_SYNC_FLUSH:2,Z_FULL_FLUSH:3,Z_FINISH:4,Z_BLOCK:5,Z_OK:0,Z_STREAM_END:1,Z_NEED_DICT:2,Z_ERRNO:-1,Z_STREAM_ERROR:-2,Z_DATA_ERROR:-3,Z_MEM_ERROR:-4,Z_BUF_ERROR:-5,Z_VERSION_ERROR:-6,Z_NO_COMPRESSION:0,Z_BEST_SPEED:1,Z_BEST_COMPRESSION:9,Z_DEFAULT_COMPRESSION:-1,Z_FILTERED:1,Z_HUFFMAN_ONLY:2,Z_RLE:3,Z_FIXED:4,Z_DEFAULT_STRATEGY:0,DEFLATE:1,INFLATE:2,GZIP:3,GUNZIP:4,DEFLATERAW:5,INFLATERAW:6,UNZIP:7,BROTLI_DECODE:8,BROTLI_ENCODE:9,Z_MIN_WINDOWBITS:8,Z_MAX_WINDOWBITS:15,Z_DEFAULT_WINDOWBITS:15,Z_MIN_CHUNK:64,Z_MAX_CHUNK:Infinity,Z_DEFAULT_CHUNK:16384,Z_MIN_MEMLEVEL:1,Z_MAX_MEMLEVEL:9,Z_DEFAULT_MEMLEVEL:8,Z_MIN_LEVEL:-1,Z_MAX_LEVEL:9,Z_DEFAULT_LEVEL:-1,BROTLI_OPERATION_PROCESS:0,BROTLI_OPERATION_FLUSH:1,BROTLI_OPERATION_FINISH:2,BROTLI_OPERATION_EMIT_METADATA:3,BROTLI_MODE_GENERIC:0,BROTLI_MODE_TEXT:1,BROTLI_MODE_FONT:2,BROTLI_DEFAULT_MODE:0,BROTLI_MIN_QUALITY:0,BROTLI_MAX_QUALITY:11,BROTLI_DEFAULT_QUALITY:11,BROTLI_MIN_WINDOW_BITS:10,BROTLI_MAX_WINDOW_BITS:24,BROTLI_LARGE_MAX_WINDOW_BITS:30,BROTLI_DEFAULT_WINDOW:22,BROTLI_MIN_INPUT_BLOCK_BITS:16,BROTLI_MAX_INPUT_BLOCK_BITS:24,BROTLI_PARAM_MODE:0,BROTLI_PARAM_QUALITY:1,BROTLI_PARAM_LGWIN:2,BROTLI_PARAM_LGBLOCK:3,BROTLI_PARAM_DISABLE_LITERAL_CONTEXT_MODELING:4,BROTLI_PARAM_SIZE_HINT:5,BROTLI_PARAM_LARGE_WINDOW:6,BROTLI_PARAM_NPOSTFIX:7,BROTLI_PARAM_NDIRECT:8,BROTLI_DECODER_RESULT_ERROR:0,BROTLI_DECODER_RESULT_SUCCESS:1,BROTLI_DECODER_RESULT_NEEDS_MORE_INPUT:2,BROTLI_DECODER_RESULT_NEEDS_MORE_OUTPUT:3,BROTLI_DECODER_PARAM_DISABLE_RING_BUFFER_REALLOCATION:0,BROTLI_DECODER_PARAM_LARGE_WINDOW:1,BROTLI_DECODER_NO_ERROR:0,BROTLI_DECODER_SUCCESS:1,BROTLI_DECODER_NEEDS_MORE_INPUT:2,BROTLI_DECODER_NEEDS_MORE_OUTPUT:3,BROTLI_DECODER_ERROR_FORMAT_EXUBERANT_NIBBLE:-1,BROTLI_DECODER_ERROR_FORMAT_RESERVED:-2,BROTLI_DECODER_ERROR_FORMAT_EXUBERANT_META_NIBBLE:-3,BROTLI_DECODER_ERROR_FORMAT_SIMPLE_HUFFMAN_ALPHABET:-4,BROTLI_DECODER_ERROR_FORMAT_SIMPLE_HUFFMAN_SAME:-5,BROTLI_DECODER_ERROR_FORMAT_CL_SPACE:-6,BROTLI_DECODER_ERROR_FORMAT_HUFFMAN_SPACE:-7,BROTLI_DECODER_ERROR_FORMAT_CONTEXT_MAP_REPEAT:-8,BROTLI_DECODER_ERROR_FORMAT_BLOCK_LENGTH_1:-9,BROTLI_DECODER_ERROR_FORMAT_BLOCK_LENGTH_2:-10,BROTLI_DECODER_ERROR_FORMAT_TRANSFORM:-11,BROTLI_DECODER_ERROR_FORMAT_DICTIONARY:-12,BROTLI_DECODER_ERROR_FORMAT_WINDOW_BITS:-13,BROTLI_DECODER_ERROR_FORMAT_PADDING_1:-14,BROTLI_DECODER_ERROR_FORMAT_PADDING_2:-15,BROTLI_DECODER_ERROR_FORMAT_DISTANCE:-16,BROTLI_DECODER_ERROR_DICTIONARY_NOT_SET:-19,BROTLI_DECODER_ERROR_INVALID_ARGUMENTS:-20,BROTLI_DECODER_ERROR_ALLOC_CONTEXT_MODES:-21,BROTLI_DECODER_ERROR_ALLOC_TREE_GROUPS:-22,BROTLI_DECODER_ERROR_ALLOC_CONTEXT_MAP:-25,BROTLI_DECODER_ERROR_ALLOC_RING_BUFFER_1:-26,BROTLI_DECODER_ERROR_ALLOC_RING_BUFFER_2:-27,BROTLI_DECODER_ERROR_ALLOC_BLOCK_TYPE_TREES:-30,BROTLI_DECODER_ERROR_UNREACHABLE:-31},XFe))});var fD=I(Un=>{"use strict";var sD=require("assert"),kA=require("buffer").Buffer,v9=require("zlib"),uc=Un.constants=b9(),ZFe=hg(),S9=kA.concat,gc=Symbol("_superWrite"),ed=class extends Error{constructor(e){super("zlib: "+e.message);this.code=e.code,this.errno=e.errno,this.code||(this.code="ZLIB_ERROR"),this.message="zlib: "+e.message,Error.captureStackTrace(this,this.constructor)}get name(){return"ZlibError"}},$Fe=Symbol("opts"),td=Symbol("flushFlag"),x9=Symbol("finishFlushFlag"),oD=Symbol("fullFlushFlag"),tr=Symbol("handle"),qw=Symbol("onError"),pg=Symbol("sawError"),aD=Symbol("level"),AD=Symbol("strategy"),lD=Symbol("ended"),clt=Symbol("_defaultFullFlush"),cD=class extends ZFe{constructor(e,r){if(!e||typeof e!="object")throw new TypeError("invalid options for ZlibBase constructor");super(e);this[pg]=!1,this[lD]=!1,this[$Fe]=e,this[td]=e.flush,this[x9]=e.finishFlush;try{this[tr]=new v9[r](e)}catch(i){throw new ed(i)}this[qw]=i=>{this[pg]||(this[pg]=!0,this.close(),this.emit("error",i))},this[tr].on("error",i=>this[qw](new ed(i))),this.once("end",()=>this.close)}close(){this[tr]&&(this[tr].close(),this[tr]=null,this.emit("close"))}reset(){if(!this[pg])return sD(this[tr],"zlib binding closed"),this[tr].reset()}flush(e){this.ended||(typeof e!="number"&&(e=this[oD]),this.write(Object.assign(kA.alloc(0),{[td]:e})))}end(e,r,i){return e&&this.write(e,r),this.flush(this[x9]),this[lD]=!0,super.end(null,null,i)}get ended(){return this[lD]}write(e,r,i){if(typeof r=="function"&&(i=r,r="utf8"),typeof e=="string"&&(e=kA.from(e,r)),this[pg])return;sD(this[tr],"zlib binding closed");let n=this[tr]._handle,s=n.close;n.close=()=>{};let o=this[tr].close;this[tr].close=()=>{},kA.concat=c=>c;let a;try{let c=typeof e[td]=="number"?e[td]:this[td];a=this[tr]._processChunk(e,c),kA.concat=S9}catch(c){kA.concat=S9,this[qw](new ed(c))}finally{this[tr]&&(this[tr]._handle=n,n.close=s,this[tr].close=o,this[tr].removeAllListeners("error"))}this[tr]&&this[tr].on("error",c=>this[qw](new ed(c)));let l;if(a)if(Array.isArray(a)&&a.length>0){l=this[gc](kA.from(a[0]));for(let c=1;c{this.flush(n),s()};try{this[tr].params(e,r)}finally{this[tr].flush=i}this[tr]&&(this[aD]=e,this[AD]=r)}}}},k9=class extends PA{constructor(e){super(e,"Deflate")}},P9=class extends PA{constructor(e){super(e,"Inflate")}},uD=Symbol("_portable"),D9=class extends PA{constructor(e){super(e,"Gzip");this[uD]=e&&!!e.portable}[gc](e){return this[uD]?(this[uD]=!1,e[9]=255,super[gc](e)):super[gc](e)}},R9=class extends PA{constructor(e){super(e,"Gunzip")}},F9=class extends PA{constructor(e){super(e,"DeflateRaw")}},N9=class extends PA{constructor(e){super(e,"InflateRaw")}},L9=class extends PA{constructor(e){super(e,"Unzip")}},gD=class extends cD{constructor(e,r){e=e||{},e.flush=e.flush||uc.BROTLI_OPERATION_PROCESS,e.finishFlush=e.finishFlush||uc.BROTLI_OPERATION_FINISH,super(e,r),this[oD]=uc.BROTLI_OPERATION_FLUSH}},T9=class extends gD{constructor(e){super(e,"BrotliCompress")}},M9=class extends gD{constructor(e){super(e,"BrotliDecompress")}};Un.Deflate=k9;Un.Inflate=P9;Un.Gzip=D9;Un.Gunzip=R9;Un.DeflateRaw=F9;Un.InflateRaw=N9;Un.Unzip=L9;typeof v9.BrotliCompress=="function"?(Un.BrotliCompress=T9,Un.BrotliDecompress=M9):Un.BrotliCompress=Un.BrotliDecompress=class{constructor(){throw new Error("Brotli is not supported in this version of Node.js")}}});var rd=I(Jw=>{"use strict";Jw.name=new Map([["0","File"],["","OldFile"],["1","Link"],["2","SymbolicLink"],["3","CharacterDevice"],["4","BlockDevice"],["5","Directory"],["6","FIFO"],["7","ContiguousFile"],["g","GlobalExtendedHeader"],["x","ExtendedHeader"],["A","SolarisACL"],["D","GNUDumpDir"],["I","Inode"],["K","NextFileHasLongLinkpath"],["L","NextFileHasLongPath"],["M","ContinuationFile"],["N","OldGnuLongPath"],["S","SparseFile"],["V","TapeVolumeHeader"],["X","OldExtendedHeader"]]);Jw.code=new Map(Array.from(Jw.name).map(t=>[t[1],t[0]]))});var id=I((plt,O9)=>{"use strict";var flt=rd(),eNe=hg(),hD=Symbol("slurp");O9.exports=class extends eNe{constructor(e,r,i){super();switch(this.pause(),this.extended=r,this.globalExtended=i,this.header=e,this.startBlockSize=512*Math.ceil(e.size/512),this.blockRemain=this.startBlockSize,this.remain=e.size,this.type=e.type,this.meta=!1,this.ignore=!1,this.type){case"File":case"OldFile":case"Link":case"SymbolicLink":case"CharacterDevice":case"BlockDevice":case"Directory":case"FIFO":case"ContiguousFile":case"GNUDumpDir":break;case"NextFileHasLongLinkpath":case"NextFileHasLongPath":case"OldGnuLongPath":case"GlobalExtendedHeader":case"ExtendedHeader":case"OldExtendedHeader":this.meta=!0;break;default:this.ignore=!0}this.path=e.path,this.mode=e.mode,this.mode&&(this.mode=this.mode&4095),this.uid=e.uid,this.gid=e.gid,this.uname=e.uname,this.gname=e.gname,this.size=e.size,this.mtime=e.mtime,this.atime=e.atime,this.ctime=e.ctime,this.linkpath=e.linkpath,this.uname=e.uname,this.gname=e.gname,r&&this[hD](r),i&&this[hD](i,!0)}write(e){let r=e.length;if(r>this.blockRemain)throw new Error("writing more to entry than is appropriate");let i=this.remain,n=this.blockRemain;return this.remain=Math.max(0,i-r),this.blockRemain=Math.max(0,n-r),this.ignore?!0:i>=r?super.write(e):super.write(e.slice(0,i))}[hD](e,r){for(let i in e)e[i]!==null&&e[i]!==void 0&&!(r&&i==="path")&&(this[i]=e[i])}}});var H9=I(pD=>{"use strict";var dlt=pD.encode=(t,e)=>{if(Number.isSafeInteger(t))t<0?rNe(t,e):tNe(t,e);else throw Error("cannot encode number outside of javascript safe integer range");return e},tNe=(t,e)=>{e[0]=128;for(var r=e.length;r>1;r--)e[r-1]=t&255,t=Math.floor(t/256)},rNe=(t,e)=>{e[0]=255;var r=!1;t=t*-1;for(var i=e.length;i>1;i--){var n=t&255;t=Math.floor(t/256),r?e[i-1]=K9(n):n===0?e[i-1]=0:(r=!0,e[i-1]=U9(n))}},Clt=pD.parse=t=>{var e=t[t.length-1],r=t[0],i;if(r===128)i=nNe(t.slice(1,t.length));else if(r===255)i=iNe(t);else throw Error("invalid base256 encoding");if(!Number.isSafeInteger(i))throw Error("parsed number outside of javascript safe integer range");return i},iNe=t=>{for(var e=t.length,r=0,i=!1,n=e-1;n>-1;n--){var s=t[n],o;i?o=K9(s):s===0?o=s:(i=!0,o=U9(s)),o!==0&&(r-=o*Math.pow(256,e-n-1))}return r},nNe=t=>{for(var e=t.length,r=0,i=e-1;i>-1;i--){var n=t[i];n!==0&&(r+=n*Math.pow(256,e-i-1))}return r},K9=t=>(255^t)&255,U9=t=>(255^t)+1&255});var Cg=I((Ilt,G9)=>{"use strict";var dD=rd(),dg=require("path").posix,j9=H9(),CD=Symbol("slurp"),Hn=Symbol("type"),Y9=class{constructor(e,r,i,n){this.cksumValid=!1,this.needPax=!1,this.nullBlock=!1,this.block=null,this.path=null,this.mode=null,this.uid=null,this.gid=null,this.size=null,this.mtime=null,this.cksum=null,this[Hn]="0",this.linkpath=null,this.uname=null,this.gname=null,this.devmaj=0,this.devmin=0,this.atime=null,this.ctime=null,Buffer.isBuffer(e)?this.decode(e,r||0,i,n):e&&this.set(e)}decode(e,r,i,n){if(r||(r=0),!e||!(e.length>=r+512))throw new Error("need 512 bytes for header");if(this.path=fc(e,r,100),this.mode=DA(e,r+100,8),this.uid=DA(e,r+108,8),this.gid=DA(e,r+116,8),this.size=DA(e,r+124,12),this.mtime=mD(e,r+136,12),this.cksum=DA(e,r+148,12),this[CD](i),this[CD](n,!0),this[Hn]=fc(e,r+156,1),this[Hn]===""&&(this[Hn]="0"),this[Hn]==="0"&&this.path.substr(-1)==="/"&&(this[Hn]="5"),this[Hn]==="5"&&(this.size=0),this.linkpath=fc(e,r+157,100),e.slice(r+257,r+265).toString()==="ustar\x0000")if(this.uname=fc(e,r+265,32),this.gname=fc(e,r+297,32),this.devmaj=DA(e,r+329,8),this.devmin=DA(e,r+337,8),e[r+475]!==0){let o=fc(e,r+345,155);this.path=o+"/"+this.path}else{let o=fc(e,r+345,130);o&&(this.path=o+"/"+this.path),this.atime=mD(e,r+476,12),this.ctime=mD(e,r+488,12)}let s=8*32;for(let o=r;o=r+512))throw new Error("need 512 bytes for header");let i=this.ctime||this.atime?130:155,n=sNe(this.path||"",i),s=n[0],o=n[1];this.needPax=n[2],this.needPax=hc(e,r,100,s)||this.needPax,this.needPax=RA(e,r+100,8,this.mode)||this.needPax,this.needPax=RA(e,r+108,8,this.uid)||this.needPax,this.needPax=RA(e,r+116,8,this.gid)||this.needPax,this.needPax=RA(e,r+124,12,this.size)||this.needPax,this.needPax=ID(e,r+136,12,this.mtime)||this.needPax,e[r+156]=this[Hn].charCodeAt(0),this.needPax=hc(e,r+157,100,this.linkpath)||this.needPax,e.write("ustar\x0000",r+257,8),this.needPax=hc(e,r+265,32,this.uname)||this.needPax,this.needPax=hc(e,r+297,32,this.gname)||this.needPax,this.needPax=RA(e,r+329,8,this.devmaj)||this.needPax,this.needPax=RA(e,r+337,8,this.devmin)||this.needPax,this.needPax=hc(e,r+345,i,o)||this.needPax,e[r+475]!==0?this.needPax=hc(e,r+345,155,o)||this.needPax:(this.needPax=hc(e,r+345,130,o)||this.needPax,this.needPax=ID(e,r+476,12,this.atime)||this.needPax,this.needPax=ID(e,r+488,12,this.ctime)||this.needPax);let a=8*32;for(let l=r;l{let r=100,i=t,n="",s,o=dg.parse(t).root||".";if(Buffer.byteLength(i)r&&Buffer.byteLength(n)<=e?s=[i.substr(0,r-1),n,!0]:(i=dg.join(dg.basename(n),i),n=dg.dirname(n));while(n!==o&&!s);s||(s=[t.substr(0,r-1),"",!0])}return s},fc=(t,e,r)=>t.slice(e,e+r).toString("utf8").replace(/\0.*/,""),mD=(t,e,r)=>oNe(DA(t,e,r)),oNe=t=>t===null?null:new Date(t*1e3),DA=(t,e,r)=>t[e]&128?j9.parse(t.slice(e,e+r)):aNe(t,e,r),ANe=t=>isNaN(t)?null:t,aNe=(t,e,r)=>ANe(parseInt(t.slice(e,e+r).toString("utf8").replace(/\0.*$/,"").trim(),8)),lNe={12:8589934591,8:2097151},RA=(t,e,r,i)=>i===null?!1:i>lNe[r]||i<0?(j9.encode(i,t.slice(e,e+r)),!0):(cNe(t,e,r,i),!1),cNe=(t,e,r,i)=>t.write(uNe(i,r),e,r,"ascii"),uNe=(t,e)=>gNe(Math.floor(t).toString(8),e),gNe=(t,e)=>(t.length===e-1?t:new Array(e-t.length-1).join("0")+t+" ")+"\0",ID=(t,e,r,i)=>i===null?!1:RA(t,e,r,i.getTime()/1e3),fNe=new Array(156).join("\0"),hc=(t,e,r,i)=>i===null?!1:(t.write(i+fNe,e,r,"utf8"),i.length!==Buffer.byteLength(i)||i.length>r);G9.exports=Y9});var zw=I((Elt,q9)=>{"use strict";var hNe=Cg(),pNe=require("path"),Ww=class{constructor(e,r){this.atime=e.atime||null,this.charset=e.charset||null,this.comment=e.comment||null,this.ctime=e.ctime||null,this.gid=e.gid||null,this.gname=e.gname||null,this.linkpath=e.linkpath||null,this.mtime=e.mtime||null,this.path=e.path||null,this.size=e.size||null,this.uid=e.uid||null,this.uname=e.uname||null,this.dev=e.dev||null,this.ino=e.ino||null,this.nlink=e.nlink||null,this.global=r||!1}encode(){let e=this.encodeBody();if(e==="")return null;let r=Buffer.byteLength(e),i=512*Math.ceil(1+r/512),n=Buffer.allocUnsafe(i);for(let s=0;s<512;s++)n[s]=0;new hNe({path:("PaxHeader/"+pNe.basename(this.path)).slice(0,99),mode:this.mode||420,uid:this.uid||null,gid:this.gid||null,size:r,mtime:this.mtime||null,type:this.global?"GlobalExtendedHeader":"ExtendedHeader",linkpath:"",uname:this.uname||"",gname:this.gname||"",devmaj:0,devmin:0,atime:this.atime||null,ctime:this.ctime||null}).encode(n),n.write(e,512,r,"utf8");for(let s=r+512;s=Math.pow(10,s)&&(s+=1),s+n+i}};Ww.parse=(t,e,r)=>new Ww(dNe(CNe(t),e),r);var dNe=(t,e)=>e?Object.keys(t).reduce((r,i)=>(r[i]=t[i],r),e):t,CNe=t=>t.replace(/\n$/,"").split(` +`).reduce(mNe,Object.create(null)),mNe=(t,e)=>{let r=parseInt(e,10);if(r!==Buffer.byteLength(e)+1)return t;e=e.substr((r+" ").length);let i=e.split("="),n=i.shift().replace(/^SCHILY\.(dev|ino|nlink)/,"$1");if(!n)return t;let s=i.join("=");return t[n]=/^([A-Z]+\.)?([mac]|birth|creation)time$/.test(n)?new Date(s*1e3):/^[0-9]+$/.test(s)?+s:s,t};q9.exports=Ww});var Vw=I((ylt,J9)=>{"use strict";J9.exports=t=>class extends t{warn(e,r,i={}){this.file&&(i.file=this.file),this.cwd&&(i.cwd=this.cwd),i.code=r instanceof Error&&r.code||e,i.tarCode=e,!this.strict&&i.recoverable!==!1?(r instanceof Error&&(i=Object.assign(r,i),r=r.message),this.emit("warn",i.tarCode,r,i)):r instanceof Error?this.emit("error",Object.assign(r,i)):this.emit("error",Object.assign(new Error(`${e}: ${r}`),i))}}});var yD=I((wlt,W9)=>{"use strict";var _w=["|","<",">","?",":"],ED=_w.map(t=>String.fromCharCode(61440+t.charCodeAt(0))),INe=new Map(_w.map((t,e)=>[t,ED[e]])),ENe=new Map(ED.map((t,e)=>[t,_w[e]]));W9.exports={encode:t=>_w.reduce((e,r)=>e.split(r).join(INe.get(r)),t),decode:t=>ED.reduce((e,r)=>e.split(r).join(ENe.get(r)),t)}});var V9=I((Blt,z9)=>{"use strict";z9.exports=(t,e,r)=>(t&=4095,r&&(t=(t|384)&~18),e&&(t&256&&(t|=64),t&32&&(t|=8),t&4&&(t|=1)),t)});var xD=I((xlt,_9)=>{"use strict";var X9=hg(),Z9=zw(),$9=Cg(),Qlt=id(),bo=require("fs"),mg=require("path"),blt=rd(),yNe=16*1024*1024,e7=Symbol("process"),t7=Symbol("file"),r7=Symbol("directory"),wD=Symbol("symlink"),i7=Symbol("hardlink"),nd=Symbol("header"),Xw=Symbol("read"),BD=Symbol("lstat"),Zw=Symbol("onlstat"),QD=Symbol("onread"),bD=Symbol("onreadlink"),vD=Symbol("openfile"),SD=Symbol("onopenfile"),pc=Symbol("close"),$w=Symbol("mode"),n7=Vw(),wNe=yD(),s7=V9(),eB=n7(class extends X9{constructor(e,r){if(r=r||{},super(r),typeof e!="string")throw new TypeError("path is required");this.path=e,this.portable=!!r.portable,this.myuid=process.getuid&&process.getuid(),this.myuser=process.env.USER||"",this.maxReadSize=r.maxReadSize||yNe,this.linkCache=r.linkCache||new Map,this.statCache=r.statCache||new Map,this.preservePaths=!!r.preservePaths,this.cwd=r.cwd||process.cwd(),this.strict=!!r.strict,this.noPax=!!r.noPax,this.noMtime=!!r.noMtime,this.mtime=r.mtime||null,typeof r.onwarn=="function"&&this.on("warn",r.onwarn);let i=!1;if(!this.preservePaths&&mg.win32.isAbsolute(e)){let n=mg.win32.parse(e);this.path=e.substr(n.root.length),i=n.root}this.win32=!!r.win32||process.platform==="win32",this.win32&&(this.path=wNe.decode(this.path.replace(/\\/g,"/")),e=e.replace(/\\/g,"/")),this.absolute=r.absolute||mg.resolve(this.cwd,e),this.path===""&&(this.path="./"),i&&this.warn("TAR_ENTRY_INFO",`stripping ${i} from absolute path`,{entry:this,path:i+this.path}),this.statCache.has(this.absolute)?this[Zw](this.statCache.get(this.absolute)):this[BD]()}[BD](){bo.lstat(this.absolute,(e,r)=>{if(e)return this.emit("error",e);this[Zw](r)})}[Zw](e){this.statCache.set(this.absolute,e),this.stat=e,e.isFile()||(e.size=0),this.type=BNe(e),this.emit("stat",e),this[e7]()}[e7](){switch(this.type){case"File":return this[t7]();case"Directory":return this[r7]();case"SymbolicLink":return this[wD]();default:return this.end()}}[$w](e){return s7(e,this.type==="Directory",this.portable)}[nd](){this.type==="Directory"&&this.portable&&(this.noMtime=!0),this.header=new $9({path:this.path,linkpath:this.linkpath,mode:this[$w](this.stat.mode),uid:this.portable?null:this.stat.uid,gid:this.portable?null:this.stat.gid,size:this.stat.size,mtime:this.noMtime?null:this.mtime||this.stat.mtime,type:this.type,uname:this.portable?null:this.stat.uid===this.myuid?this.myuser:"",atime:this.portable?null:this.stat.atime,ctime:this.portable?null:this.stat.ctime}),this.header.encode()&&!this.noPax&&this.write(new Z9({atime:this.portable?null:this.header.atime,ctime:this.portable?null:this.header.ctime,gid:this.portable?null:this.header.gid,mtime:this.noMtime?null:this.mtime||this.header.mtime,path:this.path,linkpath:this.linkpath,size:this.header.size,uid:this.portable?null:this.header.uid,uname:this.portable?null:this.header.uname,dev:this.portable?null:this.stat.dev,ino:this.portable?null:this.stat.ino,nlink:this.portable?null:this.stat.nlink}).encode()),this.write(this.header.block)}[r7](){this.path.substr(-1)!=="/"&&(this.path+="/"),this.stat.size=0,this[nd](),this.end()}[wD](){bo.readlink(this.absolute,(e,r)=>{if(e)return this.emit("error",e);this[bD](r)})}[bD](e){this.linkpath=e.replace(/\\/g,"/"),this[nd](),this.end()}[i7](e){this.type="Link",this.linkpath=mg.relative(this.cwd,e).replace(/\\/g,"/"),this.stat.size=0,this[nd](),this.end()}[t7](){if(this.stat.nlink>1){let e=this.stat.dev+":"+this.stat.ino;if(this.linkCache.has(e)){let r=this.linkCache.get(e);if(r.indexOf(this.cwd)===0)return this[i7](r)}this.linkCache.set(e,this.absolute)}if(this[nd](),this.stat.size===0)return this.end();this[vD]()}[vD](){bo.open(this.absolute,"r",(e,r)=>{if(e)return this.emit("error",e);this[SD](r)})}[SD](e){let r=512*Math.ceil(this.stat.size/512),i=Math.min(r,this.maxReadSize),n=Buffer.allocUnsafe(i);this[Xw](e,n,0,n.length,0,this.stat.size,r)}[Xw](e,r,i,n,s,o,a){bo.read(e,r,i,n,s,(l,c)=>{if(l)return this[pc](e,()=>this.emit("error",l));this[QD](e,r,i,n,s,o,a,c)})}[pc](e,r){bo.close(e,r)}[QD](e,r,i,n,s,o,a,l){if(l<=0&&o>0){let u=new Error("encountered unexpected EOF");return u.path=this.absolute,u.syscall="read",u.code="EOF",this[pc](e,()=>this.emit("error",u))}if(l>o){let u=new Error("did not encounter expected EOF");return u.path=this.absolute,u.syscall="read",u.code="EOF",this[pc](e,()=>this.emit("error",u))}if(l===o)for(let u=l;uu?this.emit("error",u):this.end());i>=n&&(r=Buffer.allocUnsafe(n),i=0),n=r.length-i,this[Xw](e,r,i,n,s,o,a)}}),o7=class extends eB{constructor(e,r){super(e,r)}[BD](){this[Zw](bo.lstatSync(this.absolute))}[wD](){this[bD](bo.readlinkSync(this.absolute))}[vD](){this[SD](bo.openSync(this.absolute,"r"))}[Xw](e,r,i,n,s,o,a){let l=!0;try{let c=bo.readSync(e,r,i,n,s);this[QD](e,r,i,n,s,o,a,c),l=!1}finally{if(l)try{this[pc](e,()=>{})}catch(c){}}}[pc](e,r){bo.closeSync(e),r()}},QNe=n7(class extends X9{constructor(e,r){r=r||{},super(r),this.preservePaths=!!r.preservePaths,this.portable=!!r.portable,this.strict=!!r.strict,this.noPax=!!r.noPax,this.noMtime=!!r.noMtime,this.readEntry=e,this.type=e.type,this.type==="Directory"&&this.portable&&(this.noMtime=!0),this.path=e.path,this.mode=this[$w](e.mode),this.uid=this.portable?null:e.uid,this.gid=this.portable?null:e.gid,this.uname=this.portable?null:e.uname,this.gname=this.portable?null:e.gname,this.size=e.size,this.mtime=this.noMtime?null:r.mtime||e.mtime,this.atime=this.portable?null:e.atime,this.ctime=this.portable?null:e.ctime,this.linkpath=e.linkpath,typeof r.onwarn=="function"&&this.on("warn",r.onwarn);let i=!1;if(mg.isAbsolute(this.path)&&!this.preservePaths){let n=mg.parse(this.path);i=n.root,this.path=this.path.substr(n.root.length)}this.remain=e.size,this.blockRemain=e.startBlockSize,this.header=new $9({path:this.path,linkpath:this.linkpath,mode:this.mode,uid:this.portable?null:this.uid,gid:this.portable?null:this.gid,size:this.size,mtime:this.noMtime?null:this.mtime,type:this.type,uname:this.portable?null:this.uname,atime:this.portable?null:this.atime,ctime:this.portable?null:this.ctime}),i&&this.warn("TAR_ENTRY_INFO",`stripping ${i} from absolute path`,{entry:this,path:i+this.path}),this.header.encode()&&!this.noPax&&super.write(new Z9({atime:this.portable?null:this.atime,ctime:this.portable?null:this.ctime,gid:this.portable?null:this.gid,mtime:this.noMtime?null:this.mtime,path:this.path,linkpath:this.linkpath,size:this.size,uid:this.portable?null:this.uid,uname:this.portable?null:this.uname,dev:this.portable?null:this.readEntry.dev,ino:this.portable?null:this.readEntry.ino,nlink:this.portable?null:this.readEntry.nlink}).encode()),super.write(this.header.block),e.pipe(this)}[$w](e){return s7(e,this.type==="Directory",this.portable)}write(e){let r=e.length;if(r>this.blockRemain)throw new Error("writing more to entry than is appropriate");return this.blockRemain-=r,super.write(e)}end(){return this.blockRemain&&this.write(Buffer.alloc(this.blockRemain)),super.end()}});eB.Sync=o7;eB.Tar=QNe;var BNe=t=>t.isFile()?"File":t.isDirectory()?"Directory":t.isSymbolicLink()?"SymbolicLink":"Unsupported";_9.exports=eB});var AB=I((Plt,a7)=>{"use strict";var kD=class{constructor(e,r){this.path=e||"./",this.absolute=r,this.entry=null,this.stat=null,this.readdir=null,this.pending=!1,this.ignore=!1,this.piped=!1}},bNe=hg(),vNe=fD(),SNe=id(),PD=xD(),xNe=PD.Sync,kNe=PD.Tar,PNe=Rh(),A7=Buffer.alloc(1024),tB=Symbol("onStat"),rB=Symbol("ended"),vo=Symbol("queue"),Ig=Symbol("current"),dc=Symbol("process"),iB=Symbol("processing"),l7=Symbol("processJob"),So=Symbol("jobs"),DD=Symbol("jobDone"),nB=Symbol("addFSEntry"),c7=Symbol("addTarEntry"),RD=Symbol("stat"),FD=Symbol("readdir"),sB=Symbol("onreaddir"),oB=Symbol("pipe"),u7=Symbol("entry"),ND=Symbol("entryOpt"),LD=Symbol("writeEntryClass"),g7=Symbol("write"),TD=Symbol("ondrain"),aB=require("fs"),f7=require("path"),DNe=Vw(),MD=DNe(class extends bNe{constructor(e){super(e);e=e||Object.create(null),this.opt=e,this.file=e.file||"",this.cwd=e.cwd||process.cwd(),this.maxReadSize=e.maxReadSize,this.preservePaths=!!e.preservePaths,this.strict=!!e.strict,this.noPax=!!e.noPax,this.prefix=(e.prefix||"").replace(/(\\|\/)+$/,""),this.linkCache=e.linkCache||new Map,this.statCache=e.statCache||new Map,this.readdirCache=e.readdirCache||new Map,this[LD]=PD,typeof e.onwarn=="function"&&this.on("warn",e.onwarn),this.portable=!!e.portable,this.zip=null,e.gzip?(typeof e.gzip!="object"&&(e.gzip={}),this.portable&&(e.gzip.portable=!0),this.zip=new vNe.Gzip(e.gzip),this.zip.on("data",r=>super.write(r)),this.zip.on("end",r=>super.end()),this.zip.on("drain",r=>this[TD]()),this.on("resume",r=>this.zip.resume())):this.on("drain",this[TD]),this.noDirRecurse=!!e.noDirRecurse,this.follow=!!e.follow,this.noMtime=!!e.noMtime,this.mtime=e.mtime||null,this.filter=typeof e.filter=="function"?e.filter:r=>!0,this[vo]=new PNe,this[So]=0,this.jobs=+e.jobs||4,this[iB]=!1,this[rB]=!1}[g7](e){return super.write(e)}add(e){return this.write(e),this}end(e){return e&&this.write(e),this[rB]=!0,this[dc](),this}write(e){if(this[rB])throw new Error("write after end");return e instanceof SNe?this[c7](e):this[nB](e),this.flowing}[c7](e){let r=f7.resolve(this.cwd,e.path);if(this.prefix&&(e.path=this.prefix+"/"+e.path.replace(/^\.(\/+|$)/,"")),!this.filter(e.path,e))e.resume();else{let i=new kD(e.path,r,!1);i.entry=new kNe(e,this[ND](i)),i.entry.on("end",n=>this[DD](i)),this[So]+=1,this[vo].push(i)}this[dc]()}[nB](e){let r=f7.resolve(this.cwd,e);this.prefix&&(e=this.prefix+"/"+e.replace(/^\.(\/+|$)/,"")),this[vo].push(new kD(e,r)),this[dc]()}[RD](e){e.pending=!0,this[So]+=1;let r=this.follow?"stat":"lstat";aB[r](e.absolute,(i,n)=>{e.pending=!1,this[So]-=1,i?this.emit("error",i):this[tB](e,n)})}[tB](e,r){this.statCache.set(e.absolute,r),e.stat=r,this.filter(e.path,r)||(e.ignore=!0),this[dc]()}[FD](e){e.pending=!0,this[So]+=1,aB.readdir(e.absolute,(r,i)=>{if(e.pending=!1,this[So]-=1,r)return this.emit("error",r);this[sB](e,i)})}[sB](e,r){this.readdirCache.set(e.absolute,r),e.readdir=r,this[dc]()}[dc](){if(!this[iB]){this[iB]=!0;for(let e=this[vo].head;e!==null&&this[So]this.warn(r,i,n),noPax:this.noPax,cwd:this.cwd,absolute:e.absolute,preservePaths:this.preservePaths,maxReadSize:this.maxReadSize,strict:this.strict,portable:this.portable,linkCache:this.linkCache,statCache:this.statCache,noMtime:this.noMtime,mtime:this.mtime}}[u7](e){this[So]+=1;try{return new this[LD](e.path,this[ND](e)).on("end",()=>this[DD](e)).on("error",r=>this.emit("error",r))}catch(r){this.emit("error",r)}}[TD](){this[Ig]&&this[Ig].entry&&this[Ig].entry.resume()}[oB](e){e.piped=!0,e.readdir&&e.readdir.forEach(n=>{let s=this.prefix?e.path.slice(this.prefix.length+1)||"./":e.path,o=s==="./"?"":s.replace(/\/*$/,"/");this[nB](o+n)});let r=e.entry,i=this.zip;i?r.on("data",n=>{i.write(n)||r.pause()}):r.on("data",n=>{super.write(n)||r.pause()})}pause(){return this.zip&&this.zip.pause(),super.pause()}}),h7=class extends MD{constructor(e){super(e);this[LD]=xNe}pause(){}resume(){}[RD](e){let r=this.follow?"statSync":"lstatSync";this[tB](e,aB[r](e.absolute))}[FD](e,r){this[sB](e,aB.readdirSync(e.absolute))}[oB](e){let r=e.entry,i=this.zip;e.readdir&&e.readdir.forEach(n=>{let s=this.prefix?e.path.slice(this.prefix.length+1)||"./":e.path,o=s==="./"?"":s.replace(/\/*$/,"/");this[nB](o+n)}),i?r.on("data",n=>{i.write(n)}):r.on("data",n=>{super[g7](n)})}};MD.Sync=h7;a7.exports=MD});var bg=I(sd=>{"use strict";var RNe=hg(),FNe=require("events").EventEmitter,ls=require("fs"),lB=process.binding("fs"),Dlt=lB.writeBuffers,NNe=lB.FSReqWrap||lB.FSReqCallback,Eg=Symbol("_autoClose"),xo=Symbol("_close"),od=Symbol("_ended"),Jt=Symbol("_fd"),p7=Symbol("_finished"),Cc=Symbol("_flags"),OD=Symbol("_flush"),KD=Symbol("_handleChunk"),UD=Symbol("_makeBuf"),HD=Symbol("_mode"),cB=Symbol("_needDrain"),yg=Symbol("_onerror"),wg=Symbol("_onopen"),GD=Symbol("_onread"),mc=Symbol("_onwrite"),FA=Symbol("_open"),NA=Symbol("_path"),Ic=Symbol("_pos"),ko=Symbol("_queue"),Bg=Symbol("_read"),d7=Symbol("_readSize"),LA=Symbol("_reading"),uB=Symbol("_remain"),C7=Symbol("_size"),gB=Symbol("_write"),Qg=Symbol("_writing"),fB=Symbol("_defaultFlag"),jD=class extends RNe{constructor(e,r){if(r=r||{},super(r),this.writable=!1,typeof e!="string")throw new TypeError("path must be a string");this[Jt]=typeof r.fd=="number"?r.fd:null,this[NA]=e,this[d7]=r.readSize||16*1024*1024,this[LA]=!1,this[C7]=typeof r.size=="number"?r.size:Infinity,this[uB]=this[C7],this[Eg]=typeof r.autoClose=="boolean"?r.autoClose:!0,typeof this[Jt]=="number"?this[Bg]():this[FA]()}get fd(){return this[Jt]}get path(){return this[NA]}write(){throw new TypeError("this is a readable stream")}end(){throw new TypeError("this is a readable stream")}[FA](){ls.open(this[NA],"r",(e,r)=>this[wg](e,r))}[wg](e,r){e?this[yg](e):(this[Jt]=r,this.emit("open",r),this[Bg]())}[UD](){return Buffer.allocUnsafe(Math.min(this[d7],this[uB]))}[Bg](){if(!this[LA]){this[LA]=!0;let e=this[UD]();if(e.length===0)return process.nextTick(()=>this[GD](null,0,e));ls.read(this[Jt],e,0,e.length,null,(r,i,n)=>this[GD](r,i,n))}}[GD](e,r,i){this[LA]=!1,e?this[yg](e):this[KD](r,i)&&this[Bg]()}[xo](){this[Eg]&&typeof this[Jt]=="number"&&(ls.close(this[Jt],e=>this.emit("close")),this[Jt]=null)}[yg](e){this[LA]=!0,this[xo](),this.emit("error",e)}[KD](e,r){let i=!1;return this[uB]-=e,e>0&&(i=super.write(ethis[wg](e,r))}[wg](e,r){this[fB]&&this[Cc]==="r+"&&e&&e.code==="ENOENT"?(this[Cc]="w",this[FA]()):e?this[yg](e):(this[Jt]=r,this.emit("open",r),this[OD]())}end(e,r){e&&this.write(e,r),this[od]=!0,!this[Qg]&&!this[ko].length&&typeof this[Jt]=="number"&&this[mc](null,0)}write(e,r){return typeof e=="string"&&(e=new Buffer(e,r)),this[od]?(this.emit("error",new Error("write() after end()")),!1):this[Jt]===null||this[Qg]||this[ko].length?(this[ko].push(e),this[cB]=!0,!1):(this[Qg]=!0,this[gB](e),!0)}[gB](e){ls.write(this[Jt],e,0,e.length,this[Ic],(r,i)=>this[mc](r,i))}[mc](e,r){e?this[yg](e):(this[Ic]!==null&&(this[Ic]+=r),this[ko].length?this[OD]():(this[Qg]=!1,this[od]&&!this[p7]?(this[p7]=!0,this[xo](),this.emit("finish")):this[cB]&&(this[cB]=!1,this.emit("drain"))))}[OD](){if(this[ko].length===0)this[od]&&this[mc](null,0);else if(this[ko].length===1)this[gB](this[ko].pop());else{let e=this[ko];this[ko]=[],LNe(this[Jt],e,this[Ic],(r,i)=>this[mc](r,i))}}[xo](){this[Eg]&&typeof this[Jt]=="number"&&(ls.close(this[Jt],e=>this.emit("close")),this[Jt]=null)}},I7=class extends YD{[FA](){let e;try{e=ls.openSync(this[NA],this[Cc],this[HD])}catch(r){if(this[fB]&&this[Cc]==="r+"&&r&&r.code==="ENOENT")return this[Cc]="w",this[FA]();throw r}this[wg](null,e)}[xo](){if(this[Eg]&&typeof this[Jt]=="number"){try{ls.closeSync(this[Jt])}catch(e){}this[Jt]=null,this.emit("close")}}[gB](e){try{this[mc](null,ls.writeSync(this[Jt],e,0,e.length,this[Ic]))}catch(r){this[mc](r,0)}}},LNe=(t,e,r,i)=>{let n=(o,a)=>i(o,a,e),s=new NNe;s.oncomplete=n,lB.writeBuffers(t,e,r,s)};sd.ReadStream=jD;sd.ReadStreamSync=m7;sd.WriteStream=YD;sd.WriteStreamSync=I7});var ld=I((Llt,E7)=>{"use strict";var TNe=Vw(),Flt=require("path"),MNe=Cg(),ONe=require("events"),KNe=Rh(),UNe=1024*1024,HNe=id(),y7=zw(),GNe=fD(),qD=Buffer.from([31,139]),cs=Symbol("state"),Ec=Symbol("writeEntry"),xa=Symbol("readEntry"),JD=Symbol("nextEntry"),w7=Symbol("processEntry"),us=Symbol("extendedHeader"),ad=Symbol("globalExtendedHeader"),TA=Symbol("meta"),B7=Symbol("emitMeta"),Ar=Symbol("buffer"),ka=Symbol("queue"),yc=Symbol("ended"),Q7=Symbol("emittedEnd"),wc=Symbol("emit"),Qn=Symbol("unzip"),hB=Symbol("consumeChunk"),pB=Symbol("consumeChunkSub"),WD=Symbol("consumeBody"),b7=Symbol("consumeMeta"),v7=Symbol("consumeHeader"),dB=Symbol("consuming"),zD=Symbol("bufferConcat"),VD=Symbol("maybeEnd"),Ad=Symbol("writing"),MA=Symbol("aborted"),CB=Symbol("onDone"),Bc=Symbol("sawValidEntry"),mB=Symbol("sawNullBlock"),IB=Symbol("sawEOF"),jNe=t=>!0;E7.exports=TNe(class extends ONe{constructor(e){e=e||{},super(e),this.file=e.file||"",this[Bc]=null,this.on(CB,r=>{(this[cs]==="begin"||this[Bc]===!1)&&this.warn("TAR_BAD_ARCHIVE","Unrecognized archive format")}),e.ondone?this.on(CB,e.ondone):this.on(CB,r=>{this.emit("prefinish"),this.emit("finish"),this.emit("end"),this.emit("close")}),this.strict=!!e.strict,this.maxMetaEntrySize=e.maxMetaEntrySize||UNe,this.filter=typeof e.filter=="function"?e.filter:jNe,this.writable=!0,this.readable=!1,this[ka]=new KNe,this[Ar]=null,this[xa]=null,this[Ec]=null,this[cs]="begin",this[TA]="",this[us]=null,this[ad]=null,this[yc]=!1,this[Qn]=null,this[MA]=!1,this[mB]=!1,this[IB]=!1,typeof e.onwarn=="function"&&this.on("warn",e.onwarn),typeof e.onentry=="function"&&this.on("entry",e.onentry)}[v7](e,r){this[Bc]===null&&(this[Bc]=!1);let i;try{i=new MNe(e,r,this[us],this[ad])}catch(n){return this.warn("TAR_ENTRY_INVALID",n)}if(i.nullBlock)this[mB]?(this[IB]=!0,this[cs]==="begin"&&(this[cs]="header"),this[wc]("eof")):(this[mB]=!0,this[wc]("nullBlock"));else if(this[mB]=!1,!i.cksumValid)this.warn("TAR_ENTRY_INVALID","checksum failure",{header:i});else if(!i.path)this.warn("TAR_ENTRY_INVALID","path is required",{header:i});else{let n=i.type;if(/^(Symbolic)?Link$/.test(n)&&!i.linkpath)this.warn("TAR_ENTRY_INVALID","linkpath required",{header:i});else if(!/^(Symbolic)?Link$/.test(n)&&i.linkpath)this.warn("TAR_ENTRY_INVALID","linkpath forbidden",{header:i});else{let s=this[Ec]=new HNe(i,this[us],this[ad]);if(!this[Bc])if(s.remain){let o=()=>{s.invalid||(this[Bc]=!0)};s.on("end",o)}else this[Bc]=!0;s.meta?s.size>this.maxMetaEntrySize?(s.ignore=!0,this[wc]("ignoredEntry",s),this[cs]="ignore",s.resume()):s.size>0&&(this[TA]="",s.on("data",o=>this[TA]+=o),this[cs]="meta"):(this[us]=null,s.ignore=s.ignore||!this.filter(s.path,s),s.ignore?(this[wc]("ignoredEntry",s),this[cs]=s.remain?"ignore":"header",s.resume()):(s.remain?this[cs]="body":(this[cs]="header",s.end()),this[xa]?this[ka].push(s):(this[ka].push(s),this[JD]())))}}}[w7](e){let r=!0;return e?Array.isArray(e)?this.emit.apply(this,e):(this[xa]=e,this.emit("entry",e),e.emittedEnd||(e.on("end",i=>this[JD]()),r=!1)):(this[xa]=null,r=!1),r}[JD](){do;while(this[w7](this[ka].shift()));if(!this[ka].length){let e=this[xa];!e||e.flowing||e.size===e.remain?this[Ad]||this.emit("drain"):e.once("drain",i=>this.emit("drain"))}}[WD](e,r){let i=this[Ec],n=i.blockRemain,s=n>=e.length&&r===0?e:e.slice(r,r+n);return i.write(s),i.blockRemain||(this[cs]="header",this[Ec]=null,i.end()),s.length}[b7](e,r){let i=this[Ec],n=this[WD](e,r);return this[Ec]||this[B7](i),n}[wc](e,r,i){!this[ka].length&&!this[xa]?this.emit(e,r,i):this[ka].push([e,r,i])}[B7](e){switch(this[wc]("meta",this[TA]),e.type){case"ExtendedHeader":case"OldExtendedHeader":this[us]=y7.parse(this[TA],this[us],!1);break;case"GlobalExtendedHeader":this[ad]=y7.parse(this[TA],this[ad],!0);break;case"NextFileHasLongPath":case"OldGnuLongPath":this[us]=this[us]||Object.create(null),this[us].path=this[TA].replace(/\0.*/,"");break;case"NextFileHasLongLinkpath":this[us]=this[us]||Object.create(null),this[us].linkpath=this[TA].replace(/\0.*/,"");break;default:throw new Error("unknown meta: "+e.type)}}abort(e){this[MA]=!0,this.emit("abort",e),this.warn("TAR_ABORT",e,{recoverable:!1})}write(e){if(this[MA])return;if(this[Qn]===null&&e){if(this[Ar]&&(e=Buffer.concat([this[Ar],e]),this[Ar]=null),e.lengththis[hB](s)),this[Qn].on("error",s=>this.abort(s)),this[Qn].on("end",s=>{this[yc]=!0,this[hB]()}),this[Ad]=!0;let n=this[Qn][i?"end":"write"](e);return this[Ad]=!1,n}}this[Ad]=!0,this[Qn]?this[Qn].write(e):this[hB](e),this[Ad]=!1;let r=this[ka].length?!1:this[xa]?this[xa].flowing:!0;return!r&&!this[ka].length&&this[xa].once("drain",i=>this.emit("drain")),r}[zD](e){e&&!this[MA]&&(this[Ar]=this[Ar]?Buffer.concat([this[Ar],e]):e)}[VD](){if(this[yc]&&!this[Q7]&&!this[MA]&&!this[dB]){this[Q7]=!0;let e=this[Ec];if(e&&e.blockRemain){let r=this[Ar]?this[Ar].length:0;this.warn("TAR_BAD_ARCHIVE",`Truncated input (needed ${e.blockRemain} more bytes, only ${r} available)`,{entry:e}),this[Ar]&&e.write(this[Ar]),e.end()}this[wc](CB)}}[hB](e){if(this[dB])this[zD](e);else if(!e&&!this[Ar])this[VD]();else{if(this[dB]=!0,this[Ar]){this[zD](e);let r=this[Ar];this[Ar]=null,this[pB](r)}else this[pB](e);for(;this[Ar]&&this[Ar].length>=512&&!this[MA]&&!this[IB];){let r=this[Ar];this[Ar]=null,this[pB](r)}this[dB]=!1}(!this[Ar]||this[yc])&&this[VD]()}[pB](e){let r=0,i=e.length;for(;r+512<=i&&!this[MA]&&!this[IB];)switch(this[cs]){case"begin":case"header":this[v7](e,r),r+=512;break;case"ignore":case"body":r+=this[WD](e,r);break;case"meta":r+=this[b7](e,r);break;default:throw new Error("invalid state: "+this[cs])}r{"use strict";var YNe=fg(),x7=ld(),vg=require("fs"),qNe=bg(),k7=require("path"),Tlt=S7.exports=(t,e,r)=>{typeof t=="function"?(r=t,e=null,t={}):Array.isArray(t)&&(e=t,t={}),typeof e=="function"&&(r=e,e=null),e?e=Array.from(e):e=[];let i=YNe(t);if(i.sync&&typeof r=="function")throw new TypeError("callback not supported for sync tar functions");if(!i.file&&typeof r=="function")throw new TypeError("callback only supported with file option");return e.length&&WNe(i,e),i.noResume||JNe(i),i.file&&i.sync?zNe(i):i.file?VNe(i,r):P7(i)},JNe=t=>{let e=t.onentry;t.onentry=e?r=>{e(r),r.resume()}:r=>r.resume()},WNe=(t,e)=>{let r=new Map(e.map(s=>[s.replace(/\/+$/,""),!0])),i=t.filter,n=(s,o)=>{let a=o||k7.parse(s).root||".",l=s===a?!1:r.has(s)?r.get(s):n(k7.dirname(s),a);return r.set(s,l),l};t.filter=i?(s,o)=>i(s,o)&&n(s.replace(/\/+$/,"")):s=>n(s.replace(/\/+$/,""))},zNe=t=>{let e=P7(t),r=t.file,i=!0,n;try{let s=vg.statSync(r),o=t.maxReadSize||16*1024*1024;if(s.size{let r=new x7(t),i=t.maxReadSize||16*1024*1024,n=t.file,s=new Promise((o,a)=>{r.on("error",a),r.on("end",o),vg.stat(n,(l,c)=>{if(l)a(l);else{let u=new qNe.ReadStream(n,{readSize:i,size:c.size});u.on("error",a),u.pipe(r)}})});return e?s.then(e,e):s},P7=t=>new x7(t)});var T7=I((Ult,D7)=>{"use strict";var _Ne=fg(),yB=AB(),Olt=require("fs"),R7=bg(),F7=EB(),N7=require("path"),Klt=D7.exports=(t,e,r)=>{if(typeof e=="function"&&(r=e),Array.isArray(t)&&(e=t,t={}),!e||!Array.isArray(e)||!e.length)throw new TypeError("no files or directories specified");e=Array.from(e);let i=_Ne(t);if(i.sync&&typeof r=="function")throw new TypeError("callback not supported for sync tar functions");if(!i.file&&typeof r=="function")throw new TypeError("callback only supported with file option");return i.file&&i.sync?XNe(i,e):i.file?ZNe(i,e,r):i.sync?$Ne(i,e):eLe(i,e)},XNe=(t,e)=>{let r=new yB.Sync(t),i=new R7.WriteStreamSync(t.file,{mode:t.mode||438});r.pipe(i),L7(r,e)},ZNe=(t,e,r)=>{let i=new yB(t),n=new R7.WriteStream(t.file,{mode:t.mode||438});i.pipe(n);let s=new Promise((o,a)=>{n.on("error",a),n.on("close",o),i.on("error",a)});return _D(i,e),r?s.then(r,r):s},L7=(t,e)=>{e.forEach(r=>{r.charAt(0)==="@"?F7({file:N7.resolve(t.cwd,r.substr(1)),sync:!0,noResume:!0,onentry:i=>t.add(i)}):t.add(r)}),t.end()},_D=(t,e)=>{for(;e.length;){let r=e.shift();if(r.charAt(0)==="@")return F7({file:N7.resolve(t.cwd,r.substr(1)),noResume:!0,onentry:i=>t.add(i)}).then(i=>_D(t,e));t.add(r)}t.end()},$Ne=(t,e)=>{let r=new yB.Sync(t);return L7(r,e),r},eLe=(t,e)=>{let r=new yB(t);return _D(r,e),r}});var XD=I((jlt,M7)=>{"use strict";var tLe=fg(),O7=AB(),Hlt=ld(),gs=require("fs"),K7=bg(),U7=EB(),H7=require("path"),G7=Cg(),Glt=M7.exports=(t,e,r)=>{let i=tLe(t);if(!i.file)throw new TypeError("file is required");if(i.gzip)throw new TypeError("cannot append to compressed archives");if(!e||!Array.isArray(e)||!e.length)throw new TypeError("no files or directories specified");return e=Array.from(e),i.sync?rLe(i,e):iLe(i,e,r)},rLe=(t,e)=>{let r=new O7.Sync(t),i=!0,n,s;try{try{n=gs.openSync(t.file,"r+")}catch(l){if(l.code==="ENOENT")n=gs.openSync(t.file,"w+");else throw l}let o=gs.fstatSync(n),a=Buffer.alloc(512);e:for(s=0;so.size)break;s+=c,t.mtimeCache&&t.mtimeCache.set(l.path,l.mtime)}i=!1,nLe(t,r,s,n,e)}finally{if(i)try{gs.closeSync(n)}catch(o){}}},nLe=(t,e,r,i,n)=>{let s=new K7.WriteStreamSync(t.file,{fd:i,start:r});e.pipe(s),sLe(e,n)},iLe=(t,e,r)=>{e=Array.from(e);let i=new O7(t),n=(o,a,l)=>{let c=(p,d)=>{p?gs.close(o,m=>l(p)):l(null,d)},u=0;if(a===0)return c(null,0);let g=0,f=Buffer.alloc(512),h=(p,d)=>{if(p)return c(p);if(g+=d,g<512&&d)return gs.read(o,f,g,f.length-g,u+g,h);if(u===0&&f[0]===31&&f[1]===139)return c(new Error("cannot append to compressed archives"));if(g<512)return c(null,u);let m=new G7(f);if(!m.cksumValid)return c(null,u);let E=512*Math.ceil(m.size/512);if(u+E+512>a||(u+=E+512,u>=a))return c(null,u);t.mtimeCache&&t.mtimeCache.set(m.path,m.mtime),g=0,gs.read(o,f,0,512,u,h)};gs.read(o,f,0,512,u,h)},s=new Promise((o,a)=>{i.on("error",a);let l="r+",c=(u,g)=>{if(u&&u.code==="ENOENT"&&l==="r+")return l="w+",gs.open(t.file,l,c);if(u)return a(u);gs.fstat(g,(f,h)=>{if(f)return a(f);n(g,h.size,(p,d)=>{if(p)return a(p);let m=new K7.WriteStream(t.file,{fd:g,start:d});i.pipe(m),m.on("error",a),m.on("close",o),j7(i,e)})})};gs.open(t.file,l,c)});return r?s.then(r,r):s},sLe=(t,e)=>{e.forEach(r=>{r.charAt(0)==="@"?U7({file:H7.resolve(t.cwd,r.substr(1)),sync:!0,noResume:!0,onentry:i=>t.add(i)}):t.add(r)}),t.end()},j7=(t,e)=>{for(;e.length;){let r=e.shift();if(r.charAt(0)==="@")return U7({file:H7.resolve(t.cwd,r.substr(1)),noResume:!0,onentry:i=>t.add(i)}).then(i=>j7(t,e));t.add(r)}t.end()}});var q7=I((qlt,Y7)=>{"use strict";var oLe=fg(),aLe=XD(),Ylt=Y7.exports=(t,e,r)=>{let i=oLe(t);if(!i.file)throw new TypeError("file is required");if(i.gzip)throw new TypeError("cannot append to compressed archives");if(!e||!Array.isArray(e)||!e.length)throw new TypeError("no files or directories specified");return e=Array.from(e),ALe(i),aLe(i,e,r)},ALe=t=>{let e=t.filter;t.mtimeCache||(t.mtimeCache=new Map),t.filter=e?(r,i)=>e(r,i)&&!(t.mtimeCache.get(r)>i.mtime):(r,i)=>!(t.mtimeCache.get(r)>i.mtime)}});var z7=I((Jlt,J7)=>{var{promisify:W7}=require("util"),OA=require("fs"),lLe=t=>{if(!t)t={mode:511,fs:OA};else if(typeof t=="object")t=P({mode:511,fs:OA},t);else if(typeof t=="number")t={mode:t,fs:OA};else if(typeof t=="string")t={mode:parseInt(t,8),fs:OA};else throw new TypeError("invalid options argument");return t.mkdir=t.mkdir||t.fs.mkdir||OA.mkdir,t.mkdirAsync=W7(t.mkdir),t.stat=t.stat||t.fs.stat||OA.stat,t.statAsync=W7(t.stat),t.statSync=t.statSync||t.fs.statSync||OA.statSync,t.mkdirSync=t.mkdirSync||t.fs.mkdirSync||OA.mkdirSync,t};J7.exports=lLe});var _7=I((Wlt,V7)=>{var cLe=process.env.__TESTING_MKDIRP_PLATFORM__||process.platform,{resolve:uLe,parse:gLe}=require("path"),fLe=t=>{if(/\0/.test(t))throw Object.assign(new TypeError("path must be a string without null bytes"),{path:t,code:"ERR_INVALID_ARG_VALUE"});if(t=uLe(t),cLe==="win32"){let e=/[*|"<>?:]/,{root:r}=gLe(t);if(e.test(t.substr(r.length)))throw Object.assign(new Error("Illegal characters in path."),{path:t,code:"EINVAL"})}return t};V7.exports=fLe});var tV=I((zlt,X7)=>{var{dirname:Z7}=require("path"),$7=(t,e,r=void 0)=>r===e?Promise.resolve():t.statAsync(e).then(i=>i.isDirectory()?r:void 0,i=>i.code==="ENOENT"?$7(t,Z7(e),e):void 0),eV=(t,e,r=void 0)=>{if(r!==e)try{return t.statSync(e).isDirectory()?r:void 0}catch(i){return i.code==="ENOENT"?eV(t,Z7(e),e):void 0}};X7.exports={findMade:$7,findMadeSync:eV}});var eR=I((Vlt,rV)=>{var{dirname:iV}=require("path"),ZD=(t,e,r)=>{e.recursive=!1;let i=iV(t);return i===t?e.mkdirAsync(t,e).catch(n=>{if(n.code!=="EISDIR")throw n}):e.mkdirAsync(t,e).then(()=>r||t,n=>{if(n.code==="ENOENT")return ZD(i,e).then(s=>ZD(t,e,s));if(n.code!=="EEXIST"&&n.code!=="EROFS")throw n;return e.statAsync(t).then(s=>{if(s.isDirectory())return r;throw n},()=>{throw n})})},$D=(t,e,r)=>{let i=iV(t);if(e.recursive=!1,i===t)try{return e.mkdirSync(t,e)}catch(n){if(n.code!=="EISDIR")throw n;return}try{return e.mkdirSync(t,e),r||t}catch(n){if(n.code==="ENOENT")return $D(t,e,$D(i,e,r));if(n.code!=="EEXIST"&&n.code!=="EROFS")throw n;try{if(!e.statSync(t).isDirectory())throw n}catch(s){throw n}}};rV.exports={mkdirpManual:ZD,mkdirpManualSync:$D}});var oV=I((_lt,nV)=>{var{dirname:sV}=require("path"),{findMade:hLe,findMadeSync:pLe}=tV(),{mkdirpManual:dLe,mkdirpManualSync:CLe}=eR(),mLe=(t,e)=>(e.recursive=!0,sV(t)===t?e.mkdirAsync(t,e):hLe(e,t).then(i=>e.mkdirAsync(t,e).then(()=>i).catch(n=>{if(n.code==="ENOENT")return dLe(t,e);throw n}))),ILe=(t,e)=>{if(e.recursive=!0,sV(t)===t)return e.mkdirSync(t,e);let i=pLe(e,t);try{return e.mkdirSync(t,e),i}catch(n){if(n.code==="ENOENT")return CLe(t,e);throw n}};nV.exports={mkdirpNative:mLe,mkdirpNativeSync:ILe}});var cV=I((Xlt,aV)=>{var AV=require("fs"),ELe=process.env.__TESTING_MKDIRP_NODE_VERSION__||process.version,tR=ELe.replace(/^v/,"").split("."),lV=+tR[0]>10||+tR[0]==10&&+tR[1]>=12,yLe=lV?t=>t.mkdir===AV.mkdir:()=>!1,wLe=lV?t=>t.mkdirSync===AV.mkdirSync:()=>!1;aV.exports={useNative:yLe,useNativeSync:wLe}});var dV=I((Zlt,uV)=>{var Sg=z7(),xg=_7(),{mkdirpNative:gV,mkdirpNativeSync:fV}=oV(),{mkdirpManual:hV,mkdirpManualSync:pV}=eR(),{useNative:BLe,useNativeSync:QLe}=cV(),kg=(t,e)=>(t=xg(t),e=Sg(e),BLe(e)?gV(t,e):hV(t,e)),bLe=(t,e)=>(t=xg(t),e=Sg(e),QLe(e)?fV(t,e):pV(t,e));kg.sync=bLe;kg.native=(t,e)=>gV(xg(t),Sg(e));kg.manual=(t,e)=>hV(xg(t),Sg(e));kg.nativeSync=(t,e)=>fV(xg(t),Sg(e));kg.manualSync=(t,e)=>pV(xg(t),Sg(e));uV.exports=kg});var BV=I(($lt,CV)=>{"use strict";var fs=require("fs"),Qc=require("path"),vLe=fs.lchown?"lchown":"chown",SLe=fs.lchownSync?"lchownSync":"chownSync",mV=fs.lchown&&!process.version.match(/v1[1-9]+\./)&&!process.version.match(/v10\.[6-9]/),IV=(t,e,r)=>{try{return fs[SLe](t,e,r)}catch(i){if(i.code!=="ENOENT")throw i}},xLe=(t,e,r)=>{try{return fs.chownSync(t,e,r)}catch(i){if(i.code!=="ENOENT")throw i}},kLe=mV?(t,e,r,i)=>n=>{!n||n.code!=="EISDIR"?i(n):fs.chown(t,e,r,i)}:(t,e,r,i)=>i,rR=mV?(t,e,r)=>{try{return IV(t,e,r)}catch(i){if(i.code!=="EISDIR")throw i;xLe(t,e,r)}}:(t,e,r)=>IV(t,e,r),PLe=process.version,EV=(t,e,r)=>fs.readdir(t,e,r),DLe=(t,e)=>fs.readdirSync(t,e);/^v4\./.test(PLe)&&(EV=(t,e,r)=>fs.readdir(t,r));var wB=(t,e,r,i)=>{fs[vLe](t,e,r,kLe(t,e,r,n=>{i(n&&n.code!=="ENOENT"?n:null)}))},yV=(t,e,r,i,n)=>{if(typeof e=="string")return fs.lstat(Qc.resolve(t,e),(s,o)=>{if(s)return n(s.code!=="ENOENT"?s:null);o.name=e,yV(t,o,r,i,n)});if(e.isDirectory())iR(Qc.resolve(t,e.name),r,i,s=>{if(s)return n(s);let o=Qc.resolve(t,e.name);wB(o,r,i,n)});else{let s=Qc.resolve(t,e.name);wB(s,r,i,n)}},iR=(t,e,r,i)=>{EV(t,{withFileTypes:!0},(n,s)=>{if(n){if(n.code==="ENOENT")return i();if(n.code!=="ENOTDIR"&&n.code!=="ENOTSUP")return i(n)}if(n||!s.length)return wB(t,e,r,i);let o=s.length,a=null,l=c=>{if(!a){if(c)return i(a=c);if(--o==0)return wB(t,e,r,i)}};s.forEach(c=>yV(t,c,e,r,l))})},RLe=(t,e,r,i)=>{if(typeof e=="string")try{let n=fs.lstatSync(Qc.resolve(t,e));n.name=e,e=n}catch(n){if(n.code==="ENOENT")return;throw n}e.isDirectory()&&wV(Qc.resolve(t,e.name),r,i),rR(Qc.resolve(t,e.name),r,i)},wV=(t,e,r)=>{let i;try{i=DLe(t,{withFileTypes:!0})}catch(n){if(n.code==="ENOENT")return;if(n.code==="ENOTDIR"||n.code==="ENOTSUP")return rR(t,e,r);throw n}return i&&i.length&&i.forEach(n=>RLe(t,n,e,r)),rR(t,e,r)};CV.exports=iR;iR.sync=wV});var SV=I((rct,nR)=>{"use strict";var QV=dV(),hs=require("fs"),BB=require("path"),bV=BV(),sR=class extends Error{constructor(e,r){super("Cannot extract through symbolic link");this.path=r,this.symlink=e}get name(){return"SylinkError"}},cd=class extends Error{constructor(e,r){super(r+": Cannot cd into '"+e+"'");this.path=e,this.code=r}get name(){return"CwdError"}},ect=nR.exports=(t,e,r)=>{let i=e.umask,n=e.mode|448,s=(n&i)!=0,o=e.uid,a=e.gid,l=typeof o=="number"&&typeof a=="number"&&(o!==e.processUid||a!==e.processGid),c=e.preserve,u=e.unlink,g=e.cache,f=e.cwd,h=(m,E)=>{m?r(m):(g.set(t,!0),E&&l?bV(E,o,a,B=>h(B)):s?hs.chmod(t,n,r):r())};if(g&&g.get(t)===!0)return h();if(t===f)return hs.stat(t,(m,E)=>{(m||!E.isDirectory())&&(m=new cd(t,m&&m.code||"ENOTDIR")),h(m)});if(c)return QV(t,{mode:n}).then(m=>h(null,m),h);let d=BB.relative(f,t).split(/\/|\\/);QB(f,d,n,g,u,f,null,h)},QB=(t,e,r,i,n,s,o,a)=>{if(!e.length)return a(null,o);let l=e.shift(),c=t+"/"+l;if(i.get(c))return QB(c,e,r,i,n,s,o,a);hs.mkdir(c,r,vV(c,e,r,i,n,s,o,a))},vV=(t,e,r,i,n,s,o,a)=>l=>{if(l){if(l.path&&BB.dirname(l.path)===s&&(l.code==="ENOTDIR"||l.code==="ENOENT"))return a(new cd(s,l.code));hs.lstat(t,(c,u)=>{if(c)a(c);else if(u.isDirectory())QB(t,e,r,i,n,s,o,a);else if(n)hs.unlink(t,g=>{if(g)return a(g);hs.mkdir(t,r,vV(t,e,r,i,n,s,o,a))});else{if(u.isSymbolicLink())return a(new sR(t,t+"/"+e.join("/")));a(l)}})}else o=o||t,QB(t,e,r,i,n,s,o,a)},tct=nR.exports.sync=(t,e)=>{let r=e.umask,i=e.mode|448,n=(i&r)!=0,s=e.uid,o=e.gid,a=typeof s=="number"&&typeof o=="number"&&(s!==e.processUid||o!==e.processGid),l=e.preserve,c=e.unlink,u=e.cache,g=e.cwd,f=m=>{u.set(t,!0),m&&a&&bV.sync(m,s,o),n&&hs.chmodSync(t,i)};if(u&&u.get(t)===!0)return f();if(t===g){let m=!1,E="ENOTDIR";try{m=hs.statSync(t).isDirectory()}catch(B){E=B.code}finally{if(!m)throw new cd(t,E)}f();return}if(l)return f(QV.sync(t,i));let p=BB.relative(g,t).split(/\/|\\/),d=null;for(let m=p.shift(),E=g;m&&(E+="/"+m);m=p.shift())if(!u.get(E))try{hs.mkdirSync(E,i),d=d||E,u.set(E,!0)}catch(B){if(B.path&&BB.dirname(B.path)===g&&(B.code==="ENOTDIR"||B.code==="ENOENT"))return new cd(g,B.code);let b=hs.lstatSync(E);if(b.isDirectory()){u.set(E,!0);continue}else if(c){hs.unlinkSync(E),hs.mkdirSync(E,i),d=d||E,u.set(E,!0);continue}else if(b.isSymbolicLink())return new sR(E,E+"/"+p.join("/"))}return f(d)}});var PV=I((ict,xV)=>{var kV=require("assert");xV.exports=()=>{let t=new Map,e=new Map,{join:r}=require("path"),i=u=>r(u).split(/[\\\/]/).slice(0,-1).reduce((g,f)=>g.length?g.concat(r(g[g.length-1],f)):[f],[]),n=new Set,s=u=>{let g=e.get(u);if(!g)throw new Error("function does not have any path reservations");return{paths:g.paths.map(f=>t.get(f)),dirs:[...g.dirs].map(f=>t.get(f))}},o=u=>{let{paths:g,dirs:f}=s(u);return g.every(h=>h[0]===u)&&f.every(h=>h[0]instanceof Set&&h[0].has(u))},a=u=>n.has(u)||!o(u)?!1:(n.add(u),u(()=>l(u)),!0),l=u=>{if(!n.has(u))return!1;let{paths:g,dirs:f}=e.get(u),h=new Set;return g.forEach(p=>{let d=t.get(p);kV.equal(d[0],u),d.length===1?t.delete(p):(d.shift(),typeof d[0]=="function"?h.add(d[0]):d[0].forEach(m=>h.add(m)))}),f.forEach(p=>{let d=t.get(p);kV(d[0]instanceof Set),d[0].size===1&&d.length===1?t.delete(p):d[0].size===1?(d.shift(),h.add(d[0])):d[0].delete(u)}),n.delete(u),h.forEach(p=>a(p)),!0};return{check:o,reserve:(u,g)=>{let f=new Set(u.map(h=>i(h)).reduce((h,p)=>h.concat(p)));return e.set(g,{dirs:f,paths:u}),u.forEach(h=>{let p=t.get(h);p?p.push(g):t.set(h,[g])}),f.forEach(h=>{let p=t.get(h);p?p[p.length-1]instanceof Set?p[p.length-1].add(g):p.push(new Set([g])):t.set(h,[new Set([g])])}),a(g)}}}});var FV=I((nct,DV)=>{var FLe=process.env.__FAKE_PLATFORM__||process.platform,NLe=FLe==="win32",LLe=global.__FAKE_TESTING_FS__||require("fs"),{O_CREAT:TLe,O_TRUNC:MLe,O_WRONLY:OLe,UV_FS_O_FILEMAP:RV=0}=LLe.constants,KLe=NLe&&!!RV,ULe=512*1024,HLe=RV|MLe|TLe|OLe;DV.exports=KLe?t=>t"w"});var hR=I((Act,NV)=>{"use strict";var GLe=require("assert"),sct=require("events").EventEmitter,jLe=ld(),Ut=require("fs"),YLe=bg(),Pa=require("path"),oR=SV(),oct=oR.sync,LV=yD(),qLe=PV(),TV=Symbol("onEntry"),aR=Symbol("checkFs"),MV=Symbol("checkFs2"),AR=Symbol("isReusable"),Da=Symbol("makeFs"),lR=Symbol("file"),cR=Symbol("directory"),bB=Symbol("link"),OV=Symbol("symlink"),KV=Symbol("hardlink"),UV=Symbol("unsupported"),act=Symbol("unknown"),HV=Symbol("checkPath"),Pg=Symbol("mkdir"),nn=Symbol("onError"),vB=Symbol("pending"),GV=Symbol("pend"),Dg=Symbol("unpend"),uR=Symbol("ended"),gR=Symbol("maybeClose"),fR=Symbol("skip"),ud=Symbol("doChown"),gd=Symbol("uid"),fd=Symbol("gid"),jV=require("crypto"),YV=FV(),SB=()=>{throw new Error("sync function called cb somehow?!?")},JLe=(t,e)=>{if(process.platform!=="win32")return Ut.unlink(t,e);let r=t+".DELETE."+jV.randomBytes(16).toString("hex");Ut.rename(t,r,i=>{if(i)return e(i);Ut.unlink(r,e)})},WLe=t=>{if(process.platform!=="win32")return Ut.unlinkSync(t);let e=t+".DELETE."+jV.randomBytes(16).toString("hex");Ut.renameSync(t,e),Ut.unlinkSync(e)},qV=(t,e,r)=>t===t>>>0?t:e===e>>>0?e:r,xB=class extends jLe{constructor(e){if(e||(e={}),e.ondone=r=>{this[uR]=!0,this[gR]()},super(e),this.reservations=qLe(),this.transform=typeof e.transform=="function"?e.transform:null,this.writable=!0,this.readable=!1,this[vB]=0,this[uR]=!1,this.dirCache=e.dirCache||new Map,typeof e.uid=="number"||typeof e.gid=="number"){if(typeof e.uid!="number"||typeof e.gid!="number")throw new TypeError("cannot set owner without number uid and gid");if(e.preserveOwner)throw new TypeError("cannot preserve owner in archive and also set owner explicitly");this.uid=e.uid,this.gid=e.gid,this.setOwner=!0}else this.uid=null,this.gid=null,this.setOwner=!1;e.preserveOwner===void 0&&typeof e.uid!="number"?this.preserveOwner=process.getuid&&process.getuid()===0:this.preserveOwner=!!e.preserveOwner,this.processUid=(this.preserveOwner||this.setOwner)&&process.getuid?process.getuid():null,this.processGid=(this.preserveOwner||this.setOwner)&&process.getgid?process.getgid():null,this.forceChown=e.forceChown===!0,this.win32=!!e.win32||process.platform==="win32",this.newer=!!e.newer,this.keep=!!e.keep,this.noMtime=!!e.noMtime,this.preservePaths=!!e.preservePaths,this.unlink=!!e.unlink,this.cwd=Pa.resolve(e.cwd||process.cwd()),this.strip=+e.strip||0,this.processUmask=process.umask(),this.umask=typeof e.umask=="number"?e.umask:this.processUmask,this.dmode=e.dmode||511&~this.umask,this.fmode=e.fmode||438&~this.umask,this.on("entry",r=>this[TV](r))}warn(e,r,i={}){return(e==="TAR_BAD_ARCHIVE"||e==="TAR_ABORT")&&(i.recoverable=!1),super.warn(e,r,i)}[gR](){this[uR]&&this[vB]===0&&(this.emit("prefinish"),this.emit("finish"),this.emit("end"),this.emit("close"))}[HV](e){if(this.strip){let r=e.path.split(/\/|\\/);if(r.length=this.strip&&(e.linkpath=i.slice(this.strip).join("/"))}}if(!this.preservePaths){let r=e.path;if(r.match(/(^|\/|\\)\.\.(\\|\/|$)/))return this.warn("TAR_ENTRY_ERROR","path contains '..'",{entry:e,path:r}),!1;if(Pa.win32.isAbsolute(r)){let i=Pa.win32.parse(r);e.path=r.substr(i.root.length);let n=i.root;this.warn("TAR_ENTRY_INFO",`stripping ${n} from absolute path`,{entry:e,path:r})}}if(this.win32){let r=Pa.win32.parse(e.path);e.path=r.root===""?LV.encode(e.path):r.root+LV.encode(e.path.substr(r.root.length))}return Pa.isAbsolute(e.path)?e.absolute=e.path:e.absolute=Pa.resolve(this.cwd,e.path),!0}[TV](e){if(!this[HV](e))return e.resume();switch(GLe.equal(typeof e.absolute,"string"),e.type){case"Directory":case"GNUDumpDir":e.mode&&(e.mode=e.mode|448);case"File":case"OldFile":case"ContiguousFile":case"Link":case"SymbolicLink":return this[aR](e);case"CharacterDevice":case"BlockDevice":case"FIFO":return this[UV](e)}}[nn](e,r){e.name==="CwdError"?this.emit("error",e):(this.warn("TAR_ENTRY_ERROR",e,{entry:r}),this[Dg](),r.resume())}[Pg](e,r,i){oR(e,{uid:this.uid,gid:this.gid,processUid:this.processUid,processGid:this.processGid,umask:this.processUmask,preserve:this.preservePaths,unlink:this.unlink,cache:this.dirCache,cwd:this.cwd,mode:r},i)}[ud](e){return this.forceChown||this.preserveOwner&&(typeof e.uid=="number"&&e.uid!==this.processUid||typeof e.gid=="number"&&e.gid!==this.processGid)||typeof this.uid=="number"&&this.uid!==this.processUid||typeof this.gid=="number"&&this.gid!==this.processGid}[gd](e){return qV(this.uid,e.uid,this.processUid)}[fd](e){return qV(this.gid,e.gid,this.processGid)}[lR](e,r){let i=e.mode&4095||this.fmode,n=new YLe.WriteStream(e.absolute,{flags:YV(e.size),mode:i,autoClose:!1});n.on("error",l=>this[nn](l,e));let s=1,o=l=>{if(l)return this[nn](l,e);--s==0&&Ut.close(n.fd,c=>{r(),c?this[nn](c,e):this[Dg]()})};n.on("finish",l=>{let c=e.absolute,u=n.fd;if(e.mtime&&!this.noMtime){s++;let g=e.atime||new Date,f=e.mtime;Ut.futimes(u,g,f,h=>h?Ut.utimes(c,g,f,p=>o(p&&h)):o())}if(this[ud](e)){s++;let g=this[gd](e),f=this[fd](e);Ut.fchown(u,g,f,h=>h?Ut.chown(c,g,f,p=>o(p&&h)):o())}o()});let a=this.transform&&this.transform(e)||e;a!==e&&(a.on("error",l=>this[nn](l,e)),e.pipe(a)),a.pipe(n)}[cR](e,r){let i=e.mode&4095||this.dmode;this[Pg](e.absolute,i,n=>{if(n)return r(),this[nn](n,e);let s=1,o=a=>{--s==0&&(r(),this[Dg](),e.resume())};e.mtime&&!this.noMtime&&(s++,Ut.utimes(e.absolute,e.atime||new Date,e.mtime,o)),this[ud](e)&&(s++,Ut.chown(e.absolute,this[gd](e),this[fd](e),o)),o()})}[UV](e){e.unsupported=!0,this.warn("TAR_ENTRY_UNSUPPORTED",`unsupported entry type: ${e.type}`,{entry:e}),e.resume()}[OV](e,r){this[bB](e,e.linkpath,"symlink",r)}[KV](e,r){this[bB](e,Pa.resolve(this.cwd,e.linkpath),"link",r)}[GV](){this[vB]++}[Dg](){this[vB]--,this[gR]()}[fR](e){this[Dg](),e.resume()}[AR](e,r){return e.type==="File"&&!this.unlink&&r.isFile()&&r.nlink<=1&&process.platform!=="win32"}[aR](e){this[GV]();let r=[e.path];e.linkpath&&r.push(e.linkpath),this.reservations.reserve(r,i=>this[MV](e,i))}[MV](e,r){this[Pg](Pa.dirname(e.absolute),this.dmode,i=>{if(i)return r(),this[nn](i,e);Ut.lstat(e.absolute,(n,s)=>{s&&(this.keep||this.newer&&s.mtime>e.mtime)?(this[fR](e),r()):n||this[AR](e,s)?this[Da](null,e,r):s.isDirectory()?e.type==="Directory"?!e.mode||(s.mode&4095)===e.mode?this[Da](null,e,r):Ut.chmod(e.absolute,e.mode,o=>this[Da](o,e,r)):Ut.rmdir(e.absolute,o=>this[Da](o,e,r)):JLe(e.absolute,o=>this[Da](o,e,r))})})}[Da](e,r,i){if(e)return this[nn](e,r);switch(r.type){case"File":case"OldFile":case"ContiguousFile":return this[lR](r,i);case"Link":return this[KV](r,i);case"SymbolicLink":return this[OV](r,i);case"Directory":case"GNUDumpDir":return this[cR](r,i)}}[bB](e,r,i,n){Ut[i](r,e.absolute,s=>{if(s)return this[nn](s,e);n(),this[Dg](),e.resume()})}},JV=class extends xB{constructor(e){super(e)}[aR](e){let r=this[Pg](Pa.dirname(e.absolute),this.dmode,SB);if(r)return this[nn](r,e);try{let i=Ut.lstatSync(e.absolute);if(this.keep||this.newer&&i.mtime>e.mtime)return this[fR](e);if(this[AR](e,i))return this[Da](null,e,SB);try{return i.isDirectory()?e.type==="Directory"?e.mode&&(i.mode&4095)!==e.mode&&Ut.chmodSync(e.absolute,e.mode):Ut.rmdirSync(e.absolute):WLe(e.absolute),this[Da](null,e,SB)}catch(n){return this[nn](n,e)}}catch(i){return this[Da](null,e,SB)}}[lR](e,r){let i=e.mode&4095||this.fmode,n=l=>{let c;try{Ut.closeSync(o)}catch(u){c=u}(l||c)&&this[nn](l||c,e)},s,o;try{o=Ut.openSync(e.absolute,YV(e.size),i)}catch(l){return n(l)}let a=this.transform&&this.transform(e)||e;a!==e&&(a.on("error",l=>this[nn](l,e)),e.pipe(a)),a.on("data",l=>{try{Ut.writeSync(o,l,0,l.length)}catch(c){n(c)}}),a.on("end",l=>{let c=null;if(e.mtime&&!this.noMtime){let u=e.atime||new Date,g=e.mtime;try{Ut.futimesSync(o,u,g)}catch(f){try{Ut.utimesSync(e.absolute,u,g)}catch(h){c=f}}}if(this[ud](e)){let u=this[gd](e),g=this[fd](e);try{Ut.fchownSync(o,u,g)}catch(f){try{Ut.chownSync(e.absolute,u,g)}catch(h){c=c||f}}}n(c)})}[cR](e,r){let i=e.mode&4095||this.dmode,n=this[Pg](e.absolute,i);if(n)return this[nn](n,e);if(e.mtime&&!this.noMtime)try{Ut.utimesSync(e.absolute,e.atime||new Date,e.mtime)}catch(s){}if(this[ud](e))try{Ut.chownSync(e.absolute,this[gd](e),this[fd](e))}catch(s){}e.resume()}[Pg](e,r){try{return oR.sync(e,{uid:this.uid,gid:this.gid,processUid:this.processUid,processGid:this.processGid,umask:this.processUmask,preserve:this.preservePaths,unlink:this.unlink,cache:this.dirCache,cwd:this.cwd,mode:r})}catch(i){return i}}[bB](e,r,i,n){try{Ut[i+"Sync"](r,e.absolute),e.resume()}catch(s){return this[nn](s,e)}}};xB.Sync=JV;NV.exports=xB});var XV=I((cct,WV)=>{"use strict";var zLe=fg(),kB=hR(),zV=require("fs"),VV=bg(),_V=require("path"),lct=WV.exports=(t,e,r)=>{typeof t=="function"?(r=t,e=null,t={}):Array.isArray(t)&&(e=t,t={}),typeof e=="function"&&(r=e,e=null),e?e=Array.from(e):e=[];let i=zLe(t);if(i.sync&&typeof r=="function")throw new TypeError("callback not supported for sync tar functions");if(!i.file&&typeof r=="function")throw new TypeError("callback only supported with file option");return e.length&&VLe(i,e),i.file&&i.sync?_Le(i):i.file?XLe(i,r):i.sync?ZLe(i):$Le(i)},VLe=(t,e)=>{let r=new Map(e.map(s=>[s.replace(/\/+$/,""),!0])),i=t.filter,n=(s,o)=>{let a=o||_V.parse(s).root||".",l=s===a?!1:r.has(s)?r.get(s):n(_V.dirname(s),a);return r.set(s,l),l};t.filter=i?(s,o)=>i(s,o)&&n(s.replace(/\/+$/,"")):s=>n(s.replace(/\/+$/,""))},_Le=t=>{let e=new kB.Sync(t),r=t.file,i=!0,n,s=zV.statSync(r),o=t.maxReadSize||16*1024*1024;new VV.ReadStreamSync(r,{readSize:o,size:s.size}).pipe(e)},XLe=(t,e)=>{let r=new kB(t),i=t.maxReadSize||16*1024*1024,n=t.file,s=new Promise((o,a)=>{r.on("error",a),r.on("close",o),zV.stat(n,(l,c)=>{if(l)a(l);else{let u=new VV.ReadStream(n,{readSize:i,size:c.size});u.on("error",a),u.pipe(r)}})});return e?s.then(e,e):s},ZLe=t=>new kB.Sync(t),$Le=t=>new kB(t)});var ZV=I($r=>{"use strict";$r.c=$r.create=T7();$r.r=$r.replace=XD();$r.t=$r.list=EB();$r.u=$r.update=q7();$r.x=$r.extract=XV();$r.Pack=AB();$r.Unpack=hR();$r.Parse=ld();$r.ReadEntry=id();$r.WriteEntry=xD();$r.Header=Cg();$r.Pax=zw();$r.types=rd()});var e_=I((gct,pR)=>{"use strict";var eTe=Object.prototype.hasOwnProperty,sn="~";function hd(){}Object.create&&(hd.prototype=Object.create(null),new hd().__proto__||(sn=!1));function tTe(t,e,r){this.fn=t,this.context=e,this.once=r||!1}function $V(t,e,r,i,n){if(typeof r!="function")throw new TypeError("The listener must be a function");var s=new tTe(r,i||t,n),o=sn?sn+e:e;return t._events[o]?t._events[o].fn?t._events[o]=[t._events[o],s]:t._events[o].push(s):(t._events[o]=s,t._eventsCount++),t}function PB(t,e){--t._eventsCount==0?t._events=new hd:delete t._events[e]}function Ti(){this._events=new hd,this._eventsCount=0}Ti.prototype.eventNames=function(){var e=[],r,i;if(this._eventsCount===0)return e;for(i in r=this._events)eTe.call(r,i)&&e.push(sn?i.slice(1):i);return Object.getOwnPropertySymbols?e.concat(Object.getOwnPropertySymbols(r)):e};Ti.prototype.listeners=function(e){var r=sn?sn+e:e,i=this._events[r];if(!i)return[];if(i.fn)return[i.fn];for(var n=0,s=i.length,o=new Array(s);n{"use strict";t_.exports=(t,e)=>(e=e||(()=>{}),t.then(r=>new Promise(i=>{i(e())}).then(()=>r),r=>new Promise(i=>{i(e())}).then(()=>{throw r})))});var n_=I((hct,DB)=>{"use strict";var rTe=r_(),dR=class extends Error{constructor(e){super(e);this.name="TimeoutError"}},i_=(t,e,r)=>new Promise((i,n)=>{if(typeof e!="number"||e<0)throw new TypeError("Expected `milliseconds` to be a positive number");if(e===Infinity){i(t);return}let s=setTimeout(()=>{if(typeof r=="function"){try{i(r())}catch(l){n(l)}return}let o=typeof r=="string"?r:`Promise timed out after ${e} milliseconds`,a=r instanceof Error?r:new dR(o);typeof t.cancel=="function"&&t.cancel(),n(a)},e);rTe(t.then(i,n),()=>{clearTimeout(s)})});DB.exports=i_;DB.exports.default=i_;DB.exports.TimeoutError=dR});var s_=I(CR=>{"use strict";Object.defineProperty(CR,"__esModule",{value:!0});function iTe(t,e,r){let i=0,n=t.length;for(;n>0;){let s=n/2|0,o=i+s;r(t[o],e)<=0?(i=++o,n-=s+1):n=s}return i}CR.default=iTe});var a_=I(mR=>{"use strict";Object.defineProperty(mR,"__esModule",{value:!0});var nTe=s_(),o_=class{constructor(){this._queue=[]}enqueue(e,r){r=Object.assign({priority:0},r);let i={priority:r.priority,run:e};if(this.size&&this._queue[this.size-1].priority>=r.priority){this._queue.push(i);return}let n=nTe.default(this._queue,i,(s,o)=>o.priority-s.priority);this._queue.splice(n,0,i)}dequeue(){let e=this._queue.shift();return e==null?void 0:e.run}filter(e){return this._queue.filter(r=>r.priority===e.priority).map(r=>r.run)}get size(){return this._queue.length}};mR.default=o_});var c_=I(IR=>{"use strict";Object.defineProperty(IR,"__esModule",{value:!0});var sTe=e_(),A_=n_(),oTe=a_(),RB=()=>{},aTe=new A_.TimeoutError,l_=class extends sTe{constructor(e){var r,i,n,s;super();if(this._intervalCount=0,this._intervalEnd=0,this._pendingCount=0,this._resolveEmpty=RB,this._resolveIdle=RB,e=Object.assign({carryoverConcurrencyCount:!1,intervalCap:Infinity,interval:0,concurrency:Infinity,autoStart:!0,queueClass:oTe.default},e),!(typeof e.intervalCap=="number"&&e.intervalCap>=1))throw new TypeError(`Expected \`intervalCap\` to be a number from 1 and up, got \`${(i=(r=e.intervalCap)===null||r===void 0?void 0:r.toString())!==null&&i!==void 0?i:""}\` (${typeof e.intervalCap})`);if(e.interval===void 0||!(Number.isFinite(e.interval)&&e.interval>=0))throw new TypeError(`Expected \`interval\` to be a finite number >= 0, got \`${(s=(n=e.interval)===null||n===void 0?void 0:n.toString())!==null&&s!==void 0?s:""}\` (${typeof e.interval})`);this._carryoverConcurrencyCount=e.carryoverConcurrencyCount,this._isIntervalIgnored=e.intervalCap===Infinity||e.interval===0,this._intervalCap=e.intervalCap,this._interval=e.interval,this._queue=new e.queueClass,this._queueClass=e.queueClass,this.concurrency=e.concurrency,this._timeout=e.timeout,this._throwOnTimeout=e.throwOnTimeout===!0,this._isPaused=e.autoStart===!1}get _doesIntervalAllowAnother(){return this._isIntervalIgnored||this._intervalCount{this._onResumeInterval()},r)),!0}return!1}_tryToStartAnother(){if(this._queue.size===0)return this._intervalId&&clearInterval(this._intervalId),this._intervalId=void 0,this._resolvePromises(),!1;if(!this._isPaused){let e=!this._isIntervalPaused();if(this._doesIntervalAllowAnother&&this._doesConcurrentAllowAnother){let r=this._queue.dequeue();return r?(this.emit("active"),r(),e&&this._initializeIntervalIfNeeded(),!0):!1}}return!1}_initializeIntervalIfNeeded(){this._isIntervalIgnored||this._intervalId!==void 0||(this._intervalId=setInterval(()=>{this._onInterval()},this._interval),this._intervalEnd=Date.now()+this._interval)}_onInterval(){this._intervalCount===0&&this._pendingCount===0&&this._intervalId&&(clearInterval(this._intervalId),this._intervalId=void 0),this._intervalCount=this._carryoverConcurrencyCount?this._pendingCount:0,this._processQueue()}_processQueue(){for(;this._tryToStartAnother(););}get concurrency(){return this._concurrency}set concurrency(e){if(!(typeof e=="number"&&e>=1))throw new TypeError(`Expected \`concurrency\` to be a number from 1 and up, got \`${e}\` (${typeof e})`);this._concurrency=e,this._processQueue()}async add(e,r={}){return new Promise((i,n)=>{let s=async()=>{this._pendingCount++,this._intervalCount++;try{let o=this._timeout===void 0&&r.timeout===void 0?e():A_.default(Promise.resolve(e()),r.timeout===void 0?this._timeout:r.timeout,()=>{(r.throwOnTimeout===void 0?this._throwOnTimeout:r.throwOnTimeout)&&n(aTe)});i(await o)}catch(o){n(o)}this._next()};this._queue.enqueue(s,r),this._tryToStartAnother(),this.emit("add")})}async addAll(e,r){return Promise.all(e.map(async i=>this.add(i,r)))}start(){return this._isPaused?(this._isPaused=!1,this._processQueue(),this):this}pause(){this._isPaused=!0}clear(){this._queue=new this._queueClass}async onEmpty(){if(this._queue.size!==0)return new Promise(e=>{let r=this._resolveEmpty;this._resolveEmpty=()=>{r(),e()}})}async onIdle(){if(!(this._pendingCount===0&&this._queue.size===0))return new Promise(e=>{let r=this._resolveIdle;this._resolveIdle=()=>{r(),e()}})}get size(){return this._queue.size}sizeBy(e){return this._queue.filter(e).length}get pending(){return this._pendingCount}get isPaused(){return this._isPaused}get timeout(){return this._timeout}set timeout(e){this._timeout=e}};IR.default=l_});var p_=I((Ict,h_)=>{var yR;h_.exports.getContent=()=>(typeof yR=="undefined"&&(yR=require("zlib").brotliDecompressSync(Buffer.from("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","base64")).toString()),yR)});var y_=I((wR,E_)=>{(function(t,e){typeof wR=="object"?E_.exports=e():typeof define=="function"&&define.amd?define(e):t.treeify=e()})(wR,function(){function t(n,s){var o=s?"\u2514":"\u251C";return n?o+="\u2500 ":o+="\u2500\u2500\u2510",o}function e(n,s){var o=[];for(var a in n)!n.hasOwnProperty(a)||s&&typeof n[a]=="function"||o.push(a);return o}function r(n,s,o,a,l,c,u){var g="",f=0,h,p,d=a.slice(0);if(d.push([s,o])&&a.length>0&&(a.forEach(function(E,B){B>0&&(g+=(E[1]?" ":"\u2502")+" "),!p&&E[0]===s&&(p=!0)}),g+=t(n,o)+n,l&&(typeof s!="object"||s instanceof Date)&&(g+=": "+s),p&&(g+=" (circular ref.)"),u(g)),!p&&typeof s=="object"){var m=e(s,c);m.forEach(function(E){h=++f===m.length,r(E,s[E],h,d,l,c,u)})}}var i={};return i.asLines=function(n,s,o,a){var l=typeof o!="function"?o:!1;r(".",n,!1,[],s,l,a||o)},i.asTree=function(n,s,o){var a="";return r(".",n,!1,[],s,o,function(l){a+=l+` +`}),a},i})});var x_=I((Uct,bR)=>{"use strict";var pTe=t=>{let e=!1,r=!1,i=!1;for(let n=0;n{if(!(typeof t=="string"||Array.isArray(t)))throw new TypeError("Expected the input to be `string | string[]`");e=Object.assign({pascalCase:!1},e);let r=n=>e.pascalCase?n.charAt(0).toUpperCase()+n.slice(1):n;return Array.isArray(t)?t=t.map(n=>n.trim()).filter(n=>n.length).join("-"):t=t.trim(),t.length===0?"":t.length===1?e.pascalCase?t.toUpperCase():t.toLowerCase():(t!==t.toLowerCase()&&(t=pTe(t)),t=t.replace(/^[_.\- ]+/,"").toLowerCase().replace(/[_.\- ]+(\w|$)/g,(n,s)=>s.toUpperCase()).replace(/\d+(\w|$)/g,n=>n.toUpperCase()),r(t))};bR.exports=S_;bR.exports.default=S_});var Na=I(TR=>{"use strict";Object.defineProperty(TR,"__esModule",{value:!0});TR.default=L_;function L_(){}L_.prototype={diff:function(e,r){var i=arguments.length>2&&arguments[2]!==void 0?arguments[2]:{},n=i.callback;typeof i=="function"&&(n=i,i={}),this.options=i;var s=this;function o(d){return n?(setTimeout(function(){n(void 0,d)},0),!0):d}e=this.castInput(e),r=this.castInput(r),e=this.removeEmpty(this.tokenize(e)),r=this.removeEmpty(this.tokenize(r));var a=r.length,l=e.length,c=1,u=a+l,g=[{newPos:-1,components:[]}],f=this.extractCommon(g[0],r,e,0);if(g[0].newPos+1>=a&&f+1>=l)return o([{value:this.join(r),count:r.length}]);function h(){for(var d=-1*c;d<=c;d+=2){var m=void 0,E=g[d-1],B=g[d+1],b=(B?B.newPos:0)-d;E&&(g[d-1]=void 0);var R=E&&E.newPos+1=a&&b+1>=l)return o(yTe(s,m.components,r,e,s.useLongestToken));g[d]=m}c++}if(n)(function d(){setTimeout(function(){if(c>u)return n();h()||d()},0)})();else for(;c<=u;){var p=h();if(p)return p}},pushComponent:function(e,r,i){var n=e[e.length-1];n&&n.added===r&&n.removed===i?e[e.length-1]={count:n.count+1,added:r,removed:i}:e.push({count:1,added:r,removed:i})},extractCommon:function(e,r,i,n){for(var s=r.length,o=i.length,a=e.newPos,l=a-n,c=0;a+1h.length?d:h}),c.value=t.join(u)}else c.value=t.join(r.slice(a,a+c.count));a+=c.count,c.added||(l+=c.count)}}var f=e[o-1];return o>1&&typeof f.value=="string"&&(f.added||f.removed)&&t.equals("",f.value)&&(e[o-2].value+=f.value,e.pop()),e}function wTe(t){return{newPos:t.newPos,components:t.components.slice(0)}}});var M_=I(Cd=>{"use strict";Object.defineProperty(Cd,"__esModule",{value:!0});Cd.diffChars=BTe;Cd.characterDiff=void 0;var bTe=QTe(Na());function QTe(t){return t&&t.__esModule?t:{default:t}}var T_=new bTe.default;Cd.characterDiff=T_;function BTe(t,e,r){return T_.diff(t,e,r)}});var OR=I(MR=>{"use strict";Object.defineProperty(MR,"__esModule",{value:!0});MR.generateOptions=vTe;function vTe(t,e){if(typeof t=="function")e.callback=t;else if(t)for(var r in t)t.hasOwnProperty(r)&&(e[r]=t[r]);return e}});var U_=I(Ng=>{"use strict";Object.defineProperty(Ng,"__esModule",{value:!0});Ng.diffWords=STe;Ng.diffWordsWithSpace=xTe;Ng.wordDiff=void 0;var PTe=kTe(Na()),DTe=OR();function kTe(t){return t&&t.__esModule?t:{default:t}}var O_=/^[A-Za-z\xC0-\u02C6\u02C8-\u02D7\u02DE-\u02FF\u1E00-\u1EFF]+$/,K_=/\S/,md=new PTe.default;Ng.wordDiff=md;md.equals=function(t,e){return this.options.ignoreCase&&(t=t.toLowerCase(),e=e.toLowerCase()),t===e||this.options.ignoreWhitespace&&!K_.test(t)&&!K_.test(e)};md.tokenize=function(t){for(var e=t.split(/(\s+|[()[\]{}'"]|\b)/),r=0;r{"use strict";Object.defineProperty(Lg,"__esModule",{value:!0});Lg.diffLines=RTe;Lg.diffTrimmedLines=FTe;Lg.lineDiff=void 0;var LTe=NTe(Na()),TTe=OR();function NTe(t){return t&&t.__esModule?t:{default:t}}var OB=new LTe.default;Lg.lineDiff=OB;OB.tokenize=function(t){var e=[],r=t.split(/(\n|\r\n)/);r[r.length-1]||r.pop();for(var i=0;i{"use strict";Object.defineProperty(Id,"__esModule",{value:!0});Id.diffSentences=MTe;Id.sentenceDiff=void 0;var KTe=OTe(Na());function OTe(t){return t&&t.__esModule?t:{default:t}}var KR=new KTe.default;Id.sentenceDiff=KR;KR.tokenize=function(t){return t.split(/(\S.+?[.!?])(?=\s+|$)/)};function MTe(t,e,r){return KR.diff(t,e,r)}});var G_=I(Ed=>{"use strict";Object.defineProperty(Ed,"__esModule",{value:!0});Ed.diffCss=UTe;Ed.cssDiff=void 0;var GTe=HTe(Na());function HTe(t){return t&&t.__esModule?t:{default:t}}var UR=new GTe.default;Ed.cssDiff=UR;UR.tokenize=function(t){return t.split(/([{}:;,]|\s+)/)};function UTe(t,e,r){return UR.diff(t,e,r)}});var Y_=I(Tg=>{"use strict";Object.defineProperty(Tg,"__esModule",{value:!0});Tg.diffJson=jTe;Tg.canonicalize=UB;Tg.jsonDiff=void 0;var j_=YTe(Na()),qTe=KB();function YTe(t){return t&&t.__esModule?t:{default:t}}function HB(t){return typeof Symbol=="function"&&typeof Symbol.iterator=="symbol"?HB=function(r){return typeof r}:HB=function(r){return r&&typeof Symbol=="function"&&r.constructor===Symbol&&r!==Symbol.prototype?"symbol":typeof r},HB(t)}var JTe=Object.prototype.toString,bc=new j_.default;Tg.jsonDiff=bc;bc.useLongestToken=!0;bc.tokenize=qTe.lineDiff.tokenize;bc.castInput=function(t){var e=this.options,r=e.undefinedReplacement,i=e.stringifyReplacer,n=i===void 0?function(s,o){return typeof o=="undefined"?r:o}:i;return typeof t=="string"?t:JSON.stringify(UB(t,null,null,n),n," ")};bc.equals=function(t,e){return j_.default.prototype.equals.call(bc,t.replace(/,([\r\n])/g,"$1"),e.replace(/,([\r\n])/g,"$1"))};function jTe(t,e,r){return bc.diff(t,e,r)}function UB(t,e,r,i,n){e=e||[],r=r||[],i&&(t=i(n,t));var s;for(s=0;s{"use strict";Object.defineProperty(yd,"__esModule",{value:!0});yd.diffArrays=WTe;yd.arrayDiff=void 0;var VTe=zTe(Na());function zTe(t){return t&&t.__esModule?t:{default:t}}var wd=new VTe.default;yd.arrayDiff=wd;wd.tokenize=function(t){return t.slice()};wd.join=wd.removeEmpty=function(t){return t};function WTe(t,e,r){return wd.diff(t,e,r)}});var GB=I(HR=>{"use strict";Object.defineProperty(HR,"__esModule",{value:!0});HR.parsePatch=_Te;function _Te(t){var e=arguments.length>1&&arguments[1]!==void 0?arguments[1]:{},r=t.split(/\r\n|[\n\v\f\r\x85]/),i=t.match(/\r\n|[\n\v\f\r\x85]/g)||[],n=[],s=0;function o(){var c={};for(n.push(c);s{"use strict";Object.defineProperty(GR,"__esModule",{value:!0});GR.default=XTe;function XTe(t,e,r){var i=!0,n=!1,s=!1,o=1;return function a(){if(i&&!s){if(n?o++:i=!1,t+o<=r)return o;s=!0}if(!n)return s||(i=!0),e<=t-o?-o++:(n=!0,a())}}});var V_=I(jB=>{"use strict";Object.defineProperty(jB,"__esModule",{value:!0});jB.applyPatch=W_;jB.applyPatches=ZTe;var z_=GB(),eMe=$Te(J_());function $Te(t){return t&&t.__esModule?t:{default:t}}function W_(t,e){var r=arguments.length>2&&arguments[2]!==void 0?arguments[2]:{};if(typeof e=="string"&&(e=(0,z_.parsePatch)(e)),Array.isArray(e)){if(e.length>1)throw new Error("applyPatch only works with a single input.");e=e[0]}var i=t.split(/\r\n|[\n\v\f\r\x85]/),n=t.match(/\r\n|[\n\v\f\r\x85]/g)||[],s=e.hunks,o=r.compareLine||function(F,D,he,pe){return D===pe},a=0,l=r.fuzzFactor||0,c=0,u=0,g,f;function h(F,D){for(var he=0;he0?pe[0]:" ",Pe=pe.length>0?pe.substr(1):pe;if(Ne===" "||Ne==="-"){if(!o(D+1,i[D],Ne,Pe)&&(a++,a>l))return!1;D++}}return!0}for(var p=0;p0?ne[0]:" ",A=ne.length>0?ne.substr(1):ne,V=L.linedelimiters[J];if(q===" ")K++;else if(q==="-")i.splice(K,1),n.splice(K,1);else if(q==="+")i.splice(K,0,A),n.splice(K,0,V),K++;else if(q==="\\"){var W=L.lines[J-1]?L.lines[J-1][0]:null;W==="+"?g=!0:W==="-"&&(f=!0)}}}if(g)for(;!i[i.length-1];)i.pop(),n.pop();else f&&(i.push(""),n.push(` +`));for(var X=0;X{"use strict";Object.defineProperty(Bd,"__esModule",{value:!0});Bd.structuredPatch=__;Bd.createTwoFilesPatch=X_;Bd.createPatch=tMe;var rMe=KB();function jR(t){return sMe(t)||nMe(t)||iMe()}function iMe(){throw new TypeError("Invalid attempt to spread non-iterable instance")}function nMe(t){if(Symbol.iterator in Object(t)||Object.prototype.toString.call(t)==="[object Arguments]")return Array.from(t)}function sMe(t){if(Array.isArray(t)){for(var e=0,r=new Array(t.length);e0?l(L.lines.slice(-o.context)):[],u-=f.length,g-=f.length)}(H=f).push.apply(H,jR(R.map(function(X){return(b.added?"+":"-")+X}))),b.added?p+=R.length:h+=R.length}else{if(u)if(R.length<=o.context*2&&B=a.length-2&&R.length<=o.context){var A=/\n$/.test(r),V=/\n$/.test(i),W=R.length==0&&f.length>q.oldLines;!A&&W&&f.splice(q.oldLines,0,"\\ No newline at end of file"),(!A&&!W||!V)&&f.push("\\ No newline at end of file")}c.push(q),u=0,g=0,f=[]}h+=R.length,p+=R.length}},m=0;m{"use strict";Object.defineProperty(YB,"__esModule",{value:!0});YB.arrayEqual=oMe;YB.arrayStartsWith=Z_;function oMe(t,e){return t.length!==e.length?!1:Z_(t,e)}function Z_(t,e){if(e.length>t.length)return!1;for(var r=0;r{"use strict";Object.defineProperty(qB,"__esModule",{value:!0});qB.calcLineCount=eX;qB.merge=aMe;var AMe=YR(),lMe=GB(),qR=$_();function Mg(t){return gMe(t)||uMe(t)||cMe()}function cMe(){throw new TypeError("Invalid attempt to spread non-iterable instance")}function uMe(t){if(Symbol.iterator in Object(t)||Object.prototype.toString.call(t)==="[object Arguments]")return Array.from(t)}function gMe(t){if(Array.isArray(t)){for(var e=0,r=new Array(t.length);e{"use strict";Object.defineProperty(zR,"__esModule",{value:!0});zR.convertChangesToDMP=dMe;function dMe(t){for(var e=[],r,i,n=0;n{"use strict";Object.defineProperty(VR,"__esModule",{value:!0});VR.convertChangesToXML=CMe;function CMe(t){for(var e=[],r=0;r"):i.removed&&e.push(""),e.push(mMe(i.value)),i.added?e.push(""):i.removed&&e.push("")}return e.join("")}function mMe(t){var e=t;return e=e.replace(/&/g,"&"),e=e.replace(//g,">"),e=e.replace(/"/g,"""),e}});var CX=I(br=>{"use strict";Object.defineProperty(br,"__esModule",{value:!0});Object.defineProperty(br,"Diff",{enumerable:!0,get:function(){return IMe.default}});Object.defineProperty(br,"diffChars",{enumerable:!0,get:function(){return EMe.diffChars}});Object.defineProperty(br,"diffWords",{enumerable:!0,get:function(){return fX.diffWords}});Object.defineProperty(br,"diffWordsWithSpace",{enumerable:!0,get:function(){return fX.diffWordsWithSpace}});Object.defineProperty(br,"diffLines",{enumerable:!0,get:function(){return hX.diffLines}});Object.defineProperty(br,"diffTrimmedLines",{enumerable:!0,get:function(){return hX.diffTrimmedLines}});Object.defineProperty(br,"diffSentences",{enumerable:!0,get:function(){return yMe.diffSentences}});Object.defineProperty(br,"diffCss",{enumerable:!0,get:function(){return wMe.diffCss}});Object.defineProperty(br,"diffJson",{enumerable:!0,get:function(){return pX.diffJson}});Object.defineProperty(br,"canonicalize",{enumerable:!0,get:function(){return pX.canonicalize}});Object.defineProperty(br,"diffArrays",{enumerable:!0,get:function(){return BMe.diffArrays}});Object.defineProperty(br,"applyPatch",{enumerable:!0,get:function(){return dX.applyPatch}});Object.defineProperty(br,"applyPatches",{enumerable:!0,get:function(){return dX.applyPatches}});Object.defineProperty(br,"parsePatch",{enumerable:!0,get:function(){return QMe.parsePatch}});Object.defineProperty(br,"merge",{enumerable:!0,get:function(){return bMe.merge}});Object.defineProperty(br,"structuredPatch",{enumerable:!0,get:function(){return _R.structuredPatch}});Object.defineProperty(br,"createTwoFilesPatch",{enumerable:!0,get:function(){return _R.createTwoFilesPatch}});Object.defineProperty(br,"createPatch",{enumerable:!0,get:function(){return _R.createPatch}});Object.defineProperty(br,"convertChangesToDMP",{enumerable:!0,get:function(){return vMe.convertChangesToDMP}});Object.defineProperty(br,"convertChangesToXML",{enumerable:!0,get:function(){return SMe.convertChangesToXML}});var IMe=xMe(Na()),EMe=M_(),fX=U_(),hX=KB(),yMe=H_(),wMe=G_(),pX=Y_(),BMe=q_(),dX=V_(),QMe=GB(),bMe=cX(),_R=YR(),vMe=uX(),SMe=gX();function xMe(t){return t&&t.__esModule?t:{default:t}}});var WB=I((agt,mX)=>{var kMe=As(),PMe=Nw(),DMe=/\.|\[(?:[^[\]]*|(["'])(?:(?!\1)[^\\]|\\.)*?\1)\]/,RMe=/^\w*$/;function FMe(t,e){if(kMe(t))return!1;var r=typeof t;return r=="number"||r=="symbol"||r=="boolean"||t==null||PMe(t)?!0:RMe.test(t)||!DMe.test(t)||e!=null&&t in Object(e)}mX.exports=FMe});var Gs=I((Agt,IX)=>{function NMe(t){var e=typeof t;return t!=null&&(e=="object"||e=="function")}IX.exports=NMe});var zB=I((lgt,EX)=>{var LMe=Ac(),TMe=Gs(),MMe="[object AsyncFunction]",OMe="[object Function]",KMe="[object GeneratorFunction]",UMe="[object Proxy]";function HMe(t){if(!TMe(t))return!1;var e=LMe(t);return e==OMe||e==KMe||e==MMe||e==UMe}EX.exports=HMe});var wX=I((cgt,yX)=>{var GMe=Ks(),jMe=GMe["__core-js_shared__"];yX.exports=jMe});var bX=I((ugt,BX)=>{var XR=wX(),QX=function(){var t=/[^.]+$/.exec(XR&&XR.keys&&XR.keys.IE_PROTO||"");return t?"Symbol(src)_1."+t:""}();function YMe(t){return!!QX&&QX in t}BX.exports=YMe});var ZR=I((ggt,vX)=>{var qMe=Function.prototype,JMe=qMe.toString;function WMe(t){if(t!=null){try{return JMe.call(t)}catch(e){}try{return t+""}catch(e){}}return""}vX.exports=WMe});var xX=I((fgt,SX)=>{var zMe=zB(),VMe=bX(),_Me=Gs(),XMe=ZR(),ZMe=/[\\^$.*+?()[\]{}|]/g,$Me=/^\[object .+?Constructor\]$/,eOe=Function.prototype,tOe=Object.prototype,rOe=eOe.toString,iOe=tOe.hasOwnProperty,nOe=RegExp("^"+rOe.call(iOe).replace(ZMe,"\\$&").replace(/hasOwnProperty|(function).*?(?=\\\()| for .+?(?=\\\])/g,"$1.*?")+"$");function sOe(t){if(!_Me(t)||VMe(t))return!1;var e=zMe(t)?nOe:$Me;return e.test(XMe(t))}SX.exports=sOe});var PX=I((hgt,kX)=>{function oOe(t,e){return t==null?void 0:t[e]}kX.exports=oOe});var UA=I((pgt,DX)=>{var aOe=xX(),AOe=PX();function lOe(t,e){var r=AOe(t,e);return aOe(r)?r:void 0}DX.exports=lOe});var Qd=I((dgt,RX)=>{var cOe=UA(),uOe=cOe(Object,"create");RX.exports=uOe});var LX=I((Cgt,FX)=>{var NX=Qd();function gOe(){this.__data__=NX?NX(null):{},this.size=0}FX.exports=gOe});var MX=I((mgt,TX)=>{function fOe(t){var e=this.has(t)&&delete this.__data__[t];return this.size-=e?1:0,e}TX.exports=fOe});var KX=I((Igt,OX)=>{var hOe=Qd(),pOe="__lodash_hash_undefined__",dOe=Object.prototype,COe=dOe.hasOwnProperty;function mOe(t){var e=this.__data__;if(hOe){var r=e[t];return r===pOe?void 0:r}return COe.call(e,t)?e[t]:void 0}OX.exports=mOe});var HX=I((Egt,UX)=>{var IOe=Qd(),EOe=Object.prototype,yOe=EOe.hasOwnProperty;function wOe(t){var e=this.__data__;return IOe?e[t]!==void 0:yOe.call(e,t)}UX.exports=wOe});var jX=I((ygt,GX)=>{var BOe=Qd(),QOe="__lodash_hash_undefined__";function bOe(t,e){var r=this.__data__;return this.size+=this.has(t)?0:1,r[t]=BOe&&e===void 0?QOe:e,this}GX.exports=bOe});var qX=I((wgt,YX)=>{var vOe=LX(),SOe=MX(),xOe=KX(),kOe=HX(),POe=jX();function Og(t){var e=-1,r=t==null?0:t.length;for(this.clear();++e{function DOe(){this.__data__=[],this.size=0}JX.exports=DOe});var Kg=I((Qgt,zX)=>{function ROe(t,e){return t===e||t!==t&&e!==e}zX.exports=ROe});var bd=I((bgt,VX)=>{var FOe=Kg();function NOe(t,e){for(var r=t.length;r--;)if(FOe(t[r][0],e))return r;return-1}VX.exports=NOe});var XX=I((vgt,_X)=>{var LOe=bd(),TOe=Array.prototype,MOe=TOe.splice;function OOe(t){var e=this.__data__,r=LOe(e,t);if(r<0)return!1;var i=e.length-1;return r==i?e.pop():MOe.call(e,r,1),--this.size,!0}_X.exports=OOe});var $X=I((Sgt,ZX)=>{var KOe=bd();function UOe(t){var e=this.__data__,r=KOe(e,t);return r<0?void 0:e[r][1]}ZX.exports=UOe});var tZ=I((xgt,eZ)=>{var HOe=bd();function GOe(t){return HOe(this.__data__,t)>-1}eZ.exports=GOe});var iZ=I((kgt,rZ)=>{var jOe=bd();function YOe(t,e){var r=this.__data__,i=jOe(r,t);return i<0?(++this.size,r.push([t,e])):r[i][1]=e,this}rZ.exports=YOe});var vd=I((Pgt,nZ)=>{var qOe=WX(),JOe=XX(),WOe=$X(),zOe=tZ(),VOe=iZ();function Ug(t){var e=-1,r=t==null?0:t.length;for(this.clear();++e{var _Oe=UA(),XOe=Ks(),ZOe=_Oe(XOe,"Map");sZ.exports=ZOe});var AZ=I((Rgt,oZ)=>{var aZ=qX(),$Oe=vd(),eKe=VB();function tKe(){this.size=0,this.__data__={hash:new aZ,map:new(eKe||$Oe),string:new aZ}}oZ.exports=tKe});var cZ=I((Fgt,lZ)=>{function rKe(t){var e=typeof t;return e=="string"||e=="number"||e=="symbol"||e=="boolean"?t!=="__proto__":t===null}lZ.exports=rKe});var Sd=I((Ngt,uZ)=>{var iKe=cZ();function nKe(t,e){var r=t.__data__;return iKe(e)?r[typeof e=="string"?"string":"hash"]:r.map}uZ.exports=nKe});var fZ=I((Lgt,gZ)=>{var sKe=Sd();function oKe(t){var e=sKe(this,t).delete(t);return this.size-=e?1:0,e}gZ.exports=oKe});var pZ=I((Tgt,hZ)=>{var aKe=Sd();function AKe(t){return aKe(this,t).get(t)}hZ.exports=AKe});var CZ=I((Mgt,dZ)=>{var lKe=Sd();function cKe(t){return lKe(this,t).has(t)}dZ.exports=cKe});var IZ=I((Ogt,mZ)=>{var uKe=Sd();function gKe(t,e){var r=uKe(this,t),i=r.size;return r.set(t,e),this.size+=r.size==i?0:1,this}mZ.exports=gKe});var _B=I((Kgt,EZ)=>{var fKe=AZ(),hKe=fZ(),pKe=pZ(),dKe=CZ(),CKe=IZ();function Hg(t){var e=-1,r=t==null?0:t.length;for(this.clear();++e{var wZ=_B(),mKe="Expected a function";function $R(t,e){if(typeof t!="function"||e!=null&&typeof e!="function")throw new TypeError(mKe);var r=function(){var i=arguments,n=e?e.apply(this,i):i[0],s=r.cache;if(s.has(n))return s.get(n);var o=t.apply(this,i);return r.cache=s.set(n,o)||s,o};return r.cache=new($R.Cache||wZ),r}$R.Cache=wZ;yZ.exports=$R});var bZ=I((Hgt,QZ)=>{var IKe=BZ(),EKe=500;function yKe(t){var e=IKe(t,function(i){return r.size===EKe&&r.clear(),i}),r=e.cache;return e}QZ.exports=yKe});var SZ=I((Ggt,vZ)=>{var wKe=bZ(),BKe=/[^.[\]]+|\[(?:(-?\d+(?:\.\d+)?)|(["'])((?:(?!\2)[^\\]|\\.)*?)\2)\]|(?=(?:\.|\[\])(?:\.|\[\]|$))/g,QKe=/\\(\\)?/g,bKe=wKe(function(t){var e=[];return t.charCodeAt(0)===46&&e.push(""),t.replace(BKe,function(r,i,n,s){e.push(n?s.replace(QKe,"$1"):i||r)}),e});vZ.exports=bKe});var Gg=I((jgt,xZ)=>{var vKe=As(),SKe=WB(),xKe=SZ(),kKe=gg();function PKe(t,e){return vKe(t)?t:SKe(t,e)?[t]:xKe(kKe(t))}xZ.exports=PKe});var Sc=I((Ygt,kZ)=>{var DKe=Nw(),RKe=1/0;function FKe(t){if(typeof t=="string"||DKe(t))return t;var e=t+"";return e=="0"&&1/t==-RKe?"-0":e}kZ.exports=FKe});var xd=I((qgt,PZ)=>{var NKe=Gg(),LKe=Sc();function TKe(t,e){e=NKe(e,t);for(var r=0,i=e.length;t!=null&&r{var MKe=UA(),OKe=function(){try{var t=MKe(Object,"defineProperty");return t({},"",{}),t}catch(e){}}();DZ.exports=OKe});var jg=I((Wgt,RZ)=>{var FZ=eF();function KKe(t,e,r){e=="__proto__"&&FZ?FZ(t,e,{configurable:!0,enumerable:!0,value:r,writable:!0}):t[e]=r}RZ.exports=KKe});var XB=I((zgt,NZ)=>{var UKe=jg(),HKe=Kg(),GKe=Object.prototype,jKe=GKe.hasOwnProperty;function YKe(t,e,r){var i=t[e];(!(jKe.call(t,e)&&HKe(i,r))||r===void 0&&!(e in t))&&UKe(t,e,r)}NZ.exports=YKe});var kd=I((Vgt,LZ)=>{var qKe=9007199254740991,JKe=/^(?:0|[1-9]\d*)$/;function WKe(t,e){var r=typeof t;return e=e==null?qKe:e,!!e&&(r=="number"||r!="symbol"&&JKe.test(t))&&t>-1&&t%1==0&&t{var zKe=XB(),VKe=Gg(),_Ke=kd(),MZ=Gs(),XKe=Sc();function ZKe(t,e,r,i){if(!MZ(t))return t;e=VKe(e,t);for(var n=-1,s=e.length,o=s-1,a=t;a!=null&&++n{var $Ke=xd(),e1e=tF(),t1e=Gg();function r1e(t,e,r){for(var i=-1,n=e.length,s={};++i{function i1e(t,e){return t!=null&&e in Object(t)}UZ.exports=i1e});var jZ=I(($gt,GZ)=>{var n1e=Ac(),s1e=Qo(),o1e="[object Arguments]";function a1e(t){return s1e(t)&&n1e(t)==o1e}GZ.exports=a1e});var Pd=I((eft,YZ)=>{var qZ=jZ(),A1e=Qo(),JZ=Object.prototype,l1e=JZ.hasOwnProperty,c1e=JZ.propertyIsEnumerable,u1e=qZ(function(){return arguments}())?qZ:function(t){return A1e(t)&&l1e.call(t,"callee")&&!c1e.call(t,"callee")};YZ.exports=u1e});var ZB=I((tft,WZ)=>{var g1e=9007199254740991;function f1e(t){return typeof t=="number"&&t>-1&&t%1==0&&t<=g1e}WZ.exports=f1e});var rF=I((rft,zZ)=>{var h1e=Gg(),p1e=Pd(),d1e=As(),C1e=kd(),m1e=ZB(),I1e=Sc();function E1e(t,e,r){e=h1e(e,t);for(var i=-1,n=e.length,s=!1;++i{var y1e=HZ(),w1e=rF();function B1e(t,e){return t!=null&&w1e(t,e,y1e)}VZ.exports=B1e});var XZ=I((nft,_Z)=>{var Q1e=KZ(),b1e=iF();function v1e(t,e){return Q1e(t,e,function(r,i){return b1e(t,i)})}_Z.exports=v1e});var $B=I((sft,ZZ)=>{function S1e(t,e){for(var r=-1,i=e.length,n=t.length;++r{var e$=ac(),x1e=Pd(),k1e=As(),t$=e$?e$.isConcatSpreadable:void 0;function P1e(t){return k1e(t)||x1e(t)||!!(t$&&t&&t[t$])}$Z.exports=P1e});var s$=I((aft,i$)=>{var D1e=$B(),R1e=r$();function n$(t,e,r,i,n){var s=-1,o=t.length;for(r||(r=R1e),n||(n=[]);++s0&&r(a)?e>1?n$(a,e-1,r,i,n):D1e(n,a):i||(n[n.length]=a)}return n}i$.exports=n$});var a$=I((Aft,o$)=>{var F1e=s$();function N1e(t){var e=t==null?0:t.length;return e?F1e(t,1):[]}o$.exports=N1e});var l$=I((lft,A$)=>{function L1e(t,e,r){switch(r.length){case 0:return t.call(e);case 1:return t.call(e,r[0]);case 2:return t.call(e,r[0],r[1]);case 3:return t.call(e,r[0],r[1],r[2])}return t.apply(e,r)}A$.exports=L1e});var nF=I((cft,c$)=>{var T1e=l$(),u$=Math.max;function M1e(t,e,r){return e=u$(e===void 0?t.length-1:e,0),function(){for(var i=arguments,n=-1,s=u$(i.length-e,0),o=Array(s);++n{function O1e(t){return function(){return t}}g$.exports=O1e});var e0=I((gft,h$)=>{function K1e(t){return t}h$.exports=K1e});var C$=I((fft,p$)=>{var U1e=f$(),d$=eF(),H1e=e0(),G1e=d$?function(t,e){return d$(t,"toString",{configurable:!0,enumerable:!1,value:U1e(e),writable:!0})}:H1e;p$.exports=G1e});var I$=I((hft,m$)=>{var j1e=800,Y1e=16,q1e=Date.now;function J1e(t){var e=0,r=0;return function(){var i=q1e(),n=Y1e-(i-r);if(r=i,n>0){if(++e>=j1e)return arguments[0]}else e=0;return t.apply(void 0,arguments)}}m$.exports=J1e});var sF=I((pft,E$)=>{var W1e=C$(),z1e=I$(),V1e=z1e(W1e);E$.exports=V1e});var w$=I((dft,y$)=>{var _1e=a$(),X1e=nF(),Z1e=sF();function $1e(t){return Z1e(X1e(t,void 0,_1e),t+"")}y$.exports=$1e});var Q$=I((Cft,B$)=>{var eUe=XZ(),tUe=w$(),rUe=tUe(function(t,e){return t==null?{}:eUe(t,e)});B$.exports=rUe});var M$=I((lpt,N$)=>{"use strict";var pF;try{pF=Map}catch(t){}var dF;try{dF=Set}catch(t){}function L$(t,e,r){if(!t||typeof t!="object"||typeof t=="function")return t;if(t.nodeType&&"cloneNode"in t)return t.cloneNode(!0);if(t instanceof Date)return new Date(t.getTime());if(t instanceof RegExp)return new RegExp(t);if(Array.isArray(t))return t.map(T$);if(pF&&t instanceof pF)return new Map(Array.from(t.entries()));if(dF&&t instanceof dF)return new Set(Array.from(t.values()));if(t instanceof Object){e.push(t);var i=Object.create(t);r.push(i);for(var n in t){var s=e.findIndex(function(o){return o===t[n]});i[n]=s>-1?r[s]:L$(t[n],e,r)}return i}return t}function T$(t){return L$(t,[],[])}N$.exports=T$});var Nd=I(CF=>{"use strict";Object.defineProperty(CF,"__esModule",{value:!0});CF.default=uUe;var gUe=Object.prototype.toString,fUe=Error.prototype.toString,hUe=RegExp.prototype.toString,pUe=typeof Symbol!="undefined"?Symbol.prototype.toString:()=>"",dUe=/^Symbol\((.*)\)(.*)$/;function CUe(t){return t!=+t?"NaN":t===0&&1/t<0?"-0":""+t}function O$(t,e=!1){if(t==null||t===!0||t===!1)return""+t;let r=typeof t;if(r==="number")return CUe(t);if(r==="string")return e?`"${t}"`:t;if(r==="function")return"[Function "+(t.name||"anonymous")+"]";if(r==="symbol")return pUe.call(t).replace(dUe,"Symbol($1)");let i=gUe.call(t).slice(8,-1);return i==="Date"?isNaN(t.getTime())?""+t:t.toISOString(t):i==="Error"||t instanceof Error?"["+fUe.call(t)+"]":i==="RegExp"?hUe.call(t):null}function uUe(t,e){let r=O$(t,e);return r!==null?r:JSON.stringify(t,function(i,n){let s=O$(this[i],e);return s!==null?s:n},2)}});var La=I(ci=>{"use strict";Object.defineProperty(ci,"__esModule",{value:!0});ci.default=ci.array=ci.object=ci.boolean=ci.date=ci.number=ci.string=ci.mixed=void 0;var K$=mUe(Nd());function mUe(t){return t&&t.__esModule?t:{default:t}}var U$={default:"${path} is invalid",required:"${path} is a required field",oneOf:"${path} must be one of the following values: ${values}",notOneOf:"${path} must not be one of the following values: ${values}",notType:({path:t,type:e,value:r,originalValue:i})=>{let n=i!=null&&i!==r,s=`${t} must be a \`${e}\` type, but the final value was: \`${(0,K$.default)(r,!0)}\``+(n?` (cast from the value \`${(0,K$.default)(i,!0)}\`).`:".");return r===null&&(s+='\n If "null" is intended as an empty value be sure to mark the schema as `.nullable()`'),s},defined:"${path} must be defined"};ci.mixed=U$;var H$={length:"${path} must be exactly ${length} characters",min:"${path} must be at least ${min} characters",max:"${path} must be at most ${max} characters",matches:'${path} must match the following: "${regex}"',email:"${path} must be a valid email",url:"${path} must be a valid URL",uuid:"${path} must be a valid UUID",trim:"${path} must be a trimmed string",lowercase:"${path} must be a lowercase string",uppercase:"${path} must be a upper case string"};ci.string=H$;var G$={min:"${path} must be greater than or equal to ${min}",max:"${path} must be less than or equal to ${max}",lessThan:"${path} must be less than ${less}",moreThan:"${path} must be greater than ${more}",positive:"${path} must be a positive number",negative:"${path} must be a negative number",integer:"${path} must be an integer"};ci.number=G$;var j$={min:"${path} field must be later than ${min}",max:"${path} field must be at earlier than ${max}"};ci.date=j$;var Y$={isValue:"${path} field must be ${value}"};ci.boolean=Y$;var q$={noUnknown:"${path} field has unspecified keys: ${unknown}"};ci.object=q$;var J$={min:"${path} field must have at least ${min} items",max:"${path} field must have less than or equal to ${max} items",length:"${path} must be have ${length} items"};ci.array=J$;var IUe=Object.assign(Object.create(null),{mixed:U$,string:H$,number:G$,date:j$,object:q$,array:J$,boolean:Y$});ci.default=IUe});var z$=I((gpt,W$)=>{var EUe=Object.prototype,yUe=EUe.hasOwnProperty;function wUe(t,e){return t!=null&&yUe.call(t,e)}W$.exports=wUe});var Ld=I((fpt,V$)=>{var BUe=z$(),QUe=rF();function bUe(t,e){return t!=null&&QUe(t,e,BUe)}V$.exports=bUe});var qg=I(n0=>{"use strict";Object.defineProperty(n0,"__esModule",{value:!0});n0.default=void 0;var vUe=t=>t&&t.__isYupSchema__;n0.default=vUe});var Z$=I(s0=>{"use strict";Object.defineProperty(s0,"__esModule",{value:!0});s0.default=void 0;var SUe=_$(Ld()),xUe=_$(qg());function _$(t){return t&&t.__esModule?t:{default:t}}var X$=class{constructor(e,r){if(this.refs=e,this.refs=e,typeof r=="function"){this.fn=r;return}if(!(0,SUe.default)(r,"is"))throw new TypeError("`is:` is required for `when()` conditions");if(!r.then&&!r.otherwise)throw new TypeError("either `then:` or `otherwise:` is required for `when()` conditions");let{is:i,then:n,otherwise:s}=r,o=typeof i=="function"?i:(...a)=>a.every(l=>l===i);this.fn=function(...a){let l=a.pop(),c=a.pop(),u=o(...a)?n:s;if(!!u)return typeof u=="function"?u(c):c.concat(u.resolve(l))}}resolve(e,r){let i=this.refs.map(s=>s.getValue(r==null?void 0:r.value,r==null?void 0:r.parent,r==null?void 0:r.context)),n=this.fn.apply(e,i.concat(e,r));if(n===void 0||n===e)return e;if(!(0,xUe.default)(n))throw new TypeError("conditions must return a schema object");return n.resolve(r)}},kUe=X$;s0.default=kUe});var IF=I(mF=>{"use strict";Object.defineProperty(mF,"__esModule",{value:!0});mF.default=PUe;function PUe(t){return t==null?[]:[].concat(t)}});var xc=I(o0=>{"use strict";Object.defineProperty(o0,"__esModule",{value:!0});o0.default=void 0;var DUe=$$(Nd()),RUe=$$(IF());function $$(t){return t&&t.__esModule?t:{default:t}}function EF(){return EF=Object.assign||function(t){for(var e=1;e(0,DUe.default)(r[s])):typeof e=="function"?e(r):e}static isError(e){return e&&e.name==="ValidationError"}constructor(e,r,i,n){super();this.name="ValidationError",this.value=r,this.path=i,this.type=n,this.errors=[],this.inner=[],(0,RUe.default)(e).forEach(s=>{Td.isError(s)?(this.errors.push(...s.errors),this.inner=this.inner.concat(s.inner.length?s.inner:s)):this.errors.push(s)}),this.message=this.errors.length>1?`${this.errors.length} errors occurred`:this.errors[0],Error.captureStackTrace&&Error.captureStackTrace(this,Td)}};o0.default=Td});var a0=I(yF=>{"use strict";Object.defineProperty(yF,"__esModule",{value:!0});yF.default=NUe;var wF=LUe(xc());function LUe(t){return t&&t.__esModule?t:{default:t}}var TUe=t=>{let e=!1;return(...r)=>{e||(e=!0,t(...r))}};function NUe(t,e){let{endEarly:r,tests:i,args:n,value:s,errors:o,sort:a,path:l}=t,c=TUe(e),u=i.length,g=[];if(o=o||[],!u)return o.length?c(new wF.default(o,s,l)):c(null,s);for(let f=0;f{function MUe(t){return function(e,r,i){for(var n=-1,s=Object(e),o=i(e),a=o.length;a--;){var l=o[t?a:++n];if(r(s[l],l,s)===!1)break}return e}}eee.exports=MUe});var BF=I((Ept,ree)=>{var OUe=tee(),KUe=OUe();ree.exports=KUe});var nee=I((ypt,iee)=>{function UUe(t,e){for(var r=-1,i=Array(t);++r{function HUe(){return!1}see.exports=HUe});var Od=I((Md,Jg)=>{var GUe=Ks(),jUe=oee(),aee=typeof Md=="object"&&Md&&!Md.nodeType&&Md,Aee=aee&&typeof Jg=="object"&&Jg&&!Jg.nodeType&&Jg,YUe=Aee&&Aee.exports===aee,lee=YUe?GUe.Buffer:void 0,qUe=lee?lee.isBuffer:void 0,JUe=qUe||jUe;Jg.exports=JUe});var uee=I((Bpt,cee)=>{var WUe=Ac(),zUe=ZB(),VUe=Qo(),_Ue="[object Arguments]",XUe="[object Array]",ZUe="[object Boolean]",$Ue="[object Date]",e2e="[object Error]",t2e="[object Function]",r2e="[object Map]",i2e="[object Number]",n2e="[object Object]",s2e="[object RegExp]",o2e="[object Set]",a2e="[object String]",A2e="[object WeakMap]",l2e="[object ArrayBuffer]",c2e="[object DataView]",u2e="[object Float32Array]",g2e="[object Float64Array]",f2e="[object Int8Array]",h2e="[object Int16Array]",p2e="[object Int32Array]",d2e="[object Uint8Array]",C2e="[object Uint8ClampedArray]",m2e="[object Uint16Array]",I2e="[object Uint32Array]",lr={};lr[u2e]=lr[g2e]=lr[f2e]=lr[h2e]=lr[p2e]=lr[d2e]=lr[C2e]=lr[m2e]=lr[I2e]=!0;lr[_Ue]=lr[XUe]=lr[l2e]=lr[ZUe]=lr[c2e]=lr[$Ue]=lr[e2e]=lr[t2e]=lr[r2e]=lr[i2e]=lr[n2e]=lr[s2e]=lr[o2e]=lr[a2e]=lr[A2e]=!1;function E2e(t){return VUe(t)&&zUe(t.length)&&!!lr[WUe(t)]}cee.exports=E2e});var A0=I((Qpt,gee)=>{function y2e(t){return function(e){return t(e)}}gee.exports=y2e});var l0=I((Kd,Wg)=>{var w2e=WP(),fee=typeof Kd=="object"&&Kd&&!Kd.nodeType&&Kd,Ud=fee&&typeof Wg=="object"&&Wg&&!Wg.nodeType&&Wg,B2e=Ud&&Ud.exports===fee,QF=B2e&&w2e.process,Q2e=function(){try{var t=Ud&&Ud.require&&Ud.require("util").types;return t||QF&&QF.binding&&QF.binding("util")}catch(e){}}();Wg.exports=Q2e});var c0=I((bpt,hee)=>{var b2e=uee(),v2e=A0(),pee=l0(),dee=pee&&pee.isTypedArray,S2e=dee?v2e(dee):b2e;hee.exports=S2e});var bF=I((vpt,Cee)=>{var x2e=nee(),k2e=Pd(),P2e=As(),D2e=Od(),R2e=kd(),F2e=c0(),N2e=Object.prototype,L2e=N2e.hasOwnProperty;function T2e(t,e){var r=P2e(t),i=!r&&k2e(t),n=!r&&!i&&D2e(t),s=!r&&!i&&!n&&F2e(t),o=r||i||n||s,a=o?x2e(t.length,String):[],l=a.length;for(var c in t)(e||L2e.call(t,c))&&!(o&&(c=="length"||n&&(c=="offset"||c=="parent")||s&&(c=="buffer"||c=="byteLength"||c=="byteOffset")||R2e(c,l)))&&a.push(c);return a}Cee.exports=T2e});var u0=I((Spt,mee)=>{var M2e=Object.prototype;function O2e(t){var e=t&&t.constructor,r=typeof e=="function"&&e.prototype||M2e;return t===r}mee.exports=O2e});var vF=I((xpt,Iee)=>{function K2e(t,e){return function(r){return t(e(r))}}Iee.exports=K2e});var yee=I((kpt,Eee)=>{var U2e=vF(),H2e=U2e(Object.keys,Object);Eee.exports=H2e});var Bee=I((Ppt,wee)=>{var G2e=u0(),j2e=yee(),Y2e=Object.prototype,q2e=Y2e.hasOwnProperty;function J2e(t){if(!G2e(t))return j2e(t);var e=[];for(var r in Object(t))q2e.call(t,r)&&r!="constructor"&&e.push(r);return e}wee.exports=J2e});var Hd=I((Dpt,Qee)=>{var W2e=zB(),z2e=ZB();function V2e(t){return t!=null&&z2e(t.length)&&!W2e(t)}Qee.exports=V2e});var zg=I((Rpt,bee)=>{var _2e=bF(),X2e=Bee(),Z2e=Hd();function $2e(t){return Z2e(t)?_2e(t):X2e(t)}bee.exports=$2e});var SF=I((Fpt,vee)=>{var eHe=BF(),tHe=zg();function rHe(t,e){return t&&eHe(t,e,tHe)}vee.exports=rHe});var xee=I((Npt,See)=>{var iHe=vd();function nHe(){this.__data__=new iHe,this.size=0}See.exports=nHe});var Pee=I((Lpt,kee)=>{function sHe(t){var e=this.__data__,r=e.delete(t);return this.size=e.size,r}kee.exports=sHe});var Ree=I((Tpt,Dee)=>{function oHe(t){return this.__data__.get(t)}Dee.exports=oHe});var Nee=I((Mpt,Fee)=>{function aHe(t){return this.__data__.has(t)}Fee.exports=aHe});var Tee=I((Opt,Lee)=>{var AHe=vd(),lHe=VB(),cHe=_B(),uHe=200;function gHe(t,e){var r=this.__data__;if(r instanceof AHe){var i=r.__data__;if(!lHe||i.length{var fHe=vd(),hHe=xee(),pHe=Pee(),dHe=Ree(),CHe=Nee(),mHe=Tee();function Vg(t){var e=this.__data__=new fHe(t);this.size=e.size}Vg.prototype.clear=hHe;Vg.prototype.delete=pHe;Vg.prototype.get=dHe;Vg.prototype.has=CHe;Vg.prototype.set=mHe;Mee.exports=Vg});var Kee=I((Upt,Oee)=>{var IHe="__lodash_hash_undefined__";function EHe(t){return this.__data__.set(t,IHe),this}Oee.exports=EHe});var Hee=I((Hpt,Uee)=>{function yHe(t){return this.__data__.has(t)}Uee.exports=yHe});var jee=I((Gpt,Gee)=>{var wHe=_B(),BHe=Kee(),QHe=Hee();function g0(t){var e=-1,r=t==null?0:t.length;for(this.__data__=new wHe;++e{function bHe(t,e){for(var r=-1,i=t==null?0:t.length;++r{function vHe(t,e){return t.has(e)}Jee.exports=vHe});var xF=I((qpt,zee)=>{var SHe=jee(),xHe=qee(),kHe=Wee(),PHe=1,DHe=2;function RHe(t,e,r,i,n,s){var o=r&PHe,a=t.length,l=e.length;if(a!=l&&!(o&&l>a))return!1;var c=s.get(t),u=s.get(e);if(c&&u)return c==e&&u==t;var g=-1,f=!0,h=r&DHe?new SHe:void 0;for(s.set(t,e),s.set(e,t);++g{var FHe=Ks(),NHe=FHe.Uint8Array;Vee.exports=NHe});var Xee=I((Wpt,_ee)=>{function LHe(t){var e=-1,r=Array(t.size);return t.forEach(function(i,n){r[++e]=[n,i]}),r}_ee.exports=LHe});var $ee=I((zpt,Zee)=>{function THe(t){var e=-1,r=Array(t.size);return t.forEach(function(i){r[++e]=i}),r}Zee.exports=THe});var nte=I((Vpt,ete)=>{var tte=ac(),rte=kF(),MHe=Kg(),OHe=xF(),KHe=Xee(),UHe=$ee(),HHe=1,GHe=2,jHe="[object Boolean]",YHe="[object Date]",qHe="[object Error]",JHe="[object Map]",WHe="[object Number]",zHe="[object RegExp]",VHe="[object Set]",_He="[object String]",XHe="[object Symbol]",ZHe="[object ArrayBuffer]",$He="[object DataView]",ite=tte?tte.prototype:void 0,PF=ite?ite.valueOf:void 0;function eGe(t,e,r,i,n,s,o){switch(r){case $He:if(t.byteLength!=e.byteLength||t.byteOffset!=e.byteOffset)return!1;t=t.buffer,e=e.buffer;case ZHe:return!(t.byteLength!=e.byteLength||!s(new rte(t),new rte(e)));case jHe:case YHe:case WHe:return MHe(+t,+e);case qHe:return t.name==e.name&&t.message==e.message;case zHe:case _He:return t==e+"";case JHe:var a=KHe;case VHe:var l=i&HHe;if(a||(a=UHe),t.size!=e.size&&!l)return!1;var c=o.get(t);if(c)return c==e;i|=GHe,o.set(t,e);var u=OHe(a(t),a(e),i,n,s,o);return o.delete(t),u;case XHe:if(PF)return PF.call(t)==PF.call(e)}return!1}ete.exports=eGe});var DF=I((_pt,ste)=>{var tGe=$B(),rGe=As();function iGe(t,e,r){var i=e(t);return rGe(t)?i:tGe(i,r(t))}ste.exports=iGe});var ate=I((Xpt,ote)=>{function nGe(t,e){for(var r=-1,i=t==null?0:t.length,n=0,s=[];++r{function sGe(){return[]}Ate.exports=sGe});var f0=I(($pt,lte)=>{var oGe=ate(),aGe=RF(),AGe=Object.prototype,lGe=AGe.propertyIsEnumerable,cte=Object.getOwnPropertySymbols,cGe=cte?function(t){return t==null?[]:(t=Object(t),oGe(cte(t),function(e){return lGe.call(t,e)}))}:aGe;lte.exports=cGe});var FF=I((edt,ute)=>{var uGe=DF(),gGe=f0(),fGe=zg();function hGe(t){return uGe(t,fGe,gGe)}ute.exports=hGe});var hte=I((tdt,gte)=>{var fte=FF(),pGe=1,dGe=Object.prototype,CGe=dGe.hasOwnProperty;function mGe(t,e,r,i,n,s){var o=r&pGe,a=fte(t),l=a.length,c=fte(e),u=c.length;if(l!=u&&!o)return!1;for(var g=l;g--;){var f=a[g];if(!(o?f in e:CGe.call(e,f)))return!1}var h=s.get(t),p=s.get(e);if(h&&p)return h==e&&p==t;var d=!0;s.set(t,e),s.set(e,t);for(var m=o;++g{var IGe=UA(),EGe=Ks(),yGe=IGe(EGe,"DataView");pte.exports=yGe});var mte=I((idt,Cte)=>{var wGe=UA(),BGe=Ks(),QGe=wGe(BGe,"Promise");Cte.exports=QGe});var Ete=I((ndt,Ite)=>{var bGe=UA(),vGe=Ks(),SGe=bGe(vGe,"Set");Ite.exports=SGe});var wte=I((sdt,yte)=>{var xGe=UA(),kGe=Ks(),PGe=xGe(kGe,"WeakMap");yte.exports=PGe});var jd=I((odt,Bte)=>{var NF=dte(),LF=VB(),TF=mte(),MF=Ete(),OF=wte(),Qte=Ac(),_g=ZR(),bte="[object Map]",DGe="[object Object]",vte="[object Promise]",Ste="[object Set]",xte="[object WeakMap]",kte="[object DataView]",RGe=_g(NF),FGe=_g(LF),NGe=_g(TF),LGe=_g(MF),TGe=_g(OF),kc=Qte;(NF&&kc(new NF(new ArrayBuffer(1)))!=kte||LF&&kc(new LF)!=bte||TF&&kc(TF.resolve())!=vte||MF&&kc(new MF)!=Ste||OF&&kc(new OF)!=xte)&&(kc=function(t){var e=Qte(t),r=e==DGe?t.constructor:void 0,i=r?_g(r):"";if(i)switch(i){case RGe:return kte;case FGe:return bte;case NGe:return vte;case LGe:return Ste;case TGe:return xte}return e});Bte.exports=kc});var Mte=I((adt,Pte)=>{var KF=Gd(),MGe=xF(),OGe=nte(),KGe=hte(),Dte=jd(),Rte=As(),Fte=Od(),UGe=c0(),HGe=1,Nte="[object Arguments]",Lte="[object Array]",h0="[object Object]",GGe=Object.prototype,Tte=GGe.hasOwnProperty;function jGe(t,e,r,i,n,s){var o=Rte(t),a=Rte(e),l=o?Lte:Dte(t),c=a?Lte:Dte(e);l=l==Nte?h0:l,c=c==Nte?h0:c;var u=l==h0,g=c==h0,f=l==c;if(f&&Fte(t)){if(!Fte(e))return!1;o=!0,u=!1}if(f&&!u)return s||(s=new KF),o||UGe(t)?MGe(t,e,r,i,n,s):OGe(t,e,l,r,i,n,s);if(!(r&HGe)){var h=u&&Tte.call(t,"__wrapped__"),p=g&&Tte.call(e,"__wrapped__");if(h||p){var d=h?t.value():t,m=p?e.value():e;return s||(s=new KF),n(d,m,r,i,s)}}return f?(s||(s=new KF),KGe(t,e,r,i,n,s)):!1}Pte.exports=jGe});var UF=I((Adt,Ote)=>{var YGe=Mte(),Kte=Qo();function Ute(t,e,r,i,n){return t===e?!0:t==null||e==null||!Kte(t)&&!Kte(e)?t!==t&&e!==e:YGe(t,e,r,i,Ute,n)}Ote.exports=Ute});var Gte=I((ldt,Hte)=>{var qGe=Gd(),JGe=UF(),WGe=1,zGe=2;function VGe(t,e,r,i){var n=r.length,s=n,o=!i;if(t==null)return!s;for(t=Object(t);n--;){var a=r[n];if(o&&a[2]?a[1]!==t[a[0]]:!(a[0]in t))return!1}for(;++n{var _Ge=Gs();function XGe(t){return t===t&&!_Ge(t)}jte.exports=XGe});var qte=I((udt,Yte)=>{var ZGe=HF(),$Ge=zg();function eje(t){for(var e=$Ge(t),r=e.length;r--;){var i=e[r],n=t[i];e[r]=[i,n,ZGe(n)]}return e}Yte.exports=eje});var GF=I((gdt,Jte)=>{function tje(t,e){return function(r){return r==null?!1:r[t]===e&&(e!==void 0||t in Object(r))}}Jte.exports=tje});var zte=I((fdt,Wte)=>{var rje=Gte(),ije=qte(),nje=GF();function sje(t){var e=ije(t);return e.length==1&&e[0][2]?nje(e[0][0],e[0][1]):function(r){return r===t||rje(r,t,e)}}Wte.exports=sje});var p0=I((hdt,Vte)=>{var oje=xd();function aje(t,e,r){var i=t==null?void 0:oje(t,e);return i===void 0?r:i}Vte.exports=aje});var Xte=I((pdt,_te)=>{var Aje=UF(),lje=p0(),cje=iF(),uje=WB(),gje=HF(),fje=GF(),hje=Sc(),pje=1,dje=2;function Cje(t,e){return uje(t)&&gje(e)?fje(hje(t),e):function(r){var i=lje(r,t);return i===void 0&&i===e?cje(r,t):Aje(e,i,pje|dje)}}_te.exports=Cje});var $te=I((ddt,Zte)=>{function mje(t){return function(e){return e==null?void 0:e[t]}}Zte.exports=mje});var tre=I((Cdt,ere)=>{var Ije=xd();function Eje(t){return function(e){return Ije(e,t)}}ere.exports=Eje});var ire=I((mdt,rre)=>{var yje=$te(),wje=tre(),Bje=WB(),Qje=Sc();function bje(t){return Bje(t)?yje(Qje(t)):wje(t)}rre.exports=bje});var jF=I((Idt,nre)=>{var vje=zte(),Sje=Xte(),xje=e0(),kje=As(),Pje=ire();function Dje(t){return typeof t=="function"?t:t==null?xje:typeof t=="object"?kje(t)?Sje(t[0],t[1]):vje(t):Pje(t)}nre.exports=Dje});var YF=I((Edt,sre)=>{var Rje=jg(),Fje=SF(),Nje=jF();function Lje(t,e){var r={};return e=Nje(e,3),Fje(t,function(i,n,s){Rje(r,n,e(i,n,s))}),r}sre.exports=Lje});var Yd=I((ydt,ore)=>{"use strict";function Pc(t){this._maxSize=t,this.clear()}Pc.prototype.clear=function(){this._size=0,this._values=Object.create(null)};Pc.prototype.get=function(t){return this._values[t]};Pc.prototype.set=function(t,e){return this._size>=this._maxSize&&this.clear(),t in this._values||this._size++,this._values[t]=e};var Tje=/[^.^\]^[]+|(?=\[\]|\.\.)/g,are=/^\d+$/,Mje=/^\d/,Oje=/[~`!#$%\^&*+=\-\[\]\\';,/{}|\\":<>\?]/g,Kje=/^\s*(['"]?)(.*?)(\1)\s*$/,qF=512,Are=new Pc(qF),lre=new Pc(qF),cre=new Pc(qF);ore.exports={Cache:Pc,split:WF,normalizePath:JF,setter:function(t){var e=JF(t);return lre.get(t)||lre.set(t,function(i,n){for(var s=0,o=e.length,a=i;s{"use strict";Object.defineProperty(qd,"__esModule",{value:!0});qd.create=Yje;qd.default=void 0;var qje=Yd(),d0={context:"$",value:"."};function Yje(t,e){return new C0(t,e)}var C0=class{constructor(e,r={}){if(typeof e!="string")throw new TypeError("ref must be a string, got: "+e);if(this.key=e.trim(),e==="")throw new TypeError("ref must be a non-empty string");this.isContext=this.key[0]===d0.context,this.isValue=this.key[0]===d0.value,this.isSibling=!this.isContext&&!this.isValue;let i=this.isContext?d0.context:this.isValue?d0.value:"";this.path=this.key.slice(i.length),this.getter=this.path&&(0,qje.getter)(this.path,!0),this.map=r.map}getValue(e,r,i){let n=this.isContext?i:this.isValue?e:r;return this.getter&&(n=this.getter(n||{})),this.map&&(n=this.map(n)),n}cast(e,r){return this.getValue(e,r==null?void 0:r.parent,r==null?void 0:r.context)}resolve(){return this}describe(){return{type:"ref",key:this.key}}toString(){return`Ref(${this.key})`}static isRef(e){return e&&e.__isYupRef}};qd.default=C0;C0.prototype.__isYupRef=!0});var ure=I(VF=>{"use strict";Object.defineProperty(VF,"__esModule",{value:!0});VF.default=Jje;var Wje=_F(YF()),m0=_F(xc()),zje=_F(Dc());function _F(t){return t&&t.__esModule?t:{default:t}}function I0(){return I0=Object.assign||function(t){for(var e=1;e=0)&&(r[n]=t[n]);return r}function Jje(t){function e(r,i){let{value:n,path:s="",label:o,options:a,originalValue:l,sync:c}=r,u=Vje(r,["value","path","label","options","originalValue","sync"]),{name:g,test:f,params:h,message:p}=t,{parent:d,context:m}=a;function E(L){return zje.default.isRef(L)?L.getValue(n,d,m):L}function B(L={}){let K=(0,Wje.default)(I0({value:n,originalValue:l,label:o,path:L.path||s},h,L.params),E),J=new m0.default(m0.default.formatError(L.message||p,K),n,K.path,L.type||g);return J.params=K,J}let b=I0({path:s,parent:d,type:g,createError:B,resolve:E,options:a,originalValue:l},u);if(!c){try{Promise.resolve(f.call(b,n,b)).then(L=>{m0.default.isError(L)?i(L):L?i(null,L):i(B())})}catch(L){i(L)}return}let R;try{var H;if(R=f.call(b,n,b),typeof((H=R)==null?void 0:H.then)=="function")throw new Error(`Validation test of type: "${b.type}" returned a Promise during a synchronous validate. This test will finish after the validate call has returned`)}catch(L){i(L);return}m0.default.isError(R)?i(R):R?i(null,R):i(B())}return e.OPTIONS=t,e}});var XF=I(Jd=>{"use strict";Object.defineProperty(Jd,"__esModule",{value:!0});Jd.getIn=gre;Jd.default=void 0;var _je=Yd(),Xje=t=>t.substr(0,t.length-1).substr(1);function gre(t,e,r,i=r){let n,s,o;return e?((0,_je.forEach)(e,(a,l,c)=>{let u=l?Xje(a):a;if(t=t.resolve({context:i,parent:n,value:r}),t.innerType){let g=c?parseInt(u,10):0;if(r&&g>=r.length)throw new Error(`Yup.reach cannot resolve an array item at index: ${a}, in the path: ${e}. because there is no value at that index. `);n=r,r=r&&r[g],t=t.innerType}if(!c){if(!t.fields||!t.fields[u])throw new Error(`The schema does not contain the path: ${e}. (failed at: ${o} which is a type: "${t._type}")`);n=r,r=r&&r[u],t=t.fields[u]}s=u,o=l?"["+a+"]":"."+a}),{schema:t,parent:n,parentPath:s}):{parent:n,parentPath:e,schema:t}}var Zje=(t,e,r,i)=>gre(t,e,r,i).schema,$je=Zje;Jd.default=$je});var hre=I(E0=>{"use strict";Object.defineProperty(E0,"__esModule",{value:!0});E0.default=void 0;var fre=eYe(Dc());function eYe(t){return t&&t.__esModule?t:{default:t}}var y0=class{constructor(){this.list=new Set,this.refs=new Map}get size(){return this.list.size+this.refs.size}describe(){let e=[];for(let r of this.list)e.push(r);for(let[,r]of this.refs)e.push(r.describe());return e}toArray(){return Array.from(this.list).concat(Array.from(this.refs.values()))}add(e){fre.default.isRef(e)?this.refs.set(e.key,e):this.list.add(e)}delete(e){fre.default.isRef(e)?this.refs.delete(e.key):this.list.delete(e)}has(e,r){if(this.list.has(e))return!0;let i,n=this.refs.values();for(;i=n.next(),!i.done;)if(r(i.value)===e)return!0;return!1}clone(){let e=new y0;return e.list=new Set(this.list),e.refs=new Map(this.refs),e}merge(e,r){let i=this.clone();return e.list.forEach(n=>i.add(n)),e.refs.forEach(n=>i.add(n)),r.list.forEach(n=>i.delete(n)),r.refs.forEach(n=>i.delete(n)),i}};E0.default=y0});var Ma=I(w0=>{"use strict";Object.defineProperty(w0,"__esModule",{value:!0});w0.default=void 0;var pre=Ta(M$()),Xg=La(),tYe=Ta(Z$()),dre=Ta(a0()),B0=Ta(ure()),Cre=Ta(Nd()),rYe=Ta(Dc()),iYe=XF(),nYe=Ta(IF()),mre=Ta(xc()),Ire=Ta(hre());function Ta(t){return t&&t.__esModule?t:{default:t}}function ds(){return ds=Object.assign||function(t){for(var e=1;e{this.typeError(Xg.mixed.notType)}),this.type=(e==null?void 0:e.type)||"mixed",this.spec=ds({strip:!1,strict:!1,abortEarly:!0,recursive:!0,nullable:!1,presence:"optional"},e==null?void 0:e.spec)}get _type(){return this.type}_typeCheck(e){return!0}clone(e){if(this._mutate)return e&&Object.assign(this.spec,e),this;let r=Object.create(Object.getPrototypeOf(this));return r.type=this.type,r._typeError=this._typeError,r._whitelistError=this._whitelistError,r._blacklistError=this._blacklistError,r._whitelist=this._whitelist.clone(),r._blacklist=this._blacklist.clone(),r.exclusiveTests=ds({},this.exclusiveTests),r.deps=[...this.deps],r.conditions=[...this.conditions],r.tests=[...this.tests],r.transforms=[...this.transforms],r.spec=(0,pre.default)(ds({},this.spec,e)),r}label(e){var r=this.clone();return r.spec.label=e,r}meta(...e){if(e.length===0)return this.spec.meta;let r=this.clone();return r.spec.meta=Object.assign(r.spec.meta||{},e[0]),r}withMutation(e){let r=this._mutate;this._mutate=!0;let i=e(this);return this._mutate=r,i}concat(e){if(!e||e===this)return this;if(e.type!==this.type&&this.type!=="mixed")throw new TypeError(`You cannot \`concat()\` schema's of different types: ${this.type} and ${e.type}`);let r=this,i=e.clone(),n=ds({},r.spec,i.spec);return i.spec=n,i._typeError||(i._typeError=r._typeError),i._whitelistError||(i._whitelistError=r._whitelistError),i._blacklistError||(i._blacklistError=r._blacklistError),i._whitelist=r._whitelist.merge(e._whitelist,e._blacklist),i._blacklist=r._blacklist.merge(e._blacklist,e._whitelist),i.tests=r.tests,i.exclusiveTests=r.exclusiveTests,i.withMutation(s=>{e.tests.forEach(o=>{s.test(o.OPTIONS)})}),i}isType(e){return this.spec.nullable&&e===null?!0:this._typeCheck(e)}resolve(e){let r=this;if(r.conditions.length){let i=r.conditions;r=r.clone(),r.conditions=[],r=i.reduce((n,s)=>s.resolve(n,e),r),r=r.resolve(e)}return r}cast(e,r={}){let i=this.resolve(ds({value:e},r)),n=i._cast(e,r);if(e!==void 0&&r.assert!==!1&&i.isType(n)!==!0){let s=(0,Cre.default)(e),o=(0,Cre.default)(n);throw new TypeError(`The value of ${r.path||"field"} could not be cast to a value that satisfies the schema type: "${i._type}". + +attempted value: ${s} +`+(o!==s?`result of cast: ${o}`:""))}return n}_cast(e,r){let i=e===void 0?e:this.transforms.reduce((n,s)=>s.call(this,n,e,this),e);return i===void 0&&(i=this.getDefault()),i}_validate(e,r={},i){let{sync:n,path:s,from:o=[],originalValue:a=e,strict:l=this.spec.strict,abortEarly:c=this.spec.abortEarly}=r,u=e;l||(u=this._cast(u,ds({assert:!1},r)));let g={value:u,path:s,options:r,originalValue:a,schema:this,label:this.spec.label,sync:n,from:o},f=[];this._typeError&&f.push(this._typeError),this._whitelistError&&f.push(this._whitelistError),this._blacklistError&&f.push(this._blacklistError),(0,dre.default)({args:g,value:u,path:s,sync:n,tests:f,endEarly:c},h=>{if(h)return void i(h,u);(0,dre.default)({tests:this.tests,args:g,path:s,sync:n,value:u,endEarly:c},i)})}validate(e,r,i){let n=this.resolve(ds({},r,{value:e}));return typeof i=="function"?n._validate(e,r,i):new Promise((s,o)=>n._validate(e,r,(a,l)=>{a?o(a):s(l)}))}validateSync(e,r){let i=this.resolve(ds({},r,{value:e})),n;return i._validate(e,ds({},r,{sync:!0}),(s,o)=>{if(s)throw s;n=o}),n}isValid(e,r){return this.validate(e,r).then(()=>!0,i=>{if(mre.default.isError(i))return!1;throw i})}isValidSync(e,r){try{return this.validateSync(e,r),!0}catch(i){if(mre.default.isError(i))return!1;throw i}}_getDefault(){let e=this.spec.default;return e==null?e:typeof e=="function"?e.call(this):(0,pre.default)(e)}getDefault(e){return this.resolve(e||{})._getDefault()}default(e){return arguments.length===0?this._getDefault():this.clone({default:e})}strict(e=!0){var r=this.clone();return r.spec.strict=e,r}_isPresent(e){return e!=null}defined(e=Xg.mixed.defined){return this.test({message:e,name:"defined",exclusive:!0,test(r){return r!==void 0}})}required(e=Xg.mixed.required){return this.clone({presence:"required"}).withMutation(r=>r.test({message:e,name:"required",exclusive:!0,test(i){return this.schema._isPresent(i)}}))}notRequired(){var e=this.clone({presence:"optional"});return e.tests=e.tests.filter(r=>r.OPTIONS.name!=="required"),e}nullable(e=!0){var r=this.clone({nullable:e!==!1});return r}transform(e){var r=this.clone();return r.transforms.push(e),r}test(...e){let r;if(e.length===1?typeof e[0]=="function"?r={test:e[0]}:r=e[0]:e.length===2?r={name:e[0],test:e[1]}:r={name:e[0],message:e[1],test:e[2]},r.message===void 0&&(r.message=Xg.mixed.default),typeof r.test!="function")throw new TypeError("`test` is a required parameters");let i=this.clone(),n=(0,B0.default)(r),s=r.exclusive||r.name&&i.exclusiveTests[r.name]===!0;if(r.exclusive&&!r.name)throw new TypeError("Exclusive tests must provide a unique `name` identifying the test");return r.name&&(i.exclusiveTests[r.name]=!!r.exclusive),i.tests=i.tests.filter(o=>!(o.OPTIONS.name===r.name&&(s||o.OPTIONS.test===n.OPTIONS.test))),i.tests.push(n),i}when(e,r){!Array.isArray(e)&&typeof e!="string"&&(r=e,e=".");let i=this.clone(),n=(0,nYe.default)(e).map(s=>new rYe.default(s));return n.forEach(s=>{s.isSibling&&i.deps.push(s.key)}),i.conditions.push(new tYe.default(n,r)),i}typeError(e){var r=this.clone();return r._typeError=(0,B0.default)({message:e,name:"typeError",test(i){return i!==void 0&&!this.schema.isType(i)?this.createError({params:{type:this.schema._type}}):!0}}),r}oneOf(e,r=Xg.mixed.oneOf){var i=this.clone();return e.forEach(n=>{i._whitelist.add(n),i._blacklist.delete(n)}),i._whitelistError=(0,B0.default)({message:r,name:"oneOf",test(n){if(n===void 0)return!0;let s=this.schema._whitelist;return s.has(n,this.resolve)?!0:this.createError({params:{values:s.toArray().join(", ")}})}}),i}notOneOf(e,r=Xg.mixed.notOneOf){var i=this.clone();return e.forEach(n=>{i._blacklist.add(n),i._whitelist.delete(n)}),i._blacklistError=(0,B0.default)({message:r,name:"notOneOf",test(n){let s=this.schema._blacklist;return s.has(n,this.resolve)?this.createError({params:{values:s.toArray().join(", ")}}):!0}}),i}strip(e=!0){let r=this.clone();return r.spec.strip=e,r}describe(){let e=this.clone(),{label:r,meta:i}=e.spec;return{meta:i,label:r,type:e.type,oneOf:e._whitelist.describe(),notOneOf:e._blacklist.describe(),tests:e.tests.map(s=>({name:s.OPTIONS.name,params:s.OPTIONS.params})).filter((s,o,a)=>a.findIndex(l=>l.name===s.name)===o)}}};w0.default=Do;Do.prototype.__isYupSchema__=!0;for(let t of["validate","validateSync"])Do.prototype[`${t}At`]=function(e,r,i={}){let{parent:n,parentPath:s,schema:o}=(0,iYe.getIn)(this,e,r,i.context);return o[t](n&&n[s],ds({},i,{parent:n,path:e}))};for(let t of["equals","is"])Do.prototype[t]=Do.prototype.oneOf;for(let t of["not","nope"])Do.prototype[t]=Do.prototype.notOneOf;Do.prototype.optional=Do.prototype.notRequired});var yre=I(Wd=>{"use strict";Object.defineProperty(Wd,"__esModule",{value:!0});Wd.create=Ere;Wd.default=void 0;var oYe=sYe(Ma());function sYe(t){return t&&t.__esModule?t:{default:t}}var ZF=oYe.default,aYe=ZF;Wd.default=aYe;function Ere(){return new ZF}Ere.prototype=ZF.prototype});var Zg=I(Q0=>{"use strict";Object.defineProperty(Q0,"__esModule",{value:!0});Q0.default=void 0;var AYe=t=>t==null;Q0.default=AYe});var vre=I(zd=>{"use strict";Object.defineProperty(zd,"__esModule",{value:!0});zd.create=wre;zd.default=void 0;var lYe=Bre(Ma()),Qre=La(),bre=Bre(Zg());function Bre(t){return t&&t.__esModule?t:{default:t}}function wre(){return new b0}var b0=class extends lYe.default{constructor(){super({type:"boolean"});this.withMutation(()=>{this.transform(function(e){if(!this.isType(e)){if(/^(true|1)$/i.test(String(e)))return!0;if(/^(false|0)$/i.test(String(e)))return!1}return e})})}_typeCheck(e){return e instanceof Boolean&&(e=e.valueOf()),typeof e=="boolean"}isTrue(e=Qre.boolean.isValue){return this.test({message:e,name:"is-value",exclusive:!0,params:{value:"true"},test(r){return(0,bre.default)(r)||r===!0}})}isFalse(e=Qre.boolean.isValue){return this.test({message:e,name:"is-value",exclusive:!0,params:{value:"false"},test(r){return(0,bre.default)(r)||r===!1}})}};zd.default=b0;wre.prototype=b0.prototype});var kre=I(Vd=>{"use strict";Object.defineProperty(Vd,"__esModule",{value:!0});Vd.create=Sre;Vd.default=void 0;var Ro=La(),Oa=xre(Zg()),cYe=xre(Ma());function xre(t){return t&&t.__esModule?t:{default:t}}var uYe=/^((([a-z]|\d|[!#\$%&'\*\+\-\/=\?\^_`{\|}~]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])+(\.([a-z]|\d|[!#\$%&'\*\+\-\/=\?\^_`{\|}~]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])+)*)|((\x22)((((\x20|\x09)*(\x0d\x0a))?(\x20|\x09)+)?(([\x01-\x08\x0b\x0c\x0e-\x1f\x7f]|\x21|[\x23-\x5b]|[\x5d-\x7e]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(\\([\x01-\x09\x0b\x0c\x0d-\x7f]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]))))*(((\x20|\x09)*(\x0d\x0a))?(\x20|\x09)+)?(\x22)))@((([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.)+(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))$/i,gYe=/^((https?|ftp):)?\/\/(((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:)*@)?(((\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5]))|((([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.)+(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.?)(:\d*)?)(\/((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)+(\/(([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)*)*)?)?(\?((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)|[\uE000-\uF8FF]|\/|\?)*)?(\#((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)|\/|\?)*)?$/i,fYe=/^(?:[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}|00000000-0000-0000-0000-000000000000)$/i,hYe=t=>(0,Oa.default)(t)||t===t.trim(),pYe={}.toString();function Sre(){return new v0}var v0=class extends cYe.default{constructor(){super({type:"string"});this.withMutation(()=>{this.transform(function(e){if(this.isType(e)||Array.isArray(e))return e;let r=e!=null&&e.toString?e.toString():e;return r===pYe?e:r})})}_typeCheck(e){return e instanceof String&&(e=e.valueOf()),typeof e=="string"}_isPresent(e){return super._isPresent(e)&&!!e.length}length(e,r=Ro.string.length){return this.test({message:r,name:"length",exclusive:!0,params:{length:e},test(i){return(0,Oa.default)(i)||i.length===this.resolve(e)}})}min(e,r=Ro.string.min){return this.test({message:r,name:"min",exclusive:!0,params:{min:e},test(i){return(0,Oa.default)(i)||i.length>=this.resolve(e)}})}max(e,r=Ro.string.max){return this.test({name:"max",exclusive:!0,message:r,params:{max:e},test(i){return(0,Oa.default)(i)||i.length<=this.resolve(e)}})}matches(e,r){let i=!1,n,s;return r&&(typeof r=="object"?{excludeEmptyString:i=!1,message:n,name:s}=r:n=r),this.test({name:s||"matches",message:n||Ro.string.matches,params:{regex:e},test:o=>(0,Oa.default)(o)||o===""&&i||o.search(e)!==-1})}email(e=Ro.string.email){return this.matches(uYe,{name:"email",message:e,excludeEmptyString:!0})}url(e=Ro.string.url){return this.matches(gYe,{name:"url",message:e,excludeEmptyString:!0})}uuid(e=Ro.string.uuid){return this.matches(fYe,{name:"uuid",message:e,excludeEmptyString:!1})}ensure(){return this.default("").transform(e=>e===null?"":e)}trim(e=Ro.string.trim){return this.transform(r=>r!=null?r.trim():r).test({message:e,name:"trim",test:hYe})}lowercase(e=Ro.string.lowercase){return this.transform(r=>(0,Oa.default)(r)?r:r.toLowerCase()).test({message:e,name:"string_case",exclusive:!0,test:r=>(0,Oa.default)(r)||r===r.toLowerCase()})}uppercase(e=Ro.string.uppercase){return this.transform(r=>(0,Oa.default)(r)?r:r.toUpperCase()).test({message:e,name:"string_case",exclusive:!0,test:r=>(0,Oa.default)(r)||r===r.toUpperCase()})}};Vd.default=v0;Sre.prototype=v0.prototype});var Rre=I(_d=>{"use strict";Object.defineProperty(_d,"__esModule",{value:!0});_d.create=Pre;_d.default=void 0;var Rc=La(),Fc=Dre(Zg()),dYe=Dre(Ma());function Dre(t){return t&&t.__esModule?t:{default:t}}var CYe=t=>t!=+t;function Pre(){return new S0}var S0=class extends dYe.default{constructor(){super({type:"number"});this.withMutation(()=>{this.transform(function(e){let r=e;if(typeof r=="string"){if(r=r.replace(/\s/g,""),r==="")return NaN;r=+r}return this.isType(r)?r:parseFloat(r)})})}_typeCheck(e){return e instanceof Number&&(e=e.valueOf()),typeof e=="number"&&!CYe(e)}min(e,r=Rc.number.min){return this.test({message:r,name:"min",exclusive:!0,params:{min:e},test(i){return(0,Fc.default)(i)||i>=this.resolve(e)}})}max(e,r=Rc.number.max){return this.test({message:r,name:"max",exclusive:!0,params:{max:e},test(i){return(0,Fc.default)(i)||i<=this.resolve(e)}})}lessThan(e,r=Rc.number.lessThan){return this.test({message:r,name:"max",exclusive:!0,params:{less:e},test(i){return(0,Fc.default)(i)||ithis.resolve(e)}})}positive(e=Rc.number.positive){return this.moreThan(0,e)}negative(e=Rc.number.negative){return this.lessThan(0,e)}integer(e=Rc.number.integer){return this.test({name:"integer",message:e,test:r=>(0,Fc.default)(r)||Number.isInteger(r)})}truncate(){return this.transform(e=>(0,Fc.default)(e)?e:e|0)}round(e){var r,i=["ceil","floor","round","trunc"];if(e=((r=e)==null?void 0:r.toLowerCase())||"round",e==="trunc")return this.truncate();if(i.indexOf(e.toLowerCase())===-1)throw new TypeError("Only valid options for round() are: "+i.join(", "));return this.transform(n=>(0,Fc.default)(n)?n:Math[e](n))}};_d.default=S0;Pre.prototype=S0.prototype});var Fre=I($F=>{"use strict";Object.defineProperty($F,"__esModule",{value:!0});$F.default=mYe;var IYe=/^(\d{4}|[+\-]\d{6})(?:-?(\d{2})(?:-?(\d{2}))?)?(?:[ T]?(\d{2}):?(\d{2})(?::?(\d{2})(?:[,\.](\d{1,}))?)?(?:(Z)|([+\-])(\d{2})(?::?(\d{2}))?)?)?$/;function mYe(t){var e=[1,4,5,6,7,10,11],r=0,i,n;if(n=IYe.exec(t)){for(var s=0,o;o=e[s];++s)n[o]=+n[o]||0;n[2]=(+n[2]||1)-1,n[3]=+n[3]||1,n[7]=n[7]?String(n[7]).substr(0,3):0,(n[8]===void 0||n[8]==="")&&(n[9]===void 0||n[9]==="")?i=+new Date(n[1],n[2],n[3],n[4],n[5],n[6],n[7]):(n[8]!=="Z"&&n[9]!==void 0&&(r=n[10]*60+n[11],n[9]==="+"&&(r=0-r)),i=Date.UTC(n[1],n[2],n[3],n[4],n[5]+r,n[6],n[7]))}else i=Date.parse?Date.parse(t):NaN;return i}});var Tre=I(Xd=>{"use strict";Object.defineProperty(Xd,"__esModule",{value:!0});Xd.create=eN;Xd.default=void 0;var EYe=x0(Fre()),Nre=La(),Lre=x0(Zg()),yYe=x0(Dc()),wYe=x0(Ma());function x0(t){return t&&t.__esModule?t:{default:t}}var tN=new Date(""),BYe=t=>Object.prototype.toString.call(t)==="[object Date]";function eN(){return new Zd}var Zd=class extends wYe.default{constructor(){super({type:"date"});this.withMutation(()=>{this.transform(function(e){return this.isType(e)?e:(e=(0,EYe.default)(e),isNaN(e)?tN:new Date(e))})})}_typeCheck(e){return BYe(e)&&!isNaN(e.getTime())}prepareParam(e,r){let i;if(yYe.default.isRef(e))i=e;else{let n=this.cast(e);if(!this._typeCheck(n))throw new TypeError(`\`${r}\` must be a Date or a value that can be \`cast()\` to a Date`);i=n}return i}min(e,r=Nre.date.min){let i=this.prepareParam(e,"min");return this.test({message:r,name:"min",exclusive:!0,params:{min:e},test(n){return(0,Lre.default)(n)||n>=this.resolve(i)}})}max(e,r=Nre.date.max){var i=this.prepareParam(e,"max");return this.test({message:r,name:"max",exclusive:!0,params:{max:e},test(n){return(0,Lre.default)(n)||n<=this.resolve(i)}})}};Xd.default=Zd;Zd.INVALID_DATE=tN;eN.prototype=Zd.prototype;eN.INVALID_DATE=tN});var Ore=I((Ndt,Mre)=>{function QYe(t,e,r,i){var n=-1,s=t==null?0:t.length;for(i&&s&&(r=t[++n]);++n{function bYe(t){return function(e){return t==null?void 0:t[e]}}Kre.exports=bYe});var Gre=I((Tdt,Hre)=>{var vYe=Ure(),SYe={\u00C0:"A",\u00C1:"A",\u00C2:"A",\u00C3:"A",\u00C4:"A",\u00C5:"A",\u00E0:"a",\u00E1:"a",\u00E2:"a",\u00E3:"a",\u00E4:"a",\u00E5:"a",\u00C7:"C",\u00E7:"c",\u00D0:"D",\u00F0:"d",\u00C8:"E",\u00C9:"E",\u00CA:"E",\u00CB:"E",\u00E8:"e",\u00E9:"e",\u00EA:"e",\u00EB:"e",\u00CC:"I",\u00CD:"I",\u00CE:"I",\u00CF:"I",\u00EC:"i",\u00ED:"i",\u00EE:"i",\u00EF:"i",\u00D1:"N",\u00F1:"n",\u00D2:"O",\u00D3:"O",\u00D4:"O",\u00D5:"O",\u00D6:"O",\u00D8:"O",\u00F2:"o",\u00F3:"o",\u00F4:"o",\u00F5:"o",\u00F6:"o",\u00F8:"o",\u00D9:"U",\u00DA:"U",\u00DB:"U",\u00DC:"U",\u00F9:"u",\u00FA:"u",\u00FB:"u",\u00FC:"u",\u00DD:"Y",\u00FD:"y",\u00FF:"y",\u00C6:"Ae",\u00E6:"ae",\u00DE:"Th",\u00FE:"th",\u00DF:"ss",\u0100:"A",\u0102:"A",\u0104:"A",\u0101:"a",\u0103:"a",\u0105:"a",\u0106:"C",\u0108:"C",\u010A:"C",\u010C:"C",\u0107:"c",\u0109:"c",\u010B:"c",\u010D:"c",\u010E:"D",\u0110:"D",\u010F:"d",\u0111:"d",\u0112:"E",\u0114:"E",\u0116:"E",\u0118:"E",\u011A:"E",\u0113:"e",\u0115:"e",\u0117:"e",\u0119:"e",\u011B:"e",\u011C:"G",\u011E:"G",\u0120:"G",\u0122:"G",\u011D:"g",\u011F:"g",\u0121:"g",\u0123:"g",\u0124:"H",\u0126:"H",\u0125:"h",\u0127:"h",\u0128:"I",\u012A:"I",\u012C:"I",\u012E:"I",\u0130:"I",\u0129:"i",\u012B:"i",\u012D:"i",\u012F:"i",\u0131:"i",\u0134:"J",\u0135:"j",\u0136:"K",\u0137:"k",\u0138:"k",\u0139:"L",\u013B:"L",\u013D:"L",\u013F:"L",\u0141:"L",\u013A:"l",\u013C:"l",\u013E:"l",\u0140:"l",\u0142:"l",\u0143:"N",\u0145:"N",\u0147:"N",\u014A:"N",\u0144:"n",\u0146:"n",\u0148:"n",\u014B:"n",\u014C:"O",\u014E:"O",\u0150:"O",\u014D:"o",\u014F:"o",\u0151:"o",\u0154:"R",\u0156:"R",\u0158:"R",\u0155:"r",\u0157:"r",\u0159:"r",\u015A:"S",\u015C:"S",\u015E:"S",\u0160:"S",\u015B:"s",\u015D:"s",\u015F:"s",\u0161:"s",\u0162:"T",\u0164:"T",\u0166:"T",\u0163:"t",\u0165:"t",\u0167:"t",\u0168:"U",\u016A:"U",\u016C:"U",\u016E:"U",\u0170:"U",\u0172:"U",\u0169:"u",\u016B:"u",\u016D:"u",\u016F:"u",\u0171:"u",\u0173:"u",\u0174:"W",\u0175:"w",\u0176:"Y",\u0177:"y",\u0178:"Y",\u0179:"Z",\u017B:"Z",\u017D:"Z",\u017A:"z",\u017C:"z",\u017E:"z",\u0132:"IJ",\u0133:"ij",\u0152:"Oe",\u0153:"oe",\u0149:"'n",\u017F:"s"},xYe=vYe(SYe);Hre.exports=xYe});var Yre=I((Mdt,jre)=>{var kYe=Gre(),PYe=gg(),DYe=/[\xc0-\xd6\xd8-\xf6\xf8-\xff\u0100-\u017f]/g,RYe="\\u0300-\\u036f",FYe="\\ufe20-\\ufe2f",NYe="\\u20d0-\\u20ff",LYe=RYe+FYe+NYe,TYe="["+LYe+"]",MYe=RegExp(TYe,"g");function OYe(t){return t=PYe(t),t&&t.replace(DYe,kYe).replace(MYe,"")}jre.exports=OYe});var Jre=I((Odt,qre)=>{var KYe=/[^\x00-\x2f\x3a-\x40\x5b-\x60\x7b-\x7f]+/g;function UYe(t){return t.match(KYe)||[]}qre.exports=UYe});var zre=I((Kdt,Wre)=>{var HYe=/[a-z][A-Z]|[A-Z]{2}[a-z]|[0-9][a-zA-Z]|[a-zA-Z][0-9]|[^a-zA-Z0-9 ]/;function GYe(t){return HYe.test(t)}Wre.exports=GYe});var fie=I((Udt,Vre)=>{var _re="\\ud800-\\udfff",jYe="\\u0300-\\u036f",YYe="\\ufe20-\\ufe2f",qYe="\\u20d0-\\u20ff",JYe=jYe+YYe+qYe,Xre="\\u2700-\\u27bf",Zre="a-z\\xdf-\\xf6\\xf8-\\xff",WYe="\\xac\\xb1\\xd7\\xf7",zYe="\\x00-\\x2f\\x3a-\\x40\\x5b-\\x60\\x7b-\\xbf",VYe="\\u2000-\\u206f",_Ye=" \\t\\x0b\\f\\xa0\\ufeff\\n\\r\\u2028\\u2029\\u1680\\u180e\\u2000\\u2001\\u2002\\u2003\\u2004\\u2005\\u2006\\u2007\\u2008\\u2009\\u200a\\u202f\\u205f\\u3000",$re="A-Z\\xc0-\\xd6\\xd8-\\xde",XYe="\\ufe0e\\ufe0f",eie=WYe+zYe+VYe+_Ye,tie="['\u2019]",rie="["+eie+"]",ZYe="["+JYe+"]",iie="\\d+",$Ye="["+Xre+"]",nie="["+Zre+"]",sie="[^"+_re+eie+iie+Xre+Zre+$re+"]",eqe="\\ud83c[\\udffb-\\udfff]",tqe="(?:"+ZYe+"|"+eqe+")",rqe="[^"+_re+"]",oie="(?:\\ud83c[\\udde6-\\uddff]){2}",aie="[\\ud800-\\udbff][\\udc00-\\udfff]",$g="["+$re+"]",iqe="\\u200d",Aie="(?:"+nie+"|"+sie+")",nqe="(?:"+$g+"|"+sie+")",lie="(?:"+tie+"(?:d|ll|m|re|s|t|ve))?",cie="(?:"+tie+"(?:D|LL|M|RE|S|T|VE))?",uie=tqe+"?",gie="["+XYe+"]?",sqe="(?:"+iqe+"(?:"+[rqe,oie,aie].join("|")+")"+gie+uie+")*",oqe="\\d*(?:1st|2nd|3rd|(?![123])\\dth)(?=\\b|[A-Z_])",aqe="\\d*(?:1ST|2ND|3RD|(?![123])\\dTH)(?=\\b|[a-z_])",Aqe=gie+uie+sqe,lqe="(?:"+[$Ye,oie,aie].join("|")+")"+Aqe,cqe=RegExp([$g+"?"+nie+"+"+lie+"(?="+[rie,$g,"$"].join("|")+")",nqe+"+"+cie+"(?="+[rie,$g+Aie,"$"].join("|")+")",$g+"?"+Aie+"+"+lie,$g+"+"+cie,aqe,oqe,iie,lqe].join("|"),"g");function uqe(t){return t.match(cqe)||[]}Vre.exports=uqe});var pie=I((Hdt,hie)=>{var gqe=Jre(),fqe=zre(),hqe=gg(),pqe=fie();function dqe(t,e,r){return t=hqe(t),e=r?void 0:e,e===void 0?fqe(t)?pqe(t):gqe(t):t.match(e)||[]}hie.exports=dqe});var rN=I((Gdt,die)=>{var Cqe=Ore(),mqe=Yre(),Iqe=pie(),Eqe="['\u2019]",yqe=RegExp(Eqe,"g");function wqe(t){return function(e){return Cqe(Iqe(mqe(e).replace(yqe,"")),t,"")}}die.exports=wqe});var mie=I((jdt,Cie)=>{var Bqe=rN(),Qqe=Bqe(function(t,e,r){return t+(r?"_":"")+e.toLowerCase()});Cie.exports=Qqe});var Eie=I((Ydt,Iie)=>{var bqe=ZP(),vqe=rN(),Sqe=vqe(function(t,e,r){return e=e.toLowerCase(),t+(r?bqe(e):e)});Iie.exports=Sqe});var wie=I((qdt,yie)=>{var xqe=jg(),kqe=SF(),Pqe=jF();function Dqe(t,e){var r={};return e=Pqe(e,3),kqe(t,function(i,n,s){xqe(r,e(i,n,s),i)}),r}yie.exports=Dqe});var Qie=I((Jdt,iN)=>{iN.exports=function(t){return Bie(Rqe(t),t)};iN.exports.array=Bie;function Bie(t,e){var r=t.length,i=new Array(r),n={},s=r,o=Fqe(e),a=Nqe(t);for(e.forEach(function(c){if(!a.has(c[0])||!a.has(c[1]))throw new Error("Unknown node. There is an unknown node in the supplied edges.")});s--;)n[s]||l(t[s],s,new Set);return i;function l(c,u,g){if(g.has(c)){var f;try{f=", node was:"+JSON.stringify(c)}catch(d){f=""}throw new Error("Cyclic dependency"+f)}if(!a.has(c))throw new Error("Found unknown node. Make sure to provided all involved nodes. Unknown node: "+JSON.stringify(c));if(!n[u]){n[u]=!0;var h=o.get(c)||new Set;if(h=Array.from(h),u=h.length){g.add(c);do{var p=h[--u];l(p,a.get(p),g)}while(u);g.delete(c)}i[--r]=c}}}function Rqe(t){for(var e=new Set,r=0,i=t.length;r{"use strict";Object.defineProperty(nN,"__esModule",{value:!0});nN.default=Lqe;var Tqe=k0(Ld()),Mqe=k0(Qie()),Oqe=Yd(),Kqe=k0(Dc()),Uqe=k0(qg());function k0(t){return t&&t.__esModule?t:{default:t}}function Lqe(t,e=[]){let r=[],i=[];function n(s,o){var a=(0,Oqe.split)(s)[0];~i.indexOf(a)||i.push(a),~e.indexOf(`${o}-${a}`)||r.push([o,a])}for(let s in t)if((0,Tqe.default)(t,s)){let o=t[s];~i.indexOf(s)||i.push(s),Kqe.default.isRef(o)&&o.isSibling?n(o.path,s):(0,Uqe.default)(o)&&"deps"in o&&o.deps.forEach(a=>n(a,s))}return Mqe.default.array(i,r).reverse()}});var Sie=I(sN=>{"use strict";Object.defineProperty(sN,"__esModule",{value:!0});sN.default=Hqe;function vie(t,e){let r=Infinity;return t.some((i,n)=>{var s;if(((s=e.path)==null?void 0:s.indexOf(i))!==-1)return r=n,!0}),r}function Hqe(t){return(e,r)=>vie(t,e)-vie(t,r)}});var Nie=I($d=>{"use strict";Object.defineProperty($d,"__esModule",{value:!0});$d.create=xie;$d.default=void 0;var kie=Fo(Ld()),Pie=Fo(mie()),Gqe=Fo(Eie()),jqe=Fo(wie()),Yqe=Fo(YF()),qqe=Yd(),Die=La(),Jqe=Fo(bie()),Rie=Fo(Sie()),Wqe=Fo(a0()),zqe=Fo(xc()),oN=Fo(Ma());function Fo(t){return t&&t.__esModule?t:{default:t}}function ef(){return ef=Object.assign||function(t){for(var e=1;eObject.prototype.toString.call(t)==="[object Object]";function Vqe(t,e){let r=Object.keys(t.fields);return Object.keys(e).filter(i=>r.indexOf(i)===-1)}var _qe=(0,Rie.default)([]),P0=class extends oN.default{constructor(e){super({type:"object"});this.fields=Object.create(null),this._sortErrors=_qe,this._nodes=[],this._excludedEdges=[],this.withMutation(()=>{this.transform(function(i){if(typeof i=="string")try{i=JSON.parse(i)}catch(n){i=null}return this.isType(i)?i:null}),e&&this.shape(e)})}_typeCheck(e){return Fie(e)||typeof e=="function"}_cast(e,r={}){var i;let n=super._cast(e,r);if(n===void 0)return this.getDefault();if(!this._typeCheck(n))return n;let s=this.fields,o=(i=r.stripUnknown)!=null?i:this.spec.noUnknown,a=this._nodes.concat(Object.keys(n).filter(g=>this._nodes.indexOf(g)===-1)),l={},c=ef({},r,{parent:l,__validating:r.__validating||!1}),u=!1;for(let g of a){let f=s[g],h=(0,kie.default)(n,g);if(f){let p,d=n[g];c.path=(r.path?`${r.path}.`:"")+g,f=f.resolve({value:d,context:r.context,parent:l});let m="spec"in f?f.spec:void 0,E=m==null?void 0:m.strict;if(m==null?void 0:m.strip){u=u||g in n;continue}p=!r.__validating||!E?f.cast(n[g],c):n[g],p!==void 0&&(l[g]=p)}else h&&!o&&(l[g]=n[g]);l[g]!==n[g]&&(u=!0)}return u?l:n}_validate(e,r={},i){let n=[],{sync:s,from:o=[],originalValue:a=e,abortEarly:l=this.spec.abortEarly,recursive:c=this.spec.recursive}=r;o=[{schema:this,value:a},...o],r.__validating=!0,r.originalValue=a,r.from=o,super._validate(e,r,(u,g)=>{if(u){if(!zqe.default.isError(u)||l)return void i(u,g);n.push(u)}if(!c||!Fie(g)){i(n[0]||null,g);return}a=a||g;let f=this._nodes.map(h=>(p,d)=>{let m=h.indexOf(".")===-1?(r.path?`${r.path}.`:"")+h:`${r.path||""}["${h}"]`,E=this.fields[h];if(E&&"validate"in E){E.validate(g[h],ef({},r,{path:m,from:o,strict:!0,parent:g,originalValue:a[h]}),d);return}d(null)});(0,Wqe.default)({sync:s,tests:f,value:g,errors:n,endEarly:l,sort:this._sortErrors,path:r.path},i)})}clone(e){let r=super.clone(e);return r.fields=ef({},this.fields),r._nodes=this._nodes,r._excludedEdges=this._excludedEdges,r._sortErrors=this._sortErrors,r}concat(e){let r=super.concat(e),i=r.fields;for(let[n,s]of Object.entries(this.fields)){let o=i[n];o===void 0?i[n]=s:o instanceof oN.default&&s instanceof oN.default&&(i[n]=s.concat(o))}return r.withMutation(()=>r.shape(i))}getDefaultFromShape(){let e={};return this._nodes.forEach(r=>{let i=this.fields[r];e[r]="default"in i?i.getDefault():void 0}),e}_getDefault(){if("default"in this.spec)return super._getDefault();if(!!this._nodes.length)return this.getDefaultFromShape()}shape(e,r=[]){let i=this.clone(),n=Object.assign(i.fields,e);if(i.fields=n,i._sortErrors=(0,Rie.default)(Object.keys(n)),r.length){Array.isArray(r[0])||(r=[r]);let s=r.map(([o,a])=>`${o}-${a}`);i._excludedEdges=i._excludedEdges.concat(s)}return i._nodes=(0,Jqe.default)(n,i._excludedEdges),i}pick(e){let r={};for(let i of e)this.fields[i]&&(r[i]=this.fields[i]);return this.clone().withMutation(i=>(i.fields={},i.shape(r)))}omit(e){let r=this.clone(),i=r.fields;r.fields={};for(let n of e)delete i[n];return r.withMutation(()=>r.shape(i))}from(e,r,i){let n=(0,qqe.getter)(e,!0);return this.transform(s=>{if(s==null)return s;let o=s;return(0,kie.default)(s,e)&&(o=ef({},s),i||delete o[e],o[r]=n(s)),o})}noUnknown(e=!0,r=Die.object.noUnknown){typeof e=="string"&&(r=e,e=!0);let i=this.test({name:"noUnknown",exclusive:!0,message:r,test(n){if(n==null)return!0;let s=Vqe(this.schema,n);return!e||s.length===0||this.createError({params:{unknown:s.join(", ")}})}});return i.spec.noUnknown=e,i}unknown(e=!0,r=Die.object.noUnknown){return this.noUnknown(!e,r)}transformKeys(e){return this.transform(r=>r&&(0,jqe.default)(r,(i,n)=>e(n)))}camelCase(){return this.transformKeys(Gqe.default)}snakeCase(){return this.transformKeys(Pie.default)}constantCase(){return this.transformKeys(e=>(0,Pie.default)(e).toUpperCase())}describe(){let e=super.describe();return e.fields=(0,Yqe.default)(this.fields,r=>r.describe()),e}};$d.default=P0;function xie(t){return new P0(t)}xie.prototype=P0.prototype});var Tie=I(eC=>{"use strict";Object.defineProperty(eC,"__esModule",{value:!0});eC.create=Lie;eC.default=void 0;var aN=tf(Zg()),Xqe=tf(qg()),Zqe=tf(Nd()),AN=La(),$qe=tf(a0()),eJe=tf(xc()),tJe=tf(Ma());function tf(t){return t&&t.__esModule?t:{default:t}}function D0(){return D0=Object.assign||function(t){for(var e=1;e{this.transform(function(r){if(typeof r=="string")try{r=JSON.parse(r)}catch(i){r=null}return this.isType(r)?r:null})})}_typeCheck(e){return Array.isArray(e)}get _subType(){return this.innerType}_cast(e,r){let i=super._cast(e,r);if(!this._typeCheck(i)||!this.innerType)return i;let n=!1,s=i.map((o,a)=>{let l=this.innerType.cast(o,D0({},r,{path:`${r.path||""}[${a}]`}));return l!==o&&(n=!0),l});return n?s:i}_validate(e,r={},i){var n,s;let o=[],a=r.sync,l=r.path,c=this.innerType,u=(n=r.abortEarly)!=null?n:this.spec.abortEarly,g=(s=r.recursive)!=null?s:this.spec.recursive,f=r.originalValue!=null?r.originalValue:e;super._validate(e,r,(h,p)=>{if(h){if(!eJe.default.isError(h)||u)return void i(h,p);o.push(h)}if(!g||!c||!this._typeCheck(p)){i(o[0]||null,p);return}f=f||p;let d=new Array(p.length);for(let m=0;mc.validate(E,b,H)}(0,$qe.default)({sync:a,path:l,value:p,errors:o,endEarly:u,tests:d},i)})}clone(e){let r=super.clone(e);return r.innerType=this.innerType,r}concat(e){let r=super.concat(e);return r.innerType=this.innerType,e.innerType&&(r.innerType=r.innerType?r.innerType.concat(e.innerType):e.innerType),r}of(e){let r=this.clone();if(!(0,Xqe.default)(e))throw new TypeError("`array.of()` sub-schema must be a valid yup schema not: "+(0,Zqe.default)(e));return r.innerType=e,r}length(e,r=AN.array.length){return this.test({message:r,name:"length",exclusive:!0,params:{length:e},test(i){return(0,aN.default)(i)||i.length===this.resolve(e)}})}min(e,r){return r=r||AN.array.min,this.test({message:r,name:"min",exclusive:!0,params:{min:e},test(i){return(0,aN.default)(i)||i.length>=this.resolve(e)}})}max(e,r){return r=r||AN.array.max,this.test({message:r,name:"max",exclusive:!0,params:{max:e},test(i){return(0,aN.default)(i)||i.length<=this.resolve(e)}})}ensure(){return this.default(()=>[]).transform((e,r)=>this._typeCheck(e)?e:r==null?[]:[].concat(r))}compact(e){let r=e?(i,n,s)=>!e(i,n,s):i=>!!i;return this.transform(i=>i!=null?i.filter(r):i)}describe(){let e=super.describe();return this.innerType&&(e.innerType=this.innerType.describe()),e}nullable(e=!0){return super.nullable(e)}defined(){return super.defined()}required(e){return super.required(e)}};eC.default=R0;Lie.prototype=R0.prototype});var Mie=I(tC=>{"use strict";Object.defineProperty(tC,"__esModule",{value:!0});tC.create=rJe;tC.default=void 0;var nJe=iJe(qg());function iJe(t){return t&&t.__esModule?t:{default:t}}function rJe(t){return new lN(t)}var lN=class{constructor(e){this.type="lazy",this.__isYupSchema__=!0,this._resolve=(r,i={})=>{let n=this.builder(r,i);if(!(0,nJe.default)(n))throw new TypeError("lazy() functions must return a valid schema");return n.resolve(i)},this.builder=e}resolve(e){return this._resolve(e.value,e)}cast(e,r){return this._resolve(e,r).cast(e,r)}validate(e,r,i){return this._resolve(e,r).validate(e,r,i)}validateSync(e,r){return this._resolve(e,r).validateSync(e,r)}validateAt(e,r,i){return this._resolve(r,i).validateAt(e,r,i)}validateSyncAt(e,r,i){return this._resolve(r,i).validateSyncAt(e,r,i)}describe(){return null}isValid(e,r){return this._resolve(e,r).isValid(e,r)}isValidSync(e,r){return this._resolve(e,r).isValidSync(e,r)}},sJe=lN;tC.default=sJe});var Oie=I(cN=>{"use strict";Object.defineProperty(cN,"__esModule",{value:!0});cN.default=oJe;var AJe=aJe(La());function aJe(t){return t&&t.__esModule?t:{default:t}}function oJe(t){Object.keys(t).forEach(e=>{Object.keys(t[e]).forEach(r=>{AJe.default[e][r]=t[e][r]})})}});var gN=I(cr=>{"use strict";Object.defineProperty(cr,"__esModule",{value:!0});cr.addMethod=lJe;Object.defineProperty(cr,"MixedSchema",{enumerable:!0,get:function(){return Kie.default}});Object.defineProperty(cr,"mixed",{enumerable:!0,get:function(){return Kie.create}});Object.defineProperty(cr,"BooleanSchema",{enumerable:!0,get:function(){return uN.default}});Object.defineProperty(cr,"bool",{enumerable:!0,get:function(){return uN.create}});Object.defineProperty(cr,"boolean",{enumerable:!0,get:function(){return uN.create}});Object.defineProperty(cr,"StringSchema",{enumerable:!0,get:function(){return Uie.default}});Object.defineProperty(cr,"string",{enumerable:!0,get:function(){return Uie.create}});Object.defineProperty(cr,"NumberSchema",{enumerable:!0,get:function(){return Hie.default}});Object.defineProperty(cr,"number",{enumerable:!0,get:function(){return Hie.create}});Object.defineProperty(cr,"DateSchema",{enumerable:!0,get:function(){return Gie.default}});Object.defineProperty(cr,"date",{enumerable:!0,get:function(){return Gie.create}});Object.defineProperty(cr,"ObjectSchema",{enumerable:!0,get:function(){return jie.default}});Object.defineProperty(cr,"object",{enumerable:!0,get:function(){return jie.create}});Object.defineProperty(cr,"ArraySchema",{enumerable:!0,get:function(){return Yie.default}});Object.defineProperty(cr,"array",{enumerable:!0,get:function(){return Yie.create}});Object.defineProperty(cr,"ref",{enumerable:!0,get:function(){return cJe.create}});Object.defineProperty(cr,"lazy",{enumerable:!0,get:function(){return uJe.create}});Object.defineProperty(cr,"ValidationError",{enumerable:!0,get:function(){return gJe.default}});Object.defineProperty(cr,"reach",{enumerable:!0,get:function(){return fJe.default}});Object.defineProperty(cr,"isSchema",{enumerable:!0,get:function(){return qie.default}});Object.defineProperty(cr,"setLocale",{enumerable:!0,get:function(){return hJe.default}});Object.defineProperty(cr,"BaseSchema",{enumerable:!0,get:function(){return pJe.default}});var Kie=Nc(yre()),uN=Nc(vre()),Uie=Nc(kre()),Hie=Nc(Rre()),Gie=Nc(Tre()),jie=Nc(Nie()),Yie=Nc(Tie()),cJe=Dc(),uJe=Mie(),gJe=rC(xc()),fJe=rC(XF()),qie=rC(qg()),hJe=rC(Oie()),pJe=rC(Ma());function rC(t){return t&&t.__esModule?t:{default:t}}function Jie(){if(typeof WeakMap!="function")return null;var t=new WeakMap;return Jie=function(){return t},t}function Nc(t){if(t&&t.__esModule)return t;if(t===null||typeof t!="object"&&typeof t!="function")return{default:t};var e=Jie();if(e&&e.has(t))return e.get(t);var r={},i=Object.defineProperty&&Object.getOwnPropertyDescriptor;for(var n in t)if(Object.prototype.hasOwnProperty.call(t,n)){var s=i?Object.getOwnPropertyDescriptor(t,n):null;s&&(s.get||s.set)?Object.defineProperty(r,n,s):r[n]=t[n]}return r.default=t,e&&e.set(t,r),r}function lJe(t,e,r){if(!t||!(0,qie.default)(t.prototype))throw new TypeError("You must provide a yup schema constructor function");if(typeof e!="string")throw new TypeError("A Method name must be provided");if(typeof r!="function")throw new TypeError("Method function must be provided");t.prototype[e]=r}});var Xie=I((gCt,nC)=>{"use strict";var mJe=process.env.TERM_PROGRAM==="Hyper",IJe=process.platform==="win32",zie=process.platform==="linux",fN={ballotDisabled:"\u2612",ballotOff:"\u2610",ballotOn:"\u2611",bullet:"\u2022",bulletWhite:"\u25E6",fullBlock:"\u2588",heart:"\u2764",identicalTo:"\u2261",line:"\u2500",mark:"\u203B",middot:"\xB7",minus:"\uFF0D",multiplication:"\xD7",obelus:"\xF7",pencilDownRight:"\u270E",pencilRight:"\u270F",pencilUpRight:"\u2710",percent:"%",pilcrow2:"\u2761",pilcrow:"\xB6",plusMinus:"\xB1",section:"\xA7",starsOff:"\u2606",starsOn:"\u2605",upDownArrow:"\u2195"},Vie=Object.assign({},fN,{check:"\u221A",cross:"\xD7",ellipsisLarge:"...",ellipsis:"...",info:"i",question:"?",questionSmall:"?",pointer:">",pointerSmall:"\xBB",radioOff:"( )",radioOn:"(*)",warning:"\u203C"}),_ie=Object.assign({},fN,{ballotCross:"\u2718",check:"\u2714",cross:"\u2716",ellipsisLarge:"\u22EF",ellipsis:"\u2026",info:"\u2139",question:"?",questionFull:"\uFF1F",questionSmall:"\uFE56",pointer:zie?"\u25B8":"\u276F",pointerSmall:zie?"\u2023":"\u203A",radioOff:"\u25EF",radioOn:"\u25C9",warning:"\u26A0"});nC.exports=IJe&&!mJe?Vie:_ie;Reflect.defineProperty(nC.exports,"common",{enumerable:!1,value:fN});Reflect.defineProperty(nC.exports,"windows",{enumerable:!1,value:Vie});Reflect.defineProperty(nC.exports,"other",{enumerable:!1,value:_ie})});var js=I((fCt,hN)=>{"use strict";var EJe=t=>t!==null&&typeof t=="object"&&!Array.isArray(t),yJe=/[\u001b\u009b][[\]#;?()]*(?:(?:(?:[^\W_]*;?[^\W_]*)\u0007)|(?:(?:[0-9]{1,4}(;[0-9]{0,4})*)?[~0-9=<>cf-nqrtyA-PRZ]))/g,Zie=()=>{let t={enabled:!0,visible:!0,styles:{},keys:{}};"FORCE_COLOR"in process.env&&(t.enabled=process.env.FORCE_COLOR!=="0");let e=s=>{let o=s.open=`[${s.codes[0]}m`,a=s.close=`[${s.codes[1]}m`,l=s.regex=new RegExp(`\\u001b\\[${s.codes[1]}m`,"g");return s.wrap=(c,u)=>{c.includes(a)&&(c=c.replace(l,a+o));let g=o+c+a;return u?g.replace(/\r*\n/g,`${a}$&${o}`):g},s},r=(s,o,a)=>typeof s=="function"?s(o):s.wrap(o,a),i=(s,o)=>{if(s===""||s==null)return"";if(t.enabled===!1)return s;if(t.visible===!1)return"";let a=""+s,l=a.includes(` +`),c=o.length;for(c>0&&o.includes("unstyle")&&(o=[...new Set(["unstyle",...o])].reverse());c-- >0;)a=r(t.styles[o[c]],a,l);return a},n=(s,o,a)=>{t.styles[s]=e({name:s,codes:o}),(t.keys[a]||(t.keys[a]=[])).push(s),Reflect.defineProperty(t,s,{configurable:!0,enumerable:!0,set(c){t.alias(s,c)},get(){let c=u=>i(u,c.stack);return Reflect.setPrototypeOf(c,t),c.stack=this.stack?this.stack.concat(s):[s],c}})};return n("reset",[0,0],"modifier"),n("bold",[1,22],"modifier"),n("dim",[2,22],"modifier"),n("italic",[3,23],"modifier"),n("underline",[4,24],"modifier"),n("inverse",[7,27],"modifier"),n("hidden",[8,28],"modifier"),n("strikethrough",[9,29],"modifier"),n("black",[30,39],"color"),n("red",[31,39],"color"),n("green",[32,39],"color"),n("yellow",[33,39],"color"),n("blue",[34,39],"color"),n("magenta",[35,39],"color"),n("cyan",[36,39],"color"),n("white",[37,39],"color"),n("gray",[90,39],"color"),n("grey",[90,39],"color"),n("bgBlack",[40,49],"bg"),n("bgRed",[41,49],"bg"),n("bgGreen",[42,49],"bg"),n("bgYellow",[43,49],"bg"),n("bgBlue",[44,49],"bg"),n("bgMagenta",[45,49],"bg"),n("bgCyan",[46,49],"bg"),n("bgWhite",[47,49],"bg"),n("blackBright",[90,39],"bright"),n("redBright",[91,39],"bright"),n("greenBright",[92,39],"bright"),n("yellowBright",[93,39],"bright"),n("blueBright",[94,39],"bright"),n("magentaBright",[95,39],"bright"),n("cyanBright",[96,39],"bright"),n("whiteBright",[97,39],"bright"),n("bgBlackBright",[100,49],"bgBright"),n("bgRedBright",[101,49],"bgBright"),n("bgGreenBright",[102,49],"bgBright"),n("bgYellowBright",[103,49],"bgBright"),n("bgBlueBright",[104,49],"bgBright"),n("bgMagentaBright",[105,49],"bgBright"),n("bgCyanBright",[106,49],"bgBright"),n("bgWhiteBright",[107,49],"bgBright"),t.ansiRegex=yJe,t.hasColor=t.hasAnsi=s=>(t.ansiRegex.lastIndex=0,typeof s=="string"&&s!==""&&t.ansiRegex.test(s)),t.alias=(s,o)=>{let a=typeof o=="string"?t[o]:o;if(typeof a!="function")throw new TypeError("Expected alias to be the name of an existing color (string) or a function");a.stack||(Reflect.defineProperty(a,"name",{value:s}),t.styles[s]=a,a.stack=[s]),Reflect.defineProperty(t,s,{configurable:!0,enumerable:!0,set(l){t.alias(s,l)},get(){let l=c=>i(c,l.stack);return Reflect.setPrototypeOf(l,t),l.stack=this.stack?this.stack.concat(a.stack):a.stack,l}})},t.theme=s=>{if(!EJe(s))throw new TypeError("Expected theme to be an object");for(let o of Object.keys(s))t.alias(o,s[o]);return t},t.alias("unstyle",s=>typeof s=="string"&&s!==""?(t.ansiRegex.lastIndex=0,s.replace(t.ansiRegex,"")):""),t.alias("noop",s=>s),t.none=t.clear=t.noop,t.stripColor=t.unstyle,t.symbols=Xie(),t.define=n,t};hN.exports=Zie();hN.exports.create=Zie});var Mi=I(bt=>{"use strict";var wJe=Object.prototype.toString,Cs=js(),$ie=!1,pN=[],ene={yellow:"blue",cyan:"red",green:"magenta",black:"white",blue:"yellow",red:"cyan",magenta:"green",white:"black"};bt.longest=(t,e)=>t.reduce((r,i)=>Math.max(r,e?i[e].length:i.length),0);bt.hasColor=t=>!!t&&Cs.hasColor(t);var N0=bt.isObject=t=>t!==null&&typeof t=="object"&&!Array.isArray(t);bt.nativeType=t=>wJe.call(t).slice(8,-1).toLowerCase().replace(/\s/g,"");bt.isAsyncFn=t=>bt.nativeType(t)==="asyncfunction";bt.isPrimitive=t=>t!=null&&typeof t!="object"&&typeof t!="function";bt.resolve=(t,e,...r)=>typeof e=="function"?e.call(t,...r):e;bt.scrollDown=(t=[])=>[...t.slice(1),t[0]];bt.scrollUp=(t=[])=>[t.pop(),...t];bt.reorder=(t=[])=>{let e=t.slice();return e.sort((r,i)=>r.index>i.index?1:r.index{let i=t.length,n=r===i?0:r<0?i-1:r,s=t[e];t[e]=t[n],t[n]=s};bt.width=(t,e=80)=>{let r=t&&t.columns?t.columns:e;return t&&typeof t.getWindowSize=="function"&&(r=t.getWindowSize()[0]),process.platform==="win32"?r-1:r};bt.height=(t,e=20)=>{let r=t&&t.rows?t.rows:e;return t&&typeof t.getWindowSize=="function"&&(r=t.getWindowSize()[1]),r};bt.wordWrap=(t,e={})=>{if(!t)return t;typeof e=="number"&&(e={width:e});let{indent:r="",newline:i=` +`+r,width:n=80}=e;n-=((i+r).match(/[^\S\n]/g)||[]).length;let o=`.{1,${n}}([\\s\\u200B]+|$)|[^\\s\\u200B]+?([\\s\\u200B]+|$)`,a=t.trim(),l=new RegExp(o,"g"),c=a.match(l)||[];return c=c.map(u=>u.replace(/\n$/,"")),e.padEnd&&(c=c.map(u=>u.padEnd(n," "))),e.padStart&&(c=c.map(u=>u.padStart(n," "))),r+c.join(i)};bt.unmute=t=>{let e=t.stack.find(i=>Cs.keys.color.includes(i));return e?Cs[e]:t.stack.find(i=>i.slice(2)==="bg")?Cs[e.slice(2)]:i=>i};bt.pascal=t=>t?t[0].toUpperCase()+t.slice(1):"";bt.inverse=t=>{if(!t||!t.stack)return t;let e=t.stack.find(i=>Cs.keys.color.includes(i));if(e){let i=Cs["bg"+bt.pascal(e)];return i?i.black:t}let r=t.stack.find(i=>i.slice(0,2)==="bg");return r?Cs[r.slice(2).toLowerCase()]||t:Cs.none};bt.complement=t=>{if(!t||!t.stack)return t;let e=t.stack.find(i=>Cs.keys.color.includes(i)),r=t.stack.find(i=>i.slice(0,2)==="bg");if(e&&!r)return Cs[ene[e]||e];if(r){let i=r.slice(2).toLowerCase(),n=ene[i];return n&&Cs["bg"+bt.pascal(n)]||t}return Cs.none};bt.meridiem=t=>{let e=t.getHours(),r=t.getMinutes(),i=e>=12?"pm":"am";e=e%12;let n=e===0?12:e,s=r<10?"0"+r:r;return n+":"+s+" "+i};bt.set=(t={},e="",r)=>e.split(".").reduce((i,n,s,o)=>{let a=o.length-1>s?i[n]||{}:r;return!bt.isObject(a)&&s{let i=t[e]==null?e.split(".").reduce((n,s)=>n&&n[s],t):t[e];return i==null?r:i};bt.mixin=(t,e)=>{if(!N0(t))return e;if(!N0(e))return t;for(let r of Object.keys(e)){let i=Object.getOwnPropertyDescriptor(e,r);if(i.hasOwnProperty("value"))if(t.hasOwnProperty(r)&&N0(i.value)){let n=Object.getOwnPropertyDescriptor(t,r);N0(n.value)?t[r]=bt.merge({},t[r],e[r]):Reflect.defineProperty(t,r,i)}else Reflect.defineProperty(t,r,i);else Reflect.defineProperty(t,r,i)}return t};bt.merge=(...t)=>{let e={};for(let r of t)bt.mixin(e,r);return e};bt.mixinEmitter=(t,e)=>{let r=e.constructor.prototype;for(let i of Object.keys(r)){let n=r[i];typeof n=="function"?bt.define(t,i,n.bind(e)):bt.define(t,i,n)}};bt.onExit=t=>{let e=(r,i)=>{$ie||($ie=!0,pN.forEach(n=>n()),r===!0&&process.exit(128+i))};pN.length===0&&(process.once("SIGTERM",e.bind(null,!0,15)),process.once("SIGINT",e.bind(null,!0,2)),process.once("exit",e)),pN.push(t)};bt.define=(t,e,r)=>{Reflect.defineProperty(t,e,{value:r})};bt.defineExport=(t,e,r)=>{let i;Reflect.defineProperty(t,e,{enumerable:!0,configurable:!0,set(n){i=n},get(){return i?i():r()}})}});var tne=I(nf=>{"use strict";nf.ctrl={a:"first",b:"backward",c:"cancel",d:"deleteForward",e:"last",f:"forward",g:"reset",i:"tab",k:"cutForward",l:"reset",n:"newItem",m:"cancel",j:"submit",p:"search",r:"remove",s:"save",u:"undo",w:"cutLeft",x:"toggleCursor",v:"paste"};nf.shift={up:"shiftUp",down:"shiftDown",left:"shiftLeft",right:"shiftRight",tab:"prev"};nf.fn={up:"pageUp",down:"pageDown",left:"pageLeft",right:"pageRight",delete:"deleteForward"};nf.option={b:"backward",f:"forward",d:"cutRight",left:"cutLeft",up:"altUp",down:"altDown"};nf.keys={pageup:"pageUp",pagedown:"pageDown",home:"home",end:"end",cancel:"cancel",delete:"deleteForward",backspace:"delete",down:"down",enter:"submit",escape:"cancel",left:"left",space:"space",number:"number",return:"submit",right:"right",tab:"next",up:"up"}});var nne=I((dCt,rne)=>{"use strict";var ine=require("readline"),BJe=tne(),QJe=/^(?:\x1b)([a-zA-Z0-9])$/,bJe=/^(?:\x1b+)(O|N|\[|\[\[)(?:(\d+)(?:;(\d+))?([~^$])|(?:1;)?(\d+)?([a-zA-Z]))/,vJe={OP:"f1",OQ:"f2",OR:"f3",OS:"f4","[11~":"f1","[12~":"f2","[13~":"f3","[14~":"f4","[[A":"f1","[[B":"f2","[[C":"f3","[[D":"f4","[[E":"f5","[15~":"f5","[17~":"f6","[18~":"f7","[19~":"f8","[20~":"f9","[21~":"f10","[23~":"f11","[24~":"f12","[A":"up","[B":"down","[C":"right","[D":"left","[E":"clear","[F":"end","[H":"home",OA:"up",OB:"down",OC:"right",OD:"left",OE:"clear",OF:"end",OH:"home","[1~":"home","[2~":"insert","[3~":"delete","[4~":"end","[5~":"pageup","[6~":"pagedown","[[5~":"pageup","[[6~":"pagedown","[7~":"home","[8~":"end","[a":"up","[b":"down","[c":"right","[d":"left","[e":"clear","[2$":"insert","[3$":"delete","[5$":"pageup","[6$":"pagedown","[7$":"home","[8$":"end",Oa:"up",Ob:"down",Oc:"right",Od:"left",Oe:"clear","[2^":"insert","[3^":"delete","[5^":"pageup","[6^":"pagedown","[7^":"home","[8^":"end","[Z":"tab"};function SJe(t){return["[a","[b","[c","[d","[e","[2$","[3$","[5$","[6$","[7$","[8$","[Z"].includes(t)}function xJe(t){return["Oa","Ob","Oc","Od","Oe","[2^","[3^","[5^","[6^","[7^","[8^"].includes(t)}var L0=(t="",e={})=>{let r,i=P({name:e.name,ctrl:!1,meta:!1,shift:!1,option:!1,sequence:t,raw:t},e);if(Buffer.isBuffer(t)?t[0]>127&&t[1]===void 0?(t[0]-=128,t=""+String(t)):t=String(t):t!==void 0&&typeof t!="string"?t=String(t):t||(t=i.sequence||""),i.sequence=i.sequence||t||i.name,t==="\r")i.raw=void 0,i.name="return";else if(t===` +`)i.name="enter";else if(t===" ")i.name="tab";else if(t==="\b"||t==="\x7F"||t==="\x7F"||t==="\b")i.name="backspace",i.meta=t.charAt(0)==="";else if(t===""||t==="")i.name="escape",i.meta=t.length===2;else if(t===" "||t===" ")i.name="space",i.meta=t.length===2;else if(t<="")i.name=String.fromCharCode(t.charCodeAt(0)+"a".charCodeAt(0)-1),i.ctrl=!0;else if(t.length===1&&t>="0"&&t<="9")i.name="number";else if(t.length===1&&t>="a"&&t<="z")i.name=t;else if(t.length===1&&t>="A"&&t<="Z")i.name=t.toLowerCase(),i.shift=!0;else if(r=QJe.exec(t))i.meta=!0,i.shift=/^[A-Z]$/.test(r[1]);else if(r=bJe.exec(t)){let n=[...t];n[0]===""&&n[1]===""&&(i.option=!0);let s=[r[1],r[2],r[4],r[6]].filter(Boolean).join(""),o=(r[3]||r[5]||1)-1;i.ctrl=!!(o&4),i.meta=!!(o&10),i.shift=!!(o&1),i.code=s,i.name=vJe[s],i.shift=SJe(s)||i.shift,i.ctrl=xJe(s)||i.ctrl}return i};L0.listen=(t={},e)=>{let{stdin:r}=t;if(!r||r!==process.stdin&&!r.isTTY)throw new Error("Invalid stream passed");let i=ine.createInterface({terminal:!0,input:r});ine.emitKeypressEvents(r,i);let n=(a,l)=>e(a,L0(a,l),i),s=r.isRaw;return r.isTTY&&r.setRawMode(!0),r.on("keypress",n),i.resume(),()=>{r.isTTY&&r.setRawMode(s),r.removeListener("keypress",n),i.pause(),i.close()}};L0.action=(t,e,r)=>{let i=P(P({},BJe),r);return e.ctrl?(e.action=i.ctrl[e.name],e):e.option&&i.option?(e.action=i.option[e.name],e):e.shift?(e.action=i.shift[e.name],e):(e.action=i.keys[e.name],e)};rne.exports=L0});var one=I((CCt,sne)=>{"use strict";sne.exports=t=>{t.timers=t.timers||{};let e=t.options.timers;if(!!e)for(let r of Object.keys(e)){let i=e[r];typeof i=="number"&&(i={interval:i}),kJe(t,r,i)}};function kJe(t,e,r={}){let i=t.timers[e]={name:e,start:Date.now(),ms:0,tick:0},n=r.interval||120;i.frames=r.frames||[],i.loading=!0;let s=setInterval(()=>{i.ms=Date.now()-i.start,i.tick++,t.render()},n);return i.stop=()=>{i.loading=!1,clearInterval(s)},Reflect.defineProperty(i,"interval",{value:s}),t.once("close",()=>i.stop()),i.stop}});var lne=I((mCt,ane)=>{"use strict";var{define:PJe,width:DJe}=Mi(),Ane=class{constructor(e){let r=e.options;PJe(this,"_prompt",e),this.type=e.type,this.name=e.name,this.message="",this.header="",this.footer="",this.error="",this.hint="",this.input="",this.cursor=0,this.index=0,this.lines=0,this.tick=0,this.prompt="",this.buffer="",this.width=DJe(r.stdout||process.stdout),Object.assign(this,r),this.name=this.name||this.message,this.message=this.message||this.name,this.symbols=e.symbols,this.styles=e.styles,this.required=new Set,this.cancelled=!1,this.submitted=!1}clone(){let e=P({},this);return e.status=this.status,e.buffer=Buffer.from(e.buffer),delete e.clone,e}set color(e){this._color=e}get color(){let e=this.prompt.styles;if(this.cancelled)return e.cancelled;if(this.submitted)return e.submitted;let r=this._color||e[this.status];return typeof r=="function"?r:e.pending}set loading(e){this._loading=e}get loading(){return typeof this._loading=="boolean"?this._loading:this.loadingChoices?"choices":!1}get status(){return this.cancelled?"cancelled":this.submitted?"submitted":"pending"}};ane.exports=Ane});var une=I((ICt,cne)=>{"use strict";var dN=Mi(),yi=js(),CN={default:yi.noop,noop:yi.noop,set inverse(t){this._inverse=t},get inverse(){return this._inverse||dN.inverse(this.primary)},set complement(t){this._complement=t},get complement(){return this._complement||dN.complement(this.primary)},primary:yi.cyan,success:yi.green,danger:yi.magenta,strong:yi.bold,warning:yi.yellow,muted:yi.dim,disabled:yi.gray,dark:yi.dim.gray,underline:yi.underline,set info(t){this._info=t},get info(){return this._info||this.primary},set em(t){this._em=t},get em(){return this._em||this.primary.underline},set heading(t){this._heading=t},get heading(){return this._heading||this.muted.underline},set pending(t){this._pending=t},get pending(){return this._pending||this.primary},set submitted(t){this._submitted=t},get submitted(){return this._submitted||this.success},set cancelled(t){this._cancelled=t},get cancelled(){return this._cancelled||this.danger},set typing(t){this._typing=t},get typing(){return this._typing||this.dim},set placeholder(t){this._placeholder=t},get placeholder(){return this._placeholder||this.primary.dim},set highlight(t){this._highlight=t},get highlight(){return this._highlight||this.inverse}};CN.merge=(t={})=>{t.styles&&typeof t.styles.enabled=="boolean"&&(yi.enabled=t.styles.enabled),t.styles&&typeof t.styles.visible=="boolean"&&(yi.visible=t.styles.visible);let e=dN.merge({},CN,t.styles);delete e.merge;for(let r of Object.keys(yi))e.hasOwnProperty(r)||Reflect.defineProperty(e,r,{get:()=>yi[r]});for(let r of Object.keys(yi.styles))e.hasOwnProperty(r)||Reflect.defineProperty(e,r,{get:()=>yi[r]});return e};cne.exports=CN});var fne=I((ECt,gne)=>{"use strict";var mN=process.platform==="win32",Ka=js(),RJe=Mi(),IN=_(P({},Ka.symbols),{upDownDoubleArrow:"\u21D5",upDownDoubleArrow2:"\u2B0D",upDownArrow:"\u2195",asterisk:"*",asterism:"\u2042",bulletWhite:"\u25E6",electricArrow:"\u2301",ellipsisLarge:"\u22EF",ellipsisSmall:"\u2026",fullBlock:"\u2588",identicalTo:"\u2261",indicator:Ka.symbols.check,leftAngle:"\u2039",mark:"\u203B",minus:"\u2212",multiplication:"\xD7",obelus:"\xF7",percent:"%",pilcrow:"\xB6",pilcrow2:"\u2761",pencilUpRight:"\u2710",pencilDownRight:"\u270E",pencilRight:"\u270F",plus:"+",plusMinus:"\xB1",pointRight:"\u261E",rightAngle:"\u203A",section:"\xA7",hexagon:{off:"\u2B21",on:"\u2B22",disabled:"\u2B22"},ballot:{on:"\u2611",off:"\u2610",disabled:"\u2612"},stars:{on:"\u2605",off:"\u2606",disabled:"\u2606"},folder:{on:"\u25BC",off:"\u25B6",disabled:"\u25B6"},prefix:{pending:Ka.symbols.question,submitted:Ka.symbols.check,cancelled:Ka.symbols.cross},separator:{pending:Ka.symbols.pointerSmall,submitted:Ka.symbols.middot,cancelled:Ka.symbols.middot},radio:{off:mN?"( )":"\u25EF",on:mN?"(*)":"\u25C9",disabled:mN?"(|)":"\u24BE"},numbers:["\u24EA","\u2460","\u2461","\u2462","\u2463","\u2464","\u2465","\u2466","\u2467","\u2468","\u2469","\u246A","\u246B","\u246C","\u246D","\u246E","\u246F","\u2470","\u2471","\u2472","\u2473","\u3251","\u3252","\u3253","\u3254","\u3255","\u3256","\u3257","\u3258","\u3259","\u325A","\u325B","\u325C","\u325D","\u325E","\u325F","\u32B1","\u32B2","\u32B3","\u32B4","\u32B5","\u32B6","\u32B7","\u32B8","\u32B9","\u32BA","\u32BB","\u32BC","\u32BD","\u32BE","\u32BF"]});IN.merge=t=>{let e=RJe.merge({},Ka.symbols,IN,t.symbols);return delete e.merge,e};gne.exports=IN});var pne=I((yCt,hne)=>{"use strict";var FJe=une(),NJe=fne(),LJe=Mi();hne.exports=t=>{t.options=LJe.merge({},t.options.theme,t.options),t.symbols=NJe.merge(t.options),t.styles=FJe.merge(t.options)}});var Ene=I((dne,Cne)=>{"use strict";var mne=process.env.TERM_PROGRAM==="Apple_Terminal",TJe=js(),EN=Mi(),Ys=Cne.exports=dne,Er="[",Ine="\x07",yN=!1,HA=Ys.code={bell:Ine,beep:Ine,beginning:`${Er}G`,down:`${Er}J`,esc:Er,getPosition:`${Er}6n`,hide:`${Er}?25l`,line:`${Er}2K`,lineEnd:`${Er}K`,lineStart:`${Er}1K`,restorePosition:Er+(mne?"8":"u"),savePosition:Er+(mne?"7":"s"),screen:`${Er}2J`,show:`${Er}?25h`,up:`${Er}1J`},Lc=Ys.cursor={get hidden(){return yN},hide(){return yN=!0,HA.hide},show(){return yN=!1,HA.show},forward:(t=1)=>`${Er}${t}C`,backward:(t=1)=>`${Er}${t}D`,nextLine:(t=1)=>`${Er}E`.repeat(t),prevLine:(t=1)=>`${Er}F`.repeat(t),up:(t=1)=>t?`${Er}${t}A`:"",down:(t=1)=>t?`${Er}${t}B`:"",right:(t=1)=>t?`${Er}${t}C`:"",left:(t=1)=>t?`${Er}${t}D`:"",to(t,e){return e?`${Er}${e+1};${t+1}H`:`${Er}${t+1}G`},move(t=0,e=0){let r="";return r+=t<0?Lc.left(-t):t>0?Lc.right(t):"",r+=e<0?Lc.up(-e):e>0?Lc.down(e):"",r},restore(t={}){let{after:e,cursor:r,initial:i,input:n,prompt:s,size:o,value:a}=t;if(i=EN.isPrimitive(i)?String(i):"",n=EN.isPrimitive(n)?String(n):"",a=EN.isPrimitive(a)?String(a):"",o){let l=Ys.cursor.up(o)+Ys.cursor.to(s.length),c=n.length-r;return c>0&&(l+=Ys.cursor.left(c)),l}if(a||e){let l=!n&&!!i?-i.length:-n.length+r;return e&&(l-=e.length),n===""&&i&&!s.includes(i)&&(l+=i.length),Ys.cursor.move(l)}}},wN=Ys.erase={screen:HA.screen,up:HA.up,down:HA.down,line:HA.line,lineEnd:HA.lineEnd,lineStart:HA.lineStart,lines(t){let e="";for(let r=0;r{if(!e)return wN.line+Lc.to(0);let r=s=>[...TJe.unstyle(s)].length,i=t.split(/\r?\n/),n=0;for(let s of i)n+=1+Math.floor(Math.max(r(s)-1,0)/e);return(wN.line+Lc.prevLine()).repeat(n-1)+wN.line+Lc.to(0)}});var sf=I((wCt,yne)=>{"use strict";var MJe=require("events"),wne=js(),BN=nne(),OJe=one(),KJe=lne(),UJe=pne(),bn=Mi(),Tc=Ene(),T0=class extends MJe{constructor(e={}){super();this.name=e.name,this.type=e.type,this.options=e,UJe(this),OJe(this),this.state=new KJe(this),this.initial=[e.initial,e.default].find(r=>r!=null),this.stdout=e.stdout||process.stdout,this.stdin=e.stdin||process.stdin,this.scale=e.scale||1,this.term=this.options.term||process.env.TERM_PROGRAM,this.margin=GJe(this.options.margin),this.setMaxListeners(0),HJe(this)}async keypress(e,r={}){this.keypressed=!0;let i=BN.action(e,BN(e,r),this.options.actions);this.state.keypress=i,this.emit("keypress",e,i),this.emit("state",this.state.clone());let n=this.options[i.action]||this[i.action]||this.dispatch;if(typeof n=="function")return await n.call(this,e,i);this.alert()}alert(){delete this.state.alert,this.options.show===!1?this.emit("alert"):this.stdout.write(Tc.code.beep)}cursorHide(){this.stdout.write(Tc.cursor.hide()),bn.onExit(()=>this.cursorShow())}cursorShow(){this.stdout.write(Tc.cursor.show())}write(e){!e||(this.stdout&&this.state.show!==!1&&this.stdout.write(e),this.state.buffer+=e)}clear(e=0){let r=this.state.buffer;this.state.buffer="",!(!r&&!e||this.options.show===!1)&&this.stdout.write(Tc.cursor.down(e)+Tc.clear(r,this.width))}restore(){if(this.state.closed||this.options.show===!1)return;let{prompt:e,after:r,rest:i}=this.sections(),{cursor:n,initial:s="",input:o="",value:a=""}=this,l=this.state.size=i.length,c={after:r,cursor:n,initial:s,input:o,prompt:e,size:l,value:a},u=Tc.cursor.restore(c);u&&this.stdout.write(u)}sections(){let{buffer:e,input:r,prompt:i}=this.state;i=wne.unstyle(i);let n=wne.unstyle(e),s=n.indexOf(i),o=n.slice(0,s),l=n.slice(s).split(` +`),c=l[0],u=l[l.length-1],f=(i+(r?" "+r:"")).length,h=fe.call(this,this.value),this.result=()=>i.call(this,this.value),typeof r.initial=="function"&&(this.initial=await r.initial.call(this,this)),typeof r.onRun=="function"&&await r.onRun.call(this,this),typeof r.onSubmit=="function"){let n=r.onSubmit.bind(this),s=this.submit.bind(this);delete this.options.onSubmit,this.submit=async()=>(await n(this.name,this.value,this),s())}await this.start(),await this.render()}render(){throw new Error("expected prompt to have a custom render method")}run(){return new Promise(async(e,r)=>{if(this.once("submit",e),this.once("cancel",r),await this.skip())return this.render=()=>{},this.submit();await this.initialize(),this.emit("run")})}async element(e,r,i){let{options:n,state:s,symbols:o,timers:a}=this,l=a&&a[e];s.timer=l;let c=n[e]||s[e]||o[e],u=r&&r[e]!=null?r[e]:await c;if(u==="")return u;let g=await this.resolve(u,s,r,i);return!g&&r&&r[e]?this.resolve(c,s,r,i):g}async prefix(){let e=await this.element("prefix")||this.symbols,r=this.timers&&this.timers.prefix,i=this.state;return i.timer=r,bn.isObject(e)&&(e=e[i.status]||e.pending),bn.hasColor(e)?e:(this.styles[i.status]||this.styles.pending)(e)}async message(){let e=await this.element("message");return bn.hasColor(e)?e:this.styles.strong(e)}async separator(){let e=await this.element("separator")||this.symbols,r=this.timers&&this.timers.separator,i=this.state;i.timer=r;let n=e[i.status]||e.pending||i.separator,s=await this.resolve(n,i);return bn.isObject(s)&&(s=s[i.status]||s.pending),bn.hasColor(s)?s:this.styles.muted(s)}async pointer(e,r){let i=await this.element("pointer",e,r);if(typeof i=="string"&&bn.hasColor(i))return i;if(i){let n=this.styles,s=this.index===r,o=s?n.primary:c=>c,a=await this.resolve(i[s?"on":"off"]||i,this.state),l=bn.hasColor(a)?a:o(a);return s?l:" ".repeat(a.length)}}async indicator(e,r){let i=await this.element("indicator",e,r);if(typeof i=="string"&&bn.hasColor(i))return i;if(i){let n=this.styles,s=e.enabled===!0,o=s?n.success:n.dark,a=i[s?"on":"off"]||i;return bn.hasColor(a)?a:o(a)}return""}body(){return null}footer(){if(this.state.status==="pending")return this.element("footer")}header(){if(this.state.status==="pending")return this.element("header")}async hint(){if(this.state.status==="pending"&&!this.isValue(this.state.input)){let e=await this.element("hint");return bn.hasColor(e)?e:this.styles.muted(e)}}error(e){return this.state.submitted?"":e||this.state.error}format(e){return e}result(e){return e}validate(e){return this.options.required===!0?this.isValue(e):!0}isValue(e){return e!=null&&e!==""}resolve(e,...r){return bn.resolve(this,e,...r)}get base(){return T0.prototype}get style(){return this.styles[this.state.status]}get height(){return this.options.rows||bn.height(this.stdout,25)}get width(){return this.options.columns||bn.width(this.stdout,80)}get size(){return{width:this.width,height:this.height}}set cursor(e){this.state.cursor=e}get cursor(){return this.state.cursor}set input(e){this.state.input=e}get input(){return this.state.input}set value(e){this.state.value=e}get value(){let{input:e,value:r}=this.state,i=[r,e].find(this.isValue.bind(this));return this.isValue(i)?i:this.initial}static get prompt(){return e=>new this(e).run()}};function HJe(t){let e=n=>t[n]===void 0||typeof t[n]=="function",r=["actions","choices","initial","margin","roles","styles","symbols","theme","timers","value"],i=["body","footer","error","header","hint","indicator","message","prefix","separator","skip"];for(let n of Object.keys(t.options)){if(r.includes(n)||/^on[A-Z]/.test(n))continue;let s=t.options[n];typeof s=="function"&&e(n)?i.includes(n)||(t[n]=s.bind(t)):typeof t[n]!="function"&&(t[n]=s)}}function GJe(t){typeof t=="number"&&(t=[t,t,t,t]);let e=[].concat(t||[]),r=n=>n%2==0?` +`:" ",i=[];for(let n=0;n<4;n++){let s=r(n);e[n]?i.push(s.repeat(e[n])):i.push("")}return i}yne.exports=T0});var bne=I((BCt,Bne)=>{"use strict";var jJe=Mi(),Qne={default(t,e){return e},checkbox(t,e){throw new Error("checkbox role is not implemented yet")},editable(t,e){throw new Error("editable role is not implemented yet")},expandable(t,e){throw new Error("expandable role is not implemented yet")},heading(t,e){return e.disabled="",e.indicator=[e.indicator," "].find(r=>r!=null),e.message=e.message||"",e},input(t,e){throw new Error("input role is not implemented yet")},option(t,e){return Qne.default(t,e)},radio(t,e){throw new Error("radio role is not implemented yet")},separator(t,e){return e.disabled="",e.indicator=[e.indicator," "].find(r=>r!=null),e.message=e.message||t.symbols.line.repeat(5),e},spacer(t,e){return e}};Bne.exports=(t,e={})=>{let r=jJe.merge({},Qne,e.roles);return r[t]||r.default}});var sC=I((QCt,vne)=>{"use strict";var YJe=js(),qJe=sf(),JJe=bne(),M0=Mi(),{reorder:QN,scrollUp:WJe,scrollDown:zJe,isObject:Sne,swap:VJe}=M0,xne=class extends qJe{constructor(e){super(e);this.cursorHide(),this.maxSelected=e.maxSelected||Infinity,this.multiple=e.multiple||!1,this.initial=e.initial||0,this.delay=e.delay||0,this.longest=0,this.num=""}async initialize(){typeof this.options.initial=="function"&&(this.initial=await this.options.initial.call(this)),await this.reset(!0),await super.initialize()}async reset(){let{choices:e,initial:r,autofocus:i,suggest:n}=this.options;if(this.state._choices=[],this.state.choices=[],this.choices=await Promise.all(await this.toChoices(e)),this.choices.forEach(s=>s.enabled=!1),typeof n!="function"&&this.selectable.length===0)throw new Error("At least one choice must be selectable");Sne(r)&&(r=Object.keys(r)),Array.isArray(r)?(i!=null&&(this.index=this.findIndex(i)),r.forEach(s=>this.enable(this.find(s))),await this.render()):(i!=null&&(r=i),typeof r=="string"&&(r=this.findIndex(r)),typeof r=="number"&&r>-1&&(this.index=Math.max(0,Math.min(r,this.choices.length)),this.enable(this.find(this.index)))),this.isDisabled(this.focused)&&await this.down()}async toChoices(e,r){this.state.loadingChoices=!0;let i=[],n=0,s=async(o,a)=>{typeof o=="function"&&(o=await o.call(this)),o instanceof Promise&&(o=await o);for(let l=0;l(this.state.loadingChoices=!1,o))}async toChoice(e,r,i){if(typeof e=="function"&&(e=await e.call(this,this)),e instanceof Promise&&(e=await e),typeof e=="string"&&(e={name:e}),e.normalized)return e;e.normalized=!0;let n=e.value;if(e=JJe(e.role,this.options)(this,e),typeof e.disabled=="string"&&!e.hint&&(e.hint=e.disabled,e.disabled=!0),e.disabled===!0&&e.hint==null&&(e.hint="(disabled)"),e.index!=null)return e;e.name=e.name||e.key||e.title||e.value||e.message,e.message=e.message||e.name||"",e.value=[e.value,e.name].find(this.isValue.bind(this)),e.input="",e.index=r,e.cursor=0,M0.define(e,"parent",i),e.level=i?i.level+1:1,e.indent==null&&(e.indent=i?i.indent+" ":e.indent||""),e.path=i?i.path+"."+e.name:e.name,e.enabled=!!(this.multiple&&!this.isDisabled(e)&&(e.enabled||this.isSelected(e))),this.isDisabled(e)||(this.longest=Math.max(this.longest,YJe.unstyle(e.message).length));let o=P({},e);return e.reset=(a=o.input,l=o.value)=>{for(let c of Object.keys(o))e[c]=o[c];e.input=a,e.value=l},n==null&&typeof e.initial=="function"&&(e.input=await e.initial.call(this,this.state,e,r)),e}async onChoice(e,r){this.emit("choice",e,r,this),typeof e.onChoice=="function"&&await e.onChoice.call(this,this.state,e,r)}async addChoice(e,r,i){let n=await this.toChoice(e,r,i);return this.choices.push(n),this.index=this.choices.length-1,this.limit=this.choices.length,n}async newItem(e,r,i){let n=P({name:"New choice name?",editable:!0,newChoice:!0},e),s=await this.addChoice(n,r,i);return s.updateChoice=()=>{delete s.newChoice,s.name=s.message=s.input,s.input="",s.cursor=0},this.render()}indent(e){return e.indent==null?e.level>1?" ".repeat(e.level-1):"":e.indent}dispatch(e,r){if(this.multiple&&this[r.name])return this[r.name]();this.alert()}focus(e,r){return typeof r!="boolean"&&(r=e.enabled),r&&!e.enabled&&this.selected.length>=this.maxSelected?this.alert():(this.index=e.index,e.enabled=r&&!this.isDisabled(e),e)}space(){return this.multiple?(this.toggle(this.focused),this.render()):this.alert()}a(){if(this.maxSelectedr.enabled);return this.choices.forEach(r=>r.enabled=!e),this.render()}i(){return this.choices.length-this.selected.length>this.maxSelected?this.alert():(this.choices.forEach(e=>e.enabled=!e.enabled),this.render())}g(e=this.focused){return this.choices.some(r=>!!r.parent)?(this.toggle(e.parent&&!e.choices?e.parent:e),this.render()):this.a()}toggle(e,r){if(!e.enabled&&this.selected.length>=this.maxSelected)return this.alert();typeof r!="boolean"&&(r=!e.enabled),e.enabled=r,e.choices&&e.choices.forEach(n=>this.toggle(n,r));let i=e.parent;for(;i;){let n=i.choices.filter(s=>this.isDisabled(s));i.enabled=n.every(s=>s.enabled===!0),i=i.parent}return kne(this,this.choices),this.emit("toggle",e,this),e}enable(e){return this.selected.length>=this.maxSelected?this.alert():(e.enabled=!this.isDisabled(e),e.choices&&e.choices.forEach(this.enable.bind(this)),e)}disable(e){return e.enabled=!1,e.choices&&e.choices.forEach(this.disable.bind(this)),e}number(e){this.num+=e;let r=i=>{let n=Number(i);if(n>this.choices.length-1)return this.alert();let s=this.focused,o=this.choices.find(a=>n===a.index);if(!o.enabled&&this.selected.length>=this.maxSelected)return this.alert();if(this.visible.indexOf(o)===-1){let a=QN(this.choices),l=a.indexOf(o);if(s.index>l){let c=a.slice(l,l+this.limit),u=a.filter(g=>!c.includes(g));this.choices=c.concat(u)}else{let c=l-this.limit+1;this.choices=a.slice(c).concat(a.slice(0,c))}}return this.index=this.choices.indexOf(o),this.toggle(this.focused),this.render()};return clearTimeout(this.numberTimeout),new Promise(i=>{let n=this.choices.length,s=this.num,o=(a=!1,l)=>{clearTimeout(this.numberTimeout),a&&(l=r(s)),this.num="",i(l)};if(s==="0"||s.length===1&&Number(s+"0")>n)return o(!0);if(Number(s)>n)return o(!1,this.alert());this.numberTimeout=setTimeout(()=>o(!0),this.delay)})}home(){return this.choices=QN(this.choices),this.index=0,this.render()}end(){let e=this.choices.length-this.limit,r=QN(this.choices);return this.choices=r.slice(e).concat(r.slice(0,e)),this.index=this.limit-1,this.render()}first(){return this.index=0,this.render()}last(){return this.index=this.visible.length-1,this.render()}prev(){return this.visible.length<=1?this.alert():this.up()}next(){return this.visible.length<=1?this.alert():this.down()}right(){return this.cursor>=this.input.length?this.alert():(this.cursor++,this.render())}left(){return this.cursor<=0?this.alert():(this.cursor--,this.render())}up(){let e=this.choices.length,r=this.visible.length,i=this.index;return this.options.scroll===!1&&i===0?this.alert():e>r&&i===0?this.scrollUp():(this.index=(i-1%e+e)%e,this.isDisabled()?this.up():this.render())}down(){let e=this.choices.length,r=this.visible.length,i=this.index;return this.options.scroll===!1&&i===r-1?this.alert():e>r&&i===r-1?this.scrollDown():(this.index=(i+1)%e,this.isDisabled()?this.down():this.render())}scrollUp(e=0){return this.choices=WJe(this.choices),this.index=e,this.isDisabled()?this.up():this.render()}scrollDown(e=this.visible.length-1){return this.choices=zJe(this.choices),this.index=e,this.isDisabled()?this.down():this.render()}async shiftUp(){if(this.options.sort===!0){this.sorting=!0,this.swap(this.index-1),await this.up(),this.sorting=!1;return}return this.scrollUp(this.index)}async shiftDown(){if(this.options.sort===!0){this.sorting=!0,this.swap(this.index+1),await this.down(),this.sorting=!1;return}return this.scrollDown(this.index)}pageUp(){return this.visible.length<=1?this.alert():(this.limit=Math.max(this.limit-1,0),this.index=Math.min(this.limit-1,this.index),this._limit=this.limit,this.isDisabled()?this.up():this.render())}pageDown(){return this.visible.length>=this.choices.length?this.alert():(this.index=Math.max(0,this.index),this.limit=Math.min(this.limit+1,this.choices.length),this._limit=this.limit,this.isDisabled()?this.down():this.render())}swap(e){VJe(this.choices,this.index,e)}isDisabled(e=this.focused){return e&&["disabled","collapsed","hidden","completing","readonly"].some(i=>e[i]===!0)?!0:e&&e.role==="heading"}isEnabled(e=this.focused){if(Array.isArray(e))return e.every(r=>this.isEnabled(r));if(e.choices){let r=e.choices.filter(i=>!this.isDisabled(i));return e.enabled&&r.every(i=>this.isEnabled(i))}return e.enabled&&!this.isDisabled(e)}isChoice(e,r){return e.name===r||e.index===Number(r)}isSelected(e){return Array.isArray(this.initial)?this.initial.some(r=>this.isChoice(e,r)):this.isChoice(e,this.initial)}map(e=[],r="value"){return[].concat(e||[]).reduce((i,n)=>(i[n]=this.find(n,r),i),{})}filter(e,r){let i=(a,l)=>[a.name,l].includes(e),n=typeof e=="function"?e:i,o=(this.options.multiple?this.state._choices:this.choices).filter(n);return r?o.map(a=>a[r]):o}find(e,r){if(Sne(e))return r?e[r]:e;let i=(o,a)=>[o.name,a].includes(e),n=typeof e=="function"?e:i,s=this.choices.find(n);if(s)return r?s[r]:s}findIndex(e){return this.choices.indexOf(this.find(e))}async submit(){let e=this.focused;if(!e)return this.alert();if(e.newChoice)return e.input?(e.updateChoice(),this.render()):this.alert();if(this.choices.some(o=>o.newChoice))return this.alert();let{reorder:r,sort:i}=this.options,n=this.multiple===!0,s=this.selected;return s===void 0?this.alert():(Array.isArray(s)&&r!==!1&&i!==!0&&(s=M0.reorder(s)),this.value=n?s.map(o=>o.name):s.name,super.submit())}set choices(e=[]){this.state._choices=this.state._choices||[],this.state.choices=e;for(let r of e)this.state._choices.some(i=>i.name===r.name)||this.state._choices.push(r);if(!this._initial&&this.options.initial){this._initial=!0;let r=this.initial;if(typeof r=="string"||typeof r=="number"){let i=this.find(r);i&&(this.initial=i.index,this.focus(i,!0))}}}get choices(){return kne(this,this.state.choices||[])}set visible(e){this.state.visible=e}get visible(){return(this.state.visible||this.choices).slice(0,this.limit)}set limit(e){this.state.limit=e}get limit(){let{state:e,options:r,choices:i}=this,n=e.limit||this._limit||r.limit||i.length;return Math.min(n,this.height)}set value(e){super.value=e}get value(){return typeof super.value!="string"&&super.value===this.initial?this.input:super.value}set index(e){this.state.index=e}get index(){return Math.max(0,this.state?this.state.index:0)}get enabled(){return this.filter(this.isEnabled.bind(this))}get focused(){let e=this.choices[this.index];return e&&this.state.submitted&&this.multiple!==!0&&(e.enabled=!0),e}get selectable(){return this.choices.filter(e=>!this.isDisabled(e))}get selected(){return this.multiple?this.enabled:this.focused}};function kne(t,e){if(e instanceof Promise)return e;if(typeof e=="function"){if(M0.isAsyncFn(e))return e;e=e.call(t,t)}for(let r of e){if(Array.isArray(r.choices)){let i=r.choices.filter(n=>!t.isDisabled(n));r.enabled=i.every(n=>n.enabled===!0)}t.isDisabled(r)===!0&&delete r.enabled}return e}vne.exports=xne});var GA=I((bCt,Pne)=>{"use strict";var _Je=sC(),bN=Mi(),Dne=class extends _Je{constructor(e){super(e);this.emptyError=this.options.emptyError||"No items were selected"}async dispatch(e,r){if(this.multiple)return this[r.name]?await this[r.name](e,r):await super.dispatch(e,r);this.alert()}separator(){if(this.options.separator)return super.separator();let e=this.styles.muted(this.symbols.ellipsis);return this.state.submitted?super.separator():e}pointer(e,r){return!this.multiple||this.options.pointer?super.pointer(e,r):""}indicator(e,r){return this.multiple?super.indicator(e,r):""}choiceMessage(e,r){let i=this.resolve(e.message,this.state,e,r);return e.role==="heading"&&!bN.hasColor(i)&&(i=this.styles.strong(i)),this.resolve(i,this.state,e,r)}choiceSeparator(){return":"}async renderChoice(e,r){await this.onChoice(e,r);let i=this.index===r,n=await this.pointer(e,r),s=await this.indicator(e,r)+(e.pad||""),o=await this.resolve(e.hint,this.state,e,r);o&&!bN.hasColor(o)&&(o=this.styles.muted(o));let a=this.indent(e),l=await this.choiceMessage(e,r),c=()=>[this.margin[3],a+n+s,l,this.margin[1],o].filter(Boolean).join(" ");return e.role==="heading"?c():e.disabled?(bN.hasColor(l)||(l=this.styles.disabled(l)),c()):(i&&(l=this.styles.em(l)),c())}async renderChoices(){if(this.state.loading==="choices")return this.styles.warning("Loading choices");if(this.state.submitted)return"";let e=this.visible.map(async(s,o)=>await this.renderChoice(s,o)),r=await Promise.all(e);r.length||r.push(this.styles.danger("No matching choices"));let i=this.margin[0]+r.join(` +`),n;return this.options.choicesHeader&&(n=await this.resolve(this.options.choicesHeader,this.state)),[n,i].filter(Boolean).join(` +`)}format(){return!this.state.submitted||this.state.cancelled?"":Array.isArray(this.selected)?this.selected.map(e=>this.styles.primary(e.name)).join(", "):this.styles.primary(this.selected.name)}async render(){let{submitted:e,size:r}=this.state,i="",n=await this.header(),s=await this.prefix(),o=await this.separator(),a=await this.message();this.options.promptLine!==!1&&(i=[s,a,o,""].join(" "),this.state.prompt=i);let l=await this.format(),c=await this.error()||await this.hint(),u=await this.renderChoices(),g=await this.footer();l&&(i+=l),c&&!i.includes(c)&&(i+=" "+c),e&&!l&&!u.trim()&&this.multiple&&this.emptyError!=null&&(i+=this.styles.danger(this.emptyError)),this.clear(r),this.write([n,i,u,g].filter(Boolean).join(` +`)),this.write(this.margin[2]),this.restore()}};Pne.exports=Dne});var Nne=I((vCt,Rne)=>{"use strict";var XJe=GA(),ZJe=(t,e)=>{let r=t.toLowerCase();return i=>{let s=i.toLowerCase().indexOf(r),o=e(i.slice(s,s+r.length));return s>=0?i.slice(0,s)+o+i.slice(s+r.length):i}},Fne=class extends XJe{constructor(e){super(e);this.cursorShow()}moveCursor(e){this.state.cursor+=e}dispatch(e){return this.append(e)}space(e){return this.options.multiple?super.space(e):this.append(e)}append(e){let{cursor:r,input:i}=this.state;return this.input=i.slice(0,r)+e+i.slice(r),this.moveCursor(1),this.complete()}delete(){let{cursor:e,input:r}=this.state;return r?(this.input=r.slice(0,e-1)+r.slice(e),this.moveCursor(-1),this.complete()):this.alert()}deleteForward(){let{cursor:e,input:r}=this.state;return r[e]===void 0?this.alert():(this.input=`${r}`.slice(0,e)+`${r}`.slice(e+1),this.complete())}number(e){return this.append(e)}async complete(){this.completing=!0,this.choices=await this.suggest(this.input,this.state._choices),this.state.limit=void 0,this.index=Math.min(Math.max(this.visible.length-1,0),this.index),await this.render(),this.completing=!1}suggest(e=this.input,r=this.state._choices){if(typeof this.options.suggest=="function")return this.options.suggest.call(this,e,r);let i=e.toLowerCase();return r.filter(n=>n.message.toLowerCase().includes(i))}pointer(){return""}format(){if(!this.focused)return this.input;if(this.options.multiple&&this.state.submitted)return this.selected.map(e=>this.styles.primary(e.message)).join(", ");if(this.state.submitted){let e=this.value=this.input=this.focused.value;return this.styles.primary(e)}return this.input}async render(){if(this.state.status!=="pending")return super.render();let e=this.options.highlight?this.options.highlight.bind(this):this.styles.placeholder,r=ZJe(this.input,e),i=this.choices;this.choices=i.map(n=>_(P({},n),{message:r(n.message)})),await super.render(),this.choices=i}submit(){return this.options.multiple&&(this.value=this.selected.map(e=>e.name)),super.submit()}};Rne.exports=Fne});var SN=I((SCt,Lne)=>{"use strict";var vN=Mi();Lne.exports=(t,e={})=>{t.cursorHide();let{input:r="",initial:i="",pos:n,showCursor:s=!0,color:o}=e,a=o||t.styles.placeholder,l=vN.inverse(t.styles.primary),c=d=>l(t.styles.black(d)),u=r,g=" ",f=c(g);if(t.blink&&t.blink.off===!0&&(c=d=>d,f=""),s&&n===0&&i===""&&r==="")return c(g);if(s&&n===0&&(r===i||r===""))return c(i[0])+a(i.slice(1));i=vN.isPrimitive(i)?`${i}`:"",r=vN.isPrimitive(r)?`${r}`:"";let h=i&&i.startsWith(r)&&i!==r,p=h?c(i[r.length]):f;if(n!==r.length&&s===!0&&(u=r.slice(0,n)+c(r[n])+r.slice(n+1),p=""),s===!1&&(p=""),h){let d=t.styles.unstyle(u+p);return u+p+a(i.slice(d.length))}return u+p}});var O0=I((xCt,Tne)=>{"use strict";var $Je=js(),e3e=GA(),t3e=SN(),Mne=class extends e3e{constructor(e){super(_(P({},e),{multiple:!0}));this.type="form",this.initial=this.options.initial,this.align=[this.options.align,"right"].find(r=>r!=null),this.emptyError="",this.values={}}async reset(e){return await super.reset(),e===!0&&(this._index=this.index),this.index=this._index,this.values={},this.choices.forEach(r=>r.reset&&r.reset()),this.render()}dispatch(e){return!!e&&this.append(e)}append(e){let r=this.focused;if(!r)return this.alert();let{cursor:i,input:n}=r;return r.value=r.input=n.slice(0,i)+e+n.slice(i),r.cursor++,this.render()}delete(){let e=this.focused;if(!e||e.cursor<=0)return this.alert();let{cursor:r,input:i}=e;return e.value=e.input=i.slice(0,r-1)+i.slice(r),e.cursor--,this.render()}deleteForward(){let e=this.focused;if(!e)return this.alert();let{cursor:r,input:i}=e;if(i[r]===void 0)return this.alert();let n=`${i}`.slice(0,r)+`${i}`.slice(r+1);return e.value=e.input=n,this.render()}right(){let e=this.focused;return e?e.cursor>=e.input.length?this.alert():(e.cursor++,this.render()):this.alert()}left(){let e=this.focused;return e?e.cursor<=0?this.alert():(e.cursor--,this.render()):this.alert()}space(e,r){return this.dispatch(e,r)}number(e,r){return this.dispatch(e,r)}next(){let e=this.focused;if(!e)return this.alert();let{initial:r,input:i}=e;return r&&r.startsWith(i)&&i!==r?(e.value=e.input=r,e.cursor=e.value.length,this.render()):super.next()}prev(){let e=this.focused;return e?e.cursor===0?super.prev():(e.value=e.input="",e.cursor=0,this.render()):this.alert()}separator(){return""}format(e){return this.state.submitted?"":super.format(e)}pointer(){return""}indicator(e){return e.input?"\u29BF":"\u2299"}async choiceSeparator(e,r){let i=await this.resolve(e.separator,this.state,e,r)||":";return i?" "+this.styles.disabled(i):""}async renderChoice(e,r){await this.onChoice(e,r);let{state:i,styles:n}=this,{cursor:s,initial:o="",name:a,hint:l,input:c=""}=e,{muted:u,submitted:g,primary:f,danger:h}=n,p=l,d=this.index===r,m=e.validate||(()=>!0),E=await this.choiceSeparator(e,r),B=e.message;this.align==="right"&&(B=B.padStart(this.longest+1," ")),this.align==="left"&&(B=B.padEnd(this.longest+1," "));let b=this.values[a]=c||o,R=c?"success":"dark";await m.call(e,b,this.state)!==!0&&(R="danger");let L=n[R](await this.indicator(e,r))+(e.pad||""),K=this.indent(e),J=()=>[K,L,B+E,c,p].filter(Boolean).join(" ");if(i.submitted)return B=$Je.unstyle(B),c=g(c),p="",J();if(e.format)c=await e.format.call(this,c,e,r);else{let ne=this.styles.muted;c=t3e(this,{input:c,initial:o,pos:s,showCursor:d,color:ne})}return this.isValue(c)||(c=this.styles.muted(this.symbols.ellipsis)),e.result&&(this.values[a]=await e.result.call(this,b,e,r)),d&&(B=f(B)),e.error?c+=(c?" ":"")+h(e.error.trim()):e.hint&&(c+=(c?" ":"")+u(e.hint.trim())),J()}async submit(){return this.value=this.values,super.base.submit.call(this)}};Tne.exports=Mne});var xN=I((kCt,One)=>{"use strict";var r3e=O0(),i3e=()=>{throw new Error("expected prompt to have a custom authenticate method")},Kne=(t=i3e)=>{class e extends r3e{constructor(i){super(i)}async submit(){this.value=await t.call(this,this.values,this.state),super.base.submit.call(this)}static create(i){return Kne(i)}}return e};One.exports=Kne()});var Gne=I((PCt,Une)=>{"use strict";var n3e=xN();function s3e(t,e){return t.username===this.options.username&&t.password===this.options.password}var Hne=(t=s3e)=>{let e=[{name:"username",message:"username"},{name:"password",message:"password",format(i){return this.options.showPassword?i:(this.state.submitted?this.styles.primary:this.styles.muted)(this.symbols.asterisk.repeat(i.length))}}];class r extends n3e.create(t){constructor(n){super(_(P({},n),{choices:e}))}static create(n){return Hne(n)}}return r};Une.exports=Hne()});var K0=I((DCt,jne)=>{"use strict";var o3e=sf(),{isPrimitive:a3e,hasColor:A3e}=Mi(),Yne=class extends o3e{constructor(e){super(e);this.cursorHide()}async initialize(){let e=await this.resolve(this.initial,this.state);this.input=await this.cast(e),await super.initialize()}dispatch(e){return this.isValue(e)?(this.input=e,this.submit()):this.alert()}format(e){let{styles:r,state:i}=this;return i.submitted?r.success(e):r.primary(e)}cast(e){return this.isTrue(e)}isTrue(e){return/^[ty1]/i.test(e)}isFalse(e){return/^[fn0]/i.test(e)}isValue(e){return a3e(e)&&(this.isTrue(e)||this.isFalse(e))}async hint(){if(this.state.status==="pending"){let e=await this.element("hint");return A3e(e)?e:this.styles.muted(e)}}async render(){let{input:e,size:r}=this.state,i=await this.prefix(),n=await this.separator(),s=await this.message(),o=this.styles.muted(this.default),a=[i,s,o,n].filter(Boolean).join(" ");this.state.prompt=a;let l=await this.header(),c=this.value=this.cast(e),u=await this.format(c),g=await this.error()||await this.hint(),f=await this.footer();g&&!a.includes(g)&&(u+=" "+g),a+=" "+u,this.clear(r),this.write([l,a,f].filter(Boolean).join(` +`)),this.restore()}set value(e){super.value=e}get value(){return this.cast(super.value)}};jne.exports=Yne});var Wne=I((RCt,qne)=>{"use strict";var l3e=K0(),Jne=class extends l3e{constructor(e){super(e);this.default=this.options.default||(this.initial?"(Y/n)":"(y/N)")}};qne.exports=Jne});var _ne=I((FCt,zne)=>{"use strict";var c3e=GA(),u3e=O0(),of=u3e.prototype,Vne=class extends c3e{constructor(e){super(_(P({},e),{multiple:!0}));this.align=[this.options.align,"left"].find(r=>r!=null),this.emptyError="",this.values={}}dispatch(e,r){let i=this.focused,n=i.parent||{};return!i.editable&&!n.editable&&(e==="a"||e==="i")?super[e]():of.dispatch.call(this,e,r)}append(e,r){return of.append.call(this,e,r)}delete(e,r){return of.delete.call(this,e,r)}space(e){return this.focused.editable?this.append(e):super.space()}number(e){return this.focused.editable?this.append(e):super.number(e)}next(){return this.focused.editable?of.next.call(this):super.next()}prev(){return this.focused.editable?of.prev.call(this):super.prev()}async indicator(e,r){let i=e.indicator||"",n=e.editable?i:super.indicator(e,r);return await this.resolve(n,this.state,e,r)||""}indent(e){return e.role==="heading"?"":e.editable?" ":" "}async renderChoice(e,r){return e.indent="",e.editable?of.renderChoice.call(this,e,r):super.renderChoice(e,r)}error(){return""}footer(){return this.state.error}async validate(){let e=!0;for(let r of this.choices){if(typeof r.validate!="function"||r.role==="heading")continue;let i=r.parent?this.value[r.parent.name]:this.value;if(r.editable?i=r.value===r.name?r.initial||"":r.value:this.isDisabled(r)||(i=r.enabled===!0),e=await r.validate(i,this.state),e!==!0)break}return e!==!0&&(this.state.error=typeof e=="string"?e:"Invalid Input"),e}submit(){if(this.focused.newChoice===!0)return super.submit();if(this.choices.some(e=>e.newChoice))return this.alert();this.value={};for(let e of this.choices){let r=e.parent?this.value[e.parent.name]:this.value;if(e.role==="heading"){this.value[e.name]={};continue}e.editable?r[e.name]=e.value===e.name?e.initial||"":e.value:this.isDisabled(e)||(r[e.name]=e.enabled===!0)}return this.base.submit.call(this)}};zne.exports=Vne});var Mc=I((NCt,Xne)=>{"use strict";var g3e=sf(),f3e=SN(),{isPrimitive:h3e}=Mi(),Zne=class extends g3e{constructor(e){super(e);this.initial=h3e(this.initial)?String(this.initial):"",this.initial&&this.cursorHide(),this.state.prevCursor=0,this.state.clipboard=[]}async keypress(e,r={}){let i=this.state.prevKeypress;return this.state.prevKeypress=r,this.options.multiline===!0&&r.name==="return"&&(!i||i.name!=="return")?this.append(` +`,r):super.keypress(e,r)}moveCursor(e){this.cursor+=e}reset(){return this.input=this.value="",this.cursor=0,this.render()}dispatch(e,r){if(!e||r.ctrl||r.code)return this.alert();this.append(e)}append(e){let{cursor:r,input:i}=this.state;this.input=`${i}`.slice(0,r)+e+`${i}`.slice(r),this.moveCursor(String(e).length),this.render()}insert(e){this.append(e)}delete(){let{cursor:e,input:r}=this.state;if(e<=0)return this.alert();this.input=`${r}`.slice(0,e-1)+`${r}`.slice(e),this.moveCursor(-1),this.render()}deleteForward(){let{cursor:e,input:r}=this.state;if(r[e]===void 0)return this.alert();this.input=`${r}`.slice(0,e)+`${r}`.slice(e+1),this.render()}cutForward(){let e=this.cursor;if(this.input.length<=e)return this.alert();this.state.clipboard.push(this.input.slice(e)),this.input=this.input.slice(0,e),this.render()}cutLeft(){let e=this.cursor;if(e===0)return this.alert();let r=this.input.slice(0,e),i=this.input.slice(e),n=r.split(" ");this.state.clipboard.push(n.pop()),this.input=n.join(" "),this.cursor=this.input.length,this.input+=i,this.render()}paste(){if(!this.state.clipboard.length)return this.alert();this.insert(this.state.clipboard.pop()),this.render()}toggleCursor(){this.state.prevCursor?(this.cursor=this.state.prevCursor,this.state.prevCursor=0):(this.state.prevCursor=this.cursor,this.cursor=0),this.render()}first(){this.cursor=0,this.render()}last(){this.cursor=this.input.length-1,this.render()}next(){let e=this.initial!=null?String(this.initial):"";if(!e||!e.startsWith(this.input))return this.alert();this.input=this.initial,this.cursor=this.initial.length,this.render()}prev(){if(!this.input)return this.alert();this.reset()}backward(){return this.left()}forward(){return this.right()}right(){return this.cursor>=this.input.length?this.alert():(this.moveCursor(1),this.render())}left(){return this.cursor<=0?this.alert():(this.moveCursor(-1),this.render())}isValue(e){return!!e}async format(e=this.value){let r=await this.resolve(this.initial,this.state);return this.state.submitted?this.styles.submitted(e||r):f3e(this,{input:e,initial:r,pos:this.cursor})}async render(){let e=this.state.size,r=await this.prefix(),i=await this.separator(),n=await this.message(),s=[r,n,i].filter(Boolean).join(" ");this.state.prompt=s;let o=await this.header(),a=await this.format(),l=await this.error()||await this.hint(),c=await this.footer();l&&!a.includes(l)&&(a+=" "+l),s+=" "+a,this.clear(e),this.write([o,s,c].filter(Boolean).join(` +`)),this.restore()}};Xne.exports=Zne});var ese=I((LCt,$ne)=>{"use strict";var p3e=t=>t.filter((e,r)=>t.lastIndexOf(e)===r),U0=t=>p3e(t).filter(Boolean);$ne.exports=(t,e={},r="")=>{let{past:i=[],present:n=""}=e,s,o;switch(t){case"prev":case"undo":return s=i.slice(0,i.length-1),o=i[i.length-1]||"",{past:U0([r,...s]),present:o};case"next":case"redo":return s=i.slice(1),o=i[0]||"",{past:U0([...s,r]),present:o};case"save":return{past:U0([...i,r]),present:""};case"remove":return o=U0(i.filter(a=>a!==r)),n="",o.length&&(n=o.pop()),{past:o,present:n};default:throw new Error(`Invalid action: "${t}"`)}}});var kN=I((TCt,tse)=>{"use strict";var d3e=Mc(),rse=ese(),ise=class extends d3e{constructor(e){super(e);let r=this.options.history;if(r&&r.store){let i=r.values||this.initial;this.autosave=!!r.autosave,this.store=r.store,this.data=this.store.get("values")||{past:[],present:i},this.initial=this.data.present||this.data.past[this.data.past.length-1]}}completion(e){return this.store?(this.data=rse(e,this.data,this.input),this.data.present?(this.input=this.data.present,this.cursor=this.input.length,this.render()):this.alert()):this.alert()}altUp(){return this.completion("prev")}altDown(){return this.completion("next")}prev(){return this.save(),super.prev()}save(){!this.store||(this.data=rse("save",this.data,this.input),this.store.set("values",this.data))}submit(){return this.store&&this.autosave===!0&&this.save(),super.submit()}};tse.exports=ise});var ose=I((MCt,nse)=>{"use strict";var C3e=Mc(),sse=class extends C3e{format(){return""}};nse.exports=sse});var lse=I((OCt,ase)=>{"use strict";var m3e=Mc(),Ase=class extends m3e{constructor(e={}){super(e);this.sep=this.options.separator||/, */,this.initial=e.initial||""}split(e=this.value){return e?String(e).split(this.sep):[]}format(){let e=this.state.submitted?this.styles.primary:r=>r;return this.list.map(e).join(", ")}async submit(e){let r=this.state.error||await this.validate(this.list,this.state);return r!==!0?(this.state.error=r,super.submit()):(this.value=this.list,super.submit())}get list(){return this.split()}};ase.exports=Ase});var gse=I((KCt,cse)=>{"use strict";var I3e=GA(),use=class extends I3e{constructor(e){super(_(P({},e),{multiple:!0}))}};cse.exports=use});var PN=I((UCt,fse)=>{"use strict";var E3e=Mc(),hse=class extends E3e{constructor(e={}){super(P({style:"number"},e));this.min=this.isValue(e.min)?this.toNumber(e.min):-Infinity,this.max=this.isValue(e.max)?this.toNumber(e.max):Infinity,this.delay=e.delay!=null?e.delay:1e3,this.float=e.float!==!1,this.round=e.round===!0||e.float===!1,this.major=e.major||10,this.minor=e.minor||1,this.initial=e.initial!=null?e.initial:"",this.input=String(this.initial),this.cursor=this.input.length,this.cursorShow()}append(e){return!/[-+.]/.test(e)||e==="."&&this.input.includes(".")?this.alert("invalid number"):super.append(e)}number(e){return super.append(e)}next(){return this.input&&this.input!==this.initial?this.alert():this.isValue(this.initial)?(this.input=this.initial,this.cursor=String(this.initial).length,this.render()):this.alert()}up(e){let r=e||this.minor,i=this.toNumber(this.input);return i>this.max+r?this.alert():(this.input=`${i+r}`,this.render())}down(e){let r=e||this.minor,i=this.toNumber(this.input);return ithis.isValue(r));return this.value=this.toNumber(e||0),super.submit()}};fse.exports=hse});var dse=I((HCt,pse)=>{pse.exports=PN()});var Ise=I((GCt,Cse)=>{"use strict";var y3e=Mc(),mse=class extends y3e{constructor(e){super(e);this.cursorShow()}format(e=this.input){return this.keypressed?(this.state.submitted?this.styles.primary:this.styles.muted)(this.symbols.asterisk.repeat(e.length)):""}};Cse.exports=mse});var Bse=I((jCt,Ese)=>{"use strict";var w3e=js(),B3e=sC(),yse=Mi(),wse=class extends B3e{constructor(e={}){super(e);this.widths=[].concat(e.messageWidth||50),this.align=[].concat(e.align||"left"),this.linebreak=e.linebreak||!1,this.edgeLength=e.edgeLength||3,this.newline=e.newline||` + `;let r=e.startNumber||1;typeof this.scale=="number"&&(this.scaleKey=!1,this.scale=Array(this.scale).fill(0).map((i,n)=>({name:n+r})))}async reset(){return this.tableized=!1,await super.reset(),this.render()}tableize(){if(this.tableized===!0)return;this.tableized=!0;let e=0;for(let r of this.choices){e=Math.max(e,r.message.length),r.scaleIndex=r.initial||2,r.scale=[];for(let i=0;i=this.scale.length-1?this.alert():(e.scaleIndex++,this.render())}left(){let e=this.focused;return e.scaleIndex<=0?this.alert():(e.scaleIndex--,this.render())}indent(){return""}format(){return this.state.submitted?this.choices.map(r=>this.styles.info(r.index)).join(", "):""}pointer(){return""}renderScaleKey(){if(this.scaleKey===!1||this.state.submitted)return"";let e=this.scale.map(i=>` ${i.name} - ${i.message}`);return["",...e].map(i=>this.styles.muted(i)).join(` +`)}renderScaleHeading(e){let r=this.scale.map(l=>l.name);typeof this.options.renderScaleHeading=="function"&&(r=this.options.renderScaleHeading.call(this,e));let i=this.scaleLength-r.join("").length,n=Math.round(i/(r.length-1)),o=r.map(l=>this.styles.strong(l)).join(" ".repeat(n)),a=" ".repeat(this.widths[0]);return this.margin[3]+a+this.margin[1]+o}scaleIndicator(e,r,i){if(typeof this.options.scaleIndicator=="function")return this.options.scaleIndicator.call(this,e,r,i);let n=e.scaleIndex===r.index;return r.disabled?this.styles.hint(this.symbols.radio.disabled):n?this.styles.success(this.symbols.radio.on):this.symbols.radio.off}renderScale(e,r){let i=e.scale.map(s=>this.scaleIndicator(e,s,r)),n=this.term==="Hyper"?"":" ";return i.join(n+this.symbols.line.repeat(this.edgeLength))}async renderChoice(e,r){await this.onChoice(e,r);let i=this.index===r,n=await this.pointer(e,r),s=await e.hint;s&&!yse.hasColor(s)&&(s=this.styles.muted(s));let o=p=>this.margin[3]+p.replace(/\s+$/,"").padEnd(this.widths[0]," "),a=this.newline,l=this.indent(e),c=await this.resolve(e.message,this.state,e,r),u=await this.renderScale(e,r),g=this.margin[1]+this.margin[3];this.scaleLength=w3e.unstyle(u).length,this.widths[0]=Math.min(this.widths[0],this.width-this.scaleLength-g.length);let h=yse.wordWrap(c,{width:this.widths[0],newline:a}).split(` +`).map(p=>o(p)+this.margin[1]);return i&&(u=this.styles.info(u),h=h.map(p=>this.styles.info(p))),h[0]+=u,this.linebreak&&h.push(""),[l+n,h.join(` +`)].filter(Boolean)}async renderChoices(){if(this.state.submitted)return"";this.tableize();let e=this.visible.map(async(n,s)=>await this.renderChoice(n,s)),r=await Promise.all(e),i=await this.renderScaleHeading();return this.margin[0]+[i,...r.map(n=>n.join(" "))].join(` +`)}async render(){let{submitted:e,size:r}=this.state,i=await this.prefix(),n=await this.separator(),s=await this.message(),o="";this.options.promptLine!==!1&&(o=[i,s,n,""].join(" "),this.state.prompt=o);let a=await this.header(),l=await this.format(),c=await this.renderScaleKey(),u=await this.error()||await this.hint(),g=await this.renderChoices(),f=await this.footer(),h=this.emptyError;l&&(o+=l),u&&!o.includes(u)&&(o+=" "+u),e&&!l&&!g.trim()&&this.multiple&&h!=null&&(o+=this.styles.danger(h)),this.clear(r),this.write([a,o,c,g,f].filter(Boolean).join(` +`)),this.state.submitted||this.write(this.margin[2]),this.restore()}submit(){this.value={};for(let e of this.choices)this.value[e.name]=e.scaleIndex;return this.base.submit.call(this)}};Ese.exports=wse});var Sse=I((YCt,Qse)=>{"use strict";var bse=js(),Q3e=(t="")=>typeof t=="string"?t.replace(/^['"]|['"]$/g,""):"",vse=class{constructor(e){this.name=e.key,this.field=e.field||{},this.value=Q3e(e.initial||this.field.initial||""),this.message=e.message||this.name,this.cursor=0,this.input="",this.lines=[]}},b3e=async(t={},e={},r=i=>i)=>{let i=new Set,n=t.fields||[],s=t.template,o=[],a=[],l=[],c=1;typeof s=="function"&&(s=await s());let u=-1,g=()=>s[++u],f=()=>s[u+1],h=p=>{p.line=c,o.push(p)};for(h({type:"bos",value:""});uR.name===E.key);E.field=n.find(R=>R.name===E.key),b||(b=new vse(E),a.push(b)),b.lines.push(E.line-1);continue}let d=o[o.length-1];d.type==="text"&&d.line===c?d.value+=p:h({type:"text",value:p})}return h({type:"eos",value:""}),{input:s,tabstops:o,unique:i,keys:l,items:a}};Qse.exports=async t=>{let e=t.options,r=new Set(e.required===!0?[]:e.required||[]),i=P(P({},e.values),e.initial),{tabstops:n,items:s,keys:o}=await b3e(e,i),a=DN("result",t,e),l=DN("format",t,e),c=DN("validate",t,e,!0),u=t.isValue.bind(t);return async(g={},f=!1)=>{let h=0;g.required=r,g.items=s,g.keys=o,g.output="";let p=async(B,b,R,H)=>{let L=await c(B,b,R,H);return L===!1?"Invalid field "+R.name:L};for(let B of n){let b=B.value,R=B.key;if(B.type!=="template"){b&&(g.output+=b);continue}if(B.type==="template"){let H=s.find(q=>q.name===R);e.required===!0&&g.required.add(H.name);let L=[H.input,g.values[H.value],H.value,b].find(u),J=(H.field||{}).message||B.inner;if(f){let q=await p(g.values[R],g,H,h);if(q&&typeof q=="string"||q===!1){g.invalid.set(R,q);continue}g.invalid.delete(R);let A=await a(g.values[R],g,H,h);g.output+=bse.unstyle(A);continue}H.placeholder=!1;let ne=b;b=await l(b,g,H,h),L!==b?(g.values[R]=L,b=t.styles.typing(L),g.missing.delete(J)):(g.values[R]=void 0,L=`<${J}>`,b=t.styles.primary(L),H.placeholder=!0,g.required.has(R)&&g.missing.add(J)),g.missing.has(J)&&g.validating&&(b=t.styles.warning(L)),g.invalid.has(R)&&g.validating&&(b=t.styles.danger(L)),h===g.index&&(ne!==b?b=t.styles.underline(b):b=t.styles.heading(bse.unstyle(b))),h++}b&&(g.output+=b)}let d=g.output.split(` +`).map(B=>" "+B),m=s.length,E=0;for(let B of s)g.invalid.has(B.name)&&B.lines.forEach(b=>{d[b][0]===" "&&(d[b]=g.styles.danger(g.symbols.bullet)+d[b].slice(1))}),t.isValue(g.values[B.name])&&E++;return g.completed=(E/m*100).toFixed(0),g.output=d.join(` +`),g.output}};function DN(t,e,r,i){return(n,s,o,a)=>typeof o.field[t]=="function"?o.field[t].call(e,n,s,o,a):[i,n].find(l=>e.isValue(l))}});var Pse=I((qCt,xse)=>{"use strict";var v3e=js(),S3e=Sse(),x3e=sf(),kse=class extends x3e{constructor(e){super(e);this.cursorHide(),this.reset(!0)}async initialize(){this.interpolate=await S3e(this),await super.initialize()}async reset(e){this.state.keys=[],this.state.invalid=new Map,this.state.missing=new Set,this.state.completed=0,this.state.values={},e!==!0&&(await this.initialize(),await this.render())}moveCursor(e){let r=this.getItem();this.cursor+=e,r.cursor+=e}dispatch(e,r){if(!r.code&&!r.ctrl&&e!=null&&this.getItem()){this.append(e,r);return}this.alert()}append(e,r){let i=this.getItem(),n=i.input.slice(0,this.cursor),s=i.input.slice(this.cursor);this.input=i.input=`${n}${e}${s}`,this.moveCursor(1),this.render()}delete(){let e=this.getItem();if(this.cursor<=0||!e.input)return this.alert();let r=e.input.slice(this.cursor),i=e.input.slice(0,this.cursor-1);this.input=e.input=`${i}${r}`,this.moveCursor(-1),this.render()}increment(e){return e>=this.state.keys.length-1?0:e+1}decrement(e){return e<=0?this.state.keys.length-1:e-1}first(){this.state.index=0,this.render()}last(){this.state.index=this.state.keys.length-1,this.render()}right(){if(this.cursor>=this.input.length)return this.alert();this.moveCursor(1),this.render()}left(){if(this.cursor<=0)return this.alert();this.moveCursor(-1),this.render()}prev(){this.state.index=this.decrement(this.state.index),this.getItem(),this.render()}next(){this.state.index=this.increment(this.state.index),this.getItem(),this.render()}up(){this.prev()}down(){this.next()}format(e){let r=this.state.completed<100?this.styles.warning:this.styles.success;return this.state.submitted===!0&&this.state.completed!==100&&(r=this.styles.danger),r(`${this.state.completed}% completed`)}async render(){let{index:e,keys:r=[],submitted:i,size:n}=this.state,s=[this.options.newline,` +`].find(B=>B!=null),o=await this.prefix(),a=await this.separator(),l=await this.message(),c=[o,l,a].filter(Boolean).join(" ");this.state.prompt=c;let u=await this.header(),g=await this.error()||"",f=await this.hint()||"",h=i?"":await this.interpolate(this.state),p=this.state.key=r[e]||"",d=await this.format(p),m=await this.footer();d&&(c+=" "+d),f&&!d&&this.state.completed===0&&(c+=" "+f),this.clear(n);let E=[u,c,h,m,g.trim()];this.write(E.filter(Boolean).join(s)),this.restore()}getItem(e){let{items:r,keys:i,index:n}=this.state,s=r.find(o=>o.name===i[n]);return s&&s.input!=null&&(this.input=s.input,this.cursor=s.cursor),s}async submit(){typeof this.interpolate!="function"&&await this.initialize(),await this.interpolate(this.state,!0);let{invalid:e,missing:r,output:i,values:n}=this.state;if(e.size){let a="";for(let[l,c]of e)a+=`Invalid ${l}: ${c} +`;return this.state.error=a,super.submit()}if(r.size)return this.state.error="Required: "+[...r.keys()].join(", "),super.submit();let o=v3e.unstyle(i).split(` +`).map(a=>a.slice(1)).join(` +`);return this.value={values:n,result:o},super.submit()}};xse.exports=kse});var Fse=I((JCt,Dse)=>{"use strict";var k3e="(Use + to sort)",P3e=GA(),Rse=class extends P3e{constructor(e){super(_(P({},e),{reorder:!1,sort:!0,multiple:!0}));this.state.hint=[this.options.hint,k3e].find(this.isValue.bind(this))}indicator(){return""}async renderChoice(e,r){let i=await super.renderChoice(e,r),n=this.symbols.identicalTo+" ",s=this.index===r&&this.sorting?this.styles.muted(n):" ";return this.options.drag===!1&&(s=""),this.options.numbered===!0?s+`${r+1} - `+i:s+i}get selected(){return this.choices}submit(){return this.value=this.choices.map(e=>e.value),super.submit()}};Dse.exports=Rse});var Tse=I((WCt,Nse)=>{"use strict";var D3e=sC(),Lse=class extends D3e{constructor(e={}){super(e);if(this.emptyError=e.emptyError||"No items were selected",this.term=process.env.TERM_PROGRAM,!this.options.header){let r=["","4 - Strongly Agree","3 - Agree","2 - Neutral","1 - Disagree","0 - Strongly Disagree",""];r=r.map(i=>this.styles.muted(i)),this.state.header=r.join(` + `)}}async toChoices(...e){if(this.createdScales)return!1;this.createdScales=!0;let r=await super.toChoices(...e);for(let i of r)i.scale=R3e(5,this.options),i.scaleIdx=2;return r}dispatch(){this.alert()}space(){let e=this.focused,r=e.scale[e.scaleIdx],i=r.selected;return e.scale.forEach(n=>n.selected=!1),r.selected=!i,this.render()}indicator(){return""}pointer(){return""}separator(){return this.styles.muted(this.symbols.ellipsis)}right(){let e=this.focused;return e.scaleIdx>=e.scale.length-1?this.alert():(e.scaleIdx++,this.render())}left(){let e=this.focused;return e.scaleIdx<=0?this.alert():(e.scaleIdx--,this.render())}indent(){return" "}async renderChoice(e,r){await this.onChoice(e,r);let i=this.index===r,n=this.term==="Hyper",s=n?9:8,o=n?"":" ",a=this.symbols.line.repeat(s),l=" ".repeat(s+(n?0:1)),c=b=>(b?this.styles.success("\u25C9"):"\u25EF")+o,u=r+1+".",g=i?this.styles.heading:this.styles.noop,f=await this.resolve(e.message,this.state,e,r),h=this.indent(e),p=h+e.scale.map((b,R)=>c(R===e.scaleIdx)).join(a),d=b=>b===e.scaleIdx?g(b):b,m=h+e.scale.map((b,R)=>d(R)).join(l),E=()=>[u,f].filter(Boolean).join(" "),B=()=>[E(),p,m," "].filter(Boolean).join(` +`);return i&&(p=this.styles.cyan(p),m=this.styles.cyan(m)),B()}async renderChoices(){if(this.state.submitted)return"";let e=this.visible.map(async(i,n)=>await this.renderChoice(i,n)),r=await Promise.all(e);return r.length||r.push(this.styles.danger("No matching choices")),r.join(` +`)}format(){return this.state.submitted?this.choices.map(r=>this.styles.info(r.scaleIdx)).join(", "):""}async render(){let{submitted:e,size:r}=this.state,i=await this.prefix(),n=await this.separator(),s=await this.message(),o=[i,s,n].filter(Boolean).join(" ");this.state.prompt=o;let a=await this.header(),l=await this.format(),c=await this.error()||await this.hint(),u=await this.renderChoices(),g=await this.footer();(l||!c)&&(o+=" "+l),c&&!o.includes(c)&&(o+=" "+c),e&&!l&&!u&&this.multiple&&this.type!=="form"&&(o+=this.styles.danger(this.emptyError)),this.clear(r),this.write([o,a,u,g].filter(Boolean).join(` +`)),this.restore()}submit(){this.value={};for(let e of this.choices)this.value[e.name]=e.scaleIdx;return this.base.submit.call(this)}};function R3e(t,e={}){if(Array.isArray(e.scale))return e.scale.map(i=>P({},i));let r=[];for(let i=1;i{Mse.exports=kN()});var Hse=I((VCt,Kse)=>{"use strict";var F3e=K0(),Use=class extends F3e{async initialize(){await super.initialize(),this.value=this.initial=!!this.options.initial,this.disabled=this.options.disabled||"no",this.enabled=this.options.enabled||"yes",await this.render()}reset(){this.value=this.initial,this.render()}delete(){this.alert()}toggle(){this.value=!this.value,this.render()}enable(){if(this.value===!0)return this.alert();this.value=!0,this.render()}disable(){if(this.value===!1)return this.alert();this.value=!1,this.render()}up(){this.toggle()}down(){this.toggle()}right(){this.toggle()}left(){this.toggle()}next(){this.toggle()}prev(){this.toggle()}dispatch(e="",r){switch(e.toLowerCase()){case" ":return this.toggle();case"1":case"y":case"t":return this.enable();case"0":case"n":case"f":return this.disable();default:return this.alert()}}format(){let e=i=>this.styles.primary.underline(i);return[this.value?this.disabled:e(this.disabled),this.value?e(this.enabled):this.enabled].join(this.styles.muted(" / "))}async render(){let{size:e}=this.state,r=await this.header(),i=await this.prefix(),n=await this.separator(),s=await this.message(),o=await this.format(),a=await this.error()||await this.hint(),l=await this.footer(),c=[i,s,n,o].join(" ");this.state.prompt=c,a&&!c.includes(a)&&(c+=" "+a),this.clear(e),this.write([r,c,l].filter(Boolean).join(` +`)),this.write(this.margin[2]),this.restore()}};Kse.exports=Use});var Yse=I((_Ct,Gse)=>{"use strict";var N3e=GA(),jse=class extends N3e{constructor(e){super(e);if(typeof this.options.correctChoice!="number"||this.options.correctChoice<0)throw new Error("Please specify the index of the correct answer from the list of choices")}async toChoices(e,r){let i=await super.toChoices(e,r);if(i.length<2)throw new Error("Please give at least two choices to the user");if(this.options.correctChoice>i.length)throw new Error("Please specify the index of the correct answer from the list of choices");return i}check(e){return e.index===this.options.correctChoice}async result(e){return{selectedAnswer:e,correctAnswer:this.options.choices[this.options.correctChoice].value,correct:await this.check(this.state)}}};Gse.exports=jse});var Jse=I(RN=>{"use strict";var qse=Mi(),ti=(t,e)=>{qse.defineExport(RN,t,e),qse.defineExport(RN,t.toLowerCase(),e)};ti("AutoComplete",()=>Nne());ti("BasicAuth",()=>Gne());ti("Confirm",()=>Wne());ti("Editable",()=>_ne());ti("Form",()=>O0());ti("Input",()=>kN());ti("Invisible",()=>ose());ti("List",()=>lse());ti("MultiSelect",()=>gse());ti("Numeral",()=>dse());ti("Password",()=>Ise());ti("Scale",()=>Bse());ti("Select",()=>GA());ti("Snippet",()=>Pse());ti("Sort",()=>Fse());ti("Survey",()=>Tse());ti("Text",()=>Ose());ti("Toggle",()=>Hse());ti("Quiz",()=>Yse())});var zse=I((ZCt,Wse)=>{Wse.exports={ArrayPrompt:sC(),AuthPrompt:xN(),BooleanPrompt:K0(),NumberPrompt:PN(),StringPrompt:Mc()}});var aC=I(($Ct,Vse)=>{"use strict";var _se=require("assert"),FN=require("events"),jA=Mi(),No=class extends FN{constructor(e,r){super();this.options=jA.merge({},e),this.answers=P({},r)}register(e,r){if(jA.isObject(e)){for(let n of Object.keys(e))this.register(n,e[n]);return this}_se.equal(typeof r,"function","expected a function");let i=e.toLowerCase();return r.prototype instanceof this.Prompt?this.prompts[i]=r:this.prompts[i]=r(this.Prompt,this),this}async prompt(e=[]){for(let r of[].concat(e))try{typeof r=="function"&&(r=await r.call(this)),await this.ask(jA.merge({},this.options,r))}catch(i){return Promise.reject(i)}return this.answers}async ask(e){typeof e=="function"&&(e=await e.call(this));let r=jA.merge({},this.options,e),{type:i,name:n}=e,{set:s,get:o}=jA;if(typeof i=="function"&&(i=await i.call(this,e,this.answers)),!i)return this.answers[n];_se(this.prompts[i],`Prompt "${i}" is not registered`);let a=new this.prompts[i](r),l=o(this.answers,n);a.state.answers=this.answers,a.enquirer=this,n&&a.on("submit",u=>{this.emit("answer",n,u,a),s(this.answers,n,u)});let c=a.emit.bind(a);return a.emit=(...u)=>(this.emit.call(this,...u),c(...u)),this.emit("prompt",a,this),r.autofill&&l!=null?(a.value=a.input=l,r.autofill==="show"&&await a.submit()):l=a.value=await a.run(),l}use(e){return e.call(this,this),this}set Prompt(e){this._Prompt=e}get Prompt(){return this._Prompt||this.constructor.Prompt}get prompts(){return this.constructor.prompts}static set Prompt(e){this._Prompt=e}static get Prompt(){return this._Prompt||sf()}static get prompts(){return Jse()}static get types(){return zse()}static get prompt(){let e=(r,...i)=>{let n=new this(...i),s=n.emit.bind(n);return n.emit=(...o)=>(e.emit(...o),s(...o)),n.prompt(r)};return jA.mixinEmitter(e,new FN),e}};jA.mixinEmitter(No,new FN);var NN=No.prompts;for(let t of Object.keys(NN)){let e=t.toLowerCase(),r=i=>new NN[t](i).run();No.prompt[e]=r,No[e]=r,No[t]||Reflect.defineProperty(No,t,{get:()=>NN[t]})}var oC=t=>{jA.defineExport(No,t,()=>No.types[t])};oC("ArrayPrompt");oC("AuthPrompt");oC("BooleanPrompt");oC("NumberPrompt");oC("StringPrompt");Vse.exports=No});var loe=I((Gmt,Aoe)=>{function K3e(t,e){for(var r=-1,i=t==null?0:t.length;++r{var U3e=XB(),H3e=jg();function G3e(t,e,r,i){var n=!r;r||(r={});for(var s=-1,o=e.length;++s{var j3e=Af(),Y3e=zg();function q3e(t,e){return t&&j3e(e,Y3e(e),t)}uoe.exports=q3e});var hoe=I((qmt,foe)=>{function J3e(t){var e=[];if(t!=null)for(var r in Object(t))e.push(r);return e}foe.exports=J3e});var doe=I((Jmt,poe)=>{var W3e=Gs(),z3e=u0(),V3e=hoe(),_3e=Object.prototype,X3e=_3e.hasOwnProperty;function Z3e(t){if(!W3e(t))return V3e(t);var e=z3e(t),r=[];for(var i in t)i=="constructor"&&(e||!X3e.call(t,i))||r.push(i);return r}poe.exports=Z3e});var lf=I((Wmt,Coe)=>{var $3e=bF(),eWe=doe(),tWe=Hd();function rWe(t){return tWe(t)?$3e(t,!0):eWe(t)}Coe.exports=rWe});var Ioe=I((zmt,moe)=>{var iWe=Af(),nWe=lf();function sWe(t,e){return t&&iWe(e,nWe(e),t)}moe.exports=sWe});var UN=I((hC,cf)=>{var oWe=Ks(),Eoe=typeof hC=="object"&&hC&&!hC.nodeType&&hC,yoe=Eoe&&typeof cf=="object"&&cf&&!cf.nodeType&&cf,aWe=yoe&&yoe.exports===Eoe,woe=aWe?oWe.Buffer:void 0,Boe=woe?woe.allocUnsafe:void 0;function AWe(t,e){if(e)return t.slice();var r=t.length,i=Boe?Boe(r):new t.constructor(r);return t.copy(i),i}cf.exports=AWe});var HN=I((Vmt,Qoe)=>{function lWe(t,e){var r=-1,i=t.length;for(e||(e=Array(i));++r{var cWe=Af(),uWe=f0();function gWe(t,e){return cWe(t,uWe(t),e)}boe.exports=gWe});var H0=I((Xmt,Soe)=>{var fWe=vF(),hWe=fWe(Object.getPrototypeOf,Object);Soe.exports=hWe});var GN=I((Zmt,xoe)=>{var pWe=$B(),dWe=H0(),CWe=f0(),mWe=RF(),IWe=Object.getOwnPropertySymbols,EWe=IWe?function(t){for(var e=[];t;)pWe(e,CWe(t)),t=dWe(t);return e}:mWe;xoe.exports=EWe});var Poe=I(($mt,koe)=>{var yWe=Af(),wWe=GN();function BWe(t,e){return yWe(t,wWe(t),e)}koe.exports=BWe});var Roe=I((eIt,Doe)=>{var QWe=DF(),bWe=GN(),vWe=lf();function SWe(t){return QWe(t,vWe,bWe)}Doe.exports=SWe});var Noe=I((tIt,Foe)=>{var xWe=Object.prototype,kWe=xWe.hasOwnProperty;function PWe(t){var e=t.length,r=new t.constructor(e);return e&&typeof t[0]=="string"&&kWe.call(t,"index")&&(r.index=t.index,r.input=t.input),r}Foe.exports=PWe});var G0=I((rIt,Loe)=>{var Toe=kF();function DWe(t){var e=new t.constructor(t.byteLength);return new Toe(e).set(new Toe(t)),e}Loe.exports=DWe});var Ooe=I((iIt,Moe)=>{var RWe=G0();function FWe(t,e){var r=e?RWe(t.buffer):t.buffer;return new t.constructor(r,t.byteOffset,t.byteLength)}Moe.exports=FWe});var Uoe=I((nIt,Koe)=>{var NWe=/\w*$/;function LWe(t){var e=new t.constructor(t.source,NWe.exec(t));return e.lastIndex=t.lastIndex,e}Koe.exports=LWe});var qoe=I((sIt,Hoe)=>{var Goe=ac(),joe=Goe?Goe.prototype:void 0,Yoe=joe?joe.valueOf:void 0;function TWe(t){return Yoe?Object(Yoe.call(t)):{}}Hoe.exports=TWe});var jN=I((oIt,Joe)=>{var MWe=G0();function OWe(t,e){var r=e?MWe(t.buffer):t.buffer;return new t.constructor(r,t.byteOffset,t.length)}Joe.exports=OWe});var zoe=I((aIt,Woe)=>{var KWe=G0(),UWe=Ooe(),HWe=Uoe(),GWe=qoe(),jWe=jN(),YWe="[object Boolean]",qWe="[object Date]",JWe="[object Map]",WWe="[object Number]",zWe="[object RegExp]",VWe="[object Set]",_We="[object String]",XWe="[object Symbol]",ZWe="[object ArrayBuffer]",$We="[object DataView]",e8e="[object Float32Array]",t8e="[object Float64Array]",r8e="[object Int8Array]",i8e="[object Int16Array]",n8e="[object Int32Array]",s8e="[object Uint8Array]",o8e="[object Uint8ClampedArray]",a8e="[object Uint16Array]",A8e="[object Uint32Array]";function l8e(t,e,r){var i=t.constructor;switch(e){case ZWe:return KWe(t);case YWe:case qWe:return new i(+t);case $We:return UWe(t,r);case e8e:case t8e:case r8e:case i8e:case n8e:case s8e:case o8e:case a8e:case A8e:return jWe(t,r);case JWe:return new i;case WWe:case _We:return new i(t);case zWe:return HWe(t);case VWe:return new i;case XWe:return GWe(t)}}Woe.exports=l8e});var Xoe=I((AIt,Voe)=>{var c8e=Gs(),_oe=Object.create,u8e=function(){function t(){}return function(e){if(!c8e(e))return{};if(_oe)return _oe(e);t.prototype=e;var r=new t;return t.prototype=void 0,r}}();Voe.exports=u8e});var YN=I((lIt,Zoe)=>{var g8e=Xoe(),f8e=H0(),h8e=u0();function p8e(t){return typeof t.constructor=="function"&&!h8e(t)?g8e(f8e(t)):{}}Zoe.exports=p8e});var eae=I((cIt,$oe)=>{var d8e=jd(),C8e=Qo(),m8e="[object Map]";function I8e(t){return C8e(t)&&d8e(t)==m8e}$oe.exports=I8e});var nae=I((uIt,tae)=>{var E8e=eae(),y8e=A0(),rae=l0(),iae=rae&&rae.isMap,w8e=iae?y8e(iae):E8e;tae.exports=w8e});var oae=I((gIt,sae)=>{var B8e=jd(),Q8e=Qo(),b8e="[object Set]";function v8e(t){return Q8e(t)&&B8e(t)==b8e}sae.exports=v8e});var cae=I((fIt,aae)=>{var S8e=oae(),x8e=A0(),Aae=l0(),lae=Aae&&Aae.isSet,k8e=lae?x8e(lae):S8e;aae.exports=k8e});var pae=I((hIt,uae)=>{var P8e=Gd(),D8e=loe(),R8e=XB(),F8e=goe(),N8e=Ioe(),L8e=UN(),T8e=HN(),M8e=voe(),O8e=Poe(),K8e=FF(),U8e=Roe(),H8e=jd(),G8e=Noe(),j8e=zoe(),Y8e=YN(),q8e=As(),J8e=Od(),W8e=nae(),z8e=Gs(),V8e=cae(),_8e=zg(),X8e=lf(),Z8e=1,$8e=2,eze=4,gae="[object Arguments]",tze="[object Array]",rze="[object Boolean]",ize="[object Date]",nze="[object Error]",fae="[object Function]",sze="[object GeneratorFunction]",oze="[object Map]",aze="[object Number]",hae="[object Object]",Aze="[object RegExp]",lze="[object Set]",cze="[object String]",uze="[object Symbol]",gze="[object WeakMap]",fze="[object ArrayBuffer]",hze="[object DataView]",pze="[object Float32Array]",dze="[object Float64Array]",Cze="[object Int8Array]",mze="[object Int16Array]",Ize="[object Int32Array]",Eze="[object Uint8Array]",yze="[object Uint8ClampedArray]",wze="[object Uint16Array]",Bze="[object Uint32Array]",rr={};rr[gae]=rr[tze]=rr[fze]=rr[hze]=rr[rze]=rr[ize]=rr[pze]=rr[dze]=rr[Cze]=rr[mze]=rr[Ize]=rr[oze]=rr[aze]=rr[hae]=rr[Aze]=rr[lze]=rr[cze]=rr[uze]=rr[Eze]=rr[yze]=rr[wze]=rr[Bze]=!0;rr[nze]=rr[fae]=rr[gze]=!1;function j0(t,e,r,i,n,s){var o,a=e&Z8e,l=e&$8e,c=e&eze;if(r&&(o=n?r(t,i,n,s):r(t)),o!==void 0)return o;if(!z8e(t))return t;var u=q8e(t);if(u){if(o=G8e(t),!a)return T8e(t,o)}else{var g=H8e(t),f=g==fae||g==sze;if(J8e(t))return L8e(t,a);if(g==hae||g==gae||f&&!n){if(o=l||f?{}:Y8e(t),!a)return l?O8e(t,N8e(o,t)):M8e(t,F8e(o,t))}else{if(!rr[g])return n?t:{};o=j8e(t,g,a)}}s||(s=new P8e);var h=s.get(t);if(h)return h;s.set(t,o),V8e(t)?t.forEach(function(m){o.add(j0(m,e,r,m,t,s))}):W8e(t)&&t.forEach(function(m,E){o.set(E,j0(m,e,r,E,t,s))});var p=c?l?U8e:K8e:l?X8e:_8e,d=u?void 0:p(t);return D8e(d||t,function(m,E){d&&(E=m,m=t[E]),R8e(o,E,j0(m,e,r,E,t,s))}),o}uae.exports=j0});var qN=I((pIt,dae)=>{var Qze=pae(),bze=1,vze=4;function Sze(t){return Qze(t,bze|vze)}dae.exports=Sze});var mae=I((dIt,Cae)=>{var xze=tF();function kze(t,e,r){return t==null?t:xze(t,e,r)}Cae.exports=kze});var Qae=I((wIt,Bae)=>{function Pze(t){var e=t==null?0:t.length;return e?t[e-1]:void 0}Bae.exports=Pze});var vae=I((BIt,bae)=>{var Dze=xd(),Rze=zP();function Fze(t,e){return e.length<2?t:Dze(t,Rze(e,0,-1))}bae.exports=Fze});var xae=I((QIt,Sae)=>{var Nze=Gg(),Lze=Qae(),Tze=vae(),Mze=Sc();function Oze(t,e){return e=Nze(e,t),t=Tze(t,e),t==null||delete t[Mze(Lze(e))]}Sae.exports=Oze});var Pae=I((bIt,kae)=>{var Kze=xae();function Uze(t,e){return t==null?!0:Kze(t,e)}kae.exports=Uze});var Kae=I((tEt,Oae)=>{Oae.exports={name:"@yarnpkg/cli",version:"3.1.0",license:"BSD-2-Clause",main:"./sources/index.ts",dependencies:{"@yarnpkg/core":"workspace:^","@yarnpkg/fslib":"workspace:^","@yarnpkg/libzip":"workspace:^","@yarnpkg/parsers":"workspace:^","@yarnpkg/plugin-compat":"workspace:^","@yarnpkg/plugin-dlx":"workspace:^","@yarnpkg/plugin-essentials":"workspace:^","@yarnpkg/plugin-file":"workspace:^","@yarnpkg/plugin-git":"workspace:^","@yarnpkg/plugin-github":"workspace:^","@yarnpkg/plugin-http":"workspace:^","@yarnpkg/plugin-init":"workspace:^","@yarnpkg/plugin-link":"workspace:^","@yarnpkg/plugin-nm":"workspace:^","@yarnpkg/plugin-npm":"workspace:^","@yarnpkg/plugin-npm-cli":"workspace:^","@yarnpkg/plugin-pack":"workspace:^","@yarnpkg/plugin-patch":"workspace:^","@yarnpkg/plugin-pnp":"workspace:^","@yarnpkg/plugin-pnpm":"workspace:^","@yarnpkg/shell":"workspace:^",chalk:"^3.0.0","ci-info":"^3.2.0",clipanion:"^3.0.1",semver:"^7.1.2",tslib:"^1.13.0",typanion:"^3.3.0",yup:"^0.32.9"},devDependencies:{"@types/semver":"^7.1.0","@types/yup":"^0","@yarnpkg/builder":"workspace:^","@yarnpkg/monorepo":"workspace:^","@yarnpkg/pnpify":"workspace:^",micromatch:"^4.0.2",typescript:"^4.4.2"},peerDependencies:{"@yarnpkg/core":"workspace:^"},scripts:{postpack:"rm -rf lib",prepack:'run build:compile "$(pwd)"',"build:cli+hook":"run build:pnp:hook && builder build bundle","build:cli":"builder build bundle","run:cli":"builder run","update-local":"run build:cli --no-git-hash && rsync -a --delete bundles/ bin/"},publishConfig:{main:"./lib/index.js",types:"./lib/index.d.ts",bin:null},files:["/lib/**/*","!/lib/pluginConfiguration.*","!/lib/cli.*"],"@yarnpkg/builder":{bundles:{standard:["@yarnpkg/plugin-essentials","@yarnpkg/plugin-compat","@yarnpkg/plugin-dlx","@yarnpkg/plugin-file","@yarnpkg/plugin-git","@yarnpkg/plugin-github","@yarnpkg/plugin-http","@yarnpkg/plugin-init","@yarnpkg/plugin-link","@yarnpkg/plugin-nm","@yarnpkg/plugin-npm","@yarnpkg/plugin-npm-cli","@yarnpkg/plugin-pack","@yarnpkg/plugin-patch","@yarnpkg/plugin-pnp","@yarnpkg/plugin-pnpm"]}},repository:{type:"git",url:"ssh://git@github.com/yarnpkg/berry.git",directory:"packages/yarnpkg-cli"},engines:{node:">=12 <14 || 14.2 - 14.9 || >14.10.0"}}});var iL=I((SBt,QAe)=>{"use strict";QAe.exports=function(e,r){r===!0&&(r=0);var i=e.indexOf("://"),n=e.substring(0,i).split("+").filter(Boolean);return typeof r=="number"?n[r]:n}});var nL=I((xBt,bAe)=>{"use strict";var s4e=iL();function vAe(t){if(Array.isArray(t))return t.indexOf("ssh")!==-1||t.indexOf("rsync")!==-1;if(typeof t!="string")return!1;var e=s4e(t);return t=t.substring(t.indexOf("://")+3),vAe(e)?!0:t.indexOf("@"){"use strict";var o4e=iL(),a4e=nL(),A4e=require("querystring");function l4e(t){t=(t||"").trim();var e={protocols:o4e(t),protocol:null,port:null,resource:"",user:"",pathname:"",hash:"",search:"",href:t,query:Object.create(null)},r=t.indexOf("://"),i=-1,n=null,s=null;t.startsWith(".")&&(t.startsWith("./")&&(t=t.substring(2)),e.pathname=t,e.protocol="file");var o=t.charAt(1);return e.protocol||(e.protocol=e.protocols[0],e.protocol||(a4e(t)?e.protocol="ssh":((o==="/"||o==="~")&&(t=t.substring(2)),e.protocol="file"))),r!==-1&&(t=t.substring(r+3)),s=t.split("/"),e.protocol!=="file"?e.resource=s.shift():e.resource="",n=e.resource.split("@"),n.length===2&&(e.user=n[0],e.resource=n[1]),n=e.resource.split(":"),n.length===2&&(e.resource=n[0],n[1]?(e.port=Number(n[1]),isNaN(e.port)&&(e.port=null,s.unshift(n[1]))):e.port=null),s=s.filter(Boolean),e.protocol==="file"?e.pathname=e.href:e.pathname=e.pathname||(e.protocol!=="file"||e.href[0]==="/"?"/":"")+s.join("/"),n=e.pathname.split("#"),n.length===2&&(e.pathname=n[0],e.hash=n[1]),n=e.pathname.split("?"),n.length===2&&(e.pathname=n[0],e.search=n[1]),e.query=A4e.parse(e.search),e.href=e.href.replace(/\/$/,""),e.pathname=e.pathname.replace(/\/$/,""),e}SAe.exports=l4e});var DAe=I((PBt,kAe)=>{"use strict";var c4e=typeof URL=="undefined"?require("url").URL:URL,PAe=(t,e)=>e.some(r=>r instanceof RegExp?r.test(t):r===t);kAe.exports=(t,e)=>{e=Object.assign({defaultProtocol:"http:",normalizeProtocol:!0,forceHttp:!1,forceHttps:!1,stripHash:!0,stripWWW:!0,removeQueryParameters:[/^utm_\w+/i],removeTrailingSlash:!0,removeDirectoryIndex:!1,sortQueryParameters:!0},e),Reflect.has(e,"normalizeHttps")&&(e.forceHttp=e.normalizeHttps),Reflect.has(e,"normalizeHttp")&&(e.forceHttps=e.normalizeHttp),Reflect.has(e,"stripFragment")&&(e.stripHash=e.stripFragment),t=t.trim();let r=t.startsWith("//");!r&&/^\.*\//.test(t)||(t=t.replace(/^(?!(?:\w+:)?\/\/)|^\/\//,e.defaultProtocol));let n=new c4e(t);if(e.forceHttp&&e.forceHttps)throw new Error("The `forceHttp` and `forceHttps` options cannot be used together");if(e.forceHttp&&n.protocol==="https:"&&(n.protocol="http:"),e.forceHttps&&n.protocol==="http:"&&(n.protocol="https:"),e.stripHash&&(n.hash=""),n.pathname&&(n.pathname=n.pathname.replace(/((?![https?:]).)\/{2,}/g,(s,o)=>/^(?!\/)/g.test(o)?`${o}/`:"/")),n.pathname&&(n.pathname=decodeURI(n.pathname)),e.removeDirectoryIndex===!0&&(e.removeDirectoryIndex=[/^index\.[a-z]+$/]),Array.isArray(e.removeDirectoryIndex)&&e.removeDirectoryIndex.length>0){let s=n.pathname.split("/"),o=s[s.length-1];PAe(o,e.removeDirectoryIndex)&&(s=s.slice(0,s.length-1),n.pathname=s.slice(1).join("/")+"/")}if(n.hostname&&(n.hostname=n.hostname.replace(/\.$/,""),e.stripWWW&&/^www\.([a-z\-\d]{2,63})\.([a-z\.]{2,5})$/.test(n.hostname)&&(n.hostname=n.hostname.replace(/^www\./,""))),Array.isArray(e.removeQueryParameters))for(let s of[...n.searchParams.keys()])PAe(s,e.removeQueryParameters)&&n.searchParams.delete(s);return e.sortQueryParameters&&n.searchParams.sort(),t=n.toString(),(e.removeTrailingSlash||n.pathname==="/")&&(t=t.replace(/\/$/,"")),r&&!e.normalizeProtocol&&(t=t.replace(/^http:\/\//,"//")),t}});var FAe=I((DBt,RAe)=>{"use strict";var u4e=typeof Symbol=="function"&&typeof Symbol.iterator=="symbol"?function(t){return typeof t}:function(t){return t&&typeof Symbol=="function"&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t},g4e=xAe(),f4e=DAe();function h4e(t){var e=arguments.length>1&&arguments[1]!==void 0?arguments[1]:!1;if(typeof t!="string"||!t.trim())throw new Error("Invalid url.");e&&((typeof e=="undefined"?"undefined":u4e(e))!=="object"&&(e={stripFragment:!1}),t=f4e(t,e));var r=g4e(t);return r}RAe.exports=h4e});var TAe=I((RBt,NAe)=>{"use strict";var p4e=FAe(),LAe=nL();function d4e(t){var e=p4e(t);e.token="";var r=e.user.split(":");return r.length===2&&(r[1]==="x-oauth-basic"?e.token=r[0]:r[0]==="x-token-auth"&&(e.token=r[1])),LAe(e.protocols)||LAe(t)?e.protocol="ssh":e.protocols.length?e.protocol=e.protocols[0]:e.protocol="file",e.href=e.href.replace(/\/$/,""),e}NAe.exports=d4e});var OAe=I((FBt,MAe)=>{"use strict";var C4e=TAe();function sL(t){if(typeof t!="string")throw new Error("The url must be a string.");var e=C4e(t),r=e.resource.split("."),i=null;switch(e.toString=function(l){return sL.stringify(this,l)},e.source=r.length>2?r.slice(1-r.length).join("."):e.source=e.resource,e.git_suffix=/\.git$/.test(e.pathname),e.name=decodeURIComponent(e.pathname.replace(/^\//,"").replace(/\.git$/,"")),e.owner=decodeURIComponent(e.user),e.source){case"git.cloudforge.com":e.owner=e.user,e.organization=r[0],e.source="cloudforge.com";break;case"visualstudio.com":if(e.resource==="vs-ssh.visualstudio.com"){i=e.name.split("/"),i.length===4&&(e.organization=i[1],e.owner=i[2],e.name=i[3],e.full_name=i[2]+"/"+i[3]);break}else{i=e.name.split("/"),i.length===2?(e.owner=i[1],e.name=i[1],e.full_name="_git/"+e.name):i.length===3?(e.name=i[2],i[0]==="DefaultCollection"?(e.owner=i[2],e.organization=i[0],e.full_name=e.organization+"/_git/"+e.name):(e.owner=i[0],e.full_name=e.owner+"/_git/"+e.name)):i.length===4&&(e.organization=i[0],e.owner=i[1],e.name=i[3],e.full_name=e.organization+"/"+e.owner+"/_git/"+e.name);break}case"dev.azure.com":case"azure.com":if(e.resource==="ssh.dev.azure.com"){i=e.name.split("/"),i.length===4&&(e.organization=i[1],e.owner=i[2],e.name=i[3]);break}else{i=e.name.split("/"),i.length===5?(e.organization=i[0],e.owner=i[1],e.name=i[4],e.full_name="_git/"+e.name):i.length===3?(e.name=i[2],i[0]==="DefaultCollection"?(e.owner=i[2],e.organization=i[0],e.full_name=e.organization+"/_git/"+e.name):(e.owner=i[0],e.full_name=e.owner+"/_git/"+e.name)):i.length===4&&(e.organization=i[0],e.owner=i[1],e.name=i[3],e.full_name=e.organization+"/"+e.owner+"/_git/"+e.name);break}default:i=e.name.split("/");var n=i.length-1;if(i.length>=2){var s=i.indexOf("blob",2),o=i.indexOf("tree",2),a=i.indexOf("commit",2);n=s>0?s-1:o>0?o-1:a>0?a-1:n,e.owner=i.slice(0,n).join("/"),e.name=i[n],a&&(e.commit=i[n+2])}e.ref="",e.filepathtype="",e.filepath="",i.length>n+2&&["blob","tree"].indexOf(i[n+1])>=0&&(e.filepathtype=i[n+1],e.ref=i[n+2],i.length>n+3&&(e.filepath=i.slice(n+3).join("/"))),e.organization=e.owner;break}return e.full_name||(e.full_name=e.owner,e.name&&(e.full_name&&(e.full_name+="/"),e.full_name+=e.name)),e}sL.stringify=function(t,e){e=e||(t.protocols&&t.protocols.length?t.protocols.join("+"):t.protocol);var r=t.port?":"+t.port:"",i=t.user||"git",n=t.git_suffix?".git":"";switch(e){case"ssh":return r?"ssh://"+i+"@"+t.resource+r+"/"+t.full_name+n:i+"@"+t.resource+":"+t.full_name+n;case"git+ssh":case"ssh+git":case"ftp":case"ftps":return e+"://"+i+"@"+t.resource+r+"/"+t.full_name+n;case"http":case"https":var s=t.token?m4e(t):t.user&&(t.protocols.includes("http")||t.protocols.includes("https"))?t.user+"@":"";return e+"://"+s+t.resource+r+"/"+t.full_name+n;default:return t.href}};function m4e(t){switch(t.source){case"bitbucket.org":return"x-token-auth:"+t.token+"@";default:return t.token+"@"}}MAe.exports=sL});var NL=I((Obt,ole)=>{var M4e=jg(),O4e=Kg();function K4e(t,e,r){(r!==void 0&&!O4e(t[e],r)||r===void 0&&!(e in t))&&M4e(t,e,r)}ole.exports=K4e});var Ale=I((Kbt,ale)=>{var U4e=Hd(),H4e=Qo();function G4e(t){return H4e(t)&&U4e(t)}ale.exports=G4e});var ule=I((Ubt,lle)=>{var j4e=Ac(),Y4e=H0(),q4e=Qo(),J4e="[object Object]",W4e=Function.prototype,z4e=Object.prototype,cle=W4e.toString,V4e=z4e.hasOwnProperty,_4e=cle.call(Object);function X4e(t){if(!q4e(t)||j4e(t)!=J4e)return!1;var e=Y4e(t);if(e===null)return!0;var r=V4e.call(e,"constructor")&&e.constructor;return typeof r=="function"&&r instanceof r&&cle.call(r)==_4e}lle.exports=X4e});var LL=I((Hbt,gle)=>{function Z4e(t,e){if(!(e==="constructor"&&typeof t[e]=="function")&&e!="__proto__")return t[e]}gle.exports=Z4e});var hle=I((Gbt,fle)=>{var $4e=Af(),e5e=lf();function t5e(t){return $4e(t,e5e(t))}fle.exports=t5e});var Ele=I((jbt,ple)=>{var dle=NL(),r5e=UN(),i5e=jN(),n5e=HN(),s5e=YN(),Cle=Pd(),mle=As(),o5e=Ale(),a5e=Od(),A5e=zB(),l5e=Gs(),c5e=ule(),u5e=c0(),Ile=LL(),g5e=hle();function f5e(t,e,r,i,n,s,o){var a=Ile(t,r),l=Ile(e,r),c=o.get(l);if(c){dle(t,r,c);return}var u=s?s(a,l,r+"",t,e,o):void 0,g=u===void 0;if(g){var f=mle(l),h=!f&&a5e(l),p=!f&&!h&&u5e(l);u=l,f||h||p?mle(a)?u=a:o5e(a)?u=n5e(a):h?(g=!1,u=r5e(l,!0)):p?(g=!1,u=i5e(l,!0)):u=[]:c5e(l)||Cle(l)?(u=a,Cle(a)?u=g5e(a):(!l5e(a)||A5e(a))&&(u=s5e(l))):g=!1}g&&(o.set(l,u),n(u,l,i,s,o),o.delete(l)),dle(t,r,u)}ple.exports=f5e});var Ble=I((Ybt,yle)=>{var h5e=Gd(),p5e=NL(),d5e=BF(),C5e=Ele(),m5e=Gs(),I5e=lf(),E5e=LL();function wle(t,e,r,i,n){t!==e&&d5e(e,function(s,o){if(n||(n=new h5e),m5e(s))C5e(t,e,o,r,wle,i,n);else{var a=i?i(E5e(t,o),s,o+"",t,e,n):void 0;a===void 0&&(a=s),p5e(t,o,a)}},I5e)}yle.exports=wle});var ble=I((qbt,Qle)=>{var y5e=e0(),w5e=nF(),B5e=sF();function Q5e(t,e){return B5e(w5e(t,e,y5e),t+"")}Qle.exports=Q5e});var Sle=I((Jbt,vle)=>{var b5e=Kg(),v5e=Hd(),S5e=kd(),x5e=Gs();function k5e(t,e,r){if(!x5e(r))return!1;var i=typeof e;return(i=="number"?v5e(r)&&S5e(e,r.length):i=="string"&&e in r)?b5e(r[e],t):!1}vle.exports=k5e});var kle=I((Wbt,xle)=>{var P5e=ble(),D5e=Sle();function R5e(t){return P5e(function(e,r){var i=-1,n=r.length,s=n>1?r[n-1]:void 0,o=n>2?r[2]:void 0;for(s=t.length>3&&typeof s=="function"?(n--,s):void 0,o&&D5e(r[0],r[1],o)&&(s=n<3?void 0:s,n=1),e=Object(e);++i{var F5e=Ble(),N5e=kle(),L5e=N5e(function(t,e,r){F5e(t,e,r)});Ple.exports=L5e});var Wle=I(($vt,Jle)=>{var VL;Jle.exports=()=>(typeof VL=="undefined"&&(VL=require("zlib").brotliDecompressSync(Buffer.from("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","base64")).toString()),VL)});var $le=I(XL=>{function pf(t,e){if(typeof t=="string")return t;if(t){let r,i;if(Array.isArray(t)){for(r=0;r0)return(f=pf(n[g],u))?f.replace("*",c.substring(g.length-1)):Gc(i,c,1)}return Gc(i,c)}}function l6e(t,e={}){let r=0,i,n=e.browser,s=e.fields||["module","main"];for(n&&!s.includes("browser")&&s.unshift("browser");r{var eT;nce.exports=()=>(typeof eT=="undefined"&&(eT=require("zlib").brotliDecompressSync(Buffer.from("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","base64")).toString()),eT)});var gce=I((aT,AT)=>{(function(t){aT&&typeof aT=="object"&&typeof AT!="undefined"?AT.exports=t():typeof define=="function"&&define.amd?define([],t):typeof window!="undefined"?window.isWindows=t():typeof global!="undefined"?global.isWindows=t():typeof self!="undefined"?self.isWindows=t():this.isWindows=t()})(function(){"use strict";return function(){return process&&(process.platform==="win32"||/^(msys|cygwin)$/.test(process.env.OSTYPE))}})});var dce=I((Dxt,fce)=>{"use strict";lT.ifExists=I6e;var mf=require("util"),Is=require("path"),hce=gce(),E6e=/^#!\s*(?:\/usr\/bin\/env)?\s*([^ \t]+)(.*)$/,y6e={createPwshFile:!0,createCmdFile:hce(),fs:require("fs")},w6e=new Map([[".js","node"],[".cjs","node"],[".mjs","node"],[".cmd","cmd"],[".bat","cmd"],[".ps1","pwsh"],[".sh","sh"]]);function pce(t){let e=P(P({},y6e),t),r=e.fs;return e.fs_={chmod:r.chmod?mf.promisify(r.chmod):async()=>{},mkdir:mf.promisify(r.mkdir),readFile:mf.promisify(r.readFile),stat:mf.promisify(r.stat),unlink:mf.promisify(r.unlink),writeFile:mf.promisify(r.writeFile)},e}async function lT(t,e,r){let i=pce(r);await i.fs_.stat(t),await B6e(t,e,i)}function I6e(t,e,r){return lT(t,e,r).catch(()=>{})}function Q6e(t,e){return e.fs_.unlink(t).catch(()=>{})}async function B6e(t,e,r){let i=await S6e(t,r);return await b6e(e,r),v6e(t,e,i,r)}function b6e(t,e){return e.fs_.mkdir(Is.dirname(t),{recursive:!0})}function v6e(t,e,r,i){let n=pce(i),s=[{generator:P6e,extension:""}];return n.createCmdFile&&s.push({generator:k6e,extension:".cmd"}),n.createPwshFile&&s.push({generator:D6e,extension:".ps1"}),Promise.all(s.map(o=>x6e(t,e+o.extension,r,o.generator,n)))}function R6e(t,e){return Q6e(t,e)}function N6e(t,e){return F6e(t,e)}async function S6e(t,e){let n=(await e.fs_.readFile(t,"utf8")).trim().split(/\r*\n/)[0].match(E6e);if(!n){let s=Is.extname(t).toLowerCase();return{program:w6e.get(s)||null,additionalArgs:""}}return{program:n[1],additionalArgs:n[2]}}async function x6e(t,e,r,i,n){let s=n.preserveSymlinks?"--preserve-symlinks":"",o=[r.additionalArgs,s].filter(a=>a).join(" ");return n=Object.assign({},n,{prog:r.program,args:o}),await R6e(e,n),await n.fs_.writeFile(e,i(t,e,n),"utf8"),N6e(e,n)}function k6e(t,e,r){let n=Is.relative(Is.dirname(e),t).split("/").join("\\"),s=Is.isAbsolute(n)?`"${n}"`:`"%~dp0\\${n}"`,o,a=r.prog,l=r.args||"",c=cT(r.nodePath).win32;a?(o=`"%~dp0\\${a}.exe"`,n=s):(a=s,l="",n="");let u=r.progArgs?`${r.progArgs.join(" ")} `:"",g=c?`@SET NODE_PATH=${c}\r +`:"";return o?g+=`@IF EXIST ${o} (\r + ${o} ${l} ${n} ${u}%*\r +) ELSE (\r + @SETLOCAL\r + @SET PATHEXT=%PATHEXT:;.JS;=;%\r + ${a} ${l} ${n} ${u}%*\r +)\r +`:g+=`@${a} ${l} ${n} ${u}%*\r +`,g}function P6e(t,e,r){let i=Is.relative(Is.dirname(e),t),n=r.prog&&r.prog.split("\\").join("/"),s;i=i.split("\\").join("/");let o=Is.isAbsolute(i)?`"${i}"`:`"$basedir/${i}"`,a=r.args||"",l=cT(r.nodePath).posix;n?(s=`"$basedir/${r.prog}"`,i=o):(n=o,a="",i="");let c=r.progArgs?`${r.progArgs.join(" ")} `:"",u=`#!/bin/sh +basedir=$(dirname "$(echo "$0" | sed -e 's,\\\\,/,g')") + +case \`uname\` in + *CYGWIN*) basedir=\`cygpath -w "$basedir"\`;; +esac + +`,g=r.nodePath?`export NODE_PATH="${l}" +`:"";return s?u+=`${g}if [ -x ${s} ]; then + exec ${s} ${a} ${i} ${c}"$@" +else + exec ${n} ${a} ${i} ${c}"$@" +fi +`:u+=`${g}${n} ${a} ${i} ${c}"$@" +exit $? +`,u}function D6e(t,e,r){let i=Is.relative(Is.dirname(e),t),n=r.prog&&r.prog.split("\\").join("/"),s=n&&`"${n}$exe"`,o;i=i.split("\\").join("/");let a=Is.isAbsolute(i)?`"${i}"`:`"$basedir/${i}"`,l=r.args||"",c=cT(r.nodePath),u=c.win32,g=c.posix;s?(o=`"$basedir/${r.prog}$exe"`,i=a):(s=a,l="",i="");let f=r.progArgs?`${r.progArgs.join(" ")} `:"",h=`#!/usr/bin/env pwsh +$basedir=Split-Path $MyInvocation.MyCommand.Definition -Parent + +$exe="" +${r.nodePath?`$env_node_path=$env:NODE_PATH +$env:NODE_PATH="${u}" +`:""}if ($PSVersionTable.PSVersion -lt "6.0" -or $IsWindows) { + # Fix case when both the Windows and Linux builds of Node + # are installed in the same directory + $exe=".exe" +}`;return r.nodePath&&(h+=` else { + $env:NODE_PATH="${g}" +}`),o?h+=` +$ret=0 +if (Test-Path ${o}) { + # Support pipeline input + if ($MyInvocation.ExpectingInput) { + $input | & ${o} ${l} ${i} ${f}$args + } else { + & ${o} ${l} ${i} ${f}$args + } + $ret=$LASTEXITCODE +} else { + # Support pipeline input + if ($MyInvocation.ExpectingInput) { + $input | & ${s} ${l} ${i} ${f}$args + } else { + & ${s} ${l} ${i} ${f}$args + } + $ret=$LASTEXITCODE +} +${r.nodePath?`$env:NODE_PATH=$env_node_path +`:""}exit $ret +`:h+=` +# Support pipeline input +if ($MyInvocation.ExpectingInput) { + $input | & ${s} ${l} ${i} ${f}$args +} else { + & ${s} ${l} ${i} ${f}$args +} +${r.nodePath?`$env:NODE_PATH=$env_node_path +`:""}exit $LASTEXITCODE +`,h}function F6e(t,e){return e.fs_.chmod(t,493)}function cT(t){if(!t)return{win32:"",posix:""};let e=typeof t=="string"?t.split(Is.delimiter):Array.from(t),r={};for(let i=0;i`/mnt/${a.toLowerCase()}`):e[i];r.win32=r.win32?`${r.win32};${n}`:n,r.posix=r.posix?`${r.posix}:${s}`:s,r[i]={win32:n,posix:s}}return r}fce.exports=lT});var PT=I((fPt,Nce)=>{Nce.exports=require("stream")});var Oce=I((hPt,Lce)=>{"use strict";function Tce(t,e){var r=Object.keys(t);if(Object.getOwnPropertySymbols){var i=Object.getOwnPropertySymbols(t);e&&(i=i.filter(function(n){return Object.getOwnPropertyDescriptor(t,n).enumerable})),r.push.apply(r,i)}return r}function e9e(t){for(var e=1;e0?this.tail.next=i:this.head=i,this.tail=i,++this.length}},{key:"unshift",value:function(r){var i={data:r,next:this.head};this.length===0&&(this.tail=i),this.head=i,++this.length}},{key:"shift",value:function(){if(this.length!==0){var r=this.head.data;return this.length===1?this.head=this.tail=null:this.head=this.head.next,--this.length,r}}},{key:"clear",value:function(){this.head=this.tail=null,this.length=0}},{key:"join",value:function(r){if(this.length===0)return"";for(var i=this.head,n=""+i.data;i=i.next;)n+=r+i.data;return n}},{key:"concat",value:function(r){if(this.length===0)return iQ.alloc(0);for(var i=iQ.allocUnsafe(r>>>0),n=this.head,s=0;n;)o9e(n.data,i,s),s+=n.data.length,n=n.next;return i}},{key:"consume",value:function(r,i){var n;return ro.length?o.length:r;if(a===o.length?s+=o:s+=o.slice(0,r),r-=a,r===0){a===o.length?(++n,i.next?this.head=i.next:this.head=this.tail=null):(this.head=i,i.data=o.slice(a));break}++n}return this.length-=n,s}},{key:"_getBuffer",value:function(r){var i=iQ.allocUnsafe(r),n=this.head,s=1;for(n.data.copy(i),r-=n.data.length;n=n.next;){var o=n.data,a=r>o.length?o.length:r;if(o.copy(i,i.length-r,0,a),r-=a,r===0){a===o.length?(++s,n.next?this.head=n.next:this.head=this.tail=null):(this.head=n,n.data=o.slice(a));break}++s}return this.length-=s,i}},{key:s9e,value:function(r,i){return DT(this,e9e({},i,{depth:0,customInspect:!1}))}}]),t}()});var FT=I((pPt,Kce)=>{"use strict";function a9e(t,e){var r=this,i=this._readableState&&this._readableState.destroyed,n=this._writableState&&this._writableState.destroyed;return i||n?(e?e(t):t&&(this._writableState?this._writableState.errorEmitted||(this._writableState.errorEmitted=!0,process.nextTick(RT,this,t)):process.nextTick(RT,this,t)),this):(this._readableState&&(this._readableState.destroyed=!0),this._writableState&&(this._writableState.destroyed=!0),this._destroy(t||null,function(s){!e&&s?r._writableState?r._writableState.errorEmitted?process.nextTick(nQ,r):(r._writableState.errorEmitted=!0,process.nextTick(Uce,r,s)):process.nextTick(Uce,r,s):e?(process.nextTick(nQ,r),e(s)):process.nextTick(nQ,r)}),this)}function Uce(t,e){RT(t,e),nQ(t)}function nQ(t){t._writableState&&!t._writableState.emitClose||t._readableState&&!t._readableState.emitClose||t.emit("close")}function A9e(){this._readableState&&(this._readableState.destroyed=!1,this._readableState.reading=!1,this._readableState.ended=!1,this._readableState.endEmitted=!1),this._writableState&&(this._writableState.destroyed=!1,this._writableState.ended=!1,this._writableState.ending=!1,this._writableState.finalCalled=!1,this._writableState.prefinished=!1,this._writableState.finished=!1,this._writableState.errorEmitted=!1)}function RT(t,e){t.emit("error",e)}function l9e(t,e){var r=t._readableState,i=t._writableState;r&&r.autoDestroy||i&&i.autoDestroy?t.destroy(e):t.emit("error",e)}Kce.exports={destroy:a9e,undestroy:A9e,errorOrDestroy:l9e}});var VA=I((dPt,Hce)=>{"use strict";var Gce={};function Es(t,e,r){r||(r=Error);function i(s,o,a){return typeof e=="string"?e:e(s,o,a)}class n extends r{constructor(o,a,l){super(i(o,a,l))}}n.prototype.name=r.name,n.prototype.code=t,Gce[t]=n}function jce(t,e){if(Array.isArray(t)){let r=t.length;return t=t.map(i=>String(i)),r>2?`one of ${e} ${t.slice(0,r-1).join(", ")}, or `+t[r-1]:r===2?`one of ${e} ${t[0]} or ${t[1]}`:`of ${e} ${t[0]}`}else return`of ${e} ${String(t)}`}function c9e(t,e,r){return t.substr(!r||r<0?0:+r,e.length)===e}function u9e(t,e,r){return(r===void 0||r>t.length)&&(r=t.length),t.substring(r-e.length,r)===e}function g9e(t,e,r){return typeof r!="number"&&(r=0),r+e.length>t.length?!1:t.indexOf(e,r)!==-1}Es("ERR_INVALID_OPT_VALUE",function(t,e){return'The value "'+e+'" is invalid for option "'+t+'"'},TypeError);Es("ERR_INVALID_ARG_TYPE",function(t,e,r){let i;typeof e=="string"&&c9e(e,"not ")?(i="must not be",e=e.replace(/^not /,"")):i="must be";let n;if(u9e(t," argument"))n=`The ${t} ${i} ${jce(e,"type")}`;else{let s=g9e(t,".")?"property":"argument";n=`The "${t}" ${s} ${i} ${jce(e,"type")}`}return n+=`. Received type ${typeof r}`,n},TypeError);Es("ERR_STREAM_PUSH_AFTER_EOF","stream.push() after EOF");Es("ERR_METHOD_NOT_IMPLEMENTED",function(t){return"The "+t+" method is not implemented"});Es("ERR_STREAM_PREMATURE_CLOSE","Premature close");Es("ERR_STREAM_DESTROYED",function(t){return"Cannot call "+t+" after a stream was destroyed"});Es("ERR_MULTIPLE_CALLBACK","Callback called multiple times");Es("ERR_STREAM_CANNOT_PIPE","Cannot pipe, not readable");Es("ERR_STREAM_WRITE_AFTER_END","write after end");Es("ERR_STREAM_NULL_VALUES","May not write null values to stream",TypeError);Es("ERR_UNKNOWN_ENCODING",function(t){return"Unknown encoding: "+t},TypeError);Es("ERR_STREAM_UNSHIFT_AFTER_END_EVENT","stream.unshift() after end event");Hce.exports.codes=Gce});var NT=I((CPt,Yce)=>{"use strict";var f9e=VA().codes.ERR_INVALID_OPT_VALUE;function h9e(t,e,r){return t.highWaterMark!=null?t.highWaterMark:e?t[r]:null}function p9e(t,e,r,i){var n=h9e(e,i,r);if(n!=null){if(!(isFinite(n)&&Math.floor(n)===n)||n<0){var s=i?r:"highWaterMark";throw new f9e(s,n)}return Math.floor(n)}return t.objectMode?16:16*1024}Yce.exports={getHighWaterMark:p9e}});var qce=I((mPt,LT)=>{typeof Object.create=="function"?LT.exports=function(e,r){r&&(e.super_=r,e.prototype=Object.create(r.prototype,{constructor:{value:e,enumerable:!1,writable:!0,configurable:!0}}))}:LT.exports=function(e,r){if(r){e.super_=r;var i=function(){};i.prototype=r.prototype,e.prototype=new i,e.prototype.constructor=e}}});var _A=I((IPt,TT)=>{try{if(MT=require("util"),typeof MT.inherits!="function")throw"";TT.exports=MT.inherits}catch(t){TT.exports=qce()}var MT});var Wce=I((EPt,Jce)=>{Jce.exports=require("util").deprecate});var UT=I((yPt,zce)=>{"use strict";zce.exports=Sr;function Vce(t){var e=this;this.next=null,this.entry=null,this.finish=function(){d9e(e,t)}}var Ef;Sr.WritableState=em;var C9e={deprecate:Wce()},_ce=PT(),sQ=require("buffer").Buffer,m9e=global.Uint8Array||function(){};function I9e(t){return sQ.from(t)}function E9e(t){return sQ.isBuffer(t)||t instanceof m9e}var OT=FT(),y9e=NT(),w9e=y9e.getHighWaterMark,XA=VA().codes,B9e=XA.ERR_INVALID_ARG_TYPE,Q9e=XA.ERR_METHOD_NOT_IMPLEMENTED,b9e=XA.ERR_MULTIPLE_CALLBACK,v9e=XA.ERR_STREAM_CANNOT_PIPE,S9e=XA.ERR_STREAM_DESTROYED,x9e=XA.ERR_STREAM_NULL_VALUES,k9e=XA.ERR_STREAM_WRITE_AFTER_END,P9e=XA.ERR_UNKNOWN_ENCODING,yf=OT.errorOrDestroy;_A()(Sr,_ce);function D9e(){}function em(t,e,r){Ef=Ef||Yc(),t=t||{},typeof r!="boolean"&&(r=e instanceof Ef),this.objectMode=!!t.objectMode,r&&(this.objectMode=this.objectMode||!!t.writableObjectMode),this.highWaterMark=w9e(this,t,"writableHighWaterMark",r),this.finalCalled=!1,this.needDrain=!1,this.ending=!1,this.ended=!1,this.finished=!1,this.destroyed=!1;var i=t.decodeStrings===!1;this.decodeStrings=!i,this.defaultEncoding=t.defaultEncoding||"utf8",this.length=0,this.writing=!1,this.corked=0,this.sync=!0,this.bufferProcessing=!1,this.onwrite=function(n){R9e(e,n)},this.writecb=null,this.writelen=0,this.bufferedRequest=null,this.lastBufferedRequest=null,this.pendingcb=0,this.prefinished=!1,this.errorEmitted=!1,this.emitClose=t.emitClose!==!1,this.autoDestroy=!!t.autoDestroy,this.bufferedRequestCount=0,this.corkedRequestsFree=new Vce(this)}em.prototype.getBuffer=function(){for(var e=this.bufferedRequest,r=[];e;)r.push(e),e=e.next;return r};(function(){try{Object.defineProperty(em.prototype,"buffer",{get:C9e.deprecate(function(){return this.getBuffer()},"_writableState.buffer is deprecated. Use _writableState.getBuffer instead.","DEP0003")})}catch(t){}})();var oQ;typeof Symbol=="function"&&Symbol.hasInstance&&typeof Function.prototype[Symbol.hasInstance]=="function"?(oQ=Function.prototype[Symbol.hasInstance],Object.defineProperty(Sr,Symbol.hasInstance,{value:function(e){return oQ.call(this,e)?!0:this!==Sr?!1:e&&e._writableState instanceof em}})):oQ=function(e){return e instanceof this};function Sr(t){Ef=Ef||Yc();var e=this instanceof Ef;if(!e&&!oQ.call(Sr,this))return new Sr(t);this._writableState=new em(t,this,e),this.writable=!0,t&&(typeof t.write=="function"&&(this._write=t.write),typeof t.writev=="function"&&(this._writev=t.writev),typeof t.destroy=="function"&&(this._destroy=t.destroy),typeof t.final=="function"&&(this._final=t.final)),_ce.call(this)}Sr.prototype.pipe=function(){yf(this,new v9e)};function F9e(t,e){var r=new k9e;yf(t,r),process.nextTick(e,r)}function N9e(t,e,r,i){var n;return r===null?n=new x9e:typeof r!="string"&&!e.objectMode&&(n=new B9e("chunk",["string","Buffer"],r)),n?(yf(t,n),process.nextTick(i,n),!1):!0}Sr.prototype.write=function(t,e,r){var i=this._writableState,n=!1,s=!i.objectMode&&E9e(t);return s&&!sQ.isBuffer(t)&&(t=I9e(t)),typeof e=="function"&&(r=e,e=null),s?e="buffer":e||(e=i.defaultEncoding),typeof r!="function"&&(r=D9e),i.ending?F9e(this,r):(s||N9e(this,i,t,r))&&(i.pendingcb++,n=L9e(this,i,s,t,e,r)),n};Sr.prototype.cork=function(){this._writableState.corked++};Sr.prototype.uncork=function(){var t=this._writableState;t.corked&&(t.corked--,!t.writing&&!t.corked&&!t.bufferProcessing&&t.bufferedRequest&&Xce(this,t))};Sr.prototype.setDefaultEncoding=function(e){if(typeof e=="string"&&(e=e.toLowerCase()),!(["hex","utf8","utf-8","ascii","binary","base64","ucs2","ucs-2","utf16le","utf-16le","raw"].indexOf((e+"").toLowerCase())>-1))throw new P9e(e);return this._writableState.defaultEncoding=e,this};Object.defineProperty(Sr.prototype,"writableBuffer",{enumerable:!1,get:function(){return this._writableState&&this._writableState.getBuffer()}});function T9e(t,e,r){return!t.objectMode&&t.decodeStrings!==!1&&typeof e=="string"&&(e=sQ.from(e,r)),e}Object.defineProperty(Sr.prototype,"writableHighWaterMark",{enumerable:!1,get:function(){return this._writableState.highWaterMark}});function L9e(t,e,r,i,n,s){if(!r){var o=T9e(e,i,n);i!==o&&(r=!0,n="buffer",i=o)}var a=e.objectMode?1:i.length;e.length+=a;var l=e.length{"use strict";var j9e=Object.keys||function(t){var e=[];for(var r in t)e.push(r);return e};eue.exports=Mo;var tue=HT(),GT=UT();_A()(Mo,tue);for(jT=j9e(GT.prototype),aQ=0;aQ{var lQ=require("buffer"),qa=lQ.Buffer;function iue(t,e){for(var r in t)e[r]=t[r]}qa.from&&qa.alloc&&qa.allocUnsafe&&qa.allocUnsafeSlow?rue.exports=lQ:(iue(lQ,YT),YT.Buffer=wf);function wf(t,e,r){return qa(t,e,r)}iue(qa,wf);wf.from=function(t,e,r){if(typeof t=="number")throw new TypeError("Argument must not be a number");return qa(t,e,r)};wf.alloc=function(t,e,r){if(typeof t!="number")throw new TypeError("Argument must be a number");var i=qa(t);return e!==void 0?typeof r=="string"?i.fill(e,r):i.fill(e):i.fill(0),i};wf.allocUnsafe=function(t){if(typeof t!="number")throw new TypeError("Argument must be a number");return qa(t)};wf.allocUnsafeSlow=function(t){if(typeof t!="number")throw new TypeError("Argument must be a number");return lQ.SlowBuffer(t)}});var WT=I(sue=>{"use strict";var qT=nue().Buffer,oue=qT.isEncoding||function(t){switch(t=""+t,t&&t.toLowerCase()){case"hex":case"utf8":case"utf-8":case"ascii":case"binary":case"base64":case"ucs2":case"ucs-2":case"utf16le":case"utf-16le":case"raw":return!0;default:return!1}};function J9e(t){if(!t)return"utf8";for(var e;;)switch(t){case"utf8":case"utf-8":return"utf8";case"ucs2":case"ucs-2":case"utf16le":case"utf-16le":return"utf16le";case"latin1":case"binary":return"latin1";case"base64":case"ascii":case"hex":return t;default:if(e)return;t=(""+t).toLowerCase(),e=!0}}function W9e(t){var e=J9e(t);if(typeof e!="string"&&(qT.isEncoding===oue||!oue(t)))throw new Error("Unknown encoding: "+t);return e||t}sue.StringDecoder=rm;function rm(t){this.encoding=W9e(t);var e;switch(this.encoding){case"utf16le":this.text=V9e,this.end=_9e,e=4;break;case"utf8":this.fillLast=z9e,e=4;break;case"base64":this.text=X9e,this.end=Z9e,e=3;break;default:this.write=$9e,this.end=e7e;return}this.lastNeed=0,this.lastTotal=0,this.lastChar=qT.allocUnsafe(e)}rm.prototype.write=function(t){if(t.length===0)return"";var e,r;if(this.lastNeed){if(e=this.fillLast(t),e===void 0)return"";r=this.lastNeed,this.lastNeed=0}else r=0;return r>5==6?2:t>>4==14?3:t>>3==30?4:t>>6==2?-1:-2}function i7e(t,e,r){var i=e.length-1;if(i=0?(n>0&&(t.lastNeed=n-1),n):--i=0?(n>0&&(t.lastNeed=n-2),n):--i=0?(n>0&&(n===2?n=0:t.lastNeed=n-3),n):0))}function n7e(t,e,r){if((e[0]&192)!=128)return t.lastNeed=0,"\uFFFD";if(t.lastNeed>1&&e.length>1){if((e[1]&192)!=128)return t.lastNeed=1,"\uFFFD";if(t.lastNeed>2&&e.length>2&&(e[2]&192)!=128)return t.lastNeed=2,"\uFFFD"}}function z9e(t){var e=this.lastTotal-this.lastNeed,r=n7e(this,t,e);if(r!==void 0)return r;if(this.lastNeed<=t.length)return t.copy(this.lastChar,e,0,this.lastNeed),this.lastChar.toString(this.encoding,0,this.lastTotal);t.copy(this.lastChar,e,0,t.length),this.lastNeed-=t.length}function r7e(t,e){var r=i7e(this,t,e);if(!this.lastNeed)return t.toString("utf8",e);this.lastTotal=r;var i=t.length-(r-this.lastNeed);return t.copy(this.lastChar,0,i),t.toString("utf8",e,i)}function t7e(t){var e=t&&t.length?this.write(t):"";return this.lastNeed?e+"\uFFFD":e}function V9e(t,e){if((t.length-e)%2==0){var r=t.toString("utf16le",e);if(r){var i=r.charCodeAt(r.length-1);if(i>=55296&&i<=56319)return this.lastNeed=2,this.lastTotal=4,this.lastChar[0]=t[t.length-2],this.lastChar[1]=t[t.length-1],r.slice(0,-1)}return r}return this.lastNeed=1,this.lastTotal=2,this.lastChar[0]=t[t.length-1],t.toString("utf16le",e,t.length-1)}function _9e(t){var e=t&&t.length?this.write(t):"";if(this.lastNeed){var r=this.lastTotal-this.lastNeed;return e+this.lastChar.toString("utf16le",0,r)}return e}function X9e(t,e){var r=(t.length-e)%3;return r===0?t.toString("base64",e):(this.lastNeed=3-r,this.lastTotal=3,r===1?this.lastChar[0]=t[t.length-1]:(this.lastChar[0]=t[t.length-2],this.lastChar[1]=t[t.length-1]),t.toString("base64",e,t.length-r))}function Z9e(t){var e=t&&t.length?this.write(t):"";return this.lastNeed?e+this.lastChar.toString("base64",0,3-this.lastNeed):e}function $9e(t){return t.toString(this.encoding)}function e7e(t){return t&&t.length?this.write(t):""}});var cQ=I((QPt,aue)=>{"use strict";var Aue=VA().codes.ERR_STREAM_PREMATURE_CLOSE;function s7e(t){var e=!1;return function(){if(!e){e=!0;for(var r=arguments.length,i=new Array(r),n=0;n{"use strict";var uQ;function ZA(t,e,r){return e in t?Object.defineProperty(t,e,{value:r,enumerable:!0,configurable:!0,writable:!0}):t[e]=r,t}var A7e=cQ(),$A=Symbol("lastResolve"),qc=Symbol("lastReject"),im=Symbol("error"),gQ=Symbol("ended"),Jc=Symbol("lastPromise"),zT=Symbol("handlePromise"),Wc=Symbol("stream");function el(t,e){return{value:t,done:e}}function l7e(t){var e=t[$A];if(e!==null){var r=t[Wc].read();r!==null&&(t[Jc]=null,t[$A]=null,t[qc]=null,e(el(r,!1)))}}function c7e(t){process.nextTick(l7e,t)}function u7e(t,e){return function(r,i){t.then(function(){if(e[gQ]){r(el(void 0,!0));return}e[zT](r,i)},i)}}var g7e=Object.getPrototypeOf(function(){}),f7e=Object.setPrototypeOf((uQ={get stream(){return this[Wc]},next:function(){var e=this,r=this[im];if(r!==null)return Promise.reject(r);if(this[gQ])return Promise.resolve(el(void 0,!0));if(this[Wc].destroyed)return new Promise(function(o,a){process.nextTick(function(){e[im]?a(e[im]):o(el(void 0,!0))})});var i=this[Jc],n;if(i)n=new Promise(u7e(i,this));else{var s=this[Wc].read();if(s!==null)return Promise.resolve(el(s,!1));n=new Promise(this[zT])}return this[Jc]=n,n}},ZA(uQ,Symbol.asyncIterator,function(){return this}),ZA(uQ,"return",function(){var e=this;return new Promise(function(r,i){e[Wc].destroy(null,function(n){if(n){i(n);return}r(el(void 0,!0))})})}),uQ),g7e),h7e=function(e){var r,i=Object.create(f7e,(r={},ZA(r,Wc,{value:e,writable:!0}),ZA(r,$A,{value:null,writable:!0}),ZA(r,qc,{value:null,writable:!0}),ZA(r,im,{value:null,writable:!0}),ZA(r,gQ,{value:e._readableState.endEmitted,writable:!0}),ZA(r,zT,{value:function(s,o){var a=i[Wc].read();a?(i[Jc]=null,i[$A]=null,i[qc]=null,s(el(a,!1))):(i[$A]=s,i[qc]=o)},writable:!0}),r));return i[Jc]=null,A7e(e,function(n){if(n&&n.code!=="ERR_STREAM_PREMATURE_CLOSE"){var s=i[qc];s!==null&&(i[Jc]=null,i[$A]=null,i[qc]=null,s(n)),i[im]=n;return}var o=i[$A];o!==null&&(i[Jc]=null,i[$A]=null,i[qc]=null,o(el(void 0,!0))),i[gQ]=!0}),e.on("readable",c7e.bind(null,i)),i};cue.exports=h7e});var pue=I((vPt,gue)=>{"use strict";function fue(t,e,r,i,n,s,o){try{var a=t[s](o),l=a.value}catch(c){r(c);return}a.done?e(l):Promise.resolve(l).then(i,n)}function p7e(t){return function(){var e=this,r=arguments;return new Promise(function(i,n){var s=t.apply(e,r);function o(l){fue(s,i,n,o,a,"next",l)}function a(l){fue(s,i,n,o,a,"throw",l)}o(void 0)})}}function hue(t,e){var r=Object.keys(t);if(Object.getOwnPropertySymbols){var i=Object.getOwnPropertySymbols(t);e&&(i=i.filter(function(n){return Object.getOwnPropertyDescriptor(t,n).enumerable})),r.push.apply(r,i)}return r}function C7e(t){for(var e=1;e{"use strict";due.exports=kt;var Bf;kt.ReadableState=Cue;var SPt=require("events").EventEmitter,mue=function(e,r){return e.listeners(r).length},nm=PT(),fQ=require("buffer").Buffer,E7e=global.Uint8Array||function(){};function y7e(t){return fQ.from(t)}function w7e(t){return fQ.isBuffer(t)||t instanceof E7e}var VT=require("util"),It;VT&&VT.debuglog?It=VT.debuglog("stream"):It=function(){};var B7e=Oce(),_T=FT(),Q7e=NT(),b7e=Q7e.getHighWaterMark,hQ=VA().codes,v7e=hQ.ERR_INVALID_ARG_TYPE,S7e=hQ.ERR_STREAM_PUSH_AFTER_EOF,x7e=hQ.ERR_METHOD_NOT_IMPLEMENTED,k7e=hQ.ERR_STREAM_UNSHIFT_AFTER_END_EVENT,Qf,XT,ZT;_A()(kt,nm);var sm=_T.errorOrDestroy,$T=["error","close","destroy","pause","resume"];function P7e(t,e,r){if(typeof t.prependListener=="function")return t.prependListener(e,r);!t._events||!t._events[e]?t.on(e,r):Array.isArray(t._events[e])?t._events[e].unshift(r):t._events[e]=[r,t._events[e]]}function Cue(t,e,r){Bf=Bf||Yc(),t=t||{},typeof r!="boolean"&&(r=e instanceof Bf),this.objectMode=!!t.objectMode,r&&(this.objectMode=this.objectMode||!!t.readableObjectMode),this.highWaterMark=b7e(this,t,"readableHighWaterMark",r),this.buffer=new B7e,this.length=0,this.pipes=null,this.pipesCount=0,this.flowing=null,this.ended=!1,this.endEmitted=!1,this.reading=!1,this.sync=!0,this.needReadable=!1,this.emittedReadable=!1,this.readableListening=!1,this.resumeScheduled=!1,this.paused=!0,this.emitClose=t.emitClose!==!1,this.autoDestroy=!!t.autoDestroy,this.destroyed=!1,this.defaultEncoding=t.defaultEncoding||"utf8",this.awaitDrain=0,this.readingMore=!1,this.decoder=null,this.encoding=null,t.encoding&&(Qf||(Qf=WT().StringDecoder),this.decoder=new Qf(t.encoding),this.encoding=t.encoding)}function kt(t){if(Bf=Bf||Yc(),!(this instanceof kt))return new kt(t);var e=this instanceof Bf;this._readableState=new Cue(t,this,e),this.readable=!0,t&&(typeof t.read=="function"&&(this._read=t.read),typeof t.destroy=="function"&&(this._destroy=t.destroy)),nm.call(this)}Object.defineProperty(kt.prototype,"destroyed",{enumerable:!1,get:function(){return this._readableState===void 0?!1:this._readableState.destroyed},set:function(e){!this._readableState||(this._readableState.destroyed=e)}});kt.prototype.destroy=_T.destroy;kt.prototype._undestroy=_T.undestroy;kt.prototype._destroy=function(t,e){e(t)};kt.prototype.push=function(t,e){var r=this._readableState,i;return r.objectMode?i=!0:typeof t=="string"&&(e=e||r.defaultEncoding,e!==r.encoding&&(t=fQ.from(t,e),e=""),i=!0),Iue(this,t,e,!1,i)};kt.prototype.unshift=function(t){return Iue(this,t,null,!0,!1)};function Iue(t,e,r,i,n){It("readableAddChunk",e);var s=t._readableState;if(e===null)s.reading=!1,R7e(t,s);else{var o;if(n||(o=D7e(s,e)),o)sm(t,o);else if(s.objectMode||e&&e.length>0)if(typeof e!="string"&&!s.objectMode&&Object.getPrototypeOf(e)!==fQ.prototype&&(e=y7e(e)),i)s.endEmitted?sm(t,new k7e):eM(t,s,e,!0);else if(s.ended)sm(t,new S7e);else{if(s.destroyed)return!1;s.reading=!1,s.decoder&&!r?(e=s.decoder.write(e),s.objectMode||e.length!==0?eM(t,s,e,!1):tM(t,s)):eM(t,s,e,!1)}else i||(s.reading=!1,tM(t,s))}return!s.ended&&(s.length=Eue?t=Eue:(t--,t|=t>>>1,t|=t>>>2,t|=t>>>4,t|=t>>>8,t|=t>>>16,t++),t}function yue(t,e){return t<=0||e.length===0&&e.ended?0:e.objectMode?1:t!==t?e.flowing&&e.length?e.buffer.head.data.length:e.length:(t>e.highWaterMark&&(e.highWaterMark=F7e(t)),t<=e.length?t:e.ended?e.length:(e.needReadable=!0,0))}kt.prototype.read=function(t){It("read",t),t=parseInt(t,10);var e=this._readableState,r=t;if(t!==0&&(e.emittedReadable=!1),t===0&&e.needReadable&&((e.highWaterMark!==0?e.length>=e.highWaterMark:e.length>0)||e.ended))return It("read: emitReadable",e.length,e.ended),e.length===0&&e.ended?rM(this):pQ(this),null;if(t=yue(t,e),t===0&&e.ended)return e.length===0&&rM(this),null;var i=e.needReadable;It("need readable",i),(e.length===0||e.length-t0?n=wue(t,e):n=null,n===null?(e.needReadable=e.length<=e.highWaterMark,t=0):(e.length-=t,e.awaitDrain=0),e.length===0&&(e.ended||(e.needReadable=!0),r!==t&&e.ended&&rM(this)),n!==null&&this.emit("data",n),n};function R7e(t,e){if(It("onEofChunk"),!e.ended){if(e.decoder){var r=e.decoder.end();r&&r.length&&(e.buffer.push(r),e.length+=e.objectMode?1:r.length)}e.ended=!0,e.sync?pQ(t):(e.needReadable=!1,e.emittedReadable||(e.emittedReadable=!0,Bue(t)))}}function pQ(t){var e=t._readableState;It("emitReadable",e.needReadable,e.emittedReadable),e.needReadable=!1,e.emittedReadable||(It("emitReadable",e.flowing),e.emittedReadable=!0,process.nextTick(Bue,t))}function Bue(t){var e=t._readableState;It("emitReadable_",e.destroyed,e.length,e.ended),!e.destroyed&&(e.length||e.ended)&&(t.emit("readable"),e.emittedReadable=!1),e.needReadable=!e.flowing&&!e.ended&&e.length<=e.highWaterMark,iM(t)}function tM(t,e){e.readingMore||(e.readingMore=!0,process.nextTick(N7e,t,e))}function N7e(t,e){for(;!e.reading&&!e.ended&&(e.length1&&Que(i.pipes,t)!==-1)&&!c&&(It("false write response, pause",i.awaitDrain),i.awaitDrain++),r.pause())}function f(m){It("onerror",m),d(),t.removeListener("error",f),mue(t,"error")===0&&sm(t,m)}P7e(t,"error",f);function h(){t.removeListener("finish",p),d()}t.once("close",h);function p(){It("onfinish"),t.removeListener("close",h),d()}t.once("finish",p);function d(){It("unpipe"),r.unpipe(t)}return t.emit("pipe",r),i.flowing||(It("pipe resume"),r.resume()),t};function L7e(t){return function(){var r=t._readableState;It("pipeOnDrain",r.awaitDrain),r.awaitDrain&&r.awaitDrain--,r.awaitDrain===0&&mue(t,"data")&&(r.flowing=!0,iM(t))}}kt.prototype.unpipe=function(t){var e=this._readableState,r={hasUnpiped:!1};if(e.pipesCount===0)return this;if(e.pipesCount===1)return t&&t!==e.pipes?this:(t||(t=e.pipes),e.pipes=null,e.pipesCount=0,e.flowing=!1,t&&t.emit("unpipe",this,r),this);if(!t){var i=e.pipes,n=e.pipesCount;e.pipes=null,e.pipesCount=0,e.flowing=!1;for(var s=0;s0,i.flowing!==!1&&this.resume()):t==="readable"&&!i.endEmitted&&!i.readableListening&&(i.readableListening=i.needReadable=!0,i.flowing=!1,i.emittedReadable=!1,It("on readable",i.length,i.reading),i.length?pQ(this):i.reading||process.nextTick(T7e,this)),r};kt.prototype.addListener=kt.prototype.on;kt.prototype.removeListener=function(t,e){var r=nm.prototype.removeListener.call(this,t,e);return t==="readable"&&process.nextTick(bue,this),r};kt.prototype.removeAllListeners=function(t){var e=nm.prototype.removeAllListeners.apply(this,arguments);return(t==="readable"||t===void 0)&&process.nextTick(bue,this),e};function bue(t){var e=t._readableState;e.readableListening=t.listenerCount("readable")>0,e.resumeScheduled&&!e.paused?e.flowing=!0:t.listenerCount("data")>0&&t.resume()}function T7e(t){It("readable nexttick read 0"),t.read(0)}kt.prototype.resume=function(){var t=this._readableState;return t.flowing||(It("resume"),t.flowing=!t.readableListening,M7e(this,t)),t.paused=!1,this};function M7e(t,e){e.resumeScheduled||(e.resumeScheduled=!0,process.nextTick(O7e,t,e))}function O7e(t,e){It("resume",e.reading),e.reading||t.read(0),e.resumeScheduled=!1,t.emit("resume"),iM(t),e.flowing&&!e.reading&&t.read(0)}kt.prototype.pause=function(){return It("call pause flowing=%j",this._readableState.flowing),this._readableState.flowing!==!1&&(It("pause"),this._readableState.flowing=!1,this.emit("pause")),this._readableState.paused=!0,this};function iM(t){var e=t._readableState;for(It("flow",e.flowing);e.flowing&&t.read()!==null;);}kt.prototype.wrap=function(t){var e=this,r=this._readableState,i=!1;t.on("end",function(){if(It("wrapped end"),r.decoder&&!r.ended){var o=r.decoder.end();o&&o.length&&e.push(o)}e.push(null)}),t.on("data",function(o){if(It("wrapped data"),r.decoder&&(o=r.decoder.write(o)),!(r.objectMode&&o==null)&&!(!r.objectMode&&(!o||!o.length))){var a=e.push(o);a||(i=!0,t.pause())}});for(var n in t)this[n]===void 0&&typeof t[n]=="function"&&(this[n]=function(a){return function(){return t[a].apply(t,arguments)}}(n));for(var s=0;s<$T.length;s++)t.on($T[s],this.emit.bind(this,$T[s]));return this._read=function(o){It("wrapped _read",o),i&&(i=!1,t.resume())},this};typeof Symbol=="function"&&(kt.prototype[Symbol.asyncIterator]=function(){return XT===void 0&&(XT=uue()),XT(this)});Object.defineProperty(kt.prototype,"readableHighWaterMark",{enumerable:!1,get:function(){return this._readableState.highWaterMark}});Object.defineProperty(kt.prototype,"readableBuffer",{enumerable:!1,get:function(){return this._readableState&&this._readableState.buffer}});Object.defineProperty(kt.prototype,"readableFlowing",{enumerable:!1,get:function(){return this._readableState.flowing},set:function(e){this._readableState&&(this._readableState.flowing=e)}});kt._fromList=wue;Object.defineProperty(kt.prototype,"readableLength",{enumerable:!1,get:function(){return this._readableState.length}});function wue(t,e){if(e.length===0)return null;var r;return e.objectMode?r=e.buffer.shift():!t||t>=e.length?(e.decoder?r=e.buffer.join(""):e.buffer.length===1?r=e.buffer.first():r=e.buffer.concat(e.length),e.buffer.clear()):r=e.buffer.consume(t,e.decoder),r}function rM(t){var e=t._readableState;It("endReadable",e.endEmitted),e.endEmitted||(e.ended=!0,process.nextTick(K7e,e,t))}function K7e(t,e){if(It("endReadableNT",t.endEmitted,t.length),!t.endEmitted&&t.length===0&&(t.endEmitted=!0,e.readable=!1,e.emit("end"),t.autoDestroy)){var r=e._writableState;(!r||r.autoDestroy&&r.finished)&&e.destroy()}}typeof Symbol=="function"&&(kt.from=function(t,e){return ZT===void 0&&(ZT=pue()),ZT(kt,t,e)});function Que(t,e){for(var r=0,i=t.length;r{"use strict";vue.exports=Ja;var dQ=VA().codes,U7e=dQ.ERR_METHOD_NOT_IMPLEMENTED,H7e=dQ.ERR_MULTIPLE_CALLBACK,G7e=dQ.ERR_TRANSFORM_ALREADY_TRANSFORMING,j7e=dQ.ERR_TRANSFORM_WITH_LENGTH_0,CQ=Yc();_A()(Ja,CQ);function Y7e(t,e){var r=this._transformState;r.transforming=!1;var i=r.writecb;if(i===null)return this.emit("error",new H7e);r.writechunk=null,r.writecb=null,e!=null&&this.push(e),i(t);var n=this._readableState;n.reading=!1,(n.needReadable||n.length{"use strict";xue.exports=om;var kue=nM();_A()(om,kue);function om(t){if(!(this instanceof om))return new om(t);kue.call(this,t)}om.prototype._transform=function(t,e,r){r(null,t)}});var Lue=I((DPt,Due)=>{"use strict";var sM;function J7e(t){var e=!1;return function(){e||(e=!0,t.apply(void 0,arguments))}}var Rue=VA().codes,W7e=Rue.ERR_MISSING_ARGS,z7e=Rue.ERR_STREAM_DESTROYED;function Fue(t){if(t)throw t}function V7e(t){return t.setHeader&&typeof t.abort=="function"}function _7e(t,e,r,i){i=J7e(i);var n=!1;t.on("close",function(){n=!0}),sM===void 0&&(sM=cQ()),sM(t,{readable:e,writable:r},function(o){if(o)return i(o);n=!0,i()});var s=!1;return function(o){if(!n&&!s){if(s=!0,V7e(t))return t.abort();if(typeof t.destroy=="function")return t.destroy();i(o||new z7e("pipe"))}}}function Nue(t){t()}function X7e(t,e){return t.pipe(e)}function Z7e(t){return!t.length||typeof t[t.length-1]!="function"?Fue:t.pop()}function $7e(){for(var t=arguments.length,e=new Array(t),r=0;r0;return _7e(o,l,c,function(u){n||(n=u),u&&s.forEach(Nue),!l&&(s.forEach(Nue),i(n))})});return e.reduce(X7e)}Due.exports=$7e});var bf=I((ys,am)=>{var Am=require("stream");process.env.READABLE_STREAM==="disable"&&Am?(am.exports=Am.Readable,Object.assign(am.exports,Am),am.exports.Stream=Am):(ys=am.exports=HT(),ys.Stream=Am||ys,ys.Readable=ys,ys.Writable=UT(),ys.Duplex=Yc(),ys.Transform=nM(),ys.PassThrough=Pue(),ys.finished=cQ(),ys.pipeline=Lue())});var Oue=I((RPt,Tue)=>{"use strict";var{Buffer:_s}=require("buffer"),Mue=Symbol.for("BufferList");function nr(t){if(!(this instanceof nr))return new nr(t);nr._init.call(this,t)}nr._init=function(e){Object.defineProperty(this,Mue,{value:!0}),this._bufs=[],this.length=0,e&&this.append(e)};nr.prototype._new=function(e){return new nr(e)};nr.prototype._offset=function(e){if(e===0)return[0,0];let r=0;for(let i=0;ithis.length||e<0)return;let r=this._offset(e);return this._bufs[r[0]][r[1]]};nr.prototype.slice=function(e,r){return typeof e=="number"&&e<0&&(e+=this.length),typeof r=="number"&&r<0&&(r+=this.length),this.copy(null,0,e,r)};nr.prototype.copy=function(e,r,i,n){if((typeof i!="number"||i<0)&&(i=0),(typeof n!="number"||n>this.length)&&(n=this.length),i>=this.length||n<=0)return e||_s.alloc(0);let s=!!e,o=this._offset(i),a=n-i,l=a,c=s&&r||0,u=o[1];if(i===0&&n===this.length){if(!s)return this._bufs.length===1?this._bufs[0]:_s.concat(this._bufs,this.length);for(let g=0;gf)this._bufs[g].copy(e,c,u),c+=f;else{this._bufs[g].copy(e,c,u,u+l),c+=f;break}l-=f,u&&(u=0)}return e.length>c?e.slice(0,c):e};nr.prototype.shallowSlice=function(e,r){if(e=e||0,r=typeof r!="number"?this.length:r,e<0&&(e+=this.length),r<0&&(r+=this.length),e===r)return this._new();let i=this._offset(e),n=this._offset(r),s=this._bufs.slice(i[0],n[0]+1);return n[1]===0?s.pop():s[s.length-1]=s[s.length-1].slice(0,n[1]),i[1]!==0&&(s[0]=s[0].slice(i[1])),this._new(s)};nr.prototype.toString=function(e,r,i){return this.slice(r,i).toString(e)};nr.prototype.consume=function(e){if(e=Math.trunc(e),Number.isNaN(e)||e<=0)return this;for(;this._bufs.length;)if(e>=this._bufs[0].length)e-=this._bufs[0].length,this.length-=this._bufs[0].length,this._bufs.shift();else{this._bufs[0]=this._bufs[0].slice(e),this.length-=e;break}return this};nr.prototype.duplicate=function(){let e=this._new();for(let r=0;rthis.length?this.length:e;let i=this._offset(e),n=i[0],s=i[1];for(;n=t.length){let l=o.indexOf(t,s);if(l!==-1)return this._reverseOffset([n,l]);s=o.length-t.length+1}else{let l=this._reverseOffset([n,s]);if(this._match(l,t))return l;s++}s=0}return-1};nr.prototype._match=function(t,e){if(this.length-t{"use strict";var oM=bf().Duplex,eVe=_A(),lm=Oue();function Oi(t){if(!(this instanceof Oi))return new Oi(t);if(typeof t=="function"){this._callback=t;let e=function(i){this._callback&&(this._callback(i),this._callback=null)}.bind(this);this.on("pipe",function(i){i.on("error",e)}),this.on("unpipe",function(i){i.removeListener("error",e)}),t=null}lm._init.call(this,t),oM.call(this)}eVe(Oi,oM);Object.assign(Oi.prototype,lm.prototype);Oi.prototype._new=function(e){return new Oi(e)};Oi.prototype._write=function(e,r,i){this._appendBuffer(e),typeof i=="function"&&i()};Oi.prototype._read=function(e){if(!this.length)return this.push(null);e=Math.min(e,this.length),this.push(this.slice(0,e)),this.consume(e)};Oi.prototype.end=function(e){oM.prototype.end.call(this,e),this._callback&&(this._callback(null,this.slice()),this._callback=null)};Oi.prototype._destroy=function(e,r){this._bufs.length=0,this.length=0,r(e)};Oi.prototype._isBufferList=function(e){return e instanceof Oi||e instanceof lm||Oi.isBufferList(e)};Oi.isBufferList=lm.isBufferList;mQ.exports=Oi;mQ.exports.BufferListStream=Oi;mQ.exports.BufferList=lm});var lM=I(vf=>{var tVe=Buffer.alloc,rVe="0000000000000000000",iVe="7777777777777777777",Uue="0".charCodeAt(0),Hue=Buffer.from("ustar\0","binary"),nVe=Buffer.from("00","binary"),sVe=Buffer.from("ustar ","binary"),oVe=Buffer.from(" \0","binary"),aVe=parseInt("7777",8),cm=257,aM=263,AVe=function(t,e,r){return typeof t!="number"?r:(t=~~t,t>=e?e:t>=0||(t+=e,t>=0)?t:0)},lVe=function(t){switch(t){case 0:return"file";case 1:return"link";case 2:return"symlink";case 3:return"character-device";case 4:return"block-device";case 5:return"directory";case 6:return"fifo";case 7:return"contiguous-file";case 72:return"pax-header";case 55:return"pax-global-header";case 27:return"gnu-long-link-path";case 28:case 30:return"gnu-long-path"}return null},cVe=function(t){switch(t){case"file":return 0;case"link":return 1;case"symlink":return 2;case"character-device":return 3;case"block-device":return 4;case"directory":return 5;case"fifo":return 6;case"contiguous-file":return 7;case"pax-header":return 72}return 0},Gue=function(t,e,r,i){for(;re?iVe.slice(0,e)+" ":rVe.slice(0,e-t.length)+t+" "};function uVe(t){var e;if(t[0]===128)e=!0;else if(t[0]===255)e=!1;else return null;for(var r=[],i=t.length-1;i>0;i--){var n=t[i];e?r.push(n):r.push(255-n)}var s=0,o=r.length;for(i=0;i=Math.pow(10,r)&&r++,e+r+t};vf.decodeLongPath=function(t,e){return Sf(t,0,t.length,e)};vf.encodePax=function(t){var e="";t.name&&(e+=AM(" path="+t.name+` +`)),t.linkname&&(e+=AM(" linkpath="+t.linkname+` +`));var r=t.pax;if(r)for(var i in r)e+=AM(" "+i+"="+r[i]+` +`);return Buffer.from(e)};vf.decodePax=function(t){for(var e={};t.length;){for(var r=0;r100;){var n=r.indexOf("/");if(n===-1)return null;i+=i?"/"+r.slice(0,n):r.slice(0,n),r=r.slice(n+1)}return Buffer.byteLength(r)>100||Buffer.byteLength(i)>155||t.linkname&&Buffer.byteLength(t.linkname)>100?null:(e.write(r),e.write(tl(t.mode&aVe,6),100),e.write(tl(t.uid,6),108),e.write(tl(t.gid,6),116),e.write(tl(t.size,11),124),e.write(tl(t.mtime.getTime()/1e3|0,11),136),e[156]=Uue+cVe(t.type),t.linkname&&e.write(t.linkname,157),Hue.copy(e,cm),nVe.copy(e,aM),t.uname&&e.write(t.uname,265),t.gname&&e.write(t.gname,297),e.write(tl(t.devmajor||0,6),329),e.write(tl(t.devminor||0,6),337),i&&e.write(i,345),e.write(tl(jue(e),6),148),e)};vf.decode=function(t,e,r){var i=t[156]===0?0:t[156]-Uue,n=Sf(t,0,100,e),s=rl(t,100,8),o=rl(t,108,8),a=rl(t,116,8),l=rl(t,124,12),c=rl(t,136,12),u=lVe(i),g=t[157]===0?null:Sf(t,157,100,e),f=Sf(t,265,32),h=Sf(t,297,32),p=rl(t,329,8),d=rl(t,337,8),m=jue(t);if(m===8*32)return null;if(m!==rl(t,148,8))throw new Error("Invalid tar header. Maybe the tar is corrupted or it needs to be gunzipped?");if(Hue.compare(t,cm,cm+6)===0)t[345]&&(n=Sf(t,345,155,e)+"/"+n);else if(!(sVe.compare(t,cm,cm+6)===0&&oVe.compare(t,aM,aM+2)===0)){if(!r)throw new Error("Invalid tar header: unknown format.")}return i===0&&n&&n[n.length-1]==="/"&&(i=5),{name:n,mode:s,uid:o,gid:a,size:l,mtime:new Date(1e3*c),type:u,linkname:g,uname:f,gname:h,devmajor:p,devminor:d}}});var _ue=I((LPt,Yue)=>{var que=require("util"),gVe=Kue(),um=lM(),Jue=bf().Writable,Wue=bf().PassThrough,zue=function(){},Vue=function(t){return t&=511,t&&512-t},fVe=function(t,e){var r=new IQ(t,e);return r.end(),r},hVe=function(t,e){return e.path&&(t.name=e.path),e.linkpath&&(t.linkname=e.linkpath),e.size&&(t.size=parseInt(e.size,10)),t.pax=e,t},IQ=function(t,e){this._parent=t,this.offset=e,Wue.call(this,{autoDestroy:!1})};que.inherits(IQ,Wue);IQ.prototype.destroy=function(t){this._parent.destroy(t)};var Wa=function(t){if(!(this instanceof Wa))return new Wa(t);Jue.call(this,t),t=t||{},this._offset=0,this._buffer=gVe(),this._missing=0,this._partial=!1,this._onparse=zue,this._header=null,this._stream=null,this._overflow=null,this._cb=null,this._locked=!1,this._destroyed=!1,this._pax=null,this._paxGlobal=null,this._gnuLongPath=null,this._gnuLongLinkPath=null;var e=this,r=e._buffer,i=function(){e._continue()},n=function(f){if(e._locked=!1,f)return e.destroy(f);e._stream||i()},s=function(){e._stream=null;var f=Vue(e._header.size);f?e._parse(f,o):e._parse(512,g),e._locked||i()},o=function(){e._buffer.consume(Vue(e._header.size)),e._parse(512,g),i()},a=function(){var f=e._header.size;e._paxGlobal=um.decodePax(r.slice(0,f)),r.consume(f),s()},l=function(){var f=e._header.size;e._pax=um.decodePax(r.slice(0,f)),e._paxGlobal&&(e._pax=Object.assign({},e._paxGlobal,e._pax)),r.consume(f),s()},c=function(){var f=e._header.size;this._gnuLongPath=um.decodeLongPath(r.slice(0,f),t.filenameEncoding),r.consume(f),s()},u=function(){var f=e._header.size;this._gnuLongLinkPath=um.decodeLongPath(r.slice(0,f),t.filenameEncoding),r.consume(f),s()},g=function(){var f=e._offset,h;try{h=e._header=um.decode(r.slice(0,512),t.filenameEncoding,t.allowUnknownFormat)}catch(p){e.emit("error",p)}if(r.consume(512),!h){e._parse(512,g),i();return}if(h.type==="gnu-long-path"){e._parse(h.size,c),i();return}if(h.type==="gnu-long-link-path"){e._parse(h.size,u),i();return}if(h.type==="pax-global-header"){e._parse(h.size,a),i();return}if(h.type==="pax-header"){e._parse(h.size,l),i();return}if(e._gnuLongPath&&(h.name=e._gnuLongPath,e._gnuLongPath=null),e._gnuLongLinkPath&&(h.linkname=e._gnuLongLinkPath,e._gnuLongLinkPath=null),e._pax&&(e._header=h=hVe(h,e._pax),e._pax=null),e._locked=!0,!h.size||h.type==="directory"){e._parse(512,g),e.emit("entry",h,fVe(e,f),n);return}e._stream=new IQ(e,f),e.emit("entry",h,e._stream,n),e._parse(h.size,s),i()};this._onheader=g,this._parse(512,g)};que.inherits(Wa,Jue);Wa.prototype.destroy=function(t){this._destroyed||(this._destroyed=!0,t&&this.emit("error",t),this.emit("close"),this._stream&&this._stream.emit("close"))};Wa.prototype._parse=function(t,e){this._destroyed||(this._offset+=t,this._missing=t,e===this._onheader&&(this._partial=!1),this._onparse=e)};Wa.prototype._continue=function(){if(!this._destroyed){var t=this._cb;this._cb=zue,this._overflow?this._write(this._overflow,void 0,t):t()}};Wa.prototype._write=function(t,e,r){if(!this._destroyed){var i=this._stream,n=this._buffer,s=this._missing;if(t.length&&(this._partial=!0),t.lengths&&(o=t.slice(s),t=t.slice(0,s)),i?i.end(t):n.append(t),this._overflow=o,this._onparse()}};Wa.prototype._final=function(t){if(this._partial)return this.destroy(new Error("Unexpected end of data"));t()};Yue.exports=Wa});var Zue=I((TPt,Xue)=>{Xue.exports=require("fs").constants||require("constants")});var ige=I((MPt,$ue)=>{var xf=Zue(),ege=tk(),EQ=_A(),pVe=Buffer.alloc,tge=bf().Readable,kf=bf().Writable,dVe=require("string_decoder").StringDecoder,yQ=lM(),CVe=parseInt("755",8),mVe=parseInt("644",8),rge=pVe(1024),cM=function(){},uM=function(t,e){e&=511,e&&t.push(rge.slice(0,512-e))};function IVe(t){switch(t&xf.S_IFMT){case xf.S_IFBLK:return"block-device";case xf.S_IFCHR:return"character-device";case xf.S_IFDIR:return"directory";case xf.S_IFIFO:return"fifo";case xf.S_IFLNK:return"symlink"}return"file"}var wQ=function(t){kf.call(this),this.written=0,this._to=t,this._destroyed=!1};EQ(wQ,kf);wQ.prototype._write=function(t,e,r){if(this.written+=t.length,this._to.push(t))return r();this._to._drain=r};wQ.prototype.destroy=function(){this._destroyed||(this._destroyed=!0,this.emit("close"))};var BQ=function(){kf.call(this),this.linkname="",this._decoder=new dVe("utf-8"),this._destroyed=!1};EQ(BQ,kf);BQ.prototype._write=function(t,e,r){this.linkname+=this._decoder.write(t),r()};BQ.prototype.destroy=function(){this._destroyed||(this._destroyed=!0,this.emit("close"))};var gm=function(){kf.call(this),this._destroyed=!1};EQ(gm,kf);gm.prototype._write=function(t,e,r){r(new Error("No body allowed for this entry"))};gm.prototype.destroy=function(){this._destroyed||(this._destroyed=!0,this.emit("close"))};var Oo=function(t){if(!(this instanceof Oo))return new Oo(t);tge.call(this,t),this._drain=cM,this._finalized=!1,this._finalizing=!1,this._destroyed=!1,this._stream=null};EQ(Oo,tge);Oo.prototype.entry=function(t,e,r){if(this._stream)throw new Error("already piping an entry");if(!(this._finalized||this._destroyed)){typeof e=="function"&&(r=e,e=null),r||(r=cM);var i=this;if((!t.size||t.type==="symlink")&&(t.size=0),t.type||(t.type=IVe(t.mode)),t.mode||(t.mode=t.type==="directory"?CVe:mVe),t.uid||(t.uid=0),t.gid||(t.gid=0),t.mtime||(t.mtime=new Date),typeof e=="string"&&(e=Buffer.from(e)),Buffer.isBuffer(e)){t.size=e.length,this._encode(t);var n=this.push(e);return uM(i,t.size),n?process.nextTick(r):this._drain=r,new gm}if(t.type==="symlink"&&!t.linkname){var s=new BQ;return ege(s,function(a){if(a)return i.destroy(),r(a);t.linkname=s.linkname,i._encode(t),r()}),s}if(this._encode(t),t.type!=="file"&&t.type!=="contiguous-file")return process.nextTick(r),new gm;var o=new wQ(this);return this._stream=o,ege(o,function(a){if(i._stream=null,a)return i.destroy(),r(a);if(o.written!==t.size)return i.destroy(),r(new Error("size mismatch"));uM(i,t.size),i._finalizing&&i.finalize(),r()}),o}};Oo.prototype.finalize=function(){if(this._stream){this._finalizing=!0;return}this._finalized||(this._finalized=!0,this.push(rge),this.push(null))};Oo.prototype.destroy=function(t){this._destroyed||(this._destroyed=!0,t&&this.emit("error",t),this.emit("close"),this._stream&&this._stream.destroy&&this._stream.destroy())};Oo.prototype._encode=function(t){if(!t.pax){var e=yQ.encode(t);if(e){this.push(e);return}}this._encodePax(t)};Oo.prototype._encodePax=function(t){var e=yQ.encodePax({name:t.name,linkname:t.linkname,pax:t.pax}),r={name:"PaxHeader",mode:t.mode,uid:t.uid,gid:t.gid,size:e.length,mtime:t.mtime,type:"pax-header",linkname:t.linkname&&"PaxHeader",uname:t.uname,gname:t.gname,devmajor:t.devmajor,devminor:t.devminor};this.push(yQ.encode(r)),this.push(e),uM(this,e.length),r.size=t.size,r.type=t.type,this.push(yQ.encode(r))};Oo.prototype._read=function(t){var e=this._drain;this._drain=cM,e()};$ue.exports=Oo});var nge=I(gM=>{gM.extract=_ue();gM.pack=ige()});var Cge=I((oDt,fge)=>{"use strict";var Pf=class{constructor(e,r,i){this.__specs=e||{},Object.keys(this.__specs).forEach(n=>{if(typeof this.__specs[n]=="string"){let s=this.__specs[n],o=this.__specs[s];if(o){let a=o.aliases||[];a.push(n,s),o.aliases=[...new Set(a)],this.__specs[n]=o}else throw new Error(`Alias refers to invalid key: ${s} -> ${n}`)}}),this.__opts=r||{},this.__providers=pge(i.filter(n=>n!=null&&typeof n=="object")),this.__isFiggyPudding=!0}get(e){return mM(this,e,!0)}get[Symbol.toStringTag](){return"FiggyPudding"}forEach(e,r=this){for(let[i,n]of this.entries())e.call(r,n,i,this)}toJSON(){let e={};return this.forEach((r,i)=>{e[i]=r}),e}*entries(e){for(let i of Object.keys(this.__specs))yield[i,this.get(i)];let r=e||this.__opts.other;if(r){let i=new Set;for(let n of this.__providers){let s=n.entries?n.entries(r):RVe(n);for(let[o,a]of s)r(o)&&!i.has(o)&&(i.add(o),yield[o,a])}}}*[Symbol.iterator](){for(let[e,r]of this.entries())yield[e,r]}*keys(){for(let[e]of this.entries())yield e}*values(){for(let[,e]of this.entries())yield e}concat(...e){return new Proxy(new Pf(this.__specs,this.__opts,pge(this.__providers).concat(e)),hge)}};try{let t=require("util");Pf.prototype[t.inspect.custom]=function(e,r){return this[Symbol.toStringTag]+" "+t.inspect(this.toJSON(),r)}}catch(t){}function FVe(t){throw Object.assign(new Error(`invalid config key requested: ${t}`),{code:"EBADKEY"})}function mM(t,e,r){let i=t.__specs[e];if(r&&!i&&(!t.__opts.other||!t.__opts.other(e)))FVe(e);else{i||(i={});let n;for(let s of t.__providers){if(n=dge(e,s),n===void 0&&i.aliases&&i.aliases.length){for(let o of i.aliases)if(o!==e&&(n=dge(o,s),n!==void 0))break}if(n!==void 0)break}return n===void 0&&i.default!==void 0?typeof i.default=="function"?i.default(t):i.default:n}}function dge(t,e){let r;return e.__isFiggyPudding?r=mM(e,t,!1):typeof e.get=="function"?r=e.get(t):r=e[t],r}var hge={has(t,e){return e in t.__specs&&mM(t,e,!1)!==void 0},ownKeys(t){return Object.keys(t.__specs)},get(t,e){return typeof e=="symbol"||e.slice(0,2)==="__"||e in Pf.prototype?t[e]:t.get(e)},set(t,e,r){if(typeof e=="symbol"||e.slice(0,2)==="__")return t[e]=r,!0;throw new Error("figgyPudding options cannot be modified. Use .concat() instead.")},deleteProperty(){throw new Error("figgyPudding options cannot be deleted. Use .concat() and shadow them instead.")}};fge.exports=NVe;function NVe(t,e){function r(...i){return new Proxy(new Pf(t,e,i),hge)}return r}function pge(t){let e=[];return t.forEach(r=>e.unshift(r)),e}function RVe(t){return Object.keys(t).map(e=>[e,t[e]])}});var Ege=I((aDt,Ko)=>{"use strict";var hm=require("crypto"),LVe=Cge(),TVe=require("stream").Transform,mge=["sha256","sha384","sha512"],MVe=/^[a-z0-9+/]+(?:=?=?)$/i,OVe=/^([^-]+)-([^?]+)([?\S*]*)$/,KVe=/^([^-]+)-([A-Za-z0-9+/=]{44,88})(\?[\x21-\x7E]*)*$/,UVe=/^[\x21-\x7E]+$/,on=LVe({algorithms:{default:["sha512"]},error:{default:!1},integrity:{},options:{default:[]},pickAlgorithm:{default:()=>HVe},Promise:{default:()=>Promise},sep:{default:" "},single:{default:!1},size:{},strict:{default:!1}}),zc=class{get isHash(){return!0}constructor(e,r){r=on(r);let i=!!r.strict;this.source=e.trim();let n=this.source.match(i?KVe:OVe);if(!n||i&&!mge.some(o=>o===n[1]))return;this.algorithm=n[1],this.digest=n[2];let s=n[3];this.options=s?s.slice(1).split("?"):[]}hexDigest(){return this.digest&&Buffer.from(this.digest,"base64").toString("hex")}toJSON(){return this.toString()}toString(e){if(e=on(e),e.strict&&!(mge.some(i=>i===this.algorithm)&&this.digest.match(MVe)&&(this.options||[]).every(i=>i.match(UVe))))return"";let r=this.options&&this.options.length?`?${this.options.join("?")}`:"";return`${this.algorithm}-${this.digest}${r}`}},Df=class{get isIntegrity(){return!0}toJSON(){return this.toString()}toString(e){e=on(e);let r=e.sep||" ";return e.strict&&(r=r.replace(/\S+/g," ")),Object.keys(this).map(i=>this[i].map(n=>zc.prototype.toString.call(n,e)).filter(n=>n.length).join(r)).filter(i=>i.length).join(r)}concat(e,r){r=on(r);let i=typeof e=="string"?e:pm(e,r);return Uo(`${this.toString(r)} ${i}`,r)}hexDigest(){return Uo(this,{single:!0}).hexDigest()}match(e,r){r=on(r);let i=Uo(e,r),n=i.pickAlgorithm(r);return this[n]&&i[n]&&this[n].find(s=>i[n].find(o=>s.digest===o.digest))||!1}pickAlgorithm(e){e=on(e);let r=e.pickAlgorithm,i=Object.keys(this);if(!i.length)throw new Error(`No algorithms available for ${JSON.stringify(this.toString())}`);return i.reduce((n,s)=>r(n,s)||n)}};Ko.exports.parse=Uo;function Uo(t,e){if(e=on(e),typeof t=="string")return IM(t,e);if(t.algorithm&&t.digest){let r=new Df;return r[t.algorithm]=[t],IM(pm(r,e),e)}else return IM(pm(t,e),e)}function IM(t,e){return e.single?new zc(t,e):t.trim().split(/\s+/).reduce((r,i)=>{let n=new zc(i,e);if(n.algorithm&&n.digest){let s=n.algorithm;r[s]||(r[s]=[]),r[s].push(n)}return r},new Df)}Ko.exports.stringify=pm;function pm(t,e){return e=on(e),t.algorithm&&t.digest?zc.prototype.toString.call(t,e):typeof t=="string"?pm(Uo(t,e),e):Df.prototype.toString.call(t,e)}Ko.exports.fromHex=GVe;function GVe(t,e,r){r=on(r);let i=r.options&&r.options.length?`?${r.options.join("?")}`:"";return Uo(`${e}-${Buffer.from(t,"hex").toString("base64")}${i}`,r)}Ko.exports.fromData=jVe;function jVe(t,e){e=on(e);let r=e.algorithms,i=e.options&&e.options.length?`?${e.options.join("?")}`:"";return r.reduce((n,s)=>{let o=hm.createHash(s).update(t).digest("base64"),a=new zc(`${s}-${o}${i}`,e);if(a.algorithm&&a.digest){let l=a.algorithm;n[l]||(n[l]=[]),n[l].push(a)}return n},new Df)}Ko.exports.fromStream=YVe;function YVe(t,e){e=on(e);let r=e.Promise||Promise,i=EM(e);return new r((n,s)=>{t.pipe(i),t.on("error",s),i.on("error",s);let o;i.on("integrity",a=>{o=a}),i.on("end",()=>n(o)),i.on("data",()=>{})})}Ko.exports.checkData=qVe;function qVe(t,e,r){if(r=on(r),e=Uo(e,r),!Object.keys(e).length){if(r.error)throw Object.assign(new Error("No valid integrity hashes to check against"),{code:"EINTEGRITY"});return!1}let i=e.pickAlgorithm(r),n=hm.createHash(i).update(t).digest("base64"),s=Uo({algorithm:i,digest:n}),o=s.match(e,r);if(o||!r.error)return o;if(typeof r.size=="number"&&t.length!==r.size){let a=new Error(`data size mismatch when checking ${e}. + Wanted: ${r.size} + Found: ${t.length}`);throw a.code="EBADSIZE",a.found=t.length,a.expected=r.size,a.sri=e,a}else{let a=new Error(`Integrity checksum failed when using ${i}: Wanted ${e}, but got ${s}. (${t.length} bytes)`);throw a.code="EINTEGRITY",a.found=s,a.expected=e,a.algorithm=i,a.sri=e,a}}Ko.exports.checkStream=JVe;function JVe(t,e,r){r=on(r);let i=r.Promise||Promise,n=EM(r.concat({integrity:e}));return new i((s,o)=>{t.pipe(n),t.on("error",o),n.on("error",o);let a;n.on("verified",l=>{a=l}),n.on("end",()=>s(a)),n.on("data",()=>{})})}Ko.exports.integrityStream=EM;function EM(t){t=on(t);let e=t.integrity&&Uo(t.integrity,t),r=e&&Object.keys(e).length,i=r&&e.pickAlgorithm(t),n=r&&e[i],s=Array.from(new Set(t.algorithms.concat(i?[i]:[]))),o=s.map(hm.createHash),a=0,l=new TVe({transform(c,u,g){a+=c.length,o.forEach(f=>f.update(c,u)),g(null,c,u)}}).on("end",()=>{let c=t.options&&t.options.length?`?${t.options.join("?")}`:"",u=Uo(o.map((f,h)=>`${s[h]}-${f.digest("base64")}${c}`).join(" "),t),g=r&&u.match(e,t);if(typeof t.size=="number"&&a!==t.size){let f=new Error(`stream size mismatch when checking ${e}. + Wanted: ${t.size} + Found: ${a}`);f.code="EBADSIZE",f.found=a,f.expected=t.size,f.sri=e,l.emit("error",f)}else if(t.integrity&&!g){let f=new Error(`${e} integrity checksum failed when using ${i}: wanted ${n} but got ${u}. (${a} bytes)`);f.code="EINTEGRITY",f.found=u,f.expected=n,f.algorithm=i,f.sri=e,l.emit("error",f)}else l.emit("size",a),l.emit("integrity",u),g&&l.emit("verified",g)});return l}Ko.exports.create=WVe;function WVe(t){t=on(t);let e=t.algorithms,r=t.options.length?`?${t.options.join("?")}`:"",i=e.map(hm.createHash);return{update:function(n,s){return i.forEach(o=>o.update(n,s)),this},digest:function(n){return e.reduce((o,a)=>{let l=i.shift().digest("base64"),c=new zc(`${a}-${l}${r}`,t);if(c.algorithm&&c.digest){let u=c.algorithm;o[u]||(o[u]=[]),o[u].push(c)}return o},new Df)}}}var zVe=new Set(hm.getHashes()),Ige=["md5","whirlpool","sha1","sha224","sha256","sha384","sha512","sha3","sha3-256","sha3-384","sha3-512","sha3_256","sha3_384","sha3_512"].filter(t=>zVe.has(t));function HVe(t,e){return Ige.indexOf(t.toLowerCase())>=Ige.indexOf(e.toLowerCase())?t:e}});var Fd={};it(Fd,{BuildType:()=>Gn,Cache:()=>Qt,Configuration:()=>fe,DEFAULT_LOCK_FILENAME:()=>DR,DEFAULT_RC_FILENAME:()=>PR,FormatType:()=>ps,InstallMode:()=>li,LightReport:()=>Fa,LinkType:()=>gt,Manifest:()=>Ze,MessageName:()=>z,PackageExtensionStatus:()=>ki,PackageExtensionType:()=>oi,Project:()=>Ke,ProjectLookup:()=>KA,Report:()=>Xi,ReportError:()=>nt,SettingsType:()=>ge,StreamReport:()=>Fe,TAG_REGEXP:()=>Rg,TelemetryManager:()=>Rd,ThrowReport:()=>ei,VirtualFetcher:()=>dd,Workspace:()=>Dd,WorkspaceResolver:()=>Yr,YarnVersion:()=>Zr,execUtils:()=>hr,folderUtils:()=>Pb,formatUtils:()=>ue,hashUtils:()=>mn,httpUtils:()=>Zt,miscUtils:()=>de,scriptUtils:()=>Kt,semverUtils:()=>qt,structUtils:()=>S,tgzUtils:()=>Ai,treeUtils:()=>Hs});var hr={};it(hr,{EndStrategy:()=>Pn,execvp:()=>Nhe,pipevp:()=>to});var ch={};it(ch,{AliasFS:()=>Xo,CwdFS:()=>Ft,DEFAULT_COMPRESSION_LEVEL:()=>pl,FakeFS:()=>eA,Filename:()=>wt,JailFS:()=>Zo,LazyFS:()=>oh,LinkStrategy:()=>eh,NoFS:()=>bI,NodeFS:()=>Wt,PortablePath:()=>Se,PosixFS:()=>ah,ProxiedFS:()=>fi,VirtualFS:()=>Pr,ZipFS:()=>Jr,ZipOpenFS:()=>Jn,constants:()=>mr,extendFs:()=>SI,normalizeLineEndings:()=>ul,npath:()=>M,opendir:()=>wI,patchFs:()=>pb,ppath:()=>v,statUtils:()=>rb,toFilename:()=>kr,xfs:()=>T});var mr={};it(mr,{SAFE_TIME:()=>tb,S_IFDIR:()=>zo,S_IFLNK:()=>_o,S_IFMT:()=>kn,S_IFREG:()=>Vo});var kn=61440,zo=16384,Vo=32768,_o=40960,tb=456789e3;var rb={};it(rb,{BigIntStatsEntry:()=>Xf,DEFAULT_MODE:()=>_f,DirEntry:()=>uO,StatEntry:()=>Za,areStatsEqual:()=>nb,clearStats:()=>pI,convertToBigIntStats:()=>dI,makeDefaultStats:()=>Zf,makeEmptyStats:()=>Jfe});var ib=ie(require("util"));var _f=Vo|420,uO=class{constructor(){this.name="";this.mode=0}isBlockDevice(){return!1}isCharacterDevice(){return!1}isDirectory(){return(this.mode&kn)===zo}isFIFO(){return!1}isFile(){return(this.mode&kn)===Vo}isSocket(){return!1}isSymbolicLink(){return(this.mode&kn)===_o}},Za=class{constructor(){this.uid=0;this.gid=0;this.size=0;this.blksize=0;this.atimeMs=0;this.mtimeMs=0;this.ctimeMs=0;this.birthtimeMs=0;this.atime=new Date(0);this.mtime=new Date(0);this.ctime=new Date(0);this.birthtime=new Date(0);this.dev=0;this.ino=0;this.mode=_f;this.nlink=1;this.rdev=0;this.blocks=1}isBlockDevice(){return!1}isCharacterDevice(){return!1}isDirectory(){return(this.mode&kn)===zo}isFIFO(){return!1}isFile(){return(this.mode&kn)===Vo}isSocket(){return!1}isSymbolicLink(){return(this.mode&kn)===_o}},Xf=class{constructor(){this.uid=BigInt(0);this.gid=BigInt(0);this.size=BigInt(0);this.blksize=BigInt(0);this.atimeMs=BigInt(0);this.mtimeMs=BigInt(0);this.ctimeMs=BigInt(0);this.birthtimeMs=BigInt(0);this.atimeNs=BigInt(0);this.mtimeNs=BigInt(0);this.ctimeNs=BigInt(0);this.birthtimeNs=BigInt(0);this.atime=new Date(0);this.mtime=new Date(0);this.ctime=new Date(0);this.birthtime=new Date(0);this.dev=BigInt(0);this.ino=BigInt(0);this.mode=BigInt(_f);this.nlink=BigInt(1);this.rdev=BigInt(0);this.blocks=BigInt(1)}isBlockDevice(){return!1}isCharacterDevice(){return!1}isDirectory(){return(this.mode&BigInt(kn))===BigInt(zo)}isFIFO(){return!1}isFile(){return(this.mode&BigInt(kn))===BigInt(Vo)}isSocket(){return!1}isSymbolicLink(){return(this.mode&BigInt(kn))===BigInt(_o)}};function Zf(){return new Za}function Jfe(){return pI(Zf())}function pI(t){for(let e in t)if(Object.prototype.hasOwnProperty.call(t,e)){let r=t[e];typeof r=="number"?t[e]=0:typeof r=="bigint"?t[e]=BigInt(0):ib.types.isDate(r)&&(t[e]=new Date(0))}return t}function dI(t){let e=new Xf;for(let r in t)if(Object.prototype.hasOwnProperty.call(t,r)){let i=t[r];typeof i=="number"?e[r]=BigInt(i):ib.types.isDate(i)&&(e[r]=new Date(i))}return e.atimeNs=e.atimeMs*BigInt(1e6),e.mtimeNs=e.mtimeMs*BigInt(1e6),e.ctimeNs=e.ctimeMs*BigInt(1e6),e.birthtimeNs=e.birthtimeMs*BigInt(1e6),e}function nb(t,e){if(t.atimeMs!==e.atimeMs||t.birthtimeMs!==e.birthtimeMs||t.blksize!==e.blksize||t.blocks!==e.blocks||t.ctimeMs!==e.ctimeMs||t.dev!==e.dev||t.gid!==e.gid||t.ino!==e.ino||t.isBlockDevice()!==e.isBlockDevice()||t.isCharacterDevice()!==e.isCharacterDevice()||t.isDirectory()!==e.isDirectory()||t.isFIFO()!==e.isFIFO()||t.isFile()!==e.isFile()||t.isSocket()!==e.isSocket()||t.isSymbolicLink()!==e.isSymbolicLink()||t.mode!==e.mode||t.mtimeMs!==e.mtimeMs||t.nlink!==e.nlink||t.rdev!==e.rdev||t.size!==e.size||t.uid!==e.uid)return!1;let r=t,i=e;return!(r.atimeNs!==i.atimeNs||r.mtimeNs!==i.mtimeNs||r.ctimeNs!==i.ctimeNs||r.birthtimeNs!==i.birthtimeNs)}var mI=ie(require("fs"));var $f=ie(require("path")),gO;(function(i){i[i.File=0]="File",i[i.Portable=1]="Portable",i[i.Native=2]="Native"})(gO||(gO={}));var Se={root:"/",dot:"."},wt={nodeModules:"node_modules",manifest:"package.json",lockfile:"yarn.lock",virtual:"__virtual__",pnpJs:".pnp.js",pnpCjs:".pnp.cjs",rc:".yarnrc.yml"},M=Object.create($f.default),v=Object.create($f.default.posix);M.cwd=()=>process.cwd();v.cwd=()=>sb(process.cwd());v.resolve=(...t)=>t.length>0&&v.isAbsolute(t[0])?$f.default.posix.resolve(...t):$f.default.posix.resolve(v.cwd(),...t);var fO=function(t,e,r){return e=t.normalize(e),r=t.normalize(r),e===r?".":(e.endsWith(t.sep)||(e=e+t.sep),r.startsWith(e)?r.slice(e.length):null)};M.fromPortablePath=hO;M.toPortablePath=sb;M.contains=(t,e)=>fO(M,t,e);v.contains=(t,e)=>fO(v,t,e);var Wfe=/^([a-zA-Z]:.*)$/,zfe=/^\\\\(\.\\)?(.*)$/,Vfe=/^\/([a-zA-Z]:.*)$/,_fe=/^\/unc\/(\.dot\/)?(.*)$/;function hO(t){if(process.platform!=="win32")return t;let e,r;if(e=t.match(Vfe))t=e[1];else if(r=t.match(_fe))t=`\\\\${r[1]?".\\":""}${r[2]}`;else return t;return t.replace(/\//g,"\\")}function sb(t){if(process.platform!=="win32")return t;let e,r;return(e=t.match(Wfe))?t=`/${e[1]}`:(r=t.match(zfe))&&(t=`/unc/${r[1]?".dot/":""}${r[2]}`),t.replace(/\\/g,"/")}function CI(t,e){return t===M?hO(e):sb(e)}function kr(t){if(M.parse(t).dir!==""||v.parse(t).dir!=="")throw new Error(`Invalid filename: "${t}"`);return t}var II=new Date(tb*1e3),eh;(function(r){r.Allow="allow",r.ReadOnly="readOnly"})(eh||(eh={}));async function pO(t,e,r,i,n){let s=t.pathUtils.normalize(e),o=r.pathUtils.normalize(i),a=[],l=[],c=n.stableTime?{mtime:II,atime:II}:await r.lstatPromise(o);await t.mkdirpPromise(t.pathUtils.dirname(e),{utimes:[c.atime,c.mtime]});let u=typeof t.lutimesPromise=="function"?t.lutimesPromise.bind(t):t.utimesPromise.bind(t);await ob(a,l,u,t,s,r,o,n);for(let g of a)await g();await Promise.all(l.map(g=>g()))}async function ob(t,e,r,i,n,s,o,a){var f,h;let l=await Xfe(i,n),c=await s.lstatPromise(o),u=a.stableTime?{mtime:II,atime:II}:c,g;switch(!0){case c.isDirectory():g=await Zfe(t,e,r,i,n,l,s,o,c,a);break;case c.isFile():g=await $fe(t,e,r,i,n,l,s,o,c,a);break;case c.isSymbolicLink():g=await ehe(t,e,r,i,n,l,s,o,c,a);break;default:throw new Error(`Unsupported file type (${c.mode})`)}return(g||((f=l==null?void 0:l.mtime)==null?void 0:f.getTime())!==u.mtime.getTime()||((h=l==null?void 0:l.atime)==null?void 0:h.getTime())!==u.atime.getTime())&&(e.push(()=>r(n,u.atime,u.mtime)),g=!0),(l===null||(l.mode&511)!=(c.mode&511))&&(e.push(()=>i.chmodPromise(n,c.mode&511)),g=!0),g}async function Xfe(t,e){try{return await t.lstatPromise(e)}catch(r){return null}}async function Zfe(t,e,r,i,n,s,o,a,l,c){if(s!==null&&!s.isDirectory())if(c.overwrite)t.push(async()=>i.removePromise(n)),s=null;else return!1;let u=!1;s===null&&(t.push(async()=>{try{await i.mkdirPromise(n,{mode:l.mode})}catch(f){if(f.code!=="EEXIST")throw f}}),u=!0);let g=await o.readdirPromise(a);if(c.stableSort)for(let f of g.sort())await ob(t,e,r,i,i.pathUtils.join(n,f),o,o.pathUtils.join(a,f),c)&&(u=!0);else(await Promise.all(g.map(async h=>{await ob(t,e,r,i,i.pathUtils.join(n,h),o,o.pathUtils.join(a,h),c)}))).some(h=>h)&&(u=!0);return u}var ab=new WeakMap;function Ab(t,e,r,i,n){return async()=>{await t.linkPromise(r,e),n===eh.ReadOnly&&(i.mode&=~146,await t.chmodPromise(e,i.mode))}}function the(t,e,r,i,n){let s=ab.get(t);return typeof s=="undefined"?async()=>{try{await t.copyFilePromise(r,e,mI.default.constants.COPYFILE_FICLONE_FORCE),ab.set(t,!0)}catch(o){if(o.code==="ENOSYS"||o.code==="ENOTSUP")ab.set(t,!1),await Ab(t,e,r,i,n)();else throw o}}:s?async()=>t.copyFilePromise(r,e,mI.default.constants.COPYFILE_FICLONE_FORCE):Ab(t,e,r,i,n)}async function $fe(t,e,r,i,n,s,o,a,l,c){var f;if(s!==null)if(c.overwrite)t.push(async()=>i.removePromise(n)),s=null;else return!1;let u=(f=c.linkStrategy)!=null?f:null,g=i===o?u!==null?the(i,n,a,l,u):async()=>i.copyFilePromise(a,n,mI.default.constants.COPYFILE_FICLONE):u!==null?Ab(i,n,a,l,u):async()=>i.writeFilePromise(n,await o.readFilePromise(a));return t.push(async()=>g()),!0}async function ehe(t,e,r,i,n,s,o,a,l,c){if(s!==null)if(c.overwrite)t.push(async()=>i.removePromise(n)),s=null;else return!1;return t.push(async()=>{await i.symlinkPromise(CI(i.pathUtils,await o.readlinkPromise(a)),n)}),!0}function qn(t,e){return Object.assign(new Error(`${t}: ${e}`),{code:t})}function EI(t){return qn("EBUSY",t)}function th(t,e){return qn("ENOSYS",`${t}, ${e}`)}function $a(t){return qn("EINVAL",`invalid argument, ${t}`)}function Hi(t){return qn("EBADF",`bad file descriptor, ${t}`)}function bs(t){return qn("ENOENT",`no such file or directory, ${t}`)}function eo(t){return qn("ENOTDIR",`not a directory, ${t}`)}function rh(t){return qn("EISDIR",`illegal operation on a directory, ${t}`)}function yI(t){return qn("EEXIST",`file already exists, ${t}`)}function ln(t){return qn("EROFS",`read-only filesystem, ${t}`)}function dO(t){return qn("ENOTEMPTY",`directory not empty, ${t}`)}function CO(t){return qn("EOPNOTSUPP",`operation not supported, ${t}`)}function mO(){return qn("ERR_DIR_CLOSED","Directory handle was closed")}var lb=class extends Error{constructor(e,r){super(e);this.name="Libzip Error",this.code=r}};var IO=class{constructor(e,r,i={}){this.path=e;this.nextDirent=r;this.opts=i;this.closed=!1}throwIfClosed(){if(this.closed)throw mO()}async*[Symbol.asyncIterator](){try{let e;for(;(e=await this.read())!==null;)yield e}finally{await this.close()}}read(e){let r=this.readSync();return typeof e!="undefined"?e(null,r):Promise.resolve(r)}readSync(){return this.throwIfClosed(),this.nextDirent()}close(e){return this.closeSync(),typeof e!="undefined"?e(null):Promise.resolve()}closeSync(){var e,r;this.throwIfClosed(),(r=(e=this.opts).onClose)==null||r.call(e),this.closed=!0}};function wI(t,e,r,i){let n=()=>{let s=r.shift();return typeof s=="undefined"?null:Object.assign(t.statSync(t.pathUtils.join(e,s)),{name:s})};return new IO(e,n,i)}var EO=ie(require("os"));var eA=class{constructor(e){this.pathUtils=e}async*genTraversePromise(e,{stableSort:r=!1}={}){let i=[e];for(;i.length>0;){let n=i.shift();if((await this.lstatPromise(n)).isDirectory()){let o=await this.readdirPromise(n);if(r)for(let a of o.sort())i.push(this.pathUtils.join(n,a));else throw new Error("Not supported")}else yield n}}async removePromise(e,{recursive:r=!0,maxRetries:i=5}={}){let n;try{n=await this.lstatPromise(e)}catch(s){if(s.code==="ENOENT")return;throw s}if(n.isDirectory()){if(r){let o=await this.readdirPromise(e);await Promise.all(o.map(a=>this.removePromise(this.pathUtils.resolve(e,a))))}let s=0;do try{await this.rmdirPromise(e);break}catch(o){if(o.code==="EBUSY"||o.code==="ENOTEMPTY"){if(i===0)break;await new Promise(a=>setTimeout(a,s*100));continue}else throw o}while(s++{let l;try{[l]=await this.readJsonPromise(i)}catch(c){return Date.now()-s<500}try{return process.kill(l,0),!0}catch(c){return!1}};for(;o===null;)try{o=await this.openPromise(i,"wx")}catch(l){if(l.code==="EEXIST"){if(!await a())try{await this.unlinkPromise(i);continue}catch(c){}if(Date.now()-s<60*1e3)await new Promise(c=>setTimeout(c,n));else throw new Error(`Couldn't acquire a lock in a reasonable time (via ${i})`)}else throw l}await this.writePromise(o,JSON.stringify([process.pid]));try{return await r()}finally{try{await this.closePromise(o),await this.unlinkPromise(i)}catch(l){}}}async readJsonPromise(e){let r=await this.readFilePromise(e,"utf8");try{return JSON.parse(r)}catch(i){throw i.message+=` (in ${e})`,i}}readJsonSync(e){let r=this.readFileSync(e,"utf8");try{return JSON.parse(r)}catch(i){throw i.message+=` (in ${e})`,i}}async writeJsonPromise(e,r){return await this.writeFilePromise(e,`${JSON.stringify(r,null,2)} +`)}writeJsonSync(e,r){return this.writeFileSync(e,`${JSON.stringify(r,null,2)} +`)}async preserveTimePromise(e,r){let i=await this.lstatPromise(e),n=await r();typeof n!="undefined"&&(e=n),this.lutimesPromise?await this.lutimesPromise(e,i.atime,i.mtime):i.isSymbolicLink()||await this.utimesPromise(e,i.atime,i.mtime)}async preserveTimeSync(e,r){let i=this.lstatSync(e),n=r();typeof n!="undefined"&&(e=n),this.lutimesSync?this.lutimesSync(e,i.atime,i.mtime):i.isSymbolicLink()||this.utimesSync(e,i.atime,i.mtime)}},gl=class extends eA{constructor(){super(v)}};function rhe(t){let e=t.match(/\r?\n/g);if(e===null)return EO.EOL;let r=e.filter(n=>n===`\r +`).length,i=e.length-r;return r>i?`\r +`:` +`}function ul(t,e){return e.replace(/\r?\n/g,rhe(t))}var $c=ie(require("fs")),cb=ie(require("stream")),QO=ie(require("util")),ub=ie(require("zlib"));var yO=ie(require("fs"));var Wt=class extends gl{constructor(e=yO.default){super();this.realFs=e,typeof this.realFs.lutimes!="undefined"&&(this.lutimesPromise=this.lutimesPromiseImpl,this.lutimesSync=this.lutimesSyncImpl)}getExtractHint(){return!1}getRealPath(){return Se.root}resolve(e){return v.resolve(e)}async openPromise(e,r,i){return await new Promise((n,s)=>{this.realFs.open(M.fromPortablePath(e),r,i,this.makeCallback(n,s))})}openSync(e,r,i){return this.realFs.openSync(M.fromPortablePath(e),r,i)}async opendirPromise(e,r){return await new Promise((i,n)=>{typeof r!="undefined"?this.realFs.opendir(M.fromPortablePath(e),r,this.makeCallback(i,n)):this.realFs.opendir(M.fromPortablePath(e),this.makeCallback(i,n))}).then(i=>Object.defineProperty(i,"path",{value:e,configurable:!0,writable:!0}))}opendirSync(e,r){let i=typeof r!="undefined"?this.realFs.opendirSync(M.fromPortablePath(e),r):this.realFs.opendirSync(M.fromPortablePath(e));return Object.defineProperty(i,"path",{value:e,configurable:!0,writable:!0})}async readPromise(e,r,i=0,n=0,s=-1){return await new Promise((o,a)=>{this.realFs.read(e,r,i,n,s,(l,c)=>{l?a(l):o(c)})})}readSync(e,r,i,n,s){return this.realFs.readSync(e,r,i,n,s)}async writePromise(e,r,i,n,s){return await new Promise((o,a)=>typeof r=="string"?this.realFs.write(e,r,i,this.makeCallback(o,a)):this.realFs.write(e,r,i,n,s,this.makeCallback(o,a)))}writeSync(e,r,i,n,s){return typeof r=="string"?this.realFs.writeSync(e,r,i):this.realFs.writeSync(e,r,i,n,s)}async closePromise(e){await new Promise((r,i)=>{this.realFs.close(e,this.makeCallback(r,i))})}closeSync(e){this.realFs.closeSync(e)}createReadStream(e,r){let i=e!==null?M.fromPortablePath(e):e;return this.realFs.createReadStream(i,r)}createWriteStream(e,r){let i=e!==null?M.fromPortablePath(e):e;return this.realFs.createWriteStream(i,r)}async realpathPromise(e){return await new Promise((r,i)=>{this.realFs.realpath(M.fromPortablePath(e),{},this.makeCallback(r,i))}).then(r=>M.toPortablePath(r))}realpathSync(e){return M.toPortablePath(this.realFs.realpathSync(M.fromPortablePath(e),{}))}async existsPromise(e){return await new Promise(r=>{this.realFs.exists(M.fromPortablePath(e),r)})}accessSync(e,r){return this.realFs.accessSync(M.fromPortablePath(e),r)}async accessPromise(e,r){return await new Promise((i,n)=>{this.realFs.access(M.fromPortablePath(e),r,this.makeCallback(i,n))})}existsSync(e){return this.realFs.existsSync(M.fromPortablePath(e))}async statPromise(e,r){return await new Promise((i,n)=>{r?this.realFs.stat(M.fromPortablePath(e),r,this.makeCallback(i,n)):this.realFs.stat(M.fromPortablePath(e),this.makeCallback(i,n))})}statSync(e,r){return r?this.realFs.statSync(M.fromPortablePath(e),r):this.realFs.statSync(M.fromPortablePath(e))}async fstatPromise(e,r){return await new Promise((i,n)=>{r?this.realFs.fstat(e,r,this.makeCallback(i,n)):this.realFs.fstat(e,this.makeCallback(i,n))})}fstatSync(e,r){return r?this.realFs.fstatSync(e,r):this.realFs.fstatSync(e)}async lstatPromise(e,r){return await new Promise((i,n)=>{r?this.realFs.lstat(M.fromPortablePath(e),r,this.makeCallback(i,n)):this.realFs.lstat(M.fromPortablePath(e),this.makeCallback(i,n))})}lstatSync(e,r){return r?this.realFs.lstatSync(M.fromPortablePath(e),r):this.realFs.lstatSync(M.fromPortablePath(e))}async chmodPromise(e,r){return await new Promise((i,n)=>{this.realFs.chmod(M.fromPortablePath(e),r,this.makeCallback(i,n))})}chmodSync(e,r){return this.realFs.chmodSync(M.fromPortablePath(e),r)}async chownPromise(e,r,i){return await new Promise((n,s)=>{this.realFs.chown(M.fromPortablePath(e),r,i,this.makeCallback(n,s))})}chownSync(e,r,i){return this.realFs.chownSync(M.fromPortablePath(e),r,i)}async renamePromise(e,r){return await new Promise((i,n)=>{this.realFs.rename(M.fromPortablePath(e),M.fromPortablePath(r),this.makeCallback(i,n))})}renameSync(e,r){return this.realFs.renameSync(M.fromPortablePath(e),M.fromPortablePath(r))}async copyFilePromise(e,r,i=0){return await new Promise((n,s)=>{this.realFs.copyFile(M.fromPortablePath(e),M.fromPortablePath(r),i,this.makeCallback(n,s))})}copyFileSync(e,r,i=0){return this.realFs.copyFileSync(M.fromPortablePath(e),M.fromPortablePath(r),i)}async appendFilePromise(e,r,i){return await new Promise((n,s)=>{let o=typeof e=="string"?M.fromPortablePath(e):e;i?this.realFs.appendFile(o,r,i,this.makeCallback(n,s)):this.realFs.appendFile(o,r,this.makeCallback(n,s))})}appendFileSync(e,r,i){let n=typeof e=="string"?M.fromPortablePath(e):e;i?this.realFs.appendFileSync(n,r,i):this.realFs.appendFileSync(n,r)}async writeFilePromise(e,r,i){return await new Promise((n,s)=>{let o=typeof e=="string"?M.fromPortablePath(e):e;i?this.realFs.writeFile(o,r,i,this.makeCallback(n,s)):this.realFs.writeFile(o,r,this.makeCallback(n,s))})}writeFileSync(e,r,i){let n=typeof e=="string"?M.fromPortablePath(e):e;i?this.realFs.writeFileSync(n,r,i):this.realFs.writeFileSync(n,r)}async unlinkPromise(e){return await new Promise((r,i)=>{this.realFs.unlink(M.fromPortablePath(e),this.makeCallback(r,i))})}unlinkSync(e){return this.realFs.unlinkSync(M.fromPortablePath(e))}async utimesPromise(e,r,i){return await new Promise((n,s)=>{this.realFs.utimes(M.fromPortablePath(e),r,i,this.makeCallback(n,s))})}utimesSync(e,r,i){this.realFs.utimesSync(M.fromPortablePath(e),r,i)}async lutimesPromiseImpl(e,r,i){let n=this.realFs.lutimes;if(typeof n=="undefined")throw th("unavailable Node binding",`lutimes '${e}'`);return await new Promise((s,o)=>{n.call(this.realFs,M.fromPortablePath(e),r,i,this.makeCallback(s,o))})}lutimesSyncImpl(e,r,i){let n=this.realFs.lutimesSync;if(typeof n=="undefined")throw th("unavailable Node binding",`lutimes '${e}'`);n.call(this.realFs,M.fromPortablePath(e),r,i)}async mkdirPromise(e,r){return await new Promise((i,n)=>{this.realFs.mkdir(M.fromPortablePath(e),r,this.makeCallback(i,n))})}mkdirSync(e,r){return this.realFs.mkdirSync(M.fromPortablePath(e),r)}async rmdirPromise(e,r){return await new Promise((i,n)=>{r?this.realFs.rmdir(M.fromPortablePath(e),r,this.makeCallback(i,n)):this.realFs.rmdir(M.fromPortablePath(e),this.makeCallback(i,n))})}rmdirSync(e,r){return this.realFs.rmdirSync(M.fromPortablePath(e),r)}async linkPromise(e,r){return await new Promise((i,n)=>{this.realFs.link(M.fromPortablePath(e),M.fromPortablePath(r),this.makeCallback(i,n))})}linkSync(e,r){return this.realFs.linkSync(M.fromPortablePath(e),M.fromPortablePath(r))}async symlinkPromise(e,r,i){return await new Promise((n,s)=>{this.realFs.symlink(M.fromPortablePath(e.replace(/\/+$/,"")),M.fromPortablePath(r),i,this.makeCallback(n,s))})}symlinkSync(e,r,i){return this.realFs.symlinkSync(M.fromPortablePath(e.replace(/\/+$/,"")),M.fromPortablePath(r),i)}async readFilePromise(e,r){return await new Promise((i,n)=>{let s=typeof e=="string"?M.fromPortablePath(e):e;this.realFs.readFile(s,r,this.makeCallback(i,n))})}readFileSync(e,r){let i=typeof e=="string"?M.fromPortablePath(e):e;return this.realFs.readFileSync(i,r)}async readdirPromise(e,r){return await new Promise((i,n)=>{(r==null?void 0:r.withFileTypes)?this.realFs.readdir(M.fromPortablePath(e),{withFileTypes:!0},this.makeCallback(i,n)):this.realFs.readdir(M.fromPortablePath(e),this.makeCallback(s=>i(s),n))})}readdirSync(e,r){return(r==null?void 0:r.withFileTypes)?this.realFs.readdirSync(M.fromPortablePath(e),{withFileTypes:!0}):this.realFs.readdirSync(M.fromPortablePath(e))}async readlinkPromise(e){return await new Promise((r,i)=>{this.realFs.readlink(M.fromPortablePath(e),this.makeCallback(r,i))}).then(r=>M.toPortablePath(r))}readlinkSync(e){return M.toPortablePath(this.realFs.readlinkSync(M.fromPortablePath(e)))}async truncatePromise(e,r){return await new Promise((i,n)=>{this.realFs.truncate(M.fromPortablePath(e),r,this.makeCallback(i,n))})}truncateSync(e,r){return this.realFs.truncateSync(M.fromPortablePath(e),r)}watch(e,r,i){return this.realFs.watch(M.fromPortablePath(e),r,i)}watchFile(e,r,i){return this.realFs.watchFile(M.fromPortablePath(e),r,i)}unwatchFile(e,r){return this.realFs.unwatchFile(M.fromPortablePath(e),r)}makeCallback(e,r){return(i,n)=>{i?r(i):e(n)}}};var wO=ie(require("events"));var fl;(function(r){r.Change="change",r.Stop="stop"})(fl||(fl={}));var hl;(function(i){i.Ready="ready",i.Running="running",i.Stopped="stopped"})(hl||(hl={}));function BO(t,e){if(t!==e)throw new Error(`Invalid StatWatcher status: expected '${e}', got '${t}'`)}var ih=class extends wO.EventEmitter{constructor(e,r,{bigint:i=!1}={}){super();this.status=hl.Ready;this.changeListeners=new Map;this.startTimeout=null;this.fakeFs=e,this.path=r,this.bigint=i,this.lastStats=this.stat()}static create(e,r,i){let n=new ih(e,r,i);return n.start(),n}start(){BO(this.status,hl.Ready),this.status=hl.Running,this.startTimeout=setTimeout(()=>{this.startTimeout=null,this.fakeFs.existsSync(this.path)||this.emit(fl.Change,this.lastStats,this.lastStats)},3)}stop(){BO(this.status,hl.Running),this.status=hl.Stopped,this.startTimeout!==null&&(clearTimeout(this.startTimeout),this.startTimeout=null),this.emit(fl.Stop)}stat(){try{return this.fakeFs.statSync(this.path,{bigint:this.bigint})}catch(e){let r=this.bigint?new Xf:new Za;return pI(r)}}makeInterval(e){let r=setInterval(()=>{let i=this.stat(),n=this.lastStats;nb(i,n)||(this.lastStats=i,this.emit(fl.Change,i,n))},e.interval);return e.persistent?r:r.unref()}registerChangeListener(e,r){this.addListener(fl.Change,e),this.changeListeners.set(e,this.makeInterval(r))}unregisterChangeListener(e){this.removeListener(fl.Change,e);let r=this.changeListeners.get(e);typeof r!="undefined"&&clearInterval(r),this.changeListeners.delete(e)}unregisterAllChangeListeners(){for(let e of this.changeListeners.keys())this.unregisterChangeListener(e)}hasChangeListeners(){return this.changeListeners.size>0}ref(){for(let e of this.changeListeners.values())e.ref();return this}unref(){for(let e of this.changeListeners.values())e.unref();return this}};var BI=new WeakMap;function QI(t,e,r,i){let n,s,o,a;switch(typeof r){case"function":n=!1,s=!0,o=5007,a=r;break;default:({bigint:n=!1,persistent:s=!0,interval:o=5007}=r),a=i;break}let l=BI.get(t);typeof l=="undefined"&&BI.set(t,l=new Map);let c=l.get(e);return typeof c=="undefined"&&(c=ih.create(t,e,{bigint:n}),l.set(e,c)),c.registerChangeListener(a,{persistent:s,interval:o}),c}function nh(t,e,r){let i=BI.get(t);if(typeof i=="undefined")return;let n=i.get(e);typeof n!="undefined"&&(typeof r=="undefined"?n.unregisterAllChangeListeners():n.unregisterChangeListener(r),n.hasChangeListeners()||(n.stop(),i.delete(e)))}function sh(t){let e=BI.get(t);if(typeof e!="undefined")for(let r of e.keys())nh(t,r)}var pl="mixed";function ihe(t){if(typeof t=="string"&&String(+t)===t)return+t;if(Number.isFinite(t))return t<0?Date.now()/1e3:t;if((0,QO.isDate)(t))return t.getTime()/1e3;throw new Error("Invalid time")}function bO(){return Buffer.from([80,75,5,6,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0])}var Jr=class extends gl{constructor(e,r){super();this.lzSource=null;this.listings=new Map;this.entries=new Map;this.fileSources=new Map;this.fds=new Map;this.nextFd=0;this.ready=!1;this.readOnly=!1;this.libzip=r.libzip;let i=r;if(this.level=typeof i.level!="undefined"?i.level:pl,e!=null||(e=bO()),typeof e=="string"){let{baseFs:o=new Wt}=i;this.baseFs=o,this.path=e}else this.path=null,this.baseFs=null;if(r.stats)this.stats=r.stats;else if(typeof e=="string")try{this.stats=this.baseFs.statSync(e)}catch(o){if(o.code==="ENOENT"&&i.create)this.stats=Zf();else throw o}else this.stats=Zf();let n=this.libzip.malloc(4);try{let o=0;if(typeof e=="string"&&i.create&&(o|=this.libzip.ZIP_CREATE|this.libzip.ZIP_TRUNCATE),r.readOnly&&(o|=this.libzip.ZIP_RDONLY,this.readOnly=!0),typeof e=="string")this.zip=this.libzip.open(M.fromPortablePath(e),o,n);else{let a=this.allocateUnattachedSource(e);try{this.zip=this.libzip.openFromSource(a,o,n),this.lzSource=a}catch(l){throw this.libzip.source.free(a),l}}if(this.zip===0){let a=this.libzip.struct.errorS();throw this.libzip.error.initWithCode(a,this.libzip.getValue(n,"i32")),this.makeLibzipError(a)}}finally{this.libzip.free(n)}this.listings.set(Se.root,new Set);let s=this.libzip.getNumEntries(this.zip,0);for(let o=0;oe)throw new Error("Overread");let n=this.libzip.HEAPU8.subarray(r,r+e);return Buffer.from(n)}finally{this.libzip.free(r)}}finally{this.libzip.source.close(this.lzSource),this.libzip.source.free(this.lzSource),this.ready=!1}}prepareClose(){if(!this.ready)throw EI("archive closed, close");sh(this)}saveAndClose(){if(!this.path||!this.baseFs)throw new Error("ZipFS cannot be saved and must be discarded when loaded from a buffer");if(this.prepareClose(),this.readOnly){this.discardAndClose();return}let e=this.baseFs.existsSync(this.path)||this.stats.mode===_f?void 0:this.stats.mode;if(this.entries.size===0)this.discardAndClose(),this.baseFs.writeFileSync(this.path,bO(),{mode:e});else{if(this.libzip.close(this.zip)===-1)throw this.makeLibzipError(this.libzip.getError(this.zip));typeof e!="undefined"&&this.baseFs.chmodSync(this.path,e)}this.ready=!1}discardAndClose(){this.prepareClose(),this.libzip.discard(this.zip),this.ready=!1}resolve(e){return v.resolve(Se.root,e)}async openPromise(e,r,i){return this.openSync(e,r,i)}openSync(e,r,i){let n=this.nextFd++;return this.fds.set(n,{cursor:0,p:e}),n}hasOpenFileHandles(){return!!this.fds.size}async opendirPromise(e,r){return this.opendirSync(e,r)}opendirSync(e,r={}){let i=this.resolveFilename(`opendir '${e}'`,e);if(!this.entries.has(i)&&!this.listings.has(i))throw bs(`opendir '${e}'`);let n=this.listings.get(i);if(!n)throw eo(`opendir '${e}'`);let s=[...n],o=this.openSync(i,"r");return wI(this,i,s,{onClose:()=>{this.closeSync(o)}})}async readPromise(e,r,i,n,s){return this.readSync(e,r,i,n,s)}readSync(e,r,i=0,n=r.byteLength,s=-1){let o=this.fds.get(e);if(typeof o=="undefined")throw Hi("read");let a;s===-1||s===null?a=o.cursor:a=s;let l=this.readFileSync(o.p);l.copy(r,i,a,a+n);let c=Math.max(0,Math.min(l.length-a,n));return(s===-1||s===null)&&(o.cursor+=c),c}async writePromise(e,r,i,n,s){return typeof r=="string"?this.writeSync(e,r,s):this.writeSync(e,r,i,n,s)}writeSync(e,r,i,n,s){throw typeof this.fds.get(e)=="undefined"?Hi("read"):new Error("Unimplemented")}async closePromise(e){return this.closeSync(e)}closeSync(e){if(typeof this.fds.get(e)=="undefined")throw Hi("read");this.fds.delete(e)}createReadStream(e,{encoding:r}={}){if(e===null)throw new Error("Unimplemented");let i=this.openSync(e,"r"),n=Object.assign(new cb.PassThrough({emitClose:!0,autoDestroy:!0,destroy:(o,a)=>{clearImmediate(s),this.closeSync(i),a(o)}}),{close(){n.destroy()},bytesRead:0,path:e}),s=setImmediate(async()=>{try{let o=await this.readFilePromise(e,r);n.bytesRead=o.length,n.end(o)}catch(o){n.destroy(o)}});return n}createWriteStream(e,{encoding:r}={}){if(this.readOnly)throw ln(`open '${e}'`);if(e===null)throw new Error("Unimplemented");let i=[],n=this.openSync(e,"w"),s=Object.assign(new cb.PassThrough({autoDestroy:!0,emitClose:!0,destroy:(o,a)=>{try{o?a(o):(this.writeFileSync(e,Buffer.concat(i),r),a(null))}catch(l){a(l)}finally{this.closeSync(n)}}}),{bytesWritten:0,path:e,close(){s.destroy()}});return s.on("data",o=>{let a=Buffer.from(o);s.bytesWritten+=a.length,i.push(a)}),s}async realpathPromise(e){return this.realpathSync(e)}realpathSync(e){let r=this.resolveFilename(`lstat '${e}'`,e);if(!this.entries.has(r)&&!this.listings.has(r))throw bs(`lstat '${e}'`);return r}async existsPromise(e){return this.existsSync(e)}existsSync(e){if(!this.ready)throw EI(`archive closed, existsSync '${e}'`);if(this.symlinkCount===0){let i=v.resolve(Se.root,e);return this.entries.has(i)||this.listings.has(i)}let r;try{r=this.resolveFilename(`stat '${e}'`,e)}catch(i){return!1}return this.entries.has(r)||this.listings.has(r)}async accessPromise(e,r){return this.accessSync(e,r)}accessSync(e,r=$c.constants.F_OK){let i=this.resolveFilename(`access '${e}'`,e);if(!this.entries.has(i)&&!this.listings.has(i))throw bs(`access '${e}'`);if(this.readOnly&&r&$c.constants.W_OK)throw ln(`access '${e}'`)}async statPromise(e,r){return this.statSync(e,r)}statSync(e,r){let i=this.resolveFilename(`stat '${e}'`,e);if(!this.entries.has(i)&&!this.listings.has(i))throw bs(`stat '${e}'`);if(e[e.length-1]==="/"&&!this.listings.has(i))throw eo(`stat '${e}'`);return this.statImpl(`stat '${e}'`,i,r)}async fstatPromise(e,r){return this.fstatSync(e,r)}fstatSync(e,r){let i=this.fds.get(e);if(typeof i=="undefined")throw Hi("fstatSync");let{p:n}=i,s=this.resolveFilename(`stat '${n}'`,n);if(!this.entries.has(s)&&!this.listings.has(s))throw bs(`stat '${n}'`);if(n[n.length-1]==="/"&&!this.listings.has(s))throw eo(`stat '${n}'`);return this.statImpl(`fstat '${n}'`,s,r)}async lstatPromise(e,r){return this.lstatSync(e,r)}lstatSync(e,r){let i=this.resolveFilename(`lstat '${e}'`,e,!1);if(!this.entries.has(i)&&!this.listings.has(i))throw bs(`lstat '${e}'`);if(e[e.length-1]==="/"&&!this.listings.has(i))throw eo(`lstat '${e}'`);return this.statImpl(`lstat '${e}'`,i,r)}statImpl(e,r,i={}){let n=this.entries.get(r);if(typeof n!="undefined"){let s=this.libzip.struct.statS();if(this.libzip.statIndex(this.zip,n,0,0,s)===-1)throw this.makeLibzipError(this.libzip.getError(this.zip));let a=this.stats.uid,l=this.stats.gid,c=this.libzip.struct.statSize(s)>>>0,u=512,g=Math.ceil(c/u),f=(this.libzip.struct.statMtime(s)>>>0)*1e3,h=f,p=f,d=f,m=new Date(h),E=new Date(p),B=new Date(d),b=new Date(f),R=this.listings.has(r)?zo:this.isSymbolicLink(n)?_o:Vo,H=R===zo?493:420,L=R|this.getUnixMode(n,H)&511,K=this.libzip.struct.statCrc(s),J=Object.assign(new Za,{uid:a,gid:l,size:c,blksize:u,blocks:g,atime:m,birthtime:E,ctime:B,mtime:b,atimeMs:h,birthtimeMs:p,ctimeMs:d,mtimeMs:f,mode:L,crc:K});return i.bigint===!0?dI(J):J}if(this.listings.has(r)){let s=this.stats.uid,o=this.stats.gid,a=0,l=512,c=0,u=this.stats.mtimeMs,g=this.stats.mtimeMs,f=this.stats.mtimeMs,h=this.stats.mtimeMs,p=new Date(u),d=new Date(g),m=new Date(f),E=new Date(h),B=zo|493,b=0,R=Object.assign(new Za,{uid:s,gid:o,size:a,blksize:l,blocks:c,atime:p,birthtime:d,ctime:m,mtime:E,atimeMs:u,birthtimeMs:g,ctimeMs:f,mtimeMs:h,mode:B,crc:b});return i.bigint===!0?dI(R):R}throw new Error("Unreachable")}getUnixMode(e,r){if(this.libzip.file.getExternalAttributes(this.zip,e,0,0,this.libzip.uint08S,this.libzip.uint32S)===-1)throw this.makeLibzipError(this.libzip.getError(this.zip));return this.libzip.getValue(this.libzip.uint08S,"i8")>>>0!==this.libzip.ZIP_OPSYS_UNIX?r:this.libzip.getValue(this.libzip.uint32S,"i32")>>>16}registerListing(e){let r=this.listings.get(e);if(r)return r;let i=this.registerListing(v.dirname(e));return r=new Set,i.add(v.basename(e)),this.listings.set(e,r),r}registerEntry(e,r){this.registerListing(v.dirname(e)).add(v.basename(e)),this.entries.set(e,r)}unregisterListing(e){this.listings.delete(e);let r=this.listings.get(v.dirname(e));r==null||r.delete(v.basename(e))}unregisterEntry(e){this.unregisterListing(e);let r=this.entries.get(e);this.entries.delete(e),typeof r!="undefined"&&(this.fileSources.delete(r),this.isSymbolicLink(r)&&this.symlinkCount--)}deleteEntry(e,r){if(this.unregisterEntry(e),this.libzip.delete(this.zip,r)===-1)throw this.makeLibzipError(this.libzip.getError(this.zip))}resolveFilename(e,r,i=!0){if(!this.ready)throw EI(`archive closed, ${e}`);let n=v.resolve(Se.root,r);if(n==="/")return Se.root;let s=this.entries.get(n);if(i&&s!==void 0)if(this.symlinkCount!==0&&this.isSymbolicLink(s)){let o=this.getFileSource(s).toString();return this.resolveFilename(e,v.resolve(v.dirname(n),o),!0)}else return n;for(;;){let o=this.resolveFilename(e,v.dirname(n),!0),a=this.listings.has(o),l=this.entries.has(o);if(!a&&!l)throw bs(e);if(!a)throw eo(e);if(n=v.resolve(o,v.basename(n)),!i||this.symlinkCount===0)break;let c=this.libzip.name.locate(this.zip,n.slice(1));if(c===-1)break;if(this.isSymbolicLink(c)){let u=this.getFileSource(c).toString();n=v.resolve(v.dirname(n),u)}else break}return n}allocateBuffer(e){Buffer.isBuffer(e)||(e=Buffer.from(e));let r=this.libzip.malloc(e.byteLength);if(!r)throw new Error("Couldn't allocate enough memory");return new Uint8Array(this.libzip.HEAPU8.buffer,r,e.byteLength).set(e),{buffer:r,byteLength:e.byteLength}}allocateUnattachedSource(e){let r=this.libzip.struct.errorS(),{buffer:i,byteLength:n}=this.allocateBuffer(e),s=this.libzip.source.fromUnattachedBuffer(i,n,0,!0,r);if(s===0)throw this.libzip.free(r),this.makeLibzipError(r);return s}allocateSource(e){let{buffer:r,byteLength:i}=this.allocateBuffer(e),n=this.libzip.source.fromBuffer(this.zip,r,i,0,!0);if(n===0)throw this.libzip.free(r),this.makeLibzipError(this.libzip.getError(this.zip));return n}setFileSource(e,r){let i=Buffer.isBuffer(r)?r:Buffer.from(r),n=v.relative(Se.root,e),s=this.allocateSource(r);try{let o=this.libzip.file.add(this.zip,n,s,this.libzip.ZIP_FL_OVERWRITE);if(o===-1)throw this.makeLibzipError(this.libzip.getError(this.zip));if(this.level!=="mixed"){let a;if(this.level===0?a=this.libzip.ZIP_CM_STORE:a=this.libzip.ZIP_CM_DEFLATE,this.libzip.file.setCompression(this.zip,o,0,a,this.level)===-1)throw this.makeLibzipError(this.libzip.getError(this.zip))}return this.fileSources.set(o,i),o}catch(o){throw this.libzip.source.free(s),o}}isSymbolicLink(e){if(this.symlinkCount===0)return!1;if(this.libzip.file.getExternalAttributes(this.zip,e,0,0,this.libzip.uint08S,this.libzip.uint32S)===-1)throw this.makeLibzipError(this.libzip.getError(this.zip));return this.libzip.getValue(this.libzip.uint08S,"i8")>>>0!==this.libzip.ZIP_OPSYS_UNIX?!1:(this.libzip.getValue(this.libzip.uint32S,"i32")>>>16&kn)===_o}getFileSource(e,r={asyncDecompress:!1}){let i=this.fileSources.get(e);if(typeof i!="undefined")return i;let n=this.libzip.struct.statS();if(this.libzip.statIndex(this.zip,e,0,0,n)===-1)throw this.makeLibzipError(this.libzip.getError(this.zip));let o=this.libzip.struct.statCompSize(n),a=this.libzip.struct.statCompMethod(n),l=this.libzip.malloc(o);try{let c=this.libzip.fopenIndex(this.zip,e,0,this.libzip.ZIP_FL_COMPRESSED);if(c===0)throw this.makeLibzipError(this.libzip.getError(this.zip));try{let u=this.libzip.fread(c,l,o,0);if(u===-1)throw this.makeLibzipError(this.libzip.file.getError(c));if(uo)throw new Error("Overread");let g=this.libzip.HEAPU8.subarray(l,l+o),f=Buffer.from(g);if(a===0)return this.fileSources.set(e,f),f;if(r.asyncDecompress)return new Promise((h,p)=>{ub.default.inflateRaw(f,(d,m)=>{d?p(d):(this.fileSources.set(e,m),h(m))})});{let h=ub.default.inflateRawSync(f);return this.fileSources.set(e,h),h}}finally{this.libzip.fclose(c)}}finally{this.libzip.free(l)}}async chmodPromise(e,r){return this.chmodSync(e,r)}chmodSync(e,r){if(this.readOnly)throw ln(`chmod '${e}'`);r&=493;let i=this.resolveFilename(`chmod '${e}'`,e,!1),n=this.entries.get(i);if(typeof n=="undefined")throw new Error(`Assertion failed: The entry should have been registered (${i})`);let o=this.getUnixMode(n,Vo|0)&~511|r;if(this.libzip.file.setExternalAttributes(this.zip,n,0,0,this.libzip.ZIP_OPSYS_UNIX,o<<16)===-1)throw this.makeLibzipError(this.libzip.getError(this.zip))}async chownPromise(e,r,i){return this.chownSync(e,r,i)}chownSync(e,r,i){throw new Error("Unimplemented")}async renamePromise(e,r){return this.renameSync(e,r)}renameSync(e,r){throw new Error("Unimplemented")}async copyFilePromise(e,r,i){let{indexSource:n,indexDest:s,resolvedDestP:o}=this.prepareCopyFile(e,r,i),a=await this.getFileSource(n,{asyncDecompress:!0}),l=this.setFileSource(o,a);l!==s&&this.registerEntry(o,l)}copyFileSync(e,r,i=0){let{indexSource:n,indexDest:s,resolvedDestP:o}=this.prepareCopyFile(e,r,i),a=this.getFileSource(n),l=this.setFileSource(o,a);l!==s&&this.registerEntry(o,l)}prepareCopyFile(e,r,i=0){if(this.readOnly)throw ln(`copyfile '${e} -> '${r}'`);if((i&$c.constants.COPYFILE_FICLONE_FORCE)!=0)throw th("unsupported clone operation",`copyfile '${e}' -> ${r}'`);let n=this.resolveFilename(`copyfile '${e} -> ${r}'`,e),s=this.entries.get(n);if(typeof s=="undefined")throw $a(`copyfile '${e}' -> '${r}'`);let o=this.resolveFilename(`copyfile '${e}' -> ${r}'`,r),a=this.entries.get(o);if((i&($c.constants.COPYFILE_EXCL|$c.constants.COPYFILE_FICLONE_FORCE))!=0&&typeof a!="undefined")throw yI(`copyfile '${e}' -> '${r}'`);return{indexSource:s,resolvedDestP:o,indexDest:a}}async appendFilePromise(e,r,i){if(this.readOnly)throw ln(`open '${e}'`);return typeof i=="undefined"?i={flag:"a"}:typeof i=="string"?i={flag:"a",encoding:i}:typeof i.flag=="undefined"&&(i=P({flag:"a"},i)),this.writeFilePromise(e,r,i)}appendFileSync(e,r,i={}){if(this.readOnly)throw ln(`open '${e}'`);return typeof i=="undefined"?i={flag:"a"}:typeof i=="string"?i={flag:"a",encoding:i}:typeof i.flag=="undefined"&&(i=P({flag:"a"},i)),this.writeFileSync(e,r,i)}fdToPath(e,r){var n;let i=(n=this.fds.get(e))==null?void 0:n.p;if(typeof i=="undefined")throw Hi(r);return i}async writeFilePromise(e,r,i){let{encoding:n,mode:s,index:o,resolvedP:a}=this.prepareWriteFile(e,i);o!==void 0&&typeof i=="object"&&i.flag&&i.flag.includes("a")&&(r=Buffer.concat([await this.getFileSource(o,{asyncDecompress:!0}),Buffer.from(r)])),n!==null&&(r=r.toString(n));let l=this.setFileSource(a,r);l!==o&&this.registerEntry(a,l),s!==null&&await this.chmodPromise(a,s)}writeFileSync(e,r,i){let{encoding:n,mode:s,index:o,resolvedP:a}=this.prepareWriteFile(e,i);o!==void 0&&typeof i=="object"&&i.flag&&i.flag.includes("a")&&(r=Buffer.concat([this.getFileSource(o),Buffer.from(r)])),n!==null&&(r=r.toString(n));let l=this.setFileSource(a,r);l!==o&&this.registerEntry(a,l),s!==null&&this.chmodSync(a,s)}prepareWriteFile(e,r){if(typeof e=="number"&&(e=this.fdToPath(e,"read")),this.readOnly)throw ln(`open '${e}'`);let i=this.resolveFilename(`open '${e}'`,e);if(this.listings.has(i))throw rh(`open '${e}'`);let n=null,s=null;typeof r=="string"?n=r:typeof r=="object"&&({encoding:n=null,mode:s=null}=r);let o=this.entries.get(i);return{encoding:n,mode:s,resolvedP:i,index:o}}async unlinkPromise(e){return this.unlinkSync(e)}unlinkSync(e){if(this.readOnly)throw ln(`unlink '${e}'`);let r=this.resolveFilename(`unlink '${e}'`,e);if(this.listings.has(r))throw rh(`unlink '${e}'`);let i=this.entries.get(r);if(typeof i=="undefined")throw $a(`unlink '${e}'`);this.deleteEntry(r,i)}async utimesPromise(e,r,i){return this.utimesSync(e,r,i)}utimesSync(e,r,i){if(this.readOnly)throw ln(`utimes '${e}'`);let n=this.resolveFilename(`utimes '${e}'`,e);this.utimesImpl(n,i)}async lutimesPromise(e,r,i){return this.lutimesSync(e,r,i)}lutimesSync(e,r,i){if(this.readOnly)throw ln(`lutimes '${e}'`);let n=this.resolveFilename(`utimes '${e}'`,e,!1);this.utimesImpl(n,i)}utimesImpl(e,r){this.listings.has(e)&&(this.entries.has(e)||this.hydrateDirectory(e));let i=this.entries.get(e);if(i===void 0)throw new Error("Unreachable");if(this.libzip.file.setMtime(this.zip,i,0,ihe(r),0)===-1)throw this.makeLibzipError(this.libzip.getError(this.zip))}async mkdirPromise(e,r){return this.mkdirSync(e,r)}mkdirSync(e,{mode:r=493,recursive:i=!1}={}){if(i){this.mkdirpSync(e,{chmod:r});return}if(this.readOnly)throw ln(`mkdir '${e}'`);let n=this.resolveFilename(`mkdir '${e}'`,e);if(this.entries.has(n)||this.listings.has(n))throw yI(`mkdir '${e}'`);this.hydrateDirectory(n),this.chmodSync(n,r)}async rmdirPromise(e,r){return this.rmdirSync(e,r)}rmdirSync(e,{recursive:r=!1}={}){if(this.readOnly)throw ln(`rmdir '${e}'`);if(r){this.removeSync(e);return}let i=this.resolveFilename(`rmdir '${e}'`,e),n=this.listings.get(i);if(!n)throw eo(`rmdir '${e}'`);if(n.size>0)throw dO(`rmdir '${e}'`);let s=this.entries.get(i);if(typeof s=="undefined")throw $a(`rmdir '${e}'`);this.deleteEntry(e,s)}hydrateDirectory(e){let r=this.libzip.dir.add(this.zip,v.relative(Se.root,e));if(r===-1)throw this.makeLibzipError(this.libzip.getError(this.zip));return this.registerListing(e),this.registerEntry(e,r),r}async linkPromise(e,r){return this.linkSync(e,r)}linkSync(e,r){throw CO(`link '${e}' -> '${r}'`)}async symlinkPromise(e,r){return this.symlinkSync(e,r)}symlinkSync(e,r){if(this.readOnly)throw ln(`symlink '${e}' -> '${r}'`);let i=this.resolveFilename(`symlink '${e}' -> '${r}'`,r);if(this.listings.has(i))throw rh(`symlink '${e}' -> '${r}'`);if(this.entries.has(i))throw yI(`symlink '${e}' -> '${r}'`);let n=this.setFileSource(i,e);if(this.registerEntry(i,n),this.libzip.file.setExternalAttributes(this.zip,n,0,0,this.libzip.ZIP_OPSYS_UNIX,(_o|511)<<16)===-1)throw this.makeLibzipError(this.libzip.getError(this.zip));this.symlinkCount+=1}async readFilePromise(e,r){typeof r=="object"&&(r=r?r.encoding:void 0);let i=await this.readFileBuffer(e,{asyncDecompress:!0});return r?i.toString(r):i}readFileSync(e,r){typeof r=="object"&&(r=r?r.encoding:void 0);let i=this.readFileBuffer(e);return r?i.toString(r):i}readFileBuffer(e,r={asyncDecompress:!1}){typeof e=="number"&&(e=this.fdToPath(e,"read"));let i=this.resolveFilename(`open '${e}'`,e);if(!this.entries.has(i)&&!this.listings.has(i))throw bs(`open '${e}'`);if(e[e.length-1]==="/"&&!this.listings.has(i))throw eo(`open '${e}'`);if(this.listings.has(i))throw rh("read");let n=this.entries.get(i);if(n===void 0)throw new Error("Unreachable");return this.getFileSource(n,r)}async readdirPromise(e,r){return this.readdirSync(e,r)}readdirSync(e,r){let i=this.resolveFilename(`scandir '${e}'`,e);if(!this.entries.has(i)&&!this.listings.has(i))throw bs(`scandir '${e}'`);let n=this.listings.get(i);if(!n)throw eo(`scandir '${e}'`);let s=[...n];return(r==null?void 0:r.withFileTypes)?s.map(o=>Object.assign(this.statImpl("lstat",v.join(e,o)),{name:o})):s}async readlinkPromise(e){let r=this.prepareReadlink(e);return(await this.getFileSource(r,{asyncDecompress:!0})).toString()}readlinkSync(e){let r=this.prepareReadlink(e);return this.getFileSource(r).toString()}prepareReadlink(e){let r=this.resolveFilename(`readlink '${e}'`,e,!1);if(!this.entries.has(r)&&!this.listings.has(r))throw bs(`readlink '${e}'`);if(e[e.length-1]==="/"&&!this.listings.has(r))throw eo(`open '${e}'`);if(this.listings.has(r))throw $a(`readlink '${e}'`);let i=this.entries.get(r);if(i===void 0)throw new Error("Unreachable");if(!this.isSymbolicLink(i))throw $a(`readlink '${e}'`);return i}async truncatePromise(e,r=0){let i=this.resolveFilename(`open '${e}'`,e),n=this.entries.get(i);if(typeof n=="undefined")throw $a(`open '${e}'`);let s=await this.getFileSource(n,{asyncDecompress:!0}),o=Buffer.alloc(r,0);return s.copy(o),await this.writeFilePromise(e,o)}truncateSync(e,r=0){let i=this.resolveFilename(`open '${e}'`,e),n=this.entries.get(i);if(typeof n=="undefined")throw $a(`open '${e}'`);let s=this.getFileSource(n),o=Buffer.alloc(r,0);return s.copy(o),this.writeFileSync(e,o)}watch(e,r,i){let n;switch(typeof r){case"function":case"string":case"undefined":n=!0;break;default:({persistent:n=!0}=r);break}if(!n)return{on:()=>{},close:()=>{}};let s=setInterval(()=>{},24*60*60*1e3);return{on:()=>{},close:()=>{clearInterval(s)}}}watchFile(e,r,i){let n=v.resolve(Se.root,e);return QI(this,n,r,i)}unwatchFile(e,r){let i=v.resolve(Se.root,e);return nh(this,i,r)}};var fi=class extends eA{getExtractHint(e){return this.baseFs.getExtractHint(e)}resolve(e){return this.mapFromBase(this.baseFs.resolve(this.mapToBase(e)))}getRealPath(){return this.mapFromBase(this.baseFs.getRealPath())}async openPromise(e,r,i){return this.baseFs.openPromise(this.mapToBase(e),r,i)}openSync(e,r,i){return this.baseFs.openSync(this.mapToBase(e),r,i)}async opendirPromise(e,r){return Object.assign(await this.baseFs.opendirPromise(this.mapToBase(e),r),{path:e})}opendirSync(e,r){return Object.assign(this.baseFs.opendirSync(this.mapToBase(e),r),{path:e})}async readPromise(e,r,i,n,s){return await this.baseFs.readPromise(e,r,i,n,s)}readSync(e,r,i,n,s){return this.baseFs.readSync(e,r,i,n,s)}async writePromise(e,r,i,n,s){return typeof r=="string"?await this.baseFs.writePromise(e,r,i):await this.baseFs.writePromise(e,r,i,n,s)}writeSync(e,r,i,n,s){return typeof r=="string"?this.baseFs.writeSync(e,r,i):this.baseFs.writeSync(e,r,i,n,s)}async closePromise(e){return this.baseFs.closePromise(e)}closeSync(e){this.baseFs.closeSync(e)}createReadStream(e,r){return this.baseFs.createReadStream(e!==null?this.mapToBase(e):e,r)}createWriteStream(e,r){return this.baseFs.createWriteStream(e!==null?this.mapToBase(e):e,r)}async realpathPromise(e){return this.mapFromBase(await this.baseFs.realpathPromise(this.mapToBase(e)))}realpathSync(e){return this.mapFromBase(this.baseFs.realpathSync(this.mapToBase(e)))}async existsPromise(e){return this.baseFs.existsPromise(this.mapToBase(e))}existsSync(e){return this.baseFs.existsSync(this.mapToBase(e))}accessSync(e,r){return this.baseFs.accessSync(this.mapToBase(e),r)}async accessPromise(e,r){return this.baseFs.accessPromise(this.mapToBase(e),r)}async statPromise(e,r){return this.baseFs.statPromise(this.mapToBase(e),r)}statSync(e,r){return this.baseFs.statSync(this.mapToBase(e),r)}async fstatPromise(e,r){return this.baseFs.fstatPromise(e,r)}fstatSync(e,r){return this.baseFs.fstatSync(e,r)}async lstatPromise(e,r){return this.baseFs.lstatPromise(this.mapToBase(e),r)}lstatSync(e,r){return this.baseFs.lstatSync(this.mapToBase(e),r)}async chmodPromise(e,r){return this.baseFs.chmodPromise(this.mapToBase(e),r)}chmodSync(e,r){return this.baseFs.chmodSync(this.mapToBase(e),r)}async chownPromise(e,r,i){return this.baseFs.chownPromise(this.mapToBase(e),r,i)}chownSync(e,r,i){return this.baseFs.chownSync(this.mapToBase(e),r,i)}async renamePromise(e,r){return this.baseFs.renamePromise(this.mapToBase(e),this.mapToBase(r))}renameSync(e,r){return this.baseFs.renameSync(this.mapToBase(e),this.mapToBase(r))}async copyFilePromise(e,r,i=0){return this.baseFs.copyFilePromise(this.mapToBase(e),this.mapToBase(r),i)}copyFileSync(e,r,i=0){return this.baseFs.copyFileSync(this.mapToBase(e),this.mapToBase(r),i)}async appendFilePromise(e,r,i){return this.baseFs.appendFilePromise(this.fsMapToBase(e),r,i)}appendFileSync(e,r,i){return this.baseFs.appendFileSync(this.fsMapToBase(e),r,i)}async writeFilePromise(e,r,i){return this.baseFs.writeFilePromise(this.fsMapToBase(e),r,i)}writeFileSync(e,r,i){return this.baseFs.writeFileSync(this.fsMapToBase(e),r,i)}async unlinkPromise(e){return this.baseFs.unlinkPromise(this.mapToBase(e))}unlinkSync(e){return this.baseFs.unlinkSync(this.mapToBase(e))}async utimesPromise(e,r,i){return this.baseFs.utimesPromise(this.mapToBase(e),r,i)}utimesSync(e,r,i){return this.baseFs.utimesSync(this.mapToBase(e),r,i)}async mkdirPromise(e,r){return this.baseFs.mkdirPromise(this.mapToBase(e),r)}mkdirSync(e,r){return this.baseFs.mkdirSync(this.mapToBase(e),r)}async rmdirPromise(e,r){return this.baseFs.rmdirPromise(this.mapToBase(e),r)}rmdirSync(e,r){return this.baseFs.rmdirSync(this.mapToBase(e),r)}async linkPromise(e,r){return this.baseFs.linkPromise(this.mapToBase(e),this.mapToBase(r))}linkSync(e,r){return this.baseFs.linkSync(this.mapToBase(e),this.mapToBase(r))}async symlinkPromise(e,r,i){let n=this.mapToBase(r);if(this.pathUtils.isAbsolute(e))return this.baseFs.symlinkPromise(this.mapToBase(e),n,i);let s=this.mapToBase(this.pathUtils.join(this.pathUtils.dirname(r),e)),o=this.baseFs.pathUtils.relative(this.baseFs.pathUtils.dirname(n),s);return this.baseFs.symlinkPromise(o,n,i)}symlinkSync(e,r,i){let n=this.mapToBase(r);if(this.pathUtils.isAbsolute(e))return this.baseFs.symlinkSync(this.mapToBase(e),n,i);let s=this.mapToBase(this.pathUtils.join(this.pathUtils.dirname(r),e)),o=this.baseFs.pathUtils.relative(this.baseFs.pathUtils.dirname(n),s);return this.baseFs.symlinkSync(o,n,i)}async readFilePromise(e,r){return r==="utf8"?this.baseFs.readFilePromise(this.fsMapToBase(e),r):this.baseFs.readFilePromise(this.fsMapToBase(e),r)}readFileSync(e,r){return r==="utf8"?this.baseFs.readFileSync(this.fsMapToBase(e),r):this.baseFs.readFileSync(this.fsMapToBase(e),r)}async readdirPromise(e,r){return this.baseFs.readdirPromise(this.mapToBase(e),r)}readdirSync(e,r){return this.baseFs.readdirSync(this.mapToBase(e),r)}async readlinkPromise(e){return this.mapFromBase(await this.baseFs.readlinkPromise(this.mapToBase(e)))}readlinkSync(e){return this.mapFromBase(this.baseFs.readlinkSync(this.mapToBase(e)))}async truncatePromise(e,r){return this.baseFs.truncatePromise(this.mapToBase(e),r)}truncateSync(e,r){return this.baseFs.truncateSync(this.mapToBase(e),r)}watch(e,r,i){return this.baseFs.watch(this.mapToBase(e),r,i)}watchFile(e,r,i){return this.baseFs.watchFile(this.mapToBase(e),r,i)}unwatchFile(e,r){return this.baseFs.unwatchFile(this.mapToBase(e),r)}fsMapToBase(e){return typeof e=="number"?e:this.mapToBase(e)}};var Xo=class extends fi{constructor(e,{baseFs:r,pathUtils:i}){super(i);this.target=e,this.baseFs=r}getRealPath(){return this.target}getBaseFs(){return this.baseFs}mapFromBase(e){return e}mapToBase(e){return e}};var Ft=class extends fi{constructor(e,{baseFs:r=new Wt}={}){super(v);this.target=this.pathUtils.normalize(e),this.baseFs=r}getRealPath(){return this.pathUtils.resolve(this.baseFs.getRealPath(),this.target)}resolve(e){return this.pathUtils.isAbsolute(e)?v.normalize(e):this.baseFs.resolve(v.join(this.target,e))}mapFromBase(e){return e}mapToBase(e){return this.pathUtils.isAbsolute(e)?e:this.pathUtils.join(this.target,e)}};var vO=Se.root,Zo=class extends fi{constructor(e,{baseFs:r=new Wt}={}){super(v);this.target=this.pathUtils.resolve(Se.root,e),this.baseFs=r}getRealPath(){return this.pathUtils.resolve(this.baseFs.getRealPath(),this.pathUtils.relative(Se.root,this.target))}getTarget(){return this.target}getBaseFs(){return this.baseFs}mapToBase(e){let r=this.pathUtils.normalize(e);if(this.pathUtils.isAbsolute(e))return this.pathUtils.resolve(this.target,this.pathUtils.relative(vO,e));if(r.match(/^\.\.\/?/))throw new Error(`Resolving this path (${e}) would escape the jail`);return this.pathUtils.resolve(this.target,e)}mapFromBase(e){return this.pathUtils.resolve(vO,this.pathUtils.relative(this.target,e))}};var oh=class extends fi{constructor(e,r){super(r);this.instance=null;this.factory=e}get baseFs(){return this.instance||(this.instance=this.factory()),this.instance}set baseFs(e){this.instance=e}mapFromBase(e){return e}mapToBase(e){return e}};var ze=()=>Object.assign(new Error("ENOSYS: unsupported filesystem access"),{code:"ENOSYS"}),gb=class extends eA{constructor(){super(v)}getExtractHint(){throw ze()}getRealPath(){throw ze()}resolve(){throw ze()}async openPromise(){throw ze()}openSync(){throw ze()}async opendirPromise(){throw ze()}opendirSync(){throw ze()}async readPromise(){throw ze()}readSync(){throw ze()}async writePromise(){throw ze()}writeSync(){throw ze()}async closePromise(){throw ze()}closeSync(){throw ze()}createWriteStream(){throw ze()}createReadStream(){throw ze()}async realpathPromise(){throw ze()}realpathSync(){throw ze()}async readdirPromise(){throw ze()}readdirSync(){throw ze()}async existsPromise(e){throw ze()}existsSync(e){throw ze()}async accessPromise(){throw ze()}accessSync(){throw ze()}async statPromise(){throw ze()}statSync(){throw ze()}async fstatPromise(e){throw ze()}fstatSync(e){throw ze()}async lstatPromise(e){throw ze()}lstatSync(e){throw ze()}async chmodPromise(){throw ze()}chmodSync(){throw ze()}async chownPromise(){throw ze()}chownSync(){throw ze()}async mkdirPromise(){throw ze()}mkdirSync(){throw ze()}async rmdirPromise(){throw ze()}rmdirSync(){throw ze()}async linkPromise(){throw ze()}linkSync(){throw ze()}async symlinkPromise(){throw ze()}symlinkSync(){throw ze()}async renamePromise(){throw ze()}renameSync(){throw ze()}async copyFilePromise(){throw ze()}copyFileSync(){throw ze()}async appendFilePromise(){throw ze()}appendFileSync(){throw ze()}async writeFilePromise(){throw ze()}writeFileSync(){throw ze()}async unlinkPromise(){throw ze()}unlinkSync(){throw ze()}async utimesPromise(){throw ze()}utimesSync(){throw ze()}async readFilePromise(){throw ze()}readFileSync(){throw ze()}async readlinkPromise(){throw ze()}readlinkSync(){throw ze()}async truncatePromise(){throw ze()}truncateSync(){throw ze()}watch(){throw ze()}watchFile(){throw ze()}unwatchFile(){throw ze()}},bI=gb;bI.instance=new gb;var ah=class extends fi{constructor(e){super(M);this.baseFs=e}mapFromBase(e){return M.fromPortablePath(e)}mapToBase(e){return M.toPortablePath(e)}};var nhe=/^[0-9]+$/,fb=/^(\/(?:[^/]+\/)*?(?:\$\$virtual|__virtual__))((?:\/((?:[^/]+-)?[a-f0-9]+)(?:\/([^/]+))?)?((?:\/.*)?))$/,she=/^([^/]+-)?[a-f0-9]+$/,Pr=class extends fi{static makeVirtualPath(e,r,i){if(v.basename(e)!=="__virtual__")throw new Error('Assertion failed: Virtual folders must be named "__virtual__"');if(!v.basename(r).match(she))throw new Error("Assertion failed: Virtual components must be ended by an hexadecimal hash");let s=v.relative(v.dirname(e),i).split("/"),o=0;for(;o{let r=t.indexOf(e);if(r<=0)return null;let i=r;for(;r>=0&&(i=r+e.length,t[i]!==v.sep);){if(t[r-1]===v.sep)return null;r=t.indexOf(e,i)}return t.length>i&&t[i]!==v.sep?null:t.slice(0,i)},Jn=class extends gl{constructor({libzip:e,baseFs:r=new Wt,filter:i=null,maxOpenFiles:n=Infinity,readOnlyArchives:s=!1,useCache:o=!0,maxAge:a=5e3,fileExtensions:l=null}){super();this.fdMap=new Map;this.nextFd=3;this.isZip=new Set;this.notZip=new Set;this.realPaths=new Map;this.limitOpenFilesTimeout=null;this.libzipFactory=typeof e!="function"?()=>e:e,this.baseFs=r,this.zipInstances=o?new Map:null,this.filter=i,this.maxOpenFiles=n,this.readOnlyArchives=s,this.maxAge=a,this.fileExtensions=l}static async openPromise(e,r){let i=new Jn(r);try{return await e(i)}finally{i.saveAndClose()}}get libzip(){return typeof this.libzipInstance=="undefined"&&(this.libzipInstance=this.libzipFactory()),this.libzipInstance}getExtractHint(e){return this.baseFs.getExtractHint(e)}getRealPath(){return this.baseFs.getRealPath()}saveAndClose(){if(sh(this),this.zipInstances)for(let[e,{zipFs:r}]of this.zipInstances.entries())r.saveAndClose(),this.zipInstances.delete(e)}discardAndClose(){if(sh(this),this.zipInstances)for(let[e,{zipFs:r}]of this.zipInstances.entries())r.discardAndClose(),this.zipInstances.delete(e)}resolve(e){return this.baseFs.resolve(e)}remapFd(e,r){let i=this.nextFd++|$o;return this.fdMap.set(i,[e,r]),i}async openPromise(e,r,i){return await this.makeCallPromise(e,async()=>await this.baseFs.openPromise(e,r,i),async(n,{subPath:s})=>this.remapFd(n,await n.openPromise(s,r,i)))}openSync(e,r,i){return this.makeCallSync(e,()=>this.baseFs.openSync(e,r,i),(n,{subPath:s})=>this.remapFd(n,n.openSync(s,r,i)))}async opendirPromise(e,r){return await this.makeCallPromise(e,async()=>await this.baseFs.opendirPromise(e,r),async(i,{subPath:n})=>await i.opendirPromise(n,r),{requireSubpath:!1})}opendirSync(e,r){return this.makeCallSync(e,()=>this.baseFs.opendirSync(e,r),(i,{subPath:n})=>i.opendirSync(n,r),{requireSubpath:!1})}async readPromise(e,r,i,n,s){if((e&$o)==0)return await this.baseFs.readPromise(e,r,i,n,s);let o=this.fdMap.get(e);if(typeof o=="undefined")throw Hi("read");let[a,l]=o;return await a.readPromise(l,r,i,n,s)}readSync(e,r,i,n,s){if((e&$o)==0)return this.baseFs.readSync(e,r,i,n,s);let o=this.fdMap.get(e);if(typeof o=="undefined")throw Hi("readSync");let[a,l]=o;return a.readSync(l,r,i,n,s)}async writePromise(e,r,i,n,s){if((e&$o)==0)return typeof r=="string"?await this.baseFs.writePromise(e,r,i):await this.baseFs.writePromise(e,r,i,n,s);let o=this.fdMap.get(e);if(typeof o=="undefined")throw Hi("write");let[a,l]=o;return typeof r=="string"?await a.writePromise(l,r,i):await a.writePromise(l,r,i,n,s)}writeSync(e,r,i,n,s){if((e&$o)==0)return typeof r=="string"?this.baseFs.writeSync(e,r,i):this.baseFs.writeSync(e,r,i,n,s);let o=this.fdMap.get(e);if(typeof o=="undefined")throw Hi("writeSync");let[a,l]=o;return typeof r=="string"?a.writeSync(l,r,i):a.writeSync(l,r,i,n,s)}async closePromise(e){if((e&$o)==0)return await this.baseFs.closePromise(e);let r=this.fdMap.get(e);if(typeof r=="undefined")throw Hi("close");this.fdMap.delete(e);let[i,n]=r;return await i.closePromise(n)}closeSync(e){if((e&$o)==0)return this.baseFs.closeSync(e);let r=this.fdMap.get(e);if(typeof r=="undefined")throw Hi("closeSync");this.fdMap.delete(e);let[i,n]=r;return i.closeSync(n)}createReadStream(e,r){return e===null?this.baseFs.createReadStream(e,r):this.makeCallSync(e,()=>this.baseFs.createReadStream(e,r),(i,{subPath:n})=>i.createReadStream(n,r))}createWriteStream(e,r){return e===null?this.baseFs.createWriteStream(e,r):this.makeCallSync(e,()=>this.baseFs.createWriteStream(e,r),(i,{subPath:n})=>i.createWriteStream(n,r))}async realpathPromise(e){return await this.makeCallPromise(e,async()=>await this.baseFs.realpathPromise(e),async(r,{archivePath:i,subPath:n})=>{let s=this.realPaths.get(i);return typeof s=="undefined"&&(s=await this.baseFs.realpathPromise(i),this.realPaths.set(i,s)),this.pathUtils.join(s,this.pathUtils.relative(Se.root,await r.realpathPromise(n)))})}realpathSync(e){return this.makeCallSync(e,()=>this.baseFs.realpathSync(e),(r,{archivePath:i,subPath:n})=>{let s=this.realPaths.get(i);return typeof s=="undefined"&&(s=this.baseFs.realpathSync(i),this.realPaths.set(i,s)),this.pathUtils.join(s,this.pathUtils.relative(Se.root,r.realpathSync(n)))})}async existsPromise(e){return await this.makeCallPromise(e,async()=>await this.baseFs.existsPromise(e),async(r,{subPath:i})=>await r.existsPromise(i))}existsSync(e){return this.makeCallSync(e,()=>this.baseFs.existsSync(e),(r,{subPath:i})=>r.existsSync(i))}async accessPromise(e,r){return await this.makeCallPromise(e,async()=>await this.baseFs.accessPromise(e,r),async(i,{subPath:n})=>await i.accessPromise(n,r))}accessSync(e,r){return this.makeCallSync(e,()=>this.baseFs.accessSync(e,r),(i,{subPath:n})=>i.accessSync(n,r))}async statPromise(e,r){return await this.makeCallPromise(e,async()=>await this.baseFs.statPromise(e,r),async(i,{subPath:n})=>await i.statPromise(n,r))}statSync(e,r){return this.makeCallSync(e,()=>this.baseFs.statSync(e,r),(i,{subPath:n})=>i.statSync(n,r))}async fstatPromise(e,r){if((e&$o)==0)return this.baseFs.fstatPromise(e,r);let i=this.fdMap.get(e);if(typeof i=="undefined")throw Hi("fstat");let[n,s]=i;return n.fstatPromise(s,r)}fstatSync(e,r){if((e&$o)==0)return this.baseFs.fstatSync(e,r);let i=this.fdMap.get(e);if(typeof i=="undefined")throw Hi("fstatSync");let[n,s]=i;return n.fstatSync(s,r)}async lstatPromise(e,r){return await this.makeCallPromise(e,async()=>await this.baseFs.lstatPromise(e,r),async(i,{subPath:n})=>await i.lstatPromise(n,r))}lstatSync(e,r){return this.makeCallSync(e,()=>this.baseFs.lstatSync(e,r),(i,{subPath:n})=>i.lstatSync(n,r))}async chmodPromise(e,r){return await this.makeCallPromise(e,async()=>await this.baseFs.chmodPromise(e,r),async(i,{subPath:n})=>await i.chmodPromise(n,r))}chmodSync(e,r){return this.makeCallSync(e,()=>this.baseFs.chmodSync(e,r),(i,{subPath:n})=>i.chmodSync(n,r))}async chownPromise(e,r,i){return await this.makeCallPromise(e,async()=>await this.baseFs.chownPromise(e,r,i),async(n,{subPath:s})=>await n.chownPromise(s,r,i))}chownSync(e,r,i){return this.makeCallSync(e,()=>this.baseFs.chownSync(e,r,i),(n,{subPath:s})=>n.chownSync(s,r,i))}async renamePromise(e,r){return await this.makeCallPromise(e,async()=>await this.makeCallPromise(r,async()=>await this.baseFs.renamePromise(e,r),async()=>{throw Object.assign(new Error("EEXDEV: cross-device link not permitted"),{code:"EEXDEV"})}),async(i,{subPath:n})=>await this.makeCallPromise(r,async()=>{throw Object.assign(new Error("EEXDEV: cross-device link not permitted"),{code:"EEXDEV"})},async(s,{subPath:o})=>{if(i!==s)throw Object.assign(new Error("EEXDEV: cross-device link not permitted"),{code:"EEXDEV"});return await i.renamePromise(n,o)}))}renameSync(e,r){return this.makeCallSync(e,()=>this.makeCallSync(r,()=>this.baseFs.renameSync(e,r),()=>{throw Object.assign(new Error("EEXDEV: cross-device link not permitted"),{code:"EEXDEV"})}),(i,{subPath:n})=>this.makeCallSync(r,()=>{throw Object.assign(new Error("EEXDEV: cross-device link not permitted"),{code:"EEXDEV"})},(s,{subPath:o})=>{if(i!==s)throw Object.assign(new Error("EEXDEV: cross-device link not permitted"),{code:"EEXDEV"});return i.renameSync(n,o)}))}async copyFilePromise(e,r,i=0){let n=async(s,o,a,l)=>{if((i&Ah.constants.COPYFILE_FICLONE_FORCE)!=0)throw Object.assign(new Error(`EXDEV: cross-device clone not permitted, copyfile '${o}' -> ${l}'`),{code:"EXDEV"});if(i&Ah.constants.COPYFILE_EXCL&&await this.existsPromise(o))throw Object.assign(new Error(`EEXIST: file already exists, copyfile '${o}' -> '${l}'`),{code:"EEXIST"});let c;try{c=await s.readFilePromise(o)}catch(u){throw Object.assign(new Error(`EINVAL: invalid argument, copyfile '${o}' -> '${l}'`),{code:"EINVAL"})}await a.writeFilePromise(l,c)};return await this.makeCallPromise(e,async()=>await this.makeCallPromise(r,async()=>await this.baseFs.copyFilePromise(e,r,i),async(s,{subPath:o})=>await n(this.baseFs,e,s,o)),async(s,{subPath:o})=>await this.makeCallPromise(r,async()=>await n(s,o,this.baseFs,r),async(a,{subPath:l})=>s!==a?await n(s,o,a,l):await s.copyFilePromise(o,l,i)))}copyFileSync(e,r,i=0){let n=(s,o,a,l)=>{if((i&Ah.constants.COPYFILE_FICLONE_FORCE)!=0)throw Object.assign(new Error(`EXDEV: cross-device clone not permitted, copyfile '${o}' -> ${l}'`),{code:"EXDEV"});if(i&Ah.constants.COPYFILE_EXCL&&this.existsSync(o))throw Object.assign(new Error(`EEXIST: file already exists, copyfile '${o}' -> '${l}'`),{code:"EEXIST"});let c;try{c=s.readFileSync(o)}catch(u){throw Object.assign(new Error(`EINVAL: invalid argument, copyfile '${o}' -> '${l}'`),{code:"EINVAL"})}a.writeFileSync(l,c)};return this.makeCallSync(e,()=>this.makeCallSync(r,()=>this.baseFs.copyFileSync(e,r,i),(s,{subPath:o})=>n(this.baseFs,e,s,o)),(s,{subPath:o})=>this.makeCallSync(r,()=>n(s,o,this.baseFs,r),(a,{subPath:l})=>s!==a?n(s,o,a,l):s.copyFileSync(o,l,i)))}async appendFilePromise(e,r,i){return await this.makeCallPromise(e,async()=>await this.baseFs.appendFilePromise(e,r,i),async(n,{subPath:s})=>await n.appendFilePromise(s,r,i))}appendFileSync(e,r,i){return this.makeCallSync(e,()=>this.baseFs.appendFileSync(e,r,i),(n,{subPath:s})=>n.appendFileSync(s,r,i))}async writeFilePromise(e,r,i){return await this.makeCallPromise(e,async()=>await this.baseFs.writeFilePromise(e,r,i),async(n,{subPath:s})=>await n.writeFilePromise(s,r,i))}writeFileSync(e,r,i){return this.makeCallSync(e,()=>this.baseFs.writeFileSync(e,r,i),(n,{subPath:s})=>n.writeFileSync(s,r,i))}async unlinkPromise(e){return await this.makeCallPromise(e,async()=>await this.baseFs.unlinkPromise(e),async(r,{subPath:i})=>await r.unlinkPromise(i))}unlinkSync(e){return this.makeCallSync(e,()=>this.baseFs.unlinkSync(e),(r,{subPath:i})=>r.unlinkSync(i))}async utimesPromise(e,r,i){return await this.makeCallPromise(e,async()=>await this.baseFs.utimesPromise(e,r,i),async(n,{subPath:s})=>await n.utimesPromise(s,r,i))}utimesSync(e,r,i){return this.makeCallSync(e,()=>this.baseFs.utimesSync(e,r,i),(n,{subPath:s})=>n.utimesSync(s,r,i))}async mkdirPromise(e,r){return await this.makeCallPromise(e,async()=>await this.baseFs.mkdirPromise(e,r),async(i,{subPath:n})=>await i.mkdirPromise(n,r))}mkdirSync(e,r){return this.makeCallSync(e,()=>this.baseFs.mkdirSync(e,r),(i,{subPath:n})=>i.mkdirSync(n,r))}async rmdirPromise(e,r){return await this.makeCallPromise(e,async()=>await this.baseFs.rmdirPromise(e,r),async(i,{subPath:n})=>await i.rmdirPromise(n,r))}rmdirSync(e,r){return this.makeCallSync(e,()=>this.baseFs.rmdirSync(e,r),(i,{subPath:n})=>i.rmdirSync(n,r))}async linkPromise(e,r){return await this.makeCallPromise(r,async()=>await this.baseFs.linkPromise(e,r),async(i,{subPath:n})=>await i.linkPromise(e,n))}linkSync(e,r){return this.makeCallSync(r,()=>this.baseFs.linkSync(e,r),(i,{subPath:n})=>i.linkSync(e,n))}async symlinkPromise(e,r,i){return await this.makeCallPromise(r,async()=>await this.baseFs.symlinkPromise(e,r,i),async(n,{subPath:s})=>await n.symlinkPromise(e,s))}symlinkSync(e,r,i){return this.makeCallSync(r,()=>this.baseFs.symlinkSync(e,r,i),(n,{subPath:s})=>n.symlinkSync(e,s))}async readFilePromise(e,r){return this.makeCallPromise(e,async()=>{switch(r){case"utf8":return await this.baseFs.readFilePromise(e,r);default:return await this.baseFs.readFilePromise(e,r)}},async(i,{subPath:n})=>await i.readFilePromise(n,r))}readFileSync(e,r){return this.makeCallSync(e,()=>{switch(r){case"utf8":return this.baseFs.readFileSync(e,r);default:return this.baseFs.readFileSync(e,r)}},(i,{subPath:n})=>i.readFileSync(n,r))}async readdirPromise(e,r){return await this.makeCallPromise(e,async()=>await this.baseFs.readdirPromise(e,r),async(i,{subPath:n})=>await i.readdirPromise(n,r),{requireSubpath:!1})}readdirSync(e,r){return this.makeCallSync(e,()=>this.baseFs.readdirSync(e,r),(i,{subPath:n})=>i.readdirSync(n,r),{requireSubpath:!1})}async readlinkPromise(e){return await this.makeCallPromise(e,async()=>await this.baseFs.readlinkPromise(e),async(r,{subPath:i})=>await r.readlinkPromise(i))}readlinkSync(e){return this.makeCallSync(e,()=>this.baseFs.readlinkSync(e),(r,{subPath:i})=>r.readlinkSync(i))}async truncatePromise(e,r){return await this.makeCallPromise(e,async()=>await this.baseFs.truncatePromise(e,r),async(i,{subPath:n})=>await i.truncatePromise(n,r))}truncateSync(e,r){return this.makeCallSync(e,()=>this.baseFs.truncateSync(e,r),(i,{subPath:n})=>i.truncateSync(n,r))}watch(e,r,i){return this.makeCallSync(e,()=>this.baseFs.watch(e,r,i),(n,{subPath:s})=>n.watch(s,r,i))}watchFile(e,r,i){return this.makeCallSync(e,()=>this.baseFs.watchFile(e,r,i),()=>QI(this,e,r,i))}unwatchFile(e,r){return this.makeCallSync(e,()=>this.baseFs.unwatchFile(e,r),()=>nh(this,e,r))}async makeCallPromise(e,r,i,{requireSubpath:n=!0}={}){if(typeof e!="string")return await r();let s=this.resolve(e),o=this.findZip(s);return o?n&&o.subPath==="/"?await r():await this.getZipPromise(o.archivePath,async a=>await i(a,o)):await r()}makeCallSync(e,r,i,{requireSubpath:n=!0}={}){if(typeof e!="string")return r();let s=this.resolve(e),o=this.findZip(s);return!o||n&&o.subPath==="/"?r():this.getZipSync(o.archivePath,a=>i(a,o))}findZip(e){if(this.filter&&!this.filter.test(e))return null;let r="";for(;;){let i=e.substr(r.length),n;if(!this.fileExtensions)n=SO(i,".zip");else for(let s of this.fileExtensions)if(n=SO(i,s),n)break;if(!n)return null;if(r=this.pathUtils.join(r,n),this.isZip.has(r)===!1){if(this.notZip.has(r))continue;try{if(!this.baseFs.lstatSync(r).isFile()){this.notZip.add(r);continue}}catch{return null}this.isZip.add(r)}return{archivePath:r,subPath:this.pathUtils.join(Se.root,e.substr(r.length))}}}limitOpenFiles(e){if(this.zipInstances===null)return;let r=Date.now(),i=r+this.maxAge,n=e===null?0:this.zipInstances.size-e;for(let[s,{zipFs:o,expiresAt:a,refCount:l}]of this.zipInstances.entries())if(!(l!==0||o.hasOpenFileHandles())){if(r>=a){o.saveAndClose(),this.zipInstances.delete(s),n-=1;continue}else if(e===null||n<=0){i=a;break}o.saveAndClose(),this.zipInstances.delete(s),n-=1}this.limitOpenFilesTimeout===null&&(e===null&&this.zipInstances.size>0||e!==null)&&(this.limitOpenFilesTimeout=setTimeout(()=>{this.limitOpenFilesTimeout=null,this.limitOpenFiles(null)},i-r).unref())}async getZipPromise(e,r){let i=async()=>({baseFs:this.baseFs,libzip:this.libzip,readOnly:this.readOnlyArchives,stats:await this.baseFs.statPromise(e)});if(this.zipInstances){let n=this.zipInstances.get(e);if(!n){let s=await i();n=this.zipInstances.get(e),n||(n={zipFs:new Jr(e,s),expiresAt:0,refCount:0})}this.zipInstances.delete(e),this.limitOpenFiles(this.maxOpenFiles-1),this.zipInstances.set(e,n),n.expiresAt=Date.now()+this.maxAge,n.refCount+=1;try{return await r(n.zipFs)}finally{n.refCount-=1}}else{let n=new Jr(e,await i());try{return await r(n)}finally{n.saveAndClose()}}}getZipSync(e,r){let i=()=>({baseFs:this.baseFs,libzip:this.libzip,readOnly:this.readOnlyArchives,stats:this.baseFs.statSync(e)});if(this.zipInstances){let n=this.zipInstances.get(e);return n||(n={zipFs:new Jr(e,i()),expiresAt:0,refCount:0}),this.zipInstances.delete(e),this.limitOpenFiles(this.maxOpenFiles-1),this.zipInstances.set(e,n),n.expiresAt=Date.now()+this.maxAge,r(n.zipFs)}else{let n=new Jr(e,i());try{return r(n)}finally{n.saveAndClose()}}}};var lh=ie(require("util"));var vI=ie(require("url"));var hb=class extends fi{constructor(e){super(M);this.baseFs=e}mapFromBase(e){return e}mapToBase(e){return e instanceof vI.URL?(0,vI.fileURLToPath)(e):e}};var ohe=new Set(["accessSync","appendFileSync","createReadStream","createWriteStream","chmodSync","chownSync","closeSync","copyFileSync","linkSync","lstatSync","fstatSync","lutimesSync","mkdirSync","openSync","opendirSync","readSync","readlinkSync","readFileSync","readdirSync","readlinkSync","realpathSync","renameSync","rmdirSync","statSync","symlinkSync","truncateSync","unlinkSync","unwatchFile","utimesSync","watch","watchFile","writeFileSync","writeSync"]),xO=new Set(["accessPromise","appendFilePromise","chmodPromise","chownPromise","closePromise","copyFilePromise","linkPromise","fstatPromise","lstatPromise","lutimesPromise","mkdirPromise","openPromise","opendirPromise","readdirPromise","realpathPromise","readFilePromise","readdirPromise","readlinkPromise","renamePromise","rmdirPromise","statPromise","symlinkPromise","truncatePromise","unlinkPromise","utimesPromise","writeFilePromise","writeSync"]),ahe=new Set(["appendFilePromise","chmodPromise","chownPromise","closePromise","readPromise","readFilePromise","statPromise","truncatePromise","utimesPromise","writePromise","writeFilePromise"]);function pb(t,e){e=new hb(e);let r=(i,n,s)=>{let o=i[n];i[n]=s,typeof(o==null?void 0:o[lh.promisify.custom])!="undefined"&&(s[lh.promisify.custom]=o[lh.promisify.custom])};{r(t,"exists",(i,...n)=>{let o=typeof n[n.length-1]=="function"?n.pop():()=>{};process.nextTick(()=>{e.existsPromise(i).then(a=>{o(a)},()=>{o(!1)})})}),r(t,"read",(i,n,...s)=>{let a=typeof s[s.length-1]=="function"?s.pop():()=>{};process.nextTick(()=>{e.readPromise(i,n,...s).then(l=>{a(null,l,n)},l=>{a(l,0,n)})})});for(let i of xO){let n=i.replace(/Promise$/,"");if(typeof t[n]=="undefined")continue;let s=e[i];if(typeof s=="undefined")continue;r(t,n,(...a)=>{let c=typeof a[a.length-1]=="function"?a.pop():()=>{};process.nextTick(()=>{s.apply(e,a).then(u=>{c(null,u)},u=>{c(u)})})})}t.realpath.native=t.realpath}{r(t,"existsSync",i=>{try{return e.existsSync(i)}catch(n){return!1}});for(let i of ohe){let n=i;if(typeof t[n]=="undefined")continue;let s=e[i];typeof s!="undefined"&&r(t,n,s.bind(e))}t.realpathSync.native=t.realpathSync}{let i=process.emitWarning;process.emitWarning=()=>{};let n;try{n=t.promises}finally{process.emitWarning=i}if(typeof n!="undefined"){for(let o of xO){let a=o.replace(/Promise$/,"");if(typeof n[a]=="undefined")continue;let l=e[o];typeof l!="undefined"&&o!=="open"&&r(n,a,l.bind(e))}class s{constructor(a){this.fd=a}}for(let o of ahe){let a=o.replace(/Promise$/,""),l=e[o];typeof l!="undefined"&&r(s.prototype,a,function(...c){return l.call(e,this.fd,...c)})}r(n,"open",async(...o)=>{let a=await e.openPromise(...o);return new s(a)})}}t.read[lh.promisify.custom]=async(i,n,...s)=>({bytesRead:await e.readPromise(i,n,...s),buffer:n})}function SI(t,e){let r=Object.create(t);return pb(r,e),r}var kO=ie(require("os"));function PO(t){let e=M.toPortablePath(kO.default.tmpdir()),r=Math.ceil(Math.random()*4294967296).toString(16).padStart(8,"0");return v.join(e,`${t}${r}`)}var vs=new Set,DO=!1;function RO(){DO||(DO=!0,process.once("exit",()=>{T.rmtempSync()}))}var T=Object.assign(new Wt,{detachTemp(t){vs.delete(t)},mktempSync(t){for(RO();;){let e=PO("xfs-");try{this.mkdirSync(e)}catch(i){if(i.code==="EEXIST")continue;throw i}let r=this.realpathSync(e);if(vs.add(r),typeof t!="undefined")try{return t(r)}finally{if(vs.has(r)){vs.delete(r);try{this.removeSync(r)}catch{}}}else return r}},async mktempPromise(t){for(RO();;){let e=PO("xfs-");try{await this.mkdirPromise(e)}catch(i){if(i.code==="EEXIST")continue;throw i}let r=await this.realpathPromise(e);if(vs.add(r),typeof t!="undefined")try{return await t(r)}finally{if(vs.has(r)){vs.delete(r);try{await this.removePromise(r)}catch{}}}else return r}},async rmtempPromise(){await Promise.all(Array.from(vs.values()).map(async t=>{try{await T.removePromise(t,{maxRetries:0}),vs.delete(t)}catch{}}))},rmtempSync(){for(let t of vs)try{T.removeSync(t),vs.delete(t)}catch{}}});var vb=ie(bb()),Pn;(function(i){i[i.Never=0]="Never",i[i.ErrorCode=1]="ErrorCode",i[i.Always=2]="Always"})(Pn||(Pn={}));function dl(t){return t!==null&&typeof t.fd=="number"}var Cl=new Set;function Sb(){}function xb(){for(let t of Cl)t.kill()}async function to(t,e,{cwd:r,env:i=process.env,strict:n=!1,stdin:s=null,stdout:o,stderr:a,end:l=2}){let c=["pipe","pipe","pipe"];s===null?c[0]="ignore":dl(s)&&(c[0]=s),dl(o)&&(c[1]=o),dl(a)&&(c[2]=a);let u=(0,vb.default)(t,e,{cwd:M.fromPortablePath(r),env:_(P({},i),{PWD:M.fromPortablePath(r)}),stdio:c});Cl.add(u),Cl.size===1&&(process.on("SIGINT",Sb),process.on("SIGTERM",xb)),!dl(s)&&s!==null&&s.pipe(u.stdin),dl(o)||u.stdout.pipe(o,{end:!1}),dl(a)||u.stderr.pipe(a,{end:!1});let g=()=>{for(let f of new Set([o,a]))dl(f)||f.end()};return new Promise((f,h)=>{u.on("error",p=>{Cl.delete(u),Cl.size===0&&(process.off("SIGINT",Sb),process.off("SIGTERM",xb)),(l===2||l===1)&&g(),h(p)}),u.on("close",(p,d)=>{Cl.delete(u),Cl.size===0&&(process.off("SIGINT",Sb),process.off("SIGTERM",xb)),(l===2||l===1&&p>0)&&g(),p===0||!n?f({code:kb(p,d)}):h(p!==null?new Error(`Child "${t}" exited with exit code ${p}`):new Error(`Child "${t}" exited with signal ${d}`))})})}async function Nhe(t,e,{cwd:r,env:i=process.env,encoding:n="utf8",strict:s=!1}){let o=["ignore","pipe","pipe"],a=[],l=[],c=M.fromPortablePath(r);typeof i.PWD!="undefined"&&(i=_(P({},i),{PWD:c}));let u=(0,vb.default)(t,e,{cwd:c,env:i,stdio:o});return u.stdout.on("data",g=>{a.push(g)}),u.stderr.on("data",g=>{l.push(g)}),await new Promise((g,f)=>{u.on("error",()=>{f()}),u.on("close",(h,p)=>{let d=n==="buffer"?Buffer.concat(a):Buffer.concat(a).toString(n),m=n==="buffer"?Buffer.concat(l):Buffer.concat(l).toString(n);h===0||!s?g({code:kb(h,p),stdout:d,stderr:m}):f(Object.assign(new Error(`Child "${t}" exited with exit code ${h} + +${m}`),{code:kb(h,p),stdout:d,stderr:m}))})})}var Lhe=new Map([["SIGINT",2],["SIGQUIT",3],["SIGKILL",9],["SIGTERM",15]]);function kb(t,e){let r=Lhe.get(e);return typeof r!="undefined"?128+r:t!=null?t:1}var Pb={};it(Pb,{getDefaultGlobalFolder:()=>Rb,getHomeFolder:()=>uh,isFolderInside:()=>Fb});var Db=ie(require("os"));function Rb(){if(process.platform==="win32"){let t=M.toPortablePath(process.env.LOCALAPPDATA||M.join((0,Db.homedir)(),"AppData","Local"));return v.resolve(t,"Yarn/Berry")}if(process.env.XDG_DATA_HOME){let t=M.toPortablePath(process.env.XDG_DATA_HOME);return v.resolve(t,"yarn/berry")}return v.resolve(uh(),".yarn/berry")}function uh(){return M.toPortablePath((0,Db.homedir)()||"/usr/local/share")}function Fb(t,e){let r=v.relative(e,t);return r&&!r.startsWith("..")&&!v.isAbsolute(r)}var ue={};it(ue,{LogLevel:()=>Ts,Style:()=>Gl,Type:()=>Le,addLogFilterSupport:()=>Cp,applyColor:()=>On,applyHyperlink:()=>Ku,applyStyle:()=>Py,json:()=>Uu,mark:()=>xx,pretty:()=>Ve,prettyField:()=>Yl,prettyList:()=>Kx,supportsColor:()=>xy,supportsHyperlinks:()=>Mx,tuple:()=>jl});var pp=ie(jb()),dp=ie(ml()),o3=ie(Nn()),a3=ie(gU());var z;(function(te){te[te.UNNAMED=0]="UNNAMED",te[te.EXCEPTION=1]="EXCEPTION",te[te.MISSING_PEER_DEPENDENCY=2]="MISSING_PEER_DEPENDENCY",te[te.CYCLIC_DEPENDENCIES=3]="CYCLIC_DEPENDENCIES",te[te.DISABLED_BUILD_SCRIPTS=4]="DISABLED_BUILD_SCRIPTS",te[te.BUILD_DISABLED=5]="BUILD_DISABLED",te[te.SOFT_LINK_BUILD=6]="SOFT_LINK_BUILD",te[te.MUST_BUILD=7]="MUST_BUILD",te[te.MUST_REBUILD=8]="MUST_REBUILD",te[te.BUILD_FAILED=9]="BUILD_FAILED",te[te.RESOLVER_NOT_FOUND=10]="RESOLVER_NOT_FOUND",te[te.FETCHER_NOT_FOUND=11]="FETCHER_NOT_FOUND",te[te.LINKER_NOT_FOUND=12]="LINKER_NOT_FOUND",te[te.FETCH_NOT_CACHED=13]="FETCH_NOT_CACHED",te[te.YARN_IMPORT_FAILED=14]="YARN_IMPORT_FAILED",te[te.REMOTE_INVALID=15]="REMOTE_INVALID",te[te.REMOTE_NOT_FOUND=16]="REMOTE_NOT_FOUND",te[te.RESOLUTION_PACK=17]="RESOLUTION_PACK",te[te.CACHE_CHECKSUM_MISMATCH=18]="CACHE_CHECKSUM_MISMATCH",te[te.UNUSED_CACHE_ENTRY=19]="UNUSED_CACHE_ENTRY",te[te.MISSING_LOCKFILE_ENTRY=20]="MISSING_LOCKFILE_ENTRY",te[te.WORKSPACE_NOT_FOUND=21]="WORKSPACE_NOT_FOUND",te[te.TOO_MANY_MATCHING_WORKSPACES=22]="TOO_MANY_MATCHING_WORKSPACES",te[te.CONSTRAINTS_MISSING_DEPENDENCY=23]="CONSTRAINTS_MISSING_DEPENDENCY",te[te.CONSTRAINTS_INCOMPATIBLE_DEPENDENCY=24]="CONSTRAINTS_INCOMPATIBLE_DEPENDENCY",te[te.CONSTRAINTS_EXTRANEOUS_DEPENDENCY=25]="CONSTRAINTS_EXTRANEOUS_DEPENDENCY",te[te.CONSTRAINTS_INVALID_DEPENDENCY=26]="CONSTRAINTS_INVALID_DEPENDENCY",te[te.CANT_SUGGEST_RESOLUTIONS=27]="CANT_SUGGEST_RESOLUTIONS",te[te.FROZEN_LOCKFILE_EXCEPTION=28]="FROZEN_LOCKFILE_EXCEPTION",te[te.CROSS_DRIVE_VIRTUAL_LOCAL=29]="CROSS_DRIVE_VIRTUAL_LOCAL",te[te.FETCH_FAILED=30]="FETCH_FAILED",te[te.DANGEROUS_NODE_MODULES=31]="DANGEROUS_NODE_MODULES",te[te.NODE_GYP_INJECTED=32]="NODE_GYP_INJECTED",te[te.AUTHENTICATION_NOT_FOUND=33]="AUTHENTICATION_NOT_FOUND",te[te.INVALID_CONFIGURATION_KEY=34]="INVALID_CONFIGURATION_KEY",te[te.NETWORK_ERROR=35]="NETWORK_ERROR",te[te.LIFECYCLE_SCRIPT=36]="LIFECYCLE_SCRIPT",te[te.CONSTRAINTS_MISSING_FIELD=37]="CONSTRAINTS_MISSING_FIELD",te[te.CONSTRAINTS_INCOMPATIBLE_FIELD=38]="CONSTRAINTS_INCOMPATIBLE_FIELD",te[te.CONSTRAINTS_EXTRANEOUS_FIELD=39]="CONSTRAINTS_EXTRANEOUS_FIELD",te[te.CONSTRAINTS_INVALID_FIELD=40]="CONSTRAINTS_INVALID_FIELD",te[te.AUTHENTICATION_INVALID=41]="AUTHENTICATION_INVALID",te[te.PROLOG_UNKNOWN_ERROR=42]="PROLOG_UNKNOWN_ERROR",te[te.PROLOG_SYNTAX_ERROR=43]="PROLOG_SYNTAX_ERROR",te[te.PROLOG_EXISTENCE_ERROR=44]="PROLOG_EXISTENCE_ERROR",te[te.STACK_OVERFLOW_RESOLUTION=45]="STACK_OVERFLOW_RESOLUTION",te[te.AUTOMERGE_FAILED_TO_PARSE=46]="AUTOMERGE_FAILED_TO_PARSE",te[te.AUTOMERGE_IMMUTABLE=47]="AUTOMERGE_IMMUTABLE",te[te.AUTOMERGE_SUCCESS=48]="AUTOMERGE_SUCCESS",te[te.AUTOMERGE_REQUIRED=49]="AUTOMERGE_REQUIRED",te[te.DEPRECATED_CLI_SETTINGS=50]="DEPRECATED_CLI_SETTINGS",te[te.PLUGIN_NAME_NOT_FOUND=51]="PLUGIN_NAME_NOT_FOUND",te[te.INVALID_PLUGIN_REFERENCE=52]="INVALID_PLUGIN_REFERENCE",te[te.CONSTRAINTS_AMBIGUITY=53]="CONSTRAINTS_AMBIGUITY",te[te.CACHE_OUTSIDE_PROJECT=54]="CACHE_OUTSIDE_PROJECT",te[te.IMMUTABLE_INSTALL=55]="IMMUTABLE_INSTALL",te[te.IMMUTABLE_CACHE=56]="IMMUTABLE_CACHE",te[te.INVALID_MANIFEST=57]="INVALID_MANIFEST",te[te.PACKAGE_PREPARATION_FAILED=58]="PACKAGE_PREPARATION_FAILED",te[te.INVALID_RANGE_PEER_DEPENDENCY=59]="INVALID_RANGE_PEER_DEPENDENCY",te[te.INCOMPATIBLE_PEER_DEPENDENCY=60]="INCOMPATIBLE_PEER_DEPENDENCY",te[te.DEPRECATED_PACKAGE=61]="DEPRECATED_PACKAGE",te[te.INCOMPATIBLE_OS=62]="INCOMPATIBLE_OS",te[te.INCOMPATIBLE_CPU=63]="INCOMPATIBLE_CPU",te[te.FROZEN_ARTIFACT_EXCEPTION=64]="FROZEN_ARTIFACT_EXCEPTION",te[te.TELEMETRY_NOTICE=65]="TELEMETRY_NOTICE",te[te.PATCH_HUNK_FAILED=66]="PATCH_HUNK_FAILED",te[te.INVALID_CONFIGURATION_VALUE=67]="INVALID_CONFIGURATION_VALUE",te[te.UNUSED_PACKAGE_EXTENSION=68]="UNUSED_PACKAGE_EXTENSION",te[te.REDUNDANT_PACKAGE_EXTENSION=69]="REDUNDANT_PACKAGE_EXTENSION",te[te.AUTO_NM_SUCCESS=70]="AUTO_NM_SUCCESS",te[te.NM_CANT_INSTALL_EXTERNAL_SOFT_LINK=71]="NM_CANT_INSTALL_EXTERNAL_SOFT_LINK",te[te.NM_PRESERVE_SYMLINKS_REQUIRED=72]="NM_PRESERVE_SYMLINKS_REQUIRED",te[te.UPDATE_LOCKFILE_ONLY_SKIP_LINK=73]="UPDATE_LOCKFILE_ONLY_SKIP_LINK",te[te.NM_HARDLINKS_MODE_DOWNGRADED=74]="NM_HARDLINKS_MODE_DOWNGRADED",te[te.PROLOG_INSTANTIATION_ERROR=75]="PROLOG_INSTANTIATION_ERROR",te[te.INCOMPATIBLE_ARCHITECTURE=76]="INCOMPATIBLE_ARCHITECTURE",te[te.GHOST_ARCHITECTURE=77]="GHOST_ARCHITECTURE"})(z||(z={}));function KI(t){return`YN${t.toString(10).padStart(4,"0")}`}var de={};it(de,{BufferStream:()=>OH,CachingStrategy:()=>Dl,DefaultStream:()=>KH,assertNever:()=>Lv,bufferStream:()=>Cu,buildIgnorePattern:()=>DIe,convertMapsToIndexableObjects:()=>aE,dynamicRequire:()=>mu,escapeRegExp:()=>SIe,getArrayWithDefault:()=>hu,getFactoryWithDefault:()=>na,getMapWithDefault:()=>pu,getSetWithDefault:()=>Pl,isIndexableObject:()=>Tv,isPathLike:()=>RIe,isTaggedYarnVersion:()=>vIe,mapAndFilter:()=>kl,mapAndFind:()=>MH,overrideType:()=>Nv,parseBoolean:()=>Hh,parseOptionalBoolean:()=>jH,prettifyAsyncErrors:()=>du,prettifySyncErrors:()=>Mv,releaseAfterUseAsync:()=>kIe,replaceEnvVariables:()=>Ov,sortMap:()=>gn,tryParseOptionalBoolean:()=>Kv,validateEnum:()=>xIe});var vh={};it(vh,{Builtins:()=>Ev,Cli:()=>oo,Command:()=>ye,Option:()=>Y,UsageError:()=>me});var yl=0,Ih=1,Gi=2,sv="",hi="\0",Au=-1,ov=/^(-h|--help)(?:=([0-9]+))?$/,UI=/^(--[a-z]+(?:-[a-z]+)*|-[a-zA-Z]+)$/,fU=/^-[a-zA-Z]{2,}$/,av=/^([^=]+)=([\s\S]*)$/,Av=process.env.DEBUG_CLI==="1";var me=class extends Error{constructor(e){super(e);this.clipanion={type:"usage"},this.name="UsageError"}},Eh=class extends Error{constructor(e,r){super();if(this.input=e,this.candidates=r,this.clipanion={type:"none"},this.name="UnknownSyntaxError",this.candidates.length===0)this.message="Command not found, but we're not sure what's the alternative.";else if(this.candidates.every(i=>i.reason!==null&&i.reason===r[0].reason)){let[{reason:i}]=this.candidates;this.message=`${i} + +${this.candidates.map(({usage:n})=>`$ ${n}`).join(` +`)}`}else if(this.candidates.length===1){let[{usage:i}]=this.candidates;this.message=`Command not found; did you mean: + +$ ${i} +${lv(e)}`}else this.message=`Command not found; did you mean one of: + +${this.candidates.map(({usage:i},n)=>`${`${n}.`.padStart(4)} ${i}`).join(` +`)} + +${lv(e)}`}},cv=class extends Error{constructor(e,r){super();this.input=e,this.usages=r,this.clipanion={type:"none"},this.name="AmbiguousSyntaxError",this.message=`Cannot find which to pick amongst the following alternatives: + +${this.usages.map((i,n)=>`${`${n}.`.padStart(4)} ${i}`).join(` +`)} + +${lv(e)}`}},lv=t=>`While running ${t.filter(e=>e!==hi).map(e=>{let r=JSON.stringify(e);return e.match(/\s/)||e.length===0||r!==`"${e}"`?r:e}).join(" ")}`;var yh=Symbol("clipanion/isOption");function ji(t){return _(P({},t),{[yh]:!0})}function so(t,e){return typeof t=="undefined"?[t,e]:typeof t=="object"&&t!==null&&!Array.isArray(t)?[void 0,t]:[t,e]}function HI(t,e=!1){let r=t.replace(/^\.: /,"");return e&&(r=r[0].toLowerCase()+r.slice(1)),r}function wh(t,e){return e.length===1?new me(`${t}: ${HI(e[0],!0)}`):new me(`${t}: +${e.map(r=>` +- ${HI(r)}`).join("")}`)}function Bh(t,e,r){if(typeof r=="undefined")return e;let i=[],n=[],s=a=>{let l=e;return e=a,s.bind(null,l)};if(!r(e,{errors:i,coercions:n,coercion:s}))throw wh(`Invalid value for ${t}`,i);for(let[,a]of n)a();return e}var ye=class{constructor(){this.help=!1}static Usage(e){return e}async catch(e){throw e}async validateAndExecute(){let r=this.constructor.schema;if(typeof r!="undefined"){let{isDict:n,isUnknown:s,applyCascade:o}=await Promise.resolve().then(()=>(Ss(),lu)),a=o(n(s()),r),l=[],c=[];if(!a(this,{errors:l,coercions:c}))throw wh("Invalid option schema",l);for(let[,g]of c)g()}let i=await this.execute();return typeof i!="undefined"?i:0}};ye.isOption=yh;ye.Default=[];function un(t){Av&&console.log(t)}var BU={candidateUsage:null,requiredOptions:[],errorMessage:null,ignoreOptions:!1,path:[],positionals:[],options:[],remainder:null,selectedIndex:Au};function QU(){return{nodes:[qi(),qi(),qi()]}}function nCe(t){let e=QU(),r=[],i=e.nodes.length;for(let n of t){r.push(i);for(let s=0;s{if(e.has(i))return;e.add(i);let n=t.nodes[i];for(let o of Object.values(n.statics))for(let{to:a}of o)r(a);for(let[,{to:o}]of n.dynamics)r(o);for(let{to:o}of n.shortcuts)r(o);let s=new Set(n.shortcuts.map(({to:o})=>o));for(;n.shortcuts.length>0;){let{to:o}=n.shortcuts.shift(),a=t.nodes[o];for(let[l,c]of Object.entries(a.statics)){let u=Object.prototype.hasOwnProperty.call(n.statics,l)?n.statics[l]:n.statics[l]=[];for(let g of c)u.some(({to:f})=>g.to===f)||u.push(g)}for(let[l,c]of a.dynamics)n.dynamics.some(([u,{to:g}])=>l===u&&c.to===g)||n.dynamics.push([l,c]);for(let l of a.shortcuts)s.has(l.to)||(n.shortcuts.push(l),s.add(l.to))}};r(yl)}function oCe(t,{prefix:e=""}={}){if(Av){un(`${e}Nodes are:`);for(let r=0;rl!==Gi).map(({state:l})=>({usage:l.candidateUsage,reason:null})));if(a.every(({node:l})=>l===Gi))throw new Eh(e,a.map(({state:l})=>({usage:l.candidateUsage,reason:l.errorMessage})));i=aCe(a)}if(i.length>0){un(" Results:");for(let s of i)un(` - ${s.node} -> ${JSON.stringify(s.state)}`)}else un(" No results");return i}function ACe(t,e){if(e.selectedIndex!==null)return!0;if(Object.prototype.hasOwnProperty.call(t.statics,hi)){for(let{to:r}of t.statics[hi])if(r===Ih)return!0}return!1}function cCe(t,e,r){let i=r&&e.length>0?[""]:[],n=vU(t,e,r),s=[],o=new Set,a=(l,c,u=!0)=>{let g=[c];for(;g.length>0;){let h=g;g=[];for(let p of h){let d=t.nodes[p],m=Object.keys(d.statics);for(let E of Object.keys(d.statics)){let B=m[0];for(let{to:b,reducer:R}of d.statics[B])R==="pushPath"&&(u||l.push(B),g.push(b))}}u=!1}let f=JSON.stringify(l);o.has(f)||(s.push(l),o.add(f))};for(let{node:l,state:c}of n){if(c.remainder!==null){a([c.remainder],l);continue}let u=t.nodes[l],g=ACe(u,c);for(let[f,h]of Object.entries(u.statics))(g&&f!==hi||!f.startsWith("-")&&h.some(({reducer:p})=>p==="pushPath"))&&a([...i,f],l);if(!!g)for(let[f,{to:h}]of u.dynamics){if(h===Gi)continue;let p=lCe(f,c);if(p!==null)for(let d of p)a([...i,d],l)}}return[...s].sort()}function gCe(t,e){let r=vU(t,[...e,hi]);return uCe(e,r.map(({state:i})=>i))}function aCe(t){let e=0;for(let{state:r}of t)r.path.length>e&&(e=r.path.length);return t.filter(({state:r})=>r.path.length===e)}function uCe(t,e){let r=e.filter(g=>g.selectedIndex!==null);if(r.length===0)throw new Error;let i=r.filter(g=>g.requiredOptions.every(f=>f.some(h=>g.options.find(p=>p.name===h))));if(i.length===0)throw new Eh(t,r.map(g=>({usage:g.candidateUsage,reason:null})));let n=0;for(let g of i)g.path.length>n&&(n=g.path.length);let s=i.filter(g=>g.path.length===n),o=g=>g.positionals.filter(({extra:f})=>!f).length+g.options.length,a=s.map(g=>({state:g,positionalCount:o(g)})),l=0;for(let{positionalCount:g}of a)g>l&&(l=g);let c=a.filter(({positionalCount:g})=>g===l).map(({state:g})=>g),u=fCe(c);if(u.length>1)throw new cv(t,u.map(g=>g.candidateUsage));return u[0]}function fCe(t){let e=[],r=[];for(let i of t)i.selectedIndex===Au?r.push(i):e.push(i);return r.length>0&&e.push(_(P({},BU),{path:SU(...r.map(i=>i.path)),options:r.reduce((i,n)=>i.concat(n.options),[])})),e}function SU(t,e,...r){return e===void 0?Array.from(t):SU(t.filter((i,n)=>i===e[n]),...r)}function qi(){return{dynamics:[],shortcuts:[],statics:{}}}function bU(t){return t===Ih||t===Gi}function Cv(t,e=0){return{to:bU(t.to)?t.to:t.to>2?t.to+e-2:t.to+e,reducer:t.reducer}}function iCe(t,e=0){let r=qi();for(let[i,n]of t.dynamics)r.dynamics.push([i,Cv(n,e)]);for(let i of t.shortcuts)r.shortcuts.push(Cv(i,e));for(let[i,n]of Object.entries(t.statics))r.statics[i]=n.map(s=>Cv(s,e));return r}function pi(t,e,r,i,n){t.nodes[e].dynamics.push([r,{to:i,reducer:n}])}function cu(t,e,r,i){t.nodes[e].shortcuts.push({to:r,reducer:i})}function ta(t,e,r,i,n){(Object.prototype.hasOwnProperty.call(t.nodes[e].statics,r)?t.nodes[e].statics[r]:t.nodes[e].statics[r]=[]).push({to:i,reducer:n})}function jI(t,e,r,i){if(Array.isArray(e)){let[n,...s]=e;return t[n](r,i,...s)}else return t[e](r,i)}function lCe(t,e){let r=Array.isArray(t)?YI[t[0]]:YI[t];if(typeof r.suggest=="undefined")return null;let i=Array.isArray(t)?t.slice(1):[];return r.suggest(e,...i)}var YI={always:()=>!0,isOptionLike:(t,e)=>!t.ignoreOptions&&e!=="-"&&e.startsWith("-"),isNotOptionLike:(t,e)=>t.ignoreOptions||e==="-"||!e.startsWith("-"),isOption:(t,e,r,i)=>!t.ignoreOptions&&e===r,isBatchOption:(t,e,r)=>!t.ignoreOptions&&fU.test(e)&&[...e.slice(1)].every(i=>r.includes(`-${i}`)),isBoundOption:(t,e,r,i)=>{let n=e.match(av);return!t.ignoreOptions&&!!n&&UI.test(n[1])&&r.includes(n[1])&&i.filter(s=>s.names.includes(n[1])).every(s=>s.allowBinding)},isNegatedOption:(t,e,r)=>!t.ignoreOptions&&e===`--no-${r.slice(2)}`,isHelp:(t,e)=>!t.ignoreOptions&&ov.test(e),isUnsupportedOption:(t,e,r)=>!t.ignoreOptions&&e.startsWith("-")&&UI.test(e)&&!r.includes(e),isInvalidOption:(t,e)=>!t.ignoreOptions&&e.startsWith("-")&&!UI.test(e)};YI.isOption.suggest=(t,e,r=!0)=>r?null:[e];var dv={setCandidateState:(t,e,r)=>P(P({},t),r),setSelectedIndex:(t,e,r)=>_(P({},t),{selectedIndex:r}),pushBatch:(t,e)=>_(P({},t),{options:t.options.concat([...e.slice(1)].map(r=>({name:`-${r}`,value:!0})))}),pushBound:(t,e)=>{let[,r,i]=e.match(av);return _(P({},t),{options:t.options.concat({name:r,value:i})})},pushPath:(t,e)=>_(P({},t),{path:t.path.concat(e)}),pushPositional:(t,e)=>_(P({},t),{positionals:t.positionals.concat({value:e,extra:!1})}),pushExtra:(t,e)=>_(P({},t),{positionals:t.positionals.concat({value:e,extra:!0})}),pushExtraNoLimits:(t,e)=>_(P({},t),{positionals:t.positionals.concat({value:e,extra:Ln})}),pushTrue:(t,e,r=e)=>_(P({},t),{options:t.options.concat({name:e,value:!0})}),pushFalse:(t,e,r=e)=>_(P({},t),{options:t.options.concat({name:r,value:!1})}),pushUndefined:(t,e)=>_(P({},t),{options:t.options.concat({name:e,value:void 0})}),pushStringValue:(t,e)=>{var r;let i=_(P({},t),{options:[...t.options]}),n=t.options[t.options.length-1];return n.value=((r=n.value)!==null&&r!==void 0?r:[]).concat([e]),i},setStringValue:(t,e)=>{let r=_(P({},t),{options:[...t.options]}),i=t.options[t.options.length-1];return i.value=e,r},inhibateOptions:t=>_(P({},t),{ignoreOptions:!0}),useHelp:(t,e,r)=>{let[,,i]=e.match(ov);return typeof i!="undefined"?_(P({},t),{options:[{name:"-c",value:String(r)},{name:"-i",value:i}]}):_(P({},t),{options:[{name:"-c",value:String(r)}]})},setError:(t,e,r)=>e===hi?_(P({},t),{errorMessage:`${r}.`}):_(P({},t),{errorMessage:`${r} ("${e}").`}),setOptionArityError:(t,e)=>{let r=t.options[t.options.length-1];return _(P({},t),{errorMessage:`Not enough arguments to option ${r.name}.`})}},Ln=Symbol(),xU=class{constructor(e,r){this.allOptionNames=[],this.arity={leading:[],trailing:[],extra:[],proxy:!1},this.options=[],this.paths=[],this.cliIndex=e,this.cliOpts=r}addPath(e){this.paths.push(e)}setArity({leading:e=this.arity.leading,trailing:r=this.arity.trailing,extra:i=this.arity.extra,proxy:n=this.arity.proxy}){Object.assign(this.arity,{leading:e,trailing:r,extra:i,proxy:n})}addPositional({name:e="arg",required:r=!0}={}){if(!r&&this.arity.extra===Ln)throw new Error("Optional parameters cannot be declared when using .rest() or .proxy()");if(!r&&this.arity.trailing.length>0)throw new Error("Optional parameters cannot be declared after the required trailing positional arguments");!r&&this.arity.extra!==Ln?this.arity.extra.push(e):this.arity.extra!==Ln&&this.arity.extra.length===0?this.arity.leading.push(e):this.arity.trailing.push(e)}addRest({name:e="arg",required:r=0}={}){if(this.arity.extra===Ln)throw new Error("Infinite lists cannot be declared multiple times in the same command");if(this.arity.trailing.length>0)throw new Error("Infinite lists cannot be declared after the required trailing positional arguments");for(let i=0;i1)throw new Error("The arity cannot be higher than 1 when the option only supports the --arg=value syntax");if(!Number.isInteger(i))throw new Error(`The arity must be an integer, got ${i}`);if(i<0)throw new Error(`The arity must be positive, got ${i}`);this.allOptionNames.push(...e),this.options.push({names:e,description:r,arity:i,hidden:n,required:s,allowBinding:o})}setContext(e){this.context=e}usage({detailed:e=!0,inlineOptions:r=!0}={}){let i=[this.cliOpts.binaryName],n=[];if(this.paths.length>0&&i.push(...this.paths[0]),e){for(let{names:o,arity:a,hidden:l,description:c,required:u}of this.options){if(l)continue;let g=[];for(let h=0;h`:`[${f}]`)}i.push(...this.arity.leading.map(o=>`<${o}>`)),this.arity.extra===Ln?i.push("..."):i.push(...this.arity.extra.map(o=>`[${o}]`)),i.push(...this.arity.trailing.map(o=>`<${o}>`))}return{usage:i.join(" "),options:n}}compile(){if(typeof this.context=="undefined")throw new Error("Assertion failed: No context attached");let e=QU(),r=yl,i=this.usage().usage,n=this.options.filter(a=>a.required).map(a=>a.names);r=xs(e,qi()),ta(e,yl,sv,r,["setCandidateState",{candidateUsage:i,requiredOptions:n}]);let s=this.arity.proxy?"always":"isNotOptionLike",o=this.paths.length>0?this.paths:[[]];for(let a of o){let l=r;if(a.length>0){let f=xs(e,qi());cu(e,l,f),this.registerOptions(e,f),l=f}for(let f=0;f0||!this.arity.proxy){let f=xs(e,qi());pi(e,l,"isHelp",f,["useHelp",this.cliIndex]),ta(e,f,hi,Ih,["setSelectedIndex",Au]),this.registerOptions(e,l)}this.arity.leading.length>0&&ta(e,l,hi,Gi,["setError","Not enough positional arguments"]);let c=l;for(let f=0;f0||f+1!==this.arity.leading.length)&&ta(e,h,hi,Gi,["setError","Not enough positional arguments"]),pi(e,c,"isNotOptionLike",h,"pushPositional"),c=h}let u=c;if(this.arity.extra===Ln||this.arity.extra.length>0){let f=xs(e,qi());if(cu(e,c,f),this.arity.extra===Ln){let h=xs(e,qi());this.arity.proxy||this.registerOptions(e,h),pi(e,c,s,h,"pushExtraNoLimits"),pi(e,h,s,h,"pushExtraNoLimits"),cu(e,h,f)}else for(let h=0;h0&&ta(e,u,hi,Gi,["setError","Not enough positional arguments"]);let g=u;for(let f=0;fo.length>s.length?o:s,"");if(i.arity===0)for(let s of i.names)pi(e,r,["isOption",s,i.hidden||s!==n],r,"pushTrue"),s.startsWith("--")&&!s.startsWith("--no-")&&pi(e,r,["isNegatedOption",s],r,["pushFalse",s]);else{let s=xs(e,qi());for(let o of i.names)pi(e,r,["isOption",o,i.hidden||o!==n],s,"pushUndefined");for(let o=0;o=0&&egCe(i,n),suggest:(n,s)=>cCe(i,n,s)}}};var kU=80,mv=Array(kU).fill("\u2501");for(let t=0;t<=24;++t)mv[mv.length-t]=`[38;5;${232+t}m\u2501`;var Iv={header:t=>`\u2501\u2501\u2501 ${t}${t.length`${t}`,error:t=>`${t}`,code:t=>`${t}`},PU={header:t=>t,bold:t=>t,error:t=>t,code:t=>t};function hCe(t){let e=t.split(` +`),r=e.filter(n=>n.match(/\S/)),i=r.length>0?r.reduce((n,s)=>Math.min(n,s.length-s.trimStart().length),Number.MAX_VALUE):0;return e.map(n=>n.slice(i).trimRight()).join(` +`)}function Vn(t,{format:e,paragraphs:r}){return t=t.replace(/\r\n?/g,` +`),t=hCe(t),t=t.replace(/^\n+|\n+$/g,""),t=t.replace(/^(\s*)-([^\n]*?)\n+/gm,`$1-$2 + +`),t=t.replace(/\n(\n)?\n*/g,"$1"),r&&(t=t.split(/\n/).map(i=>{let n=i.match(/^\s*[*-][\t ]+(.*)/);if(!n)return i.match(/(.{1,80})(?: |$)/g).join(` +`);let s=i.length-i.trimStart().length;return n[1].match(new RegExp(`(.{1,${78-s}})(?: |$)`,"g")).map((o,a)=>" ".repeat(s)+(a===0?"- ":" ")+o).join(` +`)}).join(` + +`)),t=t.replace(/(`+)((?:.|[\n])*?)\1/g,(i,n,s)=>e.code(n+s+n)),t=t.replace(/(\*\*)((?:.|[\n])*?)\1/g,(i,n,s)=>e.bold(n+s+n)),t?`${t} +`:""}var bh=class extends ye{constructor(e){super();this.contexts=e,this.commands=[]}static from(e,r){let i=new bh(r);i.path=e.path;for(let n of e.options)switch(n.name){case"-c":i.commands.push(Number(n.value));break;case"-i":i.index=Number(n.value);break}return i}async execute(){let e=this.commands;if(typeof this.index!="undefined"&&this.index>=0&&this.index1){this.context.stdout.write(`Multiple commands match your selection: +`),this.context.stdout.write(` +`);let r=0;for(let i of this.commands)this.context.stdout.write(this.cli.usage(this.contexts[i].commandClass,{prefix:`${r++}. `.padStart(5)}));this.context.stdout.write(` +`),this.context.stdout.write(`Run again with -h= to see the longer details of any of those commands. +`)}}};var DU=Symbol("clipanion/errorCommand");function pCe(){return process.env.FORCE_COLOR==="0"?!1:!!(process.env.FORCE_COLOR==="1"||typeof process.stdout!="undefined"&&process.stdout.isTTY)}var oo=class{constructor({binaryLabel:e,binaryName:r="...",binaryVersion:i,enableColors:n=pCe()}={}){this.registrations=new Map,this.builder=new Qh({binaryName:r}),this.binaryLabel=e,this.binaryName=r,this.binaryVersion=i,this.enableColors=n}static from(e,r={}){let i=new oo(r);for(let n of e)i.register(n);return i}register(e){var r;let i=new Map,n=new e;for(let l in n){let c=n[l];typeof c=="object"&&c!==null&&c[ye.isOption]&&i.set(l,c)}let s=this.builder.command(),o=s.cliIndex,a=(r=e.paths)!==null&&r!==void 0?r:n.paths;if(typeof a!="undefined")for(let l of a)s.addPath(l);this.registrations.set(e,{specs:i,builder:s,index:o});for(let[l,{definition:c}]of i.entries())c(s,l);s.setContext({commandClass:e})}process(e){let{contexts:r,process:i}=this.builder.compile(),n=i(e);switch(n.selectedIndex){case Au:return bh.from(n,r);default:{let{commandClass:s}=r[n.selectedIndex],o=this.registrations.get(s);if(typeof o=="undefined")throw new Error("Assertion failed: Expected the command class to have been registered.");let a=new s;a.path=n.path;try{for(let[l,{transformer:c}]of o.specs.entries())a[l]=c(o.builder,l,n);return a}catch(l){throw l[DU]=a,l}}break}}async run(e,r){let i;if(!Array.isArray(e))i=e;else try{i=this.process(e)}catch(s){return r.stdout.write(this.error(s)),1}if(i.help)return r.stdout.write(this.usage(i,{detailed:!0})),0;i.context=r,i.cli={binaryLabel:this.binaryLabel,binaryName:this.binaryName,binaryVersion:this.binaryVersion,enableColors:this.enableColors,definitions:()=>this.definitions(),error:(s,o)=>this.error(s,o),process:s=>this.process(s),run:(s,o)=>this.run(s,P(P({},r),o)),usage:(s,o)=>this.usage(s,o)};let n;try{n=await i.validateAndExecute().catch(s=>i.catch(s).then(()=>0))}catch(s){return r.stdout.write(this.error(s,{command:i})),1}return n}async runExit(e,r){process.exitCode=await this.run(e,r)}suggest(e,r){let{suggest:i}=this.builder.compile();return i(e,r)}definitions({colored:e=!1}={}){let r=[];for(let[i,{index:n}]of this.registrations){if(typeof i.usage=="undefined")continue;let{usage:s}=this.getUsageByIndex(n,{detailed:!1}),{usage:o,options:a}=this.getUsageByIndex(n,{detailed:!0,inlineOptions:!1}),l=typeof i.usage.category!="undefined"?Vn(i.usage.category,{format:this.format(e),paragraphs:!1}):void 0,c=typeof i.usage.description!="undefined"?Vn(i.usage.description,{format:this.format(e),paragraphs:!1}):void 0,u=typeof i.usage.details!="undefined"?Vn(i.usage.details,{format:this.format(e),paragraphs:!0}):void 0,g=typeof i.usage.examples!="undefined"?i.usage.examples.map(([f,h])=>[Vn(f,{format:this.format(e),paragraphs:!1}),h.replace(/\$0/g,this.binaryName)]):void 0;r.push({path:s,usage:o,category:l,description:c,details:u,examples:g,options:a})}return r}usage(e=null,{colored:r,detailed:i=!1,prefix:n="$ "}={}){var s;if(e===null){for(let l of this.registrations.keys()){let c=l.paths,u=typeof l.usage!="undefined";if(!c||c.length===0||c.length===1&&c[0].length===0||((s=c==null?void 0:c.some(h=>h.length===0))!==null&&s!==void 0?s:!1))if(e){e=null;break}else e=l;else if(u){e=null;continue}}e&&(i=!0)}let o=e!==null&&e instanceof ye?e.constructor:e,a="";if(o)if(i){let{description:l="",details:c="",examples:u=[]}=o.usage||{};l!==""&&(a+=Vn(l,{format:this.format(r),paragraphs:!1}).replace(/^./,h=>h.toUpperCase()),a+=` +`),(c!==""||u.length>0)&&(a+=`${this.format(r).header("Usage")} +`,a+=` +`);let{usage:g,options:f}=this.getUsageByRegistration(o,{inlineOptions:!1});if(a+=`${this.format(r).bold(n)}${g} +`,f.length>0){a+=` +`,a+=`${Iv.header("Options")} +`;let h=f.reduce((p,d)=>Math.max(p,d.definition.length),0);a+=` +`;for(let{definition:p,description:d}of f)a+=` ${this.format(r).bold(p.padEnd(h))} ${Vn(d,{format:this.format(r),paragraphs:!1})}`}if(c!==""&&(a+=` +`,a+=`${this.format(r).header("Details")} +`,a+=` +`,a+=Vn(c,{format:this.format(r),paragraphs:!0})),u.length>0){a+=` +`,a+=`${this.format(r).header("Examples")} +`;for(let[h,p]of u)a+=` +`,a+=Vn(h,{format:this.format(r),paragraphs:!1}),a+=`${p.replace(/^/m,` ${this.format(r).bold(n)}`).replace(/\$0/g,this.binaryName)} +`}}else{let{usage:l}=this.getUsageByRegistration(o);a+=`${this.format(r).bold(n)}${l} +`}else{let l=new Map;for(let[f,{index:h}]of this.registrations.entries()){if(typeof f.usage=="undefined")continue;let p=typeof f.usage.category!="undefined"?Vn(f.usage.category,{format:this.format(r),paragraphs:!1}):null,d=l.get(p);typeof d=="undefined"&&l.set(p,d=[]);let{usage:m}=this.getUsageByIndex(h);d.push({commandClass:f,usage:m})}let c=Array.from(l.keys()).sort((f,h)=>f===null?-1:h===null?1:f.localeCompare(h,"en",{usage:"sort",caseFirst:"upper"})),u=typeof this.binaryLabel!="undefined",g=typeof this.binaryVersion!="undefined";u||g?(u&&g?a+=`${this.format(r).header(`${this.binaryLabel} - ${this.binaryVersion}`)} + +`:u?a+=`${this.format(r).header(`${this.binaryLabel}`)} +`:a+=`${this.format(r).header(`${this.binaryVersion}`)} +`,a+=` ${this.format(r).bold(n)}${this.binaryName} +`):a+=`${this.format(r).bold(n)}${this.binaryName} +`;for(let f of c){let h=l.get(f).slice().sort((d,m)=>d.usage.localeCompare(m.usage,"en",{usage:"sort",caseFirst:"upper"})),p=f!==null?f.trim():"General commands";a+=` +`,a+=`${this.format(r).header(`${p}`)} +`;for(let{commandClass:d,usage:m}of h){let E=d.usage.description||"undocumented";a+=` +`,a+=` ${this.format(r).bold(m)} +`,a+=` ${Vn(E,{format:this.format(r),paragraphs:!1})}`}}a+=` +`,a+=Vn("You can also print more details about any of these commands by calling them with the `-h,--help` flag right after the command name.",{format:this.format(r),paragraphs:!0})}return a}error(e,r){var i,{colored:n,command:s=(i=e[DU])!==null&&i!==void 0?i:null}=r===void 0?{}:r;e instanceof Error||(e=new Error(`Execution failed with a non-error rejection (rejected value: ${JSON.stringify(e)})`));let o="",a=e.name.replace(/([a-z])([A-Z])/g,"$1 $2");a==="Error"&&(a="Internal Error"),o+=`${this.format(n).error(a)}: ${e.message} +`;let l=e.clipanion;return typeof l!="undefined"?l.type==="usage"&&(o+=` +`,o+=this.usage(s)):e.stack&&(o+=`${e.stack.replace(/^.*\n/,"")} +`),o}getUsageByRegistration(e,r){let i=this.registrations.get(e);if(typeof i=="undefined")throw new Error("Assertion failed: Unregistered command");return this.getUsageByIndex(i.index,r)}getUsageByIndex(e,r){return this.builder.getBuilderByIndex(e).usage(r)}format(e=this.enableColors){return e?Iv:PU}};oo.defaultContext={stdin:process.stdin,stdout:process.stdout,stderr:process.stderr};var Ev={};it(Ev,{DefinitionsCommand:()=>qI,HelpCommand:()=>JI,VersionCommand:()=>WI});var qI=class extends ye{async execute(){this.context.stdout.write(`${JSON.stringify(this.cli.definitions(),null,2)} +`)}};qI.paths=[["--clipanion=definitions"]];var JI=class extends ye{async execute(){this.context.stdout.write(this.cli.usage())}};JI.paths=[["-h"],["--help"]];var WI=class extends ye{async execute(){var e;this.context.stdout.write(`${(e=this.cli.binaryVersion)!==null&&e!==void 0?e:""} +`)}};WI.paths=[["-v"],["--version"]];var Y={};it(Y,{Array:()=>RU,Boolean:()=>FU,Counter:()=>NU,Proxy:()=>LU,Rest:()=>TU,String:()=>MU,applyValidator:()=>Bh,cleanValidationError:()=>HI,formatError:()=>wh,isOptionSymbol:()=>yh,makeCommandOption:()=>ji,rerouteArguments:()=>so});function RU(t,e,r){let[i,n]=so(e,r!=null?r:{}),{arity:s=1}=n,o=t.split(","),a=new Set(o);return ji({definition(l){l.addOption({names:o,arity:s,hidden:n==null?void 0:n.hidden,description:n==null?void 0:n.description,required:n.required})},transformer(l,c,u){let g=typeof i!="undefined"?[...i]:void 0;for(let{name:f,value:h}of u.options)!a.has(f)||(g=g!=null?g:[],g.push(h));return g}})}function FU(t,e,r){let[i,n]=so(e,r!=null?r:{}),s=t.split(","),o=new Set(s);return ji({definition(a){a.addOption({names:s,allowBinding:!1,arity:0,hidden:n.hidden,description:n.description,required:n.required})},transformer(a,l,c){let u=i;for(let{name:g,value:f}of c.options)!o.has(g)||(u=f);return u}})}function NU(t,e,r){let[i,n]=so(e,r!=null?r:{}),s=t.split(","),o=new Set(s);return ji({definition(a){a.addOption({names:s,allowBinding:!1,arity:0,hidden:n.hidden,description:n.description,required:n.required})},transformer(a,l,c){let u=i;for(let{name:g,value:f}of c.options)!o.has(g)||(u!=null||(u=0),f?u+=1:u=0);return u}})}function LU(t={}){return ji({definition(e,r){var i;e.addProxy({name:(i=t.name)!==null&&i!==void 0?i:r,required:t.required})},transformer(e,r,i){return i.positionals.map(({value:n})=>n)}})}function TU(t={}){return ji({definition(e,r){var i;e.addRest({name:(i=t.name)!==null&&i!==void 0?i:r,required:t.required})},transformer(e,r,i){let n=o=>{let a=i.positionals[o];return a.extra===Ln||a.extra===!1&&oo)}})}function dCe(t,e,r){let[i,n]=so(e,r!=null?r:{}),{arity:s=1}=n,o=t.split(","),a=new Set(o);return ji({definition(l){l.addOption({names:o,arity:n.tolerateBoolean?0:s,hidden:n.hidden,description:n.description,required:n.required})},transformer(l,c,u){let g,f=i;for(let{name:h,value:p}of u.options)!a.has(h)||(g=h,f=p);return typeof f=="string"?Bh(g!=null?g:c,f,n.validator):f}})}function CCe(t={}){let{required:e=!0}=t;return ji({definition(r,i){var n;r.addPositional({name:(n=t.name)!==null&&n!==void 0?n:i,required:t.required})},transformer(r,i,n){var s;for(let o=0;oJSON.stringify(i)).join(", ")})`);return e}function kl(t,e){let r=[];for(let i of t){let n=e(i);n!==LH&&r.push(n)}return r}var LH=Symbol();kl.skip=LH;function MH(t,e){for(let r of t){let i=e(r);if(i!==TH)return i}}var TH=Symbol();MH.skip=TH;function Tv(t){return typeof t=="object"&&t!==null}function aE(t){if(t instanceof Map&&(t=Object.fromEntries(t)),Tv(t))for(let e of Object.keys(t)){let r=t[e];Tv(r)&&(t[e]=aE(r))}return t}function na(t,e,r){let i=t.get(e);return typeof i=="undefined"&&t.set(e,i=r()),i}function hu(t,e){let r=t.get(e);return typeof r=="undefined"&&t.set(e,r=[]),r}function Pl(t,e){let r=t.get(e);return typeof r=="undefined"&&t.set(e,r=new Set),r}function pu(t,e){let r=t.get(e);return typeof r=="undefined"&&t.set(e,r=new Map),r}async function kIe(t,e){if(e==null)return await t();try{return await t()}finally{await e()}}async function du(t,e){try{return await t()}catch(r){throw r.message=e(r.message),r}}function Mv(t,e){try{return t()}catch(r){throw r.message=e(r.message),r}}async function Cu(t){return await new Promise((e,r)=>{let i=[];t.on("error",n=>{r(n)}),t.on("data",n=>{i.push(n)}),t.on("end",()=>{e(Buffer.concat(i))})})}var OH=class extends Fv.Transform{constructor(){super(...arguments);this.chunks=[]}_transform(e,r,i){if(r!=="buffer"||!Buffer.isBuffer(e))throw new Error("Assertion failed: BufferStream only accept buffers");this.chunks.push(e),i(null,null)}_flush(e){e(null,Buffer.concat(this.chunks))}},KH=class extends Fv.Transform{constructor(e=Buffer.alloc(0)){super();this.active=!0;this.ifEmpty=e}_transform(e,r,i){if(r!=="buffer"||!Buffer.isBuffer(e))throw new Error("Assertion failed: DefaultStream only accept buffers");this.active=!1,i(null,e)}_flush(e){this.active&&this.ifEmpty.length>0?e(null,this.ifEmpty):e(null)}},Uh=eval("require");function UH(t){return Uh(M.fromPortablePath(t))}function HH(path){let physicalPath=M.fromPortablePath(path),currentCacheEntry=Uh.cache[physicalPath];delete Uh.cache[physicalPath];let result;try{result=UH(physicalPath);let freshCacheEntry=Uh.cache[physicalPath],dynamicModule=eval("module"),freshCacheIndex=dynamicModule.children.indexOf(freshCacheEntry);freshCacheIndex!==-1&&dynamicModule.children.splice(freshCacheIndex,1)}finally{Uh.cache[physicalPath]=currentCacheEntry}return result}var GH=new Map;function PIe(t){let e=GH.get(t),r=T.statSync(t);if((e==null?void 0:e.mtime)===r.mtimeMs)return e.instance;let i=HH(t);return GH.set(t,{mtime:r.mtimeMs,instance:i}),i}var Dl;(function(i){i[i.NoCache=0]="NoCache",i[i.FsTime=1]="FsTime",i[i.Node=2]="Node"})(Dl||(Dl={}));function mu(t,{cachingStrategy:e=2}={}){switch(e){case 0:return HH(t);case 1:return PIe(t);case 2:return UH(t);default:throw new Error("Unsupported caching strategy")}}function gn(t,e){let r=Array.from(t);Array.isArray(e)||(e=[e]);let i=[];for(let s of e)i.push(r.map(o=>s(o)));let n=r.map((s,o)=>o);return n.sort((s,o)=>{for(let a of i){let l=a[s]a[o]?1:0;if(l!==0)return l}return 0}),n.map(s=>r[s])}function DIe(t){return t.length===0?null:t.map(e=>`(${FH.default.makeRe(e,{windows:!1,dot:!0}).source})`).join("|")}function Ov(t,{env:e}){let r=/\${(?[\d\w_]+)(?:)?(?:-(?[^}]*))?}/g;return t.replace(r,(...i)=>{let{variableName:n,colon:s,fallback:o}=i[i.length-1],a=Object.prototype.hasOwnProperty.call(e,n),l=e[n];if(l||a&&!s)return l;if(o!=null)return o;throw new me(`Environment variable not found (${n})`)})}function Hh(t){switch(t){case"true":case"1":case 1:case!0:return!0;case"false":case"0":case 0:case!1:return!1;default:throw new Error(`Couldn't parse "${t}" as a boolean`)}}function jH(t){return typeof t=="undefined"?t:Hh(t)}function Kv(t){try{return jH(t)}catch{return null}}function RIe(t){return!!(M.isAbsolute(t)||t.match(/^(\.{1,2}|~)\//))}var S={};it(S,{areDescriptorsEqual:()=>i3,areIdentsEqual:()=>cp,areLocatorsEqual:()=>up,areVirtualPackagesEquivalent:()=>XQe,bindDescriptor:()=>VQe,bindLocator:()=>_Qe,convertDescriptorToLocator:()=>By,convertLocatorToDescriptor:()=>WQe,convertPackageToLocator:()=>zQe,convertToIdent:()=>JQe,convertToManifestRange:()=>ebe,copyPackage:()=>ap,devirtualizeDescriptor:()=>Ap,devirtualizeLocator:()=>lp,getIdentVendorPath:()=>Lx,isPackageCompatible:()=>Sy,isVirtualDescriptor:()=>hA,isVirtualLocator:()=>Eo,makeDescriptor:()=>Yt,makeIdent:()=>Io,makeLocator:()=>Vi,makeRange:()=>by,parseDescriptor:()=>pA,parseFileStyleRange:()=>ZQe,parseIdent:()=>In,parseLocator:()=>Hl,parseRange:()=>Tu,prettyDependent:()=>Nx,prettyDescriptor:()=>Xt,prettyIdent:()=>Vr,prettyLocator:()=>lt,prettyLocatorNoColors:()=>Rx,prettyRange:()=>yy,prettyReference:()=>fp,prettyResolution:()=>Fx,prettyWorkspace:()=>hp,renamePackage:()=>op,slugifyIdent:()=>Dx,slugifyLocator:()=>Mu,sortDescriptors:()=>Ou,stringifyDescriptor:()=>En,stringifyIdent:()=>St,stringifyLocator:()=>is,tryParseDescriptor:()=>gp,tryParseIdent:()=>n3,tryParseLocator:()=>Qy,virtualizeDescriptor:()=>kx,virtualizePackage:()=>Px});var Lu=ie(require("querystring")),e3=ie(Or()),t3=ie(wY());var mn={};it(mn,{checksumFile:()=>Iy,checksumPattern:()=>Ey,makeHash:()=>zi});var my=ie(require("crypto")),Sx=ie(vx());function zi(...t){let e=(0,my.createHash)("sha512"),r="";for(let i of t)typeof i=="string"?r+=i:i&&(r&&(e.update(r),r=""),e.update(i));return r&&e.update(r),e.digest("hex")}async function Iy(t,{baseFs:e,algorithm:r}={baseFs:T,algorithm:"sha512"}){let i=await e.openPromise(t,"r");try{let n=65536,s=Buffer.allocUnsafeSlow(n),o=(0,my.createHash)(r),a=0;for(;(a=await e.readPromise(i,s,0,n))!==0;)o.update(a===n?s:s.slice(0,a));return o.digest("hex")}finally{await e.closePromise(i)}}async function Ey(t,{cwd:e}){let i=(await(0,Sx.default)(t,{cwd:M.fromPortablePath(e),expandDirectories:!1,onlyDirectories:!0,unique:!0})).map(a=>`${a}/**/*`),n=await(0,Sx.default)([t,...i],{cwd:M.fromPortablePath(e),expandDirectories:!1,onlyFiles:!1,unique:!0});n.sort();let s=await Promise.all(n.map(async a=>{let l=[Buffer.from(a)],c=M.toPortablePath(a),u=await T.lstatPromise(c);return u.isSymbolicLink()?l.push(Buffer.from(await T.readlinkPromise(c))):u.isFile()&&l.push(await T.readFilePromise(c)),l.join("\0")})),o=(0,my.createHash)("sha512");for(let a of s)o.update(a);return o.digest("hex")}var wy="virtual:",YQe=5,r3=/(os|cpu)=([a-z0-9_-]+)/,qQe=(0,t3.makeParser)(r3);function Io(t,e){if(t==null?void 0:t.startsWith("@"))throw new Error("Invalid scope: don't prefix it with '@'");return{identHash:zi(t,e),scope:t,name:e}}function Yt(t,e){return{identHash:t.identHash,scope:t.scope,name:t.name,descriptorHash:zi(t.identHash,e),range:e}}function Vi(t,e){return{identHash:t.identHash,scope:t.scope,name:t.name,locatorHash:zi(t.identHash,e),reference:e}}function JQe(t){return{identHash:t.identHash,scope:t.scope,name:t.name}}function By(t){return{identHash:t.identHash,scope:t.scope,name:t.name,locatorHash:t.descriptorHash,reference:t.range}}function WQe(t){return{identHash:t.identHash,scope:t.scope,name:t.name,descriptorHash:t.locatorHash,range:t.reference}}function zQe(t){return{identHash:t.identHash,scope:t.scope,name:t.name,locatorHash:t.locatorHash,reference:t.reference}}function op(t,e){return{identHash:e.identHash,scope:e.scope,name:e.name,locatorHash:e.locatorHash,reference:e.reference,version:t.version,languageName:t.languageName,linkType:t.linkType,conditions:t.conditions,dependencies:new Map(t.dependencies),peerDependencies:new Map(t.peerDependencies),dependenciesMeta:new Map(t.dependenciesMeta),peerDependenciesMeta:new Map(t.peerDependenciesMeta),bin:new Map(t.bin)}}function ap(t){return op(t,t)}function kx(t,e){if(e.includes("#"))throw new Error("Invalid entropy");return Yt(t,`virtual:${e}#${t.range}`)}function Px(t,e){if(e.includes("#"))throw new Error("Invalid entropy");return op(t,Vi(t,`virtual:${e}#${t.reference}`))}function hA(t){return t.range.startsWith(wy)}function Eo(t){return t.reference.startsWith(wy)}function Ap(t){if(!hA(t))throw new Error("Not a virtual descriptor");return Yt(t,t.range.replace(/^[^#]*#/,""))}function lp(t){if(!Eo(t))throw new Error("Not a virtual descriptor");return Vi(t,t.reference.replace(/^[^#]*#/,""))}function VQe(t,e){return t.range.includes("::")?t:Yt(t,`${t.range}::${Lu.default.stringify(e)}`)}function _Qe(t,e){return t.reference.includes("::")?t:Vi(t,`${t.reference}::${Lu.default.stringify(e)}`)}function cp(t,e){return t.identHash===e.identHash}function i3(t,e){return t.descriptorHash===e.descriptorHash}function up(t,e){return t.locatorHash===e.locatorHash}function XQe(t,e){if(!Eo(t))throw new Error("Invalid package type");if(!Eo(e))throw new Error("Invalid package type");if(!cp(t,e)||t.dependencies.size!==e.dependencies.size)return!1;for(let r of t.dependencies.values()){let i=e.dependencies.get(r.identHash);if(!i||!i3(r,i))return!1}return!0}function In(t){let e=n3(t);if(!e)throw new Error(`Invalid ident (${t})`);return e}function n3(t){let e=t.match(/^(?:@([^/]+?)\/)?([^/]+)$/);if(!e)return null;let[,r,i]=e,n=typeof r!="undefined"?r:null;return Io(n,i)}function pA(t,e=!1){let r=gp(t,e);if(!r)throw new Error(`Invalid descriptor (${t})`);return r}function gp(t,e=!1){let r=e?t.match(/^(?:@([^/]+?)\/)?([^/]+?)(?:@(.+))$/):t.match(/^(?:@([^/]+?)\/)?([^/]+?)(?:@(.+))?$/);if(!r)return null;let[,i,n,s]=r;if(s==="unknown")throw new Error(`Invalid range (${t})`);let o=typeof i!="undefined"?i:null,a=typeof s!="undefined"?s:"unknown";return Yt(Io(o,n),a)}function Hl(t,e=!1){let r=Qy(t,e);if(!r)throw new Error(`Invalid locator (${t})`);return r}function Qy(t,e=!1){let r=e?t.match(/^(?:@([^/]+?)\/)?([^/]+?)(?:@(.+))$/):t.match(/^(?:@([^/]+?)\/)?([^/]+?)(?:@(.+))?$/);if(!r)return null;let[,i,n,s]=r;if(s==="unknown")throw new Error(`Invalid reference (${t})`);let o=typeof i!="undefined"?i:null,a=typeof s!="undefined"?s:"unknown";return Vi(Io(o,n),a)}function Tu(t,e){let r=t.match(/^([^#:]*:)?((?:(?!::)[^#])*)(?:#((?:(?!::).)*))?(?:::(.*))?$/);if(r===null)throw new Error(`Invalid range (${t})`);let i=typeof r[1]!="undefined"?r[1]:null;if(typeof(e==null?void 0:e.requireProtocol)=="string"&&i!==e.requireProtocol)throw new Error(`Invalid protocol (${i})`);if((e==null?void 0:e.requireProtocol)&&i===null)throw new Error(`Missing protocol (${i})`);let n=typeof r[3]!="undefined"?decodeURIComponent(r[2]):null;if((e==null?void 0:e.requireSource)&&n===null)throw new Error(`Missing source (${t})`);let s=typeof r[3]!="undefined"?decodeURIComponent(r[3]):decodeURIComponent(r[2]),o=(e==null?void 0:e.parseSelector)?Lu.default.parse(s):s,a=typeof r[4]!="undefined"?Lu.default.parse(r[4]):null;return{protocol:i,source:n,selector:o,params:a}}function ZQe(t,{protocol:e}){let{selector:r,params:i}=Tu(t,{requireProtocol:e,requireBindings:!0});if(typeof i.locator!="string")throw new Error(`Assertion failed: Invalid bindings for ${t}`);return{parentLocator:Hl(i.locator,!0),path:r}}function s3(t){return t=t.replace(/%/g,"%25"),t=t.replace(/:/g,"%3A"),t=t.replace(/#/g,"%23"),t}function $Qe(t){return t===null?!1:Object.entries(t).length>0}function by({protocol:t,source:e,selector:r,params:i}){let n="";return t!==null&&(n+=`${t}`),e!==null&&(n+=`${s3(e)}#`),n+=s3(r),$Qe(i)&&(n+=`::${Lu.default.stringify(i)}`),n}function ebe(t){let{params:e,protocol:r,source:i,selector:n}=Tu(t);for(let s in e)s.startsWith("__")&&delete e[s];return by({protocol:r,source:i,params:e,selector:n})}function St(t){return t.scope?`@${t.scope}/${t.name}`:`${t.name}`}function En(t){return t.scope?`@${t.scope}/${t.name}@${t.range}`:`${t.name}@${t.range}`}function is(t){return t.scope?`@${t.scope}/${t.name}@${t.reference}`:`${t.name}@${t.reference}`}function Dx(t){return t.scope!==null?`@${t.scope}-${t.name}`:t.name}function Mu(t){let{protocol:e,selector:r}=Tu(t.reference),i=e!==null?e.replace(/:$/,""):"exotic",n=e3.default.valid(r),s=n!==null?`${i}-${n}`:`${i}`,o=10,a=t.scope?`${Dx(t)}-${s}-${t.locatorHash.slice(0,o)}`:`${Dx(t)}-${s}-${t.locatorHash.slice(0,o)}`;return kr(a)}function Vr(t,e){return e.scope?`${Ve(t,`@${e.scope}/`,Le.SCOPE)}${Ve(t,e.name,Le.NAME)}`:`${Ve(t,e.name,Le.NAME)}`}function vy(t){if(t.startsWith(wy)){let e=vy(t.substr(t.indexOf("#")+1)),r=t.substr(wy.length,YQe);return`${e} [${r}]`}else return t.replace(/\?.*/,"?[...]")}function yy(t,e){return`${Ve(t,vy(e),Le.RANGE)}`}function Xt(t,e){return`${Vr(t,e)}${Ve(t,"@",Le.RANGE)}${yy(t,e.range)}`}function fp(t,e){return`${Ve(t,vy(e),Le.REFERENCE)}`}function lt(t,e){return`${Vr(t,e)}${Ve(t,"@",Le.REFERENCE)}${fp(t,e.reference)}`}function Rx(t){return`${St(t)}@${vy(t.reference)}`}function Ou(t){return gn(t,[e=>St(e),e=>e.range])}function hp(t,e){return Vr(t,e.locator)}function Fx(t,e,r){let i=hA(e)?Ap(e):e;return r===null?`${Xt(t,i)} \u2192 ${xx(t).Cross}`:i.identHash===r.identHash?`${Xt(t,i)} \u2192 ${fp(t,r.reference)}`:`${Xt(t,i)} \u2192 ${lt(t,r)}`}function Nx(t,e,r){return r===null?`${lt(t,e)}`:`${lt(t,e)} (via ${yy(t,r.range)})`}function Lx(t){return`node_modules/${St(t)}`}function Sy(t,e){return t.conditions?qQe(t.conditions,r=>{let[,i,n]=r.match(r3),s=e[i];return s?s.includes(n):!0}):!0}var gt;(function(r){r.HARD="HARD",r.SOFT="SOFT"})(gt||(gt={}));var oi;(function(i){i.Dependency="Dependency",i.PeerDependency="PeerDependency",i.PeerDependencyMeta="PeerDependencyMeta"})(oi||(oi={}));var ki;(function(i){i.Inactive="inactive",i.Redundant="redundant",i.Active="active"})(ki||(ki={}));var Le={NO_HINT:"NO_HINT",NULL:"NULL",SCOPE:"SCOPE",NAME:"NAME",RANGE:"RANGE",REFERENCE:"REFERENCE",NUMBER:"NUMBER",PATH:"PATH",URL:"URL",ADDED:"ADDED",REMOVED:"REMOVED",CODE:"CODE",DURATION:"DURATION",SIZE:"SIZE",IDENT:"IDENT",DESCRIPTOR:"DESCRIPTOR",LOCATOR:"LOCATOR",RESOLUTION:"RESOLUTION",DEPENDENT:"DEPENDENT",PACKAGE_EXTENSION:"PACKAGE_EXTENSION",SETTING:"SETTING"},Gl;(function(e){e[e.BOLD=2]="BOLD"})(Gl||(Gl={}));var Tx=dp.default.GITHUB_ACTIONS?{level:2}:pp.default.supportsColor?{level:pp.default.supportsColor.level}:{level:0},xy=Tx.level!==0,Mx=xy&&!dp.default.GITHUB_ACTIONS&&!dp.default.CIRCLE&&!dp.default.GITLAB,Ox=new pp.default.Instance(Tx),tbe=new Map([[Le.NO_HINT,null],[Le.NULL,["#a853b5",129]],[Le.SCOPE,["#d75f00",166]],[Le.NAME,["#d7875f",173]],[Le.RANGE,["#00afaf",37]],[Le.REFERENCE,["#87afff",111]],[Le.NUMBER,["#ffd700",220]],[Le.PATH,["#d75fd7",170]],[Le.URL,["#d75fd7",170]],[Le.ADDED,["#5faf00",70]],[Le.REMOVED,["#d70000",160]],[Le.CODE,["#87afff",111]],[Le.SIZE,["#ffd700",220]]]),Ls=t=>t,ky={[Le.NUMBER]:Ls({pretty:(t,e)=>`${e}`,json:t=>t}),[Le.IDENT]:Ls({pretty:(t,e)=>Vr(t,e),json:t=>St(t)}),[Le.LOCATOR]:Ls({pretty:(t,e)=>lt(t,e),json:t=>is(t)}),[Le.DESCRIPTOR]:Ls({pretty:(t,e)=>Xt(t,e),json:t=>En(t)}),[Le.RESOLUTION]:Ls({pretty:(t,{descriptor:e,locator:r})=>Fx(t,e,r),json:({descriptor:t,locator:e})=>({descriptor:En(t),locator:e!==null?is(e):null})}),[Le.DEPENDENT]:Ls({pretty:(t,{locator:e,descriptor:r})=>Nx(t,e,r),json:({locator:t,descriptor:e})=>({locator:is(t),descriptor:En(e)})}),[Le.PACKAGE_EXTENSION]:Ls({pretty:(t,e)=>{switch(e.type){case oi.Dependency:return`${Vr(t,e.parentDescriptor)} \u27A4 ${On(t,"dependencies",Le.CODE)} \u27A4 ${Vr(t,e.descriptor)}`;case oi.PeerDependency:return`${Vr(t,e.parentDescriptor)} \u27A4 ${On(t,"peerDependencies",Le.CODE)} \u27A4 ${Vr(t,e.descriptor)}`;case oi.PeerDependencyMeta:return`${Vr(t,e.parentDescriptor)} \u27A4 ${On(t,"peerDependenciesMeta",Le.CODE)} \u27A4 ${Vr(t,In(e.selector))} \u27A4 ${On(t,e.key,Le.CODE)}`;default:throw new Error(`Assertion failed: Unsupported package extension type: ${e.type}`)}},json:t=>{switch(t.type){case oi.Dependency:return`${St(t.parentDescriptor)} > ${St(t.descriptor)}`;case oi.PeerDependency:return`${St(t.parentDescriptor)} >> ${St(t.descriptor)}`;case oi.PeerDependencyMeta:return`${St(t.parentDescriptor)} >> ${t.selector} / ${t.key}`;default:throw new Error(`Assertion failed: Unsupported package extension type: ${t.type}`)}}}),[Le.SETTING]:Ls({pretty:(t,e)=>(t.get(e),Ku(t,On(t,e,Le.CODE),`https://yarnpkg.com/configuration/yarnrc#${e}`)),json:t=>t}),[Le.DURATION]:Ls({pretty:(t,e)=>{if(e>1e3*60){let r=Math.floor(e/1e3/60),i=Math.ceil((e-r*60*1e3)/1e3);return i===0?`${r}m`:`${r}m ${i}s`}else{let r=Math.floor(e/1e3),i=e-r*1e3;return i===0?`${r}s`:`${r}s ${i}ms`}},json:t=>t}),[Le.SIZE]:Ls({pretty:(t,e)=>{let r=["KB","MB","GB","TB"],i=r.length;for(;i>1&&e<1024**i;)i-=1;let n=1024**i,s=Math.floor(e*100/n)/100;return On(t,`${s} ${r[i-1]}`,Le.NUMBER)},json:t=>t}),[Le.PATH]:Ls({pretty:(t,e)=>On(t,M.fromPortablePath(e),Le.PATH),json:t=>M.fromPortablePath(t)})};function jl(t,e){return[e,t]}function Py(t,e,r){return t.get("enableColors")&&r&2&&(e=pp.default.bold(e)),e}function On(t,e,r){if(!t.get("enableColors"))return e;let i=tbe.get(r);if(i===null)return e;let n=typeof i=="undefined"?r:Tx.level>=3?i[0]:i[1],s=typeof n=="number"?Ox.ansi256(n):n.startsWith("#")?Ox.hex(n):Ox[n];if(typeof s!="function")throw new Error(`Invalid format type ${n}`);return s(e)}var rbe=!!process.env.KONSOLE_VERSION;function Ku(t,e,r){return t.get("enableHyperlinks")?rbe?`]8;;${r}\\${e}]8;;\\`:`]8;;${r}\x07${e}]8;;\x07`:e}function Ve(t,e,r){if(e===null)return On(t,"null",Le.NULL);if(Object.prototype.hasOwnProperty.call(ky,r))return ky[r].pretty(t,e);if(typeof e!="string")throw new Error(`Assertion failed: Expected the value to be a string, got ${typeof e}`);return On(t,e,r)}function Kx(t,e,r,{separator:i=", "}={}){return[...e].map(n=>Ve(t,n,r)).join(i)}function Uu(t,e){if(t===null)return null;if(Object.prototype.hasOwnProperty.call(ky,e))return Nv(e),ky[e].json(t);if(typeof t!="string")throw new Error(`Assertion failed: Expected the value to be a string, got ${typeof t}`);return t}function xx(t){return{Check:On(t,"\u2713","green"),Cross:On(t,"\u2718","red"),Question:On(t,"?","cyan")}}function Yl(t,{label:e,value:[r,i]}){return`${Ve(t,e,Le.CODE)}: ${Ve(t,r,i)}`}var Ts;(function(n){n.Error="error",n.Warning="warning",n.Info="info",n.Discard="discard"})(Ts||(Ts={}));function Cp(t,{configuration:e}){let r=e.get("logFilters"),i=new Map,n=new Map,s=[];for(let g of r){let f=g.get("level");if(typeof f=="undefined")continue;let h=g.get("code");typeof h!="undefined"&&i.set(h,f);let p=g.get("text");typeof p!="undefined"&&n.set(p,f);let d=g.get("pattern");typeof d!="undefined"&&s.push([o3.default.matcher(d,{contains:!0}),f])}s.reverse();let o=(g,f,h)=>{if(g===null||g===z.UNNAMED)return h;let p=n.size>0||s.length>0?(0,a3.default)(f):f;if(n.size>0){let d=n.get(p);if(typeof d!="undefined")return d!=null?d:h}if(s.length>0){for(let[d,m]of s)if(d(p))return m!=null?m:h}if(i.size>0){let d=i.get(KI(g));if(typeof d!="undefined")return d!=null?d:h}return h},a=t.reportInfo,l=t.reportWarning,c=t.reportError,u=function(g,f,h,p){switch(o(f,h,p)){case Ts.Info:a.call(g,f,h);break;case Ts.Warning:l.call(g,f!=null?f:z.UNNAMED,h);break;case Ts.Error:c.call(g,f!=null?f:z.UNNAMED,h);break}};t.reportInfo=function(...g){return u(this,...g,Ts.Info)},t.reportWarning=function(...g){return u(this,...g,Ts.Warning)},t.reportError=function(...g){return u(this,...g,Ts.Error)}}var Zt={};it(Zt,{Method:()=>Jl,RequestError:()=>z8.RequestError,del:()=>pxe,get:()=>fxe,getNetworkSettings:()=>Z8,post:()=>iP,put:()=>hxe,request:()=>xp});var q8=ie(zy()),J8=ie(require("https")),W8=ie(require("http")),tP=ie(Nn()),rP=ie(G8()),Vy=ie(require("url"));var j8=ie(require("stream")),Y8=ie(require("string_decoder"));var nt=class extends Error{constructor(e,r,i){super(r);this.reportExtra=i;this.reportCode=e}};function Axe(t){return typeof t.reportCode!="undefined"}var Xi=class{constructor(){this.reportedInfos=new Set;this.reportedWarnings=new Set;this.reportedErrors=new Set}static progressViaCounter(e){let r=0,i,n=new Promise(l=>{i=l}),s=l=>{let c=i;n=new Promise(u=>{i=u}),r=l,c()},o=(l=0)=>{s(r+1)},a=async function*(){for(;r{let o=i.write(s),a;do if(a=o.indexOf(` +`),a!==-1){let l=n+o.substr(0,a);o=o.substr(a+1),n="",e!==null?this.reportInfo(null,`${e} ${l}`):this.reportInfo(null,l)}while(a!==-1);n+=o}),r.on("end",()=>{let s=i.end();s!==""&&(e!==null?this.reportInfo(null,`${e} ${s}`):this.reportInfo(null,s))}),r}};var z8=ie(zy()),V8=new Map,_8=new Map,lxe=new W8.Agent({keepAlive:!0}),cxe=new J8.Agent({keepAlive:!0});function X8(t){let e=new Vy.URL(t),r={host:e.hostname,headers:{}};return e.port&&(r.port=Number(e.port)),{proxy:r}}async function uxe(t){return na(_8,t,()=>T.readFilePromise(t).then(e=>(_8.set(t,e),e)))}function gxe({statusCode:t,statusMessage:e},r){let i=Ve(r,t,Le.NUMBER),n=`https://developer.mozilla.org/en-US/docs/Web/HTTP/Status/${t}`;return Ku(r,`${i}${e?` (${e})`:""}`,n)}async function _y(t,{configuration:e,customErrorMessage:r}){var i,n;try{return await t}catch(s){if(s.name!=="HTTPError")throw s;let o=(n=r==null?void 0:r(s))!=null?n:(i=s.response.body)==null?void 0:i.error;o==null&&(s.message.startsWith("Response code")?o="The remote server failed to provide the requested resource":o=s.message),s instanceof q8.TimeoutError&&s.event==="socket"&&(o+=`(can be increased via ${Ve(e,"httpTimeout",Le.SETTING)})`);let a=new nt(z.NETWORK_ERROR,o,l=>{s.response&&l.reportError(z.NETWORK_ERROR,` ${Yl(e,{label:"Response Code",value:jl(Le.NO_HINT,gxe(s.response,e))})}`),s.request&&(l.reportError(z.NETWORK_ERROR,` ${Yl(e,{label:"Request Method",value:jl(Le.NO_HINT,s.request.options.method)})}`),l.reportError(z.NETWORK_ERROR,` ${Yl(e,{label:"Request URL",value:jl(Le.URL,s.request.requestUrl)})}`)),s.request.redirects.length>0&&l.reportError(z.NETWORK_ERROR,` ${Yl(e,{label:"Request Redirects",value:jl(Le.NO_HINT,Kx(e,s.request.redirects,Le.URL))})}`),s.request.retryCount===s.request.options.retry.limit&&l.reportError(z.NETWORK_ERROR,` ${Yl(e,{label:"Request Retry Count",value:jl(Le.NO_HINT,`${Ve(e,s.request.retryCount,Le.NUMBER)} (can be increased via ${Ve(e,"httpRetry",Le.SETTING)})`)})}`)});throw a.originalError=s,a}}function Z8(t,e){let r=[...e.configuration.get("networkSettings")].sort(([o],[a])=>a.length-o.length),i={enableNetwork:void 0,caFilePath:void 0,httpProxy:void 0,httpsProxy:void 0},n=Object.keys(i),s=typeof t=="string"?new Vy.URL(t):t;for(let[o,a]of r)if(tP.default.isMatch(s.hostname,o))for(let l of n){let c=a.get(l);c!==null&&typeof i[l]=="undefined"&&(i[l]=c)}for(let o of n)typeof i[o]=="undefined"&&(i[o]=e.configuration.get(o));return i}var Jl;(function(n){n.GET="GET",n.PUT="PUT",n.POST="POST",n.DELETE="DELETE"})(Jl||(Jl={}));async function xp(t,e,{configuration:r,headers:i,jsonRequest:n,jsonResponse:s,method:o=Jl.GET}){let a=typeof t=="string"?new Vy.URL(t):t,l=Z8(a,{configuration:r});if(l.enableNetwork===!1)throw new Error(`Request to '${a.href}' has been blocked because of your configuration settings`);if(a.protocol==="http:"&&!tP.default.isMatch(a.hostname,r.get("unsafeHttpWhitelist")))throw new Error(`Unsafe http requests must be explicitly whitelisted in your configuration (${a.hostname})`);let u={agent:{http:l.httpProxy?rP.default.httpOverHttp(X8(l.httpProxy)):lxe,https:l.httpsProxy?rP.default.httpsOverHttp(X8(l.httpsProxy)):cxe},headers:i,method:o};u.responseType=s?"json":"buffer",e!==null&&(Buffer.isBuffer(e)||!n&&typeof e=="string"?u.body=e:u.json=e);let g=r.get("httpTimeout"),f=r.get("httpRetry"),h=r.get("enableStrictSsl"),p=l.caFilePath,{default:d}=await Promise.resolve().then(()=>ie(zy())),m=p?await uxe(p):void 0,E=d.extend(P({timeout:{socket:g},retry:f,https:{rejectUnauthorized:h,certificateAuthority:m}},u));return r.getLimit("networkConcurrency")(()=>E(a))}async function fxe(t,n){var s=n,{configuration:e,jsonResponse:r}=s,i=qr(s,["configuration","jsonResponse"]);let o=na(V8,t,()=>_y(xp(t,null,P({configuration:e},i)),{configuration:e}).then(a=>(V8.set(t,a.body),a.body)));return Buffer.isBuffer(o)===!1&&(o=await o),r?JSON.parse(o.toString()):o}async function hxe(t,e,n){var s=n,{customErrorMessage:r}=s,i=qr(s,["customErrorMessage"]);return(await _y(xp(t,e,_(P({},i),{method:Jl.PUT})),i)).body}async function iP(t,e,n){var s=n,{customErrorMessage:r}=s,i=qr(s,["customErrorMessage"]);return(await _y(xp(t,e,_(P({},i),{method:Jl.POST})),i)).body}async function pxe(t,i){var n=i,{customErrorMessage:e}=n,r=qr(n,["customErrorMessage"]);return(await _y(xp(t,null,_(P({},r),{method:Jl.DELETE})),r)).body}var Kt={};it(Kt,{PackageManager:()=>tn,detectPackageManager:()=>a9,executePackageAccessibleBinary:()=>g9,executePackageScript:()=>Uw,executePackageShellcode:()=>rD,executeWorkspaceAccessibleBinary:()=>qFe,executeWorkspaceLifecycleScript:()=>u9,executeWorkspaceScript:()=>c9,getPackageAccessibleBinaries:()=>Hw,getWorkspaceAccessibleBinaries:()=>l9,hasPackageScript:()=>GFe,hasWorkspaceScript:()=>tD,makeScriptEnv:()=>Vp,maybeExecuteWorkspaceLifecycleScript:()=>YFe,prepareExternalProject:()=>HFe});var Fp={};it(Fp,{getLibzipPromise:()=>$i,getLibzipSync:()=>vz});var yA=["number","number"],nP;(function(D){D[D.ZIP_ER_OK=0]="ZIP_ER_OK",D[D.ZIP_ER_MULTIDISK=1]="ZIP_ER_MULTIDISK",D[D.ZIP_ER_RENAME=2]="ZIP_ER_RENAME",D[D.ZIP_ER_CLOSE=3]="ZIP_ER_CLOSE",D[D.ZIP_ER_SEEK=4]="ZIP_ER_SEEK",D[D.ZIP_ER_READ=5]="ZIP_ER_READ",D[D.ZIP_ER_WRITE=6]="ZIP_ER_WRITE",D[D.ZIP_ER_CRC=7]="ZIP_ER_CRC",D[D.ZIP_ER_ZIPCLOSED=8]="ZIP_ER_ZIPCLOSED",D[D.ZIP_ER_NOENT=9]="ZIP_ER_NOENT",D[D.ZIP_ER_EXISTS=10]="ZIP_ER_EXISTS",D[D.ZIP_ER_OPEN=11]="ZIP_ER_OPEN",D[D.ZIP_ER_TMPOPEN=12]="ZIP_ER_TMPOPEN",D[D.ZIP_ER_ZLIB=13]="ZIP_ER_ZLIB",D[D.ZIP_ER_MEMORY=14]="ZIP_ER_MEMORY",D[D.ZIP_ER_CHANGED=15]="ZIP_ER_CHANGED",D[D.ZIP_ER_COMPNOTSUPP=16]="ZIP_ER_COMPNOTSUPP",D[D.ZIP_ER_EOF=17]="ZIP_ER_EOF",D[D.ZIP_ER_INVAL=18]="ZIP_ER_INVAL",D[D.ZIP_ER_NOZIP=19]="ZIP_ER_NOZIP",D[D.ZIP_ER_INTERNAL=20]="ZIP_ER_INTERNAL",D[D.ZIP_ER_INCONS=21]="ZIP_ER_INCONS",D[D.ZIP_ER_REMOVE=22]="ZIP_ER_REMOVE",D[D.ZIP_ER_DELETED=23]="ZIP_ER_DELETED",D[D.ZIP_ER_ENCRNOTSUPP=24]="ZIP_ER_ENCRNOTSUPP",D[D.ZIP_ER_RDONLY=25]="ZIP_ER_RDONLY",D[D.ZIP_ER_NOPASSWD=26]="ZIP_ER_NOPASSWD",D[D.ZIP_ER_WRONGPASSWD=27]="ZIP_ER_WRONGPASSWD",D[D.ZIP_ER_OPNOTSUPP=28]="ZIP_ER_OPNOTSUPP",D[D.ZIP_ER_INUSE=29]="ZIP_ER_INUSE",D[D.ZIP_ER_TELL=30]="ZIP_ER_TELL",D[D.ZIP_ER_COMPRESSED_DATA=31]="ZIP_ER_COMPRESSED_DATA"})(nP||(nP={}));var $8=t=>({get HEAP8(){return t.HEAP8},get HEAPU8(){return t.HEAPU8},errors:nP,SEEK_SET:0,SEEK_CUR:1,SEEK_END:2,ZIP_CHECKCONS:4,ZIP_CREATE:1,ZIP_EXCL:2,ZIP_TRUNCATE:8,ZIP_RDONLY:16,ZIP_FL_OVERWRITE:8192,ZIP_FL_COMPRESSED:4,ZIP_OPSYS_DOS:0,ZIP_OPSYS_AMIGA:1,ZIP_OPSYS_OPENVMS:2,ZIP_OPSYS_UNIX:3,ZIP_OPSYS_VM_CMS:4,ZIP_OPSYS_ATARI_ST:5,ZIP_OPSYS_OS_2:6,ZIP_OPSYS_MACINTOSH:7,ZIP_OPSYS_Z_SYSTEM:8,ZIP_OPSYS_CPM:9,ZIP_OPSYS_WINDOWS_NTFS:10,ZIP_OPSYS_MVS:11,ZIP_OPSYS_VSE:12,ZIP_OPSYS_ACORN_RISC:13,ZIP_OPSYS_VFAT:14,ZIP_OPSYS_ALTERNATE_MVS:15,ZIP_OPSYS_BEOS:16,ZIP_OPSYS_TANDEM:17,ZIP_OPSYS_OS_400:18,ZIP_OPSYS_OS_X:19,ZIP_CM_DEFAULT:-1,ZIP_CM_STORE:0,ZIP_CM_DEFLATE:8,uint08S:t._malloc(1),uint16S:t._malloc(2),uint32S:t._malloc(4),uint64S:t._malloc(8),malloc:t._malloc,free:t._free,getValue:t.getValue,open:t.cwrap("zip_open","number",["string","number","number"]),openFromSource:t.cwrap("zip_open_from_source","number",["number","number","number"]),close:t.cwrap("zip_close","number",["number"]),discard:t.cwrap("zip_discard",null,["number"]),getError:t.cwrap("zip_get_error","number",["number"]),getName:t.cwrap("zip_get_name","string",["number","number","number"]),getNumEntries:t.cwrap("zip_get_num_entries","number",["number","number"]),delete:t.cwrap("zip_delete","number",["number","number"]),stat:t.cwrap("zip_stat","number",["number","string","number","number"]),statIndex:t.cwrap("zip_stat_index","number",["number",...yA,"number","number"]),fopen:t.cwrap("zip_fopen","number",["number","string","number"]),fopenIndex:t.cwrap("zip_fopen_index","number",["number",...yA,"number"]),fread:t.cwrap("zip_fread","number",["number","number","number","number"]),fclose:t.cwrap("zip_fclose","number",["number"]),dir:{add:t.cwrap("zip_dir_add","number",["number","string"])},file:{add:t.cwrap("zip_file_add","number",["number","string","number","number"]),getError:t.cwrap("zip_file_get_error","number",["number"]),getExternalAttributes:t.cwrap("zip_file_get_external_attributes","number",["number",...yA,"number","number","number"]),setExternalAttributes:t.cwrap("zip_file_set_external_attributes","number",["number",...yA,"number","number","number"]),setMtime:t.cwrap("zip_file_set_mtime","number",["number",...yA,"number","number"]),setCompression:t.cwrap("zip_set_file_compression","number",["number",...yA,"number","number"])},ext:{countSymlinks:t.cwrap("zip_ext_count_symlinks","number",["number"])},error:{initWithCode:t.cwrap("zip_error_init_with_code",null,["number","number"]),strerror:t.cwrap("zip_error_strerror","string",["number"])},name:{locate:t.cwrap("zip_name_locate","number",["number","string","number"])},source:{fromUnattachedBuffer:t.cwrap("zip_source_buffer_create","number",["number","number","number","number"]),fromBuffer:t.cwrap("zip_source_buffer","number",["number","number",...yA,"number"]),free:t.cwrap("zip_source_free",null,["number"]),keep:t.cwrap("zip_source_keep",null,["number"]),open:t.cwrap("zip_source_open","number",["number"]),close:t.cwrap("zip_source_close","number",["number"]),seek:t.cwrap("zip_source_seek","number",["number",...yA,"number"]),tell:t.cwrap("zip_source_tell","number",["number"]),read:t.cwrap("zip_source_read","number",["number","number","number"]),error:t.cwrap("zip_source_error","number",["number"]),setMtime:t.cwrap("zip_source_set_mtime","number",["number","number"])},struct:{stat:t.cwrap("zipstruct_stat","number",[]),statS:t.cwrap("zipstruct_statS","number",[]),statName:t.cwrap("zipstruct_stat_name","string",["number"]),statIndex:t.cwrap("zipstruct_stat_index","number",["number"]),statSize:t.cwrap("zipstruct_stat_size","number",["number"]),statCompSize:t.cwrap("zipstruct_stat_comp_size","number",["number"]),statCompMethod:t.cwrap("zipstruct_stat_comp_method","number",["number"]),statMtime:t.cwrap("zipstruct_stat_mtime","number",["number"]),statCrc:t.cwrap("zipstruct_stat_crc","number",["number"]),error:t.cwrap("zipstruct_error","number",[]),errorS:t.cwrap("zipstruct_errorS","number",[]),errorCodeZip:t.cwrap("zipstruct_error_code_zip","number",["number"])}});var BP=null;function vz(){return BP===null&&(BP=$8(bz())),BP}async function $i(){return vz()}var jp={};it(jp,{ShellError:()=>as,execute:()=>Fw,globUtils:()=>bw});var Hp={};it(Hp,{parseResolution:()=>gw,parseShell:()=>Aw,parseSyml:()=>Ei,stringifyArgument:()=>SP,stringifyArgumentSegment:()=>xP,stringifyArithmeticExpression:()=>uw,stringifyCommand:()=>vP,stringifyCommandChain:()=>rg,stringifyCommandChainThen:()=>bP,stringifyCommandLine:()=>lw,stringifyCommandLineThen:()=>QP,stringifyEnvSegment:()=>cw,stringifyRedirectArgument:()=>Np,stringifyResolution:()=>fw,stringifyShell:()=>tg,stringifyShellLine:()=>tg,stringifySyml:()=>Qa,stringifyValueArgument:()=>ig});var kz=ie(xz());function Aw(t,e={isGlobPattern:()=>!1}){try{return(0,kz.parse)(t,e)}catch(r){throw r.location&&(r.message=r.message.replace(/(\.)?$/,` (line ${r.location.start.line}, column ${r.location.start.column})$1`)),r}}function tg(t,{endSemicolon:e=!1}={}){return t.map(({command:r,type:i},n)=>`${lw(r)}${i===";"?n!==t.length-1||e?";":"":" &"}`).join(" ")}function lw(t){return`${rg(t.chain)}${t.then?` ${QP(t.then)}`:""}`}function QP(t){return`${t.type} ${lw(t.line)}`}function rg(t){return`${vP(t)}${t.then?` ${bP(t.then)}`:""}`}function bP(t){return`${t.type} ${rg(t.chain)}`}function vP(t){switch(t.type){case"command":return`${t.envs.length>0?`${t.envs.map(e=>cw(e)).join(" ")} `:""}${t.args.map(e=>SP(e)).join(" ")}`;case"subshell":return`(${tg(t.subshell)})${t.args.length>0?` ${t.args.map(e=>Np(e)).join(" ")}`:""}`;case"group":return`{ ${tg(t.group,{endSemicolon:!0})} }${t.args.length>0?` ${t.args.map(e=>Np(e)).join(" ")}`:""}`;case"envs":return t.envs.map(e=>cw(e)).join(" ");default:throw new Error(`Unsupported command type: "${t.type}"`)}}function cw(t){return`${t.name}=${t.args[0]?ig(t.args[0]):""}`}function SP(t){switch(t.type){case"redirection":return Np(t);case"argument":return ig(t);default:throw new Error(`Unsupported argument type: "${t.type}"`)}}function Np(t){return`${t.subtype} ${t.args.map(e=>ig(e)).join(" ")}`}function ig(t){return t.segments.map(e=>xP(e)).join("")}function xP(t){let e=(i,n)=>n?`"${i}"`:i,r=i=>i===""?'""':i.match(/[(){}<>$|&; \t"']/)?`$'${i.replace(/\\/g,"\\\\").replace(/'/g,"\\'").replace(/\f/g,"\\f").replace(/\n/g,"\\n").replace(/\r/g,"\\r").replace(/\t/g,"\\t").replace(/\v/g,"\\v").replace(/\0/g,"\\0")}'`:i;switch(t.type){case"text":return r(t.text);case"glob":return t.pattern;case"shell":return e(`\${${tg(t.shell)}}`,t.quoted);case"variable":return e(typeof t.defaultValue=="undefined"?`\${${t.name}}`:t.defaultValue.length===0?`\${${t.name}:-}`:`\${${t.name}:-${t.defaultValue.map(i=>ig(i)).join(" ")}}`,t.quoted);case"arithmetic":return`$(( ${uw(t.arithmetic)} ))`;default:throw new Error(`Unsupported argument segment type: "${t.type}"`)}}function uw(t){let e=n=>{switch(n){case"addition":return"+";case"subtraction":return"-";case"multiplication":return"*";case"division":return"/";default:throw new Error(`Can't extract operator from arithmetic expression of type "${n}"`)}},r=(n,s)=>s?`( ${n} )`:n,i=n=>r(uw(n),!["number","variable"].includes(n.type));switch(t.type){case"number":return String(t.value);case"variable":return t.name;default:return`${i(t.left)} ${e(t.type)} ${i(t.right)}`}}var Rz=ie(Dz());function gw(t){let e=t.match(/^\*{1,2}\/(.*)/);if(e)throw new Error(`The override for '${t}' includes a glob pattern. Glob patterns have been removed since their behaviours don't match what you'd expect. Set the override to '${e[1]}' instead.`);try{return(0,Rz.parse)(t)}catch(r){throw r.location&&(r.message=r.message.replace(/(\.)?$/,` (line ${r.location.start.line}, column ${r.location.start.column})$1`)),r}}function fw(t){let e="";return t.from&&(e+=t.from.fullName,t.from.description&&(e+=`@${t.from.description}`),e+="/"),e+=t.descriptor.fullName,t.descriptor.description&&(e+=`@${t.descriptor.description}`),e}var Qw=ie(w5()),b5=ie(Q5()),$De=/^(?![-?:,\][{}#&*!|>'"%@` \t\r\n]).([ \t]*(?![,\][{}:# \t\r\n]).)*$/,v5=["__metadata","version","resolution","dependencies","peerDependencies","dependenciesMeta","peerDependenciesMeta","binaries"],HP=class{constructor(e){this.data=e}};function S5(t){return t.match($De)?t:JSON.stringify(t)}function x5(t){return typeof t=="undefined"?!0:typeof t=="object"&&t!==null?Object.keys(t).every(e=>x5(t[e])):!1}function GP(t,e,r){if(t===null)return`null +`;if(typeof t=="number"||typeof t=="boolean")return`${t.toString()} +`;if(typeof t=="string")return`${S5(t)} +`;if(Array.isArray(t)){if(t.length===0)return`[] +`;let i=" ".repeat(e);return` +${t.map(s=>`${i}- ${GP(s,e+1,!1)}`).join("")}`}if(typeof t=="object"&&t){let i,n;t instanceof HP?(i=t.data,n=!1):(i=t,n=!0);let s=" ".repeat(e),o=Object.keys(i);n&&o.sort((l,c)=>{let u=v5.indexOf(l),g=v5.indexOf(c);return u===-1&&g===-1?lc?1:0:u!==-1&&g===-1?-1:u===-1&&g!==-1?1:u-g});let a=o.filter(l=>!x5(i[l])).map((l,c)=>{let u=i[l],g=S5(l),f=GP(u,e+1,!0),h=c>0||r?s:"";return f.startsWith(` +`)?`${h}${g}:${f}`:`${h}${g}: ${f}`}).join(e===0?` +`:"")||` +`;return r?` +${a}`:`${a}`}throw new Error(`Unsupported value type (${t})`)}function Qa(t){try{let e=GP(t,0,!1);return e!==` +`?e:""}catch(e){throw e.location&&(e.message=e.message.replace(/(\.)?$/,` (line ${e.location.start.line}, column ${e.location.start.column})$1`)),e}}Qa.PreserveOrdering=HP;function eRe(t){return t.endsWith(` +`)||(t+=` +`),(0,b5.parse)(t)}var tRe=/^(#.*(\r?\n))*?#\s+yarn\s+lockfile\s+v1\r?\n/i;function rRe(t){if(tRe.test(t))return eRe(t);let e=(0,Qw.safeLoad)(t,{schema:Qw.FAILSAFE_SCHEMA,json:!0});if(e==null)return{};if(typeof e!="object")throw new Error(`Expected an indexed object, got a ${typeof e} instead. Does your file follow Yaml's rules?`);if(Array.isArray(e))throw new Error("Expected an indexed object, got an array instead. Does your file follow Yaml's rules?");return e}function Ei(t){return rRe(t)}var U5=ie(jb()),H5=ie(require("os")),Kn=ie(require("stream")),G5=ie(require("util"));var as=class extends Error{constructor(e){super(e);this.name="ShellError"}};var bw={};it(bw,{fastGlobOptions:()=>D5,isBraceExpansion:()=>R5,isGlobPattern:()=>iRe,match:()=>nRe,micromatchOptions:()=>Sw});var k5=ie(gy()),P5=ie(require("fs")),vw=ie(Nn()),Sw={strictBrackets:!0},D5={onlyDirectories:!1,onlyFiles:!1};function iRe(t){if(!vw.default.scan(t,Sw).isGlob)return!1;try{vw.default.parse(t,Sw)}catch{return!1}return!0}function nRe(t,{cwd:e,baseFs:r}){return(0,k5.default)(t,_(P({},D5),{cwd:M.fromPortablePath(e),fs:SI(P5.default,new ah(r))}))}function R5(t){return vw.default.scan(t,Sw).isBrace}var F5=ie(bb()),Bo=ie(require("stream")),N5=ie(require("string_decoder")),wn;(function(i){i[i.STDIN=0]="STDIN",i[i.STDOUT=1]="STDOUT",i[i.STDERR=2]="STDERR"})(wn||(wn={}));var sc=new Set;function jP(){}function YP(){for(let t of sc)t.kill()}function L5(t,e,r,i){return n=>{let s=n[0]instanceof Bo.Transform?"pipe":n[0],o=n[1]instanceof Bo.Transform?"pipe":n[1],a=n[2]instanceof Bo.Transform?"pipe":n[2],l=(0,F5.default)(t,e,_(P({},i),{stdio:[s,o,a]}));return sc.add(l),sc.size===1&&(process.on("SIGINT",jP),process.on("SIGTERM",YP)),n[0]instanceof Bo.Transform&&n[0].pipe(l.stdin),n[1]instanceof Bo.Transform&&l.stdout.pipe(n[1],{end:!1}),n[2]instanceof Bo.Transform&&l.stderr.pipe(n[2],{end:!1}),{stdin:l.stdin,promise:new Promise(c=>{l.on("error",u=>{switch(sc.delete(l),sc.size===0&&(process.off("SIGINT",jP),process.off("SIGTERM",YP)),u.code){case"ENOENT":n[2].write(`command not found: ${t} +`),c(127);break;case"EACCES":n[2].write(`permission denied: ${t} +`),c(128);break;default:n[2].write(`uncaught error: ${u.message} +`),c(1);break}}),l.on("exit",u=>{sc.delete(l),sc.size===0&&(process.off("SIGINT",jP),process.off("SIGTERM",YP)),c(u!==null?u:129)})})}}}function T5(t){return e=>{let r=e[0]==="pipe"?new Bo.PassThrough:e[0];return{stdin:r,promise:Promise.resolve().then(()=>t({stdin:r,stdout:e[1],stderr:e[2]}))}}}var Os=class{constructor(e){this.stream=e}close(){}get(){return this.stream}},M5=class{constructor(){this.stream=null}close(){if(this.stream===null)throw new Error("Assertion failed: No stream attached");this.stream.end()}attach(e){this.stream=e}get(){if(this.stream===null)throw new Error("Assertion failed: No stream attached");return this.stream}},Gp=class{constructor(e,r){this.stdin=null;this.stdout=null;this.stderr=null;this.pipe=null;this.ancestor=e,this.implementation=r}static start(e,{stdin:r,stdout:i,stderr:n}){let s=new Gp(null,e);return s.stdin=r,s.stdout=i,s.stderr=n,s}pipeTo(e,r=1){let i=new Gp(this,e),n=new M5;return i.pipe=n,i.stdout=this.stdout,i.stderr=this.stderr,(r&1)==1?this.stdout=n:this.ancestor!==null&&(this.stderr=this.ancestor.stdout),(r&2)==2?this.stderr=n:this.ancestor!==null&&(this.stderr=this.ancestor.stderr),i}async exec(){let e=["ignore","ignore","ignore"];if(this.pipe)e[0]="pipe";else{if(this.stdin===null)throw new Error("Assertion failed: No input stream registered");e[0]=this.stdin.get()}let r;if(this.stdout===null)throw new Error("Assertion failed: No output stream registered");r=this.stdout,e[1]=r.get();let i;if(this.stderr===null)throw new Error("Assertion failed: No error stream registered");i=this.stderr,e[2]=i.get();let n=this.implementation(e);return this.pipe&&this.pipe.attach(n.stdin),await n.promise.then(s=>(r.close(),i.close(),s))}async run(){let e=[];for(let i=this;i;i=i.ancestor)e.push(i.exec());return(await Promise.all(e))[0]}};function xw(t,e){return Gp.start(t,e)}function O5(t,e=null){let r=new Bo.PassThrough,i=new N5.StringDecoder,n="";return r.on("data",s=>{let o=i.write(s),a;do if(a=o.indexOf(` +`),a!==-1){let l=n+o.substr(0,a);o=o.substr(a+1),n="",t(e!==null?`${e} ${l}`:l)}while(a!==-1);n+=o}),r.on("end",()=>{let s=i.end();s!==""&&t(e!==null?`${e} ${s}`:s)}),r}function K5(t,{prefix:e}){return{stdout:O5(r=>t.stdout.write(`${r} +`),t.stdout.isTTY?e:null),stderr:O5(r=>t.stderr.write(`${r} +`),t.stderr.isTTY?e:null)}}var sRe=(0,G5.promisify)(setTimeout);var Fi;(function(r){r[r.Readable=1]="Readable",r[r.Writable=2]="Writable"})(Fi||(Fi={}));function j5(t,e,r){let i=new Kn.PassThrough({autoDestroy:!0});switch(t){case wn.STDIN:(e&1)==1&&r.stdin.pipe(i,{end:!1}),(e&2)==2&&r.stdin instanceof Kn.Writable&&i.pipe(r.stdin,{end:!1});break;case wn.STDOUT:(e&1)==1&&r.stdout.pipe(i,{end:!1}),(e&2)==2&&i.pipe(r.stdout,{end:!1});break;case wn.STDERR:(e&1)==1&&r.stderr.pipe(i,{end:!1}),(e&2)==2&&i.pipe(r.stderr,{end:!1});break;default:throw new as(`Bad file descriptor: "${t}"`)}return i}function kw(t,e={}){let r=P(P({},t),e);return r.environment=P(P({},t.environment),e.environment),r.variables=P(P({},t.variables),e.variables),r}var oRe=new Map([["cd",async([t=(0,H5.homedir)(),...e],r,i)=>{let n=v.resolve(i.cwd,M.toPortablePath(t));if(!(await r.baseFs.statPromise(n).catch(o=>{throw o.code==="ENOENT"?new as(`cd: no such file or directory: ${t}`):o})).isDirectory())throw new as(`cd: not a directory: ${t}`);return i.cwd=n,0}],["pwd",async(t,e,r)=>(r.stdout.write(`${M.fromPortablePath(r.cwd)} +`),0)],[":",async(t,e,r)=>0],["true",async(t,e,r)=>0],["false",async(t,e,r)=>1],["exit",async([t,...e],r,i)=>i.exitCode=parseInt(t!=null?t:i.variables["?"],10)],["echo",async(t,e,r)=>(r.stdout.write(`${t.join(" ")} +`),0)],["sleep",async([t],e,r)=>{if(typeof t=="undefined")throw new as("sleep: missing operand");let i=Number(t);if(Number.isNaN(i))throw new as(`sleep: invalid time interval '${t}'`);return await sRe(1e3*i,0)}],["__ysh_run_procedure",async(t,e,r)=>{let i=r.procedures[t[0]];return await xw(i,{stdin:new Os(r.stdin),stdout:new Os(r.stdout),stderr:new Os(r.stderr)}).run()}],["__ysh_set_redirects",async(t,e,r)=>{let i=r.stdin,n=r.stdout,s=r.stderr,o=[],a=[],l=[],c=0;for(;t[c]!=="--";){let g=t[c++],{type:f,fd:h}=JSON.parse(g),p=B=>{switch(h){case null:case 0:o.push(B);break;default:throw new Error(`Unsupported file descriptor: "${h}"`)}},d=B=>{switch(h){case null:case 1:a.push(B);break;case 2:l.push(B);break;default:throw new Error(`Unsupported file descriptor: "${h}"`)}},m=Number(t[c++]),E=c+m;for(let B=c;Be.baseFs.createReadStream(v.resolve(r.cwd,M.toPortablePath(t[B]))));break;case"<<<":p(()=>{let b=new Kn.PassThrough;return process.nextTick(()=>{b.write(`${t[B]} +`),b.end()}),b});break;case"<&":p(()=>j5(Number(t[B]),1,r));break;case">":case">>":{let b=v.resolve(r.cwd,M.toPortablePath(t[B]));d(b==="/dev/null"?new Kn.Writable({autoDestroy:!0,emitClose:!0,write(R,H,L){setImmediate(L)}}):e.baseFs.createWriteStream(b,f===">>"?{flags:"a"}:void 0))}break;case">&":d(j5(Number(t[B]),2,r));break;default:throw new Error(`Assertion failed: Unsupported redirection type: "${f}"`)}}if(o.length>0){let g=new Kn.PassThrough;i=g;let f=h=>{if(h===o.length)g.end();else{let p=o[h]();p.pipe(g,{end:!1}),p.on("end",()=>{f(h+1)})}};f(0)}if(a.length>0){let g=new Kn.PassThrough;n=g;for(let f of a)g.pipe(f)}if(l.length>0){let g=new Kn.PassThrough;s=g;for(let f of l)g.pipe(f)}let u=await xw(Yp(t.slice(c+1),e,r),{stdin:new Os(i),stdout:new Os(n),stderr:new Os(s)}).run();return await Promise.all(a.map(g=>new Promise((f,h)=>{g.on("error",p=>{h(p)}),g.on("close",()=>{f()}),g.end()}))),await Promise.all(l.map(g=>new Promise((f,h)=>{g.on("error",p=>{h(p)}),g.on("close",()=>{f()}),g.end()}))),u}]]);async function aRe(t,e,r){let i=[],n=new Kn.PassThrough;return n.on("data",s=>i.push(s)),await Pw(t,e,kw(r,{stdout:n})),Buffer.concat(i).toString().replace(/[\r\n]+$/,"")}async function Y5(t,e,r){let i=t.map(async s=>{let o=await oc(s.args,e,r);return{name:s.name,value:o.join(" ")}});return(await Promise.all(i)).reduce((s,o)=>(s[o.name]=o.value,s),{})}function Dw(t){return t.match(/[^ \r\n\t]+/g)||[]}async function q5(t,e,r,i,n=i){switch(t.name){case"$":i(String(process.pid));break;case"#":i(String(e.args.length));break;case"@":if(t.quoted)for(let s of e.args)n(s);else for(let s of e.args){let o=Dw(s);for(let a=0;a=0&&st+e,subtraction:(t,e)=>t-e,multiplication:(t,e)=>t*e,division:(t,e)=>Math.trunc(t/e)};async function qp(t,e,r){if(t.type==="number"){if(Number.isInteger(t.value))return t.value;throw new Error(`Invalid number: "${t.value}", only integers are allowed`)}else if(t.type==="variable"){let i=[];await q5(_(P({},t),{quoted:!0}),e,r,s=>i.push(s));let n=Number(i.join(" "));return Number.isNaN(n)?qp({type:"variable",name:i.join(" ")},e,r):qp({type:"number",value:n},e,r)}else return ARe[t.type](await qp(t.left,e,r),await qp(t.right,e,r))}async function oc(t,e,r){let i=new Map,n=[],s=[],o=u=>{s.push(u)},a=()=>{s.length>0&&n.push(s.join("")),s=[]},l=u=>{o(u),a()},c=(u,g,f)=>{let h=JSON.stringify({type:u,fd:g}),p=i.get(h);typeof p=="undefined"&&i.set(h,p=[]),p.push(f)};for(let u of t){let g=!1;switch(u.type){case"redirection":{let f=await oc(u.args,e,r);for(let h of f)c(u.subtype,u.fd,h)}break;case"argument":for(let f of u.segments)switch(f.type){case"text":o(f.text);break;case"glob":o(f.pattern),g=!0;break;case"shell":{let h=await aRe(f.shell,e,r);if(f.quoted)o(h);else{let p=Dw(h);for(let d=0;d0){let u=[];for(let[g,f]of i.entries())u.splice(u.length,0,g,String(f.length),...f);n.splice(0,0,"__ysh_set_redirects",...u,"--")}return n}function Yp(t,e,r){e.builtins.has(t[0])||(t=["command",...t]);let i=M.fromPortablePath(r.cwd),n=r.environment;typeof n.PWD!="undefined"&&(n=_(P({},n),{PWD:i}));let[s,...o]=t;if(s==="command")return L5(o[0],o.slice(1),e,{cwd:i,env:n});let a=e.builtins.get(s);if(typeof a=="undefined")throw new Error(`Assertion failed: A builtin should exist for "${s}"`);return T5(async({stdin:l,stdout:c,stderr:u})=>{let{stdin:g,stdout:f,stderr:h}=r;r.stdin=l,r.stdout=c,r.stderr=u;try{return await a(o,e,r)}finally{r.stdin=g,r.stdout=f,r.stderr=h}})}function lRe(t,e,r){return i=>{let n=new Kn.PassThrough,s=Pw(t,e,kw(r,{stdin:n}));return{stdin:n,promise:s}}}function cRe(t,e,r){return i=>{let n=new Kn.PassThrough,s=Pw(t,e,r);return{stdin:n,promise:s}}}function J5(t,e,r,i){if(e.length===0)return t;{let n;do n=String(Math.random());while(Object.prototype.hasOwnProperty.call(i.procedures,n));return i.procedures=P({},i.procedures),i.procedures[n]=t,Yp([...e,"__ysh_run_procedure",n],r,i)}}async function W5(t,e,r){let i=t,n=null,s=null;for(;i;){let o=i.then?P({},r):r,a;switch(i.type){case"command":{let l=await oc(i.args,e,r),c=await Y5(i.envs,e,r);a=i.envs.length?Yp(l,e,kw(o,{environment:c})):Yp(l,e,o)}break;case"subshell":{let l=await oc(i.args,e,r),c=lRe(i.subshell,e,o);a=J5(c,l,e,o)}break;case"group":{let l=await oc(i.args,e,r),c=cRe(i.group,e,o);a=J5(c,l,e,o)}break;case"envs":{let l=await Y5(i.envs,e,r);o.environment=P(P({},o.environment),l),a=Yp(["true"],e,o)}break}if(typeof a=="undefined")throw new Error("Assertion failed: An action should have been generated");if(n===null)s=xw(a,{stdin:new Os(o.stdin),stdout:new Os(o.stdout),stderr:new Os(o.stderr)});else{if(s===null)throw new Error("Assertion failed: The execution pipeline should have been setup");switch(n){case"|":s=s.pipeTo(a,wn.STDOUT);break;case"|&":s=s.pipeTo(a,wn.STDOUT|wn.STDERR);break}}i.then?(n=i.then.type,i=i.then.chain):i=null}if(s===null)throw new Error("Assertion failed: The execution pipeline should have been setup");return await s.run()}async function uRe(t,e,r,{background:i=!1}={}){function n(s){let o=["#2E86AB","#A23B72","#F18F01","#C73E1D","#CCE2A3"],a=o[s%o.length];return U5.default.hex(a)}if(i){let s=r.nextBackgroundJobIndex++,o=n(s),a=`[${s}]`,l=o(a),{stdout:c,stderr:u}=K5(r,{prefix:l});return r.backgroundJobs.push(W5(t,e,kw(r,{stdout:c,stderr:u})).catch(g=>u.write(`${g.message} +`)).finally(()=>{r.stdout.isTTY&&r.stdout.write(`Job ${l}, '${o(rg(t))}' has ended +`)})),0}return await W5(t,e,r)}async function gRe(t,e,r,{background:i=!1}={}){let n,s=a=>{n=a,r.variables["?"]=String(a)},o=async a=>{try{return await uRe(a.chain,e,r,{background:i&&typeof a.then=="undefined"})}catch(l){if(!(l instanceof as))throw l;return r.stderr.write(`${l.message} +`),1}};for(s(await o(t));t.then;){if(r.exitCode!==null)return r.exitCode;switch(t.then.type){case"&&":n===0&&s(await o(t.then.line));break;case"||":n!==0&&s(await o(t.then.line));break;default:throw new Error(`Assertion failed: Unsupported command type: "${t.then.type}"`)}t=t.then.line}return n}async function Pw(t,e,r){let i=r.backgroundJobs;r.backgroundJobs=[];let n=0;for(let{command:s,type:o}of t){if(n=await gRe(s,e,r,{background:o==="&"}),r.exitCode!==null)return r.exitCode;r.variables["?"]=String(n)}return await Promise.all(r.backgroundJobs),r.backgroundJobs=i,n}function z5(t){switch(t.type){case"variable":return t.name==="@"||t.name==="#"||t.name==="*"||Number.isFinite(parseInt(t.name,10))||"defaultValue"in t&&!!t.defaultValue&&t.defaultValue.some(e=>Rw(e));case"arithmetic":return qP(t.arithmetic);case"shell":return JP(t.shell);default:return!1}}function Rw(t){switch(t.type){case"redirection":return t.args.some(e=>Rw(e));case"argument":return t.segments.some(e=>z5(e));default:throw new Error(`Assertion failed: Unsupported argument type: "${t.type}"`)}}function qP(t){switch(t.type){case"variable":return z5(t);case"number":return!1;default:return qP(t.left)||qP(t.right)}}function JP(t){return t.some(({command:e})=>{for(;e;){let r=e.chain;for(;r;){let i;switch(r.type){case"subshell":i=JP(r.subshell);break;case"command":i=r.envs.some(n=>n.args.some(s=>Rw(s)))||r.args.some(n=>Rw(n));break}if(i)return!0;if(!r.then)break;r=r.then.chain}if(!e.then)break;e=e.then.line}return!1})}async function Fw(t,e=[],{baseFs:r=new Wt,builtins:i={},cwd:n=M.toPortablePath(process.cwd()),env:s=process.env,stdin:o=process.stdin,stdout:a=process.stdout,stderr:l=process.stderr,variables:c={},glob:u=bw}={}){let g={};for(let[p,d]of Object.entries(s))typeof d!="undefined"&&(g[p]=d);let f=new Map(oRe);for(let[p,d]of Object.entries(i))f.set(p,d);o===null&&(o=new Kn.PassThrough,o.end());let h=Aw(t,u);if(!JP(h)&&h.length>0&&e.length>0){let{command:p}=h[h.length-1];for(;p.then;)p=p.then.line;let d=p.chain;for(;d.then;)d=d.then.chain;d.type==="command"&&(d.args=d.args.concat(e.map(m=>({type:"argument",segments:[{type:"text",text:m}]}))))}return await Pw(h,{args:e,baseFs:r,builtins:f,initialStdin:o,initialStdout:a,initialStderr:l,glob:u},{cwd:n,environment:g,exitCode:null,procedures:{},stdin:o,stdout:a,stderr:l,variables:Object.assign({},c,{["?"]:0}),nextBackgroundJobIndex:1,backgroundJobs:[]})}var s9=ie(ZP()),o9=ie(Wp()),cc=ie(require("stream"));var J6=ie(Or());var zp=class{supportsDescriptor(e,r){return!!(e.range.startsWith(zp.protocol)||r.project.tryWorkspaceByDescriptor(e)!==null)}supportsLocator(e,r){return!!e.reference.startsWith(zp.protocol)}shouldPersistResolution(e,r){return!1}bindDescriptor(e,r,i){return e}getResolutionDependencies(e,r){return[]}async getCandidates(e,r,i){return[i.project.getWorkspaceByDescriptor(e).anchoredLocator]}async getSatisfying(e,r,i){return null}async resolve(e,r){let i=r.project.getWorkspaceByCwd(e.reference.slice(zp.protocol.length));return _(P({},e),{version:i.manifest.version||"0.0.0",languageName:"unknown",linkType:gt.SOFT,conditions:null,dependencies:new Map([...i.manifest.dependencies,...i.manifest.devDependencies]),peerDependencies:new Map([...i.manifest.peerDependencies]),dependenciesMeta:i.manifest.dependenciesMeta,peerDependenciesMeta:i.manifest.peerDependenciesMeta,bin:i.manifest.bin})}},Yr=zp;Yr.protocol="workspace:";var qt={};it(qt,{SemVer:()=>j6.SemVer,satisfiesWithPrereleases:()=>lc,validRange:()=>Us});var Lw=ie(Or()),j6=ie(Or()),Y6=new Map;function lc(t,e,r=!1){if(!t)return!1;let i=`${e}${r}`,n=Y6.get(i);if(typeof n=="undefined")try{n=new Lw.default.Range(e,{includePrerelease:!0,loose:r})}catch{return!1}finally{Y6.set(i,n||null)}else if(n===null)return!1;let s;try{s=new Lw.default.SemVer(t,n)}catch(o){return!1}return n.test(s)?!0:(s.prerelease&&(s.prerelease=[]),n.set.some(o=>{for(let a of o)a.semver.prerelease&&(a.semver.prerelease=[]);return o.every(a=>a.test(s))}))}var q6=new Map;function Us(t){if(t.indexOf(":")!==-1)return null;let e=q6.get(t);if(typeof e!="undefined")return e;try{e=new Lw.default.Range(t)}catch{e=null}return q6.set(t,e),e}var vA=class{constructor(){this.indent=" ";this.name=null;this.version=null;this.os=null;this.cpu=null;this.type=null;this.packageManager=null;this.private=!1;this.license=null;this.main=null;this.module=null;this.browser=null;this.languageName=null;this.bin=new Map;this.scripts=new Map;this.dependencies=new Map;this.devDependencies=new Map;this.peerDependencies=new Map;this.workspaceDefinitions=[];this.dependenciesMeta=new Map;this.peerDependenciesMeta=new Map;this.resolutions=[];this.files=null;this.publishConfig=null;this.installConfig=null;this.preferUnplugged=null;this.raw={};this.errors=[]}static async tryFind(e,{baseFs:r=new Wt}={}){let i=v.join(e,"package.json");return await r.existsPromise(i)?await vA.fromFile(i,{baseFs:r}):null}static async find(e,{baseFs:r}={}){let i=await vA.tryFind(e,{baseFs:r});if(i===null)throw new Error("Manifest not found");return i}static async fromFile(e,{baseFs:r=new Wt}={}){let i=new vA;return await i.loadFile(e,{baseFs:r}),i}static fromText(e){let r=new vA;return r.loadFromText(e),r}static isManifestFieldCompatible(e,r){if(e===null)return!0;let i=!0,n=!1;for(let s of e)if(s[0]==="!"){if(n=!0,r===s.slice(1))return!1}else if(i=!1,s===r)return!0;return n&&i}loadFromText(e){let r;try{r=JSON.parse(z6(e)||"{}")}catch(i){throw i.message+=` (when parsing ${e})`,i}this.load(r),this.indent=W6(e)}async loadFile(e,{baseFs:r=new Wt}){let i=await r.readFilePromise(e,"utf8"),n;try{n=JSON.parse(z6(i)||"{}")}catch(s){throw s.message+=` (when parsing ${e})`,s}this.load(n),this.indent=W6(i)}load(e,{yamlCompatibilityMode:r=!1}={}){if(typeof e!="object"||e===null)throw new Error(`Utterly invalid manifest data (${e})`);this.raw=e;let i=[];if(this.name=null,typeof e.name=="string")try{this.name=In(e.name)}catch(s){i.push(new Error("Parsing failed for the 'name' field"))}if(typeof e.version=="string"?this.version=e.version:this.version=null,Array.isArray(e.os)){let s=[];this.os=s;for(let o of e.os)typeof o!="string"?i.push(new Error("Parsing failed for the 'os' field")):s.push(o)}else this.os=null;if(Array.isArray(e.cpu)){let s=[];this.cpu=s;for(let o of e.cpu)typeof o!="string"?i.push(new Error("Parsing failed for the 'cpu' field")):s.push(o)}else this.cpu=null;if(typeof e.type=="string"?this.type=e.type:this.type=null,typeof e.packageManager=="string"?this.packageManager=e.packageManager:this.packageManager=null,typeof e.private=="boolean"?this.private=e.private:this.private=!1,typeof e.license=="string"?this.license=e.license:this.license=null,typeof e.languageName=="string"?this.languageName=e.languageName:this.languageName=null,typeof e.main=="string"?this.main=en(e.main):this.main=null,typeof e.module=="string"?this.module=en(e.module):this.module=null,e.browser!=null)if(typeof e.browser=="string")this.browser=en(e.browser);else{this.browser=new Map;for(let[s,o]of Object.entries(e.browser))this.browser.set(en(s),typeof o=="string"?en(o):o)}else this.browser=null;if(this.bin=new Map,typeof e.bin=="string")this.name!==null?this.bin.set(this.name.name,en(e.bin)):i.push(new Error("String bin field, but no attached package name"));else if(typeof e.bin=="object"&&e.bin!==null)for(let[s,o]of Object.entries(e.bin)){if(typeof o!="string"){i.push(new Error(`Invalid bin definition for '${s}'`));continue}this.bin.set(s,en(o))}if(this.scripts=new Map,typeof e.scripts=="object"&&e.scripts!==null)for(let[s,o]of Object.entries(e.scripts)){if(typeof o!="string"){i.push(new Error(`Invalid script definition for '${s}'`));continue}this.scripts.set(s,o)}if(this.dependencies=new Map,typeof e.dependencies=="object"&&e.dependencies!==null)for(let[s,o]of Object.entries(e.dependencies)){if(typeof o!="string"){i.push(new Error(`Invalid dependency range for '${s}'`));continue}let a;try{a=In(s)}catch(c){i.push(new Error(`Parsing failed for the dependency name '${s}'`));continue}let l=Yt(a,o);this.dependencies.set(l.identHash,l)}if(this.devDependencies=new Map,typeof e.devDependencies=="object"&&e.devDependencies!==null)for(let[s,o]of Object.entries(e.devDependencies)){if(typeof o!="string"){i.push(new Error(`Invalid dependency range for '${s}'`));continue}let a;try{a=In(s)}catch(c){i.push(new Error(`Parsing failed for the dependency name '${s}'`));continue}let l=Yt(a,o);this.devDependencies.set(l.identHash,l)}if(this.peerDependencies=new Map,typeof e.peerDependencies=="object"&&e.peerDependencies!==null)for(let[s,o]of Object.entries(e.peerDependencies)){let a;try{a=In(s)}catch(c){i.push(new Error(`Parsing failed for the dependency name '${s}'`));continue}(typeof o!="string"||!o.startsWith(Yr.protocol)&&!Us(o))&&(i.push(new Error(`Invalid dependency range for '${s}'`)),o="*");let l=Yt(a,o);this.peerDependencies.set(l.identHash,l)}typeof e.workspaces=="object"&&e.workspaces.nohoist&&i.push(new Error("'nohoist' is deprecated, please use 'installConfig.hoistingLimits' instead"));let n=Array.isArray(e.workspaces)?e.workspaces:typeof e.workspaces=="object"&&e.workspaces!==null&&Array.isArray(e.workspaces.packages)?e.workspaces.packages:[];this.workspaceDefinitions=[];for(let s of n){if(typeof s!="string"){i.push(new Error(`Invalid workspace definition for '${s}'`));continue}this.workspaceDefinitions.push({pattern:s})}if(this.dependenciesMeta=new Map,typeof e.dependenciesMeta=="object"&&e.dependenciesMeta!==null)for(let[s,o]of Object.entries(e.dependenciesMeta)){if(typeof o!="object"||o===null){i.push(new Error(`Invalid meta field for '${s}`));continue}let a=pA(s),l=this.ensureDependencyMeta(a),c=Tw(o.built,{yamlCompatibilityMode:r});if(c===null){i.push(new Error(`Invalid built meta field for '${s}'`));continue}let u=Tw(o.optional,{yamlCompatibilityMode:r});if(u===null){i.push(new Error(`Invalid optional meta field for '${s}'`));continue}let g=Tw(o.unplugged,{yamlCompatibilityMode:r});if(g===null){i.push(new Error(`Invalid unplugged meta field for '${s}'`));continue}Object.assign(l,{built:c,optional:u,unplugged:g})}if(this.peerDependenciesMeta=new Map,typeof e.peerDependenciesMeta=="object"&&e.peerDependenciesMeta!==null)for(let[s,o]of Object.entries(e.peerDependenciesMeta)){if(typeof o!="object"||o===null){i.push(new Error(`Invalid meta field for '${s}'`));continue}let a=pA(s),l=this.ensurePeerDependencyMeta(a),c=Tw(o.optional,{yamlCompatibilityMode:r});if(c===null){i.push(new Error(`Invalid optional meta field for '${s}'`));continue}Object.assign(l,{optional:c})}if(this.resolutions=[],typeof e.resolutions=="object"&&e.resolutions!==null)for(let[s,o]of Object.entries(e.resolutions)){if(typeof o!="string"){i.push(new Error(`Invalid resolution entry for '${s}'`));continue}try{this.resolutions.push({pattern:gw(s),reference:o})}catch(a){i.push(a);continue}}if(Array.isArray(e.files)){this.files=new Set;for(let s of e.files){if(typeof s!="string"){i.push(new Error(`Invalid files entry for '${s}'`));continue}this.files.add(s)}}else this.files=null;if(typeof e.publishConfig=="object"&&e.publishConfig!==null){if(this.publishConfig={},typeof e.publishConfig.access=="string"&&(this.publishConfig.access=e.publishConfig.access),typeof e.publishConfig.main=="string"&&(this.publishConfig.main=en(e.publishConfig.main)),typeof e.publishConfig.module=="string"&&(this.publishConfig.module=en(e.publishConfig.module)),e.publishConfig.browser!=null)if(typeof e.publishConfig.browser=="string")this.publishConfig.browser=en(e.publishConfig.browser);else{this.publishConfig.browser=new Map;for(let[s,o]of Object.entries(e.publishConfig.browser))this.publishConfig.browser.set(en(s),typeof o=="string"?en(o):o)}if(typeof e.publishConfig.registry=="string"&&(this.publishConfig.registry=e.publishConfig.registry),typeof e.publishConfig.bin=="string")this.name!==null?this.publishConfig.bin=new Map([[this.name.name,en(e.publishConfig.bin)]]):i.push(new Error("String bin field, but no attached package name"));else if(typeof e.publishConfig.bin=="object"&&e.publishConfig.bin!==null){this.publishConfig.bin=new Map;for(let[s,o]of Object.entries(e.publishConfig.bin)){if(typeof o!="string"){i.push(new Error(`Invalid bin definition for '${s}'`));continue}this.publishConfig.bin.set(s,en(o))}}if(Array.isArray(e.publishConfig.executableFiles)){this.publishConfig.executableFiles=new Set;for(let s of e.publishConfig.executableFiles){if(typeof s!="string"){i.push(new Error("Invalid executable file definition"));continue}this.publishConfig.executableFiles.add(en(s))}}}else this.publishConfig=null;if(typeof e.installConfig=="object"&&e.installConfig!==null){this.installConfig={};for(let s of Object.keys(e.installConfig))s==="hoistingLimits"?typeof e.installConfig.hoistingLimits=="string"?this.installConfig.hoistingLimits=e.installConfig.hoistingLimits:i.push(new Error("Invalid hoisting limits definition")):s=="selfReferences"?typeof e.installConfig.selfReferences=="boolean"?this.installConfig.selfReferences=e.installConfig.selfReferences:i.push(new Error("Invalid selfReferences definition, must be a boolean value")):i.push(new Error(`Unrecognized installConfig key: ${s}`))}else this.installConfig=null;if(typeof e.optionalDependencies=="object"&&e.optionalDependencies!==null)for(let[s,o]of Object.entries(e.optionalDependencies)){if(typeof o!="string"){i.push(new Error(`Invalid dependency range for '${s}'`));continue}let a;try{a=In(s)}catch(g){i.push(new Error(`Parsing failed for the dependency name '${s}'`));continue}let l=Yt(a,o);this.dependencies.set(l.identHash,l);let c=Yt(a,"unknown"),u=this.ensureDependencyMeta(c);Object.assign(u,{optional:!0})}typeof e.preferUnplugged=="boolean"?this.preferUnplugged=e.preferUnplugged:this.preferUnplugged=null,this.errors=i}getForScope(e){switch(e){case"dependencies":return this.dependencies;case"devDependencies":return this.devDependencies;case"peerDependencies":return this.peerDependencies;default:throw new Error(`Unsupported value ("${e}")`)}}hasConsumerDependency(e){return!!(this.dependencies.has(e.identHash)||this.peerDependencies.has(e.identHash))}hasHardDependency(e){return!!(this.dependencies.has(e.identHash)||this.devDependencies.has(e.identHash))}hasSoftDependency(e){return!!this.peerDependencies.has(e.identHash)}hasDependency(e){return!!(this.hasHardDependency(e)||this.hasSoftDependency(e))}getConditions(){let e=[];return this.os&&this.os.length>0&&e.push(V6("os",this.os)),this.cpu&&this.cpu.length>0&&e.push(V6("cpu",this.cpu)),e.length>0?e.join(" & "):null}isCompatibleWithOS(e){return vA.isManifestFieldCompatible(this.os,e)}isCompatibleWithCPU(e){return vA.isManifestFieldCompatible(this.cpu,e)}ensureDependencyMeta(e){if(e.range!=="unknown"&&!J6.default.valid(e.range))throw new Error(`Invalid meta field range for '${En(e)}'`);let r=St(e),i=e.range!=="unknown"?e.range:null,n=this.dependenciesMeta.get(r);n||this.dependenciesMeta.set(r,n=new Map);let s=n.get(i);return s||n.set(i,s={}),s}ensurePeerDependencyMeta(e){if(e.range!=="unknown")throw new Error(`Invalid meta field range for '${En(e)}'`);let r=St(e),i=this.peerDependenciesMeta.get(r);return i||this.peerDependenciesMeta.set(r,i={}),i}setRawField(e,r,{after:i=[]}={}){let n=new Set(i.filter(s=>Object.prototype.hasOwnProperty.call(this.raw,s)));if(n.size===0||Object.prototype.hasOwnProperty.call(this.raw,e))this.raw[e]=r;else{let s=this.raw,o=this.raw={},a=!1;for(let l of Object.keys(s))o[l]=s[l],a||(n.delete(l),n.size===0&&(o[e]=r,a=!0))}}exportTo(e,{compatibilityMode:r=!0}={}){var s;if(Object.assign(e,this.raw),this.name!==null?e.name=St(this.name):delete e.name,this.version!==null?e.version=this.version:delete e.version,this.os!==null?e.os=this.os:delete e.os,this.cpu!==null?e.cpu=this.cpu:delete e.cpu,this.type!==null?e.type=this.type:delete e.type,this.packageManager!==null?e.packageManager=this.packageManager:delete e.packageManager,this.private?e.private=!0:delete e.private,this.license!==null?e.license=this.license:delete e.license,this.languageName!==null?e.languageName=this.languageName:delete e.languageName,this.main!==null?e.main=this.main:delete e.main,this.module!==null?e.module=this.module:delete e.module,this.browser!==null){let o=this.browser;typeof o=="string"?e.browser=o:o instanceof Map&&(e.browser=Object.assign({},...Array.from(o.keys()).sort().map(a=>({[a]:o.get(a)}))))}else delete e.browser;this.bin.size===1&&this.name!==null&&this.bin.has(this.name.name)?e.bin=this.bin.get(this.name.name):this.bin.size>0?e.bin=Object.assign({},...Array.from(this.bin.keys()).sort().map(o=>({[o]:this.bin.get(o)}))):delete e.bin,this.workspaceDefinitions.length>0?this.raw.workspaces&&!Array.isArray(this.raw.workspaces)?e.workspaces=_(P({},this.raw.workspaces),{packages:this.workspaceDefinitions.map(({pattern:o})=>o)}):e.workspaces=this.workspaceDefinitions.map(({pattern:o})=>o):this.raw.workspaces&&!Array.isArray(this.raw.workspaces)&&Object.keys(this.raw.workspaces).length>0?e.workspaces=this.raw.workspaces:delete e.workspaces;let i=[],n=[];for(let o of this.dependencies.values()){let a=this.dependenciesMeta.get(St(o)),l=!1;if(r&&a){let c=a.get(null);c&&c.optional&&(l=!0)}l?n.push(o):i.push(o)}i.length>0?e.dependencies=Object.assign({},...Ou(i).map(o=>({[St(o)]:o.range}))):delete e.dependencies,n.length>0?e.optionalDependencies=Object.assign({},...Ou(n).map(o=>({[St(o)]:o.range}))):delete e.optionalDependencies,this.devDependencies.size>0?e.devDependencies=Object.assign({},...Ou(this.devDependencies.values()).map(o=>({[St(o)]:o.range}))):delete e.devDependencies,this.peerDependencies.size>0?e.peerDependencies=Object.assign({},...Ou(this.peerDependencies.values()).map(o=>({[St(o)]:o.range}))):delete e.peerDependencies,e.dependenciesMeta={};for(let[o,a]of gn(this.dependenciesMeta.entries(),([l,c])=>l))for(let[l,c]of gn(a.entries(),([u,g])=>u!==null?`0${u}`:"1")){let u=l!==null?En(Yt(In(o),l)):o,g=P({},c);r&&l===null&&delete g.optional,Object.keys(g).length!==0&&(e.dependenciesMeta[u]=g)}if(Object.keys(e.dependenciesMeta).length===0&&delete e.dependenciesMeta,this.peerDependenciesMeta.size>0?e.peerDependenciesMeta=Object.assign({},...gn(this.peerDependenciesMeta.entries(),([o,a])=>o).map(([o,a])=>({[o]:a}))):delete e.peerDependenciesMeta,this.resolutions.length>0?e.resolutions=Object.assign({},...this.resolutions.map(({pattern:o,reference:a})=>({[fw(o)]:a}))):delete e.resolutions,this.files!==null?e.files=Array.from(this.files):delete e.files,this.preferUnplugged!==null?e.preferUnplugged=this.preferUnplugged:delete e.preferUnplugged,this.scripts!==null&&this.scripts.size>0){(s=e.scripts)!=null||(e.scripts={});for(let o of Object.keys(e.scripts))this.scripts.has(o)||delete e.scripts[o];for(let[o,a]of this.scripts.entries())e.scripts[o]=a}else delete e.scripts;return e}},Ze=vA;Ze.fileName="package.json",Ze.allDependencies=["dependencies","devDependencies","peerDependencies"],Ze.hardDependencies=["dependencies","devDependencies"];function W6(t){let e=t.match(/^[ \t]+/m);return e?e[0]:" "}function z6(t){return t.charCodeAt(0)===65279?t.slice(1):t}function en(t){return t.replace(/\\/g,"/")}function Tw(t,{yamlCompatibilityMode:e}){return e?Kv(t):typeof t=="undefined"||typeof t=="boolean"?t:null}function _6(t,e){let r=e.search(/[^!]/);if(r===-1)return"invalid";let i=r%2==0?"":"!",n=e.slice(r);return`${i}${t}=${n}`}function V6(t,e){return e.length===1?_6(t,e[0]):`(${e.map(r=>_6(t,r)).join(" | ")})`}var e9=ie($6()),Ow=ie(ml());var t9=["\u280B","\u2819","\u2839","\u2838","\u283C","\u2834","\u2826","\u2827","\u2807","\u280F"],r9=80,NFe=new Set([z.FETCH_NOT_CACHED,z.UNUSED_CACHE_ENTRY]),LFe=5,SA=Ow.default.GITHUB_ACTIONS?{start:t=>`::group::${t} +`,end:t=>`::endgroup:: +`}:Ow.default.TRAVIS?{start:t=>`travis_fold:start:${t} +`,end:t=>`travis_fold:end:${t} +`}:Ow.default.GITLAB?{start:t=>`section_start:${Math.floor(Date.now()/1e3)}:${t.toLowerCase().replace(/\W+/g,"_")}[collapsed=true]\r${t} +`,end:t=>`section_end:${Math.floor(Date.now()/1e3)}:${t.toLowerCase().replace(/\W+/g,"_")}\r`}:null,i9=new Date,TFe=["iTerm.app","Apple_Terminal"].includes(process.env.TERM_PROGRAM)||!!process.env.WT_SESSION,MFe=t=>t,Kw=MFe({patrick:{date:[17,3],chars:["\u{1F340}","\u{1F331}"],size:40},simba:{date:[19,7],chars:["\u{1F981}","\u{1F334}"],size:40},jack:{date:[31,10],chars:["\u{1F383}","\u{1F987}"],size:40},hogsfather:{date:[31,12],chars:["\u{1F389}","\u{1F384}"],size:40},default:{chars:["=","-"],size:80}}),OFe=TFe&&Object.keys(Kw).find(t=>{let e=Kw[t];return!(e.date&&(e.date[0]!==i9.getDate()||e.date[1]!==i9.getMonth()+1))})||"default";function n9(t,{configuration:e,json:r}){if(!e.get("enableMessageNames"))return"";let n=KI(t===null?0:t);return!r&&t===null?Ve(e,n,"grey"):n}function eD(t,{configuration:e,json:r}){let i=n9(t,{configuration:e,json:r});if(!i||t===null||t===z.UNNAMED)return i;let n=z[t],s=`https://yarnpkg.com/advanced/error-codes#${i}---${n}`.toLowerCase();return Ku(e,i,s)}var Fe=class extends Xi{constructor({configuration:e,stdout:r,json:i=!1,includeFooter:n=!0,includeLogs:s=!i,includeInfos:o=s,includeWarnings:a=s,forgettableBufferSize:l=LFe,forgettableNames:c=new Set}){super();this.uncommitted=new Set;this.cacheHitCount=0;this.cacheMissCount=0;this.lastCacheMiss=null;this.warningCount=0;this.errorCount=0;this.startTime=Date.now();this.indent=0;this.progress=new Map;this.progressTime=0;this.progressFrame=0;this.progressTimeout=null;this.forgettableLines=[];Cp(this,{configuration:e}),this.configuration=e,this.forgettableBufferSize=l,this.forgettableNames=new Set([...c,...NFe]),this.includeFooter=n,this.includeInfos=o,this.includeWarnings=a,this.json=i,this.stdout=r;let u=this.configuration.get("progressBarStyle")||OFe;if(!Object.prototype.hasOwnProperty.call(Kw,u))throw new Error("Assertion failed: Invalid progress bar style");this.progressStyle=Kw[u];let g="\u27A4 YN0000: \u250C ".length,f=Math.max(0,Math.min(process.stdout.columns-g,80));this.progressMaxScaledSize=Math.floor(this.progressStyle.size*f/80)}static async start(e,r){let i=new this(e),n=process.emitWarning;process.emitWarning=(s,o)=>{if(typeof s!="string"){let l=s;s=l.message,o=o!=null?o:l.name}let a=typeof o!="undefined"?`${o}: ${s}`:s;i.reportWarning(z.UNNAMED,a)};try{await r(i)}catch(s){i.reportExceptionOnce(s)}finally{await i.finalize(),process.emitWarning=n}return i}hasErrors(){return this.errorCount>0}exitCode(){return this.hasErrors()?1:0}reportCacheHit(e){this.cacheHitCount+=1}reportCacheMiss(e,r){this.lastCacheMiss=e,this.cacheMissCount+=1,typeof r!="undefined"&&!this.configuration.get("preferAggregateCacheInfo")&&this.reportInfo(z.FETCH_NOT_CACHED,r)}startTimerSync(e,r,i){let n=typeof r=="function"?{}:r,s=typeof r=="function"?r:i,o={committed:!1,action:()=>{this.reportInfo(null,`\u250C ${e}`),this.indent+=1,SA!==null&&!this.json&&this.includeInfos&&this.stdout.write(SA.start(e))}};n.skipIfEmpty?this.uncommitted.add(o):(o.action(),o.committed=!0);let a=Date.now();try{return s()}catch(l){throw this.reportExceptionOnce(l),l}finally{let l=Date.now();this.uncommitted.delete(o),o.committed&&(this.indent-=1,SA!==null&&!this.json&&this.includeInfos&&this.stdout.write(SA.end(e)),this.configuration.get("enableTimers")&&l-a>200?this.reportInfo(null,`\u2514 Completed in ${Ve(this.configuration,l-a,Le.DURATION)}`):this.reportInfo(null,"\u2514 Completed"))}}async startTimerPromise(e,r,i){let n=typeof r=="function"?{}:r,s=typeof r=="function"?r:i,o={committed:!1,action:()=>{this.reportInfo(null,`\u250C ${e}`),this.indent+=1,SA!==null&&!this.json&&this.includeInfos&&this.stdout.write(SA.start(e))}};n.skipIfEmpty?this.uncommitted.add(o):(o.action(),o.committed=!0);let a=Date.now();try{return await s()}catch(l){throw this.reportExceptionOnce(l),l}finally{let l=Date.now();this.uncommitted.delete(o),o.committed&&(this.indent-=1,SA!==null&&!this.json&&this.includeInfos&&this.stdout.write(SA.end(e)),this.configuration.get("enableTimers")&&l-a>200?this.reportInfo(null,`\u2514 Completed in ${Ve(this.configuration,l-a,Le.DURATION)}`):this.reportInfo(null,"\u2514 Completed"))}}async startCacheReport(e){let r=this.configuration.get("preferAggregateCacheInfo")?{cacheHitCount:this.cacheHitCount,cacheMissCount:this.cacheMissCount}:null;try{return await e()}catch(i){throw this.reportExceptionOnce(i),i}finally{r!==null&&this.reportCacheChanges(r)}}reportSeparator(){this.indent===0?this.writeLineWithForgettableReset(""):this.reportInfo(null,"")}reportInfo(e,r){if(!this.includeInfos)return;this.commit();let i=this.formatNameWithHyperlink(e),n=i?`${i}: `:"",s=`${Ve(this.configuration,"\u27A4","blueBright")} ${n}${this.formatIndent()}${r}`;if(this.json)this.reportJson({type:"info",name:e,displayName:this.formatName(e),indent:this.formatIndent(),data:r});else if(this.forgettableNames.has(e))if(this.forgettableLines.push(s),this.forgettableLines.length>this.forgettableBufferSize){for(;this.forgettableLines.length>this.forgettableBufferSize;)this.forgettableLines.shift();this.writeLines(this.forgettableLines,{truncate:!0})}else this.writeLine(s,{truncate:!0});else this.writeLineWithForgettableReset(s)}reportWarning(e,r){if(this.warningCount+=1,!this.includeWarnings)return;this.commit();let i=this.formatNameWithHyperlink(e),n=i?`${i}: `:"";this.json?this.reportJson({type:"warning",name:e,displayName:this.formatName(e),indent:this.formatIndent(),data:r}):this.writeLineWithForgettableReset(`${Ve(this.configuration,"\u27A4","yellowBright")} ${n}${this.formatIndent()}${r}`)}reportError(e,r){this.errorCount+=1,this.commit();let i=this.formatNameWithHyperlink(e),n=i?`${i}: `:"";this.json?this.reportJson({type:"error",name:e,displayName:this.formatName(e),indent:this.formatIndent(),data:r}):this.writeLineWithForgettableReset(`${Ve(this.configuration,"\u27A4","redBright")} ${n}${this.formatIndent()}${r}`,{truncate:!1})}reportProgress(e){let r=!1,i=Promise.resolve().then(async()=>{let s={progress:0,title:void 0};this.progress.set(e,{definition:s,lastScaledSize:-1}),this.refreshProgress(-1);for await(let{progress:o,title:a}of e)r||s.progress===o&&s.title===a||(s.progress=o,s.title=a,this.refreshProgress());n()}),n=()=>{r||(r=!0,this.progress.delete(e),this.refreshProgress(1))};return _(P({},i),{stop:n})}reportJson(e){this.json&&this.writeLineWithForgettableReset(`${JSON.stringify(e)}`)}async finalize(){if(!this.includeFooter)return;let e="";this.errorCount>0?e="Failed with errors":this.warningCount>0?e="Done with warnings":e="Done";let r=Ve(this.configuration,Date.now()-this.startTime,Le.DURATION),i=this.configuration.get("enableTimers")?`${e} in ${r}`:e;this.errorCount>0?this.reportError(z.UNNAMED,i):this.warningCount>0?this.reportWarning(z.UNNAMED,i):this.reportInfo(z.UNNAMED,i)}writeLine(e,{truncate:r}={}){this.clearProgress({clear:!0}),this.stdout.write(`${this.truncate(e,{truncate:r})} +`),this.writeProgress()}writeLineWithForgettableReset(e,{truncate:r}={}){this.forgettableLines=[],this.writeLine(e,{truncate:r})}writeLines(e,{truncate:r}={}){this.clearProgress({delta:e.length});for(let i of e)this.stdout.write(`${this.truncate(i,{truncate:r})} +`);this.writeProgress()}reportCacheChanges({cacheHitCount:e,cacheMissCount:r}){let i=this.cacheHitCount-e,n=this.cacheMissCount-r;if(i===0&&n===0)return;let s="";this.cacheHitCount>1?s+=`${this.cacheHitCount} packages were already cached`:this.cacheHitCount===1?s+=" - one package was already cached":s+="No packages were cached",this.cacheHitCount>0?this.cacheMissCount>1?s+=`, ${this.cacheMissCount} had to be fetched`:this.cacheMissCount===1&&(s+=`, one had to be fetched (${lt(this.configuration,this.lastCacheMiss)})`):this.cacheMissCount>1?s+=` - ${this.cacheMissCount} packages had to be fetched`:this.cacheMissCount===1&&(s+=` - one package had to be fetched (${lt(this.configuration,this.lastCacheMiss)})`),this.reportInfo(z.FETCH_NOT_CACHED,s)}commit(){let e=this.uncommitted;this.uncommitted=new Set;for(let r of e)r.committed=!0,r.action()}clearProgress({delta:e=0,clear:r=!1}){!this.configuration.get("enableProgressBars")||this.json||this.progress.size+e>0&&(this.stdout.write(`[${this.progress.size+e}A`),(e>0||r)&&this.stdout.write(""))}writeProgress(){if(!this.configuration.get("enableProgressBars")||this.json||(this.progressTimeout!==null&&clearTimeout(this.progressTimeout),this.progressTimeout=null,this.progress.size===0))return;let e=Date.now();e-this.progressTime>r9&&(this.progressFrame=(this.progressFrame+1)%t9.length,this.progressTime=e);let r=t9[this.progressFrame];for(let i of this.progress.values()){let n=this.progressStyle.chars[0].repeat(i.lastScaledSize),s=this.progressStyle.chars[1].repeat(this.progressMaxScaledSize-i.lastScaledSize),o=this.formatName(null),a=o?`${o}: `:"";this.stdout.write(`${Ve(this.configuration,"\u27A4","blueBright")} ${a}${r} ${n}${s} +`)}this.progressTimeout=setTimeout(()=>{this.refreshProgress()},r9)}refreshProgress(e=0){let r=!1;if(this.progress.size===0)r=!0;else for(let i of this.progress.values()){let n=Math.trunc(this.progressMaxScaledSize*i.definition.progress),s=i.lastScaledSize;if(i.lastScaledSize=n,n!==s){r=!0;break}}r&&(this.clearProgress({delta:e}),this.writeProgress())}truncate(e,{truncate:r}={}){return this.configuration.get("enableProgressBars")||(r=!1),typeof r=="undefined"&&(r=this.configuration.get("preferTruncatedLines")),r&&(e=(0,e9.default)(e,0,process.stdout.columns-1)),e}formatName(e){return n9(e,{configuration:this.configuration,json:this.json})}formatNameWithHyperlink(e){return eD(e,{configuration:this.configuration,json:this.json})}formatIndent(){return"\u2502 ".repeat(this.indent)}};var Zr="3.1.0";var tn;(function(n){n.Yarn1="Yarn Classic",n.Yarn2="Yarn",n.Npm="npm",n.Pnpm="pnpm"})(tn||(tn={}));async function ba(t,e,r,i=[]){if(process.platform==="win32"){let n=`@goto #_undefined_# 2>NUL || @title %COMSPEC% & @setlocal & @"${r}" ${i.map(s=>`"${s.replace('"','""')}"`).join(" ")} %*`;await T.writeFilePromise(v.format({dir:t,name:e,ext:".cmd"}),n)}await T.writeFilePromise(v.join(t,e),`#!/bin/sh +exec "${r}" ${i.map(n=>`'${n.replace(/'/g,`'"'"'`)}'`).join(" ")} "$@" +`,{mode:493})}async function a9(t){let e=await Ze.tryFind(t);if(e==null?void 0:e.packageManager){let i=Qy(e.packageManager);if(i==null?void 0:i.name){let n=`found ${JSON.stringify({packageManager:e.packageManager})} in manifest`,[s]=i.reference.split(".");switch(i.name){case"yarn":return{packageManager:Number(s)===1?tn.Yarn1:tn.Yarn2,reason:n};case"npm":return{packageManager:tn.Npm,reason:n};case"pnpm":return{packageManager:tn.Pnpm,reason:n}}}}let r;try{r=await T.readFilePromise(v.join(t,wt.lockfile),"utf8")}catch{}return r!==void 0?r.match(/^__metadata:$/m)?{packageManager:tn.Yarn2,reason:'"__metadata" key found in yarn.lock'}:{packageManager:tn.Yarn1,reason:'"__metadata" key not found in yarn.lock, must be a Yarn classic lockfile'}:T.existsSync(v.join(t,"package-lock.json"))?{packageManager:tn.Npm,reason:`found npm's "package-lock.json" lockfile`}:T.existsSync(v.join(t,"pnpm-lock.yaml"))?{packageManager:tn.Pnpm,reason:`found pnpm's "pnpm-lock.yaml" lockfile`}:null}async function Vp({project:t,locator:e,binFolder:r,lifecycleScript:i}){var l,c;let n={};for(let[u,g]of Object.entries(process.env))typeof g!="undefined"&&(n[u.toLowerCase()!=="path"?u:"PATH"]=g);let s=M.fromPortablePath(r);n.BERRY_BIN_FOLDER=M.fromPortablePath(s);let o=process.env.COREPACK_ROOT?M.join(process.env.COREPACK_ROOT,"dist/yarn.js"):process.argv[1];if(await Promise.all([ba(r,"node",process.execPath),...Zr!==null?[ba(r,"run",process.execPath,[o,"run"]),ba(r,"yarn",process.execPath,[o]),ba(r,"yarnpkg",process.execPath,[o]),ba(r,"node-gyp",process.execPath,[o,"run","--top-level","node-gyp"])]:[]]),t&&(n.INIT_CWD=M.fromPortablePath(t.configuration.startingCwd),n.PROJECT_CWD=M.fromPortablePath(t.cwd)),n.PATH=n.PATH?`${s}${M.delimiter}${n.PATH}`:`${s}`,n.npm_execpath=`${s}${M.sep}yarn`,n.npm_node_execpath=`${s}${M.sep}node`,e){if(!t)throw new Error("Assertion failed: Missing project");let u=t.tryWorkspaceByLocator(e),g=u?(l=u.manifest.version)!=null?l:"":(c=t.storedPackages.get(e.locatorHash).version)!=null?c:"";n.npm_package_name=St(e),n.npm_package_version=g}let a=Zr!==null?`yarn/${Zr}`:`yarn/${mu("@yarnpkg/core").version}-core`;return n.npm_config_user_agent=`${a} npm/? node/${process.versions.node} ${process.platform} ${process.arch}`,i&&(n.npm_lifecycle_event=i),t&&await t.configuration.triggerHook(u=>u.setupScriptEnvironment,t,n,async(u,g,f)=>await ba(r,kr(u),g,f)),n}var KFe=2,UFe=(0,o9.default)(KFe);async function HFe(t,e,{configuration:r,report:i,workspace:n=null,locator:s=null}){await UFe(async()=>{await T.mktempPromise(async o=>{let a=v.join(o,"pack.log"),l=null,{stdout:c,stderr:u}=r.getSubprocessStreams(a,{prefix:M.fromPortablePath(t),report:i}),g=s&&Eo(s)?lp(s):s,f=g?is(g):"an external project";c.write(`Packing ${f} from sources +`);let h=await a9(t),p;h!==null?(c.write(`Using ${h.packageManager} for bootstrap. Reason: ${h.reason} + +`),p=h.packageManager):(c.write(`No package manager configuration detected; defaulting to Yarn + +`),p=tn.Yarn2),await T.mktempPromise(async d=>{let m=await Vp({binFolder:d}),B=new Map([[tn.Yarn1,async()=>{let R=n!==null?["workspace",n]:[],H=await to("yarn",["set","version","classic","--only-if-needed"],{cwd:t,env:m,stdin:l,stdout:c,stderr:u,end:Pn.ErrorCode});if(H.code!==0)return H.code;await T.appendFilePromise(v.join(t,".npmignore"),`/.yarn +`),c.write(` +`);let L=await to("yarn",["install"],{cwd:t,env:m,stdin:l,stdout:c,stderr:u,end:Pn.ErrorCode});if(L.code!==0)return L.code;c.write(` +`);let K=await to("yarn",[...R,"pack","--filename",M.fromPortablePath(e)],{cwd:t,env:m,stdin:l,stdout:c,stderr:u});return K.code!==0?K.code:0}],[tn.Yarn2,async()=>{let R=n!==null?["workspace",n]:[];m.YARN_ENABLE_INLINE_BUILDS="1";let H=v.join(t,wt.lockfile);await T.existsPromise(H)||await T.writeFilePromise(H,"");let L=await to("yarn",[...R,"pack","--install-if-needed","--filename",M.fromPortablePath(e)],{cwd:t,env:m,stdin:l,stdout:c,stderr:u});return L.code!==0?L.code:0}],[tn.Npm,async()=>{if(n!==null){let A=new cc.PassThrough,V=Cu(A);A.pipe(c,{end:!1});let W=await to("npm",["--version"],{cwd:t,env:m,stdin:l,stdout:A,stderr:u,end:Pn.Never});if(A.end(),W.code!==0)return c.end(),u.end(),W.code;let X=(await V).toString().trim();if(!lc(X,">=7.x")){let F=Io(null,"npm"),D=Yt(F,X),he=Yt(F,">=7.x");throw new Error(`Workspaces aren't supported by ${Xt(r,D)}; please upgrade to ${Xt(r,he)} (npm has been detected as the primary package manager for ${Ve(r,t,Le.PATH)})`)}}let R=n!==null?["--workspace",n]:[];delete m.npm_config_user_agent;let H=await to("npm",["install"],{cwd:t,env:m,stdin:l,stdout:c,stderr:u,end:Pn.ErrorCode});if(H.code!==0)return H.code;let L=new cc.PassThrough,K=Cu(L);L.pipe(c);let J=await to("npm",["pack","--silent",...R],{cwd:t,env:m,stdin:l,stdout:L,stderr:u});if(J.code!==0)return J.code;let ne=(await K).toString().trim().replace(/^.*\n/s,""),q=v.resolve(t,M.toPortablePath(ne));return await T.renamePromise(q,e),0}]]).get(p);if(typeof B=="undefined")throw new Error("Assertion failed: Unsupported workflow");let b=await B();if(!(b===0||typeof b=="undefined"))throw T.detachTemp(o),new nt(z.PACKAGE_PREPARATION_FAILED,`Packing the package failed (exit code ${b}, logs can be found here: ${Ve(r,a,Le.PATH)})`)})})})}async function GFe(t,e,{project:r}){let i=r.tryWorkspaceByLocator(t);if(i!==null)return tD(i,e);let n=r.storedPackages.get(t.locatorHash);if(!n)throw new Error(`Package for ${lt(r.configuration,t)} not found in the project`);return await Jn.openPromise(async s=>{let o=r.configuration,a=r.configuration.getLinkers(),l={project:r,report:new Fe({stdout:new cc.PassThrough,configuration:o})},c=a.find(h=>h.supportsPackage(n,l));if(!c)throw new Error(`The package ${lt(r.configuration,n)} isn't supported by any of the available linkers`);let u=await c.findPackageLocation(n,l),g=new Ft(u,{baseFs:s});return(await Ze.find(Se.dot,{baseFs:g})).scripts.has(e)},{libzip:await $i()})}async function Uw(t,e,r,{cwd:i,project:n,stdin:s,stdout:o,stderr:a}){return await T.mktempPromise(async l=>{let{manifest:c,env:u,cwd:g}=await A9(t,{project:n,binFolder:l,cwd:i,lifecycleScript:e}),f=c.scripts.get(e);if(typeof f=="undefined")return 1;let h=async()=>await Fw(f,r,{cwd:g,env:u,stdin:s,stdout:o,stderr:a});return await(await n.configuration.reduceHook(d=>d.wrapScriptExecution,h,n,t,e,{script:f,args:r,cwd:g,env:u,stdin:s,stdout:o,stderr:a}))()})}async function rD(t,e,r,{cwd:i,project:n,stdin:s,stdout:o,stderr:a}){return await T.mktempPromise(async l=>{let{env:c,cwd:u}=await A9(t,{project:n,binFolder:l,cwd:i});return await Fw(e,r,{cwd:u,env:c,stdin:s,stdout:o,stderr:a})})}async function jFe(t,{binFolder:e,cwd:r,lifecycleScript:i}){let n=await Vp({project:t.project,locator:t.anchoredLocator,binFolder:e,lifecycleScript:i});return await Promise.all(Array.from(await l9(t),([s,[,o]])=>ba(e,kr(s),process.execPath,[o]))),typeof r=="undefined"&&(r=v.dirname(await T.realpathPromise(v.join(t.cwd,"package.json")))),{manifest:t.manifest,binFolder:e,env:n,cwd:r}}async function A9(t,{project:e,binFolder:r,cwd:i,lifecycleScript:n}){let s=e.tryWorkspaceByLocator(t);if(s!==null)return jFe(s,{binFolder:r,cwd:i,lifecycleScript:n});let o=e.storedPackages.get(t.locatorHash);if(!o)throw new Error(`Package for ${lt(e.configuration,t)} not found in the project`);return await Jn.openPromise(async a=>{let l=e.configuration,c=e.configuration.getLinkers(),u={project:e,report:new Fe({stdout:new cc.PassThrough,configuration:l})},g=c.find(m=>m.supportsPackage(o,u));if(!g)throw new Error(`The package ${lt(e.configuration,o)} isn't supported by any of the available linkers`);let f=await Vp({project:e,locator:t,binFolder:r,lifecycleScript:n});await Promise.all(Array.from(await Hw(t,{project:e}),([m,[,E]])=>ba(r,kr(m),process.execPath,[E])));let h=await g.findPackageLocation(o,u),p=new Ft(h,{baseFs:a}),d=await Ze.find(Se.dot,{baseFs:p});return typeof i=="undefined"&&(i=h),{manifest:d,binFolder:r,env:f,cwd:i}},{libzip:await $i()})}async function c9(t,e,r,{cwd:i,stdin:n,stdout:s,stderr:o}){return await Uw(t.anchoredLocator,e,r,{cwd:i,project:t.project,stdin:n,stdout:s,stderr:o})}function tD(t,e){return t.manifest.scripts.has(e)}async function u9(t,e,{cwd:r,report:i}){let{configuration:n}=t.project,s=null;await T.mktempPromise(async o=>{let a=v.join(o,`${e}.log`),l=`# This file contains the result of Yarn calling the "${e}" lifecycle script inside a workspace ("${M.fromPortablePath(t.cwd)}") +`,{stdout:c,stderr:u}=n.getSubprocessStreams(a,{report:i,prefix:lt(n,t.anchoredLocator),header:l});i.reportInfo(z.LIFECYCLE_SCRIPT,`Calling the "${e}" lifecycle script`);let g=await c9(t,e,[],{cwd:r,stdin:s,stdout:c,stderr:u});if(c.end(),u.end(),g!==0)throw T.detachTemp(o),new nt(z.LIFECYCLE_SCRIPT,`${(0,s9.default)(e)} script failed (exit code ${Ve(n,g,Le.NUMBER)}, logs can be found here: ${Ve(n,a,Le.PATH)}); run ${Ve(n,`yarn ${e}`,Le.CODE)} to investigate`)})}async function YFe(t,e,r){tD(t,e)&&await u9(t,e,r)}async function Hw(t,{project:e}){let r=e.configuration,i=new Map,n=e.storedPackages.get(t.locatorHash);if(!n)throw new Error(`Package for ${lt(r,t)} not found in the project`);let s=new cc.Writable,o=r.getLinkers(),a={project:e,report:new Fe({configuration:r,stdout:s})},l=new Set([t.locatorHash]);for(let u of n.dependencies.values()){let g=e.storedResolutions.get(u.descriptorHash);if(!g)throw new Error(`Assertion failed: The resolution (${Xt(r,u)}) should have been registered`);l.add(g)}let c=await Promise.all(Array.from(l,async u=>{let g=e.storedPackages.get(u);if(!g)throw new Error(`Assertion failed: The package (${u}) should have been registered`);if(g.bin.size===0)return kl.skip;let f=o.find(p=>p.supportsPackage(g,a));if(!f)return kl.skip;let h=null;try{h=await f.findPackageLocation(g,a)}catch(p){if(p.code==="LOCATOR_NOT_INSTALLED")return kl.skip;throw p}return{dependency:g,packageLocation:h}}));for(let u of c){if(u===kl.skip)continue;let{dependency:g,packageLocation:f}=u;for(let[h,p]of g.bin)i.set(h,[g,M.fromPortablePath(v.resolve(f,p))])}return i}async function l9(t){return await Hw(t.anchoredLocator,{project:t.project})}async function g9(t,e,r,{cwd:i,project:n,stdin:s,stdout:o,stderr:a,nodeArgs:l=[],packageAccessibleBinaries:c}){c!=null||(c=await Hw(t,{project:n}));let u=c.get(e);if(!u)throw new Error(`Binary not found (${e}) for ${lt(n.configuration,t)}`);return await T.mktempPromise(async g=>{let[,f]=u,h=await Vp({project:n,locator:t,binFolder:g});await Promise.all(Array.from(c,([d,[,m]])=>ba(h.BERRY_BIN_FOLDER,kr(d),process.execPath,[m])));let p;try{p=await to(process.execPath,[...l,f,...r],{cwd:i,env:h,stdin:s,stdout:o,stderr:a})}finally{await T.removePromise(h.BERRY_BIN_FOLDER)}return p.code})}async function qFe(t,e,r,{cwd:i,stdin:n,stdout:s,stderr:o,packageAccessibleBinaries:a}){return await g9(t.anchoredLocator,e,r,{project:t.project,cwd:i,stdin:n,stdout:s,stderr:o,packageAccessibleBinaries:a})}var Ai={};it(Ai,{convertToZip:()=>lTe,extractArchiveTo:()=>uTe,makeArchiveFromDirectory:()=>ATe});var d_=ie(require("stream")),C_=ie(ZV());var u_=ie(require("os")),g_=ie(c_()),f_=ie(require("worker_threads")),ER=class{constructor(e){this.source=e;this.pool=[];this.queue=new g_.default({concurrency:Math.max(1,(0,u_.cpus)().length)});let r=setTimeout(()=>{if(!(this.queue.size!==0||this.queue.pending!==0)){for(let i of this.pool)i.terminate();this.pool=[]}},1e3).unref();this.queue.on("idle",()=>{r.refresh()})}run(e){return this.queue.add(()=>{var i;let r=(i=this.pool.pop())!=null?i:new f_.Worker(this.source,{eval:!0,execArgv:[...process.execArgv,"--unhandled-rejections=strict"]});return r.ref(),new Promise((n,s)=>{let o=a=>{a!==0&&s(new Error(`Worker exited with code ${a}`))};r.once("message",a=>{this.pool.push(r),r.unref(),r.off("error",s),r.off("exit",o),n(a)}),r.once("error",s),r.once("exit",o),r.postMessage(e)})})}};var m_=ie(p_());async function ATe(t,{baseFs:e=new Wt,prefixPath:r=Se.root,compressionLevel:i,inMemory:n=!1}={}){let s=await $i(),o;if(n)o=new Jr(null,{libzip:s,level:i});else{let l=await T.mktempPromise(),c=v.join(l,"archive.zip");o=new Jr(c,{create:!0,libzip:s,level:i})}let a=v.resolve(Se.root,r);return await o.copyPromise(a,t,{baseFs:e,stableTime:!0,stableSort:!0}),o}var I_;async function lTe(t,e){let r=await T.mktempPromise(),i=v.join(r,"archive.zip");return I_||(I_=new ER((0,m_.getContent)())),await I_.run({tmpFile:i,tgz:t,opts:e}),new Jr(i,{libzip:await $i(),level:e.compressionLevel})}async function*cTe(t){let e=new C_.default.Parse,r=new d_.PassThrough({objectMode:!0,autoDestroy:!0,emitClose:!0});e.on("entry",i=>{r.write(i)}),e.on("error",i=>{r.destroy(i)}),e.on("close",()=>{r.destroyed||r.end()}),e.end(t);for await(let i of r){let n=i;yield n,n.resume()}}async function uTe(t,e,{stripComponents:r=0,prefixPath:i=Se.dot}={}){var s,o;function n(a){if(a.path[0]==="/")return!0;let l=a.path.split(/\//g);return!!(l.some(c=>c==="..")||l.length<=r)}for await(let a of cTe(t)){if(n(a))continue;let l=v.normalize(M.toPortablePath(a.path)).replace(/\/$/,"").split(/\//g);if(l.length<=r)continue;let c=l.slice(r).join("/"),u=v.join(i,c),g=420;switch((a.type==="Directory"||(((s=a.mode)!=null?s:0)&73)!=0)&&(g|=73),a.type){case"Directory":e.mkdirpSync(v.dirname(u),{chmod:493,utimes:[mr.SAFE_TIME,mr.SAFE_TIME]}),e.mkdirSync(u,{mode:g}),e.utimesSync(u,mr.SAFE_TIME,mr.SAFE_TIME);break;case"OldFile":case"File":e.mkdirpSync(v.dirname(u),{chmod:493,utimes:[mr.SAFE_TIME,mr.SAFE_TIME]}),e.writeFileSync(u,await Cu(a),{mode:g}),e.utimesSync(u,mr.SAFE_TIME,mr.SAFE_TIME);break;case"SymbolicLink":e.mkdirpSync(v.dirname(u),{chmod:493,utimes:[mr.SAFE_TIME,mr.SAFE_TIME]}),e.symlinkSync(a.linkpath,u),(o=e.lutimesSync)==null||o.call(e,u,mr.SAFE_TIME,mr.SAFE_TIME);break}}return e}var Hs={};it(Hs,{emitList:()=>gTe,emitTree:()=>b_,treeNodeToJson:()=>Q_,treeNodeToTreeify:()=>B_});var w_=ie(y_());function B_(t,{configuration:e}){let r={},i=(n,s)=>{let o=Array.isArray(n)?n.entries():Object.entries(n);for(let[a,{label:l,value:c,children:u}]of o){let g=[];typeof l!="undefined"&&g.push(Py(e,l,Gl.BOLD)),typeof c!="undefined"&&g.push(Ve(e,c[0],c[1])),g.length===0&&g.push(Py(e,`${a}`,Gl.BOLD));let f=g.join(": "),h=s[f]={};typeof u!="undefined"&&i(u,h)}};if(typeof t.children=="undefined")throw new Error("The root node must only contain children");return i(t.children,r),r}function Q_(t){let e=r=>{var s;if(typeof r.children=="undefined"){if(typeof r.value=="undefined")throw new Error("Assertion failed: Expected a value to be set if the children are missing");return Uu(r.value[0],r.value[1])}let i=Array.isArray(r.children)?r.children.entries():Object.entries((s=r.children)!=null?s:{}),n=Array.isArray(r.children)?[]:{};for(let[o,a]of i)n[o]=e(a);return typeof r.value=="undefined"?n:{value:Uu(r.value[0],r.value[1]),children:n}};return e(t)}function gTe(t,{configuration:e,stdout:r,json:i}){let n=t.map(s=>({value:s}));b_({children:n},{configuration:e,stdout:r,json:i})}function b_(t,{configuration:e,stdout:r,json:i,separators:n=0}){var o;if(i){let a=Array.isArray(t.children)?t.children.values():Object.values((o=t.children)!=null?o:{});for(let l of a)r.write(`${JSON.stringify(Q_(l))} +`);return}let s=(0,w_.asTree)(B_(t,{configuration:e}),!1,!1);if(n>=1&&(s=s.replace(/^([ā”œā””]ā”€)/gm,`\u2502 +$1`).replace(/^ā”‚\n/,"")),n>=2)for(let a=0;a<2;++a)s=s.replace(/^([ā”‚ ].{2}[ā”œā”‚ ].{2}[^\n]+\n)(([ā”‚ ]).{2}[ā”œā””].{2}[^\n]*\n[ā”‚ ].{2}[ā”‚ ].{2}[ā”œā””]ā”€)/gm,`$1$3 \u2502 +$2`).replace(/^ā”‚\n/,"");if(n>=3)throw new Error("Only the first two levels are accepted by treeUtils.emitTree");r.write(s)}var v_=ie(require("crypto")),BR=ie(require("fs"));var fTe=8,Qt=class{constructor(e,{configuration:r,immutable:i=r.get("enableImmutableCache"),check:n=!1}){this.markedFiles=new Set;this.mutexes=new Map;this.cacheId=`-${(0,v_.randomBytes)(8).toString("hex")}.tmp`;this.configuration=r,this.cwd=e,this.immutable=i,this.check=n;let s=r.get("cacheKeyOverride");if(s!==null)this.cacheKey=`${s}`;else{let o=r.get("compressionLevel"),a=o!==pl?`c${o}`:"";this.cacheKey=[fTe,a].join("")}}static async find(e,{immutable:r,check:i}={}){let n=new Qt(e.get("cacheFolder"),{configuration:e,immutable:r,check:i});return await n.setup(),n}get mirrorCwd(){if(!this.configuration.get("enableMirror"))return null;let e=`${this.configuration.get("globalFolder")}/cache`;return e!==this.cwd?e:null}getVersionFilename(e){return`${Mu(e)}-${this.cacheKey}.zip`}getChecksumFilename(e,r){let n=hTe(r).slice(0,10);return`${Mu(e)}-${n}.zip`}getLocatorPath(e,r,i={}){var s;return this.mirrorCwd===null||((s=i.unstablePackages)==null?void 0:s.has(e.locatorHash))?v.resolve(this.cwd,this.getVersionFilename(e)):r===null||QR(r)!==this.cacheKey?null:v.resolve(this.cwd,this.getChecksumFilename(e,r))}getLocatorMirrorPath(e){let r=this.mirrorCwd;return r!==null?v.resolve(r,this.getVersionFilename(e)):null}async setup(){if(!this.configuration.get("enableGlobalCache"))if(this.immutable){if(!await T.existsPromise(this.cwd))throw new nt(z.IMMUTABLE_CACHE,"Cache path does not exist.")}else{await T.mkdirPromise(this.cwd,{recursive:!0});let e=v.resolve(this.cwd,".gitignore");await T.changeFilePromise(e,`/.gitignore +*.flock +*.tmp +`)}(this.mirrorCwd||!this.immutable)&&await T.mkdirPromise(this.mirrorCwd||this.cwd,{recursive:!0})}async fetchPackageFromCache(e,r,a){var l=a,{onHit:i,onMiss:n,loader:s}=l,o=qr(l,["onHit","onMiss","loader"]);var A;let c=this.getLocatorMirrorPath(e),u=new Wt,g=()=>{let V=new Jr(null,{libzip:H}),W=v.join(Se.root,Lx(e));return V.mkdirSync(W,{recursive:!0}),V.writeJsonSync(v.join(W,wt.manifest),{name:St(e),mocked:!0}),V},f=async(V,W=null)=>{let X=!o.skipIntegrityCheck||!r?`${this.cacheKey}/${await Iy(V)}`:r;if(W!==null){let F=!o.skipIntegrityCheck||!r?`${this.cacheKey}/${await Iy(W)}`:r;if(X!==F)throw new nt(z.CACHE_CHECKSUM_MISMATCH,"The remote archive doesn't match the local checksum - has the local cache been corrupted?")}if(r!==null&&X!==r){let F;switch(this.check?F="throw":QR(r)!==QR(X)?F="update":F=this.configuration.get("checksumBehavior"),F){case"ignore":return r;case"update":return X;default:case"throw":throw new nt(z.CACHE_CHECKSUM_MISMATCH,"The remote archive doesn't match the expected checksum")}}return X},h=async V=>{if(!s)throw new Error(`Cache check required but no loader configured for ${lt(this.configuration,e)}`);let W=await s(),X=W.getRealPath();return W.saveAndClose(),await T.chmodPromise(X,420),await f(V,X)},p=async()=>{if(c===null||!await T.existsPromise(c)){let V=await s(),W=V.getRealPath();return V.saveAndClose(),{source:"loader",path:W}}return{source:"mirror",path:c}},d=async()=>{if(!s)throw new Error(`Cache entry required but missing for ${lt(this.configuration,e)}`);if(this.immutable)throw new nt(z.IMMUTABLE_CACHE,`Cache entry required but missing for ${lt(this.configuration,e)}`);let{path:V,source:W}=await p(),X=await f(V),F=this.getLocatorPath(e,X,o);if(!F)throw new Error("Assertion failed: Expected the cache path to be available");let D=[];W!=="mirror"&&c!==null&&D.push(async()=>{let pe=`${c}${this.cacheId}`;await T.copyFilePromise(V,pe,BR.default.constants.COPYFILE_FICLONE),await T.chmodPromise(pe,420),await T.renamePromise(pe,c)}),(!o.mirrorWriteOnly||c===null)&&D.push(async()=>{let pe=`${F}${this.cacheId}`;await T.copyFilePromise(V,pe,BR.default.constants.COPYFILE_FICLONE),await T.chmodPromise(pe,420),await T.renamePromise(pe,F)});let he=o.mirrorWriteOnly&&c!=null?c:F;return await Promise.all(D.map(pe=>pe())),[!1,he,X]},m=async()=>{let W=(async()=>{var Ne;let X=this.getLocatorPath(e,r,o),F=X!==null?await u.existsPromise(X):!1,D=!!((Ne=o.mockedPackages)==null?void 0:Ne.has(e.locatorHash))&&(!this.check||!F),he=D||F,pe=he?i:n;if(pe&&pe(),he){let Pe=null,qe=X;return D||(Pe=this.check?await h(qe):await f(qe)),[D,qe,Pe]}else return d()})();this.mutexes.set(e.locatorHash,W);try{return await W}finally{this.mutexes.delete(e.locatorHash)}};for(let V;V=this.mutexes.get(e.locatorHash);)await V;let[E,B,b]=await m();this.markedFiles.add(B);let R,H=await $i(),L=E?()=>g():()=>new Jr(B,{baseFs:u,libzip:H,readOnly:!0}),K=new oh(()=>Mv(()=>R=L(),V=>`Failed to open the cache entry for ${lt(this.configuration,e)}: ${V}`),v),J=new Xo(B,{baseFs:K,pathUtils:v}),ne=()=>{R==null||R.discardAndClose()},q=((A=o.unstablePackages)==null?void 0:A.has(e.locatorHash))?null:b;return[J,ne,q]}};function QR(t){let e=t.indexOf("/");return e!==-1?t.slice(0,e):null}function hTe(t){let e=t.indexOf("/");return e!==-1?t.slice(e+1):t}var F_=ie(x_()),NB=ie(ml());var N_=ie(Wp()),kR=ie(require("stream"));var k_={hooks:{reduceDependency:(t,e,r,i,{resolver:n,resolveOptions:s})=>{for(let{pattern:o,reference:a}of e.topLevelWorkspace.manifest.resolutions){if(o.from&&o.from.fullName!==St(r)||o.from&&o.from.description&&o.from.description!==r.reference||o.descriptor.fullName!==St(t)||o.descriptor.description&&o.descriptor.description!==t.range)continue;return n.bindDescriptor(Yt(t,a),e.topLevelWorkspace.anchoredLocator,s)}return t},validateProject:async(t,e)=>{for(let r of t.workspaces){let i=hp(t.configuration,r);await t.configuration.triggerHook(n=>n.validateWorkspace,r,{reportWarning:(n,s)=>e.reportWarning(n,`${i}: ${s}`),reportError:(n,s)=>e.reportError(n,`${i}: ${s}`)})}},validateWorkspace:async(t,e)=>{let{manifest:r}=t;r.resolutions.length&&t.cwd!==t.project.cwd&&r.errors.push(new Error("Resolutions field will be ignored"));for(let i of r.errors)e.reportWarning(z.INVALID_MANIFEST,i.message)}}};var vR=class{constructor(e){this.fetchers=e}supports(e,r){return!!this.tryFetcher(e,r)}getLocalPath(e,r){return this.getFetcher(e,r).getLocalPath(e,r)}async fetch(e,r){return await this.getFetcher(e,r).fetch(e,r)}tryFetcher(e,r){let i=this.fetchers.find(n=>n.supports(e,r));return i||null}getFetcher(e,r){let i=this.fetchers.find(n=>n.supports(e,r));if(!i)throw new nt(z.FETCHER_NOT_FOUND,`${lt(r.project.configuration,e)} isn't supported by any available fetcher`);return i}};var pd=class{constructor(e){this.resolvers=e.filter(r=>r)}supportsDescriptor(e,r){return!!this.tryResolverByDescriptor(e,r)}supportsLocator(e,r){return!!this.tryResolverByLocator(e,r)}shouldPersistResolution(e,r){return this.getResolverByLocator(e,r).shouldPersistResolution(e,r)}bindDescriptor(e,r,i){return this.getResolverByDescriptor(e,i).bindDescriptor(e,r,i)}getResolutionDependencies(e,r){return this.getResolverByDescriptor(e,r).getResolutionDependencies(e,r)}async getCandidates(e,r,i){return await this.getResolverByDescriptor(e,i).getCandidates(e,r,i)}async getSatisfying(e,r,i){return this.getResolverByDescriptor(e,i).getSatisfying(e,r,i)}async resolve(e,r){return await this.getResolverByLocator(e,r).resolve(e,r)}tryResolverByDescriptor(e,r){let i=this.resolvers.find(n=>n.supportsDescriptor(e,r));return i||null}getResolverByDescriptor(e,r){let i=this.resolvers.find(n=>n.supportsDescriptor(e,r));if(!i)throw new Error(`${Xt(r.project.configuration,e)} isn't supported by any available resolver`);return i}tryResolverByLocator(e,r){let i=this.resolvers.find(n=>n.supportsLocator(e,r));return i||null}getResolverByLocator(e,r){let i=this.resolvers.find(n=>n.supportsLocator(e,r));if(!i)throw new Error(`${lt(r.project.configuration,e)} isn't supported by any available resolver`);return i}};var P_=ie(Or());var Rg=/^(?!v)[a-z0-9._-]+$/i,SR=class{supportsDescriptor(e,r){return!!(Us(e.range)||Rg.test(e.range))}supportsLocator(e,r){return!!(P_.default.valid(e.reference)||Rg.test(e.reference))}shouldPersistResolution(e,r){return r.resolver.shouldPersistResolution(this.forwardLocator(e,r),r)}bindDescriptor(e,r,i){return i.resolver.bindDescriptor(this.forwardDescriptor(e,i),r,i)}getResolutionDependencies(e,r){return r.resolver.getResolutionDependencies(this.forwardDescriptor(e,r),r)}async getCandidates(e,r,i){return await i.resolver.getCandidates(this.forwardDescriptor(e,i),r,i)}async getSatisfying(e,r,i){return await i.resolver.getSatisfying(this.forwardDescriptor(e,i),r,i)}async resolve(e,r){let i=await r.resolver.resolve(this.forwardLocator(e,r),r);return op(i,e)}forwardDescriptor(e,r){return Yt(e,`${r.project.configuration.get("defaultProtocol")}${e.range}`)}forwardLocator(e,r){return Vi(e,`${r.project.configuration.get("defaultProtocol")}${e.reference}`)}};var dd=class{supports(e){return!!e.reference.startsWith("virtual:")}getLocalPath(e,r){let i=e.reference.indexOf("#");if(i===-1)throw new Error("Invalid virtual package reference");let n=e.reference.slice(i+1),s=Vi(e,n);return r.fetcher.getLocalPath(s,r)}async fetch(e,r){let i=e.reference.indexOf("#");if(i===-1)throw new Error("Invalid virtual package reference");let n=e.reference.slice(i+1),s=Vi(e,n),o=await r.fetcher.fetch(s,r);return await this.ensureVirtualLink(e,o,r)}getLocatorFilename(e){return Mu(e)}async ensureVirtualLink(e,r,i){let n=r.packageFs.getRealPath(),s=i.project.configuration.get("virtualFolder"),o=this.getLocatorFilename(e),a=Pr.makeVirtualPath(s,o,n),l=new Xo(a,{baseFs:r.packageFs,pathUtils:v});return _(P({},r),{packageFs:l})}};var Fg=class{static isVirtualDescriptor(e){return!!e.range.startsWith(Fg.protocol)}static isVirtualLocator(e){return!!e.reference.startsWith(Fg.protocol)}supportsDescriptor(e,r){return Fg.isVirtualDescriptor(e)}supportsLocator(e,r){return Fg.isVirtualLocator(e)}shouldPersistResolution(e,r){return!1}bindDescriptor(e,r,i){throw new Error('Assertion failed: calling "bindDescriptor" on a virtual descriptor is unsupported')}getResolutionDependencies(e,r){throw new Error('Assertion failed: calling "getResolutionDependencies" on a virtual descriptor is unsupported')}async getCandidates(e,r,i){throw new Error('Assertion failed: calling "getCandidates" on a virtual descriptor is unsupported')}async getSatisfying(e,r,i){throw new Error('Assertion failed: calling "getSatisfying" on a virtual descriptor is unsupported')}async resolve(e,r){throw new Error('Assertion failed: calling "resolve" on a virtual locator is unsupported')}},FB=Fg;FB.protocol="virtual:";var xR=class{supports(e){return!!e.reference.startsWith(Yr.protocol)}getLocalPath(e,r){return this.getWorkspace(e,r).cwd}async fetch(e,r){let i=this.getWorkspace(e,r).cwd;return{packageFs:new Ft(i),prefixPath:Se.dot,localPath:i}}getWorkspace(e,r){return r.project.getWorkspaceByCwd(e.reference.slice(Yr.protocol.length))}};var D_=ie(require("module"));function R_(){return new Set(D_.default.builtinModules||Object.keys(process.binding("natives")))}var dTe=new Set(["binFolder","version","flags","profile","gpg","ignoreNode","wrapOutput","home","confDir"]),LB="yarn_",PR=".yarnrc.yml",DR="yarn.lock",CTe="********",ge;(function(u){u.ANY="ANY",u.BOOLEAN="BOOLEAN",u.ABSOLUTE_PATH="ABSOLUTE_PATH",u.LOCATOR="LOCATOR",u.LOCATOR_LOOSE="LOCATOR_LOOSE",u.NUMBER="NUMBER",u.STRING="STRING",u.SECRET="SECRET",u.SHAPE="SHAPE",u.MAP="MAP"})(ge||(ge={}));var ps=Le,RR={lastUpdateCheck:{description:"Last timestamp we checked whether new Yarn versions were available",type:ge.STRING,default:null},yarnPath:{description:"Path to the local executable that must be used over the global one",type:ge.ABSOLUTE_PATH,default:null},ignorePath:{description:"If true, the local executable will be ignored when using the global one",type:ge.BOOLEAN,default:!1},ignoreCwd:{description:"If true, the `--cwd` flag will be ignored",type:ge.BOOLEAN,default:!1},cacheKeyOverride:{description:"A global cache key override; used only for test purposes",type:ge.STRING,default:null},globalFolder:{description:"Folder where are stored the system-wide settings",type:ge.ABSOLUTE_PATH,default:Rb()},cacheFolder:{description:"Folder where the cache files must be written",type:ge.ABSOLUTE_PATH,default:"./.yarn/cache"},compressionLevel:{description:"Zip files compression level, from 0 to 9 or mixed (a variant of 9, which stores some files uncompressed, when compression doesn't yield good results)",type:ge.NUMBER,values:["mixed",0,1,2,3,4,5,6,7,8,9],default:pl},virtualFolder:{description:"Folder where the virtual packages (cf doc) will be mapped on the disk (must be named __virtual__)",type:ge.ABSOLUTE_PATH,default:"./.yarn/__virtual__"},lockfileFilename:{description:"Name of the files where the Yarn dependency tree entries must be stored",type:ge.STRING,default:DR},installStatePath:{description:"Path of the file where the install state will be persisted",type:ge.ABSOLUTE_PATH,default:"./.yarn/install-state.gz"},immutablePatterns:{description:"Array of glob patterns; files matching them won't be allowed to change during immutable installs",type:ge.STRING,default:[],isArray:!0},rcFilename:{description:"Name of the files where the configuration can be found",type:ge.STRING,default:TB()},enableGlobalCache:{description:"If true, the system-wide cache folder will be used regardless of `cache-folder`",type:ge.BOOLEAN,default:!1},enableColors:{description:"If true, the CLI is allowed to use colors in its output",type:ge.BOOLEAN,default:xy,defaultText:""},enableHyperlinks:{description:"If true, the CLI is allowed to use hyperlinks in its output",type:ge.BOOLEAN,default:Mx,defaultText:""},enableInlineBuilds:{description:"If true, the CLI will print the build output on the command line",type:ge.BOOLEAN,default:NB.isCI,defaultText:""},enableMessageNames:{description:"If true, the CLI will prefix most messages with codes suitable for search engines",type:ge.BOOLEAN,default:!0},enableProgressBars:{description:"If true, the CLI is allowed to show a progress bar for long-running events",type:ge.BOOLEAN,default:!NB.isCI&&process.stdout.isTTY&&process.stdout.columns>22,defaultText:""},enableTimers:{description:"If true, the CLI is allowed to print the time spent executing commands",type:ge.BOOLEAN,default:!0},preferAggregateCacheInfo:{description:"If true, the CLI will only print a one-line report of any cache changes",type:ge.BOOLEAN,default:NB.isCI},preferInteractive:{description:"If true, the CLI will automatically use the interactive mode when called from a TTY",type:ge.BOOLEAN,default:!1},preferTruncatedLines:{description:"If true, the CLI will truncate lines that would go beyond the size of the terminal",type:ge.BOOLEAN,default:!1},progressBarStyle:{description:"Which style of progress bar should be used (only when progress bars are enabled)",type:ge.STRING,default:void 0,defaultText:""},defaultLanguageName:{description:"Default language mode that should be used when a package doesn't offer any insight",type:ge.STRING,default:"node"},defaultProtocol:{description:"Default resolution protocol used when resolving pure semver and tag ranges",type:ge.STRING,default:"npm:"},enableTransparentWorkspaces:{description:"If false, Yarn won't automatically resolve workspace dependencies unless they use the `workspace:` protocol",type:ge.BOOLEAN,default:!0},supportedArchitectures:{description:"Architectures that Yarn will fetch and inject into the resolver",type:ge.SHAPE,properties:{os:{description:"Array of supported process.platform strings, or null to target them all",type:ge.STRING,isArray:!0,isNullable:!0,default:["current"]},cpu:{description:"Array of supported process.arch strings, or null to target them all",type:ge.STRING,isArray:!0,isNullable:!0,default:["current"]}}},enableMirror:{description:"If true, the downloaded packages will be retrieved and stored in both the local and global folders",type:ge.BOOLEAN,default:!0},enableNetwork:{description:"If false, the package manager will refuse to use the network if required to",type:ge.BOOLEAN,default:!0},httpProxy:{description:"URL of the http proxy that must be used for outgoing http requests",type:ge.STRING,default:null},httpsProxy:{description:"URL of the http proxy that must be used for outgoing https requests",type:ge.STRING,default:null},unsafeHttpWhitelist:{description:"List of the hostnames for which http queries are allowed (glob patterns are supported)",type:ge.STRING,default:[],isArray:!0},httpTimeout:{description:"Timeout of each http request in milliseconds",type:ge.NUMBER,default:6e4},httpRetry:{description:"Retry times on http failure",type:ge.NUMBER,default:3},networkConcurrency:{description:"Maximal number of concurrent requests",type:ge.NUMBER,default:50},networkSettings:{description:"Network settings per hostname (glob patterns are supported)",type:ge.MAP,valueDefinition:{description:"",type:ge.SHAPE,properties:{caFilePath:{description:"Path to file containing one or multiple Certificate Authority signing certificates",type:ge.ABSOLUTE_PATH,default:null},enableNetwork:{description:"If false, the package manager will refuse to use the network if required to",type:ge.BOOLEAN,default:null},httpProxy:{description:"URL of the http proxy that must be used for outgoing http requests",type:ge.STRING,default:null},httpsProxy:{description:"URL of the http proxy that must be used for outgoing https requests",type:ge.STRING,default:null}}}},caFilePath:{description:"A path to a file containing one or multiple Certificate Authority signing certificates",type:ge.ABSOLUTE_PATH,default:null},enableStrictSsl:{description:"If false, SSL certificate errors will be ignored",type:ge.BOOLEAN,default:!0},logFilters:{description:"Overrides for log levels",type:ge.SHAPE,isArray:!0,concatenateValues:!0,properties:{code:{description:"Code of the messages covered by this override",type:ge.STRING,default:void 0},text:{description:"Code of the texts covered by this override",type:ge.STRING,default:void 0},pattern:{description:"Code of the patterns covered by this override",type:ge.STRING,default:void 0},level:{description:"Log level override, set to null to remove override",type:ge.STRING,values:Object.values(Ts),isNullable:!0,default:void 0}}},enableTelemetry:{description:"If true, telemetry will be periodically sent, following the rules in https://yarnpkg.com/advanced/telemetry",type:ge.BOOLEAN,default:!0},telemetryInterval:{description:"Minimal amount of time between two telemetry uploads, in days",type:ge.NUMBER,default:7},telemetryUserId:{description:"If you desire to tell us which project you are, you can set this field. Completely optional and opt-in.",type:ge.STRING,default:null},enableScripts:{description:"If true, packages are allowed to have install scripts by default",type:ge.BOOLEAN,default:!0},enableStrictSettings:{description:"If true, unknown settings will cause Yarn to abort",type:ge.BOOLEAN,default:!0},enableImmutableCache:{description:"If true, the cache is reputed immutable and actions that would modify it will throw",type:ge.BOOLEAN,default:!1},checksumBehavior:{description:"Enumeration defining what to do when a checksum doesn't match expectations",type:ge.STRING,default:"throw"},packageExtensions:{description:"Map of package corrections to apply on the dependency tree",type:ge.MAP,valueDefinition:{description:"The extension that will be applied to any package whose version matches the specified range",type:ge.SHAPE,properties:{dependencies:{description:"The set of dependencies that must be made available to the current package in order for it to work properly",type:ge.MAP,valueDefinition:{description:"A range",type:ge.STRING}},peerDependencies:{description:"Inherited dependencies - the consumer of the package will be tasked to provide them",type:ge.MAP,valueDefinition:{description:"A semver range",type:ge.STRING}},peerDependenciesMeta:{description:"Extra information related to the dependencies listed in the peerDependencies field",type:ge.MAP,valueDefinition:{description:"The peerDependency meta",type:ge.SHAPE,properties:{optional:{description:"If true, the selected peer dependency will be marked as optional by the package manager and the consumer omitting it won't be reported as an error",type:ge.BOOLEAN,default:!1}}}}}}}};function NR(t,e,r,i,n){if(i.isArray||i.type===ge.ANY&&Array.isArray(r))return Array.isArray(r)?r.map((s,o)=>FR(t,`${e}[${o}]`,s,i,n)):String(r).split(/,/).map(s=>FR(t,e,s,i,n));if(Array.isArray(r))throw new Error(`Non-array configuration settings "${e}" cannot be an array`);return FR(t,e,r,i,n)}function FR(t,e,r,i,n){var a;switch(i.type){case ge.ANY:return r;case ge.SHAPE:return mTe(t,e,r,i,n);case ge.MAP:return ITe(t,e,r,i,n)}if(r===null&&!i.isNullable&&i.default!==null)throw new Error(`Non-nullable configuration settings "${e}" cannot be set to null`);if((a=i.values)==null?void 0:a.includes(r))return r;let o=(()=>{if(i.type===ge.BOOLEAN&&typeof r!="string")return Hh(r);if(typeof r!="string")throw new Error(`Expected value (${r}) to be a string`);let l=Ov(r,{env:process.env});switch(i.type){case ge.ABSOLUTE_PATH:return v.resolve(n,M.toPortablePath(l));case ge.LOCATOR_LOOSE:return Hl(l,!1);case ge.NUMBER:return parseInt(l);case ge.LOCATOR:return Hl(l);case ge.BOOLEAN:return Hh(l);default:return l}})();if(i.values&&!i.values.includes(o))throw new Error(`Invalid value, expected one of ${i.values.join(", ")}`);return o}function mTe(t,e,r,i,n){if(typeof r!="object"||Array.isArray(r))throw new me(`Object configuration settings "${e}" must be an object`);let s=LR(t,i,{ignoreArrays:!0});if(r===null)return s;for(let[o,a]of Object.entries(r)){let l=`${e}.${o}`;if(!i.properties[o])throw new me(`Unrecognized configuration settings found: ${e}.${o} - run "yarn config -v" to see the list of settings supported in Yarn`);s.set(o,NR(t,l,a,i.properties[o],n))}return s}function ITe(t,e,r,i,n){let s=new Map;if(typeof r!="object"||Array.isArray(r))throw new me(`Map configuration settings "${e}" must be an object`);if(r===null)return s;for(let[o,a]of Object.entries(r)){let l=i.normalizeKeys?i.normalizeKeys(o):o,c=`${e}['${l}']`,u=i.valueDefinition;s.set(l,NR(t,c,a,u,n))}return s}function LR(t,e,{ignoreArrays:r=!1}={}){switch(e.type){case ge.SHAPE:{if(e.isArray&&!r)return[];let i=new Map;for(let[n,s]of Object.entries(e.properties))i.set(n,LR(t,s));return i}break;case ge.MAP:return e.isArray&&!r?[]:new Map;case ge.ABSOLUTE_PATH:return e.default===null?null:t.projectCwd===null?v.isAbsolute(e.default)?v.normalize(e.default):e.isNullable?null:void 0:Array.isArray(e.default)?e.default.map(i=>v.resolve(t.projectCwd,i)):v.resolve(t.projectCwd,e.default);default:return e.default}}function MB(t,e,r){if(e.type===ge.SECRET&&typeof t=="string"&&r.hideSecrets)return CTe;if(e.type===ge.ABSOLUTE_PATH&&typeof t=="string"&&r.getNativePaths)return M.fromPortablePath(t);if(e.isArray&&Array.isArray(t)){let i=[];for(let n of t)i.push(MB(n,e,r));return i}if(e.type===ge.MAP&&t instanceof Map){let i=new Map;for(let[n,s]of t.entries())i.set(n,MB(s,e.valueDefinition,r));return i}if(e.type===ge.SHAPE&&t instanceof Map){let i=new Map;for(let[n,s]of t.entries()){let o=e.properties[n];i.set(n,MB(s,o,r))}return i}return t}function ETe(){let t={};for(let[e,r]of Object.entries(process.env))e=e.toLowerCase(),!!e.startsWith(LB)&&(e=(0,F_.default)(e.slice(LB.length)),t[e]=r);return t}function TB(){let t=`${LB}rc_filename`;for(let[e,r]of Object.entries(process.env))if(e.toLowerCase()===t&&typeof r=="string")return r;return PR}var KA;(function(i){i[i.LOCKFILE=0]="LOCKFILE",i[i.MANIFEST=1]="MANIFEST",i[i.NONE=2]="NONE"})(KA||(KA={}));var Ra=class{constructor(e){this.projectCwd=null;this.plugins=new Map;this.settings=new Map;this.values=new Map;this.sources=new Map;this.invalid=new Map;this.packageExtensions=new Map;this.limits=new Map;this.startingCwd=e}static create(e,r,i){let n=new Ra(e);typeof r!="undefined"&&!(r instanceof Map)&&(n.projectCwd=r),n.importSettings(RR);let s=typeof i!="undefined"?i:r instanceof Map?r:new Map;for(let[o,a]of s)n.activatePlugin(o,a);return n}static async find(e,r,{lookup:i=0,strict:n=!0,usePath:s=!1,useRc:o=!0}={}){let a=ETe();delete a.rcFilename;let l=await Ra.findRcFiles(e),c=await Ra.findHomeRcFile();if(c){let E=l.find(B=>B.path===c.path);E?E.strict=!1:l.push(_(P({},c),{strict:!1}))}let u=({ignoreCwd:E,yarnPath:B,ignorePath:b,lockfileFilename:R})=>({ignoreCwd:E,yarnPath:B,ignorePath:b,lockfileFilename:R}),g=L=>{var K=L,{ignoreCwd:E,yarnPath:B,ignorePath:b,lockfileFilename:R}=K,H=qr(K,["ignoreCwd","yarnPath","ignorePath","lockfileFilename"]);return H},f=new Ra(e);f.importSettings(u(RR)),f.useWithSource("",u(a),e,{strict:!1});for(let{path:E,cwd:B,data:b}of l)f.useWithSource(E,u(b),B,{strict:!1});if(s){let E=f.get("yarnPath"),B=f.get("ignorePath");if(E!==null&&!B)return f}let h=f.get("lockfileFilename"),p;switch(i){case 0:p=await Ra.findProjectCwd(e,h);break;case 1:p=await Ra.findProjectCwd(e,null);break;case 2:T.existsSync(v.join(e,"package.json"))?p=v.resolve(e):p=null;break}f.startingCwd=e,f.projectCwd=p,f.importSettings(g(RR));let d=new Map([["@@core",k_]]),m=E=>"default"in E?E.default:E;if(r!==null){for(let R of r.plugins.keys())d.set(R,m(r.modules.get(R)));let E=new Map;for(let R of R_())E.set(R,()=>mu(R));for(let[R,H]of r.modules)E.set(R,()=>H);let B=new Set,b=async(R,H)=>{let{factory:L,name:K}=mu(R);if(B.has(K))return;let J=new Map(E),ne=A=>{if(J.has(A))return J.get(A)();throw new me(`This plugin cannot access the package referenced via ${A} which is neither a builtin, nor an exposed entry`)},q=await du(async()=>m(await L(ne)),A=>`${A} (when initializing ${K}, defined in ${H})`);E.set(K,()=>q),B.add(K),d.set(K,q)};if(a.plugins)for(let R of a.plugins.split(";")){let H=v.resolve(e,M.toPortablePath(R));await b(H,"")}for(let{path:R,cwd:H,data:L}of l)if(!!o&&!!Array.isArray(L.plugins))for(let K of L.plugins){let J=typeof K!="string"?K.path:K,ne=v.resolve(H,M.toPortablePath(J));await b(ne,R)}}for(let[E,B]of d)f.activatePlugin(E,B);f.useWithSource("",g(a),e,{strict:n});for(let{path:E,cwd:B,data:b,strict:R}of l)f.useWithSource(E,g(b),B,{strict:R!=null?R:n});return f.get("enableGlobalCache")&&(f.values.set("cacheFolder",`${f.get("globalFolder")}/cache`),f.sources.set("cacheFolder","")),await f.refreshPackageExtensions(),f}static async findRcFiles(e){let r=TB(),i=[],n=e,s=null;for(;n!==s;){s=n;let o=v.join(s,r);if(T.existsSync(o)){let a=await T.readFilePromise(o,"utf8"),l;try{l=Ei(a)}catch(c){let u="";throw a.match(/^\s+(?!-)[^:]+\s+\S+/m)&&(u=" (in particular, make sure you list the colons after each key name)"),new me(`Parse error when loading ${o}; please check it's proper Yaml${u}`)}i.push({path:o,cwd:s,data:l})}n=v.dirname(s)}return i}static async findHomeRcFile(){let e=TB(),r=uh(),i=v.join(r,e);if(T.existsSync(i)){let n=await T.readFilePromise(i,"utf8"),s=Ei(n);return{path:i,cwd:r,data:s}}return null}static async findProjectCwd(e,r){let i=null,n=e,s=null;for(;n!==s;){if(s=n,T.existsSync(v.join(s,"package.json"))&&(i=s),r!==null){if(T.existsSync(v.join(s,r))){i=s;break}}else if(i!==null)break;n=v.dirname(s)}return i}static async updateConfiguration(e,r){let i=TB(),n=v.join(e,i),s=T.existsSync(n)?Ei(await T.readFilePromise(n,"utf8")):{},o=!1,a;if(typeof r=="function"){try{a=r(s)}catch{a=r({})}if(a===s)return}else{a=s;for(let l of Object.keys(r)){let c=s[l],u=r[l],g;if(typeof u=="function")try{g=u(c)}catch{g=u(void 0)}else g=u;c!==g&&(a[l]=g,o=!0)}if(!o)return}await T.changeFilePromise(n,Qa(a),{automaticNewlines:!0})}static async updateHomeConfiguration(e){let r=uh();return await Ra.updateConfiguration(r,e)}activatePlugin(e,r){this.plugins.set(e,r),typeof r.configuration!="undefined"&&this.importSettings(r.configuration)}importSettings(e){for(let[r,i]of Object.entries(e))if(i!=null){if(this.settings.has(r))throw new Error(`Cannot redefine settings "${r}"`);this.settings.set(r,i),this.values.set(r,LR(this,i))}}useWithSource(e,r,i,n){try{this.use(e,r,i,n)}catch(s){throw s.message+=` (in ${Ve(this,e,Le.PATH)})`,s}}use(e,r,i,{strict:n=!0,overwrite:s=!1}={}){n=n&&this.get("enableStrictSettings");for(let o of["enableStrictSettings",...Object.keys(r)]){if(typeof r[o]=="undefined"||o==="plugins"||e===""&&dTe.has(o))continue;if(o==="rcFilename")throw new me(`The rcFilename settings can only be set via ${`${LB}RC_FILENAME`.toUpperCase()}, not via a rc file`);let l=this.settings.get(o);if(!l){if(n)throw new me(`Unrecognized or legacy configuration settings found: ${o} - run "yarn config -v" to see the list of settings supported in Yarn`);this.invalid.set(o,e);continue}if(this.sources.has(o)&&!(s||l.type===ge.MAP||l.isArray&&l.concatenateValues))continue;let c;try{c=NR(this,o,r[o],l,i)}catch(u){throw u.message+=` in ${Ve(this,e,Le.PATH)}`,u}if(o==="enableStrictSettings"&&e!==""){n=c;continue}if(l.type===ge.MAP){let u=this.values.get(o);this.values.set(o,new Map(s?[...u,...c]:[...c,...u])),this.sources.set(o,`${this.sources.get(o)}, ${e}`)}else if(l.isArray&&l.concatenateValues){let u=this.values.get(o);this.values.set(o,s?[...u,...c]:[...c,...u]),this.sources.set(o,`${this.sources.get(o)}, ${e}`)}else this.values.set(o,c),this.sources.set(o,e)}}get(e){if(!this.values.has(e))throw new Error(`Invalid configuration key "${e}"`);return this.values.get(e)}getSpecial(e,{hideSecrets:r=!1,getNativePaths:i=!1}){let n=this.get(e),s=this.settings.get(e);if(typeof s=="undefined")throw new me(`Couldn't find a configuration settings named "${e}"`);return MB(n,s,{hideSecrets:r,getNativePaths:i})}getSubprocessStreams(e,{header:r,prefix:i,report:n}){let s,o,a=T.createWriteStream(e);if(this.get("enableInlineBuilds")){let l=n.createStreamReporter(`${i} ${Ve(this,"STDOUT","green")}`),c=n.createStreamReporter(`${i} ${Ve(this,"STDERR","red")}`);s=new kR.PassThrough,s.pipe(l),s.pipe(a),o=new kR.PassThrough,o.pipe(c),o.pipe(a)}else s=a,o=a,typeof r!="undefined"&&s.write(`${r} +`);return{stdout:s,stderr:o}}makeResolver(){let e=[];for(let r of this.plugins.values())for(let i of r.resolvers||[])e.push(new i);return new pd([new FB,new Yr,new SR,...e])}makeFetcher(){let e=[];for(let r of this.plugins.values())for(let i of r.fetchers||[])e.push(new i);return new vR([new dd,new xR,...e])}getLinkers(){let e=[];for(let r of this.plugins.values())for(let i of r.linkers||[])e.push(new i);return e}getSupportedArchitectures(){let e=this.get("supportedArchitectures"),r=e.get("os");r!==null&&(r=r.map(n=>n==="current"?process.platform:n));let i=e.get("cpu");return i!==null&&(i=i.map(n=>n==="current"?process.arch:n)),{os:r,cpu:i}}async refreshPackageExtensions(){this.packageExtensions=new Map;let e=this.packageExtensions,r=(i,n,{userProvided:s=!1}={})=>{if(!Us(i.range))throw new Error("Only semver ranges are allowed as keys for the packageExtensions setting");let o=new Ze;o.load(n,{yamlCompatibilityMode:!0});let a=hu(e,i.identHash),l=[];a.push([i.range,l]);let c={status:ki.Inactive,userProvided:s,parentDescriptor:i};for(let u of o.dependencies.values())l.push(_(P({},c),{type:oi.Dependency,descriptor:u}));for(let u of o.peerDependencies.values())l.push(_(P({},c),{type:oi.PeerDependency,descriptor:u}));for(let[u,g]of o.peerDependenciesMeta)for(let[f,h]of Object.entries(g))l.push(_(P({},c),{type:oi.PeerDependencyMeta,selector:u,key:f,value:h}))};await this.triggerHook(i=>i.registerPackageExtensions,this,r);for(let[i,n]of this.get("packageExtensions"))r(pA(i,!0),aE(n),{userProvided:!0})}normalizePackage(e){let r=ap(e);if(this.packageExtensions==null)throw new Error("refreshPackageExtensions has to be called before normalizing packages");let i=this.packageExtensions.get(e.identHash);if(typeof i!="undefined"){let s=e.version;if(s!==null){for(let[o,a]of i)if(!!lc(s,o))for(let l of a)switch(l.status===ki.Inactive&&(l.status=ki.Redundant),l.type){case oi.Dependency:typeof r.dependencies.get(l.descriptor.identHash)=="undefined"&&(l.status=ki.Active,r.dependencies.set(l.descriptor.identHash,l.descriptor));break;case oi.PeerDependency:typeof r.peerDependencies.get(l.descriptor.identHash)=="undefined"&&(l.status=ki.Active,r.peerDependencies.set(l.descriptor.identHash,l.descriptor));break;case oi.PeerDependencyMeta:{let c=r.peerDependenciesMeta.get(l.selector);(typeof c=="undefined"||!Object.prototype.hasOwnProperty.call(c,l.key)||c[l.key]!==l.value)&&(l.status=ki.Active,na(r.peerDependenciesMeta,l.selector,()=>({}))[l.key]=l.value)}break;default:Lv(l);break}}}let n=s=>s.scope?`${s.scope}__${s.name}`:`${s.name}`;for(let s of r.peerDependenciesMeta.keys()){let o=In(s);r.peerDependencies.has(o.identHash)||r.peerDependencies.set(o.identHash,Yt(o,"*"))}for(let s of r.peerDependencies.values()){if(s.scope==="types")continue;let o=n(s),a=Io("types",o),l=St(a);r.peerDependencies.has(a.identHash)||r.peerDependenciesMeta.has(l)||(r.peerDependencies.set(a.identHash,Yt(a,"*")),r.peerDependenciesMeta.set(l,{optional:!0}))}return r.dependencies=new Map(gn(r.dependencies,([,s])=>En(s))),r.peerDependencies=new Map(gn(r.peerDependencies,([,s])=>En(s))),r}getLimit(e){return na(this.limits,e,()=>(0,N_.default)(this.get(e)))}async triggerHook(e,...r){for(let i of this.plugins.values()){let n=i.hooks;if(!n)continue;let s=e(n);!s||await s(...r)}}async triggerMultipleHooks(e,r){for(let i of r)await this.triggerHook(e,...i)}async reduceHook(e,r,...i){let n=r;for(let s of this.plugins.values()){let o=s.hooks;if(!o)continue;let a=e(o);!a||(n=await a(n,...i))}return n}async firstHook(e,...r){for(let i of this.plugins.values()){let n=i.hooks;if(!n)continue;let s=e(n);if(!s)continue;let o=await s(...r);if(typeof o!="undefined")return o}return null}},fe=Ra;fe.telemetry=null;var Gn;(function(r){r[r.SCRIPT=0]="SCRIPT",r[r.SHELLCODE=1]="SHELLCODE"})(Gn||(Gn={}));var Fa=class extends Xi{constructor({configuration:e,stdout:r,suggestInstall:i=!0}){super();this.errorCount=0;Cp(this,{configuration:e}),this.configuration=e,this.stdout=r,this.suggestInstall=i}static async start(e,r){let i=new this(e);try{await r(i)}catch(n){i.reportExceptionOnce(n)}finally{await i.finalize()}return i}hasErrors(){return this.errorCount>0}exitCode(){return this.hasErrors()?1:0}reportCacheHit(e){}reportCacheMiss(e){}startTimerSync(e,r,i){return(typeof r=="function"?r:i)()}async startTimerPromise(e,r,i){return await(typeof r=="function"?r:i)()}async startCacheReport(e){return await e()}reportSeparator(){}reportInfo(e,r){}reportWarning(e,r){}reportError(e,r){this.errorCount+=1,this.stdout.write(`${Ve(this.configuration,"\u27A4","redBright")} ${this.formatNameWithHyperlink(e)}: ${r} +`)}reportProgress(e){let r=Promise.resolve().then(async()=>{for await(let{}of e);}),i=()=>{};return _(P({},r),{stop:i})}reportJson(e){}async finalize(){this.errorCount>0&&(this.stdout.write(` +`),this.stdout.write(`${Ve(this.configuration,"\u27A4","redBright")} Errors happened when preparing the environment required to run this command. +`),this.suggestInstall&&this.stdout.write(`${Ve(this.configuration,"\u27A4","redBright")} This might be caused by packages being missing from the lockfile, in which case running "yarn install" might help. +`))}formatNameWithHyperlink(e){return eD(e,{configuration:this.configuration,json:!1})}};var t0=ie(require("crypto")),v$=ie(CX()),r0=ie(Q$()),S$=ie(Wp()),x$=ie(Or()),lF=ie(require("util")),cF=ie(require("v8")),uF=ie(require("zlib"));var iUe=[[/^(git(?:\+(?:https|ssh))?:\/\/.*(?:\.git)?)#(.*)$/,(t,e,r,i)=>`${r}#commit=${i}`],[/^https:\/\/((?:[^/]+?)@)?codeload\.github\.com\/([^/]+\/[^/]+)\/tar\.gz\/([0-9a-f]+)$/,(t,e,r="",i,n)=>`https://${r}github.com/${i}.git#commit=${n}`],[/^https:\/\/((?:[^/]+?)@)?github\.com\/([^/]+\/[^/]+?)(?:\.git)?#([0-9a-f]+)$/,(t,e,r="",i,n)=>`https://${r}github.com/${i}.git#commit=${n}`],[/^https?:\/\/[^/]+\/(?:[^/]+\/)*(?:@.+(?:\/|(?:%2f)))?([^/]+)\/(?:-|download)\/\1-[^/]+\.tgz(?:#|$)/,t=>`npm:${t}`],[/^https:\/\/npm\.pkg\.github\.com\/download\/(?:@[^/]+)\/(?:[^/]+)\/(?:[^/]+)\/(?:[0-9a-f]+)(?:#|$)/,t=>`npm:${t}`],[/^https:\/\/npm\.fontawesome\.com\/(?:@[^/]+)\/([^/]+)\/-\/([^/]+)\/\1-\2.tgz(?:#|$)/,t=>`npm:${t}`],[/^https?:\/\/(?:[^\\.]+)\.jfrog\.io\/.*\/(@[^/]+)\/([^/]+)\/-\/\1\/\2-(?:[.\d\w-]+)\.tgz(?:#|$)/,(t,e)=>by({protocol:"npm:",source:null,selector:t,params:{__archiveUrl:e}})],[/^[^/]+\.tgz#[0-9a-f]+$/,t=>`npm:${t}`]],oF=class{constructor(){this.resolutions=null}async setup(e,{report:r}){let i=v.join(e.cwd,e.configuration.get("lockfileFilename"));if(!T.existsSync(i))return;let n=await T.readFilePromise(i,"utf8"),s=Ei(n);if(Object.prototype.hasOwnProperty.call(s,"__metadata"))return;let o=this.resolutions=new Map;for(let a of Object.keys(s)){let l=gp(a);if(!l){r.reportWarning(z.YARN_IMPORT_FAILED,`Failed to parse the string "${a}" into a proper descriptor`);continue}Us(l.range)&&(l=Yt(l,`npm:${l.range}`));let{version:c,resolved:u}=s[a];if(!u)continue;let g;for(let[h,p]of iUe){let d=u.match(h);if(d){g=p(c,...d);break}}if(!g){r.reportWarning(z.YARN_IMPORT_FAILED,`${Xt(e.configuration,l)}: Only some patterns can be imported from legacy lockfiles (not "${u}")`);continue}let f=l;try{let h=Tu(l.range),p=gp(h.selector,!0);p&&(f=p)}catch{}o.set(l.descriptorHash,Vi(f,g))}}supportsDescriptor(e,r){return this.resolutions?this.resolutions.has(e.descriptorHash):!1}supportsLocator(e,r){return!1}shouldPersistResolution(e,r){throw new Error("Assertion failed: This resolver doesn't support resolving locators to packages")}bindDescriptor(e,r,i){return e}getResolutionDependencies(e,r){return[]}async getCandidates(e,r,i){if(!this.resolutions)throw new Error("Assertion failed: The resolution store should have been setup");let n=this.resolutions.get(e.descriptorHash);if(!n)throw new Error("Assertion failed: The resolution should have been registered");return[n]}async getSatisfying(e,r,i){return null}async resolve(e,r){throw new Error("Assertion failed: This resolver doesn't support resolving locators to packages")}};var aF=class{constructor(e){this.resolver=e}supportsDescriptor(e,r){return!!(r.project.storedResolutions.get(e.descriptorHash)||r.project.originalPackages.has(By(e).locatorHash))}supportsLocator(e,r){return!!(r.project.originalPackages.has(e.locatorHash)&&!r.project.lockfileNeedsRefresh)}shouldPersistResolution(e,r){throw new Error("The shouldPersistResolution method shouldn't be called on the lockfile resolver, which would always answer yes")}bindDescriptor(e,r,i){return e}getResolutionDependencies(e,r){return this.resolver.getResolutionDependencies(e,r)}async getCandidates(e,r,i){let n=i.project.originalPackages.get(By(e).locatorHash);if(n)return[n];let s=i.project.storedResolutions.get(e.descriptorHash);if(!s)throw new Error("Expected the resolution to have been successful - resolution not found");if(n=i.project.originalPackages.get(s),!n)throw new Error("Expected the resolution to have been successful - package not found");return[n]}async getSatisfying(e,r,i){return null}async resolve(e,r){let i=r.project.originalPackages.get(e.locatorHash);if(!i)throw new Error("The lockfile resolver isn't meant to resolve packages - they should already have been stored into a cache");return i}};var AF=class{constructor(e){this.resolver=e}supportsDescriptor(e,r){return this.resolver.supportsDescriptor(e,r)}supportsLocator(e,r){return this.resolver.supportsLocator(e,r)}shouldPersistResolution(e,r){return this.resolver.shouldPersistResolution(e,r)}bindDescriptor(e,r,i){return this.resolver.bindDescriptor(e,r,i)}getResolutionDependencies(e,r){return this.resolver.getResolutionDependencies(e,r)}async getCandidates(e,r,i){throw new nt(z.MISSING_LOCKFILE_ENTRY,`This package doesn't seem to be present in your lockfile; run "yarn install" to update the lockfile`)}async getSatisfying(e,r,i){throw new nt(z.MISSING_LOCKFILE_ENTRY,`This package doesn't seem to be present in your lockfile; run "yarn install" to update the lockfile`)}async resolve(e,r){throw new nt(z.MISSING_LOCKFILE_ENTRY,`This package doesn't seem to be present in your lockfile; run "yarn install" to update the lockfile`)}};var ei=class extends Xi{reportCacheHit(e){}reportCacheMiss(e){}startTimerSync(e,r,i){return(typeof r=="function"?r:i)()}async startTimerPromise(e,r,i){return await(typeof r=="function"?r:i)()}async startCacheReport(e){return await e()}reportSeparator(){}reportInfo(e,r){}reportWarning(e,r){}reportError(e,r){}reportProgress(e){let r=Promise.resolve().then(async()=>{for await(let{}of e);}),i=()=>{};return _(P({},r),{stop:i})}reportJson(e){}async finalize(){}};var b$=ie(vx());var Dd=class{constructor(e,{project:r}){this.workspacesCwds=new Set;this.dependencies=new Map;this.project=r,this.cwd=e}async setup(){this.manifest=T.existsSync(v.join(this.cwd,Ze.fileName))?await Ze.find(this.cwd):new Ze,this.relativeCwd=v.relative(this.project.cwd,this.cwd)||Se.dot;let e=this.manifest.name?this.manifest.name:Io(null,`${this.computeCandidateName()}-${zi(this.relativeCwd).substr(0,6)}`),r=this.manifest.version?this.manifest.version:"0.0.0";this.locator=Vi(e,r),this.anchoredDescriptor=Yt(this.locator,`${Yr.protocol}${this.relativeCwd}`),this.anchoredLocator=Vi(this.locator,`${Yr.protocol}${this.relativeCwd}`);let i=this.manifest.workspaceDefinitions.map(({pattern:s})=>s),n=await(0,b$.default)(i,{cwd:M.fromPortablePath(this.cwd),expandDirectories:!1,onlyDirectories:!0,onlyFiles:!1,ignore:["**/node_modules","**/.git","**/.yarn"]});n.sort();for(let s of n){let o=v.resolve(this.cwd,M.toPortablePath(s));T.existsSync(v.join(o,"package.json"))&&this.workspacesCwds.add(o)}}accepts(e){var o;let r=e.indexOf(":"),i=r!==-1?e.slice(0,r+1):null,n=r!==-1?e.slice(r+1):e;if(i===Yr.protocol&&v.normalize(n)===this.relativeCwd||i===Yr.protocol&&(n==="*"||n==="^"||n==="~"))return!0;let s=Us(n);return s?i===Yr.protocol?s.test((o=this.manifest.version)!=null?o:"0.0.0"):this.project.configuration.get("enableTransparentWorkspaces")&&this.manifest.version!==null?s.test(this.manifest.version):!1:!1}computeCandidateName(){return this.cwd===this.project.cwd?"root-workspace":`${v.basename(this.cwd)}`||"unnamed-workspace"}getRecursiveWorkspaceDependencies({dependencies:e=Ze.hardDependencies}={}){let r=new Set,i=n=>{for(let s of e)for(let o of n.manifest[s].values()){let a=this.project.tryWorkspaceByDescriptor(o);a===null||r.has(a)||(r.add(a),i(a))}};return i(this),r}getRecursiveWorkspaceDependents({dependencies:e=Ze.hardDependencies}={}){let r=new Set,i=n=>{for(let s of this.project.workspaces)e.some(a=>[...s.manifest[a].values()].some(l=>{let c=this.project.tryWorkspaceByDescriptor(l);return c!==null&&up(c.anchoredLocator,n.anchoredLocator)}))&&!r.has(s)&&(r.add(s),i(s))};return i(this),r}getRecursiveWorkspaceChildren(){let e=[];for(let r of this.workspacesCwds){let i=this.project.workspacesByCwd.get(r);i&&e.push(i,...i.getRecursiveWorkspaceChildren())}return e}async persistManifest(){let e={};this.manifest.exportTo(e);let r=v.join(this.cwd,Ze.fileName),i=`${JSON.stringify(e,null,this.manifest.indent)} +`;await T.changeFilePromise(r,i,{automaticNewlines:!0}),this.manifest.raw=e}};var k$=5,nUe=1,sUe=/ *, */g,P$=/\/$/,oUe=32,aUe=(0,lF.promisify)(uF.default.gzip),AUe=(0,lF.promisify)(uF.default.gunzip),li;(function(r){r.UpdateLockfile="update-lockfile",r.SkipBuild="skip-build"})(li||(li={}));var gF={restoreInstallersCustomData:["installersCustomData"],restoreResolutions:["accessibleLocators","conditionalLocators","disabledLocators","optionalBuilds","storedDescriptors","storedResolutions","storedPackages","lockFileChecksum"],restoreBuildState:["storedBuildState"]},D$=t=>zi(`${nUe}`,t),Ke=class{constructor(e,{configuration:r}){this.resolutionAliases=new Map;this.workspaces=[];this.workspacesByCwd=new Map;this.workspacesByIdent=new Map;this.storedResolutions=new Map;this.storedDescriptors=new Map;this.storedPackages=new Map;this.storedChecksums=new Map;this.storedBuildState=new Map;this.accessibleLocators=new Set;this.conditionalLocators=new Set;this.disabledLocators=new Set;this.originalPackages=new Map;this.optionalBuilds=new Set;this.lockfileNeedsRefresh=!1;this.peerRequirements=new Map;this.installersCustomData=new Map;this.lockFileChecksum=null;this.installStateChecksum=null;this.configuration=r,this.cwd=e}static async find(e,r){var c,u,g;if(!e.projectCwd)throw new me(`No project found in ${r}`);let i=e.projectCwd,n=r,s=null;for(;s!==e.projectCwd;){if(s=n,T.existsSync(v.join(s,wt.manifest))){i=s;break}n=v.dirname(s)}let o=new Ke(e.projectCwd,{configuration:e});(c=fe.telemetry)==null||c.reportProject(o.cwd),await o.setupResolutions(),await o.setupWorkspaces(),(u=fe.telemetry)==null||u.reportWorkspaceCount(o.workspaces.length),(g=fe.telemetry)==null||g.reportDependencyCount(o.workspaces.reduce((f,h)=>f+h.manifest.dependencies.size+h.manifest.devDependencies.size,0));let a=o.tryWorkspaceByCwd(i);if(a)return{project:o,workspace:a,locator:a.anchoredLocator};let l=await o.findLocatorForLocation(`${i}/`,{strict:!0});if(l)return{project:o,locator:l,workspace:null};throw new me(`The nearest package directory (${Ve(e,i,Le.PATH)}) doesn't seem to be part of the project declared in ${Ve(e,o.cwd,Le.PATH)}. + +- If the project directory is right, it might be that you forgot to list ${Ve(e,v.relative(o.cwd,i),Le.PATH)} as a workspace. +- If it isn't, it's likely because you have a yarn.lock or package.json file there, confusing the project root detection.`)}async setupResolutions(){var i;this.storedResolutions=new Map,this.storedDescriptors=new Map,this.storedPackages=new Map,this.lockFileChecksum=null;let e=v.join(this.cwd,this.configuration.get("lockfileFilename")),r=this.configuration.get("defaultLanguageName");if(T.existsSync(e)){let n=await T.readFilePromise(e,"utf8");this.lockFileChecksum=D$(n);let s=Ei(n);if(s.__metadata){let o=s.__metadata.version,a=s.__metadata.cacheKey;this.lockfileNeedsRefresh=o0;){let r=e;e=[];for(let i of r){if(this.workspacesByCwd.has(i))continue;let n=await this.addWorkspace(i),s=this.storedPackages.get(n.anchoredLocator.locatorHash);s&&(n.dependencies=s.dependencies);for(let o of n.workspacesCwds)e.push(o)}}}async addWorkspace(e){let r=new Dd(e,{project:this});await r.setup();let i=this.workspacesByIdent.get(r.locator.identHash);if(typeof i!="undefined")throw new Error(`Duplicate workspace name ${Vr(this.configuration,r.locator)}: ${M.fromPortablePath(e)} conflicts with ${M.fromPortablePath(i.cwd)}`);return this.workspaces.push(r),this.workspacesByCwd.set(e,r),this.workspacesByIdent.set(r.locator.identHash,r),r}get topLevelWorkspace(){return this.getWorkspaceByCwd(this.cwd)}tryWorkspaceByCwd(e){v.isAbsolute(e)||(e=v.resolve(this.cwd,e)),e=v.normalize(e).replace(/\/+$/,"");let r=this.workspacesByCwd.get(e);return r||null}getWorkspaceByCwd(e){let r=this.tryWorkspaceByCwd(e);if(!r)throw new Error(`Workspace not found (${e})`);return r}tryWorkspaceByFilePath(e){let r=null;for(let i of this.workspaces)v.relative(i.cwd,e).startsWith("../")||r&&r.cwd.length>=i.cwd.length||(r=i);return r||null}getWorkspaceByFilePath(e){let r=this.tryWorkspaceByFilePath(e);if(!r)throw new Error(`Workspace not found (${e})`);return r}tryWorkspaceByIdent(e){let r=this.workspacesByIdent.get(e.identHash);return typeof r=="undefined"?null:r}getWorkspaceByIdent(e){let r=this.tryWorkspaceByIdent(e);if(!r)throw new Error(`Workspace not found (${Vr(this.configuration,e)})`);return r}tryWorkspaceByDescriptor(e){let r=this.tryWorkspaceByIdent(e);return r===null||(hA(e)&&(e=Ap(e)),!r.accepts(e.range))?null:r}getWorkspaceByDescriptor(e){let r=this.tryWorkspaceByDescriptor(e);if(r===null)throw new Error(`Workspace not found (${Xt(this.configuration,e)})`);return r}tryWorkspaceByLocator(e){let r=this.tryWorkspaceByIdent(e);return r===null||(Eo(e)&&(e=lp(e)),r.locator.locatorHash!==e.locatorHash&&r.anchoredLocator.locatorHash!==e.locatorHash)?null:r}getWorkspaceByLocator(e){let r=this.tryWorkspaceByLocator(e);if(!r)throw new Error(`Workspace not found (${lt(this.configuration,e)})`);return r}refreshWorkspaceDependencies(){for(let e of this.workspaces){let r=this.storedPackages.get(e.anchoredLocator.locatorHash);if(!r)throw new Error(`Assertion failed: Expected workspace ${hp(this.configuration,e)} (${Ve(this.configuration,v.join(e.cwd,wt.manifest),Le.PATH)}) to have been resolved. Run "yarn install" to update the lockfile`);e.dependencies=new Map(r.dependencies)}}forgetResolution(e){let r=n=>{this.storedResolutions.delete(n),this.storedDescriptors.delete(n)},i=n=>{this.originalPackages.delete(n),this.storedPackages.delete(n),this.accessibleLocators.delete(n)};if("descriptorHash"in e){let n=this.storedResolutions.get(e.descriptorHash);r(e.descriptorHash);let s=new Set(this.storedResolutions.values());typeof n!="undefined"&&!s.has(n)&&i(n)}if("locatorHash"in e){i(e.locatorHash);for(let[n,s]of this.storedResolutions)s===e.locatorHash&&r(n)}}forgetTransientResolutions(){let e=this.configuration.makeResolver();for(let r of this.originalPackages.values()){let i;try{i=e.shouldPersistResolution(r,{project:this,resolver:e})}catch{i=!1}i||this.forgetResolution(r)}}forgetVirtualResolutions(){for(let e of this.storedPackages.values())for(let[r,i]of e.dependencies)hA(i)&&e.dependencies.set(r,Ap(i))}getDependencyMeta(e,r){let i={},s=this.topLevelWorkspace.manifest.dependenciesMeta.get(St(e));if(!s)return i;let o=s.get(null);if(o&&Object.assign(i,o),r===null||!x$.default.valid(r))return i;for(let[a,l]of s)a!==null&&a===r&&Object.assign(i,l);return i}async findLocatorForLocation(e,{strict:r=!1}={}){let i=new ei,n=this.configuration.getLinkers(),s={project:this,report:i};for(let o of n){let a=await o.findPackageLocator(e,s);if(a){if(r&&(await o.findPackageLocation(a,s)).replace(P$,"")!==e.replace(P$,""))continue;return a}}return null}async resolveEverything(e){if(!this.workspacesByCwd||!this.workspacesByIdent)throw new Error("Workspaces must have been setup before calling this function");this.forgetVirtualResolutions(),e.lockfileOnly||this.forgetTransientResolutions();let r=e.resolver||this.configuration.makeResolver(),i=new oF;await i.setup(this,{report:e.report});let n=e.lockfileOnly?[new AF(r)]:[i,r],s=new pd([new aF(r),...n]),o=this.configuration.makeFetcher(),a=e.lockfileOnly?{project:this,report:e.report,resolver:s}:{project:this,report:e.report,resolver:s,fetchOptions:{project:this,cache:e.cache,checksums:this.storedChecksums,report:e.report,fetcher:o,cacheOptions:{mirrorWriteOnly:!0}}},l=new Map,c=new Map,u=new Map,g=new Map,f=new Map,h=new Map,p=this.topLevelWorkspace.anchoredLocator,d=new Set,m=[],E=async W=>{let X=await du(async()=>await s.resolve(W,a),D=>`${lt(this.configuration,W)}: ${D}`);if(!up(W,X))throw new Error(`Assertion failed: The locator cannot be changed by the resolver (went from ${lt(this.configuration,W)} to ${lt(this.configuration,X)})`);g.set(X.locatorHash,X);let F=this.configuration.normalizePackage(X);for(let[D,he]of F.dependencies){let pe=await this.configuration.reduceHook(Pe=>Pe.reduceDependency,he,this,F,he,{resolver:s,resolveOptions:a});if(!cp(he,pe))throw new Error("Assertion failed: The descriptor ident cannot be changed through aliases");let Ne=s.bindDescriptor(pe,W,a);F.dependencies.set(D,Ne)}return m.push(Promise.all([...F.dependencies.values()].map(D=>H(D)))),c.set(F.locatorHash,F),F},B=async W=>{let X=f.get(W.locatorHash);if(typeof X!="undefined")return X;let F=Promise.resolve().then(()=>E(W));return f.set(W.locatorHash,F),F},b=async(W,X)=>{let F=await H(X);return l.set(W.descriptorHash,W),u.set(W.descriptorHash,F.locatorHash),F},R=async W=>{let X=this.resolutionAliases.get(W.descriptorHash);if(typeof X!="undefined")return b(W,this.storedDescriptors.get(X));let F=s.getResolutionDependencies(W,a),D=new Map(await Promise.all(F.map(async Ne=>{let Pe=s.bindDescriptor(Ne,p,a),qe=await H(Pe);return d.add(qe.locatorHash),[Ne.descriptorHash,qe]}))),pe=(await du(async()=>await s.getCandidates(W,D,a),Ne=>`${Xt(this.configuration,W)}: ${Ne}`))[0];if(typeof pe=="undefined")throw new Error(`${Xt(this.configuration,W)}: No candidates found`);return l.set(W.descriptorHash,W),u.set(W.descriptorHash,pe.locatorHash),B(pe)},H=W=>{let X=h.get(W.descriptorHash);if(typeof X!="undefined")return X;l.set(W.descriptorHash,W);let F=Promise.resolve().then(()=>R(W));return h.set(W.descriptorHash,F),F};for(let W of this.workspaces){let X=W.anchoredDescriptor;m.push(H(X))}for(;m.length>0;){let W=[...m];m.length=0,await Promise.all(W)}let L=new Set(this.resolutionAliases.values()),K=new Set(c.keys()),J=new Set,ne=new Map;lUe({project:this,report:e.report,accessibleLocators:J,volatileDescriptors:L,optionalBuilds:K,peerRequirements:ne,allDescriptors:l,allResolutions:u,allPackages:c});for(let W of d)K.delete(W);for(let W of L)l.delete(W),u.delete(W);let q=this.configuration.getSupportedArchitectures(),A=new Set,V=new Set;for(let W of c.values())W.conditions!=null&&(!K.has(W.locatorHash)||(Sy(W,q)||(Sy(W,{os:[process.platform],cpu:[process.arch]})&&e.report.reportWarningOnce(z.GHOST_ARCHITECTURE,`${lt(this.configuration,W)}: Your current architecture (${process.platform}-${process.arch}) is supported by this package, but is missing from the ${Ve(this.configuration,"supportedArchitectures",ps.SETTING)} setting`),V.add(W.locatorHash)),A.add(W.locatorHash)));this.storedResolutions=u,this.storedDescriptors=l,this.storedPackages=c,this.accessibleLocators=J,this.conditionalLocators=A,this.disabledLocators=V,this.originalPackages=g,this.optionalBuilds=K,this.peerRequirements=ne,this.refreshWorkspaceDependencies()}async fetchEverything({cache:e,report:r,fetcher:i,mode:n}){let s={mockedPackages:this.disabledLocators,unstablePackages:this.conditionalLocators},o=i||this.configuration.makeFetcher(),a={checksums:this.storedChecksums,project:this,cache:e,fetcher:o,report:r,cacheOptions:s},l=Array.from(new Set(gn(this.storedResolutions.values(),[f=>{let h=this.storedPackages.get(f);if(!h)throw new Error("Assertion failed: The locator should have been registered");return is(h)}])));n===li.UpdateLockfile&&(l=l.filter(f=>!this.storedChecksums.has(f)));let c=!1,u=Xi.progressViaCounter(l.length);r.reportProgress(u);let g=(0,S$.default)(oUe);if(await r.startCacheReport(async()=>{await Promise.all(l.map(f=>g(async()=>{let h=this.storedPackages.get(f);if(!h)throw new Error("Assertion failed: The locator should have been registered");if(Eo(h))return;let p;try{p=await o.fetch(h,a)}catch(d){d.message=`${lt(this.configuration,h)}: ${d.message}`,r.reportExceptionOnce(d),c=d;return}p.checksum!=null?this.storedChecksums.set(h.locatorHash,p.checksum):this.storedChecksums.delete(h.locatorHash),p.releaseFs&&p.releaseFs()}).finally(()=>{u.tick()})))}),c)throw c}async linkEverything({cache:e,report:r,fetcher:i,mode:n}){var A,V,W;let s={mockedPackages:this.disabledLocators,unstablePackages:this.conditionalLocators,skipIntegrityCheck:!0},o=i||this.configuration.makeFetcher(),a={checksums:this.storedChecksums,project:this,cache:e,fetcher:o,report:r,skipIntegrityCheck:!0,cacheOptions:s},l=this.configuration.getLinkers(),c={project:this,report:r},u=new Map(l.map(X=>{let F=X.makeInstaller(c),D=F.getCustomDataKey(),he=this.installersCustomData.get(D);return typeof he!="undefined"&&F.attachCustomData(he),[X,F]})),g=new Map,f=new Map,h=new Map,p=new Map(await Promise.all([...this.accessibleLocators].map(async X=>{let F=this.storedPackages.get(X);if(!F)throw new Error("Assertion failed: The locator should have been registered");return[X,await o.fetch(F,a)]}))),d=[];for(let X of this.accessibleLocators){let F=this.storedPackages.get(X);if(typeof F=="undefined")throw new Error("Assertion failed: The locator should have been registered");let D=p.get(F.locatorHash);if(typeof D=="undefined")throw new Error("Assertion failed: The fetch result should have been registered");let he=[],pe=Pe=>{he.push(Pe)},Ne=this.tryWorkspaceByLocator(F);if(Ne!==null){let Pe=[],{scripts:qe}=Ne.manifest;for(let se of["preinstall","install","postinstall"])qe.has(se)&&Pe.push([Gn.SCRIPT,se]);try{for(let[se,be]of u)if(se.supportsPackage(F,c)&&(await be.installPackage(F,D,{holdFetchResult:pe})).buildDirective!==null)throw new Error("Assertion failed: Linkers can't return build directives for workspaces; this responsibility befalls to the Yarn core")}finally{he.length===0?(A=D.releaseFs)==null||A.call(D):d.push(Promise.all(he).catch(()=>{}).then(()=>{var se;(se=D.releaseFs)==null||se.call(D)}))}let re=v.join(D.packageFs.getRealPath(),D.prefixPath);f.set(F.locatorHash,re),!Eo(F)&&Pe.length>0&&h.set(F.locatorHash,{directives:Pe,buildLocations:[re]})}else{let Pe=l.find(se=>se.supportsPackage(F,c));if(!Pe)throw new nt(z.LINKER_NOT_FOUND,`${lt(this.configuration,F)} isn't supported by any available linker`);let qe=u.get(Pe);if(!qe)throw new Error("Assertion failed: The installer should have been registered");let re;try{re=await qe.installPackage(F,D,{holdFetchResult:pe})}finally{he.length===0?(V=D.releaseFs)==null||V.call(D):d.push(Promise.all(he).then(()=>{}).then(()=>{var se;(se=D.releaseFs)==null||se.call(D)}))}g.set(F.locatorHash,Pe),f.set(F.locatorHash,re.packageLocation),re.buildDirective&&re.buildDirective.length>0&&re.packageLocation&&h.set(F.locatorHash,{directives:re.buildDirective,buildLocations:[re.packageLocation]})}}let m=new Map;for(let X of this.accessibleLocators){let F=this.storedPackages.get(X);if(!F)throw new Error("Assertion failed: The locator should have been registered");let D=this.tryWorkspaceByLocator(F)!==null,he=async(pe,Ne)=>{let Pe=f.get(F.locatorHash);if(typeof Pe=="undefined")throw new Error(`Assertion failed: The package (${lt(this.configuration,F)}) should have been registered`);let qe=[];for(let re of F.dependencies.values()){let se=this.storedResolutions.get(re.descriptorHash);if(typeof se=="undefined")throw new Error(`Assertion failed: The resolution (${Xt(this.configuration,re)}, from ${lt(this.configuration,F)})should have been registered`);let be=this.storedPackages.get(se);if(typeof be=="undefined")throw new Error(`Assertion failed: The package (${se}, resolved from ${Xt(this.configuration,re)}) should have been registered`);let ae=this.tryWorkspaceByLocator(be)===null?g.get(se):null;if(typeof ae=="undefined")throw new Error(`Assertion failed: The package (${se}, resolved from ${Xt(this.configuration,re)}) should have been registered`);ae===pe||ae===null?f.get(be.locatorHash)!==null&&qe.push([re,be]):!D&&Pe!==null&&hu(m,se).push(Pe)}Pe!==null&&await Ne.attachInternalDependencies(F,qe)};if(D)for(let[pe,Ne]of u)pe.supportsPackage(F,c)&&await he(pe,Ne);else{let pe=g.get(F.locatorHash);if(!pe)throw new Error("Assertion failed: The linker should have been found");let Ne=u.get(pe);if(!Ne)throw new Error("Assertion failed: The installer should have been registered");await he(pe,Ne)}}for(let[X,F]of m){let D=this.storedPackages.get(X);if(!D)throw new Error("Assertion failed: The package should have been registered");let he=g.get(D.locatorHash);if(!he)throw new Error("Assertion failed: The linker should have been found");let pe=u.get(he);if(!pe)throw new Error("Assertion failed: The installer should have been registered");await pe.attachExternalDependents(D,F)}let E=new Map;for(let X of u.values()){let F=await X.finalizeInstall();for(let D of(W=F==null?void 0:F.records)!=null?W:[])h.set(D.locatorHash,{directives:D.buildDirective,buildLocations:D.buildLocations});typeof(F==null?void 0:F.customData)!="undefined"&&E.set(X.getCustomDataKey(),F.customData)}if(this.installersCustomData=E,await Promise.all(d),n===li.SkipBuild)return;let B=new Set(this.storedPackages.keys()),b=new Set(h.keys());for(let X of b)B.delete(X);let R=(0,t0.createHash)("sha512");R.update(process.versions.node),await this.configuration.triggerHook(X=>X.globalHashGeneration,this,X=>{R.update("\0"),R.update(X)});let H=R.digest("hex"),L=new Map,K=X=>{let F=L.get(X.locatorHash);if(typeof F!="undefined")return F;let D=this.storedPackages.get(X.locatorHash);if(typeof D=="undefined")throw new Error("Assertion failed: The package should have been registered");let he=(0,t0.createHash)("sha512");he.update(X.locatorHash),L.set(X.locatorHash,"");for(let pe of D.dependencies.values()){let Ne=this.storedResolutions.get(pe.descriptorHash);if(typeof Ne=="undefined")throw new Error(`Assertion failed: The resolution (${Xt(this.configuration,pe)}) should have been registered`);let Pe=this.storedPackages.get(Ne);if(typeof Pe=="undefined")throw new Error("Assertion failed: The package should have been registered");he.update(K(Pe))}return F=he.digest("hex"),L.set(X.locatorHash,F),F},J=(X,F)=>{let D=(0,t0.createHash)("sha512");D.update(H),D.update(K(X));for(let he of F)D.update(he);return D.digest("hex")},ne=new Map,q=!1;for(;b.size>0;){let X=b.size,F=[];for(let D of b){let he=this.storedPackages.get(D);if(!he)throw new Error("Assertion failed: The package should have been registered");let pe=!0;for(let qe of he.dependencies.values()){let re=this.storedResolutions.get(qe.descriptorHash);if(!re)throw new Error(`Assertion failed: The resolution (${Xt(this.configuration,qe)}) should have been registered`);if(b.has(re)){pe=!1;break}}if(!pe)continue;b.delete(D);let Ne=h.get(he.locatorHash);if(!Ne)throw new Error("Assertion failed: The build directive should have been registered");let Pe=J(he,Ne.buildLocations);if(this.storedBuildState.get(he.locatorHash)===Pe){ne.set(he.locatorHash,Pe);continue}q||(await this.persistInstallStateFile(),q=!0),this.storedBuildState.has(he.locatorHash)?r.reportInfo(z.MUST_REBUILD,`${lt(this.configuration,he)} must be rebuilt because its dependency tree changed`):r.reportInfo(z.MUST_BUILD,`${lt(this.configuration,he)} must be built because it never has been before or the last one failed`);for(let qe of Ne.buildLocations){if(!v.isAbsolute(qe))throw new Error(`Assertion failed: Expected the build location to be absolute (not ${qe})`);F.push((async()=>{for(let[re,se]of Ne.directives){let be=`# This file contains the result of Yarn building a package (${is(he)}) +`;switch(re){case Gn.SCRIPT:be+=`# Script name: ${se} +`;break;case Gn.SHELLCODE:be+=`# Script code: ${se} +`;break}let ae=null;if(!await T.mktempPromise(async De=>{let $=v.join(De,"build.log"),{stdout:G,stderr:Ce}=this.configuration.getSubprocessStreams($,{header:be,prefix:lt(this.configuration,he),report:r}),ee;try{switch(re){case Gn.SCRIPT:ee=await Uw(he,se,[],{cwd:qe,project:this,stdin:ae,stdout:G,stderr:Ce});break;case Gn.SHELLCODE:ee=await rD(he,se,[],{cwd:qe,project:this,stdin:ae,stdout:G,stderr:Ce});break}}catch(Oe){Ce.write(Oe.stack),ee=1}if(G.end(),Ce.end(),ee===0)return ne.set(he.locatorHash,Pe),!0;T.detachTemp(De);let Ue=`${lt(this.configuration,he)} couldn't be built successfully (exit code ${Ve(this.configuration,ee,Le.NUMBER)}, logs can be found here: ${Ve(this.configuration,$,Le.PATH)})`;return this.optionalBuilds.has(he.locatorHash)?(r.reportInfo(z.BUILD_FAILED,Ue),ne.set(he.locatorHash,Pe),!0):(r.reportError(z.BUILD_FAILED,Ue),!1)}))return}})())}}if(await Promise.all(F),X===b.size){let D=Array.from(b).map(he=>{let pe=this.storedPackages.get(he);if(!pe)throw new Error("Assertion failed: The package should have been registered");return lt(this.configuration,pe)}).join(", ");r.reportError(z.CYCLIC_DEPENDENCIES,`Some packages have circular dependencies that make their build order unsatisfiable - as a result they won't be built (affected packages are: ${D})`);break}}this.storedBuildState=ne}async install(e){var a,l;let r=this.configuration.get("nodeLinker");(a=fe.telemetry)==null||a.reportInstall(r),await e.report.startTimerPromise("Project validation",{skipIfEmpty:!0},async()=>{await this.configuration.triggerHook(c=>c.validateProject,this,{reportWarning:e.report.reportWarning.bind(e.report),reportError:e.report.reportError.bind(e.report)})});for(let c of this.configuration.packageExtensions.values())for(let[,u]of c)for(let g of u)g.status=ki.Inactive;let i=v.join(this.cwd,this.configuration.get("lockfileFilename")),n=null;if(e.immutable)try{n=await T.readFilePromise(i,"utf8")}catch(c){throw c.code==="ENOENT"?new nt(z.FROZEN_LOCKFILE_EXCEPTION,"The lockfile would have been created by this install, which is explicitly forbidden."):c}await e.report.startTimerPromise("Resolution step",async()=>{await this.resolveEverything(e)}),await e.report.startTimerPromise("Post-resolution validation",{skipIfEmpty:!0},async()=>{for(let[,c]of this.configuration.packageExtensions)for(let[,u]of c)for(let g of u)if(g.userProvided){let f=Ve(this.configuration,g,Le.PACKAGE_EXTENSION);switch(g.status){case ki.Inactive:e.report.reportWarning(z.UNUSED_PACKAGE_EXTENSION,`${f}: No matching package in the dependency tree; you may not need this rule anymore.`);break;case ki.Redundant:e.report.reportWarning(z.REDUNDANT_PACKAGE_EXTENSION,`${f}: This rule seems redundant when applied on the original package; the extension may have been applied upstream.`);break}}if(n!==null){let c=ul(n,this.generateLockfile());if(c!==n){let u=(0,v$.structuredPatch)(i,i,n,c);e.report.reportSeparator();for(let g of u.hunks){e.report.reportInfo(null,`@@ -${g.oldStart},${g.oldLines} +${g.newStart},${g.newLines} @@`);for(let f of g.lines)f.startsWith("+")?e.report.reportError(z.FROZEN_LOCKFILE_EXCEPTION,Ve(this.configuration,f,Le.ADDED)):f.startsWith("-")?e.report.reportError(z.FROZEN_LOCKFILE_EXCEPTION,Ve(this.configuration,f,Le.REMOVED)):e.report.reportInfo(null,Ve(this.configuration,f,"grey"))}throw e.report.reportSeparator(),new nt(z.FROZEN_LOCKFILE_EXCEPTION,"The lockfile would have been modified by this install, which is explicitly forbidden.")}}});for(let c of this.configuration.packageExtensions.values())for(let[,u]of c)for(let g of u)g.userProvided&&g.status===ki.Active&&((l=fe.telemetry)==null||l.reportPackageExtension(Uu(g,Le.PACKAGE_EXTENSION)));await e.report.startTimerPromise("Fetch step",async()=>{await this.fetchEverything(e),(typeof e.persistProject=="undefined"||e.persistProject)&&e.mode!==li.UpdateLockfile&&await this.cacheCleanup(e)});let s=e.immutable?[...new Set(this.configuration.get("immutablePatterns"))].sort():[],o=await Promise.all(s.map(async c=>Ey(c,{cwd:this.cwd})));(typeof e.persistProject=="undefined"||e.persistProject)&&await this.persist(),await e.report.startTimerPromise("Link step",async()=>{if(e.mode===li.UpdateLockfile){e.report.reportWarning(z.UPDATE_LOCKFILE_ONLY_SKIP_LINK,`Skipped due to ${Ve(this.configuration,"mode=update-lockfile",Le.CODE)}`);return}await this.linkEverything(e);let c=await Promise.all(s.map(async u=>Ey(u,{cwd:this.cwd})));for(let u=0;uc.afterAllInstalled,this,e)}generateLockfile(){let e=new Map;for(let[n,s]of this.storedResolutions.entries()){let o=e.get(s);o||e.set(s,o=new Set),o.add(n)}let r={};r.__metadata={version:k$,cacheKey:void 0};for(let[n,s]of e.entries()){let o=this.originalPackages.get(n);if(!o)continue;let a=[];for(let f of s){let h=this.storedDescriptors.get(f);if(!h)throw new Error("Assertion failed: The descriptor should have been registered");a.push(h)}let l=a.map(f=>En(f)).sort().join(", "),c=new Ze;c.version=o.linkType===gt.HARD?o.version:"0.0.0-use.local",c.languageName=o.languageName,c.dependencies=new Map(o.dependencies),c.peerDependencies=new Map(o.peerDependencies),c.dependenciesMeta=new Map(o.dependenciesMeta),c.peerDependenciesMeta=new Map(o.peerDependenciesMeta),c.bin=new Map(o.bin);let u,g=this.storedChecksums.get(o.locatorHash);if(typeof g!="undefined"){let f=g.indexOf("/");if(f===-1)throw new Error("Assertion failed: Expected the checksum to reference its cache key");let h=g.slice(0,f),p=g.slice(f+1);typeof r.__metadata.cacheKey=="undefined"&&(r.__metadata.cacheKey=h),h===r.__metadata.cacheKey?u=p:u=g}r[l]=_(P({},c.exportTo({},{compatibilityMode:!1})),{linkType:o.linkType.toLowerCase(),resolution:is(o),checksum:u,conditions:o.conditions||void 0})}return`${[`# This file is generated by running "yarn install" inside your project. +`,`# Manual changes might be lost - proceed with caution! +`].join("")} +`+Qa(r)}async persistLockfile(){let e=v.join(this.cwd,this.configuration.get("lockfileFilename")),r="";try{r=await T.readFilePromise(e,"utf8")}catch(s){}let i=this.generateLockfile(),n=ul(r,i);n!==r&&(await T.writeFilePromise(e,n),this.lockFileChecksum=D$(n),this.lockfileNeedsRefresh=!1)}async persistInstallStateFile(){let e=[];for(let o of Object.values(gF))e.push(...o);let r=(0,r0.default)(this,e),i=cF.default.serialize(r),n=zi(i);if(this.installStateChecksum===n)return;let s=this.configuration.get("installStatePath");await T.mkdirPromise(v.dirname(s),{recursive:!0}),await T.writeFilePromise(s,await aUe(i)),this.installStateChecksum=n}async restoreInstallState({restoreInstallersCustomData:e=!0,restoreResolutions:r=!0,restoreBuildState:i=!0}={}){let n=this.configuration.get("installStatePath");if(!T.existsSync(n)){r&&await this.applyLightResolution();return}let s=await AUe(await T.readFilePromise(n));this.installStateChecksum=zi(s);let o=cF.default.deserialize(s);e&&typeof o.installersCustomData!="undefined"&&(this.installersCustomData=o.installersCustomData),i&&Object.assign(this,(0,r0.default)(o,gF.restoreBuildState)),r&&(o.lockFileChecksum===this.lockFileChecksum?(Object.assign(this,(0,r0.default)(o,gF.restoreResolutions)),this.refreshWorkspaceDependencies()):await this.applyLightResolution())}async applyLightResolution(){await this.resolveEverything({lockfileOnly:!0,report:new ei}),await this.persistInstallStateFile()}async persist(){await this.persistLockfile();for(let e of this.workspacesByCwd.values())await e.persistManifest()}async cacheCleanup({cache:e,report:r}){let i=new Set([".gitignore"]);if(!Fb(e.cwd,this.cwd)||!await T.existsPromise(e.cwd))return;let n=this.configuration.get("preferAggregateCacheInfo"),s=0,o=null;for(let a of await T.readdirPromise(e.cwd)){if(i.has(a))continue;let l=v.resolve(e.cwd,a);e.markedFiles.has(l)||(o=a,e.immutable?r.reportError(z.IMMUTABLE_CACHE,`${Ve(this.configuration,v.basename(l),"magenta")} appears to be unused and would be marked for deletion, but the cache is immutable`):(n?s+=1:r.reportInfo(z.UNUSED_CACHE_ENTRY,`${Ve(this.configuration,v.basename(l),"magenta")} appears to be unused - removing`),await T.removePromise(l)))}n&&s!==0&&r.reportInfo(z.UNUSED_CACHE_ENTRY,s>1?`${s} packages appeared to be unused and were removed`:`${o} appeared to be unused and was removed`),e.markedFiles.clear()}};function lUe({project:t,allDescriptors:e,allResolutions:r,allPackages:i,accessibleLocators:n=new Set,optionalBuilds:s=new Set,volatileDescriptors:o=new Set,peerRequirements:a=new Map,report:l,tolerateMissingPackages:c=!1}){var ne;let u=new Map,g=[],f=new Map,h=new Map,p=new Map,d=new Map,m=new Map,E=new Map(t.workspaces.map(q=>{let A=q.anchoredLocator.locatorHash,V=i.get(A);if(typeof V=="undefined"){if(c)return[A,null];throw new Error("Assertion failed: The workspace should have an associated package")}return[A,ap(V)]})),B=()=>{let q=T.mktempSync(),A=v.join(q,"stacktrace.log"),V=String(g.length+1).length,W=g.map((X,F)=>`${`${F+1}.`.padStart(V," ")} ${is(X)} +`).join("");throw T.writeFileSync(A,W),T.detachTemp(q),new nt(z.STACK_OVERFLOW_RESOLUTION,`Encountered a stack overflow when resolving peer dependencies; cf ${M.fromPortablePath(A)}`)},b=q=>{let A=r.get(q.descriptorHash);if(typeof A=="undefined")throw new Error("Assertion failed: The resolution should have been registered");let V=i.get(A);if(!V)throw new Error("Assertion failed: The package could not be found");return V},R=(q,A,V,{top:W,optional:X})=>{g.length>1e3&&B(),g.push(A);let F=H(q,A,V,{top:W,optional:X});return g.pop(),F},H=(q,A,V,{top:W,optional:X})=>{if(n.has(A.locatorHash))return;n.add(A.locatorHash),X||s.delete(A.locatorHash);let F=i.get(A.locatorHash);if(!F){if(c)return;throw new Error(`Assertion failed: The package (${lt(t.configuration,A)}) should have been registered`)}let D=[],he=[],pe=[],Ne=[],Pe=[];for(let re of Array.from(F.dependencies.values())){if(F.peerDependencies.has(re.identHash)&&F.locatorHash!==W)continue;if(hA(re))throw new Error("Assertion failed: Virtual packages shouldn't be encountered when virtualizing a branch");o.delete(re.descriptorHash);let se=X;if(!se){let ee=F.dependenciesMeta.get(St(re));if(typeof ee!="undefined"){let Ue=ee.get(null);typeof Ue!="undefined"&&Ue.optional&&(se=!0)}}let be=r.get(re.descriptorHash);if(!be){if(c)continue;throw new Error(`Assertion failed: The resolution (${Xt(t.configuration,re)}) should have been registered`)}let ae=E.get(be)||i.get(be);if(!ae)throw new Error(`Assertion failed: The package (${be}, resolved from ${Xt(t.configuration,re)}) should have been registered`);if(ae.peerDependencies.size===0){R(re,ae,new Map,{top:W,optional:se});continue}let Ae=u.get(ae.locatorHash);typeof Ae=="number"&&Ae>=2&&B();let De,$,G=new Set,Ce;he.push(()=>{De=kx(re,A.locatorHash),$=Px(ae,A.locatorHash),F.dependencies.delete(re.identHash),F.dependencies.set(De.identHash,De),r.set(De.descriptorHash,$.locatorHash),e.set(De.descriptorHash,De),i.set($.locatorHash,$),D.push([ae,De,$])}),pe.push(()=>{var ee;Ce=new Map;for(let Ue of $.peerDependencies.values()){let Oe=F.dependencies.get(Ue.identHash);if(!Oe&&cp(A,Ue)&&(Oe=q),(!Oe||Oe.range==="missing:")&&$.dependencies.has(Ue.identHash)){$.peerDependencies.delete(Ue.identHash);continue}Oe||(Oe=Yt(Ue,"missing:")),$.dependencies.set(Oe.identHash,Oe),hA(Oe)&&Pl(p,Oe.descriptorHash).add($.locatorHash),f.set(Oe.identHash,Oe),Oe.range==="missing:"&&G.add(Oe.identHash),Ce.set(Ue.identHash,(ee=V.get(Ue.identHash))!=null?ee:$.locatorHash)}$.dependencies=new Map(gn($.dependencies,([Ue,Oe])=>St(Oe)))}),Ne.push(()=>{if(!i.has($.locatorHash))return;let ee=u.get(ae.locatorHash),Ue=typeof ee!="undefined"?ee+1:1;u.set(ae.locatorHash,Ue),R(De,$,Ce,{top:W,optional:se}),u.set(ae.locatorHash,Ue-1)}),Pe.push(()=>{let ee=F.dependencies.get(re.identHash);if(typeof ee=="undefined")throw new Error("Assertion failed: Expected the peer dependency to have been turned into a dependency");let Ue=r.get(ee.descriptorHash);if(typeof Ue=="undefined")throw new Error("Assertion failed: Expected the descriptor to be registered");if(Pl(m,Ue).add(A.locatorHash),!!i.has($.locatorHash)){for(let Oe of $.peerDependencies.values()){let vt=Ce.get(Oe.identHash);if(typeof vt=="undefined")throw new Error("Assertion failed: Expected the peer dependency ident to be registered");hu(pu(d,vt),St(Oe)).push($.locatorHash)}for(let Oe of G)$.dependencies.delete(Oe)}})}for(let re of[...he,...pe])re();let qe;do{qe=!0;for(let[re,se,be]of D){if(!i.has(be.locatorHash))continue;let ae=pu(h,re.locatorHash),Ae=zi(...[...be.dependencies.values()].map(Ce=>{let ee=Ce.range!=="missing:"?r.get(Ce.descriptorHash):"missing:";if(typeof ee=="undefined")throw new Error(`Assertion failed: Expected the resolution for ${Xt(t.configuration,Ce)} to have been registered`);return ee===W?`${ee} (top)`:ee}),se.identHash),De=ae.get(Ae);if(typeof De=="undefined"){ae.set(Ae,se);continue}if(De===se)continue;qe=!1,i.delete(be.locatorHash),e.delete(se.descriptorHash),r.delete(se.descriptorHash),n.delete(be.locatorHash);let $=p.get(se.descriptorHash)||[],G=[F.locatorHash,...$];p.delete(se.descriptorHash);for(let Ce of G){let ee=i.get(Ce);typeof ee!="undefined"&&ee.dependencies.set(se.identHash,De)}}}while(!qe);for(let re of[...Ne,...Pe])re()};for(let q of t.workspaces){let A=q.anchoredLocator;o.delete(q.anchoredDescriptor.descriptorHash),R(q.anchoredDescriptor,A,new Map,{top:A.locatorHash,optional:!1})}var L;(function(V){V[V.NotProvided=0]="NotProvided",V[V.NotCompatible=1]="NotCompatible"})(L||(L={}));let K=[];for(let[q,A]of m){let V=i.get(q);if(typeof V=="undefined")throw new Error("Assertion failed: Expected the root to be registered");let W=d.get(q);if(typeof W!="undefined")for(let X of A){let F=i.get(X);if(typeof F!="undefined")for(let[D,he]of W){let pe=In(D);if(F.peerDependencies.has(pe.identHash))continue;let Ne=`p${zi(X,D,q).slice(0,5)}`;a.set(Ne,{subject:X,requested:pe,rootRequester:q,allRequesters:he});let Pe=V.dependencies.get(pe.identHash);if(typeof Pe!="undefined"){let qe=b(Pe),re=(ne=qe.version)!=null?ne:"0.0.0",se=new Set;for(let ae of he){let Ae=i.get(ae);if(typeof Ae=="undefined")throw new Error("Assertion failed: Expected the link to be registered");let De=Ae.peerDependencies.get(pe.identHash);if(typeof De=="undefined")throw new Error("Assertion failed: Expected the ident to be registered");se.add(De.range)}[...se].every(ae=>{if(ae.startsWith(Yr.protocol)){if(!t.tryWorkspaceByLocator(qe))return!1;ae=ae.slice(Yr.protocol.length),(ae==="^"||ae==="~")&&(ae="*")}return lc(re,ae)})||K.push({type:1,subject:F,requested:pe,requester:V,version:re,hash:Ne,requirementCount:he.length})}else{let qe=V.peerDependenciesMeta.get(D);(qe==null?void 0:qe.optional)||K.push({type:0,subject:F,requested:pe,requester:V,hash:Ne})}}}}let J=[q=>Rx(q.subject),q=>St(q.requested),q=>`${q.type}`];for(let q of gn(K,J))switch(q.type){case 0:l==null||l.reportWarning(z.MISSING_PEER_DEPENDENCY,`${lt(t.configuration,q.subject)} doesn't provide ${Vr(t.configuration,q.requested)} (${Ve(t.configuration,q.hash,Le.CODE)}), requested by ${Vr(t.configuration,q.requester)}`);break;case 1:{let A=q.requirementCount>1?"and some of its descendants request":"requests";l==null||l.reportWarning(z.INCOMPATIBLE_PEER_DEPENDENCY,`${lt(t.configuration,q.subject)} provides ${Vr(t.configuration,q.requested)} (${Ve(t.configuration,q.hash,Le.CODE)}) with version ${fp(t.configuration,q.version)}, which doesn't satisfy what ${Vr(t.configuration,q.requester)} ${A}`)}break}K.length>0&&(l==null||l.reportWarning(z.UNNAMED,`Some peer dependencies are incorrectly met; run ${Ve(t.configuration,"yarn explain peer-requirements ",Le.CODE)} for details, where ${Ve(t.configuration,"",Le.CODE)} is the six-letter p-prefixed code`))}var Po;(function(l){l.VERSION="version",l.COMMAND_NAME="commandName",l.PLUGIN_NAME="pluginName",l.INSTALL_COUNT="installCount",l.PROJECT_COUNT="projectCount",l.WORKSPACE_COUNT="workspaceCount",l.DEPENDENCY_COUNT="dependencyCount",l.EXTENSION="packageExtension"})(Po||(Po={}));var Rd=class{constructor(e,r){this.values=new Map;this.hits=new Map;this.enumerators=new Map;this.configuration=e;let i=this.getRegistryPath();this.isNew=!T.existsSync(i),this.sendReport(r),this.startBuffer()}reportVersion(e){this.reportValue(Po.VERSION,e.replace(/-git\..*/,"-git"))}reportCommandName(e){this.reportValue(Po.COMMAND_NAME,e||"")}reportPluginName(e){this.reportValue(Po.PLUGIN_NAME,e)}reportProject(e){this.reportEnumerator(Po.PROJECT_COUNT,e)}reportInstall(e){this.reportHit(Po.INSTALL_COUNT,e)}reportPackageExtension(e){this.reportValue(Po.EXTENSION,e)}reportWorkspaceCount(e){this.reportValue(Po.WORKSPACE_COUNT,String(e))}reportDependencyCount(e){this.reportValue(Po.DEPENDENCY_COUNT,String(e))}reportValue(e,r){Pl(this.values,e).add(r)}reportEnumerator(e,r){Pl(this.enumerators,e).add(zi(r))}reportHit(e,r="*"){let i=pu(this.hits,e),n=na(i,r,()=>0);i.set(r,n+1)}getRegistryPath(){let e=this.configuration.get("globalFolder");return v.join(e,"telemetry.json")}sendReport(e){var u,g,f;let r=this.getRegistryPath(),i;try{i=T.readJsonSync(r)}catch{i={}}let n=Date.now(),s=this.configuration.get("telemetryInterval")*24*60*60*1e3,a=((u=i.lastUpdate)!=null?u:n+s+Math.floor(s*Math.random()))+s;if(a>n&&i.lastUpdate!=null)return;try{T.mkdirSync(v.dirname(r),{recursive:!0}),T.writeJsonSync(r,{lastUpdate:n})}catch{return}if(a>n||!i.blocks)return;let l=`https://browser-http-intake.logs.datadoghq.eu/v1/input/${e}?ddsource=yarn`,c=h=>iP(l,h,{configuration:this.configuration}).catch(()=>{});for(let[h,p]of Object.entries((g=i.blocks)!=null?g:{})){if(Object.keys(p).length===0)continue;let d=p;d.userId=h,d.reportType="primary";for(let B of Object.keys((f=d.enumerators)!=null?f:{}))d.enumerators[B]=d.enumerators[B].length;c(d);let m=new Map,E=20;for(let[B,b]of Object.entries(d.values))b.length>0&&m.set(B,b.slice(0,E));for(;m.size>0;){let B={};B.userId=h,B.reportType="secondary",B.metrics={};for(let[b,R]of m)B.metrics[b]=R.shift(),R.length===0&&m.delete(b);c(B)}}}applyChanges(){var o,a,l,c,u,g,f,h,p;let e=this.getRegistryPath(),r;try{r=T.readJsonSync(e)}catch{r={}}let i=(o=this.configuration.get("telemetryUserId"))!=null?o:"*",n=r.blocks=(a=r.blocks)!=null?a:{},s=n[i]=(l=n[i])!=null?l:{};for(let d of this.hits.keys()){let m=s.hits=(c=s.hits)!=null?c:{},E=m[d]=(u=m[d])!=null?u:{};for(let[B,b]of this.hits.get(d))E[B]=((g=E[B])!=null?g:0)+b}for(let d of["values","enumerators"])for(let m of this[d].keys()){let E=s[d]=(f=s[d])!=null?f:{};E[m]=[...new Set([...(h=E[m])!=null?h:[],...(p=this[d].get(m))!=null?p:[]])]}T.mkdirSync(v.dirname(e),{recursive:!0}),T.writeJsonSync(e,r)}startBuffer(){process.on("exit",()=>{try{this.applyChanges()}catch{}})}};var fF=ie(require("child_process")),R$=ie(ml());var hF=ie(require("fs"));var Yg=new Map([["constraints",[["constraints","query"],["constraints","source"],["constraints"]]],["exec",[]],["interactive-tools",[["search"],["upgrade-interactive"]]],["stage",[["stage"]]],["typescript",[]],["version",[["version","apply"],["version","check"],["version"]]],["workspace-tools",[["workspaces","focus"],["workspaces","foreach"]]]]);function cUe(t){let e=M.fromPortablePath(t);process.on("SIGINT",()=>{}),e?(0,fF.execFileSync)(process.execPath,[e,...process.argv.slice(2)],{stdio:"inherit",env:_(P({},process.env),{YARN_IGNORE_PATH:"1",YARN_IGNORE_CWD:"1"})}):(0,fF.execFileSync)(e,process.argv.slice(2),{stdio:"inherit",env:_(P({},process.env),{YARN_IGNORE_PATH:"1",YARN_IGNORE_CWD:"1"})})}async function i0({binaryVersion:t,pluginConfiguration:e}){async function r(){let n=new oo({binaryLabel:"Yarn Package Manager",binaryName:"yarn",binaryVersion:t});try{await i(n)}catch(s){process.stdout.write(n.error(s)),process.exitCode=1}}async function i(n){var p,d,m,E,B;let s=process.versions.node,o=">=12 <14 || 14.2 - 14.9 || >14.10.0";if(process.env.YARN_IGNORE_NODE!=="1"&&!qt.satisfiesWithPrereleases(s,o))throw new me(`This tool requires a Node version compatible with ${o} (got ${s}). Upgrade Node, or set \`YARN_IGNORE_NODE=1\` in your environment.`);let a=await fe.find(M.toPortablePath(process.cwd()),e,{usePath:!0,strict:!1}),l=a.get("yarnPath"),c=a.get("ignorePath"),u=a.get("ignoreCwd"),g=M.toPortablePath(M.resolve(process.argv[1])),f=b=>T.readFilePromise(b).catch(()=>Buffer.of());if(!c&&!u&&await(async()=>l===g||Buffer.compare(...await Promise.all([f(l),f(g)]))===0)()){process.env.YARN_IGNORE_PATH="1",process.env.YARN_IGNORE_CWD="1",await i(n);return}else if(l!==null&&!c)if(!T.existsSync(l))process.stdout.write(n.error(new Error(`The "yarn-path" option has been set (in ${a.sources.get("yarnPath")}), but the specified location doesn't exist (${l}).`))),process.exitCode=1;else try{cUe(l)}catch(b){process.exitCode=b.code||1}else{c&&delete process.env.YARN_IGNORE_PATH,a.get("enableTelemetry")&&!R$.isCI&&process.stdout.isTTY&&(fe.telemetry=new Rd(a,"puba9cdc10ec5790a2cf4969dd413a47270")),(p=fe.telemetry)==null||p.reportVersion(t);for(let[L,K]of a.plugins.entries()){Yg.has((m=(d=L.match(/^@yarnpkg\/plugin-(.*)$/))==null?void 0:d[1])!=null?m:"")&&((E=fe.telemetry)==null||E.reportPluginName(L));for(let J of K.commands||[])n.register(J)}let R=n.process(process.argv.slice(2));R.help||(B=fe.telemetry)==null||B.reportCommandName(R.path.join(" "));let H=R.cwd;if(typeof H!="undefined"&&!u){let L=(0,hF.realpathSync)(process.cwd()),K=(0,hF.realpathSync)(H);if(L!==K){process.chdir(H),await r();return}}await n.runExit(R,{cwd:M.toPortablePath(process.cwd()),plugins:e,quiet:!1,stdin:process.stdin,stdout:process.stdout,stderr:process.stderr})}}return r().catch(n=>{process.stdout.write(n.stack||n.message),process.exitCode=1}).finally(()=>T.rmtempPromise())}function F$(t){t.Command.Path=(...e)=>r=>{r.paths=r.paths||[],r.paths.push(e)};for(let e of["Array","Boolean","String","Proxy","Rest","Counter"])t.Command[e]=(...r)=>(i,n)=>{let s=t.Option[e](...r);Object.defineProperty(i,`__${n}`,{configurable:!1,enumerable:!0,get(){return s},set(o){this[n]=o}})};return t}var iC={};it(iC,{BaseCommand:()=>Be,WorkspaceRequiredError:()=>rt,getDynamicLibs:()=>Wie,getPluginConfiguration:()=>F0,main:()=>i0,openWorkspace:()=>rf,pluginCommands:()=>Yg});var Be=class extends ye{constructor(){super(...arguments);this.cwd=Y.String("--cwd",{hidden:!0})}};var rt=class extends me{constructor(e,r){let i=v.relative(e,r),n=v.join(e,Ze.fileName);super(`This command can only be run from within a workspace of your project (${i} isn't a workspace of ${n}).`)}};var dJe=ie(Or());Ss();var CJe=ie(gN()),Wie=()=>new Map([["@yarnpkg/cli",iC],["@yarnpkg/core",Fd],["@yarnpkg/fslib",ch],["@yarnpkg/libzip",Fp],["@yarnpkg/parsers",Hp],["@yarnpkg/shell",jp],["clipanion",vh],["semver",dJe],["typanion",lu],["yup",CJe]]);async function rf(t,e){let{project:r,workspace:i}=await Ke.find(t,e);if(!i)throw new rt(r.cwd,e);return i}var x_e=ie(Or());Ss();var k_e=ie(gN());var hL={};it(hL,{dedupeUtils:()=>zN,default:()=>Q4e,suggestUtils:()=>LN});var WAe=ie(ml());var roe=ie(aC());Ss();var LN={};it(LN,{Modifier:()=>Lo,Strategy:()=>Fr,Target:()=>vr,WorkspaceModifier:()=>af,applyModifier:()=>Zse,extractDescriptorFromPath:()=>ON,extractRangeModifier:()=>Xse,fetchDescriptorFrom:()=>MN,findProjectDescriptors:()=>toe,getModifier:()=>AC,getSuggestedDescriptors:()=>lC,makeWorkspaceDescriptor:()=>eoe,toWorkspaceModifier:()=>$se});var TN=ie(Or()),L3e="workspace:",vr;(function(i){i.REGULAR="dependencies",i.DEVELOPMENT="devDependencies",i.PEER="peerDependencies"})(vr||(vr={}));var Lo;(function(i){i.CARET="^",i.TILDE="~",i.EXACT=""})(Lo||(Lo={}));var af;(function(i){i.CARET="^",i.TILDE="~",i.EXACT="*"})(af||(af={}));var Fr;(function(s){s.KEEP="keep",s.REUSE="reuse",s.PROJECT="project",s.LATEST="latest",s.CACHE="cache"})(Fr||(Fr={}));function AC(t,e){return t.exact?Lo.EXACT:t.caret?Lo.CARET:t.tilde?Lo.TILDE:e.configuration.get("defaultSemverRangePrefix")}var T3e=/^([\^~]?)[0-9]+(?:\.[0-9]+){0,2}(?:-\S+)?$/;function Xse(t,{project:e}){let r=t.match(T3e);return r?r[1]:e.configuration.get("defaultSemverRangePrefix")}function Zse(t,e){let{protocol:r,source:i,params:n,selector:s}=S.parseRange(t.range);return TN.default.valid(s)&&(s=`${e}${t.range}`),S.makeDescriptor(t,S.makeRange({protocol:r,source:i,params:n,selector:s}))}function $se(t){switch(t){case Lo.CARET:return af.CARET;case Lo.TILDE:return af.TILDE;case Lo.EXACT:return af.EXACT;default:throw new Error(`Assertion failed: Unknown modifier: "${t}"`)}}function eoe(t,e){return S.makeDescriptor(t.anchoredDescriptor,`${L3e}${$se(e)}`)}async function toe(t,{project:e,target:r}){let i=new Map,n=s=>{let o=i.get(s.descriptorHash);return o||i.set(s.descriptorHash,o={descriptor:s,locators:[]}),o};for(let s of e.workspaces)if(r===vr.PEER){let o=s.manifest.peerDependencies.get(t.identHash);o!==void 0&&n(o).locators.push(s.locator)}else{let o=s.manifest.dependencies.get(t.identHash),a=s.manifest.devDependencies.get(t.identHash);r===vr.DEVELOPMENT?a!==void 0?n(a).locators.push(s.locator):o!==void 0&&n(o).locators.push(s.locator):o!==void 0?n(o).locators.push(s.locator):a!==void 0&&n(a).locators.push(s.locator)}return i}async function ON(t,{cwd:e,workspace:r}){return await M3e(async i=>{v.isAbsolute(t)||(t=v.relative(r.cwd,v.resolve(e,t)),t.match(/^\.{0,2}\//)||(t=`./${t}`));let{project:n}=r,s=await MN(S.makeIdent(null,"archive"),t,{project:r.project,cache:i,workspace:r});if(!s)throw new Error("Assertion failed: The descriptor should have been found");let o=new ei,a=n.configuration.makeResolver(),l=n.configuration.makeFetcher(),c={checksums:n.storedChecksums,project:n,cache:i,fetcher:l,report:o,resolver:a},u=a.bindDescriptor(s,r.anchoredLocator,c),g=S.convertDescriptorToLocator(u),f=await l.fetch(g,c),h=await Ze.find(f.prefixPath,{baseFs:f.packageFs});if(!h.name)throw new Error("Target path doesn't have a name");return S.makeDescriptor(h.name,t)})}async function lC(t,{project:e,workspace:r,cache:i,target:n,modifier:s,strategies:o,maxResults:a=Infinity}){if(!(a>=0))throw new Error(`Invalid maxResults (${a})`);if(t.range!=="unknown")return{suggestions:[{descriptor:t,name:`Use ${S.prettyDescriptor(e.configuration,t)}`,reason:"(unambiguous explicit request)"}],rejections:[]};let l=typeof r!="undefined"&&r!==null&&r.manifest[n].get(t.identHash)||null,c=[],u=[],g=async f=>{try{await f()}catch(h){u.push(h)}};for(let f of o){if(c.length>=a)break;switch(f){case Fr.KEEP:await g(async()=>{l&&c.push({descriptor:l,name:`Keep ${S.prettyDescriptor(e.configuration,l)}`,reason:"(no changes)"})});break;case Fr.REUSE:await g(async()=>{for(let{descriptor:h,locators:p}of(await toe(t,{project:e,target:n})).values()){if(p.length===1&&p[0].locatorHash===r.anchoredLocator.locatorHash&&o.includes(Fr.KEEP))continue;let d=`(originally used by ${S.prettyLocator(e.configuration,p[0])}`;d+=p.length>1?` and ${p.length-1} other${p.length>2?"s":""})`:")",c.push({descriptor:h,name:`Reuse ${S.prettyDescriptor(e.configuration,h)}`,reason:d})}});break;case Fr.CACHE:await g(async()=>{for(let h of e.storedDescriptors.values())h.identHash===t.identHash&&c.push({descriptor:h,name:`Reuse ${S.prettyDescriptor(e.configuration,h)}`,reason:"(already used somewhere in the lockfile)"})});break;case Fr.PROJECT:await g(async()=>{if(r.manifest.name!==null&&t.identHash===r.manifest.name.identHash)return;let h=e.tryWorkspaceByIdent(t);if(h===null)return;let p=eoe(h,s);c.push({descriptor:p,name:`Attach ${S.prettyDescriptor(e.configuration,p)}`,reason:`(local workspace at ${ue.pretty(e.configuration,h.relativeCwd,ue.Type.PATH)})`})});break;case Fr.LATEST:await g(async()=>{if(t.range!=="unknown")c.push({descriptor:t,name:`Use ${S.prettyRange(e.configuration,t.range)}`,reason:"(explicit range requested)"});else if(n===vr.PEER)c.push({descriptor:S.makeDescriptor(t,"*"),name:"Use *",reason:"(catch-all peer dependency pattern)"});else if(!e.configuration.get("enableNetwork"))c.push({descriptor:null,name:"Resolve from latest",reason:ue.pretty(e.configuration,"(unavailable because enableNetwork is toggled off)","grey")});else{let h=await MN(t,"latest",{project:e,cache:i,workspace:r,preserveModifier:!1});h&&(h=Zse(h,s),c.push({descriptor:h,name:`Use ${S.prettyDescriptor(e.configuration,h)}`,reason:"(resolved from latest)"}))}});break}}return{suggestions:c.slice(0,a),rejections:u.slice(0,a)}}async function MN(t,e,{project:r,cache:i,workspace:n,preserveModifier:s=!0}){let o=S.makeDescriptor(t,e),a=new ei,l=r.configuration.makeFetcher(),c=r.configuration.makeResolver(),u={project:r,fetcher:l,cache:i,checksums:r.storedChecksums,report:a,cacheOptions:{skipIntegrityCheck:!0},skipIntegrityCheck:!0},g=_(P({},u),{resolver:c,fetchOptions:u}),f=c.bindDescriptor(o,n.anchoredLocator,g),h=await c.getCandidates(f,new Map,g);if(h.length===0)return null;let p=h[0],{protocol:d,source:m,params:E,selector:B}=S.parseRange(S.convertToManifestRange(p.reference));if(d===r.configuration.get("defaultProtocol")&&(d=null),TN.default.valid(B)&&s!==!1){let b=typeof s=="string"?s:o.range;B=Xse(b,{project:r})+B}return S.makeDescriptor(p,S.makeRange({protocol:d,source:m,params:E,selector:B}))}async function M3e(t){return await T.mktempPromise(async e=>{let r=fe.create(e);return r.useWithSource(e,{enableMirror:!1,compressionLevel:0},e,{overwrite:!0}),await t(new Qt(e,{configuration:r,check:!1,immutable:!1}))})}var cC=class extends Be{constructor(){super(...arguments);this.json=Y.Boolean("--json",!1,{description:"Format the output as an NDJSON stream"});this.exact=Y.Boolean("-E,--exact",!1,{description:"Don't use any semver modifier on the resolved range"});this.tilde=Y.Boolean("-T,--tilde",!1,{description:"Use the `~` semver modifier on the resolved range"});this.caret=Y.Boolean("-C,--caret",!1,{description:"Use the `^` semver modifier on the resolved range"});this.dev=Y.Boolean("-D,--dev",!1,{description:"Add a package as a dev dependency"});this.peer=Y.Boolean("-P,--peer",!1,{description:"Add a package as a peer dependency"});this.optional=Y.Boolean("-O,--optional",!1,{description:"Add / upgrade a package to an optional regular / peer dependency"});this.preferDev=Y.Boolean("--prefer-dev",!1,{description:"Add / upgrade a package to a dev dependency"});this.interactive=Y.Boolean("-i,--interactive",{description:"Reuse the specified package from other workspaces in the project"});this.cached=Y.Boolean("--cached",!1,{description:"Reuse the highest version already used somewhere within the project"});this.mode=Y.String("--mode",{description:"Change what artifacts installs generate",validator:Yi(li)});this.silent=Y.Boolean("--silent",{hidden:!0});this.packages=Y.Rest()}async execute(){var d;let e=await fe.find(this.context.cwd,this.context.plugins),{project:r,workspace:i}=await Ke.find(e,this.context.cwd),n=await Qt.find(e);if(!i)throw new rt(r.cwd,this.context.cwd);await r.restoreInstallState({restoreResolutions:!1});let s=(d=this.interactive)!=null?d:e.get("preferInteractive"),o=AC(this,r),a=[...s?[Fr.REUSE]:[],Fr.PROJECT,...this.cached?[Fr.CACHE]:[],Fr.LATEST],l=s?Infinity:1,c=await Promise.all(this.packages.map(async m=>{let E=m.match(/^\.{0,2}\//)?await ON(m,{cwd:this.context.cwd,workspace:i}):S.parseDescriptor(m),B=O3e(i,E,{dev:this.dev,peer:this.peer,preferDev:this.preferDev,optional:this.optional}),b=await lC(E,{project:r,workspace:i,cache:n,target:B,modifier:o,strategies:a,maxResults:l});return[E,b,B]})),u=await Fa.start({configuration:e,stdout:this.context.stdout,suggestInstall:!1},async m=>{for(let[E,{suggestions:B,rejections:b}]of c)if(B.filter(H=>H.descriptor!==null).length===0){let[H]=b;if(typeof H=="undefined")throw new Error("Assertion failed: Expected an error to have been set");r.configuration.get("enableNetwork")?m.reportError(z.CANT_SUGGEST_RESOLUTIONS,`${S.prettyDescriptor(e,E)} can't be resolved to a satisfying range`):m.reportError(z.CANT_SUGGEST_RESOLUTIONS,`${S.prettyDescriptor(e,E)} can't be resolved to a satisfying range (note: network resolution has been disabled)`),m.reportSeparator(),m.reportExceptionOnce(H)}});if(u.hasErrors())return u.exitCode();let g=!1,f=[],h=[];for(let[,{suggestions:m},E]of c){let B,b=m.filter(K=>K.descriptor!==null),R=b[0].descriptor,H=b.every(K=>S.areDescriptorsEqual(K.descriptor,R));b.length===1||H?B=R:(g=!0,{answer:B}=await(0,roe.prompt)({type:"select",name:"answer",message:"Which range do you want to use?",choices:m.map(({descriptor:K,name:J,reason:ne})=>K?{name:J,hint:ne,descriptor:K}:{name:J,hint:ne,disabled:!0}),onCancel:()=>process.exit(130),result(K){return this.find(K,"descriptor")},stdin:this.context.stdin,stdout:this.context.stdout}));let L=i.manifest[E].get(B.identHash);(typeof L=="undefined"||L.descriptorHash!==B.descriptorHash)&&(i.manifest[E].set(B.identHash,B),this.optional&&(E==="dependencies"?i.manifest.ensureDependencyMeta(_(P({},B),{range:"unknown"})).optional=!0:E==="peerDependencies"&&(i.manifest.ensurePeerDependencyMeta(_(P({},B),{range:"unknown"})).optional=!0)),typeof L=="undefined"?f.push([i,E,B,a]):h.push([i,E,L,B]))}return await e.triggerMultipleHooks(m=>m.afterWorkspaceDependencyAddition,f),await e.triggerMultipleHooks(m=>m.afterWorkspaceDependencyReplacement,h),g&&this.context.stdout.write(` +`),(await Fe.start({configuration:e,json:this.json,stdout:this.context.stdout,includeLogs:!this.context.quiet},async m=>{await r.install({cache:n,report:m,mode:this.mode})})).exitCode()}};cC.paths=[["add"]],cC.usage=ye.Usage({description:"add dependencies to the project",details:"\n This command adds a package to the package.json for the nearest workspace.\n\n - If it didn't exist before, the package will by default be added to the regular `dependencies` field, but this behavior can be overriden thanks to the `-D,--dev` flag (which will cause the dependency to be added to the `devDependencies` field instead) and the `-P,--peer` flag (which will do the same but for `peerDependencies`).\n\n - If the package was already listed in your dependencies, it will by default be upgraded whether it's part of your `dependencies` or `devDependencies` (it won't ever update `peerDependencies`, though).\n\n - If set, the `--prefer-dev` flag will operate as a more flexible `-D,--dev` in that it will add the package to your `devDependencies` if it isn't already listed in either `dependencies` or `devDependencies`, but it will also happily upgrade your `dependencies` if that's what you already use (whereas `-D,--dev` would throw an exception).\n\n - If set, the `-O,--optional` flag will add the package to the `optionalDependencies` field and, in combination with the `-P,--peer` flag, it will add the package as an optional peer dependency. If the package was already listed in your `dependencies`, it will be upgraded to `optionalDependencies`. If the package was already listed in your `peerDependencies`, in combination with the `-P,--peer` flag, it will be upgraded to an optional peer dependency: `\"peerDependenciesMeta\": { \"\": { \"optional\": true } }`\n\n - If the added package doesn't specify a range at all its `latest` tag will be resolved and the returned version will be used to generate a new semver range (using the `^` modifier by default unless otherwise configured via the `defaultSemverRangePrefix` configuration, or the `~` modifier if `-T,--tilde` is specified, or no modifier at all if `-E,--exact` is specified). Two exceptions to this rule: the first one is that if the package is a workspace then its local version will be used, and the second one is that if you use `-P,--peer` the default range will be `*` and won't be resolved at all.\n\n - If the added package specifies a range (such as `^1.0.0`, `latest`, or `rc`), Yarn will add this range as-is in the resulting package.json entry (in particular, tags such as `rc` will be encoded as-is rather than being converted into a semver range).\n\n If the `--cached` option is used, Yarn will preferably reuse the highest version already used somewhere within the project, even if through a transitive dependency.\n\n If the `-i,--interactive` option is used (or if the `preferInteractive` settings is toggled on) the command will first try to check whether other workspaces in the project use the specified package and, if so, will offer to reuse them.\n\n If the `--mode=` option is set, Yarn will change which artifacts are generated. The modes currently supported are:\n\n - `skip-build` will not run the build scripts at all. Note that this is different from setting `enableScripts` to false because the later will disable build scripts, and thus affect the content of the artifacts generated on disk, whereas the former will just disable the build step - but not the scripts themselves, which just won't run.\n\n - `update-lockfile` will skip the link step altogether, and only fetch packages that are missing from the lockfile (or that have no associated checksums). This mode is typically used by tools like Renovate or Dependabot to keep a lockfile up-to-date without incurring the full install cost.\n\n For a compilation of all the supported protocols, please consult the dedicated page from our website: https://yarnpkg.com/features/protocols.\n ",examples:[["Add a regular package to the current workspace","$0 add lodash"],["Add a specific version for a package to the current workspace","$0 add lodash@1.2.3"],["Add a package from a GitHub repository (the master branch) to the current workspace using a URL","$0 add lodash@https://github.com/lodash/lodash"],["Add a package from a GitHub repository (the master branch) to the current workspace using the GitHub protocol","$0 add lodash@github:lodash/lodash"],["Add a package from a GitHub repository (the master branch) to the current workspace using the GitHub protocol (shorthand)","$0 add lodash@lodash/lodash"],["Add a package from a specific branch of a GitHub repository to the current workspace using the GitHub protocol (shorthand)","$0 add lodash-es@lodash/lodash#es"]]});var ioe=cC;function O3e(t,e,{dev:r,peer:i,preferDev:n,optional:s}){let o=t.manifest[vr.REGULAR].has(e.identHash),a=t.manifest[vr.DEVELOPMENT].has(e.identHash),l=t.manifest[vr.PEER].has(e.identHash);if((r||i)&&o)throw new me(`Package "${S.prettyIdent(t.project.configuration,e)}" is already listed as a regular dependency - remove the -D,-P flags or remove it from your dependencies first`);if(!r&&!i&&l)throw new me(`Package "${S.prettyIdent(t.project.configuration,e)}" is already listed as a peer dependency - use either of -D or -P, or remove it from your peer dependencies first`);if(s&&a)throw new me(`Package "${S.prettyIdent(t.project.configuration,e)}" is already listed as a dev dependency - remove the -O flag or remove it from your dev dependencies first`);if(s&&!i&&l)throw new me(`Package "${S.prettyIdent(t.project.configuration,e)}" is already listed as a peer dependency - remove the -O flag or add the -P flag or remove it from your peer dependencies first`);if((r||n)&&s)throw new me(`Package "${S.prettyIdent(t.project.configuration,e)}" cannot simultaneously be a dev dependency and an optional dependency`);return i?vr.PEER:r||n?vr.DEVELOPMENT:o?vr.REGULAR:a?vr.DEVELOPMENT:vr.REGULAR}var uC=class extends Be{constructor(){super(...arguments);this.verbose=Y.Boolean("-v,--verbose",!1,{description:"Print both the binary name and the locator of the package that provides the binary"});this.json=Y.Boolean("--json",!1,{description:"Format the output as an NDJSON stream"});this.name=Y.String({required:!1})}async execute(){let e=await fe.find(this.context.cwd,this.context.plugins),{project:r,locator:i}=await Ke.find(e,this.context.cwd);if(await r.restoreInstallState(),this.name){let o=(await Kt.getPackageAccessibleBinaries(i,{project:r})).get(this.name);if(!o)throw new me(`Couldn't find a binary named "${this.name}" for package "${S.prettyLocator(e,i)}"`);let[,a]=o;return this.context.stdout.write(`${a} +`),0}return(await Fe.start({configuration:e,json:this.json,stdout:this.context.stdout},async s=>{let o=await Kt.getPackageAccessibleBinaries(i,{project:r}),l=Array.from(o.keys()).reduce((c,u)=>Math.max(c,u.length),0);for(let[c,[u,g]]of o)s.reportJson({name:c,source:S.stringifyIdent(u),path:g});if(this.verbose)for(let[c,[u]]of o)s.reportInfo(null,`${c.padEnd(l," ")} ${S.prettyLocator(e,u)}`);else for(let c of o.keys())s.reportInfo(null,c)})).exitCode()}};uC.paths=[["bin"]],uC.usage=ye.Usage({description:"get the path to a binary script",details:` + When used without arguments, this command will print the list of all the binaries available in the current workspace. Adding the \`-v,--verbose\` flag will cause the output to contain both the binary name and the locator of the package that provides the binary. + + When an argument is specified, this command will just print the path to the binary on the standard output and exit. Note that the reported path may be stored within a zip archive. + `,examples:[["List all the available binaries","$0 bin"],["Print the path to a specific binary","$0 bin eslint"]]});var noe=uC;var gC=class extends Be{constructor(){super(...arguments);this.mirror=Y.Boolean("--mirror",!1,{description:"Remove the global cache files instead of the local cache files"});this.all=Y.Boolean("--all",!1,{description:"Remove both the global cache files and the local cache files of the current project"})}async execute(){let e=await fe.find(this.context.cwd,this.context.plugins),r=await Qt.find(e);return(await Fe.start({configuration:e,stdout:this.context.stdout},async()=>{let n=(this.all||this.mirror)&&r.mirrorCwd!==null,s=!this.mirror;n&&(await T.removePromise(r.mirrorCwd),await e.triggerHook(o=>o.cleanGlobalArtifacts,e)),s&&await T.removePromise(r.cwd)})).exitCode()}};gC.paths=[["cache","clean"],["cache","clear"]],gC.usage=ye.Usage({description:"remove the shared cache files",details:` + This command will remove all the files from the cache. + `,examples:[["Remove all the local archives","$0 cache clean"],["Remove all the archives stored in the ~/.yarn directory","$0 cache clean --mirror"]]});var soe=gC;var ooe=ie(p0()),KN=ie(require("util")),fC=class extends Be{constructor(){super(...arguments);this.json=Y.Boolean("--json",!1,{description:"Format the output as an NDJSON stream"});this.unsafe=Y.Boolean("--no-redacted",!1,{description:"Don't redact secrets (such as tokens) from the output"});this.name=Y.String()}async execute(){let e=await fe.find(this.context.cwd,this.context.plugins),r=this.name.replace(/[.[].*$/,""),i=this.name.replace(/^[^.[]*/,"");if(typeof e.settings.get(r)=="undefined")throw new me(`Couldn't find a configuration settings named "${r}"`);let s=e.getSpecial(r,{hideSecrets:!this.unsafe,getNativePaths:!0}),o=de.convertMapsToIndexableObjects(s),a=i?(0,ooe.default)(o,i):o,l=await Fe.start({configuration:e,includeFooter:!1,json:this.json,stdout:this.context.stdout},async c=>{c.reportJson(a)});if(!this.json){if(typeof a=="string")return this.context.stdout.write(`${a} +`),l.exitCode();KN.inspect.styles.name="cyan",this.context.stdout.write(`${(0,KN.inspect)(a,{depth:Infinity,colors:e.get("enableColors"),compact:!1})} +`)}return l.exitCode()}};fC.paths=[["config","get"]],fC.usage=ye.Usage({description:"read a configuration settings",details:` + This command will print a configuration setting. + + Secrets (such as tokens) will be redacted from the output by default. If this behavior isn't desired, set the \`--no-redacted\` to get the untransformed value. + `,examples:[["Print a simple configuration setting","yarn config get yarnPath"],["Print a complex configuration setting","yarn config get packageExtensions"],["Print a nested field from the configuration",`yarn config get 'npmScopes["my-company"].npmRegistryServer'`],["Print a token from the configuration","yarn config get npmAuthToken --no-redacted"],["Print a configuration setting as JSON","yarn config get packageExtensions --json"]]});var aoe=fC;var Iae=ie(qN()),Eae=ie(p0()),yae=ie(mae()),JN=ie(require("util")),pC=class extends Be{constructor(){super(...arguments);this.json=Y.Boolean("--json",!1,{description:"Set complex configuration settings to JSON values"});this.home=Y.Boolean("-H,--home",!1,{description:"Update the home configuration instead of the project configuration"});this.name=Y.String();this.value=Y.String()}async execute(){let e=await fe.find(this.context.cwd,this.context.plugins),r=()=>{if(!e.projectCwd)throw new me("This command must be run from within a project folder");return e.projectCwd},i=this.name.replace(/[.[].*$/,""),n=this.name.replace(/^[^.[]*\.?/,"");if(typeof e.settings.get(i)=="undefined")throw new me(`Couldn't find a configuration settings named "${i}"`);if(i==="enableStrictSettings")throw new me("This setting only affects the file it's in, and thus cannot be set from the CLI");let o=this.json?JSON.parse(this.value):this.value;await(this.home?h=>fe.updateHomeConfiguration(h):h=>fe.updateConfiguration(r(),h))(h=>{if(n){let p=(0,Iae.default)(h);return(0,yae.default)(p,this.name,o),p}else return _(P({},h),{[i]:o})});let c=(await fe.find(this.context.cwd,this.context.plugins)).getSpecial(i,{hideSecrets:!0,getNativePaths:!0}),u=de.convertMapsToIndexableObjects(c),g=n?(0,Eae.default)(u,n):u;return(await Fe.start({configuration:e,includeFooter:!1,stdout:this.context.stdout},async h=>{JN.inspect.styles.name="cyan",h.reportInfo(z.UNNAMED,`Successfully set ${this.name} to ${(0,JN.inspect)(g,{depth:Infinity,colors:e.get("enableColors"),compact:!1})}`)})).exitCode()}};pC.paths=[["config","set"]],pC.usage=ye.Usage({description:"change a configuration settings",details:` + This command will set a configuration setting. + + When used without the \`--json\` flag, it can only set a simple configuration setting (a string, a number, or a boolean). + + When used with the \`--json\` flag, it can set both simple and complex configuration settings, including Arrays and Objects. + `,examples:[["Set a simple configuration setting (a string, a number, or a boolean)","yarn config set initScope myScope"],["Set a simple configuration setting (a string, a number, or a boolean) using the `--json` flag",'yarn config set initScope --json \\"myScope\\"'],["Set a complex configuration setting (an Array) using the `--json` flag",`yarn config set unsafeHttpWhitelist --json '["*.example.com", "example.com"]'`],["Set a complex configuration setting (an Object) using the `--json` flag",`yarn config set packageExtensions --json '{ "@babel/parser@*": { "dependencies": { "@babel/types": "*" } } }'`],["Set a nested configuration setting",'yarn config set npmScopes.company.npmRegistryServer "https://npm.example.com"'],["Set a nested configuration setting using indexed access for non-simple keys",`yarn config set 'npmRegistries["//npm.example.com"].npmAuthToken' "ffffffff-ffff-ffff-ffff-ffffffffffff"`]]});var wae=pC;var Dae=ie(qN()),Rae=ie(Ld()),Fae=ie(Pae()),dC=class extends Be{constructor(){super(...arguments);this.home=Y.Boolean("-H,--home",!1,{description:"Update the home configuration instead of the project configuration"});this.name=Y.String()}async execute(){let e=await fe.find(this.context.cwd,this.context.plugins),r=()=>{if(!e.projectCwd)throw new me("This command must be run from within a project folder");return e.projectCwd},i=this.name.replace(/[.[].*$/,""),n=this.name.replace(/^[^.[]*\.?/,"");if(typeof e.settings.get(i)=="undefined")throw new me(`Couldn't find a configuration settings named "${i}"`);let o=this.home?l=>fe.updateHomeConfiguration(l):l=>fe.updateConfiguration(r(),l);return(await Fe.start({configuration:e,includeFooter:!1,stdout:this.context.stdout},async l=>{let c=!1;await o(u=>{if(!(0,Rae.default)(u,this.name))return l.reportWarning(z.UNNAMED,`Configuration doesn't contain setting ${this.name}; there is nothing to unset`),c=!0,u;let g=n?(0,Dae.default)(u):P({},u);return(0,Fae.default)(g,this.name),g}),c||l.reportInfo(z.UNNAMED,`Successfully unset ${this.name}`)})).exitCode()}};dC.paths=[["config","unset"]],dC.usage=ye.Usage({description:"unset a configuration setting",details:` + This command will unset a configuration setting. + `,examples:[["Unset a simple configuration setting","yarn config unset initScope"],["Unset a complex configuration setting","yarn config unset packageExtensions"],["Unset a nested configuration setting","yarn config unset npmScopes.company.npmRegistryServer"]]});var Nae=dC;var WN=ie(require("util")),CC=class extends Be{constructor(){super(...arguments);this.verbose=Y.Boolean("-v,--verbose",!1,{description:"Print the setting description on top of the regular key/value information"});this.why=Y.Boolean("--why",!1,{description:"Print the reason why a setting is set a particular way"});this.json=Y.Boolean("--json",!1,{description:"Format the output as an NDJSON stream"})}async execute(){let e=await fe.find(this.context.cwd,this.context.plugins,{strict:!1});return(await Fe.start({configuration:e,json:this.json,stdout:this.context.stdout},async i=>{if(e.invalid.size>0&&!this.json){for(let[n,s]of e.invalid)i.reportError(z.INVALID_CONFIGURATION_KEY,`Invalid configuration key "${n}" in ${s}`);i.reportSeparator()}if(this.json){let n=de.sortMap(e.settings.keys(),s=>s);for(let s of n){let o=e.settings.get(s),a=e.getSpecial(s,{hideSecrets:!0,getNativePaths:!0}),l=e.sources.get(s);this.verbose?i.reportJson({key:s,effective:a,source:l}):i.reportJson(P({key:s,effective:a,source:l},o))}}else{let n=de.sortMap(e.settings.keys(),a=>a),s=n.reduce((a,l)=>Math.max(a,l.length),0),o={breakLength:Infinity,colors:e.get("enableColors"),maxArrayLength:2};if(this.why||this.verbose){let a=n.map(c=>{let u=e.settings.get(c);if(!u)throw new Error(`Assertion failed: This settings ("${c}") should have been registered`);let g=this.why?e.sources.get(c)||"":u.description;return[c,g]}),l=a.reduce((c,[,u])=>Math.max(c,u.length),0);for(let[c,u]of a)i.reportInfo(null,`${c.padEnd(s," ")} ${u.padEnd(l," ")} ${(0,WN.inspect)(e.getSpecial(c,{hideSecrets:!0,getNativePaths:!0}),o)}`)}else for(let a of n)i.reportInfo(null,`${a.padEnd(s," ")} ${(0,WN.inspect)(e.getSpecial(a,{hideSecrets:!0,getNativePaths:!0}),o)}`)}})).exitCode()}};CC.paths=[["config"]],CC.usage=ye.Usage({description:"display the current configuration",details:` + This command prints the current active configuration settings. + `,examples:[["Print the active configuration settings","$0 config"]]});var Lae=CC;Ss();var zN={};it(zN,{Strategy:()=>Oc,acceptedStrategies:()=>Hze,dedupe:()=>VN});var Tae=ie(Nn()),Oc;(function(e){e.HIGHEST="highest"})(Oc||(Oc={}));var Hze=new Set(Object.values(Oc)),Gze={highest:async(t,e,{resolver:r,fetcher:i,resolveOptions:n,fetchOptions:s})=>{let o=new Map;for(let[a,l]of t.storedResolutions){let c=t.storedDescriptors.get(a);if(typeof c=="undefined")throw new Error(`Assertion failed: The descriptor (${a}) should have been registered`);de.getSetWithDefault(o,c.identHash).add(l)}return Array.from(t.storedDescriptors.values(),async a=>{if(e.length&&!Tae.default.isMatch(S.stringifyIdent(a),e))return null;let l=t.storedResolutions.get(a.descriptorHash);if(typeof l=="undefined")throw new Error(`Assertion failed: The resolution (${a.descriptorHash}) should have been registered`);let c=t.originalPackages.get(l);if(typeof c=="undefined"||!r.shouldPersistResolution(c,n))return null;let u=o.get(a.identHash);if(typeof u=="undefined")throw new Error(`Assertion failed: The resolutions (${a.identHash}) should have been registered`);if(u.size===1)return null;let g=[...u].map(m=>{let E=t.originalPackages.get(m);if(typeof E=="undefined")throw new Error(`Assertion failed: The package (${m}) should have been registered`);return E.reference}),f=await r.getSatisfying(a,g,n),h=f==null?void 0:f[0];if(typeof h=="undefined")return null;let p=h.locatorHash,d=t.originalPackages.get(p);if(typeof d=="undefined")throw new Error(`Assertion failed: The package (${p}) should have been registered`);return p===l?null:{descriptor:a,currentPackage:c,updatedPackage:d}})}};async function VN(t,{strategy:e,patterns:r,cache:i,report:n}){let{configuration:s}=t,o=new ei,a=s.makeResolver(),l=s.makeFetcher(),c={cache:i,checksums:t.storedChecksums,fetcher:l,project:t,report:o,skipIntegrityCheck:!0,cacheOptions:{skipIntegrityCheck:!0}},u={project:t,resolver:a,report:o,fetchOptions:c};return await n.startTimerPromise("Deduplication step",async()=>{let f=await Gze[e](t,r,{resolver:a,resolveOptions:u,fetcher:l,fetchOptions:c}),h=Xi.progressViaCounter(f.length);n.reportProgress(h);let p=0;await Promise.all(f.map(E=>E.then(B=>{if(B===null)return;p++;let{descriptor:b,currentPackage:R,updatedPackage:H}=B;n.reportInfo(z.UNNAMED,`${S.prettyDescriptor(s,b)} can be deduped from ${S.prettyLocator(s,R)} to ${S.prettyLocator(s,H)}`),n.reportJson({descriptor:S.stringifyDescriptor(b),currentResolution:S.stringifyLocator(R),updatedResolution:S.stringifyLocator(H)}),t.storedResolutions.set(b.descriptorHash,H.locatorHash)}).finally(()=>h.tick())));let d;switch(p){case 0:d="No packages";break;case 1:d="One package";break;default:d=`${p} packages`}let m=ue.pretty(s,e,ue.Type.CODE);return n.reportInfo(z.UNNAMED,`${d} can be deduped using the ${m} strategy`),p})}var mC=class extends Be{constructor(){super(...arguments);this.strategy=Y.String("-s,--strategy",Oc.HIGHEST,{description:"The strategy to use when deduping dependencies",validator:Yi(Oc)});this.check=Y.Boolean("-c,--check",!1,{description:"Exit with exit code 1 when duplicates are found, without persisting the dependency tree"});this.json=Y.Boolean("--json",!1,{description:"Format the output as an NDJSON stream"});this.mode=Y.String("--mode",{description:"Change what artifacts installs generate",validator:Yi(li)});this.patterns=Y.Rest()}async execute(){let e=await fe.find(this.context.cwd,this.context.plugins),{project:r}=await Ke.find(e,this.context.cwd),i=await Qt.find(e);await r.restoreInstallState({restoreResolutions:!1});let n=0,s=await Fe.start({configuration:e,includeFooter:!1,stdout:this.context.stdout,json:this.json},async o=>{n=await VN(r,{strategy:this.strategy,patterns:this.patterns,cache:i,report:o})});return s.hasErrors()?s.exitCode():this.check?n?1:0:(await Fe.start({configuration:e,stdout:this.context.stdout,json:this.json},async a=>{await r.install({cache:i,report:a,mode:this.mode})})).exitCode()}};mC.paths=[["dedupe"]],mC.usage=ye.Usage({description:"deduplicate dependencies with overlapping ranges",details:"\n Duplicates are defined as descriptors with overlapping ranges being resolved and locked to different locators. They are a natural consequence of Yarn's deterministic installs, but they can sometimes pile up and unnecessarily increase the size of your project.\n\n This command dedupes dependencies in the current project using different strategies (only one is implemented at the moment):\n\n - `highest`: Reuses (where possible) the locators with the highest versions. This means that dependencies can only be upgraded, never downgraded. It's also guaranteed that it never takes more than a single pass to dedupe the entire dependency tree.\n\n **Note:** Even though it never produces a wrong dependency tree, this command should be used with caution, as it modifies the dependency tree, which can sometimes cause problems when packages don't strictly follow semver recommendations. Because of this, it is recommended to also review the changes manually.\n\n If set, the `-c,--check` flag will only report the found duplicates, without persisting the modified dependency tree. If changes are found, the command will exit with a non-zero exit code, making it suitable for CI purposes.\n\n If the `--mode=` option is set, Yarn will change which artifacts are generated. The modes currently supported are:\n\n - `skip-build` will not run the build scripts at all. Note that this is different from setting `enableScripts` to false because the later will disable build scripts, and thus affect the content of the artifacts generated on disk, whereas the former will just disable the build step - but not the scripts themselves, which just won't run.\n\n - `update-lockfile` will skip the link step altogether, and only fetch packages that are missing from the lockfile (or that have no associated checksums). This mode is typically used by tools like Renovate or Dependabot to keep a lockfile up-to-date without incurring the full install cost.\n\n This command accepts glob patterns as arguments (if valid Idents and supported by [micromatch](https://github.com/micromatch/micromatch)). Make sure to escape the patterns, to prevent your own shell from trying to expand them.\n\n ### In-depth explanation:\n\n Yarn doesn't deduplicate dependencies by default, otherwise installs wouldn't be deterministic and the lockfile would be useless. What it actually does is that it tries to not duplicate dependencies in the first place.\n\n **Example:** If `foo@^2.3.4` (a dependency of a dependency) has already been resolved to `foo@2.3.4`, running `yarn add foo@*`will cause Yarn to reuse `foo@2.3.4`, even if the latest `foo` is actually `foo@2.10.14`, thus preventing unnecessary duplication.\n\n Duplication happens when Yarn can't unlock dependencies that have already been locked inside the lockfile.\n\n **Example:** If `foo@^2.3.4` (a dependency of a dependency) has already been resolved to `foo@2.3.4`, running `yarn add foo@2.10.14` will cause Yarn to install `foo@2.10.14` because the existing resolution doesn't satisfy the range `2.10.14`. This behavior can lead to (sometimes) unwanted duplication, since now the lockfile contains 2 separate resolutions for the 2 `foo` descriptors, even though they have overlapping ranges, which means that the lockfile can be simplified so that both descriptors resolve to `foo@2.10.14`.\n ",examples:[["Dedupe all packages","$0 dedupe"],["Dedupe all packages using a specific strategy","$0 dedupe --strategy highest"],["Dedupe a specific package","$0 dedupe lodash"],["Dedupe all packages with the `@babel/*` scope","$0 dedupe '@babel/*'"],["Check for duplicates (can be used as a CI step)","$0 dedupe --check"]]});var Mae=mC;var Y0=class extends Be{async execute(){let{plugins:e}=await fe.find(this.context.cwd,this.context.plugins),r=[];for(let o of e){let{commands:a}=o[1];if(a){let c=oo.from(a).definitions();r.push([o[0],c])}}let i=this.cli.definitions(),n=(o,a)=>o.split(" ").slice(1).join()===a.split(" ").slice(1).join(),s=Kae()["@yarnpkg/builder"].bundles.standard;for(let o of r){let a=o[1];for(let l of a)i.find(c=>n(c.path,l.path)).plugin={name:o[0],isDefault:s.includes(o[0])}}this.context.stdout.write(`${JSON.stringify(i,null,2)} +`)}};Y0.paths=[["--clipanion=definitions"]];var Uae=Y0;var q0=class extends Be{async execute(){this.context.stdout.write(this.cli.usage(null))}};q0.paths=[["help"],["--help"],["-h"]];var Hae=q0;var _N=class extends Be{constructor(){super(...arguments);this.leadingArgument=Y.String();this.args=Y.Proxy()}async execute(){if(this.leadingArgument.match(/[\\/]/)&&!S.tryParseIdent(this.leadingArgument)){let e=v.resolve(this.context.cwd,M.toPortablePath(this.leadingArgument));return await this.cli.run(this.args,{cwd:e})}else return await this.cli.run(["run",this.leadingArgument,...this.args])}},Gae=_N;var J0=class extends Be{async execute(){this.context.stdout.write(`${Zr||""} +`)}};J0.paths=[["-v"],["--version"]];var jae=J0;var IC=class extends Be{constructor(){super(...arguments);this.commandName=Y.String();this.args=Y.Proxy()}async execute(){let e=await fe.find(this.context.cwd,this.context.plugins),{project:r,locator:i}=await Ke.find(e,this.context.cwd);return await r.restoreInstallState(),await Kt.executePackageShellcode(i,this.commandName,this.args,{cwd:this.context.cwd,stdin:this.context.stdin,stdout:this.context.stdout,stderr:this.context.stderr,project:r})}};IC.paths=[["exec"]],IC.usage=ye.Usage({description:"execute a shell script",details:` + This command simply executes a shell script within the context of the root directory of the active workspace using the portable shell. + + It also makes sure to call it in a way that's compatible with the current project (for example, on PnP projects the environment will be setup in such a way that PnP will be correctly injected into the environment). + `,examples:[["Execute a single shell command","$0 exec echo Hello World"],["Execute a shell script",'$0 exec "tsc & babel src --out-dir lib"']]});var Yae=IC;Ss();var EC=class extends Be{constructor(){super(...arguments);this.hash=Y.String({required:!1,validator:fv(gv(),[hv(/^p[0-9a-f]{5}$/)])})}async execute(){let e=await fe.find(this.context.cwd,this.context.plugins),{project:r}=await Ke.find(e,this.context.cwd);return await r.restoreInstallState({restoreResolutions:!1}),await r.applyLightResolution(),typeof this.hash!="undefined"?await jze(this.hash,r,{stdout:this.context.stdout}):(await Fe.start({configuration:e,stdout:this.context.stdout,includeFooter:!1},async n=>{var o;let s=[([,a])=>S.stringifyLocator(r.storedPackages.get(a.subject)),([,a])=>S.stringifyIdent(a.requested)];for(let[a,l]of de.sortMap(r.peerRequirements,s)){let c=r.storedPackages.get(l.subject);if(typeof c=="undefined")throw new Error("Assertion failed: Expected the subject package to have been registered");let u=r.storedPackages.get(l.rootRequester);if(typeof u=="undefined")throw new Error("Assertion failed: Expected the root package to have been registered");let g=(o=c.dependencies.get(l.requested.identHash))!=null?o:null,f=ue.pretty(e,a,ue.Type.CODE),h=S.prettyLocator(e,c),p=S.prettyIdent(e,l.requested),d=S.prettyIdent(e,u),m=l.allRequesters.length-1,E=`descendant${m===1?"":"s"}`,B=m>0?` and ${m} ${E}`:"",b=g!==null?"provides":"doesn't provide";n.reportInfo(null,`${f} \u2192 ${h} ${b} ${p} to ${d}${B}`)}})).exitCode()}};EC.paths=[["explain","peer-requirements"]],EC.usage=ye.Usage({description:"explain a set of peer requirements",details:` + A set of peer requirements represents all peer requirements that a dependent must satisfy when providing a given peer request to a requester and its descendants. + + When the hash argument is specified, this command prints a detailed explanation of all requirements of the set corresponding to the hash and whether they're satisfied or not. + + When used without arguments, this command lists all sets of peer requirements and the corresponding hash that can be used to get detailed information about a given set. + + **Note:** A hash is a six-letter p-prefixed code that can be obtained from peer dependency warnings or from the list of all peer requirements (\`yarn explain peer-requirements\`). + `,examples:[["Explain the corresponding set of peer requirements for a hash","$0 explain peer-requirements p1a4ed"],["List all sets of peer requirements","$0 explain peer-requirements"]]});var qae=EC;async function jze(t,e,r){let{configuration:i}=e,n=e.peerRequirements.get(t);if(typeof n=="undefined")throw new Error(`No peerDependency requirements found for hash: "${t}"`);return(await Fe.start({configuration:i,stdout:r.stdout,includeFooter:!1},async o=>{var E,B;let a=e.storedPackages.get(n.subject);if(typeof a=="undefined")throw new Error("Assertion failed: Expected the subject package to have been registered");let l=e.storedPackages.get(n.rootRequester);if(typeof l=="undefined")throw new Error("Assertion failed: Expected the root package to have been registered");let c=(E=a.dependencies.get(n.requested.identHash))!=null?E:null,u=c!==null?e.storedResolutions.get(c.descriptorHash):null;if(typeof u=="undefined")throw new Error("Assertion failed: Expected the resolution to have been registered");let g=u!==null?e.storedPackages.get(u):null;if(typeof g=="undefined")throw new Error("Assertion failed: Expected the provided package to have been registered");let f=[...n.allRequesters.values()].map(b=>{let R=e.storedPackages.get(b);if(typeof R=="undefined")throw new Error("Assertion failed: Expected the package to be registered");let H=S.devirtualizeLocator(R),L=e.storedPackages.get(H.locatorHash);if(typeof L=="undefined")throw new Error("Assertion failed: Expected the package to be registered");let K=L.peerDependencies.get(n.requested.identHash);if(typeof K=="undefined")throw new Error("Assertion failed: Expected the peer dependency to be registered");return{pkg:R,peerDependency:K}});if(g!==null){let b=f.every(({peerDependency:R})=>qt.satisfiesWithPrereleases(g.version,R.range));o.reportInfo(z.UNNAMED,`${S.prettyLocator(i,a)} provides ${S.prettyLocator(i,g)} with version ${S.prettyReference(i,(B=g.version)!=null?B:"")}, which ${b?"satisfies":"doesn't satisfy"} the following requirements:`)}else o.reportInfo(z.UNNAMED,`${S.prettyLocator(i,a)} doesn't provide ${S.prettyIdent(i,n.requested)}, breaking the following requirements:`);o.reportSeparator();let h=ue.mark(i),p=[];for(let{pkg:b,peerDependency:R}of de.sortMap(f,H=>S.stringifyLocator(H.pkg))){let L=(g!==null?qt.satisfiesWithPrereleases(g.version,R.range):!1)?h.Check:h.Cross;p.push({stringifiedLocator:S.stringifyLocator(b),prettyLocator:S.prettyLocator(i,b),prettyRange:S.prettyRange(i,R.range),mark:L})}let d=Math.max(...p.map(({stringifiedLocator:b})=>b.length)),m=Math.max(...p.map(({prettyRange:b})=>b.length));for(let{stringifiedLocator:b,prettyLocator:R,prettyRange:H,mark:L}of de.sortMap(p,({stringifiedLocator:K})=>K))o.reportInfo(null,`${R.padEnd(d+(R.length-b.length)," ")} \u2192 ${H.padEnd(m," ")} ${L}`);p.length>1&&(o.reportSeparator(),o.reportInfo(z.UNNAMED,`Note: these requirements start with ${S.prettyLocator(e.configuration,l)}`))})).exitCode()}var Jae=ie(Nn()),yC=class extends Be{constructor(){super(...arguments);this.all=Y.Boolean("-A,--all",!1,{description:"Print versions of a package from the whole project"});this.recursive=Y.Boolean("-R,--recursive",!1,{description:"Print information for all packages, including transitive dependencies"});this.extra=Y.Array("-X,--extra",[],{description:"An array of requests of extra data provided by plugins"});this.cache=Y.Boolean("--cache",!1,{description:"Print information about the cache entry of a package (path, size, checksum)"});this.dependents=Y.Boolean("--dependents",!1,{description:"Print all dependents for each matching package"});this.manifest=Y.Boolean("--manifest",!1,{description:"Print data obtained by looking at the package archive (license, homepage, ...)"});this.nameOnly=Y.Boolean("--name-only",!1,{description:"Only print the name for the matching packages"});this.virtuals=Y.Boolean("--virtuals",!1,{description:"Print each instance of the virtual packages"});this.json=Y.Boolean("--json",!1,{description:"Format the output as an NDJSON stream"});this.patterns=Y.Rest()}async execute(){let e=await fe.find(this.context.cwd,this.context.plugins),{project:r,workspace:i}=await Ke.find(e,this.context.cwd),n=await Qt.find(e);if(!i&&!this.all)throw new rt(r.cwd,this.context.cwd);await r.restoreInstallState();let s=new Set(this.extra);this.cache&&s.add("cache"),this.dependents&&s.add("dependents"),this.manifest&&s.add("manifest");let o=(b,{recursive:R})=>{let H=b.anchoredLocator.locatorHash,L=new Map,K=[H];for(;K.length>0;){let J=K.shift();if(L.has(J))continue;let ne=r.storedPackages.get(J);if(typeof ne=="undefined")throw new Error("Assertion failed: Expected the package to be registered");if(L.set(J,ne),S.isVirtualLocator(ne)&&K.push(S.devirtualizeLocator(ne).locatorHash),!(!R&&J!==H))for(let q of ne.dependencies.values()){let A=r.storedResolutions.get(q.descriptorHash);if(typeof A=="undefined")throw new Error("Assertion failed: Expected the resolution to be registered");K.push(A)}}return L.values()},a=({recursive:b})=>{let R=new Map;for(let H of r.workspaces)for(let L of o(H,{recursive:b}))R.set(L.locatorHash,L);return R.values()},l=({all:b,recursive:R})=>b&&R?r.storedPackages.values():b?a({recursive:R}):o(i,{recursive:R}),c=({all:b,recursive:R})=>{let H=l({all:b,recursive:R}),L=this.patterns.map(ne=>{let q=S.parseLocator(ne),A=Jae.default.makeRe(S.stringifyIdent(q)),V=S.isVirtualLocator(q),W=V?S.devirtualizeLocator(q):q;return X=>{let F=S.stringifyIdent(X);if(!A.test(F))return!1;if(q.reference==="unknown")return!0;let D=S.isVirtualLocator(X),he=D?S.devirtualizeLocator(X):X;return!(V&&D&&q.reference!==X.reference||W.reference!==he.reference)}}),K=de.sortMap([...H],ne=>S.stringifyLocator(ne));return{selection:K.filter(ne=>L.length===0||L.some(q=>q(ne))),sortedLookup:K}},{selection:u,sortedLookup:g}=c({all:this.all,recursive:this.recursive});if(u.length===0)throw new me("No package matched your request");let f=new Map;if(this.dependents)for(let b of g)for(let R of b.dependencies.values()){let H=r.storedResolutions.get(R.descriptorHash);if(typeof H=="undefined")throw new Error("Assertion failed: Expected the resolution to be registered");de.getArrayWithDefault(f,H).push(b)}let h=new Map;for(let b of g){if(!S.isVirtualLocator(b))continue;let R=S.devirtualizeLocator(b);de.getArrayWithDefault(h,R.locatorHash).push(b)}let p={},d={children:p},m=e.makeFetcher(),E={project:r,fetcher:m,cache:n,checksums:r.storedChecksums,report:new ei,cacheOptions:{skipIntegrityCheck:!0},skipIntegrityCheck:!0},B=[async(b,R,H)=>{var J,ne;if(!R.has("manifest"))return;let L=await m.fetch(b,E),K;try{K=await Ze.find(L.prefixPath,{baseFs:L.packageFs})}finally{(J=L.releaseFs)==null||J.call(L)}H("Manifest",{License:ue.tuple(ue.Type.NO_HINT,K.license),Homepage:ue.tuple(ue.Type.URL,(ne=K.raw.homepage)!=null?ne:null)})},async(b,R,H)=>{var A;if(!R.has("cache"))return;let L={mockedPackages:r.disabledLocators,unstablePackages:r.conditionalLocators},K=(A=r.storedChecksums.get(b.locatorHash))!=null?A:null,J=n.getLocatorPath(b,K,L),ne;if(J!==null)try{ne=T.statSync(J)}catch{}let q=typeof ne!="undefined"?[ne.size,ue.Type.SIZE]:void 0;H("Cache",{Checksum:ue.tuple(ue.Type.NO_HINT,K),Path:ue.tuple(ue.Type.PATH,J),Size:q})}];for(let b of u){let R=S.isVirtualLocator(b);if(!this.virtuals&&R)continue;let H={},L={value:[b,ue.Type.LOCATOR],children:H};if(p[S.stringifyLocator(b)]=L,this.nameOnly){delete L.children;continue}let K=h.get(b.locatorHash);typeof K!="undefined"&&(H.Instances={label:"Instances",value:ue.tuple(ue.Type.NUMBER,K.length)}),H.Version={label:"Version",value:ue.tuple(ue.Type.NO_HINT,b.version)};let J=(q,A)=>{let V={};if(H[q]=V,Array.isArray(A))V.children=A.map(W=>({value:W}));else{let W={};V.children=W;for(let[X,F]of Object.entries(A))typeof F!="undefined"&&(W[X]={label:X,value:F})}};if(!R){for(let q of B)await q(b,s,J);await e.triggerHook(q=>q.fetchPackageInfo,b,s,J)}b.bin.size>0&&!R&&J("Exported Binaries",[...b.bin.keys()].map(q=>ue.tuple(ue.Type.PATH,q)));let ne=f.get(b.locatorHash);typeof ne!="undefined"&&ne.length>0&&J("Dependents",ne.map(q=>ue.tuple(ue.Type.LOCATOR,q))),b.dependencies.size>0&&!R&&J("Dependencies",[...b.dependencies.values()].map(q=>{var W;let A=r.storedResolutions.get(q.descriptorHash),V=typeof A!="undefined"&&(W=r.storedPackages.get(A))!=null?W:null;return ue.tuple(ue.Type.RESOLUTION,{descriptor:q,locator:V})})),b.peerDependencies.size>0&&R&&J("Peer dependencies",[...b.peerDependencies.values()].map(q=>{var X,F;let A=b.dependencies.get(q.identHash),V=typeof A!="undefined"&&(X=r.storedResolutions.get(A.descriptorHash))!=null?X:null,W=V!==null&&(F=r.storedPackages.get(V))!=null?F:null;return ue.tuple(ue.Type.RESOLUTION,{descriptor:q,locator:W})}))}Hs.emitTree(d,{configuration:e,json:this.json,stdout:this.context.stdout,separators:this.nameOnly?0:2})}};yC.paths=[["info"]],yC.usage=ye.Usage({description:"see information related to packages",details:"\n This command prints various information related to the specified packages, accepting glob patterns.\n\n By default, if the locator reference is missing, Yarn will default to print the information about all the matching direct dependencies of the package for the active workspace. To instead print all versions of the package that are direct dependencies of any of your workspaces, use the `-A,--all` flag. Adding the `-R,--recursive` flag will also report transitive dependencies.\n\n Some fields will be hidden by default in order to keep the output readable, but can be selectively displayed by using additional options (`--dependents`, `--manifest`, `--virtuals`, ...) described in the option descriptions.\n\n Note that this command will only print the information directly related to the selected packages - if you wish to know why the package is there in the first place, use `yarn why` which will do just that (it also provides a `-R,--recursive` flag that may be of some help).\n ",examples:[["Show information about Lodash","$0 info lodash"]]});var Wae=yC;var W0=ie(ml());Ss();var wC=class extends Be{constructor(){super(...arguments);this.json=Y.Boolean("--json",!1,{description:"Format the output as an NDJSON stream"});this.immutable=Y.Boolean("--immutable",{description:"Abort with an error exit code if the lockfile was to be modified"});this.immutableCache=Y.Boolean("--immutable-cache",{description:"Abort with an error exit code if the cache folder was to be modified"});this.checkCache=Y.Boolean("--check-cache",!1,{description:"Always refetch the packages and ensure that their checksums are consistent"});this.inlineBuilds=Y.Boolean("--inline-builds",{description:"Verbosely print the output of the build steps of dependencies"});this.mode=Y.String("--mode",{description:"Change what artifacts installs generate",validator:Yi(li)});this.cacheFolder=Y.String("--cache-folder",{hidden:!0});this.frozenLockfile=Y.Boolean("--frozen-lockfile",{hidden:!0});this.ignoreEngines=Y.Boolean("--ignore-engines",{hidden:!0});this.nonInteractive=Y.Boolean("--non-interactive",{hidden:!0});this.preferOffline=Y.Boolean("--prefer-offline",{hidden:!0});this.production=Y.Boolean("--production",{hidden:!0});this.registry=Y.String("--registry",{hidden:!0});this.silent=Y.Boolean("--silent",{hidden:!0});this.networkTimeout=Y.String("--network-timeout",{hidden:!0})}async execute(){var c;let e=await fe.find(this.context.cwd,this.context.plugins);typeof this.inlineBuilds!="undefined"&&e.useWithSource("",{enableInlineBuilds:this.inlineBuilds},e.startingCwd,{overwrite:!0});let r=!!process.env.FUNCTION_TARGET||!!process.env.GOOGLE_RUNTIME,i=async(u,{error:g})=>{let f=await Fe.start({configuration:e,stdout:this.context.stdout,includeFooter:!1},async h=>{g?h.reportError(z.DEPRECATED_CLI_SETTINGS,u):h.reportWarning(z.DEPRECATED_CLI_SETTINGS,u)});return f.hasErrors()?f.exitCode():null};if(typeof this.ignoreEngines!="undefined"){let u=await i("The --ignore-engines option is deprecated; engine checking isn't a core feature anymore",{error:!W0.default.VERCEL});if(u!==null)return u}if(typeof this.registry!="undefined"){let u=await i("The --registry option is deprecated; prefer setting npmRegistryServer in your .yarnrc.yml file",{error:!1});if(u!==null)return u}if(typeof this.preferOffline!="undefined"){let u=await i("The --prefer-offline flag is deprecated; use the --cached flag with 'yarn add' instead",{error:!W0.default.VERCEL});if(u!==null)return u}if(typeof this.production!="undefined"){let u=await i("The --production option is deprecated on 'install'; use 'yarn workspaces focus' instead",{error:!0});if(u!==null)return u}if(typeof this.nonInteractive!="undefined"){let u=await i("The --non-interactive option is deprecated",{error:!r});if(u!==null)return u}if(typeof this.frozenLockfile!="undefined"&&(await i("The --frozen-lockfile option is deprecated; use --immutable and/or --immutable-cache instead",{error:!1}),this.immutable=this.frozenLockfile),typeof this.cacheFolder!="undefined"){let u=await i("The cache-folder option has been deprecated; use rc settings instead",{error:!W0.default.NETLIFY});if(u!==null)return u}let n=(c=this.immutable)!=null?c:e.get("enableImmutableInstalls");if(e.projectCwd!==null){let u=await Fe.start({configuration:e,json:this.json,stdout:this.context.stdout,includeFooter:!1},async g=>{await Yze(e,n)&&(g.reportInfo(z.AUTOMERGE_SUCCESS,"Automatically fixed merge conflicts \u{1F44D}"),g.reportSeparator())});if(u.hasErrors())return u.exitCode()}if(e.projectCwd!==null&&typeof e.sources.get("nodeLinker")=="undefined"){let u=e.projectCwd,g;try{g=await T.readFilePromise(v.join(u,wt.lockfile),"utf8")}catch{}if(g==null?void 0:g.includes("yarn lockfile v1")){let f=await Fe.start({configuration:e,json:this.json,stdout:this.context.stdout,includeFooter:!1},async h=>{h.reportInfo(z.AUTO_NM_SUCCESS,"Migrating from Yarn 1; automatically enabling the compatibility node-modules linker \u{1F44D}"),h.reportSeparator(),e.use("",{nodeLinker:"node-modules"},u,{overwrite:!0}),await fe.updateConfiguration(u,{nodeLinker:"node-modules"})});if(f.hasErrors())return f.exitCode()}}if(e.projectCwd!==null){let u=await Fe.start({configuration:e,json:this.json,stdout:this.context.stdout,includeFooter:!1},async g=>{var f;((f=fe.telemetry)==null?void 0:f.isNew)&&(g.reportInfo(z.TELEMETRY_NOTICE,"Yarn will periodically gather anonymous telemetry: https://yarnpkg.com/advanced/telemetry"),g.reportInfo(z.TELEMETRY_NOTICE,`Run ${ue.pretty(e,"yarn config set --home enableTelemetry 0",ue.Type.CODE)} to disable`),g.reportSeparator())});if(u.hasErrors())return u.exitCode()}let{project:s,workspace:o}=await Ke.find(e,this.context.cwd),a=await Qt.find(e,{immutable:this.immutableCache,check:this.checkCache});if(!o)throw new rt(s.cwd,this.context.cwd);return await s.restoreInstallState({restoreResolutions:!1}),(await Fe.start({configuration:e,json:this.json,stdout:this.context.stdout,includeLogs:!0},async u=>{await s.install({cache:a,report:u,immutable:n,mode:this.mode})})).exitCode()}};wC.paths=[["install"],ye.Default],wC.usage=ye.Usage({description:"install the project dependencies",details:` + This command sets up your project if needed. The installation is split into four different steps that each have their own characteristics: + + - **Resolution:** First the package manager will resolve your dependencies. The exact way a dependency version is privileged over another isn't standardized outside of the regular semver guarantees. If a package doesn't resolve to what you would expect, check that all dependencies are correctly declared (also check our website for more information: ). + + - **Fetch:** Then we download all the dependencies if needed, and make sure that they're all stored within our cache (check the value of \`cacheFolder\` in \`yarn config\` to see where the cache files are stored). + + - **Link:** Then we send the dependency tree information to internal plugins tasked with writing them on the disk in some form (for example by generating the .pnp.cjs file you might know). + + - **Build:** Once the dependency tree has been written on the disk, the package manager will now be free to run the build scripts for all packages that might need it, in a topological order compatible with the way they depend on one another. See https://yarnpkg.com/advanced/lifecycle-scripts for detail. + + Note that running this command is not part of the recommended workflow. Yarn supports zero-installs, which means that as long as you store your cache and your .pnp.cjs file inside your repository, everything will work without requiring any install right after cloning your repository or switching branches. + + If the \`--immutable\` option is set (defaults to true on CI), Yarn will abort with an error exit code if the lockfile was to be modified (other paths can be added using the \`immutablePatterns\` configuration setting). For backward compatibility we offer an alias under the name of \`--frozen-lockfile\`, but it will be removed in a later release. + + If the \`--immutable-cache\` option is set, Yarn will abort with an error exit code if the cache folder was to be modified (either because files would be added, or because they'd be removed). + + If the \`--check-cache\` option is set, Yarn will always refetch the packages and will ensure that their checksum matches what's 1/ described in the lockfile 2/ inside the existing cache files (if present). This is recommended as part of your CI workflow if you're both following the Zero-Installs model and accepting PRs from third-parties, as they'd otherwise have the ability to alter the checked-in packages before submitting them. + + If the \`--inline-builds\` option is set, Yarn will verbosely print the output of the build steps of your dependencies (instead of writing them into individual files). This is likely useful mostly for debug purposes only when using Docker-like environments. + + If the \`--mode=\` option is set, Yarn will change which artifacts are generated. The modes currently supported are: + + - \`skip-build\` will not run the build scripts at all. Note that this is different from setting \`enableScripts\` to false because the later will disable build scripts, and thus affect the content of the artifacts generated on disk, whereas the former will just disable the build step - but not the scripts themselves, which just won't run. + + - \`update-lockfile\` will skip the link step altogether, and only fetch packages that are missing from the lockfile (or that have no associated checksums). This mode is typically used by tools like Renovate or Dependabot to keep a lockfile up-to-date without incurring the full install cost. + `,examples:[["Install the project","$0 install"],["Validate a project when using Zero-Installs","$0 install --immutable --immutable-cache"],["Validate a project when using Zero-Installs (slightly safer if you accept external PRs)","$0 install --immutable --immutable-cache --check-cache"]]});var zae=wC,qze="|||||||",Jze=">>>>>>>",Wze="=======",Vae="<<<<<<<";async function Yze(t,e){if(!t.projectCwd)return!1;let r=v.join(t.projectCwd,t.get("lockfileFilename"));if(!await T.existsPromise(r))return!1;let i=await T.readFilePromise(r,"utf8");if(!i.includes(Vae))return!1;if(e)throw new nt(z.AUTOMERGE_IMMUTABLE,"Cannot autofix a lockfile when running an immutable install");let[n,s]=zze(i),o,a;try{o=Ei(n),a=Ei(s)}catch(c){throw new nt(z.AUTOMERGE_FAILED_TO_PARSE,"The individual variants of the lockfile failed to parse")}let l=P(P({},o),a);for(let[c,u]of Object.entries(l))typeof u=="string"&&delete l[c];return await T.changeFilePromise(r,Qa(l),{automaticNewlines:!0}),!0}function zze(t){let e=[[],[]],r=t.split(/\r?\n/g),i=!1;for(;r.length>0;){let n=r.shift();if(typeof n=="undefined")throw new Error("Assertion failed: Some lines should remain");if(n.startsWith(Vae)){for(;r.length>0;){let s=r.shift();if(typeof s=="undefined")throw new Error("Assertion failed: Some lines should remain");if(s===Wze){i=!1;break}else if(i||s.startsWith(qze)){i=!0;continue}else e[0].push(s)}for(;r.length>0;){let s=r.shift();if(typeof s=="undefined")throw new Error("Assertion failed: Some lines should remain");if(s.startsWith(Jze))break;e[1].push(s)}}else e[0].push(n),e[1].push(n)}return[e[0].join(` +`),e[1].join(` +`)]}var BC=class extends Be{constructor(){super(...arguments);this.all=Y.Boolean("-A,--all",!1,{description:"Link all workspaces belonging to the target project to the current one"});this.private=Y.Boolean("-p,--private",!1,{description:"Also link private workspaces belonging to the target project to the current one"});this.relative=Y.Boolean("-r,--relative",!1,{description:"Link workspaces using relative paths instead of absolute paths"});this.destination=Y.String()}async execute(){let e=await fe.find(this.context.cwd,this.context.plugins),{project:r,workspace:i}=await Ke.find(e,this.context.cwd),n=await Qt.find(e);if(!i)throw new rt(r.cwd,this.context.cwd);await r.restoreInstallState({restoreResolutions:!1});let s=v.resolve(this.context.cwd,M.toPortablePath(this.destination)),o=await fe.find(s,this.context.plugins,{useRc:!1,strict:!1}),{project:a,workspace:l}=await Ke.find(o,s);if(r.cwd===a.cwd)throw new me("Invalid destination; Can't link the project to itself");if(!l)throw new rt(a.cwd,s);let c=r.topLevelWorkspace,u=[];if(this.all){for(let f of a.workspaces)f.manifest.name&&(!f.manifest.private||this.private)&&u.push(f);if(u.length===0)throw new me("No workspace found to be linked in the target project")}else{if(!l.manifest.name)throw new me("The target workspace doesn't have a name and thus cannot be linked");if(l.manifest.private&&!this.private)throw new me("The target workspace is marked private - use the --private flag to link it anyway");u.push(l)}for(let f of u){let h=S.stringifyIdent(f.locator),p=this.relative?v.relative(r.cwd,f.cwd):f.cwd;c.manifest.resolutions.push({pattern:{descriptor:{fullName:h}},reference:`portal:${p}`})}return(await Fe.start({configuration:e,stdout:this.context.stdout},async f=>{await r.install({cache:n,report:f})})).exitCode()}};BC.paths=[["link"]],BC.usage=ye.Usage({description:"connect the local project to another one",details:"\n This command will set a new `resolutions` field in the project-level manifest and point it to the workspace at the specified location (even if part of another project).\n ",examples:[["Register a remote workspace for use in the current project","$0 link ~/ts-loader"],["Register all workspaces from a remote project for use in the current project","$0 link ~/jest --all"]]});var _ae=BC;var QC=class extends Be{constructor(){super(...arguments);this.args=Y.Proxy()}async execute(){return this.cli.run(["exec","node",...this.args])}};QC.paths=[["node"]],QC.usage=ye.Usage({description:"run node with the hook already setup",details:` + This command simply runs Node. It also makes sure to call it in a way that's compatible with the current project (for example, on PnP projects the environment will be setup in such a way that PnP will be correctly injected into the environment). + + The Node process will use the exact same version of Node as the one used to run Yarn itself, which might be a good way to ensure that your commands always use a consistent Node version. + `,examples:[["Run a Node script","$0 node ./my-script.js"]]});var Xae=QC;var lAe=ie(require("os"));var rAe=ie(require("os"));var Vze="https://raw.githubusercontent.com/yarnpkg/berry/master/plugins.yml";async function Kc(t){let e=await Zt.get(Vze,{configuration:t});return Ei(e.toString())}var bC=class extends Be{constructor(){super(...arguments);this.json=Y.Boolean("--json",!1,{description:"Format the output as an NDJSON stream"})}async execute(){let e=await fe.find(this.context.cwd,this.context.plugins);return(await Fe.start({configuration:e,json:this.json,stdout:this.context.stdout},async i=>{let n=await Kc(e);for(let s of Object.entries(n)){let[l,o]=s,a=o,{experimental:c}=a,u=qr(a,["experimental"]);let g=l;c&&(g+=" [experimental]"),i.reportJson(P({name:l,experimental:c},u)),i.reportInfo(null,g)}})).exitCode()}};bC.paths=[["plugin","list"]],bC.usage=ye.Usage({category:"Plugin-related commands",description:"list the available official plugins",details:"\n This command prints the plugins available directly from the Yarn repository. Only those plugins can be referenced by name in `yarn plugin import`.\n ",examples:[["List the official plugins","$0 plugin list"]]});var Zae=bC;var $ae=ie(Or()),vC=class extends Be{constructor(){super(...arguments);this.onlyIfNeeded=Y.Boolean("--only-if-needed",!1,{description:"Only lock the Yarn version if it isn't already locked"});this.version=Y.String()}async execute(){let e=await fe.find(this.context.cwd,this.context.plugins);if(e.get("yarnPath")&&this.onlyIfNeeded)return 0;let r=()=>{if(typeof Zr=="undefined")throw new me("The --install flag can only be used without explicit version specifier from the Yarn CLI");return`file://${process.argv[1]}`},i;if(this.version==="self")i=r();else if(this.version==="latest"||this.version==="berry"||this.version==="stable")i=`https://repo.yarnpkg.com/${await eAe(e,"stable")}/packages/yarnpkg-cli/bin/yarn.js`;else if(this.version==="canary")i=`https://repo.yarnpkg.com/${await eAe(e,"canary")}/packages/yarnpkg-cli/bin/yarn.js`;else if(this.version==="classic")i="https://nightly.yarnpkg.com/latest.js";else if(this.version.match(/^\.{0,2}[\\/]/)||M.isAbsolute(this.version))i=`file://${M.resolve(this.version)}`;else if(qt.satisfiesWithPrereleases(this.version,">=2.0.0"))i=`https://repo.yarnpkg.com/${this.version}/packages/yarnpkg-cli/bin/yarn.js`;else if(qt.satisfiesWithPrereleases(this.version,"^0.x || ^1.x"))i=`https://github.com/yarnpkg/yarn/releases/download/v${this.version}/yarn-${this.version}.js`;else if(qt.validRange(this.version))i=`https://repo.yarnpkg.com/${await _ze(e,this.version)}/packages/yarnpkg-cli/bin/yarn.js`;else throw new me(`Invalid version descriptor "${this.version}"`);return(await Fe.start({configuration:e,stdout:this.context.stdout,includeLogs:!this.context.quiet},async s=>{let o="file://",a;i.startsWith(o)?(s.reportInfo(z.UNNAMED,`Downloading ${ue.pretty(e,i,ps.URL)}`),a=await T.readFilePromise(M.toPortablePath(i.slice(o.length)))):(s.reportInfo(z.UNNAMED,`Retrieving ${ue.pretty(e,i,ps.PATH)}`),a=await Zt.get(i,{configuration:e})),await XN(e,null,a,{report:s})})).exitCode()}};vC.paths=[["set","version"]],vC.usage=ye.Usage({description:"lock the Yarn version used by the project",details:"\n This command will download a specific release of Yarn directly from the Yarn GitHub repository, will store it inside your project, and will change the `yarnPath` settings from your project `.yarnrc.yml` file to point to the new file.\n\n A very good use case for this command is to enforce the version of Yarn used by the any single member of your team inside a same project - by doing this you ensure that you have control on Yarn upgrades and downgrades (including on your deployment servers), and get rid of most of the headaches related to someone using a slightly different version and getting a different behavior than you.\n\n The version specifier can be:\n\n - a tag:\n - `latest` / `berry` / `stable` -> the most recent stable berry (`>=2.0.0`) release\n - `canary` -> the most recent canary (release candidate) berry (`>=2.0.0`) release\n - `classic` -> the most recent classic (`^0.x || ^1.x`) release\n\n - a semver range (e.g. `2.x`) -> the most recent version satisfying the range (limited to berry releases)\n\n - a semver version (e.g. `2.4.1`, `1.22.1`)\n\n - a local file referenced through either a relative or absolute path\n\n - `self` -> the version used to invoke the command\n ",examples:[["Download the latest release from the Yarn repository","$0 set version latest"],["Download the latest canary release from the Yarn repository","$0 set version canary"],["Download the latest classic release from the Yarn repository","$0 set version classic"],["Download the most recent Yarn 3 build","$0 set version 3.x"],["Download a specific Yarn 2 build","$0 set version 2.0.0-rc.30"],["Switch back to a specific Yarn 1 release","$0 set version 1.22.1"],["Use a release from the local filesystem","$0 set version ./yarn.cjs"],["Download the version used to invoke the command","$0 set version self"]]});var tAe=vC;async function _ze(t,e){let i=(await Zt.get("https://repo.yarnpkg.com/tags",{configuration:t,jsonResponse:!0})).tags.filter(n=>qt.satisfiesWithPrereleases(n,e));if(i.length===0)throw new me(`No matching release found for range ${ue.pretty(t,e,ue.Type.RANGE)}.`);return i[0]}async function eAe(t,e){let r=await Zt.get("https://repo.yarnpkg.com/tags",{configuration:t,jsonResponse:!0});if(!r.latest[e])throw new me(`Tag ${ue.pretty(t,e,ue.Type.RANGE)} not found`);return r.latest[e]}async function XN(t,e,r,{report:i}){var g;e===null&&await T.mktempPromise(async f=>{let h=v.join(f,"yarn.cjs");await T.writeFilePromise(h,r);let{stdout:p}=await hr.execvp(process.execPath,[M.fromPortablePath(h),"--version"],{cwd:f,env:_(P({},process.env),{YARN_IGNORE_PATH:"1"})});if(e=p.trim(),!$ae.default.valid(e))throw new Error(`Invalid semver version. ${ue.pretty(t,"yarn --version",ue.Type.CODE)} returned: +${e}`)});let n=(g=t.projectCwd)!=null?g:t.startingCwd,s=v.resolve(n,".yarn/releases"),o=v.resolve(s,`yarn-${e}.cjs`),a=v.relative(t.startingCwd,o),l=v.relative(n,o),c=t.get("yarnPath"),u=c===null||c.startsWith(`${s}/`);if(i.reportInfo(z.UNNAMED,`Saving the new release in ${ue.pretty(t,a,"magenta")}`),await T.removePromise(v.dirname(o)),await T.mkdirPromise(v.dirname(o),{recursive:!0}),await T.writeFilePromise(o,r,{mode:493}),u){await fe.updateConfiguration(n,{yarnPath:l});let f=await Ze.tryFind(n)||new Ze;e&&de.isTaggedYarnVersion(e)&&(f.packageManager=`yarn@${e}`);let h={};f.exportTo(h);let p=v.join(n,Ze.fileName),d=`${JSON.stringify(h,null,f.indent)} +`;await T.changeFilePromise(p,d,{automaticNewlines:!0})}}var Xze=/^[0-9]+$/;function iAe(t){return Xze.test(t)?`pull/${t}/head`:t}var Zze=({repository:t,branch:e},r)=>[["git","init",M.fromPortablePath(r)],["git","remote","add","origin",t],["git","fetch","origin",iAe(e)],["git","reset","--hard","FETCH_HEAD"]],$ze=({branch:t})=>[["git","fetch","origin",iAe(t),"--force"],["git","reset","--hard","FETCH_HEAD"],["git","clean","-dfx"]],e4e=({plugins:t,noMinify:e},r)=>[["yarn","build:cli",...new Array().concat(...t.map(i=>["--plugin",v.resolve(r,i)])),...e?["--no-minify"]:[],"|"]],SC=class extends Be{constructor(){super(...arguments);this.installPath=Y.String("--path",{description:"The path where the repository should be cloned to"});this.repository=Y.String("--repository","https://github.com/yarnpkg/berry.git",{description:"The repository that should be cloned"});this.branch=Y.String("--branch","master",{description:"The branch of the repository that should be cloned"});this.plugins=Y.Array("--plugin",[],{description:"An array of additional plugins that should be included in the bundle"});this.noMinify=Y.Boolean("--no-minify",!1,{description:"Build a bundle for development (debugging) - non-minified and non-mangled"});this.force=Y.Boolean("-f,--force",!1,{description:"Always clone the repository instead of trying to fetch the latest commits"});this.skipPlugins=Y.Boolean("--skip-plugins",!1,{description:"Skip updating the contrib plugins"})}async execute(){let e=await fe.find(this.context.cwd,this.context.plugins),{project:r}=await Ke.find(e,this.context.cwd),i=typeof this.installPath!="undefined"?v.resolve(this.context.cwd,M.toPortablePath(this.installPath)):v.resolve(M.toPortablePath((0,rAe.tmpdir)()),"yarnpkg-sources",mn.makeHash(this.repository).slice(0,6));return(await Fe.start({configuration:e,stdout:this.context.stdout},async s=>{await $N(this,{configuration:e,report:s,target:i}),s.reportSeparator(),s.reportInfo(z.UNNAMED,"Building a fresh bundle"),s.reportSeparator(),await xC(e4e(this,i),{configuration:e,context:this.context,target:i}),s.reportSeparator();let o=v.resolve(i,"packages/yarnpkg-cli/bundles/yarn.js"),a=await T.readFilePromise(o);await XN(e,"sources",a,{report:s}),this.skipPlugins||await t4e(this,{project:r,report:s,target:i})})).exitCode()}};SC.paths=[["set","version","from","sources"]],SC.usage=ye.Usage({description:"build Yarn from master",details:` + This command will clone the Yarn repository into a temporary folder, then build it. The resulting bundle will then be copied into the local project. + + By default, it also updates all contrib plugins to the same commit the bundle is built from. This behavior can be disabled by using the \`--skip-plugins\` flag. + `,examples:[["Build Yarn from master","$0 set version from sources"]]});var nAe=SC;async function xC(t,{configuration:e,context:r,target:i}){for(let[n,...s]of t){let o=s[s.length-1]==="|";if(o&&s.pop(),o)await hr.pipevp(n,s,{cwd:i,stdin:r.stdin,stdout:r.stdout,stderr:r.stderr,strict:!0});else{r.stdout.write(`${ue.pretty(e,` $ ${[n,...s].join(" ")}`,"grey")} +`);try{await hr.execvp(n,s,{cwd:i,strict:!0})}catch(a){throw r.stdout.write(a.stdout||a.stack),a}}}}async function $N(t,{configuration:e,report:r,target:i}){let n=!1;if(!t.force&&T.existsSync(v.join(i,".git"))){r.reportInfo(z.UNNAMED,"Fetching the latest commits"),r.reportSeparator();try{await xC($ze(t),{configuration:e,context:t.context,target:i}),n=!0}catch(s){r.reportSeparator(),r.reportWarning(z.UNNAMED,"Repository update failed; we'll try to regenerate it")}}n||(r.reportInfo(z.UNNAMED,"Cloning the remote repository"),r.reportSeparator(),await T.removePromise(i),await T.mkdirPromise(i,{recursive:!0}),await xC(Zze(t,i),{configuration:e,context:t.context,target:i}))}async function t4e(t,{project:e,report:r,target:i}){let n=await Kc(e.configuration),s=new Set(Object.keys(n));for(let o of e.configuration.plugins.keys())!s.has(o)||await ZN(o,t,{project:e,report:r,target:i})}var sAe=ie(Or()),oAe=ie(require("url")),aAe=ie(require("vm"));var kC=class extends Be{constructor(){super(...arguments);this.name=Y.String()}async execute(){let e=await fe.find(this.context.cwd,this.context.plugins);return(await Fe.start({configuration:e,stdout:this.context.stdout},async i=>{let{project:n}=await Ke.find(e,this.context.cwd),s,o;if(this.name.match(/^\.{0,2}[\\/]/)||M.isAbsolute(this.name)){let a=v.resolve(this.context.cwd,M.toPortablePath(this.name));i.reportInfo(z.UNNAMED,`Reading ${ue.pretty(e,a,ue.Type.PATH)}`),s=v.relative(n.cwd,a),o=await T.readFilePromise(a)}else{let a;if(this.name.match(/^https?:/)){try{new oAe.URL(this.name)}catch{throw new nt(z.INVALID_PLUGIN_REFERENCE,`Plugin specifier "${this.name}" is neither a plugin name nor a valid url`)}s=this.name,a=this.name}else{let l=S.parseLocator(this.name.replace(/^((@yarnpkg\/)?plugin-)?/,"@yarnpkg/plugin-"));if(l.reference!=="unknown"&&!sAe.default.valid(l.reference))throw new nt(z.UNNAMED,"Official plugins only accept strict version references. Use an explicit URL if you wish to download them from another location.");let c=S.stringifyIdent(l),u=await Kc(e);if(!Object.prototype.hasOwnProperty.call(u,c))throw new nt(z.PLUGIN_NAME_NOT_FOUND,`Couldn't find a plugin named "${c}" on the remote registry. Note that only the plugins referenced on our website (https://github.com/yarnpkg/berry/blob/master/plugins.yml) can be referenced by their name; any other plugin will have to be referenced through its public url (for example https://github.com/yarnpkg/berry/raw/master/packages/plugin-typescript/bin/%40yarnpkg/plugin-typescript.js).`);s=c,a=u[c].url,l.reference!=="unknown"?a=a.replace(/\/master\//,`/${c}/${l.reference}/`):Zr!==null&&(a=a.replace(/\/master\//,`/@yarnpkg/cli/${Zr}/`))}i.reportInfo(z.UNNAMED,`Downloading ${ue.pretty(e,a,"green")}`),o=await Zt.get(a,{configuration:e})}await eL(s,o,{project:n,report:i})})).exitCode()}};kC.paths=[["plugin","import"]],kC.usage=ye.Usage({category:"Plugin-related commands",description:"download a plugin",details:` + This command downloads the specified plugin from its remote location and updates the configuration to reference it in further CLI invocations. + + Three types of plugin references are accepted: + + - If the plugin is stored within the Yarn repository, it can be referenced by name. + - Third-party plugins can be referenced directly through their public urls. + - Local plugins can be referenced by their path on the disk. + + Plugins cannot be downloaded from the npm registry, and aren't allowed to have dependencies (they need to be bundled into a single file, possibly thanks to the \`@yarnpkg/builder\` package). + `,examples:[['Download and activate the "@yarnpkg/plugin-exec" plugin',"$0 plugin import @yarnpkg/plugin-exec"],['Download and activate the "@yarnpkg/plugin-exec" plugin (shorthand)',"$0 plugin import exec"],["Download and activate a community plugin","$0 plugin import https://example.org/path/to/plugin.js"],["Activate a local plugin","$0 plugin import ./path/to/plugin.js"]]});var AAe=kC;async function eL(t,e,{project:r,report:i}){let{configuration:n}=r,s={},o={exports:s};(0,aAe.runInNewContext)(e.toString(),{module:o,exports:s});let a=o.exports.name,l=`.yarn/plugins/${a}.cjs`,c=v.resolve(r.cwd,l);i.reportInfo(z.UNNAMED,`Saving the new plugin in ${ue.pretty(n,l,"magenta")}`),await T.mkdirPromise(v.dirname(c),{recursive:!0}),await T.writeFilePromise(c,e);let u={path:l,spec:t};await fe.updateConfiguration(r.cwd,g=>{let f=[],h=!1;for(let p of g.plugins||[]){let d=typeof p!="string"?p.path:p,m=v.resolve(r.cwd,M.toPortablePath(d)),{name:E}=de.dynamicRequire(m);E!==a?f.push(p):(f.push(u),h=!0)}return h||f.push(u),_(P({},g),{plugins:f})})}var r4e=({pluginName:t,noMinify:e},r)=>[["yarn",`build:${t}`,...e?["--no-minify"]:[],"|"]],PC=class extends Be{constructor(){super(...arguments);this.installPath=Y.String("--path",{description:"The path where the repository should be cloned to"});this.repository=Y.String("--repository","https://github.com/yarnpkg/berry.git",{description:"The repository that should be cloned"});this.branch=Y.String("--branch","master",{description:"The branch of the repository that should be cloned"});this.noMinify=Y.Boolean("--no-minify",!1,{description:"Build a plugin for development (debugging) - non-minified and non-mangled"});this.force=Y.Boolean("-f,--force",!1,{description:"Always clone the repository instead of trying to fetch the latest commits"});this.name=Y.String()}async execute(){let e=await fe.find(this.context.cwd,this.context.plugins),r=typeof this.installPath!="undefined"?v.resolve(this.context.cwd,M.toPortablePath(this.installPath)):v.resolve(M.toPortablePath((0,lAe.tmpdir)()),"yarnpkg-sources",mn.makeHash(this.repository).slice(0,6));return(await Fe.start({configuration:e,stdout:this.context.stdout},async n=>{let{project:s}=await Ke.find(e,this.context.cwd),o=S.parseIdent(this.name.replace(/^((@yarnpkg\/)?plugin-)?/,"@yarnpkg/plugin-")),a=S.stringifyIdent(o),l=await Kc(e);if(!Object.prototype.hasOwnProperty.call(l,a))throw new nt(z.PLUGIN_NAME_NOT_FOUND,`Couldn't find a plugin named "${a}" on the remote registry. Note that only the plugins referenced on our website (https://github.com/yarnpkg/berry/blob/master/plugins.yml) can be built and imported from sources.`);let c=a;await $N(this,{configuration:e,report:n,target:r}),await ZN(c,this,{project:s,report:n,target:r})})).exitCode()}};PC.paths=[["plugin","import","from","sources"]],PC.usage=ye.Usage({category:"Plugin-related commands",description:"build a plugin from sources",details:` + This command clones the Yarn repository into a temporary folder, builds the specified contrib plugin and updates the configuration to reference it in further CLI invocations. + + The plugins can be referenced by their short name if sourced from the official Yarn repository. + `,examples:[['Build and activate the "@yarnpkg/plugin-exec" plugin',"$0 plugin import from sources @yarnpkg/plugin-exec"],['Build and activate the "@yarnpkg/plugin-exec" plugin (shorthand)',"$0 plugin import from sources exec"]]});var cAe=PC;async function ZN(t,{context:e,noMinify:r},{project:i,report:n,target:s}){let o=t.replace(/@yarnpkg\//,""),{configuration:a}=i;n.reportSeparator(),n.reportInfo(z.UNNAMED,`Building a fresh ${o}`),n.reportSeparator(),await xC(r4e({pluginName:o,noMinify:r},s),{configuration:a,context:e,target:s}),n.reportSeparator();let l=v.resolve(s,`packages/${o}/bundles/${t}.js`),c=await T.readFilePromise(l);await eL(t,c,{project:i,report:n})}var DC=class extends Be{constructor(){super(...arguments);this.name=Y.String()}async execute(){let e=await fe.find(this.context.cwd,this.context.plugins),{project:r}=await Ke.find(e,this.context.cwd);return(await Fe.start({configuration:e,stdout:this.context.stdout},async n=>{let s=this.name,o=S.parseIdent(s);if(!e.plugins.has(s))throw new me(`${S.prettyIdent(e,o)} isn't referenced by the current configuration`);let a=`.yarn/plugins/${s}.cjs`,l=v.resolve(r.cwd,a);T.existsSync(l)&&(n.reportInfo(z.UNNAMED,`Removing ${ue.pretty(e,a,ue.Type.PATH)}...`),await T.removePromise(l)),n.reportInfo(z.UNNAMED,"Updating the configuration..."),await fe.updateConfiguration(r.cwd,c=>{if(!Array.isArray(c.plugins))return c;let u=c.plugins.filter(g=>g.path!==a);return c.plugins.length===u.length?c:_(P({},c),{plugins:u})})})).exitCode()}};DC.paths=[["plugin","remove"]],DC.usage=ye.Usage({category:"Plugin-related commands",description:"remove a plugin",details:` + This command deletes the specified plugin from the .yarn/plugins folder and removes it from the configuration. + + **Note:** The plugins have to be referenced by their name property, which can be obtained using the \`yarn plugin runtime\` command. Shorthands are not allowed. + `,examples:[["Remove a plugin imported from the Yarn repository","$0 plugin remove @yarnpkg/plugin-typescript"],["Remove a plugin imported from a local file","$0 plugin remove my-local-plugin"]]});var uAe=DC;var RC=class extends Be{constructor(){super(...arguments);this.json=Y.Boolean("--json",!1,{description:"Format the output as an NDJSON stream"})}async execute(){let e=await fe.find(this.context.cwd,this.context.plugins);return(await Fe.start({configuration:e,json:this.json,stdout:this.context.stdout},async i=>{for(let n of e.plugins.keys()){let s=this.context.plugins.plugins.has(n),o=n;s&&(o+=" [builtin]"),i.reportJson({name:n,builtin:s}),i.reportInfo(null,`${o}`)}})).exitCode()}};RC.paths=[["plugin","runtime"]],RC.usage=ye.Usage({category:"Plugin-related commands",description:"list the active plugins",details:` + This command prints the currently active plugins. Will be displayed both builtin plugins and external plugins. + `,examples:[["List the currently active plugins","$0 plugin runtime"]]});var gAe=RC;var FC=class extends Be{constructor(){super(...arguments);this.idents=Y.Rest()}async execute(){let e=await fe.find(this.context.cwd,this.context.plugins),{project:r,workspace:i}=await Ke.find(e,this.context.cwd),n=await Qt.find(e);if(!i)throw new rt(r.cwd,this.context.cwd);let s=new Set;for(let a of this.idents)s.add(S.parseIdent(a).identHash);if(await r.restoreInstallState({restoreResolutions:!1}),await r.resolveEverything({cache:n,report:new ei}),s.size>0)for(let a of r.storedPackages.values())s.has(a.identHash)&&r.storedBuildState.delete(a.locatorHash);else r.storedBuildState.clear();return(await Fe.start({configuration:e,stdout:this.context.stdout,includeLogs:!this.context.quiet},async a=>{await r.install({cache:n,report:a})})).exitCode()}};FC.paths=[["rebuild"]],FC.usage=ye.Usage({description:"rebuild the project's native packages",details:` + This command will automatically cause Yarn to forget about previous compilations of the given packages and to run them again. + + Note that while Yarn forgets the compilation, the previous artifacts aren't erased from the filesystem and may affect the next builds (in good or bad). To avoid this, you may remove the .yarn/unplugged folder, or any other relevant location where packages might have been stored (Yarn may offer a way to do that automatically in the future). + + By default all packages will be rebuilt, but you can filter the list by specifying the names of the packages you want to clear from memory. + `,examples:[["Rebuild all packages","$0 rebuild"],["Rebuild fsevents only","$0 rebuild fsevents"]]});var fAe=FC;var tL=ie(Nn());Ss();var NC=class extends Be{constructor(){super(...arguments);this.all=Y.Boolean("-A,--all",!1,{description:"Apply the operation to all workspaces from the current project"});this.mode=Y.String("--mode",{description:"Change what artifacts installs generate",validator:Yi(li)});this.patterns=Y.Rest()}async execute(){let e=await fe.find(this.context.cwd,this.context.plugins),{project:r,workspace:i}=await Ke.find(e,this.context.cwd),n=await Qt.find(e);if(!i)throw new rt(r.cwd,this.context.cwd);await r.restoreInstallState({restoreResolutions:!1});let s=this.all?r.workspaces:[i],o=[vr.REGULAR,vr.DEVELOPMENT,vr.PEER],a=[],l=!1,c=[];for(let h of this.patterns){let p=!1,d=S.parseIdent(h);for(let m of s){let E=[...m.manifest.peerDependenciesMeta.keys()];for(let B of(0,tL.default)(E,h))m.manifest.peerDependenciesMeta.delete(B),l=!0,p=!0;for(let B of o){let b=m.manifest.getForScope(B),R=[...b.values()].map(H=>S.stringifyIdent(H));for(let H of(0,tL.default)(R,S.stringifyIdent(d))){let{identHash:L}=S.parseIdent(H),K=b.get(L);if(typeof K=="undefined")throw new Error("Assertion failed: Expected the descriptor to be registered");m.manifest[B].delete(L),c.push([m,B,K]),l=!0,p=!0}}}p||a.push(h)}let u=a.length>1?"Patterns":"Pattern",g=a.length>1?"don't":"doesn't",f=this.all?"any":"this";if(a.length>0)throw new me(`${u} ${ue.prettyList(e,a,ps.CODE)} ${g} match any packages referenced by ${f} workspace`);return l?(await e.triggerMultipleHooks(p=>p.afterWorkspaceDependencyRemoval,c),(await Fe.start({configuration:e,stdout:this.context.stdout},async p=>{await r.install({cache:n,report:p,mode:this.mode})})).exitCode()):0}};NC.paths=[["remove"]],NC.usage=ye.Usage({description:"remove dependencies from the project",details:` + This command will remove the packages matching the specified patterns from the current workspace. + + If the \`--mode=\` option is set, Yarn will change which artifacts are generated. The modes currently supported are: + + - \`skip-build\` will not run the build scripts at all. Note that this is different from setting \`enableScripts\` to false because the later will disable build scripts, and thus affect the content of the artifacts generated on disk, whereas the former will just disable the build step - but not the scripts themselves, which just won't run. + + - \`update-lockfile\` will skip the link step altogether, and only fetch packages that are missing from the lockfile (or that have no associated checksums). This mode is typically used by tools like Renovate or Dependabot to keep a lockfile up-to-date without incurring the full install cost. + + This command accepts glob patterns as arguments (if valid Idents and supported by [micromatch](https://github.com/micromatch/micromatch)). Make sure to escape the patterns, to prevent your own shell from trying to expand them. + `,examples:[["Remove a dependency from the current project","$0 remove lodash"],["Remove a dependency from all workspaces at once","$0 remove lodash --all"],["Remove all dependencies starting with `eslint-`","$0 remove 'eslint-*'"],["Remove all dependencies with the `@babel` scope","$0 remove '@babel/*'"],["Remove all dependencies matching `react-dom` or `react-helmet`","$0 remove 'react-{dom,helmet}'"]]});var hAe=NC;var pAe=ie(require("util")),z0=class extends Be{async execute(){let e=await fe.find(this.context.cwd,this.context.plugins),{project:r,workspace:i}=await Ke.find(e,this.context.cwd);if(!i)throw new rt(r.cwd,this.context.cwd);return(await Fe.start({configuration:e,stdout:this.context.stdout},async s=>{let o=i.manifest.scripts,a=de.sortMap(o.keys(),u=>u),l={breakLength:Infinity,colors:e.get("enableColors"),maxArrayLength:2},c=a.reduce((u,g)=>Math.max(u,g.length),0);for(let[u,g]of o.entries())s.reportInfo(null,`${u.padEnd(c," ")} ${(0,pAe.inspect)(g,l)}`)})).exitCode()}};z0.paths=[["run"]];var dAe=z0;var LC=class extends Be{constructor(){super(...arguments);this.inspect=Y.String("--inspect",!1,{tolerateBoolean:!0,description:"Forwarded to the underlying Node process when executing a binary"});this.inspectBrk=Y.String("--inspect-brk",!1,{tolerateBoolean:!0,description:"Forwarded to the underlying Node process when executing a binary"});this.topLevel=Y.Boolean("-T,--top-level",!1,{description:"Check the root workspace for scripts and/or binaries instead of the current one"});this.binariesOnly=Y.Boolean("-B,--binaries-only",!1,{description:"Ignore any user defined scripts and only check for binaries"});this.silent=Y.Boolean("--silent",{hidden:!0});this.scriptName=Y.String();this.args=Y.Proxy()}async execute(){let e=await fe.find(this.context.cwd,this.context.plugins),{project:r,workspace:i,locator:n}=await Ke.find(e,this.context.cwd);await r.restoreInstallState();let s=this.topLevel?r.topLevelWorkspace.anchoredLocator:n;if(!this.binariesOnly&&await Kt.hasPackageScript(s,this.scriptName,{project:r}))return await Kt.executePackageScript(s,this.scriptName,this.args,{project:r,stdin:this.context.stdin,stdout:this.context.stdout,stderr:this.context.stderr});let o=await Kt.getPackageAccessibleBinaries(s,{project:r});if(o.get(this.scriptName)){let l=[];return this.inspect&&(typeof this.inspect=="string"?l.push(`--inspect=${this.inspect}`):l.push("--inspect")),this.inspectBrk&&(typeof this.inspectBrk=="string"?l.push(`--inspect-brk=${this.inspectBrk}`):l.push("--inspect-brk")),await Kt.executePackageAccessibleBinary(s,this.scriptName,this.args,{cwd:this.context.cwd,project:r,stdin:this.context.stdin,stdout:this.context.stdout,stderr:this.context.stderr,nodeArgs:l,packageAccessibleBinaries:o})}if(!this.topLevel&&!this.binariesOnly&&i&&this.scriptName.includes(":")){let c=(await Promise.all(r.workspaces.map(async u=>u.manifest.scripts.has(this.scriptName)?u:null))).filter(u=>u!==null);if(c.length===1)return await Kt.executeWorkspaceScript(c[0],this.scriptName,this.args,{stdin:this.context.stdin,stdout:this.context.stdout,stderr:this.context.stderr})}if(this.topLevel)throw this.scriptName==="node-gyp"?new me(`Couldn't find a script name "${this.scriptName}" in the top-level (used by ${S.prettyLocator(e,n)}). This typically happens because some package depends on "node-gyp" to build itself, but didn't list it in their dependencies. To fix that, please run "yarn add node-gyp" into your top-level workspace. You also can open an issue on the repository of the specified package to suggest them to use an optional peer dependency.`):new me(`Couldn't find a script name "${this.scriptName}" in the top-level (used by ${S.prettyLocator(e,n)}).`);{if(this.scriptName==="global")throw new me("The 'yarn global' commands have been removed in 2.x - consider using 'yarn dlx' or a third-party plugin instead");let l=[this.scriptName].concat(this.args);for(let[c,u]of Yg)for(let g of u)if(l.length>=g.length&&JSON.stringify(l.slice(0,g.length))===JSON.stringify(g))throw new me(`Couldn't find a script named "${this.scriptName}", but a matching command can be found in the ${c} plugin. You can install it with "yarn plugin import ${c}".`);throw new me(`Couldn't find a script named "${this.scriptName}".`)}}};LC.paths=[["run"]],LC.usage=ye.Usage({description:"run a script defined in the package.json",details:` + This command will run a tool. The exact tool that will be executed will depend on the current state of your workspace: + + - If the \`scripts\` field from your local package.json contains a matching script name, its definition will get executed. + + - Otherwise, if one of the local workspace's dependencies exposes a binary with a matching name, this binary will get executed. + + - Otherwise, if the specified name contains a colon character and if one of the workspaces in the project contains exactly one script with a matching name, then this script will get executed. + + Whatever happens, the cwd of the spawned process will be the workspace that declares the script (which makes it possible to call commands cross-workspaces using the third syntax). + `,examples:[["Run the tests from the local workspace","$0 run test"],['Same thing, but without the "run" keyword',"$0 test"],["Inspect Webpack while running","$0 run --inspect-brk webpack"]]});var CAe=LC;var TC=class extends Be{constructor(){super(...arguments);this.save=Y.Boolean("-s,--save",!1,{description:"Persist the resolution inside the top-level manifest"});this.descriptor=Y.String();this.resolution=Y.String()}async execute(){let e=await fe.find(this.context.cwd,this.context.plugins),{project:r,workspace:i}=await Ke.find(e,this.context.cwd),n=await Qt.find(e);if(await r.restoreInstallState({restoreResolutions:!1}),!i)throw new rt(r.cwd,this.context.cwd);let s=S.parseDescriptor(this.descriptor,!0),o=S.makeDescriptor(s,this.resolution);return r.storedDescriptors.set(s.descriptorHash,s),r.storedDescriptors.set(o.descriptorHash,o),r.resolutionAliases.set(s.descriptorHash,o.descriptorHash),(await Fe.start({configuration:e,stdout:this.context.stdout},async l=>{await r.install({cache:n,report:l})})).exitCode()}};TC.paths=[["set","resolution"]],TC.usage=ye.Usage({description:"enforce a package resolution",details:'\n This command updates the resolution table so that `descriptor` is resolved by `resolution`.\n\n Note that by default this command only affect the current resolution table - meaning that this "manual override" will disappear if you remove the lockfile, or if the package disappear from the table. If you wish to make the enforced resolution persist whatever happens, add the `-s,--save` flag which will also edit the `resolutions` field from your top-level manifest.\n\n Note that no attempt is made at validating that `resolution` is a valid resolution entry for `descriptor`.\n ',examples:[["Force all instances of lodash@npm:^1.2.3 to resolve to 1.5.0","$0 set resolution lodash@npm:^1.2.3 1.5.0"]]});var mAe=TC;var IAe=ie(Nn()),MC=class extends Be{constructor(){super(...arguments);this.all=Y.Boolean("-A,--all",!1,{description:"Unlink all workspaces belonging to the target project from the current one"});this.leadingArguments=Y.Rest()}async execute(){let e=await fe.find(this.context.cwd,this.context.plugins),{project:r,workspace:i}=await Ke.find(e,this.context.cwd),n=await Qt.find(e);if(!i)throw new rt(r.cwd,this.context.cwd);let s=r.topLevelWorkspace,o=new Set;if(this.leadingArguments.length===0&&this.all)for(let{pattern:l,reference:c}of s.manifest.resolutions)c.startsWith("portal:")&&o.add(l.descriptor.fullName);if(this.leadingArguments.length>0)for(let l of this.leadingArguments){let c=v.resolve(this.context.cwd,M.toPortablePath(l));if(de.isPathLike(l)){let u=await fe.find(c,this.context.plugins,{useRc:!1,strict:!1}),{project:g,workspace:f}=await Ke.find(u,c);if(!f)throw new rt(g.cwd,c);if(this.all){for(let h of g.workspaces)h.manifest.name&&o.add(S.stringifyIdent(h.locator));if(o.size===0)throw new me("No workspace found to be unlinked in the target project")}else{if(!f.manifest.name)throw new me("The target workspace doesn't have a name and thus cannot be unlinked");o.add(S.stringifyIdent(f.locator))}}else{let u=[...s.manifest.resolutions.map(({pattern:g})=>g.descriptor.fullName)];for(let g of(0,IAe.default)(u,l))o.add(g)}}return s.manifest.resolutions=s.manifest.resolutions.filter(({pattern:l})=>!o.has(l.descriptor.fullName)),(await Fe.start({configuration:e,stdout:this.context.stdout},async l=>{await r.install({cache:n,report:l})})).exitCode()}};MC.paths=[["unlink"]],MC.usage=ye.Usage({description:"disconnect the local project from another one",details:` + This command will remove any resolutions in the project-level manifest that would have been added via a yarn link with similar arguments. + `,examples:[["Unregister a remote workspace in the current project","$0 unlink ~/ts-loader"],["Unregister all workspaces from a remote project in the current project","$0 unlink ~/jest --all"],["Unregister all previously linked workspaces","$0 unlink --all"],["Unregister all workspaces matching a glob","$0 unlink '@babel/*' 'pkg-{a,b}'"]]});var EAe=MC;var yAe=ie(aC()),rL=ie(Nn());Ss();var uf=class extends Be{constructor(){super(...arguments);this.interactive=Y.Boolean("-i,--interactive",{description:"Offer various choices, depending on the detected upgrade paths"});this.exact=Y.Boolean("-E,--exact",!1,{description:"Don't use any semver modifier on the resolved range"});this.tilde=Y.Boolean("-T,--tilde",!1,{description:"Use the `~` semver modifier on the resolved range"});this.caret=Y.Boolean("-C,--caret",!1,{description:"Use the `^` semver modifier on the resolved range"});this.recursive=Y.Boolean("-R,--recursive",!1,{description:"Resolve again ALL resolutions for those packages"});this.mode=Y.String("--mode",{description:"Change what artifacts installs generate",validator:Yi(li)});this.patterns=Y.Rest()}async execute(){return this.recursive?await this.executeUpRecursive():await this.executeUpClassic()}async executeUpRecursive(){let e=await fe.find(this.context.cwd,this.context.plugins),{project:r,workspace:i}=await Ke.find(e,this.context.cwd),n=await Qt.find(e);if(!i)throw new rt(r.cwd,this.context.cwd);await r.restoreInstallState({restoreResolutions:!1});let s=[...r.storedDescriptors.values()],o=s.map(u=>S.stringifyIdent(u)),a=new Set;for(let u of this.patterns){if(S.parseDescriptor(u).range!=="unknown")throw new me("Ranges aren't allowed when using --recursive");for(let g of(0,rL.default)(o,u)){let f=S.parseIdent(g);a.add(f.identHash)}}let l=s.filter(u=>a.has(u.identHash));for(let u of l)r.storedDescriptors.delete(u.descriptorHash),r.storedResolutions.delete(u.descriptorHash);return(await Fe.start({configuration:e,stdout:this.context.stdout},async u=>{await r.install({cache:n,report:u})})).exitCode()}async executeUpClassic(){var d;let e=await fe.find(this.context.cwd,this.context.plugins),{project:r,workspace:i}=await Ke.find(e,this.context.cwd),n=await Qt.find(e);if(!i)throw new rt(r.cwd,this.context.cwd);await r.restoreInstallState({restoreResolutions:!1});let s=(d=this.interactive)!=null?d:e.get("preferInteractive"),o=AC(this,r),a=s?[Fr.KEEP,Fr.REUSE,Fr.PROJECT,Fr.LATEST]:[Fr.PROJECT,Fr.LATEST],l=[],c=[];for(let m of this.patterns){let E=!1,B=S.parseDescriptor(m);for(let b of r.workspaces)for(let R of[vr.REGULAR,vr.DEVELOPMENT]){let L=[...b.manifest.getForScope(R).values()].map(K=>S.stringifyIdent(K));for(let K of(0,rL.default)(L,S.stringifyIdent(B))){let J=S.parseIdent(K),ne=b.manifest[R].get(J.identHash);if(typeof ne=="undefined")throw new Error("Assertion failed: Expected the descriptor to be registered");let q=S.makeDescriptor(J,B.range);l.push(Promise.resolve().then(async()=>[b,R,ne,await lC(q,{project:r,workspace:b,cache:n,target:R,modifier:o,strategies:a})])),E=!0}}E||c.push(m)}if(c.length>1)throw new me(`Patterns ${ue.prettyList(e,c,ps.CODE)} don't match any packages referenced by any workspace`);if(c.length>0)throw new me(`Pattern ${ue.prettyList(e,c,ps.CODE)} doesn't match any packages referenced by any workspace`);let u=await Promise.all(l),g=await Fa.start({configuration:e,stdout:this.context.stdout,suggestInstall:!1},async m=>{for(let[,,E,{suggestions:B,rejections:b}]of u){let R=B.filter(H=>H.descriptor!==null);if(R.length===0){let[H]=b;if(typeof H=="undefined")throw new Error("Assertion failed: Expected an error to have been set");let L=this.cli.error(H);r.configuration.get("enableNetwork")?m.reportError(z.CANT_SUGGEST_RESOLUTIONS,`${S.prettyDescriptor(e,E)} can't be resolved to a satisfying range + +${L}`):m.reportError(z.CANT_SUGGEST_RESOLUTIONS,`${S.prettyDescriptor(e,E)} can't be resolved to a satisfying range (note: network resolution has been disabled) + +${L}`)}else R.length>1&&!s&&m.reportError(z.CANT_SUGGEST_RESOLUTIONS,`${S.prettyDescriptor(e,E)} has multiple possible upgrade strategies; use -i to disambiguate manually`)}});if(g.hasErrors())return g.exitCode();let f=!1,h=[];for(let[m,E,,{suggestions:B}]of u){let b,R=B.filter(J=>J.descriptor!==null),H=R[0].descriptor,L=R.every(J=>S.areDescriptorsEqual(J.descriptor,H));R.length===1||L?b=H:(f=!0,{answer:b}=await(0,yAe.prompt)({type:"select",name:"answer",message:`Which range to you want to use in ${S.prettyWorkspace(e,m)} \u276F ${E}?`,choices:B.map(({descriptor:J,name:ne,reason:q})=>J?{name:ne,hint:q,descriptor:J}:{name:ne,hint:q,disabled:!0}),onCancel:()=>process.exit(130),result(J){return this.find(J,"descriptor")},stdin:this.context.stdin,stdout:this.context.stdout}));let K=m.manifest[E].get(b.identHash);if(typeof K=="undefined")throw new Error("Assertion failed: This descriptor should have a matching entry");if(K.descriptorHash!==b.descriptorHash)m.manifest[E].set(b.identHash,b),h.push([m,E,K,b]);else{let J=e.makeResolver(),ne={project:r,resolver:J},q=J.bindDescriptor(K,m.anchoredLocator,ne);r.forgetResolution(q)}}return await e.triggerMultipleHooks(m=>m.afterWorkspaceDependencyReplacement,h),f&&this.context.stdout.write(` +`),(await Fe.start({configuration:e,stdout:this.context.stdout},async m=>{await r.install({cache:n,report:m,mode:this.mode})})).exitCode()}};uf.paths=[["up"]],uf.usage=ye.Usage({description:"upgrade dependencies across the project",details:"\n This command upgrades the packages matching the list of specified patterns to their latest available version across the whole project (regardless of whether they're part of `dependencies` or `devDependencies` - `peerDependencies` won't be affected). This is a project-wide command: all workspaces will be upgraded in the process.\n\n If `-R,--recursive` is set the command will change behavior and no other switch will be allowed. When operating under this mode `yarn up` will force all ranges matching the selected packages to be resolved again (often to the highest available versions) before being stored in the lockfile. It however won't touch your manifests anymore, so depending on your needs you might want to run both `yarn up` and `yarn up -R` to cover all bases.\n\n If `-i,--interactive` is set (or if the `preferInteractive` settings is toggled on) the command will offer various choices, depending on the detected upgrade paths. Some upgrades require this flag in order to resolve ambiguities.\n\n The, `-C,--caret`, `-E,--exact` and `-T,--tilde` options have the same meaning as in the `add` command (they change the modifier used when the range is missing or a tag, and are ignored when the range is explicitly set).\n\n If the `--mode=` option is set, Yarn will change which artifacts are generated. The modes currently supported are:\n\n - `skip-build` will not run the build scripts at all. Note that this is different from setting `enableScripts` to false because the later will disable build scripts, and thus affect the content of the artifacts generated on disk, whereas the former will just disable the build step - but not the scripts themselves, which just won't run.\n\n - `update-lockfile` will skip the link step altogether, and only fetch packages that are missing from the lockfile (or that have no associated checksums). This mode is typically used by tools like Renovate or Dependabot to keep a lockfile up-to-date without incurring the full install cost.\n\n Generally you can see `yarn up` as a counterpart to what was `yarn upgrade --latest` in Yarn 1 (ie it ignores the ranges previously listed in your manifests), but unlike `yarn upgrade` which only upgraded dependencies in the current workspace, `yarn up` will upgrade all workspaces at the same time.\n\n This command accepts glob patterns as arguments (if valid Descriptors and supported by [micromatch](https://github.com/micromatch/micromatch)). Make sure to escape the patterns, to prevent your own shell from trying to expand them.\n\n **Note:** The ranges have to be static, only the package scopes and names can contain glob patterns.\n ",examples:[["Upgrade all instances of lodash to the latest release","$0 up lodash"],["Upgrade all instances of lodash to the latest release, but ask confirmation for each","$0 up lodash -i"],["Upgrade all instances of lodash to 1.2.3","$0 up lodash@1.2.3"],["Upgrade all instances of packages with the `@babel` scope to the latest release","$0 up '@babel/*'"],["Upgrade all instances of packages containing the word `jest` to the latest release","$0 up '*jest*'"],["Upgrade all instances of packages with the `@babel` scope to 7.0.0","$0 up '@babel/*@7.0.0'"]]}),uf.schema=[pv("recursive",Bl.Forbids,["interactive","exact","tilde","caret"],{ignore:[void 0,!1]})];var wAe=uf;var OC=class extends Be{constructor(){super(...arguments);this.recursive=Y.Boolean("-R,--recursive",!1,{description:"List, for each workspace, what are all the paths that lead to the dependency"});this.json=Y.Boolean("--json",!1,{description:"Format the output as an NDJSON stream"});this.peers=Y.Boolean("--peers",!1,{description:"Also print the peer dependencies that match the specified name"});this.package=Y.String()}async execute(){let e=await fe.find(this.context.cwd,this.context.plugins),{project:r,workspace:i}=await Ke.find(e,this.context.cwd);if(!i)throw new rt(r.cwd,this.context.cwd);await r.restoreInstallState();let n=S.parseIdent(this.package).identHash,s=this.recursive?n4e(r,n,{configuration:e,peers:this.peers}):i4e(r,n,{configuration:e,peers:this.peers});Hs.emitTree(s,{configuration:e,stdout:this.context.stdout,json:this.json,separators:1})}};OC.paths=[["why"]],OC.usage=ye.Usage({description:"display the reason why a package is needed",details:` + This command prints the exact reasons why a package appears in the dependency tree. + + If \`-R,--recursive\` is set, the listing will go in depth and will list, for each workspaces, what are all the paths that lead to the dependency. Note that the display is somewhat optimized in that it will not print the package listing twice for a single package, so if you see a leaf named "Foo" when looking for "Bar", it means that "Foo" already got printed higher in the tree. + `,examples:[["Explain why lodash is used in your project","$0 why lodash"]]});var BAe=OC;function i4e(t,e,{configuration:r,peers:i}){let n=de.sortMap(t.storedPackages.values(),a=>S.stringifyLocator(a)),s={},o={children:s};for(let a of n){let l={},c=null;for(let u of a.dependencies.values()){if(!i&&a.peerDependencies.has(u.identHash))continue;let g=t.storedResolutions.get(u.descriptorHash);if(!g)throw new Error("Assertion failed: The resolution should have been registered");let f=t.storedPackages.get(g);if(!f)throw new Error("Assertion failed: The package should have been registered");if(f.identHash!==e)continue;if(c===null){let p=S.stringifyLocator(a);s[p]={value:[a,ue.Type.LOCATOR],children:l}}let h=S.stringifyLocator(f);l[h]={value:[{descriptor:u,locator:f},ue.Type.DEPENDENT]}}}return o}function n4e(t,e,{configuration:r,peers:i}){let n=de.sortMap(t.workspaces,f=>S.stringifyLocator(f.anchoredLocator)),s=new Set,o=new Set,a=f=>{if(s.has(f.locatorHash))return o.has(f.locatorHash);if(s.add(f.locatorHash),f.identHash===e)return o.add(f.locatorHash),!0;let h=!1;f.identHash===e&&(h=!0);for(let p of f.dependencies.values()){if(!i&&f.peerDependencies.has(p.identHash))continue;let d=t.storedResolutions.get(p.descriptorHash);if(!d)throw new Error("Assertion failed: The resolution should have been registered");let m=t.storedPackages.get(d);if(!m)throw new Error("Assertion failed: The package should have been registered");a(m)&&(h=!0)}return h&&o.add(f.locatorHash),h};for(let f of n){let h=t.storedPackages.get(f.anchoredLocator.locatorHash);if(!h)throw new Error("Assertion failed: The package should have been registered");a(h)}let l=new Set,c={},u={children:c},g=(f,h,p)=>{if(!o.has(f.locatorHash))return;let d=p!==null?ue.tuple(ue.Type.DEPENDENT,{locator:f,descriptor:p}):ue.tuple(ue.Type.LOCATOR,f),m={},E={value:d,children:m},B=S.stringifyLocator(f);if(h[B]=E,!l.has(f.locatorHash)&&(l.add(f.locatorHash),!(p!==null&&t.tryWorkspaceByLocator(f))))for(let b of f.dependencies.values()){if(!i&&f.peerDependencies.has(b.identHash))continue;let R=t.storedResolutions.get(b.descriptorHash);if(!R)throw new Error("Assertion failed: The resolution should have been registered");let H=t.storedPackages.get(R);if(!H)throw new Error("Assertion failed: The package should have been registered");g(H,m,b)}};for(let f of n){let h=t.storedPackages.get(f.anchoredLocator.locatorHash);if(!h)throw new Error("Assertion failed: The package should have been registered");g(h,c,null)}return u}var fL={};it(fL,{default:()=>w4e,gitUtils:()=>Uc});var Uc={};it(Uc,{TreeishProtocols:()=>vn,clone:()=>cL,fetchBase:()=>jAe,fetchChangedFiles:()=>YAe,fetchChangedWorkspaces:()=>E4e,fetchRoot:()=>GAe,isGitUrl:()=>ff,lsRemote:()=>HAe,normalizeLocator:()=>AL,normalizeRepoUrl:()=>KC,resolveUrl:()=>lL,splitRepoUrl:()=>UC});var oL=ie(OAe()),gf=ie(require("querystring")),aL=ie(Or()),KAe=ie(require("url"));function UAe(){return _(P({},process.env),{GIT_SSH_COMMAND:"ssh -o BatchMode=yes"})}var I4e=[/^ssh:/,/^git(?:\+[^:]+)?:/,/^(?:git\+)?https?:[^#]+\/[^#]+(?:\.git)(?:#.*)?$/,/^git@[^#]+\/[^#]+\.git(?:#.*)?$/,/^(?:github:|https:\/\/github\.com\/)?(?!\.{1,2}\/)([a-zA-Z._0-9-]+)\/(?!\.{1,2}(?:#|$))([a-zA-Z._0-9-]+?)(?:\.git)?(?:#.*)?$/,/^https:\/\/github\.com\/(?!\.{1,2}\/)([a-zA-Z0-9._-]+)\/(?!\.{1,2}(?:#|$))([a-zA-Z0-9._-]+?)\/tarball\/(.+)?$/],vn;(function(n){n.Commit="commit",n.Head="head",n.Tag="tag",n.Semver="semver"})(vn||(vn={}));function ff(t){return t?I4e.some(e=>!!t.match(e)):!1}function UC(t){t=KC(t);let e=t.indexOf("#");if(e===-1)return{repo:t,treeish:{protocol:vn.Head,request:"HEAD"},extra:{}};let r=t.slice(0,e),i=t.slice(e+1);if(i.match(/^[a-z]+=/)){let n=gf.default.parse(i);for(let[l,c]of Object.entries(n))if(typeof c!="string")throw new Error(`Assertion failed: The ${l} parameter must be a literal string`);let s=Object.values(vn).find(l=>Object.prototype.hasOwnProperty.call(n,l)),o,a;typeof s!="undefined"?(o=s,a=n[s]):(o=vn.Head,a="HEAD");for(let l of Object.values(vn))delete n[l];return{repo:r,treeish:{protocol:o,request:a},extra:n}}else{let n=i.indexOf(":"),s,o;return n===-1?(s=null,o=i):(s=i.slice(0,n),o=i.slice(n+1)),{repo:r,treeish:{protocol:s,request:o},extra:{}}}}function KC(t,{git:e=!1}={}){var r;if(t=t.replace(/^git\+https:/,"https:"),t=t.replace(/^(?:github:|https:\/\/github\.com\/)?(?!\.{1,2}\/)([a-zA-Z0-9._-]+)\/(?!\.{1,2}(?:#|$))([a-zA-Z0-9._-]+?)(?:\.git)?(#.*)?$/,"https://github.com/$1/$2.git$3"),t=t.replace(/^https:\/\/github\.com\/(?!\.{1,2}\/)([a-zA-Z0-9._-]+)\/(?!\.{1,2}(?:#|$))([a-zA-Z0-9._-]+?)\/tarball\/(.+)?$/,"https://github.com/$1/$2.git#$3"),e){t=t.replace(/^git\+([^:]+):/,"$1:");let i;try{i=KAe.default.parse(t)}catch{i=null}i&&i.protocol==="ssh:"&&((r=i.path)==null?void 0:r.startsWith("/:"))&&(t=t.replace(/^ssh:\/\//,""))}return t}function AL(t){return S.makeLocator(t,KC(t.reference))}async function HAe(t,e){let r=KC(t,{git:!0});if(!Zt.getNetworkSettings(`https://${(0,oL.default)(r).resource}`,{configuration:e}).enableNetwork)throw new Error(`Request to '${r}' has been blocked because of your configuration settings`);let n;try{n=await hr.execvp("git",["ls-remote",r],{cwd:e.startingCwd,env:UAe(),strict:!0})}catch(l){throw l.message=`Listing the refs for ${t} failed`,l}let s=new Map,o=/^([a-f0-9]{40})\t([^\n]+)/gm,a;for(;(a=o.exec(n.stdout))!==null;)s.set(a[2],a[1]);return s}async function lL(t,e){let{repo:r,treeish:{protocol:i,request:n},extra:s}=UC(t),o=await HAe(r,e),a=(c,u)=>{switch(c){case vn.Commit:{if(!u.match(/^[a-f0-9]{40}$/))throw new Error("Invalid commit hash");return gf.default.stringify(_(P({},s),{commit:u}))}case vn.Head:{let g=o.get(u==="HEAD"?u:`refs/heads/${u}`);if(typeof g=="undefined")throw new Error(`Unknown head ("${u}")`);return gf.default.stringify(_(P({},s),{commit:g}))}case vn.Tag:{let g=o.get(`refs/tags/${u}`);if(typeof g=="undefined")throw new Error(`Unknown tag ("${u}")`);return gf.default.stringify(_(P({},s),{commit:g}))}case vn.Semver:{let g=qt.validRange(u);if(!g)throw new Error(`Invalid range ("${u}")`);let f=new Map([...o.entries()].filter(([p])=>p.startsWith("refs/tags/")).map(([p,d])=>[aL.default.parse(p.slice(10)),d]).filter(p=>p[0]!==null)),h=aL.default.maxSatisfying([...f.keys()],g);if(h===null)throw new Error(`No matching range ("${u}")`);return gf.default.stringify(_(P({},s),{commit:f.get(h)}))}case null:{let g;if((g=l(vn.Commit,u))!==null||(g=l(vn.Tag,u))!==null||(g=l(vn.Head,u))!==null)return g;throw u.match(/^[a-f0-9]+$/)?new Error(`Couldn't resolve "${u}" as either a commit, a tag, or a head - if a commit, use the 40-characters commit hash`):new Error(`Couldn't resolve "${u}" as either a commit, a tag, or a head`)}default:throw new Error(`Invalid Git resolution protocol ("${c}")`)}},l=(c,u)=>{try{return a(c,u)}catch(g){return null}};return`${r}#${a(i,n)}`}async function cL(t,e){return await e.getLimit("cloneConcurrency")(async()=>{let{repo:r,treeish:{protocol:i,request:n}}=UC(t);if(i!=="commit")throw new Error("Invalid treeish protocol when cloning");let s=KC(r,{git:!0});if(Zt.getNetworkSettings(`https://${(0,oL.default)(s).resource}`,{configuration:e}).enableNetwork===!1)throw new Error(`Request to '${s}' has been blocked because of your configuration settings`);let o=await T.mktempPromise(),a={cwd:o,env:UAe(),strict:!0};try{await hr.execvp("git",["clone","-c core.autocrlf=false",s,M.fromPortablePath(o)],a),await hr.execvp("git",["checkout",`${n}`],a)}catch(l){throw l.message=`Repository clone failed: ${l.message}`,l}return o})}async function GAe(t){let e=null,r,i=t;do r=i,await T.existsPromise(v.join(r,".git"))&&(e=r),i=v.dirname(r);while(e===null&&i!==r);return e}async function jAe(t,{baseRefs:e}){if(e.length===0)throw new me("Can't run this command with zero base refs specified.");let r=[];for(let a of e){let{code:l}=await hr.execvp("git",["merge-base",a,"HEAD"],{cwd:t});l===0&&r.push(a)}if(r.length===0)throw new me(`No ancestor could be found between any of HEAD and ${e.join(", ")}`);let{stdout:i}=await hr.execvp("git",["merge-base","HEAD",...r],{cwd:t,strict:!0}),n=i.trim(),{stdout:s}=await hr.execvp("git",["show","--quiet","--pretty=format:%s",n],{cwd:t,strict:!0}),o=s.trim();return{hash:n,title:o}}async function YAe(t,{base:e,project:r}){let i=de.buildIgnorePattern(r.configuration.get("changesetIgnorePatterns")),{stdout:n}=await hr.execvp("git",["diff","--name-only",`${e}`],{cwd:t,strict:!0}),s=n.split(/\r\n|\r|\n/).filter(c=>c.length>0).map(c=>v.resolve(t,M.toPortablePath(c))),{stdout:o}=await hr.execvp("git",["ls-files","--others","--exclude-standard"],{cwd:t,strict:!0}),a=o.split(/\r\n|\r|\n/).filter(c=>c.length>0).map(c=>v.resolve(t,M.toPortablePath(c))),l=[...new Set([...s,...a].sort())];return i?l.filter(c=>!v.relative(r.cwd,c).match(i)):l}async function E4e({ref:t,project:e}){if(e.configuration.projectCwd===null)throw new me("This command can only be run from within a Yarn project");let r=[v.resolve(e.cwd,e.configuration.get("cacheFolder")),v.resolve(e.cwd,e.configuration.get("installStatePath")),v.resolve(e.cwd,e.configuration.get("lockfileFilename")),v.resolve(e.cwd,e.configuration.get("virtualFolder"))];await e.configuration.triggerHook(o=>o.populateYarnPaths,e,o=>{o!=null&&r.push(o)});let i=await GAe(e.configuration.projectCwd);if(i==null)throw new me("This command can only be run on Git repositories");let n=await jAe(i,{baseRefs:typeof t=="string"?[t]:e.configuration.get("changesetBaseRefs")}),s=await YAe(i,{base:n.hash,project:e});return new Set(de.mapAndFilter(s,o=>{let a=e.tryWorkspaceByFilePath(o);return a===null?de.mapAndFilter.skip:r.some(l=>o.startsWith(l))?de.mapAndFilter.skip:a}))}var uL=class{supports(e,r){return ff(e.reference)}getLocalPath(e,r){return null}async fetch(e,r){let i=r.checksums.get(e.locatorHash)||null,n=AL(e),s=new Map(r.checksums);s.set(n.locatorHash,i);let o=_(P({},r),{checksums:s}),a=await this.downloadHosted(n,o);if(a!==null)return a;let[l,c,u]=await r.cache.fetchPackageFromCache(e,i,P({onHit:()=>r.report.reportCacheHit(e),onMiss:()=>r.report.reportCacheMiss(e,`${S.prettyLocator(r.project.configuration,e)} can't be found in the cache and will be fetched from the remote repository`),loader:()=>this.cloneFromRemote(n,o),skipIntegrityCheck:r.skipIntegrityCheck},r.cacheOptions));return{packageFs:l,releaseFs:c,prefixPath:S.getIdentVendorPath(e),checksum:u}}async downloadHosted(e,r){return r.project.configuration.reduceHook(i=>i.fetchHostedRepository,null,e,r)}async cloneFromRemote(e,r){let i=await cL(e.reference,r.project.configuration),n=UC(e.reference),s=v.join(i,"package.tgz");await Kt.prepareExternalProject(i,s,{configuration:r.project.configuration,report:r.report,workspace:n.extra.workspace,locator:e});let o=await T.readFilePromise(s);return await de.releaseAfterUseAsync(async()=>await Ai.convertToZip(o,{compressionLevel:r.project.configuration.get("compressionLevel"),prefixPath:S.getIdentVendorPath(e),stripComponents:1}))}};var gL=class{supportsDescriptor(e,r){return ff(e.range)}supportsLocator(e,r){return ff(e.reference)}shouldPersistResolution(e,r){return!0}bindDescriptor(e,r,i){return e}getResolutionDependencies(e,r){return[]}async getCandidates(e,r,i){let n=await lL(e.range,i.project.configuration);return[S.makeLocator(e,n)]}async getSatisfying(e,r,i){return null}async resolve(e,r){if(!r.fetchOptions)throw new Error("Assertion failed: This resolver cannot be used unless a fetcher is configured");let i=await r.fetchOptions.fetcher.fetch(e,r.fetchOptions),n=await de.releaseAfterUseAsync(async()=>await Ze.find(i.prefixPath,{baseFs:i.packageFs}),i.releaseFs);return _(P({},e),{version:n.version||"0.0.0",languageName:n.languageName||r.project.configuration.get("defaultLanguageName"),linkType:gt.HARD,conditions:n.getConditions(),dependencies:n.dependencies,peerDependencies:n.peerDependencies,dependenciesMeta:n.dependenciesMeta,peerDependenciesMeta:n.peerDependenciesMeta,bin:n.bin})}};var y4e={configuration:{changesetBaseRefs:{description:"The base git refs that the current HEAD is compared against when detecting changes. Supports git branches, tags, and commits.",type:ge.STRING,isArray:!0,isNullable:!1,default:["master","origin/master","upstream/master","main","origin/main","upstream/main"]},changesetIgnorePatterns:{description:"Array of glob patterns; files matching them will be ignored when fetching the changed files",type:ge.STRING,default:[],isArray:!0},cloneConcurrency:{description:"Maximal number of concurrent clones",type:ge.NUMBER,default:2}},fetchers:[uL],resolvers:[gL]};var w4e=y4e;var HC=class extends Be{constructor(){super(...arguments);this.since=Y.String("--since",{description:"Only include workspaces that have been changed since the specified ref.",tolerateBoolean:!0});this.recursive=Y.Boolean("-R,--recursive",!1,{description:"Find packages via dependencies/devDependencies instead of using the workspaces field"});this.verbose=Y.Boolean("-v,--verbose",!1,{description:"Also return the cross-dependencies between workspaces"});this.json=Y.Boolean("--json",!1,{description:"Format the output as an NDJSON stream"})}async execute(){let e=await fe.find(this.context.cwd,this.context.plugins),{project:r}=await Ke.find(e,this.context.cwd);return(await Fe.start({configuration:e,json:this.json,stdout:this.context.stdout},async n=>{let s=this.since?await Uc.fetchChangedWorkspaces({ref:this.since,project:r}):r.workspaces,o=new Set(s);if(this.recursive)for(let a of[...s].map(l=>l.getRecursiveWorkspaceDependents()))for(let l of a)o.add(l);for(let a of o){let{manifest:l}=a,c;if(this.verbose){let u=new Set,g=new Set;for(let f of Ze.hardDependencies)for(let[h,p]of l.getForScope(f)){let d=r.tryWorkspaceByDescriptor(p);d===null?r.workspacesByIdent.has(h)&&g.add(p):u.add(d)}c={workspaceDependencies:Array.from(u).map(f=>f.relativeCwd),mismatchedWorkspaceDependencies:Array.from(g).map(f=>S.stringifyDescriptor(f))}}n.reportInfo(null,`${a.relativeCwd}`),n.reportJson(P({location:a.relativeCwd,name:l.name?S.stringifyIdent(l.name):null},c))}})).exitCode()}};HC.paths=[["workspaces","list"]],HC.usage=ye.Usage({category:"Workspace-related commands",description:"list all available workspaces",details:"\n This command will print the list of all workspaces in the project.\n\n - If `--since` is set, Yarn will only list workspaces that have been modified since the specified ref. By default Yarn will use the refs specified by the `changesetBaseRefs` configuration option.\n\n - If `-R,--recursive` is set, Yarn will find workspaces to run the command on by recursively evaluating `dependencies` and `devDependencies` fields, instead of looking at the `workspaces` fields.\n\n - If both the `-v,--verbose` and `--json` options are set, Yarn will also return the cross-dependencies between each workspaces (useful when you wish to automatically generate Buck / Bazel rules).\n "});var qAe=HC;var GC=class extends Be{constructor(){super(...arguments);this.workspaceName=Y.String();this.commandName=Y.String();this.args=Y.Proxy()}async execute(){let e=await fe.find(this.context.cwd,this.context.plugins),{project:r,workspace:i}=await Ke.find(e,this.context.cwd);if(!i)throw new rt(r.cwd,this.context.cwd);let n=r.workspaces,s=new Map(n.map(a=>{let l=S.convertToIdent(a.locator);return[S.stringifyIdent(l),a]})),o=s.get(this.workspaceName);if(o===void 0){let a=Array.from(s.keys()).sort();throw new me(`Workspace '${this.workspaceName}' not found. Did you mean any of the following: + - ${a.join(` + - `)}?`)}return this.cli.run([this.commandName,...this.args],{cwd:o.cwd})}};GC.paths=[["workspace"]],GC.usage=ye.Usage({category:"Workspace-related commands",description:"run a command within the specified workspace",details:` + This command will run a given sub-command on a single workspace. + `,examples:[["Add a package to a single workspace","yarn workspace components add -D react"],["Run build script on a single workspace","yarn workspace components run build"]]});var JAe=GC;var B4e={configuration:{enableImmutableInstalls:{description:"If true (the default on CI), prevents the install command from modifying the lockfile",type:ge.BOOLEAN,default:WAe.isCI},defaultSemverRangePrefix:{description:"The default save prefix: '^', '~' or ''",type:ge.STRING,values:["^","~",""],default:Lo.CARET}},commands:[soe,aoe,wae,Nae,mAe,nAe,tAe,qAe,Uae,Hae,Gae,jae,ioe,noe,Lae,Mae,Yae,qae,Wae,zae,_ae,EAe,Xae,cAe,AAe,uAe,Zae,gAe,fAe,hAe,dAe,CAe,wAe,BAe,JAe]},Q4e=B4e;var mL={};it(mL,{default:()=>v4e});var Me={optional:!0},zAe=[["@tailwindcss/aspect-ratio@<0.2.1",{peerDependencies:{tailwindcss:"^2.0.2"}}],["@tailwindcss/line-clamp@<0.2.1",{peerDependencies:{tailwindcss:"^2.0.2"}}],["@fullhuman/postcss-purgecss@3.1.3 || 3.1.3-alpha.0",{peerDependencies:{postcss:"^8.0.0"}}],["@samverschueren/stream-to-observable@<0.3.1",{peerDependenciesMeta:{rxjs:Me,zenObservable:Me}}],["any-observable@<0.5.1",{peerDependenciesMeta:{rxjs:Me,zenObservable:Me}}],["@pm2/agent@<1.0.4",{dependencies:{debug:"*"}}],["debug@<4.2.0",{peerDependenciesMeta:{["supports-color"]:Me}}],["got@<11",{dependencies:{["@types/responselike"]:"^1.0.0",["@types/keyv"]:"^3.1.1"}}],["cacheable-lookup@<4.1.2",{dependencies:{["@types/keyv"]:"^3.1.1"}}],["http-link-dataloader@*",{peerDependencies:{graphql:"^0.13.1 || ^14.0.0"}}],["typescript-language-server@*",{dependencies:{["vscode-jsonrpc"]:"^5.0.1",["vscode-languageserver-protocol"]:"^3.15.0"}}],["postcss-syntax@*",{peerDependenciesMeta:{["postcss-html"]:Me,["postcss-jsx"]:Me,["postcss-less"]:Me,["postcss-markdown"]:Me,["postcss-scss"]:Me}}],["jss-plugin-rule-value-function@<=10.1.1",{dependencies:{["tiny-warning"]:"^1.0.2"}}],["ink-select-input@<4.1.0",{peerDependencies:{react:"^16.8.2"}}],["license-webpack-plugin@<2.3.18",{peerDependenciesMeta:{webpack:Me}}],["snowpack@>=3.3.0",{dependencies:{["node-gyp"]:"^7.1.0"}}],["promise-inflight@*",{peerDependenciesMeta:{bluebird:Me}}],["reactcss@*",{peerDependencies:{react:"*"}}],["react-color@<=2.19.0",{peerDependencies:{react:"*"}}],["gatsby-plugin-i18n@*",{dependencies:{ramda:"^0.24.1"}}],["useragent@^2.0.0",{dependencies:{request:"^2.88.0",yamlparser:"0.0.x",semver:"5.5.x"}}],["@apollographql/apollo-tools@*",{peerDependencies:{graphql:"^14.2.1 || ^15.0.0"}}],["material-table@^2.0.0",{dependencies:{"@babel/runtime":"^7.11.2"}}],["@babel/parser@*",{dependencies:{"@babel/types":"^7.8.3"}}],["fork-ts-checker-webpack-plugin@<=6.3.4",{peerDependencies:{eslint:">= 6",typescript:">= 2.7",webpack:">= 4","vue-template-compiler":"*"},peerDependenciesMeta:{eslint:Me,"vue-template-compiler":Me}}],["rc-animate@<=3.1.1",{peerDependencies:{react:">=16.9.0","react-dom":">=16.9.0"}}],["react-bootstrap-table2-paginator@*",{dependencies:{classnames:"^2.2.6"}}],["react-draggable@<=4.4.3",{peerDependencies:{react:">= 16.3.0","react-dom":">= 16.3.0"}}],["apollo-upload-client@<14",{peerDependencies:{graphql:"14 - 15"}}],["react-instantsearch-core@<=6.7.0",{peerDependencies:{algoliasearch:">= 3.1 < 5"}}],["react-instantsearch-dom@<=6.7.0",{dependencies:{"react-fast-compare":"^3.0.0"}}],["ws@<7.2.1",{peerDependencies:{bufferutil:"^4.0.1","utf-8-validate":"^5.0.2"},peerDependenciesMeta:{bufferutil:Me,"utf-8-validate":Me}}],["react-portal@*",{peerDependencies:{"react-dom":"^15.0.0-0 || ^16.0.0-0 || ^17.0.0-0"}}],["react-scripts@<=4.0.1",{peerDependencies:{react:"*"}}],["testcafe@<=1.10.1",{dependencies:{"@babel/plugin-transform-for-of":"^7.12.1","@babel/runtime":"^7.12.5"}}],["testcafe-legacy-api@<=4.2.0",{dependencies:{"testcafe-hammerhead":"^17.0.1","read-file-relative":"^1.2.0"}}],["@google-cloud/firestore@<=4.9.3",{dependencies:{protobufjs:"^6.8.6"}}],["gatsby-source-apiserver@*",{dependencies:{["babel-polyfill"]:"^6.26.0"}}],["@webpack-cli/package-utils@<=1.0.1-alpha.4",{dependencies:{["cross-spawn"]:"^7.0.3"}}],["gatsby-remark-prismjs@<3.3.28",{dependencies:{lodash:"^4"}}],["gatsby-plugin-favicon@*",{peerDependencies:{webpack:"*"}}],["gatsby-plugin-sharp@*",{dependencies:{debug:"^4.3.1"}}],["gatsby-react-router-scroll@*",{dependencies:{["prop-types"]:"^15.7.2"}}],["@rebass/forms@*",{dependencies:{["@styled-system/should-forward-prop"]:"^5.0.0"},peerDependencies:{react:"^16.8.6"}}],["rebass@*",{peerDependencies:{react:"^16.8.6"}}],["@ant-design/react-slick@<=0.28.3",{peerDependencies:{react:">=16.0.0"}}],["mqtt@<4.2.7",{dependencies:{duplexify:"^4.1.1"}}],["vue-cli-plugin-vuetify@<=2.0.3",{dependencies:{semver:"^6.3.0"},peerDependenciesMeta:{"sass-loader":Me,"vuetify-loader":Me}}],["vue-cli-plugin-vuetify@<=2.0.4",{dependencies:{"null-loader":"^3.0.0"}}],["@vuetify/cli-plugin-utils@<=0.0.4",{dependencies:{semver:"^6.3.0"},peerDependenciesMeta:{"sass-loader":Me}}],["@vue/cli-plugin-typescript@<=5.0.0-alpha.0",{dependencies:{"babel-loader":"^8.1.0"}}],["@vue/cli-plugin-typescript@<=5.0.0-beta.0",{dependencies:{"@babel/core":"^7.12.16"},peerDependencies:{"vue-template-compiler":"^2.0.0"},peerDependenciesMeta:{"vue-template-compiler":Me}}],["cordova-ios@<=6.3.0",{dependencies:{underscore:"^1.9.2"}}],["cordova-lib@<=10.0.1",{dependencies:{underscore:"^1.9.2"}}],["git-node-fs@*",{peerDependencies:{"js-git":"^0.7.8"},peerDependenciesMeta:{"js-git":Me}}],["consolidate@*",{peerDependencies:{velocityjs:"^2.0.1",tinyliquid:"^0.2.34","liquid-node":"^3.0.1",jade:"^1.11.0","then-jade":"*",dust:"^0.3.0","dustjs-helpers":"^1.7.4","dustjs-linkedin":"^2.7.5",swig:"^1.4.2","swig-templates":"^2.0.3","razor-tmpl":"^1.3.1",atpl:">=0.7.6",liquor:"^0.0.5",twig:"^1.15.2",ejs:"^3.1.5",eco:"^1.1.0-rc-3",jazz:"^0.0.18",jqtpl:"~1.1.0",hamljs:"^0.6.2",hamlet:"^0.3.3",whiskers:"^0.4.0","haml-coffee":"^1.14.1","hogan.js":"^3.0.2",templayed:">=0.2.3",handlebars:"^4.7.6",underscore:"^1.11.0",lodash:"^4.17.20",pug:"^3.0.0","then-pug":"*",qejs:"^3.0.5",walrus:"^0.10.1",mustache:"^4.0.1",just:"^0.1.8",ect:"^0.5.9",mote:"^0.2.0",toffee:"^0.3.6",dot:"^1.1.3","bracket-template":"^1.1.5",ractive:"^1.3.12",nunjucks:"^3.2.2",htmling:"^0.0.8","babel-core":"^6.26.3",plates:"~0.4.11","react-dom":"^16.13.1",react:"^16.13.1","arc-templates":"^0.5.3",vash:"^0.13.0",slm:"^2.0.0",marko:"^3.14.4",teacup:"^2.0.0","coffee-script":"^1.12.7",squirrelly:"^5.1.0",twing:"^5.0.2"},peerDependenciesMeta:{velocityjs:Me,tinyliquid:Me,"liquid-node":Me,jade:Me,"then-jade":Me,dust:Me,"dustjs-helpers":Me,"dustjs-linkedin":Me,swig:Me,"swig-templates":Me,"razor-tmpl":Me,atpl:Me,liquor:Me,twig:Me,ejs:Me,eco:Me,jazz:Me,jqtpl:Me,hamljs:Me,hamlet:Me,whiskers:Me,"haml-coffee":Me,"hogan.js":Me,templayed:Me,handlebars:Me,underscore:Me,lodash:Me,pug:Me,"then-pug":Me,qejs:Me,walrus:Me,mustache:Me,just:Me,ect:Me,mote:Me,toffee:Me,dot:Me,"bracket-template":Me,ractive:Me,nunjucks:Me,htmling:Me,"babel-core":Me,plates:Me,"react-dom":Me,react:Me,"arc-templates":Me,vash:Me,slm:Me,marko:Me,teacup:Me,"coffee-script":Me,squirrelly:Me,twing:Me}}],["vue-loader@<=16.3.1",{peerDependencies:{"@vue/compiler-sfc":"^3.0.8",webpack:"^4.1.0 || ^5.0.0-0"}}],["scss-parser@*",{dependencies:{lodash:"^4.17.21"}}],["query-ast@*",{dependencies:{lodash:"^4.17.21"}}],["redux-thunk@<=2.3.0",{peerDependencies:{redux:"^4.0.0"}}],["skypack@<=0.3.2",{dependencies:{tar:"^6.1.0"}}],["@npmcli/metavuln-calculator@*",{dependencies:{"json-parse-even-better-errors":"^2.3.1"}}],["bin-links@*",{dependencies:{"mkdirp-infer-owner":"^1.0.2"}}],["rollup-plugin-polyfill-node@*",{peerDependencies:{rollup:"^1.20.0 || ^2.0.0"}}],["snowpack@*",{dependencies:{"magic-string":"^0.25.7"}}],["elm-webpack-loader@*",{dependencies:{temp:"^0.9.4"}}],["winston-transport@<=4.4.0",{dependencies:{logform:"^2.2.0"}}],["jest-vue-preprocessor@*",{dependencies:{"@babel/core":"7.8.7","@babel/template":"7.8.6"},peerDependencies:{pug:"^2.0.4"},peerDependenciesMeta:{pug:Me}}],["redux-persist@*",{peerDependencies:{react:">=16"},peerDependenciesMeta:{react:Me}}],["sodium@>=3",{dependencies:{"node-gyp":"^3.8.0"}}],["babel-plugin-graphql-tag@<=3.1.0",{peerDependencies:{graphql:"^14.0.0 || ^15.0.0"}}],["@playwright/test@<=1.14.1",{dependencies:{"jest-matcher-utils":"^26.4.2"}}],...["babel-plugin-remove-graphql-queries@<3.14.0-next.1","babel-preset-gatsby-package@<1.14.0-next.1","create-gatsby@<1.14.0-next.1","gatsby-admin@<0.24.0-next.1","gatsby-cli@<3.14.0-next.1","gatsby-core-utils@<2.14.0-next.1","gatsby-design-tokens@<3.14.0-next.1","gatsby-legacy-polyfills@<1.14.0-next.1","gatsby-plugin-benchmark-reporting@<1.14.0-next.1","gatsby-plugin-graphql-config@<0.23.0-next.1","gatsby-plugin-image@<1.14.0-next.1","gatsby-plugin-mdx@<2.14.0-next.1","gatsby-plugin-netlify-cms@<5.14.0-next.1","gatsby-plugin-no-sourcemaps@<3.14.0-next.1","gatsby-plugin-page-creator@<3.14.0-next.1","gatsby-plugin-preact@<5.14.0-next.1","gatsby-plugin-preload-fonts@<2.14.0-next.1","gatsby-plugin-schema-snapshot@<2.14.0-next.1","gatsby-plugin-styletron@<6.14.0-next.1","gatsby-plugin-subfont@<3.14.0-next.1","gatsby-plugin-utils@<1.14.0-next.1","gatsby-recipes@<0.25.0-next.1","gatsby-source-shopify@<5.6.0-next.1","gatsby-source-wikipedia@<3.14.0-next.1","gatsby-transformer-screenshot@<3.14.0-next.1","gatsby-worker@<0.5.0-next.1"].map(t=>[t,{dependencies:{"@babel/runtime":"^7.14.8"}}]),["gatsby-core-utils@<2.14.0-next.1",{dependencies:{got:"8.3.2"}}],["gatsby-plugin-gatsby-cloud@<=3.1.0-next.0",{dependencies:{"gatsby-core-utils":"^2.13.0-next.0"}}],["gatsby-plugin-gatsby-cloud@<=3.2.0-next.1",{peerDependencies:{webpack:"*"}}],["babel-plugin-remove-graphql-queries@<=3.14.0-next.1",{dependencies:{"gatsby-core-utils":"^2.8.0-next.1"}}],["gatsby-plugin-netlify@3.13.0-next.1",{dependencies:{"gatsby-core-utils":"^2.13.0-next.0"}}],["clipanion-v3-codemod@<=0.2.0",{peerDependencies:{jscodeshift:"^0.11.0"}}],["react-live@*",{peerDependencies:{"react-dom":"*",react:"*"}}],["webpack@<4.44.1",{peerDependenciesMeta:{"webpack-cli":Me,"webpack-command":Me}}],["webpack@<5.0.0-beta.23",{peerDependenciesMeta:{"webpack-cli":Me}}],["webpack-dev-server@<3.10.2",{peerDependenciesMeta:{"webpack-cli":Me}}]];var pL;function VAe(){return typeof pL=="undefined"&&(pL=require("zlib").brotliDecompressSync(Buffer.from("G7weAByFTVk3Vs7UfHhq4yykgEM7pbW7TI43SG2S5tvGrwHBAzdz+s/npQ6tgEvobvxisrPIadkXeUAJotBn5bDZ5kAhcRqsIHe3F75Walet5hNalwgFDtxb0BiDUjiUQkjG0yW2hto9HPgiCkm316d6bC0kST72YN7D7rfkhCE9x4J0XwB0yavalxpUu2t9xszHrmtwalOxT7VslsxWcB1qpqZwERUra4psWhTV8BgwWeizurec82Caf1ABL11YMfbf8FJ9JBceZOkgmvrQPbC9DUldX/yMbmX06UQluCEjSwUoyO+EZPIjofr+/oAZUck2enraRD+oWLlnlYnj8xB+gwSo9lmmks4fXv574qSqcWA6z21uYkzMu3EWj+K23RxeQlLqiE35/rC8GcS4CGkKHKKq+zAIQwD9iRDNfiAqueLLpicFFrNsAI4zeTD/eO9MHcnRa5m8UT+M2+V+AkFST4BlKneiAQRSdST8KEAIyFlULt6wa9EBd0Ds28VmpaxquJdVt+nwdEs5xUskI13OVtFyY0UrQIRAlCuvvWivvlSKQfTO+2Q8OyUR1W5RvetaPz4jD27hdtwHFFA1Ptx6Ee/t2cY2rg2G46M1pNDRf2pWhvpy8pqMnuI3++4OF3+7OFIWXGjh+o7Nr2jNvbiYcQdQS1h903/jVFgOpA0yJ78z+x759bFA0rq+6aY5qPB4FzS3oYoLupDUhD9nDz6F6H7hpnlMf18KNKDu4IKjTWwrAnY6MFQw1W6ymOALHlFyCZmQhldg1MQHaMVVQTVgDC60TfaBqG++Y8PEoFhN/PBTZT175KNP/BlHDYGOOBmnBdzqJKplZ/ljiVG0ZBzfqeBRrrUkn6rA54462SgiliKoYVnbeptMdXNfAuaupIEi0bApF10TlgHfmEJAPUVidRVFyDupSem5po5vErPqWKhKbUIp0LozpYsIKK57dM/HKr+nguF+7924IIWMICkQ8JUigs9D+W+c4LnNoRtPPKNRUiCYmP+Jfo2lfKCKw8qpraEeWU3uiNRO6zcyKQoXPR5htmzzLznke7b4YbXW3I1lIRzmgG02Udb58U+7TpwyN7XymCgH+wuPDthZVQvRZuEP+SnLtMicz9m5zASWOBiAcLmkuFlTKuHspSIhCBD0yUPKcxu81A+4YD78rA2vtwsUEday9WNyrShyrl60rWmA+SmbYZkQOwFJWArxRYYc5jGhA5ikxYw1rx3ei4NmeX/lKiwpZ9Ln1tV2Ae7sArvxuVLbJjqJRjW1vFXAyHpvLG+8MJ6T2Ubx5M2KDa2SN6vuIGxJ9WQM9Mk3Q7aCNiZONXllhqq24DmoLbQfW2rYWsOgHWjtOmIQMyMKdiHZDjoyIq5+U700nZ6odJAoYXPQBvFNiQ78d5jaXliBqLTJEqUCwi+LiH2mx92EmNKDsJL74Z613+3lf20pxkV1+erOrjj8pW00vsPaahKUM+05ssd5uwM7K482KWEf3TCwlg/o3e5ngto7qSMz7YteIgCsF1UOcsLk7F7MxWbvrPMY473ew0G+noVL8EPbkmEMftMSeL6HFub/zy+2JQ==","base64")).toString()),pL}var dL;function _Ae(){return typeof dL=="undefined"&&(dL=require("zlib").brotliDecompressSync(Buffer.from("G8MSIIzURnVBnObTcvb3XE6v2S9Qgc2K801Oa5otNKEtK8BINZNcaQHy+9/vf/WXBimwutXC33P2DPc64pps5rz7NGGWaOKNSPL4Y2KRE8twut2lFOIN+OXPtRmPMRhMTILib2bEQx43az2I5d3YS8Roa5UZpF/ujHb3Djd3GDvYUfvFYSUQ39vb2cmifp/rgB4J/65JK3wRBTvMBoNBmn3mbXC63/gbBkW/2IRPri0O8bcsRBsmarF328pAln04nyJFkwUAvNu934supAqLtyerZZpJ8I8suJHhf/ocMV+scKwa8NOiDKIPXw6Ex/EEZD6TEGaW8N5zvNHYF10l6Lfooj7D5W2k3dgvQSbp2Wv8TGOayS978gxlOLVjTGXs66ozewbrjwElLtyrYNnWTfzzdEutgROUFPVMhnMoy8EjJLLlWwIEoySxliim9kYW30JUHiPVyjt0iAw/ZpPmCbUCltYPnq6ZNblIKhTNhqS/oqC9iya5sGKZTOVsTEg34n92uZTf2iPpcZih8rPW8CzA+adIGmyCPcKdLMsBLShd+zuEbTrqpwuh+DLmracZcjPC5Sdf5odDAhKpFuOsQS67RT+1VgWWygSv3YwxDnylc04/PYuaMeIzhBkLrvs7e/OUzRTF56MmfY6rI63QtEjEQzq637zQqJ39nNhu3NmoRRhW/086bHGBUtx0PE0j3aEGvkdh9WJC8y8j8mqqke9/dQ5la+Q3ba4RlhvTbnfQhPDDab3tUifkjKuOsp13mXEmO00Mu88F/M67R7LXfoFDFLNtgCSWjWX+3Jn1371pJTK9xPBiMJafvDjtFyAzu8rxeQ0TKMQXNPs5xxiBOd+BRJP8KP88XPtJIbZKh/cdW8KvBUkpqKpGoiIaA32c3/JnQr4efXt85mXvidOvn/eU3Pase1typLYBalJ14mCso9h79nuMOuCa/kZAOkJHmTjP5RM2WNoPasZUAnT1TAE/NH25hUxcQv6hQWR/m1PKk4ooXMcM4SR1iYU3fUohvqk4RY2hbmTVVIXv6TvqO+0doOjgeVFAcom+RlwJQmOVH7pr1Q9LoJT6n1DeQEB+NHygsATbIwTcOKZlJsY8G4+suX1uQLjUWwLjjs0mvSvZcLTpIGAekeR7GCgl8eo3ndAqEe2XCav4huliHjdbIPBsGJuPX7lrO9HX1UbXRH5opOe1x6JsOSgHZR+EaxuXVhpLLxm6jk1LJtZfHSc6BKPun3CpYYVMJGwEUyk8MTGG0XL5MfEwaXpnc9TKnBmlGn6nHiGREc3ysn47XIBDzA+YvFdjZzVIEDcKGpS6PbUJehFRjEne8D0lVU1XuRtlgszq6pTNlQ/3MzNOEgCWPyTct22V2mEi2krizn5VDo9B19/X2DB3hCGRMM7ONbtnAcIx/OWB1u5uPbW1gsH8irXxT/IzG0PoXWYjhbMsH3KTuoOl5o17PulcgvsfTSnKFM354GWI8luqZnrswWjiXy3G+Vbyo1KMopFmmvBwNELgaS8z8dNZchx/Cl/xjddxhMcyqtzFyONb2Zdu90NkI8pAeufe7YlXrp53v8Dj/l8vWeVspRKBGXScBBPI/HinSTGmLDOGGOCIyH0JFdOZx0gWsacNlQLJMIrBhqRxXxHF/5pseWwejlAAvZ3klZSDSYY8mkToaWejXhgNomeGtx1DTLEUFMRkgF5yFB22WYdJnaWN14r1YJj81hGi45+jrADS5nYRhCiSlCJJ1nL8pYX+HDSMhdTEWyRcgHVp/IsUIZYMfT+YYncUQPgcxNGCHfZ88vDdrcUuaGIl6zhAsiaq7R5dfqrqXH/JcBhfjT8D0azayIyEz75Nxp6YkcyDxlJq3EXnJUpqDohJJOysL1t1uNiHESlvsxPb5cpbW0+ICZqJmUZus1BMW0F5IVBODLIo2zHHjA0=","base64")).toString()),dL}var CL;function XAe(){return typeof CL=="undefined"&&(CL=require("zlib").brotliDecompressSync(Buffer.from("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","base64")).toString()),CL}var ZAe=new Map([[S.makeIdent(null,"fsevents").identHash,VAe],[S.makeIdent(null,"resolve").identHash,_Ae],[S.makeIdent(null,"typescript").identHash,XAe]]),b4e={hooks:{registerPackageExtensions:async(t,e)=>{for(let[r,i]of zAe)e(S.parseDescriptor(r,!0),i)},getBuiltinPatch:async(t,e)=>{var s;let r="compat/";if(!e.startsWith(r))return;let i=S.parseIdent(e.slice(r.length)),n=(s=ZAe.get(i.identHash))==null?void 0:s();return typeof n!="undefined"?n:null},reduceDependency:async(t,e,r,i)=>typeof ZAe.get(t.identHash)=="undefined"?t:S.makeDescriptor(t,S.makeRange({protocol:"patch:",source:S.stringifyDescriptor(t),selector:`~builtin`,params:null}))}},v4e=b4e;var IL={};it(IL,{default:()=>x4e});var V0=class extends Be{constructor(){super(...arguments);this.pkg=Y.String("-p,--package",{description:"The package to run the provided command from"});this.quiet=Y.Boolean("-q,--quiet",!1,{description:"Only report critical errors instead of printing the full install logs"});this.command=Y.String();this.args=Y.Proxy()}async execute(){let e=[];this.pkg&&e.push("--package",this.pkg),this.quiet&&e.push("--quiet");let r=S.parseIdent(this.command),i=S.makeIdent(r.scope,`create-${r.name}`);return this.cli.run(["dlx",...e,S.stringifyIdent(i),...this.args])}};V0.paths=[["create"]];var $Ae=V0;var jC=class extends Be{constructor(){super(...arguments);this.packages=Y.Array("-p,--package",{description:"The package(s) to install before running the command"});this.quiet=Y.Boolean("-q,--quiet",!1,{description:"Only report critical errors instead of printing the full install logs"});this.command=Y.String();this.args=Y.Proxy()}async execute(){return fe.telemetry=null,await T.mktempPromise(async e=>{var p;let r=v.join(e,`dlx-${process.pid}`);await T.mkdirPromise(r),await T.writeFilePromise(v.join(r,"package.json"),`{} +`),await T.writeFilePromise(v.join(r,"yarn.lock"),"");let i=v.join(r,".yarnrc.yml"),n=await fe.findProjectCwd(this.context.cwd,wt.lockfile),s=!(await fe.find(this.context.cwd,null,{strict:!1})).get("enableGlobalCache"),o=n!==null?v.join(n,".yarnrc.yml"):null;o!==null&&T.existsSync(o)?(await T.copyFilePromise(o,i),await fe.updateConfiguration(r,d=>{let m=_(P({},d),{enableGlobalCache:s,enableTelemetry:!1});return Array.isArray(d.plugins)&&(m.plugins=d.plugins.map(E=>{let B=typeof E=="string"?E:E.path,b=M.isAbsolute(B)?B:M.resolve(M.fromPortablePath(n),B);return typeof E=="string"?b:{path:b,spec:E.spec}})),m})):await T.writeFilePromise(i,`enableGlobalCache: ${s} +enableTelemetry: false +`);let a=(p=this.packages)!=null?p:[this.command],l=S.parseDescriptor(this.command).name,c=await this.cli.run(["add","--",...a],{cwd:r,quiet:this.quiet});if(c!==0)return c;this.quiet||this.context.stdout.write(` +`);let u=await fe.find(r,this.context.plugins),{project:g,workspace:f}=await Ke.find(u,r);if(f===null)throw new rt(g.cwd,r);await g.restoreInstallState();let h=await Kt.getWorkspaceAccessibleBinaries(f);return h.has(l)===!1&&h.size===1&&typeof this.packages=="undefined"&&(l=Array.from(h)[0][0]),await Kt.executeWorkspaceAccessibleBinary(f,l,this.args,{packageAccessibleBinaries:h,cwd:this.context.cwd,stdin:this.context.stdin,stdout:this.context.stdout,stderr:this.context.stderr})})}};jC.paths=[["dlx"]],jC.usage=ye.Usage({description:"run a package in a temporary environment",details:"\n This command will install a package within a temporary environment, and run its binary script if it contains any. The binary will run within the current cwd.\n\n By default Yarn will download the package named `command`, but this can be changed through the use of the `-p,--package` flag which will instruct Yarn to still run the same command but from a different package.\n\n Using `yarn dlx` as a replacement of `yarn add` isn't recommended, as it makes your project non-deterministic (Yarn doesn't keep track of the packages installed through `dlx` - neither their name, nor their version).\n ",examples:[["Use create-react-app to create a new React app","yarn dlx create-react-app ./my-app"],["Install multiple packages for a single command",`yarn dlx -p typescript -p ts-node ts-node --transpile-only -e "console.log('hello!')"`]]});var ele=jC;var S4e={commands:[$Ae,ele]},x4e=S4e;var xL={};it(xL,{default:()=>D4e,fileUtils:()=>EL});var hf=/^(?:[a-zA-Z]:[\\/]|\.{0,2}\/)/,YC=/^[^?]*\.(?:tar\.gz|tgz)(?:::.*)?$/,Nr="file:";var EL={};it(EL,{makeArchiveFromLocator:()=>_0,makeBufferFromLocator:()=>BL,makeLocator:()=>wL,makeSpec:()=>tle,parseSpec:()=>yL});function yL(t){let{params:e,selector:r}=S.parseRange(t),i=M.toPortablePath(r);return{parentLocator:e&&typeof e.locator=="string"?S.parseLocator(e.locator):null,path:i}}function tle({parentLocator:t,path:e,folderHash:r,protocol:i}){let n=t!==null?{locator:S.stringifyLocator(t)}:{},s=typeof r!="undefined"?{hash:r}:{};return S.makeRange({protocol:i,source:e,selector:e,params:P(P({},s),n)})}function wL(t,{parentLocator:e,path:r,folderHash:i,protocol:n}){return S.makeLocator(t,tle({parentLocator:e,path:r,folderHash:i,protocol:n}))}async function _0(t,{protocol:e,fetchOptions:r,inMemory:i=!1}){let{parentLocator:n,path:s}=S.parseFileStyleRange(t.reference,{protocol:e}),o=v.isAbsolute(s)?{packageFs:new Ft(Se.root),prefixPath:Se.dot,localPath:Se.root}:await r.fetcher.fetch(n,r),a=o.localPath?{packageFs:new Ft(Se.root),prefixPath:v.relative(Se.root,o.localPath)}:o;o!==a&&o.releaseFs&&o.releaseFs();let l=a.packageFs,c=v.join(a.prefixPath,s);return await de.releaseAfterUseAsync(async()=>await Ai.makeArchiveFromDirectory(c,{baseFs:l,prefixPath:S.getIdentVendorPath(t),compressionLevel:r.project.configuration.get("compressionLevel"),inMemory:i}),a.releaseFs)}async function BL(t,{protocol:e,fetchOptions:r}){return(await _0(t,{protocol:e,fetchOptions:r,inMemory:!0})).getBufferAndClose()}var QL=class{supports(e,r){return!!e.reference.startsWith(Nr)}getLocalPath(e,r){let{parentLocator:i,path:n}=S.parseFileStyleRange(e.reference,{protocol:Nr});if(v.isAbsolute(n))return n;let s=r.fetcher.getLocalPath(i,r);return s===null?null:v.resolve(s,n)}async fetch(e,r){let i=r.checksums.get(e.locatorHash)||null,[n,s,o]=await r.cache.fetchPackageFromCache(e,i,P({onHit:()=>r.report.reportCacheHit(e),onMiss:()=>r.report.reportCacheMiss(e,`${S.prettyLocator(r.project.configuration,e)} can't be found in the cache and will be fetched from the disk`),loader:()=>this.fetchFromDisk(e,r),skipIntegrityCheck:r.skipIntegrityCheck},r.cacheOptions));return{packageFs:n,releaseFs:s,prefixPath:S.getIdentVendorPath(e),localPath:this.getLocalPath(e,r),checksum:o}}async fetchFromDisk(e,r){return _0(e,{protocol:Nr,fetchOptions:r})}};var k4e=2,bL=class{supportsDescriptor(e,r){return e.range.match(hf)?!0:!!e.range.startsWith(Nr)}supportsLocator(e,r){return!!e.reference.startsWith(Nr)}shouldPersistResolution(e,r){return!1}bindDescriptor(e,r,i){return hf.test(e.range)&&(e=S.makeDescriptor(e,`${Nr}${e.range}`)),S.bindDescriptor(e,{locator:S.stringifyLocator(r)})}getResolutionDependencies(e,r){return[]}async getCandidates(e,r,i){if(!i.fetchOptions)throw new Error("Assertion failed: This resolver cannot be used unless a fetcher is configured");let{path:n,parentLocator:s}=yL(e.range);if(s===null)throw new Error("Assertion failed: The descriptor should have been bound");let o=await BL(S.makeLocator(e,S.makeRange({protocol:Nr,source:n,selector:n,params:{locator:S.stringifyLocator(s)}})),{protocol:Nr,fetchOptions:i.fetchOptions}),a=mn.makeHash(`${k4e}`,o).slice(0,6);return[wL(e,{parentLocator:s,path:n,folderHash:a,protocol:Nr})]}async getSatisfying(e,r,i){return null}async resolve(e,r){if(!r.fetchOptions)throw new Error("Assertion failed: This resolver cannot be used unless a fetcher is configured");let i=await r.fetchOptions.fetcher.fetch(e,r.fetchOptions),n=await de.releaseAfterUseAsync(async()=>await Ze.find(i.prefixPath,{baseFs:i.packageFs}),i.releaseFs);return _(P({},e),{version:n.version||"0.0.0",languageName:n.languageName||r.project.configuration.get("defaultLanguageName"),linkType:gt.HARD,conditions:n.getConditions(),dependencies:n.dependencies,peerDependencies:n.peerDependencies,dependenciesMeta:n.dependenciesMeta,peerDependenciesMeta:n.peerDependenciesMeta,bin:n.bin})}};var vL=class{supports(e,r){return YC.test(e.reference)?!!e.reference.startsWith(Nr):!1}getLocalPath(e,r){return null}async fetch(e,r){let i=r.checksums.get(e.locatorHash)||null,[n,s,o]=await r.cache.fetchPackageFromCache(e,i,P({onHit:()=>r.report.reportCacheHit(e),onMiss:()=>r.report.reportCacheMiss(e,`${S.prettyLocator(r.project.configuration,e)} can't be found in the cache and will be fetched from the disk`),loader:()=>this.fetchFromDisk(e,r),skipIntegrityCheck:r.skipIntegrityCheck},r.cacheOptions));return{packageFs:n,releaseFs:s,prefixPath:S.getIdentVendorPath(e),checksum:o}}async fetchFromDisk(e,r){let{parentLocator:i,path:n}=S.parseFileStyleRange(e.reference,{protocol:Nr}),s=v.isAbsolute(n)?{packageFs:new Ft(Se.root),prefixPath:Se.dot,localPath:Se.root}:await r.fetcher.fetch(i,r),o=s.localPath?{packageFs:new Ft(Se.root),prefixPath:v.relative(Se.root,s.localPath)}:s;s!==o&&s.releaseFs&&s.releaseFs();let a=o.packageFs,l=v.join(o.prefixPath,n),c=await a.readFilePromise(l);return await de.releaseAfterUseAsync(async()=>await Ai.convertToZip(c,{compressionLevel:r.project.configuration.get("compressionLevel"),prefixPath:S.getIdentVendorPath(e),stripComponents:1}),o.releaseFs)}};var SL=class{supportsDescriptor(e,r){return YC.test(e.range)?!!(e.range.startsWith(Nr)||hf.test(e.range)):!1}supportsLocator(e,r){return YC.test(e.reference)?!!e.reference.startsWith(Nr):!1}shouldPersistResolution(e,r){return!0}bindDescriptor(e,r,i){return hf.test(e.range)&&(e=S.makeDescriptor(e,`${Nr}${e.range}`)),S.bindDescriptor(e,{locator:S.stringifyLocator(r)})}getResolutionDependencies(e,r){return[]}async getCandidates(e,r,i){let n=e.range;return n.startsWith(Nr)&&(n=n.slice(Nr.length)),[S.makeLocator(e,`${Nr}${M.toPortablePath(n)}`)]}async getSatisfying(e,r,i){return null}async resolve(e,r){if(!r.fetchOptions)throw new Error("Assertion failed: This resolver cannot be used unless a fetcher is configured");let i=await r.fetchOptions.fetcher.fetch(e,r.fetchOptions),n=await de.releaseAfterUseAsync(async()=>await Ze.find(i.prefixPath,{baseFs:i.packageFs}),i.releaseFs);return _(P({},e),{version:n.version||"0.0.0",languageName:n.languageName||r.project.configuration.get("defaultLanguageName"),linkType:gt.HARD,conditions:n.getConditions(),dependencies:n.dependencies,peerDependencies:n.peerDependencies,dependenciesMeta:n.dependenciesMeta,peerDependenciesMeta:n.peerDependenciesMeta,bin:n.bin})}};var P4e={fetchers:[vL,QL],resolvers:[SL,bL]},D4e=P4e;var PL={};it(PL,{default:()=>N4e});var rle=ie(require("querystring")),ile=[/^https?:\/\/(?:([^/]+?)@)?github.com\/([^/#]+)\/([^/#]+)\/tarball\/([^/#]+)(?:#(.*))?$/,/^https?:\/\/(?:([^/]+?)@)?github.com\/([^/#]+)\/([^/#]+?)(?:\.git)?(?:#(.*))?$/];function nle(t){return t?ile.some(e=>!!t.match(e)):!1}function sle(t){let e;for(let a of ile)if(e=t.match(a),e)break;if(!e)throw new Error(R4e(t));let[,r,i,n,s="master"]=e,{commit:o}=rle.default.parse(s);return s=o||s.replace(/[^:]*:/,""),{auth:r,username:i,reponame:n,treeish:s}}function R4e(t){return`Input cannot be parsed as a valid GitHub URL ('${t}').`}var kL=class{supports(e,r){return!!nle(e.reference)}getLocalPath(e,r){return null}async fetch(e,r){let i=r.checksums.get(e.locatorHash)||null,[n,s,o]=await r.cache.fetchPackageFromCache(e,i,P({onHit:()=>r.report.reportCacheHit(e),onMiss:()=>r.report.reportCacheMiss(e,`${S.prettyLocator(r.project.configuration,e)} can't be found in the cache and will be fetched from GitHub`),loader:()=>this.fetchFromNetwork(e,r),skipIntegrityCheck:r.skipIntegrityCheck},r.cacheOptions));return{packageFs:n,releaseFs:s,prefixPath:S.getIdentVendorPath(e),checksum:o}}async fetchFromNetwork(e,r){let i=await Zt.get(this.getLocatorUrl(e,r),{configuration:r.project.configuration});return await T.mktempPromise(async n=>{let s=new Ft(n);await Ai.extractArchiveTo(i,s,{stripComponents:1});let o=Uc.splitRepoUrl(e.reference),a=v.join(n,"package.tgz");await Kt.prepareExternalProject(n,a,{configuration:r.project.configuration,report:r.report,workspace:o.extra.workspace,locator:e});let l=await T.readFilePromise(a);return await Ai.convertToZip(l,{compressionLevel:r.project.configuration.get("compressionLevel"),prefixPath:S.getIdentVendorPath(e),stripComponents:1})})}getLocatorUrl(e,r){let{auth:i,username:n,reponame:s,treeish:o}=sle(e.reference);return`https://${i?`${i}@`:""}github.com/${n}/${s}/archive/${o}.tar.gz`}};var F4e={hooks:{async fetchHostedRepository(t,e,r){if(t!==null)return t;let i=new kL;if(!i.supports(e,r))return null;try{return await i.fetch(e,r)}catch(n){return null}}}},N4e=F4e;var FL={};it(FL,{default:()=>T4e});var qC=/^[^?]*\.(?:tar\.gz|tgz)(?:\?.*)?$/,JC=/^https?:/;var DL=class{supports(e,r){return qC.test(e.reference)?!!JC.test(e.reference):!1}getLocalPath(e,r){return null}async fetch(e,r){let i=r.checksums.get(e.locatorHash)||null,[n,s,o]=await r.cache.fetchPackageFromCache(e,i,P({onHit:()=>r.report.reportCacheHit(e),onMiss:()=>r.report.reportCacheMiss(e,`${S.prettyLocator(r.project.configuration,e)} can't be found in the cache and will be fetched from the remote server`),loader:()=>this.fetchFromNetwork(e,r),skipIntegrityCheck:r.skipIntegrityCheck},r.cacheOptions));return{packageFs:n,releaseFs:s,prefixPath:S.getIdentVendorPath(e),checksum:o}}async fetchFromNetwork(e,r){let i=await Zt.get(e.reference,{configuration:r.project.configuration});return await Ai.convertToZip(i,{compressionLevel:r.project.configuration.get("compressionLevel"),prefixPath:S.getIdentVendorPath(e),stripComponents:1})}};var RL=class{supportsDescriptor(e,r){return qC.test(e.range)?!!JC.test(e.range):!1}supportsLocator(e,r){return qC.test(e.reference)?!!JC.test(e.reference):!1}shouldPersistResolution(e,r){return!0}bindDescriptor(e,r,i){return e}getResolutionDependencies(e,r){return[]}async getCandidates(e,r,i){return[S.convertDescriptorToLocator(e)]}async getSatisfying(e,r,i){return null}async resolve(e,r){if(!r.fetchOptions)throw new Error("Assertion failed: This resolver cannot be used unless a fetcher is configured");let i=await r.fetchOptions.fetcher.fetch(e,r.fetchOptions),n=await de.releaseAfterUseAsync(async()=>await Ze.find(i.prefixPath,{baseFs:i.packageFs}),i.releaseFs);return _(P({},e),{version:n.version||"0.0.0",languageName:n.languageName||r.project.configuration.get("defaultLanguageName"),linkType:gt.HARD,conditions:n.getConditions(),dependencies:n.dependencies,peerDependencies:n.peerDependencies,dependenciesMeta:n.dependenciesMeta,peerDependenciesMeta:n.peerDependenciesMeta,bin:n.bin})}};var L4e={fetchers:[DL],resolvers:[RL]},T4e=L4e;var ML={};it(ML,{default:()=>M5e});var Rle=ie(Dle()),TL=ie(require("util")),WC=class extends Be{constructor(){super(...arguments);this.private=Y.Boolean("-p,--private",!1,{description:"Initialize a private package"});this.workspace=Y.Boolean("-w,--workspace",!1,{description:"Initialize a workspace root with a `packages/` directory"});this.install=Y.String("-i,--install",!1,{tolerateBoolean:!0,description:"Initialize a package with a specific bundle that will be locked in the project"});this.usev2=Y.Boolean("-2",!1,{hidden:!0});this.yes=Y.Boolean("-y,--yes",{hidden:!0});this.assumeFreshProject=Y.Boolean("--assume-fresh-project",!1,{hidden:!0})}async execute(){let e=await fe.find(this.context.cwd,this.context.plugins),r=typeof this.install=="string"?this.install:this.usev2||this.install===!0?"latest":null;return r!==null?await this.executeProxy(e,r):await this.executeRegular(e)}async executeProxy(e,r){if(e.projectCwd!==null&&e.projectCwd!==this.context.cwd)throw new me("Cannot use the --install flag from within a project subdirectory");T.existsSync(this.context.cwd)||await T.mkdirPromise(this.context.cwd,{recursive:!0});let i=v.join(this.context.cwd,e.get("lockfileFilename"));T.existsSync(i)||await T.writeFilePromise(i,"");let n=await this.cli.run(["set","version",r],{quiet:!0});if(n!==0)return n;let s=[];return this.private&&s.push("-p"),this.workspace&&s.push("-w"),this.yes&&s.push("-y"),await T.mktempPromise(async o=>{let{code:a}=await hr.pipevp("yarn",["init",...s],{cwd:this.context.cwd,stdin:this.context.stdin,stdout:this.context.stdout,stderr:this.context.stderr,env:await Kt.makeScriptEnv({binFolder:o})});return a})}async executeRegular(e){var l;let r=null;try{r=(await Ke.find(e,this.context.cwd)).project}catch{r=null}T.existsSync(this.context.cwd)||await T.mkdirPromise(this.context.cwd,{recursive:!0});let i=await Ze.tryFind(this.context.cwd)||new Ze,n=Object.fromEntries(e.get("initFields").entries());i.load(n),i.name=(l=i.name)!=null?l:S.makeIdent(e.get("initScope"),v.basename(this.context.cwd)),i.packageManager=Zr&&de.isTaggedYarnVersion(Zr)?`yarn@${Zr}`:null,typeof i.raw.private=="undefined"&&(this.private||this.workspace&&i.workspaceDefinitions.length===0)&&(i.private=!0),this.workspace&&i.workspaceDefinitions.length===0&&(await T.mkdirPromise(v.join(this.context.cwd,"packages"),{recursive:!0}),i.workspaceDefinitions=[{pattern:"packages/*"}]);let s={};i.exportTo(s),TL.inspect.styles.name="cyan",this.context.stdout.write(`${(0,TL.inspect)(s,{depth:Infinity,colors:!0,compact:!1})} +`);let o=v.join(this.context.cwd,Ze.fileName);await T.changeFilePromise(o,`${JSON.stringify(s,null,2)} +`,{automaticNewlines:!0});let a=v.join(this.context.cwd,"README.md");if(T.existsSync(a)||await T.writeFilePromise(a,`# ${S.stringifyIdent(i.name)} +`),!r||r.cwd===this.context.cwd){let c=v.join(this.context.cwd,wt.lockfile);T.existsSync(c)||await T.writeFilePromise(c,"");let g=["/.yarn/*","!/.yarn/patches","!/.yarn/plugins","!/.yarn/releases","!/.yarn/sdks","","# Swap the comments on the following lines if you don't wish to use zero-installs","# Documentation here: https://yarnpkg.com/features/zero-installs","!/.yarn/cache","#/.pnp.*"].map(m=>`${m} +`).join(""),f=v.join(this.context.cwd,".gitignore");T.existsSync(f)||await T.writeFilePromise(f,g);let h={["*"]:{endOfLine:"lf",insertFinalNewline:!0},["*.{js,json,yml}"]:{charset:"utf-8",indentStyle:"space",indentSize:2}};(0,Rle.default)(h,e.get("initEditorConfig"));let p=`root = true +`;for(let[m,E]of Object.entries(h)){p+=` +[${m}] +`;for(let[B,b]of Object.entries(E))p+=`${B.replace(/[A-Z]/g,H=>`_${H.toLowerCase()}`)} = ${b} +`}let d=v.join(this.context.cwd,".editorconfig");T.existsSync(d)||await T.writeFilePromise(d,p),T.existsSync(v.join(this.context.cwd,".git"))||await hr.execvp("git",["init"],{cwd:this.context.cwd})}}};WC.paths=[["init"]],WC.usage=ye.Usage({description:"create a new package",details:"\n This command will setup a new package in your local directory.\n\n If the `-p,--private` or `-w,--workspace` options are set, the package will be private by default.\n\n If the `-w,--workspace` option is set, the package will be configured to accept a set of workspaces in the `packages/` directory.\n\n If the `-i,--install` option is given a value, Yarn will first download it using `yarn set version` and only then forward the init call to the newly downloaded bundle. Without arguments, the downloaded bundle will be `latest`.\n\n The initial settings of the manifest can be changed by using the `initScope` and `initFields` configuration values. Additionally, Yarn will generate an EditorConfig file whose rules can be altered via `initEditorConfig`, and will initialize a Git repository in the current directory.\n ",examples:[["Create a new package in the local directory","yarn init"],["Create a new private package in the local directory","yarn init -p"],["Create a new package and store the Yarn release inside","yarn init -i=latest"],["Create a new private package and defines it as a workspace root","yarn init -w"]]});var Fle=WC;var T5e={configuration:{initScope:{description:"Scope used when creating packages via the init command",type:ge.STRING,default:null},initFields:{description:"Additional fields to set when creating packages via the init command",type:ge.MAP,valueDefinition:{description:"",type:ge.ANY}},initEditorConfig:{description:"Extra rules to define in the generator editorconfig",type:ge.MAP,valueDefinition:{description:"",type:ge.ANY}}},commands:[Fle]},M5e=T5e;var GL={};it(GL,{default:()=>K5e});var Ua="portal:",Ha="link:";var OL=class{supports(e,r){return!!e.reference.startsWith(Ua)}getLocalPath(e,r){let{parentLocator:i,path:n}=S.parseFileStyleRange(e.reference,{protocol:Ua});if(v.isAbsolute(n))return n;let s=r.fetcher.getLocalPath(i,r);return s===null?null:v.resolve(s,n)}async fetch(e,r){var c;let{parentLocator:i,path:n}=S.parseFileStyleRange(e.reference,{protocol:Ua}),s=v.isAbsolute(n)?{packageFs:new Ft(Se.root),prefixPath:Se.dot,localPath:Se.root}:await r.fetcher.fetch(i,r),o=s.localPath?{packageFs:new Ft(Se.root),prefixPath:v.relative(Se.root,s.localPath),localPath:Se.root}:s;s!==o&&s.releaseFs&&s.releaseFs();let a=o.packageFs,l=v.resolve((c=o.localPath)!=null?c:o.packageFs.getRealPath(),o.prefixPath,n);return s.localPath?{packageFs:new Ft(l,{baseFs:a}),releaseFs:o.releaseFs,prefixPath:Se.dot,localPath:l}:{packageFs:new Zo(l,{baseFs:a}),releaseFs:o.releaseFs,prefixPath:Se.dot}}};var KL=class{supportsDescriptor(e,r){return!!e.range.startsWith(Ua)}supportsLocator(e,r){return!!e.reference.startsWith(Ua)}shouldPersistResolution(e,r){return!1}bindDescriptor(e,r,i){return S.bindDescriptor(e,{locator:S.stringifyLocator(r)})}getResolutionDependencies(e,r){return[]}async getCandidates(e,r,i){let n=e.range.slice(Ua.length);return[S.makeLocator(e,`${Ua}${M.toPortablePath(n)}`)]}async getSatisfying(e,r,i){return null}async resolve(e,r){if(!r.fetchOptions)throw new Error("Assertion failed: This resolver cannot be used unless a fetcher is configured");let i=await r.fetchOptions.fetcher.fetch(e,r.fetchOptions),n=await de.releaseAfterUseAsync(async()=>await Ze.find(i.prefixPath,{baseFs:i.packageFs}),i.releaseFs);return _(P({},e),{version:n.version||"0.0.0",languageName:n.languageName||r.project.configuration.get("defaultLanguageName"),linkType:gt.SOFT,conditions:n.getConditions(),dependencies:new Map([...n.dependencies]),peerDependencies:n.peerDependencies,dependenciesMeta:n.dependenciesMeta,peerDependenciesMeta:n.peerDependenciesMeta,bin:n.bin})}};var UL=class{supports(e,r){return!!e.reference.startsWith(Ha)}getLocalPath(e,r){let{parentLocator:i,path:n}=S.parseFileStyleRange(e.reference,{protocol:Ha});if(v.isAbsolute(n))return n;let s=r.fetcher.getLocalPath(i,r);return s===null?null:v.resolve(s,n)}async fetch(e,r){var c;let{parentLocator:i,path:n}=S.parseFileStyleRange(e.reference,{protocol:Ha}),s=v.isAbsolute(n)?{packageFs:new Ft(Se.root),prefixPath:Se.dot,localPath:Se.root}:await r.fetcher.fetch(i,r),o=s.localPath?{packageFs:new Ft(Se.root),prefixPath:v.relative(Se.root,s.localPath),localPath:Se.root}:s;s!==o&&s.releaseFs&&s.releaseFs();let a=o.packageFs,l=v.resolve((c=o.localPath)!=null?c:o.packageFs.getRealPath(),o.prefixPath,n);return s.localPath?{packageFs:new Ft(l,{baseFs:a}),releaseFs:o.releaseFs,prefixPath:Se.dot,discardFromLookup:!0,localPath:l}:{packageFs:new Zo(l,{baseFs:a}),releaseFs:o.releaseFs,prefixPath:Se.dot,discardFromLookup:!0}}};var HL=class{supportsDescriptor(e,r){return!!e.range.startsWith(Ha)}supportsLocator(e,r){return!!e.reference.startsWith(Ha)}shouldPersistResolution(e,r){return!1}bindDescriptor(e,r,i){return S.bindDescriptor(e,{locator:S.stringifyLocator(r)})}getResolutionDependencies(e,r){return[]}async getCandidates(e,r,i){let n=e.range.slice(Ha.length);return[S.makeLocator(e,`${Ha}${M.toPortablePath(n)}`)]}async getSatisfying(e,r,i){return null}async resolve(e,r){return _(P({},e),{version:"0.0.0",languageName:r.project.configuration.get("defaultLanguageName"),linkType:gt.SOFT,conditions:null,dependencies:new Map,peerDependencies:new Map,dependenciesMeta:new Map,peerDependenciesMeta:new Map,bin:new Map})}};var O5e={fetchers:[UL,OL],resolvers:[HL,KL]},K5e=O5e;var mT={};it(mT,{default:()=>Y6e});var Ga;(function(i){i[i.YES=0]="YES",i[i.NO=1]="NO",i[i.DEPENDS=2]="DEPENDS"})(Ga||(Ga={}));var jL=(t,e)=>`${t}@${e}`,Nle=(t,e)=>{let r=e.indexOf("#"),i=r>=0?e.substring(r+1):e;return jL(t,i)},qs;(function(s){s[s.NONE=-1]="NONE",s[s.PERF=0]="PERF",s[s.CHECK=1]="CHECK",s[s.REASONS=2]="REASONS",s[s.INTENSIVE_CHECK=9]="INTENSIVE_CHECK"})(qs||(qs={}));var Tle=(t,e={})=>{let r=e.debugLevel||Number(process.env.NM_DEBUG_LEVEL||-1),i=e.check||r>=9,n=e.hoistingLimits||new Map,s={check:i,debugLevel:r,hoistingLimits:n,fastLookupPossible:!0},o;s.debugLevel>=0&&(o=Date.now());let a=U5e(t,s),l=!1,c=0;do l=YL(a,[a],new Set([a.locator]),new Map,s).anotherRoundNeeded,s.fastLookupPossible=!1,c++;while(l);if(s.debugLevel>=0&&console.log(`hoist time: ${Date.now()-o}ms, rounds: ${c}`),s.debugLevel>=1){let u=zC(a);if(YL(a,[a],new Set([a.locator]),new Map,s).isGraphChanged)throw new Error(`The hoisting result is not terminal, prev tree: +${u}, next tree: +${zC(a)}`);let f=Lle(a);if(f)throw new Error(`${f}, after hoisting finished: +${zC(a)}`)}return s.debugLevel>=2&&console.log(zC(a)),H5e(a)},G5e=t=>{let e=t[t.length-1],r=new Map,i=new Set,n=s=>{if(!i.has(s)){i.add(s);for(let o of s.hoistedDependencies.values())r.set(o.name,o);for(let o of s.dependencies.values())s.peerNames.has(o.name)||n(o)}};return n(e),r},j5e=t=>{let e=t[t.length-1],r=new Map,i=new Set,n=new Set,s=(o,a)=>{if(i.has(o))return;i.add(o);for(let c of o.hoistedDependencies.values())if(!a.has(c.name)){let u;for(let g of t)u=g.dependencies.get(c.name),u&&r.set(u.name,u)}let l=new Set;for(let c of o.dependencies.values())l.add(c.name);for(let c of o.dependencies.values())o.peerNames.has(c.name)||s(c,l)};return s(e,n),r},Mle=(t,e)=>{if(e.decoupled)return e;let{name:r,references:i,ident:n,locator:s,dependencies:o,originalDependencies:a,hoistedDependencies:l,peerNames:c,reasons:u,isHoistBorder:g,hoistPriority:f,isWorkspace:h,hoistedFrom:p,hoistedTo:d}=e,m={name:r,references:new Set(i),ident:n,locator:s,dependencies:new Map(o),originalDependencies:new Map(a),hoistedDependencies:new Map(l),peerNames:new Set(c),reasons:new Map(u),decoupled:!0,isHoistBorder:g,hoistPriority:f,isWorkspace:h,hoistedFrom:new Map(p),hoistedTo:new Map(d)},E=m.dependencies.get(r);return E&&E.ident==m.ident&&m.dependencies.set(r,m),t.dependencies.set(m.name,m),m},Y5e=(t,e)=>{let r=new Map([[t.name,[t.ident]]]);for(let n of t.dependencies.values())t.peerNames.has(n.name)||r.set(n.name,[n.ident]);let i=Array.from(e.keys());i.sort((n,s)=>{let o=e.get(n),a=e.get(s);return a.hoistPriority!==o.hoistPriority?a.hoistPriority-o.hoistPriority:a.peerDependents.size!==o.peerDependents.size?a.peerDependents.size-o.peerDependents.size:a.dependents.size-o.dependents.size});for(let n of i){let s=n.substring(0,n.indexOf("@",1)),o=n.substring(s.length+1);if(!t.peerNames.has(s)){let a=r.get(s);a||(a=[],r.set(s,a)),a.indexOf(o)<0&&a.push(o)}}return r},qL=t=>{let e=new Set,r=(i,n=new Set)=>{if(!n.has(i)){n.add(i);for(let s of i.peerNames)if(!t.peerNames.has(s)){let o=t.dependencies.get(s);o&&!e.has(o)&&r(o,n)}e.add(i)}};for(let i of t.dependencies.values())t.peerNames.has(i.name)||r(i);return e},YL=(t,e,r,i,n,s=new Set)=>{let o=e[e.length-1];if(s.has(o))return{anotherRoundNeeded:!1,isGraphChanged:!1};s.add(o);let a=J5e(o),l=Y5e(o,a),c=t==o?new Map:n.fastLookupPossible?G5e(e):j5e(e),u,g=!1,f=!1,h=new Map(Array.from(l.entries()).map(([d,m])=>[d,m[0]])),p=new Map;do{let d=q5e(t,e,r,c,h,l,i,p,n);d.isGraphChanged&&(f=!0),d.anotherRoundNeeded&&(g=!0),u=!1;for(let[m,E]of l)E.length>1&&!o.dependencies.has(m)&&(h.delete(m),E.shift(),h.set(m,E[0]),u=!0)}while(u);for(let d of o.dependencies.values())if(!o.peerNames.has(d.name)&&!r.has(d.locator)){r.add(d.locator);let m=YL(t,[...e,d],r,p,n);m.isGraphChanged&&(f=!0),m.anotherRoundNeeded&&(g=!0),r.delete(d.locator)}return{anotherRoundNeeded:g,isGraphChanged:f}},W5e=(t,e,r,i,n,s,o,a,{outputReason:l,fastLookupPossible:c})=>{let u,g=null,f=new Set;l&&(u=`${Array.from(e).map(m=>wi(m)).join("\u2192")}`);let h=r[r.length-1],d=!(i.ident===h.ident);if(l&&!d&&(g="- self-reference"),d&&(d=!i.isWorkspace,l&&!d&&(g="- workspace")),d&&(d=!h.isWorkspace||h.hoistedFrom.has(i.name)||e.size===1,l&&!d&&(g=h.reasons.get(i.name))),d&&(d=!t.peerNames.has(i.name),l&&!d&&(g=`- cannot shadow peer: ${wi(t.originalDependencies.get(i.name).locator)} at ${u}`)),d){let m=!1,E=n.get(i.name);if(m=!E||E.ident===i.ident,l&&!m&&(g=`- filled by: ${wi(E.locator)} at ${u}`),m)for(let B=r.length-1;B>=1;B--){let R=r[B].dependencies.get(i.name);if(R&&R.ident!==i.ident){m=!1;let H=a.get(h);H||(H=new Set,a.set(h,H)),H.add(i.name),l&&(g=`- filled by ${wi(R.locator)} at ${r.slice(0,B).map(L=>wi(L.locator)).join("\u2192")}`);break}}d=m}if(d&&(d=s.get(i.name)===i.ident,l&&!d&&(g=`- filled by: ${wi(o.get(i.name)[0])} at ${u}`)),d){let m=!0,E=new Set(i.peerNames);for(let B=r.length-1;B>=1;B--){let b=r[B];for(let R of E){if(b.peerNames.has(R)&&b.originalDependencies.has(R))continue;let H=b.dependencies.get(R);H&&t.dependencies.get(R)!==H&&(B===r.length-1?f.add(H):(f=null,m=!1,l&&(g=`- peer dependency ${wi(H.locator)} from parent ${wi(b.locator)} was not hoisted to ${u}`))),E.delete(R)}if(!m)break}d=m}if(d&&!c)for(let m of i.hoistedDependencies.values()){let E=n.get(m.name);if(!E||m.ident!==E.ident){d=!1,l&&(g=`- previously hoisted dependency mismatch, needed: ${wi(m.locator)}, available: ${wi(E==null?void 0:E.locator)}`);break}}return f!==null&&f.size>0?{isHoistable:2,dependsOn:f,reason:g}:{isHoistable:d?0:1,reason:g}},q5e=(t,e,r,i,n,s,o,a,l)=>{let c=e[e.length-1],u=new Set,g=!1,f=!1,h=(m,E,B,b)=>{if(u.has(B))return;let R=[...E,B.locator],H=new Map,L=new Map;for(let q of qL(B)){let A=W5e(c,r,[c,...m,B],q,i,n,s,a,{outputReason:l.debugLevel>=2,fastLookupPossible:l.fastLookupPossible});if(L.set(q,A),A.isHoistable===2)for(let V of A.dependsOn){let W=H.get(V.name)||new Set;W.add(q.name),H.set(V.name,W)}}let K=new Set,J=(q,A,V)=>{if(!K.has(q)){K.add(q),L.set(q,{isHoistable:1,reason:V});for(let W of H.get(q.name)||[])J(B.dependencies.get(W),A,l.debugLevel>=2?`- peer dependency ${wi(q.locator)} from parent ${wi(B.locator)} was not hoisted`:"")}};for(let[q,A]of L)A.isHoistable===1&&J(q,A,A.reason);for(let q of L.keys())if(!K.has(q)){f=!0;let A=o.get(B);A&&A.has(q.name)&&(g=!0),B.dependencies.delete(q.name),B.hoistedDependencies.set(q.name,q),B.reasons.delete(q.name);let V=c.dependencies.get(q.name);if(l.debugLevel>=2){let W=Array.from(E).concat([B.locator]).map(F=>wi(F)).join("\u2192"),X=c.hoistedFrom.get(q.name);X||(X=[],c.hoistedFrom.set(q.name,X)),X.push(W),B.hoistedTo.set(q.name,Array.from(e).map(F=>wi(F.locator)).join("\u2192"))}if(!V)c.ident!==q.ident&&(c.dependencies.set(q.name,q),b.add(q));else for(let W of q.references)V.references.add(W)}if(l.check){let q=Lle(t);if(q)throw new Error(`${q}, after hoisting dependencies of ${[c,...m,B].map(A=>wi(A.locator)).join("\u2192")}: +${zC(t)}`)}let ne=qL(B);for(let q of ne)if(K.has(q)){let A=L.get(q);if((n.get(q.name)===q.ident||!B.reasons.has(q.name))&&A.isHoistable!==0&&B.reasons.set(q.name,A.reason),!q.isHoistBorder&&R.indexOf(q.locator)<0){u.add(B);let W=Mle(B,q);h([...m,B],[...E,B.locator],W,d),u.delete(B)}}},p,d=new Set(qL(c));do{p=d,d=new Set;for(let m of p){if(m.locator===c.locator||m.isHoistBorder)continue;let E=Mle(c,m);h([],Array.from(r),E,d)}}while(d.size>0);return{anotherRoundNeeded:g,isGraphChanged:f}},Lle=t=>{let e=[],r=new Set,i=new Set,n=(s,o,a)=>{if(r.has(s)||(r.add(s),i.has(s)))return;let l=new Map(o);for(let c of s.dependencies.values())s.peerNames.has(c.name)||l.set(c.name,c);for(let c of s.originalDependencies.values()){let u=l.get(c.name),g=()=>`${Array.from(i).concat([s]).map(f=>wi(f.locator)).join("\u2192")}`;if(s.peerNames.has(c.name)){let f=o.get(c.name);(f!==u||!f||f.ident!==c.ident)&&e.push(`${g()} - broken peer promise: expected ${c.ident} but found ${f&&f.ident}`)}else{let f=a.hoistedFrom.get(s.name),h=s.hoistedTo.get(c.name),p=`${f?` hoisted from ${f.join(", ")}`:""}`,d=`${h?` hoisted to ${h}`:""}`,m=`${g()}${p}`;u?u.ident!==c.ident&&e.push(`${m} - broken require promise for ${c.name}${d}: expected ${c.ident}, but found: ${u.ident}`):e.push(`${m} - broken require promise: no required dependency ${c.name}${d} found`)}}i.add(s);for(let c of s.dependencies.values())s.peerNames.has(c.name)||n(c,l,s);i.delete(s)};return n(t,t.dependencies,t),e.join(` +`)},U5e=(t,e)=>{let{identName:r,name:i,reference:n,peerNames:s}=t,o={name:i,references:new Set([n]),locator:jL(r,n),ident:Nle(r,n),dependencies:new Map,originalDependencies:new Map,hoistedDependencies:new Map,peerNames:new Set(s),reasons:new Map,decoupled:!0,isHoistBorder:!0,hoistPriority:0,isWorkspace:!0,hoistedFrom:new Map,hoistedTo:new Map},a=new Map([[t,o]]),l=(c,u)=>{let g=a.get(c),f=!!g;if(!g){let{name:h,identName:p,reference:d,peerNames:m,hoistPriority:E,isWorkspace:B}=c,b=e.hoistingLimits.get(u.locator);g={name:h,references:new Set([d]),locator:jL(p,d),ident:Nle(p,d),dependencies:new Map,originalDependencies:new Map,hoistedDependencies:new Map,peerNames:new Set(m),reasons:new Map,decoupled:!0,isHoistBorder:b?b.has(h):!1,hoistPriority:E||0,isWorkspace:B||!1,hoistedFrom:new Map,hoistedTo:new Map},a.set(c,g)}if(u.dependencies.set(c.name,g),u.originalDependencies.set(c.name,g),f){let h=new Set,p=d=>{if(!h.has(d)){h.add(d),d.decoupled=!1;for(let m of d.dependencies.values())d.peerNames.has(m.name)||p(m)}};p(g)}else for(let h of c.dependencies)l(h,g)};for(let c of t.dependencies)l(c,o);return o},JL=t=>t.substring(0,t.indexOf("@",1)),H5e=t=>{let e={name:t.name,identName:JL(t.locator),references:new Set(t.references),dependencies:new Set},r=new Set([t]),i=(n,s,o)=>{let a=r.has(n),l;if(s===n)l=o;else{let{name:c,references:u,locator:g}=n;l={name:c,identName:JL(g),references:u,dependencies:new Set}}if(o.dependencies.add(l),!a){r.add(n);for(let c of n.dependencies.values())n.peerNames.has(c.name)||i(c,n,l);r.delete(n)}};for(let n of t.dependencies.values())i(n,t,e);return e},J5e=t=>{let e=new Map,r=new Set([t]),i=o=>`${o.name}@${o.ident}`,n=o=>{let a=i(o),l=e.get(a);return l||(l={dependents:new Set,peerDependents:new Set,hoistPriority:0},e.set(a,l)),l},s=(o,a)=>{let l=!!r.has(a);if(n(a).dependents.add(o.ident),!l){r.add(a);for(let u of a.dependencies.values()){let g=n(u);g.hoistPriority=Math.max(g.hoistPriority,u.hoistPriority),a.peerNames.has(u.name)?g.peerDependents.add(a.ident):s(a,u)}}};for(let o of t.dependencies.values())t.peerNames.has(o.name)||s(t,o);return e},wi=t=>{if(!t)return"none";let e=t.indexOf("@",1),r=t.substring(0,e);r.endsWith("$wsroot$")&&(r=`wh:${r.replace("$wsroot$","")}`);let i=t.substring(e+1);if(i==="workspace:.")return".";if(i){let n=(i.indexOf("#")>0?i.split("#")[1]:i).replace("npm:","");return i.startsWith("virtual")&&(r=`v:${r}`),n.startsWith("workspace")&&(r=`w:${r}`,n=""),`${r}${n?`@${n}`:""}`}else return`${r}`},Ole=5e4,zC=t=>{let e=0,r=(n,s,o="")=>{if(e>Ole||s.has(n))return"";e++;let a=Array.from(n.dependencies.values()).sort((c,u)=>c.name.localeCompare(u.name)),l="";s.add(n);for(let c=0;c":"")+(f!==u.name?`a:${u.name}:`:"")+wi(u.locator)+(g?` ${g}`:"")+(u!==n&&h.length>0?`, hoisted from: ${h.join(", ")}`:"")} +`,l+=r(u,s,`${o}${cOle?` +Tree is too large, part of the tree has been dunped +`:"")};var Js;(function(r){r.HARD="HARD",r.SOFT="SOFT"})(Js||(Js={}));var Sn;(function(i){i.WORKSPACES="workspaces",i.DEPENDENCIES="dependencies",i.NONE="none"})(Sn||(Sn={}));var Kle="node_modules",Hc="$wsroot$";var VC=(t,e)=>{let{packageTree:r,hoistingLimits:i,errors:n,preserveSymlinksRequired:s}=z5e(t,e),o=null;if(n.length===0){let a=Tle(r,{hoistingLimits:i});o=V5e(t,a,e)}return{tree:o,errors:n,preserveSymlinksRequired:s}},ms=t=>`${t.name}@${t.reference}`,WL=t=>{let e=new Map;for(let[r,i]of t.entries())if(!i.dirList){let n=e.get(i.locator);n||(n={target:i.target,linkType:i.linkType,locations:[],aliases:i.aliases},e.set(i.locator,n)),n.locations.push(r)}for(let r of e.values())r.locations=r.locations.sort((i,n)=>{let s=i.split(v.delimiter).length,o=n.split(v.delimiter).length;return s!==o?o-s:n.localeCompare(i)});return e},Ule=(t,e)=>{let r=S.isVirtualLocator(t)?S.devirtualizeLocator(t):t,i=S.isVirtualLocator(e)?S.devirtualizeLocator(e):e;return S.areLocatorsEqual(r,i)},zL=(t,e,r,i)=>{if(t.linkType!==Js.SOFT)return!1;let n=M.toPortablePath(r.resolveVirtual&&e.reference&&e.reference.startsWith("virtual:")?r.resolveVirtual(t.packageLocation):t.packageLocation);return v.contains(i,n)===null},_5e=t=>{let e=t.getPackageInformation(t.topLevel);if(e===null)throw new Error("Assertion failed: Expected the top-level package to have been registered");if(t.findPackageLocator(e.packageLocation)===null)throw new Error("Assertion failed: Expected the top-level package to have a physical locator");let i=M.toPortablePath(e.packageLocation.slice(0,-1)),n=new Map,s={children:new Map},o=t.getDependencyTreeRoots(),a=new Map,l=new Set,c=(f,h)=>{let p=ms(f);if(l.has(p))return;l.add(p);let d=t.getPackageInformation(f);if(d){let m=h?ms(h):"";if(ms(f)!==m&&d.linkType===Js.SOFT&&!zL(d,f,t,i)){let E=Hle(d,f,t);(!a.get(E)||f.reference.startsWith("workspace:"))&&a.set(E,f)}for(let[E,B]of d.packageDependencies)B!==null&&(d.packagePeers.has(E)||c(t.getLocator(E,B),f))}};for(let f of o)c(f,null);let u=i.split(v.sep);for(let f of a.values()){let h=t.getPackageInformation(f),d=M.toPortablePath(h.packageLocation.slice(0,-1)).split(v.sep).slice(u.length),m=s;for(let E of d){let B=m.children.get(E);B||(B={children:new Map},m.children.set(E,B)),m=B}m.workspaceLocator=f}let g=(f,h)=>{if(f.workspaceLocator){let p=ms(h),d=n.get(p);d||(d=new Set,n.set(p,d)),d.add(f.workspaceLocator)}for(let p of f.children.values())g(p,f.workspaceLocator||h)};for(let f of s.children.values())g(f,s.workspaceLocator);return n},z5e=(t,e)=>{let r=[],i=!1,n=new Map,s=_5e(t),o=t.getPackageInformation(t.topLevel);if(o===null)throw new Error("Assertion failed: Expected the top-level package to have been registered");let a=t.findPackageLocator(o.packageLocation);if(a===null)throw new Error("Assertion failed: Expected the top-level package to have a physical locator");let l=M.toPortablePath(o.packageLocation.slice(0,-1)),c={name:a.name,identName:a.name,reference:a.reference,peerNames:o.packagePeers,dependencies:new Set,isWorkspace:!0},u=new Map,g=(h,p)=>`${ms(p)}:${h}`,f=(h,p,d,m,E,B,b,R)=>{var X,F;let H=g(h,d),L=u.get(H),K=!!L;!K&&d.name===a.name&&d.reference===a.reference&&(L=c,u.set(H,c));let J=zL(p,d,t,l);if(!L){let D=p.linkType===Js.SOFT&&d.name.endsWith(Hc);L={name:h,identName:d.name,reference:d.reference,dependencies:new Set,peerNames:D?new Set:p.packagePeers,isWorkspace:D},u.set(H,L)}let ne;if(J?ne=2:E.linkType===Js.SOFT?ne=1:ne=0,L.hoistPriority=Math.max(L.hoistPriority||0,ne),R&&!J){let D=ms({name:m.identName,reference:m.reference}),he=n.get(D)||new Set;n.set(D,he),he.add(L.name)}let q=new Map(p.packageDependencies);if(e.project){let D=e.project.workspacesByCwd.get(M.toPortablePath(p.packageLocation.slice(0,-1)));if(D){let he=new Set([...Array.from(D.manifest.peerDependencies.values(),pe=>S.stringifyIdent(pe)),...Array.from(D.manifest.peerDependenciesMeta.keys())]);for(let pe of he)q.has(pe)||(q.set(pe,B.get(pe)||null),L.peerNames.add(pe))}}let A=ms({name:d.name.replace(Hc,""),reference:d.reference}),V=s.get(A);if(V)for(let D of V)q.set(`${D.name}${Hc}`,D.reference);(p!==E||p.linkType!==Js.SOFT||!e.selfReferencesByCwd||e.selfReferencesByCwd.get(b))&&m.dependencies.add(L);let W=d!==a&&p.linkType===Js.SOFT&&!d.name.endsWith(Hc)&&!J;if(!K&&!W){let D=new Map;for(let[he,pe]of q)if(pe!==null){let Ne=t.getLocator(he,pe),Pe=t.getLocator(he.replace(Hc,""),pe),qe=t.getPackageInformation(Pe);if(qe===null)throw new Error("Assertion failed: Expected the package to have been registered");let re=zL(qe,Ne,t,l);if(e.validateExternalSoftLinks&&e.project&&re){qe.packageDependencies.size>0&&(i=!0);for(let[De,$]of qe.packageDependencies)if($!==null){let G=S.parseLocator(Array.isArray($)?`${$[0]}@${$[1]}`:`${De}@${$}`);if(ms(G)!==ms(Ne)){let Ce=q.get(De);if(Ce){let ee=S.parseLocator(Array.isArray(Ce)?`${Ce[0]}@${Ce[1]}`:`${De}@${Ce}`);Ule(ee,G)||r.push({messageName:z.NM_CANT_INSTALL_EXTERNAL_SOFT_LINK,text:`Cannot link ${S.prettyIdent(e.project.configuration,S.parseIdent(Ne.name))} into ${S.prettyLocator(e.project.configuration,S.parseLocator(`${d.name}@${d.reference}`))} dependency ${S.prettyLocator(e.project.configuration,G)} conflicts with parent dependency ${S.prettyLocator(e.project.configuration,ee)}`})}else{let ee=D.get(De);if(ee){let Ue=ee.target,Oe=S.parseLocator(Array.isArray(Ue)?`${Ue[0]}@${Ue[1]}`:`${De}@${Ue}`);Ule(Oe,G)||r.push({messageName:z.NM_CANT_INSTALL_EXTERNAL_SOFT_LINK,text:`Cannot link ${S.prettyIdent(e.project.configuration,S.parseIdent(Ne.name))} into ${S.prettyLocator(e.project.configuration,S.parseLocator(`${d.name}@${d.reference}`))} dependency ${S.prettyLocator(e.project.configuration,G)} conflicts with dependency ${S.prettyLocator(e.project.configuration,Oe)} from sibling portal ${S.prettyIdent(e.project.configuration,S.parseIdent(ee.portal.name))}`})}else D.set(De,{target:G.reference,portal:Ne})}}}}let se=(X=e.hoistingLimitsByCwd)==null?void 0:X.get(b),be=re?b:v.relative(l,M.toPortablePath(qe.packageLocation))||Se.dot,ae=(F=e.hoistingLimitsByCwd)==null?void 0:F.get(be),Ae=se===Sn.DEPENDENCIES||ae===Sn.DEPENDENCIES||ae===Sn.WORKSPACES;f(ms(Ne)===ms(d)?h:he,qe,Ne,L,p,q,be,Ae)}}};return f(a.name,o,a,c,o,o.packageDependencies,Se.dot,!1),{packageTree:c,hoistingLimits:n,errors:r,preserveSymlinksRequired:i}};function Hle(t,e,r){let i=r.resolveVirtual&&e.reference&&e.reference.startsWith("virtual:")?r.resolveVirtual(t.packageLocation):t.packageLocation;return M.toPortablePath(i||t.packageLocation)}function X5e(t,e,r){let i=e.getLocator(t.name.replace(Hc,""),t.reference),n=e.getPackageInformation(i);if(n===null)throw new Error("Assertion failed: Expected the package to be registered");let s,o;return r.pnpifyFs?(o=M.toPortablePath(n.packageLocation),s=Js.SOFT):(o=Hle(n,t,e),s=n.linkType),{linkType:s,target:o}}var V5e=(t,e,r)=>{let i=new Map,n=(u,g,f)=>{let{linkType:h,target:p}=X5e(u,t,r);return{locator:ms(u),nodePath:g,target:p,linkType:h,aliases:f}},s=u=>{let[g,f]=u.split("/");return f?{scope:kr(g),name:kr(f)}:{scope:null,name:kr(g)}},o=new Set,a=(u,g,f)=>{if(!o.has(u)){o.add(u);for(let h of u.dependencies){if(h===u)continue;let p=Array.from(h.references).sort(),d={name:h.identName,reference:p[0]},{name:m,scope:E}=s(h.name),B=E?[E,m]:[m],b=v.join(g,Kle),R=v.join(b,...B),H=`${f}/${d.name}`,L=n(d,f,p.slice(1)),K=!1;if(L.linkType===Js.SOFT&&r.project){let J=r.project.workspacesByCwd.get(L.target.slice(0,-1));K=!!(J&&!J.manifest.name)}if(!h.name.endsWith(Hc)&&!K){let J=i.get(R);if(J){if(J.dirList)throw new Error(`Assertion failed: ${R} cannot merge dir node with leaf node`);{let V=S.parseLocator(J.locator),W=S.parseLocator(L.locator);if(J.linkType!==L.linkType)throw new Error(`Assertion failed: ${R} cannot merge nodes with different link types ${J.nodePath}/${S.stringifyLocator(V)} and ${f}/${S.stringifyLocator(W)}`);if(V.identHash!==W.identHash)throw new Error(`Assertion failed: ${R} cannot merge nodes with different idents ${J.nodePath}/${S.stringifyLocator(V)} and ${f}/s${S.stringifyLocator(W)}`);L.aliases=[...L.aliases,...J.aliases,S.parseLocator(J.locator).reference]}}i.set(R,L);let ne=R.split("/"),q=ne.indexOf(Kle),A=ne.length-1;for(;q>=0&&A>q;){let V=M.toPortablePath(ne.slice(0,A).join(v.sep)),W=kr(ne[A]),X=i.get(V);if(!X)i.set(V,{dirList:new Set([W])});else if(X.dirList){if(X.dirList.has(W))break;X.dirList.add(W)}A--}}a(h,L.linkType===Js.SOFT?L.target:R,H)}}},l=n({name:e.name,reference:Array.from(e.references)[0]},"",[]),c=l.target;return i.set(c,l),a(e,c,""),i};var oT={};it(oT,{PnpInstaller:()=>Cf,PnpLinker:()=>jc,default:()=>m6e,getPnpPath:()=>qA,jsInstallUtils:()=>Ws,pnpUtils:()=>nT,quotePathIfNeeded:()=>uce});var lce=ie(Or()),cce=ie(require("url"));var Gle;(function(r){r.HARD="HARD",r.SOFT="SOFT"})(Gle||(Gle={}));var Ht;(function(f){f.DEFAULT="DEFAULT",f.TOP_LEVEL="TOP_LEVEL",f.FALLBACK_EXCLUSION_LIST="FALLBACK_EXCLUSION_LIST",f.FALLBACK_EXCLUSION_ENTRIES="FALLBACK_EXCLUSION_ENTRIES",f.FALLBACK_EXCLUSION_DATA="FALLBACK_EXCLUSION_DATA",f.PACKAGE_REGISTRY_DATA="PACKAGE_REGISTRY_DATA",f.PACKAGE_REGISTRY_ENTRIES="PACKAGE_REGISTRY_ENTRIES",f.PACKAGE_STORE_DATA="PACKAGE_STORE_DATA",f.PACKAGE_STORE_ENTRIES="PACKAGE_STORE_ENTRIES",f.PACKAGE_INFORMATION_DATA="PACKAGE_INFORMATION_DATA",f.PACKAGE_DEPENDENCIES="PACKAGE_DEPENDENCIES",f.PACKAGE_DEPENDENCY="PACKAGE_DEPENDENCY"})(Ht||(Ht={}));var jle={[Ht.DEFAULT]:{collapsed:!1,next:{["*"]:Ht.DEFAULT}},[Ht.TOP_LEVEL]:{collapsed:!1,next:{fallbackExclusionList:Ht.FALLBACK_EXCLUSION_LIST,packageRegistryData:Ht.PACKAGE_REGISTRY_DATA,["*"]:Ht.DEFAULT}},[Ht.FALLBACK_EXCLUSION_LIST]:{collapsed:!1,next:{["*"]:Ht.FALLBACK_EXCLUSION_ENTRIES}},[Ht.FALLBACK_EXCLUSION_ENTRIES]:{collapsed:!0,next:{["*"]:Ht.FALLBACK_EXCLUSION_DATA}},[Ht.FALLBACK_EXCLUSION_DATA]:{collapsed:!0,next:{["*"]:Ht.DEFAULT}},[Ht.PACKAGE_REGISTRY_DATA]:{collapsed:!1,next:{["*"]:Ht.PACKAGE_REGISTRY_ENTRIES}},[Ht.PACKAGE_REGISTRY_ENTRIES]:{collapsed:!0,next:{["*"]:Ht.PACKAGE_STORE_DATA}},[Ht.PACKAGE_STORE_DATA]:{collapsed:!1,next:{["*"]:Ht.PACKAGE_STORE_ENTRIES}},[Ht.PACKAGE_STORE_ENTRIES]:{collapsed:!0,next:{["*"]:Ht.PACKAGE_INFORMATION_DATA}},[Ht.PACKAGE_INFORMATION_DATA]:{collapsed:!1,next:{packageDependencies:Ht.PACKAGE_DEPENDENCIES,["*"]:Ht.DEFAULT}},[Ht.PACKAGE_DEPENDENCIES]:{collapsed:!1,next:{["*"]:Ht.PACKAGE_DEPENDENCY}},[Ht.PACKAGE_DEPENDENCY]:{collapsed:!0,next:{["*"]:Ht.DEFAULT}}};function Z5e(t,e,r){let i="";i+="[";for(let n=0,s=t.length;ns(o)));let n=r.map((s,o)=>o);return n.sort((s,o)=>{for(let a of i){let l=a[s]a[o]?1:0;if(l!==0)return l}return 0}),n.map(s=>r[s])}function r6e(t){let e=new Map,r=_C(t.fallbackExclusionList||[],[({name:i,reference:n})=>i,({name:i,reference:n})=>n]);for(let{name:i,reference:n}of r){let s=e.get(i);typeof s=="undefined"&&e.set(i,s=new Set),s.add(n)}return Array.from(e).map(([i,n])=>[i,Array.from(n)])}function i6e(t){return _C(t.fallbackPool||[],([e])=>e)}function n6e(t){let e=[];for(let[r,i]of _C(t.packageRegistry,([n])=>n===null?"0":`1${n}`)){let n=[];e.push([r,n]);for(let[s,{packageLocation:o,packageDependencies:a,packagePeers:l,linkType:c,discardFromLookup:u}]of _C(i,([g])=>g===null?"0":`1${g}`)){let g=[];r!==null&&s!==null&&!a.has(r)&&g.push([r,s]);for(let[p,d]of _C(a.entries(),([m])=>m))g.push([p,d]);let f=l&&l.size>0?Array.from(l):void 0,h=u||void 0;n.push([s,{packageLocation:o,packageDependencies:g,packagePeers:f,linkType:c,discardFromLookup:h}])}}return e}function XC(t){return{__info:["This file is automatically generated. Do not touch it, or risk","your modifications being lost. We also recommend you not to read","it either without using the @yarnpkg/pnp package, as the data layout","is entirely unspecified and WILL change from a version to another."],dependencyTreeRoots:t.dependencyTreeRoots,enableTopLevelFallback:t.enableTopLevelFallback||!1,ignorePatternData:t.ignorePattern||null,fallbackExclusionList:r6e(t),fallbackPool:i6e(t),packageRegistryData:n6e(t)}}var zle=ie(Wle());function Vle(t,e){return[t?`${t} +`:"",`/* eslint-disable */ + +`,`try { +`,` Object.freeze({}).detectStrictMode = true; +`,`} catch (error) { +`," throw new Error(`The whole PnP file got strict-mode-ified, which is known to break (Emscripten libraries aren't strict mode). This usually happens when the file goes through Babel.`);\n",`} +`,` +`,`var __non_webpack_module__ = module; +`,` +`,`function $$SETUP_STATE(hydrateRuntimeState, basePath) { +`,e.replace(/^/gm," "),`} +`,` +`,(0,zle.default)()].join("")}function s6e(t){return JSON.stringify(t,null,2)}function o6e(t){return[`return hydrateRuntimeState(${qle(t)}, {basePath: basePath || __dirname}); +`].join("")}function a6e(t){return[`var path = require('path'); +`,`var dataLocation = path.resolve(__dirname, ${JSON.stringify(t)}); +`,`return hydrateRuntimeState(require(dataLocation), {basePath: basePath || path.dirname(dataLocation)}); +`].join("")}function _le(t){let e=XC(t),r=o6e(e);return Vle(t.shebang,r)}function Xle(t){let e=XC(t),r=a6e(t.dataLocation),i=Vle(t.shebang,r);return{dataFile:s6e(e),loaderFile:i}}var tce=ie(require("fs")),u6e=ie(require("path")),rce=ie(require("util"));function _L(t,{basePath:e}){let r=M.toPortablePath(e),i=v.resolve(r),n=t.ignorePatternData!==null?new RegExp(t.ignorePatternData):null,s=new Map,o=new Map(t.packageRegistryData.map(([g,f])=>[g,new Map(f.map(([h,p])=>{var b;if(g===null!=(h===null))throw new Error("Assertion failed: The name and reference should be null, or neither should");let d=(b=p.discardFromLookup)!=null?b:!1,m={name:g,reference:h},E=s.get(p.packageLocation);E?(E.discardFromLookup=E.discardFromLookup&&d,d||(E.locator=m)):s.set(p.packageLocation,{locator:m,discardFromLookup:d});let B=null;return[h,{packageDependencies:new Map(p.packageDependencies),packagePeers:new Set(p.packagePeers),linkType:p.linkType,discardFromLookup:d,get packageLocation(){return B||(B=v.join(i,p.packageLocation))}}]}))])),a=new Map(t.fallbackExclusionList.map(([g,f])=>[g,new Set(f)])),l=new Map(t.fallbackPool),c=t.dependencyTreeRoots,u=t.enableTopLevelFallback;return{basePath:r,dependencyTreeRoots:c,enableTopLevelFallback:u,fallbackExclusionList:a,fallbackPool:l,ignorePattern:n,packageLocatorsByLocations:s,packageRegistry:o}}var df=ie(require("module")),ece=ie($le()),ZL=ie(require("util"));var ur;(function(l){l.API_ERROR="API_ERROR",l.BUILTIN_NODE_RESOLUTION_FAILED="BUILTIN_NODE_RESOLUTION_FAILED",l.MISSING_DEPENDENCY="MISSING_DEPENDENCY",l.MISSING_PEER_DEPENDENCY="MISSING_PEER_DEPENDENCY",l.QUALIFIED_PATH_RESOLUTION_FAILED="QUALIFIED_PATH_RESOLUTION_FAILED",l.INTERNAL="INTERNAL",l.UNDECLARED_DEPENDENCY="UNDECLARED_DEPENDENCY",l.UNSUPPORTED="UNSUPPORTED"})(ur||(ur={}));var c6e=new Set([ur.BUILTIN_NODE_RESOLUTION_FAILED,ur.MISSING_DEPENDENCY,ur.MISSING_PEER_DEPENDENCY,ur.QUALIFIED_PATH_RESOLUTION_FAILED,ur.UNDECLARED_DEPENDENCY]);function ui(t,e,r={}){let i=c6e.has(t)?"MODULE_NOT_FOUND":t,n={configurable:!0,writable:!0,enumerable:!1};return Object.defineProperties(new Error(e),{code:_(P({},n),{value:i}),pnpCode:_(P({},n),{value:t}),data:_(P({},n),{value:r})})}function YA(t){return M.normalize(M.fromPortablePath(t))}function $L(t,e){let r=Number(process.env.PNP_ALWAYS_WARN_ON_FALLBACK)>0,i=Number(process.env.PNP_DEBUG_LEVEL),n=new Set(df.Module.builtinModules||Object.keys(process.binding("natives"))),s=re=>n.has(re)||re.startsWith("node:"),o=/^(?![a-zA-Z]:[\\/]|\\\\|\.{0,2}(?:\/|$))((?:node:)?(?:@[^/]+\/)?[^/]+)\/*(.*|)$/,a=/^(\/|\.{1,2}(\/|$))/,l=/\/$/,c=/^\.{0,2}\//,u={name:null,reference:null},g=[],f=new Set;if(t.enableTopLevelFallback===!0&&g.push(u),e.compatibilityMode!==!1)for(let re of["react-scripts","gatsby"]){let se=t.packageRegistry.get(re);if(se)for(let be of se.keys()){if(be===null)throw new Error("Assertion failed: This reference shouldn't be null");g.push({name:re,reference:be})}}let{ignorePattern:h,packageRegistry:p,packageLocatorsByLocations:d}=t;function m(re,se){return{fn:re,args:se,error:null,result:null}}function E(re){var De,$,G,Ce,ee,Ue;let se=(G=($=(De=process.stderr)==null?void 0:De.hasColors)==null?void 0:$.call(De))!=null?G:process.stdout.isTTY,be=(Oe,vt)=>`[${Oe}m${vt}`,ae=re.error;console.error(ae?be("31;1",`\u2716 ${(Ce=re.error)==null?void 0:Ce.message.replace(/\n.*/s,"")}`):be("33;1","\u203C Resolution")),re.args.length>0&&console.error();for(let Oe of re.args)console.error(` ${be("37;1","In \u2190")} ${(0,ZL.inspect)(Oe,{colors:se,compact:!0})}`);re.result&&(console.error(),console.error(` ${be("37;1","Out \u2192")} ${(0,ZL.inspect)(re.result,{colors:se,compact:!0})}`));let Ae=(Ue=(ee=new Error().stack.match(/(?<=^ +)at.*/gm))==null?void 0:ee.slice(2))!=null?Ue:[];if(Ae.length>0){console.error();for(let Oe of Ae)console.error(` ${be("38;5;244",Oe)}`)}console.error()}function B(re,se){if(e.allowDebug===!1)return se;if(Number.isFinite(i)){if(i>=2)return(...be)=>{let ae=m(re,be);try{return ae.result=se(...be)}catch(Ae){throw ae.error=Ae}finally{E(ae)}};if(i>=1)return(...be)=>{try{return se(...be)}catch(ae){let Ae=m(re,be);throw Ae.error=ae,E(Ae),ae}}}return se}function b(re){let se=W(re);if(!se)throw ui(ur.INTERNAL,"Couldn't find a matching entry in the dependency tree for the specified parent (this is probably an internal error)");return se}function R(re){if(re.name===null)return!0;for(let se of t.dependencyTreeRoots)if(se.name===re.name&&se.reference===re.reference)return!0;return!1}let H=new Set(["default","node","require"]);function L(re,se=H){let be=D(v.join(re,"internal.js"),{resolveIgnored:!0,includeDiscardFromLookup:!0});if(be===null)throw ui(ur.INTERNAL,`The locator that owns the "${re}" path can't be found inside the dependency tree (this is probably an internal error)`);let{packageLocation:ae}=b(be),Ae=v.join(ae,wt.manifest);if(!e.fakeFs.existsSync(Ae))return null;let De=JSON.parse(e.fakeFs.readFileSync(Ae,"utf8")),$=v.contains(ae,re);if($===null)throw ui(ur.INTERNAL,"unqualifiedPath doesn't contain the packageLocation (this is probably an internal error)");c.test($)||($=`./${$}`);let G=(0,ece.resolve)(De,v.normalize($),{conditions:se,unsafe:!0});return typeof G=="string"?v.join(ae,G):null}function K(re,se,{extensions:be}){let ae;try{se.push(re),ae=e.fakeFs.statSync(re)}catch(Ae){}if(ae&&!ae.isDirectory())return e.fakeFs.realpathSync(re);if(ae&&ae.isDirectory()){let Ae;try{Ae=JSON.parse(e.fakeFs.readFileSync(v.join(re,wt.manifest),"utf8"))}catch($){}let De;if(Ae&&Ae.main&&(De=v.resolve(re,Ae.main)),De&&De!==re){let $=K(De,se,{extensions:be});if($!==null)return $}}for(let Ae=0,De=be.length;Ae{let G=JSON.stringify($.name);if(ae.has(G))return;ae.add(G);let Ce=X($);for(let ee of Ce)if(b(ee).packagePeers.has(re))Ae(ee);else{let Oe=be.get(ee.name);typeof Oe=="undefined"&&be.set(ee.name,Oe=new Set),Oe.add(ee.reference)}};Ae(se);let De=[];for(let $ of[...be.keys()].sort())for(let G of[...be.get($)].sort())De.push({name:$,reference:G});return De}function D(re,{resolveIgnored:se=!1,includeDiscardFromLookup:be=!1}={}){if(q(re)&&!se)return null;let ae=v.relative(t.basePath,re);ae.match(a)||(ae=`./${ae}`),ae.endsWith("/")||(ae=`${ae}/`);do{let Ae=d.get(ae);if(typeof Ae=="undefined"||Ae.discardFromLookup&&!be){ae=ae.substring(0,ae.lastIndexOf("/",ae.length-2)+1);continue}return Ae.locator}while(ae!=="");return null}function he(re,se,{considerBuiltins:be=!0}={}){if(re==="pnpapi")return M.toPortablePath(e.pnpapiResolution);if(be&&s(re))return null;let ae=YA(re),Ae=se&&YA(se);if(se&&q(se)&&(!v.isAbsolute(re)||D(re)===null)){let G=ne(re,se);if(G===!1)throw ui(ur.BUILTIN_NODE_RESOLUTION_FAILED,`The builtin node resolution algorithm was unable to resolve the requested module (it didn't go through the pnp resolver because the issuer was explicitely ignored by the regexp) + +Require request: "${ae}" +Required by: ${Ae} +`,{request:ae,issuer:Ae});return M.toPortablePath(G)}let De,$=re.match(o);if($){if(!se)throw ui(ur.API_ERROR,"The resolveToUnqualified function must be called with a valid issuer when the path isn't a builtin nor absolute",{request:ae,issuer:Ae});let[,G,Ce]=$,ee=D(se);if(!ee){let yr=ne(re,se);if(yr===!1)throw ui(ur.BUILTIN_NODE_RESOLUTION_FAILED,`The builtin node resolution algorithm was unable to resolve the requested module (it didn't go through the pnp resolver because the issuer doesn't seem to be part of the Yarn-managed dependency tree). + +Require path: "${ae}" +Required by: ${Ae} +`,{request:ae,issuer:Ae});return M.toPortablePath(yr)}let Oe=b(ee).packageDependencies.get(G),vt=null;if(Oe==null&&ee.name!==null){let yr=t.fallbackExclusionList.get(ee.name);if(!yr||!yr.has(ee.reference)){for(let Qi=0,Go=g.length;QiR(Ki))?dt=ui(ur.MISSING_PEER_DEPENDENCY,`${ee.name} tried to access ${G} (a peer dependency) but it isn't provided by your application; this makes the require call ambiguous and unsound. + +Required package: ${G}${G!==ae?` (via "${ae}")`:""} +Required by: ${ee.name}@${ee.reference} (via ${Ae}) +${yr.map(Ki=>`Ancestor breaking the chain: ${Ki.name}@${Ki.reference} +`).join("")} +`,{request:ae,issuer:Ae,issuerLocator:Object.assign({},ee),dependencyName:G,brokenAncestors:yr}):dt=ui(ur.MISSING_PEER_DEPENDENCY,`${ee.name} tried to access ${G} (a peer dependency) but it isn't provided by its ancestors; this makes the require call ambiguous and unsound. + +Required package: ${G}${G!==ae?` (via "${ae}")`:""} +Required by: ${ee.name}@${ee.reference} (via ${Ae}) + +${yr.map(Ki=>`Ancestor breaking the chain: ${Ki.name}@${Ki.reference} +`).join("")} +`,{request:ae,issuer:Ae,issuerLocator:Object.assign({},ee),dependencyName:G,brokenAncestors:yr})}else Oe===void 0&&(!be&&s(re)?R(ee)?dt=ui(ur.UNDECLARED_DEPENDENCY,`Your application tried to access ${G}. While this module is usually interpreted as a Node builtin, your resolver is running inside a non-Node resolution context where such builtins are ignored. Since ${G} isn't otherwise declared in your dependencies, this makes the require call ambiguous and unsound. + +Required package: ${G}${G!==ae?` (via "${ae}")`:""} +Required by: ${Ae} +`,{request:ae,issuer:Ae,dependencyName:G}):dt=ui(ur.UNDECLARED_DEPENDENCY,`${ee.name} tried to access ${G}. While this module is usually interpreted as a Node builtin, your resolver is running inside a non-Node resolution context where such builtins are ignored. Since ${G} isn't otherwise declared in ${ee.name}'s dependencies, this makes the require call ambiguous and unsound. + +Required package: ${G}${G!==ae?` (via "${ae}")`:""} +Required by: ${Ae} +`,{request:ae,issuer:Ae,issuerLocator:Object.assign({},ee),dependencyName:G}):R(ee)?dt=ui(ur.UNDECLARED_DEPENDENCY,`Your application tried to access ${G}, but it isn't declared in your dependencies; this makes the require call ambiguous and unsound. + +Required package: ${G}${G!==ae?` (via "${ae}")`:""} +Required by: ${Ae} +`,{request:ae,issuer:Ae,dependencyName:G}):dt=ui(ur.UNDECLARED_DEPENDENCY,`${ee.name} tried to access ${G}, but it isn't declared in its dependencies; this makes the require call ambiguous and unsound. + +Required package: ${G}${G!==ae?` (via "${ae}")`:""} +Required by: ${ee.name}@${ee.reference} (via ${Ae}) +`,{request:ae,issuer:Ae,issuerLocator:Object.assign({},ee),dependencyName:G}));if(Oe==null){if(vt===null||dt===null)throw dt||new Error("Assertion failed: Expected an error to have been set");Oe=vt;let yr=dt.message.replace(/\n.*/g,"");dt.message=yr,!f.has(yr)&&i!==0&&(f.add(yr),process.emitWarning(dt))}let ri=Array.isArray(Oe)?{name:Oe[0],reference:Oe[1]}:{name:G,reference:Oe},ii=b(ri);if(!ii.packageLocation)throw ui(ur.MISSING_DEPENDENCY,`A dependency seems valid but didn't get installed for some reason. This might be caused by a partial install, such as dev vs prod. + +Required package: ${ri.name}@${ri.reference}${ri.name!==ae?` (via "${ae}")`:""} +Required by: ${ee.name}@${ee.reference} (via ${Ae}) +`,{request:ae,issuer:Ae,dependencyLocator:Object.assign({},ri)});let an=ii.packageLocation;Ce?De=v.join(an,Ce):De=an}else if(v.isAbsolute(re))De=v.normalize(re);else{if(!se)throw ui(ur.API_ERROR,"The resolveToUnqualified function must be called with a valid issuer when the path isn't a builtin nor absolute",{request:ae,issuer:Ae});let G=v.resolve(se);se.match(l)?De=v.normalize(v.join(G,re)):De=v.normalize(v.join(v.dirname(G),re))}return v.normalize(De)}function pe(re,se,be=H){if(a.test(re))return se;let ae=L(se,be);return ae?v.normalize(ae):se}function Ne(re,{extensions:se=Object.keys(df.Module._extensions)}={}){let be=[],ae=K(re,be,{extensions:se});if(ae)return v.normalize(ae);{let Ae=YA(re),De=D(re);if(De){let{packageLocation:$}=b(De);if(!e.fakeFs.existsSync($)){let G=$.includes("/unplugged/")?"Required unplugged package missing from disk. This may happen when switching branches without running installs (unplugged packages must be fully materialized on disk to work).":"Required package missing from disk. If you keep your packages inside your repository then restarting the Node process may be enough. Otherwise, try to run an install first.";throw ui(ur.QUALIFIED_PATH_RESOLUTION_FAILED,`${G} + +Missing package: ${De.name}@${De.reference} +Expected package location: ${YA($)} +`,{unqualifiedPath:Ae})}}throw ui(ur.QUALIFIED_PATH_RESOLUTION_FAILED,`Qualified path resolution failed - none of those files can be found on the disk. + +Source path: ${Ae} +${be.map($=>`Not found: ${YA($)} +`).join("")}`,{unqualifiedPath:Ae})}}function Pe(re,se,{considerBuiltins:be,extensions:ae,conditions:Ae}={}){let De=he(re,se,{considerBuiltins:be});if(re==="pnpapi")return De;if(De===null)return null;let $=()=>se!==null?q(se):!1,G=(!be||!s(re))&&!$()?pe(re,De,Ae):De;try{return Ne(G,{extensions:ae})}catch(Ce){throw Ce.pnpCode==="QUALIFIED_PATH_RESOLUTION_FAILED"&&Object.assign(Ce.data,{request:YA(re),issuer:se&&YA(se)}),Ce}}function qe(re){let se=v.normalize(re),be=Pr.resolveVirtual(se);return be!==se?be:null}return{VERSIONS:A,topLevel:V,getLocator:(re,se)=>Array.isArray(se)?{name:se[0],reference:se[1]}:{name:re,reference:se},getDependencyTreeRoots:()=>[...t.dependencyTreeRoots],getAllLocators(){let re=[];for(let[se,be]of p)for(let ae of be.keys())se!==null&&ae!==null&&re.push({name:se,reference:ae});return re},getPackageInformation:re=>{let se=W(re);if(se===null)return null;let be=M.fromPortablePath(se.packageLocation);return _(P({},se),{packageLocation:be})},findPackageLocator:re=>D(M.toPortablePath(re)),resolveToUnqualified:B("resolveToUnqualified",(re,se,be)=>{let ae=se!==null?M.toPortablePath(se):null,Ae=he(M.toPortablePath(re),ae,be);return Ae===null?null:M.fromPortablePath(Ae)}),resolveUnqualified:B("resolveUnqualified",(re,se)=>M.fromPortablePath(Ne(M.toPortablePath(re),se))),resolveRequest:B("resolveRequest",(re,se,be)=>{let ae=se!==null?M.toPortablePath(se):null,Ae=Pe(M.toPortablePath(re),ae,be);return Ae===null?null:M.fromPortablePath(Ae)}),resolveVirtual:B("resolveVirtual",re=>{let se=qe(M.toPortablePath(re));return se!==null?M.fromPortablePath(se):null})}}var ESt=(0,rce.promisify)(tce.readFile);var ice=(t,e,r)=>{let i=XC(t),n=_L(i,{basePath:e}),s=M.join(e,wt.pnpCjs);return $L(n,{fakeFs:r,pnpapiResolution:s})};var tT=ie(sce());var Ws={};it(Ws,{checkAndReportManifestCompatibility:()=>oce,extractBuildScripts:()=>Z0,getExtractHint:()=>rT,hasBindingGyp:()=>iT});function oce(t,e,{configuration:r,report:i}){return S.isPackageCompatible(t,{os:[process.platform],cpu:[process.arch]})?!0:(i==null||i.reportWarningOnce(z.INCOMPATIBLE_ARCHITECTURE,`${S.prettyLocator(r,t)} The ${process.platform}-${process.arch} architecture is incompatible with this module, ${e} skipped.`),!1)}function Z0(t,e,r,{configuration:i,report:n}){let s=[];for(let a of["preinstall","install","postinstall"])e.manifest.scripts.has(a)&&s.push([Gn.SCRIPT,a]);return!e.manifest.scripts.has("install")&&e.misc.hasBindingGyp&&s.push([Gn.SHELLCODE,"node-gyp rebuild"]),s.length===0?[]:t.linkType!==gt.HARD?(n==null||n.reportWarningOnce(z.SOFT_LINK_BUILD,`${S.prettyLocator(i,t)} lists build scripts, but is referenced through a soft link. Soft links don't support build scripts, so they'll be ignored.`),[]):r&&r.built===!1?(n==null||n.reportInfoOnce(z.BUILD_DISABLED,`${S.prettyLocator(i,t)} lists build scripts, but its build has been explicitly disabled through configuration.`),[]):!i.get("enableScripts")&&!r.built?(n==null||n.reportWarningOnce(z.DISABLED_BUILD_SCRIPTS,`${S.prettyLocator(i,t)} lists build scripts, but all build scripts have been disabled.`),[]):oce(t,"build",{configuration:i,report:n})?s:[]}var g6e=new Set([".exe",".h",".hh",".hpp",".c",".cc",".cpp",".java",".jar",".node"]);function rT(t){return t.packageFs.getExtractHint({relevantExtensions:g6e})}function iT(t){let e=v.join(t.prefixPath,"binding.gyp");return t.packageFs.existsSync(e)}var nT={};it(nT,{getUnpluggedPath:()=>ZC});function ZC(t,{configuration:e}){return v.resolve(e.get("pnpUnpluggedFolder"),S.slugifyLocator(t))}var f6e=new Set([S.makeIdent(null,"nan").identHash,S.makeIdent(null,"node-gyp").identHash,S.makeIdent(null,"node-pre-gyp").identHash,S.makeIdent(null,"node-addon-api").identHash,S.makeIdent(null,"fsevents").identHash]),jc=class{constructor(){this.mode="strict";this.pnpCache=new Map}supportsPackage(e,r){return!(r.project.configuration.get("nodeLinker")!=="pnp"||r.project.configuration.get("pnpMode")!==this.mode)}async findPackageLocation(e,r){let i=qA(r.project).cjs;if(!T.existsSync(i))throw new me(`The project in ${ue.pretty(r.project.configuration,`${r.project.cwd}/package.json`,ue.Type.PATH)} doesn't seem to have been installed - running an install there might help`);let n=de.getFactoryWithDefault(this.pnpCache,i,()=>de.dynamicRequire(i,{cachingStrategy:de.CachingStrategy.FsTime})),s={name:S.stringifyIdent(e),reference:e.reference},o=n.getPackageInformation(s);if(!o)throw new me(`Couldn't find ${S.prettyLocator(r.project.configuration,e)} in the currently installed PnP map - running an install might help`);return M.toPortablePath(o.packageLocation)}async findPackageLocator(e,r){let i=qA(r.project).cjs;if(!T.existsSync(i))return null;let s=de.getFactoryWithDefault(this.pnpCache,i,()=>de.dynamicRequire(i,{cachingStrategy:de.CachingStrategy.FsTime})).findPackageLocator(M.fromPortablePath(e));return s?S.makeLocator(S.parseIdent(s.name),s.reference):null}makeInstaller(e){return new Cf(e)}},Cf=class{constructor(e){this.opts=e;this.mode="strict";this.packageRegistry=new Map;this.virtualTemplates=new Map;this.isESMLoaderRequired=!1;this.customData={store:new Map};this.unpluggedPaths=new Set;this.opts=e}getCustomDataKey(){return JSON.stringify({name:"PnpInstaller",version:2})}attachCustomData(e){this.customData=e}async installPackage(e,r){let i=S.stringifyIdent(e),n=e.reference,s=!!this.opts.project.tryWorkspaceByLocator(e),o=S.isVirtualLocator(e),a=e.peerDependencies.size>0&&!o,l=!a&&!s,c=!a&&e.linkType!==gt.SOFT,u,g;if(l||c){let B=o?S.devirtualizeLocator(e):e;u=this.customData.store.get(B.locatorHash),typeof u=="undefined"&&(u=await h6e(r),e.linkType===gt.HARD&&this.customData.store.set(B.locatorHash,u)),u.manifest.type==="module"&&(this.isESMLoaderRequired=!0),g=this.opts.project.getDependencyMeta(B,e.version)}let f=l?Z0(e,u,g,{configuration:this.opts.project.configuration,report:this.opts.report}):[],h=c?await this.unplugPackageIfNeeded(e,u,r,g):r.packageFs;if(v.isAbsolute(r.prefixPath))throw new Error(`Assertion failed: Expected the prefix path (${r.prefixPath}) to be relative to the parent`);let p=v.resolve(h.getRealPath(),r.prefixPath),d=sT(this.opts.project.cwd,p),m=new Map,E=new Set;if(o){for(let B of e.peerDependencies.values())m.set(S.stringifyIdent(B),null),E.add(S.stringifyIdent(B));if(!s){let B=S.devirtualizeLocator(e);this.virtualTemplates.set(B.locatorHash,{location:sT(this.opts.project.cwd,Pr.resolveVirtual(p)),locator:B})}}return de.getMapWithDefault(this.packageRegistry,i).set(n,{packageLocation:d,packageDependencies:m,packagePeers:E,linkType:e.linkType,discardFromLookup:r.discardFromLookup||!1}),{packageLocation:p,buildDirective:f.length>0?f:null}}async attachInternalDependencies(e,r){let i=this.getPackageInformation(e);for(let[n,s]of r){let o=S.areIdentsEqual(n,s)?s.reference:[S.stringifyIdent(s),s.reference];i.packageDependencies.set(S.stringifyIdent(n),o)}}async attachExternalDependents(e,r){for(let i of r)this.getDiskInformation(i).packageDependencies.set(S.stringifyIdent(e),e.reference)}async finalizeInstall(){if(this.opts.project.configuration.get("pnpMode")!==this.mode)return;let e=qA(this.opts.project);if(T.existsSync(e.cjsLegacy)&&(this.opts.report.reportWarning(z.UNNAMED,`Removing the old ${ue.pretty(this.opts.project.configuration,wt.pnpJs,ue.Type.PATH)} file. You might need to manually update existing references to reference the new ${ue.pretty(this.opts.project.configuration,wt.pnpCjs,ue.Type.PATH)} file. If you use Editor SDKs, you'll have to rerun ${ue.pretty(this.opts.project.configuration,"yarn sdks",ue.Type.CODE)}.`),await T.removePromise(e.cjsLegacy)),this.isEsmEnabled()||await T.removePromise(e.esmLoader),this.opts.project.configuration.get("nodeLinker")!=="pnp"){await T.removePromise(e.cjs),await T.removePromise(this.opts.project.configuration.get("pnpDataPath")),await T.removePromise(e.esmLoader);return}for(let{locator:u,location:g}of this.virtualTemplates.values())de.getMapWithDefault(this.packageRegistry,S.stringifyIdent(u)).set(u.reference,{packageLocation:g,packageDependencies:new Map,packagePeers:new Set,linkType:gt.SOFT,discardFromLookup:!1});this.packageRegistry.set(null,new Map([[null,this.getPackageInformation(this.opts.project.topLevelWorkspace.anchoredLocator)]]));let r=this.opts.project.configuration.get("pnpFallbackMode"),i=this.opts.project.workspaces.map(({anchoredLocator:u})=>({name:S.stringifyIdent(u),reference:u.reference})),n=r!=="none",s=[],o=new Map,a=de.buildIgnorePattern([".yarn/sdks/**",...this.opts.project.configuration.get("pnpIgnorePatterns")]),l=this.packageRegistry,c=this.opts.project.configuration.get("pnpShebang");if(r==="dependencies-only")for(let u of this.opts.project.storedPackages.values())this.opts.project.tryWorkspaceByLocator(u)&&s.push({name:S.stringifyIdent(u),reference:u.reference});return await this.finalizeInstallWithPnp({dependencyTreeRoots:i,enableTopLevelFallback:n,fallbackExclusionList:s,fallbackPool:o,ignorePattern:a,packageRegistry:l,shebang:c}),{customData:this.customData}}async transformPnpSettings(e){}isEsmEnabled(){if(this.opts.project.configuration.sources.has("pnpEnableEsmLoader"))return this.opts.project.configuration.get("pnpEnableEsmLoader");if(this.isESMLoaderRequired)return!0;for(let e of this.opts.project.workspaces)if(e.manifest.type==="module")return!0;return!1}async finalizeInstallWithPnp(e){let r=qA(this.opts.project),i=this.opts.project.configuration.get("pnpDataPath"),n=await this.locateNodeModules(e.ignorePattern);if(n.length>0){this.opts.report.reportWarning(z.DANGEROUS_NODE_MODULES,"One or more node_modules have been detected and will be removed. This operation may take some time.");for(let o of n)await T.removePromise(o)}if(await this.transformPnpSettings(e),this.opts.project.configuration.get("pnpEnableInlining")){let o=_le(e);await T.changeFilePromise(r.cjs,o,{automaticNewlines:!0,mode:493}),await T.removePromise(i)}else{let o=v.relative(v.dirname(r.cjs),i),{dataFile:a,loaderFile:l}=Xle(_(P({},e),{dataLocation:o}));await T.changeFilePromise(r.cjs,l,{automaticNewlines:!0,mode:493}),await T.changeFilePromise(i,a,{automaticNewlines:!0,mode:420})}this.isEsmEnabled()&&(this.opts.report.reportWarning(z.UNNAMED,"ESM support for PnP uses the experimental loader API and is therefore experimental"),await T.changeFilePromise(r.esmLoader,(0,tT.default)(),{automaticNewlines:!0,mode:420}));let s=this.opts.project.configuration.get("pnpUnpluggedFolder");if(this.unpluggedPaths.size===0)await T.removePromise(s);else for(let o of await T.readdirPromise(s)){let a=v.resolve(s,o);this.unpluggedPaths.has(a)||await T.removePromise(a)}}async locateNodeModules(e){let r=[],i=e?new RegExp(e):null;for(let n of this.opts.project.workspaces){let s=v.join(n.cwd,"node_modules");if(i&&i.test(v.relative(this.opts.project.cwd,n.cwd))||!T.existsSync(s))continue;let o=await T.readdirPromise(s,{withFileTypes:!0}),a=o.filter(l=>!l.isDirectory()||l.name===".bin"||!l.name.startsWith("."));if(a.length===o.length)r.push(s);else for(let l of a)r.push(v.join(s,l.name))}return r}async unplugPackageIfNeeded(e,r,i,n){return this.shouldBeUnplugged(e,r,n)?this.unplugPackage(e,i):i.packageFs}shouldBeUnplugged(e,r,i){return typeof i.unplugged!="undefined"?i.unplugged:f6e.has(e.identHash)||e.conditions!=null?!0:r.manifest.preferUnplugged!==null?r.manifest.preferUnplugged:!!(Z0(e,r,i,{configuration:this.opts.project.configuration}).length>0||r.misc.extractHint)}async unplugPackage(e,r){let i=ZC(e,{configuration:this.opts.project.configuration});if(this.opts.project.disabledLocators.has(e.locatorHash))return new Xo(i,{baseFs:r.packageFs,pathUtils:v});this.unpluggedPaths.add(i);let n=v.join(i,r.prefixPath,".ready");return await T.existsPromise(n)?new Ft(i):(this.opts.project.storedBuildState.delete(e.locatorHash),await T.mkdirPromise(i,{recursive:!0}),await T.copyPromise(i,Se.dot,{baseFs:r.packageFs,overwrite:!1}),await T.writeFilePromise(n,""),new Ft(i))}getPackageInformation(e){let r=S.stringifyIdent(e),i=e.reference,n=this.packageRegistry.get(r);if(!n)throw new Error(`Assertion failed: The package information store should have been available (for ${S.prettyIdent(this.opts.project.configuration,e)})`);let s=n.get(i);if(!s)throw new Error(`Assertion failed: The package information should have been available (for ${S.prettyLocator(this.opts.project.configuration,e)})`);return s}getDiskInformation(e){let r=de.getMapWithDefault(this.packageRegistry,"@@disk"),i=sT(this.opts.project.cwd,e);return de.getFactoryWithDefault(r,i,()=>({packageLocation:i,packageDependencies:new Map,packagePeers:new Set,linkType:gt.SOFT,discardFromLookup:!1}))}};function sT(t,e){let r=v.relative(t,e);return r.match(/^\.{0,2}\//)||(r=`./${r}`),r.replace(/\/?$/,"/")}async function h6e(t){var i;let e=(i=await Ze.tryFind(t.prefixPath,{baseFs:t.packageFs}))!=null?i:new Ze,r=new Set(["preinstall","install","postinstall"]);for(let n of e.scripts.keys())r.has(n)||e.scripts.delete(n);return{manifest:{scripts:e.scripts,preferUnplugged:e.preferUnplugged,type:e.type},misc:{extractHint:rT(t),hasBindingGyp:iT(t)}}}var ace=ie(Nn());var $C=class extends Be{constructor(){super(...arguments);this.all=Y.Boolean("-A,--all",!1,{description:"Unplug direct dependencies from the entire project"});this.recursive=Y.Boolean("-R,--recursive",!1,{description:"Unplug both direct and transitive dependencies"});this.json=Y.Boolean("--json",!1,{description:"Format the output as an NDJSON stream"});this.patterns=Y.Rest()}async execute(){let e=await fe.find(this.context.cwd,this.context.plugins),{project:r,workspace:i}=await Ke.find(e,this.context.cwd),n=await Qt.find(e);if(!i)throw new rt(r.cwd,this.context.cwd);if(e.get("nodeLinker")!=="pnp")throw new me("This command can only be used if the `nodeLinker` option is set to `pnp`");await r.restoreInstallState();let s=new Set(this.patterns),o=this.patterns.map(f=>{let h=S.parseDescriptor(f),p=h.range!=="unknown"?h:S.makeDescriptor(h,"*");if(!qt.validRange(p.range))throw new me(`The range of the descriptor patterns must be a valid semver range (${S.prettyDescriptor(e,p)})`);return d=>{let m=S.stringifyIdent(d);return!ace.default.isMatch(m,S.stringifyIdent(p))||d.version&&!qt.satisfiesWithPrereleases(d.version,p.range)?!1:(s.delete(f),!0)}}),a=()=>{let f=[];for(let h of r.storedPackages.values())!r.tryWorkspaceByLocator(h)&&!S.isVirtualLocator(h)&&o.some(p=>p(h))&&f.push(h);return f},l=f=>{let h=new Set,p=[],d=(m,E)=>{if(!h.has(m.locatorHash)&&(h.add(m.locatorHash),!r.tryWorkspaceByLocator(m)&&o.some(B=>B(m))&&p.push(m),!(E>0&&!this.recursive)))for(let B of m.dependencies.values()){let b=r.storedResolutions.get(B.descriptorHash);if(!b)throw new Error("Assertion failed: The resolution should have been registered");let R=r.storedPackages.get(b);if(!R)throw new Error("Assertion failed: The package should have been registered");d(R,E+1)}};for(let m of f){let E=r.storedPackages.get(m.anchoredLocator.locatorHash);if(!E)throw new Error("Assertion failed: The package should have been registered");d(E,0)}return p},c,u;if(this.all&&this.recursive?(c=a(),u="the project"):this.all?(c=l(r.workspaces),u="any workspace"):(c=l([i]),u="this workspace"),s.size>1)throw new me(`Patterns ${ue.prettyList(e,s,ue.Type.CODE)} don't match any packages referenced by ${u}`);if(s.size>0)throw new me(`Pattern ${ue.prettyList(e,s,ue.Type.CODE)} doesn't match any packages referenced by ${u}`);return c=de.sortMap(c,f=>S.stringifyLocator(f)),(await Fe.start({configuration:e,stdout:this.context.stdout,json:this.json},async f=>{var h;for(let p of c){let d=(h=p.version)!=null?h:"unknown",m=r.topLevelWorkspace.manifest.ensureDependencyMeta(S.makeDescriptor(p,d));m.unplugged=!0,f.reportInfo(z.UNNAMED,`Will unpack ${S.prettyLocator(e,p)} to ${ue.pretty(e,ZC(p,{configuration:e}),ue.Type.PATH)}`),f.reportJson({locator:S.stringifyLocator(p),version:d})}await r.topLevelWorkspace.persistManifest(),f.reportSeparator(),await r.install({cache:n,report:f})})).exitCode()}};$C.paths=[["unplug"]],$C.usage=ye.Usage({description:"force the unpacking of a list of packages",details:"\n This command will add the selectors matching the specified patterns to the list of packages that must be unplugged when installed.\n\n A package being unplugged means that instead of being referenced directly through its archive, it will be unpacked at install time in the directory configured via `pnpUnpluggedFolder`. Note that unpacking packages this way is generally not recommended because it'll make it harder to store your packages within the repository. However, it's a good approach to quickly and safely debug some packages, and can even sometimes be required depending on the context (for example when the package contains shellscripts).\n\n Running the command will set a persistent flag inside your top-level `package.json`, in the `dependenciesMeta` field. As such, to undo its effects, you'll need to revert the changes made to the manifest and run `yarn install` to apply the modification.\n\n By default, only direct dependencies from the current workspace are affected. If `-A,--all` is set, direct dependencies from the entire project are affected. Using the `-R,--recursive` flag will affect transitive dependencies as well as direct ones.\n\n This command accepts glob patterns inside the scope and name components (not the range). Make sure to escape the patterns to prevent your own shell from trying to expand them.\n ",examples:[["Unplug the lodash dependency from the active workspace","yarn unplug lodash"],["Unplug all instances of lodash referenced by any workspace","yarn unplug lodash -A"],["Unplug all instances of lodash referenced by the active workspace and its dependencies","yarn unplug lodash -R"],["Unplug all instances of lodash, anywhere","yarn unplug lodash -AR"],["Unplug one specific version of lodash","yarn unplug lodash@1.2.3"],["Unplug all packages with the `@babel` scope","yarn unplug '@babel/*'"],["Unplug all packages (only for testing, not recommended)","yarn unplug -R '*'"]]});var Ace=$C;var qA=t=>({cjs:v.join(t.cwd,wt.pnpCjs),cjsLegacy:v.join(t.cwd,wt.pnpJs),esmLoader:v.join(t.cwd,".pnp.loader.mjs")}),uce=t=>/\s/.test(t)?JSON.stringify(t):t;async function p6e(t,e,r){let i=qA(t),n=`--require ${uce(M.fromPortablePath(i.cjs))}`;if(T.existsSync(i.esmLoader)&&(n=`${n} --experimental-loader ${(0,cce.pathToFileURL)(M.fromPortablePath(i.esmLoader)).href}`),i.cjs.includes(" ")&&lce.default.lt(process.versions.node,"12.0.0"))throw new Error(`Expected the build location to not include spaces when using Node < 12.0.0 (${process.versions.node})`);if(T.existsSync(i.cjs)){let s=e.NODE_OPTIONS||"",o=/\s*--require\s+\S*\.pnp\.c?js\s*/g,a=/\s*--experimental-loader\s+\S*\.pnp\.loader\.mjs\s*/;s=s.replace(o," ").replace(a," ").trim(),s=s?`${n} ${s}`:n,e.NODE_OPTIONS=s}}async function d6e(t,e){let r=qA(t);e(r.cjs),e(r.esmLoader),e(t.configuration.get("pnpDataPath")),e(t.configuration.get("pnpUnpluggedFolder"))}var C6e={hooks:{populateYarnPaths:d6e,setupScriptEnvironment:p6e},configuration:{nodeLinker:{description:'The linker used for installing Node packages, one of: "pnp", "node-modules"',type:ge.STRING,default:"pnp"},pnpMode:{description:"If 'strict', generates standard PnP maps. If 'loose', merges them with the n_m resolution.",type:ge.STRING,default:"strict"},pnpShebang:{description:"String to prepend to the generated PnP script",type:ge.STRING,default:"#!/usr/bin/env node"},pnpIgnorePatterns:{description:"Array of glob patterns; files matching them will use the classic resolution",type:ge.STRING,default:[],isArray:!0},pnpEnableEsmLoader:{description:"If true, Yarn will generate an ESM loader (`.pnp.loader.mjs`). If this is not explicitly set Yarn tries to automatically detect whether ESM support is required.",type:ge.BOOLEAN,default:!1},pnpEnableInlining:{description:"If true, the PnP data will be inlined along with the generated loader",type:ge.BOOLEAN,default:!0},pnpFallbackMode:{description:"If true, the generated PnP loader will follow the top-level fallback rule",type:ge.STRING,default:"dependencies-only"},pnpUnpluggedFolder:{description:"Folder where the unplugged packages must be stored",type:ge.ABSOLUTE_PATH,default:"./.yarn/unplugged"},pnpDataPath:{description:"Path of the file where the PnP data (used by the loader) must be written",type:ge.ABSOLUTE_PATH,default:"./.pnp.data.json"}},linkers:[jc],commands:[Ace]},m6e=C6e;var Cce=ie(dce());var uT=ie(require("crypto")),mce=ie(require("fs")),Ice=1,gi="node_modules",gT=".bin",Ece=".yarn-state.yml",Bi;(function(i){i.CLASSIC="classic",i.HARDLINKS_LOCAL="hardlinks-local",i.HARDLINKS_GLOBAL="hardlinks-global"})(Bi||(Bi={}));var fT=class{constructor(){this.installStateCache=new Map}supportsPackage(e,r){return r.project.configuration.get("nodeLinker")==="node-modules"}async findPackageLocation(e,r){let i=r.project.tryWorkspaceByLocator(e);if(i)return i.cwd;let n=await de.getFactoryWithDefault(this.installStateCache,r.project.cwd,async()=>await hT(r.project,{unrollAliases:!0}));if(n===null)throw new me("Couldn't find the node_modules state file - running an install might help (findPackageLocation)");let s=n.locatorMap.get(S.stringifyLocator(e));if(!s){let a=new me(`Couldn't find ${S.prettyLocator(r.project.configuration,e)} in the currently installed node_modules map - running an install might help`);throw a.code="LOCATOR_NOT_INSTALLED",a}let o=r.project.configuration.startingCwd;return s.locations.find(a=>v.contains(o,a))||s.locations[0]}async findPackageLocator(e,r){let i=await de.getFactoryWithDefault(this.installStateCache,r.project.cwd,async()=>await hT(r.project,{unrollAliases:!0}));if(i===null)return null;let{locationRoot:n,segments:s}=$0(v.resolve(e),{skipPrefix:r.project.cwd}),o=i.locationTree.get(n);if(!o)return null;let a=o.locator;for(let l of s){if(o=o.children.get(l),!o)break;a=o.locator||a}return S.parseLocator(a)}makeInstaller(e){return new yce(e)}},yce=class{constructor(e){this.opts=e;this.localStore=new Map;this.realLocatorChecksums=new Map;this.customData={store:new Map}}getCustomDataKey(){return JSON.stringify({name:"NodeModulesInstaller",version:1})}attachCustomData(e){this.customData=e}async installPackage(e,r){var u;let i=v.resolve(r.packageFs.getRealPath(),r.prefixPath),n=this.customData.store.get(e.locatorHash);if(typeof n=="undefined"&&(n=await L6e(e,r),e.linkType===gt.HARD&&this.customData.store.set(e.locatorHash,n)),!Ws.checkAndReportManifestCompatibility(e,"link",{configuration:this.opts.project.configuration,report:this.opts.report}))return{packageLocation:null,buildDirective:null};let s=new Map,o=new Set;s.has(S.stringifyIdent(e))||s.set(S.stringifyIdent(e),e.reference);let a=e;if(S.isVirtualLocator(e)){a=S.devirtualizeLocator(e);for(let g of e.peerDependencies.values())s.set(S.stringifyIdent(g),null),o.add(S.stringifyIdent(g))}let l={packageLocation:`${M.fromPortablePath(i)}/`,packageDependencies:s,packagePeers:o,linkType:e.linkType,discardFromLookup:(u=r.discardFromLookup)!=null?u:!1};this.localStore.set(e.locatorHash,{pkg:e,customPackageData:n,dependencyMeta:this.opts.project.getDependencyMeta(e,e.version),pnpNode:l});let c=r.checksum?r.checksum.substring(r.checksum.indexOf("/")+1):null;return this.realLocatorChecksums.set(a.locatorHash,c),{packageLocation:i,buildDirective:null}}async attachInternalDependencies(e,r){let i=this.localStore.get(e.locatorHash);if(typeof i=="undefined")throw new Error("Assertion failed: Expected information object to have been registered");for(let[n,s]of r){let o=S.areIdentsEqual(n,s)?s.reference:[S.stringifyIdent(s),s.reference];i.pnpNode.packageDependencies.set(S.stringifyIdent(n),o)}}async attachExternalDependents(e,r){throw new Error("External dependencies haven't been implemented for the node-modules linker")}async finalizeInstall(){if(this.opts.project.configuration.get("nodeLinker")!=="node-modules")return;let e=new Pr({baseFs:new Jn({libzip:await $i(),maxOpenFiles:80,readOnlyArchives:!0})}),r=await hT(this.opts.project),i=this.opts.project.configuration.get("nmMode");(r===null||i!==r.nmMode)&&(this.opts.project.storedBuildState.clear(),r={locatorMap:new Map,binSymlinks:new Map,locationTree:new Map,nmMode:i});let n=new Map(this.opts.project.workspaces.map(f=>{var p,d;let h=this.opts.project.configuration.get("nmHoistingLimits");try{h=de.validateEnum(Sn,(d=(p=f.manifest.installConfig)==null?void 0:p.hoistingLimits)!=null?d:h)}catch(m){let E=S.prettyWorkspace(this.opts.project.configuration,f);this.opts.report.reportWarning(z.INVALID_MANIFEST,`${E}: Invalid 'installConfig.hoistingLimits' value. Expected one of ${Object.values(Sn).join(", ")}, using default: "${h}"`)}return[f.relativeCwd,h]})),s=new Map(this.opts.project.workspaces.map(f=>{var p,d;let h=this.opts.project.configuration.get("nmSelfReferences");return h=(d=(p=f.manifest.installConfig)==null?void 0:p.selfReferences)!=null?d:h,[f.relativeCwd,h]})),o={VERSIONS:{std:1},topLevel:{name:null,reference:null},getLocator:(f,h)=>Array.isArray(h)?{name:h[0],reference:h[1]}:{name:f,reference:h},getDependencyTreeRoots:()=>this.opts.project.workspaces.map(f=>{let h=f.anchoredLocator;return{name:S.stringifyIdent(f.locator),reference:h.reference}}),getPackageInformation:f=>{let h=f.reference===null?this.opts.project.topLevelWorkspace.anchoredLocator:S.makeLocator(S.parseIdent(f.name),f.reference),p=this.localStore.get(h.locatorHash);if(typeof p=="undefined")throw new Error("Assertion failed: Expected the package reference to have been registered");return p.pnpNode},findPackageLocator:f=>{let h=this.opts.project.tryWorkspaceByCwd(M.toPortablePath(f));if(h!==null){let p=h.anchoredLocator;return{name:S.stringifyIdent(p),reference:p.reference}}throw new Error("Assertion failed: Unimplemented")},resolveToUnqualified:()=>{throw new Error("Assertion failed: Unimplemented")},resolveUnqualified:()=>{throw new Error("Assertion failed: Unimplemented")},resolveRequest:()=>{throw new Error("Assertion failed: Unimplemented")},resolveVirtual:f=>M.fromPortablePath(Pr.resolveVirtual(M.toPortablePath(f)))},{tree:a,errors:l,preserveSymlinksRequired:c}=VC(o,{pnpifyFs:!1,validateExternalSoftLinks:!0,hoistingLimitsByCwd:n,project:this.opts.project,selfReferencesByCwd:s});if(!a){for(let{messageName:f,text:h}of l)this.opts.report.reportError(f,h);return}let u=WL(a);await T6e(r,u,{baseFs:e,project:this.opts.project,report:this.opts.report,realLocatorChecksums:this.realLocatorChecksums,loadManifest:async f=>{let h=S.parseLocator(f),p=this.localStore.get(h.locatorHash);if(typeof p=="undefined")throw new Error("Assertion failed: Expected the slot to exist");return p.customPackageData.manifest}});let g=[];for(let[f,h]of u.entries()){if(wce(f))continue;let p=S.parseLocator(f),d=this.localStore.get(p.locatorHash);if(typeof d=="undefined")throw new Error("Assertion failed: Expected the slot to exist");if(this.opts.project.tryWorkspaceByLocator(d.pkg))continue;let m=Ws.extractBuildScripts(d.pkg,d.customPackageData,d.dependencyMeta,{configuration:this.opts.project.configuration,report:this.opts.report});m.length!==0&&g.push({buildLocations:h.locations,locatorHash:p.locatorHash,buildDirective:m})}return c&&this.opts.report.reportWarning(z.NM_PRESERVE_SYMLINKS_REQUIRED,`The application uses portals and that's why ${ue.pretty(this.opts.project.configuration,"--preserve-symlinks",ue.Type.CODE)} Node option is required for launching it`),{customData:this.customData,records:g}}};async function L6e(t,e){var n;let r=(n=await Ze.tryFind(e.prefixPath,{baseFs:e.packageFs}))!=null?n:new Ze,i=new Set(["preinstall","install","postinstall"]);for(let s of r.scripts.keys())i.has(s)||r.scripts.delete(s);return{manifest:{bin:r.bin,scripts:r.scripts},misc:{extractHint:Ws.getExtractHint(e),hasBindingGyp:Ws.hasBindingGyp(e)}}}async function M6e(t,e,r,i){let n="";n+=`# Warning: This file is automatically generated. Removing it is fine, but will +`,n+=`# cause your node_modules installation to become invalidated. +`,n+=` +`,n+=`__metadata: +`,n+=` version: ${Ice} +`,n+=` nmMode: ${i.value} +`;let s=Array.from(e.keys()).sort(),o=S.stringifyLocator(t.topLevelWorkspace.anchoredLocator);for(let c of s){let u=e.get(c);n+=` +`,n+=`${JSON.stringify(c)}: +`,n+=` locations: +`;for(let g of u.locations){let f=v.contains(t.cwd,g);if(f===null)throw new Error(`Assertion failed: Expected the path to be within the project (${g})`);n+=` - ${JSON.stringify(f)} +`}if(u.aliases.length>0){n+=` aliases: +`;for(let g of u.aliases)n+=` - ${JSON.stringify(g)} +`}if(c===o&&r.size>0){n+=` bin: +`;for(let[g,f]of r){let h=v.contains(t.cwd,g);if(h===null)throw new Error(`Assertion failed: Expected the path to be within the project (${g})`);n+=` ${JSON.stringify(h)}: +`;for(let[p,d]of f){let m=v.relative(v.join(g,gi),d);n+=` ${JSON.stringify(p)}: ${JSON.stringify(m)} +`}}}}let a=t.cwd,l=v.join(a,gi,Ece);await T.changeFilePromise(l,n,{automaticNewlines:!0})}async function hT(t,{unrollAliases:e=!1}={}){let r=t.cwd,i=v.join(r,gi,Ece);if(!T.existsSync(i))return null;let n=Ei(await T.readFilePromise(i,"utf8"));if(n.__metadata.version>Ice)return null;let s=n.__metadata.nmMode||Bi.CLASSIC,o=new Map,a=new Map;delete n.__metadata;for(let[l,c]of Object.entries(n)){let u=c.locations.map(f=>v.join(r,f)),g=c.bin;if(g)for(let[f,h]of Object.entries(g)){let p=v.join(r,M.toPortablePath(f)),d=de.getMapWithDefault(a,p);for(let[m,E]of Object.entries(h))d.set(kr(m),M.toPortablePath([p,gi,E].join(v.delimiter)))}if(o.set(l,{target:Se.dot,linkType:gt.HARD,locations:u,aliases:c.aliases||[]}),e&&c.aliases)for(let f of c.aliases){let{scope:h,name:p}=S.parseLocator(l),d=S.makeLocator(S.makeIdent(h,p),f),m=S.stringifyLocator(d);o.set(m,{target:Se.dot,linkType:gt.HARD,locations:u,aliases:[]})}}return{locatorMap:o,binSymlinks:a,locationTree:Bce(o,{skipPrefix:t.cwd}),nmMode:s}}var If=async(t,e)=>{if(t.split(v.sep).indexOf(gi)<0)throw new Error(`Assertion failed: trying to remove dir that doesn't contain node_modules: ${t}`);try{if(!e.innerLoop&&(await T.lstatPromise(t)).isSymbolicLink()){await T.unlinkPromise(t);return}let r=await T.readdirPromise(t,{withFileTypes:!0});for(let i of r){let n=v.join(t,kr(i.name));i.isDirectory()?(i.name!==gi||e&&e.innerLoop)&&await If(n,{innerLoop:!0,contentsOnly:!1}):await T.unlinkPromise(n)}e.contentsOnly||await T.rmdirPromise(t)}catch(r){if(r.code!=="ENOENT"&&r.code!=="ENOTEMPTY")throw r}},Qce=4,$0=(t,{skipPrefix:e})=>{let r=v.contains(e,t);if(r===null)throw new Error(`Assertion failed: Writing attempt prevented to ${t} which is outside project root: ${e}`);let i=r.split(v.sep).filter(l=>l!==""),n=i.indexOf(gi),s=i.slice(0,n).join(v.sep),o=v.join(e,s),a=i.slice(n);return{locationRoot:o,segments:a}},Bce=(t,{skipPrefix:e})=>{let r=new Map;if(t===null)return r;let i=()=>({children:new Map,linkType:gt.HARD});for(let[n,s]of t.entries()){if(s.linkType===gt.SOFT&&v.contains(e,s.target)!==null){let a=de.getFactoryWithDefault(r,s.target,i);a.locator=n,a.linkType=s.linkType}for(let o of s.locations){let{locationRoot:a,segments:l}=$0(o,{skipPrefix:e}),c=de.getFactoryWithDefault(r,a,i);for(let u=0;u{let r;try{process.platform==="win32"&&(r=await T.lstatPromise(t))}catch(i){}process.platform=="win32"&&(!r||r.isDirectory())?await T.symlinkPromise(t,e,"junction"):await T.symlinkPromise(v.relative(v.dirname(e),t),e)};async function bce(t,e,r){let i=v.join(t,kr(`${uT.default.randomBytes(16).toString("hex")}.tmp`));try{await T.writeFilePromise(i,r);try{await T.linkPromise(i,e)}catch(n){}}finally{await T.unlinkPromise(i)}}async function O6e({srcPath:t,dstPath:e,srcMode:r,globalHardlinksStore:i,baseFs:n,nmMode:s,digest:o}){if(s.value===Bi.HARDLINKS_GLOBAL&&i&&o){let l=v.join(i,o.substring(0,2),`${o.substring(2)}.dat`),c;try{if(await mn.checksumFile(l,{baseFs:T,algorithm:"sha1"})!==o){let g=v.join(i,kr(`${uT.default.randomBytes(16).toString("hex")}.tmp`));await T.renamePromise(l,g);let f=await n.readFilePromise(t);await T.writeFilePromise(g,f);try{await T.linkPromise(g,l),await T.unlinkPromise(g)}catch(h){}}await T.linkPromise(l,e),c=!0}catch(u){c=!1}if(!c){let u=await n.readFilePromise(t);await bce(i,l,u);try{await T.linkPromise(l,e)}catch(g){g&&g.code&&g.code=="EXDEV"&&(s.value=Bi.HARDLINKS_LOCAL,await n.copyFilePromise(t,e))}}}else await n.copyFilePromise(t,e);let a=r&511;a!==420&&await T.chmodPromise(e,a)}var JA;(function(i){i.FILE="file",i.DIRECTORY="directory",i.SYMLINK="symlink"})(JA||(JA={}));var K6e=async(t,e,{baseFs:r,globalHardlinksStore:i,nmMode:n,packageChecksum:s})=>{await T.mkdirPromise(t,{recursive:!0});let o=async(l=Se.dot)=>{let c=v.join(e,l),u=await r.readdirPromise(c,{withFileTypes:!0}),g=new Map;for(let f of u){let h=v.join(l,f.name),p,d=v.join(c,f.name);if(f.isFile()){if(p={kind:JA.FILE,mode:(await r.lstatPromise(d)).mode},n.value===Bi.HARDLINKS_GLOBAL){let m=await mn.checksumFile(d,{baseFs:r,algorithm:"sha1"});p.digest=m}}else if(f.isDirectory())p={kind:JA.DIRECTORY};else if(f.isSymbolicLink())p={kind:JA.SYMLINK,symlinkTo:await r.readlinkPromise(d)};else throw new Error(`Unsupported file type (file: ${d}, mode: 0o${await r.statSync(d).mode.toString(8).padStart(6,"0")})`);if(g.set(h,p),f.isDirectory()&&h!==gi){let m=await o(h);for(let[E,B]of m)g.set(E,B)}}return g},a;if(n.value===Bi.HARDLINKS_GLOBAL&&i&&s){let l=v.join(i,s.substring(0,2),`${s.substring(2)}.json`);try{a=new Map(Object.entries(JSON.parse(await T.readFilePromise(l,"utf8"))))}catch(c){a=await o(),await bce(i,l,Buffer.from(JSON.stringify(Object.fromEntries(a))))}}else a=await o();for(let[l,c]of a){let u=v.join(e,l),g=v.join(t,l);c.kind===JA.DIRECTORY?await T.mkdirPromise(g,{recursive:!0}):c.kind===JA.FILE?await O6e({srcPath:u,dstPath:g,srcMode:c.mode,digest:c.digest,nmMode:n,baseFs:r,globalHardlinksStore:i}):c.kind===JA.SYMLINK&&await pT(v.resolve(v.dirname(g),c.symlinkTo),g)}};function U6e(t,e){let r=new Map([...t]),i=new Map([...e]);for(let[n,s]of t){let o=v.join(n,gi);if(!T.existsSync(o)){s.children.delete(gi);for(let a of i.keys())v.contains(o,a)!==null&&i.delete(a)}}return{locationTree:r,binSymlinks:i}}function wce(t){let e=S.parseDescriptor(t);return S.isVirtualDescriptor(e)&&(e=S.devirtualizeDescriptor(e)),e.range.startsWith("link:")}async function H6e(t,e,r,{loadManifest:i}){let n=new Map;for(let[a,{locations:l}]of t){let c=wce(a)?null:await i(a,l[0]),u=new Map;if(c)for(let[g,f]of c.bin){let h=v.join(l[0],f);f!==""&&T.existsSync(h)&&u.set(g,f)}n.set(a,u)}let s=new Map,o=(a,l,c)=>{let u=new Map,g=v.contains(r,a);if(c.locator&&g!==null){let f=n.get(c.locator);for(let[h,p]of f){let d=v.join(a,M.toPortablePath(p));u.set(kr(h),d)}for(let[h,p]of c.children){let d=v.join(a,h),m=o(d,d,p);m.size>0&&s.set(a,new Map([...s.get(a)||new Map,...m]))}}else for(let[f,h]of c.children){let p=o(v.join(a,f),l,h);for(let[d,m]of p)u.set(d,m)}return u};for(let[a,l]of e){let c=o(a,a,l);c.size>0&&s.set(a,new Map([...s.get(a)||new Map,...c]))}return s}var vce=(t,e)=>{if(!t||!e)return t===e;let r=S.parseLocator(t);S.isVirtualLocator(r)&&(r=S.devirtualizeLocator(r));let i=S.parseLocator(e);return S.isVirtualLocator(i)&&(i=S.devirtualizeLocator(i)),S.areLocatorsEqual(r,i)};function dT(t){return v.join(t.get("globalFolder"),"store")}async function T6e(t,e,{baseFs:r,project:i,report:n,loadManifest:s,realLocatorChecksums:o}){let a=v.join(i.cwd,gi),{locationTree:l,binSymlinks:c}=U6e(t.locationTree,t.binSymlinks),u=Bce(e,{skipPrefix:i.cwd}),g=[],f=async({srcDir:L,dstDir:K,linkType:J,globalHardlinksStore:ne,nmMode:q,packageChecksum:A})=>{let V=(async()=>{try{J===gt.SOFT?(await T.mkdirPromise(v.dirname(K),{recursive:!0}),await pT(v.resolve(L),K)):await K6e(K,L,{baseFs:r,globalHardlinksStore:ne,nmMode:q,packageChecksum:A})}catch(W){throw W.message=`While persisting ${L} -> ${K} ${W.message}`,W}finally{B.tick()}})().then(()=>g.splice(g.indexOf(V),1));g.push(V),g.length>Qce&&await Promise.race(g)},h=async(L,K,J)=>{let ne=(async()=>{let q=async(A,V,W)=>{try{W.innerLoop||await T.mkdirPromise(V,{recursive:!0});let X=await T.readdirPromise(A,{withFileTypes:!0});for(let F of X){if(!W.innerLoop&&F.name===gT)continue;let D=v.join(A,F.name),he=v.join(V,F.name);F.isDirectory()?(F.name!==gi||W&&W.innerLoop)&&(await T.mkdirPromise(he,{recursive:!0}),await q(D,he,_(P({},W),{innerLoop:!0}))):H.value===Bi.HARDLINKS_LOCAL||H.value===Bi.HARDLINKS_GLOBAL?await T.linkPromise(D,he):await T.copyFilePromise(D,he,mce.default.constants.COPYFILE_FICLONE)}}catch(X){throw W.innerLoop||(X.message=`While cloning ${A} -> ${V} ${X.message}`),X}finally{W.innerLoop||B.tick()}};await q(L,K,J)})().then(()=>g.splice(g.indexOf(ne),1));g.push(ne),g.length>Qce&&await Promise.race(g)},p=async(L,K,J)=>{if(!J)K.children.has(gi)&&await If(v.join(L,gi),{contentsOnly:!1}),await If(L,{contentsOnly:L===a});else for(let[ne,q]of K.children){let A=J.children.get(ne);await p(v.join(L,ne),q,A)}};for(let[L,K]of l){let J=u.get(L);for(let[ne,q]of K.children){if(ne===".")continue;let A=J&&J.children.get(ne);await p(v.join(L,ne),q,A)}}let d=async(L,K,J)=>{if(!J)K.children.has(gi)&&await If(v.join(L,gi),{contentsOnly:!0}),await If(L,{contentsOnly:K.linkType===gt.HARD});else{vce(K.locator,J.locator)||await If(L,{contentsOnly:K.linkType===gt.HARD});for(let[ne,q]of K.children){let A=J.children.get(ne);await d(v.join(L,ne),q,A)}}};for(let[L,K]of u){let J=l.get(L);for(let[ne,q]of K.children){if(ne===".")continue;let A=J&&J.children.get(ne);await d(v.join(L,ne),q,A)}}let m=new Map,E=[];for(let[L,{locations:K}]of t.locatorMap.entries())for(let J of K){let{locationRoot:ne,segments:q}=$0(J,{skipPrefix:i.cwd}),A=u.get(ne),V=ne;if(A){for(let W of q)if(V=v.join(V,W),A=A.children.get(W),!A)break;if(A){let W=vce(A.locator,L),X=e.get(A.locator),F=X.target,D=V,he=X.linkType;if(W)m.has(F)||m.set(F,D);else if(F!==D){let pe=S.parseLocator(A.locator);S.isVirtualLocator(pe)&&(pe=S.devirtualizeLocator(pe)),E.push({srcDir:F,dstDir:D,linkType:he,realLocatorHash:pe.locatorHash})}}}}for(let[L,{locations:K}]of e.entries())for(let J of K){let{locationRoot:ne,segments:q}=$0(J,{skipPrefix:i.cwd}),A=l.get(ne),V=u.get(ne),W=ne,X=e.get(L),F=S.parseLocator(L);S.isVirtualLocator(F)&&(F=S.devirtualizeLocator(F));let D=F.locatorHash,he=X.target,pe=J;if(he===pe)continue;let Ne=X.linkType;for(let Pe of q)V=V.children.get(Pe);if(!A)E.push({srcDir:he,dstDir:pe,linkType:Ne,realLocatorHash:D});else for(let Pe of q)if(W=v.join(W,Pe),A=A.children.get(Pe),!A){E.push({srcDir:he,dstDir:pe,linkType:Ne,realLocatorHash:D});break}}let B=Xi.progressViaCounter(E.length),b=n.reportProgress(B),R=i.configuration.get("nmMode"),H={value:R};try{let L=H.value===Bi.HARDLINKS_GLOBAL?`${dT(i.configuration)}/v1`:null;if(L&&!await T.existsPromise(L)){await T.mkdirpPromise(L);for(let J=0;J<256;J++)await T.mkdirPromise(v.join(L,J.toString(16).padStart(2,"0")))}for(let J of E)(J.linkType===gt.SOFT||!m.has(J.srcDir))&&(m.set(J.srcDir,J.dstDir),await f(_(P({},J),{globalHardlinksStore:L,nmMode:H,packageChecksum:o.get(J.realLocatorHash)||null})));await Promise.all(g),g.length=0;for(let J of E){let ne=m.get(J.srcDir);J.linkType!==gt.SOFT&&J.dstDir!==ne&&await h(ne,J.dstDir,{nmMode:H})}await Promise.all(g),await T.mkdirPromise(a,{recursive:!0});let K=await H6e(e,u,i.cwd,{loadManifest:s});await G6e(c,K,i.cwd),await M6e(i,e,K,H),R==Bi.HARDLINKS_GLOBAL&&H.value==Bi.HARDLINKS_LOCAL&&n.reportWarningOnce(z.NM_HARDLINKS_MODE_DOWNGRADED,"'nmMode' has been downgraded to 'hardlinks-local' due to global cache and install folder being on different devices")}finally{b.stop()}}async function G6e(t,e,r){for(let i of t.keys()){if(v.contains(r,i)===null)throw new Error(`Assertion failed. Excepted bin symlink location to be inside project dir, instead it was at ${i}`);if(!e.has(i)){let n=v.join(i,gi,gT);await T.removePromise(n)}}for(let[i,n]of e){if(v.contains(r,i)===null)throw new Error(`Assertion failed. Excepted bin symlink location to be inside project dir, instead it was at ${i}`);let s=v.join(i,gi,gT),o=t.get(i)||new Map;await T.mkdirPromise(s,{recursive:!0});for(let a of o.keys())n.has(a)||(await T.removePromise(v.join(s,a)),process.platform==="win32"&&await T.removePromise(v.join(s,kr(`${a}.cmd`))));for(let[a,l]of n){let c=o.get(a),u=v.join(s,a);c!==l&&(process.platform==="win32"?await(0,Cce.default)(M.fromPortablePath(l),M.fromPortablePath(u),{createPwshFile:!1}):(await T.removePromise(u),await pT(l,u),v.contains(r,await T.realpathPromise(l))!==null&&await T.chmodPromise(l,493)))}}}var CT=class extends jc{constructor(){super(...arguments);this.mode="loose"}makeInstaller(e){return new Sce(e)}},Sce=class extends Cf{constructor(){super(...arguments);this.mode="loose"}async transformPnpSettings(e){let r=new Pr({baseFs:new Jn({libzip:await $i(),maxOpenFiles:80,readOnlyArchives:!0})}),i=ice(e,this.opts.project.cwd,r),{tree:n,errors:s}=VC(i,{pnpifyFs:!1,project:this.opts.project});if(!n){for(let{messageName:u,text:g}of s)this.opts.report.reportError(u,g);return}let o=new Map;e.fallbackPool=o;let a=(u,g)=>{let f=S.parseLocator(g.locator),h=S.stringifyIdent(f);h===u?o.set(u,f.reference):o.set(u,[h,f.reference])},l=v.join(this.opts.project.cwd,wt.nodeModules),c=n.get(l);if(typeof c!="undefined"){if("target"in c)throw new Error("Assertion failed: Expected the root junction point to be a directory");for(let u of c.dirList){let g=v.join(l,u),f=n.get(g);if(typeof f=="undefined")throw new Error("Assertion failed: Expected the child to have been registered");if("target"in f)a(u,f);else for(let h of f.dirList){let p=v.join(g,h),d=n.get(p);if(typeof d=="undefined")throw new Error("Assertion failed: Expected the subchild to have been registered");if("target"in d)a(`${u}/${h}`,d);else throw new Error("Assertion failed: Expected the leaf junction to be a package")}}}}};var j6e={hooks:{cleanGlobalArtifacts:async t=>{let e=dT(t);await T.removePromise(e)}},configuration:{nmHoistingLimits:{description:"Prevent packages to be hoisted past specific levels",type:ge.STRING,values:[Sn.WORKSPACES,Sn.DEPENDENCIES,Sn.NONE],default:Sn.NONE},nmMode:{description:'If set to "hardlinks-local" Yarn will utilize hardlinks to reduce disk space consumption inside "node_modules" directories. With "hardlinks-global" Yarn will use global content addressable storage to reduce "node_modules" size across all the projects using this option.',type:ge.STRING,values:[Bi.CLASSIC,Bi.HARDLINKS_LOCAL,Bi.HARDLINKS_GLOBAL],default:Bi.CLASSIC},nmSelfReferences:{description:"If set to 'false' the workspace will not be allowed to require itself and corresponding self-referencing symlink will not be created",type:ge.BOOLEAN,default:!0}},linkers:[fT,CT]},Y6e=j6e;var yM={};it(yM,{default:()=>ZVe,npmConfigUtils:()=>gr,npmHttpUtils:()=>Lt,npmPublishUtils:()=>Rf});var Rce=ie(Or());var ir="npm:";var Lt={};it(Lt,{AuthType:()=>jn,customPackageError:()=>W6e,del:()=>_6e,get:()=>zs,getIdentUrl:()=>zA,handleInvalidAuthenticationError:()=>WA,post:()=>z6e,put:()=>V6e});var Pce=ie(aC()),Dce=ie(require("url"));var gr={};it(gr,{RegistryType:()=>ja,getAuditRegistry:()=>q6e,getAuthConfiguration:()=>ET,getDefaultRegistry:()=>eQ,getPublishRegistry:()=>xce,getRegistryConfiguration:()=>kce,getScopeConfiguration:()=>IT,getScopeRegistry:()=>Ya,normalizeRegistry:()=>To});var ja;(function(i){i.AUDIT_REGISTRY="npmAuditRegistry",i.FETCH_REGISTRY="npmRegistryServer",i.PUBLISH_REGISTRY="npmPublishRegistry"})(ja||(ja={}));function To(t){return t.replace(/\/$/,"")}function q6e(t,{configuration:e}){let r=e.get(ja.AUDIT_REGISTRY);return r!==null?To(r):xce(t,{configuration:e})}function xce(t,{configuration:e}){var r;return((r=t.publishConfig)==null?void 0:r.registry)?To(t.publishConfig.registry):t.name?Ya(t.name.scope,{configuration:e,type:ja.PUBLISH_REGISTRY}):eQ({configuration:e,type:ja.PUBLISH_REGISTRY})}function Ya(t,{configuration:e,type:r=ja.FETCH_REGISTRY}){let i=IT(t,{configuration:e});if(i===null)return eQ({configuration:e,type:r});let n=i.get(r);return n===null?eQ({configuration:e,type:r}):To(n)}function eQ({configuration:t,type:e=ja.FETCH_REGISTRY}){let r=t.get(e);return To(r!==null?r:t.get(ja.FETCH_REGISTRY))}function kce(t,{configuration:e}){let r=e.get("npmRegistries"),i=To(t),n=r.get(i);if(typeof n!="undefined")return n;let s=r.get(i.replace(/^[a-z]+:/,""));return typeof s!="undefined"?s:null}function IT(t,{configuration:e}){if(t===null)return null;let i=e.get("npmScopes").get(t);return i||null}function ET(t,{configuration:e,ident:r}){let i=r&&IT(r.scope,{configuration:e});return(i==null?void 0:i.get("npmAuthIdent"))||(i==null?void 0:i.get("npmAuthToken"))?i:kce(t,{configuration:e})||e}var jn;(function(n){n[n.NO_AUTH=0]="NO_AUTH",n[n.BEST_EFFORT=1]="BEST_EFFORT",n[n.CONFIGURATION=2]="CONFIGURATION",n[n.ALWAYS_AUTH=3]="ALWAYS_AUTH"})(jn||(jn={}));async function WA(t,{attemptedAs:e,registry:r,headers:i,configuration:n}){var s,o;if(((s=t.originalError)==null?void 0:s.name)==="HTTPError"&&((o=t.originalError)==null?void 0:o.response.statusCode)===401)throw new nt(z.AUTHENTICATION_INVALID,`Invalid authentication (${typeof e!="string"?`as ${await J6e(r,i,{configuration:n})}`:`attempted as ${e}`})`)}function W6e(t){var e;return((e=t.response)==null?void 0:e.statusCode)===404?"Package not found":null}function zA(t){return t.scope?`/@${t.scope}%2f${t.name}`:`/${t.name}`}async function zs(t,a){var l=a,{configuration:e,headers:r,ident:i,authType:n,registry:s}=l,o=qr(l,["configuration","headers","ident","authType","registry"]);if(i&&typeof s=="undefined"&&(s=Ya(i.scope,{configuration:e})),i&&i.scope&&typeof n=="undefined"&&(n=1),typeof s!="string")throw new Error("Assertion failed: The registry should be a string");let c=await tQ(s,{authType:n,configuration:e,ident:i});c&&(r=_(P({},r),{authorization:c}));try{return await Zt.get(t.charAt(0)==="/"?`${s}${t}`:t,P({configuration:e,headers:r},o))}catch(u){throw await WA(u,{registry:s,configuration:e,headers:r}),u}}async function z6e(t,e,c){var u=c,{attemptedAs:r,configuration:i,headers:n,ident:s,authType:o=3,registry:a}=u,l=qr(u,["attemptedAs","configuration","headers","ident","authType","registry"]);if(s&&typeof a=="undefined"&&(a=Ya(s.scope,{configuration:i})),typeof a!="string")throw new Error("Assertion failed: The registry should be a string");let g=await tQ(a,{authType:o,configuration:i,ident:s});g&&(n=_(P({},n),{authorization:g}));try{return await Zt.post(a+t,e,P({configuration:i,headers:n},l))}catch(f){if(!wT(f))throw await WA(f,{attemptedAs:r,registry:a,configuration:i,headers:n}),f;let h=await yT(),p=P(P({},n),BT(h));try{return await Zt.post(`${a}${t}`,e,P({configuration:i,headers:p},l))}catch(d){throw await WA(d,{attemptedAs:r,registry:a,configuration:i,headers:n}),d}}}async function V6e(t,e,c){var u=c,{attemptedAs:r,configuration:i,headers:n,ident:s,authType:o=3,registry:a}=u,l=qr(u,["attemptedAs","configuration","headers","ident","authType","registry"]);if(s&&typeof a=="undefined"&&(a=Ya(s.scope,{configuration:i})),typeof a!="string")throw new Error("Assertion failed: The registry should be a string");let g=await tQ(a,{authType:o,configuration:i,ident:s});g&&(n=_(P({},n),{authorization:g}));try{return await Zt.put(a+t,e,P({configuration:i,headers:n},l))}catch(f){if(!wT(f))throw await WA(f,{attemptedAs:r,registry:a,configuration:i,headers:n}),f;let h=await yT(),p=P(P({},n),BT(h));try{return await Zt.put(`${a}${t}`,e,P({configuration:i,headers:p},l))}catch(d){throw await WA(d,{attemptedAs:r,registry:a,configuration:i,headers:n}),d}}}async function _6e(t,l){var c=l,{attemptedAs:e,configuration:r,headers:i,ident:n,authType:s=3,registry:o}=c,a=qr(c,["attemptedAs","configuration","headers","ident","authType","registry"]);if(n&&typeof o=="undefined"&&(o=Ya(n.scope,{configuration:r})),typeof o!="string")throw new Error("Assertion failed: The registry should be a string");let u=await tQ(o,{authType:s,configuration:r,ident:n});u&&(i=_(P({},i),{authorization:u}));try{return await Zt.del(o+t,P({configuration:r,headers:i},a))}catch(g){if(!wT(g))throw await WA(g,{attemptedAs:e,registry:o,configuration:r,headers:i}),g;let f=await yT(),h=P(P({},i),BT(f));try{return await Zt.del(`${o}${t}`,P({configuration:r,headers:h},a))}catch(p){throw await WA(p,{attemptedAs:e,registry:o,configuration:r,headers:i}),p}}}async function tQ(t,{authType:e=2,configuration:r,ident:i}){let n=ET(t,{configuration:r,ident:i}),s=X6e(n,e);if(!s)return null;let o=await r.reduceHook(a=>a.getNpmAuthenticationHeader,void 0,t,{configuration:r,ident:i});if(o)return o;if(n.get("npmAuthToken"))return`Bearer ${n.get("npmAuthToken")}`;if(n.get("npmAuthIdent")){let a=n.get("npmAuthIdent");return a.includes(":")?`Basic ${Buffer.from(a).toString("base64")}`:`Basic ${a}`}if(s&&e!==1)throw new nt(z.AUTHENTICATION_NOT_FOUND,"No authentication configured for request");return null}function X6e(t,e){switch(e){case 2:return t.get("npmAlwaysAuth");case 1:case 3:return!0;case 0:return!1;default:throw new Error("Unreachable")}}async function J6e(t,e,{configuration:r}){var i;if(typeof e=="undefined"||typeof e.authorization=="undefined")return"an anonymous user";try{return(i=(await Zt.get(new Dce.URL(`${t}/-/whoami`).href,{configuration:r,headers:e,jsonResponse:!0})).username)!=null?i:"an unknown user"}catch{return"an unknown user"}}async function yT(){if(process.env.TEST_ENV)return process.env.TEST_NPM_2FA_TOKEN||"";let{otp:t}=await(0,Pce.prompt)({type:"password",name:"otp",message:"One-time password:",required:!0,onCancel:()=>process.exit(130)});return t}function wT(t){var e,r;if(((e=t.originalError)==null?void 0:e.name)!=="HTTPError")return!1;try{return((r=t.originalError)==null?void 0:r.response.headers["www-authenticate"].split(/,\s*/).map(n=>n.toLowerCase())).includes("otp")}catch(i){return!1}}function BT(t){return{["npm-otp"]:t}}var QT=class{supports(e,r){if(!e.reference.startsWith(ir))return!1;let{selector:i,params:n}=S.parseRange(e.reference);return!(!Rce.default.valid(i)||n===null||typeof n.__archiveUrl!="string")}getLocalPath(e,r){return null}async fetch(e,r){let i=r.checksums.get(e.locatorHash)||null,[n,s,o]=await r.cache.fetchPackageFromCache(e,i,P({onHit:()=>r.report.reportCacheHit(e),onMiss:()=>r.report.reportCacheMiss(e,`${S.prettyLocator(r.project.configuration,e)} can't be found in the cache and will be fetched from the remote server`),loader:()=>this.fetchFromNetwork(e,r),skipIntegrityCheck:r.skipIntegrityCheck},r.cacheOptions));return{packageFs:n,releaseFs:s,prefixPath:S.getIdentVendorPath(e),checksum:o}}async fetchFromNetwork(e,r){let{params:i}=S.parseRange(e.reference);if(i===null||typeof i.__archiveUrl!="string")throw new Error("Assertion failed: The archiveUrl querystring parameter should have been available");let n=await zs(i.__archiveUrl,{configuration:r.project.configuration,ident:e});return await Ai.convertToZip(n,{compressionLevel:r.project.configuration.get("compressionLevel"),prefixPath:S.getIdentVendorPath(e),stripComponents:1})}};var bT=class{supportsDescriptor(e,r){return!(!e.range.startsWith(ir)||!S.tryParseDescriptor(e.range.slice(ir.length),!0))}supportsLocator(e,r){return!1}shouldPersistResolution(e,r){throw new Error("Unreachable")}bindDescriptor(e,r,i){return e}getResolutionDependencies(e,r){let i=S.parseDescriptor(e.range.slice(ir.length),!0);return r.resolver.getResolutionDependencies(i,r)}async getCandidates(e,r,i){let n=S.parseDescriptor(e.range.slice(ir.length),!0);return await i.resolver.getCandidates(n,r,i)}async getSatisfying(e,r,i){let n=S.parseDescriptor(e.range.slice(ir.length),!0);return i.resolver.getSatisfying(n,r,i)}resolve(e,r){throw new Error("Unreachable")}};var vT=ie(Or()),Fce=ie(require("url"));var Vs=class{supports(e,r){if(!e.reference.startsWith(ir))return!1;let i=new Fce.URL(e.reference);return!(!vT.default.valid(i.pathname)||i.searchParams.has("__archiveUrl"))}getLocalPath(e,r){return null}async fetch(e,r){let i=r.checksums.get(e.locatorHash)||null,[n,s,o]=await r.cache.fetchPackageFromCache(e,i,P({onHit:()=>r.report.reportCacheHit(e),onMiss:()=>r.report.reportCacheMiss(e,`${S.prettyLocator(r.project.configuration,e)} can't be found in the cache and will be fetched from the remote registry`),loader:()=>this.fetchFromNetwork(e,r),skipIntegrityCheck:r.skipIntegrityCheck},r.cacheOptions));return{packageFs:n,releaseFs:s,prefixPath:S.getIdentVendorPath(e),checksum:o}}async fetchFromNetwork(e,r){let i;try{i=await zs(Vs.getLocatorUrl(e),{configuration:r.project.configuration,ident:e})}catch(n){i=await zs(Vs.getLocatorUrl(e).replace(/%2f/g,"/"),{configuration:r.project.configuration,ident:e})}return await Ai.convertToZip(i,{compressionLevel:r.project.configuration.get("compressionLevel"),prefixPath:S.getIdentVendorPath(e),stripComponents:1})}static isConventionalTarballUrl(e,r,{configuration:i}){let n=Ya(e.scope,{configuration:i}),s=Vs.getLocatorUrl(e);return r=r.replace(/^https?:(\/\/(?:[^/]+\.)?npmjs.org(?:$|\/))/,"https:$1"),n=n.replace(/^https:\/\/registry\.npmjs\.org($|\/)/,"https://registry.yarnpkg.com$1"),r=r.replace(/^https:\/\/registry\.npmjs\.org($|\/)/,"https://registry.yarnpkg.com$1"),r===n+s||r===n+s.replace(/%2f/g,"/")}static getLocatorUrl(e){let r=vT.default.clean(e.reference.slice(ir.length));if(r===null)throw new nt(z.RESOLVER_NOT_FOUND,"The npm semver resolver got selected, but the version isn't semver");return`${zA(e)}/-/${e.name}-${r}.tgz`}};var ST=ie(Or());var rQ=S.makeIdent(null,"node-gyp"),Z6e=/\b(node-gyp|prebuild-install)\b/,xT=class{supportsDescriptor(e,r){return e.range.startsWith(ir)?!!qt.validRange(e.range.slice(ir.length)):!1}supportsLocator(e,r){if(!e.reference.startsWith(ir))return!1;let{selector:i}=S.parseRange(e.reference);return!!ST.default.valid(i)}shouldPersistResolution(e,r){return!0}bindDescriptor(e,r,i){return e}getResolutionDependencies(e,r){return[]}async getCandidates(e,r,i){let n=qt.validRange(e.range.slice(ir.length));if(n===null)throw new Error(`Expected a valid range, got ${e.range.slice(ir.length)}`);let s=await zs(zA(e),{configuration:i.project.configuration,ident:e,jsonResponse:!0}),o=de.mapAndFilter(Object.keys(s.versions),c=>{try{let u=new qt.SemVer(c);if(n.test(u))return u}catch{}return de.mapAndFilter.skip}),a=o.filter(c=>!s.versions[c.raw].deprecated),l=a.length>0?a:o;return l.sort((c,u)=>-c.compare(u)),l.map(c=>{let u=S.makeLocator(e,`${ir}${c.raw}`),g=s.versions[c.raw].dist.tarball;return Vs.isConventionalTarballUrl(u,g,{configuration:i.project.configuration})?u:S.bindLocator(u,{__archiveUrl:g})})}async getSatisfying(e,r,i){let n=qt.validRange(e.range.slice(ir.length));if(n===null)throw new Error(`Expected a valid range, got ${e.range.slice(ir.length)}`);return de.mapAndFilter(r,s=>{try{let{selector:o}=S.parseRange(s,{requireProtocol:ir}),a=new qt.SemVer(o);if(n.test(a))return{reference:s,version:a}}catch{}return de.mapAndFilter.skip}).sort((s,o)=>-s.version.compare(o.version)).map(({reference:s})=>S.makeLocator(e,s))}async resolve(e,r){let{selector:i}=S.parseRange(e.reference),n=ST.default.clean(i);if(n===null)throw new nt(z.RESOLVER_NOT_FOUND,"The npm semver resolver got selected, but the version isn't semver");let s=await zs(zA(e),{configuration:r.project.configuration,ident:e,jsonResponse:!0});if(!Object.prototype.hasOwnProperty.call(s,"versions"))throw new nt(z.REMOTE_INVALID,'Registry returned invalid data for - missing "versions" field');if(!Object.prototype.hasOwnProperty.call(s.versions,n))throw new nt(z.REMOTE_NOT_FOUND,`Registry failed to return reference "${n}"`);let o=new Ze;if(o.load(s.versions[n]),!o.dependencies.has(rQ.identHash)&&!o.peerDependencies.has(rQ.identHash)){for(let a of o.scripts.values())if(a.match(Z6e)){o.dependencies.set(rQ.identHash,S.makeDescriptor(rQ,"latest")),r.report.reportWarningOnce(z.NODE_GYP_INJECTED,`${S.prettyLocator(r.project.configuration,e)}: Implicit dependencies on node-gyp are discouraged`);break}}return typeof o.raw.deprecated=="string"&&r.report.reportWarningOnce(z.DEPRECATED_PACKAGE,`${S.prettyLocator(r.project.configuration,e)} is deprecated: ${o.raw.deprecated}`),_(P({},e),{version:n,languageName:"node",linkType:gt.HARD,conditions:o.getConditions(),dependencies:o.dependencies,peerDependencies:o.peerDependencies,dependenciesMeta:o.dependenciesMeta,peerDependenciesMeta:o.peerDependenciesMeta,bin:o.bin})}};var kT=class{supportsDescriptor(e,r){return!(!e.range.startsWith(ir)||!Rg.test(e.range.slice(ir.length)))}supportsLocator(e,r){return!1}shouldPersistResolution(e,r){throw new Error("Unreachable")}bindDescriptor(e,r,i){return e}getResolutionDependencies(e,r){return[]}async getCandidates(e,r,i){let n=e.range.slice(ir.length),s=await zs(zA(e),{configuration:i.project.configuration,ident:e,jsonResponse:!0});if(!Object.prototype.hasOwnProperty.call(s,"dist-tags"))throw new nt(z.REMOTE_INVALID,'Registry returned invalid data - missing "dist-tags" field');let o=s["dist-tags"];if(!Object.prototype.hasOwnProperty.call(o,n))throw new nt(z.REMOTE_NOT_FOUND,`Registry failed to return tag "${n}"`);let a=o[n],l=S.makeLocator(e,`${ir}${a}`),c=s.versions[a].dist.tarball;return Vs.isConventionalTarballUrl(l,c,{configuration:i.project.configuration})?[l]:[S.bindLocator(l,{__archiveUrl:c})]}async getSatisfying(e,r,i){return null}async resolve(e,r){throw new Error("Unreachable")}};var Rf={};it(Rf,{getGitHead:()=>_Ve,makePublishBody:()=>VVe});var CM={};it(CM,{default:()=>DVe,packUtils:()=>za});var za={};it(za,{genPackList:()=>QQ,genPackStream:()=>dM,genPackageManifest:()=>age,hasPackScripts:()=>hM,prepareForPack:()=>pM});var fM=ie(Nn()),sge=ie(nge()),oge=ie(require("zlib")),EVe=["/package.json","/readme","/readme.*","/license","/license.*","/licence","/licence.*","/changelog","/changelog.*"],yVe=["/package.tgz",".github",".git",".hg","node_modules",".npmignore",".gitignore",".#*",".DS_Store"];async function hM(t){return!!(Kt.hasWorkspaceScript(t,"prepack")||Kt.hasWorkspaceScript(t,"postpack"))}async function pM(t,{report:e},r){await Kt.maybeExecuteWorkspaceLifecycleScript(t,"prepack",{report:e});try{let i=v.join(t.cwd,Ze.fileName);await T.existsPromise(i)&&await t.manifest.loadFile(i,{baseFs:T}),await r()}finally{await Kt.maybeExecuteWorkspaceLifecycleScript(t,"postpack",{report:e})}}async function dM(t,e){var s,o;typeof e=="undefined"&&(e=await QQ(t));let r=new Set;for(let a of(o=(s=t.manifest.publishConfig)==null?void 0:s.executableFiles)!=null?o:new Set)r.add(v.normalize(a));for(let a of t.manifest.bin.values())r.add(v.normalize(a));let i=sge.default.pack();process.nextTick(async()=>{for(let a of e){let l=v.normalize(a),c=v.resolve(t.cwd,l),u=v.join("package",l),g=await T.lstatPromise(c),f={name:u,mtime:new Date(mr.SAFE_TIME*1e3)},h=r.has(l)?493:420,p,d,m=new Promise((B,b)=>{p=B,d=b}),E=B=>{B?d(B):p()};if(g.isFile()){let B;l==="package.json"?B=Buffer.from(JSON.stringify(await age(t),null,2)):B=await T.readFilePromise(c),i.entry(_(P({},f),{mode:h,type:"file"}),B,E)}else g.isSymbolicLink()?i.entry(_(P({},f),{mode:h,type:"symlink",linkname:await T.readlinkPromise(c)}),E):E(new Error(`Unsupported file type ${g.mode} for ${M.fromPortablePath(l)}`));await m}i.finalize()});let n=(0,oge.createGzip)();return i.pipe(n),n}async function age(t){let e=JSON.parse(JSON.stringify(t.manifest.raw));return await t.project.configuration.triggerHook(r=>r.beforeWorkspacePacking,t,e),e}async function QQ(t){var g,f,h,p,d,m,E,B;let e=t.project,r=e.configuration,i={accept:[],reject:[]};for(let b of yVe)i.reject.push(b);for(let b of EVe)i.accept.push(b);i.reject.push(r.get("rcFilename"));let n=b=>{if(b===null||!b.startsWith(`${t.cwd}/`))return;let R=v.relative(t.cwd,b),H=v.resolve(Se.root,R);i.reject.push(H)};n(v.resolve(e.cwd,r.get("lockfileFilename"))),n(r.get("cacheFolder")),n(r.get("globalFolder")),n(r.get("installStatePath")),n(r.get("virtualFolder")),n(r.get("yarnPath")),await r.triggerHook(b=>b.populateYarnPaths,e,b=>{n(b)});for(let b of e.workspaces){let R=v.relative(t.cwd,b.cwd);R!==""&&!R.match(/^(\.\.)?\//)&&i.reject.push(`/${R}`)}let s={accept:[],reject:[]},o=(f=(g=t.manifest.publishConfig)==null?void 0:g.main)!=null?f:t.manifest.main,a=(p=(h=t.manifest.publishConfig)==null?void 0:h.module)!=null?p:t.manifest.module,l=(m=(d=t.manifest.publishConfig)==null?void 0:d.browser)!=null?m:t.manifest.browser,c=(B=(E=t.manifest.publishConfig)==null?void 0:E.bin)!=null?B:t.manifest.bin;o!=null&&s.accept.push(v.resolve(Se.root,o)),a!=null&&s.accept.push(v.resolve(Se.root,a)),typeof l=="string"&&s.accept.push(v.resolve(Se.root,l));for(let b of c.values())s.accept.push(v.resolve(Se.root,b));if(l instanceof Map)for(let[b,R]of l.entries())s.accept.push(v.resolve(Se.root,b)),typeof R=="string"&&s.accept.push(v.resolve(Se.root,R));let u=t.manifest.files!==null;if(u){s.reject.push("/*");for(let b of t.manifest.files)Age(s.accept,b,{cwd:Se.root})}return await wVe(t.cwd,{hasExplicitFileList:u,globalList:i,ignoreList:s})}async function wVe(t,{hasExplicitFileList:e,globalList:r,ignoreList:i}){let n=[],s=new Zo(t),o=[[Se.root,[i]]];for(;o.length>0;){let[a,l]=o.pop(),c=await s.lstatPromise(a);if(!cge(a,{globalList:r,ignoreLists:c.isDirectory()?null:l}))if(c.isDirectory()){let u=await s.readdirPromise(a),g=!1,f=!1;if(!e||a!==Se.root)for(let d of u)g=g||d===".gitignore",f=f||d===".npmignore";let h=f?await lge(s,a,".npmignore"):g?await lge(s,a,".gitignore"):null,p=h!==null?[h].concat(l):l;cge(a,{globalList:r,ignoreLists:l})&&(p=[...l,{accept:[],reject:["**/*"]}]);for(let d of u)o.push([v.resolve(a,d),p])}else(c.isFile()||c.isSymbolicLink())&&n.push(v.relative(Se.root,a))}return n.sort()}async function lge(t,e,r){let i={accept:[],reject:[]},n=await t.readFilePromise(v.join(e,r),"utf8");for(let s of n.split(/\n/g))Age(i.reject,s,{cwd:e});return i}function BVe(t,{cwd:e}){let r=t[0]==="!";return r&&(t=t.slice(1)),t.match(/\.{0,1}\//)&&(t=v.resolve(e,t)),r&&(t=`!${t}`),t}function Age(t,e,{cwd:r}){let i=e.trim();i===""||i[0]==="#"||t.push(BVe(i,{cwd:r}))}function cge(t,{globalList:e,ignoreLists:r}){if(bQ(t,e.accept))return!1;if(bQ(t,e.reject))return!0;if(r!==null)for(let i of r){if(bQ(t,i.accept))return!1;if(bQ(t,i.reject))return!0}return!1}function bQ(t,e){let r=e,i=[];for(let n=0;n{await pM(i,{report:l},async()=>{l.reportJson({base:M.fromPortablePath(i.cwd)});let c=await QQ(i);for(let u of c)l.reportInfo(null,M.fromPortablePath(u)),l.reportJson({location:M.fromPortablePath(u)});if(!this.dryRun){let u=await dM(i,c),g=T.createWriteStream(s);u.pipe(g),await new Promise(f=>{g.on("finish",f)})}}),this.dryRun||(l.reportInfo(z.UNNAMED,`Package archive generated in ${ue.pretty(e,s,ue.Type.PATH)}`),l.reportJson({output:M.fromPortablePath(s)}))})).exitCode()}};fm.paths=[["pack"]],fm.usage=ye.Usage({description:"generate a tarball from the active workspace",details:"\n This command will turn the active workspace into a compressed archive suitable for publishing. The archive will by default be stored at the root of the workspace (`package.tgz`).\n\n If the `-o,---out` is set the archive will be created at the specified path. The `%s` and `%v` variables can be used within the path and will be respectively replaced by the package name and version.\n ",examples:[["Create an archive from the active workspace","yarn pack"],["List the files that would be made part of the workspace's archive","yarn pack --dry-run"],["Name and output the archive in a dedicated folder","yarn pack --out /artifacts/%s-%v.tgz"]]});var gge=fm;function QVe(t,{workspace:e}){let r=t.replace("%s",bVe(e)).replace("%v",vVe(e));return M.toPortablePath(r)}function bVe(t){return t.manifest.name!==null?S.slugifyIdent(t.manifest.name):"package"}function vVe(t){return t.manifest.version!==null?t.manifest.version:"unknown"}var SVe=["dependencies","devDependencies","peerDependencies"],xVe="workspace:",kVe=(t,e)=>{var i,n;e.publishConfig&&(e.publishConfig.main&&(e.main=e.publishConfig.main),e.publishConfig.browser&&(e.browser=e.publishConfig.browser),e.publishConfig.module&&(e.module=e.publishConfig.module),e.publishConfig.browser&&(e.browser=e.publishConfig.browser),e.publishConfig.exports&&(e.exports=e.publishConfig.exports),e.publishConfig.bin&&(e.bin=e.publishConfig.bin));let r=t.project;for(let s of SVe)for(let o of t.manifest.getForScope(s).values()){let a=r.tryWorkspaceByDescriptor(o),l=S.parseRange(o.range);if(l.protocol===xVe)if(a===null){if(r.tryWorkspaceByIdent(o)===null)throw new nt(z.WORKSPACE_NOT_FOUND,`${S.prettyDescriptor(r.configuration,o)}: No local workspace found for this range`)}else{let c;S.areDescriptorsEqual(o,a.anchoredDescriptor)||l.selector==="*"?c=(i=a.manifest.version)!=null?i:"0.0.0":l.selector==="~"||l.selector==="^"?c=`${l.selector}${(n=a.manifest.version)!=null?n:"0.0.0"}`:c=l.selector,e[s][S.stringifyIdent(o)]=c}}},PVe={hooks:{beforeWorkspacePacking:kVe},commands:[gge]},DVe=PVe;var yge=ie(require("crypto")),wge=ie(Ege()),Bge=ie(require("url"));async function VVe(t,e,{access:r,tag:i,registry:n,gitHead:s}){let o=t.project.configuration,a=t.manifest.name,l=t.manifest.version,c=S.stringifyIdent(a),u=(0,yge.createHash)("sha1").update(e).digest("hex"),g=wge.default.fromData(e).toString();typeof r=="undefined"&&(t.manifest.publishConfig&&typeof t.manifest.publishConfig.access=="string"?r=t.manifest.publishConfig.access:o.get("npmPublishAccess")!==null?r=o.get("npmPublishAccess"):a.scope?r="restricted":r="public");let f=await za.genPackageManifest(t),h=`${c}-${l}.tgz`,p=new Bge.URL(`${To(n)}/${c}/-/${h}`);return{_id:c,_attachments:{[h]:{content_type:"application/octet-stream",data:e.toString("base64"),length:e.length}},name:c,access:r,["dist-tags"]:{[i]:l},versions:{[l]:_(P({},f),{_id:`${c}@${l}`,name:c,version:l,gitHead:s,dist:{shasum:u,integrity:g,tarball:p.toString()}})}}}async function _Ve(t){try{let{stdout:e}=await hr.execvp("git",["rev-parse","--revs-only","HEAD"],{cwd:t});return e.trim()===""?void 0:e.trim()}catch{return}}var wM={npmAlwaysAuth:{description:"URL of the selected npm registry (note: npm enterprise isn't supported)",type:ge.BOOLEAN,default:!1},npmAuthIdent:{description:"Authentication identity for the npm registry (_auth in npm and yarn v1)",type:ge.SECRET,default:null},npmAuthToken:{description:"Authentication token for the npm registry (_authToken in npm and yarn v1)",type:ge.SECRET,default:null}},Qge={npmAuditRegistry:{description:"Registry to query for audit reports",type:ge.STRING,default:null},npmPublishRegistry:{description:"Registry to push packages to",type:ge.STRING,default:null},npmRegistryServer:{description:"URL of the selected npm registry (note: npm enterprise isn't supported)",type:ge.STRING,default:"https://registry.yarnpkg.com"}},XVe={configuration:_(P(P({},wM),Qge),{npmScopes:{description:"Settings per package scope",type:ge.MAP,valueDefinition:{description:"",type:ge.SHAPE,properties:P(P({},wM),Qge)}},npmRegistries:{description:"Settings per registry",type:ge.MAP,normalizeKeys:To,valueDefinition:{description:"",type:ge.SHAPE,properties:P({},wM)}}}),fetchers:[QT,Vs],resolvers:[bT,xT,kT]},ZVe=XVe;var vM={};it(vM,{default:()=>a_e});Ss();var Ho;(function(i){i.All="all",i.Production="production",i.Development="development"})(Ho||(Ho={}));var Xs;(function(s){s.Info="info",s.Low="low",s.Moderate="moderate",s.High="high",s.Critical="critical"})(Xs||(Xs={}));var vQ=[Xs.Info,Xs.Low,Xs.Moderate,Xs.High,Xs.Critical];function bge(t,e){let r=[],i=new Set,n=o=>{i.has(o)||(i.add(o),r.push(o))};for(let o of e)n(o);let s=new Set;for(;r.length>0;){let o=r.shift(),a=t.storedResolutions.get(o);if(typeof a=="undefined")throw new Error("Assertion failed: Expected the resolution to have been registered");let l=t.storedPackages.get(a);if(!!l){s.add(o);for(let c of l.dependencies.values())n(c.descriptorHash)}}return s}function $Ve(t,e){return new Set([...t].filter(r=>!e.has(r)))}function e_e(t,e,{all:r}){let i=r?t.workspaces:[e],n=i.map(f=>f.manifest),s=new Set(n.map(f=>[...f.dependencies].map(([h,p])=>h)).flat()),o=new Set(n.map(f=>[...f.devDependencies].map(([h,p])=>h)).flat()),a=i.map(f=>[...f.dependencies.values()]).flat(),l=a.filter(f=>s.has(f.identHash)).map(f=>f.descriptorHash),c=a.filter(f=>o.has(f.identHash)).map(f=>f.descriptorHash),u=bge(t,l),g=bge(t,c);return $Ve(g,u)}function vge(t){let e={};for(let r of t)e[S.stringifyIdent(r)]=S.parseRange(r.range).selector;return e}function Sge(t){if(typeof t=="undefined")return new Set;let e=vQ.indexOf(t),r=vQ.slice(e);return new Set(r)}function t_e(t,e){let r=Sge(e),i={};for(let n of r)i[n]=t[n];return i}function xge(t,e){var i;let r=t_e(t,e);for(let n of Object.keys(r))if((i=r[n])!=null?i:0>0)return!0;return!1}function kge(t,e){var s;let r={},i={children:r},n=Object.values(t.advisories);if(e!=null){let o=Sge(e);n=n.filter(a=>o.has(a.severity))}for(let o of de.sortMap(n,a=>a.module_name))r[o.module_name]={label:o.module_name,value:ue.tuple(ue.Type.RANGE,o.findings.map(a=>a.version).join(", ")),children:{Issue:{label:"Issue",value:ue.tuple(ue.Type.NO_HINT,o.title)},URL:{label:"URL",value:ue.tuple(ue.Type.URL,o.url)},Severity:{label:"Severity",value:ue.tuple(ue.Type.NO_HINT,o.severity)},["Vulnerable Versions"]:{label:"Vulnerable Versions",value:ue.tuple(ue.Type.RANGE,o.vulnerable_versions)},["Patched Versions"]:{label:"Patched Versions",value:ue.tuple(ue.Type.RANGE,o.patched_versions)},Via:{label:"Via",value:ue.tuple(ue.Type.NO_HINT,Array.from(new Set(o.findings.map(a=>a.paths).flat().map(a=>a.split(">")[0]))).join(", "))},Recommendation:{label:"Recommendation",value:ue.tuple(ue.Type.NO_HINT,(s=o.recommendation)==null?void 0:s.replace(/\n/g," "))}}};return i}function Pge(t,e,{all:r,environment:i}){let n=r?t.workspaces:[e],s=[Ho.All,Ho.Production].includes(i),o=[];if(s)for(let c of n)for(let u of c.manifest.dependencies.values())o.push(u);let a=[Ho.All,Ho.Development].includes(i),l=[];if(a)for(let c of n)for(let u of c.manifest.devDependencies.values())l.push(u);return vge([...o,...l].filter(c=>S.parseRange(c.range).protocol===null))}function Dge(t,e,{all:r}){var s;let i=e_e(t,e,{all:r}),n={};for(let o of t.storedPackages.values())n[S.stringifyIdent(o)]={version:(s=o.version)!=null?s:"0.0.0",integrity:o.identHash,requires:vge(o.dependencies.values()),dev:i.has(S.convertLocatorToDescriptor(o).descriptorHash)};return n}var dm=class extends Be{constructor(){super(...arguments);this.all=Y.Boolean("-A,--all",!1,{description:"Audit dependencies from all workspaces"});this.recursive=Y.Boolean("-R,--recursive",!1,{description:"Audit transitive dependencies as well"});this.environment=Y.String("--environment",Ho.All,{description:"Which environments to cover",validator:Yi(Ho)});this.json=Y.Boolean("--json",!1,{description:"Format the output as an NDJSON stream"});this.severity=Y.String("--severity",Xs.Info,{description:"Minimal severity requested for packages to be displayed",validator:Yi(Xs)})}async execute(){let e=await fe.find(this.context.cwd,this.context.plugins),{project:r,workspace:i}=await Ke.find(e,this.context.cwd);if(!i)throw new rt(r.cwd,this.context.cwd);await r.restoreInstallState();let n=Pge(r,i,{all:this.all,environment:this.environment}),s=Dge(r,i,{all:this.all});if(!this.recursive)for(let f of Object.keys(s))Object.prototype.hasOwnProperty.call(n,f)?s[f].requires={}:delete s[f];let o={requires:n,dependencies:s},a=gr.getAuditRegistry(i.manifest,{configuration:e}),l,c=await Fa.start({configuration:e,stdout:this.context.stdout},async()=>{l=await Lt.post("/-/npm/v1/security/audits/quick",o,{authType:Lt.AuthType.BEST_EFFORT,configuration:e,jsonResponse:!0,registry:a})});if(c.hasErrors())return c.exitCode();let u=xge(l.metadata.vulnerabilities,this.severity);return!this.json&&u?(Hs.emitTree(kge(l,this.severity),{configuration:e,json:this.json,stdout:this.context.stdout,separators:2}),1):(await Fe.start({configuration:e,includeFooter:!1,json:this.json,stdout:this.context.stdout},async f=>{f.reportJson(l),u||f.reportInfo(z.EXCEPTION,"No audit suggestions")})).exitCode()}};dm.paths=[["npm","audit"]],dm.usage=ye.Usage({description:"perform a vulnerability audit against the installed packages",details:` + This command checks for known security reports on the packages you use. The reports are by default extracted from the npm registry, and may or may not be relevant to your actual program (not all vulnerabilities affect all code paths). + + For consistency with our other commands the default is to only check the direct dependencies for the active workspace. To extend this search to all workspaces, use \`-A,--all\`. To extend this search to both direct and transitive dependencies, use \`-R,--recursive\`. + + Applying the \`--severity\` flag will limit the audit table to vulnerabilities of the corresponding severity and above. Valid values are ${vQ.map(e=>`\`${e}\``).join(", ")}. + + If the \`--json\` flag is set, Yarn will print the output exactly as received from the registry. Regardless of this flag, the process will exit with a non-zero exit code if a report is found for the selected packages. + + To understand the dependency tree requiring vulnerable packages, check the raw report with the \`--json\` flag or use \`yarn why \` to get more information as to who depends on them. + `,examples:[["Checks for known security issues with the installed packages. The output is a list of known issues.","yarn npm audit"],["Audit dependencies in all workspaces","yarn npm audit --all"],["Limit auditing to `dependencies` (excludes `devDependencies`)","yarn npm audit --environment production"],["Show audit report as valid JSON","yarn npm audit --json"],["Audit all direct and transitive dependencies","yarn npm audit --recursive"],["Output moderate (or more severe) vulnerabilities","yarn npm audit --severity moderate"]]});var Rge=dm;var BM=ie(Or()),QM=ie(require("util")),Cm=class extends Be{constructor(){super(...arguments);this.fields=Y.String("-f,--fields",{description:"A comma-separated list of manifest fields that should be displayed"});this.json=Y.Boolean("--json",!1,{description:"Format the output as an NDJSON stream"});this.packages=Y.Rest()}async execute(){let e=await fe.find(this.context.cwd,this.context.plugins),{project:r}=await Ke.find(e,this.context.cwd),i=typeof this.fields!="undefined"?new Set(["name",...this.fields.split(/\s*,\s*/)]):null,n=[],s=!1,o=await Fe.start({configuration:e,includeFooter:!1,json:this.json,stdout:this.context.stdout},async a=>{for(let l of this.packages){let c;if(l==="."){let b=r.topLevelWorkspace;if(!b.manifest.name)throw new me(`Missing 'name' field in ${M.fromPortablePath(v.join(b.cwd,wt.manifest))}`);c=S.makeDescriptor(b.manifest.name,"unknown")}else c=S.parseDescriptor(l);let u=Lt.getIdentUrl(c),g=bM(await Lt.get(u,{configuration:e,ident:c,jsonResponse:!0,customErrorMessage:Lt.customPackageError})),f=Object.keys(g.versions).sort(BM.default.compareLoose),p=g["dist-tags"].latest||f[f.length-1],d=qt.validRange(c.range);if(d){let b=BM.default.maxSatisfying(f,d);b!==null?p=b:(a.reportWarning(z.UNNAMED,`Unmet range ${S.prettyRange(e,c.range)}; falling back to the latest version`),s=!0)}else c.range!=="unknown"&&(a.reportWarning(z.UNNAMED,`Invalid range ${S.prettyRange(e,c.range)}; falling back to the latest version`),s=!0);let m=g.versions[p],E=_(P(P({},g),m),{version:p,versions:f}),B;if(i!==null){B={};for(let b of i){let R=E[b];if(typeof R!="undefined")B[b]=R;else{a.reportWarning(z.EXCEPTION,`The '${b}' field doesn't exist inside ${S.prettyIdent(e,c)}'s informations`),s=!0;continue}}}else this.json||(delete E.dist,delete E.readme,delete E.users),B=E;a.reportJson(B),this.json||n.push(B)}});QM.inspect.styles.name="cyan";for(let a of n)(a!==n[0]||s)&&this.context.stdout.write(` +`),this.context.stdout.write(`${(0,QM.inspect)(a,{depth:Infinity,colors:!0,compact:!1})} +`);return o.exitCode()}};Cm.paths=[["npm","info"]],Cm.usage=ye.Usage({category:"Npm-related commands",description:"show information about a package",details:"\n This command will fetch information about a package from the npm registry, and prints it in a tree format.\n\n The package does not have to be installed locally, but needs to have been published (in particular, local changes will be ignored even for workspaces).\n\n Append `@` to the package argument to provide information specific to the latest version that satisfies the range. If the range is invalid or if there is no version satisfying the range, the command will print a warning and fall back to the latest version.\n\n If the `-f,--fields` option is set, it's a comma-separated list of fields which will be used to only display part of the package informations.\n\n By default, this command won't return the `dist`, `readme`, and `users` fields, since they are often very long. To explicitly request those fields, explicitly list them with the `--fields` flag or request the output in JSON mode.\n ",examples:[["Show all available information about react (except the `dist`, `readme`, and `users` fields)","yarn npm info react"],["Show all available information about react as valid JSON (including the `dist`, `readme`, and `users` fields)","yarn npm info react --json"],["Show all available information about react 16.12.0","yarn npm info react@16.12.0"],["Show the description of react","yarn npm info react --fields description"],["Show all available versions of react","yarn npm info react --fields versions"],["Show the readme of react","yarn npm info react --fields readme"],["Show a few fields of react","yarn npm info react --fields homepage,repository"]]});var Fge=Cm;function bM(t){if(Array.isArray(t)){let e=[];for(let r of t)r=bM(r),r&&e.push(r);return e}else if(typeof t=="object"&&t!==null){let e={};for(let r of Object.keys(t)){if(r.startsWith("_"))continue;let i=bM(t[r]);i&&(e[r]=i)}return e}else return t||null}var Nge=ie(aC()),mm=class extends Be{constructor(){super(...arguments);this.scope=Y.String("-s,--scope",{description:"Login to the registry configured for a given scope"});this.publish=Y.Boolean("--publish",!1,{description:"Login to the publish registry"})}async execute(){let e=await fe.find(this.context.cwd,this.context.plugins),r=await SQ({configuration:e,cwd:this.context.cwd,publish:this.publish,scope:this.scope});return(await Fe.start({configuration:e,stdout:this.context.stdout},async n=>{let s=await i_e({registry:r,report:n,stdin:this.context.stdin,stdout:this.context.stdout}),o=`/-/user/org.couchdb.user:${encodeURIComponent(s.name)}`,a=await Lt.put(o,s,{attemptedAs:s.name,configuration:e,registry:r,jsonResponse:!0,authType:Lt.AuthType.NO_AUTH});return await r_e(r,a.token,{configuration:e,scope:this.scope}),n.reportInfo(z.UNNAMED,"Successfully logged in")})).exitCode()}};mm.paths=[["npm","login"]],mm.usage=ye.Usage({category:"Npm-related commands",description:"store new login info to access the npm registry",details:"\n This command will ask you for your username, password, and 2FA One-Time-Password (when it applies). It will then modify your local configuration (in your home folder, never in the project itself) to reference the new tokens thus generated.\n\n Adding the `-s,--scope` flag will cause the authentication to be done against whatever registry is configured for the associated scope (see also `npmScopes`).\n\n Adding the `--publish` flag will cause the authentication to be done against the registry used when publishing the package (see also `publishConfig.registry` and `npmPublishRegistry`).\n ",examples:[["Login to the default registry","yarn npm login"],["Login to the registry linked to the @my-scope registry","yarn npm login --scope my-scope"],["Login to the publish registry for the current package","yarn npm login --publish"]]});var Lge=mm;async function SQ({scope:t,publish:e,configuration:r,cwd:i}){return t&&e?gr.getScopeRegistry(t,{configuration:r,type:gr.RegistryType.PUBLISH_REGISTRY}):t?gr.getScopeRegistry(t,{configuration:r}):e?gr.getPublishRegistry((await rf(r,i)).manifest,{configuration:r}):gr.getDefaultRegistry({configuration:r})}async function r_e(t,e,{configuration:r,scope:i}){let n=o=>a=>{let l=de.isIndexableObject(a)?a:{},c=l[o],u=de.isIndexableObject(c)?c:{};return _(P({},l),{[o]:_(P({},u),{npmAuthToken:e})})},s=i?{npmScopes:n(i)}:{npmRegistries:n(t)};return await fe.updateHomeConfiguration(s)}async function i_e({registry:t,report:e,stdin:r,stdout:i}){if(process.env.TEST_ENV)return{name:process.env.TEST_NPM_USER||"",password:process.env.TEST_NPM_PASSWORD||""};e.reportInfo(z.UNNAMED,`Logging in to ${t}`);let n=!1;t.match(/^https:\/\/npm\.pkg\.github\.com(\/|$)/)&&(e.reportInfo(z.UNNAMED,"You seem to be using the GitHub Package Registry. Tokens must be generated with the 'repo', 'write:packages', and 'read:packages' permissions."),n=!0),e.reportSeparator();let{username:s,password:o}=await(0,Nge.prompt)([{type:"input",name:"username",message:"Username:",required:!0,onCancel:()=>process.exit(130),stdin:r,stdout:i},{type:"password",name:"password",message:n?"Token:":"Password:",required:!0,onCancel:()=>process.exit(130),stdin:r,stdout:i}]);return e.reportSeparator(),{name:s,password:o}}var Ff=new Set(["npmAuthIdent","npmAuthToken"]),Im=class extends Be{constructor(){super(...arguments);this.scope=Y.String("-s,--scope",{description:"Logout of the registry configured for a given scope"});this.publish=Y.Boolean("--publish",!1,{description:"Logout of the publish registry"});this.all=Y.Boolean("-A,--all",!1,{description:"Logout of all registries"})}async execute(){let e=await fe.find(this.context.cwd,this.context.plugins),r=async()=>{var l;let n=await SQ({configuration:e,cwd:this.context.cwd,publish:this.publish,scope:this.scope}),s=await fe.find(this.context.cwd,this.context.plugins),o=S.makeIdent((l=this.scope)!=null?l:null,"pkg");return!gr.getAuthConfiguration(n,{configuration:s,ident:o}).get("npmAuthToken")};return(await Fe.start({configuration:e,stdout:this.context.stdout},async n=>{if(this.all&&(await n_e(),n.reportInfo(z.UNNAMED,"Successfully logged out from everything")),this.scope){await Tge("npmScopes",this.scope),await r()?n.reportInfo(z.UNNAMED,`Successfully logged out from ${this.scope}`):n.reportWarning(z.UNNAMED,"Scope authentication settings removed, but some other ones settings still apply to it");return}let s=await SQ({configuration:e,cwd:this.context.cwd,publish:this.publish});await Tge("npmRegistries",s),await r()?n.reportInfo(z.UNNAMED,`Successfully logged out from ${s}`):n.reportWarning(z.UNNAMED,"Registry authentication settings removed, but some other ones settings still apply to it")})).exitCode()}};Im.paths=[["npm","logout"]],Im.usage=ye.Usage({category:"Npm-related commands",description:"logout of the npm registry",details:"\n This command will log you out by modifying your local configuration (in your home folder, never in the project itself) to delete all credentials linked to a registry.\n\n Adding the `-s,--scope` flag will cause the deletion to be done against whatever registry is configured for the associated scope (see also `npmScopes`).\n\n Adding the `--publish` flag will cause the deletion to be done against the registry used when publishing the package (see also `publishConfig.registry` and `npmPublishRegistry`).\n\n Adding the `-A,--all` flag will cause the deletion to be done against all registries and scopes.\n ",examples:[["Logout of the default registry","yarn npm logout"],["Logout of the @my-scope scope","yarn npm logout --scope my-scope"],["Logout of the publish registry for the current package","yarn npm logout --publish"],["Logout of all registries","yarn npm logout --all"]]});var Mge=Im;function s_e(t,e){let r=t[e];if(!de.isIndexableObject(r))return!1;let i=new Set(Object.keys(r));if([...Ff].every(s=>!i.has(s)))return!1;for(let s of Ff)i.delete(s);if(i.size===0)return t[e]=void 0,!0;let n=P({},r);for(let s of Ff)delete n[s];return t[e]=n,!0}async function n_e(){let t=e=>{let r=!1,i=de.isIndexableObject(e)?P({},e):{};i.npmAuthToken&&(delete i.npmAuthToken,r=!0);for(let n of Object.keys(i))s_e(i,n)&&(r=!0);if(Object.keys(i).length!==0)return r?i:e};return await fe.updateHomeConfiguration({npmRegistries:t,npmScopes:t})}async function Tge(t,e){return await fe.updateHomeConfiguration({[t]:r=>{let i=de.isIndexableObject(r)?r:{};if(!Object.prototype.hasOwnProperty.call(i,e))return r;let n=i[e],s=de.isIndexableObject(n)?n:{},o=new Set(Object.keys(s));if([...Ff].every(l=>!o.has(l)))return r;for(let l of Ff)o.delete(l);if(o.size===0)return Object.keys(i).length===1?void 0:_(P({},i),{[e]:void 0});let a={};for(let l of Ff)a[l]=void 0;return _(P({},i),{[e]:P(P({},s),a)})}})}var Em=class extends Be{constructor(){super(...arguments);this.access=Y.String("--access",{description:"The access for the published package (public or restricted)"});this.tag=Y.String("--tag","latest",{description:"The tag on the registry that the package should be attached to"});this.tolerateRepublish=Y.Boolean("--tolerate-republish",!1,{description:"Warn and exit when republishing an already existing version of a package"})}async execute(){let e=await fe.find(this.context.cwd,this.context.plugins),{project:r,workspace:i}=await Ke.find(e,this.context.cwd);if(!i)throw new rt(r.cwd,this.context.cwd);if(i.manifest.private)throw new me("Private workspaces cannot be published");if(i.manifest.name===null||i.manifest.version===null)throw new me("Workspaces must have valid names and versions to be published on an external registry");await r.restoreInstallState();let n=i.manifest.name,s=i.manifest.version,o=gr.getPublishRegistry(i.manifest,{configuration:e});return(await Fe.start({configuration:e,stdout:this.context.stdout},async l=>{var c,u;if(this.tolerateRepublish)try{let g=await Lt.get(Lt.getIdentUrl(n),{configuration:e,registry:o,ident:n,jsonResponse:!0});if(!Object.prototype.hasOwnProperty.call(g,"versions"))throw new nt(z.REMOTE_INVALID,'Registry returned invalid data for - missing "versions" field');if(Object.prototype.hasOwnProperty.call(g.versions,s)){l.reportWarning(z.UNNAMED,`Registry already knows about version ${s}; skipping.`);return}}catch(g){if(((u=(c=g.originalError)==null?void 0:c.response)==null?void 0:u.statusCode)!==404)throw g}await Kt.maybeExecuteWorkspaceLifecycleScript(i,"prepublish",{report:l}),await za.prepareForPack(i,{report:l},async()=>{let g=await za.genPackList(i);for(let m of g)l.reportInfo(null,m);let f=await za.genPackStream(i,g),h=await de.bufferStream(f),p=await Rf.getGitHead(i.cwd),d=await Rf.makePublishBody(i,h,{access:this.access,tag:this.tag,registry:o,gitHead:p});await Lt.put(Lt.getIdentUrl(n),d,{configuration:e,registry:o,ident:n,jsonResponse:!0})}),l.reportInfo(z.UNNAMED,"Package archive published")})).exitCode()}};Em.paths=[["npm","publish"]],Em.usage=ye.Usage({category:"Npm-related commands",description:"publish the active workspace to the npm registry",details:'\n This command will pack the active workspace into a fresh archive and upload it to the npm registry.\n\n The package will by default be attached to the `latest` tag on the registry, but this behavior can be overriden by using the `--tag` option.\n\n Note that for legacy reasons scoped packages are by default published with an access set to `restricted` (aka "private packages"). This requires you to register for a paid npm plan. In case you simply wish to publish a public scoped package to the registry (for free), just add the `--access public` flag. This behavior can be enabled by default through the `npmPublishAccess` settings.\n ',examples:[["Publish the active workspace","yarn npm publish"]]});var Oge=Em;var Uge=ie(Or());var ym=class extends Be{constructor(){super(...arguments);this.json=Y.Boolean("--json",!1,{description:"Format the output as an NDJSON stream"});this.package=Y.String({required:!1})}async execute(){let e=await fe.find(this.context.cwd,this.context.plugins),{project:r,workspace:i}=await Ke.find(e,this.context.cwd),n;if(typeof this.package!="undefined")n=S.parseIdent(this.package);else{if(!i)throw new rt(r.cwd,this.context.cwd);if(!i.manifest.name)throw new me(`Missing 'name' field in ${M.fromPortablePath(v.join(i.cwd,wt.manifest))}`);n=i.manifest.name}let s=await wm(n,e),a={children:de.sortMap(Object.entries(s),([l])=>l).map(([l,c])=>({value:ue.tuple(ue.Type.RESOLUTION,{descriptor:S.makeDescriptor(n,l),locator:S.makeLocator(n,c)})}))};return Hs.emitTree(a,{configuration:e,json:this.json,stdout:this.context.stdout})}};ym.paths=[["npm","tag","list"]],ym.usage=ye.Usage({category:"Npm-related commands",description:"list all dist-tags of a package",details:` + This command will list all tags of a package from the npm registry. + + If the package is not specified, Yarn will default to the current workspace. + `,examples:[["List all tags of package `my-pkg`","yarn npm tag list my-pkg"]]});var Kge=ym;async function wm(t,e){let r=`/-/package${Lt.getIdentUrl(t)}/dist-tags`;return Lt.get(r,{configuration:e,ident:t,jsonResponse:!0,customErrorMessage:Lt.customPackageError})}var Bm=class extends Be{constructor(){super(...arguments);this.package=Y.String();this.tag=Y.String()}async execute(){let e=await fe.find(this.context.cwd,this.context.plugins),{project:r,workspace:i}=await Ke.find(e,this.context.cwd);if(!i)throw new rt(r.cwd,this.context.cwd);let n=S.parseDescriptor(this.package,!0),s=n.range;if(!Uge.default.valid(s))throw new me(`The range ${ue.pretty(e,n.range,ue.Type.RANGE)} must be a valid semver version`);let o=gr.getPublishRegistry(i.manifest,{configuration:e}),a=ue.pretty(e,n,ue.Type.IDENT),l=ue.pretty(e,s,ue.Type.RANGE),c=ue.pretty(e,this.tag,ue.Type.CODE);return(await Fe.start({configuration:e,stdout:this.context.stdout},async g=>{let f=await wm(n,e);Object.prototype.hasOwnProperty.call(f,this.tag)&&f[this.tag]===s&&g.reportWarning(z.UNNAMED,`Tag ${c} is already set to version ${l}`);let h=`/-/package${Lt.getIdentUrl(n)}/dist-tags/${encodeURIComponent(this.tag)}`;await Lt.put(h,s,{configuration:e,registry:o,ident:n,jsonRequest:!0,jsonResponse:!0}),g.reportInfo(z.UNNAMED,`Tag ${c} added to version ${l} of package ${a}`)})).exitCode()}};Bm.paths=[["npm","tag","add"]],Bm.usage=ye.Usage({category:"Npm-related commands",description:"add a tag for a specific version of a package",details:` + This command will add a tag to the npm registry for a specific version of a package. If the tag already exists, it will be overwritten. + `,examples:[["Add a `beta` tag for version `2.3.4-beta.4` of package `my-pkg`","yarn npm tag add my-pkg@2.3.4-beta.4 beta"]]});var Hge=Bm;var Qm=class extends Be{constructor(){super(...arguments);this.package=Y.String();this.tag=Y.String()}async execute(){if(this.tag==="latest")throw new me("The 'latest' tag cannot be removed.");let e=await fe.find(this.context.cwd,this.context.plugins),{project:r,workspace:i}=await Ke.find(e,this.context.cwd);if(!i)throw new rt(r.cwd,this.context.cwd);let n=S.parseIdent(this.package),s=gr.getPublishRegistry(i.manifest,{configuration:e}),o=ue.pretty(e,this.tag,ue.Type.CODE),a=ue.pretty(e,n,ue.Type.IDENT),l=await wm(n,e);if(!Object.prototype.hasOwnProperty.call(l,this.tag))throw new me(`${o} is not a tag of package ${a}`);return(await Fe.start({configuration:e,stdout:this.context.stdout},async u=>{let g=`/-/package${Lt.getIdentUrl(n)}/dist-tags/${encodeURIComponent(this.tag)}`;await Lt.del(g,{configuration:e,registry:s,ident:n,jsonResponse:!0}),u.reportInfo(z.UNNAMED,`Tag ${o} removed from package ${a}`)})).exitCode()}};Qm.paths=[["npm","tag","remove"]],Qm.usage=ye.Usage({category:"Npm-related commands",description:"remove a tag from a package",details:` + This command will remove a tag from a package from the npm registry. + `,examples:[["Remove the `beta` tag from package `my-pkg`","yarn npm tag remove my-pkg beta"]]});var Gge=Qm;var bm=class extends Be{constructor(){super(...arguments);this.scope=Y.String("-s,--scope",{description:"Print username for the registry configured for a given scope"});this.publish=Y.Boolean("--publish",!1,{description:"Print username for the publish registry"})}async execute(){let e=await fe.find(this.context.cwd,this.context.plugins),r;return this.scope&&this.publish?r=gr.getScopeRegistry(this.scope,{configuration:e,type:gr.RegistryType.PUBLISH_REGISTRY}):this.scope?r=gr.getScopeRegistry(this.scope,{configuration:e}):this.publish?r=gr.getPublishRegistry((await rf(e,this.context.cwd)).manifest,{configuration:e}):r=gr.getDefaultRegistry({configuration:e}),(await Fe.start({configuration:e,stdout:this.context.stdout},async n=>{var o,a;let s;try{s=await Lt.get("/-/whoami",{configuration:e,registry:r,authType:Lt.AuthType.ALWAYS_AUTH,jsonResponse:!0,ident:this.scope?S.makeIdent(this.scope,""):void 0})}catch(l){if(((o=l.response)==null?void 0:o.statusCode)===401||((a=l.response)==null?void 0:a.statusCode)===403){n.reportError(z.AUTHENTICATION_INVALID,"Authentication failed - your credentials may have expired");return}else throw l}n.reportInfo(z.UNNAMED,s.username)})).exitCode()}};bm.paths=[["npm","whoami"]],bm.usage=ye.Usage({category:"Npm-related commands",description:"display the name of the authenticated user",details:"\n Print the username associated with the current authentication settings to the standard output.\n\n When using `-s,--scope`, the username printed will be the one that matches the authentication settings of the registry associated with the given scope (those settings can be overriden using the `npmRegistries` map, and the registry associated with the scope is configured via the `npmScopes` map).\n\n When using `--publish`, the registry we'll select will by default be the one used when publishing packages (`publishConfig.registry` or `npmPublishRegistry` if available, otherwise we'll fallback to the regular `npmRegistryServer`).\n ",examples:[["Print username for the default registry","yarn npm whoami"],["Print username for the registry on a given scope","yarn npm whoami --scope company"]]});var jge=bm;var o_e={configuration:{npmPublishAccess:{description:"Default access of the published packages",type:ge.STRING,default:null}},commands:[Rge,Fge,Lge,Mge,Oge,Hge,Kge,Gge,jge]},a_e=o_e;var NM={};it(NM,{default:()=>B_e,patchUtils:()=>SM});var SM={};it(SM,{applyPatchFile:()=>PQ,diffFolders:()=>DM,extractPackageToDisk:()=>PM,extractPatchFlags:()=>Xge,isParentRequired:()=>kM,loadPatchFiles:()=>km,makeDescriptor:()=>E_e,makeLocator:()=>xM,parseDescriptor:()=>Sm,parseLocator:()=>xm,parsePatchFile:()=>kQ});var vm=class extends Error{constructor(e,r){super(`Cannot apply hunk #${e+1}`);this.hunk=r}};var A_e=/^@@ -(\d+)(,(\d+))? \+(\d+)(,(\d+))? @@.*/;function Nf(t){return v.relative(Se.root,v.resolve(Se.root,M.toPortablePath(t)))}function l_e(t){let e=t.trim().match(A_e);if(!e)throw new Error(`Bad header line: '${t}'`);return{original:{start:Math.max(Number(e[1]),1),length:Number(e[3]||1)},patched:{start:Math.max(Number(e[4]),1),length:Number(e[6]||1)}}}var c_e=420,u_e=493,Lr;(function(i){i.Context="context",i.Insertion="insertion",i.Deletion="deletion"})(Lr||(Lr={}));var Yge=()=>({semverExclusivity:null,diffLineFromPath:null,diffLineToPath:null,oldMode:null,newMode:null,deletedFileMode:null,newFileMode:null,renameFrom:null,renameTo:null,beforeHash:null,afterHash:null,fromPath:null,toPath:null,hunks:null}),g_e=t=>({header:l_e(t),parts:[]}),f_e={["@"]:"header",["-"]:Lr.Deletion,["+"]:Lr.Insertion,[" "]:Lr.Context,["\\"]:"pragma",undefined:Lr.Context};function p_e(t){let e=[],r=Yge(),i="parsing header",n=null,s=null;function o(){n&&(s&&(n.parts.push(s),s=null),r.hunks.push(n),n=null)}function a(){o(),e.push(r),r=Yge()}for(let l=0;l0?"patch":"mode change",B=null;switch(E){case"rename":{if(!u||!g)throw new Error("Bad parser state: rename from & to not given");e.push({type:"rename",semverExclusivity:i,fromPath:Nf(u),toPath:Nf(g)}),B=g}break;case"file deletion":{let b=n||p;if(!b)throw new Error("Bad parse state: no path given for file deletion");e.push({type:"file deletion",semverExclusivity:i,hunk:m&&m[0]||null,path:Nf(b),mode:xQ(l),hash:f})}break;case"file creation":{let b=s||d;if(!b)throw new Error("Bad parse state: no path given for file creation");e.push({type:"file creation",semverExclusivity:i,hunk:m&&m[0]||null,path:Nf(b),mode:xQ(c),hash:h})}break;case"patch":case"mode change":B=d||s;break;default:de.assertNever(E);break}B&&o&&a&&o!==a&&e.push({type:"mode change",semverExclusivity:i,path:Nf(B),oldMode:xQ(o),newMode:xQ(a)}),B&&m&&m.length&&e.push({type:"patch",semverExclusivity:i,path:Nf(B),hunks:m,beforeHash:f,afterHash:h})}if(e.length===0)throw new Error("Unable to parse patch file: No changes found. Make sure the patch is a valid UTF8 encoded string");return e}function xQ(t){let e=parseInt(t,8)&511;if(e!==c_e&&e!==u_e)throw new Error(`Unexpected file mode string: ${t}`);return e}function kQ(t){let e=t.split(/\n/g);return e[e.length-1]===""&&e.pop(),d_e(p_e(e))}function h_e(t){let e=0,r=0;for(let{type:i,lines:n}of t.parts)switch(i){case Lr.Context:r+=n.length,e+=n.length;break;case Lr.Deletion:e+=n.length;break;case Lr.Insertion:r+=n.length;break;default:de.assertNever(i);break}if(e!==t.header.original.length||r!==t.header.patched.length){let i=n=>n<0?n:`+${n}`;throw new Error(`hunk header integrity check failed (expected @@ ${i(t.header.original.length)} ${i(t.header.patched.length)} @@, got @@ ${i(e)} ${i(r)} @@)`)}}async function Lf(t,e,r){let i=await t.lstatPromise(e),n=await r();if(typeof n!="undefined"&&(e=n),t.lutimesPromise)await t.lutimesPromise(e,i.atime,i.mtime);else if(!i.isSymbolicLink())await t.utimesPromise(e,i.atime,i.mtime);else throw new Error("Cannot preserve the time values of a symlink")}async function PQ(t,{baseFs:e=new Wt,dryRun:r=!1,version:i=null}={}){for(let n of t)if(!(n.semverExclusivity!==null&&i!==null&&!qt.satisfiesWithPrereleases(i,n.semverExclusivity)))switch(n.type){case"file deletion":if(r){if(!e.existsSync(n.path))throw new Error(`Trying to delete a file that doesn't exist: ${n.path}`)}else await Lf(e,v.dirname(n.path),async()=>{await e.unlinkPromise(n.path)});break;case"rename":if(r){if(!e.existsSync(n.fromPath))throw new Error(`Trying to move a file that doesn't exist: ${n.fromPath}`)}else await Lf(e,v.dirname(n.fromPath),async()=>{await Lf(e,v.dirname(n.toPath),async()=>{await Lf(e,n.fromPath,async()=>(await e.movePromise(n.fromPath,n.toPath),n.toPath))})});break;case"file creation":if(r){if(e.existsSync(n.path))throw new Error(`Trying to create a file that already exists: ${n.path}`)}else{let s=n.hunk?n.hunk.parts[0].lines.join(` +`)+(n.hunk.parts[0].noNewlineAtEndOfFile?"":` +`):"";await e.mkdirpPromise(v.dirname(n.path),{chmod:493,utimes:[mr.SAFE_TIME,mr.SAFE_TIME]}),await e.writeFilePromise(n.path,s,{mode:n.mode}),await e.utimesPromise(n.path,mr.SAFE_TIME,mr.SAFE_TIME)}break;case"patch":await Lf(e,n.path,async()=>{await C_e(n,{baseFs:e,dryRun:r})});break;case"mode change":{let o=(await e.statPromise(n.path)).mode;if(qge(n.newMode)!==qge(o))continue;await Lf(e,n.path,async()=>{await e.chmodPromise(n.path,n.newMode)})}break;default:de.assertNever(n);break}}function qge(t){return(t&64)>0}function Jge(t){return t.replace(/\s+$/,"")}function m_e(t,e){return Jge(t)===Jge(e)}async function C_e({hunks:t,path:e},{baseFs:r,dryRun:i=!1}){let n=await r.statSync(e).mode,o=(await r.readFileSync(e,"utf8")).split(/\n/),a=[],l=0,c=0;for(let g of t){let f=Math.max(c,g.header.patched.start+l),h=Math.max(0,f-c),p=Math.max(0,o.length-f-g.header.original.length),d=Math.max(h,p),m=0,E=0,B=null;for(;m<=d;){if(m<=h&&(E=f-m,B=Wge(g,o,E),B!==null)){m=-m;break}if(m<=p&&(E=f+m,B=Wge(g,o,E),B!==null))break;m+=1}if(B===null)throw new vm(t.indexOf(g),g);a.push(B),l+=m,c=E+g.header.original.length}if(i)return;let u=0;for(let g of a)for(let f of g)switch(f.type){case"splice":{let h=f.index+u;o.splice(h,f.numToDelete,...f.linesToInsert),u+=f.linesToInsert.length-f.numToDelete}break;case"pop":o.pop();break;case"push":o.push(f.line);break;default:de.assertNever(f);break}await r.writeFilePromise(e,o.join(` +`),{mode:n})}function Wge(t,e,r){let i=[];for(let n of t.parts)switch(n.type){case Lr.Context:case Lr.Deletion:{for(let s of n.lines){let o=e[r];if(o==null||!m_e(o,s))return null;r+=1}n.type===Lr.Deletion&&(i.push({type:"splice",index:r-n.lines.length,numToDelete:n.lines.length,linesToInsert:[]}),n.noNewlineAtEndOfFile&&i.push({type:"push",line:""}))}break;case Lr.Insertion:i.push({type:"splice",index:r,numToDelete:0,linesToInsert:n.lines}),n.noNewlineAtEndOfFile&&i.push({type:"pop"});break;default:de.assertNever(n.type);break}return i}var I_e=/^builtin<([^>]+)>$/;function zge(t,e){let{source:r,selector:i,params:n}=S.parseRange(t);if(r===null)throw new Error("Patch locators must explicitly define their source");let s=i?i.split(/&/).map(c=>M.toPortablePath(c)):[],o=n&&typeof n.locator=="string"?S.parseLocator(n.locator):null,a=n&&typeof n.version=="string"?n.version:null,l=e(r);return{parentLocator:o,sourceItem:l,patchPaths:s,sourceVersion:a}}function Sm(t){let i=zge(t.range,S.parseDescriptor),{sourceItem:e}=i,r=qr(i,["sourceItem"]);return _(P({},r),{sourceDescriptor:e})}function xm(t){let i=zge(t.reference,S.parseLocator),{sourceItem:e}=i,r=qr(i,["sourceItem"]);return _(P({},r),{sourceLocator:e})}function Vge({parentLocator:t,sourceItem:e,patchPaths:r,sourceVersion:i,patchHash:n},s){let o=t!==null?{locator:S.stringifyLocator(t)}:{},a=typeof i!="undefined"?{version:i}:{},l=typeof n!="undefined"?{hash:n}:{};return S.makeRange({protocol:"patch:",source:s(e),selector:r.join("&"),params:P(P(P({},a),l),o)})}function E_e(t,{parentLocator:e,sourceDescriptor:r,patchPaths:i}){return S.makeLocator(t,Vge({parentLocator:e,sourceItem:r,patchPaths:i},S.stringifyDescriptor))}function xM(t,{parentLocator:e,sourcePackage:r,patchPaths:i,patchHash:n}){return S.makeLocator(t,Vge({parentLocator:e,sourceItem:r,sourceVersion:r.version,patchPaths:i,patchHash:n},S.stringifyLocator))}function _ge({onAbsolute:t,onRelative:e,onBuiltin:r},i){i.startsWith("~")&&(i=i.slice(1));let s=i.match(I_e);return s!==null?r(s[1]):v.isAbsolute(i)?t(i):e(i)}function Xge(t){let e=t.startsWith("~");return e&&(t=t.slice(1)),{optional:e}}function kM(t){return _ge({onAbsolute:()=>!1,onRelative:()=>!0,onBuiltin:()=>!1},t)}async function km(t,e,r){let i=t!==null?await r.fetcher.fetch(t,r):null,n=i&&i.localPath?{packageFs:new Ft(Se.root),prefixPath:v.relative(Se.root,i.localPath)}:i;i&&i!==n&&i.releaseFs&&i.releaseFs();let s=await de.releaseAfterUseAsync(async()=>await Promise.all(e.map(async o=>{let a=Xge(o),l=await _ge({onAbsolute:async()=>await T.readFilePromise(o,"utf8"),onRelative:async()=>{if(n===null)throw new Error("Assertion failed: The parent locator should have been fetched");return await n.packageFs.readFilePromise(v.join(n.prefixPath,o),"utf8")},onBuiltin:async c=>await r.project.configuration.firstHook(u=>u.getBuiltinPatch,r.project,c)},o);return _(P({},a),{source:l})})));for(let o of s)typeof o.source=="string"&&(o.source=o.source.replace(/\r\n?/g,` +`));return s}async function PM(t,{cache:e,project:r}){let i=r.storedPackages.get(t.locatorHash);if(typeof i=="undefined")throw new Error("Assertion failed: Expected the package to be registered");let n=r.storedChecksums,s=new ei,o=r.configuration.makeFetcher(),a=await o.fetch(t,{cache:e,project:r,fetcher:o,checksums:n,report:s}),l=await T.mktempPromise(),c=v.join(l,"source"),u=v.join(l,"user"),g=v.join(l,".yarn-patch.json");return await Promise.all([T.copyPromise(c,a.prefixPath,{baseFs:a.packageFs}),T.copyPromise(u,a.prefixPath,{baseFs:a.packageFs}),T.writeJsonPromise(g,{locator:S.stringifyLocator(t),version:i.version})]),T.detachTemp(l),u}async function DM(t,e){let r=M.fromPortablePath(t).replace(/\\/g,"/"),i=M.fromPortablePath(e).replace(/\\/g,"/"),{stdout:n,stderr:s}=await hr.execvp("git",["-c","core.safecrlf=false","diff","--src-prefix=a/","--dst-prefix=b/","--ignore-cr-at-eol","--full-index","--no-index","--text",r,i],{cwd:M.toPortablePath(process.cwd()),env:_(P({},process.env),{GIT_CONFIG_NOSYSTEM:"1",HOME:"",XDG_CONFIG_HOME:"",USERPROFILE:""})});if(s.length>0)throw new Error(`Unable to diff directories. Make sure you have a recent version of 'git' available in PATH. +The following error was reported by 'git': +${s}`);let o=r.startsWith("/")?a=>a.slice(1):a=>a;return n.replace(new RegExp(`(a|b)(${de.escapeRegExp(`/${o(r)}/`)})`,"g"),"$1/").replace(new RegExp(`(a|b)${de.escapeRegExp(`/${o(i)}/`)}`,"g"),"$1/").replace(new RegExp(de.escapeRegExp(`${r}/`),"g"),"").replace(new RegExp(de.escapeRegExp(`${i}/`),"g"),"")}function Zge(t,{configuration:e,report:r}){for(let i of t.parts)for(let n of i.lines)switch(i.type){case Lr.Context:r.reportInfo(null,` ${ue.pretty(e,n,"grey")}`);break;case Lr.Deletion:r.reportError(z.FROZEN_LOCKFILE_EXCEPTION,`- ${ue.pretty(e,n,ue.Type.REMOVED)}`);break;case Lr.Insertion:r.reportError(z.FROZEN_LOCKFILE_EXCEPTION,`+ ${ue.pretty(e,n,ue.Type.ADDED)}`);break;default:de.assertNever(i.type)}}var RM=class{supports(e,r){return!!e.reference.startsWith("patch:")}getLocalPath(e,r){return null}async fetch(e,r){let i=r.checksums.get(e.locatorHash)||null,[n,s,o]=await r.cache.fetchPackageFromCache(e,i,P({onHit:()=>r.report.reportCacheHit(e),onMiss:()=>r.report.reportCacheMiss(e,`${S.prettyLocator(r.project.configuration,e)} can't be found in the cache and will be fetched from the disk`),loader:()=>this.patchPackage(e,r),skipIntegrityCheck:r.skipIntegrityCheck},r.cacheOptions));return{packageFs:n,releaseFs:s,prefixPath:S.getIdentVendorPath(e),localPath:this.getLocalPath(e,r),checksum:o}}async patchPackage(e,r){let{parentLocator:i,sourceLocator:n,sourceVersion:s,patchPaths:o}=xm(e),a=await km(i,o,r),l=await T.mktempPromise(),c=v.join(l,"current.zip"),u=await r.fetcher.fetch(n,r),g=S.getIdentVendorPath(e),f=await $i(),h=new Jr(c,{libzip:f,create:!0,level:r.project.configuration.get("compressionLevel")});await de.releaseAfterUseAsync(async()=>{await h.copyPromise(g,u.prefixPath,{baseFs:u.packageFs,stableSort:!0})},u.releaseFs),h.saveAndClose();for(let{source:p,optional:d}of a){if(p===null)continue;let m=new Jr(c,{libzip:f,level:r.project.configuration.get("compressionLevel")}),E=new Ft(v.resolve(Se.root,g),{baseFs:m});try{await PQ(kQ(p),{baseFs:E,version:s})}catch(B){if(!(B instanceof vm))throw B;let b=r.project.configuration.get("enableInlineHunks"),R=!b&&!d?" (set enableInlineHunks for details)":"",H=`${S.prettyLocator(r.project.configuration,e)}: ${B.message}${R}`,L=K=>{!b||Zge(B.hunk,{configuration:r.project.configuration,report:K})};if(m.discardAndClose(),d){r.report.reportWarningOnce(z.PATCH_HUNK_FAILED,H,{reportExtra:L});continue}else throw new nt(z.PATCH_HUNK_FAILED,H,L)}m.saveAndClose()}return new Jr(c,{libzip:f,level:r.project.configuration.get("compressionLevel")})}};var y_e=3,FM=class{supportsDescriptor(e,r){return!!e.range.startsWith("patch:")}supportsLocator(e,r){return!!e.reference.startsWith("patch:")}shouldPersistResolution(e,r){return!1}bindDescriptor(e,r,i){let{patchPaths:n}=Sm(e);return n.every(s=>!kM(s))?e:S.bindDescriptor(e,{locator:S.stringifyLocator(r)})}getResolutionDependencies(e,r){let{sourceDescriptor:i}=Sm(e);return[i]}async getCandidates(e,r,i){if(!i.fetchOptions)throw new Error("Assertion failed: This resolver cannot be used unless a fetcher is configured");let{parentLocator:n,sourceDescriptor:s,patchPaths:o}=Sm(e),a=await km(n,o,i.fetchOptions),l=r.get(s.descriptorHash);if(typeof l=="undefined")throw new Error("Assertion failed: The dependency should have been resolved");let c=mn.makeHash(`${y_e}`,...a.map(u=>JSON.stringify(u))).slice(0,6);return[xM(e,{parentLocator:n,sourcePackage:l,patchPaths:o,patchHash:c})]}async getSatisfying(e,r,i){return null}async resolve(e,r){let{sourceLocator:i}=xm(e),n=await r.resolver.resolve(i,r);return P(P({},n),e)}};var Pm=class extends Be{constructor(){super(...arguments);this.save=Y.Boolean("-s,--save",!1,{description:"Add the patch to your resolution entries"});this.patchFolder=Y.String()}async execute(){let e=await fe.find(this.context.cwd,this.context.plugins),{project:r,workspace:i}=await Ke.find(e,this.context.cwd);if(!i)throw new rt(r.cwd,this.context.cwd);await r.restoreInstallState();let n=v.resolve(this.context.cwd,M.toPortablePath(this.patchFolder)),s=v.join(n,"../source"),o=v.join(n,"../.yarn-patch.json");if(!T.existsSync(s))throw new me("The argument folder didn't get created by 'yarn patch'");let a=await DM(s,n),l=await T.readJsonPromise(o),c=S.parseLocator(l.locator,!0);if(!r.storedPackages.has(c.locatorHash))throw new me("No package found in the project for the given locator");if(!this.save){this.context.stdout.write(a);return}let u=e.get("patchFolder"),g=v.join(u,S.slugifyLocator(c));await T.mkdirPromise(u,{recursive:!0}),await T.writeFilePromise(g,a);let f=v.relative(r.cwd,g);r.topLevelWorkspace.manifest.resolutions.push({pattern:{descriptor:{fullName:S.stringifyIdent(c),description:l.version}},reference:`patch:${S.stringifyLocator(c)}#${f}`}),await r.persist()}};Pm.paths=[["patch-commit"]],Pm.usage=ye.Usage({description:"generate a patch out of a directory",details:"\n This will print a patchfile on stdout based on the diff between the folder passed in and the original version of the package. Such file is suitable for consumption with the `patch:` protocol.\n\n Only folders generated by `yarn patch` are accepted as valid input for `yarn patch-commit`.\n "});var $ge=Pm;var Dm=class extends Be{constructor(){super(...arguments);this.json=Y.Boolean("--json",!1,{description:"Format the output as an NDJSON stream"});this.package=Y.String()}async execute(){let e=await fe.find(this.context.cwd,this.context.plugins),{project:r,workspace:i}=await Ke.find(e,this.context.cwd),n=await Qt.find(e);if(!i)throw new rt(r.cwd,this.context.cwd);await r.restoreInstallState();let s=S.parseLocator(this.package);if(s.reference==="unknown"){let o=de.mapAndFilter([...r.storedPackages.values()],a=>a.identHash!==s.identHash?de.mapAndFilter.skip:S.isVirtualLocator(a)?de.mapAndFilter.skip:a);if(o.length===0)throw new me("No package found in the project for the given locator");if(o.length>1)throw new me(`Multiple candidate packages found; explicitly choose one of them (use \`yarn why \` to get more information as to who depends on them): +${o.map(a=>` +- ${S.prettyLocator(e,a)}`).join("")}`);s=o[0]}if(!r.storedPackages.has(s.locatorHash))throw new me("No package found in the project for the given locator");await Fe.start({configuration:e,json:this.json,stdout:this.context.stdout},async o=>{let a=await PM(s,{cache:n,project:r});o.reportJson({locator:S.stringifyLocator(s),path:M.fromPortablePath(a)}),o.reportInfo(z.UNNAMED,`Package ${S.prettyLocator(e,s)} got extracted with success!`),o.reportInfo(z.UNNAMED,`You can now edit the following folder: ${ue.pretty(e,M.fromPortablePath(a),"magenta")}`),o.reportInfo(z.UNNAMED,`Once you are done run ${ue.pretty(e,`yarn patch-commit ${process.platform==="win32"?'"':""}${M.fromPortablePath(a)}${process.platform==="win32"?'"':""}`,"cyan")} and Yarn will store a patchfile based on your changes.`)})}};Dm.paths=[["patch"]],Dm.usage=ye.Usage({description:"prepare a package for patching",details:'\n This command will cause a package to be extracted in a temporary directory (under a folder named "patch-workdir"). This folder will be editable at will; running `yarn patch` inside it will then cause Yarn to generate a patchfile and register it into your top-level manifest (cf the `patch:` protocol).\n '});var efe=Dm;var w_e={configuration:{enableInlineHunks:{description:"If true, the installs will print unmatched patch hunks",type:ge.BOOLEAN,default:!1},patchFolder:{description:"Folder where the patch files must be written",type:ge.ABSOLUTE_PATH,default:"./.yarn/patches"}},commands:[$ge,efe],fetchers:[RM],resolvers:[FM]},B_e=w_e;var TM={};it(TM,{default:()=>S_e});var tfe=ie(Wp()),LM=class{supportsPackage(e,r){return r.project.configuration.get("nodeLinker")==="pnpm"}async findPackageLocation(e,r){return nfe(e,{project:r.project})}async findPackageLocator(e,r){let i=ife(),n=r.project.installersCustomData.get(i);if(!n)throw new me(`The project in ${ue.pretty(r.project.configuration,`${r.project.cwd}/package.json`,ue.Type.PATH)} doesn't seem to have been installed - running an install there might help`);let s=e.match(/(^.*\/node_modules\/(@[^/]*\/)?[^/]+)(\/.*$)/);if(s){let l=n.locatorByPath.get(s[1]);if(l)return l}let o=e,a=e;do{a=o,o=v.dirname(a);let l=n.locatorByPath.get(a);if(l)return l}while(o!==a);return null}makeInstaller(e){return new rfe(e)}},rfe=class{constructor(e){this.opts=e;this.asyncActions=new afe;this.packageLocations=new Map;this.customData={locatorByPath:new Map}}getCustomDataKey(){return ife()}attachCustomData(e){this.customData=e}async installPackage(e,r,i){switch(e.linkType){case gt.SOFT:return this.installPackageSoft(e,r,i);case gt.HARD:return this.installPackageHard(e,r,i)}throw new Error("Assertion failed: Unsupported package link type")}async installPackageSoft(e,r,i){let n=v.resolve(r.packageFs.getRealPath(),r.prefixPath);return this.packageLocations.set(e.locatorHash,n),{packageLocation:n,buildDirective:null}}async installPackageHard(e,r,i){var u;let n=nfe(e,{project:this.opts.project});this.customData.locatorByPath.set(n,S.stringifyLocator(e)),this.packageLocations.set(e.locatorHash,n),i.holdFetchResult(this.asyncActions.set(e.locatorHash,async()=>{await T.mkdirPromise(n,{recursive:!0}),await T.copyPromise(n,r.prefixPath,{baseFs:r.packageFs,overwrite:!1})}));let o=S.isVirtualLocator(e)?S.devirtualizeLocator(e):e,a={manifest:(u=await Ze.tryFind(r.prefixPath,{baseFs:r.packageFs}))!=null?u:new Ze,misc:{hasBindingGyp:Ws.hasBindingGyp(r)}},l=this.opts.project.getDependencyMeta(o,e.version),c=Ws.extractBuildScripts(e,a,l,{configuration:this.opts.project.configuration,report:this.opts.report});return{packageLocation:n,buildDirective:c}}async attachInternalDependencies(e,r){this.opts.project.configuration.get("nodeLinker")==="pnpm"&&(!ofe(e,{project:this.opts.project})||this.asyncActions.reduce(e.locatorHash,async i=>{await i;let n=this.packageLocations.get(e.locatorHash);if(typeof n=="undefined")throw new Error(`Assertion failed: Expected the package to have been registered (${S.stringifyLocator(e)})`);let s=v.join(n,wt.nodeModules);r.length>0&&await T.mkdirpPromise(s);let o=await Q_e(s),a=[];for(let[l,c]of r){let u=c;ofe(c,{project:this.opts.project})||(this.opts.report.reportWarning(z.UNNAMED,"The pnpm linker doesn't support providing different versions to workspaces' peer dependencies"),u=S.devirtualizeLocator(c));let g=this.packageLocations.get(u.locatorHash);if(typeof g=="undefined")throw new Error(`Assertion failed: Expected the package to have been registered (${S.stringifyLocator(c)})`);let f=S.stringifyIdent(l),h=v.join(s,f),p=v.relative(v.dirname(h),g),d=o.get(f);o.delete(f),a.push(Promise.resolve().then(async()=>{if(d){if(d.isSymbolicLink()&&await T.readlinkPromise(h)===p)return;await T.removePromise(h)}await T.mkdirpPromise(v.dirname(h)),process.platform=="win32"?await T.symlinkPromise(g,h,"junction"):await T.symlinkPromise(p,h)}))}for(let l of o.keys())a.push(T.removePromise(v.join(s,l)));await Promise.all(a)}))}async attachExternalDependents(e,r){throw new Error("External dependencies haven't been implemented for the pnpm linker")}async finalizeInstall(){let e=sfe(this.opts.project),r=new Set;for(let s of this.packageLocations.values())r.add(v.basename(s));let i;try{i=await T.readdirPromise(e)}catch{i=[]}let n=[];for(let s of i)r.has(s)||n.push(T.removePromise(v.join(e,s)));await Promise.all(n),await this.asyncActions.wait()}};function ife(){return JSON.stringify({name:"PnpmInstaller",version:1})}function sfe(t){return v.join(t.cwd,wt.nodeModules,".store")}function nfe(t,{project:e}){let r=S.slugifyLocator(t);return v.join(sfe(e),r)}function ofe(t,{project:e}){return!S.isVirtualLocator(t)||!e.tryWorkspaceByLocator(t)}async function Q_e(t){let e=new Map,r=[];try{r=await T.readdirPromise(t,{withFileTypes:!0})}catch(i){if(i.code!=="ENOENT")throw i}try{for(let i of r)if(!i.name.startsWith("."))if(i.name.startsWith("@"))for(let n of await T.readdirPromise(v.join(t,i.name),{withFileTypes:!0}))e.set(`${i.name}/${n.name}`,n);else e.set(i.name,i)}catch(i){if(i.code!=="ENOENT")throw i}return e}function b_e(){let t,e;return{promise:new Promise((i,n)=>{t=i,e=n}),resolve:t,reject:e}}var afe=class{constructor(){this.deferred=new Map;this.promises=new Map;this.limit=(0,tfe.default)(10)}set(e,r){let i=this.deferred.get(e);typeof i=="undefined"&&this.deferred.set(e,i=b_e());let n=this.limit(()=>r());return this.promises.set(e,n),n.then(()=>{this.promises.get(e)===n&&i.resolve()},s=>{this.promises.get(e)===n&&i.reject(s)}),i.promise}reduce(e,r){var n;let i=(n=this.promises.get(e))!=null?n:Promise.resolve();this.set(e,()=>r(i))}async wait(){await Promise.all(this.promises.values())}};var v_e={linkers:[LM]},S_e=v_e;var F0=()=>({modules:new Map([["@yarnpkg/cli",iC],["@yarnpkg/core",Fd],["@yarnpkg/fslib",ch],["@yarnpkg/libzip",Fp],["@yarnpkg/parsers",Hp],["@yarnpkg/shell",jp],["clipanion",F$(vh)],["semver",x_e],["typanion",lu],["yup",k_e],["@yarnpkg/plugin-essentials",hL],["@yarnpkg/plugin-compat",mL],["@yarnpkg/plugin-dlx",IL],["@yarnpkg/plugin-file",xL],["@yarnpkg/plugin-git",fL],["@yarnpkg/plugin-github",PL],["@yarnpkg/plugin-http",FL],["@yarnpkg/plugin-init",ML],["@yarnpkg/plugin-link",GL],["@yarnpkg/plugin-nm",mT],["@yarnpkg/plugin-npm",yM],["@yarnpkg/plugin-npm-cli",vM],["@yarnpkg/plugin-pack",CM],["@yarnpkg/plugin-patch",NM],["@yarnpkg/plugin-pnp",oT],["@yarnpkg/plugin-pnpm",TM]]),plugins:new Set(["@yarnpkg/plugin-essentials","@yarnpkg/plugin-compat","@yarnpkg/plugin-dlx","@yarnpkg/plugin-file","@yarnpkg/plugin-git","@yarnpkg/plugin-github","@yarnpkg/plugin-http","@yarnpkg/plugin-init","@yarnpkg/plugin-link","@yarnpkg/plugin-nm","@yarnpkg/plugin-npm","@yarnpkg/plugin-npm-cli","@yarnpkg/plugin-pack","@yarnpkg/plugin-patch","@yarnpkg/plugin-pnp","@yarnpkg/plugin-pnpm"])});i0({binaryVersion:Zr||"",pluginConfiguration:F0()});})(); +/*! + * buildToken + * Builds OAuth token prefix (helper function) + * + * @name buildToken + * @function + * @param {GitUrl} obj The parsed Git url object. + * @return {String} token prefix + */ +/*! + * fill-range + * + * Copyright (c) 2014-present, Jon Schlinkert. + * Licensed under the MIT License. + */ +/*! + * is-extglob + * + * Copyright (c) 2014-2016, Jon Schlinkert. + * Licensed under the MIT License. + */ +/*! + * is-glob + * + * Copyright (c) 2014-2017, Jon Schlinkert. + * Released under the MIT License. + */ +/*! + * is-number + * + * Copyright (c) 2014-present, Jon Schlinkert. + * Released under the MIT License. + */ +/*! + * is-windows + * + * Copyright Ā© 2015-2018, Jon Schlinkert. + * Released under the MIT License. + */ +/*! + * to-regex-range + * + * Copyright (c) 2015-present, Jon Schlinkert. + * Released under the MIT License. + */ diff --git a/.yarnrc.yml b/.yarnrc.yml new file mode 100644 index 000000000..70af58a84 --- /dev/null +++ b/.yarnrc.yml @@ -0,0 +1,3 @@ +nodeLinker: node-modules + +yarnPath: .yarn/releases/yarn-3.1.0.cjs diff --git a/Dockerfile b/Dockerfile index cd8f81aa4..c926f330f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -16,7 +16,8 @@ WORKDIR /code ENV GRADLE_OPTS="-Dorg.gradle.daemon=false -Dorg.gradle.project.prod=true" \ GRADLE_USER_HOME=/code/.gradlecache -COPY package.json yarn.lock /code/ +COPY package.json yarn.lock .yarnrc.yml /code/ +COPY .yarn /code/.yarn RUN yarn install COPY gradle/*.gradle gradle/ diff --git a/angular.json b/angular.json index 9957667bf..3620fd8de 100644 --- a/angular.json +++ b/angular.json @@ -37,6 +37,9 @@ "styles": [ "src/main/webapp/content/scss/global.scss" ], + "allowedCommonJsDependencies": [ + "qrcode" + ], "scripts": [] }, "configurations": { @@ -146,4 +149,4 @@ "cli": { "defaultCollection": "@angular-eslint/schematics" } -} \ No newline at end of file +} diff --git a/package.json b/package.json index cd21eb1cf..435356dae 100644 --- a/package.json +++ b/package.json @@ -7,36 +7,34 @@ "node_modules" ], "dependencies": { - "@angular/animations": "~12.2.0", - "@angular/common": "~12.2.0", - "@angular/compiler": "~12.2.0", - "@angular/core": "~12.2.0", - "@angular/forms": "~12.2.0", - "@angular/localize": "~12.2.0", - "@angular/platform-browser": "~12.2.0", - "@angular/platform-browser-dynamic": "~12.2.0", - "@angular/router": "~12.2.0", + "@angular/animations": "^12.2.12", + "@angular/common": "^12.2.12", + "@angular/core": "^12.2.12", + "@angular/forms": "^12.2.12", + "@angular/localize": "^12.2.12", + "@angular/platform-browser": "^12.2.12", + "@angular/platform-browser-dynamic": "^12.2.12", + "@angular/router": "^12.2.12", "@ng-bootstrap/ng-bootstrap": "^10.0.0", "@ngx-translate/core": "13.0.0", "@ngx-translate/http-loader": "6.0.0", - "angularx-qrcode": "^11.0.0", - "bootstrap": "4.6.0", - "core-js": "2.4.1", + "bootstrap": "^4.6.1", "font-awesome": "4.7.0", "jquery": "3.5.0", "material-design-icons": "^3.0.1", + "ng-qrcode": "^5.2.0", "ngx-cookie-service": "^12.0.3", "ngx-webstorage": "^8.0.0", - "popper.js": "^1.16.1", "rxjs": "~6.6.0", "tslib": "^2.3.0", "zone.js": "~0.11.4" }, "devDependencies": { - "@angular-builders/custom-webpack": "^12.1.0", - "@angular-devkit/build-angular": "~12.2.1", - "@angular/cli": "~12.2.1", - "@angular/compiler-cli": "~12.2.0", + "@angular-builders/custom-webpack": "^12.1.3", + "@angular-devkit/build-angular": "^12.2.12", + "@angular/cli": "^12.2.12", + "@angular/compiler": "^12.2.12", + "@angular/compiler-cli": "^12.2.12", "@cypress/schematic": "1.5.0", "@types/jasmine": "~3.8.0", "@types/node": "^12.11.1", @@ -53,7 +51,8 @@ "puppeteer": "^10.2.0", "rimraf": "2.6.1", "typescript": "~4.3.5", - "wait-port": "^0.2.9" + "wait-port": "^0.2.9", + "webpack": "^5.0.0" }, "engines": { "node": ">=14.14.0" @@ -71,5 +70,6 @@ "e2e-prod": "yarn run wait-for-managementportal-prod && ng e2e --configuration production", "wait-for-managementportal": "wait-port -t 240000 http://localhost:8080/management/health", "wait-for-managementportal-prod": "wait-port -t 240000 http://localhost:8080/managementportal/management/health" - } + }, + "packageManager": "yarn@3.1.0" } diff --git a/src/main/webapp/app/entities/subject/general.subject.module.ts b/src/main/webapp/app/entities/subject/general.subject.module.ts index 54b8e8dd0..d7ed8ab82 100644 --- a/src/main/webapp/app/entities/subject/general.subject.module.ts +++ b/src/main/webapp/app/entities/subject/general.subject.module.ts @@ -1,6 +1,6 @@ import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; -import { QRCodeModule } from 'angularx-qrcode'; +import { QrCodeModule } from 'ng-qrcode'; import { ManagementPortalSharedModule } from '../../shared'; import { ManagementPortalSharedSubjectModule } from '../../shared/subject/subject.module'; import { @@ -20,7 +20,7 @@ const ENTITY_STATES = [ ManagementPortalSharedModule, ManagementPortalSharedSubjectModule, RouterModule.forRoot(ENTITY_STATES, {useHash: true}), - QRCodeModule, + QrCodeModule, ], declarations: [ GeneralSubjectComponent, diff --git a/src/main/webapp/app/home/home.component.ts b/src/main/webapp/app/home/home.component.ts index 8b0b786fa..9a07d2b26 100644 --- a/src/main/webapp/app/home/home.component.ts +++ b/src/main/webapp/app/home/home.component.ts @@ -43,7 +43,6 @@ export class HomeComponent implements OnInit, OnDestroy { tap(account => this.account = account), switchMap(account => { if (account) { - console.log(account) return this.userService.findProject(account.login); } else { return of([]); diff --git a/src/main/webapp/app/layouts/navbar/navbar.component.ts b/src/main/webapp/app/layouts/navbar/navbar.component.ts index 3275e6bc9..91fd6660b 100644 --- a/src/main/webapp/app/layouts/navbar/navbar.component.ts +++ b/src/main/webapp/app/layouts/navbar/navbar.component.ts @@ -70,7 +70,6 @@ export class NavbarComponent implements OnInit, OnDestroy { tap(account => this.currentAccount = account), switchMap(account => { if (account) { - console.log(account) return this.userService.findProject(account.login); } else { return of([]); diff --git a/src/main/webapp/app/shared/subject/subject-pair-dialog.component.html b/src/main/webapp/app/shared/subject/subject-pair-dialog.component.html index 2bdd8045c..7c58c9042 100644 --- a/src/main/webapp/app/shared/subject/subject-pair-dialog.component.html +++ b/src/main/webapp/app/shared/subject/subject-pair-dialog.component.html @@ -35,7 +35,8 @@
    - +
    diff --git a/src/main/webapp/app/shared/subject/subject.module.ts b/src/main/webapp/app/shared/subject/subject.module.ts index f2b3f4010..51cda75ab 100644 --- a/src/main/webapp/app/shared/subject/subject.module.ts +++ b/src/main/webapp/app/shared/subject/subject.module.ts @@ -1,6 +1,6 @@ import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; -import { QRCodeModule } from 'angularx-qrcode'; +import { QrCodeModule } from 'ng-qrcode'; import { ManagementPortalSharedModule } from '../../shared'; import { @@ -31,7 +31,7 @@ const ENTITY_STATES = [ imports: [ ManagementPortalSharedModule, RouterModule.forRoot(ENTITY_STATES, {useHash: true}), - QRCodeModule, + QrCodeModule, ], declarations: [ SubjectComponent, diff --git a/tsconfig.json b/tsconfig.json index 1a53116f8..d9b5c2ff2 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -5,7 +5,7 @@ "target": "es2017", "module": "es2020", "moduleResolution": "node", - "baseUrl": "src/main/webapp", + "baseUrl": "./src/main/webapp", "forceConsistentCasingInFileNames": true, "noFallthroughCasesInSwitch": true, "sourceMap": true, diff --git a/yarn.lock b/yarn.lock index 0c951e165..59cffa4e2 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1,8727 +1,12322 @@ -# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. -# yarn lockfile v1 - - -"@ampproject/remapping@1.0.1": - version "1.0.1" - resolved "https://registry.yarnpkg.com/@ampproject/remapping/-/remapping-1.0.1.tgz#1398e73e567c2a7992df6554c15bb94a89b68ba2" - integrity sha512-Ta9bMA3EtUHDaZJXqUoT5cn/EecwOp+SXpKJqxDbDuMbLvEMu6YTyDDuvTWeStODfdmXyfMo7LymQyPkN3BicA== - dependencies: - "@jridgewell/resolve-uri" "1.0.0" - sourcemap-codec "1.4.8" - -"@angular-builders/custom-webpack@^12.1.0": - version "12.1.1" - resolved "https://registry.yarnpkg.com/@angular-builders/custom-webpack/-/custom-webpack-12.1.1.tgz#878aba575288059bd0c5f7ac473e28f2b91cb432" - integrity sha512-V5P4FBBYEZ9KKPaTsN4MVBbDYHYZbMry+WBb6lYjLV+hHJEVaoitzTNPKlRbjOBfxVZLFHMcx2nPVjj5uUZ/Sw== - dependencies: - "@angular-devkit/architect" ">=0.1200.0 < 0.1300.0" - "@angular-devkit/build-angular" "^12.0.0" - "@angular-devkit/core" "^12.0.0" - lodash "^4.17.15" - ts-node "^10.0.0" - tsconfig-paths "^3.9.0" - webpack-merge "^5.7.3" - -"@angular-devkit/architect@0.1202.3", "@angular-devkit/architect@>=0.1200.0 < 0.1300.0": - version "0.1202.3" - resolved "https://registry.yarnpkg.com/@angular-devkit/architect/-/architect-0.1202.3.tgz#4bc0a8dc7b1c39eb738c7276fb428454faae84ea" - integrity sha512-AwLdofKggAiv0hThYe0v3MWOl94XJdJlgq/MXnYU/Ma/IeJDLlRa9WJuajL9AB//x5G+uH06smD3E4Ni8mv2ag== - dependencies: - "@angular-devkit/core" "12.2.3" - rxjs "6.6.7" - -"@angular-devkit/architect@^0.1200.0": - version "0.1200.5" - resolved "https://registry.yarnpkg.com/@angular-devkit/architect/-/architect-0.1200.5.tgz#db20520c1beff0c206197652c5c46a7755caa2a0" - integrity sha512-222VZ4OeaDK3vON8V5m+w15SRWfUs5uOb4H9ij/H9/6tyHD83uWfCDoOGg+ax4wJVdWEFJIS+Vn4ijGcZCq9WQ== - dependencies: - "@angular-devkit/core" "12.0.5" - rxjs "6.6.7" - -"@angular-devkit/build-angular@^12.0.0", "@angular-devkit/build-angular@~12.2.1": - version "12.2.3" - resolved "https://registry.yarnpkg.com/@angular-devkit/build-angular/-/build-angular-12.2.3.tgz#52981758dd1f11c377ddbd1fa895929425db03e7" - integrity sha512-8qqUinwjt4Ud3MXTlME5Sw426Hgj1SFrnLP/iAbgYBFT2WBnGcOVlkxJaWmTj1cmds1H0ubi3gQGtNzPrVVcSw== - dependencies: - "@ampproject/remapping" "1.0.1" - "@angular-devkit/architect" "0.1202.3" - "@angular-devkit/build-optimizer" "0.1202.3" - "@angular-devkit/build-webpack" "0.1202.3" - "@angular-devkit/core" "12.2.3" - "@babel/core" "7.14.8" - "@babel/generator" "7.14.8" - "@babel/helper-annotate-as-pure" "7.14.5" - "@babel/plugin-proposal-async-generator-functions" "7.14.7" - "@babel/plugin-transform-async-to-generator" "7.14.5" - "@babel/plugin-transform-runtime" "7.14.5" - "@babel/preset-env" "7.14.8" - "@babel/runtime" "7.14.8" - "@babel/template" "7.14.5" - "@discoveryjs/json-ext" "0.5.3" - "@jsdevtools/coverage-istanbul-loader" "3.0.5" - "@ngtools/webpack" "12.2.3" - ansi-colors "4.1.1" - babel-loader "8.2.2" - browserslist "^4.9.1" - cacache "15.2.0" - caniuse-lite "^1.0.30001032" - circular-dependency-plugin "5.2.2" - copy-webpack-plugin "9.0.1" - core-js "3.16.0" - critters "0.0.10" - css-loader "6.2.0" - css-minimizer-webpack-plugin "3.0.2" - esbuild "0.12.17" - find-cache-dir "3.3.1" - glob "7.1.7" - https-proxy-agent "5.0.0" - inquirer "8.1.2" - karma-source-map-support "1.4.0" - less "4.1.1" - less-loader "10.0.1" - license-webpack-plugin "2.3.20" - loader-utils "2.0.0" - mini-css-extract-plugin "2.1.0" - minimatch "3.0.4" - open "8.2.1" - ora "5.4.1" - parse5-html-rewriting-stream "6.0.1" - piscina "3.1.0" - postcss "8.3.6" - postcss-import "14.0.2" - postcss-loader "6.1.1" - postcss-preset-env "6.7.0" - regenerator-runtime "0.13.9" - resolve-url-loader "4.0.0" - rxjs "6.6.7" - sass "1.36.0" - sass-loader "12.1.0" - semver "7.3.5" - source-map-loader "3.0.0" - source-map-support "0.5.19" - style-loader "3.2.1" - stylus "0.54.8" - stylus-loader "6.1.0" - terser "5.7.1" - terser-webpack-plugin "5.1.4" - text-table "0.2.0" - tree-kill "1.2.2" - tslib "2.3.0" - webpack "5.50.0" - webpack-dev-middleware "5.0.0" - webpack-dev-server "3.11.2" - webpack-merge "5.8.0" - webpack-subresource-integrity "1.5.2" - -"@angular-devkit/build-optimizer@0.1202.3": - version "0.1202.3" - resolved "https://registry.yarnpkg.com/@angular-devkit/build-optimizer/-/build-optimizer-0.1202.3.tgz#e567abbd9810650c01b52ee65e76e98141777bc8" - integrity sha512-RdicnNqLzHZhGtDwopjOjc73gI08iYcoksn7x0LLZpOMXFZ9ypucE39m4ktOkKw+IK3IPyhCPa7OpCjiGhjWFg== - dependencies: - source-map "0.7.3" - tslib "2.3.0" - typescript "4.3.5" - -"@angular-devkit/build-webpack@0.1202.3": - version "0.1202.3" - resolved "https://registry.yarnpkg.com/@angular-devkit/build-webpack/-/build-webpack-0.1202.3.tgz#d8bbf7b48a7a817a7bf8031e452bc2409028cab3" - integrity sha512-2AlDzGTMabFpSt8aBJF6FrBbwMMyRypr3NgFuoI9hLpjKuCF6uflAEGlcidqgn6HS4xWukSAmod7veVN+OqQMQ== - dependencies: - "@angular-devkit/architect" "0.1202.3" - rxjs "6.6.7" - -"@angular-devkit/core@12.0.5": - version "12.0.5" - resolved "https://registry.yarnpkg.com/@angular-devkit/core/-/core-12.0.5.tgz#3d02abd97684434f6e1ffee470b7a9c63987ae51" - integrity sha512-zVSQV+8/vjUjsUKGlj8Kf5LioA6AXJTGI0yhHW9q1dFX4dPpbW63k0R1UoIB2wJ0F/AbYVgpnPGPe9BBm2fvZA== - dependencies: - ajv "8.2.0" - ajv-formats "2.0.2" - fast-json-stable-stringify "2.1.0" - magic-string "0.25.7" - rxjs "6.6.7" - source-map "0.7.3" - -"@angular-devkit/core@12.2.3", "@angular-devkit/core@^12.0.0": - version "12.2.3" - resolved "https://registry.yarnpkg.com/@angular-devkit/core/-/core-12.2.3.tgz#16810ebdb0daee0d8732275af5da64d7eb64410a" - integrity sha512-qt1hcX5zydGmCI9gEFcqTyJDcFEScSHPRqx0dlm61hCtBF75C2g7erSgb35zE3kZ7UE9UQY28JffFnwCj6uJhQ== - dependencies: - ajv "8.6.2" - ajv-formats "2.1.0" - fast-json-stable-stringify "2.1.0" - magic-string "0.25.7" - rxjs "6.6.7" - source-map "0.7.3" - -"@angular-devkit/schematics@12.2.3", "@angular-devkit/schematics@^12.0.0": - version "12.2.3" - resolved "https://registry.yarnpkg.com/@angular-devkit/schematics/-/schematics-12.2.3.tgz#307b5af645449e64bfa2e9c0eb8f14462531c1a9" - integrity sha512-pbYOK8DK1V7YCzt8C3OckjQDGvCQqrLmg5kH+nLLAYOlkToRk3DBPIocuF9tCflNt6tEIkRJM4lPeDyy/z/GjQ== - dependencies: - "@angular-devkit/core" "12.2.3" - ora "5.4.1" - rxjs "6.6.7" - -"@angular/animations@~12.2.0": - version "12.2.3" - resolved "https://registry.yarnpkg.com/@angular/animations/-/animations-12.2.3.tgz#2605e754d1e49d010400e1b4f9961cf29a459e48" - integrity sha512-mX0NA05psPW97R9uVLvT3uuvFpZtlaeMVGsQyktyZvrbZVk89cr1DT4yHcwb8UNp9SMfN5prmq1l++Gkvu+c3w== - dependencies: - tslib "^2.2.0" - -"@angular/cli@~12.2.1": - version "12.2.3" - resolved "https://registry.yarnpkg.com/@angular/cli/-/cli-12.2.3.tgz#08b3d64ac9c4c4a2355dadcfc46b90494ece455a" - integrity sha512-QBudMbLc+m/Z7GZTskeStk8PUAIPYVYRDq+9dQyKmill56t4MdmTU/m8eteVUXWpQFdRwhqIz6L9hlsfJXzP6A== - dependencies: - "@angular-devkit/architect" "0.1202.3" - "@angular-devkit/core" "12.2.3" - "@angular-devkit/schematics" "12.2.3" - "@schematics/angular" "12.2.3" - "@yarnpkg/lockfile" "1.1.0" - ansi-colors "4.1.1" - debug "4.3.2" - ini "2.0.0" - inquirer "8.1.2" - jsonc-parser "3.0.0" - npm-package-arg "8.1.5" - npm-pick-manifest "6.1.1" - open "8.2.1" - ora "5.4.1" - pacote "11.3.5" - resolve "1.20.0" - semver "7.3.5" - symbol-observable "4.0.0" - uuid "8.3.2" - -"@angular/common@~12.2.0": - version "12.2.3" - resolved "https://registry.yarnpkg.com/@angular/common/-/common-12.2.3.tgz#deb11b2cc0e0e3056af4b0318098aecbc67fa561" - integrity sha512-AkOeknm35kzLqqh5dIz1143e3Q1MjWgi7THlY3StY63yphseQUUvGQSNHkDSIpfwBN8Mt+ZykKFjhY+cNFYt7w== - dependencies: - tslib "^2.2.0" - -"@angular/compiler-cli@~12.2.0": - version "12.2.3" - resolved "https://registry.yarnpkg.com/@angular/compiler-cli/-/compiler-cli-12.2.3.tgz#77774b219276ef45b269743093a40166299b6da6" - integrity sha512-8yw13AqfRSY9YV4zb6PfuJizPa5/lh4DNbc6gQkw1Dmh/Af+U2bxrtZhQCgXWJAys1sd+PN/gTQOc7/YzDNVLQ== - dependencies: - "@babel/core" "^7.8.6" - "@babel/types" "^7.8.6" - canonical-path "1.0.0" - chokidar "^3.0.0" - convert-source-map "^1.5.1" - dependency-graph "^0.11.0" - magic-string "^0.25.0" - minimist "^1.2.0" - reflect-metadata "^0.1.2" - semver "^7.0.0" - source-map "^0.6.1" - sourcemap-codec "^1.4.8" - tslib "^2.2.0" - yargs "^17.0.0" - -"@angular/compiler@~12.2.0": - version "12.2.3" - resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-12.2.3.tgz#a528dcda48c17c9b844caba5b61cfd119e515d17" - integrity sha512-jlS7XUokGb4eH6aYEIanrq6a7ZxcMI9GmMr5tBAdIHusH3b40dcMpZVXIxoGzv1Ws47m2izDCrjWjkFKeXPavQ== - dependencies: - tslib "^2.2.0" - -"@angular/core@~12.2.0": - version "12.2.3" - resolved "https://registry.yarnpkg.com/@angular/core/-/core-12.2.3.tgz#74f53915da3134f7e3a205219107b2eb4adcf8a6" - integrity sha512-gv3FJPiwDKugySzPepBzXrbr8HxeK2enotEmducNv3IdtGZPS0/qrbDVt7W0woRt7BGAeWaZKEaPoFzMZeEbCw== - dependencies: - tslib "^2.2.0" - -"@angular/forms@~12.2.0": - version "12.2.3" - resolved "https://registry.yarnpkg.com/@angular/forms/-/forms-12.2.3.tgz#3da2c32bc584382932b26377aee9f5e06ba31584" - integrity sha512-euc2omQ8YVRLjmJDGXRBNLLTzOQZjLYn/DxB3yChWNcsiOZoqhBQprgioQZt4GnCoQJyBH9iQZENnHOZk0TD1w== - dependencies: - tslib "^2.2.0" - -"@angular/localize@~12.2.0": - version "12.2.3" - resolved "https://registry.yarnpkg.com/@angular/localize/-/localize-12.2.3.tgz#69faac155239dd418b6cb07fdc5904730b963777" - integrity sha512-vIF2MXNsLYfa3yAwxhtv/dcVuojYtCaP/Zxf6vEvGrIxEFV5Q5vqqXU5Rg77CUgGV1vDYcDgGp4V8xd2R2hHoQ== - dependencies: - "@babel/core" "7.8.3" - glob "7.1.7" - yargs "^17.0.0" - -"@angular/platform-browser-dynamic@~12.2.0": - version "12.2.3" - resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-12.2.3.tgz#e4ce6805ec557eeb92c90732b8cfb8ac263ab96b" - integrity sha512-K31+QW6ubquSXkWaf54TXIkV5aoRLwZ5aFo8TEAXbmddgwxhWF7egCB5j0pajq5QTxyDnXns9140HNcqg4QLcw== - dependencies: - tslib "^2.2.0" - -"@angular/platform-browser@~12.2.0": - version "12.2.3" - resolved "https://registry.yarnpkg.com/@angular/platform-browser/-/platform-browser-12.2.3.tgz#0d9c6e8270c8192f4abf7b0a7c520a933ba60a1d" - integrity sha512-dPA9JDZtxBb4VvhFFMh0sQzTfMcUXYxe/jY1rsKqYJVbIW6NZ1kj9/00acxTU0QdrW4xv5TlwgOdTYck6//C4g== - dependencies: - tslib "^2.2.0" - -"@angular/router@~12.2.0": - version "12.2.3" - resolved "https://registry.yarnpkg.com/@angular/router/-/router-12.2.3.tgz#91303914ad07319e4e326dfb9554a57a3d41b6d9" - integrity sha512-6qKQzS7WVx1J0ue3rqNlr2h/F0Kar6JNVrbDc+hFXyeHhdtk3Wg8Xfk4LxWBqgs6d+6HlOPIzMM4QzydVbEyRQ== - dependencies: - tslib "^2.2.0" - -"@assemblyscript/loader@^0.10.1": - version "0.10.1" - resolved "https://registry.yarnpkg.com/@assemblyscript/loader/-/loader-0.10.1.tgz#70e45678f06c72fa2e350e8553ec4a4d72b92e06" - integrity sha512-H71nDOOL8Y7kWRLqf6Sums+01Q5msqBW2KhDUTemh1tvY04eSkSXrK0uj/4mmY0Xr16/3zyZmsrxN7CKuRbNRg== - -"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.14.5", "@babel/code-frame@^7.8.3": - version "7.14.5" - resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.14.5.tgz#23b08d740e83f49c5e59945fbf1b43e80bbf4edb" - integrity sha512-9pzDqyc6OLDaqe+zbACgFkb6fKMNG6CObKpnYXChRsvYGyEdc7CA2BaqeOM+vOtCS5ndmJicPJhKAwYRI6UfFw== - dependencies: - "@babel/highlight" "^7.14.5" - -"@babel/compat-data@^7.13.11", "@babel/compat-data@^7.14.7", "@babel/compat-data@^7.15.0": - version "7.15.0" - resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.15.0.tgz#2dbaf8b85334796cafbb0f5793a90a2fc010b176" - integrity sha512-0NqAC1IJE0S0+lL1SWFMxMkz1pKCNCjI4tr2Zx4LJSXxCLAdr6KyArnY+sno5m3yH9g737ygOyPABDsnXkpxiA== - -"@babel/core@7.14.8": - version "7.14.8" - resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.14.8.tgz#20cdf7c84b5d86d83fac8710a8bc605a7ba3f010" - integrity sha512-/AtaeEhT6ErpDhInbXmjHcUQXH0L0TEgscfcxk1qbOvLuKCa5aZT0SOOtDKFY96/CLROwbLSKyFor6idgNaU4Q== - dependencies: - "@babel/code-frame" "^7.14.5" - "@babel/generator" "^7.14.8" - "@babel/helper-compilation-targets" "^7.14.5" - "@babel/helper-module-transforms" "^7.14.8" - "@babel/helpers" "^7.14.8" - "@babel/parser" "^7.14.8" - "@babel/template" "^7.14.5" - "@babel/traverse" "^7.14.8" - "@babel/types" "^7.14.8" - convert-source-map "^1.7.0" - debug "^4.1.0" - gensync "^1.0.0-beta.2" - json5 "^2.1.2" - semver "^6.3.0" - source-map "^0.5.0" - -"@babel/core@7.8.3": - version "7.8.3" - resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.8.3.tgz#30b0ebb4dd1585de6923a0b4d179e0b9f5d82941" - integrity sha512-4XFkf8AwyrEG7Ziu3L2L0Cv+WyY47Tcsp70JFmpftbAA1K7YL/sgE9jh9HyNj08Y/U50ItUchpN0w6HxAoX1rA== - dependencies: - "@babel/code-frame" "^7.8.3" - "@babel/generator" "^7.8.3" - "@babel/helpers" "^7.8.3" - "@babel/parser" "^7.8.3" - "@babel/template" "^7.8.3" - "@babel/traverse" "^7.8.3" - "@babel/types" "^7.8.3" - convert-source-map "^1.7.0" - debug "^4.1.0" - gensync "^1.0.0-beta.1" - json5 "^2.1.0" - lodash "^4.17.13" - resolve "^1.3.2" - semver "^5.4.1" - source-map "^0.5.0" - -"@babel/core@^7.7.5", "@babel/core@^7.8.6": - version "7.15.0" - resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.15.0.tgz#749e57c68778b73ad8082775561f67f5196aafa8" - integrity sha512-tXtmTminrze5HEUPn/a0JtOzzfp0nk+UEXQ/tqIJo3WDGypl/2OFQEMll/zSFU8f/lfmfLXvTaORHF3cfXIQMw== - dependencies: - "@babel/code-frame" "^7.14.5" - "@babel/generator" "^7.15.0" - "@babel/helper-compilation-targets" "^7.15.0" - "@babel/helper-module-transforms" "^7.15.0" - "@babel/helpers" "^7.14.8" - "@babel/parser" "^7.15.0" - "@babel/template" "^7.14.5" - "@babel/traverse" "^7.15.0" - "@babel/types" "^7.15.0" - convert-source-map "^1.7.0" - debug "^4.1.0" - gensync "^1.0.0-beta.2" - json5 "^2.1.2" - semver "^6.3.0" - source-map "^0.5.0" - -"@babel/generator@7.14.8": - version "7.14.8" - resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.14.8.tgz#bf86fd6af96cf3b74395a8ca409515f89423e070" - integrity sha512-cYDUpvIzhBVnMzRoY1fkSEhK/HmwEVwlyULYgn/tMQYd6Obag3ylCjONle3gdErfXBW61SVTlR9QR7uWlgeIkg== - dependencies: - "@babel/types" "^7.14.8" - jsesc "^2.5.1" - source-map "^0.5.0" - -"@babel/generator@^7.14.8", "@babel/generator@^7.15.0", "@babel/generator@^7.8.3": - version "7.15.0" - resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.15.0.tgz#a7d0c172e0d814974bad5aa77ace543b97917f15" - integrity sha512-eKl4XdMrbpYvuB505KTta4AV9g+wWzmVBW69tX0H2NwKVKd2YJbKgyK6M8j/rgLbmHOYJn6rUklV677nOyJrEQ== - dependencies: - "@babel/types" "^7.15.0" - jsesc "^2.5.1" - source-map "^0.5.0" - -"@babel/helper-annotate-as-pure@7.14.5", "@babel/helper-annotate-as-pure@^7.14.5": - version "7.14.5" - resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.14.5.tgz#7bf478ec3b71726d56a8ca5775b046fc29879e61" - integrity sha512-EivH9EgBIb+G8ij1B2jAwSH36WnGvkQSEC6CkX/6v6ZFlw5fVOHvsgGF4uiEHO2GzMvunZb6tDLQEQSdrdocrA== - dependencies: - "@babel/types" "^7.14.5" - -"@babel/helper-builder-binary-assignment-operator-visitor@^7.14.5": - version "7.14.5" - resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.14.5.tgz#b939b43f8c37765443a19ae74ad8b15978e0a191" - integrity sha512-YTA/Twn0vBXDVGJuAX6PwW7x5zQei1luDDo2Pl6q1qZ7hVNl0RZrhHCQG/ArGpR29Vl7ETiB8eJyrvpuRp300w== - dependencies: - "@babel/helper-explode-assignable-expression" "^7.14.5" - "@babel/types" "^7.14.5" - -"@babel/helper-compilation-targets@^7.13.0", "@babel/helper-compilation-targets@^7.14.5", "@babel/helper-compilation-targets@^7.15.0": - version "7.15.0" - resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.15.0.tgz#973df8cbd025515f3ff25db0c05efc704fa79818" - integrity sha512-h+/9t0ncd4jfZ8wsdAsoIxSa61qhBYlycXiHWqJaQBCXAhDCMbPRSMTGnZIkkmt1u4ag+UQmuqcILwqKzZ4N2A== - dependencies: - "@babel/compat-data" "^7.15.0" - "@babel/helper-validator-option" "^7.14.5" - browserslist "^4.16.6" - semver "^6.3.0" - -"@babel/helper-create-class-features-plugin@^7.14.5": - version "7.15.0" - resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.15.0.tgz#c9a137a4d137b2d0e2c649acf536d7ba1a76c0f7" - integrity sha512-MdmDXgvTIi4heDVX/e9EFfeGpugqm9fobBVg/iioE8kueXrOHdRDe36FAY7SnE9xXLVeYCoJR/gdrBEIHRC83Q== - dependencies: - "@babel/helper-annotate-as-pure" "^7.14.5" - "@babel/helper-function-name" "^7.14.5" - "@babel/helper-member-expression-to-functions" "^7.15.0" - "@babel/helper-optimise-call-expression" "^7.14.5" - "@babel/helper-replace-supers" "^7.15.0" - "@babel/helper-split-export-declaration" "^7.14.5" - -"@babel/helper-create-regexp-features-plugin@^7.14.5": - version "7.14.5" - resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.14.5.tgz#c7d5ac5e9cf621c26057722fb7a8a4c5889358c4" - integrity sha512-TLawwqpOErY2HhWbGJ2nZT5wSkR192QpN+nBg1THfBfftrlvOh+WbhrxXCH4q4xJ9Gl16BGPR/48JA+Ryiho/A== - dependencies: - "@babel/helper-annotate-as-pure" "^7.14.5" - regexpu-core "^4.7.1" - -"@babel/helper-define-polyfill-provider@^0.2.2": - version "0.2.3" - resolved "https://registry.yarnpkg.com/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.2.3.tgz#0525edec5094653a282688d34d846e4c75e9c0b6" - integrity sha512-RH3QDAfRMzj7+0Nqu5oqgO5q9mFtQEVvCRsi8qCEfzLR9p2BHfn5FzhSB2oj1fF7I2+DcTORkYaQ6aTR9Cofew== - dependencies: - "@babel/helper-compilation-targets" "^7.13.0" - "@babel/helper-module-imports" "^7.12.13" - "@babel/helper-plugin-utils" "^7.13.0" - "@babel/traverse" "^7.13.0" - debug "^4.1.1" - lodash.debounce "^4.0.8" - resolve "^1.14.2" - semver "^6.1.2" - -"@babel/helper-explode-assignable-expression@^7.14.5": - version "7.14.5" - resolved "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.14.5.tgz#8aa72e708205c7bb643e45c73b4386cdf2a1f645" - integrity sha512-Htb24gnGJdIGT4vnRKMdoXiOIlqOLmdiUYpAQ0mYfgVT/GDm8GOYhgi4GL+hMKrkiPRohO4ts34ELFsGAPQLDQ== - dependencies: - "@babel/types" "^7.14.5" - -"@babel/helper-function-name@^7.14.5": - version "7.14.5" - resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.14.5.tgz#89e2c474972f15d8e233b52ee8c480e2cfcd50c4" - integrity sha512-Gjna0AsXWfFvrAuX+VKcN/aNNWonizBj39yGwUzVDVTlMYJMK2Wp6xdpy72mfArFq5uK+NOuexfzZlzI1z9+AQ== - dependencies: - "@babel/helper-get-function-arity" "^7.14.5" - "@babel/template" "^7.14.5" - "@babel/types" "^7.14.5" - -"@babel/helper-get-function-arity@^7.14.5": - version "7.14.5" - resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.14.5.tgz#25fbfa579b0937eee1f3b805ece4ce398c431815" - integrity sha512-I1Db4Shst5lewOM4V+ZKJzQ0JGGaZ6VY1jYvMghRjqs6DWgxLCIyFt30GlnKkfUeFLpJt2vzbMVEXVSXlIFYUg== - dependencies: - "@babel/types" "^7.14.5" - -"@babel/helper-hoist-variables@^7.14.5": - version "7.14.5" - resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.14.5.tgz#e0dd27c33a78e577d7c8884916a3e7ef1f7c7f8d" - integrity sha512-R1PXiz31Uc0Vxy4OEOm07x0oSjKAdPPCh3tPivn/Eo8cvz6gveAeuyUUPB21Hoiif0uoPQSSdhIPS3352nvdyQ== - dependencies: - "@babel/types" "^7.14.5" - -"@babel/helper-member-expression-to-functions@^7.15.0": - version "7.15.0" - resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.15.0.tgz#0ddaf5299c8179f27f37327936553e9bba60990b" - integrity sha512-Jq8H8U2kYiafuj2xMTPQwkTBnEEdGKpT35lJEQsRRjnG0LW3neucsaMWLgKcwu3OHKNeYugfw+Z20BXBSEs2Lg== - dependencies: - "@babel/types" "^7.15.0" - -"@babel/helper-module-imports@^7.12.13", "@babel/helper-module-imports@^7.14.5": - version "7.14.5" - resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.14.5.tgz#6d1a44df6a38c957aa7c312da076429f11b422f3" - integrity sha512-SwrNHu5QWS84XlHwGYPDtCxcA0hrSlL2yhWYLgeOc0w7ccOl2qv4s/nARI0aYZW+bSwAL5CukeXA47B/1NKcnQ== - dependencies: - "@babel/types" "^7.14.5" - -"@babel/helper-module-transforms@^7.14.5", "@babel/helper-module-transforms@^7.14.8", "@babel/helper-module-transforms@^7.15.0": - version "7.15.0" - resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.15.0.tgz#679275581ea056373eddbe360e1419ef23783b08" - integrity sha512-RkGiW5Rer7fpXv9m1B3iHIFDZdItnO2/BLfWVW/9q7+KqQSDY5kUfQEbzdXM1MVhJGcugKV7kRrNVzNxmk7NBg== - dependencies: - "@babel/helper-module-imports" "^7.14.5" - "@babel/helper-replace-supers" "^7.15.0" - "@babel/helper-simple-access" "^7.14.8" - "@babel/helper-split-export-declaration" "^7.14.5" - "@babel/helper-validator-identifier" "^7.14.9" - "@babel/template" "^7.14.5" - "@babel/traverse" "^7.15.0" - "@babel/types" "^7.15.0" - -"@babel/helper-optimise-call-expression@^7.14.5": - version "7.14.5" - resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.14.5.tgz#f27395a8619e0665b3f0364cddb41c25d71b499c" - integrity sha512-IqiLIrODUOdnPU9/F8ib1Fx2ohlgDhxnIDU7OEVi+kAbEZcyiF7BLU8W6PfvPi9LzztjS7kcbzbmL7oG8kD6VA== - dependencies: - "@babel/types" "^7.14.5" - -"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.13.0", "@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3": - version "7.14.5" - resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.14.5.tgz#5ac822ce97eec46741ab70a517971e443a70c5a9" - integrity sha512-/37qQCE3K0vvZKwoK4XU/irIJQdIfCJuhU5eKnNxpFDsOkgFaUAwbv+RYw6eYgsC0E4hS7r5KqGULUogqui0fQ== - -"@babel/helper-remap-async-to-generator@^7.14.5": - version "7.14.5" - resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.14.5.tgz#51439c913612958f54a987a4ffc9ee587a2045d6" - integrity sha512-rLQKdQU+HYlxBwQIj8dk4/0ENOUEhA/Z0l4hN8BexpvmSMN9oA9EagjnhnDpNsRdWCfjwa4mn/HyBXO9yhQP6A== - dependencies: - "@babel/helper-annotate-as-pure" "^7.14.5" - "@babel/helper-wrap-function" "^7.14.5" - "@babel/types" "^7.14.5" - -"@babel/helper-replace-supers@^7.14.5", "@babel/helper-replace-supers@^7.15.0": - version "7.15.0" - resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.15.0.tgz#ace07708f5bf746bf2e6ba99572cce79b5d4e7f4" - integrity sha512-6O+eWrhx+HEra/uJnifCwhwMd6Bp5+ZfZeJwbqUTuqkhIT6YcRhiZCOOFChRypOIe0cV46kFrRBlm+t5vHCEaA== - dependencies: - "@babel/helper-member-expression-to-functions" "^7.15.0" - "@babel/helper-optimise-call-expression" "^7.14.5" - "@babel/traverse" "^7.15.0" - "@babel/types" "^7.15.0" - -"@babel/helper-simple-access@^7.14.8": - version "7.14.8" - resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.14.8.tgz#82e1fec0644a7e775c74d305f212c39f8fe73924" - integrity sha512-TrFN4RHh9gnWEU+s7JloIho2T76GPwRHhdzOWLqTrMnlas8T9O7ec+oEDNsRXndOmru9ymH9DFrEOxpzPoSbdg== - dependencies: - "@babel/types" "^7.14.8" - -"@babel/helper-skip-transparent-expression-wrappers@^7.14.5": - version "7.14.5" - resolved "https://registry.yarnpkg.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.14.5.tgz#96f486ac050ca9f44b009fbe5b7d394cab3a0ee4" - integrity sha512-dmqZB7mrb94PZSAOYtr+ZN5qt5owZIAgqtoTuqiFbHFtxgEcmQlRJVI+bO++fciBunXtB6MK7HrzrfcAzIz2NQ== - dependencies: - "@babel/types" "^7.14.5" - -"@babel/helper-split-export-declaration@^7.14.5": - version "7.14.5" - resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.14.5.tgz#22b23a54ef51c2b7605d851930c1976dd0bc693a" - integrity sha512-hprxVPu6e5Kdp2puZUmvOGjaLv9TCe58E/Fl6hRq4YiVQxIcNvuq6uTM2r1mT/oPskuS9CgR+I94sqAYv0NGKA== - dependencies: - "@babel/types" "^7.14.5" - -"@babel/helper-validator-identifier@^7.14.5", "@babel/helper-validator-identifier@^7.14.9": - version "7.14.9" - resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.9.tgz#6654d171b2024f6d8ee151bf2509699919131d48" - integrity sha512-pQYxPY0UP6IHISRitNe8bsijHex4TWZXi2HwKVsjPiltzlhse2znVcm9Ace510VT1kxIHjGJCZZQBX2gJDbo0g== - -"@babel/helper-validator-option@^7.14.5": - version "7.14.5" - resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.14.5.tgz#6e72a1fff18d5dfcb878e1e62f1a021c4b72d5a3" - integrity sha512-OX8D5eeX4XwcroVW45NMvoYaIuFI+GQpA2a8Gi+X/U/cDUIRsV37qQfF905F0htTRCREQIB4KqPeaveRJUl3Ow== - -"@babel/helper-wrap-function@^7.14.5": - version "7.14.5" - resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.14.5.tgz#5919d115bf0fe328b8a5d63bcb610f51601f2bff" - integrity sha512-YEdjTCq+LNuNS1WfxsDCNpgXkJaIyqco6DAelTUjT4f2KIWC1nBcaCaSdHTBqQVLnTBexBcVcFhLSU1KnYuePQ== - dependencies: - "@babel/helper-function-name" "^7.14.5" - "@babel/template" "^7.14.5" - "@babel/traverse" "^7.14.5" - "@babel/types" "^7.14.5" - -"@babel/helpers@^7.14.8", "@babel/helpers@^7.8.3": - version "7.15.3" - resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.15.3.tgz#c96838b752b95dcd525b4e741ed40bb1dc2a1357" - integrity sha512-HwJiz52XaS96lX+28Tnbu31VeFSQJGOeKHJeaEPQlTl7PnlhFElWPj8tUXtqFIzeN86XxXoBr+WFAyK2PPVz6g== - dependencies: - "@babel/template" "^7.14.5" - "@babel/traverse" "^7.15.0" - "@babel/types" "^7.15.0" - -"@babel/highlight@^7.14.5": - version "7.14.5" - resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.14.5.tgz#6861a52f03966405001f6aa534a01a24d99e8cd9" - integrity sha512-qf9u2WFWVV0MppaL877j2dBtQIDgmidgjGk5VIMw3OadXvYaXn66U1BFlH2t4+t3i+8PhedppRv+i40ABzd+gg== - dependencies: - "@babel/helper-validator-identifier" "^7.14.5" - chalk "^2.0.0" - js-tokens "^4.0.0" - -"@babel/parser@^7.14.5", "@babel/parser@^7.14.8", "@babel/parser@^7.15.0", "@babel/parser@^7.8.3": - version "7.15.3" - resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.15.3.tgz#3416d9bea748052cfcb63dbcc27368105b1ed862" - integrity sha512-O0L6v/HvqbdJawj0iBEfVQMc3/6WP+AeOsovsIgBFyJaG+W2w7eqvZB7puddATmWuARlm1SX7DwxJ/JJUnDpEA== - -"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@^7.14.5": - version "7.14.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.14.5.tgz#4b467302e1548ed3b1be43beae2cc9cf45e0bb7e" - integrity sha512-ZoJS2XCKPBfTmL122iP6NM9dOg+d4lc9fFk3zxc8iDjvt8Pk4+TlsHSKhIPf6X+L5ORCdBzqMZDjL/WHj7WknQ== - dependencies: - "@babel/helper-plugin-utils" "^7.14.5" - "@babel/helper-skip-transparent-expression-wrappers" "^7.14.5" - "@babel/plugin-proposal-optional-chaining" "^7.14.5" - -"@babel/plugin-proposal-async-generator-functions@7.14.7": - version "7.14.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.14.7.tgz#784a48c3d8ed073f65adcf30b57bcbf6c8119ace" - integrity sha512-RK8Wj7lXLY3bqei69/cc25gwS5puEc3dknoFPFbqfy3XxYQBQFvu4ioWpafMBAB+L9NyptQK4nMOa5Xz16og8Q== - dependencies: - "@babel/helper-plugin-utils" "^7.14.5" - "@babel/helper-remap-async-to-generator" "^7.14.5" - "@babel/plugin-syntax-async-generators" "^7.8.4" - -"@babel/plugin-proposal-async-generator-functions@^7.14.7": - version "7.14.9" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.14.9.tgz#7028dc4fa21dc199bbacf98b39bab1267d0eaf9a" - integrity sha512-d1lnh+ZnKrFKwtTYdw320+sQWCTwgkB9fmUhNXRADA4akR6wLjaruSGnIEUjpt9HCOwTr4ynFTKu19b7rFRpmw== - dependencies: - "@babel/helper-plugin-utils" "^7.14.5" - "@babel/helper-remap-async-to-generator" "^7.14.5" - "@babel/plugin-syntax-async-generators" "^7.8.4" - -"@babel/plugin-proposal-class-properties@^7.14.5": - version "7.14.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.14.5.tgz#40d1ee140c5b1e31a350f4f5eed945096559b42e" - integrity sha512-q/PLpv5Ko4dVc1LYMpCY7RVAAO4uk55qPwrIuJ5QJ8c6cVuAmhu7I/49JOppXL6gXf7ZHzpRVEUZdYoPLM04Gg== - dependencies: - "@babel/helper-create-class-features-plugin" "^7.14.5" - "@babel/helper-plugin-utils" "^7.14.5" - -"@babel/plugin-proposal-class-static-block@^7.14.5": - version "7.14.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.14.5.tgz#158e9e10d449c3849ef3ecde94a03d9f1841b681" - integrity sha512-KBAH5ksEnYHCegqseI5N9skTdxgJdmDoAOc0uXa+4QMYKeZD0w5IARh4FMlTNtaHhbB8v+KzMdTgxMMzsIy6Yg== - dependencies: - "@babel/helper-create-class-features-plugin" "^7.14.5" - "@babel/helper-plugin-utils" "^7.14.5" - "@babel/plugin-syntax-class-static-block" "^7.14.5" - -"@babel/plugin-proposal-dynamic-import@^7.14.5": - version "7.14.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.14.5.tgz#0c6617df461c0c1f8fff3b47cd59772360101d2c" - integrity sha512-ExjiNYc3HDN5PXJx+bwC50GIx/KKanX2HiggnIUAYedbARdImiCU4RhhHfdf0Kd7JNXGpsBBBCOm+bBVy3Gb0g== - dependencies: - "@babel/helper-plugin-utils" "^7.14.5" - "@babel/plugin-syntax-dynamic-import" "^7.8.3" - -"@babel/plugin-proposal-export-namespace-from@^7.14.5": - version "7.14.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.14.5.tgz#dbad244310ce6ccd083072167d8cea83a52faf76" - integrity sha512-g5POA32bXPMmSBu5Dx/iZGLGnKmKPc5AiY7qfZgurzrCYgIztDlHFbznSNCoQuv57YQLnQfaDi7dxCtLDIdXdA== - dependencies: - "@babel/helper-plugin-utils" "^7.14.5" - "@babel/plugin-syntax-export-namespace-from" "^7.8.3" - -"@babel/plugin-proposal-json-strings@^7.14.5": - version "7.14.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.14.5.tgz#38de60db362e83a3d8c944ac858ddf9f0c2239eb" - integrity sha512-NSq2fczJYKVRIsUJyNxrVUMhB27zb7N7pOFGQOhBKJrChbGcgEAqyZrmZswkPk18VMurEeJAaICbfm57vUeTbQ== - dependencies: - "@babel/helper-plugin-utils" "^7.14.5" - "@babel/plugin-syntax-json-strings" "^7.8.3" - -"@babel/plugin-proposal-logical-assignment-operators@^7.14.5": - version "7.14.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.14.5.tgz#6e6229c2a99b02ab2915f82571e0cc646a40c738" - integrity sha512-YGn2AvZAo9TwyhlLvCCWxD90Xq8xJ4aSgaX3G5D/8DW94L8aaT+dS5cSP+Z06+rCJERGSr9GxMBZ601xoc2taw== - dependencies: - "@babel/helper-plugin-utils" "^7.14.5" - "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4" - -"@babel/plugin-proposal-nullish-coalescing-operator@^7.14.5": - version "7.14.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.14.5.tgz#ee38589ce00e2cc59b299ec3ea406fcd3a0fdaf6" - integrity sha512-gun/SOnMqjSb98Nkaq2rTKMwervfdAoz6NphdY0vTfuzMfryj+tDGb2n6UkDKwez+Y8PZDhE3D143v6Gepp4Hg== - dependencies: - "@babel/helper-plugin-utils" "^7.14.5" - "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3" - -"@babel/plugin-proposal-numeric-separator@^7.14.5": - version "7.14.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.14.5.tgz#83631bf33d9a51df184c2102a069ac0c58c05f18" - integrity sha512-yiclALKe0vyZRZE0pS6RXgjUOt87GWv6FYa5zqj15PvhOGFO69R5DusPlgK/1K5dVnCtegTiWu9UaBSrLLJJBg== - dependencies: - "@babel/helper-plugin-utils" "^7.14.5" - "@babel/plugin-syntax-numeric-separator" "^7.10.4" - -"@babel/plugin-proposal-object-rest-spread@^7.14.7": - version "7.14.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.14.7.tgz#5920a2b3df7f7901df0205974c0641b13fd9d363" - integrity sha512-082hsZz+sVabfmDWo1Oct1u1AgbKbUAyVgmX4otIc7bdsRgHBXwTwb3DpDmD4Eyyx6DNiuz5UAATT655k+kL5g== - dependencies: - "@babel/compat-data" "^7.14.7" - "@babel/helper-compilation-targets" "^7.14.5" - "@babel/helper-plugin-utils" "^7.14.5" - "@babel/plugin-syntax-object-rest-spread" "^7.8.3" - "@babel/plugin-transform-parameters" "^7.14.5" - -"@babel/plugin-proposal-optional-catch-binding@^7.14.5": - version "7.14.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.14.5.tgz#939dd6eddeff3a67fdf7b3f044b5347262598c3c" - integrity sha512-3Oyiixm0ur7bzO5ybNcZFlmVsygSIQgdOa7cTfOYCMY+wEPAYhZAJxi3mixKFCTCKUhQXuCTtQ1MzrpL3WT8ZQ== - dependencies: - "@babel/helper-plugin-utils" "^7.14.5" - "@babel/plugin-syntax-optional-catch-binding" "^7.8.3" - -"@babel/plugin-proposal-optional-chaining@^7.14.5": - version "7.14.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.14.5.tgz#fa83651e60a360e3f13797eef00b8d519695b603" - integrity sha512-ycz+VOzo2UbWNI1rQXxIuMOzrDdHGrI23fRiz/Si2R4kv2XZQ1BK8ccdHwehMKBlcH/joGW/tzrUmo67gbJHlQ== - dependencies: - "@babel/helper-plugin-utils" "^7.14.5" - "@babel/helper-skip-transparent-expression-wrappers" "^7.14.5" - "@babel/plugin-syntax-optional-chaining" "^7.8.3" - -"@babel/plugin-proposal-private-methods@^7.14.5": - version "7.14.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.14.5.tgz#37446495996b2945f30f5be5b60d5e2aa4f5792d" - integrity sha512-838DkdUA1u+QTCplatfq4B7+1lnDa/+QMI89x5WZHBcnNv+47N8QEj2k9I2MUU9xIv8XJ4XvPCviM/Dj7Uwt9g== - dependencies: - "@babel/helper-create-class-features-plugin" "^7.14.5" - "@babel/helper-plugin-utils" "^7.14.5" - -"@babel/plugin-proposal-private-property-in-object@^7.14.5": - version "7.14.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.14.5.tgz#9f65a4d0493a940b4c01f8aa9d3f1894a587f636" - integrity sha512-62EyfyA3WA0mZiF2e2IV9mc9Ghwxcg8YTu8BS4Wss4Y3PY725OmS9M0qLORbJwLqFtGh+jiE4wAmocK2CTUK2Q== - dependencies: - "@babel/helper-annotate-as-pure" "^7.14.5" - "@babel/helper-create-class-features-plugin" "^7.14.5" - "@babel/helper-plugin-utils" "^7.14.5" - "@babel/plugin-syntax-private-property-in-object" "^7.14.5" - -"@babel/plugin-proposal-unicode-property-regex@^7.14.5", "@babel/plugin-proposal-unicode-property-regex@^7.4.4": - version "7.14.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.14.5.tgz#0f95ee0e757a5d647f378daa0eca7e93faa8bbe8" - integrity sha512-6axIeOU5LnY471KenAB9vI8I5j7NQ2d652hIYwVyRfgaZT5UpiqFKCuVXCDMSrU+3VFafnu2c5m3lrWIlr6A5Q== - dependencies: - "@babel/helper-create-regexp-features-plugin" "^7.14.5" - "@babel/helper-plugin-utils" "^7.14.5" - -"@babel/plugin-syntax-async-generators@^7.8.4": - version "7.8.4" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz#a983fb1aeb2ec3f6ed042a210f640e90e786fe0d" - integrity sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw== - dependencies: - "@babel/helper-plugin-utils" "^7.8.0" - -"@babel/plugin-syntax-class-properties@^7.12.13": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz#b5c987274c4a3a82b89714796931a6b53544ae10" - integrity sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA== - dependencies: - "@babel/helper-plugin-utils" "^7.12.13" - -"@babel/plugin-syntax-class-static-block@^7.14.5": - version "7.14.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-class-static-block/-/plugin-syntax-class-static-block-7.14.5.tgz#195df89b146b4b78b3bf897fd7a257c84659d406" - integrity sha512-b+YyPmr6ldyNnM6sqYeMWE+bgJcJpO6yS4QD7ymxgH34GBPNDM/THBh8iunyvKIZztiwLH4CJZ0RxTk9emgpjw== - dependencies: - "@babel/helper-plugin-utils" "^7.14.5" - -"@babel/plugin-syntax-dynamic-import@^7.8.3": - version "7.8.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.3.tgz#62bf98b2da3cd21d626154fc96ee5b3cb68eacb3" - integrity sha512-5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ== - dependencies: - "@babel/helper-plugin-utils" "^7.8.0" - -"@babel/plugin-syntax-export-namespace-from@^7.8.3": - version "7.8.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-export-namespace-from/-/plugin-syntax-export-namespace-from-7.8.3.tgz#028964a9ba80dbc094c915c487ad7c4e7a66465a" - integrity sha512-MXf5laXo6c1IbEbegDmzGPwGNTsHZmEy6QGznu5Sh2UCWvueywb2ee+CCE4zQiZstxU9BMoQO9i6zUFSY0Kj0Q== - dependencies: - "@babel/helper-plugin-utils" "^7.8.3" - -"@babel/plugin-syntax-json-strings@^7.8.3": - version "7.8.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz#01ca21b668cd8218c9e640cb6dd88c5412b2c96a" - integrity sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA== - dependencies: - "@babel/helper-plugin-utils" "^7.8.0" - -"@babel/plugin-syntax-logical-assignment-operators@^7.10.4": - version "7.10.4" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz#ca91ef46303530448b906652bac2e9fe9941f699" - integrity sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig== - dependencies: - "@babel/helper-plugin-utils" "^7.10.4" - -"@babel/plugin-syntax-nullish-coalescing-operator@^7.8.3": - version "7.8.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz#167ed70368886081f74b5c36c65a88c03b66d1a9" - integrity sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ== - dependencies: - "@babel/helper-plugin-utils" "^7.8.0" - -"@babel/plugin-syntax-numeric-separator@^7.10.4": - version "7.10.4" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz#b9b070b3e33570cd9fd07ba7fa91c0dd37b9af97" - integrity sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug== - dependencies: - "@babel/helper-plugin-utils" "^7.10.4" - -"@babel/plugin-syntax-object-rest-spread@^7.8.3": - version "7.8.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz#60e225edcbd98a640332a2e72dd3e66f1af55871" - integrity sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA== - dependencies: - "@babel/helper-plugin-utils" "^7.8.0" - -"@babel/plugin-syntax-optional-catch-binding@^7.8.3": - version "7.8.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz#6111a265bcfb020eb9efd0fdfd7d26402b9ed6c1" - integrity sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q== - dependencies: - "@babel/helper-plugin-utils" "^7.8.0" - -"@babel/plugin-syntax-optional-chaining@^7.8.3": - version "7.8.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz#4f69c2ab95167e0180cd5336613f8c5788f7d48a" - integrity sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg== - dependencies: - "@babel/helper-plugin-utils" "^7.8.0" - -"@babel/plugin-syntax-private-property-in-object@^7.14.5": - version "7.14.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-private-property-in-object/-/plugin-syntax-private-property-in-object-7.14.5.tgz#0dc6671ec0ea22b6e94a1114f857970cd39de1ad" - integrity sha512-0wVnp9dxJ72ZUJDV27ZfbSj6iHLoytYZmh3rFcxNnvsJF3ktkzLDZPy/mA17HGsaQT3/DQsWYX1f1QGWkCoVUg== - dependencies: - "@babel/helper-plugin-utils" "^7.14.5" - -"@babel/plugin-syntax-top-level-await@^7.14.5": - version "7.14.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz#c1cfdadc35a646240001f06138247b741c34d94c" - integrity sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw== - dependencies: - "@babel/helper-plugin-utils" "^7.14.5" - -"@babel/plugin-transform-arrow-functions@^7.14.5": - version "7.14.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.14.5.tgz#f7187d9588a768dd080bf4c9ffe117ea62f7862a" - integrity sha512-KOnO0l4+tD5IfOdi4x8C1XmEIRWUjNRV8wc6K2vz/3e8yAOoZZvsRXRRIF/yo/MAOFb4QjtAw9xSxMXbSMRy8A== - dependencies: - "@babel/helper-plugin-utils" "^7.14.5" - -"@babel/plugin-transform-async-to-generator@7.14.5", "@babel/plugin-transform-async-to-generator@^7.14.5": - version "7.14.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.14.5.tgz#72c789084d8f2094acb945633943ef8443d39e67" - integrity sha512-szkbzQ0mNk0rpu76fzDdqSyPu0MuvpXgC+6rz5rpMb5OIRxdmHfQxrktL8CYolL2d8luMCZTR0DpIMIdL27IjA== - dependencies: - "@babel/helper-module-imports" "^7.14.5" - "@babel/helper-plugin-utils" "^7.14.5" - "@babel/helper-remap-async-to-generator" "^7.14.5" - -"@babel/plugin-transform-block-scoped-functions@^7.14.5": - version "7.14.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.14.5.tgz#e48641d999d4bc157a67ef336aeb54bc44fd3ad4" - integrity sha512-dtqWqdWZ5NqBX3KzsVCWfQI3A53Ft5pWFCT2eCVUftWZgjc5DpDponbIF1+c+7cSGk2wN0YK7HGL/ezfRbpKBQ== - dependencies: - "@babel/helper-plugin-utils" "^7.14.5" - -"@babel/plugin-transform-block-scoping@^7.14.5": - version "7.15.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.15.3.tgz#94c81a6e2fc230bcce6ef537ac96a1e4d2b3afaf" - integrity sha512-nBAzfZwZb4DkaGtOes1Up1nOAp9TDRRFw4XBzBBSG9QK7KVFmYzgj9o9sbPv7TX5ofL4Auq4wZnxCoPnI/lz2Q== - dependencies: - "@babel/helper-plugin-utils" "^7.14.5" - -"@babel/plugin-transform-classes@^7.14.5": - version "7.14.9" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.14.9.tgz#2a391ffb1e5292710b00f2e2c210e1435e7d449f" - integrity sha512-NfZpTcxU3foGWbl4wxmZ35mTsYJy8oQocbeIMoDAGGFarAmSQlL+LWMkDx/tj6pNotpbX3rltIA4dprgAPOq5A== - dependencies: - "@babel/helper-annotate-as-pure" "^7.14.5" - "@babel/helper-function-name" "^7.14.5" - "@babel/helper-optimise-call-expression" "^7.14.5" - "@babel/helper-plugin-utils" "^7.14.5" - "@babel/helper-replace-supers" "^7.14.5" - "@babel/helper-split-export-declaration" "^7.14.5" - globals "^11.1.0" - -"@babel/plugin-transform-computed-properties@^7.14.5": - version "7.14.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.14.5.tgz#1b9d78987420d11223d41195461cc43b974b204f" - integrity sha512-pWM+E4283UxaVzLb8UBXv4EIxMovU4zxT1OPnpHJcmnvyY9QbPPTKZfEj31EUvG3/EQRbYAGaYEUZ4yWOBC2xg== - dependencies: - "@babel/helper-plugin-utils" "^7.14.5" - -"@babel/plugin-transform-destructuring@^7.14.7": - version "7.14.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.14.7.tgz#0ad58ed37e23e22084d109f185260835e5557576" - integrity sha512-0mDE99nK+kVh3xlc5vKwB6wnP9ecuSj+zQCa/n0voENtP/zymdT4HH6QEb65wjjcbqr1Jb/7z9Qp7TF5FtwYGw== - dependencies: - "@babel/helper-plugin-utils" "^7.14.5" - -"@babel/plugin-transform-dotall-regex@^7.14.5", "@babel/plugin-transform-dotall-regex@^7.4.4": - version "7.14.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.14.5.tgz#2f6bf76e46bdf8043b4e7e16cf24532629ba0c7a" - integrity sha512-loGlnBdj02MDsFaHhAIJzh7euK89lBrGIdM9EAtHFo6xKygCUGuuWe07o1oZVk287amtW1n0808sQM99aZt3gw== - dependencies: - "@babel/helper-create-regexp-features-plugin" "^7.14.5" - "@babel/helper-plugin-utils" "^7.14.5" - -"@babel/plugin-transform-duplicate-keys@^7.14.5": - version "7.14.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.14.5.tgz#365a4844881bdf1501e3a9f0270e7f0f91177954" - integrity sha512-iJjbI53huKbPDAsJ8EmVmvCKeeq21bAze4fu9GBQtSLqfvzj2oRuHVx4ZkDwEhg1htQ+5OBZh/Ab0XDf5iBZ7A== - dependencies: - "@babel/helper-plugin-utils" "^7.14.5" - -"@babel/plugin-transform-exponentiation-operator@^7.14.5": - version "7.14.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.14.5.tgz#5154b8dd6a3dfe6d90923d61724bd3deeb90b493" - integrity sha512-jFazJhMBc9D27o9jDnIE5ZErI0R0m7PbKXVq77FFvqFbzvTMuv8jaAwLZ5PviOLSFttqKIW0/wxNSDbjLk0tYA== - dependencies: - "@babel/helper-builder-binary-assignment-operator-visitor" "^7.14.5" - "@babel/helper-plugin-utils" "^7.14.5" - -"@babel/plugin-transform-for-of@^7.14.5": - version "7.14.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.14.5.tgz#dae384613de8f77c196a8869cbf602a44f7fc0eb" - integrity sha512-CfmqxSUZzBl0rSjpoQSFoR9UEj3HzbGuGNL21/iFTmjb5gFggJp3ph0xR1YBhexmLoKRHzgxuFvty2xdSt6gTA== - dependencies: - "@babel/helper-plugin-utils" "^7.14.5" - -"@babel/plugin-transform-function-name@^7.14.5": - version "7.14.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.14.5.tgz#e81c65ecb900746d7f31802f6bed1f52d915d6f2" - integrity sha512-vbO6kv0fIzZ1GpmGQuvbwwm+O4Cbm2NrPzwlup9+/3fdkuzo1YqOZcXw26+YUJB84Ja7j9yURWposEHLYwxUfQ== - dependencies: - "@babel/helper-function-name" "^7.14.5" - "@babel/helper-plugin-utils" "^7.14.5" - -"@babel/plugin-transform-literals@^7.14.5": - version "7.14.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.14.5.tgz#41d06c7ff5d4d09e3cf4587bd3ecf3930c730f78" - integrity sha512-ql33+epql2F49bi8aHXxvLURHkxJbSmMKl9J5yHqg4PLtdE6Uc48CH1GS6TQvZ86eoB/ApZXwm7jlA+B3kra7A== - dependencies: - "@babel/helper-plugin-utils" "^7.14.5" - -"@babel/plugin-transform-member-expression-literals@^7.14.5": - version "7.14.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.14.5.tgz#b39cd5212a2bf235a617d320ec2b48bcc091b8a7" - integrity sha512-WkNXxH1VXVTKarWFqmso83xl+2V3Eo28YY5utIkbsmXoItO8Q3aZxN4BTS2k0hz9dGUloHK26mJMyQEYfkn/+Q== - dependencies: - "@babel/helper-plugin-utils" "^7.14.5" - -"@babel/plugin-transform-modules-amd@^7.14.5": - version "7.14.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.14.5.tgz#4fd9ce7e3411cb8b83848480b7041d83004858f7" - integrity sha512-3lpOU8Vxmp3roC4vzFpSdEpGUWSMsHFreTWOMMLzel2gNGfHE5UWIh/LN6ghHs2xurUp4jRFYMUIZhuFbody1g== - dependencies: - "@babel/helper-module-transforms" "^7.14.5" - "@babel/helper-plugin-utils" "^7.14.5" - babel-plugin-dynamic-import-node "^2.3.3" - -"@babel/plugin-transform-modules-commonjs@^7.14.5": - version "7.15.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.15.0.tgz#3305896e5835f953b5cdb363acd9e8c2219a5281" - integrity sha512-3H/R9s8cXcOGE8kgMlmjYYC9nqr5ELiPkJn4q0mypBrjhYQoc+5/Maq69vV4xRPWnkzZuwJPf5rArxpB/35Cig== - dependencies: - "@babel/helper-module-transforms" "^7.15.0" - "@babel/helper-plugin-utils" "^7.14.5" - "@babel/helper-simple-access" "^7.14.8" - babel-plugin-dynamic-import-node "^2.3.3" - -"@babel/plugin-transform-modules-systemjs@^7.14.5": - version "7.14.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.14.5.tgz#c75342ef8b30dcde4295d3401aae24e65638ed29" - integrity sha512-mNMQdvBEE5DcMQaL5LbzXFMANrQjd2W7FPzg34Y4yEz7dBgdaC+9B84dSO+/1Wba98zoDbInctCDo4JGxz1VYA== - dependencies: - "@babel/helper-hoist-variables" "^7.14.5" - "@babel/helper-module-transforms" "^7.14.5" - "@babel/helper-plugin-utils" "^7.14.5" - "@babel/helper-validator-identifier" "^7.14.5" - babel-plugin-dynamic-import-node "^2.3.3" - -"@babel/plugin-transform-modules-umd@^7.14.5": - version "7.14.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.14.5.tgz#fb662dfee697cce274a7cda525190a79096aa6e0" - integrity sha512-RfPGoagSngC06LsGUYyM9QWSXZ8MysEjDJTAea1lqRjNECE3y0qIJF/qbvJxc4oA4s99HumIMdXOrd+TdKaAAA== - dependencies: - "@babel/helper-module-transforms" "^7.14.5" - "@babel/helper-plugin-utils" "^7.14.5" - -"@babel/plugin-transform-named-capturing-groups-regex@^7.14.7": - version "7.14.9" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.14.9.tgz#c68f5c5d12d2ebaba3762e57c2c4f6347a46e7b2" - integrity sha512-l666wCVYO75mlAtGFfyFwnWmIXQm3kSH0C3IRnJqWcZbWkoihyAdDhFm2ZWaxWTqvBvhVFfJjMRQ0ez4oN1yYA== - dependencies: - "@babel/helper-create-regexp-features-plugin" "^7.14.5" - -"@babel/plugin-transform-new-target@^7.14.5": - version "7.14.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.14.5.tgz#31bdae8b925dc84076ebfcd2a9940143aed7dbf8" - integrity sha512-Nx054zovz6IIRWEB49RDRuXGI4Gy0GMgqG0cII9L3MxqgXz/+rgII+RU58qpo4g7tNEx1jG7rRVH4ihZoP4esQ== - dependencies: - "@babel/helper-plugin-utils" "^7.14.5" - -"@babel/plugin-transform-object-super@^7.14.5": - version "7.14.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.14.5.tgz#d0b5faeac9e98597a161a9cf78c527ed934cdc45" - integrity sha512-MKfOBWzK0pZIrav9z/hkRqIk/2bTv9qvxHzPQc12RcVkMOzpIKnFCNYJip00ssKWYkd8Sf5g0Wr7pqJ+cmtuFg== - dependencies: - "@babel/helper-plugin-utils" "^7.14.5" - "@babel/helper-replace-supers" "^7.14.5" - -"@babel/plugin-transform-parameters@^7.14.5": - version "7.14.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.14.5.tgz#49662e86a1f3ddccac6363a7dfb1ff0a158afeb3" - integrity sha512-Tl7LWdr6HUxTmzQtzuU14SqbgrSKmaR77M0OKyq4njZLQTPfOvzblNKyNkGwOfEFCEx7KeYHQHDI0P3F02IVkA== - dependencies: - "@babel/helper-plugin-utils" "^7.14.5" - -"@babel/plugin-transform-property-literals@^7.14.5": - version "7.14.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.14.5.tgz#0ddbaa1f83db3606f1cdf4846fa1dfb473458b34" - integrity sha512-r1uilDthkgXW8Z1vJz2dKYLV1tuw2xsbrp3MrZmD99Wh9vsfKoob+JTgri5VUb/JqyKRXotlOtwgu4stIYCmnw== - dependencies: - "@babel/helper-plugin-utils" "^7.14.5" - -"@babel/plugin-transform-regenerator@^7.14.5": - version "7.14.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.14.5.tgz#9676fd5707ed28f522727c5b3c0aa8544440b04f" - integrity sha512-NVIY1W3ITDP5xQl50NgTKlZ0GrotKtLna08/uGY6ErQt6VEQZXla86x/CTddm5gZdcr+5GSsvMeTmWA5Ii6pkg== - dependencies: - regenerator-transform "^0.14.2" - -"@babel/plugin-transform-reserved-words@^7.14.5": - version "7.14.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.14.5.tgz#c44589b661cfdbef8d4300dcc7469dffa92f8304" - integrity sha512-cv4F2rv1nD4qdexOGsRQXJrOcyb5CrgjUH9PKrrtyhSDBNWGxd0UIitjyJiWagS+EbUGjG++22mGH1Pub8D6Vg== - dependencies: - "@babel/helper-plugin-utils" "^7.14.5" - -"@babel/plugin-transform-runtime@7.14.5": - version "7.14.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.14.5.tgz#30491dad49c6059f8f8fa5ee8896a0089e987523" - integrity sha512-fPMBhh1AV8ZyneiCIA+wYYUH1arzlXR1UMcApjvchDhfKxhy2r2lReJv8uHEyihi4IFIGlr1Pdx7S5fkESDQsg== - dependencies: - "@babel/helper-module-imports" "^7.14.5" - "@babel/helper-plugin-utils" "^7.14.5" - babel-plugin-polyfill-corejs2 "^0.2.2" - babel-plugin-polyfill-corejs3 "^0.2.2" - babel-plugin-polyfill-regenerator "^0.2.2" - semver "^6.3.0" - -"@babel/plugin-transform-shorthand-properties@^7.14.5": - version "7.14.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.14.5.tgz#97f13855f1409338d8cadcbaca670ad79e091a58" - integrity sha512-xLucks6T1VmGsTB+GWK5Pl9Jl5+nRXD1uoFdA5TSO6xtiNjtXTjKkmPdFXVLGlK5A2/or/wQMKfmQ2Y0XJfn5g== - dependencies: - "@babel/helper-plugin-utils" "^7.14.5" - -"@babel/plugin-transform-spread@^7.14.6": - version "7.14.6" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.14.6.tgz#6bd40e57fe7de94aa904851963b5616652f73144" - integrity sha512-Zr0x0YroFJku7n7+/HH3A2eIrGMjbmAIbJSVv0IZ+t3U2WUQUA64S/oeied2e+MaGSjmt4alzBCsK9E8gh+fag== - dependencies: - "@babel/helper-plugin-utils" "^7.14.5" - "@babel/helper-skip-transparent-expression-wrappers" "^7.14.5" - -"@babel/plugin-transform-sticky-regex@^7.14.5": - version "7.14.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.14.5.tgz#5b617542675e8b7761294381f3c28c633f40aeb9" - integrity sha512-Z7F7GyvEMzIIbwnziAZmnSNpdijdr4dWt+FJNBnBLz5mwDFkqIXU9wmBcWWad3QeJF5hMTkRe4dAq2sUZiG+8A== - dependencies: - "@babel/helper-plugin-utils" "^7.14.5" - -"@babel/plugin-transform-template-literals@^7.14.5": - version "7.14.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.14.5.tgz#a5f2bc233937d8453885dc736bdd8d9ffabf3d93" - integrity sha512-22btZeURqiepOfuy/VkFr+zStqlujWaarpMErvay7goJS6BWwdd6BY9zQyDLDa4x2S3VugxFb162IZ4m/S/+Gg== - dependencies: - "@babel/helper-plugin-utils" "^7.14.5" - -"@babel/plugin-transform-typeof-symbol@^7.14.5": - version "7.14.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.14.5.tgz#39af2739e989a2bd291bf6b53f16981423d457d4" - integrity sha512-lXzLD30ffCWseTbMQzrvDWqljvZlHkXU+CnseMhkMNqU1sASnCsz3tSzAaH3vCUXb9PHeUb90ZT1BdFTm1xxJw== - dependencies: - "@babel/helper-plugin-utils" "^7.14.5" - -"@babel/plugin-transform-unicode-escapes@^7.14.5": - version "7.14.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.14.5.tgz#9d4bd2a681e3c5d7acf4f57fa9e51175d91d0c6b" - integrity sha512-crTo4jATEOjxj7bt9lbYXcBAM3LZaUrbP2uUdxb6WIorLmjNKSpHfIybgY4B8SRpbf8tEVIWH3Vtm7ayCrKocA== - dependencies: - "@babel/helper-plugin-utils" "^7.14.5" - -"@babel/plugin-transform-unicode-regex@^7.14.5": - version "7.14.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.14.5.tgz#4cd09b6c8425dd81255c7ceb3fb1836e7414382e" - integrity sha512-UygduJpC5kHeCiRw/xDVzC+wj8VaYSoKl5JNVmbP7MadpNinAm3SvZCxZ42H37KZBKztz46YC73i9yV34d0Tzw== - dependencies: - "@babel/helper-create-regexp-features-plugin" "^7.14.5" - "@babel/helper-plugin-utils" "^7.14.5" - -"@babel/preset-env@7.14.8": - version "7.14.8" - resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.14.8.tgz#254942f5ca80ccabcfbb2a9f524c74bca574005b" - integrity sha512-a9aOppDU93oArQ51H+B8M1vH+tayZbuBqzjOhntGetZVa+4tTu5jp+XTwqHGG2lxslqomPYVSjIxQkFwXzgnxg== - dependencies: - "@babel/compat-data" "^7.14.7" - "@babel/helper-compilation-targets" "^7.14.5" - "@babel/helper-plugin-utils" "^7.14.5" - "@babel/helper-validator-option" "^7.14.5" - "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining" "^7.14.5" - "@babel/plugin-proposal-async-generator-functions" "^7.14.7" - "@babel/plugin-proposal-class-properties" "^7.14.5" - "@babel/plugin-proposal-class-static-block" "^7.14.5" - "@babel/plugin-proposal-dynamic-import" "^7.14.5" - "@babel/plugin-proposal-export-namespace-from" "^7.14.5" - "@babel/plugin-proposal-json-strings" "^7.14.5" - "@babel/plugin-proposal-logical-assignment-operators" "^7.14.5" - "@babel/plugin-proposal-nullish-coalescing-operator" "^7.14.5" - "@babel/plugin-proposal-numeric-separator" "^7.14.5" - "@babel/plugin-proposal-object-rest-spread" "^7.14.7" - "@babel/plugin-proposal-optional-catch-binding" "^7.14.5" - "@babel/plugin-proposal-optional-chaining" "^7.14.5" - "@babel/plugin-proposal-private-methods" "^7.14.5" - "@babel/plugin-proposal-private-property-in-object" "^7.14.5" - "@babel/plugin-proposal-unicode-property-regex" "^7.14.5" - "@babel/plugin-syntax-async-generators" "^7.8.4" - "@babel/plugin-syntax-class-properties" "^7.12.13" - "@babel/plugin-syntax-class-static-block" "^7.14.5" - "@babel/plugin-syntax-dynamic-import" "^7.8.3" - "@babel/plugin-syntax-export-namespace-from" "^7.8.3" - "@babel/plugin-syntax-json-strings" "^7.8.3" - "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4" - "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3" - "@babel/plugin-syntax-numeric-separator" "^7.10.4" - "@babel/plugin-syntax-object-rest-spread" "^7.8.3" - "@babel/plugin-syntax-optional-catch-binding" "^7.8.3" - "@babel/plugin-syntax-optional-chaining" "^7.8.3" - "@babel/plugin-syntax-private-property-in-object" "^7.14.5" - "@babel/plugin-syntax-top-level-await" "^7.14.5" - "@babel/plugin-transform-arrow-functions" "^7.14.5" - "@babel/plugin-transform-async-to-generator" "^7.14.5" - "@babel/plugin-transform-block-scoped-functions" "^7.14.5" - "@babel/plugin-transform-block-scoping" "^7.14.5" - "@babel/plugin-transform-classes" "^7.14.5" - "@babel/plugin-transform-computed-properties" "^7.14.5" - "@babel/plugin-transform-destructuring" "^7.14.7" - "@babel/plugin-transform-dotall-regex" "^7.14.5" - "@babel/plugin-transform-duplicate-keys" "^7.14.5" - "@babel/plugin-transform-exponentiation-operator" "^7.14.5" - "@babel/plugin-transform-for-of" "^7.14.5" - "@babel/plugin-transform-function-name" "^7.14.5" - "@babel/plugin-transform-literals" "^7.14.5" - "@babel/plugin-transform-member-expression-literals" "^7.14.5" - "@babel/plugin-transform-modules-amd" "^7.14.5" - "@babel/plugin-transform-modules-commonjs" "^7.14.5" - "@babel/plugin-transform-modules-systemjs" "^7.14.5" - "@babel/plugin-transform-modules-umd" "^7.14.5" - "@babel/plugin-transform-named-capturing-groups-regex" "^7.14.7" - "@babel/plugin-transform-new-target" "^7.14.5" - "@babel/plugin-transform-object-super" "^7.14.5" - "@babel/plugin-transform-parameters" "^7.14.5" - "@babel/plugin-transform-property-literals" "^7.14.5" - "@babel/plugin-transform-regenerator" "^7.14.5" - "@babel/plugin-transform-reserved-words" "^7.14.5" - "@babel/plugin-transform-shorthand-properties" "^7.14.5" - "@babel/plugin-transform-spread" "^7.14.6" - "@babel/plugin-transform-sticky-regex" "^7.14.5" - "@babel/plugin-transform-template-literals" "^7.14.5" - "@babel/plugin-transform-typeof-symbol" "^7.14.5" - "@babel/plugin-transform-unicode-escapes" "^7.14.5" - "@babel/plugin-transform-unicode-regex" "^7.14.5" - "@babel/preset-modules" "^0.1.4" - "@babel/types" "^7.14.8" - babel-plugin-polyfill-corejs2 "^0.2.2" - babel-plugin-polyfill-corejs3 "^0.2.2" - babel-plugin-polyfill-regenerator "^0.2.2" - core-js-compat "^3.15.0" - semver "^6.3.0" - -"@babel/preset-modules@^0.1.4": - version "0.1.4" - resolved "https://registry.yarnpkg.com/@babel/preset-modules/-/preset-modules-0.1.4.tgz#362f2b68c662842970fdb5e254ffc8fc1c2e415e" - integrity sha512-J36NhwnfdzpmH41M1DrnkkgAqhZaqr/NBdPfQ677mLzlaXo+oDiv1deyCDtgAhz8p328otdob0Du7+xgHGZbKg== - dependencies: - "@babel/helper-plugin-utils" "^7.0.0" - "@babel/plugin-proposal-unicode-property-regex" "^7.4.4" - "@babel/plugin-transform-dotall-regex" "^7.4.4" - "@babel/types" "^7.4.4" - esutils "^2.0.2" - -"@babel/runtime@7.14.8": - version "7.14.8" - resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.14.8.tgz#7119a56f421018852694290b9f9148097391b446" - integrity sha512-twj3L8Og5SaCRCErB4x4ajbvBIVV77CGeFglHpeg5WC5FF8TZzBWXtTJ4MqaD9QszLYTtr+IsaAL2rEUevb+eg== - dependencies: - regenerator-runtime "^0.13.4" - -"@babel/runtime@^7.8.4": - version "7.15.3" - resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.15.3.tgz#2e1c2880ca118e5b2f9988322bd8a7656a32502b" - integrity sha512-OvwMLqNXkCXSz1kSm58sEsNuhqOx/fKpnUnKnFB5v8uDda5bLNEHNgKPvhDN6IU0LDcnHQ90LlJ0Q6jnyBSIBA== - dependencies: - regenerator-runtime "^0.13.4" - -"@babel/template@7.14.5", "@babel/template@^7.14.5", "@babel/template@^7.8.3": - version "7.14.5" - resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.14.5.tgz#a9bc9d8b33354ff6e55a9c60d1109200a68974f4" - integrity sha512-6Z3Po85sfxRGachLULUhOmvAaOo7xCvqGQtxINai2mEGPFm6pQ4z5QInFnUrRpfoSV60BnjyF5F3c+15fxFV1g== - dependencies: - "@babel/code-frame" "^7.14.5" - "@babel/parser" "^7.14.5" - "@babel/types" "^7.14.5" - -"@babel/traverse@^7.13.0", "@babel/traverse@^7.14.5", "@babel/traverse@^7.14.8", "@babel/traverse@^7.15.0", "@babel/traverse@^7.8.3": - version "7.15.0" - resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.15.0.tgz#4cca838fd1b2a03283c1f38e141f639d60b3fc98" - integrity sha512-392d8BN0C9eVxVWd8H6x9WfipgVH5IaIoLp23334Sc1vbKKWINnvwRpb4us0xtPaCumlwbTtIYNA0Dv/32sVFw== - dependencies: - "@babel/code-frame" "^7.14.5" - "@babel/generator" "^7.15.0" - "@babel/helper-function-name" "^7.14.5" - "@babel/helper-hoist-variables" "^7.14.5" - "@babel/helper-split-export-declaration" "^7.14.5" - "@babel/parser" "^7.15.0" - "@babel/types" "^7.15.0" - debug "^4.1.0" - globals "^11.1.0" - -"@babel/types@^7.14.5", "@babel/types@^7.14.8", "@babel/types@^7.15.0", "@babel/types@^7.4.4", "@babel/types@^7.8.3", "@babel/types@^7.8.6": - version "7.15.0" - resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.15.0.tgz#61af11f2286c4e9c69ca8deb5f4375a73c72dcbd" - integrity sha512-OBvfqnllOIdX4ojTHpwZbpvz4j3EWyjkZEdmjH0/cgsd6QOdSgU8rLSk6ard/pcW7rlmjdVSX/AWOaORR1uNOQ== - dependencies: - "@babel/helper-validator-identifier" "^7.14.9" - to-fast-properties "^2.0.0" - -"@cspotcode/source-map-consumer@0.8.0": - version "0.8.0" - resolved "https://registry.yarnpkg.com/@cspotcode/source-map-consumer/-/source-map-consumer-0.8.0.tgz#33bf4b7b39c178821606f669bbc447a6a629786b" - integrity sha512-41qniHzTU8yAGbCp04ohlmSrZf8bkf/iJsl3V0dRGsQN/5GFfx+LbCSsCpp2gqrqjTVg/K6O8ycoV35JIwAzAg== - -"@cspotcode/source-map-support@0.6.1": - version "0.6.1" - resolved "https://registry.yarnpkg.com/@cspotcode/source-map-support/-/source-map-support-0.6.1.tgz#118511f316e2e87ee4294761868e254d3da47960" - integrity sha512-DX3Z+T5dt1ockmPdobJS/FAsQPW4V4SrWEhD2iYQT2Cb2tQsiMnYxrcUH9By/Z3B+v0S5LMBkQtV/XOBbpLEOg== - dependencies: - "@cspotcode/source-map-consumer" "0.8.0" - -"@csstools/convert-colors@^1.4.0": - version "1.4.0" - resolved "https://registry.yarnpkg.com/@csstools/convert-colors/-/convert-colors-1.4.0.tgz#ad495dc41b12e75d588c6db8b9834f08fa131eb7" - integrity sha512-5a6wqoJV/xEdbRNKVo6I4hO3VjyDq//8q2f9I6PBAvMesJHFauXDorcNCsr9RzvsZnaWi5NYCcfyqP1QeFHFbw== - -"@cypress/request@^2.88.5": - version "2.88.6" - resolved "https://registry.yarnpkg.com/@cypress/request/-/request-2.88.6.tgz#a970dd675befc6bdf8a8921576c01f51cc5798e9" - integrity sha512-z0UxBE/+qaESAHY9p9sM2h8Y4XqtsbDCt0/DPOrqA/RZgKi4PkxdpXyK4wCCnSk1xHqWHZZAE+gV6aDAR6+caQ== - dependencies: - aws-sign2 "~0.7.0" - aws4 "^1.8.0" - caseless "~0.12.0" - combined-stream "~1.0.6" - extend "~3.0.2" - forever-agent "~0.6.1" - form-data "~2.3.2" - har-validator "~5.1.3" - http-signature "~1.2.0" - is-typedarray "~1.0.0" - isstream "~0.1.2" - json-stringify-safe "~5.0.1" - mime-types "~2.1.19" - performance-now "^2.1.0" - qs "~6.5.2" - safe-buffer "^5.1.2" - tough-cookie "~2.5.0" - tunnel-agent "^0.6.0" - uuid "^8.3.2" - -"@cypress/schematic@1.5.0": - version "1.5.0" - resolved "https://registry.yarnpkg.com/@cypress/schematic/-/schematic-1.5.0.tgz#7eb2a13a71641bded3ef6e1cb4f3f6201f087ccc" - integrity sha512-mixvdJaRimgJkoW7dTQaxiVQwfnjVqUVLYhadFYRCm6bR0HMN+6woXAYUXmxlWhpK7lEyDJPllL3NAI4Ik3YAw== - dependencies: - "@angular-devkit/architect" "^0.1200.0" - "@angular-devkit/core" "^12.0.0" - "@angular-devkit/schematics" "^12.0.0" - "@schematics/angular" "^12.0.0" - jsonc-parser "^3.0.0" - rxjs "~6.6.0" - -"@cypress/xvfb@^1.2.4": - version "1.2.4" - resolved "https://registry.yarnpkg.com/@cypress/xvfb/-/xvfb-1.2.4.tgz#2daf42e8275b39f4aa53c14214e557bd14e7748a" - integrity sha512-skbBzPggOVYCbnGgV+0dmBdW/s77ZkAOXIC1knS8NagwDjBrNC1LuXtQJeiN6l+m7lzmHtaoUw/ctJKdqkG57Q== - dependencies: - debug "^3.1.0" - lodash.once "^4.1.1" - -"@discoveryjs/json-ext@0.5.3": - version "0.5.3" - resolved "https://registry.yarnpkg.com/@discoveryjs/json-ext/-/json-ext-0.5.3.tgz#90420f9f9c6d3987f176a19a7d8e764271a2f55d" - integrity sha512-Fxt+AfXgjMoin2maPIYzFZnQjAXjAL0PHscM5pRTtatFqB+vZxAM9tLp2Optnuw3QOQC40jTNeGYFOMvyf7v9g== - -"@gar/promisify@^1.0.1": - version "1.1.2" - resolved "https://registry.yarnpkg.com/@gar/promisify/-/promisify-1.1.2.tgz#30aa825f11d438671d585bd44e7fd564535fc210" - integrity sha512-82cpyJyKRoQoRi+14ibCeGPu0CwypgtBAdBhq1WfvagpCZNKqwXbKwXllYSMG91DhmG4jt9gN8eP6lGOtozuaw== - -"@istanbuljs/schema@^0.1.2": - version "0.1.3" - resolved "https://registry.yarnpkg.com/@istanbuljs/schema/-/schema-0.1.3.tgz#e45e384e4b8ec16bce2fd903af78450f6bf7ec98" - integrity sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA== - -"@jridgewell/resolve-uri@1.0.0": - version "1.0.0" - resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-1.0.0.tgz#3fdf5798f0b49e90155896f6291df186eac06c83" - integrity sha512-9oLAnygRMi8Q5QkYEU4XWK04B+nuoXoxjRvRxgjuChkLZFBja0YPSgdZ7dZtwhncLBcQe/I/E+fLuk5qxcYVJA== - -"@jsdevtools/coverage-istanbul-loader@3.0.5": - version "3.0.5" - resolved "https://registry.yarnpkg.com/@jsdevtools/coverage-istanbul-loader/-/coverage-istanbul-loader-3.0.5.tgz#2a4bc65d0271df8d4435982db4af35d81754ee26" - integrity sha512-EUCPEkaRPvmHjWAAZkWMT7JDzpw7FKB00WTISaiXsbNOd5hCHg77XLA8sLYLFDo1zepYLo2w7GstN8YBqRXZfA== - dependencies: - convert-source-map "^1.7.0" - istanbul-lib-instrument "^4.0.3" - loader-utils "^2.0.0" - merge-source-map "^1.1.0" - schema-utils "^2.7.0" - -"@ng-bootstrap/ng-bootstrap@^10.0.0": - version "10.0.0" - resolved "https://registry.yarnpkg.com/@ng-bootstrap/ng-bootstrap/-/ng-bootstrap-10.0.0.tgz#6022927bac7029bdd12d7f1e10b5b20074db06dc" - integrity sha512-Sz+QaxjuyJYJ+zyUbf0TevgcgVesCPQiiFiggEzxKjzY5R+Hvq3YgryLdXf2r/ryePL+C3FXCcmmKpTM5bfczQ== - dependencies: - tslib "^2.1.0" - -"@ngtools/webpack@12.2.3": - version "12.2.3" - resolved "https://registry.yarnpkg.com/@ngtools/webpack/-/webpack-12.2.3.tgz#5dd8095c3e517c8b3d1fcc5c132dcc93767fcd8e" - integrity sha512-Mx8QYCuOlgL0HdX0GDw5I3PLyW/TPJPSrk8VZLW2H5NR1wTHEw6PmqauAnuAMr7npAtOhV4tN9YyeTi8gy6+7A== - -"@ngx-translate/core@13.0.0": - version "13.0.0" - resolved "https://registry.yarnpkg.com/@ngx-translate/core/-/core-13.0.0.tgz#60547cb8a0845a2a0abfde6b0bf5ec6516a63fd6" - integrity sha512-+tzEp8wlqEnw0Gc7jtVRAJ6RteUjXw6JJR4O65KlnxOmJrCGPI0xjV/lKRnQeU0w4i96PQs/jtpL921Wrb7PWg== - dependencies: - tslib "^2.0.0" - -"@ngx-translate/http-loader@6.0.0": - version "6.0.0" - resolved "https://registry.yarnpkg.com/@ngx-translate/http-loader/-/http-loader-6.0.0.tgz#041393ab5753f50ecf64262d624703046b8c7570" - integrity sha512-LCekn6qCbeXWlhESCxU1rAbZz33WzDG0lI7Ig0pYC1o5YxJWrkU9y3Y4tNi+jakQ7R6YhTR2D3ox6APxDtA0wA== - dependencies: - tslib "^2.0.0" - -"@nodelib/fs.scandir@2.1.5": - version "2.1.5" - resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz#7619c2eb21b25483f6d167548b4cfd5a7488c3d5" - integrity sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g== - dependencies: - "@nodelib/fs.stat" "2.0.5" - run-parallel "^1.1.9" - -"@nodelib/fs.stat@2.0.5", "@nodelib/fs.stat@^2.0.2": - version "2.0.5" - resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz#5bd262af94e9d25bd1e71b05deed44876a222e8b" - integrity sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A== - -"@nodelib/fs.walk@^1.2.3": - version "1.2.8" - resolved "https://registry.yarnpkg.com/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz#e95737e8bb6746ddedf69c556953494f196fe69a" - integrity sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg== - dependencies: - "@nodelib/fs.scandir" "2.1.5" - fastq "^1.6.0" - -"@npmcli/fs@^1.0.0": - version "1.0.0" - resolved "https://registry.yarnpkg.com/@npmcli/fs/-/fs-1.0.0.tgz#589612cfad3a6ea0feafcb901d29c63fd52db09f" - integrity sha512-8ltnOpRR/oJbOp8vaGUnipOi3bqkcW+sLHFlyXIr08OGHmVJLB1Hn7QtGXbYcpVtH1gAYZTlmDXtE4YV0+AMMQ== - dependencies: - "@gar/promisify" "^1.0.1" - semver "^7.3.5" - -"@npmcli/git@^2.1.0": - version "2.1.0" - resolved "https://registry.yarnpkg.com/@npmcli/git/-/git-2.1.0.tgz#2fbd77e147530247d37f325930d457b3ebe894f6" - integrity sha512-/hBFX/QG1b+N7PZBFs0bi+evgRZcK9nWBxQKZkGoXUT5hJSwl5c4d7y8/hm+NQZRPhQ67RzFaj5UM9YeyKoryw== - dependencies: - "@npmcli/promise-spawn" "^1.3.2" - lru-cache "^6.0.0" - mkdirp "^1.0.4" - npm-pick-manifest "^6.1.1" - promise-inflight "^1.0.1" - promise-retry "^2.0.1" - semver "^7.3.5" - which "^2.0.2" - -"@npmcli/installed-package-contents@^1.0.6": - version "1.0.7" - resolved "https://registry.yarnpkg.com/@npmcli/installed-package-contents/-/installed-package-contents-1.0.7.tgz#ab7408c6147911b970a8abe261ce512232a3f4fa" - integrity sha512-9rufe0wnJusCQoLpV9ZPKIVP55itrM5BxOXs10DmdbRfgWtHy1LDyskbwRnBghuB0PrF7pNPOqREVtpz4HqzKw== - dependencies: - npm-bundled "^1.1.1" - npm-normalize-package-bin "^1.0.1" - -"@npmcli/move-file@^1.0.1": - version "1.1.2" - resolved "https://registry.yarnpkg.com/@npmcli/move-file/-/move-file-1.1.2.tgz#1a82c3e372f7cae9253eb66d72543d6b8685c674" - integrity sha512-1SUf/Cg2GzGDyaf15aR9St9TWlb+XvbZXWpDx8YKs7MLzMH/BCeopv+y9vzrzgkfykCGuWOlSu3mZhj2+FQcrg== - dependencies: - mkdirp "^1.0.4" - rimraf "^3.0.2" - -"@npmcli/node-gyp@^1.0.2": - version "1.0.2" - resolved "https://registry.yarnpkg.com/@npmcli/node-gyp/-/node-gyp-1.0.2.tgz#3cdc1f30e9736dbc417373ed803b42b1a0a29ede" - integrity sha512-yrJUe6reVMpktcvagumoqD9r08fH1iRo01gn1u0zoCApa9lnZGEigVKUd2hzsCId4gdtkZZIVscLhNxMECKgRg== - -"@npmcli/promise-spawn@^1.2.0", "@npmcli/promise-spawn@^1.3.2": - version "1.3.2" - resolved "https://registry.yarnpkg.com/@npmcli/promise-spawn/-/promise-spawn-1.3.2.tgz#42d4e56a8e9274fba180dabc0aea6e38f29274f5" - integrity sha512-QyAGYo/Fbj4MXeGdJcFzZ+FkDkomfRBrPM+9QYJSg+PxgAUL+LU3FneQk37rKR2/zjqkCV1BLHccX98wRXG3Sg== - dependencies: - infer-owner "^1.0.4" - -"@npmcli/run-script@^1.8.2": - version "1.8.6" - resolved "https://registry.yarnpkg.com/@npmcli/run-script/-/run-script-1.8.6.tgz#18314802a6660b0d4baa4c3afe7f1ad39d8c28b7" - integrity sha512-e42bVZnC6VluBZBAFEr3YrdqSspG3bgilyg4nSLBJ7TRGNCzxHa92XAHxQBLYg0BmgwO4b2mf3h/l5EkEWRn3g== - dependencies: - "@npmcli/node-gyp" "^1.0.2" - "@npmcli/promise-spawn" "^1.3.2" - node-gyp "^7.1.0" - read-package-json-fast "^2.0.1" - -"@schematics/angular@12.2.3", "@schematics/angular@^12.0.0": - version "12.2.3" - resolved "https://registry.yarnpkg.com/@schematics/angular/-/angular-12.2.3.tgz#e0e21fdc0e8aff6c5d6ad9f1f4712ed46585baec" - integrity sha512-MyInM0/Dg1geP5eYx370IX6l70ZTtGq7QIt9CFBViHlX4BWNmXq5bbJIPYJ/FWwT+zhSK7zp5AcyDKg6PWqh/Q== - dependencies: - "@angular-devkit/core" "12.2.3" - "@angular-devkit/schematics" "12.2.3" - jsonc-parser "3.0.0" - -"@tootallnate/once@1": - version "1.1.2" - resolved "https://registry.yarnpkg.com/@tootallnate/once/-/once-1.1.2.tgz#ccb91445360179a04e7fe6aff78c00ffc1eeaf82" - integrity sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw== - -"@trysound/sax@0.1.1": - version "0.1.1" - resolved "https://registry.yarnpkg.com/@trysound/sax/-/sax-0.1.1.tgz#3348564048e7a2d7398c935d466c0414ebb6a669" - integrity sha512-Z6DoceYb/1xSg5+e+ZlPZ9v0N16ZvZ+wYMraFue4HYrE4ttONKtsvruIRf6t9TBR0YvSOfi1hUU0fJfBLCDYow== - -"@tsconfig/node10@^1.0.7": - version "1.0.8" - resolved "https://registry.yarnpkg.com/@tsconfig/node10/-/node10-1.0.8.tgz#c1e4e80d6f964fbecb3359c43bd48b40f7cadad9" - integrity sha512-6XFfSQmMgq0CFLY1MslA/CPUfhIL919M1rMsa5lP2P097N2Wd1sSX0tx1u4olM16fLNhtHZpRhedZJphNJqmZg== - -"@tsconfig/node12@^1.0.7": - version "1.0.9" - resolved "https://registry.yarnpkg.com/@tsconfig/node12/-/node12-1.0.9.tgz#62c1f6dee2ebd9aead80dc3afa56810e58e1a04c" - integrity sha512-/yBMcem+fbvhSREH+s14YJi18sp7J9jpuhYByADT2rypfajMZZN4WQ6zBGgBKp53NKmqI36wFYDb3yaMPurITw== - -"@tsconfig/node14@^1.0.0": - version "1.0.1" - resolved "https://registry.yarnpkg.com/@tsconfig/node14/-/node14-1.0.1.tgz#95f2d167ffb9b8d2068b0b235302fafd4df711f2" - integrity sha512-509r2+yARFfHHE7T6Puu2jjkoycftovhXRqW328PDXTVGKihlb1P8Z9mMZH04ebyajfRY7dedfGynlrFHJUQCg== - -"@tsconfig/node16@^1.0.2": - version "1.0.2" - resolved "https://registry.yarnpkg.com/@tsconfig/node16/-/node16-1.0.2.tgz#423c77877d0569db20e1fc80885ac4118314010e" - integrity sha512-eZxlbI8GZscaGS7kkc/trHTT5xgrjH3/1n2JDwusC9iahPKWMRvRjJSAN5mCXviuTGQ/lHnhvv8Q1YTpnfz9gA== - -"@types/component-emitter@^1.2.10": - version "1.2.10" - resolved "https://registry.yarnpkg.com/@types/component-emitter/-/component-emitter-1.2.10.tgz#ef5b1589b9f16544642e473db5ea5639107ef3ea" - integrity sha512-bsjleuRKWmGqajMerkzox19aGbscQX5rmmvvXl3wlIp5gMG1HgkiwPxsN5p070fBDKTNSPgojVbuY1+HWMbFhg== - -"@types/cookie@^0.4.0": - version "0.4.1" - resolved "https://registry.yarnpkg.com/@types/cookie/-/cookie-0.4.1.tgz#bfd02c1f2224567676c1545199f87c3a861d878d" - integrity sha512-XW/Aa8APYr6jSVVA1y/DEIZX0/GMKLEVekNG727R8cs56ahETkRAy/3DR7+fJyh7oUgGwNQaRfXCun0+KbWY7Q== - -"@types/cors@^2.8.8": - version "2.8.12" - resolved "https://registry.yarnpkg.com/@types/cors/-/cors-2.8.12.tgz#6b2c510a7ad7039e98e7b8d3d6598f4359e5c080" - integrity sha512-vt+kDhq/M2ayberEtJcIN/hxXy1Pk+59g2FV/ZQceeaTyCtCucjL2Q7FXlFjtWn4n15KCr1NE2lNNFhp0lEThw== - -"@types/eslint-scope@^3.7.0": - version "3.7.1" - resolved "https://registry.yarnpkg.com/@types/eslint-scope/-/eslint-scope-3.7.1.tgz#8dc390a7b4f9dd9f1284629efce982e41612116e" - integrity sha512-SCFeogqiptms4Fg29WpOTk5nHIzfpKCemSN63ksBQYKTcXoJEmJagV+DhVmbapZzY4/5YaOV1nZwrsU79fFm1g== - dependencies: - "@types/eslint" "*" - "@types/estree" "*" - -"@types/eslint@*": - version "7.28.0" - resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-7.28.0.tgz#7e41f2481d301c68e14f483fe10b017753ce8d5a" - integrity sha512-07XlgzX0YJUn4iG1ocY4IX9DzKSmMGUs6ESKlxWhZRaa0fatIWaHWUVapcuGa8r5HFnTqzj+4OCjd5f7EZ/i/A== - dependencies: - "@types/estree" "*" - "@types/json-schema" "*" - -"@types/estree@*", "@types/estree@^0.0.50": - version "0.0.50" - resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.50.tgz#1e0caa9364d3fccd2931c3ed96fdbeaa5d4cca83" - integrity sha512-C6N5s2ZFtuZRj54k2/zyRhNDjJwwcViAM3Nbm8zjBpbqAdZ00mr0CFxvSKeO8Y/e03WVFLpQMdHYVfUd6SB+Hw== - -"@types/glob@^7.1.1": - version "7.1.4" - resolved "https://registry.yarnpkg.com/@types/glob/-/glob-7.1.4.tgz#ea59e21d2ee5c517914cb4bc8e4153b99e566672" - integrity sha512-w+LsMxKyYQm347Otw+IfBXOv9UWVjpHpCDdbBMt8Kz/xbvCYNjP+0qPh91Km3iKfSRLBB0P7fAMf0KHrPu+MyA== - dependencies: - "@types/minimatch" "*" - "@types/node" "*" - -"@types/jasmine@~3.8.0": - version "3.8.2" - resolved "https://registry.yarnpkg.com/@types/jasmine/-/jasmine-3.8.2.tgz#27ab0aaac29581bcbde5774e1843f90df977078e" - integrity sha512-u5h7dqzy2XpXTzhOzSNQUQpKGFvROF8ElNX9P/TJvsHnTg/JvsAseVsGWQAQQldqanYaM+5kwxW909BBFAUYsg== - -"@types/json-schema@*", "@types/json-schema@^7.0.5", "@types/json-schema@^7.0.8": - version "7.0.9" - resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.9.tgz#97edc9037ea0c38585320b28964dde3b39e4660d" - integrity sha512-qcUXuemtEu+E5wZSJHNxUXeCZhAfXKQ41D+duX+VYPde7xyEVZci+/oXKJL13tnRs9lR2pr4fod59GT6/X1/yQ== - -"@types/json5@^0.0.29": - version "0.0.29" - resolved "https://registry.yarnpkg.com/@types/json5/-/json5-0.0.29.tgz#ee28707ae94e11d2b827bcbe5270bcea7f3e71ee" - integrity sha1-7ihweulOEdK4J7y+UnC86n8+ce4= - -"@types/minimatch@*": - version "3.0.5" - resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.5.tgz#1001cc5e6a3704b83c236027e77f2f58ea010f40" - integrity sha512-Klz949h02Gz2uZCMGwDUSDS1YBlTdDDgbWHi+81l29tQALUtvz4rAYi5uoVhE5Lagoq6DeqAUlbrHvW/mXDgdQ== - -"@types/node@*", "@types/node@>=10.0.0": - version "16.7.8" - resolved "https://registry.yarnpkg.com/@types/node/-/node-16.7.8.tgz#2448be5f24fe6b77114632b6350fcd219334651e" - integrity sha512-8upnoQU0OPzbIkm+ZMM0zCeFCkw2s3mS0IWdx0+AAaWqm4fkBb0UJp8Edl7FVKRamYbpJC/aVsHpKWBIbiC7Zg== - -"@types/node@^12.11.1": - version "12.20.21" - resolved "https://registry.yarnpkg.com/@types/node/-/node-12.20.21.tgz#575e91f59c2e79318c2d39a48286c6954e484fd5" - integrity sha512-Qk7rOvV2A4vNgXNS88vEvbJE1NDFPCQ8AU+pNElrU2bA4yrRDef3fg3SUe+xkwyin3Bpg/Xh5JkNWTlsOcS2tA== - -"@types/node@^14.14.31": - version "14.17.12" - resolved "https://registry.yarnpkg.com/@types/node/-/node-14.17.12.tgz#7a31f720b85a617e54e42d24c4ace136601656c7" - integrity sha512-vhUqgjJR1qxwTWV5Ps5txuy2XMdf7Fw+OrdChRboy8BmWUPkckOhphaohzFG6b8DW7CrxaBMdrdJ47SYFq1okw== - -"@types/parse-json@^4.0.0": - version "4.0.0" - resolved "https://registry.yarnpkg.com/@types/parse-json/-/parse-json-4.0.0.tgz#2f8bb441434d163b35fb8ffdccd7138927ffb8c0" - integrity sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA== - -"@types/sinonjs__fake-timers@^6.0.2": - version "6.0.3" - resolved "https://registry.yarnpkg.com/@types/sinonjs__fake-timers/-/sinonjs__fake-timers-6.0.3.tgz#79df6f358ae8f79e628fe35a63608a0ea8e7cf08" - integrity sha512-E1dU4fzC9wN2QK2Cr1MLCfyHM8BoNnRFvuf45LYMPNDA+WqbNzC45S4UzPxvp1fFJ1rvSGU0bPvdd35VLmXG8g== - -"@types/sizzle@^2.3.2": - version "2.3.3" - resolved "https://registry.yarnpkg.com/@types/sizzle/-/sizzle-2.3.3.tgz#ff5e2f1902969d305225a047c8a0fd5c915cebef" - integrity sha512-JYM8x9EGF163bEyhdJBpR2QX1R5naCJHC8ucJylJ3w9/CVBaskdQ8WqBf8MmQrd1kRvp/a4TS8HJ+bxzR7ZJYQ== - -"@types/source-list-map@*": - version "0.1.2" - resolved "https://registry.yarnpkg.com/@types/source-list-map/-/source-list-map-0.1.2.tgz#0078836063ffaf17412349bba364087e0ac02ec9" - integrity sha512-K5K+yml8LTo9bWJI/rECfIPrGgxdpeNbj+d53lwN4QjW1MCwlkhUms+gtdzigTeUyBr09+u8BwOIY3MXvHdcsA== - -"@types/webpack-sources@^0.1.5": - version "0.1.9" - resolved "https://registry.yarnpkg.com/@types/webpack-sources/-/webpack-sources-0.1.9.tgz#da69b06eb34f6432e6658acb5a6893c55d983920" - integrity sha512-bvzMnzqoK16PQIC8AYHNdW45eREJQMd6WG/msQWX5V2+vZmODCOPb4TJcbgRljTZZTwTM4wUMcsI8FftNA7new== - dependencies: - "@types/node" "*" - "@types/source-list-map" "*" - source-map "^0.6.1" - -"@types/yauzl@^2.9.1": - version "2.9.2" - resolved "https://registry.yarnpkg.com/@types/yauzl/-/yauzl-2.9.2.tgz#c48e5d56aff1444409e39fa164b0b4d4552a7b7a" - integrity sha512-8uALY5LTvSuHgloDVUvWP3pIauILm+8/0pDMokuDYIoNsOkSwd5AiHBTSEJjKTDcZr5z8UpgOWZkxBF4iJftoA== - dependencies: - "@types/node" "*" - -"@webassemblyjs/ast@1.11.1": - version "1.11.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.11.1.tgz#2bfd767eae1a6996f432ff7e8d7fc75679c0b6a7" - integrity sha512-ukBh14qFLjxTQNTXocdyksN5QdM28S1CxHt2rdskFyL+xFV7VremuBLVbmCePj+URalXBENx/9Lm7lnhihtCSw== - dependencies: - "@webassemblyjs/helper-numbers" "1.11.1" - "@webassemblyjs/helper-wasm-bytecode" "1.11.1" - -"@webassemblyjs/floating-point-hex-parser@1.11.1": - version "1.11.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.1.tgz#f6c61a705f0fd7a6aecaa4e8198f23d9dc179e4f" - integrity sha512-iGRfyc5Bq+NnNuX8b5hwBrRjzf0ocrJPI6GWFodBFzmFnyvrQ83SHKhmilCU/8Jv67i4GJZBMhEzltxzcNagtQ== - -"@webassemblyjs/helper-api-error@1.11.1": - version "1.11.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.1.tgz#1a63192d8788e5c012800ba6a7a46c705288fd16" - integrity sha512-RlhS8CBCXfRUR/cwo2ho9bkheSXG0+NwooXcc3PAILALf2QLdFyj7KGsKRbVc95hZnhnERon4kW/D3SZpp6Tcg== - -"@webassemblyjs/helper-buffer@1.11.1": - version "1.11.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.1.tgz#832a900eb444884cde9a7cad467f81500f5e5ab5" - integrity sha512-gwikF65aDNeeXa8JxXa2BAk+REjSyhrNC9ZwdT0f8jc4dQQeDQ7G4m0f2QCLPJiMTTO6wfDmRmj/pW0PsUvIcA== - -"@webassemblyjs/helper-numbers@1.11.1": - version "1.11.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.1.tgz#64d81da219fbbba1e3bd1bfc74f6e8c4e10a62ae" - integrity sha512-vDkbxiB8zfnPdNK9Rajcey5C0w+QJugEglN0of+kmO8l7lDb77AnlKYQF7aarZuCrv+l0UvqL+68gSDr3k9LPQ== - dependencies: - "@webassemblyjs/floating-point-hex-parser" "1.11.1" - "@webassemblyjs/helper-api-error" "1.11.1" - "@xtuc/long" "4.2.2" - -"@webassemblyjs/helper-wasm-bytecode@1.11.1": - version "1.11.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.1.tgz#f328241e41e7b199d0b20c18e88429c4433295e1" - integrity sha512-PvpoOGiJwXeTrSf/qfudJhwlvDQxFgelbMqtq52WWiXC6Xgg1IREdngmPN3bs4RoO83PnL/nFrxucXj1+BX62Q== - -"@webassemblyjs/helper-wasm-section@1.11.1": - version "1.11.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.1.tgz#21ee065a7b635f319e738f0dd73bfbda281c097a" - integrity sha512-10P9No29rYX1j7F3EVPX3JvGPQPae+AomuSTPiF9eBQeChHI6iqjMIwR9JmOJXwpnn/oVGDk7I5IlskuMwU/pg== - dependencies: - "@webassemblyjs/ast" "1.11.1" - "@webassemblyjs/helper-buffer" "1.11.1" - "@webassemblyjs/helper-wasm-bytecode" "1.11.1" - "@webassemblyjs/wasm-gen" "1.11.1" - -"@webassemblyjs/ieee754@1.11.1": - version "1.11.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.11.1.tgz#963929e9bbd05709e7e12243a099180812992614" - integrity sha512-hJ87QIPtAMKbFq6CGTkZYJivEwZDbQUgYd3qKSadTNOhVY7p+gfP6Sr0lLRVTaG1JjFj+r3YchoqRYxNH3M0GQ== - dependencies: - "@xtuc/ieee754" "^1.2.0" - -"@webassemblyjs/leb128@1.11.1": - version "1.11.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.11.1.tgz#ce814b45574e93d76bae1fb2644ab9cdd9527aa5" - integrity sha512-BJ2P0hNZ0u+Th1YZXJpzW6miwqQUGcIHT1G/sf72gLVD9DZ5AdYTqPNbHZh6K1M5VmKvFXwGSWZADz+qBWxeRw== - dependencies: - "@xtuc/long" "4.2.2" - -"@webassemblyjs/utf8@1.11.1": - version "1.11.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.11.1.tgz#d1f8b764369e7c6e6bae350e854dec9a59f0a3ff" - integrity sha512-9kqcxAEdMhiwQkHpkNiorZzqpGrodQQ2IGrHHxCy+Ozng0ofyMA0lTqiLkVs1uzTRejX+/O0EOT7KxqVPuXosQ== - -"@webassemblyjs/wasm-edit@1.11.1": - version "1.11.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.1.tgz#ad206ebf4bf95a058ce9880a8c092c5dec8193d6" - integrity sha512-g+RsupUC1aTHfR8CDgnsVRVZFJqdkFHpsHMfJuWQzWU3tvnLC07UqHICfP+4XyL2tnr1amvl1Sdp06TnYCmVkA== - dependencies: - "@webassemblyjs/ast" "1.11.1" - "@webassemblyjs/helper-buffer" "1.11.1" - "@webassemblyjs/helper-wasm-bytecode" "1.11.1" - "@webassemblyjs/helper-wasm-section" "1.11.1" - "@webassemblyjs/wasm-gen" "1.11.1" - "@webassemblyjs/wasm-opt" "1.11.1" - "@webassemblyjs/wasm-parser" "1.11.1" - "@webassemblyjs/wast-printer" "1.11.1" - -"@webassemblyjs/wasm-gen@1.11.1": - version "1.11.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.1.tgz#86c5ea304849759b7d88c47a32f4f039ae3c8f76" - integrity sha512-F7QqKXwwNlMmsulj6+O7r4mmtAlCWfO/0HdgOxSklZfQcDu0TpLiD1mRt/zF25Bk59FIjEuGAIyn5ei4yMfLhA== - dependencies: - "@webassemblyjs/ast" "1.11.1" - "@webassemblyjs/helper-wasm-bytecode" "1.11.1" - "@webassemblyjs/ieee754" "1.11.1" - "@webassemblyjs/leb128" "1.11.1" - "@webassemblyjs/utf8" "1.11.1" - -"@webassemblyjs/wasm-opt@1.11.1": - version "1.11.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.1.tgz#657b4c2202f4cf3b345f8a4c6461c8c2418985f2" - integrity sha512-VqnkNqnZlU5EB64pp1l7hdm3hmQw7Vgqa0KF/KCNO9sIpI6Fk6brDEiX+iCOYrvMuBWDws0NkTOxYEb85XQHHw== - dependencies: - "@webassemblyjs/ast" "1.11.1" - "@webassemblyjs/helper-buffer" "1.11.1" - "@webassemblyjs/wasm-gen" "1.11.1" - "@webassemblyjs/wasm-parser" "1.11.1" - -"@webassemblyjs/wasm-parser@1.11.1": - version "1.11.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.1.tgz#86ca734534f417e9bd3c67c7a1c75d8be41fb199" - integrity sha512-rrBujw+dJu32gYB7/Lup6UhdkPx9S9SnobZzRVL7VcBH9Bt9bCBLEuX/YXOOtBsOZ4NQrRykKhffRWHvigQvOA== - dependencies: - "@webassemblyjs/ast" "1.11.1" - "@webassemblyjs/helper-api-error" "1.11.1" - "@webassemblyjs/helper-wasm-bytecode" "1.11.1" - "@webassemblyjs/ieee754" "1.11.1" - "@webassemblyjs/leb128" "1.11.1" - "@webassemblyjs/utf8" "1.11.1" - -"@webassemblyjs/wast-printer@1.11.1": - version "1.11.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.11.1.tgz#d0c73beda8eec5426f10ae8ef55cee5e7084c2f0" - integrity sha512-IQboUWM4eKzWW+N/jij2sRatKMh99QEelo3Eb2q0qXkvPRISAj8Qxtmw5itwqK+TTkBuUIE45AxYPToqPtL5gg== - dependencies: - "@webassemblyjs/ast" "1.11.1" - "@xtuc/long" "4.2.2" - -"@xtuc/ieee754@^1.2.0": - version "1.2.0" - resolved "https://registry.yarnpkg.com/@xtuc/ieee754/-/ieee754-1.2.0.tgz#eef014a3145ae477a1cbc00cd1e552336dceb790" - integrity sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA== - -"@xtuc/long@4.2.2": - version "4.2.2" - resolved "https://registry.yarnpkg.com/@xtuc/long/-/long-4.2.2.tgz#d291c6a4e97989b5c61d9acf396ae4fe133a718d" - integrity sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ== - -"@yarnpkg/lockfile@1.1.0": - version "1.1.0" - resolved "https://registry.yarnpkg.com/@yarnpkg/lockfile/-/lockfile-1.1.0.tgz#e77a97fbd345b76d83245edcd17d393b1b41fb31" - integrity sha512-GpSwvyXOcOOlV70vbnzjj4fW5xW/FdUF6nQEt1ENy7m4ZCczi1+/buVUPAqmGfqznsORNFzUMjctTIp8a9tuCQ== - -abab@^2.0.5: - version "2.0.5" - resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.5.tgz#c0b678fb32d60fc1219c784d6a826fe385aeb79a" - integrity sha512-9IK9EadsbHo6jLWIpxpR6pL0sazTXV6+SQv25ZB+F7Bj9mJNaOc4nCRabwd5M/JwmUa8idz6Eci6eKfJryPs6Q== - -abbrev@1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8" - integrity sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q== - -accepts@~1.3.4, accepts@~1.3.5, accepts@~1.3.7: - version "1.3.7" - resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.7.tgz#531bc726517a3b2b41f850021c6cc15eaab507cd" - integrity sha512-Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA== - dependencies: - mime-types "~2.1.24" - negotiator "0.6.2" - -acorn-import-assertions@^1.7.6: - version "1.7.6" - resolved "https://registry.yarnpkg.com/acorn-import-assertions/-/acorn-import-assertions-1.7.6.tgz#580e3ffcae6770eebeec76c3b9723201e9d01f78" - integrity sha512-FlVvVFA1TX6l3lp8VjDnYYq7R1nyW6x3svAt4nDgrWQ9SBaSh9CnbwgSUTasgfNfOG5HlM1ehugCvM+hjo56LA== - -acorn-walk@^8.1.1: - version "8.1.1" - resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-8.1.1.tgz#3ddab7f84e4a7e2313f6c414c5b7dac85f4e3ebc" - integrity sha512-FbJdceMlPHEAWJOILDk1fXD8lnTlEIWFkqtfk+MvmL5q/qlHfN7GEHcsFZWt/Tea9jRNPWUZG4G976nqAAmU9w== - -acorn@^8.4.1: - version "8.4.1" - resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.4.1.tgz#56c36251fc7cabc7096adc18f05afe814321a28c" - integrity sha512-asabaBSkEKosYKMITunzX177CXxQ4Q8BSSzMTKD+FefUhipQC70gfW5SiUDhYQ3vk8G+81HqQk7Fv9OXwwn9KA== - -adjust-sourcemap-loader@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/adjust-sourcemap-loader/-/adjust-sourcemap-loader-4.0.0.tgz#fc4a0fd080f7d10471f30a7320f25560ade28c99" - integrity sha512-OXwN5b9pCUXNQHJpwwD2qP40byEmSgzj8B4ydSN0uMNYWiFmJ6x6KwUllMmfk8Rwu/HJDFR7U8ubsWBoN0Xp0A== - dependencies: - loader-utils "^2.0.0" - regex-parser "^2.2.11" - -agent-base@6, agent-base@^6.0.2: - version "6.0.2" - resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-6.0.2.tgz#49fff58577cfee3f37176feab4c22e00f86d7f77" - integrity sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ== - dependencies: - debug "4" - -agentkeepalive@^4.1.3: - version "4.1.4" - resolved "https://registry.yarnpkg.com/agentkeepalive/-/agentkeepalive-4.1.4.tgz#d928028a4862cb11718e55227872e842a44c945b" - integrity sha512-+V/rGa3EuU74H6wR04plBb7Ks10FbtUQgRj/FQOG7uUIEuaINI+AiqJR1k6t3SVNs7o7ZjIdus6706qqzVq8jQ== - dependencies: - debug "^4.1.0" - depd "^1.1.2" - humanize-ms "^1.2.1" - -aggregate-error@^3.0.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/aggregate-error/-/aggregate-error-3.1.0.tgz#92670ff50f5359bdb7a3e0d40d0ec30c5737687a" - integrity sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA== - dependencies: - clean-stack "^2.0.0" - indent-string "^4.0.0" - -ajv-errors@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/ajv-errors/-/ajv-errors-1.0.1.tgz#f35986aceb91afadec4102fbd85014950cefa64d" - integrity sha512-DCRfO/4nQ+89p/RK43i8Ezd41EqdGIU4ld7nGF8OQ14oc/we5rEntLCUa7+jrn3nn83BosfwZA0wb4pon2o8iQ== - -ajv-formats@2.0.2: - version "2.0.2" - resolved "https://registry.yarnpkg.com/ajv-formats/-/ajv-formats-2.0.2.tgz#69875cb99d76c74be46e9c7a4444bc232354eba0" - integrity sha512-Brah4Uo5/U8v76c6euTwtjVFFaVishwnJrQBYpev1JRh4vjA1F4HY3UzQez41YUCszUCXKagG8v6eVRBHV1gkw== - dependencies: - ajv "^8.0.0" - -ajv-formats@2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/ajv-formats/-/ajv-formats-2.1.0.tgz#96eaf83e38d32108b66d82a9cb0cfa24886cdfeb" - integrity sha512-USH2jBb+C/hIpwD2iRjp0pe0k+MvzG0mlSn/FIdCgQhUb9ALPRjt2KIQdfZDS9r0ZIeUAg7gOu9KL0PFqGqr5Q== - dependencies: - ajv "^8.0.0" - -ajv-keywords@^3.1.0, ajv-keywords@^3.5.2: - version "3.5.2" - resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.5.2.tgz#31f29da5ab6e00d1c2d329acf7b5929614d5014d" - integrity sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ== - -ajv@8.2.0: - version "8.2.0" - resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.2.0.tgz#c89d3380a784ce81b2085f48811c4c101df4c602" - integrity sha512-WSNGFuyWd//XO8n/m/EaOlNLtO0yL8EXT/74LqT4khdhpZjP7lkj/kT5uwRmGitKEVp/Oj7ZUHeGfPtgHhQ5CA== - dependencies: - fast-deep-equal "^3.1.1" - json-schema-traverse "^1.0.0" - require-from-string "^2.0.2" - uri-js "^4.2.2" - -ajv@8.6.2, ajv@^8.0.0: - version "8.6.2" - resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.6.2.tgz#2fb45e0e5fcbc0813326c1c3da535d1881bb0571" - integrity sha512-9807RlWAgT564wT+DjeyU5OFMPjmzxVobvDFmNAhY+5zD6A2ly3jDp6sgnfyDtlIQ+7H97oc/DGCzzfu9rjw9w== - dependencies: - fast-deep-equal "^3.1.1" - json-schema-traverse "^1.0.0" - require-from-string "^2.0.2" - uri-js "^4.2.2" - -ajv@^6.1.0, ajv@^6.12.3, ajv@^6.12.4, ajv@^6.12.5: - version "6.12.6" - resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4" - integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g== - dependencies: - fast-deep-equal "^3.1.1" - fast-json-stable-stringify "^2.0.0" - json-schema-traverse "^0.4.1" - uri-js "^4.2.2" - -alphanum-sort@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/alphanum-sort/-/alphanum-sort-1.0.2.tgz#97a1119649b211ad33691d9f9f486a8ec9fbe0a3" - integrity sha1-l6ERlkmyEa0zaR2fn0hqjsn74KM= - -angularx-qrcode@^11.0.0: - version "11.0.0" - resolved "https://registry.yarnpkg.com/angularx-qrcode/-/angularx-qrcode-11.0.0.tgz#03f1ccdd34c99fa1fa9f5666febb0b903e3c6881" - integrity sha512-qg6g288LO9daqBP5GCHewy9W0IMW7jDMEaAiklA1za0UhjCj6VH1Agydr4JVp7RMkw1LsLapFhWsVSYqrWaERA== - dependencies: - qrcode "1.4.2" - tslib "^2.0.0" - -ansi-colors@4.1.1, ansi-colors@^4.1.1: - version "4.1.1" - resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-4.1.1.tgz#cbb9ae256bf750af1eab344f229aa27fe94ba348" - integrity sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA== - -ansi-colors@^3.0.0: - version "3.2.4" - resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-3.2.4.tgz#e3a3da4bfbae6c86a9c285625de124a234026fbf" - integrity sha512-hHUXGagefjN2iRrID63xckIvotOXOojhQKWIPUZ4mNUZ9nLZW+7FMNoE1lOkEhNWYsx/7ysGIuJYCiMAA9FnrA== - -ansi-escapes@^4.2.1, ansi-escapes@^4.3.0: - version "4.3.2" - resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-4.3.2.tgz#6b2291d1db7d98b6521d5f1efa42d0f3a9feb65e" - integrity sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ== - dependencies: - type-fest "^0.21.3" - -ansi-html@0.0.7: - version "0.0.7" - resolved "https://registry.yarnpkg.com/ansi-html/-/ansi-html-0.0.7.tgz#813584021962a9e9e6fd039f940d12f56ca7859e" - integrity sha1-gTWEAhliqenm/QOflA0S9WynhZ4= - -ansi-regex@^2.0.0: - version "2.1.1" - resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df" - integrity sha1-w7M6te42DYbg5ijwRorn7yfWVN8= - -ansi-regex@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998" - integrity sha1-7QMXwyIGT3lGbAKWa922Bas32Zg= - -ansi-regex@^4.1.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.1.0.tgz#8b9f8f08cf1acb843756a839ca8c7e3168c51997" - integrity sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg== - -ansi-regex@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.0.tgz#388539f55179bf39339c81af30a654d69f87cb75" - integrity sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg== - -ansi-styles@^3.2.0, ansi-styles@^3.2.1: - version "3.2.1" - resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d" - integrity sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA== - dependencies: - color-convert "^1.9.0" - -ansi-styles@^4.0.0, ansi-styles@^4.1.0: - version "4.3.0" - resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.3.0.tgz#edd803628ae71c04c85ae7a0906edad34b648937" - integrity sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg== - dependencies: - color-convert "^2.0.1" - -anymatch@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-2.0.0.tgz#bcb24b4f37934d9aa7ac17b4adaf89e7c76ef2eb" - integrity sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw== - dependencies: - micromatch "^3.1.4" - normalize-path "^2.1.1" - -anymatch@~3.1.2: - version "3.1.2" - resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.2.tgz#c0557c096af32f106198f4f4e2a383537e378716" - integrity sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg== - dependencies: - normalize-path "^3.0.0" - picomatch "^2.0.4" - -aproba@^1.0.3: - version "1.2.0" - resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a" - integrity sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw== - -arch@^2.2.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/arch/-/arch-2.2.0.tgz#1bc47818f305764f23ab3306b0bfc086c5a29d11" - integrity sha512-Of/R0wqp83cgHozfIYLbBMnej79U/SVGOOyuB3VVFv1NRM/PSFMK12x9KVtiYzJqmnU5WR2qp0Z5rHb7sWGnFQ== - -are-we-there-yet@~1.1.2: - version "1.1.5" - resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz#4b35c2944f062a8bfcda66410760350fe9ddfc21" - integrity sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w== - dependencies: - delegates "^1.0.0" - readable-stream "^2.0.6" - -arg@^4.1.0: - version "4.1.3" - resolved "https://registry.yarnpkg.com/arg/-/arg-4.1.3.tgz#269fc7ad5b8e42cb63c896d5666017261c144089" - integrity sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA== - -arr-diff@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-4.0.0.tgz#d6461074febfec71e7e15235761a329a5dc7c520" - integrity sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA= - -arr-flatten@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/arr-flatten/-/arr-flatten-1.1.0.tgz#36048bbff4e7b47e136644316c99669ea5ae91f1" - integrity sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg== - -arr-union@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/arr-union/-/arr-union-3.1.0.tgz#e39b09aea9def866a8f206e288af63919bae39c4" - integrity sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ= - -array-flatten@1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-1.1.1.tgz#9a5f699051b1e7073328f2a008968b64ea2955d2" - integrity sha1-ml9pkFGx5wczKPKgCJaLZOopVdI= - -array-flatten@^2.1.0: - version "2.1.2" - resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-2.1.2.tgz#24ef80a28c1a893617e2149b0c6d0d788293b099" - integrity sha512-hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ== - -array-union@^1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/array-union/-/array-union-1.0.2.tgz#9a34410e4f4e3da23dea375be5be70f24778ec39" - integrity sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk= - dependencies: - array-uniq "^1.0.1" - -array-union@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/array-union/-/array-union-2.1.0.tgz#b798420adbeb1de828d84acd8a2e23d3efe85e8d" - integrity sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw== - -array-uniq@^1.0.1: - version "1.0.3" - resolved "https://registry.yarnpkg.com/array-uniq/-/array-uniq-1.0.3.tgz#af6ac877a25cc7f74e058894753858dfdb24fdb6" - integrity sha1-r2rId6Jcx/dOBYiUdThY39sk/bY= - -array-unique@^0.3.2: - version "0.3.2" - resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz#a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428" - integrity sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg= - -asn1@~0.2.3: - version "0.2.4" - resolved "https://registry.yarnpkg.com/asn1/-/asn1-0.2.4.tgz#8d2475dfab553bb33e77b54e59e880bb8ce23136" - integrity sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg== - dependencies: - safer-buffer "~2.1.0" - -assert-plus@1.0.0, assert-plus@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525" - integrity sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU= - -assign-symbols@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/assign-symbols/-/assign-symbols-1.0.0.tgz#59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367" - integrity sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c= - -astral-regex@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/astral-regex/-/astral-regex-2.0.0.tgz#483143c567aeed4785759c0865786dc77d7d2e31" - integrity sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ== - -async-each@^1.0.1: - version "1.0.3" - resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.3.tgz#b727dbf87d7651602f06f4d4ac387f47d91b0cbf" - integrity sha512-z/WhQ5FPySLdvREByI2vZiTWwCnF0moMJ1hK9YQwDTHKh6I7/uSckMetoRGb5UBZPC1z0jlw+n/XCgjeH7y1AQ== - -async-limiter@~1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/async-limiter/-/async-limiter-1.0.1.tgz#dd379e94f0db8310b08291f9d64c3209766617fd" - integrity sha512-csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ== - -async@^2.6.2: - version "2.6.3" - resolved "https://registry.yarnpkg.com/async/-/async-2.6.3.tgz#d72625e2344a3656e3a3ad4fa749fa83299d82ff" - integrity sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg== - dependencies: - lodash "^4.17.14" - -async@^3.2.0: - version "3.2.1" - resolved "https://registry.yarnpkg.com/async/-/async-3.2.1.tgz#d3274ec66d107a47476a4c49136aacdb00665fc8" - integrity sha512-XdD5lRO/87udXCMC9meWdYiR+Nq6ZjUfXidViUZGu2F1MO4T3XwZ1et0hb2++BgLfhyJwy44BGB/yx80ABx8hg== - -asynckit@^0.4.0: - version "0.4.0" - resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79" - integrity sha1-x57Zf380y48robyXkLzDZkdLS3k= - -at-least-node@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/at-least-node/-/at-least-node-1.0.0.tgz#602cd4b46e844ad4effc92a8011a3c46e0238dc2" - integrity sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg== - -atob@^2.1.2: - version "2.1.2" - resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9" - integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg== - -autoprefixer@^9.6.1: - version "9.8.6" - resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.8.6.tgz#3b73594ca1bf9266320c5acf1588d74dea74210f" - integrity sha512-XrvP4VVHdRBCdX1S3WXVD8+RyG9qeb1D5Sn1DeLiG2xfSpzellk5k54xbUERJ3M5DggQxes39UGOTP8CFrEGbg== - dependencies: - browserslist "^4.12.0" - caniuse-lite "^1.0.30001109" - colorette "^1.2.1" - normalize-range "^0.1.2" - num2fraction "^1.2.2" - postcss "^7.0.32" - postcss-value-parser "^4.1.0" - -aws-sign2@~0.7.0: - version "0.7.0" - resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz#b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8" - integrity sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg= - -aws4@^1.8.0: - version "1.11.0" - resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.11.0.tgz#d61f46d83b2519250e2784daf5b09479a8b41c59" - integrity sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA== - -babel-loader@8.2.2: - version "8.2.2" - resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-8.2.2.tgz#9363ce84c10c9a40e6c753748e1441b60c8a0b81" - integrity sha512-JvTd0/D889PQBtUXJ2PXaKU/pjZDMtHA9V2ecm+eNRmmBCMR09a+fmpGTNwnJtFmFl5Ei7Vy47LjBb+L0wQ99g== - dependencies: - find-cache-dir "^3.3.1" - loader-utils "^1.4.0" - make-dir "^3.1.0" - schema-utils "^2.6.5" - -babel-plugin-dynamic-import-node@^2.3.3: - version "2.3.3" - resolved "https://registry.yarnpkg.com/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.3.tgz#84fda19c976ec5c6defef57f9427b3def66e17a3" - integrity sha512-jZVI+s9Zg3IqA/kdi0i6UDCybUI3aSBLnglhYbSSjKlV7yF1F/5LWv8MakQmvYpnbJDS6fcBL2KzHSxNCMtWSQ== - dependencies: - object.assign "^4.1.0" - -babel-plugin-polyfill-corejs2@^0.2.2: - version "0.2.2" - resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.2.2.tgz#e9124785e6fd94f94b618a7954e5693053bf5327" - integrity sha512-kISrENsJ0z5dNPq5eRvcctITNHYXWOA4DUZRFYCz3jYCcvTb/A546LIddmoGNMVYg2U38OyFeNosQwI9ENTqIQ== - dependencies: - "@babel/compat-data" "^7.13.11" - "@babel/helper-define-polyfill-provider" "^0.2.2" - semver "^6.1.1" - -babel-plugin-polyfill-corejs3@^0.2.2: - version "0.2.4" - resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.2.4.tgz#68cb81316b0e8d9d721a92e0009ec6ecd4cd2ca9" - integrity sha512-z3HnJE5TY/j4EFEa/qpQMSbcUJZ5JQi+3UFjXzn6pQCmIKc5Ug5j98SuYyH+m4xQnvKlMDIW4plLfgyVnd0IcQ== - dependencies: - "@babel/helper-define-polyfill-provider" "^0.2.2" - core-js-compat "^3.14.0" - -babel-plugin-polyfill-regenerator@^0.2.2: - version "0.2.2" - resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.2.2.tgz#b310c8d642acada348c1fa3b3e6ce0e851bee077" - integrity sha512-Goy5ghsc21HgPDFtzRkSirpZVW35meGoTmTOb2bxqdl60ghub4xOidgNTHaZfQ2FaxQsKmwvXtOAkcIS4SMBWg== - dependencies: - "@babel/helper-define-polyfill-provider" "^0.2.2" - -balanced-match@^1.0.0: - version "1.0.2" - resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee" - integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw== - -base64-arraybuffer@0.1.4: - version "0.1.4" - resolved "https://registry.yarnpkg.com/base64-arraybuffer/-/base64-arraybuffer-0.1.4.tgz#9818c79e059b1355f97e0428a017c838e90ba812" - integrity sha1-mBjHngWbE1X5fgQooBfIOOkLqBI= - -base64-js@^1.2.0, base64-js@^1.3.1: - version "1.5.1" - resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a" - integrity sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA== - -base64id@2.0.0, base64id@~2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/base64id/-/base64id-2.0.0.tgz#2770ac6bc47d312af97a8bf9a634342e0cd25cb6" - integrity sha512-lGe34o6EHj9y3Kts9R4ZYs/Gr+6N7MCaMlIFA3F1R2O5/m7K06AxfSeO5530PEERE6/WyEg3lsuyw4GHlPZHog== - -base@^0.11.1: - version "0.11.2" - resolved "https://registry.yarnpkg.com/base/-/base-0.11.2.tgz#7bde5ced145b6d551a90db87f83c558b4eb48a8f" - integrity sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg== - dependencies: - cache-base "^1.0.1" - class-utils "^0.3.5" - component-emitter "^1.2.1" - define-property "^1.0.0" - isobject "^3.0.1" - mixin-deep "^1.2.0" - pascalcase "^0.1.1" - -batch@0.6.1: - version "0.6.1" - resolved "https://registry.yarnpkg.com/batch/-/batch-0.6.1.tgz#dc34314f4e679318093fc760272525f94bf25c16" - integrity sha1-3DQxT05nkxgJP8dgJyUl+UvyXBY= - -bcrypt-pbkdf@^1.0.0: - version "1.0.2" - resolved "https://registry.yarnpkg.com/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz#a4301d389b6a43f9b67ff3ca11a3f6637e360e9e" - integrity sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4= - dependencies: - tweetnacl "^0.14.3" - -big.js@^5.2.2: - version "5.2.2" - resolved "https://registry.yarnpkg.com/big.js/-/big.js-5.2.2.tgz#65f0af382f578bcdc742bd9c281e9cb2d7768328" - integrity sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ== - -binary-extensions@^1.0.0: - version "1.13.1" - resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.13.1.tgz#598afe54755b2868a5330d2aff9d4ebb53209b65" - integrity sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw== - -binary-extensions@^2.0.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.2.0.tgz#75f502eeaf9ffde42fc98829645be4ea76bd9e2d" - integrity sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA== - -bindings@^1.5.0: - version "1.5.0" - resolved "https://registry.yarnpkg.com/bindings/-/bindings-1.5.0.tgz#10353c9e945334bc0511a6d90b38fbc7c9c504df" - integrity sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ== - dependencies: - file-uri-to-path "1.0.0" - -bl@^4.0.3, bl@^4.1.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/bl/-/bl-4.1.0.tgz#451535264182bec2fbbc83a62ab98cf11d9f7b3a" - integrity sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w== - dependencies: - buffer "^5.5.0" - inherits "^2.0.4" - readable-stream "^3.4.0" - -blob-util@^2.0.2: - version "2.0.2" - resolved "https://registry.yarnpkg.com/blob-util/-/blob-util-2.0.2.tgz#3b4e3c281111bb7f11128518006cdc60b403a1eb" - integrity sha512-T7JQa+zsXXEa6/8ZhHcQEW1UFfVM49Ts65uBkFL6fz2QmrElqmbajIDJvuA0tEhRe5eIjpV9ZF+0RfZR9voJFQ== - -bluebird@^3.7.2: - version "3.7.2" - resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f" - integrity sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg== - -body-parser@1.19.0, body-parser@^1.19.0: - version "1.19.0" - resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.19.0.tgz#96b2709e57c9c4e09a6fd66a8fd979844f69f08a" - integrity sha512-dhEPs72UPbDnAQJ9ZKMNTP6ptJaionhP5cBb541nXPlW60Jepo9RV/a4fX4XWW9CuFNK22krhrj1+rgzifNCsw== - dependencies: - bytes "3.1.0" - content-type "~1.0.4" - debug "2.6.9" - depd "~1.1.2" - http-errors "1.7.2" - iconv-lite "0.4.24" - on-finished "~2.3.0" - qs "6.7.0" - raw-body "2.4.0" - type-is "~1.6.17" - -bonjour@^3.5.0: - version "3.5.0" - resolved "https://registry.yarnpkg.com/bonjour/-/bonjour-3.5.0.tgz#8e890a183d8ee9a2393b3844c691a42bcf7bc9f5" - integrity sha1-jokKGD2O6aI5OzhExpGkK897yfU= - dependencies: - array-flatten "^2.1.0" - deep-equal "^1.0.1" - dns-equal "^1.0.0" - dns-txt "^2.0.2" - multicast-dns "^6.0.1" - multicast-dns-service-types "^1.1.0" - -boolbase@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/boolbase/-/boolbase-1.0.0.tgz#68dff5fbe60c51eb37725ea9e3ed310dcc1e776e" - integrity sha1-aN/1++YMUes3cl6p4+0xDcwed24= - -bootstrap@4.6.0: - version "4.6.0" - resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-4.6.0.tgz#97b9f29ac98f98dfa43bf7468262d84392552fd7" - integrity sha512-Io55IuQY3kydzHtbGvQya3H+KorS/M9rSNyfCGCg9WZ4pyT/lCxIlpJgG1GXW/PswzC84Tr2fBYi+7+jFVQQBw== - -brace-expansion@^1.1.7: - version "1.1.11" - resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd" - integrity sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA== - dependencies: - balanced-match "^1.0.0" - concat-map "0.0.1" - -braces@^2.3.1, braces@^2.3.2: - version "2.3.2" - resolved "https://registry.yarnpkg.com/braces/-/braces-2.3.2.tgz#5979fd3f14cd531565e5fa2df1abfff1dfaee729" - integrity sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w== - dependencies: - arr-flatten "^1.1.0" - array-unique "^0.3.2" - extend-shallow "^2.0.1" - fill-range "^4.0.0" - isobject "^3.0.1" - repeat-element "^1.1.2" - snapdragon "^0.8.1" - snapdragon-node "^2.0.1" - split-string "^3.0.2" - to-regex "^3.0.1" - -braces@^3.0.1, braces@^3.0.2, braces@~3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107" - integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A== - dependencies: - fill-range "^7.0.1" - -browserslist@^4.0.0, browserslist@^4.12.0, browserslist@^4.14.5, browserslist@^4.16.0, browserslist@^4.16.6, browserslist@^4.16.8, browserslist@^4.6.4, browserslist@^4.9.1: - version "4.16.8" - resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.16.8.tgz#cb868b0b554f137ba6e33de0ecff2eda403c4fb0" - integrity sha512-sc2m9ohR/49sWEbPj14ZSSZqp+kbi16aLao42Hmn3Z8FpjuMaq2xCA2l4zl9ITfyzvnvyE0hcg62YkIGKxgaNQ== - dependencies: - caniuse-lite "^1.0.30001251" - colorette "^1.3.0" - electron-to-chromium "^1.3.811" - escalade "^3.1.1" - node-releases "^1.1.75" - -buffer-crc32@~0.2.3: - version "0.2.13" - resolved "https://registry.yarnpkg.com/buffer-crc32/-/buffer-crc32-0.2.13.tgz#0d333e3f00eac50aa1454abd30ef8c2a5d9a7242" - integrity sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI= - -buffer-from@^1.0.0: - version "1.1.2" - resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.2.tgz#2b146a6fd72e80b4f55d255f35ed59a3a9a41bd5" - integrity sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ== - -buffer-indexof@^1.0.0: - version "1.1.1" - resolved "https://registry.yarnpkg.com/buffer-indexof/-/buffer-indexof-1.1.1.tgz#52fabcc6a606d1a00302802648ef68f639da268c" - integrity sha512-4/rOEg86jivtPTeOUUT61jJO1Ya1TrR/OkqCSZDyq84WJh3LuuiphBYJN+fm5xufIk4XAFcEwte/8WzC8If/1g== - -buffer@^5.2.1, buffer@^5.5.0: - version "5.7.1" - resolved "https://registry.yarnpkg.com/buffer/-/buffer-5.7.1.tgz#ba62e7c13133053582197160851a8f648e99eed0" - integrity sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ== - dependencies: - base64-js "^1.3.1" - ieee754 "^1.1.13" - -builtins@^1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/builtins/-/builtins-1.0.3.tgz#cb94faeb61c8696451db36534e1422f94f0aee88" - integrity sha1-y5T662HIaWRR2zZTThQi+U8K7og= - -bytes@3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.0.0.tgz#d32815404d689699f85a4ea4fa8755dd13a96048" - integrity sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg= - -bytes@3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.0.tgz#f6cf7933a360e0588fa9fde85651cdc7f805d1f6" - integrity sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg== - -cacache@15.2.0: - version "15.2.0" - resolved "https://registry.yarnpkg.com/cacache/-/cacache-15.2.0.tgz#73af75f77c58e72d8c630a7a2858cb18ef523389" - integrity sha512-uKoJSHmnrqXgthDFx/IU6ED/5xd+NNGe+Bb+kLZy7Ku4P+BaiWEUflAKPZ7eAzsYGcsAGASJZsybXp+quEcHTw== - dependencies: - "@npmcli/move-file" "^1.0.1" - chownr "^2.0.0" - fs-minipass "^2.0.0" - glob "^7.1.4" - infer-owner "^1.0.4" - lru-cache "^6.0.0" - minipass "^3.1.1" - minipass-collect "^1.0.2" - minipass-flush "^1.0.5" - minipass-pipeline "^1.2.2" - mkdirp "^1.0.3" - p-map "^4.0.0" - promise-inflight "^1.0.1" - rimraf "^3.0.2" - ssri "^8.0.1" - tar "^6.0.2" - unique-filename "^1.1.1" - -cacache@^15.0.5, cacache@^15.2.0: - version "15.3.0" - resolved "https://registry.yarnpkg.com/cacache/-/cacache-15.3.0.tgz#dc85380fb2f556fe3dda4c719bfa0ec875a7f1eb" - integrity sha512-VVdYzXEn+cnbXpFgWs5hTT7OScegHVmLhJIR8Ufqk3iFD6A6j5iSX1KuBTfNEv4tdJWE2PzA6IVFtcLC7fN9wQ== - dependencies: - "@npmcli/fs" "^1.0.0" - "@npmcli/move-file" "^1.0.1" - chownr "^2.0.0" - fs-minipass "^2.0.0" - glob "^7.1.4" - infer-owner "^1.0.4" - lru-cache "^6.0.0" - minipass "^3.1.1" - minipass-collect "^1.0.2" - minipass-flush "^1.0.5" - minipass-pipeline "^1.2.2" - mkdirp "^1.0.3" - p-map "^4.0.0" - promise-inflight "^1.0.1" - rimraf "^3.0.2" - ssri "^8.0.1" - tar "^6.0.2" - unique-filename "^1.1.1" - -cache-base@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/cache-base/-/cache-base-1.0.1.tgz#0a7f46416831c8b662ee36fe4e7c59d76f666ab2" - integrity sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ== - dependencies: - collection-visit "^1.0.0" - component-emitter "^1.2.1" - get-value "^2.0.6" - has-value "^1.0.0" - isobject "^3.0.1" - set-value "^2.0.0" - to-object-path "^0.3.0" - union-value "^1.0.0" - unset-value "^1.0.0" - -cachedir@^2.3.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/cachedir/-/cachedir-2.3.0.tgz#0c75892a052198f0b21c7c1804d8331edfcae0e8" - integrity sha512-A+Fezp4zxnit6FanDmv9EqXNAi3vt9DWp51/71UEhXukb7QUuvtv9344h91dyAxuTLoSYJFU299qzR3tzwPAhw== - -call-bind@^1.0.0, call-bind@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.2.tgz#b1d4e89e688119c3c9a903ad30abb2f6a919be3c" - integrity sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA== - dependencies: - function-bind "^1.1.1" - get-intrinsic "^1.0.2" - -callsites@^3.0.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz#b3630abd8943432f54b3f0519238e33cd7df2f73" - integrity sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ== - -camelcase@^5.0.0: - version "5.3.1" - resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320" - integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg== - -caniuse-api@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/caniuse-api/-/caniuse-api-3.0.0.tgz#5e4d90e2274961d46291997df599e3ed008ee4c0" - integrity sha512-bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw== - dependencies: - browserslist "^4.0.0" - caniuse-lite "^1.0.0" - lodash.memoize "^4.1.2" - lodash.uniq "^4.5.0" - -caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000981, caniuse-lite@^1.0.30001032, caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001251: - version "1.0.30001252" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001252.tgz#cb16e4e3dafe948fc4a9bb3307aea054b912019a" - integrity sha512-I56jhWDGMtdILQORdusxBOH+Nl/KgQSdDmpJezYddnAkVOmnoU8zwjTV9xAjMIYxr0iPreEAVylCGcmHCjfaOw== - -canonical-path@1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/canonical-path/-/canonical-path-1.0.0.tgz#fcb470c23958def85081856be7a86e904f180d1d" - integrity sha512-feylzsbDxi1gPZ1IjystzIQZagYYLvfKrSuygUCgf7z6x790VEzze5QEkdSV1U58RA7Hi0+v6fv4K54atOzATg== - -caseless@~0.12.0: - version "0.12.0" - resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc" - integrity sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw= - -chalk@^2.0.0, chalk@^2.4.2: - version "2.4.2" - resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424" - integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ== - dependencies: - ansi-styles "^3.2.1" - escape-string-regexp "^1.0.5" - supports-color "^5.3.0" - -chalk@^4.1.0, chalk@^4.1.1: - version "4.1.2" - resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01" - integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA== - dependencies: - ansi-styles "^4.1.0" - supports-color "^7.1.0" - -chardet@^0.7.0: - version "0.7.0" - resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.7.0.tgz#90094849f0937f2eedc2425d0d28a9e5f0cbad9e" - integrity sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA== - -check-more-types@^2.24.0: - version "2.24.0" - resolved "https://registry.yarnpkg.com/check-more-types/-/check-more-types-2.24.0.tgz#1420ffb10fd444dcfc79b43891bbfffd32a84600" - integrity sha1-FCD/sQ/URNz8ebQ4kbv//TKoRgA= - -"chokidar@>=3.0.0 <4.0.0", chokidar@^3.0.0, chokidar@^3.5.1: - version "3.5.2" - resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.2.tgz#dba3976fcadb016f66fd365021d91600d01c1e75" - integrity sha512-ekGhOnNVPgT77r4K/U3GDhu+FQ2S8TnK/s2KbIGXi0SZWuwkZ2QNyfWdZW+TVfn84DpEP7rLeCt2UI6bJ8GwbQ== - dependencies: - anymatch "~3.1.2" - braces "~3.0.2" - glob-parent "~5.1.2" - is-binary-path "~2.1.0" - is-glob "~4.0.1" - normalize-path "~3.0.0" - readdirp "~3.6.0" - optionalDependencies: - fsevents "~2.3.2" - -chokidar@^2.1.8: - version "2.1.8" - resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.1.8.tgz#804b3a7b6a99358c3c5c61e71d8728f041cff917" - integrity sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg== - dependencies: - anymatch "^2.0.0" - async-each "^1.0.1" - braces "^2.3.2" - glob-parent "^3.1.0" - inherits "^2.0.3" - is-binary-path "^1.0.0" - is-glob "^4.0.0" - normalize-path "^3.0.0" - path-is-absolute "^1.0.0" - readdirp "^2.2.1" - upath "^1.1.1" - optionalDependencies: - fsevents "^1.2.7" - -chownr@^1.1.1: - version "1.1.4" - resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.4.tgz#6fc9d7b42d32a583596337666e7d08084da2cc6b" - integrity sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg== - -chownr@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/chownr/-/chownr-2.0.0.tgz#15bfbe53d2eab4cf70f18a8cd68ebe5b3cb1dece" - integrity sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ== - -chrome-trace-event@^1.0.2: - version "1.0.3" - resolved "https://registry.yarnpkg.com/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz#1015eced4741e15d06664a957dbbf50d041e26ac" - integrity sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg== - -ci-info@^3.1.1: - version "3.2.0" - resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-3.2.0.tgz#2876cb948a498797b5236f0095bc057d0dca38b6" - integrity sha512-dVqRX7fLUm8J6FgHJ418XuIgDLZDkYcDFTeL6TA2gt5WlIZUQrrH6EZrNClwT/H0FateUsZkGIOPRrLbP+PR9A== - -circular-dependency-plugin@5.2.2: - version "5.2.2" - resolved "https://registry.yarnpkg.com/circular-dependency-plugin/-/circular-dependency-plugin-5.2.2.tgz#39e836079db1d3cf2f988dc48c5188a44058b600" - integrity sha512-g38K9Cm5WRwlaH6g03B9OEz/0qRizI+2I7n+Gz+L5DxXJAPAiWQvwlYNm1V1jkdpUv95bOe/ASm2vfi/G560jQ== - -class-utils@^0.3.5: - version "0.3.6" - resolved "https://registry.yarnpkg.com/class-utils/-/class-utils-0.3.6.tgz#f93369ae8b9a7ce02fd41faad0ca83033190c463" - integrity sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg== - dependencies: - arr-union "^3.1.0" - define-property "^0.2.5" - isobject "^3.0.0" - static-extend "^0.1.1" - -clean-stack@^2.0.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/clean-stack/-/clean-stack-2.2.0.tgz#ee8472dbb129e727b31e8a10a427dee9dfe4008b" - integrity sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A== - -cli-cursor@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-3.1.0.tgz#264305a7ae490d1d03bf0c9ba7c925d1753af307" - integrity sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw== - dependencies: - restore-cursor "^3.1.0" - -cli-spinners@^2.5.0: - version "2.6.0" - resolved "https://registry.yarnpkg.com/cli-spinners/-/cli-spinners-2.6.0.tgz#36c7dc98fb6a9a76bd6238ec3f77e2425627e939" - integrity sha512-t+4/y50K/+4xcCRosKkA7W4gTr1MySvLV0q+PxmG7FJ5g+66ChKurYjxBCjHggHH3HA5Hh9cy+lcUGWDqVH+4Q== - -cli-table3@~0.6.0: - version "0.6.0" - resolved "https://registry.yarnpkg.com/cli-table3/-/cli-table3-0.6.0.tgz#b7b1bc65ca8e7b5cef9124e13dc2b21e2ce4faee" - integrity sha512-gnB85c3MGC7Nm9I/FkiasNBOKjOiO1RNuXXarQms37q4QMpWdlbBgD/VnOStA2faG1dpXMv31RFApjX1/QdgWQ== - dependencies: - object-assign "^4.1.0" - string-width "^4.2.0" - optionalDependencies: - colors "^1.1.2" - -cli-truncate@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/cli-truncate/-/cli-truncate-2.1.0.tgz#c39e28bf05edcde5be3b98992a22deed5a2b93c7" - integrity sha512-n8fOixwDD6b/ObinzTrp1ZKFzbgvKZvuz/TvejnLn1aQfC6r52XEx85FmuC+3HI+JM7coBRXUvNqEU2PHVrHpg== - dependencies: - slice-ansi "^3.0.0" - string-width "^4.2.0" - -cli-width@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-3.0.0.tgz#a2f48437a2caa9a22436e794bf071ec9e61cedf6" - integrity sha512-FxqpkPPwu1HjuN93Omfm4h8uIanXofW0RxVEW3k5RKx+mJJYSthzNhp32Kzxxy3YAEZ/Dc/EWN1vZRY0+kOhbw== - -cliui@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/cliui/-/cliui-5.0.0.tgz#deefcfdb2e800784aa34f46fa08e06851c7bbbc5" - integrity sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA== - dependencies: - string-width "^3.1.0" - strip-ansi "^5.2.0" - wrap-ansi "^5.1.0" - -cliui@^7.0.2: - version "7.0.4" - resolved "https://registry.yarnpkg.com/cliui/-/cliui-7.0.4.tgz#a0265ee655476fc807aea9df3df8df7783808b4f" - integrity sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ== - dependencies: - string-width "^4.2.0" - strip-ansi "^6.0.0" - wrap-ansi "^7.0.0" - -clone-deep@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/clone-deep/-/clone-deep-4.0.1.tgz#c19fd9bdbbf85942b4fd979c84dcf7d5f07c2387" - integrity sha512-neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ== - dependencies: - is-plain-object "^2.0.4" - kind-of "^6.0.2" - shallow-clone "^3.0.0" - -clone@^1.0.2: - version "1.0.4" - resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.4.tgz#da309cc263df15994c688ca902179ca3c7cd7c7e" - integrity sha1-2jCcwmPfFZlMaIypAheco8fNfH4= - -code-point-at@^1.0.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77" - integrity sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c= - -collection-visit@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/collection-visit/-/collection-visit-1.0.0.tgz#4bc0373c164bc3291b4d368c829cf1a80a59dca0" - integrity sha1-S8A3PBZLwykbTTaMgpzxqApZ3KA= - dependencies: - map-visit "^1.0.0" - object-visit "^1.0.0" - -color-convert@^1.9.0: - version "1.9.3" - resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8" - integrity sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg== - dependencies: - color-name "1.1.3" - -color-convert@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-2.0.1.tgz#72d3a68d598c9bdb3af2ad1e84f21d896abd4de3" - integrity sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ== - dependencies: - color-name "~1.1.4" - -color-name@1.1.3: - version "1.1.3" - resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25" - integrity sha1-p9BVi9icQveV3UIyj3QIMcpTvCU= - -color-name@~1.1.4: - version "1.1.4" - resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2" - integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA== - -colord@^2.0.1, colord@^2.6: - version "2.7.0" - resolved "https://registry.yarnpkg.com/colord/-/colord-2.7.0.tgz#706ea36fe0cd651b585eb142fe64b6480185270e" - integrity sha512-pZJBqsHz+pYyw3zpX6ZRXWoCHM1/cvFikY9TV8G3zcejCaKE0lhankoj8iScyrrePA8C7yJ5FStfA9zbcOnw7Q== - -colorette@^1.2.1, colorette@^1.2.2, colorette@^1.3.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/colorette/-/colorette-1.3.0.tgz#ff45d2f0edb244069d3b772adeb04fed38d0a0af" - integrity sha512-ecORCqbSFP7Wm8Y6lyqMJjexBQqXSF7SSeaTyGGphogUjBlFP9m9o08wy86HL2uB7fMTxtOUzLMk7ogKcxMg1w== - -colors@^1.1.2, colors@^1.4.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/colors/-/colors-1.4.0.tgz#c50491479d4c1bdaed2c9ced32cf7c7dc2360f78" - integrity sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA== - -combined-stream@^1.0.6, combined-stream@~1.0.6: - version "1.0.8" - resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f" - integrity sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg== - dependencies: - delayed-stream "~1.0.0" - -commander@^2.20.0: - version "2.20.3" - resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33" - integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ== - -commander@^3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/commander/-/commander-3.0.2.tgz#6837c3fb677ad9933d1cfba42dd14d5117d6b39e" - integrity sha512-Gar0ASD4BDyKC4hl4DwHqDrmvjoxWKZigVnAbn5H1owvm4CxCPdb0HQDehwNYMJpla5+M2tPmPARzhtYuwpHow== - -commander@^5.1.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/commander/-/commander-5.1.0.tgz#46abbd1652f8e059bddaef99bbdcb2ad9cf179ae" - integrity sha512-P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg== - -commander@^7.2.0: - version "7.2.0" - resolved "https://registry.yarnpkg.com/commander/-/commander-7.2.0.tgz#a36cb57d0b501ce108e4d20559a150a391d97ab7" - integrity sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw== - -common-tags@^1.8.0: - version "1.8.0" - resolved "https://registry.yarnpkg.com/common-tags/-/common-tags-1.8.0.tgz#8e3153e542d4a39e9b10554434afaaf98956a937" - integrity sha512-6P6g0uetGpW/sdyUy/iQQCbFF0kWVMSIVSyYz7Zgjcgh8mgw8PQzDNZeyZ5DQ2gM7LBoZPHmnjz8rUthkBG5tw== - -commondir@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b" - integrity sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs= - -component-emitter@^1.2.1, component-emitter@~1.3.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.3.0.tgz#16e4070fba8ae29b679f2215853ee181ab2eabc0" - integrity sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg== - -compressible@~2.0.16: - version "2.0.18" - resolved "https://registry.yarnpkg.com/compressible/-/compressible-2.0.18.tgz#af53cca6b070d4c3c0750fbd77286a6d7cc46fba" - integrity sha512-AF3r7P5dWxL8MxyITRMlORQNaOA2IkAFaTr4k7BUumjPtRpGDTZpl0Pb1XCO6JeDCBdp126Cgs9sMxqSjgYyRg== - dependencies: - mime-db ">= 1.43.0 < 2" - -compression@^1.7.4: - version "1.7.4" - resolved "https://registry.yarnpkg.com/compression/-/compression-1.7.4.tgz#95523eff170ca57c29a0ca41e6fe131f41e5bb8f" - integrity sha512-jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ== - dependencies: - accepts "~1.3.5" - bytes "3.0.0" - compressible "~2.0.16" - debug "2.6.9" - on-headers "~1.0.2" - safe-buffer "5.1.2" - vary "~1.1.2" - -concat-map@0.0.1: - version "0.0.1" - resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b" - integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s= - -connect-history-api-fallback@^1.6.0: - version "1.6.0" - resolved "https://registry.yarnpkg.com/connect-history-api-fallback/-/connect-history-api-fallback-1.6.0.tgz#8b32089359308d111115d81cad3fceab888f97bc" - integrity sha512-e54B99q/OUoH64zYYRf3HBP5z24G38h5D3qXu23JGRoigpX5Ss4r9ZnDk3g0Z8uQC2x2lPaJ+UlWBc1ZWBWdLg== - -connect@^3.7.0: - version "3.7.0" - resolved "https://registry.yarnpkg.com/connect/-/connect-3.7.0.tgz#5d49348910caa5e07a01800b030d0c35f20484f8" - integrity sha512-ZqRXc+tZukToSNmh5C2iWMSoV3X1YUcPbqEM4DkEG5tNQXrQUZCNVGGv3IuicnkMtPfGf3Xtp8WCXs295iQ1pQ== - dependencies: - debug "2.6.9" - finalhandler "1.1.2" - parseurl "~1.3.3" - utils-merge "1.0.1" - -console-control-strings@^1.0.0, console-control-strings@~1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e" - integrity sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4= - -content-disposition@0.5.3: - version "0.5.3" - resolved "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.3.tgz#e130caf7e7279087c5616c2007d0485698984fbd" - integrity sha512-ExO0774ikEObIAEV9kDo50o+79VCUdEB6n6lzKgGwupcVeRlhrj3qGAfwq8G6uBJjkqLrhT0qEYFcWng8z1z0g== - dependencies: - safe-buffer "5.1.2" - -content-type@~1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.4.tgz#e138cc75e040c727b1966fe5e5f8c9aee256fe3b" - integrity sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA== - -convert-source-map@^1.5.1, convert-source-map@^1.7.0: - version "1.8.0" - resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.8.0.tgz#f3373c32d21b4d780dd8004514684fb791ca4369" - integrity sha512-+OQdjP49zViI/6i7nIJpA8rAl4sV/JdPfU9nZs3VqOwGIgizICvuN2ru6fMd+4llL0tar18UYJXfZ/TWtmhUjA== - dependencies: - safe-buffer "~5.1.1" - -cookie-signature@1.0.6: - version "1.0.6" - resolved "https://registry.yarnpkg.com/cookie-signature/-/cookie-signature-1.0.6.tgz#e303a882b342cc3ee8ca513a79999734dab3ae2c" - integrity sha1-4wOogrNCzD7oylE6eZmXNNqzriw= - -cookie@0.4.0: - version "0.4.0" - resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.4.0.tgz#beb437e7022b3b6d49019d088665303ebe9c14ba" - integrity sha512-+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg== - -cookie@~0.4.1: - version "0.4.1" - resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.4.1.tgz#afd713fe26ebd21ba95ceb61f9a8116e50a537d1" - integrity sha512-ZwrFkGJxUR3EIoXtO+yVE69Eb7KlixbaeAWfBQB9vVsNn/o+Yw69gBWSSDK825hQNdN+wF8zELf3dFNl/kxkUA== - -copy-anything@^2.0.1: - version "2.0.3" - resolved "https://registry.yarnpkg.com/copy-anything/-/copy-anything-2.0.3.tgz#842407ba02466b0df844819bbe3baebbe5d45d87" - integrity sha512-GK6QUtisv4fNS+XcI7shX0Gx9ORg7QqIznyfho79JTnX1XhLiyZHfftvGiziqzRiEi/Bjhgpi+D2o7HxJFPnDQ== - dependencies: - is-what "^3.12.0" - -copy-descriptor@^0.1.0: - version "0.1.1" - resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d" - integrity sha1-Z29us8OZl8LuGsOpJP1hJHSPV40= - -copy-webpack-plugin@9.0.1: - version "9.0.1" - resolved "https://registry.yarnpkg.com/copy-webpack-plugin/-/copy-webpack-plugin-9.0.1.tgz#b71d21991599f61a4ee00ba79087b8ba279bbb59" - integrity sha512-14gHKKdYIxF84jCEgPgYXCPpldbwpxxLbCmA7LReY7gvbaT555DgeBWBgBZM116tv/fO6RRJrsivBqRyRlukhw== - dependencies: - fast-glob "^3.2.5" - glob-parent "^6.0.0" - globby "^11.0.3" - normalize-path "^3.0.0" - p-limit "^3.1.0" - schema-utils "^3.0.0" - serialize-javascript "^6.0.0" - -core-js-compat@^3.14.0, core-js-compat@^3.15.0: - version "3.16.4" - resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.16.4.tgz#cf28abe0e45a43645b04b2c1a073efa03d0b3b26" - integrity sha512-IzCSomxRdahCYb6G3HiN6pl3JCiM0NMunRcNa1pIeC7g17Vd6Ue3AT9anQiENPIm/svThUVer1pIbLMDERIsFw== - dependencies: - browserslist "^4.16.8" - semver "7.0.0" - -core-js@2.4.1: - version "2.4.1" - resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.4.1.tgz#4de911e667b0eae9124e34254b53aea6fc618d3e" - integrity sha1-TekR5mew6ukSTjQlS1OupvxhjT4= - -core-js@3.16.0: - version "3.16.0" - resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.16.0.tgz#1d46fb33720bc1fa7f90d20431f36a5540858986" - integrity sha512-5+5VxRFmSf97nM8Jr2wzOwLqRo6zphH2aX+7KsAUONObyzakDNq2G/bgbhinxB4PoV9L3aXQYhiDKyIKWd2c8g== - -core-util-is@1.0.2, core-util-is@~1.0.0: - version "1.0.2" - resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7" - integrity sha1-tf1UIgqivFq1eqtxQMlAdUUDwac= - -cors@~2.8.5: - version "2.8.5" - resolved "https://registry.yarnpkg.com/cors/-/cors-2.8.5.tgz#eac11da51592dd86b9f06f6e7ac293b3df875d29" - integrity sha512-KIHbLJqu73RGr/hnbrO9uBeixNGuvSQjul/jdFvS/KFSIH1hWVd1ng7zOHx+YrEfInLG7q4n6GHQ9cDtxv/P6g== - dependencies: - object-assign "^4" - vary "^1" - -cosmiconfig@^7.0.0: - version "7.0.1" - resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-7.0.1.tgz#714d756522cace867867ccb4474c5d01bbae5d6d" - integrity sha512-a1YWNUV2HwGimB7dU2s1wUMurNKjpx60HxBB6xUM8Re+2s1g1IIfJvFR0/iCF+XHdE0GMTKTuLR32UQff4TEyQ== - dependencies: - "@types/parse-json" "^4.0.0" - import-fresh "^3.2.1" - parse-json "^5.0.0" - path-type "^4.0.0" - yaml "^1.10.0" - -create-require@^1.1.0: - version "1.1.1" - resolved "https://registry.yarnpkg.com/create-require/-/create-require-1.1.1.tgz#c1d7e8f1e5f6cfc9ff65f9cd352d37348756c333" - integrity sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ== - -critters@0.0.10: - version "0.0.10" - resolved "https://registry.yarnpkg.com/critters/-/critters-0.0.10.tgz#edd0e962fc5af6c4adb6dbf1a71bae2d3f917000" - integrity sha512-p5VKhP1803+f+0Jq5P03w1SbiHtpAKm+1EpJHkiPxQPq0Vu9QLZHviJ02GRrWi0dlcJqrmzMWInbwp4d22RsGw== - dependencies: - chalk "^4.1.0" - css "^3.0.0" - parse5 "^6.0.1" - parse5-htmlparser2-tree-adapter "^6.0.1" - pretty-bytes "^5.3.0" - -cross-spawn@^6.0.0: - version "6.0.5" - resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz#4a5ec7c64dfae22c3a14124dbacdee846d80cbc4" - integrity sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ== - dependencies: - nice-try "^1.0.4" - path-key "^2.0.1" - semver "^5.5.0" - shebang-command "^1.2.0" - which "^1.2.9" - -cross-spawn@^7.0.0: - version "7.0.3" - resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6" - integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w== - dependencies: - path-key "^3.1.0" - shebang-command "^2.0.0" - which "^2.0.1" - -css-blank-pseudo@^0.1.4: - version "0.1.4" - resolved "https://registry.yarnpkg.com/css-blank-pseudo/-/css-blank-pseudo-0.1.4.tgz#dfdefd3254bf8a82027993674ccf35483bfcb3c5" - integrity sha512-LHz35Hr83dnFeipc7oqFDmsjHdljj3TQtxGGiNWSOsTLIAubSm4TEz8qCaKFpk7idaQ1GfWscF4E6mgpBysA1w== - dependencies: - postcss "^7.0.5" - -css-color-names@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/css-color-names/-/css-color-names-1.0.1.tgz#6ff7ee81a823ad46e020fa2fd6ab40a887e2ba67" - integrity sha512-/loXYOch1qU1biStIFsHH8SxTmOseh1IJqFvy8IujXOm1h+QjUdDhkzOrR5HG8K8mlxREj0yfi8ewCHx0eMxzA== - -css-declaration-sorter@^6.0.3: - version "6.1.1" - resolved "https://registry.yarnpkg.com/css-declaration-sorter/-/css-declaration-sorter-6.1.1.tgz#77b32b644ba374bc562c0fc6f4fdaba4dfb0b749" - integrity sha512-BZ1aOuif2Sb7tQYY1GeCjG7F++8ggnwUkH5Ictw0mrdpqpEd+zWmcPdstnH2TItlb74FqR0DrVEieon221T/1Q== - dependencies: - timsort "^0.3.0" - -css-has-pseudo@^0.10.0: - version "0.10.0" - resolved "https://registry.yarnpkg.com/css-has-pseudo/-/css-has-pseudo-0.10.0.tgz#3c642ab34ca242c59c41a125df9105841f6966ee" - integrity sha512-Z8hnfsZu4o/kt+AuFzeGpLVhFOGO9mluyHBaA2bA8aCGTwah5sT3WV/fTHH8UNZUytOIImuGPrl/prlb4oX4qQ== - dependencies: - postcss "^7.0.6" - postcss-selector-parser "^5.0.0-rc.4" - -css-loader@6.2.0: - version "6.2.0" - resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-6.2.0.tgz#9663d9443841de957a3cb9bcea2eda65b3377071" - integrity sha512-/rvHfYRjIpymZblf49w8jYcRo2y9gj6rV8UroHGmBxKrIyGLokpycyKzp9OkitvqT29ZSpzJ0Ic7SpnJX3sC8g== - dependencies: - icss-utils "^5.1.0" - postcss "^8.2.15" - postcss-modules-extract-imports "^3.0.0" - postcss-modules-local-by-default "^4.0.0" - postcss-modules-scope "^3.0.0" - postcss-modules-values "^4.0.0" - postcss-value-parser "^4.1.0" - semver "^7.3.5" - -css-minimizer-webpack-plugin@3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/css-minimizer-webpack-plugin/-/css-minimizer-webpack-plugin-3.0.2.tgz#8fadbdf10128cb40227bff275a4bb47412534245" - integrity sha512-B3I5e17RwvKPJwsxjjWcdgpU/zqylzK1bPVghcmpFHRL48DXiBgrtqz1BJsn68+t/zzaLp9kYAaEDvQ7GyanFQ== - dependencies: - cssnano "^5.0.6" - jest-worker "^27.0.2" - p-limit "^3.0.2" - postcss "^8.3.5" - schema-utils "^3.0.0" - serialize-javascript "^6.0.0" - source-map "^0.6.1" - -css-parse@~2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/css-parse/-/css-parse-2.0.0.tgz#a468ee667c16d81ccf05c58c38d2a97c780dbfd4" - integrity sha1-pGjuZnwW2BzPBcWMONKpfHgNv9Q= - dependencies: - css "^2.0.0" - -css-prefers-color-scheme@^3.1.1: - version "3.1.1" - resolved "https://registry.yarnpkg.com/css-prefers-color-scheme/-/css-prefers-color-scheme-3.1.1.tgz#6f830a2714199d4f0d0d0bb8a27916ed65cff1f4" - integrity sha512-MTu6+tMs9S3EUqzmqLXEcgNRbNkkD/TGFvowpeoWJn5Vfq7FMgsmRQs9X5NXAURiOBmOxm/lLjsDNXDE6k9bhg== - dependencies: - postcss "^7.0.5" - -css-select@^4.1.3: - version "4.1.3" - resolved "https://registry.yarnpkg.com/css-select/-/css-select-4.1.3.tgz#a70440f70317f2669118ad74ff105e65849c7067" - integrity sha512-gT3wBNd9Nj49rAbmtFHj1cljIAOLYSX1nZ8CB7TBO3INYckygm5B7LISU/szY//YmdiSLbJvDLOx9VnMVpMBxA== - dependencies: - boolbase "^1.0.0" - css-what "^5.0.0" - domhandler "^4.2.0" - domutils "^2.6.0" - nth-check "^2.0.0" - -css-tree@^1.1.2, css-tree@^1.1.3: - version "1.1.3" - resolved "https://registry.yarnpkg.com/css-tree/-/css-tree-1.1.3.tgz#eb4870fb6fd7707327ec95c2ff2ab09b5e8db91d" - integrity sha512-tRpdppF7TRazZrjJ6v3stzv93qxRcSsFmW6cX0Zm2NVKpxE1WV1HblnghVv9TreireHkqI/VDEsfolRF1p6y7Q== - dependencies: - mdn-data "2.0.14" - source-map "^0.6.1" - -css-what@^5.0.0: - version "5.0.1" - resolved "https://registry.yarnpkg.com/css-what/-/css-what-5.0.1.tgz#3efa820131f4669a8ac2408f9c32e7c7de9f4cad" - integrity sha512-FYDTSHb/7KXsWICVsxdmiExPjCfRC4qRFBdVwv7Ax9hMnvMmEjP9RfxTEZ3qPZGmADDn2vAKSo9UcN1jKVYscg== - -css@^2.0.0: - version "2.2.4" - resolved "https://registry.yarnpkg.com/css/-/css-2.2.4.tgz#c646755c73971f2bba6a601e2cf2fd71b1298929" - integrity sha512-oUnjmWpy0niI3x/mPL8dVEI1l7MnG3+HHyRPHf+YFSbK+svOhXpmSOcDURUh2aOCgl2grzrOPt1nHLuCVFULLw== - dependencies: - inherits "^2.0.3" - source-map "^0.6.1" - source-map-resolve "^0.5.2" - urix "^0.1.0" - -css@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/css/-/css-3.0.0.tgz#4447a4d58fdd03367c516ca9f64ae365cee4aa5d" - integrity sha512-DG9pFfwOrzc+hawpmqX/dHYHJG+Bsdb0klhyi1sDneOgGOXy9wQIC8hzyVp1e4NRYDBdxcylvywPkkXCHAzTyQ== - dependencies: - inherits "^2.0.4" - source-map "^0.6.1" - source-map-resolve "^0.6.0" - -cssdb@^4.4.0: - version "4.4.0" - resolved "https://registry.yarnpkg.com/cssdb/-/cssdb-4.4.0.tgz#3bf2f2a68c10f5c6a08abd92378331ee803cddb0" - integrity sha512-LsTAR1JPEM9TpGhl/0p3nQecC2LJ0kD8X5YARu1hk/9I1gril5vDtMZyNxcEpxxDj34YNck/ucjuoUd66K03oQ== - -cssesc@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/cssesc/-/cssesc-2.0.0.tgz#3b13bd1bb1cb36e1bcb5a4dcd27f54c5dcb35703" - integrity sha512-MsCAG1z9lPdoO/IUMLSBWBSVxVtJ1395VGIQ+Fc2gNdkQ1hNDnQdw3YhA71WJCBW1vdwA0cAnk/DnW6bqoEUYg== - -cssesc@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/cssesc/-/cssesc-3.0.0.tgz#37741919903b868565e1c09ea747445cd18983ee" - integrity sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg== - -cssnano-preset-default@^5.1.4: - version "5.1.4" - resolved "https://registry.yarnpkg.com/cssnano-preset-default/-/cssnano-preset-default-5.1.4.tgz#359943bf00c5c8e05489f12dd25f3006f2c1cbd2" - integrity sha512-sPpQNDQBI3R/QsYxQvfB4mXeEcWuw0wGtKtmS5eg8wudyStYMgKOQT39G07EbW1LB56AOYrinRS9f0ig4Y3MhQ== - dependencies: - css-declaration-sorter "^6.0.3" - cssnano-utils "^2.0.1" - postcss-calc "^8.0.0" - postcss-colormin "^5.2.0" - postcss-convert-values "^5.0.1" - postcss-discard-comments "^5.0.1" - postcss-discard-duplicates "^5.0.1" - postcss-discard-empty "^5.0.1" - postcss-discard-overridden "^5.0.1" - postcss-merge-longhand "^5.0.2" - postcss-merge-rules "^5.0.2" - postcss-minify-font-values "^5.0.1" - postcss-minify-gradients "^5.0.2" - postcss-minify-params "^5.0.1" - postcss-minify-selectors "^5.1.0" - postcss-normalize-charset "^5.0.1" - postcss-normalize-display-values "^5.0.1" - postcss-normalize-positions "^5.0.1" - postcss-normalize-repeat-style "^5.0.1" - postcss-normalize-string "^5.0.1" - postcss-normalize-timing-functions "^5.0.1" - postcss-normalize-unicode "^5.0.1" - postcss-normalize-url "^5.0.2" - postcss-normalize-whitespace "^5.0.1" - postcss-ordered-values "^5.0.2" - postcss-reduce-initial "^5.0.1" - postcss-reduce-transforms "^5.0.1" - postcss-svgo "^5.0.2" - postcss-unique-selectors "^5.0.1" - -cssnano-utils@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/cssnano-utils/-/cssnano-utils-2.0.1.tgz#8660aa2b37ed869d2e2f22918196a9a8b6498ce2" - integrity sha512-i8vLRZTnEH9ubIyfdZCAdIdgnHAUeQeByEeQ2I7oTilvP9oHO6RScpeq3GsFUVqeB8uZgOQ9pw8utofNn32hhQ== - -cssnano@^5.0.6: - version "5.0.8" - resolved "https://registry.yarnpkg.com/cssnano/-/cssnano-5.0.8.tgz#39ad166256980fcc64faa08c9bb18bb5789ecfa9" - integrity sha512-Lda7geZU0Yu+RZi2SGpjYuQz4HI4/1Y+BhdD0jL7NXAQ5larCzVn+PUGuZbDMYz904AXXCOgO5L1teSvgu7aFg== - dependencies: - cssnano-preset-default "^5.1.4" - is-resolvable "^1.1.0" - lilconfig "^2.0.3" - yaml "^1.10.2" - -csso@^4.2.0: - version "4.2.0" - resolved "https://registry.yarnpkg.com/csso/-/csso-4.2.0.tgz#ea3a561346e8dc9f546d6febedd50187cf389529" - integrity sha512-wvlcdIbf6pwKEk7vHj8/Bkc0B4ylXZruLvOgs9doS5eOsOpuodOV2zJChSpkp+pRpYQLQMeF04nr3Z68Sta9jA== - dependencies: - css-tree "^1.1.2" - -custom-event@~1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/custom-event/-/custom-event-1.0.1.tgz#5d02a46850adf1b4a317946a3928fccb5bfd0425" - integrity sha1-XQKkaFCt8bSjF5RqOSj8y1v9BCU= - -cypress@8.3.0: - version "8.3.0" - resolved "https://registry.yarnpkg.com/cypress/-/cypress-8.3.0.tgz#ba906d2170888073ad94b2be1b994a749bbb7c7d" - integrity sha512-zA5Rcq8AZIfRfPXU0CCcauofF+YpaU9HYbfqkunFTmFV0Kdlo14tNjH2E3++MkjXKFnv3/pXq+HgxWtw8CSe8Q== - dependencies: - "@cypress/request" "^2.88.5" - "@cypress/xvfb" "^1.2.4" - "@types/node" "^14.14.31" - "@types/sinonjs__fake-timers" "^6.0.2" - "@types/sizzle" "^2.3.2" - arch "^2.2.0" - blob-util "^2.0.2" - bluebird "^3.7.2" - cachedir "^2.3.0" - chalk "^4.1.0" - check-more-types "^2.24.0" - cli-cursor "^3.1.0" - cli-table3 "~0.6.0" - commander "^5.1.0" - common-tags "^1.8.0" - dayjs "^1.10.4" - debug "^4.3.2" - enquirer "^2.3.6" - eventemitter2 "^6.4.3" - execa "4.1.0" - executable "^4.1.1" - extract-zip "2.0.1" - figures "^3.2.0" - fs-extra "^9.1.0" - getos "^3.2.1" - is-ci "^3.0.0" - is-installed-globally "~0.4.0" - lazy-ass "^1.6.0" - listr2 "^3.8.3" - lodash "^4.17.21" - log-symbols "^4.0.0" - minimist "^1.2.5" - ospath "^1.2.2" - pretty-bytes "^5.6.0" - ramda "~0.27.1" - request-progress "^3.0.0" - supports-color "^8.1.1" - tmp "~0.2.1" - untildify "^4.0.0" - url "^0.11.0" - yauzl "^2.10.0" - -dashdash@^1.12.0: - version "1.14.1" - resolved "https://registry.yarnpkg.com/dashdash/-/dashdash-1.14.1.tgz#853cfa0f7cbe2fed5de20326b8dd581035f6e2f0" - integrity sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA= - dependencies: - assert-plus "^1.0.0" - -date-format@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/date-format/-/date-format-2.1.0.tgz#31d5b5ea211cf5fd764cd38baf9d033df7e125cf" - integrity sha512-bYQuGLeFxhkxNOF3rcMtiZxvCBAquGzZm6oWA1oZ0g2THUzivaRhv8uOhdr19LmoobSOLoIAxeUK2RdbM8IFTA== - -date-format@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/date-format/-/date-format-3.0.0.tgz#eb8780365c7d2b1511078fb491e6479780f3ad95" - integrity sha512-eyTcpKOcamdhWJXj56DpQMo1ylSQpcGtGKXcU0Tb97+K56/CF5amAqqqNj0+KvA0iw2ynxtHWFsPDSClCxe48w== - -dayjs@^1.10.4: - version "1.10.6" - resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.10.6.tgz#288b2aa82f2d8418a6c9d4df5898c0737ad02a63" - integrity sha512-AztC/IOW4L1Q41A86phW5Thhcrco3xuAA+YX/BLpLWWjRcTj5TOt/QImBLmCKlrF7u7k47arTnOyL6GnbG8Hvw== - -debug@2.6.9, debug@^2.2.0, debug@^2.3.3: - version "2.6.9" - resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f" - integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA== - dependencies: - ms "2.0.0" - -debug@4, debug@4.3.2, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2, debug@~4.3.1: - version "4.3.2" - resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.2.tgz#f0a49c18ac8779e31d4a0c6029dfb76873c7428b" - integrity sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw== - dependencies: - ms "2.1.2" - -debug@4.3.1: - version "4.3.1" - resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.1.tgz#f0d229c505e0c6d8c49ac553d1b13dc183f6b2ee" - integrity sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ== - dependencies: - ms "2.1.2" - -debug@^3.1.0, debug@^3.1.1, debug@^3.2.6: - version "3.2.7" - resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.7.tgz#72580b7e9145fb39b6676f9c5e5fb100b934179a" - integrity sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ== - dependencies: - ms "^2.1.1" - -debug@~3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261" - integrity sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g== - dependencies: - ms "2.0.0" - -decamelize@^1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290" - integrity sha1-9lNNFRSCabIDUue+4m9QH5oZEpA= - -decode-uri-component@^0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545" - integrity sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU= - -deep-equal@^1.0.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/deep-equal/-/deep-equal-1.1.1.tgz#b5c98c942ceffaf7cb051e24e1434a25a2e6076a" - integrity sha512-yd9c5AdiqVcR+JjcwUQb9DkhJc8ngNr0MahEBGvDiJw8puWab2yZlh+nkasOnZP+EGTAP6rRp2JzJhJZzvNF8g== - dependencies: - is-arguments "^1.0.4" - is-date-object "^1.0.1" - is-regex "^1.0.4" - object-is "^1.0.1" - object-keys "^1.1.1" - regexp.prototype.flags "^1.2.0" - -default-gateway@^4.2.0: - version "4.2.0" - resolved "https://registry.yarnpkg.com/default-gateway/-/default-gateway-4.2.0.tgz#167104c7500c2115f6dd69b0a536bb8ed720552b" - integrity sha512-h6sMrVB1VMWVrW13mSc6ia/DwYYw5MN6+exNu1OaJeFac5aSAvwM7lZ0NVfTABuSkQelr4h5oebg3KB1XPdjgA== - dependencies: - execa "^1.0.0" - ip-regex "^2.1.0" - -defaults@^1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/defaults/-/defaults-1.0.3.tgz#c656051e9817d9ff08ed881477f3fe4019f3ef7d" - integrity sha1-xlYFHpgX2f8I7YgUd/P+QBnz730= - dependencies: - clone "^1.0.2" - -define-lazy-prop@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz#3f7ae421129bcaaac9bc74905c98a0009ec9ee7f" - integrity sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og== - -define-properties@^1.1.3: - version "1.1.3" - resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.3.tgz#cf88da6cbee26fe6db7094f61d870cbd84cee9f1" - integrity sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ== - dependencies: - object-keys "^1.0.12" - -define-property@^0.2.5: - version "0.2.5" - resolved "https://registry.yarnpkg.com/define-property/-/define-property-0.2.5.tgz#c35b1ef918ec3c990f9a5bc57be04aacec5c8116" - integrity sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY= - dependencies: - is-descriptor "^0.1.0" - -define-property@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/define-property/-/define-property-1.0.0.tgz#769ebaaf3f4a63aad3af9e8d304c9bbe79bfb0e6" - integrity sha1-dp66rz9KY6rTr56NMEybvnm/sOY= - dependencies: - is-descriptor "^1.0.0" - -define-property@^2.0.2: - version "2.0.2" - resolved "https://registry.yarnpkg.com/define-property/-/define-property-2.0.2.tgz#d459689e8d654ba77e02a817f8710d702cb16e9d" - integrity sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ== - dependencies: - is-descriptor "^1.0.2" - isobject "^3.0.1" - -del@^4.1.1: - version "4.1.1" - resolved "https://registry.yarnpkg.com/del/-/del-4.1.1.tgz#9e8f117222ea44a31ff3a156c049b99052a9f0b4" - integrity sha512-QwGuEUouP2kVwQenAsOof5Fv8K9t3D8Ca8NxcXKrIpEHjTXK5J2nXLdP+ALI1cgv8wj7KuwBhTwBkOZSJKM5XQ== - dependencies: - "@types/glob" "^7.1.1" - globby "^6.1.0" - is-path-cwd "^2.0.0" - is-path-in-cwd "^2.0.0" - p-map "^2.0.0" - pify "^4.0.1" - rimraf "^2.6.3" - -delayed-stream@~1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619" - integrity sha1-3zrhmayt+31ECqrgsp4icrJOxhk= - -delegates@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a" - integrity sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o= - -depd@^1.1.2, depd@~1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9" - integrity sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak= - -dependency-graph@^0.11.0: - version "0.11.0" - resolved "https://registry.yarnpkg.com/dependency-graph/-/dependency-graph-0.11.0.tgz#ac0ce7ed68a54da22165a85e97a01d53f5eb2e27" - integrity sha512-JeMq7fEshyepOWDfcfHK06N3MhyPhz++vtqWhMT5O9A3K42rdsEDpfdVqjaqaAhsw6a+ZqeDvQVtD0hFHQWrzg== - -destroy@~1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.0.4.tgz#978857442c44749e4206613e37946205826abd80" - integrity sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA= - -detect-node@^2.0.4: - version "2.1.0" - resolved "https://registry.yarnpkg.com/detect-node/-/detect-node-2.1.0.tgz#c9c70775a49c3d03bc2c06d9a73be550f978f8b1" - integrity sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g== - -devtools-protocol@0.0.901419: - version "0.0.901419" - resolved "https://registry.yarnpkg.com/devtools-protocol/-/devtools-protocol-0.0.901419.tgz#79b5459c48fe7e1c5563c02bd72f8fec3e0cebcd" - integrity sha512-4INMPwNm9XRpBukhNbF7OB6fNTTCaI8pzy/fXg0xQzAy5h3zL1P8xT3QazgKqBrb/hAYwIBizqDBZ7GtJE74QQ== - -di@^0.0.1: - version "0.0.1" - resolved "https://registry.yarnpkg.com/di/-/di-0.0.1.tgz#806649326ceaa7caa3306d75d985ea2748ba913c" - integrity sha1-gGZJMmzqp8qjMG112YXqJ0i6kTw= - -diff@^4.0.1: - version "4.0.2" - resolved "https://registry.yarnpkg.com/diff/-/diff-4.0.2.tgz#60f3aecb89d5fae520c11aa19efc2bb982aade7d" - integrity sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A== - -dijkstrajs@^1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/dijkstrajs/-/dijkstrajs-1.0.2.tgz#2e48c0d3b825462afe75ab4ad5e829c8ece36257" - integrity sha512-QV6PMaHTCNmKSeP6QoXhVTw9snc9VD8MulTT0Bd99Pacp4SS1cjcrYPgBPmibqKVtMJJfqC6XvOXgPMEEPH/fg== - -dir-glob@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/dir-glob/-/dir-glob-3.0.1.tgz#56dbf73d992a4a93ba1584f4534063fd2e41717f" - integrity sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA== - dependencies: - path-type "^4.0.0" - -dns-equal@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/dns-equal/-/dns-equal-1.0.0.tgz#b39e7f1da6eb0a75ba9c17324b34753c47e0654d" - integrity sha1-s55/HabrCnW6nBcySzR1PEfgZU0= - -dns-packet@^1.3.1: - version "1.3.4" - resolved "https://registry.yarnpkg.com/dns-packet/-/dns-packet-1.3.4.tgz#e3455065824a2507ba886c55a89963bb107dec6f" - integrity sha512-BQ6F4vycLXBvdrJZ6S3gZewt6rcrks9KBgM9vrhW+knGRqc8uEdT7fuCwloc7nny5xNoMJ17HGH0R/6fpo8ECA== - dependencies: - ip "^1.1.0" - safe-buffer "^5.0.1" - -dns-txt@^2.0.2: - version "2.0.2" - resolved "https://registry.yarnpkg.com/dns-txt/-/dns-txt-2.0.2.tgz#b91d806f5d27188e4ab3e7d107d881a1cc4642b6" - integrity sha1-uR2Ab10nGI5Ks+fRB9iBocxGQrY= - dependencies: - buffer-indexof "^1.0.0" - -dom-serialize@^2.2.1: - version "2.2.1" - resolved "https://registry.yarnpkg.com/dom-serialize/-/dom-serialize-2.2.1.tgz#562ae8999f44be5ea3076f5419dcd59eb43ac95b" - integrity sha1-ViromZ9Evl6jB29UGdzVnrQ6yVs= - dependencies: - custom-event "~1.0.0" - ent "~2.2.0" - extend "^3.0.0" - void-elements "^2.0.0" - -dom-serializer@^1.0.1: - version "1.3.2" - resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-1.3.2.tgz#6206437d32ceefaec7161803230c7a20bc1b4d91" - integrity sha512-5c54Bk5Dw4qAxNOI1pFEizPSjVsx5+bpJKmL2kPn8JhBUq2q09tTCa3mjijun2NfK78NMouDYNMBkOrPZiS+ig== - dependencies: - domelementtype "^2.0.1" - domhandler "^4.2.0" - entities "^2.0.0" - -domelementtype@^2.0.1, domelementtype@^2.2.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-2.2.0.tgz#9a0b6c2782ed6a1c7323d42267183df9bd8b1d57" - integrity sha512-DtBMo82pv1dFtUmHyr48beiuq792Sxohr+8Hm9zoxklYPfa6n0Z3Byjj2IV7bmr2IyqClnqEQhfgHJJ5QF0R5A== - -domhandler@^4.2.0: - version "4.2.2" - resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-4.2.2.tgz#e825d721d19a86b8c201a35264e226c678ee755f" - integrity sha512-PzE9aBMsdZO8TK4BnuJwH0QT41wgMbRzuZrHUcpYncEjmQazq8QEaBWgLG7ZyC/DAZKEgglpIA6j4Qn/HmxS3w== - dependencies: - domelementtype "^2.2.0" - -domutils@^2.6.0: - version "2.8.0" - resolved "https://registry.yarnpkg.com/domutils/-/domutils-2.8.0.tgz#4437def5db6e2d1f5d6ee859bd95ca7d02048135" - integrity sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A== - dependencies: - dom-serializer "^1.0.1" - domelementtype "^2.2.0" - domhandler "^4.2.0" - -ecc-jsbn@~0.1.1: - version "0.1.2" - resolved "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz#3a83a904e54353287874c564b7549386849a98c9" - integrity sha1-OoOpBOVDUyh4dMVkt1SThoSamMk= - dependencies: - jsbn "~0.1.0" - safer-buffer "^2.1.0" - -ee-first@1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d" - integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0= - -electron-to-chromium@^1.3.811: - version "1.3.823" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.823.tgz#ebcc606e6e0c08f92e553276711dc30a7ea43c02" - integrity sha512-jbwqBmqo9ZBWNfz6EKDTx66rqRDt87ZbOxtUegYNpkVMX6z93PMaFbDy7/LIPRwMI/5T4GVcYkROWDPQm9Ni7A== - -emoji-regex@^7.0.1: - version "7.0.3" - resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-7.0.3.tgz#933a04052860c85e83c122479c4748a8e4c72156" - integrity sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA== - -emoji-regex@^8.0.0: - version "8.0.0" - resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37" - integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A== - -emojis-list@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-3.0.0.tgz#5570662046ad29e2e916e71aae260abdff4f6a78" - integrity sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q== - -encodeurl@~1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59" - integrity sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k= - -encoding@^0.1.12: - version "0.1.13" - resolved "https://registry.yarnpkg.com/encoding/-/encoding-0.1.13.tgz#56574afdd791f54a8e9b2785c0582a2d26210fa9" - integrity sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A== - dependencies: - iconv-lite "^0.6.2" - -end-of-stream@^1.1.0, end-of-stream@^1.4.1: - version "1.4.4" - resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.4.tgz#5ae64a5f45057baf3626ec14da0ca5e4b2431eb0" - integrity sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q== - dependencies: - once "^1.4.0" - -engine.io-parser@~4.0.0: - version "4.0.3" - resolved "https://registry.yarnpkg.com/engine.io-parser/-/engine.io-parser-4.0.3.tgz#83d3a17acfd4226f19e721bb22a1ee8f7662d2f6" - integrity sha512-xEAAY0msNnESNPc00e19y5heTPX4y/TJ36gr8t1voOaNmTojP9b3oK3BbJLFufW2XFPQaaijpFewm2g2Um3uqA== - dependencies: - base64-arraybuffer "0.1.4" - -engine.io@~4.1.0: - version "4.1.1" - resolved "https://registry.yarnpkg.com/engine.io/-/engine.io-4.1.1.tgz#9a8f8a5ac5a5ea316183c489bf7f5b6cf91ace5b" - integrity sha512-t2E9wLlssQjGw0nluF6aYyfX8LwYU8Jj0xct+pAhfWfv/YrBn6TSNtEYsgxHIfaMqfrLx07czcMg9bMN6di+3w== - dependencies: - accepts "~1.3.4" - base64id "2.0.0" - cookie "~0.4.1" - cors "~2.8.5" - debug "~4.3.1" - engine.io-parser "~4.0.0" - ws "~7.4.2" - -enhanced-resolve@^5.8.0: - version "5.8.2" - resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.8.2.tgz#15ddc779345cbb73e97c611cd00c01c1e7bf4d8b" - integrity sha512-F27oB3WuHDzvR2DOGNTaYy0D5o0cnrv8TeI482VM4kYgQd/FT9lUQwuNsJ0oOHtBUq7eiW5ytqzp7nBFknL+GA== - dependencies: - graceful-fs "^4.2.4" - tapable "^2.2.0" - -enquirer@^2.3.6: - version "2.3.6" - resolved "https://registry.yarnpkg.com/enquirer/-/enquirer-2.3.6.tgz#2a7fe5dd634a1e4125a975ec994ff5456dc3734d" - integrity sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg== - dependencies: - ansi-colors "^4.1.1" - -ent@~2.2.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/ent/-/ent-2.2.0.tgz#e964219325a21d05f44466a2f686ed6ce5f5dd1d" - integrity sha1-6WQhkyWiHQX0RGai9obtbOX13R0= - -entities@^2.0.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/entities/-/entities-2.2.0.tgz#098dc90ebb83d8dffa089d55256b351d34c4da55" - integrity sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A== - -env-paths@^2.2.0: - version "2.2.1" - resolved "https://registry.yarnpkg.com/env-paths/-/env-paths-2.2.1.tgz#420399d416ce1fbe9bc0a07c62fa68d67fd0f8f2" - integrity sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A== - -err-code@^2.0.2: - version "2.0.3" - resolved "https://registry.yarnpkg.com/err-code/-/err-code-2.0.3.tgz#23c2f3b756ffdfc608d30e27c9a941024807e7f9" - integrity sha512-2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA== - -errno@^0.1.1, errno@^0.1.3: - version "0.1.8" - resolved "https://registry.yarnpkg.com/errno/-/errno-0.1.8.tgz#8bb3e9c7d463be4976ff888f76b4809ebc2e811f" - integrity sha512-dJ6oBr5SQ1VSd9qkk7ByRgb/1SH4JZjCHSW/mr63/QcXO9zLVxvJ6Oy13nio03rxpSnVDDjFor75SjVeZWPW/A== - dependencies: - prr "~1.0.1" - -error-ex@^1.3.1: - version "1.3.2" - resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.2.tgz#b4ac40648107fdcdcfae242f428bea8a14d4f1bf" - integrity sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g== - dependencies: - is-arrayish "^0.2.1" - -es-module-lexer@^0.7.1: - version "0.7.1" - resolved "https://registry.yarnpkg.com/es-module-lexer/-/es-module-lexer-0.7.1.tgz#c2c8e0f46f2df06274cdaf0dd3f3b33e0a0b267d" - integrity sha512-MgtWFl5No+4S3TmhDmCz2ObFGm6lEpTnzbQi+Dd+pw4mlTIZTmM2iAs5gRlmx5zS9luzobCSBSI90JM/1/JgOw== - -esbuild@0.12.17: - version "0.12.17" - resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.12.17.tgz#5816f905c2905de0ebbc658860df7b5b48afbcd3" - integrity sha512-GshKJyVYUnlSXIZj/NheC2O0Kblh42CS7P1wJyTbbIHevTG4jYMS9NNw8EOd8dDWD0dzydYHS01MpZoUcQXB4g== - -escalade@^3.1.1: - version "3.1.1" - resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz#d8cfdc7000965c5a0174b4a82eaa5c0552742e40" - integrity sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw== - -escape-html@~1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988" - integrity sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg= - -escape-string-regexp@^1.0.5: - version "1.0.5" - resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4" - integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ= - -eslint-scope@5.1.1: - version "5.1.1" - resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.1.tgz#e786e59a66cb92b3f6c1fb0d508aab174848f48c" - integrity sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw== - dependencies: - esrecurse "^4.3.0" - estraverse "^4.1.1" - -esrecurse@^4.3.0: - version "4.3.0" - resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.3.0.tgz#7ad7964d679abb28bee72cec63758b1c5d2c9921" - integrity sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag== - dependencies: - estraverse "^5.2.0" - -estraverse@^4.1.1: - version "4.3.0" - resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.3.0.tgz#398ad3f3c5a24948be7725e83d11a7de28cdbd1d" - integrity sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw== - -estraverse@^5.2.0: - version "5.2.0" - resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.2.0.tgz#307df42547e6cc7324d3cf03c155d5cdb8c53880" - integrity sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ== - -esutils@^2.0.2: - version "2.0.3" - resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64" - integrity sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g== - -etag@~1.8.1: - version "1.8.1" - resolved "https://registry.yarnpkg.com/etag/-/etag-1.8.1.tgz#41ae2eeb65efa62268aebfea83ac7d79299b0887" - integrity sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc= - -eventemitter-asyncresource@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/eventemitter-asyncresource/-/eventemitter-asyncresource-1.0.0.tgz#734ff2e44bf448e627f7748f905d6bdd57bdb65b" - integrity sha512-39F7TBIV0G7gTelxwbEqnwhp90eqCPON1k0NwNfwhgKn4Co4ybUbj2pECcXT0B3ztRKZ7Pw1JujUUgmQJHcVAQ== - -eventemitter2@^6.4.3: - version "6.4.4" - resolved "https://registry.yarnpkg.com/eventemitter2/-/eventemitter2-6.4.4.tgz#aa96e8275c4dbeb017a5d0e03780c65612a1202b" - integrity sha512-HLU3NDY6wARrLCEwyGKRBvuWYyvW6mHYv72SJJAH3iJN3a6eVUvkjFkcxah1bcTgGVBBrFdIopBJPhCQFMLyXw== - -eventemitter3@^4.0.0: - version "4.0.7" - resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-4.0.7.tgz#2de9b68f6528d5644ef5c59526a1b4a07306169f" - integrity sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw== - -events@^3.2.0: - version "3.3.0" - resolved "https://registry.yarnpkg.com/events/-/events-3.3.0.tgz#31a95ad0a924e2d2c419a813aeb2c4e878ea7400" - integrity sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q== - -eventsource@^1.0.7: - version "1.1.0" - resolved "https://registry.yarnpkg.com/eventsource/-/eventsource-1.1.0.tgz#00e8ca7c92109e94b0ddf32dac677d841028cfaf" - integrity sha512-VSJjT5oCNrFvCS6igjzPAt5hBzQ2qPBFIbJ03zLI9SE0mxwZpMw6BfJrbFHm1a141AavMEB8JHmBhWAd66PfCg== - dependencies: - original "^1.0.0" - -execa@4.1.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/execa/-/execa-4.1.0.tgz#4e5491ad1572f2f17a77d388c6c857135b22847a" - integrity sha512-j5W0//W7f8UxAn8hXVnwG8tLwdiUy4FJLcSupCg6maBYZDpyBvTApK7KyuI4bKj8KOh1r2YH+6ucuYtJv1bTZA== - dependencies: - cross-spawn "^7.0.0" - get-stream "^5.0.0" - human-signals "^1.1.1" - is-stream "^2.0.0" - merge-stream "^2.0.0" - npm-run-path "^4.0.0" - onetime "^5.1.0" - signal-exit "^3.0.2" - strip-final-newline "^2.0.0" - -execa@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/execa/-/execa-1.0.0.tgz#c6236a5bb4df6d6f15e88e7f017798216749ddd8" - integrity sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA== - dependencies: - cross-spawn "^6.0.0" - get-stream "^4.0.0" - is-stream "^1.1.0" - npm-run-path "^2.0.0" - p-finally "^1.0.0" - signal-exit "^3.0.0" - strip-eof "^1.0.0" - -executable@^4.1.1: - version "4.1.1" - resolved "https://registry.yarnpkg.com/executable/-/executable-4.1.1.tgz#41532bff361d3e57af4d763b70582db18f5d133c" - integrity sha512-8iA79xD3uAch729dUG8xaaBBFGaEa0wdD2VkYLFHwlqosEj/jT66AzcreRDSgV7ehnNLBW2WR5jIXwGKjVdTLg== - dependencies: - pify "^2.2.0" - -expand-brackets@^2.1.4: - version "2.1.4" - resolved "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-2.1.4.tgz#b77735e315ce30f6b6eff0f83b04151a22449622" - integrity sha1-t3c14xXOMPa27/D4OwQVGiJEliI= - dependencies: - debug "^2.3.3" - define-property "^0.2.5" - extend-shallow "^2.0.1" - posix-character-classes "^0.1.0" - regex-not "^1.0.0" - snapdragon "^0.8.1" - to-regex "^3.0.1" - -express@^4.17.1: - version "4.17.1" - resolved "https://registry.yarnpkg.com/express/-/express-4.17.1.tgz#4491fc38605cf51f8629d39c2b5d026f98a4c134" - integrity sha512-mHJ9O79RqluphRrcw2X/GTh3k9tVv8YcoyY4Kkh4WDMUYKRZUq0h1o0w2rrrxBqM7VoeUVqgb27xlEMXTnYt4g== - dependencies: - accepts "~1.3.7" - array-flatten "1.1.1" - body-parser "1.19.0" - content-disposition "0.5.3" - content-type "~1.0.4" - cookie "0.4.0" - cookie-signature "1.0.6" - debug "2.6.9" - depd "~1.1.2" - encodeurl "~1.0.2" - escape-html "~1.0.3" - etag "~1.8.1" - finalhandler "~1.1.2" - fresh "0.5.2" - merge-descriptors "1.0.1" - methods "~1.1.2" - on-finished "~2.3.0" - parseurl "~1.3.3" - path-to-regexp "0.1.7" - proxy-addr "~2.0.5" - qs "6.7.0" - range-parser "~1.2.1" - safe-buffer "5.1.2" - send "0.17.1" - serve-static "1.14.1" - setprototypeof "1.1.1" - statuses "~1.5.0" - type-is "~1.6.18" - utils-merge "1.0.1" - vary "~1.1.2" - -extend-shallow@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-2.0.1.tgz#51af7d614ad9a9f610ea1bafbb989d6b1c56890f" - integrity sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8= - dependencies: - is-extendable "^0.1.0" - -extend-shallow@^3.0.0, extend-shallow@^3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-3.0.2.tgz#26a71aaf073b39fb2127172746131c2704028db8" - integrity sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg= - dependencies: - assign-symbols "^1.0.0" - is-extendable "^1.0.1" - -extend@^3.0.0, extend@~3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa" - integrity sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g== - -external-editor@^3.0.3: - version "3.1.0" - resolved "https://registry.yarnpkg.com/external-editor/-/external-editor-3.1.0.tgz#cb03f740befae03ea4d283caed2741a83f335495" - integrity sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew== - dependencies: - chardet "^0.7.0" - iconv-lite "^0.4.24" - tmp "^0.0.33" - -extglob@^2.0.4: - version "2.0.4" - resolved "https://registry.yarnpkg.com/extglob/-/extglob-2.0.4.tgz#ad00fe4dc612a9232e8718711dc5cb5ab0285543" - integrity sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw== - dependencies: - array-unique "^0.3.2" - define-property "^1.0.0" - expand-brackets "^2.1.4" - extend-shallow "^2.0.1" - fragment-cache "^0.2.1" - regex-not "^1.0.0" - snapdragon "^0.8.1" - to-regex "^3.0.1" - -extract-zip@2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/extract-zip/-/extract-zip-2.0.1.tgz#663dca56fe46df890d5f131ef4a06d22bb8ba13a" - integrity sha512-GDhU9ntwuKyGXdZBUgTIe+vXnWj0fppUEtMDL0+idd5Sta8TGpHssn/eusA9mrPr9qNDym6SxAYZjNvCn/9RBg== - dependencies: - debug "^4.1.1" - get-stream "^5.1.0" - yauzl "^2.10.0" - optionalDependencies: - "@types/yauzl" "^2.9.1" - -extsprintf@1.3.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.3.0.tgz#96918440e3041a7a414f8c52e3c574eb3c3e1e05" - integrity sha1-lpGEQOMEGnpBT4xS48V06zw+HgU= - -extsprintf@^1.2.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.0.tgz#e2689f8f356fad62cca65a3a91c5df5f9551692f" - integrity sha1-4mifjzVvrWLMplo6kcXfX5VRaS8= - -fast-deep-equal@^3.1.1: - version "3.1.3" - resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525" - integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q== - -fast-glob@^3.1.1, fast-glob@^3.2.5, fast-glob@^3.2.7: - version "3.2.7" - resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.7.tgz#fd6cb7a2d7e9aa7a7846111e85a196d6b2f766a1" - integrity sha512-rYGMRwip6lUMvYD3BTScMwT1HtAs2d71SMv66Vrxs0IekGZEjhM0pcMfjQPnknBt2zeCwQMEupiN02ZP4DiT1Q== - dependencies: - "@nodelib/fs.stat" "^2.0.2" - "@nodelib/fs.walk" "^1.2.3" - glob-parent "^5.1.2" - merge2 "^1.3.0" - micromatch "^4.0.4" - -fast-json-stable-stringify@2.1.0, fast-json-stable-stringify@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633" - integrity sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw== - -fastq@^1.6.0: - version "1.12.0" - resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.12.0.tgz#ed7b6ab5d62393fb2cc591c853652a5c318bf794" - integrity sha512-VNX0QkHK3RsXVKr9KrlUv/FoTa0NdbYoHHl7uXHv2rzyHSlxjdNAKug2twd9luJxpcyNeAgf5iPPMutJO67Dfg== - dependencies: - reusify "^1.0.4" - -faye-websocket@^0.11.3: - version "0.11.4" - resolved "https://registry.yarnpkg.com/faye-websocket/-/faye-websocket-0.11.4.tgz#7f0d9275cfdd86a1c963dc8b65fcc451edcbb1da" - integrity sha512-CzbClwlXAuiRQAlUyfqPgvPoNKTckTPGfwZV4ZdAhVcP2lh9KUxJg2b5GkE7XbjKQ3YJnQ9z6D9ntLAlB+tP8g== - dependencies: - websocket-driver ">=0.5.1" - -fd-slicer@~1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/fd-slicer/-/fd-slicer-1.1.0.tgz#25c7c89cb1f9077f8891bbe61d8f390eae256f1e" - integrity sha1-JcfInLH5B3+IkbvmHY85Dq4lbx4= - dependencies: - pend "~1.2.0" - -figures@^3.0.0, figures@^3.2.0: - version "3.2.0" - resolved "https://registry.yarnpkg.com/figures/-/figures-3.2.0.tgz#625c18bd293c604dc4a8ddb2febf0c88341746af" - integrity sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg== - dependencies: - escape-string-regexp "^1.0.5" - -file-uri-to-path@1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz#553a7b8446ff6f684359c445f1e37a05dacc33dd" - integrity sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw== - -fill-range@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-4.0.0.tgz#d544811d428f98eb06a63dc402d2403c328c38f7" - integrity sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc= - dependencies: - extend-shallow "^2.0.1" - is-number "^3.0.0" - repeat-string "^1.6.1" - to-regex-range "^2.1.0" - -fill-range@^7.0.1: - version "7.0.1" - resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40" - integrity sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ== - dependencies: - to-regex-range "^5.0.1" - -finalhandler@1.1.2, finalhandler@~1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.1.2.tgz#b7e7d000ffd11938d0fdb053506f6ebabe9f587d" - integrity sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA== - dependencies: - debug "2.6.9" - encodeurl "~1.0.2" - escape-html "~1.0.3" - on-finished "~2.3.0" - parseurl "~1.3.3" - statuses "~1.5.0" - unpipe "~1.0.0" - -find-cache-dir@3.3.1: - version "3.3.1" - resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-3.3.1.tgz#89b33fad4a4670daa94f855f7fbe31d6d84fe880" - integrity sha512-t2GDMt3oGC/v+BMwzmllWDuJF/xcDtE5j/fCGbqDD7OLuJkj0cfh1YSA5VKPvwMeLFLNDBkwOKZ2X85jGLVftQ== - dependencies: - commondir "^1.0.1" - make-dir "^3.0.2" - pkg-dir "^4.1.0" - -find-cache-dir@^3.3.1: - version "3.3.2" - resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-3.3.2.tgz#b30c5b6eff0730731aea9bbd9dbecbd80256d64b" - integrity sha512-wXZV5emFEjrridIgED11OoUKLxiYjAcqot/NJdAkOhlJ+vGzwhOAfcG5OX1jP+S0PcjEn8bdMJv+g2jwQ3Onig== - dependencies: - commondir "^1.0.1" - make-dir "^3.0.2" - pkg-dir "^4.1.0" - -find-up@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/find-up/-/find-up-3.0.0.tgz#49169f1d7993430646da61ecc5ae355c21c97b73" - integrity sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg== - dependencies: - locate-path "^3.0.0" - -find-up@^4.0.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/find-up/-/find-up-4.1.0.tgz#97afe7d6cdc0bc5928584b7c8d7b16e8a9aa5d19" - integrity sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw== - dependencies: - locate-path "^5.0.0" - path-exists "^4.0.0" - -flatted@^2.0.1: - version "2.0.2" - resolved "https://registry.yarnpkg.com/flatted/-/flatted-2.0.2.tgz#4575b21e2bcee7434aa9be662f4b7b5f9c2b5138" - integrity sha512-r5wGx7YeOwNWNlCA0wQ86zKyDLMQr+/RB8xy74M4hTphfmjlijTSSXGuH8rnvKZnfT9i+75zmd8jcKdMR4O6jA== - -flatten@^1.0.2: - version "1.0.3" - resolved "https://registry.yarnpkg.com/flatten/-/flatten-1.0.3.tgz#c1283ac9f27b368abc1e36d1ff7b04501a30356b" - integrity sha512-dVsPA/UwQ8+2uoFe5GHtiBMu48dWLTdsuEd7CKGlZlD78r1TTWBvDuFaFGKCo/ZfEr95Uk56vZoX86OsHkUeIg== - -follow-redirects@^1.0.0: - version "1.14.2" - resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.2.tgz#cecb825047c00f5e66b142f90fed4f515dec789b" - integrity sha512-yLR6WaE2lbF0x4K2qE2p9PEXKLDjUjnR/xmjS3wHAYxtlsI9MLLBJUZirAHKzUZDGLxje7w/cXR49WOUo4rbsA== - -font-awesome@4.7.0: - version "4.7.0" - resolved "https://registry.yarnpkg.com/font-awesome/-/font-awesome-4.7.0.tgz#8fa8cf0411a1a31afd07b06d2902bb9fc815a133" - integrity sha1-j6jPBBGhoxr9B7BtKQK7n8gVoTM= - -for-in@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80" - integrity sha1-gQaNKVqBQuwKxybG4iAMMPttXoA= - -forever-agent@~0.6.1: - version "0.6.1" - resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91" - integrity sha1-+8cfDEGt6zf5bFd60e1C2P2sypE= - -form-data@~2.3.2: - version "2.3.3" - resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.3.tgz#dcce52c05f644f298c6a7ab936bd724ceffbf3a6" - integrity sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ== - dependencies: - asynckit "^0.4.0" - combined-stream "^1.0.6" - mime-types "^2.1.12" - -forwarded@0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/forwarded/-/forwarded-0.2.0.tgz#2269936428aad4c15c7ebe9779a84bf0b2a81811" - integrity sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow== - -fragment-cache@^0.2.1: - version "0.2.1" - resolved "https://registry.yarnpkg.com/fragment-cache/-/fragment-cache-0.2.1.tgz#4290fad27f13e89be7f33799c6bc5a0abfff0d19" - integrity sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk= - dependencies: - map-cache "^0.2.2" - -fresh@0.5.2: - version "0.5.2" - resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.2.tgz#3d8cadd90d976569fa835ab1f8e4b23a105605a7" - integrity sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac= - -fs-constants@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/fs-constants/-/fs-constants-1.0.0.tgz#6be0de9be998ce16af8afc24497b9ee9b7ccd9ad" - integrity sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow== - -fs-extra@^8.1.0: - version "8.1.0" - resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-8.1.0.tgz#49d43c45a88cd9677668cb7be1b46efdb8d2e1c0" - integrity sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g== - dependencies: - graceful-fs "^4.2.0" - jsonfile "^4.0.0" - universalify "^0.1.0" - -fs-extra@^9.1.0: - version "9.1.0" - resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-9.1.0.tgz#5954460c764a8da2094ba3554bf839e6b9a7c86d" - integrity sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ== - dependencies: - at-least-node "^1.0.0" - graceful-fs "^4.2.0" - jsonfile "^6.0.1" - universalify "^2.0.0" - -fs-minipass@^2.0.0, fs-minipass@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-2.1.0.tgz#7f5036fdbf12c63c169190cbe4199c852271f9fb" - integrity sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg== - dependencies: - minipass "^3.0.0" - -fs-monkey@1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/fs-monkey/-/fs-monkey-1.0.3.tgz#ae3ac92d53bb328efe0e9a1d9541f6ad8d48e2d3" - integrity sha512-cybjIfiiE+pTWicSCLFHSrXZ6EilF30oh91FDP9S2B051prEa7QWfrVTQm10/dDpswBDXZugPa1Ogu8Yh+HV0Q== - -fs.realpath@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f" - integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8= - -fsevents@^1.2.7: - version "1.2.13" - resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.13.tgz#f325cb0455592428bcf11b383370ef70e3bfcc38" - integrity sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw== - dependencies: - bindings "^1.5.0" - nan "^2.12.1" - -fsevents@~2.3.2: - version "2.3.2" - resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.2.tgz#8a526f78b8fdf4623b709e0b975c52c24c02fd1a" - integrity sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA== - -function-bind@^1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d" - integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A== - -gauge@~2.7.3: - version "2.7.4" - resolved "https://registry.yarnpkg.com/gauge/-/gauge-2.7.4.tgz#2c03405c7538c39d7eb37b317022e325fb018bf7" - integrity sha1-LANAXHU4w51+s3sxcCLjJfsBi/c= - dependencies: - aproba "^1.0.3" - console-control-strings "^1.0.0" - has-unicode "^2.0.0" - object-assign "^4.1.0" - signal-exit "^3.0.0" - string-width "^1.0.1" - strip-ansi "^3.0.1" - wide-align "^1.1.0" - -gensync@^1.0.0-beta.1, gensync@^1.0.0-beta.2: - version "1.0.0-beta.2" - resolved "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.2.tgz#32a6ee76c3d7f52d46b2b1ae5d93fea8580a25e0" - integrity sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg== - -get-caller-file@^2.0.1, get-caller-file@^2.0.5: - version "2.0.5" - resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e" - integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg== - -get-intrinsic@^1.0.2: - version "1.1.1" - resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.1.1.tgz#15f59f376f855c446963948f0d24cd3637b4abc6" - integrity sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q== - dependencies: - function-bind "^1.1.1" - has "^1.0.3" - has-symbols "^1.0.1" - -get-stream@^4.0.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-4.1.0.tgz#c1b255575f3dc21d59bfc79cd3d2b46b1c3a54b5" - integrity sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w== - dependencies: - pump "^3.0.0" - -get-stream@^5.0.0, get-stream@^5.1.0: - version "5.2.0" - resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-5.2.0.tgz#4966a1795ee5ace65e706c4b7beb71257d6e22d3" - integrity sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA== - dependencies: - pump "^3.0.0" - -get-value@^2.0.3, get-value@^2.0.6: - version "2.0.6" - resolved "https://registry.yarnpkg.com/get-value/-/get-value-2.0.6.tgz#dc15ca1c672387ca76bd37ac0a395ba2042a2c28" - integrity sha1-3BXKHGcjh8p2vTesCjlbogQqLCg= - -getos@^3.2.1: - version "3.2.1" - resolved "https://registry.yarnpkg.com/getos/-/getos-3.2.1.tgz#0134d1f4e00eb46144c5a9c0ac4dc087cbb27dc5" - integrity sha512-U56CfOK17OKgTVqozZjUKNdkfEv6jk5WISBJ8SHoagjE6L69zOwl3Z+O8myjY9MEW3i2HPWQBt/LTbCgcC973Q== - dependencies: - async "^3.2.0" - -getpass@^0.1.1: - version "0.1.7" - resolved "https://registry.yarnpkg.com/getpass/-/getpass-0.1.7.tgz#5eff8e3e684d569ae4cb2b1282604e8ba62149fa" - integrity sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo= - dependencies: - assert-plus "^1.0.0" - -glob-parent@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-3.1.0.tgz#9e6af6299d8d3bd2bd40430832bd113df906c5ae" - integrity sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4= - dependencies: - is-glob "^3.1.0" - path-dirname "^1.0.0" - -glob-parent@^5.1.2, glob-parent@~5.1.2: - version "5.1.2" - resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4" - integrity sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow== - dependencies: - is-glob "^4.0.1" - -glob-parent@^6.0.0: - version "6.0.1" - resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-6.0.1.tgz#42054f685eb6a44e7a7d189a96efa40a54971aa7" - integrity sha512-kEVjS71mQazDBHKcsq4E9u/vUzaLcw1A8EtUeydawvIWQCJM0qQ08G1H7/XTjFUulla6XQiDOG6MXSaG0HDKog== - dependencies: - is-glob "^4.0.1" - -glob-to-regexp@^0.4.1: - version "0.4.1" - resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz#c75297087c851b9a578bd217dd59a92f59fe546e" - integrity sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw== - -glob@7.1.7, glob@^7.0.3, glob@^7.0.5, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6, glob@^7.1.7: - version "7.1.7" - resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.7.tgz#3b193e9233f01d42d0b3f78294bbeeb418f94a90" - integrity sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ== - dependencies: - fs.realpath "^1.0.0" - inflight "^1.0.4" - inherits "2" - minimatch "^3.0.4" - once "^1.3.0" - path-is-absolute "^1.0.0" - -global-dirs@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/global-dirs/-/global-dirs-3.0.0.tgz#70a76fe84ea315ab37b1f5576cbde7d48ef72686" - integrity sha512-v8ho2DS5RiCjftj1nD9NmnfaOzTdud7RRnVd9kFNOjqZbISlx5DQ+OrTkywgd0dIt7oFCvKetZSHoHcP3sDdiA== - dependencies: - ini "2.0.0" - -globals@^11.1.0: - version "11.12.0" - resolved "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e" - integrity sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA== - -globby@^11.0.3: - version "11.0.4" - resolved "https://registry.yarnpkg.com/globby/-/globby-11.0.4.tgz#2cbaff77c2f2a62e71e9b2813a67b97a3a3001a5" - integrity sha512-9O4MVG9ioZJ08ffbcyVYyLOJLk5JQ688pJ4eMGLpdWLHq/Wr1D9BlriLQyL0E+jbkuePVZXYFj47QM/v093wHg== - dependencies: - array-union "^2.1.0" - dir-glob "^3.0.1" - fast-glob "^3.1.1" - ignore "^5.1.4" - merge2 "^1.3.0" - slash "^3.0.0" - -globby@^6.1.0: - version "6.1.0" - resolved "https://registry.yarnpkg.com/globby/-/globby-6.1.0.tgz#f5a6d70e8395e21c858fb0489d64df02424d506c" - integrity sha1-9abXDoOV4hyFj7BInWTfAkJNUGw= - dependencies: - array-union "^1.0.1" - glob "^7.0.3" - object-assign "^4.0.1" - pify "^2.0.0" - pinkie-promise "^2.0.0" - -graceful-fs@^4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.3, graceful-fs@^4.2.4, graceful-fs@^4.2.6: - version "4.2.8" - resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.8.tgz#e412b8d33f5e006593cbd3cee6df9f2cebbe802a" - integrity sha512-qkIilPUYcNhJpd33n0GBXTB1MMPp14TxEsEs0pTrsSVucApsYzW5V+Q8Qxhik6KU3evy+qkAAowTByymK0avdg== - -growly@^1.3.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/growly/-/growly-1.3.0.tgz#f10748cbe76af964b7c96c93c6bcc28af120c081" - integrity sha1-8QdIy+dq+WS3yWyTxrzCivEgwIE= - -handle-thing@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/handle-thing/-/handle-thing-2.0.1.tgz#857f79ce359580c340d43081cc648970d0bb234e" - integrity sha512-9Qn4yBxelxoh2Ow62nP+Ka/kMnOXRi8BXnRaUwezLNhqelnN49xKz4F/dPP8OYLxLxq6JDtZb2i9XznUQbNPTg== - -har-schema@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92" - integrity sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI= - -har-validator@~5.1.3: - version "5.1.5" - resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.1.5.tgz#1f0803b9f8cb20c0fa13822df1ecddb36bde1efd" - integrity sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w== - dependencies: - ajv "^6.12.3" - har-schema "^2.0.0" - -has-flag@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd" - integrity sha1-tdRU3CGZriJWmfNGfloH87lVuv0= - -has-flag@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b" - integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ== - -has-symbols@^1.0.1, has-symbols@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.2.tgz#165d3070c00309752a1236a479331e3ac56f1423" - integrity sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw== - -has-tostringtag@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/has-tostringtag/-/has-tostringtag-1.0.0.tgz#7e133818a7d394734f941e73c3d3f9291e658b25" - integrity sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ== - dependencies: - has-symbols "^1.0.2" - -has-unicode@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9" - integrity sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk= - -has-value@^0.3.1: - version "0.3.1" - resolved "https://registry.yarnpkg.com/has-value/-/has-value-0.3.1.tgz#7b1f58bada62ca827ec0a2078025654845995e1f" - integrity sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8= - dependencies: - get-value "^2.0.3" - has-values "^0.1.4" - isobject "^2.0.0" - -has-value@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/has-value/-/has-value-1.0.0.tgz#18b281da585b1c5c51def24c930ed29a0be6b177" - integrity sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc= - dependencies: - get-value "^2.0.6" - has-values "^1.0.0" - isobject "^3.0.0" - -has-values@^0.1.4: - version "0.1.4" - resolved "https://registry.yarnpkg.com/has-values/-/has-values-0.1.4.tgz#6d61de95d91dfca9b9a02089ad384bff8f62b771" - integrity sha1-bWHeldkd/Km5oCCJrThL/49it3E= - -has-values@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/has-values/-/has-values-1.0.0.tgz#95b0b63fec2146619a6fe57fe75628d5a39efe4f" - integrity sha1-lbC2P+whRmGab+V/51Yo1aOe/k8= - dependencies: - is-number "^3.0.0" - kind-of "^4.0.0" - -has@^1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796" - integrity sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw== - dependencies: - function-bind "^1.1.1" - -hdr-histogram-js@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/hdr-histogram-js/-/hdr-histogram-js-2.0.1.tgz#ecb1ff2bcb6181c3e93ff4af9472c28c7e97284e" - integrity sha512-uPZxl1dAFnjUFHWLZmt93vUUvtHeaBay9nVNHu38SdOjMSF/4KqJUqa1Seuj08ptU1rEb6AHvB41X8n/zFZ74Q== - dependencies: - "@assemblyscript/loader" "^0.10.1" - base64-js "^1.2.0" - pako "^1.0.3" - -hdr-histogram-percentiles-obj@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/hdr-histogram-percentiles-obj/-/hdr-histogram-percentiles-obj-3.0.0.tgz#9409f4de0c2dda78e61de2d9d78b1e9f3cba283c" - integrity sha512-7kIufnBqdsBGcSZLPJwqHT3yhk1QTsSlFsVD3kx5ixH/AlgBs9yM1q6DPhXZ8f8gtdqgh7N7/5btRLpQsS2gHw== - -hosted-git-info@^4.0.1: - version "4.0.2" - resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-4.0.2.tgz#5e425507eede4fea846b7262f0838456c4209961" - integrity sha512-c9OGXbZ3guC/xOlCg1Ci/VgWlwsqDv1yMQL1CWqXDL0hDjXuNcq0zuR4xqPSuasI3kqFDhqSyTjREz5gzq0fXg== - dependencies: - lru-cache "^6.0.0" - -hpack.js@^2.1.6: - version "2.1.6" - resolved "https://registry.yarnpkg.com/hpack.js/-/hpack.js-2.1.6.tgz#87774c0949e513f42e84575b3c45681fade2a0b2" - integrity sha1-h3dMCUnlE/QuhFdbPEVoH63ioLI= - dependencies: - inherits "^2.0.1" - obuf "^1.0.0" - readable-stream "^2.0.1" - wbuf "^1.1.0" - -html-entities@^1.3.1: - version "1.4.0" - resolved "https://registry.yarnpkg.com/html-entities/-/html-entities-1.4.0.tgz#cfbd1b01d2afaf9adca1b10ae7dffab98c71d2dc" - integrity sha512-8nxjcBcd8wovbeKx7h3wTji4e6+rhaVuPNpMqwWgnHh+N9ToqsCs6XztWRBPQ+UtzsoMAdKZtUENoVzU/EMtZA== - -html-escaper@^2.0.0: - version "2.0.2" - resolved "https://registry.yarnpkg.com/html-escaper/-/html-escaper-2.0.2.tgz#dfd60027da36a36dfcbe236262c00a5822681453" - integrity sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg== - -http-cache-semantics@^4.1.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz#49e91c5cbf36c9b94bcfcd71c23d5249ec74e390" - integrity sha512-carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ== - -http-deceiver@^1.2.7: - version "1.2.7" - resolved "https://registry.yarnpkg.com/http-deceiver/-/http-deceiver-1.2.7.tgz#fa7168944ab9a519d337cb0bec7284dc3e723d87" - integrity sha1-+nFolEq5pRnTN8sL7HKE3D5yPYc= - -http-errors@1.7.2: - version "1.7.2" - resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.7.2.tgz#4f5029cf13239f31036e5b2e55292bcfbcc85c8f" - integrity sha512-uUQBt3H/cSIVfch6i1EuPNy/YsRSOUBXTVfZ+yR7Zjez3qjBz6i9+i4zjNaoqcoFVI4lQJ5plg63TvGfRSDCRg== - dependencies: - depd "~1.1.2" - inherits "2.0.3" - setprototypeof "1.1.1" - statuses ">= 1.5.0 < 2" - toidentifier "1.0.0" - -http-errors@~1.6.2: - version "1.6.3" - resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.6.3.tgz#8b55680bb4be283a0b5bf4ea2e38580be1d9320d" - integrity sha1-i1VoC7S+KDoLW/TqLjhYC+HZMg0= - dependencies: - depd "~1.1.2" - inherits "2.0.3" - setprototypeof "1.1.0" - statuses ">= 1.4.0 < 2" - -http-errors@~1.7.2: - version "1.7.3" - resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.7.3.tgz#6c619e4f9c60308c38519498c14fbb10aacebb06" - integrity sha512-ZTTX0MWrsQ2ZAhA1cejAwDLycFsd7I7nVtnkT3Ol0aqodaKW+0CTZDQ1uBv5whptCnc8e8HeRRJxRs0kmm/Qfw== - dependencies: - depd "~1.1.2" - inherits "2.0.4" - setprototypeof "1.1.1" - statuses ">= 1.5.0 < 2" - toidentifier "1.0.0" - -http-parser-js@>=0.5.1: - version "0.5.3" - resolved "https://registry.yarnpkg.com/http-parser-js/-/http-parser-js-0.5.3.tgz#01d2709c79d41698bb01d4decc5e9da4e4a033d9" - integrity sha512-t7hjvef/5HEK7RWTdUzVUhl8zkEu+LlaE0IYzdMuvbSDipxBRpOn4Uhw8ZyECEa808iVT8XCjzo6xmYt4CiLZg== - -http-proxy-agent@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz#8a8c8ef7f5932ccf953c296ca8291b95aa74aa3a" - integrity sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg== - dependencies: - "@tootallnate/once" "1" - agent-base "6" - debug "4" - -http-proxy-middleware@0.19.1: - version "0.19.1" - resolved "https://registry.yarnpkg.com/http-proxy-middleware/-/http-proxy-middleware-0.19.1.tgz#183c7dc4aa1479150306498c210cdaf96080a43a" - integrity sha512-yHYTgWMQO8VvwNS22eLLloAkvungsKdKTLO8AJlftYIKNfJr3GK3zK0ZCfzDDGUBttdGc8xFy1mCitvNKQtC3Q== - dependencies: - http-proxy "^1.17.0" - is-glob "^4.0.0" - lodash "^4.17.11" - micromatch "^3.1.10" - -http-proxy@^1.17.0, http-proxy@^1.18.1: - version "1.18.1" - resolved "https://registry.yarnpkg.com/http-proxy/-/http-proxy-1.18.1.tgz#401541f0534884bbf95260334e72f88ee3976549" - integrity sha512-7mz/721AbnJwIVbnaSv1Cz3Am0ZLT/UBwkC92VlxhXv/k/BBQfM2fXElQNC27BVGr0uwUpplYPQM9LnaBMR5NQ== - dependencies: - eventemitter3 "^4.0.0" - follow-redirects "^1.0.0" - requires-port "^1.0.0" - -http-signature@~1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.2.0.tgz#9aecd925114772f3d95b65a60abb8f7c18fbace1" - integrity sha1-muzZJRFHcvPZW2WmCruPfBj7rOE= - dependencies: - assert-plus "^1.0.0" - jsprim "^1.2.2" - sshpk "^1.7.0" - -https-proxy-agent@5.0.0, https-proxy-agent@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz#e2a90542abb68a762e0a0850f6c9edadfd8506b2" - integrity sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA== - dependencies: - agent-base "6" - debug "4" - -human-signals@^1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-1.1.1.tgz#c5b1cd14f50aeae09ab6c59fe63ba3395fe4dfa3" - integrity sha512-SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw== - -humanize-ms@^1.2.1: - version "1.2.1" - resolved "https://registry.yarnpkg.com/humanize-ms/-/humanize-ms-1.2.1.tgz#c46e3159a293f6b896da29316d8b6fe8bb79bbed" - integrity sha1-xG4xWaKT9riW2ikxbYtv6Lt5u+0= - dependencies: - ms "^2.0.0" - -iconv-lite@0.4.24, iconv-lite@^0.4.24, iconv-lite@^0.4.4: - version "0.4.24" - resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b" - integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA== - dependencies: - safer-buffer ">= 2.1.2 < 3" - -iconv-lite@^0.6.2: - version "0.6.3" - resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.6.3.tgz#a52f80bf38da1952eb5c681790719871a1a72501" - integrity sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw== - dependencies: - safer-buffer ">= 2.1.2 < 3.0.0" - -icss-utils@^5.0.0, icss-utils@^5.1.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/icss-utils/-/icss-utils-5.1.0.tgz#c6be6858abd013d768e98366ae47e25d5887b1ae" - integrity sha512-soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA== - -ieee754@^1.1.13: - version "1.2.1" - resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.2.1.tgz#8eb7a10a63fff25d15a57b001586d177d1b0d352" - integrity sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA== - -ignore-walk@^3.0.3: - version "3.0.4" - resolved "https://registry.yarnpkg.com/ignore-walk/-/ignore-walk-3.0.4.tgz#c9a09f69b7c7b479a5d74ac1a3c0d4236d2a6335" - integrity sha512-PY6Ii8o1jMRA1z4F2hRkH/xN59ox43DavKvD3oDpfurRlOJyAHpifIwpbdv1n4jt4ov0jSpw3kQ4GhJnpBL6WQ== - dependencies: - minimatch "^3.0.4" - -ignore@^5.1.4: - version "5.1.8" - resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.1.8.tgz#f150a8b50a34289b33e22f5889abd4d8016f0e57" - integrity sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw== - -image-size@~0.5.0: - version "0.5.5" - resolved "https://registry.yarnpkg.com/image-size/-/image-size-0.5.5.tgz#09dfd4ab9d20e29eb1c3e80b8990378df9e3cb9c" - integrity sha1-Cd/Uq50g4p6xw+gLiZA3jfnjy5w= - -import-fresh@^3.2.1: - version "3.3.0" - resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.3.0.tgz#37162c25fcb9ebaa2e6e53d5b4d88ce17d9e0c2b" - integrity sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw== - dependencies: - parent-module "^1.0.0" - resolve-from "^4.0.0" - -import-local@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/import-local/-/import-local-2.0.0.tgz#55070be38a5993cf18ef6db7e961f5bee5c5a09d" - integrity sha512-b6s04m3O+s3CGSbqDIyP4R6aAwAeYlVq9+WUWep6iHa8ETRf9yei1U48C5MmfJmV9AiLYYBKPMq/W+/WRpQmCQ== - dependencies: - pkg-dir "^3.0.0" - resolve-cwd "^2.0.0" - -imurmurhash@^0.1.4: - version "0.1.4" - resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea" - integrity sha1-khi5srkoojixPcT7a21XbyMUU+o= - -indent-string@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-4.0.0.tgz#624f8f4497d619b2d9768531d58f4122854d7251" - integrity sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg== - -indexes-of@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/indexes-of/-/indexes-of-1.0.1.tgz#f30f716c8e2bd346c7b67d3df3915566a7c05607" - integrity sha1-8w9xbI4r00bHtn0985FVZqfAVgc= - -infer-owner@^1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/infer-owner/-/infer-owner-1.0.4.tgz#c4cefcaa8e51051c2a40ba2ce8a3d27295af9467" - integrity sha512-IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A== - -inflight@^1.0.4: - version "1.0.6" - resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9" - integrity sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk= - dependencies: - once "^1.3.0" - wrappy "1" - -inherits@2, inherits@2.0.4, inherits@^2.0.1, inherits@^2.0.3, inherits@^2.0.4, inherits@~2.0.3: - version "2.0.4" - resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c" - integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ== - -inherits@2.0.3: - version "2.0.3" - resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de" - integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4= - -ini@2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/ini/-/ini-2.0.0.tgz#e5fd556ecdd5726be978fa1001862eacb0a94bc5" - integrity sha512-7PnF4oN3CvZF23ADhA5wRaYEQpJ8qygSkbtTXWBeXWXmEVRXK+1ITciHWwHhsjv1TmW0MgacIv6hEi5pX5NQdA== - -inquirer@8.1.2: - version "8.1.2" - resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-8.1.2.tgz#65b204d2cd7fb63400edd925dfe428bafd422e3d" - integrity sha512-DHLKJwLPNgkfwNmsuEUKSejJFbkv0FMO9SMiQbjI3n5NQuCrSIBqP66ggqyz2a6t2qEolKrMjhQ3+W/xXgUQ+Q== - dependencies: - ansi-escapes "^4.2.1" - chalk "^4.1.1" - cli-cursor "^3.1.0" - cli-width "^3.0.0" - external-editor "^3.0.3" - figures "^3.0.0" - lodash "^4.17.21" - mute-stream "0.0.8" - ora "^5.3.0" - run-async "^2.4.0" - rxjs "^7.2.0" - string-width "^4.1.0" - strip-ansi "^6.0.0" - through "^2.3.6" - -internal-ip@^4.3.0: - version "4.3.0" - resolved "https://registry.yarnpkg.com/internal-ip/-/internal-ip-4.3.0.tgz#845452baad9d2ca3b69c635a137acb9a0dad0907" - integrity sha512-S1zBo1D6zcsyuC6PMmY5+55YMILQ9av8lotMx447Bq6SAgo/sDK6y6uUKmuYhW7eacnIhFfsPmCNYdDzsnnDCg== - dependencies: - default-gateway "^4.2.0" - ipaddr.js "^1.9.0" - -ip-regex@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/ip-regex/-/ip-regex-2.1.0.tgz#fa78bf5d2e6913c911ce9f819ee5146bb6d844e9" - integrity sha1-+ni/XS5pE8kRzp+BnuUUa7bYROk= - -ip@^1.1.0, ip@^1.1.5: - version "1.1.5" - resolved "https://registry.yarnpkg.com/ip/-/ip-1.1.5.tgz#bdded70114290828c0a039e72ef25f5aaec4354a" - integrity sha1-vd7XARQpCCjAoDnnLvJfWq7ENUo= - -ipaddr.js@1.9.1, ipaddr.js@^1.9.0: - version "1.9.1" - resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.9.1.tgz#bff38543eeb8984825079ff3a2a8e6cbd46781b3" - integrity sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g== - -is-absolute-url@^3.0.3: - version "3.0.3" - resolved "https://registry.yarnpkg.com/is-absolute-url/-/is-absolute-url-3.0.3.tgz#96c6a22b6a23929b11ea0afb1836c36ad4a5d698" - integrity sha512-opmNIX7uFnS96NtPmhWQgQx6/NYFgsUXYMllcfzwWKUMwfo8kku1TvE6hkNcH+Q1ts5cMVrsY7j0bxXQDciu9Q== - -is-accessor-descriptor@^0.1.6: - version "0.1.6" - resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz#a9e12cb3ae8d876727eeef3843f8a0897b5c98d6" - integrity sha1-qeEss66Nh2cn7u84Q/igiXtcmNY= - dependencies: - kind-of "^3.0.2" - -is-accessor-descriptor@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz#169c2f6d3df1f992618072365c9b0ea1f6878656" - integrity sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ== - dependencies: - kind-of "^6.0.0" - -is-arguments@^1.0.4: - version "1.1.1" - resolved "https://registry.yarnpkg.com/is-arguments/-/is-arguments-1.1.1.tgz#15b3f88fda01f2a97fec84ca761a560f123efa9b" - integrity sha512-8Q7EARjzEnKpt/PCD7e1cgUS0a6X8u5tdSiMqXhojOdoV9TsMsiO+9VLC5vAmO8N7/GmXn7yjR8qnA6bVAEzfA== - dependencies: - call-bind "^1.0.2" - has-tostringtag "^1.0.0" - -is-arrayish@^0.2.1: - version "0.2.1" - resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d" - integrity sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0= - -is-binary-path@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-1.0.1.tgz#75f16642b480f187a711c814161fd3a4a7655898" - integrity sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg= - dependencies: - binary-extensions "^1.0.0" - -is-binary-path@~2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-2.1.0.tgz#ea1f7f3b80f064236e83470f86c09c254fb45b09" - integrity sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw== - dependencies: - binary-extensions "^2.0.0" - -is-buffer@^1.1.5: - version "1.1.6" - resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be" - integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w== - -is-ci@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-3.0.0.tgz#c7e7be3c9d8eef7d0fa144390bd1e4b88dc4c994" - integrity sha512-kDXyttuLeslKAHYL/K28F2YkM3x5jvFPEw3yXbRptXydjD9rpLEz+C5K5iutY9ZiUu6AP41JdvRQwF4Iqs4ZCQ== - dependencies: - ci-info "^3.1.1" - -is-core-module@^2.2.0: - version "2.6.0" - resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.6.0.tgz#d7553b2526fe59b92ba3e40c8df757ec8a709e19" - integrity sha512-wShG8vs60jKfPWpF2KZRaAtvt3a20OAn7+IJ6hLPECpSABLcKtFKTTI4ZtH5QcBruBHlq+WsdHWyz0BCZW7svQ== - dependencies: - has "^1.0.3" - -is-data-descriptor@^0.1.4: - version "0.1.4" - resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz#0b5ee648388e2c860282e793f1856fec3f301b56" - integrity sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y= - dependencies: - kind-of "^3.0.2" - -is-data-descriptor@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz#d84876321d0e7add03990406abbbbd36ba9268c7" - integrity sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ== - dependencies: - kind-of "^6.0.0" - -is-date-object@^1.0.1: - version "1.0.5" - resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.5.tgz#0841d5536e724c25597bf6ea62e1bd38298df31f" - integrity sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ== - dependencies: - has-tostringtag "^1.0.0" - -is-descriptor@^0.1.0: - version "0.1.6" - resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-0.1.6.tgz#366d8240dde487ca51823b1ab9f07a10a78251ca" - integrity sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg== - dependencies: - is-accessor-descriptor "^0.1.6" - is-data-descriptor "^0.1.4" - kind-of "^5.0.0" - -is-descriptor@^1.0.0, is-descriptor@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-1.0.2.tgz#3b159746a66604b04f8c81524ba365c5f14d86ec" - integrity sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg== - dependencies: - is-accessor-descriptor "^1.0.0" - is-data-descriptor "^1.0.0" - kind-of "^6.0.2" - -is-docker@^2.0.0, is-docker@^2.1.1: - version "2.2.1" - resolved "https://registry.yarnpkg.com/is-docker/-/is-docker-2.2.1.tgz#33eeabe23cfe86f14bde4408a02c0cfb853acdaa" - integrity sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ== - -is-extendable@^0.1.0, is-extendable@^0.1.1: - version "0.1.1" - resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89" - integrity sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik= - -is-extendable@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-1.0.1.tgz#a7470f9e426733d81bd81e1155264e3a3507cab4" - integrity sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA== - dependencies: - is-plain-object "^2.0.4" - -is-extglob@^2.1.0, is-extglob@^2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2" - integrity sha1-qIwCU1eR8C7TfHahueqXc8gz+MI= - -is-fullwidth-code-point@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz#ef9e31386f031a7f0d643af82fde50c457ef00cb" - integrity sha1-754xOG8DGn8NZDr4L95QxFfvAMs= - dependencies: - number-is-nan "^1.0.0" - -is-fullwidth-code-point@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f" - integrity sha1-o7MKXE8ZkYMWeqq5O+764937ZU8= - -is-fullwidth-code-point@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d" - integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg== - -is-glob@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-3.1.0.tgz#7ba5ae24217804ac70707b96922567486cc3e84a" - integrity sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo= - dependencies: - is-extglob "^2.1.0" - -is-glob@^4.0.0, is-glob@^4.0.1, is-glob@~4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.1.tgz#7567dbe9f2f5e2467bc77ab83c4a29482407a5dc" - integrity sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg== - dependencies: - is-extglob "^2.1.1" - -is-installed-globally@~0.4.0: - version "0.4.0" - resolved "https://registry.yarnpkg.com/is-installed-globally/-/is-installed-globally-0.4.0.tgz#9a0fd407949c30f86eb6959ef1b7994ed0b7b520" - integrity sha512-iwGqO3J21aaSkC7jWnHP/difazwS7SFeIqxv6wEtLU8Y5KlzFTjyqcSIT0d8s4+dDhKytsk9PJZ2BkS5eZwQRQ== - dependencies: - global-dirs "^3.0.0" - is-path-inside "^3.0.2" - -is-interactive@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-interactive/-/is-interactive-1.0.0.tgz#cea6e6ae5c870a7b0a0004070b7b587e0252912e" - integrity sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w== - -is-lambda@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/is-lambda/-/is-lambda-1.0.1.tgz#3d9877899e6a53efc0160504cde15f82e6f061d5" - integrity sha1-PZh3iZ5qU+/AFgUEzeFfgubwYdU= - -is-number@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/is-number/-/is-number-3.0.0.tgz#24fd6201a4782cf50561c810276afc7d12d71195" - integrity sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU= - dependencies: - kind-of "^3.0.2" - -is-number@^7.0.0: - version "7.0.0" - resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b" - integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng== - -is-path-cwd@^2.0.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/is-path-cwd/-/is-path-cwd-2.2.0.tgz#67d43b82664a7b5191fd9119127eb300048a9fdb" - integrity sha512-w942bTcih8fdJPJmQHFzkS76NEP8Kzzvmw92cXsazb8intwLqPibPPdXf4ANdKV3rYMuuQYGIWtvz9JilB3NFQ== - -is-path-in-cwd@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/is-path-in-cwd/-/is-path-in-cwd-2.1.0.tgz#bfe2dca26c69f397265a4009963602935a053acb" - integrity sha512-rNocXHgipO+rvnP6dk3zI20RpOtrAM/kzbB258Uw5BWr3TpXi861yzjo16Dn4hUox07iw5AyeMLHWsujkjzvRQ== - dependencies: - is-path-inside "^2.1.0" - -is-path-inside@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-2.1.0.tgz#7c9810587d659a40d27bcdb4d5616eab059494b2" - integrity sha512-wiyhTzfDWsvwAW53OBWF5zuvaOGlZ6PwYxAbPVDhpm+gM09xKQGjBq/8uYN12aDvMxnAnq3dxTyoSoRNmg5YFg== - dependencies: - path-is-inside "^1.0.2" - -is-path-inside@^3.0.2: - version "3.0.3" - resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-3.0.3.tgz#d231362e53a07ff2b0e0ea7fed049161ffd16283" - integrity sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ== - -is-plain-object@^2.0.3, is-plain-object@^2.0.4: - version "2.0.4" - resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-2.0.4.tgz#2c163b3fafb1b606d9d17928f05c2a1c38e07677" - integrity sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og== - dependencies: - isobject "^3.0.1" - -is-regex@^1.0.4: - version "1.1.4" - resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.4.tgz#eef5663cd59fa4c0ae339505323df6854bb15958" - integrity sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg== - dependencies: - call-bind "^1.0.2" - has-tostringtag "^1.0.0" - -is-resolvable@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/is-resolvable/-/is-resolvable-1.1.0.tgz#fb18f87ce1feb925169c9a407c19318a3206ed88" - integrity sha512-qgDYXFSR5WvEfuS5dMj6oTMEbrrSaM0CrFk2Yiq/gXnBvD9pMa2jGXxyhGLfvhZpuMZe18CJpFxAt3CRs42NMg== - -is-stream@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44" - integrity sha1-EtSj3U5o4Lec6428hBc66A2RykQ= - -is-stream@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-2.0.1.tgz#fac1e3d53b97ad5a9d0ae9cef2389f5810a5c077" - integrity sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg== - -is-typedarray@~1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a" - integrity sha1-5HnICFjfDBsR3dppQPlgEfzaSpo= - -is-unicode-supported@^0.1.0: - version "0.1.0" - resolved "https://registry.yarnpkg.com/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz#3f26c76a809593b52bfa2ecb5710ed2779b522a7" - integrity sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw== - -is-what@^3.12.0: - version "3.14.1" - resolved "https://registry.yarnpkg.com/is-what/-/is-what-3.14.1.tgz#e1222f46ddda85dead0fd1c9df131760e77755c1" - integrity sha512-sNxgpk9793nzSs7bA6JQJGeIuRBQhAaNGG77kzYQgMkrID+lS6SlK07K5LaptscDlSaIgH+GPFzf+d75FVxozA== - -is-windows@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d" - integrity sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA== - -is-wsl@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-1.1.0.tgz#1f16e4aa22b04d1336b66188a66af3c600c3a66d" - integrity sha1-HxbkqiKwTRM2tmGIpmrzxgDDpm0= - -is-wsl@^2.2.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-2.2.0.tgz#74a4c76e77ca9fd3f932f290c17ea326cd157271" - integrity sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww== - dependencies: - is-docker "^2.0.0" - -isarray@1.0.0, isarray@~1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11" - integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE= - -isarray@^2.0.1: - version "2.0.5" - resolved "https://registry.yarnpkg.com/isarray/-/isarray-2.0.5.tgz#8af1e4c1221244cc62459faf38940d4e644a5723" - integrity sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw== - -isbinaryfile@^4.0.8: - version "4.0.8" - resolved "https://registry.yarnpkg.com/isbinaryfile/-/isbinaryfile-4.0.8.tgz#5d34b94865bd4946633ecc78a026fc76c5b11fcf" - integrity sha512-53h6XFniq77YdW+spoRrebh0mnmTxRPTlcuIArO57lmMdq4uBKFKaeTjnb92oYWrSn/LVL+LT+Hap2tFQj8V+w== - -isexe@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10" - integrity sha1-6PvzdNxVb/iUehDcsFctYz8s+hA= - -isobject@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/isobject/-/isobject-2.1.0.tgz#f065561096a3f1da2ef46272f815c840d87e0c89" - integrity sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk= - dependencies: - isarray "1.0.0" - -isobject@^3.0.0, isobject@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df" - integrity sha1-TkMekrEalzFjaqH5yNHMvP2reN8= - -isstream@~0.1.2: - version "0.1.2" - resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a" - integrity sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo= - -istanbul-lib-coverage@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-3.0.0.tgz#f5944a37c70b550b02a78a5c3b2055b280cec8ec" - integrity sha512-UiUIqxMgRDET6eR+o5HbfRYP1l0hqkWOs7vNxC/mggutCMUIhWMm8gAHb8tHlyfD3/l6rlgNA5cKdDzEAf6hEg== - -istanbul-lib-instrument@^4.0.1, istanbul-lib-instrument@^4.0.3: - version "4.0.3" - resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-4.0.3.tgz#873c6fff897450118222774696a3f28902d77c1d" - integrity sha512-BXgQl9kf4WTCPCCpmFGoJkz/+uhvm7h7PFKUYxh7qarQd3ER33vHG//qaE8eN25l07YqZPpHXU9I09l/RD5aGQ== - dependencies: - "@babel/core" "^7.7.5" - "@istanbuljs/schema" "^0.1.2" - istanbul-lib-coverage "^3.0.0" - semver "^6.3.0" - -istanbul-lib-report@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz#7518fe52ea44de372f460a76b5ecda9ffb73d8a6" - integrity sha512-wcdi+uAKzfiGT2abPpKZ0hSU1rGQjUQnLvtY5MpQ7QCTahD3VODhcu4wcfY1YtkGaDD5yuydOLINXsfbus9ROw== - dependencies: - istanbul-lib-coverage "^3.0.0" - make-dir "^3.0.0" - supports-color "^7.1.0" - -istanbul-lib-source-maps@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.0.tgz#75743ce6d96bb86dc7ee4352cf6366a23f0b1ad9" - integrity sha512-c16LpFRkR8vQXyHZ5nLpY35JZtzj1PQY1iZmesUbf1FZHbIupcWfjgOXBY9YHkLEQ6puz1u4Dgj6qmU/DisrZg== - dependencies: - debug "^4.1.1" - istanbul-lib-coverage "^3.0.0" - source-map "^0.6.1" - -istanbul-reports@^3.0.0: - version "3.0.2" - resolved "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-3.0.2.tgz#d593210e5000683750cb09fc0644e4b6e27fd53b" - integrity sha512-9tZvz7AiR3PEDNGiV9vIouQ/EAcqMXFmkcA1CDFTwOB98OZVDL0PH9glHotf5Ugp6GCOTypfzGWI/OqjWNCRUw== - dependencies: - html-escaper "^2.0.0" - istanbul-lib-report "^3.0.0" - -jasmine-core@^3.6.0: - version "3.9.0" - resolved "https://registry.yarnpkg.com/jasmine-core/-/jasmine-core-3.9.0.tgz#09a3c8169fe98ec69440476d04a0e4cb4d59e452" - integrity sha512-Tv3kVbPCGVrjsnHBZ38NsPU3sDOtNa0XmbG2baiyJqdb5/SPpDO6GVwJYtUryl6KB4q1Ssckwg612ES9Z0dreQ== - -jasmine-core@~3.8.0: - version "3.8.0" - resolved "https://registry.yarnpkg.com/jasmine-core/-/jasmine-core-3.8.0.tgz#815399aae5aa5d9beeb1262805f981b99ffc9bf0" - integrity sha512-zl0nZWDrmbCiKns0NcjkFGYkVTGCPUgoHypTaj+G2AzaWus7QGoXARSlYsSle2VRpSdfJmM+hzmFKzQNhF2kHg== - -jest-worker@^27.0.2: - version "27.1.0" - resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-27.1.0.tgz#65f4a88e37148ed984ba8ca8492d6b376938c0aa" - integrity sha512-mO4PHb2QWLn9yRXGp7rkvXLAYuxwhq1ZYUo0LoDhg8wqvv4QizP1ZWEJOeolgbEgAWZLIEU0wsku8J+lGWfBhg== - dependencies: - "@types/node" "*" - merge-stream "^2.0.0" - supports-color "^8.0.0" - -jquery@3.5.0: - version "3.5.0" - resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.5.0.tgz#9980b97d9e4194611c36530e7dc46a58d7340fc9" - integrity sha512-Xb7SVYMvygPxbFMpTFQiHh1J7HClEaThguL15N/Gg37Lri/qKyhRGZYzHRyLH8Stq3Aow0LsHO2O2ci86fCrNQ== - -js-tokens@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499" - integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ== - -jsbn@~0.1.0: - version "0.1.1" - resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513" - integrity sha1-peZUwuWi3rXyAdls77yoDA7y9RM= - -jsesc@^2.5.1: - version "2.5.2" - resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-2.5.2.tgz#80564d2e483dacf6e8ef209650a67df3f0c283a4" - integrity sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA== - -jsesc@~0.5.0: - version "0.5.0" - resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-0.5.0.tgz#e7dee66e35d6fc16f710fe91d5cf69f70f08911d" - integrity sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0= - -json-parse-better-errors@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz#bb867cfb3450e69107c131d1c514bab3dc8bcaa9" - integrity sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw== - -json-parse-even-better-errors@^2.3.0: - version "2.3.1" - resolved "https://registry.yarnpkg.com/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz#7c47805a94319928e05777405dc12e1f7a4ee02d" - integrity sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w== - -json-schema-traverse@^0.4.1: - version "0.4.1" - resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660" - integrity sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg== - -json-schema-traverse@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz#ae7bcb3656ab77a73ba5c49bf654f38e6b6860e2" - integrity sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug== - -json-schema@0.2.3: - version "0.2.3" - resolved "https://registry.yarnpkg.com/json-schema/-/json-schema-0.2.3.tgz#b480c892e59a2f05954ce727bd3f2a4e882f9e13" - integrity sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM= - -json-stringify-safe@~5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb" - integrity sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus= - -json3@^3.3.3: - version "3.3.3" - resolved "https://registry.yarnpkg.com/json3/-/json3-3.3.3.tgz#7fc10e375fc5ae42c4705a5cc0aa6f62be305b81" - integrity sha512-c7/8mbUsKigAbLkD5B010BK4D9LZm7A1pNItkEwiUZRpIN66exu/e7YQWysGun+TRKaJp8MhemM+VkfWv42aCA== - -json5@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/json5/-/json5-1.0.1.tgz#779fb0018604fa854eacbf6252180d83543e3dbe" - integrity sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow== - dependencies: - minimist "^1.2.0" - -json5@^2.1.0, json5@^2.1.2: - version "2.2.0" - resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.0.tgz#2dfefe720c6ba525d9ebd909950f0515316c89a3" - integrity sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA== - dependencies: - minimist "^1.2.5" - -jsonc-parser@3.0.0, jsonc-parser@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/jsonc-parser/-/jsonc-parser-3.0.0.tgz#abdd785701c7e7eaca8a9ec8cf070ca51a745a22" - integrity sha512-fQzRfAbIBnR0IQvftw9FJveWiHp72Fg20giDrHz6TdfB12UH/uue0D3hm57UB5KgAVuniLMCaS8P1IMj9NR7cA== - -jsonfile@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-4.0.0.tgz#8771aae0799b64076b76640fca058f9c10e33ecb" - integrity sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss= - optionalDependencies: - graceful-fs "^4.1.6" - -jsonfile@^6.0.1: - version "6.1.0" - resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-6.1.0.tgz#bc55b2634793c679ec6403094eb13698a6ec0aae" - integrity sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ== - dependencies: - universalify "^2.0.0" - optionalDependencies: - graceful-fs "^4.1.6" - -jsonparse@^1.3.1: - version "1.3.1" - resolved "https://registry.yarnpkg.com/jsonparse/-/jsonparse-1.3.1.tgz#3f4dae4a91fac315f71062f8521cc239f1366280" - integrity sha1-P02uSpH6wxX3EGL4UhzCOfE2YoA= - -jsprim@^1.2.2: - version "1.4.1" - resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.1.tgz#313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2" - integrity sha1-MT5mvB5cwG5Di8G3SZwuXFastqI= - dependencies: - assert-plus "1.0.0" - extsprintf "1.3.0" - json-schema "0.2.3" - verror "1.10.0" - -karma-chrome-launcher@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/karma-chrome-launcher/-/karma-chrome-launcher-3.1.0.tgz#805a586799a4d05f4e54f72a204979f3f3066738" - integrity sha512-3dPs/n7vgz1rxxtynpzZTvb9y/GIaW8xjAwcIGttLbycqoFtI7yo1NGnQi6oFTherRE+GIhCAHZC4vEqWGhNvg== - dependencies: - which "^1.2.1" - -karma-coverage@~2.0.3: - version "2.0.3" - resolved "https://registry.yarnpkg.com/karma-coverage/-/karma-coverage-2.0.3.tgz#c10f4711f4cf5caaaa668b1d6f642e7da122d973" - integrity sha512-atDvLQqvPcLxhED0cmXYdsPMCQuh6Asa9FMZW1bhNqlVEhJoB9qyZ2BY1gu7D/rr5GLGb5QzYO4siQskxaWP/g== - dependencies: - istanbul-lib-coverage "^3.0.0" - istanbul-lib-instrument "^4.0.1" - istanbul-lib-report "^3.0.0" - istanbul-lib-source-maps "^4.0.0" - istanbul-reports "^3.0.0" - minimatch "^3.0.4" - -karma-jasmine-html-reporter@~1.7.0: - version "1.7.0" - resolved "https://registry.yarnpkg.com/karma-jasmine-html-reporter/-/karma-jasmine-html-reporter-1.7.0.tgz#52c489a74d760934a1089bfa5ea4a8fcb84cc28b" - integrity sha512-pzum1TL7j90DTE86eFt48/s12hqwQuiD+e5aXx2Dc9wDEn2LfGq6RoAxEZZjFiN0RDSCOnosEKRZWxbQ+iMpQQ== - -karma-jasmine@~4.0.0: - version "4.0.1" - resolved "https://registry.yarnpkg.com/karma-jasmine/-/karma-jasmine-4.0.1.tgz#b99e073b6d99a5196fc4bffc121b89313b0abd82" - integrity sha512-h8XDAhTiZjJKzfkoO1laMH+zfNlra+dEQHUAjpn5JV1zCPtOIVWGQjLBrqhnzQa/hrU2XrZwSyBa6XjEBzfXzw== - dependencies: - jasmine-core "^3.6.0" - -karma-notify-reporter@^1.3.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/karma-notify-reporter/-/karma-notify-reporter-1.3.0.tgz#dbe5cd5f2632813a680d2532319a51791c2d749f" - integrity sha512-EDVjD5ghu3DO+/CMvx2XmMxbSEZyFOkSf/5GAWc4Y5Z0+/NbcWnQew7fKMTvQoxuJnK0AYkDJ27nBzR8sXCIBA== - dependencies: - node-notifier "^9.0.0" - -karma-source-map-support@1.4.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/karma-source-map-support/-/karma-source-map-support-1.4.0.tgz#58526ceccf7e8730e56effd97a4de8d712ac0d6b" - integrity sha512-RsBECncGO17KAoJCYXjv+ckIz+Ii9NCi+9enk+rq6XC81ezYkb4/RHE6CTXdA7IOJqoF3wcaLfVG0CPmE5ca6A== - dependencies: - source-map-support "^0.5.5" - -karma@~6.3.0: - version "6.3.4" - resolved "https://registry.yarnpkg.com/karma/-/karma-6.3.4.tgz#359899d3aab3d6b918ea0f57046fd2a6b68565e6" - integrity sha512-hbhRogUYIulfkBTZT7xoPrCYhRBnBoqbbL4fszWD0ReFGUxU+LYBr3dwKdAluaDQ/ynT9/7C+Lf7pPNW4gSx4Q== - dependencies: - body-parser "^1.19.0" - braces "^3.0.2" - chokidar "^3.5.1" - colors "^1.4.0" - connect "^3.7.0" - di "^0.0.1" - dom-serialize "^2.2.1" - glob "^7.1.7" - graceful-fs "^4.2.6" - http-proxy "^1.18.1" - isbinaryfile "^4.0.8" - lodash "^4.17.21" - log4js "^6.3.0" - mime "^2.5.2" - minimatch "^3.0.4" - qjobs "^1.2.0" - range-parser "^1.2.1" - rimraf "^3.0.2" - socket.io "^3.1.0" - source-map "^0.6.1" - tmp "^0.2.1" - ua-parser-js "^0.7.28" - yargs "^16.1.1" - -killable@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/killable/-/killable-1.0.1.tgz#4c8ce441187a061c7474fb87ca08e2a638194892" - integrity sha512-LzqtLKlUwirEUyl/nicirVmNiPvYs7l5n8wOPP7fyJVpUPkvCnW/vuiXGpylGUlnPDnB7311rARzAt3Mhswpjg== - -kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.2.0: - version "3.2.2" - resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64" - integrity sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ= - dependencies: - is-buffer "^1.1.5" - -kind-of@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-4.0.0.tgz#20813df3d712928b207378691a45066fae72dd57" - integrity sha1-IIE989cSkosgc3hpGkUGb65y3Vc= - dependencies: - is-buffer "^1.1.5" - -kind-of@^5.0.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-5.1.0.tgz#729c91e2d857b7a419a1f9aa65685c4c33f5845d" - integrity sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw== - -kind-of@^6.0.0, kind-of@^6.0.2: - version "6.0.3" - resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd" - integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw== - -klona@^2.0.4: - version "2.0.4" - resolved "https://registry.yarnpkg.com/klona/-/klona-2.0.4.tgz#7bb1e3affb0cb8624547ef7e8f6708ea2e39dfc0" - integrity sha512-ZRbnvdg/NxqzC7L9Uyqzf4psi1OM4Cuc+sJAkQPjO6XkQIJTNbfK2Rsmbw8fx1p2mkZdp2FZYo2+LwXYY/uwIA== - -lazy-ass@^1.6.0: - version "1.6.0" - resolved "https://registry.yarnpkg.com/lazy-ass/-/lazy-ass-1.6.0.tgz#7999655e8646c17f089fdd187d150d3324d54513" - integrity sha1-eZllXoZGwX8In90YfRUNMyTVRRM= - -less-loader@10.0.1: - version "10.0.1" - resolved "https://registry.yarnpkg.com/less-loader/-/less-loader-10.0.1.tgz#c05aaba68d00400820275f21c2ad87cb9fa9923f" - integrity sha512-Crln//HpW9M5CbtdfWm3IO66Cvx1WhZQvNybXgfB2dD/6Sav9ppw+IWqs/FQKPBFO4B6X0X28Z0WNznshgwUzA== - dependencies: - klona "^2.0.4" - -less@4.1.1: - version "4.1.1" - resolved "https://registry.yarnpkg.com/less/-/less-4.1.1.tgz#15bf253a9939791dc690888c3ff424f3e6c7edba" - integrity sha512-w09o8tZFPThBscl5d0Ggp3RcrKIouBoQscnOMgFH3n5V3kN/CXGHNfCkRPtxJk6nKryDXaV9aHLK55RXuH4sAw== - dependencies: - copy-anything "^2.0.1" - parse-node-version "^1.0.1" - tslib "^1.10.0" - optionalDependencies: - errno "^0.1.1" - graceful-fs "^4.1.2" - image-size "~0.5.0" - make-dir "^2.1.0" - mime "^1.4.1" - needle "^2.5.2" - source-map "~0.6.0" - -license-webpack-plugin@2.3.20: - version "2.3.20" - resolved "https://registry.yarnpkg.com/license-webpack-plugin/-/license-webpack-plugin-2.3.20.tgz#f51fb674ca31519dbedbe1c7aabc036e5a7f2858" - integrity sha512-AHVueg9clOKACSHkhmEI+PCC9x8+qsQVuKECZD3ETxETK5h/PCv5/MUzyG1gm8OMcip/s1tcNxqo9Qb7WhjGsg== - dependencies: - "@types/webpack-sources" "^0.1.5" - webpack-sources "^1.2.0" - -lilconfig@^2.0.3: - version "2.0.3" - resolved "https://registry.yarnpkg.com/lilconfig/-/lilconfig-2.0.3.tgz#68f3005e921dafbd2a2afb48379986aa6d2579fd" - integrity sha512-EHKqr/+ZvdKCifpNrJCKxBTgk5XupZA3y/aCPY9mxfgBzmgh93Mt/WqjjQ38oMxXuvDokaKiM3lAgvSH2sjtHg== - -lines-and-columns@^1.1.6: - version "1.1.6" - resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.1.6.tgz#1c00c743b433cd0a4e80758f7b64a57440d9ff00" - integrity sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA= - -listr2@^3.8.3: - version "3.11.0" - resolved "https://registry.yarnpkg.com/listr2/-/listr2-3.11.0.tgz#9771b02407875aa78e73d6e0ff6541bbec0aaee9" - integrity sha512-XLJVe2JgXCyQTa3FbSv11lkKExYmEyA4jltVo8z4FX10Vt1Yj8IMekBfwim0BSOM9uj1QMTJvDQQpHyuPbB/dQ== - dependencies: - cli-truncate "^2.1.0" - colorette "^1.2.2" - log-update "^4.0.0" - p-map "^4.0.0" - rxjs "^6.6.7" - through "^2.3.8" - wrap-ansi "^7.0.0" - -loader-runner@^4.2.0: - version "4.2.0" - resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-4.2.0.tgz#d7022380d66d14c5fb1d496b89864ebcfd478384" - integrity sha512-92+huvxMvYlMzMt0iIOukcwYBFpkYJdpl2xsZ7LrlayO7E8SOv+JJUEK17B/dJIHAOLMfh2dZZ/Y18WgmGtYNw== - -loader-utils@2.0.0, loader-utils@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-2.0.0.tgz#e4cace5b816d425a166b5f097e10cd12b36064b0" - integrity sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ== - dependencies: - big.js "^5.2.2" - emojis-list "^3.0.0" - json5 "^2.1.2" - -loader-utils@^1.4.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.4.0.tgz#c579b5e34cb34b1a74edc6c1fb36bfa371d5a613" - integrity sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA== - dependencies: - big.js "^5.2.2" - emojis-list "^3.0.0" - json5 "^1.0.1" - -locate-path@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-3.0.0.tgz#dbec3b3ab759758071b58fe59fc41871af21400e" - integrity sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A== - dependencies: - p-locate "^3.0.0" - path-exists "^3.0.0" - -locate-path@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-5.0.0.tgz#1afba396afd676a6d42504d0a67a3a7eb9f62aa0" - integrity sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g== - dependencies: - p-locate "^4.1.0" - -lodash.debounce@^4.0.8: - version "4.0.8" - resolved "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz#82d79bff30a67c4005ffd5e2515300ad9ca4d7af" - integrity sha1-gteb/zCmfEAF/9XiUVMArZyk168= - -lodash.memoize@^4.1.2: - version "4.1.2" - resolved "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-4.1.2.tgz#bcc6c49a42a2840ed997f323eada5ecd182e0bfe" - integrity sha1-vMbEmkKihA7Zl/Mj6tpezRguC/4= - -lodash.merge@^4.6.2: - version "4.6.2" - resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.2.tgz#558aa53b43b661e1925a0afdfa36a9a1085fe57a" - integrity sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ== - -lodash.once@^4.1.1: - version "4.1.1" - resolved "https://registry.yarnpkg.com/lodash.once/-/lodash.once-4.1.1.tgz#0dd3971213c7c56df880977d504c88fb471a97ac" - integrity sha1-DdOXEhPHxW34gJd9UEyI+0cal6w= - -lodash.uniq@^4.5.0: - version "4.5.0" - resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773" - integrity sha1-0CJTc662Uq3BvILklFM5qEJ1R3M= - -lodash@^4.17.11, lodash@^4.17.13, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.21: - version "4.17.21" - resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c" - integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg== - -log-symbols@^4.0.0, log-symbols@^4.1.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-4.1.0.tgz#3fbdbb95b4683ac9fc785111e792e558d4abd503" - integrity sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg== - dependencies: - chalk "^4.1.0" - is-unicode-supported "^0.1.0" - -log-update@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/log-update/-/log-update-4.0.0.tgz#589ecd352471f2a1c0c570287543a64dfd20e0a1" - integrity sha512-9fkkDevMefjg0mmzWFBW8YkFP91OrizzkW3diF7CpG+S2EYdy4+TVfGwz1zeF8x7hCx1ovSPTOE9Ngib74qqUg== - dependencies: - ansi-escapes "^4.3.0" - cli-cursor "^3.1.0" - slice-ansi "^4.0.0" - wrap-ansi "^6.2.0" - -log4js@^6.3.0: - version "6.3.0" - resolved "https://registry.yarnpkg.com/log4js/-/log4js-6.3.0.tgz#10dfafbb434351a3e30277a00b9879446f715bcb" - integrity sha512-Mc8jNuSFImQUIateBFwdOQcmC6Q5maU0VVvdC2R6XMb66/VnT+7WS4D/0EeNMZu1YODmJe5NIn2XftCzEocUgw== - dependencies: - date-format "^3.0.0" - debug "^4.1.1" - flatted "^2.0.1" - rfdc "^1.1.4" - streamroller "^2.2.4" - -loglevel@^1.6.8: - version "1.7.1" - resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.7.1.tgz#005fde2f5e6e47068f935ff28573e125ef72f197" - integrity sha512-Hesni4s5UkWkwCGJMQGAh71PaLUmKFM60dHvq0zi/vDhhrzuk+4GgNbTXJ12YYQJn6ZKBDNIjYcuQGKudvqrIw== - -lru-cache@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-6.0.0.tgz#6d6fe6570ebd96aaf90fcad1dafa3b2566db3a94" - integrity sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA== - dependencies: - yallist "^4.0.0" - -magic-string@0.25.7, magic-string@^0.25.0: - version "0.25.7" - resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.25.7.tgz#3f497d6fd34c669c6798dcb821f2ef31f5445051" - integrity sha512-4CrMT5DOHTDk4HYDlzmwu4FVCcIYI8gauveasrdCu2IKIFOJ3f0v/8MDGJCDL9oD2ppz/Av1b0Nj345H9M+XIA== - dependencies: - sourcemap-codec "^1.4.4" - -make-dir@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-2.1.0.tgz#5f0310e18b8be898cc07009295a30ae41e91e6f5" - integrity sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA== - dependencies: - pify "^4.0.1" - semver "^5.6.0" - -make-dir@^3.0.0, make-dir@^3.0.2, make-dir@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-3.1.0.tgz#415e967046b3a7f1d185277d84aa58203726a13f" - integrity sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw== - dependencies: - semver "^6.0.0" - -make-error@^1.1.1: - version "1.3.6" - resolved "https://registry.yarnpkg.com/make-error/-/make-error-1.3.6.tgz#2eb2e37ea9b67c4891f684a1394799af484cf7a2" - integrity sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw== - -make-fetch-happen@^9.0.1: - version "9.1.0" - resolved "https://registry.yarnpkg.com/make-fetch-happen/-/make-fetch-happen-9.1.0.tgz#53085a09e7971433e6765f7971bf63f4e05cb968" - integrity sha512-+zopwDy7DNknmwPQplem5lAZX/eCOzSvSNNcSKm5eVwTkOBzoktEfXsa9L23J/GIRhxRsaxzkPEhrJEpE2F4Gg== - dependencies: - agentkeepalive "^4.1.3" - cacache "^15.2.0" - http-cache-semantics "^4.1.0" - http-proxy-agent "^4.0.1" - https-proxy-agent "^5.0.0" - is-lambda "^1.0.1" - lru-cache "^6.0.0" - minipass "^3.1.3" - minipass-collect "^1.0.2" - minipass-fetch "^1.3.2" - minipass-flush "^1.0.5" - minipass-pipeline "^1.2.4" - negotiator "^0.6.2" - promise-retry "^2.0.1" - socks-proxy-agent "^6.0.0" - ssri "^8.0.0" - -map-age-cleaner@^0.1.3: - version "0.1.3" - resolved "https://registry.yarnpkg.com/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz#7d583a7306434c055fe474b0f45078e6e1b4b92a" - integrity sha512-bJzx6nMoP6PDLPBFmg7+xRKeFZvFboMrGlxmNj9ClvX53KrmvM5bXFXEWjbz4cz1AFn+jWJ9z/DJSz7hrs0w3w== - dependencies: - p-defer "^1.0.0" - -map-cache@^0.2.2: - version "0.2.2" - resolved "https://registry.yarnpkg.com/map-cache/-/map-cache-0.2.2.tgz#c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf" - integrity sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8= - -map-visit@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/map-visit/-/map-visit-1.0.0.tgz#ecdca8f13144e660f1b5bd41f12f3479d98dfb8f" - integrity sha1-7Nyo8TFE5mDxtb1B8S80edmN+48= - dependencies: - object-visit "^1.0.0" - -material-design-icons@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/material-design-icons/-/material-design-icons-3.0.1.tgz#9a71c48747218ebca51e51a66da682038cdcb7bf" - integrity sha1-mnHEh0chjrylHlGmbaaCA4zct78= - -mdn-data@2.0.14: - version "2.0.14" - resolved "https://registry.yarnpkg.com/mdn-data/-/mdn-data-2.0.14.tgz#7113fc4281917d63ce29b43446f701e68c25ba50" - integrity sha512-dn6wd0uw5GsdswPFfsgMp5NSB0/aDe6fK94YJV/AJDYXL6HVLWBsxeq7js7Ad+mU2K9LAlwpk6kN2D5mwCPVow== - -media-typer@0.3.0: - version "0.3.0" - resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748" - integrity sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g= - -mem@^8.1.1: - version "8.1.1" - resolved "https://registry.yarnpkg.com/mem/-/mem-8.1.1.tgz#cf118b357c65ab7b7e0817bdf00c8062297c0122" - integrity sha512-qFCFUDs7U3b8mBDPyz5EToEKoAkgCzqquIgi9nkkR9bixxOVOre+09lbuH7+9Kn2NFpm56M3GUWVbU2hQgdACA== - dependencies: - map-age-cleaner "^0.1.3" - mimic-fn "^3.1.0" - -memfs@^3.2.2: - version "3.2.2" - resolved "https://registry.yarnpkg.com/memfs/-/memfs-3.2.2.tgz#5de461389d596e3f23d48bb7c2afb6161f4df40e" - integrity sha512-RE0CwmIM3CEvpcdK3rZ19BC4E6hv9kADkMN5rPduRak58cNArWLi/9jFLsa4rhsjfVxMP3v0jO7FHXq7SvFY5Q== - dependencies: - fs-monkey "1.0.3" - -memory-fs@^0.4.1: - version "0.4.1" - resolved "https://registry.yarnpkg.com/memory-fs/-/memory-fs-0.4.1.tgz#3a9a20b8462523e447cfbc7e8bb80ed667bfc552" - integrity sha1-OpoguEYlI+RHz7x+i7gO1me/xVI= - dependencies: - errno "^0.1.3" - readable-stream "^2.0.1" - -merge-descriptors@1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.1.tgz#b00aaa556dd8b44568150ec9d1b953f3f90cbb61" - integrity sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E= - -merge-json-webpack-plugin@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/merge-json-webpack-plugin/-/merge-json-webpack-plugin-6.0.0.tgz#f66334b56dc51fd22422ebb0c0025531e5c08c1e" - integrity sha512-Ll08MD7/Pzd2dXeJBINRXPby3xrRaia5fR8vABwczb6DW2CVi6intEuOi7eFNHhTbFEDbxTFuaD+a06DUiYAQQ== - dependencies: - fast-glob "^3.2.7" - schema-utils "^3.1.1" - -merge-source-map@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/merge-source-map/-/merge-source-map-1.1.0.tgz#2fdde7e6020939f70906a68f2d7ae685e4c8c646" - integrity sha512-Qkcp7P2ygktpMPh2mCQZaf3jhN6D3Z/qVZHSdWvQ+2Ef5HgRAPBO57A77+ENm0CPx2+1Ce/MYKi3ymqdfuqibw== - dependencies: - source-map "^0.6.1" - -merge-stream@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-2.0.0.tgz#52823629a14dd00c9770fb6ad47dc6310f2c1f60" - integrity sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w== - -merge2@^1.3.0: - version "1.4.1" - resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.4.1.tgz#4368892f885e907455a6fd7dc55c0c9d404990ae" - integrity sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg== - -methods@~1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee" - integrity sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4= - -micromatch@^3.1.10, micromatch@^3.1.4: - version "3.1.10" - resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.10.tgz#70859bc95c9840952f359a068a3fc49f9ecfac23" - integrity sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg== - dependencies: - arr-diff "^4.0.0" - array-unique "^0.3.2" - braces "^2.3.1" - define-property "^2.0.2" - extend-shallow "^3.0.2" - extglob "^2.0.4" - fragment-cache "^0.2.1" - kind-of "^6.0.2" - nanomatch "^1.2.9" - object.pick "^1.3.0" - regex-not "^1.0.0" - snapdragon "^0.8.1" - to-regex "^3.0.2" - -micromatch@^4.0.4: - version "4.0.4" - resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.4.tgz#896d519dfe9db25fce94ceb7a500919bf881ebf9" - integrity sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg== - dependencies: - braces "^3.0.1" - picomatch "^2.2.3" - -mime-db@1.49.0, "mime-db@>= 1.43.0 < 2": - version "1.49.0" - resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.49.0.tgz#f3dfde60c99e9cf3bc9701d687778f537001cbed" - integrity sha512-CIc8j9URtOVApSFCQIF+VBkX1RwXp/oMMOrqdyXSBXq5RWNEsRfyj1kiRnQgmNXmHxPoFIxOroKA3zcU9P+nAA== - -mime-types@^2.1.12, mime-types@^2.1.27, mime-types@^2.1.31, mime-types@~2.1.17, mime-types@~2.1.19, mime-types@~2.1.24: - version "2.1.32" - resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.32.tgz#1d00e89e7de7fe02008db61001d9e02852670fd5" - integrity sha512-hJGaVS4G4c9TSMYh2n6SQAGrC4RnfU+daP8G7cSCmaqNjiOoUY0VHCMS42pxnQmVF1GWwFhbHWn3RIxCqTmZ9A== - dependencies: - mime-db "1.49.0" - -mime@1.6.0, mime@^1.4.1: - version "1.6.0" - resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1" - integrity sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg== - -mime@^2.4.4, mime@^2.5.2: - version "2.5.2" - resolved "https://registry.yarnpkg.com/mime/-/mime-2.5.2.tgz#6e3dc6cc2b9510643830e5f19d5cb753da5eeabe" - integrity sha512-tqkh47FzKeCPD2PUiPB6pkbMzsCasjxAfC62/Wap5qrUWcb+sFasXUC5I3gYM5iBM8v/Qpn4UK0x+j0iHyFPDg== - -mimic-fn@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b" - integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg== - -mimic-fn@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-3.1.0.tgz#65755145bbf3e36954b949c16450427451d5ca74" - integrity sha512-Ysbi9uYW9hFyfrThdDEQuykN4Ey6BuwPD2kpI5ES/nFTDn/98yxYNLZJcgUAKPT/mcrLLKaGzJR9YVxJrIdASQ== - -mini-css-extract-plugin@2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-2.1.0.tgz#4aa6558b527ad4c168fee4a20b6092ebe9f98309" - integrity sha512-SV1GgjMcfqy6hW07rAniUbQE4qS3inh3v4rZEUySkPRWy3vMbS3jUCjMOvNI4lUnDlQYJEmuUqKktTCNY5koFQ== - dependencies: - schema-utils "^3.0.0" - -minimalistic-assert@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz#2e194de044626d4a10e7f7fbc00ce73e83e4d5c7" - integrity sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A== - -minimatch@3.0.4, minimatch@^3.0.4: - version "3.0.4" - resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083" - integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA== - dependencies: - brace-expansion "^1.1.7" - -minimist@^1.2.0, minimist@^1.2.5: - version "1.2.5" - resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602" - integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw== - -minipass-collect@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/minipass-collect/-/minipass-collect-1.0.2.tgz#22b813bf745dc6edba2576b940022ad6edc8c617" - integrity sha512-6T6lH0H8OG9kITm/Jm6tdooIbogG9e0tLgpY6mphXSm/A9u8Nq1ryBG+Qspiub9LjWlBPsPS3tWQ/Botq4FdxA== - dependencies: - minipass "^3.0.0" - -minipass-fetch@^1.3.0, minipass-fetch@^1.3.2: - version "1.3.4" - resolved "https://registry.yarnpkg.com/minipass-fetch/-/minipass-fetch-1.3.4.tgz#63f5af868a38746ca7b33b03393ddf8c291244fe" - integrity sha512-TielGogIzbUEtd1LsjZFs47RWuHHfhl6TiCx1InVxApBAmQ8bL0dL5ilkLGcRvuyW/A9nE+Lvn855Ewz8S0PnQ== - dependencies: - minipass "^3.1.0" - minipass-sized "^1.0.3" - minizlib "^2.0.0" - optionalDependencies: - encoding "^0.1.12" - -minipass-flush@^1.0.5: - version "1.0.5" - resolved "https://registry.yarnpkg.com/minipass-flush/-/minipass-flush-1.0.5.tgz#82e7135d7e89a50ffe64610a787953c4c4cbb373" - integrity sha512-JmQSYYpPUqX5Jyn1mXaRwOda1uQ8HP5KAT/oDSLCzt1BYRhQU0/hDtsB1ufZfEEzMZ9aAVmsBw8+FWsIXlClWw== - dependencies: - minipass "^3.0.0" - -minipass-json-stream@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/minipass-json-stream/-/minipass-json-stream-1.0.1.tgz#7edbb92588fbfc2ff1db2fc10397acb7b6b44aa7" - integrity sha512-ODqY18UZt/I8k+b7rl2AENgbWE8IDYam+undIJONvigAz8KR5GWblsFTEfQs0WODsjbSXWlm+JHEv8Gr6Tfdbg== - dependencies: - jsonparse "^1.3.1" - minipass "^3.0.0" - -minipass-pipeline@^1.2.2, minipass-pipeline@^1.2.4: - version "1.2.4" - resolved "https://registry.yarnpkg.com/minipass-pipeline/-/minipass-pipeline-1.2.4.tgz#68472f79711c084657c067c5c6ad93cddea8214c" - integrity sha512-xuIq7cIOt09RPRJ19gdi4b+RiNvDFYe5JH+ggNvBqGqpQXcru3PcRmOZuHBKWK1Txf9+cQ+HMVN4d6z46LZP7A== - dependencies: - minipass "^3.0.0" - -minipass-sized@^1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/minipass-sized/-/minipass-sized-1.0.3.tgz#70ee5a7c5052070afacfbc22977ea79def353b70" - integrity sha512-MbkQQ2CTiBMlA2Dm/5cY+9SWFEN8pzzOXi6rlM5Xxq0Yqbda5ZQy9sU75a673FE9ZK0Zsbr6Y5iP6u9nktfg2g== - dependencies: - minipass "^3.0.0" - -minipass@^3.0.0, minipass@^3.1.0, minipass@^3.1.1, minipass@^3.1.3: - version "3.1.3" - resolved "https://registry.yarnpkg.com/minipass/-/minipass-3.1.3.tgz#7d42ff1f39635482e15f9cdb53184deebd5815fd" - integrity sha512-Mgd2GdMVzY+x3IJ+oHnVM+KG3lA5c8tnabyJKmHSaG2kAGpudxuOf8ToDkhumF7UzME7DecbQE9uOZhNm7PuJg== - dependencies: - yallist "^4.0.0" - -minizlib@^2.0.0, minizlib@^2.1.1: - version "2.1.2" - resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-2.1.2.tgz#e90d3466ba209b932451508a11ce3d3632145931" - integrity sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg== - dependencies: - minipass "^3.0.0" - yallist "^4.0.0" - -mixin-deep@^1.2.0: - version "1.3.2" - resolved "https://registry.yarnpkg.com/mixin-deep/-/mixin-deep-1.3.2.tgz#1120b43dc359a785dce65b55b82e257ccf479566" - integrity sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA== - dependencies: - for-in "^1.0.2" - is-extendable "^1.0.1" - -mkdirp@^0.5.1, mkdirp@^0.5.5: - version "0.5.5" - resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz#d91cefd62d1436ca0f41620e251288d420099def" - integrity sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ== - dependencies: - minimist "^1.2.5" - -mkdirp@^1.0.3, mkdirp@^1.0.4, mkdirp@~1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e" - integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw== - -ms@2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8" - integrity sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g= - -ms@2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.1.tgz#30a5864eb3ebb0a66f2ebe6d727af06a09d86e0a" - integrity sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg== - -ms@2.1.2: - version "2.1.2" - resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009" - integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w== - -ms@^2.0.0, ms@^2.1.1: - version "2.1.3" - resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2" - integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA== - -multicast-dns-service-types@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/multicast-dns-service-types/-/multicast-dns-service-types-1.1.0.tgz#899f11d9686e5e05cb91b35d5f0e63b773cfc901" - integrity sha1-iZ8R2WhuXgXLkbNdXw5jt3PPyQE= - -multicast-dns@^6.0.1: - version "6.2.3" - resolved "https://registry.yarnpkg.com/multicast-dns/-/multicast-dns-6.2.3.tgz#a0ec7bd9055c4282f790c3c82f4e28db3b31b229" - integrity sha512-ji6J5enbMyGRHIAkAOu3WdV8nggqviKCEKtXcOqfphZZtQrmHKycfynJ2V7eVPUA4NhJ6V7Wf4TmGbTwKE9B6g== - dependencies: - dns-packet "^1.3.1" - thunky "^1.0.2" - -mute-stream@0.0.8: - version "0.0.8" - resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.8.tgz#1630c42b2251ff81e2a283de96a5497ea92e5e0d" - integrity sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA== - -nan@^2.12.1: - version "2.15.0" - resolved "https://registry.yarnpkg.com/nan/-/nan-2.15.0.tgz#3f34a473ff18e15c1b5626b62903b5ad6e665fee" - integrity sha512-8ZtvEnA2c5aYCZYd1cvgdnU6cqwixRoYg70xPLWUws5ORTa/lnw+u4amixRS/Ac5U5mQVgp9pnlSUnbNWFaWZQ== - -nanoid@^3.1.23: - version "3.1.25" - resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.1.25.tgz#09ca32747c0e543f0e1814b7d3793477f9c8e152" - integrity sha512-rdwtIXaXCLFAQbnfqDRnI6jaRHp9fTcYBjtFKE8eezcZ7LuLjhUaQGNeMXf1HmRoCH32CLz6XwX0TtxEOS/A3Q== - -nanomatch@^1.2.9: - version "1.2.13" - resolved "https://registry.yarnpkg.com/nanomatch/-/nanomatch-1.2.13.tgz#b87a8aa4fc0de8fe6be88895b38983ff265bd119" - integrity sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA== - dependencies: - arr-diff "^4.0.0" - array-unique "^0.3.2" - define-property "^2.0.2" - extend-shallow "^3.0.2" - fragment-cache "^0.2.1" - is-windows "^1.0.2" - kind-of "^6.0.2" - object.pick "^1.3.0" - regex-not "^1.0.0" - snapdragon "^0.8.1" - to-regex "^3.0.1" - -needle@^2.5.2: - version "2.9.0" - resolved "https://registry.yarnpkg.com/needle/-/needle-2.9.0.tgz#c680e401f99b6c3d8d1f315756052edf3dc3bdff" - integrity sha512-UBLC4P8w9to3rAhWOQYXIXzTUio9yVnDzIeKxfGbF+Hngy+2bXTqqFK+6nF42EAQKfJdezXK6vzMsefUa1Y3ag== - dependencies: - debug "^3.2.6" - iconv-lite "^0.4.4" - sax "^1.2.4" - -negotiator@0.6.2, negotiator@^0.6.2: - version "0.6.2" - resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.2.tgz#feacf7ccf525a77ae9634436a64883ffeca346fb" - integrity sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw== - -neo-async@^2.6.2: - version "2.6.2" - resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.2.tgz#b4aafb93e3aeb2d8174ca53cf163ab7d7308305f" - integrity sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw== - -ngx-cookie-service@^12.0.3: - version "12.0.3" - resolved "https://registry.yarnpkg.com/ngx-cookie-service/-/ngx-cookie-service-12.0.3.tgz#eb2fc73b40dcc5ef8282eb78e82986afc299537f" - integrity sha512-F5xJBTrrreI2DERGOrO6U+L7s031HxTER+3Z4gDCwxdTl4AXmtWddMxxQVw7KflOLZ4InYEs6FjQsXmKU4HsJg== - dependencies: - tslib "^2.0.0" - -ngx-webstorage@^8.0.0: - version "8.0.0" - resolved "https://registry.yarnpkg.com/ngx-webstorage/-/ngx-webstorage-8.0.0.tgz#c469cb3afcfb7a443527cbbaa43b0e9b02e64c99" - integrity sha512-dpHgboSi6adnYpwiAQ2/PRJe8dcvSbM2qWTacTCUPVPeWlhLvTCtIl1GA9BNDiZzYuyA3dmXyqlcDl/Th9Pi2A== - dependencies: - tslib "^2.0.0" - -nice-napi@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/nice-napi/-/nice-napi-1.0.2.tgz#dc0ab5a1eac20ce548802fc5686eaa6bc654927b" - integrity sha512-px/KnJAJZf5RuBGcfD+Sp2pAKq0ytz8j+1NehvgIGFkvtvFrDM3T8E4x/JJODXK9WZow8RRGrbA9QQ3hs+pDhA== - dependencies: - node-addon-api "^3.0.0" - node-gyp-build "^4.2.2" - -nice-try@^1.0.4: - version "1.0.5" - resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366" - integrity sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ== - -node-addon-api@^3.0.0: - version "3.2.1" - resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-3.2.1.tgz#81325e0a2117789c0128dab65e7e38f07ceba161" - integrity sha512-mmcei9JghVNDYydghQmeDX8KoAm0FAiYyIcUt/N4nhyAipB17pllZQDOJD2fotxABnt4Mdz+dKTO7eftLg4d0A== - -node-fetch@2.6.1: - version "2.6.1" - resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.1.tgz#045bd323631f76ed2e2b55573394416b639a0052" - integrity sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw== - -node-forge@^0.10.0: - version "0.10.0" - resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-0.10.0.tgz#32dea2afb3e9926f02ee5ce8794902691a676bf3" - integrity sha512-PPmu8eEeG9saEUvI97fm4OYxXVB6bFvyNTyiUOBichBpFG8A1Ljw3bY62+5oOjDEMHRnd0Y7HQ+x7uzxOzC6JA== - -node-gyp-build@^4.2.2: - version "4.2.3" - resolved "https://registry.yarnpkg.com/node-gyp-build/-/node-gyp-build-4.2.3.tgz#ce6277f853835f718829efb47db20f3e4d9c4739" - integrity sha512-MN6ZpzmfNCRM+3t57PTJHgHyw/h4OWnZ6mR8P5j/uZtqQr46RRuDE/P+g3n0YR/AiYXeWixZZzaip77gdICfRg== - -node-gyp@^7.1.0: - version "7.1.2" - resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-7.1.2.tgz#21a810aebb187120251c3bcec979af1587b188ae" - integrity sha512-CbpcIo7C3eMu3dL1c3d0xw449fHIGALIJsRP4DDPHpyiW8vcriNY7ubh9TE4zEKfSxscY7PjeFnshE7h75ynjQ== - dependencies: - env-paths "^2.2.0" - glob "^7.1.4" - graceful-fs "^4.2.3" - nopt "^5.0.0" - npmlog "^4.1.2" - request "^2.88.2" - rimraf "^3.0.2" - semver "^7.3.2" - tar "^6.0.2" - which "^2.0.2" - -node-notifier@^9.0.0: - version "9.0.1" - resolved "https://registry.yarnpkg.com/node-notifier/-/node-notifier-9.0.1.tgz#cea837f4c5e733936c7b9005e6545cea825d1af4" - integrity sha512-fPNFIp2hF/Dq7qLDzSg4vZ0J4e9v60gJR+Qx7RbjbWqzPDdEqeVpEx5CFeDAELIl+A/woaaNn1fQ5nEVerMxJg== - dependencies: - growly "^1.3.0" - is-wsl "^2.2.0" - semver "^7.3.2" - shellwords "^0.1.1" - uuid "^8.3.0" - which "^2.0.2" - -node-releases@^1.1.75: - version "1.1.75" - resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.75.tgz#6dd8c876b9897a1b8e5a02de26afa79bb54ebbfe" - integrity sha512-Qe5OUajvqrqDSy6wrWFmMwfJ0jVgwiw4T3KqmbTcZ62qW0gQkheXYhcFM1+lOVcGUoRxcEcfyvFMAnDgaF1VWw== - -nopt@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/nopt/-/nopt-5.0.0.tgz#530942bb58a512fccafe53fe210f13a25355dc88" - integrity sha512-Tbj67rffqceeLpcRXrT7vKAN8CwfPeIBgM7E6iBkmKLV7bEMwpGgYLGv0jACUsECaa/vuxP0IjEont6umdMgtQ== - dependencies: - abbrev "1" - -normalize-path@^2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-2.1.1.tgz#1ab28b556e198363a8c1a6f7e6fa20137fe6aed9" - integrity sha1-GrKLVW4Zg2Oowab35vogE3/mrtk= - dependencies: - remove-trailing-separator "^1.0.1" - -normalize-path@^3.0.0, normalize-path@~3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65" - integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA== - -normalize-range@^0.1.2: - version "0.1.2" - resolved "https://registry.yarnpkg.com/normalize-range/-/normalize-range-0.1.2.tgz#2d10c06bdfd312ea9777695a4d28439456b75942" - integrity sha1-LRDAa9/TEuqXd2laTShDlFa3WUI= - -normalize-url@^6.0.1: - version "6.1.0" - resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-6.1.0.tgz#40d0885b535deffe3f3147bec877d05fe4c5668a" - integrity sha512-DlL+XwOy3NxAQ8xuC0okPgK46iuVNAK01YN7RueYBqqFeGsBjV9XmCAzAdgt+667bCl5kPh9EqKKDwnaPG1I7A== - -npm-bundled@^1.1.1: - version "1.1.2" - resolved "https://registry.yarnpkg.com/npm-bundled/-/npm-bundled-1.1.2.tgz#944c78789bd739035b70baa2ca5cc32b8d860bc1" - integrity sha512-x5DHup0SuyQcmL3s7Rx/YQ8sbw/Hzg0rj48eN0dV7hf5cmQq5PXIeioroH3raV1QC1yh3uTYuMThvEQF3iKgGQ== - dependencies: - npm-normalize-package-bin "^1.0.1" - -npm-install-checks@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/npm-install-checks/-/npm-install-checks-4.0.0.tgz#a37facc763a2fde0497ef2c6d0ac7c3fbe00d7b4" - integrity sha512-09OmyDkNLYwqKPOnbI8exiOZU2GVVmQp7tgez2BPi5OZC8M82elDAps7sxC4l//uSUtotWqoEIDwjRvWH4qz8w== - dependencies: - semver "^7.1.1" - -npm-normalize-package-bin@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/npm-normalize-package-bin/-/npm-normalize-package-bin-1.0.1.tgz#6e79a41f23fd235c0623218228da7d9c23b8f6e2" - integrity sha512-EPfafl6JL5/rU+ot6P3gRSCpPDW5VmIzX959Ob1+ySFUuuYHWHekXpwdUZcKP5C+DS4GEtdJluwBjnsNDl+fSA== - -npm-package-arg@8.1.5, npm-package-arg@^8.0.0, npm-package-arg@^8.0.1, npm-package-arg@^8.1.2: - version "8.1.5" - resolved "https://registry.yarnpkg.com/npm-package-arg/-/npm-package-arg-8.1.5.tgz#3369b2d5fe8fdc674baa7f1786514ddc15466e44" - integrity sha512-LhgZrg0n0VgvzVdSm1oiZworPbTxYHUJCgtsJW8mGvlDpxTM1vSJc3m5QZeUkhAHIzbz3VCHd/R4osi1L1Tg/Q== - dependencies: - hosted-git-info "^4.0.1" - semver "^7.3.4" - validate-npm-package-name "^3.0.0" - -npm-packlist@^2.1.4: - version "2.2.2" - resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-2.2.2.tgz#076b97293fa620f632833186a7a8f65aaa6148c8" - integrity sha512-Jt01acDvJRhJGthnUJVF/w6gumWOZxO7IkpY/lsX9//zqQgnF7OJaxgQXcerd4uQOLu7W5bkb4mChL9mdfm+Zg== - dependencies: - glob "^7.1.6" - ignore-walk "^3.0.3" - npm-bundled "^1.1.1" - npm-normalize-package-bin "^1.0.1" - -npm-pick-manifest@6.1.1, npm-pick-manifest@^6.0.0, npm-pick-manifest@^6.1.1: - version "6.1.1" - resolved "https://registry.yarnpkg.com/npm-pick-manifest/-/npm-pick-manifest-6.1.1.tgz#7b5484ca2c908565f43b7f27644f36bb816f5148" - integrity sha512-dBsdBtORT84S8V8UTad1WlUyKIY9iMsAmqxHbLdeEeBNMLQDlDWWra3wYUx9EBEIiG/YwAy0XyNHDd2goAsfuA== - dependencies: - npm-install-checks "^4.0.0" - npm-normalize-package-bin "^1.0.1" - npm-package-arg "^8.1.2" - semver "^7.3.4" - -npm-registry-fetch@^11.0.0: - version "11.0.0" - resolved "https://registry.yarnpkg.com/npm-registry-fetch/-/npm-registry-fetch-11.0.0.tgz#68c1bb810c46542760d62a6a965f85a702d43a76" - integrity sha512-jmlgSxoDNuhAtxUIG6pVwwtz840i994dL14FoNVZisrmZW5kWd63IUTNv1m/hyRSGSqWjCUp/YZlS1BJyNp9XA== - dependencies: - make-fetch-happen "^9.0.1" - minipass "^3.1.3" - minipass-fetch "^1.3.0" - minipass-json-stream "^1.0.1" - minizlib "^2.0.0" - npm-package-arg "^8.0.0" - -npm-run-path@^2.0.0: - version "2.0.2" - resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-2.0.2.tgz#35a9232dfa35d7067b4cb2ddf2357b1871536c5f" - integrity sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8= - dependencies: - path-key "^2.0.0" - -npm-run-path@^4.0.0: - version "4.0.1" - resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-4.0.1.tgz#b7ecd1e5ed53da8e37a55e1c2269e0b97ed748ea" - integrity sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw== - dependencies: - path-key "^3.0.0" - -npmlog@^4.1.2: - version "4.1.2" - resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b" - integrity sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg== - dependencies: - are-we-there-yet "~1.1.2" - console-control-strings "~1.1.0" - gauge "~2.7.3" - set-blocking "~2.0.0" - -nth-check@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/nth-check/-/nth-check-2.0.0.tgz#1bb4f6dac70072fc313e8c9cd1417b5074c0a125" - integrity sha512-i4sc/Kj8htBrAiH1viZ0TgU8Y5XqCaV/FziYK6TBczxmeKm3AEFWqqF3195yKudrarqy7Zu80Ra5dobFjn9X/Q== - dependencies: - boolbase "^1.0.0" - -num2fraction@^1.2.2: - version "1.2.2" - resolved "https://registry.yarnpkg.com/num2fraction/-/num2fraction-1.2.2.tgz#6f682b6a027a4e9ddfa4564cd2589d1d4e669ede" - integrity sha1-b2gragJ6Tp3fpFZM0lidHU5mnt4= - -number-is-nan@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d" - integrity sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0= - -oauth-sign@~0.9.0: - version "0.9.0" - resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.9.0.tgz#47a7b016baa68b5fa0ecf3dee08a85c679ac6455" - integrity sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ== - -object-assign@^4, object-assign@^4.0.1, object-assign@^4.1.0: - version "4.1.1" - resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863" - integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM= - -object-copy@^0.1.0: - version "0.1.0" - resolved "https://registry.yarnpkg.com/object-copy/-/object-copy-0.1.0.tgz#7e7d858b781bd7c991a41ba975ed3812754e998c" - integrity sha1-fn2Fi3gb18mRpBupde04EnVOmYw= - dependencies: - copy-descriptor "^0.1.0" - define-property "^0.2.5" - kind-of "^3.0.3" - -object-is@^1.0.1: - version "1.1.5" - resolved "https://registry.yarnpkg.com/object-is/-/object-is-1.1.5.tgz#b9deeaa5fc7f1846a0faecdceec138e5778f53ac" - integrity sha512-3cyDsyHgtmi7I7DfSSI2LDp6SK2lwvtbg0p0R1e0RvTqF5ceGx+K2dfSjm1bKDMVCFEDAQvy+o8c6a7VujOddw== - dependencies: - call-bind "^1.0.2" - define-properties "^1.1.3" - -object-keys@^1.0.12, object-keys@^1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e" - integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA== - -object-visit@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/object-visit/-/object-visit-1.0.1.tgz#f79c4493af0c5377b59fe39d395e41042dd045bb" - integrity sha1-95xEk68MU3e1n+OdOV5BBC3QRbs= - dependencies: - isobject "^3.0.0" - -object.assign@^4.1.0: - version "4.1.2" - resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.2.tgz#0ed54a342eceb37b38ff76eb831a0e788cb63940" - integrity sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ== - dependencies: - call-bind "^1.0.0" - define-properties "^1.1.3" - has-symbols "^1.0.1" - object-keys "^1.1.1" - -object.pick@^1.3.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/object.pick/-/object.pick-1.3.0.tgz#87a10ac4c1694bd2e1cbf53591a66141fb5dd747" - integrity sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c= - dependencies: - isobject "^3.0.1" - -obuf@^1.0.0, obuf@^1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/obuf/-/obuf-1.1.2.tgz#09bea3343d41859ebd446292d11c9d4db619084e" - integrity sha512-PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg== - -on-finished@~2.3.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.3.0.tgz#20f1336481b083cd75337992a16971aa2d906947" - integrity sha1-IPEzZIGwg811M3mSoWlxqi2QaUc= - dependencies: - ee-first "1.1.1" - -on-headers@~1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/on-headers/-/on-headers-1.0.2.tgz#772b0ae6aaa525c399e489adfad90c403eb3c28f" - integrity sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA== - -once@^1.3.0, once@^1.3.1, once@^1.4.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1" - integrity sha1-WDsap3WWHUsROsF9nFC6753Xa9E= - dependencies: - wrappy "1" - -onetime@^5.1.0: - version "5.1.2" - resolved "https://registry.yarnpkg.com/onetime/-/onetime-5.1.2.tgz#d0e96ebb56b07476df1dd9c4806e5237985ca45e" - integrity sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg== - dependencies: - mimic-fn "^2.1.0" - -open@8.2.1: - version "8.2.1" - resolved "https://registry.yarnpkg.com/open/-/open-8.2.1.tgz#82de42da0ccbf429bc12d099dad2e0975e14e8af" - integrity sha512-rXILpcQlkF/QuFez2BJDf3GsqpjGKbkUUToAIGo9A0Q6ZkoSGogZJulrUdwRkrAsoQvoZsrjCYt8+zblOk7JQQ== - dependencies: - define-lazy-prop "^2.0.0" - is-docker "^2.1.1" - is-wsl "^2.2.0" - -opn@^5.5.0: - version "5.5.0" - resolved "https://registry.yarnpkg.com/opn/-/opn-5.5.0.tgz#fc7164fab56d235904c51c3b27da6758ca3b9bfc" - integrity sha512-PqHpggC9bLV0VeWcdKhkpxY+3JTzetLSqTCWL/z/tFIbI6G8JCjondXklT1JinczLz2Xib62sSp0T/gKT4KksA== - dependencies: - is-wsl "^1.1.0" - -ora@5.4.1, ora@^5.3.0: - version "5.4.1" - resolved "https://registry.yarnpkg.com/ora/-/ora-5.4.1.tgz#1b2678426af4ac4a509008e5e4ac9e9959db9e18" - integrity sha512-5b6Y85tPxZZ7QytO+BQzysW31HJku27cRIlkbAXaNx+BdcVi+LlRFmVXzeF6a7JCwJpyw5c4b+YSVImQIrBpuQ== - dependencies: - bl "^4.1.0" - chalk "^4.1.0" - cli-cursor "^3.1.0" - cli-spinners "^2.5.0" - is-interactive "^1.0.0" - is-unicode-supported "^0.1.0" - log-symbols "^4.1.0" - strip-ansi "^6.0.0" - wcwidth "^1.0.1" - -original@^1.0.0: - version "1.0.2" - resolved "https://registry.yarnpkg.com/original/-/original-1.0.2.tgz#e442a61cffe1c5fd20a65f3261c26663b303f25f" - integrity sha512-hyBVl6iqqUOJ8FqRe+l/gS8H+kKYjrEndd5Pm1MfBtsEKA038HkkdbAl/72EAXGyonD/PFsvmVG+EvcIpliMBg== - dependencies: - url-parse "^1.4.3" - -os-tmpdir@~1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274" - integrity sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ= - -ospath@^1.2.2: - version "1.2.2" - resolved "https://registry.yarnpkg.com/ospath/-/ospath-1.2.2.tgz#1276639774a3f8ef2572f7fe4280e0ea4550c07b" - integrity sha1-EnZjl3Sj+O8lcvf+QoDg6kVQwHs= - -p-defer@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/p-defer/-/p-defer-1.0.0.tgz#9f6eb182f6c9aa8cd743004a7d4f96b196b0fb0c" - integrity sha1-n26xgvbJqozXQwBKfU+WsZaw+ww= - -p-finally@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae" - integrity sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4= - -p-limit@^2.0.0, p-limit@^2.2.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.3.0.tgz#3dd33c647a214fdfffd835933eb086da0dc21db1" - integrity sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w== - dependencies: - p-try "^2.0.0" - -p-limit@^3.0.2, p-limit@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-3.1.0.tgz#e1daccbe78d0d1388ca18c64fea38e3e57e3706b" - integrity sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ== - dependencies: - yocto-queue "^0.1.0" - -p-locate@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-3.0.0.tgz#322d69a05c0264b25997d9f40cd8a891ab0064a4" - integrity sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ== - dependencies: - p-limit "^2.0.0" - -p-locate@^4.1.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-4.1.0.tgz#a3428bb7088b3a60292f66919278b7c297ad4f07" - integrity sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A== - dependencies: - p-limit "^2.2.0" - -p-map@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/p-map/-/p-map-2.1.0.tgz#310928feef9c9ecc65b68b17693018a665cea175" - integrity sha512-y3b8Kpd8OAN444hxfBbFfj1FY/RjtTd8tzYwhUqNYXx0fXx2iX4maP4Qr6qhIKbQXI02wTLAda4fYUbDagTUFw== - -p-map@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/p-map/-/p-map-4.0.0.tgz#bb2f95a5eda2ec168ec9274e06a747c3e2904d2b" - integrity sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ== - dependencies: - aggregate-error "^3.0.0" - -p-retry@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/p-retry/-/p-retry-3.0.1.tgz#316b4c8893e2c8dc1cfa891f406c4b422bebf328" - integrity sha512-XE6G4+YTTkT2a0UWb2kjZe8xNwf8bIbnqpc/IS/idOBVhyves0mK5OJgeocjx7q5pvX/6m23xuzVPYT1uGM73w== - dependencies: - retry "^0.12.0" - -p-try@^2.0.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6" - integrity sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ== - -pacote@11.3.5: - version "11.3.5" - resolved "https://registry.yarnpkg.com/pacote/-/pacote-11.3.5.tgz#73cf1fc3772b533f575e39efa96c50be8c3dc9d2" - integrity sha512-fT375Yczn4zi+6Hkk2TBe1x1sP8FgFsEIZ2/iWaXY2r/NkhDJfxbcn5paz1+RTFCyNf+dPnaoBDJoAxXSU8Bkg== - dependencies: - "@npmcli/git" "^2.1.0" - "@npmcli/installed-package-contents" "^1.0.6" - "@npmcli/promise-spawn" "^1.2.0" - "@npmcli/run-script" "^1.8.2" - cacache "^15.0.5" - chownr "^2.0.0" - fs-minipass "^2.1.0" - infer-owner "^1.0.4" - minipass "^3.1.3" - mkdirp "^1.0.3" - npm-package-arg "^8.0.1" - npm-packlist "^2.1.4" - npm-pick-manifest "^6.0.0" - npm-registry-fetch "^11.0.0" - promise-retry "^2.0.1" - read-package-json-fast "^2.0.1" - rimraf "^3.0.2" - ssri "^8.0.1" - tar "^6.1.0" - -pako@^1.0.3: - version "1.0.11" - resolved "https://registry.yarnpkg.com/pako/-/pako-1.0.11.tgz#6c9599d340d54dfd3946380252a35705a6b992bf" - integrity sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw== - -parent-module@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/parent-module/-/parent-module-1.0.1.tgz#691d2709e78c79fae3a156622452d00762caaaa2" - integrity sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g== - dependencies: - callsites "^3.0.0" - -parse-json@^5.0.0: - version "5.2.0" - resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-5.2.0.tgz#c76fc66dee54231c962b22bcc8a72cf2f99753cd" - integrity sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg== - dependencies: - "@babel/code-frame" "^7.0.0" - error-ex "^1.3.1" - json-parse-even-better-errors "^2.3.0" - lines-and-columns "^1.1.6" - -parse-node-version@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/parse-node-version/-/parse-node-version-1.0.1.tgz#e2b5dbede00e7fa9bc363607f53327e8b073189b" - integrity sha512-3YHlOa/JgH6Mnpr05jP9eDG254US9ek25LyIxZlDItp2iJtwyaXQb57lBYLdT3MowkUFYEV2XXNAYIPlESvJlA== - -parse5-html-rewriting-stream@6.0.1: - version "6.0.1" - resolved "https://registry.yarnpkg.com/parse5-html-rewriting-stream/-/parse5-html-rewriting-stream-6.0.1.tgz#de1820559317ab4e451ea72dba05fddfd914480b" - integrity sha512-vwLQzynJVEfUlURxgnf51yAJDQTtVpNyGD8tKi2Za7m+akukNHxCcUQMAa/mUGLhCeicFdpy7Tlvj8ZNKadprg== - dependencies: - parse5 "^6.0.1" - parse5-sax-parser "^6.0.1" - -parse5-htmlparser2-tree-adapter@^6.0.1: - version "6.0.1" - resolved "https://registry.yarnpkg.com/parse5-htmlparser2-tree-adapter/-/parse5-htmlparser2-tree-adapter-6.0.1.tgz#2cdf9ad823321140370d4dbf5d3e92c7c8ddc6e6" - integrity sha512-qPuWvbLgvDGilKc5BoicRovlT4MtYT6JfJyBOMDsKoiT+GiuP5qyrPCnR9HcPECIJJmZh5jRndyNThnhhb/vlA== - dependencies: - parse5 "^6.0.1" - -parse5-sax-parser@^6.0.1: - version "6.0.1" - resolved "https://registry.yarnpkg.com/parse5-sax-parser/-/parse5-sax-parser-6.0.1.tgz#98b4d366b5b266a7cd90b4b58906667af882daba" - integrity sha512-kXX+5S81lgESA0LsDuGjAlBybImAChYRMT+/uKCEXFBFOeEhS52qUCydGhU3qLRD8D9DVjaUo821WK7DM4iCeg== - dependencies: - parse5 "^6.0.1" - -parse5@^6.0.1: - version "6.0.1" - resolved "https://registry.yarnpkg.com/parse5/-/parse5-6.0.1.tgz#e1a1c085c569b3dc08321184f19a39cc27f7c30b" - integrity sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw== - -parseurl@~1.3.2, parseurl@~1.3.3: - version "1.3.3" - resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.3.tgz#9da19e7bee8d12dff0513ed5b76957793bc2e8d4" - integrity sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ== - -pascalcase@^0.1.1: - version "0.1.1" - resolved "https://registry.yarnpkg.com/pascalcase/-/pascalcase-0.1.1.tgz#b363e55e8006ca6fe21784d2db22bd15d7917f14" - integrity sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ= - -path-dirname@^1.0.0: - version "1.0.2" - resolved "https://registry.yarnpkg.com/path-dirname/-/path-dirname-1.0.2.tgz#cc33d24d525e099a5388c0336c6e32b9160609e0" - integrity sha1-zDPSTVJeCZpTiMAzbG4yuRYGCeA= - -path-exists@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-3.0.0.tgz#ce0ebeaa5f78cb18925ea7d810d7b59b010fd515" - integrity sha1-zg6+ql94yxiSXqfYENe1mwEP1RU= - -path-exists@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-4.0.0.tgz#513bdbe2d3b95d7762e8c1137efa195c6c61b5b3" - integrity sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w== - -path-is-absolute@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f" - integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18= - -path-is-inside@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/path-is-inside/-/path-is-inside-1.0.2.tgz#365417dede44430d1c11af61027facf074bdfc53" - integrity sha1-NlQX3t5EQw0cEa9hAn+s8HS9/FM= - -path-key@^2.0.0, path-key@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/path-key/-/path-key-2.0.1.tgz#411cadb574c5a140d3a4b1910d40d80cc9f40b40" - integrity sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A= - -path-key@^3.0.0, path-key@^3.1.0: - version "3.1.1" - resolved "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375" - integrity sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q== - -path-parse@^1.0.6: - version "1.0.7" - resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz#fbc114b60ca42b30d9daf5858e4bd68bbedb6735" - integrity sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw== - -path-to-regexp@0.1.7: - version "0.1.7" - resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.7.tgz#df604178005f522f15eb4490e7247a1bfaa67f8c" - integrity sha1-32BBeABfUi8V60SQ5yR6G/qmf4w= - -path-type@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/path-type/-/path-type-4.0.0.tgz#84ed01c0a7ba380afe09d90a8c180dcd9d03043b" - integrity sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw== - -pend@~1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/pend/-/pend-1.2.0.tgz#7a57eb550a6783f9115331fcf4663d5c8e007a50" - integrity sha1-elfrVQpng/kRUzH89GY9XI4AelA= - -performance-now@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b" - integrity sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns= - -picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.2.3: - version "2.3.0" - resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.0.tgz#f1f061de8f6a4bf022892e2d128234fb98302972" - integrity sha512-lY1Q/PiJGC2zOv/z391WOTD+Z02bCgsFfvxoXXf6h7kv9o+WmsmzYqrAwY63sNgOxE4xEdq0WyUnXfKeBrSvYw== - -pify@^2.0.0, pify@^2.2.0, pify@^2.3.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c" - integrity sha1-7RQaasBDqEnqWISY59yosVMw6Qw= - -pify@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/pify/-/pify-4.0.1.tgz#4b2cd25c50d598735c50292224fd8c6df41e3231" - integrity sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g== - -pinkie-promise@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/pinkie-promise/-/pinkie-promise-2.0.1.tgz#2135d6dfa7a358c069ac9b178776288228450ffa" - integrity sha1-ITXW36ejWMBprJsXh3YogihFD/o= - dependencies: - pinkie "^2.0.0" - -pinkie@^2.0.0: - version "2.0.4" - resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870" - integrity sha1-clVrgM+g1IqXToDnckjoDtT3+HA= - -piscina@3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/piscina/-/piscina-3.1.0.tgz#2333636865b6cb69c5a370bbc499a98cabcf3e04" - integrity sha512-KTW4sjsCD34MHrUbx9eAAbuUSpVj407hQSgk/6Epkg0pbRBmv4a3UX7Sr8wxm9xYqQLnsN4mFOjqGDzHAdgKQg== - dependencies: - eventemitter-asyncresource "^1.0.0" - hdr-histogram-js "^2.0.1" - hdr-histogram-percentiles-obj "^3.0.0" - optionalDependencies: - nice-napi "^1.0.2" - -pkg-dir@4.2.0, pkg-dir@^4.1.0: - version "4.2.0" - resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-4.2.0.tgz#f099133df7ede422e81d1d8448270eeb3e4261f3" - integrity sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ== - dependencies: - find-up "^4.0.0" - -pkg-dir@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-3.0.0.tgz#2749020f239ed990881b1f71210d51eb6523bea3" - integrity sha512-/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw== - dependencies: - find-up "^3.0.0" - -pngjs@^3.3.0: - version "3.4.0" - resolved "https://registry.yarnpkg.com/pngjs/-/pngjs-3.4.0.tgz#99ca7d725965fb655814eaf65f38f12bbdbf555f" - integrity sha512-NCrCHhWmnQklfH4MtJMRjZ2a8c80qXeMlQMv2uVp9ISJMTt562SbGd6n2oq0PaPgKm7Z6pL9E2UlLIhC+SHL3w== - -popper.js@^1.16.1: - version "1.16.1" - resolved "https://registry.yarnpkg.com/popper.js/-/popper.js-1.16.1.tgz#2a223cb3dc7b6213d740e40372be40de43e65b1b" - integrity sha512-Wb4p1J4zyFTbM+u6WuO4XstYx4Ky9Cewe4DWrel7B0w6VVICvPwdOpotjzcf6eD8TsckVnIMNONQyPIUFOUbCQ== - -portfinder@^1.0.26: - version "1.0.28" - resolved "https://registry.yarnpkg.com/portfinder/-/portfinder-1.0.28.tgz#67c4622852bd5374dd1dd900f779f53462fac778" - integrity sha512-Se+2isanIcEqf2XMHjyUKskczxbPH7dQnlMjXX6+dybayyHvAf/TCgyMRlzf/B6QDhAEFOGes0pzRo3by4AbMA== - dependencies: - async "^2.6.2" - debug "^3.1.1" - mkdirp "^0.5.5" - -posix-character-classes@^0.1.0: - version "0.1.1" - resolved "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz#01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab" - integrity sha1-AerA/jta9xoqbAL+q7jB/vfgDqs= - -postcss-attribute-case-insensitive@^4.0.1: - version "4.0.2" - resolved "https://registry.yarnpkg.com/postcss-attribute-case-insensitive/-/postcss-attribute-case-insensitive-4.0.2.tgz#d93e46b504589e94ac7277b0463226c68041a880" - integrity sha512-clkFxk/9pcdb4Vkn0hAHq3YnxBQ2p0CGD1dy24jN+reBck+EWxMbxSUqN4Yj7t0w8csl87K6p0gxBe1utkJsYA== - dependencies: - postcss "^7.0.2" - postcss-selector-parser "^6.0.2" - -postcss-calc@^8.0.0: - version "8.0.0" - resolved "https://registry.yarnpkg.com/postcss-calc/-/postcss-calc-8.0.0.tgz#a05b87aacd132740a5db09462a3612453e5df90a" - integrity sha512-5NglwDrcbiy8XXfPM11F3HeC6hoT9W7GUH/Zi5U/p7u3Irv4rHhdDcIZwG0llHXV4ftsBjpfWMXAnXNl4lnt8g== - dependencies: - postcss-selector-parser "^6.0.2" - postcss-value-parser "^4.0.2" - -postcss-color-functional-notation@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/postcss-color-functional-notation/-/postcss-color-functional-notation-2.0.1.tgz#5efd37a88fbabeb00a2966d1e53d98ced93f74e0" - integrity sha512-ZBARCypjEDofW4P6IdPVTLhDNXPRn8T2s1zHbZidW6rPaaZvcnCS2soYFIQJrMZSxiePJ2XIYTlcb2ztr/eT2g== - dependencies: - postcss "^7.0.2" - postcss-values-parser "^2.0.0" - -postcss-color-gray@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/postcss-color-gray/-/postcss-color-gray-5.0.0.tgz#532a31eb909f8da898ceffe296fdc1f864be8547" - integrity sha512-q6BuRnAGKM/ZRpfDascZlIZPjvwsRye7UDNalqVz3s7GDxMtqPY6+Q871liNxsonUw8oC61OG+PSaysYpl1bnw== - dependencies: - "@csstools/convert-colors" "^1.4.0" - postcss "^7.0.5" - postcss-values-parser "^2.0.0" - -postcss-color-hex-alpha@^5.0.3: - version "5.0.3" - resolved "https://registry.yarnpkg.com/postcss-color-hex-alpha/-/postcss-color-hex-alpha-5.0.3.tgz#a8d9ca4c39d497c9661e374b9c51899ef0f87388" - integrity sha512-PF4GDel8q3kkreVXKLAGNpHKilXsZ6xuu+mOQMHWHLPNyjiUBOr75sp5ZKJfmv1MCus5/DWUGcK9hm6qHEnXYw== - dependencies: - postcss "^7.0.14" - postcss-values-parser "^2.0.1" - -postcss-color-mod-function@^3.0.3: - version "3.0.3" - resolved "https://registry.yarnpkg.com/postcss-color-mod-function/-/postcss-color-mod-function-3.0.3.tgz#816ba145ac11cc3cb6baa905a75a49f903e4d31d" - integrity sha512-YP4VG+xufxaVtzV6ZmhEtc+/aTXH3d0JLpnYfxqTvwZPbJhWqp8bSY3nfNzNRFLgB4XSaBA82OE4VjOOKpCdVQ== - dependencies: - "@csstools/convert-colors" "^1.4.0" - postcss "^7.0.2" - postcss-values-parser "^2.0.0" - -postcss-color-rebeccapurple@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/postcss-color-rebeccapurple/-/postcss-color-rebeccapurple-4.0.1.tgz#c7a89be872bb74e45b1e3022bfe5748823e6de77" - integrity sha512-aAe3OhkS6qJXBbqzvZth2Au4V3KieR5sRQ4ptb2b2O8wgvB3SJBsdG+jsn2BZbbwekDG8nTfcCNKcSfe/lEy8g== - dependencies: - postcss "^7.0.2" - postcss-values-parser "^2.0.0" - -postcss-colormin@^5.2.0: - version "5.2.0" - resolved "https://registry.yarnpkg.com/postcss-colormin/-/postcss-colormin-5.2.0.tgz#2b620b88c0ff19683f3349f4cf9e24ebdafb2c88" - integrity sha512-+HC6GfWU3upe5/mqmxuqYZ9B2Wl4lcoUUNkoaX59nEWV4EtADCMiBqui111Bu8R8IvaZTmqmxrqOAqjbHIwXPw== - dependencies: - browserslist "^4.16.6" - caniuse-api "^3.0.0" - colord "^2.0.1" - postcss-value-parser "^4.1.0" - -postcss-convert-values@^5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/postcss-convert-values/-/postcss-convert-values-5.0.1.tgz#4ec19d6016534e30e3102fdf414e753398645232" - integrity sha512-C3zR1Do2BkKkCgC0g3sF8TS0koF2G+mN8xxayZx3f10cIRmTaAnpgpRQZjNekTZxM2ciSPoh2IWJm0VZx8NoQg== - dependencies: - postcss-value-parser "^4.1.0" - -postcss-custom-media@^7.0.8: - version "7.0.8" - resolved "https://registry.yarnpkg.com/postcss-custom-media/-/postcss-custom-media-7.0.8.tgz#fffd13ffeffad73621be5f387076a28b00294e0c" - integrity sha512-c9s5iX0Ge15o00HKbuRuTqNndsJUbaXdiNsksnVH8H4gdc+zbLzr/UasOwNG6CTDpLFekVY4672eWdiiWu2GUg== - dependencies: - postcss "^7.0.14" - -postcss-custom-properties@^8.0.11: - version "8.0.11" - resolved "https://registry.yarnpkg.com/postcss-custom-properties/-/postcss-custom-properties-8.0.11.tgz#2d61772d6e92f22f5e0d52602df8fae46fa30d97" - integrity sha512-nm+o0eLdYqdnJ5abAJeXp4CEU1c1k+eB2yMCvhgzsds/e0umabFrN6HoTy/8Q4K5ilxERdl/JD1LO5ANoYBeMA== - dependencies: - postcss "^7.0.17" - postcss-values-parser "^2.0.1" - -postcss-custom-selectors@^5.1.2: - version "5.1.2" - resolved "https://registry.yarnpkg.com/postcss-custom-selectors/-/postcss-custom-selectors-5.1.2.tgz#64858c6eb2ecff2fb41d0b28c9dd7b3db4de7fba" - integrity sha512-DSGDhqinCqXqlS4R7KGxL1OSycd1lydugJ1ky4iRXPHdBRiozyMHrdu0H3o7qNOCiZwySZTUI5MV0T8QhCLu+w== - dependencies: - postcss "^7.0.2" - postcss-selector-parser "^5.0.0-rc.3" - -postcss-dir-pseudo-class@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/postcss-dir-pseudo-class/-/postcss-dir-pseudo-class-5.0.0.tgz#6e3a4177d0edb3abcc85fdb6fbb1c26dabaeaba2" - integrity sha512-3pm4oq8HYWMZePJY+5ANriPs3P07q+LW6FAdTlkFH2XqDdP4HeeJYMOzn0HYLhRSjBO3fhiqSwwU9xEULSrPgw== - dependencies: - postcss "^7.0.2" - postcss-selector-parser "^5.0.0-rc.3" - -postcss-discard-comments@^5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/postcss-discard-comments/-/postcss-discard-comments-5.0.1.tgz#9eae4b747cf760d31f2447c27f0619d5718901fe" - integrity sha512-lgZBPTDvWrbAYY1v5GYEv8fEO/WhKOu/hmZqmCYfrpD6eyDWWzAOsl2rF29lpvziKO02Gc5GJQtlpkTmakwOWg== - -postcss-discard-duplicates@^5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/postcss-discard-duplicates/-/postcss-discard-duplicates-5.0.1.tgz#68f7cc6458fe6bab2e46c9f55ae52869f680e66d" - integrity sha512-svx747PWHKOGpAXXQkCc4k/DsWo+6bc5LsVrAsw+OU+Ibi7klFZCyX54gjYzX4TH+f2uzXjRviLARxkMurA2bA== - -postcss-discard-empty@^5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/postcss-discard-empty/-/postcss-discard-empty-5.0.1.tgz#ee136c39e27d5d2ed4da0ee5ed02bc8a9f8bf6d8" - integrity sha512-vfU8CxAQ6YpMxV2SvMcMIyF2LX1ZzWpy0lqHDsOdaKKLQVQGVP1pzhrI9JlsO65s66uQTfkQBKBD/A5gp9STFw== - -postcss-discard-overridden@^5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/postcss-discard-overridden/-/postcss-discard-overridden-5.0.1.tgz#454b41f707300b98109a75005ca4ab0ff2743ac6" - integrity sha512-Y28H7y93L2BpJhrdUR2SR2fnSsT+3TVx1NmVQLbcnZWwIUpJ7mfcTC6Za9M2PG6w8j7UQRfzxqn8jU2VwFxo3Q== - -postcss-double-position-gradients@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/postcss-double-position-gradients/-/postcss-double-position-gradients-1.0.0.tgz#fc927d52fddc896cb3a2812ebc5df147e110522e" - integrity sha512-G+nV8EnQq25fOI8CH/B6krEohGWnF5+3A6H/+JEpOncu5dCnkS1QQ6+ct3Jkaepw1NGVqqOZH6lqrm244mCftA== - dependencies: - postcss "^7.0.5" - postcss-values-parser "^2.0.0" - -postcss-env-function@^2.0.2: - version "2.0.2" - resolved "https://registry.yarnpkg.com/postcss-env-function/-/postcss-env-function-2.0.2.tgz#0f3e3d3c57f094a92c2baf4b6241f0b0da5365d7" - integrity sha512-rwac4BuZlITeUbiBq60h/xbLzXY43qOsIErngWa4l7Mt+RaSkT7QBjXVGTcBHupykkblHMDrBFh30zchYPaOUw== - dependencies: - postcss "^7.0.2" - postcss-values-parser "^2.0.0" - -postcss-focus-visible@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/postcss-focus-visible/-/postcss-focus-visible-4.0.0.tgz#477d107113ade6024b14128317ade2bd1e17046e" - integrity sha512-Z5CkWBw0+idJHSV6+Bgf2peDOFf/x4o+vX/pwcNYrWpXFrSfTkQ3JQ1ojrq9yS+upnAlNRHeg8uEwFTgorjI8g== - dependencies: - postcss "^7.0.2" - -postcss-focus-within@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/postcss-focus-within/-/postcss-focus-within-3.0.0.tgz#763b8788596cee9b874c999201cdde80659ef680" - integrity sha512-W0APui8jQeBKbCGZudW37EeMCjDeVxKgiYfIIEo8Bdh5SpB9sxds/Iq8SEuzS0Q4YFOlG7EPFulbbxujpkrV2w== - dependencies: - postcss "^7.0.2" - -postcss-font-variant@^4.0.0: - version "4.0.1" - resolved "https://registry.yarnpkg.com/postcss-font-variant/-/postcss-font-variant-4.0.1.tgz#42d4c0ab30894f60f98b17561eb5c0321f502641" - integrity sha512-I3ADQSTNtLTTd8uxZhtSOrTCQ9G4qUVKPjHiDk0bV75QSxXjVWiJVJ2VLdspGUi9fbW9BcjKJoRvxAH1pckqmA== - dependencies: - postcss "^7.0.2" - -postcss-gap-properties@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/postcss-gap-properties/-/postcss-gap-properties-2.0.0.tgz#431c192ab3ed96a3c3d09f2ff615960f902c1715" - integrity sha512-QZSqDaMgXCHuHTEzMsS2KfVDOq7ZFiknSpkrPJY6jmxbugUPTuSzs/vuE5I3zv0WAS+3vhrlqhijiprnuQfzmg== - dependencies: - postcss "^7.0.2" - -postcss-image-set-function@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/postcss-image-set-function/-/postcss-image-set-function-3.0.1.tgz#28920a2f29945bed4c3198d7df6496d410d3f288" - integrity sha512-oPTcFFip5LZy8Y/whto91L9xdRHCWEMs3e1MdJxhgt4jy2WYXfhkng59fH5qLXSCPN8k4n94p1Czrfe5IOkKUw== - dependencies: - postcss "^7.0.2" - postcss-values-parser "^2.0.0" - -postcss-import@14.0.2: - version "14.0.2" - resolved "https://registry.yarnpkg.com/postcss-import/-/postcss-import-14.0.2.tgz#60eff77e6be92e7b67fe469ec797d9424cae1aa1" - integrity sha512-BJ2pVK4KhUyMcqjuKs9RijV5tatNzNa73e/32aBVE/ejYPe37iH+6vAu9WvqUkB5OAYgLHzbSvzHnorybJCm9g== - dependencies: - postcss-value-parser "^4.0.0" - read-cache "^1.0.0" - resolve "^1.1.7" - -postcss-initial@^3.0.0: - version "3.0.4" - resolved "https://registry.yarnpkg.com/postcss-initial/-/postcss-initial-3.0.4.tgz#9d32069a10531fe2ecafa0b6ac750ee0bc7efc53" - integrity sha512-3RLn6DIpMsK1l5UUy9jxQvoDeUN4gP939tDcKUHD/kM8SGSKbFAnvkpFpj3Bhtz3HGk1jWY5ZNWX6mPta5M9fg== - dependencies: - postcss "^7.0.2" - -postcss-lab-function@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/postcss-lab-function/-/postcss-lab-function-2.0.1.tgz#bb51a6856cd12289ab4ae20db1e3821ef13d7d2e" - integrity sha512-whLy1IeZKY+3fYdqQFuDBf8Auw+qFuVnChWjmxm/UhHWqNHZx+B99EwxTvGYmUBqe3Fjxs4L1BoZTJmPu6usVg== - dependencies: - "@csstools/convert-colors" "^1.4.0" - postcss "^7.0.2" - postcss-values-parser "^2.0.0" - -postcss-loader@6.1.1: - version "6.1.1" - resolved "https://registry.yarnpkg.com/postcss-loader/-/postcss-loader-6.1.1.tgz#58dd0a3accd9bc87cc52eff75244db578d11301a" - integrity sha512-lBmJMvRh1D40dqpWKr9Rpygwxn8M74U9uaCSeYGNKLGInbk9mXBt1ultHf2dH9Ghk6Ue4UXlXWwGMH9QdUJ5ug== - dependencies: - cosmiconfig "^7.0.0" - klona "^2.0.4" - semver "^7.3.5" - -postcss-logical@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/postcss-logical/-/postcss-logical-3.0.0.tgz#2495d0f8b82e9f262725f75f9401b34e7b45d5b5" - integrity sha512-1SUKdJc2vuMOmeItqGuNaC+N8MzBWFWEkAnRnLpFYj1tGGa7NqyVBujfRtgNa2gXR+6RkGUiB2O5Vmh7E2RmiA== - dependencies: - postcss "^7.0.2" - -postcss-media-minmax@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/postcss-media-minmax/-/postcss-media-minmax-4.0.0.tgz#b75bb6cbc217c8ac49433e12f22048814a4f5ed5" - integrity sha512-fo9moya6qyxsjbFAYl97qKO9gyre3qvbMnkOZeZwlsW6XYFsvs2DMGDlchVLfAd8LHPZDxivu/+qW2SMQeTHBw== - dependencies: - postcss "^7.0.2" - -postcss-merge-longhand@^5.0.2: - version "5.0.2" - resolved "https://registry.yarnpkg.com/postcss-merge-longhand/-/postcss-merge-longhand-5.0.2.tgz#277ada51d9a7958e8ef8cf263103c9384b322a41" - integrity sha512-BMlg9AXSI5G9TBT0Lo/H3PfUy63P84rVz3BjCFE9e9Y9RXQZD3+h3YO1kgTNsNJy7bBc1YQp8DmSnwLIW5VPcw== - dependencies: - css-color-names "^1.0.1" - postcss-value-parser "^4.1.0" - stylehacks "^5.0.1" - -postcss-merge-rules@^5.0.2: - version "5.0.2" - resolved "https://registry.yarnpkg.com/postcss-merge-rules/-/postcss-merge-rules-5.0.2.tgz#d6e4d65018badbdb7dcc789c4f39b941305d410a" - integrity sha512-5K+Md7S3GwBewfB4rjDeol6V/RZ8S+v4B66Zk2gChRqLTCC8yjnHQ601omj9TKftS19OPGqZ/XzoqpzNQQLwbg== - dependencies: - browserslist "^4.16.6" - caniuse-api "^3.0.0" - cssnano-utils "^2.0.1" - postcss-selector-parser "^6.0.5" - vendors "^1.0.3" - -postcss-minify-font-values@^5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/postcss-minify-font-values/-/postcss-minify-font-values-5.0.1.tgz#a90cefbfdaa075bd3dbaa1b33588bb4dc268addf" - integrity sha512-7JS4qIsnqaxk+FXY1E8dHBDmraYFWmuL6cgt0T1SWGRO5bzJf8sUoelwa4P88LEWJZweHevAiDKxHlofuvtIoA== - dependencies: - postcss-value-parser "^4.1.0" - -postcss-minify-gradients@^5.0.2: - version "5.0.2" - resolved "https://registry.yarnpkg.com/postcss-minify-gradients/-/postcss-minify-gradients-5.0.2.tgz#7c175c108f06a5629925d698b3c4cf7bd3864ee5" - integrity sha512-7Do9JP+wqSD6Prittitt2zDLrfzP9pqKs2EcLX7HJYxsxCOwrrcLt4x/ctQTsiOw+/8HYotAoqNkrzItL19SdQ== - dependencies: - colord "^2.6" - cssnano-utils "^2.0.1" - postcss-value-parser "^4.1.0" - -postcss-minify-params@^5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/postcss-minify-params/-/postcss-minify-params-5.0.1.tgz#371153ba164b9d8562842fdcd929c98abd9e5b6c" - integrity sha512-4RUC4k2A/Q9mGco1Z8ODc7h+A0z7L7X2ypO1B6V8057eVK6mZ6xwz6QN64nHuHLbqbclkX1wyzRnIrdZehTEHw== - dependencies: - alphanum-sort "^1.0.2" - browserslist "^4.16.0" - cssnano-utils "^2.0.1" - postcss-value-parser "^4.1.0" - uniqs "^2.0.0" - -postcss-minify-selectors@^5.1.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/postcss-minify-selectors/-/postcss-minify-selectors-5.1.0.tgz#4385c845d3979ff160291774523ffa54eafd5a54" - integrity sha512-NzGBXDa7aPsAcijXZeagnJBKBPMYLaJJzB8CQh6ncvyl2sIndLVWfbcDi0SBjRWk5VqEjXvf8tYwzoKf4Z07og== - dependencies: - alphanum-sort "^1.0.2" - postcss-selector-parser "^6.0.5" - -postcss-modules-extract-imports@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.0.0.tgz#cda1f047c0ae80c97dbe28c3e76a43b88025741d" - integrity sha512-bdHleFnP3kZ4NYDhuGlVK+CMrQ/pqUm8bx/oGL93K6gVwiclvX5x0n76fYMKuIGKzlABOy13zsvqjb0f92TEXw== - -postcss-modules-local-by-default@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.0.0.tgz#ebbb54fae1598eecfdf691a02b3ff3b390a5a51c" - integrity sha512-sT7ihtmGSF9yhm6ggikHdV0hlziDTX7oFoXtuVWeDd3hHObNkcHRo9V3yg7vCAY7cONyxJC/XXCmmiHHcvX7bQ== - dependencies: - icss-utils "^5.0.0" - postcss-selector-parser "^6.0.2" - postcss-value-parser "^4.1.0" - -postcss-modules-scope@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/postcss-modules-scope/-/postcss-modules-scope-3.0.0.tgz#9ef3151456d3bbfa120ca44898dfca6f2fa01f06" - integrity sha512-hncihwFA2yPath8oZ15PZqvWGkWf+XUfQgUGamS4LqoP1anQLOsOJw0vr7J7IwLpoY9fatA2qiGUGmuZL0Iqlg== - dependencies: - postcss-selector-parser "^6.0.4" - -postcss-modules-values@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/postcss-modules-values/-/postcss-modules-values-4.0.0.tgz#d7c5e7e68c3bb3c9b27cbf48ca0bb3ffb4602c9c" - integrity sha512-RDxHkAiEGI78gS2ofyvCsu7iycRv7oqw5xMWn9iMoR0N/7mf9D50ecQqUo5BZ9Zh2vH4bCUR/ktCqbB9m8vJjQ== - dependencies: - icss-utils "^5.0.0" - -postcss-nesting@^7.0.0: - version "7.0.1" - resolved "https://registry.yarnpkg.com/postcss-nesting/-/postcss-nesting-7.0.1.tgz#b50ad7b7f0173e5b5e3880c3501344703e04c052" - integrity sha512-FrorPb0H3nuVq0Sff7W2rnc3SmIcruVC6YwpcS+k687VxyxO33iE1amna7wHuRVzM8vfiYofXSBHNAZ3QhLvYg== - dependencies: - postcss "^7.0.2" - -postcss-normalize-charset@^5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/postcss-normalize-charset/-/postcss-normalize-charset-5.0.1.tgz#121559d1bebc55ac8d24af37f67bd4da9efd91d0" - integrity sha512-6J40l6LNYnBdPSk+BHZ8SF+HAkS4q2twe5jnocgd+xWpz/mx/5Sa32m3W1AA8uE8XaXN+eg8trIlfu8V9x61eg== - -postcss-normalize-display-values@^5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/postcss-normalize-display-values/-/postcss-normalize-display-values-5.0.1.tgz#62650b965981a955dffee83363453db82f6ad1fd" - integrity sha512-uupdvWk88kLDXi5HEyI9IaAJTE3/Djbcrqq8YgjvAVuzgVuqIk3SuJWUisT2gaJbZm1H9g5k2w1xXilM3x8DjQ== - dependencies: - cssnano-utils "^2.0.1" - postcss-value-parser "^4.1.0" - -postcss-normalize-positions@^5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/postcss-normalize-positions/-/postcss-normalize-positions-5.0.1.tgz#868f6af1795fdfa86fbbe960dceb47e5f9492fe5" - integrity sha512-rvzWAJai5xej9yWqlCb1OWLd9JjW2Ex2BCPzUJrbaXmtKtgfL8dBMOOMTX6TnvQMtjk3ei1Lswcs78qKO1Skrg== - dependencies: - postcss-value-parser "^4.1.0" - -postcss-normalize-repeat-style@^5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-5.0.1.tgz#cbc0de1383b57f5bb61ddd6a84653b5e8665b2b5" - integrity sha512-syZ2itq0HTQjj4QtXZOeefomckiV5TaUO6ReIEabCh3wgDs4Mr01pkif0MeVwKyU/LHEkPJnpwFKRxqWA/7O3w== - dependencies: - cssnano-utils "^2.0.1" - postcss-value-parser "^4.1.0" - -postcss-normalize-string@^5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/postcss-normalize-string/-/postcss-normalize-string-5.0.1.tgz#d9eafaa4df78c7a3b973ae346ef0e47c554985b0" - integrity sha512-Ic8GaQ3jPMVl1OEn2U//2pm93AXUcF3wz+OriskdZ1AOuYV25OdgS7w9Xu2LO5cGyhHCgn8dMXh9bO7vi3i9pA== - dependencies: - postcss-value-parser "^4.1.0" - -postcss-normalize-timing-functions@^5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/postcss-normalize-timing-functions/-/postcss-normalize-timing-functions-5.0.1.tgz#8ee41103b9130429c6cbba736932b75c5e2cb08c" - integrity sha512-cPcBdVN5OsWCNEo5hiXfLUnXfTGtSFiBU9SK8k7ii8UD7OLuznzgNRYkLZow11BkQiiqMcgPyh4ZqXEEUrtQ1Q== - dependencies: - cssnano-utils "^2.0.1" - postcss-value-parser "^4.1.0" - -postcss-normalize-unicode@^5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/postcss-normalize-unicode/-/postcss-normalize-unicode-5.0.1.tgz#82d672d648a411814aa5bf3ae565379ccd9f5e37" - integrity sha512-kAtYD6V3pK0beqrU90gpCQB7g6AOfP/2KIPCVBKJM2EheVsBQmx/Iof+9zR9NFKLAx4Pr9mDhogB27pmn354nA== - dependencies: - browserslist "^4.16.0" - postcss-value-parser "^4.1.0" - -postcss-normalize-url@^5.0.2: - version "5.0.2" - resolved "https://registry.yarnpkg.com/postcss-normalize-url/-/postcss-normalize-url-5.0.2.tgz#ddcdfb7cede1270740cf3e4dfc6008bd96abc763" - integrity sha512-k4jLTPUxREQ5bpajFQZpx8bCF2UrlqOTzP9kEqcEnOfwsRshWs2+oAFIHfDQB8GO2PaUaSE0NlTAYtbluZTlHQ== - dependencies: - is-absolute-url "^3.0.3" - normalize-url "^6.0.1" - postcss-value-parser "^4.1.0" - -postcss-normalize-whitespace@^5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/postcss-normalize-whitespace/-/postcss-normalize-whitespace-5.0.1.tgz#b0b40b5bcac83585ff07ead2daf2dcfbeeef8e9a" - integrity sha512-iPklmI5SBnRvwceb/XH568yyzK0qRVuAG+a1HFUsFRf11lEJTiQQa03a4RSCQvLKdcpX7XsI1Gen9LuLoqwiqA== - dependencies: - postcss-value-parser "^4.1.0" - -postcss-ordered-values@^5.0.2: - version "5.0.2" - resolved "https://registry.yarnpkg.com/postcss-ordered-values/-/postcss-ordered-values-5.0.2.tgz#1f351426977be00e0f765b3164ad753dac8ed044" - integrity sha512-8AFYDSOYWebJYLyJi3fyjl6CqMEG/UVworjiyK1r573I56kb3e879sCJLGvR3merj+fAdPpVplXKQZv+ey6CgQ== - dependencies: - cssnano-utils "^2.0.1" - postcss-value-parser "^4.1.0" - -postcss-overflow-shorthand@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/postcss-overflow-shorthand/-/postcss-overflow-shorthand-2.0.0.tgz#31ecf350e9c6f6ddc250a78f0c3e111f32dd4c30" - integrity sha512-aK0fHc9CBNx8jbzMYhshZcEv8LtYnBIRYQD5i7w/K/wS9c2+0NSR6B3OVMu5y0hBHYLcMGjfU+dmWYNKH0I85g== - dependencies: - postcss "^7.0.2" - -postcss-page-break@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/postcss-page-break/-/postcss-page-break-2.0.0.tgz#add52d0e0a528cabe6afee8b46e2abb277df46bf" - integrity sha512-tkpTSrLpfLfD9HvgOlJuigLuk39wVTbbd8RKcy8/ugV2bNBUW3xU+AIqyxhDrQr1VUj1RmyJrBn1YWrqUm9zAQ== - dependencies: - postcss "^7.0.2" - -postcss-place@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/postcss-place/-/postcss-place-4.0.1.tgz#e9f39d33d2dc584e46ee1db45adb77ca9d1dcc62" - integrity sha512-Zb6byCSLkgRKLODj/5mQugyuj9bvAAw9LqJJjgwz5cYryGeXfFZfSXoP1UfveccFmeq0b/2xxwcTEVScnqGxBg== - dependencies: - postcss "^7.0.2" - postcss-values-parser "^2.0.0" - -postcss-preset-env@6.7.0: - version "6.7.0" - resolved "https://registry.yarnpkg.com/postcss-preset-env/-/postcss-preset-env-6.7.0.tgz#c34ddacf8f902383b35ad1e030f178f4cdf118a5" - integrity sha512-eU4/K5xzSFwUFJ8hTdTQzo2RBLbDVt83QZrAvI07TULOkmyQlnYlpwep+2yIK+K+0KlZO4BvFcleOCCcUtwchg== - dependencies: - autoprefixer "^9.6.1" - browserslist "^4.6.4" - caniuse-lite "^1.0.30000981" - css-blank-pseudo "^0.1.4" - css-has-pseudo "^0.10.0" - css-prefers-color-scheme "^3.1.1" - cssdb "^4.4.0" - postcss "^7.0.17" - postcss-attribute-case-insensitive "^4.0.1" - postcss-color-functional-notation "^2.0.1" - postcss-color-gray "^5.0.0" - postcss-color-hex-alpha "^5.0.3" - postcss-color-mod-function "^3.0.3" - postcss-color-rebeccapurple "^4.0.1" - postcss-custom-media "^7.0.8" - postcss-custom-properties "^8.0.11" - postcss-custom-selectors "^5.1.2" - postcss-dir-pseudo-class "^5.0.0" - postcss-double-position-gradients "^1.0.0" - postcss-env-function "^2.0.2" - postcss-focus-visible "^4.0.0" - postcss-focus-within "^3.0.0" - postcss-font-variant "^4.0.0" - postcss-gap-properties "^2.0.0" - postcss-image-set-function "^3.0.1" - postcss-initial "^3.0.0" - postcss-lab-function "^2.0.1" - postcss-logical "^3.0.0" - postcss-media-minmax "^4.0.0" - postcss-nesting "^7.0.0" - postcss-overflow-shorthand "^2.0.0" - postcss-page-break "^2.0.0" - postcss-place "^4.0.1" - postcss-pseudo-class-any-link "^6.0.0" - postcss-replace-overflow-wrap "^3.0.0" - postcss-selector-matches "^4.0.0" - postcss-selector-not "^4.0.0" - -postcss-pseudo-class-any-link@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/postcss-pseudo-class-any-link/-/postcss-pseudo-class-any-link-6.0.0.tgz#2ed3eed393b3702879dec4a87032b210daeb04d1" - integrity sha512-lgXW9sYJdLqtmw23otOzrtbDXofUdfYzNm4PIpNE322/swES3VU9XlXHeJS46zT2onFO7V1QFdD4Q9LiZj8mew== - dependencies: - postcss "^7.0.2" - postcss-selector-parser "^5.0.0-rc.3" - -postcss-reduce-initial@^5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/postcss-reduce-initial/-/postcss-reduce-initial-5.0.1.tgz#9d6369865b0f6f6f6b165a0ef5dc1a4856c7e946" - integrity sha512-zlCZPKLLTMAqA3ZWH57HlbCjkD55LX9dsRyxlls+wfuRfqCi5mSlZVan0heX5cHr154Dq9AfbH70LyhrSAezJw== - dependencies: - browserslist "^4.16.0" - caniuse-api "^3.0.0" - -postcss-reduce-transforms@^5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/postcss-reduce-transforms/-/postcss-reduce-transforms-5.0.1.tgz#93c12f6a159474aa711d5269923e2383cedcf640" - integrity sha512-a//FjoPeFkRuAguPscTVmRQUODP+f3ke2HqFNgGPwdYnpeC29RZdCBvGRGTsKpMURb/I3p6jdKoBQ2zI+9Q7kA== - dependencies: - cssnano-utils "^2.0.1" - postcss-value-parser "^4.1.0" - -postcss-replace-overflow-wrap@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/postcss-replace-overflow-wrap/-/postcss-replace-overflow-wrap-3.0.0.tgz#61b360ffdaedca84c7c918d2b0f0d0ea559ab01c" - integrity sha512-2T5hcEHArDT6X9+9dVSPQdo7QHzG4XKclFT8rU5TzJPDN7RIRTbO9c4drUISOVemLj03aezStHCR2AIcr8XLpw== - dependencies: - postcss "^7.0.2" - -postcss-selector-matches@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/postcss-selector-matches/-/postcss-selector-matches-4.0.0.tgz#71c8248f917ba2cc93037c9637ee09c64436fcff" - integrity sha512-LgsHwQR/EsRYSqlwdGzeaPKVT0Ml7LAT6E75T8W8xLJY62CE4S/l03BWIt3jT8Taq22kXP08s2SfTSzaraoPww== - dependencies: - balanced-match "^1.0.0" - postcss "^7.0.2" - -postcss-selector-not@^4.0.0: - version "4.0.1" - resolved "https://registry.yarnpkg.com/postcss-selector-not/-/postcss-selector-not-4.0.1.tgz#263016eef1cf219e0ade9a913780fc1f48204cbf" - integrity sha512-YolvBgInEK5/79C+bdFMyzqTg6pkYqDbzZIST/PDMqa/o3qtXenD05apBG2jLgT0/BQ77d4U2UK12jWpilqMAQ== - dependencies: - balanced-match "^1.0.0" - postcss "^7.0.2" - -postcss-selector-parser@^5.0.0-rc.3, postcss-selector-parser@^5.0.0-rc.4: - version "5.0.0" - resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-5.0.0.tgz#249044356697b33b64f1a8f7c80922dddee7195c" - integrity sha512-w+zLE5Jhg6Liz8+rQOWEAwtwkyqpfnmsinXjXg6cY7YIONZZtgvE0v2O0uhQBs0peNomOJwWRKt6JBfTdTd3OQ== - dependencies: - cssesc "^2.0.0" - indexes-of "^1.0.1" - uniq "^1.0.1" - -postcss-selector-parser@^6.0.2, postcss-selector-parser@^6.0.4, postcss-selector-parser@^6.0.5: - version "6.0.6" - resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.6.tgz#2c5bba8174ac2f6981ab631a42ab0ee54af332ea" - integrity sha512-9LXrvaaX3+mcv5xkg5kFwqSzSH1JIObIx51PrndZwlmznwXRfxMddDvo9gve3gVR8ZTKgoFDdWkbRFmEhT4PMg== - dependencies: - cssesc "^3.0.0" - util-deprecate "^1.0.2" - -postcss-svgo@^5.0.2: - version "5.0.2" - resolved "https://registry.yarnpkg.com/postcss-svgo/-/postcss-svgo-5.0.2.tgz#bc73c4ea4c5a80fbd4b45e29042c34ceffb9257f" - integrity sha512-YzQuFLZu3U3aheizD+B1joQ94vzPfE6BNUcSYuceNxlVnKKsOtdo6hL9/zyC168Q8EwfLSgaDSalsUGa9f2C0A== - dependencies: - postcss-value-parser "^4.1.0" - svgo "^2.3.0" - -postcss-unique-selectors@^5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/postcss-unique-selectors/-/postcss-unique-selectors-5.0.1.tgz#3be5c1d7363352eff838bd62b0b07a0abad43bfc" - integrity sha512-gwi1NhHV4FMmPn+qwBNuot1sG1t2OmacLQ/AX29lzyggnjd+MnVD5uqQmpXO3J17KGL2WAxQruj1qTd3H0gG/w== - dependencies: - alphanum-sort "^1.0.2" - postcss-selector-parser "^6.0.5" - uniqs "^2.0.0" - -postcss-value-parser@^4.0.0, postcss-value-parser@^4.0.2, postcss-value-parser@^4.1.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.1.0.tgz#443f6a20ced6481a2bda4fa8532a6e55d789a2cb" - integrity sha512-97DXOFbQJhk71ne5/Mt6cOu6yxsSfM0QGQyl0L25Gca4yGWEGJaig7l7gbCX623VqTBNGLRLaVUCnNkcedlRSQ== - -postcss-values-parser@^2.0.0, postcss-values-parser@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/postcss-values-parser/-/postcss-values-parser-2.0.1.tgz#da8b472d901da1e205b47bdc98637b9e9e550e5f" - integrity sha512-2tLuBsA6P4rYTNKCXYG/71C7j1pU6pK503suYOmn4xYrQIzW+opD+7FAFNuGSdZC/3Qfy334QbeMu7MEb8gOxg== - dependencies: - flatten "^1.0.2" - indexes-of "^1.0.1" - uniq "^1.0.1" - -postcss@8.3.6, postcss@^8.2.15, postcss@^8.3.5: - version "8.3.6" - resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.3.6.tgz#2730dd76a97969f37f53b9a6096197be311cc4ea" - integrity sha512-wG1cc/JhRgdqB6WHEuyLTedf3KIRuD0hG6ldkFEZNCjRxiC+3i6kkWUUbiJQayP28iwG35cEmAbe98585BYV0A== - dependencies: - colorette "^1.2.2" - nanoid "^3.1.23" - source-map-js "^0.6.2" - -postcss@^7.0.14, postcss@^7.0.17, postcss@^7.0.2, postcss@^7.0.32, postcss@^7.0.35, postcss@^7.0.5, postcss@^7.0.6: - version "7.0.36" - resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.36.tgz#056f8cffa939662a8f5905950c07d5285644dfcb" - integrity sha512-BebJSIUMwJHRH0HAQoxN4u1CN86glsrwsW0q7T+/m44eXOUAxSNdHRkNZPYz5vVUbg17hFgOQDE7fZk7li3pZw== - dependencies: - chalk "^2.4.2" - source-map "^0.6.1" - supports-color "^6.1.0" - -pretty-bytes@^5.3.0, pretty-bytes@^5.6.0: - version "5.6.0" - resolved "https://registry.yarnpkg.com/pretty-bytes/-/pretty-bytes-5.6.0.tgz#356256f643804773c82f64723fe78c92c62beaeb" - integrity sha512-FFw039TmrBqFK8ma/7OL3sDz/VytdtJr044/QUJtH0wK9lb9jLq9tJyIxUwtQJHwar2BqtiA4iCWSwo9JLkzFg== - -process-nextick-args@~2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2" - integrity sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag== - -progress@2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.1.tgz#c9242169342b1c29d275889c95734621b1952e31" - integrity sha512-OE+a6vzqazc+K6LxJrX5UPyKFvGnL5CYmq2jFGNIBWHpc4QyE49/YOumcrpQFJpfejmvRtbJzgO1zPmMCqlbBg== - -promise-inflight@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/promise-inflight/-/promise-inflight-1.0.1.tgz#98472870bf228132fcbdd868129bad12c3c029e3" - integrity sha1-mEcocL8igTL8vdhoEputEsPAKeM= - -promise-retry@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/promise-retry/-/promise-retry-2.0.1.tgz#ff747a13620ab57ba688f5fc67855410c370da22" - integrity sha512-y+WKFlBR8BGXnsNlIHFGPZmyDf3DFMoLhaflAnyZgV6rG6xu+JwesTo2Q9R6XwYmtmwAFCkAk3e35jEdoeh/3g== - dependencies: - err-code "^2.0.2" - retry "^0.12.0" - -proxy-addr@~2.0.5: - version "2.0.7" - resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.7.tgz#f19fe69ceab311eeb94b42e70e8c2070f9ba1025" - integrity sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg== - dependencies: - forwarded "0.2.0" - ipaddr.js "1.9.1" - -proxy-from-env@1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/proxy-from-env/-/proxy-from-env-1.1.0.tgz#e102f16ca355424865755d2c9e8ea4f24d58c3e2" - integrity sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg== - -prr@~1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/prr/-/prr-1.0.1.tgz#d3fc114ba06995a45ec6893f484ceb1d78f5f476" - integrity sha1-0/wRS6BplaRexok/SEzrHXj19HY= - -psl@^1.1.28: - version "1.8.0" - resolved "https://registry.yarnpkg.com/psl/-/psl-1.8.0.tgz#9326f8bcfb013adcc005fdff056acce020e51c24" - integrity sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ== - -pump@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/pump/-/pump-3.0.0.tgz#b4a2116815bde2f4e1ea602354e8c75565107a64" - integrity sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww== - dependencies: - end-of-stream "^1.1.0" - once "^1.3.1" - -punycode@1.3.2: - version "1.3.2" - resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.3.2.tgz#9653a036fb7c1ee42342f2325cceefea3926c48d" - integrity sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0= - -punycode@^2.1.0, punycode@^2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec" - integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A== - -puppeteer@^10.2.0: - version "10.2.0" - resolved "https://registry.yarnpkg.com/puppeteer/-/puppeteer-10.2.0.tgz#7d8d7fda91e19a7cfd56986e0275448e6351849e" - integrity sha512-OR2CCHRashF+f30+LBOtAjK6sNtz2HEyTr5FqAvhf8lR/qB3uBRoIZOwQKgwoyZnMBsxX7ZdazlyBgGjpnkiMw== - dependencies: - debug "4.3.1" - devtools-protocol "0.0.901419" - extract-zip "2.0.1" - https-proxy-agent "5.0.0" - node-fetch "2.6.1" - pkg-dir "4.2.0" - progress "2.0.1" - proxy-from-env "1.1.0" - rimraf "3.0.2" - tar-fs "2.0.0" - unbzip2-stream "1.3.3" - ws "7.4.6" - -qjobs@^1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/qjobs/-/qjobs-1.2.0.tgz#c45e9c61800bd087ef88d7e256423bdd49e5d071" - integrity sha512-8YOJEHtxpySA3fFDyCRxA+UUV+fA+rTWnuWvylOK/NCjhY+b4ocCtmu8TtsWb+mYeU+GCHf/S66KZF/AsteKHg== - -qrcode@1.4.2: - version "1.4.2" - resolved "https://registry.yarnpkg.com/qrcode/-/qrcode-1.4.2.tgz#e7c82a60140916d666541043bd2b0b72ee4e38a6" - integrity sha512-eR6RgxFYPDFH+zFLTJKtoNP/RlsHANQb52AUmQ2bGDPMuUw7jJb0F+DNEgx7qQGIElrbFxWYMc0/B91zLZPF9Q== - dependencies: - dijkstrajs "^1.0.1" - isarray "^2.0.1" - pngjs "^3.3.0" - yargs "^13.2.4" - -qs@6.7.0: - version "6.7.0" - resolved "https://registry.yarnpkg.com/qs/-/qs-6.7.0.tgz#41dc1a015e3d581f1621776be31afb2876a9b1bc" - integrity sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ== - -qs@~6.5.2: - version "6.5.2" - resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36" - integrity sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA== - -querystring@0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/querystring/-/querystring-0.2.0.tgz#b209849203bb25df820da756e747005878521620" - integrity sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA= - -querystringify@^2.1.1: - version "2.2.0" - resolved "https://registry.yarnpkg.com/querystringify/-/querystringify-2.2.0.tgz#3345941b4153cb9d082d8eee4cda2016a9aef7f6" - integrity sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ== - -queue-microtask@^1.2.2: - version "1.2.3" - resolved "https://registry.yarnpkg.com/queue-microtask/-/queue-microtask-1.2.3.tgz#4929228bbc724dfac43e0efb058caf7b6cfb6243" - integrity sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A== - -ramda@~0.27.1: - version "0.27.1" - resolved "https://registry.yarnpkg.com/ramda/-/ramda-0.27.1.tgz#66fc2df3ef873874ffc2da6aa8984658abacf5c9" - integrity sha512-PgIdVpn5y5Yns8vqb8FzBUEYn98V3xcPgawAkkgj0YJ0qDsnHCiNmZYfOGMgOvoB0eWFLpYbhxUR3mxfDIMvpw== - -randombytes@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/randombytes/-/randombytes-2.1.0.tgz#df6f84372f0270dc65cdf6291349ab7a473d4f2a" - integrity sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ== - dependencies: - safe-buffer "^5.1.0" - -range-parser@^1.2.1, range-parser@~1.2.1: - version "1.2.1" - resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.1.tgz#3cf37023d199e1c24d1a55b84800c2f3e6468031" - integrity sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg== - -raw-body@2.4.0: - version "2.4.0" - resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.4.0.tgz#a1ce6fb9c9bc356ca52e89256ab59059e13d0332" - integrity sha512-4Oz8DUIwdvoa5qMJelxipzi/iJIi40O5cGV1wNYp5hvZP8ZN0T+jiNkL0QepXs+EsQ9XJ8ipEDoiH70ySUJP3Q== - dependencies: - bytes "3.1.0" - http-errors "1.7.2" - iconv-lite "0.4.24" - unpipe "1.0.0" - -read-cache@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/read-cache/-/read-cache-1.0.0.tgz#e664ef31161166c9751cdbe8dbcf86b5fb58f774" - integrity sha1-5mTvMRYRZsl1HNvo28+GtftY93Q= - dependencies: - pify "^2.3.0" - -read-package-json-fast@^2.0.1: - version "2.0.3" - resolved "https://registry.yarnpkg.com/read-package-json-fast/-/read-package-json-fast-2.0.3.tgz#323ca529630da82cb34b36cc0b996693c98c2b83" - integrity sha512-W/BKtbL+dUjTuRL2vziuYhp76s5HZ9qQhd/dKfWIZveD0O40453QNyZhC0e63lqZrAQ4jiOapVoeJ7JrszenQQ== - dependencies: - json-parse-even-better-errors "^2.3.0" - npm-normalize-package-bin "^1.0.1" - -readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.6: - version "2.3.7" - resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57" - integrity sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw== - dependencies: - core-util-is "~1.0.0" - inherits "~2.0.3" - isarray "~1.0.0" - process-nextick-args "~2.0.0" - safe-buffer "~5.1.1" - string_decoder "~1.1.1" - util-deprecate "~1.0.1" - -readable-stream@^3.0.6, readable-stream@^3.1.1, readable-stream@^3.4.0: - version "3.6.0" - resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.0.tgz#337bbda3adc0706bd3e024426a286d4b4b2c9198" - integrity sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA== - dependencies: - inherits "^2.0.3" - string_decoder "^1.1.1" - util-deprecate "^1.0.1" - -readdirp@^2.2.1: - version "2.2.1" - resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-2.2.1.tgz#0e87622a3325aa33e892285caf8b4e846529a525" - integrity sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ== - dependencies: - graceful-fs "^4.1.11" - micromatch "^3.1.10" - readable-stream "^2.0.2" - -readdirp@~3.6.0: - version "3.6.0" - resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.6.0.tgz#74a370bd857116e245b29cc97340cd431a02a6c7" - integrity sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA== - dependencies: - picomatch "^2.2.1" - -reflect-metadata@^0.1.2: - version "0.1.13" - resolved "https://registry.yarnpkg.com/reflect-metadata/-/reflect-metadata-0.1.13.tgz#67ae3ca57c972a2aa1642b10fe363fe32d49dc08" - integrity sha512-Ts1Y/anZELhSsjMcU605fU9RE4Oi3p5ORujwbIKXfWa+0Zxs510Qrmrce5/Jowq3cHSZSJqBjypxmHarc+vEWg== - -regenerate-unicode-properties@^8.2.0: - version "8.2.0" - resolved "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-8.2.0.tgz#e5de7111d655e7ba60c057dbe9ff37c87e65cdec" - integrity sha512-F9DjY1vKLo/tPePDycuH3dn9H1OTPIkVD9Kz4LODu+F2C75mgjAJ7x/gwy6ZcSNRAAkhNlJSOHRe8k3p+K9WhA== - dependencies: - regenerate "^1.4.0" - -regenerate@^1.4.0: - version "1.4.2" - resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.4.2.tgz#b9346d8827e8f5a32f7ba29637d398b69014848a" - integrity sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A== - -regenerator-runtime@0.13.9, regenerator-runtime@^0.13.4: - version "0.13.9" - resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz#8925742a98ffd90814988d7566ad30ca3b263b52" - integrity sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA== - -regenerator-transform@^0.14.2: - version "0.14.5" - resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.14.5.tgz#c98da154683671c9c4dcb16ece736517e1b7feb4" - integrity sha512-eOf6vka5IO151Jfsw2NO9WpGX58W6wWmefK3I1zEGr0lOD0u8rwPaNqQL1aRxUaxLeKO3ArNh3VYg1KbaD+FFw== - dependencies: - "@babel/runtime" "^7.8.4" - -regex-not@^1.0.0, regex-not@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/regex-not/-/regex-not-1.0.2.tgz#1f4ece27e00b0b65e0247a6810e6a85d83a5752c" - integrity sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A== - dependencies: - extend-shallow "^3.0.2" - safe-regex "^1.1.0" - -regex-parser@^2.2.11: - version "2.2.11" - resolved "https://registry.yarnpkg.com/regex-parser/-/regex-parser-2.2.11.tgz#3b37ec9049e19479806e878cabe7c1ca83ccfe58" - integrity sha512-jbD/FT0+9MBU2XAZluI7w2OBs1RBi6p9M83nkoZayQXXU9e8Robt69FcZc7wU4eJD/YFTjn1JdCk3rbMJajz8Q== - -regexp.prototype.flags@^1.2.0: - version "1.3.1" - resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.3.1.tgz#7ef352ae8d159e758c0eadca6f8fcb4eef07be26" - integrity sha512-JiBdRBq91WlY7uRJ0ds7R+dU02i6LKi8r3BuQhNXn+kmeLN+EfHhfjqMRis1zJxnlu88hq/4dx0P2OP3APRTOA== - dependencies: - call-bind "^1.0.2" - define-properties "^1.1.3" - -regexpu-core@^4.7.1: - version "4.7.1" - resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-4.7.1.tgz#2dea5a9a07233298fbf0db91fa9abc4c6e0f8ad6" - integrity sha512-ywH2VUraA44DZQuRKzARmw6S66mr48pQVva4LBeRhcOltJ6hExvWly5ZjFLYo67xbIxb6W1q4bAGtgfEl20zfQ== - dependencies: - regenerate "^1.4.0" - regenerate-unicode-properties "^8.2.0" - regjsgen "^0.5.1" - regjsparser "^0.6.4" - unicode-match-property-ecmascript "^1.0.4" - unicode-match-property-value-ecmascript "^1.2.0" - -regjsgen@^0.5.1: - version "0.5.2" - resolved "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.5.2.tgz#92ff295fb1deecbf6ecdab2543d207e91aa33733" - integrity sha512-OFFT3MfrH90xIW8OOSyUrk6QHD5E9JOTeGodiJeBS3J6IwlgzJMNE/1bZklWz5oTg+9dCMyEetclvCVXOPoN3A== - -regjsparser@^0.6.4: - version "0.6.9" - resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.6.9.tgz#b489eef7c9a2ce43727627011429cf833a7183e6" - integrity sha512-ZqbNRz1SNjLAiYuwY0zoXW8Ne675IX5q+YHioAGbCw4X96Mjl2+dcX9B2ciaeyYjViDAfvIjFpQjJgLttTEERQ== - dependencies: - jsesc "~0.5.0" - -remove-trailing-separator@^1.0.1: - version "1.1.0" - resolved "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz#c24bce2a283adad5bc3f58e0d48249b92379d8ef" - integrity sha1-wkvOKig62tW8P1jg1IJJuSN52O8= - -repeat-element@^1.1.2: - version "1.1.4" - resolved "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.4.tgz#be681520847ab58c7568ac75fbfad28ed42d39e9" - integrity sha512-LFiNfRcSu7KK3evMyYOuCzv3L10TW7yC1G2/+StMjK8Y6Vqd2MG7r/Qjw4ghtuCOjFvlnms/iMmLqpvW/ES/WQ== - -repeat-string@^1.6.1: - version "1.6.1" - resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637" - integrity sha1-jcrkcOHIirwtYA//Sndihtp15jc= - -request-progress@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/request-progress/-/request-progress-3.0.0.tgz#4ca754081c7fec63f505e4faa825aa06cd669dbe" - integrity sha1-TKdUCBx/7GP1BeT6qCWqBs1mnb4= - dependencies: - throttleit "^1.0.0" - -request@^2.88.2: - version "2.88.2" - resolved "https://registry.yarnpkg.com/request/-/request-2.88.2.tgz#d73c918731cb5a87da047e207234146f664d12b3" - integrity sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw== - dependencies: - aws-sign2 "~0.7.0" - aws4 "^1.8.0" - caseless "~0.12.0" - combined-stream "~1.0.6" - extend "~3.0.2" - forever-agent "~0.6.1" - form-data "~2.3.2" - har-validator "~5.1.3" - http-signature "~1.2.0" - is-typedarray "~1.0.0" - isstream "~0.1.2" - json-stringify-safe "~5.0.1" - mime-types "~2.1.19" - oauth-sign "~0.9.0" - performance-now "^2.1.0" - qs "~6.5.2" - safe-buffer "^5.1.2" - tough-cookie "~2.5.0" - tunnel-agent "^0.6.0" - uuid "^3.3.2" - -require-directory@^2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42" - integrity sha1-jGStX9MNqxyXbiNE/+f3kqam30I= - -require-from-string@^2.0.2: - version "2.0.2" - resolved "https://registry.yarnpkg.com/require-from-string/-/require-from-string-2.0.2.tgz#89a7fdd938261267318eafe14f9c32e598c36909" - integrity sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw== - -require-main-filename@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-2.0.0.tgz#d0b329ecc7cc0f61649f62215be69af54aa8989b" - integrity sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg== - -requires-port@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff" - integrity sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8= - -resolve-cwd@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/resolve-cwd/-/resolve-cwd-2.0.0.tgz#00a9f7387556e27038eae232caa372a6a59b665a" - integrity sha1-AKn3OHVW4nA46uIyyqNypqWbZlo= - dependencies: - resolve-from "^3.0.0" - -resolve-from@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-3.0.0.tgz#b22c7af7d9d6881bc8b6e653335eebcb0a188748" - integrity sha1-six699nWiBvItuZTM17rywoYh0g= - -resolve-from@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6" - integrity sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g== - -resolve-url-loader@4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/resolve-url-loader/-/resolve-url-loader-4.0.0.tgz#d50d4ddc746bb10468443167acf800dcd6c3ad57" - integrity sha512-05VEMczVREcbtT7Bz+C+96eUO5HDNvdthIiMB34t7FcF8ehcu4wC0sSgPUubs3XW2Q3CNLJk/BJrCU9wVRymiA== - dependencies: - adjust-sourcemap-loader "^4.0.0" - convert-source-map "^1.7.0" - loader-utils "^2.0.0" - postcss "^7.0.35" - source-map "0.6.1" - -resolve-url@^0.2.1: - version "0.2.1" - resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a" - integrity sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo= - -resolve@1.20.0, resolve@^1.1.7, resolve@^1.14.2, resolve@^1.3.2: - version "1.20.0" - resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.20.0.tgz#629a013fb3f70755d6f0b7935cc1c2c5378b1975" - integrity sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A== - dependencies: - is-core-module "^2.2.0" - path-parse "^1.0.6" - -restore-cursor@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-3.1.0.tgz#39f67c54b3a7a58cea5236d95cf0034239631f7e" - integrity sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA== - dependencies: - onetime "^5.1.0" - signal-exit "^3.0.2" - -ret@~0.1.10: - version "0.1.15" - resolved "https://registry.yarnpkg.com/ret/-/ret-0.1.15.tgz#b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc" - integrity sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg== - -retry@^0.12.0: - version "0.12.0" - resolved "https://registry.yarnpkg.com/retry/-/retry-0.12.0.tgz#1b42a6266a21f07421d1b0b54b7dc167b01c013b" - integrity sha1-G0KmJmoh8HQh0bC1S33BZ7AcATs= - -reusify@^1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/reusify/-/reusify-1.0.4.tgz#90da382b1e126efc02146e90845a88db12925d76" - integrity sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw== - -rfdc@^1.1.4: - version "1.3.0" - resolved "https://registry.yarnpkg.com/rfdc/-/rfdc-1.3.0.tgz#d0b7c441ab2720d05dc4cf26e01c89631d9da08b" - integrity sha512-V2hovdzFbOi77/WajaSMXk2OLm+xNIeQdMMuB7icj7bk6zi2F8GGAxigcnDFpJHbNyNcgyJDiP+8nOrY5cZGrA== - -rimraf@2.6.1: - version "2.6.1" - resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.1.tgz#c2338ec643df7a1b7fe5c54fa86f57428a55f33d" - integrity sha1-wjOOxkPfeht/5cVPqG9XQopV8z0= - dependencies: - glob "^7.0.5" - -rimraf@3.0.2, rimraf@^3.0.0, rimraf@^3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a" - integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA== - dependencies: - glob "^7.1.3" - -rimraf@^2.6.3: - version "2.7.1" - resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec" - integrity sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w== - dependencies: - glob "^7.1.3" - -run-async@^2.4.0: - version "2.4.1" - resolved "https://registry.yarnpkg.com/run-async/-/run-async-2.4.1.tgz#8440eccf99ea3e70bd409d49aab88e10c189a455" - integrity sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ== - -run-parallel@^1.1.9: - version "1.2.0" - resolved "https://registry.yarnpkg.com/run-parallel/-/run-parallel-1.2.0.tgz#66d1368da7bdf921eb9d95bd1a9229e7f21a43ee" - integrity sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA== - dependencies: - queue-microtask "^1.2.2" - -rxjs@6.6.7, rxjs@^6.6.7, rxjs@~6.6.0: - version "6.6.7" - resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.6.7.tgz#90ac018acabf491bf65044235d5863c4dab804c9" - integrity sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ== - dependencies: - tslib "^1.9.0" - -rxjs@^7.2.0: - version "7.3.0" - resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-7.3.0.tgz#39fe4f3461dc1e50be1475b2b85a0a88c1e938c6" - integrity sha512-p2yuGIg9S1epc3vrjKf6iVb3RCaAYjYskkO+jHIaV0IjOPlJop4UnodOoFb2xeNwlguqLYvGw1b1McillYb5Gw== - dependencies: - tslib "~2.1.0" - -safe-buffer@5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1: - version "5.1.2" - resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d" - integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g== - -safe-buffer@>=5.1.0, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.2, safe-buffer@~5.2.0: - version "5.2.1" - resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6" - integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ== - -safe-regex@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/safe-regex/-/safe-regex-1.1.0.tgz#40a3669f3b077d1e943d44629e157dd48023bf2e" - integrity sha1-QKNmnzsHfR6UPURinhV91IAjvy4= - dependencies: - ret "~0.1.10" - -"safer-buffer@>= 2.1.2 < 3", "safer-buffer@>= 2.1.2 < 3.0.0", safer-buffer@^2.0.2, safer-buffer@^2.1.0, safer-buffer@^2.1.2, safer-buffer@~2.1.0: - version "2.1.2" - resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a" - integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg== - -sass-loader@12.1.0: - version "12.1.0" - resolved "https://registry.yarnpkg.com/sass-loader/-/sass-loader-12.1.0.tgz#b73324622231009da6fba61ab76013256380d201" - integrity sha512-FVJZ9kxVRYNZTIe2xhw93n3xJNYZADr+q69/s98l9nTCrWASo+DR2Ot0s5xTKQDDEosUkatsGeHxcH4QBp5bSg== - dependencies: - klona "^2.0.4" - neo-async "^2.6.2" - -sass@1.36.0: - version "1.36.0" - resolved "https://registry.yarnpkg.com/sass/-/sass-1.36.0.tgz#5912ef9d5d16714171ba11cb17edb274c4bbc07e" - integrity sha512-fQzEjipfOv5kh930nu3Imzq3ie/sGDc/4KtQMJlt7RRdrkQSfe37Bwi/Rf/gfuYHsIuE1fIlDMvpyMcEwjnPvg== - dependencies: - chokidar ">=3.0.0 <4.0.0" - -sax@^1.2.4, sax@~1.2.4: - version "1.2.4" - resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9" - integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw== - -schema-utils@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-1.0.0.tgz#0b79a93204d7b600d4b2850d1f66c2a34951c770" - integrity sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g== - dependencies: - ajv "^6.1.0" - ajv-errors "^1.0.0" - ajv-keywords "^3.1.0" - -schema-utils@^2.6.5, schema-utils@^2.7.0: - version "2.7.1" - resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.7.1.tgz#1ca4f32d1b24c590c203b8e7a50bf0ea4cd394d7" - integrity sha512-SHiNtMOUGWBQJwzISiVYKu82GiV4QYGePp3odlY1tuKO7gPtphAT5R/py0fA6xtbgLL/RvtJZnU9b8s0F1q0Xg== - dependencies: - "@types/json-schema" "^7.0.5" - ajv "^6.12.4" - ajv-keywords "^3.5.2" - -schema-utils@^3.0.0, schema-utils@^3.1.0, schema-utils@^3.1.1: - version "3.1.1" - resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-3.1.1.tgz#bc74c4b6b6995c1d88f76a8b77bea7219e0c8281" - integrity sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw== - dependencies: - "@types/json-schema" "^7.0.8" - ajv "^6.12.5" - ajv-keywords "^3.5.2" - -select-hose@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/select-hose/-/select-hose-2.0.0.tgz#625d8658f865af43ec962bfc376a37359a4994ca" - integrity sha1-Yl2GWPhlr0Psliv8N2o3NZpJlMo= - -selfsigned@^1.10.8: - version "1.10.11" - resolved "https://registry.yarnpkg.com/selfsigned/-/selfsigned-1.10.11.tgz#24929cd906fe0f44b6d01fb23999a739537acbe9" - integrity sha512-aVmbPOfViZqOZPgRBT0+3u4yZFHpmnIghLMlAcb5/xhp5ZtB/RVnKhz5vl2M32CLXAqR4kha9zfhNg0Lf/sxKA== - dependencies: - node-forge "^0.10.0" - -semver@7.0.0: - version "7.0.0" - resolved "https://registry.yarnpkg.com/semver/-/semver-7.0.0.tgz#5f3ca35761e47e05b206c6daff2cf814f0316b8e" - integrity sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A== - -semver@7.3.5, semver@^7.0.0, semver@^7.1.1, semver@^7.3.2, semver@^7.3.4, semver@^7.3.5: - version "7.3.5" - resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.5.tgz#0b621c879348d8998e4b0e4be94b3f12e6018ef7" - integrity sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ== - dependencies: - lru-cache "^6.0.0" - -semver@^5.4.1, semver@^5.5.0, semver@^5.6.0: - version "5.7.1" - resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7" - integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ== - -semver@^6.0.0, semver@^6.1.1, semver@^6.1.2, semver@^6.3.0: - version "6.3.0" - resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d" - integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw== - -send@0.17.1: - version "0.17.1" - resolved "https://registry.yarnpkg.com/send/-/send-0.17.1.tgz#c1d8b059f7900f7466dd4938bdc44e11ddb376c8" - integrity sha512-BsVKsiGcQMFwT8UxypobUKyv7irCNRHk1T0G680vk88yf6LBByGcZJOTJCrTP2xVN6yI+XjPJcNuE3V4fT9sAg== - dependencies: - debug "2.6.9" - depd "~1.1.2" - destroy "~1.0.4" - encodeurl "~1.0.2" - escape-html "~1.0.3" - etag "~1.8.1" - fresh "0.5.2" - http-errors "~1.7.2" - mime "1.6.0" - ms "2.1.1" - on-finished "~2.3.0" - range-parser "~1.2.1" - statuses "~1.5.0" - -serialize-javascript@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-6.0.0.tgz#efae5d88f45d7924141da8b5c3a7a7e663fefeb8" - integrity sha512-Qr3TosvguFt8ePWqsvRfrKyQXIiW+nGbYpy8XK24NQHE83caxWt+mIymTT19DGFbNWNLfEwsrkSmN64lVWB9ag== - dependencies: - randombytes "^2.1.0" - -serve-index@^1.9.1: - version "1.9.1" - resolved "https://registry.yarnpkg.com/serve-index/-/serve-index-1.9.1.tgz#d3768d69b1e7d82e5ce050fff5b453bea12a9239" - integrity sha1-03aNabHn2C5c4FD/9bRTvqEqkjk= - dependencies: - accepts "~1.3.4" - batch "0.6.1" - debug "2.6.9" - escape-html "~1.0.3" - http-errors "~1.6.2" - mime-types "~2.1.17" - parseurl "~1.3.2" - -serve-static@1.14.1: - version "1.14.1" - resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.14.1.tgz#666e636dc4f010f7ef29970a88a674320898b2f9" - integrity sha512-JMrvUwE54emCYWlTI+hGrGv5I8dEwmco/00EvkzIIsR7MqrHonbD9pO2MOfFnpFntl7ecpZs+3mW+XbQZu9QCg== - dependencies: - encodeurl "~1.0.2" - escape-html "~1.0.3" - parseurl "~1.3.3" - send "0.17.1" - -set-blocking@^2.0.0, set-blocking@~2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7" - integrity sha1-BF+XgtARrppoA93TgrJDkrPYkPc= - -set-value@^2.0.0, set-value@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/set-value/-/set-value-2.0.1.tgz#a18d40530e6f07de4228c7defe4227af8cad005b" - integrity sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw== - dependencies: - extend-shallow "^2.0.1" - is-extendable "^0.1.1" - is-plain-object "^2.0.3" - split-string "^3.0.1" - -setprototypeof@1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.0.tgz#d0bd85536887b6fe7c0d818cb962d9d91c54e656" - integrity sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ== - -setprototypeof@1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.1.tgz#7e95acb24aa92f5885e0abef5ba131330d4ae683" - integrity sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw== - -shallow-clone@^3.0.0: - version "3.0.1" - resolved "https://registry.yarnpkg.com/shallow-clone/-/shallow-clone-3.0.1.tgz#8f2981ad92531f55035b01fb230769a40e02efa3" - integrity sha512-/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA== - dependencies: - kind-of "^6.0.2" - -shebang-command@^1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz#44aac65b695b03398968c39f363fee5deafdf1ea" - integrity sha1-RKrGW2lbAzmJaMOfNj/uXer98eo= - dependencies: - shebang-regex "^1.0.0" - -shebang-command@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-2.0.0.tgz#ccd0af4f8835fbdc265b82461aaf0c36663f34ea" - integrity sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA== - dependencies: - shebang-regex "^3.0.0" - -shebang-regex@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz#da42f49740c0b42db2ca9728571cb190c98efea3" - integrity sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM= - -shebang-regex@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172" - integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A== - -shellwords@^0.1.1: - version "0.1.1" - resolved "https://registry.yarnpkg.com/shellwords/-/shellwords-0.1.1.tgz#d6b9181c1a48d397324c84871efbcfc73fc0654b" - integrity sha512-vFwSUfQvqybiICwZY5+DAWIPLKsWO31Q91JSKl3UYv+K5c2QRPzn0qzec6QPu1Qc9eHYItiP3NdJqNVqetYAww== - -signal-exit@^3.0.0, signal-exit@^3.0.2: - version "3.0.3" - resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.3.tgz#a1410c2edd8f077b08b4e253c8eacfcaf057461c" - integrity sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA== - -slash@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634" - integrity sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q== - -slice-ansi@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-3.0.0.tgz#31ddc10930a1b7e0b67b08c96c2f49b77a789787" - integrity sha512-pSyv7bSTC7ig9Dcgbw9AuRNUb5k5V6oDudjZoMBSr13qpLBG7tB+zgCkARjq7xIUgdz5P1Qe8u+rSGdouOOIyQ== - dependencies: - ansi-styles "^4.0.0" - astral-regex "^2.0.0" - is-fullwidth-code-point "^3.0.0" - -slice-ansi@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-4.0.0.tgz#500e8dd0fd55b05815086255b3195adf2a45fe6b" - integrity sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ== - dependencies: - ansi-styles "^4.0.0" - astral-regex "^2.0.0" - is-fullwidth-code-point "^3.0.0" - -smart-buffer@^4.1.0: - version "4.2.0" - resolved "https://registry.yarnpkg.com/smart-buffer/-/smart-buffer-4.2.0.tgz#6e1d71fa4f18c05f7d0ff216dd16a481d0e8d9ae" - integrity sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg== - -snapdragon-node@^2.0.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/snapdragon-node/-/snapdragon-node-2.1.1.tgz#6c175f86ff14bdb0724563e8f3c1b021a286853b" - integrity sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw== - dependencies: - define-property "^1.0.0" - isobject "^3.0.0" - snapdragon-util "^3.0.1" - -snapdragon-util@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/snapdragon-util/-/snapdragon-util-3.0.1.tgz#f956479486f2acd79700693f6f7b805e45ab56e2" - integrity sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ== - dependencies: - kind-of "^3.2.0" - -snapdragon@^0.8.1: - version "0.8.2" - resolved "https://registry.yarnpkg.com/snapdragon/-/snapdragon-0.8.2.tgz#64922e7c565b0e14204ba1aa7d6964278d25182d" - integrity sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg== - dependencies: - base "^0.11.1" - debug "^2.2.0" - define-property "^0.2.5" - extend-shallow "^2.0.1" - map-cache "^0.2.2" - source-map "^0.5.6" - source-map-resolve "^0.5.0" - use "^3.1.0" - -socket.io-adapter@~2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/socket.io-adapter/-/socket.io-adapter-2.1.0.tgz#edc5dc36602f2985918d631c1399215e97a1b527" - integrity sha512-+vDov/aTsLjViYTwS9fPy5pEtTkrbEKsw2M+oVSoFGw6OD1IpvlV1VPhUzNbofCQ8oyMbdYJqDtGdmHQK6TdPg== - -socket.io-parser@~4.0.3: - version "4.0.4" - resolved "https://registry.yarnpkg.com/socket.io-parser/-/socket.io-parser-4.0.4.tgz#9ea21b0d61508d18196ef04a2c6b9ab630f4c2b0" - integrity sha512-t+b0SS+IxG7Rxzda2EVvyBZbvFPBCjJoyHuE0P//7OAsN23GItzDRdWa6ALxZI/8R5ygK7jAR6t028/z+7295g== - dependencies: - "@types/component-emitter" "^1.2.10" - component-emitter "~1.3.0" - debug "~4.3.1" - -socket.io@^3.1.0: - version "3.1.2" - resolved "https://registry.yarnpkg.com/socket.io/-/socket.io-3.1.2.tgz#06e27caa1c4fc9617547acfbb5da9bc1747da39a" - integrity sha512-JubKZnTQ4Z8G4IZWtaAZSiRP3I/inpy8c/Bsx2jrwGrTbKeVU5xd6qkKMHpChYeM3dWZSO0QACiGK+obhBNwYw== - dependencies: - "@types/cookie" "^0.4.0" - "@types/cors" "^2.8.8" - "@types/node" ">=10.0.0" - accepts "~1.3.4" - base64id "~2.0.0" - debug "~4.3.1" - engine.io "~4.1.0" - socket.io-adapter "~2.1.0" - socket.io-parser "~4.0.3" - -sockjs-client@^1.5.0: - version "1.5.2" - resolved "https://registry.yarnpkg.com/sockjs-client/-/sockjs-client-1.5.2.tgz#4bc48c2da9ce4769f19dc723396b50f5c12330a3" - integrity sha512-ZzRxPBISQE7RpzlH4tKJMQbHM9pabHluk0WBaxAQ+wm/UieeBVBou0p4wVnSQGN9QmpAZygQ0cDIypWuqOFmFQ== - dependencies: - debug "^3.2.6" - eventsource "^1.0.7" - faye-websocket "^0.11.3" - inherits "^2.0.4" - json3 "^3.3.3" - url-parse "^1.5.3" - -sockjs@^0.3.21: - version "0.3.21" - resolved "https://registry.yarnpkg.com/sockjs/-/sockjs-0.3.21.tgz#b34ffb98e796930b60a0cfa11904d6a339a7d417" - integrity sha512-DhbPFGpxjc6Z3I+uX07Id5ZO2XwYsWOrYjaSeieES78cq+JaJvVe5q/m1uvjIQhXinhIeCFRH6JgXe+mvVMyXw== - dependencies: - faye-websocket "^0.11.3" - uuid "^3.4.0" - websocket-driver "^0.7.4" - -socks-proxy-agent@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/socks-proxy-agent/-/socks-proxy-agent-6.0.0.tgz#9f8749cdc05976505fa9f9a958b1818d0e60573b" - integrity sha512-FIgZbQWlnjVEQvMkylz64/rUggGtrKstPnx8OZyYFG0tAFR8CSBtpXxSwbFLHyeXFn/cunFL7MpuSOvDSOPo9g== - dependencies: - agent-base "^6.0.2" - debug "^4.3.1" - socks "^2.6.1" - -socks@^2.6.1: - version "2.6.1" - resolved "https://registry.yarnpkg.com/socks/-/socks-2.6.1.tgz#989e6534a07cf337deb1b1c94aaa44296520d30e" - integrity sha512-kLQ9N5ucj8uIcxrDwjm0Jsqk06xdpBjGNQtpXy4Q8/QY2k+fY7nZH8CARy+hkbG+SGAovmzzuauCpBlb8FrnBA== - dependencies: - ip "^1.1.5" - smart-buffer "^4.1.0" - -source-list-map@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-2.0.1.tgz#3993bd873bfc48479cca9ea3a547835c7c154b34" - integrity sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw== - -source-map-js@^0.6.2: - version "0.6.2" - resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-0.6.2.tgz#0bb5de631b41cfbda6cfba8bd05a80efdfd2385e" - integrity sha512-/3GptzWzu0+0MBQFrDKzw/DvvMTUORvgY6k6jd/VS6iCR4RDTKWH6v6WPwQoUO8667uQEf9Oe38DxAYWY5F/Ug== - -source-map-loader@3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/source-map-loader/-/source-map-loader-3.0.0.tgz#f2a04ee2808ad01c774dea6b7d2639839f3b3049" - integrity sha512-GKGWqWvYr04M7tn8dryIWvb0s8YM41z82iQv01yBtIylgxax0CwvSy6gc2Y02iuXwEfGWRlMicH0nvms9UZphw== - dependencies: - abab "^2.0.5" - iconv-lite "^0.6.2" - source-map-js "^0.6.2" - -source-map-resolve@^0.5.0, source-map-resolve@^0.5.2: - version "0.5.3" - resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.5.3.tgz#190866bece7553e1f8f267a2ee82c606b5509a1a" - integrity sha512-Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw== - dependencies: - atob "^2.1.2" - decode-uri-component "^0.2.0" - resolve-url "^0.2.1" - source-map-url "^0.4.0" - urix "^0.1.0" - -source-map-resolve@^0.6.0: - version "0.6.0" - resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.6.0.tgz#3d9df87e236b53f16d01e58150fc7711138e5ed2" - integrity sha512-KXBr9d/fO/bWo97NXsPIAW1bFSBOuCnjbNTBMO7N59hsv5i9yzRDfcYwwt0l04+VqnKC+EwzvJZIP/qkuMgR/w== - dependencies: - atob "^2.1.2" - decode-uri-component "^0.2.0" - -source-map-support@0.5.19, source-map-support@^0.5.5, source-map-support@~0.5.19: - version "0.5.19" - resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.19.tgz#a98b62f86dcaf4f67399648c085291ab9e8fed61" - integrity sha512-Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw== - dependencies: - buffer-from "^1.0.0" - source-map "^0.6.0" - -source-map-url@^0.4.0: - version "0.4.1" - resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.1.tgz#0af66605a745a5a2f91cf1bbf8a7afbc283dec56" - integrity sha512-cPiFOTLUKvJFIg4SKVScy4ilPPW6rFgMgfuZJPNoDuMs3nC1HbMUycBoJw77xFIp6z1UJQJOfx6C9GMH80DiTw== - -source-map@0.6.1, source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.0, source-map@~0.6.1: - version "0.6.1" - resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263" - integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g== - -source-map@0.7.3, source-map@^0.7.3, source-map@~0.7.2: - version "0.7.3" - resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.7.3.tgz#5302f8169031735226544092e64981f751750383" - integrity sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ== - -source-map@^0.5.0, source-map@^0.5.6: - version "0.5.7" - resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc" - integrity sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w= - -sourcemap-codec@1.4.8, sourcemap-codec@^1.4.4, sourcemap-codec@^1.4.8: - version "1.4.8" - resolved "https://registry.yarnpkg.com/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz#ea804bd94857402e6992d05a38ef1ae35a9ab4c4" - integrity sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA== - -spdy-transport@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/spdy-transport/-/spdy-transport-3.0.0.tgz#00d4863a6400ad75df93361a1608605e5dcdcf31" - integrity sha512-hsLVFE5SjA6TCisWeJXFKniGGOpBgMLmerfO2aCyCU5s7nJ/rpAepqmFifv/GCbSbueEeAJJnmSQ2rKC/g8Fcw== - dependencies: - debug "^4.1.0" - detect-node "^2.0.4" - hpack.js "^2.1.6" - obuf "^1.1.2" - readable-stream "^3.0.6" - wbuf "^1.7.3" - -spdy@^4.0.2: - version "4.0.2" - resolved "https://registry.yarnpkg.com/spdy/-/spdy-4.0.2.tgz#b74f466203a3eda452c02492b91fb9e84a27677b" - integrity sha512-r46gZQZQV+Kl9oItvl1JZZqJKGr+oEkB08A6BzkiR7593/7IbtuncXHd2YoYeTsG4157ZssMu9KYvUHLcjcDoA== - dependencies: - debug "^4.1.0" - handle-thing "^2.0.0" - http-deceiver "^1.2.7" - select-hose "^2.0.0" - spdy-transport "^3.0.0" - -split-string@^3.0.1, split-string@^3.0.2: - version "3.1.0" - resolved "https://registry.yarnpkg.com/split-string/-/split-string-3.1.0.tgz#7cb09dda3a86585705c64b39a6466038682e8fe2" - integrity sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw== - dependencies: - extend-shallow "^3.0.0" - -sshpk@^1.7.0: - version "1.16.1" - resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.16.1.tgz#fb661c0bef29b39db40769ee39fa70093d6f6877" - integrity sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg== - dependencies: - asn1 "~0.2.3" - assert-plus "^1.0.0" - bcrypt-pbkdf "^1.0.0" - dashdash "^1.12.0" - ecc-jsbn "~0.1.1" - getpass "^0.1.1" - jsbn "~0.1.0" - safer-buffer "^2.0.2" - tweetnacl "~0.14.0" - -ssri@^8.0.0, ssri@^8.0.1: - version "8.0.1" - resolved "https://registry.yarnpkg.com/ssri/-/ssri-8.0.1.tgz#638e4e439e2ffbd2cd289776d5ca457c4f51a2af" - integrity sha512-97qShzy1AiyxvPNIkLWoGua7xoQzzPjQ0HAH4B0rWKo7SZ6USuPcrUiAFrws0UH8RrbWmgq3LMTObhPIHbbBeQ== - dependencies: - minipass "^3.1.1" - -stable@^0.1.8: - version "0.1.8" - resolved "https://registry.yarnpkg.com/stable/-/stable-0.1.8.tgz#836eb3c8382fe2936feaf544631017ce7d47a3cf" - integrity sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w== - -static-extend@^0.1.1: - version "0.1.2" - resolved "https://registry.yarnpkg.com/static-extend/-/static-extend-0.1.2.tgz#60809c39cbff55337226fd5e0b520f341f1fb5c6" - integrity sha1-YICcOcv/VTNyJv1eC1IPNB8ftcY= - dependencies: - define-property "^0.2.5" - object-copy "^0.1.0" - -"statuses@>= 1.4.0 < 2", "statuses@>= 1.5.0 < 2", statuses@~1.5.0: - version "1.5.0" - resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c" - integrity sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow= - -streamroller@^2.2.4: - version "2.2.4" - resolved "https://registry.yarnpkg.com/streamroller/-/streamroller-2.2.4.tgz#c198ced42db94086a6193608187ce80a5f2b0e53" - integrity sha512-OG79qm3AujAM9ImoqgWEY1xG4HX+Lw+yY6qZj9R1K2mhF5bEmQ849wvrb+4vt4jLMLzwXttJlQbOdPOQVRv7DQ== - dependencies: - date-format "^2.1.0" - debug "^4.1.1" - fs-extra "^8.1.0" - -string-width@^1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3" - integrity sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M= - dependencies: - code-point-at "^1.0.0" - is-fullwidth-code-point "^1.0.0" - strip-ansi "^3.0.0" - -"string-width@^1.0.2 || 2": - version "2.1.1" - resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e" - integrity sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw== - dependencies: - is-fullwidth-code-point "^2.0.0" - strip-ansi "^4.0.0" - -string-width@^3.0.0, string-width@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/string-width/-/string-width-3.1.0.tgz#22767be21b62af1081574306f69ac51b62203961" - integrity sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w== - dependencies: - emoji-regex "^7.0.1" - is-fullwidth-code-point "^2.0.0" - strip-ansi "^5.1.0" - -string-width@^4.1.0, string-width@^4.2.0: - version "4.2.2" - resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.2.tgz#dafd4f9559a7585cfba529c6a0a4f73488ebd4c5" - integrity sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA== - dependencies: - emoji-regex "^8.0.0" - is-fullwidth-code-point "^3.0.0" - strip-ansi "^6.0.0" - -string_decoder@^1.1.1: - version "1.3.0" - resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.3.0.tgz#42f114594a46cf1a8e30b0a84f56c78c3edac21e" - integrity sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA== - dependencies: - safe-buffer "~5.2.0" - -string_decoder@~1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8" - integrity sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg== - dependencies: - safe-buffer "~5.1.0" - -strip-ansi@^3.0.0, strip-ansi@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf" - integrity sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8= - dependencies: - ansi-regex "^2.0.0" - -strip-ansi@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-4.0.0.tgz#a8479022eb1ac368a871389b635262c505ee368f" - integrity sha1-qEeQIusaw2iocTibY1JixQXuNo8= - dependencies: - ansi-regex "^3.0.0" - -strip-ansi@^5.0.0, strip-ansi@^5.1.0, strip-ansi@^5.2.0: - version "5.2.0" - resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-5.2.0.tgz#8c9a536feb6afc962bdfa5b104a5091c1ad9c0ae" - integrity sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA== - dependencies: - ansi-regex "^4.1.0" - -strip-ansi@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.0.tgz#0b1571dd7669ccd4f3e06e14ef1eed26225ae532" - integrity sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w== - dependencies: - ansi-regex "^5.0.0" - -strip-bom@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3" - integrity sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM= - -strip-eof@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/strip-eof/-/strip-eof-1.0.0.tgz#bb43ff5598a6eb05d89b59fcd129c983313606bf" - integrity sha1-u0P/VZim6wXYm1n80SnJgzE2Br8= - -strip-final-newline@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/strip-final-newline/-/strip-final-newline-2.0.0.tgz#89b852fb2fcbe936f6f4b3187afb0a12c1ab58ad" - integrity sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA== - -style-loader@3.2.1: - version "3.2.1" - resolved "https://registry.yarnpkg.com/style-loader/-/style-loader-3.2.1.tgz#63cb920ec145c8669e9a50e92961452a1ef5dcde" - integrity sha512-1k9ZosJCRFaRbY6hH49JFlRB0fVSbmnyq1iTPjNxUmGVjBNEmwrrHPenhlp+Lgo51BojHSf6pl2FcqYaN3PfVg== - -stylehacks@^5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/stylehacks/-/stylehacks-5.0.1.tgz#323ec554198520986806388c7fdaebc38d2c06fb" - integrity sha512-Es0rVnHIqbWzveU1b24kbw92HsebBepxfcqe5iix7t9j0PQqhs0IxXVXv0pY2Bxa08CgMkzD6OWql7kbGOuEdA== - dependencies: - browserslist "^4.16.0" - postcss-selector-parser "^6.0.4" - -stylus-loader@6.1.0: - version "6.1.0" - resolved "https://registry.yarnpkg.com/stylus-loader/-/stylus-loader-6.1.0.tgz#7a3a719a27cb2b9617896d6da28fda94c3ed9762" - integrity sha512-qKO34QCsOtSJrXxQQmXsPeaVHh6hMumBAFIoJTcsSr2VzrA6o/CW9HCGR8spCjzJhN8oKQHdj/Ytx0wwXyElkw== - dependencies: - fast-glob "^3.2.5" - klona "^2.0.4" - normalize-path "^3.0.0" - -stylus@0.54.8: - version "0.54.8" - resolved "https://registry.yarnpkg.com/stylus/-/stylus-0.54.8.tgz#3da3e65966bc567a7b044bfe0eece653e099d147" - integrity sha512-vr54Or4BZ7pJafo2mpf0ZcwA74rpuYCZbxrHBsH8kbcXOwSfvBFwsRfpGO5OD5fhG5HDCFW737PKaawI7OqEAg== - dependencies: - css-parse "~2.0.0" - debug "~3.1.0" - glob "^7.1.6" - mkdirp "~1.0.4" - safer-buffer "^2.1.2" - sax "~1.2.4" - semver "^6.3.0" - source-map "^0.7.3" - -supports-color@^5.3.0: - version "5.5.0" - resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f" - integrity sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow== - dependencies: - has-flag "^3.0.0" - -supports-color@^6.1.0: - version "6.1.0" - resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-6.1.0.tgz#0764abc69c63d5ac842dd4867e8d025e880df8f3" - integrity sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ== - dependencies: - has-flag "^3.0.0" - -supports-color@^7.1.0: - version "7.2.0" - resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.2.0.tgz#1b7dcdcb32b8138801b3e478ba6a51caa89648da" - integrity sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw== - dependencies: - has-flag "^4.0.0" - -supports-color@^8.0.0, supports-color@^8.1.1: - version "8.1.1" - resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-8.1.1.tgz#cd6fc17e28500cff56c1b86c0a7fd4a54a73005c" - integrity sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q== - dependencies: - has-flag "^4.0.0" - -svgo@^2.3.0: - version "2.5.0" - resolved "https://registry.yarnpkg.com/svgo/-/svgo-2.5.0.tgz#3c9051b606d85a02fcb59f459b19970d2cc2c9bf" - integrity sha512-FSdBOOo271VyF/qZnOn1PgwCdt1v4Dx0Sey+U1jgqm1vqRYjPGdip0RGrFW6ItwtkBB8rHgHk26dlVr0uCs82Q== - dependencies: - "@trysound/sax" "0.1.1" - colorette "^1.3.0" - commander "^7.2.0" - css-select "^4.1.3" - css-tree "^1.1.3" - csso "^4.2.0" - stable "^0.1.8" - -symbol-observable@4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-4.0.0.tgz#5b425f192279e87f2f9b937ac8540d1984b39205" - integrity sha512-b19dMThMV4HVFynSAM1++gBHAbk2Tc/osgLIBZMKsyqh34jb2e8Os7T6ZW/Bt3pJFdBTd2JwAnAAEQV7rSNvcQ== - -tapable@^2.1.1, tapable@^2.2.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/tapable/-/tapable-2.2.0.tgz#5c373d281d9c672848213d0e037d1c4165ab426b" - integrity sha512-FBk4IesMV1rBxX2tfiK8RAmogtWn53puLOQlvO8XuwlgxcYbP4mVPS9Ph4aeamSyyVjOl24aYWAuc8U5kCVwMw== - -tar-fs@2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/tar-fs/-/tar-fs-2.0.0.tgz#677700fc0c8b337a78bee3623fdc235f21d7afad" - integrity sha512-vaY0obB6Om/fso8a8vakQBzwholQ7v5+uy+tF3Ozvxv1KNezmVQAiWtcNmMHFSFPqL3dJA8ha6gdtFbfX9mcxA== - dependencies: - chownr "^1.1.1" - mkdirp "^0.5.1" - pump "^3.0.0" - tar-stream "^2.0.0" - -tar-stream@^2.0.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/tar-stream/-/tar-stream-2.2.0.tgz#acad84c284136b060dc3faa64474aa9aebd77287" - integrity sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ== - dependencies: - bl "^4.0.3" - end-of-stream "^1.4.1" - fs-constants "^1.0.0" - inherits "^2.0.3" - readable-stream "^3.1.1" - -tar@^6.0.2, tar@^6.1.0: - version "6.1.11" - resolved "https://registry.yarnpkg.com/tar/-/tar-6.1.11.tgz#6760a38f003afa1b2ffd0ffe9e9abbd0eab3d621" - integrity sha512-an/KZQzQUkZCkuoAA64hM92X0Urb6VpRhAFllDzz44U2mcD5scmT3zBc4VgVpkugF580+DQn8eAFSyoQt0tznA== - dependencies: - chownr "^2.0.0" - fs-minipass "^2.0.0" - minipass "^3.0.0" - minizlib "^2.1.1" - mkdirp "^1.0.3" - yallist "^4.0.0" - -terser-webpack-plugin@5.1.4, terser-webpack-plugin@^5.1.3: - version "5.1.4" - resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-5.1.4.tgz#c369cf8a47aa9922bd0d8a94fe3d3da11a7678a1" - integrity sha512-C2WkFwstHDhVEmsmlCxrXUtVklS+Ir1A7twrYzrDrQQOIMOaVAYykaoo/Aq1K0QRkMoY2hhvDQY1cm4jnIMFwA== - dependencies: - jest-worker "^27.0.2" - p-limit "^3.1.0" - schema-utils "^3.0.0" - serialize-javascript "^6.0.0" - source-map "^0.6.1" - terser "^5.7.0" - -terser@5.7.1: - version "5.7.1" - resolved "https://registry.yarnpkg.com/terser/-/terser-5.7.1.tgz#2dc7a61009b66bb638305cb2a824763b116bf784" - integrity sha512-b3e+d5JbHAe/JSjwsC3Zn55wsBIM7AsHLjKxT31kGCldgbpFePaFo+PiddtO6uwRZWRw7sPXmAN8dTW61xmnSg== - dependencies: - commander "^2.20.0" - source-map "~0.7.2" - source-map-support "~0.5.19" - -terser@^5.7.0: - version "5.7.2" - resolved "https://registry.yarnpkg.com/terser/-/terser-5.7.2.tgz#d4d95ed4f8bf735cb933e802f2a1829abf545e3f" - integrity sha512-0Omye+RD4X7X69O0eql3lC4Heh/5iLj3ggxR/B5ketZLOtLiOqukUgjw3q4PDnNQbsrkKr3UMypqStQG3XKRvw== - dependencies: - commander "^2.20.0" - source-map "~0.7.2" - source-map-support "~0.5.19" - -text-table@0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4" - integrity sha1-f17oI66AUgfACvLfSoTsP8+lcLQ= - -throttleit@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/throttleit/-/throttleit-1.0.0.tgz#9e785836daf46743145a5984b6268d828528ac6c" - integrity sha1-nnhYNtr0Z0MUWlmEtiaNgoUorGw= - -through@^2.3.6, through@^2.3.8: - version "2.3.8" - resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5" - integrity sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU= - -thunky@^1.0.2: - version "1.1.0" - resolved "https://registry.yarnpkg.com/thunky/-/thunky-1.1.0.tgz#5abaf714a9405db0504732bbccd2cedd9ef9537d" - integrity sha512-eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA== - -timsort@^0.3.0: - version "0.3.0" - resolved "https://registry.yarnpkg.com/timsort/-/timsort-0.3.0.tgz#405411a8e7e6339fe64db9a234de11dc31e02bd4" - integrity sha1-QFQRqOfmM5/mTbmiNN4R3DHgK9Q= - -tmp@^0.0.33: - version "0.0.33" - resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.33.tgz#6d34335889768d21b2bcda0aa277ced3b1bfadf9" - integrity sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw== - dependencies: - os-tmpdir "~1.0.2" - -tmp@^0.2.1, tmp@~0.2.1: - version "0.2.1" - resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.2.1.tgz#8457fc3037dcf4719c251367a1af6500ee1ccf14" - integrity sha512-76SUhtfqR2Ijn+xllcI5P1oyannHNHByD80W1q447gU3mp9G9PSpGdWmjUOHRDPiHYacIk66W7ubDTuPF3BEtQ== - dependencies: - rimraf "^3.0.0" - -to-fast-properties@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz#dc5e698cbd079265bc73e0377681a4e4e83f616e" - integrity sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4= - -to-object-path@^0.3.0: - version "0.3.0" - resolved "https://registry.yarnpkg.com/to-object-path/-/to-object-path-0.3.0.tgz#297588b7b0e7e0ac08e04e672f85c1f4999e17af" - integrity sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68= - dependencies: - kind-of "^3.0.2" - -to-regex-range@^2.1.0: - version "2.1.1" - resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-2.1.1.tgz#7c80c17b9dfebe599e27367e0d4dd5590141db38" - integrity sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg= - dependencies: - is-number "^3.0.0" - repeat-string "^1.6.1" - -to-regex-range@^5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-5.0.1.tgz#1648c44aae7c8d988a326018ed72f5b4dd0392e4" - integrity sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ== - dependencies: - is-number "^7.0.0" - -to-regex@^3.0.1, to-regex@^3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/to-regex/-/to-regex-3.0.2.tgz#13cfdd9b336552f30b51f33a8ae1b42a7a7599ce" - integrity sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw== - dependencies: - define-property "^2.0.2" - extend-shallow "^3.0.2" - regex-not "^1.0.2" - safe-regex "^1.1.0" - -toidentifier@1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.0.tgz#7e1be3470f1e77948bc43d94a3c8f4d7752ba553" - integrity sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw== - -tough-cookie@~2.5.0: - version "2.5.0" - resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.5.0.tgz#cd9fb2a0aa1d5a12b473bd9fb96fa3dcff65ade2" - integrity sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g== - dependencies: - psl "^1.1.28" - punycode "^2.1.1" - -tree-kill@1.2.2: - version "1.2.2" - resolved "https://registry.yarnpkg.com/tree-kill/-/tree-kill-1.2.2.tgz#4ca09a9092c88b73a7cdc5e8a01b507b0790a0cc" - integrity sha512-L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A== - -ts-node@^10.0.0: - version "10.2.1" - resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-10.2.1.tgz#4cc93bea0a7aba2179497e65bb08ddfc198b3ab5" - integrity sha512-hCnyOyuGmD5wHleOQX6NIjJtYVIO8bPP8F2acWkB4W06wdlkgyvJtubO/I9NkI88hCFECbsEgoLc0VNkYmcSfw== - dependencies: - "@cspotcode/source-map-support" "0.6.1" - "@tsconfig/node10" "^1.0.7" - "@tsconfig/node12" "^1.0.7" - "@tsconfig/node14" "^1.0.0" - "@tsconfig/node16" "^1.0.2" - acorn "^8.4.1" - acorn-walk "^8.1.1" - arg "^4.1.0" - create-require "^1.1.0" - diff "^4.0.1" - make-error "^1.1.1" - yn "3.1.1" - -tsconfig-paths@^3.9.0: - version "3.11.0" - resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.11.0.tgz#954c1fe973da6339c78e06b03ce2e48810b65f36" - integrity sha512-7ecdYDnIdmv639mmDwslG6KQg1Z9STTz1j7Gcz0xa+nshh/gKDAHcPxRbWOsA3SPp0tXP2leTcY9Kw+NAkfZzA== - dependencies: - "@types/json5" "^0.0.29" - json5 "^1.0.1" - minimist "^1.2.0" - strip-bom "^3.0.0" - -tslib@2.3.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.3.0.tgz#803b8cdab3e12ba581a4ca41c8839bbb0dacb09e" - integrity sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg== - -tslib@^1.10.0, tslib@^1.9.0: - version "1.14.1" - resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00" - integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg== - -tslib@^2.0.0, tslib@^2.1.0, tslib@^2.2.0, tslib@^2.3.0: - version "2.3.1" - resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.3.1.tgz#e8a335add5ceae51aa261d32a490158ef042ef01" - integrity sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw== - -tslib@~2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.1.0.tgz#da60860f1c2ecaa5703ab7d39bc05b6bf988b97a" - integrity sha512-hcVC3wYEziELGGmEEXue7D75zbwIIVUMWAVbHItGPx0ziyXxrOMQx4rQEVEV45Ut/1IotuEvwqPopzIOkDMf0A== - -tunnel-agent@^0.6.0: - version "0.6.0" - resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd" - integrity sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0= - dependencies: - safe-buffer "^5.0.1" - -tweetnacl@^0.14.3, tweetnacl@~0.14.0: - version "0.14.5" - resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64" - integrity sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q= - -type-fest@^0.21.3: - version "0.21.3" - resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.21.3.tgz#d260a24b0198436e133fa26a524a6d65fa3b2e37" - integrity sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w== - -type-is@~1.6.17, type-is@~1.6.18: - version "1.6.18" - resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.18.tgz#4e552cd05df09467dcbc4ef739de89f2cf37c131" - integrity sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g== - dependencies: - media-typer "0.3.0" - mime-types "~2.1.24" - -typescript@4.3.5, typescript@~4.3.5: - version "4.3.5" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.3.5.tgz#4d1c37cc16e893973c45a06886b7113234f119f4" - integrity sha512-DqQgihaQ9cUrskJo9kIyW/+g0Vxsk8cDtZ52a3NGh0YNTfpUSArXSohyUGnvbPazEPLu398C0UxmKSOrPumUzA== - -ua-parser-js@^0.7.28: - version "0.7.28" - resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.28.tgz#8ba04e653f35ce210239c64661685bf9121dec31" - integrity sha512-6Gurc1n//gjp9eQNXjD9O3M/sMwVtN5S8Lv9bvOYBfKfDNiIIhqiyi01vMBO45u4zkDE420w/e0se7Vs+sIg+g== - -unbzip2-stream@1.3.3: - version "1.3.3" - resolved "https://registry.yarnpkg.com/unbzip2-stream/-/unbzip2-stream-1.3.3.tgz#d156d205e670d8d8c393e1c02ebd506422873f6a" - integrity sha512-fUlAF7U9Ah1Q6EieQ4x4zLNejrRvDWUYmxXUpN3uziFYCHapjWFaCAnreY9bGgxzaMCFAPPpYNng57CypwJVhg== - dependencies: - buffer "^5.2.1" - through "^2.3.8" - -unicode-canonical-property-names-ecmascript@^1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-1.0.4.tgz#2619800c4c825800efdd8343af7dd9933cbe2818" - integrity sha512-jDrNnXWHd4oHiTZnx/ZG7gtUTVp+gCcTTKr8L0HjlwphROEW3+Him+IpvC+xcJEFegapiMZyZe02CyuOnRmbnQ== - -unicode-match-property-ecmascript@^1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-1.0.4.tgz#8ed2a32569961bce9227d09cd3ffbb8fed5f020c" - integrity sha512-L4Qoh15vTfntsn4P1zqnHulG0LdXgjSO035fEpdtp6YxXhMT51Q6vgM5lYdG/5X3MjS+k/Y9Xw4SFCY9IkR0rg== - dependencies: - unicode-canonical-property-names-ecmascript "^1.0.4" - unicode-property-aliases-ecmascript "^1.0.4" - -unicode-match-property-value-ecmascript@^1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-1.2.0.tgz#0d91f600eeeb3096aa962b1d6fc88876e64ea531" - integrity sha512-wjuQHGQVofmSJv1uVISKLE5zO2rNGzM/KCYZch/QQvez7C1hUhBIuZ701fYXExuufJFMPhv2SyL8CyoIfMLbIQ== - -unicode-property-aliases-ecmascript@^1.0.4: - version "1.1.0" - resolved "https://registry.yarnpkg.com/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-1.1.0.tgz#dd57a99f6207bedff4628abefb94c50db941c8f4" - integrity sha512-PqSoPh/pWetQ2phoj5RLiaqIk4kCNwoV3CI+LfGmWLKI3rE3kl1h59XpX2BjgDrmbxD9ARtQobPGU1SguCYuQg== - -union-value@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/union-value/-/union-value-1.0.1.tgz#0b6fe7b835aecda61c6ea4d4f02c14221e109847" - integrity sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg== - dependencies: - arr-union "^3.1.0" - get-value "^2.0.6" - is-extendable "^0.1.1" - set-value "^2.0.1" - -uniq@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/uniq/-/uniq-1.0.1.tgz#b31c5ae8254844a3a8281541ce2b04b865a734ff" - integrity sha1-sxxa6CVIRKOoKBVBzisEuGWnNP8= - -uniqs@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/uniqs/-/uniqs-2.0.0.tgz#ffede4b36b25290696e6e165d4a59edb998e6b02" - integrity sha1-/+3ks2slKQaW5uFl1KWe25mOawI= - -unique-filename@^1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/unique-filename/-/unique-filename-1.1.1.tgz#1d69769369ada0583103a1e6ae87681b56573230" - integrity sha512-Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ== - dependencies: - unique-slug "^2.0.0" - -unique-slug@^2.0.0: - version "2.0.2" - resolved "https://registry.yarnpkg.com/unique-slug/-/unique-slug-2.0.2.tgz#baabce91083fc64e945b0f3ad613e264f7cd4e6c" - integrity sha512-zoWr9ObaxALD3DOPfjPSqxt4fnZiWblxHIgeWqW8x7UqDzEtHEQLzji2cuJYQFCU6KmoJikOYAZlrTHHebjx2w== - dependencies: - imurmurhash "^0.1.4" - -universalify@^0.1.0: - version "0.1.2" - resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66" - integrity sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg== - -universalify@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/universalify/-/universalify-2.0.0.tgz#75a4984efedc4b08975c5aeb73f530d02df25717" - integrity sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ== - -unpipe@1.0.0, unpipe@~1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec" - integrity sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw= - -unset-value@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/unset-value/-/unset-value-1.0.0.tgz#8376873f7d2335179ffb1e6fc3a8ed0dfc8ab559" - integrity sha1-g3aHP30jNRef+x5vw6jtDfyKtVk= - dependencies: - has-value "^0.3.1" - isobject "^3.0.0" - -untildify@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/untildify/-/untildify-4.0.0.tgz#2bc947b953652487e4600949fb091e3ae8cd919b" - integrity sha512-KK8xQ1mkzZeg9inewmFVDNkg3l5LUhoq9kN6iWYB/CC9YMG8HA+c1Q8HwDe6dEX7kErrEVNVBO3fWsVq5iDgtw== - -upath@^1.1.1: - version "1.2.0" - resolved "https://registry.yarnpkg.com/upath/-/upath-1.2.0.tgz#8f66dbcd55a883acdae4408af8b035a5044c1894" - integrity sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg== - -uri-js@^4.2.2: - version "4.4.1" - resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.1.tgz#9b1a52595225859e55f669d928f88c6c57f2a77e" - integrity sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg== - dependencies: - punycode "^2.1.0" - -urix@^0.1.0: - version "0.1.0" - resolved "https://registry.yarnpkg.com/urix/-/urix-0.1.0.tgz#da937f7a62e21fec1fd18d49b35c2935067a6c72" - integrity sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI= - -url-parse@^1.4.3, url-parse@^1.5.3: - version "1.5.3" - resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.5.3.tgz#71c1303d38fb6639ade183c2992c8cc0686df862" - integrity sha512-IIORyIQD9rvj0A4CLWsHkBBJuNqWpFQe224b6j9t/ABmquIS0qDU2pY6kl6AuOrL5OkCXHMCFNe1jBcuAggjvQ== - dependencies: - querystringify "^2.1.1" - requires-port "^1.0.0" - -url@^0.11.0: - version "0.11.0" - resolved "https://registry.yarnpkg.com/url/-/url-0.11.0.tgz#3838e97cfc60521eb73c525a8e55bfdd9e2e28f1" - integrity sha1-ODjpfPxgUh63PFJajlW/3Z4uKPE= - dependencies: - punycode "1.3.2" - querystring "0.2.0" - -use@^3.1.0: - version "3.1.1" - resolved "https://registry.yarnpkg.com/use/-/use-3.1.1.tgz#d50c8cac79a19fbc20f2911f56eb973f4e10070f" - integrity sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ== - -util-deprecate@^1.0.1, util-deprecate@^1.0.2, util-deprecate@~1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf" - integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8= - -utils-merge@1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713" - integrity sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM= - -uuid@8.3.2, uuid@^8.3.0, uuid@^8.3.2: - version "8.3.2" - resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2" - integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg== - -uuid@^3.3.2, uuid@^3.4.0: - version "3.4.0" - resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz#b23e4358afa8a202fe7a100af1f5f883f02007ee" - integrity sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A== - -validate-npm-package-name@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/validate-npm-package-name/-/validate-npm-package-name-3.0.0.tgz#5fa912d81eb7d0c74afc140de7317f0ca7df437e" - integrity sha1-X6kS2B630MdK/BQN5zF/DKffQ34= - dependencies: - builtins "^1.0.3" - -vary@^1, vary@~1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc" - integrity sha1-IpnwLG3tMNSllhsLn3RSShj2NPw= - -vendors@^1.0.3: - version "1.0.4" - resolved "https://registry.yarnpkg.com/vendors/-/vendors-1.0.4.tgz#e2b800a53e7a29b93506c3cf41100d16c4c4ad8e" - integrity sha512-/juG65kTL4Cy2su4P8HjtkTxk6VmJDiOPBufWniqQ6wknac6jNiXS9vU+hO3wgusiyqWlzTbVHi0dyJqRONg3w== - -verror@1.10.0: - version "1.10.0" - resolved "https://registry.yarnpkg.com/verror/-/verror-1.10.0.tgz#3a105ca17053af55d6e270c1f8288682e18da400" - integrity sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA= - dependencies: - assert-plus "^1.0.0" - core-util-is "1.0.2" - extsprintf "^1.2.0" - -void-elements@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/void-elements/-/void-elements-2.0.1.tgz#c066afb582bb1cb4128d60ea92392e94d5e9dbec" - integrity sha1-wGavtYK7HLQSjWDqkjkulNXp2+w= - -wait-port@^0.2.9: - version "0.2.9" - resolved "https://registry.yarnpkg.com/wait-port/-/wait-port-0.2.9.tgz#3905cf271b5dbe37a85c03b85b418b81cb24ee55" - integrity sha512-hQ/cVKsNqGZ/UbZB/oakOGFqic00YAMM5/PEj3Bt4vKarv2jWIWzDbqlwT94qMs/exAQAsvMOq99sZblV92zxQ== - dependencies: - chalk "^2.4.2" - commander "^3.0.2" - debug "^4.1.1" - -watchpack@^2.2.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-2.2.0.tgz#47d78f5415fe550ecd740f99fe2882323a58b1ce" - integrity sha512-up4YAn/XHgZHIxFBVCdlMiWDj6WaLKpwVeGQk2I5thdYxF/KmF0aaz6TfJZ/hfl1h/XlcDr7k1KH7ThDagpFaA== - dependencies: - glob-to-regexp "^0.4.1" - graceful-fs "^4.1.2" - -wbuf@^1.1.0, wbuf@^1.7.3: - version "1.7.3" - resolved "https://registry.yarnpkg.com/wbuf/-/wbuf-1.7.3.tgz#c1d8d149316d3ea852848895cb6a0bfe887b87df" - integrity sha512-O84QOnr0icsbFGLS0O3bI5FswxzRr8/gHwWkDlQFskhSPryQXvrTMxjxGP4+iWYoauLoBvfDpkrOauZ+0iZpDA== - dependencies: - minimalistic-assert "^1.0.0" - -wcwidth@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/wcwidth/-/wcwidth-1.0.1.tgz#f0b0dcf915bc5ff1528afadb2c0e17b532da2fe8" - integrity sha1-8LDc+RW8X/FSivrbLA4XtTLaL+g= - dependencies: - defaults "^1.0.3" - -webpack-dev-middleware@5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-5.0.0.tgz#0abe825275720e0a339978aea5f0b03b140c1584" - integrity sha512-9zng2Z60pm6A98YoRcA0wSxw1EYn7B7y5owX/Tckyt9KGyULTkLtiavjaXlWqOMkM0YtqGgL3PvMOFgyFLq8vw== - dependencies: - colorette "^1.2.2" - mem "^8.1.1" - memfs "^3.2.2" - mime-types "^2.1.31" - range-parser "^1.2.1" - schema-utils "^3.0.0" - -webpack-dev-middleware@^3.7.2: - version "3.7.3" - resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-3.7.3.tgz#0639372b143262e2b84ab95d3b91a7597061c2c5" - integrity sha512-djelc/zGiz9nZj/U7PTBi2ViorGJXEWo/3ltkPbDyxCXhhEXkW0ce99falaok4TPj+AsxLiXJR0EBOb0zh9fKQ== - dependencies: - memory-fs "^0.4.1" - mime "^2.4.4" - mkdirp "^0.5.1" - range-parser "^1.2.1" - webpack-log "^2.0.0" - -webpack-dev-server@3.11.2: - version "3.11.2" - resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-3.11.2.tgz#695ebced76a4929f0d5de7fd73fafe185fe33708" - integrity sha512-A80BkuHRQfCiNtGBS1EMf2ChTUs0x+B3wGDFmOeT4rmJOHhHTCH2naNxIHhmkr0/UillP4U3yeIyv1pNp+QDLQ== - dependencies: - ansi-html "0.0.7" - bonjour "^3.5.0" - chokidar "^2.1.8" - compression "^1.7.4" - connect-history-api-fallback "^1.6.0" - debug "^4.1.1" - del "^4.1.1" - express "^4.17.1" - html-entities "^1.3.1" - http-proxy-middleware "0.19.1" - import-local "^2.0.0" - internal-ip "^4.3.0" - ip "^1.1.5" - is-absolute-url "^3.0.3" - killable "^1.0.1" - loglevel "^1.6.8" - opn "^5.5.0" - p-retry "^3.0.1" - portfinder "^1.0.26" - schema-utils "^1.0.0" - selfsigned "^1.10.8" - semver "^6.3.0" - serve-index "^1.9.1" - sockjs "^0.3.21" - sockjs-client "^1.5.0" - spdy "^4.0.2" - strip-ansi "^3.0.1" - supports-color "^6.1.0" - url "^0.11.0" - webpack-dev-middleware "^3.7.2" - webpack-log "^2.0.0" - ws "^6.2.1" - yargs "^13.3.2" - -webpack-log@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/webpack-log/-/webpack-log-2.0.0.tgz#5b7928e0637593f119d32f6227c1e0ac31e1b47f" - integrity sha512-cX8G2vR/85UYG59FgkoMamwHUIkSSlV3bBMRsbxVXVUk2j6NleCKjQ/WE9eYg9WY4w25O9w8wKP4rzNZFmUcUg== - dependencies: - ansi-colors "^3.0.0" - uuid "^3.3.2" - -webpack-merge@5.8.0, webpack-merge@^5.7.3: - version "5.8.0" - resolved "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-5.8.0.tgz#2b39dbf22af87776ad744c390223731d30a68f61" - integrity sha512-/SaI7xY0831XwP6kzuwhKWVKDP9t1QY1h65lAFLbZqMPIuYcD9QAW4u9STIbU9kaJbPBB/geU/gLr1wDjOhQ+Q== - dependencies: - clone-deep "^4.0.1" - wildcard "^2.0.0" - -webpack-sources@^1.2.0, webpack-sources@^1.3.0: - version "1.4.3" - resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-1.4.3.tgz#eedd8ec0b928fbf1cbfe994e22d2d890f330a933" - integrity sha512-lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ== - dependencies: - source-list-map "^2.0.0" - source-map "~0.6.1" - -webpack-sources@^3.2.0: - version "3.2.0" - resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-3.2.0.tgz#b16973bcf844ebcdb3afde32eda1c04d0b90f89d" - integrity sha512-fahN08Et7P9trej8xz/Z7eRu8ltyiygEo/hnRi9KqBUs80KeDcnf96ZJo++ewWd84fEf3xSX9bp4ZS9hbw0OBw== - -webpack-subresource-integrity@1.5.2: - version "1.5.2" - resolved "https://registry.yarnpkg.com/webpack-subresource-integrity/-/webpack-subresource-integrity-1.5.2.tgz#e40b6578d3072e2d24104975249c52c66e9a743e" - integrity sha512-GBWYBoyalbo5YClwWop9qe6Zclp8CIXYGIz12OPclJhIrSplDxs1Ls1JDMH8xBPPrg1T6ISaTW9Y6zOrwEiAzw== - dependencies: - webpack-sources "^1.3.0" - -webpack@5.50.0: - version "5.50.0" - resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.50.0.tgz#5562d75902a749eb4d75131f5627eac3a3192527" - integrity sha512-hqxI7t/KVygs0WRv/kTgUW8Kl3YC81uyWQSo/7WUs5LsuRw0htH/fCwbVBGCuiX/t4s7qzjXFcf41O8Reiypag== - dependencies: - "@types/eslint-scope" "^3.7.0" - "@types/estree" "^0.0.50" - "@webassemblyjs/ast" "1.11.1" - "@webassemblyjs/wasm-edit" "1.11.1" - "@webassemblyjs/wasm-parser" "1.11.1" - acorn "^8.4.1" - acorn-import-assertions "^1.7.6" - browserslist "^4.14.5" - chrome-trace-event "^1.0.2" - enhanced-resolve "^5.8.0" - es-module-lexer "^0.7.1" - eslint-scope "5.1.1" - events "^3.2.0" - glob-to-regexp "^0.4.1" - graceful-fs "^4.2.4" - json-parse-better-errors "^1.0.2" - loader-runner "^4.2.0" - mime-types "^2.1.27" - neo-async "^2.6.2" - schema-utils "^3.1.0" - tapable "^2.1.1" - terser-webpack-plugin "^5.1.3" - watchpack "^2.2.0" - webpack-sources "^3.2.0" - -websocket-driver@>=0.5.1, websocket-driver@^0.7.4: - version "0.7.4" - resolved "https://registry.yarnpkg.com/websocket-driver/-/websocket-driver-0.7.4.tgz#89ad5295bbf64b480abcba31e4953aca706f5760" - integrity sha512-b17KeDIQVjvb0ssuSDF2cYXSg2iztliJ4B9WdsuB6J952qCPKmnVq4DyW5motImXHDC1cBT/1UezrJVsKw5zjg== - dependencies: - http-parser-js ">=0.5.1" - safe-buffer ">=5.1.0" - websocket-extensions ">=0.1.1" - -websocket-extensions@>=0.1.1: - version "0.1.4" - resolved "https://registry.yarnpkg.com/websocket-extensions/-/websocket-extensions-0.1.4.tgz#7f8473bc839dfd87608adb95d7eb075211578a42" - integrity sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg== - -which-module@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a" - integrity sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho= - -which@^1.2.1, which@^1.2.9: - version "1.3.1" - resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a" - integrity sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ== - dependencies: - isexe "^2.0.0" - -which@^2.0.1, which@^2.0.2: - version "2.0.2" - resolved "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1" - integrity sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA== - dependencies: - isexe "^2.0.0" - -wide-align@^1.1.0: - version "1.1.3" - resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.3.tgz#ae074e6bdc0c14a431e804e624549c633b000457" - integrity sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA== - dependencies: - string-width "^1.0.2 || 2" - -wildcard@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/wildcard/-/wildcard-2.0.0.tgz#a77d20e5200c6faaac979e4b3aadc7b3dd7f8fec" - integrity sha512-JcKqAHLPxcdb9KM49dufGXn2x3ssnfjbcaQdLlfZsL9rH9wgDQjUtDxbo8NE0F6SFvydeu1VhZe7hZuHsB2/pw== - -wrap-ansi@^5.1.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-5.1.0.tgz#1fd1f67235d5b6d0fee781056001bfb694c03b09" - integrity sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q== - dependencies: - ansi-styles "^3.2.0" - string-width "^3.0.0" - strip-ansi "^5.0.0" - -wrap-ansi@^6.2.0: - version "6.2.0" - resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-6.2.0.tgz#e9393ba07102e6c91a3b221478f0257cd2856e53" - integrity sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA== - dependencies: - ansi-styles "^4.0.0" - string-width "^4.1.0" - strip-ansi "^6.0.0" - -wrap-ansi@^7.0.0: - version "7.0.0" - resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" - integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q== - dependencies: - ansi-styles "^4.0.0" - string-width "^4.1.0" - strip-ansi "^6.0.0" - -wrappy@1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" - integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8= - -ws@7.4.6, ws@~7.4.2: - version "7.4.6" - resolved "https://registry.yarnpkg.com/ws/-/ws-7.4.6.tgz#5654ca8ecdeee47c33a9a4bf6d28e2be2980377c" - integrity sha512-YmhHDO4MzaDLB+M9ym/mDA5z0naX8j7SIlT8f8z+I0VtzsRbekxEutHSme7NPS2qE8StCYQNUnfWdXta/Yu85A== - -ws@^6.2.1: - version "6.2.2" - resolved "https://registry.yarnpkg.com/ws/-/ws-6.2.2.tgz#dd5cdbd57a9979916097652d78f1cc5faea0c32e" - integrity sha512-zmhltoSR8u1cnDsD43TX59mzoMZsLKqUweyYBAIvTngR3shc0W6aOZylZmq/7hqyVxPdi+5Ud2QInblgyE72fw== - dependencies: - async-limiter "~1.0.0" - -y18n@^4.0.0: - version "4.0.3" - resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.3.tgz#b5f259c82cd6e336921efd7bfd8bf560de9eeedf" - integrity sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ== - -y18n@^5.0.5: - version "5.0.8" - resolved "https://registry.yarnpkg.com/y18n/-/y18n-5.0.8.tgz#7f4934d0f7ca8c56f95314939ddcd2dd91ce1d55" - integrity sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA== - -yallist@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72" - integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A== - -yaml@^1.10.0, yaml@^1.10.2: - version "1.10.2" - resolved "https://registry.yarnpkg.com/yaml/-/yaml-1.10.2.tgz#2301c5ffbf12b467de8da2333a459e29e7920e4b" - integrity sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg== - -yargs-parser@^13.1.2: - version "13.1.2" - resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-13.1.2.tgz#130f09702ebaeef2650d54ce6e3e5706f7a4fb38" - integrity sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg== - dependencies: - camelcase "^5.0.0" - decamelize "^1.2.0" - -yargs-parser@^20.2.2: - version "20.2.9" - resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.9.tgz#2eb7dc3b0289718fc295f362753845c41a0c94ee" - integrity sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w== - -yargs@^13.2.4, yargs@^13.3.2: - version "13.3.2" - resolved "https://registry.yarnpkg.com/yargs/-/yargs-13.3.2.tgz#ad7ffefec1aa59565ac915f82dccb38a9c31a2dd" - integrity sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw== - dependencies: - cliui "^5.0.0" - find-up "^3.0.0" - get-caller-file "^2.0.1" - require-directory "^2.1.1" - require-main-filename "^2.0.0" - set-blocking "^2.0.0" - string-width "^3.0.0" - which-module "^2.0.0" - y18n "^4.0.0" - yargs-parser "^13.1.2" - -yargs@^16.1.1: - version "16.2.0" - resolved "https://registry.yarnpkg.com/yargs/-/yargs-16.2.0.tgz#1c82bf0f6b6a66eafce7ef30e376f49a12477f66" - integrity sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw== - dependencies: - cliui "^7.0.2" - escalade "^3.1.1" - get-caller-file "^2.0.5" - require-directory "^2.1.1" - string-width "^4.2.0" - y18n "^5.0.5" - yargs-parser "^20.2.2" - -yargs@^17.0.0: - version "17.1.1" - resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.1.1.tgz#c2a8091564bdb196f7c0a67c1d12e5b85b8067ba" - integrity sha512-c2k48R0PwKIqKhPMWjeiF6y2xY/gPMUlro0sgxqXpbOIohWiLNXWslsootttv7E1e73QPAMQSg5FeySbVcpsPQ== - dependencies: - cliui "^7.0.2" - escalade "^3.1.1" - get-caller-file "^2.0.5" - require-directory "^2.1.1" - string-width "^4.2.0" - y18n "^5.0.5" - yargs-parser "^20.2.2" - -yauzl@^2.10.0: - version "2.10.0" - resolved "https://registry.yarnpkg.com/yauzl/-/yauzl-2.10.0.tgz#c7eb17c93e112cb1086fa6d8e51fb0667b79a5f9" - integrity sha1-x+sXyT4RLLEIb6bY5R+wZnt5pfk= - dependencies: - buffer-crc32 "~0.2.3" - fd-slicer "~1.1.0" - -yn@3.1.1: - version "3.1.1" - resolved "https://registry.yarnpkg.com/yn/-/yn-3.1.1.tgz#1e87401a09d767c1d5eab26a6e4c185182d2eb50" - integrity sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q== - -yocto-queue@^0.1.0: - version "0.1.0" - resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-0.1.0.tgz#0294eb3dee05028d31ee1a5fa2c556a6aaf10a1b" - integrity sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q== - -zone.js@~0.11.4: - version "0.11.4" - resolved "https://registry.yarnpkg.com/zone.js/-/zone.js-0.11.4.tgz#0f70dcf6aba80f698af5735cbb257969396e8025" - integrity sha512-DDh2Ab+A/B+9mJyajPjHFPWfYU1H+pdun4wnnk0OcQTNjem1XQSZ2CDW+rfZEUDjv5M19SBqAkjZi0x5wuB5Qw== - dependencies: - tslib "^2.0.0" +# This file is generated by running "yarn install" inside your project. +# Manual changes might be lost - proceed with caution! + +__metadata: + version: 5 + cacheKey: 8 + +"@ampproject/remapping@npm:1.0.1": + version: 1.0.1 + resolution: "@ampproject/remapping@npm:1.0.1" + dependencies: + "@jridgewell/resolve-uri": 1.0.0 + sourcemap-codec: 1.4.8 + checksum: 9bff987d1a86202df4793e2828fa34bfd7a78028ec79b2ac9202614543b4f475e7b2485e4f761a3ef54c9a24be355149a33482430fa2968231426178b4b89f6f + languageName: node + linkType: hard + +"@angular-builders/custom-webpack@npm:^12.1.3": + version: 12.1.3 + resolution: "@angular-builders/custom-webpack@npm:12.1.3" + dependencies: + "@angular-devkit/architect": ">=0.1200.0 < 0.1300.0" + "@angular-devkit/build-angular": ^12.0.0 + "@angular-devkit/core": ^12.0.0 + lodash: ^4.17.15 + ts-node: ^10.0.0 + tsconfig-paths: ^3.9.0 + webpack-merge: ^5.7.3 + checksum: f8e056a3c1b4a728efbd1cd4f31b81909f8b8464ab96c7621f6084743ad555c6a4c32e7b6945f9b698a00429865e4405b34aae707e4769a500a933426777c62a + languageName: node + linkType: hard + +"@angular-devkit/architect@npm:0.1202.12": + version: 0.1202.12 + resolution: "@angular-devkit/architect@npm:0.1202.12" + dependencies: + "@angular-devkit/core": 12.2.12 + rxjs: 6.6.7 + checksum: 4260d13d517d32e939d2e4197ae4f429fd0a41c1a08f99af4b1aefae6d387856aebd7e40fb47e486de05d80e52a2afc253788a73eac5dd37a8ed3012211415ea + languageName: node + linkType: hard + +"@angular-devkit/architect@npm:0.1202.3, @angular-devkit/architect@npm:>=0.1200.0 < 0.1300.0": + version: 0.1202.3 + resolution: "@angular-devkit/architect@npm:0.1202.3" + dependencies: + "@angular-devkit/core": 12.2.3 + rxjs: 6.6.7 + checksum: 46bd9472a515cba8f64d96eddf9789e52fea985c8ff651e9ee59a1c8cb5bff3a31e76004b84f9284e96d4aa7f0449dcbe9df9d586cfdb70073cd0f20c845a920 + languageName: node + linkType: hard + +"@angular-devkit/architect@npm:^0.1200.0": + version: 0.1200.5 + resolution: "@angular-devkit/architect@npm:0.1200.5" + dependencies: + "@angular-devkit/core": 12.0.5 + rxjs: 6.6.7 + checksum: 333da0c6acd377e0c4021628fcc1d177b809c055f63fb39f1915bdfec0e5e9d45776b2f5b8e07b8c3a45ed4002e75623f97f2f0bc47035c840a08ad0526dffe5 + languageName: node + linkType: hard + +"@angular-devkit/build-angular@npm:^12.0.0": + version: 12.2.3 + resolution: "@angular-devkit/build-angular@npm:12.2.3" + dependencies: + "@ampproject/remapping": 1.0.1 + "@angular-devkit/architect": 0.1202.3 + "@angular-devkit/build-optimizer": 0.1202.3 + "@angular-devkit/build-webpack": 0.1202.3 + "@angular-devkit/core": 12.2.3 + "@babel/core": 7.14.8 + "@babel/generator": 7.14.8 + "@babel/helper-annotate-as-pure": 7.14.5 + "@babel/plugin-proposal-async-generator-functions": 7.14.7 + "@babel/plugin-transform-async-to-generator": 7.14.5 + "@babel/plugin-transform-runtime": 7.14.5 + "@babel/preset-env": 7.14.8 + "@babel/runtime": 7.14.8 + "@babel/template": 7.14.5 + "@discoveryjs/json-ext": 0.5.3 + "@jsdevtools/coverage-istanbul-loader": 3.0.5 + "@ngtools/webpack": 12.2.3 + ansi-colors: 4.1.1 + babel-loader: 8.2.2 + browserslist: ^4.9.1 + cacache: 15.2.0 + caniuse-lite: ^1.0.30001032 + circular-dependency-plugin: 5.2.2 + copy-webpack-plugin: 9.0.1 + core-js: 3.16.0 + critters: 0.0.10 + css-loader: 6.2.0 + css-minimizer-webpack-plugin: 3.0.2 + esbuild: 0.12.17 + find-cache-dir: 3.3.1 + glob: 7.1.7 + https-proxy-agent: 5.0.0 + inquirer: 8.1.2 + karma-source-map-support: 1.4.0 + less: 4.1.1 + less-loader: 10.0.1 + license-webpack-plugin: 2.3.20 + loader-utils: 2.0.0 + mini-css-extract-plugin: 2.1.0 + minimatch: 3.0.4 + open: 8.2.1 + ora: 5.4.1 + parse5-html-rewriting-stream: 6.0.1 + piscina: 3.1.0 + postcss: 8.3.6 + postcss-import: 14.0.2 + postcss-loader: 6.1.1 + postcss-preset-env: 6.7.0 + regenerator-runtime: 0.13.9 + resolve-url-loader: 4.0.0 + rxjs: 6.6.7 + sass: 1.36.0 + sass-loader: 12.1.0 + semver: 7.3.5 + source-map-loader: 3.0.0 + source-map-support: 0.5.19 + style-loader: 3.2.1 + stylus: 0.54.8 + stylus-loader: 6.1.0 + terser: 5.7.1 + terser-webpack-plugin: 5.1.4 + text-table: 0.2.0 + tree-kill: 1.2.2 + tslib: 2.3.0 + webpack: 5.50.0 + webpack-dev-middleware: 5.0.0 + webpack-dev-server: 3.11.2 + webpack-merge: 5.8.0 + webpack-subresource-integrity: 1.5.2 + peerDependencies: + "@angular/compiler-cli": ^12.0.0 + "@angular/localize": ^12.0.0 + "@angular/service-worker": ^12.0.0 + karma: ^6.3.0 + ng-packagr: ^12.0.0 + protractor: ^7.0.0 + tailwindcss: ^2.0.0 + tslint: ^6.1.0 + typescript: ~4.2.3 || ~4.3.2 + peerDependenciesMeta: + "@angular/localize": + optional: true + "@angular/service-worker": + optional: true + karma: + optional: true + ng-packagr: + optional: true + protractor: + optional: true + tailwindcss: + optional: true + tslint: + optional: true + checksum: 95137fc651abae5f83da7002ed12f25ed39f510edbb85ac3acf1fa8e7b782d6df3d6b31eb838cd8e0214ca18a3b9ccee50f429f8b2c78256c58b1ed8b622e7ae + languageName: node + linkType: hard + +"@angular-devkit/build-angular@npm:^12.2.12": + version: 12.2.12 + resolution: "@angular-devkit/build-angular@npm:12.2.12" + dependencies: + "@ampproject/remapping": 1.0.1 + "@angular-devkit/architect": 0.1202.12 + "@angular-devkit/build-optimizer": 0.1202.12 + "@angular-devkit/build-webpack": 0.1202.12 + "@angular-devkit/core": 12.2.12 + "@babel/core": 7.14.8 + "@babel/generator": 7.14.8 + "@babel/helper-annotate-as-pure": 7.14.5 + "@babel/plugin-proposal-async-generator-functions": 7.14.7 + "@babel/plugin-transform-async-to-generator": 7.14.5 + "@babel/plugin-transform-runtime": 7.14.5 + "@babel/preset-env": 7.14.8 + "@babel/runtime": 7.14.8 + "@babel/template": 7.14.5 + "@discoveryjs/json-ext": 0.5.3 + "@jsdevtools/coverage-istanbul-loader": 3.0.5 + "@ngtools/webpack": 12.2.12 + ansi-colors: 4.1.1 + babel-loader: 8.2.2 + browserslist: ^4.9.1 + cacache: 15.2.0 + caniuse-lite: ^1.0.30001032 + circular-dependency-plugin: 5.2.2 + copy-webpack-plugin: 9.0.1 + core-js: 3.16.0 + critters: 0.0.12 + css-loader: 6.2.0 + css-minimizer-webpack-plugin: 3.0.2 + esbuild: 0.13.8 + esbuild-wasm: 0.13.8 + find-cache-dir: 3.3.1 + glob: 7.1.7 + https-proxy-agent: 5.0.0 + inquirer: 8.1.2 + karma-source-map-support: 1.4.0 + less: 4.1.1 + less-loader: 10.0.1 + license-webpack-plugin: 2.3.20 + loader-utils: 2.0.0 + mini-css-extract-plugin: 2.4.2 + minimatch: 3.0.4 + open: 8.2.1 + ora: 5.4.1 + parse5-html-rewriting-stream: 6.0.1 + piscina: 3.1.0 + postcss: 8.3.6 + postcss-import: 14.0.2 + postcss-loader: 6.1.1 + postcss-preset-env: 6.7.0 + regenerator-runtime: 0.13.9 + resolve-url-loader: 4.0.0 + rxjs: 6.6.7 + sass: 1.36.0 + sass-loader: 12.1.0 + semver: 7.3.5 + source-map-loader: 3.0.0 + source-map-support: 0.5.19 + style-loader: 3.2.1 + stylus: 0.54.8 + stylus-loader: 6.1.0 + terser: 5.7.1 + terser-webpack-plugin: 5.1.4 + text-table: 0.2.0 + tree-kill: 1.2.2 + tslib: 2.3.0 + webpack: 5.50.0 + webpack-dev-middleware: 5.0.0 + webpack-dev-server: 3.11.2 + webpack-merge: 5.8.0 + webpack-subresource-integrity: 1.5.2 + peerDependencies: + "@angular/compiler-cli": ^12.0.0 + "@angular/localize": ^12.0.0 + "@angular/service-worker": ^12.0.0 + karma: ^6.3.0 + ng-packagr: ^12.0.0 + protractor: ^7.0.0 + tailwindcss: ^2.0.0 + tslint: ^6.1.0 + typescript: ~4.2.3 || ~4.3.2 + dependenciesMeta: + esbuild: + optional: true + peerDependenciesMeta: + "@angular/localize": + optional: true + "@angular/service-worker": + optional: true + karma: + optional: true + ng-packagr: + optional: true + protractor: + optional: true + tailwindcss: + optional: true + tslint: + optional: true + checksum: 0608abc123e8e261ec6e3236fe124f6af9afa715484841ef3a4d4e70057301a982a09b408c1ac917a81310b2539aa7d93af5970ae65eb5e98228bdba3e53f13b + languageName: node + linkType: hard + +"@angular-devkit/build-optimizer@npm:0.1202.12": + version: 0.1202.12 + resolution: "@angular-devkit/build-optimizer@npm:0.1202.12" + dependencies: + source-map: 0.7.3 + tslib: 2.3.0 + typescript: 4.3.5 + peerDependencies: + webpack: ^5.30.0 + peerDependenciesMeta: + webpack: + optional: true + bin: + build-optimizer: src/build-optimizer/cli.js + checksum: 3ff7a44250a4253f227694d3889dcd4399cc98be976176bdd3829d3881b38bb8fff927819c93673f7942bd75c61f9c2aace9194db6e1b9e7236ca7e20395d9e4 + languageName: node + linkType: hard + +"@angular-devkit/build-optimizer@npm:0.1202.3": + version: 0.1202.3 + resolution: "@angular-devkit/build-optimizer@npm:0.1202.3" + dependencies: + source-map: 0.7.3 + tslib: 2.3.0 + typescript: 4.3.5 + peerDependencies: + webpack: ^5.30.0 + peerDependenciesMeta: + webpack: + optional: true + bin: + build-optimizer: src/build-optimizer/cli.js + checksum: 7732722fd2ae1dfa986007bc2dbfbb2d753f2be523ac83af2bd5ef9cabe069b75ae504030252785e1a27006ca9b2e9e2d02c25e3ce5c4e2e3b7eb59bb1674904 + languageName: node + linkType: hard + +"@angular-devkit/build-webpack@npm:0.1202.12": + version: 0.1202.12 + resolution: "@angular-devkit/build-webpack@npm:0.1202.12" + dependencies: + "@angular-devkit/architect": 0.1202.12 + rxjs: 6.6.7 + peerDependencies: + webpack: ^5.30.0 + webpack-dev-server: ^3.1.4 + checksum: ca034776dc887901fe28b5a63a73a990ee06704d8afcaac59c6c3249cf3507f9b45931b1776659683730e9b8614cfee71b56545bcd486a9ac58b58a69c54c16a + languageName: node + linkType: hard + +"@angular-devkit/build-webpack@npm:0.1202.3": + version: 0.1202.3 + resolution: "@angular-devkit/build-webpack@npm:0.1202.3" + dependencies: + "@angular-devkit/architect": 0.1202.3 + rxjs: 6.6.7 + peerDependencies: + webpack: ^5.30.0 + webpack-dev-server: ^3.1.4 + checksum: 3c3819999bc863964b4387592290d9c2523bee02665c85fe71ccd0843bafbac51d7957040a70a33ed9a00248ec38ad41f47c461a7fbfbde537e0355cc2154be9 + languageName: node + linkType: hard + +"@angular-devkit/core@npm:12.0.5": + version: 12.0.5 + resolution: "@angular-devkit/core@npm:12.0.5" + dependencies: + ajv: 8.2.0 + ajv-formats: 2.0.2 + fast-json-stable-stringify: 2.1.0 + magic-string: 0.25.7 + rxjs: 6.6.7 + source-map: 0.7.3 + checksum: 55b32ff2bef615a88822520d963bf40566a6438b6a795bf6115f3f891247cf85fe8163ab3df0791ca4e51ce62e48a92da449a24047cd34ff90822c3464b22205 + languageName: node + linkType: hard + +"@angular-devkit/core@npm:12.2.12": + version: 12.2.12 + resolution: "@angular-devkit/core@npm:12.2.12" + dependencies: + ajv: 8.6.2 + ajv-formats: 2.1.0 + fast-json-stable-stringify: 2.1.0 + magic-string: 0.25.7 + rxjs: 6.6.7 + source-map: 0.7.3 + checksum: 349bc1121d71f91784fedd52a4a5b7e161b0dbd95f3a9c5a25bd1772b37524c0e6666f4205413d5cd668acf9d90fa8c20d99446e5f239e0266aca12641cd9b61 + languageName: node + linkType: hard + +"@angular-devkit/core@npm:12.2.3, @angular-devkit/core@npm:^12.0.0": + version: 12.2.3 + resolution: "@angular-devkit/core@npm:12.2.3" + dependencies: + ajv: 8.6.2 + ajv-formats: 2.1.0 + fast-json-stable-stringify: 2.1.0 + magic-string: 0.25.7 + rxjs: 6.6.7 + source-map: 0.7.3 + checksum: ad3db596cf8a6235bab0e62f091994411f9ac6133fe5ef0fbe8370036b4b8269be6fb90bc45d57137c48a1d9ace3651c7c91f0644e659453e8327e7d17f23373 + languageName: node + linkType: hard + +"@angular-devkit/schematics@npm:12.2.12": + version: 12.2.12 + resolution: "@angular-devkit/schematics@npm:12.2.12" + dependencies: + "@angular-devkit/core": 12.2.12 + ora: 5.4.1 + rxjs: 6.6.7 + checksum: ba00f57a9cfdec6051a35aa0ffd82986a28f078782cc151ec9638b3adbf532047b24432520bf048af38694ed64506c3d21b2c02ceb1e6e1d91f14fe562845242 + languageName: node + linkType: hard + +"@angular-devkit/schematics@npm:12.2.3, @angular-devkit/schematics@npm:^12.0.0": + version: 12.2.3 + resolution: "@angular-devkit/schematics@npm:12.2.3" + dependencies: + "@angular-devkit/core": 12.2.3 + ora: 5.4.1 + rxjs: 6.6.7 + checksum: 69f6d46ba1358b3e0187984f988ad6afb4456ed0814913e87f6a2aec674d4aa4f3c264dc147d491d125bd9a14be386aa492d5c8ba513ec750b2a72f2bb5ad664 + languageName: node + linkType: hard + +"@angular/animations@npm:^12.2.12": + version: 12.2.12 + resolution: "@angular/animations@npm:12.2.12" + dependencies: + tslib: ^2.2.0 + peerDependencies: + "@angular/core": 12.2.12 + checksum: e5e8ada4fc3f62d08ff6b1c3fb74d90882464db95fefff798d9a913b1dfc96e94c28d867cfb5bdbc3e899f1f4eb2c376ad0fdf089f8c9df1043ff74483fc7214 + languageName: node + linkType: hard + +"@angular/cli@npm:^12.2.12": + version: 12.2.12 + resolution: "@angular/cli@npm:12.2.12" + dependencies: + "@angular-devkit/architect": 0.1202.12 + "@angular-devkit/core": 12.2.12 + "@angular-devkit/schematics": 12.2.12 + "@schematics/angular": 12.2.12 + "@yarnpkg/lockfile": 1.1.0 + ansi-colors: 4.1.1 + debug: 4.3.2 + ini: 2.0.0 + inquirer: 8.1.2 + jsonc-parser: 3.0.0 + npm-package-arg: 8.1.5 + npm-pick-manifest: 6.1.1 + open: 8.2.1 + ora: 5.4.1 + pacote: 11.3.5 + resolve: 1.20.0 + semver: 7.3.5 + symbol-observable: 4.0.0 + uuid: 8.3.2 + bin: + ng: bin/ng + checksum: 232ac4a1b8518e3eb9768ea21f2811457806dd69e3783f0774bfb89395b01af300c19fecb069af55c5708e1dad336cf298d8af7961e981d68a6fab32506dd2d1 + languageName: node + linkType: hard + +"@angular/common@npm:^12.2.12": + version: 12.2.12 + resolution: "@angular/common@npm:12.2.12" + dependencies: + tslib: ^2.2.0 + peerDependencies: + "@angular/core": 12.2.12 + rxjs: ^6.5.3 || ^7.0.0 + checksum: 4448f9fbeabcca0755a58b064c1d949a8caccd6f4455c91a4a87a97ce495f13c9cff182d13508ad7d2239a755f7ceeeb7b14dfef52fae8b5b950ed9326bae447 + languageName: node + linkType: hard + +"@angular/compiler-cli@npm:^12.2.12": + version: 12.2.12 + resolution: "@angular/compiler-cli@npm:12.2.12" + dependencies: + "@babel/core": ^7.8.6 + "@babel/types": ^7.8.6 + canonical-path: 1.0.0 + chokidar: ^3.0.0 + convert-source-map: ^1.5.1 + dependency-graph: ^0.11.0 + magic-string: ^0.25.0 + minimist: ^1.2.0 + reflect-metadata: ^0.1.2 + semver: ^7.0.0 + source-map: ^0.6.1 + sourcemap-codec: ^1.4.8 + tslib: ^2.2.0 + yargs: ^17.0.0 + peerDependencies: + "@angular/compiler": 12.2.12 + typescript: ">=4.2.3 <4.4" + bin: + ivy-ngcc: ngcc/main-ivy-ngcc.js + ng-xi18n: src/extract_i18n.js + ngc: src/main.js + ngcc: ngcc/main-ngcc.js + checksum: f47f0176ea4523d16d2b8265abf4517c5bf0f3f15c92c497d06e4e518c60d0b272908ac224ec2194b512431e9c9db09ef79eea6b1d1f355f5b3839148db7295c + languageName: node + linkType: hard + +"@angular/compiler@npm:^12.2.12": + version: 12.2.12 + resolution: "@angular/compiler@npm:12.2.12" + dependencies: + tslib: ^2.2.0 + checksum: e8949664b65672969e3c97af2fb9e5f7ec28a0019ffb266d4ed5d79dec06d870e1bdb293932d450463d26481b1a0b874866c7f2ba2bb76fbf5a31f6047f2b4d5 + languageName: node + linkType: hard + +"@angular/core@npm:^12.2.12": + version: 12.2.12 + resolution: "@angular/core@npm:12.2.12" + dependencies: + tslib: ^2.2.0 + peerDependencies: + rxjs: ^6.5.3 || ^7.0.0 + zone.js: ~0.11.4 + checksum: 8ddcbb45794a11173071c23d71776d9a85365ef66966e04110408deb214e65873dd9e7098c9d43a35f5e94c2360269a213e1a802c03ee8b4f903e84d626f0da6 + languageName: node + linkType: hard + +"@angular/forms@npm:^12.2.12": + version: 12.2.12 + resolution: "@angular/forms@npm:12.2.12" + dependencies: + tslib: ^2.2.0 + peerDependencies: + "@angular/common": 12.2.12 + "@angular/core": 12.2.12 + "@angular/platform-browser": 12.2.12 + rxjs: ^6.5.3 || ^7.0.0 + checksum: bd0bcb4e6e7a181a47f033926ae6926ad2edf3f1df2a00f026386306180de52191028c51451ed1e7a2d9fe050b3e24fa60902a58eb7ae837612568de764a8314 + languageName: node + linkType: hard + +"@angular/localize@npm:^12.2.12": + version: 12.2.12 + resolution: "@angular/localize@npm:12.2.12" + dependencies: + "@babel/core": 7.8.3 + glob: 7.1.7 + yargs: ^17.0.0 + peerDependencies: + "@angular/compiler": 12.2.12 + "@angular/compiler-cli": 12.2.12 + bin: + localize-extract: src/tools/src/extract/main.js + localize-migrate: src/tools/src/migrate/main.js + localize-translate: src/tools/src/translate/main.js + checksum: bcfa1dbc95f47206c6e3771c5d6d981fc00185afa1c7c6917b624e37ca7be2d32964b71b4add52abb031172bf51f57fda0d960ec2fca9b419d16170cc72a92ee + languageName: node + linkType: hard + +"@angular/platform-browser-dynamic@npm:^12.2.12": + version: 12.2.12 + resolution: "@angular/platform-browser-dynamic@npm:12.2.12" + dependencies: + tslib: ^2.2.0 + peerDependencies: + "@angular/common": 12.2.12 + "@angular/compiler": 12.2.12 + "@angular/core": 12.2.12 + "@angular/platform-browser": 12.2.12 + checksum: 944b7401dd0cd53256ae8676c5535f8a610d33097d97640bc2f8d1b3668ca2c173ce270a4f33e2f7a3b4adb335256530f1dff078cd28d1603980e03184213b5a + languageName: node + linkType: hard + +"@angular/platform-browser@npm:^12.2.12": + version: 12.2.12 + resolution: "@angular/platform-browser@npm:12.2.12" + dependencies: + tslib: ^2.2.0 + peerDependencies: + "@angular/animations": 12.2.12 + "@angular/common": 12.2.12 + "@angular/core": 12.2.12 + peerDependenciesMeta: + "@angular/animations": + optional: true + checksum: 1a54662e90e84b57f0ef08718de98008ddde3b920b162825fa627e00d64dd20d8d790fdf2053420476633910ce9fee729078f866848e622709d586ae83eabcbb + languageName: node + linkType: hard + +"@angular/router@npm:^12.2.12": + version: 12.2.12 + resolution: "@angular/router@npm:12.2.12" + dependencies: + tslib: ^2.2.0 + peerDependencies: + "@angular/common": 12.2.12 + "@angular/core": 12.2.12 + "@angular/platform-browser": 12.2.12 + rxjs: ^6.5.3 || ^7.0.0 + checksum: 1087d56eb371a7bd67dfd0e7c0afae50d9863c9e6e5cea37baf30dd1a769f170389589db598360d42371623172422407734db4105d5898bd894b3968b19b8e09 + languageName: node + linkType: hard + +"@assemblyscript/loader@npm:^0.10.1": + version: 0.10.1 + resolution: "@assemblyscript/loader@npm:0.10.1" + checksum: fd1f57bdf2c55252a48c2d93fbec3c5a9ef4ca40e581e8709dd8ee437613eb47af74c8cdba011a324077eda9605d6f24983f429c2ce18b0b582ddcc5acf75c26 + languageName: node + linkType: hard + +"@babel/code-frame@npm:^7.0.0, @babel/code-frame@npm:^7.14.5, @babel/code-frame@npm:^7.8.3": + version: 7.14.5 + resolution: "@babel/code-frame@npm:7.14.5" + dependencies: + "@babel/highlight": ^7.14.5 + checksum: 0adbe4f8d91586f764f524e57631f582ab988b2ef504391a5d89db29bfaaf7c67c237798ed4a249b6a2d7135852cf94d3d07ce6b9739dd1df1f271d5ed069565 + languageName: node + linkType: hard + +"@babel/compat-data@npm:^7.13.11, @babel/compat-data@npm:^7.14.7, @babel/compat-data@npm:^7.15.0": + version: 7.15.0 + resolution: "@babel/compat-data@npm:7.15.0" + checksum: 65088d87b14966dcdba397c799f312beb1e7a4dac178e7daa922a17ee9b65d8cfd9f35ff8352ccb6e20bb9a169df1171263ef5fd5967aa25d544ea3f62681993 + languageName: node + linkType: hard + +"@babel/core@npm:7.14.8": + version: 7.14.8 + resolution: "@babel/core@npm:7.14.8" + dependencies: + "@babel/code-frame": ^7.14.5 + "@babel/generator": ^7.14.8 + "@babel/helper-compilation-targets": ^7.14.5 + "@babel/helper-module-transforms": ^7.14.8 + "@babel/helpers": ^7.14.8 + "@babel/parser": ^7.14.8 + "@babel/template": ^7.14.5 + "@babel/traverse": ^7.14.8 + "@babel/types": ^7.14.8 + convert-source-map: ^1.7.0 + debug: ^4.1.0 + gensync: ^1.0.0-beta.2 + json5: ^2.1.2 + semver: ^6.3.0 + source-map: ^0.5.0 + checksum: 4c9a5b21020791659095a514f11c81159a96477037682183f23a1084732e0e3dbb58986e14ebf3a03a31230a75d8b2e1d23644ca84204eddf70018cba983035f + languageName: node + linkType: hard + +"@babel/core@npm:7.8.3": + version: 7.8.3 + resolution: "@babel/core@npm:7.8.3" + dependencies: + "@babel/code-frame": ^7.8.3 + "@babel/generator": ^7.8.3 + "@babel/helpers": ^7.8.3 + "@babel/parser": ^7.8.3 + "@babel/template": ^7.8.3 + "@babel/traverse": ^7.8.3 + "@babel/types": ^7.8.3 + convert-source-map: ^1.7.0 + debug: ^4.1.0 + gensync: ^1.0.0-beta.1 + json5: ^2.1.0 + lodash: ^4.17.13 + resolve: ^1.3.2 + semver: ^5.4.1 + source-map: ^0.5.0 + checksum: 57228193e26835430b30fbc3a1e78acdfb66d42a147e2d3335b77f677cef6803c67980ab5a466a51a4f7064fe70d1f2aa22f712a8a83fd078556488ba06bd505 + languageName: node + linkType: hard + +"@babel/core@npm:^7.7.5, @babel/core@npm:^7.8.6": + version: 7.15.0 + resolution: "@babel/core@npm:7.15.0" + dependencies: + "@babel/code-frame": ^7.14.5 + "@babel/generator": ^7.15.0 + "@babel/helper-compilation-targets": ^7.15.0 + "@babel/helper-module-transforms": ^7.15.0 + "@babel/helpers": ^7.14.8 + "@babel/parser": ^7.15.0 + "@babel/template": ^7.14.5 + "@babel/traverse": ^7.15.0 + "@babel/types": ^7.15.0 + convert-source-map: ^1.7.0 + debug: ^4.1.0 + gensync: ^1.0.0-beta.2 + json5: ^2.1.2 + semver: ^6.3.0 + source-map: ^0.5.0 + checksum: 6f7ac97d2d2eebe62a431ce55b37753aa443b762da0524640caa2f7d4417750f8e21f3eb30d62f25e479f93dac505c868d24011b124cfa6905abebb23b44715c + languageName: node + linkType: hard + +"@babel/generator@npm:7.14.8": + version: 7.14.8 + resolution: "@babel/generator@npm:7.14.8" + dependencies: + "@babel/types": ^7.14.8 + jsesc: ^2.5.1 + source-map: ^0.5.0 + checksum: 0fdec7e1991fc3973d241e4c5e7d69f8c4ab063359695e6a019e4a5a0139a768ddce91d0705d7bd8a28f3befb5abde68355e19745fcdb45c40a26cf53d879191 + languageName: node + linkType: hard + +"@babel/generator@npm:^7.14.8, @babel/generator@npm:^7.15.0, @babel/generator@npm:^7.8.3": + version: 7.15.0 + resolution: "@babel/generator@npm:7.15.0" + dependencies: + "@babel/types": ^7.15.0 + jsesc: ^2.5.1 + source-map: ^0.5.0 + checksum: ef227c4c39ab810616b1d76cf9fa7b452b3a36ae1f26d52c2a7c68edcba29d6dd3cd3e88c58f6e3969a58dadee7b73016d3cabbd6f0040ff832f686db4679628 + languageName: node + linkType: hard + +"@babel/helper-annotate-as-pure@npm:7.14.5, @babel/helper-annotate-as-pure@npm:^7.14.5": + version: 7.14.5 + resolution: "@babel/helper-annotate-as-pure@npm:7.14.5" + dependencies: + "@babel/types": ^7.14.5 + checksum: 18cefedda60003c2551dabe0e4ad278ef0507682680892c60e9f7cb75ae1dc9a065cddb3ce9964da76f220bf972af5262619eeac4b84c2b8aba1b031961215cc + languageName: node + linkType: hard + +"@babel/helper-builder-binary-assignment-operator-visitor@npm:^7.14.5": + version: 7.14.5 + resolution: "@babel/helper-builder-binary-assignment-operator-visitor@npm:7.14.5" + dependencies: + "@babel/helper-explode-assignable-expression": ^7.14.5 + "@babel/types": ^7.14.5 + checksum: 0d3571edff0a96d625503a3fd79643f66f8a5204e75c4351276c0d194240e1debe322a70ef9ff47952bd77ac76792f42d732922b00b5bd8b6e2c99909dc4f49b + languageName: node + linkType: hard + +"@babel/helper-compilation-targets@npm:^7.13.0, @babel/helper-compilation-targets@npm:^7.14.5, @babel/helper-compilation-targets@npm:^7.15.0": + version: 7.15.0 + resolution: "@babel/helper-compilation-targets@npm:7.15.0" + dependencies: + "@babel/compat-data": ^7.15.0 + "@babel/helper-validator-option": ^7.14.5 + browserslist: ^4.16.6 + semver: ^6.3.0 + peerDependencies: + "@babel/core": ^7.0.0 + checksum: 82a1f5d8041d39454fe5d7d109e32e90f5c6c13f0e87c7ac94332ac79a1fb62ab135b2f8ceba07ba307bb0db792c1f64796aec68bb258a13aa69a56ee65e2427 + languageName: node + linkType: hard + +"@babel/helper-create-class-features-plugin@npm:^7.14.5": + version: 7.15.0 + resolution: "@babel/helper-create-class-features-plugin@npm:7.15.0" + dependencies: + "@babel/helper-annotate-as-pure": ^7.14.5 + "@babel/helper-function-name": ^7.14.5 + "@babel/helper-member-expression-to-functions": ^7.15.0 + "@babel/helper-optimise-call-expression": ^7.14.5 + "@babel/helper-replace-supers": ^7.15.0 + "@babel/helper-split-export-declaration": ^7.14.5 + peerDependencies: + "@babel/core": ^7.0.0 + checksum: d09136e31fce0c172a36a09532003423b6c263fe1fc51bc3b740fcea5134abed71faab0131b4264890c5cc5ebacbe200c9ba7904bd21a74070adfe46001dd178 + languageName: node + linkType: hard + +"@babel/helper-create-regexp-features-plugin@npm:^7.14.5": + version: 7.14.5 + resolution: "@babel/helper-create-regexp-features-plugin@npm:7.14.5" + dependencies: + "@babel/helper-annotate-as-pure": ^7.14.5 + regexpu-core: ^4.7.1 + peerDependencies: + "@babel/core": ^7.0.0 + checksum: c2636d0a6ea6d57eb3603ba9b223fd6ec273a3d8171eb8d84a357ff028cd747ab383b1d7cef84a4df5f9aebb321d43599895f562f3c8aa96314d4847aa59710e + languageName: node + linkType: hard + +"@babel/helper-define-polyfill-provider@npm:^0.2.2": + version: 0.2.3 + resolution: "@babel/helper-define-polyfill-provider@npm:0.2.3" + dependencies: + "@babel/helper-compilation-targets": ^7.13.0 + "@babel/helper-module-imports": ^7.12.13 + "@babel/helper-plugin-utils": ^7.13.0 + "@babel/traverse": ^7.13.0 + debug: ^4.1.1 + lodash.debounce: ^4.0.8 + resolve: ^1.14.2 + semver: ^6.1.2 + peerDependencies: + "@babel/core": ^7.4.0-0 + checksum: 797699fe870e45bdbc7c4128963427f7d6240609b700b3f2c0a2f2f187e5f848ba704bcfe58d7d91796cabc5001fae01746b3efda113beb5b5b824927cf59fdb + languageName: node + linkType: hard + +"@babel/helper-explode-assignable-expression@npm:^7.14.5": + version: 7.14.5 + resolution: "@babel/helper-explode-assignable-expression@npm:7.14.5" + dependencies: + "@babel/types": ^7.14.5 + checksum: f3b34c54ad26e48e1409f21aaac8ee5b5fa3bd2917ce4df496f57daec12b6132b2d5c2618da807458e97bc2d7894c5bf505cc96789e0c289dcc9948d7844bb03 + languageName: node + linkType: hard + +"@babel/helper-function-name@npm:^7.14.5": + version: 7.14.5 + resolution: "@babel/helper-function-name@npm:7.14.5" + dependencies: + "@babel/helper-get-function-arity": ^7.14.5 + "@babel/template": ^7.14.5 + "@babel/types": ^7.14.5 + checksum: fd8ffa82f7622b6e9a6294fb3b98b42e743ab2a8e3c329367667a960b5b98b48bc5ebf8be7308981f1985b9f3c69e1a3b4a91c8944ae97c31803240da92fb3c8 + languageName: node + linkType: hard + +"@babel/helper-get-function-arity@npm:^7.14.5": + version: 7.14.5 + resolution: "@babel/helper-get-function-arity@npm:7.14.5" + dependencies: + "@babel/types": ^7.14.5 + checksum: a60779918b677a35e177bb4f46babfd54e9790587b6a4f076092a9eff2a940cbeacdeb10c94331b26abfe838769554d72293d16df897246cfccd1444e5e27cb7 + languageName: node + linkType: hard + +"@babel/helper-hoist-variables@npm:^7.14.5": + version: 7.14.5 + resolution: "@babel/helper-hoist-variables@npm:7.14.5" + dependencies: + "@babel/types": ^7.14.5 + checksum: 35af58eebffca10988de7003e044ce2d27212aea72ac6d2c4604137da7f1e193cc694d8d60805d0d0beaf3d990f6f2dcc2622c52e3d3148e37017a29cacf2e56 + languageName: node + linkType: hard + +"@babel/helper-member-expression-to-functions@npm:^7.15.0": + version: 7.15.0 + resolution: "@babel/helper-member-expression-to-functions@npm:7.15.0" + dependencies: + "@babel/types": ^7.15.0 + checksum: 63b4824839990fbf3fe38b5c8a7b002a73bb2161e72b7146b1dc256671bcf36f34587a927e597a556dd496b49089cf13ea77877482aef1f35f628899042127ae + languageName: node + linkType: hard + +"@babel/helper-module-imports@npm:^7.12.13, @babel/helper-module-imports@npm:^7.14.5": + version: 7.14.5 + resolution: "@babel/helper-module-imports@npm:7.14.5" + dependencies: + "@babel/types": ^7.14.5 + checksum: b98279908698a50a22634e683924cb25eb93edf1bf28ac65691dfa82d7a1a4dae4e6b12b8ef9f9a50171ca484620bce544f270873c53505d8a45364c5b665c0c + languageName: node + linkType: hard + +"@babel/helper-module-transforms@npm:^7.14.5, @babel/helper-module-transforms@npm:^7.14.8, @babel/helper-module-transforms@npm:^7.15.0": + version: 7.15.0 + resolution: "@babel/helper-module-transforms@npm:7.15.0" + dependencies: + "@babel/helper-module-imports": ^7.14.5 + "@babel/helper-replace-supers": ^7.15.0 + "@babel/helper-simple-access": ^7.14.8 + "@babel/helper-split-export-declaration": ^7.14.5 + "@babel/helper-validator-identifier": ^7.14.9 + "@babel/template": ^7.14.5 + "@babel/traverse": ^7.15.0 + "@babel/types": ^7.15.0 + checksum: 65eca31a9571d43c454cad13b26e17a0909e1fb439a939d2f17268f016ec85cec2fe7a9abcadea863d1b80b448f89647ac9be0abd76265c0e274205794031f33 + languageName: node + linkType: hard + +"@babel/helper-optimise-call-expression@npm:^7.14.5": + version: 7.14.5 + resolution: "@babel/helper-optimise-call-expression@npm:7.14.5" + dependencies: + "@babel/types": ^7.14.5 + checksum: c7af558c63eb5449bf2249f1236d892ed54a400cb6c721756cde573b996c12c64dee6b57fa18ad1a0025d152e6f689444f7ea32997a1d56e1af66c3eda18843d + languageName: node + linkType: hard + +"@babel/helper-plugin-utils@npm:^7.0.0, @babel/helper-plugin-utils@npm:^7.10.4, @babel/helper-plugin-utils@npm:^7.12.13, @babel/helper-plugin-utils@npm:^7.13.0, @babel/helper-plugin-utils@npm:^7.14.5, @babel/helper-plugin-utils@npm:^7.8.0, @babel/helper-plugin-utils@npm:^7.8.3": + version: 7.14.5 + resolution: "@babel/helper-plugin-utils@npm:7.14.5" + checksum: fe20e90a24d02770a60ebe80ab9f0dfd7258503cea8006c71709ac9af1aa3e47b0de569499673f11ea6c99597f8c0e4880ae1d505986e61101b69716820972fe + languageName: node + linkType: hard + +"@babel/helper-remap-async-to-generator@npm:^7.14.5": + version: 7.14.5 + resolution: "@babel/helper-remap-async-to-generator@npm:7.14.5" + dependencies: + "@babel/helper-annotate-as-pure": ^7.14.5 + "@babel/helper-wrap-function": ^7.14.5 + "@babel/types": ^7.14.5 + checksum: 022594a15caed0d3bbac52e27eef0f20f9dceb85921b682df55f3bb21dee6fea645b03663e84fdfaadc6b88f4b83b012858520813c15e88728bbc5e16bf3fa29 + languageName: node + linkType: hard + +"@babel/helper-replace-supers@npm:^7.14.5, @babel/helper-replace-supers@npm:^7.15.0": + version: 7.15.0 + resolution: "@babel/helper-replace-supers@npm:7.15.0" + dependencies: + "@babel/helper-member-expression-to-functions": ^7.15.0 + "@babel/helper-optimise-call-expression": ^7.14.5 + "@babel/traverse": ^7.15.0 + "@babel/types": ^7.15.0 + checksum: e1fce39b88ac32058a6fad15f0840cc40a63af7d60ef1d3bca0fcda3e4d88422d164a165c3b1efbcbda3b80ac68165fa79005fe27fc5569d2b9582a8cc002db3 + languageName: node + linkType: hard + +"@babel/helper-simple-access@npm:^7.14.8": + version: 7.14.8 + resolution: "@babel/helper-simple-access@npm:7.14.8" + dependencies: + "@babel/types": ^7.14.8 + checksum: c1dae88c956154c854bb1679d19b9158ff1c8241329a4a70026ec16c594b9637e73647e5a1a0f9b7c47b2309201f633c259fb41d06a800496283debce6a67fab + languageName: node + linkType: hard + +"@babel/helper-skip-transparent-expression-wrappers@npm:^7.14.5": + version: 7.14.5 + resolution: "@babel/helper-skip-transparent-expression-wrappers@npm:7.14.5" + dependencies: + "@babel/types": ^7.14.5 + checksum: d16937eb08d57d2577902fa6d05ac4b1695602babd9dff9890fa8e56b593fdc997ad24de13fdaf15617036bfacf3493ea569898a5ac0538c2a831aa163f18985 + languageName: node + linkType: hard + +"@babel/helper-split-export-declaration@npm:^7.14.5": + version: 7.14.5 + resolution: "@babel/helper-split-export-declaration@npm:7.14.5" + dependencies: + "@babel/types": ^7.14.5 + checksum: 93437025a33747bfd37d6d5a9cdac8f4b6b3e5c0c53c0e24c5444575e731ea64fd5471a51a039fd74ff3378f916ea2d69d9f10274d253ed6f832952be2fd65f0 + languageName: node + linkType: hard + +"@babel/helper-validator-identifier@npm:^7.14.5, @babel/helper-validator-identifier@npm:^7.14.9": + version: 7.14.9 + resolution: "@babel/helper-validator-identifier@npm:7.14.9" + checksum: 58552531a7674363e74672434c312ddaf1545b8a43308e1a7f38db58bf79c796c095a6dab6a6105eb0d783b97441f6cbb525bb887f29a35f232fcdbd8cb240dc + languageName: node + linkType: hard + +"@babel/helper-validator-option@npm:^7.14.5": + version: 7.14.5 + resolution: "@babel/helper-validator-option@npm:7.14.5" + checksum: 1b25c34a5cb3d8602280f33b9ab687d2a77895e3616458d0f70ddc450ada9b05e342c44f322bc741d51b252e84cff6ec44ae93d622a3354828579a643556b523 + languageName: node + linkType: hard + +"@babel/helper-wrap-function@npm:^7.14.5": + version: 7.14.5 + resolution: "@babel/helper-wrap-function@npm:7.14.5" + dependencies: + "@babel/helper-function-name": ^7.14.5 + "@babel/template": ^7.14.5 + "@babel/traverse": ^7.14.5 + "@babel/types": ^7.14.5 + checksum: d5c4bec02396f00d305ae2b60cfa5f3ec27d196a71b88107745b6be4fe257ebe54deedb6ee3997c8c9a2cc5c2571d567c22e9b866109490a2aa7f79a1a2272e2 + languageName: node + linkType: hard + +"@babel/helpers@npm:^7.14.8, @babel/helpers@npm:^7.8.3": + version: 7.15.3 + resolution: "@babel/helpers@npm:7.15.3" + dependencies: + "@babel/template": ^7.14.5 + "@babel/traverse": ^7.15.0 + "@babel/types": ^7.15.0 + checksum: cd70614d610b01189812c83b505b076dca0822df55ed6cd41232416f3a10ae9200a07315683942e0adbc1833481920c2fc7a23a08064ced5a8770259aa0ad707 + languageName: node + linkType: hard + +"@babel/highlight@npm:^7.14.5": + version: 7.14.5 + resolution: "@babel/highlight@npm:7.14.5" + dependencies: + "@babel/helper-validator-identifier": ^7.14.5 + chalk: ^2.0.0 + js-tokens: ^4.0.0 + checksum: 4e4b22fb886c939551d73307de16232c186fdb4d8ec8f514541b058feaecdba5234788a0740ca5bcd28777f4108596c39ac4b7463684c63b3812f6071e3fb88f + languageName: node + linkType: hard + +"@babel/parser@npm:^7.14.5, @babel/parser@npm:^7.14.8, @babel/parser@npm:^7.15.0, @babel/parser@npm:^7.8.3": + version: 7.15.3 + resolution: "@babel/parser@npm:7.15.3" + bin: + parser: ./bin/babel-parser.js + checksum: 4b9ba7e8ffe0a3d0dd8c61dee975c79863f7744177de677cb7d12f96549eb5c8b9ffc70ca2b1b2488b06e056da99a6273e2d7d68fc31f498d01483dfac149e13 + languageName: node + linkType: hard + +"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@npm:^7.14.5": + version: 7.14.5 + resolution: "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@npm:7.14.5" + dependencies: + "@babel/helper-plugin-utils": ^7.14.5 + "@babel/helper-skip-transparent-expression-wrappers": ^7.14.5 + "@babel/plugin-proposal-optional-chaining": ^7.14.5 + peerDependencies: + "@babel/core": ^7.13.0 + checksum: 17331fd4c1de860ac78aa3195eb5bd058c4eb24a8f2c6e719f079f9c86cbdb53d9a8affc2f9f78b6fc257afef03811922c2d16addad5d5f6224d2820da1c9f45 + languageName: node + linkType: hard + +"@babel/plugin-proposal-async-generator-functions@npm:7.14.7": + version: 7.14.7 + resolution: "@babel/plugin-proposal-async-generator-functions@npm:7.14.7" + dependencies: + "@babel/helper-plugin-utils": ^7.14.5 + "@babel/helper-remap-async-to-generator": ^7.14.5 + "@babel/plugin-syntax-async-generators": ^7.8.4 + peerDependencies: + "@babel/core": ^7.0.0-0 + checksum: 09343a79385615f8d5f95aaef7c44af5e899c82f030f3d73546c2ffffa567c0949f0405052d7e32f643c0eb2a23590a5050f4606855b3506246d3d60e46f32e3 + languageName: node + linkType: hard + +"@babel/plugin-proposal-async-generator-functions@npm:^7.14.7": + version: 7.14.9 + resolution: "@babel/plugin-proposal-async-generator-functions@npm:7.14.9" + dependencies: + "@babel/helper-plugin-utils": ^7.14.5 + "@babel/helper-remap-async-to-generator": ^7.14.5 + "@babel/plugin-syntax-async-generators": ^7.8.4 + peerDependencies: + "@babel/core": ^7.0.0-0 + checksum: 2c03f8ccb8cefc37d62fbd1e5af9570b14df80334f2bb8351381675d6c8f945596479ea51e59478dff9c80e1c234cd1e94675b3b3ccf694e06dde880c78495fa + languageName: node + linkType: hard + +"@babel/plugin-proposal-class-properties@npm:^7.14.5": + version: 7.14.5 + resolution: "@babel/plugin-proposal-class-properties@npm:7.14.5" + dependencies: + "@babel/helper-create-class-features-plugin": ^7.14.5 + "@babel/helper-plugin-utils": ^7.14.5 + peerDependencies: + "@babel/core": ^7.0.0-0 + checksum: fe2aa0a44f8ea121e10c856d6fb4fca418dc42451258ef6ed29321ca740080fba420ebd3d6700d0456c34c2ab2044f9ce4308498321f52a93184ff5adb015aae + languageName: node + linkType: hard + +"@babel/plugin-proposal-class-static-block@npm:^7.14.5": + version: 7.14.5 + resolution: "@babel/plugin-proposal-class-static-block@npm:7.14.5" + dependencies: + "@babel/helper-create-class-features-plugin": ^7.14.5 + "@babel/helper-plugin-utils": ^7.14.5 + "@babel/plugin-syntax-class-static-block": ^7.14.5 + peerDependencies: + "@babel/core": ^7.12.0 + checksum: 0275d0643dacd08638c2d3c129158ad0c2dea6a26e78fa4b2129811a29460ff9a6459d1955a19bfa3b9ed67ba2bb3c88676823ad207b2de4f0c65e0c3751d75c + languageName: node + linkType: hard + +"@babel/plugin-proposal-dynamic-import@npm:^7.14.5": + version: 7.14.5 + resolution: "@babel/plugin-proposal-dynamic-import@npm:7.14.5" + dependencies: + "@babel/helper-plugin-utils": ^7.14.5 + "@babel/plugin-syntax-dynamic-import": ^7.8.3 + peerDependencies: + "@babel/core": ^7.0.0-0 + checksum: 47be4b5f8824f8690b47d99a34d52de0e6c19d0b99f26c1f9a2e4cc49e05082bcef7248c610bb3830ae84cec928713c7774f4929fca4fa72df570df7a76a9d2b + languageName: node + linkType: hard + +"@babel/plugin-proposal-export-namespace-from@npm:^7.14.5": + version: 7.14.5 + resolution: "@babel/plugin-proposal-export-namespace-from@npm:7.14.5" + dependencies: + "@babel/helper-plugin-utils": ^7.14.5 + "@babel/plugin-syntax-export-namespace-from": ^7.8.3 + peerDependencies: + "@babel/core": ^7.0.0-0 + checksum: b3f4e0cc196f7ad9132816bb350124e8932bc047ab946e431f85bae9649b0de384c54261a60c050a2b8220703408fc089f90349ad008ed69a70944a6f3048d0e + languageName: node + linkType: hard + +"@babel/plugin-proposal-json-strings@npm:^7.14.5": + version: 7.14.5 + resolution: "@babel/plugin-proposal-json-strings@npm:7.14.5" + dependencies: + "@babel/helper-plugin-utils": ^7.14.5 + "@babel/plugin-syntax-json-strings": ^7.8.3 + peerDependencies: + "@babel/core": ^7.0.0-0 + checksum: 51dafe70237860569c9c27dc6a0db83e149bf7babb0fcafa9dbcd55a960b443f7b5bb695956c6e116e46b3dbd2a6777ead62bcad843aff8c1916c1be56e2f504 + languageName: node + linkType: hard + +"@babel/plugin-proposal-logical-assignment-operators@npm:^7.14.5": + version: 7.14.5 + resolution: "@babel/plugin-proposal-logical-assignment-operators@npm:7.14.5" + dependencies: + "@babel/helper-plugin-utils": ^7.14.5 + "@babel/plugin-syntax-logical-assignment-operators": ^7.10.4 + peerDependencies: + "@babel/core": ^7.0.0-0 + checksum: 08b6dbc991c4824b0d8bfabf46c8254fce02d2df04627b8849cf15a4b6de75629c10c7c83d1e6834cdcebfc98b16264ce2dd32aa9c0fae900ed2af807d5ac42b + languageName: node + linkType: hard + +"@babel/plugin-proposal-nullish-coalescing-operator@npm:^7.14.5": + version: 7.14.5 + resolution: "@babel/plugin-proposal-nullish-coalescing-operator@npm:7.14.5" + dependencies: + "@babel/helper-plugin-utils": ^7.14.5 + "@babel/plugin-syntax-nullish-coalescing-operator": ^7.8.3 + peerDependencies: + "@babel/core": ^7.0.0-0 + checksum: 033d9483c2feb74928fbb83a73948eb1179c8852d2ae507fbfc37752d2dbf702c9ad0daaf1eaa029f81b12b7e2470061b4f611db88b7293f0e9a71eba288a430 + languageName: node + linkType: hard + +"@babel/plugin-proposal-numeric-separator@npm:^7.14.5": + version: 7.14.5 + resolution: "@babel/plugin-proposal-numeric-separator@npm:7.14.5" + dependencies: + "@babel/helper-plugin-utils": ^7.14.5 + "@babel/plugin-syntax-numeric-separator": ^7.10.4 + peerDependencies: + "@babel/core": ^7.0.0-0 + checksum: 22093297ec9aed3938b39f4efa1b518252fe7b0835902c3066f0ae6a864ac253b986a4a21a6092aa068d0702d7b09bed74e56cf39f2da8b4f3f43e0747bffb62 + languageName: node + linkType: hard + +"@babel/plugin-proposal-object-rest-spread@npm:^7.14.7": + version: 7.14.7 + resolution: "@babel/plugin-proposal-object-rest-spread@npm:7.14.7" + dependencies: + "@babel/compat-data": ^7.14.7 + "@babel/helper-compilation-targets": ^7.14.5 + "@babel/helper-plugin-utils": ^7.14.5 + "@babel/plugin-syntax-object-rest-spread": ^7.8.3 + "@babel/plugin-transform-parameters": ^7.14.5 + peerDependencies: + "@babel/core": ^7.0.0-0 + checksum: a35192868166fb5a62003a56ce2c266f74ae680f1d9589652c4495145240dd138a9505301bb5adca069cb874d6f0f733dc2f3d1d05f71a06019735c29c4d1a11 + languageName: node + linkType: hard + +"@babel/plugin-proposal-optional-catch-binding@npm:^7.14.5": + version: 7.14.5 + resolution: "@babel/plugin-proposal-optional-catch-binding@npm:7.14.5" + dependencies: + "@babel/helper-plugin-utils": ^7.14.5 + "@babel/plugin-syntax-optional-catch-binding": ^7.8.3 + peerDependencies: + "@babel/core": ^7.0.0-0 + checksum: f9c1b2b34fef1bde85feeb0b438131f526056161e10b6fb91c74a5828ad39d2a20521b5c3cefc7367a7e5fc792b7c7e607bf278d7999b5d89824c34af3174eae + languageName: node + linkType: hard + +"@babel/plugin-proposal-optional-chaining@npm:^7.14.5": + version: 7.14.5 + resolution: "@babel/plugin-proposal-optional-chaining@npm:7.14.5" + dependencies: + "@babel/helper-plugin-utils": ^7.14.5 + "@babel/helper-skip-transparent-expression-wrappers": ^7.14.5 + "@babel/plugin-syntax-optional-chaining": ^7.8.3 + peerDependencies: + "@babel/core": ^7.0.0-0 + checksum: 9e39e20d162bea2241b4c24ea8a339f872a04954a5155c606bf2437edaa1a15b8a517daee4b2b09cfd42d826b93c57f080aa9fbb13c60a8f3a7a72963badf2df + languageName: node + linkType: hard + +"@babel/plugin-proposal-private-methods@npm:^7.14.5": + version: 7.14.5 + resolution: "@babel/plugin-proposal-private-methods@npm:7.14.5" + dependencies: + "@babel/helper-create-class-features-plugin": ^7.14.5 + "@babel/helper-plugin-utils": ^7.14.5 + peerDependencies: + "@babel/core": ^7.0.0-0 + checksum: badacc1d68c8cf92a7ba973e3c283bc3aebf586a6573b6d18a96461ce18039d4cdc0135edac1b810df8d92cfca628115d98a0ad83ed8f15bf15eaff21539bf32 + languageName: node + linkType: hard + +"@babel/plugin-proposal-private-property-in-object@npm:^7.14.5": + version: 7.14.5 + resolution: "@babel/plugin-proposal-private-property-in-object@npm:7.14.5" + dependencies: + "@babel/helper-annotate-as-pure": ^7.14.5 + "@babel/helper-create-class-features-plugin": ^7.14.5 + "@babel/helper-plugin-utils": ^7.14.5 + "@babel/plugin-syntax-private-property-in-object": ^7.14.5 + peerDependencies: + "@babel/core": ^7.0.0-0 + checksum: a11da6a52eb13d6dcb6ed36993a81e9746404f6e83d32be16142911b7e5768293d8c4c5373d182ef25cb94d0b18c0c27a07f4553be042ee2dc49f7179f8cbfe2 + languageName: node + linkType: hard + +"@babel/plugin-proposal-unicode-property-regex@npm:^7.14.5, @babel/plugin-proposal-unicode-property-regex@npm:^7.4.4": + version: 7.14.5 + resolution: "@babel/plugin-proposal-unicode-property-regex@npm:7.14.5" + dependencies: + "@babel/helper-create-regexp-features-plugin": ^7.14.5 + "@babel/helper-plugin-utils": ^7.14.5 + peerDependencies: + "@babel/core": ^7.0.0-0 + checksum: 58bd3277a972a33d101d29ab4f52e964b6e8ec218eb84f764b4ea67bf8ed362909760812d3f7451ee5e54dc273bd81bc5a00cd2c13e8fb64a47ec117cb69d51b + languageName: node + linkType: hard + +"@babel/plugin-syntax-async-generators@npm:^7.8.4": + version: 7.8.4 + resolution: "@babel/plugin-syntax-async-generators@npm:7.8.4" + dependencies: + "@babel/helper-plugin-utils": ^7.8.0 + peerDependencies: + "@babel/core": ^7.0.0-0 + checksum: 7ed1c1d9b9e5b64ef028ea5e755c0be2d4e5e4e3d6cf7df757b9a8c4cfa4193d268176d0f1f7fbecdda6fe722885c7fda681f480f3741d8a2d26854736f05367 + languageName: node + linkType: hard + +"@babel/plugin-syntax-class-properties@npm:^7.12.13": + version: 7.12.13 + resolution: "@babel/plugin-syntax-class-properties@npm:7.12.13" + dependencies: + "@babel/helper-plugin-utils": ^7.12.13 + peerDependencies: + "@babel/core": ^7.0.0-0 + checksum: 24f34b196d6342f28d4bad303612d7ff566ab0a013ce89e775d98d6f832969462e7235f3e7eaf17678a533d4be0ba45d3ae34ab4e5a9dcbda5d98d49e5efa2fc + languageName: node + linkType: hard + +"@babel/plugin-syntax-class-static-block@npm:^7.14.5": + version: 7.14.5 + resolution: "@babel/plugin-syntax-class-static-block@npm:7.14.5" + dependencies: + "@babel/helper-plugin-utils": ^7.14.5 + peerDependencies: + "@babel/core": ^7.0.0-0 + checksum: 3e80814b5b6d4fe17826093918680a351c2d34398a914ce6e55d8083d72a9bdde4fbaf6a2dcea0e23a03de26dc2917ae3efd603d27099e2b98380345703bf948 + languageName: node + linkType: hard + +"@babel/plugin-syntax-dynamic-import@npm:^7.8.3": + version: 7.8.3 + resolution: "@babel/plugin-syntax-dynamic-import@npm:7.8.3" + dependencies: + "@babel/helper-plugin-utils": ^7.8.0 + peerDependencies: + "@babel/core": ^7.0.0-0 + checksum: ce307af83cf433d4ec42932329fad25fa73138ab39c7436882ea28742e1c0066626d224e0ad2988724c82644e41601cef607b36194f695cb78a1fcdc959637bd + languageName: node + linkType: hard + +"@babel/plugin-syntax-export-namespace-from@npm:^7.8.3": + version: 7.8.3 + resolution: "@babel/plugin-syntax-export-namespace-from@npm:7.8.3" + dependencies: + "@babel/helper-plugin-utils": ^7.8.3 + peerDependencies: + "@babel/core": ^7.0.0-0 + checksum: 85740478be5b0de185228e7814451d74ab8ce0a26fcca7613955262a26e99e8e15e9da58f60c754b84515d4c679b590dbd3f2148f0f58025f4ae706f1c5a5d4a + languageName: node + linkType: hard + +"@babel/plugin-syntax-json-strings@npm:^7.8.3": + version: 7.8.3 + resolution: "@babel/plugin-syntax-json-strings@npm:7.8.3" + dependencies: + "@babel/helper-plugin-utils": ^7.8.0 + peerDependencies: + "@babel/core": ^7.0.0-0 + checksum: bf5aea1f3188c9a507e16efe030efb996853ca3cadd6512c51db7233cc58f3ac89ff8c6bdfb01d30843b161cfe7d321e1bf28da82f7ab8d7e6bc5464666f354a + languageName: node + linkType: hard + +"@babel/plugin-syntax-logical-assignment-operators@npm:^7.10.4": + version: 7.10.4 + resolution: "@babel/plugin-syntax-logical-assignment-operators@npm:7.10.4" + dependencies: + "@babel/helper-plugin-utils": ^7.10.4 + peerDependencies: + "@babel/core": ^7.0.0-0 + checksum: aff33577037e34e515911255cdbb1fd39efee33658aa00b8a5fd3a4b903585112d037cce1cc9e4632f0487dc554486106b79ccd5ea63a2e00df4363f6d4ff886 + languageName: node + linkType: hard + +"@babel/plugin-syntax-nullish-coalescing-operator@npm:^7.8.3": + version: 7.8.3 + resolution: "@babel/plugin-syntax-nullish-coalescing-operator@npm:7.8.3" + dependencies: + "@babel/helper-plugin-utils": ^7.8.0 + peerDependencies: + "@babel/core": ^7.0.0-0 + checksum: 87aca4918916020d1fedba54c0e232de408df2644a425d153be368313fdde40d96088feed6c4e5ab72aac89be5d07fef2ddf329a15109c5eb65df006bf2580d1 + languageName: node + linkType: hard + +"@babel/plugin-syntax-numeric-separator@npm:^7.10.4": + version: 7.10.4 + resolution: "@babel/plugin-syntax-numeric-separator@npm:7.10.4" + dependencies: + "@babel/helper-plugin-utils": ^7.10.4 + peerDependencies: + "@babel/core": ^7.0.0-0 + checksum: 01ec5547bd0497f76cc903ff4d6b02abc8c05f301c88d2622b6d834e33a5651aa7c7a3d80d8d57656a4588f7276eba357f6b7e006482f5b564b7a6488de493a1 + languageName: node + linkType: hard + +"@babel/plugin-syntax-object-rest-spread@npm:^7.8.3": + version: 7.8.3 + resolution: "@babel/plugin-syntax-object-rest-spread@npm:7.8.3" + dependencies: + "@babel/helper-plugin-utils": ^7.8.0 + peerDependencies: + "@babel/core": ^7.0.0-0 + checksum: fddcf581a57f77e80eb6b981b10658421bc321ba5f0a5b754118c6a92a5448f12a0c336f77b8abf734841e102e5126d69110a306eadb03ca3e1547cab31f5cbf + languageName: node + linkType: hard + +"@babel/plugin-syntax-optional-catch-binding@npm:^7.8.3": + version: 7.8.3 + resolution: "@babel/plugin-syntax-optional-catch-binding@npm:7.8.3" + dependencies: + "@babel/helper-plugin-utils": ^7.8.0 + peerDependencies: + "@babel/core": ^7.0.0-0 + checksum: 910d90e72bc90ea1ce698e89c1027fed8845212d5ab588e35ef91f13b93143845f94e2539d831dc8d8ededc14ec02f04f7bd6a8179edd43a326c784e7ed7f0b9 + languageName: node + linkType: hard + +"@babel/plugin-syntax-optional-chaining@npm:^7.8.3": + version: 7.8.3 + resolution: "@babel/plugin-syntax-optional-chaining@npm:7.8.3" + dependencies: + "@babel/helper-plugin-utils": ^7.8.0 + peerDependencies: + "@babel/core": ^7.0.0-0 + checksum: eef94d53a1453361553c1f98b68d17782861a04a392840341bc91780838dd4e695209c783631cf0de14c635758beafb6a3a65399846ffa4386bff90639347f30 + languageName: node + linkType: hard + +"@babel/plugin-syntax-private-property-in-object@npm:^7.14.5": + version: 7.14.5 + resolution: "@babel/plugin-syntax-private-property-in-object@npm:7.14.5" + dependencies: + "@babel/helper-plugin-utils": ^7.14.5 + peerDependencies: + "@babel/core": ^7.0.0-0 + checksum: b317174783e6e96029b743ccff2a67d63d38756876e7e5d0ba53a322e38d9ca452c13354a57de1ad476b4c066dbae699e0ca157441da611117a47af88985ecda + languageName: node + linkType: hard + +"@babel/plugin-syntax-top-level-await@npm:^7.14.5": + version: 7.14.5 + resolution: "@babel/plugin-syntax-top-level-await@npm:7.14.5" + dependencies: + "@babel/helper-plugin-utils": ^7.14.5 + peerDependencies: + "@babel/core": ^7.0.0-0 + checksum: bbd1a56b095be7820029b209677b194db9b1d26691fe999856462e66b25b281f031f3dfd91b1619e9dcf95bebe336211833b854d0fb8780d618e35667c2d0d7e + languageName: node + linkType: hard + +"@babel/plugin-transform-arrow-functions@npm:^7.14.5": + version: 7.14.5 + resolution: "@babel/plugin-transform-arrow-functions@npm:7.14.5" + dependencies: + "@babel/helper-plugin-utils": ^7.14.5 + peerDependencies: + "@babel/core": ^7.0.0-0 + checksum: 126196ea0107e97f711c0d48d8d1e01a30f5a5e127628f7367658b4c5832182c4e28914294408374690c5bfbb4ad4fe6560068d8bf370cafe8d4fe23599aaa95 + languageName: node + linkType: hard + +"@babel/plugin-transform-async-to-generator@npm:7.14.5, @babel/plugin-transform-async-to-generator@npm:^7.14.5": + version: 7.14.5 + resolution: "@babel/plugin-transform-async-to-generator@npm:7.14.5" + dependencies: + "@babel/helper-module-imports": ^7.14.5 + "@babel/helper-plugin-utils": ^7.14.5 + "@babel/helper-remap-async-to-generator": ^7.14.5 + peerDependencies: + "@babel/core": ^7.0.0-0 + checksum: 4c47016c5f65adaa5836054fcc99402f1d295aedd7ebd44e6df128a90977952f2a8abdf3b3d0aa5a9e1186184da538452c4d9a3b1482376759c6962627201da5 + languageName: node + linkType: hard + +"@babel/plugin-transform-block-scoped-functions@npm:^7.14.5": + version: 7.14.5 + resolution: "@babel/plugin-transform-block-scoped-functions@npm:7.14.5" + dependencies: + "@babel/helper-plugin-utils": ^7.14.5 + peerDependencies: + "@babel/core": ^7.0.0-0 + checksum: 9994d9f107308b21be043de115fe1d06956807d93a3039ddab54333d1fbb39ad50cc5f9eccaedf5317f4699230e923662254974f3a974c4f000e986837bc020a + languageName: node + linkType: hard + +"@babel/plugin-transform-block-scoping@npm:^7.14.5": + version: 7.15.3 + resolution: "@babel/plugin-transform-block-scoping@npm:7.15.3" + dependencies: + "@babel/helper-plugin-utils": ^7.14.5 + peerDependencies: + "@babel/core": ^7.0.0-0 + checksum: ee28f51711b5f6569a9bb86be5b2a5456f3e6e22e68488ee77f8082fae5563f45c858dc8323e0e51085d880db1be73e28dc5d108c8a855c831fb29310a01b549 + languageName: node + linkType: hard + +"@babel/plugin-transform-classes@npm:^7.14.5": + version: 7.14.9 + resolution: "@babel/plugin-transform-classes@npm:7.14.9" + dependencies: + "@babel/helper-annotate-as-pure": ^7.14.5 + "@babel/helper-function-name": ^7.14.5 + "@babel/helper-optimise-call-expression": ^7.14.5 + "@babel/helper-plugin-utils": ^7.14.5 + "@babel/helper-replace-supers": ^7.14.5 + "@babel/helper-split-export-declaration": ^7.14.5 + globals: ^11.1.0 + peerDependencies: + "@babel/core": ^7.0.0-0 + checksum: 9cb8e78b1249734de6d518a5e63fe429beed9d096298cd79cd1bd36836704cc3644d889d762ce079077bc007dbe4c950d66a58456d9472a123ab3c1100cff7b2 + languageName: node + linkType: hard + +"@babel/plugin-transform-computed-properties@npm:^7.14.5": + version: 7.14.5 + resolution: "@babel/plugin-transform-computed-properties@npm:7.14.5" + dependencies: + "@babel/helper-plugin-utils": ^7.14.5 + peerDependencies: + "@babel/core": ^7.0.0-0 + checksum: 87bd4c46255359ab8d53d0e9b5aa5e1ef218c1447874bd8c2eff759d3a2b5fe6b3ec55046babe0087f7e3890f6167524c729737e912080ea1c9758a559765130 + languageName: node + linkType: hard + +"@babel/plugin-transform-destructuring@npm:^7.14.7": + version: 7.14.7 + resolution: "@babel/plugin-transform-destructuring@npm:7.14.7" + dependencies: + "@babel/helper-plugin-utils": ^7.14.5 + peerDependencies: + "@babel/core": ^7.0.0-0 + checksum: 0b0cf8ed9fb92c53e3888c17402c4f1e8f329f05a759829b559df883b19b442d3950b7f319df419d0cff122ea76fc8b3b55779fdbb9e394e5f058419a8d5ba14 + languageName: node + linkType: hard + +"@babel/plugin-transform-dotall-regex@npm:^7.14.5, @babel/plugin-transform-dotall-regex@npm:^7.4.4": + version: 7.14.5 + resolution: "@babel/plugin-transform-dotall-regex@npm:7.14.5" + dependencies: + "@babel/helper-create-regexp-features-plugin": ^7.14.5 + "@babel/helper-plugin-utils": ^7.14.5 + peerDependencies: + "@babel/core": ^7.0.0-0 + checksum: 4da3dac9580823c1fe8aaedf6109d3a26d17ad7ef7d1b278ddbcd7c148e02c465cf49250794529a34bac0bda6b53db558ae08d185a96b76efaaa17a5da3911df + languageName: node + linkType: hard + +"@babel/plugin-transform-duplicate-keys@npm:^7.14.5": + version: 7.14.5 + resolution: "@babel/plugin-transform-duplicate-keys@npm:7.14.5" + dependencies: + "@babel/helper-plugin-utils": ^7.14.5 + peerDependencies: + "@babel/core": ^7.0.0-0 + checksum: c6c951d2f7ed528a8103d08293d4aaf95efa38c697e7b2b27b7e6c9780280484373e2f7ef8d77daf17dffdc86748fbf75e776e0542b1c7b17e29308bc31ebd8c + languageName: node + linkType: hard + +"@babel/plugin-transform-exponentiation-operator@npm:^7.14.5": + version: 7.14.5 + resolution: "@babel/plugin-transform-exponentiation-operator@npm:7.14.5" + dependencies: + "@babel/helper-builder-binary-assignment-operator-visitor": ^7.14.5 + "@babel/helper-plugin-utils": ^7.14.5 + peerDependencies: + "@babel/core": ^7.0.0-0 + checksum: 7588a582d0bc5c80fda7f1c631354a35a9a7d284dd80ccaf2bbfd086a39a9d6461718dc7dd45a3ca59228593270a7c6a907a9cbe7ddc349d80c7342af0263c5c + languageName: node + linkType: hard + +"@babel/plugin-transform-for-of@npm:^7.14.5": + version: 7.14.5 + resolution: "@babel/plugin-transform-for-of@npm:7.14.5" + dependencies: + "@babel/helper-plugin-utils": ^7.14.5 + peerDependencies: + "@babel/core": ^7.0.0-0 + checksum: aeb76eb11d10b2390996001e2fd529bbaf3695edd306d24e4eba87b8137c10a6afda3896017f88fcf40fd2334cc424c0a111fad34e10c747e81e577e5957e328 + languageName: node + linkType: hard + +"@babel/plugin-transform-function-name@npm:^7.14.5": + version: 7.14.5 + resolution: "@babel/plugin-transform-function-name@npm:7.14.5" + dependencies: + "@babel/helper-function-name": ^7.14.5 + "@babel/helper-plugin-utils": ^7.14.5 + peerDependencies: + "@babel/core": ^7.0.0-0 + checksum: 3db2fa1bcd21b76a91ce78db8ebca047fdadbf198f816e2621e531a751a0d40976cf2a25262dee9352fd0c53bff5b25fddefadebdbb4ba3da6d89b849ab075b6 + languageName: node + linkType: hard + +"@babel/plugin-transform-literals@npm:^7.14.5": + version: 7.14.5 + resolution: "@babel/plugin-transform-literals@npm:7.14.5" + dependencies: + "@babel/helper-plugin-utils": ^7.14.5 + peerDependencies: + "@babel/core": ^7.0.0-0 + checksum: 2341cfaaf8ac7199c578407ea4de41205d3d74c5a48899aa96c41b08c09d18c46d9018fdc6a2f69f0bccc2662223afc47b60130ae4ff36a79351fface71a61f3 + languageName: node + linkType: hard + +"@babel/plugin-transform-member-expression-literals@npm:^7.14.5": + version: 7.14.5 + resolution: "@babel/plugin-transform-member-expression-literals@npm:7.14.5" + dependencies: + "@babel/helper-plugin-utils": ^7.14.5 + peerDependencies: + "@babel/core": ^7.0.0-0 + checksum: a94ff910e8d0e28effd58c64f2d15c9772ea4c209644f116fd81dc5c93ce232304f42ef14d5ec2baf095c824786698fcf6c1d4c91952dc3762350f4ec0eb1f17 + languageName: node + linkType: hard + +"@babel/plugin-transform-modules-amd@npm:^7.14.5": + version: 7.14.5 + resolution: "@babel/plugin-transform-modules-amd@npm:7.14.5" + dependencies: + "@babel/helper-module-transforms": ^7.14.5 + "@babel/helper-plugin-utils": ^7.14.5 + babel-plugin-dynamic-import-node: ^2.3.3 + peerDependencies: + "@babel/core": ^7.0.0-0 + checksum: 963d9ebb11b282d5c5f462e3e1ad6991e60fb4d190b5a7aa0d9937e0fa83d89cf5f94268f0b0b343576f2cee0cf545bcaf40da40eb8b9dca5c79840fd86a65ed + languageName: node + linkType: hard + +"@babel/plugin-transform-modules-commonjs@npm:^7.14.5": + version: 7.15.0 + resolution: "@babel/plugin-transform-modules-commonjs@npm:7.15.0" + dependencies: + "@babel/helper-module-transforms": ^7.15.0 + "@babel/helper-plugin-utils": ^7.14.5 + "@babel/helper-simple-access": ^7.14.8 + babel-plugin-dynamic-import-node: ^2.3.3 + peerDependencies: + "@babel/core": ^7.0.0-0 + checksum: ef55fb736cc8dd984d1a39a74a108b0c52326e93c2e94264da2800ba7027369b64c5d4bd67f274d5386d5346beec264bd8d52e4f1fe6b59802984472e28e4f68 + languageName: node + linkType: hard + +"@babel/plugin-transform-modules-systemjs@npm:^7.14.5": + version: 7.14.5 + resolution: "@babel/plugin-transform-modules-systemjs@npm:7.14.5" + dependencies: + "@babel/helper-hoist-variables": ^7.14.5 + "@babel/helper-module-transforms": ^7.14.5 + "@babel/helper-plugin-utils": ^7.14.5 + "@babel/helper-validator-identifier": ^7.14.5 + babel-plugin-dynamic-import-node: ^2.3.3 + peerDependencies: + "@babel/core": ^7.0.0-0 + checksum: 3ca0bb1c0c22a3d705476186afa9fc86398ae4662afc259ff29c1942e3c8770f4bdadaf67418a21816964d4e1eaf07412eeabccccfaa9d45eac735f971ad148b + languageName: node + linkType: hard + +"@babel/plugin-transform-modules-umd@npm:^7.14.5": + version: 7.14.5 + resolution: "@babel/plugin-transform-modules-umd@npm:7.14.5" + dependencies: + "@babel/helper-module-transforms": ^7.14.5 + "@babel/helper-plugin-utils": ^7.14.5 + peerDependencies: + "@babel/core": ^7.0.0-0 + checksum: 455ff383bed47e104d4b2b32f11bc5a44a25c797fad26b5eab9b8a81856f9945350b45ad28b9b20b0bbf324832c7a826c9c3d6f865e85c26a1771663132e4145 + languageName: node + linkType: hard + +"@babel/plugin-transform-named-capturing-groups-regex@npm:^7.14.7": + version: 7.14.9 + resolution: "@babel/plugin-transform-named-capturing-groups-regex@npm:7.14.9" + dependencies: + "@babel/helper-create-regexp-features-plugin": ^7.14.5 + peerDependencies: + "@babel/core": ^7.0.0 + checksum: 81dda376c0af4c07ae252703481e8bd16d49045bd624697ff6b6635326f3f20fca9c574a2f0036bf7f4aa8c36baa9d926912538de486a189a3515bec7f72e16a + languageName: node + linkType: hard + +"@babel/plugin-transform-new-target@npm:^7.14.5": + version: 7.14.5 + resolution: "@babel/plugin-transform-new-target@npm:7.14.5" + dependencies: + "@babel/helper-plugin-utils": ^7.14.5 + peerDependencies: + "@babel/core": ^7.0.0-0 + checksum: 5b806c86926cd0b03fa2f22cf21a6d6a86e5831b80e8a1e898877acd3a03fd07078e45da33b671200ec98a5c7ac9be2f3592cd88933e262feffba248ca7ca4e7 + languageName: node + linkType: hard + +"@babel/plugin-transform-object-super@npm:^7.14.5": + version: 7.14.5 + resolution: "@babel/plugin-transform-object-super@npm:7.14.5" + dependencies: + "@babel/helper-plugin-utils": ^7.14.5 + "@babel/helper-replace-supers": ^7.14.5 + peerDependencies: + "@babel/core": ^7.0.0-0 + checksum: 88477a8b27e76042ffbff1345088422f5b3135346d69f264e71d90b3749a3d73d5a579c97a33cd11c61c5d499a655911c7cd97dbe68edb36e090dfd5f154d777 + languageName: node + linkType: hard + +"@babel/plugin-transform-parameters@npm:^7.14.5": + version: 7.14.5 + resolution: "@babel/plugin-transform-parameters@npm:7.14.5" + dependencies: + "@babel/helper-plugin-utils": ^7.14.5 + peerDependencies: + "@babel/core": ^7.0.0-0 + checksum: 932bc616be7b5542ba2371c85cfcc579a8556b9e5a5ea5535b7f0ec5b68284ed2a3724ae181f1a22719b5ea6539c82f5fcee37d9f45f08ed72eb9e43a0940b56 + languageName: node + linkType: hard + +"@babel/plugin-transform-property-literals@npm:^7.14.5": + version: 7.14.5 + resolution: "@babel/plugin-transform-property-literals@npm:7.14.5" + dependencies: + "@babel/helper-plugin-utils": ^7.14.5 + peerDependencies: + "@babel/core": ^7.0.0-0 + checksum: 426e7b13a048220314e35bd4e6732640293c616173ef05ceca3a2bfadd043199e35ec693f1604f77178c3a88bea241b6d7ce92d8fc837faeb37117ad7866350f + languageName: node + linkType: hard + +"@babel/plugin-transform-regenerator@npm:^7.14.5": + version: 7.14.5 + resolution: "@babel/plugin-transform-regenerator@npm:7.14.5" + dependencies: + regenerator-transform: ^0.14.2 + peerDependencies: + "@babel/core": ^7.0.0-0 + checksum: f606bc04da7d0cfd651914cb144e85a0ea6fe20ee453ed21d002747cc47b09c853bc97166c32dc47e959581b772d9883f7d96d1c8e795c81ed21dbbb300e3aa7 + languageName: node + linkType: hard + +"@babel/plugin-transform-reserved-words@npm:^7.14.5": + version: 7.14.5 + resolution: "@babel/plugin-transform-reserved-words@npm:7.14.5" + dependencies: + "@babel/helper-plugin-utils": ^7.14.5 + peerDependencies: + "@babel/core": ^7.0.0-0 + checksum: 8a40d7b48e1b4a549272d603e7b28ead70213e12353d65edd07156b7169d7933cee8b79987b54f374f3c41b835d941aca4b13b8aa23a922c94113af2131ca686 + languageName: node + linkType: hard + +"@babel/plugin-transform-runtime@npm:7.14.5": + version: 7.14.5 + resolution: "@babel/plugin-transform-runtime@npm:7.14.5" + dependencies: + "@babel/helper-module-imports": ^7.14.5 + "@babel/helper-plugin-utils": ^7.14.5 + babel-plugin-polyfill-corejs2: ^0.2.2 + babel-plugin-polyfill-corejs3: ^0.2.2 + babel-plugin-polyfill-regenerator: ^0.2.2 + semver: ^6.3.0 + peerDependencies: + "@babel/core": ^7.0.0-0 + checksum: 563762ece9b83ad62df5600140b3182e896c3c39f2d6629f2f91fb50a840fa79bf31c5105b73038422982dcb319cc2dbf3955a1b6350ff4a1bc5503f165a0e36 + languageName: node + linkType: hard + +"@babel/plugin-transform-shorthand-properties@npm:^7.14.5": + version: 7.14.5 + resolution: "@babel/plugin-transform-shorthand-properties@npm:7.14.5" + dependencies: + "@babel/helper-plugin-utils": ^7.14.5 + peerDependencies: + "@babel/core": ^7.0.0-0 + checksum: 60cdd17e347a6a0973c8ea5c08ae4b3f8e59ce0e188453c4bda045d2a5c34495af8e0e9393631aa9f3fd51282455b9c5d6ba07e262576171dbe2b4094bdaf8ad + languageName: node + linkType: hard + +"@babel/plugin-transform-spread@npm:^7.14.6": + version: 7.14.6 + resolution: "@babel/plugin-transform-spread@npm:7.14.6" + dependencies: + "@babel/helper-plugin-utils": ^7.14.5 + "@babel/helper-skip-transparent-expression-wrappers": ^7.14.5 + peerDependencies: + "@babel/core": ^7.0.0-0 + checksum: 20c11de962dd7ddab110d6c4ab9f3c0bea97393ce09cbe4e46be53182c3df0577eaf0e31aaa2d76344ae21ed3a3b7e779fe814b845d188e11a6031c619648b89 + languageName: node + linkType: hard + +"@babel/plugin-transform-sticky-regex@npm:^7.14.5": + version: 7.14.5 + resolution: "@babel/plugin-transform-sticky-regex@npm:7.14.5" + dependencies: + "@babel/helper-plugin-utils": ^7.14.5 + peerDependencies: + "@babel/core": ^7.0.0-0 + checksum: 6d77e0641c4c72203d592d54fdb11770de22a34d659d3335e4c537e95b930d03142b11f1d41d103da3de063c628a0f34bdd4c6534b591bc59d9ce67fafb836dc + languageName: node + linkType: hard + +"@babel/plugin-transform-template-literals@npm:^7.14.5": + version: 7.14.5 + resolution: "@babel/plugin-transform-template-literals@npm:7.14.5" + dependencies: + "@babel/helper-plugin-utils": ^7.14.5 + peerDependencies: + "@babel/core": ^7.0.0-0 + checksum: 56d273470c16e83bac1bfab5057a64f23191b51460a009b522b3b29806d7a9f64cbd94323836ceb997c4f331b85564f952eb5566c7bd140d0b278f0191a31985 + languageName: node + linkType: hard + +"@babel/plugin-transform-typeof-symbol@npm:^7.14.5": + version: 7.14.5 + resolution: "@babel/plugin-transform-typeof-symbol@npm:7.14.5" + dependencies: + "@babel/helper-plugin-utils": ^7.14.5 + peerDependencies: + "@babel/core": ^7.0.0-0 + checksum: 1e71ec00ea8b64522b8677c030f334cc5b3833a5b7269a152a2ba7a6b36f0e0a4333a61072e69113e4062e71554d4751ef2e3ddd5e81994978123323f266981c + languageName: node + linkType: hard + +"@babel/plugin-transform-unicode-escapes@npm:^7.14.5": + version: 7.14.5 + resolution: "@babel/plugin-transform-unicode-escapes@npm:7.14.5" + dependencies: + "@babel/helper-plugin-utils": ^7.14.5 + peerDependencies: + "@babel/core": ^7.0.0-0 + checksum: 2a6979c5b886d9c7d9d3887374d75384542fe05a71eb7738b2cde659386089a930d37d1a34ffb4b87def98fbed3526d78b7cd5dd9bffde4d406b368faba81b7d + languageName: node + linkType: hard + +"@babel/plugin-transform-unicode-regex@npm:^7.14.5": + version: 7.14.5 + resolution: "@babel/plugin-transform-unicode-regex@npm:7.14.5" + dependencies: + "@babel/helper-create-regexp-features-plugin": ^7.14.5 + "@babel/helper-plugin-utils": ^7.14.5 + peerDependencies: + "@babel/core": ^7.0.0-0 + checksum: 1b7a4c0dc6b07390f991e7cac8409f7a1ae74495d94b9e1fb5a716d5362a349a35717cfad883074e3f80e16bb630bbd1986a3436f739f6b01c30a96ef3f9ea9a + languageName: node + linkType: hard + +"@babel/preset-env@npm:7.14.8": + version: 7.14.8 + resolution: "@babel/preset-env@npm:7.14.8" + dependencies: + "@babel/compat-data": ^7.14.7 + "@babel/helper-compilation-targets": ^7.14.5 + "@babel/helper-plugin-utils": ^7.14.5 + "@babel/helper-validator-option": ^7.14.5 + "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": ^7.14.5 + "@babel/plugin-proposal-async-generator-functions": ^7.14.7 + "@babel/plugin-proposal-class-properties": ^7.14.5 + "@babel/plugin-proposal-class-static-block": ^7.14.5 + "@babel/plugin-proposal-dynamic-import": ^7.14.5 + "@babel/plugin-proposal-export-namespace-from": ^7.14.5 + "@babel/plugin-proposal-json-strings": ^7.14.5 + "@babel/plugin-proposal-logical-assignment-operators": ^7.14.5 + "@babel/plugin-proposal-nullish-coalescing-operator": ^7.14.5 + "@babel/plugin-proposal-numeric-separator": ^7.14.5 + "@babel/plugin-proposal-object-rest-spread": ^7.14.7 + "@babel/plugin-proposal-optional-catch-binding": ^7.14.5 + "@babel/plugin-proposal-optional-chaining": ^7.14.5 + "@babel/plugin-proposal-private-methods": ^7.14.5 + "@babel/plugin-proposal-private-property-in-object": ^7.14.5 + "@babel/plugin-proposal-unicode-property-regex": ^7.14.5 + "@babel/plugin-syntax-async-generators": ^7.8.4 + "@babel/plugin-syntax-class-properties": ^7.12.13 + "@babel/plugin-syntax-class-static-block": ^7.14.5 + "@babel/plugin-syntax-dynamic-import": ^7.8.3 + "@babel/plugin-syntax-export-namespace-from": ^7.8.3 + "@babel/plugin-syntax-json-strings": ^7.8.3 + "@babel/plugin-syntax-logical-assignment-operators": ^7.10.4 + "@babel/plugin-syntax-nullish-coalescing-operator": ^7.8.3 + "@babel/plugin-syntax-numeric-separator": ^7.10.4 + "@babel/plugin-syntax-object-rest-spread": ^7.8.3 + "@babel/plugin-syntax-optional-catch-binding": ^7.8.3 + "@babel/plugin-syntax-optional-chaining": ^7.8.3 + "@babel/plugin-syntax-private-property-in-object": ^7.14.5 + "@babel/plugin-syntax-top-level-await": ^7.14.5 + "@babel/plugin-transform-arrow-functions": ^7.14.5 + "@babel/plugin-transform-async-to-generator": ^7.14.5 + "@babel/plugin-transform-block-scoped-functions": ^7.14.5 + "@babel/plugin-transform-block-scoping": ^7.14.5 + "@babel/plugin-transform-classes": ^7.14.5 + "@babel/plugin-transform-computed-properties": ^7.14.5 + "@babel/plugin-transform-destructuring": ^7.14.7 + "@babel/plugin-transform-dotall-regex": ^7.14.5 + "@babel/plugin-transform-duplicate-keys": ^7.14.5 + "@babel/plugin-transform-exponentiation-operator": ^7.14.5 + "@babel/plugin-transform-for-of": ^7.14.5 + "@babel/plugin-transform-function-name": ^7.14.5 + "@babel/plugin-transform-literals": ^7.14.5 + "@babel/plugin-transform-member-expression-literals": ^7.14.5 + "@babel/plugin-transform-modules-amd": ^7.14.5 + "@babel/plugin-transform-modules-commonjs": ^7.14.5 + "@babel/plugin-transform-modules-systemjs": ^7.14.5 + "@babel/plugin-transform-modules-umd": ^7.14.5 + "@babel/plugin-transform-named-capturing-groups-regex": ^7.14.7 + "@babel/plugin-transform-new-target": ^7.14.5 + "@babel/plugin-transform-object-super": ^7.14.5 + "@babel/plugin-transform-parameters": ^7.14.5 + "@babel/plugin-transform-property-literals": ^7.14.5 + "@babel/plugin-transform-regenerator": ^7.14.5 + "@babel/plugin-transform-reserved-words": ^7.14.5 + "@babel/plugin-transform-shorthand-properties": ^7.14.5 + "@babel/plugin-transform-spread": ^7.14.6 + "@babel/plugin-transform-sticky-regex": ^7.14.5 + "@babel/plugin-transform-template-literals": ^7.14.5 + "@babel/plugin-transform-typeof-symbol": ^7.14.5 + "@babel/plugin-transform-unicode-escapes": ^7.14.5 + "@babel/plugin-transform-unicode-regex": ^7.14.5 + "@babel/preset-modules": ^0.1.4 + "@babel/types": ^7.14.8 + babel-plugin-polyfill-corejs2: ^0.2.2 + babel-plugin-polyfill-corejs3: ^0.2.2 + babel-plugin-polyfill-regenerator: ^0.2.2 + core-js-compat: ^3.15.0 + semver: ^6.3.0 + peerDependencies: + "@babel/core": ^7.0.0-0 + checksum: b52f08b9b6ca84c6941ca6e43ab9dcddc768dd197d5921a09778429648dc8fa85cafd92293859c9349be2ec4181e91821d4c376ccfd5e25538c30f500b1b3d5c + languageName: node + linkType: hard + +"@babel/preset-modules@npm:^0.1.4": + version: 0.1.4 + resolution: "@babel/preset-modules@npm:0.1.4" + dependencies: + "@babel/helper-plugin-utils": ^7.0.0 + "@babel/plugin-proposal-unicode-property-regex": ^7.4.4 + "@babel/plugin-transform-dotall-regex": ^7.4.4 + "@babel/types": ^7.4.4 + esutils: ^2.0.2 + peerDependencies: + "@babel/core": ^7.0.0-0 + checksum: 7c6500be06be9a341e377eb63292a4a22d0da2b4fb8c68714aff703ddb341cbd58e37d4119d64fc3e602f73801103af471fca2c60b4c1e48e08eea3e6b1afc93 + languageName: node + linkType: hard + +"@babel/runtime@npm:7.14.8": + version: 7.14.8 + resolution: "@babel/runtime@npm:7.14.8" + dependencies: + regenerator-runtime: ^0.13.4 + checksum: d2dd0ce51ddab78ac93928b04042425145d0dc8cc2b70150d47934f8703f55702eb0b2894f9bd47f66794ad04d8bb03a6a847d0138fbb7aa0b970b5ccd5cc8b7 + languageName: node + linkType: hard + +"@babel/runtime@npm:^7.8.4": + version: 7.15.3 + resolution: "@babel/runtime@npm:7.15.3" + dependencies: + regenerator-runtime: ^0.13.4 + checksum: 2f0b8d2d4e36035ab1d84af0ec26aafa098536870f27c8e07de0a0e398f7a394fdea68a88165535ffb52ded6a68912bdc3450bdf91f229eb132e1c89470789f5 + languageName: node + linkType: hard + +"@babel/template@npm:7.14.5, @babel/template@npm:^7.14.5, @babel/template@npm:^7.8.3": + version: 7.14.5 + resolution: "@babel/template@npm:7.14.5" + dependencies: + "@babel/code-frame": ^7.14.5 + "@babel/parser": ^7.14.5 + "@babel/types": ^7.14.5 + checksum: 4939199c5b1ca8940e14c87f30f4fab5f35c909bef88447131075349027546927b4e3e08e50db5c2db2024f2c6585a4fe571c739c835ac980f7a4ada2dd8a623 + languageName: node + linkType: hard + +"@babel/traverse@npm:^7.13.0, @babel/traverse@npm:^7.14.5, @babel/traverse@npm:^7.14.8, @babel/traverse@npm:^7.15.0, @babel/traverse@npm:^7.8.3": + version: 7.15.0 + resolution: "@babel/traverse@npm:7.15.0" + dependencies: + "@babel/code-frame": ^7.14.5 + "@babel/generator": ^7.15.0 + "@babel/helper-function-name": ^7.14.5 + "@babel/helper-hoist-variables": ^7.14.5 + "@babel/helper-split-export-declaration": ^7.14.5 + "@babel/parser": ^7.15.0 + "@babel/types": ^7.15.0 + debug: ^4.1.0 + globals: ^11.1.0 + checksum: e13056690a2a4a4dd699e241b89d4f7cf701ceef2f4ee0efc32a8cc4e07e1bbd397423868ecfec8aa98a769486f7d08778420d48f981b4f5dbb1b2f211daf656 + languageName: node + linkType: hard + +"@babel/types@npm:^7.14.5, @babel/types@npm:^7.14.8, @babel/types@npm:^7.15.0, @babel/types@npm:^7.4.4, @babel/types@npm:^7.8.3, @babel/types@npm:^7.8.6": + version: 7.15.0 + resolution: "@babel/types@npm:7.15.0" + dependencies: + "@babel/helper-validator-identifier": ^7.14.9 + to-fast-properties: ^2.0.0 + checksum: 6d6bcdfce94b5446520a24087c6dede453e28425af092965b304d4028e9bca79712fd691cdad031e3570c7667bf3206e5f642bcccbfccb33d42ca4a8203587f9 + languageName: node + linkType: hard + +"@cspotcode/source-map-consumer@npm:0.8.0": + version: 0.8.0 + resolution: "@cspotcode/source-map-consumer@npm:0.8.0" + checksum: c0c16ca3d2f58898f1bd74c4f41a189dbcc202e642e60e489cbcc2e52419c4e89bdead02c886a12fb13ea37798ede9e562b2321df997ebc210ae9bd881561b4e + languageName: node + linkType: hard + +"@cspotcode/source-map-support@npm:0.6.1": + version: 0.6.1 + resolution: "@cspotcode/source-map-support@npm:0.6.1" + dependencies: + "@cspotcode/source-map-consumer": 0.8.0 + checksum: da9fb4f6404ebd210537bfa8b2821a747407bf422d2d3d46f29bf85c7c3a68a126de1a9ec41398d57ca116c3bef56d58c2fb4def0800630b1ec82533ad2447c2 + languageName: node + linkType: hard + +"@csstools/convert-colors@npm:^1.4.0": + version: 1.4.0 + resolution: "@csstools/convert-colors@npm:1.4.0" + checksum: 26069eeb845a506934c821c203feb97f5de634c5fbeb9978505a2271d6cfdb0ce400240fca9620a4ef2e68953928ea25aab92ea8454e0edf5cd074066d9ad57b + languageName: node + linkType: hard + +"@cypress/request@npm:^2.88.5": + version: 2.88.6 + resolution: "@cypress/request@npm:2.88.6" + dependencies: + aws-sign2: ~0.7.0 + aws4: ^1.8.0 + caseless: ~0.12.0 + combined-stream: ~1.0.6 + extend: ~3.0.2 + forever-agent: ~0.6.1 + form-data: ~2.3.2 + har-validator: ~5.1.3 + http-signature: ~1.2.0 + is-typedarray: ~1.0.0 + isstream: ~0.1.2 + json-stringify-safe: ~5.0.1 + mime-types: ~2.1.19 + performance-now: ^2.1.0 + qs: ~6.5.2 + safe-buffer: ^5.1.2 + tough-cookie: ~2.5.0 + tunnel-agent: ^0.6.0 + uuid: ^8.3.2 + checksum: 31d4586e212e20955091cdf67a0de746c2587f97f7ff0e2b8e84e772d98a73a1c6051c9090dd938ecdf595c37aec9193b6211faf754b5fcf43c7a151b4d274b7 + languageName: node + linkType: hard + +"@cypress/schematic@npm:1.5.0": + version: 1.5.0 + resolution: "@cypress/schematic@npm:1.5.0" + dependencies: + "@angular-devkit/architect": ^0.1200.0 + "@angular-devkit/core": ^12.0.0 + "@angular-devkit/schematics": ^12.0.0 + "@schematics/angular": ^12.0.0 + jsonc-parser: ^3.0.0 + rxjs: ~6.6.0 + checksum: f13f86d37dd8004dd064c140b48da042a194263d735980ee1c9125ca93abb33b766831d69aa630149cb59953ddc2786cde213e2c35f548cae4c1c756b9167698 + languageName: node + linkType: hard + +"@cypress/xvfb@npm:^1.2.4": + version: 1.2.4 + resolution: "@cypress/xvfb@npm:1.2.4" + dependencies: + debug: ^3.1.0 + lodash.once: ^4.1.1 + checksum: 7bdcdaeb1bb692ec9d9bf8ec52538aa0bead6764753f4a067a171a511807a43fab016f7285a56bef6a606c2467ff3f1365e1ad2d2d583b81beed849ee1573fd1 + languageName: node + linkType: hard + +"@discoveryjs/json-ext@npm:0.5.3": + version: 0.5.3 + resolution: "@discoveryjs/json-ext@npm:0.5.3" + checksum: fea319569f9894391ff1ddb5f59f9dfebe611ac202e7e97d9719ff9f7a726388e6a0a7e5ae8e54cf009ae1748269760d5842bfda5b9cbf834ceda28711baf89d + languageName: node + linkType: hard + +"@gar/promisify@npm:^1.0.1": + version: 1.1.2 + resolution: "@gar/promisify@npm:1.1.2" + checksum: d05081e0887a49c178b75ee3067bd6ee086f73c154d121b854fb2e044e8a89cb1cbb6de3a0dd93a519b80f0531fda68b099dd7256205f7fbb3490324342f2217 + languageName: node + linkType: hard + +"@istanbuljs/schema@npm:^0.1.2": + version: 0.1.3 + resolution: "@istanbuljs/schema@npm:0.1.3" + checksum: 5282759d961d61350f33d9118d16bcaed914ebf8061a52f4fa474b2cb08720c9c81d165e13b82f2e5a8a212cc5af482f0c6fc1ac27b9e067e5394c9a6ed186c9 + languageName: node + linkType: hard + +"@jridgewell/resolve-uri@npm:1.0.0": + version: 1.0.0 + resolution: "@jridgewell/resolve-uri@npm:1.0.0" + checksum: 46ae6bb9c3fdd17d2ad1e7d77044c6541ff14ccf878d0cd39545c7d74446444fea5adb6c96363d3c3d45426504fadca6585bb7eadffd86a0bd8421ce5392f4b3 + languageName: node + linkType: hard + +"@jsdevtools/coverage-istanbul-loader@npm:3.0.5": + version: 3.0.5 + resolution: "@jsdevtools/coverage-istanbul-loader@npm:3.0.5" + dependencies: + convert-source-map: ^1.7.0 + istanbul-lib-instrument: ^4.0.3 + loader-utils: ^2.0.0 + merge-source-map: ^1.1.0 + schema-utils: ^2.7.0 + checksum: e5371e1b711130d75caa3771cb37e8e2cc627e8012571a9da45f6c85d46256c3583016b91a316de05df7ee98a6bc550337c40c275c3cb646becd14649f271157 + languageName: node + linkType: hard + +"@ng-bootstrap/ng-bootstrap@npm:^10.0.0": + version: 10.0.0 + resolution: "@ng-bootstrap/ng-bootstrap@npm:10.0.0" + dependencies: + tslib: ^2.1.0 + peerDependencies: + "@angular/common": ^12.0.0 + "@angular/core": ^12.0.0 + "@angular/forms": ^12.0.0 + "@angular/localize": ^12.0.0 + rxjs: ^6.5.5 + checksum: 687ddb94be0217720f9a14e9d62ac12fac50c6c4ee49315d62ace5deac95a97bac517d9803637e4dcc78b8d564c57b8cadaf4a44f729ab9b5d5c1afbd00f326b + languageName: node + linkType: hard + +"@ngtools/webpack@npm:12.2.12": + version: 12.2.12 + resolution: "@ngtools/webpack@npm:12.2.12" + peerDependencies: + "@angular/compiler-cli": ^12.0.0 + typescript: ~4.2.3 || ~4.3.2 + webpack: ^5.30.0 + checksum: 3424ad4f0b1c8dbdc7d6f884242c7ee36d7c09272d7b81ff5391325fc87a251f509b31797e0cd1b1fa336d9a438f3d03d0abf64679aa76c69671760b436e008c + languageName: node + linkType: hard + +"@ngtools/webpack@npm:12.2.3": + version: 12.2.3 + resolution: "@ngtools/webpack@npm:12.2.3" + peerDependencies: + "@angular/compiler-cli": ^12.0.0 + typescript: ~4.2.3 || ~4.3.2 + webpack: ^5.30.0 + checksum: d6245f1e644926ff8d38c297b57ef62be871929e701ac179d029f5de53aa7b80e41a64a2b86880b0bb71c5b162a98f0e18a1d431caa4e523c3f2d0f5fcfccc5f + languageName: node + linkType: hard + +"@ngx-translate/core@npm:13.0.0": + version: 13.0.0 + resolution: "@ngx-translate/core@npm:13.0.0" + dependencies: + tslib: ^2.0.0 + peerDependencies: + "@angular/core": ">=10.0.0" + rxjs: ">=6.5.3" + checksum: ef7df7870dddc53d483b5c70093174844a5bd231568e36a18271bcaf71209bbedb66c82005d76088392df2bde1d82136fb7f79afb44975e2f7426cc8824e0288 + languageName: node + linkType: hard + +"@ngx-translate/http-loader@npm:6.0.0": + version: 6.0.0 + resolution: "@ngx-translate/http-loader@npm:6.0.0" + dependencies: + tslib: ^2.0.0 + peerDependencies: + "@angular/common": ">=10.0.0" + "@ngx-translate/core": ">=13.0.0" + rxjs: ">=6.5.3" + checksum: fdf516bce93483663091937ef377d1b54bfbb193b1208084c95959dd415bf677a2434d961ec85ef5e5c91cecaf2d62b10ae093ad871d7296ee972154f661a15a + languageName: node + linkType: hard + +"@nodelib/fs.scandir@npm:2.1.5": + version: 2.1.5 + resolution: "@nodelib/fs.scandir@npm:2.1.5" + dependencies: + "@nodelib/fs.stat": 2.0.5 + run-parallel: ^1.1.9 + checksum: a970d595bd23c66c880e0ef1817791432dbb7acbb8d44b7e7d0e7a22f4521260d4a83f7f9fd61d44fda4610105577f8f58a60718105fb38352baed612fd79e59 + languageName: node + linkType: hard + +"@nodelib/fs.stat@npm:2.0.5, @nodelib/fs.stat@npm:^2.0.2": + version: 2.0.5 + resolution: "@nodelib/fs.stat@npm:2.0.5" + checksum: 012480b5ca9d97bff9261571dbbec7bbc6033f69cc92908bc1ecfad0792361a5a1994bc48674b9ef76419d056a03efadfce5a6cf6dbc0a36559571a7a483f6f0 + languageName: node + linkType: hard + +"@nodelib/fs.walk@npm:^1.2.3": + version: 1.2.8 + resolution: "@nodelib/fs.walk@npm:1.2.8" + dependencies: + "@nodelib/fs.scandir": 2.1.5 + fastq: ^1.6.0 + checksum: 190c643f156d8f8f277bf2a6078af1ffde1fd43f498f187c2db24d35b4b4b5785c02c7dc52e356497b9a1b65b13edc996de08de0b961c32844364da02986dc53 + languageName: node + linkType: hard + +"@npmcli/fs@npm:^1.0.0": + version: 1.0.0 + resolution: "@npmcli/fs@npm:1.0.0" + dependencies: + "@gar/promisify": ^1.0.1 + semver: ^7.3.5 + checksum: f2b4990107dd2a5b18794c89aaff6f62f3a67883d49a20602fdfc353cbc7f8c5fd50edeffdc769e454900e01b8b8e43d0b9eb524d00963d69f3c829be1a2e8ac + languageName: node + linkType: hard + +"@npmcli/git@npm:^2.1.0": + version: 2.1.0 + resolution: "@npmcli/git@npm:2.1.0" + dependencies: + "@npmcli/promise-spawn": ^1.3.2 + lru-cache: ^6.0.0 + mkdirp: ^1.0.4 + npm-pick-manifest: ^6.1.1 + promise-inflight: ^1.0.1 + promise-retry: ^2.0.1 + semver: ^7.3.5 + which: ^2.0.2 + checksum: 1f89752df7b836f378b8828423c6ae344fe59399915b9460acded19686e2d0626246251a3cd4cc411ed21c1be6fe7f0c2195c17f392e88748581262ee806dc33 + languageName: node + linkType: hard + +"@npmcli/installed-package-contents@npm:^1.0.6": + version: 1.0.7 + resolution: "@npmcli/installed-package-contents@npm:1.0.7" + dependencies: + npm-bundled: ^1.1.1 + npm-normalize-package-bin: ^1.0.1 + bin: + installed-package-contents: index.js + checksum: a4a29b99d439827ce2e7817c1f61b56be160e640696e31dc513a2c8a37c792f75cdb6258ec15a1e22904f20df0a8a3019dd3766de5e6619f259834cf64233538 + languageName: node + linkType: hard + +"@npmcli/move-file@npm:^1.0.1": + version: 1.1.2 + resolution: "@npmcli/move-file@npm:1.1.2" + dependencies: + mkdirp: ^1.0.4 + rimraf: ^3.0.2 + checksum: c96381d4a37448ea280951e46233f7e541058cf57a57d4094dd4bdcaae43fa5872b5f2eb6bfb004591a68e29c5877abe3cdc210cb3588cbf20ab2877f31a7de7 + languageName: node + linkType: hard + +"@npmcli/node-gyp@npm:^1.0.2": + version: 1.0.2 + resolution: "@npmcli/node-gyp@npm:1.0.2" + checksum: ee4b0706862404189ed40abf19760d9f1a45dcf2ad823b6fbc37f69709ae2fefb57e4ee27cb541111f08c304c46f885cc0479f4fe842af107148f4650cc5ad5e + languageName: node + linkType: hard + +"@npmcli/promise-spawn@npm:^1.2.0, @npmcli/promise-spawn@npm:^1.3.2": + version: 1.3.2 + resolution: "@npmcli/promise-spawn@npm:1.3.2" + dependencies: + infer-owner: ^1.0.4 + checksum: 543b7c1e26230499b4100b10d45efa35b1077e8f25595050f34930ca3310abe9524f7387279fe4330139e0f28a0207595245503439276fd4b686cca2b6503080 + languageName: node + linkType: hard + +"@npmcli/run-script@npm:^1.8.2": + version: 1.8.6 + resolution: "@npmcli/run-script@npm:1.8.6" + dependencies: + "@npmcli/node-gyp": ^1.0.2 + "@npmcli/promise-spawn": ^1.3.2 + node-gyp: ^7.1.0 + read-package-json-fast: ^2.0.1 + checksum: 41924e7925452ac8e78d78bef5d65b3d58f86eea4481a453e11e3a9099504bfbfcf1f65d7f75d92170b846fa347d05424e58e617fb9c17b3efd87db599a0f46e + languageName: node + linkType: hard + +"@schematics/angular@npm:12.2.12": + version: 12.2.12 + resolution: "@schematics/angular@npm:12.2.12" + dependencies: + "@angular-devkit/core": 12.2.12 + "@angular-devkit/schematics": 12.2.12 + jsonc-parser: 3.0.0 + checksum: bfb54d60ab4bc33bce6e4d5a3b39eab7533dd78024cc10d2433ca821ac40349ad7e9d18239db4c1183e593e523654b2f7be8260f7736134ab4f2f20a7176d264 + languageName: node + linkType: hard + +"@schematics/angular@npm:^12.0.0": + version: 12.2.3 + resolution: "@schematics/angular@npm:12.2.3" + dependencies: + "@angular-devkit/core": 12.2.3 + "@angular-devkit/schematics": 12.2.3 + jsonc-parser: 3.0.0 + checksum: c53b4821ea8a6452c815b2d66794dea4ba021a37b3e4a785c662e867d4c8e47b870ff2c50060674988b8bfabd6093bf994218faa5f3d612dce9f3cb3278a55cd + languageName: node + linkType: hard + +"@tootallnate/once@npm:1": + version: 1.1.2 + resolution: "@tootallnate/once@npm:1.1.2" + checksum: e1fb1bbbc12089a0cb9433dc290f97bddd062deadb6178ce9bcb93bb7c1aecde5e60184bc7065aec42fe1663622a213493c48bbd4972d931aae48315f18e1be9 + languageName: node + linkType: hard + +"@trysound/sax@npm:0.1.1": + version: 0.1.1 + resolution: "@trysound/sax@npm:0.1.1" + checksum: 6fe9a87f2a6808c468789b5f2d3677a8ea8d342facce2d9ca3198efa920a169bd6f546805ebad6dc0a851c6468cf1569f63a3b97a4e9380a2c17711636d77eed + languageName: node + linkType: hard + +"@tsconfig/node10@npm:^1.0.7": + version: 1.0.8 + resolution: "@tsconfig/node10@npm:1.0.8" + checksum: b8d5fffbc6b17ef64ef74f7fdbccee02a809a063ade785c3648dae59406bc207f70ea2c4296f92749b33019fa36a5ae716e42e49cc7f1bbf0fd147be0d6b970a + languageName: node + linkType: hard + +"@tsconfig/node12@npm:^1.0.7": + version: 1.0.9 + resolution: "@tsconfig/node12@npm:1.0.9" + checksum: a01b2400ab3582b86b589c6d31dcd0c0656f333adecde85d6d7d4086adb059808b82692380bb169546d189bf771ae21d02544a75b57bd6da4a5dd95f8567bec9 + languageName: node + linkType: hard + +"@tsconfig/node14@npm:^1.0.0": + version: 1.0.1 + resolution: "@tsconfig/node14@npm:1.0.1" + checksum: 976345e896c0f059867f94f8d0f6ddb8b1844fb62bf36b727de8a9a68f024857e5db97ed51d3325e23e0616a5e48c034ff51a8d595b3fe7e955f3587540489be + languageName: node + linkType: hard + +"@tsconfig/node16@npm:^1.0.2": + version: 1.0.2 + resolution: "@tsconfig/node16@npm:1.0.2" + checksum: ca94d3639714672bbfd55f03521d3f56bb6a25479bd425da81faf21f13e1e9d15f40f97377dedbbf477a5841c5b0c8f4cd1b391f33553d750b9202c54c2c07aa + languageName: node + linkType: hard + +"@types/component-emitter@npm:^1.2.10": + version: 1.2.10 + resolution: "@types/component-emitter@npm:1.2.10" + checksum: 7589d3a10ef4e1c60f415db0d7ad90680c2d60b589972d198c19ba092f06559988dde501f83c0293e945fe19b989ef2334da07802b802d1a9846b0dde7a34ab1 + languageName: node + linkType: hard + +"@types/cookie@npm:^0.4.0": + version: 0.4.1 + resolution: "@types/cookie@npm:0.4.1" + checksum: 3275534ed69a76c68eb1a77d547d75f99fedc80befb75a3d1d03662fb08d697e6f8b1274e12af1a74c6896071b11510631ba891f64d30c78528d0ec45a9c1a18 + languageName: node + linkType: hard + +"@types/cors@npm:^2.8.8": + version: 2.8.12 + resolution: "@types/cors@npm:2.8.12" + checksum: 8c45f112c7d1d2d831b4b266f2e6ed33a1887a35dcbfe2a18b28370751fababb7cd045e745ef84a523c33a25932678097bf79afaa367c6cb3fa0daa7a6438257 + languageName: node + linkType: hard + +"@types/eslint-scope@npm:^3.7.0": + version: 3.7.1 + resolution: "@types/eslint-scope@npm:3.7.1" + dependencies: + "@types/eslint": "*" + "@types/estree": "*" + checksum: 4271c9adad19ad8a1d23062d9020468a51c7f81594b12b8e68f7d460c09e14d57cae3e82b077c402766369c0c17e2de72da72c405fa465d18a46c0b14ce92530 + languageName: node + linkType: hard + +"@types/eslint@npm:*": + version: 7.28.0 + resolution: "@types/eslint@npm:7.28.0" + dependencies: + "@types/estree": "*" + "@types/json-schema": "*" + checksum: 75ac2577d2a2e35bae66f56d2d1c871d5e836b2721cf14bd3df450c9d584eba48fa3b1013fba710245bf4795f16e1df0ed315e543e3199c4815ee4782537d0ae + languageName: node + linkType: hard + +"@types/estree@npm:*, @types/estree@npm:^0.0.50": + version: 0.0.50 + resolution: "@types/estree@npm:0.0.50" + checksum: 9a2b6a4a8c117f34d08fbda5e8f69b1dfb109f7d149b60b00fd7a9fb6ac545c078bc590aa4ec2f0a256d680cf72c88b3b28b60c326ee38a7bc8ee1ee95624922 + languageName: node + linkType: hard + +"@types/glob@npm:^7.1.1": + version: 7.1.4 + resolution: "@types/glob@npm:7.1.4" + dependencies: + "@types/minimatch": "*" + "@types/node": "*" + checksum: 6911a956448f5eddea1e4371f814bf92072e8ceedba83de6ce2a6745938a6f0327376e1c0072fa0d7b3b73d84e255aafda53c1dff148225cfe542a8cc5d54b02 + languageName: node + linkType: hard + +"@types/jasmine@npm:~3.8.0": + version: 3.8.2 + resolution: "@types/jasmine@npm:3.8.2" + checksum: f4a91ba3c508ad503790e299dadccbc5f4e6496408757c43a5f378e144f338cacf946cc36ca15d51d89e9faaf1fe49e61288ea4c19d4deedf92cc16035c203b7 + languageName: node + linkType: hard + +"@types/json-schema@npm:*, @types/json-schema@npm:^7.0.5, @types/json-schema@npm:^7.0.8": + version: 7.0.9 + resolution: "@types/json-schema@npm:7.0.9" + checksum: 259d0e25f11a21ba5c708f7ea47196bd396e379fddb79c76f9f4f62c945879dc21657904914313ec2754e443c5018ea8372362f323f30e0792897fdb2098a705 + languageName: node + linkType: hard + +"@types/json5@npm:^0.0.29": + version: 0.0.29 + resolution: "@types/json5@npm:0.0.29" + checksum: e60b153664572116dfea673c5bda7778dbff150498f44f998e34b5886d8afc47f16799280e4b6e241c0472aef1bc36add771c569c68fc5125fc2ae519a3eb9ac + languageName: node + linkType: hard + +"@types/minimatch@npm:*": + version: 3.0.5 + resolution: "@types/minimatch@npm:3.0.5" + checksum: c41d136f67231c3131cf1d4ca0b06687f4a322918a3a5adddc87ce90ed9dbd175a3610adee36b106ae68c0b92c637c35e02b58c8a56c424f71d30993ea220b92 + languageName: node + linkType: hard + +"@types/node@npm:*, @types/node@npm:>=10.0.0": + version: 16.7.8 + resolution: "@types/node@npm:16.7.8" + checksum: 060ea222ce8f3eb05bd86a7785ca5807503a50602dd805c5be997a5ae684fa6224c9ad8890bcc5551c05d14a8bcd735f94567691342d197f5f7f7f893ed0d46b + languageName: node + linkType: hard + +"@types/node@npm:^12.11.1": + version: 12.20.21 + resolution: "@types/node@npm:12.20.21" + checksum: 080b2f471ba5d4dd9a31e3e93b5dc0364523de14e0d6a6aa9b3383e5567c87d541959638a2f03c2047b7c799a36731927516a264e17c3616e8a9589f9d08cb4e + languageName: node + linkType: hard + +"@types/node@npm:^14.14.31": + version: 14.17.12 + resolution: "@types/node@npm:14.17.12" + checksum: 7efbce3781a0ea5d7a39bca3c5ed9c4e4d99fed3483fb2a89670aeb049cd9d25f1ddecd8fb58420fd92de371278721ddd6e3ad95c4f55992592f1ac5d1dedf98 + languageName: node + linkType: hard + +"@types/parse-json@npm:^4.0.0": + version: 4.0.0 + resolution: "@types/parse-json@npm:4.0.0" + checksum: fd6bce2b674b6efc3db4c7c3d336bd70c90838e8439de639b909ce22f3720d21344f52427f1d9e57b265fcb7f6c018699b99e5e0c208a1a4823014269a6bf35b + languageName: node + linkType: hard + +"@types/sinonjs__fake-timers@npm:^6.0.2": + version: 6.0.3 + resolution: "@types/sinonjs__fake-timers@npm:6.0.3" + checksum: 6def7829e18b6f23506f7c4d6843e9ab80ae2ae983e2321c10fd816667297af519d96819aa436f30ae1a9a35b75bfbe4489f310cee1bf0983eede1ba3248b44c + languageName: node + linkType: hard + +"@types/sizzle@npm:^2.3.2": + version: 2.3.3 + resolution: "@types/sizzle@npm:2.3.3" + checksum: 586a9fb1f6ff3e325e0f2cc1596a460615f0bc8a28f6e276ac9b509401039dd242fa8b34496d3a30c52f5b495873922d09a9e76c50c2ab2bcc70ba3fb9c4e160 + languageName: node + linkType: hard + +"@types/source-list-map@npm:*": + version: 0.1.2 + resolution: "@types/source-list-map@npm:0.1.2" + checksum: fda8f37537aca9d3ed860d559289ab1dddb6897e642e6f53e909bbd18a7ac3129a8faa2a7d093847c91346cf09c86ef36e350c715406fba1f2271759b449adf6 + languageName: node + linkType: hard + +"@types/webpack-sources@npm:^0.1.5": + version: 0.1.9 + resolution: "@types/webpack-sources@npm:0.1.9" + dependencies: + "@types/node": "*" + "@types/source-list-map": "*" + source-map: ^0.6.1 + checksum: bc09c584c7047e8aed29801a3981787dee3898e9e7a99891a362df114fcac3879eea5a00932314866a01b25220391839be09fe1487b16d4970ff4a7afd5b9725 + languageName: node + linkType: hard + +"@types/yauzl@npm:^2.9.1": + version: 2.9.2 + resolution: "@types/yauzl@npm:2.9.2" + dependencies: + "@types/node": "*" + checksum: dfb49abe82605615712fc694eaa4f7068fe30aa03f38c085e2c2e74408beaad30471d36da9654a811482ece2ea4405575fd99b19c0aa327ed2a9736b554bbf43 + languageName: node + linkType: hard + +"@webassemblyjs/ast@npm:1.11.1": + version: 1.11.1 + resolution: "@webassemblyjs/ast@npm:1.11.1" + dependencies: + "@webassemblyjs/helper-numbers": 1.11.1 + "@webassemblyjs/helper-wasm-bytecode": 1.11.1 + checksum: 1eee1534adebeece635362f8e834ae03e389281972611408d64be7895fc49f48f98fddbbb5339bf8a72cb101bcb066e8bca3ca1bf1ef47dadf89def0395a8d87 + languageName: node + linkType: hard + +"@webassemblyjs/floating-point-hex-parser@npm:1.11.1": + version: 1.11.1 + resolution: "@webassemblyjs/floating-point-hex-parser@npm:1.11.1" + checksum: b8efc6fa08e4787b7f8e682182d84dfdf8da9d9c77cae5d293818bc4a55c1f419a87fa265ab85252b3e6c1fd323d799efea68d825d341a7c365c64bc14750e97 + languageName: node + linkType: hard + +"@webassemblyjs/helper-api-error@npm:1.11.1": + version: 1.11.1 + resolution: "@webassemblyjs/helper-api-error@npm:1.11.1" + checksum: 0792813f0ed4a0e5ee0750e8b5d0c631f08e927f4bdfdd9fe9105dc410c786850b8c61bff7f9f515fdfb149903bec3c976a1310573a4c6866a94d49bc7271959 + languageName: node + linkType: hard + +"@webassemblyjs/helper-buffer@npm:1.11.1": + version: 1.11.1 + resolution: "@webassemblyjs/helper-buffer@npm:1.11.1" + checksum: a337ee44b45590c3a30db5a8b7b68a717526cf967ada9f10253995294dbd70a58b2da2165222e0b9830cd4fc6e4c833bf441a721128d1fe2e9a7ab26b36003ce + languageName: node + linkType: hard + +"@webassemblyjs/helper-numbers@npm:1.11.1": + version: 1.11.1 + resolution: "@webassemblyjs/helper-numbers@npm:1.11.1" + dependencies: + "@webassemblyjs/floating-point-hex-parser": 1.11.1 + "@webassemblyjs/helper-api-error": 1.11.1 + "@xtuc/long": 4.2.2 + checksum: 44d2905dac2f14d1e9b5765cf1063a0fa3d57295c6d8930f6c59a36462afecc6e763e8a110b97b342a0f13376166c5d41aa928e6ced92e2f06b071fd0db59d3a + languageName: node + linkType: hard + +"@webassemblyjs/helper-wasm-bytecode@npm:1.11.1": + version: 1.11.1 + resolution: "@webassemblyjs/helper-wasm-bytecode@npm:1.11.1" + checksum: eac400113127832c88f5826bcc3ad1c0db9b3dbd4c51a723cfdb16af6bfcbceb608170fdaac0ab7731a7e18b291be7af68a47fcdb41cfe0260c10857e7413d97 + languageName: node + linkType: hard + +"@webassemblyjs/helper-wasm-section@npm:1.11.1": + version: 1.11.1 + resolution: "@webassemblyjs/helper-wasm-section@npm:1.11.1" + dependencies: + "@webassemblyjs/ast": 1.11.1 + "@webassemblyjs/helper-buffer": 1.11.1 + "@webassemblyjs/helper-wasm-bytecode": 1.11.1 + "@webassemblyjs/wasm-gen": 1.11.1 + checksum: 617696cfe8ecaf0532763162aaf748eb69096fb27950219bb87686c6b2e66e11cd0614d95d319d0ab1904bc14ebe4e29068b12c3e7c5e020281379741fe4bedf + languageName: node + linkType: hard + +"@webassemblyjs/ieee754@npm:1.11.1": + version: 1.11.1 + resolution: "@webassemblyjs/ieee754@npm:1.11.1" + dependencies: + "@xtuc/ieee754": ^1.2.0 + checksum: 23a0ac02a50f244471631802798a816524df17e56b1ef929f0c73e3cde70eaf105a24130105c60aff9d64a24ce3b640dad443d6f86e5967f922943a7115022ec + languageName: node + linkType: hard + +"@webassemblyjs/leb128@npm:1.11.1": + version: 1.11.1 + resolution: "@webassemblyjs/leb128@npm:1.11.1" + dependencies: + "@xtuc/long": 4.2.2 + checksum: 33ccc4ade2f24de07bf31690844d0b1ad224304ee2062b0e464a610b0209c79e0b3009ac190efe0e6bd568b0d1578d7c3047fc1f9d0197c92fc061f56224ff4a + languageName: node + linkType: hard + +"@webassemblyjs/utf8@npm:1.11.1": + version: 1.11.1 + resolution: "@webassemblyjs/utf8@npm:1.11.1" + checksum: 972c5cfc769d7af79313a6bfb96517253a270a4bf0c33ba486aa43cac43917184fb35e51dfc9e6b5601548cd5931479a42e42c89a13bb591ffabebf30c8a6a0b + languageName: node + linkType: hard + +"@webassemblyjs/wasm-edit@npm:1.11.1": + version: 1.11.1 + resolution: "@webassemblyjs/wasm-edit@npm:1.11.1" + dependencies: + "@webassemblyjs/ast": 1.11.1 + "@webassemblyjs/helper-buffer": 1.11.1 + "@webassemblyjs/helper-wasm-bytecode": 1.11.1 + "@webassemblyjs/helper-wasm-section": 1.11.1 + "@webassemblyjs/wasm-gen": 1.11.1 + "@webassemblyjs/wasm-opt": 1.11.1 + "@webassemblyjs/wasm-parser": 1.11.1 + "@webassemblyjs/wast-printer": 1.11.1 + checksum: 6d7d9efaec1227e7ef7585a5d7ff0be5f329f7c1c6b6c0e906b18ed2e9a28792a5635e450aca2d136770d0207225f204eff70a4b8fd879d3ac79e1dcc26dbeb9 + languageName: node + linkType: hard + +"@webassemblyjs/wasm-gen@npm:1.11.1": + version: 1.11.1 + resolution: "@webassemblyjs/wasm-gen@npm:1.11.1" + dependencies: + "@webassemblyjs/ast": 1.11.1 + "@webassemblyjs/helper-wasm-bytecode": 1.11.1 + "@webassemblyjs/ieee754": 1.11.1 + "@webassemblyjs/leb128": 1.11.1 + "@webassemblyjs/utf8": 1.11.1 + checksum: 1f6921e640293bf99fb16b21e09acb59b340a79f986c8f979853a0ae9f0b58557534b81e02ea2b4ef11e929d946708533fd0693c7f3712924128fdafd6465f5b + languageName: node + linkType: hard + +"@webassemblyjs/wasm-opt@npm:1.11.1": + version: 1.11.1 + resolution: "@webassemblyjs/wasm-opt@npm:1.11.1" + dependencies: + "@webassemblyjs/ast": 1.11.1 + "@webassemblyjs/helper-buffer": 1.11.1 + "@webassemblyjs/wasm-gen": 1.11.1 + "@webassemblyjs/wasm-parser": 1.11.1 + checksum: 21586883a20009e2b20feb67bdc451bbc6942252e038aae4c3a08e6f67b6bae0f5f88f20bfc7bd0452db5000bacaf5ab42b98cf9aa034a6c70e9fc616142e1db + languageName: node + linkType: hard + +"@webassemblyjs/wasm-parser@npm:1.11.1": + version: 1.11.1 + resolution: "@webassemblyjs/wasm-parser@npm:1.11.1" + dependencies: + "@webassemblyjs/ast": 1.11.1 + "@webassemblyjs/helper-api-error": 1.11.1 + "@webassemblyjs/helper-wasm-bytecode": 1.11.1 + "@webassemblyjs/ieee754": 1.11.1 + "@webassemblyjs/leb128": 1.11.1 + "@webassemblyjs/utf8": 1.11.1 + checksum: 1521644065c360e7b27fad9f4bb2df1802d134dd62937fa1f601a1975cde56bc31a57b6e26408b9ee0228626ff3ba1131ae6f74ffb7d718415b6528c5a6dbfc2 + languageName: node + linkType: hard + +"@webassemblyjs/wast-printer@npm:1.11.1": + version: 1.11.1 + resolution: "@webassemblyjs/wast-printer@npm:1.11.1" + dependencies: + "@webassemblyjs/ast": 1.11.1 + "@xtuc/long": 4.2.2 + checksum: f15ae4c2441b979a3b4fce78f3d83472fb22350c6dc3fd34bfe7c3da108e0b2360718734d961bba20e7716cb8578e964b870da55b035e209e50ec9db0378a3f7 + languageName: node + linkType: hard + +"@xtuc/ieee754@npm:^1.2.0": + version: 1.2.0 + resolution: "@xtuc/ieee754@npm:1.2.0" + checksum: ac56d4ca6e17790f1b1677f978c0c6808b1900a5b138885d3da21732f62e30e8f0d9120fcf8f6edfff5100ca902b46f8dd7c1e3f903728634523981e80e2885a + languageName: node + linkType: hard + +"@xtuc/long@npm:4.2.2": + version: 4.2.2 + resolution: "@xtuc/long@npm:4.2.2" + checksum: 8ed0d477ce3bc9c6fe2bf6a6a2cc316bb9c4127c5a7827bae947fa8ec34c7092395c5a283cc300c05b5fa01cbbfa1f938f410a7bf75db7c7846fea41949989ec + languageName: node + linkType: hard + +"@yarnpkg/lockfile@npm:1.1.0": + version: 1.1.0 + resolution: "@yarnpkg/lockfile@npm:1.1.0" + checksum: 05b881b4866a3546861fee756e6d3812776ea47fa6eb7098f983d6d0eefa02e12b66c3fff931574120f196286a7ad4879ce02743c8bb2be36c6a576c7852083a + languageName: node + linkType: hard + +"abab@npm:^2.0.5": + version: 2.0.5 + resolution: "abab@npm:2.0.5" + checksum: 0ec951b46d5418c2c2f923021ec193eaebdb4e802ffd5506286781b454be722a13a8430f98085cd3e204918401d9130ec6cc8f5ae19be315b3a0e857d83196e1 + languageName: node + linkType: hard + +"abbrev@npm:1": + version: 1.1.1 + resolution: "abbrev@npm:1.1.1" + checksum: a4a97ec07d7ea112c517036882b2ac22f3109b7b19077dc656316d07d308438aac28e4d9746dc4d84bf6b1e75b4a7b0a5f3cb30592419f128ca9a8cee3bcfa17 + languageName: node + linkType: hard + +"accepts@npm:~1.3.4, accepts@npm:~1.3.5, accepts@npm:~1.3.7": + version: 1.3.7 + resolution: "accepts@npm:1.3.7" + dependencies: + mime-types: ~2.1.24 + negotiator: 0.6.2 + checksum: 27fc8060ffc69481ff6719cd3ee06387d2b88381cb0ce626f087781bbd02201a645a9febc8e7e7333558354b33b1d2f922ad13560be4ec1b7ba9e76fc1c1241d + languageName: node + linkType: hard + +"acorn-import-assertions@npm:^1.7.6": + version: 1.7.6 + resolution: "acorn-import-assertions@npm:1.7.6" + peerDependencies: + acorn: ^8 + checksum: bc8a1585abd70ebfb3a6b3112f5e3974fee3ac598230f916a3857f0ad4fa7e72197be532c49d1feeb83678ef264f34bee9bf1934dfb2f276d88468134a51fa9f + languageName: node + linkType: hard + +"acorn-walk@npm:^8.1.1": + version: 8.1.1 + resolution: "acorn-walk@npm:8.1.1" + checksum: 5e4dafbcec14fbfac96e1f13726273e969a30fdf607ed4eb6ca335292f85b8c896393fee15837a8f2b27afd7ede0f1c6edb5b5e6d0123a8821fee1a834318e62 + languageName: node + linkType: hard + +"acorn@npm:^8.4.1": + version: 8.4.1 + resolution: "acorn@npm:8.4.1" + bin: + acorn: bin/acorn + checksum: 0a8fd264349285aa36194b26a5a9d70c3641e78ad459ec44b9a9a5738e0ce6d86ec120ca2c0f04477165cee912fdeb158f62d6582697185c82278bdbf71187f8 + languageName: node + linkType: hard + +"adjust-sourcemap-loader@npm:^4.0.0": + version: 4.0.0 + resolution: "adjust-sourcemap-loader@npm:4.0.0" + dependencies: + loader-utils: ^2.0.0 + regex-parser: ^2.2.11 + checksum: d524ae23582f41e2275af5d88faab7a9dc09770ed588244e0a76d3196d0d6a90bf02760c71bc6213dbfef3aef4a86232ac9521bfd629752c32b7af37bc74c660 + languageName: node + linkType: hard + +"agent-base@npm:6, agent-base@npm:^6.0.2": + version: 6.0.2 + resolution: "agent-base@npm:6.0.2" + dependencies: + debug: 4 + checksum: f52b6872cc96fd5f622071b71ef200e01c7c4c454ee68bc9accca90c98cfb39f2810e3e9aa330435835eedc8c23f4f8a15267f67c6e245d2b33757575bdac49d + languageName: node + linkType: hard + +"agentkeepalive@npm:^4.1.3": + version: 4.1.4 + resolution: "agentkeepalive@npm:4.1.4" + dependencies: + debug: ^4.1.0 + depd: ^1.1.2 + humanize-ms: ^1.2.1 + checksum: d49c24d4b333e9507119385895a583872f4f53d62764a89be165926e824056a126955bae4a6d3c6f7cd26f4089621a40f7b27675f7868214d82118f744b9e82d + languageName: node + linkType: hard + +"aggregate-error@npm:^3.0.0": + version: 3.1.0 + resolution: "aggregate-error@npm:3.1.0" + dependencies: + clean-stack: ^2.0.0 + indent-string: ^4.0.0 + checksum: 1101a33f21baa27a2fa8e04b698271e64616b886795fd43c31068c07533c7b3facfcaf4e9e0cab3624bd88f729a592f1c901a1a229c9e490eafce411a8644b79 + languageName: node + linkType: hard + +"ajv-errors@npm:^1.0.0": + version: 1.0.1 + resolution: "ajv-errors@npm:1.0.1" + peerDependencies: + ajv: ">=5.0.0" + checksum: 2c9fc02cf58f9aae5bace61ebd1b162e1ea372ae9db5999243ba5e32a9a78c0d635d29ae085f652c61c941a43af0b2b1acdb255e29d44dc43a6e021085716d8c + languageName: node + linkType: hard + +"ajv-formats@npm:2.0.2": + version: 2.0.2 + resolution: "ajv-formats@npm:2.0.2" + dependencies: + ajv: ^8.0.0 + peerDependencies: + ajv: ^8.0.0 + peerDependenciesMeta: + ajv: + optional: true + checksum: 1db638917c2da3cb3cf65ea8908bcdf478cadc4d2b6d48529a1bd2a857f03c0fc80995b27be657d29fd24119f3ffde96a15dde55bc51bd68a1ea2e01ef1a4280 + languageName: node + linkType: hard + +"ajv-formats@npm:2.1.0": + version: 2.1.0 + resolution: "ajv-formats@npm:2.1.0" + dependencies: + ajv: ^8.0.0 + peerDependencies: + ajv: ^8.0.0 + peerDependenciesMeta: + ajv: + optional: true + checksum: fae7947f4118c3db374587d08c36c4e6584575dcb8281610feef64f25f59b6d918e253007fb30c174bbab320cb13a9161e44a9da3710cb0a93a8db47462c3df1 + languageName: node + linkType: hard + +"ajv-keywords@npm:^3.1.0, ajv-keywords@npm:^3.5.2": + version: 3.5.2 + resolution: "ajv-keywords@npm:3.5.2" + peerDependencies: + ajv: ^6.9.1 + checksum: 7dc5e5931677a680589050f79dcbe1fefbb8fea38a955af03724229139175b433c63c68f7ae5f86cf8f65d55eb7c25f75a046723e2e58296707617ca690feae9 + languageName: node + linkType: hard + +"ajv@npm:8.2.0": + version: 8.2.0 + resolution: "ajv@npm:8.2.0" + dependencies: + fast-deep-equal: ^3.1.1 + json-schema-traverse: ^1.0.0 + require-from-string: ^2.0.2 + uri-js: ^4.2.2 + checksum: 36994bc227aac4c29ff967de5d53f087449ffab62d66f782f99c6aad8ac1d58db4eb7b0f78ce7961492eae00be51c2384b38b69e099d1021d41b2353dce91417 + languageName: node + linkType: hard + +"ajv@npm:8.6.2, ajv@npm:^8.0.0": + version: 8.6.2 + resolution: "ajv@npm:8.6.2" + dependencies: + fast-deep-equal: ^3.1.1 + json-schema-traverse: ^1.0.0 + require-from-string: ^2.0.2 + uri-js: ^4.2.2 + checksum: b86d6cb86c69abbd8ce71ab7d4ff272660bf6d34fa9fbe770f73e54da59d531b2546692e36e2b35bbcfb11d20db774b4c09189671335185b8c799d65194e5169 + languageName: node + linkType: hard + +"ajv@npm:^6.1.0, ajv@npm:^6.12.3, ajv@npm:^6.12.4, ajv@npm:^6.12.5": + version: 6.12.6 + resolution: "ajv@npm:6.12.6" + dependencies: + fast-deep-equal: ^3.1.1 + fast-json-stable-stringify: ^2.0.0 + json-schema-traverse: ^0.4.1 + uri-js: ^4.2.2 + checksum: 874972efe5c4202ab0a68379481fbd3d1b5d0a7bd6d3cc21d40d3536ebff3352a2a1fabb632d4fd2cc7fe4cbdcd5ed6782084c9bbf7f32a1536d18f9da5007d4 + languageName: node + linkType: hard + +"alphanum-sort@npm:^1.0.2": + version: 1.0.2 + resolution: "alphanum-sort@npm:1.0.2" + checksum: 5a32d0b3c0944e65d22ff3ae2f88d7a4f8d88a78a703033caeae33f2944915e053d283d02f630dc94823edc7757148ecdcf39fd687a5117bda5c10133a03a7d8 + languageName: node + linkType: hard + +"ansi-colors@npm:4.1.1, ansi-colors@npm:^4.1.1": + version: 4.1.1 + resolution: "ansi-colors@npm:4.1.1" + checksum: 138d04a51076cb085da0a7e2d000c5c0bb09f6e772ed5c65c53cb118d37f6c5f1637506d7155fb5f330f0abcf6f12fa2e489ac3f8cdab9da393bf1bb4f9a32b0 + languageName: node + linkType: hard + +"ansi-colors@npm:^3.0.0": + version: 3.2.4 + resolution: "ansi-colors@npm:3.2.4" + checksum: 026c51880e9f8eb59b112669a87dbea4469939ff94b131606303bbd697438a6691b16b9db3027aa9bf132a244214e83ab1508b998496a34d2aea5b437ac9e62d + languageName: node + linkType: hard + +"ansi-escapes@npm:^4.2.1, ansi-escapes@npm:^4.3.0": + version: 4.3.2 + resolution: "ansi-escapes@npm:4.3.2" + dependencies: + type-fest: ^0.21.3 + checksum: 93111c42189c0a6bed9cdb4d7f2829548e943827ee8479c74d6e0b22ee127b2a21d3f8b5ca57723b8ef78ce011fbfc2784350eb2bde3ccfccf2f575fa8489815 + languageName: node + linkType: hard + +"ansi-html@npm:0.0.7": + version: 0.0.7 + resolution: "ansi-html@npm:0.0.7" + bin: + ansi-html: ./bin/ansi-html + checksum: 9b839ce99650b4c2d83621d67d68622d27e7948b54f7a4386f2218a3997ee4e684e5a6e8d290880c3f3260e8d90c2613c59c7028f04992ad5c8d99d3a0fcc02c + languageName: node + linkType: hard + +"ansi-regex@npm:^2.0.0": + version: 2.1.1 + resolution: "ansi-regex@npm:2.1.1" + checksum: 190abd03e4ff86794f338a31795d262c1dfe8c91f7e01d04f13f646f1dcb16c5800818f886047876f1272f065570ab86b24b99089f8b68a0e11ff19aed4ca8f1 + languageName: node + linkType: hard + +"ansi-regex@npm:^3.0.0": + version: 3.0.0 + resolution: "ansi-regex@npm:3.0.0" + checksum: 2ad11c416f81c39f5c65eafc88cf1d71aa91d76a2f766e75e457c2a3c43e8a003aadbf2966b61c497aa6a6940a36412486c975b3270cdfc3f413b69826189ec3 + languageName: node + linkType: hard + +"ansi-regex@npm:^4.1.0": + version: 4.1.0 + resolution: "ansi-regex@npm:4.1.0" + checksum: 97aa4659538d53e5e441f5ef2949a3cffcb838e57aeaad42c4194e9d7ddb37246a6526c4ca85d3940a9d1e19b11cc2e114530b54c9d700c8baf163c31779baf8 + languageName: node + linkType: hard + +"ansi-regex@npm:^5.0.0": + version: 5.0.0 + resolution: "ansi-regex@npm:5.0.0" + checksum: b1bb4e992a5d96327bb4f72eaba9f8047f1d808d273ad19d399e266bfcc7fb19a4d1a127a32f7bc61fe46f1a94a4d04ec4c424e3fbe184929aa866323d8ed4ce + languageName: node + linkType: hard + +"ansi-styles@npm:^3.2.0, ansi-styles@npm:^3.2.1": + version: 3.2.1 + resolution: "ansi-styles@npm:3.2.1" + dependencies: + color-convert: ^1.9.0 + checksum: d85ade01c10e5dd77b6c89f34ed7531da5830d2cb5882c645f330079975b716438cd7ebb81d0d6e6b4f9c577f19ae41ab55f07f19786b02f9dfd9e0377395665 + languageName: node + linkType: hard + +"ansi-styles@npm:^4.0.0, ansi-styles@npm:^4.1.0": + version: 4.3.0 + resolution: "ansi-styles@npm:4.3.0" + dependencies: + color-convert: ^2.0.1 + checksum: 513b44c3b2105dd14cc42a19271e80f386466c4be574bccf60b627432f9198571ebf4ab1e4c3ba17347658f4ee1711c163d574248c0c1cdc2d5917a0ad582ec4 + languageName: node + linkType: hard + +"anymatch@npm:^2.0.0": + version: 2.0.0 + resolution: "anymatch@npm:2.0.0" + dependencies: + micromatch: ^3.1.4 + normalize-path: ^2.1.1 + checksum: f7bb1929842b4585cdc28edbb385767d499ce7d673f96a8f11348d2b2904592ffffc594fe9229b9a1e9e4dccb9329b7692f9f45e6a11dcefbb76ecdc9ab740f6 + languageName: node + linkType: hard + +"anymatch@npm:~3.1.2": + version: 3.1.2 + resolution: "anymatch@npm:3.1.2" + dependencies: + normalize-path: ^3.0.0 + picomatch: ^2.0.4 + checksum: 985163db2292fac9e5a1e072bf99f1b5baccf196e4de25a0b0b81865ebddeb3b3eb4480734ef0a2ac8c002845396b91aa89121f5b84f93981a4658164a9ec6e9 + languageName: node + linkType: hard + +"aproba@npm:^1.0.3": + version: 1.2.0 + resolution: "aproba@npm:1.2.0" + checksum: 0fca141966559d195072ed047658b6e6c4fe92428c385dd38e288eacfc55807e7b4989322f030faff32c0f46bb0bc10f1e0ac32ec22d25315a1e5bbc0ebb76dc + languageName: node + linkType: hard + +"arch@npm:^2.2.0": + version: 2.2.0 + resolution: "arch@npm:2.2.0" + checksum: e21b7635029fe8e9cdd5a026f9a6c659103e63fff423834323cdf836a1bb240a72d0c39ca8c470f84643385cf581bd8eda2cad8bf493e27e54bd9783abe9101f + languageName: node + linkType: hard + +"are-we-there-yet@npm:~1.1.2": + version: 1.1.5 + resolution: "are-we-there-yet@npm:1.1.5" + dependencies: + delegates: ^1.0.0 + readable-stream: ^2.0.6 + checksum: 9a746b1dbce4122f44002b0c39fbba5b2c6f52c00e88b6ccba6fc68652323f8a1355a20e8ab94846995626d8de3bf67669a3b4a037dff0885db14607168f2b15 + languageName: node + linkType: hard + +"arg@npm:^4.1.0": + version: 4.1.3 + resolution: "arg@npm:4.1.3" + checksum: 544af8dd3f60546d3e4aff084d451b96961d2267d668670199692f8d054f0415d86fc5497d0e641e91546f0aa920e7c29e5250e99fc89f5552a34b5d93b77f43 + languageName: node + linkType: hard + +"arr-diff@npm:^4.0.0": + version: 4.0.0 + resolution: "arr-diff@npm:4.0.0" + checksum: ea7c8834842ad3869297f7915689bef3494fd5b102ac678c13ffccab672d3d1f35802b79e90c4cfec2f424af3392e44112d1ccf65da34562ed75e049597276a0 + languageName: node + linkType: hard + +"arr-flatten@npm:^1.1.0": + version: 1.1.0 + resolution: "arr-flatten@npm:1.1.0" + checksum: 963fe12564fca2f72c055f3f6c206b9e031f7c433a0c66ca9858b484821f248c5b1e5d53c8e4989d80d764cd776cf6d9b160ad05f47bdc63022bfd63b5455e22 + languageName: node + linkType: hard + +"arr-union@npm:^3.1.0": + version: 3.1.0 + resolution: "arr-union@npm:3.1.0" + checksum: b5b0408c6eb7591143c394f3be082fee690ddd21f0fdde0a0a01106799e847f67fcae1b7e56b0a0c173290e29c6aca9562e82b300708a268bc8f88f3d6613cb9 + languageName: node + linkType: hard + +"array-flatten@npm:1.1.1": + version: 1.1.1 + resolution: "array-flatten@npm:1.1.1" + checksum: a9925bf3512d9dce202112965de90c222cd59a4fbfce68a0951d25d965cf44642931f40aac72309c41f12df19afa010ecadceb07cfff9ccc1621e99d89ab5f3b + languageName: node + linkType: hard + +"array-flatten@npm:^2.1.0": + version: 2.1.2 + resolution: "array-flatten@npm:2.1.2" + checksum: e8988aac1fbfcdaae343d08c9a06a6fddd2c6141721eeeea45c3cf523bf4431d29a46602929455ed548c7a3e0769928cdc630405427297e7081bd118fdec9262 + languageName: node + linkType: hard + +"array-union@npm:^1.0.1": + version: 1.0.2 + resolution: "array-union@npm:1.0.2" + dependencies: + array-uniq: ^1.0.1 + checksum: 82cec6421b6e6766556c484835a6d476a873f1b71cace5ab2b4f1b15b1e3162dc4da0d16f7a2b04d4aec18146c6638fe8f661340b31ba8e469fd811a1b45dc8d + languageName: node + linkType: hard + +"array-union@npm:^2.1.0": + version: 2.1.0 + resolution: "array-union@npm:2.1.0" + checksum: 5bee12395cba82da674931df6d0fea23c4aa4660cb3b338ced9f828782a65caa232573e6bf3968f23e0c5eb301764a382cef2f128b170a9dc59de0e36c39f98d + languageName: node + linkType: hard + +"array-uniq@npm:^1.0.1": + version: 1.0.3 + resolution: "array-uniq@npm:1.0.3" + checksum: 1625f06b093d8bf279b81adfec6e72951c0857d65b5e3f65f053fffe9f9dd61c2fc52cff57e38a4700817e7e3f01a4faa433d505ea9e33cdae4514c334e0bf9e + languageName: node + linkType: hard + +"array-unique@npm:^0.3.2": + version: 0.3.2 + resolution: "array-unique@npm:0.3.2" + checksum: da344b89cfa6b0a5c221f965c21638bfb76b57b45184a01135382186924f55973cd9b171d4dad6bf606c6d9d36b0d721d091afdc9791535ead97ccbe78f8a888 + languageName: node + linkType: hard + +"asn1@npm:~0.2.3": + version: 0.2.4 + resolution: "asn1@npm:0.2.4" + dependencies: + safer-buffer: ~2.1.0 + checksum: aa5d6f77b1e0597df53824c68cfe82d1d89ce41cb3520148611f025fbb3101b2d25dd6a40ad34e4fac10f6b19ed5e8628cd4b7d212261e80e83f02b39ee5663c + languageName: node + linkType: hard + +"assert-plus@npm:1.0.0, assert-plus@npm:^1.0.0": + version: 1.0.0 + resolution: "assert-plus@npm:1.0.0" + checksum: 19b4340cb8f0e6a981c07225eacac0e9d52c2644c080198765d63398f0075f83bbc0c8e95474d54224e297555ad0d631c1dcd058adb1ddc2437b41a6b424ac64 + languageName: node + linkType: hard + +"assign-symbols@npm:^1.0.0": + version: 1.0.0 + resolution: "assign-symbols@npm:1.0.0" + checksum: c0eb895911d05b6b2d245154f70461c5e42c107457972e5ebba38d48967870dee53bcdf6c7047990586daa80fab8dab3cc6300800fbd47b454247fdedd859a2c + languageName: node + linkType: hard + +"astral-regex@npm:^2.0.0": + version: 2.0.0 + resolution: "astral-regex@npm:2.0.0" + checksum: 876231688c66400473ba505731df37ea436e574dd524520294cc3bbc54ea40334865e01fa0d074d74d036ee874ee7e62f486ea38bc421ee8e6a871c06f011766 + languageName: node + linkType: hard + +"async-each@npm:^1.0.1": + version: 1.0.3 + resolution: "async-each@npm:1.0.3" + checksum: 868651cfeb209970b367fbb96df1e1c8dc0b22c681cda7238417005ab2a5fbd944ee524b43f2692977259a57b7cc2547e03ff68f2b5113dbdf953d48cc078dc3 + languageName: node + linkType: hard + +"async-limiter@npm:~1.0.0": + version: 1.0.1 + resolution: "async-limiter@npm:1.0.1" + checksum: 2b849695b465d93ad44c116220dee29a5aeb63adac16c1088983c339b0de57d76e82533e8e364a93a9f997f28bbfc6a92948cefc120652bd07f3b59f8d75cf2b + languageName: node + linkType: hard + +"async@npm:^2.6.2": + version: 2.6.3 + resolution: "async@npm:2.6.3" + dependencies: + lodash: ^4.17.14 + checksum: 5e5561ff8fca807e88738533d620488ac03a5c43fce6c937451f7e35f943d33ad06c24af3f681a48cca3d2b0002b3118faff0a128dc89438a9bf0226f712c499 + languageName: node + linkType: hard + +"async@npm:^3.2.0": + version: 3.2.1 + resolution: "async@npm:3.2.1" + checksum: fcd6dc73d36bdb0e5bf978ea27832136cc8116cef15e0a2dc9a5c63f362c5f82363996a349bf3046d590587b7f30614ac340a4f3db6d48780a07f40f81941e0c + languageName: node + linkType: hard + +"asynckit@npm:^0.4.0": + version: 0.4.0 + resolution: "asynckit@npm:0.4.0" + checksum: 7b78c451df768adba04e2d02e63e2d0bf3b07adcd6e42b4cf665cb7ce899bedd344c69a1dcbce355b5f972d597b25aaa1c1742b52cffd9caccb22f348114f6be + languageName: node + linkType: hard + +"at-least-node@npm:^1.0.0": + version: 1.0.0 + resolution: "at-least-node@npm:1.0.0" + checksum: 463e2f8e43384f1afb54bc68485c436d7622acec08b6fad269b421cb1d29cebb5af751426793d0961ed243146fe4dc983402f6d5a51b720b277818dbf6f2e49e + languageName: node + linkType: hard + +"atob@npm:^2.1.2": + version: 2.1.2 + resolution: "atob@npm:2.1.2" + bin: + atob: bin/atob.js + checksum: dfeeeb70090c5ebea7be4b9f787f866686c645d9f39a0d184c817252d0cf08455ed25267d79c03254d3be1f03ac399992a792edcd5ffb9c91e097ab5ef42833a + languageName: node + linkType: hard + +"autoprefixer@npm:^9.6.1": + version: 9.8.6 + resolution: "autoprefixer@npm:9.8.6" + dependencies: + browserslist: ^4.12.0 + caniuse-lite: ^1.0.30001109 + colorette: ^1.2.1 + normalize-range: ^0.1.2 + num2fraction: ^1.2.2 + postcss: ^7.0.32 + postcss-value-parser: ^4.1.0 + bin: + autoprefixer: bin/autoprefixer + checksum: 46987bc3de6612f0276c3643061901e33cc5721d07aaeb6f0daf237554448884a59c0b17087bf0f00a07d940abcb5a6eaf2203b962c24fe33d52f76aa845cb70 + languageName: node + linkType: hard + +"aws-sign2@npm:~0.7.0": + version: 0.7.0 + resolution: "aws-sign2@npm:0.7.0" + checksum: b148b0bb0778098ad8cf7e5fc619768bcb51236707ca1d3e5b49e41b171166d8be9fdc2ea2ae43d7decf02989d0aaa3a9c4caa6f320af95d684de9b548a71525 + languageName: node + linkType: hard + +"aws4@npm:^1.8.0": + version: 1.11.0 + resolution: "aws4@npm:1.11.0" + checksum: 5a00d045fd0385926d20ebebcfba5ec79d4482fe706f63c27b324d489a04c68edb0db99ed991e19eda09cb8c97dc2452059a34d97545cebf591d7a2b5a10999f + languageName: node + linkType: hard + +"babel-loader@npm:8.2.2": + version: 8.2.2 + resolution: "babel-loader@npm:8.2.2" + dependencies: + find-cache-dir: ^3.3.1 + loader-utils: ^1.4.0 + make-dir: ^3.1.0 + schema-utils: ^2.6.5 + peerDependencies: + "@babel/core": ^7.0.0 + webpack: ">=2" + checksum: df5092ef9886bb49aacb7c58ac40ed0681ced031c8d91e49d680cedace2aa1703390a31fbe7c0e409f739836e911c5c991119133d90d9289f681c0a8ff2447a1 + languageName: node + linkType: hard + +"babel-plugin-dynamic-import-node@npm:^2.3.3": + version: 2.3.3 + resolution: "babel-plugin-dynamic-import-node@npm:2.3.3" + dependencies: + object.assign: ^4.1.0 + checksum: c9d24415bcc608d0db7d4c8540d8002ac2f94e2573d2eadced137a29d9eab7e25d2cbb4bc6b9db65cf6ee7430f7dd011d19c911a9a778f0533b4a05ce8292c9b + languageName: node + linkType: hard + +"babel-plugin-polyfill-corejs2@npm:^0.2.2": + version: 0.2.2 + resolution: "babel-plugin-polyfill-corejs2@npm:0.2.2" + dependencies: + "@babel/compat-data": ^7.13.11 + "@babel/helper-define-polyfill-provider": ^0.2.2 + semver: ^6.1.1 + peerDependencies: + "@babel/core": ^7.0.0-0 + checksum: eee45ecce743e06840d29936a7f4a9f9eca19552ba010e9f3676c6a2697ab815230f39953296b72f09665de0e8fffe260e52b348011a9ddba36cfa7eec6f8c51 + languageName: node + linkType: hard + +"babel-plugin-polyfill-corejs3@npm:^0.2.2": + version: 0.2.4 + resolution: "babel-plugin-polyfill-corejs3@npm:0.2.4" + dependencies: + "@babel/helper-define-polyfill-provider": ^0.2.2 + core-js-compat: ^3.14.0 + peerDependencies: + "@babel/core": ^7.0.0-0 + checksum: 49e9b1709fd76bff8b577da38548d05ec0317acaa9cba893bf447af7b0f26494d635b70814452782d079b2b6f25c09dd8fa76e151c0e4ae1397e8295af14e685 + languageName: node + linkType: hard + +"babel-plugin-polyfill-regenerator@npm:^0.2.2": + version: 0.2.2 + resolution: "babel-plugin-polyfill-regenerator@npm:0.2.2" + dependencies: + "@babel/helper-define-polyfill-provider": ^0.2.2 + peerDependencies: + "@babel/core": ^7.0.0-0 + checksum: 3e32e318fd91d65c3af2bb363189f00d3839f07a73a08813b553553e07da205162091b428dd5b6ffb6ea4caf531ff43ebc54197b0a5a9dc2fc5c7e9a650e946d + languageName: node + linkType: hard + +"balanced-match@npm:^1.0.0": + version: 1.0.2 + resolution: "balanced-match@npm:1.0.2" + checksum: 9706c088a283058a8a99e0bf91b0a2f75497f185980d9ffa8b304de1d9e58ebda7c72c07ebf01dadedaac5b2907b2c6f566f660d62bd336c3468e960403b9d65 + languageName: node + linkType: hard + +"base64-arraybuffer@npm:0.1.4": + version: 0.1.4 + resolution: "base64-arraybuffer@npm:0.1.4" + checksum: d249a929e27b2430d7ba1527e91a36e14da37ae2f80e350c4d696a038257718f8da07577e820e7262f86a0ecd573c283db10c46502080f53ae11bfdd99b6a029 + languageName: node + linkType: hard + +"base64-js@npm:^1.2.0, base64-js@npm:^1.3.1": + version: 1.5.1 + resolution: "base64-js@npm:1.5.1" + checksum: 669632eb3745404c2f822a18fc3a0122d2f9a7a13f7fb8b5823ee19d1d2ff9ee5b52c53367176ea4ad093c332fd5ab4bd0ebae5a8e27917a4105a4cfc86b1005 + languageName: node + linkType: hard + +"base64id@npm:2.0.0, base64id@npm:~2.0.0": + version: 2.0.0 + resolution: "base64id@npm:2.0.0" + checksum: 581b1d37e6cf3738b7ccdd4d14fe2bfc5c238e696e2720ee6c44c183b838655842e22034e53ffd783f872a539915c51b0d4728a49c7cc678ac5a758e00d62168 + languageName: node + linkType: hard + +"base@npm:^0.11.1": + version: 0.11.2 + resolution: "base@npm:0.11.2" + dependencies: + cache-base: ^1.0.1 + class-utils: ^0.3.5 + component-emitter: ^1.2.1 + define-property: ^1.0.0 + isobject: ^3.0.1 + mixin-deep: ^1.2.0 + pascalcase: ^0.1.1 + checksum: a4a146b912e27eea8f66d09cb0c9eab666f32ce27859a7dfd50f38cd069a2557b39f16dba1bc2aecb3b44bf096738dd207b7970d99b0318423285ab1b1994edd + languageName: node + linkType: hard + +"batch@npm:0.6.1": + version: 0.6.1 + resolution: "batch@npm:0.6.1" + checksum: 61f9934c7378a51dce61b915586191078ef7f1c3eca707fdd58b96ff2ff56d9e0af2bdab66b1462301a73c73374239e6542d9821c0af787f3209a23365d07e7f + languageName: node + linkType: hard + +"bcrypt-pbkdf@npm:^1.0.0": + version: 1.0.2 + resolution: "bcrypt-pbkdf@npm:1.0.2" + dependencies: + tweetnacl: ^0.14.3 + checksum: 4edfc9fe7d07019609ccf797a2af28351736e9d012c8402a07120c4453a3b789a15f2ee1530dc49eee8f7eb9379331a8dd4b3766042b9e502f74a68e7f662291 + languageName: node + linkType: hard + +"big.js@npm:^5.2.2": + version: 5.2.2 + resolution: "big.js@npm:5.2.2" + checksum: b89b6e8419b097a8fb4ed2399a1931a68c612bce3cfd5ca8c214b2d017531191070f990598de2fc6f3f993d91c0f08aa82697717f6b3b8732c9731866d233c9e + languageName: node + linkType: hard + +"binary-extensions@npm:^1.0.0": + version: 1.13.1 + resolution: "binary-extensions@npm:1.13.1" + checksum: ad7747f33c07e94ba443055de130b50c8b8b130a358bca064c580d91769ca6a69c7ac65ca008ff044ed4541d2c6ad45496e1fadbef5218a68770996b6a2194d7 + languageName: node + linkType: hard + +"binary-extensions@npm:^2.0.0": + version: 2.2.0 + resolution: "binary-extensions@npm:2.2.0" + checksum: ccd267956c58d2315f5d3ea6757cf09863c5fc703e50fbeb13a7dc849b812ef76e3cf9ca8f35a0c48498776a7478d7b4a0418e1e2b8cb9cb9731f2922aaad7f8 + languageName: node + linkType: hard + +"bindings@npm:^1.5.0": + version: 1.5.0 + resolution: "bindings@npm:1.5.0" + dependencies: + file-uri-to-path: 1.0.0 + checksum: 65b6b48095717c2e6105a021a7da4ea435aa8d3d3cd085cb9e85bcb6e5773cf318c4745c3f7c504412855940b585bdf9b918236612a1c7a7942491de176f1ae7 + languageName: node + linkType: hard + +"bl@npm:^4.0.3, bl@npm:^4.1.0": + version: 4.1.0 + resolution: "bl@npm:4.1.0" + dependencies: + buffer: ^5.5.0 + inherits: ^2.0.4 + readable-stream: ^3.4.0 + checksum: 9e8521fa7e83aa9427c6f8ccdcba6e8167ef30cc9a22df26effcc5ab682ef91d2cbc23a239f945d099289e4bbcfae7a192e9c28c84c6202e710a0dfec3722662 + languageName: node + linkType: hard + +"blob-util@npm:^2.0.2": + version: 2.0.2 + resolution: "blob-util@npm:2.0.2" + checksum: d543e6b92e4ca715ca33c78e89a07a2290d43e5b2bc897d7ec588c5c7bbf59df93e45225ac0c9258aa6ce4320358990f99c9288f1c48280f8ec5d7a2e088d19b + languageName: node + linkType: hard + +"bluebird@npm:^3.7.2": + version: 3.7.2 + resolution: "bluebird@npm:3.7.2" + checksum: 869417503c722e7dc54ca46715f70e15f4d9c602a423a02c825570862d12935be59ed9c7ba34a9b31f186c017c23cac6b54e35446f8353059c101da73eac22ef + languageName: node + linkType: hard + +"body-parser@npm:1.19.0, body-parser@npm:^1.19.0": + version: 1.19.0 + resolution: "body-parser@npm:1.19.0" + dependencies: + bytes: 3.1.0 + content-type: ~1.0.4 + debug: 2.6.9 + depd: ~1.1.2 + http-errors: 1.7.2 + iconv-lite: 0.4.24 + on-finished: ~2.3.0 + qs: 6.7.0 + raw-body: 2.4.0 + type-is: ~1.6.17 + checksum: 490231b4c89bbd43112762f7ba8e5342c174a6c9f64284a3b0fcabf63277e332f8316765596f1e5b15e4f3a6cf0422e005f4bb3149ed3a224bb025b7a36b9ac1 + languageName: node + linkType: hard + +"bonjour@npm:^3.5.0": + version: 3.5.0 + resolution: "bonjour@npm:3.5.0" + dependencies: + array-flatten: ^2.1.0 + deep-equal: ^1.0.1 + dns-equal: ^1.0.0 + dns-txt: ^2.0.2 + multicast-dns: ^6.0.1 + multicast-dns-service-types: ^1.1.0 + checksum: 2cfbe9fa861f4507b5ff3853eeae3ef03a231ede2b7363efedd80880ea3c0576f64416f98056c96e429ed68ff38dc4a70c0583d1eb4dab72e491ca44a0f03444 + languageName: node + linkType: hard + +"boolbase@npm:^1.0.0": + version: 1.0.0 + resolution: "boolbase@npm:1.0.0" + checksum: 3e25c80ef626c3a3487c73dbfc70ac322ec830666c9ad915d11b701142fab25ec1e63eff2c450c74347acfd2de854ccde865cd79ef4db1683f7c7b046ea43bb0 + languageName: node + linkType: hard + +"bootstrap@npm:^4.6.1": + version: 4.6.1 + resolution: "bootstrap@npm:4.6.1" + peerDependencies: + jquery: 1.9.1 - 3 + popper.js: ^1.16.1 + checksum: ff44e13787aafe1e2b8ac77802eae0f19bf957ea53a40ce3d9d4af9b67eab8adc585dc5a62cb6be82a3bc33e7ae67b0efd75f02282c0ddca09272d5c18a0b379 + languageName: node + linkType: hard + +"brace-expansion@npm:^1.1.7": + version: 1.1.11 + resolution: "brace-expansion@npm:1.1.11" + dependencies: + balanced-match: ^1.0.0 + concat-map: 0.0.1 + checksum: faf34a7bb0c3fcf4b59c7808bc5d2a96a40988addf2e7e09dfbb67a2251800e0d14cd2bfc1aa79174f2f5095c54ff27f46fb1289fe2d77dac755b5eb3434cc07 + languageName: node + linkType: hard + +"braces@npm:^2.3.1, braces@npm:^2.3.2": + version: 2.3.2 + resolution: "braces@npm:2.3.2" + dependencies: + arr-flatten: ^1.1.0 + array-unique: ^0.3.2 + extend-shallow: ^2.0.1 + fill-range: ^4.0.0 + isobject: ^3.0.1 + repeat-element: ^1.1.2 + snapdragon: ^0.8.1 + snapdragon-node: ^2.0.1 + split-string: ^3.0.2 + to-regex: ^3.0.1 + checksum: e30dcb6aaf4a31c8df17d848aa283a65699782f75ad61ae93ec25c9729c66cf58e66f0000a9fec84e4add1135bb7da40f7cb9601b36bebcfa9ca58e8d5c07de0 + languageName: node + linkType: hard + +"braces@npm:^3.0.1, braces@npm:^3.0.2, braces@npm:~3.0.2": + version: 3.0.2 + resolution: "braces@npm:3.0.2" + dependencies: + fill-range: ^7.0.1 + checksum: e2a8e769a863f3d4ee887b5fe21f63193a891c68b612ddb4b68d82d1b5f3ff9073af066c343e9867a393fe4c2555dcb33e89b937195feb9c1613d259edfcd459 + languageName: node + linkType: hard + +"browserslist@npm:^4.0.0, browserslist@npm:^4.12.0, browserslist@npm:^4.14.5, browserslist@npm:^4.16.0, browserslist@npm:^4.16.6, browserslist@npm:^4.16.8, browserslist@npm:^4.6.4, browserslist@npm:^4.9.1": + version: 4.16.8 + resolution: "browserslist@npm:4.16.8" + dependencies: + caniuse-lite: ^1.0.30001251 + colorette: ^1.3.0 + electron-to-chromium: ^1.3.811 + escalade: ^3.1.1 + node-releases: ^1.1.75 + bin: + browserslist: cli.js + checksum: a442ab2156b95bc88627591c5af6f3e4952eab4a3b1eef942af37bbeaa717f60a78b31890c76b1ade08e881c541c6ac9e7a74f0a66968658e9fe013e69e69093 + languageName: node + linkType: hard + +"buffer-alloc-unsafe@npm:^1.1.0": + version: 1.1.0 + resolution: "buffer-alloc-unsafe@npm:1.1.0" + checksum: c5e18bf51f67754ec843c9af3d4c005051aac5008a3992938dda1344e5cfec77c4b02b4ca303644d1e9a6e281765155ce6356d85c6f5ccc5cd21afc868def396 + languageName: node + linkType: hard + +"buffer-alloc@npm:^1.2.0": + version: 1.2.0 + resolution: "buffer-alloc@npm:1.2.0" + dependencies: + buffer-alloc-unsafe: ^1.1.0 + buffer-fill: ^1.0.0 + checksum: 560cd27f3cbe73c614867da373407d4506309c62fe18de45a1ce191f3785ec6ca2488d802ff82065798542422980ca25f903db078c57822218182c37c3576df5 + languageName: node + linkType: hard + +"buffer-crc32@npm:~0.2.3": + version: 0.2.13 + resolution: "buffer-crc32@npm:0.2.13" + checksum: 06252347ae6daca3453b94e4b2f1d3754a3b146a111d81c68924c22d91889a40623264e95e67955b1cb4a68cbedf317abeabb5140a9766ed248973096db5ce1c + languageName: node + linkType: hard + +"buffer-fill@npm:^1.0.0": + version: 1.0.0 + resolution: "buffer-fill@npm:1.0.0" + checksum: c29b4723ddeab01e74b5d3b982a0c6828f2ded49cef049ddca3dac661c874ecdbcecb5dd8380cf0f4adbeb8cff90a7de724126750a1f1e5ebd4eb6c59a1315b1 + languageName: node + linkType: hard + +"buffer-from@npm:^1.0.0, buffer-from@npm:^1.1.1": + version: 1.1.2 + resolution: "buffer-from@npm:1.1.2" + checksum: 0448524a562b37d4d7ed9efd91685a5b77a50672c556ea254ac9a6d30e3403a517d8981f10e565db24e8339413b43c97ca2951f10e399c6125a0d8911f5679bb + languageName: node + linkType: hard + +"buffer-indexof@npm:^1.0.0": + version: 1.1.1 + resolution: "buffer-indexof@npm:1.1.1" + checksum: 0967abc2981a8e7d776324c6b84811e4d84a7ead89b54a3bb8791437f0c4751afd060406b06db90a436f1cf771867331b5ecf5c4aca95b4ccb9f6cb146c22ebc + languageName: node + linkType: hard + +"buffer@npm:^5.2.1, buffer@npm:^5.4.3, buffer@npm:^5.5.0": + version: 5.7.1 + resolution: "buffer@npm:5.7.1" + dependencies: + base64-js: ^1.3.1 + ieee754: ^1.1.13 + checksum: e2cf8429e1c4c7b8cbd30834ac09bd61da46ce35f5c22a78e6c2f04497d6d25541b16881e30a019c6fd3154150650ccee27a308eff3e26229d788bbdeb08ab84 + languageName: node + linkType: hard + +"builtins@npm:^1.0.3": + version: 1.0.3 + resolution: "builtins@npm:1.0.3" + checksum: 47ce94f7eee0e644969da1f1a28e5f29bd2e48b25b2bbb61164c345881086e29464ccb1fb88dbc155ea26e8b1f5fc8a923b26c8c1ed0935b67b644d410674513 + languageName: node + linkType: hard + +"bytes@npm:3.0.0": + version: 3.0.0 + resolution: "bytes@npm:3.0.0" + checksum: a2b386dd8188849a5325f58eef69c3b73c51801c08ffc6963eddc9be244089ba32d19347caf6d145c86f315ae1b1fc7061a32b0c1aa6379e6a719090287ed101 + languageName: node + linkType: hard + +"bytes@npm:3.1.0": + version: 3.1.0 + resolution: "bytes@npm:3.1.0" + checksum: 7c3b21c5d9d44ed455460d5d36a31abc6fa2ce3807964ba60a4b03fd44454c8cf07bb0585af83bfde1c5cc2ea4bbe5897bc3d18cd15e0acf25a3615a35aba2df + languageName: node + linkType: hard + +"cacache@npm:15.2.0": + version: 15.2.0 + resolution: "cacache@npm:15.2.0" + dependencies: + "@npmcli/move-file": ^1.0.1 + chownr: ^2.0.0 + fs-minipass: ^2.0.0 + glob: ^7.1.4 + infer-owner: ^1.0.4 + lru-cache: ^6.0.0 + minipass: ^3.1.1 + minipass-collect: ^1.0.2 + minipass-flush: ^1.0.5 + minipass-pipeline: ^1.2.2 + mkdirp: ^1.0.3 + p-map: ^4.0.0 + promise-inflight: ^1.0.1 + rimraf: ^3.0.2 + ssri: ^8.0.1 + tar: ^6.0.2 + unique-filename: ^1.1.1 + checksum: 34d0fba6030dd3f1f9de4d9fb486cfa8f6ec836ab00d75b846b40c06f96e64898e781f715d19a2c357a601a899c339a44446f94dd328f173605af165a295dd29 + languageName: node + linkType: hard + +"cacache@npm:^15.0.5, cacache@npm:^15.2.0": + version: 15.3.0 + resolution: "cacache@npm:15.3.0" + dependencies: + "@npmcli/fs": ^1.0.0 + "@npmcli/move-file": ^1.0.1 + chownr: ^2.0.0 + fs-minipass: ^2.0.0 + glob: ^7.1.4 + infer-owner: ^1.0.4 + lru-cache: ^6.0.0 + minipass: ^3.1.1 + minipass-collect: ^1.0.2 + minipass-flush: ^1.0.5 + minipass-pipeline: ^1.2.2 + mkdirp: ^1.0.3 + p-map: ^4.0.0 + promise-inflight: ^1.0.1 + rimraf: ^3.0.2 + ssri: ^8.0.1 + tar: ^6.0.2 + unique-filename: ^1.1.1 + checksum: a07327c27a4152c04eb0a831c63c00390d90f94d51bb80624a66f4e14a6b6360bbf02a84421267bd4d00ca73ac9773287d8d7169e8d2eafe378d2ce140579db8 + languageName: node + linkType: hard + +"cache-base@npm:^1.0.1": + version: 1.0.1 + resolution: "cache-base@npm:1.0.1" + dependencies: + collection-visit: ^1.0.0 + component-emitter: ^1.2.1 + get-value: ^2.0.6 + has-value: ^1.0.0 + isobject: ^3.0.1 + set-value: ^2.0.0 + to-object-path: ^0.3.0 + union-value: ^1.0.0 + unset-value: ^1.0.0 + checksum: 9114b8654fe2366eedc390bad0bcf534e2f01b239a888894e2928cb58cdc1e6ea23a73c6f3450dcfd2058aa73a8a981e723cd1e7c670c047bf11afdc65880107 + languageName: node + linkType: hard + +"cachedir@npm:^2.3.0": + version: 2.3.0 + resolution: "cachedir@npm:2.3.0" + checksum: ec90cb0f2e6336e266aa748dbadf3da9e0b20e843e43f1591acab7a3f1451337dc2f26cb9dd833ae8cfefeffeeb43ef5b5ff62782a685f4e3c2305dd98482fcb + languageName: node + linkType: hard + +"call-bind@npm:^1.0.0, call-bind@npm:^1.0.2": + version: 1.0.2 + resolution: "call-bind@npm:1.0.2" + dependencies: + function-bind: ^1.1.1 + get-intrinsic: ^1.0.2 + checksum: f8e31de9d19988a4b80f3e704788c4a2d6b6f3d17cfec4f57dc29ced450c53a49270dc66bf0fbd693329ee948dd33e6c90a329519aef17474a4d961e8d6426b0 + languageName: node + linkType: hard + +"callsites@npm:^3.0.0": + version: 3.1.0 + resolution: "callsites@npm:3.1.0" + checksum: 072d17b6abb459c2ba96598918b55868af677154bec7e73d222ef95a8fdb9bbf7dae96a8421085cdad8cd190d86653b5b6dc55a4484f2e5b2e27d5e0c3fc15b3 + languageName: node + linkType: hard + +"camelcase@npm:^5.0.0": + version: 5.3.1 + resolution: "camelcase@npm:5.3.1" + checksum: e6effce26b9404e3c0f301498184f243811c30dfe6d0b9051863bd8e4034d09c8c2923794f280d6827e5aa055f6c434115ff97864a16a963366fb35fd673024b + languageName: node + linkType: hard + +"caniuse-api@npm:^3.0.0": + version: 3.0.0 + resolution: "caniuse-api@npm:3.0.0" + dependencies: + browserslist: ^4.0.0 + caniuse-lite: ^1.0.0 + lodash.memoize: ^4.1.2 + lodash.uniq: ^4.5.0 + checksum: db2a229383b20d0529b6b589dde99d7b6cb56ba371366f58cbbfa2929c9f42c01f873e2b6ef641d4eda9f0b4118de77dbb2805814670bdad4234bf08e720b0b4 + languageName: node + linkType: hard + +"caniuse-lite@npm:^1.0.0, caniuse-lite@npm:^1.0.30000981, caniuse-lite@npm:^1.0.30001032, caniuse-lite@npm:^1.0.30001109, caniuse-lite@npm:^1.0.30001251": + version: 1.0.30001252 + resolution: "caniuse-lite@npm:1.0.30001252" + checksum: 0d25a2795ca224c1a689b08fe37a5dc6c4c79d80720f927bf7df70ed30c1b1b62c3cc51429eac01902d3fc298d9531b85efec331c2a051e42615c76fa348f118 + languageName: node + linkType: hard + +"canonical-path@npm:1.0.0": + version: 1.0.0 + resolution: "canonical-path@npm:1.0.0" + checksum: ed0fa05c2b63ffcda14b63def5ea3c323a6a17282560f02b9cb8c9154fb1fcd3c20dd836deea64382e81088f4f74476022cbd24e422fa1e99e63863e06836f8c + languageName: node + linkType: hard + +"caseless@npm:~0.12.0": + version: 0.12.0 + resolution: "caseless@npm:0.12.0" + checksum: b43bd4c440aa1e8ee6baefee8063b4850fd0d7b378f6aabc796c9ec8cb26d27fb30b46885350777d9bd079c5256c0e1329ad0dc7c2817e0bb466810ebb353751 + languageName: node + linkType: hard + +"chalk@npm:^2.0.0, chalk@npm:^2.4.2": + version: 2.4.2 + resolution: "chalk@npm:2.4.2" + dependencies: + ansi-styles: ^3.2.1 + escape-string-regexp: ^1.0.5 + supports-color: ^5.3.0 + checksum: ec3661d38fe77f681200f878edbd9448821924e0f93a9cefc0e26a33b145f1027a2084bf19967160d11e1f03bfe4eaffcabf5493b89098b2782c3fe0b03d80c2 + languageName: node + linkType: hard + +"chalk@npm:^4.1.0, chalk@npm:^4.1.1": + version: 4.1.2 + resolution: "chalk@npm:4.1.2" + dependencies: + ansi-styles: ^4.1.0 + supports-color: ^7.1.0 + checksum: fe75c9d5c76a7a98d45495b91b2172fa3b7a09e0cc9370e5c8feb1c567b85c4288e2b3fded7cfdd7359ac28d6b3844feb8b82b8686842e93d23c827c417e83fc + languageName: node + linkType: hard + +"chardet@npm:^0.7.0": + version: 0.7.0 + resolution: "chardet@npm:0.7.0" + checksum: 6fd5da1f5d18ff5712c1e0aed41da200d7c51c28f11b36ee3c7b483f3696dabc08927fc6b227735eb8f0e1215c9a8abd8154637f3eff8cada5959df7f58b024d + languageName: node + linkType: hard + +"check-more-types@npm:^2.24.0": + version: 2.24.0 + resolution: "check-more-types@npm:2.24.0" + checksum: b09080ec3404d20a4b0ead828994b2e5913236ef44ed3033a27062af0004cf7d2091fbde4b396bf13b7ce02fb018bc9960b48305e6ab2304cd82d73ed7a51ef4 + languageName: node + linkType: hard + +"chokidar@npm:>=3.0.0 <4.0.0, chokidar@npm:^3.0.0, chokidar@npm:^3.5.1": + version: 3.5.2 + resolution: "chokidar@npm:3.5.2" + dependencies: + anymatch: ~3.1.2 + braces: ~3.0.2 + fsevents: ~2.3.2 + glob-parent: ~5.1.2 + is-binary-path: ~2.1.0 + is-glob: ~4.0.1 + normalize-path: ~3.0.0 + readdirp: ~3.6.0 + dependenciesMeta: + fsevents: + optional: true + checksum: d1fda32fcd67d9f6170a8468ad2630a3c6194949c9db3f6a91b16478c328b2800f433fb5d2592511b6cb145a47c013ea1cce60b432b1a001ae3ee978a8bffc2d + languageName: node + linkType: hard + +"chokidar@npm:^2.1.8": + version: 2.1.8 + resolution: "chokidar@npm:2.1.8" + dependencies: + anymatch: ^2.0.0 + async-each: ^1.0.1 + braces: ^2.3.2 + fsevents: ^1.2.7 + glob-parent: ^3.1.0 + inherits: ^2.0.3 + is-binary-path: ^1.0.0 + is-glob: ^4.0.0 + normalize-path: ^3.0.0 + path-is-absolute: ^1.0.0 + readdirp: ^2.2.1 + upath: ^1.1.1 + dependenciesMeta: + fsevents: + optional: true + checksum: 0c43e89cbf0268ef1e1f41ce8ec5233c7ba022c6f3282c2ef6530e351d42396d389a1148c5a040f291cf1f4083a4c6b2f51dad3f31c726442ea9a337de316bcf + languageName: node + linkType: hard + +"chownr@npm:^1.1.1": + version: 1.1.4 + resolution: "chownr@npm:1.1.4" + checksum: 115648f8eb38bac5e41c3857f3e663f9c39ed6480d1349977c4d96c95a47266fcacc5a5aabf3cb6c481e22d72f41992827db47301851766c4fd77ac21a4f081d + languageName: node + linkType: hard + +"chownr@npm:^2.0.0": + version: 2.0.0 + resolution: "chownr@npm:2.0.0" + checksum: c57cf9dd0791e2f18a5ee9c1a299ae6e801ff58fee96dc8bfd0dcb4738a6ce58dd252a3605b1c93c6418fe4f9d5093b28ffbf4d66648cb2a9c67eaef9679be2f + languageName: node + linkType: hard + +"chrome-trace-event@npm:^1.0.2": + version: 1.0.3 + resolution: "chrome-trace-event@npm:1.0.3" + checksum: cb8b1fc7e881aaef973bd0c4a43cd353c2ad8323fb471a041e64f7c2dd849cde4aad15f8b753331a32dda45c973f032c8a03b8177fc85d60eaa75e91e08bfb97 + languageName: node + linkType: hard + +"ci-info@npm:^3.1.1": + version: 3.2.0 + resolution: "ci-info@npm:3.2.0" + checksum: c68995a94e95ce3f233ff845e62dfc56f2e8ff1e3f5c1361bcdd520cbbc9726d8a54cbc1a685cb9ee19c3c5e71a1dade6dda23eb364b59b8e6c32508a9b761bc + languageName: node + linkType: hard + +"circular-dependency-plugin@npm:5.2.2": + version: 5.2.2 + resolution: "circular-dependency-plugin@npm:5.2.2" + peerDependencies: + webpack: ">=4.0.1" + checksum: d1a51e7f86e72d9e7a08c47234511cc7a5c3050781c2d6dcc77c0b22214f94f272702488c952e59b2af589c67944160ad1c9c0b7b3e0d4f89222f2a27ebf085e + languageName: node + linkType: hard + +"class-utils@npm:^0.3.5": + version: 0.3.6 + resolution: "class-utils@npm:0.3.6" + dependencies: + arr-union: ^3.1.0 + define-property: ^0.2.5 + isobject: ^3.0.0 + static-extend: ^0.1.1 + checksum: be108900801e639e50f96a7e4bfa8867c753a7750a7603879f3981f8b0a89cba657497a2d5f40cd4ea557ff15d535a100818bb486baf6e26fe5d7872e75f1078 + languageName: node + linkType: hard + +"clean-stack@npm:^2.0.0": + version: 2.2.0 + resolution: "clean-stack@npm:2.2.0" + checksum: 2ac8cd2b2f5ec986a3c743935ec85b07bc174d5421a5efc8017e1f146a1cf5f781ae962618f416352103b32c9cd7e203276e8c28241bbe946160cab16149fb68 + languageName: node + linkType: hard + +"cli-cursor@npm:^3.1.0": + version: 3.1.0 + resolution: "cli-cursor@npm:3.1.0" + dependencies: + restore-cursor: ^3.1.0 + checksum: 2692784c6cd2fd85cfdbd11f53aea73a463a6d64a77c3e098b2b4697a20443f430c220629e1ca3b195ea5ac4a97a74c2ee411f3807abf6df2b66211fec0c0a29 + languageName: node + linkType: hard + +"cli-spinners@npm:^2.5.0": + version: 2.6.0 + resolution: "cli-spinners@npm:2.6.0" + checksum: bc5d06af9f896e95d0c277e2a5ee0adc5876767decca6b3c22e212934b96033453268cb59be904eccb6d59119e57dbb3fc8ca9bdf5f8476506283b3dd8728748 + languageName: node + linkType: hard + +"cli-table3@npm:~0.6.0": + version: 0.6.0 + resolution: "cli-table3@npm:0.6.0" + dependencies: + colors: ^1.1.2 + object-assign: ^4.1.0 + string-width: ^4.2.0 + dependenciesMeta: + colors: + optional: true + checksum: 98682a2d3eef5ad07d34a08f90398d0640004e28ecf8eb59006436f11ed7b4d453db09f46c2ea880618fbd61fee66321b3b3ee1b20276bc708b6baf6f9663d75 + languageName: node + linkType: hard + +"cli-truncate@npm:^2.1.0": + version: 2.1.0 + resolution: "cli-truncate@npm:2.1.0" + dependencies: + slice-ansi: ^3.0.0 + string-width: ^4.2.0 + checksum: bf1e4e6195392dc718bf9cd71f317b6300dc4a9191d052f31046b8773230ece4fa09458813bf0e3455a5e68c0690d2ea2c197d14a8b85a7b5e01c97f4b5feb5d + languageName: node + linkType: hard + +"cli-width@npm:^3.0.0": + version: 3.0.0 + resolution: "cli-width@npm:3.0.0" + checksum: 4c94af3769367a70e11ed69aa6095f1c600c0ff510f3921ab4045af961820d57c0233acfa8b6396037391f31b4c397e1f614d234294f979ff61430a6c166c3f6 + languageName: node + linkType: hard + +"cliui@npm:^5.0.0": + version: 5.0.0 + resolution: "cliui@npm:5.0.0" + dependencies: + string-width: ^3.1.0 + strip-ansi: ^5.2.0 + wrap-ansi: ^5.1.0 + checksum: 0bb8779efe299b8f3002a73619eaa8add4081eb8d1c17bc4fedc6240557fb4eacdc08fe87c39b002eacb6cfc117ce736b362dbfd8bf28d90da800e010ee97df4 + languageName: node + linkType: hard + +"cliui@npm:^7.0.2": + version: 7.0.4 + resolution: "cliui@npm:7.0.4" + dependencies: + string-width: ^4.2.0 + strip-ansi: ^6.0.0 + wrap-ansi: ^7.0.0 + checksum: ce2e8f578a4813806788ac399b9e866297740eecd4ad1823c27fd344d78b22c5f8597d548adbcc46f0573e43e21e751f39446c5a5e804a12aace402b7a315d7f + languageName: node + linkType: hard + +"clone-deep@npm:^4.0.1": + version: 4.0.1 + resolution: "clone-deep@npm:4.0.1" + dependencies: + is-plain-object: ^2.0.4 + kind-of: ^6.0.2 + shallow-clone: ^3.0.0 + checksum: 770f912fe4e6f21873c8e8fbb1e99134db3b93da32df271d00589ea4a29dbe83a9808a322c93f3bcaf8584b8b4fa6fc269fc8032efbaa6728e0c9886c74467d2 + languageName: node + linkType: hard + +"clone@npm:^1.0.2": + version: 1.0.4 + resolution: "clone@npm:1.0.4" + checksum: d06418b7335897209e77bdd430d04f882189582e67bd1f75a04565f3f07f5b3f119a9d670c943b6697d0afb100f03b866b3b8a1f91d4d02d72c4ecf2bb64b5dd + languageName: node + linkType: hard + +"code-point-at@npm:^1.0.0": + version: 1.1.0 + resolution: "code-point-at@npm:1.1.0" + checksum: 17d5666611f9b16d64fdf48176d9b7fb1c7d1c1607a189f7e600040a11a6616982876af148230336adb7d8fe728a559f743a4e29db3747e3b1a32fa7f4529681 + languageName: node + linkType: hard + +"collection-visit@npm:^1.0.0": + version: 1.0.0 + resolution: "collection-visit@npm:1.0.0" + dependencies: + map-visit: ^1.0.0 + object-visit: ^1.0.0 + checksum: 15d9658fe6eb23594728346adad5433b86bb7a04fd51bbab337755158722f9313a5376ef479de5b35fbc54140764d0d39de89c339f5d25b959ed221466981da9 + languageName: node + linkType: hard + +"color-convert@npm:^1.9.0": + version: 1.9.3 + resolution: "color-convert@npm:1.9.3" + dependencies: + color-name: 1.1.3 + checksum: fd7a64a17cde98fb923b1dd05c5f2e6f7aefda1b60d67e8d449f9328b4e53b228a428fd38bfeaeb2db2ff6b6503a776a996150b80cdf224062af08a5c8a3a203 + languageName: node + linkType: hard + +"color-convert@npm:^2.0.1": + version: 2.0.1 + resolution: "color-convert@npm:2.0.1" + dependencies: + color-name: ~1.1.4 + checksum: 79e6bdb9fd479a205c71d89574fccfb22bd9053bd98c6c4d870d65c132e5e904e6034978e55b43d69fcaa7433af2016ee203ce76eeba9cfa554b373e7f7db336 + languageName: node + linkType: hard + +"color-name@npm:1.1.3": + version: 1.1.3 + resolution: "color-name@npm:1.1.3" + checksum: 09c5d3e33d2105850153b14466501f2bfb30324a2f76568a408763a3b7433b0e50e5b4ab1947868e65cb101bb7cb75029553f2c333b6d4b8138a73fcc133d69d + languageName: node + linkType: hard + +"color-name@npm:~1.1.4": + version: 1.1.4 + resolution: "color-name@npm:1.1.4" + checksum: b0445859521eb4021cd0fb0cc1a75cecf67fceecae89b63f62b201cca8d345baf8b952c966862a9d9a2632987d4f6581f0ec8d957dfacece86f0a7919316f610 + languageName: node + linkType: hard + +"colord@npm:^2.0.1, colord@npm:^2.6": + version: 2.7.0 + resolution: "colord@npm:2.7.0" + checksum: 8366539ab254c565926b2f80579d57dfc399aa7e0ffa823922d85defb342df03d61b3aab4ec71f4ad1cb1feb8f651e8dac3d1b0b7cdd8ca95abdd951a6bd974e + languageName: node + linkType: hard + +"colorette@npm:^1.2.1, colorette@npm:^1.2.2, colorette@npm:^1.3.0": + version: 1.3.0 + resolution: "colorette@npm:1.3.0" + checksum: bda403dfba4d032bee4169f2a6436a83ae3da488a53bcb3be92dc44ace056518245cc614b12429d7529493d6b090a119b2523b0d55e8cd6b81ad939a3003c008 + languageName: node + linkType: hard + +"colors@npm:^1.1.2, colors@npm:^1.4.0": + version: 1.4.0 + resolution: "colors@npm:1.4.0" + checksum: 98aa2c2418ad87dedf25d781be69dc5fc5908e279d9d30c34d8b702e586a0474605b3a189511482b9d5ed0d20c867515d22749537f7bc546256c6014f3ebdcec + languageName: node + linkType: hard + +"combined-stream@npm:^1.0.6, combined-stream@npm:~1.0.6": + version: 1.0.8 + resolution: "combined-stream@npm:1.0.8" + dependencies: + delayed-stream: ~1.0.0 + checksum: 49fa4aeb4916567e33ea81d088f6584749fc90c7abec76fd516bf1c5aa5c79f3584b5ba3de6b86d26ddd64bae5329c4c7479343250cfe71c75bb366eae53bb7c + languageName: node + linkType: hard + +"commander@npm:^2.20.0": + version: 2.20.3 + resolution: "commander@npm:2.20.3" + checksum: ab8c07884e42c3a8dbc5dd9592c606176c7eb5c1ca5ff274bcf907039b2c41de3626f684ea75ccf4d361ba004bbaff1f577d5384c155f3871e456bdf27becf9e + languageName: node + linkType: hard + +"commander@npm:^3.0.2": + version: 3.0.2 + resolution: "commander@npm:3.0.2" + checksum: 6d14ad030d1904428139487ed31febcb04c1604db2b8d9fae711f60ee6718828dc0e11602249e91c8a97b0e721e9c6d53edbc166bad3cde1596851d59a8f824d + languageName: node + linkType: hard + +"commander@npm:^5.1.0": + version: 5.1.0 + resolution: "commander@npm:5.1.0" + checksum: 0b7fec1712fbcc6230fcb161d8d73b4730fa91a21dc089515489402ad78810547683f058e2a9835929c212fead1d6a6ade70db28bbb03edbc2829a9ab7d69447 + languageName: node + linkType: hard + +"commander@npm:^7.2.0": + version: 7.2.0 + resolution: "commander@npm:7.2.0" + checksum: 53501cbeee61d5157546c0bef0fedb6cdfc763a882136284bed9a07225f09a14b82d2a84e7637edfd1a679fb35ed9502fd58ef1d091e6287f60d790147f68ddc + languageName: node + linkType: hard + +"common-tags@npm:^1.8.0": + version: 1.8.0 + resolution: "common-tags@npm:1.8.0" + checksum: fb0cc9420d149176f2bd2b1fc9e6df622cd34eccaca60b276aa3253a7c9241e8a8ed1ec0702b2679eba7e47aeef721869c686bbd7257b75b5c44993c8462cd7f + languageName: node + linkType: hard + +"commondir@npm:^1.0.1": + version: 1.0.1 + resolution: "commondir@npm:1.0.1" + checksum: 59715f2fc456a73f68826285718503340b9f0dd89bfffc42749906c5cf3d4277ef11ef1cca0350d0e79204f00f1f6d83851ececc9095dc88512a697ac0b9bdcb + languageName: node + linkType: hard + +"component-emitter@npm:^1.2.1, component-emitter@npm:~1.3.0": + version: 1.3.0 + resolution: "component-emitter@npm:1.3.0" + checksum: b3c46de38ffd35c57d1c02488355be9f218e582aec72d72d1b8bbec95a3ac1b38c96cd6e03ff015577e68f550fbb361a3bfdbd9bb248be9390b7b3745691be6b + languageName: node + linkType: hard + +"compressible@npm:~2.0.16": + version: 2.0.18 + resolution: "compressible@npm:2.0.18" + dependencies: + mime-db: ">= 1.43.0 < 2" + checksum: 58321a85b375d39230405654721353f709d0c1442129e9a17081771b816302a012471a9b8f4864c7dbe02eef7f2aaac3c614795197092262e94b409c9be108f0 + languageName: node + linkType: hard + +"compression@npm:^1.7.4": + version: 1.7.4 + resolution: "compression@npm:1.7.4" + dependencies: + accepts: ~1.3.5 + bytes: 3.0.0 + compressible: ~2.0.16 + debug: 2.6.9 + on-headers: ~1.0.2 + safe-buffer: 5.1.2 + vary: ~1.1.2 + checksum: 35c0f2eb1f28418978615dc1bc02075b34b1568f7f56c62d60f4214d4b7cc00d0f6d282b5f8a954f59872396bd770b6b15ffd8aa94c67d4bce9b8887b906999b + languageName: node + linkType: hard + +"concat-map@npm:0.0.1": + version: 0.0.1 + resolution: "concat-map@npm:0.0.1" + checksum: 902a9f5d8967a3e2faf138d5cb784b9979bad2e6db5357c5b21c568df4ebe62bcb15108af1b2253744844eb964fc023fbd9afbbbb6ddd0bcc204c6fb5b7bf3af + languageName: node + linkType: hard + +"connect-history-api-fallback@npm:^1.6.0": + version: 1.6.0 + resolution: "connect-history-api-fallback@npm:1.6.0" + checksum: 804ca2be28c999032ecd37a9f71405e5d7b7a4b3defcebbe41077bb8c5a0a150d7b59f51dcc33b2de30bc7e217a31d10f8cfad27e8e74c2fc7655eeba82d6e7e + languageName: node + linkType: hard + +"connect@npm:^3.7.0": + version: 3.7.0 + resolution: "connect@npm:3.7.0" + dependencies: + debug: 2.6.9 + finalhandler: 1.1.2 + parseurl: ~1.3.3 + utils-merge: 1.0.1 + checksum: 96e1c4effcf219b065c7823e57351c94366d2e2a6952fa95e8212bffb35c86f1d5a3f9f6c5796d4cd3a5fdda628368b1c3cc44bf19c66cfd68fe9f9cab9177e2 + languageName: node + linkType: hard + +"console-control-strings@npm:^1.0.0, console-control-strings@npm:~1.1.0": + version: 1.1.0 + resolution: "console-control-strings@npm:1.1.0" + checksum: 8755d76787f94e6cf79ce4666f0c5519906d7f5b02d4b884cf41e11dcd759ed69c57da0670afd9236d229a46e0f9cf519db0cd829c6dca820bb5a5c3def584ed + languageName: node + linkType: hard + +"content-disposition@npm:0.5.3": + version: 0.5.3 + resolution: "content-disposition@npm:0.5.3" + dependencies: + safe-buffer: 5.1.2 + checksum: 95bf164c0b0b8199d3f44b7631e51b37f683c6a90b9baa4315bd3d405a6d1bc81b7346f0981046aa004331fb3d7a28b629514d01fc209a5251573fc7e4d33380 + languageName: node + linkType: hard + +"content-type@npm:~1.0.4": + version: 1.0.4 + resolution: "content-type@npm:1.0.4" + checksum: 3d93585fda985d1554eca5ebd251994327608d2e200978fdbfba21c0c679914d5faf266d17027de44b34a72c7b0745b18584ecccaa7e1fdfb6a68ac7114f12e0 + languageName: node + linkType: hard + +"convert-source-map@npm:^1.5.1, convert-source-map@npm:^1.7.0": + version: 1.8.0 + resolution: "convert-source-map@npm:1.8.0" + dependencies: + safe-buffer: ~5.1.1 + checksum: 985d974a2d33e1a2543ada51c93e1ba2f73eaed608dc39f229afc78f71dcc4c8b7d7c684aa647e3c6a3a204027444d69e53e169ce94e8d1fa8d7dee80c9c8fed + languageName: node + linkType: hard + +"cookie-signature@npm:1.0.6": + version: 1.0.6 + resolution: "cookie-signature@npm:1.0.6" + checksum: f4e1b0a98a27a0e6e66fd7ea4e4e9d8e038f624058371bf4499cfcd8f3980be9a121486995202ba3fca74fbed93a407d6d54d43a43f96fd28d0bd7a06761591a + languageName: node + linkType: hard + +"cookie@npm:0.4.0": + version: 0.4.0 + resolution: "cookie@npm:0.4.0" + checksum: 760384ba0aef329c52523747e36a452b5e51bc49b34160363a6934e7b7df3f93fcc88b35e33450361535d40a92a96412da870e1816aba9aa6cc556a9fedd8492 + languageName: node + linkType: hard + +"cookie@npm:~0.4.1": + version: 0.4.1 + resolution: "cookie@npm:0.4.1" + checksum: bd7c47f5d94ab70ccdfe8210cde7d725880d2fcda06d8e375afbdd82de0c8d3b73541996e9ce57d35f67f672c4ee6d60208adec06b3c5fc94cebb85196084cf8 + languageName: node + linkType: hard + +"copy-anything@npm:^2.0.1": + version: 2.0.3 + resolution: "copy-anything@npm:2.0.3" + dependencies: + is-what: ^3.12.0 + checksum: 50f6423fa7e346416c18658fd253bfbe8783ff51c4f244a3c18c39693369cc7cb84cc9e4a4e109c0ab2f81e44eb345ce9ca8f0fb4b48f4aae3a396423912d60f + languageName: node + linkType: hard + +"copy-descriptor@npm:^0.1.0": + version: 0.1.1 + resolution: "copy-descriptor@npm:0.1.1" + checksum: d4b7b57b14f1d256bb9aa0b479241048afd7f5bcf22035fc7b94e8af757adeae247ea23c1a774fe44869fd5694efba4a969b88d966766c5245fdee59837fe45b + languageName: node + linkType: hard + +"copy-webpack-plugin@npm:9.0.1": + version: 9.0.1 + resolution: "copy-webpack-plugin@npm:9.0.1" + dependencies: + fast-glob: ^3.2.5 + glob-parent: ^6.0.0 + globby: ^11.0.3 + normalize-path: ^3.0.0 + p-limit: ^3.1.0 + schema-utils: ^3.0.0 + serialize-javascript: ^6.0.0 + peerDependencies: + webpack: ^5.1.0 + checksum: f3e69883e173f9a298b63dcf35ba5aafc02e252c67c236029424af19fb2e36fc93de94054bd7a9ada8b4cbcc4e96e9a3a269f972e4a45f4fd1b32a3d199d2cae + languageName: node + linkType: hard + +"core-js-compat@npm:^3.14.0, core-js-compat@npm:^3.15.0": + version: 3.16.4 + resolution: "core-js-compat@npm:3.16.4" + dependencies: + browserslist: ^4.16.8 + semver: 7.0.0 + checksum: 165736493ea73d4cb1f7bfe5733f2a1b9993de3bf9a453756176d91e503a67b42fe9d7c268907b11f4c1c2c87d659db5677cbc89f2503ac61dbfa70f5c88f957 + languageName: node + linkType: hard + +"core-js@npm:3.16.0": + version: 3.16.0 + resolution: "core-js@npm:3.16.0" + checksum: e215cf057fadd86e5386d8042c1bd0ddab1c7811d8f66d272c356ba9bae34c0897c3f5a80d19f93fd74cff832652354a0feb0c817234a066ae9177e28c6d865a + languageName: node + linkType: hard + +"core-util-is@npm:1.0.2, core-util-is@npm:~1.0.0": + version: 1.0.2 + resolution: "core-util-is@npm:1.0.2" + checksum: 7a4c925b497a2c91421e25bf76d6d8190f0b2359a9200dbeed136e63b2931d6294d3b1893eda378883ed363cd950f44a12a401384c609839ea616befb7927dab + languageName: node + linkType: hard + +"cors@npm:~2.8.5": + version: 2.8.5 + resolution: "cors@npm:2.8.5" + dependencies: + object-assign: ^4 + vary: ^1 + checksum: ced838404ccd184f61ab4fdc5847035b681c90db7ac17e428f3d81d69e2989d2b680cc254da0e2554f5ed4f8a341820a1ce3d1c16b499f6e2f47a1b9b07b5006 + languageName: node + linkType: hard + +"cosmiconfig@npm:^7.0.0": + version: 7.0.1 + resolution: "cosmiconfig@npm:7.0.1" + dependencies: + "@types/parse-json": ^4.0.0 + import-fresh: ^3.2.1 + parse-json: ^5.0.0 + path-type: ^4.0.0 + yaml: ^1.10.0 + checksum: 4be63e7117955fd88333d7460e4c466a90f556df6ef34efd59034d2463484e339666c41f02b523d574a797ec61f4a91918c5b89a316db2ea2f834e0d2d09465b + languageName: node + linkType: hard + +"create-require@npm:^1.1.0": + version: 1.1.1 + resolution: "create-require@npm:1.1.1" + checksum: a9a1503d4390d8b59ad86f4607de7870b39cad43d929813599a23714831e81c520bddf61bcdd1f8e30f05fd3a2b71ae8538e946eb2786dc65c2bbc520f692eff + languageName: node + linkType: hard + +"critters@npm:0.0.10": + version: 0.0.10 + resolution: "critters@npm:0.0.10" + dependencies: + chalk: ^4.1.0 + css: ^3.0.0 + parse5: ^6.0.1 + parse5-htmlparser2-tree-adapter: ^6.0.1 + pretty-bytes: ^5.3.0 + checksum: bd93269cf76ab0b9ccbcb15fee584c06b9cfe52a528db9aff2e139830cd1ac49153ff7b7223ce923a7724b0bc0728b3736d0fabfc91237ca6a787f7cc3443a28 + languageName: node + linkType: hard + +"critters@npm:0.0.12": + version: 0.0.12 + resolution: "critters@npm:0.0.12" + dependencies: + chalk: ^4.1.0 + css-select: ^4.1.3 + parse5: ^6.0.1 + parse5-htmlparser2-tree-adapter: ^6.0.1 + postcss: ^8.3.7 + pretty-bytes: ^5.3.0 + checksum: 3a4ce08a1342b0b580fe5413df5ff06d50aa4c7ab0681cfe1b1a3da50ccf6629296f7d66e65b847f1c0c8399c4838cc731eac6619da9c60b9a3478b5d176ab27 + languageName: node + linkType: hard + +"cross-spawn@npm:^6.0.0": + version: 6.0.5 + resolution: "cross-spawn@npm:6.0.5" + dependencies: + nice-try: ^1.0.4 + path-key: ^2.0.1 + semver: ^5.5.0 + shebang-command: ^1.2.0 + which: ^1.2.9 + checksum: f893bb0d96cd3d5751d04e67145bdddf25f99449531a72e82dcbbd42796bbc8268c1076c6b3ea51d4d455839902804b94bc45dfb37ecbb32ea8e54a6741c3ab9 + languageName: node + linkType: hard + +"cross-spawn@npm:^7.0.0": + version: 7.0.3 + resolution: "cross-spawn@npm:7.0.3" + dependencies: + path-key: ^3.1.0 + shebang-command: ^2.0.0 + which: ^2.0.1 + checksum: 671cc7c7288c3a8406f3c69a3ae2fc85555c04169e9d611def9a675635472614f1c0ed0ef80955d5b6d4e724f6ced67f0ad1bb006c2ea643488fcfef994d7f52 + languageName: node + linkType: hard + +"css-blank-pseudo@npm:^0.1.4": + version: 0.1.4 + resolution: "css-blank-pseudo@npm:0.1.4" + dependencies: + postcss: ^7.0.5 + bin: + css-blank-pseudo: cli.js + checksum: f995a6ca5dbb867af4b30c3dc872a8f0b27ad120442c34796eef7f9c4dcf014249522aaa0a2da3c101c4afa5d7d376436bb978ae1b2c02deddec283fad30c998 + languageName: node + linkType: hard + +"css-color-names@npm:^1.0.1": + version: 1.0.1 + resolution: "css-color-names@npm:1.0.1" + checksum: 7a3cdeb9e3311dc508c2f59872ba40b4c0af70304e942d638956fc4103afc3d62784c17aa8703ab42180653e0079734919a6c436143f12c8baf63035bb8d187d + languageName: node + linkType: hard + +"css-declaration-sorter@npm:^6.0.3": + version: 6.1.1 + resolution: "css-declaration-sorter@npm:6.1.1" + dependencies: + timsort: ^0.3.0 + peerDependencies: + postcss: ^8.0.9 + checksum: 161d1802d07e3d6cf4fbe5e29afc6b4c775901d6e6bfd2760a35f4c8a0347526fbb90be2f7c9b7594d0768d8775aee7dedc16bd0d0991642cd0005bbe054b957 + languageName: node + linkType: hard + +"css-has-pseudo@npm:^0.10.0": + version: 0.10.0 + resolution: "css-has-pseudo@npm:0.10.0" + dependencies: + postcss: ^7.0.6 + postcss-selector-parser: ^5.0.0-rc.4 + bin: + css-has-pseudo: cli.js + checksum: 88d891ba18f821e8a94d821ecdd723c606019462664c7d86e7d8731622bd26f9d55582e494bcc2a62f9399cc7b89049ddc8a9d1e8f1bf1a133c2427739d2d334 + languageName: node + linkType: hard + +"css-loader@npm:6.2.0": + version: 6.2.0 + resolution: "css-loader@npm:6.2.0" + dependencies: + icss-utils: ^5.1.0 + postcss: ^8.2.15 + postcss-modules-extract-imports: ^3.0.0 + postcss-modules-local-by-default: ^4.0.0 + postcss-modules-scope: ^3.0.0 + postcss-modules-values: ^4.0.0 + postcss-value-parser: ^4.1.0 + semver: ^7.3.5 + peerDependencies: + webpack: ^5.0.0 + checksum: 9c6e6e1eef7ab897ea1f45094a153ee82d94ef5248b54b8f8a3634c72900ec5f3cc463b3c0eca65290118c3dbfd52887ba7294b4807a0247a3c5d7cf3a63b2e6 + languageName: node + linkType: hard + +"css-minimizer-webpack-plugin@npm:3.0.2": + version: 3.0.2 + resolution: "css-minimizer-webpack-plugin@npm:3.0.2" + dependencies: + cssnano: ^5.0.6 + jest-worker: ^27.0.2 + p-limit: ^3.0.2 + postcss: ^8.3.5 + schema-utils: ^3.0.0 + serialize-javascript: ^6.0.0 + source-map: ^0.6.1 + peerDependencies: + webpack: ^5.0.0 + peerDependenciesMeta: + clean-css: + optional: true + csso: + optional: true + checksum: f4cacd46d4157d5005c9d3b5aa6bf60cd036ab10faae20cc1bdffb7153d2802473ef9f464d30098aad98f2205aee92b956c1f92c5da5a04f772ca9f17fd72dab + languageName: node + linkType: hard + +"css-parse@npm:~2.0.0": + version: 2.0.0 + resolution: "css-parse@npm:2.0.0" + dependencies: + css: ^2.0.0 + checksum: e6b23721364f6d7028538463f2388200430f32331fbbd8cd3b2c545e4b17a270594b74986aa1d6f2ad9dd206cbdad1c5e2331a16c06f4a7213f07494a32cca2b + languageName: node + linkType: hard + +"css-prefers-color-scheme@npm:^3.1.1": + version: 3.1.1 + resolution: "css-prefers-color-scheme@npm:3.1.1" + dependencies: + postcss: ^7.0.5 + bin: + css-prefers-color-scheme: cli.js + checksum: ba69a86b006818ffe3548bcbeb5e4e8139b8b6cf45815a3b3dddd12cd9acf3d8ac3b94e63fe0abd34e0683cf43ed8c2344e3bd472bbf02a6eb40c7bbf565d587 + languageName: node + linkType: hard + +"css-select@npm:^4.1.3": + version: 4.1.3 + resolution: "css-select@npm:4.1.3" + dependencies: + boolbase: ^1.0.0 + css-what: ^5.0.0 + domhandler: ^4.2.0 + domutils: ^2.6.0 + nth-check: ^2.0.0 + checksum: 40928f1aa6c71faf36430e7f26bcbb8ab51d07b98b754caacb71906400a195df5e6c7020a94f2982f02e52027b9bd57c99419220cf7020968c3415f14e4be5f8 + languageName: node + linkType: hard + +"css-tree@npm:^1.1.2, css-tree@npm:^1.1.3": + version: 1.1.3 + resolution: "css-tree@npm:1.1.3" + dependencies: + mdn-data: 2.0.14 + source-map: ^0.6.1 + checksum: 79f9b81803991b6977b7fcb1588799270438274d89066ce08f117f5cdb5e20019b446d766c61506dd772c839df84caa16042d6076f20c97187f5abe3b50e7d1f + languageName: node + linkType: hard + +"css-what@npm:^5.0.0": + version: 5.0.1 + resolution: "css-what@npm:5.0.1" + checksum: 7a3de33a1c130d32d711cce4e0fa747be7a9afe6b5f2c6f3d56bc2765f150f6034f5dd5fe263b9359a1c371c01847399602d74b55322c982742b336d998602cd + languageName: node + linkType: hard + +"css@npm:^2.0.0": + version: 2.2.4 + resolution: "css@npm:2.2.4" + dependencies: + inherits: ^2.0.3 + source-map: ^0.6.1 + source-map-resolve: ^0.5.2 + urix: ^0.1.0 + checksum: a35d483c5ccc04bcde3b1e7393d58ad3eee1dd6956df0f152de38e46a17c0ee193c30eec6b1e59831ad0e74599385732000e95987fcc9cb2b16c6d951bae49e1 + languageName: node + linkType: hard + +"css@npm:^3.0.0": + version: 3.0.0 + resolution: "css@npm:3.0.0" + dependencies: + inherits: ^2.0.4 + source-map: ^0.6.1 + source-map-resolve: ^0.6.0 + checksum: 4273ac816ddf99b99acb9c1d1a27d86d266a533cc01118369d941d8e8a78277a83cad3315e267a398c509d930fbb86504e193ea1ebc620a4a4212e06fe76e8be + languageName: node + linkType: hard + +"cssdb@npm:^4.4.0": + version: 4.4.0 + resolution: "cssdb@npm:4.4.0" + checksum: 521dd2135da1ab93612a4161eb1024cfc7b155a35d95f9867d328cc88ad57fdd959aa88ea8f4e6cea3a82bca91b76570dc1abb18bfd902c6889973956a03e497 + languageName: node + linkType: hard + +"cssesc@npm:^2.0.0": + version: 2.0.0 + resolution: "cssesc@npm:2.0.0" + bin: + cssesc: bin/cssesc + checksum: 5e50886c2aca3f492fe808dbd146d30eb1c6f31fbe6093979a8376e39d171d989279199f6f3f1a42464109e082e0e42bc33eeff9467fb69bf346f5ba5853c3c6 + languageName: node + linkType: hard + +"cssesc@npm:^3.0.0": + version: 3.0.0 + resolution: "cssesc@npm:3.0.0" + bin: + cssesc: bin/cssesc + checksum: f8c4ababffbc5e2ddf2fa9957dda1ee4af6048e22aeda1869d0d00843223c1b13ad3f5d88b51caa46c994225eacb636b764eb807a8883e2fb6f99b4f4e8c48b2 + languageName: node + linkType: hard + +"cssnano-preset-default@npm:^5.1.4": + version: 5.1.4 + resolution: "cssnano-preset-default@npm:5.1.4" + dependencies: + css-declaration-sorter: ^6.0.3 + cssnano-utils: ^2.0.1 + postcss-calc: ^8.0.0 + postcss-colormin: ^5.2.0 + postcss-convert-values: ^5.0.1 + postcss-discard-comments: ^5.0.1 + postcss-discard-duplicates: ^5.0.1 + postcss-discard-empty: ^5.0.1 + postcss-discard-overridden: ^5.0.1 + postcss-merge-longhand: ^5.0.2 + postcss-merge-rules: ^5.0.2 + postcss-minify-font-values: ^5.0.1 + postcss-minify-gradients: ^5.0.2 + postcss-minify-params: ^5.0.1 + postcss-minify-selectors: ^5.1.0 + postcss-normalize-charset: ^5.0.1 + postcss-normalize-display-values: ^5.0.1 + postcss-normalize-positions: ^5.0.1 + postcss-normalize-repeat-style: ^5.0.1 + postcss-normalize-string: ^5.0.1 + postcss-normalize-timing-functions: ^5.0.1 + postcss-normalize-unicode: ^5.0.1 + postcss-normalize-url: ^5.0.2 + postcss-normalize-whitespace: ^5.0.1 + postcss-ordered-values: ^5.0.2 + postcss-reduce-initial: ^5.0.1 + postcss-reduce-transforms: ^5.0.1 + postcss-svgo: ^5.0.2 + postcss-unique-selectors: ^5.0.1 + peerDependencies: + postcss: ^8.2.15 + checksum: feeed9e46988d4679f69db2ed858fb746331d035ac63527bdaa2910b875aaeef2903ac9de77d4cfecab0ca5f0b6be0ce8d9016d269d35f67cd19fa40beed71c4 + languageName: node + linkType: hard + +"cssnano-utils@npm:^2.0.1": + version: 2.0.1 + resolution: "cssnano-utils@npm:2.0.1" + peerDependencies: + postcss: ^8.2.15 + checksum: e27f7648fdb999667ba607fd8d56e28d4dbf4bf458c625fc84f460f70fa0fcd491991f309ca27cc0609a24fb3af49b3d0b9b205921e0edd7de57ca27048652e3 + languageName: node + linkType: hard + +"cssnano@npm:^5.0.6": + version: 5.0.8 + resolution: "cssnano@npm:5.0.8" + dependencies: + cssnano-preset-default: ^5.1.4 + is-resolvable: ^1.1.0 + lilconfig: ^2.0.3 + yaml: ^1.10.2 + peerDependencies: + postcss: ^8.2.15 + checksum: 18d6496accecf8aa428ed8ef27fbc41cd1c2cad26e64b335711fafd23b2d03d5854023d3fbfda7da9718e416ae94d6b38357df20a6289e1db1c422421d819684 + languageName: node + linkType: hard + +"csso@npm:^4.2.0": + version: 4.2.0 + resolution: "csso@npm:4.2.0" + dependencies: + css-tree: ^1.1.2 + checksum: 380ba9663da3bcea58dee358a0d8c4468bb6539be3c439dc266ac41c047217f52fd698fb7e4b6b6ccdfb8cf53ef4ceed8cc8ceccb8dfca2aa628319826b5b998 + languageName: node + linkType: hard + +"custom-event@npm:~1.0.0": + version: 1.0.1 + resolution: "custom-event@npm:1.0.1" + checksum: 334f48a6d5fb98df95c5f72cab2729417ffdcc74aebb1d51aa9220391bdee028ec36d9e19976a5a64f536e1e4aceb5bb4f0232d4761acc3e8fd74c54573959bd + languageName: node + linkType: hard + +"cypress@npm:8.3.0": + version: 8.3.0 + resolution: "cypress@npm:8.3.0" + dependencies: + "@cypress/request": ^2.88.5 + "@cypress/xvfb": ^1.2.4 + "@types/node": ^14.14.31 + "@types/sinonjs__fake-timers": ^6.0.2 + "@types/sizzle": ^2.3.2 + arch: ^2.2.0 + blob-util: ^2.0.2 + bluebird: ^3.7.2 + cachedir: ^2.3.0 + chalk: ^4.1.0 + check-more-types: ^2.24.0 + cli-cursor: ^3.1.0 + cli-table3: ~0.6.0 + commander: ^5.1.0 + common-tags: ^1.8.0 + dayjs: ^1.10.4 + debug: ^4.3.2 + enquirer: ^2.3.6 + eventemitter2: ^6.4.3 + execa: 4.1.0 + executable: ^4.1.1 + extract-zip: 2.0.1 + figures: ^3.2.0 + fs-extra: ^9.1.0 + getos: ^3.2.1 + is-ci: ^3.0.0 + is-installed-globally: ~0.4.0 + lazy-ass: ^1.6.0 + listr2: ^3.8.3 + lodash: ^4.17.21 + log-symbols: ^4.0.0 + minimist: ^1.2.5 + ospath: ^1.2.2 + pretty-bytes: ^5.6.0 + ramda: ~0.27.1 + request-progress: ^3.0.0 + supports-color: ^8.1.1 + tmp: ~0.2.1 + untildify: ^4.0.0 + url: ^0.11.0 + yauzl: ^2.10.0 + bin: + cypress: bin/cypress + checksum: acffc5ee3a347c3dc0989b43509f1d56ef2089aab6d8a2a8087f91dd93fd81d86939fa71a6df4a6690014385650e24599777bc5513c66ef7acfe34e6733dc4d6 + languageName: node + linkType: hard + +"dashdash@npm:^1.12.0": + version: 1.14.1 + resolution: "dashdash@npm:1.14.1" + dependencies: + assert-plus: ^1.0.0 + checksum: 3634c249570f7f34e3d34f866c93f866c5b417f0dd616275decae08147dcdf8fccfaa5947380ccfb0473998ea3a8057c0b4cd90c875740ee685d0624b2983598 + languageName: node + linkType: hard + +"date-format@npm:^2.1.0": + version: 2.1.0 + resolution: "date-format@npm:2.1.0" + checksum: ff2c80c76021a315409b6ce2f08997f6e4a61ae68042dbf2cefda450207712a804aa30ac52e235f3de495dc915842507249c74e4668659835cc4870892042394 + languageName: node + linkType: hard + +"date-format@npm:^3.0.0": + version: 3.0.0 + resolution: "date-format@npm:3.0.0" + checksum: 9e1d224460d27f28fd0ce9ae72790bfb850a0d71ce97926633968d5ff9a4c86a537ff288edbe60cd4549a3c35bf5ad3b930d57cd5d579ce9da0a7e71605bdd74 + languageName: node + linkType: hard + +"dayjs@npm:^1.10.4": + version: 1.10.6 + resolution: "dayjs@npm:1.10.6" + checksum: a79af6d19cf1e3aefc231e480037b37df50701e8d0cdbe1736fc6665b7045a159777215c5c8dd42ede7dd3c4c4f4a174d4ddd5bffca51df2a4ba0e0e25a6163c + languageName: node + linkType: hard + +"debug@npm:2.6.9, debug@npm:^2.2.0, debug@npm:^2.3.3": + version: 2.6.9 + resolution: "debug@npm:2.6.9" + dependencies: + ms: 2.0.0 + checksum: d2f51589ca66df60bf36e1fa6e4386b318c3f1e06772280eea5b1ae9fd3d05e9c2b7fd8a7d862457d00853c75b00451aa2d7459b924629ee385287a650f58fe6 + languageName: node + linkType: hard + +"debug@npm:4, debug@npm:4.3.2, debug@npm:^4.1.0, debug@npm:^4.1.1, debug@npm:^4.3.1, debug@npm:^4.3.2, debug@npm:~4.3.1": + version: 4.3.2 + resolution: "debug@npm:4.3.2" + dependencies: + ms: 2.1.2 + peerDependenciesMeta: + supports-color: + optional: true + checksum: 820ea160e267e23c953c9ed87e7ad93494d8cda2f7349af5e7e3bb236d23707ee3022f477d5a7d2ee86ef2bf7d60aa9ab22d1f58080d7deb9dccd073585e1e43 + languageName: node + linkType: hard + +"debug@npm:4.3.1": + version: 4.3.1 + resolution: "debug@npm:4.3.1" + dependencies: + ms: 2.1.2 + peerDependenciesMeta: + supports-color: + optional: true + checksum: 2c3352e37d5c46b0d203317cd45ea0e26b2c99f2d9dfec8b128e6ceba90dfb65425f5331bf3020fe9929d7da8c16758e737f4f3bfc0fce6b8b3d503bae03298b + languageName: node + linkType: hard + +"debug@npm:^3.1.0, debug@npm:^3.1.1, debug@npm:^3.2.6": + version: 3.2.7 + resolution: "debug@npm:3.2.7" + dependencies: + ms: ^2.1.1 + checksum: b3d8c5940799914d30314b7c3304a43305fd0715581a919dacb8b3176d024a782062368405b47491516d2091d6462d4d11f2f4974a405048094f8bfebfa3071c + languageName: node + linkType: hard + +"debug@npm:~3.1.0": + version: 3.1.0 + resolution: "debug@npm:3.1.0" + dependencies: + ms: 2.0.0 + checksum: 0b52718ab957254a5b3ca07fc34543bc778f358620c206a08452251eb7fc193c3ea3505072acbf4350219c14e2d71ceb7bdaa0d3370aa630b50da790458d08b3 + languageName: node + linkType: hard + +"decamelize@npm:^1.2.0": + version: 1.2.0 + resolution: "decamelize@npm:1.2.0" + checksum: ad8c51a7e7e0720c70ec2eeb1163b66da03e7616d7b98c9ef43cce2416395e84c1e9548dd94f5f6ffecfee9f8b94251fc57121a8b021f2ff2469b2bae247b8aa + languageName: node + linkType: hard + +"decode-uri-component@npm:^0.2.0": + version: 0.2.0 + resolution: "decode-uri-component@npm:0.2.0" + checksum: f3749344ab9305ffcfe4bfe300e2dbb61fc6359e2b736812100a3b1b6db0a5668cba31a05e4b45d4d63dbf1a18dfa354cd3ca5bb3ededddabb8cd293f4404f94 + languageName: node + linkType: hard + +"deep-equal@npm:^1.0.1": + version: 1.1.1 + resolution: "deep-equal@npm:1.1.1" + dependencies: + is-arguments: ^1.0.4 + is-date-object: ^1.0.1 + is-regex: ^1.0.4 + object-is: ^1.0.1 + object-keys: ^1.1.1 + regexp.prototype.flags: ^1.2.0 + checksum: f92686f2c5bcdf714a75a5fa7a9e47cb374a8ec9307e717b8d1ce61f56a75aaebf5619c2a12b8087a705b5a2f60d0292c35f8b58cb1f72e3268a3a15cab9f78d + languageName: node + linkType: hard + +"default-gateway@npm:^4.2.0": + version: 4.2.0 + resolution: "default-gateway@npm:4.2.0" + dependencies: + execa: ^1.0.0 + ip-regex: ^2.1.0 + checksum: 1f5be765471689c6bab33e0c8b87363c3e2485cc1ab78904d383a8a8293a79f684da2a3303744b112503f986af4ea87d917c63a468ed913e9b0c31588c02d6a4 + languageName: node + linkType: hard + +"defaults@npm:^1.0.3": + version: 1.0.3 + resolution: "defaults@npm:1.0.3" + dependencies: + clone: ^1.0.2 + checksum: 96e2112da6553d376afd5265ea7cbdb2a3b45535965d71ab8bb1da10c8126d168fdd5268799625324b368356d21ba2a7b3d4ec50961f11a47b7feb9de3d4413e + languageName: node + linkType: hard + +"define-lazy-prop@npm:^2.0.0": + version: 2.0.0 + resolution: "define-lazy-prop@npm:2.0.0" + checksum: 0115fdb065e0490918ba271d7339c42453d209d4cb619dfe635870d906731eff3e1ade8028bb461ea27ce8264ec5e22c6980612d332895977e89c1bbc80fcee2 + languageName: node + linkType: hard + +"define-properties@npm:^1.1.3": + version: 1.1.3 + resolution: "define-properties@npm:1.1.3" + dependencies: + object-keys: ^1.0.12 + checksum: da80dba55d0cd76a5a7ab71ef6ea0ebcb7b941f803793e4e0257b384cb772038faa0c31659d244e82c4342edef841c1a1212580006a05a5068ee48223d787317 + languageName: node + linkType: hard + +"define-property@npm:^0.2.5": + version: 0.2.5 + resolution: "define-property@npm:0.2.5" + dependencies: + is-descriptor: ^0.1.0 + checksum: 85af107072b04973b13f9e4128ab74ddfda48ec7ad2e54b193c0ffb57067c4ce5b7786a7b4ae1f24bd03e87c5d18766b094571810b314d7540f86d4354dbd394 + languageName: node + linkType: hard + +"define-property@npm:^1.0.0": + version: 1.0.0 + resolution: "define-property@npm:1.0.0" + dependencies: + is-descriptor: ^1.0.0 + checksum: 5fbed11dace44dd22914035ba9ae83ad06008532ca814d7936a53a09e897838acdad5b108dd0688cc8d2a7cf0681acbe00ee4136cf36743f680d10517379350a + languageName: node + linkType: hard + +"define-property@npm:^2.0.2": + version: 2.0.2 + resolution: "define-property@npm:2.0.2" + dependencies: + is-descriptor: ^1.0.2 + isobject: ^3.0.1 + checksum: 3217ed53fc9eed06ba8da6f4d33e28c68a82e2f2a8ab4d562c4920d8169a166fe7271453675e6c69301466f36a65d7f47edf0cf7f474b9aa52a5ead9c1b13c99 + languageName: node + linkType: hard + +"del@npm:^4.1.1": + version: 4.1.1 + resolution: "del@npm:4.1.1" + dependencies: + "@types/glob": ^7.1.1 + globby: ^6.1.0 + is-path-cwd: ^2.0.0 + is-path-in-cwd: ^2.0.0 + p-map: ^2.0.0 + pify: ^4.0.1 + rimraf: ^2.6.3 + checksum: 521f7da44bd79da841c06d573923d1f64f423aee8b8219c973478d3150ce1dcc024d03ad605929292adbff56d6448bca60d96dcdd2d8a53b46dbcb27e265c94b + languageName: node + linkType: hard + +"delayed-stream@npm:~1.0.0": + version: 1.0.0 + resolution: "delayed-stream@npm:1.0.0" + checksum: 46fe6e83e2cb1d85ba50bd52803c68be9bd953282fa7096f51fc29edd5d67ff84ff753c51966061e5ba7cb5e47ef6d36a91924eddb7f3f3483b1c560f77a0020 + languageName: node + linkType: hard + +"delegates@npm:^1.0.0": + version: 1.0.0 + resolution: "delegates@npm:1.0.0" + checksum: a51744d9b53c164ba9c0492471a1a2ffa0b6727451bdc89e31627fdf4adda9d51277cfcbfb20f0a6f08ccb3c436f341df3e92631a3440226d93a8971724771fd + languageName: node + linkType: hard + +"depd@npm:^1.1.2, depd@npm:~1.1.2": + version: 1.1.2 + resolution: "depd@npm:1.1.2" + checksum: 6b406620d269619852885ce15965272b829df6f409724415e0002c8632ab6a8c0a08ec1f0bd2add05dc7bd7507606f7e2cc034fa24224ab829580040b835ecd9 + languageName: node + linkType: hard + +"dependency-graph@npm:^0.11.0": + version: 0.11.0 + resolution: "dependency-graph@npm:0.11.0" + checksum: 477204beaa9be69e642bc31ffe7a8c383d0cf48fa27acbc91c5df01431ab913e65c154213d2ef83d034c98d77280743ec85e5da018a97a18dd43d3c0b78b28cd + languageName: node + linkType: hard + +"destroy@npm:~1.0.4": + version: 1.0.4 + resolution: "destroy@npm:1.0.4" + checksum: da9ab4961dc61677c709da0c25ef01733042614453924d65636a7db37308fef8a24cd1e07172e61173d471ca175371295fbc984b0af5b2b4ff47cd57bd784c03 + languageName: node + linkType: hard + +"detect-node@npm:^2.0.4": + version: 2.1.0 + resolution: "detect-node@npm:2.1.0" + checksum: 832184ec458353e41533ac9c622f16c19f7c02d8b10c303dfd3a756f56be93e903616c0bb2d4226183c9351c15fc0b3dba41a17a2308262afabcfa3776e6ae6e + languageName: node + linkType: hard + +"devtools-protocol@npm:0.0.901419": + version: 0.0.901419 + resolution: "devtools-protocol@npm:0.0.901419" + checksum: de68331ddfb35b828ad743d939d9237e122f76d4a6cbf1e64f6c6d8e9c2c5cc65a5f1994db0fead90192cca1aa9dbed2ea822a7da7b58104cd041a90e215b9a3 + languageName: node + linkType: hard + +"di@npm:^0.0.1": + version: 0.0.1 + resolution: "di@npm:0.0.1" + checksum: 3f09a99534d33e49264585db7f863ea8bc76c25c4d5a60df387c946018ecf1e1516b2c05a2092e5ca51fcdc08cefe609a6adc5253fa831626cb78cad4746505e + languageName: node + linkType: hard + +"diff@npm:^4.0.1": + version: 4.0.2 + resolution: "diff@npm:4.0.2" + checksum: f2c09b0ce4e6b301c221addd83bf3f454c0bc00caa3dd837cf6c127d6edf7223aa2bbe3b688feea110b7f262adbfc845b757c44c8a9f8c0c5b15d8fa9ce9d20d + languageName: node + linkType: hard + +"dijkstrajs@npm:^1.0.1": + version: 1.0.2 + resolution: "dijkstrajs@npm:1.0.2" + checksum: 8cd822441a26f190da24d69bfab7b433d080b09e069e41e046ac84e152f182a1ed9478d531b34126e000adaa7b73114a0f85fcac117a7d25b3edf302d57c0d09 + languageName: node + linkType: hard + +"dir-glob@npm:^3.0.1": + version: 3.0.1 + resolution: "dir-glob@npm:3.0.1" + dependencies: + path-type: ^4.0.0 + checksum: fa05e18324510d7283f55862f3161c6759a3f2f8dbce491a2fc14c8324c498286c54282c1f0e933cb930da8419b30679389499b919122952a4f8592362ef4615 + languageName: node + linkType: hard + +"dns-equal@npm:^1.0.0": + version: 1.0.0 + resolution: "dns-equal@npm:1.0.0" + checksum: a8471ac849c7c13824f053babea1bc26e2f359394dd5a460f8340d8abd13434be01e3327a5c59d212f8c8997817450efd3f3ac77bec709b21979cf0235644524 + languageName: node + linkType: hard + +"dns-packet@npm:^1.3.1": + version: 1.3.4 + resolution: "dns-packet@npm:1.3.4" + dependencies: + ip: ^1.1.0 + safe-buffer: ^5.0.1 + checksum: 7dd87f85cb4f9d1a99c03470730e3d9385e67dc94f6c13868c4034424a5378631e492f9f1fbc43d3c42f319fbbfe18b6488bb9527c32d34692c52bf1f5eedf69 + languageName: node + linkType: hard + +"dns-txt@npm:^2.0.2": + version: 2.0.2 + resolution: "dns-txt@npm:2.0.2" + dependencies: + buffer-indexof: ^1.0.0 + checksum: 80130b665379ecd991687ae079fbee25d091e03e4c4cef41e7643b977849ac48c2f56bfcb3727e53594d29029b833749811110d9f3fbee1b26a6e6f8096a5cef + languageName: node + linkType: hard + +"dom-serialize@npm:^2.2.1": + version: 2.2.1 + resolution: "dom-serialize@npm:2.2.1" + dependencies: + custom-event: ~1.0.0 + ent: ~2.2.0 + extend: ^3.0.0 + void-elements: ^2.0.0 + checksum: 48262e299a694dbfa32905ecceb29b89f2ce59adfc00cb676284f85ee0c8db0225e07961cbf9b06bf309291deebf52c958f855a5b6709d556000acf46d5a46ef + languageName: node + linkType: hard + +"dom-serializer@npm:^1.0.1": + version: 1.3.2 + resolution: "dom-serializer@npm:1.3.2" + dependencies: + domelementtype: ^2.0.1 + domhandler: ^4.2.0 + entities: ^2.0.0 + checksum: bff48714944d67b160db71ba244fb0f3fe72e77ef2ec8414e2eeb56f2d926e404a13456b8b83a5392e217ba47dec2ec0c368801b31481813e94d185276c3e964 + languageName: node + linkType: hard + +"domelementtype@npm:^2.0.1, domelementtype@npm:^2.2.0": + version: 2.2.0 + resolution: "domelementtype@npm:2.2.0" + checksum: 24cb386198640cd58aa36f8c987f2ea61859929106d06ffcc8f547e70cb2ed82a6dc56dcb8252b21fba1f1ea07df6e4356d60bfe57f77114ca1aed6828362629 + languageName: node + linkType: hard + +"domhandler@npm:^4.2.0": + version: 4.2.2 + resolution: "domhandler@npm:4.2.2" + dependencies: + domelementtype: ^2.2.0 + checksum: ad782fef984eca5a6fdd4ce70b90c38aff335ae4d6a51223ac82bd371b6674614efdcfff2dbb1126a7395634357906781f179e4ec028c7c578bb7f2beef8a4a5 + languageName: node + linkType: hard + +"domutils@npm:^2.6.0": + version: 2.8.0 + resolution: "domutils@npm:2.8.0" + dependencies: + dom-serializer: ^1.0.1 + domelementtype: ^2.2.0 + domhandler: ^4.2.0 + checksum: abf7434315283e9aadc2a24bac0e00eab07ae4313b40cc239f89d84d7315ebdfd2fb1b5bf750a96bc1b4403d7237c7b2ebf60459be394d625ead4ca89b934391 + languageName: node + linkType: hard + +"ecc-jsbn@npm:~0.1.1": + version: 0.1.2 + resolution: "ecc-jsbn@npm:0.1.2" + dependencies: + jsbn: ~0.1.0 + safer-buffer: ^2.1.0 + checksum: 22fef4b6203e5f31d425f5b711eb389e4c6c2723402e389af394f8411b76a488fa414d309d866e2b577ce3e8462d344205545c88a8143cc21752a5172818888a + languageName: node + linkType: hard + +"ee-first@npm:1.1.1": + version: 1.1.1 + resolution: "ee-first@npm:1.1.1" + checksum: 1b4cac778d64ce3b582a7e26b218afe07e207a0f9bfe13cc7395a6d307849cfe361e65033c3251e00c27dd060cab43014c2d6b2647676135e18b77d2d05b3f4f + languageName: node + linkType: hard + +"electron-to-chromium@npm:^1.3.811": + version: 1.3.823 + resolution: "electron-to-chromium@npm:1.3.823" + checksum: 00ff9d5e5e7590f46da5cc9e7e1703e48aa7eefda655395090a6773c2b5dce8aace59d755cca5fa7e374a668b26cfd50b629a5c3e30eafad4c4657391cb8a9d8 + languageName: node + linkType: hard + +"emoji-regex@npm:^7.0.1": + version: 7.0.3 + resolution: "emoji-regex@npm:7.0.3" + checksum: 9159b2228b1511f2870ac5920f394c7e041715429a68459ebe531601555f11ea782a8e1718f969df2711d38c66268174407cbca57ce36485544f695c2dfdc96e + languageName: node + linkType: hard + +"emoji-regex@npm:^8.0.0": + version: 8.0.0 + resolution: "emoji-regex@npm:8.0.0" + checksum: d4c5c39d5a9868b5fa152f00cada8a936868fd3367f33f71be515ecee4c803132d11b31a6222b2571b1e5f7e13890156a94880345594d0ce7e3c9895f560f192 + languageName: node + linkType: hard + +"emojis-list@npm:^3.0.0": + version: 3.0.0 + resolution: "emojis-list@npm:3.0.0" + checksum: ddaaa02542e1e9436c03970eeed445f4ed29a5337dfba0fe0c38dfdd2af5da2429c2a0821304e8a8d1cadf27fdd5b22ff793571fa803ae16852a6975c65e8e70 + languageName: node + linkType: hard + +"encodeurl@npm:~1.0.2": + version: 1.0.2 + resolution: "encodeurl@npm:1.0.2" + checksum: e50e3d508cdd9c4565ba72d2012e65038e5d71bdc9198cb125beb6237b5b1ade6c0d343998da9e170fb2eae52c1bed37d4d6d98a46ea423a0cddbed5ac3f780c + languageName: node + linkType: hard + +"encoding@npm:^0.1.12": + version: 0.1.13 + resolution: "encoding@npm:0.1.13" + dependencies: + iconv-lite: ^0.6.2 + checksum: bb98632f8ffa823996e508ce6a58ffcf5856330fde839ae42c9e1f436cc3b5cc651d4aeae72222916545428e54fd0f6aa8862fd8d25bdbcc4589f1e3f3715e7f + languageName: node + linkType: hard + +"end-of-stream@npm:^1.1.0, end-of-stream@npm:^1.4.1": + version: 1.4.4 + resolution: "end-of-stream@npm:1.4.4" + dependencies: + once: ^1.4.0 + checksum: 530a5a5a1e517e962854a31693dbb5c0b2fc40b46dad2a56a2deec656ca040631124f4795823acc68238147805f8b021abbe221f4afed5ef3c8e8efc2024908b + languageName: node + linkType: hard + +"engine.io-parser@npm:~4.0.0": + version: 4.0.3 + resolution: "engine.io-parser@npm:4.0.3" + dependencies: + base64-arraybuffer: 0.1.4 + checksum: 9e2db35acb6f2e8269a7c5cd8ca40d1cd7277e5c6472e7341d0f85a8d09a6788427c1f55cc5a8fa4a44213d89d2bd2494f230d0624605d88f7aae32651a3c44b + languageName: node + linkType: hard + +"engine.io@npm:~4.1.0": + version: 4.1.1 + resolution: "engine.io@npm:4.1.1" + dependencies: + accepts: ~1.3.4 + base64id: 2.0.0 + cookie: ~0.4.1 + cors: ~2.8.5 + debug: ~4.3.1 + engine.io-parser: ~4.0.0 + ws: ~7.4.2 + checksum: 773fc7be6ecc2b8af95f72e6371feaa44957e481e175e614513a92307b55a33fa779d491a918af7f9071c11ad36fd52133b44d09c996baca88b5524d934ce4f7 + languageName: node + linkType: hard + +"enhanced-resolve@npm:^5.8.0": + version: 5.8.2 + resolution: "enhanced-resolve@npm:5.8.2" + dependencies: + graceful-fs: ^4.2.4 + tapable: ^2.2.0 + checksum: 6e871ec5b183220dbcdaff8580cbdacee5425e321790e5846abd1b573d20d2bcb37f73ee983fd10c6d6878d31a2d08e234e72fc91a81236d64623ee6ba7d6611 + languageName: node + linkType: hard + +"enhanced-resolve@npm:^5.8.3": + version: 5.8.3 + resolution: "enhanced-resolve@npm:5.8.3" + dependencies: + graceful-fs: ^4.2.4 + tapable: ^2.2.0 + checksum: d79fbe531106448b768bb0673fb623ec0202d7ee70373ab7d4f4745d5dfe0806f38c9db7e7da8c941288fe475ab3d538db3791fce522056eeea40ca398c9e287 + languageName: node + linkType: hard + +"enquirer@npm:^2.3.6": + version: 2.3.6 + resolution: "enquirer@npm:2.3.6" + dependencies: + ansi-colors: ^4.1.1 + checksum: 1c0911e14a6f8d26721c91e01db06092a5f7675159f0261d69c403396a385afd13dd76825e7678f66daffa930cfaa8d45f506fb35f818a2788463d022af1b884 + languageName: node + linkType: hard + +"ent@npm:~2.2.0": + version: 2.2.0 + resolution: "ent@npm:2.2.0" + checksum: f588b5707d6fef36011ea10d530645912a69530a1eb0831f8708c498ac028363a7009f45cfadd28ceb4dafd9ac17ec15213f88d09ce239cd033cfe1328dd7d7d + languageName: node + linkType: hard + +"entities@npm:^2.0.0": + version: 2.2.0 + resolution: "entities@npm:2.2.0" + checksum: 19010dacaf0912c895ea262b4f6128574f9ccf8d4b3b65c7e8334ad0079b3706376360e28d8843ff50a78aabcb8f08f0a32dbfacdc77e47ed77ca08b713669b3 + languageName: node + linkType: hard + +"env-paths@npm:^2.2.0": + version: 2.2.1 + resolution: "env-paths@npm:2.2.1" + checksum: 65b5df55a8bab92229ab2b40dad3b387fad24613263d103a97f91c9fe43ceb21965cd3392b1ccb5d77088021e525c4e0481adb309625d0cb94ade1d1fb8dc17e + languageName: node + linkType: hard + +"err-code@npm:^2.0.2": + version: 2.0.3 + resolution: "err-code@npm:2.0.3" + checksum: 8b7b1be20d2de12d2255c0bc2ca638b7af5171142693299416e6a9339bd7d88fc8d7707d913d78e0993176005405a236b066b45666b27b797252c771156ace54 + languageName: node + linkType: hard + +"errno@npm:^0.1.1, errno@npm:^0.1.3": + version: 0.1.8 + resolution: "errno@npm:0.1.8" + dependencies: + prr: ~1.0.1 + bin: + errno: cli.js + checksum: 1271f7b9fbb3bcbec76ffde932485d1e3561856d21d847ec613a9722ee924cdd4e523a62dc71a44174d91e898fe21fdc8d5b50823f4b5e0ce8c35c8271e6ef4a + languageName: node + linkType: hard + +"error-ex@npm:^1.3.1": + version: 1.3.2 + resolution: "error-ex@npm:1.3.2" + dependencies: + is-arrayish: ^0.2.1 + checksum: c1c2b8b65f9c91b0f9d75f0debaa7ec5b35c266c2cac5de412c1a6de86d4cbae04ae44e510378cb14d032d0645a36925d0186f8bb7367bcc629db256b743a001 + languageName: node + linkType: hard + +"es-module-lexer@npm:^0.7.1": + version: 0.7.1 + resolution: "es-module-lexer@npm:0.7.1" + checksum: c66fb633cc521529862818caf603897d58d30442c885a1a1ed16823ddbbb8a437e3952454a4b2650242df1c1b4d0efa42fedbe49594e3ef2ceb3c891cf1211dd + languageName: node + linkType: hard + +"es-module-lexer@npm:^0.9.0": + version: 0.9.3 + resolution: "es-module-lexer@npm:0.9.3" + checksum: 84bbab23c396281db2c906c766af58b1ae2a1a2599844a504df10b9e8dc77ec800b3211fdaa133ff700f5703d791198807bba25d9667392d27a5e9feda344da8 + languageName: node + linkType: hard + +"esbuild-android-arm64@npm:0.13.8": + version: 0.13.8 + resolution: "esbuild-android-arm64@npm:0.13.8" + conditions: os=android & cpu=arm64 + languageName: node + linkType: hard + +"esbuild-darwin-64@npm:0.13.8": + version: 0.13.8 + resolution: "esbuild-darwin-64@npm:0.13.8" + conditions: os=darwin & cpu=x64 + languageName: node + linkType: hard + +"esbuild-darwin-arm64@npm:0.13.8": + version: 0.13.8 + resolution: "esbuild-darwin-arm64@npm:0.13.8" + conditions: os=darwin & cpu=arm64 + languageName: node + linkType: hard + +"esbuild-freebsd-64@npm:0.13.8": + version: 0.13.8 + resolution: "esbuild-freebsd-64@npm:0.13.8" + conditions: os=freebsd & cpu=x64 + languageName: node + linkType: hard + +"esbuild-freebsd-arm64@npm:0.13.8": + version: 0.13.8 + resolution: "esbuild-freebsd-arm64@npm:0.13.8" + conditions: os=freebsd & cpu=arm64 + languageName: node + linkType: hard + +"esbuild-linux-32@npm:0.13.8": + version: 0.13.8 + resolution: "esbuild-linux-32@npm:0.13.8" + conditions: os=linux & cpu=ia32 + languageName: node + linkType: hard + +"esbuild-linux-64@npm:0.13.8": + version: 0.13.8 + resolution: "esbuild-linux-64@npm:0.13.8" + conditions: os=linux & cpu=x64 + languageName: node + linkType: hard + +"esbuild-linux-arm64@npm:0.13.8": + version: 0.13.8 + resolution: "esbuild-linux-arm64@npm:0.13.8" + conditions: os=linux & cpu=arm64 + languageName: node + linkType: hard + +"esbuild-linux-arm@npm:0.13.8": + version: 0.13.8 + resolution: "esbuild-linux-arm@npm:0.13.8" + conditions: os=linux & cpu=arm + languageName: node + linkType: hard + +"esbuild-linux-mips64le@npm:0.13.8": + version: 0.13.8 + resolution: "esbuild-linux-mips64le@npm:0.13.8" + conditions: os=linux & cpu=mips64el + languageName: node + linkType: hard + +"esbuild-linux-ppc64le@npm:0.13.8": + version: 0.13.8 + resolution: "esbuild-linux-ppc64le@npm:0.13.8" + conditions: os=linux & cpu=ppc64 + languageName: node + linkType: hard + +"esbuild-netbsd-64@npm:0.13.8": + version: 0.13.8 + resolution: "esbuild-netbsd-64@npm:0.13.8" + conditions: os=netbsd & cpu=x64 + languageName: node + linkType: hard + +"esbuild-openbsd-64@npm:0.13.8": + version: 0.13.8 + resolution: "esbuild-openbsd-64@npm:0.13.8" + conditions: os=openbsd & cpu=x64 + languageName: node + linkType: hard + +"esbuild-sunos-64@npm:0.13.8": + version: 0.13.8 + resolution: "esbuild-sunos-64@npm:0.13.8" + conditions: os=sunos & cpu=x64 + languageName: node + linkType: hard + +"esbuild-wasm@npm:0.13.8": + version: 0.13.8 + resolution: "esbuild-wasm@npm:0.13.8" + bin: + esbuild: bin/esbuild + checksum: a60bb7e2fb9eae3194074d82c4443639d5aba71bb89c2f1a1a2f766d912160b55d32547d02901cbb53549f27f54250413e67ef335498d61570a86f2e69767ddf + languageName: node + linkType: hard + +"esbuild-windows-32@npm:0.13.8": + version: 0.13.8 + resolution: "esbuild-windows-32@npm:0.13.8" + conditions: os=win32 & cpu=ia32 + languageName: node + linkType: hard + +"esbuild-windows-64@npm:0.13.8": + version: 0.13.8 + resolution: "esbuild-windows-64@npm:0.13.8" + conditions: os=win32 & cpu=x64 + languageName: node + linkType: hard + +"esbuild-windows-arm64@npm:0.13.8": + version: 0.13.8 + resolution: "esbuild-windows-arm64@npm:0.13.8" + conditions: os=win32 & cpu=arm64 + languageName: node + linkType: hard + +"esbuild@npm:0.12.17": + version: 0.12.17 + resolution: "esbuild@npm:0.12.17" + bin: + esbuild: bin/esbuild + checksum: 9c0c230470a1daa7e1e623bbbf24c8d15187406b862a82258a7df2c3db59bc1f04b5889b50ac940b7b2b3c43dac13e675181a60e828fc39c0288f5c6ccccfec0 + languageName: node + linkType: hard + +"esbuild@npm:0.13.8": + version: 0.13.8 + resolution: "esbuild@npm:0.13.8" + dependencies: + esbuild-android-arm64: 0.13.8 + esbuild-darwin-64: 0.13.8 + esbuild-darwin-arm64: 0.13.8 + esbuild-freebsd-64: 0.13.8 + esbuild-freebsd-arm64: 0.13.8 + esbuild-linux-32: 0.13.8 + esbuild-linux-64: 0.13.8 + esbuild-linux-arm: 0.13.8 + esbuild-linux-arm64: 0.13.8 + esbuild-linux-mips64le: 0.13.8 + esbuild-linux-ppc64le: 0.13.8 + esbuild-netbsd-64: 0.13.8 + esbuild-openbsd-64: 0.13.8 + esbuild-sunos-64: 0.13.8 + esbuild-windows-32: 0.13.8 + esbuild-windows-64: 0.13.8 + esbuild-windows-arm64: 0.13.8 + dependenciesMeta: + esbuild-android-arm64: + optional: true + esbuild-darwin-64: + optional: true + esbuild-darwin-arm64: + optional: true + esbuild-freebsd-64: + optional: true + esbuild-freebsd-arm64: + optional: true + esbuild-linux-32: + optional: true + esbuild-linux-64: + optional: true + esbuild-linux-arm: + optional: true + esbuild-linux-arm64: + optional: true + esbuild-linux-mips64le: + optional: true + esbuild-linux-ppc64le: + optional: true + esbuild-netbsd-64: + optional: true + esbuild-openbsd-64: + optional: true + esbuild-sunos-64: + optional: true + esbuild-windows-32: + optional: true + esbuild-windows-64: + optional: true + esbuild-windows-arm64: + optional: true + bin: + esbuild: bin/esbuild + checksum: 239b48f26af525236d96385a0854eb86886581d503eee81c18d189cc8d099ff182fc0de9b14c4328fd146ca3ec506efa5d011c95c6af2dd7011cb0b225dfd140 + languageName: node + linkType: hard + +"escalade@npm:^3.1.1": + version: 3.1.1 + resolution: "escalade@npm:3.1.1" + checksum: a3e2a99f07acb74b3ad4989c48ca0c3140f69f923e56d0cba0526240ee470b91010f9d39001f2a4a313841d237ede70a729e92125191ba5d21e74b106800b133 + languageName: node + linkType: hard + +"escape-html@npm:~1.0.3": + version: 1.0.3 + resolution: "escape-html@npm:1.0.3" + checksum: 6213ca9ae00d0ab8bccb6d8d4e0a98e76237b2410302cf7df70aaa6591d509a2a37ce8998008cbecae8fc8ffaadf3fb0229535e6a145f3ce0b211d060decbb24 + languageName: node + linkType: hard + +"escape-string-regexp@npm:^1.0.5": + version: 1.0.5 + resolution: "escape-string-regexp@npm:1.0.5" + checksum: 6092fda75c63b110c706b6a9bfde8a612ad595b628f0bd2147eea1d3406723020810e591effc7db1da91d80a71a737a313567c5abb3813e8d9c71f4aa595b410 + languageName: node + linkType: hard + +"eslint-scope@npm:5.1.1": + version: 5.1.1 + resolution: "eslint-scope@npm:5.1.1" + dependencies: + esrecurse: ^4.3.0 + estraverse: ^4.1.1 + checksum: 47e4b6a3f0cc29c7feedee6c67b225a2da7e155802c6ea13bbef4ac6b9e10c66cd2dcb987867ef176292bf4e64eccc680a49e35e9e9c669f4a02bac17e86abdb + languageName: node + linkType: hard + +"esrecurse@npm:^4.3.0": + version: 4.3.0 + resolution: "esrecurse@npm:4.3.0" + dependencies: + estraverse: ^5.2.0 + checksum: ebc17b1a33c51cef46fdc28b958994b1dc43cd2e86237515cbc3b4e5d2be6a811b2315d0a1a4d9d340b6d2308b15322f5c8291059521cc5f4802f65e7ec32837 + languageName: node + linkType: hard + +"estraverse@npm:^4.1.1": + version: 4.3.0 + resolution: "estraverse@npm:4.3.0" + checksum: a6299491f9940bb246124a8d44b7b7a413a8336f5436f9837aaa9330209bd9ee8af7e91a654a3545aee9c54b3308e78ee360cef1d777d37cfef77d2fa33b5827 + languageName: node + linkType: hard + +"estraverse@npm:^5.2.0": + version: 5.2.0 + resolution: "estraverse@npm:5.2.0" + checksum: ec11b70d946bf5d7f76f91db38ef6f08109ac1b36cda293a26e678e58df4719f57f67b9ec87042afdd1f0267cee91865be3aa48d2161765a93defab5431be7b8 + languageName: node + linkType: hard + +"esutils@npm:^2.0.2": + version: 2.0.3 + resolution: "esutils@npm:2.0.3" + checksum: 22b5b08f74737379a840b8ed2036a5fb35826c709ab000683b092d9054e5c2a82c27818f12604bfc2a9a76b90b6834ef081edbc1c7ae30d1627012e067c6ec87 + languageName: node + linkType: hard + +"etag@npm:~1.8.1": + version: 1.8.1 + resolution: "etag@npm:1.8.1" + checksum: 571aeb3dbe0f2bbd4e4fadbdb44f325fc75335cd5f6f6b6a091e6a06a9f25ed5392f0863c5442acb0646787446e816f13cbfc6edce5b07658541dff573cab1ff + languageName: node + linkType: hard + +"eventemitter-asyncresource@npm:^1.0.0": + version: 1.0.0 + resolution: "eventemitter-asyncresource@npm:1.0.0" + checksum: 3cfbbc3490bd429a165bff6336289ff810f7df214796f25000d2097a5a0883eae51542a78674916ff99bbd4c66811911b310df1cb4fc96dfc9546ba9dfc89f8f + languageName: node + linkType: hard + +"eventemitter2@npm:^6.4.3": + version: 6.4.4 + resolution: "eventemitter2@npm:6.4.4" + checksum: b5e707039973d5a770bc4c64255604df66df3a1f63389dccb7118af163b9f790ca7596463d7868426339301ad9de5ef1c3f4a9c7ac3b93874c5ca792916dede1 + languageName: node + linkType: hard + +"eventemitter3@npm:^4.0.0": + version: 4.0.7 + resolution: "eventemitter3@npm:4.0.7" + checksum: 1875311c42fcfe9c707b2712c32664a245629b42bb0a5a84439762dd0fd637fc54d078155ea83c2af9e0323c9ac13687e03cfba79b03af9f40c89b4960099374 + languageName: node + linkType: hard + +"events@npm:^3.2.0": + version: 3.3.0 + resolution: "events@npm:3.3.0" + checksum: f6f487ad2198aa41d878fa31452f1a3c00958f46e9019286ff4787c84aac329332ab45c9cdc8c445928fc6d7ded294b9e005a7fce9426488518017831b272780 + languageName: node + linkType: hard + +"eventsource@npm:^1.0.7": + version: 1.1.0 + resolution: "eventsource@npm:1.1.0" + dependencies: + original: ^1.0.0 + checksum: 78338b7e75ec471cb793efb3319e0c4d2bf00fb638a2e3f888ad6d98cd1e3d4492a29f554c0921c7b2ac5130c3a732a1a0056739f6e2f548d714aec685e5da7e + languageName: node + linkType: hard + +"execa@npm:4.1.0": + version: 4.1.0 + resolution: "execa@npm:4.1.0" + dependencies: + cross-spawn: ^7.0.0 + get-stream: ^5.0.0 + human-signals: ^1.1.1 + is-stream: ^2.0.0 + merge-stream: ^2.0.0 + npm-run-path: ^4.0.0 + onetime: ^5.1.0 + signal-exit: ^3.0.2 + strip-final-newline: ^2.0.0 + checksum: e30d298934d9c52f90f3847704fd8224e849a081ab2b517bbc02f5f7732c24e56a21f14cb96a08256deffeb2d12b2b7cb7e2b014a12fb36f8d3357e06417ed55 + languageName: node + linkType: hard + +"execa@npm:^1.0.0": + version: 1.0.0 + resolution: "execa@npm:1.0.0" + dependencies: + cross-spawn: ^6.0.0 + get-stream: ^4.0.0 + is-stream: ^1.1.0 + npm-run-path: ^2.0.0 + p-finally: ^1.0.0 + signal-exit: ^3.0.0 + strip-eof: ^1.0.0 + checksum: ddf1342c1c7d02dd93b41364cd847640f6163350d9439071abf70bf4ceb1b9b2b2e37f54babb1d8dc1df8e0d8def32d0e81e74a2e62c3e1d70c303eb4c306bc4 + languageName: node + linkType: hard + +"executable@npm:^4.1.1": + version: 4.1.1 + resolution: "executable@npm:4.1.1" + dependencies: + pify: ^2.2.0 + checksum: f01927ce59bccec804e171bf859a26e362c1f50aa9ebc69f7cafdcce3859d29d4b6267fd47237c18b0a1830614bd3f0ee14b7380d9bad18a4e7af9b5f0b6984f + languageName: node + linkType: hard + +"expand-brackets@npm:^2.1.4": + version: 2.1.4 + resolution: "expand-brackets@npm:2.1.4" + dependencies: + debug: ^2.3.3 + define-property: ^0.2.5 + extend-shallow: ^2.0.1 + posix-character-classes: ^0.1.0 + regex-not: ^1.0.0 + snapdragon: ^0.8.1 + to-regex: ^3.0.1 + checksum: 1781d422e7edfa20009e2abda673cadb040a6037f0bd30fcd7357304f4f0c284afd420d7622722ca4a016f39b6d091841ab57b401c1f7e2e5131ac65b9f14fa1 + languageName: node + linkType: hard + +"express@npm:^4.17.1": + version: 4.17.1 + resolution: "express@npm:4.17.1" + dependencies: + accepts: ~1.3.7 + array-flatten: 1.1.1 + body-parser: 1.19.0 + content-disposition: 0.5.3 + content-type: ~1.0.4 + cookie: 0.4.0 + cookie-signature: 1.0.6 + debug: 2.6.9 + depd: ~1.1.2 + encodeurl: ~1.0.2 + escape-html: ~1.0.3 + etag: ~1.8.1 + finalhandler: ~1.1.2 + fresh: 0.5.2 + merge-descriptors: 1.0.1 + methods: ~1.1.2 + on-finished: ~2.3.0 + parseurl: ~1.3.3 + path-to-regexp: 0.1.7 + proxy-addr: ~2.0.5 + qs: 6.7.0 + range-parser: ~1.2.1 + safe-buffer: 5.1.2 + send: 0.17.1 + serve-static: 1.14.1 + setprototypeof: 1.1.1 + statuses: ~1.5.0 + type-is: ~1.6.18 + utils-merge: 1.0.1 + vary: ~1.1.2 + checksum: d964e9e17af331ea6fa2f84999b063bc47189dd71b4a735df83f9126d3bb2b92e830f1cb1d7c2742530eb625e2689d7a9a9c71f0c3cc4dd6015c3cd32a01abd5 + languageName: node + linkType: hard + +"extend-shallow@npm:^2.0.1": + version: 2.0.1 + resolution: "extend-shallow@npm:2.0.1" + dependencies: + is-extendable: ^0.1.0 + checksum: 8fb58d9d7a511f4baf78d383e637bd7d2e80843bd9cd0853649108ea835208fb614da502a553acc30208e1325240bb7cc4a68473021612496bb89725483656d8 + languageName: node + linkType: hard + +"extend-shallow@npm:^3.0.0, extend-shallow@npm:^3.0.2": + version: 3.0.2 + resolution: "extend-shallow@npm:3.0.2" + dependencies: + assign-symbols: ^1.0.0 + is-extendable: ^1.0.1 + checksum: a920b0cd5838a9995ace31dfd11ab5e79bf6e295aa566910ce53dff19f4b1c0fda2ef21f26b28586c7a2450ca2b42d97bd8c0f5cec9351a819222bf861e02461 + languageName: node + linkType: hard + +"extend@npm:^3.0.0, extend@npm:~3.0.2": + version: 3.0.2 + resolution: "extend@npm:3.0.2" + checksum: a50a8309ca65ea5d426382ff09f33586527882cf532931cb08ca786ea3146c0553310bda688710ff61d7668eba9f96b923fe1420cdf56a2c3eaf30fcab87b515 + languageName: node + linkType: hard + +"external-editor@npm:^3.0.3": + version: 3.1.0 + resolution: "external-editor@npm:3.1.0" + dependencies: + chardet: ^0.7.0 + iconv-lite: ^0.4.24 + tmp: ^0.0.33 + checksum: 1c2a616a73f1b3435ce04030261bed0e22d4737e14b090bb48e58865da92529c9f2b05b893de650738d55e692d071819b45e1669259b2b354bc3154d27a698c7 + languageName: node + linkType: hard + +"extglob@npm:^2.0.4": + version: 2.0.4 + resolution: "extglob@npm:2.0.4" + dependencies: + array-unique: ^0.3.2 + define-property: ^1.0.0 + expand-brackets: ^2.1.4 + extend-shallow: ^2.0.1 + fragment-cache: ^0.2.1 + regex-not: ^1.0.0 + snapdragon: ^0.8.1 + to-regex: ^3.0.1 + checksum: a41531b8934735b684cef5e8c5a01d0f298d7d384500ceca38793a9ce098125aab04ee73e2d75d5b2901bc5dddd2b64e1b5e3bf19139ea48bac52af4a92f1d00 + languageName: node + linkType: hard + +"extract-zip@npm:2.0.1": + version: 2.0.1 + resolution: "extract-zip@npm:2.0.1" + dependencies: + "@types/yauzl": ^2.9.1 + debug: ^4.1.1 + get-stream: ^5.1.0 + yauzl: ^2.10.0 + dependenciesMeta: + "@types/yauzl": + optional: true + bin: + extract-zip: cli.js + checksum: 8cbda9debdd6d6980819cc69734d874ddd71051c9fe5bde1ef307ebcedfe949ba57b004894b585f758b7c9eeeea0e3d87f2dda89b7d25320459c2c9643ebb635 + languageName: node + linkType: hard + +"extsprintf@npm:1.3.0": + version: 1.3.0 + resolution: "extsprintf@npm:1.3.0" + checksum: cee7a4a1e34cffeeec18559109de92c27517e5641991ec6bab849aa64e3081022903dd53084f2080d0d2530803aa5ee84f1e9de642c365452f9e67be8f958ce2 + languageName: node + linkType: hard + +"extsprintf@npm:^1.2.0": + version: 1.4.0 + resolution: "extsprintf@npm:1.4.0" + checksum: 184dc8a413eb4b1ff16bdce797340e7ded4d28511d56a1c9afa5a95bcff6ace154063823eaf0206dbbb0d14059d74f382a15c34b7c0636fa74a7e681295eb67e + languageName: node + linkType: hard + +"fast-deep-equal@npm:^3.1.1": + version: 3.1.3 + resolution: "fast-deep-equal@npm:3.1.3" + checksum: e21a9d8d84f53493b6aa15efc9cfd53dd5b714a1f23f67fb5dc8f574af80df889b3bce25dc081887c6d25457cce704e636395333abad896ccdec03abaf1f3f9d + languageName: node + linkType: hard + +"fast-glob@npm:^3.1.1, fast-glob@npm:^3.2.5, fast-glob@npm:^3.2.7": + version: 3.2.7 + resolution: "fast-glob@npm:3.2.7" + dependencies: + "@nodelib/fs.stat": ^2.0.2 + "@nodelib/fs.walk": ^1.2.3 + glob-parent: ^5.1.2 + merge2: ^1.3.0 + micromatch: ^4.0.4 + checksum: 2f4708ff112d2b451888129fdd9a0938db88b105b0ddfd043c064e3c4d3e20eed8d7c7615f7565fee660db34ddcf08a2db1bf0ab3c00b87608e4719694642d78 + languageName: node + linkType: hard + +"fast-json-stable-stringify@npm:2.1.0, fast-json-stable-stringify@npm:^2.0.0": + version: 2.1.0 + resolution: "fast-json-stable-stringify@npm:2.1.0" + checksum: b191531e36c607977e5b1c47811158733c34ccb3bfde92c44798929e9b4154884378536d26ad90dfecd32e1ffc09c545d23535ad91b3161a27ddbb8ebe0cbecb + languageName: node + linkType: hard + +"fastq@npm:^1.6.0": + version: 1.12.0 + resolution: "fastq@npm:1.12.0" + dependencies: + reusify: ^1.0.4 + checksum: 486db511686b5ab28b1d87170f05c3fa6c8d769cde6861ed34cf3756cdf356950ba9c7dde0bc976ad4308b85aa9ef6214c685887f9f724be72c054a7becb642a + languageName: node + linkType: hard + +"faye-websocket@npm:^0.11.3": + version: 0.11.4 + resolution: "faye-websocket@npm:0.11.4" + dependencies: + websocket-driver: ">=0.5.1" + checksum: d49a62caf027f871149fc2b3f3c7104dc6d62744277eb6f9f36e2d5714e847d846b9f7f0d0b7169b25a012e24a594cde11a93034b30732e4c683f20b8a5019fa + languageName: node + linkType: hard + +"fd-slicer@npm:~1.1.0": + version: 1.1.0 + resolution: "fd-slicer@npm:1.1.0" + dependencies: + pend: ~1.2.0 + checksum: c8585fd5713f4476eb8261150900d2cb7f6ff2d87f8feb306ccc8a1122efd152f1783bdb2b8dc891395744583436bfd8081d8e63ece0ec8687eeefea394d4ff2 + languageName: node + linkType: hard + +"figures@npm:^3.0.0, figures@npm:^3.2.0": + version: 3.2.0 + resolution: "figures@npm:3.2.0" + dependencies: + escape-string-regexp: ^1.0.5 + checksum: 85a6ad29e9aca80b49b817e7c89ecc4716ff14e3779d9835af554db91bac41c0f289c418923519392a1e582b4d10482ad282021330cd045bb7b80c84152f2a2b + languageName: node + linkType: hard + +"file-uri-to-path@npm:1.0.0": + version: 1.0.0 + resolution: "file-uri-to-path@npm:1.0.0" + checksum: b648580bdd893a008c92c7ecc96c3ee57a5e7b6c4c18a9a09b44fb5d36d79146f8e442578bc0e173dc027adf3987e254ba1dfd6e3ec998b7c282873010502144 + languageName: node + linkType: hard + +"fill-range@npm:^4.0.0": + version: 4.0.0 + resolution: "fill-range@npm:4.0.0" + dependencies: + extend-shallow: ^2.0.1 + is-number: ^3.0.0 + repeat-string: ^1.6.1 + to-regex-range: ^2.1.0 + checksum: dbb5102467786ab42bc7a3ec7380ae5d6bfd1b5177b2216de89e4a541193f8ba599a6db84651bd2c58c8921db41b8cc3d699ea83b477342d3ce404020f73c298 + languageName: node + linkType: hard + +"fill-range@npm:^7.0.1": + version: 7.0.1 + resolution: "fill-range@npm:7.0.1" + dependencies: + to-regex-range: ^5.0.1 + checksum: cc283f4e65b504259e64fd969bcf4def4eb08d85565e906b7d36516e87819db52029a76b6363d0f02d0d532f0033c9603b9e2d943d56ee3b0d4f7ad3328ff917 + languageName: node + linkType: hard + +"finalhandler@npm:1.1.2, finalhandler@npm:~1.1.2": + version: 1.1.2 + resolution: "finalhandler@npm:1.1.2" + dependencies: + debug: 2.6.9 + encodeurl: ~1.0.2 + escape-html: ~1.0.3 + on-finished: ~2.3.0 + parseurl: ~1.3.3 + statuses: ~1.5.0 + unpipe: ~1.0.0 + checksum: 617880460c5138dd7ccfd555cb5dde4d8f170f4b31b8bd51e4b646bb2946c30f7db716428a1f2882d730d2b72afb47d1f67cc487b874cb15426f95753a88965e + languageName: node + linkType: hard + +"find-cache-dir@npm:3.3.1": + version: 3.3.1 + resolution: "find-cache-dir@npm:3.3.1" + dependencies: + commondir: ^1.0.1 + make-dir: ^3.0.2 + pkg-dir: ^4.1.0 + checksum: 0f7c22b65e07f9b486b4560227d014fab1e79ffbbfbafb87d113a2e878510bd620ef6fdff090e5248bb2846d28851d19e42bfdc7c50687966acc106328e7abf1 + languageName: node + linkType: hard + +"find-cache-dir@npm:^3.3.1": + version: 3.3.2 + resolution: "find-cache-dir@npm:3.3.2" + dependencies: + commondir: ^1.0.1 + make-dir: ^3.0.2 + pkg-dir: ^4.1.0 + checksum: 1e61c2e64f5c0b1c535bd85939ae73b0e5773142713273818cc0b393ee3555fb0fd44e1a5b161b8b6c3e03e98c2fcc9c227d784850a13a90a8ab576869576817 + languageName: node + linkType: hard + +"find-up@npm:^3.0.0": + version: 3.0.0 + resolution: "find-up@npm:3.0.0" + dependencies: + locate-path: ^3.0.0 + checksum: 38eba3fe7a66e4bc7f0f5a1366dc25508b7cfc349f852640e3678d26ad9a6d7e2c43eff0a472287de4a9753ef58f066a0ea892a256fa3636ad51b3fe1e17fae9 + languageName: node + linkType: hard + +"find-up@npm:^4.0.0": + version: 4.1.0 + resolution: "find-up@npm:4.1.0" + dependencies: + locate-path: ^5.0.0 + path-exists: ^4.0.0 + checksum: 4c172680e8f8c1f78839486e14a43ef82e9decd0e74145f40707cc42e7420506d5ec92d9a11c22bd2c48fb0c384ea05dd30e10dd152fefeec6f2f75282a8b844 + languageName: node + linkType: hard + +"flatted@npm:^2.0.1": + version: 2.0.2 + resolution: "flatted@npm:2.0.2" + checksum: 473c754db7a529e125a22057098f1a4c905ba17b8cc269c3acf77352f0ffa6304c851eb75f6a1845f74461f560e635129ca6b0b8a78fb253c65cea4de3d776f2 + languageName: node + linkType: hard + +"flatten@npm:^1.0.2": + version: 1.0.3 + resolution: "flatten@npm:1.0.3" + checksum: 5c57379816f1692aaa79fbc6390e0a0644e5e8442c5783ed57c6d315468eddbc53a659eaa03c9bb1e771b0f4a9bd8dd8a2620286bf21fd6538a7857321fdfb20 + languageName: node + linkType: hard + +"follow-redirects@npm:^1.0.0": + version: 1.14.2 + resolution: "follow-redirects@npm:1.14.2" + peerDependenciesMeta: + debug: + optional: true + checksum: 53195df4a2f36202177f40a2d59d497d630f3b20e2e51e2b697ee5f9c0a5261985f164b23d3744a574e117618af668d07c0d000c2c5cb0c1546851671585ac4e + languageName: node + linkType: hard + +"font-awesome@npm:4.7.0": + version: 4.7.0 + resolution: "font-awesome@npm:4.7.0" + checksum: fa223f6e3b27e97d2d09cdbf0c1363e2ad18d2a685fc045f54e86394db59f7c113482a819de3b6489f42a630a8ec5911b8e65718e45f7cace1c0a1b05d7fce08 + languageName: node + linkType: hard + +"for-in@npm:^1.0.2": + version: 1.0.2 + resolution: "for-in@npm:1.0.2" + checksum: 09f4ae93ce785d253ac963d94c7f3432d89398bf25ac7a24ed034ca393bf74380bdeccc40e0f2d721a895e54211b07c8fad7132e8157827f6f7f059b70b4043d + languageName: node + linkType: hard + +"forever-agent@npm:~0.6.1": + version: 0.6.1 + resolution: "forever-agent@npm:0.6.1" + checksum: 766ae6e220f5fe23676bb4c6a99387cec5b7b62ceb99e10923376e27bfea72f3c3aeec2ba5f45f3f7ba65d6616965aa7c20b15002b6860833bb6e394dea546a8 + languageName: node + linkType: hard + +"form-data@npm:~2.3.2": + version: 2.3.3 + resolution: "form-data@npm:2.3.3" + dependencies: + asynckit: ^0.4.0 + combined-stream: ^1.0.6 + mime-types: ^2.1.12 + checksum: 10c1780fa13dbe1ff3100114c2ce1f9307f8be10b14bf16e103815356ff567b6be39d70fc4a40f8990b9660012dc24b0f5e1dde1b6426166eb23a445ba068ca3 + languageName: node + linkType: hard + +"forwarded@npm:0.2.0": + version: 0.2.0 + resolution: "forwarded@npm:0.2.0" + checksum: fd27e2394d8887ebd16a66ffc889dc983fbbd797d5d3f01087c020283c0f019a7d05ee85669383d8e0d216b116d720fc0cef2f6e9b7eb9f4c90c6e0bc7fd28e6 + languageName: node + linkType: hard + +"fragment-cache@npm:^0.2.1": + version: 0.2.1 + resolution: "fragment-cache@npm:0.2.1" + dependencies: + map-cache: ^0.2.2 + checksum: 1cbbd0b0116b67d5790175de0038a11df23c1cd2e8dcdbade58ebba5594c2d641dade6b4f126d82a7b4a6ffc2ea12e3d387dbb64ea2ae97cf02847d436f60fdc + languageName: node + linkType: hard + +"fresh@npm:0.5.2": + version: 0.5.2 + resolution: "fresh@npm:0.5.2" + checksum: 13ea8b08f91e669a64e3ba3a20eb79d7ca5379a81f1ff7f4310d54e2320645503cc0c78daedc93dfb6191287295f6479544a649c64d8e41a1c0fb0c221552346 + languageName: node + linkType: hard + +"fs-constants@npm:^1.0.0": + version: 1.0.0 + resolution: "fs-constants@npm:1.0.0" + checksum: 18f5b718371816155849475ac36c7d0b24d39a11d91348cfcb308b4494824413e03572c403c86d3a260e049465518c4f0d5bd00f0371cdfcad6d4f30a85b350d + languageName: node + linkType: hard + +"fs-extra@npm:^8.1.0": + version: 8.1.0 + resolution: "fs-extra@npm:8.1.0" + dependencies: + graceful-fs: ^4.2.0 + jsonfile: ^4.0.0 + universalify: ^0.1.0 + checksum: bf44f0e6cea59d5ce071bba4c43ca76d216f89e402dc6285c128abc0902e9b8525135aa808adad72c9d5d218e9f4bcc63962815529ff2f684ad532172a284880 + languageName: node + linkType: hard + +"fs-extra@npm:^9.1.0": + version: 9.1.0 + resolution: "fs-extra@npm:9.1.0" + dependencies: + at-least-node: ^1.0.0 + graceful-fs: ^4.2.0 + jsonfile: ^6.0.1 + universalify: ^2.0.0 + checksum: ba71ba32e0faa74ab931b7a0031d1523c66a73e225de7426e275e238e312d07313d2da2d33e34a52aa406c8763ade5712eb3ec9ba4d9edce652bcacdc29e6b20 + languageName: node + linkType: hard + +"fs-minipass@npm:^2.0.0, fs-minipass@npm:^2.1.0": + version: 2.1.0 + resolution: "fs-minipass@npm:2.1.0" + dependencies: + minipass: ^3.0.0 + checksum: 1b8d128dae2ac6cc94230cc5ead341ba3e0efaef82dab46a33d171c044caaa6ca001364178d42069b2809c35a1c3c35079a32107c770e9ffab3901b59af8c8b1 + languageName: node + linkType: hard + +"fs-monkey@npm:1.0.3": + version: 1.0.3 + resolution: "fs-monkey@npm:1.0.3" + checksum: cf50804833f9b88a476911ae911fe50f61a98d986df52f890bd97e7262796d023698cb2309fa9b74fdd8974f04315b648748a0a8ee059e7d5257b293bfc409c0 + languageName: node + linkType: hard + +"fs.realpath@npm:^1.0.0": + version: 1.0.0 + resolution: "fs.realpath@npm:1.0.0" + checksum: 99ddea01a7e75aa276c250a04eedeffe5662bce66c65c07164ad6264f9de18fb21be9433ead460e54cff20e31721c811f4fb5d70591799df5f85dce6d6746fd0 + languageName: node + linkType: hard + +"fsevents@npm:^1.2.7": + version: 1.2.13 + resolution: "fsevents@npm:1.2.13" + dependencies: + bindings: ^1.5.0 + nan: ^2.12.1 + checksum: ae855aa737aaa2f9167e9f70417cf6e45a5cd11918e1fee9923709a0149be52416d765433b4aeff56c789b1152e718cd1b13ddec6043b78cdda68260d86383c1 + conditions: os=darwin + languageName: node + linkType: hard + +"fsevents@npm:~2.3.2": + version: 2.3.2 + resolution: "fsevents@npm:2.3.2" + dependencies: + node-gyp: latest + checksum: 97ade64e75091afee5265e6956cb72ba34db7819b4c3e94c431d4be2b19b8bb7a2d4116da417950c3425f17c8fe693d25e20212cac583ac1521ad066b77ae31f + conditions: os=darwin + languageName: node + linkType: hard + +"fsevents@patch:fsevents@^1.2.7#~builtin": + version: 1.2.13 + resolution: "fsevents@patch:fsevents@npm%3A1.2.13#~builtin::version=1.2.13&hash=18f3a7" + dependencies: + bindings: ^1.5.0 + nan: ^2.12.1 + conditions: os=darwin + languageName: node + linkType: hard + +"fsevents@patch:fsevents@~2.3.2#~builtin": + version: 2.3.2 + resolution: "fsevents@patch:fsevents@npm%3A2.3.2#~builtin::version=2.3.2&hash=18f3a7" + dependencies: + node-gyp: latest + conditions: os=darwin + languageName: node + linkType: hard + +"function-bind@npm:^1.1.1": + version: 1.1.1 + resolution: "function-bind@npm:1.1.1" + checksum: b32fbaebb3f8ec4969f033073b43f5c8befbb58f1a79e12f1d7490358150359ebd92f49e72ff0144f65f2c48ea2a605bff2d07965f548f6474fd8efd95bf361a + languageName: node + linkType: hard + +"gauge@npm:~2.7.3": + version: 2.7.4 + resolution: "gauge@npm:2.7.4" + dependencies: + aproba: ^1.0.3 + console-control-strings: ^1.0.0 + has-unicode: ^2.0.0 + object-assign: ^4.1.0 + signal-exit: ^3.0.0 + string-width: ^1.0.1 + strip-ansi: ^3.0.1 + wide-align: ^1.1.0 + checksum: a89b53cee65579b46832e050b5f3a79a832cc422c190de79c6b8e2e15296ab92faddde6ddf2d376875cbba2b043efa99b9e1ed8124e7365f61b04e3cee9d40ee + languageName: node + linkType: hard + +"gensync@npm:^1.0.0-beta.1, gensync@npm:^1.0.0-beta.2": + version: 1.0.0-beta.2 + resolution: "gensync@npm:1.0.0-beta.2" + checksum: a7437e58c6be12aa6c90f7730eac7fa9833dc78872b4ad2963d2031b00a3367a93f98aec75f9aaac7220848e4026d67a8655e870b24f20a543d103c0d65952ec + languageName: node + linkType: hard + +"get-caller-file@npm:^2.0.1, get-caller-file@npm:^2.0.5": + version: 2.0.5 + resolution: "get-caller-file@npm:2.0.5" + checksum: b9769a836d2a98c3ee734a88ba712e62703f1df31b94b784762c433c27a386dd6029ff55c2a920c392e33657d80191edbf18c61487e198844844516f843496b9 + languageName: node + linkType: hard + +"get-intrinsic@npm:^1.0.2": + version: 1.1.1 + resolution: "get-intrinsic@npm:1.1.1" + dependencies: + function-bind: ^1.1.1 + has: ^1.0.3 + has-symbols: ^1.0.1 + checksum: a9fe2ca8fa3f07f9b0d30fb202bcd01f3d9b9b6b732452e79c48e79f7d6d8d003af3f9e38514250e3553fdc83c61650851cb6870832ac89deaaceb08e3721a17 + languageName: node + linkType: hard + +"get-stream@npm:^4.0.0": + version: 4.1.0 + resolution: "get-stream@npm:4.1.0" + dependencies: + pump: ^3.0.0 + checksum: 443e1914170c15bd52ff8ea6eff6dfc6d712b031303e36302d2778e3de2506af9ee964d6124010f7818736dcfde05c04ba7ca6cc26883106e084357a17ae7d73 + languageName: node + linkType: hard + +"get-stream@npm:^5.0.0, get-stream@npm:^5.1.0": + version: 5.2.0 + resolution: "get-stream@npm:5.2.0" + dependencies: + pump: ^3.0.0 + checksum: 8bc1a23174a06b2b4ce600df38d6c98d2ef6d84e020c1ddad632ad75bac4e092eeb40e4c09e0761c35fc2dbc5e7fff5dab5e763a383582c4a167dd69a905bd12 + languageName: node + linkType: hard + +"get-value@npm:^2.0.3, get-value@npm:^2.0.6": + version: 2.0.6 + resolution: "get-value@npm:2.0.6" + checksum: 5c3b99cb5398ea8016bf46ff17afc5d1d286874d2ad38ca5edb6e87d75c0965b0094cb9a9dddef2c59c23d250702323539a7fbdd870620db38c7e7d7ec87c1eb + languageName: node + linkType: hard + +"getos@npm:^3.2.1": + version: 3.2.1 + resolution: "getos@npm:3.2.1" + dependencies: + async: ^3.2.0 + checksum: 42fd78a66d47cebd3e09de5566cc0044e034b08f4a000a310dbd89a77b02c65d8f4002554bfa495ea5bdc4fa9d515f5ac785a7cc474ba45383cc697f865eeaf1 + languageName: node + linkType: hard + +"getpass@npm:^0.1.1": + version: 0.1.7 + resolution: "getpass@npm:0.1.7" + dependencies: + assert-plus: ^1.0.0 + checksum: ab18d55661db264e3eac6012c2d3daeafaab7a501c035ae0ccb193c3c23e9849c6e29b6ac762b9c2adae460266f925d55a3a2a3a3c8b94be2f222df94d70c046 + languageName: node + linkType: hard + +"glob-parent@npm:^3.1.0": + version: 3.1.0 + resolution: "glob-parent@npm:3.1.0" + dependencies: + is-glob: ^3.1.0 + path-dirname: ^1.0.0 + checksum: 653d559237e89a11b9934bef3f392ec42335602034c928590544d383ff5ef449f7b12f3cfa539708e74bc0a6c28ab1fe51d663cc07463cdf899ba92afd85a855 + languageName: node + linkType: hard + +"glob-parent@npm:^5.1.2, glob-parent@npm:~5.1.2": + version: 5.1.2 + resolution: "glob-parent@npm:5.1.2" + dependencies: + is-glob: ^4.0.1 + checksum: f4f2bfe2425296e8a47e36864e4f42be38a996db40420fe434565e4480e3322f18eb37589617a98640c5dc8fdec1a387007ee18dbb1f3f5553409c34d17f425e + languageName: node + linkType: hard + +"glob-parent@npm:^6.0.0": + version: 6.0.1 + resolution: "glob-parent@npm:6.0.1" + dependencies: + is-glob: ^4.0.1 + checksum: 0468cf300b8c7a483dbd8c031704fa1003331cbc65ded095f768328ed35eec78dd199c224c7436db997569863c0cbc0b7fd7c3cb45508e6134c502be9e691dc5 + languageName: node + linkType: hard + +"glob-to-regexp@npm:^0.4.1": + version: 0.4.1 + resolution: "glob-to-regexp@npm:0.4.1" + checksum: e795f4e8f06d2a15e86f76e4d92751cf8bbfcf0157cea5c2f0f35678a8195a750b34096b1256e436f0cebc1883b5ff0888c47348443e69546a5a87f9e1eb1167 + languageName: node + linkType: hard + +"glob@npm:7.1.7, glob@npm:^7.0.3, glob@npm:^7.0.5, glob@npm:^7.1.3, glob@npm:^7.1.4, glob@npm:^7.1.6, glob@npm:^7.1.7": + version: 7.1.7 + resolution: "glob@npm:7.1.7" + dependencies: + fs.realpath: ^1.0.0 + inflight: ^1.0.4 + inherits: 2 + minimatch: ^3.0.4 + once: ^1.3.0 + path-is-absolute: ^1.0.0 + checksum: b61f48973bbdcf5159997b0874a2165db572b368b931135832599875919c237fc05c12984e38fe828e69aa8a921eb0e8a4997266211c517c9cfaae8a93988bb8 + languageName: node + linkType: hard + +"global-dirs@npm:^3.0.0": + version: 3.0.0 + resolution: "global-dirs@npm:3.0.0" + dependencies: + ini: 2.0.0 + checksum: 953c17cf14bf6ee0e2100ae82a0d779934eed8a3ec5c94a7a4f37c5b3b592c31ea015fb9a15cf32484de13c79f4a814f3015152f3e1d65976cfbe47c1bfe4a88 + languageName: node + linkType: hard + +"globals@npm:^11.1.0": + version: 11.12.0 + resolution: "globals@npm:11.12.0" + checksum: 67051a45eca3db904aee189dfc7cd53c20c7d881679c93f6146ddd4c9f4ab2268e68a919df740d39c71f4445d2b38ee360fc234428baea1dbdfe68bbcb46979e + languageName: node + linkType: hard + +"globby@npm:^11.0.3": + version: 11.0.4 + resolution: "globby@npm:11.0.4" + dependencies: + array-union: ^2.1.0 + dir-glob: ^3.0.1 + fast-glob: ^3.1.1 + ignore: ^5.1.4 + merge2: ^1.3.0 + slash: ^3.0.0 + checksum: d3e02d5e459e02ffa578b45f040381c33e3c0538ed99b958f0809230c423337999867d7b0dbf752ce93c46157d3bbf154d3fff988a93ccaeb627df8e1841775b + languageName: node + linkType: hard + +"globby@npm:^6.1.0": + version: 6.1.0 + resolution: "globby@npm:6.1.0" + dependencies: + array-union: ^1.0.1 + glob: ^7.0.3 + object-assign: ^4.0.1 + pify: ^2.0.0 + pinkie-promise: ^2.0.0 + checksum: 18109d6b9d55643d2b98b59c3cfae7073ccfe39829632f353d516cc124d836c2ddebe48a23f04af63d66a621b6d86dd4cbd7e6af906f2458a7fe510ffc4bd424 + languageName: node + linkType: hard + +"graceful-fs@npm:^4.1.11, graceful-fs@npm:^4.1.2, graceful-fs@npm:^4.1.6, graceful-fs@npm:^4.2.0, graceful-fs@npm:^4.2.3, graceful-fs@npm:^4.2.4, graceful-fs@npm:^4.2.6": + version: 4.2.8 + resolution: "graceful-fs@npm:4.2.8" + checksum: 5d224c8969ad0581d551dfabdb06882706b31af2561bd5e2034b4097e67cc27d05232849b8643866585fd0a41c7af152950f8776f4dd5579e9853733f31461c6 + languageName: node + linkType: hard + +"growly@npm:^1.3.0": + version: 1.3.0 + resolution: "growly@npm:1.3.0" + checksum: 53cdecd4c16d7d9154a9061a9ccb87d602e957502ca69b529d7d1b2436c2c0b700ec544fc6b3e4cd115d59b81e62e44ce86bd0521403b579d3a2a97d7ce72a44 + languageName: node + linkType: hard + +"handle-thing@npm:^2.0.0": + version: 2.0.1 + resolution: "handle-thing@npm:2.0.1" + checksum: 68071f313062315cd9dce55710e9496873945f1dd425107007058fc1629f93002a7649fcc3e464281ce02c7e809a35f5925504ab8105d972cf649f1f47cb7d6c + languageName: node + linkType: hard + +"har-schema@npm:^2.0.0": + version: 2.0.0 + resolution: "har-schema@npm:2.0.0" + checksum: d8946348f333fb09e2bf24cc4c67eabb47c8e1d1aa1c14184c7ffec1140a49ec8aa78aa93677ae452d71d5fc0fdeec20f0c8c1237291fc2bcb3f502a5d204f9b + languageName: node + linkType: hard + +"har-validator@npm:~5.1.3": + version: 5.1.5 + resolution: "har-validator@npm:5.1.5" + dependencies: + ajv: ^6.12.3 + har-schema: ^2.0.0 + checksum: b998a7269ca560d7f219eedc53e2c664cd87d487e428ae854a6af4573fc94f182fe9d2e3b92ab968249baec7ebaf9ead69cf975c931dc2ab282ec182ee988280 + languageName: node + linkType: hard + +"has-flag@npm:^3.0.0": + version: 3.0.0 + resolution: "has-flag@npm:3.0.0" + checksum: 4a15638b454bf086c8148979aae044dd6e39d63904cd452d970374fa6a87623423da485dfb814e7be882e05c096a7ccf1ebd48e7e7501d0208d8384ff4dea73b + languageName: node + linkType: hard + +"has-flag@npm:^4.0.0": + version: 4.0.0 + resolution: "has-flag@npm:4.0.0" + checksum: 261a1357037ead75e338156b1f9452c016a37dcd3283a972a30d9e4a87441ba372c8b81f818cd0fbcd9c0354b4ae7e18b9e1afa1971164aef6d18c2b6095a8ad + languageName: node + linkType: hard + +"has-symbols@npm:^1.0.1, has-symbols@npm:^1.0.2": + version: 1.0.2 + resolution: "has-symbols@npm:1.0.2" + checksum: 2309c426071731be792b5be43b3da6fb4ed7cbe8a9a6bcfca1862587709f01b33d575ce8f5c264c1eaad09fca2f9a8208c0a2be156232629daa2dd0c0740976b + languageName: node + linkType: hard + +"has-tostringtag@npm:^1.0.0": + version: 1.0.0 + resolution: "has-tostringtag@npm:1.0.0" + dependencies: + has-symbols: ^1.0.2 + checksum: cc12eb28cb6ae22369ebaad3a8ab0799ed61270991be88f208d508076a1e99abe4198c965935ce85ea90b60c94ddda73693b0920b58e7ead048b4a391b502c1c + languageName: node + linkType: hard + +"has-unicode@npm:^2.0.0": + version: 2.0.1 + resolution: "has-unicode@npm:2.0.1" + checksum: 1eab07a7436512db0be40a710b29b5dc21fa04880b7f63c9980b706683127e3c1b57cb80ea96d47991bdae2dfe479604f6a1ba410106ee1046a41d1bd0814400 + languageName: node + linkType: hard + +"has-value@npm:^0.3.1": + version: 0.3.1 + resolution: "has-value@npm:0.3.1" + dependencies: + get-value: ^2.0.3 + has-values: ^0.1.4 + isobject: ^2.0.0 + checksum: 29e2a1e6571dad83451b769c7ce032fce6009f65bccace07c2962d3ad4d5530b6743d8f3229e4ecf3ea8e905d23a752c5f7089100c1f3162039fa6dc3976558f + languageName: node + linkType: hard + +"has-value@npm:^1.0.0": + version: 1.0.0 + resolution: "has-value@npm:1.0.0" + dependencies: + get-value: ^2.0.6 + has-values: ^1.0.0 + isobject: ^3.0.0 + checksum: b9421d354e44f03d3272ac39fd49f804f19bc1e4fa3ceef7745df43d6b402053f828445c03226b21d7d934a21ac9cf4bc569396dc312f496ddff873197bbd847 + languageName: node + linkType: hard + +"has-values@npm:^0.1.4": + version: 0.1.4 + resolution: "has-values@npm:0.1.4" + checksum: ab1c4bcaf811ccd1856c11cfe90e62fca9e2b026ebe474233a3d282d8d67e3b59ed85b622c7673bac3db198cb98bd1da2b39300a2f98e453729b115350af49bc + languageName: node + linkType: hard + +"has-values@npm:^1.0.0": + version: 1.0.0 + resolution: "has-values@npm:1.0.0" + dependencies: + is-number: ^3.0.0 + kind-of: ^4.0.0 + checksum: 77e6693f732b5e4cf6c38dfe85fdcefad0fab011af74995c3e83863fabf5e3a836f406d83565816baa0bc0a523c9410db8b990fe977074d61aeb6d8f4fcffa11 + languageName: node + linkType: hard + +"has@npm:^1.0.3": + version: 1.0.3 + resolution: "has@npm:1.0.3" + dependencies: + function-bind: ^1.1.1 + checksum: b9ad53d53be4af90ce5d1c38331e712522417d017d5ef1ebd0507e07c2fbad8686fffb8e12ddecd4c39ca9b9b47431afbb975b8abf7f3c3b82c98e9aad052792 + languageName: node + linkType: hard + +"hdr-histogram-js@npm:^2.0.1": + version: 2.0.1 + resolution: "hdr-histogram-js@npm:2.0.1" + dependencies: + "@assemblyscript/loader": ^0.10.1 + base64-js: ^1.2.0 + pako: ^1.0.3 + checksum: 28006929257b804b4ebd13d5490416c04bd69149f93c445d167f486a2b0c511b663a06c2187ae5b722ce10f4167cd15d7756fa66baddf7dcfd99bdacf5da5feb + languageName: node + linkType: hard + +"hdr-histogram-percentiles-obj@npm:^3.0.0": + version: 3.0.0 + resolution: "hdr-histogram-percentiles-obj@npm:3.0.0" + checksum: ab238edcb38d9b60d23ca53da0ecd9a6b1c8ee9a49e30a6146bd3f8f70f26244652f28b79974157c00504e7ddf3129e0ddb217baf71d32330e3fae0105bf30ed + languageName: node + linkType: hard + +"hosted-git-info@npm:^4.0.1": + version: 4.0.2 + resolution: "hosted-git-info@npm:4.0.2" + dependencies: + lru-cache: ^6.0.0 + checksum: d1b2d7720398ce96a788bd38d198fbddce089a2381f63cfb01743e6c7e5aed656e5547fe74090fb9fe53b2cb785b0e8c9ebdddadff48ed26bb471dd23cd25458 + languageName: node + linkType: hard + +"hpack.js@npm:^2.1.6": + version: 2.1.6 + resolution: "hpack.js@npm:2.1.6" + dependencies: + inherits: ^2.0.1 + obuf: ^1.0.0 + readable-stream: ^2.0.1 + wbuf: ^1.1.0 + checksum: 2de144115197967ad6eeee33faf41096c6ba87078703c5cb011632dcfbffeb45784569e0cf02c317bd79c48375597c8ec88c30fff5bb0b023e8f654fb6e9c06e + languageName: node + linkType: hard + +"html-entities@npm:^1.3.1": + version: 1.4.0 + resolution: "html-entities@npm:1.4.0" + checksum: 4b73ffb9eead200f99146e4fbe70acb0af2fea136901a131fc3a782e9ef876a7cbb07dec303ca1f8804232b812249dbf3643a270c9c524852065d9224a8dcdd0 + languageName: node + linkType: hard + +"html-escaper@npm:^2.0.0": + version: 2.0.2 + resolution: "html-escaper@npm:2.0.2" + checksum: d2df2da3ad40ca9ee3a39c5cc6475ef67c8f83c234475f24d8e9ce0dc80a2c82df8e1d6fa78ddd1e9022a586ea1bd247a615e80a5cd9273d90111ddda7d9e974 + languageName: node + linkType: hard + +"http-cache-semantics@npm:^4.1.0": + version: 4.1.0 + resolution: "http-cache-semantics@npm:4.1.0" + checksum: 974de94a81c5474be07f269f9fd8383e92ebb5a448208223bfb39e172a9dbc26feff250192ecc23b9593b3f92098e010406b0f24bd4d588d631f80214648ed42 + languageName: node + linkType: hard + +"http-deceiver@npm:^1.2.7": + version: 1.2.7 + resolution: "http-deceiver@npm:1.2.7" + checksum: 64d7d1ae3a6933eb0e9a94e6f27be4af45a53a96c3c34e84ff57113787105a89fff9d1c3df263ef63add823df019b0e8f52f7121e32393bb5ce9a713bf100b41 + languageName: node + linkType: hard + +"http-errors@npm:1.7.2": + version: 1.7.2 + resolution: "http-errors@npm:1.7.2" + dependencies: + depd: ~1.1.2 + inherits: 2.0.3 + setprototypeof: 1.1.1 + statuses: ">= 1.5.0 < 2" + toidentifier: 1.0.0 + checksum: 5534b0ae08e77f5a45a2380f500e781f6580c4ff75b816cb1f09f99a290b57e78a518be6d866db1b48cca6b052c09da2c75fc91fb16a2fe3da3c44d9acbb9972 + languageName: node + linkType: hard + +"http-errors@npm:~1.6.2": + version: 1.6.3 + resolution: "http-errors@npm:1.6.3" + dependencies: + depd: ~1.1.2 + inherits: 2.0.3 + setprototypeof: 1.1.0 + statuses: ">= 1.4.0 < 2" + checksum: a9654ee027e3d5de305a56db1d1461f25709ac23267c6dc28cdab8323e3f96caa58a9a6a5e93ac15d7285cee0c2f019378c3ada9026e7fe19c872d695f27de7c + languageName: node + linkType: hard + +"http-errors@npm:~1.7.2": + version: 1.7.3 + resolution: "http-errors@npm:1.7.3" + dependencies: + depd: ~1.1.2 + inherits: 2.0.4 + setprototypeof: 1.1.1 + statuses: ">= 1.5.0 < 2" + toidentifier: 1.0.0 + checksum: a59f359473f4b3ea78305beee90d186268d6075432622a46fb7483059068a2dd4c854a20ac8cd438883127e06afb78c1309168bde6cdfeed1e3700eb42487d99 + languageName: node + linkType: hard + +"http-parser-js@npm:>=0.5.1": + version: 0.5.3 + resolution: "http-parser-js@npm:0.5.3" + checksum: 6f3142c5f60ad995a6895a1dc4f70f8cef0910745366e97cbcb99caa604590dbcc11006b00989ad306837d6b820e9bfc6e801c4060ed19a0e4df83caa8577cb5 + languageName: node + linkType: hard + +"http-proxy-agent@npm:^4.0.1": + version: 4.0.1 + resolution: "http-proxy-agent@npm:4.0.1" + dependencies: + "@tootallnate/once": 1 + agent-base: 6 + debug: 4 + checksum: c6a5da5a1929416b6bbdf77b1aca13888013fe7eb9d59fc292e25d18e041bb154a8dfada58e223fc7b76b9b2d155a87e92e608235201f77d34aa258707963a82 + languageName: node + linkType: hard + +"http-proxy-middleware@npm:0.19.1": + version: 0.19.1 + resolution: "http-proxy-middleware@npm:0.19.1" + dependencies: + http-proxy: ^1.17.0 + is-glob: ^4.0.0 + lodash: ^4.17.11 + micromatch: ^3.1.10 + checksum: 64df0438417a613bb22b3689d9652a1b7a56f10b145a463f95f4e8a9b9a351f2c63bc5fd3a9cd710baec224897733b6f299cb7f974ea82769b2a4f1e074764ac + languageName: node + linkType: hard + +"http-proxy@npm:^1.17.0, http-proxy@npm:^1.18.1": + version: 1.18.1 + resolution: "http-proxy@npm:1.18.1" + dependencies: + eventemitter3: ^4.0.0 + follow-redirects: ^1.0.0 + requires-port: ^1.0.0 + checksum: f5bd96bf83e0b1e4226633dbb51f8b056c3e6321917df402deacec31dd7fe433914fc7a2c1831cf7ae21e69c90b3a669b8f434723e9e8b71fd68afe30737b6a5 + languageName: node + linkType: hard + +"http-signature@npm:~1.2.0": + version: 1.2.0 + resolution: "http-signature@npm:1.2.0" + dependencies: + assert-plus: ^1.0.0 + jsprim: ^1.2.2 + sshpk: ^1.7.0 + checksum: 3324598712266a9683585bb84a75dec4fd550567d5e0dd4a0fff6ff3f74348793404d3eeac4918fa0902c810eeee1a86419e4a2e92a164132dfe6b26743fb47c + languageName: node + linkType: hard + +"https-proxy-agent@npm:5.0.0, https-proxy-agent@npm:^5.0.0": + version: 5.0.0 + resolution: "https-proxy-agent@npm:5.0.0" + dependencies: + agent-base: 6 + debug: 4 + checksum: 165bfb090bd26d47693597661298006841ab733d0c7383a8cb2f17373387a94c903a3ac687090aa739de05e379ab6f868bae84ab4eac288ad85c328cd1ec9e53 + languageName: node + linkType: hard + +"human-signals@npm:^1.1.1": + version: 1.1.1 + resolution: "human-signals@npm:1.1.1" + checksum: d587647c9e8ec24e02821b6be7de5a0fc37f591f6c4e319b3054b43fd4c35a70a94c46fc74d8c1a43c47fde157d23acd7421f375e1c1365b09a16835b8300205 + languageName: node + linkType: hard + +"humanize-ms@npm:^1.2.1": + version: 1.2.1 + resolution: "humanize-ms@npm:1.2.1" + dependencies: + ms: ^2.0.0 + checksum: 9c7a74a2827f9294c009266c82031030eae811ca87b0da3dceb8d6071b9bde22c9f3daef0469c3c533cc67a97d8a167cd9fc0389350e5f415f61a79b171ded16 + languageName: node + linkType: hard + +"iconv-lite@npm:0.4.24, iconv-lite@npm:^0.4.24, iconv-lite@npm:^0.4.4": + version: 0.4.24 + resolution: "iconv-lite@npm:0.4.24" + dependencies: + safer-buffer: ">= 2.1.2 < 3" + checksum: bd9f120f5a5b306f0bc0b9ae1edeb1577161503f5f8252a20f1a9e56ef8775c9959fd01c55f2d3a39d9a8abaf3e30c1abeb1895f367dcbbe0a8fd1c9ca01c4f6 + languageName: node + linkType: hard + +"iconv-lite@npm:^0.6.2": + version: 0.6.3 + resolution: "iconv-lite@npm:0.6.3" + dependencies: + safer-buffer: ">= 2.1.2 < 3.0.0" + checksum: 3f60d47a5c8fc3313317edfd29a00a692cc87a19cac0159e2ce711d0ebc9019064108323b5e493625e25594f11c6236647d8e256fbe7a58f4a3b33b89e6d30bf + languageName: node + linkType: hard + +"icss-utils@npm:^5.0.0, icss-utils@npm:^5.1.0": + version: 5.1.0 + resolution: "icss-utils@npm:5.1.0" + peerDependencies: + postcss: ^8.1.0 + checksum: 5c324d283552b1269cfc13a503aaaa172a280f914e5b81544f3803bc6f06a3b585fb79f66f7c771a2c052db7982c18bf92d001e3b47282e3abbbb4c4cc488d68 + languageName: node + linkType: hard + +"ieee754@npm:^1.1.13": + version: 1.2.1 + resolution: "ieee754@npm:1.2.1" + checksum: 5144c0c9815e54ada181d80a0b810221a253562422e7c6c3a60b1901154184f49326ec239d618c416c1c5945a2e197107aee8d986a3dd836b53dffefd99b5e7e + languageName: node + linkType: hard + +"ignore-walk@npm:^3.0.3": + version: 3.0.4 + resolution: "ignore-walk@npm:3.0.4" + dependencies: + minimatch: ^3.0.4 + checksum: 9e9c5ef6c3e0ed7ef5d797991abb554dbb7e60d5fedf6cf05c7129819689eba2b462f625c6e3561e0fc79841904eb829565513eeeab1b44f4fbec4d3146b1a8d + languageName: node + linkType: hard + +"ignore@npm:^5.1.4": + version: 5.1.8 + resolution: "ignore@npm:5.1.8" + checksum: 967abadb61e2cb0e5c5e8c4e1686ab926f91bc1a4680d994b91947d3c65d04c3ae126dcdf67f08e0feeb8ff8407d453e641aeeddcc47a3a3cca359f283cf6121 + languageName: node + linkType: hard + +"image-size@npm:~0.5.0": + version: 0.5.5 + resolution: "image-size@npm:0.5.5" + bin: + image-size: bin/image-size.js + checksum: 6709d5cb73e96d5097ae5e9aa746dd36d6a9c8cf645e7eecac72ea07dbd6f312a65183752762fa92e2f3b698d4ed8d85dd55bf5207b6367245996bd16576d8fe + languageName: node + linkType: hard + +"import-fresh@npm:^3.2.1": + version: 3.3.0 + resolution: "import-fresh@npm:3.3.0" + dependencies: + parent-module: ^1.0.0 + resolve-from: ^4.0.0 + checksum: 2cacfad06e652b1edc50be650f7ec3be08c5e5a6f6d12d035c440a42a8cc028e60a5b99ca08a77ab4d6b1346da7d971915828f33cdab730d3d42f08242d09baa + languageName: node + linkType: hard + +"import-local@npm:^2.0.0": + version: 2.0.0 + resolution: "import-local@npm:2.0.0" + dependencies: + pkg-dir: ^3.0.0 + resolve-cwd: ^2.0.0 + bin: + import-local-fixture: fixtures/cli.js + checksum: b8469252483624379fd65d53c82f3658b32a1136f7168bfeea961a4ea7ca10a45786ea2b02e0006408f9cd22d2f33305a6f17a64e4d5a03274a50942c5e7c949 + languageName: node + linkType: hard + +"imurmurhash@npm:^0.1.4": + version: 0.1.4 + resolution: "imurmurhash@npm:0.1.4" + checksum: 7cae75c8cd9a50f57dadd77482359f659eaebac0319dd9368bcd1714f55e65badd6929ca58569da2b6494ef13fdd5598cd700b1eba23f8b79c5f19d195a3ecf7 + languageName: node + linkType: hard + +"indent-string@npm:^4.0.0": + version: 4.0.0 + resolution: "indent-string@npm:4.0.0" + checksum: 824cfb9929d031dabf059bebfe08cf3137365e112019086ed3dcff6a0a7b698cb80cf67ccccde0e25b9e2d7527aa6cc1fed1ac490c752162496caba3e6699612 + languageName: node + linkType: hard + +"indexes-of@npm:^1.0.1": + version: 1.0.1 + resolution: "indexes-of@npm:1.0.1" + checksum: 4f9799b1739a62f3e02d09f6f4162cf9673025282af7fa36e790146e7f4e216dad3e776a25b08536c093209c9fcb5ea7bd04b082d42686a45f58ff401d6da32e + languageName: node + linkType: hard + +"infer-owner@npm:^1.0.4": + version: 1.0.4 + resolution: "infer-owner@npm:1.0.4" + checksum: 181e732764e4a0611576466b4b87dac338972b839920b2a8cde43642e4ed6bd54dc1fb0b40874728f2a2df9a1b097b8ff83b56d5f8f8e3927f837fdcb47d8a89 + languageName: node + linkType: hard + +"inflight@npm:^1.0.4": + version: 1.0.6 + resolution: "inflight@npm:1.0.6" + dependencies: + once: ^1.3.0 + wrappy: 1 + checksum: f4f76aa072ce19fae87ce1ef7d221e709afb59d445e05d47fba710e85470923a75de35bfae47da6de1b18afc3ce83d70facf44cfb0aff89f0a3f45c0a0244dfd + languageName: node + linkType: hard + +"inherits@npm:2, inherits@npm:2.0.4, inherits@npm:^2.0.1, inherits@npm:^2.0.3, inherits@npm:^2.0.4, inherits@npm:~2.0.3": + version: 2.0.4 + resolution: "inherits@npm:2.0.4" + checksum: 4a48a733847879d6cf6691860a6b1e3f0f4754176e4d71494c41f3475553768b10f84b5ce1d40fbd0e34e6bfbb864ee35858ad4dd2cf31e02fc4a154b724d7f1 + languageName: node + linkType: hard + +"inherits@npm:2.0.3": + version: 2.0.3 + resolution: "inherits@npm:2.0.3" + checksum: 78cb8d7d850d20a5e9a7f3620db31483aa00ad5f722ce03a55b110e5a723539b3716a3b463e2b96ce3fe286f33afc7c131fa2f91407528ba80cea98a7545d4c0 + languageName: node + linkType: hard + +"ini@npm:2.0.0": + version: 2.0.0 + resolution: "ini@npm:2.0.0" + checksum: e7aadc5fb2e4aefc666d74ee2160c073995a4061556b1b5b4241ecb19ad609243b9cceafe91bae49c219519394bbd31512516cb22a3b1ca6e66d869e0447e84e + languageName: node + linkType: hard + +"inquirer@npm:8.1.2": + version: 8.1.2 + resolution: "inquirer@npm:8.1.2" + dependencies: + ansi-escapes: ^4.2.1 + chalk: ^4.1.1 + cli-cursor: ^3.1.0 + cli-width: ^3.0.0 + external-editor: ^3.0.3 + figures: ^3.0.0 + lodash: ^4.17.21 + mute-stream: 0.0.8 + ora: ^5.3.0 + run-async: ^2.4.0 + rxjs: ^7.2.0 + string-width: ^4.1.0 + strip-ansi: ^6.0.0 + through: ^2.3.6 + checksum: fa6caec984d12a89f6bf926c3ee4924beed3dd1ceae66ad8ac287c3ef1b534e31cba86af66950f364305c42eb263c8f4a98c5a27227b3459308c8e3251c6d39a + languageName: node + linkType: hard + +"internal-ip@npm:^4.3.0": + version: 4.3.0 + resolution: "internal-ip@npm:4.3.0" + dependencies: + default-gateway: ^4.2.0 + ipaddr.js: ^1.9.0 + checksum: c970433c84d9a6b46e2c9f5ab7785d3105b856d0a566891bf919241b5a884c5c1c9bf8e915aebb822a86c14b1b6867e58c1eaf5cd49eb023368083069d1a4a9a + languageName: node + linkType: hard + +"ip-regex@npm:^2.1.0": + version: 2.1.0 + resolution: "ip-regex@npm:2.1.0" + checksum: 331d95052aa53ce245745ea0fc3a6a1e2e3c8d6da65fa8ea52bf73768c1b22a9ac50629d1d2b08c04e7b3ac4c21b536693c149ce2c2615ee4796030e5b3e3cba + languageName: node + linkType: hard + +"ip@npm:^1.1.0, ip@npm:^1.1.5": + version: 1.1.5 + resolution: "ip@npm:1.1.5" + checksum: 30133981f082a060a32644f6a7746e9ba7ac9e2bc07ecc8bbdda3ee8ca9bec1190724c390e45a1ee7695e7edfd2a8f7dda2c104ec5f7ac5068c00648504c7e5a + languageName: node + linkType: hard + +"ipaddr.js@npm:1.9.1, ipaddr.js@npm:^1.9.0": + version: 1.9.1 + resolution: "ipaddr.js@npm:1.9.1" + checksum: f88d3825981486f5a1942414c8d77dd6674dd71c065adcfa46f578d677edcb99fda25af42675cb59db492fdf427b34a5abfcde3982da11a8fd83a500b41cfe77 + languageName: node + linkType: hard + +"is-absolute-url@npm:^3.0.3": + version: 3.0.3 + resolution: "is-absolute-url@npm:3.0.3" + checksum: 5159b51d065d9ad29e16a2f78d6c0e41c43227caf90a45e659c54ea6fd50ef0595b1871ce392e84b1df7cfdcad9a8e66eec0813a029112188435abf115accb16 + languageName: node + linkType: hard + +"is-accessor-descriptor@npm:^0.1.6": + version: 0.1.6 + resolution: "is-accessor-descriptor@npm:0.1.6" + dependencies: + kind-of: ^3.0.2 + checksum: 3d629a086a9585bc16a83a8e8a3416f400023301855cafb7ccc9a1d63145b7480f0ad28877dcc2cce09492c4ec1c39ef4c071996f24ee6ac626be4217b8ffc8a + languageName: node + linkType: hard + +"is-accessor-descriptor@npm:^1.0.0": + version: 1.0.0 + resolution: "is-accessor-descriptor@npm:1.0.0" + dependencies: + kind-of: ^6.0.0 + checksum: 8e475968e9b22f9849343c25854fa24492dbe8ba0dea1a818978f9f1b887339190b022c9300d08c47fe36f1b913d70ce8cbaca00369c55a56705fdb7caed37fe + languageName: node + linkType: hard + +"is-arguments@npm:^1.0.4": + version: 1.1.1 + resolution: "is-arguments@npm:1.1.1" + dependencies: + call-bind: ^1.0.2 + has-tostringtag: ^1.0.0 + checksum: 7f02700ec2171b691ef3e4d0e3e6c0ba408e8434368504bb593d0d7c891c0dbfda6d19d30808b904a6cb1929bca648c061ba438c39f296c2a8ca083229c49f27 + languageName: node + linkType: hard + +"is-arrayish@npm:^0.2.1": + version: 0.2.1 + resolution: "is-arrayish@npm:0.2.1" + checksum: eef4417e3c10e60e2c810b6084942b3ead455af16c4509959a27e490e7aee87cfb3f38e01bbde92220b528a0ee1a18d52b787e1458ee86174d8c7f0e58cd488f + languageName: node + linkType: hard + +"is-binary-path@npm:^1.0.0": + version: 1.0.1 + resolution: "is-binary-path@npm:1.0.1" + dependencies: + binary-extensions: ^1.0.0 + checksum: a803c99e9d898170c3b44a86fbdc0736d3d7fcbe737345433fb78e810b9fe30c982657782ad0e676644ba4693ddf05601a7423b5611423218663d6b533341ac9 + languageName: node + linkType: hard + +"is-binary-path@npm:~2.1.0": + version: 2.1.0 + resolution: "is-binary-path@npm:2.1.0" + dependencies: + binary-extensions: ^2.0.0 + checksum: 84192eb88cff70d320426f35ecd63c3d6d495da9d805b19bc65b518984b7c0760280e57dbf119b7e9be6b161784a5a673ab2c6abe83abb5198a432232ad5b35c + languageName: node + linkType: hard + +"is-buffer@npm:^1.1.5": + version: 1.1.6 + resolution: "is-buffer@npm:1.1.6" + checksum: 4a186d995d8bbf9153b4bd9ff9fd04ae75068fe695d29025d25e592d9488911eeece84eefbd8fa41b8ddcc0711058a71d4c466dcf6f1f6e1d83830052d8ca707 + languageName: node + linkType: hard + +"is-ci@npm:^3.0.0": + version: 3.0.0 + resolution: "is-ci@npm:3.0.0" + dependencies: + ci-info: ^3.1.1 + bin: + is-ci: bin.js + checksum: 4b45aef32dd42dcb1f6fb3cd4b3a7ee7e18ea47516d2129005f46c3f36983506bb471382bac890973cf48a2f60d926a24461674ca2d9dc10744d82d4a876c26b + languageName: node + linkType: hard + +"is-core-module@npm:^2.2.0": + version: 2.6.0 + resolution: "is-core-module@npm:2.6.0" + dependencies: + has: ^1.0.3 + checksum: 183b3b96fed19822b13959876b0317e61fc2cb5ebcbc21639904c81f7ae328af57f8e18cc4750a9c4abebd686130c70d34a89521e57dbe002edfa4614507ce18 + languageName: node + linkType: hard + +"is-data-descriptor@npm:^0.1.4": + version: 0.1.4 + resolution: "is-data-descriptor@npm:0.1.4" + dependencies: + kind-of: ^3.0.2 + checksum: 5c622e078ba933a78338ae398a3d1fc5c23332b395312daf4f74bab4afb10d061cea74821add726cb4db8b946ba36217ee71a24fe71dd5bca4632edb7f6aad87 + languageName: node + linkType: hard + +"is-data-descriptor@npm:^1.0.0": + version: 1.0.0 + resolution: "is-data-descriptor@npm:1.0.0" + dependencies: + kind-of: ^6.0.0 + checksum: e705e6816241c013b05a65dc452244ee378d1c3e3842bd140beabe6e12c0d700ef23c91803f971aa7b091fb0573c5da8963af34a2b573337d87bc3e1f53a4e6d + languageName: node + linkType: hard + +"is-date-object@npm:^1.0.1": + version: 1.0.5 + resolution: "is-date-object@npm:1.0.5" + dependencies: + has-tostringtag: ^1.0.0 + checksum: baa9077cdf15eb7b58c79398604ca57379b2fc4cf9aa7a9b9e295278648f628c9b201400c01c5e0f7afae56507d741185730307cbe7cad3b9f90a77e5ee342fc + languageName: node + linkType: hard + +"is-descriptor@npm:^0.1.0": + version: 0.1.6 + resolution: "is-descriptor@npm:0.1.6" + dependencies: + is-accessor-descriptor: ^0.1.6 + is-data-descriptor: ^0.1.4 + kind-of: ^5.0.0 + checksum: 0f780c1b46b465f71d970fd7754096ffdb7b69fd8797ca1f5069c163eaedcd6a20ec4a50af669075c9ebcfb5266d2e53c8b227e485eefdb0d1fee09aa1dd8ab6 + languageName: node + linkType: hard + +"is-descriptor@npm:^1.0.0, is-descriptor@npm:^1.0.2": + version: 1.0.2 + resolution: "is-descriptor@npm:1.0.2" + dependencies: + is-accessor-descriptor: ^1.0.0 + is-data-descriptor: ^1.0.0 + kind-of: ^6.0.2 + checksum: 2ed623560bee035fb67b23e32ce885700bef8abe3fbf8c909907d86507b91a2c89a9d3a4d835a4d7334dd5db0237a0aeae9ca109c1e4ef1c0e7b577c0846ab5a + languageName: node + linkType: hard + +"is-docker@npm:^2.0.0, is-docker@npm:^2.1.1": + version: 2.2.1 + resolution: "is-docker@npm:2.2.1" + bin: + is-docker: cli.js + checksum: 3fef7ddbf0be25958e8991ad941901bf5922ab2753c46980b60b05c1bf9c9c2402d35e6dc32e4380b980ef5e1970a5d9d5e5aa2e02d77727c3b6b5e918474c56 + languageName: node + linkType: hard + +"is-extendable@npm:^0.1.0, is-extendable@npm:^0.1.1": + version: 0.1.1 + resolution: "is-extendable@npm:0.1.1" + checksum: 3875571d20a7563772ecc7a5f36cb03167e9be31ad259041b4a8f73f33f885441f778cee1f1fe0085eb4bc71679b9d8c923690003a36a6a5fdf8023e6e3f0672 + languageName: node + linkType: hard + +"is-extendable@npm:^1.0.1": + version: 1.0.1 + resolution: "is-extendable@npm:1.0.1" + dependencies: + is-plain-object: ^2.0.4 + checksum: db07bc1e9de6170de70eff7001943691f05b9d1547730b11be01c0ebfe67362912ba743cf4be6fd20a5e03b4180c685dad80b7c509fe717037e3eee30ad8e84f + languageName: node + linkType: hard + +"is-extglob@npm:^2.1.0, is-extglob@npm:^2.1.1": + version: 2.1.1 + resolution: "is-extglob@npm:2.1.1" + checksum: df033653d06d0eb567461e58a7a8c9f940bd8c22274b94bf7671ab36df5719791aae15eef6d83bbb5e23283967f2f984b8914559d4449efda578c775c4be6f85 + languageName: node + linkType: hard + +"is-fullwidth-code-point@npm:^1.0.0": + version: 1.0.0 + resolution: "is-fullwidth-code-point@npm:1.0.0" + dependencies: + number-is-nan: ^1.0.0 + checksum: 4d46a7465a66a8aebcc5340d3b63a56602133874af576a9ca42c6f0f4bd787a743605771c5f246db77da96605fefeffb65fc1dbe862dcc7328f4b4d03edf5a57 + languageName: node + linkType: hard + +"is-fullwidth-code-point@npm:^2.0.0": + version: 2.0.0 + resolution: "is-fullwidth-code-point@npm:2.0.0" + checksum: eef9c6e15f68085fec19ff6a978a6f1b8f48018fd1265035552078ee945573594933b09bbd6f562553e2a241561439f1ef5339276eba68d272001343084cfab8 + languageName: node + linkType: hard + +"is-fullwidth-code-point@npm:^3.0.0": + version: 3.0.0 + resolution: "is-fullwidth-code-point@npm:3.0.0" + checksum: 44a30c29457c7fb8f00297bce733f0a64cd22eca270f83e58c105e0d015e45c019491a4ab2faef91ab51d4738c670daff901c799f6a700e27f7314029e99e348 + languageName: node + linkType: hard + +"is-glob@npm:^3.1.0": + version: 3.1.0 + resolution: "is-glob@npm:3.1.0" + dependencies: + is-extglob: ^2.1.0 + checksum: 9d483bca84f16f01230f7c7c8c63735248fe1064346f292e0f6f8c76475fd20c6f50fc19941af5bec35f85d6bf26f4b7768f39a48a5f5fdc72b408dc74e07afc + languageName: node + linkType: hard + +"is-glob@npm:^4.0.0, is-glob@npm:^4.0.1, is-glob@npm:~4.0.1": + version: 4.0.1 + resolution: "is-glob@npm:4.0.1" + dependencies: + is-extglob: ^2.1.1 + checksum: 84627cad11b4e745f5db5a163f32c47b711585a5ff6e14f8f8d026db87f4cdd3e2c95f6fa1f94ad22e469f36d819ae2814f03f9c668b164422ac3354a94672d3 + languageName: node + linkType: hard + +"is-installed-globally@npm:~0.4.0": + version: 0.4.0 + resolution: "is-installed-globally@npm:0.4.0" + dependencies: + global-dirs: ^3.0.0 + is-path-inside: ^3.0.2 + checksum: 3359840d5982d22e9b350034237b2cda2a12bac1b48a721912e1ab8e0631dd07d45a2797a120b7b87552759a65ba03e819f1bd63f2d7ab8657ec0b44ee0bf399 + languageName: node + linkType: hard + +"is-interactive@npm:^1.0.0": + version: 1.0.0 + resolution: "is-interactive@npm:1.0.0" + checksum: 824808776e2d468b2916cdd6c16acacebce060d844c35ca6d82267da692e92c3a16fdba624c50b54a63f38bdc4016055b6f443ce57d7147240de4f8cdabaf6f9 + languageName: node + linkType: hard + +"is-lambda@npm:^1.0.1": + version: 1.0.1 + resolution: "is-lambda@npm:1.0.1" + checksum: 93a32f01940220532e5948538699ad610d5924ac86093fcee83022252b363eb0cc99ba53ab084a04e4fb62bf7b5731f55496257a4c38adf87af9c4d352c71c35 + languageName: node + linkType: hard + +"is-number@npm:^3.0.0": + version: 3.0.0 + resolution: "is-number@npm:3.0.0" + dependencies: + kind-of: ^3.0.2 + checksum: 0c62bf8e9d72c4dd203a74d8cfc751c746e75513380fef420cda8237e619a988ee43e678ddb23c87ac24d91ac0fe9f22e4ffb1301a50310c697e9d73ca3994e9 + languageName: node + linkType: hard + +"is-number@npm:^7.0.0": + version: 7.0.0 + resolution: "is-number@npm:7.0.0" + checksum: 456ac6f8e0f3111ed34668a624e45315201dff921e5ac181f8ec24923b99e9f32ca1a194912dc79d539c97d33dba17dc635202ff0b2cf98326f608323276d27a + languageName: node + linkType: hard + +"is-path-cwd@npm:^2.0.0": + version: 2.2.0 + resolution: "is-path-cwd@npm:2.2.0" + checksum: 46a840921bb8cc0dc7b5b423a14220e7db338072a4495743a8230533ce78812dc152548c86f4b828411fe98c5451959f07cf841c6a19f611e46600bd699e8048 + languageName: node + linkType: hard + +"is-path-in-cwd@npm:^2.0.0": + version: 2.1.0 + resolution: "is-path-in-cwd@npm:2.1.0" + dependencies: + is-path-inside: ^2.1.0 + checksum: 6b01b3f8c9172e9682ea878d001836a0cc5a78cbe6236024365d478c2c9e384da2417e5f21f2ad2da2761d0465309fc5baf6e71187d2a23f0058da69790f7f48 + languageName: node + linkType: hard + +"is-path-inside@npm:^2.1.0": + version: 2.1.0 + resolution: "is-path-inside@npm:2.1.0" + dependencies: + path-is-inside: ^1.0.2 + checksum: 6ca34dbd84d5c50a3ee1547afb6ada9b06d556a4ff42da9b303797e4acc3ac086516a4833030aa570f397f8c58dacabd57ee8e6c2ce8b2396a986ad2af10fcaf + languageName: node + linkType: hard + +"is-path-inside@npm:^3.0.2": + version: 3.0.3 + resolution: "is-path-inside@npm:3.0.3" + checksum: abd50f06186a052b349c15e55b182326f1936c89a78bf6c8f2b707412517c097ce04bc49a0ca221787bc44e1049f51f09a2ffb63d22899051988d3a618ba13e9 + languageName: node + linkType: hard + +"is-plain-object@npm:^2.0.3, is-plain-object@npm:^2.0.4": + version: 2.0.4 + resolution: "is-plain-object@npm:2.0.4" + dependencies: + isobject: ^3.0.1 + checksum: 2a401140cfd86cabe25214956ae2cfee6fbd8186809555cd0e84574f88de7b17abacb2e477a6a658fa54c6083ecbda1e6ae404c7720244cd198903848fca70ca + languageName: node + linkType: hard + +"is-regex@npm:^1.0.4": + version: 1.1.4 + resolution: "is-regex@npm:1.1.4" + dependencies: + call-bind: ^1.0.2 + has-tostringtag: ^1.0.0 + checksum: 362399b33535bc8f386d96c45c9feb04cf7f8b41c182f54174c1a45c9abbbe5e31290bbad09a458583ff6bf3b2048672cdb1881b13289569a7c548370856a652 + languageName: node + linkType: hard + +"is-resolvable@npm:^1.1.0": + version: 1.1.0 + resolution: "is-resolvable@npm:1.1.0" + checksum: 2ddff983be0cabc2c8d60246365755f8fb322f5fb9db834740d3e694c635c1b74c1bd674cf221e072fc4bd911ef3f08f2247d390e476f7e80af9092443193c68 + languageName: node + linkType: hard + +"is-stream@npm:^1.1.0": + version: 1.1.0 + resolution: "is-stream@npm:1.1.0" + checksum: 063c6bec9d5647aa6d42108d4c59723d2bd4ae42135a2d4db6eadbd49b7ea05b750fd69d279e5c7c45cf9da753ad2c00d8978be354d65aa9f6bb434969c6a2ae + languageName: node + linkType: hard + +"is-stream@npm:^2.0.0": + version: 2.0.1 + resolution: "is-stream@npm:2.0.1" + checksum: b8e05ccdf96ac330ea83c12450304d4a591f9958c11fd17bed240af8d5ffe08aedafa4c0f4cfccd4d28dc9d4d129daca1023633d5c11601a6cbc77521f6fae66 + languageName: node + linkType: hard + +"is-typedarray@npm:~1.0.0": + version: 1.0.0 + resolution: "is-typedarray@npm:1.0.0" + checksum: 3508c6cd0a9ee2e0df2fa2e9baabcdc89e911c7bd5cf64604586697212feec525aa21050e48affb5ffc3df20f0f5d2e2cf79b08caa64e1ccc9578e251763aef7 + languageName: node + linkType: hard + +"is-unicode-supported@npm:^0.1.0": + version: 0.1.0 + resolution: "is-unicode-supported@npm:0.1.0" + checksum: a2aab86ee7712f5c2f999180daaba5f361bdad1efadc9610ff5b8ab5495b86e4f627839d085c6530363c6d6d4ecbde340fb8e54bdb83da4ba8e0865ed5513c52 + languageName: node + linkType: hard + +"is-what@npm:^3.12.0": + version: 3.14.1 + resolution: "is-what@npm:3.14.1" + checksum: a9a6ce92d33799f1ae0916c7afb6f8128a23ce9d28bd69d9ec3ec88910e7a1f68432e6236c3c8a4d544cf0b864675e5d828437efde60ee0cf8102061d395c1df + languageName: node + linkType: hard + +"is-windows@npm:^1.0.2": + version: 1.0.2 + resolution: "is-windows@npm:1.0.2" + checksum: 438b7e52656fe3b9b293b180defb4e448088e7023a523ec21a91a80b9ff8cdb3377ddb5b6e60f7c7de4fa8b63ab56e121b6705fe081b3cf1b828b0a380009ad7 + languageName: node + linkType: hard + +"is-wsl@npm:^1.1.0": + version: 1.1.0 + resolution: "is-wsl@npm:1.1.0" + checksum: ea157d232351e68c92bd62fc541771096942fe72f69dff452dd26dcc31466258c570a3b04b8cda2e01cd2968255b02951b8670d08ea4ed76d6b1a646061ac4fe + languageName: node + linkType: hard + +"is-wsl@npm:^2.2.0": + version: 2.2.0 + resolution: "is-wsl@npm:2.2.0" + dependencies: + is-docker: ^2.0.0 + checksum: 20849846ae414997d290b75e16868e5261e86ff5047f104027026fd61d8b5a9b0b3ade16239f35e1a067b3c7cc02f70183cb661010ed16f4b6c7c93dad1b19d8 + languageName: node + linkType: hard + +"isarray@npm:1.0.0, isarray@npm:~1.0.0": + version: 1.0.0 + resolution: "isarray@npm:1.0.0" + checksum: f032df8e02dce8ec565cf2eb605ea939bdccea528dbcf565cdf92bfa2da9110461159d86a537388ef1acef8815a330642d7885b29010e8f7eac967c9993b65ab + languageName: node + linkType: hard + +"isarray@npm:^2.0.1": + version: 2.0.5 + resolution: "isarray@npm:2.0.5" + checksum: bd5bbe4104438c4196ba58a54650116007fa0262eccef13a4c55b2e09a5b36b59f1e75b9fcc49883dd9d4953892e6fc007eef9e9155648ceea036e184b0f930a + languageName: node + linkType: hard + +"isbinaryfile@npm:^4.0.8": + version: 4.0.8 + resolution: "isbinaryfile@npm:4.0.8" + checksum: 606e3bb648d1a0dee23459d1d937bb2560e66a5281ec7c9ff50e585402d73321ac268d0f34cb7393125b3ebc4c7962d39e50a01cdb8904b52fce08b7ccd2bf9f + languageName: node + linkType: hard + +"isexe@npm:^2.0.0": + version: 2.0.0 + resolution: "isexe@npm:2.0.0" + checksum: 26bf6c5480dda5161c820c5b5c751ae1e766c587b1f951ea3fcfc973bafb7831ae5b54a31a69bd670220e42e99ec154475025a468eae58ea262f813fdc8d1c62 + languageName: node + linkType: hard + +"isobject@npm:^2.0.0": + version: 2.1.0 + resolution: "isobject@npm:2.1.0" + dependencies: + isarray: 1.0.0 + checksum: 811c6f5a866877d31f0606a88af4a45f282544de886bf29f6a34c46616a1ae2ed17076cc6bf34c0128f33eecf7e1fcaa2c82cf3770560d3e26810894e96ae79f + languageName: node + linkType: hard + +"isobject@npm:^3.0.0, isobject@npm:^3.0.1": + version: 3.0.1 + resolution: "isobject@npm:3.0.1" + checksum: db85c4c970ce30693676487cca0e61da2ca34e8d4967c2e1309143ff910c207133a969f9e4ddb2dc6aba670aabce4e0e307146c310350b298e74a31f7d464703 + languageName: node + linkType: hard + +"isstream@npm:~0.1.2": + version: 0.1.2 + resolution: "isstream@npm:0.1.2" + checksum: 1eb2fe63a729f7bdd8a559ab552c69055f4f48eb5c2f03724430587c6f450783c8f1cd936c1c952d0a927925180fcc892ebd5b174236cf1065d4bd5bdb37e963 + languageName: node + linkType: hard + +"istanbul-lib-coverage@npm:^3.0.0": + version: 3.0.0 + resolution: "istanbul-lib-coverage@npm:3.0.0" + checksum: ea57c2428858cc5d1e04c0e28b362950bbf6415e8ba1235cdd6f4c8dc3c57cb950db8b4e8a4f7e33abc240aa1eb816dba0d7285bdb8b70bda22bb2082492dbfc + languageName: node + linkType: hard + +"istanbul-lib-instrument@npm:^4.0.1, istanbul-lib-instrument@npm:^4.0.3": + version: 4.0.3 + resolution: "istanbul-lib-instrument@npm:4.0.3" + dependencies: + "@babel/core": ^7.7.5 + "@istanbuljs/schema": ^0.1.2 + istanbul-lib-coverage: ^3.0.0 + semver: ^6.3.0 + checksum: fa1171d3022b1bb8f6a734042620ac5d9ee7dc80f3065a0bb12863e9f0494d0eefa3d86608fcc0254ab2765d29d7dad8bdc42e5f8df2f9a1fbe85ccc59d76cb9 + languageName: node + linkType: hard + +"istanbul-lib-report@npm:^3.0.0": + version: 3.0.0 + resolution: "istanbul-lib-report@npm:3.0.0" + dependencies: + istanbul-lib-coverage: ^3.0.0 + make-dir: ^3.0.0 + supports-color: ^7.1.0 + checksum: 3f29eb3f53c59b987386e07fe772d24c7f58c6897f34c9d7a296f4000de7ae3de9eb95c3de3df91dc65b134c84dee35c54eee572a56243e8907c48064e34ff1b + languageName: node + linkType: hard + +"istanbul-lib-source-maps@npm:^4.0.0": + version: 4.0.0 + resolution: "istanbul-lib-source-maps@npm:4.0.0" + dependencies: + debug: ^4.1.1 + istanbul-lib-coverage: ^3.0.0 + source-map: ^0.6.1 + checksum: 292bfb4083e5f8783cdf829a7686b1a377d0c6c2119d4343c8478e948b38146c4827cddc7eee9f57605acd63c291376d67e4a84163d37c5fc78ad0f27f7e2621 + languageName: node + linkType: hard + +"istanbul-reports@npm:^3.0.0": + version: 3.0.2 + resolution: "istanbul-reports@npm:3.0.2" + dependencies: + html-escaper: ^2.0.0 + istanbul-lib-report: ^3.0.0 + checksum: c5da63f1f4610f47f3015c525a3bc2fb4c87a8791ae452ee3983546d7a2873f0cf5d5fff7c3735ac52943c5b3506f49c294c92f1837df6ec03312625ccd176d7 + languageName: node + linkType: hard + +"jasmine-core@npm:^3.6.0": + version: 3.9.0 + resolution: "jasmine-core@npm:3.9.0" + checksum: af08d9aee93f956f4cb0eae7dcb4b669213fddab80e5e6b16c52e33a0f2f5c969e54de009a65dfde0111cb03cabe577a2aaa8803614c685111e85ebd51323649 + languageName: node + linkType: hard + +"jasmine-core@npm:~3.8.0": + version: 3.8.0 + resolution: "jasmine-core@npm:3.8.0" + checksum: 6490373bd96d4d2a3c74214d307f8c37394370b1e892b9f203d4c5eda56941d53f84aabee0e65538b6921a190710618f1e73af44bd1d93e6c6e6c3f5c4bbfab6 + languageName: node + linkType: hard + +"jest-worker@npm:^27.0.2": + version: 27.1.0 + resolution: "jest-worker@npm:27.1.0" + dependencies: + "@types/node": "*" + merge-stream: ^2.0.0 + supports-color: ^8.0.0 + checksum: 6df593e5a9eae9fc5a5c809706ab91145a3fca9128c2fdc199f7e6e7f3428abe3e70c181eb1bee6574470d0212ca18556e2c9e3afd18aaa6495643597a5ca28c + languageName: node + linkType: hard + +"jquery@npm:3.5.0": + version: 3.5.0 + resolution: "jquery@npm:3.5.0" + checksum: 5085f2f2e26fe5cbab10b3d05aef1dd9980c6f01aa07bbb238fc7778695b21fa5c182e5dd9ea6e7852349edae3a203b96849fd86862c81fc1c49d5fd1281f886 + languageName: node + linkType: hard + +"js-tokens@npm:^4.0.0": + version: 4.0.0 + resolution: "js-tokens@npm:4.0.0" + checksum: 8a95213a5a77deb6cbe94d86340e8d9ace2b93bc367790b260101d2f36a2eaf4e4e22d9fa9cf459b38af3a32fb4190e638024cf82ec95ef708680e405ea7cc78 + languageName: node + linkType: hard + +"jsbn@npm:~0.1.0": + version: 0.1.1 + resolution: "jsbn@npm:0.1.1" + checksum: e5ff29c1b8d965017ef3f9c219dacd6e40ad355c664e277d31246c90545a02e6047018c16c60a00f36d561b3647215c41894f5d869ada6908a2e0ce4200c88f2 + languageName: node + linkType: hard + +"jsesc@npm:^2.5.1": + version: 2.5.2 + resolution: "jsesc@npm:2.5.2" + bin: + jsesc: bin/jsesc + checksum: 4dc190771129e12023f729ce20e1e0bfceac84d73a85bc3119f7f938843fe25a4aeccb54b6494dce26fcf263d815f5f31acdefac7cc9329efb8422a4f4d9fa9d + languageName: node + linkType: hard + +"jsesc@npm:~0.5.0": + version: 0.5.0 + resolution: "jsesc@npm:0.5.0" + bin: + jsesc: bin/jsesc + checksum: b8b44cbfc92f198ad972fba706ee6a1dfa7485321ee8c0b25f5cedd538dcb20cde3197de16a7265430fce8277a12db066219369e3d51055038946039f6e20e17 + languageName: node + linkType: hard + +"json-parse-better-errors@npm:^1.0.2": + version: 1.0.2 + resolution: "json-parse-better-errors@npm:1.0.2" + checksum: ff2b5ba2a70e88fd97a3cb28c1840144c5ce8fae9cbeeddba15afa333a5c407cf0e42300cd0a2885dbb055227fe68d405070faad941beeffbfde9cf3b2c78c5d + languageName: node + linkType: hard + +"json-parse-even-better-errors@npm:^2.3.0": + version: 2.3.1 + resolution: "json-parse-even-better-errors@npm:2.3.1" + checksum: 798ed4cf3354a2d9ccd78e86d2169515a0097a5c133337807cdf7f1fc32e1391d207ccfc276518cc1d7d8d4db93288b8a50ba4293d212ad1336e52a8ec0a941f + languageName: node + linkType: hard + +"json-schema-traverse@npm:^0.4.1": + version: 0.4.1 + resolution: "json-schema-traverse@npm:0.4.1" + checksum: 7486074d3ba247769fda17d5181b345c9fb7d12e0da98b22d1d71a5db9698d8b4bd900a3ec1a4ffdd60846fc2556274a5c894d0c48795f14cb03aeae7b55260b + languageName: node + linkType: hard + +"json-schema-traverse@npm:^1.0.0": + version: 1.0.0 + resolution: "json-schema-traverse@npm:1.0.0" + checksum: 02f2f466cdb0362558b2f1fd5e15cce82ef55d60cd7f8fa828cf35ba74330f8d767fcae5c5c2adb7851fa811766c694b9405810879bc4e1ddd78a7c0e03658ad + languageName: node + linkType: hard + +"json-schema@npm:0.2.3": + version: 0.2.3 + resolution: "json-schema@npm:0.2.3" + checksum: bbc2070988fb5f2a2266a31b956f1b5660e03ea7eaa95b33402901274f625feb586ae0c485e1df854fde40a7f0dc679f3b3ca8e5b8d31f8ea07a0d834de785c7 + languageName: node + linkType: hard + +"json-stringify-safe@npm:~5.0.1": + version: 5.0.1 + resolution: "json-stringify-safe@npm:5.0.1" + checksum: 48ec0adad5280b8a96bb93f4563aa1667fd7a36334f79149abd42446d0989f2ddc58274b479f4819f1f00617957e6344c886c55d05a4e15ebb4ab931e4a6a8ee + languageName: node + linkType: hard + +"json3@npm:^3.3.3": + version: 3.3.3 + resolution: "json3@npm:3.3.3" + checksum: 55eda204a4c70d11b7d5caa5cb64c76a3aa54d5df72d07bdf446b922fd7cb8657b0732f68e0c36790f55e195e0a429c299144ff05430bbe93bc2a7c81ad3472b + languageName: node + linkType: hard + +"json5@npm:^1.0.1": + version: 1.0.1 + resolution: "json5@npm:1.0.1" + dependencies: + minimist: ^1.2.0 + bin: + json5: lib/cli.js + checksum: e76ea23dbb8fc1348c143da628134a98adf4c5a4e8ea2adaa74a80c455fc2cdf0e2e13e6398ef819bfe92306b610ebb2002668ed9fc1af386d593691ef346fc3 + languageName: node + linkType: hard + +"json5@npm:^2.1.0, json5@npm:^2.1.2": + version: 2.2.0 + resolution: "json5@npm:2.2.0" + dependencies: + minimist: ^1.2.5 + bin: + json5: lib/cli.js + checksum: e88fc5274bb58fc99547baa777886b069d2dd96d9cfc4490b305fd16d711dabd5979e35a4f90873cefbeb552e216b041a304fe56702bedba76e19bc7845f208d + languageName: node + linkType: hard + +"jsonc-parser@npm:3.0.0, jsonc-parser@npm:^3.0.0": + version: 3.0.0 + resolution: "jsonc-parser@npm:3.0.0" + checksum: 1df2326f1f9688de30c70ff19c5b2a83ba3b89a1036160da79821d1361090775e9db502dc57a67c11b56e1186fc1ed70b887f25c5febf9a3ec4f91435836c99d + languageName: node + linkType: hard + +"jsonfile@npm:^4.0.0": + version: 4.0.0 + resolution: "jsonfile@npm:4.0.0" + dependencies: + graceful-fs: ^4.1.6 + dependenciesMeta: + graceful-fs: + optional: true + checksum: 6447d6224f0d31623eef9b51185af03ac328a7553efcee30fa423d98a9e276ca08db87d71e17f2310b0263fd3ffa6c2a90a6308367f661dc21580f9469897c9e + languageName: node + linkType: hard + +"jsonfile@npm:^6.0.1": + version: 6.1.0 + resolution: "jsonfile@npm:6.1.0" + dependencies: + graceful-fs: ^4.1.6 + universalify: ^2.0.0 + dependenciesMeta: + graceful-fs: + optional: true + checksum: 7af3b8e1ac8fe7f1eccc6263c6ca14e1966fcbc74b618d3c78a0a2075579487547b94f72b7a1114e844a1e15bb00d440e5d1720bfc4612d790a6f285d5ea8354 + languageName: node + linkType: hard + +"jsonparse@npm:^1.3.1": + version: 1.3.1 + resolution: "jsonparse@npm:1.3.1" + checksum: 6514a7be4674ebf407afca0eda3ba284b69b07f9958a8d3113ef1005f7ec610860c312be067e450c569aab8b89635e332cee3696789c750692bb60daba627f4d + languageName: node + linkType: hard + +"jsprim@npm:^1.2.2": + version: 1.4.1 + resolution: "jsprim@npm:1.4.1" + dependencies: + assert-plus: 1.0.0 + extsprintf: 1.3.0 + json-schema: 0.2.3 + verror: 1.10.0 + checksum: 6bcb20ec265ae18bb48e540a6da2c65f9c844f7522712d6dfcb01039527a49414816f4869000493363f1e1ea96cbad00e46188d5ecc78257a19f152467587373 + languageName: node + linkType: hard + +"karma-chrome-launcher@npm:^3.1.0": + version: 3.1.0 + resolution: "karma-chrome-launcher@npm:3.1.0" + dependencies: + which: ^1.2.1 + checksum: 63431ddec9aa40e2a0439d9e2bcfa58a6822efd08e2666bdbc3f55dfbe8fcc0b401035b71b1f6f21340339dc56c172edaed8e8c0ddc6949873318ad1666b2dd9 + languageName: node + linkType: hard + +"karma-coverage@npm:~2.0.3": + version: 2.0.3 + resolution: "karma-coverage@npm:2.0.3" + dependencies: + istanbul-lib-coverage: ^3.0.0 + istanbul-lib-instrument: ^4.0.1 + istanbul-lib-report: ^3.0.0 + istanbul-lib-source-maps: ^4.0.0 + istanbul-reports: ^3.0.0 + minimatch: ^3.0.4 + checksum: 9be68b877a15d4eb613389523d7be517d2699e8f96a8877f0adcbfa562ccb77c6d19eed3bb6c92353fc5267cb836b95b1b1e76ebb236f9a8f122767854528351 + languageName: node + linkType: hard + +"karma-jasmine-html-reporter@npm:~1.7.0": + version: 1.7.0 + resolution: "karma-jasmine-html-reporter@npm:1.7.0" + peerDependencies: + jasmine-core: ">=3.8" + karma: ">=0.9" + karma-jasmine: ">=1.1" + checksum: 926c25858ea45115496524749881837de0091e3f8119e0f81a18c377e69fb82f832836b94e08d2a24fbc49aa21b491ae0bb861f07404f144c92bc84f409ef202 + languageName: node + linkType: hard + +"karma-jasmine@npm:~4.0.0": + version: 4.0.1 + resolution: "karma-jasmine@npm:4.0.1" + dependencies: + jasmine-core: ^3.6.0 + peerDependencies: + karma: "*" + checksum: 28337c82941ed6c68e0c47ef432c2c91511214e84a336e78d9068daebd61a3c1cee6209207ddc5fe3ad78124597f58054b93aa0f973ff6dcc8a8fcd1951c9851 + languageName: node + linkType: hard + +"karma-notify-reporter@npm:^1.3.0": + version: 1.3.0 + resolution: "karma-notify-reporter@npm:1.3.0" + dependencies: + node-notifier: ^9.0.0 + peerDependencies: + karma: ">=0.9" + checksum: 1b703c20df6def6fa52dde86dd311cead2162a27e479ebeace9ced27e13188860eca067607773da3c0fe474a693b7bf57c2e4669a736cbe2a1f1b107a3d3ddca + languageName: node + linkType: hard + +"karma-source-map-support@npm:1.4.0": + version: 1.4.0 + resolution: "karma-source-map-support@npm:1.4.0" + dependencies: + source-map-support: ^0.5.5 + checksum: 7a482bc836c70f8c1d9468382a9e1c887d032697f6ace97fac90b02e73d0523cb59fc0af8759356293e6bc4ce3a17bab59b331bad0560cab9dd77ac65b343de8 + languageName: node + linkType: hard + +"karma@npm:~6.3.0": + version: 6.3.4 + resolution: "karma@npm:6.3.4" + dependencies: + body-parser: ^1.19.0 + braces: ^3.0.2 + chokidar: ^3.5.1 + colors: ^1.4.0 + connect: ^3.7.0 + di: ^0.0.1 + dom-serialize: ^2.2.1 + glob: ^7.1.7 + graceful-fs: ^4.2.6 + http-proxy: ^1.18.1 + isbinaryfile: ^4.0.8 + lodash: ^4.17.21 + log4js: ^6.3.0 + mime: ^2.5.2 + minimatch: ^3.0.4 + qjobs: ^1.2.0 + range-parser: ^1.2.1 + rimraf: ^3.0.2 + socket.io: ^3.1.0 + source-map: ^0.6.1 + tmp: ^0.2.1 + ua-parser-js: ^0.7.28 + yargs: ^16.1.1 + bin: + karma: bin/karma + checksum: d8850275a7ba7447e37e19835594584eb112e286dd5db08fea4630cbe519551c0b5b477a2dd7e1583f7371ec54ae26620abcb9c96344118aa12d16bbed3dbb03 + languageName: node + linkType: hard + +"killable@npm:^1.0.1": + version: 1.0.1 + resolution: "killable@npm:1.0.1" + checksum: 911a85c6e390c19d72c4e3149347cf44042cbd7d18c3c6c5e4f706fdde6e0ed532473392e282c7ef27f518407e6cb7d2a0e71a2ae8d8d8f8ffdb68891a29a68a + languageName: node + linkType: hard + +"kind-of@npm:^3.0.2, kind-of@npm:^3.0.3, kind-of@npm:^3.2.0": + version: 3.2.2 + resolution: "kind-of@npm:3.2.2" + dependencies: + is-buffer: ^1.1.5 + checksum: e898df8ca2f31038f27d24f0b8080da7be274f986bc6ed176f37c77c454d76627619e1681f6f9d2e8d2fd7557a18ecc419a6bb54e422abcbb8da8f1a75e4b386 + languageName: node + linkType: hard + +"kind-of@npm:^4.0.0": + version: 4.0.0 + resolution: "kind-of@npm:4.0.0" + dependencies: + is-buffer: ^1.1.5 + checksum: 1b9e7624a8771b5a2489026e820f3bbbcc67893e1345804a56b23a91e9069965854d2a223a7c6ee563c45be9d8c6ff1ef87f28ed5f0d1a8d00d9dcbb067c529f + languageName: node + linkType: hard + +"kind-of@npm:^5.0.0": + version: 5.1.0 + resolution: "kind-of@npm:5.1.0" + checksum: f2a0102ae0cf19c4a953397e552571bad2b588b53282874f25fca7236396e650e2db50d41f9f516bd402536e4df968dbb51b8e69e4d5d4a7173def78448f7bab + languageName: node + linkType: hard + +"kind-of@npm:^6.0.0, kind-of@npm:^6.0.2": + version: 6.0.3 + resolution: "kind-of@npm:6.0.3" + checksum: 3ab01e7b1d440b22fe4c31f23d8d38b4d9b91d9f291df683476576493d5dfd2e03848a8b05813dd0c3f0e835bc63f433007ddeceb71f05cb25c45ae1b19c6d3b + languageName: node + linkType: hard + +"klona@npm:^2.0.4": + version: 2.0.4 + resolution: "klona@npm:2.0.4" + checksum: abc6690882e0e6f5cf70451b79a6de95a27be56ced283d1d6d7e610db7d824e5da1f142f8073466dfbcfa887ee001b98f6dcfbcf02759828ba356b90202a74c5 + languageName: node + linkType: hard + +"lazy-ass@npm:^1.6.0": + version: 1.6.0 + resolution: "lazy-ass@npm:1.6.0" + checksum: 5a3ebb17915b03452320804466345382a6c25ac782ec4874fecdb2385793896cd459be2f187dc7def8899180c32ee0ab9a1aa7fe52193ac3ff3fe29bb0591729 + languageName: node + linkType: hard + +"less-loader@npm:10.0.1": + version: 10.0.1 + resolution: "less-loader@npm:10.0.1" + dependencies: + klona: ^2.0.4 + peerDependencies: + less: ^3.5.0 || ^4.0.0 + webpack: ^5.0.0 + checksum: 3063e477987205669946fd49c091c8ec5d390d10ce56ae5975b9b3580f68ed12e9925edda42faa2cb40cf310aa4053668699af86c50e6e0510c5de19dd124a06 + languageName: node + linkType: hard + +"less@npm:4.1.1": + version: 4.1.1 + resolution: "less@npm:4.1.1" + dependencies: + copy-anything: ^2.0.1 + errno: ^0.1.1 + graceful-fs: ^4.1.2 + image-size: ~0.5.0 + make-dir: ^2.1.0 + mime: ^1.4.1 + needle: ^2.5.2 + parse-node-version: ^1.0.1 + source-map: ~0.6.0 + tslib: ^1.10.0 + dependenciesMeta: + errno: + optional: true + graceful-fs: + optional: true + image-size: + optional: true + make-dir: + optional: true + mime: + optional: true + needle: + optional: true + source-map: + optional: true + bin: + lessc: bin/lessc + checksum: 56872a0b8e9dc58abba585c7b771b42b628ce841e962b1c5c66f0e73eb6c4ce7f4a8e7fe857568c84d17c91e2a384af272bf13a9dcd945e5a2bd08094063d961 + languageName: node + linkType: hard + +"license-webpack-plugin@npm:2.3.20": + version: 2.3.20 + resolution: "license-webpack-plugin@npm:2.3.20" + dependencies: + "@types/webpack-sources": ^0.1.5 + webpack-sources: ^1.2.0 + peerDependenciesMeta: + webpack: + optional: true + checksum: 72a29e172765d3760896740318b3ed927cd0d412d90780dbb5c82f988988c44e7a88abf16dd7db5aa3df193432861ec5590756185e86b272fd98930dcc03bd00 + languageName: node + linkType: hard + +"lilconfig@npm:^2.0.3": + version: 2.0.3 + resolution: "lilconfig@npm:2.0.3" + checksum: 39fcd06c9f94bec0f7be969f89abcead96cf9334682007df63e6fbe9bdb0566cf8e1ca53a8f56d2acca802f28e8acbabe8ed4e6265ed5e419b6a1397db003741 + languageName: node + linkType: hard + +"lines-and-columns@npm:^1.1.6": + version: 1.1.6 + resolution: "lines-and-columns@npm:1.1.6" + checksum: 198a5436b1fa5cf703bae719c01c686b076f0ad7e1aafd95a58d626cabff302dc0414822126f2f80b58a8c3d66cda8a7b6da064f27130f87e1d3506d6dfd0d68 + languageName: node + linkType: hard + +"listr2@npm:^3.8.3": + version: 3.11.0 + resolution: "listr2@npm:3.11.0" + dependencies: + cli-truncate: ^2.1.0 + colorette: ^1.2.2 + log-update: ^4.0.0 + p-map: ^4.0.0 + rxjs: ^6.6.7 + through: ^2.3.8 + wrap-ansi: ^7.0.0 + peerDependencies: + enquirer: ">= 2.3.0 < 3" + checksum: 6533edd4304f5c113198db42b87ddb17fb3dc2167017b2d63c30df50c1277865fc0eed99c4f4c8abdfc5a960b997049dba14a65180fbf2851ad82f2259038a0c + languageName: node + linkType: hard + +"loader-runner@npm:^4.2.0": + version: 4.2.0 + resolution: "loader-runner@npm:4.2.0" + checksum: e61aea8b6904b8af53d9de6f0484da86c462c0001f4511bedc837cec63deb9475cea813db62f702cd7930420ccb0e75c78112270ca5c8b61b374294f53c0cb3a + languageName: node + linkType: hard + +"loader-utils@npm:2.0.0, loader-utils@npm:^2.0.0": + version: 2.0.0 + resolution: "loader-utils@npm:2.0.0" + dependencies: + big.js: ^5.2.2 + emojis-list: ^3.0.0 + json5: ^2.1.2 + checksum: 6856423131b50b6f5f259da36f498cfd7fc3c3f8bb17777cf87fdd9159e797d4ba4288d9a96415fd8da62c2906960e88f74711dee72d03a9003bddcd0d364a51 + languageName: node + linkType: hard + +"loader-utils@npm:^1.4.0": + version: 1.4.0 + resolution: "loader-utils@npm:1.4.0" + dependencies: + big.js: ^5.2.2 + emojis-list: ^3.0.0 + json5: ^1.0.1 + checksum: d150b15e7a42ac47d935c8b484b79e44ff6ab4c75df7cc4cb9093350cf014ec0b17bdb60c5d6f91a37b8b218bd63b973e263c65944f58ca2573e402b9a27e717 + languageName: node + linkType: hard + +"locate-path@npm:^3.0.0": + version: 3.0.0 + resolution: "locate-path@npm:3.0.0" + dependencies: + p-locate: ^3.0.0 + path-exists: ^3.0.0 + checksum: 53db3996672f21f8b0bf2a2c645ae2c13ffdae1eeecfcd399a583bce8516c0b88dcb4222ca6efbbbeb6949df7e46860895be2c02e8d3219abd373ace3bfb4e11 + languageName: node + linkType: hard + +"locate-path@npm:^5.0.0": + version: 5.0.0 + resolution: "locate-path@npm:5.0.0" + dependencies: + p-locate: ^4.1.0 + checksum: 83e51725e67517287d73e1ded92b28602e3ae5580b301fe54bfb76c0c723e3f285b19252e375712316774cf52006cb236aed5704692c32db0d5d089b69696e30 + languageName: node + linkType: hard + +"lodash.debounce@npm:^4.0.8": + version: 4.0.8 + resolution: "lodash.debounce@npm:4.0.8" + checksum: a3f527d22c548f43ae31c861ada88b2637eb48ac6aa3eb56e82d44917971b8aa96fbb37aa60efea674dc4ee8c42074f90f7b1f772e9db375435f6c83a19b3bc6 + languageName: node + linkType: hard + +"lodash.memoize@npm:^4.1.2": + version: 4.1.2 + resolution: "lodash.memoize@npm:4.1.2" + checksum: 9ff3942feeccffa4f1fafa88d32f0d24fdc62fd15ded5a74a5f950ff5f0c6f61916157246744c620173dddf38d37095a92327d5fd3861e2063e736a5c207d089 + languageName: node + linkType: hard + +"lodash.merge@npm:^4.6.2": + version: 4.6.2 + resolution: "lodash.merge@npm:4.6.2" + checksum: ad580b4bdbb7ca1f7abf7e1bce63a9a0b98e370cf40194b03380a46b4ed799c9573029599caebc1b14e3f24b111aef72b96674a56cfa105e0f5ac70546cdc005 + languageName: node + linkType: hard + +"lodash.once@npm:^4.1.1": + version: 4.1.1 + resolution: "lodash.once@npm:4.1.1" + checksum: d768fa9f9b4e1dc6453be99b753906f58990e0c45e7b2ca5a3b40a33111e5d17f6edf2f768786e2716af90a8e78f8f91431ab8435f761fef00f9b0c256f6d245 + languageName: node + linkType: hard + +"lodash.uniq@npm:^4.5.0": + version: 4.5.0 + resolution: "lodash.uniq@npm:4.5.0" + checksum: a4779b57a8d0f3c441af13d9afe7ecff22dd1b8ce1129849f71d9bbc8e8ee4e46dfb4b7c28f7ad3d67481edd6e51126e4e2a6ee276e25906d10f7140187c392d + languageName: node + linkType: hard + +"lodash@npm:^4.17.11, lodash@npm:^4.17.13, lodash@npm:^4.17.14, lodash@npm:^4.17.15, lodash@npm:^4.17.21": + version: 4.17.21 + resolution: "lodash@npm:4.17.21" + checksum: eb835a2e51d381e561e508ce932ea50a8e5a68f4ebdd771ea240d3048244a8d13658acbd502cd4829768c56f2e16bdd4340b9ea141297d472517b83868e677f7 + languageName: node + linkType: hard + +"log-symbols@npm:^4.0.0, log-symbols@npm:^4.1.0": + version: 4.1.0 + resolution: "log-symbols@npm:4.1.0" + dependencies: + chalk: ^4.1.0 + is-unicode-supported: ^0.1.0 + checksum: fce1497b3135a0198803f9f07464165e9eb83ed02ceb2273930a6f8a508951178d8cf4f0378e9d28300a2ed2bc49050995d2bd5f53ab716bb15ac84d58c6ef74 + languageName: node + linkType: hard + +"log-update@npm:^4.0.0": + version: 4.0.0 + resolution: "log-update@npm:4.0.0" + dependencies: + ansi-escapes: ^4.3.0 + cli-cursor: ^3.1.0 + slice-ansi: ^4.0.0 + wrap-ansi: ^6.2.0 + checksum: ae2f85bbabc1906034154fb7d4c4477c79b3e703d22d78adee8b3862fa913942772e7fa11713e3d96fb46de4e3cabefbf5d0a544344f03b58d3c4bff52aa9eb2 + languageName: node + linkType: hard + +"log4js@npm:^6.3.0": + version: 6.3.0 + resolution: "log4js@npm:6.3.0" + dependencies: + date-format: ^3.0.0 + debug: ^4.1.1 + flatted: ^2.0.1 + rfdc: ^1.1.4 + streamroller: ^2.2.4 + checksum: da2812bbe477d0594154562d63c8b23030d4a31964bbf9d5b708f528eb57adb9e4c2eec4caf087400776b5758e4f5e5a5ef90c1453bec471aba2a8c42ee9176c + languageName: node + linkType: hard + +"loglevel@npm:^1.6.8": + version: 1.7.1 + resolution: "loglevel@npm:1.7.1" + checksum: 715a4ae69ad75d4d3bd04e4f6e9edbc4cae4db34d1e7f54f426d8cebe2dd9fef891ca3789e839d927cdbc5fad73d789e998db0af2f11f4c40219c272bc923823 + languageName: node + linkType: hard + +"lru-cache@npm:^6.0.0": + version: 6.0.0 + resolution: "lru-cache@npm:6.0.0" + dependencies: + yallist: ^4.0.0 + checksum: f97f499f898f23e4585742138a22f22526254fdba6d75d41a1c2526b3b6cc5747ef59c5612ba7375f42aca4f8461950e925ba08c991ead0651b4918b7c978297 + languageName: node + linkType: hard + +"magic-string@npm:0.25.7, magic-string@npm:^0.25.0": + version: 0.25.7 + resolution: "magic-string@npm:0.25.7" + dependencies: + sourcemap-codec: ^1.4.4 + checksum: 727a1fb70f9610304fe384f1df0251eb7d1d9dd779c07ef1225690361b71b216f26f5d934bfb11c919b5b0e7ba50f6240c823a6f2e44cfd33d4a07d7747ca829 + languageName: node + linkType: hard + +"make-dir@npm:^2.1.0": + version: 2.1.0 + resolution: "make-dir@npm:2.1.0" + dependencies: + pify: ^4.0.1 + semver: ^5.6.0 + checksum: 043548886bfaf1820323c6a2997e6d2fa51ccc2586ac14e6f14634f7458b4db2daf15f8c310e2a0abd3e0cddc64df1890d8fc7263033602c47bb12cbfcf86aab + languageName: node + linkType: hard + +"make-dir@npm:^3.0.0, make-dir@npm:^3.0.2, make-dir@npm:^3.1.0": + version: 3.1.0 + resolution: "make-dir@npm:3.1.0" + dependencies: + semver: ^6.0.0 + checksum: 484200020ab5a1fdf12f393fe5f385fc8e4378824c940fba1729dcd198ae4ff24867bc7a5646331e50cead8abff5d9270c456314386e629acec6dff4b8016b78 + languageName: node + linkType: hard + +"make-error@npm:^1.1.1": + version: 1.3.6 + resolution: "make-error@npm:1.3.6" + checksum: b86e5e0e25f7f777b77fabd8e2cbf15737972869d852a22b7e73c17623928fccb826d8e46b9951501d3f20e51ad74ba8c59ed584f610526a48f8ccf88aaec402 + languageName: node + linkType: hard + +"make-fetch-happen@npm:^9.0.1, make-fetch-happen@npm:^9.1.0": + version: 9.1.0 + resolution: "make-fetch-happen@npm:9.1.0" + dependencies: + agentkeepalive: ^4.1.3 + cacache: ^15.2.0 + http-cache-semantics: ^4.1.0 + http-proxy-agent: ^4.0.1 + https-proxy-agent: ^5.0.0 + is-lambda: ^1.0.1 + lru-cache: ^6.0.0 + minipass: ^3.1.3 + minipass-collect: ^1.0.2 + minipass-fetch: ^1.3.2 + minipass-flush: ^1.0.5 + minipass-pipeline: ^1.2.4 + negotiator: ^0.6.2 + promise-retry: ^2.0.1 + socks-proxy-agent: ^6.0.0 + ssri: ^8.0.0 + checksum: 0eb371c85fdd0b1584fcfdf3dc3c62395761b3c14658be02620c310305a9a7ecf1617a5e6fb30c1d081c5c8aaf177fa133ee225024313afabb7aa6a10f1e3d04 + languageName: node + linkType: hard + +"management-portal@workspace:.": + version: 0.0.0-use.local + resolution: "management-portal@workspace:." + dependencies: + "@angular-builders/custom-webpack": ^12.1.3 + "@angular-devkit/build-angular": ^12.2.12 + "@angular/animations": ^12.2.12 + "@angular/cli": ^12.2.12 + "@angular/common": ^12.2.12 + "@angular/compiler": ^12.2.12 + "@angular/compiler-cli": ^12.2.12 + "@angular/core": ^12.2.12 + "@angular/forms": ^12.2.12 + "@angular/localize": ^12.2.12 + "@angular/platform-browser": ^12.2.12 + "@angular/platform-browser-dynamic": ^12.2.12 + "@angular/router": ^12.2.12 + "@cypress/schematic": 1.5.0 + "@ng-bootstrap/ng-bootstrap": ^10.0.0 + "@ngx-translate/core": 13.0.0 + "@ngx-translate/http-loader": 6.0.0 + "@types/jasmine": ~3.8.0 + "@types/node": ^12.11.1 + bootstrap: ^4.6.1 + cypress: 8.3.0 + font-awesome: 4.7.0 + jasmine-core: ~3.8.0 + jquery: 3.5.0 + karma: ~6.3.0 + karma-chrome-launcher: ^3.1.0 + karma-coverage: ~2.0.3 + karma-jasmine: ~4.0.0 + karma-jasmine-html-reporter: ~1.7.0 + karma-notify-reporter: ^1.3.0 + lodash.merge: ^4.6.2 + material-design-icons: ^3.0.1 + merge-json-webpack-plugin: ^6.0.0 + ng-qrcode: ^5.2.0 + ngx-cookie-service: ^12.0.3 + ngx-webstorage: ^8.0.0 + puppeteer: ^10.2.0 + rimraf: 2.6.1 + rxjs: ~6.6.0 + tslib: ^2.3.0 + typescript: ~4.3.5 + wait-port: ^0.2.9 + webpack: ^5.0.0 + zone.js: ~0.11.4 + languageName: unknown + linkType: soft + +"map-age-cleaner@npm:^0.1.3": + version: 0.1.3 + resolution: "map-age-cleaner@npm:0.1.3" + dependencies: + p-defer: ^1.0.0 + checksum: cb2804a5bcb3cbdfe4b59066ea6d19f5e7c8c196cd55795ea4c28f792b192e4c442426ae52524e5e1acbccf393d3bddacefc3d41f803e66453f6c4eda3650bc1 + languageName: node + linkType: hard + +"map-cache@npm:^0.2.2": + version: 0.2.2 + resolution: "map-cache@npm:0.2.2" + checksum: 3067cea54285c43848bb4539f978a15dedc63c03022abeec6ef05c8cb6829f920f13b94bcaf04142fc6a088318e564c4785704072910d120d55dbc2e0c421969 + languageName: node + linkType: hard + +"map-visit@npm:^1.0.0": + version: 1.0.0 + resolution: "map-visit@npm:1.0.0" + dependencies: + object-visit: ^1.0.0 + checksum: c27045a5021c344fc19b9132eb30313e441863b2951029f8f8b66f79d3d8c1e7e5091578075a996f74e417479506fe9ede28c44ca7bc351a61c9d8073daec36a + languageName: node + linkType: hard + +"material-design-icons@npm:^3.0.1": + version: 3.0.1 + resolution: "material-design-icons@npm:3.0.1" + checksum: 9a6dd4b2a7f531616df76080508281d3235f290568e40592b347ba4ea582fc992d8068491c55260b7d11907ad16be57d9c64d57ac4bbf7fc1c93f622e7accde7 + languageName: node + linkType: hard + +"mdn-data@npm:2.0.14": + version: 2.0.14 + resolution: "mdn-data@npm:2.0.14" + checksum: 9d0128ed425a89f4cba8f787dca27ad9408b5cb1b220af2d938e2a0629d17d879a34d2cb19318bdb26c3f14c77dd5dfbae67211f5caaf07b61b1f2c5c8c7dc16 + languageName: node + linkType: hard + +"media-typer@npm:0.3.0": + version: 0.3.0 + resolution: "media-typer@npm:0.3.0" + checksum: af1b38516c28ec95d6b0826f6c8f276c58aec391f76be42aa07646b4e39d317723e869700933ca6995b056db4b09a78c92d5440dc23657e6764be5d28874bba1 + languageName: node + linkType: hard + +"mem@npm:^8.1.1": + version: 8.1.1 + resolution: "mem@npm:8.1.1" + dependencies: + map-age-cleaner: ^0.1.3 + mimic-fn: ^3.1.0 + checksum: c41bc97f6f82b91899206058989e34bcb1543af40413c2ab59e5a8e97e4f8f2188d62e7bd95b2d575d5b0d823d5034a0f274a0676f6d11a0e0b973898b06c8b1 + languageName: node + linkType: hard + +"memfs@npm:^3.2.2": + version: 3.2.2 + resolution: "memfs@npm:3.2.2" + dependencies: + fs-monkey: 1.0.3 + checksum: b50f91aafda967c440a38e793bbe70cd04e4f155a38316468b90b7a2256328cebe87e0665ff81057cf72110f9017cbfd1e1a9c66df1ebce3cbf39ec3620220d9 + languageName: node + linkType: hard + +"memory-fs@npm:^0.4.1": + version: 0.4.1 + resolution: "memory-fs@npm:0.4.1" + dependencies: + errno: ^0.1.3 + readable-stream: ^2.0.1 + checksum: 6db6c8682eff836664ca9b5b6052ae38d21713dda9d0ef4700fa5c0599a8bc16b2093bee75ac3dedbe59fb2222d368f25bafaa62ba143c41051359cbcb005044 + languageName: node + linkType: hard + +"merge-descriptors@npm:1.0.1": + version: 1.0.1 + resolution: "merge-descriptors@npm:1.0.1" + checksum: 5abc259d2ae25bb06d19ce2b94a21632583c74e2a9109ee1ba7fd147aa7362b380d971e0251069f8b3eb7d48c21ac839e21fa177b335e82c76ec172e30c31a26 + languageName: node + linkType: hard + +"merge-json-webpack-plugin@npm:^6.0.0": + version: 6.0.0 + resolution: "merge-json-webpack-plugin@npm:6.0.0" + dependencies: + fast-glob: ^3.2.7 + schema-utils: ^3.1.1 + peerDependencies: + webpack: ^5.0.0 + checksum: 383e048baf777d40e948b24e17f11c60ae48ad9bae9fda7a2f4882f4f47d90f246c5f4039979df72457aed2ef4f2b54dcd9068c241361a281bbfdf30045f516f + languageName: node + linkType: hard + +"merge-source-map@npm:^1.1.0": + version: 1.1.0 + resolution: "merge-source-map@npm:1.1.0" + dependencies: + source-map: ^0.6.1 + checksum: 945a83dcc59eff77dde709be1d3d6cb575c11cd7164a7ccdc1c6f0d463aad7c12750a510bdf84af2c05fac4615c4305d97ac90477975348bb901a905c8e92c4b + languageName: node + linkType: hard + +"merge-stream@npm:^2.0.0": + version: 2.0.0 + resolution: "merge-stream@npm:2.0.0" + checksum: 6fa4dcc8d86629705cea944a4b88ef4cb0e07656ebf223fa287443256414283dd25d91c1cd84c77987f2aec5927af1a9db6085757cb43d90eb170ebf4b47f4f4 + languageName: node + linkType: hard + +"merge2@npm:^1.3.0": + version: 1.4.1 + resolution: "merge2@npm:1.4.1" + checksum: 7268db63ed5169466540b6fb947aec313200bcf6d40c5ab722c22e242f651994619bcd85601602972d3c85bd2cc45a358a4c61937e9f11a061919a1da569b0c2 + languageName: node + linkType: hard + +"methods@npm:~1.1.2": + version: 1.1.2 + resolution: "methods@npm:1.1.2" + checksum: 0917ff4041fa8e2f2fda5425a955fe16ca411591fbd123c0d722fcf02b73971ed6f764d85f0a6f547ce49ee0221ce2c19a5fa692157931cecb422984f1dcd13a + languageName: node + linkType: hard + +"micromatch@npm:^3.1.10, micromatch@npm:^3.1.4": + version: 3.1.10 + resolution: "micromatch@npm:3.1.10" + dependencies: + arr-diff: ^4.0.0 + array-unique: ^0.3.2 + braces: ^2.3.1 + define-property: ^2.0.2 + extend-shallow: ^3.0.2 + extglob: ^2.0.4 + fragment-cache: ^0.2.1 + kind-of: ^6.0.2 + nanomatch: ^1.2.9 + object.pick: ^1.3.0 + regex-not: ^1.0.0 + snapdragon: ^0.8.1 + to-regex: ^3.0.2 + checksum: ad226cba4daa95b4eaf47b2ca331c8d2e038d7b41ae7ed0697cde27f3f1d6142881ab03d4da51b65d9d315eceb5e4cdddb3fbb55f5f72cfa19cf3ea469d054dc + languageName: node + linkType: hard + +"micromatch@npm:^4.0.4": + version: 4.0.4 + resolution: "micromatch@npm:4.0.4" + dependencies: + braces: ^3.0.1 + picomatch: ^2.2.3 + checksum: ef3d1c88e79e0a68b0e94a03137676f3324ac18a908c245a9e5936f838079fcc108ac7170a5fadc265a9c2596963462e402841406bda1a4bb7b68805601d631c + languageName: node + linkType: hard + +"mime-db@npm:1.49.0, mime-db@npm:>= 1.43.0 < 2": + version: 1.49.0 + resolution: "mime-db@npm:1.49.0" + checksum: 3744efc45b17896ff8a5934a761c434d5ffe3c7816662002d799ca9934347e00f99ae4d9b4ddf1c48d391cc9e522cc4523a6e77e7701f8e27c426e3e1d6e215a + languageName: node + linkType: hard + +"mime-types@npm:^2.1.12, mime-types@npm:^2.1.27, mime-types@npm:^2.1.31, mime-types@npm:~2.1.17, mime-types@npm:~2.1.19, mime-types@npm:~2.1.24": + version: 2.1.32 + resolution: "mime-types@npm:2.1.32" + dependencies: + mime-db: 1.49.0 + checksum: 4487dfd2f872126d2c219ec731ad47a6169a438d5a4cce6ecef7594ce08eaefaf0d85429485a76ec005f095016c7ec488a24cf8bfcc0ea06de0355e23395746f + languageName: node + linkType: hard + +"mime@npm:1.6.0, mime@npm:^1.4.1": + version: 1.6.0 + resolution: "mime@npm:1.6.0" + bin: + mime: cli.js + checksum: fef25e39263e6d207580bdc629f8872a3f9772c923c7f8c7e793175cee22777bbe8bba95e5d509a40aaa292d8974514ce634ae35769faa45f22d17edda5e8557 + languageName: node + linkType: hard + +"mime@npm:^2.4.4, mime@npm:^2.5.2": + version: 2.5.2 + resolution: "mime@npm:2.5.2" + bin: + mime: cli.js + checksum: dd3c93d433d41a09f6a1cfa969b653b769899f3bd573e7bfcea33bdc8b0cc4eba57daa2f95937369c2bd2b6d39d62389b11a4309fe40d1d3a1b736afdedad0ff + languageName: node + linkType: hard + +"mimic-fn@npm:^2.1.0": + version: 2.1.0 + resolution: "mimic-fn@npm:2.1.0" + checksum: d2421a3444848ce7f84bd49115ddacff29c15745db73f54041edc906c14b131a38d05298dae3081667627a59b2eb1ca4b436ff2e1b80f69679522410418b478a + languageName: node + linkType: hard + +"mimic-fn@npm:^3.1.0": + version: 3.1.0 + resolution: "mimic-fn@npm:3.1.0" + checksum: f7b167f9115b8bbdf2c3ee55dce9149d14be9e54b237259c4bc1d8d0512ea60f25a1b323f814eb1fe8f5a541662804bcfcfff3202ca58df143edb986849d58db + languageName: node + linkType: hard + +"mini-css-extract-plugin@npm:2.1.0": + version: 2.1.0 + resolution: "mini-css-extract-plugin@npm:2.1.0" + dependencies: + schema-utils: ^3.0.0 + peerDependencies: + webpack: ^5.0.0 + checksum: d9d61c6bb40328806c8f4dd874a5e2e77ad7d452720fe1b48ad9fbdf84f2619f1063ce2370da48a4859318e5c865da128dc6ca1ea03fde556aea214576108cc5 + languageName: node + linkType: hard + +"mini-css-extract-plugin@npm:2.4.2": + version: 2.4.2 + resolution: "mini-css-extract-plugin@npm:2.4.2" + dependencies: + schema-utils: ^3.1.0 + peerDependencies: + webpack: ^5.0.0 + checksum: c413b4fd0ba0ff398b58ddecc0e805c254c2253e6536627469408b29ea1eb9f5b38c610a3be505c6ca9096a1bb5ed4faf8c6ff8c387b2b4891c8e38fdc8f719b + languageName: node + linkType: hard + +"minimalistic-assert@npm:^1.0.0": + version: 1.0.1 + resolution: "minimalistic-assert@npm:1.0.1" + checksum: cc7974a9268fbf130fb055aff76700d7e2d8be5f761fb5c60318d0ed010d839ab3661a533ad29a5d37653133385204c503bfac995aaa4236f4e847461ea32ba7 + languageName: node + linkType: hard + +"minimatch@npm:3.0.4, minimatch@npm:^3.0.4": + version: 3.0.4 + resolution: "minimatch@npm:3.0.4" + dependencies: + brace-expansion: ^1.1.7 + checksum: 66ac295f8a7b59788000ea3749938b0970344c841750abd96694f80269b926ebcafad3deeb3f1da2522978b119e6ae3a5869b63b13a7859a456b3408bd18a078 + languageName: node + linkType: hard + +"minimist@npm:^1.2.0, minimist@npm:^1.2.5": + version: 1.2.5 + resolution: "minimist@npm:1.2.5" + checksum: 86706ce5b36c16bfc35c5fe3dbb01d5acdc9a22f2b6cc810b6680656a1d2c0e44a0159c9a3ba51fb072bb5c203e49e10b51dcd0eec39c481f4c42086719bae52 + languageName: node + linkType: hard + +"minipass-collect@npm:^1.0.2": + version: 1.0.2 + resolution: "minipass-collect@npm:1.0.2" + dependencies: + minipass: ^3.0.0 + checksum: 14df761028f3e47293aee72888f2657695ec66bd7d09cae7ad558da30415fdc4752bbfee66287dcc6fd5e6a2fa3466d6c484dc1cbd986525d9393b9523d97f10 + languageName: node + linkType: hard + +"minipass-fetch@npm:^1.3.0, minipass-fetch@npm:^1.3.2": + version: 1.3.4 + resolution: "minipass-fetch@npm:1.3.4" + dependencies: + encoding: ^0.1.12 + minipass: ^3.1.0 + minipass-sized: ^1.0.3 + minizlib: ^2.0.0 + dependenciesMeta: + encoding: + optional: true + checksum: 67cb59d30ba646d652a250e08833bb54463ef1fead6eea5b835a53e3f6b32410356b81948ba7be7634cbb1ab37ba497d3e1ddf203b9f0d0d7637728075f67124 + languageName: node + linkType: hard + +"minipass-flush@npm:^1.0.5": + version: 1.0.5 + resolution: "minipass-flush@npm:1.0.5" + dependencies: + minipass: ^3.0.0 + checksum: 56269a0b22bad756a08a94b1ffc36b7c9c5de0735a4dd1ab2b06c066d795cfd1f0ac44a0fcae13eece5589b908ecddc867f04c745c7009be0b566421ea0944cf + languageName: node + linkType: hard + +"minipass-json-stream@npm:^1.0.1": + version: 1.0.1 + resolution: "minipass-json-stream@npm:1.0.1" + dependencies: + jsonparse: ^1.3.1 + minipass: ^3.0.0 + checksum: 791b696a27d1074c4c08dab1bf5a9f3201145c2933e428f45d880467bce12c60de4703203d2928de4b162d0ae77b0bb4b55f96cb846645800aa0eb4919b3e796 + languageName: node + linkType: hard + +"minipass-pipeline@npm:^1.2.2, minipass-pipeline@npm:^1.2.4": + version: 1.2.4 + resolution: "minipass-pipeline@npm:1.2.4" + dependencies: + minipass: ^3.0.0 + checksum: b14240dac0d29823c3d5911c286069e36d0b81173d7bdf07a7e4a91ecdef92cdff4baaf31ea3746f1c61e0957f652e641223970870e2353593f382112257971b + languageName: node + linkType: hard + +"minipass-sized@npm:^1.0.3": + version: 1.0.3 + resolution: "minipass-sized@npm:1.0.3" + dependencies: + minipass: ^3.0.0 + checksum: 79076749fcacf21b5d16dd596d32c3b6bf4d6e62abb43868fac21674078505c8b15eaca4e47ed844985a4514854f917d78f588fcd029693709417d8f98b2bd60 + languageName: node + linkType: hard + +"minipass@npm:^3.0.0, minipass@npm:^3.1.0, minipass@npm:^3.1.1, minipass@npm:^3.1.3": + version: 3.1.3 + resolution: "minipass@npm:3.1.3" + dependencies: + yallist: ^4.0.0 + checksum: 74b623c1f996caafa66772301b66a1b634b20270f0d1a731ef86195d5a1a5f9984a773a1e88a6cecfd264d6c471c4c0fc8574cd96488f01c8f74c0b600021e55 + languageName: node + linkType: hard + +"minizlib@npm:^2.0.0, minizlib@npm:^2.1.1": + version: 2.1.2 + resolution: "minizlib@npm:2.1.2" + dependencies: + minipass: ^3.0.0 + yallist: ^4.0.0 + checksum: f1fdeac0b07cf8f30fcf12f4b586795b97be856edea22b5e9072707be51fc95d41487faec3f265b42973a304fe3a64acd91a44a3826a963e37b37bafde0212c3 + languageName: node + linkType: hard + +"mixin-deep@npm:^1.2.0": + version: 1.3.2 + resolution: "mixin-deep@npm:1.3.2" + dependencies: + for-in: ^1.0.2 + is-extendable: ^1.0.1 + checksum: 820d5a51fcb7479f2926b97f2c3bb223546bc915e6b3a3eb5d906dda871bba569863595424a76682f2b15718252954644f3891437cb7e3f220949bed54b1750d + languageName: node + linkType: hard + +"mkdirp@npm:^0.5.1, mkdirp@npm:^0.5.5": + version: 0.5.5 + resolution: "mkdirp@npm:0.5.5" + dependencies: + minimist: ^1.2.5 + bin: + mkdirp: bin/cmd.js + checksum: 3bce20ea525f9477befe458ab85284b0b66c8dc3812f94155af07c827175948cdd8114852ac6c6d82009b13c1048c37f6d98743eb019651ee25c39acc8aabe7d + languageName: node + linkType: hard + +"mkdirp@npm:^1.0.3, mkdirp@npm:^1.0.4, mkdirp@npm:~1.0.4": + version: 1.0.4 + resolution: "mkdirp@npm:1.0.4" + bin: + mkdirp: bin/cmd.js + checksum: a96865108c6c3b1b8e1d5e9f11843de1e077e57737602de1b82030815f311be11f96f09cce59bd5b903d0b29834733e5313f9301e3ed6d6f6fba2eae0df4298f + languageName: node + linkType: hard + +"ms@npm:2.0.0": + version: 2.0.0 + resolution: "ms@npm:2.0.0" + checksum: 0e6a22b8b746d2e0b65a430519934fefd41b6db0682e3477c10f60c76e947c4c0ad06f63ffdf1d78d335f83edee8c0aa928aa66a36c7cd95b69b26f468d527f4 + languageName: node + linkType: hard + +"ms@npm:2.1.1": + version: 2.1.1 + resolution: "ms@npm:2.1.1" + checksum: 0078a23cd916a9a7435c413caa14c57d4b4f6e2470e0ab554b6964163c8a4436448ac7ae020e883685475da6b6796cc396b670f579cb275db288a21e3e57721e + languageName: node + linkType: hard + +"ms@npm:2.1.2": + version: 2.1.2 + resolution: "ms@npm:2.1.2" + checksum: 673cdb2c3133eb050c745908d8ce632ed2c02d85640e2edb3ace856a2266a813b30c613569bf3354fdf4ea7d1a1494add3bfa95e2713baa27d0c2c71fc44f58f + languageName: node + linkType: hard + +"ms@npm:^2.0.0, ms@npm:^2.1.1": + version: 2.1.3 + resolution: "ms@npm:2.1.3" + checksum: aa92de608021b242401676e35cfa5aa42dd70cbdc082b916da7fb925c542173e36bce97ea3e804923fe92c0ad991434e4a38327e15a1b5b5f945d66df615ae6d + languageName: node + linkType: hard + +"multicast-dns-service-types@npm:^1.1.0": + version: 1.1.0 + resolution: "multicast-dns-service-types@npm:1.1.0" + checksum: 0979fca1cce85484d256e4db3af591d941b41a61f134da3607213d2624c12ed5b8a246565cb19a9b3cb542819e8fbc71a90b07e77023ee6a9515540fe1d371f7 + languageName: node + linkType: hard + +"multicast-dns@npm:^6.0.1": + version: 6.2.3 + resolution: "multicast-dns@npm:6.2.3" + dependencies: + dns-packet: ^1.3.1 + thunky: ^1.0.2 + bin: + multicast-dns: cli.js + checksum: f515b49ca964429ab48a4ac8041fcf969c927aeb49ab65288bd982e52c849a870fc3b03565780b0d194a1a02da8821f28b6425e48e95b8107bc9fcc92f571a6f + languageName: node + linkType: hard + +"mute-stream@npm:0.0.8": + version: 0.0.8 + resolution: "mute-stream@npm:0.0.8" + checksum: ff48d251fc3f827e5b1206cda0ffdaec885e56057ee86a3155e1951bc940fd5f33531774b1cc8414d7668c10a8907f863f6561875ee6e8768931a62121a531a1 + languageName: node + linkType: hard + +"nan@npm:^2.12.1": + version: 2.15.0 + resolution: "nan@npm:2.15.0" + dependencies: + node-gyp: latest + checksum: 33e1bb4dfca447fe37d4bb5889be55de154828632c8d38646db67293a21afd61ed9909cdf1b886214a64707d935926c4e60e2b09de9edfc2ad58de31d6ce8f39 + languageName: node + linkType: hard + +"nanoid@npm:^3.1.23": + version: 3.1.25 + resolution: "nanoid@npm:3.1.25" + bin: + nanoid: bin/nanoid.cjs + checksum: e2353828c7d8fde65265e9c981380102e2021f292038a93fd27288bad390339833286e8cbc7531abe1cb2c6b317e55f38b895dcb775151637bb487388558e0ff + languageName: node + linkType: hard + +"nanoid@npm:^3.1.30": + version: 3.1.30 + resolution: "nanoid@npm:3.1.30" + bin: + nanoid: bin/nanoid.cjs + checksum: 276d0d4b0c41c46aeefec5f09f093e4085a2352d06881c845db22b84f8ef72cc8defae6d76bfb1d8a2a128eb2dec42ab148d16582be4e7754c97905806ef57b6 + languageName: node + linkType: hard + +"nanomatch@npm:^1.2.9": + version: 1.2.13 + resolution: "nanomatch@npm:1.2.13" + dependencies: + arr-diff: ^4.0.0 + array-unique: ^0.3.2 + define-property: ^2.0.2 + extend-shallow: ^3.0.2 + fragment-cache: ^0.2.1 + is-windows: ^1.0.2 + kind-of: ^6.0.2 + object.pick: ^1.3.0 + regex-not: ^1.0.0 + snapdragon: ^0.8.1 + to-regex: ^3.0.1 + checksum: 54d4166d6ef08db41252eb4e96d4109ebcb8029f0374f9db873bd91a1f896c32ec780d2a2ea65c0b2d7caf1f28d5e1ea33746a470f32146ac8bba821d80d38d8 + languageName: node + linkType: hard + +"needle@npm:^2.5.2": + version: 2.9.0 + resolution: "needle@npm:2.9.0" + dependencies: + debug: ^3.2.6 + iconv-lite: ^0.4.4 + sax: ^1.2.4 + bin: + needle: bin/needle + checksum: d2dfe926b47491b788051eb76e4ee1d50b5732178482d6824d91c491f05f5dba03feaf4a7107a89415908690273d07411f43d8706f26c3d248c4177393d6da0e + languageName: node + linkType: hard + +"negotiator@npm:0.6.2, negotiator@npm:^0.6.2": + version: 0.6.2 + resolution: "negotiator@npm:0.6.2" + checksum: dfddaff6c06792f1c4c3809e29a427b8daef8cd437c83b08dd51d7ee11bbd1c29d9512d66b801144d6c98e910ffd8723f2432e0cbf8b18d41d2a09599c975ab3 + languageName: node + linkType: hard + +"neo-async@npm:^2.6.2": + version: 2.6.2 + resolution: "neo-async@npm:2.6.2" + checksum: deac9f8d00eda7b2e5cd1b2549e26e10a0faa70adaa6fdadca701cc55f49ee9018e427f424bac0c790b7c7e2d3068db97f3093f1093975f2acb8f8818b936ed9 + languageName: node + linkType: hard + +"ng-qrcode@npm:^5.2.0": + version: 5.2.0 + resolution: "ng-qrcode@npm:5.2.0" + dependencies: + qrcode: ^1.4.4 + tslib: ^2.0.0 + peerDependencies: + "@angular/common": ">=12 <13" + "@angular/core": ">=12 <13" + checksum: 6c0f04410aaa5b1abad66848f835f4134cbed803909eb129942d4389bbc5234ac0b403f74113fab3faad2639b4b24ea7858f51122c40f8bc522dad06da8e31a6 + languageName: node + linkType: hard + +"ngx-cookie-service@npm:^12.0.3": + version: 12.0.3 + resolution: "ngx-cookie-service@npm:12.0.3" + dependencies: + tslib: ^2.0.0 + peerDependencies: + "@angular/common": ^12.0.0 + "@angular/core": ^12.0.0 + checksum: 435b71b48c2852b9b78756d8fabd102845d0ec520c8ea055a19293d6da317a6bd02b72b02204ed65623a472cf69e8459a4f0b1ef7209f7179a5298d31cd502e1 + languageName: node + linkType: hard + +"ngx-webstorage@npm:^8.0.0": + version: 8.0.0 + resolution: "ngx-webstorage@npm:8.0.0" + dependencies: + tslib: ^2.0.0 + peerDependencies: + "@angular/common": ^12.0.0 + "@angular/core": ^12.0.0 + checksum: 9e73ba05955f5878bf3a2d76ef101d680aec48b07e3b68b3ee4c2343a023c02af47c42252b420ae19654c154d3d55de5ee3fc0bfa38310b0b681b0db8842ed60 + languageName: node + linkType: hard + +"nice-napi@npm:^1.0.2": + version: 1.0.2 + resolution: "nice-napi@npm:1.0.2" + dependencies: + node-addon-api: ^3.0.0 + node-gyp: latest + node-gyp-build: ^4.2.2 + conditions: "!os=win32" + languageName: node + linkType: hard + +"nice-try@npm:^1.0.4": + version: 1.0.5 + resolution: "nice-try@npm:1.0.5" + checksum: 0b4af3b5bb5d86c289f7a026303d192a7eb4417231fe47245c460baeabae7277bcd8fd9c728fb6bd62c30b3e15cd6620373e2cf33353b095d8b403d3e8a15aff + languageName: node + linkType: hard + +"node-addon-api@npm:^3.0.0": + version: 3.2.1 + resolution: "node-addon-api@npm:3.2.1" + dependencies: + node-gyp: latest + checksum: 2369986bb0881ccd9ef6bacdf39550e07e089a9c8ede1cbc5fc7712d8e2faa4d50da0e487e333d4125f8c7a616c730131d1091676c9d499af1d74560756b4a18 + languageName: node + linkType: hard + +"node-fetch@npm:2.6.1": + version: 2.6.1 + resolution: "node-fetch@npm:2.6.1" + checksum: 91075bedd57879117e310fbcc36983ad5d699e522edb1ebcdc4ee5294c982843982652925c3532729fdc86b2d64a8a827797a745f332040d91823c8752ee4d7c + languageName: node + linkType: hard + +"node-forge@npm:^0.10.0": + version: 0.10.0 + resolution: "node-forge@npm:0.10.0" + checksum: 5aa6dc9922e424a20ef101d2f517418e2bc9cfc0255dd22e0701c0fad1568445f510ee67f6f3fcdf085812c4ca1b847b8ba45683b34776828e41f5c1794e42e1 + languageName: node + linkType: hard + +"node-gyp-build@npm:^4.2.2": + version: 4.2.3 + resolution: "node-gyp-build@npm:4.2.3" + bin: + node-gyp-build: bin.js + node-gyp-build-optional: optional.js + node-gyp-build-test: build-test.js + checksum: 450d7b2016290d269343f8a33d13f4d7ccd0a38057af0d71a4d714fe06e6051da50b677a411ea9e240706253c4b53eb41e1b050df72d75d796b2e4d91b2757ae + languageName: node + linkType: hard + +"node-gyp@npm:^7.1.0": + version: 7.1.2 + resolution: "node-gyp@npm:7.1.2" + dependencies: + env-paths: ^2.2.0 + glob: ^7.1.4 + graceful-fs: ^4.2.3 + nopt: ^5.0.0 + npmlog: ^4.1.2 + request: ^2.88.2 + rimraf: ^3.0.2 + semver: ^7.3.2 + tar: ^6.0.2 + which: ^2.0.2 + bin: + node-gyp: bin/node-gyp.js + checksum: 08582720f28f9a9bb64bc9cbe2f58b159c0258326a9c898e4e95d2f2d8002f44602338111ebf980e5aa47a3421e071525b758923b76855d780fab8cc03279ae0 + languageName: node + linkType: hard + +"node-gyp@npm:latest": + version: 8.3.0 + resolution: "node-gyp@npm:8.3.0" + dependencies: + env-paths: ^2.2.0 + glob: ^7.1.4 + graceful-fs: ^4.2.6 + make-fetch-happen: ^9.1.0 + nopt: ^5.0.0 + npmlog: ^4.1.2 + rimraf: ^3.0.2 + semver: ^7.3.5 + tar: ^6.1.2 + which: ^2.0.2 + bin: + node-gyp: bin/node-gyp.js + checksum: a0304728eb56c99ce61b3210b934d247b72bba81658d1d92fc0f125bbdd252bbcdedcd949a09ead9e52d6fa742301945ead06d0e2d67f614f4426b5fc6d30996 + languageName: node + linkType: hard + +"node-notifier@npm:^9.0.0": + version: 9.0.1 + resolution: "node-notifier@npm:9.0.1" + dependencies: + growly: ^1.3.0 + is-wsl: ^2.2.0 + semver: ^7.3.2 + shellwords: ^0.1.1 + uuid: ^8.3.0 + which: ^2.0.2 + checksum: a75623912ec6c3fd7c4e6f1c04586adf716a3610268bdbd5adfeb95dc75a2126c10368d98051530aa0dc6fe8d72791d5033ad6dd2a5f63d009fea30f7292f07e + languageName: node + linkType: hard + +"node-releases@npm:^1.1.75": + version: 1.1.75 + resolution: "node-releases@npm:1.1.75" + checksum: 74028e7d193c9c5986b2f6bb51f4f6405a3f144599bbb19751c81faece52af8eb3f5abac40cbcd11ead44be3f856be125aa71fbb8dd8bf0c7f90caa94179ee51 + languageName: node + linkType: hard + +"nopt@npm:^5.0.0": + version: 5.0.0 + resolution: "nopt@npm:5.0.0" + dependencies: + abbrev: 1 + bin: + nopt: bin/nopt.js + checksum: d35fdec187269503843924e0114c0c6533fb54bbf1620d0f28b4b60ba01712d6687f62565c55cc20a504eff0fbe5c63e22340c3fad549ad40469ffb611b04f2f + languageName: node + linkType: hard + +"normalize-path@npm:^2.1.1": + version: 2.1.1 + resolution: "normalize-path@npm:2.1.1" + dependencies: + remove-trailing-separator: ^1.0.1 + checksum: 7e9cbdcf7f5b8da7aa191fbfe33daf290cdcd8c038f422faf1b8a83c972bf7a6d94c5be34c4326cb00fb63bc0fd97d9fbcfaf2e5d6142332c2cd36d2e1b86cea + languageName: node + linkType: hard + +"normalize-path@npm:^3.0.0, normalize-path@npm:~3.0.0": + version: 3.0.0 + resolution: "normalize-path@npm:3.0.0" + checksum: 88eeb4da891e10b1318c4b2476b6e2ecbeb5ff97d946815ffea7794c31a89017c70d7f34b3c2ebf23ef4e9fc9fb99f7dffe36da22011b5b5c6ffa34f4873ec20 + languageName: node + linkType: hard + +"normalize-range@npm:^0.1.2": + version: 0.1.2 + resolution: "normalize-range@npm:0.1.2" + checksum: 9b2f14f093593f367a7a0834267c24f3cb3e887a2d9809c77d8a7e5fd08738bcd15af46f0ab01cc3a3d660386f015816b5c922cea8bf2ee79777f40874063184 + languageName: node + linkType: hard + +"normalize-url@npm:^6.0.1": + version: 6.1.0 + resolution: "normalize-url@npm:6.1.0" + checksum: 4a4944631173e7d521d6b80e4c85ccaeceb2870f315584fa30121f505a6dfd86439c5e3fdd8cd9e0e291290c41d0c3599f0cb12ab356722ed242584c30348e50 + languageName: node + linkType: hard + +"npm-bundled@npm:^1.1.1": + version: 1.1.2 + resolution: "npm-bundled@npm:1.1.2" + dependencies: + npm-normalize-package-bin: ^1.0.1 + checksum: 6e599155ef28d0b498622f47f1ba189dfbae05095a1ed17cb3a5babf961e965dd5eab621f0ec6f0a98de774e5836b8f5a5ee639010d64f42850a74acec3d4d09 + languageName: node + linkType: hard + +"npm-install-checks@npm:^4.0.0": + version: 4.0.0 + resolution: "npm-install-checks@npm:4.0.0" + dependencies: + semver: ^7.1.1 + checksum: 8308ff48e61e0863d7f148f62543e1f6c832525a7d8002ea742d5e478efa8b29bf65a87f9fb82786e15232e4b3d0362b126c45afdceed4c051c0d3c227dd0ace + languageName: node + linkType: hard + +"npm-normalize-package-bin@npm:^1.0.1": + version: 1.0.1 + resolution: "npm-normalize-package-bin@npm:1.0.1" + checksum: ae7f15155a1e3ace2653f12ddd1ee8eaa3c84452fdfbf2f1943e1de264e4b079c86645e2c55931a51a0a498cba31f70022a5219d5665fbcb221e99e58bc70122 + languageName: node + linkType: hard + +"npm-package-arg@npm:8.1.5, npm-package-arg@npm:^8.0.0, npm-package-arg@npm:^8.0.1, npm-package-arg@npm:^8.1.2": + version: 8.1.5 + resolution: "npm-package-arg@npm:8.1.5" + dependencies: + hosted-git-info: ^4.0.1 + semver: ^7.3.4 + validate-npm-package-name: ^3.0.0 + checksum: ae76afbcebb4ea8d0b849b8b18ed1b0491030fb04a0af5d75f1b8390cc50bec186ced9fbe60f47d939eab630c7c0db0919d879ac56a87d3782267dfe8eec60d3 + languageName: node + linkType: hard + +"npm-packlist@npm:^2.1.4": + version: 2.2.2 + resolution: "npm-packlist@npm:2.2.2" + dependencies: + glob: ^7.1.6 + ignore-walk: ^3.0.3 + npm-bundled: ^1.1.1 + npm-normalize-package-bin: ^1.0.1 + bin: + npm-packlist: bin/index.js + checksum: 799ce94b077e4dc366a9a5bcc5f006669263bb1a48d6948161aed915fd2f11dea8a7cf516a63fc78e5df059915591dade5928f0738baadc99a8ab4685d8b58c3 + languageName: node + linkType: hard + +"npm-pick-manifest@npm:6.1.1, npm-pick-manifest@npm:^6.0.0, npm-pick-manifest@npm:^6.1.1": + version: 6.1.1 + resolution: "npm-pick-manifest@npm:6.1.1" + dependencies: + npm-install-checks: ^4.0.0 + npm-normalize-package-bin: ^1.0.1 + npm-package-arg: ^8.1.2 + semver: ^7.3.4 + checksum: 7a7b9475ae95cf903d37471229efbd12a829a9a7a1020ba36e75768aaa35da4c3a087fde3f06070baf81ec6b2ea2b660f022a1172644e6e7188199d7c1d2954b + languageName: node + linkType: hard + +"npm-registry-fetch@npm:^11.0.0": + version: 11.0.0 + resolution: "npm-registry-fetch@npm:11.0.0" + dependencies: + make-fetch-happen: ^9.0.1 + minipass: ^3.1.3 + minipass-fetch: ^1.3.0 + minipass-json-stream: ^1.0.1 + minizlib: ^2.0.0 + npm-package-arg: ^8.0.0 + checksum: dda149cd86f8ee73db1b0a0302fbf59983ef03ad180051caa9aad1de9f1e099aaa77adcda3ca2c3bd9d98958e9e6593bd56ee21d3f660746b0a65fafbf5ae161 + languageName: node + linkType: hard + +"npm-run-path@npm:^2.0.0": + version: 2.0.2 + resolution: "npm-run-path@npm:2.0.2" + dependencies: + path-key: ^2.0.0 + checksum: acd5ad81648ba4588ba5a8effb1d98d2b339d31be16826a118d50f182a134ac523172101b82eab1d01cb4c2ba358e857d54cfafd8163a1ffe7bd52100b741125 + languageName: node + linkType: hard + +"npm-run-path@npm:^4.0.0": + version: 4.0.1 + resolution: "npm-run-path@npm:4.0.1" + dependencies: + path-key: ^3.0.0 + checksum: 5374c0cea4b0bbfdfae62da7bbdf1e1558d338335f4cacf2515c282ff358ff27b2ecb91ffa5330a8b14390ac66a1e146e10700440c1ab868208430f56b5f4d23 + languageName: node + linkType: hard + +"npmlog@npm:^4.1.2": + version: 4.1.2 + resolution: "npmlog@npm:4.1.2" + dependencies: + are-we-there-yet: ~1.1.2 + console-control-strings: ~1.1.0 + gauge: ~2.7.3 + set-blocking: ~2.0.0 + checksum: edbda9f95ec20957a892de1839afc6fb735054c3accf6fbefe767bac9a639fd5cea2baeac6bd2bcd50a85cb54924d57d9886c81c7fbc2332c2ddd19227504192 + languageName: node + linkType: hard + +"nth-check@npm:^2.0.0": + version: 2.0.0 + resolution: "nth-check@npm:2.0.0" + dependencies: + boolbase: ^1.0.0 + checksum: a22eb19616719d46a5b517f76c32e67e4a2b6a229d67ba2f3efb296e24d79687d52b904c2298cd16510215d5d2a419f8ba671f5957a3b4b73905f62ba7aafa3b + languageName: node + linkType: hard + +"num2fraction@npm:^1.2.2": + version: 1.2.2 + resolution: "num2fraction@npm:1.2.2" + checksum: 1da9c6797b505d3f5b17c7f694c4fa31565bdd5c0e5d669553253aed848a580804cd285280e8a73148bd9628839267daee4967f24b53d4e893e44b563e412635 + languageName: node + linkType: hard + +"number-is-nan@npm:^1.0.0": + version: 1.0.1 + resolution: "number-is-nan@npm:1.0.1" + checksum: 13656bc9aa771b96cef209ffca31c31a03b507ca6862ba7c3f638a283560620d723d52e626d57892c7fff475f4c36ac07f0600f14544692ff595abff214b9ffb + languageName: node + linkType: hard + +"oauth-sign@npm:~0.9.0": + version: 0.9.0 + resolution: "oauth-sign@npm:0.9.0" + checksum: 8f5497a127967866a3c67094c21efd295e46013a94e6e828573c62220e9af568cc1d2d04b16865ba583e430510fa168baf821ea78f355146d8ed7e350fc44c64 + languageName: node + linkType: hard + +"object-assign@npm:^4, object-assign@npm:^4.0.1, object-assign@npm:^4.1.0": + version: 4.1.1 + resolution: "object-assign@npm:4.1.1" + checksum: fcc6e4ea8c7fe48abfbb552578b1c53e0d194086e2e6bbbf59e0a536381a292f39943c6e9628af05b5528aa5e3318bb30d6b2e53cadaf5b8fe9e12c4b69af23f + languageName: node + linkType: hard + +"object-copy@npm:^0.1.0": + version: 0.1.0 + resolution: "object-copy@npm:0.1.0" + dependencies: + copy-descriptor: ^0.1.0 + define-property: ^0.2.5 + kind-of: ^3.0.3 + checksum: a9e35f07e3a2c882a7e979090360d1a20ab51d1fa19dfdac3aa8873b328a7c4c7683946ee97c824ae40079d848d6740a3788fa14f2185155dab7ed970a72c783 + languageName: node + linkType: hard + +"object-is@npm:^1.0.1": + version: 1.1.5 + resolution: "object-is@npm:1.1.5" + dependencies: + call-bind: ^1.0.2 + define-properties: ^1.1.3 + checksum: 989b18c4cba258a6b74dc1d74a41805c1a1425bce29f6cabb50dcb1a6a651ea9104a1b07046739a49a5bb1bc49727bcb00efd5c55f932f6ea04ec8927a7901fe + languageName: node + linkType: hard + +"object-keys@npm:^1.0.12, object-keys@npm:^1.1.1": + version: 1.1.1 + resolution: "object-keys@npm:1.1.1" + checksum: b363c5e7644b1e1b04aa507e88dcb8e3a2f52b6ffd0ea801e4c7a62d5aa559affe21c55a07fd4b1fd55fc03a33c610d73426664b20032405d7b92a1414c34d6a + languageName: node + linkType: hard + +"object-visit@npm:^1.0.0": + version: 1.0.1 + resolution: "object-visit@npm:1.0.1" + dependencies: + isobject: ^3.0.0 + checksum: b0ee07f5bf3bb881b881ff53b467ebbde2b37ebb38649d6944a6cd7681b32eedd99da9bd1e01c55facf81f54ed06b13af61aba6ad87f0052982995e09333f790 + languageName: node + linkType: hard + +"object.assign@npm:^4.1.0": + version: 4.1.2 + resolution: "object.assign@npm:4.1.2" + dependencies: + call-bind: ^1.0.0 + define-properties: ^1.1.3 + has-symbols: ^1.0.1 + object-keys: ^1.1.1 + checksum: d621d832ed7b16ac74027adb87196804a500d80d9aca536fccb7ba48d33a7e9306a75f94c1d29cbfa324bc091bfc530bc24789568efdaee6a47fcfa298993814 + languageName: node + linkType: hard + +"object.pick@npm:^1.3.0": + version: 1.3.0 + resolution: "object.pick@npm:1.3.0" + dependencies: + isobject: ^3.0.1 + checksum: 77fb6eed57c67adf75e9901187e37af39f052ef601cb4480386436561357eb9e459e820762f01fd02c5c1b42ece839ad393717a6d1850d848ee11fbabb3e580a + languageName: node + linkType: hard + +"obuf@npm:^1.0.0, obuf@npm:^1.1.2": + version: 1.1.2 + resolution: "obuf@npm:1.1.2" + checksum: 41a2ba310e7b6f6c3b905af82c275bf8854896e2e4c5752966d64cbcd2f599cfffd5932006bcf3b8b419dfdacebb3a3912d5d94e10f1d0acab59876c8757f27f + languageName: node + linkType: hard + +"on-finished@npm:~2.3.0": + version: 2.3.0 + resolution: "on-finished@npm:2.3.0" + dependencies: + ee-first: 1.1.1 + checksum: 1db595bd963b0124d6fa261d18320422407b8f01dc65863840f3ddaaf7bcad5b28ff6847286703ca53f4ec19595bd67a2f1253db79fc4094911ec6aa8df1671b + languageName: node + linkType: hard + +"on-headers@npm:~1.0.2": + version: 1.0.2 + resolution: "on-headers@npm:1.0.2" + checksum: 2bf13467215d1e540a62a75021e8b318a6cfc5d4fc53af8e8f84ad98dbcea02d506c6d24180cd62e1d769c44721ba542f3154effc1f7579a8288c9f7873ed8e5 + languageName: node + linkType: hard + +"once@npm:^1.3.0, once@npm:^1.3.1, once@npm:^1.4.0": + version: 1.4.0 + resolution: "once@npm:1.4.0" + dependencies: + wrappy: 1 + checksum: cd0a88501333edd640d95f0d2700fbde6bff20b3d4d9bdc521bdd31af0656b5706570d6c6afe532045a20bb8dc0849f8332d6f2a416e0ba6d3d3b98806c7db68 + languageName: node + linkType: hard + +"onetime@npm:^5.1.0": + version: 5.1.2 + resolution: "onetime@npm:5.1.2" + dependencies: + mimic-fn: ^2.1.0 + checksum: 2478859ef817fc5d4e9c2f9e5728512ddd1dbc9fb7829ad263765bb6d3b91ce699d6e2332eef6b7dff183c2f490bd3349f1666427eaba4469fba0ac38dfd0d34 + languageName: node + linkType: hard + +"open@npm:8.2.1": + version: 8.2.1 + resolution: "open@npm:8.2.1" + dependencies: + define-lazy-prop: ^2.0.0 + is-docker: ^2.1.1 + is-wsl: ^2.2.0 + checksum: fcde0059188dd497e080436f81c5240dad0bebd331d1c856a532d4b870808bdc5770ef7c5c4b83143fd0c0577fe2b580e54c03357d695771259aa59f64cf0f40 + languageName: node + linkType: hard + +"opn@npm:^5.5.0": + version: 5.5.0 + resolution: "opn@npm:5.5.0" + dependencies: + is-wsl: ^1.1.0 + checksum: 35b677b5a1fd6c8cb1996b0607671ba79f7ce9fa029217d54eafaf6bee13eb7e700691c6a415009140fd02a435fffdfd143875f3b233b60f3f9d631c6f6b81a0 + languageName: node + linkType: hard + +"ora@npm:5.4.1, ora@npm:^5.3.0": + version: 5.4.1 + resolution: "ora@npm:5.4.1" + dependencies: + bl: ^4.1.0 + chalk: ^4.1.0 + cli-cursor: ^3.1.0 + cli-spinners: ^2.5.0 + is-interactive: ^1.0.0 + is-unicode-supported: ^0.1.0 + log-symbols: ^4.1.0 + strip-ansi: ^6.0.0 + wcwidth: ^1.0.1 + checksum: 28d476ee6c1049d68368c0dc922e7225e3b5600c3ede88fade8052837f9ed342625fdaa84a6209302587c8ddd9b664f71f0759833cbdb3a4cf81344057e63c63 + languageName: node + linkType: hard + +"original@npm:^1.0.0": + version: 1.0.2 + resolution: "original@npm:1.0.2" + dependencies: + url-parse: ^1.4.3 + checksum: 8dca9311dab50c8953366127cb86b7c07bf547d6aa6dc6873a75964b7563825351440557e5724d9c652c5e99043b8295624f106af077f84bccf19592e421beb9 + languageName: node + linkType: hard + +"os-tmpdir@npm:~1.0.2": + version: 1.0.2 + resolution: "os-tmpdir@npm:1.0.2" + checksum: 5666560f7b9f10182548bf7013883265be33620b1c1b4a4d405c25be2636f970c5488ff3e6c48de75b55d02bde037249fe5dbfbb4c0fb7714953d56aed062e6d + languageName: node + linkType: hard + +"ospath@npm:^1.2.2": + version: 1.2.2 + resolution: "ospath@npm:1.2.2" + checksum: 505f48a4f4f1c557d6c656ec985707726e3714721680139be037613e903aa8c8fa4ddd8d1342006f9b2dc0065e6e20f8b7bea2ee05354f31257044790367b347 + languageName: node + linkType: hard + +"p-defer@npm:^1.0.0": + version: 1.0.0 + resolution: "p-defer@npm:1.0.0" + checksum: 4271b935c27987e7b6f229e5de4cdd335d808465604644cb7b4c4c95bef266735859a93b16415af8a41fd663ee9e3b97a1a2023ca9def613dba1bad2a0da0c7b + languageName: node + linkType: hard + +"p-finally@npm:^1.0.0": + version: 1.0.0 + resolution: "p-finally@npm:1.0.0" + checksum: 93a654c53dc805dd5b5891bab16eb0ea46db8f66c4bfd99336ae929323b1af2b70a8b0654f8f1eae924b2b73d037031366d645f1fd18b3d30cbd15950cc4b1d4 + languageName: node + linkType: hard + +"p-limit@npm:^2.0.0, p-limit@npm:^2.2.0": + version: 2.3.0 + resolution: "p-limit@npm:2.3.0" + dependencies: + p-try: ^2.0.0 + checksum: 84ff17f1a38126c3314e91ecfe56aecbf36430940e2873dadaa773ffe072dc23b7af8e46d4b6485d302a11673fe94c6b67ca2cfbb60c989848b02100d0594ac1 + languageName: node + linkType: hard + +"p-limit@npm:^3.0.2, p-limit@npm:^3.1.0": + version: 3.1.0 + resolution: "p-limit@npm:3.1.0" + dependencies: + yocto-queue: ^0.1.0 + checksum: 7c3690c4dbf62ef625671e20b7bdf1cbc9534e83352a2780f165b0d3ceba21907e77ad63401708145ca4e25bfc51636588d89a8c0aeb715e6c37d1c066430360 + languageName: node + linkType: hard + +"p-locate@npm:^3.0.0": + version: 3.0.0 + resolution: "p-locate@npm:3.0.0" + dependencies: + p-limit: ^2.0.0 + checksum: 83991734a9854a05fe9dbb29f707ea8a0599391f52daac32b86f08e21415e857ffa60f0e120bfe7ce0cc4faf9274a50239c7895fc0d0579d08411e513b83a4ae + languageName: node + linkType: hard + +"p-locate@npm:^4.1.0": + version: 4.1.0 + resolution: "p-locate@npm:4.1.0" + dependencies: + p-limit: ^2.2.0 + checksum: 513bd14a455f5da4ebfcb819ef706c54adb09097703de6aeaa5d26fe5ea16df92b48d1ac45e01e3944ce1e6aa2a66f7f8894742b8c9d6e276e16cd2049a2b870 + languageName: node + linkType: hard + +"p-map@npm:^2.0.0": + version: 2.1.0 + resolution: "p-map@npm:2.1.0" + checksum: 9e3ad3c9f6d75a5b5661bcad78c91f3a63849189737cd75e4f1225bf9ac205194e5c44aac2ef6f09562b1facdb9bd1425584d7ac375bfaa17b3f1a142dab936d + languageName: node + linkType: hard + +"p-map@npm:^4.0.0": + version: 4.0.0 + resolution: "p-map@npm:4.0.0" + dependencies: + aggregate-error: ^3.0.0 + checksum: cb0ab21ec0f32ddffd31dfc250e3afa61e103ef43d957cc45497afe37513634589316de4eb88abdfd969fe6410c22c0b93ab24328833b8eb1ccc087fc0442a1c + languageName: node + linkType: hard + +"p-retry@npm:^3.0.1": + version: 3.0.1 + resolution: "p-retry@npm:3.0.1" + dependencies: + retry: ^0.12.0 + checksum: 702efc63fc13ef7fc0bab9a1b08432ab38a0236efcbce64af0cf692030ba6ed8009f29ba66e3301cb98dc69ef33e7ccab29ba1ac2bea897f802f81f4f7e468dd + languageName: node + linkType: hard + +"p-try@npm:^2.0.0": + version: 2.2.0 + resolution: "p-try@npm:2.2.0" + checksum: f8a8e9a7693659383f06aec604ad5ead237c7a261c18048a6e1b5b85a5f8a067e469aa24f5bc009b991ea3b058a87f5065ef4176793a200d4917349881216cae + languageName: node + linkType: hard + +"pacote@npm:11.3.5": + version: 11.3.5 + resolution: "pacote@npm:11.3.5" + dependencies: + "@npmcli/git": ^2.1.0 + "@npmcli/installed-package-contents": ^1.0.6 + "@npmcli/promise-spawn": ^1.2.0 + "@npmcli/run-script": ^1.8.2 + cacache: ^15.0.5 + chownr: ^2.0.0 + fs-minipass: ^2.1.0 + infer-owner: ^1.0.4 + minipass: ^3.1.3 + mkdirp: ^1.0.3 + npm-package-arg: ^8.0.1 + npm-packlist: ^2.1.4 + npm-pick-manifest: ^6.0.0 + npm-registry-fetch: ^11.0.0 + promise-retry: ^2.0.1 + read-package-json-fast: ^2.0.1 + rimraf: ^3.0.2 + ssri: ^8.0.1 + tar: ^6.1.0 + bin: + pacote: lib/bin.js + checksum: 4fae0b1429be77e69972402dad24775999c92198dadc20f1f7a418f24e268e8bf85faaffc3f778d94c21348645f99bb65ef519fb82776902b556eef934afd932 + languageName: node + linkType: hard + +"pako@npm:^1.0.3": + version: 1.0.11 + resolution: "pako@npm:1.0.11" + checksum: 1be2bfa1f807608c7538afa15d6f25baa523c30ec870a3228a89579e474a4d992f4293859524e46d5d87fd30fa17c5edf34dbef0671251d9749820b488660b16 + languageName: node + linkType: hard + +"parent-module@npm:^1.0.0": + version: 1.0.1 + resolution: "parent-module@npm:1.0.1" + dependencies: + callsites: ^3.0.0 + checksum: 6ba8b255145cae9470cf5551eb74be2d22281587af787a2626683a6c20fbb464978784661478dd2a3f1dad74d1e802d403e1b03c1a31fab310259eec8ac560ff + languageName: node + linkType: hard + +"parse-json@npm:^5.0.0": + version: 5.2.0 + resolution: "parse-json@npm:5.2.0" + dependencies: + "@babel/code-frame": ^7.0.0 + error-ex: ^1.3.1 + json-parse-even-better-errors: ^2.3.0 + lines-and-columns: ^1.1.6 + checksum: 62085b17d64da57f40f6afc2ac1f4d95def18c4323577e1eced571db75d9ab59b297d1d10582920f84b15985cbfc6b6d450ccbf317644cfa176f3ed982ad87e2 + languageName: node + linkType: hard + +"parse-node-version@npm:^1.0.1": + version: 1.0.1 + resolution: "parse-node-version@npm:1.0.1" + checksum: c192393b6a978092c1ef8df2c42c0a02e4534b96543e23d335f1b9b5b913ac75473d18fe6050b58d6995c57fb383ee71a5cb8397e363caaf38a6df8215cc52fd + languageName: node + linkType: hard + +"parse5-html-rewriting-stream@npm:6.0.1": + version: 6.0.1 + resolution: "parse5-html-rewriting-stream@npm:6.0.1" + dependencies: + parse5: ^6.0.1 + parse5-sax-parser: ^6.0.1 + checksum: 41b8c8ac611e2d478fe46fabb6b624b939bede68dc095beaf4e0a014cc095f0cb12cff62200f3cd39374b62ba91b8284f6c49d4bea8bc398085182408e2a2f5d + languageName: node + linkType: hard + +"parse5-htmlparser2-tree-adapter@npm:^6.0.1": + version: 6.0.1 + resolution: "parse5-htmlparser2-tree-adapter@npm:6.0.1" + dependencies: + parse5: ^6.0.1 + checksum: 1848378b355d027915645c13f13f982e60502d201f53bc2067a508bf2dba4aac08219fc781dcd160167f5f50f0c73f58d20fa4fb3d90ee46762c20234fa90a6d + languageName: node + linkType: hard + +"parse5-sax-parser@npm:^6.0.1": + version: 6.0.1 + resolution: "parse5-sax-parser@npm:6.0.1" + dependencies: + parse5: ^6.0.1 + checksum: c62961aeac04a1fc4a6ce1053520da935694abb877d2b8284258361768b10c424e2c1a25aec22aa1e7841d36a74caddf79a0544020bdb43c7d57f90a5f7bacca + languageName: node + linkType: hard + +"parse5@npm:^6.0.1": + version: 6.0.1 + resolution: "parse5@npm:6.0.1" + checksum: 7d569a176c5460897f7c8f3377eff640d54132b9be51ae8a8fa4979af940830b2b0c296ce75e5bd8f4041520aadde13170dbdec44889975f906098ea0002f4bd + languageName: node + linkType: hard + +"parseurl@npm:~1.3.2, parseurl@npm:~1.3.3": + version: 1.3.3 + resolution: "parseurl@npm:1.3.3" + checksum: 407cee8e0a3a4c5cd472559bca8b6a45b82c124e9a4703302326e9ab60fc1081442ada4e02628efef1eb16197ddc7f8822f5a91fd7d7c86b51f530aedb17dfa2 + languageName: node + linkType: hard + +"pascalcase@npm:^0.1.1": + version: 0.1.1 + resolution: "pascalcase@npm:0.1.1" + checksum: f83681c3c8ff75fa473a2bb2b113289952f802ff895d435edd717e7cb898b0408cbdb247117a938edcbc5d141020909846cc2b92c47213d764e2a94d2ad2b925 + languageName: node + linkType: hard + +"path-dirname@npm:^1.0.0": + version: 1.0.2 + resolution: "path-dirname@npm:1.0.2" + checksum: 0d2f6604ae05a252a0025318685f290e2764ecf9c5436f203cdacfc8c0b17c24cdedaa449d766beb94ab88cc7fc70a09ec21e7933f31abc2b719180883e5e33f + languageName: node + linkType: hard + +"path-exists@npm:^3.0.0": + version: 3.0.0 + resolution: "path-exists@npm:3.0.0" + checksum: 96e92643aa34b4b28d0de1cd2eba52a1c5313a90c6542d03f62750d82480e20bfa62bc865d5cfc6165f5fcd5aeb0851043c40a39be5989646f223300021bae0a + languageName: node + linkType: hard + +"path-exists@npm:^4.0.0": + version: 4.0.0 + resolution: "path-exists@npm:4.0.0" + checksum: 505807199dfb7c50737b057dd8d351b82c033029ab94cb10a657609e00c1bc53b951cfdbccab8de04c5584d5eff31128ce6afd3db79281874a5ef2adbba55ed1 + languageName: node + linkType: hard + +"path-is-absolute@npm:^1.0.0": + version: 1.0.1 + resolution: "path-is-absolute@npm:1.0.1" + checksum: 060840f92cf8effa293bcc1bea81281bd7d363731d214cbe5c227df207c34cd727430f70c6037b5159c8a870b9157cba65e775446b0ab06fd5ecc7e54615a3b8 + languageName: node + linkType: hard + +"path-is-inside@npm:^1.0.2": + version: 1.0.2 + resolution: "path-is-inside@npm:1.0.2" + checksum: 0b5b6c92d3018b82afb1f74fe6de6338c4c654de4a96123cb343f2b747d5606590ac0c890f956ed38220a4ab59baddfd7b713d78a62d240b20b14ab801fa02cb + languageName: node + linkType: hard + +"path-key@npm:^2.0.0, path-key@npm:^2.0.1": + version: 2.0.1 + resolution: "path-key@npm:2.0.1" + checksum: f7ab0ad42fe3fb8c7f11d0c4f849871e28fbd8e1add65c370e422512fc5887097b9cf34d09c1747d45c942a8c1e26468d6356e2df3f740bf177ab8ca7301ebfd + languageName: node + linkType: hard + +"path-key@npm:^3.0.0, path-key@npm:^3.1.0": + version: 3.1.1 + resolution: "path-key@npm:3.1.1" + checksum: 55cd7a9dd4b343412a8386a743f9c746ef196e57c823d90ca3ab917f90ab9f13dd0ded27252ba49dbdfcab2b091d998bc446f6220cd3cea65db407502a740020 + languageName: node + linkType: hard + +"path-parse@npm:^1.0.6": + version: 1.0.7 + resolution: "path-parse@npm:1.0.7" + checksum: 49abf3d81115642938a8700ec580da6e830dde670be21893c62f4e10bd7dd4c3742ddc603fe24f898cba7eb0c6bc1777f8d9ac14185d34540c6d4d80cd9cae8a + languageName: node + linkType: hard + +"path-to-regexp@npm:0.1.7": + version: 0.1.7 + resolution: "path-to-regexp@npm:0.1.7" + checksum: 69a14ea24db543e8b0f4353305c5eac6907917031340e5a8b37df688e52accd09e3cebfe1660b70d76b6bd89152f52183f28c74813dbf454ba1a01c82a38abce + languageName: node + linkType: hard + +"path-type@npm:^4.0.0": + version: 4.0.0 + resolution: "path-type@npm:4.0.0" + checksum: 5b1e2daa247062061325b8fdbfd1fb56dde0a448fb1455453276ea18c60685bdad23a445dc148cf87bc216be1573357509b7d4060494a6fd768c7efad833ee45 + languageName: node + linkType: hard + +"pend@npm:~1.2.0": + version: 1.2.0 + resolution: "pend@npm:1.2.0" + checksum: 6c72f5243303d9c60bd98e6446ba7d30ae29e3d56fdb6fae8767e8ba6386f33ee284c97efe3230a0d0217e2b1723b8ab490b1bbf34fcbb2180dbc8a9de47850d + languageName: node + linkType: hard + +"performance-now@npm:^2.1.0": + version: 2.1.0 + resolution: "performance-now@npm:2.1.0" + checksum: 534e641aa8f7cba160f0afec0599b6cecefbb516a2e837b512be0adbe6c1da5550e89c78059c7fabc5c9ffdf6627edabe23eb7c518c4500067a898fa65c2b550 + languageName: node + linkType: hard + +"picocolors@npm:^1.0.0": + version: 1.0.0 + resolution: "picocolors@npm:1.0.0" + checksum: a2e8092dd86c8396bdba9f2b5481032848525b3dc295ce9b57896f931e63fc16f79805144321f72976383fc249584672a75cc18d6777c6b757603f372f745981 + languageName: node + linkType: hard + +"picomatch@npm:^2.0.4, picomatch@npm:^2.2.1, picomatch@npm:^2.2.3": + version: 2.3.0 + resolution: "picomatch@npm:2.3.0" + checksum: 16818720ea7c5872b6af110760dee856c8e4cd79aed1c7a006d076b1cc09eff3ae41ca5019966694c33fbd2e1cc6ea617ab10e4adac6df06556168f13be3fca2 + languageName: node + linkType: hard + +"pify@npm:^2.0.0, pify@npm:^2.2.0, pify@npm:^2.3.0": + version: 2.3.0 + resolution: "pify@npm:2.3.0" + checksum: 9503aaeaf4577acc58642ad1d25c45c6d90288596238fb68f82811c08104c800e5a7870398e9f015d82b44ecbcbef3dc3d4251a1cbb582f6e5959fe09884b2ba + languageName: node + linkType: hard + +"pify@npm:^4.0.1": + version: 4.0.1 + resolution: "pify@npm:4.0.1" + checksum: 9c4e34278cb09987685fa5ef81499c82546c033713518f6441778fbec623fc708777fe8ac633097c72d88470d5963094076c7305cafc7ad340aae27cfacd856b + languageName: node + linkType: hard + +"pinkie-promise@npm:^2.0.0": + version: 2.0.1 + resolution: "pinkie-promise@npm:2.0.1" + dependencies: + pinkie: ^2.0.0 + checksum: b53a4a2e73bf56b6f421eef711e7bdcb693d6abb474d57c5c413b809f654ba5ee750c6a96dd7225052d4b96c4d053cdcb34b708a86fceed4663303abee52fcca + languageName: node + linkType: hard + +"pinkie@npm:^2.0.0": + version: 2.0.4 + resolution: "pinkie@npm:2.0.4" + checksum: b12b10afea1177595aab036fc220785488f67b4b0fc49e7a27979472592e971614fa1c728e63ad3e7eb748b4ec3c3dbd780819331dad6f7d635c77c10537b9db + languageName: node + linkType: hard + +"piscina@npm:3.1.0": + version: 3.1.0 + resolution: "piscina@npm:3.1.0" + dependencies: + eventemitter-asyncresource: ^1.0.0 + hdr-histogram-js: ^2.0.1 + hdr-histogram-percentiles-obj: ^3.0.0 + nice-napi: ^1.0.2 + dependenciesMeta: + nice-napi: + optional: true + checksum: ae093257c3b4a54ead4687f1423716137c4e8e0012616bb3f93efd81ae1661aeb250c34a623b142c0d298541d0f8c96d09965024fc45cb7beb92109ea6f6c882 + languageName: node + linkType: hard + +"pkg-dir@npm:4.2.0, pkg-dir@npm:^4.1.0": + version: 4.2.0 + resolution: "pkg-dir@npm:4.2.0" + dependencies: + find-up: ^4.0.0 + checksum: 9863e3f35132bf99ae1636d31ff1e1e3501251d480336edb1c211133c8d58906bed80f154a1d723652df1fda91e01c7442c2eeaf9dc83157c7ae89087e43c8d6 + languageName: node + linkType: hard + +"pkg-dir@npm:^3.0.0": + version: 3.0.0 + resolution: "pkg-dir@npm:3.0.0" + dependencies: + find-up: ^3.0.0 + checksum: 70c9476ffefc77552cc6b1880176b71ad70bfac4f367604b2b04efd19337309a4eec985e94823271c7c0e83946fa5aeb18cd360d15d10a5d7533e19344bfa808 + languageName: node + linkType: hard + +"pngjs@npm:^3.3.0": + version: 3.4.0 + resolution: "pngjs@npm:3.4.0" + checksum: 8bd40bd698abd16b72c97b85cb858c80894fbedc76277ce72a784aa441e14795d45d9856e97333ca469b34b67528860ffc8a7317ca6beea349b645366df00bcd + languageName: node + linkType: hard + +"portfinder@npm:^1.0.26": + version: 1.0.28 + resolution: "portfinder@npm:1.0.28" + dependencies: + async: ^2.6.2 + debug: ^3.1.1 + mkdirp: ^0.5.5 + checksum: 91fef602f13f8f4c64385d0ad2a36cc9dc6be0b8d10a2628ee2c3c7b9917ab4fefb458815b82cea2abf4b785cd11c9b4e2d917ac6fa06f14b6fa880ca8f8928c + languageName: node + linkType: hard + +"posix-character-classes@npm:^0.1.0": + version: 0.1.1 + resolution: "posix-character-classes@npm:0.1.1" + checksum: dedb99913c60625a16050cfed2fb5c017648fc075be41ac18474e1c6c3549ef4ada201c8bd9bd006d36827e289c571b6092e1ef6e756cdbab2fd7046b25c6442 + languageName: node + linkType: hard + +"postcss-attribute-case-insensitive@npm:^4.0.1": + version: 4.0.2 + resolution: "postcss-attribute-case-insensitive@npm:4.0.2" + dependencies: + postcss: ^7.0.2 + postcss-selector-parser: ^6.0.2 + checksum: e9cf4b61f443bf302dcd1110ef38d6a808fa38ae5d85bfd0aaaa6d35bef3825e0434f1aed8eb9596a5d88f21580ce8b9cd0098414d8490293ef71149695cae9a + languageName: node + linkType: hard + +"postcss-calc@npm:^8.0.0": + version: 8.0.0 + resolution: "postcss-calc@npm:8.0.0" + dependencies: + postcss-selector-parser: ^6.0.2 + postcss-value-parser: ^4.0.2 + peerDependencies: + postcss: ^8.2.2 + checksum: d945c49f317d6e8f220bce33075f2eec8e26052158a5a694186c11a26d23098b0300a3d44f666fda2feaa3ec93a636282881ee50b9e32776e08e5338e4a8c887 + languageName: node + linkType: hard + +"postcss-color-functional-notation@npm:^2.0.1": + version: 2.0.1 + resolution: "postcss-color-functional-notation@npm:2.0.1" + dependencies: + postcss: ^7.0.2 + postcss-values-parser: ^2.0.0 + checksum: 0bfd1fa93bc54a07240d821d091093256511f70f0df5349e27e4d8b034ee3345f0ae58674ce425be6a91cc934325b2ce36ecddbf958fa8805fed6647cf671348 + languageName: node + linkType: hard + +"postcss-color-gray@npm:^5.0.0": + version: 5.0.0 + resolution: "postcss-color-gray@npm:5.0.0" + dependencies: + "@csstools/convert-colors": ^1.4.0 + postcss: ^7.0.5 + postcss-values-parser: ^2.0.0 + checksum: 81a62b3e2c170ffadc085c1643a7b5f1c153837d7ca228b07df88b9aeb0ec9088a92f8d919a748137ead3936e8dac2606e32b14b5166a59143642c8573949db5 + languageName: node + linkType: hard + +"postcss-color-hex-alpha@npm:^5.0.3": + version: 5.0.3 + resolution: "postcss-color-hex-alpha@npm:5.0.3" + dependencies: + postcss: ^7.0.14 + postcss-values-parser: ^2.0.1 + checksum: 0a0ccb42c7c6a271ffd3c8b123b9c67744827d4b810b759731bc702fea1e00f05f08479ec7cbd8dfa47bc20510830a69f1e316a5724b9e53d5fdc6fabf90afc4 + languageName: node + linkType: hard + +"postcss-color-mod-function@npm:^3.0.3": + version: 3.0.3 + resolution: "postcss-color-mod-function@npm:3.0.3" + dependencies: + "@csstools/convert-colors": ^1.4.0 + postcss: ^7.0.2 + postcss-values-parser: ^2.0.0 + checksum: ecbf74e9395527aaf3e83b90b1a6c9bba0a1904038d8acef1f530d50a68d912d6b1af8df690342f942be8b89fa7dfaa35ae67cb5fb48013cb389ecb8c74deadb + languageName: node + linkType: hard + +"postcss-color-rebeccapurple@npm:^4.0.1": + version: 4.0.1 + resolution: "postcss-color-rebeccapurple@npm:4.0.1" + dependencies: + postcss: ^7.0.2 + postcss-values-parser: ^2.0.0 + checksum: a7b1a204dfc5163ac4195cc3cb0c7b1bba9561feab49d24be8a17d695d6b69fd92f3da23d638260fe7e9d5076cf81bb798b25134fa2a2fbf7f74b0dda2829a96 + languageName: node + linkType: hard + +"postcss-colormin@npm:^5.2.0": + version: 5.2.0 + resolution: "postcss-colormin@npm:5.2.0" + dependencies: + browserslist: ^4.16.6 + caniuse-api: ^3.0.0 + colord: ^2.0.1 + postcss-value-parser: ^4.1.0 + peerDependencies: + postcss: ^8.2.15 + checksum: 7b767874a139530469630ef66e38ee5cbb2e91b86a297f74555c8fc1870305321918629240d60858a9e0e84a0018d956aaa114bd58df06557ada9bbb9379a3a0 + languageName: node + linkType: hard + +"postcss-convert-values@npm:^5.0.1": + version: 5.0.1 + resolution: "postcss-convert-values@npm:5.0.1" + dependencies: + postcss-value-parser: ^4.1.0 + peerDependencies: + postcss: ^8.2.15 + checksum: 5c71a9bd7659a4638e6af5cd97f6da9711bef98e2e5c22459d969e4b07f7cd11ddcdb55e8b091974493ffa9c22e427ca7de74fe8198c7ddae3dbae4c579f736c + languageName: node + linkType: hard + +"postcss-custom-media@npm:^7.0.8": + version: 7.0.8 + resolution: "postcss-custom-media@npm:7.0.8" + dependencies: + postcss: ^7.0.14 + checksum: 3786eb10f238b22dc620cfcc9257779e27d8cee4510b3209d0ab67310e07dc68b69f3359db7a911f5e76df466f73d078fc80100943fe2e8fa9bcacf226705a2d + languageName: node + linkType: hard + +"postcss-custom-properties@npm:^8.0.11": + version: 8.0.11 + resolution: "postcss-custom-properties@npm:8.0.11" + dependencies: + postcss: ^7.0.17 + postcss-values-parser: ^2.0.1 + checksum: cb1b47459a23ff2e48714c5d48d50070d573ef829dc7e57189d1b38c6fba0de7084f1acefbd84c61dd67e30bd9a7d154b22f195547728a9dc5f76f7d3f03ffea + languageName: node + linkType: hard + +"postcss-custom-selectors@npm:^5.1.2": + version: 5.1.2 + resolution: "postcss-custom-selectors@npm:5.1.2" + dependencies: + postcss: ^7.0.2 + postcss-selector-parser: ^5.0.0-rc.3 + checksum: 26c83d348448f4ab5931cc1621606b09a6b1171e25fac2404073f3e298e77494ac87d4a21009679503b4895452810e93e618b5af26b4c7180a9013f283bb8088 + languageName: node + linkType: hard + +"postcss-dir-pseudo-class@npm:^5.0.0": + version: 5.0.0 + resolution: "postcss-dir-pseudo-class@npm:5.0.0" + dependencies: + postcss: ^7.0.2 + postcss-selector-parser: ^5.0.0-rc.3 + checksum: 703156fc65f259ec2e86ba51d18370a6d3b71f2e6473c7d65694676a8f0152137b1997bc0a53f7f373c8c3e4d63c72f7b5e2049f2ef3a7276b49409395722044 + languageName: node + linkType: hard + +"postcss-discard-comments@npm:^5.0.1": + version: 5.0.1 + resolution: "postcss-discard-comments@npm:5.0.1" + peerDependencies: + postcss: ^8.2.15 + checksum: c561952bbffa799cfc96216098d7ccc14b1dc776f0a8038c52eafe89fbec02701a234f35f7244aa06d58127103e7dd5f0bfd1db18a53c1438fef5c0a9b2dbddf + languageName: node + linkType: hard + +"postcss-discard-duplicates@npm:^5.0.1": + version: 5.0.1 + resolution: "postcss-discard-duplicates@npm:5.0.1" + peerDependencies: + postcss: ^8.2.15 + checksum: becb68fd5ccd632fe51413a6ab4fd5c8aa3aae9d12947238014c2fb7816a2e0eb9a5454ee7207cac19f4a093c799be6053f13bf4048e97e20d88d5af4a0656bc + languageName: node + linkType: hard + +"postcss-discard-empty@npm:^5.0.1": + version: 5.0.1 + resolution: "postcss-discard-empty@npm:5.0.1" + peerDependencies: + postcss: ^8.2.15 + checksum: 2465ddabb18774c4996c18b8370498cf71597a23c45518ea75e7b73cd8f003b0be52ea9f27f28e24bba408d08ec5152e019cc595611bb097748993c1788d9f4f + languageName: node + linkType: hard + +"postcss-discard-overridden@npm:^5.0.1": + version: 5.0.1 + resolution: "postcss-discard-overridden@npm:5.0.1" + peerDependencies: + postcss: ^8.2.15 + checksum: 7da9a4bda963145c45b0b51ddf7684e37072569d6f5d22f6cab9f37ea953426274f52eeec87391cd2bd1dd561a6a26cbd1f39debb124ccd8b665b760eda849b4 + languageName: node + linkType: hard + +"postcss-double-position-gradients@npm:^1.0.0": + version: 1.0.0 + resolution: "postcss-double-position-gradients@npm:1.0.0" + dependencies: + postcss: ^7.0.5 + postcss-values-parser: ^2.0.0 + checksum: d2c4515b38a131ece44dba331aea2b3f9de646e30873b49f03fa8906179a3c43ddc43183bc4df609d8af0834e7c266ec3a63eaa4b3e96aa445d98ecdc12d2544 + languageName: node + linkType: hard + +"postcss-env-function@npm:^2.0.2": + version: 2.0.2 + resolution: "postcss-env-function@npm:2.0.2" + dependencies: + postcss: ^7.0.2 + postcss-values-parser: ^2.0.0 + checksum: 0cfa2e6cad5123cce39dcf5af332ec3b0e3e09b54d5142225f255914079d2afda3f1052e60f4b6d3bccf7eb9d592325b7421f1ecc6674ccb13c267a721fc3128 + languageName: node + linkType: hard + +"postcss-focus-visible@npm:^4.0.0": + version: 4.0.0 + resolution: "postcss-focus-visible@npm:4.0.0" + dependencies: + postcss: ^7.0.2 + checksum: a3c93fbb578608f60c5256d0989ae32fd9100f76fa053880e82bfeb43751e81a3a9e69bd8338e06579b7f56b230a80fb2cc671eff134f2682dcbec9bbb8658ae + languageName: node + linkType: hard + +"postcss-focus-within@npm:^3.0.0": + version: 3.0.0 + resolution: "postcss-focus-within@npm:3.0.0" + dependencies: + postcss: ^7.0.2 + checksum: 2a31292cd9b929a2dd3171fc4ed287ea4a93c6ec8df1d634503fb97b8b30b33a2970b5e0df60634c60ff887923ab28641b624d566533096950e0a384705e9b90 + languageName: node + linkType: hard + +"postcss-font-variant@npm:^4.0.0": + version: 4.0.1 + resolution: "postcss-font-variant@npm:4.0.1" + dependencies: + postcss: ^7.0.2 + checksum: d09836cd848e8c24d144484b6b9b175df26dca59e1a1579e790c7f3dcaea00944a8d0b6ac543f4c128de7b30fab9a0aef544d54789b3b55fd850770b172d980d + languageName: node + linkType: hard + +"postcss-gap-properties@npm:^2.0.0": + version: 2.0.0 + resolution: "postcss-gap-properties@npm:2.0.0" + dependencies: + postcss: ^7.0.2 + checksum: c842d105c9403e34a8fac7bdef33a63fcb6bde038b04b20cae1e719e1966632887545576af99a4a6f302c98ca029c6f0d746419f498ef7f6821177ba676e6c25 + languageName: node + linkType: hard + +"postcss-image-set-function@npm:^3.0.1": + version: 3.0.1 + resolution: "postcss-image-set-function@npm:3.0.1" + dependencies: + postcss: ^7.0.2 + postcss-values-parser: ^2.0.0 + checksum: 43958d7c1f80077e60e066bdf61bc326bcac64c272f17fd7a0585a6934fb1ffc7ba7f560a39849f597e4d28b8ae3addd9279c7145b9478d2d91a7c54c2fefd8b + languageName: node + linkType: hard + +"postcss-import@npm:14.0.2": + version: 14.0.2 + resolution: "postcss-import@npm:14.0.2" + dependencies: + postcss-value-parser: ^4.0.0 + read-cache: ^1.0.0 + resolve: ^1.1.7 + peerDependencies: + postcss: ^8.0.0 + checksum: e9f42b5956b1231f8516da11268021222d61969befc142bb7d0a65d9d3e53bdc574e51486b6ffdf72c0b395ce19060663eab5b5504b3d0855c173357425f9fb5 + languageName: node + linkType: hard + +"postcss-initial@npm:^3.0.0": + version: 3.0.4 + resolution: "postcss-initial@npm:3.0.4" + dependencies: + postcss: ^7.0.2 + checksum: 710ab6cabc5970912c04314099f5334e7d901235014bb1462657e29f8dc97b6e51caa35f0beba7e5dbe440589ef9c1df13a89bc53d6e6aa664573b945f1630bb + languageName: node + linkType: hard + +"postcss-lab-function@npm:^2.0.1": + version: 2.0.1 + resolution: "postcss-lab-function@npm:2.0.1" + dependencies: + "@csstools/convert-colors": ^1.4.0 + postcss: ^7.0.2 + postcss-values-parser: ^2.0.0 + checksum: 598229a7a05803b18cccde28114833e910367c5954341bea03c7d7b7b5a667dfb6a77ef9dd4a16d80fdff8b10dd44c478602a7d56e43687c8687af3710b4706f + languageName: node + linkType: hard + +"postcss-loader@npm:6.1.1": + version: 6.1.1 + resolution: "postcss-loader@npm:6.1.1" + dependencies: + cosmiconfig: ^7.0.0 + klona: ^2.0.4 + semver: ^7.3.5 + peerDependencies: + postcss: ^7.0.0 || ^8.0.1 + webpack: ^5.0.0 + checksum: 3c32d123813efeaede39cbd990a5c2275d0feeb3e3d2b9ad8f0bbf37e1e6d28f24d3174e4eebe9db4f563d57052dc9b5fb3f699f7527f639769d88e907a99490 + languageName: node + linkType: hard + +"postcss-logical@npm:^3.0.0": + version: 3.0.0 + resolution: "postcss-logical@npm:3.0.0" + dependencies: + postcss: ^7.0.2 + checksum: 5278661b78a093661c9cac8c04666d457734bf156f83d8c67f6034c00e8d4b3a26fce32a8a4a251feae3c7587f42556412dca980e100d0c920ee55e878f7b8ee + languageName: node + linkType: hard + +"postcss-media-minmax@npm:^4.0.0": + version: 4.0.0 + resolution: "postcss-media-minmax@npm:4.0.0" + dependencies: + postcss: ^7.0.2 + checksum: 8a4d94e25089bb5a66c6742bcdd263fce2fea391438151a85b442b7f8b66323bbca552b59a93efd6bcabcfd41845ddd4149bd56d156b008f8d7d04bc84d9fb11 + languageName: node + linkType: hard + +"postcss-merge-longhand@npm:^5.0.2": + version: 5.0.2 + resolution: "postcss-merge-longhand@npm:5.0.2" + dependencies: + css-color-names: ^1.0.1 + postcss-value-parser: ^4.1.0 + stylehacks: ^5.0.1 + peerDependencies: + postcss: ^8.2.15 + checksum: d7d313299ee1efc9777fa0866a9386a7a610c0d4d9c0f99b6533b9358dab822a3c8aaf5f243c1f3e3aa7bd4b7e03754ba1c9154c60259dd159e33ebf890c2aad + languageName: node + linkType: hard + +"postcss-merge-rules@npm:^5.0.2": + version: 5.0.2 + resolution: "postcss-merge-rules@npm:5.0.2" + dependencies: + browserslist: ^4.16.6 + caniuse-api: ^3.0.0 + cssnano-utils: ^2.0.1 + postcss-selector-parser: ^6.0.5 + vendors: ^1.0.3 + peerDependencies: + postcss: ^8.2.15 + checksum: 04b2be8e9def9822182aeb1362d25ef1bee9d4a5be6715fc9bec7aa4c7e885fb1b22d2d8a4438d58952952d2d3957e423ef8adcd7d5339d8bd046c9bae8c1639 + languageName: node + linkType: hard + +"postcss-minify-font-values@npm:^5.0.1": + version: 5.0.1 + resolution: "postcss-minify-font-values@npm:5.0.1" + dependencies: + postcss-value-parser: ^4.1.0 + peerDependencies: + postcss: ^8.2.15 + checksum: 56aeb2cad5b3c4ca736b7fd7fa331d82281fbecc47e0e275a6a1203b436dbaa9f0772f668c3265dbf7ea2026c68d77c752cf9abe65bd3c65a53e696ae277e6e6 + languageName: node + linkType: hard + +"postcss-minify-gradients@npm:^5.0.2": + version: 5.0.2 + resolution: "postcss-minify-gradients@npm:5.0.2" + dependencies: + colord: ^2.6 + cssnano-utils: ^2.0.1 + postcss-value-parser: ^4.1.0 + peerDependencies: + postcss: ^8.2.15 + checksum: f6c655e1850e6ab24bac66a0339cf8fd7638e2550bf1d9bbb7235dbb31022654f9dfdcc0289ba15312bf3048c914d2bbd92eed8df51d00294cc86d40b48fd696 + languageName: node + linkType: hard + +"postcss-minify-params@npm:^5.0.1": + version: 5.0.1 + resolution: "postcss-minify-params@npm:5.0.1" + dependencies: + alphanum-sort: ^1.0.2 + browserslist: ^4.16.0 + cssnano-utils: ^2.0.1 + postcss-value-parser: ^4.1.0 + uniqs: ^2.0.0 + peerDependencies: + postcss: ^8.2.15 + checksum: 52f210c5240c17d21bf4d1fec6477c929e74b047d084d5bf0f8e388534cc4b821cd4f2880d1aca0a0e0c13fcf133dc566897645d9f1f7e056bd443ef27c9a6c7 + languageName: node + linkType: hard + +"postcss-minify-selectors@npm:^5.1.0": + version: 5.1.0 + resolution: "postcss-minify-selectors@npm:5.1.0" + dependencies: + alphanum-sort: ^1.0.2 + postcss-selector-parser: ^6.0.5 + peerDependencies: + postcss: ^8.2.15 + checksum: bf938e70a77b54d68709ec5e9a500b932e177b2278b5c405c3b59fb6f8315f2013e7b327ba76105949bf3c9ba6d6bef80ced4077cababb8e0015d87b4a086b50 + languageName: node + linkType: hard + +"postcss-modules-extract-imports@npm:^3.0.0": + version: 3.0.0 + resolution: "postcss-modules-extract-imports@npm:3.0.0" + peerDependencies: + postcss: ^8.1.0 + checksum: 4b65f2f1382d89c4bc3c0a1bdc5942f52f3cb19c110c57bd591ffab3a5fee03fcf831604168205b0c1b631a3dce2255c70b61aaae3ef39d69cd7eb450c2552d2 + languageName: node + linkType: hard + +"postcss-modules-local-by-default@npm:^4.0.0": + version: 4.0.0 + resolution: "postcss-modules-local-by-default@npm:4.0.0" + dependencies: + icss-utils: ^5.0.0 + postcss-selector-parser: ^6.0.2 + postcss-value-parser: ^4.1.0 + peerDependencies: + postcss: ^8.1.0 + checksum: 6cf570badc7bc26c265e073f3ff9596b69bb954bc6ac9c5c1b8cba2995b80834226b60e0a3cbb87d5f399dbb52e6466bba8aa1d244f6218f99d834aec431a69d + languageName: node + linkType: hard + +"postcss-modules-scope@npm:^3.0.0": + version: 3.0.0 + resolution: "postcss-modules-scope@npm:3.0.0" + dependencies: + postcss-selector-parser: ^6.0.4 + peerDependencies: + postcss: ^8.1.0 + checksum: 330b9398dbd44c992c92b0dc612c0626135e2cc840fee41841eb61247a6cfed95af2bd6f67ead9dd9d0bb41f5b0367129d93c6e434fa3e9c58ade391d9a5a138 + languageName: node + linkType: hard + +"postcss-modules-values@npm:^4.0.0": + version: 4.0.0 + resolution: "postcss-modules-values@npm:4.0.0" + dependencies: + icss-utils: ^5.0.0 + peerDependencies: + postcss: ^8.1.0 + checksum: f7f2cdf14a575b60e919ad5ea52fed48da46fe80db2733318d71d523fc87db66c835814940d7d05b5746b0426e44661c707f09bdb83592c16aea06e859409db6 + languageName: node + linkType: hard + +"postcss-nesting@npm:^7.0.0": + version: 7.0.1 + resolution: "postcss-nesting@npm:7.0.1" + dependencies: + postcss: ^7.0.2 + checksum: 4056be95759e8b25477f19aff7202b57dd27eeef41d31f7ca14e4c87d16ffb40e4db3f518fc85bd28b20e183f5e5399b56b52fcc79affd556e13a98bbc678169 + languageName: node + linkType: hard + +"postcss-normalize-charset@npm:^5.0.1": + version: 5.0.1 + resolution: "postcss-normalize-charset@npm:5.0.1" + peerDependencies: + postcss: ^8.2.15 + checksum: b74720bf0487809143a30e1965ff756698650abdd072f4fe81f0a32ce41e84c140f107b39ad0babf4d319aa620d1d4e01d1f89dc7c7b3f55fd3b27f243ee26e1 + languageName: node + linkType: hard + +"postcss-normalize-display-values@npm:^5.0.1": + version: 5.0.1 + resolution: "postcss-normalize-display-values@npm:5.0.1" + dependencies: + cssnano-utils: ^2.0.1 + postcss-value-parser: ^4.1.0 + peerDependencies: + postcss: ^8.2.15 + checksum: ee84d379abd3fefcb23c09789a5f9d384a7f275d56e51b6ea149bf7a1cf512381bff0c3f00d938d0f91ab7c7fe00b19ace280cc3f84a100cd3cd8a604c4c7406 + languageName: node + linkType: hard + +"postcss-normalize-positions@npm:^5.0.1": + version: 5.0.1 + resolution: "postcss-normalize-positions@npm:5.0.1" + dependencies: + postcss-value-parser: ^4.1.0 + peerDependencies: + postcss: ^8.2.15 + checksum: 71a97ff851b78cdce8cc1ef21f91d40ddb2aca55d1bdc56056df27037efd9c208290f863ce0adf58a3060f8bb6eb3d66b4cf6d9a1e3ccbb03ba4eb0a0d1b6da4 + languageName: node + linkType: hard + +"postcss-normalize-repeat-style@npm:^5.0.1": + version: 5.0.1 + resolution: "postcss-normalize-repeat-style@npm:5.0.1" + dependencies: + cssnano-utils: ^2.0.1 + postcss-value-parser: ^4.1.0 + peerDependencies: + postcss: ^8.2.15 + checksum: 24f21dd8eee0f5ef9119e71ba57174f675d16fe9a8f368656d64a4e5f2d69cb41ae42f70b814e5ef40f93857ff759205642f78781ff8854f473b7d726e93bc99 + languageName: node + linkType: hard + +"postcss-normalize-string@npm:^5.0.1": + version: 5.0.1 + resolution: "postcss-normalize-string@npm:5.0.1" + dependencies: + postcss-value-parser: ^4.1.0 + peerDependencies: + postcss: ^8.2.15 + checksum: 4b42d41a05780517647b9a55888d314bfdfda2042f7a84050555e64da5eccade966fdca645c4ef66503fa95d642e89f2950e5b556b2a38a1a8f3120a24816c73 + languageName: node + linkType: hard + +"postcss-normalize-timing-functions@npm:^5.0.1": + version: 5.0.1 + resolution: "postcss-normalize-timing-functions@npm:5.0.1" + dependencies: + cssnano-utils: ^2.0.1 + postcss-value-parser: ^4.1.0 + peerDependencies: + postcss: ^8.2.15 + checksum: fa58de8f9f6f8d4b507f9f029b18a0903a69a3b5088a2a1306e22163d81ca041d0f179888f5696516a9f75e188df904b0e082ec522b497a46ad1bfc24b06f348 + languageName: node + linkType: hard + +"postcss-normalize-unicode@npm:^5.0.1": + version: 5.0.1 + resolution: "postcss-normalize-unicode@npm:5.0.1" + dependencies: + browserslist: ^4.16.0 + postcss-value-parser: ^4.1.0 + peerDependencies: + postcss: ^8.2.15 + checksum: d5a0e0c107639847709c1e9badf09267ee7c67206ac4c19df4f9479308866f0592773ff4063e58d48a6a1d638637a0f7b187ec429ddd3385bab32a06e2d020fd + languageName: node + linkType: hard + +"postcss-normalize-url@npm:^5.0.2": + version: 5.0.2 + resolution: "postcss-normalize-url@npm:5.0.2" + dependencies: + is-absolute-url: ^3.0.3 + normalize-url: ^6.0.1 + postcss-value-parser: ^4.1.0 + peerDependencies: + postcss: ^8.2.15 + checksum: 161a0a02d33188f61e6e46f10c0f2dcb1f0360adf1c39748340b691b9a686d2885a2aa29341e0733f8250060466e0c1b234ae49232d7827fd8689ee25222bb8c + languageName: node + linkType: hard + +"postcss-normalize-whitespace@npm:^5.0.1": + version: 5.0.1 + resolution: "postcss-normalize-whitespace@npm:5.0.1" + dependencies: + postcss-value-parser: ^4.1.0 + peerDependencies: + postcss: ^8.2.15 + checksum: cefb27d2443d4a8fc34aa2a0aebd470d7d5a58d9adcf39f5e2a80455f4ab37b171a24f58dc47b3111232c1adbb1c8702f80c0ecac1cfcef03e48e00dac6a4a58 + languageName: node + linkType: hard + +"postcss-ordered-values@npm:^5.0.2": + version: 5.0.2 + resolution: "postcss-ordered-values@npm:5.0.2" + dependencies: + cssnano-utils: ^2.0.1 + postcss-value-parser: ^4.1.0 + peerDependencies: + postcss: ^8.2.15 + checksum: 80b1cab96e3e9caf23de9b5436b36d7dc1efdd7ff9ee7b02c5ddc88c3564ec5adfa08e66f64c3b335beeb74a8c690a89e1594be14f2d5b708deb2c259de69619 + languageName: node + linkType: hard + +"postcss-overflow-shorthand@npm:^2.0.0": + version: 2.0.0 + resolution: "postcss-overflow-shorthand@npm:2.0.0" + dependencies: + postcss: ^7.0.2 + checksum: 553be1b7f9645017d33b654f9a436ce4f4406066c3056ca4c7ee06c21c2964fbe3437a9a3f998137efb6a17c1a79ee7e8baa39332c7dd9874aac8b69a3ad08b0 + languageName: node + linkType: hard + +"postcss-page-break@npm:^2.0.0": + version: 2.0.0 + resolution: "postcss-page-break@npm:2.0.0" + dependencies: + postcss: ^7.0.2 + checksum: 65a4453883e904ca0f337d3a988a1b5a090e2e8bc2855913cb0b4b741158e6ea2e4eed9b33f5989e7ae55faa0f7b83cdc09693d600ac4c86ce804ae381ec48a4 + languageName: node + linkType: hard + +"postcss-place@npm:^4.0.1": + version: 4.0.1 + resolution: "postcss-place@npm:4.0.1" + dependencies: + postcss: ^7.0.2 + postcss-values-parser: ^2.0.0 + checksum: 26b2a443b0a8fcb6774d00036fa351633798a655ccd609da2d561fbd6561b0ba6f6b6d89e15fb074389fadb7da4cbc59c48ba75f1f5fdc478c020febb4e2b557 + languageName: node + linkType: hard + +"postcss-preset-env@npm:6.7.0": + version: 6.7.0 + resolution: "postcss-preset-env@npm:6.7.0" + dependencies: + autoprefixer: ^9.6.1 + browserslist: ^4.6.4 + caniuse-lite: ^1.0.30000981 + css-blank-pseudo: ^0.1.4 + css-has-pseudo: ^0.10.0 + css-prefers-color-scheme: ^3.1.1 + cssdb: ^4.4.0 + postcss: ^7.0.17 + postcss-attribute-case-insensitive: ^4.0.1 + postcss-color-functional-notation: ^2.0.1 + postcss-color-gray: ^5.0.0 + postcss-color-hex-alpha: ^5.0.3 + postcss-color-mod-function: ^3.0.3 + postcss-color-rebeccapurple: ^4.0.1 + postcss-custom-media: ^7.0.8 + postcss-custom-properties: ^8.0.11 + postcss-custom-selectors: ^5.1.2 + postcss-dir-pseudo-class: ^5.0.0 + postcss-double-position-gradients: ^1.0.0 + postcss-env-function: ^2.0.2 + postcss-focus-visible: ^4.0.0 + postcss-focus-within: ^3.0.0 + postcss-font-variant: ^4.0.0 + postcss-gap-properties: ^2.0.0 + postcss-image-set-function: ^3.0.1 + postcss-initial: ^3.0.0 + postcss-lab-function: ^2.0.1 + postcss-logical: ^3.0.0 + postcss-media-minmax: ^4.0.0 + postcss-nesting: ^7.0.0 + postcss-overflow-shorthand: ^2.0.0 + postcss-page-break: ^2.0.0 + postcss-place: ^4.0.1 + postcss-pseudo-class-any-link: ^6.0.0 + postcss-replace-overflow-wrap: ^3.0.0 + postcss-selector-matches: ^4.0.0 + postcss-selector-not: ^4.0.0 + checksum: 209cbb63443a1631aa97ccfc3b95b1ff519ddaeb672f84d6af501bd9e9ad6727680b5b1bffb8209322e47d93029a69df6064f75cd0b7633b6df943cbef33f22e + languageName: node + linkType: hard + +"postcss-pseudo-class-any-link@npm:^6.0.0": + version: 6.0.0 + resolution: "postcss-pseudo-class-any-link@npm:6.0.0" + dependencies: + postcss: ^7.0.2 + postcss-selector-parser: ^5.0.0-rc.3 + checksum: d7dc3bba45df2966f8512c082a9cc341e63edac14d915ad9f41c62c452cd306d82da6baeee757dd4e7deafe3fa33b26c16e5236c670916bbb7ff4b4723453541 + languageName: node + linkType: hard + +"postcss-reduce-initial@npm:^5.0.1": + version: 5.0.1 + resolution: "postcss-reduce-initial@npm:5.0.1" + dependencies: + browserslist: ^4.16.0 + caniuse-api: ^3.0.0 + peerDependencies: + postcss: ^8.2.15 + checksum: c33306694ebd98e8a9402bf9eef1b1724e351e884d0c10f4c77ee34e8f603442d45c20862794ee05793b29d5c10f23b0e3f5697f02600b568911d48be41d421a + languageName: node + linkType: hard + +"postcss-reduce-transforms@npm:^5.0.1": + version: 5.0.1 + resolution: "postcss-reduce-transforms@npm:5.0.1" + dependencies: + cssnano-utils: ^2.0.1 + postcss-value-parser: ^4.1.0 + peerDependencies: + postcss: ^8.2.15 + checksum: 89e033ba1fe92057e6196237d5ae6f30b7ca86a98d91a01aa1853baea36ea6c092d29d354d3281000a618445a780c30277868b10d517015317fdc8b97739d34e + languageName: node + linkType: hard + +"postcss-replace-overflow-wrap@npm:^3.0.0": + version: 3.0.0 + resolution: "postcss-replace-overflow-wrap@npm:3.0.0" + dependencies: + postcss: ^7.0.2 + checksum: 8c5b512a1172dd3d7b4a06d56d3b64c76dea01ca0950b546f83ae993f83aa95f933239e18deed0a5f3d2ef47840de55fa73498c4a46bfbe7bd892eb0dd8b606c + languageName: node + linkType: hard + +"postcss-selector-matches@npm:^4.0.0": + version: 4.0.0 + resolution: "postcss-selector-matches@npm:4.0.0" + dependencies: + balanced-match: ^1.0.0 + postcss: ^7.0.2 + checksum: 724f6cb345477691909468268a456f978ad3bae9ecd9908b2bb55c55c5f3c6d54a1fe50ce3956d93b122d05fc36677a8e4a34eed07bccda969c3f8baa43669a6 + languageName: node + linkType: hard + +"postcss-selector-not@npm:^4.0.0": + version: 4.0.1 + resolution: "postcss-selector-not@npm:4.0.1" + dependencies: + balanced-match: ^1.0.0 + postcss: ^7.0.2 + checksum: 08fbd3e5ca273f3b767bd35d6bd033647a68f59b596d8aec19a9089b750539bdf85121ed7fd00a7763174a55c75c22a309d75d306127e23dc396069781efbaa4 + languageName: node + linkType: hard + +"postcss-selector-parser@npm:^5.0.0-rc.3, postcss-selector-parser@npm:^5.0.0-rc.4": + version: 5.0.0 + resolution: "postcss-selector-parser@npm:5.0.0" + dependencies: + cssesc: ^2.0.0 + indexes-of: ^1.0.1 + uniq: ^1.0.1 + checksum: e49d21455e06d2cb9bf2a615bf3e605e0603c2c430a84c37a34f8baedaf3e8f9d0059a085d3e0483cbfa04c0d4153c7da28e7ac0ada319efdefe407df11dc1d4 + languageName: node + linkType: hard + +"postcss-selector-parser@npm:^6.0.2, postcss-selector-parser@npm:^6.0.4, postcss-selector-parser@npm:^6.0.5": + version: 6.0.6 + resolution: "postcss-selector-parser@npm:6.0.6" + dependencies: + cssesc: ^3.0.0 + util-deprecate: ^1.0.2 + checksum: 3602758798048bffbd6a97d6f009b32a993d6fd2cc70775bb59593e803d7fa8738822ecffb2fafc745edf7fad297dad53c30d2cfe78446a7d3f4a4a258cb15b2 + languageName: node + linkType: hard + +"postcss-svgo@npm:^5.0.2": + version: 5.0.2 + resolution: "postcss-svgo@npm:5.0.2" + dependencies: + postcss-value-parser: ^4.1.0 + svgo: ^2.3.0 + peerDependencies: + postcss: ^8.2.15 + checksum: b0c4c0c7b826dc29bd67c93eb0e7bc8613e0b2f922c921b64bc53e23ee3e24341ff1c0fa4649a02cf70363bfea6c7c2e0d7f2bdba9fff2eae1248036b5815cf1 + languageName: node + linkType: hard + +"postcss-unique-selectors@npm:^5.0.1": + version: 5.0.1 + resolution: "postcss-unique-selectors@npm:5.0.1" + dependencies: + alphanum-sort: ^1.0.2 + postcss-selector-parser: ^6.0.5 + uniqs: ^2.0.0 + peerDependencies: + postcss: ^8.2.15 + checksum: 4346c4715b3f5facfd4b52fc8553085241c98b533b8965b1d3c1e370f277092d02c72bde519d70a82102467464e6cde9581e0d0592d07108c67e7ad20e67a23a + languageName: node + linkType: hard + +"postcss-value-parser@npm:^4.0.0, postcss-value-parser@npm:^4.0.2, postcss-value-parser@npm:^4.1.0": + version: 4.1.0 + resolution: "postcss-value-parser@npm:4.1.0" + checksum: 68a9ea27c780fa3cc350be37b47cc46385c61dd9627990909230e0e9c3debf6d5beb49006bd743a2e506cdd6fa7d07637f2d9504a394f67cc3011d1ff0134886 + languageName: node + linkType: hard + +"postcss-values-parser@npm:^2.0.0, postcss-values-parser@npm:^2.0.1": + version: 2.0.1 + resolution: "postcss-values-parser@npm:2.0.1" + dependencies: + flatten: ^1.0.2 + indexes-of: ^1.0.1 + uniq: ^1.0.1 + checksum: 050877880937e15af8d18bf48902e547e2123d7cc32c1f215b392642bc5e2598a87a341995d62f38e450aab4186b8afeb2c9541934806d458ad8b117020b2ebf + languageName: node + linkType: hard + +"postcss@npm:8.3.6, postcss@npm:^8.2.15, postcss@npm:^8.3.5": + version: 8.3.6 + resolution: "postcss@npm:8.3.6" + dependencies: + colorette: ^1.2.2 + nanoid: ^3.1.23 + source-map-js: ^0.6.2 + checksum: ff55b91bea21f42c2a94d77fd05c3f66dd15889c68506cf1dbb9cdee8c3b9e9d0e219bcbc6e61a107bd63e3cac0670176486e2a5794c106a4e1b9babceb79317 + languageName: node + linkType: hard + +"postcss@npm:^7.0.14, postcss@npm:^7.0.17, postcss@npm:^7.0.2, postcss@npm:^7.0.32, postcss@npm:^7.0.35, postcss@npm:^7.0.5, postcss@npm:^7.0.6": + version: 7.0.36 + resolution: "postcss@npm:7.0.36" + dependencies: + chalk: ^2.4.2 + source-map: ^0.6.1 + supports-color: ^6.1.0 + checksum: 4cfc0989b9ad5d0e8971af80d87f9c5beac5c84cb89ff22ad69852edf73c0a2fa348e7e0a135b5897bf893edad0fe86c428769050431ad9b532f072ff530828d + languageName: node + linkType: hard + +"postcss@npm:^8.3.7": + version: 8.3.11 + resolution: "postcss@npm:8.3.11" + dependencies: + nanoid: ^3.1.30 + picocolors: ^1.0.0 + source-map-js: ^0.6.2 + checksum: 1a230553d74c66aa9585c90781ed8ea75f19cefea405d2117b67fbeb24b5b5e0e17be2e0c5a07db31dd085643a13394127ab2222e940771b70498331bf20f35e + languageName: node + linkType: hard + +"pretty-bytes@npm:^5.3.0, pretty-bytes@npm:^5.6.0": + version: 5.6.0 + resolution: "pretty-bytes@npm:5.6.0" + checksum: 9c082500d1e93434b5b291bd651662936b8bd6204ec9fa17d563116a192d6d86b98f6d328526b4e8d783c07d5499e2614a807520249692da9ec81564b2f439cd + languageName: node + linkType: hard + +"process-nextick-args@npm:~2.0.0": + version: 2.0.1 + resolution: "process-nextick-args@npm:2.0.1" + checksum: 1d38588e520dab7cea67cbbe2efdd86a10cc7a074c09657635e34f035277b59fbb57d09d8638346bf7090f8e8ebc070c96fa5fd183b777fff4f5edff5e9466cf + languageName: node + linkType: hard + +"progress@npm:2.0.1": + version: 2.0.1 + resolution: "progress@npm:2.0.1" + checksum: 46d1f5a5df9c331f6402d856a4239f90a8fde8f9fcff0426ceb4edca7a7a3b4256d83adcfb3d4176a1dd239536a43e547bd0f325f5e8c4ac2881169361028426 + languageName: node + linkType: hard + +"promise-inflight@npm:^1.0.1": + version: 1.0.1 + resolution: "promise-inflight@npm:1.0.1" + checksum: 22749483091d2c594261517f4f80e05226d4d5ecc1fc917e1886929da56e22b5718b7f2a75f3807e7a7d471bc3be2907fe92e6e8f373ddf5c64bae35b5af3981 + languageName: node + linkType: hard + +"promise-retry@npm:^2.0.1": + version: 2.0.1 + resolution: "promise-retry@npm:2.0.1" + dependencies: + err-code: ^2.0.2 + retry: ^0.12.0 + checksum: f96a3f6d90b92b568a26f71e966cbbc0f63ab85ea6ff6c81284dc869b41510e6cdef99b6b65f9030f0db422bf7c96652a3fff9f2e8fb4a0f069d8f4430359429 + languageName: node + linkType: hard + +"proxy-addr@npm:~2.0.5": + version: 2.0.7 + resolution: "proxy-addr@npm:2.0.7" + dependencies: + forwarded: 0.2.0 + ipaddr.js: 1.9.1 + checksum: 29c6990ce9364648255454842f06f8c46fcd124d3e6d7c5066df44662de63cdc0bad032e9bf5a3d653ff72141cc7b6019873d685708ac8210c30458ad99f2b74 + languageName: node + linkType: hard + +"proxy-from-env@npm:1.1.0": + version: 1.1.0 + resolution: "proxy-from-env@npm:1.1.0" + checksum: ed7fcc2ba0a33404958e34d95d18638249a68c430e30fcb6c478497d72739ba64ce9810a24f53a7d921d0c065e5b78e3822759800698167256b04659366ca4d4 + languageName: node + linkType: hard + +"prr@npm:~1.0.1": + version: 1.0.1 + resolution: "prr@npm:1.0.1" + checksum: 3bca2db0479fd38f8c4c9439139b0c42dcaadcc2fbb7bb8e0e6afaa1383457f1d19aea9e5f961d5b080f1cfc05bfa1fe9e45c97a1d3fd6d421950a73d3108381 + languageName: node + linkType: hard + +"psl@npm:^1.1.28": + version: 1.8.0 + resolution: "psl@npm:1.8.0" + checksum: 6150048ed2da3f919478bee8a82f3828303bc0fc730fb015a48f83c9977682c7b28c60ab01425a72d82a2891a1681627aa530a991d50c086b48a3be27744bde7 + languageName: node + linkType: hard + +"pump@npm:^3.0.0": + version: 3.0.0 + resolution: "pump@npm:3.0.0" + dependencies: + end-of-stream: ^1.1.0 + once: ^1.3.1 + checksum: e42e9229fba14732593a718b04cb5e1cfef8254544870997e0ecd9732b189a48e1256e4e5478148ecb47c8511dca2b09eae56b4d0aad8009e6fac8072923cfc9 + languageName: node + linkType: hard + +"punycode@npm:1.3.2": + version: 1.3.2 + resolution: "punycode@npm:1.3.2" + checksum: b8807fd594b1db33335692d1f03e8beeddde6fda7fbb4a2e32925d88d20a3aa4cd8dcc0c109ccaccbd2ba761c208dfaaada83007087ea8bfb0129c9ef1b99ed6 + languageName: node + linkType: hard + +"punycode@npm:^2.1.0, punycode@npm:^2.1.1": + version: 2.1.1 + resolution: "punycode@npm:2.1.1" + checksum: 823bf443c6dd14f669984dea25757b37993f67e8d94698996064035edd43bed8a5a17a9f12e439c2b35df1078c6bec05a6c86e336209eb1061e8025c481168e8 + languageName: node + linkType: hard + +"puppeteer@npm:^10.2.0": + version: 10.2.0 + resolution: "puppeteer@npm:10.2.0" + dependencies: + debug: 4.3.1 + devtools-protocol: 0.0.901419 + extract-zip: 2.0.1 + https-proxy-agent: 5.0.0 + node-fetch: 2.6.1 + pkg-dir: 4.2.0 + progress: 2.0.1 + proxy-from-env: 1.1.0 + rimraf: 3.0.2 + tar-fs: 2.0.0 + unbzip2-stream: 1.3.3 + ws: 7.4.6 + checksum: 2722adc087a01a3797948f9ec0bd98f4c6d5aaf8f5fed8c0407259ccfeaaa4c25c6bd27927aca3db58e6de03456f5556806a1cce322a7529a7624eafb87321ab + languageName: node + linkType: hard + +"qjobs@npm:^1.2.0": + version: 1.2.0 + resolution: "qjobs@npm:1.2.0" + checksum: eb64c00724d2fecaf9246383b4eebc3a4c34845b25d41921dd57f41b30a4310cef661543facac27ceb6911aab64a1acdf45b5d8f1d5e2838554d0c010ee56852 + languageName: node + linkType: hard + +"qrcode@npm:^1.4.4": + version: 1.4.4 + resolution: "qrcode@npm:1.4.4" + dependencies: + buffer: ^5.4.3 + buffer-alloc: ^1.2.0 + buffer-from: ^1.1.1 + dijkstrajs: ^1.0.1 + isarray: ^2.0.1 + pngjs: ^3.3.0 + yargs: ^13.2.4 + bin: + qrcode: ./bin/qrcode + checksum: 8c1a7ee3092c0ed60f0413594af879ac6dffb897d4921144a8e7ae3dce40c04ba6457ab21664ca43934ba3fe19cced85abaf0b87b07916239d7254d4bb4fcf13 + languageName: node + linkType: hard + +"qs@npm:6.7.0": + version: 6.7.0 + resolution: "qs@npm:6.7.0" + checksum: dfd5f6adef50e36e908cfa70a6233871b5afe66fbaca37ecc1da352ba29eb2151a3797991948f158bb37fccde51bd57845cb619a8035287bfc24e4591172c347 + languageName: node + linkType: hard + +"qs@npm:~6.5.2": + version: 6.5.2 + resolution: "qs@npm:6.5.2" + checksum: 24af7b9928ba2141233fba2912876ff100403dba1b08b20c3b490da9ea6c636760445ea2211a079e7dfa882a5cf8f738337b3748c8bdd0f93358fa8881d2db8f + languageName: node + linkType: hard + +"querystring@npm:0.2.0": + version: 0.2.0 + resolution: "querystring@npm:0.2.0" + checksum: 8258d6734f19be27e93f601758858c299bdebe71147909e367101ba459b95446fbe5b975bf9beb76390156a592b6f4ac3a68b6087cea165c259705b8b4e56a69 + languageName: node + linkType: hard + +"querystringify@npm:^2.1.1": + version: 2.2.0 + resolution: "querystringify@npm:2.2.0" + checksum: 5641ea231bad7ef6d64d9998faca95611ed4b11c2591a8cae741e178a974f6a8e0ebde008475259abe1621cb15e692404e6b6626e927f7b849d5c09392604b15 + languageName: node + linkType: hard + +"queue-microtask@npm:^1.2.2": + version: 1.2.3 + resolution: "queue-microtask@npm:1.2.3" + checksum: b676f8c040cdc5b12723ad2f91414d267605b26419d5c821ff03befa817ddd10e238d22b25d604920340fd73efd8ba795465a0377c4adf45a4a41e4234e42dc4 + languageName: node + linkType: hard + +"ramda@npm:~0.27.1": + version: 0.27.1 + resolution: "ramda@npm:0.27.1" + checksum: 31a0c0ef739b2525d7615f84cbb5d3cb89ee0c795469b711f729ea1d8df0dccc3cd75d3717a1e9742d42315ce86435680b7c87743eb7618111c60c144a5b8059 + languageName: node + linkType: hard + +"randombytes@npm:^2.1.0": + version: 2.1.0 + resolution: "randombytes@npm:2.1.0" + dependencies: + safe-buffer: ^5.1.0 + checksum: d779499376bd4cbb435ef3ab9a957006c8682f343f14089ed5f27764e4645114196e75b7f6abf1cbd84fd247c0cb0651698444df8c9bf30e62120fbbc52269d6 + languageName: node + linkType: hard + +"range-parser@npm:^1.2.1, range-parser@npm:~1.2.1": + version: 1.2.1 + resolution: "range-parser@npm:1.2.1" + checksum: 0a268d4fea508661cf5743dfe3d5f47ce214fd6b7dec1de0da4d669dd4ef3d2144468ebe4179049eff253d9d27e719c88dae55be64f954e80135a0cada804ec9 + languageName: node + linkType: hard + +"raw-body@npm:2.4.0": + version: 2.4.0 + resolution: "raw-body@npm:2.4.0" + dependencies: + bytes: 3.1.0 + http-errors: 1.7.2 + iconv-lite: 0.4.24 + unpipe: 1.0.0 + checksum: 6343906939e018c6e633a34a938a5d6d1e93ffcfa48646e00207d53b418e941953b521473950c079347220944dc75ba10e7b3c08bf97e3ac72c7624882db09bb + languageName: node + linkType: hard + +"read-cache@npm:^1.0.0": + version: 1.0.0 + resolution: "read-cache@npm:1.0.0" + dependencies: + pify: ^2.3.0 + checksum: cffc728b9ede1e0667399903f9ecaf3789888b041c46ca53382fa3a06303e5132774dc0a96d0c16aa702dbac1ea0833d5a868d414f5ab2af1e1438e19e6657c6 + languageName: node + linkType: hard + +"read-package-json-fast@npm:^2.0.1": + version: 2.0.3 + resolution: "read-package-json-fast@npm:2.0.3" + dependencies: + json-parse-even-better-errors: ^2.3.0 + npm-normalize-package-bin: ^1.0.1 + checksum: fca37b3b2160b9dda7c5588b767f6a2b8ce68d03a044000e568208e20bea0cf6dd2de17b90740ce8da8b42ea79c0b3859649dadf29510bbe77224ea65326a903 + languageName: node + linkType: hard + +"readable-stream@npm:^2.0.1, readable-stream@npm:^2.0.2, readable-stream@npm:^2.0.6": + version: 2.3.7 + resolution: "readable-stream@npm:2.3.7" + dependencies: + core-util-is: ~1.0.0 + inherits: ~2.0.3 + isarray: ~1.0.0 + process-nextick-args: ~2.0.0 + safe-buffer: ~5.1.1 + string_decoder: ~1.1.1 + util-deprecate: ~1.0.1 + checksum: e4920cf7549a60f8aaf694d483a0e61b2a878b969d224f89b3bc788b8d920075132c4b55a7494ee944c7b6a9a0eada28a7f6220d80b0312ece70bbf08eeca755 + languageName: node + linkType: hard + +"readable-stream@npm:^3.0.6, readable-stream@npm:^3.1.1, readable-stream@npm:^3.4.0": + version: 3.6.0 + resolution: "readable-stream@npm:3.6.0" + dependencies: + inherits: ^2.0.3 + string_decoder: ^1.1.1 + util-deprecate: ^1.0.1 + checksum: d4ea81502d3799439bb955a3a5d1d808592cf3133350ed352aeaa499647858b27b1c4013984900238b0873ec8d0d8defce72469fb7a83e61d53f5ad61cb80dc8 + languageName: node + linkType: hard + +"readdirp@npm:^2.2.1": + version: 2.2.1 + resolution: "readdirp@npm:2.2.1" + dependencies: + graceful-fs: ^4.1.11 + micromatch: ^3.1.10 + readable-stream: ^2.0.2 + checksum: 3879b20f1a871e0e004a14fbf1776e65ee0b746a62f5a416010808b37c272ac49b023c47042c7b1e281cba75a449696635bc64c397ed221ea81d853a8f2ed79a + languageName: node + linkType: hard + +"readdirp@npm:~3.6.0": + version: 3.6.0 + resolution: "readdirp@npm:3.6.0" + dependencies: + picomatch: ^2.2.1 + checksum: 1ced032e6e45670b6d7352d71d21ce7edf7b9b928494dcaba6f11fba63180d9da6cd7061ebc34175ffda6ff529f481818c962952004d273178acd70f7059b320 + languageName: node + linkType: hard + +"reflect-metadata@npm:^0.1.2": + version: 0.1.13 + resolution: "reflect-metadata@npm:0.1.13" + checksum: 798d379a7b6f6455501145419505c97dd11cbc23857a386add2b9ef15963ccf15a48d9d15507afe01d4cd74116df8a213247200bac00320bd7c11ddeaa5e8fb4 + languageName: node + linkType: hard + +"regenerate-unicode-properties@npm:^8.2.0": + version: 8.2.0 + resolution: "regenerate-unicode-properties@npm:8.2.0" + dependencies: + regenerate: ^1.4.0 + checksum: ee7db70ab25b95f2e3f39537089fc3eddba0b39fc9b982d6602f127996ce873d8c55584d5428486ca00dc0a85d174d943354943cd4a745cda475c8fe314b4f8a + languageName: node + linkType: hard + +"regenerate@npm:^1.4.0": + version: 1.4.2 + resolution: "regenerate@npm:1.4.2" + checksum: 3317a09b2f802da8db09aa276e469b57a6c0dd818347e05b8862959c6193408242f150db5de83c12c3fa99091ad95fb42a6db2c3329bfaa12a0ea4cbbeb30cb0 + languageName: node + linkType: hard + +"regenerator-runtime@npm:0.13.9, regenerator-runtime@npm:^0.13.4": + version: 0.13.9 + resolution: "regenerator-runtime@npm:0.13.9" + checksum: 65ed455fe5afd799e2897baf691ca21c2772e1a969d19bb0c4695757c2d96249eb74ee3553ea34a91062b2a676beedf630b4c1551cc6299afb937be1426ec55e + languageName: node + linkType: hard + +"regenerator-transform@npm:^0.14.2": + version: 0.14.5 + resolution: "regenerator-transform@npm:0.14.5" + dependencies: + "@babel/runtime": ^7.8.4 + checksum: a467a3b652b4ec26ff964e9c5f1817523a73fc44cb928b8d21ff11aebeac5d10a84d297fe02cea9f282bcec81a0b0d562237da69ef0f40a0160b30a4fa98bc94 + languageName: node + linkType: hard + +"regex-not@npm:^1.0.0, regex-not@npm:^1.0.2": + version: 1.0.2 + resolution: "regex-not@npm:1.0.2" + dependencies: + extend-shallow: ^3.0.2 + safe-regex: ^1.1.0 + checksum: 3081403de79559387a35ef9d033740e41818a559512668cef3d12da4e8a29ef34ee13c8ed1256b07e27ae392790172e8a15c8a06b72962fd4550476cde3d8f77 + languageName: node + linkType: hard + +"regex-parser@npm:^2.2.11": + version: 2.2.11 + resolution: "regex-parser@npm:2.2.11" + checksum: 78200331ec0cc372302d287a4946c38681eb5fe435453fca572cb53cac0ba579e5eb3b9e25eac24c0c80a555fb3ea7a637814a35da1e9bc88e8819110ae5de24 + languageName: node + linkType: hard + +"regexp.prototype.flags@npm:^1.2.0": + version: 1.3.1 + resolution: "regexp.prototype.flags@npm:1.3.1" + dependencies: + call-bind: ^1.0.2 + define-properties: ^1.1.3 + checksum: 343595db5a6bbbb3bfbda881f9c74832cfa9fc0039e64a43843f6bb9158b78b921055266510800ed69d4997638890b17a46d55fd9f32961f53ae56ac3ec4dd05 + languageName: node + linkType: hard + +"regexpu-core@npm:^4.7.1": + version: 4.7.1 + resolution: "regexpu-core@npm:4.7.1" + dependencies: + regenerate: ^1.4.0 + regenerate-unicode-properties: ^8.2.0 + regjsgen: ^0.5.1 + regjsparser: ^0.6.4 + unicode-match-property-ecmascript: ^1.0.4 + unicode-match-property-value-ecmascript: ^1.2.0 + checksum: 368b4aab72132ba3c8bd114822572c920d390ae99d3d219e0c7f872c6a0a3b1fbe30c88188ff90ec6f8e681667fa8e51d84a78bb05c460996a0df6a060b7ae80 + languageName: node + linkType: hard + +"regjsgen@npm:^0.5.1": + version: 0.5.2 + resolution: "regjsgen@npm:0.5.2" + checksum: 87c83d8488affae2493a823904de1a29a1867a07433c5e1142ad749b5606c5589b305fe35bfcc0972cf5a3b0d66b1f7999009e541be39a5d42c6041c59e2fb52 + languageName: node + linkType: hard + +"regjsparser@npm:^0.6.4": + version: 0.6.9 + resolution: "regjsparser@npm:0.6.9" + dependencies: + jsesc: ~0.5.0 + bin: + regjsparser: bin/parser + checksum: 1c439ec46a0be7834ec82fbb109396e088b6b73f0e9562cd67c37e3bdf85cc7cffe0192b3324da4491c7f709ce2b06fb2d59e12f0f9836b2e0cf26d5e54263aa + languageName: node + linkType: hard + +"remove-trailing-separator@npm:^1.0.1": + version: 1.1.0 + resolution: "remove-trailing-separator@npm:1.1.0" + checksum: d3c20b5a2d987db13e1cca9385d56ecfa1641bae143b620835ac02a6b70ab88f68f117a0021838db826c57b31373d609d52e4f31aca75fc490c862732d595419 + languageName: node + linkType: hard + +"repeat-element@npm:^1.1.2": + version: 1.1.4 + resolution: "repeat-element@npm:1.1.4" + checksum: 1edd0301b7edad71808baad226f0890ba709443f03a698224c9ee4f2494c317892dc5211b2ba8cbea7194a9ddbcac01e283bd66de0467ab24ee1fc1a3711d8a9 + languageName: node + linkType: hard + +"repeat-string@npm:^1.6.1": + version: 1.6.1 + resolution: "repeat-string@npm:1.6.1" + checksum: 1b809fc6db97decdc68f5b12c4d1a671c8e3f65ec4a40c238bc5200e44e85bcc52a54f78268ab9c29fcf5fe4f1343e805420056d1f30fa9a9ee4c2d93e3cc6c0 + languageName: node + linkType: hard + +"request-progress@npm:^3.0.0": + version: 3.0.0 + resolution: "request-progress@npm:3.0.0" + dependencies: + throttleit: ^1.0.0 + checksum: 6ea1761dcc8a8b7b5894afd478c0286aa31bd69438d7050294bd4fd0d0b3e09b5cde417d38deef9c49809039c337d8744e4bb49d8632b0c3e4ffa5e8a687e0fd + languageName: node + linkType: hard + +"request@npm:^2.88.2": + version: 2.88.2 + resolution: "request@npm:2.88.2" + dependencies: + aws-sign2: ~0.7.0 + aws4: ^1.8.0 + caseless: ~0.12.0 + combined-stream: ~1.0.6 + extend: ~3.0.2 + forever-agent: ~0.6.1 + form-data: ~2.3.2 + har-validator: ~5.1.3 + http-signature: ~1.2.0 + is-typedarray: ~1.0.0 + isstream: ~0.1.2 + json-stringify-safe: ~5.0.1 + mime-types: ~2.1.19 + oauth-sign: ~0.9.0 + performance-now: ^2.1.0 + qs: ~6.5.2 + safe-buffer: ^5.1.2 + tough-cookie: ~2.5.0 + tunnel-agent: ^0.6.0 + uuid: ^3.3.2 + checksum: 4e112c087f6eabe7327869da2417e9d28fcd0910419edd2eb17b6acfc4bfa1dad61954525949c228705805882d8a98a86a0ea12d7f739c01ee92af7062996983 + languageName: node + linkType: hard + +"require-directory@npm:^2.1.1": + version: 2.1.1 + resolution: "require-directory@npm:2.1.1" + checksum: fb47e70bf0001fdeabdc0429d431863e9475e7e43ea5f94ad86503d918423c1543361cc5166d713eaa7029dd7a3d34775af04764bebff99ef413111a5af18c80 + languageName: node + linkType: hard + +"require-from-string@npm:^2.0.2": + version: 2.0.2 + resolution: "require-from-string@npm:2.0.2" + checksum: a03ef6895445f33a4015300c426699bc66b2b044ba7b670aa238610381b56d3f07c686251740d575e22f4c87531ba662d06937508f0f3c0f1ddc04db3130560b + languageName: node + linkType: hard + +"require-main-filename@npm:^2.0.0": + version: 2.0.0 + resolution: "require-main-filename@npm:2.0.0" + checksum: e9e294695fea08b076457e9ddff854e81bffbe248ed34c1eec348b7abbd22a0d02e8d75506559e2265e96978f3c4720bd77a6dad84755de8162b357eb6c778c7 + languageName: node + linkType: hard + +"requires-port@npm:^1.0.0": + version: 1.0.0 + resolution: "requires-port@npm:1.0.0" + checksum: eee0e303adffb69be55d1a214e415cf42b7441ae858c76dfc5353148644f6fd6e698926fc4643f510d5c126d12a705e7c8ed7e38061113bdf37547ab356797ff + languageName: node + linkType: hard + +"resolve-cwd@npm:^2.0.0": + version: 2.0.0 + resolution: "resolve-cwd@npm:2.0.0" + dependencies: + resolve-from: ^3.0.0 + checksum: e7c16880c460656e77f102d537a6dc82b3657d9173697cd6ea82ffce37df96f6c1fc79d0bb35fd73fff8871ac13f21b4396958b5f0a13e5b99c97d69f5e319fa + languageName: node + linkType: hard + +"resolve-from@npm:^3.0.0": + version: 3.0.0 + resolution: "resolve-from@npm:3.0.0" + checksum: fff9819254d2d62b57f74e5c2ca9c0bdd425ca47287c4d801bc15f947533148d858229ded7793b0f59e61e49e782fffd6722048add12996e1bd4333c29669062 + languageName: node + linkType: hard + +"resolve-from@npm:^4.0.0": + version: 4.0.0 + resolution: "resolve-from@npm:4.0.0" + checksum: f4ba0b8494846a5066328ad33ef8ac173801a51739eb4d63408c847da9a2e1c1de1e6cbbf72699211f3d13f8fc1325648b169bd15eb7da35688e30a5fb0e4a7f + languageName: node + linkType: hard + +"resolve-url-loader@npm:4.0.0": + version: 4.0.0 + resolution: "resolve-url-loader@npm:4.0.0" + dependencies: + adjust-sourcemap-loader: ^4.0.0 + convert-source-map: ^1.7.0 + loader-utils: ^2.0.0 + postcss: ^7.0.35 + source-map: 0.6.1 + peerDependencies: + rework: 1.0.1 + rework-visit: 1.0.0 + peerDependenciesMeta: + rework: + optional: true + rework-visit: + optional: true + checksum: 8e5bcf97867a5e128b6b86988d445b7fbd1214f7c5c0214332f835e8607438e153d9b3899799a03ddd03540254bb591e572feb330981a4478be934f6f045c925 + languageName: node + linkType: hard + +"resolve-url@npm:^0.2.1": + version: 0.2.1 + resolution: "resolve-url@npm:0.2.1" + checksum: 7b7035b9ed6e7bc7d289e90aef1eab5a43834539695dac6416ca6e91f1a94132ae4796bbd173cdacfdc2ade90b5f38a3fb6186bebc1b221cd157777a23b9ad14 + languageName: node + linkType: hard + +"resolve@npm:1.20.0, resolve@npm:^1.1.7, resolve@npm:^1.14.2, resolve@npm:^1.3.2": + version: 1.20.0 + resolution: "resolve@npm:1.20.0" + dependencies: + is-core-module: ^2.2.0 + path-parse: ^1.0.6 + checksum: 40cf70b2cde00ef57f99daf2dc63c6a56d6c14a1b7fc51735d06a6f0a3b97cb67b4fb7ef6c747b4e13a7baba83b0ef625d7c4ce92a483cd5af923c3b65fd16fe + languageName: node + linkType: hard + +"resolve@patch:resolve@1.20.0#~builtin, resolve@patch:resolve@^1.1.7#~builtin, resolve@patch:resolve@^1.14.2#~builtin, resolve@patch:resolve@^1.3.2#~builtin": + version: 1.20.0 + resolution: "resolve@patch:resolve@npm%3A1.20.0#~builtin::version=1.20.0&hash=07638b" + dependencies: + is-core-module: ^2.2.0 + path-parse: ^1.0.6 + checksum: a0dd7d16a8e47af23afa9386df2dff10e3e0debb2c7299a42e581d9d9b04d7ad5d2c53f24f1e043f7b3c250cbdc71150063e53d0b6559683d37f790b7c8c3cd5 + languageName: node + linkType: hard + +"restore-cursor@npm:^3.1.0": + version: 3.1.0 + resolution: "restore-cursor@npm:3.1.0" + dependencies: + onetime: ^5.1.0 + signal-exit: ^3.0.2 + checksum: f877dd8741796b909f2a82454ec111afb84eb45890eb49ac947d87991379406b3b83ff9673a46012fca0d7844bb989f45cc5b788254cf1a39b6b5a9659de0630 + languageName: node + linkType: hard + +"ret@npm:~0.1.10": + version: 0.1.15 + resolution: "ret@npm:0.1.15" + checksum: d76a9159eb8c946586567bd934358dfc08a36367b3257f7a3d7255fdd7b56597235af23c6afa0d7f0254159e8051f93c918809962ebd6df24ca2a83dbe4d4151 + languageName: node + linkType: hard + +"retry@npm:^0.12.0": + version: 0.12.0 + resolution: "retry@npm:0.12.0" + checksum: 623bd7d2e5119467ba66202d733ec3c2e2e26568074923bc0585b6b99db14f357e79bdedb63cab56cec47491c4a0da7e6021a7465ca6dc4f481d3898fdd3158c + languageName: node + linkType: hard + +"reusify@npm:^1.0.4": + version: 1.0.4 + resolution: "reusify@npm:1.0.4" + checksum: c3076ebcc22a6bc252cb0b9c77561795256c22b757f40c0d8110b1300723f15ec0fc8685e8d4ea6d7666f36c79ccc793b1939c748bf36f18f542744a4e379fcc + languageName: node + linkType: hard + +"rfdc@npm:^1.1.4": + version: 1.3.0 + resolution: "rfdc@npm:1.3.0" + checksum: fb2ba8512e43519983b4c61bd3fa77c0f410eff6bae68b08614437bc3f35f91362215f7b4a73cbda6f67330b5746ce07db5dd9850ad3edc91271ad6deea0df32 + languageName: node + linkType: hard + +"rimraf@npm:2.6.1": + version: 2.6.1 + resolution: "rimraf@npm:2.6.1" + dependencies: + glob: ^7.0.5 + bin: + rimraf: ./bin.js + checksum: ff59d2c3e17e5cc48fa3e2b19770602a213410ee7e788b4447d925f652b0f78a1dcd6910c84f1edcc97922f69aa635895ca9d4565a3c67bbb32cac8987372a7a + languageName: node + linkType: hard + +"rimraf@npm:3.0.2, rimraf@npm:^3.0.0, rimraf@npm:^3.0.2": + version: 3.0.2 + resolution: "rimraf@npm:3.0.2" + dependencies: + glob: ^7.1.3 + bin: + rimraf: bin.js + checksum: 87f4164e396f0171b0a3386cc1877a817f572148ee13a7e113b238e48e8a9f2f31d009a92ec38a591ff1567d9662c6b67fd8818a2dbbaed74bc26a87a2a4a9a0 + languageName: node + linkType: hard + +"rimraf@npm:^2.6.3": + version: 2.7.1 + resolution: "rimraf@npm:2.7.1" + dependencies: + glob: ^7.1.3 + bin: + rimraf: ./bin.js + checksum: cdc7f6eacb17927f2a075117a823e1c5951792c6498ebcce81ca8203454a811d4cf8900314154d3259bb8f0b42ab17f67396a8694a54cae3283326e57ad250cd + languageName: node + linkType: hard + +"run-async@npm:^2.4.0": + version: 2.4.1 + resolution: "run-async@npm:2.4.1" + checksum: a2c88aa15df176f091a2878eb840e68d0bdee319d8d97bbb89112223259cebecb94bc0defd735662b83c2f7a30bed8cddb7d1674eb48ae7322dc602b22d03797 + languageName: node + linkType: hard + +"run-parallel@npm:^1.1.9": + version: 1.2.0 + resolution: "run-parallel@npm:1.2.0" + dependencies: + queue-microtask: ^1.2.2 + checksum: cb4f97ad25a75ebc11a8ef4e33bb962f8af8516bb2001082ceabd8902e15b98f4b84b4f8a9b222e5d57fc3bd1379c483886ed4619367a7680dad65316993021d + languageName: node + linkType: hard + +"rxjs@npm:6.6.7, rxjs@npm:^6.6.7, rxjs@npm:~6.6.0": + version: 6.6.7 + resolution: "rxjs@npm:6.6.7" + dependencies: + tslib: ^1.9.0 + checksum: bc334edef1bb8bbf56590b0b25734ba0deaf8825b703256a93714308ea36dff8a11d25533671adf8e104e5e8f256aa6fdfe39b2e248cdbd7a5f90c260acbbd1b + languageName: node + linkType: hard + +"rxjs@npm:^7.2.0": + version: 7.3.0 + resolution: "rxjs@npm:7.3.0" + dependencies: + tslib: ~2.1.0 + checksum: e63adb8808ea6c299a020d56d2af92bcf71efe641adf838499932e29b8f5fd5ff00873653ad48ba3ecf6c9fc11c3c595acf995e8d456f9d8cb85c7d37a1fd72e + languageName: node + linkType: hard + +"safe-buffer@npm:5.1.2, safe-buffer@npm:~5.1.0, safe-buffer@npm:~5.1.1": + version: 5.1.2 + resolution: "safe-buffer@npm:5.1.2" + checksum: f2f1f7943ca44a594893a852894055cf619c1fbcb611237fc39e461ae751187e7baf4dc391a72125e0ac4fb2d8c5c0b3c71529622e6a58f46b960211e704903c + languageName: node + linkType: hard + +"safe-buffer@npm:>=5.1.0, safe-buffer@npm:^5.0.1, safe-buffer@npm:^5.1.0, safe-buffer@npm:^5.1.2, safe-buffer@npm:~5.2.0": + version: 5.2.1 + resolution: "safe-buffer@npm:5.2.1" + checksum: b99c4b41fdd67a6aaf280fcd05e9ffb0813654894223afb78a31f14a19ad220bba8aba1cb14eddce1fcfb037155fe6de4e861784eb434f7d11ed58d1e70dd491 + languageName: node + linkType: hard + +"safe-regex@npm:^1.1.0": + version: 1.1.0 + resolution: "safe-regex@npm:1.1.0" + dependencies: + ret: ~0.1.10 + checksum: 9a8bba57c87a841f7997b3b951e8e403b1128c1a4fd1182f40cc1a20e2d490593d7c2a21030fadfea320c8e859219019e136f678c6689ed5960b391b822f01d5 + languageName: node + linkType: hard + +"safer-buffer@npm:>= 2.1.2 < 3, safer-buffer@npm:>= 2.1.2 < 3.0.0, safer-buffer@npm:^2.0.2, safer-buffer@npm:^2.1.0, safer-buffer@npm:^2.1.2, safer-buffer@npm:~2.1.0": + version: 2.1.2 + resolution: "safer-buffer@npm:2.1.2" + checksum: cab8f25ae6f1434abee8d80023d7e72b598cf1327164ddab31003c51215526801e40b66c5e65d658a0af1e9d6478cadcb4c745f4bd6751f97d8644786c0978b0 + languageName: node + linkType: hard + +"sass-loader@npm:12.1.0": + version: 12.1.0 + resolution: "sass-loader@npm:12.1.0" + dependencies: + klona: ^2.0.4 + neo-async: ^2.6.2 + peerDependencies: + fibers: ">= 3.1.0" + node-sass: ^4.0.0 || ^5.0.0 || ^6.0.0 + sass: ^1.3.0 + webpack: ^5.0.0 + peerDependenciesMeta: + fibers: + optional: true + node-sass: + optional: true + sass: + optional: true + checksum: 69c66ea3482922064f1e907fc204283e5e9cc02eb20b7ab1761d478922f77b3e2c47c8e3c585f771d75ce57bb088b226ae2eb4c736849b29c8727e921a6e0d41 + languageName: node + linkType: hard + +"sass@npm:1.36.0": + version: 1.36.0 + resolution: "sass@npm:1.36.0" + dependencies: + chokidar: ">=3.0.0 <4.0.0" + bin: + sass: sass.js + checksum: fdb03deed1769f182900c1b5505bc22e50cf1d3ce4d5253fc907865f784c430236937bd391d91ef714e59995584f13ff31d3776d5283e730f5172ac227585754 + languageName: node + linkType: hard + +"sax@npm:^1.2.4, sax@npm:~1.2.4": + version: 1.2.4 + resolution: "sax@npm:1.2.4" + checksum: d3df7d32b897a2c2f28e941f732c71ba90e27c24f62ee918bd4d9a8cfb3553f2f81e5493c7f0be94a11c1911b643a9108f231dd6f60df3fa9586b5d2e3e9e1fe + languageName: node + linkType: hard + +"schema-utils@npm:^1.0.0": + version: 1.0.0 + resolution: "schema-utils@npm:1.0.0" + dependencies: + ajv: ^6.1.0 + ajv-errors: ^1.0.0 + ajv-keywords: ^3.1.0 + checksum: e8273b4f6eff9ddf4a4f4c11daf7b96b900237bf8859c86fa1e9b4fab416b72d7ea92468f8db89c18a3499a1070206e1c8a750c83b42d5325fc659cbb55eee88 + languageName: node + linkType: hard + +"schema-utils@npm:^2.6.5, schema-utils@npm:^2.7.0": + version: 2.7.1 + resolution: "schema-utils@npm:2.7.1" + dependencies: + "@types/json-schema": ^7.0.5 + ajv: ^6.12.4 + ajv-keywords: ^3.5.2 + checksum: 32c62fc9e28edd101e1bd83453a4216eb9bd875cc4d3775e4452b541908fa8f61a7bbac8ffde57484f01d7096279d3ba0337078e85a918ecbeb72872fb09fb2b + languageName: node + linkType: hard + +"schema-utils@npm:^3.0.0, schema-utils@npm:^3.1.0, schema-utils@npm:^3.1.1": + version: 3.1.1 + resolution: "schema-utils@npm:3.1.1" + dependencies: + "@types/json-schema": ^7.0.8 + ajv: ^6.12.5 + ajv-keywords: ^3.5.2 + checksum: fb73f3d759d43ba033c877628fe9751620a26879f6301d3dbeeb48cf2a65baec5cdf99da65d1bf3b4ff5444b2e59cbe4f81c2456b5e0d2ba7d7fd4aed5da29ce + languageName: node + linkType: hard + +"select-hose@npm:^2.0.0": + version: 2.0.0 + resolution: "select-hose@npm:2.0.0" + checksum: d7e5fcc695a4804209d232a1b18624a5134be334d4e1114b0721f7a5e72bd73da483dcf41528c1af4f4f4892ad7cfd6a1e55c8ffb83f9c9fe723b738db609dbb + languageName: node + linkType: hard + +"selfsigned@npm:^1.10.8": + version: 1.10.11 + resolution: "selfsigned@npm:1.10.11" + dependencies: + node-forge: ^0.10.0 + checksum: 1fd8fd317dc0b7d713d12d828131ac03c53abf41c4538b263fecd37bbc15688526c631654049ff00806b757ccb85492de6a13d6fefcad5cb54926631e48a76e1 + languageName: node + linkType: hard + +"semver@npm:7.0.0": + version: 7.0.0 + resolution: "semver@npm:7.0.0" + bin: + semver: bin/semver.js + checksum: 272c11bf8d083274ef79fe40a81c55c184dff84dd58e3c325299d0927ba48cece1f020793d138382b85f89bab5002a35a5ba59a3a68a7eebbb597eb733838778 + languageName: node + linkType: hard + +"semver@npm:7.3.5, semver@npm:^7.0.0, semver@npm:^7.1.1, semver@npm:^7.3.2, semver@npm:^7.3.4, semver@npm:^7.3.5": + version: 7.3.5 + resolution: "semver@npm:7.3.5" + dependencies: + lru-cache: ^6.0.0 + bin: + semver: bin/semver.js + checksum: 5eafe6102bea2a7439897c1856362e31cc348ccf96efd455c8b5bc2c61e6f7e7b8250dc26b8828c1d76a56f818a7ee907a36ae9fb37a599d3d24609207001d60 + languageName: node + linkType: hard + +"semver@npm:^5.4.1, semver@npm:^5.5.0, semver@npm:^5.6.0": + version: 5.7.1 + resolution: "semver@npm:5.7.1" + bin: + semver: ./bin/semver + checksum: 57fd0acfd0bac382ee87cd52cd0aaa5af086a7dc8d60379dfe65fea491fb2489b6016400813930ecd61fd0952dae75c115287a1b16c234b1550887117744dfaf + languageName: node + linkType: hard + +"semver@npm:^6.0.0, semver@npm:^6.1.1, semver@npm:^6.1.2, semver@npm:^6.3.0": + version: 6.3.0 + resolution: "semver@npm:6.3.0" + bin: + semver: ./bin/semver.js + checksum: 1b26ecf6db9e8292dd90df4e781d91875c0dcc1b1909e70f5d12959a23c7eebb8f01ea581c00783bbee72ceeaad9505797c381756326073850dc36ed284b21b9 + languageName: node + linkType: hard + +"send@npm:0.17.1": + version: 0.17.1 + resolution: "send@npm:0.17.1" + dependencies: + debug: 2.6.9 + depd: ~1.1.2 + destroy: ~1.0.4 + encodeurl: ~1.0.2 + escape-html: ~1.0.3 + etag: ~1.8.1 + fresh: 0.5.2 + http-errors: ~1.7.2 + mime: 1.6.0 + ms: 2.1.1 + on-finished: ~2.3.0 + range-parser: ~1.2.1 + statuses: ~1.5.0 + checksum: d214c2fa42e7fae3f8fc1aa3931eeb3e6b78c2cf141574e09dbe159915c1e3a337269fc6b7512e7dfddcd7d6ff5974cb62f7c3637ba86a55bde20a92c18bdca0 + languageName: node + linkType: hard + +"serialize-javascript@npm:^6.0.0": + version: 6.0.0 + resolution: "serialize-javascript@npm:6.0.0" + dependencies: + randombytes: ^2.1.0 + checksum: 56f90b562a1bdc92e55afb3e657c6397c01a902c588c0fe3d4c490efdcc97dcd2a3074ba12df9e94630f33a5ce5b76a74784a7041294628a6f4306e0ec84bf93 + languageName: node + linkType: hard + +"serve-index@npm:^1.9.1": + version: 1.9.1 + resolution: "serve-index@npm:1.9.1" + dependencies: + accepts: ~1.3.4 + batch: 0.6.1 + debug: 2.6.9 + escape-html: ~1.0.3 + http-errors: ~1.6.2 + mime-types: ~2.1.17 + parseurl: ~1.3.2 + checksum: e2647ce13379485b98a53ba2ea3fbad4d44b57540d00663b02b976e426e6194d62ac465c0d862cb7057f65e0de8ab8a684aa095427a4b8612412eca0d300d22f + languageName: node + linkType: hard + +"serve-static@npm:1.14.1": + version: 1.14.1 + resolution: "serve-static@npm:1.14.1" + dependencies: + encodeurl: ~1.0.2 + escape-html: ~1.0.3 + parseurl: ~1.3.3 + send: 0.17.1 + checksum: c6b268e8486d39ecd54b86c7f2d0ee4a38cd7514ddd9c92c8d5793bb005afde5e908b12395898ae206782306ccc848193d93daa15b86afb3cbe5a8414806abe8 + languageName: node + linkType: hard + +"set-blocking@npm:^2.0.0, set-blocking@npm:~2.0.0": + version: 2.0.0 + resolution: "set-blocking@npm:2.0.0" + checksum: 6e65a05f7cf7ebdf8b7c75b101e18c0b7e3dff4940d480efed8aad3a36a4005140b660fa1d804cb8bce911cac290441dc728084a30504d3516ac2ff7ad607b02 + languageName: node + linkType: hard + +"set-value@npm:^2.0.0, set-value@npm:^2.0.1": + version: 2.0.1 + resolution: "set-value@npm:2.0.1" + dependencies: + extend-shallow: ^2.0.1 + is-extendable: ^0.1.1 + is-plain-object: ^2.0.3 + split-string: ^3.0.1 + checksum: 09a4bc72c94641aeae950eb60dc2755943b863780fcc32e441eda964b64df5e3f50603d5ebdd33394ede722528bd55ed43aae26e9df469b4d32e2292b427b601 + languageName: node + linkType: hard + +"setprototypeof@npm:1.1.0": + version: 1.1.0 + resolution: "setprototypeof@npm:1.1.0" + checksum: 27cb44304d6c9e1a23bc6c706af4acaae1a7aa1054d4ec13c05f01a99fd4887109a83a8042b67ad90dbfcd100d43efc171ee036eb080667172079213242ca36e + languageName: node + linkType: hard + +"setprototypeof@npm:1.1.1": + version: 1.1.1 + resolution: "setprototypeof@npm:1.1.1" + checksum: a8bee29c1c64c245d460ce53f7460af8cbd0aceac68d66e5215153992cc8b3a7a123416353e0c642060e85cc5fd4241c92d1190eec97eda0dcb97436e8fcca3b + languageName: node + linkType: hard + +"shallow-clone@npm:^3.0.0": + version: 3.0.1 + resolution: "shallow-clone@npm:3.0.1" + dependencies: + kind-of: ^6.0.2 + checksum: 39b3dd9630a774aba288a680e7d2901f5c0eae7b8387fc5c8ea559918b29b3da144b7bdb990d7ccd9e11be05508ac9e459ce51d01fd65e583282f6ffafcba2e7 + languageName: node + linkType: hard + +"shebang-command@npm:^1.2.0": + version: 1.2.0 + resolution: "shebang-command@npm:1.2.0" + dependencies: + shebang-regex: ^1.0.0 + checksum: 9eed1750301e622961ba5d588af2212505e96770ec376a37ab678f965795e995ade7ed44910f5d3d3cb5e10165a1847f52d3348c64e146b8be922f7707958908 + languageName: node + linkType: hard + +"shebang-command@npm:^2.0.0": + version: 2.0.0 + resolution: "shebang-command@npm:2.0.0" + dependencies: + shebang-regex: ^3.0.0 + checksum: 6b52fe87271c12968f6a054e60f6bde5f0f3d2db483a1e5c3e12d657c488a15474121a1d55cd958f6df026a54374ec38a4a963988c213b7570e1d51575cea7fa + languageName: node + linkType: hard + +"shebang-regex@npm:^1.0.0": + version: 1.0.0 + resolution: "shebang-regex@npm:1.0.0" + checksum: 404c5a752cd40f94591dfd9346da40a735a05139dac890ffc229afba610854d8799aaa52f87f7e0c94c5007f2c6af55bdcaeb584b56691926c5eaf41dc8f1372 + languageName: node + linkType: hard + +"shebang-regex@npm:^3.0.0": + version: 3.0.0 + resolution: "shebang-regex@npm:3.0.0" + checksum: 1a2bcae50de99034fcd92ad4212d8e01eedf52c7ec7830eedcf886622804fe36884278f2be8be0ea5fde3fd1c23911643a4e0f726c8685b61871c8908af01222 + languageName: node + linkType: hard + +"shellwords@npm:^0.1.1": + version: 0.1.1 + resolution: "shellwords@npm:0.1.1" + checksum: 8d73a5e9861f5e5f1068e2cfc39bc0002400fe58558ab5e5fa75630d2c3adf44ca1fac81957609c8320d5533e093802fcafc72904bf1a32b95de3c19a0b1c0d4 + languageName: node + linkType: hard + +"signal-exit@npm:^3.0.0, signal-exit@npm:^3.0.2": + version: 3.0.3 + resolution: "signal-exit@npm:3.0.3" + checksum: f0169d3f1263d06df32ca072b0bf33b34c6f8f0341a7a1621558a2444dfbe8f5fec76b35537fcc6f0bc4944bdb5336fe0bdcf41a5422c4e45a1dba3f45475e6c + languageName: node + linkType: hard + +"slash@npm:^3.0.0": + version: 3.0.0 + resolution: "slash@npm:3.0.0" + checksum: 94a93fff615f25a999ad4b83c9d5e257a7280c90a32a7cb8b4a87996e4babf322e469c42b7f649fd5796edd8687652f3fb452a86dc97a816f01113183393f11c + languageName: node + linkType: hard + +"slice-ansi@npm:^3.0.0": + version: 3.0.0 + resolution: "slice-ansi@npm:3.0.0" + dependencies: + ansi-styles: ^4.0.0 + astral-regex: ^2.0.0 + is-fullwidth-code-point: ^3.0.0 + checksum: 5ec6d022d12e016347e9e3e98a7eb2a592213a43a65f1b61b74d2c78288da0aded781f665807a9f3876b9daa9ad94f64f77d7633a0458876c3a4fdc4eb223f24 + languageName: node + linkType: hard + +"slice-ansi@npm:^4.0.0": + version: 4.0.0 + resolution: "slice-ansi@npm:4.0.0" + dependencies: + ansi-styles: ^4.0.0 + astral-regex: ^2.0.0 + is-fullwidth-code-point: ^3.0.0 + checksum: 4a82d7f085b0e1b070e004941ada3c40d3818563ac44766cca4ceadd2080427d337554f9f99a13aaeb3b4a94d9964d9466c807b3d7b7541d1ec37ee32d308756 + languageName: node + linkType: hard + +"smart-buffer@npm:^4.1.0": + version: 4.2.0 + resolution: "smart-buffer@npm:4.2.0" + checksum: b5167a7142c1da704c0e3af85c402002b597081dd9575031a90b4f229ca5678e9a36e8a374f1814c8156a725d17008ae3bde63b92f9cfd132526379e580bec8b + languageName: node + linkType: hard + +"snapdragon-node@npm:^2.0.1": + version: 2.1.1 + resolution: "snapdragon-node@npm:2.1.1" + dependencies: + define-property: ^1.0.0 + isobject: ^3.0.0 + snapdragon-util: ^3.0.1 + checksum: 9bb57d759f9e2a27935dbab0e4a790137adebace832b393e350a8bf5db461ee9206bb642d4fe47568ee0b44080479c8b4a9ad0ebe3712422d77edf9992a672fd + languageName: node + linkType: hard + +"snapdragon-util@npm:^3.0.1": + version: 3.0.1 + resolution: "snapdragon-util@npm:3.0.1" + dependencies: + kind-of: ^3.2.0 + checksum: 684997dbe37ec995c03fd3f412fba2b711fc34cb4010452b7eb668be72e8811a86a12938b511e8b19baf853b325178c56d8b78d655305e5cfb0bb8b21677e7b7 + languageName: node + linkType: hard + +"snapdragon@npm:^0.8.1": + version: 0.8.2 + resolution: "snapdragon@npm:0.8.2" + dependencies: + base: ^0.11.1 + debug: ^2.2.0 + define-property: ^0.2.5 + extend-shallow: ^2.0.1 + map-cache: ^0.2.2 + source-map: ^0.5.6 + source-map-resolve: ^0.5.0 + use: ^3.1.0 + checksum: a197f242a8f48b11036563065b2487e9b7068f50a20dd81d9161eca6af422174fc158b8beeadbe59ce5ef172aa5718143312b3aebaae551c124b7824387c8312 + languageName: node + linkType: hard + +"socket.io-adapter@npm:~2.1.0": + version: 2.1.0 + resolution: "socket.io-adapter@npm:2.1.0" + checksum: d5b18b1c007066adcfb4737ac835834e4191221179c50334314605b077df2468a37a9ba2d37626f740ecf6b2adef7b6b7bb7dae6e262e5561d36814910a0a8b0 + languageName: node + linkType: hard + +"socket.io-parser@npm:~4.0.3": + version: 4.0.4 + resolution: "socket.io-parser@npm:4.0.4" + dependencies: + "@types/component-emitter": ^1.2.10 + component-emitter: ~1.3.0 + debug: ~4.3.1 + checksum: c173b4f3747c51e2af802eca35212f4dcfa8fe55d7fdc07b9a01da1ecc956791c1bf6591e307952548eab69e6500bcfe27cea8aff1386b860d9bb51f98e4fafb + languageName: node + linkType: hard + +"socket.io@npm:^3.1.0": + version: 3.1.2 + resolution: "socket.io@npm:3.1.2" + dependencies: + "@types/cookie": ^0.4.0 + "@types/cors": ^2.8.8 + "@types/node": ">=10.0.0" + accepts: ~1.3.4 + base64id: ~2.0.0 + debug: ~4.3.1 + engine.io: ~4.1.0 + socket.io-adapter: ~2.1.0 + socket.io-parser: ~4.0.3 + checksum: 3fa5296f9f917c8765ff150030308aac6198baeceb7182f62cfee8d5696fad2c8ebef2364d8bb8910be5e299752394afac68c1819f5ea79abaa524038ed09596 + languageName: node + linkType: hard + +"sockjs-client@npm:^1.5.0": + version: 1.5.2 + resolution: "sockjs-client@npm:1.5.2" + dependencies: + debug: ^3.2.6 + eventsource: ^1.0.7 + faye-websocket: ^0.11.3 + inherits: ^2.0.4 + json3: ^3.3.3 + url-parse: ^1.5.3 + checksum: b3c3966ca8ebe72454e3bbb83b21b0f58dda1c725815f2897162104afc42b779de9a6d964fb2b164ea290cb4c0c94cb3542bd7f788f21fe5df018da963826f96 + languageName: node + linkType: hard + +"sockjs@npm:^0.3.21": + version: 0.3.21 + resolution: "sockjs@npm:0.3.21" + dependencies: + faye-websocket: ^0.11.3 + uuid: ^3.4.0 + websocket-driver: ^0.7.4 + checksum: 9614e5dded95d38c08c42bba3505638801d0e88d9fec03dc1ae37296286ad5c31dff503b8c81a11e573bd0bea76b295db93d4f00cc336e749bc89f9f7cc7e6c9 + languageName: node + linkType: hard + +"socks-proxy-agent@npm:^6.0.0": + version: 6.0.0 + resolution: "socks-proxy-agent@npm:6.0.0" + dependencies: + agent-base: ^6.0.2 + debug: ^4.3.1 + socks: ^2.6.1 + checksum: bc2b321c0ad3f4302effa791823dc100594f95222ce8c0c41143dd25dd81975bd0fd90553ce213c1c27e56a819c08e85c66b819e777072b704857dcbd6177fcf + languageName: node + linkType: hard + +"socks@npm:^2.6.1": + version: 2.6.1 + resolution: "socks@npm:2.6.1" + dependencies: + ip: ^1.1.5 + smart-buffer: ^4.1.0 + checksum: 2ca9d616e424f645838ebaabb04f85d94ea999e0f8393dc07f86c435af22ed88cb83958feeabd1bb7bc537c635ed47454255635502c6808a6df61af1f41af750 + languageName: node + linkType: hard + +"source-list-map@npm:^2.0.0": + version: 2.0.1 + resolution: "source-list-map@npm:2.0.1" + checksum: 806efc6f75e7cd31e4815e7a3aaf75a45c704871ea4075cb2eb49882c6fca28998f44fc5ac91adb6de03b2882ee6fb02f951fdc85e6a22b338c32bfe19557938 + languageName: node + linkType: hard + +"source-map-js@npm:^0.6.2": + version: 0.6.2 + resolution: "source-map-js@npm:0.6.2" + checksum: 9c8151a29e00fd8d3ba87709fdf9a9ce48313d653f4a29a39b4ae53d346ac79e005de624796ff42eff55cbaf26d2e87f4466001ca87831d400d818c5cf146a0e + languageName: node + linkType: hard + +"source-map-loader@npm:3.0.0": + version: 3.0.0 + resolution: "source-map-loader@npm:3.0.0" + dependencies: + abab: ^2.0.5 + iconv-lite: ^0.6.2 + source-map-js: ^0.6.2 + peerDependencies: + webpack: ^5.0.0 + checksum: c4459cef5a43917ca1c7ad53b106ba715d545daae1ace259c867c36b2b2443c3b9eebe8630cac8f193760db39965c22d1b44d8f69e9910b88c8aca1c836757b5 + languageName: node + linkType: hard + +"source-map-resolve@npm:^0.5.0, source-map-resolve@npm:^0.5.2": + version: 0.5.3 + resolution: "source-map-resolve@npm:0.5.3" + dependencies: + atob: ^2.1.2 + decode-uri-component: ^0.2.0 + resolve-url: ^0.2.1 + source-map-url: ^0.4.0 + urix: ^0.1.0 + checksum: c73fa44ac00783f025f6ad9e038ab1a2e007cd6a6b86f47fe717c3d0765b4a08d264f6966f3bd7cd9dbcd69e4832783d5472e43247775b2a550d6f2155d24bae + languageName: node + linkType: hard + +"source-map-resolve@npm:^0.6.0": + version: 0.6.0 + resolution: "source-map-resolve@npm:0.6.0" + dependencies: + atob: ^2.1.2 + decode-uri-component: ^0.2.0 + checksum: fe503b9e5dac1c54be835282fcfec10879434e7b3ee08a9774f230299c724a8d403484d9531276d1670c87390e0e4d1d3f92b14cca6e4a2445ea3016b786ecd4 + languageName: node + linkType: hard + +"source-map-support@npm:0.5.19, source-map-support@npm:^0.5.5, source-map-support@npm:~0.5.19": + version: 0.5.19 + resolution: "source-map-support@npm:0.5.19" + dependencies: + buffer-from: ^1.0.0 + source-map: ^0.6.0 + checksum: c72802fdba9cb62b92baef18cc14cc4047608b77f0353e6c36dd993444149a466a2845332c5540d4a6630957254f0f68f4ef5a0120c33d2e83974c51a05afbac + languageName: node + linkType: hard + +"source-map-url@npm:^0.4.0": + version: 0.4.1 + resolution: "source-map-url@npm:0.4.1" + checksum: 64c5c2c77aff815a6e61a4120c309ae4cac01298d9bcbb3deb1b46a4dd4c46d4a1eaeda79ec9f684766ae80e8dc86367b89326ce9dd2b89947bd9291fc1ac08c + languageName: node + linkType: hard + +"source-map@npm:0.6.1, source-map@npm:^0.6.0, source-map@npm:^0.6.1, source-map@npm:~0.6.0, source-map@npm:~0.6.1": + version: 0.6.1 + resolution: "source-map@npm:0.6.1" + checksum: 59ce8640cf3f3124f64ac289012c2b8bd377c238e316fb323ea22fbfe83da07d81e000071d7242cad7a23cd91c7de98e4df8830ec3f133cb6133a5f6e9f67bc2 + languageName: node + linkType: hard + +"source-map@npm:0.7.3, source-map@npm:^0.7.3, source-map@npm:~0.7.2": + version: 0.7.3 + resolution: "source-map@npm:0.7.3" + checksum: cd24efb3b8fa69b64bf28e3c1b1a500de77e84260c5b7f2b873f88284df17974157cc88d386ee9b6d081f08fdd8242f3fc05c953685a6ad81aad94c7393dedea + languageName: node + linkType: hard + +"source-map@npm:^0.5.0, source-map@npm:^0.5.6": + version: 0.5.7 + resolution: "source-map@npm:0.5.7" + checksum: 5dc2043b93d2f194142c7f38f74a24670cd7a0063acdaf4bf01d2964b402257ae843c2a8fa822ad5b71013b5fcafa55af7421383da919752f22ff488bc553f4d + languageName: node + linkType: hard + +"sourcemap-codec@npm:1.4.8, sourcemap-codec@npm:^1.4.4, sourcemap-codec@npm:^1.4.8": + version: 1.4.8 + resolution: "sourcemap-codec@npm:1.4.8" + checksum: b57981c05611afef31605732b598ccf65124a9fcb03b833532659ac4d29ac0f7bfacbc0d6c5a28a03e84c7510e7e556d758d0bb57786e214660016fb94279316 + languageName: node + linkType: hard + +"spdy-transport@npm:^3.0.0": + version: 3.0.0 + resolution: "spdy-transport@npm:3.0.0" + dependencies: + debug: ^4.1.0 + detect-node: ^2.0.4 + hpack.js: ^2.1.6 + obuf: ^1.1.2 + readable-stream: ^3.0.6 + wbuf: ^1.7.3 + checksum: 0fcaad3b836fb1ec0bdd39fa7008b9a7a84a553f12be6b736a2512613b323207ffc924b9551cef0378f7233c85916cff1118652e03a730bdb97c0e042243d56c + languageName: node + linkType: hard + +"spdy@npm:^4.0.2": + version: 4.0.2 + resolution: "spdy@npm:4.0.2" + dependencies: + debug: ^4.1.0 + handle-thing: ^2.0.0 + http-deceiver: ^1.2.7 + select-hose: ^2.0.0 + spdy-transport: ^3.0.0 + checksum: 2c739d0ff6f56ad36d2d754d0261d5ec358457bea7cbf77b1b05b0c6464f2ce65b85f196305f50b7bd9120723eb94bae9933466f28e67e5cd8cde4e27f1d75f8 + languageName: node + linkType: hard + +"split-string@npm:^3.0.1, split-string@npm:^3.0.2": + version: 3.1.0 + resolution: "split-string@npm:3.1.0" + dependencies: + extend-shallow: ^3.0.0 + checksum: ae5af5c91bdc3633628821bde92fdf9492fa0e8a63cf6a0376ed6afde93c701422a1610916f59be61972717070119e848d10dfbbd5024b7729d6a71972d2a84c + languageName: node + linkType: hard + +"sshpk@npm:^1.7.0": + version: 1.16.1 + resolution: "sshpk@npm:1.16.1" + dependencies: + asn1: ~0.2.3 + assert-plus: ^1.0.0 + bcrypt-pbkdf: ^1.0.0 + dashdash: ^1.12.0 + ecc-jsbn: ~0.1.1 + getpass: ^0.1.1 + jsbn: ~0.1.0 + safer-buffer: ^2.0.2 + tweetnacl: ~0.14.0 + bin: + sshpk-conv: bin/sshpk-conv + sshpk-sign: bin/sshpk-sign + sshpk-verify: bin/sshpk-verify + checksum: 5e76afd1cedc780256f688b7c09327a8a650902d18e284dfeac97489a735299b03c3e72c6e8d22af03dbbe4d6f123fdfd5f3c4ed6bedbec72b9529a55051b857 + languageName: node + linkType: hard + +"ssri@npm:^8.0.0, ssri@npm:^8.0.1": + version: 8.0.1 + resolution: "ssri@npm:8.0.1" + dependencies: + minipass: ^3.1.1 + checksum: bc447f5af814fa9713aa201ec2522208ae0f4d8f3bda7a1f445a797c7b929a02720436ff7c478fb5edc4045adb02b1b88d2341b436a80798734e2494f1067b36 + languageName: node + linkType: hard + +"stable@npm:^0.1.8": + version: 0.1.8 + resolution: "stable@npm:0.1.8" + checksum: 2ff482bb100285d16dd75cd8f7c60ab652570e8952c0bfa91828a2b5f646a0ff533f14596ea4eabd48bb7f4aeea408dce8f8515812b975d958a4cc4fa6b9dfeb + languageName: node + linkType: hard + +"static-extend@npm:^0.1.1": + version: 0.1.2 + resolution: "static-extend@npm:0.1.2" + dependencies: + define-property: ^0.2.5 + object-copy: ^0.1.0 + checksum: 8657485b831f79e388a437260baf22784540417a9b29e11572c87735df24c22b84eda42107403a64b30861b2faf13df9f7fc5525d51f9d1d2303aba5cbf4e12c + languageName: node + linkType: hard + +"statuses@npm:>= 1.4.0 < 2, statuses@npm:>= 1.5.0 < 2, statuses@npm:~1.5.0": + version: 1.5.0 + resolution: "statuses@npm:1.5.0" + checksum: c469b9519de16a4bb19600205cffb39ee471a5f17b82589757ca7bd40a8d92ebb6ed9f98b5a540c5d302ccbc78f15dc03cc0280dd6e00df1335568a5d5758a5c + languageName: node + linkType: hard + +"streamroller@npm:^2.2.4": + version: 2.2.4 + resolution: "streamroller@npm:2.2.4" + dependencies: + date-format: ^2.1.0 + debug: ^4.1.1 + fs-extra: ^8.1.0 + checksum: 83060ded804747d2a9f202f142d24680a01f3bc5e36e9bd746b3e530252bbbf29a8030659f3c66e2dcd3d1ce403144bd302d9b4e51be0f9ed7d2f371a13d166b + languageName: node + linkType: hard + +"string-width@npm:^1.0.1": + version: 1.0.2 + resolution: "string-width@npm:1.0.2" + dependencies: + code-point-at: ^1.0.0 + is-fullwidth-code-point: ^1.0.0 + strip-ansi: ^3.0.0 + checksum: 5c79439e95bc3bd7233a332c5f5926ab2ee90b23816ed4faa380ce3b2576d7800b0a5bb15ae88ed28737acc7ea06a518c2eef39142dd727adad0e45c776cd37e + languageName: node + linkType: hard + +"string-width@npm:^1.0.2 || 2": + version: 2.1.1 + resolution: "string-width@npm:2.1.1" + dependencies: + is-fullwidth-code-point: ^2.0.0 + strip-ansi: ^4.0.0 + checksum: d6173abe088c615c8dffaf3861dc5d5906ed3dc2d6fd67ff2bd2e2b5dce7fd683c5240699cf0b1b8aa679a3b3bd6b28b5053c824cb89b813d7f6541d8f89064a + languageName: node + linkType: hard + +"string-width@npm:^3.0.0, string-width@npm:^3.1.0": + version: 3.1.0 + resolution: "string-width@npm:3.1.0" + dependencies: + emoji-regex: ^7.0.1 + is-fullwidth-code-point: ^2.0.0 + strip-ansi: ^5.1.0 + checksum: 57f7ca73d201682816d573dc68bd4bb8e1dff8dc9fcf10470fdfc3474135c97175fec12ea6a159e67339b41e86963112355b64529489af6e7e70f94a7caf08b2 + languageName: node + linkType: hard + +"string-width@npm:^4.1.0, string-width@npm:^4.2.0": + version: 4.2.2 + resolution: "string-width@npm:4.2.2" + dependencies: + emoji-regex: ^8.0.0 + is-fullwidth-code-point: ^3.0.0 + strip-ansi: ^6.0.0 + checksum: 343e089b0e66e0f72aab4ad1d9b6f2c9cc5255844b0c83fd9b53f2a3b3fd0421bdd6cb05be96a73117eb012db0887a6c1d64ca95aaa50c518e48980483fea0ab + languageName: node + linkType: hard + +"string_decoder@npm:^1.1.1": + version: 1.3.0 + resolution: "string_decoder@npm:1.3.0" + dependencies: + safe-buffer: ~5.2.0 + checksum: 8417646695a66e73aefc4420eb3b84cc9ffd89572861fe004e6aeb13c7bc00e2f616247505d2dbbef24247c372f70268f594af7126f43548565c68c117bdeb56 + languageName: node + linkType: hard + +"string_decoder@npm:~1.1.1": + version: 1.1.1 + resolution: "string_decoder@npm:1.1.1" + dependencies: + safe-buffer: ~5.1.0 + checksum: 9ab7e56f9d60a28f2be697419917c50cac19f3e8e6c28ef26ed5f4852289fe0de5d6997d29becf59028556f2c62983790c1d9ba1e2a3cc401768ca12d5183a5b + languageName: node + linkType: hard + +"strip-ansi@npm:^3.0.0, strip-ansi@npm:^3.0.1": + version: 3.0.1 + resolution: "strip-ansi@npm:3.0.1" + dependencies: + ansi-regex: ^2.0.0 + checksum: 9b974de611ce5075c70629c00fa98c46144043db92ae17748fb780f706f7a789e9989fd10597b7c2053ae8d1513fd707816a91f1879b2f71e6ac0b6a863db465 + languageName: node + linkType: hard + +"strip-ansi@npm:^4.0.0": + version: 4.0.0 + resolution: "strip-ansi@npm:4.0.0" + dependencies: + ansi-regex: ^3.0.0 + checksum: d9186e6c0cf78f25274f6750ee5e4a5725fb91b70fdd79aa5fe648eab092a0ec5b9621b22d69d4534a56319f75d8944efbd84e3afa8d4ad1b9a9491f12c84eca + languageName: node + linkType: hard + +"strip-ansi@npm:^5.0.0, strip-ansi@npm:^5.1.0, strip-ansi@npm:^5.2.0": + version: 5.2.0 + resolution: "strip-ansi@npm:5.2.0" + dependencies: + ansi-regex: ^4.1.0 + checksum: bdb5f76ade97062bd88e7723aa019adbfacdcba42223b19ccb528ffb9fb0b89a5be442c663c4a3fb25268eaa3f6ea19c7c3fbae830bd1562d55adccae1fcec46 + languageName: node + linkType: hard + +"strip-ansi@npm:^6.0.0": + version: 6.0.0 + resolution: "strip-ansi@npm:6.0.0" + dependencies: + ansi-regex: ^5.0.0 + checksum: 04c3239ede44c4d195b0e66c0ad58b932f08bec7d05290416d361ff908ad282ecdaf5d9731e322c84f151d427436bde01f05b7422c3ec26dd927586736b0e5d0 + languageName: node + linkType: hard + +"strip-bom@npm:^3.0.0": + version: 3.0.0 + resolution: "strip-bom@npm:3.0.0" + checksum: 8d50ff27b7ebe5ecc78f1fe1e00fcdff7af014e73cf724b46fb81ef889eeb1015fc5184b64e81a2efe002180f3ba431bdd77e300da5c6685d702780fbf0c8d5b + languageName: node + linkType: hard + +"strip-eof@npm:^1.0.0": + version: 1.0.0 + resolution: "strip-eof@npm:1.0.0" + checksum: 40bc8ddd7e072f8ba0c2d6d05267b4e0a4800898c3435b5fb5f5a21e6e47dfaff18467e7aa0d1844bb5d6274c3097246595841fbfeb317e541974ee992cac506 + languageName: node + linkType: hard + +"strip-final-newline@npm:^2.0.0": + version: 2.0.0 + resolution: "strip-final-newline@npm:2.0.0" + checksum: 69412b5e25731e1938184b5d489c32e340605bb611d6140344abc3421b7f3c6f9984b21dff296dfcf056681b82caa3bb4cc996a965ce37bcfad663e92eae9c64 + languageName: node + linkType: hard + +"style-loader@npm:3.2.1": + version: 3.2.1 + resolution: "style-loader@npm:3.2.1" + peerDependencies: + webpack: ^5.0.0 + checksum: 10e47c29f4fff7a95fd24cc905c61abba82910cf956730294e8823271b1c2777bd0a180248c2a5185fccf2555863c695b4be31f3b5a8ca2026aab31ee4cba809 + languageName: node + linkType: hard + +"stylehacks@npm:^5.0.1": + version: 5.0.1 + resolution: "stylehacks@npm:5.0.1" + dependencies: + browserslist: ^4.16.0 + postcss-selector-parser: ^6.0.4 + peerDependencies: + postcss: ^8.2.15 + checksum: 777dbed3987e04f713b9d74e08f66ab4c23c76cabb07c666c0ae9a06e58e8961063e17b5c7b9c23421b75e9caa9fb78084688e509624e57b19c92c174fbd964d + languageName: node + linkType: hard + +"stylus-loader@npm:6.1.0": + version: 6.1.0 + resolution: "stylus-loader@npm:6.1.0" + dependencies: + fast-glob: ^3.2.5 + klona: ^2.0.4 + normalize-path: ^3.0.0 + peerDependencies: + stylus: ">=0.52.4" + webpack: ^5.0.0 + checksum: ffe98fbcf6361ff55c2df1918dac51b5f8d0ff5f77a5ae746df4ec2925e4c403f30fb986da3359038e17aff6bea270f4e02220083f1ead2c250281cfaa1dab89 + languageName: node + linkType: hard + +"stylus@npm:0.54.8": + version: 0.54.8 + resolution: "stylus@npm:0.54.8" + dependencies: + css-parse: ~2.0.0 + debug: ~3.1.0 + glob: ^7.1.6 + mkdirp: ~1.0.4 + safer-buffer: ^2.1.2 + sax: ~1.2.4 + semver: ^6.3.0 + source-map: ^0.7.3 + bin: + stylus: bin/stylus + checksum: 5b8fe13af9da74f6ef6e9b9e977d93c1ad3113eba807c7cc91445c6a111bbbab4e43542f4356e1a32ae5ae774b549da66932a259fb533b73a421ff0085906111 + languageName: node + linkType: hard + +"supports-color@npm:^5.3.0": + version: 5.5.0 + resolution: "supports-color@npm:5.5.0" + dependencies: + has-flag: ^3.0.0 + checksum: 95f6f4ba5afdf92f495b5a912d4abee8dcba766ae719b975c56c084f5004845f6f5a5f7769f52d53f40e21952a6d87411bafe34af4a01e65f9926002e38e1dac + languageName: node + linkType: hard + +"supports-color@npm:^6.1.0": + version: 6.1.0 + resolution: "supports-color@npm:6.1.0" + dependencies: + has-flag: ^3.0.0 + checksum: 74358f9535c83ee113fbaac354b11e808060f6e7d8722082ee43af3578469134e89d00026dce2a6b93ce4e5b89d0e9a10f638b2b9f64c7838c2fb2883a47b3d5 + languageName: node + linkType: hard + +"supports-color@npm:^7.1.0": + version: 7.2.0 + resolution: "supports-color@npm:7.2.0" + dependencies: + has-flag: ^4.0.0 + checksum: 3dda818de06ebbe5b9653e07842d9479f3555ebc77e9a0280caf5a14fb877ffee9ed57007c3b78f5a6324b8dbeec648d9e97a24e2ed9fdb81ddc69ea07100f4a + languageName: node + linkType: hard + +"supports-color@npm:^8.0.0, supports-color@npm:^8.1.1": + version: 8.1.1 + resolution: "supports-color@npm:8.1.1" + dependencies: + has-flag: ^4.0.0 + checksum: c052193a7e43c6cdc741eb7f378df605636e01ad434badf7324f17fb60c69a880d8d8fcdcb562cf94c2350e57b937d7425ab5b8326c67c2adc48f7c87c1db406 + languageName: node + linkType: hard + +"svgo@npm:^2.3.0": + version: 2.5.0 + resolution: "svgo@npm:2.5.0" + dependencies: + "@trysound/sax": 0.1.1 + colorette: ^1.3.0 + commander: ^7.2.0 + css-select: ^4.1.3 + css-tree: ^1.1.3 + csso: ^4.2.0 + stable: ^0.1.8 + bin: + svgo: bin/svgo + checksum: 9a07a0e7fceef3a2ca9e3977f0b847749493701368397002ede973699d08afc19780a91fffcf161eacaadeeb082f4c67eb2d6bd1351def81165369e376f6834d + languageName: node + linkType: hard + +"symbol-observable@npm:4.0.0": + version: 4.0.0 + resolution: "symbol-observable@npm:4.0.0" + checksum: 212c7edce6186634d671336a88c0e0bbd626c2ab51ed57498dc90698cce541839a261b969c2a1e8dd43762133d47672e8b62e0b1ce9cf4157934ba45fd172ba8 + languageName: node + linkType: hard + +"tapable@npm:^2.1.1, tapable@npm:^2.2.0": + version: 2.2.0 + resolution: "tapable@npm:2.2.0" + checksum: 5a7e31ddd2400d524b68e7ba0373e492ba52b321b8e1eb15b65956e9c1b9ba90dd175210a1318b6752538cbe3b284f4a7218a714be942aeeb812623c243aea25 + languageName: node + linkType: hard + +"tar-fs@npm:2.0.0": + version: 2.0.0 + resolution: "tar-fs@npm:2.0.0" + dependencies: + chownr: ^1.1.1 + mkdirp: ^0.5.1 + pump: ^3.0.0 + tar-stream: ^2.0.0 + checksum: f15079cd7e5b38b7982d3a1c2f0cf0eac58e1c622f0191b12d90440a4e97ea0f63bf31467f6ad9cb5ffdd47d9fc251682f9456e36c6d5e2488f49f14a9d28a75 + languageName: node + linkType: hard + +"tar-stream@npm:^2.0.0": + version: 2.2.0 + resolution: "tar-stream@npm:2.2.0" + dependencies: + bl: ^4.0.3 + end-of-stream: ^1.4.1 + fs-constants: ^1.0.0 + inherits: ^2.0.3 + readable-stream: ^3.1.1 + checksum: 699831a8b97666ef50021c767f84924cfee21c142c2eb0e79c63254e140e6408d6d55a065a2992548e72b06de39237ef2b802b99e3ece93ca3904a37622a66f3 + languageName: node + linkType: hard + +"tar@npm:^6.0.2, tar@npm:^6.1.0, tar@npm:^6.1.2": + version: 6.1.11 + resolution: "tar@npm:6.1.11" + dependencies: + chownr: ^2.0.0 + fs-minipass: ^2.0.0 + minipass: ^3.0.0 + minizlib: ^2.1.1 + mkdirp: ^1.0.3 + yallist: ^4.0.0 + checksum: a04c07bb9e2d8f46776517d4618f2406fb977a74d914ad98b264fc3db0fe8224da5bec11e5f8902c5b9bcb8ace22d95fbe3c7b36b8593b7dfc8391a25898f32f + languageName: node + linkType: hard + +"terser-webpack-plugin@npm:5.1.4, terser-webpack-plugin@npm:^5.1.3": + version: 5.1.4 + resolution: "terser-webpack-plugin@npm:5.1.4" + dependencies: + jest-worker: ^27.0.2 + p-limit: ^3.1.0 + schema-utils: ^3.0.0 + serialize-javascript: ^6.0.0 + source-map: ^0.6.1 + terser: ^5.7.0 + peerDependencies: + webpack: ^5.1.0 + checksum: 7e5f97ac1944aaff12460201496314ab75d842f4f088e0344ca5143caf85a340d7b0294ed6b4e32b52bbd1bea71648d6417034e889872c582c1be4840e9bd0e7 + languageName: node + linkType: hard + +"terser@npm:5.7.1": + version: 5.7.1 + resolution: "terser@npm:5.7.1" + dependencies: + commander: ^2.20.0 + source-map: ~0.7.2 + source-map-support: ~0.5.19 + bin: + terser: bin/terser + checksum: 9354af5c22ade95004c103893606968cbd5390824c9d89df540f9e578c6e6559a5e9c56a1bf23ed055cdb61c60defdbc2c29e773514f9f2fbc7fd7ed335f1f58 + languageName: node + linkType: hard + +"terser@npm:^5.7.0": + version: 5.7.2 + resolution: "terser@npm:5.7.2" + dependencies: + commander: ^2.20.0 + source-map: ~0.7.2 + source-map-support: ~0.5.19 + bin: + terser: bin/terser + checksum: a929ab3f0e030e59a136557063833cc5054997bd56524682308421c14a3c8f4f37ff94f84c09da42bd1e5efb4512d0c6a1dc3bbcd2a130ed6bf39f81d20c2765 + languageName: node + linkType: hard + +"text-table@npm:0.2.0": + version: 0.2.0 + resolution: "text-table@npm:0.2.0" + checksum: b6937a38c80c7f84d9c11dd75e49d5c44f71d95e810a3250bd1f1797fc7117c57698204adf676b71497acc205d769d65c16ae8fa10afad832ae1322630aef10a + languageName: node + linkType: hard + +"throttleit@npm:^1.0.0": + version: 1.0.0 + resolution: "throttleit@npm:1.0.0" + checksum: 1b2db4d2454202d589e8236c07a69d2fab838876d370030ebea237c34c0a7d1d9cf11c29f994531ebb00efd31e9728291042b7754f2798a8352ec4463455b659 + languageName: node + linkType: hard + +"through@npm:^2.3.6, through@npm:^2.3.8": + version: 2.3.8 + resolution: "through@npm:2.3.8" + checksum: a38c3e059853c494af95d50c072b83f8b676a9ba2818dcc5b108ef252230735c54e0185437618596c790bbba8fcdaef5b290405981ffa09dce67b1f1bf190cbd + languageName: node + linkType: hard + +"thunky@npm:^1.0.2": + version: 1.1.0 + resolution: "thunky@npm:1.1.0" + checksum: 993096c472b6b8f30e29dc777a8d17720e4cab448375041f20c0cb802a09a7fb2217f2a3e8cdc11851faa71c957e2db309357367fc9d7af3cb7a4d00f4b66034 + languageName: node + linkType: hard + +"timsort@npm:^0.3.0": + version: 0.3.0 + resolution: "timsort@npm:0.3.0" + checksum: 1a66cb897dacabd7dd7c91b7e2301498ca9e224de2edb9e42d19f5b17c4b6dc62a8d4cbc64f28be82aaf1541cb5a78ab49aa818f42a2989ebe049a64af731e2a + languageName: node + linkType: hard + +"tmp@npm:^0.0.33": + version: 0.0.33 + resolution: "tmp@npm:0.0.33" + dependencies: + os-tmpdir: ~1.0.2 + checksum: 902d7aceb74453ea02abbf58c203f4a8fc1cead89b60b31e354f74ed5b3fb09ea817f94fb310f884a5d16987dd9fa5a735412a7c2dd088dd3d415aa819ae3a28 + languageName: node + linkType: hard + +"tmp@npm:^0.2.1, tmp@npm:~0.2.1": + version: 0.2.1 + resolution: "tmp@npm:0.2.1" + dependencies: + rimraf: ^3.0.0 + checksum: 8b1214654182575124498c87ca986ac53dc76ff36e8f0e0b67139a8d221eaecfdec108c0e6ec54d76f49f1f72ab9325500b246f562b926f85bcdfca8bf35df9e + languageName: node + linkType: hard + +"to-fast-properties@npm:^2.0.0": + version: 2.0.0 + resolution: "to-fast-properties@npm:2.0.0" + checksum: be2de62fe58ead94e3e592680052683b1ec986c72d589e7b21e5697f8744cdbf48c266fa72f6c15932894c10187b5f54573a3bcf7da0bfd964d5caf23d436168 + languageName: node + linkType: hard + +"to-object-path@npm:^0.3.0": + version: 0.3.0 + resolution: "to-object-path@npm:0.3.0" + dependencies: + kind-of: ^3.0.2 + checksum: 9425effee5b43e61d720940fa2b889623f77473d459c2ce3d4a580a4405df4403eec7be6b857455908070566352f9e2417304641ed158dda6f6a365fe3e66d70 + languageName: node + linkType: hard + +"to-regex-range@npm:^2.1.0": + version: 2.1.1 + resolution: "to-regex-range@npm:2.1.1" + dependencies: + is-number: ^3.0.0 + repeat-string: ^1.6.1 + checksum: 46093cc14be2da905cc931e442d280b2e544e2bfdb9a24b3cf821be8d342f804785e5736c108d5be026021a05d7b38144980a61917eee3c88de0a5e710e10320 + languageName: node + linkType: hard + +"to-regex-range@npm:^5.0.1": + version: 5.0.1 + resolution: "to-regex-range@npm:5.0.1" + dependencies: + is-number: ^7.0.0 + checksum: f76fa01b3d5be85db6a2a143e24df9f60dd047d151062d0ba3df62953f2f697b16fe5dad9b0ac6191c7efc7b1d9dcaa4b768174b7b29da89d4428e64bc0a20ed + languageName: node + linkType: hard + +"to-regex@npm:^3.0.1, to-regex@npm:^3.0.2": + version: 3.0.2 + resolution: "to-regex@npm:3.0.2" + dependencies: + define-property: ^2.0.2 + extend-shallow: ^3.0.2 + regex-not: ^1.0.2 + safe-regex: ^1.1.0 + checksum: 4ed4a619059b64e204aad84e4e5f3ea82d97410988bcece7cf6cbfdbf193d11bff48cf53842d88b8bb00b1bfc0d048f61f20f0709e6f393fd8fe0122662d9db4 + languageName: node + linkType: hard + +"toidentifier@npm:1.0.0": + version: 1.0.0 + resolution: "toidentifier@npm:1.0.0" + checksum: 199e6bfca1531d49b3506cff02353d53ec987c9ee10ee272ca6484ed97f1fc10fb77c6c009079ca16d5c5be4a10378178c3cacdb41ce9ec954c3297c74c6053e + languageName: node + linkType: hard + +"tough-cookie@npm:~2.5.0": + version: 2.5.0 + resolution: "tough-cookie@npm:2.5.0" + dependencies: + psl: ^1.1.28 + punycode: ^2.1.1 + checksum: 16a8cd090224dd176eee23837cbe7573ca0fa297d7e468ab5e1c02d49a4e9a97bb05fef11320605eac516f91d54c57838a25864e8680e27b069a5231d8264977 + languageName: node + linkType: hard + +"tree-kill@npm:1.2.2": + version: 1.2.2 + resolution: "tree-kill@npm:1.2.2" + bin: + tree-kill: cli.js + checksum: 49117f5f410d19c84b0464d29afb9642c863bc5ba40fcb9a245d474c6d5cc64d1b177a6e6713129eb346b40aebb9d4631d967517f9fbe8251c35b21b13cd96c7 + languageName: node + linkType: hard + +"ts-node@npm:^10.0.0": + version: 10.2.1 + resolution: "ts-node@npm:10.2.1" + dependencies: + "@cspotcode/source-map-support": 0.6.1 + "@tsconfig/node10": ^1.0.7 + "@tsconfig/node12": ^1.0.7 + "@tsconfig/node14": ^1.0.0 + "@tsconfig/node16": ^1.0.2 + acorn: ^8.4.1 + acorn-walk: ^8.1.1 + arg: ^4.1.0 + create-require: ^1.1.0 + diff: ^4.0.1 + make-error: ^1.1.1 + yn: 3.1.1 + peerDependencies: + "@swc/core": ">=1.2.50" + "@swc/wasm": ">=1.2.50" + "@types/node": "*" + typescript: ">=2.7" + peerDependenciesMeta: + "@swc/core": + optional: true + "@swc/wasm": + optional: true + bin: + ts-node: dist/bin.js + ts-node-cwd: dist/bin-cwd.js + ts-node-script: dist/bin-script.js + ts-node-transpile-only: dist/bin-transpile.js + ts-script: dist/bin-script-deprecated.js + checksum: f37d2827a583c51d012cdd3d9b96629fba7a5b5dfad2c26ca48c7c89f904118924689ca56f4b9b2136217194870a76f26aae06e3490ee613b0e960f02dc96bbe + languageName: node + linkType: hard + +"tsconfig-paths@npm:^3.9.0": + version: 3.11.0 + resolution: "tsconfig-paths@npm:3.11.0" + dependencies: + "@types/json5": ^0.0.29 + json5: ^1.0.1 + minimist: ^1.2.0 + strip-bom: ^3.0.0 + checksum: e14aaa6883f316d611db41cbb0fc8779b59c66b31d1e045565ad4540c77ccd3d2bb66f7c261b74ff535d3cc6b4a1ce21dc84774bf2a2a603ed6b0fb96f7e0cc7 + languageName: node + linkType: hard + +"tslib@npm:2.3.0": + version: 2.3.0 + resolution: "tslib@npm:2.3.0" + checksum: 8869694c26e4a7b56d449662fd54a4f9ba872c889d991202c74462bd99f10e61d5bd63199566c4284c0f742277736292a969642cc7b590f98727a7cae9529122 + languageName: node + linkType: hard + +"tslib@npm:^1.10.0, tslib@npm:^1.9.0": + version: 1.14.1 + resolution: "tslib@npm:1.14.1" + checksum: dbe628ef87f66691d5d2959b3e41b9ca0045c3ee3c7c7b906cc1e328b39f199bb1ad9e671c39025bd56122ac57dfbf7385a94843b1cc07c60a4db74795829acd + languageName: node + linkType: hard + +"tslib@npm:^2.0.0, tslib@npm:^2.1.0, tslib@npm:^2.2.0, tslib@npm:^2.3.0": + version: 2.3.1 + resolution: "tslib@npm:2.3.1" + checksum: de17a98d4614481f7fcb5cd53ffc1aaf8654313be0291e1bfaee4b4bb31a20494b7d218ff2e15017883e8ea9626599b3b0e0229c18383ba9dce89da2adf15cb9 + languageName: node + linkType: hard + +"tslib@npm:~2.1.0": + version: 2.1.0 + resolution: "tslib@npm:2.1.0" + checksum: aa189c8179de0427b0906da30926fd53c59d96ec239dff87d6e6bc831f608df0cbd6f77c61dabc074408bd0aa0b9ae4ec35cb2c15f729e32f37274db5730cb78 + languageName: node + linkType: hard + +"tunnel-agent@npm:^0.6.0": + version: 0.6.0 + resolution: "tunnel-agent@npm:0.6.0" + dependencies: + safe-buffer: ^5.0.1 + checksum: 05f6510358f8afc62a057b8b692f05d70c1782b70db86d6a1e0d5e28a32389e52fa6e7707b6c5ecccacc031462e4bc35af85ecfe4bbc341767917b7cf6965711 + languageName: node + linkType: hard + +"tweetnacl@npm:^0.14.3, tweetnacl@npm:~0.14.0": + version: 0.14.5 + resolution: "tweetnacl@npm:0.14.5" + checksum: 6061daba1724f59473d99a7bb82e13f211cdf6e31315510ae9656fefd4779851cb927adad90f3b488c8ed77c106adc0421ea8055f6f976ff21b27c5c4e918487 + languageName: node + linkType: hard + +"type-fest@npm:^0.21.3": + version: 0.21.3 + resolution: "type-fest@npm:0.21.3" + checksum: e6b32a3b3877f04339bae01c193b273c62ba7bfc9e325b8703c4ee1b32dc8fe4ef5dfa54bf78265e069f7667d058e360ae0f37be5af9f153b22382cd55a9afe0 + languageName: node + linkType: hard + +"type-is@npm:~1.6.17, type-is@npm:~1.6.18": + version: 1.6.18 + resolution: "type-is@npm:1.6.18" + dependencies: + media-typer: 0.3.0 + mime-types: ~2.1.24 + checksum: 2c8e47675d55f8b4e404bcf529abdf5036c537a04c2b20177bcf78c9e3c1da69da3942b1346e6edb09e823228c0ee656ef0e033765ec39a70d496ef601a0c657 + languageName: node + linkType: hard + +"typescript@npm:4.3.5, typescript@npm:~4.3.5": + version: 4.3.5 + resolution: "typescript@npm:4.3.5" + bin: + tsc: bin/tsc + tsserver: bin/tsserver + checksum: bab033b5e2b0790dd35b77fd005df976ef80b8d84fd2c6e63cc31808151875beae9216e5a315fe7068e8499905c3c354248fe83272cdfc13b7705635f0c66c97 + languageName: node + linkType: hard + +"typescript@patch:typescript@4.3.5#~builtin, typescript@patch:typescript@~4.3.5#~builtin": + version: 4.3.5 + resolution: "typescript@patch:typescript@npm%3A4.3.5#~builtin::version=4.3.5&hash=ddd1e8" + bin: + tsc: bin/tsc + tsserver: bin/tsserver + checksum: 61fc1a2ca5037420de5bbe17c6ddc4cbcc0d52301ed94f0a7b5821c55ff9eb96307f0816f745ca8f0fc87ed92f3951cde6d97cd6fd6bc6920c02ea63b5b26259 + languageName: node + linkType: hard + +"ua-parser-js@npm:^0.7.28": + version: 0.7.28 + resolution: "ua-parser-js@npm:0.7.28" + checksum: a7da4ad54527211e878ee016c2ef64efad5c2f5a31277d36c9da93b4c89ecaa64f391ad4cf158ada76a9ad8e53004a950705ff1c2f27a52ca8bfb3f1381c39ff + languageName: node + linkType: hard + +"unbzip2-stream@npm:1.3.3": + version: 1.3.3 + resolution: "unbzip2-stream@npm:1.3.3" + dependencies: + buffer: ^5.2.1 + through: ^2.3.8 + checksum: 5ae179e60971023c1ee2be2d3f02dd81e4dae8c506fe2367f63a2c126073c2f08c101005d328c34b13cb1d691627e4c6c528d1e273ea3a3dda15d906bac66391 + languageName: node + linkType: hard + +"unicode-canonical-property-names-ecmascript@npm:^1.0.4": + version: 1.0.4 + resolution: "unicode-canonical-property-names-ecmascript@npm:1.0.4" + checksum: cc1973b18d0e1a151711e5551f87f4b3086c4f542cd5142aa691307d5720fd725fa7d36c24e12e944e108b91c72554237b0c236772d35592839434da5506c40f + languageName: node + linkType: hard + +"unicode-match-property-ecmascript@npm:^1.0.4": + version: 1.0.4 + resolution: "unicode-match-property-ecmascript@npm:1.0.4" + dependencies: + unicode-canonical-property-names-ecmascript: ^1.0.4 + unicode-property-aliases-ecmascript: ^1.0.4 + checksum: 08e269fac71b5ace0f8331df9e87b9b533fe97b00c43ea58de69ae81816581490f846050e0c472279a3e7434524feba99915a93816f90dbbc0a30bcbd082da88 + languageName: node + linkType: hard + +"unicode-match-property-value-ecmascript@npm:^1.2.0": + version: 1.2.0 + resolution: "unicode-match-property-value-ecmascript@npm:1.2.0" + checksum: 2e663cfec8e2cf317b69613566314979f717034ea8f58a237dd63234795044a87337410064fe839774d71e1d7e12195520e9edd69ed8e28f2a9eb28a2db38595 + languageName: node + linkType: hard + +"unicode-property-aliases-ecmascript@npm:^1.0.4": + version: 1.1.0 + resolution: "unicode-property-aliases-ecmascript@npm:1.1.0" + checksum: 1a96dc462d251bb1c5237f7bc77956b29f01cefce7f3e7448430742930961557c3d1515a9669715ebb06209bf01072e2f78ba1627247017daa84346414bc02f1 + languageName: node + linkType: hard + +"union-value@npm:^1.0.0": + version: 1.0.1 + resolution: "union-value@npm:1.0.1" + dependencies: + arr-union: ^3.1.0 + get-value: ^2.0.6 + is-extendable: ^0.1.1 + set-value: ^2.0.1 + checksum: a3464097d3f27f6aa90cf103ed9387541bccfc006517559381a10e0dffa62f465a9d9a09c9b9c3d26d0f4cbe61d4d010e2fbd710fd4bf1267a768ba8a774b0ba + languageName: node + linkType: hard + +"uniq@npm:^1.0.1": + version: 1.0.1 + resolution: "uniq@npm:1.0.1" + checksum: 8206535f83745ea83f9da7035f3b983fd6ed5e35b8ed7745441944e4065b616bc67cf0d0a23a86b40ee0074426f0607f0a138f9b78e124eb6a7a6a6966055709 + languageName: node + linkType: hard + +"uniqs@npm:^2.0.0": + version: 2.0.0 + resolution: "uniqs@npm:2.0.0" + checksum: 5ace63e0521fd1ae2c161b3fa167cf6846fc45a71c00496729e0146402c3ae467c6f025a68fbd6766300a9bfbac9f240f2f0198164283bef48012b39db83f81f + languageName: node + linkType: hard + +"unique-filename@npm:^1.1.1": + version: 1.1.1 + resolution: "unique-filename@npm:1.1.1" + dependencies: + unique-slug: ^2.0.0 + checksum: cf4998c9228cc7647ba7814e255dec51be43673903897b1786eff2ac2d670f54d4d733357eb08dea969aa5e6875d0e1bd391d668fbdb5a179744e7c7551a6f80 + languageName: node + linkType: hard + +"unique-slug@npm:^2.0.0": + version: 2.0.2 + resolution: "unique-slug@npm:2.0.2" + dependencies: + imurmurhash: ^0.1.4 + checksum: 5b6876a645da08d505dedb970d1571f6cebdf87044cb6b740c8dbb24f0d6e1dc8bdbf46825fd09f994d7cf50760e6f6e063cfa197d51c5902c00a861702eb75a + languageName: node + linkType: hard + +"universalify@npm:^0.1.0": + version: 0.1.2 + resolution: "universalify@npm:0.1.2" + checksum: 40cdc60f6e61070fe658ca36016a8f4ec216b29bf04a55dce14e3710cc84c7448538ef4dad3728d0bfe29975ccd7bfb5f414c45e7b78883567fb31b246f02dff + languageName: node + linkType: hard + +"universalify@npm:^2.0.0": + version: 2.0.0 + resolution: "universalify@npm:2.0.0" + checksum: 2406a4edf4a8830aa6813278bab1f953a8e40f2f63a37873ffa9a3bc8f9745d06cc8e88f3572cb899b7e509013f7f6fcc3e37e8a6d914167a5381d8440518c44 + languageName: node + linkType: hard + +"unpipe@npm:1.0.0, unpipe@npm:~1.0.0": + version: 1.0.0 + resolution: "unpipe@npm:1.0.0" + checksum: 4fa18d8d8d977c55cb09715385c203197105e10a6d220087ec819f50cb68870f02942244f1017565484237f1f8c5d3cd413631b1ae104d3096f24fdfde1b4aa2 + languageName: node + linkType: hard + +"unset-value@npm:^1.0.0": + version: 1.0.0 + resolution: "unset-value@npm:1.0.0" + dependencies: + has-value: ^0.3.1 + isobject: ^3.0.0 + checksum: 5990ecf660672be2781fc9fb322543c4aa592b68ed9a3312fa4df0e9ba709d42e823af090fc8f95775b4cd2c9a5169f7388f0cec39238b6d0d55a69fc2ab6b29 + languageName: node + linkType: hard + +"untildify@npm:^4.0.0": + version: 4.0.0 + resolution: "untildify@npm:4.0.0" + checksum: 39ced9c418a74f73f0a56e1ba4634b4d959422dff61f4c72a8e39f60b99380c1b45ed776fbaa0a4101b157e4310d873ad7d114e8534ca02609b4916bb4187fb9 + languageName: node + linkType: hard + +"upath@npm:^1.1.1": + version: 1.2.0 + resolution: "upath@npm:1.2.0" + checksum: 4c05c094797cb733193a0784774dbea5b1889d502fc9f0572164177e185e4a59ba7099bf0b0adf945b232e2ac60363f9bf18aac9b2206fb99cbef971a8455445 + languageName: node + linkType: hard + +"uri-js@npm:^4.2.2": + version: 4.4.1 + resolution: "uri-js@npm:4.4.1" + dependencies: + punycode: ^2.1.0 + checksum: 7167432de6817fe8e9e0c9684f1d2de2bb688c94388f7569f7dbdb1587c9f4ca2a77962f134ec90be0cc4d004c939ff0d05acc9f34a0db39a3c797dada262633 + languageName: node + linkType: hard + +"urix@npm:^0.1.0": + version: 0.1.0 + resolution: "urix@npm:0.1.0" + checksum: 4c076ecfbf3411e888547fe844e52378ab5ada2d2f27625139011eada79925e77f7fbf0e4016d45e6a9e9adb6b7e64981bd49b22700c7c401c5fc15f423303b3 + languageName: node + linkType: hard + +"url-parse@npm:^1.4.3, url-parse@npm:^1.5.3": + version: 1.5.3 + resolution: "url-parse@npm:1.5.3" + dependencies: + querystringify: ^2.1.1 + requires-port: ^1.0.0 + checksum: c6b32fff835e43f3b1b4150239f459744f0ab1a908841dbfecbfc79bf67f4d6c8d9af1841d0c6d814d45bfa08525cc29312a0bef31db7aa894306b3db07e4ee0 + languageName: node + linkType: hard + +"url@npm:^0.11.0": + version: 0.11.0 + resolution: "url@npm:0.11.0" + dependencies: + punycode: 1.3.2 + querystring: 0.2.0 + checksum: 50d100d3dd2d98b9fe3ada48cadb0b08aa6be6d3ac64112b867b56b19be4bfcba03c2a9a0d7922bfd7ac17d4834e88537749fe182430dfd9b68e520175900d90 + languageName: node + linkType: hard + +"use@npm:^3.1.0": + version: 3.1.1 + resolution: "use@npm:3.1.1" + checksum: 08a130289f5238fcbf8f59a18951286a6e660d17acccc9d58d9b69dfa0ee19aa038e8f95721b00b432c36d1629a9e32a464bf2e7e0ae6a244c42ddb30bdd8b33 + languageName: node + linkType: hard + +"util-deprecate@npm:^1.0.1, util-deprecate@npm:^1.0.2, util-deprecate@npm:~1.0.1": + version: 1.0.2 + resolution: "util-deprecate@npm:1.0.2" + checksum: 474acf1146cb2701fe3b074892217553dfcf9a031280919ba1b8d651a068c9b15d863b7303cb15bd00a862b498e6cf4ad7b4a08fb134edd5a6f7641681cb54a2 + languageName: node + linkType: hard + +"utils-merge@npm:1.0.1": + version: 1.0.1 + resolution: "utils-merge@npm:1.0.1" + checksum: c81095493225ecfc28add49c106ca4f09cdf56bc66731aa8dabc2edbbccb1e1bfe2de6a115e5c6a380d3ea166d1636410b62ef216bb07b3feb1cfde1d95d5080 + languageName: node + linkType: hard + +"uuid@npm:8.3.2, uuid@npm:^8.3.0, uuid@npm:^8.3.2": + version: 8.3.2 + resolution: "uuid@npm:8.3.2" + bin: + uuid: dist/bin/uuid + checksum: 5575a8a75c13120e2f10e6ddc801b2c7ed7d8f3c8ac22c7ed0c7b2ba6383ec0abda88c905085d630e251719e0777045ae3236f04c812184b7c765f63a70e58df + languageName: node + linkType: hard + +"uuid@npm:^3.3.2, uuid@npm:^3.4.0": + version: 3.4.0 + resolution: "uuid@npm:3.4.0" + bin: + uuid: ./bin/uuid + checksum: 58de2feed61c59060b40f8203c0e4ed7fd6f99d42534a499f1741218a1dd0c129f4aa1de797bcf822c8ea5da7e4137aa3673431a96dae729047f7aca7b27866f + languageName: node + linkType: hard + +"validate-npm-package-name@npm:^3.0.0": + version: 3.0.0 + resolution: "validate-npm-package-name@npm:3.0.0" + dependencies: + builtins: ^1.0.3 + checksum: ce4c68207abfb22c05eedb09ff97adbcedc80304a235a0844f5344f1fd5086aa80e4dbec5684d6094e26e35065277b765c1caef68bcea66b9056761eddb22967 + languageName: node + linkType: hard + +"vary@npm:^1, vary@npm:~1.1.2": + version: 1.1.2 + resolution: "vary@npm:1.1.2" + checksum: ae0123222c6df65b437669d63dfa8c36cee20a504101b2fcd97b8bf76f91259c17f9f2b4d70a1e3c6bbcee7f51b28392833adb6b2770b23b01abec84e369660b + languageName: node + linkType: hard + +"vendors@npm:^1.0.3": + version: 1.0.4 + resolution: "vendors@npm:1.0.4" + checksum: 4b16e0bc18dbdd7ac8dd745c776c08f6c73e9a7f620ffd9faf94a3d86a35feaf4c6cb1bbdb304d2381548a30d0abe69b83eeb1b7b1bf5bb33935e64b28812681 + languageName: node + linkType: hard + +"verror@npm:1.10.0": + version: 1.10.0 + resolution: "verror@npm:1.10.0" + dependencies: + assert-plus: ^1.0.0 + core-util-is: 1.0.2 + extsprintf: ^1.2.0 + checksum: c431df0bedf2088b227a4e051e0ff4ca54df2c114096b0c01e1cbaadb021c30a04d7dd5b41ab277bcd51246ca135bf931d4c4c796ecae7a4fef6d744ecef36ea + languageName: node + linkType: hard + +"void-elements@npm:^2.0.0": + version: 2.0.1 + resolution: "void-elements@npm:2.0.1" + checksum: 700c07ba9cfa2dff88bb23974b3173118f9ad8107143db9e5d753552be15cf93380954d4e7f7d7bc80e7306c35c3a7fb83ab0ce4d4dcc18abf90ca8b31452126 + languageName: node + linkType: hard + +"wait-port@npm:^0.2.9": + version: 0.2.9 + resolution: "wait-port@npm:0.2.9" + dependencies: + chalk: ^2.4.2 + commander: ^3.0.2 + debug: ^4.1.1 + bin: + wait-port: bin/wait-port.js + checksum: 62ad348234b4a7398f600e409a6b549b641319cb6d00b04b6a762041763634f453c3788ef10d3fcbd59cb466d49ce0917702fe0de331b7625ed4f18c158be664 + languageName: node + linkType: hard + +"watchpack@npm:^2.2.0": + version: 2.2.0 + resolution: "watchpack@npm:2.2.0" + dependencies: + glob-to-regexp: ^0.4.1 + graceful-fs: ^4.1.2 + checksum: e275f48fae29edee3195c51a8312b609581b9be5ce323d3102ffd082cb124f48d7a393ce05e4110239e4354379e04d78a97ceb26ae367746e7e218bf258135c8 + languageName: node + linkType: hard + +"wbuf@npm:^1.1.0, wbuf@npm:^1.7.3": + version: 1.7.3 + resolution: "wbuf@npm:1.7.3" + dependencies: + minimalistic-assert: ^1.0.0 + checksum: 2abc306c96930b757972a1c4650eb6b25b5d99f24088714957f88629e137db569368c5de0e57986c89ea70db2f1df9bba11a87cb6d0c8694b6f53a0159fab3bf + languageName: node + linkType: hard + +"wcwidth@npm:^1.0.1": + version: 1.0.1 + resolution: "wcwidth@npm:1.0.1" + dependencies: + defaults: ^1.0.3 + checksum: 814e9d1ddcc9798f7377ffa448a5a3892232b9275ebb30a41b529607691c0491de47cba426e917a4d08ded3ee7e9ba2f3fe32e62ee3cd9c7d3bafb7754bd553c + languageName: node + linkType: hard + +"webpack-dev-middleware@npm:5.0.0": + version: 5.0.0 + resolution: "webpack-dev-middleware@npm:5.0.0" + dependencies: + colorette: ^1.2.2 + mem: ^8.1.1 + memfs: ^3.2.2 + mime-types: ^2.1.31 + range-parser: ^1.2.1 + schema-utils: ^3.0.0 + peerDependencies: + webpack: ^4.0.0 || ^5.0.0 + checksum: e5bf56a299da509d5810564790b481e599768265399777897dbbd555c6f4dfdab87f1b162e30f3dd4628a6c08097315272d1f1faa6bbb8abe82bd3ce999e261f + languageName: node + linkType: hard + +"webpack-dev-middleware@npm:^3.7.2": + version: 3.7.3 + resolution: "webpack-dev-middleware@npm:3.7.3" + dependencies: + memory-fs: ^0.4.1 + mime: ^2.4.4 + mkdirp: ^0.5.1 + range-parser: ^1.2.1 + webpack-log: ^2.0.0 + peerDependencies: + webpack: ^4.0.0 || ^5.0.0 + checksum: faa3cdd7b82d23c35b8f45903556eadd92b0795c76f3e08e234d53f7bab3de13331096a71968e7e9905770ae5de7a4f75ddf09f66d1e0bbabfecbb30db0f71e3 + languageName: node + linkType: hard + +"webpack-dev-server@npm:3.11.2": + version: 3.11.2 + resolution: "webpack-dev-server@npm:3.11.2" + dependencies: + ansi-html: 0.0.7 + bonjour: ^3.5.0 + chokidar: ^2.1.8 + compression: ^1.7.4 + connect-history-api-fallback: ^1.6.0 + debug: ^4.1.1 + del: ^4.1.1 + express: ^4.17.1 + html-entities: ^1.3.1 + http-proxy-middleware: 0.19.1 + import-local: ^2.0.0 + internal-ip: ^4.3.0 + ip: ^1.1.5 + is-absolute-url: ^3.0.3 + killable: ^1.0.1 + loglevel: ^1.6.8 + opn: ^5.5.0 + p-retry: ^3.0.1 + portfinder: ^1.0.26 + schema-utils: ^1.0.0 + selfsigned: ^1.10.8 + semver: ^6.3.0 + serve-index: ^1.9.1 + sockjs: ^0.3.21 + sockjs-client: ^1.5.0 + spdy: ^4.0.2 + strip-ansi: ^3.0.1 + supports-color: ^6.1.0 + url: ^0.11.0 + webpack-dev-middleware: ^3.7.2 + webpack-log: ^2.0.0 + ws: ^6.2.1 + yargs: ^13.3.2 + peerDependencies: + webpack: ^4.0.0 || ^5.0.0 + peerDependenciesMeta: + webpack-cli: + optional: true + bin: + webpack-dev-server: bin/webpack-dev-server.js + checksum: d2bfa2e9a33f96dc5af8f771e9978956e59c3efcad3deaca246ea7ff219c5587ebcf20ea0f0b6af251dec5e8111c0e473aa43a57bc9a88fb3ad8573f4a321805 + languageName: node + linkType: hard + +"webpack-log@npm:^2.0.0": + version: 2.0.0 + resolution: "webpack-log@npm:2.0.0" + dependencies: + ansi-colors: ^3.0.0 + uuid: ^3.3.2 + checksum: 4757179310995e20633ec2d77a8c1ac11e4135c84745f57148692f8195f1c0f8ec122c77d0dc16fc484b7d301df6674f36c9fc6b1ff06b5cf142abaaf5d24f4f + languageName: node + linkType: hard + +"webpack-merge@npm:5.8.0, webpack-merge@npm:^5.7.3": + version: 5.8.0 + resolution: "webpack-merge@npm:5.8.0" + dependencies: + clone-deep: ^4.0.1 + wildcard: ^2.0.0 + checksum: 88786ab91013f1bd2a683834ff381be81c245a4b0f63304a5103e90f6653f44dab496a0768287f8531761f8ad957d1f9f3ccb2cb55df0de1bd9ee343e079da26 + languageName: node + linkType: hard + +"webpack-sources@npm:^1.2.0, webpack-sources@npm:^1.3.0": + version: 1.4.3 + resolution: "webpack-sources@npm:1.4.3" + dependencies: + source-list-map: ^2.0.0 + source-map: ~0.6.1 + checksum: 37463dad8d08114930f4bc4882a9602941f07c9f0efa9b6bc78738cd936275b990a596d801ef450d022bb005b109b9f451dd087db2f3c9baf53e8e22cf388f79 + languageName: node + linkType: hard + +"webpack-sources@npm:^3.2.0": + version: 3.2.0 + resolution: "webpack-sources@npm:3.2.0" + checksum: 8f1d686bd6aab2eda330579a07e14803cb2e01415f5a603697402aea3c36e98c1d2731167c3e97e50170cf1b0214cf8ef945fc639b100d1e3b67c023feb35716 + languageName: node + linkType: hard + +"webpack-subresource-integrity@npm:1.5.2": + version: 1.5.2 + resolution: "webpack-subresource-integrity@npm:1.5.2" + dependencies: + webpack-sources: ^1.3.0 + peerDependencies: + html-webpack-plugin: ">= 2.21.0 < 5" + webpack: ">= 1.12.11 < 6" + peerDependenciesMeta: + html-webpack-plugin: + optional: true + checksum: ddb4dca747349da462c0828a2e4d7d08f58fee365733a2edf682c5cfe13497524fc2a40080522b3f67bdef547aca0acc0a125ae81535103119c8ae297c0b4b17 + languageName: node + linkType: hard + +"webpack@npm:5.50.0": + version: 5.50.0 + resolution: "webpack@npm:5.50.0" + dependencies: + "@types/eslint-scope": ^3.7.0 + "@types/estree": ^0.0.50 + "@webassemblyjs/ast": 1.11.1 + "@webassemblyjs/wasm-edit": 1.11.1 + "@webassemblyjs/wasm-parser": 1.11.1 + acorn: ^8.4.1 + acorn-import-assertions: ^1.7.6 + browserslist: ^4.14.5 + chrome-trace-event: ^1.0.2 + enhanced-resolve: ^5.8.0 + es-module-lexer: ^0.7.1 + eslint-scope: 5.1.1 + events: ^3.2.0 + glob-to-regexp: ^0.4.1 + graceful-fs: ^4.2.4 + json-parse-better-errors: ^1.0.2 + loader-runner: ^4.2.0 + mime-types: ^2.1.27 + neo-async: ^2.6.2 + schema-utils: ^3.1.0 + tapable: ^2.1.1 + terser-webpack-plugin: ^5.1.3 + watchpack: ^2.2.0 + webpack-sources: ^3.2.0 + peerDependenciesMeta: + webpack-cli: + optional: true + bin: + webpack: bin/webpack.js + checksum: 293bed1d9101ac127605f35a225a5cbc1bc89eac68d6e09e7feb3e284ec2693b3db7c1dd7710fadf6852f89ad39ed09413c35befa1cfc9738074b33299ac2b9e + languageName: node + linkType: hard + +"webpack@npm:^5.0.0": + version: 5.61.0 + resolution: "webpack@npm:5.61.0" + dependencies: + "@types/eslint-scope": ^3.7.0 + "@types/estree": ^0.0.50 + "@webassemblyjs/ast": 1.11.1 + "@webassemblyjs/wasm-edit": 1.11.1 + "@webassemblyjs/wasm-parser": 1.11.1 + acorn: ^8.4.1 + acorn-import-assertions: ^1.7.6 + browserslist: ^4.14.5 + chrome-trace-event: ^1.0.2 + enhanced-resolve: ^5.8.3 + es-module-lexer: ^0.9.0 + eslint-scope: 5.1.1 + events: ^3.2.0 + glob-to-regexp: ^0.4.1 + graceful-fs: ^4.2.4 + json-parse-better-errors: ^1.0.2 + loader-runner: ^4.2.0 + mime-types: ^2.1.27 + neo-async: ^2.6.2 + schema-utils: ^3.1.0 + tapable: ^2.1.1 + terser-webpack-plugin: ^5.1.3 + watchpack: ^2.2.0 + webpack-sources: ^3.2.0 + peerDependenciesMeta: + webpack-cli: + optional: true + bin: + webpack: bin/webpack.js + checksum: 442958ec48645c9e612a2628a815c411cbc18289b5cc7b3d1b5d0f8e5b41606ed225decf4f3684edc365e6390867bded244d20387c70fbb630c0ac08443c34c8 + languageName: node + linkType: hard + +"websocket-driver@npm:>=0.5.1, websocket-driver@npm:^0.7.4": + version: 0.7.4 + resolution: "websocket-driver@npm:0.7.4" + dependencies: + http-parser-js: ">=0.5.1" + safe-buffer: ">=5.1.0" + websocket-extensions: ">=0.1.1" + checksum: fffe5a33fe8eceafd21d2a065661d09e38b93877eae1de6ab5d7d2734c6ed243973beae10ae48c6613cfd675f200e5a058d1e3531bc9e6c5d4f1396ff1f0bfb9 + languageName: node + linkType: hard + +"websocket-extensions@npm:>=0.1.1": + version: 0.1.4 + resolution: "websocket-extensions@npm:0.1.4" + checksum: 5976835e68a86afcd64c7a9762ed85f2f27d48c488c707e67ba85e717b90fa066b98ab33c744d64255c9622d349eedecf728e65a5f921da71b58d0e9591b9038 + languageName: node + linkType: hard + +"which-module@npm:^2.0.0": + version: 2.0.0 + resolution: "which-module@npm:2.0.0" + checksum: 809f7fd3dfcb2cdbe0180b60d68100c88785084f8f9492b0998c051d7a8efe56784492609d3f09ac161635b78ea29219eb1418a98c15ce87d085bce905705c9c + languageName: node + linkType: hard + +"which@npm:^1.2.1, which@npm:^1.2.9": + version: 1.3.1 + resolution: "which@npm:1.3.1" + dependencies: + isexe: ^2.0.0 + bin: + which: ./bin/which + checksum: f2e185c6242244b8426c9df1510e86629192d93c1a986a7d2a591f2c24869e7ffd03d6dac07ca863b2e4c06f59a4cc9916c585b72ee9fa1aa609d0124df15e04 + languageName: node + linkType: hard + +"which@npm:^2.0.1, which@npm:^2.0.2": + version: 2.0.2 + resolution: "which@npm:2.0.2" + dependencies: + isexe: ^2.0.0 + bin: + node-which: ./bin/node-which + checksum: 1a5c563d3c1b52d5f893c8b61afe11abc3bab4afac492e8da5bde69d550de701cf9806235f20a47b5c8fa8a1d6a9135841de2596535e998027a54589000e66d1 + languageName: node + linkType: hard + +"wide-align@npm:^1.1.0": + version: 1.1.3 + resolution: "wide-align@npm:1.1.3" + dependencies: + string-width: ^1.0.2 || 2 + checksum: d09c8012652a9e6cab3e82338d1874a4d7db2ad1bd19ab43eb744acf0b9b5632ec406bdbbbb970a8f4771a7d5ef49824d038ba70aa884e7723f5b090ab87134d + languageName: node + linkType: hard + +"wildcard@npm:^2.0.0": + version: 2.0.0 + resolution: "wildcard@npm:2.0.0" + checksum: 1f4fe4c03dfc492777c60f795bbba597ac78794f1b650d68f398fbee9adb765367c516ebd4220889b6a81e9626e7228bbe0d66237abb311573c2ee1f4902a5ad + languageName: node + linkType: hard + +"wrap-ansi@npm:^5.1.0": + version: 5.1.0 + resolution: "wrap-ansi@npm:5.1.0" + dependencies: + ansi-styles: ^3.2.0 + string-width: ^3.0.0 + strip-ansi: ^5.0.0 + checksum: 9b48c862220e541eb0daa22661b38b947973fc57054e91be5b0f2dcc77741a6875ccab4ebe970a394b4682c8dfc17e888266a105fb8b0a9b23c19245e781ceae + languageName: node + linkType: hard + +"wrap-ansi@npm:^6.2.0": + version: 6.2.0 + resolution: "wrap-ansi@npm:6.2.0" + dependencies: + ansi-styles: ^4.0.0 + string-width: ^4.1.0 + strip-ansi: ^6.0.0 + checksum: 6cd96a410161ff617b63581a08376f0cb9162375adeb7956e10c8cd397821f7eb2a6de24eb22a0b28401300bf228c86e50617cd568209b5f6775b93c97d2fe3a + languageName: node + linkType: hard + +"wrap-ansi@npm:^7.0.0": + version: 7.0.0 + resolution: "wrap-ansi@npm:7.0.0" + dependencies: + ansi-styles: ^4.0.0 + string-width: ^4.1.0 + strip-ansi: ^6.0.0 + checksum: a790b846fd4505de962ba728a21aaeda189b8ee1c7568ca5e817d85930e06ef8d1689d49dbf0e881e8ef84436af3a88bc49115c2e2788d841ff1b8b5b51a608b + languageName: node + linkType: hard + +"wrappy@npm:1": + version: 1.0.2 + resolution: "wrappy@npm:1.0.2" + checksum: 159da4805f7e84a3d003d8841557196034155008f817172d4e986bd591f74aa82aa7db55929a54222309e01079a65a92a9e6414da5a6aa4b01ee44a511ac3ee5 + languageName: node + linkType: hard + +"ws@npm:7.4.6, ws@npm:~7.4.2": + version: 7.4.6 + resolution: "ws@npm:7.4.6" + peerDependencies: + bufferutil: ^4.0.1 + utf-8-validate: ^5.0.2 + peerDependenciesMeta: + bufferutil: + optional: true + utf-8-validate: + optional: true + checksum: 3a990b32ed08c72070d5e8913e14dfcd831919205be52a3ff0b4cdd998c8d554f167c9df3841605cde8b11d607768cacab3e823c58c96a5c08c987e093eb767a + languageName: node + linkType: hard + +"ws@npm:^6.2.1": + version: 6.2.2 + resolution: "ws@npm:6.2.2" + dependencies: + async-limiter: ~1.0.0 + checksum: aec3154ec51477c094ac2cb5946a156e17561a581fa27005cbf22c53ac57f8d4e5f791dd4bbba6a488602cb28778c8ab7df06251d590507c3c550fd8ebeee949 + languageName: node + linkType: hard + +"y18n@npm:^4.0.0": + version: 4.0.3 + resolution: "y18n@npm:4.0.3" + checksum: 014dfcd9b5f4105c3bb397c1c8c6429a9df004aa560964fb36732bfb999bfe83d45ae40aeda5b55d21b1ee53d8291580a32a756a443e064317953f08025b1aa4 + languageName: node + linkType: hard + +"y18n@npm:^5.0.5": + version: 5.0.8 + resolution: "y18n@npm:5.0.8" + checksum: 54f0fb95621ee60898a38c572c515659e51cc9d9f787fb109cef6fde4befbe1c4602dc999d30110feee37456ad0f1660fa2edcfde6a9a740f86a290999550d30 + languageName: node + linkType: hard + +"yallist@npm:^4.0.0": + version: 4.0.0 + resolution: "yallist@npm:4.0.0" + checksum: 343617202af32df2a15a3be36a5a8c0c8545208f3d3dfbc6bb7c3e3b7e8c6f8e7485432e4f3b88da3031a6e20afa7c711eded32ddfb122896ac5d914e75848d5 + languageName: node + linkType: hard + +"yaml@npm:^1.10.0, yaml@npm:^1.10.2": + version: 1.10.2 + resolution: "yaml@npm:1.10.2" + checksum: ce4ada136e8a78a0b08dc10b4b900936912d15de59905b2bf415b4d33c63df1d555d23acb2a41b23cf9fb5da41c256441afca3d6509de7247daa062fd2c5ea5f + languageName: node + linkType: hard + +"yargs-parser@npm:^13.1.2": + version: 13.1.2 + resolution: "yargs-parser@npm:13.1.2" + dependencies: + camelcase: ^5.0.0 + decamelize: ^1.2.0 + checksum: c8bb6f44d39a4acd94462e96d4e85469df865de6f4326e0ab1ac23ae4a835e5dd2ddfe588317ebf80c3a7e37e741bd5cb0dc8d92bcc5812baefb7df7c885e86b + languageName: node + linkType: hard + +"yargs-parser@npm:^20.2.2": + version: 20.2.9 + resolution: "yargs-parser@npm:20.2.9" + checksum: 8bb69015f2b0ff9e17b2c8e6bfe224ab463dd00ca211eece72a4cd8a906224d2703fb8a326d36fdd0e68701e201b2a60ed7cf81ce0fd9b3799f9fe7745977ae3 + languageName: node + linkType: hard + +"yargs@npm:^13.2.4, yargs@npm:^13.3.2": + version: 13.3.2 + resolution: "yargs@npm:13.3.2" + dependencies: + cliui: ^5.0.0 + find-up: ^3.0.0 + get-caller-file: ^2.0.1 + require-directory: ^2.1.1 + require-main-filename: ^2.0.0 + set-blocking: ^2.0.0 + string-width: ^3.0.0 + which-module: ^2.0.0 + y18n: ^4.0.0 + yargs-parser: ^13.1.2 + checksum: 75c13e837eb2bb25717957ba58d277e864efc0cca7f945c98bdf6477e6ec2f9be6afa9ed8a876b251a21423500c148d7b91e88dee7adea6029bdec97af1ef3e8 + languageName: node + linkType: hard + +"yargs@npm:^16.1.1": + version: 16.2.0 + resolution: "yargs@npm:16.2.0" + dependencies: + cliui: ^7.0.2 + escalade: ^3.1.1 + get-caller-file: ^2.0.5 + require-directory: ^2.1.1 + string-width: ^4.2.0 + y18n: ^5.0.5 + yargs-parser: ^20.2.2 + checksum: b14afbb51e3251a204d81937c86a7e9d4bdbf9a2bcee38226c900d00f522969ab675703bee2a6f99f8e20103f608382936034e64d921b74df82b63c07c5e8f59 + languageName: node + linkType: hard + +"yargs@npm:^17.0.0": + version: 17.1.1 + resolution: "yargs@npm:17.1.1" + dependencies: + cliui: ^7.0.2 + escalade: ^3.1.1 + get-caller-file: ^2.0.5 + require-directory: ^2.1.1 + string-width: ^4.2.0 + y18n: ^5.0.5 + yargs-parser: ^20.2.2 + checksum: b05a9467937172e01a4af7a7ad4361a22ee510cd12d1d5a3ad3b4c2e57eb8c35ca94ee22e4bdfbb40fe693fbf8000771e41824f77f6b224f1496c57f20f192b6 + languageName: node + linkType: hard + +"yauzl@npm:^2.10.0": + version: 2.10.0 + resolution: "yauzl@npm:2.10.0" + dependencies: + buffer-crc32: ~0.2.3 + fd-slicer: ~1.1.0 + checksum: 7f21fe0bbad6e2cb130044a5d1d0d5a0e5bf3d8d4f8c4e6ee12163ce798fee3de7388d22a7a0907f563ac5f9d40f8699a223d3d5c1718da90b0156da6904022b + languageName: node + linkType: hard + +"yn@npm:3.1.1": + version: 3.1.1 + resolution: "yn@npm:3.1.1" + checksum: 2c487b0e149e746ef48cda9f8bad10fc83693cd69d7f9dcd8be4214e985de33a29c9e24f3c0d6bcf2288427040a8947406ab27f7af67ee9456e6b84854f02dd6 + languageName: node + linkType: hard + +"yocto-queue@npm:^0.1.0": + version: 0.1.0 + resolution: "yocto-queue@npm:0.1.0" + checksum: f77b3d8d00310def622123df93d4ee654fc6a0096182af8bd60679ddcdfb3474c56c6c7190817c84a2785648cdee9d721c0154eb45698c62176c322fb46fc700 + languageName: node + linkType: hard + +"zone.js@npm:~0.11.4": + version: 0.11.4 + resolution: "zone.js@npm:0.11.4" + dependencies: + tslib: ^2.0.0 + checksum: 20c3e39898019de4747a434a29ed528e5d730a674570c3e72775a57f9d57dba812e70d67c3932ff54e95db9b778f06a9b18119c5184dfd9552d3622544a6729f + languageName: node + linkType: hard From 82e7cbf495ab0ee56b77fcc31a548d3e1df6b758 Mon Sep 17 00:00:00 2001 From: Joris Borgdorff Date: Mon, 1 Nov 2021 14:30:59 +0100 Subject: [PATCH 099/431] Fix duplicate webpack dependency --- package.json | 3 +-- yarn.lock | 55 ---------------------------------------------------- 2 files changed, 1 insertion(+), 57 deletions(-) diff --git a/package.json b/package.json index 435356dae..856820b3c 100644 --- a/package.json +++ b/package.json @@ -51,8 +51,7 @@ "puppeteer": "^10.2.0", "rimraf": "2.6.1", "typescript": "~4.3.5", - "wait-port": "^0.2.9", - "webpack": "^5.0.0" + "wait-port": "^0.2.9" }, "engines": { "node": ">=14.14.0" diff --git a/yarn.lock b/yarn.lock index 59cffa4e2..7e3d61172 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4858,16 +4858,6 @@ __metadata: languageName: node linkType: hard -"enhanced-resolve@npm:^5.8.3": - version: 5.8.3 - resolution: "enhanced-resolve@npm:5.8.3" - dependencies: - graceful-fs: ^4.2.4 - tapable: ^2.2.0 - checksum: d79fbe531106448b768bb0673fb623ec0202d7ee70373ab7d4f4745d5dfe0806f38c9db7e7da8c941288fe475ab3d538db3791fce522056eeea40ca398c9e287 - languageName: node - linkType: hard - "enquirer@npm:^2.3.6": version: 2.3.6 resolution: "enquirer@npm:2.3.6" @@ -4932,13 +4922,6 @@ __metadata: languageName: node linkType: hard -"es-module-lexer@npm:^0.9.0": - version: 0.9.3 - resolution: "es-module-lexer@npm:0.9.3" - checksum: 84bbab23c396281db2c906c766af58b1ae2a1a2599844a504df10b9e8dc77ec800b3211fdaa133ff700f5703d791198807bba25d9667392d27a5e9feda344da8 - languageName: node - linkType: hard - "esbuild-android-arm64@npm:0.13.8": version: 0.13.8 resolution: "esbuild-android-arm64@npm:0.13.8" @@ -7563,7 +7546,6 @@ __metadata: tslib: ^2.3.0 typescript: ~4.3.5 wait-port: ^0.2.9 - webpack: ^5.0.0 zone.js: ~0.11.4 languageName: unknown linkType: soft @@ -12031,43 +12013,6 @@ __metadata: languageName: node linkType: hard -"webpack@npm:^5.0.0": - version: 5.61.0 - resolution: "webpack@npm:5.61.0" - dependencies: - "@types/eslint-scope": ^3.7.0 - "@types/estree": ^0.0.50 - "@webassemblyjs/ast": 1.11.1 - "@webassemblyjs/wasm-edit": 1.11.1 - "@webassemblyjs/wasm-parser": 1.11.1 - acorn: ^8.4.1 - acorn-import-assertions: ^1.7.6 - browserslist: ^4.14.5 - chrome-trace-event: ^1.0.2 - enhanced-resolve: ^5.8.3 - es-module-lexer: ^0.9.0 - eslint-scope: 5.1.1 - events: ^3.2.0 - glob-to-regexp: ^0.4.1 - graceful-fs: ^4.2.4 - json-parse-better-errors: ^1.0.2 - loader-runner: ^4.2.0 - mime-types: ^2.1.27 - neo-async: ^2.6.2 - schema-utils: ^3.1.0 - tapable: ^2.1.1 - terser-webpack-plugin: ^5.1.3 - watchpack: ^2.2.0 - webpack-sources: ^3.2.0 - peerDependenciesMeta: - webpack-cli: - optional: true - bin: - webpack: bin/webpack.js - checksum: 442958ec48645c9e612a2628a815c411cbc18289b5cc7b3d1b5d0f8e5b41606ed225decf4f3684edc365e6390867bded244d20387c70fbb630c0ac08443c34c8 - languageName: node - linkType: hard - "websocket-driver@npm:>=0.5.1, websocket-driver@npm:^0.7.4": version: 0.7.4 resolution: "websocket-driver@npm:0.7.4" From 40d73fdbf39c147e6bf87d1733ee8b298acfcdbc Mon Sep 17 00:00:00 2001 From: Joris Borgdorff Date: Mon, 1 Nov 2021 15:04:12 +0100 Subject: [PATCH 100/431] Fix e2e --- .../e2e/cypress/integration/scenarios/generate-qr-code.spec.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/javascript/e2e/cypress/integration/scenarios/generate-qr-code.spec.ts b/src/test/javascript/e2e/cypress/integration/scenarios/generate-qr-code.spec.ts index 11bc796fb..3540cd9e8 100644 --- a/src/test/javascript/e2e/cypress/integration/scenarios/generate-qr-code.spec.ts +++ b/src/test/javascript/e2e/cypress/integration/scenarios/generate-qr-code.spec.ts @@ -13,7 +13,7 @@ describe('Project view: Generate QR code', () => { .should('have.text', 'Pair an application'); cy.get('#field_clientApp').select('pRMT'); cy.get('button').contains('Generate QR code').click(); - cy.get('qrcode').should('have.length', 1); + cy.get('qr-code').should('have.length', 1); cy.get('button.close').click(); }); }); From c546ee7e43c00dd92da7dbd4b5bc14061d04f9e5 Mon Sep 17 00:00:00 2001 From: Joris Borgdorff Date: Thu, 21 Oct 2021 10:55:10 +0200 Subject: [PATCH 101/431] Fix tests and translations --- .../config/DateTimeFormatConfiguration.java | 48 +++++----- .../radarbase/management/domain/Source.java | 2 - .../repository/SourceRepository.java | 10 ++- .../filters/SubjectSpecification.java | 1 - .../decorator/SourceMapperDecorator.java | 18 +++- .../management/web/rest/SubjectResource.java | 1 - src/main/resources/.h2.server.properties | 4 +- ...20211006160000_add_source_deleted_flag.xml | 2 +- .../resources/config/liquibase/sources.csv | 2 +- src/main/webapp/i18n/en/subject.json | 4 +- src/main/webapp/i18n/nl/audits.json | 6 +- src/main/webapp/i18n/nl/global.json | 32 +++---- src/main/webapp/i18n/nl/subject.json | 90 +++++++++---------- 13 files changed, 115 insertions(+), 105 deletions(-) diff --git a/src/main/java/org/radarbase/management/config/DateTimeFormatConfiguration.java b/src/main/java/org/radarbase/management/config/DateTimeFormatConfiguration.java index e8f2996a6..0dbf2d722 100644 --- a/src/main/java/org/radarbase/management/config/DateTimeFormatConfiguration.java +++ b/src/main/java/org/radarbase/management/config/DateTimeFormatConfiguration.java @@ -24,30 +24,30 @@ public void addFormatters(@Nonnull FormatterRegistry registry) { DateTimeFormatterRegistrar registrar = new DateTimeFormatterRegistrar(); registrar.setUseIsoFormat(true); registrar.setDateTimeFormatter(new DateTimeFormatterBuilder() - .parseCaseInsensitive() - .append(DateTimeFormatter.ISO_LOCAL_DATE) - .optionalStart() - .appendLiteral('T') - .append(DateTimeFormatter.ISO_LOCAL_TIME) - .optionalStart() - .parseLenient() - .appendOffsetId() - .parseStrict() - .optionalEnd() - .optionalStart() - .appendLiteral('[') - .parseCaseSensitive() - .appendZoneRegionId() - .appendLiteral(']') - .optionalEnd() - .optionalEnd() - .parseDefaulting(HOUR_OF_DAY, HOUR_OF_DAY.range().getMinimum()) - .parseDefaulting(MINUTE_OF_HOUR, MINUTE_OF_HOUR.range().getMinimum()) - .parseDefaulting(SECOND_OF_MINUTE, SECOND_OF_MINUTE.range().getMinimum()) - .parseDefaulting(NANO_OF_SECOND, NANO_OF_SECOND.range().getMinimum()) - .toFormatter() - .withZone(ZoneId.of("UTC")) - .withResolverStyle(ResolverStyle.LENIENT)); + .parseCaseInsensitive() + .append(DateTimeFormatter.ISO_LOCAL_DATE) + .optionalStart() + .appendLiteral('T') + .append(DateTimeFormatter.ISO_LOCAL_TIME) + .optionalStart() + .parseLenient() + .appendOffsetId() + .parseStrict() + .optionalEnd() + .optionalStart() + .appendLiteral('[') + .parseCaseSensitive() + .appendZoneRegionId() + .appendLiteral(']') + .optionalEnd() + .optionalEnd() + .parseDefaulting(HOUR_OF_DAY, HOUR_OF_DAY.range().getMinimum()) + .parseDefaulting(MINUTE_OF_HOUR, MINUTE_OF_HOUR.range().getMinimum()) + .parseDefaulting(SECOND_OF_MINUTE, SECOND_OF_MINUTE.range().getMinimum()) + .parseDefaulting(NANO_OF_SECOND, NANO_OF_SECOND.range().getMinimum()) + .toFormatter() + .withZone(ZoneId.of("UTC")) + .withResolverStyle(ResolverStyle.LENIENT)); registrar.registerFormatters(registry); } } diff --git a/src/main/java/org/radarbase/management/domain/Source.java b/src/main/java/org/radarbase/management/domain/Source.java index f05448789..15b485e4d 100644 --- a/src/main/java/org/radarbase/management/domain/Source.java +++ b/src/main/java/org/radarbase/management/domain/Source.java @@ -5,7 +5,6 @@ import com.fasterxml.jackson.annotation.Nulls; import org.hibernate.annotations.Cache; import org.hibernate.annotations.CacheConcurrencyStrategy; -import org.hibernate.annotations.Where; import org.hibernate.envers.Audited; import org.radarbase.auth.config.Constants; import org.radarbase.management.domain.support.AbstractEntityListener; @@ -39,7 +38,6 @@ @Entity @Audited @Table(name = "radar_source") -@Where(clause = "deleted=false") @Cache(usage = CacheConcurrencyStrategy.NONSTRICT_READ_WRITE) @EntityListeners({AbstractEntityListener.class}) public class Source extends AbstractEntity implements Serializable { diff --git a/src/main/java/org/radarbase/management/repository/SourceRepository.java b/src/main/java/org/radarbase/management/repository/SourceRepository.java index f6443c529..a5ca8b140 100644 --- a/src/main/java/org/radarbase/management/repository/SourceRepository.java +++ b/src/main/java/org/radarbase/management/repository/SourceRepository.java @@ -3,6 +3,8 @@ import java.util.List; import java.util.Optional; import java.util.UUID; + +import org.hibernate.annotations.Where; import org.radarbase.management.domain.Source; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; @@ -14,19 +16,19 @@ /** * Spring Data JPA repository for the Source entity. */ -@SuppressWarnings("unused") @RepositoryDefinition(domainClass = Source.class, idClass = Long.class) public interface SourceRepository extends JpaRepository, RevisionRepository { - - List findAllSourcesByAssigned(@Param("assigned") Boolean assigned); - + @Where(clause = "deleted = false") Page findAllSourcesByProjectId(Pageable pageable, @Param("projectId") Long projectId); + @Where(clause = "deleted = false") List findAllSourcesByProjectIdAndAssigned(@Param("projectId") Long projectId, @Param("assigned") Boolean assigned); + @Where(clause = "deleted = false") Optional findOneBySourceId(UUID sourceId); + @Where(clause = "deleted = false") Optional findOneBySourceName(String sourceName); } diff --git a/src/main/java/org/radarbase/management/repository/filters/SubjectSpecification.java b/src/main/java/org/radarbase/management/repository/filters/SubjectSpecification.java index 1817cbec3..4e6789652 100644 --- a/src/main/java/org/radarbase/management/repository/filters/SubjectSpecification.java +++ b/src/main/java/org/radarbase/management/repository/filters/SubjectSpecification.java @@ -27,7 +27,6 @@ import java.time.ZonedDateTime; import java.util.ArrayList; import java.util.List; -import java.util.Objects; import java.util.Set; import java.util.stream.Collectors; diff --git a/src/main/java/org/radarbase/management/service/mapper/decorator/SourceMapperDecorator.java b/src/main/java/org/radarbase/management/service/mapper/decorator/SourceMapperDecorator.java index 01d8ded9e..420eba393 100644 --- a/src/main/java/org/radarbase/management/service/mapper/decorator/SourceMapperDecorator.java +++ b/src/main/java/org/radarbase/management/service/mapper/decorator/SourceMapperDecorator.java @@ -1,6 +1,5 @@ package org.radarbase.management.service.mapper.decorator; -import java.util.NoSuchElementException; import org.radarbase.management.domain.Source; import org.radarbase.management.repository.SourceRepository; import org.radarbase.management.repository.SubjectRepository; @@ -8,9 +7,15 @@ import org.radarbase.management.service.dto.SourceDTO; import org.radarbase.management.service.mapper.SourceMapper; import org.radarbase.management.web.rest.errors.NotFoundException; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; +import java.util.List; +import java.util.Map; +import java.util.NoSuchElementException; + import static org.radarbase.management.web.rest.errors.EntityName.SOURCE; import static org.radarbase.management.web.rest.errors.ErrorConstants.ERR_SOURCE_NOT_FOUND; @@ -19,6 +24,7 @@ */ public abstract class SourceMapperDecorator implements SourceMapper { + private static final Logger logger = LoggerFactory.getLogger(SourceMapperDecorator.class); @Autowired @Qualifier("delegate") @@ -32,11 +38,16 @@ public abstract class SourceMapperDecorator implements SourceMapper { @Override public Source descriptiveDTOToSource(MinimalSourceDetailsDTO minimalSource) { + List allSources = sourceRepository.findAll(); + logger.info("Listing {} existing sources", allSources.size()); + allSources.forEach(s -> logger.info("Existing source: {}", s.getSourceId())); + Source source = sourceRepository .findOneBySourceId(minimalSource.getSourceId()) .orElseThrow(() -> new NotFoundException( "Source ID " + minimalSource.getSourceId() + " not found", - SOURCE, ERR_SOURCE_NOT_FOUND)); + SOURCE, ERR_SOURCE_NOT_FOUND, + Map.of("sourceId", minimalSource.getSourceId().toString()))); source.setAssigned(minimalSource.isAssigned()); return source; } @@ -48,7 +59,8 @@ public Source sourceDTOToSource(SourceDTO sourceDto) { Source existingSource = sourceRepository.findById(sourceDto.getId()) .orElseThrow(() -> new NotFoundException( "Source ID " + sourceDto.getId() + " not found", - SOURCE, ERR_SOURCE_NOT_FOUND)); + SOURCE, ERR_SOURCE_NOT_FOUND, + Map.of("sourceId", sourceDto.getId().toString()))); if (sourceDto.getSubjectLogin() == null) { source.setSubject(existingSource.getSubject()); } else { diff --git a/src/main/java/org/radarbase/management/web/rest/SubjectResource.java b/src/main/java/org/radarbase/management/web/rest/SubjectResource.java index 6ecf47289..0800fd345 100644 --- a/src/main/java/org/radarbase/management/web/rest/SubjectResource.java +++ b/src/main/java/org/radarbase/management/web/rest/SubjectResource.java @@ -56,7 +56,6 @@ import org.radarbase.management.service.mapper.SubjectMapper; import org.radarbase.management.web.rest.criteria.SubjectCriteria; import org.radarbase.management.web.rest.errors.BadRequestException; -import org.radarbase.management.web.rest.errors.ErrorConstants; import org.radarbase.management.web.rest.errors.InvalidRequestException; import org.radarbase.management.web.rest.errors.NotFoundException; import org.radarbase.management.web.rest.util.HeaderUtil; diff --git a/src/main/resources/.h2.server.properties b/src/main/resources/.h2.server.properties index a373eb3cb..ff7b967a8 100644 --- a/src/main/resources/.h2.server.properties +++ b/src/main/resources/.h2.server.properties @@ -1,6 +1,6 @@ #H2 Server Properties -#Tue May 04 09:21:28 BST 2021 +#Thu Oct 21 09:11:42 CEST 2021 0=JHipster H2 (Memory)|org.h2.Driver|jdbc\:h2\:mem\:managementportal|ManagementPortal +webSSL=false webAllowOthers=true webPort=8082 -webSSL=false diff --git a/src/main/resources/config/liquibase/changelog/20211006160000_add_source_deleted_flag.xml b/src/main/resources/config/liquibase/changelog/20211006160000_add_source_deleted_flag.xml index ca5f42c19..27bb0873b 100644 --- a/src/main/resources/config/liquibase/changelog/20211006160000_add_source_deleted_flag.xml +++ b/src/main/resources/config/liquibase/changelog/20211006160000_add_source_deleted_flag.xml @@ -21,7 +21,7 @@ --> - + diff --git a/src/main/resources/config/liquibase/sources.csv b/src/main/resources/config/liquibase/sources.csv index ea4aa726b..73284db88 100644 --- a/src/main/resources/config/liquibase/sources.csv +++ b/src/main/resources/config/liquibase/sources.csv @@ -1,2 +1,2 @@ "ID";"source_id";"source_name";"assigned";"created_by";"source_type_id";"project_id" -"1";"03d28e5c-e005-46d4-a9b3-279c27fbbc83";"source-1";"TRUE";"system";"1";"1" \ No newline at end of file +"1";"03d28e5c-e005-46d4-a9b3-279c27fbbc83";"source-1";"TRUE";"system";"1";"1" diff --git a/src/main/webapp/i18n/en/subject.json b/src/main/webapp/i18n/en/subject.json index 73a2ed6a2..f5f76795a 100644 --- a/src/main/webapp/i18n/en/subject.json +++ b/src/main/webapp/i18n/en/subject.json @@ -11,7 +11,7 @@ "updated": "A Subject is updated with identifier {{ param }}", "deleted": "A Subject is deleted with identifier {{ param }}", "delete": { - "question": "Are you sure you want to delete Subject {{ id }}?" + "question": "Are you sure you want to delete Subject {{ id }}? This operation cannot be undone." }, "detail": { "title": "Subject" @@ -70,7 +70,7 @@ "discontinue" : { "operation" : "Discontinue", "title" : "Confirm discontinue operation", - "question" : "Are you sure you want to discontinue Subject {{ id }}?" + "question" : "Are you sure you want to discontinue Subject {{ id }}? This operation cannot be undone." }, "discontinued": "A Subject is discontinued with identifier {{ param }}", "sorting": { diff --git a/src/main/webapp/i18n/nl/audits.json b/src/main/webapp/i18n/nl/audits.json index d6eef3174..d77f7bf95 100644 --- a/src/main/webapp/i18n/nl/audits.json +++ b/src/main/webapp/i18n/nl/audits.json @@ -28,7 +28,7 @@ "title": "Geschiedenis", "revision": "Revisie", "revisionList": "Geschiedenis voor", - "revisionType": "Revisie Type", + "revisionType": "Revisietype", "number": "Revisienummer", "author": "Auteur", "modifications": "Wijzigingen", @@ -43,8 +43,8 @@ "subject": "Subject", "source": "Source", "project": "Project", - "sourceType": "Source Type", - "sourceData": "Source Data" + "sourceType": "Source-type", + "sourceData": "Source-data" } } } diff --git a/src/main/webapp/i18n/nl/global.json b/src/main/webapp/i18n/nl/global.json index 359fa8657..a3e73bd68 100644 --- a/src/main/webapp/i18n/nl/global.json +++ b/src/main/webapp/i18n/nl/global.json @@ -8,10 +8,10 @@ "entities": { "main": "Entiteiten", "source": "Source", - "sourceType": "Source Type", + "sourceType": "Source-type", "project": "Project", - "oauth-clients": "OAuth Clients", - "sourceData": "Source Data", + "oauth-clients": "OAuth clienten", + "sourceData": "Source-data", "subject": "Subject", "jhipster-needle-menu-add-entry": "JHipster will add additional entities here (do not translate!)" }, @@ -19,7 +19,7 @@ "main": "Gebruiker", "settings": "Instellingen", "password": "Wachtwoord", - "sessions": "Sessions", + "sessions": "Sessies", "login": "Aanmelden", "logout": "Afmelden", "register": "Registreren" @@ -43,14 +43,14 @@ "language": "Taal" }, "form": { - "username": "Username", - "username.placeholder": "Uw username", + "username": "Gebruikersnaam", + "username.placeholder": "Uw gebruikersnaam", "newpassword": "Nieuw wachtwoord", "newpassword.placeholder": "Nieuw wachtwoord", "confirmpassword": "Nieuw wachtwoord bevestigen", "confirmpassword.placeholder": "Bevestig het nieuwe wachtwoord", - "email": "Email", - "email.placeholder": "Uw email" + "email": "E-mailadres", + "email.placeholder": "Uw e-mail" }, "messages": { "info": { @@ -119,7 +119,7 @@ "value": "Waarde" }, "delete": { - "title": "Bevestig wisbewerking" + "title": "Bevestig wissen" }, "validation": { "required": "Dit veld is vereist.", @@ -138,14 +138,14 @@ "internalServerError": "Internal server error", "projectNotEmpty": "Kan project niet verwijderen: het heeft nog gebruikers", "internalParameterized": "Internal server error: {{ message }}", - "server.not.reachable": "Server not reachable", + "server.not.reachable": "Server niet bereikbaar.", "url.not.found": "Not found", - "NotNull": "Field {{fieldName}} cannot be empty!", - "Size": "Field {{fieldName}} does not meet min/max size requirements!", - "userexists": "Login name already used!", - "emailexists": "Email is already in use!", - "idexists": "A new {{entityName}} cannot already have an ID", - "invalidsubjectstate": "Een stopgezette deelnemer kan niet geactiveerd worden", + "NotNull": "Veld {{fieldName}} mag niet leeg zijn", + "Size": "Veld {{fieldName}} voldoet niet aan de mininum/maximum lengte!", + "userexists": "De opgegeven gebruikersnaam is al in gebruik.", + "emailexists": "Het opgegeven e-mailadres is al in gebruik.", + "idexists": "Een nieuwe {{entityName}} mag geen explicit ID hebben.", + "invalidsubjectstate": "Een stopgezet deelname door een subject kan niet gereactiveerd worden", "nameexists": "Er bestaat reeds een {{ entityName }} met deze naam" }, "footer": "Voor meer details, lees de gebruikershandleiding.", diff --git a/src/main/webapp/i18n/nl/subject.json b/src/main/webapp/i18n/nl/subject.json index f4db8ff30..01d004f81 100644 --- a/src/main/webapp/i18n/nl/subject.json +++ b/src/main/webapp/i18n/nl/subject.json @@ -2,16 +2,16 @@ "managementPortalApp": { "subject" : { "home": { - "title": "Subjects", - "createLabel": "Maak een nieuwe Subject", - "createOrEditLabel": "Maak of wijzig een Subject", + "title": "Subjecten", + "createLabel": "Maak een nieuwe subject", + "createOrEditLabel": "Maak of wijzig een subject", "pairAppLabel": "Koppel een app" }, - "created": "A new Subject is created with identifier {{ param }}", - "updated": "A Subject is updated with identifier {{ param }}", - "deleted": "A Subject is deleted with identifier {{ param }}", + "created": "Een nieuw subject is met login {{ param }} is aangemaakt.", + "updated": "Het subject {{ param }} is bewerkt.", + "deleted": "Het subject {{ param }} is verwijderd.", "delete": { - "question": "Bent u zeker dat u Subject {{ id }} wilt verwijderen?" + "question": "Weet u zeker dat u subject {{ id }} wilt verwijderen? Dit kan niet ongedaan gemaakt worden." }, "detail": { "title": "Subject" @@ -24,69 +24,69 @@ "advancedFilter": "Uitgebreid filter" }, "login": "Login", - "email": "Email", - "externalLink": "External Link", - "externalId": "External Id", + "email": "E-mail", + "externalLink": "Externe link", + "externalId": "Extern ID", "name": "Naam", "dob": "Geboortedatum", "humanReadableId": "Leesbare ID", "enrolmentDate": "Inschrijvingsdatum", - "removed": "Removed", - "activated": "Activated", + "removed": "Verwijderd", + "activated": "Actief", "langKey": "Taal", "project": "Project", "sources": "Sources", - "createdBy": "Aanmaak door", - "createdDate": "Aanmaak datum", + "createdBy": "Gemaakt door", + "createdDate": "Aanmaakdatum", "dateOfBirth": "Geboortedatum", "enrollmentDate": "Inschrijvingsdatum", "lastModifiedBy": "Laatst aangepast door", - "lastModifiedDate": "Laatst aangepast datum", + "lastModifiedDate": "Laatst aangepaste datum", "personName": "Naam", "pairing": "Koppelen", "actions": "Acties", "pairApp": "App koppelen", "pairSources": { - "button" : "Paar Sources", - "title" : "Toewijzen of verwijderen sources ", - "Id" : "Id", - "sourceDescription" : "Source Beschrijving", + "button" : "Koppel Sources", + "title" : "Koppel of verwijder sources", + "Id" : "ID", + "sourceDescription" : "Source beschrijving", "remove" : "Verwijderen", - "assignedSources" : "Toegewezen sources", - "availableSources" : "Beschikbaar sources", - "sourceType": "Device type", + "assignedSources" : "Gekoppelde sources", + "availableSources" : "Beschikbare sources", + "sourceType": "Source type", "sourceId": "Source ID", - "sourceName": "Source Naam", + "sourceName": "Source naam", "expectedSourceName": "Fysiek ID" }, "clientApp": "Client app", "resource": "Beveiligde gegevensbron", - "attributeData" : "Attributes", + "attributeData" : "Attributen", "status" : { "title" : "Staat", "discontinued" : "Stopgezet", - "active" : "Geactiveerd", - "deactivated" : "Gedeactiveerd", + "active" : "Actief", + "deactivated" : "Inactief", "invalid": "Ongeldig" }, "discontinue" : { - "operation" : "Staken", - "title" : "Bevestig de werking stoppen", - "question" : "Weet u zeker dat u het onderwerp wilt stoppen {{ id }}?" + "operation" : "Stopzetten", + "title" : "Bevestig stopzetten", + "question" : "Weet u zeker dat u de deelname van subject {{ id }} wilt stopzetten? Dit kan niet ongedaan gemaakt worden." }, - "discontinued": "Een onderwerp wordt beƫindigd met een identificatiecode {{ param }}", + "discontinued": "De deelname van subject {{ param }} is stopgezet.", "sorting": { "sortByLabel": "Sorteren op", "sortOrderLabel": "Volgorde", "id": "Id", - "externalId": "External Id", - "user.login": "Subject Id", - "user.activated": "Status", + "externalId": "Extern ID", "asc": "Oplopend", - "desc": "Aflopend" + "desc": "Aflopend", + "login": "Subject ID", + "authority": "Status" }, - "subjectId" : "Subject Id", - "baseUrl" : "Base Url", + "subjectId" : "Subject ID", + "baseUrl" : "Basis-url", "tokenName" : "Token naam", "tokenTimeoutMinutes": "{{minutes}} minuten", "tokenTimeoutHour": "1 uur", @@ -100,21 +100,21 @@ "group": "Groep", "loadMore": "Meer laden ({{shown}}/{{total}} getoond)", "allLoaded": "Alle {{total}} subjects geladen", - "generateToken": "Genereer QR code", - "generatePersistentToken": "Genereer blijvende QR code" + "generateToken": "Genereer QR-code", + "generatePersistentToken": "Genereer langdurige QR-code" } }, "error": { - "patientEmailRequired": "Er is een geldige e-mail nodig om het vakaccount te activeren", - "subjectExists" : "Er bestaat al een onderwerp met een gegeven project-id en extern id", - "loginNotParticipant": "Opgegeven login is geen deelnemer in een studie", - "loginRequired": "A subject login is required", - "sourceNotFound": "Er is geen source met deze naam toegewezen aan de deelnemer.", + "patientEmailRequired": "Er is een geldige e-mailadres nodig om het subject-account te activeren", + "subjectExists" : "Er bestaat al een onderwerp met een gegeven project ID en extern ID", + "loginNotParticipant": "Opgegeven subject is geen deelnemer van een project", + "loginRequired": "Een subject-login is vereist.", + "sourceNotFound": "Er is geen source met deze naam toegewezen aan het subject.", "sourceNameExists": "Er bestaat reeds een source met deze naam.", "validation": "Validatie fout, controleer de ingevoerde waarden.", "sourceTypeExists": "De deelnemer werd reeds een source van dit type toegewezen.", - "activeParticipantProjectNotFound": "Het Subject heeft geen actief deelnemersproject", - "sourceTypeNotProvided" : "Het verzoek bevat geen geldige eigenschappen van het source-type" + "activeParticipantProjectNotFound": "Het subject neemt niet deel aan een project", + "sourceTypeNotProvided" : "De opgegeven eigenschappen van het source-type zijn incompleet." } } From 4814d8282003cd1b2e7ec88e531e30127b8c1c73 Mon Sep 17 00:00:00 2001 From: Joris Borgdorff Date: Mon, 1 Nov 2021 16:24:04 +0100 Subject: [PATCH 102/431] Set the correct enrollment date initialization --- .../20211006170000_add_enrollment_date.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/src/main/resources/config/liquibase/changelog/20211006170000_add_enrollment_date.xml b/src/main/resources/config/liquibase/changelog/20211006170000_add_enrollment_date.xml index cc2a26363..de363877b 100644 --- a/src/main/resources/config/liquibase/changelog/20211006170000_add_enrollment_date.xml +++ b/src/main/resources/config/liquibase/changelog/20211006170000_add_enrollment_date.xml @@ -24,10 +24,26 @@ + + + + + UPDATE subject + SET subject.enrollment_date = ( + SELECT MIN(r.timestamp) + FROM subject_aud a + INNER JOIN _revisions_info r ON a.rev = r.id + WHERE a.id = subject.id + AND a.revtype = 0 + GROUP BY a.id + ) + WHERE subject.enrollment_date IS NULL + + From 124c11591e2fd8b05e8ba5a3a2c3c49acea10aa7 Mon Sep 17 00:00:00 2001 From: Joris Borgdorff Date: Mon, 1 Nov 2021 16:42:35 +0100 Subject: [PATCH 103/431] Remove redundant GROUP BY clause --- .../liquibase/changelog/20211006170000_add_enrollment_date.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/resources/config/liquibase/changelog/20211006170000_add_enrollment_date.xml b/src/main/resources/config/liquibase/changelog/20211006170000_add_enrollment_date.xml index de363877b..ad5f912ca 100644 --- a/src/main/resources/config/liquibase/changelog/20211006170000_add_enrollment_date.xml +++ b/src/main/resources/config/liquibase/changelog/20211006170000_add_enrollment_date.xml @@ -41,7 +41,6 @@ INNER JOIN _revisions_info r ON a.rev = r.id WHERE a.id = subject.id AND a.revtype = 0 - GROUP BY a.id ) WHERE subject.enrollment_date IS NULL From 0a1ea37b99952eed87486687498c9e5055e2584a Mon Sep 17 00:00:00 2001 From: Joris Borgdorff Date: Mon, 1 Nov 2021 16:52:32 +0100 Subject: [PATCH 104/431] Fix GA yarn cache location --- .github/workflows/pre-release.yml | 2 +- .github/workflows/release.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pre-release.yml b/.github/workflows/pre-release.yml index 8398af4ad..bbe8d095e 100644 --- a/.github/workflows/pre-release.yml +++ b/.github/workflows/pre-release.yml @@ -26,7 +26,7 @@ jobs: - name: Get yarn cache directory path id: yarn-cache-dir-path - run: echo "::set-output name=dir::.yarn" + run: echo "::set-output name=dir::.yarn/cache" - uses: actions/setup-java@v1 with: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 6d188fe90..a063f6d2d 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -25,7 +25,7 @@ jobs: - name: Get yarn cache directory path id: yarn-cache-dir-path - run: echo "::set-output name=dir::.yarn" + run: echo "::set-output name=dir::.yarn/cache" - uses: actions/setup-java@v1 with: From bedfeb9a7fb135a4654d0d631be5af0d67a03503 Mon Sep 17 00:00:00 2001 From: Joris Borgdorff Date: Tue, 2 Nov 2021 10:20:00 +0100 Subject: [PATCH 105/431] Clean up interceptors --- .../interceptor/auth-expired.interceptor.ts | 34 ------------------- .../blocks/interceptor/auth.interceptor.ts | 28 --------------- .../interceptor/errorhandler.interceptor.ts | 11 +++--- .../interceptor/notification.interceptor.ts | 3 +- .../app/shared/alert/alert-error.component.ts | 2 +- 5 files changed, 8 insertions(+), 70 deletions(-) delete mode 100644 src/main/webapp/app/blocks/interceptor/auth-expired.interceptor.ts delete mode 100644 src/main/webapp/app/blocks/interceptor/auth.interceptor.ts diff --git a/src/main/webapp/app/blocks/interceptor/auth-expired.interceptor.ts b/src/main/webapp/app/blocks/interceptor/auth-expired.interceptor.ts deleted file mode 100644 index 6887e1da5..000000000 --- a/src/main/webapp/app/blocks/interceptor/auth-expired.interceptor.ts +++ /dev/null @@ -1,34 +0,0 @@ -// import { Injectable } from '@angular/core'; -// import { Observable } from 'rxjs'; -// import { tap } from 'rxjs/operators'; -// import { -// HttpHandler, -// HttpRequest, -// HttpInterceptor, -// HttpEvent, -// } from '@angular/common/http'; -// import {AuthServerProvider, AuthService, Principal} from '../../shared'; -// -// @Injectable() -// export class AuthExpiredInterceptor implements HttpInterceptor { -// -// constructor( -// private auth: AuthService, -// private authServerProvider: AuthServerProvider, -// private principal: Principal, -// ) {} -// -// intercept(request: HttpRequest, next: HttpHandler): Observable> { -// return next.handle(request).pipe( -// tap({ -// error: () => { -// if (this.principal.isAuthenticated()) { -// this.auth.authorize(true); -// } else { -// this.authServerProvider.logout(); -// } -// } -// }) -// ); -// } -// } diff --git a/src/main/webapp/app/blocks/interceptor/auth.interceptor.ts b/src/main/webapp/app/blocks/interceptor/auth.interceptor.ts deleted file mode 100644 index d9ef384bd..000000000 --- a/src/main/webapp/app/blocks/interceptor/auth.interceptor.ts +++ /dev/null @@ -1,28 +0,0 @@ -// import { Injectable } from '@angular/core'; -// import {Observable} from 'rxjs'; -// import {HttpEvent, HttpHandler, HttpInterceptor, HttpRequest} from '@angular/common/http'; -// import {AuthServerProvider, TokenData} from '../../shared'; -// -// @Injectable() -// export class AuthInterceptor implements HttpInterceptor { -// -// constructor( -// private authServerProvider: AuthServerProvider, -// ) {} -// -// intercept(request: HttpRequest, next: HttpHandler): Observable> { -// const tokenString: string = this.authServerProvider.getToken(); -// if (!!tokenString) { -// const token: TokenData = JSON.parse(tokenString); -// if (!!token && token.expires_at && token.expires_at > new Date().getTime()) { -// const newReq = request.clone({ -// setHeaders: { -// Authorization: 'Bearer ' + token.access_token -// } -// }); -// return next.handle(newReq); -// } -// } -// return next.handle(request); -// } -// } diff --git a/src/main/webapp/app/blocks/interceptor/errorhandler.interceptor.ts b/src/main/webapp/app/blocks/interceptor/errorhandler.interceptor.ts index a63bb4493..4583ec0da 100644 --- a/src/main/webapp/app/blocks/interceptor/errorhandler.interceptor.ts +++ b/src/main/webapp/app/blocks/interceptor/errorhandler.interceptor.ts @@ -20,12 +20,13 @@ export class ErrorHandlerInterceptor implements HttpInterceptor { return next.handle(request).pipe( tap({ error: (err: HttpErrorResponse) => { - if (!(err.status === 401 && (err.message === '' || (err.url && err.url.includes('/api/account'))))) { - this.eventManager.broadcast({ - name: 'managementPortalApp.httpError', - content: err - }); + if (err.status === 401 && (err.message === '' || (err.url && err.url.includes('/api/account')))) { + return; } + this.eventManager.broadcast({ + name: 'managementPortalApp.httpError', + content: err + }); } })); } diff --git a/src/main/webapp/app/blocks/interceptor/notification.interceptor.ts b/src/main/webapp/app/blocks/interceptor/notification.interceptor.ts index d0ba332ba..03770a6e1 100644 --- a/src/main/webapp/app/blocks/interceptor/notification.interceptor.ts +++ b/src/main/webapp/app/blocks/interceptor/notification.interceptor.ts @@ -33,8 +33,7 @@ export class NotificationInterceptor implements HttpInterceptor { if (alert) { if (typeof alert === 'string') { if (this.alertService) { - const alertParam = alertParams; - this.alertService.success(alert, { param : alertParam }, null); + this.alertService.success(alert, { param : alertParams }, null); } } } diff --git a/src/main/webapp/app/shared/alert/alert-error.component.ts b/src/main/webapp/app/shared/alert/alert-error.component.ts index 8e95ebde2..cb45f40d2 100644 --- a/src/main/webapp/app/shared/alert/alert-error.component.ts +++ b/src/main/webapp/app/shared/alert/alert-error.component.ts @@ -92,7 +92,7 @@ export class JhiAlertErrorComponent implements OnDestroy { } addErrorAlert(message, key?, data?) { - key = key && key !== null ? key : message; + key = key ? key : message; this.alerts.push( this.alertService.addAlert( { From 587c32d1b46ddfa09c4b55670095ee29ce595091 Mon Sep 17 00:00:00 2001 From: Joris Borgdorff Date: Tue, 2 Nov 2021 12:12:13 +0100 Subject: [PATCH 106/431] Bump docker FROM --- Dockerfile | 4 ++-- build.gradle | 13 ++----------- gradle.properties | 3 --- 3 files changed, 4 insertions(+), 16 deletions(-) diff --git a/Dockerfile b/Dockerfile index c926f330f..fda295e9e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ # Build stage -FROM gradle:7.2-jdk11 as builder +FROM gradle:7.2-jdk17 as builder # Install NodeJS and Yarn RUN curl -sL https://deb.nodesource.com/setup_16.x | bash - && \ @@ -39,7 +39,7 @@ COPY src src RUN gradle -s bootWar --no-watch-fs # Run stage -FROM azul/zulu-openjdk-alpine:11-jre-headless +FROM azul/zulu-openjdk-alpine:17-jre-headless ENV SPRING_OUTPUT_ANSI_ENABLED=ALWAYS \ JHIPSTER_SLEEP=0 \ diff --git a/build.gradle b/build.gradle index 7d9af937f..efe016c06 100644 --- a/build.gradle +++ b/build.gradle @@ -60,8 +60,8 @@ allprojects { } } -sourceCompatibility = JavaVersion.VERSION_11 -targetCompatibility = JavaVersion.VERSION_11 +sourceCompatibility = JavaVersion.VERSION_17 +targetCompatibility = JavaVersion.VERSION_17 description = 'MangementPortal application to manage studies and participants' @@ -265,15 +265,6 @@ task ghPagesOpenApiSpec(type: Copy) { into file("$rootDir/public/apidoc") } -if (project.hasProperty('nodeInstall')) { - node { - version = "${node_version}" - npmVersion = "${npm_version}" - yarnVersion = "${yarn_version}" - download = true - } -} - compileJava.dependsOn processResources processResources.dependsOn cleanResources, bootBuildInfo bootBuildInfo.mustRunAfter cleanResources diff --git a/gradle.properties b/gradle.properties index 126cffa2a..9e28ab3c5 100644 --- a/gradle.properties +++ b/gradle.properties @@ -6,14 +6,11 @@ hazelcast_version=4.2.2 hikaricp_version=5.0.0 liquibase_slf4j_version=4.0.0 liquibase_version=4.5.0 -node_version=16.11.1 -npm_version=8.0.0 postgresql_version=42.2.14 springdoc_version=1.5.2 spring_boot_version=2.5.6 gatling_version=3.6.1 mapstruct_version=1.4.2.Final -yarn_version=1.22.15 jackson_version=2.12.5 jackson_dataformat_version=2.12.5 javax_xml_bind_version=2.3.3 From 89aceb9034c96e178a7e1ecadbea4a0e263f655d Mon Sep 17 00:00:00 2001 From: Joris Borgdorff Date: Tue, 2 Nov 2021 12:12:59 +0100 Subject: [PATCH 107/431] Add cy.session again --- cypress.json | 1 + .../e2e/cypress/integration/util/login.ts | 22 +++++++++++-------- 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/cypress.json b/cypress.json index 15ba0427d..eaba6b9c8 100644 --- a/cypress.json +++ b/cypress.json @@ -2,6 +2,7 @@ "integrationFolder": "src/test/javascript/e2e/cypress/integration", "supportFile": false, "video": false, + "experimentalSessionSupport": true, "screenshotsFolder": "src/test/javascript/e2e/cypress/screenshots", "pluginsFile": false, "fixturesFolder": false, diff --git a/src/test/javascript/e2e/cypress/integration/util/login.ts b/src/test/javascript/e2e/cypress/integration/util/login.ts index 2dc21f142..9641633e7 100644 --- a/src/test/javascript/e2e/cypress/integration/util/login.ts +++ b/src/test/javascript/e2e/cypress/integration/util/login.ts @@ -1,13 +1,17 @@ import * as navBarPage from "./nav-bar"; export function login(username = "admin", password = "admin") { - cy.visit('./'); - navBarPage.clickOnAccountMenu(); - navBarPage.clickOnSignIn(); - cy.get('.modal-content h1').first().should('have.text', 'Sign in'); - cy.get('#username').type(username); - cy.get('#password').type(password); - cy.get('button[type=submit]').click(); - cy.get('.alert-success span').should('exist'); - cy.getCookie('SESSION').should('exist') + cy.session([username, password], () => { + cy.visit('/'); + navBarPage.clickOnAccountMenu(); + navBarPage.clickOnSignIn(); + cy.get('.modal-content h1').first().should('have.text', 'Sign in'); + cy.get('#username').type(username); + cy.get('#password').type(password); + cy.get('button[type=submit]').click(); + cy.get('.alert-success span').should('exist'); + }, { validate() { + cy.getCookie('SESSION').should('exist')} + }) + cy.visit('/'); } From 35a040acd352589a9408f44f2620364aefb2649a Mon Sep 17 00:00:00 2001 From: Joris Borgdorff Date: Tue, 2 Nov 2021 12:19:52 +0100 Subject: [PATCH 108/431] Bump workflow Java --- .github/workflows/main.yml | 2 +- .github/workflows/pre-release.yml | 2 +- .github/workflows/release.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 30a57b71f..9b31b6306 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -32,7 +32,7 @@ jobs: - uses: actions/setup-java@v1 with: - java-version: 11 + java-version: 17 - name: Cache uses: actions/cache@v2 diff --git a/.github/workflows/pre-release.yml b/.github/workflows/pre-release.yml index bbe8d095e..ccc36ae5b 100644 --- a/.github/workflows/pre-release.yml +++ b/.github/workflows/pre-release.yml @@ -30,7 +30,7 @@ jobs: - uses: actions/setup-java@v1 with: - java-version: 11 + java-version: 17 - name: Cache uses: actions/cache@v2 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index a063f6d2d..21c5804eb 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -29,7 +29,7 @@ jobs: - uses: actions/setup-java@v1 with: - java-version: 11 + java-version: 17 - name: Cache uses: actions/cache@v2 From 79de1d5a9880be0d76cc3f336d861cd8096b2019 Mon Sep 17 00:00:00 2001 From: Joris Borgdorff Date: Tue, 2 Nov 2021 13:37:35 +0100 Subject: [PATCH 109/431] Reduce cy.wait --- .../integration/account/account.spec.ts | 2 +- .../integration/admin/administration.spec.ts | 1 - .../integration/entities/oauth-client.spec.ts | 11 +++---- .../integration/entities/project.spec.ts | 22 +++++--------- .../integration/entities/source-data.spec.ts | 29 ++++++++----------- .../integration/entities/source-type.spec.ts | 9 ++---- .../integration/entities/source.spec.ts | 6 ++-- .../integration/entities/subject.spec.ts | 7 ++--- .../entities/user-management.spec.ts | 11 +++---- 9 files changed, 35 insertions(+), 63 deletions(-) diff --git a/src/test/javascript/e2e/cypress/integration/account/account.spec.ts b/src/test/javascript/e2e/cypress/integration/account/account.spec.ts index 978d941f8..8d5a126f2 100644 --- a/src/test/javascript/e2e/cypress/integration/account/account.spec.ts +++ b/src/test/javascript/e2e/cypress/integration/account/account.spec.ts @@ -30,7 +30,7 @@ describe('account', () => { it('should be able to update settings', () => { login('admin', 'admin') navBarPage.clickOnAccountMenu(); - cy.get('[routerLink="settings"]').click(); + navBarPage.clickOnEntity('settings'); cy.get('h2').first() .should('have.text', 'User settings for [admin]'); diff --git a/src/test/javascript/e2e/cypress/integration/admin/administration.spec.ts b/src/test/javascript/e2e/cypress/integration/admin/administration.spec.ts index c7a620a17..408ca7b1e 100644 --- a/src/test/javascript/e2e/cypress/integration/admin/administration.spec.ts +++ b/src/test/javascript/e2e/cypress/integration/admin/administration.spec.ts @@ -8,7 +8,6 @@ describe('administration', () => { beforeEach(() => { login(); - cy.wait(100); navBarPage.clickOnAdminMenu(); }); diff --git a/src/test/javascript/e2e/cypress/integration/entities/oauth-client.spec.ts b/src/test/javascript/e2e/cypress/integration/entities/oauth-client.spec.ts index 5fe5e53a3..29b4cf283 100644 --- a/src/test/javascript/e2e/cypress/integration/entities/oauth-client.spec.ts +++ b/src/test/javascript/e2e/cypress/integration/entities/oauth-client.spec.ts @@ -29,7 +29,6 @@ describe('OAuth Clients e2e test', () => { it('should be able to create OAuth Client', () => { cy.get('jhi-oauth-client h4 button.btn-primary').click(); - cy.wait(1000); cy.get('#id').type('test-client'); cy.get('button').contains('Random').click(); @@ -45,15 +44,13 @@ describe('OAuth Clients e2e test', () => { cy.get('#accessTokenValidity').type('3600'); cy.get('#refreshTokenValidity').clear(); cy.get('#refreshTokenValidity').type('7200'); - cy.get('button.btn-primary').contains('Save').click(); + cy.contains('button.btn-primary', 'Save').click(); }); it('should be able to edit OAuth Client', () => { - cy.wait(1000); - cy.get('td').contains('test-client').parents('tr') - .find('button').contains('Edit').click(); - cy.wait(1000); - cy.get('button.btn-primary').contains('Save').click(); + cy.contains('tr', 'test-client') + .contains('button', 'Edit').click(); + cy.contains('button.btn-primary', 'Save').click(); }); it('should be able to delete OAuth Client', () => { diff --git a/src/test/javascript/e2e/cypress/integration/entities/project.spec.ts b/src/test/javascript/e2e/cypress/integration/entities/project.spec.ts index 67082350c..ed568919d 100644 --- a/src/test/javascript/e2e/cypress/integration/entities/project.spec.ts +++ b/src/test/javascript/e2e/cypress/integration/entities/project.spec.ts @@ -22,31 +22,23 @@ describe('Project e2e test', () => { }); it('should be able to create Project', () => { - cy.wait(5000); cy.get('button.create-project').click(); - cy.wait(5000); cy.get('#field_projectName').type('test-project'); cy.get('#field_humanReadableProjectName').type('Test project'); cy.get('#field_description').type('Best test project in the world'); cy.get('#field_location').type('in-memory'); - cy.wait(5000); - cy.get('jhi-project-dialog button.btn-primary').contains('Save').click(); + cy.contains('jhi-project-dialog button.btn-primary', 'Save').click(); }); it('should be able to edit Project', () => { - cy.wait(5000); - cy.get('td').contains('test-project').parents('tr') - .find('button').contains('Edit').click(); - cy.wait(5000); - cy.get('button.btn-primary').contains('Save').click(); + cy.contains('tr', 'test-project') + .contains('button', 'Edit').click(); + cy.contains('button.btn-primary', 'Save').click(); }); it('should be able to delete Project', () => { - cy.wait(5000); - cy.get('td').contains('test-project').parents('tr') - .find('button').contains('Delete').click(); - cy.wait(5000); - cy.get('jhi-project-delete-dialog button.btn-danger') - .contains('Delete').click(); + cy.contains('tr', 'test-project') + .contains('button', 'Delete').click(); + cy.contains('jhi-project-delete-dialog button.btn-danger', 'Delete').click(); }); }); diff --git a/src/test/javascript/e2e/cypress/integration/entities/source-data.spec.ts b/src/test/javascript/e2e/cypress/integration/entities/source-data.spec.ts index 89c5b3323..f80b0ff42 100644 --- a/src/test/javascript/e2e/cypress/integration/entities/source-data.spec.ts +++ b/src/test/javascript/e2e/cypress/integration/entities/source-data.spec.ts @@ -5,7 +5,7 @@ describe('SourceData e2e test', () => { beforeEach(() => { login(); navBarPage.clickOnEntityMenu(); - cy.get('[routerLink="source-data"]').first().click(); + navBarPage.clickOnEntity('source-data'); }); it('should load SourceData', () => { @@ -23,29 +23,24 @@ describe('SourceData e2e test', () => { it('should be able to create SourceData', () => { cy.get('button.create-source-data').click(); - cy.wait(3000); - - cy.get('#field_sourceDataType').type('TEST-TYPE'); - cy.get('#field_sourceDataName').type('TEST-SENSOR'); - cy.wait(3000); - cy.get('jhi-source-data-dialog').contains('Save').click(); - + cy.get('#field_sourceDataType').type('TEST_TYPE'); + cy.get('#field_sourceDataName').type('TEST_SENSOR'); + cy.contains('jhi-source-data-dialog button', 'Save').click(); + cy.get('.alert-success').first() + .should('contain', 'A new Source Data is created with identifier TEST_SENSOR'); }); it('should be able to edit SourceData', () => { - cy.wait(3000); - cy.get('td').contains('TEST-SENSOR').parents('tr') - .find('button').contains('Edit').click(); + cy.contains('tr', 'TEST_SENSOR') + .contains('button', 'Edit').click(); - cy.wait(3000); - cy.get('button.btn-primary').contains('Save').click(); + cy.contains('button.btn-primary', 'Save').click(); }); it('should be able to delete SourceData', () => { - cy.get('td').contains('TEST-SENSOR').parents('tr') - .find('button').contains('Delete').click(); + cy.contains('tr', 'TEST_SENSOR') + .contains('button', 'Delete').click(); - cy.get('jhi-source-data-delete-dialog button.btn-danger') - .contains('Delete').click(); + cy.contains('jhi-source-data-delete-dialog button.btn-danger', 'Delete').click(); }); }); diff --git a/src/test/javascript/e2e/cypress/integration/entities/source-type.spec.ts b/src/test/javascript/e2e/cypress/integration/entities/source-type.spec.ts index 87a43b5cb..88cad44c1 100644 --- a/src/test/javascript/e2e/cypress/integration/entities/source-type.spec.ts +++ b/src/test/javascript/e2e/cypress/integration/entities/source-type.spec.ts @@ -23,7 +23,6 @@ describe('SourceType e2e test', () => { it('should be able to create SourceType', () => { cy.get('button.create-source-type').click(); - cy.wait(1000); cy.get('#field_producer').type('test-producer'); cy.get('#field_model').type('test-model'); cy.get('#field_catalogVersion').type('v1'); @@ -33,11 +32,9 @@ describe('SourceType e2e test', () => { }); it('should be able to edit SourceType', () => { - cy.wait(1000); - cy.get('td').contains('test-producer').parents('tr') - .find('button').contains('Edit').click(); - cy.wait(1000); - cy.get('button.btn-primary').contains('Save').click(); + cy.contains('tr', 'test-producer') + .contains('button', 'Edit').click(); + cy.contains('button.btn-primary', 'Save').click(); }); it('should be able to delete SourceType', () => { diff --git a/src/test/javascript/e2e/cypress/integration/entities/source.spec.ts b/src/test/javascript/e2e/cypress/integration/entities/source.spec.ts index e0287b7cb..2d167052a 100644 --- a/src/test/javascript/e2e/cypress/integration/entities/source.spec.ts +++ b/src/test/javascript/e2e/cypress/integration/entities/source.spec.ts @@ -23,7 +23,6 @@ describe('Source e2e test', () => { it('should be able to create new source', () => { cy.get('button.btn-primary').contains('Create a new Source').click(); - cy.wait(1000); cy.get('[name=sourceName]').type('test-source1'); cy.get('[name=expectedSourceName]').type('A007C'); cy.get('[name=project]').select('radar'); @@ -34,9 +33,8 @@ describe('Source e2e test', () => { }); it('should be able to edit a source', () => { - cy.wait(1000); - cy.get('jhi-source tbody tr td').contains('test-source1').parents('tr') - .find('button').contains('Edit') + cy.contains('jhi-source tbody tr', 'test-source1') + .contains('button', 'Edit') .first().click(); cy.get('[name=expectedSourceName]').type('A007C9'); cy.get('button.btn-primary').contains('Save').click(); diff --git a/src/test/javascript/e2e/cypress/integration/entities/subject.spec.ts b/src/test/javascript/e2e/cypress/integration/entities/subject.spec.ts index 323820708..0563067b4 100644 --- a/src/test/javascript/e2e/cypress/integration/entities/subject.spec.ts +++ b/src/test/javascript/e2e/cypress/integration/entities/subject.spec.ts @@ -23,7 +23,6 @@ describe('Subject e2e test', () => { it('should be able to create new subject', () => { cy.get('button.btn-primary').contains('Create a new Subject').click(); - cy.wait(1000); cy.get('[name=externalId]').type('test-subject1'); cy.get('[name=project]').select('radar'); @@ -33,10 +32,8 @@ describe('Subject e2e test', () => { }); it('should be able to edit a subject', () => { - cy.wait(1000); - cy.get('jhi-subjects tbody tr td').contains('test-subject1') - .parents('tr') - .get('jhi-subjects tbody tr button').contains('Edit') + cy.contains('jhi-subjects tbody tr', 'test-subject1') + .contains('button', 'Edit') .first().click(); cy.get('[name=externalLink]').type('www.radar-base.org'); cy.get('button.btn-primary').contains('Save').click(); diff --git a/src/test/javascript/e2e/cypress/integration/entities/user-management.spec.ts b/src/test/javascript/e2e/cypress/integration/entities/user-management.spec.ts index 6654f14dd..424e140e4 100644 --- a/src/test/javascript/e2e/cypress/integration/entities/user-management.spec.ts +++ b/src/test/javascript/e2e/cypress/integration/entities/user-management.spec.ts @@ -37,22 +37,19 @@ describe('Create, edit, and delete user', () => { }); it('should be able to create new system admin user', () => { - cy.get('button.btn-primary').contains('Create an admin user').click(); - cy.wait(1000); + cy.contains('button.btn-primary', 'Create an admin user').click(); cy.get('[name=login]').type('test-sys-admin'); cy.get('[name=firstName]').type('Alice'); cy.get('[name=lastName]').type('Bob'); cy.get('[name=email]').type('alice@radarbase.org'); - cy.get('button.btn-primary').contains('Save').click(); - cy.wait(1000); + cy.contains('button.btn-primary', 'Save').click(); cy.get('jhi-user-mgmt tbody tr').should('have.length', 5); }); it('should be able to edit a user with roles', () => { - cy.get('jhi-user-mgmt tbody tr td').contains('test-user-radar') - .parents('tr') - .find('button').contains('Edit') + cy.contains('jhi-user-mgmt tbody tr', 'test-user-radar') + .contains('button', 'Edit') .first().click(); cy.get('[name=lastName]').type('Robert'); cy.get('button.btn-primary').contains('Save').click(); From c495778acb5d30733376a1fb0d486775d084823b Mon Sep 17 00:00:00 2001 From: Joris Borgdorff Date: Tue, 2 Nov 2021 14:01:41 +0100 Subject: [PATCH 110/431] Remove superfluous puppeteer package It conflicted with the AMD64 docker build. --- package.json | 1 - src/test/javascript/karma.conf.js | 2 - yarn.lock | 176 ++++++------------------------ 3 files changed, 33 insertions(+), 146 deletions(-) diff --git a/package.json b/package.json index 856820b3c..c63886f8e 100644 --- a/package.json +++ b/package.json @@ -48,7 +48,6 @@ "karma-notify-reporter": "^1.3.0", "lodash.merge": "^4.6.2", "merge-json-webpack-plugin": "^6.0.0", - "puppeteer": "^10.2.0", "rimraf": "2.6.1", "typescript": "~4.3.5", "wait-port": "^0.2.9" diff --git a/src/test/javascript/karma.conf.js b/src/test/javascript/karma.conf.js index be2484766..0e341b2d2 100644 --- a/src/test/javascript/karma.conf.js +++ b/src/test/javascript/karma.conf.js @@ -1,8 +1,6 @@ // Karma configuration file, see link for more information // https://karma-runner.github.io/1.0/config/configuration-file.html -process.env.CHROME_BIN = require('puppeteer').executablePath(); - module.exports = function (config) { config.set({ diff --git a/yarn.lock b/yarn.lock index 7e3d61172..8822cb580 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3181,7 +3181,7 @@ __metadata: languageName: node linkType: hard -"bl@npm:^4.0.3, bl@npm:^4.1.0": +"bl@npm:^4.1.0": version: 4.1.0 resolution: "bl@npm:4.1.0" dependencies: @@ -3352,7 +3352,7 @@ __metadata: languageName: node linkType: hard -"buffer@npm:^5.2.1, buffer@npm:^5.4.3, buffer@npm:^5.5.0": +"buffer@npm:^5.4.3, buffer@npm:^5.5.0": version: 5.7.1 resolution: "buffer@npm:5.7.1" dependencies: @@ -3592,13 +3592,6 @@ __metadata: languageName: node linkType: hard -"chownr@npm:^1.1.1": - version: 1.1.4 - resolution: "chownr@npm:1.1.4" - checksum: 115648f8eb38bac5e41c3857f3e663f9c39ed6480d1349977c4d96c95a47266fcacc5a5aabf3cb6c481e22d72f41992827db47301851766c4fd77ac21a4f081d - languageName: node - linkType: hard - "chownr@npm:^2.0.0": version: 2.0.0 resolution: "chownr@npm:2.0.0" @@ -4463,18 +4456,6 @@ __metadata: languageName: node linkType: hard -"debug@npm:4.3.1": - version: 4.3.1 - resolution: "debug@npm:4.3.1" - dependencies: - ms: 2.1.2 - peerDependenciesMeta: - supports-color: - optional: true - checksum: 2c3352e37d5c46b0d203317cd45ea0e26b2c99f2d9dfec8b128e6ceba90dfb65425f5331bf3020fe9929d7da8c16758e737f4f3bfc0fce6b8b3d503bae03298b - languageName: node - linkType: hard - "debug@npm:^3.1.0, debug@npm:^3.1.1, debug@npm:^3.2.6": version: 3.2.7 resolution: "debug@npm:3.2.7" @@ -4641,13 +4622,6 @@ __metadata: languageName: node linkType: hard -"devtools-protocol@npm:0.0.901419": - version: 0.0.901419 - resolution: "devtools-protocol@npm:0.0.901419" - checksum: de68331ddfb35b828ad743d939d9237e122f76d4a6cbf1e64f6c6d8e9c2c5cc65a5f1994db0fead90192cca1aa9dbed2ea822a7da7b58104cd041a90e215b9a3 - languageName: node - linkType: hard - "di@npm:^0.0.1": version: 0.0.1 resolution: "di@npm:0.0.1" @@ -4815,7 +4789,7 @@ __metadata: languageName: node linkType: hard -"end-of-stream@npm:^1.1.0, end-of-stream@npm:^1.4.1": +"end-of-stream@npm:^1.1.0": version: 1.4.4 resolution: "end-of-stream@npm:1.4.4" dependencies: @@ -5630,13 +5604,6 @@ __metadata: languageName: node linkType: hard -"fs-constants@npm:^1.0.0": - version: 1.0.0 - resolution: "fs-constants@npm:1.0.0" - checksum: 18f5b718371816155849475ac36c7d0b24d39a11d91348cfcb308b4494824413e03572c403c86d3a260e049465518c4f0d5bd00f0371cdfcad6d4f30a85b350d - languageName: node - linkType: hard - "fs-extra@npm:^8.1.0": version: 8.1.0 resolution: "fs-extra@npm:8.1.0" @@ -7540,7 +7507,6 @@ __metadata: ng-qrcode: ^5.2.0 ngx-cookie-service: ^12.0.3 ngx-webstorage: ^8.0.0 - puppeteer: ^10.2.0 rimraf: 2.6.1 rxjs: ~6.6.0 tslib: ^2.3.0 @@ -8099,13 +8065,6 @@ __metadata: languageName: node linkType: hard -"node-fetch@npm:2.6.1": - version: 2.6.1 - resolution: "node-fetch@npm:2.6.1" - checksum: 91075bedd57879117e310fbcc36983ad5d699e522edb1ebcdc4ee5294c982843982652925c3532729fdc86b2d64a8a827797a745f332040d91823c8752ee4d7c - languageName: node - linkType: hard - "node-forge@npm:^0.10.0": version: 0.10.0 resolution: "node-forge@npm:0.10.0" @@ -8866,15 +8825,6 @@ __metadata: languageName: node linkType: hard -"pkg-dir@npm:4.2.0, pkg-dir@npm:^4.1.0": - version: 4.2.0 - resolution: "pkg-dir@npm:4.2.0" - dependencies: - find-up: ^4.0.0 - checksum: 9863e3f35132bf99ae1636d31ff1e1e3501251d480336edb1c211133c8d58906bed80f154a1d723652df1fda91e01c7442c2eeaf9dc83157c7ae89087e43c8d6 - languageName: node - linkType: hard - "pkg-dir@npm:^3.0.0": version: 3.0.0 resolution: "pkg-dir@npm:3.0.0" @@ -8884,6 +8834,15 @@ __metadata: languageName: node linkType: hard +"pkg-dir@npm:^4.1.0": + version: 4.2.0 + resolution: "pkg-dir@npm:4.2.0" + dependencies: + find-up: ^4.0.0 + checksum: 9863e3f35132bf99ae1636d31ff1e1e3501251d480336edb1c211133c8d58906bed80f154a1d723652df1fda91e01c7442c2eeaf9dc83157c7ae89087e43c8d6 + languageName: node + linkType: hard + "pngjs@npm:^3.3.0": version: 3.4.0 resolution: "pngjs@npm:3.4.0" @@ -9708,13 +9667,6 @@ __metadata: languageName: node linkType: hard -"progress@npm:2.0.1": - version: 2.0.1 - resolution: "progress@npm:2.0.1" - checksum: 46d1f5a5df9c331f6402d856a4239f90a8fde8f9fcff0426ceb4edca7a7a3b4256d83adcfb3d4176a1dd239536a43e547bd0f325f5e8c4ac2881169361028426 - languageName: node - linkType: hard - "promise-inflight@npm:^1.0.1": version: 1.0.1 resolution: "promise-inflight@npm:1.0.1" @@ -9742,13 +9694,6 @@ __metadata: languageName: node linkType: hard -"proxy-from-env@npm:1.1.0": - version: 1.1.0 - resolution: "proxy-from-env@npm:1.1.0" - checksum: ed7fcc2ba0a33404958e34d95d18638249a68c430e30fcb6c478497d72739ba64ce9810a24f53a7d921d0c065e5b78e3822759800698167256b04659366ca4d4 - languageName: node - linkType: hard - "prr@npm:~1.0.1": version: 1.0.1 resolution: "prr@npm:1.0.1" @@ -9787,26 +9732,6 @@ __metadata: languageName: node linkType: hard -"puppeteer@npm:^10.2.0": - version: 10.2.0 - resolution: "puppeteer@npm:10.2.0" - dependencies: - debug: 4.3.1 - devtools-protocol: 0.0.901419 - extract-zip: 2.0.1 - https-proxy-agent: 5.0.0 - node-fetch: 2.6.1 - pkg-dir: 4.2.0 - progress: 2.0.1 - proxy-from-env: 1.1.0 - rimraf: 3.0.2 - tar-fs: 2.0.0 - unbzip2-stream: 1.3.3 - ws: 7.4.6 - checksum: 2722adc087a01a3797948f9ec0bd98f4c6d5aaf8f5fed8c0407259ccfeaaa4c25c6bd27927aca3db58e6de03456f5556806a1cce322a7529a7624eafb87321ab - languageName: node - linkType: hard - "qjobs@npm:^1.2.0": version: 1.2.0 resolution: "qjobs@npm:1.2.0" @@ -9935,7 +9860,7 @@ __metadata: languageName: node linkType: hard -"readable-stream@npm:^3.0.6, readable-stream@npm:^3.1.1, readable-stream@npm:^3.4.0": +"readable-stream@npm:^3.0.6, readable-stream@npm:^3.4.0": version: 3.6.0 resolution: "readable-stream@npm:3.6.0" dependencies: @@ -10270,25 +10195,25 @@ __metadata: languageName: node linkType: hard -"rimraf@npm:3.0.2, rimraf@npm:^3.0.0, rimraf@npm:^3.0.2": - version: 3.0.2 - resolution: "rimraf@npm:3.0.2" +"rimraf@npm:^2.6.3": + version: 2.7.1 + resolution: "rimraf@npm:2.7.1" dependencies: glob: ^7.1.3 bin: - rimraf: bin.js - checksum: 87f4164e396f0171b0a3386cc1877a817f572148ee13a7e113b238e48e8a9f2f31d009a92ec38a591ff1567d9662c6b67fd8818a2dbbaed74bc26a87a2a4a9a0 + rimraf: ./bin.js + checksum: cdc7f6eacb17927f2a075117a823e1c5951792c6498ebcce81ca8203454a811d4cf8900314154d3259bb8f0b42ab17f67396a8694a54cae3283326e57ad250cd languageName: node linkType: hard -"rimraf@npm:^2.6.3": - version: 2.7.1 - resolution: "rimraf@npm:2.7.1" +"rimraf@npm:^3.0.0, rimraf@npm:^3.0.2": + version: 3.0.2 + resolution: "rimraf@npm:3.0.2" dependencies: glob: ^7.1.3 bin: - rimraf: ./bin.js - checksum: cdc7f6eacb17927f2a075117a823e1c5951792c6498ebcce81ca8203454a811d4cf8900314154d3259bb8f0b42ab17f67396a8694a54cae3283326e57ad250cd + rimraf: bin.js + checksum: 87f4164e396f0171b0a3386cc1877a817f572148ee13a7e113b238e48e8a9f2f31d009a92ec38a591ff1567d9662c6b67fd8818a2dbbaed74bc26a87a2a4a9a0 languageName: node linkType: hard @@ -11215,31 +11140,6 @@ __metadata: languageName: node linkType: hard -"tar-fs@npm:2.0.0": - version: 2.0.0 - resolution: "tar-fs@npm:2.0.0" - dependencies: - chownr: ^1.1.1 - mkdirp: ^0.5.1 - pump: ^3.0.0 - tar-stream: ^2.0.0 - checksum: f15079cd7e5b38b7982d3a1c2f0cf0eac58e1c622f0191b12d90440a4e97ea0f63bf31467f6ad9cb5ffdd47d9fc251682f9456e36c6d5e2488f49f14a9d28a75 - languageName: node - linkType: hard - -"tar-stream@npm:^2.0.0": - version: 2.2.0 - resolution: "tar-stream@npm:2.2.0" - dependencies: - bl: ^4.0.3 - end-of-stream: ^1.4.1 - fs-constants: ^1.0.0 - inherits: ^2.0.3 - readable-stream: ^3.1.1 - checksum: 699831a8b97666ef50021c767f84924cfee21c142c2eb0e79c63254e140e6408d6d55a065a2992548e72b06de39237ef2b802b99e3ece93ca3904a37622a66f3 - languageName: node - linkType: hard - "tar@npm:^6.0.2, tar@npm:^6.1.0, tar@npm:^6.1.2": version: 6.1.11 resolution: "tar@npm:6.1.11" @@ -11558,16 +11458,6 @@ __metadata: languageName: node linkType: hard -"unbzip2-stream@npm:1.3.3": - version: 1.3.3 - resolution: "unbzip2-stream@npm:1.3.3" - dependencies: - buffer: ^5.2.1 - through: ^2.3.8 - checksum: 5ae179e60971023c1ee2be2d3f02dd81e4dae8c506fe2367f63a2c126073c2f08c101005d328c34b13cb1d691627e4c6c528d1e273ea3a3dda15d906bac66391 - languageName: node - linkType: hard - "unicode-canonical-property-names-ecmascript@npm:^1.0.4": version: 1.0.4 resolution: "unicode-canonical-property-names-ecmascript@npm:1.0.4" @@ -12116,7 +12006,16 @@ __metadata: languageName: node linkType: hard -"ws@npm:7.4.6, ws@npm:~7.4.2": +"ws@npm:^6.2.1": + version: 6.2.2 + resolution: "ws@npm:6.2.2" + dependencies: + async-limiter: ~1.0.0 + checksum: aec3154ec51477c094ac2cb5946a156e17561a581fa27005cbf22c53ac57f8d4e5f791dd4bbba6a488602cb28778c8ab7df06251d590507c3c550fd8ebeee949 + languageName: node + linkType: hard + +"ws@npm:~7.4.2": version: 7.4.6 resolution: "ws@npm:7.4.6" peerDependencies: @@ -12131,15 +12030,6 @@ __metadata: languageName: node linkType: hard -"ws@npm:^6.2.1": - version: 6.2.2 - resolution: "ws@npm:6.2.2" - dependencies: - async-limiter: ~1.0.0 - checksum: aec3154ec51477c094ac2cb5946a156e17561a581fa27005cbf22c53ac57f8d4e5f791dd4bbba6a488602cb28778c8ab7df06251d590507c3c550fd8ebeee949 - languageName: node - linkType: hard - "y18n@npm:^4.0.0": version: 4.0.3 resolution: "y18n@npm:4.0.3" From da7afaec70da5656913a12474d28dcc3e078342a Mon Sep 17 00:00:00 2001 From: Peyman Mohtashami Date: Tue, 2 Nov 2021 14:54:24 +0100 Subject: [PATCH 111/431] Add clear filter --- .../app/shared/subject/subject.component.html | 8 ++++++++ .../webapp/app/shared/subject/subject.component.ts | 14 ++++++++++++++ src/main/webapp/i18n/en/subject.json | 1 + 3 files changed, 23 insertions(+) diff --git a/src/main/webapp/app/shared/subject/subject.component.html b/src/main/webapp/app/shared/subject/subject.component.html index d2de1d229..fc76df524 100644 --- a/src/main/webapp/app/shared/subject/subject.component.html +++ b/src/main/webapp/app/shared/subject/subject.component.html @@ -71,6 +71,14 @@

    [translate]="'managementPortalApp.subject.filter.applyButton'" > + +
    diff --git a/src/main/webapp/app/shared/subject/subject.component.ts b/src/main/webapp/app/shared/subject/subject.component.ts index e64304682..be5958a4a 100644 --- a/src/main/webapp/app/shared/subject/subject.component.ts +++ b/src/main/webapp/app/shared/subject/subject.component.ts @@ -243,6 +243,18 @@ export class SubjectComponent implements OnInit, OnDestroy, OnChanges { this.loadSubjects(); } + clearFilter() { + this.filterSubjectExternalId = ''; + this.filterSubjectId = ''; + this.filterSubjectHumanReadableId = ''; + this.filterDateOfBirth = ''; + this.filterPersonName = ''; + this.filterEnrollmentDateFrom = ''; + this.filterEnrollmentDateTo = ''; + this.filterSubjectGroup = ''; + this.applyFilter(); + } + loadMore() { this.page = this.page + 1; this.transition(); @@ -307,4 +319,6 @@ export class SubjectComponent implements OnInit, OnDestroy, OnChanges { }).then(() => this.loadSubjects()); } } + + } diff --git a/src/main/webapp/i18n/en/subject.json b/src/main/webapp/i18n/en/subject.json index f5f76795a..dbcb14ecf 100644 --- a/src/main/webapp/i18n/en/subject.json +++ b/src/main/webapp/i18n/en/subject.json @@ -19,6 +19,7 @@ "filter": { "title": "Filter", "applyButton": "Apply filter", + "clearButton": "Clear filter", "advancedFilter": "Advanced Filter", "from": "From", "to": "To" From 7e5514c0048399e2ca5c6169545cb9d4666d09ca Mon Sep 17 00:00:00 2001 From: Peyman Mohtashami Date: Tue, 2 Nov 2021 15:06:23 +0100 Subject: [PATCH 112/431] Change enrollment filter fields from date-time to date --- src/main/webapp/app/shared/subject/subject.component.html | 4 ++-- src/main/webapp/app/shared/subject/subject.component.ts | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/webapp/app/shared/subject/subject.component.html b/src/main/webapp/app/shared/subject/subject.component.html index fc76df524..a3e73b0a3 100644 --- a/src/main/webapp/app/shared/subject/subject.component.html +++ b/src/main/webapp/app/shared/subject/subject.component.html @@ -43,13 +43,13 @@

    - +
    - +
    - +
    +
    + +
    - -
    - +
    +
    - - -
    - -
    +
    -
    - -
    +
    - - -
    - +
    + + + + + +
    +
    + +
    + +
    + +
    + +
    + +
    + +
    + +
    + +
    +
    + The date is not valid. +
    +
    + +
    + +
    + +
    +
    + The date is not valid or it is after From Date. +
    +
    + +
    + +
    + +
    + +
    + +
    + +
    +
    +
    -
    - +
    -
    @@ -142,7 +204,43 @@

    - +
    + Filters: +
    + Subject ID: {{filters.subjectId}} + +
    +
    + External ID: {{filters.externalId}} + +
    +
    + Person Name: {{filters.personName}} + +
    +
    + Human Readable ID: {{filters.humanReadableId}} + +
    +
    + Date of Birth: {{appliedFilters.dateOfBirth}} + +
    +
    + Enrollment Date From: {{appliedFilters.enrollmentDateFrom}} + +
    +
    + Enrollment Date To: {{appliedFilters.enrollmentDateTo}} + +
    +
    + Group: {{appliedFilters.group}} + +
    +
    diff --git a/src/main/webapp/app/shared/subject/subject.component.scss b/src/main/webapp/app/shared/subject/subject.component.scss index 7e2b5702d..cbd7c65bd 100644 --- a/src/main/webapp/app/shared/subject/subject.component.scss +++ b/src/main/webapp/app/shared/subject/subject.component.scss @@ -3,12 +3,14 @@ display: flex; } .subject-filter { - flex-grow: 0; - max-width: 200px; + flex-shrink: 0; + width: 250px; display: flex; flex-direction: column; - padding: 8px 16px; + padding: 0; border-right: 1px solid #dadada; + font-size: 14px; + font-weight: bold; } .subject-filter input { max-width: 100%; @@ -20,6 +22,49 @@ width: 100%; } +.subject-filter .form-group { + margin: 4px 0; + padding: 4px 8px; + background: #f9f9f9; +} + +.subject-filter .subject-filter-header{ + display: flex; + justify-content: space-between; + align-items: center; + padding: 0 8px; + margin-bottom: 8px; + h5 { + margin: 0; + } +} + +.advanced-filter{ + margin-top: 16px; + border-top: 1px solid #ccc; +} + +.advanced-filter-header{ + display: flex; + justify-content: space-between; + align-items: center; + padding: 16px 8px; + border-bottom: 1px solid #ccc; + cursor: pointer; + margin-bottom: 16px; +} + +.field-enrollment-date{ + border-top: 1px solid #eee; + border-bottom: 1px solid #eee; + padding: 8px 0; + margin: 16px 0; + background-color: #f9f9f9; +} + +.field-enrollment-date__header{ + padding: 0 8px; +} .subject-wrapper > section { flex-grow: 1; @@ -27,81 +72,89 @@ } .subject-sorting-action { - margin-right: 8px; - margin-bottom: 8px; +margin-right: 8px; +margin-bottom: 8px; } .subject-row { - display: flex; - justify-content: space-between; - padding: 8px 16px; +display: flex; +justify-content: space-between; +padding: 8px 16px; } .subject-row:nth-child(even) { - border-top: #eceeef; - background-color: #eceeef; +border-top: #eceeef; +background-color: #eceeef; } .subject-row__content { - display: flex; - flex-grow: 1; - flex-wrap: wrap; +display: flex; +flex-grow: 1; +flex-wrap: wrap; } .subject-row__content > * { - flex-basis: 80px; - flex-grow: 1; +flex-basis: 80px; +flex-grow: 1; } .subject-row__field-label { - position: relative; - font-weight: bold; - font-size: 12px; - line-height: 12px; - color: #5e5e5e; +position: relative; +font-weight: bold; +font-size: 12px; +line-height: 12px; +color: #5e5e5e; } .subject-list-actions { - margin-bottom: 8px; +margin-bottom: 8px; } .subject-list-actions > :not(:first-child) { - margin-left: 8px; +margin-left: 8px; } .subject-row__select-row { - display: flex; - flex-direction: column; - flex-grow: 0; - padding-top: 28px; - margin-right: 16px; +display: flex; +flex-direction: column; +flex-grow: 0; +padding-top: 28px; +margin-right: 16px; } .subject-row__actions { - display: flex; - flex-direction: column; - flex-basis: unset; - flex-grow: 0 !important; - margin-left: 16px; +display: flex; +flex-direction: column; +flex-basis: unset; +flex-grow: 0 !important; +margin-left: 16px; } .subject-row__actions > *:not(:last-child) { - width: 100%; - margin-bottom: 4px; +width: 100%; +margin-bottom: 4px; } .subject-pagination { - display: flex; - margin-top: 8px; +display: flex; +margin-top: 8px; } .subject-pagination > * { - text-align: center; - flex-grow: 1; - padding: 16px; +text-align: center; +flex-grow: 1; +padding: 16px; } .subject-pagination__all-loaded { - color: #dadada; - cursor: not-allowed; +color: #dadada; +cursor: not-allowed; } .subject-pagination__load-more:hover { - background: rgba(169, 209, 255, 0.3); +background: rgba(169, 209, 255, 0.3); } .subject-pagination__load-more:active { - background: rgba(0, 120, 255, 0.15); +background: rgba(0, 120, 255, 0.15); +} + +button.calendar, button.calendar:active { +width: 2.75rem; +background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACIAAAAcCAYAAAAEN20fAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAAOxAAADsQBlSsOGwAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAAEUSURBVEiJ7ZQxToVAEIY/YCHGxN6XGOIpnpaEsBSeQC9ArZbm9TZ6ADyBNzAhQGGl8Riv4BLAWAgmkpBYkH1b8FWT2WK/zJ8ZJ4qiI6XUI3ANnGKWBnht2/ZBDRK3hgVGNsCd7/ui+JkEIrKtqurLpEWaphd933+IyI3LEIdpCYCiKD6HcuOa/nwOa0ScJEnk0BJg0UTUWJRl6RxCYEzEmomsIlPU3IPW+grIAbquy+q6fluy/28RIBeRMwDXdXMgXLj/B2uimRXpui4D9sBeRLKl+1N+L+t6RwbWrZliTTTr1oxYtzVWiTQAcRxvTX+eJMnlUDaO1vpZRO5NS0x48sIwfPc87xg4B04MCzQi8hIEwe4bl1DnFMCN2zsAAAAASUVORK5CYII=') !important; +background-repeat: no-repeat; +background-size: 23px; +background-position: center; } diff --git a/src/main/webapp/app/shared/subject/subject.component.ts b/src/main/webapp/app/shared/subject/subject.component.ts index 333e9bcaf..76e53d0a7 100644 --- a/src/main/webapp/app/shared/subject/subject.component.ts +++ b/src/main/webapp/app/shared/subject/subject.component.ts @@ -10,7 +10,7 @@ import { import { HttpErrorResponse, HttpResponse } from '@angular/common/http'; import { ActivatedRoute, Router } from '@angular/router'; import { BehaviorSubject, Observable, Subscription } from 'rxjs'; -import { map } from 'rxjs/operators'; +import {debounceTime, distinctUntilChanged, map} from 'rxjs/operators'; import {Group, GroupService, ITEMS_PER_PAGE, Project} from '..'; import { Subject } from './subject.model'; @@ -23,6 +23,7 @@ import { PagingParams } from '../commons'; import { AlertService } from '../util/alert.service'; import { EventManager } from '../util/event-manager.service'; import { parseLinks } from '../util/parse-links-util'; +import {NgbCalendar, NgbDate, NgbDateParserFormatter} from "@ng-bootstrap/ng-bootstrap"; @Component({ selector: 'jhi-subjects', @@ -52,14 +53,30 @@ export class SubjectComponent implements OnInit, OnDestroy, OnChanges { routeData: any; previousPage: any; - filterSubjectExternalId = ''; - filterSubjectId = ''; - filterSubjectHumanReadableId = ''; - filterDateOfBirth = ''; - filterPersonName = ''; - filterEnrollmentDateFrom = ''; - filterEnrollmentDateTo = ''; - filterSubjectGroupId = ''; + filters = { + subjectId: '', + externalId: '', + humanReadableId: '', + dateOfBirth: undefined, + personName: '', + enrollmentDateFrom: undefined, + enrollmentDateTo: undefined, + groupId: '', + } + + appliedFilters = { + dateOfBirth: undefined, + enrollmentDateFrom: undefined, + enrollmentDateTo: undefined, + group: '', + } + + filterTriggerUpdate$: BehaviorSubject = new BehaviorSubject(''); + + isFilterApplied = false; + + enrollmentDateFromError = false; + enrollmentDateToError = false; isAdvancedFilterCollapsed = true; @@ -75,6 +92,8 @@ export class SubjectComponent implements OnInit, OnDestroy, OnChanges { private eventManager: EventManager, private activatedRoute: ActivatedRoute, private router: Router, + private calendar: NgbCalendar, + public formatter: NgbDateParserFormatter ) { this.subjects = []; this.itemsPerPage = ITEMS_PER_PAGE; @@ -88,6 +107,11 @@ export class SubjectComponent implements OnInit, OnDestroy, OnChanges { this.ascending = params.ascending; this.predicate = params.predicate; }); + + this.filterTriggerUpdate$.pipe( + debounceTime(300), + distinctUntilChanged() + ).subscribe(() => this.applyFilter()); } loadSubjects() { @@ -177,32 +201,67 @@ export class SubjectComponent implements OnInit, OnDestroy, OnChanges { get queryFilterParams(): SubjectFilterParams { const params = { - login: this.filterSubjectId.trim() || undefined, - externalId: this.filterSubjectExternalId.trim() || undefined, - personName: this.filterPersonName.trim() || undefined, - humanReadableIdentifier: this.filterSubjectHumanReadableId.trim() || undefined, - groupId: this.filterSubjectGroupId, + login: this.filters.subjectId.trim() || undefined, + externalId: this.filters.externalId.trim() || undefined, + personName: this.filters.personName.trim() || undefined, + humanReadableIdentifier: this.filters.humanReadableId.trim() || undefined, + groupId: this.filters.groupId, dateOfBirth: undefined, enrollmentDate: undefined, }; - let enrollmentDateFrom = this.filterEnrollmentDateFrom.trim(); - let enrollmentDateTo = this.filterEnrollmentDateTo.trim(); - if (enrollmentDateFrom || enrollmentDateTo) { + + const filteredGroup = this.groups?.filter(g => g.id.toString() == this.filters.groupId)[0]; + this.appliedFilters.group = filteredGroup? filteredGroup.name : ''; + + if(this.isRange(this.filters.enrollmentDateFrom, this.filters.enrollmentDateTo)){ + let enrollmentDateFrom = this.formatter.format(this.filters.enrollmentDateFrom); //this.formatDate(this.filters.enrollmentDateFrom); + let enrollmentDateTo = this.formatter.format(this.filters.enrollmentDateTo); + this.appliedFilters.enrollmentDateFrom = enrollmentDateFrom; + this.appliedFilters.enrollmentDateTo = enrollmentDateTo; const timeZone = Intl.DateTimeFormat().resolvedOptions().timeZone; params.enrollmentDate = { from: enrollmentDateFrom ? enrollmentDateFrom + 'T00:00' + '[' + timeZone + ']' : undefined, to: enrollmentDateTo ? enrollmentDateTo + 'T23:59' + '[' + timeZone + ']' : undefined, }; } - if (this.filterDateOfBirth) { + if (this.filters.dateOfBirth && this.calendar.isValid(NgbDate.from(this.filters.dateOfBirth))){ + const dateOfBirth = this.formatter.format(this.filters.dateOfBirth); + this.appliedFilters.dateOfBirth = dateOfBirth; params.dateOfBirth = { - is: this.filterDateOfBirth, + is: dateOfBirth, }; } return params; } + isRange(from: NgbDate, to: NgbDate): boolean { + if(from && !this.calendar.isValid(NgbDate.from(from))){ + this.enrollmentDateFromError = true; + return false; + } + if(to && !this.calendar.isValid(NgbDate.from(to))){ + this.enrollmentDateToError = true; + return false; + } + if(from && to) { + const dateFrom: NgbDate = new NgbDate(from.year, from.month, from.day); + const dateTo: NgbDate = new NgbDate(to.year, to.month, to.day); + if(dateTo.equals(dateFrom) || dateTo.after(dateFrom)){ + this.enrollmentDateFromError = false; + this.enrollmentDateToError = false; + return true; + } + this.enrollmentDateFromError = false; + this.enrollmentDateToError = true; + return false; + } else { + this.enrollmentDateFromError = false; + this.enrollmentDateToError = false; + return !!(from || to); + } + } + get queryPaginationParams(): SubjectPaginationParams { const subjects = this.subjects || []; @@ -238,20 +297,49 @@ export class SubjectComponent implements OnInit, OnDestroy, OnChanges { }) } + filterChanged(text) { + this.filterTriggerUpdate$.next(text); + } + applyFilter() { + const {subjectId, externalId, personName, humanReadableId, dateOfBirth, enrollmentDateFrom, enrollmentDateTo, groupId} = this.filters; + this.isFilterApplied = !!(subjectId || externalId || personName || humanReadableId || + dateOfBirth || enrollmentDateFrom || enrollmentDateTo || groupId); this.subjects = []; this.loadSubjects(); } - clearFilter() { - this.filterSubjectExternalId = ''; - this.filterSubjectId = ''; - this.filterSubjectHumanReadableId = ''; - this.filterDateOfBirth = ''; - this.filterPersonName = ''; - this.filterEnrollmentDateFrom = ''; - this.filterEnrollmentDateTo = ''; - this.filterSubjectGroupId = ''; + clearFilter(filterName: string){ + this.filters[filterName] = ''; + this.applyFilter(); + } + + clearDateFilter(filterName: string) { + this.appliedFilters[filterName] = undefined; + this.filters[filterName] = undefined; + this.applyFilter(); + } + + clearSelectFilter(filterName: string){ + this.appliedFilters[filterName] = ''; + this.filters[filterName] = ''; + this.applyFilter(); + } + + clearFilters() { + this.filters.externalId = ''; + this.filters.subjectId = ''; + this.filters.humanReadableId = ''; + this.filters.personName = ''; + this.filters.groupId = ''; + this.filters.dateOfBirth = undefined; + this.filters.enrollmentDateFrom = undefined; + this.filters.enrollmentDateTo = undefined; + this.appliedFilters.group = ''; + this.appliedFilters.dateOfBirth = undefined; + this.appliedFilters.enrollmentDateFrom = undefined; + this.appliedFilters.enrollmentDateTo = undefined; + this.applyFilter(); } @@ -319,6 +407,4 @@ export class SubjectComponent implements OnInit, OnDestroy, OnChanges { }).then(() => this.loadSubjects()); } } - - } From 9a0d5491f986691d53925d8b72605063ebe221af Mon Sep 17 00:00:00 2001 From: Peyman Mohtashami Date: Fri, 5 Nov 2021 14:02:55 +0100 Subject: [PATCH 145/431] Fix e2e tests --- .../group/group-delete-dialog.component.ts | 1 - .../cypress/integration/entities/group.spec.ts | 12 +++--------- .../integration/entities/subject.spec.ts | 17 ++--------------- 3 files changed, 5 insertions(+), 25 deletions(-) diff --git a/src/main/webapp/app/shared/group/group-delete-dialog.component.ts b/src/main/webapp/app/shared/group/group-delete-dialog.component.ts index bacd16c1f..2d6bbfb2c 100644 --- a/src/main/webapp/app/shared/group/group-delete-dialog.component.ts +++ b/src/main/webapp/app/shared/group/group-delete-dialog.component.ts @@ -31,7 +31,6 @@ export class GroupDeleteDialogComponent { () => { this.eventManager.broadcast({name: 'groupListModification', content: null}); this.activeModal.dismiss(true); - window.history.back(); } ); } diff --git a/src/test/javascript/e2e/cypress/integration/entities/group.spec.ts b/src/test/javascript/e2e/cypress/integration/entities/group.spec.ts index 83ebb6478..37de47b17 100644 --- a/src/test/javascript/e2e/cypress/integration/entities/group.spec.ts +++ b/src/test/javascript/e2e/cypress/integration/entities/group.spec.ts @@ -1,19 +1,13 @@ import { login } from '../util/login'; describe('Group e2e test', () => { - before(() => { - login(); - cy.visit('./'); - }); - beforeEach(() => { - cy.wait(100); - Cypress.Cookies.preserveOnce('oAtkn'); + login(); + cy.contains('jhi-home .card-title', 'radar').click(); + cy.contains('jhi-project-detail ul.nav-tabs .nav-item', 'Groups').click(); }); it('should load Groups', () => { - cy.contains('jhi-home .card-title', 'radar').click(); - cy.contains('jhi-project-detail ul.nav-tabs .nav-item', 'Groups').click(); cy.get('jhi-groups .group-row').should('have.length', 2); }); diff --git a/src/test/javascript/e2e/cypress/integration/entities/subject.spec.ts b/src/test/javascript/e2e/cypress/integration/entities/subject.spec.ts index 14759a805..f7ad9af2f 100644 --- a/src/test/javascript/e2e/cypress/integration/entities/subject.spec.ts +++ b/src/test/javascript/e2e/cypress/integration/entities/subject.spec.ts @@ -1,15 +1,12 @@ import { login } from '../util/login'; -import { clickOnEntity, clickOnEntityMenu } from "../util/nav-bar"; describe('Subject e2e test', () => { beforeEach(() => { login(); - clickOnEntityMenu(); - clickOnEntity('subject'); + cy.contains('jhi-home .card-title', 'radar').click(); }); it('should load Subjects', () => { - cy.contains('jhi-home .card-title', 'radar').click(); cy.get('jhi-subjects .subject-row').should('have.length', 20); }); @@ -40,7 +37,7 @@ describe('Subject e2e test', () => { // cy.wait(1000); cy.get('jhi-subject-dialog input[name=externalLink]').clear().type('https://radar-base-test-edited.org'); cy.contains('jhi-subject-dialog button.btn-primary', 'Save').click(); - cy.get('jhi-subjects .subject-row').should('have.length', 21); + cy.get('jhi-subjects .subject-row').should('have.length', 20); }); it('should have load subject row with subject-id, external-id, status, project, sources and attributes columns', () => { @@ -83,29 +80,23 @@ describe('Subject e2e test', () => { it('should be able to filter subjects by subject id', () => { cy.get('#field-subject-id').type('b-1'); - cy.get('#apply-filter').click(); cy.get('jhi-subjects .subject-row').should('have.length', 11); cy.get('#field-subject-id').clear(); - cy.get('#apply-filter').click(); cy.get('jhi-subjects .subject-row').should('have.length', 20); }); it('should be able to filter subjects by subject external id', () => { cy.get('#field-subject-external-id').type('test-subject-1'); - cy.get('#apply-filter').click(); cy.get('jhi-subjects .subject-row').should('have.length', 1); cy.get('#field-subject-external-id').clear(); - cy.get('#apply-filter').click(); cy.get('jhi-subjects .subject-row').should('have.length', 20); }); it('should be able to filter subjects by human readable id', () => { cy.get('#advanced-filter').click(); cy.get('#field-human-readable-id').type('Test'); - cy.get('#apply-filter').click(); cy.get('jhi-subjects .subject-row').should('have.length', 1); cy.get('#field-human-readable-id').clear(); - cy.get('#apply-filter').click(); cy.get('jhi-subjects .subject-row').should('have.length', 20); cy.get('#advanced-filter').click(); }); @@ -113,10 +104,8 @@ describe('Subject e2e test', () => { it('should be able to filter subjects by person name', () => { cy.get('#advanced-filter').click(); cy.get('#field-person-name').type('Test'); - cy.get('#apply-filter').click(); cy.get('jhi-subjects .subject-row').should('have.length', 1); cy.get('#field-person-name').clear(); - cy.get('#apply-filter').click(); cy.get('jhi-subjects .subject-row').should('have.length', 20); cy.get('#advanced-filter').click(); }); @@ -126,10 +115,8 @@ describe('Subject e2e test', () => { it('should be able to filter subjects by date of birth', () => { cy.get('#advanced-filter').click(); cy.get('#field_date_of_birth').type('1980-01-01'); - cy.get('#apply-filter').click(); cy.get('jhi-subjects .subject-row').should('have.length', 1); cy.get('#field_date_of_birth').clear(); - cy.get('#apply-filter').click(); cy.get('jhi-subjects .subject-row').should('have.length', 20); cy.get('#advanced-filter').click(); }); From c5affb88bd82563cf2d18070f78941d19f92681d Mon Sep 17 00:00:00 2001 From: Peyman Mohtashami Date: Mon, 8 Nov 2021 12:54:02 +0100 Subject: [PATCH 146/431] Add delay in e2e test --- .../e2e/cypress/integration/entities/subject.spec.ts | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/test/javascript/e2e/cypress/integration/entities/subject.spec.ts b/src/test/javascript/e2e/cypress/integration/entities/subject.spec.ts index f7ad9af2f..1c5f9baaf 100644 --- a/src/test/javascript/e2e/cypress/integration/entities/subject.spec.ts +++ b/src/test/javascript/e2e/cypress/integration/entities/subject.spec.ts @@ -18,7 +18,6 @@ describe('Subject e2e test', () => { it('should be able to create new subject', () => { cy.get('jhi-subjects button.create-subject').click(); - // cy.wait(1000); cy.get('jhi-subject-dialog input[name=externalLink]').type('https://radar-base-test.org'); cy.get('jhi-subject-dialog input[name=externalId]').type('test-subject-1'); cy.get('jhi-subject-dialog input[name=personName]').type('Test Subject 1'); @@ -32,9 +31,8 @@ describe('Subject e2e test', () => { }); it('should be able to edit a subject', () => { - // cy.wait(1000); + cy.wait(1000); cy.contains('jhi-subjects .subject-row', 'test-subject-1').contains('button', 'Edit').click(); - // cy.wait(1000); cy.get('jhi-subject-dialog input[name=externalLink]').clear().type('https://radar-base-test-edited.org'); cy.contains('jhi-subject-dialog button.btn-primary', 'Save').click(); cy.get('jhi-subjects .subject-row').should('have.length', 20); From 750d3c56330f7f03ca8cabbaf9ca2aaf3cb5bbcf Mon Sep 17 00:00:00 2001 From: aykl Date: Mon, 8 Nov 2021 13:42:28 +0100 Subject: [PATCH 147/431] AddSubjectsToGroup Dialog added --- .../webapp/app/shared/group/group.service.ts | 18 ++-- .../add-subjects-to-group-dialog.component.ts | 85 +++++++++++++++++++ .../app/shared/subject/subject.component.html | 3 +- .../app/shared/subject/subject.component.ts | 12 ++- .../app/shared/subject/subject.module.ts | 4 + 5 files changed, 114 insertions(+), 8 deletions(-) create mode 100644 src/main/webapp/app/shared/subject/add-subjects-to-group-dialog.component.ts diff --git a/src/main/webapp/app/shared/group/group.service.ts b/src/main/webapp/app/shared/group/group.service.ts index 5cde24abb..6263a5500 100644 --- a/src/main/webapp/app/shared/group/group.service.ts +++ b/src/main/webapp/app/shared/group/group.service.ts @@ -1,8 +1,8 @@ import { Injectable } from '@angular/core'; import { HttpClient } from '@angular/common/http'; import { Observable } from 'rxjs'; +import { map } from "rxjs/operators"; import { Group } from "./group.model"; -import {map} from "rxjs/operators"; @Injectable({ providedIn: 'root' }) export class GroupService { @@ -23,11 +23,8 @@ export class GroupService { find(id: number, projectName: string): Observable { return this.list(projectName).pipe( - map(groups => { - console.log(groups, id) - return groups.filter(g => g.id == id)[0] - }) - ) + map(groups => groups.filter(g => g.id == id)[0]) + ); } create(projectName: string, group: Group): Observable { @@ -38,4 +35,13 @@ export class GroupService { delete(projectName: string, groupName: string): Observable { return this.http.delete(this.resourceUrl(projectName, groupName)); } + + addSubjectsToGroup( + projectName: string, groupName: string, + subjects: { login?: string, id?: number; }[] + ) { + let baseUrl = this.resourceUrl(projectName, groupName); + let body = [{ op: "add", value: subjects }]; + return this.http.patch(`${baseUrl}/subjects`, body); + } } diff --git a/src/main/webapp/app/shared/subject/add-subjects-to-group-dialog.component.ts b/src/main/webapp/app/shared/subject/add-subjects-to-group-dialog.component.ts new file mode 100644 index 000000000..87e611583 --- /dev/null +++ b/src/main/webapp/app/shared/subject/add-subjects-to-group-dialog.component.ts @@ -0,0 +1,85 @@ +import { Component, Input } from "@angular/core"; +import { NgbActiveModal } from "@ng-bootstrap/ng-bootstrap"; +import { tap } from "rxjs/operators"; + +import { Group } from "../group/group.model"; +import { GroupService } from "../group/group.service"; +import { AlertService } from "../util/alert.service"; +import { EventManager } from "../util/event-manager.service"; +import { Subject } from "./subject.model"; + +@Component({ + selector: 'add-subjects-to-group-dialog', + template: ` +
    +

    Add subjects to group

    + +
    +
    + +
    +
    + + +
    + ` +}) +export class AddSubjectsToGroupDialogComponent { + @Input() groups: Group[]; + @Input() projectName: string; + @Input() subjects: Subject[]; + + group: Group | null; + isSaving = false; + + constructor( + public activeModal: NgbActiveModal, + private alertService: AlertService, + private eventManager: EventManager, + private groupService: GroupService, + ) { } + + clear() { + this.activeModal.dismiss('cancel'); + } + + save() { + this.isSaving = true; + let groupName = this.group.name; + let items = this.subjects.map(s => ({ id: s.id })); + this.groupService.addSubjectsToGroup(this.projectName, groupName, items) + .pipe(tap(() => this.isSaving = false)) + .subscribe( + () => { + for (let s of this.subjects) { + this.eventManager.broadcast({ + name: 'subjectListModification', + content: { ...s, group: groupName }, + }); + } + this.activeModal.close('saved'); + }, + error => { + this.alertService.error(error.message, null, null); + }); + } +} \ No newline at end of file diff --git a/src/main/webapp/app/shared/subject/subject.component.html b/src/main/webapp/app/shared/subject/subject.component.html index 3249e285a..7705a1bc7 100644 --- a/src/main/webapp/app/shared/subject/subject.component.html +++ b/src/main/webapp/app/shared/subject/subject.component.html @@ -152,8 +152,9 @@

    (click)="selectAll(!checked)" > diff --git a/src/main/webapp/app/shared/subject/subject.component.ts b/src/main/webapp/app/shared/subject/subject.component.ts index 333e9bcaf..8153c88cd 100644 --- a/src/main/webapp/app/shared/subject/subject.component.ts +++ b/src/main/webapp/app/shared/subject/subject.component.ts @@ -9,10 +9,14 @@ import { } from '@angular/core'; import { HttpErrorResponse, HttpResponse } from '@angular/common/http'; import { ActivatedRoute, Router } from '@angular/router'; +import { NgbModal } from "@ng-bootstrap/ng-bootstrap"; import { BehaviorSubject, Observable, Subscription } from 'rxjs'; import { map } from 'rxjs/operators'; import {Group, GroupService, ITEMS_PER_PAGE, Project} from '..'; +import { + AddSubjectsToGroupDialogComponent +} from "./add-subjects-to-group-dialog.component"; import { Subject } from './subject.model'; import { SubjectService, @@ -73,6 +77,7 @@ export class SubjectComponent implements OnInit, OnDestroy, OnChanges { private groupService: GroupService, private alertService: AlertService, private eventManager: EventManager, + private modalService: NgbModal, private activatedRoute: ActivatedRoute, private router: Router, ) { @@ -304,7 +309,12 @@ export class SubjectComponent implements OnInit, OnDestroy, OnChanges { } addSelectedToGroup() { - // TODO implement function + let ids = this.setOfCheckedId; + let subjects = this.subjects.filter(s => ids.has(s.id)); + let modalRef = this.modalService.open(AddSubjectsToGroupDialogComponent); + modalRef.componentInstance.groups = this.groups; + modalRef.componentInstance.projectName = this.project.projectName; + modalRef.componentInstance.subjects = subjects; } transition() { diff --git a/src/main/webapp/app/shared/subject/subject.module.ts b/src/main/webapp/app/shared/subject/subject.module.ts index 51cda75ab..d81ab518d 100644 --- a/src/main/webapp/app/shared/subject/subject.module.ts +++ b/src/main/webapp/app/shared/subject/subject.module.ts @@ -17,6 +17,9 @@ import { SubjectRevisionListComponent, subjectRoute, } from './'; +import { + AddSubjectsToGroupDialogComponent +} from "./add-subjects-to-group-dialog.component"; import { SubjectSourceAssignerDialogComponent, SubjectSourceAssignerPopupComponent, @@ -34,6 +37,7 @@ const ENTITY_STATES = [ QrCodeModule, ], declarations: [ + AddSubjectsToGroupDialogComponent, SubjectComponent, SubjectDetailComponent, SubjectRevisionComponent, From 5ebfc3f69584b32b2b2bd6402cb398ac6113d962 Mon Sep 17 00:00:00 2001 From: Peyman Mohtashami Date: Mon, 8 Nov 2021 14:24:52 +0100 Subject: [PATCH 148/431] Add translations --- .../app/shared/subject/subject.component.html | 25 +++++++++---------- .../app/shared/subject/subject.component.scss | 7 ++++++ src/main/webapp/i18n/en/subject.json | 9 ++++++- src/main/webapp/i18n/nl/subject.json | 13 ++++++---- 4 files changed, 35 insertions(+), 19 deletions(-) diff --git a/src/main/webapp/app/shared/subject/subject.component.html b/src/main/webapp/app/shared/subject/subject.component.html index cb7cbb7f9..896afd715 100644 --- a/src/main/webapp/app/shared/subject/subject.component.html +++ b/src/main/webapp/app/shared/subject/subject.component.html @@ -89,7 +89,7 @@
    - The date is not valid. +
    @@ -106,7 +106,7 @@
    - The date is not valid or it is after From Date. + @@ -205,39 +205,38 @@
    - Filters: + *ngIf="isFilterApplied"> + {{ 'managementPortalApp.subject.filter.filters' | translate}}:
    - Subject ID: {{filters.subjectId}} + {{ 'managementPortalApp.subject.subjectId' | translate }}: {{filters.subjectId}}
    - External ID: {{filters.externalId}} + {{ 'managementPortalApp.subject.externalId' | translate }}: {{filters.externalId}}
    - Person Name: {{filters.personName}} + {{ 'managementPortalApp.subject.personName' | translate }}: {{filters.personName}}
    - Human Readable ID: {{filters.humanReadableId}} + {{ 'managementPortalApp.subject.humanReadableId' | translate }}: {{filters.humanReadableId}}
    - Date of Birth: {{appliedFilters.dateOfBirth}} + {{ 'managementPortalApp.subject.dateOfBirth' | translate }}: {{appliedFilters.dateOfBirth}}
    - Enrollment Date From: {{appliedFilters.enrollmentDateFrom}} + {{ 'managementPortalApp.subject.enrollmentDateFrom' | translate }}: {{appliedFilters.enrollmentDateFrom}}
    - Enrollment Date To: {{appliedFilters.enrollmentDateTo}} + {{ 'managementPortalApp.subject.enrollmentDateFrom' | translate }}: {{appliedFilters.enrollmentDateTo}}
    - Group: {{appliedFilters.group}} + {{ 'managementPortalApp.subject.group' | translate }}: {{appliedFilters.group}}
    diff --git a/src/main/webapp/app/shared/subject/subject.component.scss b/src/main/webapp/app/shared/subject/subject.component.scss index cbd7c65bd..e6a510885 100644 --- a/src/main/webapp/app/shared/subject/subject.component.scss +++ b/src/main/webapp/app/shared/subject/subject.component.scss @@ -66,6 +66,13 @@ padding: 0 8px; } +.applied-filters{ + margin: 8px 0; + display: flex; + align-items: center; + flex-wrap: wrap; +} + .subject-wrapper > section { flex-grow: 1; padding-left: 16px; diff --git a/src/main/webapp/i18n/en/subject.json b/src/main/webapp/i18n/en/subject.json index dbcb14ecf..55915ebab 100644 --- a/src/main/webapp/i18n/en/subject.json +++ b/src/main/webapp/i18n/en/subject.json @@ -18,11 +18,16 @@ }, "filter": { "title": "Filter", + "filters": "Filters", "applyButton": "Apply filter", "clearButton": "Clear filter", "advancedFilter": "Advanced Filter", "from": "From", - "to": "To" + "to": "To", + "error": { + "invalidDate": "The date is not valid.", + "invalidRange": "The date is not valid or it is after From Date." + } }, "login": "Login", "email": "Email", @@ -39,6 +44,8 @@ "createdDate": "Created Date", "dateOfBirth": "Date of Birth", "enrollmentDate": "Enrollment Date", + "enrollmentDateFrom": "Enrollment Date From", + "enrollmentDateTo": "Enrollment Date To", "lastModifiedBy": "Last Modified By", "lastModifiedDate": "Last Modified Date", "personName": "Name", diff --git a/src/main/webapp/i18n/nl/subject.json b/src/main/webapp/i18n/nl/subject.json index c013ad247..674cd04ea 100644 --- a/src/main/webapp/i18n/nl/subject.json +++ b/src/main/webapp/i18n/nl/subject.json @@ -18,19 +18,21 @@ }, "filter": { "title": "Filter", + "filters": "Filters", "applyButton": "Filter toepassen", "clearButton": "Filters wissen", "from": "Vanaf", "to": "Tot en met", - "clearButton": "Wis filters", - "advancedFilter": "Uitgebreid filter" + "advancedFilter": "Uitgebreid filter", + "error": { + "invalidDate": "De datum is niet geldig.", + "invalidRange": "De datum is niet geldig of ligt na de Van-datum." + } }, "login": "Login", "email": "E-mail", "externalLink": "Externe link", "externalId": "Extern ID", - "name": "Naam", - "dob": "Geboortedatum", "humanReadableId": "Leesbare ID", "enrolmentDate": "Inschrijvingsdatum", "removed": "Verwijderd", @@ -42,6 +44,8 @@ "createdDate": "Aanmaakdatum", "dateOfBirth": "Geboortedatum", "enrollmentDate": "Inschrijvingsdatum", + "enrollmentDateFrom": "Inschrijvingsdatum Vanaf", + "enrollmentDateTo": "Inschrijvingsdatum Tot", "lastModifiedBy": "Laatst aangepast door", "lastModifiedDate": "Laatst aangepaste datum", "personName": "Naam", @@ -118,5 +122,4 @@ "activeParticipantProjectNotFound": "Het subject neemt niet deel aan een project", "sourceTypeNotProvided" : "De opgegeven eigenschappen van het source-type zijn incompleet." } - } From 7e0aabb798f750ef24c99dd79d80018f69435344 Mon Sep 17 00:00:00 2001 From: aykl Date: Mon, 8 Nov 2021 14:30:11 +0100 Subject: [PATCH 149/431] Enrollment Date set on Subject Creation --- .../java/org/radarbase/management/service/SubjectService.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/main/java/org/radarbase/management/service/SubjectService.java b/src/main/java/org/radarbase/management/service/SubjectService.java index 224b6c4d6..1c6311106 100644 --- a/src/main/java/org/radarbase/management/service/SubjectService.java +++ b/src/main/java/org/radarbase/management/service/SubjectService.java @@ -136,6 +136,9 @@ public SubjectDTO createSubject(SubjectDTO subjectDto) { if (subject.getSources() != null && !subject.getSources().isEmpty()) { subject.getSources().forEach(s -> s.assigned(true).subject(subject)); } + if (subject.getEnrollmentDate() == null) { + subject.setEnrollmentDate(ZonedDateTime.now()); + } sourceRepository.saveAll(subject.getSources()); return subjectMapper.subjectToSubjectReducedProjectDTO(subjectRepository.save(subject)); } From c5deb280c6052ddbe556a6895e3178f4468c4557 Mon Sep 17 00:00:00 2001 From: aykl Date: Mon, 8 Nov 2021 14:30:40 +0100 Subject: [PATCH 150/431] Group Patch Test added --- .../web/rest/vm/GroupPatchOperation.java | 8 ++ .../web/rest/GroupResourceIntTest.java | 83 +++++++++++++++++++ .../management/web/rest/TestUtil.java | 4 + 3 files changed, 95 insertions(+) diff --git a/src/main/java/org/radarbase/management/web/rest/vm/GroupPatchOperation.java b/src/main/java/org/radarbase/management/web/rest/vm/GroupPatchOperation.java index b9edd69da..9e8614504 100644 --- a/src/main/java/org/radarbase/management/web/rest/vm/GroupPatchOperation.java +++ b/src/main/java/org/radarbase/management/web/rest/vm/GroupPatchOperation.java @@ -18,10 +18,18 @@ public String getOp() { return op; } + public void setOp(String op) { + this.op = op; + } + public List getValue() { return value; } + public void setValue(List value) { + this.value = value; + } + public static class SubjectPatchValue { private Long id; private String login; diff --git a/src/test/java/org/radarbase/management/web/rest/GroupResourceIntTest.java b/src/test/java/org/radarbase/management/web/rest/GroupResourceIntTest.java index 172f77b63..2046cefb8 100644 --- a/src/test/java/org/radarbase/management/web/rest/GroupResourceIntTest.java +++ b/src/test/java/org/radarbase/management/web/rest/GroupResourceIntTest.java @@ -11,13 +11,20 @@ import org.radarbase.management.ManagementPortalTestApp; import org.radarbase.management.domain.Group; import org.radarbase.management.domain.Project; +import org.radarbase.management.domain.Subject; import org.radarbase.management.repository.GroupRepository; import org.radarbase.management.repository.ProjectRepository; +import org.radarbase.management.repository.SubjectRepository; import org.radarbase.management.security.JwtAuthenticationFilter; import org.radarbase.management.service.GroupService; +import org.radarbase.management.service.SubjectService; import org.radarbase.management.service.dto.GroupDTO; +import org.radarbase.management.service.dto.ProjectDTO; +import org.radarbase.management.service.dto.SubjectDTO; import org.radarbase.management.service.mapper.GroupMapper; +import org.radarbase.management.service.mapper.ProjectMapper; import org.radarbase.management.web.rest.errors.ExceptionTranslator; +import org.radarbase.management.web.rest.vm.GroupPatchOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.data.web.PageableHandlerMethodArgumentResolver; @@ -31,12 +38,17 @@ import org.springframework.test.web.servlet.setup.MockMvcBuilders; import javax.servlet.ServletException; + +import java.util.ArrayList; import java.util.List; +import static org.radarbase.management.service.dto.SubjectDTO.SubjectStatus.ACTIVATED; + import static org.assertj.core.api.Assertions.assertThat; import static org.hamcrest.Matchers.hasItem; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.delete; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.patch; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath; @@ -58,9 +70,18 @@ class GroupResourceIntTest { @Autowired private MappingJackson2HttpMessageConverter jacksonMessageConverter; + @Autowired + private ProjectMapper projectMapper; + @Autowired private ProjectRepository projectRepository; + @Autowired + private SubjectRepository subjectRepository; + + @Autowired + private SubjectService subjectService; + @Autowired private GroupMapper groupMapper; @@ -105,6 +126,7 @@ public void setUp() throws ServletException { @AfterEach public void tearDown() { + subjectRepository.deleteAll(); groupRepository.deleteAll(); projectRepository.delete(project); } @@ -343,4 +365,65 @@ void deleteGroupNonExistingProject() throws Exception { // Validate the database is empty assertThat(groupRepository.findAll().size()).isEqualTo(1); } + + @Test + void addSubjectsToGroup() throws Exception { + assertThat(groupRepository.findAll().size()).isEqualTo(0); + assertThat(subjectRepository.findAll().size()).isEqualTo(0); + + // Initialize the database + groupRepository.saveAndFlush(group); + + ProjectDTO projectDto = projectMapper.projectToProjectDTO(project); + + SubjectDTO sub1 = new SubjectDTO(); + sub1.setExternalLink("exLink1"); + sub1.setExternalId("exId1"); + sub1.setStatus(ACTIVATED); + sub1.setProject(projectDto); + + SubjectDTO sub2 = new SubjectDTO(); + sub1.setExternalLink("exLink2"); + sub1.setExternalId("exId2"); + sub1.setStatus(ACTIVATED); + sub1.setProject(projectDto); + + SubjectDTO savedSub1 = subjectService.createSubject(sub1); + SubjectDTO savedSub2 = subjectService.createSubject(sub2); + + assertThat(groupRepository.findAll().size()).isEqualTo(1); + assertThat(subjectRepository.findAll().size()).isEqualTo(2); + + GroupPatchOperation.SubjectPatchValue sub1Patch = + new GroupPatchOperation.SubjectPatchValue(); + sub1Patch.setId(savedSub1.getId()); + GroupPatchOperation.SubjectPatchValue sub2Patch = + new GroupPatchOperation.SubjectPatchValue(); + sub1Patch.setLogin(savedSub2.getLogin()); + GroupPatchOperation patchOp = new GroupPatchOperation(); + patchOp.setOp("add"); + List patchValue = new ArrayList<>(); + patchValue.add(sub1Patch); + patchValue.add(sub2Patch); + patchOp.setValue(patchValue); + + List body = new ArrayList<>(); + body.add(patchOp); + + // Get the project + restProjectMockMvc.perform(patch( + "/api/projects/{projectName}/groups/{groupName}/subjects", + project.getProjectName() + "2", group.getName()) + + .contentType(TestUtil.APPLICATION_JSON_PATCH) + .content(TestUtil.convertObjectToJsonBytes(body))) + .andExpect(status().isNotFound()); + + // Validate that the group was set for both subjects + List subjectList = subjectRepository.findAll(); + assertThat(subjectList).hasSize(2); + assertThat(subjectList) + .filteredOn(e -> e.getGroup().getId() == group.getId()) + .hasSize(2); + } } diff --git a/src/test/java/org/radarbase/management/web/rest/TestUtil.java b/src/test/java/org/radarbase/management/web/rest/TestUtil.java index 6e3017d2c..6444911fc 100644 --- a/src/test/java/org/radarbase/management/web/rest/TestUtil.java +++ b/src/test/java/org/radarbase/management/web/rest/TestUtil.java @@ -24,6 +24,10 @@ public final class TestUtil { MediaType.APPLICATION_JSON.getType(), MediaType.APPLICATION_JSON.getSubtype(), Charset.forName("utf8")); + public static final MediaType APPLICATION_JSON_PATCH = new MediaType( + "application", + "json-patch+json", Charset.forName("utf8")); + private static final JavaTimeModule module = new JavaTimeModule(); From b679ed8462159fec9d7e3cf9643c515acb7c2650 Mon Sep 17 00:00:00 2001 From: Joris Borgdorff Date: Mon, 8 Nov 2021 14:54:16 +0100 Subject: [PATCH 151/431] Fix project name predicate --- .../repository/filters/PredicateBuilder.java | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/radarbase/management/repository/filters/PredicateBuilder.java b/src/main/java/org/radarbase/management/repository/filters/PredicateBuilder.java index ae63a676f..05e534c02 100644 --- a/src/main/java/org/radarbase/management/repository/filters/PredicateBuilder.java +++ b/src/main/java/org/radarbase/management/repository/filters/PredicateBuilder.java @@ -58,7 +58,7 @@ public Predicate toAndPredicate() { * @param type of field. */ public void equal(Supplier> path, T value) { - if (value != null && !(value instanceof String && isValidValue((String) value))) { + if (isValidValue(value)) { add(builder.equal(path.get(), value)); } } @@ -70,7 +70,7 @@ public void equal(Supplier> path, T value) { * @param type of field. */ public void equal(Expression path, T value) { - if (value != null && !(value instanceof String && isValidValue((String) value))) { + if (isValidValue(value)) { add(builder.equal(path, value)); } } @@ -144,7 +144,13 @@ public > void range( /** * Whether given String a proper value. */ - public boolean isValidValue(String value) { - return value != null && !value.isBlank() && !value.equals("null"); + public boolean isValidValue(Object value) { + if (value == null) { + return false; + } + if (value instanceof String str) { + return !str.isBlank() && !str.equals("null"); + } + return true; } } From addc9348089b38b477eec4eeb8a4c980bedd4212 Mon Sep 17 00:00:00 2001 From: Joris Borgdorff Date: Mon, 8 Nov 2021 15:27:41 +0100 Subject: [PATCH 152/431] Fix warning --- src/main/webapp/app/shared/group/group.component.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/webapp/app/shared/group/group.component.scss b/src/main/webapp/app/shared/group/group.component.scss index c1857f0da..ca3699b86 100644 --- a/src/main/webapp/app/shared/group/group.component.scss +++ b/src/main/webapp/app/shared/group/group.component.scss @@ -65,5 +65,5 @@ } .create-group-wrapper{ display: flex; - justify-content: end; + justify-content: flex-end; } From 790f0ed4211cca196254a0c6ffa1350ae5829925 Mon Sep 17 00:00:00 2001 From: Peyman Mohtashami Date: Mon, 8 Nov 2021 15:59:55 +0100 Subject: [PATCH 153/431] Change datepickers to ng-bootstrap datepickers --- .../project/project-dialog.component.html | 34 ++++++++++++++----- .../project/project-dialog.component.ts | 25 +++++++++++++- .../subject/subject-dialog.component.html | 14 ++++++-- .../subject/subject-dialog.component.ts | 21 ++++++++++-- .../app/shared/subject/subject.component.scss | 8 ----- src/main/webapp/content/scss/global.scss | 10 ++++++ src/main/webapp/i18n/en/projectStatus.json | 1 + src/main/webapp/i18n/nl/projectStatus.json | 1 + 8 files changed, 91 insertions(+), 23 deletions(-) diff --git a/src/main/webapp/app/entities/project/project-dialog.component.html b/src/main/webapp/app/entities/project/project-dialog.component.html index ffe9e4f19..8e77bb893 100644 --- a/src/main/webapp/app/entities/project/project-dialog.component.html +++ b/src/main/webapp/app/entities/project/project-dialog.component.html @@ -97,9 +97,17 @@ [translate]="'managementPortalApp.project.startDate'" for="field_startDate"> -
    - +
    + +
    + +
    @@ -118,9 +126,17 @@ [translate]="'managementPortalApp.project.endDate'" for="field_endDate"> -
    - +
    + +
    + +
    @@ -149,7 +165,7 @@
    -

    +

    -
    diff --git a/src/main/webapp/app/entities/project/project-dialog.component.ts b/src/main/webapp/app/entities/project/project-dialog.component.ts index 88f8553e1..4e8fdd41e 100644 --- a/src/main/webapp/app/entities/project/project-dialog.component.ts +++ b/src/main/webapp/app/entities/project/project-dialog.component.ts @@ -3,7 +3,13 @@ import { debounceTime, distinctUntilChanged, map } from 'rxjs/operators'; import { Component, OnDestroy, OnInit, ViewEncapsulation } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; -import { NgbActiveModal, NgbModalRef, NgbTypeaheadSelectItemEvent } from '@ng-bootstrap/ng-bootstrap'; +import { + NgbActiveModal, + NgbCalendar, NgbDate, NgbDateParserFormatter, + NgbDateStruct, + NgbModalRef, + NgbTypeaheadSelectItemEvent +} from '@ng-bootstrap/ng-bootstrap'; import { AlertService } from '../../shared/util/alert.service'; import { EventManager } from '../../shared/util/event-manager.service'; @@ -41,6 +47,9 @@ export class ProjectDialogComponent implements OnInit { attributeComponentEventPrefix: 'projectAttributes'; + startDate: NgbDateStruct; + endDate: NgbDateStruct; + getMatchingSourceTypes = (text$: Observable) => { const debouncedText$ = text$.pipe(debounceTime(200), distinctUntilChanged()); const inputFocus$ = this.sourceTypeInputFocus$; @@ -64,6 +73,8 @@ export class ProjectDialogComponent implements OnInit { private sourceTypeService: SourceTypeService, private eventManager: EventManager, private groupService: GroupService, + private calendar: NgbCalendar, + public formatter: NgbDateParserFormatter ) { this.isSaving = false; this.authorities = ['ROLE_USER', 'ROLE_SYS_ADMIN', 'ROLE_PROJECT_ADMIN']; @@ -72,6 +83,12 @@ export class ProjectDialogComponent implements OnInit { } ngOnInit() { + if(this.project.startDate) { + this.startDate = this.formatter.parse(this.project.startDate.toString()); + } + if(this.project.endDate) { + this.endDate = this.formatter.parse(this.project.endDate.toString()); + } this.sourceTypeService.query().subscribe( (res: HttpResponse) => { this.sourceTypes = res.body; @@ -87,6 +104,12 @@ export class ProjectDialogComponent implements OnInit { save() { this.isSaving = true; + if (this.startDate && this.calendar.isValid(NgbDate.from(this.startDate))) { + this.project.startDate = this.formatter.format(this.startDate) + 'T00:00'; + } + if (this.endDate && this.calendar.isValid(NgbDate.from(this.endDate))) { + this.project.endDate = this.formatter.format(this.endDate) + 'T23:59'; + } if (this.project.id !== undefined) { this.projectService.update(this.project) .subscribe((res: Project) => diff --git a/src/main/webapp/app/shared/subject/subject-dialog.component.html b/src/main/webapp/app/shared/subject/subject-dialog.component.html index a50370c4f..5aa739af5 100644 --- a/src/main/webapp/app/shared/subject/subject-dialog.component.html +++ b/src/main/webapp/app/shared/subject/subject-dialog.component.html @@ -62,9 +62,17 @@ [translate]="'managementPortalApp.subject.dateOfBirth'" for="field_date_of_birth"> -
    - +
    + +
    + +
    diff --git a/src/main/webapp/app/shared/subject/subject-dialog.component.ts b/src/main/webapp/app/shared/subject/subject-dialog.component.ts index 45f33b892..654f1eccb 100644 --- a/src/main/webapp/app/shared/subject/subject-dialog.component.ts +++ b/src/main/webapp/app/shared/subject/subject-dialog.component.ts @@ -1,7 +1,14 @@ import { Component, OnDestroy, OnInit } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; -import { NgbActiveModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap'; +import { + NgbActiveModal, + NgbCalendar, + NgbDate, + NgbDateParserFormatter, + NgbDateStruct, + NgbModalRef +} from '@ng-bootstrap/ng-bootstrap'; import { AlertService } from '../util/alert.service'; import { EventManager } from '../util/event-manager.service'; @@ -25,16 +32,23 @@ export class SubjectDialogComponent implements OnInit { attributeComponentEventPrefix: 'subjectAttributes'; + dateOfBirth: NgbDateStruct; + constructor(public activeModal: NgbActiveModal, private alertService: AlertService, private subjectService: SubjectService, - private eventManager: EventManager) { + private eventManager: EventManager, + private calendar: NgbCalendar, + public formatter: NgbDateParserFormatter) { this.isSaving = false; this.authorities = ['ROLE_USER', 'ROLE_SYS_ADMIN']; this.options = ['Human-readable-identifier']; } ngOnInit() { + if(this.subject.dateOfBirth) { + this.dateOfBirth = this.formatter.parse(this.subject.dateOfBirth.toString()); + } this.eventManager.subscribe(this.attributeComponentEventPrefix + 'ListModification', (response) => { this.subject.attributes = response.content; }); @@ -46,6 +60,9 @@ export class SubjectDialogComponent implements OnInit { save() { this.isSaving = true; + if (this.dateOfBirth && this.calendar.isValid(NgbDate.from(this.dateOfBirth))) { + this.subject.dateOfBirth = new Date(this.formatter.format(this.dateOfBirth)); + } if (this.subject.id !== null) { this.subjectService.update(this.subject) .subscribe((res: Subject) => diff --git a/src/main/webapp/app/shared/subject/subject.component.scss b/src/main/webapp/app/shared/subject/subject.component.scss index e6a510885..a9fcfaf64 100644 --- a/src/main/webapp/app/shared/subject/subject.component.scss +++ b/src/main/webapp/app/shared/subject/subject.component.scss @@ -157,11 +157,3 @@ background: rgba(169, 209, 255, 0.3); .subject-pagination__load-more:active { background: rgba(0, 120, 255, 0.15); } - -button.calendar, button.calendar:active { -width: 2.75rem; -background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACIAAAAcCAYAAAAEN20fAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAAOxAAADsQBlSsOGwAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAAEUSURBVEiJ7ZQxToVAEIY/YCHGxN6XGOIpnpaEsBSeQC9ArZbm9TZ6ADyBNzAhQGGl8Riv4BLAWAgmkpBYkH1b8FWT2WK/zJ8ZJ4qiI6XUI3ANnGKWBnht2/ZBDRK3hgVGNsCd7/ui+JkEIrKtqurLpEWaphd933+IyI3LEIdpCYCiKD6HcuOa/nwOa0ScJEnk0BJg0UTUWJRl6RxCYEzEmomsIlPU3IPW+grIAbquy+q6fluy/28RIBeRMwDXdXMgXLj/B2uimRXpui4D9sBeRLKl+1N+L+t6RwbWrZliTTTr1oxYtzVWiTQAcRxvTX+eJMnlUDaO1vpZRO5NS0x48sIwfPc87xg4B04MCzQi8hIEwe4bl1DnFMCN2zsAAAAASUVORK5CYII=') !important; -background-repeat: no-repeat; -background-size: 23px; -background-position: center; -} diff --git a/src/main/webapp/content/scss/global.scss b/src/main/webapp/content/scss/global.scss index 2cc62cdd4..6d5e93cbd 100644 --- a/src/main/webapp/content/scss/global.scss +++ b/src/main/webapp/content/scss/global.scss @@ -261,3 +261,13 @@ http://google.github.io/material-design-icons/ } white-space: nowrap; } + + +button.calendar, button.calendar:active { + width: 2.75rem; + background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACIAAAAcCAYAAAAEN20fAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAAOxAAADsQBlSsOGwAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAAEUSURBVEiJ7ZQxToVAEIY/YCHGxN6XGOIpnpaEsBSeQC9ArZbm9TZ6ADyBNzAhQGGl8Riv4BLAWAgmkpBYkH1b8FWT2WK/zJ8ZJ4qiI6XUI3ANnGKWBnht2/ZBDRK3hgVGNsCd7/ui+JkEIrKtqurLpEWaphd933+IyI3LEIdpCYCiKD6HcuOa/nwOa0ScJEnk0BJg0UTUWJRl6RxCYEzEmomsIlPU3IPW+grIAbquy+q6fluy/28RIBeRMwDXdXMgXLj/B2uimRXpui4D9sBeRLKl+1N+L+t6RwbWrZliTTTr1oxYtzVWiTQAcRxvTX+eJMnlUDaO1vpZRO5NS0x48sIwfPc87xg4B04MCzQi8hIEwe4bl1DnFMCN2zsAAAAASUVORK5CYII=') !important; + background-repeat: no-repeat; + background-size: 23px; + background-position: center; +} + diff --git a/src/main/webapp/i18n/en/projectStatus.json b/src/main/webapp/i18n/en/projectStatus.json index 5a00b45f6..feaa2ad8c 100644 --- a/src/main/webapp/i18n/en/projectStatus.json +++ b/src/main/webapp/i18n/en/projectStatus.json @@ -1,6 +1,7 @@ { "managementPortalApp": { "ProjectStatus" : { + "undefined": "NOT SET", "null": "NOT SET", "PLANNING": "PLANNING", "ONGOING": "ONGOING", diff --git a/src/main/webapp/i18n/nl/projectStatus.json b/src/main/webapp/i18n/nl/projectStatus.json index 76dd1af53..0a3c61070 100644 --- a/src/main/webapp/i18n/nl/projectStatus.json +++ b/src/main/webapp/i18n/nl/projectStatus.json @@ -1,6 +1,7 @@ { "managementPortalApp": { "ProjectStatus" : { + "undefined": "", "null": "", "PLANNING": "PLANNING", "ONGOING": "ONGOING", From 94314dd55e419d9c8b50628a873cad99b7de2e60 Mon Sep 17 00:00:00 2001 From: Joris Borgdorff Date: Mon, 8 Nov 2021 16:05:49 +0100 Subject: [PATCH 154/431] Fix selecting already selected elements --- .../management/service/GroupService.java | 2 +- ...dd-subjects-to-group-dialog.component.html | 39 +++++++++++++ .../add-subjects-to-group-dialog.component.ts | 56 ++++++------------- .../app/shared/subject/subject.component.html | 6 +- .../app/shared/subject/subject.component.ts | 10 ++-- .../management/web/rest/TestUtil.java | 2 +- 6 files changed, 66 insertions(+), 49 deletions(-) create mode 100644 src/main/webapp/app/shared/subject/add-subjects-to-group-dialog.component.html diff --git a/src/main/java/org/radarbase/management/service/GroupService.java b/src/main/java/org/radarbase/management/service/GroupService.java index ae39447cf..839cdaa83 100644 --- a/src/main/java/org/radarbase/management/service/GroupService.java +++ b/src/main/java/org/radarbase/management/service/GroupService.java @@ -177,7 +177,7 @@ private List getSubjectEntities( // since having both will require an extra validation step // to reject e.g. {id: 1, login: "subject-id-42"}. // Whether the IDs and logins exist and belong to the project - // should be checked later + // should be allChecked later for (GroupPatchOperation.SubjectPatchValue item : subjectsToModify) { String login = item.getLogin(); Long id = item.getId(); diff --git a/src/main/webapp/app/shared/subject/add-subjects-to-group-dialog.component.html b/src/main/webapp/app/shared/subject/add-subjects-to-group-dialog.component.html new file mode 100644 index 000000000..cc4c8922f --- /dev/null +++ b/src/main/webapp/app/shared/subject/add-subjects-to-group-dialog.component.html @@ -0,0 +1,39 @@ + + +
    +

    Add subjects to group

    + +
    +
    + +
    +
    + + +
    diff --git a/src/main/webapp/app/shared/subject/add-subjects-to-group-dialog.component.ts b/src/main/webapp/app/shared/subject/add-subjects-to-group-dialog.component.ts index 87e611583..88a3992ac 100644 --- a/src/main/webapp/app/shared/subject/add-subjects-to-group-dialog.component.ts +++ b/src/main/webapp/app/shared/subject/add-subjects-to-group-dialog.component.ts @@ -1,72 +1,48 @@ -import { Component, Input } from "@angular/core"; +import { Component, Input, OnDestroy } from "@angular/core"; import { NgbActiveModal } from "@ng-bootstrap/ng-bootstrap"; import { tap } from "rxjs/operators"; -import { Group } from "../group/group.model"; -import { GroupService } from "../group/group.service"; +import { Group, GroupService } from "../group"; import { AlertService } from "../util/alert.service"; import { EventManager } from "../util/event-manager.service"; import { Subject } from "./subject.model"; +import { Subscription } from "rxjs"; @Component({ selector: 'add-subjects-to-group-dialog', - template: ` -
    -

    Add subjects to group

    - -
    -
    - -
    -
    - - -
    - ` + templateUrl: 'add-subjects-to-group-dialog.component.html', }) -export class AddSubjectsToGroupDialogComponent { +export class AddSubjectsToGroupDialogComponent implements OnDestroy { @Input() groups: Group[]; @Input() projectName: string; @Input() subjects: Subject[]; group: Group | null; isSaving = false; + subscriptions: Subscription; constructor( public activeModal: NgbActiveModal, private alertService: AlertService, private eventManager: EventManager, private groupService: GroupService, - ) { } + ) { + this.subscriptions = new Subscription(); + } clear() { this.activeModal.dismiss('cancel'); } + ngOnDestroy(): void { + this.subscriptions.unsubscribe(); + } + save() { this.isSaving = true; let groupName = this.group.name; let items = this.subjects.map(s => ({ id: s.id })); - this.groupService.addSubjectsToGroup(this.projectName, groupName, items) + this.subscriptions.add(this.groupService.addSubjectsToGroup(this.projectName, groupName, items) .pipe(tap(() => this.isSaving = false)) .subscribe( () => { @@ -80,6 +56,6 @@ export class AddSubjectsToGroupDialogComponent { }, error => { this.alertService.error(error.message, null, null); - }); + })); } -} \ No newline at end of file +} diff --git a/src/main/webapp/app/shared/subject/subject.component.html b/src/main/webapp/app/shared/subject/subject.component.html index f72079be2..d77a6a82d 100644 --- a/src/main/webapp/app/shared/subject/subject.component.html +++ b/src/main/webapp/app/shared/subject/subject.component.html @@ -246,8 +246,8 @@
    @@ -101,7 +101,7 @@
    name="enrollmentDateTo" ngbDatepicker #enrollmentToDatePicker="ngbDatepicker" - (ngModelChange)='filterChanged(filters.enrollmentDateTo)'> + (ngModelChange)='filterChanged("enrollmentDateTo", filters.enrollmentDateTo)'>
    @@ -117,7 +117,7 @@
    id="field-person-name" [(ngModel)]="filters.personName" type="text" - (ngModelChange)='filterChanged(filters.personName)'> + (ngModelChange)='filterChanged("personName", filters.personName)'>
    @@ -131,7 +131,7 @@
    placeholder="yyyy-mm-dd" ngbDatepicker #dateOfBirthDatePicker="ngbDatepicker" - (ngModelChange)='filterChanged(filters.dateOfBirth)'> + (ngModelChange)='filterChanged("dateOfBirth", filters.dateOfBirth)'>
    diff --git a/src/main/webapp/app/shared/subject/subject.component.ts b/src/main/webapp/app/shared/subject/subject.component.ts index 76e53d0a7..ce15cedb0 100644 --- a/src/main/webapp/app/shared/subject/subject.component.ts +++ b/src/main/webapp/app/shared/subject/subject.component.ts @@ -153,6 +153,8 @@ export class SubjectComponent implements OnInit, OnDestroy, OnChanges { } ngOnDestroy() { + this.filterTriggerUpdate$.next(''); + this.filterTriggerUpdate$.complete(); this.eventManager.destroy(this.eventSubscriber); this.routeData.unsubscribe(); } @@ -297,8 +299,8 @@ export class SubjectComponent implements OnInit, OnDestroy, OnChanges { }) } - filterChanged(text) { - this.filterTriggerUpdate$.next(text); + filterChanged(field: string, text: string) { + this.filterTriggerUpdate$.next(field + text); } applyFilter() { From e0cb82fa20550f37a9953e7ce1d63a669f44836d Mon Sep 17 00:00:00 2001 From: Peyman Mohtashami Date: Mon, 8 Nov 2021 14:24:52 +0100 Subject: [PATCH 156/431] Add translations --- .../app/shared/subject/subject.component.html | 25 +++++++++---------- .../app/shared/subject/subject.component.scss | 7 ++++++ src/main/webapp/i18n/en/subject.json | 9 ++++++- src/main/webapp/i18n/nl/subject.json | 13 ++++++---- 4 files changed, 35 insertions(+), 19 deletions(-) diff --git a/src/main/webapp/app/shared/subject/subject.component.html b/src/main/webapp/app/shared/subject/subject.component.html index d77a6a82d..c0e4c2fc9 100644 --- a/src/main/webapp/app/shared/subject/subject.component.html +++ b/src/main/webapp/app/shared/subject/subject.component.html @@ -89,7 +89,7 @@
    - The date is not valid. +
    @@ -106,7 +106,7 @@
    - The date is not valid or it is after From Date. + @@ -205,39 +205,38 @@
    - Filters: + *ngIf="isFilterApplied"> + {{ 'managementPortalApp.subject.filter.filters' | translate}}:
    - Subject ID: {{filters.subjectId}} + {{ 'managementPortalApp.subject.subjectId' | translate }}: {{filters.subjectId}}
    - External ID: {{filters.externalId}} + {{ 'managementPortalApp.subject.externalId' | translate }}: {{filters.externalId}}
    - Person Name: {{filters.personName}} + {{ 'managementPortalApp.subject.personName' | translate }}: {{filters.personName}}
    - Human Readable ID: {{filters.humanReadableId}} + {{ 'managementPortalApp.subject.humanReadableId' | translate }}: {{filters.humanReadableId}}
    - Date of Birth: {{appliedFilters.dateOfBirth}} + {{ 'managementPortalApp.subject.dateOfBirth' | translate }}: {{appliedFilters.dateOfBirth}}
    - Enrollment Date From: {{appliedFilters.enrollmentDateFrom}} + {{ 'managementPortalApp.subject.enrollmentDateFrom' | translate }}: {{appliedFilters.enrollmentDateFrom}}
    - Enrollment Date To: {{appliedFilters.enrollmentDateTo}} + {{ 'managementPortalApp.subject.enrollmentDateFrom' | translate }}: {{appliedFilters.enrollmentDateTo}}
    - Group: {{appliedFilters.group}} + {{ 'managementPortalApp.subject.group' | translate }}: {{appliedFilters.group}}
    diff --git a/src/main/webapp/app/shared/subject/subject.component.scss b/src/main/webapp/app/shared/subject/subject.component.scss index cbd7c65bd..e6a510885 100644 --- a/src/main/webapp/app/shared/subject/subject.component.scss +++ b/src/main/webapp/app/shared/subject/subject.component.scss @@ -66,6 +66,13 @@ padding: 0 8px; } +.applied-filters{ + margin: 8px 0; + display: flex; + align-items: center; + flex-wrap: wrap; +} + .subject-wrapper > section { flex-grow: 1; padding-left: 16px; diff --git a/src/main/webapp/i18n/en/subject.json b/src/main/webapp/i18n/en/subject.json index dbcb14ecf..55915ebab 100644 --- a/src/main/webapp/i18n/en/subject.json +++ b/src/main/webapp/i18n/en/subject.json @@ -18,11 +18,16 @@ }, "filter": { "title": "Filter", + "filters": "Filters", "applyButton": "Apply filter", "clearButton": "Clear filter", "advancedFilter": "Advanced Filter", "from": "From", - "to": "To" + "to": "To", + "error": { + "invalidDate": "The date is not valid.", + "invalidRange": "The date is not valid or it is after From Date." + } }, "login": "Login", "email": "Email", @@ -39,6 +44,8 @@ "createdDate": "Created Date", "dateOfBirth": "Date of Birth", "enrollmentDate": "Enrollment Date", + "enrollmentDateFrom": "Enrollment Date From", + "enrollmentDateTo": "Enrollment Date To", "lastModifiedBy": "Last Modified By", "lastModifiedDate": "Last Modified Date", "personName": "Name", diff --git a/src/main/webapp/i18n/nl/subject.json b/src/main/webapp/i18n/nl/subject.json index c013ad247..674cd04ea 100644 --- a/src/main/webapp/i18n/nl/subject.json +++ b/src/main/webapp/i18n/nl/subject.json @@ -18,19 +18,21 @@ }, "filter": { "title": "Filter", + "filters": "Filters", "applyButton": "Filter toepassen", "clearButton": "Filters wissen", "from": "Vanaf", "to": "Tot en met", - "clearButton": "Wis filters", - "advancedFilter": "Uitgebreid filter" + "advancedFilter": "Uitgebreid filter", + "error": { + "invalidDate": "De datum is niet geldig.", + "invalidRange": "De datum is niet geldig of ligt na de Van-datum." + } }, "login": "Login", "email": "E-mail", "externalLink": "Externe link", "externalId": "Extern ID", - "name": "Naam", - "dob": "Geboortedatum", "humanReadableId": "Leesbare ID", "enrolmentDate": "Inschrijvingsdatum", "removed": "Verwijderd", @@ -42,6 +44,8 @@ "createdDate": "Aanmaakdatum", "dateOfBirth": "Geboortedatum", "enrollmentDate": "Inschrijvingsdatum", + "enrollmentDateFrom": "Inschrijvingsdatum Vanaf", + "enrollmentDateTo": "Inschrijvingsdatum Tot", "lastModifiedBy": "Laatst aangepast door", "lastModifiedDate": "Laatst aangepaste datum", "personName": "Naam", @@ -118,5 +122,4 @@ "activeParticipantProjectNotFound": "Het subject neemt niet deel aan een project", "sourceTypeNotProvided" : "De opgegeven eigenschappen van het source-type zijn incompleet." } - } From 46ed7a15ccb5aaa6aba075942c234c04a8aa7872 Mon Sep 17 00:00:00 2001 From: Joris Borgdorff Date: Mon, 8 Nov 2021 14:54:16 +0100 Subject: [PATCH 157/431] Fix project name predicate --- .../repository/filters/PredicateBuilder.java | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/radarbase/management/repository/filters/PredicateBuilder.java b/src/main/java/org/radarbase/management/repository/filters/PredicateBuilder.java index ae63a676f..05e534c02 100644 --- a/src/main/java/org/radarbase/management/repository/filters/PredicateBuilder.java +++ b/src/main/java/org/radarbase/management/repository/filters/PredicateBuilder.java @@ -58,7 +58,7 @@ public Predicate toAndPredicate() { * @param type of field. */ public void equal(Supplier> path, T value) { - if (value != null && !(value instanceof String && isValidValue((String) value))) { + if (isValidValue(value)) { add(builder.equal(path.get(), value)); } } @@ -70,7 +70,7 @@ public void equal(Supplier> path, T value) { * @param type of field. */ public void equal(Expression path, T value) { - if (value != null && !(value instanceof String && isValidValue((String) value))) { + if (isValidValue(value)) { add(builder.equal(path, value)); } } @@ -144,7 +144,13 @@ public > void range( /** * Whether given String a proper value. */ - public boolean isValidValue(String value) { - return value != null && !value.isBlank() && !value.equals("null"); + public boolean isValidValue(Object value) { + if (value == null) { + return false; + } + if (value instanceof String str) { + return !str.isBlank() && !str.equals("null"); + } + return true; } } From 82eba8488758252aa1dc5f07b66531b802f9adc2 Mon Sep 17 00:00:00 2001 From: Joris Borgdorff Date: Mon, 8 Nov 2021 15:27:41 +0100 Subject: [PATCH 158/431] Fix warning --- src/main/webapp/app/shared/group/group.component.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/webapp/app/shared/group/group.component.scss b/src/main/webapp/app/shared/group/group.component.scss index c1857f0da..ca3699b86 100644 --- a/src/main/webapp/app/shared/group/group.component.scss +++ b/src/main/webapp/app/shared/group/group.component.scss @@ -65,5 +65,5 @@ } .create-group-wrapper{ display: flex; - justify-content: end; + justify-content: flex-end; } From b823756fae261167c251be20da29492909180362 Mon Sep 17 00:00:00 2001 From: Joris Borgdorff Date: Mon, 8 Nov 2021 16:50:32 +0100 Subject: [PATCH 159/431] Fix select behaviour --- .../management/service/GroupService.java | 2 +- .../app/shared/subject/subject.component.html | 2 +- .../app/shared/subject/subject.component.ts | 66 ++++++++++++------- 3 files changed, 43 insertions(+), 27 deletions(-) diff --git a/src/main/java/org/radarbase/management/service/GroupService.java b/src/main/java/org/radarbase/management/service/GroupService.java index 839cdaa83..ae39447cf 100644 --- a/src/main/java/org/radarbase/management/service/GroupService.java +++ b/src/main/java/org/radarbase/management/service/GroupService.java @@ -177,7 +177,7 @@ private List getSubjectEntities( // since having both will require an extra validation step // to reject e.g. {id: 1, login: "subject-id-42"}. // Whether the IDs and logins exist and belong to the project - // should be allChecked later + // should be checked later for (GroupPatchOperation.SubjectPatchValue item : subjectsToModify) { String login = item.getLogin(); Long id = item.getId(); diff --git a/src/main/webapp/app/shared/subject/subject.component.html b/src/main/webapp/app/shared/subject/subject.component.html index c0e4c2fc9..9c37552e9 100644 --- a/src/main/webapp/app/shared/subject/subject.component.html +++ b/src/main/webapp/app/shared/subject/subject.component.html @@ -259,7 +259,7 @@
    + (change)="onItemChanged(subject.id)">
    diff --git a/src/main/webapp/app/shared/subject/subject.component.ts b/src/main/webapp/app/shared/subject/subject.component.ts index 9cec82a38..a1a39a38f 100644 --- a/src/main/webapp/app/shared/subject/subject.component.ts +++ b/src/main/webapp/app/shared/subject/subject.component.ts @@ -176,7 +176,7 @@ export class SubjectComponent implements OnInit, OnDestroy, OnChanges { const subjectIndex = this.subjects.findIndex((s => s.id == modifiedSubject.id)); if (subjectIndex < 0) { this.totalItems++; - this.subjects = [modifiedSubject, ...this.subjects]; + this.updateSubjects([modifiedSubject, ...this.subjects]); } else { this.subjects[subjectIndex] = modifiedSubject; } @@ -188,7 +188,7 @@ export class SubjectComponent implements OnInit, OnDestroy, OnChanges { } ngOnChanges(changes: SimpleChanges) { - this.subjects = []; + this.clearSubjects(); const project: SimpleChange = changes.project ? changes.project : null; if (project) { this.project = project.currentValue; @@ -288,18 +288,26 @@ export class SubjectComponent implements OnInit, OnDestroy, OnChanges { }; } - private onSuccess(data, headers) { + private onSuccess(data: Subject[], headers) { if(headers.get('link')){ this.links = parseLinks(headers.get('link')); } this.totalItems = +headers.get('X-Total-Count'); this.queryCount = this.totalItems; // remove redundant subjects from the list - this.subjects = [...this.subjects, ...data]; - this.subjects = Array.from(new Set(this.subjects.map(a => a.id))) - .map(id => { - return this.subjects.find(a => a.id === id) - }) + const fetchedSubjects = new Map(data.map(a => [a.id, a])); + this.updateSubjects([ + ...this.subjects.map(s => { + const newSubject = fetchedSubjects.get(s.id); + if (newSubject !== undefined) { + fetchedSubjects.delete(s.id); + return newSubject; + } else { + return s; + } + }), + ...data.filter(s => fetchedSubjects.has(s.id)), + ]); } filterChanged(text) { @@ -310,7 +318,7 @@ export class SubjectComponent implements OnInit, OnDestroy, OnChanges { const {subjectId, externalId, personName, humanReadableId, dateOfBirth, enrollmentDateFrom, enrollmentDateTo, groupId} = this.filters; this.isFilterApplied = !!(subjectId || externalId || personName || humanReadableId || dateOfBirth || enrollmentDateFrom || enrollmentDateTo || groupId); - this.subjects = []; + this.clearSubjects(); this.loadSubjects(); } @@ -360,34 +368,43 @@ export class SubjectComponent implements OnInit, OnDestroy, OnChanges { } } + private updateSubjects(newSubjects) { + this.subjects = newSubjects; + this.allChecked = this.subjects.length !== 0 + && this.subjects.every(({ id }) => this.setOfCheckedId.has(id)); + } + + private clearSubjects() { + this.updateSubjects([]); + } + updateSortingSortBy(predicate) { - this.subjects = []; + this.clearSubjects(); this.predicate = predicate; this.page = 1; this.transition(); } updateSortingOrder(direction) { - this.subjects = []; + this.clearSubjects(); this.ascending = direction === 'asc'; this.page = 1; this.transition(); } selectAll(checked: boolean = true): void { + if (this.subjects.length === 0) { + return; + } this.subjects.forEach(({ id }) => this.updateCheckedSet(id, checked)); - this.refreshCheckedStatus(); - } - - onItemChanged(id: number, event: Event) { - const itemChecked = !(event.target as HTMLInputElement).checked; - this.updateCheckedSet(id, itemChecked); - this.refreshCheckedStatus(); + this.allChecked = checked; } - refreshCheckedStatus(): void { - this.allChecked = (this.subjects.length > 0 - && this.subjects.every(({ id }) => this.setOfCheckedId.has(id))); + onItemChanged(id: number) { + const nextIsChecked = !this.setOfCheckedId.has(id); + this.updateCheckedSet(id, nextIsChecked); + this.allChecked = nextIsChecked + && this.subjects.every(({ id }) => this.setOfCheckedId.has(id)); } updateCheckedSet(id: number, checked: boolean): void { @@ -399,12 +416,11 @@ export class SubjectComponent implements OnInit, OnDestroy, OnChanges { } addSelectedToGroup() { - let ids = this.setOfCheckedId; - let subjects = this.subjects.filter(s => ids.has(s.id)); - let modalRef = this.modalService.open(AddSubjectsToGroupDialogComponent); + const selectedSubjects = this.subjects.filter(s => this.setOfCheckedId.has(s.id)) + const modalRef = this.modalService.open(AddSubjectsToGroupDialogComponent); modalRef.componentInstance.groups = this.groups; modalRef.componentInstance.projectName = this.project.projectName; - modalRef.componentInstance.subjects = subjects; + modalRef.componentInstance.subjects = selectedSubjects; } transition() { From eec00a6d26c4997646e8c242a75a00cc25ae69cf Mon Sep 17 00:00:00 2001 From: Joris Borgdorff Date: Mon, 8 Nov 2021 16:54:04 +0100 Subject: [PATCH 160/431] Fix typo --- src/test/java/org/radarbase/management/web/rest/TestUtil.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/java/org/radarbase/management/web/rest/TestUtil.java b/src/test/java/org/radarbase/management/web/rest/TestUtil.java index ae9390d34..6444911fc 100644 --- a/src/test/java/org/radarbase/management/web/rest/TestUtil.java +++ b/src/test/java/org/radarbase/management/web/rest/TestUtil.java @@ -115,7 +115,7 @@ public void describeTo(Description description) { * Creates a matcher that matches when the examined string reprensents the same instant as the * reference datetime. * - * @param date the reference datetime against which the examined string is allChecked + * @param date the reference datetime against which the examined string is checked */ public static ZonedDateTimeMatcher sameInstant(ZonedDateTime date) { return new ZonedDateTimeMatcher(date); From ccde3754e04ecaa6d58bb6e1ce986933d2659139 Mon Sep 17 00:00:00 2001 From: Peyman Mohtashami Date: Mon, 8 Nov 2021 16:55:46 +0100 Subject: [PATCH 161/431] Remove videos --- .../e2e/cypress/integration/entities/subject.spec.ts | 1 + .../cypress/integration/scenarios/generate-qr-code.spec.ts | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/test/javascript/e2e/cypress/integration/entities/subject.spec.ts b/src/test/javascript/e2e/cypress/integration/entities/subject.spec.ts index 1c5f9baaf..077d22540 100644 --- a/src/test/javascript/e2e/cypress/integration/entities/subject.spec.ts +++ b/src/test/javascript/e2e/cypress/integration/entities/subject.spec.ts @@ -161,6 +161,7 @@ describe('Subject e2e test', () => { }); it('should be able to load subjects on loadMore click', () => { + cy.wait(1000); cy.get('jhi-subjects a.subject-pagination__load-more').click(); cy.get('jhi-subjects span.subject-pagination__all-loaded').should('have.text', 'All 25 subjects loaded'); cy.get('jhi-subjects .subject-row').should('have.length', 25); diff --git a/src/test/javascript/e2e/cypress/integration/scenarios/generate-qr-code.spec.ts b/src/test/javascript/e2e/cypress/integration/scenarios/generate-qr-code.spec.ts index 3540cd9e8..0b6c4c372 100644 --- a/src/test/javascript/e2e/cypress/integration/scenarios/generate-qr-code.spec.ts +++ b/src/test/javascript/e2e/cypress/integration/scenarios/generate-qr-code.spec.ts @@ -1,13 +1,13 @@ import { login } from '../util/login'; -import { loadProjectView } from "../util/nav-bar"; describe('Project view: Generate QR code', () => { beforeEach(() => { - login() - loadProjectView(); + login(); + cy.contains('jhi-home .card-title', 'radar').click(); }); it('should open pair app dialog', () => { + cy.wait(1000); cy.contains('button', 'Pair App').first().click(); cy.get('[name=pairForm]').find('h4').first() .should('have.text', 'Pair an application'); From d82aeb4296a3017fd96a936b0d12c19d36ad9e38 Mon Sep 17 00:00:00 2001 From: Peyman Mohtashami Date: Mon, 8 Nov 2021 19:07:22 +0100 Subject: [PATCH 162/431] Add delay to e2e subject test --- .../cypress/integration/entities/subject.spec.ts | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/src/test/javascript/e2e/cypress/integration/entities/subject.spec.ts b/src/test/javascript/e2e/cypress/integration/entities/subject.spec.ts index 077d22540..88a5fbb81 100644 --- a/src/test/javascript/e2e/cypress/integration/entities/subject.spec.ts +++ b/src/test/javascript/e2e/cypress/integration/entities/subject.spec.ts @@ -11,12 +11,14 @@ describe('Subject e2e test', () => { }); it('should load create Subject dialog', () => { + cy.wait(1000); cy.get('jhi-subjects button.create-subject').click(); cy.get('jhi-subject-dialog h4.modal-title').first().should('have.text', 'Create or edit a Subject'); cy.get('jhi-subject-dialog button.close').click(); }); it('should be able to create new subject', () => { + cy.wait(1000); cy.get('jhi-subjects button.create-subject').click(); cy.get('jhi-subject-dialog input[name=externalLink]').type('https://radar-base-test.org'); cy.get('jhi-subject-dialog input[name=externalId]').type('test-subject-1'); @@ -39,6 +41,7 @@ describe('Subject e2e test', () => { }); it('should have load subject row with subject-id, external-id, status, project, sources and attributes columns', () => { + cy.wait(1000); cy.get('jhi-subjects .subject-row').first().find('.subject-row__select-row input') .invoke('attr', 'type') .should('eq', 'checkbox') @@ -77,6 +80,7 @@ describe('Subject e2e test', () => { }) it('should be able to filter subjects by subject id', () => { + cy.wait(1000); cy.get('#field-subject-id').type('b-1'); cy.get('jhi-subjects .subject-row').should('have.length', 11); cy.get('#field-subject-id').clear(); @@ -84,6 +88,7 @@ describe('Subject e2e test', () => { }); it('should be able to filter subjects by subject external id', () => { + cy.wait(1000); cy.get('#field-subject-external-id').type('test-subject-1'); cy.get('jhi-subjects .subject-row').should('have.length', 1); cy.get('#field-subject-external-id').clear(); @@ -91,6 +96,7 @@ describe('Subject e2e test', () => { }); it('should be able to filter subjects by human readable id', () => { + cy.wait(1000); cy.get('#advanced-filter').click(); cy.get('#field-human-readable-id').type('Test'); cy.get('jhi-subjects .subject-row').should('have.length', 1); @@ -100,6 +106,7 @@ describe('Subject e2e test', () => { }); it('should be able to filter subjects by person name', () => { + cy.wait(1000); cy.get('#advanced-filter').click(); cy.get('#field-person-name').type('Test'); cy.get('jhi-subjects .subject-row').should('have.length', 1); @@ -111,6 +118,7 @@ describe('Subject e2e test', () => { // TODO Filter by group it('should be able to filter subjects by date of birth', () => { + cy.wait(1000); cy.get('#advanced-filter').click(); cy.get('#field_date_of_birth').type('1980-01-01'); cy.get('jhi-subjects .subject-row').should('have.length', 1); @@ -122,6 +130,7 @@ describe('Subject e2e test', () => { // TODO Filter by Enrollment Date it('should be able to sort subjects by subject id in asc/desc order', () => { + cy.wait(1000); cy.get('jhi-subjects #field-order-by').click(); cy.get('jhi-subjects #order-by-desc').click(); cy.get('jhi-subjects .subject-row').first().should('contain.text', 'sub-9'); @@ -132,6 +141,7 @@ describe('Subject e2e test', () => { it('should be able to sort subjects by external id in asc/desc order', () => { + cy.wait(1000); cy.get('jhi-subjects #field-sort-by').click(); cy.get('jhi-subjects #sort-by-externalId').click(); cy.get('jhi-subjects .subject-row').first().should('contain.text', 'sub-1'); @@ -141,6 +151,7 @@ describe('Subject e2e test', () => { }); it('should be able to delete a subject without source', () => { + cy.wait(1000); cy.contains('jhi-subjects .subject-row', 'test-subject-1').find('a').first().click(); cy.contains('jhi-subject-detail button', 'Delete').click(); cy.contains('jhi-subject-delete-dialog button', 'Delete').click(); @@ -148,6 +159,7 @@ describe('Subject e2e test', () => { }); it('should be able to delete a group', () => { + cy.wait(1000); cy.contains('jhi-project-detail ul.nav-tabs .nav-item', 'Groups').click(); cy.contains('jhi-groups .group-row', 'Test Group C').contains('button', 'Delete').click(); cy.contains('jhi-group-delete-dialog button', 'Delete').click(); @@ -155,6 +167,7 @@ describe('Subject e2e test', () => { }); it('should show number of loaded subjects and total number of subjects', () => { + cy.wait(1000); cy.contains('jhi-project-detail ul.nav-tabs .nav-item', 'Subjects').click(); cy.get('jhi-subjects a.subject-pagination__load-more').should('have.text', 'Load more (20/25 shown)'); cy.get('jhi-subjects .subject-row').should('have.length', 20); From 9c9a03dde312fa2d122511ab3daef3c665f6da70 Mon Sep 17 00:00:00 2001 From: Peyman Mohtashami Date: Tue, 9 Nov 2021 10:21:12 +0100 Subject: [PATCH 163/431] Fix date fileds validation in filters --- .../app/shared/subject/subject.component.html | 7 ++-- .../app/shared/subject/subject.component.scss | 5 +++ .../app/shared/subject/subject.component.ts | 41 +++++++++++++++++-- 3 files changed, 47 insertions(+), 6 deletions(-) diff --git a/src/main/webapp/app/shared/subject/subject.component.html b/src/main/webapp/app/shared/subject/subject.component.html index 87ebaacf5..e22d06a84 100644 --- a/src/main/webapp/app/shared/subject/subject.component.html +++ b/src/main/webapp/app/shared/subject/subject.component.html @@ -84,7 +84,7 @@
    [(ngModel)]="filters.enrollmentDateFrom" ngbDatepicker #enrollmentFromDatePicker="ngbDatepicker" - (ngModelChange)='filterChanged("enrollmentDateFrom", filters.enrollmentDateFrom)'> + (ngModelChange)='enrollmentDateFromFilterChanged("enrollmentDateFrom", filters.enrollmentDateFrom)'>
    @@ -101,7 +101,7 @@
    name="enrollmentDateTo" ngbDatepicker #enrollmentToDatePicker="ngbDatepicker" - (ngModelChange)='filterChanged("enrollmentDateTo", filters.enrollmentDateTo)'> + (ngModelChange)='enrollmentDateToFilterChanged("enrollmentDateTo", filters.enrollmentDateTo)'>
    @@ -131,11 +131,12 @@
    placeholder="yyyy-mm-dd" ngbDatepicker #dateOfBirthDatePicker="ngbDatepicker" - (ngModelChange)='filterChanged("dateOfBirth", filters.dateOfBirth)'> + (ngModelChange)='dateOfBirthFilterChanged("dateOfBirth", filters.dateOfBirth)'>
    +
    diff --git a/src/main/webapp/app/shared/subject/subject.component.scss b/src/main/webapp/app/shared/subject/subject.component.scss index a9fcfaf64..9ef1e1c89 100644 --- a/src/main/webapp/app/shared/subject/subject.component.scss +++ b/src/main/webapp/app/shared/subject/subject.component.scss @@ -157,3 +157,8 @@ background: rgba(169, 209, 255, 0.3); .subject-pagination__load-more:active { background: rgba(0, 120, 255, 0.15); } + +.form-group .error{ + color: red; + background-color: inherit; +} diff --git a/src/main/webapp/app/shared/subject/subject.component.ts b/src/main/webapp/app/shared/subject/subject.component.ts index ce15cedb0..9a11cc721 100644 --- a/src/main/webapp/app/shared/subject/subject.component.ts +++ b/src/main/webapp/app/shared/subject/subject.component.ts @@ -23,7 +23,7 @@ import { PagingParams } from '../commons'; import { AlertService } from '../util/alert.service'; import { EventManager } from '../util/event-manager.service'; import { parseLinks } from '../util/parse-links-util'; -import {NgbCalendar, NgbDate, NgbDateParserFormatter} from "@ng-bootstrap/ng-bootstrap"; +import {NgbCalendar, NgbDate, NgbDateParserFormatter, NgbDateStruct} from "@ng-bootstrap/ng-bootstrap"; @Component({ selector: 'jhi-subjects', @@ -77,6 +77,7 @@ export class SubjectComponent implements OnInit, OnDestroy, OnChanges { enrollmentDateFromError = false; enrollmentDateToError = false; + dateOfBirthError = false; isAdvancedFilterCollapsed = true; @@ -237,7 +238,7 @@ export class SubjectComponent implements OnInit, OnDestroy, OnChanges { return params; } - isRange(from: NgbDate, to: NgbDate): boolean { + isRange(from: NgbDateStruct, to: NgbDateStruct): boolean { if(from && !this.calendar.isValid(NgbDate.from(from))){ this.enrollmentDateFromError = true; return false; @@ -300,7 +301,30 @@ export class SubjectComponent implements OnInit, OnDestroy, OnChanges { } filterChanged(field: string, text: string) { - this.filterTriggerUpdate$.next(field + text); + this.filterTriggerUpdate$.next(field + ',' + text); + } + + dateOfBirthFilterChanged(field: string, date: NgbDateStruct){ + this.dateOfBirthError = false; + if (date) { + if (this.calendar.isValid(NgbDate.from(date))) { + this.filterTriggerUpdate$.next(field + ',' + this.formatter.format(date)); + } else { + this.dateOfBirthError = true; + } + } + } + + enrollmentDateFromFilterChanged(field: string, date: NgbDateStruct){ + if (this.isRange(date, this.filters.enrollmentDateTo)) { + this.filterTriggerUpdate$.next(field + ',' + this.formatter.format(date)); + } + } + + enrollmentDateToFilterChanged(field: string, date: NgbDateStruct){ + if (this.isRange(this.filters.enrollmentDateFrom, date)) { + this.filterTriggerUpdate$.next(field + ',' + this.formatter.format(date)); + } } applyFilter() { @@ -319,6 +343,17 @@ export class SubjectComponent implements OnInit, OnDestroy, OnChanges { clearDateFilter(filterName: string) { this.appliedFilters[filterName] = undefined; this.filters[filterName] = undefined; + switch (filterName) { + case 'dateOfBirth': + this.dateOfBirthError = false; + break; + case 'enrollmentDateFrom': + this.enrollmentDateFromError = false; + break; + case 'enrollmentDateTo': + this.enrollmentDateToError = false; + break; + } this.applyFilter(); } From fd019fb062c20f63399704c0ad7ee93d82411daf Mon Sep 17 00:00:00 2001 From: Peyman Mohtashami Date: Tue, 9 Nov 2021 10:41:12 +0100 Subject: [PATCH 164/431] Fix loading subjects and groups --- src/main/webapp/app/shared/group/group.component.ts | 1 - src/main/webapp/app/shared/subject/subject.component.scss | 4 ++++ src/main/webapp/app/shared/subject/subject.component.ts | 3 ++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/main/webapp/app/shared/group/group.component.ts b/src/main/webapp/app/shared/group/group.component.ts index cdc956efe..393a3c147 100644 --- a/src/main/webapp/app/shared/group/group.component.ts +++ b/src/main/webapp/app/shared/group/group.component.ts @@ -45,7 +45,6 @@ export class GroupComponent implements OnInit, OnDestroy, OnChanges { } ngOnInit() { - this.loadGroups(); this.registerChangeInGroups(); } diff --git a/src/main/webapp/app/shared/subject/subject.component.scss b/src/main/webapp/app/shared/subject/subject.component.scss index 9ef1e1c89..875e83614 100644 --- a/src/main/webapp/app/shared/subject/subject.component.scss +++ b/src/main/webapp/app/shared/subject/subject.component.scss @@ -162,3 +162,7 @@ background: rgba(0, 120, 255, 0.15); color: red; background-color: inherit; } + +.applied-filters .badge { + cursor: pointer; +} diff --git a/src/main/webapp/app/shared/subject/subject.component.ts b/src/main/webapp/app/shared/subject/subject.component.ts index 9a11cc721..e32f8c33b 100644 --- a/src/main/webapp/app/shared/subject/subject.component.ts +++ b/src/main/webapp/app/shared/subject/subject.component.ts @@ -10,7 +10,7 @@ import { import { HttpErrorResponse, HttpResponse } from '@angular/common/http'; import { ActivatedRoute, Router } from '@angular/router'; import { BehaviorSubject, Observable, Subscription } from 'rxjs'; -import {debounceTime, distinctUntilChanged, map} from 'rxjs/operators'; +import {debounceTime, distinctUntilChanged, filter, map} from 'rxjs/operators'; import {Group, GroupService, ITEMS_PER_PAGE, Project} from '..'; import { Subject } from './subject.model'; @@ -111,6 +111,7 @@ export class SubjectComponent implements OnInit, OnDestroy, OnChanges { this.filterTriggerUpdate$.pipe( debounceTime(300), + filter(f => f !== ''), distinctUntilChanged() ).subscribe(() => this.applyFilter()); } From d1324eae7156f45c6651e8ea08adc7451446de3b Mon Sep 17 00:00:00 2001 From: Peyman Mohtashami Date: Tue, 9 Nov 2021 10:47:16 +0100 Subject: [PATCH 165/431] Apply sorting only on changes --- .../app/shared/subject/subject.component.ts | 21 ++++++++++++------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/src/main/webapp/app/shared/subject/subject.component.ts b/src/main/webapp/app/shared/subject/subject.component.ts index e32f8c33b..bd9cf1671 100644 --- a/src/main/webapp/app/shared/subject/subject.component.ts +++ b/src/main/webapp/app/shared/subject/subject.component.ts @@ -394,17 +394,22 @@ export class SubjectComponent implements OnInit, OnDestroy, OnChanges { } updateSortingSortBy(predicate) { - this.subjects = []; - this.predicate = predicate; - this.page = 1; - this.transition(); + if (this.predicate !== predicate) { + this.subjects = []; + this.predicate = predicate; + this.page = 1; + this.transition(); + } } updateSortingOrder(direction) { - this.subjects = []; - this.ascending = direction === 'asc'; - this.page = 1; - this.transition(); + if ((this.ascending && direction !== 'asc') || + (!this.ascending && direction === 'asc')){ + this.subjects = []; + this.ascending = direction === 'asc'; + this.page = 1; + this.transition(); + } } selectAll(checked: boolean = true): void { From 9ac3bd3a2442a12f14935734d5e7c9a0ef0f51a6 Mon Sep 17 00:00:00 2001 From: Peyman Mohtashami Date: Tue, 9 Nov 2021 12:03:22 +0100 Subject: [PATCH 166/431] Remove delays from tests --- .../app/shared/subject/subject.component.ts | 2 ++ .../cypress/integration/entities/subject.spec.ts | 15 --------------- .../scenarios/generate-qr-code.spec.ts | 1 - 3 files changed, 2 insertions(+), 16 deletions(-) diff --git a/src/main/webapp/app/shared/subject/subject.component.ts b/src/main/webapp/app/shared/subject/subject.component.ts index bd9cf1671..df68a2a5e 100644 --- a/src/main/webapp/app/shared/subject/subject.component.ts +++ b/src/main/webapp/app/shared/subject/subject.component.ts @@ -313,6 +313,8 @@ export class SubjectComponent implements OnInit, OnDestroy, OnChanges { } else { this.dateOfBirthError = true; } + } else { + this.filterTriggerUpdate$.next(field); } } diff --git a/src/test/javascript/e2e/cypress/integration/entities/subject.spec.ts b/src/test/javascript/e2e/cypress/integration/entities/subject.spec.ts index 88a5fbb81..7e043c334 100644 --- a/src/test/javascript/e2e/cypress/integration/entities/subject.spec.ts +++ b/src/test/javascript/e2e/cypress/integration/entities/subject.spec.ts @@ -11,14 +11,12 @@ describe('Subject e2e test', () => { }); it('should load create Subject dialog', () => { - cy.wait(1000); cy.get('jhi-subjects button.create-subject').click(); cy.get('jhi-subject-dialog h4.modal-title').first().should('have.text', 'Create or edit a Subject'); cy.get('jhi-subject-dialog button.close').click(); }); it('should be able to create new subject', () => { - cy.wait(1000); cy.get('jhi-subjects button.create-subject').click(); cy.get('jhi-subject-dialog input[name=externalLink]').type('https://radar-base-test.org'); cy.get('jhi-subject-dialog input[name=externalId]').type('test-subject-1'); @@ -33,7 +31,6 @@ describe('Subject e2e test', () => { }); it('should be able to edit a subject', () => { - cy.wait(1000); cy.contains('jhi-subjects .subject-row', 'test-subject-1').contains('button', 'Edit').click(); cy.get('jhi-subject-dialog input[name=externalLink]').clear().type('https://radar-base-test-edited.org'); cy.contains('jhi-subject-dialog button.btn-primary', 'Save').click(); @@ -41,7 +38,6 @@ describe('Subject e2e test', () => { }); it('should have load subject row with subject-id, external-id, status, project, sources and attributes columns', () => { - cy.wait(1000); cy.get('jhi-subjects .subject-row').first().find('.subject-row__select-row input') .invoke('attr', 'type') .should('eq', 'checkbox') @@ -80,7 +76,6 @@ describe('Subject e2e test', () => { }) it('should be able to filter subjects by subject id', () => { - cy.wait(1000); cy.get('#field-subject-id').type('b-1'); cy.get('jhi-subjects .subject-row').should('have.length', 11); cy.get('#field-subject-id').clear(); @@ -88,7 +83,6 @@ describe('Subject e2e test', () => { }); it('should be able to filter subjects by subject external id', () => { - cy.wait(1000); cy.get('#field-subject-external-id').type('test-subject-1'); cy.get('jhi-subjects .subject-row').should('have.length', 1); cy.get('#field-subject-external-id').clear(); @@ -96,7 +90,6 @@ describe('Subject e2e test', () => { }); it('should be able to filter subjects by human readable id', () => { - cy.wait(1000); cy.get('#advanced-filter').click(); cy.get('#field-human-readable-id').type('Test'); cy.get('jhi-subjects .subject-row').should('have.length', 1); @@ -106,7 +99,6 @@ describe('Subject e2e test', () => { }); it('should be able to filter subjects by person name', () => { - cy.wait(1000); cy.get('#advanced-filter').click(); cy.get('#field-person-name').type('Test'); cy.get('jhi-subjects .subject-row').should('have.length', 1); @@ -118,7 +110,6 @@ describe('Subject e2e test', () => { // TODO Filter by group it('should be able to filter subjects by date of birth', () => { - cy.wait(1000); cy.get('#advanced-filter').click(); cy.get('#field_date_of_birth').type('1980-01-01'); cy.get('jhi-subjects .subject-row').should('have.length', 1); @@ -130,7 +121,6 @@ describe('Subject e2e test', () => { // TODO Filter by Enrollment Date it('should be able to sort subjects by subject id in asc/desc order', () => { - cy.wait(1000); cy.get('jhi-subjects #field-order-by').click(); cy.get('jhi-subjects #order-by-desc').click(); cy.get('jhi-subjects .subject-row').first().should('contain.text', 'sub-9'); @@ -141,7 +131,6 @@ describe('Subject e2e test', () => { it('should be able to sort subjects by external id in asc/desc order', () => { - cy.wait(1000); cy.get('jhi-subjects #field-sort-by').click(); cy.get('jhi-subjects #sort-by-externalId').click(); cy.get('jhi-subjects .subject-row').first().should('contain.text', 'sub-1'); @@ -151,7 +140,6 @@ describe('Subject e2e test', () => { }); it('should be able to delete a subject without source', () => { - cy.wait(1000); cy.contains('jhi-subjects .subject-row', 'test-subject-1').find('a').first().click(); cy.contains('jhi-subject-detail button', 'Delete').click(); cy.contains('jhi-subject-delete-dialog button', 'Delete').click(); @@ -159,7 +147,6 @@ describe('Subject e2e test', () => { }); it('should be able to delete a group', () => { - cy.wait(1000); cy.contains('jhi-project-detail ul.nav-tabs .nav-item', 'Groups').click(); cy.contains('jhi-groups .group-row', 'Test Group C').contains('button', 'Delete').click(); cy.contains('jhi-group-delete-dialog button', 'Delete').click(); @@ -167,14 +154,12 @@ describe('Subject e2e test', () => { }); it('should show number of loaded subjects and total number of subjects', () => { - cy.wait(1000); cy.contains('jhi-project-detail ul.nav-tabs .nav-item', 'Subjects').click(); cy.get('jhi-subjects a.subject-pagination__load-more').should('have.text', 'Load more (20/25 shown)'); cy.get('jhi-subjects .subject-row').should('have.length', 20); }); it('should be able to load subjects on loadMore click', () => { - cy.wait(1000); cy.get('jhi-subjects a.subject-pagination__load-more').click(); cy.get('jhi-subjects span.subject-pagination__all-loaded').should('have.text', 'All 25 subjects loaded'); cy.get('jhi-subjects .subject-row').should('have.length', 25); diff --git a/src/test/javascript/e2e/cypress/integration/scenarios/generate-qr-code.spec.ts b/src/test/javascript/e2e/cypress/integration/scenarios/generate-qr-code.spec.ts index 0b6c4c372..a744eea01 100644 --- a/src/test/javascript/e2e/cypress/integration/scenarios/generate-qr-code.spec.ts +++ b/src/test/javascript/e2e/cypress/integration/scenarios/generate-qr-code.spec.ts @@ -7,7 +7,6 @@ describe('Project view: Generate QR code', () => { }); it('should open pair app dialog', () => { - cy.wait(1000); cy.contains('button', 'Pair App').first().click(); cy.get('[name=pairForm]').find('h4').first() .should('have.text', 'Pair an application'); From 46d3d55789c2e68c1d316328a66a2852e3ca8677 Mon Sep 17 00:00:00 2001 From: aykl Date: Wed, 10 Nov 2021 14:31:10 +0100 Subject: [PATCH 167/431] Style Errors fixed --- .../repository/SubjectRepository.java | 1 - .../management/service/GroupService.java | 85 ++++++----- .../management/web/rest/GroupResource.java | 12 +- .../web/rest/errors/ExceptionTranslator.java | 2 +- .../web/rest/GroupResourceIntTest.java | 137 +++++++----------- 5 files changed, 109 insertions(+), 128 deletions(-) diff --git a/src/main/java/org/radarbase/management/repository/SubjectRepository.java b/src/main/java/org/radarbase/management/repository/SubjectRepository.java index 42050d6a8..647cf6d0d 100644 --- a/src/main/java/org/radarbase/management/repository/SubjectRepository.java +++ b/src/main/java/org/radarbase/management/repository/SubjectRepository.java @@ -1,6 +1,5 @@ package org.radarbase.management.repository; -import org.radarbase.management.domain.Group; import org.radarbase.management.domain.Source; import org.radarbase.management.domain.Subject; import org.springframework.data.domain.Page; diff --git a/src/main/java/org/radarbase/management/service/GroupService.java b/src/main/java/org/radarbase/management/service/GroupService.java index ae39447cf..16348a630 100644 --- a/src/main/java/org/radarbase/management/service/GroupService.java +++ b/src/main/java/org/radarbase/management/service/GroupService.java @@ -28,7 +28,6 @@ import java.util.ArrayList; import java.util.List; -import java.util.Objects; import java.util.stream.Collectors; import static org.radarbase.management.web.rest.errors.EntityName.GROUP; @@ -140,66 +139,40 @@ public List listGroups(String projectName) { */ @Transactional public void updateGroupSubjects( - String projectName, String groupName, - List subjectsToAdd, - List subjectsToRemove + String projectName, String groupName, + List subjectsToAdd, + List subjectsToRemove ) { Group group = groupRepository - .findByProjectNameAndName(projectName, groupName) - .orElseThrow(() -> new NotFoundException( - "Group " + groupName + " not found in project " + projectName, - GROUP, ERR_GROUP_NOT_FOUND)); + .findByProjectNameAndName(projectName, groupName) + .orElseThrow(() -> new NotFoundException( + "Group " + groupName + " not found in project " + projectName, + GROUP, ERR_GROUP_NOT_FOUND)); List entitiesToAdd = getSubjectEntities(projectName, subjectsToAdd); List entitiesToRemove = getSubjectEntities(projectName, subjectsToRemove); if (!entitiesToAdd.isEmpty()) { List idsToAdd = entitiesToAdd.stream() - .map(Subject::getId).collect(Collectors.toList()); + .map(Subject::getId).collect(Collectors.toList()); subjectRepository.setGroupIdByIds(group.getId(), idsToAdd); } if (!entitiesToRemove.isEmpty()) { List idsToRemove = entitiesToRemove.stream() - .map(Subject::getId).collect(Collectors.toList()); + .map(Subject::getId).collect(Collectors.toList()); subjectRepository.unsetGroupIdByIds(idsToRemove); } } private List getSubjectEntities( - String projectName, - List subjectsToModify + String projectName, + List subjectsToModify ) { List logins = new ArrayList<>(); List ids = new ArrayList<>(); - // Each item should specify either a login or an ID, - // since having both will require an extra validation step - // to reject e.g. {id: 1, login: "subject-id-42"}. - // Whether the IDs and logins exist and belong to the project - // should be checked later - for (GroupPatchOperation.SubjectPatchValue item : subjectsToModify) { - String login = item.getLogin(); - Long id = item.getId(); - if (id == null && login == null) { - throw new BadRequestException( - "Subject identification must be specified", - GROUP, ERR_VALIDATION); - } - if (id != null && login != null) { - throw new BadRequestException( - "Subject identification must be specify either ID or Login. " + - "Do not provide both values to avoid potential confusion.", - GROUP, ERR_VALIDATION); - } - - if (id != null) { - ids.add(id); - } - if (login != null) { - logins.add(login); - } - } + extractSubjectIdentities(subjectsToModify, logins, ids); List subjectEntities = new ArrayList<>(subjectsToModify.size()); if (!ids.isEmpty()) { @@ -225,4 +198,38 @@ private List getSubjectEntities( return subjectEntities; } + + private void extractSubjectIdentities( + List subjectsToModify, + List logins, + List ids + ) { + // Each item should specify either a login or an ID, + // since having both will require an extra validation step + // to reject e.g. {id: 1, login: "subject-id-42"}. + // Whether the IDs and logins exist and belong to the project + // should be checked later + for (var item : subjectsToModify) { + String login = item.getLogin(); + Long id = item.getId(); + if (id == null && login == null) { + throw new BadRequestException( + "Subject identification must be specified", + GROUP, ERR_VALIDATION); + } + if (id != null && login != null) { + throw new BadRequestException( + "Subject identification must be specify either ID or Login. " + + "Do not provide both values to avoid potential confusion.", + GROUP, ERR_VALIDATION); + } + + if (id != null) { + ids.add(id); + } + if (login != null) { + logins.add(login); + } + } + } } diff --git a/src/main/java/org/radarbase/management/web/rest/GroupResource.java b/src/main/java/org/radarbase/management/web/rest/GroupResource.java index 8c0b4647f..ad738b061 100644 --- a/src/main/java/org/radarbase/management/web/rest/GroupResource.java +++ b/src/main/java/org/radarbase/management/web/rest/GroupResource.java @@ -132,13 +132,17 @@ public ResponseEntity changeGroupSubjects( // should be allowed to use this endpoint checkPermissionOnProject(token, SUBJECT_UPDATE, projectName); - List addedItems = new ArrayList<>(); - List removedItems = new ArrayList<>(); + var addedItems = new ArrayList(); + var removedItems = new ArrayList(); for (GroupPatchOperation operation : patchOperations) { String opCode = operation.getOp(); switch (opCode) { - case "add": addedItems.addAll(operation.getValue()); break; - case "remove": removedItems.addAll(operation.getValue()); break; + case "add": + addedItems.addAll(operation.getValue()); + break; + case "remove": + removedItems.addAll(operation.getValue()); + break; default: throw new BadRequestException( "Group patch operation '" + opCode + "' is not supported", diff --git a/src/main/java/org/radarbase/management/web/rest/errors/ExceptionTranslator.java b/src/main/java/org/radarbase/management/web/rest/errors/ExceptionTranslator.java index 7c5d1b41e..832f872d4 100644 --- a/src/main/java/org/radarbase/management/web/rest/errors/ExceptionTranslator.java +++ b/src/main/java/org/radarbase/management/web/rest/errors/ExceptionTranslator.java @@ -75,7 +75,7 @@ public ErrorVM processValidationError(MethodArgumentNotValidException ex) { ErrorVM dto = new ErrorVM(ErrorConstants.ERR_VALIDATION); for (FieldError fieldError : fieldErrors) { dto.add(fieldError.getObjectName(), fieldError.getField(), - fieldError.getCode() + ": " + fieldError.getDefaultMessage()); + fieldError.getCode() + ": " + fieldError.getDefaultMessage()); } return dto; } diff --git a/src/test/java/org/radarbase/management/web/rest/GroupResourceIntTest.java b/src/test/java/org/radarbase/management/web/rest/GroupResourceIntTest.java index 2046cefb8..9c24f3221 100644 --- a/src/test/java/org/radarbase/management/web/rest/GroupResourceIntTest.java +++ b/src/test/java/org/radarbase/management/web/rest/GroupResourceIntTest.java @@ -11,9 +11,9 @@ import org.radarbase.management.ManagementPortalTestApp; import org.radarbase.management.domain.Group; import org.radarbase.management.domain.Project; -import org.radarbase.management.domain.Subject; import org.radarbase.management.repository.GroupRepository; import org.radarbase.management.repository.ProjectRepository; +import org.radarbase.management.repository.RoleRepository; import org.radarbase.management.repository.SubjectRepository; import org.radarbase.management.security.JwtAuthenticationFilter; import org.radarbase.management.service.GroupService; @@ -40,6 +40,7 @@ import javax.servlet.ServletException; import java.util.ArrayList; +import java.util.Arrays; import java.util.List; import static org.radarbase.management.service.dto.SubjectDTO.SubjectStatus.ACTIVATED; @@ -76,6 +77,9 @@ class GroupResourceIntTest { @Autowired private ProjectRepository projectRepository; + @Autowired + private RoleRepository roleRepository; + @Autowired private SubjectRepository subjectRepository; @@ -126,16 +130,17 @@ public void setUp() throws ServletException { @AfterEach public void tearDown() { - subjectRepository.deleteAll(); - groupRepository.deleteAll(); + groupRepository.delete(group); + var roles = roleRepository.findAllRolesByProjectName(project.getProjectName()); + for (var r : roles) { + r.setProject(null); + } + roleRepository.saveAll(roles); projectRepository.delete(project); } /** * Create an entity for this test. - * - *

    This is a static method, as tests for other entities might also need it, - * if they test an entity which requires the current entity.

    */ private Group createEntity() { Group group = new Group(); @@ -144,15 +149,8 @@ private Group createEntity() { return group; } - @BeforeEach - public void initTest() { - group = createEntity(); - } - @Test void createGroup() throws Exception { - assertThat(groupRepository.findAll().size()).isEqualTo(0); - // Create the Project GroupDTO groupDto = groupMapper.groupToGroupDTO(group); restProjectMockMvc.perform(post("/api/projects/{projectName}/groups", @@ -160,19 +158,18 @@ void createGroup() throws Exception { .contentType(TestUtil.APPLICATION_JSON_UTF8) .content(TestUtil.convertObjectToJsonBytes(groupDto))) .andExpect(status().isCreated()); + + var savedGroup = groupRepository.findByProjectNameAndName( + project.getProjectName(), groupDto.getName()).get(); - // Validate the Project in the database - List groupList = groupRepository.findAll(); - assertThat(groupList).hasSize(1); - Group testGroup = groupList.get(groupList.size() - 1); - assertThat(testGroup.getProject().getId()).isEqualTo(project.getId()); - assertThat(testGroup.getName()).isEqualTo("group1"); + // Validate the Group in the database + assertThat(savedGroup.getProject().getId()).isEqualTo(project.getId()); + assertThat(savedGroup.getName()).isEqualTo("group1"); } @Test void createGroupNonExistingProject() throws Exception { - assertThat(groupRepository.findAll().size()).isEqualTo(0); projectRepository.delete(project); // Create the Project @@ -182,15 +179,10 @@ void createGroupNonExistingProject() throws Exception { .contentType(TestUtil.APPLICATION_JSON_UTF8) .content(TestUtil.convertObjectToJsonBytes(groupDto))) .andExpect(status().isNotFound()); - - // Validate the Project in the database - assertThat(groupRepository.findAll()).hasSize(0); } @Test void createGroupWithExistingName() throws Exception { - assertThat(groupRepository.findAll().size()).isEqualTo(0); - // Create the Project GroupDTO groupDto = groupMapper.groupToGroupDTO(group); restProjectMockMvc.perform(post("/api/projects/{projectName}/groups", @@ -204,17 +196,11 @@ void createGroupWithExistingName() throws Exception { .contentType(TestUtil.APPLICATION_JSON_UTF8) .content(TestUtil.convertObjectToJsonBytes(groupDto))) .andExpect(status().isConflict()); - - // Validate the Alice in the database - List groupList = groupRepository.findAll(); - assertThat(groupList).hasSize(1); } @Test void createGroupWithExistingNameInDifferentProject() throws Exception { - assertThat(groupRepository.findAll().size()).isEqualTo(0); - Project project2 = ProjectResourceIntTest.createEntity() .projectName(project.getProjectName() + "2"); @@ -238,22 +224,25 @@ void createGroupWithExistingNameInDifferentProject() throws Exception { .content(TestUtil.convertObjectToJsonBytes(group2Dto))) .andExpect(status().isCreated()); - // Validate the Alice in the database - List groupList = groupRepository.findAll(); + // Validate groups are saved for both projects + var savedGroup1 = groupRepository.findByProjectNameAndName( + project.getProjectName(), group.getName()).get(); + var savedGroup2 = groupRepository.findByProjectNameAndName( + project2.getProjectName(), group2.getName()).get(); + var groupList = Arrays.asList(savedGroup1, savedGroup2); assertThat(groupList).hasSize(2); assertThat(groupList).haveAtLeastOne(new Condition<>( g -> project.getId().equals(g.getProject().getId()), "use project 1")); assertThat(groupList).haveAtLeastOne(new Condition<>( g -> project2.getId().equals(g.getProject().getId()), "use project 2")); - assertThat(groupList).allSatisfy(g -> assertThat(g.getName()).isEqualTo(group.getName())); + assertThat(groupList).allSatisfy( + g -> assertThat(g.getName()).isEqualTo(group.getName())); projectRepository.delete(project2); } @Test void checkGroupNameIsRequired() throws Exception { - assertThat(groupRepository.findAll().size()).isEqualTo(0); - group.setName(null); // Create the Project @@ -263,9 +252,6 @@ void checkGroupNameIsRequired() throws Exception { .contentType(TestUtil.APPLICATION_JSON_UTF8) .content(TestUtil.convertObjectToJsonBytes(groupDto))) .andExpect(status().isBadRequest()); - - // Validate the Project in the database - assertThat(groupRepository.findAll()).hasSize(0); } @Test @@ -307,13 +293,9 @@ void getNonExistingGroup() throws Exception { @Test void deleteGroup() throws Exception { - assertThat(groupRepository.findAll()).hasSize(0); - // Initialize the database groupRepository.saveAndFlush(group); - assertThat(groupRepository.findAll()).hasSize(1); - // Get the project restProjectMockMvc.perform(delete( "/api/projects/{projectName}/groups/{groupName}", @@ -321,19 +303,17 @@ void deleteGroup() throws Exception { .accept(TestUtil.APPLICATION_JSON_UTF8)) .andExpect(status().isNoContent()); - // Validate the database is empty - assertThat(groupRepository.findAll()).hasSize(0); + // Validate the Group is not present in the database + var savedGroup = groupRepository.findByProjectNameAndName( + project.getProjectName(), group.getName()); + assertThat(savedGroup).isEmpty(); } @Test void deleteGroupNonExisting() throws Exception { - assertThat(groupRepository.findAll().size()).isEqualTo(0); - // Initialize the database groupRepository.saveAndFlush(group); - assertThat(groupRepository.findAll().size()).isEqualTo(1); - // Get the project restProjectMockMvc.perform(delete( "/api/projects/{projectName}/groups/{groupName}", @@ -341,20 +321,16 @@ void deleteGroupNonExisting() throws Exception { .accept(TestUtil.APPLICATION_JSON_UTF8)) .andExpect(status().isNotFound()); - // Validate the database is empty - assertThat(groupRepository.findAll().size()).isEqualTo(1); + // Validate the database still contains the group + assertThat(groupRepository.findById(group.getId())).isNotEmpty(); } @Test void deleteGroupNonExistingProject() throws Exception { - assertThat(groupRepository.findAll().size()).isEqualTo(0); - // Initialize the database groupRepository.saveAndFlush(group); - assertThat(groupRepository.findAll().size()).isEqualTo(1); - // Get the project restProjectMockMvc.perform(delete( "/api/projects/{projectName}/groups/{groupName}", @@ -362,15 +338,12 @@ void deleteGroupNonExistingProject() throws Exception { .accept(TestUtil.APPLICATION_JSON_UTF8)) .andExpect(status().isNotFound()); - // Validate the database is empty - assertThat(groupRepository.findAll().size()).isEqualTo(1); + // Validate the database still contains the group + assertThat(groupRepository.findById(group.getId())).isNotEmpty(); } @Test void addSubjectsToGroup() throws Exception { - assertThat(groupRepository.findAll().size()).isEqualTo(0); - assertThat(subjectRepository.findAll().size()).isEqualTo(0); - // Initialize the database groupRepository.saveAndFlush(group); @@ -383,26 +356,22 @@ void addSubjectsToGroup() throws Exception { sub1.setProject(projectDto); SubjectDTO sub2 = new SubjectDTO(); - sub1.setExternalLink("exLink2"); - sub1.setExternalId("exId2"); - sub1.setStatus(ACTIVATED); - sub1.setProject(projectDto); + sub2.setExternalLink("exLink2"); + sub2.setExternalId("exId2"); + sub2.setStatus(ACTIVATED); + sub2.setProject(projectDto); - SubjectDTO savedSub1 = subjectService.createSubject(sub1); - SubjectDTO savedSub2 = subjectService.createSubject(sub2); + var savedSub1 = subjectService.createSubject(sub1); + var savedSub2 = subjectService.createSubject(sub2); - assertThat(groupRepository.findAll().size()).isEqualTo(1); - assertThat(subjectRepository.findAll().size()).isEqualTo(2); - - GroupPatchOperation.SubjectPatchValue sub1Patch = - new GroupPatchOperation.SubjectPatchValue(); + var sub1Patch = new GroupPatchOperation.SubjectPatchValue(); sub1Patch.setId(savedSub1.getId()); - GroupPatchOperation.SubjectPatchValue sub2Patch = - new GroupPatchOperation.SubjectPatchValue(); - sub1Patch.setLogin(savedSub2.getLogin()); - GroupPatchOperation patchOp = new GroupPatchOperation(); + var sub2Patch = new GroupPatchOperation.SubjectPatchValue(); + sub2Patch.setLogin(savedSub2.getLogin()); + + var patchOp = new GroupPatchOperation(); patchOp.setOp("add"); - List patchValue = new ArrayList<>(); + var patchValue = new ArrayList(); patchValue.add(sub1Patch); patchValue.add(sub2Patch); patchOp.setValue(patchValue); @@ -413,17 +382,19 @@ void addSubjectsToGroup() throws Exception { // Get the project restProjectMockMvc.perform(patch( "/api/projects/{projectName}/groups/{groupName}/subjects", - project.getProjectName() + "2", group.getName()) + project.getProjectName(), group.getName()) .contentType(TestUtil.APPLICATION_JSON_PATCH) .content(TestUtil.convertObjectToJsonBytes(body))) - .andExpect(status().isNotFound()); + .andExpect(status().isNoContent()); // Validate that the group was set for both subjects - List subjectList = subjectRepository.findAll(); - assertThat(subjectList).hasSize(2); - assertThat(subjectList) - .filteredOn(e -> e.getGroup().getId() == group.getId()) - .hasSize(2); + var subjectLogins = Arrays.asList(savedSub1.getLogin(), savedSub2.getLogin()); + var subjects = subjectRepository.findAllBySubjectLogins(subjectLogins); + assertThat(subjects).hasSize(2); + assertThat(subjects).allSatisfy( + s -> assertThat(s.getGroup().getId()).isEqualTo(group.getId())); + + subjectRepository.deleteAll(subjects); } } From 4cfd179c968c91969d4e0aacfa285593200a110c Mon Sep 17 00:00:00 2001 From: aykl Date: Wed, 10 Nov 2021 15:04:47 +0100 Subject: [PATCH 168/431] OrganizationService added --- .../shared/organization/organization.model.ts | 10 +++++++ .../organization/organization.service.ts | 26 +++++++++++++++++++ 2 files changed, 36 insertions(+) create mode 100644 src/main/webapp/app/shared/organization/organization.model.ts create mode 100644 src/main/webapp/app/shared/organization/organization.service.ts diff --git a/src/main/webapp/app/shared/organization/organization.model.ts b/src/main/webapp/app/shared/organization/organization.model.ts new file mode 100644 index 000000000..97c98cc32 --- /dev/null +++ b/src/main/webapp/app/shared/organization/organization.model.ts @@ -0,0 +1,10 @@ + +export class Organization { + constructor( + public id?: number, + public name?: string, + public description?: string, + public location?: string, + ) { + } +} diff --git a/src/main/webapp/app/shared/organization/organization.service.ts b/src/main/webapp/app/shared/organization/organization.service.ts new file mode 100644 index 000000000..31c70790d --- /dev/null +++ b/src/main/webapp/app/shared/organization/organization.service.ts @@ -0,0 +1,26 @@ +import { Injectable } from '@angular/core'; +import { HttpClient } from '@angular/common/http'; +import { Observable } from 'rxjs'; + +import { Organization } from './organization.model'; + +@Injectable({ providedIn: 'root' }) +export class OrganizationService { + + private resourceUrl = 'api/organizations'; + + constructor(private http: HttpClient) { + } + + create(organization: Organization): Observable { + return this.http.post(this.resourceUrl, organization); + } + + find(orgName: string): Observable { + return this.http.get(`${this.resourceUrl}/${encodeURIComponent(orgName)}`); + } + + findAll(): Observable { + return this.http.get(this.resourceUrl); + } +} From c8a838eaf2664e9288427bbd1428be7e778bfe9f Mon Sep 17 00:00:00 2001 From: Joris Borgdorff Date: Wed, 10 Nov 2021 15:34:25 +0100 Subject: [PATCH 169/431] Use RxJS for subject filtering --- .../shared/subject/filter-badge.component.ts | 30 ++ src/main/webapp/app/shared/subject/index.ts | 2 + .../shared/subject/load-more.component.scss | 29 ++ .../app/shared/subject/load-more.component.ts | 38 ++ .../app/shared/subject/subject.component.html | 133 ++--- .../app/shared/subject/subject.component.scss | 20 - .../app/shared/subject/subject.component.ts | 491 +++++++++--------- .../app/shared/subject/subject.model.ts | 2 +- .../app/shared/subject/subject.module.ts | 4 + .../webapp/app/shared/util/reactive-filter.ts | 121 +++++ .../integration/entities/subject.spec.ts | 12 +- 11 files changed, 532 insertions(+), 350 deletions(-) create mode 100644 src/main/webapp/app/shared/subject/filter-badge.component.ts create mode 100644 src/main/webapp/app/shared/subject/load-more.component.scss create mode 100644 src/main/webapp/app/shared/subject/load-more.component.ts create mode 100644 src/main/webapp/app/shared/util/reactive-filter.ts diff --git a/src/main/webapp/app/shared/subject/filter-badge.component.ts b/src/main/webapp/app/shared/subject/filter-badge.component.ts new file mode 100644 index 000000000..5cbad29fb --- /dev/null +++ b/src/main/webapp/app/shared/subject/filter-badge.component.ts @@ -0,0 +1,30 @@ +/* + * Copyright (c) 2021. The Hyve + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * + * See the file LICENSE in the root of this repository. + */ + +import { Component, EventEmitter, Input, Output } from "@angular/core"; + +@Component({ + selector: 'app-filter-badge', + template: ` +
    + {{ text | translate }} + : {{value}} + +
    + ` +}) +export class FilterBadgeComponent { + @Input() + text: string + @Input() + value: string + @Output() + clear: EventEmitter = new EventEmitter() +} diff --git a/src/main/webapp/app/shared/subject/index.ts b/src/main/webapp/app/shared/subject/index.ts index 2a86d4490..915d9ecc9 100644 --- a/src/main/webapp/app/shared/subject/index.ts +++ b/src/main/webapp/app/shared/subject/index.ts @@ -1,3 +1,5 @@ +export * from './filter-badge.component'; +export * from './load-more.component'; export * from './subject.model'; export * from './subject-popup.service'; export * from './subject.service'; diff --git a/src/main/webapp/app/shared/subject/load-more.component.scss b/src/main/webapp/app/shared/subject/load-more.component.scss new file mode 100644 index 000000000..632075de1 --- /dev/null +++ b/src/main/webapp/app/shared/subject/load-more.component.scss @@ -0,0 +1,29 @@ +/*! + * Copyright (c) 2021. The Hyve + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * + * See the file LICENSE in the root of this repository. + */ + + +.subject-pagination { + display: flex; + margin-top: 8px; +} +.subject-pagination > * { + text-align: center; + flex-grow: 1; + padding: 16px; +} +.all-loaded { + color: #dadada; + cursor: not-allowed; +} +.load-more:hover { + background: rgba(169, 209, 255, 0.3); +} +.load-more:active { + background: rgba(0, 120, 255, 0.15); +} diff --git a/src/main/webapp/app/shared/subject/load-more.component.ts b/src/main/webapp/app/shared/subject/load-more.component.ts new file mode 100644 index 000000000..5a2bc5371 --- /dev/null +++ b/src/main/webapp/app/shared/subject/load-more.component.ts @@ -0,0 +1,38 @@ +/* + * Copyright (c) 2021. The Hyve + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * + * See the file LICENSE in the root of this repository. + */ + +import { Component, EventEmitter, Input, Output } from "@angular/core"; + +@Component({ + selector: 'app-load-more', + template: ` +
    + + +
    + `, + styleUrls: ['./load-more.component.scss'] +}) +export class LoadMoreComponent { + @Input() + totalItems?: number + @Input() + shownItems: number + @Output() + load: EventEmitter = new EventEmitter() +} diff --git a/src/main/webapp/app/shared/subject/subject.component.html b/src/main/webapp/app/shared/subject/subject.component.html index 87ebaacf5..066c442fe 100644 --- a/src/main/webapp/app/shared/subject/subject.component.html +++ b/src/main/webapp/app/shared/subject/subject.component.html @@ -2,12 +2,12 @@
    -
    @@ -18,8 +18,8 @@
    + [ngModel]="filters.subjectId.rawValue$ | async" + (ngModelChange)='filters.subjectId.next($event)'>
    @@ -29,8 +29,8 @@
    + [ngModel]="filters.externalId.rawValue$ | async" + (ngModelChange)='filters.externalId.next($event)'> @@ -50,9 +50,9 @@
    + (ngModelChange)='filters.humanReadableId.next($event)'> @@ -62,10 +62,10 @@
    @@ -81,10 +81,11 @@
    placeholder="yyyy-mm-dd" id="field_enrollment_date_from" name="enrollmentDateFrom" - [(ngModel)]="filters.enrollmentDateFrom" + [ngModel]="filters.enrollmentDateFrom.rawValue$ | async" + [maxDate]="filters.enrollmentDateTo.value$ | async" ngbDatepicker #enrollmentFromDatePicker="ngbDatepicker" - (ngModelChange)='filterChanged("enrollmentDateFrom", filters.enrollmentDateFrom)'> + (ngModelChange)='filters.enrollmentDateFrom.next($event)'>
    @@ -97,11 +98,12 @@
    + (ngModelChange)='filters.enrollmentDateTo.next($event)'>
    @@ -115,23 +117,23 @@
    + (ngModelChange)='filters.personName.next($event)'>
    - + (ngModelChange)='filters.dateOfBirth.next($event)'>
    @@ -149,7 +151,7 @@
    > {{ 'managementPortalApp.subject.sorting.sortByLabel' | translate }}: - {{ 'managementPortalApp.subject.sorting.' + predicate | translate }} + {{ 'managementPortalApp.subject.sorting.' + (sortBy$ | async) | translate }}
    @@ -166,24 +168,24 @@
    @@ -205,48 +207,35 @@
    + *ngIf="isFilterApplied$ | async"> {{ 'managementPortalApp.subject.filter.filters' | translate}}: -
    - {{ 'managementPortalApp.subject.subjectId' | translate }}: {{filters.subjectId}} - -
    -
    - {{ 'managementPortalApp.subject.externalId' | translate }}: {{filters.externalId}} - -
    -
    - {{ 'managementPortalApp.subject.personName' | translate }}: {{filters.personName}} - -
    -
    - {{ 'managementPortalApp.subject.humanReadableId' | translate }}: {{filters.humanReadableId}} - -
    -
    - {{ 'managementPortalApp.subject.dateOfBirth' | translate }}: {{appliedFilters.dateOfBirth}} - -
    -
    - {{ 'managementPortalApp.subject.enrollmentDateFrom' | translate }}: {{appliedFilters.enrollmentDateFrom}} - -
    -
    - {{ 'managementPortalApp.subject.enrollmentDateFrom' | translate }}: {{appliedFilters.enrollmentDateTo}} - -
    -
    - {{ 'managementPortalApp.subject.group' | translate }}: {{appliedFilters.group}} - -
    + + + + + + + +
    -
    +
    -
    +
    - +
    @@ -393,20 +382,6 @@
    -
    - - -
    +
    diff --git a/src/main/webapp/app/shared/subject/subject.component.scss b/src/main/webapp/app/shared/subject/subject.component.scss index a9fcfaf64..181979163 100644 --- a/src/main/webapp/app/shared/subject/subject.component.scss +++ b/src/main/webapp/app/shared/subject/subject.component.scss @@ -137,23 +137,3 @@ margin-left: 16px; width: 100%; margin-bottom: 4px; } - -.subject-pagination { -display: flex; -margin-top: 8px; -} -.subject-pagination > * { -text-align: center; -flex-grow: 1; -padding: 16px; -} -.subject-pagination__all-loaded { -color: #dadada; -cursor: not-allowed; -} -.subject-pagination__load-more:hover { -background: rgba(169, 209, 255, 0.3); -} -.subject-pagination__load-more:active { -background: rgba(0, 120, 255, 0.15); -} diff --git a/src/main/webapp/app/shared/subject/subject.component.ts b/src/main/webapp/app/shared/subject/subject.component.ts index ce15cedb0..e1cdbd78d 100644 --- a/src/main/webapp/app/shared/subject/subject.component.ts +++ b/src/main/webapp/app/shared/subject/subject.component.ts @@ -9,8 +9,18 @@ import { } from '@angular/core'; import { HttpErrorResponse, HttpResponse } from '@angular/common/http'; import { ActivatedRoute, Router } from '@angular/router'; -import { BehaviorSubject, Observable, Subscription } from 'rxjs'; -import {debounceTime, distinctUntilChanged, map} from 'rxjs/operators'; +import { + BehaviorSubject, + Observable, + Subscription, + combineLatest +} from 'rxjs'; +import { + distinctUntilChanged, filter, first, + map, pluck, + shareReplay, + switchMap, withLatestFrom +} from 'rxjs/operators'; import {Group, GroupService, ITEMS_PER_PAGE, Project} from '..'; import { Subject } from './subject.model'; @@ -19,11 +29,27 @@ import { SubjectFilterParams, SubjectPaginationParams, SubjectLastParams, } from './subject.service'; -import { PagingParams } from '../commons'; import { AlertService } from '../util/alert.service'; import { EventManager } from '../util/event-manager.service'; import { parseLinks } from '../util/parse-links-util'; -import {NgbCalendar, NgbDate, NgbDateParserFormatter} from "@ng-bootstrap/ng-bootstrap"; +import { + NgbCalendar, + NgbDate, + NgbDateParserFormatter, + NgbDateStruct +} from "@ng-bootstrap/ng-bootstrap"; +import { NgbDateReactiveFilter, ReactiveFilter } from "../util/reactive-filter"; + +interface FilterCriteria { + externalId: string + dateOfBirth?: NgbDate + subjectId: string + enrollmentDateFrom?: NgbDateStruct + enrollmentDateTo?: NgbDateStruct + groupId: string + personName: string + humanReadableId: string +} @Component({ selector: 'jhi-subjects', @@ -35,55 +61,50 @@ export class SubjectComponent implements OnInit, OnDestroy, OnChanges { 'login', 'externalId', ]; - pagingParams$: Observable; project$ = new BehaviorSubject(null); + private filterResult$: Observable; @Input() get project() { return this.project$.value; } set project(v: Project) { this.project$.next(v); } - subjects: Subject[]; - groups: Group[]; - eventSubscriber: Subscription; - itemsPerPage: number; + subjects$: BehaviorSubject = new BehaviorSubject([]); + groups$: BehaviorSubject = new BehaviorSubject([]); + private subscriptions: Subscription = new Subscription(); + itemsPerPage = ITEMS_PER_PAGE; links: any; - page: any; - predicate: any; + sortBy$: BehaviorSubject; queryCount: any; - ascending: any; + ascending$: BehaviorSubject = new BehaviorSubject(true); totalItems: number; - routeData: any; - previousPage: any; - - filters = { - subjectId: '', - externalId: '', - humanReadableId: '', - dateOfBirth: undefined, - personName: '', - enrollmentDateFrom: undefined, - enrollmentDateTo: undefined, - groupId: '', - } - - appliedFilters = { - dateOfBirth: undefined, - enrollmentDateFrom: undefined, - enrollmentDateTo: undefined, - group: '', - } - - filterTriggerUpdate$: BehaviorSubject = new BehaviorSubject(''); - - isFilterApplied = false; + page$: BehaviorSubject = new BehaviorSubject(1); + previousPage: number = 1; + + filters: {[key: string]: ReactiveFilter} = { + subjectId: new ReactiveFilter(), + externalId: new ReactiveFilter(), + humanReadableId: new ReactiveFilter(), + dateOfBirth: new NgbDateReactiveFilter(this.calendar, this.formatter), + personName: new ReactiveFilter(), + enrollmentDateFrom: new NgbDateReactiveFilter(this.calendar, this.formatter), + enrollmentDateTo: new NgbDateReactiveFilter(this.calendar, this.formatter), + groupId: new ReactiveFilter({ + formatResult: v$ => v$.pipe(map(groupId => { + const group = this.groups$.value.find(g => g.id.toString() == groupId); + return group ? group.name : ''; + })) + }), + } + + isFilterApplied$: Observable; enrollmentDateFromError = false; enrollmentDateToError = false; isAdvancedFilterCollapsed = true; - checked = false; - setOfCheckedId = new Set(); + checked$: Observable; + setOfCheckedId$: BehaviorSubject> = new BehaviorSubject>(new Set()); - @Input() isProjectSpecific: boolean; + @Input() readonly isProjectSpecific: boolean; constructor( private subjectService: SubjectService, @@ -95,68 +116,129 @@ export class SubjectComponent implements OnInit, OnDestroy, OnChanges { private calendar: NgbCalendar, public formatter: NgbDateParserFormatter ) { - this.subjects = []; - this.itemsPerPage = ITEMS_PER_PAGE; - this.pagingParams$ = this.activatedRoute.data.pipe(map(data => { - const fallback = { page: 1, predicate: 'login', ascending: true }; - return data['pagingParams'] || fallback; + this.sortBy$ = new BehaviorSubject('login') + this.filterResult$ = combineLatest([ + this.filters.subjectId.value$, + this.filters.externalId.value$, + this.filters.humanReadableId.value$, + this.filters.dateOfBirth.value$, + this.filters.personName.value$, + this.filters.enrollmentDateFrom.value$, + this.filters.enrollmentDateTo.value$, + this.filters.groupId.value$, + ]).pipe( + map(([subjectId, externalId, humanReadableId, dateOfBirth, personName, enrollmentDateFrom, enrollmentDateTo, groupId]) => ({ + subjectId, + externalId, + humanReadableId, + dateOfBirth, + personName, + enrollmentDateFrom, + enrollmentDateTo, + groupId, + })), + shareReplay(1), + ) + this.isFilterApplied$ = this.filterResult$ + .pipe( + map(param => { + for (let key in param) { + if (param[key]) { + return true; + } + } + return false; + }) + ) + + this.subscriptions.add(this.activatedRoute.data.pipe( + map(data => data['pagingParams']), + filter(params => params), + ).subscribe(params => { + this.page$ = params.page; + this.ascending$.next(params.ascending); + this.sortBy$.next(params.predicate); })); - this.routeData = this.pagingParams$.subscribe(params => { - this.page = params.page; - this.previousPage = params.page; - this.ascending = params.ascending; - this.predicate = params.predicate; - }); - this.filterTriggerUpdate$.pipe( - debounceTime(300), - distinctUntilChanged() - ).subscribe(() => this.applyFilter()); + this.checked$ = combineLatest([this.subjects$, this.setOfCheckedId$]) + .pipe( + map(([subjects, checkedSet]) => + subjects.length !== 0 && subjects.every(v => checkedSet.has(v.id))) + ); } - loadSubjects() { - if (this.isProjectSpecific) { - this.loadAllFromProject(); - } else { - this.loadAll(); - } - } - - private loadAllFromProject() { - this.subjectService.findAllByProject( - this.project.projectName, - this.queryFilterParams, - this.queryPaginationParams, - ).subscribe( - (res: HttpResponse) => { - this.onSuccess(res.body, res.headers); + ngOnInit() { + this.subscriptions.add( + combineLatest([ + this.project$.pipe(map(p => p ? p.projectName : ''), distinctUntilChanged()), + this.filterResult$, + this.sortBy$.pipe(distinctUntilChanged()), + this.ascending$.pipe(distinctUntilChanged()), + this.page$.pipe(distinctUntilChanged()), + ]).pipe( + withLatestFrom(this.subjects$.pipe(map(s => s.length))), + switchMap(([[projectName, filter, sortBy, ascending, page], numSubjects]) => { + const mergeResults: boolean = page > this.previousPage; + const numItems = Math.max(page * this.itemsPerPage - numSubjects, this.itemsPerPage); + this.previousPage = page; + let fetch$: Observable>; + const filterParams = this.queryFilterParams(filter); + const pagingParams = this.queryPaginationParams(sortBy, ascending, mergeResults, numItems) + + if (this.isProjectSpecific) { + fetch$ = this.subjectService.findAllByProject( + projectName, + filterParams, + pagingParams, + ); + } else { + fetch$ = this.subjectService.query(filterParams, pagingParams,); + } + this.router.navigate([], { + relativeTo: this.activatedRoute, + queryParams: { + page: page, + sort: sortBy + ',' + (ascending ? 'asc' : 'desc'), + }, + }); + return fetch$.pipe( + map(res => ({ + body: res.body, + headers: res.headers, + mergeResults: mergeResults, + })) + ); + }) + ) + .subscribe( + res => { + this.onSuccess(res.body, res.headers, res.mergeResults); }, (res: HttpErrorResponse) => this.onError(res), + ) ); + this.registerChangeInSubjects(); + if (this.isProjectSpecific) { + this.loadAllGroups(); + } } - loadAll() { - this.subjectService.query( - this.queryFilterParams, - this.queryPaginationParams, - ).subscribe( - (res: HttpResponse) => this.onSuccess(res.body, res.headers), - (res: HttpErrorResponse) => this.onError(res), - ); - } - - ngOnInit() { - if(!this.isProjectSpecific){ - this.loadAll(); + ngOnDestroy() { + for (let filtersKey in this.filters) { + this.filters[filtersKey].complete(); } - this.registerChangeInSubjects(); + this.ascending$.complete(); + this.sortBy$.complete(); + this.subjects$.complete(); + this.project$.complete(); + this.subscriptions.unsubscribe(); } - ngOnDestroy() { - this.filterTriggerUpdate$.next(''); - this.filterTriggerUpdate$.complete(); - this.eventManager.destroy(this.eventSubscriber); - this.routeData.unsubscribe(); + ngOnChanges(changes: SimpleChanges) { + const project: SimpleChange = changes.project ? changes.project : null; + if (project) { + this.project = project.currentValue; + } } trackLogin(index: number, item: Subject) { @@ -168,107 +250,84 @@ export class SubjectComponent implements OnInit, OnDestroy, OnChanges { } registerChangeInSubjects() { - this.eventSubscriber = this.eventManager.subscribe('subjectListModification', (result) => { + this.subscriptions.add( + this.eventManager.subscribe('subjectListModification', (result) => { const modifiedSubject = result.content; - const subjectIndex = this.subjects.findIndex((s => s.id == modifiedSubject.id)); + let currentSubjects = this.subjects$.value; + const subjectIndex = currentSubjects.findIndex((s => s.id == modifiedSubject.id)); if (subjectIndex < 0) { this.totalItems++; - this.subjects = [modifiedSubject, ...this.subjects]; + currentSubjects = [modifiedSubject, ...currentSubjects]; } else { - this.subjects[subjectIndex] = modifiedSubject; + currentSubjects = currentSubjects.slice(); + currentSubjects[subjectIndex] = modifiedSubject; } - }); + this.subjects$.next(currentSubjects); + }) + ); } private onError(error) { this.alertService.error(error.message, null, null); } - ngOnChanges(changes: SimpleChanges) { - this.subjects = []; - const project: SimpleChange = changes.project ? changes.project : null; - if (project) { - this.project = project.currentValue; - this.loadAllFromProject(); - this.loadAllGroups(); - } - } - private loadAllGroups() { - this.groupService.list(this.project.projectName).subscribe( - (res: Group[]) => this.groups = res, - (res: HttpErrorResponse) => this.onError(res), + this.subscriptions.add( + this.project$.pipe( + filter(p => !!p), + pluck('projectName'), + switchMap(projectName => this.groupService.list(projectName)) + ).subscribe( + (res: Group[]) => this.groups$.next(res), + (res: HttpErrorResponse) => this.onError(res), + ) ); } - get queryFilterParams(): SubjectFilterParams { + queryFilterParams(criteria: FilterCriteria): SubjectFilterParams { const params = { - login: this.filters.subjectId.trim() || undefined, - externalId: this.filters.externalId.trim() || undefined, - personName: this.filters.personName.trim() || undefined, - humanReadableIdentifier: this.filters.humanReadableId.trim() || undefined, - groupId: this.filters.groupId, + login: criteria.subjectId && criteria.subjectId.trim() || undefined, + externalId: criteria.externalId && criteria.externalId.trim() || undefined, + personName: criteria.personName && criteria.personName.trim() || undefined, + humanReadableIdentifier: criteria.humanReadableId && criteria.humanReadableId.trim() || undefined, + groupId: criteria.groupId, dateOfBirth: undefined, enrollmentDate: undefined, }; - const filteredGroup = this.groups?.filter(g => g.id.toString() == this.filters.groupId)[0]; - this.appliedFilters.group = filteredGroup? filteredGroup.name : ''; - - if(this.isRange(this.filters.enrollmentDateFrom, this.filters.enrollmentDateTo)){ - let enrollmentDateFrom = this.formatter.format(this.filters.enrollmentDateFrom); //this.formatDate(this.filters.enrollmentDateFrom); - let enrollmentDateTo = this.formatter.format(this.filters.enrollmentDateTo); - this.appliedFilters.enrollmentDateFrom = enrollmentDateFrom; - this.appliedFilters.enrollmentDateTo = enrollmentDateTo; + if (this.isRange(criteria.enrollmentDateFrom, criteria.enrollmentDateTo)){ + let enrollmentDateFrom = this.formatter.format(criteria.enrollmentDateFrom); //this.formatDate(this.filters.enrollmentDateFrom); + let enrollmentDateTo = this.formatter.format(criteria.enrollmentDateTo); const timeZone = Intl.DateTimeFormat().resolvedOptions().timeZone; params.enrollmentDate = { from: enrollmentDateFrom ? enrollmentDateFrom + 'T00:00' + '[' + timeZone + ']' : undefined, to: enrollmentDateTo ? enrollmentDateTo + 'T23:59' + '[' + timeZone + ']' : undefined, }; } - if (this.filters.dateOfBirth && this.calendar.isValid(NgbDate.from(this.filters.dateOfBirth))){ - const dateOfBirth = this.formatter.format(this.filters.dateOfBirth); - this.appliedFilters.dateOfBirth = dateOfBirth; + if (criteria.dateOfBirth){ params.dateOfBirth = { - is: dateOfBirth, + is: this.formatter.format(criteria.dateOfBirth), }; } return params; } - isRange(from: NgbDate, to: NgbDate): boolean { - if(from && !this.calendar.isValid(NgbDate.from(from))){ - this.enrollmentDateFromError = true; - return false; - } - if(to && !this.calendar.isValid(NgbDate.from(to))){ - this.enrollmentDateToError = true; - return false; - } + isRange(from: NgbDateStruct, to: NgbDateStruct): boolean { if(from && to) { - const dateFrom: NgbDate = new NgbDate(from.year, from.month, from.day); - const dateTo: NgbDate = new NgbDate(to.year, to.month, to.day); - if(dateTo.equals(dateFrom) || dateTo.after(dateFrom)){ - this.enrollmentDateFromError = false; - this.enrollmentDateToError = false; - return true; - } - this.enrollmentDateFromError = false; - this.enrollmentDateToError = true; - return false; + const dateFrom = NgbDate.from(from); + const dateTo = NgbDate.from(to); + return dateTo.equals(dateFrom) || dateTo.after(dateFrom); } else { - this.enrollmentDateFromError = false; - this.enrollmentDateToError = false; return !!(from || to); } } - get queryPaginationParams(): SubjectPaginationParams { - const subjects = this.subjects || []; + queryPaginationParams(sortBy: string, ascending: boolean, loadMore: boolean, size: number): SubjectPaginationParams { + const subjects = this.subjects$.value || []; let last: SubjectLastParams | null; - if (subjects.length > 0) { + if (loadMore) { const lastSubject = subjects[subjects.length - 1] last = { id: lastSubject.id, @@ -280,133 +339,75 @@ export class SubjectComponent implements OnInit, OnDestroy, OnChanges { } return { last, - size: this.itemsPerPage, - sort: [this.predicate + ',' + (this.ascending ? 'asc' : 'desc')], + size, + sort: [sortBy + ',' + (ascending ? 'asc' : 'desc')], }; } - private onSuccess(data, headers) { + private onSuccess(data, headers, mergeResults: boolean) { if(headers.get('link')){ this.links = parseLinks(headers.get('link')); } this.totalItems = +headers.get('X-Total-Count'); this.queryCount = this.totalItems; // remove redundant subjects from the list - this.subjects = [...this.subjects, ...data]; - this.subjects = Array.from(new Set(this.subjects.map(a => a.id))) + if (mergeResults) { + let tempSubjects = [...this.subjects$.value, ...data]; + this.subjects$.next(Array.from(new Set(tempSubjects.map(a => a.id))) .map(id => { - return this.subjects.find(a => a.id === id) - }) - } - - filterChanged(field: string, text: string) { - this.filterTriggerUpdate$.next(field + text); - } - - applyFilter() { - const {subjectId, externalId, personName, humanReadableId, dateOfBirth, enrollmentDateFrom, enrollmentDateTo, groupId} = this.filters; - this.isFilterApplied = !!(subjectId || externalId || personName || humanReadableId || - dateOfBirth || enrollmentDateFrom || enrollmentDateTo || groupId); - this.subjects = []; - this.loadSubjects(); - } - - clearFilter(filterName: string){ - this.filters[filterName] = ''; - this.applyFilter(); - } - - clearDateFilter(filterName: string) { - this.appliedFilters[filterName] = undefined; - this.filters[filterName] = undefined; - this.applyFilter(); - } - - clearSelectFilter(filterName: string){ - this.appliedFilters[filterName] = ''; - this.filters[filterName] = ''; - this.applyFilter(); + return tempSubjects.find(a => a.id === id) + })) + } else { + this.subjects$.next(data); + } } clearFilters() { - this.filters.externalId = ''; - this.filters.subjectId = ''; - this.filters.humanReadableId = ''; - this.filters.personName = ''; - this.filters.groupId = ''; - this.filters.dateOfBirth = undefined; - this.filters.enrollmentDateFrom = undefined; - this.filters.enrollmentDateTo = undefined; - this.appliedFilters.group = ''; - this.appliedFilters.dateOfBirth = undefined; - this.appliedFilters.enrollmentDateFrom = undefined; - this.appliedFilters.enrollmentDateTo = undefined; - - this.applyFilter(); + for (let filtersKey in this.filters) { + this.filters[filtersKey].clear(); + } } loadMore() { - this.page = this.page + 1; - this.transition(); - } - - loadPage(page) { - if (page !== this.previousPage) { - this.previousPage = page; - this.transition(); - } + this.page$.next(this.page$.value + 1); } - updateSortingSortBy(predicate) { - this.subjects = []; - this.predicate = predicate; - this.page = 1; - this.transition(); + updateSortingSortBy(predicate?: string) { + this.sortBy$.next(predicate); + this.page$.next(1); } - updateSortingOrder(direction) { - this.subjects = []; - this.ascending = direction === 'asc'; - this.page = 1; - this.transition(); + updateSortAscending(ascending: boolean) { + this.ascending$.next(ascending); + this.page$.next(1); } - selectAll(checked: boolean = true): void { - this.subjects.forEach(({ id }) => this.updateCheckedSet(id, checked)); - this.refreshCheckedStatus(); + selectAll(): void { + this.subjects$.pipe( + withLatestFrom(this.checked$), + first(), + ).subscribe(([subjects, checked]) => { + const nextValue = new Set(this.setOfCheckedId$.value); + if (!checked) { + subjects.forEach(({ id }) => nextValue.add(id)); + } else { + subjects.forEach(({ id }) => nextValue.delete(id)); + } + this.setOfCheckedId$.next(nextValue); + }); } onItemChecked(id: number, checked: boolean): void { - this.updateCheckedSet(id, checked); - this.refreshCheckedStatus(); - } - - refreshCheckedStatus(): void { - this.checked = this.subjects.every(({ id }) => this.setOfCheckedId.has(id)) && (this.subjects.length > 0); - } - - updateCheckedSet(id: number, checked: boolean): void { + const nextValue = new Set(this.setOfCheckedId$.value); if (checked) { - this.setOfCheckedId.add(id); + nextValue.add(id); } else { - this.setOfCheckedId.delete(id); + nextValue.delete(id); } + this.setOfCheckedId$.next(nextValue); } addSelectedToGroup() { // TODO implement function } - - transition() { - if (this.isProjectSpecific) { - this.loadSubjects(); - } else { - this.router.navigate(['/subject'], { - queryParams: { - page: this.page, - sort: this.predicate + ',' + (this.ascending ? 'asc' : 'desc'), - }, - }).then(() => this.loadSubjects()); - } - } } diff --git a/src/main/webapp/app/shared/subject/subject.model.ts b/src/main/webapp/app/shared/subject/subject.model.ts index 4eae77c66..44d979c1b 100644 --- a/src/main/webapp/app/shared/subject/subject.model.ts +++ b/src/main/webapp/app/shared/subject/subject.model.ts @@ -19,7 +19,7 @@ export class Subject { public personName?: string; public project?: Project; public sources?: MinimalSource[]; - public attributes: Dictionary; + public attributes: Record; public status: SubjectStatus; public roles?: Role[]; diff --git a/src/main/webapp/app/shared/subject/subject.module.ts b/src/main/webapp/app/shared/subject/subject.module.ts index 51cda75ab..252204031 100644 --- a/src/main/webapp/app/shared/subject/subject.module.ts +++ b/src/main/webapp/app/shared/subject/subject.module.ts @@ -4,6 +4,8 @@ import { QrCodeModule } from 'ng-qrcode'; import { ManagementPortalSharedModule } from '../../shared'; import { + FilterBadgeComponent, + LoadMoreComponent, SubjectComponent, SubjectDeleteDialogComponent, SubjectDeletePopupComponent, @@ -34,6 +36,8 @@ const ENTITY_STATES = [ QrCodeModule, ], declarations: [ + FilterBadgeComponent, + LoadMoreComponent, SubjectComponent, SubjectDetailComponent, SubjectRevisionComponent, diff --git a/src/main/webapp/app/shared/util/reactive-filter.ts b/src/main/webapp/app/shared/util/reactive-filter.ts new file mode 100644 index 000000000..203da7a75 --- /dev/null +++ b/src/main/webapp/app/shared/util/reactive-filter.ts @@ -0,0 +1,121 @@ +/* + * Copyright (c) 2021. The Hyve + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * + * See the file LICENSE in the root of this repository. + */ + +import { BehaviorSubject, merge, Observable, Subject } from "rxjs"; +import { debounceTime, distinctUntilChanged, filter, map, shareReplay } from "rxjs/operators"; +import { + NgbCalendar, + NgbDate, + NgbDateParserFormatter, + NgbDateStruct +} from "@ng-bootstrap/ng-bootstrap"; + +export class ReactiveFilter { + private readonly _value$: BehaviorSubject; + private readonly _error$: BehaviorSubject; + private readonly trigger$: Subject; + + error$: Observable + rawValue$: Observable + value$: Observable; + formattedValue$: Observable; + + constructor( + options?: ReactiveFilterOptions + ) { + if (!options) { + options = {}; + } + this._error$ = new BehaviorSubject(''); + this.error$ = this._error$.asObservable().pipe(distinctUntilChanged()) + + this._value$ = new BehaviorSubject(null); + this.rawValue$ = this._value$.asObservable(); + this.trigger$ = new Subject(); + let debouncedValue = this._value$.pipe(debounceTime(300)); + if (options.validate) { + debouncedValue = this._value$.pipe( + filter(v => { + const error = options.validate(v); + if (error) { + this._error$.next(error); + return false; + } else { + this._error$.next(''); + return true; + } + }) + ) + } + if (options.mapValue) { + debouncedValue = options.mapValue(debouncedValue); + } + let mergedSignal = merge(debouncedValue, this.trigger$.pipe(debounceTime(10))); + if (options.mapResult) { + mergedSignal = options.mapResult(mergedSignal); + } else { + mergedSignal = mergedSignal.pipe(distinctUntilChanged()); + } + this.value$ = mergedSignal.pipe(shareReplay(1)); + if (options.formatResult) { + this.formattedValue$ = options.formatResult(this.value$); + } else { + this.formattedValue$ = this.value$.pipe( + map(v => v !== null ? v.toString() : '') + ); + } + } + + get rawValue(): T | null { + return this._value$.value; + } + + next(value?: T){ + this._value$.next(value); + } + clear() { + this._value$.next(null); + this._error$.next(''); + this.trigger$.next(null); + } + complete() { + this._value$.complete(); + this._error$.complete(); + this.trigger$.complete(); + } +} + +export interface ReactiveFilterOptions { + validate?: (value: T | null) => string | null; + mapValue?: (value$: Observable) => Observable + mapResult?: (value$: Observable) => Observable, + formatResult?: (value$: Observable) => Observable +} + +export class NgbDateReactiveFilter extends ReactiveFilter { + constructor( + calendar: NgbCalendar, + formatter: NgbDateParserFormatter, + options: ReactiveFilterOptions = {}, + ) { + super({ + validate: options.validate, + mapValue: options.mapValue ? options.mapValue : $v => $v.pipe( + filter(date => date === null || calendar.isValid(NgbDate.from(date))) + ), + mapResult: options.mapResult ? options.mapResult : $v => $v.pipe( + distinctUntilChanged((d1, d2) => d1 === d2 + || (d1 !== null && NgbDate.from(d1).equals(d2))) + ), + formatResult: options.formatResult ? options.formatResult : $v => $v.pipe( + map(v => formatter.format(v)) + ), + }); + } +} diff --git a/src/test/javascript/e2e/cypress/integration/entities/subject.spec.ts b/src/test/javascript/e2e/cypress/integration/entities/subject.spec.ts index 88a5fbb81..ddd9b47a5 100644 --- a/src/test/javascript/e2e/cypress/integration/entities/subject.spec.ts +++ b/src/test/javascript/e2e/cypress/integration/entities/subject.spec.ts @@ -133,20 +133,23 @@ describe('Subject e2e test', () => { cy.wait(1000); cy.get('jhi-subjects #field-order-by').click(); cy.get('jhi-subjects #order-by-desc').click(); + cy.wait(100); cy.get('jhi-subjects .subject-row').first().should('contain.text', 'sub-9'); cy.get('jhi-subjects #field-order-by').click(); cy.get('jhi-subjects #order-by-asc').click(); + cy.wait(100); cy.get('jhi-subjects .subject-row').eq(1).should('contain.text', 'sub-1'); }); - it('should be able to sort subjects by external id in asc/desc order', () => { cy.wait(1000); cy.get('jhi-subjects #field-sort-by').click(); cy.get('jhi-subjects #sort-by-externalId').click(); + cy.wait(100); cy.get('jhi-subjects .subject-row').first().should('contain.text', 'sub-1'); cy.get('jhi-subjects #field-order-by').click(); cy.get('jhi-subjects #order-by-desc').click(); + cy.wait(100); cy.get('jhi-subjects .subject-row').first().should('contain.text', 'test-subject-1'); }); @@ -169,15 +172,14 @@ describe('Subject e2e test', () => { it('should show number of loaded subjects and total number of subjects', () => { cy.wait(1000); cy.contains('jhi-project-detail ul.nav-tabs .nav-item', 'Subjects').click(); - cy.get('jhi-subjects a.subject-pagination__load-more').should('have.text', 'Load more (20/25 shown)'); + cy.get('app-load-more a.load-more').should('have.text', 'Load more (20/25 shown)'); cy.get('jhi-subjects .subject-row').should('have.length', 20); }); it('should be able to load subjects on loadMore click', () => { cy.wait(1000); - cy.get('jhi-subjects a.subject-pagination__load-more').click(); - cy.get('jhi-subjects span.subject-pagination__all-loaded').should('have.text', 'All 25 subjects loaded'); + cy.get('app-load-more a.load-more').click(); + cy.get('app-load-more span.all-loaded').should('have.text', 'All 25 subjects loaded'); cy.get('jhi-subjects .subject-row').should('have.length', 25); }); - }); From c4d4cdda893cd1c018c9bb7e6075cbb4156b3947 Mon Sep 17 00:00:00 2001 From: aykl Date: Wed, 10 Nov 2021 17:59:36 +0100 Subject: [PATCH 170/431] OrganizationResource added --- .../auth/authorization/Permission.java | 5 + .../authorization/RadarAuthorization.java | 21 ++ .../auth/token/AbstractRadarToken.java | 38 ++++ .../org/radarbase/auth/token/RadarToken.java | 8 + .../management/domain/Organization.java | 114 +++++++++++ .../repository/OrganizationRepository.java | 22 +++ .../service/OrganizationService.java | 68 +++++++ .../service/ResourceUriService.java | 11 ++ .../service/dto/OrganizationDTO.java | 90 +++++++++ .../service/mapper/OrganizationMapper.java | 15 ++ .../web/rest/OrganizationResource.java | 121 ++++++++++++ .../web/rest/errors/EntityName.java | 1 + .../web/rest/errors/ErrorConstants.java | 2 + .../20211110160000_add_organization.xml | 62 ++++++ .../resources/config/liquibase/master.xml | 1 + .../web/rest/GroupResourceIntTest.java | 84 ++++---- .../web/rest/OrganizationResourceIntTest.java | 180 ++++++++++++++++++ 17 files changed, 801 insertions(+), 42 deletions(-) create mode 100644 src/main/java/org/radarbase/management/domain/Organization.java create mode 100644 src/main/java/org/radarbase/management/repository/OrganizationRepository.java create mode 100644 src/main/java/org/radarbase/management/service/OrganizationService.java create mode 100644 src/main/java/org/radarbase/management/service/dto/OrganizationDTO.java create mode 100644 src/main/java/org/radarbase/management/service/mapper/OrganizationMapper.java create mode 100644 src/main/java/org/radarbase/management/web/rest/OrganizationResource.java create mode 100644 src/main/resources/config/liquibase/changelog/20211110160000_add_organization.xml create mode 100644 src/test/java/org/radarbase/management/web/rest/OrganizationResourceIntTest.java diff --git a/radar-auth/src/main/java/org/radarbase/auth/authorization/Permission.java b/radar-auth/src/main/java/org/radarbase/auth/authorization/Permission.java index ba04fdad2..738e551f5 100644 --- a/radar-auth/src/main/java/org/radarbase/auth/authorization/Permission.java +++ b/radar-auth/src/main/java/org/radarbase/auth/authorization/Permission.java @@ -26,6 +26,7 @@ public enum Entity { USER, ROLE, PROJECT, + ORGANIZATION, OAUTHCLIENTS, AUDIT, AUTHORITY, @@ -83,6 +84,10 @@ public enum Operation { new Permission(Entity.PROJECT, Operation.UPDATE); public static final Permission PROJECT_DELETE = new Permission(Entity.PROJECT, Operation.DELETE); + public static final Permission ORGANIZATION_CREATE = + new Permission(Entity.ORGANIZATION, Operation.CREATE); + public static final Permission ORGANIZATION_READ = + new Permission(Entity.ORGANIZATION, Operation.READ); public static final Permission OAUTHCLIENTS_CREATE = new Permission(Entity.OAUTHCLIENTS, Operation.CREATE); public static final Permission OAUTHCLIENTS_READ = diff --git a/radar-auth/src/main/java/org/radarbase/auth/authorization/RadarAuthorization.java b/radar-auth/src/main/java/org/radarbase/auth/authorization/RadarAuthorization.java index 5d104a7a5..dac78c0c5 100644 --- a/radar-auth/src/main/java/org/radarbase/auth/authorization/RadarAuthorization.java +++ b/radar-auth/src/main/java/org/radarbase/auth/authorization/RadarAuthorization.java @@ -75,6 +75,27 @@ public static void checkPermission(RadarToken token, Permission permission) } } + /** + * Similar to {@link RadarToken#hasPermissionOnOrganization(Permission, String)}, + * but this method throws an exception rather than returning a boolean. + * Useful in combination with e.g. Spring's controllers and exception translators. + * @param token The token of the logged in user + * @param permission The permission to check + * @param organizationName The organization for which to check the permission + * @throws NotAuthorizedException if the supplied token + * does not have the permission in the given organization + */ + public static void checkPermissionOnOrganization(RadarToken token, Permission permission, + String organizationName) throws NotAuthorizedException { + log.debug("Checking permission {} for user {} in organization {}", permission.toString(), + token.getSubject(), organizationName); + if (!token.hasPermissionOnOrganization(permission, organizationName)) { + throw new NotAuthorizedException(String.format("Client %s does not have " + + "permission %s in organization %s", + token.getSubject(), permission.toString(), organizationName)); + } + } + /** * Similar to {@link RadarToken#hasPermissionOnProject(Permission, String)}, but this method * throws an exception rather than returning a boolean. Useful in combination with e.g. Spring's diff --git a/radar-auth/src/main/java/org/radarbase/auth/token/AbstractRadarToken.java b/radar-auth/src/main/java/org/radarbase/auth/token/AbstractRadarToken.java index ee1ef4714..489b95aae 100644 --- a/radar-auth/src/main/java/org/radarbase/auth/token/AbstractRadarToken.java +++ b/radar-auth/src/main/java/org/radarbase/auth/token/AbstractRadarToken.java @@ -31,6 +31,12 @@ public boolean hasPermission(Permission permission) { } + @Override + public boolean hasPermissionOnOrganization(Permission permission, String orgName) { + return hasScope(permission.scopeName()) + && (isClientCredentials() || hasAuthorityForOrganization(permission, orgName)); + } + @Override public boolean hasPermissionOnProject(Permission permission, String projectName) { return hasScope(permission.scopeName()) @@ -76,6 +82,25 @@ protected boolean hasAuthorityForPermission(Permission permission) { .anyMatch(permission::isAuthorityAllowed); } + /** + * Check authorities in this token linked to the given organization, + * or not linked to any project (such as {@code SYS_ADMIN}), + * for the given permission. + * @param permission the permission + * @param organizationName the organization name + * @return {@code true} if any authority contains the permission, {@code false} otherwise + */ + protected boolean hasAuthorityForOrganization(Permission permission, String organizationName) { + if (hasNonOrganizationRelatedAuthorityForPermission(permission)) { + return true; + } + if (organizationName == null) { + return false; + } + // TODO implement role/authority check for organizations + return false; + } + /** * Check authorities in this token linked to the given project, or not linked to any project * (such as {@code SYS_ADMIN}), for the given permission. @@ -127,6 +152,19 @@ protected boolean hasAuthorityForSource(Permission permission, String projectNam } } + /** + * Check if any non-organization related authority has the given permission. + * Currently the only non-organization authority is {@code SYS_ADMIN}, + * so we only check for that. + * @param permission the permission + * @return {@code true} if any non-organization related authority has the permission, + * {@code false} otherwise + */ + protected boolean hasNonOrganizationRelatedAuthorityForPermission(Permission permission) { + return getAuthorities().contains(SYS_ADMIN) + && permission.isAuthorityAllowed(SYS_ADMIN); + } + /** * Check if any non-project related authority has the given permission. Currently the only * non-project authority is {@code SYS_ADMIN}, so we only check for that. diff --git a/radar-auth/src/main/java/org/radarbase/auth/token/RadarToken.java b/radar-auth/src/main/java/org/radarbase/auth/token/RadarToken.java index d33afae31..b453fce4c 100644 --- a/radar-auth/src/main/java/org/radarbase/auth/token/RadarToken.java +++ b/radar-auth/src/main/java/org/radarbase/auth/token/RadarToken.java @@ -133,6 +133,14 @@ public interface RadarToken { */ boolean hasPermission(Permission permission); + /** + * Check if this token gives a permission in a specific organization. + * @param permission the permission + * @param organizationName the organization name + * @return true if this token has the permission in the organization, false otherwise + */ + boolean hasPermissionOnOrganization(Permission permission, String organizationName); + /** * Check if this token gives a permission in a specific project. * @param permission the permission diff --git a/src/main/java/org/radarbase/management/domain/Organization.java b/src/main/java/org/radarbase/management/domain/Organization.java new file mode 100644 index 000000000..e33beaf00 --- /dev/null +++ b/src/main/java/org/radarbase/management/domain/Organization.java @@ -0,0 +1,114 @@ +package org.radarbase.management.domain; + +import org.hibernate.annotations.Cache; +import org.hibernate.annotations.CacheConcurrencyStrategy; +import org.hibernate.envers.Audited; +import org.radarbase.auth.config.Constants; +import org.radarbase.management.domain.support.AbstractEntityListener; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.EntityListeners; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.SequenceGenerator; +import javax.persistence.Table; +import javax.validation.constraints.NotNull; +import javax.validation.constraints.Pattern; +import java.util.Objects; + +/** + * An Organization. + */ +@Entity +@Audited +@Table(name = "radar_organization") +@Cache(usage = CacheConcurrencyStrategy.NONSTRICT_READ_WRITE) +@EntityListeners({AbstractEntityListener.class}) +public class Organization extends AbstractEntity { + + private static final long serialVersionUID = 1L; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "sequenceGenerator") + @SequenceGenerator(name = "sequenceGenerator", initialValue = 1000, + sequenceName = "hibernate_sequence") + private Long id; + + @NotNull + @Pattern(regexp = Constants.ENTITY_ID_REGEX) + @Column(name = "name", nullable = false, unique = true) + private String name; + + @NotNull + @Column(name = "description", nullable = false) + private String description; + + @NotNull + @Column(name = "location", nullable = false) + private String location; + + @Override + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public String getLocation() { + return location; + } + + public void setLocation(String location) { + this.location = location; + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + var org = (Organization) o; + if (org.id == null || id == null) { + return false; + } + return Objects.equals(id, org.id); + } + + @Override + public int hashCode() { + return Objects.hashCode(id); + } + + @Override + public String toString() { + return "Organization{" + + "id=" + id + + ", name='" + name + "'" + + ", description='" + description + "'" + + ", location='" + location + "'" + + "}"; + } +} diff --git a/src/main/java/org/radarbase/management/repository/OrganizationRepository.java b/src/main/java/org/radarbase/management/repository/OrganizationRepository.java new file mode 100644 index 000000000..3e05c0daf --- /dev/null +++ b/src/main/java/org/radarbase/management/repository/OrganizationRepository.java @@ -0,0 +1,22 @@ +package org.radarbase.management.repository; + +import java.util.Optional; + +import org.radarbase.management.domain.Organization; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Query; +import org.springframework.data.repository.RepositoryDefinition; +import org.springframework.data.repository.history.RevisionRepository; +import org.springframework.data.repository.query.Param; + +/** + * Spring Data JPA repository for the Organization entity. + */ +@RepositoryDefinition(domainClass = Organization.class, idClass = Long.class) +public interface OrganizationRepository extends JpaRepository, + RevisionRepository { + + @Query("select org from Organization org " + + "where org.name = :name") + Optional findOneByName(@Param("name") String name); +} diff --git a/src/main/java/org/radarbase/management/service/OrganizationService.java b/src/main/java/org/radarbase/management/service/OrganizationService.java new file mode 100644 index 000000000..6aa127ad3 --- /dev/null +++ b/src/main/java/org/radarbase/management/service/OrganizationService.java @@ -0,0 +1,68 @@ +package org.radarbase.management.service; + +import org.radarbase.management.repository.OrganizationRepository; +import org.radarbase.management.service.dto.OrganizationDTO; +import org.radarbase.management.service.mapper.OrganizationMapper; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; +import java.util.Optional; +import java.util.stream.Collectors; + +/** + * Service Implementation for managing Organization. + */ +@Service +@Transactional +public class OrganizationService { + + private static final Logger log = LoggerFactory.getLogger(OrganizationService.class); + + @Autowired + private OrganizationRepository organizationRepository; + + @Autowired + private OrganizationMapper organizationMapper; + + /** + * Save an organization. + * + * @param organizationDto the entity to save + * @return the persisted entity + */ + public OrganizationDTO save(OrganizationDTO organizationDto) { + log.debug("Request to save Organization : {}", organizationDto); + var org = organizationMapper.organizationDTOToOrganization(organizationDto); + org = organizationRepository.save(org); + return organizationMapper.organizationToOrganizationDTO(org); + } + + /** + * Get all the organizations. + * + * @return the list of entities + */ + @Transactional(readOnly = true) + public List findAll() { + return organizationRepository.findAll().stream() + .map(organizationMapper::organizationToOrganizationDTO) + .collect(Collectors.toList()); + } + + /** + * Get one organization by name. + * + * @param name the name of the entity + * @return the entity + */ + @Transactional(readOnly = true) + public Optional findByName(String name) { + log.debug("Request to get Organization by name: {}", name); + return organizationRepository.findOneByName(name) + .map(organizationMapper::organizationToOrganizationDTO); + } +} diff --git a/src/main/java/org/radarbase/management/service/ResourceUriService.java b/src/main/java/org/radarbase/management/service/ResourceUriService.java index c8dd4077a..f16481f85 100644 --- a/src/main/java/org/radarbase/management/service/ResourceUriService.java +++ b/src/main/java/org/radarbase/management/service/ResourceUriService.java @@ -5,6 +5,7 @@ import org.radarbase.management.domain.User; import org.radarbase.management.service.dto.ClientDetailsDTO; import org.radarbase.management.service.dto.MinimalSourceDetailsDTO; +import org.radarbase.management.service.dto.OrganizationDTO; import org.radarbase.management.service.dto.ProjectDTO; import org.radarbase.management.service.dto.RoleDTO; import org.radarbase.management.service.dto.SourceDTO; @@ -25,6 +26,16 @@ private ResourceUriService() { // utility class } + /** + * Get the API location for the given resource. + * @param resource the resource + * @return the API location + * @throws URISyntaxException See {@link URI#URI(String)} + */ + public static URI getUri(OrganizationDTO resource) throws URISyntaxException { + return new URI(HeaderUtil.buildPath("api", "organizations", resource.getName())); + } + /** * Get the API location for the given resource. * @param resource the resource diff --git a/src/main/java/org/radarbase/management/service/dto/OrganizationDTO.java b/src/main/java/org/radarbase/management/service/dto/OrganizationDTO.java new file mode 100644 index 000000000..63d25fd4e --- /dev/null +++ b/src/main/java/org/radarbase/management/service/dto/OrganizationDTO.java @@ -0,0 +1,90 @@ +package org.radarbase.management.service.dto; + + +import com.fasterxml.jackson.annotation.JsonInclude; +import java.io.Serializable; +import java.util.Objects; +import javax.validation.constraints.NotNull; + +/** + * A DTO for the Organization entity. + */ +@JsonInclude(JsonInclude.Include.NON_NULL) +public class OrganizationDTO implements Serializable { + private static final long serialVersionUID = 1L; + + private Long id; + + @NotNull + private String name; + + @NotNull + private String description; + + @NotNull + private String location; + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public String getLocation() { + return location; + } + + public void setLocation(String location) { + this.location = location; + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + + var orgDto = (OrganizationDTO) o; + if (id == null || orgDto.id == null) { + return false; + } + + return Objects.equals(id, orgDto.id); + } + + @Override + public int hashCode() { + return Objects.hashCode(id); + } + + @Override + public String toString() { + return "OrganizationDTO{" + + "id=" + id + + ", name='" + name + "'" + + ", description='" + description + "'" + + ", location='" + location + "'" + + '}'; + } +} diff --git a/src/main/java/org/radarbase/management/service/mapper/OrganizationMapper.java b/src/main/java/org/radarbase/management/service/mapper/OrganizationMapper.java new file mode 100644 index 000000000..d4b387c3a --- /dev/null +++ b/src/main/java/org/radarbase/management/service/mapper/OrganizationMapper.java @@ -0,0 +1,15 @@ +package org.radarbase.management.service.mapper; + +import org.mapstruct.Mapper; +import org.radarbase.management.domain.Organization; +import org.radarbase.management.service.dto.OrganizationDTO; + +/** + * Mapper for the entity Organization and its DTO OrganizationDTO. + */ +@Mapper(componentModel = "spring") +public interface OrganizationMapper { + OrganizationDTO organizationToOrganizationDTO(Organization organization); + + Organization organizationDTOToOrganization(OrganizationDTO organizationDto); +} diff --git a/src/main/java/org/radarbase/management/web/rest/OrganizationResource.java b/src/main/java/org/radarbase/management/web/rest/OrganizationResource.java new file mode 100644 index 000000000..932a17d8f --- /dev/null +++ b/src/main/java/org/radarbase/management/web/rest/OrganizationResource.java @@ -0,0 +1,121 @@ +package org.radarbase.management.web.rest; + +import io.micrometer.core.annotation.Timed; +import org.radarbase.auth.config.Constants; +import org.radarbase.auth.exception.NotAuthorizedException; +import org.radarbase.auth.token.RadarToken; +import org.radarbase.management.service.OrganizationService; +import org.radarbase.management.service.ResourceUriService; +import org.radarbase.management.service.dto.OrganizationDTO; +import org.radarbase.management.web.rest.errors.NotFoundException; +import org.radarbase.management.web.rest.errors.ErrorConstants; +import org.radarbase.management.web.rest.util.HeaderUtil; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.validation.Valid; +import java.net.URISyntaxException; +import java.util.Collections; + +import static org.radarbase.management.web.rest.errors.EntityName.ORGANIZATION; +import static org.radarbase.auth.authorization.Permission.ORGANIZATION_CREATE; +import static org.radarbase.auth.authorization.Permission.ORGANIZATION_READ; +import static org.radarbase.auth.authorization.RadarAuthorization.checkPermission; +import static org.radarbase.auth.authorization.RadarAuthorization.checkPermissionOnOrganization; + +/** + * REST controller for managing Organization. + */ +@RestController +@RequestMapping("/api") +public class OrganizationResource { + + private static final Logger log = LoggerFactory.getLogger(OrganizationResource.class); + + private static final String ENTITY_NAME = "organization"; + + @Autowired + private OrganizationService organizationService; + + @Autowired + private RadarToken token; + + /** + * POST /organizations : Create a new organization. + * + * @param organizationDto the organizationDto to create + * @return the ResponseEntity with status 201 (Created) + * and with body the new organizationDto, + * or with status 400 (Bad Request) if the organization already has an ID + * @throws URISyntaxException if the Location URI syntax is incorrect + */ + @PostMapping("/organizations") + @Timed + public ResponseEntity createOrganization( + @Valid @RequestBody OrganizationDTO organizationDto + ) throws URISyntaxException, NotAuthorizedException { + log.debug("REST request to save Organization : {}", organizationDto); + // checkPermission(token, ORGANIZATION_CREATE); + if (organizationDto.getId() != null) { + var msg = "A new organization cannot already have an ID"; + var headers = HeaderUtil.createFailureAlert(ENTITY_NAME, "idexists", msg); + return ResponseEntity.badRequest().headers(headers).body(null); + } + var existingOrg = organizationService.findByName(organizationDto.getName()); + if (existingOrg.isPresent()) { + var msg = "An organization with this name already exists"; + var headers = HeaderUtil.createFailureAlert(ENTITY_NAME, "nameexists", msg); + return ResponseEntity.status(HttpStatus.CONFLICT).headers(headers).body(null); + } + var result = organizationService.save(organizationDto); + return ResponseEntity.created(ResourceUriService.getUri(result)) + .headers(HeaderUtil.createEntityCreationAlert(ENTITY_NAME, result.getName())) + .body(result); + } + + /** + * GET /organizations : get all the organizations. + * + * @return the ResponseEntity with status 200 (OK) + * and the list of organizations in body + */ + @GetMapping("/organizations") + @Timed + public ResponseEntity getAllOrganizations() throws NotAuthorizedException { + log.debug("REST request to get Organizations"); + // checkPermission(token, ORGANIZATION_READ); + var orgs = organizationService.findAll(); + return new ResponseEntity<>(orgs, HttpStatus.OK); + } + + /** + * GET /organizations/:organizationName : get the organization with this name. + * + * @param name the name of the organizationDTO to retrieve + * @return the ResponseEntity with status 200 (OK) + * and with body the organizationDTO, + * or with status 404 (Not Found) + */ + @GetMapping("/organizations/{name:" + Constants.ENTITY_ID_REGEX + "}") + @Timed + public ResponseEntity getOrganization( + @PathVariable String name) throws NotAuthorizedException { + log.debug("REST request to get Organization : {}", name); + // checkPermissionOnOrganization(token, ORGANIZATION_READ, name); + var org = organizationService.findByName(name); + var dto = org.orElseThrow(() -> new NotFoundException( + "Organization not found with name " + name, + ORGANIZATION, ErrorConstants.ERR_ORGANIZATION_NAME_NOT_FOUND, + Collections.singletonMap("name", name))); + return ResponseEntity.ok(dto); + } +} diff --git a/src/main/java/org/radarbase/management/web/rest/errors/EntityName.java b/src/main/java/org/radarbase/management/web/rest/errors/EntityName.java index e94be6a2d..a8dc96baf 100644 --- a/src/main/java/org/radarbase/management/web/rest/errors/EntityName.java +++ b/src/main/java/org/radarbase/management/web/rest/errors/EntityName.java @@ -9,6 +9,7 @@ public interface EntityName { String USER = "userManagement"; String SOURCE = "source"; String META_TOKEN = "meta-token"; + String ORGANIZATION = "organization"; String PROJECT = "project"; String REVISION = "revision"; String GROUP = "group"; diff --git a/src/main/java/org/radarbase/management/web/rest/errors/ErrorConstants.java b/src/main/java/org/radarbase/management/web/rest/errors/ErrorConstants.java index b99891beb..3719b57d6 100644 --- a/src/main/java/org/radarbase/management/web/rest/errors/ErrorConstants.java +++ b/src/main/java/org/radarbase/management/web/rest/errors/ErrorConstants.java @@ -22,6 +22,8 @@ public final class ErrorConstants { public static final String ERR_GROUP_EXISTS = "error.groupExists"; public static final String ERR_INVALID_AUTHORITY = "error.invalidAuthority"; public static final String ERR_EMAIL_EXISTS = "error.emailexists"; + public static final String ERR_ORGANIZATION_NAME_NOT_FOUND = "error" + + ".organizationNameNotFound"; public static final String ERR_PROJECT_ID_NOT_FOUND = "error.projectIdNotFound"; public static final String ERR_PROJECT_NAME_NOT_FOUND = "error.projectNameNotFound"; public static final String ERR_REVISIONS_NOT_FOUND = "error.revisionsNotFound"; diff --git a/src/main/resources/config/liquibase/changelog/20211110160000_add_organization.xml b/src/main/resources/config/liquibase/changelog/20211110160000_add_organization.xml new file mode 100644 index 000000000..b38cc692d --- /dev/null +++ b/src/main/resources/config/liquibase/changelog/20211110160000_add_organization.xml @@ -0,0 +1,62 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/resources/config/liquibase/master.xml b/src/main/resources/config/liquibase/master.xml index b3b20e0b9..5d19bdf55 100644 --- a/src/main/resources/config/liquibase/master.xml +++ b/src/main/resources/config/liquibase/master.xml @@ -40,5 +40,6 @@ + diff --git a/src/test/java/org/radarbase/management/web/rest/GroupResourceIntTest.java b/src/test/java/org/radarbase/management/web/rest/GroupResourceIntTest.java index 9c24f3221..aadfe35a3 100644 --- a/src/test/java/org/radarbase/management/web/rest/GroupResourceIntTest.java +++ b/src/test/java/org/radarbase/management/web/rest/GroupResourceIntTest.java @@ -56,9 +56,9 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; /** - * Test class for the ProjectResource REST controller. + * Test class for the GroupResource REST controller. * - * @see ProjectResource + * @see GroupResource */ @ExtendWith(SpringExtension.class) @SpringBootTest(classes = ManagementPortalTestApp.class) @@ -101,7 +101,7 @@ class GroupResourceIntTest { @Autowired private RadarToken token; - private MockMvc restProjectMockMvc; + private MockMvc restGroupMockMvc; private Group group; @@ -110,14 +110,14 @@ class GroupResourceIntTest { @BeforeEach public void setUp() throws ServletException { MockitoAnnotations.initMocks(this); - GroupResource projectResource = new GroupResource(); - ReflectionTestUtils.setField(projectResource, "groupService", groupService); - ReflectionTestUtils.setField(projectResource, "token", token); + var groupResource = new GroupResource(); + ReflectionTestUtils.setField(groupResource, "groupService", groupService); + ReflectionTestUtils.setField(groupResource, "token", token); JwtAuthenticationFilter filter = OAuthHelper.createAuthenticationFilter(); filter.init(new MockFilterConfig()); - this.restProjectMockMvc = MockMvcBuilders.standaloneSetup(projectResource) + this.restGroupMockMvc = MockMvcBuilders.standaloneSetup(groupResource) .setCustomArgumentResolvers(pageableArgumentResolver) .setControllerAdvice(exceptionTranslator) .setMessageConverters(jacksonMessageConverter) @@ -151,9 +151,9 @@ private Group createEntity() { @Test void createGroup() throws Exception { - // Create the Project - GroupDTO groupDto = groupMapper.groupToGroupDTO(group); - restProjectMockMvc.perform(post("/api/projects/{projectName}/groups", + // Create the Group + var groupDto = groupMapper.groupToGroupDTO(group); + restGroupMockMvc.perform(post("/api/projects/{projectName}/groups", project.getProjectName()) .contentType(TestUtil.APPLICATION_JSON_UTF8) .content(TestUtil.convertObjectToJsonBytes(groupDto))) @@ -172,9 +172,9 @@ void createGroup() throws Exception { void createGroupNonExistingProject() throws Exception { projectRepository.delete(project); - // Create the Project - GroupDTO groupDto = groupMapper.groupToGroupDTO(group); - restProjectMockMvc.perform(post("/api/projects/{projectName}/groups", + // Create the Group + var groupDto = groupMapper.groupToGroupDTO(group); + restGroupMockMvc.perform(post("/api/projects/{projectName}/groups", project.getProjectName()) .contentType(TestUtil.APPLICATION_JSON_UTF8) .content(TestUtil.convertObjectToJsonBytes(groupDto))) @@ -183,15 +183,15 @@ void createGroupNonExistingProject() throws Exception { @Test void createGroupWithExistingName() throws Exception { - // Create the Project - GroupDTO groupDto = groupMapper.groupToGroupDTO(group); - restProjectMockMvc.perform(post("/api/projects/{projectName}/groups", + // Create the Group + var groupDto = groupMapper.groupToGroupDTO(group); + restGroupMockMvc.perform(post("/api/projects/{projectName}/groups", project.getProjectName()) .contentType(TestUtil.APPLICATION_JSON_UTF8) .content(TestUtil.convertObjectToJsonBytes(groupDto))) .andExpect(status().isCreated()); - restProjectMockMvc.perform(post("/api/projects/{projectName}/groups", + restGroupMockMvc.perform(post("/api/projects/{projectName}/groups", project.getProjectName()) .contentType(TestUtil.APPLICATION_JSON_UTF8) .content(TestUtil.convertObjectToJsonBytes(groupDto))) @@ -209,16 +209,16 @@ void createGroupWithExistingNameInDifferentProject() throws Exception { group2.setName(group.getName()); group2.setProject(project2); - // Create the Project - GroupDTO groupDto = groupMapper.groupToGroupDTO(group); - restProjectMockMvc.perform(post("/api/projects/{projectName}/groups", + // Create the Group + var groupDto = groupMapper.groupToGroupDTO(group); + restGroupMockMvc.perform(post("/api/projects/{projectName}/groups", project.getProjectName()) .contentType(TestUtil.APPLICATION_JSON_UTF8) .content(TestUtil.convertObjectToJsonBytes(groupDto))) .andExpect(status().isCreated()); - GroupDTO group2Dto = groupMapper.groupToGroupDTO(group2); - restProjectMockMvc.perform(post("/api/projects/{projectName}/groups", + var group2Dto = groupMapper.groupToGroupDTO(group2); + restGroupMockMvc.perform(post("/api/projects/{projectName}/groups", project2.getProjectName()) .contentType(TestUtil.APPLICATION_JSON_UTF8) .content(TestUtil.convertObjectToJsonBytes(group2Dto))) @@ -245,9 +245,9 @@ void createGroupWithExistingNameInDifferentProject() throws Exception { void checkGroupNameIsRequired() throws Exception { group.setName(null); - // Create the Project - GroupDTO groupDto = groupMapper.groupToGroupDTO(group); - restProjectMockMvc.perform(post("/api/projects/{projectName}/groups", + // Create the Group + var groupDto = groupMapper.groupToGroupDTO(group); + restGroupMockMvc.perform(post("/api/projects/{projectName}/groups", project.getProjectName()) .contentType(TestUtil.APPLICATION_JSON_UTF8) .content(TestUtil.convertObjectToJsonBytes(groupDto))) @@ -259,8 +259,8 @@ void getAllGroups() throws Exception { // Initialize the database groupRepository.saveAndFlush(group); - // Get all the projectList - restProjectMockMvc.perform(get("/api/projects/{projectName}/groups", + // Get all the groups + restGroupMockMvc.perform(get("/api/projects/{projectName}/groups", project.getProjectName())) .andExpect(status().isOk()) .andExpect(content().contentType(MediaType.APPLICATION_JSON)) @@ -274,8 +274,8 @@ void getGroup() throws Exception { // Initialize the database groupRepository.saveAndFlush(group); - // Get the project - restProjectMockMvc.perform(get("/api/projects/{projectName}/groups/{groupName}", + // Get the Group + restGroupMockMvc.perform(get("/api/projects/{projectName}/groups/{groupName}", project.getProjectName(), group.getName())) .andExpect(status().isOk()) .andExpect(content().contentType(MediaType.APPLICATION_JSON)) @@ -285,8 +285,8 @@ void getGroup() throws Exception { @Test void getNonExistingGroup() throws Exception { - // Get the project - restProjectMockMvc.perform(get("/api/projects/{projectName}/groups/{groupName}", + // Get the Group + restGroupMockMvc.perform(get("/api/projects/{projectName}/groups/{groupName}", project.getProjectName(), group.getName())) .andExpect(status().isNotFound()); } @@ -296,8 +296,8 @@ void deleteGroup() throws Exception { // Initialize the database groupRepository.saveAndFlush(group); - // Get the project - restProjectMockMvc.perform(delete( + // Get the Group + restGroupMockMvc.perform(delete( "/api/projects/{projectName}/groups/{groupName}", project.getProjectName(), group.getName()) .accept(TestUtil.APPLICATION_JSON_UTF8)) @@ -314,8 +314,8 @@ void deleteGroupNonExisting() throws Exception { // Initialize the database groupRepository.saveAndFlush(group); - // Get the project - restProjectMockMvc.perform(delete( + // Get the Group + restGroupMockMvc.perform(delete( "/api/projects/{projectName}/groups/{groupName}", project.getProjectName(), group.getName() + "2") .accept(TestUtil.APPLICATION_JSON_UTF8)) @@ -331,8 +331,8 @@ void deleteGroupNonExistingProject() throws Exception { // Initialize the database groupRepository.saveAndFlush(group); - // Get the project - restProjectMockMvc.perform(delete( + // Get the Group + restGroupMockMvc.perform(delete( "/api/projects/{projectName}/groups/{groupName}", project.getProjectName() + "2", group.getName()) .accept(TestUtil.APPLICATION_JSON_UTF8)) @@ -347,15 +347,15 @@ void addSubjectsToGroup() throws Exception { // Initialize the database groupRepository.saveAndFlush(group); - ProjectDTO projectDto = projectMapper.projectToProjectDTO(project); + var projectDto = projectMapper.projectToProjectDTO(project); - SubjectDTO sub1 = new SubjectDTO(); + var sub1 = new SubjectDTO(); sub1.setExternalLink("exLink1"); sub1.setExternalId("exId1"); sub1.setStatus(ACTIVATED); sub1.setProject(projectDto); - SubjectDTO sub2 = new SubjectDTO(); + var sub2 = new SubjectDTO(); sub2.setExternalLink("exLink2"); sub2.setExternalId("exId2"); sub2.setStatus(ACTIVATED); @@ -379,8 +379,8 @@ void addSubjectsToGroup() throws Exception { List body = new ArrayList<>(); body.add(patchOp); - // Get the project - restProjectMockMvc.perform(patch( + // Get the Group + restGroupMockMvc.perform(patch( "/api/projects/{projectName}/groups/{groupName}/subjects", project.getProjectName(), group.getName()) diff --git a/src/test/java/org/radarbase/management/web/rest/OrganizationResourceIntTest.java b/src/test/java/org/radarbase/management/web/rest/OrganizationResourceIntTest.java new file mode 100644 index 000000000..454143870 --- /dev/null +++ b/src/test/java/org/radarbase/management/web/rest/OrganizationResourceIntTest.java @@ -0,0 +1,180 @@ +package org.radarbase.management.web.rest; + +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.mockito.MockitoAnnotations; +import org.radarbase.auth.authentication.OAuthHelper; +import org.radarbase.auth.token.RadarToken; +import org.radarbase.management.ManagementPortalTestApp; +import org.radarbase.management.domain.Organization; +import org.radarbase.management.repository.OrganizationRepository; +import org.radarbase.management.service.OrganizationService; +import org.radarbase.management.service.mapper.OrganizationMapper; +import org.radarbase.management.web.rest.errors.ExceptionTranslator; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.data.web.PageableHandlerMethodArgumentResolver; +import org.springframework.http.MediaType; +import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter; +import org.springframework.mock.web.MockFilterConfig; +import org.springframework.security.test.context.support.WithMockUser; +import org.springframework.test.context.junit.jupiter.SpringExtension; +import org.springframework.test.util.ReflectionTestUtils; +import org.springframework.test.web.servlet.MockMvc; +import org.springframework.test.web.servlet.setup.MockMvcBuilders; + +import javax.servlet.ServletException; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.hamcrest.Matchers.hasItem; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; + +/** + * Test class for the OrganizationResource REST controller. + * + * @see OrganizationResource + */ +@ExtendWith(SpringExtension.class) +@SpringBootTest(classes = ManagementPortalTestApp.class) +@WithMockUser +class OrganizationResourceIntTest { + + @Autowired + private OrganizationMapper organizationMapper; + + @Autowired + private OrganizationRepository organizationRepository; + + @Autowired + private OrganizationService organizationService; + + @Autowired + private MappingJackson2HttpMessageConverter jacksonMessageConverter; + + @Autowired + private PageableHandlerMethodArgumentResolver pageableArgumentResolver; + + @Autowired + private ExceptionTranslator exceptionTranslator; + + @Autowired + private RadarToken token; + + private MockMvc restOrganizationMockMvc; + + private Organization organization; + + @BeforeEach + public void setUp() throws ServletException { + MockitoAnnotations.initMocks(this); + var orgResource = new OrganizationResource(); + ReflectionTestUtils + .setField(orgResource, "organizationService", organizationService); + ReflectionTestUtils.setField(orgResource, "token", token); + + var filter = OAuthHelper.createAuthenticationFilter(); + filter.init(new MockFilterConfig()); + + this.restOrganizationMockMvc = MockMvcBuilders.standaloneSetup(orgResource) + .setCustomArgumentResolvers(pageableArgumentResolver) + .setControllerAdvice(exceptionTranslator) + .setMessageConverters(jacksonMessageConverter) + .addFilter(filter) + .defaultRequest(get("/").with(OAuthHelper.bearerToken())).build(); + organization = createEntity(); + } + + @AfterEach + public void tearDown() { + var testOrg = organizationRepository.findOneByName(organization.getName()); + testOrg.ifPresent(organizationRepository::delete); + } + + /** + * Create an entity for this test. + */ + private Organization createEntity() { + var org = new Organization(); + org.setName("org1"); + org.setDescription("Test Organization 1"); + org.setLocation("Somewhere"); + return org; + } + + @Test + void createOrganization() throws Exception { + var orgDto = organizationMapper.organizationToOrganizationDTO(organization); + restOrganizationMockMvc.perform(post("/api/organizations") + .contentType(TestUtil.APPLICATION_JSON_UTF8) + .content(TestUtil.convertObjectToJsonBytes(orgDto))) + .andExpect(status().isCreated()); + + // Validate the Organization in the database + var savedOrg = organizationRepository.findOneByName(orgDto.getName()); + assertThat(savedOrg).isNotEmpty(); + } + + @Test + void createOrganizationWithExistingName() throws Exception { + var orgDto = organizationMapper.organizationToOrganizationDTO(organization); + restOrganizationMockMvc.perform(post("/api/organizations") + .contentType(TestUtil.APPLICATION_JSON_UTF8) + .content(TestUtil.convertObjectToJsonBytes(orgDto))) + .andExpect(status().isCreated()); + + // Second request should fail + restOrganizationMockMvc.perform(post("/api/organizations") + .contentType(TestUtil.APPLICATION_JSON_UTF8) + .content(TestUtil.convertObjectToJsonBytes(orgDto))) + .andExpect(status().isConflict()); + } + + @Test + void checkGroupNameIsRequired() throws Exception { + var orgDto = organizationMapper.organizationToOrganizationDTO(organization); + orgDto.setName(null); + restOrganizationMockMvc.perform(post("/api/organizations") + .contentType(TestUtil.APPLICATION_JSON_UTF8) + .content(TestUtil.convertObjectToJsonBytes(orgDto))) + .andExpect(status().isBadRequest()); + } + + @Test + void getAllOrganizations() throws Exception { + // Initialize the database + organizationRepository.saveAndFlush(organization); + + // Get all the organizations + restOrganizationMockMvc.perform(get("/api/organizations")) + .andExpect(status().isOk()) + .andExpect(content().contentType(MediaType.APPLICATION_JSON)) + .andExpect(jsonPath("$.[*].name").value(hasItem("org1"))); + } + + @Test + void getOrganization() throws Exception { + // Initialize the database + organizationRepository.saveAndFlush(organization); + + // Get the organization + restOrganizationMockMvc.perform(get("/api/organizations/{name}", + organization.getName())) + .andExpect(status().isOk()) + .andExpect(content().contentType(MediaType.APPLICATION_JSON)) + .andExpect(jsonPath("$.name").value("org1")); + } + + @Test + void getNonExistingOrganization() throws Exception { + // Get the organization + restOrganizationMockMvc.perform(get("/api/organizations/{name}", + organization.getName())) + .andExpect(status().isNotFound()); + } +} From f1658f510e1da0f730a123efd2d39d93fb7bcf2f Mon Sep 17 00:00:00 2001 From: Joris Borgdorff Date: Thu, 11 Nov 2021 20:29:33 +0100 Subject: [PATCH 171/431] Misc fixes --- .../account/password/password.component.html | 2 +- .../account/password/password.component.ts | 12 +- .../account/settings/settings.component.html | 2 +- .../account/settings/settings.component.ts | 35 ++-- .../admin/user-management/role.component.html | 2 +- .../admin/user-management/role.component.ts | 17 +- .../app/admin/user-management/role.model.ts | 13 +- .../user-management-dialog.component.html | 2 +- .../user-management-dialog.component.ts | 45 +++-- .../user-management.component.html | 4 +- .../user-management.component.ts | 74 ++++---- .../user-management/user-modal.service.ts | 15 +- .../project/project-detail.component.ts | 18 +- .../entities/project/project-popup.service.ts | 8 +- .../app/entities/project/project.route.ts | 3 + .../source-type-dialog.component.ts | 12 +- .../general-source-dialog.component.html | 2 +- .../source/general-source-dialog.component.ts | 16 +- .../general.subject-dialog.component.html | 2 +- .../general.subject-dialog.component.ts | 24 ++- src/main/webapp/app/home/home.component.html | 2 +- src/main/webapp/app/home/home.component.ts | 30 ++- .../app/layouts/navbar/navbar.component.html | 4 +- .../app/layouts/navbar/navbar.component.ts | 52 ++--- .../webapp/app/shared/auth/account.service.ts | 9 +- .../webapp/app/shared/auth/auth.service.ts | 44 ++--- .../auth/has-any-authority.directive.ts | 38 ++-- .../app/shared/auth/principal.service.ts | 81 +++----- .../shared/auth/user-route-access-service.ts | 20 +- .../app/shared/group/group.component.ts | 1 + .../app/shared/language/language.helper.ts | 4 +- .../app/shared/login/login-modal.service.ts | 4 +- .../webapp/app/shared/login/login.service.ts | 1 - .../app/shared/project/project.model.ts | 40 ++-- .../app/shared/project/project.service.ts | 168 ++++++++++++++--- .../shared/subject/filter-badge.component.ts | 2 +- src/main/webapp/app/shared/subject/index.ts | 1 + .../app/shared/subject/load-more.component.ts | 2 +- .../app/shared/subject/ngb-date.pipe.ts | 23 +++ .../subject/subject-dialog.component.ts | 18 +- .../app/shared/subject/subject.component.html | 51 +++-- .../app/shared/subject/subject.component.ts | 178 ++++++++++-------- .../app/shared/subject/subject.module.ts | 3 +- .../app/shared/subject/subject.service.ts | 1 - .../webapp/app/shared/user/account.model.ts | 27 +-- .../user/common-user-management.component.ts | 88 +++++---- src/main/webapp/app/shared/user/user.model.ts | 68 ++----- .../app/shared/util/parse-links-util.ts | 8 +- .../webapp/app/shared/util/reactive-filter.ts | 60 +++--- src/main/webapp/i18n/en/subject.json | 5 +- src/main/webapp/i18n/nl/subject.json | 3 +- 51 files changed, 710 insertions(+), 634 deletions(-) create mode 100644 src/main/webapp/app/shared/subject/ngb-date.pipe.ts diff --git a/src/main/webapp/app/account/password/password.component.html b/src/main/webapp/app/account/password/password.component.html index 7469aed13..35806da1f 100644 --- a/src/main/webapp/app/account/password/password.component.html +++ b/src/main/webapp/app/account/password/password.component.html @@ -1,7 +1,7 @@
    -

    diff --git a/src/main/webapp/app/account/password/password.component.ts b/src/main/webapp/app/account/password/password.component.ts index e13b84b56..7bb9d0d61 100644 --- a/src/main/webapp/app/account/password/password.component.ts +++ b/src/main/webapp/app/account/password/password.component.ts @@ -7,26 +7,20 @@ import { Password } from './password.service'; selector: 'jhi-password', templateUrl: './password.component.html', }) -export class PasswordComponent implements OnInit { +export class PasswordComponent { doNotMatch: string; weakPassword: string; error: string; success: string; - account: any; password: string; confirmPassword: string; constructor( - private passwordService: Password, - private principal: Principal, + private passwordService: Password, + public principal: Principal, ) { } - ngOnInit() { - this.principal.identity() - .then((account) => this.account = account); - } - changePassword() { this.error = null; this.success = null; diff --git a/src/main/webapp/app/account/settings/settings.component.html b/src/main/webapp/app/account/settings/settings.component.html index dea20c382..dbf986264 100644 --- a/src/main/webapp/app/account/settings/settings.component.html +++ b/src/main/webapp/app/account/settings/settings.component.html @@ -84,7 +84,7 @@
    -
    +
    - + diff --git a/src/main/webapp/app/admin/user-management/role.component.ts b/src/main/webapp/app/admin/user-management/role.component.ts index 10ea82fdb..ac4b3ee99 100644 --- a/src/main/webapp/app/admin/user-management/role.component.ts +++ b/src/main/webapp/app/admin/user-management/role.component.ts @@ -16,29 +16,25 @@ export class RoleComponent implements OnInit { @Input() roles: Role[]; eventSubscriber: Subscription; authorities: string[]; - projects: Project[]; selectedAuthority: any; selectedProject: Project; constructor( private authorityService: AuthorityService, - private projectService: ProjectService, + public projectService: ProjectService, private alertService: AlertService, private eventManager: EventManager ) { } ngOnInit() { - if (this.roles === null) { + if (!this.roles) { this.roles = []; } this.authorityService.findAll().subscribe(res => { this.authorities = res; }); - this.projectService.query().subscribe((res: HttpResponse) => { - this.projects = res.body; - }); } trackId(index: number, item: Role) { @@ -46,10 +42,11 @@ export class RoleComponent implements OnInit { } addRole() { - const newRole = new Role(); - newRole.authorityName = this.selectedAuthority; - newRole.projectId = this.selectedProject.id; - newRole.projectName = this.selectedProject.projectName; + const newRole = { + authorityName: this.selectedAuthority, + projectId: this.selectedProject.id, + projectName: this.selectedProject.projectName, + } if (this.hasRole(newRole)) { this.alertService.error('userManagement.role.error.alreadyExist', null, null); } else { diff --git a/src/main/webapp/app/admin/user-management/role.model.ts b/src/main/webapp/app/admin/user-management/role.model.ts index 66da6ba2f..00624fb54 100644 --- a/src/main/webapp/app/admin/user-management/role.model.ts +++ b/src/main/webapp/app/admin/user-management/role.model.ts @@ -1,9 +1,6 @@ -export class Role { - constructor( - public id?: number, - public authorityName?: string, - public projectId?: number, - public projectName?: string, - ) { - } +export interface Role { + id?: number; + authorityName?: string; + projectId?: number; + projectName?: string; } diff --git a/src/main/webapp/app/admin/user-management/user-management-dialog.component.html b/src/main/webapp/app/admin/user-management/user-management-dialog.component.html index 0184e902f..aae79a080 100644 --- a/src/main/webapp/app/admin/user-management/user-management-dialog.component.html +++ b/src/main/webapp/app/admin/user-management/user-management-dialog.component.html @@ -82,7 +82,7 @@
    -
    +
    - +
    { - this.projects = res; - }, (res: HttpErrorResponse) => this.onError(res)); - this.onProjectChange(this.source.project); } diff --git a/src/main/webapp/app/entities/subject/general.subject-dialog.component.html b/src/main/webapp/app/entities/subject/general.subject-dialog.component.html index 7bd5c7879..8b0b4c1fd 100644 --- a/src/main/webapp/app/entities/subject/general.subject-dialog.component.html +++ b/src/main/webapp/app/entities/subject/general.subject-dialog.component.html @@ -39,7 +39,7 @@
    ) => this.projects = res.body); - this.eventManager.subscribe(this.attributeComponentEventPrefix + 'ListModification', + this.eventSubscription = this.eventManager.subscribe( + this.attributeComponentEventPrefix + 'ListModification', (response) => this.subject.attributes = response.content); } + ngOnDestroy() { + this.eventSubscription.unsubscribe(); + } + clear() { this.activeModal.dismiss('cancel'); } @@ -75,10 +77,6 @@ export class GeneralSubjectDialogComponent implements OnInit { this.alertService.error(error.message, null, null); } - trackDeviceById(index: number, item: MinimalSource) { - return item.id; - } - trackProjectById(index: number, item: Project) { return item.id; } diff --git a/src/main/webapp/app/home/home.component.html b/src/main/webapp/app/home/home.component.html index 19e9696e8..9f12c8108 100644 --- a/src/main/webapp/app/home/home.component.html +++ b/src/main/webapp/app/home/home.component.html @@ -21,7 +21,7 @@

    -
    +
    {{project.projectName}}
    diff --git a/src/main/webapp/app/home/home.component.ts b/src/main/webapp/app/home/home.component.ts index 9a07d2b26..dc5efeade 100644 --- a/src/main/webapp/app/home/home.component.ts +++ b/src/main/webapp/app/home/home.component.ts @@ -1,10 +1,14 @@ import { Component, OnDestroy, OnInit } from '@angular/core'; import { NgbModalRef } from '@ng-bootstrap/ng-bootstrap'; -import { Account, LoginModalService, Principal, Project, UserService } from '../shared'; -import { EventManager } from '../shared/util/event-manager.service'; -import { Observable, of, Subscription } from "rxjs"; -import { switchMap, tap } from "rxjs/operators"; +import { + Account, + LoginModalService, + Principal, + Project, + ProjectService +} from '../shared'; +import { Subscription } from "rxjs"; @Component({ selector: 'jhi-home', @@ -17,14 +21,12 @@ import { switchMap, tap } from "rxjs/operators"; export class HomeComponent implements OnInit, OnDestroy { account: Account; modalRef: NgbModalRef; - projects: Project[]; subscriptions: Subscription; constructor( private principal: Principal, private loginModalService: LoginModalService, - private eventManager: EventManager, - private userService: UserService, + public projectService: ProjectService, ) { this.subscriptions = new Subscription(); } @@ -38,18 +40,8 @@ export class HomeComponent implements OnInit, OnDestroy { } private loadRelevantProjects() { - this.subscriptions.add(this.principal.getAuthenticationState() - .pipe( - tap(account => this.account = account), - switchMap(account => { - if (account) { - return this.userService.findProject(account.login); - } else { - return of([]); - } - }) - ) - .subscribe(projects => this.projects = projects)); + this.subscriptions.add(this.principal.account$ + .subscribe(account => this.account = account)); } trackId(index: number, item: Project) { diff --git a/src/main/webapp/app/layouts/navbar/navbar.component.html b/src/main/webapp/app/layouts/navbar/navbar.component.html index b3ee93056..3634d8d9b 100644 --- a/src/main/webapp/app/layouts/navbar/navbar.component.html +++ b/src/main/webapp/app/layouts/navbar/navbar.component.html @@ -8,7 +8,7 @@ -
    +
    diff --git a/src/main/webapp/app/shared/subject/subject.component.ts b/src/main/webapp/app/shared/subject/subject.component.ts index e1cdbd78d..f9a6935e3 100644 --- a/src/main/webapp/app/shared/subject/subject.component.ts +++ b/src/main/webapp/app/shared/subject/subject.component.ts @@ -19,7 +19,7 @@ import { distinctUntilChanged, filter, first, map, pluck, shareReplay, - switchMap, withLatestFrom + switchMap, tap, withLatestFrom } from 'rxjs/operators'; import {Group, GroupService, ITEMS_PER_PAGE, Project} from '..'; @@ -38,7 +38,7 @@ import { NgbDateParserFormatter, NgbDateStruct } from "@ng-bootstrap/ng-bootstrap"; -import { NgbDateReactiveFilter, ReactiveFilter } from "../util/reactive-filter"; +import { NgbDateRange, NgbDateReactiveFilter, ReactiveFilter } from "../util/reactive-filter"; interface FilterCriteria { externalId: string @@ -47,6 +47,7 @@ interface FilterCriteria { enrollmentDateFrom?: NgbDateStruct enrollmentDateTo?: NgbDateStruct groupId: string + groupName: string personName: string humanReadableId: string } @@ -62,7 +63,7 @@ export class SubjectComponent implements OnInit, OnDestroy, OnChanges { 'externalId', ]; project$ = new BehaviorSubject(null); - private filterResult$: Observable; + filterResult$: Observable; @Input() get project() { return this.project$.value; } set project(v: Project) { this.project$.next(v); } @@ -72,32 +73,14 @@ export class SubjectComponent implements OnInit, OnDestroy, OnChanges { itemsPerPage = ITEMS_PER_PAGE; links: any; sortBy$: BehaviorSubject; - queryCount: any; ascending$: BehaviorSubject = new BehaviorSubject(true); totalItems: number; page$: BehaviorSubject = new BehaviorSubject(1); previousPage: number = 1; + enrollmentDate$: Observable + enrollmentDateRangeError = false; - filters: {[key: string]: ReactiveFilter} = { - subjectId: new ReactiveFilter(), - externalId: new ReactiveFilter(), - humanReadableId: new ReactiveFilter(), - dateOfBirth: new NgbDateReactiveFilter(this.calendar, this.formatter), - personName: new ReactiveFilter(), - enrollmentDateFrom: new NgbDateReactiveFilter(this.calendar, this.formatter), - enrollmentDateTo: new NgbDateReactiveFilter(this.calendar, this.formatter), - groupId: new ReactiveFilter({ - formatResult: v$ => v$.pipe(map(groupId => { - const group = this.groups$.value.find(g => g.id.toString() == groupId); - return group ? group.name : ''; - })) - }), - } - - isFilterApplied$: Observable; - - enrollmentDateFromError = false; - enrollmentDateToError = false; + filters: Record> isAdvancedFilterCollapsed = true; @@ -116,6 +99,31 @@ export class SubjectComponent implements OnInit, OnDestroy, OnChanges { private calendar: NgbCalendar, public formatter: NgbDateParserFormatter ) { + this.filters = { + subjectId: new ReactiveFilter(), + externalId: new ReactiveFilter(), + humanReadableId: new ReactiveFilter(), + dateOfBirth: new NgbDateReactiveFilter(this.calendar, this.formatter), + personName: new ReactiveFilter(), + enrollmentDateFrom: new NgbDateReactiveFilter(this.calendar, this.formatter), + enrollmentDateTo: new NgbDateReactiveFilter(this.calendar, this.formatter), + groupId: new ReactiveFilter(), + } + this.enrollmentDate$ = combineLatest([ + this.filters.enrollmentDateFrom.value$, + this.filters.enrollmentDateTo.value$, + ]).pipe( + map(([from, to]) => ({from, to})), + filter(({from, to}) => { + if (NgbDateReactiveFilter.isValidRange(from, to)) { + this.enrollmentDateRangeError = false; + return true; + } else { + this.enrollmentDateRangeError = true; + return false; + } + }), + ); this.sortBy$ = new BehaviorSubject('login') this.filterResult$ = combineLatest([ this.filters.subjectId.value$, @@ -123,47 +131,48 @@ export class SubjectComponent implements OnInit, OnDestroy, OnChanges { this.filters.humanReadableId.value$, this.filters.dateOfBirth.value$, this.filters.personName.value$, - this.filters.enrollmentDateFrom.value$, - this.filters.enrollmentDateTo.value$, + this.enrollmentDate$, this.filters.groupId.value$, ]).pipe( - map(([subjectId, externalId, humanReadableId, dateOfBirth, personName, enrollmentDateFrom, enrollmentDateTo, groupId]) => ({ + map(([subjectId, externalId, humanReadableId, dateOfBirth, personName, enrollmentDate, groupId]) => ({ subjectId, externalId, humanReadableId, dateOfBirth, personName, - enrollmentDateFrom, - enrollmentDateTo, + enrollmentDateFrom: enrollmentDate.from, + enrollmentDateTo: enrollmentDate.to, groupId, + groupName: this.groups$.value.find(g => g.id.toString() == groupId)?.name, })), + map(criteria => { + for (let key in criteria) { + if (criteria[key]) { + return criteria; + } + } + return null; + }), shareReplay(1), ) - this.isFilterApplied$ = this.filterResult$ - .pipe( - map(param => { - for (let key in param) { - if (param[key]) { - return true; - } - } - return false; - }) - ) this.subscriptions.add(this.activatedRoute.data.pipe( - map(data => data['pagingParams']), - filter(params => params), + pluck('pagingParams'), ).subscribe(params => { - this.page$ = params.page; + this.page$.next(params.page); this.ascending$.next(params.ascending); - this.sortBy$.next(params.predicate); + if (params.predicate in this.sortingOptions) { + this.sortBy$.next(params.predicate); + } else { + this.sortBy$.next(this.sortingOptions[0]); + } })); this.checked$ = combineLatest([this.subjects$, this.setOfCheckedId$]) .pipe( map(([subjects, checkedSet]) => - subjects.length !== 0 && subjects.every(v => checkedSet.has(v.id))) + subjects.length !== 0 && subjects.every(v => checkedSet.has(v.id))), + distinctUntilChanged(), ); } @@ -176,14 +185,13 @@ export class SubjectComponent implements OnInit, OnDestroy, OnChanges { this.ascending$.pipe(distinctUntilChanged()), this.page$.pipe(distinctUntilChanged()), ]).pipe( - withLatestFrom(this.subjects$.pipe(map(s => s.length))), - switchMap(([[projectName, filter, sortBy, ascending, page], numSubjects]) => { + withLatestFrom(this.subjects$), + switchMap(([[projectName, filter, sortBy, ascending, page], subjects]) => { const mergeResults: boolean = page > this.previousPage; - const numItems = Math.max(page * this.itemsPerPage - numSubjects, this.itemsPerPage); this.previousPage = page; let fetch$: Observable>; const filterParams = this.queryFilterParams(filter); - const pagingParams = this.queryPaginationParams(sortBy, ascending, mergeResults, numItems) + const pagingParams = this.queryPaginationParams(page, sortBy, ascending, mergeResults, subjects) if (this.isProjectSpecific) { fetch$ = this.subjectService.findAllByProject( @@ -195,6 +203,7 @@ export class SubjectComponent implements OnInit, OnDestroy, OnChanges { fetch$ = this.subjectService.query(filterParams, pagingParams,); } this.router.navigate([], { + replaceUrl: true, relativeTo: this.activatedRoute, queryParams: { page: page, @@ -231,6 +240,8 @@ export class SubjectComponent implements OnInit, OnDestroy, OnChanges { this.sortBy$.complete(); this.subjects$.complete(); this.project$.complete(); + this.page$.complete(); + this.setOfCheckedId$.complete(); this.subscriptions.unsubscribe(); } @@ -285,6 +296,9 @@ export class SubjectComponent implements OnInit, OnDestroy, OnChanges { } queryFilterParams(criteria: FilterCriteria): SubjectFilterParams { + if (!criteria) { + return {}; + } const params = { login: criteria.subjectId && criteria.subjectId.trim() || undefined, externalId: criteria.externalId && criteria.externalId.trim() || undefined, @@ -296,7 +310,7 @@ export class SubjectComponent implements OnInit, OnDestroy, OnChanges { }; if (this.isRange(criteria.enrollmentDateFrom, criteria.enrollmentDateTo)){ - let enrollmentDateFrom = this.formatter.format(criteria.enrollmentDateFrom); //this.formatDate(this.filters.enrollmentDateFrom); + let enrollmentDateFrom = this.formatter.format(criteria.enrollmentDateFrom); let enrollmentDateTo = this.formatter.format(criteria.enrollmentDateTo); const timeZone = Intl.DateTimeFormat().resolvedOptions().timeZone; params.enrollmentDate = { @@ -304,7 +318,7 @@ export class SubjectComponent implements OnInit, OnDestroy, OnChanges { to: enrollmentDateTo ? enrollmentDateTo + 'T23:59' + '[' + timeZone + ']' : undefined, }; } - if (criteria.dateOfBirth){ + if (criteria.dateOfBirth) { params.dateOfBirth = { is: this.formatter.format(criteria.dateOfBirth), }; @@ -314,7 +328,7 @@ export class SubjectComponent implements OnInit, OnDestroy, OnChanges { } isRange(from: NgbDateStruct, to: NgbDateStruct): boolean { - if(from && to) { + if (from && to) { const dateFrom = NgbDate.from(from); const dateTo = NgbDate.from(to); return dateTo.equals(dateFrom) || dateTo.after(dateFrom); @@ -323,11 +337,9 @@ export class SubjectComponent implements OnInit, OnDestroy, OnChanges { } } - queryPaginationParams(sortBy: string, ascending: boolean, loadMore: boolean, size: number): SubjectPaginationParams { - const subjects = this.subjects$.value || []; - + queryPaginationParams(page: number, sortBy: string, ascending: boolean, loadMore: boolean, subjects: Subject[]): SubjectPaginationParams { let last: SubjectLastParams | null; - if (loadMore) { + if (loadMore && subjects.length > 0) { const lastSubject = subjects[subjects.length - 1] last = { id: lastSubject.id, @@ -339,17 +351,14 @@ export class SubjectComponent implements OnInit, OnDestroy, OnChanges { } return { last, - size, + size: Math.max(page * this.itemsPerPage - subjects.length, this.itemsPerPage), sort: [sortBy + ',' + (ascending ? 'asc' : 'desc')], }; } private onSuccess(data, headers, mergeResults: boolean) { - if(headers.get('link')){ - this.links = parseLinks(headers.get('link')); - } + this.links = parseLinks(headers.get('link')); this.totalItems = +headers.get('X-Total-Count'); - this.queryCount = this.totalItems; // remove redundant subjects from the list if (mergeResults) { let tempSubjects = [...this.subjects$.value, ...data]; @@ -382,29 +391,38 @@ export class SubjectComponent implements OnInit, OnDestroy, OnChanges { this.page$.next(1); } - selectAll(): void { - this.subjects$.pipe( - withLatestFrom(this.checked$), + toggleSelectAll(): void { + combineLatest([ + this.subjects$, + this.setOfCheckedId$, + ]).pipe( first(), - ).subscribe(([subjects, checked]) => { - const nextValue = new Set(this.setOfCheckedId$.value); - if (!checked) { - subjects.forEach(({ id }) => nextValue.add(id)); - } else { - subjects.forEach(({ id }) => nextValue.delete(id)); - } - this.setOfCheckedId$.next(nextValue); - }); + filter(([subjects]) => subjects.length > 0), + map(([subjects, checkedIds]) => { + const nextValue = new Set(checkedIds); + if (subjects.every(s => checkedIds.has(s.id))) { + subjects.forEach(({id}) => nextValue.delete(id)); + } else { + subjects.forEach(({id}) => nextValue.add(id)); + } + return nextValue; + }) + ).subscribe(nextValue => this.setOfCheckedId$.next(nextValue)); } onItemChecked(id: number, checked: boolean): void { - const nextValue = new Set(this.setOfCheckedId$.value); - if (checked) { - nextValue.add(id); - } else { - nextValue.delete(id); - } - this.setOfCheckedId$.next(nextValue); + this.setOfCheckedId$.pipe( + first(), + map(v => { + const nextValue = new Set(v); + if (checked) { + nextValue.add(id); + } else { + nextValue.delete(id); + } + return nextValue; + }), + ).subscribe(nextValue => this.setOfCheckedId$.next(nextValue)); } addSelectedToGroup() { diff --git a/src/main/webapp/app/shared/subject/subject.module.ts b/src/main/webapp/app/shared/subject/subject.module.ts index 252204031..546c53e07 100644 --- a/src/main/webapp/app/shared/subject/subject.module.ts +++ b/src/main/webapp/app/shared/subject/subject.module.ts @@ -5,7 +5,7 @@ import { QrCodeModule } from 'ng-qrcode'; import { ManagementPortalSharedModule } from '../../shared'; import { FilterBadgeComponent, - LoadMoreComponent, + LoadMoreComponent, NgbDatePipe, SubjectComponent, SubjectDeleteDialogComponent, SubjectDeletePopupComponent, @@ -38,6 +38,7 @@ const ENTITY_STATES = [ declarations: [ FilterBadgeComponent, LoadMoreComponent, + NgbDatePipe, SubjectComponent, SubjectDetailComponent, SubjectRevisionComponent, diff --git a/src/main/webapp/app/shared/subject/subject.service.ts b/src/main/webapp/app/shared/subject/subject.service.ts index ad7103a21..6a8e9d99c 100644 --- a/src/main/webapp/app/shared/subject/subject.service.ts +++ b/src/main/webapp/app/shared/subject/subject.service.ts @@ -40,7 +40,6 @@ export class SubjectService { findRevisions(login: string, req?: any): Observable> { const params = createRequestOption(req); return this.http.get(`${this.resourceUrl}/${encodeURIComponent(login)}/revisions`, {params, observe: 'response'}); - } query( diff --git a/src/main/webapp/app/shared/user/account.model.ts b/src/main/webapp/app/shared/user/account.model.ts index 8af4081e7..1fa91d789 100644 --- a/src/main/webapp/app/shared/user/account.model.ts +++ b/src/main/webapp/app/shared/user/account.model.ts @@ -1,12 +1,17 @@ -export class Account { - constructor( - public activated: boolean, - public authorities: string[], - public email: string, - public firstName: string, - public langKey: string, - public lastName: string, - public login: string, - ) { - } +import { Role } from "../../admin/user-management/role.model"; + +export interface Account { + id?: number; + login: string, + firstName?: string, + lastName?: string, + email?: string, + activated?: true, + langKey?: string; + createdBy?: string; + createdDate?: string; + lastModifiedBy?: string; + lastModifiedDate?: string; + roles?: Role[]; + authorities?: string[]; } diff --git a/src/main/webapp/app/shared/user/common-user-management.component.ts b/src/main/webapp/app/shared/user/common-user-management.component.ts index d824b62c9..f69516344 100644 --- a/src/main/webapp/app/shared/user/common-user-management.component.ts +++ b/src/main/webapp/app/shared/user/common-user-management.component.ts @@ -1,13 +1,23 @@ -import { Component, Input, OnChanges, OnInit, SimpleChange, SimpleChanges } from '@angular/core'; +import { + Component, + Input, + OnChanges, + OnDestroy, + OnInit, + SimpleChange, + SimpleChanges +} from '@angular/core'; import { ITEMS_PER_PAGE, Project, User, UserService } from '..'; import { EventManager } from '../util/event-manager.service'; +import { BehaviorSubject, combineLatest, Subject, Subscription } from "rxjs"; +import { filter, startWith, switchMap } from "rxjs/operators"; @Component({ selector: 'jhi-common-user-mgmt', templateUrl: './common-user-management.component.html' }) -export class CommonUserMgmtComponent implements OnInit, OnChanges { +export class CommonUserMgmtComponent implements OnInit, OnChanges, OnDestroy { users: User[]; error: any; success: any; @@ -16,11 +26,22 @@ export class CommonUserMgmtComponent implements OnInit, OnChanges { itemsPerPage: any; page: any; predicate: any; - previousPage: any; reverse: any; - @Input() project: Project; - @Input() authority: String; + project$ = new BehaviorSubject(null); + @Input() + get project(): Project { return this.project$.value; } + set project(v: Project) { this.project$.next(v) } + + authority$ = new BehaviorSubject(''); + @Input() + get authority(): string { return this.authority$.value; } + set authority(v: string) { this.authority$.next(v); } + + trigger$ = new Subject(); + + + private subscriptions: Subscription = new Subscription(); constructor( private userService: UserService, @@ -30,30 +51,38 @@ export class CommonUserMgmtComponent implements OnInit, OnChanges { } ngOnInit() { - this.loadAll(); + this.subscriptions.add( + combineLatest([ + this.project$, + this.authority$, + this.trigger$.pipe(startWith(undefined as void)), + ]).pipe( + filter(([p, a]) => (!!p) && (!!a)), + switchMap(([project, authority]) => this.userService.findByProjectAndAuthority({ + projectName: project.projectName, + authority: authority, + })), + ).subscribe((res: any) => this.users = res) + ); this.registerChangeInUsers(); } + ngOnDestroy() { + this.subscriptions.unsubscribe(); + } + registerChangeInUsers() { - this.eventManager.subscribe('userListModification', () => this.loadAll()); + this.subscriptions.add( + this.eventManager.subscribe('userListModification', () => this.trigger$.next()) + ); } ngOnChanges(changes: SimpleChanges) { - const project: SimpleChange = changes.project ? changes.project : null; - if (project) { - this.project = project.currentValue; - this.loadAll(); + if (changes.project) { + this.project$.next(changes.project.currentValue); } - } - - loadAll() { - if (this.project && this.authority) { - this.userService.findByProjectAndAuthority( - { - projectName: this.project.projectName, - authority: this.authority, - }, - ).subscribe((res: any) => this.users = res); + if (changes.authority) { + this.authority$.next(changes.authority.currentValue); } } @@ -61,22 +90,7 @@ export class CommonUserMgmtComponent implements OnInit, OnChanges { return item.id; } - sort() { - const result = [this.predicate + ',' + (this.reverse ? 'asc' : 'desc')]; - if (this.predicate !== 'id') { - result.push('id'); - } - return result; - } - - loadPage(page: number) { - if (page !== this.previousPage) { - this.previousPage = page; - this.transition(); - } - } - transition() { - this.loadAll(); + this.trigger$.next(); } } diff --git a/src/main/webapp/app/shared/user/user.model.ts b/src/main/webapp/app/shared/user/user.model.ts index 92ad04539..9bf561772 100644 --- a/src/main/webapp/app/shared/user/user.model.ts +++ b/src/main/webapp/app/shared/user/user.model.ts @@ -1,54 +1,20 @@ import { Role } from '../../admin/user-management/role.model'; -import { Project } from '../../shared/project'; +import { Project } from '../project'; -export class User { - public id?: any; - public login?: string; - public firstName?: string; - public lastName?: string; - public email?: string; - public activated?: Boolean; - public langKey?: string; - public authorities: string[]; - public roles?: Role[]; - public createdBy?: string; - public createdDate?: Date; - public lastModifiedBy?: string; - public lastModifiedDate?: Date; - public password?: string; - public project?: Project = new Project(); - - constructor( - id?: any, - login?: string, - firstName?: string, - lastName?: string, - email?: string, - activated?: Boolean, - langKey?: string, - authorities?: string[], - roles?: Role[], - createdBy?: string, - createdDate?: Date, - lastModifiedBy?: string, - lastModifiedDate?: Date, - password?: string, - project?: Project, - ) { - this.id = id ? id : null; - this.login = login ? login : null; - this.firstName = firstName ? firstName : null; - this.lastName = lastName ? lastName : null; - this.email = email ? email : null; - this.activated = activated ? activated : false; - this.langKey = langKey ? langKey : null; - this.roles = roles ? roles : null; - this.authorities = authorities ? authorities : null; - this.createdBy = createdBy ? createdBy : null; - this.createdDate = createdDate ? createdDate : null; - this.lastModifiedBy = lastModifiedBy ? lastModifiedBy : null; - this.lastModifiedDate = lastModifiedDate ? lastModifiedDate : null; - this.password = password ? password : null; - this.project = project ? project : new Project(); - } +export interface User { + id?: number; + login?: string; + firstName?: string; + lastName?: string; + email?: string; + activated?: Boolean; + langKey?: string; + authorities: string[]; + roles?: Role[]; + createdBy?: string; + createdDate?: Date; + lastModifiedBy?: string; + lastModifiedDate?: Date; + password?: string; + project?: Project; } diff --git a/src/main/webapp/app/shared/util/parse-links-util.ts b/src/main/webapp/app/shared/util/parse-links-util.ts index c52aea287..2f831d0a9 100644 --- a/src/main/webapp/app/shared/util/parse-links-util.ts +++ b/src/main/webapp/app/shared/util/parse-links-util.ts @@ -1,13 +1,13 @@ // Based on JHipster ParseLinks -export function parseLinks(header: string): { [name: string]: any; } { - if (header.length === 0) { - throw new Error('input must not be of zero length'); +export function parseLinks(header: string): Record { + if (!header) { + return {}; } // Split parts by comma const parts: string[] = header.split(/,\s* = {}; // Parse each part into a named link parts.forEach((p) => { diff --git a/src/main/webapp/app/shared/util/reactive-filter.ts b/src/main/webapp/app/shared/util/reactive-filter.ts index 203da7a75..26847d2d6 100644 --- a/src/main/webapp/app/shared/util/reactive-filter.ts +++ b/src/main/webapp/app/shared/util/reactive-filter.ts @@ -17,14 +17,13 @@ import { } from "@ng-bootstrap/ng-bootstrap"; export class ReactiveFilter { - private readonly _value$: BehaviorSubject; - private readonly _error$: BehaviorSubject; - private readonly trigger$: Subject; + protected readonly _value$: BehaviorSubject; + protected readonly _error$: BehaviorSubject; + protected readonly trigger$: Subject; error$: Observable rawValue$: Observable value$: Observable; - formattedValue$: Observable; constructor( options?: ReactiveFilterOptions @@ -53,9 +52,6 @@ export class ReactiveFilter { }) ) } - if (options.mapValue) { - debouncedValue = options.mapValue(debouncedValue); - } let mergedSignal = merge(debouncedValue, this.trigger$.pipe(debounceTime(10))); if (options.mapResult) { mergedSignal = options.mapResult(mergedSignal); @@ -63,27 +59,18 @@ export class ReactiveFilter { mergedSignal = mergedSignal.pipe(distinctUntilChanged()); } this.value$ = mergedSignal.pipe(shareReplay(1)); - if (options.formatResult) { - this.formattedValue$ = options.formatResult(this.value$); - } else { - this.formattedValue$ = this.value$.pipe( - map(v => v !== null ? v.toString() : '') - ); - } - } - - get rawValue(): T | null { - return this._value$.value; } next(value?: T){ this._value$.next(value); } + clear() { this._value$.next(null); this._error$.next(''); this.trigger$.next(null); } + complete() { this._value$.complete(); this._error$.complete(); @@ -93,9 +80,7 @@ export class ReactiveFilter { export interface ReactiveFilterOptions { validate?: (value: T | null) => string | null; - mapValue?: (value$: Observable) => Observable mapResult?: (value$: Observable) => Observable, - formatResult?: (value$: Observable) => Observable } export class NgbDateReactiveFilter extends ReactiveFilter { @@ -105,17 +90,38 @@ export class NgbDateReactiveFilter extends ReactiveFilter { options: ReactiveFilterOptions = {}, ) { super({ - validate: options.validate, - mapValue: options.mapValue ? options.mapValue : $v => $v.pipe( - filter(date => date === null || calendar.isValid(NgbDate.from(date))) - ), + validate(date) { + if (date === null) { + return ''; + } + if (!calendar.isValid(NgbDate.from(date))) { + return 'invalidDate'; + } + if (options.validate) { + return options.validate(date) + } + return ''; + }, mapResult: options.mapResult ? options.mapResult : $v => $v.pipe( distinctUntilChanged((d1, d2) => d1 === d2 || (d1 !== null && NgbDate.from(d1).equals(d2))) ), - formatResult: options.formatResult ? options.formatResult : $v => $v.pipe( - map(v => formatter.format(v)) - ), }); } + + public static isValidRange(from?: NgbDateStruct, to?: NgbDateStruct): boolean { + if (from && to) { + const dateFrom = NgbDate.from(from); + const dateTo = NgbDate.from(to) + if (dateFrom.after(dateTo)) { + return false; + } + } + return true; + } +} + +export interface NgbDateRange { + from: NgbDateStruct; + to: NgbDateStruct; } diff --git a/src/main/webapp/i18n/en/subject.json b/src/main/webapp/i18n/en/subject.json index 55915ebab..5f6eeb101 100644 --- a/src/main/webapp/i18n/en/subject.json +++ b/src/main/webapp/i18n/en/subject.json @@ -20,13 +20,13 @@ "title": "Filter", "filters": "Filters", "applyButton": "Apply filter", - "clearButton": "Clear filter", + "clearButton": "Clear filters", "advancedFilter": "Advanced Filter", "from": "From", "to": "To", "error": { "invalidDate": "The date is not valid.", - "invalidRange": "The date is not valid or it is after From Date." + "invalidRange": "The date range is invalid: From date is after To date." } }, "login": "Login", @@ -105,6 +105,7 @@ "addSelectedToGroup": "Add to group", "group": "Group", "loadMore": "Load more ({{shown}}/{{total}} shown)", + "loadMorePartial": "Load more ({{shown}} shown)", "allLoaded": "All {{total}} subjects loaded", "generateToken": "Generate QR code", "generatePersistentToken": "Generate persistent QR code" diff --git a/src/main/webapp/i18n/nl/subject.json b/src/main/webapp/i18n/nl/subject.json index 674cd04ea..d5c561d73 100644 --- a/src/main/webapp/i18n/nl/subject.json +++ b/src/main/webapp/i18n/nl/subject.json @@ -26,7 +26,7 @@ "advancedFilter": "Uitgebreid filter", "error": { "invalidDate": "De datum is niet geldig.", - "invalidRange": "De datum is niet geldig of ligt na de Van-datum." + "invalidRange": "De periode is is niet geldig: Vanaf datum is na de Tot en met datum." } }, "login": "Login", @@ -105,6 +105,7 @@ "addSelectedToGroup": "Aan groep toevoegen", "group": "Groep", "loadMore": "Meer laden ({{shown}}/{{total}} getoond)", + "loadMorePartial": "Meer laden ({{shown}} getoond)", "allLoaded": "Alle {{total}} subjects geladen", "generateToken": "Genereer QR-code", "generatePersistentToken": "Genereer langdurige QR-code" From 7743d0a3f1ef01f3df1d980e156f70638d351272 Mon Sep 17 00:00:00 2001 From: aykl Date: Mon, 15 Nov 2021 14:33:54 +0100 Subject: [PATCH 172/431] UnlinkSubjects Query Param added to Delete Group --- .../repository/SubjectRepository.java | 10 +++ .../management/service/GroupService.java | 13 +++- .../management/web/rest/GroupResource.java | 4 +- .../web/rest/GroupResourceIntTest.java | 67 +++++++++++++++---- 4 files changed, 78 insertions(+), 16 deletions(-) diff --git a/src/main/java/org/radarbase/management/repository/SubjectRepository.java b/src/main/java/org/radarbase/management/repository/SubjectRepository.java index 647cf6d0d..f8b1b2c87 100644 --- a/src/main/java/org/radarbase/management/repository/SubjectRepository.java +++ b/src/main/java/org/radarbase/management/repository/SubjectRepository.java @@ -25,6 +25,10 @@ public interface SubjectRepository extends JpaRepository, RevisionRepository, JpaSpecificationExecutor { + @Query("SELECT count(*) from Subject subject " + + "WHERE subject.group.id = :group_id") + long countByGroupId(@Param("group_id") Long groupId); + @Query(value = "select distinct subject from Subject subject left join fetch subject.sources " + "left join fetch subject.user user " + "join user.roles roles where roles.project.projectName = :projectName and roles" @@ -59,6 +63,12 @@ void setGroupIdByIds( + "WHERE subject.id in :ids") void unsetGroupIdByIds(@Param("ids") List ids); + @Modifying + @Query("UPDATE Subject subject " + + "SET subject.group.id = null " + + "WHERE subject.group.id = :group_id") + void unlinkAllFromGroup(@Param("group_id") Long groupId); + @Query("select subject.sources from Subject subject WHERE subject.id = :id") List findSourcesBySubjectId(@Param("id") Long id); diff --git a/src/main/java/org/radarbase/management/service/GroupService.java b/src/main/java/org/radarbase/management/service/GroupService.java index 16348a630..97e4c8e9c 100644 --- a/src/main/java/org/radarbase/management/service/GroupService.java +++ b/src/main/java/org/radarbase/management/service/GroupService.java @@ -75,15 +75,26 @@ public GroupDTO getGroup(String projectName, String groupName) { * Delete the group by name. * @param projectName project name * @param groupName group name + * @param unlinkSubjects unset group for each linked subject * @throws NotFoundException if the project or group is not found. */ @Transactional - public void deleteGroup(String projectName, String groupName) { + public void deleteGroup(String projectName, String groupName, boolean unlinkSubjects) { Group group = groupRepository.findByProjectNameAndName(projectName, groupName) .orElseThrow(() -> new NotFoundException( "Group " + groupName + " not found in project " + projectName, GROUP, ERR_GROUP_NOT_FOUND)); + if (unlinkSubjects) { + subjectRepository.unlinkAllFromGroup(group.getId()); + } else { + var subjectCount = subjectRepository.countByGroupId(group.getId()); + if (subjectCount > 0) { + var msg = "Group " + groupName + " has subjects. " + + "Add `unlinkSubjects=true` query param to confirm deletion"; + throw new ConflictException(msg, GROUP, ERR_VALIDATION); + } + } groupRepository.delete(group); } diff --git a/src/main/java/org/radarbase/management/web/rest/GroupResource.java b/src/main/java/org/radarbase/management/web/rest/GroupResource.java index ad738b061..28f68a2b1 100644 --- a/src/main/java/org/radarbase/management/web/rest/GroupResource.java +++ b/src/main/java/org/radarbase/management/web/rest/GroupResource.java @@ -25,6 +25,7 @@ import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.servlet.mvc.method.annotation.MvcUriComponentsBuilder; @@ -107,10 +108,11 @@ public GroupDTO getGroup( */ @DeleteMapping("/{groupName:" + Constants.ENTITY_ID_REGEX + "}") public ResponseEntity deleteGroup( + @RequestParam(defaultValue = "false") Boolean unlinkSubjects, @PathVariable String projectName, @PathVariable String groupName) throws NotAuthorizedException { checkPermissionOnProject(token, PROJECT_UPDATE, projectName); - groupService.deleteGroup(projectName, groupName); + groupService.deleteGroup(projectName, groupName, unlinkSubjects); return ResponseEntity.noContent().build(); } diff --git a/src/test/java/org/radarbase/management/web/rest/GroupResourceIntTest.java b/src/test/java/org/radarbase/management/web/rest/GroupResourceIntTest.java index 9c24f3221..7087202c5 100644 --- a/src/test/java/org/radarbase/management/web/rest/GroupResourceIntTest.java +++ b/src/test/java/org/radarbase/management/web/rest/GroupResourceIntTest.java @@ -56,9 +56,9 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; /** - * Test class for the ProjectResource REST controller. + * Test class for the GroupResource REST controller. * - * @see ProjectResource + * @see GroupResource */ @ExtendWith(SpringExtension.class) @SpringBootTest(classes = ManagementPortalTestApp.class) @@ -151,7 +151,7 @@ private Group createEntity() { @Test void createGroup() throws Exception { - // Create the Project + // Create the Group GroupDTO groupDto = groupMapper.groupToGroupDTO(group); restProjectMockMvc.perform(post("/api/projects/{projectName}/groups", project.getProjectName()) @@ -172,7 +172,7 @@ void createGroup() throws Exception { void createGroupNonExistingProject() throws Exception { projectRepository.delete(project); - // Create the Project + // Create the Group GroupDTO groupDto = groupMapper.groupToGroupDTO(group); restProjectMockMvc.perform(post("/api/projects/{projectName}/groups", project.getProjectName()) @@ -183,7 +183,7 @@ void createGroupNonExistingProject() throws Exception { @Test void createGroupWithExistingName() throws Exception { - // Create the Project + // Create the Group GroupDTO groupDto = groupMapper.groupToGroupDTO(group); restProjectMockMvc.perform(post("/api/projects/{projectName}/groups", project.getProjectName()) @@ -209,7 +209,7 @@ void createGroupWithExistingNameInDifferentProject() throws Exception { group2.setName(group.getName()); group2.setProject(project2); - // Create the Project + // Create the Group GroupDTO groupDto = groupMapper.groupToGroupDTO(group); restProjectMockMvc.perform(post("/api/projects/{projectName}/groups", project.getProjectName()) @@ -245,7 +245,7 @@ void createGroupWithExistingNameInDifferentProject() throws Exception { void checkGroupNameIsRequired() throws Exception { group.setName(null); - // Create the Project + // Create the Group GroupDTO groupDto = groupMapper.groupToGroupDTO(group); restProjectMockMvc.perform(post("/api/projects/{projectName}/groups", project.getProjectName()) @@ -259,7 +259,7 @@ void getAllGroups() throws Exception { // Initialize the database groupRepository.saveAndFlush(group); - // Get all the projectList + // Get all the groups restProjectMockMvc.perform(get("/api/projects/{projectName}/groups", project.getProjectName())) .andExpect(status().isOk()) @@ -274,7 +274,7 @@ void getGroup() throws Exception { // Initialize the database groupRepository.saveAndFlush(group); - // Get the project + // Get the Group restProjectMockMvc.perform(get("/api/projects/{projectName}/groups/{groupName}", project.getProjectName(), group.getName())) .andExpect(status().isOk()) @@ -285,7 +285,7 @@ void getGroup() throws Exception { @Test void getNonExistingGroup() throws Exception { - // Get the project + // Get the group restProjectMockMvc.perform(get("/api/projects/{projectName}/groups/{groupName}", project.getProjectName(), group.getName())) .andExpect(status().isNotFound()); @@ -296,7 +296,7 @@ void deleteGroup() throws Exception { // Initialize the database groupRepository.saveAndFlush(group); - // Get the project + // Delete the group restProjectMockMvc.perform(delete( "/api/projects/{projectName}/groups/{groupName}", project.getProjectName(), group.getName()) @@ -309,12 +309,51 @@ void deleteGroup() throws Exception { assertThat(savedGroup).isEmpty(); } + @Test + void deleteGroupWithSubjects() throws Exception { + // Initialize the database + groupRepository.saveAndFlush(group); + + var projectDto = projectMapper.projectToProjectDTO(project); + + var subjectDto = new SubjectDTO(); + subjectDto.setExternalLink("exLink1"); + subjectDto.setExternalId("exId1"); + subjectDto.setStatus(ACTIVATED); + subjectDto.setProject(projectDto); + subjectDto.setGroup(group.getName()); + var savedSubject = subjectService.createSubject(subjectDto); + + // Try to delete the Group (and fail) + restProjectMockMvc.perform(delete( + "/api/projects/{projectName}/groups/{groupName}", + project.getProjectName(), group.getName()) + .accept(TestUtil.APPLICATION_JSON_UTF8)) + .andExpect(status().isConflict()); + + // Delete the Group (and unlink the subjects) + restProjectMockMvc.perform(delete( + "/api/projects/{projectName}/groups/{groupName}", + project.getProjectName(), group.getName()) + .param("unlinkSubjects", "true") + .accept(TestUtil.APPLICATION_JSON_UTF8)) + .andExpect(status().isNoContent()); + + // Validate the Group is not present in the database + var savedGroup = groupRepository.findByProjectNameAndName( + project.getProjectName(), group.getName()); + assertThat(savedGroup).isEmpty(); + + var storedSubject = subjectRepository.getOne(savedSubject.getId()); + subjectRepository.delete(storedSubject); + } + @Test void deleteGroupNonExisting() throws Exception { // Initialize the database groupRepository.saveAndFlush(group); - // Get the project + // Delete the group restProjectMockMvc.perform(delete( "/api/projects/{projectName}/groups/{groupName}", project.getProjectName(), group.getName() + "2") @@ -331,7 +370,7 @@ void deleteGroupNonExistingProject() throws Exception { // Initialize the database groupRepository.saveAndFlush(group); - // Get the project + // Delete the group restProjectMockMvc.perform(delete( "/api/projects/{projectName}/groups/{groupName}", project.getProjectName() + "2", group.getName()) @@ -379,7 +418,7 @@ void addSubjectsToGroup() throws Exception { List body = new ArrayList<>(); body.add(patchOp); - // Get the project + // Link the subjects to the group restProjectMockMvc.perform(patch( "/api/projects/{projectName}/groups/{groupName}/subjects", project.getProjectName(), group.getName()) From c6033e43ca0abdb1c14be9db2b7779ca46671e91 Mon Sep 17 00:00:00 2001 From: Joris Borgdorff Date: Mon, 15 Nov 2021 19:57:19 +0100 Subject: [PATCH 173/431] Fix query / matrix params --- .../app/layouts/navbar/navbar.component.html | 2 +- .../app/shared/subject/subject.component.html | 2 +- .../app/shared/subject/subject.component.ts | 116 +++++++++--------- 3 files changed, 62 insertions(+), 58 deletions(-) diff --git a/src/main/webapp/app/layouts/navbar/navbar.component.html b/src/main/webapp/app/layouts/navbar/navbar.component.html index ebf8f12de..6a638e21e 100644 --- a/src/main/webapp/app/layouts/navbar/navbar.component.html +++ b/src/main/webapp/app/layouts/navbar/navbar.component.html @@ -62,7 +62,7 @@ -
  • +
  • diff --git a/src/main/webapp/app/layouts/navbar/navbar.component.ts b/src/main/webapp/app/layouts/navbar/navbar.component.ts index 91fd6660b..7746a3de5 100644 --- a/src/main/webapp/app/layouts/navbar/navbar.component.ts +++ b/src/main/webapp/app/layouts/navbar/navbar.component.ts @@ -22,7 +22,6 @@ export class NavbarComponent implements OnInit, OnDestroy { inProduction: boolean; isNavbarCollapsed: boolean; - languages: any[]; apiDocsEnabled: boolean; modalRef: NgbModalRef; version: string; @@ -33,7 +32,7 @@ export class NavbarComponent implements OnInit, OnDestroy { constructor( private loginService: LoginService, - private languageHelper: JhiLanguageHelper, + public languageHelper: JhiLanguageHelper, private principal: Principal, private loginModalService: LoginModalService, private profileService: ProfileService, @@ -50,10 +49,6 @@ export class NavbarComponent implements OnInit, OnDestroy { ngOnInit() { this.principal.identity().then(account => this.currentAccount = account); this.loadRelevantProjects(); - this.languageHelper.getAll().then((languages) => { - this.languages = languages; - }); - this.profileService.getProfileInfo().then((profileInfo) => { this.inProduction = profileInfo.inProduction; this.apiDocsEnabled = profileInfo.apiDocsEnabled; diff --git a/src/main/webapp/app/shared/language/language.helper.ts b/src/main/webapp/app/shared/language/language.helper.ts index a7853f1bc..f50cbeecf 100644 --- a/src/main/webapp/app/shared/language/language.helper.ts +++ b/src/main/webapp/app/shared/language/language.helper.ts @@ -8,15 +8,17 @@ import { } from '@ngx-translate/core'; import { LANGUAGES } from './language.constants'; +import { Observable, of } from "rxjs"; @Injectable({ providedIn: 'root' }) export class JhiLanguageHelper { + languages$: Observable = of(LANGUAGES); constructor(private translateService: TranslateService, private titleService: Title, private router: Router) { this.init(); } - getAll(): Promise { + getAll(): Promise { return Promise.resolve(LANGUAGES); } From fcc4f3ef4f7c7d26a160f4f70807d0998e6c5945 Mon Sep 17 00:00:00 2001 From: Joris Borgdorff Date: Tue, 16 Nov 2021 13:24:56 +0100 Subject: [PATCH 176/431] Make projects observable --- .../admin/user-management/role.component.html | 2 +- .../admin/user-management/role.component.ts | 17 +- .../app/admin/user-management/role.model.ts | 13 +- .../user-management/user-modal.service.ts | 15 +- .../project/project-detail.component.ts | 14 +- .../entities/project/project-popup.service.ts | 2 +- .../source-type-dialog.component.ts | 12 +- .../general-source-dialog.component.html | 2 +- .../source/general-source-dialog.component.ts | 16 +- .../general.subject-dialog.component.html | 2 +- .../general.subject-dialog.component.ts | 24 ++- .../subject/general.subject-popup.service.ts | 7 +- src/main/webapp/app/home/home.component.html | 27 +-- src/main/webapp/app/home/home.component.ts | 37 ++-- .../app/layouts/navbar/navbar.component.html | 4 +- .../app/layouts/navbar/navbar.component.ts | 44 ++--- .../app/shared/alert/alert-error.component.ts | 2 +- .../dictionary-mapper.component.ts | 3 +- .../dictionary-mapper.model.ts | 3 - .../app/shared/group/group.component.ts | 1 + .../app/shared/project/project.model.ts | 40 ++--- .../app/shared/project/project.service.ts | 168 ++++++++++++++---- .../webapp/app/shared/source/source.model.ts | 3 +- .../subject/patient-detail.component.spec.ts | 6 +- .../subject/subject-dialog.component.ts | 5 - .../shared/subject/subject-popup.service.ts | 9 +- .../app/shared/subject/subject.model.ts | 40 ++--- .../app/shared/subject/subject.service.ts | 1 - .../user/common-user-management.component.ts | 88 +++++---- src/main/webapp/app/shared/user/user.model.ts | 68 ++----- 30 files changed, 354 insertions(+), 321 deletions(-) delete mode 100644 src/main/webapp/app/shared/dictionary-mapper/dictionary-mapper.model.ts diff --git a/src/main/webapp/app/admin/user-management/role.component.html b/src/main/webapp/app/admin/user-management/role.component.html index 8e0d1365d..e9f3aa145 100644 --- a/src/main/webapp/app/admin/user-management/role.component.html +++ b/src/main/webapp/app/admin/user-management/role.component.html @@ -50,7 +50,7 @@

    diff --git a/src/main/webapp/app/admin/user-management/role.component.ts b/src/main/webapp/app/admin/user-management/role.component.ts index 10ea82fdb..ac4b3ee99 100644 --- a/src/main/webapp/app/admin/user-management/role.component.ts +++ b/src/main/webapp/app/admin/user-management/role.component.ts @@ -16,29 +16,25 @@ export class RoleComponent implements OnInit { @Input() roles: Role[]; eventSubscriber: Subscription; authorities: string[]; - projects: Project[]; selectedAuthority: any; selectedProject: Project; constructor( private authorityService: AuthorityService, - private projectService: ProjectService, + public projectService: ProjectService, private alertService: AlertService, private eventManager: EventManager ) { } ngOnInit() { - if (this.roles === null) { + if (!this.roles) { this.roles = []; } this.authorityService.findAll().subscribe(res => { this.authorities = res; }); - this.projectService.query().subscribe((res: HttpResponse) => { - this.projects = res.body; - }); } trackId(index: number, item: Role) { @@ -46,10 +42,11 @@ export class RoleComponent implements OnInit { } addRole() { - const newRole = new Role(); - newRole.authorityName = this.selectedAuthority; - newRole.projectId = this.selectedProject.id; - newRole.projectName = this.selectedProject.projectName; + const newRole = { + authorityName: this.selectedAuthority, + projectId: this.selectedProject.id, + projectName: this.selectedProject.projectName, + } if (this.hasRole(newRole)) { this.alertService.error('userManagement.role.error.alreadyExist', null, null); } else { diff --git a/src/main/webapp/app/admin/user-management/role.model.ts b/src/main/webapp/app/admin/user-management/role.model.ts index 66da6ba2f..00624fb54 100644 --- a/src/main/webapp/app/admin/user-management/role.model.ts +++ b/src/main/webapp/app/admin/user-management/role.model.ts @@ -1,9 +1,6 @@ -export class Role { - constructor( - public id?: number, - public authorityName?: string, - public projectId?: number, - public projectName?: string, - ) { - } +export interface Role { + id?: number; + authorityName?: string; + projectId?: number; + projectName?: string; } diff --git a/src/main/webapp/app/admin/user-management/user-modal.service.ts b/src/main/webapp/app/admin/user-management/user-modal.service.ts index 9313cc54f..c8c0e5b99 100644 --- a/src/main/webapp/app/admin/user-management/user-modal.service.ts +++ b/src/main/webapp/app/admin/user-management/user-modal.service.ts @@ -2,7 +2,7 @@ import { Injectable } from '@angular/core'; import { Router } from '@angular/router'; import { NgbModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap'; -import { User, UserService } from '../../shared'; +import { Project, User, UserService } from '../../shared'; import { SYSTEM_ADMIN } from '../../shared/constants/common.constants'; import { Role } from './role.model'; @@ -24,11 +24,12 @@ export class UserModalService { this.isOpen = true; if (admin) { - const user = new User(); - user.authorities = [SYSTEM_ADMIN]; - const adminRole = new Role(); - adminRole.authorityName = SYSTEM_ADMIN; - user.roles = [adminRole]; + const user = { + authorities: [SYSTEM_ADMIN], + roles: [{ + authorityName: SYSTEM_ADMIN + }], + } return this.userModalRef(component, user, true); } @@ -41,7 +42,7 @@ export class UserModalService { return this.userModalRef(component, user, false); }); } else { - return this.userModalRef(component, new User(), false); + return this.userModalRef(component, { authorities: [] }, false); } } diff --git a/src/main/webapp/app/entities/project/project-detail.component.ts b/src/main/webapp/app/entities/project/project-detail.component.ts index 7c3c4797f..5165d7d2d 100644 --- a/src/main/webapp/app/entities/project/project-detail.component.ts +++ b/src/main/webapp/app/entities/project/project-detail.component.ts @@ -14,8 +14,7 @@ import { EventManager } from '../../shared/util/event-manager.service'; export class ProjectDetailComponent implements OnInit, OnDestroy { project: Project; - private subscription: any; - private eventSubscriber: Subscription; + private subscription = new Subscription(); sources: Source[]; @@ -34,10 +33,9 @@ export class ProjectDetailComponent implements OnInit, OnDestroy { } ngOnInit() { - this.subscription = this.route.params.subscribe((params) => { + this.subscription.add(this.route.params.subscribe((params) => { this.load(params['projectName']); - }); - this.registerChangeInProjects(); + })); this.viewSubjects(); } @@ -53,12 +51,6 @@ export class ProjectDetailComponent implements OnInit, OnDestroy { ngOnDestroy() { this.subscription.unsubscribe(); - this.eventManager.destroy(this.eventSubscriber); - } - - registerChangeInProjects() { - this.eventSubscriber = this.eventManager.subscribe('projectListModification', - () => this.load(this.project.projectName)); } viewSources() { diff --git a/src/main/webapp/app/entities/project/project-popup.service.ts b/src/main/webapp/app/entities/project/project-popup.service.ts index 7ba1e5ec5..0c9e3b176 100644 --- a/src/main/webapp/app/entities/project/project-popup.service.ts +++ b/src/main/webapp/app/entities/project/project-popup.service.ts @@ -32,7 +32,7 @@ export class ProjectPopupService { this.projectModalRef(component, project); }); } else { - return this.projectModalRef(component, new Project()); + return this.projectModalRef(component, {}); } } diff --git a/src/main/webapp/app/entities/source-type/source-type-dialog.component.ts b/src/main/webapp/app/entities/source-type/source-type-dialog.component.ts index 19317ef16..a767b652c 100644 --- a/src/main/webapp/app/entities/source-type/source-type-dialog.component.ts +++ b/src/main/webapp/app/entities/source-type/source-type-dialog.component.ts @@ -17,32 +17,24 @@ import { SourceTypeService } from './source-type.service'; selector: 'jhi-source-type-dialog', templateUrl: './source-type-dialog.component.html', }) -export class SourceTypeDialogComponent implements OnInit { +export class SourceTypeDialogComponent { readonly authorities: string[]; sourceType: SourceType; isSaving: boolean; - projects: Project[]; - constructor( public activeModal: NgbActiveModal, private alertService: AlertService, private sourceTypeService: SourceTypeService, private sourceDataService: SourceDataService, - private projectService: ProjectService, + public projectService: ProjectService, private eventManager: EventManager, ) { this.isSaving = false; this.authorities = ['ROLE_USER', 'ROLE_SYS_ADMIN']; } - ngOnInit() { - this.projectService.query().subscribe( - (res: HttpResponse) => this.projects = res.body, - (res: HttpErrorResponse) => this.onError(res)); - } - clear() { this.activeModal.dismiss('cancel'); } diff --git a/src/main/webapp/app/entities/source/general-source-dialog.component.html b/src/main/webapp/app/entities/source/general-source-dialog.component.html index e384fe440..6150c7e9b 100644 --- a/src/main/webapp/app/entities/source/general-source-dialog.component.html +++ b/src/main/webapp/app/entities/source/general-source-dialog.component.html @@ -56,7 +56,7 @@
    { - this.projects = res; - }, (res: HttpErrorResponse) => this.onError(res)); - this.onProjectChange(this.source.project); } diff --git a/src/main/webapp/app/entities/subject/general.subject-dialog.component.html b/src/main/webapp/app/entities/subject/general.subject-dialog.component.html index 7bd5c7879..8b0b4c1fd 100644 --- a/src/main/webapp/app/entities/subject/general.subject-dialog.component.html +++ b/src/main/webapp/app/entities/subject/general.subject-dialog.component.html @@ -39,7 +39,7 @@
    ) => this.projects = res.body); - this.eventManager.subscribe(this.attributeComponentEventPrefix + 'ListModification', + this.eventSubscription = this.eventManager.subscribe( + this.attributeComponentEventPrefix + 'ListModification', (response) => this.subject.attributes = response.content); } + ngOnDestroy() { + this.eventSubscription.unsubscribe(); + } + clear() { this.activeModal.dismiss('cancel'); } @@ -75,10 +77,6 @@ export class GeneralSubjectDialogComponent implements OnInit { this.alertService.error(error.message, null, null); } - trackDeviceById(index: number, item: MinimalSource) { - return item.id; - } - trackProjectById(index: number, item: Project) { return item.id; } diff --git a/src/main/webapp/app/entities/subject/general.subject-popup.service.ts b/src/main/webapp/app/entities/subject/general.subject-popup.service.ts index 1f5c977c8..6e26d48e9 100644 --- a/src/main/webapp/app/entities/subject/general.subject-popup.service.ts +++ b/src/main/webapp/app/entities/subject/general.subject-popup.service.ts @@ -2,7 +2,7 @@ import { Injectable } from '@angular/core'; import { Router } from '@angular/router'; import { NgbModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap'; -import { Subject, SubjectService } from '../../shared/subject'; +import { Subject, SubjectService, SubjectStatus } from '../../shared/subject'; @Injectable({ providedIn: 'root' }) export class GeneralSubjectPopupService { @@ -26,7 +26,10 @@ export class GeneralSubjectPopupService { this.subjectModalRef(component, subject, isDelete); }); } else { - return this.subjectModalRef(component, new Subject(), isDelete); + return this.subjectModalRef(component, { + sources: [], + status: SubjectStatus.ACTIVATED, + }, isDelete); } } diff --git a/src/main/webapp/app/home/home.component.html b/src/main/webapp/app/home/home.component.html index 19e9696e8..355f98919 100644 --- a/src/main/webapp/app/home/home.component.html +++ b/src/main/webapp/app/home/home.component.html @@ -6,22 +6,18 @@

    -
    +
    - - +
    -
    - - -
    +
    +
    -
    -
    -
    +
    +
    {{project.projectName}}
    +
    {{project.organization}} : {{project.location}}
    +

    {{project.description}}

    {{project.projectName}}
    @@ -43,5 +39,12 @@
    {{project.organization}} :
    + + +
    + + +
    +
    diff --git a/src/main/webapp/app/home/home.component.ts b/src/main/webapp/app/home/home.component.ts index 9a07d2b26..9fac27229 100644 --- a/src/main/webapp/app/home/home.component.ts +++ b/src/main/webapp/app/home/home.component.ts @@ -1,10 +1,14 @@ import { Component, OnDestroy, OnInit } from '@angular/core'; import { NgbModalRef } from '@ng-bootstrap/ng-bootstrap'; -import { Account, LoginModalService, Principal, Project, UserService } from '../shared'; -import { EventManager } from '../shared/util/event-manager.service'; -import { Observable, of, Subscription } from "rxjs"; -import { switchMap, tap } from "rxjs/operators"; +import { + Account, + LoginModalService, + Principal, + Project, + ProjectService, +} from '../shared'; +import { Subscription } from "rxjs"; @Component({ selector: 'jhi-home', @@ -17,41 +21,26 @@ import { switchMap, tap } from "rxjs/operators"; export class HomeComponent implements OnInit, OnDestroy { account: Account; modalRef: NgbModalRef; - projects: Project[]; - subscriptions: Subscription; + private subscriptions: Subscription; constructor( private principal: Principal, private loginModalService: LoginModalService, - private eventManager: EventManager, - private userService: UserService, + public projectService: ProjectService, ) { this.subscriptions = new Subscription(); } ngOnInit() { - this.loadRelevantProjects(); + this.subscriptions.add( + this.principal.getAuthenticationState().subscribe((account) => this.account = account), + ); } ngOnDestroy() { this.subscriptions.unsubscribe(); } - private loadRelevantProjects() { - this.subscriptions.add(this.principal.getAuthenticationState() - .pipe( - tap(account => this.account = account), - switchMap(account => { - if (account) { - return this.userService.findProject(account.login); - } else { - return of([]); - } - }) - ) - .subscribe(projects => this.projects = projects)); - } - trackId(index: number, item: Project) { return item.projectName; } diff --git a/src/main/webapp/app/layouts/navbar/navbar.component.html b/src/main/webapp/app/layouts/navbar/navbar.component.html index c9bcb7902..250793b0e 100644 --- a/src/main/webapp/app/layouts/navbar/navbar.component.html +++ b/src/main/webapp/app/layouts/navbar/navbar.component.html @@ -61,8 +61,8 @@
      -
    • - +
    • + {{project.projectName}} diff --git a/src/main/webapp/app/layouts/navbar/navbar.component.ts b/src/main/webapp/app/layouts/navbar/navbar.component.ts index 7746a3de5..6d9493ca6 100644 --- a/src/main/webapp/app/layouts/navbar/navbar.component.ts +++ b/src/main/webapp/app/layouts/navbar/navbar.component.ts @@ -5,7 +5,15 @@ import { TranslateService } from '@ngx-translate/core'; import { of, Subscription } from 'rxjs'; import { DEBUG_INFO_ENABLED, VERSION } from '../../app.constants'; -import { JhiLanguageHelper, LoginModalService, LoginService, Principal, Project, UserService } from '../../shared'; +import { + JhiLanguageHelper, + LoginModalService, + LoginService, + Principal, + Project, + ProjectService, + UserService +} from '../../shared'; import { EventManager } from '../../shared/util/event-manager.service'; import { ProfileService } from '../profiles/profile.service'; @@ -31,15 +39,15 @@ export class NavbarComponent implements OnInit, OnDestroy { private subscriptions: Subscription; constructor( - private loginService: LoginService, - public languageHelper: JhiLanguageHelper, - private principal: Principal, - private loginModalService: LoginModalService, - private profileService: ProfileService, - private router: Router, - private eventManager: EventManager, - private translateService: TranslateService, - private userService: UserService, + private loginService: LoginService, + public languageHelper: JhiLanguageHelper, + private principal: Principal, + private loginModalService: LoginModalService, + private profileService: ProfileService, + private router: Router, + private eventManager: EventManager, + private translateService: TranslateService, + public projectService: ProjectService, ) { this.version = DEBUG_INFO_ENABLED ? 'v' + VERSION : ''; this.isNavbarCollapsed = true; @@ -48,7 +56,6 @@ export class NavbarComponent implements OnInit, OnDestroy { ngOnInit() { this.principal.identity().then(account => this.currentAccount = account); - this.loadRelevantProjects(); this.profileService.getProfileInfo().then((profileInfo) => { this.inProduction = profileInfo.inProduction; this.apiDocsEnabled = profileInfo.apiDocsEnabled; @@ -59,21 +66,6 @@ export class NavbarComponent implements OnInit, OnDestroy { this.subscriptions.unsubscribe(); } - loadRelevantProjects() { - this.subscriptions.add(this.principal.getAuthenticationState() - .pipe( - tap(account => this.currentAccount = account), - switchMap(account => { - if (account) { - return this.userService.findProject(account.login); - } else { - return of([]); - } - }) - ) - .subscribe(projects => this.projects = projects)); - } - trackProjectName(index: number, item: Project) { return item.projectName; } diff --git a/src/main/webapp/app/shared/alert/alert-error.component.ts b/src/main/webapp/app/shared/alert/alert-error.component.ts index cb45f40d2..a30d20b9f 100644 --- a/src/main/webapp/app/shared/alert/alert-error.component.ts +++ b/src/main/webapp/app/shared/alert/alert-error.component.ts @@ -57,7 +57,7 @@ export class JhiAlertErrorComponent implements OnDestroy { for (i = 0; i < fieldErrors.length; i++) { const fieldError = fieldErrors[i]; // convert 'something[14].other[4].id' to 'something[].other[].id' so translations can be written to it - const convertedField = fieldError.field.replace(/\[\d*\]/g, '[]'); + const convertedField = fieldError.field.replace(/\[\d*]/g, '[]'); const fieldName = translateService.instant('managementPortalApp.' + fieldError.objectName + '.' + convertedField); this.addErrorAlert( diff --git a/src/main/webapp/app/shared/dictionary-mapper/dictionary-mapper.component.ts b/src/main/webapp/app/shared/dictionary-mapper/dictionary-mapper.component.ts index ad1794784..26c2f7eb2 100644 --- a/src/main/webapp/app/shared/dictionary-mapper/dictionary-mapper.component.ts +++ b/src/main/webapp/app/shared/dictionary-mapper/dictionary-mapper.component.ts @@ -2,14 +2,13 @@ import { Component, Input, OnInit } from '@angular/core'; import { Subscription } from 'rxjs'; import { EventManager } from '../util/event-manager.service'; -import { Dictionary } from './dictionary-mapper.model'; @Component({ selector: 'jhi-dictionary-mapper', templateUrl: './dictionary-mapper.component.html', }) export class DictionaryMapperComponent implements OnInit { - @Input() attributes: Dictionary; + @Input() attributes: Record; eventSubscriber: Subscription; @Input() options: string[]; diff --git a/src/main/webapp/app/shared/dictionary-mapper/dictionary-mapper.model.ts b/src/main/webapp/app/shared/dictionary-mapper/dictionary-mapper.model.ts deleted file mode 100644 index 14155f971..000000000 --- a/src/main/webapp/app/shared/dictionary-mapper/dictionary-mapper.model.ts +++ /dev/null @@ -1,3 +0,0 @@ -export interface Dictionary { - [key: string]: string; -} diff --git a/src/main/webapp/app/shared/group/group.component.ts b/src/main/webapp/app/shared/group/group.component.ts index 393a3c147..15a438e86 100644 --- a/src/main/webapp/app/shared/group/group.component.ts +++ b/src/main/webapp/app/shared/group/group.component.ts @@ -49,6 +49,7 @@ export class GroupComponent implements OnInit, OnDestroy, OnChanges { } ngOnDestroy() { + this.project$.complete(); this.eventManager.destroy(this.eventSubscriber); } diff --git a/src/main/webapp/app/shared/project/project.model.ts b/src/main/webapp/app/shared/project/project.model.ts index 9c25763fc..9bc65debd 100644 --- a/src/main/webapp/app/shared/project/project.model.ts +++ b/src/main/webapp/app/shared/project/project.model.ts @@ -7,29 +7,23 @@ export const enum ProjectStatus { 'ENDED' } -export class Project { - constructor( - public id?: number, - public projectName?: string, - public description?: string, - public organization?: string, - public location?: string, - public startDate?: any, - public projectStatus?: ProjectStatus, - public endDate?: any, - public attributes ?: any, - public sourceTypes?: SourceType[], - public groups?: Group[], - public humanReadableProjectName ?: string, - public persistentTokenTimeout?: number - ) { - } +export interface Project { + id?: number; + projectName?: string; + description?: string; + organization?: string; + location?: string; + startDate?: any; + projectStatus?: ProjectStatus; + endDate?: any; + attributes ?: any; + sourceTypes?: SourceType[]; + groups?: Group[]; + humanReadableProjectName ?: string; + persistentTokenTimeout?: number; } -export class MinimalProject { - constructor( - public id?: number, - public projectName?: string, - ) { - } +export interface MinimalProject { + id?: number; + projectName?: string; } diff --git a/src/main/webapp/app/shared/project/project.service.ts b/src/main/webapp/app/shared/project/project.service.ts index f236348ca..17fbe268a 100644 --- a/src/main/webapp/app/shared/project/project.service.ts +++ b/src/main/webapp/app/shared/project/project.service.ts @@ -1,42 +1,116 @@ import { Injectable } from '@angular/core'; import { HttpClient, HttpResponse } from '@angular/common/http'; -import { Observable } from 'rxjs'; -import { map } from 'rxjs/operators'; +import { + BehaviorSubject, + combineLatest, + Observable, + of, + Subject, + throwError +} from 'rxjs'; +import { + concatMap, + delay, + map, + pluck, + retryWhen, + startWith, + switchMap, + take, + tap, +} from 'rxjs/operators'; import { Project } from './project.model'; import { SourceType } from '../../entities/source-type'; import { createRequestOption } from '../model/request.utils'; import { convertDateTimeFromServer, toDate } from '../util/date-util'; +import { Principal } from "../auth/principal.service"; +import { AlertService } from "../util/alert.service"; @Injectable({ providedIn: 'root' }) export class ProjectService { - private resourceUrl = 'api/projects'; + private readonly _projects$ = new BehaviorSubject([]); + private readonly _trigger$ = new Subject(); + + projects$: Observable = this._projects$.asObservable(); + + constructor( + private http: HttpClient, + private principal: Principal, + private alertService: AlertService, + ) { + combineLatest([ + principal.account$, + this._trigger$.pipe(startWith(undefined as void)), + ]).pipe( + switchMap(([state]) => { + if (state) { + return this.fetch().pipe( + retryWhen(errors => errors.pipe( + delay(1000), + take(10), + concatMap(err => throwError(err))) + ), + ); + } else { + return of([]); + } + }) + ).subscribe( + projects => this._projects$.next(projects), + err => this.alertService.error(err.message, null, null), + ); + } - constructor(private http: HttpClient) { + reset() { + this._trigger$.next(); } create(project: Project): Observable { - const copy: Project = Object.assign({}, project); - copy.startDate = toDate(project.startDate); - copy.endDate = toDate(project.endDate); - return this.http.post(this.resourceUrl, copy); + return this.http.post(this.resourceUrl, this.convertProjectToServer(project)).pipe( + map(p => this.convertProjectFromServer(p)), + tap( + p => this.updateProject(p), + () => this.reset(), + ), + ) } update(project: Project): Observable { - const copy: Project = Object.assign({}, project); - copy.startDate = toDate(project.startDate); - copy.endDate = toDate(project.endDate); - return this.http.put(this.resourceUrl, copy); + return this.http.put(this.resourceUrl, this.convertProjectToServer(project)).pipe( + map(p => this.convertProjectFromServer(p)), + tap( + p => this.updateProject(p), + () => this.reset(), + ), + ) } find(projectName: string): Observable { - return this.http.get(`${this.resourceUrl}/${encodeURIComponent(projectName)}`) - .pipe(map((jsonResponse: any) => { - jsonResponse.startDate = convertDateTimeFromServer(jsonResponse.startDate); - jsonResponse.endDate = convertDateTimeFromServer(jsonResponse.endDate); - return jsonResponse; - })); + return this.projects$.pipe( + switchMap(projects => { + const existingProject = projects.find(p => p.projectName === projectName); + if (existingProject) { + return of(existingProject); + } else { + return this.fetchProject(projectName); + } + }) + ); + } + + fetchProject(projectName: string): Observable { + return this.http.get(`${this.resourceUrl}/${encodeURIComponent(projectName)}`).pipe( + map(p => this.convertProjectFromServer(p)), + tap(p => this.updateProject(p)), + ); + } + + fetch(): Observable { + return this.query().pipe( + map(res => res.body.map(p => this.convertProjectFromServer(p))), + ); } query(req?: any): Observable> { @@ -44,24 +118,58 @@ export class ProjectService { return this.http.get(this.resourceUrl, {params: options, observe: 'response'}); } - findAll(fetchMinimal: boolean): Observable { - return this.http.get(`${this.resourceUrl}?minimized=${fetchMinimal}`) - .pipe(map((res: any) => this.convertResponseDates(res))); - } - findSourceTypesByName(projectName: string): Observable { - return this.http.get(`${this.resourceUrl}/${projectName}/source-types`); + return this.find(projectName).pipe( + pluck('sourceTypes'), + switchMap(sourceTypes => { + if (sourceTypes) { + return of(sourceTypes); + } else { + return this.http.get(`${this.resourceUrl}/${projectName}/source-types`) + } + }) + ); } delete(projectName: string): Observable { - return this.http.delete(`${this.resourceUrl}/${encodeURIComponent(projectName)}`); + return this.http.delete(`${this.resourceUrl}/${encodeURIComponent(projectName)}`).pipe( + tap( + () => { + const newProjects = this._projects$.value.slice() + const idx = newProjects.findIndex(p => p.projectName === projectName); + if (idx >= 0) { + newProjects.splice(idx, 1); + this._projects$.next(newProjects); + } + }, + () => this.reset(), + ), + ); } - private convertResponseDates(jsonResponse: any): any { - for (let i = 0; i < jsonResponse.length; i++) { - jsonResponse[i].startDate = convertDateTimeFromServer(jsonResponse[i].startDate); - jsonResponse[i].endDate = convertDateTimeFromServer(jsonResponse[i].endDate); + private updateProject(project: Project) { + const nextValue = this._projects$.value.slice(); + const idx = nextValue.findIndex(p => p.projectName === project.projectName); + if (idx >= 0) { + nextValue[idx] = project; + } else { + nextValue.push(project); } - return jsonResponse; + this._projects$.next(nextValue); + } + + private convertProjectToServer(project: Project): any { + const copy: Project = Object.assign({}, project); + copy.startDate = toDate(project.startDate); + copy.endDate = toDate(project.endDate); + return copy; } + + private convertProjectFromServer(projectFromServer: any): Project { + const copy: Project = Object.assign({}, projectFromServer); + copy.startDate = convertDateTimeFromServer(projectFromServer.startDate); + copy.endDate = convertDateTimeFromServer(projectFromServer.endDate); + return copy; + } + } diff --git a/src/main/webapp/app/shared/source/source.model.ts b/src/main/webapp/app/shared/source/source.model.ts index 81cb005d8..5fcac29fd 100644 --- a/src/main/webapp/app/shared/source/source.model.ts +++ b/src/main/webapp/app/shared/source/source.model.ts @@ -1,6 +1,5 @@ import { MinimalProject } from '../project/project.model'; import { SourceType } from '../../entities/source-type/source-type.model'; -import { Dictionary } from '../dictionary-mapper/dictionary-mapper.model'; export class Source { constructor( @@ -11,7 +10,7 @@ export class Source { public assigned?: boolean, public sourceType?: SourceType, public project?: MinimalProject, - public attributes?: Dictionary, + public attributes?: Record, ) { this.assigned = false; } diff --git a/src/main/webapp/app/shared/subject/patient-detail.component.spec.ts b/src/main/webapp/app/shared/subject/patient-detail.component.spec.ts index 22b2ddc2a..9e40a5cd9 100644 --- a/src/main/webapp/app/shared/subject/patient-detail.component.spec.ts +++ b/src/main/webapp/app/shared/subject/patient-detail.component.spec.ts @@ -7,7 +7,7 @@ import { EventManager } from '../util/event-manager.service'; import { ManagementPortalTestModule } from '../util/test/test.module'; import { MockActivatedRoute } from '../util/test/mock-route.service'; import { SubjectService } from './subject.service'; -import { Subject } from './subject.model'; +import { SubjectStatus } from './subject.model'; import { SubjectDetailComponent } from './subject-detail.component'; describe('Component Tests', () => { @@ -43,14 +43,14 @@ describe('Component Tests', () => { it('Should call load all on init', () => { // GIVEN - spyOn(service, 'find').and.returnValue(of(new Subject(10, 'test'))); + spyOn(service, 'find').and.returnValue(of({id: 10, login: 'test', sources: [], status: SubjectStatus.ACTIVATED})); // WHEN comp.ngOnInit(); // THEN expect(service.find).toHaveBeenCalledWith('test'); - expect(comp.subject).toEqual(jasmine.objectContaining({id: 10, login: 'test'})); + expect(comp.subject).toEqual(jasmine.objectContaining({id: 10, login: 'test', sources: [], status: SubjectStatus.ACTIVATED})); }); }); }); diff --git a/src/main/webapp/app/shared/subject/subject-dialog.component.ts b/src/main/webapp/app/shared/subject/subject-dialog.component.ts index 654f1eccb..c88662364 100644 --- a/src/main/webapp/app/shared/subject/subject-dialog.component.ts +++ b/src/main/webapp/app/shared/subject/subject-dialog.component.ts @@ -12,7 +12,6 @@ import { import { AlertService } from '../util/alert.service'; import { EventManager } from '../util/event-manager.service'; -import { MinimalSource } from '../source'; import { SubjectPopupService } from './subject-popup.service'; import { Subject } from './subject.model'; @@ -88,10 +87,6 @@ export class SubjectDialogComponent implements OnInit { private onError(error) { this.alertService.error(error.message, null, null); } - - trackDeviceById(index: number, item: MinimalSource) { - return item.id; - } } @Component({ diff --git a/src/main/webapp/app/shared/subject/subject-popup.service.ts b/src/main/webapp/app/shared/subject/subject-popup.service.ts index 9fe9d02e9..d2edc5182 100644 --- a/src/main/webapp/app/shared/subject/subject-popup.service.ts +++ b/src/main/webapp/app/shared/subject/subject-popup.service.ts @@ -3,7 +3,7 @@ import { Router } from '@angular/router'; import { NgbModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap'; import { ProjectService } from '../project/project.service'; -import { Subject } from './subject.model'; +import { Subject, SubjectStatus } from './subject.model'; import { SubjectService } from './subject.service'; @Injectable({ providedIn: 'root' }) @@ -31,8 +31,11 @@ export class SubjectPopupService { }); } else if (projectName) { this.projectService.find(projectName).subscribe((project) => { - const subject = new Subject(); - subject.project = project; + const subject = { + project, + sources: [], + status: SubjectStatus.ACTIVATED, + }; return this.subjectModalRef(component, subject, isDelete); }); } diff --git a/src/main/webapp/app/shared/subject/subject.model.ts b/src/main/webapp/app/shared/subject/subject.model.ts index 4eae77c66..c872a8ed5 100644 --- a/src/main/webapp/app/shared/subject/subject.model.ts +++ b/src/main/webapp/app/shared/subject/subject.model.ts @@ -1,27 +1,27 @@ import { Role } from '../../admin/user-management/role.model'; import { Project } from '../project/project.model'; -import { Dictionary } from '../dictionary-mapper/dictionary-mapper.model'; import { MinimalSource } from '../source/source.model'; -export class Subject { - public id?: any; - public login?: string; - public externalLink?: string; - public externalId?: string; - public createdBy?: string; - public createdDate?: Date; - public dateOfBirth?: Date; - public enrollmentDate?: Date; - public lastModifiedBy?: string; - public lastModifiedDate?: Date; - public group?: string; - public password?: string; - public personName?: string; - public project?: Project; - public sources?: MinimalSource[]; - public attributes: Dictionary; - public status: SubjectStatus; - public roles?: Role[]; +export interface Subject { + id?: any; + login?: string; + externalLink?: string; + externalId?: string; + createdBy?: string; + createdDate?: Date; + dateOfBirth?: Date; + enrollmentDate?: Date; + lastModifiedBy?: string; + lastModifiedDate?: Date; + group?: string; + password?: string; + personName?: string; + project?: Project; + sources: MinimalSource[]; + attributes?: Record; + status: SubjectStatus; + roles?: Role[]; +} constructor( id?: number, diff --git a/src/main/webapp/app/shared/subject/subject.service.ts b/src/main/webapp/app/shared/subject/subject.service.ts index ad7103a21..6a8e9d99c 100644 --- a/src/main/webapp/app/shared/subject/subject.service.ts +++ b/src/main/webapp/app/shared/subject/subject.service.ts @@ -40,7 +40,6 @@ export class SubjectService { findRevisions(login: string, req?: any): Observable> { const params = createRequestOption(req); return this.http.get(`${this.resourceUrl}/${encodeURIComponent(login)}/revisions`, {params, observe: 'response'}); - } query( diff --git a/src/main/webapp/app/shared/user/common-user-management.component.ts b/src/main/webapp/app/shared/user/common-user-management.component.ts index d824b62c9..f69516344 100644 --- a/src/main/webapp/app/shared/user/common-user-management.component.ts +++ b/src/main/webapp/app/shared/user/common-user-management.component.ts @@ -1,13 +1,23 @@ -import { Component, Input, OnChanges, OnInit, SimpleChange, SimpleChanges } from '@angular/core'; +import { + Component, + Input, + OnChanges, + OnDestroy, + OnInit, + SimpleChange, + SimpleChanges +} from '@angular/core'; import { ITEMS_PER_PAGE, Project, User, UserService } from '..'; import { EventManager } from '../util/event-manager.service'; +import { BehaviorSubject, combineLatest, Subject, Subscription } from "rxjs"; +import { filter, startWith, switchMap } from "rxjs/operators"; @Component({ selector: 'jhi-common-user-mgmt', templateUrl: './common-user-management.component.html' }) -export class CommonUserMgmtComponent implements OnInit, OnChanges { +export class CommonUserMgmtComponent implements OnInit, OnChanges, OnDestroy { users: User[]; error: any; success: any; @@ -16,11 +26,22 @@ export class CommonUserMgmtComponent implements OnInit, OnChanges { itemsPerPage: any; page: any; predicate: any; - previousPage: any; reverse: any; - @Input() project: Project; - @Input() authority: String; + project$ = new BehaviorSubject(null); + @Input() + get project(): Project { return this.project$.value; } + set project(v: Project) { this.project$.next(v) } + + authority$ = new BehaviorSubject(''); + @Input() + get authority(): string { return this.authority$.value; } + set authority(v: string) { this.authority$.next(v); } + + trigger$ = new Subject(); + + + private subscriptions: Subscription = new Subscription(); constructor( private userService: UserService, @@ -30,30 +51,38 @@ export class CommonUserMgmtComponent implements OnInit, OnChanges { } ngOnInit() { - this.loadAll(); + this.subscriptions.add( + combineLatest([ + this.project$, + this.authority$, + this.trigger$.pipe(startWith(undefined as void)), + ]).pipe( + filter(([p, a]) => (!!p) && (!!a)), + switchMap(([project, authority]) => this.userService.findByProjectAndAuthority({ + projectName: project.projectName, + authority: authority, + })), + ).subscribe((res: any) => this.users = res) + ); this.registerChangeInUsers(); } + ngOnDestroy() { + this.subscriptions.unsubscribe(); + } + registerChangeInUsers() { - this.eventManager.subscribe('userListModification', () => this.loadAll()); + this.subscriptions.add( + this.eventManager.subscribe('userListModification', () => this.trigger$.next()) + ); } ngOnChanges(changes: SimpleChanges) { - const project: SimpleChange = changes.project ? changes.project : null; - if (project) { - this.project = project.currentValue; - this.loadAll(); + if (changes.project) { + this.project$.next(changes.project.currentValue); } - } - - loadAll() { - if (this.project && this.authority) { - this.userService.findByProjectAndAuthority( - { - projectName: this.project.projectName, - authority: this.authority, - }, - ).subscribe((res: any) => this.users = res); + if (changes.authority) { + this.authority$.next(changes.authority.currentValue); } } @@ -61,22 +90,7 @@ export class CommonUserMgmtComponent implements OnInit, OnChanges { return item.id; } - sort() { - const result = [this.predicate + ',' + (this.reverse ? 'asc' : 'desc')]; - if (this.predicate !== 'id') { - result.push('id'); - } - return result; - } - - loadPage(page: number) { - if (page !== this.previousPage) { - this.previousPage = page; - this.transition(); - } - } - transition() { - this.loadAll(); + this.trigger$.next(); } } diff --git a/src/main/webapp/app/shared/user/user.model.ts b/src/main/webapp/app/shared/user/user.model.ts index 92ad04539..9bf561772 100644 --- a/src/main/webapp/app/shared/user/user.model.ts +++ b/src/main/webapp/app/shared/user/user.model.ts @@ -1,54 +1,20 @@ import { Role } from '../../admin/user-management/role.model'; -import { Project } from '../../shared/project'; +import { Project } from '../project'; -export class User { - public id?: any; - public login?: string; - public firstName?: string; - public lastName?: string; - public email?: string; - public activated?: Boolean; - public langKey?: string; - public authorities: string[]; - public roles?: Role[]; - public createdBy?: string; - public createdDate?: Date; - public lastModifiedBy?: string; - public lastModifiedDate?: Date; - public password?: string; - public project?: Project = new Project(); - - constructor( - id?: any, - login?: string, - firstName?: string, - lastName?: string, - email?: string, - activated?: Boolean, - langKey?: string, - authorities?: string[], - roles?: Role[], - createdBy?: string, - createdDate?: Date, - lastModifiedBy?: string, - lastModifiedDate?: Date, - password?: string, - project?: Project, - ) { - this.id = id ? id : null; - this.login = login ? login : null; - this.firstName = firstName ? firstName : null; - this.lastName = lastName ? lastName : null; - this.email = email ? email : null; - this.activated = activated ? activated : false; - this.langKey = langKey ? langKey : null; - this.roles = roles ? roles : null; - this.authorities = authorities ? authorities : null; - this.createdBy = createdBy ? createdBy : null; - this.createdDate = createdDate ? createdDate : null; - this.lastModifiedBy = lastModifiedBy ? lastModifiedBy : null; - this.lastModifiedDate = lastModifiedDate ? lastModifiedDate : null; - this.password = password ? password : null; - this.project = project ? project : new Project(); - } +export interface User { + id?: number; + login?: string; + firstName?: string; + lastName?: string; + email?: string; + activated?: Boolean; + langKey?: string; + authorities: string[]; + roles?: Role[]; + createdBy?: string; + createdDate?: Date; + lastModifiedBy?: string; + lastModifiedDate?: Date; + password?: string; + project?: Project; } From 414cb5930af227f0003664f6b45718445980293d Mon Sep 17 00:00:00 2001 From: Joris Borgdorff Date: Tue, 16 Nov 2021 13:27:07 +0100 Subject: [PATCH 177/431] Make subject listing reactive --- .../app/entities/project/project.route.ts | 3 + .../shared/subject/filter-badge.component.ts | 30 + src/main/webapp/app/shared/subject/index.ts | 3 + .../shared/subject/load-more.component.scss | 29 + .../app/shared/subject/load-more.component.ts | 39 + .../app/shared/subject/ngb-date.pipe.ts | 23 + .../app/shared/subject/subject.component.html | 156 ++-- .../app/shared/subject/subject.component.scss | 20 - .../app/shared/subject/subject.component.ts | 744 +++++++++--------- .../app/shared/subject/subject.model.ts | 48 +- .../app/shared/subject/subject.module.ts | 5 + .../app/shared/util/parse-links-util.ts | 8 +- .../webapp/app/shared/util/reactive-filter.ts | 141 ++++ src/main/webapp/i18n/en/subject.json | 5 +- src/main/webapp/i18n/nl/subject.json | 3 +- .../integration/entities/subject.spec.ts | 7 +- .../e2e/cypress/integration/util/nav-bar.ts | 2 - 17 files changed, 731 insertions(+), 535 deletions(-) create mode 100644 src/main/webapp/app/shared/subject/filter-badge.component.ts create mode 100644 src/main/webapp/app/shared/subject/load-more.component.scss create mode 100644 src/main/webapp/app/shared/subject/load-more.component.ts create mode 100644 src/main/webapp/app/shared/subject/ngb-date.pipe.ts create mode 100644 src/main/webapp/app/shared/util/reactive-filter.ts diff --git a/src/main/webapp/app/entities/project/project.route.ts b/src/main/webapp/app/entities/project/project.route.ts index 40952e324..4d7a553bb 100644 --- a/src/main/webapp/app/entities/project/project.route.ts +++ b/src/main/webapp/app/entities/project/project.route.ts @@ -30,6 +30,9 @@ export const projectRoute: Routes = [ authorities: [SYSTEM_ADMIN, PROJECT_ADMIN], pageTitle: 'managementPortalApp.project.home.title', }, + resolve: { + 'pagingParams': ResolvePagingParams, + }, canActivate: [UserRouteAccessService], }, ]; diff --git a/src/main/webapp/app/shared/subject/filter-badge.component.ts b/src/main/webapp/app/shared/subject/filter-badge.component.ts new file mode 100644 index 000000000..bd17a5e4b --- /dev/null +++ b/src/main/webapp/app/shared/subject/filter-badge.component.ts @@ -0,0 +1,30 @@ +/* + * Copyright (c) 2021. The Hyve + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * + * See the file LICENSE in the root of this repository. + */ + +import { Component, EventEmitter, Input, Output } from "@angular/core"; + +@Component({ + selector: 'app-filter-badge', + template: ` +
      + {{ text | translate }} + : {{value}} + +
      + ` +}) +export class FilterBadgeComponent { + @Input() + text: string + @Input() + value: string + @Output() + clear: EventEmitter = new EventEmitter() +} diff --git a/src/main/webapp/app/shared/subject/index.ts b/src/main/webapp/app/shared/subject/index.ts index 2a86d4490..eaa0e0ef8 100644 --- a/src/main/webapp/app/shared/subject/index.ts +++ b/src/main/webapp/app/shared/subject/index.ts @@ -1,3 +1,6 @@ +export * from './filter-badge.component'; +export * from './load-more.component'; +export * from './ngb-date.pipe'; export * from './subject.model'; export * from './subject-popup.service'; export * from './subject.service'; diff --git a/src/main/webapp/app/shared/subject/load-more.component.scss b/src/main/webapp/app/shared/subject/load-more.component.scss new file mode 100644 index 000000000..632075de1 --- /dev/null +++ b/src/main/webapp/app/shared/subject/load-more.component.scss @@ -0,0 +1,29 @@ +/*! + * Copyright (c) 2021. The Hyve + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * + * See the file LICENSE in the root of this repository. + */ + + +.subject-pagination { + display: flex; + margin-top: 8px; +} +.subject-pagination > * { + text-align: center; + flex-grow: 1; + padding: 16px; +} +.all-loaded { + color: #dadada; + cursor: not-allowed; +} +.load-more:hover { + background: rgba(169, 209, 255, 0.3); +} +.load-more:active { + background: rgba(0, 120, 255, 0.15); +} diff --git a/src/main/webapp/app/shared/subject/load-more.component.ts b/src/main/webapp/app/shared/subject/load-more.component.ts new file mode 100644 index 000000000..aa8453599 --- /dev/null +++ b/src/main/webapp/app/shared/subject/load-more.component.ts @@ -0,0 +1,39 @@ +/* + * Copyright (c) 2021. The Hyve + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * + * See the file LICENSE in the root of this repository. + */ + +import { Component, EventEmitter, Input, Output } from "@angular/core"; + +@Component({ + selector: 'app-load-more', + template: ` +
      + + +
      + `, + styleUrls: ['./load-more.component.scss'] +}) +export class LoadMoreComponent { + @Input() + totalItems?: number + @Input() + shownItems: number + @Output() + load: EventEmitter = new EventEmitter() +} diff --git a/src/main/webapp/app/shared/subject/ngb-date.pipe.ts b/src/main/webapp/app/shared/subject/ngb-date.pipe.ts new file mode 100644 index 000000000..da0c136e7 --- /dev/null +++ b/src/main/webapp/app/shared/subject/ngb-date.pipe.ts @@ -0,0 +1,23 @@ +/* + * Copyright (c) 2021. The Hyve + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * + * See the file LICENSE in the root of this repository. + */ + +import { Pipe, PipeTransform } from "@angular/core"; +import { NgbDateParserFormatter, NgbDateStruct } from "@ng-bootstrap/ng-bootstrap"; + +@Pipe({name: 'ngbDate'}) +export class NgbDatePipe implements PipeTransform { + constructor( + private formatter: NgbDateParserFormatter, + ) { + } + + transform(value: NgbDateStruct): string { + return this.formatter.format(value); + } +} diff --git a/src/main/webapp/app/shared/subject/subject.component.html b/src/main/webapp/app/shared/subject/subject.component.html index 6a386538d..4bfa01789 100644 --- a/src/main/webapp/app/shared/subject/subject.component.html +++ b/src/main/webapp/app/shared/subject/subject.component.html @@ -2,14 +2,6 @@
      -
      @@ -18,8 +10,8 @@
      + [ngModel]="filters.subjectId.rawValue$ | async" + (ngModelChange)='filters.subjectId.next($event)'>
      @@ -29,8 +21,8 @@
      + [ngModel]="filters.externalId.rawValue$ | async" + (ngModelChange)='filters.externalId.next($event)'>
      @@ -41,8 +33,7 @@
      [attr.aria-expanded]="!isAdvancedFilterCollapsed" aria-controls="collapseExample"> - - +
      @@ -50,9 +41,9 @@
      + (ngModelChange)='filters.humanReadableId.next($event)'>
      @@ -62,10 +53,10 @@
      @@ -74,6 +65,7 @@
      +

      @@ -81,15 +73,16 @@
      placeholder="yyyy-mm-dd" id="field_enrollment_date_from" name="enrollmentDateFrom" - [(ngModel)]="filters.enrollmentDateFrom" + [ngModel]="(enrollmentDate$ | async).from" + [maxDate]="filters.enrollmentDateTo.value$ | async" ngbDatepicker #enrollmentFromDatePicker="ngbDatepicker" - (ngModelChange)='enrollmentDateFromFilterChanged("enrollmentDateFrom", filters.enrollmentDateFrom)'> + (ngModelChange)='filters.enrollmentDateFrom.next($event)'>
      - +
      @@ -97,16 +90,17 @@
      + (ngModelChange)='filters.enrollmentDateTo.next($event)'>
      - +
      @@ -115,28 +109,28 @@
      + (ngModelChange)='filters.personName.next($event)'>
    - + (ngModelChange)='filters.dateOfBirth.next($event)'>
    - +
    @@ -150,13 +144,13 @@
    > {{ 'managementPortalApp.subject.sorting.sortByLabel' | translate }}: - {{ 'managementPortalApp.subject.sorting.' + predicate | translate }} + {{ 'managementPortalApp.subject.sorting.' + (sortBy$ | async) | translate }}
    @@ -205,62 +199,52 @@
    -
    +
    {{ 'managementPortalApp.subject.filter.filters' | translate}}: -
    - {{ 'managementPortalApp.subject.subjectId' | translate }}: {{filters.subjectId}} - -
    -
    - {{ 'managementPortalApp.subject.externalId' | translate }}: {{filters.externalId}} - -
    -
    - {{ 'managementPortalApp.subject.personName' | translate }}: {{filters.personName}} - -
    -
    - {{ 'managementPortalApp.subject.humanReadableId' | translate }}: {{filters.humanReadableId}} - -
    -
    - {{ 'managementPortalApp.subject.dateOfBirth' | translate }}: {{appliedFilters.dateOfBirth}} - -
    -
    - {{ 'managementPortalApp.subject.enrollmentDateFrom' | translate }}: {{appliedFilters.enrollmentDateFrom}} - -
    -
    - {{ 'managementPortalApp.subject.enrollmentDateFrom' | translate }}: {{appliedFilters.enrollmentDateTo}} - -
    -
    - {{ 'managementPortalApp.subject.group' | translate }}: {{appliedFilters.group}} - -
    + + + + + + + + + +
    -
    +
    -
    +
    - +
    @@ -394,21 +378,7 @@
    -
    -
    - - +
    diff --git a/src/main/webapp/app/shared/subject/subject.component.scss b/src/main/webapp/app/shared/subject/subject.component.scss index 875e83614..3e5caf224 100644 --- a/src/main/webapp/app/shared/subject/subject.component.scss +++ b/src/main/webapp/app/shared/subject/subject.component.scss @@ -138,26 +138,6 @@ width: 100%; margin-bottom: 4px; } -.subject-pagination { -display: flex; -margin-top: 8px; -} -.subject-pagination > * { -text-align: center; -flex-grow: 1; -padding: 16px; -} -.subject-pagination__all-loaded { -color: #dadada; -cursor: not-allowed; -} -.subject-pagination__load-more:hover { -background: rgba(169, 209, 255, 0.3); -} -.subject-pagination__load-more:active { -background: rgba(0, 120, 255, 0.15); -} - .form-group .error{ color: red; background-color: inherit; diff --git a/src/main/webapp/app/shared/subject/subject.component.ts b/src/main/webapp/app/shared/subject/subject.component.ts index 9ea33902a..6ae75fe37 100644 --- a/src/main/webapp/app/shared/subject/subject.component.ts +++ b/src/main/webapp/app/shared/subject/subject.component.ts @@ -7,27 +7,35 @@ import { SimpleChange, SimpleChanges, } from '@angular/core'; -import { HttpErrorResponse, HttpResponse } from '@angular/common/http'; +import { HttpHeaders, HttpResponse } from '@angular/common/http'; import { ActivatedRoute, Router } from '@angular/router'; -import { NgbModal } from "@ng-bootstrap/ng-bootstrap"; -import { BehaviorSubject, Observable, Subscription } from 'rxjs'; -import {debounceTime, distinctUntilChanged, filter, map} from 'rxjs/operators'; - -import {Group, GroupService, ITEMS_PER_PAGE, Project} from '..'; -import { - AddSubjectsToGroupDialogComponent -} from "./add-subjects-to-group-dialog.component"; -import { Subject } from './subject.model'; +import { BehaviorSubject, combineLatest, Observable, Subscription } from 'rxjs'; import { - SubjectService, - SubjectFilterParams, - SubjectPaginationParams, SubjectLastParams, -} from './subject.service'; -import { PagingParams } from '../commons'; + debounceTime, + distinctUntilChanged, + filter, + first, + map, + pluck, + shareReplay, + switchMap, + tap, + withLatestFrom, +} from 'rxjs/operators'; +import { NgbCalendar, NgbDateParserFormatter, NgbModal } from "@ng-bootstrap/ng-bootstrap"; + +import { Group, GroupService, ITEMS_PER_PAGE, Project } from '..'; +import { AddSubjectsToGroupDialogComponent } from "./add-subjects-to-group-dialog.component"; +import { Subject, SubjectFilterCriteria } from './subject.model'; +import { SubjectFilterParams, SubjectPaginationParams, SubjectService, } from './subject.service'; import { AlertService } from '../util/alert.service'; import { EventManager } from '../util/event-manager.service'; -import { parseLinks } from '../util/parse-links-util'; -import {NgbCalendar, NgbDate, NgbDateParserFormatter, NgbDateStruct} from "@ng-bootstrap/ng-bootstrap"; +import { + NgbDateRange, + NgbDateReactiveFilter, + ReactiveFilter, + ReactiveFilterOptions +} from "../util/reactive-filter"; @Component({ selector: 'jhi-subjects', @@ -35,60 +43,39 @@ import {NgbCalendar, NgbDate, NgbDateParserFormatter, NgbDateStruct} from "@ng-b styleUrls: ['./subject.component.scss'], }) export class SubjectComponent implements OnInit, OnDestroy, OnChanges { - sortingOptions = [ - 'login', - 'externalId', - ]; - pagingParams$: Observable; + private subscriptions: Subscription = new Subscription(); + + @Input() readonly isProjectSpecific: boolean; + project$ = new BehaviorSubject(null); @Input() get project() { return this.project$.value; } set project(v: Project) { this.project$.next(v); } - subjects: Subject[]; - groups: Group[]; - eventSubscriber: Subscription; - itemsPerPage: number; - links: any; - page: any; - predicate: any; - queryCount: any; - ascending: any; - totalItems: number; - routeData: any; - previousPage: any; - - filters = { - subjectId: '', - externalId: '', - humanReadableId: '', - dateOfBirth: undefined, - personName: '', - enrollmentDateFrom: undefined, - enrollmentDateTo: undefined, - groupId: '', - } - - appliedFilters = { - dateOfBirth: undefined, - enrollmentDateFrom: undefined, - enrollmentDateTo: undefined, - group: '', - } + subjects$: BehaviorSubject = new BehaviorSubject([]); + groups$: BehaviorSubject = new BehaviorSubject([]); - filterTriggerUpdate$: BehaviorSubject = new BehaviorSubject(''); + page$ = new BehaviorSubject(1); + totalItems: number; + previousPage: number = 1; + itemsPerPage = ITEMS_PER_PAGE; - isFilterApplied = false; + sortBy$ = new BehaviorSubject('login'); + ascending$ = new BehaviorSubject(true); + sortingOptions = [ + 'login', + 'externalId', + ]; - enrollmentDateFromError = false; - enrollmentDateToError = false; - dateOfBirthError = false; + filters: Record> + enrollmentDate$: Observable + enrollmentDateRangeError = false; + filterResult$: Observable; isAdvancedFilterCollapsed = true; - allChecked = false; - setOfCheckedId = new Set(); - - @Input() isProjectSpecific: boolean; + setOfCheckedId$ = new BehaviorSubject>(new Set()); + allChecked$: Observable; + anyChecked$: Observable; constructor( private subjectService: SubjectService, @@ -98,72 +85,64 @@ export class SubjectComponent implements OnInit, OnDestroy, OnChanges { private modalService: NgbModal, private activatedRoute: ActivatedRoute, private router: Router, - private calendar: NgbCalendar, + calendar: NgbCalendar, public formatter: NgbDateParserFormatter ) { - this.subjects = []; - this.itemsPerPage = ITEMS_PER_PAGE; - this.pagingParams$ = this.activatedRoute.data.pipe(map(data => { - const fallback = { page: 1, predicate: 'login', ascending: true }; - return data['pagingParams'] || fallback; - })); - this.routeData = this.pagingParams$.subscribe(params => { - this.page = params.page; - this.previousPage = params.page; - this.ascending = params.ascending; - this.predicate = params.predicate; - }); - - this.filterTriggerUpdate$.pipe( - debounceTime(300), - filter(f => f !== ''), - distinctUntilChanged() - ).subscribe(() => this.applyFilter()); - } - - loadSubjects() { - if (this.isProjectSpecific) { - this.loadAllFromProject(); - } else { - this.loadAll(); + const stringFilterOptions: ReactiveFilterOptions = { + mapResult: filter$ => filter$.pipe( + map(v => v ? v.trim() : ''), + distinctUntilChanged(), + ), } - } + this.filters = { + subjectId: new ReactiveFilter(stringFilterOptions), + externalId: new ReactiveFilter(stringFilterOptions), + humanReadableId: new ReactiveFilter(stringFilterOptions), + dateOfBirth: new NgbDateReactiveFilter(calendar, this.formatter), + personName: new ReactiveFilter(stringFilterOptions), + enrollmentDateFrom: new NgbDateReactiveFilter(calendar, this.formatter), + enrollmentDateTo: new NgbDateReactiveFilter(calendar, this.formatter), + groupId: new ReactiveFilter({ debounceTime: 1 }), + } + this.enrollmentDate$ = this.observeEnrollmentDate(); + this.filterResult$ = this.observeCombinedFilters(); - private loadAllFromProject() { - this.subjectService.findAllByProject( - this.project.projectName, - this.queryFilterParams, - this.queryPaginationParams, - ).subscribe( - (res: HttpResponse) => { - this.onSuccess(res.body, res.headers); - }, - (res: HttpErrorResponse) => this.onError(res), + this.allChecked$ = this.observeChecked(([subjects, checkedSet]) => + subjects.length !== 0 && subjects.every(v => checkedSet.has(v.id)) ); - } - - loadAll() { - this.subjectService.query( - this.queryFilterParams, - this.queryPaginationParams, - ).subscribe( - (res: HttpResponse) => this.onSuccess(res.body, res.headers), - (res: HttpErrorResponse) => this.onError(res), + this.anyChecked$ = this.observeChecked(([subjects, checkedSet]) => + subjects.some(v => checkedSet.has(v.id)) ); + + this.subscriptions.add(this.registerChangeInPagingParams()); + this.subscriptions.add(this.registerChangeInParams()); } ngOnInit() { - if(!this.isProjectSpecific){ - this.loadAll(); - } - this.registerChangeInSubjects(); + this.subscriptions.add(this.registerChangeInFilters()); + this.subscriptions.add(this.registerChangeInSubjects()); + this.subscriptions.add(this.loadAllGroups()); } ngOnDestroy() { - this.filterTriggerUpdate$.next(''); - this.filterTriggerUpdate$.complete(); - this.eventManager.destroy(this.eventSubscriber); - this.routeData.unsubscribe(); + this.subscriptions.unsubscribe(); + this.project$.complete(); + this.subjects$.complete(); + this.groups$.complete(); + this.page$.complete(); + this.sortBy$.complete(); + this.ascending$.complete(); + for (let filtersKey in this.filters) { + this.filters[filtersKey].complete(); + } + this.setOfCheckedId$.complete(); + } + + ngOnChanges(changes: SimpleChanges) { + const project: SimpleChange = changes.project ? changes.project : null; + if (project) { + this.project = project.currentValue; + } } trackLogin(index: number, item: Subject) { @@ -174,310 +153,331 @@ export class SubjectComponent implements OnInit, OnDestroy, OnChanges { return item.key; } - registerChangeInSubjects() { - this.eventSubscriber = this.eventManager.subscribe('subjectListModification', (result) => { - const modifiedSubject = result.content; - const subjectIndex = this.subjects.findIndex((s => s.id == modifiedSubject.id)); - if (subjectIndex < 0) { - this.totalItems++; - this.updateSubjects([modifiedSubject, ...this.subjects]); - } else { - this.subjects[subjectIndex] = modifiedSubject; + private registerChangeInParams(): Subscription { + return this.activatedRoute.params.pipe( + first() + ).subscribe(params => { + window.console.log(params); + for (let k in params) { + if (params.hasOwnProperty(k) && this.filters.hasOwnProperty(k)) { + this.filters[k].next(params[k]); + } } }); } - private onError(error) { - this.alertService.error(error.message, null, null); - } - - ngOnChanges(changes: SimpleChanges) { - this.clearSubjects(); - const project: SimpleChange = changes.project ? changes.project : null; - if (project) { - this.project = project.currentValue; - this.loadAllFromProject(); - this.loadAllGroups(); - } + private registerChangeInPagingParams(): Subscription { + return this.activatedRoute.data.pipe( + pluck('pagingParams'), + first(), + ).subscribe(params => { + this.page$.next(params.page); + this.ascending$.next(params.ascending); + if (this.sortingOptions.includes(params.predicate)) { + this.sortBy$.next(params.predicate); + } + }) + } + + private registerChangeInFilters(): Subscription { + return combineLatest([ + this.project$.pipe(map(p => p ? p.projectName : ''), distinctUntilChanged()), + this.filterResult$, + this.sortBy$.pipe(distinctUntilChanged()), + this.ascending$.pipe(distinctUntilChanged()), + this.page$.pipe(distinctUntilChanged()), + ]).pipe( + debounceTime(10), + tap(([projectName, criteria, sortBy, ascending, page]) => + this.router.navigate(this.toPathParams(projectName, criteria), { + queryParams: this.toQueryParams(page, sortBy, ascending), + })), + withLatestFrom(this.subjects$), + switchMap(([[projectName, filter, sortBy, ascending, page], subjects]) => { + const mergeResults: boolean = page > this.previousPage; + this.previousPage = page; + const filterParams = this.queryFilterParams(filter); + const pagingParams = this.queryPaginationParams(page, sortBy, ascending, mergeResults, subjects) + + let fetch$: Observable>; + if (projectName) { + fetch$ = this.subjectService.findAllByProject( + projectName, + filterParams, + pagingParams, + ); + } else { + fetch$ = this.subjectService.query(filterParams, pagingParams); + } + return fetch$.pipe( + map(res => ({ + body: res.body, + headers: res.headers, + mergeResults: mergeResults, + })) + ); + }) + ) + .subscribe(res => this.onSuccess(res.body, res.headers, res.mergeResults)); + } + + private registerChangeInSubjects(): Subscription { + return this.eventManager.subscribe('subjectListModification', (result) => { + const modifiedSubject = result.content; + let currentSubjects = this.subjects$.value; + const subjectIndex = currentSubjects.findIndex((s => s.id == modifiedSubject.id)); + if (subjectIndex < 0) { + this.totalItems++; + currentSubjects = [modifiedSubject, ...currentSubjects]; + } else { + currentSubjects = currentSubjects.slice(); + currentSubjects[subjectIndex] = modifiedSubject; + } + this.subjects$.next(currentSubjects); + }); } private loadAllGroups() { - this.groupService.list(this.project.projectName).subscribe( - (res: Group[]) => this.groups = res, - (res: HttpErrorResponse) => this.onError(res), - ); + return this.project$.pipe( + filter(p => !!p), + pluck('projectName'), + distinctUntilChanged(), + switchMap(projectName => this.groupService.list(projectName)) + ).subscribe((res: Group[]) => this.groups$.next(res)); } - get queryFilterParams(): SubjectFilterParams { - const params = { - login: this.filters.subjectId.trim() || undefined, - externalId: this.filters.externalId.trim() || undefined, - personName: this.filters.personName.trim() || undefined, - humanReadableIdentifier: this.filters.humanReadableId.trim() || undefined, - groupId: this.filters.groupId, - dateOfBirth: undefined, - enrollmentDate: undefined, + queryFilterParams(criteria: SubjectFilterCriteria): SubjectFilterParams { + if (!criteria) { + return {}; + } + const params: SubjectFilterParams = { + login: criteria.subjectId || undefined, + externalId: criteria.externalId || undefined, + personName: criteria.personName || undefined, + humanReadableIdentifier: criteria.humanReadableId || undefined, + groupId: criteria.groupId || undefined, }; - const filteredGroup = this.groups?.filter(g => g.id.toString() == this.filters.groupId)[0]; - this.appliedFilters.group = filteredGroup? filteredGroup.name : ''; - - if(this.isRange(this.filters.enrollmentDateFrom, this.filters.enrollmentDateTo)){ - let enrollmentDateFrom = this.formatter.format(this.filters.enrollmentDateFrom); //this.formatDate(this.filters.enrollmentDateFrom); - let enrollmentDateTo = this.formatter.format(this.filters.enrollmentDateTo); - this.appliedFilters.enrollmentDateFrom = enrollmentDateFrom; - this.appliedFilters.enrollmentDateTo = enrollmentDateTo; + if (criteria.enrollmentDateFrom || criteria.enrollmentDateTo) { const timeZone = Intl.DateTimeFormat().resolvedOptions().timeZone; - params.enrollmentDate = { - from: enrollmentDateFrom ? enrollmentDateFrom + 'T00:00' + '[' + timeZone + ']' : undefined, - to: enrollmentDateTo ? enrollmentDateTo + 'T23:59' + '[' + timeZone + ']' : undefined, - }; + params.enrollmentDate = {}; + if (criteria.enrollmentDateFrom) { + params.enrollmentDate.from = this.formatter.format(criteria.enrollmentDateFrom) + + 'T00:00' + '[' + timeZone + ']'; + } + if (criteria.enrollmentDateTo) { + params.enrollmentDate.to = this.formatter.format(criteria.enrollmentDateTo) + + 'T23:59' + '[' + timeZone + ']'; + } } - if (this.filters.dateOfBirth && this.calendar.isValid(NgbDate.from(this.filters.dateOfBirth))){ - const dateOfBirth = this.formatter.format(this.filters.dateOfBirth); - this.appliedFilters.dateOfBirth = dateOfBirth; + if (criteria.dateOfBirth) { params.dateOfBirth = { - is: dateOfBirth, + is: this.formatter.format(criteria.dateOfBirth), }; } return params; } - isRange(from: NgbDateStruct, to: NgbDateStruct): boolean { - if(from && !this.calendar.isValid(NgbDate.from(from))){ - this.enrollmentDateFromError = true; - return false; - } - if(to && !this.calendar.isValid(NgbDate.from(to))){ - this.enrollmentDateToError = true; - return false; - } - if(from && to) { - const dateFrom: NgbDate = new NgbDate(from.year, from.month, from.day); - const dateTo: NgbDate = new NgbDate(to.year, to.month, to.day); - if(dateTo.equals(dateFrom) || dateTo.after(dateFrom)){ - this.enrollmentDateFromError = false; - this.enrollmentDateToError = false; - return true; - } - this.enrollmentDateFromError = false; - this.enrollmentDateToError = true; - return false; - } else { - this.enrollmentDateFromError = false; - this.enrollmentDateToError = false; - return !!(from || to); - } - } - - get queryPaginationParams(): SubjectPaginationParams { - const subjects = this.subjects || []; - - let last: SubjectLastParams | null; - if (subjects.length > 0) { + private queryPaginationParams(page: number, sortBy: string, ascending: boolean, loadMore: boolean, subjects: Subject[]): SubjectPaginationParams { + const params: SubjectPaginationParams = { + size: Math.max(page * this.itemsPerPage - subjects.length, this.itemsPerPage), + sort: [sortBy + ',' + (ascending ? 'asc' : 'desc')], + }; + if (loadMore && subjects.length > 0) { const lastSubject = subjects[subjects.length - 1] - last = { + params.last = { id: lastSubject.id, login: lastSubject.login, externalId: lastSubject.externalId || '', } - } else { - last = null; } - return { - last, - size: this.itemsPerPage, - sort: [this.predicate + ',' + (this.ascending ? 'asc' : 'desc')], - }; + return params; } - private onSuccess(data: Subject[], headers) { - if(headers.get('link')){ - this.links = parseLinks(headers.get('link')); - } + private onSuccess(data: Subject[], headers: HttpHeaders, mergeResults: boolean) { this.totalItems = +headers.get('X-Total-Count'); - this.queryCount = this.totalItems; // remove redundant subjects from the list - const fetchedSubjects = new Map(data.map(a => [a.id, a])); - this.updateSubjects([ - ...this.subjects.map(s => { - const newSubject = fetchedSubjects.get(s.id); - if (newSubject !== undefined) { - fetchedSubjects.delete(s.id); - return newSubject; - } else { - return s; - } - }), - ...data.filter(s => fetchedSubjects.has(s.id)), - ]); - } - - filterChanged(field: string, text: string) { - this.filterTriggerUpdate$.next(field + ',' + text); - } - - dateOfBirthFilterChanged(field: string, date: NgbDateStruct){ - this.dateOfBirthError = false; - if (date) { - if (this.calendar.isValid(NgbDate.from(date))) { - this.filterTriggerUpdate$.next(field + ',' + this.formatter.format(date)); - } else { - this.dateOfBirthError = true; - } + let nextValue: Subject[] + if (mergeResults) { + const fetchedSubjects = new Map(data.map(a => [a.id, a])); + nextValue = [ + ...this.subjects$.value.map(s => { + const newSubject = fetchedSubjects.get(s.id); + if (newSubject) { + fetchedSubjects.delete(s.id); + return newSubject; + } else { + return s; + } + }), + ...data.filter(s => fetchedSubjects.has(s.id)), + ]; } else { - this.filterTriggerUpdate$.next(field); - } - } - - enrollmentDateFromFilterChanged(field: string, date: NgbDateStruct){ - if (this.isRange(date, this.filters.enrollmentDateTo)) { - this.filterTriggerUpdate$.next(field + ',' + this.formatter.format(date)); - } - } - - enrollmentDateToFilterChanged(field: string, date: NgbDateStruct){ - if (this.isRange(this.filters.enrollmentDateFrom, date)) { - this.filterTriggerUpdate$.next(field + ',' + this.formatter.format(date)); + nextValue = data; } - } - - applyFilter() { - const {subjectId, externalId, personName, humanReadableId, dateOfBirth, enrollmentDateFrom, enrollmentDateTo, groupId} = this.filters; - this.isFilterApplied = !!(subjectId || externalId || personName || humanReadableId || - dateOfBirth || enrollmentDateFrom || enrollmentDateTo || groupId); - this.clearSubjects(); - this.loadSubjects(); - } - - clearFilter(filterName: string){ - this.filters[filterName] = ''; - this.applyFilter(); - } - - clearDateFilter(filterName: string) { - this.appliedFilters[filterName] = undefined; - this.filters[filterName] = undefined; - switch (filterName) { - case 'dateOfBirth': - this.dateOfBirthError = false; - break; - case 'enrollmentDateFrom': - this.enrollmentDateFromError = false; - break; - case 'enrollmentDateTo': - this.enrollmentDateToError = false; - break; - } - this.applyFilter(); - } - - clearSelectFilter(filterName: string){ - this.appliedFilters[filterName] = ''; - this.filters[filterName] = ''; - this.applyFilter(); + this.subjects$.next(nextValue); } clearFilters() { - this.filters.externalId = ''; - this.filters.subjectId = ''; - this.filters.humanReadableId = ''; - this.filters.personName = ''; - this.filters.groupId = ''; - this.filters.dateOfBirth = undefined; - this.filters.enrollmentDateFrom = undefined; - this.filters.enrollmentDateTo = undefined; - this.appliedFilters.group = ''; - this.appliedFilters.dateOfBirth = undefined; - this.appliedFilters.enrollmentDateFrom = undefined; - this.appliedFilters.enrollmentDateTo = undefined; - - this.applyFilter(); - } - - loadMore() { - this.page = this.page + 1; - this.transition(); - } - - loadPage(page) { - if (page !== this.previousPage) { - this.previousPage = page; - this.transition(); + for (let filtersKey in this.filters) { + this.filters[filtersKey].clear(); } } - private updateSubjects(newSubjects) { - this.subjects = newSubjects; - this.allChecked = this.subjects.length !== 0 - && this.subjects.every(({ id }) => this.setOfCheckedId.has(id)); - } - - private clearSubjects() { - this.updateSubjects([]); - } - - updateSortingSortBy(predicate) { - if (this.predicate !== predicate) { - this.subjects = []; - this.predicate = predicate; - this.page = 1; - this.transition(); - } + loadMore() { + this.page$.next(this.page$.value + 1); + } + + updateSortingSortBy(predicate?: string) { + this.sortBy$.next(predicate); + this.page$.next(1); + } + + updateSortAscending(ascending: boolean) { + this.ascending$.next(ascending); + this.page$.next(1); + } + + toggleSelectAll(): void { + combineLatest([ + this.subjects$, + this.setOfCheckedId$, + ]).pipe( + first(), + filter(([subjects]) => subjects.length > 0), + map(([subjects, checkedIds]) => { + const nextValue = new Set(checkedIds); + if (subjects.every(s => checkedIds.has(s.id))) { + subjects.forEach(({id}) => nextValue.delete(id)); + } else { + subjects.forEach(({id}) => nextValue.add(id)); + } + return nextValue; + }) + ).subscribe(nextValue => this.setOfCheckedId$.next(nextValue)); + } + + onItemChecked(id: number, checked: boolean): void { + this.setOfCheckedId$.pipe( + first(), + map(v => { + const nextValue = new Set(v); + if (checked) { + nextValue.add(id); + } else { + nextValue.delete(id); + } + return nextValue; + }), + ).subscribe(nextValue => this.setOfCheckedId$.next(nextValue)); + } + + private observeCombinedFilters(): Observable { + return combineLatest([ + this.filters.subjectId.value$, + this.filters.externalId.value$, + this.filters.humanReadableId.value$, + this.filters.dateOfBirth.value$, + this.filters.personName.value$, + this.enrollmentDate$, + this.filters.groupId.value$, + ]).pipe( + map(([subjectId, externalId, humanReadableId, dateOfBirth, personName, enrollmentDate, groupId]) => ({ + subjectId, + externalId, + humanReadableId, + dateOfBirth, + personName, + enrollmentDateFrom: enrollmentDate.from, + enrollmentDateTo: enrollmentDate.to, + groupId, + groupName: this.groups$.value.find(g => g.id.toString() == groupId)?.name, + })), + map(criteria => + Object.keys(criteria).some(k => !!criteria[k]) ? criteria : null), + shareReplay(1), + ) + } + + private observeEnrollmentDate(): Observable { + return combineLatest([ + this.filters.enrollmentDateFrom.value$, + this.filters.enrollmentDateTo.value$, + ]).pipe( + map(([from, to]) => ({from, to})), + filter(({from, to}) => { + if (NgbDateReactiveFilter.isValidRange(from, to)) { + this.enrollmentDateRangeError = false; + return true; + } else { + this.enrollmentDateRangeError = true; + return false; + } + }), + ) + } + + private observeChecked(modify: (state: [Subject[], Set]) => T): Observable { + return combineLatest([this.subjects$, this.setOfCheckedId$]).pipe( + map(v => modify(v)), + distinctUntilChanged(), + ); } - updateSortingOrder(direction) { - if ((this.ascending && direction !== 'asc') || - (!this.ascending && direction === 'asc')){ - this.subjects = []; - this.ascending = direction === 'asc'; - this.page = 1; - this.transition(); + private toPathParams(projectName: string, criteria: SubjectFilterCriteria): Record[] { + let route = []; + if (projectName) { + route.push('/project'); + route.push(projectName); + } else { + route.push('subject') } - } - - selectAll(checked: boolean = true): void { - if (this.subjects.length === 0) { - return; + if (criteria) { + const stringFilters: Record = Object.assign, SubjectFilterCriteria>({}, criteria); + delete stringFilters['groupName']; + if (criteria.enrollmentDateFrom) { + stringFilters.enrollmentDateFrom = this.formatter.format(criteria.enrollmentDateFrom); + } + if (criteria.enrollmentDateTo) { + stringFilters.enrollmentDateTo = this.formatter.format(criteria.enrollmentDateTo); + } + if (criteria.dateOfBirth) { + stringFilters.dateOfBirth = this.formatter.format(criteria.dateOfBirth); + } + let params = {}; + for (let k in stringFilters) { + if (stringFilters[k]) { + params[k] = encodeURIComponent(stringFilters[k]); + } + } + route.push(params); } - this.subjects.forEach(({ id }) => this.updateCheckedSet(id, checked)); - this.allChecked = checked; + return route; } - onItemChanged(id: number) { - const nextIsChecked = !this.setOfCheckedId.has(id); - this.updateCheckedSet(id, nextIsChecked); - this.allChecked = nextIsChecked - && this.subjects.every(({ id }) => this.setOfCheckedId.has(id)); - } - - updateCheckedSet(id: number, checked: boolean): void { - if (checked) { - this.setOfCheckedId.add(id); - } else { - this.setOfCheckedId.delete(id); - } + private toQueryParams( + page: number, + sortBy: string, + ascending: boolean, + ): Record { + return { + page: page.toString(), + sort: sortBy + ',' + (ascending ? 'asc' : 'desc'), + }; } addSelectedToGroup() { - const selectedSubjects = this.subjects.filter(s => this.setOfCheckedId.has(s.id)) const modalRef = this.modalService.open(AddSubjectsToGroupDialogComponent); - modalRef.componentInstance.groups = this.groups; - modalRef.componentInstance.projectName = this.project.projectName; - modalRef.componentInstance.subjects = selectedSubjects; - } - - transition() { - if (this.isProjectSpecific) { - this.loadSubjects(); - } else { - this.router.navigate(['/subject'], { - queryParams: { - page: this.page, - sort: this.predicate + ',' + (this.ascending ? 'asc' : 'desc'), - }, - }).then(() => this.loadSubjects()); - } + this.subscriptions.add(combineLatest([ + this.subjects$, + this.setOfCheckedId$, + this.groups$, + this.project$, + ]).subscribe(([subjects, checkedIds, groups, project]) => { + modalRef.componentInstance.groups = groups; + modalRef.componentInstance.projectName = project.projectName; + modalRef.componentInstance.subjects = subjects.filter(s => checkedIds.has(s.id)); + })); } } diff --git a/src/main/webapp/app/shared/subject/subject.model.ts b/src/main/webapp/app/shared/subject/subject.model.ts index c872a8ed5..21addff4a 100644 --- a/src/main/webapp/app/shared/subject/subject.model.ts +++ b/src/main/webapp/app/shared/subject/subject.model.ts @@ -1,6 +1,7 @@ import { Role } from '../../admin/user-management/role.model'; import { Project } from '../project/project.model'; import { MinimalSource } from '../source/source.model'; +import { NgbDateStruct } from "@ng-bootstrap/ng-bootstrap"; export interface Subject { id?: any; @@ -23,43 +24,16 @@ export interface Subject { roles?: Role[]; } - constructor( - id?: number, - login?: string, - externalLink?: string, - externalId?: string, - status?: SubjectStatus, - createdBy?: string, - createdDate?: Date, - dateOfBirth?: Date, - enrollmentDate?: Date, - lastModifiedBy?: string, - lastModifiedDate?: Date, - group?: string, - password?: string, - personName?: string, - project?: Project, - sources?: MinimalSource[], - roles?: Role[], - ) { - this.id = id ? id : null; - this.login = login ? login : null; - this.externalLink = externalLink ? externalLink : null; - this.externalId = externalId ? externalId : null; - this.createdBy = createdBy ? createdBy : null; - this.createdDate = createdDate ? createdDate : null; - this.dateOfBirth = dateOfBirth ? dateOfBirth : null; - this.enrollmentDate = enrollmentDate ? enrollmentDate : null; - this.lastModifiedBy = lastModifiedBy ? lastModifiedBy : null; - this.lastModifiedDate = lastModifiedDate ? lastModifiedDate : null; - this.group = group ? group : null; - this.password = password ? password : null; - this.personName = personName ? personName : null; - this.project = project ? project : null; - this.sources = sources ? sources : []; - this.status = status ? status : SubjectStatus.DEACTIVATED; - this.roles = roles; - } +export interface SubjectFilterCriteria { + externalId: string + dateOfBirth?: NgbDateStruct + subjectId: string + enrollmentDateFrom?: NgbDateStruct + enrollmentDateTo?: NgbDateStruct + groupId: string + groupName: string + personName: string + humanReadableId: string } export const enum SubjectStatus { diff --git a/src/main/webapp/app/shared/subject/subject.module.ts b/src/main/webapp/app/shared/subject/subject.module.ts index d81ab518d..1b2dfa4fe 100644 --- a/src/main/webapp/app/shared/subject/subject.module.ts +++ b/src/main/webapp/app/shared/subject/subject.module.ts @@ -4,6 +4,8 @@ import { QrCodeModule } from 'ng-qrcode'; import { ManagementPortalSharedModule } from '../../shared'; import { + FilterBadgeComponent, + LoadMoreComponent, NgbDatePipe, SubjectComponent, SubjectDeleteDialogComponent, SubjectDeletePopupComponent, @@ -38,6 +40,9 @@ const ENTITY_STATES = [ ], declarations: [ AddSubjectsToGroupDialogComponent, + FilterBadgeComponent, + LoadMoreComponent, + NgbDatePipe, SubjectComponent, SubjectDetailComponent, SubjectRevisionComponent, diff --git a/src/main/webapp/app/shared/util/parse-links-util.ts b/src/main/webapp/app/shared/util/parse-links-util.ts index c52aea287..2f831d0a9 100644 --- a/src/main/webapp/app/shared/util/parse-links-util.ts +++ b/src/main/webapp/app/shared/util/parse-links-util.ts @@ -1,13 +1,13 @@ // Based on JHipster ParseLinks -export function parseLinks(header: string): { [name: string]: any; } { - if (header.length === 0) { - throw new Error('input must not be of zero length'); +export function parseLinks(header: string): Record { + if (!header) { + return {}; } // Split parts by comma const parts: string[] = header.split(/,\s* = {}; // Parse each part into a named link parts.forEach((p) => { diff --git a/src/main/webapp/app/shared/util/reactive-filter.ts b/src/main/webapp/app/shared/util/reactive-filter.ts new file mode 100644 index 000000000..f0e27364f --- /dev/null +++ b/src/main/webapp/app/shared/util/reactive-filter.ts @@ -0,0 +1,141 @@ +/* + * Copyright (c) 2021. The Hyve + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * + * See the file LICENSE in the root of this repository. + */ + +import { BehaviorSubject, merge, Observable, Subject } from "rxjs"; +import { debounceTime, distinctUntilChanged, filter, shareReplay, startWith } from "rxjs/operators"; +import { + NgbCalendar, + NgbDate, + NgbDateParserFormatter, + NgbDateStruct +} from "@ng-bootstrap/ng-bootstrap"; + +export class ReactiveFilter { + protected readonly _value$: BehaviorSubject; + protected readonly _error$: BehaviorSubject; + protected readonly trigger$: Subject; + + error$: Observable + rawValue$: Observable + value$: Observable; + + constructor( + options?: ReactiveFilterOptions + ) { + if (!options) { + options = {}; + } + this._error$ = new BehaviorSubject(''); + this.error$ = this._error$.asObservable().pipe(distinctUntilChanged()) + + this._value$ = new BehaviorSubject(null); + this.rawValue$ = this._value$.asObservable(); + this.trigger$ = new Subject(); + let debouncedValue = this._value$.pipe(debounceTime(options.debounceTime || 300)); + if (options.validate) { + debouncedValue = this._value$.pipe( + filter(v => { + const error = options.validate(v); + if (error) { + this._error$.next(error); + return false; + } else { + this._error$.next(''); + return true; + } + }) + ) + } + let mergedSignal = merge(debouncedValue, this.trigger$).pipe( + startWith(options.initialValue || null as T | null), + ); + if (options.mapResult) { + mergedSignal = options.mapResult(mergedSignal); + } else { + mergedSignal = mergedSignal.pipe(distinctUntilChanged()); + } + this.value$ = mergedSignal.pipe(shareReplay(1)); + } + + next(value?: T){ + this._value$.next(value); + } + + clear() { + this._value$.next(null); + this._error$.next(''); + this.trigger$.next(null); + } + + complete() { + this._value$.complete(); + this._error$.complete(); + this.trigger$.complete(); + } +} + +export interface ReactiveFilterOptions { + debounceTime?: number | null, + initialValue?: T | null; + validate?: (value: T | null) => string | null; + mapResult?: (value$: Observable) => Observable; +} + +export class NgbDateReactiveFilter extends ReactiveFilter { + constructor( + calendar: NgbCalendar, + private formatter: NgbDateParserFormatter, + options: ReactiveFilterOptions = {}, + ) { + super({ + validate(date) { + if (date === null) { + return ''; + } + if (!calendar.isValid(NgbDate.from(date))) { + return 'invalidDate'; + } + if (options.validate) { + return options.validate(date) + } + return ''; + }, + mapResult: options.mapResult ? options.mapResult : $v => $v.pipe( + distinctUntilChanged((d1, d2) => d1 === d2 + || (d1 && NgbDate.from(d1).equals(d2))) + ), + debounceTime: 1, + initialValue: options.initialValue, + }); + } + + next(value?: NgbDateStruct | string) { + if (typeof value === 'string') { + super.next(this.formatter.parse(value)); + } else { + super.next(value); + } + } + + public static isValidRange(from?: NgbDateStruct, to?: NgbDateStruct): boolean { + if (from && to) { + const dateFrom = NgbDate.from(from); + const dateTo = NgbDate.from(to) + if (dateFrom.after(dateTo)) { + return false; + } + } + return true; + } +} + +export interface NgbDateRange { + from: NgbDateStruct; + to: NgbDateStruct; +} diff --git a/src/main/webapp/i18n/en/subject.json b/src/main/webapp/i18n/en/subject.json index 55915ebab..5f6eeb101 100644 --- a/src/main/webapp/i18n/en/subject.json +++ b/src/main/webapp/i18n/en/subject.json @@ -20,13 +20,13 @@ "title": "Filter", "filters": "Filters", "applyButton": "Apply filter", - "clearButton": "Clear filter", + "clearButton": "Clear filters", "advancedFilter": "Advanced Filter", "from": "From", "to": "To", "error": { "invalidDate": "The date is not valid.", - "invalidRange": "The date is not valid or it is after From Date." + "invalidRange": "The date range is invalid: From date is after To date." } }, "login": "Login", @@ -105,6 +105,7 @@ "addSelectedToGroup": "Add to group", "group": "Group", "loadMore": "Load more ({{shown}}/{{total}} shown)", + "loadMorePartial": "Load more ({{shown}} shown)", "allLoaded": "All {{total}} subjects loaded", "generateToken": "Generate QR code", "generatePersistentToken": "Generate persistent QR code" diff --git a/src/main/webapp/i18n/nl/subject.json b/src/main/webapp/i18n/nl/subject.json index 674cd04ea..d5c561d73 100644 --- a/src/main/webapp/i18n/nl/subject.json +++ b/src/main/webapp/i18n/nl/subject.json @@ -26,7 +26,7 @@ "advancedFilter": "Uitgebreid filter", "error": { "invalidDate": "De datum is niet geldig.", - "invalidRange": "De datum is niet geldig of ligt na de Van-datum." + "invalidRange": "De periode is is niet geldig: Vanaf datum is na de Tot en met datum." } }, "login": "Login", @@ -105,6 +105,7 @@ "addSelectedToGroup": "Aan groep toevoegen", "group": "Groep", "loadMore": "Meer laden ({{shown}}/{{total}} getoond)", + "loadMorePartial": "Meer laden ({{shown}} getoond)", "allLoaded": "Alle {{total}} subjects geladen", "generateToken": "Genereer QR-code", "generatePersistentToken": "Genereer langdurige QR-code" diff --git a/src/test/javascript/e2e/cypress/integration/entities/subject.spec.ts b/src/test/javascript/e2e/cypress/integration/entities/subject.spec.ts index 7e043c334..a21957336 100644 --- a/src/test/javascript/e2e/cypress/integration/entities/subject.spec.ts +++ b/src/test/javascript/e2e/cypress/integration/entities/subject.spec.ts @@ -155,14 +155,13 @@ describe('Subject e2e test', () => { it('should show number of loaded subjects and total number of subjects', () => { cy.contains('jhi-project-detail ul.nav-tabs .nav-item', 'Subjects').click(); - cy.get('jhi-subjects a.subject-pagination__load-more').should('have.text', 'Load more (20/25 shown)'); + cy.get('app-load-more a.load-more-limited').should('have.text', 'Load more (20/25 shown)'); cy.get('jhi-subjects .subject-row').should('have.length', 20); }); it('should be able to load subjects on loadMore click', () => { - cy.get('jhi-subjects a.subject-pagination__load-more').click(); - cy.get('jhi-subjects span.subject-pagination__all-loaded').should('have.text', 'All 25 subjects loaded'); + cy.get('app-load-more a.load-more-limited').click(); + cy.get('app-load-more span.all-loaded').should('have.text', 'All 25 subjects loaded'); cy.get('jhi-subjects .subject-row').should('have.length', 25); }); - }); diff --git a/src/test/javascript/e2e/cypress/integration/util/nav-bar.ts b/src/test/javascript/e2e/cypress/integration/util/nav-bar.ts index b7f76ce43..52bce0aa4 100644 --- a/src/test/javascript/e2e/cypress/integration/util/nav-bar.ts +++ b/src/test/javascript/e2e/cypress/integration/util/nav-bar.ts @@ -4,9 +4,7 @@ export let clickOnAdminMenu = () => click('#admin-menu'); export let clickOnEntity = (name) => click('[routerLink="' + name + '"]'); export let clickOnEntityMenu = () => click('#entity-menu'); export let clickOnProjectMenu = () => click('#projects-menu'); -export let clickOnPasswordMenu = () => click('[routerLink="password"]'); export let clickOnSignIn = () => click('#login'); -export let clickOnSignOut = () => click('#logout'); export let loadProjectView = () => { clickOnProjectMenu(); From 56574fcf40b8975b9901385f3e2b05c988bc5fef Mon Sep 17 00:00:00 2001 From: Joris Borgdorff Date: Tue, 16 Nov 2021 13:40:36 +0100 Subject: [PATCH 178/431] Misc code fixes --- .../interceptor/errorhandler.interceptor.ts | 7 ++- src/main/webapp/app/home/home.component.ts | 10 ++-- .../app/layouts/navbar/navbar.component.ts | 8 +-- .../webapp/app/shared/auth/auth.service.ts | 8 +-- .../app/shared/auth/principal.service.ts | 7 +-- .../app/shared/auth/state-storage.service.ts | 49 ++++++++++--------- .../shared/auth/user-route-access-service.ts | 21 ++++---- .../app/shared/login/login.component.ts | 12 +++-- 8 files changed, 64 insertions(+), 58 deletions(-) diff --git a/src/main/webapp/app/blocks/interceptor/errorhandler.interceptor.ts b/src/main/webapp/app/blocks/interceptor/errorhandler.interceptor.ts index ae86c9ad8..aaec34624 100644 --- a/src/main/webapp/app/blocks/interceptor/errorhandler.interceptor.ts +++ b/src/main/webapp/app/blocks/interceptor/errorhandler.interceptor.ts @@ -1,7 +1,8 @@ import { Injectable, Injector } from '@angular/core'; -import { Observable, throwError } from 'rxjs'; +import { Observable } from 'rxjs'; import { tap } from 'rxjs/operators'; import { + HttpErrorResponse, HttpEvent, HttpHandler, HttpInterceptor, @@ -22,7 +23,9 @@ export class ErrorHandlerInterceptor implements HttpInterceptor { () => {}, (err: HttpErrorResponse) => { if (err.status === 401) { - this.injector.get(AuthService).resetAuthentication(); + this.injector.get(AuthService).resetAuthentication( + !request.url || request.url !== 'api/account' + ); return; } this.eventManager.broadcast({ diff --git a/src/main/webapp/app/home/home.component.ts b/src/main/webapp/app/home/home.component.ts index 5e1e100a2..5bb8e5f0f 100644 --- a/src/main/webapp/app/home/home.component.ts +++ b/src/main/webapp/app/home/home.component.ts @@ -2,13 +2,14 @@ import { Component, OnDestroy, OnInit } from '@angular/core'; import { NgbModalRef } from '@ng-bootstrap/ng-bootstrap'; import { - Account, LoginModalService, Principal, Project, - ProjectService + UserService } from '../shared'; -import { Subscription } from "rxjs"; +import { of, Subscription } from "rxjs"; +import { EventManager } from "../shared/util/event-manager.service"; +import { switchMap } from "rxjs/operators"; @Component({ selector: 'jhi-home', @@ -41,9 +42,8 @@ export class HomeComponent implements OnInit, OnDestroy { } private loadRelevantProjects() { - this.subscriptions.add(this.principal.getAuthenticationState() + this.subscriptions.add(this.principal.account$ .pipe( - tap(account => this.account = account), switchMap(account => { if (account) { return this.userService.findProject(account.login); diff --git a/src/main/webapp/app/layouts/navbar/navbar.component.ts b/src/main/webapp/app/layouts/navbar/navbar.component.ts index 414c97048..fac6155d5 100644 --- a/src/main/webapp/app/layouts/navbar/navbar.component.ts +++ b/src/main/webapp/app/layouts/navbar/navbar.component.ts @@ -2,7 +2,7 @@ import { Component, OnDestroy, OnInit } from '@angular/core'; import { Router } from '@angular/router'; import { NgbModalRef } from '@ng-bootstrap/ng-bootstrap'; import { TranslateService } from '@ngx-translate/core'; -import { Subscription } from 'rxjs'; +import { of, Subscription } from 'rxjs'; import { DEBUG_INFO_ENABLED, VERSION } from '../../app.constants'; import { @@ -11,11 +11,12 @@ import { LoginService, Principal, Project, - ProjectService, + ProjectService, UserService, } from '../../shared'; import { EventManager } from '../../shared/util/event-manager.service'; import { ProfileService } from '../profiles/profile.service'; +import { switchMap, tap } from "rxjs/operators"; @Component({ selector: 'jhi-navbar', @@ -69,9 +70,8 @@ export class NavbarComponent implements OnInit, OnDestroy { } loadRelevantProjects() { - this.subscriptions.add(this.principal.getAuthenticationState() + this.subscriptions.add(this.principal.account$ .pipe( - tap(account => this.currentAccount = account), switchMap(account => { if (account) { return this.userService.findProject(account.login); diff --git a/src/main/webapp/app/shared/auth/auth.service.ts b/src/main/webapp/app/shared/auth/auth.service.ts index 31069f148..40e3b922d 100644 --- a/src/main/webapp/app/shared/auth/auth.service.ts +++ b/src/main/webapp/app/shared/auth/auth.service.ts @@ -22,7 +22,7 @@ export class AuthService { return this.principal.identity().pipe( map(user => { const destState = this.stateStorageService.getDestinationState(); - const authorities = destState.data.authorities; + const authorities = destState.authorities; const hasAnyAuthority = this.principal.userHasAnyAuthority(user, authorities); if (!hasAnyAuthority) { if (user) { @@ -37,9 +37,11 @@ export class AuthService { ); } - resetAuthentication() { + resetAuthentication(redirect: boolean) { this.principal.authenticate(null); - this.handleUnauthorized(); + if (redirect) { + this.handleUnauthorized(); + } } private handleUnauthorized() { diff --git a/src/main/webapp/app/shared/auth/principal.service.ts b/src/main/webapp/app/shared/auth/principal.service.ts index 581c15460..e0e5deab9 100644 --- a/src/main/webapp/app/shared/auth/principal.service.ts +++ b/src/main/webapp/app/shared/auth/principal.service.ts @@ -11,12 +11,9 @@ export class Principal { readonly account$: Observable = this._account$.asObservable(); constructor( - private account: AccountService + private account: AccountService, ) { - // initial fetch - this.account.get().pipe( - filter(a => !!a) - ).subscribe(account => this._account$.next(account)); + this.reset().subscribe(); } authenticate(identity?: Account) { diff --git a/src/main/webapp/app/shared/auth/state-storage.service.ts b/src/main/webapp/app/shared/auth/state-storage.service.ts index 2fde2dbad..0e6676f6d 100644 --- a/src/main/webapp/app/shared/auth/state-storage.service.ts +++ b/src/main/webapp/app/shared/auth/state-storage.service.ts @@ -1,14 +1,26 @@ import { Injectable } from '@angular/core'; import { SessionStorageService } from 'ngx-webstorage'; +import { Data, Params, RouterState, UrlSegment } from "@angular/router"; + +export interface RouteStateSegment { + path: string; + /** The matrix parameters associated with a segment */ + parameters: Params; +} + +export interface RouteState { + path: RouteStateSegment[]; + queryParams: Params; + authorities?: string[]; +} @Injectable({ providedIn: 'root' }) export class StateStorageService { constructor( private $sessionStorage: SessionStorageService, - ) { - } + ) {} - getPreviousState() { + getPreviousState(): RouteState | null { return this.$sessionStorage.retrieve('previousState'); } @@ -16,13 +28,8 @@ export class StateStorageService { this.$sessionStorage.clear('previousState'); } - storePreviousState(previousStateName, previousStateParams) { - const previousState = {'name': previousStateName, 'params': previousStateParams}; - this.$sessionStorage.store('previousState', previousState); - } - - getDestinationState() { - return this.$sessionStorage.retrieve('destinationState'); + storePreviousState(state: RouteState) { + this.$sessionStorage.store('previousState', state); } storeUrl(url: string) { @@ -33,17 +40,15 @@ export class StateStorageService { return this.$sessionStorage.retrieve('previousUrl'); } - storeDestinationState(destinationState, destinationStateParams, fromState) { - const destinationInfo = { - 'destination': { - 'name': destinationState.name, - 'data': destinationState.data, - }, - 'params': destinationStateParams, - 'from': { - 'name': fromState.name, - }, - }; - this.$sessionStorage.store('destinationState', destinationInfo); + resetDestinationState() { + this.$sessionStorage.clear('destinationState'); + } + + storeDestinationState(state: RouteState) { + this.$sessionStorage.store('destinationState', state); + } + + getDestinationState(): RouteState | null { + return this.$sessionStorage.retrieve('destinationState'); } } diff --git a/src/main/webapp/app/shared/auth/user-route-access-service.ts b/src/main/webapp/app/shared/auth/user-route-access-service.ts index 172dc34f7..7e993ba9b 100644 --- a/src/main/webapp/app/shared/auth/user-route-access-service.ts +++ b/src/main/webapp/app/shared/auth/user-route-access-service.ts @@ -28,18 +28,15 @@ export class UserRouteAccessService implements CanActivate, CanActivateChild { return this.canActivate(route, state); } - setStateStorage(route: ActivatedRouteSnapshot, state: RouterStateSnapshot) { - let params = {}; - let destinationData = {}; - let destinationName = ''; - const destinationEvent = route; - if (destinationEvent !== undefined) { - params = destinationEvent.params; - destinationData = destinationEvent.data; - destinationName = state.url; + setStateStorage(route: ActivatedRouteSnapshot) { + if (route !== undefined) { + this.stateStorageService.storeDestinationState({ + path: route.url, + queryParams: route.queryParams, + authorities: route.data?.authorities, + }); + } else { + this.stateStorageService.resetDestinationState(); } - const from = {name: this.router.url.slice(1)}; - const destination = {name: destinationName, data: destinationData}; - this.stateStorageService.storeDestinationState(destination, params, from); } } diff --git a/src/main/webapp/app/shared/login/login.component.ts b/src/main/webapp/app/shared/login/login.component.ts index 5284c52c8..355432678 100644 --- a/src/main/webapp/app/shared/login/login.component.ts +++ b/src/main/webapp/app/shared/login/login.component.ts @@ -1,5 +1,5 @@ import { AfterViewInit, Component, ElementRef, ViewChild } from '@angular/core'; -import { Router } from '@angular/router'; +import { Router, UrlSegment } from '@angular/router'; import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; import { StateStorageService } from '..'; @@ -67,8 +67,10 @@ export class JhiLoginModalComponent implements AfterViewInit { const previousState = this.stateStorageService.getPreviousState(); if (previousState) { this.stateStorageService.resetPreviousState(); - this.router.navigate([previousState.path], {queryParams: previousState.params}); - return; + return this.router.navigate( + previousState.path.map(p => p.path ? p.path : p.parameters), + {queryParams: previousState.queryParams}, + ); } const redirect = this.stateStorageService.getUrl(); @@ -88,8 +90,8 @@ export class JhiLoginModalComponent implements AfterViewInit { this.router.navigate(['/register']); } - requestResetPassword() { + async requestResetPassword() { this.activeModal.dismiss('to state requestReset'); - this.router.navigate(['/reset', 'request']); + await this.router.navigate(['/reset', 'request']); } } From ddc1180e3c64f58e3d2edd9bf3dd7eb83754ff90 Mon Sep 17 00:00:00 2001 From: Joris Borgdorff Date: Tue, 16 Nov 2021 14:36:52 +0100 Subject: [PATCH 179/431] Added documentation --- .editorconfig | 2 + .../interceptor/errorhandler.interceptor.ts | 3 +- .../webapp/app/shared/auth/auth.service.ts | 39 +++++++++++++------ .../auth/has-any-authority.directive.ts | 2 +- .../app/shared/auth/principal.service.ts | 22 +++++++++-- .../app/shared/auth/state-storage.service.ts | 17 +++----- .../app/shared/login/login.component.ts | 27 ++++--------- 7 files changed, 64 insertions(+), 48 deletions(-) diff --git a/.editorconfig b/.editorconfig index 790abe95e..05cf926a8 100644 --- a/.editorconfig +++ b/.editorconfig @@ -18,6 +18,8 @@ insert_final_newline = true [*.ts] quote_type = single +indent_size = 4 +continuation_indent_size = 4 [*.md] trim_trailing_whitespace = false diff --git a/src/main/webapp/app/blocks/interceptor/errorhandler.interceptor.ts b/src/main/webapp/app/blocks/interceptor/errorhandler.interceptor.ts index aaec34624..bc04665cc 100644 --- a/src/main/webapp/app/blocks/interceptor/errorhandler.interceptor.ts +++ b/src/main/webapp/app/blocks/interceptor/errorhandler.interceptor.ts @@ -24,7 +24,8 @@ export class ErrorHandlerInterceptor implements HttpInterceptor { (err: HttpErrorResponse) => { if (err.status === 401) { this.injector.get(AuthService).resetAuthentication( - !request.url || request.url !== 'api/account' + // no redirect needed when just checking whether authentication is present. + !request.url || request.url !== 'api/account' ); return; } diff --git a/src/main/webapp/app/shared/auth/auth.service.ts b/src/main/webapp/app/shared/auth/auth.service.ts index 40e3b922d..6ecec58c7 100644 --- a/src/main/webapp/app/shared/auth/auth.service.ts +++ b/src/main/webapp/app/shared/auth/auth.service.ts @@ -20,16 +20,16 @@ export class AuthService { authorize(): Observable { return this.principal.identity().pipe( - map(user => { + map(account => { const destState = this.stateStorageService.getDestinationState(); const authorities = destState.authorities; - const hasAnyAuthority = this.principal.userHasAnyAuthority(user, authorities); + const hasAnyAuthority = this.principal.accountHasAnyAuthority(account, authorities); if (!hasAnyAuthority) { - if (user) { - // user is signed in but not authorized for desired state - this.router.navigate(['accessdenied']); + if (account) { + // user is signed in but not authorized for desired state + this.router.navigate(['accessdenied']); } else { - this.handleUnauthorized(); + this.handleUnauthenticated(); } } return hasAnyAuthority; @@ -37,19 +37,36 @@ export class AuthService { ); } + redirectBeforeUnauthenticated(): Promise { + const previousState = this.stateStorageService.getPreviousState(); + if (previousState) { + this.stateStorageService.resetPreviousState(); + return this.router.navigate( + previousState.path ? previousState.path.map(p => p.path ? p.path : p.parameters) : ['.'], + { queryParams: previousState.queryParams }, + ); + } + return Promise.resolve(false); + } + + /** + * Resets the authentication status to empty. + * @param redirect whether to redirect to login screen. + */ resetAuthentication(redirect: boolean) { this.principal.authenticate(null); if (redirect) { - this.handleUnauthorized(); + this.handleUnauthenticated(); } } - private handleUnauthorized() { + private handleUnauthenticated() { + // user is not authenticated. Show the state they wanted before you + // send them to the login service, so you can return them when you're done const destState = this.stateStorageService.getDestinationState(); - // user is not authenticated. Show the state they wanted before you - // send them to the login service, so you can return them when you're done this.stateStorageService.storePreviousState(destState); - // now, send them to the signin state so they can log in + + // now, send them to the sign in state so they can log in this.router.navigate(['accessdenied']); } } diff --git a/src/main/webapp/app/shared/auth/has-any-authority.directive.ts b/src/main/webapp/app/shared/auth/has-any-authority.directive.ts index 6ec3b891a..f57890224 100644 --- a/src/main/webapp/app/shared/auth/has-any-authority.directive.ts +++ b/src/main/webapp/app/shared/auth/has-any-authority.directive.ts @@ -33,7 +33,7 @@ export class HasAnyAuthorityDirective implements OnDestroy { this.subscriptions.add( this.principal.account$ .pipe( - map(user => this.principal.userHasAnyAuthority(user, authorities)) + map(user => this.principal.accountHasAnyAuthority(user, authorities)) ) .subscribe((hasAuthority) => { this.viewContainerRef.clear(); diff --git a/src/main/webapp/app/shared/auth/principal.service.ts b/src/main/webapp/app/shared/auth/principal.service.ts index e0e5deab9..8ce70d8fb 100644 --- a/src/main/webapp/app/shared/auth/principal.service.ts +++ b/src/main/webapp/app/shared/auth/principal.service.ts @@ -16,20 +16,32 @@ export class Principal { this.reset().subscribe(); } + /** + * Update authentication state. If new authentication state is null, the user is from the + * frontend perspective logged out. + */ authenticate(identity?: Account) { this._account$.next(identity ? identity : null); } - userHasAnyAuthority(userIdentity: any, authorities: string[] | null): boolean { + /** + * Whether user has any of the required authorities. + * @param account account to check. + * @param authorities authorities to check. If empty, this method always returns true. + */ + accountHasAnyAuthority(account: any, authorities: string[] | null): boolean { if (!authorities || authorities.length === 0) { return true; } - if (!userIdentity || !userIdentity.authorities) { + if (!account || !account.authorities) { return false; } - return userIdentity.authorities.some(a => authorities.indexOf(a) !== -1); + return account.authorities.some(a => authorities.indexOf(a) !== -1); } + /** + * Reset authentication state based on the current authentication state in the server. + */ reset(): Observable { return this.account.get().pipe( catchError(() => of(null)), @@ -37,6 +49,10 @@ export class Principal { ); } + /** + * Returns the single latest identity. If the user is not logged in, login status will be + * checked with the server. + */ identity(): Observable { // check and see if we have retrieved the userIdentity data from the server. // if we have, reuse it by immediately resolving diff --git a/src/main/webapp/app/shared/auth/state-storage.service.ts b/src/main/webapp/app/shared/auth/state-storage.service.ts index 0e6676f6d..3f6214674 100644 --- a/src/main/webapp/app/shared/auth/state-storage.service.ts +++ b/src/main/webapp/app/shared/auth/state-storage.service.ts @@ -1,6 +1,6 @@ import { Injectable } from '@angular/core'; import { SessionStorageService } from 'ngx-webstorage'; -import { Data, Params, RouterState, UrlSegment } from "@angular/router"; +import { Params, Router } from "@angular/router"; export interface RouteStateSegment { path: string; @@ -9,15 +9,16 @@ export interface RouteStateSegment { } export interface RouteState { - path: RouteStateSegment[]; - queryParams: Params; + path?: RouteStateSegment[]; + queryParams?: Params; authorities?: string[]; } @Injectable({ providedIn: 'root' }) export class StateStorageService { constructor( - private $sessionStorage: SessionStorageService, + private $sessionStorage: SessionStorageService, + private router: Router, ) {} getPreviousState(): RouteState | null { @@ -32,14 +33,6 @@ export class StateStorageService { this.$sessionStorage.store('previousState', state); } - storeUrl(url: string) { - this.$sessionStorage.store('previousUrl', url); - } - - getUrl() { - return this.$sessionStorage.retrieve('previousUrl'); - } - resetDestinationState() { this.$sessionStorage.clear('destinationState'); } diff --git a/src/main/webapp/app/shared/login/login.component.ts b/src/main/webapp/app/shared/login/login.component.ts index 355432678..28c6f938a 100644 --- a/src/main/webapp/app/shared/login/login.component.ts +++ b/src/main/webapp/app/shared/login/login.component.ts @@ -2,7 +2,7 @@ import { AfterViewInit, Component, ElementRef, ViewChild } from '@angular/core'; import { Router, UrlSegment } from '@angular/router'; import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; -import { StateStorageService } from '..'; +import { AuthService, StateStorageService } from '..'; import { EventManager } from '../util/event-manager.service'; import { LoginService } from './login.service'; @@ -23,9 +23,9 @@ export class JhiLoginModalComponent implements AfterViewInit { constructor( private eventManager: EventManager, private loginService: LoginService, - private stateStorageService: StateStorageService, private router: Router, public activeModal: NgbActiveModal, + private authService: AuthService, ) { this.credentials = {}; } @@ -62,26 +62,13 @@ export class JhiLoginModalComponent implements AfterViewInit { content: 'Sending Authentication Success', }); - // previousState was set in the authExpiredInterceptor before being redirected to login modal. - // since login is succesful, go to stored previousState and clear previousState - const previousState = this.stateStorageService.getPreviousState(); - if (previousState) { - this.stateStorageService.resetPreviousState(); - return this.router.navigate( - previousState.path.map(p => p.path ? p.path : p.parameters), - {queryParams: previousState.queryParams}, - ); - } - - const redirect = this.stateStorageService.getUrl(); - if (redirect) { - this.stateStorageService.storeUrl(null); - return this.router.navigate([redirect]); - } else { - return this.router.navigate(['/']); - } + return this.authService.redirectBeforeUnauthenticated(); }).catch(() => { this.authenticationError = true; + }).then((isRedirected) => { + if (!isRedirected) { + return this.router.navigate(['/']); + } }); } From 1dfe84bc1a55dc15cae65de055ca8ff0953e7200 Mon Sep 17 00:00:00 2001 From: Joris Borgdorff Date: Tue, 16 Nov 2021 14:40:22 +0100 Subject: [PATCH 180/431] Remove additional waits --- .../e2e/cypress/integration/entities/subject.spec.ts | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/test/javascript/e2e/cypress/integration/entities/subject.spec.ts b/src/test/javascript/e2e/cypress/integration/entities/subject.spec.ts index 04508fe74..7e043c334 100644 --- a/src/test/javascript/e2e/cypress/integration/entities/subject.spec.ts +++ b/src/test/javascript/e2e/cypress/integration/entities/subject.spec.ts @@ -123,22 +123,19 @@ describe('Subject e2e test', () => { it('should be able to sort subjects by subject id in asc/desc order', () => { cy.get('jhi-subjects #field-order-by').click(); cy.get('jhi-subjects #order-by-desc').click(); - cy.wait(100); cy.get('jhi-subjects .subject-row').first().should('contain.text', 'sub-9'); cy.get('jhi-subjects #field-order-by').click(); cy.get('jhi-subjects #order-by-asc').click(); - cy.wait(100); cy.get('jhi-subjects .subject-row').eq(1).should('contain.text', 'sub-1'); }); + it('should be able to sort subjects by external id in asc/desc order', () => { cy.get('jhi-subjects #field-sort-by').click(); cy.get('jhi-subjects #sort-by-externalId').click(); - cy.wait(100); cy.get('jhi-subjects .subject-row').first().should('contain.text', 'sub-1'); cy.get('jhi-subjects #field-order-by').click(); cy.get('jhi-subjects #order-by-desc').click(); - cy.wait(100); cy.get('jhi-subjects .subject-row').first().should('contain.text', 'test-subject-1'); }); From de2084587d568c2cce83854c84a6b7ef594b39e4 Mon Sep 17 00:00:00 2001 From: Joris Borgdorff Date: Tue, 16 Nov 2021 14:41:06 +0100 Subject: [PATCH 181/431] Added additional waits --- .../e2e/cypress/integration/entities/subject.spec.ts | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/test/javascript/e2e/cypress/integration/entities/subject.spec.ts b/src/test/javascript/e2e/cypress/integration/entities/subject.spec.ts index a21957336..2ca8edd43 100644 --- a/src/test/javascript/e2e/cypress/integration/entities/subject.spec.ts +++ b/src/test/javascript/e2e/cypress/integration/entities/subject.spec.ts @@ -123,9 +123,11 @@ describe('Subject e2e test', () => { it('should be able to sort subjects by subject id in asc/desc order', () => { cy.get('jhi-subjects #field-order-by').click(); cy.get('jhi-subjects #order-by-desc').click(); + cy.wait(100); cy.get('jhi-subjects .subject-row').first().should('contain.text', 'sub-9'); cy.get('jhi-subjects #field-order-by').click(); cy.get('jhi-subjects #order-by-asc').click(); + cy.wait(100); cy.get('jhi-subjects .subject-row').eq(1).should('contain.text', 'sub-1'); }); @@ -133,9 +135,11 @@ describe('Subject e2e test', () => { it('should be able to sort subjects by external id in asc/desc order', () => { cy.get('jhi-subjects #field-sort-by').click(); cy.get('jhi-subjects #sort-by-externalId').click(); + cy.wait(100); cy.get('jhi-subjects .subject-row').first().should('contain.text', 'sub-1'); cy.get('jhi-subjects #field-order-by').click(); cy.get('jhi-subjects #order-by-desc').click(); + cy.wait(100); cy.get('jhi-subjects .subject-row').first().should('contain.text', 'test-subject-1'); }); From 12b8976c0bfa33927859d1120397a2f4d4797cbd Mon Sep 17 00:00:00 2001 From: Joris Borgdorff Date: Tue, 16 Nov 2021 15:26:58 +0100 Subject: [PATCH 182/431] Fix code --- src/main/webapp/app/home/home.component.html | 10 +--------- src/main/webapp/app/shared/project/project.service.ts | 2 +- src/main/webapp/app/shared/subject/subject.model.ts | 3 +-- 3 files changed, 3 insertions(+), 12 deletions(-) diff --git a/src/main/webapp/app/home/home.component.html b/src/main/webapp/app/home/home.component.html index 355f98919..10ee75160 100644 --- a/src/main/webapp/app/home/home.component.html +++ b/src/main/webapp/app/home/home.component.html @@ -7,7 +7,7 @@

    -
    +
    @@ -19,13 +19,6 @@
    {{project.projectName}
    {{project.organization}} : {{project.location}}

    {{project.description}} -

    -
    {{project.projectName}}
    -
    {{project.organization}} : {{project.location}}
    -

    {{project.description}} - -

    -
    -
    diff --git a/src/main/webapp/app/shared/project/project.service.ts b/src/main/webapp/app/shared/project/project.service.ts index 17fbe268a..2e09418bc 100644 --- a/src/main/webapp/app/shared/project/project.service.ts +++ b/src/main/webapp/app/shared/project/project.service.ts @@ -41,7 +41,7 @@ export class ProjectService { private alertService: AlertService, ) { combineLatest([ - principal.account$, + principal.getAuthenticationState(), this._trigger$.pipe(startWith(undefined as void)), ]).pipe( switchMap(([state]) => { diff --git a/src/main/webapp/app/shared/subject/subject.model.ts b/src/main/webapp/app/shared/subject/subject.model.ts index c872a8ed5..c65690602 100644 --- a/src/main/webapp/app/shared/subject/subject.model.ts +++ b/src/main/webapp/app/shared/subject/subject.model.ts @@ -2,7 +2,7 @@ import { Role } from '../../admin/user-management/role.model'; import { Project } from '../project/project.model'; import { MinimalSource } from '../source/source.model'; -export interface Subject { +export class Subject { id?: any; login?: string; externalLink?: string; @@ -21,7 +21,6 @@ export interface Subject { attributes?: Record; status: SubjectStatus; roles?: Role[]; -} constructor( id?: number, From 8557dfdc36ee6b7f81681ffd7c61f82c67e295f5 Mon Sep 17 00:00:00 2001 From: Peyman Mohtashami Date: Wed, 17 Nov 2021 09:02:44 +0100 Subject: [PATCH 183/431] Init organizations --- src/main/webapp/app/entities/entity.module.ts | 2 + .../webapp/app/entities/organization/index.ts | 6 + .../organization-delete-dialog.component.html | 21 ++ .../organization-delete-dialog.component.ts | 66 ++++++ .../organization-detail.component.html | 99 ++++++++ .../organization-detail.component.scss | 27 +++ .../organization-detail.component.spec.ts | 57 +++++ .../organization-detail.component.ts | 119 ++++++++++ .../organization-dialog.component.html | 211 +++++++++++++++++ .../organization-dialog.component.scss | 25 ++ .../organization-dialog.component.ts | 218 ++++++++++++++++++ .../organization-popup.service.ts | 51 ++++ .../organization/organization.component.html | 85 +++++++ .../organization/organization.component.ts | 135 +++++++++++ .../organization/organization.module.ts | 52 +++++ .../organization/organization.route.ts | 68 ++++++ .../entities/project/project.component.html | 2 +- .../app/entities/project/project.component.ts | 15 +- .../app/entities/project/project.module.ts | 4 + src/main/webapp/app/home/home.component.html | 30 ++- src/main/webapp/app/home/home.component.ts | 54 +++-- .../app/layouts/navbar/navbar.component.html | 42 +++- .../app/layouts/navbar/navbar.component.ts | 63 +++-- .../app/shared/constants/common.constants.ts | 1 + src/main/webapp/app/shared/index.ts | 1 + .../webapp/app/shared/organization/index.ts | 2 + .../shared/organization/organization.model.ts | 17 +- .../organization/organization.service.ts | 82 ++++++- .../webapp/app/shared/user/user.service.ts | 8 +- src/main/webapp/i18n/en/global.json | 1 + src/main/webapp/i18n/en/organization.json | 44 ++++ src/main/webapp/i18n/nl/global.json | 3 +- src/main/webapp/i18n/nl/organizations.json | 44 ++++ 33 files changed, 1594 insertions(+), 61 deletions(-) create mode 100644 src/main/webapp/app/entities/organization/index.ts create mode 100644 src/main/webapp/app/entities/organization/organization-delete-dialog.component.html create mode 100644 src/main/webapp/app/entities/organization/organization-delete-dialog.component.ts create mode 100644 src/main/webapp/app/entities/organization/organization-detail.component.html create mode 100644 src/main/webapp/app/entities/organization/organization-detail.component.scss create mode 100644 src/main/webapp/app/entities/organization/organization-detail.component.spec.ts create mode 100644 src/main/webapp/app/entities/organization/organization-detail.component.ts create mode 100644 src/main/webapp/app/entities/organization/organization-dialog.component.html create mode 100644 src/main/webapp/app/entities/organization/organization-dialog.component.scss create mode 100644 src/main/webapp/app/entities/organization/organization-dialog.component.ts create mode 100644 src/main/webapp/app/entities/organization/organization-popup.service.ts create mode 100644 src/main/webapp/app/entities/organization/organization.component.html create mode 100644 src/main/webapp/app/entities/organization/organization.component.ts create mode 100644 src/main/webapp/app/entities/organization/organization.module.ts create mode 100644 src/main/webapp/app/entities/organization/organization.route.ts create mode 100644 src/main/webapp/app/shared/organization/index.ts create mode 100644 src/main/webapp/i18n/en/organization.json create mode 100644 src/main/webapp/i18n/nl/organizations.json diff --git a/src/main/webapp/app/entities/entity.module.ts b/src/main/webapp/app/entities/entity.module.ts index e90fe6775..d35b328f1 100644 --- a/src/main/webapp/app/entities/entity.module.ts +++ b/src/main/webapp/app/entities/entity.module.ts @@ -8,6 +8,7 @@ import { ManagementPortalSourceDataModule } from './source-data/source-data.modu import { ManagementPortalSourceTypeModule } from './source-type/source-type.module'; import { ManagementPortalSourceModule } from './source/general-source.module'; import { ManagementPortalSubjectModule } from './subject/general.subject.module'; +import {ManagementPortalOrganizationModule} from "./organization/organization.module"; /* jhipster-needle-add-entity-module-import - JHipster will add entity modules imports here */ @@ -15,6 +16,7 @@ import { ManagementPortalSubjectModule } from './subject/general.subject.module' imports: [ ManagementPortalSourceModule, ManagementPortalSourceTypeModule, + ManagementPortalOrganizationModule, ManagementPortalProjectModule, ManagementPortalSourceDataModule, ManagementPortalRoleModule, diff --git a/src/main/webapp/app/entities/organization/index.ts b/src/main/webapp/app/entities/organization/index.ts new file mode 100644 index 000000000..cf23e4297 --- /dev/null +++ b/src/main/webapp/app/entities/organization/index.ts @@ -0,0 +1,6 @@ +export * from './organization-popup.service'; +export * from './organization-dialog.component'; +export * from './organization-delete-dialog.component'; +export * from './organization-detail.component'; +export * from './organization.component'; +export * from './organization.route'; diff --git a/src/main/webapp/app/entities/organization/organization-delete-dialog.component.html b/src/main/webapp/app/entities/organization/organization-delete-dialog.component.html new file mode 100644 index 000000000..cfe20afe3 --- /dev/null +++ b/src/main/webapp/app/entities/organization/organization-delete-dialog.component.html @@ -0,0 +1,21 @@ + +
    +

    + +
    +
    + +

    +

    +
    +
    + + +
    + diff --git a/src/main/webapp/app/entities/organization/organization-delete-dialog.component.ts b/src/main/webapp/app/entities/organization/organization-delete-dialog.component.ts new file mode 100644 index 000000000..e1cde8894 --- /dev/null +++ b/src/main/webapp/app/entities/organization/organization-delete-dialog.component.ts @@ -0,0 +1,66 @@ +import { Component, OnDestroy, OnInit } from '@angular/core'; +import { ActivatedRoute } from '@angular/router'; + +import { NgbActiveModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap'; + +import { OrganizationPopupService } from './organization-popup.service'; + +import { Organization, OrganizationService } from '../../shared'; +import { EventManager } from '../../shared/util/event-manager.service'; + +@Component({ + selector: 'jhi-organization-delete-dialog', + templateUrl: './organization-delete-dialog.component.html', +}) +export class OrganizationDeleteDialogComponent { + + organization: Organization; + + constructor( + private organizationService: OrganizationService, + public activeModal: NgbActiveModal, + private eventManager: EventManager, + ) { + } + + clear() { + this.activeModal.dismiss('cancel'); + } + + confirmDelete(organizationName: string) { + this.organizationService.delete(organizationName).subscribe(() => { + this.eventManager.broadcast({ + name: 'organizationListModification', + content: 'Deleted an organization', + }); + this.activeModal.dismiss(true); + }); + } +} + +@Component({ + selector: 'jhi-organization-delete-popup', + template: '', +}) +export class OrganizationDeletePopupComponent implements OnInit, OnDestroy { + + modalRef: NgbModalRef; + routeSub: any; + + constructor( + private route: ActivatedRoute, + private organizationPopupService: OrganizationPopupService, + ) { + } + + ngOnInit() { + this.routeSub = this.route.params.subscribe((params) => { + this.modalRef = this.organizationPopupService + .open(OrganizationDeleteDialogComponent, params['organizationName']); + }); + } + + ngOnDestroy() { + this.routeSub.unsubscribe(); + } +} diff --git a/src/main/webapp/app/entities/organization/organization-detail.component.html b/src/main/webapp/app/entities/organization/organization-detail.component.html new file mode 100644 index 000000000..4abd67229 --- /dev/null +++ b/src/main/webapp/app/entities/organization/organization-detail.component.html @@ -0,0 +1,99 @@ +
    +

    + + + + {{organization.organizationName}} + + +

    +
    +
    +
    + +

    {{organization.organizationName}}

    +
    + + + + +
    + +

    {{organization.location}}

    +
    + + + + + + + + + + + + + + + + + + + + + + + + + + +
    +

    + {{organization.description}} +

    +
    + + +
      +
    • + + Projects + +
      • + + + + + + + + + + + + + + + + + + + + +
    + +
    + + + + + + + +
    +
    diff --git a/src/main/webapp/app/entities/organization/organization-detail.component.scss b/src/main/webapp/app/entities/organization/organization-detail.component.scss new file mode 100644 index 000000000..44a6cf0fb --- /dev/null +++ b/src/main/webapp/app/entities/organization/organization-detail.component.scss @@ -0,0 +1,27 @@ + +.organization-detail__organization-info { + padding: 8px 16px; + + > div { + display: flex; + } +} +.organization-detail__organization-info-fields { + > div { + margin-right: 16px; + + > span { + font-weight: bold; font-size: 12px; color: #bebebe; + } + } +} +.organization-detail__description { + padding: 8px 8px; + border-left: 2px solid #dadada; + color: #888; + white-space: pre-line; +} + +#organization-content-wrapper { + padding: 16px 0; +} diff --git a/src/main/webapp/app/entities/organization/organization-detail.component.spec.ts b/src/main/webapp/app/entities/organization/organization-detail.component.spec.ts new file mode 100644 index 000000000..0ec3b630a --- /dev/null +++ b/src/main/webapp/app/entities/organization/organization-detail.component.spec.ts @@ -0,0 +1,57 @@ +import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; +import { DatePipe } from '@angular/common'; +import { ActivatedRoute } from '@angular/router'; +import { of } from 'rxjs'; + +import { EventManager } from '../../shared/util/event-manager.service'; +import { ManagementPortalTestModule } from '../../shared/util/test/test.module'; +import { MockActivatedRoute } from '../../shared/util/test/mock-route.service'; +import { Project, ProjectService } from '../../shared/project'; +import { OrganizationDetailComponent } from './organization-detail.component'; + +describe('Component Tests', () => { + + describe('Project Management Detail Component', () => { + let comp: OrganizationDetailComponent; + let fixture: ComponentFixture; + let service: ProjectService; + + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + imports: [ManagementPortalTestModule], + declarations: [OrganizationDetailComponent], + providers: [ + DatePipe, + { + provide: ActivatedRoute, + useValue: new MockActivatedRoute({projectName: 'testProject'}) + }, + ProjectService, + EventManager + ] + }).overrideTemplate(OrganizationDetailComponent, '').compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(OrganizationDetailComponent); + comp = fixture.componentInstance; + service = fixture.debugElement.injector.get(ProjectService); + }); + + describe('OnInit', () => { + it('Should call load all on init', () => { + // GIVEN + + spyOn(service, 'find').and.returnValue(of(new Project(10))); + + // WHEN + comp.ngOnInit(); + + // THEN + expect(service.find).toHaveBeenCalledWith('testProject'); + expect(comp.organization).toEqual(jasmine.objectContaining({id: 10})); + }); + }); + }); + +}); diff --git a/src/main/webapp/app/entities/organization/organization-detail.component.ts b/src/main/webapp/app/entities/organization/organization-detail.component.ts new file mode 100644 index 000000000..4514eb5e6 --- /dev/null +++ b/src/main/webapp/app/entities/organization/organization-detail.component.ts @@ -0,0 +1,119 @@ +import { Component, OnDestroy, OnInit } from '@angular/core'; +import { ActivatedRoute } from '@angular/router'; +import { Subscription } from 'rxjs'; + +// import { Source } from '../../shared/source/source.model'; +import { Organization, OrganizationService } from '../../shared'; +import { EventManager } from '../../shared/util/event-manager.service'; + +@Component({ + selector: 'jhi-organization-detail', + templateUrl: './organization-detail.component.html', + styleUrls: ['organization-detail.component.scss'], +}) +export class OrganizationDetailComponent implements OnInit, OnDestroy { + + organization: Organization; + private subscription: any; + private eventSubscriber: Subscription; + + // sources: Source[]; + + showProjects: boolean; + // showSources: boolean; + // showSubjects: boolean; + // showOrganizationGroups: boolean; + // showSourceTypes: boolean; + // showOrganizationAdmins: boolean; + // showOrganizationAnalysts: boolean; + + constructor( + private eventManager: EventManager, + private organizationService: OrganizationService, + private route: ActivatedRoute, + ) { + } + + ngOnInit() { + this.subscription = this.route.params.subscribe((params) => { + this.load(params['organizationName']); + }); + this.registerChangeInOrganizations(); + // this.viewSubjects(); + this.viewProjects(); + } + + load(organizationName) { + this.organizationService.find(organizationName).subscribe((organization) => { + this.organization = organization; + }); + } + + previousState() { + window.history.back(); + } + + ngOnDestroy() { + this.subscription.unsubscribe(); + this.eventManager.destroy(this.eventSubscriber); + } + + registerChangeInOrganizations() { + this.eventSubscriber = this.eventManager.subscribe('organizationListModification', + () => this.load(this.organization.organizationName)); + } + + viewProjects() { + // this.showSources = false; + this.showProjects = true; + // this.showOrganizationGroups = false; + // this.showSourceTypes = false; + // this.showOrganizationAdmins = false; + // this.showOrganizationAnalysts = false; + } + + // viewSources() { + // this.showSources = true; + // this.showSubjects = false; + // this.showOrganizationGroups = false; + // this.showSourceTypes = false; + // this.showOrganizationAdmins = false; + // this.showOrganizationAnalysts = false; + // } + // + // viewSubjects() { + // this.showSources = false; + // this.showSubjects = true; + // this.showOrganizationGroups = false; + // this.showSourceTypes = false; + // this.showOrganizationAdmins = false; + // this.showOrganizationAnalysts = false; + // } + // + // viewOrganizationGroups() { + // this.showSources = false; + // this.showSubjects = false; + // this.showOrganizationGroups = true; + // this.showSourceTypes = false; + // this.showOrganizationAdmins = false; + // this.showOrganizationAnalysts = false; + // } + // + // viewOrganizationAdmins() { + // this.showSources = false; + // this.showSubjects = false; + // this.showOrganizationGroups = false; + // this.showSourceTypes = false; + // this.showOrganizationAdmins = true; + // this.showOrganizationAnalysts = false; + // } + // + // viewOrganizationAnalysts() { + // this.showSources = false; + // this.showSubjects = false; + // this.showOrganizationGroups = false; + // this.showSourceTypes = false; + // this.showOrganizationAdmins = false; + // this.showOrganizationAnalysts = true; + // } +} diff --git a/src/main/webapp/app/entities/organization/organization-dialog.component.html b/src/main/webapp/app/entities/organization/organization-dialog.component.html new file mode 100644 index 000000000..fa9eefc73 --- /dev/null +++ b/src/main/webapp/app/entities/organization/organization-dialog.component.html @@ -0,0 +1,211 @@ +
    + +
    + + +
    +
    + +
    + + +
    +
    + + + + +
    + + + + +
    +
    + + + + + + + + + + + + + + + + + +
    + + +
    + + +
    +
    + + + + + + + + + +
    + + +
    + + +
    +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    +
    + + +
    +
    diff --git a/src/main/webapp/app/entities/organization/organization-dialog.component.scss b/src/main/webapp/app/entities/organization/organization-dialog.component.scss new file mode 100644 index 000000000..4cb755036 --- /dev/null +++ b/src/main/webapp/app/entities/organization/organization-dialog.component.scss @@ -0,0 +1,25 @@ +.selected-source-types > .badge { + margin: 2px; + cursor: pointer; +} + +.dropdown-menu.show { + display: block; +} + +.organization-dialog__existing-groups:not(:empty) { + padding: 8px; + margin-bottom: 8px; +} +.organization-dialog__existing-groups > .badge { + margin: 2px; + cursor: pointer; +} +.organization-dialog__new-group { + display: flex; + align-items: flex-end; +} +.organization-dialog__new-group > *:first-child { + flex-grow: 1; + margin-right: 16px; +} diff --git a/src/main/webapp/app/entities/organization/organization-dialog.component.ts b/src/main/webapp/app/entities/organization/organization-dialog.component.ts new file mode 100644 index 000000000..82741ffb7 --- /dev/null +++ b/src/main/webapp/app/entities/organization/organization-dialog.component.ts @@ -0,0 +1,218 @@ +import { Observable, Subject, merge } from 'rxjs'; +import { debounceTime, distinctUntilChanged, map } from 'rxjs/operators'; +import { Component, OnDestroy, OnInit, ViewEncapsulation } from '@angular/core'; +import { ActivatedRoute } from '@angular/router'; + +import { + NgbActiveModal, + NgbCalendar, NgbDate, NgbDateParserFormatter, + NgbDateStruct, + NgbModalRef, + NgbTypeaheadSelectItemEvent +} from '@ng-bootstrap/ng-bootstrap'; + +import { AlertService } from '../../shared/util/alert.service'; +import { EventManager } from '../../shared/util/event-manager.service'; +import { SourceType, SourceTypeService } from '../source-type'; +import { OrganizationPopupService } from './organization-popup.service'; + +import { GroupService, Organization, OrganizationService } from '../../shared'; +import { HttpErrorResponse, HttpResponse } from '@angular/common/http'; + +@Component({ + selector: 'jhi-organization-dialog', + templateUrl: './organization-dialog.component.html', + styleUrls: ['organization-dialog.component.scss'], + encapsulation: ViewEncapsulation.None +}) +export class OrganizationDialogComponent implements OnInit { + readonly authorities: any[]; + readonly options: string[]; + + organization: Organization; + isSaving: boolean; + organizationIdAsPrettyValue: boolean; + + // sourceTypes: SourceType[]; + + // sourceTypeInputText: string; + // sourceTypeInputFocus$ = new Subject(); + // get sourceTypeOptions() { + // const selectedTypes = this.organization.sourceTypes || []; + // const selectedTypeIds = selectedTypes.map(t => t.id); + // return this.sourceTypes.filter(t => !selectedTypeIds.includes(t.id)); + // } + + // newGroupInputText: string; + + attributeComponentEventPrefix: 'organizationAttributes'; + + // startDate: NgbDateStruct; + // endDate: NgbDateStruct; + + // getMatchingSourceTypes = (text$: Observable) => { + // const debouncedText$ = text$.pipe(debounceTime(200), distinctUntilChanged()); + // const inputFocus$ = this.sourceTypeInputFocus$; + // + // return merge(debouncedText$, inputFocus$).pipe(map(term => { + // const availableTypes = this.sourceTypeOptions; + // + // term = term.trim().toLowerCase(); + // if (!term) { + // return availableTypes; + // } + // const getTypeKey = t => this.formatSourceTypeOption(t).toLowerCase(); + // return availableTypes.filter(t => getTypeKey(t).includes(term)); + // })); + // } + + constructor( + public activeModal: NgbActiveModal, + private alertService: AlertService, + private organizationService: OrganizationService, + private sourceTypeService: SourceTypeService, + private eventManager: EventManager, + private groupService: GroupService, + private calendar: NgbCalendar, + public formatter: NgbDateParserFormatter + ) { + this.isSaving = false; + this.authorities = ['ROLE_USER', 'ROLE_SYS_ADMIN', 'ROLE_PROJECT_ADMIN']; + this.options = ['Work-package', 'Phase', 'External-organization-url', 'External-organization-id', 'Privacy-policy-url']; + this.organizationIdAsPrettyValue = true; + } + + ngOnInit() { + // if(this.organization.startDate) { + // this.startDate = this.formatter.parse(this.organization.startDate.toString()); + // } + // if(this.organization.endDate) { + // this.endDate = this.formatter.parse(this.organization.endDate.toString()); + // } + // this.sourceTypeService.query().subscribe( + // (res: HttpResponse) => { + // this.sourceTypes = res.body; + // }, (res: HttpErrorResponse) => this.onError(res)); + // this.eventManager.subscribe(this.attributeComponentEventPrefix + 'ListModification', (response) => { + // this.organization.attributes = response.content; + // }); + } + + clear() { + this.activeModal.dismiss('cancel'); + } + + save() { + this.isSaving = true; + // if (this.startDate && this.calendar.isValid(NgbDate.from(this.startDate))) { + // this.organization.startDate = this.formatter.format(this.startDate) + 'T00:00'; + // } + // if (this.endDate && this.calendar.isValid(NgbDate.from(this.endDate))) { + // this.organization.endDate = this.formatter.format(this.endDate) + 'T23:59'; + // } + if (this.organization.id !== undefined) { + this.organizationService.update(this.organization) + .subscribe((res: Organization) => + this.onSaveSuccess(res), (res: Response) => this.onSaveError(res)); + } else { + this.organizationService.create(this.organization) + .subscribe((res: Organization) => + this.onSaveSuccess(res), (res: Response) => this.onSaveError(res)); + } + } + + private onSaveSuccess(result: Organization) { + this.eventManager.broadcast({name: 'organizationListModification', content: 'OK'}); + this.isSaving = false; + this.activeModal.dismiss(result); + } + + private onSaveError(error) { + try { + error.json(); + } catch (exception) { + error.message = error.text(); + } + this.isSaving = false; + this.onError(error); + } + + private onError(error) { + this.alertService.error(error.message, null, null); + } + + // addSourceType(event: NgbTypeaheadSelectItemEvent) { + // const sourceType = event.item as SourceType; + // const currentSourceTypes = this.organization.sourceTypes || []; + // this.organization.sourceTypes = [ ...currentSourceTypes, sourceType ]; + // this.sourceTypeInputText = ''; + // event.preventDefault(); + // } + // + // removeSourceType(id: number) { + // this.organization.sourceTypes = this.organization.sourceTypes.filter(t => t.id !== id); + // } + // + // formatSourceTypeOption(t: SourceType) { + // return `${t.producer}_${t.model}_${t.catalogVersion}`; + // } + + // addGroup() { + // let currentGroups = this.organization.groups || []; + // let newGroup = { name: this.newGroupInputText }; + // if (newGroup.name.length == 0 || newGroup.name.length > 50) { + // // TODO: actually show error + // return; + // } + // if (currentGroups.some(g => g.name === newGroup.name)) { + // // TODO: actually show error + // return; + // } + // this.groupService.create(this.organization.organizationName, newGroup).toPromise() + // .then(g => { + // this.organization.groups = [ ...currentGroups, g]; + // this.newGroupInputText = ''; + // }) + // .catch(reason => { + // // TODO: actually show error + // }) + // } + // + // removeGroup(groupName: string) { + // // TODO: warn that this may affect existing subjects + // this.groupService.delete(this.organization.organizationName, groupName).toPromise() + // .then(() => { + // this.organization.groups = this.organization.groups.filter(g => g.name !== groupName); + // }) + // .catch(() => { + // // TODO: actually show error + // }); + // } +} + +@Component({ + selector: 'jhi-organization-popup', + template: '', +}) +export class OrganizationPopupComponent implements OnInit, OnDestroy { + + modalRef: NgbModalRef; + routeSub: any; + + constructor( + private route: ActivatedRoute, + private organizationPopupService: OrganizationPopupService, + ) { + } + + ngOnInit() { + this.routeSub = this.route.params.subscribe((params) => { + this.modalRef = this.organizationPopupService + .open(OrganizationDialogComponent, params['organizationName']); + }); + } + + ngOnDestroy() { + this.routeSub.unsubscribe(); + } +} diff --git a/src/main/webapp/app/entities/organization/organization-popup.service.ts b/src/main/webapp/app/entities/organization/organization-popup.service.ts new file mode 100644 index 000000000..7afc08a4b --- /dev/null +++ b/src/main/webapp/app/entities/organization/organization-popup.service.ts @@ -0,0 +1,51 @@ +import { DatePipe } from '@angular/common'; +import { Injectable } from '@angular/core'; +import { Router } from '@angular/router'; +import { NgbModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap'; + +import { Organization, OrganizationService } from '../../shared'; + +@Injectable({ providedIn: 'root' }) +export class OrganizationPopupService { + private isOpen = false; + + constructor( + private datePipe: DatePipe, + private modalService: NgbModal, + private router: Router, + private organizationService: OrganizationService, + ) { + } + + open(component: any, organizationName?: string): NgbModalRef { + if (this.isOpen) { + return; + } + this.isOpen = true; + + if (organizationName) { + this.organizationService.find(organizationName).subscribe((organization) => { + // organization.startDate = this.datePipe + // .transform(organization.startDate, 'yyyy-MM-ddThh:mm'); + // organization.endDate = this.datePipe + // .transform(organization.endDate, 'yyyy-MM-ddThh:mm'); + this.organizationModalRef(component, organization); + }); + } else { + return this.organizationModalRef(component, new Organization()); + } + } + + organizationModalRef(component: any, organization: Organization): NgbModalRef { + const modalRef = this.modalService.open(component, {size: 'lg', backdrop: 'static'}); + modalRef.componentInstance.organization = organization; + modalRef.result.then((result) => { + this.router.navigate([{outlets: {popup: null}}], {replaceUrl: true}); + this.isOpen = false; + }, (reason) => { + this.router.navigate([{outlets: {popup: null}}], {replaceUrl: true}); + this.isOpen = false; + }); + return modalRef; + } +} diff --git a/src/main/webapp/app/entities/organization/organization.component.html b/src/main/webapp/app/entities/organization/organization.component.html new file mode 100644 index 000000000..f5eb91388 --- /dev/null +++ b/src/main/webapp/app/entities/organization/organization.component.html @@ -0,0 +1,85 @@ +
    +

    + + +

    +
    +
    +
    + +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    {{organization.id}}{{organization.organizationName}}{{organization.description}}{{organization.location}} +
    + + + +
    +
    +
    +
    +
    + +
    +
    + +
    +
    +
    diff --git a/src/main/webapp/app/entities/organization/organization.component.ts b/src/main/webapp/app/entities/organization/organization.component.ts new file mode 100644 index 000000000..b792befca --- /dev/null +++ b/src/main/webapp/app/entities/organization/organization.component.ts @@ -0,0 +1,135 @@ +import { Component, OnDestroy, OnInit } from '@angular/core'; +import { HttpErrorResponse, HttpResponse } from '@angular/common/http'; +import { ActivatedRoute, Router } from '@angular/router'; +import { Observable, Subscription } from 'rxjs'; +import { map } from 'rxjs/operators'; + +import { ITEMS_PER_PAGE, Organization, OrganizationService } from '../../shared'; +import { PagingParams } from '../../shared/commons'; +import { AlertService } from '../../shared/util/alert.service'; +import { EventManager } from '../../shared/util/event-manager.service'; +import { parseLinks } from '../../shared/util/parse-links-util'; + +@Component({ + selector: 'jhi-organization', + templateUrl: './organization.component.html', +}) +export class OrganizationComponent implements OnInit, OnDestroy { + pagingParams$: Observable; + + organizations: Organization[]; + eventSubscriber: Subscription; + itemsPerPage: number; + links: any; + page: any; + predicate: any; + queryCount: any; + ascending: any; + totalItems: number; + routeData: any; + previousPage: any; + + constructor( + private organizationService: OrganizationService, + private alertService: AlertService, + private eventManager: EventManager, + private activatedRoute: ActivatedRoute, + private router: Router, + ) { + this.organizations = []; + this.itemsPerPage = ITEMS_PER_PAGE; + this.pagingParams$ = this.activatedRoute.data.pipe(map(data => { + const fallback = { page: 1, predicate: 'id', ascending: true }; + return data['pagingParams'] || fallback; + })); + this.routeData = this.pagingParams$.subscribe(params => { + this.page = params.page; + this.previousPage = params.page; + this.ascending = params.ascending; + this.predicate = params.predicate; + }); + } + + loadAll() { + // this.organizationService.query( + // { + // page: this.page - 1, + // size: this.itemsPerPage, + // sort: this.sort(), + // }, + // ).subscribe( + // (res: HttpResponse) => this.onSuccess(res.body, res.headers), + // (res: HttpErrorResponse) => this.onError(res.message), + // ); + + this.organizationService.findAll( + // { + // page: this.page - 1, + // size: this.itemsPerPage, + // sort: this.sort(), + // }, + ).subscribe( + (organizations) => this.organizations = organizations, + // (res: HttpResponse) => this.onSuccess(res.body, res.headers), + (res: HttpErrorResponse) => this.onError(res.message), + ); + } + + ngOnInit() { + this.loadAll(); + this.registerChangeInOrganizations(); + + this.pagingParams$.subscribe(() => { + this.loadAll(); + }); + } + + ngOnDestroy() { + this.eventManager.destroy(this.eventSubscriber); + } + + trackId(index: number, item: Organization) { + return item.organizationName; + } + + registerChangeInOrganizations() { + this.eventSubscriber = this.eventManager.subscribe('organizationListModification', (response) => this.loadAll()); + } + + private onError(error) { + this.alertService.error(error.message, null, null); + } + + sort() { + const result = [this.predicate + ',' + (this.ascending ? 'asc' : 'desc')]; + if (this.predicate !== 'id') { + result.push('id'); + } + return result; + } + + private onSuccess(data, headers) { + this.links = parseLinks(headers.get('link')); + this.totalItems = headers.get('X-Total-Count'); + this.queryCount = this.totalItems; + this.organizations = data; + } + + loadPage(page) { + if (page !== this.previousPage) { + this.previousPage = page; + this.transition(); + } + } + + transition() { + this.router.navigate(['/organization'], { + queryParams: + { + page: this.page, + sort: this.predicate + ',' + (this.ascending ? 'asc' : 'desc'), + }, + }); + this.loadAll(); + } +} diff --git a/src/main/webapp/app/entities/organization/organization.module.ts b/src/main/webapp/app/entities/organization/organization.module.ts new file mode 100644 index 000000000..57a639740 --- /dev/null +++ b/src/main/webapp/app/entities/organization/organization.module.ts @@ -0,0 +1,52 @@ +import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core'; +import { RouterModule } from '@angular/router'; + +import { ManagementPortalSharedModule } from '../../shared'; +import { ManagementPortalSharedSourceModule } from '../../shared/source/source.module'; +import { ManagementPortalSharedSubjectModule } from '../../shared/subject/subject.module'; +import { + OrganizationComponent, + OrganizationDeleteDialogComponent, + OrganizationDeletePopupComponent, + OrganizationDetailComponent, + OrganizationDialogComponent, + OrganizationPopupComponent, + organizationPopupRoute, + organizationRoute, +} from './'; +import {ManagementPortalSharedGroupModule} from "../../shared/group/group.module"; +import {ManagementPortalProjectModule} from "../project/project.module"; + +const ENTITY_STATES = [ + ...organizationRoute, + ...organizationPopupRoute, +]; + +@NgModule({ + imports: [ + ManagementPortalSharedModule, + ManagementPortalProjectModule, + ManagementPortalSharedSourceModule, + ManagementPortalSharedSubjectModule, + ManagementPortalSharedGroupModule, + RouterModule.forRoot(ENTITY_STATES, {useHash: true}), + ], + declarations: [ + OrganizationComponent, + OrganizationDetailComponent, + OrganizationDialogComponent, + OrganizationDeleteDialogComponent, + OrganizationPopupComponent, + OrganizationDeletePopupComponent, + ], + entryComponents: [ + OrganizationComponent, + OrganizationDialogComponent, + OrganizationPopupComponent, + OrganizationDeleteDialogComponent, + OrganizationDeletePopupComponent, + ], + schemas: [CUSTOM_ELEMENTS_SCHEMA], +}) +export class ManagementPortalOrganizationModule { +} diff --git a/src/main/webapp/app/entities/organization/organization.route.ts b/src/main/webapp/app/entities/organization/organization.route.ts new file mode 100644 index 000000000..576d74c9b --- /dev/null +++ b/src/main/webapp/app/entities/organization/organization.route.ts @@ -0,0 +1,68 @@ +import { Resolve, Routes } from '@angular/router'; + +import { UserRouteAccessService } from '../../shared'; +import {ORGANIZATION_ADMIN, PROJECT_ADMIN, SYSTEM_ADMIN} from '../../shared/constants/common.constants'; +import { OrganizationComponent } from './organization.component'; +import { OrganizationDeletePopupComponent } from './organization-delete-dialog.component'; +import { OrganizationDetailComponent } from './organization-detail.component'; +import { OrganizationPopupComponent } from './organization-dialog.component'; + +import { ResolvePagingParams } from '../../shared/commons'; + +export const organizationRoute: Routes = [ + { + path: 'organization', + runGuardsAndResolvers: 'paramsOrQueryParamsChange', + resolve: { + 'pagingParams': ResolvePagingParams, + }, + component: OrganizationComponent, + data: { + authorities: [SYSTEM_ADMIN], + pageTitle: 'managementPortalApp.organization.home.title', + }, + canActivate: [UserRouteAccessService], + }, + { + path: 'organization/:organizationName', + component: OrganizationDetailComponent, + data: { + authorities: [SYSTEM_ADMIN, ORGANIZATION_ADMIN], + pageTitle: 'managementPortalApp.organization.home.title', + }, + canActivate: [UserRouteAccessService], + }, +]; + +export const organizationPopupRoute: Routes = [ + { + path: 'organization-new', + component: OrganizationPopupComponent, + data: { + authorities: [SYSTEM_ADMIN], + pageTitle: 'managementPortalApp.organization.home.title', + }, + canActivate: [UserRouteAccessService], + outlet: 'popup', + }, + { + path: 'organization/:organizationName/edit', + component: OrganizationPopupComponent, + data: { + authorities: [SYSTEM_ADMIN, ORGANIZATION_ADMIN], + pageTitle: 'managementPortalApp.organization.home.title', + }, + canActivate: [UserRouteAccessService], + outlet: 'popup', + }, + { + path: 'organization/:organizationName/delete', + component: OrganizationDeletePopupComponent, + data: { + authorities: [SYSTEM_ADMIN], + pageTitle: 'managementPortalApp.organization.home.title', + }, + canActivate: [UserRouteAccessService], + outlet: 'popup', + }, +]; diff --git a/src/main/webapp/app/entities/project/project.component.html b/src/main/webapp/app/entities/project/project.component.html index 77ae2282c..082a8ea40 100644 --- a/src/main/webapp/app/entities/project/project.component.html +++ b/src/main/webapp/app/entities/project/project.component.html @@ -29,7 +29,7 @@

    {{project.id}} - {{project.projectName}} + {{project.projectName}} {{project.description}} {{project.location}} {{project.startDate | date:'medium'}} diff --git a/src/main/webapp/app/entities/project/project.component.ts b/src/main/webapp/app/entities/project/project.component.ts index 4522733df..2850626d1 100644 --- a/src/main/webapp/app/entities/project/project.component.ts +++ b/src/main/webapp/app/entities/project/project.component.ts @@ -1,22 +1,27 @@ -import { Component, OnDestroy, OnInit } from '@angular/core'; +import {Component, Input, OnDestroy, OnInit} from '@angular/core'; import {Ā HttpErrorResponse, HttpResponse } from '@angular/common/http'; import { ActivatedRoute, Router } from '@angular/router'; -import { Observable, Subscription } from 'rxjs'; +import {BehaviorSubject, Observable, Subscription} from 'rxjs'; import { map } from 'rxjs/operators'; -import { ITEMS_PER_PAGE, Project, ProjectService } from '../../shared'; +import {ITEMS_PER_PAGE, Organization, Project, ProjectService} from '../../shared'; import { PagingParams } from '../../shared/commons'; import { AlertService } from '../../shared/util/alert.service'; import { EventManager } from '../../shared/util/event-manager.service'; import { parseLinks } from '../../shared/util/parse-links-util'; @Component({ - selector: 'jhi-project', + selector: 'jhi-projects', templateUrl: './project.component.html', }) export class ProjectComponent implements OnInit, OnDestroy { pagingParams$: Observable; + organization$ = new BehaviorSubject(null); + @Input() + get organization() { return this.organization$.value; } + set organization(v: Organization) { this.organization$.next(v); } + projects: Project[]; eventSubscriber: Subscription; itemsPerPage: number; @@ -29,6 +34,8 @@ export class ProjectComponent implements OnInit, OnDestroy { routeData: any; previousPage: any; + @Input() isOrganizationSpecific: boolean; + constructor( private projectService: ProjectService, private alertService: AlertService, diff --git a/src/main/webapp/app/entities/project/project.module.ts b/src/main/webapp/app/entities/project/project.module.ts index e6341fe5e..0c3f07a62 100644 --- a/src/main/webapp/app/entities/project/project.module.ts +++ b/src/main/webapp/app/entities/project/project.module.ts @@ -15,6 +15,7 @@ import { projectRoute, } from './'; import {ManagementPortalSharedGroupModule} from "../../shared/group/group.module"; +import {SubjectComponent} from "../../shared/subject"; const ENTITY_STATES = [ ...projectRoute, @@ -44,6 +45,9 @@ const ENTITY_STATES = [ ProjectDeleteDialogComponent, ProjectDeletePopupComponent, ], + exports: [ + ProjectComponent, + ], schemas: [CUSTOM_ELEMENTS_SCHEMA], }) export class ManagementPortalProjectModule { diff --git a/src/main/webapp/app/home/home.component.html b/src/main/webapp/app/home/home.component.html index 19e9696e8..880e16a77 100644 --- a/src/main/webapp/app/home/home.component.html +++ b/src/main/webapp/app/home/home.component.html @@ -21,18 +21,38 @@

    -
    + + + + + + + + + + + + + + + + + + + + +
    -
    {{project.projectName}}
    -
    {{project.organization}} : {{project.location}}
    -

    {{project.description}} +

    {{organization.organizationName}}
    +
    {{organization.location}}
    +

    {{organization.description}}

    • - + + + + + + + + + + + + + + + + + + +
  • - + - + @@ -84,10 +102,16 @@
    • + + + + + +
  • - + - +
  • diff --git a/src/main/webapp/app/layouts/navbar/navbar.component.ts b/src/main/webapp/app/layouts/navbar/navbar.component.ts index 91fd6660b..d699c1f69 100644 --- a/src/main/webapp/app/layouts/navbar/navbar.component.ts +++ b/src/main/webapp/app/layouts/navbar/navbar.component.ts @@ -5,7 +5,15 @@ import { TranslateService } from '@ngx-translate/core'; import { of, Subscription } from 'rxjs'; import { DEBUG_INFO_ENABLED, VERSION } from '../../app.constants'; -import { JhiLanguageHelper, LoginModalService, LoginService, Principal, Project, UserService } from '../../shared'; +import { + JhiLanguageHelper, + LoginModalService, + LoginService, + Organization, + Principal, + Project, + UserService +} from '../../shared'; import { EventManager } from '../../shared/util/event-manager.service'; import { ProfileService } from '../profiles/profile.service'; @@ -27,7 +35,8 @@ export class NavbarComponent implements OnInit, OnDestroy { modalRef: NgbModalRef; version: string; - projects: Project[]; + // projects: Project[]; + organizations: Organization[]; currentAccount: any; private subscriptions: Subscription; @@ -49,7 +58,8 @@ export class NavbarComponent implements OnInit, OnDestroy { ngOnInit() { this.principal.identity().then(account => this.currentAccount = account); - this.loadRelevantProjects(); + // this.loadRelevantProjects(); + this.loadRelevantOrganizations(); this.languageHelper.getAll().then((languages) => { this.languages = languages; }); @@ -64,23 +74,42 @@ export class NavbarComponent implements OnInit, OnDestroy { this.subscriptions.unsubscribe(); } - loadRelevantProjects() { + // loadRelevantProjects() { + // this.subscriptions.add(this.principal.getAuthenticationState() + // .pipe( + // tap(account => this.currentAccount = account), + // switchMap(account => { + // if (account) { + // return this.userService.findProject(account.login); + // } else { + // return of([]); + // } + // }) + // ) + // .subscribe(projects => this.projects = projects)); + // } + + loadRelevantOrganizations() { this.subscriptions.add(this.principal.getAuthenticationState() - .pipe( - tap(account => this.currentAccount = account), - switchMap(account => { - if (account) { - return this.userService.findProject(account.login); - } else { - return of([]); - } - }) - ) - .subscribe(projects => this.projects = projects)); + .pipe( + tap(account => this.currentAccount = account), + switchMap(account => { + if (account) { + return this.userService.findOrganization(account.login); + } else { + return of([]); + } + }) + ) + .subscribe(organizations => this.organizations = organizations)); } - trackProjectName(index: number, item: Project) { - return item.projectName; + // trackProjectName(index: number, item: Project) { + // return item.projectName; + // } + + trackOrganizationName(index: number, item: Organization) { + return item.organizationName; } changeLanguage(languageKey: string) { diff --git a/src/main/webapp/app/shared/constants/common.constants.ts b/src/main/webapp/app/shared/constants/common.constants.ts index 3ff52fcb0..ae573e951 100644 --- a/src/main/webapp/app/shared/constants/common.constants.ts +++ b/src/main/webapp/app/shared/constants/common.constants.ts @@ -2,5 +2,6 @@ * Created by nivethika on 21-8-17. */ export const SYSTEM_ADMIN = 'ROLE_SYS_ADMIN'; +export const ORGANIZATION_ADMIN = 'ROLE_ORGANIZATION_ADMIN'; export const PROJECT_ADMIN = 'ROLE_PROJECT_ADMIN'; export const AUTH_TOKEN_COOKIE = 'oAtkn'; // use a lesss explicit name for auth token cookie diff --git a/src/main/webapp/app/shared/index.ts b/src/main/webapp/app/shared/index.ts index ec51b60c7..114daabe5 100644 --- a/src/main/webapp/app/shared/index.ts +++ b/src/main/webapp/app/shared/index.ts @@ -22,5 +22,6 @@ export * from './shared-libs.module'; export * from './shared-common.module'; export * from './shared.module'; export * from './auth/user-route-access-service'; +export * from './organization'; export * from './project'; export * from './group'; diff --git a/src/main/webapp/app/shared/organization/index.ts b/src/main/webapp/app/shared/organization/index.ts new file mode 100644 index 000000000..ca36bc36a --- /dev/null +++ b/src/main/webapp/app/shared/organization/index.ts @@ -0,0 +1,2 @@ +export * from './organization.model'; +export * from './organization.service'; diff --git a/src/main/webapp/app/shared/organization/organization.model.ts b/src/main/webapp/app/shared/organization/organization.model.ts index 97c98cc32..25449c757 100644 --- a/src/main/webapp/app/shared/organization/organization.model.ts +++ b/src/main/webapp/app/shared/organization/organization.model.ts @@ -2,9 +2,24 @@ export class Organization { constructor( public id?: number, - public name?: string, + public organizationName?: string, public description?: string, public location?: string, ) { } } + +export const ORGANIZATIONS: Organization[] = [ + { + id: 1, + organizationName: 'The Hyve', + description: 'The Hyve description', + location: 'Utrecht, The Netherlands' + }, + { + id: 2, + organizationName: 'Another Organization', + description: 'Another organization\'s description', + location: 'A City' + } +] diff --git a/src/main/webapp/app/shared/organization/organization.service.ts b/src/main/webapp/app/shared/organization/organization.service.ts index 31c70790d..3adbba390 100644 --- a/src/main/webapp/app/shared/organization/organization.service.ts +++ b/src/main/webapp/app/shared/organization/organization.service.ts @@ -1,8 +1,13 @@ import { Injectable } from '@angular/core'; -import { HttpClient } from '@angular/common/http'; -import { Observable } from 'rxjs'; +import {HttpClient, HttpResponse} from '@angular/common/http'; +import {Observable, of} from 'rxjs'; -import { Organization } from './organization.model'; +import {Organization, ORGANIZATIONS} from './organization.model'; +import {Project} from "../project"; +import {convertDateTimeFromServer, toDate} from "../util/date-util"; +import {map} from "rxjs/operators"; +import {createRequestOption} from "../model/request.utils"; +import {SourceType} from "../../entities/source-type"; @Injectable({ providedIn: 'root' }) export class OrganizationService { @@ -16,11 +21,76 @@ export class OrganizationService { return this.http.post(this.resourceUrl, organization); } - find(orgName: string): Observable { - return this.http.get(`${this.resourceUrl}/${encodeURIComponent(orgName)}`); + // create(project: Project): Observable { + // const copy: Project = Object.assign({}, project); + // copy.startDate = toDate(project.startDate); + // copy.endDate = toDate(project.endDate); + // return this.http.post(this.resourceUrl, copy); + // } + + find(organizationName: string): Observable { + console.log(organizationName) + const organization = ORGANIZATIONS.filter(org => org.organizationName === organizationName)[0]; + if(organization){ + return of(organization); + } else { + return of(null) + } + // return this.http.get(`${this.resourceUrl}/${encodeURIComponent(organizationName)}`); } + // find(projectName: string): Observable { + // return this.http.get(`${this.resourceUrl}/${encodeURIComponent(projectName)}`) + // .pipe(map((jsonResponse: any) => { + // jsonResponse.startDate = convertDateTimeFromServer(jsonResponse.startDate); + // jsonResponse.endDate = convertDateTimeFromServer(jsonResponse.endDate); + // return jsonResponse; + // })); + // } + findAll(): Observable { - return this.http.get(this.resourceUrl); + return of(ORGANIZATIONS); + // return this.http.get(this.resourceUrl); + } + + // findAll(fetchMinimal: boolean): Observable { + // return this.http.get(`${this.resourceUrl}?minimized=${fetchMinimal}`) + // .pipe(map((res: any) => this.convertResponseDates(res))); + // } + + + + update(project: Project): Observable { + const copy: Project = Object.assign({}, project); + copy.startDate = toDate(project.startDate); + copy.endDate = toDate(project.endDate); + return this.http.put(this.resourceUrl, copy); + } + + + + // query(req?: any): Observable> { + // console.log('query') + // const options = createRequestOption(req); + // return of(new HttpResponse(ORGANIZATIONS)); //of(ORGANIZATIONS); + // // return this.http.get(this.resourceUrl, {params: options, observe: 'response'}); + // } + + + + // findSourceTypesByName(projectName: string): Observable { + // return this.http.get(`${this.resourceUrl}/${projectName}/source-types`); + // } + + delete(organizationName: string): Observable { + return this.http.delete(`${this.resourceUrl}/${encodeURIComponent(organizationName)}`); } + + // private convertResponseDates(jsonResponse: any): any { + // for (let i = 0; i < jsonResponse.length; i++) { + // jsonResponse[i].startDate = convertDateTimeFromServer(jsonResponse[i].startDate); + // jsonResponse[i].endDate = convertDateTimeFromServer(jsonResponse[i].endDate); + // } + // return jsonResponse; + // } } diff --git a/src/main/webapp/app/shared/user/user.service.ts b/src/main/webapp/app/shared/user/user.service.ts index 048eeb5eb..58a63ab9a 100644 --- a/src/main/webapp/app/shared/user/user.service.ts +++ b/src/main/webapp/app/shared/user/user.service.ts @@ -1,10 +1,11 @@ import { Injectable } from '@angular/core'; import { HttpClient, HttpResponse } from '@angular/common/http'; -import { Observable } from 'rxjs'; +import {Observable, of} from 'rxjs'; import { User } from './user.model'; import { createRequestOption } from '../model/request.utils'; import { Project } from '../project'; +import {Organization, ORGANIZATIONS} from "../organization/organization.model"; @Injectable({ providedIn: 'root' }) export class UserService { @@ -29,6 +30,11 @@ export class UserService { return this.http.get(`${this.resourceUrl}/${encodeURIComponent(login)}/projects`); } + findOrganization(login: string): Observable { + return of(ORGANIZATIONS); + // return this.http.get(`${this.resourceUrl}/${encodeURIComponent(login)}/organizations`); + } + query(req?: any): Observable> { const params = createRequestOption(req); return this.http.get(this.resourceUrl, {params, observe: 'response'}); diff --git a/src/main/webapp/i18n/en/global.json b/src/main/webapp/i18n/en/global.json index 385f9195f..6df36ceee 100644 --- a/src/main/webapp/i18n/en/global.json +++ b/src/main/webapp/i18n/en/global.json @@ -10,6 +10,7 @@ "source": "Source", "sourceType": "Source Type", "project": "Projects", + "organization": "Organizations", "oauth-clients": "OAuth Clients", "sourceData": "Source Data", "subject": "Subject", diff --git a/src/main/webapp/i18n/en/organization.json b/src/main/webapp/i18n/en/organization.json new file mode 100644 index 000000000..c841995c0 --- /dev/null +++ b/src/main/webapp/i18n/en/organization.json @@ -0,0 +1,44 @@ +{ + "managementPortalApp": { + "organization" : { + "home": { + "title": "Organizations", + "createLabel": "Create a new Organization", + "createOrEditLabel": "Create or edit a Organization" + }, + "created": "A new Organization is created with identifier {{ param }}", + "updated": "A Organization is updated with identifier {{ param }}", + "deleted": "A Organization is deleted with identifier {{ param }}", + "delete": { + "question": "Are you sure you want to delete Organization {{ id }}?" + }, + "detail": { + "title": "Organization" + }, + "organizationName": "Organization Id", + "organizationName.fieldDescription": "Unique identifier of organization", + "description": "Description", + "organization": "Organization", + "location": "Location", + "startDate": "Start Date", + "organizationStatus": "Organization Status", + "endDate": "End Date", + "organizationAdmin": "Organization Admin", + "sourceType": "Source Type", + "groups": "Groups", + "newGroup": { + "label": "New group", + "button": "Add group" + }, + "attributeDataKey" : "Tag", + "attributeDataValue" : "Value", + "prettyOrganizationName" : "Human readable organization Name", + "prettyOrganizationName.fieldDescription" : "Human readable organization name that doesn't have to follow url pattern.", + "organizationIdAsPrettyName": "Do you want to use the organization-id as the human readable name?" + }, + "error" : { + "organizationIdNotFound" : "There was no organization found with id {{ param0 }}", + "organizationNameNotFound" : "There was no organization found with the name {{ param0 }}" + } + } +} diff --git a/src/main/webapp/i18n/nl/global.json b/src/main/webapp/i18n/nl/global.json index c3b5792e7..231ef760f 100644 --- a/src/main/webapp/i18n/nl/global.json +++ b/src/main/webapp/i18n/nl/global.json @@ -9,7 +9,8 @@ "main": "Entiteiten", "source": "Source", "sourceType": "Source-type", - "project": "Project", + "project": "Projecten", + "organization": "Organisaties", "oauth-clients": "OAuth clienten", "sourceData": "Source-data", "subject": "Subject", diff --git a/src/main/webapp/i18n/nl/organizations.json b/src/main/webapp/i18n/nl/organizations.json new file mode 100644 index 000000000..ff9594a5c --- /dev/null +++ b/src/main/webapp/i18n/nl/organizations.json @@ -0,0 +1,44 @@ +{ + "managementPortalApp": { + "organization" : { + "home": { + "title": "Organisaties", + "createLabel": "Maak een nieuwe Organisatie", + "createOrEditLabel": "Maak of wijzig een Organisatie" + }, + "created": "Een nieuw Organisatie aangemaakt met identifier {{ param }}", + "updated": "Een Organisatie wordt bijgewerkt met identifier X {{ param }}", + "deleted": "Een Organisatie wordt verwijderd met identifier {{ param }}", + "delete": { + "question": "Bent u zeker dat u Organisatie {{ id }} wilt verwijderen?" + }, + "detail": { + "title": "Organisatie" + }, + "organizationName": "Organisatie Id", + "organizationName.fieldDescription": "Unieke identificatie van organization", + "description": "Omschrijving", + "organization": "Organisatie", + "location": "Plaats", + "startDate": "Startdatum", + "organizationStatus": "Organisatie Status", + "endDate": "Einddatum", + "organizationAdmin": "Organisatie Admin", + "sourceType": "Source Type", + "groups": "Groepen", + "newGroup": { + "label": "Nieuwe groep", + "button": "Groep toevogen" + }, + "attributeDataKey" : "Tag", + "attributeDataValue" : "Waarde", + "prettyProjectName" : "Leesbare organizationnaam", + "prettyProjectName.fieldDescription" : "Voor mensen leesbare organizationnaam die niet het urlpatroon hoeft te volgen.", + "organizationIdAsPrettyName": "Wil je de organization-id gebruiken als de voor mensen leesbare naam?" + }, + "error" : { + "organizationIdNotFound" : "Er werd geen organization gevonden met id {{ param0 }}", + "organizationNameNotFound" : "Er werd geen organization gevonden met de naam {{ param0 }}" + } + } +} From bfa5aa33de4fbe5328753c5cbc3f80d4facb44fc Mon Sep 17 00:00:00 2001 From: Joris Borgdorff Date: Wed, 17 Nov 2021 14:27:33 +0100 Subject: [PATCH 184/431] PR and test fixes --- .../settings/settings.component.spec.ts | 8 +++-- .../account/settings/settings.component.ts | 34 ++++++++----------- .../webapp/app/shared/auth/account.service.ts | 7 ++-- src/main/webapp/app/shared/commons.ts | 21 +++++------- .../webapp/app/shared/user/account.model.ts | 2 +- .../webapp/app/shared/util/pagination-util.ts | 17 ++++------ .../util/test/mock-principal.service.ts | 18 +++++++--- 7 files changed, 56 insertions(+), 51 deletions(-) diff --git a/src/main/webapp/app/account/settings/settings.component.spec.ts b/src/main/webapp/app/account/settings/settings.component.spec.ts index 40dc029f3..10fd167dc 100644 --- a/src/main/webapp/app/account/settings/settings.component.spec.ts +++ b/src/main/webapp/app/account/settings/settings.component.spec.ts @@ -33,7 +33,9 @@ describe('Component Tests', () => { }, { provide: JhiLanguageHelper, - useValue: null + useValue: jasmine.createSpyObj('JhiLanguageHelper', { + getAll: Promise.resolve(['en', 'nl']), + }), }, { provide: TranslateService, @@ -48,6 +50,7 @@ describe('Component Tests', () => { comp = fixture.componentInstance; mockAuth = fixture.debugElement.injector.get(AccountService); mockPrincipal = fixture.debugElement.injector.get(Principal); + fixture.detectChanges(); }); it('should send the current identity upon save', function() { @@ -68,7 +71,8 @@ describe('Component Tests', () => { comp.save(); // THEN - expect(mockPrincipal.identity).toHaveBeenCalled(); + expect(mockPrincipal.account$Spy).toHaveBeenCalled(); + expect(mockPrincipal.reset).toHaveBeenCalled(); expect(mockAuth.save).toHaveBeenCalledWith(accountValues); expect(comp.settingsAccount).toEqual(accountValues); }); diff --git a/src/main/webapp/app/account/settings/settings.component.ts b/src/main/webapp/app/account/settings/settings.component.ts index 24c198c3f..a786c687e 100644 --- a/src/main/webapp/app/account/settings/settings.component.ts +++ b/src/main/webapp/app/account/settings/settings.component.ts @@ -3,16 +3,17 @@ import { TranslateService } from '@ngx-translate/core'; import { Subscription } from 'rxjs'; import { Account, AccountService, JhiLanguageHelper, Principal } from '../../shared'; +import { filter } from "rxjs/operators"; @Component({ selector: 'jhi-settings', templateUrl: './settings.component.html', }) export class SettingsComponent implements OnInit, OnDestroy { - private subscription: Subscription; + private subscription: Subscription = new Subscription(); error: string; success: string; - settingsAccount: Account; + settingsAccount?: Account; languages: any[]; previousLangKey: String; @@ -25,10 +26,7 @@ export class SettingsComponent implements OnInit, OnDestroy { } ngOnInit() { - this.subscription = this.principal.account$.subscribe((account) => { - this.settingsAccount = this.copyAccount(account); - this.previousLangKey = this.settingsAccount.langKey; - }); + this.subscription.add(this.registerChangesToAccount()); this.languageHelper.getAll().then((languages) => { this.languages = languages; }); @@ -38,12 +36,21 @@ export class SettingsComponent implements OnInit, OnDestroy { this.subscription.unsubscribe(); } + private registerChangesToAccount(): Subscription { + return this.principal.account$.pipe( + filter(a => !!a), + ).subscribe(({activated, email, firstName, langKey, lastName, login}) => { + this.settingsAccount = { activated, email, firstName, langKey, lastName, login }; + this.previousLangKey = this.settingsAccount.langKey; + }); + } + save() { - const currentLangKey = this.settingsAccount.langKey; this.account.save(this.settingsAccount).subscribe(async () => { this.error = null; this.success = 'OK'; - await this.principal.reset(); + const currentLangKey = this.settingsAccount.langKey; + await this.principal.reset().toPromise(); if (currentLangKey && currentLangKey !== this.previousLangKey) { this.translateService.use(currentLangKey) this.previousLangKey = currentLangKey; @@ -53,15 +60,4 @@ export class SettingsComponent implements OnInit, OnDestroy { this.error = 'ERROR'; }); } - - copyAccount(account): Account { - return { - activated: account.activated, - email: account.email, - firstName: account.firstName, - langKey: account.langKey, - lastName: account.lastName, - login: account.login, - }; - } } diff --git a/src/main/webapp/app/shared/auth/account.service.ts b/src/main/webapp/app/shared/auth/account.service.ts index 4bc8ee688..7d31d5fba 100644 --- a/src/main/webapp/app/shared/auth/account.service.ts +++ b/src/main/webapp/app/shared/auth/account.service.ts @@ -1,5 +1,5 @@ import { Injectable } from '@angular/core'; -import { Observable } from 'rxjs'; +import { Observable, throwError } from 'rxjs'; import { HttpClient } from '@angular/common/http'; import { Account } from "../user/account.model"; @@ -12,7 +12,10 @@ export class AccountService { return this.http.get('api/account'); } - save(account: Account): Observable { + save(account?: Account): Observable { + if (!account) { + return throwError('account not provided'); + } return this.http.post('api/account', account); } } diff --git a/src/main/webapp/app/shared/commons.ts b/src/main/webapp/app/shared/commons.ts index f011496ab..fbae24dd7 100644 --- a/src/main/webapp/app/shared/commons.ts +++ b/src/main/webapp/app/shared/commons.ts @@ -1,23 +1,18 @@ import { Injectable } from '@angular/core'; import { ActivatedRouteSnapshot, Resolve } from '@angular/router'; -import { parseAscending, parsePage, parsePredicate } from './util/pagination-util'; +import { parseSort, parsePage } from './util/pagination-util'; @Injectable({ providedIn: 'root' }) export class ResolvePagingParams implements Resolve { resolve(route: ActivatedRouteSnapshot): PagingParams { - const page = route.queryParams['page'] ? route.queryParams['page'] : '1'; - const sort = route.queryParams['sort'] ? route.queryParams['sort'] : 'id,asc'; - const params = { - page: parsePage(page), - predicate: parsePredicate(sort), - ascending: parseAscending(sort), + let { page, sort, ...otherParams } = route.queryParams; + let { predicate, ascending } = parseSort(sort || 'id,asc') + return { + page: parsePage(page || '1'), + predicate, + ascending, + ...otherParams, }; - for (let k in route.queryParams) { - if (k !== 'page' && k !== 'sort' && route.queryParams[k]) { - params[k] = route.queryParams[k]; - } - } - return params; } } diff --git a/src/main/webapp/app/shared/user/account.model.ts b/src/main/webapp/app/shared/user/account.model.ts index 1fa91d789..3db7c9d7c 100644 --- a/src/main/webapp/app/shared/user/account.model.ts +++ b/src/main/webapp/app/shared/user/account.model.ts @@ -6,7 +6,7 @@ export interface Account { firstName?: string, lastName?: string, email?: string, - activated?: true, + activated?: boolean, langKey?: string; createdBy?: string; createdDate?: string; diff --git a/src/main/webapp/app/shared/util/pagination-util.ts b/src/main/webapp/app/shared/util/pagination-util.ts index 9f42a724a..30d406c97 100644 --- a/src/main/webapp/app/shared/util/pagination-util.ts +++ b/src/main/webapp/app/shared/util/pagination-util.ts @@ -1,19 +1,16 @@ // Extracted from JHipster PaginationUtil -export function parseAscending(sort: string): boolean { +export function parseSort(sort: string): {predicate: string, ascending: boolean} { let sortArray = sort.split(','); - sortArray = sortArray.length > 1 ? sortArray : sort.split('%2C'); - if (sortArray.length > 1) { - return sortArray.slice(-1)[0] === 'asc'; + if (sortArray.length === 1) { + sortArray = sort.split('%2C'); } - // default to true if no sort is defined - return true; + return { + predicate: sortArray[0], + ascending: sortArray.length === 1 || sortArray.slice(-1)[0] === 'asc', + }; } export function parsePage(page: string): number { return parseInt(page, 10); } - -export function parsePredicate(sort: string): string { - return sort.split(',')[0].split('%2C')[0]; -} diff --git a/src/main/webapp/app/shared/util/test/mock-principal.service.ts b/src/main/webapp/app/shared/util/test/mock-principal.service.ts index 64269093d..ca01e74cf 100644 --- a/src/main/webapp/app/shared/util/test/mock-principal.service.ts +++ b/src/main/webapp/app/shared/util/test/mock-principal.service.ts @@ -1,15 +1,25 @@ +import { Observable, ReplaySubject } from "rxjs"; +import { Account } from "../../user/account.model"; +import { take } from "rxjs/operators"; export class MockPrincipal { - + private _account$ = new ReplaySubject(); identity: any; fakeResponse: any; + reset: any; + account$Spy: any; + get account$(): Observable { + return this._account$.asObservable(); + } constructor() { this.fakeResponse = {}; - this.identity = jasmine.createSpy('identity').and.returnValue(Promise.resolve(this.fakeResponse)); + this.identity = jasmine.createSpy('identity').and.returnValue(this._account$.toPromise()); + this.reset = jasmine.createSpy('reset').and.returnValue(this._account$.pipe(take(1))); + this.account$Spy = spyOnProperty(this, 'account$', 'get').and.returnValue(this._account$.asObservable()); } - setResponse(json: any): void { - this.fakeResponse = json; + setResponse(json: Account): void { + this._account$.next(json); } } From 95847239bb30e2065ed6a9b0dfb2377ea8af5679 Mon Sep 17 00:00:00 2001 From: aykl Date: Wed, 17 Nov 2021 14:40:42 +0100 Subject: [PATCH 185/431] Explicit Subject Unlinking removed --- .../radarbase/management/repository/SubjectRepository.java | 6 ------ .../java/org/radarbase/management/service/GroupService.java | 4 +--- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/src/main/java/org/radarbase/management/repository/SubjectRepository.java b/src/main/java/org/radarbase/management/repository/SubjectRepository.java index f8b1b2c87..26dfb12e6 100644 --- a/src/main/java/org/radarbase/management/repository/SubjectRepository.java +++ b/src/main/java/org/radarbase/management/repository/SubjectRepository.java @@ -63,12 +63,6 @@ void setGroupIdByIds( + "WHERE subject.id in :ids") void unsetGroupIdByIds(@Param("ids") List ids); - @Modifying - @Query("UPDATE Subject subject " - + "SET subject.group.id = null " - + "WHERE subject.group.id = :group_id") - void unlinkAllFromGroup(@Param("group_id") Long groupId); - @Query("select subject.sources from Subject subject WHERE subject.id = :id") List findSourcesBySubjectId(@Param("id") Long id); diff --git a/src/main/java/org/radarbase/management/service/GroupService.java b/src/main/java/org/radarbase/management/service/GroupService.java index 97e4c8e9c..01b08d551 100644 --- a/src/main/java/org/radarbase/management/service/GroupService.java +++ b/src/main/java/org/radarbase/management/service/GroupService.java @@ -85,9 +85,7 @@ public void deleteGroup(String projectName, String groupName, boolean unlinkSubj "Group " + groupName + " not found in project " + projectName, GROUP, ERR_GROUP_NOT_FOUND)); - if (unlinkSubjects) { - subjectRepository.unlinkAllFromGroup(group.getId()); - } else { + if (!unlinkSubjects) { var subjectCount = subjectRepository.countByGroupId(group.getId()); if (subjectCount > 0) { var msg = "Group " + groupName + " has subjects. " From 52e84b037f0d7469ca5e99f681446dfc044ebf4f Mon Sep 17 00:00:00 2001 From: Joris Borgdorff Date: Wed, 17 Nov 2021 15:00:24 +0100 Subject: [PATCH 186/431] Fix test --- .../app/entities/project/project-detail.component.spec.ts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/main/webapp/app/entities/project/project-detail.component.spec.ts b/src/main/webapp/app/entities/project/project-detail.component.spec.ts index bf27832e9..7d48d2e0a 100644 --- a/src/main/webapp/app/entities/project/project-detail.component.spec.ts +++ b/src/main/webapp/app/entities/project/project-detail.component.spec.ts @@ -42,7 +42,7 @@ describe('Component Tests', () => { it('Should call load all on init', () => { // GIVEN - spyOn(service, 'find').and.returnValue(of(new Project(10))); + spyOn(service, 'find').and.returnValue(of({id: 10})); // WHEN comp.ngOnInit(); @@ -53,5 +53,4 @@ describe('Component Tests', () => { }); }); }); - }); From 2fa16bd18bd806480643717c93626e9009aeb089 Mon Sep 17 00:00:00 2001 From: Peyman Mohtashami Date: Wed, 17 Nov 2021 15:11:11 +0100 Subject: [PATCH 187/431] Add permissions to organizations --- .../admin/user-management/role.component.ts | 2 + .../organization-detail.component.html | 8 +- .../organization-detail.component.ts | 12 ++ .../organization/organization.module.ts | 4 +- .../permission/permission.component.html | 105 +++++++++++ .../permission/permission.component.scss | 168 ++++++++++++++++++ .../shared/permission/permission.component.ts | 128 +++++++++++++ .../shared/permission/permissions.module.ts | 22 +++ 8 files changed, 447 insertions(+), 2 deletions(-) create mode 100644 src/main/webapp/app/shared/permission/permission.component.html create mode 100644 src/main/webapp/app/shared/permission/permission.component.scss create mode 100644 src/main/webapp/app/shared/permission/permission.component.ts create mode 100644 src/main/webapp/app/shared/permission/permissions.module.ts diff --git a/src/main/webapp/app/admin/user-management/role.component.ts b/src/main/webapp/app/admin/user-management/role.component.ts index 10ea82fdb..85e217ea7 100644 --- a/src/main/webapp/app/admin/user-management/role.component.ts +++ b/src/main/webapp/app/admin/user-management/role.component.ts @@ -71,4 +71,6 @@ export class RoleComponent implements OnInit { trackProjectById(index: number, item: Project) { return item.id; } + + } diff --git a/src/main/webapp/app/entities/organization/organization-detail.component.html b/src/main/webapp/app/entities/organization/organization-detail.component.html index 4abd67229..eab2e5213 100644 --- a/src/main/webapp/app/entities/organization/organization-detail.component.html +++ b/src/main/webapp/app/entities/organization/organization-detail.component.html @@ -65,6 +65,11 @@

    Projects

    • +
  • + + Permissions + +
    • @@ -89,7 +94,8 @@

    - + + diff --git a/src/main/webapp/app/entities/organization/organization-detail.component.ts b/src/main/webapp/app/entities/organization/organization-detail.component.ts index 4514eb5e6..4c59e42aa 100644 --- a/src/main/webapp/app/entities/organization/organization-detail.component.ts +++ b/src/main/webapp/app/entities/organization/organization-detail.component.ts @@ -20,6 +20,7 @@ export class OrganizationDetailComponent implements OnInit, OnDestroy { // sources: Source[]; showProjects: boolean; + showPermissions: boolean; // showSources: boolean; // showSubjects: boolean; // showOrganizationGroups: boolean; @@ -66,6 +67,17 @@ export class OrganizationDetailComponent implements OnInit, OnDestroy { viewProjects() { // this.showSources = false; this.showProjects = true; + this.showPermissions = false; + // this.showOrganizationGroups = false; + // this.showSourceTypes = false; + // this.showOrganizationAdmins = false; + // this.showOrganizationAnalysts = false; + } + + viewPermissions() { + // this.showSources = false; + this.showProjects = false; + this.showPermissions = true; // this.showOrganizationGroups = false; // this.showSourceTypes = false; // this.showOrganizationAdmins = false; diff --git a/src/main/webapp/app/entities/organization/organization.module.ts b/src/main/webapp/app/entities/organization/organization.module.ts index 57a639740..d6e37e642 100644 --- a/src/main/webapp/app/entities/organization/organization.module.ts +++ b/src/main/webapp/app/entities/organization/organization.module.ts @@ -3,7 +3,6 @@ import { RouterModule } from '@angular/router'; import { ManagementPortalSharedModule } from '../../shared'; import { ManagementPortalSharedSourceModule } from '../../shared/source/source.module'; -import { ManagementPortalSharedSubjectModule } from '../../shared/subject/subject.module'; import { OrganizationComponent, OrganizationDeleteDialogComponent, @@ -16,6 +15,8 @@ import { } from './'; import {ManagementPortalSharedGroupModule} from "../../shared/group/group.module"; import {ManagementPortalProjectModule} from "../project/project.module"; +import {ManagementPortalSharedSubjectModule} from "../../shared/subject/subject.module"; +import {ManagementPortalSharedPermissionModule} from "../../shared/permission/permissions.module"; const ENTITY_STATES = [ ...organizationRoute, @@ -30,6 +31,7 @@ const ENTITY_STATES = [ ManagementPortalSharedSubjectModule, ManagementPortalSharedGroupModule, RouterModule.forRoot(ENTITY_STATES, {useHash: true}), + ManagementPortalSharedPermissionModule, ], declarations: [ OrganizationComponent, diff --git a/src/main/webapp/app/shared/permission/permission.component.html b/src/main/webapp/app/shared/permission/permission.component.html new file mode 100644 index 000000000..a38f1c86c --- /dev/null +++ b/src/main/webapp/app/shared/permission/permission.component.html @@ -0,0 +1,105 @@ + +
    +

    + + Roles +

    + +{{allUsers | json}} +
    +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    UsersRolesOptions
    {{user.login}} + {{user.authorities}} + + + + + +
    + + + + + +
    +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    diff --git a/src/main/webapp/app/shared/permission/permission.component.scss b/src/main/webapp/app/shared/permission/permission.component.scss new file mode 100644 index 000000000..875e83614 --- /dev/null +++ b/src/main/webapp/app/shared/permission/permission.component.scss @@ -0,0 +1,168 @@ + +.subject-wrapper { + display: flex; +} +.subject-filter { + flex-shrink: 0; + width: 250px; + display: flex; + flex-direction: column; + padding: 0; + border-right: 1px solid #dadada; + font-size: 14px; + font-weight: bold; +} +.subject-filter input { + max-width: 100%; +} +.subject-filter > button { + margin-top: 16px +} +.subject-filter label{ + width: 100%; +} + +.subject-filter .form-group { + margin: 4px 0; + padding: 4px 8px; + background: #f9f9f9; +} + +.subject-filter .subject-filter-header{ + display: flex; + justify-content: space-between; + align-items: center; + padding: 0 8px; + margin-bottom: 8px; + h5 { + margin: 0; + } +} + +.advanced-filter{ + margin-top: 16px; + border-top: 1px solid #ccc; +} + +.advanced-filter-header{ + display: flex; + justify-content: space-between; + align-items: center; + padding: 16px 8px; + border-bottom: 1px solid #ccc; + cursor: pointer; + margin-bottom: 16px; +} + +.field-enrollment-date{ + border-top: 1px solid #eee; + border-bottom: 1px solid #eee; + padding: 8px 0; + margin: 16px 0; + background-color: #f9f9f9; +} + +.field-enrollment-date__header{ + padding: 0 8px; +} + +.applied-filters{ + margin: 8px 0; + display: flex; + align-items: center; + flex-wrap: wrap; +} + +.subject-wrapper > section { + flex-grow: 1; + padding-left: 16px; +} + +.subject-sorting-action { +margin-right: 8px; +margin-bottom: 8px; +} + +.subject-row { +display: flex; +justify-content: space-between; +padding: 8px 16px; +} +.subject-row:nth-child(even) { +border-top: #eceeef; +background-color: #eceeef; +} +.subject-row__content { +display: flex; +flex-grow: 1; +flex-wrap: wrap; +} +.subject-row__content > * { +flex-basis: 80px; +flex-grow: 1; +} + +.subject-row__field-label { +position: relative; +font-weight: bold; +font-size: 12px; +line-height: 12px; +color: #5e5e5e; +} + + +.subject-list-actions { +margin-bottom: 8px; +} +.subject-list-actions > :not(:first-child) { +margin-left: 8px; +} +.subject-row__select-row { +display: flex; +flex-direction: column; +flex-grow: 0; +padding-top: 28px; +margin-right: 16px; +} + + +.subject-row__actions { +display: flex; +flex-direction: column; +flex-basis: unset; +flex-grow: 0 !important; +margin-left: 16px; +} +.subject-row__actions > *:not(:last-child) { +width: 100%; +margin-bottom: 4px; +} + +.subject-pagination { +display: flex; +margin-top: 8px; +} +.subject-pagination > * { +text-align: center; +flex-grow: 1; +padding: 16px; +} +.subject-pagination__all-loaded { +color: #dadada; +cursor: not-allowed; +} +.subject-pagination__load-more:hover { +background: rgba(169, 209, 255, 0.3); +} +.subject-pagination__load-more:active { +background: rgba(0, 120, 255, 0.15); +} + +.form-group .error{ + color: red; + background-color: inherit; +} + +.applied-filters .badge { + cursor: pointer; +} diff --git a/src/main/webapp/app/shared/permission/permission.component.ts b/src/main/webapp/app/shared/permission/permission.component.ts new file mode 100644 index 000000000..09d34666e --- /dev/null +++ b/src/main/webapp/app/shared/permission/permission.component.ts @@ -0,0 +1,128 @@ +import { + Component, Input, + OnChanges, + OnDestroy, + OnInit, + SimpleChanges, +} from '@angular/core'; +import {Role} from "../../admin/user-management/role.model"; +import {Subscription} from "rxjs"; +import {Project, ProjectService} from "../project"; +import {AuthorityService} from "../user/authority.service"; +import {AlertService} from "../util/alert.service"; +import {EventManager} from "../util/event-manager.service"; +import {HttpErrorResponse, HttpResponse} from "@angular/common/http"; +import {User} from "../user/user.model"; +import {Organization} from "../organization"; +import {UserService} from "../user/user.service"; +import {parseLinks} from "../util/parse-links-util"; + +@Component({ + selector: 'jhi-permissions', + templateUrl: './permission.component.html', + styleUrls: ['./permission.component.scss'], +}) +export class PermissionComponent implements OnInit, OnDestroy, OnChanges { + + + @Input() organization: Organization; + + users: User[] = []; + allUsers: User[]; + + eventSubscriber: Subscription; + authorities: string[]; + // projects: Project[]; + + selectedAuthority: any; + selectedUser: User; + + constructor( + private authorityService: AuthorityService, + // private projectService: ProjectService, + private alertService: AlertService, + private eventManager: EventManager, + private userService: UserService, + ) { + } + + ngOnInit() { + + // if (this.users === null) { + // this.users = []; + // } + this.authorityService.findAll().subscribe(res => { + this.authorities = res; + }); + // this.projectService.query().subscribe((res: HttpResponse) => { + // this.projects = res.body; + // }); + } + + trackId(index: number, item: Role) { + return item.id; + } + + addRole() { + // update user + + // const newUser = new User(); + // newUser + // const newRole = new Role(); + // newRole.authorityName = this.selectedAuthority; + // newRole.projectId = this.selectedProject.id; + // newRole.projectName = this.selectedProject.projectName; + // if (this.hasRole(newRole)) { + // this.alertService.error('userManagement.role.error.alreadyExist', null, null); + // } else { + // this.users.push(newRole); + // } + // this.eventManager.broadcast({name: 'roleListModification', content: this.users}); + } + + hasRole(role: Role): boolean { + return false; + // this.users.some(v => v.projectId === role.projectId && + // v.authorityName === role.authorityName); + } + + removeRole(role: Role) { + // this.users.splice(this.users.findIndex(v => v.projectId === role.projectId && v.authorityName === role.authorityName), 1); + // this.eventManager.broadcast({name: 'roleListModification', content: this.users}); + } + + trackProjectById(index: number, item: Project) { + return item.id; + } + + ngOnChanges(changes: SimpleChanges): void { + this.userService.query({ + // page: this.page - 1, + // size: this.itemsPerPage, + // authority: this.byAuthority, + // email: this.byEmail, + // login: this.byLogin, + organization: this.organization + // projectName: this.byProject, + // sort: this.sort(), + }).subscribe( + (res: HttpResponse) => this.onSuccess(res.body, res.headers), + (res: HttpErrorResponse) => this.onError(res), + ); + } + + ngOnDestroy(): void { + } + + private onSuccess(data, headers) { + // this.links = parseLinks(headers.get('link')); + // this.totalItems = headers.get('X-Total-Count'); + // this.queryCount = this.totalItems; + this.allUsers = data; + } + + private onError(error) { + this.alertService.error(error.message, null, null); + } + +} diff --git a/src/main/webapp/app/shared/permission/permissions.module.ts b/src/main/webapp/app/shared/permission/permissions.module.ts new file mode 100644 index 000000000..4c541543a --- /dev/null +++ b/src/main/webapp/app/shared/permission/permissions.module.ts @@ -0,0 +1,22 @@ +import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core'; + +import { ManagementPortalSharedModule } from '../../shared'; +import {PermissionComponent} from "./permission.component"; + +@NgModule({ + imports: [ + ManagementPortalSharedModule, + ], + declarations: [ + PermissionComponent + ], + entryComponents: [ + PermissionComponent + ], + schemas: [CUSTOM_ELEMENTS_SCHEMA], + exports: [ + PermissionComponent + ], +}) +export class ManagementPortalSharedPermissionModule { +} From 29f6d9b3fc4314d9d9693877a7dc4881a547d812 Mon Sep 17 00:00:00 2001 From: Joris Borgdorff Date: Wed, 17 Nov 2021 17:08:16 +0100 Subject: [PATCH 188/431] Misc fixes --- .../app/shared/alert/alert-error.component.ts | 1 - src/main/webapp/app/shared/commons.ts | 2 +- .../shared/subject/filter-badge.component.ts | 3 +- .../app/shared/subject/subject.component.html | 2 +- .../app/shared/subject/subject.component.ts | 1 - .../webapp/app/shared/util/reactive-filter.ts | 80 +++++++++---------- .../integration/entities/subject.spec.ts | 10 +++ 7 files changed, 53 insertions(+), 46 deletions(-) diff --git a/src/main/webapp/app/shared/alert/alert-error.component.ts b/src/main/webapp/app/shared/alert/alert-error.component.ts index 1cad380df..804208d9a 100644 --- a/src/main/webapp/app/shared/alert/alert-error.component.ts +++ b/src/main/webapp/app/shared/alert/alert-error.component.ts @@ -92,7 +92,6 @@ export class JhiAlertErrorComponent implements OnDestroy { addErrorAlert(message, key?, data?) { key = key ? key : message; - window.console.log(key, data) this.alerts.push( this.alertService.addAlert( { diff --git a/src/main/webapp/app/shared/commons.ts b/src/main/webapp/app/shared/commons.ts index 883d12b16..fbae24dd7 100644 --- a/src/main/webapp/app/shared/commons.ts +++ b/src/main/webapp/app/shared/commons.ts @@ -12,7 +12,7 @@ export class ResolvePagingParams implements Resolve { predicate, ascending, ...otherParams, - } + }; } } diff --git a/src/main/webapp/app/shared/subject/filter-badge.component.ts b/src/main/webapp/app/shared/subject/filter-badge.component.ts index bd17a5e4b..a5b552eda 100644 --- a/src/main/webapp/app/shared/subject/filter-badge.component.ts +++ b/src/main/webapp/app/shared/subject/filter-badge.component.ts @@ -14,8 +14,7 @@ import { Component, EventEmitter, Input, Output } from "@angular/core"; template: `
    - {{ text | translate }} - : {{value}} + {{ text | translate }}: {{value}}
    ` diff --git a/src/main/webapp/app/shared/subject/subject.component.html b/src/main/webapp/app/shared/subject/subject.component.html index 4bfa01789..aa3ded4b1 100644 --- a/src/main/webapp/app/shared/subject/subject.component.html +++ b/src/main/webapp/app/shared/subject/subject.component.html @@ -118,7 +118,7 @@
    - { - window.console.log(params); for (let k in params) { if (params.hasOwnProperty(k) && this.filters.hasOwnProperty(k)) { this.filters[k].next(params[k]); diff --git a/src/main/webapp/app/shared/util/reactive-filter.ts b/src/main/webapp/app/shared/util/reactive-filter.ts index f0e27364f..cbb62a0b7 100644 --- a/src/main/webapp/app/shared/util/reactive-filter.ts +++ b/src/main/webapp/app/shared/util/reactive-filter.ts @@ -21,8 +21,8 @@ export class ReactiveFilter { protected readonly _error$: BehaviorSubject; protected readonly trigger$: Subject; - error$: Observable - rawValue$: Observable + error$: Observable; + rawValue$: Observable; value$: Observable; constructor( @@ -32,27 +32,26 @@ export class ReactiveFilter { options = {}; } this._error$ = new BehaviorSubject(''); - this.error$ = this._error$.asObservable().pipe(distinctUntilChanged()) + this.error$ = this._error$.asObservable().pipe(distinctUntilChanged()); this._value$ = new BehaviorSubject(null); this.rawValue$ = this._value$.asObservable(); this.trigger$ = new Subject(); - let debouncedValue = this._value$.pipe(debounceTime(options.debounceTime || 300)); - if (options.validate) { - debouncedValue = this._value$.pipe( + + let validValue = this._value$.pipe( + debounceTime(options.debounceTime || 200), filter(v => { - const error = options.validate(v); - if (error) { - this._error$.next(error); - return false; - } else { - this._error$.next(''); - return true; - } - }) - ) - } - let mergedSignal = merge(debouncedValue, this.trigger$).pipe( + const error = this.validate(v); + if (error) { + this._error$.next(error); + return false; + } else { + this._error$.next(''); + return true; + } + }), + ); + let mergedSignal = merge(validValue, this.trigger$).pipe( startWith(options.initialValue || null as T | null), ); if (options.mapResult) { @@ -78,44 +77,45 @@ export class ReactiveFilter { this._error$.complete(); this.trigger$.complete(); } + + validate(value: T | null): string { + return ''; + } } export interface ReactiveFilterOptions { debounceTime?: number | null, initialValue?: T | null; - validate?: (value: T | null) => string | null; mapResult?: (value$: Observable) => Observable; } export class NgbDateReactiveFilter extends ReactiveFilter { constructor( - calendar: NgbCalendar, + private calendar: NgbCalendar, private formatter: NgbDateParserFormatter, options: ReactiveFilterOptions = {}, ) { - super({ - validate(date) { - if (date === null) { + super({ + mapResult: options.mapResult ? options.mapResult : $v => $v.pipe( + distinctUntilChanged((d1, d2) => d1 === d2 + || (d1 && NgbDate.from(d1).equals(d2))) + ), + debounceTime: 1, + initialValue: options.initialValue, + }); + } + + validate(date: NgbDateStruct | null): string { + if (date === null) { return ''; - } - if (!calendar.isValid(NgbDate.from(date))) { + } + if (!this.calendar.isValid(NgbDate.from(date))) { return 'invalidDate'; - } - if (options.validate) { - return options.validate(date) - } - return ''; - }, - mapResult: options.mapResult ? options.mapResult : $v => $v.pipe( - distinctUntilChanged((d1, d2) => d1 === d2 - || (d1 && NgbDate.from(d1).equals(d2))) - ), - debounceTime: 1, - initialValue: options.initialValue, - }); - } + } + return ''; + } - next(value?: NgbDateStruct | string) { + next(value?: NgbDateStruct | string) { if (typeof value === 'string') { super.next(this.formatter.parse(value)); } else { diff --git a/src/test/javascript/e2e/cypress/integration/entities/subject.spec.ts b/src/test/javascript/e2e/cypress/integration/entities/subject.spec.ts index b98228bed..dac906903 100644 --- a/src/test/javascript/e2e/cypress/integration/entities/subject.spec.ts +++ b/src/test/javascript/e2e/cypress/integration/entities/subject.spec.ts @@ -77,23 +77,29 @@ describe('Subject e2e test', () => { it('should be able to filter subjects by subject id', () => { cy.get('#field-subject-id').type('b-1'); + cy.contains('app-filter-badge', 'Subject Id: b-1').should('exist'); cy.get('jhi-subjects .subject-row').should('have.length', 11); cy.get('#field-subject-id').clear(); + cy.contains('app-filter-badge', 'Subject Id: b-1').should('not.exist'); cy.get('jhi-subjects .subject-row').should('have.length', 20); }); it('should be able to filter subjects by subject external id', () => { cy.get('#field-subject-external-id').type('test-subject-1'); + cy.contains('app-filter-badge', 'External Id: test-subject-1').should('exist'); cy.get('jhi-subjects .subject-row').should('have.length', 1); cy.get('#field-subject-external-id').clear(); + cy.contains('app-filter-badge', 'External Id: test-subject-1').should('not.exist'); cy.get('jhi-subjects .subject-row').should('have.length', 20); }); it('should be able to filter subjects by human readable id', () => { cy.get('#advanced-filter').click(); cy.get('#field-human-readable-id').type('Test'); + cy.contains('app-filter-badge', 'Human Readable ID: Test').should('exist'); cy.get('jhi-subjects .subject-row').should('have.length', 1); cy.get('#field-human-readable-id').clear(); + cy.contains('app-filter-badge', 'Human Readable ID: Test').should('not.exist'); cy.get('jhi-subjects .subject-row').should('have.length', 20); cy.get('#advanced-filter').click(); }); @@ -101,8 +107,10 @@ describe('Subject e2e test', () => { it('should be able to filter subjects by person name', () => { cy.get('#advanced-filter').click(); cy.get('#field-person-name').type('Test'); + cy.contains('app-filter-badge', 'Name: Test').should('exist'); cy.get('jhi-subjects .subject-row').should('have.length', 1); cy.get('#field-person-name').clear(); + cy.contains('app-filter-badge', 'Name: Test').should('not.exist'); cy.get('jhi-subjects .subject-row').should('have.length', 20); cy.get('#advanced-filter').click(); }); @@ -112,8 +120,10 @@ describe('Subject e2e test', () => { it('should be able to filter subjects by date of birth', () => { cy.get('#advanced-filter').click(); cy.get('#field_date_of_birth').type('1980-01-01'); + cy.contains('app-filter-badge', 'Date of Birth: 1980-01-01').should('exist'); cy.get('jhi-subjects .subject-row').should('have.length', 1); cy.get('#field_date_of_birth').clear(); + cy.contains('app-filter-badge', 'Date of Birth: 1980-01-01').should('not.exist'); cy.get('jhi-subjects .subject-row').should('have.length', 20); cy.get('#advanced-filter').click(); }); From 28e439ea25f1a12bbd65eeedd506714e0bbdebfe Mon Sep 17 00:00:00 2001 From: Joris Borgdorff Date: Wed, 17 Nov 2021 17:26:47 +0100 Subject: [PATCH 189/431] Ensure proper page update on edit --- .../webapp/app/shared/subject/subject.component.ts | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/main/webapp/app/shared/subject/subject.component.ts b/src/main/webapp/app/shared/subject/subject.component.ts index dda5dd5d1..20651e3cb 100644 --- a/src/main/webapp/app/shared/subject/subject.component.ts +++ b/src/main/webapp/app/shared/subject/subject.component.ts @@ -9,7 +9,7 @@ import { } from '@angular/core'; import { HttpHeaders, HttpResponse } from '@angular/common/http'; import { ActivatedRoute, Router } from '@angular/router'; -import { BehaviorSubject, combineLatest, Observable, Subscription } from 'rxjs'; +import { BehaviorSubject, combineLatest, Observable, Subscription, Subject as RxSubject } from 'rxjs'; import { debounceTime, distinctUntilChanged, @@ -18,6 +18,7 @@ import { map, pluck, shareReplay, + startWith, switchMap, tap, withLatestFrom, @@ -53,6 +54,7 @@ export class SubjectComponent implements OnInit, OnDestroy, OnChanges { set project(v: Project) { this.project$.next(v); } subjects$: BehaviorSubject = new BehaviorSubject([]); groups$: BehaviorSubject = new BehaviorSubject([]); + trigger$: RxSubject = new RxSubject() page$ = new BehaviorSubject(1); totalItems: number; @@ -132,6 +134,7 @@ export class SubjectComponent implements OnInit, OnDestroy, OnChanges { this.page$.complete(); this.sortBy$.complete(); this.ascending$.complete(); + this.trigger$.complete(); for (let filtersKey in this.filters) { this.filters[filtersKey].complete(); } @@ -185,6 +188,7 @@ export class SubjectComponent implements OnInit, OnDestroy, OnChanges { this.sortBy$.pipe(distinctUntilChanged()), this.ascending$.pipe(distinctUntilChanged()), this.page$.pipe(distinctUntilChanged()), + this.trigger$.pipe(startWith(undefined as void)), ]).pipe( debounceTime(10), tap(([projectName, criteria, sortBy, ascending, page]) => @@ -223,8 +227,12 @@ export class SubjectComponent implements OnInit, OnDestroy, OnChanges { private registerChangeInSubjects(): Subscription { return this.eventManager.subscribe('subjectListModification', (result) => { const modifiedSubject = result.content; + if (typeof modifiedSubject === 'string') { + this.trigger$.next(); + return; + } let currentSubjects = this.subjects$.value; - const subjectIndex = currentSubjects.findIndex((s => s.id == modifiedSubject.id)); + const subjectIndex = currentSubjects.findIndex((s => s.id === modifiedSubject.id)); if (subjectIndex < 0) { this.totalItems++; currentSubjects = [modifiedSubject, ...currentSubjects]; From ca5c2f90fe6e478b31bee639d8f66cf1d118d478 Mon Sep 17 00:00:00 2001 From: Joris Borgdorff Date: Wed, 17 Nov 2021 19:29:45 +0100 Subject: [PATCH 190/431] Ensure that subject modification always passes the modified object --- .../general.subject-dialog.component.ts | 8 ++--- .../add-subjects-to-group-dialog.component.ts | 2 +- .../source-assigner.component.ts | 2 +- .../subject-delete-dialog.component.ts | 3 +- .../subject/subject-detail.component.ts | 6 +++- .../subject/subject-dialog.component.ts | 8 ++--- .../app/shared/subject/subject.component.ts | 32 +++++++++---------- 7 files changed, 32 insertions(+), 29 deletions(-) diff --git a/src/main/webapp/app/entities/subject/general.subject-dialog.component.ts b/src/main/webapp/app/entities/subject/general.subject-dialog.component.ts index 2a494732d..a1a197ca6 100644 --- a/src/main/webapp/app/entities/subject/general.subject-dialog.component.ts +++ b/src/main/webapp/app/entities/subject/general.subject-dialog.component.ts @@ -54,16 +54,16 @@ export class GeneralSubjectDialogComponent implements OnInit, OnDestroy { if (this.subject.id !== null) { this.subjectService.update(this.subject) .subscribe((res: Subject) => - this.onSaveSuccess(res), (res: any) => this.onSaveError(res)); + this.onSaveSuccess('UPDATE', res), (res: any) => this.onSaveError(res)); } else { this.subjectService.create(this.subject) .subscribe((res: Subject) => - this.onSaveSuccess(res), (res: any) => this.onSaveError(res)); + this.onSaveSuccess('CREATE', res), (res: any) => this.onSaveError(res)); } } - private onSaveSuccess(result: Subject) { - this.eventManager.broadcast({name: 'subjectListModification', content: 'OK'}); + private onSaveSuccess(op: string, result: Subject) { + this.eventManager.broadcast({name: 'subjectListModification', content: {op, subject: result}}); this.isSaving = false; this.activeModal.dismiss(result); } diff --git a/src/main/webapp/app/shared/subject/add-subjects-to-group-dialog.component.ts b/src/main/webapp/app/shared/subject/add-subjects-to-group-dialog.component.ts index 88a3992ac..698e00764 100644 --- a/src/main/webapp/app/shared/subject/add-subjects-to-group-dialog.component.ts +++ b/src/main/webapp/app/shared/subject/add-subjects-to-group-dialog.component.ts @@ -49,7 +49,7 @@ export class AddSubjectsToGroupDialogComponent implements OnDestroy { for (let s of this.subjects) { this.eventManager.broadcast({ name: 'subjectListModification', - content: { ...s, group: groupName }, + content: { op: 'UPDATE', subject: {...s, group: groupName }}, }); } this.activeModal.close('saved'); diff --git a/src/main/webapp/app/shared/subject/source-assigner/source-assigner.component.ts b/src/main/webapp/app/shared/subject/source-assigner/source-assigner.component.ts index e6095a930..b40f912aa 100644 --- a/src/main/webapp/app/shared/subject/source-assigner/source-assigner.component.ts +++ b/src/main/webapp/app/shared/subject/source-assigner/source-assigner.component.ts @@ -89,7 +89,7 @@ export class SubjectSourceAssignerDialogComponent implements OnInit { } private onSaveSuccess(result: Subject) { - this.eventManager.broadcast({name: 'subjectListModification', content: 'OK'}); + this.eventManager.broadcast({name: 'subjectListModification', content: {op: 'UPDATE', subject: result}}); this.isSaving = false; this.activeModal.dismiss(result); } diff --git a/src/main/webapp/app/shared/subject/subject-delete-dialog.component.ts b/src/main/webapp/app/shared/subject/subject-delete-dialog.component.ts index 840d2b8fd..e6342ed42 100644 --- a/src/main/webapp/app/shared/subject/subject-delete-dialog.component.ts +++ b/src/main/webapp/app/shared/subject/subject-delete-dialog.component.ts @@ -14,7 +14,6 @@ import { SubjectService } from './subject.service'; templateUrl: './subject-delete-dialog.component.html', }) export class SubjectDeleteDialogComponent { - subject: Subject; isDelete: boolean; @@ -37,7 +36,7 @@ export class SubjectDeleteDialogComponent { }); } else { this.subjectService.discontinue(this.subject).subscribe(() => { - this.eventManager.broadcast({name: 'subjectListModification', content: 'OK'}); + this.eventManager.broadcast({name: 'subjectListModification', content: {op: 'DELETE', subject: this.subject}}); this.activeModal.dismiss(true); window.history.back(); }); diff --git a/src/main/webapp/app/shared/subject/subject-detail.component.ts b/src/main/webapp/app/shared/subject/subject-detail.component.ts index 34e54113e..e7100738e 100644 --- a/src/main/webapp/app/shared/subject/subject-detail.component.ts +++ b/src/main/webapp/app/shared/subject/subject-detail.component.ts @@ -47,6 +47,10 @@ export class SubjectDetailComponent implements OnInit, OnDestroy { } registerChangeInSubjects() { - this.eventSubscriber = this.eventManager.subscribe('subjectListModification', () => this.load(this.subject.login)); + this.eventSubscriber = this.eventManager.subscribe('subjectListModification', ({content}) => { + if (content.subject.login === this.subject.login && (content.op === 'UPDATE' || content.op === 'CREATE')) { + this.subject = content.subject; + } + }); } } diff --git a/src/main/webapp/app/shared/subject/subject-dialog.component.ts b/src/main/webapp/app/shared/subject/subject-dialog.component.ts index 5ba26b296..4a1e9e705 100644 --- a/src/main/webapp/app/shared/subject/subject-dialog.component.ts +++ b/src/main/webapp/app/shared/subject/subject-dialog.component.ts @@ -70,16 +70,16 @@ export class SubjectDialogComponent implements OnInit, OnDestroy { if (this.subject.id !== null) { this.subjectService.update(this.subject) .subscribe((res: Subject) => - this.onSaveSuccess(res), (res: any) => this.onSaveError(res)); + this.onSaveSuccess('UPDATE', res), (res: any) => this.onSaveError(res)); } else { this.subjectService.create(this.subject) .subscribe((res: Subject) => - this.onSaveSuccess(res), (res: any) => this.onSaveError(res)); + this.onSaveSuccess('CREATE', res), (res: any) => this.onSaveError(res)); } } - private onSaveSuccess(result: Subject) { - this.eventManager.broadcast({name: 'subjectListModification', content: result}); + private onSaveSuccess(op: string, result: Subject) { + this.eventManager.broadcast({name: 'subjectListModification', content: {op, subject: result}}); this.isSaving = false; this.activeModal.dismiss(result); } diff --git a/src/main/webapp/app/shared/subject/subject.component.ts b/src/main/webapp/app/shared/subject/subject.component.ts index 20651e3cb..bc210a897 100644 --- a/src/main/webapp/app/shared/subject/subject.component.ts +++ b/src/main/webapp/app/shared/subject/subject.component.ts @@ -225,22 +225,22 @@ export class SubjectComponent implements OnInit, OnDestroy, OnChanges { } private registerChangeInSubjects(): Subscription { - return this.eventManager.subscribe('subjectListModification', (result) => { - const modifiedSubject = result.content; - if (typeof modifiedSubject === 'string') { - this.trigger$.next(); - return; - } - let currentSubjects = this.subjects$.value; - const subjectIndex = currentSubjects.findIndex((s => s.id === modifiedSubject.id)); - if (subjectIndex < 0) { - this.totalItems++; - currentSubjects = [modifiedSubject, ...currentSubjects]; - } else { - currentSubjects = currentSubjects.slice(); - currentSubjects[subjectIndex] = modifiedSubject; - } - this.subjects$.next(currentSubjects); + return this.eventManager.subscribe('subjectListModification', ({content}) => { + const modifiedSubject = content.subject; + let currentSubjects = this.subjects$.value.slice(); + const subjectIndex = currentSubjects.findIndex((s => s.login === modifiedSubject.login)); + if (content.op === 'DELETE') { + if (subjectIndex >= 0) { + currentSubjects = currentSubjects.splice(subjectIndex, 1); + } + this.totalItems--; + } else if (subjectIndex >= 0) { + currentSubjects[subjectIndex] = modifiedSubject; + } else { + this.totalItems++; + currentSubjects = [modifiedSubject, ...currentSubjects]; + } + this.subjects$.next(currentSubjects); }); } From eef5e94181b80ad9c7e84343bf4bcd617a15d306 Mon Sep 17 00:00:00 2001 From: Joris Borgdorff Date: Thu, 18 Nov 2021 09:15:25 +0100 Subject: [PATCH 191/431] Show when no subjects are available --- src/main/webapp/app/shared/subject/load-more.component.ts | 1 + src/main/webapp/i18n/en/subject.json | 1 + src/main/webapp/i18n/nl/subject.json | 1 + 3 files changed, 3 insertions(+) diff --git a/src/main/webapp/app/shared/subject/load-more.component.ts b/src/main/webapp/app/shared/subject/load-more.component.ts index aa8453599..a297da84c 100644 --- a/src/main/webapp/app/shared/subject/load-more.component.ts +++ b/src/main/webapp/app/shared/subject/load-more.component.ts @@ -13,6 +13,7 @@ import { Component, EventEmitter, Input, Output } from "@angular/core"; selector: 'app-load-more', template: `
    + managementPortalApp.subject.noSubjects Date: Thu, 18 Nov 2021 09:16:06 +0100 Subject: [PATCH 192/431] Fix add to group button --- .../app/shared/subject/subject.component.html | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/main/webapp/app/shared/subject/subject.component.html b/src/main/webapp/app/shared/subject/subject.component.html index aa3ded4b1..af0a6acdb 100644 --- a/src/main/webapp/app/shared/subject/subject.component.html +++ b/src/main/webapp/app/shared/subject/subject.component.html @@ -229,16 +229,16 @@
    From 5daf065f4f85cd5e0aa61dc420550381777111e0 Mon Sep 17 00:00:00 2001 From: Joris Borgdorff Date: Thu, 18 Nov 2021 09:16:20 +0100 Subject: [PATCH 193/431] Use OnPush change detection strategy --- .../webapp/app/shared/subject/subject.component.ts | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/main/webapp/app/shared/subject/subject.component.ts b/src/main/webapp/app/shared/subject/subject.component.ts index bc210a897..904abdf01 100644 --- a/src/main/webapp/app/shared/subject/subject.component.ts +++ b/src/main/webapp/app/shared/subject/subject.component.ts @@ -1,4 +1,5 @@ import { + ChangeDetectionStrategy, Component, Input, OnChanges, @@ -9,7 +10,13 @@ import { } from '@angular/core'; import { HttpHeaders, HttpResponse } from '@angular/common/http'; import { ActivatedRoute, Router } from '@angular/router'; -import { BehaviorSubject, combineLatest, Observable, Subscription, Subject as RxSubject } from 'rxjs'; +import { + BehaviorSubject, + combineLatest, + Observable, + Subject as RxSubject, + Subscription +} from 'rxjs'; import { debounceTime, distinctUntilChanged, @@ -40,6 +47,7 @@ import { @Component({ selector: 'jhi-subjects', + changeDetection: ChangeDetectionStrategy.OnPush, templateUrl: './subject.component.html', styleUrls: ['./subject.component.scss'], }) From c0c3a6fb0d23ee3913f2ad5da8ae41cc07bbd0d2 Mon Sep 17 00:00:00 2001 From: Joris Borgdorff Date: Thu, 18 Nov 2021 09:52:18 +0100 Subject: [PATCH 194/431] Reduce ngchange overhead --- .../project/project-detail.component.html | 2 +- .../project/project-detail.component.ts | 12 ++--- .../app/layouts/navbar/navbar.component.ts | 4 +- .../shared/subject/filter-badge.component.ts | 19 +++---- .../app/shared/subject/subject.component.html | 42 +++++++-------- .../app/shared/subject/subject.component.ts | 52 +++++++++++-------- .../webapp/app/shared/util/reactive-filter.ts | 2 - 7 files changed, 69 insertions(+), 64 deletions(-) diff --git a/src/main/webapp/app/entities/project/project-detail.component.html b/src/main/webapp/app/entities/project/project-detail.component.html index 3e61a07bb..fa5ec9598 100644 --- a/src/main/webapp/app/entities/project/project-detail.component.html +++ b/src/main/webapp/app/entities/project/project-detail.component.html @@ -1,4 +1,4 @@ -
    +

    diff --git a/src/main/webapp/app/entities/project/project-detail.component.ts b/src/main/webapp/app/entities/project/project-detail.component.ts index f6c5d763b..b44e7a77f 100644 --- a/src/main/webapp/app/entities/project/project-detail.component.ts +++ b/src/main/webapp/app/entities/project/project-detail.component.ts @@ -1,21 +1,21 @@ -import { Component, OnDestroy, OnInit } from '@angular/core'; +import { ChangeDetectionStrategy, Component, OnDestroy, OnInit } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; -import { Subscription } from 'rxjs'; +import { BehaviorSubject, Observable, Subscription } from 'rxjs'; -import { Source } from '../../shared/source/source.model'; import { Project, ProjectService } from '../../shared'; import { EventManager } from '../../shared/util/event-manager.service'; import { switchMap } from "rxjs/operators"; @Component({ selector: 'jhi-project-detail', + changeDetection: ChangeDetectionStrategy.OnPush, templateUrl: './project-detail.component.html', styleUrls: ['project-detail.component.scss'], }) export class ProjectDetailComponent implements OnInit, OnDestroy { private subscription = new Subscription(); - project: Project; - sources: Source[]; + private _project$ = new BehaviorSubject(null); + project$ = this._project$.asObservable(); showSources: boolean; showSubjects: boolean; @@ -44,7 +44,7 @@ export class ProjectDetailComponent implements OnInit, OnDestroy { return this.route.params.pipe( switchMap(({projectName}) => this.projectService.find(projectName)), ).subscribe( - (project) => this.project = project, + (project) => this._project$.next(project), ); } diff --git a/src/main/webapp/app/layouts/navbar/navbar.component.ts b/src/main/webapp/app/layouts/navbar/navbar.component.ts index 47e1d75de..a686b3adb 100644 --- a/src/main/webapp/app/layouts/navbar/navbar.component.ts +++ b/src/main/webapp/app/layouts/navbar/navbar.component.ts @@ -1,4 +1,4 @@ -import { Component, OnDestroy, OnInit } from '@angular/core'; +import { ChangeDetectionStrategy, Component, OnDestroy, OnInit } from '@angular/core'; import { Router } from '@angular/router'; import { NgbModalRef } from '@ng-bootstrap/ng-bootstrap'; import { TranslateService } from '@ngx-translate/core'; @@ -19,13 +19,13 @@ import { ProfileService } from '../profiles/profile.service'; @Component({ selector: 'jhi-navbar', + changeDetection: ChangeDetectionStrategy.OnPush, templateUrl: './navbar.component.html', styleUrls: [ 'navbar.scss', ], }) export class NavbarComponent implements OnInit, OnDestroy { - inProduction: boolean; isNavbarCollapsed: boolean; apiDocsEnabled: boolean; diff --git a/src/main/webapp/app/shared/subject/filter-badge.component.ts b/src/main/webapp/app/shared/subject/filter-badge.component.ts index a5b552eda..d47e86372 100644 --- a/src/main/webapp/app/shared/subject/filter-badge.component.ts +++ b/src/main/webapp/app/shared/subject/filter-badge.component.ts @@ -7,17 +7,18 @@ * See the file LICENSE in the root of this repository. */ -import { Component, EventEmitter, Input, Output } from "@angular/core"; +import { ChangeDetectionStrategy, Component, EventEmitter, Input, Output } from "@angular/core"; @Component({ - selector: 'app-filter-badge', - template: ` -
    - {{ text | translate }}: {{value}} - -
    - ` + selector: 'app-filter-badge', + changeDetection: ChangeDetectionStrategy.OnPush, + template: ` +
    + {{ text | translate }}: {{value}} + +
    + ` }) export class FilterBadgeComponent { @Input() diff --git a/src/main/webapp/app/shared/subject/subject.component.html b/src/main/webapp/app/shared/subject/subject.component.html index af0a6acdb..d914600c0 100644 --- a/src/main/webapp/app/shared/subject/subject.component.html +++ b/src/main/webapp/app/shared/subject/subject.component.html @@ -10,7 +10,7 @@

    @@ -21,7 +21,7 @@
    @@ -41,7 +41,7 @@
    @@ -53,7 +53,7 @@
    @@ -133,9 +133,7 @@
    -
    -
    @@ -226,24 +224,24 @@
    [translate]="'managementPortalApp.subject.filter.clearButton'">
    +
    + + +
    -
    - - -
    -
    diff --git a/src/main/webapp/app/shared/subject/subject.component.ts b/src/main/webapp/app/shared/subject/subject.component.ts index 904abdf01..f8993da78 100644 --- a/src/main/webapp/app/shared/subject/subject.component.ts +++ b/src/main/webapp/app/shared/subject/subject.component.ts @@ -45,6 +45,10 @@ import { ReactiveFilterOptions } from "../util/reactive-filter"; +interface CheckedSubject extends Subject { + checked: boolean; +} + @Component({ selector: 'jhi-subjects', changeDetection: ChangeDetectionStrategy.OnPush, @@ -60,7 +64,8 @@ export class SubjectComponent implements OnInit, OnDestroy, OnChanges { @Input() get project() { return this.project$.value; } set project(v: Project) { this.project$.next(v); } - subjects$: BehaviorSubject = new BehaviorSubject([]); + _subjects$: BehaviorSubject = new BehaviorSubject([]); + subjects$: Observable groups$: BehaviorSubject = new BehaviorSubject([]); trigger$: RxSubject = new RxSubject() @@ -117,11 +122,22 @@ export class SubjectComponent implements OnInit, OnDestroy, OnChanges { this.enrollmentDate$ = this.observeEnrollmentDate(); this.filterResult$ = this.observeCombinedFilters(); - this.allChecked$ = this.observeChecked(([subjects, checkedSet]) => - subjects.length !== 0 && subjects.every(v => checkedSet.has(v.id)) + this.subjects$ = combineLatest([ + this._subjects$, + this.setOfCheckedId$, + ]).pipe( + map(([subjects, checkedSet]) => + subjects.map(s => ({...s, checked: checkedSet.has(s.id) }))), + shareReplay(1), + ) + + this.allChecked$ = this.subjects$.pipe( + map(subjects => subjects.length !== 0 && subjects.every(s => s.checked)), + distinctUntilChanged(), ); - this.anyChecked$ = this.observeChecked(([subjects, checkedSet]) => - subjects.some(v => checkedSet.has(v.id)) + this.anyChecked$ = this.subjects$.pipe( + map(subjects => subjects.some(s => s.checked)), + distinctUntilChanged(), ); this.subscriptions.add(this.registerChangeInPagingParams()); @@ -137,7 +153,7 @@ export class SubjectComponent implements OnInit, OnDestroy, OnChanges { ngOnDestroy() { this.subscriptions.unsubscribe(); this.project$.complete(); - this.subjects$.complete(); + this._subjects$.complete(); this.groups$.complete(); this.page$.complete(); this.sortBy$.complete(); @@ -203,7 +219,7 @@ export class SubjectComponent implements OnInit, OnDestroy, OnChanges { this.router.navigate(this.toPathParams(projectName, criteria), { queryParams: this.toQueryParams(page, sortBy, ascending), })), - withLatestFrom(this.subjects$), + withLatestFrom(this._subjects$), switchMap(([[projectName, filter, sortBy, ascending, page], subjects]) => { const mergeResults: boolean = page > this.previousPage; this.previousPage = page; @@ -235,7 +251,7 @@ export class SubjectComponent implements OnInit, OnDestroy, OnChanges { private registerChangeInSubjects(): Subscription { return this.eventManager.subscribe('subjectListModification', ({content}) => { const modifiedSubject = content.subject; - let currentSubjects = this.subjects$.value.slice(); + let currentSubjects = this._subjects$.value.slice(); const subjectIndex = currentSubjects.findIndex((s => s.login === modifiedSubject.login)); if (content.op === 'DELETE') { if (subjectIndex >= 0) { @@ -248,7 +264,7 @@ export class SubjectComponent implements OnInit, OnDestroy, OnChanges { this.totalItems++; currentSubjects = [modifiedSubject, ...currentSubjects]; } - this.subjects$.next(currentSubjects); + this._subjects$.next(currentSubjects); }); } @@ -317,7 +333,7 @@ export class SubjectComponent implements OnInit, OnDestroy, OnChanges { if (mergeResults) { const fetchedSubjects = new Map(data.map(a => [a.id, a])); nextValue = [ - ...this.subjects$.value.map(s => { + ...this._subjects$.value.map(s => { const newSubject = fetchedSubjects.get(s.id); if (newSubject) { fetchedSubjects.delete(s.id); @@ -331,7 +347,7 @@ export class SubjectComponent implements OnInit, OnDestroy, OnChanges { } else { nextValue = data; } - this.subjects$.next(nextValue); + this._subjects$.next(nextValue); } clearFilters() { @@ -356,7 +372,7 @@ export class SubjectComponent implements OnInit, OnDestroy, OnChanges { toggleSelectAll(): void { combineLatest([ - this.subjects$, + this._subjects$, this.setOfCheckedId$, ]).pipe( first(), @@ -433,13 +449,6 @@ export class SubjectComponent implements OnInit, OnDestroy, OnChanges { ) } - private observeChecked(modify: (state: [Subject[], Set]) => T): Observable { - return combineLatest([this.subjects$, this.setOfCheckedId$]).pipe( - map(v => modify(v)), - distinctUntilChanged(), - ); - } - private toPathParams(projectName: string, criteria: SubjectFilterCriteria): Record[] { let route = []; if (projectName) { @@ -486,13 +495,12 @@ export class SubjectComponent implements OnInit, OnDestroy, OnChanges { const modalRef = this.modalService.open(AddSubjectsToGroupDialogComponent); this.subscriptions.add(combineLatest([ this.subjects$, - this.setOfCheckedId$, this.groups$, this.project$, - ]).subscribe(([subjects, checkedIds, groups, project]) => { + ]).subscribe(([subjects, groups, project]) => { modalRef.componentInstance.groups = groups; modalRef.componentInstance.projectName = project.projectName; - modalRef.componentInstance.subjects = subjects.filter(s => checkedIds.has(s.id)); + modalRef.componentInstance.subjects = subjects.filter(s => s.checked); })); } } diff --git a/src/main/webapp/app/shared/util/reactive-filter.ts b/src/main/webapp/app/shared/util/reactive-filter.ts index cbb62a0b7..daeaac425 100644 --- a/src/main/webapp/app/shared/util/reactive-filter.ts +++ b/src/main/webapp/app/shared/util/reactive-filter.ts @@ -22,7 +22,6 @@ export class ReactiveFilter { protected readonly trigger$: Subject; error$: Observable; - rawValue$: Observable; value$: Observable; constructor( @@ -35,7 +34,6 @@ export class ReactiveFilter { this.error$ = this._error$.asObservable().pipe(distinctUntilChanged()); this._value$ = new BehaviorSubject(null); - this.rawValue$ = this._value$.asObservable(); this.trigger$ = new Subject(); let validValue = this._value$.pipe( From 64e60e7bcd77998ff818d55557759136c36e9cb3 Mon Sep 17 00:00:00 2001 From: aykl Date: Wed, 10 Nov 2021 15:04:47 +0100 Subject: [PATCH 195/431] OrganizationService added --- .../shared/organization/organization.model.ts | 10 +++++++ .../organization/organization.service.ts | 26 +++++++++++++++++++ 2 files changed, 36 insertions(+) create mode 100644 src/main/webapp/app/shared/organization/organization.model.ts create mode 100644 src/main/webapp/app/shared/organization/organization.service.ts diff --git a/src/main/webapp/app/shared/organization/organization.model.ts b/src/main/webapp/app/shared/organization/organization.model.ts new file mode 100644 index 000000000..97c98cc32 --- /dev/null +++ b/src/main/webapp/app/shared/organization/organization.model.ts @@ -0,0 +1,10 @@ + +export class Organization { + constructor( + public id?: number, + public name?: string, + public description?: string, + public location?: string, + ) { + } +} diff --git a/src/main/webapp/app/shared/organization/organization.service.ts b/src/main/webapp/app/shared/organization/organization.service.ts new file mode 100644 index 000000000..31c70790d --- /dev/null +++ b/src/main/webapp/app/shared/organization/organization.service.ts @@ -0,0 +1,26 @@ +import { Injectable } from '@angular/core'; +import { HttpClient } from '@angular/common/http'; +import { Observable } from 'rxjs'; + +import { Organization } from './organization.model'; + +@Injectable({ providedIn: 'root' }) +export class OrganizationService { + + private resourceUrl = 'api/organizations'; + + constructor(private http: HttpClient) { + } + + create(organization: Organization): Observable { + return this.http.post(this.resourceUrl, organization); + } + + find(orgName: string): Observable { + return this.http.get(`${this.resourceUrl}/${encodeURIComponent(orgName)}`); + } + + findAll(): Observable { + return this.http.get(this.resourceUrl); + } +} From 069fffd12046c7e964d8f8295b3debe1e082d999 Mon Sep 17 00:00:00 2001 From: Joris Borgdorff Date: Thu, 18 Nov 2021 09:59:42 +0100 Subject: [PATCH 196/431] OrganizationResource added --- .../auth/authorization/Permission.java | 5 + .../authorization/RadarAuthorization.java | 21 ++ .../auth/token/AbstractRadarToken.java | 38 ++++ .../org/radarbase/auth/token/RadarToken.java | 8 + .../management/domain/Organization.java | 114 +++++++++++ .../repository/OrganizationRepository.java | 22 +++ .../service/OrganizationService.java | 68 +++++++ .../service/ResourceUriService.java | 11 ++ .../service/dto/OrganizationDTO.java | 90 +++++++++ .../service/mapper/OrganizationMapper.java | 15 ++ .../web/rest/OrganizationResource.java | 121 ++++++++++++ .../web/rest/errors/EntityName.java | 1 + .../web/rest/errors/ErrorConstants.java | 2 + .../20211110160000_add_organization.xml | 62 ++++++ .../resources/config/liquibase/master.xml | 1 + .../web/rest/GroupResourceIntTest.java | 76 ++++---- .../web/rest/OrganizationResourceIntTest.java | 180 ++++++++++++++++++ 17 files changed, 797 insertions(+), 38 deletions(-) create mode 100644 src/main/java/org/radarbase/management/domain/Organization.java create mode 100644 src/main/java/org/radarbase/management/repository/OrganizationRepository.java create mode 100644 src/main/java/org/radarbase/management/service/OrganizationService.java create mode 100644 src/main/java/org/radarbase/management/service/dto/OrganizationDTO.java create mode 100644 src/main/java/org/radarbase/management/service/mapper/OrganizationMapper.java create mode 100644 src/main/java/org/radarbase/management/web/rest/OrganizationResource.java create mode 100644 src/main/resources/config/liquibase/changelog/20211110160000_add_organization.xml create mode 100644 src/test/java/org/radarbase/management/web/rest/OrganizationResourceIntTest.java diff --git a/radar-auth/src/main/java/org/radarbase/auth/authorization/Permission.java b/radar-auth/src/main/java/org/radarbase/auth/authorization/Permission.java index ba04fdad2..738e551f5 100644 --- a/radar-auth/src/main/java/org/radarbase/auth/authorization/Permission.java +++ b/radar-auth/src/main/java/org/radarbase/auth/authorization/Permission.java @@ -26,6 +26,7 @@ public enum Entity { USER, ROLE, PROJECT, + ORGANIZATION, OAUTHCLIENTS, AUDIT, AUTHORITY, @@ -83,6 +84,10 @@ public enum Operation { new Permission(Entity.PROJECT, Operation.UPDATE); public static final Permission PROJECT_DELETE = new Permission(Entity.PROJECT, Operation.DELETE); + public static final Permission ORGANIZATION_CREATE = + new Permission(Entity.ORGANIZATION, Operation.CREATE); + public static final Permission ORGANIZATION_READ = + new Permission(Entity.ORGANIZATION, Operation.READ); public static final Permission OAUTHCLIENTS_CREATE = new Permission(Entity.OAUTHCLIENTS, Operation.CREATE); public static final Permission OAUTHCLIENTS_READ = diff --git a/radar-auth/src/main/java/org/radarbase/auth/authorization/RadarAuthorization.java b/radar-auth/src/main/java/org/radarbase/auth/authorization/RadarAuthorization.java index 5d104a7a5..dac78c0c5 100644 --- a/radar-auth/src/main/java/org/radarbase/auth/authorization/RadarAuthorization.java +++ b/radar-auth/src/main/java/org/radarbase/auth/authorization/RadarAuthorization.java @@ -75,6 +75,27 @@ public static void checkPermission(RadarToken token, Permission permission) } } + /** + * Similar to {@link RadarToken#hasPermissionOnOrganization(Permission, String)}, + * but this method throws an exception rather than returning a boolean. + * Useful in combination with e.g. Spring's controllers and exception translators. + * @param token The token of the logged in user + * @param permission The permission to check + * @param organizationName The organization for which to check the permission + * @throws NotAuthorizedException if the supplied token + * does not have the permission in the given organization + */ + public static void checkPermissionOnOrganization(RadarToken token, Permission permission, + String organizationName) throws NotAuthorizedException { + log.debug("Checking permission {} for user {} in organization {}", permission.toString(), + token.getSubject(), organizationName); + if (!token.hasPermissionOnOrganization(permission, organizationName)) { + throw new NotAuthorizedException(String.format("Client %s does not have " + + "permission %s in organization %s", + token.getSubject(), permission.toString(), organizationName)); + } + } + /** * Similar to {@link RadarToken#hasPermissionOnProject(Permission, String)}, but this method * throws an exception rather than returning a boolean. Useful in combination with e.g. Spring's diff --git a/radar-auth/src/main/java/org/radarbase/auth/token/AbstractRadarToken.java b/radar-auth/src/main/java/org/radarbase/auth/token/AbstractRadarToken.java index ee1ef4714..489b95aae 100644 --- a/radar-auth/src/main/java/org/radarbase/auth/token/AbstractRadarToken.java +++ b/radar-auth/src/main/java/org/radarbase/auth/token/AbstractRadarToken.java @@ -31,6 +31,12 @@ public boolean hasPermission(Permission permission) { } + @Override + public boolean hasPermissionOnOrganization(Permission permission, String orgName) { + return hasScope(permission.scopeName()) + && (isClientCredentials() || hasAuthorityForOrganization(permission, orgName)); + } + @Override public boolean hasPermissionOnProject(Permission permission, String projectName) { return hasScope(permission.scopeName()) @@ -76,6 +82,25 @@ protected boolean hasAuthorityForPermission(Permission permission) { .anyMatch(permission::isAuthorityAllowed); } + /** + * Check authorities in this token linked to the given organization, + * or not linked to any project (such as {@code SYS_ADMIN}), + * for the given permission. + * @param permission the permission + * @param organizationName the organization name + * @return {@code true} if any authority contains the permission, {@code false} otherwise + */ + protected boolean hasAuthorityForOrganization(Permission permission, String organizationName) { + if (hasNonOrganizationRelatedAuthorityForPermission(permission)) { + return true; + } + if (organizationName == null) { + return false; + } + // TODO implement role/authority check for organizations + return false; + } + /** * Check authorities in this token linked to the given project, or not linked to any project * (such as {@code SYS_ADMIN}), for the given permission. @@ -127,6 +152,19 @@ protected boolean hasAuthorityForSource(Permission permission, String projectNam } } + /** + * Check if any non-organization related authority has the given permission. + * Currently the only non-organization authority is {@code SYS_ADMIN}, + * so we only check for that. + * @param permission the permission + * @return {@code true} if any non-organization related authority has the permission, + * {@code false} otherwise + */ + protected boolean hasNonOrganizationRelatedAuthorityForPermission(Permission permission) { + return getAuthorities().contains(SYS_ADMIN) + && permission.isAuthorityAllowed(SYS_ADMIN); + } + /** * Check if any non-project related authority has the given permission. Currently the only * non-project authority is {@code SYS_ADMIN}, so we only check for that. diff --git a/radar-auth/src/main/java/org/radarbase/auth/token/RadarToken.java b/radar-auth/src/main/java/org/radarbase/auth/token/RadarToken.java index d33afae31..b453fce4c 100644 --- a/radar-auth/src/main/java/org/radarbase/auth/token/RadarToken.java +++ b/radar-auth/src/main/java/org/radarbase/auth/token/RadarToken.java @@ -133,6 +133,14 @@ public interface RadarToken { */ boolean hasPermission(Permission permission); + /** + * Check if this token gives a permission in a specific organization. + * @param permission the permission + * @param organizationName the organization name + * @return true if this token has the permission in the organization, false otherwise + */ + boolean hasPermissionOnOrganization(Permission permission, String organizationName); + /** * Check if this token gives a permission in a specific project. * @param permission the permission diff --git a/src/main/java/org/radarbase/management/domain/Organization.java b/src/main/java/org/radarbase/management/domain/Organization.java new file mode 100644 index 000000000..e33beaf00 --- /dev/null +++ b/src/main/java/org/radarbase/management/domain/Organization.java @@ -0,0 +1,114 @@ +package org.radarbase.management.domain; + +import org.hibernate.annotations.Cache; +import org.hibernate.annotations.CacheConcurrencyStrategy; +import org.hibernate.envers.Audited; +import org.radarbase.auth.config.Constants; +import org.radarbase.management.domain.support.AbstractEntityListener; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.EntityListeners; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.SequenceGenerator; +import javax.persistence.Table; +import javax.validation.constraints.NotNull; +import javax.validation.constraints.Pattern; +import java.util.Objects; + +/** + * An Organization. + */ +@Entity +@Audited +@Table(name = "radar_organization") +@Cache(usage = CacheConcurrencyStrategy.NONSTRICT_READ_WRITE) +@EntityListeners({AbstractEntityListener.class}) +public class Organization extends AbstractEntity { + + private static final long serialVersionUID = 1L; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "sequenceGenerator") + @SequenceGenerator(name = "sequenceGenerator", initialValue = 1000, + sequenceName = "hibernate_sequence") + private Long id; + + @NotNull + @Pattern(regexp = Constants.ENTITY_ID_REGEX) + @Column(name = "name", nullable = false, unique = true) + private String name; + + @NotNull + @Column(name = "description", nullable = false) + private String description; + + @NotNull + @Column(name = "location", nullable = false) + private String location; + + @Override + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public String getLocation() { + return location; + } + + public void setLocation(String location) { + this.location = location; + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + var org = (Organization) o; + if (org.id == null || id == null) { + return false; + } + return Objects.equals(id, org.id); + } + + @Override + public int hashCode() { + return Objects.hashCode(id); + } + + @Override + public String toString() { + return "Organization{" + + "id=" + id + + ", name='" + name + "'" + + ", description='" + description + "'" + + ", location='" + location + "'" + + "}"; + } +} diff --git a/src/main/java/org/radarbase/management/repository/OrganizationRepository.java b/src/main/java/org/radarbase/management/repository/OrganizationRepository.java new file mode 100644 index 000000000..3e05c0daf --- /dev/null +++ b/src/main/java/org/radarbase/management/repository/OrganizationRepository.java @@ -0,0 +1,22 @@ +package org.radarbase.management.repository; + +import java.util.Optional; + +import org.radarbase.management.domain.Organization; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Query; +import org.springframework.data.repository.RepositoryDefinition; +import org.springframework.data.repository.history.RevisionRepository; +import org.springframework.data.repository.query.Param; + +/** + * Spring Data JPA repository for the Organization entity. + */ +@RepositoryDefinition(domainClass = Organization.class, idClass = Long.class) +public interface OrganizationRepository extends JpaRepository, + RevisionRepository { + + @Query("select org from Organization org " + + "where org.name = :name") + Optional findOneByName(@Param("name") String name); +} diff --git a/src/main/java/org/radarbase/management/service/OrganizationService.java b/src/main/java/org/radarbase/management/service/OrganizationService.java new file mode 100644 index 000000000..6aa127ad3 --- /dev/null +++ b/src/main/java/org/radarbase/management/service/OrganizationService.java @@ -0,0 +1,68 @@ +package org.radarbase.management.service; + +import org.radarbase.management.repository.OrganizationRepository; +import org.radarbase.management.service.dto.OrganizationDTO; +import org.radarbase.management.service.mapper.OrganizationMapper; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; +import java.util.Optional; +import java.util.stream.Collectors; + +/** + * Service Implementation for managing Organization. + */ +@Service +@Transactional +public class OrganizationService { + + private static final Logger log = LoggerFactory.getLogger(OrganizationService.class); + + @Autowired + private OrganizationRepository organizationRepository; + + @Autowired + private OrganizationMapper organizationMapper; + + /** + * Save an organization. + * + * @param organizationDto the entity to save + * @return the persisted entity + */ + public OrganizationDTO save(OrganizationDTO organizationDto) { + log.debug("Request to save Organization : {}", organizationDto); + var org = organizationMapper.organizationDTOToOrganization(organizationDto); + org = organizationRepository.save(org); + return organizationMapper.organizationToOrganizationDTO(org); + } + + /** + * Get all the organizations. + * + * @return the list of entities + */ + @Transactional(readOnly = true) + public List findAll() { + return organizationRepository.findAll().stream() + .map(organizationMapper::organizationToOrganizationDTO) + .collect(Collectors.toList()); + } + + /** + * Get one organization by name. + * + * @param name the name of the entity + * @return the entity + */ + @Transactional(readOnly = true) + public Optional findByName(String name) { + log.debug("Request to get Organization by name: {}", name); + return organizationRepository.findOneByName(name) + .map(organizationMapper::organizationToOrganizationDTO); + } +} diff --git a/src/main/java/org/radarbase/management/service/ResourceUriService.java b/src/main/java/org/radarbase/management/service/ResourceUriService.java index c8dd4077a..f16481f85 100644 --- a/src/main/java/org/radarbase/management/service/ResourceUriService.java +++ b/src/main/java/org/radarbase/management/service/ResourceUriService.java @@ -5,6 +5,7 @@ import org.radarbase.management.domain.User; import org.radarbase.management.service.dto.ClientDetailsDTO; import org.radarbase.management.service.dto.MinimalSourceDetailsDTO; +import org.radarbase.management.service.dto.OrganizationDTO; import org.radarbase.management.service.dto.ProjectDTO; import org.radarbase.management.service.dto.RoleDTO; import org.radarbase.management.service.dto.SourceDTO; @@ -25,6 +26,16 @@ private ResourceUriService() { // utility class } + /** + * Get the API location for the given resource. + * @param resource the resource + * @return the API location + * @throws URISyntaxException See {@link URI#URI(String)} + */ + public static URI getUri(OrganizationDTO resource) throws URISyntaxException { + return new URI(HeaderUtil.buildPath("api", "organizations", resource.getName())); + } + /** * Get the API location for the given resource. * @param resource the resource diff --git a/src/main/java/org/radarbase/management/service/dto/OrganizationDTO.java b/src/main/java/org/radarbase/management/service/dto/OrganizationDTO.java new file mode 100644 index 000000000..63d25fd4e --- /dev/null +++ b/src/main/java/org/radarbase/management/service/dto/OrganizationDTO.java @@ -0,0 +1,90 @@ +package org.radarbase.management.service.dto; + + +import com.fasterxml.jackson.annotation.JsonInclude; +import java.io.Serializable; +import java.util.Objects; +import javax.validation.constraints.NotNull; + +/** + * A DTO for the Organization entity. + */ +@JsonInclude(JsonInclude.Include.NON_NULL) +public class OrganizationDTO implements Serializable { + private static final long serialVersionUID = 1L; + + private Long id; + + @NotNull + private String name; + + @NotNull + private String description; + + @NotNull + private String location; + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public String getLocation() { + return location; + } + + public void setLocation(String location) { + this.location = location; + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + + var orgDto = (OrganizationDTO) o; + if (id == null || orgDto.id == null) { + return false; + } + + return Objects.equals(id, orgDto.id); + } + + @Override + public int hashCode() { + return Objects.hashCode(id); + } + + @Override + public String toString() { + return "OrganizationDTO{" + + "id=" + id + + ", name='" + name + "'" + + ", description='" + description + "'" + + ", location='" + location + "'" + + '}'; + } +} diff --git a/src/main/java/org/radarbase/management/service/mapper/OrganizationMapper.java b/src/main/java/org/radarbase/management/service/mapper/OrganizationMapper.java new file mode 100644 index 000000000..d4b387c3a --- /dev/null +++ b/src/main/java/org/radarbase/management/service/mapper/OrganizationMapper.java @@ -0,0 +1,15 @@ +package org.radarbase.management.service.mapper; + +import org.mapstruct.Mapper; +import org.radarbase.management.domain.Organization; +import org.radarbase.management.service.dto.OrganizationDTO; + +/** + * Mapper for the entity Organization and its DTO OrganizationDTO. + */ +@Mapper(componentModel = "spring") +public interface OrganizationMapper { + OrganizationDTO organizationToOrganizationDTO(Organization organization); + + Organization organizationDTOToOrganization(OrganizationDTO organizationDto); +} diff --git a/src/main/java/org/radarbase/management/web/rest/OrganizationResource.java b/src/main/java/org/radarbase/management/web/rest/OrganizationResource.java new file mode 100644 index 000000000..932a17d8f --- /dev/null +++ b/src/main/java/org/radarbase/management/web/rest/OrganizationResource.java @@ -0,0 +1,121 @@ +package org.radarbase.management.web.rest; + +import io.micrometer.core.annotation.Timed; +import org.radarbase.auth.config.Constants; +import org.radarbase.auth.exception.NotAuthorizedException; +import org.radarbase.auth.token.RadarToken; +import org.radarbase.management.service.OrganizationService; +import org.radarbase.management.service.ResourceUriService; +import org.radarbase.management.service.dto.OrganizationDTO; +import org.radarbase.management.web.rest.errors.NotFoundException; +import org.radarbase.management.web.rest.errors.ErrorConstants; +import org.radarbase.management.web.rest.util.HeaderUtil; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.validation.Valid; +import java.net.URISyntaxException; +import java.util.Collections; + +import static org.radarbase.management.web.rest.errors.EntityName.ORGANIZATION; +import static org.radarbase.auth.authorization.Permission.ORGANIZATION_CREATE; +import static org.radarbase.auth.authorization.Permission.ORGANIZATION_READ; +import static org.radarbase.auth.authorization.RadarAuthorization.checkPermission; +import static org.radarbase.auth.authorization.RadarAuthorization.checkPermissionOnOrganization; + +/** + * REST controller for managing Organization. + */ +@RestController +@RequestMapping("/api") +public class OrganizationResource { + + private static final Logger log = LoggerFactory.getLogger(OrganizationResource.class); + + private static final String ENTITY_NAME = "organization"; + + @Autowired + private OrganizationService organizationService; + + @Autowired + private RadarToken token; + + /** + * POST /organizations : Create a new organization. + * + * @param organizationDto the organizationDto to create + * @return the ResponseEntity with status 201 (Created) + * and with body the new organizationDto, + * or with status 400 (Bad Request) if the organization already has an ID + * @throws URISyntaxException if the Location URI syntax is incorrect + */ + @PostMapping("/organizations") + @Timed + public ResponseEntity createOrganization( + @Valid @RequestBody OrganizationDTO organizationDto + ) throws URISyntaxException, NotAuthorizedException { + log.debug("REST request to save Organization : {}", organizationDto); + // checkPermission(token, ORGANIZATION_CREATE); + if (organizationDto.getId() != null) { + var msg = "A new organization cannot already have an ID"; + var headers = HeaderUtil.createFailureAlert(ENTITY_NAME, "idexists", msg); + return ResponseEntity.badRequest().headers(headers).body(null); + } + var existingOrg = organizationService.findByName(organizationDto.getName()); + if (existingOrg.isPresent()) { + var msg = "An organization with this name already exists"; + var headers = HeaderUtil.createFailureAlert(ENTITY_NAME, "nameexists", msg); + return ResponseEntity.status(HttpStatus.CONFLICT).headers(headers).body(null); + } + var result = organizationService.save(organizationDto); + return ResponseEntity.created(ResourceUriService.getUri(result)) + .headers(HeaderUtil.createEntityCreationAlert(ENTITY_NAME, result.getName())) + .body(result); + } + + /** + * GET /organizations : get all the organizations. + * + * @return the ResponseEntity with status 200 (OK) + * and the list of organizations in body + */ + @GetMapping("/organizations") + @Timed + public ResponseEntity getAllOrganizations() throws NotAuthorizedException { + log.debug("REST request to get Organizations"); + // checkPermission(token, ORGANIZATION_READ); + var orgs = organizationService.findAll(); + return new ResponseEntity<>(orgs, HttpStatus.OK); + } + + /** + * GET /organizations/:organizationName : get the organization with this name. + * + * @param name the name of the organizationDTO to retrieve + * @return the ResponseEntity with status 200 (OK) + * and with body the organizationDTO, + * or with status 404 (Not Found) + */ + @GetMapping("/organizations/{name:" + Constants.ENTITY_ID_REGEX + "}") + @Timed + public ResponseEntity getOrganization( + @PathVariable String name) throws NotAuthorizedException { + log.debug("REST request to get Organization : {}", name); + // checkPermissionOnOrganization(token, ORGANIZATION_READ, name); + var org = organizationService.findByName(name); + var dto = org.orElseThrow(() -> new NotFoundException( + "Organization not found with name " + name, + ORGANIZATION, ErrorConstants.ERR_ORGANIZATION_NAME_NOT_FOUND, + Collections.singletonMap("name", name))); + return ResponseEntity.ok(dto); + } +} diff --git a/src/main/java/org/radarbase/management/web/rest/errors/EntityName.java b/src/main/java/org/radarbase/management/web/rest/errors/EntityName.java index e94be6a2d..a8dc96baf 100644 --- a/src/main/java/org/radarbase/management/web/rest/errors/EntityName.java +++ b/src/main/java/org/radarbase/management/web/rest/errors/EntityName.java @@ -9,6 +9,7 @@ public interface EntityName { String USER = "userManagement"; String SOURCE = "source"; String META_TOKEN = "meta-token"; + String ORGANIZATION = "organization"; String PROJECT = "project"; String REVISION = "revision"; String GROUP = "group"; diff --git a/src/main/java/org/radarbase/management/web/rest/errors/ErrorConstants.java b/src/main/java/org/radarbase/management/web/rest/errors/ErrorConstants.java index b99891beb..3719b57d6 100644 --- a/src/main/java/org/radarbase/management/web/rest/errors/ErrorConstants.java +++ b/src/main/java/org/radarbase/management/web/rest/errors/ErrorConstants.java @@ -22,6 +22,8 @@ public final class ErrorConstants { public static final String ERR_GROUP_EXISTS = "error.groupExists"; public static final String ERR_INVALID_AUTHORITY = "error.invalidAuthority"; public static final String ERR_EMAIL_EXISTS = "error.emailexists"; + public static final String ERR_ORGANIZATION_NAME_NOT_FOUND = "error" + + ".organizationNameNotFound"; public static final String ERR_PROJECT_ID_NOT_FOUND = "error.projectIdNotFound"; public static final String ERR_PROJECT_NAME_NOT_FOUND = "error.projectNameNotFound"; public static final String ERR_REVISIONS_NOT_FOUND = "error.revisionsNotFound"; diff --git a/src/main/resources/config/liquibase/changelog/20211110160000_add_organization.xml b/src/main/resources/config/liquibase/changelog/20211110160000_add_organization.xml new file mode 100644 index 000000000..b38cc692d --- /dev/null +++ b/src/main/resources/config/liquibase/changelog/20211110160000_add_organization.xml @@ -0,0 +1,62 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/resources/config/liquibase/master.xml b/src/main/resources/config/liquibase/master.xml index b3b20e0b9..5d19bdf55 100644 --- a/src/main/resources/config/liquibase/master.xml +++ b/src/main/resources/config/liquibase/master.xml @@ -40,5 +40,6 @@ + diff --git a/src/test/java/org/radarbase/management/web/rest/GroupResourceIntTest.java b/src/test/java/org/radarbase/management/web/rest/GroupResourceIntTest.java index 7087202c5..2f630fe4a 100644 --- a/src/test/java/org/radarbase/management/web/rest/GroupResourceIntTest.java +++ b/src/test/java/org/radarbase/management/web/rest/GroupResourceIntTest.java @@ -101,7 +101,7 @@ class GroupResourceIntTest { @Autowired private RadarToken token; - private MockMvc restProjectMockMvc; + private MockMvc restGroupMockMvc; private Group group; @@ -110,14 +110,14 @@ class GroupResourceIntTest { @BeforeEach public void setUp() throws ServletException { MockitoAnnotations.initMocks(this); - GroupResource projectResource = new GroupResource(); - ReflectionTestUtils.setField(projectResource, "groupService", groupService); - ReflectionTestUtils.setField(projectResource, "token", token); + var groupResource = new GroupResource(); + ReflectionTestUtils.setField(groupResource, "groupService", groupService); + ReflectionTestUtils.setField(groupResource, "token", token); JwtAuthenticationFilter filter = OAuthHelper.createAuthenticationFilter(); filter.init(new MockFilterConfig()); - this.restProjectMockMvc = MockMvcBuilders.standaloneSetup(projectResource) + this.restGroupMockMvc = MockMvcBuilders.standaloneSetup(groupResource) .setCustomArgumentResolvers(pageableArgumentResolver) .setControllerAdvice(exceptionTranslator) .setMessageConverters(jacksonMessageConverter) @@ -152,13 +152,13 @@ private Group createEntity() { @Test void createGroup() throws Exception { // Create the Group - GroupDTO groupDto = groupMapper.groupToGroupDTO(group); - restProjectMockMvc.perform(post("/api/projects/{projectName}/groups", + var groupDto = groupMapper.groupToGroupDTO(group); + restGroupMockMvc.perform(post("/api/projects/{projectName}/groups", project.getProjectName()) .contentType(TestUtil.APPLICATION_JSON_UTF8) .content(TestUtil.convertObjectToJsonBytes(groupDto))) .andExpect(status().isCreated()); - + var savedGroup = groupRepository.findByProjectNameAndName( project.getProjectName(), groupDto.getName()).get(); @@ -173,8 +173,8 @@ void createGroupNonExistingProject() throws Exception { projectRepository.delete(project); // Create the Group - GroupDTO groupDto = groupMapper.groupToGroupDTO(group); - restProjectMockMvc.perform(post("/api/projects/{projectName}/groups", + var groupDto = groupMapper.groupToGroupDTO(group); + restGroupMockMvc.perform(post("/api/projects/{projectName}/groups", project.getProjectName()) .contentType(TestUtil.APPLICATION_JSON_UTF8) .content(TestUtil.convertObjectToJsonBytes(groupDto))) @@ -184,14 +184,14 @@ void createGroupNonExistingProject() throws Exception { @Test void createGroupWithExistingName() throws Exception { // Create the Group - GroupDTO groupDto = groupMapper.groupToGroupDTO(group); - restProjectMockMvc.perform(post("/api/projects/{projectName}/groups", + var groupDto = groupMapper.groupToGroupDTO(group); + restGroupMockMvc.perform(post("/api/projects/{projectName}/groups", project.getProjectName()) .contentType(TestUtil.APPLICATION_JSON_UTF8) .content(TestUtil.convertObjectToJsonBytes(groupDto))) .andExpect(status().isCreated()); - restProjectMockMvc.perform(post("/api/projects/{projectName}/groups", + restGroupMockMvc.perform(post("/api/projects/{projectName}/groups", project.getProjectName()) .contentType(TestUtil.APPLICATION_JSON_UTF8) .content(TestUtil.convertObjectToJsonBytes(groupDto))) @@ -210,15 +210,15 @@ void createGroupWithExistingNameInDifferentProject() throws Exception { group2.setProject(project2); // Create the Group - GroupDTO groupDto = groupMapper.groupToGroupDTO(group); - restProjectMockMvc.perform(post("/api/projects/{projectName}/groups", + var groupDto = groupMapper.groupToGroupDTO(group); + restGroupMockMvc.perform(post("/api/projects/{projectName}/groups", project.getProjectName()) .contentType(TestUtil.APPLICATION_JSON_UTF8) .content(TestUtil.convertObjectToJsonBytes(groupDto))) .andExpect(status().isCreated()); - GroupDTO group2Dto = groupMapper.groupToGroupDTO(group2); - restProjectMockMvc.perform(post("/api/projects/{projectName}/groups", + var group2Dto = groupMapper.groupToGroupDTO(group2); + restGroupMockMvc.perform(post("/api/projects/{projectName}/groups", project2.getProjectName()) .contentType(TestUtil.APPLICATION_JSON_UTF8) .content(TestUtil.convertObjectToJsonBytes(group2Dto))) @@ -247,7 +247,7 @@ void checkGroupNameIsRequired() throws Exception { // Create the Group GroupDTO groupDto = groupMapper.groupToGroupDTO(group); - restProjectMockMvc.perform(post("/api/projects/{projectName}/groups", + restGroupMockMvc.perform(post("/api/projects/{projectName}/groups", project.getProjectName()) .contentType(TestUtil.APPLICATION_JSON_UTF8) .content(TestUtil.convertObjectToJsonBytes(groupDto))) @@ -260,7 +260,7 @@ void getAllGroups() throws Exception { groupRepository.saveAndFlush(group); // Get all the groups - restProjectMockMvc.perform(get("/api/projects/{projectName}/groups", + restGroupMockMvc.perform(get("/api/projects/{projectName}/groups", project.getProjectName())) .andExpect(status().isOk()) .andExpect(content().contentType(MediaType.APPLICATION_JSON)) @@ -275,7 +275,7 @@ void getGroup() throws Exception { groupRepository.saveAndFlush(group); // Get the Group - restProjectMockMvc.perform(get("/api/projects/{projectName}/groups/{groupName}", + restGroupMockMvc.perform(get("/api/projects/{projectName}/groups/{groupName}", project.getProjectName(), group.getName())) .andExpect(status().isOk()) .andExpect(content().contentType(MediaType.APPLICATION_JSON)) @@ -285,8 +285,8 @@ void getGroup() throws Exception { @Test void getNonExistingGroup() throws Exception { - // Get the group - restProjectMockMvc.perform(get("/api/projects/{projectName}/groups/{groupName}", + // Get the Group + restGroupMockMvc.perform(get("/api/projects/{projectName}/groups/{groupName}", project.getProjectName(), group.getName())) .andExpect(status().isNotFound()); } @@ -296,8 +296,8 @@ void deleteGroup() throws Exception { // Initialize the database groupRepository.saveAndFlush(group); - // Delete the group - restProjectMockMvc.perform(delete( + // Get the Group + restGroupMockMvc.perform(delete( "/api/projects/{projectName}/groups/{groupName}", project.getProjectName(), group.getName()) .accept(TestUtil.APPLICATION_JSON_UTF8)) @@ -325,14 +325,14 @@ void deleteGroupWithSubjects() throws Exception { var savedSubject = subjectService.createSubject(subjectDto); // Try to delete the Group (and fail) - restProjectMockMvc.perform(delete( + restGroupMockMvc.perform(delete( "/api/projects/{projectName}/groups/{groupName}", project.getProjectName(), group.getName()) .accept(TestUtil.APPLICATION_JSON_UTF8)) .andExpect(status().isConflict()); // Delete the Group (and unlink the subjects) - restProjectMockMvc.perform(delete( + restGroupMockMvc.perform(delete( "/api/projects/{projectName}/groups/{groupName}", project.getProjectName(), group.getName()) .param("unlinkSubjects", "true") @@ -353,8 +353,8 @@ void deleteGroupNonExisting() throws Exception { // Initialize the database groupRepository.saveAndFlush(group); - // Delete the group - restProjectMockMvc.perform(delete( + // Get the Group + restGroupMockMvc.perform(delete( "/api/projects/{projectName}/groups/{groupName}", project.getProjectName(), group.getName() + "2") .accept(TestUtil.APPLICATION_JSON_UTF8)) @@ -370,8 +370,8 @@ void deleteGroupNonExistingProject() throws Exception { // Initialize the database groupRepository.saveAndFlush(group); - // Delete the group - restProjectMockMvc.perform(delete( + // Get the Group + restGroupMockMvc.perform(delete( "/api/projects/{projectName}/groups/{groupName}", project.getProjectName() + "2", group.getName()) .accept(TestUtil.APPLICATION_JSON_UTF8)) @@ -386,20 +386,20 @@ void addSubjectsToGroup() throws Exception { // Initialize the database groupRepository.saveAndFlush(group); - ProjectDTO projectDto = projectMapper.projectToProjectDTO(project); + var projectDto = projectMapper.projectToProjectDTO(project); - SubjectDTO sub1 = new SubjectDTO(); + var sub1 = new SubjectDTO(); sub1.setExternalLink("exLink1"); sub1.setExternalId("exId1"); sub1.setStatus(ACTIVATED); sub1.setProject(projectDto); - SubjectDTO sub2 = new SubjectDTO(); + var sub2 = new SubjectDTO(); sub2.setExternalLink("exLink2"); sub2.setExternalId("exId2"); sub2.setStatus(ACTIVATED); sub2.setProject(projectDto); - + var savedSub1 = subjectService.createSubject(sub1); var savedSub2 = subjectService.createSubject(sub2); @@ -418,11 +418,11 @@ void addSubjectsToGroup() throws Exception { List body = new ArrayList<>(); body.add(patchOp); - // Link the subjects to the group - restProjectMockMvc.perform(patch( + // Get the Group + restGroupMockMvc.perform(patch( "/api/projects/{projectName}/groups/{groupName}/subjects", project.getProjectName(), group.getName()) - + .contentType(TestUtil.APPLICATION_JSON_PATCH) .content(TestUtil.convertObjectToJsonBytes(body))) .andExpect(status().isNoContent()); @@ -433,7 +433,7 @@ void addSubjectsToGroup() throws Exception { assertThat(subjects).hasSize(2); assertThat(subjects).allSatisfy( s -> assertThat(s.getGroup().getId()).isEqualTo(group.getId())); - + subjectRepository.deleteAll(subjects); } } diff --git a/src/test/java/org/radarbase/management/web/rest/OrganizationResourceIntTest.java b/src/test/java/org/radarbase/management/web/rest/OrganizationResourceIntTest.java new file mode 100644 index 000000000..454143870 --- /dev/null +++ b/src/test/java/org/radarbase/management/web/rest/OrganizationResourceIntTest.java @@ -0,0 +1,180 @@ +package org.radarbase.management.web.rest; + +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.mockito.MockitoAnnotations; +import org.radarbase.auth.authentication.OAuthHelper; +import org.radarbase.auth.token.RadarToken; +import org.radarbase.management.ManagementPortalTestApp; +import org.radarbase.management.domain.Organization; +import org.radarbase.management.repository.OrganizationRepository; +import org.radarbase.management.service.OrganizationService; +import org.radarbase.management.service.mapper.OrganizationMapper; +import org.radarbase.management.web.rest.errors.ExceptionTranslator; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.data.web.PageableHandlerMethodArgumentResolver; +import org.springframework.http.MediaType; +import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter; +import org.springframework.mock.web.MockFilterConfig; +import org.springframework.security.test.context.support.WithMockUser; +import org.springframework.test.context.junit.jupiter.SpringExtension; +import org.springframework.test.util.ReflectionTestUtils; +import org.springframework.test.web.servlet.MockMvc; +import org.springframework.test.web.servlet.setup.MockMvcBuilders; + +import javax.servlet.ServletException; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.hamcrest.Matchers.hasItem; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; + +/** + * Test class for the OrganizationResource REST controller. + * + * @see OrganizationResource + */ +@ExtendWith(SpringExtension.class) +@SpringBootTest(classes = ManagementPortalTestApp.class) +@WithMockUser +class OrganizationResourceIntTest { + + @Autowired + private OrganizationMapper organizationMapper; + + @Autowired + private OrganizationRepository organizationRepository; + + @Autowired + private OrganizationService organizationService; + + @Autowired + private MappingJackson2HttpMessageConverter jacksonMessageConverter; + + @Autowired + private PageableHandlerMethodArgumentResolver pageableArgumentResolver; + + @Autowired + private ExceptionTranslator exceptionTranslator; + + @Autowired + private RadarToken token; + + private MockMvc restOrganizationMockMvc; + + private Organization organization; + + @BeforeEach + public void setUp() throws ServletException { + MockitoAnnotations.initMocks(this); + var orgResource = new OrganizationResource(); + ReflectionTestUtils + .setField(orgResource, "organizationService", organizationService); + ReflectionTestUtils.setField(orgResource, "token", token); + + var filter = OAuthHelper.createAuthenticationFilter(); + filter.init(new MockFilterConfig()); + + this.restOrganizationMockMvc = MockMvcBuilders.standaloneSetup(orgResource) + .setCustomArgumentResolvers(pageableArgumentResolver) + .setControllerAdvice(exceptionTranslator) + .setMessageConverters(jacksonMessageConverter) + .addFilter(filter) + .defaultRequest(get("/").with(OAuthHelper.bearerToken())).build(); + organization = createEntity(); + } + + @AfterEach + public void tearDown() { + var testOrg = organizationRepository.findOneByName(organization.getName()); + testOrg.ifPresent(organizationRepository::delete); + } + + /** + * Create an entity for this test. + */ + private Organization createEntity() { + var org = new Organization(); + org.setName("org1"); + org.setDescription("Test Organization 1"); + org.setLocation("Somewhere"); + return org; + } + + @Test + void createOrganization() throws Exception { + var orgDto = organizationMapper.organizationToOrganizationDTO(organization); + restOrganizationMockMvc.perform(post("/api/organizations") + .contentType(TestUtil.APPLICATION_JSON_UTF8) + .content(TestUtil.convertObjectToJsonBytes(orgDto))) + .andExpect(status().isCreated()); + + // Validate the Organization in the database + var savedOrg = organizationRepository.findOneByName(orgDto.getName()); + assertThat(savedOrg).isNotEmpty(); + } + + @Test + void createOrganizationWithExistingName() throws Exception { + var orgDto = organizationMapper.organizationToOrganizationDTO(organization); + restOrganizationMockMvc.perform(post("/api/organizations") + .contentType(TestUtil.APPLICATION_JSON_UTF8) + .content(TestUtil.convertObjectToJsonBytes(orgDto))) + .andExpect(status().isCreated()); + + // Second request should fail + restOrganizationMockMvc.perform(post("/api/organizations") + .contentType(TestUtil.APPLICATION_JSON_UTF8) + .content(TestUtil.convertObjectToJsonBytes(orgDto))) + .andExpect(status().isConflict()); + } + + @Test + void checkGroupNameIsRequired() throws Exception { + var orgDto = organizationMapper.organizationToOrganizationDTO(organization); + orgDto.setName(null); + restOrganizationMockMvc.perform(post("/api/organizations") + .contentType(TestUtil.APPLICATION_JSON_UTF8) + .content(TestUtil.convertObjectToJsonBytes(orgDto))) + .andExpect(status().isBadRequest()); + } + + @Test + void getAllOrganizations() throws Exception { + // Initialize the database + organizationRepository.saveAndFlush(organization); + + // Get all the organizations + restOrganizationMockMvc.perform(get("/api/organizations")) + .andExpect(status().isOk()) + .andExpect(content().contentType(MediaType.APPLICATION_JSON)) + .andExpect(jsonPath("$.[*].name").value(hasItem("org1"))); + } + + @Test + void getOrganization() throws Exception { + // Initialize the database + organizationRepository.saveAndFlush(organization); + + // Get the organization + restOrganizationMockMvc.perform(get("/api/organizations/{name}", + organization.getName())) + .andExpect(status().isOk()) + .andExpect(content().contentType(MediaType.APPLICATION_JSON)) + .andExpect(jsonPath("$.name").value("org1")); + } + + @Test + void getNonExistingOrganization() throws Exception { + // Get the organization + restOrganizationMockMvc.perform(get("/api/organizations/{name}", + organization.getName())) + .andExpect(status().isNotFound()); + } +} From d10bd6f4f40bd4ba61ec6d5a96fd9f7fbb09b5a4 Mon Sep 17 00:00:00 2001 From: Peyman Mohtashami Date: Thu, 18 Nov 2021 10:13:44 +0100 Subject: [PATCH 197/431] Remove unused imports --- src/main/webapp/app/app.module.ts | 2 +- src/main/webapp/app/entities/project/project.route.ts | 2 +- .../app/entities/subject/general.subject-dialog.component.ts | 1 - src/main/webapp/app/shared/subject/subject.model.ts | 4 ++-- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/main/webapp/app/app.module.ts b/src/main/webapp/app/app.module.ts index 4ff07cf46..7edb4ff80 100644 --- a/src/main/webapp/app/app.module.ts +++ b/src/main/webapp/app/app.module.ts @@ -1,4 +1,4 @@ -import { Injector, NgModule } from '@angular/core'; +import { NgModule } from '@angular/core'; import { HttpClient, HttpClientModule, diff --git a/src/main/webapp/app/entities/project/project.route.ts b/src/main/webapp/app/entities/project/project.route.ts index 4d7a553bb..c4078589c 100644 --- a/src/main/webapp/app/entities/project/project.route.ts +++ b/src/main/webapp/app/entities/project/project.route.ts @@ -1,4 +1,4 @@ -import { Resolve, Routes } from '@angular/router'; +import { Routes } from '@angular/router'; import { UserRouteAccessService } from '../../shared'; import { PROJECT_ADMIN, SYSTEM_ADMIN } from '../../shared/constants/common.constants'; diff --git a/src/main/webapp/app/entities/subject/general.subject-dialog.component.ts b/src/main/webapp/app/entities/subject/general.subject-dialog.component.ts index a1a197ca6..7e8c0b71e 100644 --- a/src/main/webapp/app/entities/subject/general.subject-dialog.component.ts +++ b/src/main/webapp/app/entities/subject/general.subject-dialog.component.ts @@ -5,7 +5,6 @@ import { NgbActiveModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap'; import { AlertService } from '../../shared/util/alert.service'; import { EventManager } from '../../shared/util/event-manager.service'; -import { MinimalSource } from '../../shared/source'; import { Subject, SubjectService } from '../../shared/subject'; import { Project, ProjectService } from '../../shared'; diff --git a/src/main/webapp/app/shared/subject/subject.model.ts b/src/main/webapp/app/shared/subject/subject.model.ts index 21addff4a..be789b7e6 100644 --- a/src/main/webapp/app/shared/subject/subject.model.ts +++ b/src/main/webapp/app/shared/subject/subject.model.ts @@ -1,6 +1,6 @@ import { Role } from '../../admin/user-management/role.model'; -import { Project } from '../project/project.model'; -import { MinimalSource } from '../source/source.model'; +import { Project } from '../project'; +import { MinimalSource } from '../source'; import { NgbDateStruct } from "@ng-bootstrap/ng-bootstrap"; export interface Subject { From a108c567f0e84ec32fe2f203ab107a60cafcb3ed Mon Sep 17 00:00:00 2001 From: Joris Borgdorff Date: Thu, 18 Nov 2021 11:50:23 +0100 Subject: [PATCH 198/431] Refactor authorization to make it easier to include organizations --- radar-auth/build.gradle | 4 +- .../authorization/AuthoritiesConstants.java | 2 + .../auth/authorization/Permission.java | 152 ++++++------------ .../auth/authorization/Permissions.java | 138 ++++++++++------ .../authorization/RadarAuthorizationTest.java | 25 +-- .../radarbase/auth/util/TokenTestUtils.java | 6 +- .../ManagementPortalSecurityConfigLoader.java | 6 +- 7 files changed, 158 insertions(+), 175 deletions(-) diff --git a/radar-auth/build.gradle b/radar-auth/build.gradle index 147386835..3a3d60bca 100644 --- a/radar-auth/build.gradle +++ b/radar-auth/build.gradle @@ -14,8 +14,8 @@ ext { junitVersion ='5.6.3' } -sourceCompatibility = JavaVersion.VERSION_1_8 -targetCompatibility = JavaVersion.VERSION_1_8 +sourceCompatibility = JavaVersion.VERSION_11 +targetCompatibility = JavaVersion.VERSION_11 description = 'Library for authentication and authorization of JWT tokens issued by the RADAR platform' diff --git a/radar-auth/src/main/java/org/radarbase/auth/authorization/AuthoritiesConstants.java b/radar-auth/src/main/java/org/radarbase/auth/authorization/AuthoritiesConstants.java index 9b3cda745..98d26dd3f 100644 --- a/radar-auth/src/main/java/org/radarbase/auth/authorization/AuthoritiesConstants.java +++ b/radar-auth/src/main/java/org/radarbase/auth/authorization/AuthoritiesConstants.java @@ -6,6 +6,8 @@ public interface AuthoritiesConstants { String SYS_ADMIN = "ROLE_SYS_ADMIN"; + String ORGANIZATION_ADMIN = "ROLE_ORGANIZATION_ADMIN"; + String PROJECT_ADMIN = "ROLE_PROJECT_ADMIN"; String PROJECT_OWNER = "ROLE_PROJECT_OWNER"; diff --git a/radar-auth/src/main/java/org/radarbase/auth/authorization/Permission.java b/radar-auth/src/main/java/org/radarbase/auth/authorization/Permission.java index ba04fdad2..563af690b 100644 --- a/radar-auth/src/main/java/org/radarbase/auth/authorization/Permission.java +++ b/radar-auth/src/main/java/org/radarbase/auth/authorization/Permission.java @@ -3,17 +3,54 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.lang.reflect.Modifier; import java.util.Arrays; -import java.util.List; -import java.util.Objects; -import java.util.stream.Collectors; +import java.util.stream.Stream; /** * Class to represent the different permissions in the RADAR platform. A permission has an entity * and an operation. */ -public class Permission { +public enum Permission { + SOURCETYPE_CREATE(Entity.SOURCETYPE, Operation.CREATE), + SOURCETYPE_READ(Entity.SOURCETYPE, Operation.READ), + SOURCETYPE_UPDATE(Entity.SOURCETYPE, Operation.UPDATE), + SOURCETYPE_DELETE(Entity.SOURCETYPE, Operation.DELETE), + SOURCEDATA_CREATE(Entity.SOURCEDATA, Operation.CREATE), + SOURCEDATA_READ(Entity.SOURCEDATA, Operation.READ), + SOURCEDATA_UPDATE(Entity.SOURCEDATA, Operation.UPDATE), + SOURCEDATA_DELETE(Entity.SOURCEDATA, Operation.DELETE), + SOURCE_CREATE(Entity.SOURCE, Operation.CREATE), + SOURCE_READ(Entity.SOURCE, Operation.READ), + SOURCE_UPDATE(Entity.SOURCE, Operation.UPDATE), + SOURCE_DELETE(Entity.SOURCE, Operation.DELETE), + SUBJECT_CREATE(Entity.SUBJECT, Operation.CREATE), + SUBJECT_READ(Entity.SUBJECT, Operation.READ), + SUBJECT_UPDATE(Entity.SUBJECT, Operation.UPDATE), + SUBJECT_DELETE(Entity.SUBJECT, Operation.DELETE), + USER_CREATE(Entity.USER, Operation.CREATE), + USER_READ(Entity.USER, Operation.READ), + USER_UPDATE(Entity.USER, Operation.UPDATE), + USER_DELETE(Entity.USER, Operation.DELETE), + ROLE_CREATE(Entity.ROLE, Operation.CREATE), + ROLE_READ(Entity.ROLE, Operation.READ), + ROLE_UPDATE(Entity.ROLE, Operation.UPDATE), + ROLE_DELETE(Entity.ROLE, Operation.DELETE), + PROJECT_CREATE(Entity.PROJECT, Operation.CREATE), + PROJECT_READ(Entity.PROJECT, Operation.READ), + PROJECT_UPDATE(Entity.PROJECT, Operation.UPDATE), + PROJECT_DELETE(Entity.PROJECT, Operation.DELETE), + ORGANIZATION_CREATE(Entity.ORGANIZATION, Operation.CREATE), + ORGANIZATION_READ(Entity.ORGANIZATION, Operation.READ), + ORGANIZATION_UPDATE(Entity.ORGANIZATION, Operation.UPDATE), + ORGANIZATION_DELETE(Entity.ORGANIZATION, Operation.DELETE), + OAUTHCLIENTS_CREATE(Entity.OAUTHCLIENTS, Operation.CREATE), + OAUTHCLIENTS_READ(Entity.OAUTHCLIENTS, Operation.READ), + OAUTHCLIENTS_UPDATE(Entity.OAUTHCLIENTS, Operation.UPDATE), + OAUTHCLIENTS_DELETE(Entity.OAUTHCLIENTS, Operation.DELETE), + AUDIT_READ(Entity.AUDIT, Operation.READ), + AUTHORITY_READ(Entity.AUTHORITY, Operation.READ), + MEASUREMENT_READ(Entity.MEASUREMENT, Operation.READ), + MEASUREMENT_CREATE(Entity.MEASUREMENT, Operation.CREATE); private static final Logger log = LoggerFactory.getLogger(Permission.class); @@ -25,6 +62,7 @@ public enum Entity { SUBJECT, USER, ROLE, + ORGANIZATION, PROJECT, OAUTHCLIENTS, AUDIT, @@ -41,64 +79,6 @@ public enum Operation { DELETE } - public static final Permission SOURCETYPE_CREATE = - new Permission(Entity.SOURCETYPE, Operation.CREATE); - public static final Permission SOURCETYPE_READ = - new Permission(Entity.SOURCETYPE, Operation.READ); - public static final Permission SOURCETYPE_UPDATE = - new Permission(Entity.SOURCETYPE, Operation.UPDATE); - public static final Permission SOURCETYPE_DELETE = - new Permission(Entity.SOURCETYPE, Operation.DELETE); - public static final Permission SOURCEDATA_CREATE = - new Permission(Entity.SOURCEDATA, Operation.CREATE); - public static final Permission SOURCEDATA_READ = - new Permission(Entity.SOURCEDATA, Operation.READ); - public static final Permission SOURCEDATA_UPDATE = - new Permission(Entity.SOURCEDATA, Operation.UPDATE); - public static final Permission SOURCEDATA_DELETE = - new Permission(Entity.SOURCEDATA, Operation.DELETE); - public static final Permission SOURCE_CREATE = new Permission(Entity.SOURCE, Operation.CREATE); - public static final Permission SOURCE_READ = new Permission(Entity.SOURCE, Operation.READ); - public static final Permission SOURCE_UPDATE = new Permission(Entity.SOURCE, Operation.UPDATE); - public static final Permission SOURCE_DELETE = new Permission(Entity.SOURCE, Operation.DELETE); - public static final Permission SUBJECT_CREATE = - new Permission(Entity.SUBJECT, Operation.CREATE); - public static final Permission SUBJECT_READ = new Permission(Entity.SUBJECT, Operation.READ); - public static final Permission SUBJECT_UPDATE = - new Permission(Entity.SUBJECT, Operation.UPDATE); - public static final Permission SUBJECT_DELETE = - new Permission(Entity.SUBJECT, Operation.DELETE); - public static final Permission USER_CREATE = new Permission(Entity.USER, Operation.CREATE); - public static final Permission USER_READ = new Permission(Entity.USER, Operation.READ); - public static final Permission USER_UPDATE = new Permission(Entity.USER, Operation.UPDATE); - public static final Permission USER_DELETE = new Permission(Entity.USER, Operation.DELETE); - public static final Permission ROLE_CREATE = new Permission(Entity.ROLE, Operation.CREATE); - public static final Permission ROLE_READ = new Permission(Entity.ROLE, Operation.READ); - public static final Permission ROLE_UPDATE = new Permission(Entity.ROLE, Operation.UPDATE); - public static final Permission ROLE_DELETE = new Permission(Entity.ROLE, Operation.DELETE); - public static final Permission PROJECT_CREATE = new - Permission(Entity.PROJECT, Operation.CREATE); - public static final Permission PROJECT_READ = new Permission(Entity.PROJECT, Operation.READ); - public static final Permission PROJECT_UPDATE = - new Permission(Entity.PROJECT, Operation.UPDATE); - public static final Permission PROJECT_DELETE = - new Permission(Entity.PROJECT, Operation.DELETE); - public static final Permission OAUTHCLIENTS_CREATE = - new Permission(Entity.OAUTHCLIENTS, Operation.CREATE); - public static final Permission OAUTHCLIENTS_READ = - new Permission(Entity.OAUTHCLIENTS, Operation.READ); - public static final Permission OAUTHCLIENTS_UPDATE = - new Permission(Entity.OAUTHCLIENTS, Operation.UPDATE); - public static final Permission OAUTHCLIENTS_DELETE = - new Permission(Entity.OAUTHCLIENTS, Operation.DELETE); - public static final Permission AUDIT_READ = new Permission(Entity.AUDIT, Operation.READ); - public static final Permission AUTHORITY_READ = - new Permission(Entity.AUTHORITY, Operation.READ); - public static final Permission MEASUREMENT_READ = - new Permission(Entity.MEASUREMENT, Operation.READ); - public static final Permission MEASUREMENT_CREATE = - new Permission(Entity.MEASUREMENT, Operation.CREATE); - private final Entity entity; private final Operation operation; @@ -108,7 +88,7 @@ public enum Operation { * @param entity the entity that the permission refers to. * @param operation the operation on given entity that requires a permission. */ - public Permission(Entity entity, Operation operation) { + Permission(Entity entity, Operation operation) { if (entity == null || operation == null) { throw new IllegalArgumentException("Entity and operation can not be null"); } @@ -133,51 +113,15 @@ public boolean isAuthorityAllowed(String authority) { return Permissions.allowedAuthorities(this).contains(authority); } - /** - * Get all currently defined permissions. - * @return A list containing all currently defined permissions - */ - public static List allPermissions() { - return Arrays.stream(Permission.class.getDeclaredFields()) // get declared fields - .filter(f -> Modifier.isStatic(f.getModifiers()) // that are static - && f.getType() == Permission.class) // and of type Permission - .map(f -> { - try { - return (Permission) f.get(null); - } catch (IllegalAccessException ex) { - log.error("Could not get permissions through reflection. Fieldname: {}", - f.getName()); - return null; - } - }) - .filter(Objects::nonNull) - .collect(Collectors.toList()); - } - - @Override - public boolean equals(Object other) { - if (this == other) { - return true; - } - if (other == null || getClass() != other.getClass()) { - return false; - } - - Permission that = (Permission) other; - - return entity == that.entity && operation == that.operation; - } - - @Override - public int hashCode() { - return Objects.hash(entity, operation); - } - @Override public String toString() { return "Permission{entity=" + entity + ", operation=" + operation + '}'; } + public static Stream stream() { + return Arrays.stream(values()); + } + /** * Turn this permission into an OAuth scope name and return it. * diff --git a/radar-auth/src/main/java/org/radarbase/auth/authorization/Permissions.java b/radar-auth/src/main/java/org/radarbase/auth/authorization/Permissions.java index 643d9fb3b..7996870a1 100644 --- a/radar-auth/src/main/java/org/radarbase/auth/authorization/Permissions.java +++ b/radar-auth/src/main/java/org/radarbase/auth/authorization/Permissions.java @@ -1,12 +1,20 @@ package org.radarbase.auth.authorization; +import java.util.AbstractMap; import java.util.Arrays; import java.util.Collections; +import java.util.EnumMap; import java.util.HashMap; -import java.util.HashSet; import java.util.Map; import java.util.Set; - +import java.util.function.Predicate; +import java.util.stream.Stream; + +import static java.util.stream.Collectors.groupingBy; +import static java.util.stream.Collectors.mapping; +import static java.util.stream.Collectors.toUnmodifiableSet; +import static org.radarbase.auth.authorization.AuthoritiesConstants.INACTIVE_PARTICIPANT; +import static org.radarbase.auth.authorization.AuthoritiesConstants.ORGANIZATION_ADMIN; import static org.radarbase.auth.authorization.AuthoritiesConstants.PARTICIPANT; import static org.radarbase.auth.authorization.AuthoritiesConstants.PROJECT_ADMIN; import static org.radarbase.auth.authorization.AuthoritiesConstants.PROJECT_AFFILIATE; @@ -19,10 +27,10 @@ */ public final class Permissions { - private static final Map> PERMISSION_MATRIX = new HashMap<>(); + private static final Map> PERMISSION_MATRIX; static { - initPermissions(); + PERMISSION_MATRIX = createPermissions(); } private Permissions() { @@ -36,11 +44,7 @@ private Permissions() { * @return An unmodifiable view of the set of allowed authorities. */ public static Set allowedAuthorities(Permission permission) { - if (PERMISSION_MATRIX.containsKey(permission)) { - return Collections.unmodifiableSet(PERMISSION_MATRIX.get(permission)); - } else { - return Collections.emptySet(); - } + return PERMISSION_MATRIX.getOrDefault(permission, Set.of()); } /** @@ -51,76 +55,106 @@ public static Set allowedAuthorities(Permission permission) { * @return An unmodifiable view of the permission matrix. */ public static Map> getPermissionMatrix() { - return Collections.unmodifiableMap(PERMISSION_MATRIX); + return PERMISSION_MATRIX; } /** * Static permission matrix based on the currently agreed upon security rules. */ - private static void initPermissions() { - Permission.allPermissions().forEach(p -> PERMISSION_MATRIX.put(p, new HashSet<>())); + private static Map> createPermissions() { + Map> rolePermissions = new HashMap<>(); + + // System admin can do everything. + rolePermissions.put(SYS_ADMIN, Permission.stream()); - /* System Administrator - has all currently defined permissions */ - PERMISSION_MATRIX.values().forEach(s -> s.add(SYS_ADMIN)); + // Organization admin can do most things, but not view subjects or measurements + rolePermissions.put(ORGANIZATION_ADMIN, Permission.stream() + .filter(excludePermissions(Permission.ORGANIZATION_CREATE)) + .filter(excludeEntities(Permission.Entity.SUBJECT, Permission.Entity.MEASUREMENT))); // for all authorities except for SYS_ADMIN, the authority is scoped to a project, which // is checked elsewhere // Project Admin - has all currently defined permissions except creating new projects // Note: from radar-auth:0.5.7 we allow PROJECT_ADMIN to create measurements. // This can be done by uploading data through the web application. - PERMISSION_MATRIX.entrySet().stream() - .filter(e -> e.getKey() != Permission.PROJECT_CREATE) - .forEach(e -> e.getValue().add(PROJECT_ADMIN)); + rolePermissions.put(PROJECT_ADMIN, Permission.stream() + .filter(excludeEntities( + Permission.Entity.AUDIT, + Permission.Entity.AUTHORITY)) + .filter(excludeOtherEntityOperations( + Permission.Entity.ORGANIZATION, Permission.Operation.READ)) + .filter(excludePermissions(Permission.PROJECT_CREATE))); /* Project Owner */ // CRUD operations on subjects to allow enrollment - PERMISSION_MATRIX.entrySet().stream() - .filter(e -> e.getKey().getEntity() == Permission.Entity.SUBJECT) - .forEach(e -> e.getValue().add(PROJECT_OWNER)); - - // can also read all other things except users, audits and authorities - PERMISSION_MATRIX.entrySet().stream() - .filter(e -> !Arrays.asList(Permission.Entity.AUDIT, Permission.Entity.AUTHORITY, - Permission.Entity.USER) - .contains(e.getKey().getEntity())) - .filter(e -> e.getKey().getOperation() == Permission.Operation.READ) - .forEach(e -> e.getValue().add(PROJECT_OWNER)); + rolePermissions.put(PROJECT_OWNER, Permission.stream() + .filter(excludeEntities( + Permission.Entity.AUDIT, + Permission.Entity.AUTHORITY, + Permission.Entity.USER)) + .filter(excludeOtherEntityOperations( + Permission.Entity.ORGANIZATION, Permission.Operation.READ)) + .filter(excludePermissions(Permission.PROJECT_CREATE))); /* Project affiliate */ // Create, read and update participant (no delete) - PERMISSION_MATRIX.entrySet().stream() - .filter(e -> e.getKey().getEntity() == Permission.Entity.SUBJECT) - .filter(e -> e.getKey().getOperation() != Permission.Operation.DELETE) - .forEach(e -> e.getValue().add(PROJECT_AFFILIATE)); - - // can also read all other things except users, audits and authorities - PERMISSION_MATRIX.entrySet().stream() - .filter(e -> !Arrays.asList(Permission.Entity.AUDIT, Permission.Entity.AUTHORITY, - Permission.Entity.USER) - .contains(e.getKey().getEntity())) - .filter(e -> e.getKey().getOperation() == Permission.Operation.READ) - .forEach(e -> e.getValue().add(PROJECT_AFFILIATE)); + rolePermissions.put(PROJECT_AFFILIATE, Permission.stream() + .filter(excludeEntities( + Permission.Entity.AUDIT, + Permission.Entity.AUTHORITY, + Permission.Entity.USER)) + .filter(excludeOtherEntityOperations( + Permission.Entity.ORGANIZATION, Permission.Operation.READ)) + .filter(excludeOtherEntityOperations( + Permission.Entity.PROJECT, Permission.Operation.READ)) + .filter(excludePermissions( + Permission.SUBJECT_DELETE))); /* Project analyst */ // Can read everything except users, authorities and audits - PERMISSION_MATRIX.entrySet().stream() - .filter(e -> !Arrays.asList(Permission.Entity.AUDIT, Permission.Entity.AUTHORITY, - Permission.Entity.USER) - .contains(e.getKey().getEntity())) - .filter(e -> e.getKey().getOperation() == Permission.Operation.READ) - .forEach(e -> e.getValue().add(PROJECT_ANALYST)); - - // Can add metadata to sources - PERMISSION_MATRIX.get(Permission.SOURCE_UPDATE).add(PROJECT_ANALYST); + rolePermissions.put(PROJECT_ANALYST, Permission.stream() + .filter(excludeEntities( + Permission.Entity.AUDIT, + Permission.Entity.AUTHORITY, + Permission.Entity.USER)) + // Can add metadata to sources, only read other things. + .filter(p -> p.getOperation() == Permission.Operation.READ + || p == Permission.SUBJECT_UPDATE)); /* Participant */ // Can update and read own data and can read and write own measurements - Arrays.asList(Permission.SUBJECT_READ, Permission.SUBJECT_UPDATE, - Permission.MEASUREMENT_CREATE, Permission.MEASUREMENT_READ) - .forEach(p -> PERMISSION_MATRIX.get(p).add(PARTICIPANT)); + rolePermissions.put(PARTICIPANT, Stream.of( + Permission.SUBJECT_READ, + Permission.SUBJECT_UPDATE, + Permission.MEASUREMENT_CREATE, + Permission.MEASUREMENT_READ)); /* Inactive participant */ // Doesn't have any permissions + rolePermissions.put(INACTIVE_PARTICIPANT, Stream.empty()); + + // invert map + return Collections.unmodifiableMap( + rolePermissions.entrySet().stream() + .flatMap(rolePerm -> rolePerm.getValue() + .map(p -> Map.entry(p, rolePerm.getKey()))) + .collect(groupingBy( + Map.Entry::getKey, + () -> new EnumMap<>(Permission.class), + mapping(Map.Entry::getValue, toUnmodifiableSet())))); + } + + private static Predicate excludeOtherEntityOperations( + Permission.Entity entity, + Permission.Operation... operations) { + return p -> p.getEntity() != entity || Arrays.asList(operations).contains(p.getOperation()); + } + + private static Predicate excludePermissions(Permission... permissions) { + return p -> !Arrays.asList(permissions).contains(p); + } + private static Predicate excludeEntities(Permission.Entity... entities) { + return p -> !Arrays.asList(entities).contains(p.getEntity()); } } diff --git a/radar-auth/src/test/java/org/radarbase/auth/authorization/RadarAuthorizationTest.java b/radar-auth/src/test/java/org/radarbase/auth/authorization/RadarAuthorizationTest.java index 97d7aad12..3ee20b2bf 100644 --- a/radar-auth/src/test/java/org/radarbase/auth/authorization/RadarAuthorizationTest.java +++ b/radar-auth/src/test/java/org/radarbase/auth/authorization/RadarAuthorizationTest.java @@ -7,8 +7,13 @@ import java.security.GeneralSecurityException; import java.util.Arrays; import java.util.Collection; +import java.util.Collections; +import java.util.HashSet; +import java.util.List; +import java.util.Map; import java.util.Map.Entry; import java.util.Set; +import java.util.function.Function; import java.util.stream.Collectors; import org.junit.jupiter.api.Test; import org.radarbase.auth.authorization.Permission.Entity; @@ -47,7 +52,7 @@ void testCheckPermissionOnProject() throws NotAuthorizedException { @Test void testCheckPermission() throws NotAuthorizedException { RadarToken token = new JwtRadarToken(TokenTestUtils.SUPER_USER_TOKEN); - for (Permission p : Permission.allPermissions()) { + for (Permission p : Permission.values()) { RadarAuthorization.checkPermission(token, p); } } @@ -71,7 +76,7 @@ void testCheckPermissionOnOtherSubject() { // this token is participant in PROJECT2 RadarToken token = new JwtRadarToken(TokenTestUtils.PROJECT_ADMIN_TOKEN); String other = "other-subject"; - Permission.allPermissions() + Permission.stream() .forEach(p -> assertNotAuthorized( () -> RadarAuthorization.checkPermissionOnSubject(token, p, project, other), "Token should not have permission " + p + " on another subject")); @@ -84,7 +89,7 @@ void testCheckPermissionOnSubject() throws NotAuthorizedException { // this token is participant in PROJECT2 RadarToken token = new JwtRadarToken(TokenTestUtils.PROJECT_ADMIN_TOKEN); String subject = "some-subject"; - Set permissions = Permission.allPermissions().stream() + Set permissions = Permission.stream() .filter(p -> p.getEntity() == Permission.Entity.SUBJECT) .collect(Collectors.toSet()); for (Permission p : permissions) { @@ -97,7 +102,7 @@ void testMultipleRolesInProjectToken() throws NotAuthorizedException { String project = "PROJECT2"; RadarToken token = new JwtRadarToken(TokenTestUtils.MULTIPLE_ROLES_IN_PROJECT_TOKEN); String subject = "some-subject"; - Set permissions = Permission.allPermissions().stream() + Set permissions = Permission.stream() .filter(p -> p.getEntity() == Permission.Entity.SUBJECT) .collect(Collectors.toSet()); for (Permission p : permissions) { @@ -113,7 +118,7 @@ void testCheckPermissionOnSource() { String subject = "some-subject"; String source = "source-1"; - Permission.allPermissions() + Permission.stream() .forEach(p -> assertNotAuthorized( () -> RadarAuthorization.checkPermissionOnSource( token, p, project, subject, source), @@ -128,7 +133,7 @@ void testCheckPermissionOnOwnSource() throws NotAuthorizedException { String subject = token.getSubject(); String source = "source-1"; // source to use - Set permissions = Permission.allPermissions().stream() + Set permissions = Permission.stream() .filter(p -> p.getEntity() == Entity.MEASUREMENT) .collect(Collectors.toSet()); @@ -153,25 +158,25 @@ void testScopeOnlyToken() throws NotAuthorizedException { } // test we can do nothing else, for each of the checkPermission methods - Permission.allPermissions().stream() + Permission.stream() .filter(p -> !scope.contains(p)) .forEach(p -> assertNotAuthorized( () -> RadarAuthorization.checkPermission(token, p), "Permission " + p + " is granted but not in scope.")); - Permission.allPermissions().stream() + Permission.stream() .filter(p -> !scope.contains(p)) .forEach(p -> assertNotAuthorized( () -> RadarAuthorization.checkPermissionOnProject(token, p, ""), "Permission " + p + " is granted but not in scope.")); - Permission.allPermissions().stream() + Permission.stream() .filter(p -> !scope.contains(p)) .forEach(p -> assertNotAuthorized( () -> RadarAuthorization.checkPermissionOnSubject(token, p, "", ""), "Permission " + p + " is granted but not in scope.")); - Permission.allPermissions().stream() + Permission.stream() .filter(p -> !scope.contains(p)) .forEach(p -> assertNotAuthorized( () -> RadarAuthorization.checkPermissionOnSource(token, p, "", "", ""), diff --git a/radar-auth/src/test/java/org/radarbase/auth/util/TokenTestUtils.java b/radar-auth/src/test/java/org/radarbase/auth/util/TokenTestUtils.java index 6c855d1de..445d36842 100644 --- a/radar-auth/src/test/java/org/radarbase/auth/util/TokenTestUtils.java +++ b/radar-auth/src/test/java/org/radarbase/auth/util/TokenTestUtils.java @@ -8,6 +8,7 @@ import java.security.interfaces.RSAPrivateKey; import java.security.interfaces.RSAPublicKey; import java.time.Instant; +import java.util.Arrays; import java.util.Base64; import java.util.Date; import java.util.stream.Collectors; @@ -246,9 +247,8 @@ private static DecodedJWT initTokenWithScopes(Algorithm algorithm, Instant exp, } private static String[] allScopes() { - return Permission.allPermissions().stream() + return Permission.stream() .map(Permission::scopeName) - .collect(Collectors.toList()) - .toArray(new String[Permission.allPermissions().size()]); + .toArray(String[]::new); } } diff --git a/src/main/java/org/radarbase/management/config/ManagementPortalSecurityConfigLoader.java b/src/main/java/org/radarbase/management/config/ManagementPortalSecurityConfigLoader.java index acdf4ff79..b30f37a72 100644 --- a/src/main/java/org/radarbase/management/config/ManagementPortalSecurityConfigLoader.java +++ b/src/main/java/org/radarbase/management/config/ManagementPortalSecurityConfigLoader.java @@ -88,10 +88,8 @@ public void loadFrontendOauthClient() { details.setAuthorizedGrantTypes(Arrays.asList("password", "refresh_token", "authorization_code")); details.setAdditionalInformation(Collections.singletonMap("protected", Boolean.TRUE)); - List allScopes = Arrays.stream(Permission.Entity.values()) - .map(Permission.Entity::name) - .flatMap(e -> Arrays.stream(Permission.Operation.values()) - .map(o -> String.join(".", e, o.name()))) + List allScopes = Permission.stream() + .map(Permission::scopeName) .collect(Collectors.toList()); details.setScope(allScopes); details.setAutoApproveScopes(allScopes); From 238357ca40ee83f4215ba3427120ed5c3d882364 Mon Sep 17 00:00:00 2001 From: Joris Borgdorff Date: Thu, 18 Nov 2021 11:57:12 +0100 Subject: [PATCH 199/431] Style fixes --- .../auth/authorization/Permissions.java | 1 - .../authorization/RadarAuthorizationTest.java | 24 ++++++++----------- .../radarbase/auth/util/TokenTestUtils.java | 14 +++++------ .../auth/authentication/OAuthHelper.java | 5 ++-- 4 files changed, 18 insertions(+), 26 deletions(-) diff --git a/radar-auth/src/main/java/org/radarbase/auth/authorization/Permissions.java b/radar-auth/src/main/java/org/radarbase/auth/authorization/Permissions.java index 7996870a1..525f50174 100644 --- a/radar-auth/src/main/java/org/radarbase/auth/authorization/Permissions.java +++ b/radar-auth/src/main/java/org/radarbase/auth/authorization/Permissions.java @@ -1,6 +1,5 @@ package org.radarbase.auth.authorization; -import java.util.AbstractMap; import java.util.Arrays; import java.util.Collections; import java.util.EnumMap; diff --git a/radar-auth/src/test/java/org/radarbase/auth/authorization/RadarAuthorizationTest.java b/radar-auth/src/test/java/org/radarbase/auth/authorization/RadarAuthorizationTest.java index 3ee20b2bf..b4710503e 100644 --- a/radar-auth/src/test/java/org/radarbase/auth/authorization/RadarAuthorizationTest.java +++ b/radar-auth/src/test/java/org/radarbase/auth/authorization/RadarAuthorizationTest.java @@ -1,26 +1,22 @@ package org.radarbase.auth.authorization; -import static org.hamcrest.CoreMatchers.instanceOf; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.jupiter.api.Assertions.fail; +import org.junit.jupiter.api.Test; +import org.radarbase.auth.authorization.Permission.Entity; +import org.radarbase.auth.exception.NotAuthorizedException; +import org.radarbase.auth.token.JwtRadarToken; +import org.radarbase.auth.token.RadarToken; +import org.radarbase.auth.util.TokenTestUtils; import java.security.GeneralSecurityException; import java.util.Arrays; import java.util.Collection; -import java.util.Collections; -import java.util.HashSet; -import java.util.List; -import java.util.Map; import java.util.Map.Entry; import java.util.Set; -import java.util.function.Function; import java.util.stream.Collectors; -import org.junit.jupiter.api.Test; -import org.radarbase.auth.authorization.Permission.Entity; -import org.radarbase.auth.exception.NotAuthorizedException; -import org.radarbase.auth.token.JwtRadarToken; -import org.radarbase.auth.token.RadarToken; -import org.radarbase.auth.util.TokenTestUtils; + +import static org.hamcrest.CoreMatchers.instanceOf; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.junit.jupiter.api.Assertions.fail; /** * Created by dverbeec on 25/09/2017. diff --git a/radar-auth/src/test/java/org/radarbase/auth/util/TokenTestUtils.java b/radar-auth/src/test/java/org/radarbase/auth/util/TokenTestUtils.java index 445d36842..6cf521b98 100644 --- a/radar-auth/src/test/java/org/radarbase/auth/util/TokenTestUtils.java +++ b/radar-auth/src/test/java/org/radarbase/auth/util/TokenTestUtils.java @@ -1,5 +1,11 @@ package org.radarbase.auth.util; +import com.auth0.jwt.JWT; +import com.auth0.jwt.algorithms.Algorithm; +import com.auth0.jwt.interfaces.DecodedJWT; +import com.auth0.jwt.interfaces.RSAKeyProvider; +import org.radarbase.auth.authorization.Permission; + import java.io.IOException; import java.io.InputStream; import java.security.GeneralSecurityException; @@ -8,16 +14,8 @@ import java.security.interfaces.RSAPrivateKey; import java.security.interfaces.RSAPublicKey; import java.time.Instant; -import java.util.Arrays; import java.util.Base64; import java.util.Date; -import java.util.stream.Collectors; - -import com.auth0.jwt.JWT; -import com.auth0.jwt.algorithms.Algorithm; -import com.auth0.jwt.interfaces.DecodedJWT; -import com.auth0.jwt.interfaces.RSAKeyProvider; -import org.radarbase.auth.authorization.Permission; /** * Sets up a keypair for signing the tokens, initialize all kinds of different tokens for tests. diff --git a/src/test/java/org/radarbase/auth/authentication/OAuthHelper.java b/src/test/java/org/radarbase/auth/authentication/OAuthHelper.java index ced135a5a..d77073be7 100644 --- a/src/test/java/org/radarbase/auth/authentication/OAuthHelper.java +++ b/src/test/java/org/radarbase/auth/authentication/OAuthHelper.java @@ -185,9 +185,8 @@ private static String createValidToken(Algorithm algorithm) { } private static String[] allScopes() { - return Permission.allPermissions().stream() + return Permission.stream() .map(Permission::scopeName) - .collect(Collectors.toList()).toArray( - new String[Permission.allPermissions().size()]); + .toArray(String[]::new); } } From 7759f76ee5f28cc0205a6dc95159a962d850d614 Mon Sep 17 00:00:00 2001 From: Joris Borgdorff Date: Thu, 18 Nov 2021 12:04:14 +0100 Subject: [PATCH 200/431] Simplify getting all scopes --- .../org/radarbase/auth/authorization/Permission.java | 10 ++++++++++ .../java/org/radarbase/auth/util/TokenTestUtils.java | 8 +------- .../config/ManagementPortalSecurityConfigLoader.java | 5 +---- .../org/radarbase/auth/authentication/OAuthHelper.java | 8 +------- 4 files changed, 13 insertions(+), 18 deletions(-) diff --git a/radar-auth/src/main/java/org/radarbase/auth/authorization/Permission.java b/radar-auth/src/main/java/org/radarbase/auth/authorization/Permission.java index 563af690b..50d97f66c 100644 --- a/radar-auth/src/main/java/org/radarbase/auth/authorization/Permission.java +++ b/radar-auth/src/main/java/org/radarbase/auth/authorization/Permission.java @@ -118,10 +118,20 @@ public String toString() { return "Permission{entity=" + entity + ", operation=" + operation + '}'; } + /** + * Stream all available permissions. + */ public static Stream stream() { return Arrays.stream(values()); } + /** Returns all available scope names. */ + public static String[] scopes() { + return stream() + .map(Permission::scopeName) + .toArray(String[]::new); + } + /** * Turn this permission into an OAuth scope name and return it. * diff --git a/radar-auth/src/test/java/org/radarbase/auth/util/TokenTestUtils.java b/radar-auth/src/test/java/org/radarbase/auth/util/TokenTestUtils.java index 6cf521b98..da88ee2f6 100644 --- a/radar-auth/src/test/java/org/radarbase/auth/util/TokenTestUtils.java +++ b/radar-auth/src/test/java/org/radarbase/auth/util/TokenTestUtils.java @@ -33,7 +33,7 @@ public final class TokenTestUtils { public static final DecodedJWT MULTIPLE_ROLES_IN_PROJECT_TOKEN; public static final String[] AUTHORITIES = {"ROLE_SYS_ADMIN", "ROLE_USER"}; - public static final String[] ALL_SCOPES = allScopes(); + public static final String[] ALL_SCOPES = Permission.scopes(); public static final String[] ROLES = {"PROJECT1:ROLE_PROJECT_ADMIN", "PROJECT2:ROLE_PARTICIPANT"}; public static final String[] SOURCES = {}; @@ -243,10 +243,4 @@ private static DecodedJWT initTokenWithScopes(Algorithm algorithm, Instant exp, .sign(algorithm); return JWT.decode(token); } - - private static String[] allScopes() { - return Permission.stream() - .map(Permission::scopeName) - .toArray(String[]::new); - } } diff --git a/src/main/java/org/radarbase/management/config/ManagementPortalSecurityConfigLoader.java b/src/main/java/org/radarbase/management/config/ManagementPortalSecurityConfigLoader.java index b30f37a72..90a6096e3 100644 --- a/src/main/java/org/radarbase/management/config/ManagementPortalSecurityConfigLoader.java +++ b/src/main/java/org/radarbase/management/config/ManagementPortalSecurityConfigLoader.java @@ -11,7 +11,6 @@ import java.util.List; import java.util.Map; import java.util.Objects; -import java.util.stream.Collectors; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonSetter; @@ -88,9 +87,7 @@ public void loadFrontendOauthClient() { details.setAuthorizedGrantTypes(Arrays.asList("password", "refresh_token", "authorization_code")); details.setAdditionalInformation(Collections.singletonMap("protected", Boolean.TRUE)); - List allScopes = Permission.stream() - .map(Permission::scopeName) - .collect(Collectors.toList()); + List allScopes = Arrays.asList(Permission.scopes()); details.setScope(allScopes); details.setAutoApproveScopes(allScopes); loadOAuthClient(details); diff --git a/src/test/java/org/radarbase/auth/authentication/OAuthHelper.java b/src/test/java/org/radarbase/auth/authentication/OAuthHelper.java index d77073be7..f260fe5b2 100644 --- a/src/test/java/org/radarbase/auth/authentication/OAuthHelper.java +++ b/src/test/java/org/radarbase/auth/authentication/OAuthHelper.java @@ -38,7 +38,7 @@ public final class OAuthHelper { public static final String TEST_KEYSTORE_PASSWORD = "radarbase"; public static final String TEST_SIGNKEY_ALIAS = "radarbase-managementportal-ec"; public static final String TEST_CHECKKEY_ALIAS = "radarbase-managementportal-rsa"; - public static final String[] SCOPES = allScopes(); + public static final String[] SCOPES = Permission.scopes(); public static final String[] AUTHORITIES = {"ROLE_SYS_ADMIN"}; public static final String[] ROLES = {}; public static final String[] SOURCES = {}; @@ -183,10 +183,4 @@ private static String createValidToken(Algorithm algorithm) { .withClaim("grant_type", "password") .sign(algorithm); } - - private static String[] allScopes() { - return Permission.stream() - .map(Permission::scopeName) - .toArray(String[]::new); - } } From 103f9173798e83ade92a34102bf9b6ab86b87488 Mon Sep 17 00:00:00 2001 From: Joris Borgdorff Date: Thu, 18 Nov 2021 12:07:22 +0100 Subject: [PATCH 201/431] Update src/main/webapp/i18n/nl/subject.json Co-authored-by: aykl --- src/main/webapp/i18n/nl/subject.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/webapp/i18n/nl/subject.json b/src/main/webapp/i18n/nl/subject.json index 22982f8da..9a361674a 100644 --- a/src/main/webapp/i18n/nl/subject.json +++ b/src/main/webapp/i18n/nl/subject.json @@ -26,7 +26,7 @@ "advancedFilter": "Uitgebreid filter", "error": { "invalidDate": "De datum is niet geldig.", - "invalidRange": "De periode is is niet geldig: Vanaf datum is na de Tot en met datum." + "invalidRange": "De periode is niet geldig: Vanaf datum is na de Tot en met datum." } }, "login": "Login", From 9850f2e2dd07fa96b80d595da5936f140b653ddd Mon Sep 17 00:00:00 2001 From: Joris Borgdorff Date: Thu, 18 Nov 2021 12:10:51 +0100 Subject: [PATCH 202/431] Fix test --- .../app/entities/project/project-detail.component.spec.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/webapp/app/entities/project/project-detail.component.spec.ts b/src/main/webapp/app/entities/project/project-detail.component.spec.ts index 7d48d2e0a..b7f0e4b01 100644 --- a/src/main/webapp/app/entities/project/project-detail.component.spec.ts +++ b/src/main/webapp/app/entities/project/project-detail.component.spec.ts @@ -49,7 +49,7 @@ describe('Component Tests', () => { // THEN expect(service.find).toHaveBeenCalledWith('testProject'); - expect(comp.project).toEqual(jasmine.objectContaining({id: 10})); + expectAsync(comp.project$.toPromise()).toBeResolvedTo(jasmine.objectContaining({id: 10})); }); }); }); From e2715bd9b1903ec7b759e127f2c58aeede6bbdec Mon Sep 17 00:00:00 2001 From: Joris Borgdorff Date: Thu, 18 Nov 2021 12:42:33 +0100 Subject: [PATCH 203/431] Allow easeier access to Permission without creating new objects --- .../org/radarbase/auth/authorization/Permission.java | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/radar-auth/src/main/java/org/radarbase/auth/authorization/Permission.java b/radar-auth/src/main/java/org/radarbase/auth/authorization/Permission.java index 50d97f66c..146080f36 100644 --- a/radar-auth/src/main/java/org/radarbase/auth/authorization/Permission.java +++ b/radar-auth/src/main/java/org/radarbase/auth/authorization/Permission.java @@ -132,6 +132,15 @@ public static String[] scopes() { .toArray(String[]::new); } + /** Return matching permission. */ + public static Permission of(Entity entity, Operation operation) { + return stream() + .filter(p -> p.getEntity() == entity && p.getOperation() == operation) + .findAny() + .orElseThrow(() -> new IllegalArgumentException( + "No permission found for given entity and operation")); + } + /** * Turn this permission into an OAuth scope name and return it. * From 1e7a2c872663ee440c6d079a8d079e74c96540c7 Mon Sep 17 00:00:00 2001 From: Joris Borgdorff Date: Thu, 18 Nov 2021 13:51:54 +0100 Subject: [PATCH 204/431] Fixed sorting and change detection groups & common user management --- .../app/shared/group/group.component.html | 102 +++++++++--------- .../app/shared/group/group.component.ts | 66 +++++++----- .../common-user-management.component.html | 8 +- .../user/common-user-management.component.ts | 102 +++++++++++------- 4 files changed, 155 insertions(+), 123 deletions(-) diff --git a/src/main/webapp/app/shared/group/group.component.html b/src/main/webapp/app/shared/group/group.component.html index 091960bb4..5bd5044a0 100644 --- a/src/main/webapp/app/shared/group/group.component.html +++ b/src/main/webapp/app/shared/group/group.component.html @@ -1,59 +1,61 @@ -
    - -
    -
    -
    - -
    -
    -
    -
    - - -
    - {{group.id}} +
    +
    + +
    +
    +
    + +
    +
    +
    +
    + + +
    + {{group.id}} +
    -
    -
    - - -
    - - {{group.name}} +
    + +
    + + {{group.name}} + +
    -
    -
    - - - +
    + +
    -
    - +
    +
    -
    -
    - -
    -
    +
    +
    diff --git a/src/main/webapp/app/shared/group/group.component.ts b/src/main/webapp/app/shared/group/group.component.ts index 15a438e86..c3045e08b 100644 --- a/src/main/webapp/app/shared/group/group.component.ts +++ b/src/main/webapp/app/shared/group/group.component.ts @@ -1,75 +1,85 @@ import { Component, Input, - OnChanges, OnDestroy, OnInit, - SimpleChange, - SimpleChanges, } from '@angular/core'; import { HttpErrorResponse } from '@angular/common/http'; -import { BehaviorSubject, Subscription } from 'rxjs'; +import { BehaviorSubject, combineLatest, Observable, Subject, Subscription } from 'rxjs'; import {Group, GroupService, Project} from '..'; import { AlertService } from '../util/alert.service'; import { EventManager } from '../util/event-manager.service'; +import { + catchError, + distinctUntilChanged, + filter, + pluck, + startWith, + switchMap +} from "rxjs/operators"; @Component({ selector: 'jhi-groups', templateUrl: './group.component.html', styleUrls: ['./group.component.scss'], }) -export class GroupComponent implements OnInit, OnDestroy, OnChanges { +export class GroupComponent implements OnInit, OnDestroy { project$ = new BehaviorSubject(null); + projectName$: Observable; @Input() get project() { return this.project$.value; } set project(v: Project) { this.project$.next(v); } - groups: Group[]; - eventSubscriber: Subscription; + groups$ = new BehaviorSubject([]); + private trigger$ = new Subject(); + private subscription: Subscription = new Subscription(); constructor( private groupService: GroupService, private alertService: AlertService, private eventManager: EventManager, ) { - this.groups = []; - } - - loadGroups() { - this.groupService.list(this.project.projectName).subscribe( - (res: Group[]) => this.groups = res, - (res: HttpErrorResponse) => this.alertService.error(res.message, null, null), + this.projectName$ = this.project$.pipe( + filter(p => !!p), + pluck('projectName'), + distinctUntilChanged(), ); } ngOnInit() { - this.registerChangeInGroups(); + this.subscription.add(this.registerChangeInGroups()); + this.subscription.add(this.registerChangeInGroupsEvents()); } ngOnDestroy() { + this.trigger$.complete(); this.project$.complete(); - this.eventManager.destroy(this.eventSubscriber); + this.groups$.complete(); + this.subscription.unsubscribe(); } trackId(index: number, item: Group) { return item.id; } - registerChangeInGroups() { - this.eventSubscriber = this.eventManager.subscribe('groupListModification', (_) => { - this.loadGroups() - }); + registerChangeInGroups(): Subscription { + return combineLatest([ + this.projectName$, + this.trigger$.pipe(startWith(undefined as void)), + ]).pipe( + switchMap(([projectName]) => this.groupService.list(projectName)), + catchError((res: HttpErrorResponse) => { + this.alertService.error(res.message, null, null); + return []; + }), + ).subscribe(groups => this.groups$.next(groups)); } - ngOnChanges(changes: SimpleChanges) { - this.groups = []; - const project: SimpleChange = changes.project ? changes.project : null; - if (project) { - this.project = project.currentValue; - this.loadGroups(); - } + registerChangeInGroupsEvents(): Subscription { + return this.eventManager.subscribe('groupListModification', (_) => { + this.trigger$.next(); + }); } - } diff --git a/src/main/webapp/app/shared/user/common-user-management.component.html b/src/main/webapp/app/shared/user/common-user-management.component.html index da498d82b..d32b59b67 100644 --- a/src/main/webapp/app/shared/user/common-user-management.component.html +++ b/src/main/webapp/app/shared/user/common-user-management.component.html @@ -1,19 +1,19 @@
    -
    +
    - + - + - + diff --git a/src/main/webapp/app/shared/user/common-user-management.component.ts b/src/main/webapp/app/shared/user/common-user-management.component.ts index f69516344..dc75c7e6d 100644 --- a/src/main/webapp/app/shared/user/common-user-management.component.ts +++ b/src/main/webapp/app/shared/user/common-user-management.component.ts @@ -1,32 +1,33 @@ import { Component, Input, - OnChanges, OnDestroy, OnInit, - SimpleChange, - SimpleChanges } from '@angular/core'; -import { ITEMS_PER_PAGE, Project, User, UserService } from '..'; +import { Project, User, UserService } from '..'; import { EventManager } from '../util/event-manager.service'; import { BehaviorSubject, combineLatest, Subject, Subscription } from "rxjs"; -import { filter, startWith, switchMap } from "rxjs/operators"; +import { + distinctUntilChanged, + filter, + first, + map, + pluck, + startWith, + switchMap, + tap +} from "rxjs/operators"; +import { ActivatedRoute, Router } from "@angular/router"; @Component({ selector: 'jhi-common-user-mgmt', templateUrl: './common-user-management.component.html' }) -export class CommonUserMgmtComponent implements OnInit, OnChanges, OnDestroy { - users: User[]; - error: any; - success: any; - totalItems: any; - queryCount: any; - itemsPerPage: any; - page: any; - predicate: any; - reverse: any; +export class CommonUserMgmtComponent implements OnInit, OnDestroy { + readonly users$ = new BehaviorSubject([]); + predicate$ = new BehaviorSubject('id'); + ascending$ = new BehaviorSubject(true); project$ = new BehaviorSubject(null); @Input() @@ -40,50 +41,69 @@ export class CommonUserMgmtComponent implements OnInit, OnChanges, OnDestroy { trigger$ = new Subject(); - private subscriptions: Subscription = new Subscription(); constructor( private userService: UserService, private eventManager: EventManager, + private activatedRoute: ActivatedRoute, + private router: Router, ) { - this.itemsPerPage = ITEMS_PER_PAGE; + this.subscriptions.add(this.registerRouteParams()); } ngOnInit() { - this.subscriptions.add( - combineLatest([ - this.project$, - this.authority$, - this.trigger$.pipe(startWith(undefined as void)), - ]).pipe( - filter(([p, a]) => (!!p) && (!!a)), - switchMap(([project, authority]) => this.userService.findByProjectAndAuthority({ - projectName: project.projectName, - authority: authority, - })), - ).subscribe((res: any) => this.users = res) - ); - this.registerChangeInUsers(); + this.subscriptions.add(this.registerChangeInUsers()); + this.subscriptions.add(this.registerUserEvents()); } ngOnDestroy() { this.subscriptions.unsubscribe(); } - registerChangeInUsers() { - this.subscriptions.add( - this.eventManager.subscribe('userListModification', () => this.trigger$.next()) + private registerRouteParams() { + return this.activatedRoute.data.pipe( + pluck('pagingParams'), + first(), + ).subscribe(params => { + this.ascending$.next(params.ascending); + this.predicate$.next(params.predicate); + }); + } + + private registerChangeInUsers() { + const sort$ = combineLatest([ + this.predicate$, + this.ascending$, + ]).pipe( + map(([predicate, ascending]) => predicate + ',' + (ascending ? 'asc' : 'desc')), + distinctUntilChanged(), ); + + return combineLatest([ + this.project$.pipe(filter(p => !!p), pluck('projectName'), distinctUntilChanged()), + this.authority$.pipe(filter(a => !!a), distinctUntilChanged()), + sort$, + this.trigger$.pipe(startWith(undefined as void)), + ]).pipe( + tap(([, , sort]) => { + this.router.navigate([], { + relativeTo: this.activatedRoute, + queryParams: { sort }, + }) + }), + switchMap(([projectName, authority, sort]) => this.userService.findByProjectAndAuthority({ + projectName: projectName, + authority, + sort, + })), + ).subscribe((res: any) => this.users$.next(res)); } - ngOnChanges(changes: SimpleChanges) { - if (changes.project) { - this.project$.next(changes.project.currentValue); - } - if (changes.authority) { - this.authority$.next(changes.authority.currentValue); - } + private registerUserEvents() { + return this.eventManager.subscribe('userListModification', + () => this.trigger$.next(), + ); } trackIdentity(index, item: User) { From a7fc003c47e41a3eee4a4c5f118093c6fa216568 Mon Sep 17 00:00:00 2001 From: Peyman Mohtashami Date: Thu, 18 Nov 2021 14:55:01 +0100 Subject: [PATCH 205/431] Give warning dialog on group removal 409 conflict --- .../shared/group/group-delete-dialog.component.ts | 2 +- .../webapp/app/shared/group/group.component.html | 3 +-- .../webapp/app/shared/group/group.component.ts | 14 ++++++++++++++ src/main/webapp/app/shared/group/group.service.ts | 7 +++++-- 4 files changed, 21 insertions(+), 5 deletions(-) diff --git a/src/main/webapp/app/shared/group/group-delete-dialog.component.ts b/src/main/webapp/app/shared/group/group-delete-dialog.component.ts index 2d6bbfb2c..516ae23ef 100644 --- a/src/main/webapp/app/shared/group/group-delete-dialog.component.ts +++ b/src/main/webapp/app/shared/group/group-delete-dialog.component.ts @@ -27,7 +27,7 @@ export class GroupDeleteDialogComponent { } confirmDelete() { - this.groupService.delete(this.group.projectName, this.group.name).subscribe( + this.groupService.delete(this.group.projectName, this.group.name, true).subscribe( () => { this.eventManager.broadcast({name: 'groupListModification', content: null}); this.activeModal.dismiss(true); diff --git a/src/main/webapp/app/shared/group/group.component.html b/src/main/webapp/app/shared/group/group.component.html index 091960bb4..40b0c84a9 100644 --- a/src/main/webapp/app/shared/group/group.component.html +++ b/src/main/webapp/app/shared/group/group.component.html @@ -44,8 +44,7 @@ diff --git a/src/main/webapp/app/shared/group/group.component.ts b/src/main/webapp/app/shared/group/group.component.ts index 393a3c147..415f0741c 100644 --- a/src/main/webapp/app/shared/group/group.component.ts +++ b/src/main/webapp/app/shared/group/group.component.ts @@ -13,6 +13,7 @@ import { BehaviorSubject, Subscription } from 'rxjs'; import {Group, GroupService, Project} from '..'; import { AlertService } from '../util/alert.service'; import { EventManager } from '../util/event-manager.service'; +import {Router} from "@angular/router"; @Component({ selector: 'jhi-groups', @@ -33,6 +34,7 @@ export class GroupComponent implements OnInit, OnDestroy, OnChanges { private groupService: GroupService, private alertService: AlertService, private eventManager: EventManager, + private router: Router, ) { this.groups = []; } @@ -71,4 +73,16 @@ export class GroupComponent implements OnInit, OnDestroy, OnChanges { } } + deleteGroup(group: Group) { + this.groupService.delete(this.project.projectName, group.name).subscribe( + () => { + this.eventManager.broadcast({name: 'groupListModification', content: null}); + }, + (error) => { + if(error.status === 409){ + this.router.navigate(['/', { outlets: { popup: 'project-group/'+ this.project.projectName + '/' + group.id + '/delete'} }]) + } + } + ); + } } diff --git a/src/main/webapp/app/shared/group/group.service.ts b/src/main/webapp/app/shared/group/group.service.ts index 6263a5500..0b1d54db8 100644 --- a/src/main/webapp/app/shared/group/group.service.ts +++ b/src/main/webapp/app/shared/group/group.service.ts @@ -3,6 +3,7 @@ import { HttpClient } from '@angular/common/http'; import { Observable } from 'rxjs'; import { map } from "rxjs/operators"; import { Group } from "./group.model"; +import { createRequestOption } from "../model/request.utils"; @Injectable({ providedIn: 'root' }) export class GroupService { @@ -32,8 +33,10 @@ export class GroupService { return this.http.post(this.resourceUrl(projectName), copy); } - delete(projectName: string, groupName: string): Observable { - return this.http.delete(this.resourceUrl(projectName, groupName)); + delete(projectName: string, groupName: string, forceDelete?: boolean): Observable { + return this.http.delete(this.resourceUrl(projectName, groupName), { + params: createRequestOption({ unlinkSubjects: forceDelete }), + }); } addSubjectsToGroup( From b0e023cf42676899f3a4402bcb0a9f7e1f7fe22a Mon Sep 17 00:00:00 2001 From: Peyman Mohtashami Date: Thu, 18 Nov 2021 15:00:02 +0100 Subject: [PATCH 206/431] Modify translations --- src/main/webapp/i18n/en/group.json | 2 +- src/main/webapp/i18n/nl/group.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/webapp/i18n/en/group.json b/src/main/webapp/i18n/en/group.json index 7bcc22dda..9091874a8 100644 --- a/src/main/webapp/i18n/en/group.json +++ b/src/main/webapp/i18n/en/group.json @@ -10,7 +10,7 @@ "updated": "A Group is updated with identifier {{ param }}", "deleted": "A Group is deleted with identifier {{ param }}", "delete": { - "question": "Are you sure you want to delete Group {{ id }}?" + "question": "This group has subjects, are you sure you want to delete Group {{ id }}?" }, "detail": { "title": "Group" diff --git a/src/main/webapp/i18n/nl/group.json b/src/main/webapp/i18n/nl/group.json index 70a88869d..df077c04d 100644 --- a/src/main/webapp/i18n/nl/group.json +++ b/src/main/webapp/i18n/nl/group.json @@ -10,7 +10,7 @@ "updated": "De groep {{ param }} is gewijzigd", "deleted": "De groep {{ param }} is verwijderd", "delete": { - "question": "Weet je zeker dat je groep {{ id }} wilt verwijderen?" + "question": "Deze groep heeft onderwerpen. Weet u zeker dat u groep {{ id }} wilt verwijderen?" }, "detail": { "title": "Groep" From 4a3c3b551dfb74d6f7a65e9d2b4dc40295c0f8ee Mon Sep 17 00:00:00 2001 From: Joris Borgdorff Date: Thu, 18 Nov 2021 15:19:41 +0100 Subject: [PATCH 207/431] Some small updates --- .../user/common-user-management.component.ts | 25 ++++++++++--------- 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/src/main/webapp/app/shared/user/common-user-management.component.ts b/src/main/webapp/app/shared/user/common-user-management.component.ts index dc75c7e6d..38e3c5a51 100644 --- a/src/main/webapp/app/shared/user/common-user-management.component.ts +++ b/src/main/webapp/app/shared/user/common-user-management.component.ts @@ -9,6 +9,7 @@ import { Project, User, UserService } from '..'; import { EventManager } from '../util/event-manager.service'; import { BehaviorSubject, combineLatest, Subject, Subscription } from "rxjs"; import { + debounceTime, distinctUntilChanged, filter, first, @@ -26,20 +27,20 @@ import { ActivatedRoute, Router } from "@angular/router"; }) export class CommonUserMgmtComponent implements OnInit, OnDestroy { readonly users$ = new BehaviorSubject([]); - predicate$ = new BehaviorSubject('id'); - ascending$ = new BehaviorSubject(true); + readonly predicate$ = new BehaviorSubject('id'); + readonly ascending$ = new BehaviorSubject(true); - project$ = new BehaviorSubject(null); + readonly project$ = new BehaviorSubject(null); @Input() get project(): Project { return this.project$.value; } set project(v: Project) { this.project$.next(v) } - authority$ = new BehaviorSubject(''); + readonly authority$ = new BehaviorSubject(''); @Input() get authority(): string { return this.authority$.value; } set authority(v: string) { this.authority$.next(v); } - trigger$ = new Subject(); + readonly trigger$ = new Subject(); private subscriptions: Subscription = new Subscription(); @@ -76,8 +77,15 @@ export class CommonUserMgmtComponent implements OnInit, OnDestroy { this.predicate$, this.ascending$, ]).pipe( + debounceTime(5), map(([predicate, ascending]) => predicate + ',' + (ascending ? 'asc' : 'desc')), distinctUntilChanged(), + tap((sort) => { + return this.router.navigate([], { + relativeTo: this.activatedRoute, + queryParams: { sort }, + }) + }), ); return combineLatest([ @@ -86,12 +94,6 @@ export class CommonUserMgmtComponent implements OnInit, OnDestroy { sort$, this.trigger$.pipe(startWith(undefined as void)), ]).pipe( - tap(([, , sort]) => { - this.router.navigate([], { - relativeTo: this.activatedRoute, - queryParams: { sort }, - }) - }), switchMap(([projectName, authority, sort]) => this.userService.findByProjectAndAuthority({ projectName: projectName, authority, @@ -111,6 +113,5 @@ export class CommonUserMgmtComponent implements OnInit, OnDestroy { } transition() { - this.trigger$.next(); } } From 375a439035c276bc7ee8335aade132e9f20d813e Mon Sep 17 00:00:00 2001 From: Peyman Mohtashami Date: Thu, 18 Nov 2021 15:48:18 +0100 Subject: [PATCH 208/431] Fix test --- .../javascript/e2e/cypress/integration/entities/subject.spec.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/src/test/javascript/e2e/cypress/integration/entities/subject.spec.ts b/src/test/javascript/e2e/cypress/integration/entities/subject.spec.ts index 7e043c334..e4289d110 100644 --- a/src/test/javascript/e2e/cypress/integration/entities/subject.spec.ts +++ b/src/test/javascript/e2e/cypress/integration/entities/subject.spec.ts @@ -149,7 +149,6 @@ describe('Subject e2e test', () => { it('should be able to delete a group', () => { cy.contains('jhi-project-detail ul.nav-tabs .nav-item', 'Groups').click(); cy.contains('jhi-groups .group-row', 'Test Group C').contains('button', 'Delete').click(); - cy.contains('jhi-group-delete-dialog button', 'Delete').click(); cy.get('jhi-groups .group-row').should('have.length', 2); }); From 7d3595aca6e337dbc6d883b52790464716212f07 Mon Sep 17 00:00:00 2001 From: Joris Borgdorff Date: Thu, 18 Nov 2021 16:43:27 +0100 Subject: [PATCH 209/431] Fix tab handling --- .../project/project-detail.component.html | 59 ++++++------ .../project/project-detail.component.ts | 90 +++++++------------ .../app/shared/subject/subject.component.ts | 3 +- .../user/common-user-management.component.ts | 2 + 4 files changed, 66 insertions(+), 88 deletions(-) diff --git a/src/main/webapp/app/entities/project/project-detail.component.html b/src/main/webapp/app/entities/project/project-detail.component.html index fa5ec9598..4ad35d61f 100644 --- a/src/main/webapp/app/entities/project/project-detail.component.html +++ b/src/main/webapp/app/entities/project/project-detail.component.html @@ -57,36 +57,37 @@

    +
    +
      +
    • + + Subjects + +
      • +
    • + + Groups + +
      • +
    • + + Admins + +
      • +
    • + + Analysts + +
      • +
    -
      -
    • - - Subjects - -
      • -
    • - - Groups - -
      • -
    • - - Admins - -
      • -
    • - - Analysts - -
      • -
    +
    + -
    - - - - - - + + + + +
    diff --git a/src/main/webapp/app/entities/project/project-detail.component.ts b/src/main/webapp/app/entities/project/project-detail.component.ts index b44e7a77f..dfde1479a 100644 --- a/src/main/webapp/app/entities/project/project-detail.component.ts +++ b/src/main/webapp/app/entities/project/project-detail.component.ts @@ -1,10 +1,10 @@ import { ChangeDetectionStrategy, Component, OnDestroy, OnInit } from '@angular/core'; -import { ActivatedRoute } from '@angular/router'; +import { ActivatedRoute, Router } from '@angular/router'; import { BehaviorSubject, Observable, Subscription } from 'rxjs'; import { Project, ProjectService } from '../../shared'; import { EventManager } from '../../shared/util/event-manager.service'; -import { switchMap } from "rxjs/operators"; +import { distinctUntilChanged, filter, pluck, switchMap } from "rxjs/operators"; @Component({ selector: 'jhi-project-detail', @@ -13,87 +13,61 @@ import { switchMap } from "rxjs/operators"; styleUrls: ['project-detail.component.scss'], }) export class ProjectDetailComponent implements OnInit, OnDestroy { + private static availableTabs = ['subjects', 'groups', 'admins', 'analysts'] private subscription = new Subscription(); private _project$ = new BehaviorSubject(null); project$ = this._project$.asObservable(); - showSources: boolean; - showSubjects: boolean; - showProjectGroups: boolean; - showSourceTypes: boolean; - showProjectAdmins: boolean; - showProjectAnalysts: boolean; + private _activeTab$ = new BehaviorSubject('subjects'); + activeTab$: Observable; constructor( private eventManager: EventManager, private projectService: ProjectService, - private route: ActivatedRoute, + private activatedRoute: ActivatedRoute, + private router: Router, ) { + this.activeTab$ = this._activeTab$.asObservable().pipe(distinctUntilChanged()); + this.subscription.add(this.activatedRoute.queryParams.pipe( + pluck('tab'), + ).subscribe((tab) => this.updateActiveTab(tab))); } ngOnInit() { this.subscription.add(this.registerChangesInProjectName()); - this.viewSubjects(); + this.subscription.add(this._activeTab$.subscribe(tab => this.router.navigate([], { + relativeTo: this.activatedRoute, + queryParams: { tab }, + queryParamsHandling: "merge", + }))) } ngOnDestroy() { this.subscription.unsubscribe(); + this._project$.complete(); + this._activeTab$.complete(); } private registerChangesInProjectName(): Subscription { - return this.route.params.pipe( - switchMap(({projectName}) => this.projectService.find(projectName)), - ).subscribe( - (project) => this._project$.next(project), - ); + return this.activatedRoute.params.pipe( + pluck('projectName'), + distinctUntilChanged(), + switchMap(projectName => this.projectService.find(projectName)), + ).subscribe(project => this._project$.next(project)); } previousState() { window.history.back(); } - viewSources() { - this.showSources = true; - this.showSubjects = false; - this.showProjectGroups = false; - this.showSourceTypes = false; - this.showProjectAdmins = false; - this.showProjectAnalysts = false; - } - - viewSubjects() { - this.showSources = false; - this.showSubjects = true; - this.showProjectGroups = false; - this.showSourceTypes = false; - this.showProjectAdmins = false; - this.showProjectAnalysts = false; - } - - viewProjectGroups() { - this.showSources = false; - this.showSubjects = false; - this.showProjectGroups = true; - this.showSourceTypes = false; - this.showProjectAdmins = false; - this.showProjectAnalysts = false; - } - - viewProjectAdmins() { - this.showSources = false; - this.showSubjects = false; - this.showProjectGroups = false; - this.showSourceTypes = false; - this.showProjectAdmins = true; - this.showProjectAnalysts = false; - } - - viewProjectAnalysts() { - this.showSources = false; - this.showSubjects = false; - this.showProjectGroups = false; - this.showSourceTypes = false; - this.showProjectAdmins = false; - this.showProjectAnalysts = true; + updateActiveTab(tab?: string) { + if (!tab) { + return; + } + if (!ProjectDetailComponent.availableTabs.includes(tab)) { + window.console.log(`Cannot load unknown tab ${tab}`); + return; + } + this._activeTab$.next(tab); } } diff --git a/src/main/webapp/app/shared/subject/subject.component.ts b/src/main/webapp/app/shared/subject/subject.component.ts index f8993da78..17d73b1b0 100644 --- a/src/main/webapp/app/shared/subject/subject.component.ts +++ b/src/main/webapp/app/shared/subject/subject.component.ts @@ -218,6 +218,7 @@ export class SubjectComponent implements OnInit, OnDestroy, OnChanges { tap(([projectName, criteria, sortBy, ascending, page]) => this.router.navigate(this.toPathParams(projectName, criteria), { queryParams: this.toQueryParams(page, sortBy, ascending), + queryParamsHandling: "merge", })), withLatestFrom(this._subjects$), switchMap(([[projectName, filter, sortBy, ascending, page], subjects]) => { @@ -458,7 +459,7 @@ export class SubjectComponent implements OnInit, OnDestroy, OnChanges { route.push('subject') } if (criteria) { - const stringFilters: Record = Object.assign, SubjectFilterCriteria>({}, criteria); + const stringFilters: Record = Object.assign({}, criteria); delete stringFilters['groupName']; if (criteria.enrollmentDateFrom) { stringFilters.enrollmentDateFrom = this.formatter.format(criteria.enrollmentDateFrom); diff --git a/src/main/webapp/app/shared/user/common-user-management.component.ts b/src/main/webapp/app/shared/user/common-user-management.component.ts index 38e3c5a51..59e9cfea3 100644 --- a/src/main/webapp/app/shared/user/common-user-management.component.ts +++ b/src/main/webapp/app/shared/user/common-user-management.component.ts @@ -84,6 +84,8 @@ export class CommonUserMgmtComponent implements OnInit, OnDestroy { return this.router.navigate([], { relativeTo: this.activatedRoute, queryParams: { sort }, + queryParamsHandling: "merge", + skipLocationChange: true, }) }), ); From 33fb2d768775bfd34d0e5c6a6285889e60dcdd03 Mon Sep 17 00:00:00 2001 From: Joris Borgdorff Date: Thu, 18 Nov 2021 17:12:35 +0100 Subject: [PATCH 210/431] Fix test --- .../project/project-detail.component.spec.ts | 35 +++++++++++-------- .../project/project-detail.component.ts | 3 +- 2 files changed, 22 insertions(+), 16 deletions(-) diff --git a/src/main/webapp/app/entities/project/project-detail.component.spec.ts b/src/main/webapp/app/entities/project/project-detail.component.spec.ts index b7f0e4b01..3a37356f7 100644 --- a/src/main/webapp/app/entities/project/project-detail.component.spec.ts +++ b/src/main/webapp/app/entities/project/project-detail.component.spec.ts @@ -1,13 +1,14 @@ import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; import { DatePipe } from '@angular/common'; -import { ActivatedRoute } from '@angular/router'; +import { ActivatedRoute, Router } from '@angular/router'; import { of } from 'rxjs'; import { EventManager } from '../../shared/util/event-manager.service'; import { ManagementPortalTestModule } from '../../shared/util/test/test.module'; -import { MockActivatedRoute } from '../../shared/util/test/mock-route.service'; -import { Project, ProjectService } from '../../shared/project'; +import { MockActivatedRoute, MockRouter } from '../../shared/util/test/mock-route.service'; +import { ProjectService } from '../../shared/project'; import { ProjectDetailComponent } from './project-detail.component'; +import { filter } from "rxjs/operators"; describe('Component Tests', () => { @@ -26,6 +27,10 @@ describe('Component Tests', () => { provide: ActivatedRoute, useValue: new MockActivatedRoute({projectName: 'testProject'}) }, + { + provide: Router, + useClass: MockRouter, + }, ProjectService, EventManager ] @@ -39,18 +44,18 @@ describe('Component Tests', () => { }); describe('OnInit', () => { - it('Should call load all on init', () => { - // GIVEN - - spyOn(service, 'find').and.returnValue(of({id: 10})); - - // WHEN - comp.ngOnInit(); - - // THEN - expect(service.find).toHaveBeenCalledWith('testProject'); - expectAsync(comp.project$.toPromise()).toBeResolvedTo(jasmine.objectContaining({id: 10})); - }); + it('Should call load all on init', waitForAsync(async () => { + // GIVEN + spyOn(service, 'find').and.returnValue(of({id: 10})); + + // WHEN + comp.ngOnInit(); + + // THEN + expect(service.find).toHaveBeenCalledWith('testProject'); + const result = await comp.project$.pipe(filter(p => !!p)).toPromise(); + expect(result).toEqual(jasmine.objectContaining({id: 10})) + })); }); }); }); diff --git a/src/main/webapp/app/entities/project/project-detail.component.ts b/src/main/webapp/app/entities/project/project-detail.component.ts index dfde1479a..9f78021ba 100644 --- a/src/main/webapp/app/entities/project/project-detail.component.ts +++ b/src/main/webapp/app/entities/project/project-detail.component.ts @@ -30,7 +30,7 @@ export class ProjectDetailComponent implements OnInit, OnDestroy { this.activeTab$ = this._activeTab$.asObservable().pipe(distinctUntilChanged()); this.subscription.add(this.activatedRoute.queryParams.pipe( pluck('tab'), - ).subscribe((tab) => this.updateActiveTab(tab))); + ).subscribe(tab => this.updateActiveTab(tab))); } ngOnInit() { @@ -50,6 +50,7 @@ export class ProjectDetailComponent implements OnInit, OnDestroy { private registerChangesInProjectName(): Subscription { return this.activatedRoute.params.pipe( + filter(p => !!p), pluck('projectName'), distinctUntilChanged(), switchMap(projectName => this.projectService.find(projectName)), From 7ee32e53d2aef8b83c6706f7a5e1a523a91810b6 Mon Sep 17 00:00:00 2001 From: Peyman Mohtashami Date: Fri, 19 Nov 2021 20:29:01 +0100 Subject: [PATCH 211/431] Add permission tab to organization --- .../app/admin/user-management/role.model.ts | 2 + .../permission/permission.component.html | 92 +++---- .../shared/permission/permission.component.ts | 245 ++++++++++++++---- .../webapp/app/shared/user/user.service.ts | 14 +- 4 files changed, 249 insertions(+), 104 deletions(-) diff --git a/src/main/webapp/app/admin/user-management/role.model.ts b/src/main/webapp/app/admin/user-management/role.model.ts index 66da6ba2f..d96fed7b9 100644 --- a/src/main/webapp/app/admin/user-management/role.model.ts +++ b/src/main/webapp/app/admin/user-management/role.model.ts @@ -4,6 +4,8 @@ export class Role { public authorityName?: string, public projectId?: number, public projectName?: string, + public organizationId?: number, + public organizationName?: string, ) { } } diff --git a/src/main/webapp/app/shared/permission/permission.component.html b/src/main/webapp/app/shared/permission/permission.component.html index a38f1c86c..87ccab848 100644 --- a/src/main/webapp/app/shared/permission/permission.component.html +++ b/src/main/webapp/app/shared/permission/permission.component.html @@ -1,11 +1,9 @@ -

    Roles

    -{{allUsers | json}}
    @@ -20,31 +18,45 @@

    - - - - + + - @@ -55,51 +67,15 @@

    {{user.id}} {{user.login}}
    {{user.login}}
    {{user.login}} - {{user.authorities}} - - - + {{user.authorities.includes('ROLE_SYS_ADMIN')? 'ROLE_SYS_ADMIN' : 'ROLE_ORGANIZATION_ADMIN'}} -
    - + + + + + + Searching... +
    No user found for this search.
    +
    No user selected.
    + + + + + + + + + + + + + +     		- + + +
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    diff --git a/src/main/webapp/app/shared/permission/permission.component.ts b/src/main/webapp/app/shared/permission/permission.component.ts index 09d34666e..12fea8888 100644 --- a/src/main/webapp/app/shared/permission/permission.component.ts +++ b/src/main/webapp/app/shared/permission/permission.component.ts @@ -6,8 +6,8 @@ import { SimpleChanges, } from '@angular/core'; import {Role} from "../../admin/user-management/role.model"; -import {Subscription} from "rxjs"; -import {Project, ProjectService} from "../project"; +import {Observable, of, OperatorFunction, Subscription} from "rxjs"; +import {Project} from "../project"; import {AuthorityService} from "../user/authority.service"; import {AlertService} from "../util/alert.service"; import {EventManager} from "../util/event-manager.service"; @@ -15,7 +15,76 @@ import {HttpErrorResponse, HttpResponse} from "@angular/common/http"; import {User} from "../user/user.model"; import {Organization} from "../organization"; import {UserService} from "../user/user.service"; -import {parseLinks} from "../util/parse-links-util"; +import {catchError, debounceTime, distinctUntilChanged, map, switchMap, tap} from "rxjs/operators"; + +const MOCK_USER_DATA = [ { + "id" : 1, + "login" : "admin", + "firstName" : "Administrator", + "lastName" : "Administrator", + "email" : "admin@localhost", + "activated" : true, + "langKey" : "en", + "createdBy" : "system", + "createdDate" : "2021-11-19T10:08:30.968406+01:00", + "lastModifiedBy" : "system", + "lastModifiedDate" : "2021-11-19T10:08:40.261+01:00", + "roles" : [ { + "id" : 1, + "projectId" : null, + "projectName" : null, + "authorityName" : "ROLE_SYS_ADMIN" + } ], + "authorities" : [ "ROLE_SYS_ADMIN" ] +}, { + "id" : 5, + "login" : "padmin", + "firstName" : null, + "lastName" : null, + "email" : "padmin@localhost", + "activated" : true, + "langKey" : "en", + "createdBy" : "system", + "createdDate" : "2021-11-19T10:08:30.968406+01:00", + "lastModifiedBy" : "system", + "lastModifiedDate" : "2021-11-19T10:08:30.968406+01:00", + "roles" : [ { + "id" : 3, + "projectId" : 1, + "projectName" : "radar", + "authorityName" : "ROLE_PROJECT_ADMIN" + }, { + "id" : 5, + "organizationId" : 1, + "organizationName" : "The Hyve", + "authorityName" : "ROLE_ORGANIZATION_ADMIN" + } ], + "authorities" : [ "ROLE_PROJECT_ADMIN", "ROLE_ORGANIZATION_ADMIN" ] +}, { + "id" : 6, + "login" : "padmin2", + "firstName" : null, + "lastName" : null, + "email" : "padmin2@localhost", + "activated" : true, + "langKey" : "en", + "createdBy" : "system", + "createdDate" : "2021-11-19T10:08:30.968406+01:00", + "lastModifiedBy" : "system", + "lastModifiedDate" : "2021-11-19T10:08:30.968406+01:00", + "roles" : [ { + "id" : 4, + "projectId" : 2, + "projectName" : "Radar-Pilot-01", + "authorityName" : "ROLE_PROJECT_ADMIN" + }, { + "id" : 6, + "organizationId" : 2, + "organizationName" : "Other organization", + "authorityName" : "ROLE_ORGANIZATION_ADMIN" + } ], + "authorities" : [ "ROLE_PROJECT_ADMIN", "ROLE_ORGANIZATION_ADMIN" ] +} ]; @Component({ selector: 'jhi-permissions', @@ -26,16 +95,38 @@ export class PermissionComponent implements OnInit, OnDestroy, OnChanges { @Input() organization: Organization; + @Input() project: Project; + + authorities: string[]; users: User[] = []; - allUsers: User[]; + filteredUsers: User[] = []; eventSubscriber: Subscription; - authorities: string[]; - // projects: Project[]; selectedAuthority: any; - selectedUser: User; + userSearchTerm: any; + + isSearching = false; + isSearchFailed = false; + isNotSelected = false; + + searchUser: OperatorFunction = (text$: Observable) => + text$.pipe( + debounceTime(300), + distinctUntilChanged(), + tap(() => this.isSearching = true), + switchMap(term => + this.userService.search(term).pipe( + map( users => this.removeAlreadyExistingUsersFromTheList(users)), + tap(() => this.isSearchFailed = false), + catchError(() => { + this.isSearchFailed = true; + return of([]); + })) + ), + tap(() => this.isSearching = false) + ) constructor( private authorityService: AuthorityService, @@ -46,17 +137,19 @@ export class PermissionComponent implements OnInit, OnDestroy, OnChanges { ) { } - ngOnInit() { + removeAlreadyExistingUsersFromTheList(users: User[]){ + const modifiedUsers = this.users.map(u => u.login); + this.filteredUsers = users.filter(val => !modifiedUsers.includes(val.login)); + return this.filteredUsers.map(user => { + const userNameString = (user.firstName || user.lastName)? ' [' + (user.firstName || '') + ' ' + (user.lastName || '') + ']' : ''; + return user.login + userNameString; + }); + } - // if (this.users === null) { - // this.users = []; - // } + ngOnInit() { this.authorityService.findAll().subscribe(res => { this.authorities = res; }); - // this.projectService.query().subscribe((res: HttpResponse) => { - // this.projects = res.body; - // }); } trackId(index: number, item: Role) { @@ -64,29 +157,97 @@ export class PermissionComponent implements OnInit, OnDestroy, OnChanges { } addRole() { - // update user - - // const newUser = new User(); - // newUser - // const newRole = new Role(); - // newRole.authorityName = this.selectedAuthority; - // newRole.projectId = this.selectedProject.id; - // newRole.projectName = this.selectedProject.projectName; - // if (this.hasRole(newRole)) { - // this.alertService.error('userManagement.role.error.alreadyExist', null, null); - // } else { - // this.users.push(newRole); - // } + console.log(this.selectedAuthority, this.userSearchTerm) + console.log(this.filteredUsers) + const user = this.filteredUsers[0]; + if(this.userSearchTerm.includes(user.login)){ + const newRole = new Role(); + if (this.project) { + newRole.authorityName = 'ROLE_PROJECT_ADMIN'; + newRole.projectId = 1; //this.organization.id; + newRole.projectName = 'radar'; // this.organization.organizationName; + } else if (this.organization) { + newRole.authorityName = this.selectedAuthority; + newRole.organizationId = this.organization.id; + newRole.organizationName = this.organization.organizationName; + } + newRole.authorityName = 'ROLE_PROJECT_ADMIN'; + newRole.projectId = 1; //this.organization.id; + newRole.projectName = 'radar'; // this.organization.organizationName; + if (this.hasRole(newRole)) { + // this.alertService.error('userManagement.role.error.alreadyExist', null, null); + } else { + user.roles.push(newRole); + this.userService.update(user).subscribe( + (res)=> { + console.log(res); + this.getUsers(); + + }, + (error)=> console.log(error) + ); + // this.users.push(newRole); + } + } else { + console.log('error not selected') + this.isNotSelected = true; + } // this.eventManager.broadcast({name: 'roleListModification', content: this.users}); } + getUsers(){ + this.selectedAuthority = null; + this.userSearchTerm = null; + this.isNotSelected = false; + this.isSearching = false; + this.isSearchFailed = false; + + let req = {}; + if (this.project) { + req = { + project: this.project + } + } else if (this.organization) { + req = { + organization: this.organization + } + } else { + return; + } + + this.userService.query(req).subscribe( + (res: HttpResponse) => this.onSuccess(res.body, res.headers), + (error: HttpErrorResponse) => this.onError(error), + ); + } + hasRole(role: Role): boolean { return false; // this.users.some(v => v.projectId === role.projectId && // v.authorityName === role.authorityName); } - removeRole(role: Role) { + removeRole(user: User) { + // remove from roles + const roles = user.roles; + console.log(roles); + roles.splice(roles.findIndex(role => role.organizationId === this.organization.id), 1); + user.roles = roles; + + // remove from authorities + // todo warning! if user has more than one authority for organization or project + const authorities = user.authorities; + console.log(authorities); + authorities.splice(authorities.findIndex(authority => authority === this.selectedAuthority), 1); + user.authorities = authorities; + + this.userService.update(user).subscribe( + (res)=> { + console.log(res); + this.getUsers(); + }, + (error)=> console.log(error) + ); // this.users.splice(this.users.findIndex(v => v.projectId === role.projectId && v.authorityName === role.authorityName), 1); // this.eventManager.broadcast({name: 'roleListModification', content: this.users}); } @@ -96,33 +257,27 @@ export class PermissionComponent implements OnInit, OnDestroy, OnChanges { } ngOnChanges(changes: SimpleChanges): void { - this.userService.query({ - // page: this.page - 1, - // size: this.itemsPerPage, - // authority: this.byAuthority, - // email: this.byEmail, - // login: this.byLogin, - organization: this.organization - // projectName: this.byProject, - // sort: this.sort(), - }).subscribe( - (res: HttpResponse) => this.onSuccess(res.body, res.headers), - (res: HttpErrorResponse) => this.onError(res), - ); + this.getUsers(); } ngOnDestroy(): void { } private onSuccess(data, headers) { - // this.links = parseLinks(headers.get('link')); - // this.totalItems = headers.get('X-Total-Count'); - // this.queryCount = this.totalItems; - this.allUsers = data; + const organizationUsers = this.filterByOrganization(MOCK_USER_DATA); + console.log(organizationUsers); + this.users = this.filterByOrganization(organizationUsers); } private onError(error) { this.alertService.error(error.message, null, null); } + filterByOrganization(data: any[]): any[] { + return data.filter( item => { + return item.authorities.includes('ROLE_SYS_ADMIN') || + item.roles.filter(role => role.organizationId === 1).length > 0; + }) + } + } diff --git a/src/main/webapp/app/shared/user/user.service.ts b/src/main/webapp/app/shared/user/user.service.ts index 58a63ab9a..c7cf62952 100644 --- a/src/main/webapp/app/shared/user/user.service.ts +++ b/src/main/webapp/app/shared/user/user.service.ts @@ -1,11 +1,12 @@ import { Injectable } from '@angular/core'; -import { HttpClient, HttpResponse } from '@angular/common/http'; +import {HttpClient, HttpParams, HttpResponse} from '@angular/common/http'; import {Observable, of} from 'rxjs'; import { User } from './user.model'; import { createRequestOption } from '../model/request.utils'; import { Project } from '../project'; import {Organization, ORGANIZATIONS} from "../organization/organization.model"; +import {map} from "rxjs/operators"; @Injectable({ providedIn: 'root' }) export class UserService { @@ -52,4 +53,15 @@ export class UserService { const params = createRequestOption(req); return this.http.get(this.resourceUrl, {params}); } + + search(term: string) { + if (term === '') { + return of([]); + } + const params = new HttpParams({fromObject: {searching: true}}); + return this.http.get(this.resourceUrl, + {params: params.set('search', term)}).pipe( + // map(response => response[1]) + ); + } } From b6c36f017ff08b567300d2e5f2e3870704fffbad Mon Sep 17 00:00:00 2001 From: Peyman Mohtashami Date: Sat, 20 Nov 2021 12:20:59 +0100 Subject: [PATCH 212/431] Fix organization model --- .../organization-delete-dialog.component.html | 4 +-- .../organization-delete-dialog.component.ts | 1 + .../organization-detail.component.html | 6 ++-- .../organization-detail.component.ts | 2 +- .../organization-dialog.component.html | 2 +- .../organization/organization.component.html | 8 +++--- .../organization/organization.component.ts | 2 +- src/main/webapp/app/home/home.component.html | 6 ++-- src/main/webapp/app/home/home.component.ts | 2 +- .../app/layouts/navbar/navbar.component.html | 4 +-- .../app/layouts/navbar/navbar.component.ts | 2 +- .../shared/organization/organization.model.ts | 6 ++-- .../organization/organization.service.ts | 28 +++++++++++++------ .../shared/permission/permission.component.ts | 2 +- 14 files changed, 44 insertions(+), 31 deletions(-) diff --git a/src/main/webapp/app/entities/organization/organization-delete-dialog.component.html b/src/main/webapp/app/entities/organization/organization-delete-dialog.component.html index cfe20afe3..c9eaa0bd2 100644 --- a/src/main/webapp/app/entities/organization/organization-delete-dialog.component.html +++ b/src/main/webapp/app/entities/organization/organization-delete-dialog.component.html @@ -1,4 +1,4 @@ -
    +

    + [translateParams]="{id: organization.name}">

    diff --git a/src/main/webapp/app/entities/organization/organization-delete-dialog.component.ts b/src/main/webapp/app/entities/organization/organization-delete-dialog.component.ts index e1cde8894..a86b4fae8 100644 --- a/src/main/webapp/app/entities/organization/organization-delete-dialog.component.ts +++ b/src/main/webapp/app/entities/organization/organization-delete-dialog.component.ts @@ -28,6 +28,7 @@ export class OrganizationDeleteDialogComponent { } confirmDelete(organizationName: string) { + console.log(organizationName) this.organizationService.delete(organizationName).subscribe(() => { this.eventManager.broadcast({ name: 'organizationListModification', diff --git a/src/main/webapp/app/entities/organization/organization-detail.component.html b/src/main/webapp/app/entities/organization/organization-detail.component.html index eab2e5213..0dc950172 100644 --- a/src/main/webapp/app/entities/organization/organization-detail.component.html +++ b/src/main/webapp/app/entities/organization/organization-detail.component.html @@ -3,10 +3,10 @@

    - {{organization.organizationName}} + {{organization.name}}

    -
    - -
    -

    {{project.startDate | date:'medium'}}

    -

    N/A

    +

    {{project.startDate | date:'mediumDate'}}

    -

    {{project.endDate | date:'medium'}}

    -

    N/A

    +

    {{project.endDate | date:'mediumDate'}}

    - - => - + +
    {{entry.key}} => @@ -91,3 +88,7 @@

    + + +

    global.attribute.noneAvailable

    +     diff --git a/src/main/webapp/app/entities/project/project-detail.component.scss b/src/main/webapp/app/entities/project/project-detail.component.scss index 520696de7..2541b1014 100644 --- a/src/main/webapp/app/entities/project/project-detail.component.scss +++ b/src/main/webapp/app/entities/project/project-detail.component.scss @@ -25,3 +25,7 @@ #project-content-wrapper { padding: 16px 0; } + +.none-available { + color: #bebebe; +} diff --git a/src/main/webapp/app/shared/subject/subject.component.html b/src/main/webapp/app/shared/subject/subject.component.html index d914600c0..91139c0e1 100644 --- a/src/main/webapp/app/shared/subject/subject.component.html +++ b/src/main/webapp/app/shared/subject/subject.component.html @@ -261,12 +261,9 @@
    {{subject.externalId || subject.externalLink}} - + {{subject.externalId}} - - N/A -
    @@ -285,9 +282,7 @@
    [translate]="'managementPortalApp.subject.project'">
    - - N/A - + [translate]="'managementPortalApp.subject.sources'">
    - - N/A - + {{sources.sourceTypeModel}}: {{sources.sourceName}}{{last ? '' : ', '}} @@ -316,9 +309,7 @@
    [translate]="'managementPortalApp.subject.attributeData'">
    - - N/A - +
    {{entry.key}}: {{entry.value}}
    @@ -329,9 +320,7 @@
    [translate]="'managementPortalApp.subject.group'">
    - - {{subject.group || 'N/A'}} - + {{ subject.group }}
    @@ -380,3 +369,7 @@
    + + + global.attribute.noneAvailable + diff --git a/src/main/webapp/app/shared/subject/subject.component.scss b/src/main/webapp/app/shared/subject/subject.component.scss index 3e5caf224..4947a7c04 100644 --- a/src/main/webapp/app/shared/subject/subject.component.scss +++ b/src/main/webapp/app/shared/subject/subject.component.scss @@ -146,3 +146,7 @@ margin-bottom: 4px; .applied-filters .badge { cursor: pointer; } + +.none-available { + color: #bebebe; +} diff --git a/src/main/webapp/i18n/en/global.json b/src/main/webapp/i18n/en/global.json index 385f9195f..acb9edd7a 100644 --- a/src/main/webapp/i18n/en/global.json +++ b/src/main/webapp/i18n/en/global.json @@ -98,8 +98,8 @@ "add" : "Add", "error" : { "alreadyExist" : "This attribute key already exist in the list" - } - + }, + "noneAvailable": "ā€”" } }, "entity": { diff --git a/src/main/webapp/i18n/en/project.json b/src/main/webapp/i18n/en/project.json index 304014bcc..35a1d7daa 100644 --- a/src/main/webapp/i18n/en/project.json +++ b/src/main/webapp/i18n/en/project.json @@ -30,6 +30,7 @@ "label": "New group", "button": "Add group" }, + "attributeData" : "Attributes", "attributeDataKey" : "Tag", "attributeDataValue" : "Value", "prettyProjectName" : "Human readable project Name", diff --git a/src/main/webapp/i18n/nl/global.json b/src/main/webapp/i18n/nl/global.json index c3b5792e7..a0f9972f0 100644 --- a/src/main/webapp/i18n/nl/global.json +++ b/src/main/webapp/i18n/nl/global.json @@ -98,8 +98,8 @@ "add" : "Toevoegen", "error" : { "alreadyExist" : "Deze eigenschap komt reeds voor in de lijst" - } - + }, + "noneAvailable": "ā€“" } }, "entity": { diff --git a/src/main/webapp/i18n/nl/project.json b/src/main/webapp/i18n/nl/project.json index 3936a314d..14047ec0a 100644 --- a/src/main/webapp/i18n/nl/project.json +++ b/src/main/webapp/i18n/nl/project.json @@ -30,6 +30,7 @@ "label": "Nieuwe groep", "button": "Groep toevogen" }, + "attributeData" : "Eigenschappen", "attributeDataKey" : "Tag", "attributeDataValue" : "Waarde", "prettyProjectName" : "Leesbare projectnaam", From 12932476a174ca6b7338256760b9f105ed5c6daa Mon Sep 17 00:00:00 2001 From: Joris Borgdorff Date: Mon, 22 Nov 2021 14:37:04 +0100 Subject: [PATCH 215/431] Cleanup project resource url handling --- .../app/shared/project/project.service.ts | 39 ++++++++++++------- 1 file changed, 24 insertions(+), 15 deletions(-) diff --git a/src/main/webapp/app/shared/project/project.service.ts b/src/main/webapp/app/shared/project/project.service.ts index 9ff3e81e3..5d26d43be 100644 --- a/src/main/webapp/app/shared/project/project.service.ts +++ b/src/main/webapp/app/shared/project/project.service.ts @@ -29,7 +29,6 @@ import { AlertService } from "../util/alert.service"; @Injectable({ providedIn: 'root' }) export class ProjectService { - private resourceUrl = 'api/projects'; private readonly _projects$ = new BehaviorSubject([]); private readonly _trigger$ = new Subject(); @@ -68,7 +67,7 @@ export class ProjectService { } create(project: Project): Observable { - return this.http.post(this.resourceUrl, this.convertProjectToServer(project)).pipe( + return this.http.post(this.projectUrl(), this.convertProjectToServer(project)).pipe( map(p => this.convertProjectFromServer(p)), tap( p => this.updateProject(p), @@ -78,7 +77,7 @@ export class ProjectService { } update(project: Project): Observable { - return this.http.put(this.resourceUrl, this.convertProjectToServer(project)).pipe( + return this.http.put(this.projectUrl(), this.convertProjectToServer(project)).pipe( map(p => this.convertProjectFromServer(p)), tap( p => this.updateProject(p), @@ -101,7 +100,7 @@ export class ProjectService { } fetchProject(projectName: string): Observable { - return this.http.get(`${this.resourceUrl}/${encodeURIComponent(projectName)}`).pipe( + return this.http.get(this.projectUrl(projectName)).pipe( map(p => this.convertProjectFromServer(p)), tap(p => this.updateProject(p)), ); @@ -115,7 +114,7 @@ export class ProjectService { query(req?: any): Observable> { const options = createRequestOption(req); - return this.http.get(this.resourceUrl, {params: options, observe: 'response'}); + return this.http.get(this.projectUrl(), {params: options, observe: 'response'}); } findSourceTypesByName(projectName: string): Observable { @@ -125,14 +124,14 @@ export class ProjectService { if (sourceTypes) { return of(sourceTypes); } else { - return this.http.get(`${this.resourceUrl}/${projectName}/source-types`) + return this.http.get(this.projectUrl(projectName) + '/source-types'); } }) ); } delete(projectName: string): Observable { - return this.http.delete(`${this.resourceUrl}/${encodeURIComponent(projectName)}`).pipe( + return this.http.delete(this.projectUrl(projectName)).pipe( tap( () => { const newProjects = this._projects$.value.slice() @@ -159,17 +158,27 @@ export class ProjectService { } private convertProjectToServer(project: Project): any { - const copy: Project = Object.assign({}, project); - copy.startDate = toDate(project.startDate); - copy.endDate = toDate(project.endDate); - return copy; + return { + ...project, + startDate: toDate(project.startDate), + endDate: toDate(project.endDate), + }; } private convertProjectFromServer(projectFromServer: any): Project { - const copy: Project = Object.assign({}, projectFromServer); - copy.startDate = convertDateTimeFromServer(projectFromServer.startDate); - copy.endDate = convertDateTimeFromServer(projectFromServer.endDate); - return copy; + return { + ...projectFromServer, + startDate: convertDateTimeFromServer(projectFromServer.startDate), + endDate: convertDateTimeFromServer(projectFromServer.endDate), + }; + } + + private projectUrl(projectName?: string): string { + if (projectName) { + return 'api/projects/' + encodeURIComponent(projectName); + } else { + return 'api/projects'; + } } } From da98d3dff8a8d5e558837d63c3656c2523e45031 Mon Sep 17 00:00:00 2001 From: Joris Borgdorff Date: Mon, 22 Nov 2021 15:20:00 +0100 Subject: [PATCH 216/431] Fix e2e --- src/main/webapp/app/shared/subject/subject.component.html | 2 +- .../e2e/cypress/integration/entities/subject.spec.ts | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/webapp/app/shared/subject/subject.component.html b/src/main/webapp/app/shared/subject/subject.component.html index 91139c0e1..60fd7d055 100644 --- a/src/main/webapp/app/shared/subject/subject.component.html +++ b/src/main/webapp/app/shared/subject/subject.component.html @@ -319,7 +319,7 @@
    -
    +
    {{ subject.group }}
    diff --git a/src/test/javascript/e2e/cypress/integration/entities/subject.spec.ts b/src/test/javascript/e2e/cypress/integration/entities/subject.spec.ts index 2bd9dd6db..af6b1fa4d 100644 --- a/src/test/javascript/e2e/cypress/integration/entities/subject.spec.ts +++ b/src/test/javascript/e2e/cypress/integration/entities/subject.spec.ts @@ -71,8 +71,8 @@ describe('Subject e2e test', () => { cy.get('jhi-subjects .subject-row').first().find('.subject-row__content .subject-row__group .subject-row__field-label') .should('have.text', 'Group') - cy.get('jhi-subjects .subject-row').first().find('.subject-row__content .subject-row__group') - .should('have.text','Group Test Group C ') + cy.get('jhi-subjects .subject-row').first().find('.subject-row__content .subject-row__group .subject-row__field-value') + .should('have.text','Test Group C') }) it('should be able to filter subjects by subject id', () => { From 13610089c3a3089e2b038a687bb49691a0b56d51 Mon Sep 17 00:00:00 2001 From: Joris Borgdorff Date: Mon, 22 Nov 2021 16:34:58 +0100 Subject: [PATCH 217/431] Cleanup filtering --- .../app/shared/subject/subject.component.html | 24 +----- .../app/shared/subject/subject.component.ts | 24 ++++-- .../app/shared/subject/subject.model.ts | 5 +- .../webapp/app/shared/util/reactive-filter.ts | 76 +++++++++++-------- 4 files changed, 68 insertions(+), 61 deletions(-) diff --git a/src/main/webapp/app/shared/subject/subject.component.html b/src/main/webapp/app/shared/subject/subject.component.html index 60fd7d055..2eb420597 100644 --- a/src/main/webapp/app/shared/subject/subject.component.html +++ b/src/main/webapp/app/shared/subject/subject.component.html @@ -197,28 +197,10 @@
    -
    +
    {{ 'managementPortalApp.subject.filter.filters' | translate}}: - - - - - - - - - + diff --git a/src/main/webapp/app/shared/subject/subject.component.ts b/src/main/webapp/app/shared/subject/subject.component.ts index 17d73b1b0..0542a2456 100644 --- a/src/main/webapp/app/shared/subject/subject.component.ts +++ b/src/main/webapp/app/shared/subject/subject.component.ts @@ -34,7 +34,7 @@ import { NgbCalendar, NgbDateParserFormatter, NgbModal } from "@ng-bootstrap/ng- import { Group, GroupService, ITEMS_PER_PAGE, Project } from '..'; import { AddSubjectsToGroupDialogComponent } from "./add-subjects-to-group-dialog.component"; -import { Subject, SubjectFilterCriteria } from './subject.model'; +import { CheckedSubject, Subject, SubjectFilterCriteria } from './subject.model'; import { SubjectFilterParams, SubjectPaginationParams, SubjectService, } from './subject.service'; import { AlertService } from '../util/alert.service'; import { EventManager } from '../util/event-manager.service'; @@ -45,10 +45,6 @@ import { ReactiveFilterOptions } from "../util/reactive-filter"; -interface CheckedSubject extends Subject { - checked: boolean; -} - @Component({ selector: 'jhi-subjects', changeDetection: ChangeDetectionStrategy.OnPush, @@ -85,6 +81,7 @@ export class SubjectComponent implements OnInit, OnDestroy, OnChanges { enrollmentDate$: Observable enrollmentDateRangeError = false; filterResult$: Observable; + formattedFilterResult$: Observable>; isAdvancedFilterCollapsed = true; @@ -121,6 +118,20 @@ export class SubjectComponent implements OnInit, OnDestroy, OnChanges { } this.enrollmentDate$ = this.observeEnrollmentDate(); this.filterResult$ = this.observeCombinedFilters(); + this.formattedFilterResult$ = this.filterResult$.pipe( + map((f) => { + if (!f) return null; + let {dateOfBirth, enrollmentDateFrom, enrollmentDateTo, groupId, ...filters} = f; + return { + dateOfBirth: this.formatter.format(dateOfBirth), + enrollmentDateFrom: this.formatter.format(enrollmentDateFrom), + enrollmentDateTo: this.formatter.format(enrollmentDateTo), + groupId: this.groups$.value.find(g => g.id.toString() == groupId)?.name, + ...filters, + } + }), + ); + this.filterResult$ = this.observeCombinedFilters(); this.subjects$ = combineLatest([ this._subjects$, @@ -186,7 +197,7 @@ export class SubjectComponent implements OnInit, OnDestroy, OnChanges { ).subscribe(params => { for (let k in params) { if (params.hasOwnProperty(k) && this.filters.hasOwnProperty(k)) { - this.filters[k].next(params[k]); + this.filters[k].next(params[k], true); } } }); @@ -424,7 +435,6 @@ export class SubjectComponent implements OnInit, OnDestroy, OnChanges { enrollmentDateFrom: enrollmentDate.from, enrollmentDateTo: enrollmentDate.to, groupId, - groupName: this.groups$.value.find(g => g.id.toString() == groupId)?.name, })), map(criteria => Object.keys(criteria).some(k => !!criteria[k]) ? criteria : null), diff --git a/src/main/webapp/app/shared/subject/subject.model.ts b/src/main/webapp/app/shared/subject/subject.model.ts index be789b7e6..b352ccb37 100644 --- a/src/main/webapp/app/shared/subject/subject.model.ts +++ b/src/main/webapp/app/shared/subject/subject.model.ts @@ -24,6 +24,10 @@ export interface Subject { roles?: Role[]; } +export interface CheckedSubject extends Subject { + checked: boolean; +} + export interface SubjectFilterCriteria { externalId: string dateOfBirth?: NgbDateStruct @@ -31,7 +35,6 @@ export interface SubjectFilterCriteria { enrollmentDateFrom?: NgbDateStruct enrollmentDateTo?: NgbDateStruct groupId: string - groupName: string personName: string humanReadableId: string } diff --git a/src/main/webapp/app/shared/util/reactive-filter.ts b/src/main/webapp/app/shared/util/reactive-filter.ts index daeaac425..d6600f158 100644 --- a/src/main/webapp/app/shared/util/reactive-filter.ts +++ b/src/main/webapp/app/shared/util/reactive-filter.ts @@ -7,8 +7,14 @@ * See the file LICENSE in the root of this repository. */ -import { BehaviorSubject, merge, Observable, Subject } from "rxjs"; -import { debounceTime, distinctUntilChanged, filter, shareReplay, startWith } from "rxjs/operators"; +import { BehaviorSubject, interval, Observable, of, Subject } from "rxjs"; +import { + debounce, + distinctUntilChanged, + filter, map, + shareReplay, + startWith, +} from "rxjs/operators"; import { NgbCalendar, NgbDate, @@ -17,9 +23,10 @@ import { } from "@ng-bootstrap/ng-bootstrap"; export class ReactiveFilter { - protected readonly _value$: BehaviorSubject; + protected _value?: T; + protected readonly debounceTime: number protected readonly _error$: BehaviorSubject; - protected readonly trigger$: Subject; + protected readonly trigger$: Subject; error$: Observable; value$: Observable; @@ -33,45 +40,50 @@ export class ReactiveFilter { this._error$ = new BehaviorSubject(''); this.error$ = this._error$.asObservable().pipe(distinctUntilChanged()); - this._value$ = new BehaviorSubject(null); - this.trigger$ = new Subject(); - - let validValue = this._value$.pipe( - debounceTime(options.debounceTime || 200), - filter(v => { - const error = this.validate(v); - if (error) { - this._error$.next(error); - return false; - } else { - this._error$.next(''); - return true; - } - }), - ); - let mergedSignal = merge(validValue, this.trigger$).pipe( - startWith(options.initialValue || null as T | null), + this.debounceTime = typeof options.debounceTime === 'number' ? options.debounceTime : 200; + this._value = null; + this.trigger$ = new Subject(); + + let signal = this.trigger$.pipe( + startWith(0), + debounce(t => t ? interval(t) : of()), + map(() => this._value), + filter(value => { + const error = this.validate(value); + if (error) { + this._error$.next(error); + return false; + } else { + this._error$.next(''); + return true; + } + }), ); if (options.mapResult) { - mergedSignal = options.mapResult(mergedSignal); + signal = options.mapResult(signal); } else { - mergedSignal = mergedSignal.pipe(distinctUntilChanged()); + signal = signal.pipe(distinctUntilChanged()); } - this.value$ = mergedSignal.pipe(shareReplay(1)); + this.value$ = signal.pipe(shareReplay(1)); } - next(value?: T){ - this._value$.next(value); - } + next(value?: T, immediately?: boolean){ + this._value = value; + if (immediately) { + this.trigger$.next(0); + } else { + this.trigger$.next(this.debounceTime); + } + } clear() { - this._value$.next(null); + this._value = null; this._error$.next(''); - this.trigger$.next(null); + this.trigger$.next(0); } complete() { - this._value$.complete(); + this._value = undefined; this._error$.complete(); this.trigger$.complete(); } @@ -98,7 +110,7 @@ export class NgbDateReactiveFilter extends ReactiveFilter { distinctUntilChanged((d1, d2) => d1 === d2 || (d1 && NgbDate.from(d1).equals(d2))) ), - debounceTime: 1, + debounceTime: 0, initialValue: options.initialValue, }); } From 3c284b310ba90043417a61a17a658d66f7e57fb3 Mon Sep 17 00:00:00 2001 From: Joris Borgdorff Date: Tue, 23 Nov 2021 12:23:29 +0100 Subject: [PATCH 218/431] Enable organization level checks --- .../authorization/AuthoritiesConstants.java | 60 +++++++++---- .../auth/authorization/Permission.java | 2 +- .../auth/authorization/Permissions.java | 25 ++++-- .../authorization/RadarAuthorization.java | 12 +-- .../auth/token/AbstractRadarToken.java | 86 ++++++++++++++----- .../auth/token/AuthorityReference.java | 75 ++++++++++++++++ .../radarbase/auth/token/JwtRadarToken.java | 39 +++++---- .../org/radarbase/auth/token/RadarToken.java | 81 ++++++++++++++++- .../auth/token/AbstractRadarTokenTest.java | 22 ++--- .../management/config/MockConfiguration.java | 2 +- 10 files changed, 325 insertions(+), 79 deletions(-) create mode 100644 radar-auth/src/main/java/org/radarbase/auth/token/AuthorityReference.java diff --git a/radar-auth/src/main/java/org/radarbase/auth/authorization/AuthoritiesConstants.java b/radar-auth/src/main/java/org/radarbase/auth/authorization/AuthoritiesConstants.java index 98d26dd3f..a420791ab 100644 --- a/radar-auth/src/main/java/org/radarbase/auth/authorization/AuthoritiesConstants.java +++ b/radar-auth/src/main/java/org/radarbase/auth/authorization/AuthoritiesConstants.java @@ -1,22 +1,52 @@ package org.radarbase.auth.authorization; +import java.util.Locale; + /** * Constants for Spring Security authorities. */ -public interface AuthoritiesConstants { - String SYS_ADMIN = "ROLE_SYS_ADMIN"; - - String ORGANIZATION_ADMIN = "ROLE_ORGANIZATION_ADMIN"; - - String PROJECT_ADMIN = "ROLE_PROJECT_ADMIN"; - - String PROJECT_OWNER = "ROLE_PROJECT_OWNER"; - - String PROJECT_AFFILIATE = "ROLE_PROJECT_AFFILIATE"; - - String PROJECT_ANALYST = "ROLE_PROJECT_ANALYST"; - - String PARTICIPANT = "ROLE_PARTICIPANT"; - String INACTIVE_PARTICIPANT = "ROLE_INACTIVE_PARTICIPANT"; +public enum AuthoritiesConstants { + SYS_ADMIN(Scope.GLOBAL), + PROJECT_ADMIN(Scope.PROJECT), + PROJECT_OWNER(Scope.PROJECT), + PROJECT_AFFILIATE(Scope.PROJECT), + PROJECT_ANALYST(Scope.PROJECT), + PARTICIPANT(Scope.PROJECT), + INACTIVE_PARTICIPANT(Scope.PROJECT), + ORGANIZATION_ADMIN(Scope.ORGANIZATION); + + private final Scope scope; + + AuthoritiesConstants(Scope scope) { + this.scope = scope; + } + + public Scope scope() { + return scope; + } + + public String role() { + return "ROLE_" + name(); + } + + public static AuthoritiesConstants valueOfRole(String role) { + String upperRole = role.toUpperCase(Locale.ROOT); + if (!upperRole.startsWith("ROLE_")) { + throw new IllegalArgumentException("Cannot map role without 'ROLE_' prefix"); + } + return valueOf(upperRole.substring(5)); + } + + public static AuthoritiesConstants valueOfRoleOrNull(String role) { + try { + return valueOfRole(role); + } catch (IllegalArgumentException ex) { + return null; + } + } + + public enum Scope { + GLOBAL, ORGANIZATION, PROJECT + } } diff --git a/radar-auth/src/main/java/org/radarbase/auth/authorization/Permission.java b/radar-auth/src/main/java/org/radarbase/auth/authorization/Permission.java index 146080f36..82d1bb88c 100644 --- a/radar-auth/src/main/java/org/radarbase/auth/authorization/Permission.java +++ b/radar-auth/src/main/java/org/radarbase/auth/authorization/Permission.java @@ -109,7 +109,7 @@ public Operation getOperation() { * @param authority the authority name * @return true if the given authority has this permission associated with it, false otherwise */ - public boolean isAuthorityAllowed(String authority) { + public boolean isAuthorityAllowed(AuthoritiesConstants authority) { return Permissions.allowedAuthorities(this).contains(authority); } diff --git a/radar-auth/src/main/java/org/radarbase/auth/authorization/Permissions.java b/radar-auth/src/main/java/org/radarbase/auth/authorization/Permissions.java index 525f50174..6f590cb01 100644 --- a/radar-auth/src/main/java/org/radarbase/auth/authorization/Permissions.java +++ b/radar-auth/src/main/java/org/radarbase/auth/authorization/Permissions.java @@ -3,14 +3,19 @@ import java.util.Arrays; import java.util.Collections; import java.util.EnumMap; +import java.util.EnumSet; import java.util.HashMap; import java.util.Map; import java.util.Set; import java.util.function.Predicate; +import java.util.stream.Collector; +import java.util.stream.Collectors; import java.util.stream.Stream; +import static java.util.stream.Collectors.collectingAndThen; import static java.util.stream.Collectors.groupingBy; import static java.util.stream.Collectors.mapping; +import static java.util.stream.Collectors.toCollection; import static java.util.stream.Collectors.toUnmodifiableSet; import static org.radarbase.auth.authorization.AuthoritiesConstants.INACTIVE_PARTICIPANT; import static org.radarbase.auth.authorization.AuthoritiesConstants.ORGANIZATION_ADMIN; @@ -26,7 +31,7 @@ */ public final class Permissions { - private static final Map> PERMISSION_MATRIX; + private static final Map> PERMISSION_MATRIX; static { PERMISSION_MATRIX = createPermissions(); @@ -42,7 +47,7 @@ private Permissions() { * @param permission The permission to look up. * @return An unmodifiable view of the set of allowed authorities. */ - public static Set allowedAuthorities(Permission permission) { + public static Set allowedAuthorities(Permission permission) { return PERMISSION_MATRIX.getOrDefault(permission, Set.of()); } @@ -53,15 +58,16 @@ public static Set allowedAuthorities(Permission permission) { * permission.

    * @return An unmodifiable view of the permission matrix. */ - public static Map> getPermissionMatrix() { + public static Map> getPermissionMatrix() { return PERMISSION_MATRIX; } /** * Static permission matrix based on the currently agreed upon security rules. */ - private static Map> createPermissions() { - Map> rolePermissions = new HashMap<>(); + private static Map> createPermissions() { + Map> rolePermissions = new EnumMap<>( + AuthoritiesConstants.class); // System admin can do everything. rolePermissions.put(SYS_ADMIN, Permission.stream()); @@ -140,7 +146,14 @@ private static Map> createPermissions() { .collect(groupingBy( Map.Entry::getKey, () -> new EnumMap<>(Permission.class), - mapping(Map.Entry::getValue, toUnmodifiableSet())))); + mapping(Map.Entry::getValue, toUnmodifiableEnumSet())))); + } + + private static Collector> + toUnmodifiableEnumSet() { + return collectingAndThen( + toCollection(() -> EnumSet.noneOf(AuthoritiesConstants.class)), + Collections::unmodifiableSet); } private static Predicate excludeOtherEntityOperations( diff --git a/radar-auth/src/main/java/org/radarbase/auth/authorization/RadarAuthorization.java b/radar-auth/src/main/java/org/radarbase/auth/authorization/RadarAuthorization.java index 5d104a7a5..633eda0e9 100644 --- a/radar-auth/src/main/java/org/radarbase/auth/authorization/RadarAuthorization.java +++ b/radar-auth/src/main/java/org/radarbase/auth/authorization/RadarAuthorization.java @@ -19,14 +19,14 @@ private RadarAuthorization() { } /** - * Similar to {@link RadarToken#hasAuthority(String)} (Permission)}, but this method throws an - * exception rather than returning a boolean. Useful in combination with e.g. Spring's - * controllers and exception translators. + * Similar to {@link RadarToken#hasAuthority(AuthoritiesConstants)}, but this + * method throws an exception rather than returning a boolean. Useful in combination with e.g. + * Spring's controllers and exception translators. * @param token The token of the requester * @param authority The authority to check * @throws NotAuthorizedException if the supplied token does not have the authority */ - public static void checkAuthority(RadarToken token, String authority) + public static void checkAuthority(RadarToken token, AuthoritiesConstants authority) throws NotAuthorizedException { if (!token.isClientCredentials()) { log.debug("Checking authority {} for user {}", authority, @@ -40,7 +40,7 @@ public static void checkAuthority(RadarToken token, String authority) /** - * Similar to {@link RadarToken#hasAuthority(String)} (Permission)}, but this method throws an + * Similar to {@link RadarToken#hasAuthority(AuthoritiesConstants)}, but this method throws an * exception rather than returning a boolean. Useful in combination with e.g. Spring's * controllers and exception translators. * @param token The token of the requester @@ -48,7 +48,7 @@ public static void checkAuthority(RadarToken token, String authority) * @param permission Permission that the authority should have. * @throws NotAuthorizedException if the supplied token does not have the authority */ - public static void checkAuthorityAndPermission(RadarToken token, String authority, + public static void checkAuthorityAndPermission(RadarToken token, AuthoritiesConstants authority, Permission permission) throws NotAuthorizedException { log.debug("Checking authority {} and permission {} for user {}", authority, permission, diff --git a/radar-auth/src/main/java/org/radarbase/auth/token/AbstractRadarToken.java b/radar-auth/src/main/java/org/radarbase/auth/token/AbstractRadarToken.java index ee1ef4714..81ad77a87 100644 --- a/radar-auth/src/main/java/org/radarbase/auth/token/AbstractRadarToken.java +++ b/radar-auth/src/main/java/org/radarbase/auth/token/AbstractRadarToken.java @@ -1,29 +1,27 @@ package org.radarbase.auth.token; -import static java.util.Collections.singletonList; -import static org.radarbase.auth.authorization.AuthoritiesConstants.PARTICIPANT; -import static org.radarbase.auth.authorization.AuthoritiesConstants.SYS_ADMIN; +import org.radarbase.auth.authorization.AuthoritiesConstants; +import org.radarbase.auth.authorization.Permission; -import java.util.Collection; -import java.util.List; import java.util.Objects; -import org.radarbase.auth.authorization.Permission; +import java.util.Set; + +import static org.radarbase.auth.authorization.AuthoritiesConstants.PARTICIPANT; +import static org.radarbase.auth.authorization.AuthoritiesConstants.SYS_ADMIN; /** * Partial implementation of {@link RadarToken}, providing a default implementation for the three * permission checks. */ public abstract class AbstractRadarToken implements RadarToken { - protected static final String CLIENT_CREDENTIALS = "client_credentials"; @Override - public boolean hasAuthority(String authority) { + public boolean hasAuthority(AuthoritiesConstants authority) { return isClientCredentials() - || getAuthorities().stream().anyMatch(authority::equals); + || getAuthoritiesConstants().stream().anyMatch(authority::equals); } - @Override public boolean hasPermission(Permission permission) { return hasScope(permission.scopeName()) @@ -31,10 +29,25 @@ public boolean hasPermission(Permission permission) { } + @Override + public boolean hasPermissionOnOrganization(Permission permission, String organization) { + return hasScope(permission.scopeName()) + && (isClientCredentials() || hasAuthorityForOrganization(permission, organization)); + } + + @Override + public boolean hasPermissionOnOrganizationAndProject(Permission permission, String organization, + String projectName) { + return hasScope(permission.scopeName()) + && (isClientCredentials() || hasAuthorityForOrganizationAndProject( + permission, organization, projectName)); + } + @Override public boolean hasPermissionOnProject(Permission permission, String projectName) { return hasScope(permission.scopeName()) - && (isClientCredentials() || hasAuthorityForProject(permission, projectName)); + && (isClientCredentials() || hasAuthorityForProject( + permission, projectName)); } @Override @@ -69,11 +82,42 @@ public boolean isClientCredentials() { * @return {@code true} if any authority contains the permission, {@code false} otherwise */ protected boolean hasAuthorityForPermission(Permission permission) { - return hasNonProjectRelatedAuthorityForPermission(permission) - || getRoles() - .values().stream() - .flatMap(Collection::stream) - .anyMatch(permission::isAuthorityAllowed); + return getRoles().stream() + .map(AuthorityReference::getRole) + .anyMatch(permission::isAuthorityAllowed); + } + + /** + * Check authorities in this token linked to the given project, or not linked to any project + * (such as {@code SYS_ADMIN}), for the given permission. + * @param permission the permission + * @param organization the organization name + * @return {@code true} if any authority contains the permission, {@code false} otherwise + */ + protected boolean hasAuthorityForOrganization(Permission permission, String organization) { + if (hasNonProjectRelatedAuthorityForPermission(permission)) { + return true; + } + if (organization == null) { + return false; + } + Set organizationRoles = getOrganizationRoles().get(organization); + return organizationRoles != null + && organizationRoles.stream().anyMatch(permission::isAuthorityAllowed); + } + + /** + * Check authorities in this token linked to the given project, or not linked to any project + * (such as {@code SYS_ADMIN}), for the given permission. + * @param permission the permission + * @param organization the organization name + * @param projectName the project name + * @return {@code true} if any authority contains the permission, {@code false} otherwise + */ + protected boolean hasAuthorityForOrganizationAndProject(Permission permission, + String organization, String projectName) { + return hasAuthorityForOrganization(permission, organization) + || hasAuthorityForProject(permission, projectName); } /** @@ -90,8 +134,9 @@ protected boolean hasAuthorityForProject(Permission permission, String projectNa if (projectName == null) { return false; } - List roles = getRoles().get(projectName); - return roles != null && roles.stream().anyMatch(permission::isAuthorityAllowed); + Set projectRoles = getProjectRoles().get(projectName); + return projectRoles != null + && projectRoles.stream().anyMatch(permission::isAuthorityAllowed); } /** @@ -135,7 +180,7 @@ protected boolean hasAuthorityForSource(Permission permission, String projectNam * otherwise */ protected boolean hasNonProjectRelatedAuthorityForPermission(Permission permission) { - return getAuthorities().contains(SYS_ADMIN) + return getAuthoritiesConstants().contains(SYS_ADMIN) && permission.isAuthorityAllowed(SYS_ADMIN); } @@ -146,7 +191,7 @@ protected boolean hasNonProjectRelatedAuthorityForPermission(Permission permissi * {@code false} otherwise */ protected boolean isJustParticipant(String projectName) { - return singletonList(PARTICIPANT).equals(getRoles().get(projectName)); + return Set.of(PARTICIPANT).equals(getProjectRoles().get(projectName)); } @Override @@ -183,4 +228,5 @@ public String toString() { + ", type='" + getType() + '\'' + '}'; } + } diff --git a/radar-auth/src/main/java/org/radarbase/auth/token/AuthorityReference.java b/radar-auth/src/main/java/org/radarbase/auth/token/AuthorityReference.java new file mode 100644 index 000000000..c78f95e15 --- /dev/null +++ b/radar-auth/src/main/java/org/radarbase/auth/token/AuthorityReference.java @@ -0,0 +1,75 @@ +/* + * Copyright (c) 2021. The Hyve + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * + * See the file LICENSE in the root of this repository. + */ + +package org.radarbase.auth.token; + +import org.radarbase.auth.authorization.AuthoritiesConstants; + +import java.util.Objects; + +import static java.util.Objects.requireNonNull; + +public class AuthorityReference { + private final String authority; + private final String referent; + private final AuthoritiesConstants role; + + public AuthorityReference(String authority) { + this(authority, null); + } + + public AuthorityReference(AuthoritiesConstants role) { + this(role, null); + } + + public AuthorityReference(AuthoritiesConstants role, String referent) { + this.role = requireNonNull(role); + this.authority = role.role(); + this.referent = referent; + } + + public AuthorityReference(String authority, String referent) { + this.authority = requireNonNull(authority); + this.role = AuthoritiesConstants.valueOfRoleOrNull(authority); + this.referent = referent; + } + + public AuthoritiesConstants getRole() { + return role; + } + + public String getReferent() { + return referent; + } + + public String getAuthority() { + return authority; + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + + AuthorityReference that = (AuthorityReference) o; + + return Objects.equals(referent, that.referent) && authority.equals(that.authority); + } + + @Override + public int hashCode() { + int result = referent != null ? referent.hashCode() : 0; + result = 31 * result + authority.hashCode(); + return result; + } +} diff --git a/radar-auth/src/main/java/org/radarbase/auth/token/JwtRadarToken.java b/radar-auth/src/main/java/org/radarbase/auth/token/JwtRadarToken.java index 38b415df2..42c74dab7 100644 --- a/radar-auth/src/main/java/org/radarbase/auth/token/JwtRadarToken.java +++ b/radar-auth/src/main/java/org/radarbase/auth/token/JwtRadarToken.java @@ -1,18 +1,21 @@ package org.radarbase.auth.token; +import static java.util.Objects.requireNonNullElseGet; import static java.util.stream.Collectors.groupingBy; -import static java.util.stream.Collectors.mapping; -import static java.util.stream.Collectors.toList; +import static java.util.stream.Collectors.toUnmodifiableSet; import com.auth0.jwt.exceptions.JWTDecodeException; import com.auth0.jwt.interfaces.Claim; import com.auth0.jwt.interfaces.DecodedJWT; +import org.radarbase.auth.authorization.AuthoritiesConstants; + import java.util.Arrays; import java.util.Collections; import java.util.Date; import java.util.List; -import java.util.Map; +import java.util.Set; import java.util.regex.Pattern; +import java.util.stream.Stream; /** * Implementation of {@link RadarToken} based on JWT tokens. @@ -28,7 +31,7 @@ public class JwtRadarToken extends AbstractRadarToken { public static final String CLIENT_ID_CLAIM = "client_id"; public static final String USER_NAME_CLAIM = "user_name"; - private final Map> roles; + private final Set roles; private final List authorities; private final List scopes; private final List sources; @@ -53,8 +56,14 @@ public class JwtRadarToken extends AbstractRadarToken { */ public JwtRadarToken(DecodedJWT jwt) { this.jwt = jwt; - roles = parseRoles(jwt); authorities = emptyIfNull(jwt.getClaim(AUTHORITIES_CLAIM).asList(String.class)); + roles = Stream.concat( + authorities.stream() + .map(AuthoritiesConstants::valueOfRoleOrNull) + .filter(r -> r != null && r.scope() == AuthoritiesConstants.Scope.GLOBAL) + .map(AuthorityReference::new), + parseRoles(jwt)) + .collect(toUnmodifiableSet()); Claim scopeClaim = jwt.getClaim(SCOPE_CLAIM); String scopeClaimString = scopeClaim.asString(); @@ -63,11 +72,7 @@ public JwtRadarToken(DecodedJWT jwt) { scopes = Arrays.asList(scopeClaimString.split(" ")); } else { List scopeClaimList = scopeClaim.asList(String.class); - if (scopeClaimList != null) { - scopes = scopeClaimList; - } else { - scopes = Collections.emptyList(); - } + scopes = requireNonNullElseGet(scopeClaimList, Collections::emptyList); } sources = emptyIfNull(jwt.getClaim(SOURCES_CLAIM).asList(String.class)); @@ -84,7 +89,7 @@ public JwtRadarToken(DecodedJWT jwt) { } @Override - public Map> getRoles() { + public Set getRoles() { return roles; } @@ -167,13 +172,13 @@ public List getClaimList(String name) { } } - private Map> parseRoles(DecodedJWT jwt) { + private Stream parseRoles(DecodedJWT jwt) { return emptyIfNull(jwt.getClaim(ROLES_CLAIM).asList(String.class)).stream() - .filter(s -> s.contains(":")) - .distinct() + .filter(s -> s != null && !s.isBlank()) .map(ROLE_SEPARATOR_PATTERN::split) - .collect(groupingBy(s -> s[0], - mapping(s -> s[1], toList()))); + .map(v -> v.length == 1 || v[1].isEmpty() + ? new AuthorityReference(v[0]) + : new AuthorityReference(v[1], v[0])); } private static String emptyIfNull(String string) { @@ -181,6 +186,6 @@ private static String emptyIfNull(String string) { } private static List emptyIfNull(List list) { - return list != null ? list : Collections.emptyList(); + return requireNonNullElseGet(list, Collections::emptyList); } } diff --git a/radar-auth/src/main/java/org/radarbase/auth/token/RadarToken.java b/radar-auth/src/main/java/org/radarbase/auth/token/RadarToken.java index d33afae31..13c297d99 100644 --- a/radar-auth/src/main/java/org/radarbase/auth/token/RadarToken.java +++ b/radar-auth/src/main/java/org/radarbase/auth/token/RadarToken.java @@ -1,22 +1,69 @@ package org.radarbase.auth.token; +import org.radarbase.auth.authorization.AuthoritiesConstants; import org.radarbase.auth.authorization.Permission; import java.util.Date; +import java.util.EnumSet; import java.util.List; import java.util.Map; +import java.util.Objects; +import java.util.Set; + +import static java.util.stream.Collectors.groupingBy; +import static java.util.stream.Collectors.mapping; +import static java.util.stream.Collectors.toCollection; +import static java.util.stream.Collectors.toSet; /** * Created by dverbeec on 10/01/2018. */ public interface RadarToken { + /** + * Get all roles defined in this token. + * @return non-null set describing the roles defined in this token. + */ + Set getRoles(); + + /** + * Get the global roles defined in this token. + * @return non-null map describing the roles defined in this token. The keys in the map are the + * project names, and the values are lists of authority names associated to the project. + */ + default Set getGlobalRoles() { + return getRoles().stream() + .map(AuthorityReference::getRole) + .filter(r -> r.scope() == AuthoritiesConstants.Scope.GLOBAL) + .collect(toSet()); + } /** * Get the roles defined in this token. * @return non-null map describing the roles defined in this token. The keys in the map are the * project names, and the values are lists of authority names associated to the project. */ - Map> getRoles(); + default Map> getProjectRoles() { + return getRoles().stream() + .filter(r -> r.getRole().scope() == AuthoritiesConstants.Scope.PROJECT + && r.getReferent() != null) + .collect(groupingBy(AuthorityReference::getReferent, + mapping(AuthorityReference::getRole, + toCollection(() -> EnumSet.noneOf(AuthoritiesConstants.class))))); + } + + /** + * Get the roles defined in this token. + * @return non-null map describing the roles defined in this token. The keys in the map are the + * project names, and the values are lists of authority names associated to the project. + */ + default Map> getOrganizationRoles() { + return getRoles().stream() + .filter(r -> r.getRole().scope() == AuthoritiesConstants.Scope.ORGANIZATION + && r.getReferent() != null) + .collect(groupingBy(AuthorityReference::getReferent, + mapping(AuthorityReference::getRole, + toCollection(() -> EnumSet.noneOf(AuthoritiesConstants.class))))); + } /** * Get a list of non-project related authorities. @@ -24,6 +71,17 @@ public interface RadarToken { */ List getAuthorities(); + /** + * Get a list of non-project related authorities. + * @return non-null list of authority names + */ + default Set getAuthoritiesConstants() { + return getAuthorities().stream() + .map(AuthoritiesConstants::valueOfRoleOrNull) + .filter(Objects::nonNull) + .collect(toCollection(() -> EnumSet.noneOf(AuthoritiesConstants.class))); + } + /** * Get a list of scopes assigned to this token. * @return non-null list of scope names @@ -118,7 +176,7 @@ public interface RadarToken { * @param authority The permission to check * @return {@code true} if this token has the permission, {@code false} otherwise */ - boolean hasAuthority(String authority); + boolean hasAuthority(AuthoritiesConstants authority); /** * Check if this token gives the given permission, not taking into account project affiliations. @@ -134,6 +192,25 @@ public interface RadarToken { boolean hasPermission(Permission permission); /** + * Check if this token gives a permission in a specific organization. + * @param permission the permission + * @param organization the organization name + * @return true if this token has the permission in the project, false otherwise + */ + boolean hasPermissionOnOrganization(Permission permission, String organization); + + /** + * Check if this token gives a permission in a specific project in a given organization. + * @param permission the permission + * @param organization the organization name + * @param projectName the project name + * @return true if this token has the permission in the project, false otherwise + */ + boolean hasPermissionOnOrganizationAndProject(Permission permission, String organization, + String projectName); + + /** + * * Check if this token gives a permission in a specific project. * @param permission the permission * @param projectName the project name diff --git a/radar-auth/src/test/java/org/radarbase/auth/token/AbstractRadarTokenTest.java b/radar-auth/src/test/java/org/radarbase/auth/token/AbstractRadarTokenTest.java index 87a2161d6..88afa18b6 100644 --- a/radar-auth/src/test/java/org/radarbase/auth/token/AbstractRadarTokenTest.java +++ b/radar-auth/src/test/java/org/radarbase/auth/token/AbstractRadarTokenTest.java @@ -8,16 +8,16 @@ import static org.radarbase.auth.token.AbstractRadarToken.CLIENT_CREDENTIALS; import java.util.ArrayList; -import java.util.Collections; import java.util.Date; -import java.util.HashMap; +import java.util.HashSet; import java.util.List; -import java.util.Map; +import java.util.Set; + import org.junit.jupiter.api.Test; class AbstractRadarTokenTest { static class MockToken extends AbstractRadarToken { - private final Map> roles = new HashMap<>(); + private final Set roles = new HashSet<>(); private final List sources = new ArrayList<>(); private final List scopes = new ArrayList<>(); private String grantType = "refresh_token"; @@ -25,7 +25,7 @@ static class MockToken extends AbstractRadarToken { private String subject = null; @Override - public Map> getRoles() { + public Set getRoles() { return roles; } @@ -122,7 +122,7 @@ void notHasPermissionWithoutAuthority() { void hasPermissionAsAdmin() { MockToken token = new MockToken(); token.scopes.add(MEASUREMENT_CREATE.scopeName()); - token.authorities.add(SYS_ADMIN); + token.authorities.add(SYS_ADMIN.role()); assertTrue(token.hasPermission(MEASUREMENT_CREATE)); } @@ -130,7 +130,7 @@ void hasPermissionAsAdmin() { void hasPermissionAsUser() { MockToken token = new MockToken(); token.scopes.add(MEASUREMENT_CREATE.scopeName()); - token.roles.put("some", Collections.singletonList(PARTICIPANT)); + token.roles.add(new AuthorityReference(PARTICIPANT, "some")); assertTrue(token.hasPermission(MEASUREMENT_CREATE)); } @@ -159,7 +159,7 @@ void notHasPermissioOnProjectnWithoutAuthority() { void hasPermissionOnProjectAsAdmin() { MockToken token = new MockToken(); token.scopes.add(MEASUREMENT_CREATE.scopeName()); - token.authorities.add(SYS_ADMIN); + token.authorities.add(SYS_ADMIN.role()); assertTrue(token.hasPermissionOnProject(MEASUREMENT_CREATE, "project")); } @@ -167,7 +167,7 @@ void hasPermissionOnProjectAsAdmin() { void hasPermissionOnProjectAsUser() { MockToken token = new MockToken(); token.scopes.add(MEASUREMENT_CREATE.scopeName()); - token.roles.put("project", Collections.singletonList(PARTICIPANT)); + token.roles.add(new AuthorityReference(PARTICIPANT, "project")); assertTrue(token.hasPermissionOnProject(MEASUREMENT_CREATE, "project")); assertFalse(token.hasPermissionOnProject(MEASUREMENT_CREATE, "otherProject")); } @@ -198,7 +198,7 @@ void notHasPermissioOnSubjectnWithoutAuthority() { void hasPermissionOnSubjectAsAdmin() { MockToken token = new MockToken(); token.scopes.add(MEASUREMENT_CREATE.scopeName()); - token.authorities.add(SYS_ADMIN); + token.authorities.add(SYS_ADMIN.role()); assertTrue(token.hasPermissionOnSubject(MEASUREMENT_CREATE, "project", "subject")); } @@ -206,7 +206,7 @@ void hasPermissionOnSubjectAsAdmin() { void hasPermissionOnSubjectAsUser() { MockToken token = new MockToken(); token.scopes.add(MEASUREMENT_CREATE.scopeName()); - token.roles.put("project", Collections.singletonList(PARTICIPANT)); + token.roles.add(new AuthorityReference(PARTICIPANT, "project")); token.subject = "subject"; assertTrue(token.hasPermissionOnSubject(MEASUREMENT_CREATE, "project", "subject")); assertFalse(token.hasPermissionOnSubject(MEASUREMENT_CREATE, "otherProject", "subject")); diff --git a/src/test/java/org/radarbase/management/config/MockConfiguration.java b/src/test/java/org/radarbase/management/config/MockConfiguration.java index f5bb75311..556099fcf 100644 --- a/src/test/java/org/radarbase/management/config/MockConfiguration.java +++ b/src/test/java/org/radarbase/management/config/MockConfiguration.java @@ -29,7 +29,7 @@ public class MockConfiguration { public RadarToken radarTokenMock() { RadarToken token = mock(RadarToken.class); when(token.getSubject()).thenReturn("admin"); - when(token.hasAuthority(anyString())).thenAnswer(a -> a.getArgument(0).equals(SYS_ADMIN)); + when(token.hasAuthority(any())).thenAnswer(a -> a.getArgument(0).equals(SYS_ADMIN)); when(token.hasPermission(any())).thenReturn(true); when(token.hasPermissionOnProject(any(), any())).thenReturn(true); when(token.hasPermissionOnSubject(any(), any(), any())).thenReturn(true); From 9ddbfce8d3dd101b15723c209f846f25795a8ccb Mon Sep 17 00:00:00 2001 From: Joris Borgdorff Date: Tue, 23 Nov 2021 14:53:57 +0100 Subject: [PATCH 219/431] Bump gradle version --- Dockerfile | 2 +- build.gradle | 2 +- gradle/wrapper/gradle-wrapper.properties | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 3a335c556..8f438e8e1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -21,7 +21,7 @@ COPY radar-auth/build.gradle radar-auth/ COPY radar-auth/deprecated-auth0/build.gradle radar-auth/deprecated-auth0/ COPY oauth-client-util/build.gradle oauth-client-util/ -RUN ./gradlew downloadDependencies :radar-auth:shadowJar --no-watch-fs --info --stacktrace +RUN ./gradlew downloadDependencies :radar-auth:shadowJar --no-watch-fs # now we copy our application source code and build it diff --git a/build.gradle b/build.gradle index efe016c06..95cc15bcc 100644 --- a/build.gradle +++ b/build.gradle @@ -249,7 +249,7 @@ task cleanResources(type: Delete) { } wrapper { - gradleVersion '7.2' + gradleVersion '7.3' } task stage(dependsOn: 'bootWar') { diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index ffed3a254..e750102e0 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists From 3da54a78420660f6e12c47f7bcd20ed95ac0459e Mon Sep 17 00:00:00 2001 From: aykl Date: Wed, 24 Nov 2021 10:13:11 +0100 Subject: [PATCH 220/431] Get Organization Projects Endpoint added --- .../auth/authorization/Permission.java | 2 + .../auth/token/AbstractRadarToken.java | 2 + .../radarbase/management/domain/Project.java | 20 +++++++ .../repository/ProjectRepository.java | 7 +++ .../service/OrganizationService.java | 21 +++++++ .../management/service/ProjectService.java | 15 +++++ .../management/service/dto/ProjectDTO.java | 10 ++++ .../service/mapper/ProjectMapper.java | 1 + .../web/rest/OrganizationResource.java | 58 ++++++++++++++++++- .../web/rest/errors/ErrorConstants.java | 2 + .../20211110160000_add_organization.xml | 29 ++++++++++ .../config/liquibase/organization.csv | 2 + .../organization/organization.service.ts | 4 ++ .../app/shared/project/project.service.ts | 6 ++ .../web/rest/GroupResourceIntTest.java | 1 - .../web/rest/OrganizationResourceIntTest.java | 56 ++++++++++++++++-- .../web/rest/ProjectResourceIntTest.java | 18 ++++++ 17 files changed, 246 insertions(+), 8 deletions(-) create mode 100644 src/main/resources/config/liquibase/organization.csv diff --git a/radar-auth/src/main/java/org/radarbase/auth/authorization/Permission.java b/radar-auth/src/main/java/org/radarbase/auth/authorization/Permission.java index 738e551f5..5c72a4ff3 100644 --- a/radar-auth/src/main/java/org/radarbase/auth/authorization/Permission.java +++ b/radar-auth/src/main/java/org/radarbase/auth/authorization/Permission.java @@ -88,6 +88,8 @@ public enum Operation { new Permission(Entity.ORGANIZATION, Operation.CREATE); public static final Permission ORGANIZATION_READ = new Permission(Entity.ORGANIZATION, Operation.READ); + public static final Permission ORGANIZATION_UPDATE = + new Permission(Entity.ORGANIZATION, Operation.UPDATE); public static final Permission OAUTHCLIENTS_CREATE = new Permission(Entity.OAUTHCLIENTS, Operation.CREATE); public static final Permission OAUTHCLIENTS_READ = diff --git a/radar-auth/src/main/java/org/radarbase/auth/token/AbstractRadarToken.java b/radar-auth/src/main/java/org/radarbase/auth/token/AbstractRadarToken.java index 489b95aae..d0048f112 100644 --- a/radar-auth/src/main/java/org/radarbase/auth/token/AbstractRadarToken.java +++ b/radar-auth/src/main/java/org/radarbase/auth/token/AbstractRadarToken.java @@ -91,12 +91,14 @@ protected boolean hasAuthorityForPermission(Permission permission) { * @return {@code true} if any authority contains the permission, {@code false} otherwise */ protected boolean hasAuthorityForOrganization(Permission permission, String organizationName) { + /* if (hasNonOrganizationRelatedAuthorityForPermission(permission)) { return true; } if (organizationName == null) { return false; } + */ // TODO implement role/authority check for organizations return false; } diff --git a/src/main/java/org/radarbase/management/domain/Project.java b/src/main/java/org/radarbase/management/domain/Project.java index 937e22199..4c23a312b 100644 --- a/src/main/java/org/radarbase/management/domain/Project.java +++ b/src/main/java/org/radarbase/management/domain/Project.java @@ -76,6 +76,13 @@ public class Project extends AbstractEntity implements Serializable { @Column(name = "jhi_organization") private String organization; + // Ideally, this should be an organization Entity, + // but to avoid confusion with the existing organization field + // I'll keep it as an ID for now. + // TODO: sunset the old organization field + @Column(name = "organization_id") + private Long organizationId; + @NotNull @Column(name = "location", nullable = false) private String location; @@ -171,6 +178,19 @@ public void setOrganization(String organization) { this.organization = organization; } + public Long getOrganizationId() { + return organizationId; + } + + public Project organizationId(Long organizationId) { + this.organizationId = organizationId; + return this; + } + + public void setOrganizationId(Long organizationId) { + this.organizationId = organizationId; + } + public String getLocation() { return location; } diff --git a/src/main/java/org/radarbase/management/repository/ProjectRepository.java b/src/main/java/org/radarbase/management/repository/ProjectRepository.java index 8f6ad8c58..95013fe8e 100644 --- a/src/main/java/org/radarbase/management/repository/ProjectRepository.java +++ b/src/main/java/org/radarbase/management/repository/ProjectRepository.java @@ -25,6 +25,13 @@ public interface ProjectRepository extends JpaRepository, countQuery = "select distinct count(project) from Project project") Page findAllWithEagerRelationships(Pageable pageable); + @Query("select project from Project project " + + "WHERE project.organizationId IN " + + "(SELECT org.id from Organization org " + + " WHERE org.name = :organization_name)") + List findAllByOrganizationName( + @Param("organization_name") String organizationName); + @Query("select project from Project project " + "left join fetch project.sourceTypes s " + "left join fetch project.groups " diff --git a/src/main/java/org/radarbase/management/service/OrganizationService.java b/src/main/java/org/radarbase/management/service/OrganizationService.java index 6aa127ad3..0f218fa5e 100644 --- a/src/main/java/org/radarbase/management/service/OrganizationService.java +++ b/src/main/java/org/radarbase/management/service/OrganizationService.java @@ -1,8 +1,11 @@ package org.radarbase.management.service; import org.radarbase.management.repository.OrganizationRepository; +import org.radarbase.management.repository.ProjectRepository; import org.radarbase.management.service.dto.OrganizationDTO; +import org.radarbase.management.service.dto.ProjectDTO; import org.radarbase.management.service.mapper.OrganizationMapper; +import org.radarbase.management.service.mapper.ProjectMapper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -25,9 +28,15 @@ public class OrganizationService { @Autowired private OrganizationRepository organizationRepository; + @Autowired + private ProjectRepository projectRepository; + @Autowired private OrganizationMapper organizationMapper; + @Autowired + private ProjectMapper projectMapper; + /** * Save an organization. * @@ -65,4 +74,16 @@ public Optional findByName(String name) { return organizationRepository.findOneByName(name) .map(organizationMapper::organizationToOrganizationDTO); } + + /** + * Get all projects belonging to the organization. + * + * @return the list of projects + */ + @Transactional(readOnly = true) + public List findAllProjectsByOrganizationName(String organizationName) { + return projectRepository.findAllByOrganizationName(organizationName).stream() + .map(projectMapper::projectToProjectDTO) + .collect(Collectors.toList()); + } } diff --git a/src/main/java/org/radarbase/management/service/ProjectService.java b/src/main/java/org/radarbase/management/service/ProjectService.java index 138e7f3d4..6cab08a6f 100644 --- a/src/main/java/org/radarbase/management/service/ProjectService.java +++ b/src/main/java/org/radarbase/management/service/ProjectService.java @@ -1,10 +1,12 @@ package org.radarbase.management.service; +import static org.radarbase.management.web.rest.errors.EntityName.ORGANIZATION; import static org.radarbase.management.web.rest.errors.EntityName.PROJECT; import org.radarbase.management.domain.Project; import org.radarbase.management.domain.SourceType; +import org.radarbase.management.repository.OrganizationRepository; import org.radarbase.management.repository.ProjectRepository; import org.radarbase.management.service.dto.ProjectDTO; import org.radarbase.management.service.dto.SourceTypeDTO; @@ -32,6 +34,9 @@ public class ProjectService { private static final Logger log = LoggerFactory.getLogger(ProjectService.class); + @Autowired + private OrganizationRepository organizationRepository; + @Autowired private ProjectRepository projectRepository; @@ -50,6 +55,16 @@ public class ProjectService { */ public ProjectDTO save(ProjectDTO projectDto) { log.debug("Request to save Project : {}", projectDto); + var orgId = projectDto.getOrganizationId(); + if (orgId != null) { + var org = organizationRepository.findById(orgId); + if (org.isEmpty()) { + throw new NotFoundException("Organization not found with id", + ORGANIZATION, + ErrorConstants.ERR_ORGANIZATION_ID_NOT_FOUND, + Collections.singletonMap("id", orgId.toString())); + } + } Project project = projectMapper.projectDTOToProject(projectDto); project = projectRepository.save(project); return projectMapper.projectToProjectDTO(project); diff --git a/src/main/java/org/radarbase/management/service/dto/ProjectDTO.java b/src/main/java/org/radarbase/management/service/dto/ProjectDTO.java index 0ffddc658..971f1d784 100644 --- a/src/main/java/org/radarbase/management/service/dto/ProjectDTO.java +++ b/src/main/java/org/radarbase/management/service/dto/ProjectDTO.java @@ -37,6 +37,8 @@ public class ProjectDTO implements Serializable { private String organization; + private Long organizationId; + @NotNull private String location; @@ -88,6 +90,14 @@ public void setOrganization(String organization) { this.organization = organization; } + public Long getOrganizationId() { + return organizationId; + } + + public void setOrganizationId(Long organizationId) { + this.organizationId = organizationId; + } + public String getLocation() { return location; } diff --git a/src/main/java/org/radarbase/management/service/mapper/ProjectMapper.java b/src/main/java/org/radarbase/management/service/mapper/ProjectMapper.java index e79eb012d..12c4a3a84 100644 --- a/src/main/java/org/radarbase/management/service/mapper/ProjectMapper.java +++ b/src/main/java/org/radarbase/management/service/mapper/ProjectMapper.java @@ -46,6 +46,7 @@ public interface ProjectMapper { @Mapping(target = "description", ignore = true) @Mapping(target = "roles", ignore = true) @Mapping(target = "organization", ignore = true) + @Mapping(target = "organizationId", ignore = true) @Mapping(target = "location", ignore = true) @Mapping(target = "startDate", ignore = true) @Mapping(target = "endDate", ignore = true) diff --git a/src/main/java/org/radarbase/management/web/rest/OrganizationResource.java b/src/main/java/org/radarbase/management/web/rest/OrganizationResource.java index 932a17d8f..5fcba8395 100644 --- a/src/main/java/org/radarbase/management/web/rest/OrganizationResource.java +++ b/src/main/java/org/radarbase/management/web/rest/OrganizationResource.java @@ -3,10 +3,11 @@ import io.micrometer.core.annotation.Timed; import org.radarbase.auth.config.Constants; import org.radarbase.auth.exception.NotAuthorizedException; -import org.radarbase.auth.token.RadarToken; +// import org.radarbase.auth.token.RadarToken; import org.radarbase.management.service.OrganizationService; import org.radarbase.management.service.ResourceUriService; import org.radarbase.management.service.dto.OrganizationDTO; +import org.radarbase.management.service.dto.ProjectDTO; import org.radarbase.management.web.rest.errors.NotFoundException; import org.radarbase.management.web.rest.errors.ErrorConstants; import org.radarbase.management.web.rest.util.HeaderUtil; @@ -18,6 +19,7 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -25,12 +27,16 @@ import javax.validation.Valid; import java.net.URISyntaxException; import java.util.Collections; +import java.util.List; import static org.radarbase.management.web.rest.errors.EntityName.ORGANIZATION; +/* import static org.radarbase.auth.authorization.Permission.ORGANIZATION_CREATE; import static org.radarbase.auth.authorization.Permission.ORGANIZATION_READ; +import static org.radarbase.auth.authorization.Permission.ORGANIZATION_UPDATE; import static org.radarbase.auth.authorization.RadarAuthorization.checkPermission; import static org.radarbase.auth.authorization.RadarAuthorization.checkPermissionOnOrganization; +*/ /** * REST controller for managing Organization. @@ -46,8 +52,8 @@ public class OrganizationResource { @Autowired private OrganizationService organizationService; - @Autowired - private RadarToken token; + // @Autowired + // private RadarToken token; /** * POST /organizations : Create a new organization. @@ -97,6 +103,33 @@ public ResponseEntity getAllOrganizations() throws NotAuthorizedException { return new ResponseEntity<>(orgs, HttpStatus.OK); } + /** + * PUT /organizations : Updates an existing organization. + * + * @param organizationDto the organizationDto to update + * @return the ResponseEntity + * with status 200 and with the updated organizationDto as body, + * or with status 400 if the organizationDto is not valid, + * or with status 500 if the organizationDto couldnt be updated + * @throws URISyntaxException if the Location URI syntax is incorrect + */ + @PutMapping("/organizations") + @Timed + public ResponseEntity updateOrganization( + @Valid @RequestBody OrganizationDTO organizationDto + ) throws URISyntaxException, NotAuthorizedException { + log.debug("REST request to update Organization : {}", organizationDto); + if (organizationDto.getId() == null) { + return createOrganization(organizationDto); + } + // var name = organizationDto.getName(); + // checkPermissionOnOrganization(token, ORGANIZATION_UPDATE, name); + var result = organizationService.save(organizationDto); + return ResponseEntity.ok() + .headers(HeaderUtil.createEntityCreationAlert(ENTITY_NAME, result.getName())) + .body(result); + } + /** * GET /organizations/:organizationName : get the organization with this name. * @@ -118,4 +151,23 @@ public ResponseEntity getOrganization( Collections.singletonMap("name", name))); return ResponseEntity.ok(dto); } + + /** + * GET /organizations/:organizationName/projects + * : get projects belonging to the organization with this name. + * + * @param name the name of the organization + * @return the ResponseEntity + * with status 200 (OK) and with body containing the project list, + * or with status 404 (Not Found) + */ + @GetMapping("/organizations/{name:" + Constants.ENTITY_ID_REGEX + "}/projects") + @Timed + public ResponseEntity> getOrganizationProjects( + @PathVariable String name) throws NotAuthorizedException { + log.debug("REST request to get Projects of the Organization : {}", name); + // checkPermissionOnOrganization(token, ORGANIZATION_READ, name); + var projects = organizationService.findAllProjectsByOrganizationName(name); + return ResponseEntity.ok(projects); + } } diff --git a/src/main/java/org/radarbase/management/web/rest/errors/ErrorConstants.java b/src/main/java/org/radarbase/management/web/rest/errors/ErrorConstants.java index 3719b57d6..dac6ee43d 100644 --- a/src/main/java/org/radarbase/management/web/rest/errors/ErrorConstants.java +++ b/src/main/java/org/radarbase/management/web/rest/errors/ErrorConstants.java @@ -22,6 +22,8 @@ public final class ErrorConstants { public static final String ERR_GROUP_EXISTS = "error.groupExists"; public static final String ERR_INVALID_AUTHORITY = "error.invalidAuthority"; public static final String ERR_EMAIL_EXISTS = "error.emailexists"; + public static final String ERR_ORGANIZATION_ID_NOT_FOUND = "error" + + ".organizationIdNotFound"; public static final String ERR_ORGANIZATION_NAME_NOT_FOUND = "error" + ".organizationNameNotFound"; public static final String ERR_PROJECT_ID_NOT_FOUND = "error.projectIdNotFound"; diff --git a/src/main/resources/config/liquibase/changelog/20211110160000_add_organization.xml b/src/main/resources/config/liquibase/changelog/20211110160000_add_organization.xml index b38cc692d..25ddec5a4 100644 --- a/src/main/resources/config/liquibase/changelog/20211110160000_add_organization.xml +++ b/src/main/resources/config/liquibase/changelog/20211110160000_add_organization.xml @@ -59,4 +59,33 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/resources/config/liquibase/organization.csv b/src/main/resources/config/liquibase/organization.csv new file mode 100644 index 000000000..1491d0342 --- /dev/null +++ b/src/main/resources/config/liquibase/organization.csv @@ -0,0 +1,2 @@ +id;name;description;location +1;The Hyve;The Hyve B.V.;Utrecht diff --git a/src/main/webapp/app/shared/organization/organization.service.ts b/src/main/webapp/app/shared/organization/organization.service.ts index 31c70790d..17e7e4fc4 100644 --- a/src/main/webapp/app/shared/organization/organization.service.ts +++ b/src/main/webapp/app/shared/organization/organization.service.ts @@ -16,6 +16,10 @@ export class OrganizationService { return this.http.post(this.resourceUrl, organization); } + update(organization: Organization): Observable { + return this.http.put(this.resourceUrl, organization); + } + find(orgName: string): Observable { return this.http.get(`${this.resourceUrl}/${encodeURIComponent(orgName)}`); } diff --git a/src/main/webapp/app/shared/project/project.service.ts b/src/main/webapp/app/shared/project/project.service.ts index f236348ca..9f7a77258 100644 --- a/src/main/webapp/app/shared/project/project.service.ts +++ b/src/main/webapp/app/shared/project/project.service.ts @@ -12,6 +12,7 @@ import { convertDateTimeFromServer, toDate } from '../util/date-util'; export class ProjectService { private resourceUrl = 'api/projects'; + private organizationResourceUrl = 'api/organizations'; constructor(private http: HttpClient) { } @@ -49,6 +50,11 @@ export class ProjectService { .pipe(map((res: any) => this.convertResponseDates(res))); } + findAllByOrganization(orgName: string): Observable { + let url = `${this.organizationResourceUrl}/${orgName}/projects`; + return this.http.get(url); + } + findSourceTypesByName(projectName: string): Observable { return this.http.get(`${this.resourceUrl}/${projectName}/source-types`); } diff --git a/src/test/java/org/radarbase/management/web/rest/GroupResourceIntTest.java b/src/test/java/org/radarbase/management/web/rest/GroupResourceIntTest.java index 2f630fe4a..31ea0a7e3 100644 --- a/src/test/java/org/radarbase/management/web/rest/GroupResourceIntTest.java +++ b/src/test/java/org/radarbase/management/web/rest/GroupResourceIntTest.java @@ -19,7 +19,6 @@ import org.radarbase.management.service.GroupService; import org.radarbase.management.service.SubjectService; import org.radarbase.management.service.dto.GroupDTO; -import org.radarbase.management.service.dto.ProjectDTO; import org.radarbase.management.service.dto.SubjectDTO; import org.radarbase.management.service.mapper.GroupMapper; import org.radarbase.management.service.mapper.ProjectMapper; diff --git a/src/test/java/org/radarbase/management/web/rest/OrganizationResourceIntTest.java b/src/test/java/org/radarbase/management/web/rest/OrganizationResourceIntTest.java index 454143870..2b3a687a8 100644 --- a/src/test/java/org/radarbase/management/web/rest/OrganizationResourceIntTest.java +++ b/src/test/java/org/radarbase/management/web/rest/OrganizationResourceIntTest.java @@ -6,10 +6,11 @@ import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.MockitoAnnotations; import org.radarbase.auth.authentication.OAuthHelper; -import org.radarbase.auth.token.RadarToken; +// import org.radarbase.auth.token.RadarToken; import org.radarbase.management.ManagementPortalTestApp; import org.radarbase.management.domain.Organization; import org.radarbase.management.repository.OrganizationRepository; +import org.radarbase.management.repository.ProjectRepository; import org.radarbase.management.service.OrganizationService; import org.radarbase.management.service.mapper.OrganizationMapper; import org.radarbase.management.web.rest.errors.ExceptionTranslator; @@ -31,6 +32,7 @@ import static org.hamcrest.Matchers.hasItem; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.put; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; @@ -54,6 +56,9 @@ class OrganizationResourceIntTest { @Autowired private OrganizationService organizationService; + @Autowired + private ProjectRepository projectRepository; + @Autowired private MappingJackson2HttpMessageConverter jacksonMessageConverter; @@ -63,8 +68,8 @@ class OrganizationResourceIntTest { @Autowired private ExceptionTranslator exceptionTranslator; - @Autowired - private RadarToken token; + // @Autowired + // private RadarToken token; private MockMvc restOrganizationMockMvc; @@ -76,7 +81,7 @@ public void setUp() throws ServletException { var orgResource = new OrganizationResource(); ReflectionTestUtils .setField(orgResource, "organizationService", organizationService); - ReflectionTestUtils.setField(orgResource, "token", token); + // ReflectionTestUtils.setField(orgResource, "token", token); var filter = OAuthHelper.createAuthenticationFilter(); filter.init(new MockFilterConfig()); @@ -170,6 +175,29 @@ void getOrganization() throws Exception { .andExpect(jsonPath("$.name").value("org1")); } + @Test + void editOrganization() throws Exception { + // Initialize the database + organizationRepository.saveAndFlush(organization); + + var updatedOrgDto = organizationMapper + .organizationToOrganizationDTO(organization); + updatedOrgDto.setLocation("Other location"); + + // Update the organization + restOrganizationMockMvc.perform(put("/api/organizations") + .contentType(TestUtil.APPLICATION_JSON_UTF8) + .content(TestUtil.convertObjectToJsonBytes(updatedOrgDto))) + .andExpect(status().isOk()); + + // Get the organization + restOrganizationMockMvc.perform(get("/api/organizations/{name}", + organization.getName())) + .andExpect(status().isOk()) + .andExpect(content().contentType(MediaType.APPLICATION_JSON)) + .andExpect(jsonPath("$.location").value("Other location")); + } + @Test void getNonExistingOrganization() throws Exception { // Get the organization @@ -177,4 +205,24 @@ void getNonExistingOrganization() throws Exception { organization.getName())) .andExpect(status().isNotFound()); } + + @Test + void getProjectsByOrganizationName() throws Exception { + // Initialize the database + organizationRepository.saveAndFlush(organization); + + var project = ProjectResourceIntTest.createEntity() + .organizationId(organization.getId()) + .projectName("organization_project"); + projectRepository.saveAndFlush(project); + + // Get projects of the organization + restOrganizationMockMvc.perform(get("/api/organizations/{name}/projects", + organization.getName())) + .andExpect(status().isOk()) + .andExpect(content().contentType(MediaType.APPLICATION_JSON)) + .andExpect(jsonPath("$.[*].projectName").value("organization_project")); + + projectRepository.delete(project); + } } diff --git a/src/test/java/org/radarbase/management/web/rest/ProjectResourceIntTest.java b/src/test/java/org/radarbase/management/web/rest/ProjectResourceIntTest.java index 0d2249186..328752a26 100644 --- a/src/test/java/org/radarbase/management/web/rest/ProjectResourceIntTest.java +++ b/src/test/java/org/radarbase/management/web/rest/ProjectResourceIntTest.java @@ -24,8 +24,10 @@ import org.mockito.MockitoAnnotations; import org.radarbase.auth.token.RadarToken; import org.radarbase.management.ManagementPortalTestApp; +import org.radarbase.management.domain.Organization; import org.radarbase.management.domain.Project; import org.radarbase.management.domain.enumeration.ProjectStatus; +import org.radarbase.management.repository.OrganizationRepository; import org.radarbase.management.repository.ProjectRepository; import org.radarbase.management.security.JwtAuthenticationFilter; import org.radarbase.management.service.ProjectService; @@ -81,6 +83,9 @@ class ProjectResourceIntTest { private static final ZonedDateTime UPDATED_END_DATE = ZonedDateTime.now( ZoneId.systemDefault()).withNano(0); + @Autowired + private OrganizationRepository organizationRepository; + @Autowired private ProjectRepository projectRepository; @@ -304,6 +309,15 @@ void getNonExistingProject() throws Exception { void updateProject() throws Exception { // Initialize the database projectRepository.saveAndFlush(project); + + var org = new Organization(); + org.setName("org1"); + org.setDescription("Test Organization 1"); + org.setLocation("Somewhere"); + organizationRepository.saveAndFlush(org); + + assertThat(org.getId()).isNotNull(); + int databaseSizeBeforeUpdate = projectRepository.findAll().size(); // Update the project @@ -312,6 +326,7 @@ void updateProject() throws Exception { .projectName(UPDATED_PROJECT_NAME) .description(UPDATED_DESCRIPTION) .organization(UPDATED_ORGANIZATION) + .organizationId(org.getId()) .location(UPDATED_LOCATION) .startDate(UPDATED_START_DATE) .projectStatus(UPDATED_PROJECT_STATUS) @@ -330,10 +345,13 @@ void updateProject() throws Exception { assertThat(testProject.getProjectName()).isEqualTo(UPDATED_PROJECT_NAME); assertThat(testProject.getDescription()).isEqualTo(UPDATED_DESCRIPTION); assertThat(testProject.getOrganization()).isEqualTo(UPDATED_ORGANIZATION); + assertThat(testProject.getOrganizationId()).isEqualTo(org.getId()); assertThat(testProject.getLocation()).isEqualTo(UPDATED_LOCATION); assertThat(testProject.getStartDate()).isEqualTo(UPDATED_START_DATE); assertThat(testProject.getProjectStatus()).isEqualTo(UPDATED_PROJECT_STATUS); assertThat(testProject.getEndDate()).isEqualTo(UPDATED_END_DATE); + + organizationRepository.delete(org); } @Test From 81d38df1cbab337d994d42384cbfe2f154277f94 Mon Sep 17 00:00:00 2001 From: Peyman Mohtashami Date: Thu, 25 Nov 2021 10:17:34 +0100 Subject: [PATCH 221/431] Modify organization service --- .../organization/organization.service.ts | 48 +++++++++---------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/src/main/webapp/app/shared/organization/organization.service.ts b/src/main/webapp/app/shared/organization/organization.service.ts index d556afb9b..f9b9130df 100644 --- a/src/main/webapp/app/shared/organization/organization.service.ts +++ b/src/main/webapp/app/shared/organization/organization.service.ts @@ -18,10 +18,10 @@ export class OrganizationService { } create(organization: Organization): Observable { - organization.id = ORGANIZATIONS.length + 1 - ORGANIZATIONS.push(organization); - return of(organization); - // return this.http.post(this.resourceUrl, organization); + // organization.id = ORGANIZATIONS.length + 1 + // ORGANIZATIONS.push(organization); + // return of(organization); + return this.http.post(this.resourceUrl, organization); } // create(project: Project): Observable { @@ -32,14 +32,14 @@ export class OrganizationService { // } find(organizationName: string): Observable { - console.log(organizationName) - const organization = ORGANIZATIONS.filter(org => org.name === organizationName)[0]; - if(organization){ - return of(organization); - } else { - return of(null) - } - // return this.http.get(`${this.resourceUrl}/${encodeURIComponent(organizationName)}`); + // console.log(organizationName) + // const organization = ORGANIZATIONS.filter(org => org.name === organizationName)[0]; + // if(organization){ + // return of(organization); + // } else { + // return of(null) + // } + return this.http.get(`${this.resourceUrl}/${encodeURIComponent(organizationName)}`); } // find(projectName: string): Observable { @@ -52,8 +52,8 @@ export class OrganizationService { // } findAll(): Observable { - return of(ORGANIZATIONS); - // return this.http.get(this.resourceUrl); + // return of(ORGANIZATIONS); + return this.http.get(this.resourceUrl); } // findAll(fetchMinimal: boolean): Observable { @@ -64,15 +64,15 @@ export class OrganizationService { update(organization: Organization): Observable { - const index = ORGANIZATIONS.findIndex(o => o.name === organization.name) - console.log(index); - ORGANIZATIONS[index] = organization; - return of(organization) + // const index = ORGANIZATIONS.findIndex(o => o.name === organization.name) + // console.log(index); + // ORGANIZATIONS[index] = organization; + // return of(organization) // org = organization // const copy: Project = Object.assign({}, organization); // copy.startDate = toDate(organization.startDate); // copy.endDate = toDate(organization.endDate); - // return this.http.put(this.resourceUrl, organization); + return this.http.put(this.resourceUrl, organization); } @@ -91,11 +91,11 @@ export class OrganizationService { // } delete(organizationName: string): Observable { - const index = ORGANIZATIONS.findIndex(o => o.name === organizationName) - console.log(index); - ORGANIZATIONS.splice(index, 1); - return of(organizationName); - // return this.http.delete(`${this.resourceUrl}/${encodeURIComponent(organizationName)}`); + // const index = ORGANIZATIONS.findIndex(o => o.name === organizationName) + // console.log(index); + // ORGANIZATIONS.splice(index, 1); + // return of(organizationName); + return this.http.delete(`${this.resourceUrl}/${encodeURIComponent(organizationName)}`); } // private convertResponseDates(jsonResponse: any): any { From 6ff3986f430905617c1119b8be3b7d6b52f33d57 Mon Sep 17 00:00:00 2001 From: aykl Date: Thu, 25 Nov 2021 11:07:44 +0100 Subject: [PATCH 222/431] Initial Organization Revision initialized --- .../20211110160000_add_organization.xml | 53 +++++++++++++++---- 1 file changed, 43 insertions(+), 10 deletions(-) diff --git a/src/main/resources/config/liquibase/changelog/20211110160000_add_organization.xml b/src/main/resources/config/liquibase/changelog/20211110160000_add_organization.xml index 25ddec5a4..599665c16 100644 --- a/src/main/resources/config/liquibase/changelog/20211110160000_add_organization.xml +++ b/src/main/resources/config/liquibase/changelog/20211110160000_add_organization.xml @@ -37,6 +37,19 @@ + + + + + + + + + + @@ -55,9 +68,36 @@ - - - + + + + + + INSERT into radar_organization_aud ( + id, rev, revtype, + + description, description_mod, + location, location_mod, + name, name_mod + ) + SELECT + id, 1, 0, + + description, true, + location, true, + name, true + FROM radar_organization + @@ -81,11 +121,4 @@ - - - - From b9647c5b2e7fc7c62c512cdbcbe023fb58086f53 Mon Sep 17 00:00:00 2001 From: Joris Borgdorff Date: Thu, 25 Nov 2021 10:31:56 +0100 Subject: [PATCH 223/431] Update authorization stack --- .../authorization/AuthoritiesConstants.java | 52 ------- .../auth/authorization/Permission.java | 11 +- .../auth/authorization/Permissions.java | 37 ++--- .../authorization/RadarAuthorization.java | 8 +- .../auth/authorization/RoleAuthority.java | 71 +++++++++ .../auth/token/AbstractRadarToken.java | 103 ++++++------ .../auth/token/AuthorityReference.java | 27 +++- .../radarbase/auth/token/JwtRadarToken.java | 7 +- .../org/radarbase/auth/token/RadarToken.java | 53 ++++--- .../authorization/RadarAuthorizationTest.java | 4 +- .../auth/token/AbstractRadarTokenTest.java | 32 ++-- .../config/OAuth2ServerConfiguration.java | 10 +- .../management/domain/Authority.java | 5 + .../org/radarbase/management/domain/Role.java | 30 +++- .../radarbase/management/domain/Subject.java | 4 +- .../repository/AuthorityRepository.java | 1 - .../repository/ProjectRepository.java | 5 + .../management/repository/RoleRepository.java | 4 + .../repository/filters/UserFilter.java | 6 +- .../security/SessionRadarToken.java | 14 +- .../management/service/RoleService.java | 15 +- .../management/service/SubjectService.java | 61 +++++--- .../management/service/UserService.java | 147 ++++++++++++++---- .../management/service/dto/RoleDTO.java | 55 +++++++ .../management/service/mapper/RoleMapper.java | 3 + .../mapper/decorator/RoleMapperDecorator.java | 3 +- .../web/rest/AuthorityResource.java | 15 +- .../management/web/rest/LogsResource.java | 6 +- .../web/rest/OrganizationResource.java | 6 +- .../management/web/rest/ProjectResource.java | 2 +- .../management/web/rest/RevisionResource.java | 6 +- .../management/web/rest/RoleResource.java | 10 +- .../web/rest/SourceDataResource.java | 2 +- .../management/web/rest/SourceResource.java | 2 +- .../management/web/rest/SubjectResource.java | 11 +- .../management/web/rest/UserResource.java | 2 +- .../20211110160000_add_organization.xml | 20 +++ .../management/config/MockConfiguration.java | 15 +- .../service/UserServiceIntTest.java | 4 +- .../web/rest/AccountResourceIntTest.java | 23 +-- .../web/rest/GroupResourceIntTest.java | 1 - .../web/rest/SubjectResourceIntTest.java | 1 - .../web/rest/UserResourceIntTest.java | 86 +++++----- 43 files changed, 623 insertions(+), 357 deletions(-) delete mode 100644 radar-auth/src/main/java/org/radarbase/auth/authorization/AuthoritiesConstants.java create mode 100644 radar-auth/src/main/java/org/radarbase/auth/authorization/RoleAuthority.java diff --git a/radar-auth/src/main/java/org/radarbase/auth/authorization/AuthoritiesConstants.java b/radar-auth/src/main/java/org/radarbase/auth/authorization/AuthoritiesConstants.java deleted file mode 100644 index a420791ab..000000000 --- a/radar-auth/src/main/java/org/radarbase/auth/authorization/AuthoritiesConstants.java +++ /dev/null @@ -1,52 +0,0 @@ -package org.radarbase.auth.authorization; - -import java.util.Locale; - -/** - * Constants for Spring Security authorities. - */ - -public enum AuthoritiesConstants { - SYS_ADMIN(Scope.GLOBAL), - PROJECT_ADMIN(Scope.PROJECT), - PROJECT_OWNER(Scope.PROJECT), - PROJECT_AFFILIATE(Scope.PROJECT), - PROJECT_ANALYST(Scope.PROJECT), - PARTICIPANT(Scope.PROJECT), - INACTIVE_PARTICIPANT(Scope.PROJECT), - ORGANIZATION_ADMIN(Scope.ORGANIZATION); - - private final Scope scope; - - AuthoritiesConstants(Scope scope) { - this.scope = scope; - } - - public Scope scope() { - return scope; - } - - public String role() { - return "ROLE_" + name(); - } - - public static AuthoritiesConstants valueOfRole(String role) { - String upperRole = role.toUpperCase(Locale.ROOT); - if (!upperRole.startsWith("ROLE_")) { - throw new IllegalArgumentException("Cannot map role without 'ROLE_' prefix"); - } - return valueOf(upperRole.substring(5)); - } - - public static AuthoritiesConstants valueOfRoleOrNull(String role) { - try { - return valueOfRole(role); - } catch (IllegalArgumentException ex) { - return null; - } - } - - public enum Scope { - GLOBAL, ORGANIZATION, PROJECT - } -} diff --git a/radar-auth/src/main/java/org/radarbase/auth/authorization/Permission.java b/radar-auth/src/main/java/org/radarbase/auth/authorization/Permission.java index 195623610..691998f7f 100644 --- a/radar-auth/src/main/java/org/radarbase/auth/authorization/Permission.java +++ b/radar-auth/src/main/java/org/radarbase/auth/authorization/Permission.java @@ -1,8 +1,5 @@ package org.radarbase.auth.authorization; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import java.util.Arrays; import java.util.stream.Stream; @@ -107,8 +104,8 @@ public Operation getOperation() { * @param authority the authority name * @return true if the given authority has this permission associated with it, false otherwise */ - public boolean isAuthorityAllowed(AuthoritiesConstants authority) { - return Permissions.allowedAuthorities(this).contains(authority); + public boolean isRoleAllowed(RoleAuthority authority) { + return Permissions.allowedRoles(this).contains(authority); } @Override @@ -126,7 +123,7 @@ public static Stream stream() { /** Returns all available scope names. */ public static String[] scopes() { return stream() - .map(Permission::scopeName) + .map(Permission::scope) .toArray(String[]::new); } @@ -144,7 +141,7 @@ public static Permission of(Entity entity, Operation operation) { * * @return the OAuth scope representation of this permission */ - public String scopeName() { + public String scope() { return entity + "." + operation; } } diff --git a/radar-auth/src/main/java/org/radarbase/auth/authorization/Permissions.java b/radar-auth/src/main/java/org/radarbase/auth/authorization/Permissions.java index 6f590cb01..bc24a7174 100644 --- a/radar-auth/src/main/java/org/radarbase/auth/authorization/Permissions.java +++ b/radar-auth/src/main/java/org/radarbase/auth/authorization/Permissions.java @@ -4,34 +4,31 @@ import java.util.Collections; import java.util.EnumMap; import java.util.EnumSet; -import java.util.HashMap; import java.util.Map; import java.util.Set; import java.util.function.Predicate; import java.util.stream.Collector; -import java.util.stream.Collectors; import java.util.stream.Stream; import static java.util.stream.Collectors.collectingAndThen; import static java.util.stream.Collectors.groupingBy; import static java.util.stream.Collectors.mapping; import static java.util.stream.Collectors.toCollection; -import static java.util.stream.Collectors.toUnmodifiableSet; -import static org.radarbase.auth.authorization.AuthoritiesConstants.INACTIVE_PARTICIPANT; -import static org.radarbase.auth.authorization.AuthoritiesConstants.ORGANIZATION_ADMIN; -import static org.radarbase.auth.authorization.AuthoritiesConstants.PARTICIPANT; -import static org.radarbase.auth.authorization.AuthoritiesConstants.PROJECT_ADMIN; -import static org.radarbase.auth.authorization.AuthoritiesConstants.PROJECT_AFFILIATE; -import static org.radarbase.auth.authorization.AuthoritiesConstants.PROJECT_ANALYST; -import static org.radarbase.auth.authorization.AuthoritiesConstants.PROJECT_OWNER; -import static org.radarbase.auth.authorization.AuthoritiesConstants.SYS_ADMIN; +import static org.radarbase.auth.authorization.RoleAuthority.INACTIVE_PARTICIPANT; +import static org.radarbase.auth.authorization.RoleAuthority.ORGANIZATION_ADMIN; +import static org.radarbase.auth.authorization.RoleAuthority.PARTICIPANT; +import static org.radarbase.auth.authorization.RoleAuthority.PROJECT_ADMIN; +import static org.radarbase.auth.authorization.RoleAuthority.PROJECT_AFFILIATE; +import static org.radarbase.auth.authorization.RoleAuthority.PROJECT_ANALYST; +import static org.radarbase.auth.authorization.RoleAuthority.PROJECT_OWNER; +import static org.radarbase.auth.authorization.RoleAuthority.SYS_ADMIN; /** * Created by dverbeec on 22/09/2017. */ public final class Permissions { - private static final Map> PERMISSION_MATRIX; + private static final Map> PERMISSION_MATRIX; static { PERMISSION_MATRIX = createPermissions(); @@ -43,11 +40,11 @@ private Permissions() { /** * Look up the allowed authorities for a given permission. Authorities are String constants that - * appear in {@link AuthoritiesConstants}. + * appear in {@link RoleAuthority}. * @param permission The permission to look up. * @return An unmodifiable view of the set of allowed authorities. */ - public static Set allowedAuthorities(Permission permission) { + public static Set allowedRoles(Permission permission) { return PERMISSION_MATRIX.getOrDefault(permission, Set.of()); } @@ -58,16 +55,16 @@ public static Set allowedAuthorities(Permission permission * permission.

    * @return An unmodifiable view of the permission matrix. */ - public static Map> getPermissionMatrix() { + public static Map> getPermissionMatrix() { return PERMISSION_MATRIX; } /** * Static permission matrix based on the currently agreed upon security rules. */ - private static Map> createPermissions() { - Map> rolePermissions = new EnumMap<>( - AuthoritiesConstants.class); + private static Map> createPermissions() { + Map> rolePermissions = new EnumMap<>( + RoleAuthority.class); // System admin can do everything. rolePermissions.put(SYS_ADMIN, Permission.stream()); @@ -149,10 +146,10 @@ private static Map> createPermissions() { mapping(Map.Entry::getValue, toUnmodifiableEnumSet())))); } - private static Collector> + private static Collector> toUnmodifiableEnumSet() { return collectingAndThen( - toCollection(() -> EnumSet.noneOf(AuthoritiesConstants.class)), + toCollection(() -> EnumSet.noneOf(RoleAuthority.class)), Collections::unmodifiableSet); } diff --git a/radar-auth/src/main/java/org/radarbase/auth/authorization/RadarAuthorization.java b/radar-auth/src/main/java/org/radarbase/auth/authorization/RadarAuthorization.java index a0c02c73c..be73e10e5 100644 --- a/radar-auth/src/main/java/org/radarbase/auth/authorization/RadarAuthorization.java +++ b/radar-auth/src/main/java/org/radarbase/auth/authorization/RadarAuthorization.java @@ -19,14 +19,14 @@ private RadarAuthorization() { } /** - * Similar to {@link RadarToken#hasAuthority(AuthoritiesConstants)}, but this + * Similar to {@link RadarToken#hasAuthority(RoleAuthority)}, but this * method throws an exception rather than returning a boolean. Useful in combination with e.g. * Spring's controllers and exception translators. * @param token The token of the requester * @param authority The authority to check * @throws NotAuthorizedException if the supplied token does not have the authority */ - public static void checkAuthority(RadarToken token, AuthoritiesConstants authority) + public static void checkAuthority(RadarToken token, RoleAuthority authority) throws NotAuthorizedException { if (!token.isClientCredentials()) { log.debug("Checking authority {} for user {}", authority, @@ -40,7 +40,7 @@ public static void checkAuthority(RadarToken token, AuthoritiesConstants authori /** - * Similar to {@link RadarToken#hasAuthority(AuthoritiesConstants)}, but this method throws an + * Similar to {@link RadarToken#hasAuthority(RoleAuthority)}, but this method throws an * exception rather than returning a boolean. Useful in combination with e.g. Spring's * controllers and exception translators. * @param token The token of the requester @@ -48,7 +48,7 @@ public static void checkAuthority(RadarToken token, AuthoritiesConstants authori * @param permission Permission that the authority should have. * @throws NotAuthorizedException if the supplied token does not have the authority */ - public static void checkAuthorityAndPermission(RadarToken token, AuthoritiesConstants authority, + public static void checkAuthorityAndPermission(RadarToken token, RoleAuthority authority, Permission permission) throws NotAuthorizedException { log.debug("Checking authority {} and permission {} for user {}", authority, permission, diff --git a/radar-auth/src/main/java/org/radarbase/auth/authorization/RoleAuthority.java b/radar-auth/src/main/java/org/radarbase/auth/authorization/RoleAuthority.java new file mode 100644 index 000000000..571d822df --- /dev/null +++ b/radar-auth/src/main/java/org/radarbase/auth/authorization/RoleAuthority.java @@ -0,0 +1,71 @@ +package org.radarbase.auth.authorization; + +import java.io.Serializable; +import java.util.Locale; + +/** + * Constants for Spring Security authorities. + */ +public enum RoleAuthority implements Serializable { + SYS_ADMIN(Scope.GLOBAL, false), + PROJECT_ADMIN(Scope.PROJECT, false), + PROJECT_OWNER(Scope.PROJECT, false), + PROJECT_AFFILIATE(Scope.PROJECT, false), + PROJECT_ANALYST(Scope.PROJECT, false), + PARTICIPANT(Scope.PROJECT, true), + INACTIVE_PARTICIPANT(Scope.PROJECT, true), + ORGANIZATION_ADMIN(Scope.ORGANIZATION, false); + + public static final String SYS_ADMIN_AUTHORITY = "ROLE_SYS_ADMIN"; + + private final Scope scope; + private final boolean isPersonal; + + RoleAuthority(Scope scope, boolean isPersonal) { + this.scope = scope; + this.isPersonal = isPersonal; + } + + public Scope scope() { + return scope; + } + + public String authority() { + return "ROLE_" + name(); + } + + public boolean isPersonal() { + return this.isPersonal; + } + + /** + * Find role authority based on authority name. + * @param authority authority name + * @return RoleAuthority + * @throws IllegalArgumentException if no role authority exists with the given name. + */ + public static RoleAuthority valueOfAuthority(String authority) { + String upperAuthority = authority.toUpperCase(Locale.ROOT); + if (!upperAuthority.startsWith("ROLE_")) { + throw new IllegalArgumentException("Cannot map role without 'ROLE_' prefix"); + } + return valueOf(upperAuthority.substring(5)); + } + + /** + * Find role authority based on authority name. + * @param authority authority name + * @return RoleAuthority or null if no role authority exists with the given name. + */ + public static RoleAuthority valueOfAuthorityOrNull(String authority) { + try { + return valueOfAuthority(authority); + } catch (IllegalArgumentException ex) { + return null; + } + } + + public enum Scope { + GLOBAL, ORGANIZATION, PROJECT + } +} diff --git a/radar-auth/src/main/java/org/radarbase/auth/token/AbstractRadarToken.java b/radar-auth/src/main/java/org/radarbase/auth/token/AbstractRadarToken.java index 8d81a87df..b40ff435c 100644 --- a/radar-auth/src/main/java/org/radarbase/auth/token/AbstractRadarToken.java +++ b/radar-auth/src/main/java/org/radarbase/auth/token/AbstractRadarToken.java @@ -1,12 +1,12 @@ package org.radarbase.auth.token; -import org.radarbase.auth.authorization.AuthoritiesConstants; import org.radarbase.auth.authorization.Permission; +import org.radarbase.auth.authorization.RoleAuthority; import java.util.Objects; import java.util.Set; - -import static org.radarbase.auth.authorization.AuthoritiesConstants.PARTICIPANT; +import java.util.function.Predicate; +import java.util.stream.Stream; /** * Partial implementation of {@link RadarToken}, providing a default implementation for the three @@ -16,35 +16,35 @@ public abstract class AbstractRadarToken implements RadarToken { protected static final String CLIENT_CREDENTIALS = "client_credentials"; @Override - public boolean hasAuthority(AuthoritiesConstants authority) { + public boolean hasAuthority(RoleAuthority authority) { return isClientCredentials() - || getAuthoritiesConstants().stream().anyMatch(authority::equals); + || getRoleAuthorities().stream().anyMatch(authority::equals); } @Override public boolean hasPermission(Permission permission) { - return hasScope(permission.scopeName()) + return hasScope(permission.scope()) && (isClientCredentials() || hasAuthorityForPermission(permission)); } @Override public boolean hasPermissionOnOrganization(Permission permission, String organization) { - return hasScope(permission.scopeName()) + return hasScope(permission.scope()) && (isClientCredentials() || hasAuthorityForOrganization(permission, organization)); } @Override public boolean hasPermissionOnOrganizationAndProject(Permission permission, String organization, String projectName) { - return hasScope(permission.scopeName()) + return hasScope(permission.scope()) && (isClientCredentials() || hasAuthorityForOrganizationAndProject( permission, organization, projectName)); } @Override public boolean hasPermissionOnProject(Permission permission, String projectName) { - return hasScope(permission.scopeName()) + return hasScope(permission.scope()) && (isClientCredentials() || hasAuthorityForProject( permission, projectName)); } @@ -52,7 +52,7 @@ public boolean hasPermissionOnProject(Permission permission, String projectName) @Override public boolean hasPermissionOnSubject(Permission permission, String projectName, String subjectName) { - return hasScope(permission.scopeName()) + return hasScope(permission.scope()) && (isClientCredentials() || hasAuthorityForSubject(permission, projectName, subjectName)); } @@ -60,7 +60,7 @@ public boolean hasPermissionOnSubject(Permission permission, String projectName, @Override public boolean hasPermissionOnSource(Permission permission, String projectName, String subjectName, String sourceId) { - return hasScope(permission.scopeName()) + return hasScope(permission.scope()) && (isClientCredentials() || hasAuthorityForSource(permission, projectName, subjectName, sourceId)); } @@ -81,9 +81,9 @@ public boolean isClientCredentials() { * @return {@code true} if any authority contains the permission, {@code false} otherwise */ protected boolean hasAuthorityForPermission(Permission permission) { - return getRoles().stream() - .map(AuthorityReference::getRole) - .anyMatch(permission::isAuthorityAllowed); + return Stream.concat(getRoles().stream().map(AuthorityReference::getRole), + getRoleAuthorities().stream()) + .anyMatch(permission::isRoleAllowed); } /** @@ -100,9 +100,9 @@ protected boolean hasAuthorityForOrganization(Permission permission, String orga if (organization == null) { return false; } - Set organizationRoles = getOrganizationRoles().get(organization); + Set organizationRoles = getOrganizationRoles().get(organization); return organizationRoles != null - && organizationRoles.stream().anyMatch(permission::isAuthorityAllowed); + && organizationRoles.stream().anyMatch(permission::isRoleAllowed); } /** @@ -120,22 +120,44 @@ protected boolean hasAuthorityForOrganizationAndProject(Permission permission, } /** - * Check authorities in this token linked to the given project, or not linked to any project - * (such as {@code SYS_ADMIN}), for the given permission. - * @param permission the permission - * @param projectName the project name + * Check whether roles from this token give authority to a given subject. By providing an + * additional personal role condition, if the authority is personal (e.g. subject-specific), + * the predicate for that subject will be evaluated. + * + * @param permission permission to check. + * @param projectName project name. + * @param personalRoleCondition additional condition (possibly null) when a role is + * only applies to the person. * @return {@code true} if any authority contains the permission, {@code false} otherwise */ - protected boolean hasAuthorityForProject(Permission permission, String projectName) { + protected boolean hasAuthorityForProject( + Permission permission, + String projectName, + Predicate personalRoleCondition) { if (hasGlobalAuthorityForPermission(permission)) { return true; } if (projectName == null) { return false; } - Set projectRoles = getProjectRoles().get(projectName); - return projectRoles != null - && projectRoles.stream().anyMatch(permission::isAuthorityAllowed); + Set projectRoles = getProjectRoles().get(projectName); + return projectRoles != null && projectRoles.stream() + .anyMatch(role -> permission.isRoleAllowed(role) + && (personalRoleCondition == null + || !role.isPersonal() + || personalRoleCondition.test(role))); + } + + /** + * Check authorities in this token linked to the given project, or not linked to any project + * (such as {@code SYS_ADMIN}), for the given permission. + * @param permission the permission + * @param projectName the project name + * @return {@code true} if any authority contains the permission, {@code false} otherwise + */ + protected boolean hasAuthorityForProject(Permission permission, String projectName) { + return hasAuthorityForProject(permission, projectName, + p -> permission.getOperation() == Permission.Operation.READ); } /** @@ -148,27 +170,14 @@ protected boolean hasAuthorityForProject(Permission permission, String projectNa */ protected boolean hasAuthorityForSubject(Permission permission, String projectName, String subjectName) { - if (isJustParticipant(projectName)) { - // if we're only a participant, we can only do operations on our own data - return getSubject().equals(subjectName) - && permission.isAuthorityAllowed(PARTICIPANT); - } else { - // if we have other roles beside participant, we should check those on the - // project level - return hasAuthorityForProject(permission, projectName); - } + return hasAuthorityForProject(permission, projectName, role -> + getUsername().equals(subjectName)); } protected boolean hasAuthorityForSource(Permission permission, String projectName, String subjectName, String sourceId) { - if (!hasAuthorityForSubject(permission, projectName, subjectName)) { - return false; - } - if (isJustParticipant(projectName)) { - return getSources().contains(sourceId); - } else { - return true; - } + return hasAuthorityForProject(permission, projectName, role -> + getUsername().equals(subjectName) && getSources().contains(sourceId)); } /** @@ -179,17 +188,7 @@ protected boolean hasAuthorityForSource(Permission permission, String projectNam * otherwise */ protected boolean hasGlobalAuthorityForPermission(Permission permission) { - return getGlobalRoles().stream().anyMatch(permission::isAuthorityAllowed); - } - - /** - * Check if this token only has the participant role in the given project. - * @param projectName the project - * @return {@code true} if this token only has the participant role in the given project, - * {@code false} otherwise - */ - protected boolean isJustParticipant(String projectName) { - return Set.of(PARTICIPANT).equals(getProjectRoles().get(projectName)); + return getGlobalRoles().stream().anyMatch(permission::isRoleAllowed); } @Override diff --git a/radar-auth/src/main/java/org/radarbase/auth/token/AuthorityReference.java b/radar-auth/src/main/java/org/radarbase/auth/token/AuthorityReference.java index c78f95e15..218b78366 100644 --- a/radar-auth/src/main/java/org/radarbase/auth/token/AuthorityReference.java +++ b/radar-auth/src/main/java/org/radarbase/auth/token/AuthorityReference.java @@ -9,38 +9,49 @@ package org.radarbase.auth.token; -import org.radarbase.auth.authorization.AuthoritiesConstants; +import org.radarbase.auth.authorization.RoleAuthority; +import java.io.Serializable; import java.util.Objects; import static java.util.Objects.requireNonNull; -public class AuthorityReference { +public class AuthorityReference implements Serializable { private final String authority; private final String referent; - private final AuthoritiesConstants role; + private final RoleAuthority role; public AuthorityReference(String authority) { this(authority, null); } - public AuthorityReference(AuthoritiesConstants role) { + public AuthorityReference(RoleAuthority role) { this(role, null); } - public AuthorityReference(AuthoritiesConstants role, String referent) { + /** + * Authority reference with given role and the object it refers to. + * @param role user role. + * @param referent reference. + */ + public AuthorityReference(RoleAuthority role, String referent) { this.role = requireNonNull(role); - this.authority = role.role(); + this.authority = role.authority(); this.referent = referent; } + /** + * Authority reference with given authority and the object it refers to. + * @param authority user authority. + * @param referent reference. + */ public AuthorityReference(String authority, String referent) { this.authority = requireNonNull(authority); - this.role = AuthoritiesConstants.valueOfRoleOrNull(authority); + this.role = RoleAuthority.valueOfAuthorityOrNull(authority); this.referent = referent; } - public AuthoritiesConstants getRole() { + public RoleAuthority getRole() { return role; } diff --git a/radar-auth/src/main/java/org/radarbase/auth/token/JwtRadarToken.java b/radar-auth/src/main/java/org/radarbase/auth/token/JwtRadarToken.java index 42c74dab7..9224d4a5a 100644 --- a/radar-auth/src/main/java/org/radarbase/auth/token/JwtRadarToken.java +++ b/radar-auth/src/main/java/org/radarbase/auth/token/JwtRadarToken.java @@ -1,13 +1,12 @@ package org.radarbase.auth.token; import static java.util.Objects.requireNonNullElseGet; -import static java.util.stream.Collectors.groupingBy; import static java.util.stream.Collectors.toUnmodifiableSet; import com.auth0.jwt.exceptions.JWTDecodeException; import com.auth0.jwt.interfaces.Claim; import com.auth0.jwt.interfaces.DecodedJWT; -import org.radarbase.auth.authorization.AuthoritiesConstants; +import org.radarbase.auth.authorization.RoleAuthority; import java.util.Arrays; import java.util.Collections; @@ -59,8 +58,8 @@ public JwtRadarToken(DecodedJWT jwt) { authorities = emptyIfNull(jwt.getClaim(AUTHORITIES_CLAIM).asList(String.class)); roles = Stream.concat( authorities.stream() - .map(AuthoritiesConstants::valueOfRoleOrNull) - .filter(r -> r != null && r.scope() == AuthoritiesConstants.Scope.GLOBAL) + .map(RoleAuthority::valueOfAuthorityOrNull) + .filter(r -> r != null && r.scope() == RoleAuthority.Scope.GLOBAL) .map(AuthorityReference::new), parseRoles(jwt)) .collect(toUnmodifiableSet()); diff --git a/radar-auth/src/main/java/org/radarbase/auth/token/RadarToken.java b/radar-auth/src/main/java/org/radarbase/auth/token/RadarToken.java index a4c1a00a2..a03582067 100644 --- a/radar-auth/src/main/java/org/radarbase/auth/token/RadarToken.java +++ b/radar-auth/src/main/java/org/radarbase/auth/token/RadarToken.java @@ -1,6 +1,6 @@ package org.radarbase.auth.token; -import org.radarbase.auth.authorization.AuthoritiesConstants; +import org.radarbase.auth.authorization.RoleAuthority; import org.radarbase.auth.authorization.Permission; import java.util.Date; @@ -9,11 +9,12 @@ import java.util.Map; import java.util.Objects; import java.util.Set; +import java.util.stream.Collector; +import java.util.stream.Stream; import static java.util.stream.Collectors.groupingBy; import static java.util.stream.Collectors.mapping; import static java.util.stream.Collectors.toCollection; -import static java.util.stream.Collectors.toSet; /** * Created by dverbeec on 10/01/2018. @@ -30,11 +31,15 @@ public interface RadarToken { * @return non-null map describing the roles defined in this token. The keys in the map are the * project names, and the values are lists of authority names associated to the project. */ - default Set getGlobalRoles() { - return getRoles().stream() - .map(AuthorityReference::getRole) - .filter(r -> r.scope() == AuthoritiesConstants.Scope.GLOBAL) - .collect(toSet()); + default Set getGlobalRoles() { + return Stream.concat( + getAuthorities().stream() + .map(RoleAuthority::valueOfAuthorityOrNull) + .filter(Objects::nonNull), + getRoles().stream() + .map(AuthorityReference::getRole)) + .filter(r -> r.scope() == RoleAuthority.Scope.GLOBAL) + .collect(toEnumSet()); } /** @@ -42,13 +47,11 @@ default Set getGlobalRoles() { * @return non-null map describing the roles defined in this token. The keys in the map are the * project names, and the values are lists of authority names associated to the project. */ - default Map> getProjectRoles() { + default Map> getProjectRoles() { return getRoles().stream() - .filter(r -> r.getRole().scope() == AuthoritiesConstants.Scope.PROJECT + .filter(r -> r.getRole().scope() == RoleAuthority.Scope.PROJECT && r.getReferent() != null) - .collect(groupingBy(AuthorityReference::getReferent, - mapping(AuthorityReference::getRole, - toCollection(() -> EnumSet.noneOf(AuthoritiesConstants.class))))); + .collect(groupingByReferent()); } /** @@ -56,13 +59,11 @@ default Map> getProjectRoles() { * @return non-null map describing the roles defined in this token. The keys in the map are the * project names, and the values are lists of authority names associated to the project. */ - default Map> getOrganizationRoles() { + default Map> getOrganizationRoles() { return getRoles().stream() - .filter(r -> r.getRole().scope() == AuthoritiesConstants.Scope.ORGANIZATION + .filter(r -> r.getRole().scope() == RoleAuthority.Scope.ORGANIZATION && r.getReferent() != null) - .collect(groupingBy(AuthorityReference::getReferent, - mapping(AuthorityReference::getRole, - toCollection(() -> EnumSet.noneOf(AuthoritiesConstants.class))))); + .collect(groupingByReferent()); } /** @@ -75,11 +76,11 @@ default Map> getOrganizationRoles() { * Get a list of non-project related authorities. * @return non-null list of authority names */ - default Set getAuthoritiesConstants() { + default Set getRoleAuthorities() { return getAuthorities().stream() - .map(AuthoritiesConstants::valueOfRoleOrNull) + .map(RoleAuthority::valueOfAuthorityOrNull) .filter(Objects::nonNull) - .collect(toCollection(() -> EnumSet.noneOf(AuthoritiesConstants.class))); + .collect(toEnumSet()); } /** @@ -176,7 +177,7 @@ default Set getAuthoritiesConstants() { * @param authority The permission to check * @return {@code true} if this token has the permission, {@code false} otherwise */ - boolean hasAuthority(AuthoritiesConstants authority); + boolean hasAuthority(RoleAuthority authority); /** * Check if this token gives the given permission, not taking into account project affiliations. @@ -244,4 +245,14 @@ boolean hasPermissionOnSource(Permission permission, String projectName, String * @return true if the client credentials flow was certainly used, false otherwise. */ boolean isClientCredentials(); + + private static Collector> toEnumSet() { + return toCollection(() -> EnumSet.noneOf(RoleAuthority.class)); + } + + private static Collector>> + groupingByReferent() { + return groupingBy(AuthorityReference::getReferent, + mapping(AuthorityReference::getRole, toEnumSet())); + } } diff --git a/radar-auth/src/test/java/org/radarbase/auth/authorization/RadarAuthorizationTest.java b/radar-auth/src/test/java/org/radarbase/auth/authorization/RadarAuthorizationTest.java index b4710503e..d66ad0c1d 100644 --- a/radar-auth/src/test/java/org/radarbase/auth/authorization/RadarAuthorizationTest.java +++ b/radar-auth/src/test/java/org/radarbase/auth/authorization/RadarAuthorizationTest.java @@ -27,7 +27,7 @@ void testCheckPermissionOnProject() throws NotAuthorizedException { String project = "PROJECT1"; // let's get all permissions a project admin has Set permissions = Permissions.getPermissionMatrix().entrySet().stream() - .filter(e -> e.getValue().contains(AuthoritiesConstants.PROJECT_ADMIN)) + .filter(e -> e.getValue().contains(RoleAuthority.PROJECT_ADMIN)) .map(Entry::getKey) .collect(Collectors.toSet()); RadarToken token = new JwtRadarToken(TokenTestUtils.PROJECT_ADMIN_TOKEN); @@ -36,7 +36,7 @@ void testCheckPermissionOnProject() throws NotAuthorizedException { } Set notPermitted = Permissions.getPermissionMatrix().entrySet().stream() - .filter(e -> !e.getValue().contains(AuthoritiesConstants.PROJECT_ADMIN)) + .filter(e -> !e.getValue().contains(RoleAuthority.PROJECT_ADMIN)) .map(Entry::getKey) .collect(Collectors.toSet()); diff --git a/radar-auth/src/test/java/org/radarbase/auth/token/AbstractRadarTokenTest.java b/radar-auth/src/test/java/org/radarbase/auth/token/AbstractRadarTokenTest.java index 88afa18b6..2dcb758f5 100644 --- a/radar-auth/src/test/java/org/radarbase/auth/token/AbstractRadarTokenTest.java +++ b/radar-auth/src/test/java/org/radarbase/auth/token/AbstractRadarTokenTest.java @@ -2,8 +2,8 @@ import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; -import static org.radarbase.auth.authorization.AuthoritiesConstants.PARTICIPANT; -import static org.radarbase.auth.authorization.AuthoritiesConstants.SYS_ADMIN; +import static org.radarbase.auth.authorization.RoleAuthority.PARTICIPANT; +import static org.radarbase.auth.authorization.RoleAuthority.SYS_ADMIN; import static org.radarbase.auth.authorization.Permission.MEASUREMENT_CREATE; import static org.radarbase.auth.token.AbstractRadarToken.CLIENT_CREDENTIALS; @@ -56,7 +56,7 @@ public String getSubject() { @Override public String getUsername() { - return ""; + return subject; } @Override @@ -121,15 +121,15 @@ void notHasPermissionWithoutAuthority() { @Test void hasPermissionAsAdmin() { MockToken token = new MockToken(); - token.scopes.add(MEASUREMENT_CREATE.scopeName()); - token.authorities.add(SYS_ADMIN.role()); + token.scopes.add(MEASUREMENT_CREATE.scope()); + token.authorities.add(SYS_ADMIN.authority()); assertTrue(token.hasPermission(MEASUREMENT_CREATE)); } @Test void hasPermissionAsUser() { MockToken token = new MockToken(); - token.scopes.add(MEASUREMENT_CREATE.scopeName()); + token.scopes.add(MEASUREMENT_CREATE.scope()); token.roles.add(new AuthorityReference(PARTICIPANT, "some")); assertTrue(token.hasPermission(MEASUREMENT_CREATE)); } @@ -137,7 +137,7 @@ void hasPermissionAsUser() { @Test void hasPermissionAsClient() { MockToken token = new MockToken(); - token.scopes.add(MEASUREMENT_CREATE.scopeName()); + token.scopes.add(MEASUREMENT_CREATE.scope()); token.grantType = CLIENT_CREDENTIALS; assertTrue(token.hasPermission(MEASUREMENT_CREATE)); } @@ -158,24 +158,24 @@ void notHasPermissioOnProjectnWithoutAuthority() { @Test void hasPermissionOnProjectAsAdmin() { MockToken token = new MockToken(); - token.scopes.add(MEASUREMENT_CREATE.scopeName()); - token.authorities.add(SYS_ADMIN.role()); + token.scopes.add(MEASUREMENT_CREATE.scope()); + token.authorities.add(SYS_ADMIN.authority()); assertTrue(token.hasPermissionOnProject(MEASUREMENT_CREATE, "project")); } @Test void hasPermissionOnProjectAsUser() { MockToken token = new MockToken(); - token.scopes.add(MEASUREMENT_CREATE.scopeName()); + token.scopes.add(MEASUREMENT_CREATE.scope()); token.roles.add(new AuthorityReference(PARTICIPANT, "project")); - assertTrue(token.hasPermissionOnProject(MEASUREMENT_CREATE, "project")); + assertFalse(token.hasPermissionOnProject(MEASUREMENT_CREATE, "project")); assertFalse(token.hasPermissionOnProject(MEASUREMENT_CREATE, "otherProject")); } @Test void hasPermissionOnProjectAsClient() { MockToken token = new MockToken(); - token.scopes.add(MEASUREMENT_CREATE.scopeName()); + token.scopes.add(MEASUREMENT_CREATE.scope()); token.grantType = CLIENT_CREDENTIALS; assertTrue(token.hasPermissionOnProject(MEASUREMENT_CREATE, "project")); } @@ -197,15 +197,15 @@ void notHasPermissioOnSubjectnWithoutAuthority() { @Test void hasPermissionOnSubjectAsAdmin() { MockToken token = new MockToken(); - token.scopes.add(MEASUREMENT_CREATE.scopeName()); - token.authorities.add(SYS_ADMIN.role()); + token.scopes.add(MEASUREMENT_CREATE.scope()); + token.authorities.add(SYS_ADMIN.authority()); assertTrue(token.hasPermissionOnSubject(MEASUREMENT_CREATE, "project", "subject")); } @Test void hasPermissionOnSubjectAsUser() { MockToken token = new MockToken(); - token.scopes.add(MEASUREMENT_CREATE.scopeName()); + token.scopes.add(MEASUREMENT_CREATE.scope()); token.roles.add(new AuthorityReference(PARTICIPANT, "project")); token.subject = "subject"; assertTrue(token.hasPermissionOnSubject(MEASUREMENT_CREATE, "project", "subject")); @@ -216,7 +216,7 @@ void hasPermissionOnSubjectAsUser() { @Test void hasPermissionOnSubjectAsClient() { MockToken token = new MockToken(); - token.scopes.add(MEASUREMENT_CREATE.scopeName()); + token.scopes.add(MEASUREMENT_CREATE.scope()); token.grantType = CLIENT_CREDENTIALS; assertTrue(token.hasPermissionOnSubject(MEASUREMENT_CREATE, "project", "subject")); } diff --git a/src/main/java/org/radarbase/management/config/OAuth2ServerConfiguration.java b/src/main/java/org/radarbase/management/config/OAuth2ServerConfiguration.java index e689141cb..562e58057 100644 --- a/src/main/java/org/radarbase/management/config/OAuth2ServerConfiguration.java +++ b/src/main/java/org/radarbase/management/config/OAuth2ServerConfiguration.java @@ -1,6 +1,6 @@ package org.radarbase.management.config; -import org.radarbase.auth.authorization.AuthoritiesConstants; +import org.radarbase.auth.authorization.RoleAuthority; import org.radarbase.management.security.ClaimsTokenEnhancer; import org.radarbase.management.security.Http401UnauthorizedEntryPoint; import org.radarbase.management.security.JwtAuthenticationFilter; @@ -143,17 +143,19 @@ public void configure(HttpSecurity http) throws Exception { .authorizeRequests() .antMatchers("/oauth/**").permitAll() .antMatchers(HttpMethod.OPTIONS, "/**").permitAll() - .antMatchers("/api/register").hasAnyAuthority(AuthoritiesConstants.SYS_ADMIN) + .antMatchers("/api/register").hasAnyAuthority( + RoleAuthority.SYS_ADMIN_AUTHORITY) .antMatchers("/api/profile-info").permitAll() .antMatchers("/api/**").authenticated() // Allow management/health endpoint to all to allow kubernetes to be able to // detect the health of the service .antMatchers("/management/health").permitAll() - .antMatchers("/management/**").hasAnyAuthority(AuthoritiesConstants.SYS_ADMIN) + .antMatchers("/management/**").hasAnyAuthority( + RoleAuthority.SYS_ADMIN_AUTHORITY) .antMatchers("/v2/api-docs/**").permitAll() .antMatchers("/swagger-resources/configuration/ui").permitAll() .antMatchers("/swagger-ui/index.html") - .hasAnyAuthority(AuthoritiesConstants.SYS_ADMIN); + .hasAnyAuthority(RoleAuthority.SYS_ADMIN_AUTHORITY); } @Override diff --git a/src/main/java/org/radarbase/management/domain/Authority.java b/src/main/java/org/radarbase/management/domain/Authority.java index c86e6da90..9590b351a 100644 --- a/src/main/java/org/radarbase/management/domain/Authority.java +++ b/src/main/java/org/radarbase/management/domain/Authority.java @@ -12,6 +12,7 @@ import org.hibernate.annotations.Cache; import org.hibernate.annotations.CacheConcurrencyStrategy; import org.hibernate.envers.Audited; +import org.radarbase.auth.authorization.RoleAuthority; import org.radarbase.auth.config.Constants; /** @@ -40,6 +41,10 @@ public Authority(String authorityName) { this.name = authorityName; } + public Authority(RoleAuthority role) { + this.name = role.authority(); + } + public String getName() { return name; } diff --git a/src/main/java/org/radarbase/management/domain/Role.java b/src/main/java/org/radarbase/management/domain/Role.java index a3acb2ce4..501078f17 100644 --- a/src/main/java/org/radarbase/management/domain/Role.java +++ b/src/main/java/org/radarbase/management/domain/Role.java @@ -17,6 +17,7 @@ import org.hibernate.annotations.CacheConcurrencyStrategy; import org.hibernate.envers.Audited; import org.hibernate.envers.RelationTargetAuditMode; +import org.radarbase.auth.authorization.RoleAuthority; import org.radarbase.management.domain.support.AbstractEntityListener; import javax.persistence.Entity; @@ -62,6 +63,10 @@ public class Role extends AbstractEntity implements Serializable { @Cache(usage = CacheConcurrencyStrategy.NONSTRICT_READ_WRITE) private Project project; + @ManyToOne(fetch = FetchType.EAGER) + @Cache(usage = CacheConcurrencyStrategy.NONSTRICT_READ_WRITE) + private Organization organization; + @JsonProperty() @ManyToOne(fetch = FetchType.EAGER) @Cache(usage = CacheConcurrencyStrategy.NONSTRICT_READ_WRITE) @@ -104,6 +109,14 @@ public void setUsers(Set users) { this.users = users; } + public Organization getOrganization() { + return organization; + } + + public void setOrganization(Organization organization) { + this.organization = organization; + } + public Project getProject() { return project; } @@ -121,6 +134,10 @@ public Authority getAuthority() { return authority; } + public RoleAuthority getRole() { + return RoleAuthority.valueOfAuthorityOrNull(authority.getName()); + } + public Role authority(Authority authority) { this.authority = authority; return this; @@ -139,22 +156,23 @@ public boolean equals(Object o) { return false; } Role role = (Role) o; - if (role.id == null || id == null) { - return false; - } - return Objects.equals(id, role.id); + return Objects.equals(authority, role.authority) + && Objects.equals(project, role.project) + && Objects.equals(organization, role.organization); } @Override public int hashCode() { - return Objects.hashCode(id); + return Objects.hash(authority, project, organization); } @Override public String toString() { return "Role{" + "id=" + id + ", " - + "project='" + (project == null ? "null" : project.getProjectName()) + "', " + + "organization='" + (organization == null ? "null" : organization.getName()) + + "', " + + "project='" + (project == null ? "null" : project.getProjectName()) + "', " + "authority='" + getAuthority().getName() + "', " + "}"; } diff --git a/src/main/java/org/radarbase/management/domain/Subject.java b/src/main/java/org/radarbase/management/domain/Subject.java index 9ce9825cd..946fd727d 100644 --- a/src/main/java/org/radarbase/management/domain/Subject.java +++ b/src/main/java/org/radarbase/management/domain/Subject.java @@ -39,7 +39,7 @@ import java.util.Optional; import java.util.Set; -import static org.radarbase.auth.authorization.AuthoritiesConstants.PARTICIPANT; +import static org.radarbase.auth.authorization.RoleAuthority.PARTICIPANT; /** * A Subject. @@ -234,7 +234,7 @@ public String getPersonName() { */ public Optional getActiveProject() { return this.getUser().getRoles().stream() - .filter(r -> r.getAuthority().getName().equals(PARTICIPANT)) + .filter(r -> r.getAuthority().getName().equals(PARTICIPANT.authority())) .findFirst() .map(Role::getProject); } diff --git a/src/main/java/org/radarbase/management/repository/AuthorityRepository.java b/src/main/java/org/radarbase/management/repository/AuthorityRepository.java index 9a5ec67c8..577516ae6 100644 --- a/src/main/java/org/radarbase/management/repository/AuthorityRepository.java +++ b/src/main/java/org/radarbase/management/repository/AuthorityRepository.java @@ -18,5 +18,4 @@ public interface AuthorityRepository extends JpaRepository, @Query("select authority from Authority authority where authority.name = :authorityName") Optional findByAuthorityName(@Param("authorityName") String authorityName); - } diff --git a/src/main/java/org/radarbase/management/repository/ProjectRepository.java b/src/main/java/org/radarbase/management/repository/ProjectRepository.java index 8f6ad8c58..554460302 100644 --- a/src/main/java/org/radarbase/management/repository/ProjectRepository.java +++ b/src/main/java/org/radarbase/management/repository/ProjectRepository.java @@ -1,5 +1,6 @@ package org.radarbase.management.repository; +import org.radarbase.management.domain.Organization; import org.radarbase.management.domain.Project; import org.radarbase.management.domain.SourceType; import org.springframework.data.domain.Page; @@ -55,4 +56,8 @@ public interface ProjectRepository extends JpaRepository, + "and sourceType.id = :sourceTypeId ") Optional findSourceTypeByProjectIdAndSourceTypeId(@Param("id") Long id, @Param("sourceTypeId") Long sourceTypeId); + + @Query("select project from Project project " + + "where project.organization = :organization") + List findAllByOrganization(@Param("organization") Organization organization); } diff --git a/src/main/java/org/radarbase/management/repository/RoleRepository.java b/src/main/java/org/radarbase/management/repository/RoleRepository.java index 8802c97c5..a4bc22087 100644 --- a/src/main/java/org/radarbase/management/repository/RoleRepository.java +++ b/src/main/java/org/radarbase/management/repository/RoleRepository.java @@ -24,6 +24,10 @@ public interface RoleRepository extends JpaRepository, @Query("select distinct role from Role role left join fetch role.authority") List findAllWithEagerRelationships(); + Optional findOneByOrganizationIdAndAuthorityName( + @Param("organizationId") Long organizationId, + @Param("authorityName") String authorityName); + Optional findOneByProjectIdAndAuthorityName(@Param("projectId") Long projectId, @Param("authorityName") String authorityName); diff --git a/src/main/java/org/radarbase/management/repository/filters/UserFilter.java b/src/main/java/org/radarbase/management/repository/filters/UserFilter.java index 4234e4591..e9b50a374 100644 --- a/src/main/java/org/radarbase/management/repository/filters/UserFilter.java +++ b/src/main/java/org/radarbase/management/repository/filters/UserFilter.java @@ -12,8 +12,8 @@ import javax.persistence.criteria.Predicate; import javax.persistence.criteria.Root; -import static org.radarbase.auth.authorization.AuthoritiesConstants.INACTIVE_PARTICIPANT; -import static org.radarbase.auth.authorization.AuthoritiesConstants.PARTICIPANT; +import static org.radarbase.auth.authorization.RoleAuthority.INACTIVE_PARTICIPANT; +import static org.radarbase.auth.authorization.RoleAuthority.PARTICIPANT; public class UserFilter implements Specification { private String login; @@ -28,7 +28,7 @@ public Predicate toPredicate(Root root, @Nonnull CriteriaQuery query, Join roleJoin = root.join("roles"); Join authorityJoin = roleJoin.join("authority"); predicates.add(builder.not(authorityJoin.get("name") - .in(PARTICIPANT, INACTIVE_PARTICIPANT))); + .in(PARTICIPANT.authority(), INACTIVE_PARTICIPANT.authority()))); predicates.likeLower(root.get("login"), login); predicates.likeLower(root.get("email"), email); diff --git a/src/main/java/org/radarbase/management/security/SessionRadarToken.java b/src/main/java/org/radarbase/management/security/SessionRadarToken.java index 98ff88530..e460fa8b5 100644 --- a/src/main/java/org/radarbase/management/security/SessionRadarToken.java +++ b/src/main/java/org/radarbase/management/security/SessionRadarToken.java @@ -10,16 +10,16 @@ package org.radarbase.management.security; import org.radarbase.auth.token.AbstractRadarToken; +import org.radarbase.auth.token.AuthorityReference; import org.radarbase.auth.token.RadarToken; import java.io.Serializable; import java.util.Date; import java.util.List; -import java.util.Map; -import java.util.stream.Collectors; +import java.util.Set; public class SessionRadarToken extends AbstractRadarToken implements Serializable { - private final Map> roles; + private final Set roles; private final String subject; private final String token; private final List scopes; @@ -36,11 +36,7 @@ public class SessionRadarToken extends AbstractRadarToken implements Serializabl /** Instantiate a serializable session token by copying an existing RadarToken. */ public SessionRadarToken(RadarToken token) { - this.roles = token.getRoles().entrySet().stream() - .collect(Collectors.toMap( - Map.Entry::getKey, e -> e.getValue().stream() - .map(String::toString) - .collect(Collectors.toList()))); + this.roles = Set.copyOf(token.getRoles()); this.subject = token.getSubject(); this.token = token.getToken(); this.scopes = List.copyOf(token.getScopes()); @@ -57,7 +53,7 @@ public SessionRadarToken(RadarToken token) { } @Override - public Map> getRoles() { + public Set getRoles() { return roles; } diff --git a/src/main/java/org/radarbase/management/service/RoleService.java b/src/main/java/org/radarbase/management/service/RoleService.java index 88d707695..d33c8231f 100644 --- a/src/main/java/org/radarbase/management/service/RoleService.java +++ b/src/main/java/org/radarbase/management/service/RoleService.java @@ -5,9 +5,8 @@ import java.util.List; import java.util.Optional; import java.util.stream.Collectors; -import org.radarbase.auth.authorization.AuthoritiesConstants; +import org.radarbase.auth.authorization.RoleAuthority; import org.radarbase.management.domain.Authority; -import org.radarbase.management.domain.Role; import org.radarbase.management.domain.User; import org.radarbase.management.repository.RoleRepository; import org.radarbase.management.service.dto.RoleDTO; @@ -44,7 +43,7 @@ public class RoleService { */ public RoleDTO save(RoleDTO roleDto) { log.debug("Request to save Role : {}", roleDto); - Role role = roleMapper.roleDTOToRole(roleDto); + org.radarbase.management.domain.Role role = roleMapper.roleDTOToRole(roleDto); role = roleRepository.save(role); return roleMapper.roleToRoleDTO(role); } @@ -67,15 +66,15 @@ public List findAll() { } List currentUserAuthorities = currentUser.getAuthorities().stream() .map(Authority::getName).collect(Collectors.toList()); - if (currentUserAuthorities.contains(AuthoritiesConstants.SYS_ADMIN)) { + if (currentUserAuthorities.contains(RoleAuthority.SYS_ADMIN)) { log.debug("Request to get all Roles"); return roleRepository.findAll().stream() .map(roleMapper::roleToRoleDTO) .collect(Collectors.toList()); - } else if (currentUserAuthorities.contains(AuthoritiesConstants.PROJECT_ADMIN)) { + } else if (currentUserAuthorities.contains(RoleAuthority.PROJECT_ADMIN)) { log.debug("Request to get project admin's project Projects"); return currentUser.getRoles().stream() - .filter(role -> AuthoritiesConstants.PROJECT_ADMIN + .filter(role -> RoleAuthority.PROJECT_ADMIN .equals(role.getAuthority().getName())) .map(r -> r.getProject().getProjectName()) .distinct() @@ -97,7 +96,7 @@ public List findSuperAdminRoles() { log.debug("Request to get admin Roles"); return roleRepository - .findRolesByAuthorityName(AuthoritiesConstants.SYS_ADMIN).stream() + .findRolesByAuthorityName(RoleAuthority.SYS_ADMIN.authority()).stream() .map(roleMapper::roleToRoleDTO) .collect(Collectors.toCollection(LinkedList::new)); } @@ -111,7 +110,7 @@ public List findSuperAdminRoles() { @Transactional(readOnly = true) public RoleDTO findOne(Long id) { log.debug("Request to get Role : {}", id); - Role role = roleRepository.findById(id).get(); + org.radarbase.management.domain.Role role = roleRepository.findById(id).get(); return roleMapper.roleToRoleDTO(role); } diff --git a/src/main/java/org/radarbase/management/service/SubjectService.java b/src/main/java/org/radarbase/management/service/SubjectService.java index 1c6311106..810c01f5d 100644 --- a/src/main/java/org/radarbase/management/service/SubjectService.java +++ b/src/main/java/org/radarbase/management/service/SubjectService.java @@ -1,7 +1,7 @@ package org.radarbase.management.service; -import static org.radarbase.auth.authorization.AuthoritiesConstants.INACTIVE_PARTICIPANT; -import static org.radarbase.auth.authorization.AuthoritiesConstants.PARTICIPANT; +import static org.radarbase.auth.authorization.RoleAuthority.INACTIVE_PARTICIPANT; +import static org.radarbase.auth.authorization.RoleAuthority.PARTICIPANT; import static org.radarbase.management.service.dto.ProjectDTO.PRIVACY_POLICY_URL; import static org.radarbase.management.web.rest.errors.EntityName.GROUP; import static org.radarbase.management.web.rest.errors.EntityName.OAUTH_CLIENT; @@ -20,16 +20,19 @@ import java.util.HashSet; import java.util.List; import java.util.Map; -import java.util.NoSuchElementException; import java.util.Optional; import java.util.Set; import java.util.function.Function; import java.util.function.Predicate; import java.util.stream.Collectors; +import java.util.stream.Stream; import javax.annotation.Nonnull; + import org.hibernate.envers.query.AuditEntity; +import org.radarbase.auth.authorization.RoleAuthority; import org.radarbase.management.config.ManagementPortalProperties; +import org.radarbase.management.domain.Authority; import org.radarbase.management.domain.Group; import org.radarbase.management.domain.Project; import org.radarbase.management.domain.Role; @@ -81,9 +84,6 @@ public class SubjectService { @Autowired private SubjectRepository subjectRepository; - @Autowired - private AuthorityRepository authorityRepository; - @Autowired private SourceRepository sourceRepository; @@ -105,6 +105,9 @@ public class SubjectService { @Autowired private PasswordService passwordService; + @Autowired + private AuthorityRepository authorityRepository; + /** * Create a new subject. * @@ -163,12 +166,18 @@ private Group getSubjectGroup(Project project, String groupName) { * @return relevant Participant role * @throws java.util.NoSuchElementException if the authority name is not in the database */ - private Role getProjectParticipantRole(Project project, String authority) { - return roleRepository.findOneByProjectIdAndAuthorityName(project.getId(), authority) + private Role getProjectParticipantRole(Project project, RoleAuthority authority) { + return roleRepository.findOneByProjectIdAndAuthorityName(project.getId(), + authority.authority()) .orElseGet(() -> { Role subjectRole = new Role(); - subjectRole.setAuthority(authorityRepository.findByAuthorityName(authority) - .orElseThrow(NoSuchElementException::new)); + Authority auth = authorityRepository.findByAuthorityName(authority.authority()) + .orElseGet(() -> { + var a = new Authority(authority); + authorityRepository.save(a); + return a; + }); + subjectRole.setAuthority(auth); subjectRole.setProject(project); roleRepository.save(subjectRole); return subjectRole; @@ -208,19 +217,29 @@ public SubjectDTO updateSubject(SubjectDTO newSubjectDto) { } private Set updateParticipantRoles(Subject subject, SubjectDTO subjectDto) { - Set managedRoles = subject.getUser().getRoles().stream() - // make participant inactive in projects that do not match the new project - .map(role -> PARTICIPANT.equals(role.getAuthority().getName()) + if (subjectDto.getProject() == null || subjectDto.getProject().getProjectName() == null) { + return subject.getUser().getRoles(); + } + + Stream existingRoles = subject.getUser().getRoles().stream() + .map(role -> { + // make participant inactive in projects that do not match the new project + if (role.getAuthority().getName().equals(PARTICIPANT.authority()) && !role.getProject().getProjectName().equals( - subjectDto.getProject().getProjectName()) - ? getProjectParticipantRole(role.getProject(), INACTIVE_PARTICIPANT) - : role) + subjectDto.getProject().getProjectName())) { + return getProjectParticipantRole(role.getProject(), INACTIVE_PARTICIPANT); + } else { + // do not modify other roles. + return role; + } + }); + + // Ensure that given project is present + Stream newProjectRole = Stream.of(getProjectParticipantRole( + projectMapper.projectDTOToProject(subjectDto.getProject()), PARTICIPANT)); + + return Stream.concat(existingRoles, newProjectRole) .collect(Collectors.toSet()); - // add participant role for current project, if the project did not change, then the set - // will not change since the role being added here already exists in the set - managedRoles.add(getProjectParticipantRole(projectMapper.projectDTOToProject(subjectDto - .getProject()), PARTICIPANT)); - return managedRoles; } /** diff --git a/src/main/java/org/radarbase/management/service/UserService.java b/src/main/java/org/radarbase/management/service/UserService.java index 788425a26..37f981c9f 100644 --- a/src/main/java/org/radarbase/management/service/UserService.java +++ b/src/main/java/org/radarbase/management/service/UserService.java @@ -1,12 +1,14 @@ package org.radarbase.management.service; -import org.radarbase.auth.authorization.AuthoritiesConstants; +import org.radarbase.auth.authorization.RoleAuthority; import org.radarbase.auth.config.Constants; import org.radarbase.management.config.ManagementPortalProperties; +import org.radarbase.management.domain.Authority; import org.radarbase.management.domain.Project; import org.radarbase.management.domain.Role; import org.radarbase.management.domain.User; import org.radarbase.management.repository.AuthorityRepository; +import org.radarbase.management.repository.OrganizationRepository; import org.radarbase.management.repository.ProjectRepository; import org.radarbase.management.repository.RoleRepository; import org.radarbase.management.repository.UserRepository; @@ -17,6 +19,7 @@ import org.radarbase.management.service.dto.UserDTO; import org.radarbase.management.service.mapper.ProjectMapper; import org.radarbase.management.service.mapper.UserMapper; +import org.radarbase.management.web.rest.errors.BadRequestException; import org.radarbase.management.web.rest.errors.ConflictException; import org.radarbase.management.web.rest.errors.ErrorConstants; import org.radarbase.management.web.rest.errors.NotFoundException; @@ -37,13 +40,14 @@ import java.util.HashSet; import java.util.List; import java.util.Map; -import java.util.Objects; import java.util.Optional; import java.util.Set; import java.util.stream.Collectors; +import java.util.stream.Stream; -import static org.radarbase.auth.authorization.AuthoritiesConstants.INACTIVE_PARTICIPANT; -import static org.radarbase.auth.authorization.AuthoritiesConstants.PARTICIPANT; +import static org.radarbase.auth.authorization.RoleAuthority.INACTIVE_PARTICIPANT; +import static org.radarbase.auth.authorization.RoleAuthority.PARTICIPANT; +import static org.radarbase.auth.authorization.Permission.PROJECT_READ; import static org.radarbase.management.web.rest.errors.EntityName.USER; import static org.radarbase.management.web.rest.errors.ErrorConstants.ERR_EMAIL_EXISTS; import static org.radarbase.management.web.rest.errors.ErrorConstants.ERR_ENTITY_NOT_FOUND; @@ -63,6 +67,9 @@ public class UserService { @Autowired private ProjectRepository projectRepository; + @Autowired + private OrganizationRepository organizationRepository; + @Autowired private PasswordService passwordService; @@ -75,15 +82,15 @@ public class UserService { @Autowired private UserMapper userMapper; - @Autowired - private AuthorityRepository authorityRepository; - @Autowired private RevisionService revisionService; @Autowired private ManagementPortalProperties managementPortalProperties; + @Autowired + private AuthorityRepository authorityRepository; + /** * Activate a user with the given activation key. * @param key the activation key @@ -197,31 +204,82 @@ public User createUser(UserDTO userDto) { private Set getUserRoles(UserDTO userDto) { Set roles = new HashSet<>(); for (RoleDTO roleDto : userDto.getRoles()) { - Optional role = roleRepository.findOneByProjectIdAndAuthorityName( - roleDto.getProjectId(), roleDto.getAuthorityName()); - if (!role.isPresent() || role.get().getId() == null) { - Role currentRole = new Role(); - // supplied authorityname can be anything, so check if we actually have one - currentRole.setAuthority( - authorityRepository.findByAuthorityName(roleDto.getAuthorityName()) - .orElseThrow(() -> new NotFoundException("Authority not found with " - + "authorityName", USER, ErrorConstants.ERR_INVALID_AUTHORITY, - Collections.singletonMap("authorityName", - roleDto.getAuthorityName())))); - if (roleDto.getProjectId() != null) { - currentRole.setProject(projectRepository.getOne(roleDto.getProjectId())); - } - - if (Objects.nonNull(currentRole.getAuthority())) { - roles.add(roleRepository.save(currentRole)); + RoleAuthority authority = getRoleAuthority(roleDto); + RoleAuthority.Scope scope = authority.scope(); + + Optional existingRole = switch (scope) { + case GLOBAL -> roleRepository.findRolesByAuthorityName( + roleDto.getAuthorityName()).stream().findAny(); + case ORGANIZATION -> roleRepository.findOneByOrganizationIdAndAuthorityName( + roleDto.getOrganizationId(), roleDto.getAuthorityName()); + case PROJECT -> roleRepository.findOneByProjectIdAndAuthorityName( + roleDto.getProjectId(), roleDto.getAuthorityName()); + }; + + Role currentRole = existingRole.orElseGet(() -> { + Role newRole = new Role(); + Authority auth = authorityRepository.findByAuthorityName(authority.authority()) + .orElseGet(() -> { + var a = new Authority(authority); + authorityRepository.save(a); + return a; + }); + newRole.setAuthority(auth); + if (scope == RoleAuthority.Scope.ORGANIZATION) { + var organization = organizationRepository.findById( + roleDto.getOrganizationId()) + .orElseThrow(() -> new NotFoundException( + "Cannot find organization for authority", + USER, ErrorConstants.ERR_INVALID_AUTHORITY, + Map.of("authorityName", roleDto.getAuthorityName(), + "organizationId", + roleDto.getOrganizationId().toString()))); + newRole.setOrganization(organization); + } else if (scope == RoleAuthority.Scope.PROJECT) { + var project = projectRepository.findById( + roleDto.getProjectId()) + .orElseThrow(() -> new NotFoundException( + "Cannot find organization for authority", + USER, ErrorConstants.ERR_INVALID_AUTHORITY, + Map.of("authorityName", roleDto.getAuthorityName(), + "projectId", + roleDto.getProjectId().toString()))); + newRole.setProject(project); } - } else { - roles.add(role.get()); - } + return newRole; + }); + roles.add(currentRole); } return roles; } + private static RoleAuthority getRoleAuthority(RoleDTO roleDto) { + RoleAuthority authority; + try { + authority = RoleAuthority.valueOfAuthority(roleDto.getAuthorityName()); + } catch (IllegalArgumentException ex) { + throw new BadRequestException("Authority not found with " + + "authorityName", USER, ErrorConstants.ERR_INVALID_AUTHORITY, + Collections.singletonMap("authorityName", + roleDto.getAuthorityName())); + } + if (authority.scope() == RoleAuthority.Scope.ORGANIZATION + && roleDto.getOrganizationId() == null) { + throw new BadRequestException("Authority with " + + "authorityName should have organization ID", + USER, ErrorConstants.ERR_INVALID_AUTHORITY, + Collections.singletonMap("authorityName", roleDto.getAuthorityName())); + } + if (authority.scope() == RoleAuthority.Scope.PROJECT + && roleDto.getProjectId() == null) { + throw new BadRequestException("Authority with " + + "authorityName should have project ID", + USER, ErrorConstants.ERR_INVALID_AUTHORITY, + Collections.singletonMap("authorityName", roleDto.getAuthorityName())); + } + return authority; + } + /** * Update basic information (first name, last name, email, language) for the current user. * @@ -348,12 +406,33 @@ public List getProjectsAssignedToUser(String login) { List projectsOfUser; - if (userByLogin.getRoles().stream() - .anyMatch(r -> AuthoritiesConstants.SYS_ADMIN.equals(r.getAuthority().getName()))) { + Set roles = userByLogin.getRoles(); + + if (roles.stream().anyMatch(r -> { + var role = r.getRole(); + return role.scope() == RoleAuthority.Scope.GLOBAL + && PROJECT_READ.isRoleAllowed(role); + })) { projectsOfUser = projectRepository.findAll(); } else { - projectsOfUser = userByLogin.getRoles().stream() - .map(Role::getProject) + var orgProjects = roles.stream() + .filter(r -> { + var role = r.getRole(); + return role.scope() == RoleAuthority.Scope.ORGANIZATION + && PROJECT_READ.isRoleAllowed(role); + }) + .map(Role::getOrganization) + .flatMap(org -> projectRepository.findAllByOrganization(org).stream()); + + var projects = roles.stream() + .filter(r -> { + var role = r.getRole(); + return role.scope() == RoleAuthority.Scope.PROJECT + && PROJECT_READ.isRoleAllowed(role); + }) + .map(Role::getProject); + + projectsOfUser = Stream.concat(orgProjects, projects) .distinct() .collect(Collectors.toList()); } @@ -382,8 +461,10 @@ public void removeNotActivatedUsers() { log.info("Scheduled scan for expired user accounts starting now"); ZonedDateTime cutoff = ZonedDateTime.now().minus(Period.ofDays(3)); - userRepository.findAllByActivatedAndAuthoritiesNot(false, - Arrays.asList(PARTICIPANT, INACTIVE_PARTICIPANT)).stream() + List authorities = Arrays.asList( + PARTICIPANT.authority(), INACTIVE_PARTICIPANT.authority()); + + userRepository.findAllByActivatedAndAuthoritiesNot(false, authorities).stream() .filter(user -> revisionService.getAuditInfo(user).getCreatedAt().isBefore(cutoff)) .forEach(user -> { try { diff --git a/src/main/java/org/radarbase/management/service/dto/RoleDTO.java b/src/main/java/org/radarbase/management/service/dto/RoleDTO.java index 2c161e2d6..decf5f52c 100644 --- a/src/main/java/org/radarbase/management/service/dto/RoleDTO.java +++ b/src/main/java/org/radarbase/management/service/dto/RoleDTO.java @@ -1,5 +1,7 @@ package org.radarbase.management.service.dto; +import java.util.Objects; + /** * Created by nivethika on 23-5-17. */ @@ -7,6 +9,10 @@ public class RoleDTO { private Long id; + private Long organizationId; + + private String organizationName; + private Long projectId; private String projectName; @@ -21,6 +27,22 @@ public void setId(Long id) { this.id = id; } + public Long getOrganizationId() { + return organizationId; + } + + public void setOrganizationId(Long organizationId) { + this.organizationId = organizationId; + } + + public String getOrganizationName() { + return organizationName; + } + + public void setOrganizationName(String organizationName) { + this.organizationName = organizationName; + } + public Long getProjectId() { return projectId; } @@ -44,4 +66,37 @@ public String getProjectName() { public void setProjectName(String projectName) { this.projectName = projectName; } + + @Override + public String toString() { + return "RoleDTO{" + "id=" + id + + ", organizationId=" + organizationId + + ", projectId=" + projectId + + ", authorityName='" + authorityName + '\'' + + '}'; + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + + RoleDTO roleDto = (RoleDTO) o; + + return Objects.equals(id, roleDto.id) + && Objects.equals(organizationId, roleDto.organizationId) + && Objects.equals(organizationName, roleDto.organizationName) + && Objects.equals(projectId, roleDto.projectId) + && Objects.equals(projectName, roleDto.projectName) + && Objects.equals(authorityName, roleDto.authorityName); + } + + @Override + public int hashCode() { + return id != null ? id.hashCode() : 0; + } } diff --git a/src/main/java/org/radarbase/management/service/mapper/RoleMapper.java b/src/main/java/org/radarbase/management/service/mapper/RoleMapper.java index e80b5a0ea..7602a66ef 100644 --- a/src/main/java/org/radarbase/management/service/mapper/RoleMapper.java +++ b/src/main/java/org/radarbase/management/service/mapper/RoleMapper.java @@ -20,11 +20,14 @@ public interface RoleMapper { @Mapping(source = "authority.name", target = "authorityName") @Mapping(source = "project.id", target = "projectId") @Mapping(source = "project.projectName", target = "projectName") + @Mapping(source = "organization.id", target = "organizationId") + @Mapping(source = "organization.name", target = "organizationName") RoleDTO roleToRoleDTO(Role role); @Mapping(target = "authority", ignore = true) @Mapping(source = "projectId", target = "project.id") @Mapping(target = "users", ignore = true) + @Mapping(source = "organizationId", target = "organization.id") Role roleDTOToRole(RoleDTO roleDtp); Set roleDTOsToRoles(Set roleDtos); diff --git a/src/main/java/org/radarbase/management/service/mapper/decorator/RoleMapperDecorator.java b/src/main/java/org/radarbase/management/service/mapper/decorator/RoleMapperDecorator.java index 190af3e40..0c7b8c481 100644 --- a/src/main/java/org/radarbase/management/service/mapper/decorator/RoleMapperDecorator.java +++ b/src/main/java/org/radarbase/management/service/mapper/decorator/RoleMapperDecorator.java @@ -26,7 +26,6 @@ public abstract class RoleMapperDecorator implements RoleMapper { */ @Override public Role roleDTOToRole(RoleDTO roleDto) { - if (roleDto == null) { return null; } @@ -34,7 +33,7 @@ public Role roleDTOToRole(RoleDTO roleDto) { Role role = delegate.roleDTOToRole(roleDto); if (role.getAuthority() == null) { - role.setAuthority(authorityRepository.getOne(roleDto.getAuthorityName())); + role.setAuthority(authorityRepository.getById(roleDto.getAuthorityName())); } return role; diff --git a/src/main/java/org/radarbase/management/web/rest/AuthorityResource.java b/src/main/java/org/radarbase/management/web/rest/AuthorityResource.java index 5a0394973..8d68f0754 100644 --- a/src/main/java/org/radarbase/management/web/rest/AuthorityResource.java +++ b/src/main/java/org/radarbase/management/web/rest/AuthorityResource.java @@ -4,9 +4,12 @@ import static org.radarbase.auth.authorization.RadarAuthorization.checkPermission; import io.micrometer.core.annotation.Timed; -import java.util.Arrays; + import java.util.List; -import org.radarbase.auth.authorization.AuthoritiesConstants; +import java.util.stream.Collectors; +import java.util.stream.Stream; + +import org.radarbase.auth.authorization.RoleAuthority; import org.radarbase.auth.exception.NotAuthorizedException; import org.radarbase.auth.token.RadarToken; import org.slf4j.Logger; @@ -37,8 +40,12 @@ public class AuthorityResource { public List getAllAuthorities() throws NotAuthorizedException { log.debug("REST request to get all Authorities"); checkPermission(token, AUTHORITY_READ); - return Arrays.asList(AuthoritiesConstants.PROJECT_ADMIN, AuthoritiesConstants.PROJECT_OWNER, - AuthoritiesConstants.PROJECT_AFFILIATE, AuthoritiesConstants.PROJECT_ANALYST); + return Stream.of( + RoleAuthority.ORGANIZATION_ADMIN, + RoleAuthority.PROJECT_ADMIN, RoleAuthority.PROJECT_OWNER, + RoleAuthority.PROJECT_AFFILIATE, RoleAuthority.PROJECT_ANALYST) + .map(RoleAuthority::authority) + .collect(Collectors.toList()); } } diff --git a/src/main/java/org/radarbase/management/web/rest/LogsResource.java b/src/main/java/org/radarbase/management/web/rest/LogsResource.java index ee19911fb..8c94ea56f 100644 --- a/src/main/java/org/radarbase/management/web/rest/LogsResource.java +++ b/src/main/java/org/radarbase/management/web/rest/LogsResource.java @@ -5,7 +5,7 @@ import io.micrometer.core.annotation.Timed; import java.util.List; import java.util.stream.Collectors; -import org.radarbase.auth.authorization.AuthoritiesConstants; +import org.radarbase.auth.authorization.RoleAuthority; import org.radarbase.management.web.rest.vm.LoggerVM; import org.slf4j.LoggerFactory; import org.springframework.http.HttpStatus; @@ -30,7 +30,7 @@ public class LogsResource { */ @GetMapping("/logs") @Timed - @Secured({AuthoritiesConstants.SYS_ADMIN}) + @Secured({RoleAuthority.SYS_ADMIN_AUTHORITY}) public List getList() { LoggerContext context = (LoggerContext) LoggerFactory.getILoggerFactory(); return context.getLoggerList() @@ -46,7 +46,7 @@ public List getList() { @PutMapping("/logs") @ResponseStatus(HttpStatus.NO_CONTENT) @Timed - @Secured({AuthoritiesConstants.SYS_ADMIN}) + @Secured({RoleAuthority.SYS_ADMIN_AUTHORITY}) public void changeLevel(@RequestBody LoggerVM jsonLogger) { LoggerContext context = (LoggerContext) LoggerFactory.getILoggerFactory(); context.getLogger(jsonLogger.getName()).setLevel(Level.valueOf(jsonLogger.getLevel())); diff --git a/src/main/java/org/radarbase/management/web/rest/OrganizationResource.java b/src/main/java/org/radarbase/management/web/rest/OrganizationResource.java index 932a17d8f..d460d72f9 100644 --- a/src/main/java/org/radarbase/management/web/rest/OrganizationResource.java +++ b/src/main/java/org/radarbase/management/web/rest/OrganizationResource.java @@ -64,7 +64,7 @@ public ResponseEntity createOrganization( @Valid @RequestBody OrganizationDTO organizationDto ) throws URISyntaxException, NotAuthorizedException { log.debug("REST request to save Organization : {}", organizationDto); - // checkPermission(token, ORGANIZATION_CREATE); + checkPermission(token, ORGANIZATION_CREATE); if (organizationDto.getId() != null) { var msg = "A new organization cannot already have an ID"; var headers = HeaderUtil.createFailureAlert(ENTITY_NAME, "idexists", msg); @@ -92,7 +92,7 @@ public ResponseEntity createOrganization( @Timed public ResponseEntity getAllOrganizations() throws NotAuthorizedException { log.debug("REST request to get Organizations"); - // checkPermission(token, ORGANIZATION_READ); + checkPermission(token, ORGANIZATION_READ); var orgs = organizationService.findAll(); return new ResponseEntity<>(orgs, HttpStatus.OK); } @@ -110,7 +110,7 @@ public ResponseEntity getAllOrganizations() throws NotAuthorizedException { public ResponseEntity getOrganization( @PathVariable String name) throws NotAuthorizedException { log.debug("REST request to get Organization : {}", name); - // checkPermissionOnOrganization(token, ORGANIZATION_READ, name); + checkPermissionOnOrganization(token, ORGANIZATION_READ, name); var org = organizationService.findByName(name); var dto = org.orElseThrow(() -> new NotFoundException( "Organization not found with name " + name, diff --git a/src/main/java/org/radarbase/management/web/rest/ProjectResource.java b/src/main/java/org/radarbase/management/web/rest/ProjectResource.java index 9393c715f..6dede5a3c 100644 --- a/src/main/java/org/radarbase/management/web/rest/ProjectResource.java +++ b/src/main/java/org/radarbase/management/web/rest/ProjectResource.java @@ -47,7 +47,7 @@ import java.util.List; import java.util.Objects; -import static org.radarbase.auth.authorization.AuthoritiesConstants.PARTICIPANT; +import static org.radarbase.auth.authorization.RoleAuthority.PARTICIPANT; import static org.radarbase.auth.authorization.Permission.PROJECT_CREATE; import static org.radarbase.auth.authorization.Permission.PROJECT_DELETE; import static org.radarbase.auth.authorization.Permission.PROJECT_READ; diff --git a/src/main/java/org/radarbase/management/web/rest/RevisionResource.java b/src/main/java/org/radarbase/management/web/rest/RevisionResource.java index a4953f282..2c7312f3b 100644 --- a/src/main/java/org/radarbase/management/web/rest/RevisionResource.java +++ b/src/main/java/org/radarbase/management/web/rest/RevisionResource.java @@ -1,7 +1,7 @@ package org.radarbase.management.web.rest; import io.micrometer.core.annotation.Timed; -import org.radarbase.auth.authorization.AuthoritiesConstants; +import org.radarbase.auth.authorization.RoleAuthority; import org.radarbase.management.service.RevisionService; import org.radarbase.management.service.dto.RevisionInfoDTO; import org.radarbase.management.web.rest.util.PaginationUtil; @@ -38,7 +38,7 @@ public class RevisionResource { */ @GetMapping("/revisions") @Timed - @Secured({AuthoritiesConstants.SYS_ADMIN}) + @Secured({RoleAuthority.SYS_ADMIN_AUTHORITY}) public ResponseEntity> getRevisions( @PageableDefault(page = 0, size = Integer.MAX_VALUE) Pageable pageable) { log.debug("REST request to get page of revisions"); @@ -55,7 +55,7 @@ public ResponseEntity> getRevisions( */ @GetMapping("/revisions/{id}") @Timed - @Secured({AuthoritiesConstants.SYS_ADMIN}) + @Secured({RoleAuthority.SYS_ADMIN_AUTHORITY}) public ResponseEntity getRevision(@PathVariable("id") Integer id) { log.debug("REST request to get single revision: {}", id.toString()); return ResponseEntity.ok(revisionService.getRevision(id)); diff --git a/src/main/java/org/radarbase/management/web/rest/RoleResource.java b/src/main/java/org/radarbase/management/web/rest/RoleResource.java index f8aef611e..5e45ad48e 100644 --- a/src/main/java/org/radarbase/management/web/rest/RoleResource.java +++ b/src/main/java/org/radarbase/management/web/rest/RoleResource.java @@ -1,7 +1,7 @@ package org.radarbase.management.web.rest; import io.micrometer.core.annotation.Timed; -import org.radarbase.auth.authorization.AuthoritiesConstants; +import org.radarbase.auth.authorization.RoleAuthority; import org.radarbase.auth.config.Constants; import org.radarbase.auth.exception.NotAuthorizedException; import org.radarbase.auth.token.RadarToken; @@ -59,7 +59,7 @@ public class RoleResource { */ @PostMapping("/roles") @Timed - @Secured({AuthoritiesConstants.SYS_ADMIN}) + @Secured({RoleAuthority.SYS_ADMIN_AUTHORITY}) public ResponseEntity createRole(@Valid @RequestBody RoleDTO roleDto) throws URISyntaxException, NotAuthorizedException { log.debug("REST request to save Role : {}", roleDto); @@ -85,7 +85,7 @@ public ResponseEntity createRole(@Valid @RequestBody RoleDTO roleDto) */ @PutMapping("/roles") @Timed - @Secured({AuthoritiesConstants.SYS_ADMIN}) + @Secured({RoleAuthority.SYS_ADMIN_AUTHORITY}) public ResponseEntity updateRole(@Valid @RequestBody RoleDTO roleDto) throws URISyntaxException, NotAuthorizedException { log.debug("REST request to update Role : {}", roleDto); @@ -106,7 +106,7 @@ public ResponseEntity updateRole(@Valid @RequestBody RoleDTO roleDto) */ @GetMapping("/roles") @Timed - @Secured({AuthoritiesConstants.SYS_ADMIN}) + @Secured({RoleAuthority.SYS_ADMIN_AUTHORITY}) public List getAllRoles() { log.debug("REST request to get all Roles"); return roleService.findAll(); @@ -119,7 +119,7 @@ public List getAllRoles() { */ @GetMapping("/roles/admin") @Timed - @Secured({AuthoritiesConstants.SYS_ADMIN}) + @Secured({RoleAuthority.SYS_ADMIN_AUTHORITY}) public List getAllAdminRoles() { log.debug("REST request to get all Admin Roles"); return roleService.findSuperAdminRoles(); diff --git a/src/main/java/org/radarbase/management/web/rest/SourceDataResource.java b/src/main/java/org/radarbase/management/web/rest/SourceDataResource.java index 3d04168a5..40ac7d7fd 100644 --- a/src/main/java/org/radarbase/management/web/rest/SourceDataResource.java +++ b/src/main/java/org/radarbase/management/web/rest/SourceDataResource.java @@ -35,7 +35,7 @@ import java.util.List; import java.util.Optional; -import static org.radarbase.auth.authorization.AuthoritiesConstants.SYS_ADMIN; +import static org.radarbase.auth.authorization.RoleAuthority.SYS_ADMIN; import static org.radarbase.auth.authorization.Permission.SOURCEDATA_CREATE; import static org.radarbase.auth.authorization.Permission.SOURCEDATA_DELETE; import static org.radarbase.auth.authorization.Permission.SOURCEDATA_READ; diff --git a/src/main/java/org/radarbase/management/web/rest/SourceResource.java b/src/main/java/org/radarbase/management/web/rest/SourceResource.java index 4ef0cdc81..5785d06c6 100644 --- a/src/main/java/org/radarbase/management/web/rest/SourceResource.java +++ b/src/main/java/org/radarbase/management/web/rest/SourceResource.java @@ -38,7 +38,7 @@ import java.util.Optional; import java.util.stream.Collectors; -import static org.radarbase.auth.authorization.AuthoritiesConstants.SYS_ADMIN; +import static org.radarbase.auth.authorization.RoleAuthority.SYS_ADMIN; import static org.radarbase.auth.authorization.Permission.SOURCE_CREATE; import static org.radarbase.auth.authorization.Permission.SOURCE_DELETE; import static org.radarbase.auth.authorization.Permission.SOURCE_READ; diff --git a/src/main/java/org/radarbase/management/web/rest/SubjectResource.java b/src/main/java/org/radarbase/management/web/rest/SubjectResource.java index c2d99e683..ecf63d749 100644 --- a/src/main/java/org/radarbase/management/web/rest/SubjectResource.java +++ b/src/main/java/org/radarbase/management/web/rest/SubjectResource.java @@ -1,7 +1,7 @@ package org.radarbase.management.web.rest; import static tech.jhipster.web.util.ResponseUtil.wrapOrNotFound; -import static org.radarbase.auth.authorization.AuthoritiesConstants.PARTICIPANT; +import static org.radarbase.auth.authorization.RoleAuthority.PARTICIPANT; import static org.radarbase.auth.authorization.Permission.SUBJECT_CREATE; import static org.radarbase.auth.authorization.Permission.SUBJECT_DELETE; import static org.radarbase.auth.authorization.Permission.SUBJECT_READ; @@ -252,7 +252,7 @@ public ResponseEntity> getAllSubjects( // if not specified do not include inactive patients List authoritiesToInclude = subjectCriteria.getAuthority().stream() .filter(Objects::nonNull) - .map(Enum::toString) + .map(Enum::name) .collect(Collectors.toList()); if (projectName != null && externalId != null) { @@ -448,8 +448,8 @@ public ResponseEntity assignSources(@PathVariable Strin SUBJECT, ERR_SOURCE_TYPE_NOT_PROVIDED) ); - checkPermissionOnSubject(token, SUBJECT_UPDATE, currentProject - .getProjectName(), sub.getUser().getLogin()); + checkPermissionOnSubject(token, SUBJECT_UPDATE, currentProject.getProjectName(), + sub.getUser().getLogin()); // check if any of id, sourceID, sourceName were non-null boolean existing = Stream.of(sourceDto.getId(), sourceDto.getSourceName(), @@ -534,8 +534,7 @@ public ResponseEntity> getSubjectSources( @Timed public ResponseEntity updateSubjectSource(@PathVariable String login, @PathVariable String sourceName, @RequestBody Map attributes) - throws NotFoundException, NotAuthorizedException, - URISyntaxException { + throws NotFoundException, NotAuthorizedException { // check the subject id Subject subject = subjectRepository.findOneWithEagerBySubjectLogin(login) .orElseThrow(() -> new NotFoundException("Subject ID not found", diff --git a/src/main/java/org/radarbase/management/web/rest/UserResource.java b/src/main/java/org/radarbase/management/web/rest/UserResource.java index 72b1aa13f..b4354b898 100644 --- a/src/main/java/org/radarbase/management/web/rest/UserResource.java +++ b/src/main/java/org/radarbase/management/web/rest/UserResource.java @@ -42,7 +42,7 @@ import java.util.Locale; import java.util.Optional; -import static org.radarbase.auth.authorization.AuthoritiesConstants.SYS_ADMIN; +import static org.radarbase.auth.authorization.RoleAuthority.SYS_ADMIN; import static org.radarbase.auth.authorization.Permission.PROJECT_READ; import static org.radarbase.auth.authorization.Permission.USER_CREATE; import static org.radarbase.auth.authorization.Permission.USER_DELETE; diff --git a/src/main/resources/config/liquibase/changelog/20211110160000_add_organization.xml b/src/main/resources/config/liquibase/changelog/20211110160000_add_organization.xml index b38cc692d..036298b30 100644 --- a/src/main/resources/config/liquibase/changelog/20211110160000_add_organization.xml +++ b/src/main/resources/config/liquibase/changelog/20211110160000_add_organization.xml @@ -59,4 +59,24 @@ + + + + + + + + + + + + + + + + + + + diff --git a/src/test/java/org/radarbase/management/config/MockConfiguration.java b/src/test/java/org/radarbase/management/config/MockConfiguration.java index 556099fcf..684b172a8 100644 --- a/src/test/java/org/radarbase/management/config/MockConfiguration.java +++ b/src/test/java/org/radarbase/management/config/MockConfiguration.java @@ -9,18 +9,22 @@ package org.radarbase.management.config; +import org.radarbase.auth.authorization.Permission; +import org.radarbase.auth.token.AuthorityReference; import org.radarbase.auth.token.RadarToken; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Primary; +import java.util.Arrays; import java.util.List; +import java.util.Set; import static org.mockito.ArgumentMatchers.any; -import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import static org.radarbase.auth.authorization.AuthoritiesConstants.SYS_ADMIN; +import static org.radarbase.auth.authorization.RoleAuthority.SYS_ADMIN; +import static org.radarbase.auth.authorization.RoleAuthority.SYS_ADMIN_AUTHORITY; @Configuration public class MockConfiguration { @@ -29,13 +33,18 @@ public class MockConfiguration { public RadarToken radarTokenMock() { RadarToken token = mock(RadarToken.class); when(token.getSubject()).thenReturn("admin"); + when(token.getUsername()).thenReturn("admin"); when(token.hasAuthority(any())).thenAnswer(a -> a.getArgument(0).equals(SYS_ADMIN)); when(token.hasPermission(any())).thenReturn(true); + when(token.hasPermissionOnOrganization(any(), any())).thenReturn(true); + when(token.hasPermissionOnOrganizationAndProject(any(), any(), any())).thenReturn(true); when(token.hasPermissionOnProject(any(), any())).thenReturn(true); when(token.hasPermissionOnSubject(any(), any(), any())).thenReturn(true); when(token.hasPermissionOnSource(any(), any(), any(), any())).thenReturn(true); when(token.isClientCredentials()).thenReturn(false); - when(token.getAuthorities()).thenReturn(List.of(SYS_ADMIN)); + when(token.getAuthorities()).thenReturn(List.of(SYS_ADMIN_AUTHORITY)); + when(token.getRoles()).thenReturn(Set.of(new AuthorityReference(SYS_ADMIN))); + when(token.getScopes()).thenReturn(Arrays.asList(Permission.scopes())); return token; } } diff --git a/src/test/java/org/radarbase/management/service/UserServiceIntTest.java b/src/test/java/org/radarbase/management/service/UserServiceIntTest.java index dbe21f318..ed15a9088 100644 --- a/src/test/java/org/radarbase/management/service/UserServiceIntTest.java +++ b/src/test/java/org/radarbase/management/service/UserServiceIntTest.java @@ -1,6 +1,5 @@ package org.radarbase.management.service; -import javax.persistence.EntityManager; import org.hibernate.envers.AuditReader; import org.hibernate.envers.AuditReaderFactory; import org.hibernate.envers.query.AuditEntity; @@ -26,6 +25,7 @@ import org.springframework.test.util.ReflectionTestUtils; import org.springframework.transaction.annotation.Transactional; +import javax.persistence.EntityManager; import javax.persistence.EntityManagerFactory; import java.time.Period; import java.time.ZonedDateTime; @@ -35,7 +35,7 @@ import java.util.Optional; import static org.assertj.core.api.Assertions.assertThat; -import static org.radarbase.auth.authorization.AuthoritiesConstants.SYS_ADMIN; +import static org.radarbase.auth.authorization.RoleAuthority.SYS_ADMIN; import static org.radarbase.management.web.rest.TestUtil.commitTransactionAndStartNew; /** diff --git a/src/test/java/org/radarbase/management/web/rest/AccountResourceIntTest.java b/src/test/java/org/radarbase/management/web/rest/AccountResourceIntTest.java index 34d0aefd5..c581b9481 100644 --- a/src/test/java/org/radarbase/management/web/rest/AccountResourceIntTest.java +++ b/src/test/java/org/radarbase/management/web/rest/AccountResourceIntTest.java @@ -22,11 +22,10 @@ import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; -import org.radarbase.auth.authorization.AuthoritiesConstants; +import org.radarbase.auth.authorization.RoleAuthority; import org.radarbase.auth.token.RadarToken; import org.radarbase.management.ManagementPortalTestApp; import org.radarbase.management.domain.Authority; -import org.radarbase.management.domain.Role; import org.radarbase.management.domain.User; import org.radarbase.management.repository.UserRepository; import org.radarbase.management.security.RadarAuthentication; @@ -112,10 +111,10 @@ void testNonAuthenticatedUser() throws Exception { void testAuthenticatedUser() throws Exception { final RadarToken token = mock(RadarToken.class); - Set roles = new HashSet<>(); - Role role = new Role(); + Set roles = new HashSet<>(); + org.radarbase.management.domain.Role role = new org.radarbase.management.domain.Role(); Authority authority = new Authority(); - authority.setName(AuthoritiesConstants.SYS_ADMIN); + authority.setName(RoleAuthority.SYS_ADMIN.authority()); role.setAuthority(authority); roles.add(role); @@ -142,15 +141,16 @@ void testAuthenticatedUser() throws Exception { .andExpect(jsonPath("$.lastName").value("doe")) .andExpect(jsonPath("$.email").value("john.doe@jhipster.com")) .andExpect(jsonPath("$.langKey").value("en")) - .andExpect(jsonPath("$.authorities").value(AuthoritiesConstants.SYS_ADMIN)); + .andExpect(jsonPath("$.authorities").value( + RoleAuthority.SYS_ADMIN.authority())); } @Test void testGetExistingAccount() throws Exception { - Set roles = new HashSet<>(); - Role role = new Role(); + Set roles = new HashSet<>(); + org.radarbase.management.domain.Role role = new org.radarbase.management.domain.Role(); Authority authority = new Authority(); - authority.setName(AuthoritiesConstants.SYS_ADMIN); + authority.setName(RoleAuthority.SYS_ADMIN.authority()); role.setAuthority(authority); roles.add(role); @@ -172,7 +172,8 @@ void testGetExistingAccount() throws Exception { .andExpect(jsonPath("$.lastName").value("doe")) .andExpect(jsonPath("$.email").value("john.doe@jhipster.com")) .andExpect(jsonPath("$.langKey").value("en")) - .andExpect(jsonPath("$.authorities").value(AuthoritiesConstants.SYS_ADMIN)); + .andExpect(jsonPath("$.authorities").value( + RoleAuthority.SYS_ADMIN.authority())); } @Test @@ -189,7 +190,7 @@ void testGetUnknownAccount() throws Exception { void testSaveInvalidLogin() throws Exception { Set roles = new HashSet<>(); RoleDTO role = new RoleDTO(); - role.setAuthorityName(AuthoritiesConstants.PARTICIPANT); + role.setAuthorityName(RoleAuthority.PARTICIPANT.authority()); roles.add(role); UserDTO invalidUser = new UserDTO(); diff --git a/src/test/java/org/radarbase/management/web/rest/GroupResourceIntTest.java b/src/test/java/org/radarbase/management/web/rest/GroupResourceIntTest.java index 2f630fe4a..31ea0a7e3 100644 --- a/src/test/java/org/radarbase/management/web/rest/GroupResourceIntTest.java +++ b/src/test/java/org/radarbase/management/web/rest/GroupResourceIntTest.java @@ -19,7 +19,6 @@ import org.radarbase.management.service.GroupService; import org.radarbase.management.service.SubjectService; import org.radarbase.management.service.dto.GroupDTO; -import org.radarbase.management.service.dto.ProjectDTO; import org.radarbase.management.service.dto.SubjectDTO; import org.radarbase.management.service.mapper.GroupMapper; import org.radarbase.management.service.mapper.ProjectMapper; diff --git a/src/test/java/org/radarbase/management/web/rest/SubjectResourceIntTest.java b/src/test/java/org/radarbase/management/web/rest/SubjectResourceIntTest.java index c5f5c694f..62a2196f4 100644 --- a/src/test/java/org/radarbase/management/web/rest/SubjectResourceIntTest.java +++ b/src/test/java/org/radarbase/management/web/rest/SubjectResourceIntTest.java @@ -253,7 +253,6 @@ void updateSubjectWithNewProject() throws Exception { // Update the subject Subject updatedSubject = subjectRepository.findById(subjectDto.getId()).get(); - updatedSubject .externalLink(UPDATED_EXTERNAL_LINK) .externalId(UPDATED_ENTERNAL_ID) diff --git a/src/test/java/org/radarbase/management/web/rest/UserResourceIntTest.java b/src/test/java/org/radarbase/management/web/rest/UserResourceIntTest.java index 18359649b..ef58180c4 100644 --- a/src/test/java/org/radarbase/management/web/rest/UserResourceIntTest.java +++ b/src/test/java/org/radarbase/management/web/rest/UserResourceIntTest.java @@ -4,13 +4,13 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.MockitoAnnotations; -import org.radarbase.auth.authorization.AuthoritiesConstants; +import org.radarbase.auth.authorization.RoleAuthority; import org.radarbase.auth.token.RadarToken; import org.radarbase.management.ManagementPortalTestApp; import org.radarbase.management.config.ManagementPortalProperties; import org.radarbase.management.domain.Authority; -import org.radarbase.management.domain.Role; import org.radarbase.management.domain.User; +import org.radarbase.management.repository.ProjectRepository; import org.radarbase.management.repository.SubjectRepository; import org.radarbase.management.repository.UserRepository; import org.radarbase.management.security.JwtAuthenticationFilter; @@ -42,6 +42,7 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.hamcrest.Matchers.hasItem; +import static org.radarbase.auth.authorization.RoleAuthority.SYS_ADMIN_AUTHORITY; import static org.radarbase.management.service.UserServiceIntTest.DEFAULT_EMAIL; import static org.radarbase.management.service.UserServiceIntTest.DEFAULT_FIRSTNAME; import static org.radarbase.management.service.UserServiceIntTest.DEFAULT_LANGKEY; @@ -54,7 +55,7 @@ import static org.radarbase.management.service.UserServiceIntTest.UPDATED_LASTNAME; import static org.radarbase.management.service.UserServiceIntTest.UPDATED_LOGIN; import static org.radarbase.management.service.UserServiceIntTest.UPDATED_PASSWORD; -import static org.radarbase.auth.authorization.AuthoritiesConstants.SYS_ADMIN; +import static org.radarbase.auth.authorization.RoleAuthority.SYS_ADMIN; import static org.radarbase.management.service.UserServiceIntTest.createEntity; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.delete; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; @@ -104,6 +105,9 @@ class UserResourceIntTest { @Autowired private PasswordService passwordService; + @Autowired + private ProjectRepository projectRepository; + private MockMvc restUserMockMvc; private User user; @@ -145,7 +149,7 @@ void createUser() throws Exception { // Create the User Set roles = new HashSet<>(); RoleDTO role = new RoleDTO(); - role.setAuthorityName(SYS_ADMIN); + role.setAuthorityName(SYS_ADMIN_AUTHORITY); roles.add(role); ManagedUserVM managedUserVm = createDefaultUser(roles); @@ -173,7 +177,7 @@ void createUserWithExistingId() throws Exception { Set roles = new HashSet<>(); RoleDTO role = new RoleDTO(); - role.setAuthorityName(AuthoritiesConstants.PARTICIPANT); + role.setAuthorityName(RoleAuthority.PARTICIPANT.authority()); roles.add(role); ManagedUserVM managedUserVm = createDefaultUser(roles); @@ -199,7 +203,7 @@ void createUserWithExistingLogin() throws Exception { Set roles = new HashSet<>(); RoleDTO role = new RoleDTO(); - role.setAuthorityName(AuthoritiesConstants.PARTICIPANT); + role.setAuthorityName(RoleAuthority.PARTICIPANT.authority()); roles.add(role); ManagedUserVM managedUserVm = createDefaultUser(roles); managedUserVm.setEmail("anothermail@localhost"); @@ -224,7 +228,7 @@ void createUserWithExistingEmail() throws Exception { Set roles = new HashSet<>(); RoleDTO role = new RoleDTO(); - role.setAuthorityName(AuthoritiesConstants.PARTICIPANT); + role.setAuthorityName(RoleAuthority.PARTICIPANT.authority()); roles.add(role); ManagedUserVM managedUserVm = createDefaultUser(roles); managedUserVm.setLogin("anotherlogin"); @@ -244,7 +248,7 @@ void createUserWithExistingEmail() throws Exception { @Transactional void getAllUsers() throws Exception { // Initialize the database - Role adminRole = new Role(); + org.radarbase.management.domain.Role adminRole = new org.radarbase.management.domain.Role(); adminRole.setId(1L); adminRole.setAuthority(new Authority(SYS_ADMIN)); adminRole.setProject(null); @@ -302,14 +306,12 @@ void updateUser() throws Exception { // Initialize the database userRepository.saveAndFlush(user); final int databaseSizeBeforeUpdate = userRepository.findAll().size(); + var project = ProjectResourceIntTest.createEntity(); + projectRepository.save(project); // Update the user - User updatedUser = userRepository.findById(user.getId()).get(); - - Set roles = new HashSet<>(); - RoleDTO role = new RoleDTO(); - role.setAuthorityName(AuthoritiesConstants.PARTICIPANT); - roles.add(role); + User updatedUser = userRepository.findById(user.getId()) + .orElseThrow(() -> new AssertionError("Cannot find user " + user.getId())); ManagedUserVM managedUserVm = new ManagedUserVM(); managedUserVm.setId(updatedUser.getId()); @@ -320,7 +322,11 @@ void updateUser() throws Exception { managedUserVm.setEmail(UPDATED_EMAIL); managedUserVm.setActivated(updatedUser.getActivated()); managedUserVm.setLangKey(UPDATED_LANGKEY); - managedUserVm.setRoles(roles); + + RoleDTO role = new RoleDTO(); + role.setProjectId(project.getId()); + role.setAuthorityName(RoleAuthority.PARTICIPANT.authority()); + managedUserVm.setRoles(Set.of(role)); restUserMockMvc.perform(put("/api/users") .contentType(TestUtil.APPLICATION_JSON_UTF8) @@ -342,15 +348,14 @@ void updateUser() throws Exception { void updateUserLogin() throws Exception { // Initialize the database userRepository.saveAndFlush(user); + var project = ProjectResourceIntTest.createEntity(); + projectRepository.save(project); + final int databaseSizeBeforeUpdate = userRepository.findAll().size(); // Update the user - User updatedUser = userRepository.findById(user.getId()).get(); - - Set roles = new HashSet<>(); - RoleDTO role = new RoleDTO(); - role.setAuthorityName(AuthoritiesConstants.PARTICIPANT); - roles.add(role); + User updatedUser = userRepository.findById(user.getId()) + .orElseThrow(() -> new AssertionError("Cannot find user " + user.getId())); ManagedUserVM managedUserVm = new ManagedUserVM(); managedUserVm.setId(updatedUser.getId()); @@ -361,7 +366,11 @@ void updateUserLogin() throws Exception { managedUserVm.setEmail(UPDATED_EMAIL); managedUserVm.setActivated(updatedUser.getActivated()); managedUserVm.setLangKey(UPDATED_LANGKEY); - managedUserVm.setRoles(roles); + + RoleDTO role = new RoleDTO(); + role.setProjectId(project.getId()); + role.setAuthorityName(RoleAuthority.PARTICIPANT.authority()); + managedUserVm.setRoles(Set.of(role)); restUserMockMvc.perform(put("/api/users") .contentType(TestUtil.APPLICATION_JSON_UTF8) @@ -384,6 +393,8 @@ void updateUserLogin() throws Exception { void updateUserExistingEmail() throws Exception { // Initialize the database with 2 users userRepository.saveAndFlush(user); + var project = ProjectResourceIntTest.createEntity(); + projectRepository.save(project); User anotherUser = new User(); anotherUser.setLogin("jhipster"); @@ -396,11 +407,8 @@ void updateUserExistingEmail() throws Exception { userRepository.saveAndFlush(anotherUser); // Update the user - User updatedUser = userRepository.findById(user.getId()).get(); - Set roles = new HashSet<>(); - RoleDTO role = new RoleDTO(); - role.setAuthorityName(AuthoritiesConstants.PARTICIPANT); - roles.add(role); + User updatedUser = userRepository.findById(user.getId()) + .orElseThrow(() -> new AssertionError("Cannot find user " + user.getId())); ManagedUserVM managedUserVm = new ManagedUserVM(); managedUserVm.setId(updatedUser.getId()); @@ -411,7 +419,11 @@ void updateUserExistingEmail() throws Exception { managedUserVm.setEmail("jhipster@localhost"); managedUserVm.setActivated(updatedUser.getActivated()); managedUserVm.setLangKey(updatedUser.getLangKey()); - managedUserVm.setRoles(roles); + + RoleDTO role = new RoleDTO(); + role.setProjectId(project.getId()); + role.setAuthorityName(RoleAuthority.PARTICIPANT.authority()); + managedUserVm.setRoles(Set.of(role)); restUserMockMvc.perform(put("/api/users") .contentType(TestUtil.APPLICATION_JSON_UTF8) @@ -424,6 +436,8 @@ void updateUserExistingEmail() throws Exception { void updateUserExistingLogin() throws Exception { // Initialize the database userRepository.saveAndFlush(user); + var project = ProjectResourceIntTest.createEntity(); + projectRepository.save(project); User anotherUser = new User(); anotherUser.setLogin("jhipster"); @@ -436,12 +450,8 @@ void updateUserExistingLogin() throws Exception { userRepository.saveAndFlush(anotherUser); // Update the user - User updatedUser = userRepository.findById(user.getId()).get(); - - Set roles = new HashSet<>(); - RoleDTO role = new RoleDTO(); - role.setAuthorityName(AuthoritiesConstants.PARTICIPANT); - roles.add(role); + User updatedUser = userRepository.findById(user.getId()) + .orElseThrow(() -> new AssertionError("Cannot find user " + user.getId())); ManagedUserVM managedUserVm = new ManagedUserVM(); managedUserVm.setId(updatedUser.getId()); @@ -452,7 +462,11 @@ void updateUserExistingLogin() throws Exception { managedUserVm.setEmail(updatedUser.getEmail()); managedUserVm.setActivated(updatedUser.getActivated()); managedUserVm.setLangKey(updatedUser.getLangKey()); - managedUserVm.setRoles(roles); + + RoleDTO role = new RoleDTO(); + role.setProjectId(project.getId()); + role.setAuthorityName(RoleAuthority.PARTICIPANT.authority()); + managedUserVm.setRoles(Set.of(role)); restUserMockMvc.perform(put("/api/users") .contentType(TestUtil.APPLICATION_JSON_UTF8) @@ -479,7 +493,7 @@ void deleteUser() throws Exception { @Test @Transactional - void equalsVerifier() throws Exception { + void equalsVerifier() { User userA = new User(); userA.setLogin("AAA"); User userB = new User(); From a14ac1cf81f7089fa0b336b8e3c2a0184ada80c4 Mon Sep 17 00:00:00 2001 From: Peyman Mohtashami Date: Thu, 25 Nov 2021 11:10:48 +0100 Subject: [PATCH 224/431] Add delete to service --- .../webapp/app/shared/organization/organization.service.ts | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/main/webapp/app/shared/organization/organization.service.ts b/src/main/webapp/app/shared/organization/organization.service.ts index 17e7e4fc4..f14e3eaac 100644 --- a/src/main/webapp/app/shared/organization/organization.service.ts +++ b/src/main/webapp/app/shared/organization/organization.service.ts @@ -27,4 +27,8 @@ export class OrganizationService { findAll(): Observable { return this.http.get(this.resourceUrl); } + + delete(organizationName: string): Observable { + return; + } } From d931f970f3f33b9e09ad493740207d50505fd1b7 Mon Sep 17 00:00:00 2001 From: aykl Date: Thu, 25 Nov 2021 11:29:31 +0100 Subject: [PATCH 225/431] Queries modified to hide Deleted Sources --- .../repository/SourceRepository.java | 42 ++++++++++++++++--- 1 file changed, 36 insertions(+), 6 deletions(-) diff --git a/src/main/java/org/radarbase/management/repository/SourceRepository.java b/src/main/java/org/radarbase/management/repository/SourceRepository.java index a5ca8b140..67eeafb38 100644 --- a/src/main/java/org/radarbase/management/repository/SourceRepository.java +++ b/src/main/java/org/radarbase/management/repository/SourceRepository.java @@ -9,6 +9,7 @@ import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.RepositoryDefinition; import org.springframework.data.repository.history.RevisionRepository; import org.springframework.data.repository.query.Param; @@ -19,16 +20,45 @@ @RepositoryDefinition(domainClass = Source.class, idClass = Long.class) public interface SourceRepository extends JpaRepository, RevisionRepository { - @Where(clause = "deleted = false") + + @Query(value = "select source from Source source " + + "WHERE source.deleted = false", + countQuery = "select count(source) from Source source " + + "WHERE source.deleted = false") + Page findAll(Pageable pageable); + + @Query(value = "select source from Source source " + + "WHERE source.deleted = false " + + "AND source.project.id = :projectId", + countQuery = "select count(source) from Source source " + + "WHERE source.deleted = false " + + "AND source.project.id = :projectId") Page findAllSourcesByProjectId(Pageable pageable, @Param("projectId") Long projectId); - @Where(clause = "deleted = false") + @Query(value = "select source from Source source " + + "WHERE source.deleted = false " + + "AND source.project.id = :projectId " + + "AND source.assigned = :assigned", + countQuery = "select count(source) from Source source " + + "WHERE source.deleted = false " + + "AND source.project.id = :projectId " + + "AND source.assigned = :assigned") List findAllSourcesByProjectIdAndAssigned(@Param("projectId") Long projectId, @Param("assigned") Boolean assigned); - @Where(clause = "deleted = false") - Optional findOneBySourceId(UUID sourceId); + @Query(value = "select source from Source source " + + "WHERE source.deleted = false " + + "AND source.sourceId = :sourceId", + countQuery = "select count(source) from Source source " + + "WHERE source.deleted = false " + + "AND source.sourceId = :sourceId") + Optional findOneBySourceId(@Param("sourceId") UUID sourceId); - @Where(clause = "deleted = false") - Optional findOneBySourceName(String sourceName); + @Query(value = "select source from Source source " + + "WHERE source.deleted = false " + + "AND source.sourceName = :sourceName", + countQuery = "select count(source) from Source source " + + "WHERE source.deleted = false " + + "AND source.sourceName = :sourceName") + Optional findOneBySourceName(@Param("sourceName") String sourceName); } From d34e3f45dcbe9a560e6e95e239bee14fa2d6f627 Mon Sep 17 00:00:00 2001 From: Joris Borgdorff Date: Thu, 25 Nov 2021 11:31:39 +0100 Subject: [PATCH 226/431] Add organization to user filter --- .../repository/filters/UserFilter.java | 48 +++++++++++++++---- 1 file changed, 38 insertions(+), 10 deletions(-) diff --git a/src/main/java/org/radarbase/management/repository/filters/UserFilter.java b/src/main/java/org/radarbase/management/repository/filters/UserFilter.java index e9b50a374..abbbe00a0 100644 --- a/src/main/java/org/radarbase/management/repository/filters/UserFilter.java +++ b/src/main/java/org/radarbase/management/repository/filters/UserFilter.java @@ -1,5 +1,6 @@ package org.radarbase.management.repository.filters; +import org.radarbase.auth.authorization.RoleAuthority; import org.radarbase.management.domain.Authority; import org.radarbase.management.domain.Role; import org.radarbase.management.domain.User; @@ -12,30 +13,49 @@ import javax.persistence.criteria.Predicate; import javax.persistence.criteria.Root; -import static org.radarbase.auth.authorization.RoleAuthority.INACTIVE_PARTICIPANT; -import static org.radarbase.auth.authorization.RoleAuthority.PARTICIPANT; +import java.util.stream.Collectors; +import java.util.stream.Stream; public class UserFilter implements Specification { private String login; private String email; private String projectName; + private String organization; private String authority; @Override public Predicate toPredicate(Root root, @Nonnull CriteriaQuery query, @Nonnull CriteriaBuilder builder) { PredicateBuilder predicates = new PredicateBuilder(builder); - Join roleJoin = root.join("roles"); - Join authorityJoin = roleJoin.join("authority"); - predicates.add(builder.not(authorityJoin.get("name") - .in(PARTICIPANT.authority(), INACTIVE_PARTICIPANT.authority()))); - predicates.likeLower(root.get("login"), login); predicates.likeLower(root.get("email"), email); - predicates.likeLower(authorityJoin.get("name"), authority); - predicates.likeLower( - () -> roleJoin.join("project").get("projectName"), projectName); + RoleAuthority.Scope scope; + + Join roleJoin = root.join("roles"); + if (predicates.isValidValue(projectName)) { + scope = RoleAuthority.Scope.PROJECT; + predicates.likeLower( + () -> roleJoin.join("project").get("projectName"), projectName); + } else if (predicates.isValidValue(organization)) { + scope = RoleAuthority.Scope.ORGANIZATION; + predicates.likeLower( + () -> roleJoin.join("organization").get("name"), organization); + } else { + scope = null; + } + + Join authorityJoin = roleJoin.join("authority"); + if (predicates.isValidValue(authority)) { + predicates.equal(authorityJoin.get("name"), authority); + } else { + predicates.add(authorityJoin.get("name") + .in(Stream.of(RoleAuthority.values()) + .filter(scope == null + ? r -> !r.isPersonal() + : r -> r.scope() == scope && !r.isPersonal()) + .collect(Collectors.toList()))); + } query.distinct(true); return predicates.toAndPredicate(); @@ -65,6 +85,14 @@ public void setProjectName(String projectName) { this.projectName = projectName; } + public String getOrganization() { + return organization; + } + + public void setOrganization(String organization) { + this.organization = organization; + } + public String getAuthority() { return authority; } From 5547feeb0b5fe3e93ceca64e88ce4ef4a21d82e5 Mon Sep 17 00:00:00 2001 From: Joris Borgdorff Date: Thu, 25 Nov 2021 12:49:12 +0100 Subject: [PATCH 227/431] Small reordring --- .../auth/authorization/RoleAuthority.java | 4 ++ .../repository/filters/UserFilter.java | 40 +++++++++++-------- 2 files changed, 28 insertions(+), 16 deletions(-) diff --git a/radar-auth/src/main/java/org/radarbase/auth/authorization/RoleAuthority.java b/radar-auth/src/main/java/org/radarbase/auth/authorization/RoleAuthority.java index 571d822df..3bc458ec6 100644 --- a/radar-auth/src/main/java/org/radarbase/auth/authorization/RoleAuthority.java +++ b/radar-auth/src/main/java/org/radarbase/auth/authorization/RoleAuthority.java @@ -43,6 +43,7 @@ public boolean isPersonal() { * @param authority authority name * @return RoleAuthority * @throws IllegalArgumentException if no role authority exists with the given name. + * @throws NullPointerException if given authority is null. */ public static RoleAuthority valueOfAuthority(String authority) { String upperAuthority = authority.toUpperCase(Locale.ROOT); @@ -58,6 +59,9 @@ public static RoleAuthority valueOfAuthority(String authority) { * @return RoleAuthority or null if no role authority exists with the given name. */ public static RoleAuthority valueOfAuthorityOrNull(String authority) { + if (authority == null) { + return null; + } try { return valueOfAuthority(authority); } catch (IllegalArgumentException ex) { diff --git a/src/main/java/org/radarbase/management/repository/filters/UserFilter.java b/src/main/java/org/radarbase/management/repository/filters/UserFilter.java index abbbe00a0..5789f5303 100644 --- a/src/main/java/org/radarbase/management/repository/filters/UserFilter.java +++ b/src/main/java/org/radarbase/management/repository/filters/UserFilter.java @@ -30,35 +30,43 @@ public Predicate toPredicate(Root root, @Nonnull CriteriaQuery query, predicates.likeLower(root.get("login"), login); predicates.likeLower(root.get("email"), email); - RoleAuthority.Scope scope; + filterRoles(predicates, root.join("roles")); - Join roleJoin = root.join("roles"); - if (predicates.isValidValue(projectName)) { - scope = RoleAuthority.Scope.PROJECT; - predicates.likeLower( - () -> roleJoin.join("project").get("projectName"), projectName); - } else if (predicates.isValidValue(organization)) { - scope = RoleAuthority.Scope.ORGANIZATION; - predicates.likeLower( - () -> roleJoin.join("organization").get("name"), organization); - } else { - scope = null; - } + query.distinct(true); + return predicates.toAndPredicate(); + } + + private void filterRoles(PredicateBuilder predicates, Join roleJoin) { + RoleAuthority.Scope scope = determineScope(predicates, roleJoin); Join authorityJoin = roleJoin.join("authority"); if (predicates.isValidValue(authority)) { - predicates.equal(authorityJoin.get("name"), authority); + predicates.likeLower(authorityJoin.get("name"), authority); } else { predicates.add(authorityJoin.get("name") .in(Stream.of(RoleAuthority.values()) .filter(scope == null ? r -> !r.isPersonal() : r -> r.scope() == scope && !r.isPersonal()) + .map(RoleAuthority::authority) .collect(Collectors.toList()))); } + } - query.distinct(true); - return predicates.toAndPredicate(); + private RoleAuthority.Scope determineScope( + PredicateBuilder predicates, + Join roleJoin) { + if (predicates.isValidValue(projectName)) { + predicates.likeLower( + () -> roleJoin.join("project").get("projectName"), projectName); + return RoleAuthority.Scope.PROJECT; + } else if (predicates.isValidValue(organization)) { + predicates.likeLower( + () -> roleJoin.join("organization").get("name"), organization); + return RoleAuthority.Scope.ORGANIZATION; + } else { + return null; + } } public String getLogin() { From e759e70143ed3337abff216f144b121c8f02fc2b Mon Sep 17 00:00:00 2001 From: Joris Borgdorff Date: Thu, 25 Nov 2021 15:03:05 +0100 Subject: [PATCH 228/431] Read user organizations --- .../management/service/UserService.java | 42 +++++++++++++++++++ .../service/mapper/OrganizationMapper.java | 9 ++++ .../management/web/rest/UserResource.java | 16 +++++++ 3 files changed, 67 insertions(+) diff --git a/src/main/java/org/radarbase/management/service/UserService.java b/src/main/java/org/radarbase/management/service/UserService.java index 37f981c9f..998dfec3d 100644 --- a/src/main/java/org/radarbase/management/service/UserService.java +++ b/src/main/java/org/radarbase/management/service/UserService.java @@ -4,6 +4,7 @@ import org.radarbase.auth.config.Constants; import org.radarbase.management.config.ManagementPortalProperties; import org.radarbase.management.domain.Authority; +import org.radarbase.management.domain.Organization; import org.radarbase.management.domain.Project; import org.radarbase.management.domain.Role; import org.radarbase.management.domain.User; @@ -14,9 +15,11 @@ import org.radarbase.management.repository.UserRepository; import org.radarbase.management.repository.filters.UserFilter; import org.radarbase.management.security.SecurityUtils; +import org.radarbase.management.service.dto.OrganizationDTO; import org.radarbase.management.service.dto.ProjectDTO; import org.radarbase.management.service.dto.RoleDTO; import org.radarbase.management.service.dto.UserDTO; +import org.radarbase.management.service.mapper.OrganizationMapper; import org.radarbase.management.service.mapper.ProjectMapper; import org.radarbase.management.service.mapper.UserMapper; import org.radarbase.management.web.rest.errors.BadRequestException; @@ -91,6 +94,9 @@ public class UserService { @Autowired private AuthorityRepository authorityRepository; + @Autowired + private OrganizationMapper organizationMapper; + /** * Activate a user with the given activation key. * @param key the activation key @@ -440,6 +446,42 @@ public List getProjectsAssignedToUser(String login) { return projectMapper.projectsToProjectDTOs(projectsOfUser); } + /** + * Get the projects a given user has any role in. + * @param login the login of the user + * @return the list of projects + */ + @Transactional(readOnly = true) + public List getOrganizationsAssignedToUser(String login) { + User userByLogin = userRepository.findOneWithRolesByLogin(login) + .orElseThrow(() -> new NotFoundException("User with login " + login + " not found.", + USER, ERR_ENTITY_NOT_FOUND)); + + List organizationsOfUser; + + Set roles = userByLogin.getRoles(); + + if (roles.stream().anyMatch(r -> { + var role = r.getRole(); + return role.scope() == RoleAuthority.Scope.GLOBAL + && PROJECT_READ.isRoleAllowed(role); + })) { + organizationsOfUser = organizationRepository.findAll(); + } else { + organizationsOfUser = roles.stream() + .filter(r -> { + var role = r.getRole(); + return role.scope() == RoleAuthority.Scope.ORGANIZATION + && PROJECT_READ.isRoleAllowed(role); + }) + .map(Role::getOrganization) + .distinct() + .collect(Collectors.toList()); + } + + return organizationMapper.organizationsToOrganizationDTOs(organizationsOfUser); + } + /** * Get the current user. * @return the currently authenticated user, or null if no user is currently authenticated diff --git a/src/main/java/org/radarbase/management/service/mapper/OrganizationMapper.java b/src/main/java/org/radarbase/management/service/mapper/OrganizationMapper.java index d4b387c3a..05dfb04f3 100644 --- a/src/main/java/org/radarbase/management/service/mapper/OrganizationMapper.java +++ b/src/main/java/org/radarbase/management/service/mapper/OrganizationMapper.java @@ -1,15 +1,24 @@ package org.radarbase.management.service.mapper; +import org.mapstruct.IterableMapping; import org.mapstruct.Mapper; +import org.mapstruct.Named; import org.radarbase.management.domain.Organization; import org.radarbase.management.service.dto.OrganizationDTO; +import java.util.List; + /** * Mapper for the entity Organization and its DTO OrganizationDTO. */ @Mapper(componentModel = "spring") public interface OrganizationMapper { + @Named("organizationToOrganizationDTO") OrganizationDTO organizationToOrganizationDTO(Organization organization); Organization organizationDTOToOrganization(OrganizationDTO organizationDto); + + @IterableMapping(qualifiedByName = "organizationToOrganizationDTO") + List organizationsToOrganizationDTOs(List organizations); + } diff --git a/src/main/java/org/radarbase/management/web/rest/UserResource.java b/src/main/java/org/radarbase/management/web/rest/UserResource.java index b4354b898..921f01e89 100644 --- a/src/main/java/org/radarbase/management/web/rest/UserResource.java +++ b/src/main/java/org/radarbase/management/web/rest/UserResource.java @@ -13,6 +13,7 @@ import org.radarbase.management.service.MailService; import org.radarbase.management.service.ResourceUriService; import org.radarbase.management.service.UserService; +import org.radarbase.management.service.dto.OrganizationDTO; import org.radarbase.management.service.dto.ProjectDTO; import org.radarbase.management.service.dto.UserDTO; import org.radarbase.management.web.rest.errors.InvalidRequestException; @@ -42,6 +43,7 @@ import java.util.Locale; import java.util.Optional; +import static org.radarbase.auth.authorization.Permission.ORGANIZATION_READ; import static org.radarbase.auth.authorization.RoleAuthority.SYS_ADMIN; import static org.radarbase.auth.authorization.Permission.PROJECT_READ; import static org.radarbase.auth.authorization.Permission.USER_CREATE; @@ -257,6 +259,20 @@ public List getUserProjects(@PathVariable String login) return userService.getProjectsAssignedToUser(login); } + /** + * Returns all organizations if the user is s `SYS_ADMIN`. Otherwise projects that are assigned + * to a user using roles. + */ + @GetMapping("/users/{login:" + Constants.ENTITY_ID_REGEX + "}/organizations") + @Timed + public List getUserOrganizations(@PathVariable String login) + throws NotAuthorizedException { + log.debug("REST request to get User's project : {}", login); + checkPermission(token, USER_READ); + checkPermission(token, ORGANIZATION_READ); + return userService.getOrganizationsAssignedToUser(login); + } + /** * DELETE /users/:login : delete the "login" User. * From f4bd0d46c4d70ebfa107ae33400724e7a7066dae Mon Sep 17 00:00:00 2001 From: Peyman Mohtashami Date: Mon, 29 Nov 2021 11:00:51 +0100 Subject: [PATCH 229/431] Modify findOrganization by login --- src/main/webapp/app/shared/user/user.service.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/webapp/app/shared/user/user.service.ts b/src/main/webapp/app/shared/user/user.service.ts index c7cf62952..92b137edd 100644 --- a/src/main/webapp/app/shared/user/user.service.ts +++ b/src/main/webapp/app/shared/user/user.service.ts @@ -32,8 +32,8 @@ export class UserService { } findOrganization(login: string): Observable { - return of(ORGANIZATIONS); - // return this.http.get(`${this.resourceUrl}/${encodeURIComponent(login)}/organizations`); + // return of(ORGANIZATIONS); + return this.http.get(`${this.resourceUrl}/${encodeURIComponent(login)}/organizations`); } query(req?: any): Observable> { From 10cdab3de84a55ba86517803adbf54b65d96bec2 Mon Sep 17 00:00:00 2001 From: Peyman Mohtashami Date: Mon, 29 Nov 2021 13:09:39 +0100 Subject: [PATCH 230/431] Modigy navbar and home page to get organizations --- src/main/webapp/app/home/home.component.ts | 6 ++++-- src/main/webapp/app/layouts/navbar/navbar.component.ts | 4 +++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/main/webapp/app/home/home.component.ts b/src/main/webapp/app/home/home.component.ts index 53b7d4ad5..9d7e0a7a9 100644 --- a/src/main/webapp/app/home/home.component.ts +++ b/src/main/webapp/app/home/home.component.ts @@ -5,7 +5,7 @@ import { LoginModalService, Principal, Organization, - UserService + UserService, OrganizationService } from '../shared'; import { of, Subscription } from "rxjs"; import { EventManager } from "../shared/util/event-manager.service"; @@ -29,6 +29,7 @@ export class HomeComponent implements OnInit, OnDestroy { private loginModalService: LoginModalService, private eventManager: EventManager, private userService: UserService, + private organizationService: OrganizationService, ) { this.subscriptions = new Subscription(); } @@ -46,7 +47,8 @@ export class HomeComponent implements OnInit, OnDestroy { .pipe( switchMap(account => { if (account) { - return this.userService.findOrganization(account.login); + return this.organizationService.findAll(); + // return this.userService.findOrganization(account.login); } else { return of([]); } diff --git a/src/main/webapp/app/layouts/navbar/navbar.component.ts b/src/main/webapp/app/layouts/navbar/navbar.component.ts index ea3949ce6..de8cef14a 100644 --- a/src/main/webapp/app/layouts/navbar/navbar.component.ts +++ b/src/main/webapp/app/layouts/navbar/navbar.component.ts @@ -47,6 +47,7 @@ export class NavbarComponent implements OnInit, OnDestroy { private eventManager: EventManager, private translateService: TranslateService, private userService: UserService, + private organizationService: OrganizationService, ) { this.version = DEBUG_INFO_ENABLED ? 'v' + VERSION : ''; this.isNavbarCollapsed = true; @@ -74,7 +75,8 @@ export class NavbarComponent implements OnInit, OnDestroy { .pipe( switchMap(account => { if (account) { - return this.userService.findOrganization(account.login); + return this.organizationService.findAll(); + // return this.userService.findOrganization(account.login); } else { return of([]); } From 01f2a0be212d889f3506d9df9f07bf2afdc98252 Mon Sep 17 00:00:00 2001 From: Peyman Mohtashami Date: Mon, 29 Nov 2021 14:17:59 +0100 Subject: [PATCH 231/431] Fix organization service observables --- .../app/admin/user-management/role.model.ts | 2 + .../general.subject-dialog.component.html | 4 +- src/main/webapp/app/home/home.component.html | 18 +- src/main/webapp/app/home/home.component.ts | 4 +- .../app/layouts/navbar/navbar.component.html | 12 +- .../organization/organization.service.ts | 174 +++++++++++++++++- .../shared/permission/permission.component.ts | 2 +- 7 files changed, 177 insertions(+), 39 deletions(-) diff --git a/src/main/webapp/app/admin/user-management/role.model.ts b/src/main/webapp/app/admin/user-management/role.model.ts index 00624fb54..92a1da357 100644 --- a/src/main/webapp/app/admin/user-management/role.model.ts +++ b/src/main/webapp/app/admin/user-management/role.model.ts @@ -3,4 +3,6 @@ export interface Role { authorityName?: string; projectId?: number; projectName?: string; + organizationId?: number; + organizationName?: string; } diff --git a/src/main/webapp/app/entities/subject/general.subject-dialog.component.html b/src/main/webapp/app/entities/subject/general.subject-dialog.component.html index 8b0b4c1fd..fe1552fa7 100644 --- a/src/main/webapp/app/entities/subject/general.subject-dialog.component.html +++ b/src/main/webapp/app/entities/subject/general.subject-dialog.component.html @@ -60,8 +60,8 @@ [(ngModel)]="subject.group" > -
    diff --git a/src/main/webapp/app/home/home.component.html b/src/main/webapp/app/home/home.component.html index 1db5e540c..e4b10f768 100644 --- a/src/main/webapp/app/home/home.component.html +++ b/src/main/webapp/app/home/home.component.html @@ -14,22 +14,6 @@

    -
    -
    -
    {{project.projectName}}
    -
    {{project.organization}} : {{project.location}}
    -

    {{project.description}} -

    -
    - -
    -
    {{organization.name}}
    @@ -48,7 +32,7 @@
    {{organization.location}}
    - +
    diff --git a/src/main/webapp/app/home/home.component.ts b/src/main/webapp/app/home/home.component.ts index 9887a9744..2d1fedc65 100644 --- a/src/main/webapp/app/home/home.component.ts +++ b/src/main/webapp/app/home/home.component.ts @@ -5,7 +5,7 @@ import { LoginModalService, ProjectService, Principal, - Project, + Project, OrganizationService, } from '../shared'; import { of, Subscription } from "rxjs"; import { EventManager } from "../shared/util/event-manager.service"; @@ -29,6 +29,8 @@ export class HomeComponent { public principal: Principal, private loginModalService: LoginModalService, public projectService: ProjectService, + public organizationService: OrganizationService, + // private eventManager: EventManager, // private userService: UserService, ) { diff --git a/src/main/webapp/app/layouts/navbar/navbar.component.html b/src/main/webapp/app/layouts/navbar/navbar.component.html index b1ea52cb6..20053286d 100644 --- a/src/main/webapp/app/layouts/navbar/navbar.component.html +++ b/src/main/webapp/app/layouts/navbar/navbar.component.html @@ -57,16 +57,10 @@ - +
      -
    • - - - {{project.projectName}} - -
    • @@ -91,9 +85,9 @@
    • - + - +
    • diff --git a/src/main/webapp/app/shared/organization/organization.service.ts b/src/main/webapp/app/shared/organization/organization.service.ts index f14e3eaac..6d81fb04c 100644 --- a/src/main/webapp/app/shared/organization/organization.service.ts +++ b/src/main/webapp/app/shared/organization/organization.service.ts @@ -1,34 +1,190 @@ import { Injectable } from '@angular/core'; -import { HttpClient } from '@angular/common/http'; -import { Observable } from 'rxjs'; +import {HttpClient, HttpResponse} from '@angular/common/http'; +import {BehaviorSubject, combineLatest, Observable, of, Subject, throwError} from 'rxjs'; import { Organization } from './organization.model'; +import {Project} from "../project"; +import {Principal} from "../auth/principal.service"; +import {AlertService} from "../util/alert.service"; +import {concatMap, delay, map, pluck, retryWhen, startWith, switchMap, take, tap} from "rxjs/operators"; +import {createRequestOption} from "../model/request.utils"; +import {SourceType} from "../../entities/source-type"; +import {convertDateTimeFromServer, toDate} from "../util/date-util"; @Injectable({ providedIn: 'root' }) export class OrganizationService { + private readonly _organizations$ = new BehaviorSubject([]); + private readonly _trigger$ = new Subject(); + + organizations$: Observable = this._organizations$.asObservable(); private resourceUrl = 'api/organizations'; - constructor(private http: HttpClient) { + constructor( + private http: HttpClient, + private principal: Principal, + private alertService: AlertService + ) { + combineLatest([ + principal.account$, + this._trigger$.pipe(startWith(undefined as void)), + ]).pipe( + switchMap(([account]) => { + if (account) { + return this.fetch().pipe( + retryWhen(errors => errors.pipe( + delay(1000), + take(10), + concatMap(err => throwError(err))) + ), + ); + } else { + return of([]); + } + }) + ).subscribe( + organizations => this._organizations$.next(organizations), + err => this.alertService.error(err.message, null, null), + ); + } + + reset() { + this._trigger$.next(); } create(organization: Organization): Observable { - return this.http.post(this.resourceUrl, organization); + return this.http.post(this.organizationUrl(), this.convertOrganizationToServer(organization)).pipe( + map(p => this.convertOrganizationFromServer(p)), + tap( + p => this.updateOrganization(p), + () => this.reset(), + ), + ) } + // create(organization: Organization): Observable { + // return this.http.post(this.resourceUrl, organization); + // } + update(organization: Organization): Observable { - return this.http.put(this.resourceUrl, organization); + return this.http.put(this.organizationUrl(), this.convertOrganizationToServer(organization)).pipe( + map(p => this.convertOrganizationFromServer(p)), + tap( + p => this.updateOrganization(p), + () => this.reset(), + ), + ) } + // update(organization: Organization): Observable { + // return this.http.put(this.resourceUrl, organization); + // } + find(orgName: string): Observable { - return this.http.get(`${this.resourceUrl}/${encodeURIComponent(orgName)}`); + return this.organizations$.pipe( + switchMap(organizations => { + const existingOrganization = organizations.find(p => p.name === orgName); + if (existingOrganization) { + return of(existingOrganization); + } else { + return this.fetchOrganization(orgName); + } + }) + ); + } + + fetchOrganization(orgName: string): Observable { + return this.http.get(this.organizationUrl(orgName)).pipe( + map(p => this.convertOrganizationFromServer(p)), + tap(p => this.updateOrganization(p)), + ); } + fetch(): Observable { + return this.query().pipe( + map(res => res.body.map(p => this.convertOrganizationFromServer(p))), + ); + } + + query(req?: any): Observable> { + const options = createRequestOption(req); + return this.http.get(this.organizationUrl(), {params: options, observe: 'response'}); + } + + // find(orgName: string): Observable { + // return this.http.get(`${this.resourceUrl}/${encodeURIComponent(orgName)}`); + // } + + // findSourceTypesByName(projectName: string): Observable { + // return this.find(projectName).pipe( + // pluck('sourceTypes'), + // switchMap(sourceTypes => { + // if (sourceTypes) { + // return of(sourceTypes); + // } else { + // return this.http.get(this.projectUrl(projectName) + '/source-types'); + // } + // }) + // ); + // } + + delete(orgName: string): Observable { + return this.http.delete(this.organizationUrl(orgName)).pipe( + tap( + () => { + const newOrganizations = this._organizations$.value.slice() + const idx = newOrganizations.findIndex(p => p.name === orgName); + if (idx >= 0) { + newOrganizations.splice(idx, 1); + this._organizations$.next(newOrganizations); + } + }, + () => this.reset(), + ), + ); + } + + private updateOrganization(organization: Organization) { + const nextValue = this._organizations$.value.slice(); + const idx = nextValue.findIndex(p => p.name === organization.name); + if (idx >= 0) { + nextValue[idx] = organization; + } else { + nextValue.push(organization); + } + this._organizations$.next(nextValue); + } + + private convertOrganizationToServer(organization: Organization): any { + return { + ...organization, + // startDate: toDate(organization.startDate), + // endDate: toDate(organization.endDate), + }; + } + + private convertOrganizationFromServer(organizationFromServer: any): Organization { + return { + ...organizationFromServer, + // startDate: convertDateTimeFromServer(organizationFromServer.startDate), + // endDate: convertDateTimeFromServer(organizationFromServer.endDate), + }; + } + + private organizationUrl(orgName?: string): string { + if (orgName) { + return 'api/organizations/' + encodeURIComponent(orgName); + } else { + return 'api/organizations'; + } + } + + findAll(): Observable { return this.http.get(this.resourceUrl); } - delete(organizationName: string): Observable { - return; - } + // delete(organizationName: string): Observable { + // return; + // } } diff --git a/src/main/webapp/app/shared/permission/permission.component.ts b/src/main/webapp/app/shared/permission/permission.component.ts index ede5755f8..f98b9ce64 100644 --- a/src/main/webapp/app/shared/permission/permission.component.ts +++ b/src/main/webapp/app/shared/permission/permission.component.ts @@ -161,7 +161,7 @@ export class PermissionComponent implements OnInit, OnDestroy, OnChanges { console.log(this.filteredUsers) const user = this.filteredUsers[0]; if(this.userSearchTerm.includes(user.login)){ - const newRole = new Role(); + const newRole: Role = {}; //new Role(); if (this.project) { newRole.authorityName = 'ROLE_PROJECT_ADMIN'; newRole.projectId = 1; //this.organization.id; From c1110fb28d923de335a28ef43f22f8b48b08e459 Mon Sep 17 00:00:00 2001 From: Joris Borgdorff Date: Mon, 29 Nov 2021 14:28:22 +0100 Subject: [PATCH 232/431] Fix proper organization and project fetching --- .../repository/OrganizationRepository.java | 5 ++ .../repository/ProjectRepository.java | 12 +++ .../service/OrganizationService.java | 43 +++++++++- .../management/service/ProjectService.java | 31 ++++++- .../management/service/UserService.java | 84 +------------------ 5 files changed, 90 insertions(+), 85 deletions(-) diff --git a/src/main/java/org/radarbase/management/repository/OrganizationRepository.java b/src/main/java/org/radarbase/management/repository/OrganizationRepository.java index 3e05c0daf..cc5751c60 100644 --- a/src/main/java/org/radarbase/management/repository/OrganizationRepository.java +++ b/src/main/java/org/radarbase/management/repository/OrganizationRepository.java @@ -1,5 +1,6 @@ package org.radarbase.management.repository; +import java.util.List; import java.util.Optional; import org.radarbase.management.domain.Organization; @@ -19,4 +20,8 @@ public interface OrganizationRepository extends JpaRepository findOneByName(@Param("name") String name); + + @Query("select distinct org from Organization org" + + "where org.project.projectName in (:projectNames)") + List findAllByProjectNames(@Param("projectNames") List projectNames); } diff --git a/src/main/java/org/radarbase/management/repository/ProjectRepository.java b/src/main/java/org/radarbase/management/repository/ProjectRepository.java index 554460302..78818b12c 100644 --- a/src/main/java/org/radarbase/management/repository/ProjectRepository.java +++ b/src/main/java/org/radarbase/management/repository/ProjectRepository.java @@ -26,6 +26,18 @@ public interface ProjectRepository extends JpaRepository, countQuery = "select distinct count(project) from Project project") Page findAllWithEagerRelationships(Pageable pageable); + @Query(value = "select distinct project from Project project " + + "left join fetch project.sourceTypes " + + "WHERE project.projectName in (:projectNames) " + + "OR project.organization in (:organizationNames)", + countQuery = "select distinct count(project) from Project project " + + "WHERE project.projectName in (:projectNames) " + + "OR project.organization in (:organizationNames)") + Page findAllWithEagerRelationshipsInOrganizationsOrProjects( + Pageable pageable, + @Param("organizationNames") List organizationNames, + @Param("projectNames") List projectNames); + @Query("select project from Project project " + "left join fetch project.sourceTypes s " + "left join fetch project.groups " diff --git a/src/main/java/org/radarbase/management/service/OrganizationService.java b/src/main/java/org/radarbase/management/service/OrganizationService.java index 6aa127ad3..04b3513c6 100644 --- a/src/main/java/org/radarbase/management/service/OrganizationService.java +++ b/src/main/java/org/radarbase/management/service/OrganizationService.java @@ -1,8 +1,14 @@ package org.radarbase.management.service; +import org.radarbase.auth.authorization.RoleAuthority; +import org.radarbase.auth.token.RadarToken; +import org.radarbase.management.domain.Organization; +import org.radarbase.management.domain.Role; +import org.radarbase.management.domain.User; import org.radarbase.management.repository.OrganizationRepository; import org.radarbase.management.service.dto.OrganizationDTO; import org.radarbase.management.service.mapper.OrganizationMapper; +import org.radarbase.management.web.rest.errors.NotFoundException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -10,8 +16,16 @@ import org.springframework.transaction.annotation.Transactional; import java.util.List; +import java.util.Map; +import java.util.Objects; import java.util.Optional; +import java.util.Set; import java.util.stream.Collectors; +import java.util.stream.Stream; + +import static org.radarbase.auth.authorization.Permission.ORGANIZATION_READ; +import static org.radarbase.management.web.rest.errors.EntityName.USER; +import static org.radarbase.management.web.rest.errors.ErrorConstants.ERR_ENTITY_NOT_FOUND; /** * Service Implementation for managing Organization. @@ -28,6 +42,9 @@ public class OrganizationService { @Autowired private OrganizationMapper organizationMapper; + @Autowired + private RadarToken token; + /** * Save an organization. * @@ -48,7 +65,31 @@ public OrganizationDTO save(OrganizationDTO organizationDto) { */ @Transactional(readOnly = true) public List findAll() { - return organizationRepository.findAll().stream() + Stream organizationsOfUser; + + if (token.getGlobalRoles().stream().anyMatch(ORGANIZATION_READ::isRoleAllowed)) { + organizationsOfUser = organizationRepository.findAll().stream(); + } else { + List projectNames = token.getProjectRoles().entrySet().stream() + .filter(e -> e.getValue().stream().anyMatch(ORGANIZATION_READ::isRoleAllowed)) + .map(Map.Entry::getKey) + .collect(Collectors.toList()); + + List organizationsOfProject = organizationRepository + .findAllByProjectNames(projectNames); + + Stream organizationsOfRole = token.getOrganizationRoles().entrySet() + .stream() + .filter(e -> e.getValue().stream().anyMatch(ORGANIZATION_READ::isRoleAllowed)) + .map(Map.Entry::getKey) + .map(name -> organizationRepository.findOneByName(name).orElse(null)) + .filter(Objects::nonNull); + + organizationsOfUser = Stream.concat( + organizationsOfRole, organizationsOfProject.stream()).distinct(); + } + + return organizationsOfUser .map(organizationMapper::organizationToOrganizationDTO) .collect(Collectors.toList()); } diff --git a/src/main/java/org/radarbase/management/service/ProjectService.java b/src/main/java/org/radarbase/management/service/ProjectService.java index 138e7f3d4..52e295554 100644 --- a/src/main/java/org/radarbase/management/service/ProjectService.java +++ b/src/main/java/org/radarbase/management/service/ProjectService.java @@ -1,8 +1,11 @@ package org.radarbase.management.service; +import static org.radarbase.auth.authorization.Permission.PROJECT_READ; import static org.radarbase.management.web.rest.errors.EntityName.PROJECT; +import org.radarbase.auth.authorization.RoleAuthority; +import org.radarbase.auth.token.RadarToken; import org.radarbase.management.domain.Project; import org.radarbase.management.domain.SourceType; import org.radarbase.management.repository.ProjectRepository; @@ -22,6 +25,9 @@ import java.util.Collections; import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; +import java.util.stream.Stream; /** * Service Implementation for managing Project. @@ -41,6 +47,9 @@ public class ProjectService { @Autowired private SourceTypeMapper sourceTypeMapper; + @Autowired + private RadarToken token; + /** * Save a project. @@ -62,7 +71,27 @@ public ProjectDTO save(ProjectDTO projectDto) { */ @Transactional(readOnly = true) public Page findAll(Boolean fetchMinimal, Pageable pageable) { - Page projects = projectRepository.findAllWithEagerRelationships(pageable); + Page projects; + + if (token.getGlobalRoles().stream().anyMatch(PROJECT_READ::isRoleAllowed)) { + projects = projectRepository.findAllWithEagerRelationships(pageable); + } else { + List projectNames = token.getProjectRoles().entrySet().stream() + .filter(e -> e.getValue().stream() + .anyMatch(PROJECT_READ::isRoleAllowed)) + .map(Map.Entry::getKey) + .collect(Collectors.toList()); + + List organizationNames = token.getOrganizationRoles().entrySet().stream() + .filter(e -> e.getValue().stream() + .anyMatch(PROJECT_READ::isRoleAllowed)) + .map(Map.Entry::getKey) + .collect(Collectors.toList()); + + projects = projectRepository.findAllWithEagerRelationshipsInOrganizationsOrProjects( + pageable, organizationNames, projectNames); + } + if (!fetchMinimal) { return projects.map(projectMapper::projectToProjectDTOReduced); } else { diff --git a/src/main/java/org/radarbase/management/service/UserService.java b/src/main/java/org/radarbase/management/service/UserService.java index 998dfec3d..4dda9cb52 100644 --- a/src/main/java/org/radarbase/management/service/UserService.java +++ b/src/main/java/org/radarbase/management/service/UserService.java @@ -48,6 +48,7 @@ import java.util.stream.Collectors; import java.util.stream.Stream; +import static org.radarbase.auth.authorization.Permission.ORGANIZATION_READ; import static org.radarbase.auth.authorization.RoleAuthority.INACTIVE_PARTICIPANT; import static org.radarbase.auth.authorization.RoleAuthority.PARTICIPANT; import static org.radarbase.auth.authorization.Permission.PROJECT_READ; @@ -399,89 +400,6 @@ public Optional getUserWithAuthoritiesByLogin(String login) { return userRepository.findOneWithRolesByLogin(login).map(userMapper::userToUserDTO); } - /** - * Get the projects a given user has any role in. - * @param login the login of the user - * @return the list of projects - */ - @Transactional(readOnly = true) - public List getProjectsAssignedToUser(String login) { - User userByLogin = userRepository.findOneWithRolesByLogin(login) - .orElseThrow(() -> new NotFoundException("User with login " + login + " not found.", - USER, ERR_ENTITY_NOT_FOUND)); - - List projectsOfUser; - - Set roles = userByLogin.getRoles(); - - if (roles.stream().anyMatch(r -> { - var role = r.getRole(); - return role.scope() == RoleAuthority.Scope.GLOBAL - && PROJECT_READ.isRoleAllowed(role); - })) { - projectsOfUser = projectRepository.findAll(); - } else { - var orgProjects = roles.stream() - .filter(r -> { - var role = r.getRole(); - return role.scope() == RoleAuthority.Scope.ORGANIZATION - && PROJECT_READ.isRoleAllowed(role); - }) - .map(Role::getOrganization) - .flatMap(org -> projectRepository.findAllByOrganization(org).stream()); - - var projects = roles.stream() - .filter(r -> { - var role = r.getRole(); - return role.scope() == RoleAuthority.Scope.PROJECT - && PROJECT_READ.isRoleAllowed(role); - }) - .map(Role::getProject); - - projectsOfUser = Stream.concat(orgProjects, projects) - .distinct() - .collect(Collectors.toList()); - } - - return projectMapper.projectsToProjectDTOs(projectsOfUser); - } - - /** - * Get the projects a given user has any role in. - * @param login the login of the user - * @return the list of projects - */ - @Transactional(readOnly = true) - public List getOrganizationsAssignedToUser(String login) { - User userByLogin = userRepository.findOneWithRolesByLogin(login) - .orElseThrow(() -> new NotFoundException("User with login " + login + " not found.", - USER, ERR_ENTITY_NOT_FOUND)); - - List organizationsOfUser; - - Set roles = userByLogin.getRoles(); - - if (roles.stream().anyMatch(r -> { - var role = r.getRole(); - return role.scope() == RoleAuthority.Scope.GLOBAL - && PROJECT_READ.isRoleAllowed(role); - })) { - organizationsOfUser = organizationRepository.findAll(); - } else { - organizationsOfUser = roles.stream() - .filter(r -> { - var role = r.getRole(); - return role.scope() == RoleAuthority.Scope.ORGANIZATION - && PROJECT_READ.isRoleAllowed(role); - }) - .map(Role::getOrganization) - .distinct() - .collect(Collectors.toList()); - } - - return organizationMapper.organizationsToOrganizationDTOs(organizationsOfUser); - } - /** * Get the current user. * @return the currently authenticated user, or null if no user is currently authenticated From e7f4020e9a33ae7dbf1a5a2b7f10f9a619600ac5 Mon Sep 17 00:00:00 2001 From: aykl Date: Mon, 29 Nov 2021 14:43:29 +0100 Subject: [PATCH 233/431] Gradle Check fix fow Source Repository --- .../org/radarbase/management/repository/SourceRepository.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/radarbase/management/repository/SourceRepository.java b/src/main/java/org/radarbase/management/repository/SourceRepository.java index 67eeafb38..f1327649e 100644 --- a/src/main/java/org/radarbase/management/repository/SourceRepository.java +++ b/src/main/java/org/radarbase/management/repository/SourceRepository.java @@ -4,7 +4,6 @@ import java.util.Optional; import java.util.UUID; -import org.hibernate.annotations.Where; import org.radarbase.management.domain.Source; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; @@ -21,6 +20,7 @@ public interface SourceRepository extends JpaRepository, RevisionRepository { + @Override @Query(value = "select source from Source source " + "WHERE source.deleted = false", countQuery = "select count(source) from Source source " From aac9ba9c15b16e943e7a4c4eb3a66526faf80b7d Mon Sep 17 00:00:00 2001 From: Joris Borgdorff Date: Mon, 29 Nov 2021 14:56:46 +0100 Subject: [PATCH 234/431] Simplify role retrieval --- .../org/radarbase/auth/token/RadarToken.java | 15 ++++++++ .../service/OrganizationService.java | 20 +++-------- .../management/service/ProjectService.java | 23 +++++-------- .../management/service/UserService.java | 16 --------- .../management/web/rest/UserResource.java | 34 +------------------ 5 files changed, 29 insertions(+), 79 deletions(-) diff --git a/radar-auth/src/main/java/org/radarbase/auth/token/RadarToken.java b/radar-auth/src/main/java/org/radarbase/auth/token/RadarToken.java index a03582067..7e87dddf3 100644 --- a/radar-auth/src/main/java/org/radarbase/auth/token/RadarToken.java +++ b/radar-auth/src/main/java/org/radarbase/auth/token/RadarToken.java @@ -66,6 +66,21 @@ default Map> getOrganizationRoles() { .collect(groupingByReferent()); } + /** + * Get the referents in a given scope that matches a permission. + * @param scope scope of the referents + * @param permission permission that should be available from + * @return referents names. + */ + default Stream getReferentsWithPermission(RoleAuthority.Scope scope, + Permission permission) { + return getRoles().stream() + .filter(r -> r.getRole().scope() == scope + && permission.isRoleAllowed(r.getRole())) + .map(AuthorityReference::getReferent) + .filter(Objects::nonNull); + } + /** * Get a list of non-project related authorities. * @return non-null list of authority names diff --git a/src/main/java/org/radarbase/management/service/OrganizationService.java b/src/main/java/org/radarbase/management/service/OrganizationService.java index 04b3513c6..54a1f60c4 100644 --- a/src/main/java/org/radarbase/management/service/OrganizationService.java +++ b/src/main/java/org/radarbase/management/service/OrganizationService.java @@ -3,12 +3,9 @@ import org.radarbase.auth.authorization.RoleAuthority; import org.radarbase.auth.token.RadarToken; import org.radarbase.management.domain.Organization; -import org.radarbase.management.domain.Role; -import org.radarbase.management.domain.User; import org.radarbase.management.repository.OrganizationRepository; import org.radarbase.management.service.dto.OrganizationDTO; import org.radarbase.management.service.mapper.OrganizationMapper; -import org.radarbase.management.web.rest.errors.NotFoundException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -16,16 +13,12 @@ import org.springframework.transaction.annotation.Transactional; import java.util.List; -import java.util.Map; import java.util.Objects; import java.util.Optional; -import java.util.Set; import java.util.stream.Collectors; import java.util.stream.Stream; import static org.radarbase.auth.authorization.Permission.ORGANIZATION_READ; -import static org.radarbase.management.web.rest.errors.EntityName.USER; -import static org.radarbase.management.web.rest.errors.ErrorConstants.ERR_ENTITY_NOT_FOUND; /** * Service Implementation for managing Organization. @@ -70,19 +63,16 @@ public List findAll() { if (token.getGlobalRoles().stream().anyMatch(ORGANIZATION_READ::isRoleAllowed)) { organizationsOfUser = organizationRepository.findAll().stream(); } else { - List projectNames = token.getProjectRoles().entrySet().stream() - .filter(e -> e.getValue().stream().anyMatch(ORGANIZATION_READ::isRoleAllowed)) - .map(Map.Entry::getKey) + List projectNames = token.getReferentsWithPermission( + RoleAuthority.Scope.PROJECT, ORGANIZATION_READ) .collect(Collectors.toList()); List organizationsOfProject = organizationRepository .findAllByProjectNames(projectNames); - Stream organizationsOfRole = token.getOrganizationRoles().entrySet() - .stream() - .filter(e -> e.getValue().stream().anyMatch(ORGANIZATION_READ::isRoleAllowed)) - .map(Map.Entry::getKey) - .map(name -> organizationRepository.findOneByName(name).orElse(null)) + Stream organizationsOfRole = token.getReferentsWithPermission( + RoleAuthority.Scope.ORGANIZATION, ORGANIZATION_READ) + .flatMap(name -> organizationRepository.findOneByName(name).stream()) .filter(Objects::nonNull); organizationsOfUser = Stream.concat( diff --git a/src/main/java/org/radarbase/management/service/ProjectService.java b/src/main/java/org/radarbase/management/service/ProjectService.java index 52e295554..0fd94ea7b 100644 --- a/src/main/java/org/radarbase/management/service/ProjectService.java +++ b/src/main/java/org/radarbase/management/service/ProjectService.java @@ -1,9 +1,5 @@ package org.radarbase.management.service; - -import static org.radarbase.auth.authorization.Permission.PROJECT_READ; -import static org.radarbase.management.web.rest.errors.EntityName.PROJECT; - import org.radarbase.auth.authorization.RoleAuthority; import org.radarbase.auth.token.RadarToken; import org.radarbase.management.domain.Project; @@ -13,8 +9,8 @@ import org.radarbase.management.service.dto.SourceTypeDTO; import org.radarbase.management.service.mapper.ProjectMapper; import org.radarbase.management.service.mapper.SourceTypeMapper; -import org.radarbase.management.web.rest.errors.NotFoundException; import org.radarbase.management.web.rest.errors.ErrorConstants; +import org.radarbase.management.web.rest.errors.NotFoundException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -25,9 +21,10 @@ import java.util.Collections; import java.util.List; -import java.util.Map; import java.util.stream.Collectors; -import java.util.stream.Stream; + +import static org.radarbase.auth.authorization.Permission.PROJECT_READ; +import static org.radarbase.management.web.rest.errors.EntityName.PROJECT; /** * Service Implementation for managing Project. @@ -76,16 +73,12 @@ public Page findAll(Boolean fetchMinimal, Pageable pageable) { if (token.getGlobalRoles().stream().anyMatch(PROJECT_READ::isRoleAllowed)) { projects = projectRepository.findAllWithEagerRelationships(pageable); } else { - List projectNames = token.getProjectRoles().entrySet().stream() - .filter(e -> e.getValue().stream() - .anyMatch(PROJECT_READ::isRoleAllowed)) - .map(Map.Entry::getKey) + List projectNames = token.getReferentsWithPermission( + RoleAuthority.Scope.PROJECT, PROJECT_READ) .collect(Collectors.toList()); - List organizationNames = token.getOrganizationRoles().entrySet().stream() - .filter(e -> e.getValue().stream() - .anyMatch(PROJECT_READ::isRoleAllowed)) - .map(Map.Entry::getKey) + List organizationNames = token.getReferentsWithPermission( + RoleAuthority.Scope.ORGANIZATION, PROJECT_READ) .collect(Collectors.toList()); projects = projectRepository.findAllWithEagerRelationshipsInOrganizationsOrProjects( diff --git a/src/main/java/org/radarbase/management/service/UserService.java b/src/main/java/org/radarbase/management/service/UserService.java index 4dda9cb52..129f305df 100644 --- a/src/main/java/org/radarbase/management/service/UserService.java +++ b/src/main/java/org/radarbase/management/service/UserService.java @@ -4,8 +4,6 @@ import org.radarbase.auth.config.Constants; import org.radarbase.management.config.ManagementPortalProperties; import org.radarbase.management.domain.Authority; -import org.radarbase.management.domain.Organization; -import org.radarbase.management.domain.Project; import org.radarbase.management.domain.Role; import org.radarbase.management.domain.User; import org.radarbase.management.repository.AuthorityRepository; @@ -15,12 +13,8 @@ import org.radarbase.management.repository.UserRepository; import org.radarbase.management.repository.filters.UserFilter; import org.radarbase.management.security.SecurityUtils; -import org.radarbase.management.service.dto.OrganizationDTO; -import org.radarbase.management.service.dto.ProjectDTO; import org.radarbase.management.service.dto.RoleDTO; import org.radarbase.management.service.dto.UserDTO; -import org.radarbase.management.service.mapper.OrganizationMapper; -import org.radarbase.management.service.mapper.ProjectMapper; import org.radarbase.management.service.mapper.UserMapper; import org.radarbase.management.web.rest.errors.BadRequestException; import org.radarbase.management.web.rest.errors.ConflictException; @@ -45,13 +39,9 @@ import java.util.Map; import java.util.Optional; import java.util.Set; -import java.util.stream.Collectors; -import java.util.stream.Stream; -import static org.radarbase.auth.authorization.Permission.ORGANIZATION_READ; import static org.radarbase.auth.authorization.RoleAuthority.INACTIVE_PARTICIPANT; import static org.radarbase.auth.authorization.RoleAuthority.PARTICIPANT; -import static org.radarbase.auth.authorization.Permission.PROJECT_READ; import static org.radarbase.management.web.rest.errors.EntityName.USER; import static org.radarbase.management.web.rest.errors.ErrorConstants.ERR_EMAIL_EXISTS; import static org.radarbase.management.web.rest.errors.ErrorConstants.ERR_ENTITY_NOT_FOUND; @@ -80,9 +70,6 @@ public class UserService { @Autowired private RoleRepository roleRepository; - @Autowired - private ProjectMapper projectMapper; - @Autowired private UserMapper userMapper; @@ -95,9 +82,6 @@ public class UserService { @Autowired private AuthorityRepository authorityRepository; - @Autowired - private OrganizationMapper organizationMapper; - /** * Activate a user with the given activation key. * @param key the activation key diff --git a/src/main/java/org/radarbase/management/web/rest/UserResource.java b/src/main/java/org/radarbase/management/web/rest/UserResource.java index 921f01e89..26bbab9e6 100644 --- a/src/main/java/org/radarbase/management/web/rest/UserResource.java +++ b/src/main/java/org/radarbase/management/web/rest/UserResource.java @@ -13,8 +13,6 @@ import org.radarbase.management.service.MailService; import org.radarbase.management.service.ResourceUriService; import org.radarbase.management.service.UserService; -import org.radarbase.management.service.dto.OrganizationDTO; -import org.radarbase.management.service.dto.ProjectDTO; import org.radarbase.management.service.dto.UserDTO; import org.radarbase.management.web.rest.errors.InvalidRequestException; import org.radarbase.management.web.rest.util.HeaderUtil; @@ -43,15 +41,13 @@ import java.util.Locale; import java.util.Optional; -import static org.radarbase.auth.authorization.Permission.ORGANIZATION_READ; -import static org.radarbase.auth.authorization.RoleAuthority.SYS_ADMIN; -import static org.radarbase.auth.authorization.Permission.PROJECT_READ; import static org.radarbase.auth.authorization.Permission.USER_CREATE; import static org.radarbase.auth.authorization.Permission.USER_DELETE; import static org.radarbase.auth.authorization.Permission.USER_READ; import static org.radarbase.auth.authorization.Permission.USER_UPDATE; import static org.radarbase.auth.authorization.RadarAuthorization.checkAuthorityAndPermission; import static org.radarbase.auth.authorization.RadarAuthorization.checkPermission; +import static org.radarbase.auth.authorization.RoleAuthority.SYS_ADMIN; import static org.radarbase.management.web.rest.errors.EntityName.USER; /** @@ -245,34 +241,6 @@ public ResponseEntity getUser(@PathVariable String login) userService.getUserWithAuthoritiesByLogin(login)); } - /** - * Returns all project if the user is s `SYS_ADMIN`. Otherwise projects that are assigned to a - * user using roles. - */ - @GetMapping("/users/{login:" + Constants.ENTITY_ID_REGEX + "}/projects") - @Timed - public List getUserProjects(@PathVariable String login) - throws NotAuthorizedException { - log.debug("REST request to get User's project : {}", login); - checkPermission(token, USER_READ); - checkPermission(token, PROJECT_READ); - return userService.getProjectsAssignedToUser(login); - } - - /** - * Returns all organizations if the user is s `SYS_ADMIN`. Otherwise projects that are assigned - * to a user using roles. - */ - @GetMapping("/users/{login:" + Constants.ENTITY_ID_REGEX + "}/organizations") - @Timed - public List getUserOrganizations(@PathVariable String login) - throws NotAuthorizedException { - log.debug("REST request to get User's project : {}", login); - checkPermission(token, USER_READ); - checkPermission(token, ORGANIZATION_READ); - return userService.getOrganizationsAssignedToUser(login); - } - /** * DELETE /users/:login : delete the "login" User. * From 1bb55d39b304da00ec7d47b24bfdae6197143ac0 Mon Sep 17 00:00:00 2001 From: Joris Borgdorff Date: Mon, 29 Nov 2021 15:23:31 +0100 Subject: [PATCH 235/431] Merge code from mapping branch --- Dockerfile | 2 +- build.gradle | 2 +- gradle/wrapper/gradle-wrapper.properties | 2 +- .../authorization/AuthoritiesConstants.java | 52 -------- .../auth/authorization/Permission.java | 13 +- .../auth/authorization/Permissions.java | 37 +++--- .../authorization/RadarAuthorization.java | 74 ++++++++--- .../auth/authorization/RoleAuthority.java | 75 +++++++++++ .../auth/token/AbstractRadarToken.java | 118 ++++++++---------- .../auth/token/AuthorityReference.java | 27 ++-- .../radarbase/auth/token/JwtRadarToken.java | 7 +- .../org/radarbase/auth/token/RadarToken.java | 85 +++++++++---- .../authorization/RadarAuthorizationTest.java | 4 +- .../auth/token/AbstractRadarTokenTest.java | 32 ++--- .../config/OAuth2ServerConfiguration.java | 10 +- .../management/domain/Authority.java | 5 + .../org/radarbase/management/domain/Role.java | 5 + .../radarbase/management/domain/Subject.java | 4 +- .../repository/AuthorityRepository.java | 1 - .../repository/ProjectRepository.java | 9 ++ .../repository/filters/UserFilter.java | 43 +++++-- .../security/SessionRadarToken.java | 14 +-- .../management/service/ProjectService.java | 28 ++++- .../management/service/RoleService.java | 15 ++- .../management/service/SubjectService.java | 61 +++++---- .../management/service/UserService.java | 49 ++------ .../management/service/dto/RoleDTO.java | 32 +++++ .../mapper/decorator/RoleMapperDecorator.java | 3 +- .../web/rest/AuthorityResource.java | 15 ++- .../management/web/rest/LogsResource.java | 6 +- .../management/web/rest/ProjectResource.java | 2 +- .../management/web/rest/RevisionResource.java | 6 +- .../management/web/rest/RoleResource.java | 10 +- .../web/rest/SourceDataResource.java | 2 +- .../management/web/rest/SourceResource.java | 2 +- .../management/web/rest/SubjectResource.java | 11 +- .../management/web/rest/UserResource.java | 18 +-- .../group/group-delete-dialog.component.ts | 2 +- .../app/shared/group/group.component.html | 3 +- .../app/shared/group/group.component.ts | 14 +++ .../webapp/app/shared/group/group.service.ts | 7 +- src/main/webapp/i18n/en/group.json | 2 +- src/main/webapp/i18n/nl/group.json | 2 +- .../management/config/MockConfiguration.java | 16 ++- .../service/UserServiceIntTest.java | 4 +- .../web/rest/AccountResourceIntTest.java | 23 ++-- .../web/rest/GroupResourceIntTest.java | 77 ++++++------ .../web/rest/SubjectResourceIntTest.java | 1 - .../web/rest/UserResourceIntTest.java | 86 +++++++------ .../integration/entities/subject.spec.ts | 1 - 50 files changed, 659 insertions(+), 460 deletions(-) delete mode 100644 radar-auth/src/main/java/org/radarbase/auth/authorization/AuthoritiesConstants.java create mode 100644 radar-auth/src/main/java/org/radarbase/auth/authorization/RoleAuthority.java diff --git a/Dockerfile b/Dockerfile index 3a335c556..8f438e8e1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -21,7 +21,7 @@ COPY radar-auth/build.gradle radar-auth/ COPY radar-auth/deprecated-auth0/build.gradle radar-auth/deprecated-auth0/ COPY oauth-client-util/build.gradle oauth-client-util/ -RUN ./gradlew downloadDependencies :radar-auth:shadowJar --no-watch-fs --info --stacktrace +RUN ./gradlew downloadDependencies :radar-auth:shadowJar --no-watch-fs # now we copy our application source code and build it diff --git a/build.gradle b/build.gradle index efe016c06..95cc15bcc 100644 --- a/build.gradle +++ b/build.gradle @@ -249,7 +249,7 @@ task cleanResources(type: Delete) { } wrapper { - gradleVersion '7.2' + gradleVersion '7.3' } task stage(dependsOn: 'bootWar') { diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index ffed3a254..e750102e0 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/radar-auth/src/main/java/org/radarbase/auth/authorization/AuthoritiesConstants.java b/radar-auth/src/main/java/org/radarbase/auth/authorization/AuthoritiesConstants.java deleted file mode 100644 index a420791ab..000000000 --- a/radar-auth/src/main/java/org/radarbase/auth/authorization/AuthoritiesConstants.java +++ /dev/null @@ -1,52 +0,0 @@ -package org.radarbase.auth.authorization; - -import java.util.Locale; - -/** - * Constants for Spring Security authorities. - */ - -public enum AuthoritiesConstants { - SYS_ADMIN(Scope.GLOBAL), - PROJECT_ADMIN(Scope.PROJECT), - PROJECT_OWNER(Scope.PROJECT), - PROJECT_AFFILIATE(Scope.PROJECT), - PROJECT_ANALYST(Scope.PROJECT), - PARTICIPANT(Scope.PROJECT), - INACTIVE_PARTICIPANT(Scope.PROJECT), - ORGANIZATION_ADMIN(Scope.ORGANIZATION); - - private final Scope scope; - - AuthoritiesConstants(Scope scope) { - this.scope = scope; - } - - public Scope scope() { - return scope; - } - - public String role() { - return "ROLE_" + name(); - } - - public static AuthoritiesConstants valueOfRole(String role) { - String upperRole = role.toUpperCase(Locale.ROOT); - if (!upperRole.startsWith("ROLE_")) { - throw new IllegalArgumentException("Cannot map role without 'ROLE_' prefix"); - } - return valueOf(upperRole.substring(5)); - } - - public static AuthoritiesConstants valueOfRoleOrNull(String role) { - try { - return valueOfRole(role); - } catch (IllegalArgumentException ex) { - return null; - } - } - - public enum Scope { - GLOBAL, ORGANIZATION, PROJECT - } -} diff --git a/radar-auth/src/main/java/org/radarbase/auth/authorization/Permission.java b/radar-auth/src/main/java/org/radarbase/auth/authorization/Permission.java index 82d1bb88c..691998f7f 100644 --- a/radar-auth/src/main/java/org/radarbase/auth/authorization/Permission.java +++ b/radar-auth/src/main/java/org/radarbase/auth/authorization/Permission.java @@ -1,8 +1,5 @@ package org.radarbase.auth.authorization; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import java.util.Arrays; import java.util.stream.Stream; @@ -52,8 +49,6 @@ public enum Permission { MEASUREMENT_READ(Entity.MEASUREMENT, Operation.READ), MEASUREMENT_CREATE(Entity.MEASUREMENT, Operation.CREATE); - private static final Logger log = LoggerFactory.getLogger(Permission.class); - public enum Entity { // ManagementPortal entities SOURCETYPE, @@ -109,8 +104,8 @@ public Operation getOperation() { * @param authority the authority name * @return true if the given authority has this permission associated with it, false otherwise */ - public boolean isAuthorityAllowed(AuthoritiesConstants authority) { - return Permissions.allowedAuthorities(this).contains(authority); + public boolean isRoleAllowed(RoleAuthority authority) { + return Permissions.allowedRoles(this).contains(authority); } @Override @@ -128,7 +123,7 @@ public static Stream stream() { /** Returns all available scope names. */ public static String[] scopes() { return stream() - .map(Permission::scopeName) + .map(Permission::scope) .toArray(String[]::new); } @@ -146,7 +141,7 @@ public static Permission of(Entity entity, Operation operation) { * * @return the OAuth scope representation of this permission */ - public String scopeName() { + public String scope() { return entity + "." + operation; } } diff --git a/radar-auth/src/main/java/org/radarbase/auth/authorization/Permissions.java b/radar-auth/src/main/java/org/radarbase/auth/authorization/Permissions.java index 6f590cb01..bc24a7174 100644 --- a/radar-auth/src/main/java/org/radarbase/auth/authorization/Permissions.java +++ b/radar-auth/src/main/java/org/radarbase/auth/authorization/Permissions.java @@ -4,34 +4,31 @@ import java.util.Collections; import java.util.EnumMap; import java.util.EnumSet; -import java.util.HashMap; import java.util.Map; import java.util.Set; import java.util.function.Predicate; import java.util.stream.Collector; -import java.util.stream.Collectors; import java.util.stream.Stream; import static java.util.stream.Collectors.collectingAndThen; import static java.util.stream.Collectors.groupingBy; import static java.util.stream.Collectors.mapping; import static java.util.stream.Collectors.toCollection; -import static java.util.stream.Collectors.toUnmodifiableSet; -import static org.radarbase.auth.authorization.AuthoritiesConstants.INACTIVE_PARTICIPANT; -import static org.radarbase.auth.authorization.AuthoritiesConstants.ORGANIZATION_ADMIN; -import static org.radarbase.auth.authorization.AuthoritiesConstants.PARTICIPANT; -import static org.radarbase.auth.authorization.AuthoritiesConstants.PROJECT_ADMIN; -import static org.radarbase.auth.authorization.AuthoritiesConstants.PROJECT_AFFILIATE; -import static org.radarbase.auth.authorization.AuthoritiesConstants.PROJECT_ANALYST; -import static org.radarbase.auth.authorization.AuthoritiesConstants.PROJECT_OWNER; -import static org.radarbase.auth.authorization.AuthoritiesConstants.SYS_ADMIN; +import static org.radarbase.auth.authorization.RoleAuthority.INACTIVE_PARTICIPANT; +import static org.radarbase.auth.authorization.RoleAuthority.ORGANIZATION_ADMIN; +import static org.radarbase.auth.authorization.RoleAuthority.PARTICIPANT; +import static org.radarbase.auth.authorization.RoleAuthority.PROJECT_ADMIN; +import static org.radarbase.auth.authorization.RoleAuthority.PROJECT_AFFILIATE; +import static org.radarbase.auth.authorization.RoleAuthority.PROJECT_ANALYST; +import static org.radarbase.auth.authorization.RoleAuthority.PROJECT_OWNER; +import static org.radarbase.auth.authorization.RoleAuthority.SYS_ADMIN; /** * Created by dverbeec on 22/09/2017. */ public final class Permissions { - private static final Map> PERMISSION_MATRIX; + private static final Map> PERMISSION_MATRIX; static { PERMISSION_MATRIX = createPermissions(); @@ -43,11 +40,11 @@ private Permissions() { /** * Look up the allowed authorities for a given permission. Authorities are String constants that - * appear in {@link AuthoritiesConstants}. + * appear in {@link RoleAuthority}. * @param permission The permission to look up. * @return An unmodifiable view of the set of allowed authorities. */ - public static Set allowedAuthorities(Permission permission) { + public static Set allowedRoles(Permission permission) { return PERMISSION_MATRIX.getOrDefault(permission, Set.of()); } @@ -58,16 +55,16 @@ public static Set allowedAuthorities(Permission permission * permission.

      * @return An unmodifiable view of the permission matrix. */ - public static Map> getPermissionMatrix() { + public static Map> getPermissionMatrix() { return PERMISSION_MATRIX; } /** * Static permission matrix based on the currently agreed upon security rules. */ - private static Map> createPermissions() { - Map> rolePermissions = new EnumMap<>( - AuthoritiesConstants.class); + private static Map> createPermissions() { + Map> rolePermissions = new EnumMap<>( + RoleAuthority.class); // System admin can do everything. rolePermissions.put(SYS_ADMIN, Permission.stream()); @@ -149,10 +146,10 @@ private static Map> createPermissions() { mapping(Map.Entry::getValue, toUnmodifiableEnumSet())))); } - private static Collector> + private static Collector> toUnmodifiableEnumSet() { return collectingAndThen( - toCollection(() -> EnumSet.noneOf(AuthoritiesConstants.class)), + toCollection(() -> EnumSet.noneOf(RoleAuthority.class)), Collections::unmodifiableSet); } diff --git a/radar-auth/src/main/java/org/radarbase/auth/authorization/RadarAuthorization.java b/radar-auth/src/main/java/org/radarbase/auth/authorization/RadarAuthorization.java index 633eda0e9..be73e10e5 100644 --- a/radar-auth/src/main/java/org/radarbase/auth/authorization/RadarAuthorization.java +++ b/radar-auth/src/main/java/org/radarbase/auth/authorization/RadarAuthorization.java @@ -19,28 +19,28 @@ private RadarAuthorization() { } /** - * Similar to {@link RadarToken#hasAuthority(AuthoritiesConstants)}, but this + * Similar to {@link RadarToken#hasAuthority(RoleAuthority)}, but this * method throws an exception rather than returning a boolean. Useful in combination with e.g. * Spring's controllers and exception translators. * @param token The token of the requester * @param authority The authority to check * @throws NotAuthorizedException if the supplied token does not have the authority */ - public static void checkAuthority(RadarToken token, AuthoritiesConstants authority) + public static void checkAuthority(RadarToken token, RoleAuthority authority) throws NotAuthorizedException { if (!token.isClientCredentials()) { log.debug("Checking authority {} for user {}", authority, - token.getSubject()); + token.getUsername()); if (!token.hasAuthority(authority)) { throw new NotAuthorizedException(String.format("Request Client %s does not have " - + "authority %s", token.getSubject(), authority)); + + "authority %s", token.getUsername(), authority)); } } } /** - * Similar to {@link RadarToken#hasAuthority(AuthoritiesConstants)}, but this method throws an + * Similar to {@link RadarToken#hasAuthority(RoleAuthority)}, but this method throws an * exception rather than returning a boolean. Useful in combination with e.g. Spring's * controllers and exception translators. * @param token The token of the requester @@ -48,11 +48,11 @@ public static void checkAuthority(RadarToken token, AuthoritiesConstants authori * @param permission Permission that the authority should have. * @throws NotAuthorizedException if the supplied token does not have the authority */ - public static void checkAuthorityAndPermission(RadarToken token, AuthoritiesConstants authority, + public static void checkAuthorityAndPermission(RadarToken token, RoleAuthority authority, Permission permission) throws NotAuthorizedException { log.debug("Checking authority {} and permission {} for user {}", authority, permission, - token.getSubject()); + token.getUsername()); checkAuthority(token, authority); checkPermission(token, permission); } @@ -68,10 +68,54 @@ public static void checkAuthorityAndPermission(RadarToken token, AuthoritiesCons public static void checkPermission(RadarToken token, Permission permission) throws NotAuthorizedException { log.debug("Checking permission {} for user {}", permission.toString(), - token.getSubject()); + token.getUsername()); if (!token.hasPermission(permission)) { throw new NotAuthorizedException(String.format("Client %s does not have " - + "permission %s", token.getSubject(), permission.toString())); + + "permission %s", token.getUsername(), permission)); + } + } + + /** + * Similar to {@link RadarToken#hasPermissionOnOrganization(Permission, String)}, + * but this method throws an exception rather than returning a boolean. + * Useful in combination with e.g. Spring's controllers and exception translators. + * @param token The token of the logged in user + * @param permission The permission to check + * @param organizationName The organization for which to check the permission + * @throws NotAuthorizedException if the supplied token + * does not have the permission in the given organization + */ + public static void checkPermissionOnOrganization(RadarToken token, Permission permission, + String organizationName) throws NotAuthorizedException { + log.debug("Checking permission {} for user {} in organization {}", permission.toString(), + token.getUsername(), organizationName); + if (!token.hasPermissionOnOrganization(permission, organizationName)) { + throw new NotAuthorizedException(String.format("Client %s does not have " + + "permission %s in organization %s", + token.getUsername(), permission, organizationName)); + } + } + + /** + * Similar to {@link RadarToken#hasPermissionOnProject(Permission, String)}, but this method + * throws an exception rather than returning a boolean. Useful in combination with e.g. Spring's + * controllers and exception translators. + * @param token The token of the logged in user + * @param permission The permission to check + * @param projectName The project for which to check the permission + * @throws NotAuthorizedException if the supplied token does not have the permission in the + * given project + */ + public static void checkPermissionOnOrganizationAndProject(RadarToken token, + Permission permission, String organization, String projectName) + throws NotAuthorizedException { + log.debug("Checking permission {} for user {} in organization {} and project {}", + permission.toString(), token.getUsername(), organization, projectName); + if (!token.hasPermissionOnOrganizationAndProject(permission, organization, projectName)) { + throw new NotAuthorizedException(String.format("Client %s does not have " + + "permission %s in organization %s and project %s", + token.getUsername(), permission, organization, + projectName)); } } @@ -88,10 +132,10 @@ public static void checkPermission(RadarToken token, Permission permission) public static void checkPermissionOnProject(RadarToken token, Permission permission, String projectName) throws NotAuthorizedException { log.debug("Checking permission {} for user {} in project {}", permission.toString(), - token.getSubject(), projectName); + token.getUsername(), projectName); if (!token.hasPermissionOnProject(permission, projectName)) { throw new NotAuthorizedException(String.format("Client %s does not have " - + "permission %s in project %s", token.getSubject(), permission.toString(), + + "permission %s in project %s", token.getUsername(), permission, projectName)); } } @@ -110,10 +154,10 @@ public static void checkPermissionOnProject(RadarToken token, Permission permiss public static void checkPermissionOnSubject(RadarToken token, Permission permission, String projectName, String subjectName) throws NotAuthorizedException { log.debug("Checking permission {} for user {} on subject {} in project {}", - permission.toString(), token.getSubject(), subjectName, projectName); + permission.toString(), token.getUsername(), subjectName, projectName); if (!token.hasPermissionOnSubject(permission, projectName, subjectName)) { throw new NotAuthorizedException(String.format("Client %s does not have " - + "permission %s on subject %s in project %s", token.getSubject(), + + "permission %s on subject %s in project %s", token.getUsername(), permission, subjectName, projectName)); } } @@ -133,11 +177,11 @@ public static void checkPermissionOnSubject(RadarToken token, Permission permiss public static void checkPermissionOnSource(RadarToken token, Permission permission, String projectName, String subjectName, String sourceId) throws NotAuthorizedException { log.debug("Checking permission {} for user {} on source {} of subject {} in project {}", - permission.toString(), token.getSubject(), sourceId, subjectName, projectName); + permission.toString(), token.getUsername(), sourceId, subjectName, projectName); if (!token.hasPermissionOnSource(permission, projectName, subjectName, sourceId)) { throw new NotAuthorizedException(String.format("Client %s does not have " + "permission %s on source %s of subject %s in project %s", - token.getSubject(), permission, sourceId, subjectName, projectName)); + token.getUsername(), permission, sourceId, subjectName, projectName)); } } } diff --git a/radar-auth/src/main/java/org/radarbase/auth/authorization/RoleAuthority.java b/radar-auth/src/main/java/org/radarbase/auth/authorization/RoleAuthority.java new file mode 100644 index 000000000..3bc458ec6 --- /dev/null +++ b/radar-auth/src/main/java/org/radarbase/auth/authorization/RoleAuthority.java @@ -0,0 +1,75 @@ +package org.radarbase.auth.authorization; + +import java.io.Serializable; +import java.util.Locale; + +/** + * Constants for Spring Security authorities. + */ +public enum RoleAuthority implements Serializable { + SYS_ADMIN(Scope.GLOBAL, false), + PROJECT_ADMIN(Scope.PROJECT, false), + PROJECT_OWNER(Scope.PROJECT, false), + PROJECT_AFFILIATE(Scope.PROJECT, false), + PROJECT_ANALYST(Scope.PROJECT, false), + PARTICIPANT(Scope.PROJECT, true), + INACTIVE_PARTICIPANT(Scope.PROJECT, true), + ORGANIZATION_ADMIN(Scope.ORGANIZATION, false); + + public static final String SYS_ADMIN_AUTHORITY = "ROLE_SYS_ADMIN"; + + private final Scope scope; + private final boolean isPersonal; + + RoleAuthority(Scope scope, boolean isPersonal) { + this.scope = scope; + this.isPersonal = isPersonal; + } + + public Scope scope() { + return scope; + } + + public String authority() { + return "ROLE_" + name(); + } + + public boolean isPersonal() { + return this.isPersonal; + } + + /** + * Find role authority based on authority name. + * @param authority authority name + * @return RoleAuthority + * @throws IllegalArgumentException if no role authority exists with the given name. + * @throws NullPointerException if given authority is null. + */ + public static RoleAuthority valueOfAuthority(String authority) { + String upperAuthority = authority.toUpperCase(Locale.ROOT); + if (!upperAuthority.startsWith("ROLE_")) { + throw new IllegalArgumentException("Cannot map role without 'ROLE_' prefix"); + } + return valueOf(upperAuthority.substring(5)); + } + + /** + * Find role authority based on authority name. + * @param authority authority name + * @return RoleAuthority or null if no role authority exists with the given name. + */ + public static RoleAuthority valueOfAuthorityOrNull(String authority) { + if (authority == null) { + return null; + } + try { + return valueOfAuthority(authority); + } catch (IllegalArgumentException ex) { + return null; + } + } + + public enum Scope { + GLOBAL, ORGANIZATION, PROJECT + } +} diff --git a/radar-auth/src/main/java/org/radarbase/auth/token/AbstractRadarToken.java b/radar-auth/src/main/java/org/radarbase/auth/token/AbstractRadarToken.java index 81ad77a87..e137cdca2 100644 --- a/radar-auth/src/main/java/org/radarbase/auth/token/AbstractRadarToken.java +++ b/radar-auth/src/main/java/org/radarbase/auth/token/AbstractRadarToken.java @@ -1,13 +1,12 @@ package org.radarbase.auth.token; -import org.radarbase.auth.authorization.AuthoritiesConstants; import org.radarbase.auth.authorization.Permission; +import org.radarbase.auth.authorization.RoleAuthority; import java.util.Objects; import java.util.Set; - -import static org.radarbase.auth.authorization.AuthoritiesConstants.PARTICIPANT; -import static org.radarbase.auth.authorization.AuthoritiesConstants.SYS_ADMIN; +import java.util.function.Predicate; +import java.util.stream.Stream; /** * Partial implementation of {@link RadarToken}, providing a default implementation for the three @@ -17,35 +16,35 @@ public abstract class AbstractRadarToken implements RadarToken { protected static final String CLIENT_CREDENTIALS = "client_credentials"; @Override - public boolean hasAuthority(AuthoritiesConstants authority) { + public boolean hasAuthority(RoleAuthority authority) { return isClientCredentials() - || getAuthoritiesConstants().stream().anyMatch(authority::equals); + || getRoleAuthorities().stream().anyMatch(authority::equals); } @Override public boolean hasPermission(Permission permission) { - return hasScope(permission.scopeName()) + return hasScope(permission.scope()) && (isClientCredentials() || hasAuthorityForPermission(permission)); } @Override public boolean hasPermissionOnOrganization(Permission permission, String organization) { - return hasScope(permission.scopeName()) + return hasScope(permission.scope()) && (isClientCredentials() || hasAuthorityForOrganization(permission, organization)); } @Override public boolean hasPermissionOnOrganizationAndProject(Permission permission, String organization, String projectName) { - return hasScope(permission.scopeName()) + return hasScope(permission.scope()) && (isClientCredentials() || hasAuthorityForOrganizationAndProject( permission, organization, projectName)); } @Override public boolean hasPermissionOnProject(Permission permission, String projectName) { - return hasScope(permission.scopeName()) + return hasScope(permission.scope()) && (isClientCredentials() || hasAuthorityForProject( permission, projectName)); } @@ -53,7 +52,7 @@ public boolean hasPermissionOnProject(Permission permission, String projectName) @Override public boolean hasPermissionOnSubject(Permission permission, String projectName, String subjectName) { - return hasScope(permission.scopeName()) + return hasScope(permission.scope()) && (isClientCredentials() || hasAuthorityForSubject(permission, projectName, subjectName)); } @@ -61,7 +60,7 @@ public boolean hasPermissionOnSubject(Permission permission, String projectName, @Override public boolean hasPermissionOnSource(Permission permission, String projectName, String subjectName, String sourceId) { - return hasScope(permission.scopeName()) + return hasScope(permission.scope()) && (isClientCredentials() || hasAuthorityForSource(permission, projectName, subjectName, sourceId)); } @@ -82,9 +81,9 @@ public boolean isClientCredentials() { * @return {@code true} if any authority contains the permission, {@code false} otherwise */ protected boolean hasAuthorityForPermission(Permission permission) { - return getRoles().stream() - .map(AuthorityReference::getRole) - .anyMatch(permission::isAuthorityAllowed); + return Stream.concat(getRoles().stream().map(AuthorityReference::getRole), + getRoleAuthorities().stream()) + .anyMatch(permission::isRoleAllowed); } /** @@ -95,15 +94,15 @@ protected boolean hasAuthorityForPermission(Permission permission) { * @return {@code true} if any authority contains the permission, {@code false} otherwise */ protected boolean hasAuthorityForOrganization(Permission permission, String organization) { - if (hasNonProjectRelatedAuthorityForPermission(permission)) { + if (hasGlobalAuthorityForPermission(permission)) { return true; } if (organization == null) { return false; } - Set organizationRoles = getOrganizationRoles().get(organization); + Set organizationRoles = getOrganizationRoles().get(organization); return organizationRoles != null - && organizationRoles.stream().anyMatch(permission::isAuthorityAllowed); + && organizationRoles.stream().anyMatch(permission::isRoleAllowed); } /** @@ -121,22 +120,44 @@ protected boolean hasAuthorityForOrganizationAndProject(Permission permission, } /** - * Check authorities in this token linked to the given project, or not linked to any project - * (such as {@code SYS_ADMIN}), for the given permission. - * @param permission the permission - * @param projectName the project name + * Check whether roles from this token give authority to a given subject. By providing an + * additional personal role condition, if the authority is personal (e.g. subject-specific), + * the predicate for that subject will be evaluated. + * + * @param permission permission to check. + * @param projectName project name. + * @param personalRoleCondition additional condition (possibly null) when a role is + * only applies to the person. * @return {@code true} if any authority contains the permission, {@code false} otherwise */ - protected boolean hasAuthorityForProject(Permission permission, String projectName) { - if (hasNonProjectRelatedAuthorityForPermission(permission)) { + protected boolean hasAuthorityForProject( + Permission permission, + String projectName, + Predicate personalRoleCondition) { + if (hasGlobalAuthorityForPermission(permission)) { return true; } if (projectName == null) { return false; } - Set projectRoles = getProjectRoles().get(projectName); - return projectRoles != null - && projectRoles.stream().anyMatch(permission::isAuthorityAllowed); + Set projectRoles = getProjectRoles().get(projectName); + return projectRoles != null && projectRoles.stream() + .anyMatch(role -> permission.isRoleAllowed(role) + && (personalRoleCondition == null + || !role.isPersonal() + || personalRoleCondition.test(role))); + } + + /** + * Check authorities in this token linked to the given project, or not linked to any project + * (such as {@code SYS_ADMIN}), for the given permission. + * @param permission the permission + * @param projectName the project name + * @return {@code true} if any authority contains the permission, {@code false} otherwise + */ + protected boolean hasAuthorityForProject(Permission permission, String projectName) { + return hasAuthorityForProject(permission, projectName, + p -> permission.getOperation() == Permission.Operation.READ); } /** @@ -149,49 +170,14 @@ protected boolean hasAuthorityForProject(Permission permission, String projectNa */ protected boolean hasAuthorityForSubject(Permission permission, String projectName, String subjectName) { - if (isJustParticipant(projectName)) { - // if we're only a participant, we can only do operations on our own data - return getSubject().equals(subjectName) - && permission.isAuthorityAllowed(PARTICIPANT); - } else { - // if we have other roles beside participant, we should check those on the - // project level - return hasAuthorityForProject(permission, projectName); - } + return hasAuthorityForProject(permission, projectName, role -> + getUsername().equals(subjectName)); } protected boolean hasAuthorityForSource(Permission permission, String projectName, String subjectName, String sourceId) { - if (!hasAuthorityForSubject(permission, projectName, subjectName)) { - return false; - } - if (isJustParticipant(projectName)) { - return getSources().contains(sourceId); - } else { - return true; - } - } - - /** - * Check if any non-project related authority has the given permission. Currently the only - * non-project authority is {@code SYS_ADMIN}, so we only check for that. - * @param permission the permission - * @return {@code true} if any non-project related authority has the permission, {@code false} - * otherwise - */ - protected boolean hasNonProjectRelatedAuthorityForPermission(Permission permission) { - return getAuthoritiesConstants().contains(SYS_ADMIN) - && permission.isAuthorityAllowed(SYS_ADMIN); - } - - /** - * Check if this token only has the participant role in the given project. - * @param projectName the project - * @return {@code true} if this token only has the participant role in the given project, - * {@code false} otherwise - */ - protected boolean isJustParticipant(String projectName) { - return Set.of(PARTICIPANT).equals(getProjectRoles().get(projectName)); + return hasAuthorityForProject(permission, projectName, role -> + getUsername().equals(subjectName) && getSources().contains(sourceId)); } @Override diff --git a/radar-auth/src/main/java/org/radarbase/auth/token/AuthorityReference.java b/radar-auth/src/main/java/org/radarbase/auth/token/AuthorityReference.java index c78f95e15..218b78366 100644 --- a/radar-auth/src/main/java/org/radarbase/auth/token/AuthorityReference.java +++ b/radar-auth/src/main/java/org/radarbase/auth/token/AuthorityReference.java @@ -9,38 +9,49 @@ package org.radarbase.auth.token; -import org.radarbase.auth.authorization.AuthoritiesConstants; +import org.radarbase.auth.authorization.RoleAuthority; +import java.io.Serializable; import java.util.Objects; import static java.util.Objects.requireNonNull; -public class AuthorityReference { +public class AuthorityReference implements Serializable { private final String authority; private final String referent; - private final AuthoritiesConstants role; + private final RoleAuthority role; public AuthorityReference(String authority) { this(authority, null); } - public AuthorityReference(AuthoritiesConstants role) { + public AuthorityReference(RoleAuthority role) { this(role, null); } - public AuthorityReference(AuthoritiesConstants role, String referent) { + /** + * Authority reference with given role and the object it refers to. + * @param role user role. + * @param referent reference. + */ + public AuthorityReference(RoleAuthority role, String referent) { this.role = requireNonNull(role); - this.authority = role.role(); + this.authority = role.authority(); this.referent = referent; } + /** + * Authority reference with given authority and the object it refers to. + * @param authority user authority. + * @param referent reference. + */ public AuthorityReference(String authority, String referent) { this.authority = requireNonNull(authority); - this.role = AuthoritiesConstants.valueOfRoleOrNull(authority); + this.role = RoleAuthority.valueOfAuthorityOrNull(authority); this.referent = referent; } - public AuthoritiesConstants getRole() { + public RoleAuthority getRole() { return role; } diff --git a/radar-auth/src/main/java/org/radarbase/auth/token/JwtRadarToken.java b/radar-auth/src/main/java/org/radarbase/auth/token/JwtRadarToken.java index 42c74dab7..9224d4a5a 100644 --- a/radar-auth/src/main/java/org/radarbase/auth/token/JwtRadarToken.java +++ b/radar-auth/src/main/java/org/radarbase/auth/token/JwtRadarToken.java @@ -1,13 +1,12 @@ package org.radarbase.auth.token; import static java.util.Objects.requireNonNullElseGet; -import static java.util.stream.Collectors.groupingBy; import static java.util.stream.Collectors.toUnmodifiableSet; import com.auth0.jwt.exceptions.JWTDecodeException; import com.auth0.jwt.interfaces.Claim; import com.auth0.jwt.interfaces.DecodedJWT; -import org.radarbase.auth.authorization.AuthoritiesConstants; +import org.radarbase.auth.authorization.RoleAuthority; import java.util.Arrays; import java.util.Collections; @@ -59,8 +58,8 @@ public JwtRadarToken(DecodedJWT jwt) { authorities = emptyIfNull(jwt.getClaim(AUTHORITIES_CLAIM).asList(String.class)); roles = Stream.concat( authorities.stream() - .map(AuthoritiesConstants::valueOfRoleOrNull) - .filter(r -> r != null && r.scope() == AuthoritiesConstants.Scope.GLOBAL) + .map(RoleAuthority::valueOfAuthorityOrNull) + .filter(r -> r != null && r.scope() == RoleAuthority.Scope.GLOBAL) .map(AuthorityReference::new), parseRoles(jwt)) .collect(toUnmodifiableSet()); diff --git a/radar-auth/src/main/java/org/radarbase/auth/token/RadarToken.java b/radar-auth/src/main/java/org/radarbase/auth/token/RadarToken.java index 13c297d99..985f2491c 100644 --- a/radar-auth/src/main/java/org/radarbase/auth/token/RadarToken.java +++ b/radar-auth/src/main/java/org/radarbase/auth/token/RadarToken.java @@ -1,6 +1,6 @@ package org.radarbase.auth.token; -import org.radarbase.auth.authorization.AuthoritiesConstants; +import org.radarbase.auth.authorization.RoleAuthority; import org.radarbase.auth.authorization.Permission; import java.util.Date; @@ -9,11 +9,12 @@ import java.util.Map; import java.util.Objects; import java.util.Set; +import java.util.stream.Collector; +import java.util.stream.Stream; import static java.util.stream.Collectors.groupingBy; import static java.util.stream.Collectors.mapping; import static java.util.stream.Collectors.toCollection; -import static java.util.stream.Collectors.toSet; /** * Created by dverbeec on 10/01/2018. @@ -30,11 +31,15 @@ public interface RadarToken { * @return non-null map describing the roles defined in this token. The keys in the map are the * project names, and the values are lists of authority names associated to the project. */ - default Set getGlobalRoles() { - return getRoles().stream() - .map(AuthorityReference::getRole) - .filter(r -> r.scope() == AuthoritiesConstants.Scope.GLOBAL) - .collect(toSet()); + default Set getGlobalRoles() { + return Stream.concat( + getAuthorities().stream() + .map(RoleAuthority::valueOfAuthorityOrNull) + .filter(Objects::nonNull), + getRoles().stream() + .map(AuthorityReference::getRole)) + .filter(r -> r.scope() == RoleAuthority.Scope.GLOBAL) + .collect(toEnumSet()); } /** @@ -42,13 +47,11 @@ default Set getGlobalRoles() { * @return non-null map describing the roles defined in this token. The keys in the map are the * project names, and the values are lists of authority names associated to the project. */ - default Map> getProjectRoles() { + default Map> getProjectRoles() { return getRoles().stream() - .filter(r -> r.getRole().scope() == AuthoritiesConstants.Scope.PROJECT + .filter(r -> r.getRole().scope() == RoleAuthority.Scope.PROJECT && r.getReferent() != null) - .collect(groupingBy(AuthorityReference::getReferent, - mapping(AuthorityReference::getRole, - toCollection(() -> EnumSet.noneOf(AuthoritiesConstants.class))))); + .collect(groupingByReferent()); } /** @@ -56,13 +59,42 @@ default Map> getProjectRoles() { * @return non-null map describing the roles defined in this token. The keys in the map are the * project names, and the values are lists of authority names associated to the project. */ - default Map> getOrganizationRoles() { + default Map> getOrganizationRoles() { return getRoles().stream() - .filter(r -> r.getRole().scope() == AuthoritiesConstants.Scope.ORGANIZATION + .filter(r -> r.getRole().scope() == RoleAuthority.Scope.ORGANIZATION && r.getReferent() != null) - .collect(groupingBy(AuthorityReference::getReferent, - mapping(AuthorityReference::getRole, - toCollection(() -> EnumSet.noneOf(AuthoritiesConstants.class))))); + .collect(groupingByReferent()); + } + + /** + * Get the referents in a given scope that matches a permission. + * @param scope scope of the referents + * @param permission permission that should be available from + * @return referents names. + */ + default Stream getReferentsWithPermission(RoleAuthority.Scope scope, + Permission permission) { + return getRoles().stream() + .filter(r -> r.getRole().scope() == scope + && permission.isRoleAllowed(r.getRole())) + .map(AuthorityReference::getReferent) + .filter(Objects::nonNull); + } + + /** + * Check if any non-project related authority has the given permission. Currently the only + * non-project authority is {@code SYS_ADMIN}, so we only check for that. + * @param permission the permission + * @return {@code true} if any non-project related authority has the permission, {@code false} + * otherwise + */ + default boolean hasGlobalAuthorityForPermission(Permission permission) { + return Stream.concat( + getAuthorities().stream().map(RoleAuthority::valueOfAuthorityOrNull), + getRoles().stream().map(AuthorityReference::getRole)) + .anyMatch(r -> r != null + && r.scope() == RoleAuthority.Scope.GLOBAL + && permission.isRoleAllowed(r)); } /** @@ -75,11 +107,11 @@ default Map> getOrganizationRoles() { * Get a list of non-project related authorities. * @return non-null list of authority names */ - default Set getAuthoritiesConstants() { + default Set getRoleAuthorities() { return getAuthorities().stream() - .map(AuthoritiesConstants::valueOfRoleOrNull) + .map(RoleAuthority::valueOfAuthorityOrNull) .filter(Objects::nonNull) - .collect(toCollection(() -> EnumSet.noneOf(AuthoritiesConstants.class))); + .collect(toEnumSet()); } /** @@ -176,7 +208,7 @@ default Set getAuthoritiesConstants() { * @param authority The permission to check * @return {@code true} if this token has the permission, {@code false} otherwise */ - boolean hasAuthority(AuthoritiesConstants authority); + boolean hasAuthority(RoleAuthority authority); /** * Check if this token gives the given permission, not taking into account project affiliations. @@ -210,7 +242,6 @@ boolean hasPermissionOnOrganizationAndProject(Permission permission, String orga String projectName); /** - * * Check if this token gives a permission in a specific project. * @param permission the permission * @param projectName the project name @@ -245,4 +276,14 @@ boolean hasPermissionOnSource(Permission permission, String projectName, String * @return true if the client credentials flow was certainly used, false otherwise. */ boolean isClientCredentials(); + + private static Collector> toEnumSet() { + return toCollection(() -> EnumSet.noneOf(RoleAuthority.class)); + } + + private static Collector>> + groupingByReferent() { + return groupingBy(AuthorityReference::getReferent, + mapping(AuthorityReference::getRole, toEnumSet())); + } } diff --git a/radar-auth/src/test/java/org/radarbase/auth/authorization/RadarAuthorizationTest.java b/radar-auth/src/test/java/org/radarbase/auth/authorization/RadarAuthorizationTest.java index b4710503e..d66ad0c1d 100644 --- a/radar-auth/src/test/java/org/radarbase/auth/authorization/RadarAuthorizationTest.java +++ b/radar-auth/src/test/java/org/radarbase/auth/authorization/RadarAuthorizationTest.java @@ -27,7 +27,7 @@ void testCheckPermissionOnProject() throws NotAuthorizedException { String project = "PROJECT1"; // let's get all permissions a project admin has Set permissions = Permissions.getPermissionMatrix().entrySet().stream() - .filter(e -> e.getValue().contains(AuthoritiesConstants.PROJECT_ADMIN)) + .filter(e -> e.getValue().contains(RoleAuthority.PROJECT_ADMIN)) .map(Entry::getKey) .collect(Collectors.toSet()); RadarToken token = new JwtRadarToken(TokenTestUtils.PROJECT_ADMIN_TOKEN); @@ -36,7 +36,7 @@ void testCheckPermissionOnProject() throws NotAuthorizedException { } Set notPermitted = Permissions.getPermissionMatrix().entrySet().stream() - .filter(e -> !e.getValue().contains(AuthoritiesConstants.PROJECT_ADMIN)) + .filter(e -> !e.getValue().contains(RoleAuthority.PROJECT_ADMIN)) .map(Entry::getKey) .collect(Collectors.toSet()); diff --git a/radar-auth/src/test/java/org/radarbase/auth/token/AbstractRadarTokenTest.java b/radar-auth/src/test/java/org/radarbase/auth/token/AbstractRadarTokenTest.java index 88afa18b6..2dcb758f5 100644 --- a/radar-auth/src/test/java/org/radarbase/auth/token/AbstractRadarTokenTest.java +++ b/radar-auth/src/test/java/org/radarbase/auth/token/AbstractRadarTokenTest.java @@ -2,8 +2,8 @@ import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; -import static org.radarbase.auth.authorization.AuthoritiesConstants.PARTICIPANT; -import static org.radarbase.auth.authorization.AuthoritiesConstants.SYS_ADMIN; +import static org.radarbase.auth.authorization.RoleAuthority.PARTICIPANT; +import static org.radarbase.auth.authorization.RoleAuthority.SYS_ADMIN; import static org.radarbase.auth.authorization.Permission.MEASUREMENT_CREATE; import static org.radarbase.auth.token.AbstractRadarToken.CLIENT_CREDENTIALS; @@ -56,7 +56,7 @@ public String getSubject() { @Override public String getUsername() { - return ""; + return subject; } @Override @@ -121,15 +121,15 @@ void notHasPermissionWithoutAuthority() { @Test void hasPermissionAsAdmin() { MockToken token = new MockToken(); - token.scopes.add(MEASUREMENT_CREATE.scopeName()); - token.authorities.add(SYS_ADMIN.role()); + token.scopes.add(MEASUREMENT_CREATE.scope()); + token.authorities.add(SYS_ADMIN.authority()); assertTrue(token.hasPermission(MEASUREMENT_CREATE)); } @Test void hasPermissionAsUser() { MockToken token = new MockToken(); - token.scopes.add(MEASUREMENT_CREATE.scopeName()); + token.scopes.add(MEASUREMENT_CREATE.scope()); token.roles.add(new AuthorityReference(PARTICIPANT, "some")); assertTrue(token.hasPermission(MEASUREMENT_CREATE)); } @@ -137,7 +137,7 @@ void hasPermissionAsUser() { @Test void hasPermissionAsClient() { MockToken token = new MockToken(); - token.scopes.add(MEASUREMENT_CREATE.scopeName()); + token.scopes.add(MEASUREMENT_CREATE.scope()); token.grantType = CLIENT_CREDENTIALS; assertTrue(token.hasPermission(MEASUREMENT_CREATE)); } @@ -158,24 +158,24 @@ void notHasPermissioOnProjectnWithoutAuthority() { @Test void hasPermissionOnProjectAsAdmin() { MockToken token = new MockToken(); - token.scopes.add(MEASUREMENT_CREATE.scopeName()); - token.authorities.add(SYS_ADMIN.role()); + token.scopes.add(MEASUREMENT_CREATE.scope()); + token.authorities.add(SYS_ADMIN.authority()); assertTrue(token.hasPermissionOnProject(MEASUREMENT_CREATE, "project")); } @Test void hasPermissionOnProjectAsUser() { MockToken token = new MockToken(); - token.scopes.add(MEASUREMENT_CREATE.scopeName()); + token.scopes.add(MEASUREMENT_CREATE.scope()); token.roles.add(new AuthorityReference(PARTICIPANT, "project")); - assertTrue(token.hasPermissionOnProject(MEASUREMENT_CREATE, "project")); + assertFalse(token.hasPermissionOnProject(MEASUREMENT_CREATE, "project")); assertFalse(token.hasPermissionOnProject(MEASUREMENT_CREATE, "otherProject")); } @Test void hasPermissionOnProjectAsClient() { MockToken token = new MockToken(); - token.scopes.add(MEASUREMENT_CREATE.scopeName()); + token.scopes.add(MEASUREMENT_CREATE.scope()); token.grantType = CLIENT_CREDENTIALS; assertTrue(token.hasPermissionOnProject(MEASUREMENT_CREATE, "project")); } @@ -197,15 +197,15 @@ void notHasPermissioOnSubjectnWithoutAuthority() { @Test void hasPermissionOnSubjectAsAdmin() { MockToken token = new MockToken(); - token.scopes.add(MEASUREMENT_CREATE.scopeName()); - token.authorities.add(SYS_ADMIN.role()); + token.scopes.add(MEASUREMENT_CREATE.scope()); + token.authorities.add(SYS_ADMIN.authority()); assertTrue(token.hasPermissionOnSubject(MEASUREMENT_CREATE, "project", "subject")); } @Test void hasPermissionOnSubjectAsUser() { MockToken token = new MockToken(); - token.scopes.add(MEASUREMENT_CREATE.scopeName()); + token.scopes.add(MEASUREMENT_CREATE.scope()); token.roles.add(new AuthorityReference(PARTICIPANT, "project")); token.subject = "subject"; assertTrue(token.hasPermissionOnSubject(MEASUREMENT_CREATE, "project", "subject")); @@ -216,7 +216,7 @@ void hasPermissionOnSubjectAsUser() { @Test void hasPermissionOnSubjectAsClient() { MockToken token = new MockToken(); - token.scopes.add(MEASUREMENT_CREATE.scopeName()); + token.scopes.add(MEASUREMENT_CREATE.scope()); token.grantType = CLIENT_CREDENTIALS; assertTrue(token.hasPermissionOnSubject(MEASUREMENT_CREATE, "project", "subject")); } diff --git a/src/main/java/org/radarbase/management/config/OAuth2ServerConfiguration.java b/src/main/java/org/radarbase/management/config/OAuth2ServerConfiguration.java index e689141cb..562e58057 100644 --- a/src/main/java/org/radarbase/management/config/OAuth2ServerConfiguration.java +++ b/src/main/java/org/radarbase/management/config/OAuth2ServerConfiguration.java @@ -1,6 +1,6 @@ package org.radarbase.management.config; -import org.radarbase.auth.authorization.AuthoritiesConstants; +import org.radarbase.auth.authorization.RoleAuthority; import org.radarbase.management.security.ClaimsTokenEnhancer; import org.radarbase.management.security.Http401UnauthorizedEntryPoint; import org.radarbase.management.security.JwtAuthenticationFilter; @@ -143,17 +143,19 @@ public void configure(HttpSecurity http) throws Exception { .authorizeRequests() .antMatchers("/oauth/**").permitAll() .antMatchers(HttpMethod.OPTIONS, "/**").permitAll() - .antMatchers("/api/register").hasAnyAuthority(AuthoritiesConstants.SYS_ADMIN) + .antMatchers("/api/register").hasAnyAuthority( + RoleAuthority.SYS_ADMIN_AUTHORITY) .antMatchers("/api/profile-info").permitAll() .antMatchers("/api/**").authenticated() // Allow management/health endpoint to all to allow kubernetes to be able to // detect the health of the service .antMatchers("/management/health").permitAll() - .antMatchers("/management/**").hasAnyAuthority(AuthoritiesConstants.SYS_ADMIN) + .antMatchers("/management/**").hasAnyAuthority( + RoleAuthority.SYS_ADMIN_AUTHORITY) .antMatchers("/v2/api-docs/**").permitAll() .antMatchers("/swagger-resources/configuration/ui").permitAll() .antMatchers("/swagger-ui/index.html") - .hasAnyAuthority(AuthoritiesConstants.SYS_ADMIN); + .hasAnyAuthority(RoleAuthority.SYS_ADMIN_AUTHORITY); } @Override diff --git a/src/main/java/org/radarbase/management/domain/Authority.java b/src/main/java/org/radarbase/management/domain/Authority.java index c86e6da90..9590b351a 100644 --- a/src/main/java/org/radarbase/management/domain/Authority.java +++ b/src/main/java/org/radarbase/management/domain/Authority.java @@ -12,6 +12,7 @@ import org.hibernate.annotations.Cache; import org.hibernate.annotations.CacheConcurrencyStrategy; import org.hibernate.envers.Audited; +import org.radarbase.auth.authorization.RoleAuthority; import org.radarbase.auth.config.Constants; /** @@ -40,6 +41,10 @@ public Authority(String authorityName) { this.name = authorityName; } + public Authority(RoleAuthority role) { + this.name = role.authority(); + } + public String getName() { return name; } diff --git a/src/main/java/org/radarbase/management/domain/Role.java b/src/main/java/org/radarbase/management/domain/Role.java index a3acb2ce4..98923079f 100644 --- a/src/main/java/org/radarbase/management/domain/Role.java +++ b/src/main/java/org/radarbase/management/domain/Role.java @@ -17,6 +17,7 @@ import org.hibernate.annotations.CacheConcurrencyStrategy; import org.hibernate.envers.Audited; import org.hibernate.envers.RelationTargetAuditMode; +import org.radarbase.auth.authorization.RoleAuthority; import org.radarbase.management.domain.support.AbstractEntityListener; import javax.persistence.Entity; @@ -121,6 +122,10 @@ public Authority getAuthority() { return authority; } + public RoleAuthority getRole() { + return RoleAuthority.valueOfAuthorityOrNull(authority.getName()); + } + public Role authority(Authority authority) { this.authority = authority; return this; diff --git a/src/main/java/org/radarbase/management/domain/Subject.java b/src/main/java/org/radarbase/management/domain/Subject.java index 9ce9825cd..946fd727d 100644 --- a/src/main/java/org/radarbase/management/domain/Subject.java +++ b/src/main/java/org/radarbase/management/domain/Subject.java @@ -39,7 +39,7 @@ import java.util.Optional; import java.util.Set; -import static org.radarbase.auth.authorization.AuthoritiesConstants.PARTICIPANT; +import static org.radarbase.auth.authorization.RoleAuthority.PARTICIPANT; /** * A Subject. @@ -234,7 +234,7 @@ public String getPersonName() { */ public Optional getActiveProject() { return this.getUser().getRoles().stream() - .filter(r -> r.getAuthority().getName().equals(PARTICIPANT)) + .filter(r -> r.getAuthority().getName().equals(PARTICIPANT.authority())) .findFirst() .map(Role::getProject); } diff --git a/src/main/java/org/radarbase/management/repository/AuthorityRepository.java b/src/main/java/org/radarbase/management/repository/AuthorityRepository.java index 9a5ec67c8..577516ae6 100644 --- a/src/main/java/org/radarbase/management/repository/AuthorityRepository.java +++ b/src/main/java/org/radarbase/management/repository/AuthorityRepository.java @@ -18,5 +18,4 @@ public interface AuthorityRepository extends JpaRepository, @Query("select authority from Authority authority where authority.name = :authorityName") Optional findByAuthorityName(@Param("authorityName") String authorityName); - } diff --git a/src/main/java/org/radarbase/management/repository/ProjectRepository.java b/src/main/java/org/radarbase/management/repository/ProjectRepository.java index 8f6ad8c58..1078a9c89 100644 --- a/src/main/java/org/radarbase/management/repository/ProjectRepository.java +++ b/src/main/java/org/radarbase/management/repository/ProjectRepository.java @@ -25,6 +25,15 @@ public interface ProjectRepository extends JpaRepository, countQuery = "select distinct count(project) from Project project") Page findAllWithEagerRelationships(Pageable pageable); + @Query(value = "select distinct project from Project project " + + "left join fetch project.sourceTypes " + + "WHERE project.projectName in (:projectNames) ", + countQuery = "select distinct count(project) from Project project " + + "WHERE project.projectName in (:projectNames) ") + Page findAllWithEagerRelationshipsInProjects( + Pageable pageable, + @Param("projectNames") List projectNames); + @Query("select project from Project project " + "left join fetch project.sourceTypes s " + "left join fetch project.groups " diff --git a/src/main/java/org/radarbase/management/repository/filters/UserFilter.java b/src/main/java/org/radarbase/management/repository/filters/UserFilter.java index 4234e4591..3ddc50ef5 100644 --- a/src/main/java/org/radarbase/management/repository/filters/UserFilter.java +++ b/src/main/java/org/radarbase/management/repository/filters/UserFilter.java @@ -1,5 +1,6 @@ package org.radarbase.management.repository.filters; +import org.radarbase.auth.authorization.RoleAuthority; import org.radarbase.management.domain.Authority; import org.radarbase.management.domain.Role; import org.radarbase.management.domain.User; @@ -12,8 +13,8 @@ import javax.persistence.criteria.Predicate; import javax.persistence.criteria.Root; -import static org.radarbase.auth.authorization.AuthoritiesConstants.INACTIVE_PARTICIPANT; -import static org.radarbase.auth.authorization.AuthoritiesConstants.PARTICIPANT; +import java.util.stream.Collectors; +import java.util.stream.Stream; public class UserFilter implements Specification { private String login; @@ -25,22 +26,44 @@ public class UserFilter implements Specification { public Predicate toPredicate(Root root, @Nonnull CriteriaQuery query, @Nonnull CriteriaBuilder builder) { PredicateBuilder predicates = new PredicateBuilder(builder); - Join roleJoin = root.join("roles"); - Join authorityJoin = roleJoin.join("authority"); - predicates.add(builder.not(authorityJoin.get("name") - .in(PARTICIPANT, INACTIVE_PARTICIPANT))); - predicates.likeLower(root.get("login"), login); predicates.likeLower(root.get("email"), email); - predicates.likeLower(authorityJoin.get("name"), authority); - predicates.likeLower( - () -> roleJoin.join("project").get("projectName"), projectName); + filterRoles(predicates, root.join("roles")); query.distinct(true); return predicates.toAndPredicate(); } + private void filterRoles(PredicateBuilder predicates, Join roleJoin) { + RoleAuthority.Scope scope = determineScope(predicates, roleJoin); + + Join authorityJoin = roleJoin.join("authority"); + if (predicates.isValidValue(authority)) { + predicates.likeLower(authorityJoin.get("name"), authority); + } else { + predicates.add(authorityJoin.get("name") + .in(Stream.of(RoleAuthority.values()) + .filter(scope == null + ? r -> !r.isPersonal() + : r -> r.scope() == scope && !r.isPersonal()) + .map(RoleAuthority::authority) + .collect(Collectors.toList()))); + } + } + + private RoleAuthority.Scope determineScope( + PredicateBuilder predicates, + Join roleJoin) { + if (predicates.isValidValue(projectName)) { + predicates.likeLower( + () -> roleJoin.join("project").get("projectName"), projectName); + return RoleAuthority.Scope.PROJECT; + } else { + return null; + } + } + public String getLogin() { return login; } diff --git a/src/main/java/org/radarbase/management/security/SessionRadarToken.java b/src/main/java/org/radarbase/management/security/SessionRadarToken.java index 98ff88530..e460fa8b5 100644 --- a/src/main/java/org/radarbase/management/security/SessionRadarToken.java +++ b/src/main/java/org/radarbase/management/security/SessionRadarToken.java @@ -10,16 +10,16 @@ package org.radarbase.management.security; import org.radarbase.auth.token.AbstractRadarToken; +import org.radarbase.auth.token.AuthorityReference; import org.radarbase.auth.token.RadarToken; import java.io.Serializable; import java.util.Date; import java.util.List; -import java.util.Map; -import java.util.stream.Collectors; +import java.util.Set; public class SessionRadarToken extends AbstractRadarToken implements Serializable { - private final Map> roles; + private final Set roles; private final String subject; private final String token; private final List scopes; @@ -36,11 +36,7 @@ public class SessionRadarToken extends AbstractRadarToken implements Serializabl /** Instantiate a serializable session token by copying an existing RadarToken. */ public SessionRadarToken(RadarToken token) { - this.roles = token.getRoles().entrySet().stream() - .collect(Collectors.toMap( - Map.Entry::getKey, e -> e.getValue().stream() - .map(String::toString) - .collect(Collectors.toList()))); + this.roles = Set.copyOf(token.getRoles()); this.subject = token.getSubject(); this.token = token.getToken(); this.scopes = List.copyOf(token.getScopes()); @@ -57,7 +53,7 @@ public SessionRadarToken(RadarToken token) { } @Override - public Map> getRoles() { + public Set getRoles() { return roles; } diff --git a/src/main/java/org/radarbase/management/service/ProjectService.java b/src/main/java/org/radarbase/management/service/ProjectService.java index 138e7f3d4..c49d7c6ec 100644 --- a/src/main/java/org/radarbase/management/service/ProjectService.java +++ b/src/main/java/org/radarbase/management/service/ProjectService.java @@ -1,8 +1,7 @@ package org.radarbase.management.service; - -import static org.radarbase.management.web.rest.errors.EntityName.PROJECT; - +import org.radarbase.auth.authorization.RoleAuthority; +import org.radarbase.auth.token.RadarToken; import org.radarbase.management.domain.Project; import org.radarbase.management.domain.SourceType; import org.radarbase.management.repository.ProjectRepository; @@ -10,8 +9,8 @@ import org.radarbase.management.service.dto.SourceTypeDTO; import org.radarbase.management.service.mapper.ProjectMapper; import org.radarbase.management.service.mapper.SourceTypeMapper; -import org.radarbase.management.web.rest.errors.NotFoundException; import org.radarbase.management.web.rest.errors.ErrorConstants; +import org.radarbase.management.web.rest.errors.NotFoundException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -22,6 +21,10 @@ import java.util.Collections; import java.util.List; +import java.util.stream.Collectors; + +import static org.radarbase.auth.authorization.Permission.PROJECT_READ; +import static org.radarbase.management.web.rest.errors.EntityName.PROJECT; /** * Service Implementation for managing Project. @@ -41,6 +44,9 @@ public class ProjectService { @Autowired private SourceTypeMapper sourceTypeMapper; + @Autowired + private RadarToken token; + /** * Save a project. @@ -62,7 +68,19 @@ public ProjectDTO save(ProjectDTO projectDto) { */ @Transactional(readOnly = true) public Page findAll(Boolean fetchMinimal, Pageable pageable) { - Page projects = projectRepository.findAllWithEagerRelationships(pageable); + Page projects; + + if (token.hasGlobalAuthorityForPermission(PROJECT_READ)) { + projects = projectRepository.findAllWithEagerRelationships(pageable); + } else { + List projectNames = token.getReferentsWithPermission( + RoleAuthority.Scope.PROJECT, PROJECT_READ) + .collect(Collectors.toList()); + + projects = projectRepository.findAllWithEagerRelationshipsInProjects( + pageable, projectNames); + } + if (!fetchMinimal) { return projects.map(projectMapper::projectToProjectDTOReduced); } else { diff --git a/src/main/java/org/radarbase/management/service/RoleService.java b/src/main/java/org/radarbase/management/service/RoleService.java index 88d707695..d33c8231f 100644 --- a/src/main/java/org/radarbase/management/service/RoleService.java +++ b/src/main/java/org/radarbase/management/service/RoleService.java @@ -5,9 +5,8 @@ import java.util.List; import java.util.Optional; import java.util.stream.Collectors; -import org.radarbase.auth.authorization.AuthoritiesConstants; +import org.radarbase.auth.authorization.RoleAuthority; import org.radarbase.management.domain.Authority; -import org.radarbase.management.domain.Role; import org.radarbase.management.domain.User; import org.radarbase.management.repository.RoleRepository; import org.radarbase.management.service.dto.RoleDTO; @@ -44,7 +43,7 @@ public class RoleService { */ public RoleDTO save(RoleDTO roleDto) { log.debug("Request to save Role : {}", roleDto); - Role role = roleMapper.roleDTOToRole(roleDto); + org.radarbase.management.domain.Role role = roleMapper.roleDTOToRole(roleDto); role = roleRepository.save(role); return roleMapper.roleToRoleDTO(role); } @@ -67,15 +66,15 @@ public List findAll() { } List currentUserAuthorities = currentUser.getAuthorities().stream() .map(Authority::getName).collect(Collectors.toList()); - if (currentUserAuthorities.contains(AuthoritiesConstants.SYS_ADMIN)) { + if (currentUserAuthorities.contains(RoleAuthority.SYS_ADMIN)) { log.debug("Request to get all Roles"); return roleRepository.findAll().stream() .map(roleMapper::roleToRoleDTO) .collect(Collectors.toList()); - } else if (currentUserAuthorities.contains(AuthoritiesConstants.PROJECT_ADMIN)) { + } else if (currentUserAuthorities.contains(RoleAuthority.PROJECT_ADMIN)) { log.debug("Request to get project admin's project Projects"); return currentUser.getRoles().stream() - .filter(role -> AuthoritiesConstants.PROJECT_ADMIN + .filter(role -> RoleAuthority.PROJECT_ADMIN .equals(role.getAuthority().getName())) .map(r -> r.getProject().getProjectName()) .distinct() @@ -97,7 +96,7 @@ public List findSuperAdminRoles() { log.debug("Request to get admin Roles"); return roleRepository - .findRolesByAuthorityName(AuthoritiesConstants.SYS_ADMIN).stream() + .findRolesByAuthorityName(RoleAuthority.SYS_ADMIN.authority()).stream() .map(roleMapper::roleToRoleDTO) .collect(Collectors.toCollection(LinkedList::new)); } @@ -111,7 +110,7 @@ public List findSuperAdminRoles() { @Transactional(readOnly = true) public RoleDTO findOne(Long id) { log.debug("Request to get Role : {}", id); - Role role = roleRepository.findById(id).get(); + org.radarbase.management.domain.Role role = roleRepository.findById(id).get(); return roleMapper.roleToRoleDTO(role); } diff --git a/src/main/java/org/radarbase/management/service/SubjectService.java b/src/main/java/org/radarbase/management/service/SubjectService.java index 1c6311106..810c01f5d 100644 --- a/src/main/java/org/radarbase/management/service/SubjectService.java +++ b/src/main/java/org/radarbase/management/service/SubjectService.java @@ -1,7 +1,7 @@ package org.radarbase.management.service; -import static org.radarbase.auth.authorization.AuthoritiesConstants.INACTIVE_PARTICIPANT; -import static org.radarbase.auth.authorization.AuthoritiesConstants.PARTICIPANT; +import static org.radarbase.auth.authorization.RoleAuthority.INACTIVE_PARTICIPANT; +import static org.radarbase.auth.authorization.RoleAuthority.PARTICIPANT; import static org.radarbase.management.service.dto.ProjectDTO.PRIVACY_POLICY_URL; import static org.radarbase.management.web.rest.errors.EntityName.GROUP; import static org.radarbase.management.web.rest.errors.EntityName.OAUTH_CLIENT; @@ -20,16 +20,19 @@ import java.util.HashSet; import java.util.List; import java.util.Map; -import java.util.NoSuchElementException; import java.util.Optional; import java.util.Set; import java.util.function.Function; import java.util.function.Predicate; import java.util.stream.Collectors; +import java.util.stream.Stream; import javax.annotation.Nonnull; + import org.hibernate.envers.query.AuditEntity; +import org.radarbase.auth.authorization.RoleAuthority; import org.radarbase.management.config.ManagementPortalProperties; +import org.radarbase.management.domain.Authority; import org.radarbase.management.domain.Group; import org.radarbase.management.domain.Project; import org.radarbase.management.domain.Role; @@ -81,9 +84,6 @@ public class SubjectService { @Autowired private SubjectRepository subjectRepository; - @Autowired - private AuthorityRepository authorityRepository; - @Autowired private SourceRepository sourceRepository; @@ -105,6 +105,9 @@ public class SubjectService { @Autowired private PasswordService passwordService; + @Autowired + private AuthorityRepository authorityRepository; + /** * Create a new subject. * @@ -163,12 +166,18 @@ private Group getSubjectGroup(Project project, String groupName) { * @return relevant Participant role * @throws java.util.NoSuchElementException if the authority name is not in the database */ - private Role getProjectParticipantRole(Project project, String authority) { - return roleRepository.findOneByProjectIdAndAuthorityName(project.getId(), authority) + private Role getProjectParticipantRole(Project project, RoleAuthority authority) { + return roleRepository.findOneByProjectIdAndAuthorityName(project.getId(), + authority.authority()) .orElseGet(() -> { Role subjectRole = new Role(); - subjectRole.setAuthority(authorityRepository.findByAuthorityName(authority) - .orElseThrow(NoSuchElementException::new)); + Authority auth = authorityRepository.findByAuthorityName(authority.authority()) + .orElseGet(() -> { + var a = new Authority(authority); + authorityRepository.save(a); + return a; + }); + subjectRole.setAuthority(auth); subjectRole.setProject(project); roleRepository.save(subjectRole); return subjectRole; @@ -208,19 +217,29 @@ public SubjectDTO updateSubject(SubjectDTO newSubjectDto) { } private Set updateParticipantRoles(Subject subject, SubjectDTO subjectDto) { - Set managedRoles = subject.getUser().getRoles().stream() - // make participant inactive in projects that do not match the new project - .map(role -> PARTICIPANT.equals(role.getAuthority().getName()) + if (subjectDto.getProject() == null || subjectDto.getProject().getProjectName() == null) { + return subject.getUser().getRoles(); + } + + Stream existingRoles = subject.getUser().getRoles().stream() + .map(role -> { + // make participant inactive in projects that do not match the new project + if (role.getAuthority().getName().equals(PARTICIPANT.authority()) && !role.getProject().getProjectName().equals( - subjectDto.getProject().getProjectName()) - ? getProjectParticipantRole(role.getProject(), INACTIVE_PARTICIPANT) - : role) + subjectDto.getProject().getProjectName())) { + return getProjectParticipantRole(role.getProject(), INACTIVE_PARTICIPANT); + } else { + // do not modify other roles. + return role; + } + }); + + // Ensure that given project is present + Stream newProjectRole = Stream.of(getProjectParticipantRole( + projectMapper.projectDTOToProject(subjectDto.getProject()), PARTICIPANT)); + + return Stream.concat(existingRoles, newProjectRole) .collect(Collectors.toSet()); - // add participant role for current project, if the project did not change, then the set - // will not change since the role being added here already exists in the set - managedRoles.add(getProjectParticipantRole(projectMapper.projectDTOToProject(subjectDto - .getProject()), PARTICIPANT)); - return managedRoles; } /** diff --git a/src/main/java/org/radarbase/management/service/UserService.java b/src/main/java/org/radarbase/management/service/UserService.java index 788425a26..b199d001f 100644 --- a/src/main/java/org/radarbase/management/service/UserService.java +++ b/src/main/java/org/radarbase/management/service/UserService.java @@ -1,9 +1,7 @@ package org.radarbase.management.service; -import org.radarbase.auth.authorization.AuthoritiesConstants; import org.radarbase.auth.config.Constants; import org.radarbase.management.config.ManagementPortalProperties; -import org.radarbase.management.domain.Project; import org.radarbase.management.domain.Role; import org.radarbase.management.domain.User; import org.radarbase.management.repository.AuthorityRepository; @@ -12,10 +10,8 @@ import org.radarbase.management.repository.UserRepository; import org.radarbase.management.repository.filters.UserFilter; import org.radarbase.management.security.SecurityUtils; -import org.radarbase.management.service.dto.ProjectDTO; import org.radarbase.management.service.dto.RoleDTO; import org.radarbase.management.service.dto.UserDTO; -import org.radarbase.management.service.mapper.ProjectMapper; import org.radarbase.management.service.mapper.UserMapper; import org.radarbase.management.web.rest.errors.ConflictException; import org.radarbase.management.web.rest.errors.ErrorConstants; @@ -40,10 +36,9 @@ import java.util.Objects; import java.util.Optional; import java.util.Set; -import java.util.stream.Collectors; -import static org.radarbase.auth.authorization.AuthoritiesConstants.INACTIVE_PARTICIPANT; -import static org.radarbase.auth.authorization.AuthoritiesConstants.PARTICIPANT; +import static org.radarbase.auth.authorization.RoleAuthority.INACTIVE_PARTICIPANT; +import static org.radarbase.auth.authorization.RoleAuthority.PARTICIPANT; import static org.radarbase.management.web.rest.errors.EntityName.USER; import static org.radarbase.management.web.rest.errors.ErrorConstants.ERR_EMAIL_EXISTS; import static org.radarbase.management.web.rest.errors.ErrorConstants.ERR_ENTITY_NOT_FOUND; @@ -69,9 +64,6 @@ public class UserService { @Autowired private RoleRepository roleRepository; - @Autowired - private ProjectMapper projectMapper; - @Autowired private UserMapper userMapper; @@ -198,8 +190,9 @@ private Set getUserRoles(UserDTO userDto) { Set roles = new HashSet<>(); for (RoleDTO roleDto : userDto.getRoles()) { Optional role = roleRepository.findOneByProjectIdAndAuthorityName( - roleDto.getProjectId(), roleDto.getAuthorityName()); - if (!role.isPresent() || role.get().getId() == null) { + roleDto.getProjectId(), roleDto.getAuthorityName()) + .filter(r -> r.getId() != null); + if (role.isEmpty()) { Role currentRole = new Role(); // supplied authorityname can be anything, so check if we actually have one currentRole.setAuthority( @@ -335,32 +328,6 @@ public Optional getUserWithAuthoritiesByLogin(String login) { return userRepository.findOneWithRolesByLogin(login).map(userMapper::userToUserDTO); } - /** - * Get the projects a given user has any role in. - * @param login the login of the user - * @return the list of projects - */ - @Transactional(readOnly = true) - public List getProjectsAssignedToUser(String login) { - User userByLogin = userRepository.findOneWithRolesByLogin(login) - .orElseThrow(() -> new NotFoundException("User with login " + login + " not found.", - USER, ERR_ENTITY_NOT_FOUND)); - - List projectsOfUser; - - if (userByLogin.getRoles().stream() - .anyMatch(r -> AuthoritiesConstants.SYS_ADMIN.equals(r.getAuthority().getName()))) { - projectsOfUser = projectRepository.findAll(); - } else { - projectsOfUser = userByLogin.getRoles().stream() - .map(Role::getProject) - .distinct() - .collect(Collectors.toList()); - } - - return projectMapper.projectsToProjectDTOs(projectsOfUser); - } - /** * Get the current user. * @return the currently authenticated user, or null if no user is currently authenticated @@ -382,8 +349,10 @@ public void removeNotActivatedUsers() { log.info("Scheduled scan for expired user accounts starting now"); ZonedDateTime cutoff = ZonedDateTime.now().minus(Period.ofDays(3)); - userRepository.findAllByActivatedAndAuthoritiesNot(false, - Arrays.asList(PARTICIPANT, INACTIVE_PARTICIPANT)).stream() + List authorities = Arrays.asList( + PARTICIPANT.authority(), INACTIVE_PARTICIPANT.authority()); + + userRepository.findAllByActivatedAndAuthoritiesNot(false, authorities).stream() .filter(user -> revisionService.getAuditInfo(user).getCreatedAt().isBefore(cutoff)) .forEach(user -> { try { diff --git a/src/main/java/org/radarbase/management/service/dto/RoleDTO.java b/src/main/java/org/radarbase/management/service/dto/RoleDTO.java index 2c161e2d6..f223e8b80 100644 --- a/src/main/java/org/radarbase/management/service/dto/RoleDTO.java +++ b/src/main/java/org/radarbase/management/service/dto/RoleDTO.java @@ -1,5 +1,7 @@ package org.radarbase.management.service.dto; +import java.util.Objects; + /** * Created by nivethika on 23-5-17. */ @@ -44,4 +46,34 @@ public String getProjectName() { public void setProjectName(String projectName) { this.projectName = projectName; } + + @Override + public String toString() { + return "RoleDTO{" + "id=" + id + + ", projectId=" + projectId + + ", authorityName='" + authorityName + '\'' + + '}'; + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + + RoleDTO roleDto = (RoleDTO) o; + + return Objects.equals(id, roleDto.id) + && Objects.equals(projectId, roleDto.projectId) + && Objects.equals(projectName, roleDto.projectName) + && Objects.equals(authorityName, roleDto.authorityName); + } + + @Override + public int hashCode() { + return id != null ? id.hashCode() : 0; + } } diff --git a/src/main/java/org/radarbase/management/service/mapper/decorator/RoleMapperDecorator.java b/src/main/java/org/radarbase/management/service/mapper/decorator/RoleMapperDecorator.java index 190af3e40..0c7b8c481 100644 --- a/src/main/java/org/radarbase/management/service/mapper/decorator/RoleMapperDecorator.java +++ b/src/main/java/org/radarbase/management/service/mapper/decorator/RoleMapperDecorator.java @@ -26,7 +26,6 @@ public abstract class RoleMapperDecorator implements RoleMapper { */ @Override public Role roleDTOToRole(RoleDTO roleDto) { - if (roleDto == null) { return null; } @@ -34,7 +33,7 @@ public Role roleDTOToRole(RoleDTO roleDto) { Role role = delegate.roleDTOToRole(roleDto); if (role.getAuthority() == null) { - role.setAuthority(authorityRepository.getOne(roleDto.getAuthorityName())); + role.setAuthority(authorityRepository.getById(roleDto.getAuthorityName())); } return role; diff --git a/src/main/java/org/radarbase/management/web/rest/AuthorityResource.java b/src/main/java/org/radarbase/management/web/rest/AuthorityResource.java index 5a0394973..8d68f0754 100644 --- a/src/main/java/org/radarbase/management/web/rest/AuthorityResource.java +++ b/src/main/java/org/radarbase/management/web/rest/AuthorityResource.java @@ -4,9 +4,12 @@ import static org.radarbase.auth.authorization.RadarAuthorization.checkPermission; import io.micrometer.core.annotation.Timed; -import java.util.Arrays; + import java.util.List; -import org.radarbase.auth.authorization.AuthoritiesConstants; +import java.util.stream.Collectors; +import java.util.stream.Stream; + +import org.radarbase.auth.authorization.RoleAuthority; import org.radarbase.auth.exception.NotAuthorizedException; import org.radarbase.auth.token.RadarToken; import org.slf4j.Logger; @@ -37,8 +40,12 @@ public class AuthorityResource { public List getAllAuthorities() throws NotAuthorizedException { log.debug("REST request to get all Authorities"); checkPermission(token, AUTHORITY_READ); - return Arrays.asList(AuthoritiesConstants.PROJECT_ADMIN, AuthoritiesConstants.PROJECT_OWNER, - AuthoritiesConstants.PROJECT_AFFILIATE, AuthoritiesConstants.PROJECT_ANALYST); + return Stream.of( + RoleAuthority.ORGANIZATION_ADMIN, + RoleAuthority.PROJECT_ADMIN, RoleAuthority.PROJECT_OWNER, + RoleAuthority.PROJECT_AFFILIATE, RoleAuthority.PROJECT_ANALYST) + .map(RoleAuthority::authority) + .collect(Collectors.toList()); } } diff --git a/src/main/java/org/radarbase/management/web/rest/LogsResource.java b/src/main/java/org/radarbase/management/web/rest/LogsResource.java index ee19911fb..8c94ea56f 100644 --- a/src/main/java/org/radarbase/management/web/rest/LogsResource.java +++ b/src/main/java/org/radarbase/management/web/rest/LogsResource.java @@ -5,7 +5,7 @@ import io.micrometer.core.annotation.Timed; import java.util.List; import java.util.stream.Collectors; -import org.radarbase.auth.authorization.AuthoritiesConstants; +import org.radarbase.auth.authorization.RoleAuthority; import org.radarbase.management.web.rest.vm.LoggerVM; import org.slf4j.LoggerFactory; import org.springframework.http.HttpStatus; @@ -30,7 +30,7 @@ public class LogsResource { */ @GetMapping("/logs") @Timed - @Secured({AuthoritiesConstants.SYS_ADMIN}) + @Secured({RoleAuthority.SYS_ADMIN_AUTHORITY}) public List getList() { LoggerContext context = (LoggerContext) LoggerFactory.getILoggerFactory(); return context.getLoggerList() @@ -46,7 +46,7 @@ public List getList() { @PutMapping("/logs") @ResponseStatus(HttpStatus.NO_CONTENT) @Timed - @Secured({AuthoritiesConstants.SYS_ADMIN}) + @Secured({RoleAuthority.SYS_ADMIN_AUTHORITY}) public void changeLevel(@RequestBody LoggerVM jsonLogger) { LoggerContext context = (LoggerContext) LoggerFactory.getILoggerFactory(); context.getLogger(jsonLogger.getName()).setLevel(Level.valueOf(jsonLogger.getLevel())); diff --git a/src/main/java/org/radarbase/management/web/rest/ProjectResource.java b/src/main/java/org/radarbase/management/web/rest/ProjectResource.java index 9393c715f..6dede5a3c 100644 --- a/src/main/java/org/radarbase/management/web/rest/ProjectResource.java +++ b/src/main/java/org/radarbase/management/web/rest/ProjectResource.java @@ -47,7 +47,7 @@ import java.util.List; import java.util.Objects; -import static org.radarbase.auth.authorization.AuthoritiesConstants.PARTICIPANT; +import static org.radarbase.auth.authorization.RoleAuthority.PARTICIPANT; import static org.radarbase.auth.authorization.Permission.PROJECT_CREATE; import static org.radarbase.auth.authorization.Permission.PROJECT_DELETE; import static org.radarbase.auth.authorization.Permission.PROJECT_READ; diff --git a/src/main/java/org/radarbase/management/web/rest/RevisionResource.java b/src/main/java/org/radarbase/management/web/rest/RevisionResource.java index a4953f282..2c7312f3b 100644 --- a/src/main/java/org/radarbase/management/web/rest/RevisionResource.java +++ b/src/main/java/org/radarbase/management/web/rest/RevisionResource.java @@ -1,7 +1,7 @@ package org.radarbase.management.web.rest; import io.micrometer.core.annotation.Timed; -import org.radarbase.auth.authorization.AuthoritiesConstants; +import org.radarbase.auth.authorization.RoleAuthority; import org.radarbase.management.service.RevisionService; import org.radarbase.management.service.dto.RevisionInfoDTO; import org.radarbase.management.web.rest.util.PaginationUtil; @@ -38,7 +38,7 @@ public class RevisionResource { */ @GetMapping("/revisions") @Timed - @Secured({AuthoritiesConstants.SYS_ADMIN}) + @Secured({RoleAuthority.SYS_ADMIN_AUTHORITY}) public ResponseEntity> getRevisions( @PageableDefault(page = 0, size = Integer.MAX_VALUE) Pageable pageable) { log.debug("REST request to get page of revisions"); @@ -55,7 +55,7 @@ public ResponseEntity> getRevisions( */ @GetMapping("/revisions/{id}") @Timed - @Secured({AuthoritiesConstants.SYS_ADMIN}) + @Secured({RoleAuthority.SYS_ADMIN_AUTHORITY}) public ResponseEntity getRevision(@PathVariable("id") Integer id) { log.debug("REST request to get single revision: {}", id.toString()); return ResponseEntity.ok(revisionService.getRevision(id)); diff --git a/src/main/java/org/radarbase/management/web/rest/RoleResource.java b/src/main/java/org/radarbase/management/web/rest/RoleResource.java index f8aef611e..5e45ad48e 100644 --- a/src/main/java/org/radarbase/management/web/rest/RoleResource.java +++ b/src/main/java/org/radarbase/management/web/rest/RoleResource.java @@ -1,7 +1,7 @@ package org.radarbase.management.web.rest; import io.micrometer.core.annotation.Timed; -import org.radarbase.auth.authorization.AuthoritiesConstants; +import org.radarbase.auth.authorization.RoleAuthority; import org.radarbase.auth.config.Constants; import org.radarbase.auth.exception.NotAuthorizedException; import org.radarbase.auth.token.RadarToken; @@ -59,7 +59,7 @@ public class RoleResource { */ @PostMapping("/roles") @Timed - @Secured({AuthoritiesConstants.SYS_ADMIN}) + @Secured({RoleAuthority.SYS_ADMIN_AUTHORITY}) public ResponseEntity createRole(@Valid @RequestBody RoleDTO roleDto) throws URISyntaxException, NotAuthorizedException { log.debug("REST request to save Role : {}", roleDto); @@ -85,7 +85,7 @@ public ResponseEntity createRole(@Valid @RequestBody RoleDTO roleDto) */ @PutMapping("/roles") @Timed - @Secured({AuthoritiesConstants.SYS_ADMIN}) + @Secured({RoleAuthority.SYS_ADMIN_AUTHORITY}) public ResponseEntity updateRole(@Valid @RequestBody RoleDTO roleDto) throws URISyntaxException, NotAuthorizedException { log.debug("REST request to update Role : {}", roleDto); @@ -106,7 +106,7 @@ public ResponseEntity updateRole(@Valid @RequestBody RoleDTO roleDto) */ @GetMapping("/roles") @Timed - @Secured({AuthoritiesConstants.SYS_ADMIN}) + @Secured({RoleAuthority.SYS_ADMIN_AUTHORITY}) public List getAllRoles() { log.debug("REST request to get all Roles"); return roleService.findAll(); @@ -119,7 +119,7 @@ public List getAllRoles() { */ @GetMapping("/roles/admin") @Timed - @Secured({AuthoritiesConstants.SYS_ADMIN}) + @Secured({RoleAuthority.SYS_ADMIN_AUTHORITY}) public List getAllAdminRoles() { log.debug("REST request to get all Admin Roles"); return roleService.findSuperAdminRoles(); diff --git a/src/main/java/org/radarbase/management/web/rest/SourceDataResource.java b/src/main/java/org/radarbase/management/web/rest/SourceDataResource.java index 3d04168a5..40ac7d7fd 100644 --- a/src/main/java/org/radarbase/management/web/rest/SourceDataResource.java +++ b/src/main/java/org/radarbase/management/web/rest/SourceDataResource.java @@ -35,7 +35,7 @@ import java.util.List; import java.util.Optional; -import static org.radarbase.auth.authorization.AuthoritiesConstants.SYS_ADMIN; +import static org.radarbase.auth.authorization.RoleAuthority.SYS_ADMIN; import static org.radarbase.auth.authorization.Permission.SOURCEDATA_CREATE; import static org.radarbase.auth.authorization.Permission.SOURCEDATA_DELETE; import static org.radarbase.auth.authorization.Permission.SOURCEDATA_READ; diff --git a/src/main/java/org/radarbase/management/web/rest/SourceResource.java b/src/main/java/org/radarbase/management/web/rest/SourceResource.java index 4ef0cdc81..5785d06c6 100644 --- a/src/main/java/org/radarbase/management/web/rest/SourceResource.java +++ b/src/main/java/org/radarbase/management/web/rest/SourceResource.java @@ -38,7 +38,7 @@ import java.util.Optional; import java.util.stream.Collectors; -import static org.radarbase.auth.authorization.AuthoritiesConstants.SYS_ADMIN; +import static org.radarbase.auth.authorization.RoleAuthority.SYS_ADMIN; import static org.radarbase.auth.authorization.Permission.SOURCE_CREATE; import static org.radarbase.auth.authorization.Permission.SOURCE_DELETE; import static org.radarbase.auth.authorization.Permission.SOURCE_READ; diff --git a/src/main/java/org/radarbase/management/web/rest/SubjectResource.java b/src/main/java/org/radarbase/management/web/rest/SubjectResource.java index c2d99e683..ecf63d749 100644 --- a/src/main/java/org/radarbase/management/web/rest/SubjectResource.java +++ b/src/main/java/org/radarbase/management/web/rest/SubjectResource.java @@ -1,7 +1,7 @@ package org.radarbase.management.web.rest; import static tech.jhipster.web.util.ResponseUtil.wrapOrNotFound; -import static org.radarbase.auth.authorization.AuthoritiesConstants.PARTICIPANT; +import static org.radarbase.auth.authorization.RoleAuthority.PARTICIPANT; import static org.radarbase.auth.authorization.Permission.SUBJECT_CREATE; import static org.radarbase.auth.authorization.Permission.SUBJECT_DELETE; import static org.radarbase.auth.authorization.Permission.SUBJECT_READ; @@ -252,7 +252,7 @@ public ResponseEntity> getAllSubjects( // if not specified do not include inactive patients List authoritiesToInclude = subjectCriteria.getAuthority().stream() .filter(Objects::nonNull) - .map(Enum::toString) + .map(Enum::name) .collect(Collectors.toList()); if (projectName != null && externalId != null) { @@ -448,8 +448,8 @@ public ResponseEntity assignSources(@PathVariable Strin SUBJECT, ERR_SOURCE_TYPE_NOT_PROVIDED) ); - checkPermissionOnSubject(token, SUBJECT_UPDATE, currentProject - .getProjectName(), sub.getUser().getLogin()); + checkPermissionOnSubject(token, SUBJECT_UPDATE, currentProject.getProjectName(), + sub.getUser().getLogin()); // check if any of id, sourceID, sourceName were non-null boolean existing = Stream.of(sourceDto.getId(), sourceDto.getSourceName(), @@ -534,8 +534,7 @@ public ResponseEntity> getSubjectSources( @Timed public ResponseEntity updateSubjectSource(@PathVariable String login, @PathVariable String sourceName, @RequestBody Map attributes) - throws NotFoundException, NotAuthorizedException, - URISyntaxException { + throws NotFoundException, NotAuthorizedException { // check the subject id Subject subject = subjectRepository.findOneWithEagerBySubjectLogin(login) .orElseThrow(() -> new NotFoundException("Subject ID not found", diff --git a/src/main/java/org/radarbase/management/web/rest/UserResource.java b/src/main/java/org/radarbase/management/web/rest/UserResource.java index 72b1aa13f..26bbab9e6 100644 --- a/src/main/java/org/radarbase/management/web/rest/UserResource.java +++ b/src/main/java/org/radarbase/management/web/rest/UserResource.java @@ -13,7 +13,6 @@ import org.radarbase.management.service.MailService; import org.radarbase.management.service.ResourceUriService; import org.radarbase.management.service.UserService; -import org.radarbase.management.service.dto.ProjectDTO; import org.radarbase.management.service.dto.UserDTO; import org.radarbase.management.web.rest.errors.InvalidRequestException; import org.radarbase.management.web.rest.util.HeaderUtil; @@ -42,14 +41,13 @@ import java.util.Locale; import java.util.Optional; -import static org.radarbase.auth.authorization.AuthoritiesConstants.SYS_ADMIN; -import static org.radarbase.auth.authorization.Permission.PROJECT_READ; import static org.radarbase.auth.authorization.Permission.USER_CREATE; import static org.radarbase.auth.authorization.Permission.USER_DELETE; import static org.radarbase.auth.authorization.Permission.USER_READ; import static org.radarbase.auth.authorization.Permission.USER_UPDATE; import static org.radarbase.auth.authorization.RadarAuthorization.checkAuthorityAndPermission; import static org.radarbase.auth.authorization.RadarAuthorization.checkPermission; +import static org.radarbase.auth.authorization.RoleAuthority.SYS_ADMIN; import static org.radarbase.management.web.rest.errors.EntityName.USER; /** @@ -243,20 +241,6 @@ public ResponseEntity getUser(@PathVariable String login) userService.getUserWithAuthoritiesByLogin(login)); } - /** - * Returns all project if the user is s `SYS_ADMIN`. Otherwise projects that are assigned to a - * user using roles. - */ - @GetMapping("/users/{login:" + Constants.ENTITY_ID_REGEX + "}/projects") - @Timed - public List getUserProjects(@PathVariable String login) - throws NotAuthorizedException { - log.debug("REST request to get User's project : {}", login); - checkPermission(token, USER_READ); - checkPermission(token, PROJECT_READ); - return userService.getProjectsAssignedToUser(login); - } - /** * DELETE /users/:login : delete the "login" User. * diff --git a/src/main/webapp/app/shared/group/group-delete-dialog.component.ts b/src/main/webapp/app/shared/group/group-delete-dialog.component.ts index 2d6bbfb2c..516ae23ef 100644 --- a/src/main/webapp/app/shared/group/group-delete-dialog.component.ts +++ b/src/main/webapp/app/shared/group/group-delete-dialog.component.ts @@ -27,7 +27,7 @@ export class GroupDeleteDialogComponent { } confirmDelete() { - this.groupService.delete(this.group.projectName, this.group.name).subscribe( + this.groupService.delete(this.group.projectName, this.group.name, true).subscribe( () => { this.eventManager.broadcast({name: 'groupListModification', content: null}); this.activeModal.dismiss(true); diff --git a/src/main/webapp/app/shared/group/group.component.html b/src/main/webapp/app/shared/group/group.component.html index 091960bb4..40b0c84a9 100644 --- a/src/main/webapp/app/shared/group/group.component.html +++ b/src/main/webapp/app/shared/group/group.component.html @@ -44,8 +44,7 @@ diff --git a/src/main/webapp/app/shared/group/group.component.ts b/src/main/webapp/app/shared/group/group.component.ts index 393a3c147..415f0741c 100644 --- a/src/main/webapp/app/shared/group/group.component.ts +++ b/src/main/webapp/app/shared/group/group.component.ts @@ -13,6 +13,7 @@ import { BehaviorSubject, Subscription } from 'rxjs'; import {Group, GroupService, Project} from '..'; import { AlertService } from '../util/alert.service'; import { EventManager } from '../util/event-manager.service'; +import {Router} from "@angular/router"; @Component({ selector: 'jhi-groups', @@ -33,6 +34,7 @@ export class GroupComponent implements OnInit, OnDestroy, OnChanges { private groupService: GroupService, private alertService: AlertService, private eventManager: EventManager, + private router: Router, ) { this.groups = []; } @@ -71,4 +73,16 @@ export class GroupComponent implements OnInit, OnDestroy, OnChanges { } } + deleteGroup(group: Group) { + this.groupService.delete(this.project.projectName, group.name).subscribe( + () => { + this.eventManager.broadcast({name: 'groupListModification', content: null}); + }, + (error) => { + if(error.status === 409){ + this.router.navigate(['/', { outlets: { popup: 'project-group/'+ this.project.projectName + '/' + group.id + '/delete'} }]) + } + } + ); + } } diff --git a/src/main/webapp/app/shared/group/group.service.ts b/src/main/webapp/app/shared/group/group.service.ts index 6263a5500..0b1d54db8 100644 --- a/src/main/webapp/app/shared/group/group.service.ts +++ b/src/main/webapp/app/shared/group/group.service.ts @@ -3,6 +3,7 @@ import { HttpClient } from '@angular/common/http'; import { Observable } from 'rxjs'; import { map } from "rxjs/operators"; import { Group } from "./group.model"; +import { createRequestOption } from "../model/request.utils"; @Injectable({ providedIn: 'root' }) export class GroupService { @@ -32,8 +33,10 @@ export class GroupService { return this.http.post(this.resourceUrl(projectName), copy); } - delete(projectName: string, groupName: string): Observable { - return this.http.delete(this.resourceUrl(projectName, groupName)); + delete(projectName: string, groupName: string, forceDelete?: boolean): Observable { + return this.http.delete(this.resourceUrl(projectName, groupName), { + params: createRequestOption({ unlinkSubjects: forceDelete }), + }); } addSubjectsToGroup( diff --git a/src/main/webapp/i18n/en/group.json b/src/main/webapp/i18n/en/group.json index 7bcc22dda..9091874a8 100644 --- a/src/main/webapp/i18n/en/group.json +++ b/src/main/webapp/i18n/en/group.json @@ -10,7 +10,7 @@ "updated": "A Group is updated with identifier {{ param }}", "deleted": "A Group is deleted with identifier {{ param }}", "delete": { - "question": "Are you sure you want to delete Group {{ id }}?" + "question": "This group has subjects, are you sure you want to delete Group {{ id }}?" }, "detail": { "title": "Group" diff --git a/src/main/webapp/i18n/nl/group.json b/src/main/webapp/i18n/nl/group.json index 70a88869d..df077c04d 100644 --- a/src/main/webapp/i18n/nl/group.json +++ b/src/main/webapp/i18n/nl/group.json @@ -10,7 +10,7 @@ "updated": "De groep {{ param }} is gewijzigd", "deleted": "De groep {{ param }} is verwijderd", "delete": { - "question": "Weet je zeker dat je groep {{ id }} wilt verwijderen?" + "question": "Deze groep heeft onderwerpen. Weet u zeker dat u groep {{ id }} wilt verwijderen?" }, "detail": { "title": "Groep" diff --git a/src/test/java/org/radarbase/management/config/MockConfiguration.java b/src/test/java/org/radarbase/management/config/MockConfiguration.java index 556099fcf..a8a1d82ed 100644 --- a/src/test/java/org/radarbase/management/config/MockConfiguration.java +++ b/src/test/java/org/radarbase/management/config/MockConfiguration.java @@ -9,18 +9,22 @@ package org.radarbase.management.config; +import org.radarbase.auth.authorization.Permission; +import org.radarbase.auth.token.AuthorityReference; import org.radarbase.auth.token.RadarToken; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Primary; +import java.util.Arrays; import java.util.List; +import java.util.Set; import static org.mockito.ArgumentMatchers.any; -import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import static org.radarbase.auth.authorization.AuthoritiesConstants.SYS_ADMIN; +import static org.radarbase.auth.authorization.RoleAuthority.SYS_ADMIN; +import static org.radarbase.auth.authorization.RoleAuthority.SYS_ADMIN_AUTHORITY; @Configuration public class MockConfiguration { @@ -29,13 +33,19 @@ public class MockConfiguration { public RadarToken radarTokenMock() { RadarToken token = mock(RadarToken.class); when(token.getSubject()).thenReturn("admin"); + when(token.getUsername()).thenReturn("admin"); when(token.hasAuthority(any())).thenAnswer(a -> a.getArgument(0).equals(SYS_ADMIN)); when(token.hasPermission(any())).thenReturn(true); + when(token.hasPermissionOnOrganization(any(), any())).thenReturn(true); + when(token.hasPermissionOnOrganizationAndProject(any(), any(), any())).thenReturn(true); when(token.hasPermissionOnProject(any(), any())).thenReturn(true); when(token.hasPermissionOnSubject(any(), any(), any())).thenReturn(true); when(token.hasPermissionOnSource(any(), any(), any(), any())).thenReturn(true); when(token.isClientCredentials()).thenReturn(false); - when(token.getAuthorities()).thenReturn(List.of(SYS_ADMIN)); + when(token.getAuthorities()).thenReturn(List.of(SYS_ADMIN_AUTHORITY)); + when(token.getRoles()).thenReturn(Set.of(new AuthorityReference(SYS_ADMIN))); + when(token.getScopes()).thenReturn(Arrays.asList(Permission.scopes())); + when(token.hasGlobalAuthorityForPermission(any())).thenReturn(true); return token; } } diff --git a/src/test/java/org/radarbase/management/service/UserServiceIntTest.java b/src/test/java/org/radarbase/management/service/UserServiceIntTest.java index dbe21f318..ed15a9088 100644 --- a/src/test/java/org/radarbase/management/service/UserServiceIntTest.java +++ b/src/test/java/org/radarbase/management/service/UserServiceIntTest.java @@ -1,6 +1,5 @@ package org.radarbase.management.service; -import javax.persistence.EntityManager; import org.hibernate.envers.AuditReader; import org.hibernate.envers.AuditReaderFactory; import org.hibernate.envers.query.AuditEntity; @@ -26,6 +25,7 @@ import org.springframework.test.util.ReflectionTestUtils; import org.springframework.transaction.annotation.Transactional; +import javax.persistence.EntityManager; import javax.persistence.EntityManagerFactory; import java.time.Period; import java.time.ZonedDateTime; @@ -35,7 +35,7 @@ import java.util.Optional; import static org.assertj.core.api.Assertions.assertThat; -import static org.radarbase.auth.authorization.AuthoritiesConstants.SYS_ADMIN; +import static org.radarbase.auth.authorization.RoleAuthority.SYS_ADMIN; import static org.radarbase.management.web.rest.TestUtil.commitTransactionAndStartNew; /** diff --git a/src/test/java/org/radarbase/management/web/rest/AccountResourceIntTest.java b/src/test/java/org/radarbase/management/web/rest/AccountResourceIntTest.java index 34d0aefd5..c581b9481 100644 --- a/src/test/java/org/radarbase/management/web/rest/AccountResourceIntTest.java +++ b/src/test/java/org/radarbase/management/web/rest/AccountResourceIntTest.java @@ -22,11 +22,10 @@ import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; -import org.radarbase.auth.authorization.AuthoritiesConstants; +import org.radarbase.auth.authorization.RoleAuthority; import org.radarbase.auth.token.RadarToken; import org.radarbase.management.ManagementPortalTestApp; import org.radarbase.management.domain.Authority; -import org.radarbase.management.domain.Role; import org.radarbase.management.domain.User; import org.radarbase.management.repository.UserRepository; import org.radarbase.management.security.RadarAuthentication; @@ -112,10 +111,10 @@ void testNonAuthenticatedUser() throws Exception { void testAuthenticatedUser() throws Exception { final RadarToken token = mock(RadarToken.class); - Set roles = new HashSet<>(); - Role role = new Role(); + Set roles = new HashSet<>(); + org.radarbase.management.domain.Role role = new org.radarbase.management.domain.Role(); Authority authority = new Authority(); - authority.setName(AuthoritiesConstants.SYS_ADMIN); + authority.setName(RoleAuthority.SYS_ADMIN.authority()); role.setAuthority(authority); roles.add(role); @@ -142,15 +141,16 @@ void testAuthenticatedUser() throws Exception { .andExpect(jsonPath("$.lastName").value("doe")) .andExpect(jsonPath("$.email").value("john.doe@jhipster.com")) .andExpect(jsonPath("$.langKey").value("en")) - .andExpect(jsonPath("$.authorities").value(AuthoritiesConstants.SYS_ADMIN)); + .andExpect(jsonPath("$.authorities").value( + RoleAuthority.SYS_ADMIN.authority())); } @Test void testGetExistingAccount() throws Exception { - Set roles = new HashSet<>(); - Role role = new Role(); + Set roles = new HashSet<>(); + org.radarbase.management.domain.Role role = new org.radarbase.management.domain.Role(); Authority authority = new Authority(); - authority.setName(AuthoritiesConstants.SYS_ADMIN); + authority.setName(RoleAuthority.SYS_ADMIN.authority()); role.setAuthority(authority); roles.add(role); @@ -172,7 +172,8 @@ void testGetExistingAccount() throws Exception { .andExpect(jsonPath("$.lastName").value("doe")) .andExpect(jsonPath("$.email").value("john.doe@jhipster.com")) .andExpect(jsonPath("$.langKey").value("en")) - .andExpect(jsonPath("$.authorities").value(AuthoritiesConstants.SYS_ADMIN)); + .andExpect(jsonPath("$.authorities").value( + RoleAuthority.SYS_ADMIN.authority())); } @Test @@ -189,7 +190,7 @@ void testGetUnknownAccount() throws Exception { void testSaveInvalidLogin() throws Exception { Set roles = new HashSet<>(); RoleDTO role = new RoleDTO(); - role.setAuthorityName(AuthoritiesConstants.PARTICIPANT); + role.setAuthorityName(RoleAuthority.PARTICIPANT.authority()); roles.add(role); UserDTO invalidUser = new UserDTO(); diff --git a/src/test/java/org/radarbase/management/web/rest/GroupResourceIntTest.java b/src/test/java/org/radarbase/management/web/rest/GroupResourceIntTest.java index 7087202c5..31ea0a7e3 100644 --- a/src/test/java/org/radarbase/management/web/rest/GroupResourceIntTest.java +++ b/src/test/java/org/radarbase/management/web/rest/GroupResourceIntTest.java @@ -19,7 +19,6 @@ import org.radarbase.management.service.GroupService; import org.radarbase.management.service.SubjectService; import org.radarbase.management.service.dto.GroupDTO; -import org.radarbase.management.service.dto.ProjectDTO; import org.radarbase.management.service.dto.SubjectDTO; import org.radarbase.management.service.mapper.GroupMapper; import org.radarbase.management.service.mapper.ProjectMapper; @@ -101,7 +100,7 @@ class GroupResourceIntTest { @Autowired private RadarToken token; - private MockMvc restProjectMockMvc; + private MockMvc restGroupMockMvc; private Group group; @@ -110,14 +109,14 @@ class GroupResourceIntTest { @BeforeEach public void setUp() throws ServletException { MockitoAnnotations.initMocks(this); - GroupResource projectResource = new GroupResource(); - ReflectionTestUtils.setField(projectResource, "groupService", groupService); - ReflectionTestUtils.setField(projectResource, "token", token); + var groupResource = new GroupResource(); + ReflectionTestUtils.setField(groupResource, "groupService", groupService); + ReflectionTestUtils.setField(groupResource, "token", token); JwtAuthenticationFilter filter = OAuthHelper.createAuthenticationFilter(); filter.init(new MockFilterConfig()); - this.restProjectMockMvc = MockMvcBuilders.standaloneSetup(projectResource) + this.restGroupMockMvc = MockMvcBuilders.standaloneSetup(groupResource) .setCustomArgumentResolvers(pageableArgumentResolver) .setControllerAdvice(exceptionTranslator) .setMessageConverters(jacksonMessageConverter) @@ -152,13 +151,13 @@ private Group createEntity() { @Test void createGroup() throws Exception { // Create the Group - GroupDTO groupDto = groupMapper.groupToGroupDTO(group); - restProjectMockMvc.perform(post("/api/projects/{projectName}/groups", + var groupDto = groupMapper.groupToGroupDTO(group); + restGroupMockMvc.perform(post("/api/projects/{projectName}/groups", project.getProjectName()) .contentType(TestUtil.APPLICATION_JSON_UTF8) .content(TestUtil.convertObjectToJsonBytes(groupDto))) .andExpect(status().isCreated()); - + var savedGroup = groupRepository.findByProjectNameAndName( project.getProjectName(), groupDto.getName()).get(); @@ -173,8 +172,8 @@ void createGroupNonExistingProject() throws Exception { projectRepository.delete(project); // Create the Group - GroupDTO groupDto = groupMapper.groupToGroupDTO(group); - restProjectMockMvc.perform(post("/api/projects/{projectName}/groups", + var groupDto = groupMapper.groupToGroupDTO(group); + restGroupMockMvc.perform(post("/api/projects/{projectName}/groups", project.getProjectName()) .contentType(TestUtil.APPLICATION_JSON_UTF8) .content(TestUtil.convertObjectToJsonBytes(groupDto))) @@ -184,14 +183,14 @@ void createGroupNonExistingProject() throws Exception { @Test void createGroupWithExistingName() throws Exception { // Create the Group - GroupDTO groupDto = groupMapper.groupToGroupDTO(group); - restProjectMockMvc.perform(post("/api/projects/{projectName}/groups", + var groupDto = groupMapper.groupToGroupDTO(group); + restGroupMockMvc.perform(post("/api/projects/{projectName}/groups", project.getProjectName()) .contentType(TestUtil.APPLICATION_JSON_UTF8) .content(TestUtil.convertObjectToJsonBytes(groupDto))) .andExpect(status().isCreated()); - restProjectMockMvc.perform(post("/api/projects/{projectName}/groups", + restGroupMockMvc.perform(post("/api/projects/{projectName}/groups", project.getProjectName()) .contentType(TestUtil.APPLICATION_JSON_UTF8) .content(TestUtil.convertObjectToJsonBytes(groupDto))) @@ -210,15 +209,15 @@ void createGroupWithExistingNameInDifferentProject() throws Exception { group2.setProject(project2); // Create the Group - GroupDTO groupDto = groupMapper.groupToGroupDTO(group); - restProjectMockMvc.perform(post("/api/projects/{projectName}/groups", + var groupDto = groupMapper.groupToGroupDTO(group); + restGroupMockMvc.perform(post("/api/projects/{projectName}/groups", project.getProjectName()) .contentType(TestUtil.APPLICATION_JSON_UTF8) .content(TestUtil.convertObjectToJsonBytes(groupDto))) .andExpect(status().isCreated()); - GroupDTO group2Dto = groupMapper.groupToGroupDTO(group2); - restProjectMockMvc.perform(post("/api/projects/{projectName}/groups", + var group2Dto = groupMapper.groupToGroupDTO(group2); + restGroupMockMvc.perform(post("/api/projects/{projectName}/groups", project2.getProjectName()) .contentType(TestUtil.APPLICATION_JSON_UTF8) .content(TestUtil.convertObjectToJsonBytes(group2Dto))) @@ -247,7 +246,7 @@ void checkGroupNameIsRequired() throws Exception { // Create the Group GroupDTO groupDto = groupMapper.groupToGroupDTO(group); - restProjectMockMvc.perform(post("/api/projects/{projectName}/groups", + restGroupMockMvc.perform(post("/api/projects/{projectName}/groups", project.getProjectName()) .contentType(TestUtil.APPLICATION_JSON_UTF8) .content(TestUtil.convertObjectToJsonBytes(groupDto))) @@ -260,7 +259,7 @@ void getAllGroups() throws Exception { groupRepository.saveAndFlush(group); // Get all the groups - restProjectMockMvc.perform(get("/api/projects/{projectName}/groups", + restGroupMockMvc.perform(get("/api/projects/{projectName}/groups", project.getProjectName())) .andExpect(status().isOk()) .andExpect(content().contentType(MediaType.APPLICATION_JSON)) @@ -275,7 +274,7 @@ void getGroup() throws Exception { groupRepository.saveAndFlush(group); // Get the Group - restProjectMockMvc.perform(get("/api/projects/{projectName}/groups/{groupName}", + restGroupMockMvc.perform(get("/api/projects/{projectName}/groups/{groupName}", project.getProjectName(), group.getName())) .andExpect(status().isOk()) .andExpect(content().contentType(MediaType.APPLICATION_JSON)) @@ -285,8 +284,8 @@ void getGroup() throws Exception { @Test void getNonExistingGroup() throws Exception { - // Get the group - restProjectMockMvc.perform(get("/api/projects/{projectName}/groups/{groupName}", + // Get the Group + restGroupMockMvc.perform(get("/api/projects/{projectName}/groups/{groupName}", project.getProjectName(), group.getName())) .andExpect(status().isNotFound()); } @@ -296,8 +295,8 @@ void deleteGroup() throws Exception { // Initialize the database groupRepository.saveAndFlush(group); - // Delete the group - restProjectMockMvc.perform(delete( + // Get the Group + restGroupMockMvc.perform(delete( "/api/projects/{projectName}/groups/{groupName}", project.getProjectName(), group.getName()) .accept(TestUtil.APPLICATION_JSON_UTF8)) @@ -325,14 +324,14 @@ void deleteGroupWithSubjects() throws Exception { var savedSubject = subjectService.createSubject(subjectDto); // Try to delete the Group (and fail) - restProjectMockMvc.perform(delete( + restGroupMockMvc.perform(delete( "/api/projects/{projectName}/groups/{groupName}", project.getProjectName(), group.getName()) .accept(TestUtil.APPLICATION_JSON_UTF8)) .andExpect(status().isConflict()); // Delete the Group (and unlink the subjects) - restProjectMockMvc.perform(delete( + restGroupMockMvc.perform(delete( "/api/projects/{projectName}/groups/{groupName}", project.getProjectName(), group.getName()) .param("unlinkSubjects", "true") @@ -353,8 +352,8 @@ void deleteGroupNonExisting() throws Exception { // Initialize the database groupRepository.saveAndFlush(group); - // Delete the group - restProjectMockMvc.perform(delete( + // Get the Group + restGroupMockMvc.perform(delete( "/api/projects/{projectName}/groups/{groupName}", project.getProjectName(), group.getName() + "2") .accept(TestUtil.APPLICATION_JSON_UTF8)) @@ -370,8 +369,8 @@ void deleteGroupNonExistingProject() throws Exception { // Initialize the database groupRepository.saveAndFlush(group); - // Delete the group - restProjectMockMvc.perform(delete( + // Get the Group + restGroupMockMvc.perform(delete( "/api/projects/{projectName}/groups/{groupName}", project.getProjectName() + "2", group.getName()) .accept(TestUtil.APPLICATION_JSON_UTF8)) @@ -386,20 +385,20 @@ void addSubjectsToGroup() throws Exception { // Initialize the database groupRepository.saveAndFlush(group); - ProjectDTO projectDto = projectMapper.projectToProjectDTO(project); + var projectDto = projectMapper.projectToProjectDTO(project); - SubjectDTO sub1 = new SubjectDTO(); + var sub1 = new SubjectDTO(); sub1.setExternalLink("exLink1"); sub1.setExternalId("exId1"); sub1.setStatus(ACTIVATED); sub1.setProject(projectDto); - SubjectDTO sub2 = new SubjectDTO(); + var sub2 = new SubjectDTO(); sub2.setExternalLink("exLink2"); sub2.setExternalId("exId2"); sub2.setStatus(ACTIVATED); sub2.setProject(projectDto); - + var savedSub1 = subjectService.createSubject(sub1); var savedSub2 = subjectService.createSubject(sub2); @@ -418,11 +417,11 @@ void addSubjectsToGroup() throws Exception { List body = new ArrayList<>(); body.add(patchOp); - // Link the subjects to the group - restProjectMockMvc.perform(patch( + // Get the Group + restGroupMockMvc.perform(patch( "/api/projects/{projectName}/groups/{groupName}/subjects", project.getProjectName(), group.getName()) - + .contentType(TestUtil.APPLICATION_JSON_PATCH) .content(TestUtil.convertObjectToJsonBytes(body))) .andExpect(status().isNoContent()); @@ -433,7 +432,7 @@ void addSubjectsToGroup() throws Exception { assertThat(subjects).hasSize(2); assertThat(subjects).allSatisfy( s -> assertThat(s.getGroup().getId()).isEqualTo(group.getId())); - + subjectRepository.deleteAll(subjects); } } diff --git a/src/test/java/org/radarbase/management/web/rest/SubjectResourceIntTest.java b/src/test/java/org/radarbase/management/web/rest/SubjectResourceIntTest.java index c5f5c694f..62a2196f4 100644 --- a/src/test/java/org/radarbase/management/web/rest/SubjectResourceIntTest.java +++ b/src/test/java/org/radarbase/management/web/rest/SubjectResourceIntTest.java @@ -253,7 +253,6 @@ void updateSubjectWithNewProject() throws Exception { // Update the subject Subject updatedSubject = subjectRepository.findById(subjectDto.getId()).get(); - updatedSubject .externalLink(UPDATED_EXTERNAL_LINK) .externalId(UPDATED_ENTERNAL_ID) diff --git a/src/test/java/org/radarbase/management/web/rest/UserResourceIntTest.java b/src/test/java/org/radarbase/management/web/rest/UserResourceIntTest.java index 18359649b..ef58180c4 100644 --- a/src/test/java/org/radarbase/management/web/rest/UserResourceIntTest.java +++ b/src/test/java/org/radarbase/management/web/rest/UserResourceIntTest.java @@ -4,13 +4,13 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.MockitoAnnotations; -import org.radarbase.auth.authorization.AuthoritiesConstants; +import org.radarbase.auth.authorization.RoleAuthority; import org.radarbase.auth.token.RadarToken; import org.radarbase.management.ManagementPortalTestApp; import org.radarbase.management.config.ManagementPortalProperties; import org.radarbase.management.domain.Authority; -import org.radarbase.management.domain.Role; import org.radarbase.management.domain.User; +import org.radarbase.management.repository.ProjectRepository; import org.radarbase.management.repository.SubjectRepository; import org.radarbase.management.repository.UserRepository; import org.radarbase.management.security.JwtAuthenticationFilter; @@ -42,6 +42,7 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.hamcrest.Matchers.hasItem; +import static org.radarbase.auth.authorization.RoleAuthority.SYS_ADMIN_AUTHORITY; import static org.radarbase.management.service.UserServiceIntTest.DEFAULT_EMAIL; import static org.radarbase.management.service.UserServiceIntTest.DEFAULT_FIRSTNAME; import static org.radarbase.management.service.UserServiceIntTest.DEFAULT_LANGKEY; @@ -54,7 +55,7 @@ import static org.radarbase.management.service.UserServiceIntTest.UPDATED_LASTNAME; import static org.radarbase.management.service.UserServiceIntTest.UPDATED_LOGIN; import static org.radarbase.management.service.UserServiceIntTest.UPDATED_PASSWORD; -import static org.radarbase.auth.authorization.AuthoritiesConstants.SYS_ADMIN; +import static org.radarbase.auth.authorization.RoleAuthority.SYS_ADMIN; import static org.radarbase.management.service.UserServiceIntTest.createEntity; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.delete; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; @@ -104,6 +105,9 @@ class UserResourceIntTest { @Autowired private PasswordService passwordService; + @Autowired + private ProjectRepository projectRepository; + private MockMvc restUserMockMvc; private User user; @@ -145,7 +149,7 @@ void createUser() throws Exception { // Create the User Set roles = new HashSet<>(); RoleDTO role = new RoleDTO(); - role.setAuthorityName(SYS_ADMIN); + role.setAuthorityName(SYS_ADMIN_AUTHORITY); roles.add(role); ManagedUserVM managedUserVm = createDefaultUser(roles); @@ -173,7 +177,7 @@ void createUserWithExistingId() throws Exception { Set roles = new HashSet<>(); RoleDTO role = new RoleDTO(); - role.setAuthorityName(AuthoritiesConstants.PARTICIPANT); + role.setAuthorityName(RoleAuthority.PARTICIPANT.authority()); roles.add(role); ManagedUserVM managedUserVm = createDefaultUser(roles); @@ -199,7 +203,7 @@ void createUserWithExistingLogin() throws Exception { Set roles = new HashSet<>(); RoleDTO role = new RoleDTO(); - role.setAuthorityName(AuthoritiesConstants.PARTICIPANT); + role.setAuthorityName(RoleAuthority.PARTICIPANT.authority()); roles.add(role); ManagedUserVM managedUserVm = createDefaultUser(roles); managedUserVm.setEmail("anothermail@localhost"); @@ -224,7 +228,7 @@ void createUserWithExistingEmail() throws Exception { Set roles = new HashSet<>(); RoleDTO role = new RoleDTO(); - role.setAuthorityName(AuthoritiesConstants.PARTICIPANT); + role.setAuthorityName(RoleAuthority.PARTICIPANT.authority()); roles.add(role); ManagedUserVM managedUserVm = createDefaultUser(roles); managedUserVm.setLogin("anotherlogin"); @@ -244,7 +248,7 @@ void createUserWithExistingEmail() throws Exception { @Transactional void getAllUsers() throws Exception { // Initialize the database - Role adminRole = new Role(); + org.radarbase.management.domain.Role adminRole = new org.radarbase.management.domain.Role(); adminRole.setId(1L); adminRole.setAuthority(new Authority(SYS_ADMIN)); adminRole.setProject(null); @@ -302,14 +306,12 @@ void updateUser() throws Exception { // Initialize the database userRepository.saveAndFlush(user); final int databaseSizeBeforeUpdate = userRepository.findAll().size(); + var project = ProjectResourceIntTest.createEntity(); + projectRepository.save(project); // Update the user - User updatedUser = userRepository.findById(user.getId()).get(); - - Set roles = new HashSet<>(); - RoleDTO role = new RoleDTO(); - role.setAuthorityName(AuthoritiesConstants.PARTICIPANT); - roles.add(role); + User updatedUser = userRepository.findById(user.getId()) + .orElseThrow(() -> new AssertionError("Cannot find user " + user.getId())); ManagedUserVM managedUserVm = new ManagedUserVM(); managedUserVm.setId(updatedUser.getId()); @@ -320,7 +322,11 @@ void updateUser() throws Exception { managedUserVm.setEmail(UPDATED_EMAIL); managedUserVm.setActivated(updatedUser.getActivated()); managedUserVm.setLangKey(UPDATED_LANGKEY); - managedUserVm.setRoles(roles); + + RoleDTO role = new RoleDTO(); + role.setProjectId(project.getId()); + role.setAuthorityName(RoleAuthority.PARTICIPANT.authority()); + managedUserVm.setRoles(Set.of(role)); restUserMockMvc.perform(put("/api/users") .contentType(TestUtil.APPLICATION_JSON_UTF8) @@ -342,15 +348,14 @@ void updateUser() throws Exception { void updateUserLogin() throws Exception { // Initialize the database userRepository.saveAndFlush(user); + var project = ProjectResourceIntTest.createEntity(); + projectRepository.save(project); + final int databaseSizeBeforeUpdate = userRepository.findAll().size(); // Update the user - User updatedUser = userRepository.findById(user.getId()).get(); - - Set roles = new HashSet<>(); - RoleDTO role = new RoleDTO(); - role.setAuthorityName(AuthoritiesConstants.PARTICIPANT); - roles.add(role); + User updatedUser = userRepository.findById(user.getId()) + .orElseThrow(() -> new AssertionError("Cannot find user " + user.getId())); ManagedUserVM managedUserVm = new ManagedUserVM(); managedUserVm.setId(updatedUser.getId()); @@ -361,7 +366,11 @@ void updateUserLogin() throws Exception { managedUserVm.setEmail(UPDATED_EMAIL); managedUserVm.setActivated(updatedUser.getActivated()); managedUserVm.setLangKey(UPDATED_LANGKEY); - managedUserVm.setRoles(roles); + + RoleDTO role = new RoleDTO(); + role.setProjectId(project.getId()); + role.setAuthorityName(RoleAuthority.PARTICIPANT.authority()); + managedUserVm.setRoles(Set.of(role)); restUserMockMvc.perform(put("/api/users") .contentType(TestUtil.APPLICATION_JSON_UTF8) @@ -384,6 +393,8 @@ void updateUserLogin() throws Exception { void updateUserExistingEmail() throws Exception { // Initialize the database with 2 users userRepository.saveAndFlush(user); + var project = ProjectResourceIntTest.createEntity(); + projectRepository.save(project); User anotherUser = new User(); anotherUser.setLogin("jhipster"); @@ -396,11 +407,8 @@ void updateUserExistingEmail() throws Exception { userRepository.saveAndFlush(anotherUser); // Update the user - User updatedUser = userRepository.findById(user.getId()).get(); - Set roles = new HashSet<>(); - RoleDTO role = new RoleDTO(); - role.setAuthorityName(AuthoritiesConstants.PARTICIPANT); - roles.add(role); + User updatedUser = userRepository.findById(user.getId()) + .orElseThrow(() -> new AssertionError("Cannot find user " + user.getId())); ManagedUserVM managedUserVm = new ManagedUserVM(); managedUserVm.setId(updatedUser.getId()); @@ -411,7 +419,11 @@ void updateUserExistingEmail() throws Exception { managedUserVm.setEmail("jhipster@localhost"); managedUserVm.setActivated(updatedUser.getActivated()); managedUserVm.setLangKey(updatedUser.getLangKey()); - managedUserVm.setRoles(roles); + + RoleDTO role = new RoleDTO(); + role.setProjectId(project.getId()); + role.setAuthorityName(RoleAuthority.PARTICIPANT.authority()); + managedUserVm.setRoles(Set.of(role)); restUserMockMvc.perform(put("/api/users") .contentType(TestUtil.APPLICATION_JSON_UTF8) @@ -424,6 +436,8 @@ void updateUserExistingEmail() throws Exception { void updateUserExistingLogin() throws Exception { // Initialize the database userRepository.saveAndFlush(user); + var project = ProjectResourceIntTest.createEntity(); + projectRepository.save(project); User anotherUser = new User(); anotherUser.setLogin("jhipster"); @@ -436,12 +450,8 @@ void updateUserExistingLogin() throws Exception { userRepository.saveAndFlush(anotherUser); // Update the user - User updatedUser = userRepository.findById(user.getId()).get(); - - Set roles = new HashSet<>(); - RoleDTO role = new RoleDTO(); - role.setAuthorityName(AuthoritiesConstants.PARTICIPANT); - roles.add(role); + User updatedUser = userRepository.findById(user.getId()) + .orElseThrow(() -> new AssertionError("Cannot find user " + user.getId())); ManagedUserVM managedUserVm = new ManagedUserVM(); managedUserVm.setId(updatedUser.getId()); @@ -452,7 +462,11 @@ void updateUserExistingLogin() throws Exception { managedUserVm.setEmail(updatedUser.getEmail()); managedUserVm.setActivated(updatedUser.getActivated()); managedUserVm.setLangKey(updatedUser.getLangKey()); - managedUserVm.setRoles(roles); + + RoleDTO role = new RoleDTO(); + role.setProjectId(project.getId()); + role.setAuthorityName(RoleAuthority.PARTICIPANT.authority()); + managedUserVm.setRoles(Set.of(role)); restUserMockMvc.perform(put("/api/users") .contentType(TestUtil.APPLICATION_JSON_UTF8) @@ -479,7 +493,7 @@ void deleteUser() throws Exception { @Test @Transactional - void equalsVerifier() throws Exception { + void equalsVerifier() { User userA = new User(); userA.setLogin("AAA"); User userB = new User(); diff --git a/src/test/javascript/e2e/cypress/integration/entities/subject.spec.ts b/src/test/javascript/e2e/cypress/integration/entities/subject.spec.ts index 7e043c334..e4289d110 100644 --- a/src/test/javascript/e2e/cypress/integration/entities/subject.spec.ts +++ b/src/test/javascript/e2e/cypress/integration/entities/subject.spec.ts @@ -149,7 +149,6 @@ describe('Subject e2e test', () => { it('should be able to delete a group', () => { cy.contains('jhi-project-detail ul.nav-tabs .nav-item', 'Groups').click(); cy.contains('jhi-groups .group-row', 'Test Group C').contains('button', 'Delete').click(); - cy.contains('jhi-group-delete-dialog button', 'Delete').click(); cy.get('jhi-groups .group-row').should('have.length', 2); }); From 3af4f0a19ec83c99f67c47e794b21bec4ba5ed24 Mon Sep 17 00:00:00 2001 From: Joris Borgdorff Date: Mon, 29 Nov 2021 15:42:19 +0100 Subject: [PATCH 236/431] Remove unused user projects fetch --- src/main/webapp/app/shared/user/user.service.ts | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/main/webapp/app/shared/user/user.service.ts b/src/main/webapp/app/shared/user/user.service.ts index 048eeb5eb..8b42a58ff 100644 --- a/src/main/webapp/app/shared/user/user.service.ts +++ b/src/main/webapp/app/shared/user/user.service.ts @@ -25,10 +25,6 @@ export class UserService { return this.http.get(`${this.resourceUrl}/${encodeURIComponent(login)}`); } - findProject(login: string): Observable { - return this.http.get(`${this.resourceUrl}/${encodeURIComponent(login)}/projects`); - } - query(req?: any): Observable> { const params = createRequestOption(req); return this.http.get(this.resourceUrl, {params, observe: 'response'}); From d085ce5a7b5488d12b9637cf1a2a9d180355949b Mon Sep 17 00:00:00 2001 From: Joris Borgdorff Date: Mon, 29 Nov 2021 15:48:50 +0100 Subject: [PATCH 237/431] Fixed some documentation strings --- .../java/org/radarbase/auth/token/RadarToken.java | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/radar-auth/src/main/java/org/radarbase/auth/token/RadarToken.java b/radar-auth/src/main/java/org/radarbase/auth/token/RadarToken.java index 985f2491c..6f4ac13a9 100644 --- a/radar-auth/src/main/java/org/radarbase/auth/token/RadarToken.java +++ b/radar-auth/src/main/java/org/radarbase/auth/token/RadarToken.java @@ -27,7 +27,7 @@ public interface RadarToken { Set getRoles(); /** - * Get the global roles defined in this token. + * Get the global roles (not organization or project-specific) defined in this token. * @return non-null map describing the roles defined in this token. The keys in the map are the * project names, and the values are lists of authority names associated to the project. */ @@ -43,7 +43,7 @@ default Set getGlobalRoles() { } /** - * Get the roles defined in this token. + * Get the project roles defined in this token. * @return non-null map describing the roles defined in this token. The keys in the map are the * project names, and the values are lists of authority names associated to the project. */ @@ -55,7 +55,7 @@ default Map> getProjectRoles() { } /** - * Get the roles defined in this token. + * Get the organization roles defined in this token. * @return non-null map describing the roles defined in this token. The keys in the map are the * project names, and the values are lists of authority names associated to the project. */ @@ -67,10 +67,11 @@ default Map> getOrganizationRoles() { } /** - * Get the referents in a given scope that matches a permission. + * Get the referents (i.e., organization or project name) in a given scope that matches a + * permission. * @param scope scope of the referents - * @param permission permission that should be available from - * @return referents names. + * @param permission permission that should be authorized within the scope + * @return referents names */ default Stream getReferentsWithPermission(RoleAuthority.Scope scope, Permission permission) { From cd1e6bb22ad63145bb7ce7da9405c1735a7c461b Mon Sep 17 00:00:00 2001 From: Joris Borgdorff Date: Mon, 29 Nov 2021 15:52:25 +0100 Subject: [PATCH 238/431] Remove unnecessary filter --- .../java/org/radarbase/management/service/UserService.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/radarbase/management/service/UserService.java b/src/main/java/org/radarbase/management/service/UserService.java index b199d001f..0e10fe301 100644 --- a/src/main/java/org/radarbase/management/service/UserService.java +++ b/src/main/java/org/radarbase/management/service/UserService.java @@ -190,8 +190,8 @@ private Set getUserRoles(UserDTO userDto) { Set roles = new HashSet<>(); for (RoleDTO roleDto : userDto.getRoles()) { Optional role = roleRepository.findOneByProjectIdAndAuthorityName( - roleDto.getProjectId(), roleDto.getAuthorityName()) - .filter(r -> r.getId() != null); + roleDto.getProjectId(), roleDto.getAuthorityName()); + if (role.isEmpty()) { Role currentRole = new Role(); // supplied authorityname can be anything, so check if we actually have one From 60d290437c1d1fabe952198edc24432be585fbbc Mon Sep 17 00:00:00 2001 From: aykl Date: Mon, 29 Nov 2021 16:02:16 +0100 Subject: [PATCH 239/431] User Service Int Test Initialization updated --- .../org/radarbase/management/service/UserServiceIntTest.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/test/java/org/radarbase/management/service/UserServiceIntTest.java b/src/test/java/org/radarbase/management/service/UserServiceIntTest.java index dbe21f318..01d966002 100644 --- a/src/test/java/org/radarbase/management/service/UserServiceIntTest.java +++ b/src/test/java/org/radarbase/management/service/UserServiceIntTest.java @@ -101,6 +101,9 @@ public void setUp() { ReflectionTestUtils.setField(revisionService, "entityManager", entityManager); ReflectionTestUtils.setField(userService, "userMapper", userMapper); ReflectionTestUtils.setField(userService, "userRepository", userRepository); + + userRepository.findOneByLogin(userDto.getLogin()) + .ifPresent(userRepository::delete); } /** From 1fcc21c6ee203718ea048c910518f421cbc1708b Mon Sep 17 00:00:00 2001 From: aykl Date: Mon, 29 Nov 2021 16:04:50 +0100 Subject: [PATCH 240/431] User Resource Int Test Initialization updated --- .../radarbase/management/web/rest/UserResourceIntTest.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/test/java/org/radarbase/management/web/rest/UserResourceIntTest.java b/src/test/java/org/radarbase/management/web/rest/UserResourceIntTest.java index 18359649b..fe703dc1c 100644 --- a/src/test/java/org/radarbase/management/web/rest/UserResourceIntTest.java +++ b/src/test/java/org/radarbase/management/web/rest/UserResourceIntTest.java @@ -135,6 +135,10 @@ public void setUp() throws ServletException { @BeforeEach public void initTest() { user = createEntity(passwordService); + userRepository.findOneByLogin(DEFAULT_LOGIN) + .ifPresent(userRepository::delete); + userRepository.findOneByLogin(UPDATED_LOGIN) + .ifPresent(userRepository::delete); } @Test From b71364532579487df94e389b2931d61f33f7023a Mon Sep 17 00:00:00 2001 From: aykl Date: Tue, 30 Nov 2021 09:12:53 +0100 Subject: [PATCH 241/431] Role Cleanup added in Tests --- .../management/web/rest/GroupResourceIntTest.java | 5 +---- .../management/web/rest/UserResourceIntTest.java | 10 ++++++++++ 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/src/test/java/org/radarbase/management/web/rest/GroupResourceIntTest.java b/src/test/java/org/radarbase/management/web/rest/GroupResourceIntTest.java index 7087202c5..377433824 100644 --- a/src/test/java/org/radarbase/management/web/rest/GroupResourceIntTest.java +++ b/src/test/java/org/radarbase/management/web/rest/GroupResourceIntTest.java @@ -132,10 +132,7 @@ public void setUp() throws ServletException { public void tearDown() { groupRepository.delete(group); var roles = roleRepository.findAllRolesByProjectName(project.getProjectName()); - for (var r : roles) { - r.setProject(null); - } - roleRepository.saveAll(roles); + roleRepository.deleteAll(roles); projectRepository.delete(project); } diff --git a/src/test/java/org/radarbase/management/web/rest/UserResourceIntTest.java b/src/test/java/org/radarbase/management/web/rest/UserResourceIntTest.java index fe703dc1c..e642b6513 100644 --- a/src/test/java/org/radarbase/management/web/rest/UserResourceIntTest.java +++ b/src/test/java/org/radarbase/management/web/rest/UserResourceIntTest.java @@ -11,6 +11,7 @@ import org.radarbase.management.domain.Authority; import org.radarbase.management.domain.Role; import org.radarbase.management.domain.User; +import org.radarbase.management.repository.RoleRepository; import org.radarbase.management.repository.SubjectRepository; import org.radarbase.management.repository.UserRepository; import org.radarbase.management.security.JwtAuthenticationFilter; @@ -39,6 +40,7 @@ import java.util.Collections; import java.util.List; import java.util.Set; +import java.util.stream.Collectors; import static org.assertj.core.api.Assertions.assertThat; import static org.hamcrest.Matchers.hasItem; @@ -77,6 +79,9 @@ class UserResourceIntTest { @Autowired private ManagementPortalProperties managementPortalProperties; + @Autowired + private RoleRepository roleRepository; + @Autowired private UserRepository userRepository; @@ -139,6 +144,11 @@ public void initTest() { .ifPresent(userRepository::delete); userRepository.findOneByLogin(UPDATED_LOGIN) .ifPresent(userRepository::delete); + var roles = roleRepository + .findRolesByAuthorityName(AuthoritiesConstants.PARTICIPANT) + .stream().filter(r -> r.getProject() == null) + .collect(Collectors.toList()); + roleRepository.deleteAll(roles); } @Test From afcbaa7803c1044d6f84487141f8156123b07adb Mon Sep 17 00:00:00 2001 From: aykl Date: Tue, 30 Nov 2021 15:31:46 +0100 Subject: [PATCH 242/431] OrganizationName Mapping implemented --- .../radarbase/management/domain/Project.java | 38 +++++++++---------- .../repository/ProjectRepository.java | 4 +- .../management/service/ProjectService.java | 15 -------- .../management/service/dto/ProjectDTO.java | 11 +++--- .../service/mapper/ProjectMapper.java | 8 +++- .../decorator/ProjectMapperDecorator.java | 20 ++++++++++ .../web/rest/errors/ErrorConstants.java | 2 - .../20211110160000_add_organization.xml | 6 ++- .../web/rest/OrganizationResourceIntTest.java | 2 +- .../web/rest/ProjectResourceIntTest.java | 12 +++--- 10 files changed, 64 insertions(+), 54 deletions(-) diff --git a/src/main/java/org/radarbase/management/domain/Project.java b/src/main/java/org/radarbase/management/domain/Project.java index 4c23a312b..afef9e016 100644 --- a/src/main/java/org/radarbase/management/domain/Project.java +++ b/src/main/java/org/radarbase/management/domain/Project.java @@ -27,6 +27,7 @@ import javax.persistence.JoinColumn; import javax.persistence.JoinTable; import javax.persistence.ManyToMany; +import javax.persistence.ManyToOne; import javax.persistence.MapKeyColumn; import javax.persistence.OneToMany; import javax.persistence.OrderBy; @@ -74,14 +75,11 @@ public class Project extends AbstractEntity implements Serializable { private String description; @Column(name = "jhi_organization") - private String organization; + private String organizationName; - // Ideally, this should be an organization Entity, - // but to avoid confusion with the existing organization field - // I'll keep it as an ID for now. - // TODO: sunset the old organization field - @Column(name = "organization_id") - private Long organizationId; + @ManyToOne(fetch = FetchType.EAGER) + @Cache(usage = CacheConcurrencyStrategy.NONSTRICT_READ_WRITE) + private Organization organization; @NotNull @Column(name = "location", nullable = false) @@ -156,12 +154,12 @@ public void setDescription(String description) { this.description = description; } - public String getOrganization() { - return organization; + public String getOrganizationName() { + return organizationName; } - public Project organization(String organization) { - this.organization = organization; + public Project organizationName(String organizationName) { + this.organizationName = organizationName; return this; } @@ -174,21 +172,21 @@ public void setRoles(Set roles) { this.roles = roles; } - public void setOrganization(String organization) { - this.organization = organization; + public void setOrganizationName(String organizationName) { + this.organizationName = organizationName; } - public Long getOrganizationId() { - return organizationId; + public Organization getOrganization() { + return organization; } - public Project organizationId(Long organizationId) { - this.organizationId = organizationId; + public Project organization(Organization organization) { + this.organization = organization; return this; } - public void setOrganizationId(Long organizationId) { - this.organizationId = organizationId; + public void setOrganization(Organization organization) { + this.organization = organization; } public String getLocation() { @@ -301,7 +299,7 @@ public String toString() { + "id=" + id + ", projectName='" + projectName + "'" + ", description='" + description + "'" - + ", organization='" + organization + "'" + + ", organization='" + organizationName + "'" + ", location='" + location + "'" + ", startDate='" + startDate + "'" + ", projectStatus='" + projectStatus + "'" diff --git a/src/main/java/org/radarbase/management/repository/ProjectRepository.java b/src/main/java/org/radarbase/management/repository/ProjectRepository.java index 95013fe8e..1c69028bc 100644 --- a/src/main/java/org/radarbase/management/repository/ProjectRepository.java +++ b/src/main/java/org/radarbase/management/repository/ProjectRepository.java @@ -26,9 +26,7 @@ public interface ProjectRepository extends JpaRepository, Page findAllWithEagerRelationships(Pageable pageable); @Query("select project from Project project " - + "WHERE project.organizationId IN " - + "(SELECT org.id from Organization org " - + " WHERE org.name = :organization_name)") + + "WHERE project.organization.name = :organization_name") List findAllByOrganizationName( @Param("organization_name") String organizationName); diff --git a/src/main/java/org/radarbase/management/service/ProjectService.java b/src/main/java/org/radarbase/management/service/ProjectService.java index 6cab08a6f..138e7f3d4 100644 --- a/src/main/java/org/radarbase/management/service/ProjectService.java +++ b/src/main/java/org/radarbase/management/service/ProjectService.java @@ -1,12 +1,10 @@ package org.radarbase.management.service; -import static org.radarbase.management.web.rest.errors.EntityName.ORGANIZATION; import static org.radarbase.management.web.rest.errors.EntityName.PROJECT; import org.radarbase.management.domain.Project; import org.radarbase.management.domain.SourceType; -import org.radarbase.management.repository.OrganizationRepository; import org.radarbase.management.repository.ProjectRepository; import org.radarbase.management.service.dto.ProjectDTO; import org.radarbase.management.service.dto.SourceTypeDTO; @@ -34,9 +32,6 @@ public class ProjectService { private static final Logger log = LoggerFactory.getLogger(ProjectService.class); - @Autowired - private OrganizationRepository organizationRepository; - @Autowired private ProjectRepository projectRepository; @@ -55,16 +50,6 @@ public class ProjectService { */ public ProjectDTO save(ProjectDTO projectDto) { log.debug("Request to save Project : {}", projectDto); - var orgId = projectDto.getOrganizationId(); - if (orgId != null) { - var org = organizationRepository.findById(orgId); - if (org.isEmpty()) { - throw new NotFoundException("Organization not found with id", - ORGANIZATION, - ErrorConstants.ERR_ORGANIZATION_ID_NOT_FOUND, - Collections.singletonMap("id", orgId.toString())); - } - } Project project = projectMapper.projectDTOToProject(projectDto); project = projectRepository.save(project); return projectMapper.projectToProjectDTO(project); diff --git a/src/main/java/org/radarbase/management/service/dto/ProjectDTO.java b/src/main/java/org/radarbase/management/service/dto/ProjectDTO.java index 971f1d784..1df875dc4 100644 --- a/src/main/java/org/radarbase/management/service/dto/ProjectDTO.java +++ b/src/main/java/org/radarbase/management/service/dto/ProjectDTO.java @@ -37,7 +37,7 @@ public class ProjectDTO implements Serializable { private String organization; - private Long organizationId; + private String organizationName; @NotNull private String location; @@ -90,12 +90,12 @@ public void setOrganization(String organization) { this.organization = organization; } - public Long getOrganizationId() { - return organizationId; + public String getOrganizationName() { + return organizationName; } - public void setOrganizationId(Long organizationId) { - this.organizationId = organizationId; + public void setOrganizationName(String organizationName) { + this.organizationName = organizationName; } public String getLocation() { @@ -199,6 +199,7 @@ public String toString() { + ", projectName='" + projectName + "'" + ", description='" + description + "'" + ", organization='" + organization + "'" + + ", organizationName='" + organizationName + "'" + ", location='" + location + "'" + ", startDate='" + startDate + "'" + ", projectStatus='" + projectStatus + "'" diff --git a/src/main/java/org/radarbase/management/service/mapper/ProjectMapper.java b/src/main/java/org/radarbase/management/service/mapper/ProjectMapper.java index 12c4a3a84..52f2bd52a 100644 --- a/src/main/java/org/radarbase/management/service/mapper/ProjectMapper.java +++ b/src/main/java/org/radarbase/management/service/mapper/ProjectMapper.java @@ -18,6 +18,8 @@ @DecoratedWith(ProjectMapperDecorator.class) public interface ProjectMapper { @Mapping(target = "humanReadableProjectName", ignore = true) + @Mapping(target = "organization", source = "organizationName") + @Mapping(target = "organizationName", source = "organization.name") @Mapping(target = "persistentTokenTimeout", ignore = true) @Mapping(target = "groups", qualifiedByName = "groupToGroupDTO") @Mapping(target = "sourceTypes", qualifiedByName = "sourceTypeToSourceTypeDTOReduced") @@ -25,6 +27,8 @@ public interface ProjectMapper { @Named(value = "projectReducedDTO") @Mapping(target = "humanReadableProjectName", ignore = true) + @Mapping(target = "organization", source = "organizationName") + @Mapping(target = "organizationName", source = "organization.name") @Mapping(target = "sourceTypes", ignore = true) @Mapping(target = "persistentTokenTimeout", ignore = true) @Mapping(target = "groups", qualifiedByName = "groupToGroupDTO") @@ -35,6 +39,8 @@ public interface ProjectMapper { @Mapping(target = "roles", ignore = true) @Mapping(target = "groups", ignore = true) + @Mapping(target = "organization", ignore = true) + @Mapping(target = "organizationName", source = "organization") Project projectDTOToProject(ProjectDTO projectDto); List projectDTOsToProjects(List projectDtos); @@ -45,8 +51,8 @@ public interface ProjectMapper { @Mapping(target = "description", ignore = true) @Mapping(target = "roles", ignore = true) + @Mapping(target = "organizationName", ignore = true) @Mapping(target = "organization", ignore = true) - @Mapping(target = "organizationId", ignore = true) @Mapping(target = "location", ignore = true) @Mapping(target = "startDate", ignore = true) @Mapping(target = "endDate", ignore = true) diff --git a/src/main/java/org/radarbase/management/service/mapper/decorator/ProjectMapperDecorator.java b/src/main/java/org/radarbase/management/service/mapper/decorator/ProjectMapperDecorator.java index 596a96002..35391c281 100644 --- a/src/main/java/org/radarbase/management/service/mapper/decorator/ProjectMapperDecorator.java +++ b/src/main/java/org/radarbase/management/service/mapper/decorator/ProjectMapperDecorator.java @@ -1,16 +1,22 @@ package org.radarbase.management.service.mapper.decorator; import org.radarbase.management.domain.Project; +import org.radarbase.management.repository.OrganizationRepository; import org.radarbase.management.repository.ProjectRepository; import org.radarbase.management.service.OAuthClientService; import org.radarbase.management.service.dto.MinimalProjectDetailsDTO; import org.radarbase.management.service.dto.ProjectDTO; import org.radarbase.management.service.mapper.ProjectMapper; import org.radarbase.management.web.rest.errors.BadRequestException; +import org.radarbase.management.web.rest.errors.ErrorConstants; +import org.radarbase.management.web.rest.errors.NotFoundException; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import static org.radarbase.management.service.dto.ProjectDTO.HUMAN_READABLE_PROJECT_NAME; +import static org.radarbase.management.web.rest.errors.EntityName.ORGANIZATION; + +import java.util.Collections; /** * Created by nivethika on 30-8-17. @@ -21,6 +27,9 @@ public abstract class ProjectMapperDecorator implements ProjectMapper { @Qualifier("delegate") private ProjectMapper delegate; + @Autowired + private OrganizationRepository organizationRepository; + @Autowired private ProjectRepository projectRepository; @@ -69,6 +78,17 @@ public Project projectDTOToProject(ProjectDTO projectDto) { if (projectName != null && !projectName.isEmpty()) { project.getAttributes().put(HUMAN_READABLE_PROJECT_NAME, projectName); } + + var orgName = projectDto.getOrganizationName(); + if (orgName != null) { + var org = organizationRepository.findOneByName(orgName).orElseThrow( + () -> new NotFoundException("Organization not found with name", + ORGANIZATION, + ErrorConstants.ERR_ORGANIZATION_NAME_NOT_FOUND, + Collections.singletonMap("name", orgName))); + project.setOrganization(org); + } + return project; } diff --git a/src/main/java/org/radarbase/management/web/rest/errors/ErrorConstants.java b/src/main/java/org/radarbase/management/web/rest/errors/ErrorConstants.java index dac6ee43d..3719b57d6 100644 --- a/src/main/java/org/radarbase/management/web/rest/errors/ErrorConstants.java +++ b/src/main/java/org/radarbase/management/web/rest/errors/ErrorConstants.java @@ -22,8 +22,6 @@ public final class ErrorConstants { public static final String ERR_GROUP_EXISTS = "error.groupExists"; public static final String ERR_INVALID_AUTHORITY = "error.invalidAuthority"; public static final String ERR_EMAIL_EXISTS = "error.emailexists"; - public static final String ERR_ORGANIZATION_ID_NOT_FOUND = "error" - + ".organizationIdNotFound"; public static final String ERR_ORGANIZATION_NAME_NOT_FOUND = "error" + ".organizationNameNotFound"; public static final String ERR_PROJECT_ID_NOT_FOUND = "error.projectIdNotFound"; diff --git a/src/main/resources/config/liquibase/changelog/20211110160000_add_organization.xml b/src/main/resources/config/liquibase/changelog/20211110160000_add_organization.xml index 599665c16..17448f90b 100644 --- a/src/main/resources/config/liquibase/changelog/20211110160000_add_organization.xml +++ b/src/main/resources/config/liquibase/changelog/20211110160000_add_organization.xml @@ -105,9 +105,13 @@ + + - + Date: Wed, 1 Dec 2021 10:59:43 +0100 Subject: [PATCH 243/431] OrganizationName Field added to Project Model --- src/main/webapp/app/shared/project/project.model.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/webapp/app/shared/project/project.model.ts b/src/main/webapp/app/shared/project/project.model.ts index 9bc65debd..3e1eb5ac8 100644 --- a/src/main/webapp/app/shared/project/project.model.ts +++ b/src/main/webapp/app/shared/project/project.model.ts @@ -11,7 +11,8 @@ export interface Project { id?: number; projectName?: string; description?: string; - organization?: string; + organization?: string; // Legacy field + organizationName?: string; location?: string; startDate?: any; projectStatus?: ProjectStatus; From 259dcb807ede1f5c344135b4f3faa02741c4151b Mon Sep 17 00:00:00 2001 From: aykl Date: Wed, 1 Dec 2021 12:59:16 +0100 Subject: [PATCH 244/431] Initial Org renamed to "Main organization" --- src/main/resources/config/liquibase/organization.csv | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/config/liquibase/organization.csv b/src/main/resources/config/liquibase/organization.csv index 1491d0342..6a06ef488 100644 --- a/src/main/resources/config/liquibase/organization.csv +++ b/src/main/resources/config/liquibase/organization.csv @@ -1,2 +1,2 @@ id;name;description;location -1;The Hyve;The Hyve B.V.;Utrecht +1;Main organization;The default organization;- From d2a5f48ce6f4245f3862e4dbd336c6757fd5bc0c Mon Sep 17 00:00:00 2001 From: aykl Date: Wed, 1 Dec 2021 13:00:50 +0100 Subject: [PATCH 245/431] Existing Projects assigned to Main Organization --- .../20211110160000_add_organization.xml | 74 ++++++++++++------- 1 file changed, 47 insertions(+), 27 deletions(-) diff --git a/src/main/resources/config/liquibase/changelog/20211110160000_add_organization.xml b/src/main/resources/config/liquibase/changelog/20211110160000_add_organization.xml index 17448f90b..e39228b14 100644 --- a/src/main/resources/config/liquibase/changelog/20211110160000_add_organization.xml +++ b/src/main/resources/config/liquibase/changelog/20211110160000_add_organization.xml @@ -42,13 +42,39 @@ - + + + + + + + + + + + + + + + + UPDATE project + SET organization_id = (SELECT id + FROM radar_organization + WHERE name = 'Main organization') + + + @@ -81,7 +107,20 @@ onUpdate="NO ACTION" referencedColumnNames="id" referencedTableName="_revisions_info"/> - + + + + + + + + + + + + INSERT into radar_organization_aud ( id, rev, revtype, @@ -98,31 +137,12 @@ name, true FROM radar_organization - - - - - - - - - - - - - - - - - - + + UPDATE project_aud + SET organization_id = (SELECT id + FROM radar_organization + WHERE name = 'Main organization') + From 15e637841c30713052896958d9afa6bd5207448a Mon Sep 17 00:00:00 2001 From: Joris Borgdorff Date: Wed, 1 Dec 2021 14:03:07 +0100 Subject: [PATCH 246/431] Fix merge issue --- .../org/radarbase/management/web/rest/UserResourceIntTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/java/org/radarbase/management/web/rest/UserResourceIntTest.java b/src/test/java/org/radarbase/management/web/rest/UserResourceIntTest.java index 5bd9f297f..672d12a78 100644 --- a/src/test/java/org/radarbase/management/web/rest/UserResourceIntTest.java +++ b/src/test/java/org/radarbase/management/web/rest/UserResourceIntTest.java @@ -149,7 +149,7 @@ public void initTest() { userRepository.findOneByLogin(UPDATED_LOGIN) .ifPresent(userRepository::delete); var roles = roleRepository - .findRolesByAuthorityName(AuthoritiesConstants.PARTICIPANT) + .findRolesByAuthorityName(RoleAuthority.PARTICIPANT.authority()) .stream().filter(r -> r.getProject() == null) .collect(Collectors.toList()); roleRepository.deleteAll(roles); From 6979a21294dbd228222b1a7144689ce17cd9d30d Mon Sep 17 00:00:00 2001 From: aykl Date: Thu, 25 Nov 2021 11:29:31 +0100 Subject: [PATCH 247/431] Queries modified to hide Deleted Sources --- .../repository/SourceRepository.java | 42 ++++++++++++++++--- 1 file changed, 36 insertions(+), 6 deletions(-) diff --git a/src/main/java/org/radarbase/management/repository/SourceRepository.java b/src/main/java/org/radarbase/management/repository/SourceRepository.java index a5ca8b140..67eeafb38 100644 --- a/src/main/java/org/radarbase/management/repository/SourceRepository.java +++ b/src/main/java/org/radarbase/management/repository/SourceRepository.java @@ -9,6 +9,7 @@ import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.RepositoryDefinition; import org.springframework.data.repository.history.RevisionRepository; import org.springframework.data.repository.query.Param; @@ -19,16 +20,45 @@ @RepositoryDefinition(domainClass = Source.class, idClass = Long.class) public interface SourceRepository extends JpaRepository, RevisionRepository { - @Where(clause = "deleted = false") + + @Query(value = "select source from Source source " + + "WHERE source.deleted = false", + countQuery = "select count(source) from Source source " + + "WHERE source.deleted = false") + Page findAll(Pageable pageable); + + @Query(value = "select source from Source source " + + "WHERE source.deleted = false " + + "AND source.project.id = :projectId", + countQuery = "select count(source) from Source source " + + "WHERE source.deleted = false " + + "AND source.project.id = :projectId") Page findAllSourcesByProjectId(Pageable pageable, @Param("projectId") Long projectId); - @Where(clause = "deleted = false") + @Query(value = "select source from Source source " + + "WHERE source.deleted = false " + + "AND source.project.id = :projectId " + + "AND source.assigned = :assigned", + countQuery = "select count(source) from Source source " + + "WHERE source.deleted = false " + + "AND source.project.id = :projectId " + + "AND source.assigned = :assigned") List findAllSourcesByProjectIdAndAssigned(@Param("projectId") Long projectId, @Param("assigned") Boolean assigned); - @Where(clause = "deleted = false") - Optional findOneBySourceId(UUID sourceId); + @Query(value = "select source from Source source " + + "WHERE source.deleted = false " + + "AND source.sourceId = :sourceId", + countQuery = "select count(source) from Source source " + + "WHERE source.deleted = false " + + "AND source.sourceId = :sourceId") + Optional findOneBySourceId(@Param("sourceId") UUID sourceId); - @Where(clause = "deleted = false") - Optional findOneBySourceName(String sourceName); + @Query(value = "select source from Source source " + + "WHERE source.deleted = false " + + "AND source.sourceName = :sourceName", + countQuery = "select count(source) from Source source " + + "WHERE source.deleted = false " + + "AND source.sourceName = :sourceName") + Optional findOneBySourceName(@Param("sourceName") String sourceName); } From 3f97135a90197ab477b6b172c664ca771f8d899f Mon Sep 17 00:00:00 2001 From: aykl Date: Mon, 29 Nov 2021 14:43:29 +0100 Subject: [PATCH 248/431] Gradle Check fix fow Source Repository --- .../org/radarbase/management/repository/SourceRepository.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/radarbase/management/repository/SourceRepository.java b/src/main/java/org/radarbase/management/repository/SourceRepository.java index 67eeafb38..f1327649e 100644 --- a/src/main/java/org/radarbase/management/repository/SourceRepository.java +++ b/src/main/java/org/radarbase/management/repository/SourceRepository.java @@ -4,7 +4,6 @@ import java.util.Optional; import java.util.UUID; -import org.hibernate.annotations.Where; import org.radarbase.management.domain.Source; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; @@ -21,6 +20,7 @@ public interface SourceRepository extends JpaRepository, RevisionRepository { + @Override @Query(value = "select source from Source source " + "WHERE source.deleted = false", countQuery = "select count(source) from Source source " From eab6cc425e4a4479f42e457e187e9add2fbc576a Mon Sep 17 00:00:00 2001 From: aykl Date: Mon, 29 Nov 2021 16:02:16 +0100 Subject: [PATCH 249/431] User Service Int Test Initialization updated --- .../org/radarbase/management/service/UserServiceIntTest.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/test/java/org/radarbase/management/service/UserServiceIntTest.java b/src/test/java/org/radarbase/management/service/UserServiceIntTest.java index dbe21f318..01d966002 100644 --- a/src/test/java/org/radarbase/management/service/UserServiceIntTest.java +++ b/src/test/java/org/radarbase/management/service/UserServiceIntTest.java @@ -101,6 +101,9 @@ public void setUp() { ReflectionTestUtils.setField(revisionService, "entityManager", entityManager); ReflectionTestUtils.setField(userService, "userMapper", userMapper); ReflectionTestUtils.setField(userService, "userRepository", userRepository); + + userRepository.findOneByLogin(userDto.getLogin()) + .ifPresent(userRepository::delete); } /** From d2232e57b97d10bac56e7b1f061a245be716b1c4 Mon Sep 17 00:00:00 2001 From: aykl Date: Mon, 29 Nov 2021 16:04:50 +0100 Subject: [PATCH 250/431] User Resource Int Test Initialization updated --- .../radarbase/management/web/rest/UserResourceIntTest.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/test/java/org/radarbase/management/web/rest/UserResourceIntTest.java b/src/test/java/org/radarbase/management/web/rest/UserResourceIntTest.java index 18359649b..fe703dc1c 100644 --- a/src/test/java/org/radarbase/management/web/rest/UserResourceIntTest.java +++ b/src/test/java/org/radarbase/management/web/rest/UserResourceIntTest.java @@ -135,6 +135,10 @@ public void setUp() throws ServletException { @BeforeEach public void initTest() { user = createEntity(passwordService); + userRepository.findOneByLogin(DEFAULT_LOGIN) + .ifPresent(userRepository::delete); + userRepository.findOneByLogin(UPDATED_LOGIN) + .ifPresent(userRepository::delete); } @Test From bdf054fa23c4e0db501bb962699d2be96e0d19ae Mon Sep 17 00:00:00 2001 From: aykl Date: Tue, 30 Nov 2021 09:12:53 +0100 Subject: [PATCH 251/431] Role Cleanup added in Tests --- .../management/web/rest/GroupResourceIntTest.java | 5 +---- .../management/web/rest/UserResourceIntTest.java | 10 ++++++++++ 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/src/test/java/org/radarbase/management/web/rest/GroupResourceIntTest.java b/src/test/java/org/radarbase/management/web/rest/GroupResourceIntTest.java index 31ea0a7e3..366d33e87 100644 --- a/src/test/java/org/radarbase/management/web/rest/GroupResourceIntTest.java +++ b/src/test/java/org/radarbase/management/web/rest/GroupResourceIntTest.java @@ -131,10 +131,7 @@ public void setUp() throws ServletException { public void tearDown() { groupRepository.delete(group); var roles = roleRepository.findAllRolesByProjectName(project.getProjectName()); - for (var r : roles) { - r.setProject(null); - } - roleRepository.saveAll(roles); + roleRepository.deleteAll(roles); projectRepository.delete(project); } diff --git a/src/test/java/org/radarbase/management/web/rest/UserResourceIntTest.java b/src/test/java/org/radarbase/management/web/rest/UserResourceIntTest.java index fe703dc1c..e642b6513 100644 --- a/src/test/java/org/radarbase/management/web/rest/UserResourceIntTest.java +++ b/src/test/java/org/radarbase/management/web/rest/UserResourceIntTest.java @@ -11,6 +11,7 @@ import org.radarbase.management.domain.Authority; import org.radarbase.management.domain.Role; import org.radarbase.management.domain.User; +import org.radarbase.management.repository.RoleRepository; import org.radarbase.management.repository.SubjectRepository; import org.radarbase.management.repository.UserRepository; import org.radarbase.management.security.JwtAuthenticationFilter; @@ -39,6 +40,7 @@ import java.util.Collections; import java.util.List; import java.util.Set; +import java.util.stream.Collectors; import static org.assertj.core.api.Assertions.assertThat; import static org.hamcrest.Matchers.hasItem; @@ -77,6 +79,9 @@ class UserResourceIntTest { @Autowired private ManagementPortalProperties managementPortalProperties; + @Autowired + private RoleRepository roleRepository; + @Autowired private UserRepository userRepository; @@ -139,6 +144,11 @@ public void initTest() { .ifPresent(userRepository::delete); userRepository.findOneByLogin(UPDATED_LOGIN) .ifPresent(userRepository::delete); + var roles = roleRepository + .findRolesByAuthorityName(AuthoritiesConstants.PARTICIPANT) + .stream().filter(r -> r.getProject() == null) + .collect(Collectors.toList()); + roleRepository.deleteAll(roles); } @Test From d25dfd49dda6f1fa5b120be3215677351649aef2 Mon Sep 17 00:00:00 2001 From: aykl Date: Tue, 30 Nov 2021 15:31:46 +0100 Subject: [PATCH 252/431] OrganizationName Mapping implemented --- .../radarbase/management/domain/Project.java | 38 +++++++++---------- .../repository/ProjectRepository.java | 4 +- .../management/service/ProjectService.java | 15 -------- .../management/service/dto/ProjectDTO.java | 11 +++--- .../service/mapper/ProjectMapper.java | 8 +++- .../decorator/ProjectMapperDecorator.java | 20 ++++++++++ .../web/rest/errors/ErrorConstants.java | 2 - .../20211110160000_add_organization.xml | 6 ++- .../web/rest/OrganizationResourceIntTest.java | 2 +- .../web/rest/ProjectResourceIntTest.java | 12 +++--- 10 files changed, 64 insertions(+), 54 deletions(-) diff --git a/src/main/java/org/radarbase/management/domain/Project.java b/src/main/java/org/radarbase/management/domain/Project.java index 4c23a312b..afef9e016 100644 --- a/src/main/java/org/radarbase/management/domain/Project.java +++ b/src/main/java/org/radarbase/management/domain/Project.java @@ -27,6 +27,7 @@ import javax.persistence.JoinColumn; import javax.persistence.JoinTable; import javax.persistence.ManyToMany; +import javax.persistence.ManyToOne; import javax.persistence.MapKeyColumn; import javax.persistence.OneToMany; import javax.persistence.OrderBy; @@ -74,14 +75,11 @@ public class Project extends AbstractEntity implements Serializable { private String description; @Column(name = "jhi_organization") - private String organization; + private String organizationName; - // Ideally, this should be an organization Entity, - // but to avoid confusion with the existing organization field - // I'll keep it as an ID for now. - // TODO: sunset the old organization field - @Column(name = "organization_id") - private Long organizationId; + @ManyToOne(fetch = FetchType.EAGER) + @Cache(usage = CacheConcurrencyStrategy.NONSTRICT_READ_WRITE) + private Organization organization; @NotNull @Column(name = "location", nullable = false) @@ -156,12 +154,12 @@ public void setDescription(String description) { this.description = description; } - public String getOrganization() { - return organization; + public String getOrganizationName() { + return organizationName; } - public Project organization(String organization) { - this.organization = organization; + public Project organizationName(String organizationName) { + this.organizationName = organizationName; return this; } @@ -174,21 +172,21 @@ public void setRoles(Set roles) { this.roles = roles; } - public void setOrganization(String organization) { - this.organization = organization; + public void setOrganizationName(String organizationName) { + this.organizationName = organizationName; } - public Long getOrganizationId() { - return organizationId; + public Organization getOrganization() { + return organization; } - public Project organizationId(Long organizationId) { - this.organizationId = organizationId; + public Project organization(Organization organization) { + this.organization = organization; return this; } - public void setOrganizationId(Long organizationId) { - this.organizationId = organizationId; + public void setOrganization(Organization organization) { + this.organization = organization; } public String getLocation() { @@ -301,7 +299,7 @@ public String toString() { + "id=" + id + ", projectName='" + projectName + "'" + ", description='" + description + "'" - + ", organization='" + organization + "'" + + ", organization='" + organizationName + "'" + ", location='" + location + "'" + ", startDate='" + startDate + "'" + ", projectStatus='" + projectStatus + "'" diff --git a/src/main/java/org/radarbase/management/repository/ProjectRepository.java b/src/main/java/org/radarbase/management/repository/ProjectRepository.java index 95013fe8e..1c69028bc 100644 --- a/src/main/java/org/radarbase/management/repository/ProjectRepository.java +++ b/src/main/java/org/radarbase/management/repository/ProjectRepository.java @@ -26,9 +26,7 @@ public interface ProjectRepository extends JpaRepository, Page findAllWithEagerRelationships(Pageable pageable); @Query("select project from Project project " - + "WHERE project.organizationId IN " - + "(SELECT org.id from Organization org " - + " WHERE org.name = :organization_name)") + + "WHERE project.organization.name = :organization_name") List findAllByOrganizationName( @Param("organization_name") String organizationName); diff --git a/src/main/java/org/radarbase/management/service/ProjectService.java b/src/main/java/org/radarbase/management/service/ProjectService.java index 6cab08a6f..138e7f3d4 100644 --- a/src/main/java/org/radarbase/management/service/ProjectService.java +++ b/src/main/java/org/radarbase/management/service/ProjectService.java @@ -1,12 +1,10 @@ package org.radarbase.management.service; -import static org.radarbase.management.web.rest.errors.EntityName.ORGANIZATION; import static org.radarbase.management.web.rest.errors.EntityName.PROJECT; import org.radarbase.management.domain.Project; import org.radarbase.management.domain.SourceType; -import org.radarbase.management.repository.OrganizationRepository; import org.radarbase.management.repository.ProjectRepository; import org.radarbase.management.service.dto.ProjectDTO; import org.radarbase.management.service.dto.SourceTypeDTO; @@ -34,9 +32,6 @@ public class ProjectService { private static final Logger log = LoggerFactory.getLogger(ProjectService.class); - @Autowired - private OrganizationRepository organizationRepository; - @Autowired private ProjectRepository projectRepository; @@ -55,16 +50,6 @@ public class ProjectService { */ public ProjectDTO save(ProjectDTO projectDto) { log.debug("Request to save Project : {}", projectDto); - var orgId = projectDto.getOrganizationId(); - if (orgId != null) { - var org = organizationRepository.findById(orgId); - if (org.isEmpty()) { - throw new NotFoundException("Organization not found with id", - ORGANIZATION, - ErrorConstants.ERR_ORGANIZATION_ID_NOT_FOUND, - Collections.singletonMap("id", orgId.toString())); - } - } Project project = projectMapper.projectDTOToProject(projectDto); project = projectRepository.save(project); return projectMapper.projectToProjectDTO(project); diff --git a/src/main/java/org/radarbase/management/service/dto/ProjectDTO.java b/src/main/java/org/radarbase/management/service/dto/ProjectDTO.java index 971f1d784..1df875dc4 100644 --- a/src/main/java/org/radarbase/management/service/dto/ProjectDTO.java +++ b/src/main/java/org/radarbase/management/service/dto/ProjectDTO.java @@ -37,7 +37,7 @@ public class ProjectDTO implements Serializable { private String organization; - private Long organizationId; + private String organizationName; @NotNull private String location; @@ -90,12 +90,12 @@ public void setOrganization(String organization) { this.organization = organization; } - public Long getOrganizationId() { - return organizationId; + public String getOrganizationName() { + return organizationName; } - public void setOrganizationId(Long organizationId) { - this.organizationId = organizationId; + public void setOrganizationName(String organizationName) { + this.organizationName = organizationName; } public String getLocation() { @@ -199,6 +199,7 @@ public String toString() { + ", projectName='" + projectName + "'" + ", description='" + description + "'" + ", organization='" + organization + "'" + + ", organizationName='" + organizationName + "'" + ", location='" + location + "'" + ", startDate='" + startDate + "'" + ", projectStatus='" + projectStatus + "'" diff --git a/src/main/java/org/radarbase/management/service/mapper/ProjectMapper.java b/src/main/java/org/radarbase/management/service/mapper/ProjectMapper.java index 12c4a3a84..52f2bd52a 100644 --- a/src/main/java/org/radarbase/management/service/mapper/ProjectMapper.java +++ b/src/main/java/org/radarbase/management/service/mapper/ProjectMapper.java @@ -18,6 +18,8 @@ @DecoratedWith(ProjectMapperDecorator.class) public interface ProjectMapper { @Mapping(target = "humanReadableProjectName", ignore = true) + @Mapping(target = "organization", source = "organizationName") + @Mapping(target = "organizationName", source = "organization.name") @Mapping(target = "persistentTokenTimeout", ignore = true) @Mapping(target = "groups", qualifiedByName = "groupToGroupDTO") @Mapping(target = "sourceTypes", qualifiedByName = "sourceTypeToSourceTypeDTOReduced") @@ -25,6 +27,8 @@ public interface ProjectMapper { @Named(value = "projectReducedDTO") @Mapping(target = "humanReadableProjectName", ignore = true) + @Mapping(target = "organization", source = "organizationName") + @Mapping(target = "organizationName", source = "organization.name") @Mapping(target = "sourceTypes", ignore = true) @Mapping(target = "persistentTokenTimeout", ignore = true) @Mapping(target = "groups", qualifiedByName = "groupToGroupDTO") @@ -35,6 +39,8 @@ public interface ProjectMapper { @Mapping(target = "roles", ignore = true) @Mapping(target = "groups", ignore = true) + @Mapping(target = "organization", ignore = true) + @Mapping(target = "organizationName", source = "organization") Project projectDTOToProject(ProjectDTO projectDto); List projectDTOsToProjects(List projectDtos); @@ -45,8 +51,8 @@ public interface ProjectMapper { @Mapping(target = "description", ignore = true) @Mapping(target = "roles", ignore = true) + @Mapping(target = "organizationName", ignore = true) @Mapping(target = "organization", ignore = true) - @Mapping(target = "organizationId", ignore = true) @Mapping(target = "location", ignore = true) @Mapping(target = "startDate", ignore = true) @Mapping(target = "endDate", ignore = true) diff --git a/src/main/java/org/radarbase/management/service/mapper/decorator/ProjectMapperDecorator.java b/src/main/java/org/radarbase/management/service/mapper/decorator/ProjectMapperDecorator.java index 596a96002..35391c281 100644 --- a/src/main/java/org/radarbase/management/service/mapper/decorator/ProjectMapperDecorator.java +++ b/src/main/java/org/radarbase/management/service/mapper/decorator/ProjectMapperDecorator.java @@ -1,16 +1,22 @@ package org.radarbase.management.service.mapper.decorator; import org.radarbase.management.domain.Project; +import org.radarbase.management.repository.OrganizationRepository; import org.radarbase.management.repository.ProjectRepository; import org.radarbase.management.service.OAuthClientService; import org.radarbase.management.service.dto.MinimalProjectDetailsDTO; import org.radarbase.management.service.dto.ProjectDTO; import org.radarbase.management.service.mapper.ProjectMapper; import org.radarbase.management.web.rest.errors.BadRequestException; +import org.radarbase.management.web.rest.errors.ErrorConstants; +import org.radarbase.management.web.rest.errors.NotFoundException; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import static org.radarbase.management.service.dto.ProjectDTO.HUMAN_READABLE_PROJECT_NAME; +import static org.radarbase.management.web.rest.errors.EntityName.ORGANIZATION; + +import java.util.Collections; /** * Created by nivethika on 30-8-17. @@ -21,6 +27,9 @@ public abstract class ProjectMapperDecorator implements ProjectMapper { @Qualifier("delegate") private ProjectMapper delegate; + @Autowired + private OrganizationRepository organizationRepository; + @Autowired private ProjectRepository projectRepository; @@ -69,6 +78,17 @@ public Project projectDTOToProject(ProjectDTO projectDto) { if (projectName != null && !projectName.isEmpty()) { project.getAttributes().put(HUMAN_READABLE_PROJECT_NAME, projectName); } + + var orgName = projectDto.getOrganizationName(); + if (orgName != null) { + var org = organizationRepository.findOneByName(orgName).orElseThrow( + () -> new NotFoundException("Organization not found with name", + ORGANIZATION, + ErrorConstants.ERR_ORGANIZATION_NAME_NOT_FOUND, + Collections.singletonMap("name", orgName))); + project.setOrganization(org); + } + return project; } diff --git a/src/main/java/org/radarbase/management/web/rest/errors/ErrorConstants.java b/src/main/java/org/radarbase/management/web/rest/errors/ErrorConstants.java index dac6ee43d..3719b57d6 100644 --- a/src/main/java/org/radarbase/management/web/rest/errors/ErrorConstants.java +++ b/src/main/java/org/radarbase/management/web/rest/errors/ErrorConstants.java @@ -22,8 +22,6 @@ public final class ErrorConstants { public static final String ERR_GROUP_EXISTS = "error.groupExists"; public static final String ERR_INVALID_AUTHORITY = "error.invalidAuthority"; public static final String ERR_EMAIL_EXISTS = "error.emailexists"; - public static final String ERR_ORGANIZATION_ID_NOT_FOUND = "error" - + ".organizationIdNotFound"; public static final String ERR_ORGANIZATION_NAME_NOT_FOUND = "error" + ".organizationNameNotFound"; public static final String ERR_PROJECT_ID_NOT_FOUND = "error.projectIdNotFound"; diff --git a/src/main/resources/config/liquibase/changelog/20211110160000_add_organization.xml b/src/main/resources/config/liquibase/changelog/20211110160000_add_organization.xml index 599665c16..17448f90b 100644 --- a/src/main/resources/config/liquibase/changelog/20211110160000_add_organization.xml +++ b/src/main/resources/config/liquibase/changelog/20211110160000_add_organization.xml @@ -105,9 +105,13 @@ + + - + Date: Wed, 1 Dec 2021 14:32:34 +0100 Subject: [PATCH 253/431] Default Organization set for New Projects --- src/main/java/org/radarbase/management/domain/Project.java | 2 ++ .../liquibase/changelog/20211110160000_add_organization.xml | 6 ++++++ 2 files changed, 8 insertions(+) diff --git a/src/main/java/org/radarbase/management/domain/Project.java b/src/main/java/org/radarbase/management/domain/Project.java index afef9e016..26e7c1179 100644 --- a/src/main/java/org/radarbase/management/domain/Project.java +++ b/src/main/java/org/radarbase/management/domain/Project.java @@ -7,6 +7,7 @@ import org.hibernate.annotations.CacheConcurrencyStrategy; import org.hibernate.annotations.Cascade; import org.hibernate.annotations.CascadeType; +import org.hibernate.annotations.DynamicInsert; import org.hibernate.envers.Audited; import org.hibernate.envers.NotAudited; import org.radarbase.auth.config.Constants; @@ -55,6 +56,7 @@ @Table(name = "project") @Cache(usage = CacheConcurrencyStrategy.NONSTRICT_READ_WRITE) @EntityListeners({AbstractEntityListener.class}) +@DynamicInsert public class Project extends AbstractEntity implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/resources/config/liquibase/changelog/20211110160000_add_organization.xml b/src/main/resources/config/liquibase/changelog/20211110160000_add_organization.xml index e39228b14..3986e8a3a 100644 --- a/src/main/resources/config/liquibase/changelog/20211110160000_add_organization.xml +++ b/src/main/resources/config/liquibase/changelog/20211110160000_add_organization.xml @@ -75,6 +75,12 @@ + + + + From 4d2af9fc3269c8f2229850b488347a3ca314b33d Mon Sep 17 00:00:00 2001 From: Joris Borgdorff Date: Wed, 1 Dec 2021 14:40:44 +0100 Subject: [PATCH 254/431] Fix translation files --- .../webapp/i18n/nl/{organizations.json => organization.json} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename src/main/webapp/i18n/nl/{organizations.json => organization.json} (89%) diff --git a/src/main/webapp/i18n/nl/organizations.json b/src/main/webapp/i18n/nl/organization.json similarity index 89% rename from src/main/webapp/i18n/nl/organizations.json rename to src/main/webapp/i18n/nl/organization.json index ff9594a5c..88dcfd685 100644 --- a/src/main/webapp/i18n/nl/organizations.json +++ b/src/main/webapp/i18n/nl/organization.json @@ -32,8 +32,8 @@ }, "attributeDataKey" : "Tag", "attributeDataValue" : "Waarde", - "prettyProjectName" : "Leesbare organizationnaam", - "prettyProjectName.fieldDescription" : "Voor mensen leesbare organizationnaam die niet het urlpatroon hoeft te volgen.", + "prettyOrganizationName" : "Leesbare organizationnaam", + "prettyOrganizationName.fieldDescription" : "Voor mensen leesbare organizationnaam die niet het urlpatroon hoeft te volgen.", "organizationIdAsPrettyName": "Wil je de organization-id gebruiken als de voor mensen leesbare naam?" }, "error" : { From 86a6291b7eef5b8ee6e3cd39d9a266b0e1f84a62 Mon Sep 17 00:00:00 2001 From: Joris Borgdorff Date: Wed, 1 Dec 2021 14:55:42 +0100 Subject: [PATCH 255/431] Remove old commented out radartoken --- .../management/web/rest/OrganizationResourceIntTest.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/test/java/org/radarbase/management/web/rest/OrganizationResourceIntTest.java b/src/test/java/org/radarbase/management/web/rest/OrganizationResourceIntTest.java index a83981acf..fb75e6d31 100644 --- a/src/test/java/org/radarbase/management/web/rest/OrganizationResourceIntTest.java +++ b/src/test/java/org/radarbase/management/web/rest/OrganizationResourceIntTest.java @@ -6,7 +6,6 @@ import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.MockitoAnnotations; import org.radarbase.auth.authentication.OAuthHelper; -// import org.radarbase.auth.token.RadarToken; import org.radarbase.auth.token.RadarToken; import org.radarbase.management.ManagementPortalTestApp; import org.radarbase.management.domain.Organization; From 3f7a16448eb1001282a350ccb59e881937efff22 Mon Sep 17 00:00:00 2001 From: Joris Borgdorff Date: Thu, 2 Dec 2021 14:56:10 +0100 Subject: [PATCH 256/431] Add organization CSV base template --- ...11202145000_add_organization_demo_data.xml | 34 +++++++++++++++++++ .../resources/config/liquibase/master.xml | 1 + .../liquibase/organization_role_users.csv | 1 + .../config/liquibase/organization_roles.csv | 1 + .../config/liquibase/organization_user.csv | 1 + 5 files changed, 38 insertions(+) create mode 100644 src/main/resources/config/liquibase/changelog/20211202145000_add_organization_demo_data.xml create mode 100644 src/main/resources/config/liquibase/organization_role_users.csv create mode 100644 src/main/resources/config/liquibase/organization_roles.csv create mode 100644 src/main/resources/config/liquibase/organization_user.csv diff --git a/src/main/resources/config/liquibase/changelog/20211202145000_add_organization_demo_data.xml b/src/main/resources/config/liquibase/changelog/20211202145000_add_organization_demo_data.xml new file mode 100644 index 000000000..afcaf07a6 --- /dev/null +++ b/src/main/resources/config/liquibase/changelog/20211202145000_add_organization_demo_data.xml @@ -0,0 +1,34 @@ + + + + + + + + + + diff --git a/src/main/resources/config/liquibase/master.xml b/src/main/resources/config/liquibase/master.xml index 5d19bdf55..f5e8a4380 100644 --- a/src/main/resources/config/liquibase/master.xml +++ b/src/main/resources/config/liquibase/master.xml @@ -41,5 +41,6 @@ + diff --git a/src/main/resources/config/liquibase/organization_role_users.csv b/src/main/resources/config/liquibase/organization_role_users.csv new file mode 100644 index 000000000..ae5e99ebf --- /dev/null +++ b/src/main/resources/config/liquibase/organization_role_users.csv @@ -0,0 +1 @@ +"USERS_ID";"ROLES_ID" diff --git a/src/main/resources/config/liquibase/organization_roles.csv b/src/main/resources/config/liquibase/organization_roles.csv new file mode 100644 index 000000000..be170dce5 --- /dev/null +++ b/src/main/resources/config/liquibase/organization_roles.csv @@ -0,0 +1 @@ +id;authority_name;project_id;organization_id;created_by diff --git a/src/main/resources/config/liquibase/organization_user.csv b/src/main/resources/config/liquibase/organization_user.csv new file mode 100644 index 000000000..9ed518013 --- /dev/null +++ b/src/main/resources/config/liquibase/organization_user.csv @@ -0,0 +1 @@ +"ID";"LOGIN";"PASSWORD_HASH";"FIRST_NAME";"LAST_NAME";"EMAIL";"ACTIVATED";"LANG_KEY";"CREATED_BY";"LAST_MODIFIED_BY" From 1dcddf2de70a7ac944cb12c3313d51202821f31c Mon Sep 17 00:00:00 2001 From: Joris Borgdorff Date: Thu, 2 Dec 2021 15:21:37 +0100 Subject: [PATCH 257/431] Fix tests --- .../radarbase/management/domain/Organization.java | 13 +++++++++++++ .../repository/OrganizationRepository.java | 4 ++-- .../management/service/OrganizationService.java | 11 ++++++----- .../mapper/decorator/ProjectMapperDecorator.java | 3 +-- .../changelog/20211110160000_add_organization.xml | 9 +++++---- 5 files changed, 27 insertions(+), 13 deletions(-) diff --git a/src/main/java/org/radarbase/management/domain/Organization.java b/src/main/java/org/radarbase/management/domain/Organization.java index e33beaf00..f728adae7 100644 --- a/src/main/java/org/radarbase/management/domain/Organization.java +++ b/src/main/java/org/radarbase/management/domain/Organization.java @@ -12,10 +12,12 @@ import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; +import javax.persistence.OneToMany; import javax.persistence.SequenceGenerator; import javax.persistence.Table; import javax.validation.constraints.NotNull; import javax.validation.constraints.Pattern; +import java.util.List; import java.util.Objects; /** @@ -49,6 +51,9 @@ public class Organization extends AbstractEntity { @Column(name = "location", nullable = false) private String location; + @OneToMany(mappedBy = "organization") + private List projects; + @Override public Long getId() { return id; @@ -82,6 +87,14 @@ public void setLocation(String location) { this.location = location; } + public List getProjects() { + return projects; + } + + public void setProjects(List projects) { + this.projects = projects; + } + @Override public boolean equals(Object o) { if (this == o) { diff --git a/src/main/java/org/radarbase/management/repository/OrganizationRepository.java b/src/main/java/org/radarbase/management/repository/OrganizationRepository.java index 8b968fe8e..77bac7ebc 100644 --- a/src/main/java/org/radarbase/management/repository/OrganizationRepository.java +++ b/src/main/java/org/radarbase/management/repository/OrganizationRepository.java @@ -21,7 +21,7 @@ public interface OrganizationRepository extends JpaRepository findOneByName(@Param("name") String name); - @Query("select distinct org from Organization org ") - // + "where org.project.projectName in (:projectNames)") + @Query("select distinct org from Organization org left join fetch org.projects project " + + "where project.projectName in (:projectNames)") List findAllByProjectNames(@Param("projectNames") List projectNames); } diff --git a/src/main/java/org/radarbase/management/service/OrganizationService.java b/src/main/java/org/radarbase/management/service/OrganizationService.java index 009b6334f..f009527b2 100644 --- a/src/main/java/org/radarbase/management/service/OrganizationService.java +++ b/src/main/java/org/radarbase/management/service/OrganizationService.java @@ -69,23 +69,24 @@ public OrganizationDTO save(OrganizationDTO organizationDto) { public List findAll() { Stream organizationsOfUser; - if (token.getGlobalRoles().stream().anyMatch(ORGANIZATION_READ::isRoleAllowed)) { + if (token.hasGlobalAuthorityForPermission(ORGANIZATION_READ)) { organizationsOfUser = organizationRepository.findAll().stream(); } else { List projectNames = token.getReferentsWithPermission( RoleAuthority.Scope.PROJECT, ORGANIZATION_READ) .collect(Collectors.toList()); - List organizationsOfProject = organizationRepository - .findAllByProjectNames(projectNames); + Stream organizationsOfProject = projectNames.isEmpty() + ? Stream.of() + : organizationRepository.findAllByProjectNames(projectNames).stream(); Stream organizationsOfRole = token.getReferentsWithPermission( RoleAuthority.Scope.ORGANIZATION, ORGANIZATION_READ) .flatMap(name -> organizationRepository.findOneByName(name).stream()) .filter(Objects::nonNull); - organizationsOfUser = Stream.concat( - organizationsOfRole, organizationsOfProject.stream()).distinct(); + organizationsOfUser = Stream.concat(organizationsOfRole, organizationsOfProject) + .distinct(); } return organizationsOfUser diff --git a/src/main/java/org/radarbase/management/service/mapper/decorator/ProjectMapperDecorator.java b/src/main/java/org/radarbase/management/service/mapper/decorator/ProjectMapperDecorator.java index 35391c281..1613c6f4a 100644 --- a/src/main/java/org/radarbase/management/service/mapper/decorator/ProjectMapperDecorator.java +++ b/src/main/java/org/radarbase/management/service/mapper/decorator/ProjectMapperDecorator.java @@ -97,7 +97,6 @@ public Project descriptiveDTOToProject(MinimalProjectDetailsDTO minimalProjectDe if (minimalProjectDetailsDto == null) { return null; } - return projectRepository.getOne(minimalProjectDetailsDto.getId()); + return projectRepository.getById(minimalProjectDetailsDto.getId()); } } - diff --git a/src/main/resources/config/liquibase/changelog/20211110160000_add_organization.xml b/src/main/resources/config/liquibase/changelog/20211110160000_add_organization.xml index 931c3c33b..1e0008eb6 100644 --- a/src/main/resources/config/liquibase/changelog/20211110160000_add_organization.xml +++ b/src/main/resources/config/liquibase/changelog/20211110160000_add_organization.xml @@ -66,12 +66,13 @@ + - + - + INSERT into radar_organization_aud ( id, rev, revtype, @@ -92,7 +93,7 @@ ) SELECT id, 1, 0, - + description, true, location, true, name, true @@ -106,7 +107,7 @@ From 769e18782d84de50b6f189c26870cbf29b777745 Mon Sep 17 00:00:00 2001 From: Joris Borgdorff Date: Thu, 2 Dec 2021 16:33:25 +0100 Subject: [PATCH 258/431] Properly map organizations to projects and vice-versa --- .../service/dto/OrganizationDTO.java | 21 +++++++++---- .../management/service/dto/ProjectDTO.java | 6 ++-- .../service/mapper/OrganizationMapper.java | 10 ++++-- .../service/mapper/ProjectMapper.java | 31 +++---------------- .../decorator/ProjectMapperDecorator.java | 8 ++--- .../web/rest/ProjectResourceIntTest.java | 4 +-- 6 files changed, 37 insertions(+), 43 deletions(-) diff --git a/src/main/java/org/radarbase/management/service/dto/OrganizationDTO.java b/src/main/java/org/radarbase/management/service/dto/OrganizationDTO.java index 63d25fd4e..a4c216c76 100644 --- a/src/main/java/org/radarbase/management/service/dto/OrganizationDTO.java +++ b/src/main/java/org/radarbase/management/service/dto/OrganizationDTO.java @@ -3,6 +3,7 @@ import com.fasterxml.jackson.annotation.JsonInclude; import java.io.Serializable; +import java.util.List; import java.util.Objects; import javax.validation.constraints.NotNull; @@ -24,6 +25,8 @@ public class OrganizationDTO implements Serializable { @NotNull private String location; + private List projects; + public Long getId() { return id; } @@ -56,6 +59,14 @@ public void setLocation(String location) { this.location = location; } + public List getProjects() { + return projects; + } + + public void setProjects(List projects) { + this.projects = projects; + } + @Override public boolean equals(Object o) { if (this == o) { @@ -66,16 +77,14 @@ public boolean equals(Object o) { } var orgDto = (OrganizationDTO) o; - if (id == null || orgDto.id == null) { - return false; - } - - return Objects.equals(id, orgDto.id); + return Objects.equals(name, orgDto.name) + && Objects.equals(description, orgDto.description) + && Objects.equals(location, orgDto.location); } @Override public int hashCode() { - return Objects.hashCode(id); + return Objects.hashCode(name); } @Override diff --git a/src/main/java/org/radarbase/management/service/dto/ProjectDTO.java b/src/main/java/org/radarbase/management/service/dto/ProjectDTO.java index 1df875dc4..62afd3d61 100644 --- a/src/main/java/org/radarbase/management/service/dto/ProjectDTO.java +++ b/src/main/java/org/radarbase/management/service/dto/ProjectDTO.java @@ -35,7 +35,7 @@ public class ProjectDTO implements Serializable { @NotNull private String description; - private String organization; + private OrganizationDTO organization; private String organizationName; @@ -82,11 +82,11 @@ public void setDescription(String description) { this.description = description; } - public String getOrganization() { + public OrganizationDTO getOrganization() { return organization; } - public void setOrganization(String organization) { + public void setOrganization(OrganizationDTO organization) { this.organization = organization; } diff --git a/src/main/java/org/radarbase/management/service/mapper/OrganizationMapper.java b/src/main/java/org/radarbase/management/service/mapper/OrganizationMapper.java index 05dfb04f3..120f24a45 100644 --- a/src/main/java/org/radarbase/management/service/mapper/OrganizationMapper.java +++ b/src/main/java/org/radarbase/management/service/mapper/OrganizationMapper.java @@ -2,6 +2,7 @@ import org.mapstruct.IterableMapping; import org.mapstruct.Mapper; +import org.mapstruct.Mapping; import org.mapstruct.Named; import org.radarbase.management.domain.Organization; import org.radarbase.management.service.dto.OrganizationDTO; @@ -11,14 +12,19 @@ /** * Mapper for the entity Organization and its DTO OrganizationDTO. */ -@Mapper(componentModel = "spring") +@Mapper(componentModel = "spring", uses = {ProjectMapper.class}) public interface OrganizationMapper { @Named("organizationToOrganizationDTO") + @Mapping(target = "projects", qualifiedByName = "projectReducedDTO") OrganizationDTO organizationToOrganizationDTO(Organization organization); + @Named("organizationToOrganizationDTOWithoutProjects") + @Mapping(target = "projects", ignore = true) + OrganizationDTO organizationToOrganizationDTOWithoutProjects(Organization organization); + + @Mapping(target = "projects", ignore = true) Organization organizationDTOToOrganization(OrganizationDTO organizationDto); @IterableMapping(qualifiedByName = "organizationToOrganizationDTO") List organizationsToOrganizationDTOs(List organizations); - } diff --git a/src/main/java/org/radarbase/management/service/mapper/ProjectMapper.java b/src/main/java/org/radarbase/management/service/mapper/ProjectMapper.java index 52f2bd52a..48df0de89 100644 --- a/src/main/java/org/radarbase/management/service/mapper/ProjectMapper.java +++ b/src/main/java/org/radarbase/management/service/mapper/ProjectMapper.java @@ -14,12 +14,13 @@ /** * Mapper for the entity Project and its DTO ProjectDTO. */ -@Mapper(componentModel = "spring", uses = {GroupMapper.class, SourceTypeMapper.class,}) +@Mapper(componentModel = "spring", + uses = {GroupMapper.class, SourceTypeMapper.class, OrganizationMapper.class}) @DecoratedWith(ProjectMapperDecorator.class) public interface ProjectMapper { @Mapping(target = "humanReadableProjectName", ignore = true) - @Mapping(target = "organization", source = "organizationName") - @Mapping(target = "organizationName", source = "organization.name") + @Mapping(target = "organization", source = "organization", + qualifiedByName = "organizationToOrganizationDTOWithoutProjects") @Mapping(target = "persistentTokenTimeout", ignore = true) @Mapping(target = "groups", qualifiedByName = "groupToGroupDTO") @Mapping(target = "sourceTypes", qualifiedByName = "sourceTypeToSourceTypeDTOReduced") @@ -27,8 +28,7 @@ public interface ProjectMapper { @Named(value = "projectReducedDTO") @Mapping(target = "humanReadableProjectName", ignore = true) - @Mapping(target = "organization", source = "organizationName") - @Mapping(target = "organizationName", source = "organization.name") + @Mapping(target = "organization", ignore = true) @Mapping(target = "sourceTypes", ignore = true) @Mapping(target = "persistentTokenTimeout", ignore = true) @Mapping(target = "groups", qualifiedByName = "groupToGroupDTO") @@ -40,7 +40,6 @@ public interface ProjectMapper { @Mapping(target = "roles", ignore = true) @Mapping(target = "groups", ignore = true) @Mapping(target = "organization", ignore = true) - @Mapping(target = "organizationName", source = "organization") Project projectDTOToProject(ProjectDTO projectDto); List projectDTOsToProjects(List projectDtos); @@ -64,24 +63,4 @@ public interface ProjectMapper { List descriptiveDTOsToProjects( List minimalProjectDetailsDtos); - - /** - * generating the fromId for all mappers if the databaseType is sql, as the class has - * relationship to it might need it, instead of creating a new attribute to know if the entity - * has any relationship from some other entity. - * - * @param id id of the entity - * @return the entity instance - */ - - default Project projectFromId(Long id) { - if (id == null) { - return null; - } - Project project = new Project(); - project.setId(id); - return project; - } - - } diff --git a/src/main/java/org/radarbase/management/service/mapper/decorator/ProjectMapperDecorator.java b/src/main/java/org/radarbase/management/service/mapper/decorator/ProjectMapperDecorator.java index 1613c6f4a..188f6b6c4 100644 --- a/src/main/java/org/radarbase/management/service/mapper/decorator/ProjectMapperDecorator.java +++ b/src/main/java/org/radarbase/management/service/mapper/decorator/ProjectMapperDecorator.java @@ -79,13 +79,13 @@ public Project projectDTOToProject(ProjectDTO projectDto) { project.getAttributes().put(HUMAN_READABLE_PROJECT_NAME, projectName); } - var orgName = projectDto.getOrganizationName(); - if (orgName != null) { - var org = organizationRepository.findOneByName(orgName).orElseThrow( + var orgDto = projectDto.getOrganization(); + if (orgDto != null && orgDto.getName() != null) { + var org = organizationRepository.findOneByName(orgDto.getName()).orElseThrow( () -> new NotFoundException("Organization not found with name", ORGANIZATION, ErrorConstants.ERR_ORGANIZATION_NAME_NOT_FOUND, - Collections.singletonMap("name", orgName))); + Collections.singletonMap("name", orgDto.getName()))); project.setOrganization(org); } diff --git a/src/test/java/org/radarbase/management/web/rest/ProjectResourceIntTest.java b/src/test/java/org/radarbase/management/web/rest/ProjectResourceIntTest.java index 72da28888..37f3b9a05 100644 --- a/src/test/java/org/radarbase/management/web/rest/ProjectResourceIntTest.java +++ b/src/test/java/org/radarbase/management/web/rest/ProjectResourceIntTest.java @@ -267,7 +267,7 @@ void getAllProjects() throws Exception { .andExpect(jsonPath("$.[*].id").value(hasItem(project.getId().intValue()))) .andExpect(jsonPath("$.[*].projectName").value(hasItem(DEFAULT_PROJECT_NAME))) .andExpect(jsonPath("$.[*].description").value(hasItem(DEFAULT_DESCRIPTION))) - .andExpect(jsonPath("$.[*].organization").value(hasItem(DEFAULT_ORGANIZATION))) + .andExpect(jsonPath("$.[*].organizationName").value(hasItem(DEFAULT_ORGANIZATION))) .andExpect(jsonPath("$.[*].location").value(hasItem(DEFAULT_LOCATION))) .andExpect(jsonPath("$.[*].startDate").value( hasItem(sameInstant(DEFAULT_START_DATE)))) @@ -289,7 +289,7 @@ void getProject() throws Exception { .andExpect(jsonPath("$.id").value(project.getId().intValue())) .andExpect(jsonPath("$.projectName").value(DEFAULT_PROJECT_NAME)) .andExpect(jsonPath("$.description").value(DEFAULT_DESCRIPTION)) - .andExpect(jsonPath("$.organization").value(DEFAULT_ORGANIZATION)) + .andExpect(jsonPath("$.organizationName").value(DEFAULT_ORGANIZATION)) .andExpect(jsonPath("$.location").value(DEFAULT_LOCATION)) .andExpect(jsonPath("$.startDate").value(sameInstant(DEFAULT_START_DATE))) .andExpect(jsonPath("$.projectStatus").value(DEFAULT_PROJECT_STATUS.toString())) From b445f7f302bd4a5d4c61e3b9991472d8673a1297 Mon Sep 17 00:00:00 2001 From: aykl Date: Mon, 6 Dec 2021 14:31:44 +0100 Subject: [PATCH 259/431] Organization Changesets updated --- .../20211110160000_add_organization.xml | 26 ++----------------- 1 file changed, 2 insertions(+), 24 deletions(-) diff --git a/src/main/resources/config/liquibase/changelog/20211110160000_add_organization.xml b/src/main/resources/config/liquibase/changelog/20211110160000_add_organization.xml index 3986e8a3a..98dc4fb27 100644 --- a/src/main/resources/config/liquibase/changelog/20211110160000_add_organization.xml +++ b/src/main/resources/config/liquibase/changelog/20211110160000_add_organization.xml @@ -51,7 +51,7 @@ - + - - - UPDATE project - SET organization_id = (SELECT id - FROM radar_organization - WHERE name = 'Main organization') - - - - - - - @@ -121,7 +106,7 @@ newColumnName="organization_name_mod"/> - + @@ -143,12 +128,5 @@ name, true FROM radar_organization - - - UPDATE project_aud - SET organization_id = (SELECT id - FROM radar_organization - WHERE name = 'Main organization') - From 247967627bdd442af314ea75ee9b7cd3c3fd0dd3 Mon Sep 17 00:00:00 2001 From: aykl Date: Mon, 6 Dec 2021 14:46:17 +0100 Subject: [PATCH 260/431] "Main organization" -> main --- src/main/resources/config/liquibase/organization.csv | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/config/liquibase/organization.csv b/src/main/resources/config/liquibase/organization.csv index 6a06ef488..af7e9d8b4 100644 --- a/src/main/resources/config/liquibase/organization.csv +++ b/src/main/resources/config/liquibase/organization.csv @@ -1,2 +1,2 @@ id;name;description;location -1;Main organization;The default organization;- +1;main;The main organization;- From b60af73af00cabe31b76358884f03217e8ce8c2e Mon Sep 17 00:00:00 2001 From: Joris Borgdorff Date: Mon, 6 Dec 2021 16:10:06 +0100 Subject: [PATCH 261/431] Remove unused import --- src/main/webapp/app/shared/subject/subject.component.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/webapp/app/shared/subject/subject.component.ts b/src/main/webapp/app/shared/subject/subject.component.ts index c5fff231b..5ed1b453f 100644 --- a/src/main/webapp/app/shared/subject/subject.component.ts +++ b/src/main/webapp/app/shared/subject/subject.component.ts @@ -24,7 +24,6 @@ import { map, pluck, shareReplay, - startWith, switchMap, tap, withLatestFrom, From 33ca0fdb5b2da2d45f750895ca64444a1a00e20f Mon Sep 17 00:00:00 2001 From: Joris Borgdorff Date: Mon, 6 Dec 2021 16:22:51 +0100 Subject: [PATCH 262/431] Fix search query --- .../webapp/app/shared/permission/permission.component.ts | 8 ++++---- src/main/webapp/app/shared/user/user.service.ts | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/webapp/app/shared/permission/permission.component.ts b/src/main/webapp/app/shared/permission/permission.component.ts index f98b9ce64..294206c6b 100644 --- a/src/main/webapp/app/shared/permission/permission.component.ts +++ b/src/main/webapp/app/shared/permission/permission.component.ts @@ -205,12 +205,12 @@ export class PermissionComponent implements OnInit, OnDestroy, OnChanges { let req = {}; if (this.project) { req = { - project: this.project - } + projectName: this.project.projectName + }; } else if (this.organization) { req = { - organization: this.organization - } + organization: this.organization.name + }; } else { return; } diff --git a/src/main/webapp/app/shared/user/user.service.ts b/src/main/webapp/app/shared/user/user.service.ts index d434f7c5f..d7e3bb823 100644 --- a/src/main/webapp/app/shared/user/user.service.ts +++ b/src/main/webapp/app/shared/user/user.service.ts @@ -42,7 +42,7 @@ export class UserService { return this.http.get(this.resourceUrl, {params}); } - search(term: string) { + search(term: string): Observable { if (term === '') { return of([]); } From 0a1f850a003937b9e711e1c3a2257f2c7758da05 Mon Sep 17 00:00:00 2001 From: Joris Borgdorff Date: Mon, 6 Dec 2021 17:17:30 +0100 Subject: [PATCH 263/431] Fix getting and updating roles --- .../management/domain/Authority.java | 2 +- .../management/repository/RoleRepository.java | 6 + .../management/service/RoleService.java | 133 +++++++++++++++++- .../management/service/UserService.java | 113 +++------------ .../shared/permission/permission.component.ts | 28 ++-- 5 files changed, 167 insertions(+), 115 deletions(-) diff --git a/src/main/java/org/radarbase/management/domain/Authority.java b/src/main/java/org/radarbase/management/domain/Authority.java index 9590b351a..ee5d00b9b 100644 --- a/src/main/java/org/radarbase/management/domain/Authority.java +++ b/src/main/java/org/radarbase/management/domain/Authority.java @@ -42,7 +42,7 @@ public Authority(String authorityName) { } public Authority(RoleAuthority role) { - this.name = role.authority(); + this(role.authority()); } public String getName() { diff --git a/src/main/java/org/radarbase/management/repository/RoleRepository.java b/src/main/java/org/radarbase/management/repository/RoleRepository.java index a4bc22087..c91c6e9da 100644 --- a/src/main/java/org/radarbase/management/repository/RoleRepository.java +++ b/src/main/java/org/radarbase/management/repository/RoleRepository.java @@ -24,10 +24,16 @@ public interface RoleRepository extends JpaRepository, @Query("select distinct role from Role role left join fetch role.authority") List findAllWithEagerRelationships(); + @Query("select role from Role role join role.authority " + + "where role.organization.id = :organizationId " + + "and role.authority.name = :authorityName") Optional findOneByOrganizationIdAndAuthorityName( @Param("organizationId") Long organizationId, @Param("authorityName") String authorityName); + @Query("select role from Role role join role.authority " + + "where role.project.id = :projectId " + + "and role.authority.name = :authorityName") Optional findOneByProjectIdAndAuthorityName(@Param("projectId") Long projectId, @Param("authorityName") String authorityName); diff --git a/src/main/java/org/radarbase/management/service/RoleService.java b/src/main/java/org/radarbase/management/service/RoleService.java index d33c8231f..27d81d924 100644 --- a/src/main/java/org/radarbase/management/service/RoleService.java +++ b/src/main/java/org/radarbase/management/service/RoleService.java @@ -3,20 +3,31 @@ import java.util.Collections; import java.util.LinkedList; import java.util.List; +import java.util.Map; import java.util.Optional; +import java.util.function.Consumer; import java.util.stream.Collectors; import org.radarbase.auth.authorization.RoleAuthority; import org.radarbase.management.domain.Authority; +import org.radarbase.management.domain.Role; import org.radarbase.management.domain.User; +import org.radarbase.management.repository.AuthorityRepository; +import org.radarbase.management.repository.OrganizationRepository; +import org.radarbase.management.repository.ProjectRepository; import org.radarbase.management.repository.RoleRepository; import org.radarbase.management.service.dto.RoleDTO; import org.radarbase.management.service.mapper.RoleMapper; +import org.radarbase.management.web.rest.errors.BadRequestException; +import org.radarbase.management.web.rest.errors.ErrorConstants; +import org.radarbase.management.web.rest.errors.NotFoundException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import static org.radarbase.management.web.rest.errors.EntityName.USER; + /** * Service Implementation for managing Project. */ @@ -29,6 +40,15 @@ public class RoleService { @Autowired private RoleRepository roleRepository; + @Autowired + private AuthorityRepository authorityRepository; + + @Autowired + private OrganizationRepository organizationRepository; + + @Autowired + private ProjectRepository projectRepository; + @Autowired private RoleMapper roleMapper; @@ -43,7 +63,7 @@ public class RoleService { */ public RoleDTO save(RoleDTO roleDto) { log.debug("Request to save Role : {}", roleDto); - org.radarbase.management.domain.Role role = roleMapper.roleDTOToRole(roleDto); + Role role = roleMapper.roleDTOToRole(roleDto); role = roleRepository.save(role); return roleMapper.roleToRoleDTO(role); } @@ -66,15 +86,16 @@ public List findAll() { } List currentUserAuthorities = currentUser.getAuthorities().stream() .map(Authority::getName).collect(Collectors.toList()); - if (currentUserAuthorities.contains(RoleAuthority.SYS_ADMIN)) { + + if (currentUserAuthorities.contains(RoleAuthority.SYS_ADMIN.authority())) { log.debug("Request to get all Roles"); return roleRepository.findAll().stream() .map(roleMapper::roleToRoleDTO) .collect(Collectors.toList()); - } else if (currentUserAuthorities.contains(RoleAuthority.PROJECT_ADMIN)) { + } else if (currentUserAuthorities.contains(RoleAuthority.PROJECT_ADMIN.authority())) { log.debug("Request to get project admin's project Projects"); return currentUser.getRoles().stream() - .filter(role -> RoleAuthority.PROJECT_ADMIN + .filter(role -> RoleAuthority.PROJECT_ADMIN.authority() .equals(role.getAuthority().getName())) .map(r -> r.getProject().getProjectName()) .distinct() @@ -110,7 +131,7 @@ public List findSuperAdminRoles() { @Transactional(readOnly = true) public RoleDTO findOne(Long id) { log.debug("Request to get Role : {}", id); - org.radarbase.management.domain.Role role = roleRepository.findById(id).get(); + Role role = roleRepository.findById(id).get(); return roleMapper.roleToRoleDTO(role); } @@ -124,6 +145,91 @@ public void delete(Long id) { roleRepository.deleteById(id); } + /** + * Get the predefined role authority from a RoleDTO. + * @param roleDto roleDto to parse + * @return role authority + * @throws BadRequestException if the roleauthority is not found or does not correctly + * specify an organization or project ID. + */ + public static RoleAuthority getRoleAuthority(RoleDTO roleDto) { + RoleAuthority authority; + try { + authority = RoleAuthority.valueOfAuthority(roleDto.getAuthorityName()); + } catch (IllegalArgumentException ex) { + throw new BadRequestException("Authority not found with " + + "authorityName", USER, ErrorConstants.ERR_INVALID_AUTHORITY, + Collections.singletonMap("authorityName", + roleDto.getAuthorityName())); + } + if (authority.scope() == RoleAuthority.Scope.ORGANIZATION + && roleDto.getOrganizationId() == null) { + throw new BadRequestException("Authority with " + + "authorityName should have organization ID", + USER, ErrorConstants.ERR_INVALID_AUTHORITY, + Collections.singletonMap("authorityName", roleDto.getAuthorityName())); + } + if (authority.scope() == RoleAuthority.Scope.PROJECT + && roleDto.getProjectId() == null) { + throw new BadRequestException("Authority with " + + "authorityName should have project ID", + USER, ErrorConstants.ERR_INVALID_AUTHORITY, + Collections.singletonMap("authorityName", roleDto.getAuthorityName())); + } + return authority; + } + + /** + * Get or create given global role. + * @param role to get or create + * @return role from database + */ + public Role getGlobalRole(RoleAuthority role) { + return roleRepository.findRolesByAuthorityName(role.authority()).stream() + .findAny() + .orElseGet(() -> createNewRole(role, r -> { })); + } + + /** + * Get or create given organization role. + * @param role to get or create + * @param organizationId organization ID + * @return role from database + */ + public Role getOrganizationRole(RoleAuthority role, Long organizationId) { + return roleRepository.findOneByOrganizationIdAndAuthorityName( + organizationId, role.authority()) + .orElseGet(() -> createNewRole(role, r -> { + r.setOrganization(organizationRepository.findById(organizationId) + .orElseThrow(() -> new NotFoundException( + "Cannot find organization for authority", + USER, ErrorConstants.ERR_INVALID_AUTHORITY, + Map.of("authorityName", role.authority(), + "projectId", + organizationId.toString())))); + })); + } + + /** + * Get or create given project role. + * @param role to get or create + * @param projectId organization ID + * @return role from database + */ + public Role getProjectRole(RoleAuthority role, Long projectId) { + return roleRepository.findOneByProjectIdAndAuthorityName( + projectId, role.authority()) + .orElseGet(() -> createNewRole(role, r -> { + r.setProject(projectRepository.findById(projectId) + .orElseThrow(() -> new NotFoundException( + "Cannot find project for authority", + USER, ErrorConstants.ERR_INVALID_AUTHORITY, + Map.of("authorityName", role.authority(), + "projectId", + projectId.toString())))); + })); + } + /** * Get all roles related to a project. * @param projectName the project name @@ -137,6 +243,23 @@ public List getRolesByProject(String projectName) { .collect(Collectors.toCollection(LinkedList::new)); } + private Authority getAuthority(RoleAuthority role) { + return authorityRepository.findByAuthorityName(role.authority()) + .orElseGet(() -> { + var a = new Authority(role); + authorityRepository.saveAndFlush(a); + return a; + }); + } + + private Role createNewRole(RoleAuthority role, Consumer apply) { + Role newRole = new Role(); + newRole.setAuthority(getAuthority(role)); + apply.accept(newRole); + roleRepository.save(newRole); + return newRole; + } + /** * Get the role related to the given project with the given authority name. * @param projectName the project name diff --git a/src/main/java/org/radarbase/management/service/UserService.java b/src/main/java/org/radarbase/management/service/UserService.java index 129f305df..6e2df5fb6 100644 --- a/src/main/java/org/radarbase/management/service/UserService.java +++ b/src/main/java/org/radarbase/management/service/UserService.java @@ -3,22 +3,14 @@ import org.radarbase.auth.authorization.RoleAuthority; import org.radarbase.auth.config.Constants; import org.radarbase.management.config.ManagementPortalProperties; -import org.radarbase.management.domain.Authority; import org.radarbase.management.domain.Role; import org.radarbase.management.domain.User; -import org.radarbase.management.repository.AuthorityRepository; -import org.radarbase.management.repository.OrganizationRepository; -import org.radarbase.management.repository.ProjectRepository; -import org.radarbase.management.repository.RoleRepository; import org.radarbase.management.repository.UserRepository; import org.radarbase.management.repository.filters.UserFilter; import org.radarbase.management.security.SecurityUtils; -import org.radarbase.management.service.dto.RoleDTO; import org.radarbase.management.service.dto.UserDTO; import org.radarbase.management.service.mapper.UserMapper; -import org.radarbase.management.web.rest.errors.BadRequestException; import org.radarbase.management.web.rest.errors.ConflictException; -import org.radarbase.management.web.rest.errors.ErrorConstants; import org.radarbase.management.web.rest.errors.NotFoundException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -33,15 +25,15 @@ import java.time.Period; import java.time.ZonedDateTime; import java.util.Arrays; -import java.util.Collections; -import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.Optional; import java.util.Set; +import java.util.stream.Collectors; import static org.radarbase.auth.authorization.RoleAuthority.INACTIVE_PARTICIPANT; import static org.radarbase.auth.authorization.RoleAuthority.PARTICIPANT; +import static org.radarbase.management.service.RoleService.getRoleAuthority; import static org.radarbase.management.web.rest.errors.EntityName.USER; import static org.radarbase.management.web.rest.errors.ErrorConstants.ERR_EMAIL_EXISTS; import static org.radarbase.management.web.rest.errors.ErrorConstants.ERR_ENTITY_NOT_FOUND; @@ -58,17 +50,11 @@ public class UserService { @Autowired private UserRepository userRepository; - @Autowired - private ProjectRepository projectRepository; - - @Autowired - private OrganizationRepository organizationRepository; - @Autowired private PasswordService passwordService; @Autowired - private RoleRepository roleRepository; + private RoleService roleService; @Autowired private UserMapper userMapper; @@ -79,9 +65,6 @@ public class UserService { @Autowired private ManagementPortalProperties managementPortalProperties; - @Autowired - private AuthorityRepository authorityRepository; - /** * Activate a user with the given activation key. * @param key the activation key @@ -193,82 +176,19 @@ public User createUser(UserDTO userDto) { } private Set getUserRoles(UserDTO userDto) { - Set roles = new HashSet<>(); - for (RoleDTO roleDto : userDto.getRoles()) { - RoleAuthority authority = getRoleAuthority(roleDto); - RoleAuthority.Scope scope = authority.scope(); - - Optional existingRole = switch (scope) { - case GLOBAL -> roleRepository.findRolesByAuthorityName( - roleDto.getAuthorityName()).stream().findAny(); - case ORGANIZATION -> roleRepository.findOneByOrganizationIdAndAuthorityName( - roleDto.getOrganizationId(), roleDto.getAuthorityName()); - case PROJECT -> roleRepository.findOneByProjectIdAndAuthorityName( - roleDto.getProjectId(), roleDto.getAuthorityName()); - }; - - Role currentRole = existingRole.orElseGet(() -> { - Role newRole = new Role(); - Authority auth = authorityRepository.findByAuthorityName(authority.authority()) - .orElseGet(() -> { - var a = new Authority(authority); - authorityRepository.save(a); - return a; - }); - newRole.setAuthority(auth); - if (scope == RoleAuthority.Scope.ORGANIZATION) { - var organization = organizationRepository.findById( - roleDto.getOrganizationId()) - .orElseThrow(() -> new NotFoundException( - "Cannot find organization for authority", - USER, ErrorConstants.ERR_INVALID_AUTHORITY, - Map.of("authorityName", roleDto.getAuthorityName(), - "organizationId", - roleDto.getOrganizationId().toString()))); - newRole.setOrganization(organization); - } else if (scope == RoleAuthority.Scope.PROJECT) { - var project = projectRepository.findById( - roleDto.getProjectId()) - .orElseThrow(() -> new NotFoundException( - "Cannot find organization for authority", - USER, ErrorConstants.ERR_INVALID_AUTHORITY, - Map.of("authorityName", roleDto.getAuthorityName(), - "projectId", - roleDto.getProjectId().toString()))); - newRole.setProject(project); - } - return newRole; - }); - roles.add(currentRole); - } - return roles; - } - - private static RoleAuthority getRoleAuthority(RoleDTO roleDto) { - RoleAuthority authority; - try { - authority = RoleAuthority.valueOfAuthority(roleDto.getAuthorityName()); - } catch (IllegalArgumentException ex) { - throw new BadRequestException("Authority not found with " - + "authorityName", USER, ErrorConstants.ERR_INVALID_AUTHORITY, - Collections.singletonMap("authorityName", - roleDto.getAuthorityName())); - } - if (authority.scope() == RoleAuthority.Scope.ORGANIZATION - && roleDto.getOrganizationId() == null) { - throw new BadRequestException("Authority with " - + "authorityName should have organization ID", - USER, ErrorConstants.ERR_INVALID_AUTHORITY, - Collections.singletonMap("authorityName", roleDto.getAuthorityName())); - } - if (authority.scope() == RoleAuthority.Scope.PROJECT - && roleDto.getProjectId() == null) { - throw new BadRequestException("Authority with " - + "authorityName should have project ID", - USER, ErrorConstants.ERR_INVALID_AUTHORITY, - Collections.singletonMap("authorityName", roleDto.getAuthorityName())); - } - return authority; + return userDto.getRoles().stream() + .map(roleDto -> { + RoleAuthority authority = getRoleAuthority(roleDto); + + return switch (authority.scope()) { + case GLOBAL -> roleService.getGlobalRole(authority); + case ORGANIZATION -> roleService.getOrganizationRole(authority, + roleDto.getOrganizationId()); + case PROJECT -> roleService.getProjectRole(authority, + roleDto.getProjectId()); + }; + }) + .collect(Collectors.toSet()); } /** @@ -310,6 +230,7 @@ public void updateUser(String userName, String firstName, String lastName, * @param userDto user to update * @return updated user */ + @Transactional public Optional updateUser(UserDTO userDto) { return userRepository.findById(userDto.getId()) .map(user -> { diff --git a/src/main/webapp/app/shared/permission/permission.component.ts b/src/main/webapp/app/shared/permission/permission.component.ts index 294206c6b..d571e05db 100644 --- a/src/main/webapp/app/shared/permission/permission.component.ts +++ b/src/main/webapp/app/shared/permission/permission.component.ts @@ -161,19 +161,22 @@ export class PermissionComponent implements OnInit, OnDestroy, OnChanges { console.log(this.filteredUsers) const user = this.filteredUsers[0]; if(this.userSearchTerm.includes(user.login)){ - const newRole: Role = {}; //new Role(); + let newRole: Role; if (this.project) { - newRole.authorityName = 'ROLE_PROJECT_ADMIN'; - newRole.projectId = 1; //this.organization.id; - newRole.projectName = 'radar'; // this.organization.organizationName; + newRole = { + authorityName: 'ROLE_PROJECT_ADMIN', + projectId: 1, //this.organization.id, + projectName: 'radar', // this.organization.organizationName, + }; } else if (this.organization) { - newRole.authorityName = this.selectedAuthority; - newRole.organizationId = this.organization.id; - newRole.organizationName = this.organization.name; + newRole = { + authorityName: this.selectedAuthority, + organizationId: this.organization.id, + organizationName: this.organization.name, + }; + } else { + return; } - newRole.authorityName = 'ROLE_PROJECT_ADMIN'; - newRole.projectId = 1; //this.organization.id; - newRole.projectName = 'radar'; // this.organization.organizationName; if (this.hasRole(newRole)) { // this.alertService.error('userManagement.role.error.alreadyExist', null, null); } else { @@ -182,7 +185,6 @@ export class PermissionComponent implements OnInit, OnDestroy, OnChanges { (res)=> { console.log(res); this.getUsers(); - }, (error)=> console.log(error) ); @@ -195,7 +197,7 @@ export class PermissionComponent implements OnInit, OnDestroy, OnChanges { // this.eventManager.broadcast({name: 'roleListModification', content: this.users}); } - getUsers(){ + getUsers() { this.selectedAuthority = null; this.userSearchTerm = null; this.isNotSelected = false; @@ -264,7 +266,7 @@ export class PermissionComponent implements OnInit, OnDestroy, OnChanges { } private onSuccess(data, headers) { - const organizationUsers = this.filterByOrganization(MOCK_USER_DATA); + const organizationUsers = this.filterByOrganization(data); console.log(organizationUsers); this.users = this.filterByOrganization(organizationUsers); } From 8b4e755bbd456f68f970250d4899805f04d45fd8 Mon Sep 17 00:00:00 2001 From: Joris Borgdorff Date: Tue, 7 Dec 2021 11:39:30 +0100 Subject: [PATCH 264/431] Actually check that permission changes are allowed --- config/pmd/ruleset.xml | 1 + gradle/style.gradle | 4 +- .../authorization/RadarAuthorization.java | 18 ++++ .../auth/token/AbstractRadarToken.java | 6 ++ .../radarbase/auth/token/JwtRadarToken.java | 4 +- .../org/radarbase/auth/token/RadarToken.java | 13 +++ .../management/config/SourceTypeLoader.java | 2 +- .../repository/ProjectRepository.java | 5 + .../security/SessionRadarToken.java | 2 +- .../management/service/RoleService.java | 11 +-- .../management/service/SubjectService.java | 9 +- .../management/service/UserService.java | 99 ++++++++++++++----- .../management/config/MockConfiguration.java | 1 + .../service/UserServiceIntTest.java | 9 +- 14 files changed, 136 insertions(+), 48 deletions(-) diff --git a/config/pmd/ruleset.xml b/config/pmd/ruleset.xml index 4d584f940..5d0490655 100644 --- a/config/pmd/ruleset.xml +++ b/config/pmd/ruleset.xml @@ -65,6 +65,7 @@ + diff --git a/gradle/style.gradle b/gradle/style.gradle index 2011e5b62..d9bd5d803 100644 --- a/gradle/style.gradle +++ b/gradle/style.gradle @@ -11,7 +11,7 @@ dependencies { } checkstyle { - toolVersion = '8.45.1' + toolVersion = '9.2' ignoreFailures = false maxWarnings = 0 @@ -19,7 +19,7 @@ checkstyle { } pmd { - toolVersion = '6.36.0' + toolVersion = '6.41.0' ignoreFailures = false consoleOutput = true diff --git a/radar-auth/src/main/java/org/radarbase/auth/authorization/RadarAuthorization.java b/radar-auth/src/main/java/org/radarbase/auth/authorization/RadarAuthorization.java index be73e10e5..6ee9b58e1 100644 --- a/radar-auth/src/main/java/org/radarbase/auth/authorization/RadarAuthorization.java +++ b/radar-auth/src/main/java/org/radarbase/auth/authorization/RadarAuthorization.java @@ -75,6 +75,24 @@ public static void checkPermission(RadarToken token, Permission permission) } } + /** + * Similar to {@link RadarToken#hasGlobalPermission(Permission)}, but this method throws an + * exception rather than returning a boolean. Useful in combination with e.g. Spring's + * controllers and exception translators. + * @param token The token of the authenticated client + * @param permission The permission to check + * @throws NotAuthorizedException if the supplied token does not have the permission + */ + public static void checkGlobalPermission(RadarToken token, Permission permission) + throws NotAuthorizedException { + log.debug("Checking global permission {} for user {}", permission.toString(), + token.getUsername()); + if (!token.hasGlobalPermission(permission)) { + throw new NotAuthorizedException(String.format("Client %s does not have " + + "permission %s", token.getUsername(), permission)); + } + } + /** * Similar to {@link RadarToken#hasPermissionOnOrganization(Permission, String)}, * but this method throws an exception rather than returning a boolean. diff --git a/radar-auth/src/main/java/org/radarbase/auth/token/AbstractRadarToken.java b/radar-auth/src/main/java/org/radarbase/auth/token/AbstractRadarToken.java index e137cdca2..ec94ed27e 100644 --- a/radar-auth/src/main/java/org/radarbase/auth/token/AbstractRadarToken.java +++ b/radar-auth/src/main/java/org/radarbase/auth/token/AbstractRadarToken.java @@ -28,6 +28,12 @@ public boolean hasPermission(Permission permission) { } + @Override + public boolean hasGlobalPermission(Permission permission) { + return hasScope(permission.scope()) + && (isClientCredentials() || hasGlobalAuthorityForPermission(permission)); + } + @Override public boolean hasPermissionOnOrganization(Permission permission, String organization) { return hasScope(permission.scope()) diff --git a/radar-auth/src/main/java/org/radarbase/auth/token/JwtRadarToken.java b/radar-auth/src/main/java/org/radarbase/auth/token/JwtRadarToken.java index 9224d4a5a..0ff56ff23 100644 --- a/radar-auth/src/main/java/org/radarbase/auth/token/JwtRadarToken.java +++ b/radar-auth/src/main/java/org/radarbase/auth/token/JwtRadarToken.java @@ -165,9 +165,9 @@ public String getClaimString(String name) { @Override public List getClaimList(String name) { try { - return jwt.getClaim(name).asList(String.class); + return emptyIfNull(jwt.getClaim(name).asList(String.class)); } catch (JWTDecodeException ex) { - return null; + return List.of(); } } diff --git a/radar-auth/src/main/java/org/radarbase/auth/token/RadarToken.java b/radar-auth/src/main/java/org/radarbase/auth/token/RadarToken.java index 6f4ac13a9..8c266fd03 100644 --- a/radar-auth/src/main/java/org/radarbase/auth/token/RadarToken.java +++ b/radar-auth/src/main/java/org/radarbase/auth/token/RadarToken.java @@ -224,6 +224,19 @@ default Set getRoleAuthorities() { */ boolean hasPermission(Permission permission); + /** + * Check if this token gives the given permission from a global scope. + * + *

      This token must have the permission in its set of scopes. If it's a + * client credentials token, this is the only requirement, as a client credentials token is + * linked to an OAuth client and not to a user in the system. If it's not a client + * credentials token, this also checks to see if the user has a global role with the specified + * permission.

      + * @param permission The permission to check + * @return {@code true} if this token has the permission, {@code false} otherwise + */ + boolean hasGlobalPermission(Permission permission); + /** * Check if this token gives a permission in a specific organization. * @param permission the permission diff --git a/src/main/java/org/radarbase/management/config/SourceTypeLoader.java b/src/main/java/org/radarbase/management/config/SourceTypeLoader.java index 7e56ce24a..d46dfc4f0 100644 --- a/src/main/java/org/radarbase/management/config/SourceTypeLoader.java +++ b/src/main/java/org/radarbase/management/config/SourceTypeLoader.java @@ -119,7 +119,7 @@ public void saveSourceTypesFromCatalogServer(List catalogSour } else { try { // create new source-type - sourceTypeRepository.save(sourceType); + sourceType = sourceTypeRepository.save(sourceType); // create source-data for the new source-type for (CatalogSourceData catalogSourceData : catalogSourceType.getData()) { diff --git a/src/main/java/org/radarbase/management/repository/ProjectRepository.java b/src/main/java/org/radarbase/management/repository/ProjectRepository.java index 44eaf83e8..b17dd3da0 100644 --- a/src/main/java/org/radarbase/management/repository/ProjectRepository.java +++ b/src/main/java/org/radarbase/management/repository/ProjectRepository.java @@ -48,6 +48,11 @@ List findAllByOrganizationName( + "where project.id = :id") Optional findOneWithEagerRelationships(@Param("id") Long id); + @Query("select project from Project project " + + "left join fetch project.organization " + + "where project.id = :id") + Optional findByIdWithOrganization(@Param("id") Long id); + @Query("select project from Project project " + "left join fetch project.sourceTypes " + "left join fetch project.groups " diff --git a/src/main/java/org/radarbase/management/security/SessionRadarToken.java b/src/main/java/org/radarbase/management/security/SessionRadarToken.java index e460fa8b5..e6421c22c 100644 --- a/src/main/java/org/radarbase/management/security/SessionRadarToken.java +++ b/src/main/java/org/radarbase/management/security/SessionRadarToken.java @@ -124,7 +124,7 @@ public String getClaimString(String name) { @Override public List getClaimList(String name) { - return null; + return List.of(); } @Override diff --git a/src/main/java/org/radarbase/management/service/RoleService.java b/src/main/java/org/radarbase/management/service/RoleService.java index 27d81d924..83d37d8c2 100644 --- a/src/main/java/org/radarbase/management/service/RoleService.java +++ b/src/main/java/org/radarbase/management/service/RoleService.java @@ -220,7 +220,7 @@ public Role getProjectRole(RoleAuthority role, Long projectId) { return roleRepository.findOneByProjectIdAndAuthorityName( projectId, role.authority()) .orElseGet(() -> createNewRole(role, r -> { - r.setProject(projectRepository.findById(projectId) + r.setProject(projectRepository.findByIdWithOrganization(projectId) .orElseThrow(() -> new NotFoundException( "Cannot find project for authority", USER, ErrorConstants.ERR_INVALID_AUTHORITY, @@ -245,19 +245,14 @@ public List getRolesByProject(String projectName) { private Authority getAuthority(RoleAuthority role) { return authorityRepository.findByAuthorityName(role.authority()) - .orElseGet(() -> { - var a = new Authority(role); - authorityRepository.saveAndFlush(a); - return a; - }); + .orElseGet(() -> authorityRepository.saveAndFlush(new Authority(role))); } private Role createNewRole(RoleAuthority role, Consumer apply) { Role newRole = new Role(); newRole.setAuthority(getAuthority(role)); apply.accept(newRole); - roleRepository.save(newRole); - return newRole; + return roleRepository.save(newRole); } /** diff --git a/src/main/java/org/radarbase/management/service/SubjectService.java b/src/main/java/org/radarbase/management/service/SubjectService.java index 810c01f5d..cf0ed8ca8 100644 --- a/src/main/java/org/radarbase/management/service/SubjectService.java +++ b/src/main/java/org/radarbase/management/service/SubjectService.java @@ -172,15 +172,10 @@ private Role getProjectParticipantRole(Project project, RoleAuthority authority) .orElseGet(() -> { Role subjectRole = new Role(); Authority auth = authorityRepository.findByAuthorityName(authority.authority()) - .orElseGet(() -> { - var a = new Authority(authority); - authorityRepository.save(a); - return a; - }); + .orElseGet(() -> authorityRepository.save(new Authority(authority))); subjectRole.setAuthority(auth); subjectRole.setProject(project); - roleRepository.save(subjectRole); - return subjectRole; + return roleRepository.save(subjectRole); }); } diff --git a/src/main/java/org/radarbase/management/service/UserService.java b/src/main/java/org/radarbase/management/service/UserService.java index 6e2df5fb6..7aca8ac3a 100644 --- a/src/main/java/org/radarbase/management/service/UserService.java +++ b/src/main/java/org/radarbase/management/service/UserService.java @@ -2,6 +2,8 @@ import org.radarbase.auth.authorization.RoleAuthority; import org.radarbase.auth.config.Constants; +import org.radarbase.auth.exception.NotAuthorizedException; +import org.radarbase.auth.token.RadarToken; import org.radarbase.management.config.ManagementPortalProperties; import org.radarbase.management.domain.Role; import org.radarbase.management.domain.User; @@ -25,12 +27,18 @@ import java.time.Period; import java.time.ZonedDateTime; import java.util.Arrays; +import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.Optional; import java.util.Set; import java.util.stream.Collectors; +import static org.radarbase.auth.authorization.Permission.USER_UPDATE; +import static org.radarbase.auth.authorization.RadarAuthorization.checkGlobalPermission; +import static org.radarbase.auth.authorization.RadarAuthorization.checkPermissionOnOrganization; +import static org.radarbase.auth.authorization.RadarAuthorization.checkPermissionOnOrganizationAndProject; +import static org.radarbase.auth.authorization.RadarAuthorization.checkPermissionOnProject; import static org.radarbase.auth.authorization.RoleAuthority.INACTIVE_PARTICIPANT; import static org.radarbase.auth.authorization.RoleAuthority.PARTICIPANT; import static org.radarbase.management.service.RoleService.getRoleAuthority; @@ -65,6 +73,9 @@ public class UserService { @Autowired private ManagementPortalProperties managementPortalProperties; + @Autowired + private RadarToken token; + /** * Activate a user with the given activation key. * @param key the activation key @@ -153,7 +164,7 @@ public Optional requestPasswordReset(String mail) { * @param userDto the user information * @return the newly created user */ - public User createUser(UserDTO userDto) { + public User createUser(UserDTO userDto) throws NotAuthorizedException { User user = new User(); user.setLogin(userDto.getLogin()); user.setFirstName(userDto.getFirstName()); @@ -169,17 +180,17 @@ public User createUser(UserDTO userDto) { user.setResetDate(ZonedDateTime.now()); user.setActivated(false); - user.setRoles(getUserRoles(userDto)); - userRepository.save(user); + user.setRoles(getUserRoles(userDto, Set.of())); + user = userRepository.save(user); log.debug("Created Information for User: {}", user); return user; } - private Set getUserRoles(UserDTO userDto) { - return userDto.getRoles().stream() + private Set getUserRoles(UserDTO userDto, Set oldRoles) + throws NotAuthorizedException { + var roles = userDto.getRoles().stream() .map(roleDto -> { RoleAuthority authority = getRoleAuthority(roleDto); - return switch (authority.scope()) { case GLOBAL -> roleService.getGlobalRole(authority); case ORGANIZATION -> roleService.getOrganizationRole(authority, @@ -189,6 +200,45 @@ private Set getUserRoles(UserDTO userDto) { }; }) .collect(Collectors.toSet()); + + checkAuthorityForRoleChange(roles, oldRoles); + + return roles; + } + + private void checkAuthorityForRoleChange(Set roles, Set oldRoles) + throws NotAuthorizedException { + var updatedRoles = new HashSet<>(roles); + updatedRoles.removeAll(oldRoles); + for (Role r : updatedRoles) { + checkAuthorityForRoleChange(r); + } + + var removedRoles = new HashSet<>(oldRoles); + removedRoles.removeAll(roles); + for (Role r : removedRoles) { + checkAuthorityForRoleChange(r); + } + } + + private void checkAuthorityForRoleChange(Role role) + throws NotAuthorizedException { + switch (role.getRole().scope()) { + case GLOBAL -> checkGlobalPermission(token, USER_UPDATE); + case ORGANIZATION -> checkPermissionOnOrganization(token, USER_UPDATE, + role.getOrganization().getName()); + case PROJECT -> { + if (role.getProject().getOrganization() != null) { + checkPermissionOnOrganizationAndProject(token, USER_UPDATE, + role.getProject().getOrganization().getName(), + role.getProject().getProjectName()); + } else { + checkPermissionOnProject(token, USER_UPDATE, + role.getProject().getProjectName()); + } + } + default -> { } + } } /** @@ -231,23 +281,26 @@ public void updateUser(String userName, String firstName, String lastName, * @return updated user */ @Transactional - public Optional updateUser(UserDTO userDto) { - return userRepository.findById(userDto.getId()) - .map(user -> { - user.setLogin(userDto.getLogin()); - user.setFirstName(userDto.getFirstName()); - user.setLastName(userDto.getLastName()); - user.setEmail(userDto.getEmail()); - user.setActivated(userDto.isActivated()); - user.setLangKey(userDto.getLangKey()); - Set managedRoles = user.getRoles(); - managedRoles.clear(); - managedRoles.addAll(getUserRoles(userDto)); - - log.debug("Changed Information for User: {}", user); - return user; - }) - .map(userMapper::userToUserDTO); + public Optional updateUser(UserDTO userDto) throws NotAuthorizedException { + Optional userOpt = userRepository.findById(userDto.getId()); + if (userOpt.isPresent()) { + User user = userOpt.get(); + user.setLogin(userDto.getLogin()); + user.setFirstName(userDto.getFirstName()); + user.setLastName(userDto.getLastName()); + user.setEmail(userDto.getEmail()); + user.setActivated(userDto.isActivated()); + user.setLangKey(userDto.getLangKey()); + Set managedRoles = user.getRoles(); + Set oldRoles = Set.copyOf(managedRoles); + managedRoles.clear(); + managedRoles.addAll(getUserRoles(userDto, oldRoles)); + user = userRepository.save(user); + log.debug("Changed Information for User: {}", user); + return Optional.of(userMapper.userToUserDTO(user)); + } else { + return Optional.empty(); + } } /** diff --git a/src/test/java/org/radarbase/management/config/MockConfiguration.java b/src/test/java/org/radarbase/management/config/MockConfiguration.java index a8a1d82ed..066aa8f04 100644 --- a/src/test/java/org/radarbase/management/config/MockConfiguration.java +++ b/src/test/java/org/radarbase/management/config/MockConfiguration.java @@ -36,6 +36,7 @@ public RadarToken radarTokenMock() { when(token.getUsername()).thenReturn("admin"); when(token.hasAuthority(any())).thenAnswer(a -> a.getArgument(0).equals(SYS_ADMIN)); when(token.hasPermission(any())).thenReturn(true); + when(token.hasGlobalPermission(any())).thenReturn(true); when(token.hasPermissionOnOrganization(any(), any())).thenReturn(true); when(token.hasPermissionOnOrganizationAndProject(any(), any(), any())).thenReturn(true); when(token.hasPermissionOnProject(any(), any())).thenReturn(true); diff --git a/src/test/java/org/radarbase/management/service/UserServiceIntTest.java b/src/test/java/org/radarbase/management/service/UserServiceIntTest.java index 775790ec5..a30579b6d 100644 --- a/src/test/java/org/radarbase/management/service/UserServiceIntTest.java +++ b/src/test/java/org/radarbase/management/service/UserServiceIntTest.java @@ -7,6 +7,7 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.radarbase.auth.config.Constants; +import org.radarbase.auth.exception.NotAuthorizedException; import org.radarbase.management.ManagementPortalTestApp; import org.radarbase.management.domain.Authority; import org.radarbase.management.domain.Role; @@ -138,7 +139,7 @@ void assertThatUserMustExistToResetPassword() { } @Test - void assertThatOnlyActivatedUserCanRequestPasswordReset() { + void assertThatOnlyActivatedUserCanRequestPasswordReset() throws NotAuthorizedException { User user = userService.createUser(userDto); Optional maybeUser = userService.requestPasswordReset(userDto.getEmail()); assertThat(maybeUser).isNotPresent(); @@ -146,7 +147,7 @@ void assertThatOnlyActivatedUserCanRequestPasswordReset() { } @Test - void assertThatResetKeyMustNotBeOlderThan24Hours() { + void assertThatResetKeyMustNotBeOlderThan24Hours() throws NotAuthorizedException { User user = userService.createUser(userDto); ZonedDateTime daysAgo = ZonedDateTime.now().minusHours(25); @@ -166,7 +167,7 @@ void assertThatResetKeyMustNotBeOlderThan24Hours() { } @Test - void assertThatResetKeyMustBeValid() { + void assertThatResetKeyMustBeValid() throws NotAuthorizedException { User user = userService.createUser(userDto); ZonedDateTime daysAgo = ZonedDateTime.now().minusHours(25); user.setActivated(true); @@ -180,7 +181,7 @@ void assertThatResetKeyMustBeValid() { } @Test - void assertThatUserCanResetPassword() { + void assertThatUserCanResetPassword() throws NotAuthorizedException { User user = userService.createUser(userDto); final String oldPassword = user.getPassword(); ZonedDateTime daysAgo = ZonedDateTime.now().minusHours(2); From 9cbe76e2b593b5cbe6d4f82fea69e0ffbd8b9c23 Mon Sep 17 00:00:00 2001 From: Joris Borgdorff Date: Tue, 7 Dec 2021 12:05:39 +0100 Subject: [PATCH 265/431] Allow updating permissions by non sys-admins --- .../management/service/UserService.java | 35 ++++++++++---- .../management/web/rest/UserResource.java | 48 ++++++++++++++----- .../organization/organization.service.ts | 3 -- .../shared/permission/permission.component.ts | 4 +- .../webapp/app/shared/user/user.service.ts | 7 +++ 5 files changed, 73 insertions(+), 24 deletions(-) diff --git a/src/main/java/org/radarbase/management/service/UserService.java b/src/main/java/org/radarbase/management/service/UserService.java index 7aca8ac3a..6be881b7a 100644 --- a/src/main/java/org/radarbase/management/service/UserService.java +++ b/src/main/java/org/radarbase/management/service/UserService.java @@ -10,6 +10,7 @@ import org.radarbase.management.repository.UserRepository; import org.radarbase.management.repository.filters.UserFilter; import org.radarbase.management.security.SecurityUtils; +import org.radarbase.management.service.dto.RoleDTO; import org.radarbase.management.service.dto.UserDTO; import org.radarbase.management.service.mapper.UserMapper; import org.radarbase.management.web.rest.errors.ConflictException; @@ -34,6 +35,7 @@ import java.util.Set; import java.util.stream.Collectors; +import static org.radarbase.auth.authorization.Permission.ROLE_UPDATE; import static org.radarbase.auth.authorization.Permission.USER_UPDATE; import static org.radarbase.auth.authorization.RadarAuthorization.checkGlobalPermission; import static org.radarbase.auth.authorization.RadarAuthorization.checkPermissionOnOrganization; @@ -180,15 +182,18 @@ public User createUser(UserDTO userDto) throws NotAuthorizedException { user.setResetDate(ZonedDateTime.now()); user.setActivated(false); - user.setRoles(getUserRoles(userDto, Set.of())); + user.setRoles(getUserRoles(userDto.getRoles(), Set.of())); user = userRepository.save(user); log.debug("Created Information for User: {}", user); return user; } - private Set getUserRoles(UserDTO userDto, Set oldRoles) + private Set getUserRoles(Set roleDtos, Set oldRoles) throws NotAuthorizedException { - var roles = userDto.getRoles().stream() + if (roleDtos == null) { + return null; + } + var roles = roleDtos.stream() .map(roleDto -> { RoleAuthority authority = getRoleAuthority(roleDto); return switch (authority.scope()) { @@ -224,16 +229,16 @@ private void checkAuthorityForRoleChange(Set roles, Set oldRoles) private void checkAuthorityForRoleChange(Role role) throws NotAuthorizedException { switch (role.getRole().scope()) { - case GLOBAL -> checkGlobalPermission(token, USER_UPDATE); - case ORGANIZATION -> checkPermissionOnOrganization(token, USER_UPDATE, + case GLOBAL -> checkGlobalPermission(token, ROLE_UPDATE); + case ORGANIZATION -> checkPermissionOnOrganization(token, ROLE_UPDATE, role.getOrganization().getName()); case PROJECT -> { if (role.getProject().getOrganization() != null) { - checkPermissionOnOrganizationAndProject(token, USER_UPDATE, + checkPermissionOnOrganizationAndProject(token, ROLE_UPDATE, role.getProject().getOrganization().getName(), role.getProject().getProjectName()); } else { - checkPermissionOnProject(token, USER_UPDATE, + checkPermissionOnProject(token, ROLE_UPDATE, role.getProject().getProjectName()); } } @@ -294,7 +299,7 @@ public Optional updateUser(UserDTO userDto) throws NotAuthorizedExcepti Set managedRoles = user.getRoles(); Set oldRoles = Set.copyOf(managedRoles); managedRoles.clear(); - managedRoles.addAll(getUserRoles(userDto, oldRoles)); + managedRoles.addAll(getUserRoles(userDto.getRoles(), oldRoles)); user = userRepository.save(user); log.debug("Changed Information for User: {}", user); return Optional.of(userMapper.userToUserDTO(user)); @@ -397,4 +402,18 @@ public void removeNotActivatedUsers() { public Page findUsers(UserFilter userFilter, Pageable pageable) { return userRepository.findAll(userFilter, pageable).map(userMapper::userToUserDTO); } + + @Transactional + public void updateRoles(String login, Set roleDtos) throws NotAuthorizedException { + var user = userRepository.findOneByLogin(login) + .orElseThrow(() -> new NotFoundException( + "User with login " + login + " not found", USER, + ERR_ENTITY_NOT_FOUND, Map.of("user", login))); + + Set managedRoles = user.getRoles(); + Set oldRoles = Set.copyOf(managedRoles); + managedRoles.clear(); + managedRoles.addAll(getUserRoles(roleDtos, oldRoles)); + userRepository.save(user); + } } diff --git a/src/main/java/org/radarbase/management/web/rest/UserResource.java b/src/main/java/org/radarbase/management/web/rest/UserResource.java index 26bbab9e6..dd3392d40 100644 --- a/src/main/java/org/radarbase/management/web/rest/UserResource.java +++ b/src/main/java/org/radarbase/management/web/rest/UserResource.java @@ -13,6 +13,7 @@ import org.radarbase.management.service.MailService; import org.radarbase.management.service.ResourceUriService; import org.radarbase.management.service.UserService; +import org.radarbase.management.service.dto.RoleDTO; import org.radarbase.management.service.dto.UserDTO; import org.radarbase.management.web.rest.errors.InvalidRequestException; import org.radarbase.management.web.rest.util.HeaderUtil; @@ -40,7 +41,10 @@ import java.util.List; import java.util.Locale; import java.util.Optional; +import java.util.Set; +import static org.radarbase.auth.authorization.Permission.ROLE_READ; +import static org.radarbase.auth.authorization.Permission.ROLE_UPDATE; import static org.radarbase.auth.authorization.Permission.USER_CREATE; import static org.radarbase.auth.authorization.Permission.USER_DELETE; import static org.radarbase.auth.authorization.Permission.USER_READ; @@ -114,7 +118,7 @@ public class UserResource { public ResponseEntity createUser(@RequestBody ManagedUserVM managedUserVm) throws URISyntaxException, NotAuthorizedException { log.debug("REST request to save User : {}", managedUserVm); - checkAuthorityAndPermission(token, SYS_ADMIN, USER_CREATE); + checkPermission(token, USER_CREATE); if (managedUserVm.getId() != null) { return ResponseEntity.badRequest() .headers(HeaderUtil.createFailureAlert(USER, "idexists", @@ -134,11 +138,6 @@ public ResponseEntity createUser(@RequestBody ManagedUserVM managedUserVm) .createFailureAlert(USER, "emailexists", "Email already in use")) .body(null); - } else if (managedUserVm.getRoles() == null || managedUserVm.getRoles().isEmpty()) { - return ResponseEntity.badRequest() - .headers(HeaderUtil.createFailureAlert(USER, "rolesRequired", - "One or more roles are required")) - .body(null); } else { User newUser = userService.createUser(managedUserVm); mailService.sendCreationEmail(newUser, managementPortalProperties.getCommon() @@ -178,11 +177,6 @@ public ResponseEntity updateUser(@RequestBody ManagedUserVM managedUser .createFailureAlert(USER, "userexists", "Login already in use")) .body(null); } - if (managedUserVm.getRoles() == null || managedUserVm.getRoles().isEmpty()) { - return ResponseEntity.badRequest() - .headers(HeaderUtil.createEntityUpdateAlert(USER, "rolesRequired")) - .body(null); - } Optional subject = subjectRepository .findOneWithEagerBySubjectLogin(managedUserVm.getLogin()); @@ -257,4 +251,36 @@ public ResponseEntity deleteUser(@PathVariable String login) return ResponseEntity.ok().headers(HeaderUtil.createAlert("userManagement.deleted", login)) .build(); } + + /** + * Get /users/:login/roles : get the "login" User roles. + * + * @param login the login of the user to get roles from + * @return the ResponseEntity with status 200 (OK) + */ + @GetMapping("/users/{login:" + Constants.ENTITY_ID_REGEX + "}/roles") + @Timed + public ResponseEntity> getUserRoles(@PathVariable String login) + throws NotAuthorizedException { + log.debug("REST request to read User roles: {}", login); + checkPermission(token, ROLE_READ); + return ResponseUtil.wrapOrNotFound(userService.getUserWithAuthoritiesByLogin(login) + .map(UserDTO::getRoles)); + } + + /** + * PUT /users/:login/roles : get the "login" User roles. + * + * @param login the login of the user to get roles from + * @return the ResponseEntity with status 200 (OK) + */ + @GetMapping("/users/{login:" + Constants.ENTITY_ID_REGEX + "}/roles") + @Timed + public ResponseEntity putUserRoles(@PathVariable String login, + @RequestBody Set roleDtos) throws NotAuthorizedException { + log.debug("REST request to update User roles: {} to {}", login, roleDtos); + checkPermission(token, ROLE_UPDATE); + userService.updateRoles(login, roleDtos); + return ResponseEntity.noContent().build(); + } } diff --git a/src/main/webapp/app/shared/organization/organization.service.ts b/src/main/webapp/app/shared/organization/organization.service.ts index 6d81fb04c..4df517a9a 100644 --- a/src/main/webapp/app/shared/organization/organization.service.ts +++ b/src/main/webapp/app/shared/organization/organization.service.ts @@ -3,13 +3,10 @@ import {HttpClient, HttpResponse} from '@angular/common/http'; import {BehaviorSubject, combineLatest, Observable, of, Subject, throwError} from 'rxjs'; import { Organization } from './organization.model'; -import {Project} from "../project"; import {Principal} from "../auth/principal.service"; import {AlertService} from "../util/alert.service"; import {concatMap, delay, map, pluck, retryWhen, startWith, switchMap, take, tap} from "rxjs/operators"; import {createRequestOption} from "../model/request.utils"; -import {SourceType} from "../../entities/source-type"; -import {convertDateTimeFromServer, toDate} from "../util/date-util"; @Injectable({ providedIn: 'root' }) export class OrganizationService { diff --git a/src/main/webapp/app/shared/permission/permission.component.ts b/src/main/webapp/app/shared/permission/permission.component.ts index d571e05db..4e05dabf2 100644 --- a/src/main/webapp/app/shared/permission/permission.component.ts +++ b/src/main/webapp/app/shared/permission/permission.component.ts @@ -181,7 +181,7 @@ export class PermissionComponent implements OnInit, OnDestroy, OnChanges { // this.alertService.error('userManagement.role.error.alreadyExist', null, null); } else { user.roles.push(newRole); - this.userService.update(user).subscribe( + this.userService.updateRoles(user).subscribe( (res)=> { console.log(res); this.getUsers(); @@ -243,7 +243,7 @@ export class PermissionComponent implements OnInit, OnDestroy, OnChanges { authorities.splice(authorities.findIndex(authority => authority === this.selectedAuthority), 1); user.authorities = authorities; - this.userService.update(user).subscribe( + this.userService.updateRoles(user).subscribe( (res)=> { console.log(res); this.getUsers(); diff --git a/src/main/webapp/app/shared/user/user.service.ts b/src/main/webapp/app/shared/user/user.service.ts index d7e3bb823..0cfb88e4f 100644 --- a/src/main/webapp/app/shared/user/user.service.ts +++ b/src/main/webapp/app/shared/user/user.service.ts @@ -20,6 +20,13 @@ export class UserService { return this.http.put(this.resourceUrl, user); } + updateRoles(user: User): Observable { + return this.http.put( + `${this.resourceUrl}/${encodeURIComponent(user.login)}/roles`, + user.roles, + ); + } + find(login: string): Observable { return this.http.get(`${this.resourceUrl}/${encodeURIComponent(login)}`); } From 85f882c9a776fa311c9d1f57f2a6014c0acbaeb3 Mon Sep 17 00:00:00 2001 From: Joris Borgdorff Date: Tue, 7 Dec 2021 12:14:23 +0100 Subject: [PATCH 266/431] Remove broken codacy workflow --- .github/workflows/main.yml | 6 ------ README.md | 2 -- gradle/style.gradle | 24 ------------------------ 3 files changed, 32 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 60334752f..bb51f4887 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -64,12 +64,6 @@ jobs: if: always() run: ./gradlew check - - name: Codacy - if: steps.gradle-check.outcome != 'cancelled' - env: - CODACY_PROJECT_TOKEN: ${{ secrets.CODACY_PROJECT_TOKEN }} - run: ./gradlew sendCoverageToCodacy - - name: End to end tests id: e2e run: | diff --git a/README.md b/README.md index 18a62935f..ec71f30cc 100644 --- a/README.md +++ b/README.md @@ -2,8 +2,6 @@ [![Latest release](https://img.shields.io/github/v/release/RADAR-base/ManagementPortal)](https://github.com/RADAR-base/ManagementPortal/releases/latest) [![Build Status](https://github.com/RADAR-base/ManagementPortal/actions/workflows/main.yml/badge.svg?branch=master)](https://github.com/RADAR-base/ManagementPortal/actions/workflows/main.yml?query=branch%3Amaster) -[![Codacy Badge](https://api.codacy.com/project/badge/Grade/d6945ebd1eba4a3fbb55882cda33655e)](https://www.codacy.com/app/RADAR-base/ManagementPortal?utm_source=github.com&utm_medium=referral&utm_content=RADAR-base/ManagementPortal&utm_campaign=Badge_Grade) -[![Codacy Badge](https://api.codacy.com/project/badge/Coverage/d6945ebd1eba4a3fbb55882cda33655e)](https://www.codacy.com/app/RADAR-base/ManagementPortal?utm_source=github.com&utm_medium=referral&utm_content=RADAR-base/ManagementPortal&utm_campaign=Badge_Coverage) Management Portal is an application which is used to manage clinical studies for [RADAR-base](http://www.radar-base.org/) platform. diff --git a/gradle/style.gradle b/gradle/style.gradle index 2011e5b62..5c4f4e03c 100644 --- a/gradle/style.gradle +++ b/gradle/style.gradle @@ -1,14 +1,5 @@ apply plugin: 'checkstyle' apply plugin: 'pmd' -apply plugin: 'jacoco' - -configurations { - codacy -} - -dependencies { - codacy group: 'com.codacy', name: 'codacy-coverage-reporter', version: codacyVersion -} checkstyle { toolVersion = '8.45.1' @@ -31,18 +22,3 @@ pmd { pmdTest { ruleSetFiles = rootProject.files("config/pmd/test_ruleset.xml") } - -jacocoTestReport { - reports { - xml.required = true - csv.required = false - html.required = true - } - dependsOn test -} - -task sendCoverageToCodacy(type: JavaExec, dependsOn: jacocoTestReport) { - mainClass.set('com.codacy.CodacyCoverageReporter') - classpath = configurations.codacy - args = ['report', '-l', 'Java', '-r', "${buildDir}/reports/jacoco/test/jacocoTestReport.xml"] -} From d8dd3394ff5cc4b88c5ac9bae514f992e30b5420 Mon Sep 17 00:00:00 2001 From: Joris Borgdorff Date: Tue, 7 Dec 2021 12:31:39 +0100 Subject: [PATCH 267/431] Simplify RadarToken API --- .../auth/token/AbstractRadarToken.java | 14 +++--- .../org/radarbase/auth/token/RadarToken.java | 44 ++----------------- 2 files changed, 10 insertions(+), 48 deletions(-) diff --git a/radar-auth/src/main/java/org/radarbase/auth/token/AbstractRadarToken.java b/radar-auth/src/main/java/org/radarbase/auth/token/AbstractRadarToken.java index ec94ed27e..69fdfe2ab 100644 --- a/radar-auth/src/main/java/org/radarbase/auth/token/AbstractRadarToken.java +++ b/radar-auth/src/main/java/org/radarbase/auth/token/AbstractRadarToken.java @@ -106,9 +106,8 @@ protected boolean hasAuthorityForOrganization(Permission permission, String orga if (organization == null) { return false; } - Set organizationRoles = getOrganizationRoles().get(organization); - return organizationRoles != null - && organizationRoles.stream().anyMatch(permission::isRoleAllowed); + return getReferentsWithPermission(RoleAuthority.Scope.ORGANIZATION, permission) + .anyMatch(organization::equals); } /** @@ -146,12 +145,11 @@ protected boolean hasAuthorityForProject( if (projectName == null) { return false; } - Set projectRoles = getProjectRoles().get(projectName); - return projectRoles != null && projectRoles.stream() - .anyMatch(role -> permission.isRoleAllowed(role) + return getAuthorityReferencesWithPermission(RoleAuthority.Scope.PROJECT, permission) + .anyMatch(r -> projectName.equals(r.getReferent()) && (personalRoleCondition == null - || !role.isPersonal() - || personalRoleCondition.test(role))); + || !r.getRole().isPersonal() + || personalRoleCondition.test(r.getRole()))); } /** diff --git a/radar-auth/src/main/java/org/radarbase/auth/token/RadarToken.java b/radar-auth/src/main/java/org/radarbase/auth/token/RadarToken.java index 8c266fd03..3bde4e0ca 100644 --- a/radar-auth/src/main/java/org/radarbase/auth/token/RadarToken.java +++ b/radar-auth/src/main/java/org/radarbase/auth/token/RadarToken.java @@ -26,44 +26,10 @@ public interface RadarToken { */ Set getRoles(); - /** - * Get the global roles (not organization or project-specific) defined in this token. - * @return non-null map describing the roles defined in this token. The keys in the map are the - * project names, and the values are lists of authority names associated to the project. - */ - default Set getGlobalRoles() { - return Stream.concat( - getAuthorities().stream() - .map(RoleAuthority::valueOfAuthorityOrNull) - .filter(Objects::nonNull), - getRoles().stream() - .map(AuthorityReference::getRole)) - .filter(r -> r.scope() == RoleAuthority.Scope.GLOBAL) - .collect(toEnumSet()); - } - - /** - * Get the project roles defined in this token. - * @return non-null map describing the roles defined in this token. The keys in the map are the - * project names, and the values are lists of authority names associated to the project. - */ - default Map> getProjectRoles() { + default Stream getAuthorityReferencesWithPermission( + RoleAuthority.Scope scope, Permission permission) { return getRoles().stream() - .filter(r -> r.getRole().scope() == RoleAuthority.Scope.PROJECT - && r.getReferent() != null) - .collect(groupingByReferent()); - } - - /** - * Get the organization roles defined in this token. - * @return non-null map describing the roles defined in this token. The keys in the map are the - * project names, and the values are lists of authority names associated to the project. - */ - default Map> getOrganizationRoles() { - return getRoles().stream() - .filter(r -> r.getRole().scope() == RoleAuthority.Scope.ORGANIZATION - && r.getReferent() != null) - .collect(groupingByReferent()); + .filter(r -> r.getRole().scope() == scope && permission.isRoleAllowed(r.getRole())); } /** @@ -75,9 +41,7 @@ default Map> getOrganizationRoles() { */ default Stream getReferentsWithPermission(RoleAuthority.Scope scope, Permission permission) { - return getRoles().stream() - .filter(r -> r.getRole().scope() == scope - && permission.isRoleAllowed(r.getRole())) + return getAuthorityReferencesWithPermission(scope, permission) .map(AuthorityReference::getReferent) .filter(Objects::nonNull); } From d2e6fc568b934eb89ab6ffe549a716be06e6bac5 Mon Sep 17 00:00:00 2001 From: Joris Borgdorff Date: Tue, 7 Dec 2021 13:51:31 +0100 Subject: [PATCH 268/431] Fix tests --- .../radarbase/auth/token/AbstractRadarToken.java | 1 - .../auth/token/AbstractRadarTokenTest.java | 4 ++-- .../management/security/ClaimsTokenEnhancer.java | 15 +++++++++++---- .../radarbase/management/service/UserService.java | 8 +++++++- .../management/web/rest/UserResource.java | 2 +- 5 files changed, 21 insertions(+), 9 deletions(-) diff --git a/radar-auth/src/main/java/org/radarbase/auth/token/AbstractRadarToken.java b/radar-auth/src/main/java/org/radarbase/auth/token/AbstractRadarToken.java index 69fdfe2ab..e2122b712 100644 --- a/radar-auth/src/main/java/org/radarbase/auth/token/AbstractRadarToken.java +++ b/radar-auth/src/main/java/org/radarbase/auth/token/AbstractRadarToken.java @@ -4,7 +4,6 @@ import org.radarbase.auth.authorization.RoleAuthority; import java.util.Objects; -import java.util.Set; import java.util.function.Predicate; import java.util.stream.Stream; diff --git a/radar-auth/src/test/java/org/radarbase/auth/token/AbstractRadarTokenTest.java b/radar-auth/src/test/java/org/radarbase/auth/token/AbstractRadarTokenTest.java index 2dcb758f5..38f04ee93 100644 --- a/radar-auth/src/test/java/org/radarbase/auth/token/AbstractRadarTokenTest.java +++ b/radar-auth/src/test/java/org/radarbase/auth/token/AbstractRadarTokenTest.java @@ -71,7 +71,7 @@ public Date getExpiresAt() { @Override public List getAudience() { - return null; + return List.of(); } @Override @@ -101,7 +101,7 @@ public String getClaimString(String name) { @Override public List getClaimList(String name) { - return null; + return List.of(); } } diff --git a/src/main/java/org/radarbase/management/security/ClaimsTokenEnhancer.java b/src/main/java/org/radarbase/management/security/ClaimsTokenEnhancer.java index 054334d88..cb1f93f58 100644 --- a/src/main/java/org/radarbase/management/security/ClaimsTokenEnhancer.java +++ b/src/main/java/org/radarbase/management/security/ClaimsTokenEnhancer.java @@ -56,10 +56,17 @@ public OAuth2AccessToken enhance(OAuth2AccessToken accessToken, userRepository.findOneByLogin(userName) .ifPresent(user -> { - List roles = user.getRoles().stream() - .filter(role -> role.getProject() != null) - .map(role -> role.getProject().getProjectName() + ":" - + role.getAuthority().getName()) + var roles = user.getRoles().stream() + .map(role -> { + var auth = role.getAuthority().getName(); + return switch (role.getRole().scope()) { + case GLOBAL -> auth; + case ORGANIZATION -> role.getOrganization().getName() + + ":" + auth; + case PROJECT -> role.getProject().getProjectName() + + ":" + auth; + }; + }) .collect(Collectors.toList()); additionalInfo.put(JwtRadarToken.ROLES_CLAIM, roles); }); diff --git a/src/main/java/org/radarbase/management/service/UserService.java b/src/main/java/org/radarbase/management/service/UserService.java index 6be881b7a..5a8e309dc 100644 --- a/src/main/java/org/radarbase/management/service/UserService.java +++ b/src/main/java/org/radarbase/management/service/UserService.java @@ -36,7 +36,6 @@ import java.util.stream.Collectors; import static org.radarbase.auth.authorization.Permission.ROLE_UPDATE; -import static org.radarbase.auth.authorization.Permission.USER_UPDATE; import static org.radarbase.auth.authorization.RadarAuthorization.checkGlobalPermission; import static org.radarbase.auth.authorization.RadarAuthorization.checkPermissionOnOrganization; import static org.radarbase.auth.authorization.RadarAuthorization.checkPermissionOnOrganizationAndProject; @@ -403,6 +402,13 @@ public Page findUsers(UserFilter userFilter, Pageable pageable) { return userRepository.findAll(userFilter, pageable).map(userMapper::userToUserDTO); } + /** + * Update the roles of the given user. + * @param login user login + * @param roleDtos new roles to set + * @throws NotAuthorizedException if the current user is not allowed to modify the roles + * of the target user. + */ @Transactional public void updateRoles(String login, Set roleDtos) throws NotAuthorizedException { var user = userRepository.findOneByLogin(login) diff --git a/src/main/java/org/radarbase/management/web/rest/UserResource.java b/src/main/java/org/radarbase/management/web/rest/UserResource.java index dd3392d40..6cdbeca44 100644 --- a/src/main/java/org/radarbase/management/web/rest/UserResource.java +++ b/src/main/java/org/radarbase/management/web/rest/UserResource.java @@ -274,7 +274,7 @@ public ResponseEntity> getUserRoles(@PathVariable String login) * @param login the login of the user to get roles from * @return the ResponseEntity with status 200 (OK) */ - @GetMapping("/users/{login:" + Constants.ENTITY_ID_REGEX + "}/roles") + @PutMapping("/users/{login:" + Constants.ENTITY_ID_REGEX + "}/roles") @Timed public ResponseEntity putUserRoles(@PathVariable String login, @RequestBody Set roleDtos) throws NotAuthorizedException { From 3bc60e9d68c5a62f60b0e983f6acec0450f5e38e Mon Sep 17 00:00:00 2001 From: Joris Borgdorff Date: Wed, 8 Dec 2021 13:31:45 +0100 Subject: [PATCH 269/431] fix docs Co-authored-by: aykl --- .../java/org/radarbase/management/web/rest/UserResource.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/radarbase/management/web/rest/UserResource.java b/src/main/java/org/radarbase/management/web/rest/UserResource.java index 6cdbeca44..1bdcc089a 100644 --- a/src/main/java/org/radarbase/management/web/rest/UserResource.java +++ b/src/main/java/org/radarbase/management/web/rest/UserResource.java @@ -269,7 +269,7 @@ public ResponseEntity> getUserRoles(@PathVariable String login) } /** - * PUT /users/:login/roles : get the "login" User roles. + * PUT /users/:login/roles : update the "login" User roles. * * @param login the login of the user to get roles from * @return the ResponseEntity with status 200 (OK) From 2cd7aaa1d814d959bbf2e6f57f5161758ffb849a Mon Sep 17 00:00:00 2001 From: Joris Borgdorff Date: Wed, 8 Dec 2021 14:17:32 +0100 Subject: [PATCH 270/431] Fix yarn test --- .../organization-detail.component.html | 2 +- .../organization-detail.component.spec.ts | 15 ++++--- .../organization-detail.component.ts | 44 +++++++++++-------- .../shared/permission/permission.component.ts | 6 ++- 4 files changed, 38 insertions(+), 29 deletions(-) diff --git a/src/main/webapp/app/entities/organization/organization-detail.component.html b/src/main/webapp/app/entities/organization/organization-detail.component.html index 0dc950172..bbee106bc 100644 --- a/src/main/webapp/app/entities/organization/organization-detail.component.html +++ b/src/main/webapp/app/entities/organization/organization-detail.component.html @@ -1,4 +1,4 @@ -
      +

      diff --git a/src/main/webapp/app/entities/organization/organization-detail.component.spec.ts b/src/main/webapp/app/entities/organization/organization-detail.component.spec.ts index 0ec3b630a..fce7ab731 100644 --- a/src/main/webapp/app/entities/organization/organization-detail.component.spec.ts +++ b/src/main/webapp/app/entities/organization/organization-detail.component.spec.ts @@ -24,7 +24,7 @@ describe('Component Tests', () => { DatePipe, { provide: ActivatedRoute, - useValue: new MockActivatedRoute({projectName: 'testProject'}) + useValue: new MockActivatedRoute({organizationName: 'testOrganization'}) }, ProjectService, EventManager @@ -39,19 +39,20 @@ describe('Component Tests', () => { }); describe('OnInit', () => { - it('Should call load all on init', () => { + it('Should call load all on init', waitForAsync(async () => { // GIVEN - spyOn(service, 'find').and.returnValue(of(new Project(10))); + spyOn(service, 'find').and.returnValue(of({id: 10})); // WHEN comp.ngOnInit(); // THEN - expect(service.find).toHaveBeenCalledWith('testProject'); - expect(comp.organization).toEqual(jasmine.objectContaining({id: 10})); - }); + let org = await comp.organization$.toPromise(); + expect(org).toEqual(jasmine.objectContaining({id: 10})); + + expect(service.find).toHaveBeenCalledWith('testOrganization'); + })); }); }); - }); diff --git a/src/main/webapp/app/entities/organization/organization-detail.component.ts b/src/main/webapp/app/entities/organization/organization-detail.component.ts index 982c6f469..2e8351326 100644 --- a/src/main/webapp/app/entities/organization/organization-detail.component.ts +++ b/src/main/webapp/app/entities/organization/organization-detail.component.ts @@ -1,10 +1,16 @@ import { Component, OnDestroy, OnInit } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; -import { Subscription } from 'rxjs'; +import { BehaviorSubject, combineLatest, Observable, Subject, Subscription } from 'rxjs'; // import { Source } from '../../shared/source/source.model'; import { Organization, OrganizationService } from '../../shared'; import { EventManager } from '../../shared/util/event-manager.service'; +import { + distinctUntilChanged, filter, + map, shareReplay, + startWith, + switchMap +} from "rxjs/operators"; @Component({ selector: 'jhi-organization-detail', @@ -12,9 +18,8 @@ import { EventManager } from '../../shared/util/event-manager.service'; styleUrls: ['organization-detail.component.scss'], }) export class OrganizationDetailComponent implements OnInit, OnDestroy { - - organization: Organization; - private subscription: any; + private trigger$ = new Subject(); + organization$: Observable; private eventSubscriber: Subscription; // sources: Source[]; @@ -36,32 +41,33 @@ export class OrganizationDetailComponent implements OnInit, OnDestroy { } ngOnInit() { - this.subscription = this.route.params.subscribe((params) => { - this.load(params['organizationName']); - }); - this.registerChangeInOrganizations(); + this.organization$ = combineLatest([ + this.route.params, + this.trigger$.pipe(startWith(undefined as void)), + ]).pipe( + map(([params]) => params['organizationName']), + filter(orgName => !!orgName), // ensure that organization name is set + distinctUntilChanged(), // no need to trigger duplicate requests + switchMap((orgName) => this.organizationService.find(orgName)), // get organization + shareReplay(1), // multiple subscriptions will not trigger multiple requests + ); + this.eventSubscriber = this.registerChangeInOrganizations(); // this.viewSubjects(); this.viewProjects(); } - load(organizationName) { - this.organizationService.find(organizationName).subscribe((organization) => { - this.organization = organization; - }); - } - previousState() { window.history.back(); } ngOnDestroy() { - this.subscription.unsubscribe(); - this.eventManager.destroy(this.eventSubscriber); + this.trigger$.complete(); + this.eventSubscriber.unsubscribe(); } - registerChangeInOrganizations() { - this.eventSubscriber = this.eventManager.subscribe('organizationListModification', - () => this.load(this.organization.name)); + registerChangeInOrganizations(): Subscription { + return this.eventManager.subscribe('organizationListModification', + () => this.trigger$.next()); } viewProjects() { diff --git a/src/main/webapp/app/shared/permission/permission.component.ts b/src/main/webapp/app/shared/permission/permission.component.ts index 4e05dabf2..acf9d1835 100644 --- a/src/main/webapp/app/shared/permission/permission.component.ts +++ b/src/main/webapp/app/shared/permission/permission.component.ts @@ -207,11 +207,13 @@ export class PermissionComponent implements OnInit, OnDestroy, OnChanges { let req = {}; if (this.project) { req = { - projectName: this.project.projectName + projectName: this.project.projectName, + includeUpperLevels: true, }; } else if (this.organization) { req = { - organization: this.organization.name + organization: this.organization.name, + includeUpperLevels: true, }; } else { return; From f0c5487741c3f95e18475d2c041abf4eb1f89638 Mon Sep 17 00:00:00 2001 From: Joris Borgdorff Date: Wed, 8 Dec 2021 14:40:12 +0100 Subject: [PATCH 271/431] Fix PR comment --- src/main/java/org/radarbase/management/service/UserService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/radarbase/management/service/UserService.java b/src/main/java/org/radarbase/management/service/UserService.java index 5a8e309dc..8296841c5 100644 --- a/src/main/java/org/radarbase/management/service/UserService.java +++ b/src/main/java/org/radarbase/management/service/UserService.java @@ -241,7 +241,7 @@ private void checkAuthorityForRoleChange(Role role) role.getProject().getProjectName()); } } - default -> { } + default -> throw new IllegalStateException("Unknown authority scope."); } } From ece361f6e7246fd8005b55d0d90b764e44f560ac Mon Sep 17 00:00:00 2001 From: Joris Borgdorff Date: Wed, 8 Dec 2021 17:29:44 +0100 Subject: [PATCH 272/431] Fix fetching upper level users --- .../auth/authorization/RoleAuthority.java | 9 ++ .../org/radarbase/auth/token/RadarToken.java | 21 +-- .../repository/filters/PredicateBuilder.java | 37 +++++ .../repository/filters/UserFilter.java | 152 +++++++++++++++--- .../management/service/UserService.java | 16 +- .../management/service/dto/RoleDTO.java | 4 +- .../management/service/mapper/UserMapper.java | 73 +-------- .../mapper/decorator/UserMapperDecorator.java | 32 +--- .../management/web/rest/UserResource.java | 6 +- .../shared/permission/permission.component.ts | 2 + .../service/UserServiceIntTest.java | 3 +- 11 files changed, 210 insertions(+), 145 deletions(-) diff --git a/radar-auth/src/main/java/org/radarbase/auth/authorization/RoleAuthority.java b/radar-auth/src/main/java/org/radarbase/auth/authorization/RoleAuthority.java index 3bc458ec6..136008f8d 100644 --- a/radar-auth/src/main/java/org/radarbase/auth/authorization/RoleAuthority.java +++ b/radar-auth/src/main/java/org/radarbase/auth/authorization/RoleAuthority.java @@ -1,7 +1,12 @@ package org.radarbase.auth.authorization; import java.io.Serializable; +import java.util.EnumSet; import java.util.Locale; +import java.util.Set; +import java.util.stream.Collector; + +import static java.util.stream.Collectors.toCollection; /** * Constants for Spring Security authorities. @@ -72,4 +77,8 @@ public static RoleAuthority valueOfAuthorityOrNull(String authority) { public enum Scope { GLOBAL, ORGANIZATION, PROJECT } + + public static > Collector> toEnumSet(Class clazz) { + return toCollection(() -> EnumSet.noneOf(clazz)); + } } diff --git a/radar-auth/src/main/java/org/radarbase/auth/token/RadarToken.java b/radar-auth/src/main/java/org/radarbase/auth/token/RadarToken.java index 3bde4e0ca..96f0858b5 100644 --- a/radar-auth/src/main/java/org/radarbase/auth/token/RadarToken.java +++ b/radar-auth/src/main/java/org/radarbase/auth/token/RadarToken.java @@ -1,20 +1,15 @@ package org.radarbase.auth.token; -import org.radarbase.auth.authorization.RoleAuthority; import org.radarbase.auth.authorization.Permission; +import org.radarbase.auth.authorization.RoleAuthority; import java.util.Date; -import java.util.EnumSet; import java.util.List; -import java.util.Map; import java.util.Objects; import java.util.Set; -import java.util.stream.Collector; import java.util.stream.Stream; -import static java.util.stream.Collectors.groupingBy; -import static java.util.stream.Collectors.mapping; -import static java.util.stream.Collectors.toCollection; +import static org.radarbase.auth.authorization.RoleAuthority.toEnumSet; /** * Created by dverbeec on 10/01/2018. @@ -76,7 +71,7 @@ default Set getRoleAuthorities() { return getAuthorities().stream() .map(RoleAuthority::valueOfAuthorityOrNull) .filter(Objects::nonNull) - .collect(toEnumSet()); + .collect(toEnumSet(RoleAuthority.class)); } /** @@ -254,14 +249,4 @@ boolean hasPermissionOnSource(Permission permission, String projectName, String * @return true if the client credentials flow was certainly used, false otherwise. */ boolean isClientCredentials(); - - private static Collector> toEnumSet() { - return toCollection(() -> EnumSet.noneOf(RoleAuthority.class)); - } - - private static Collector>> - groupingByReferent() { - return groupingBy(AuthorityReference::getReferent, - mapping(AuthorityReference::getRole, toEnumSet())); - } } diff --git a/src/main/java/org/radarbase/management/repository/filters/PredicateBuilder.java b/src/main/java/org/radarbase/management/repository/filters/PredicateBuilder.java index 05e534c02..1569cd93c 100644 --- a/src/main/java/org/radarbase/management/repository/filters/PredicateBuilder.java +++ b/src/main/java/org/radarbase/management/repository/filters/PredicateBuilder.java @@ -20,6 +20,7 @@ import javax.persistence.criteria.Predicate; import javax.persistence.criteria.Root; import java.util.ArrayList; +import java.util.Collection; import java.util.List; import java.util.Locale; import java.util.function.Supplier; @@ -35,6 +36,9 @@ public PredicateBuilder(CriteriaBuilder builder) { /** Add predicate to query. */ public void add(Predicate predicate) { + if (predicate == null) { + return; + } predicates.add(predicate); } @@ -51,6 +55,19 @@ public Predicate toAndPredicate() { } } + /** + * Build the predicates as an AND predicate. + */ + public Predicate toOrPredicate() { + if (this.predicates.size() == 1) { + return this.predicates.get(0); + } else if (!this.predicates.isEmpty()) { + return builder.or(this.predicates.toArray(new Predicate[0])); + } else { + return null; + } + } + /** * Add an equal criteria to predicates if value is not null or empty. * @param path entity path @@ -117,6 +134,14 @@ public void attributeLike(Root root, String attributeKey, } } + public void in(Expression expr, Expression other) { + add(expr.in(other)); + } + + public void in(Expression expr, Collection other) { + add(expr.in(other)); + } + /** * Add comparable criteria matching given range. * @param path entity property path. @@ -153,4 +178,16 @@ public boolean isValidValue(Object value) { } return true; } + + public PredicateBuilder newBuilder() { + return new PredicateBuilder(builder); + } + + public CriteriaBuilder getCriteriaBuilder() { + return builder; + } + + public boolean isEmpty() { + return this.predicates.isEmpty(); + } } diff --git a/src/main/java/org/radarbase/management/repository/filters/UserFilter.java b/src/main/java/org/radarbase/management/repository/filters/UserFilter.java index 5789f5303..28bbdbca6 100644 --- a/src/main/java/org/radarbase/management/repository/filters/UserFilter.java +++ b/src/main/java/org/radarbase/management/repository/filters/UserFilter.java @@ -1,27 +1,37 @@ package org.radarbase.management.repository.filters; import org.radarbase.auth.authorization.RoleAuthority; -import org.radarbase.management.domain.Authority; +import org.radarbase.management.domain.Organization; +import org.radarbase.management.domain.Project; import org.radarbase.management.domain.Role; import org.radarbase.management.domain.User; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.data.jpa.domain.Specification; import javax.annotation.Nonnull; import javax.persistence.criteria.CriteriaBuilder; import javax.persistence.criteria.CriteriaQuery; +import javax.persistence.criteria.From; import javax.persistence.criteria.Join; import javax.persistence.criteria.Predicate; import javax.persistence.criteria.Root; - +import javax.persistence.criteria.Subquery; +import java.util.List; +import java.util.Locale; +import java.util.function.BiConsumer; import java.util.stream.Collectors; import java.util.stream.Stream; public class UserFilter implements Specification { + private static final Logger logger = LoggerFactory.getLogger(UserFilter.class); + private String login; private String email; private String projectName; private String organization; private String authority; + private boolean includeUpperLevels = false; @Override public Predicate toPredicate(Root root, @Nonnull CriteriaQuery query, @@ -30,43 +40,127 @@ public Predicate toPredicate(Root root, @Nonnull CriteriaQuery query, predicates.likeLower(root.get("login"), login); predicates.likeLower(root.get("email"), email); - filterRoles(predicates, root.join("roles")); + filterRoles(predicates, root.join("roles"), query); query.distinct(true); - return predicates.toAndPredicate(); + var result = predicates.toAndPredicate(); + logger.debug("Filtering users by {}", result); + return result; } - private void filterRoles(PredicateBuilder predicates, Join roleJoin) { - RoleAuthority.Scope scope = determineScope(predicates, roleJoin); + private void filterRoles(PredicateBuilder predicates, Join roleJoin, + CriteriaQuery query) { + Stream authoritiesFiltered = Stream.of(RoleAuthority.values()) + .filter(java.util.function.Predicate.not(RoleAuthority::isPersonal)); - Join authorityJoin = roleJoin.join("authority"); if (predicates.isValidValue(authority)) { - predicates.likeLower(authorityJoin.get("name"), authority); - } else { - predicates.add(authorityJoin.get("name") - .in(Stream.of(RoleAuthority.values()) - .filter(scope == null - ? r -> !r.isPersonal() - : r -> r.scope() == scope && !r.isPersonal()) - .map(RoleAuthority::authority) - .collect(Collectors.toList()))); + String authorityUpper = authority.toUpperCase(Locale.ROOT); + authoritiesFiltered = authoritiesFiltered + .filter(r -> r.authority().contains(authorityUpper)); + } + List authoritiesAllowed = authoritiesFiltered.collect(Collectors.toList()); + if (authoritiesAllowed.isEmpty()) { + CriteriaBuilder builder = predicates.getCriteriaBuilder(); + // never match + predicates.add(builder.isTrue(builder.literal(false))); + return; } + + determineScope(predicates, roleJoin, query, authoritiesAllowed); } - private RoleAuthority.Scope determineScope( + private void determineScope( PredicateBuilder predicates, - Join roleJoin) { + Join roleJoin, + CriteriaQuery query, + List authoritiesAllowed) { + PredicateBuilder authorityPredicates = predicates.newBuilder(); + + // Is organization admin if (predicates.isValidValue(projectName)) { - predicates.likeLower( - () -> roleJoin.join("project").get("projectName"), projectName); - return RoleAuthority.Scope.PROJECT; + // Is project admin + entitySubquery(RoleAuthority.Scope.PROJECT, roleJoin, + query, authorityPredicates, authoritiesAllowed, + (b, proj) -> b.likeLower(proj.get("projectName"), projectName)); + + // Is organization admin for organization above current project + if (includeUpperLevels) { + entitySubquery(RoleAuthority.Scope.ORGANIZATION, roleJoin, + query, authorityPredicates, authoritiesAllowed, + (b, org) -> b.likeLower( + org.join("projects").get("projectName"), projectName)); + } } else if (predicates.isValidValue(organization)) { - predicates.likeLower( - () -> roleJoin.join("organization").get("name"), organization); - return RoleAuthority.Scope.ORGANIZATION; + entitySubquery(RoleAuthority.Scope.ORGANIZATION, roleJoin, + query, authorityPredicates, authoritiesAllowed, + (b, org) -> b.likeLower(org.get("name"), organization)); + } + + if (authorityPredicates.isEmpty()) { + // no project or organization filters applied + addAllowedAuthorities(authorityPredicates, roleJoin, authoritiesAllowed, null); + } else if (includeUpperLevels) { + // is sys admin + addAllowedAuthorities(authorityPredicates, roleJoin, authoritiesAllowed, + RoleAuthority.Scope.GLOBAL); + } + + predicates.add(authorityPredicates.toOrPredicate()); + } + + private boolean addAllowedAuthorities(PredicateBuilder predicates, + Join roleJoin, + List authorities, + RoleAuthority.Scope scope) { + + Stream authorityStream = authorities.stream(); + if (scope != null) { + authorityStream = authorityStream.filter(r -> r.scope() == scope); + } + List authorityNames = authorityStream + .map(RoleAuthority::authority) + .collect(Collectors.toList()); + + if (!authorityNames.isEmpty()) { + predicates.in(roleJoin.get("authority").get("name"), authorityNames); + return true; } else { - return null; + return false; + } + } + + /** Create a subquery to filter the roles. */ + private void entitySubquery(RoleAuthority.Scope scope, + Join roleJoin, + CriteriaQuery query, + PredicateBuilder predicates, + List allowedRoles, + BiConsumer> queryMatch) { + PredicateBuilder authorityPredicates = predicates.newBuilder(); + + if (!addAllowedAuthorities(authorityPredicates, roleJoin, allowedRoles, scope)) { + return; } + + Subquery subQuery = query.subquery(Long.class); + subQuery.distinct(true); + Root orgRoot = subQuery.from((Class) switch (scope) { + case PROJECT -> Project.class; + case ORGANIZATION -> Organization.class; + default -> throw new IllegalStateException("Unknown role scope " + scope); + }); + subQuery.select(orgRoot.get("id")); + PredicateBuilder subqueryPredicates = predicates.newBuilder(); + queryMatch.accept(subqueryPredicates, orgRoot); + subQuery.where(subqueryPredicates.toAndPredicate()); + + authorityPredicates.in(roleJoin.get( switch (scope) { + case ORGANIZATION -> "organization"; + case PROJECT -> "project"; + default -> throw new IllegalStateException("Unknown role scope " + scope); + }).get("id"), subQuery); + + predicates.add(authorityPredicates.toAndPredicate()); } public String getLogin() { @@ -108,4 +202,12 @@ public String getAuthority() { public void setAuthority(String authority) { this.authority = authority; } + + public boolean isIncludeUpperLevels() { + return includeUpperLevels; + } + + public void setIncludeUpperLevels(boolean includeUpperLevels) { + this.includeUpperLevels = includeUpperLevels; + } } diff --git a/src/main/java/org/radarbase/management/service/UserService.java b/src/main/java/org/radarbase/management/service/UserService.java index 8296841c5..ccab79cc6 100644 --- a/src/main/java/org/radarbase/management/service/UserService.java +++ b/src/main/java/org/radarbase/management/service/UserService.java @@ -398,8 +398,20 @@ public void removeNotActivatedUsers() { }); } - public Page findUsers(UserFilter userFilter, Pageable pageable) { - return userRepository.findAll(userFilter, pageable).map(userMapper::userToUserDTO); + /** + * Find all user with given filter. + * + * @param userFilter filtering for users. + * @param pageable paging information + * @param includeProvenance whether to include created and modification fields. + * @return page of users. + */ + public Page findUsers(UserFilter userFilter, Pageable pageable, + boolean includeProvenance) { + return userRepository.findAll(userFilter, pageable) + .map(includeProvenance + ? userMapper::userToUserDTO + : userMapper::userToUserDTONoProvenance); } /** diff --git a/src/main/java/org/radarbase/management/service/dto/RoleDTO.java b/src/main/java/org/radarbase/management/service/dto/RoleDTO.java index decf5f52c..8ecf6fc7d 100644 --- a/src/main/java/org/radarbase/management/service/dto/RoleDTO.java +++ b/src/main/java/org/radarbase/management/service/dto/RoleDTO.java @@ -1,12 +1,14 @@ package org.radarbase.management.service.dto; +import com.fasterxml.jackson.annotation.JsonInclude; + import java.util.Objects; /** * Created by nivethika on 23-5-17. */ +@JsonInclude(JsonInclude.Include.NON_NULL) public class RoleDTO { - private Long id; private Long organizationId; diff --git a/src/main/java/org/radarbase/management/service/mapper/UserMapper.java b/src/main/java/org/radarbase/management/service/mapper/UserMapper.java index da5b8dd1d..3183e9a5e 100644 --- a/src/main/java/org/radarbase/management/service/mapper/UserMapper.java +++ b/src/main/java/org/radarbase/management/service/mapper/UserMapper.java @@ -1,18 +1,16 @@ package org.radarbase.management.service.mapper; -import java.util.List; -import java.util.Set; -import java.util.stream.Collectors; - import org.mapstruct.DecoratedWith; import org.mapstruct.Mapper; import org.mapstruct.Mapping; import org.radarbase.management.domain.Authority; -import org.radarbase.management.domain.Role; import org.radarbase.management.domain.User; import org.radarbase.management.service.dto.UserDTO; import org.radarbase.management.service.mapper.decorator.UserMapperDecorator; +import java.util.Set; +import java.util.stream.Collectors; + /** * Mapper for the entity User and its DTO UserDTO. */ @@ -26,7 +24,11 @@ public interface UserMapper { @Mapping(target = "lastModifiedDate", ignore = true) UserDTO userToUserDTO(User user); - List usersToUserDTOs(List users); + @Mapping(target = "createdBy", ignore = true) + @Mapping(target = "createdDate", ignore = true) + @Mapping(target = "lastModifiedBy", ignore = true) + @Mapping(target = "lastModifiedDate", ignore = true) + UserDTO userToUserDTONoProvenance(User user); @Mapping(target = "activationKey", ignore = true) @Mapping(target = "resetKey", ignore = true) @@ -35,49 +37,6 @@ public interface UserMapper { @Mapping(target = "authorities", ignore = true) User userDTOToUser(UserDTO userDto); - /** - * Map a set of {@link Role}s to a set of strings that are the authorities. - * @param roles the roles to map - * @return the authorities as a set of strings if roles is not null, null otherwise - */ - default Set rolesToAuthorities(Set roles) { - if (roles == null) { - return null; - } - return roles.stream().map(role -> role.getAuthority().getName()) - .collect(Collectors.toSet()); - } - - List userDTOsToUsers(List userDtos); - - /** - * Create a {@link User} object with it's id field set to the given id. - * @param id the id - * @return the user if id is not null, null otherwise. - */ - default User userFromId(Long id) { - if (id == null) { - return null; - } - User user = new User(); - user.setId(id); - return user; - } - - /** - * Create a {@link User} object with the login set to the given login. - * @param login the login - * @return the user login is not null, null otherwise - */ - default User userFromLogin(String login) { - if (login == null) { - return null; - } - User user = new User(); - user.setLogin(login); - return user; - } - /** * Map a set of {@link Authority}s to a set of strings that are the authority names. * @param authorities the authorities to map @@ -90,20 +49,4 @@ default Set stringsFromAuthorities(Set authorities) { return authorities.stream().map(Authority::getName) .collect(Collectors.toSet()); } - - /** - * Map a set of strings to a set of authorities. - * @param strings the strings - * @return the set of authorities of the set of strings is not null, null otherwise - */ - default Set authoritiesFromStrings(Set strings) { - if (strings == null) { - return null; - } - return strings.stream().map(string -> { - Authority auth = new Authority(); - auth.setName(string); - return auth; - }).collect(Collectors.toSet()); - } } diff --git a/src/main/java/org/radarbase/management/service/mapper/decorator/UserMapperDecorator.java b/src/main/java/org/radarbase/management/service/mapper/decorator/UserMapperDecorator.java index f4b40fa3c..839bd6ff3 100644 --- a/src/main/java/org/radarbase/management/service/mapper/decorator/UserMapperDecorator.java +++ b/src/main/java/org/radarbase/management/service/mapper/decorator/UserMapperDecorator.java @@ -8,10 +8,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; -import java.util.List; -import java.util.stream.Collectors; - -public class UserMapperDecorator implements UserMapper { +public abstract class UserMapperDecorator implements UserMapper { @Autowired @Qualifier("delegate") @@ -36,31 +33,4 @@ public UserDTO userToUserDTO(User user) { return dto; } - - @Override - public List usersToUserDTOs(List users) { - if (users == null) { - return null; - } - - return users.stream().map(this::userToUserDTO).collect(Collectors.toList()); - } - - @Override - public User userDTOToUser(UserDTO userDto) { - if (userDto == null) { - return null; - } - - return delegate.userDTOToUser(userDto); - } - - @Override - public List userDTOsToUsers(List userDtos) { - if (userDtos == null) { - return null; - } - - return userDtos.stream().map(this::userDTOToUser).collect(Collectors.toList()); - } } diff --git a/src/main/java/org/radarbase/management/web/rest/UserResource.java b/src/main/java/org/radarbase/management/web/rest/UserResource.java index 1bdcc089a..f767fad20 100644 --- a/src/main/java/org/radarbase/management/web/rest/UserResource.java +++ b/src/main/java/org/radarbase/management/web/rest/UserResource.java @@ -34,6 +34,7 @@ import org.springframework.web.bind.annotation.PutMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; import tech.jhipster.web.util.ResponseUtil; @@ -208,11 +209,12 @@ public ResponseEntity updateUser(@RequestBody ManagedUserVM managedUser @Timed public ResponseEntity> getUsers( @PageableDefault(page = 0, size = Integer.MAX_VALUE) Pageable pageable, - UserFilter userFilter) + UserFilter userFilter, + @RequestParam(defaultValue = "true") boolean includeProvenance) throws NotAuthorizedException { checkAuthorityAndPermission(token, SYS_ADMIN, USER_READ); - Page page = userService.findUsers(userFilter, pageable); + Page page = userService.findUsers(userFilter, pageable, includeProvenance); return new ResponseEntity<>(page.getContent(), PaginationUtil.generatePaginationHttpHeaders(page, "/api/users"), HttpStatus.OK); diff --git a/src/main/webapp/app/shared/permission/permission.component.ts b/src/main/webapp/app/shared/permission/permission.component.ts index acf9d1835..9f6eab7d9 100644 --- a/src/main/webapp/app/shared/permission/permission.component.ts +++ b/src/main/webapp/app/shared/permission/permission.component.ts @@ -209,11 +209,13 @@ export class PermissionComponent implements OnInit, OnDestroy, OnChanges { req = { projectName: this.project.projectName, includeUpperLevels: true, + includeProvenance: false, }; } else if (this.organization) { req = { organization: this.organization.name, includeUpperLevels: true, + includeProvenance: false, }; } else { return; diff --git a/src/test/java/org/radarbase/management/service/UserServiceIntTest.java b/src/test/java/org/radarbase/management/service/UserServiceIntTest.java index a30579b6d..69b58bae3 100644 --- a/src/test/java/org/radarbase/management/service/UserServiceIntTest.java +++ b/src/test/java/org/radarbase/management/service/UserServiceIntTest.java @@ -243,7 +243,8 @@ void testFindNotActivatedUsersByCreationDateBefore() { @Test void assertThatAnonymousUserIsNotGet() { final PageRequest pageable = PageRequest.of(0, (int) userRepository.count()); - final Page allManagedUsers = userService.findUsers(new UserFilter(), pageable); + final Page allManagedUsers = userService.findUsers(new UserFilter(), pageable, + false); assertThat(allManagedUsers.getContent().stream() .noneMatch(user -> Constants.ANONYMOUS_USER.equals(user.getLogin()))) .isTrue(); From 733b4df35f3dab3391bda55c289ce6ec5c5828d6 Mon Sep 17 00:00:00 2001 From: Peyman Mohtashami Date: Wed, 8 Dec 2021 19:31:11 +0100 Subject: [PATCH 273/431] Add permission tab to projects and organizations --- .../admin/user-management/role.component.html | 70 ++- .../admin/user-management/role.component.ts | 63 ++- .../user-management.component.html | 9 +- .../project/project-detail.component.html | 7 + .../project/project-detail.component.ts | 2 +- .../project/project-dialog.component.ts | 9 +- .../entities/project/project-popup.service.ts | 9 +- .../entities/project/project.component.html | 7 +- .../app/entities/project/project.component.ts | 42 +- .../app/entities/project/project.module.ts | 2 + .../app/entities/project/project.route.ts | 6 +- .../webapp/app/entities/role/role.route.ts | 11 +- .../permission/permission.component.html | 80 ++- .../shared/permission/permission.component.ts | 483 +++++++++++------- .../app/shared/project/project.model.ts | 3 +- .../app/shared/project/project.service.ts | 21 +- .../webapp/app/shared/user/user.service.ts | 11 + src/main/webapp/i18n/en/role.json | 3 +- src/main/webapp/i18n/en/user-management.json | 1 + 19 files changed, 534 insertions(+), 305 deletions(-) diff --git a/src/main/webapp/app/admin/user-management/role.component.html b/src/main/webapp/app/admin/user-management/role.component.html index e9f3aa145..f7817de3e 100644 --- a/src/main/webapp/app/admin/user-management/role.component.html +++ b/src/main/webapp/app/admin/user-management/role.component.html @@ -11,7 +11,7 @@

      - + @@ -22,6 +22,9 @@

      {{role.projectName}}
      +
      + {{role.organizationName}} +

      • +
    • + + Permissions + +
    • Admins @@ -83,6 +88,8 @@

      + +

    diff --git a/src/main/webapp/app/entities/project/project-detail.component.ts b/src/main/webapp/app/entities/project/project-detail.component.ts index 9f78021ba..34afec4af 100644 --- a/src/main/webapp/app/entities/project/project-detail.component.ts +++ b/src/main/webapp/app/entities/project/project-detail.component.ts @@ -13,7 +13,7 @@ import { distinctUntilChanged, filter, pluck, switchMap } from "rxjs/operators"; styleUrls: ['project-detail.component.scss'], }) export class ProjectDetailComponent implements OnInit, OnDestroy { - private static availableTabs = ['subjects', 'groups', 'admins', 'analysts'] + private static availableTabs = ['subjects', 'groups', 'permissions', 'admins', 'analysts'] private subscription = new Subscription(); private _project$ = new BehaviorSubject(null); project$ = this._project$.asObservable(); diff --git a/src/main/webapp/app/entities/project/project-dialog.component.ts b/src/main/webapp/app/entities/project/project-dialog.component.ts index 4e8fdd41e..b8f52d73d 100644 --- a/src/main/webapp/app/entities/project/project-dialog.component.ts +++ b/src/main/webapp/app/entities/project/project-dialog.component.ts @@ -29,6 +29,7 @@ export class ProjectDialogComponent implements OnInit { readonly authorities: any[]; readonly options: string[]; + organizationName: string; project: Project; isSaving: boolean; projectIdAsPrettyValue: boolean; @@ -83,6 +84,8 @@ export class ProjectDialogComponent implements OnInit { } ngOnInit() { + console.log(this.project, this.organizationName); + if(this.project.startDate) { this.startDate = this.formatter.parse(this.project.startDate.toString()); } @@ -115,7 +118,8 @@ export class ProjectDialogComponent implements OnInit { .subscribe((res: Project) => this.onSaveSuccess(res), (res: Response) => this.onSaveError(res)); } else { - this.projectService.create(this.project) + console.log(this.project, this.organizationName) + this.projectService.create({...this.project, organization: {name: this.organizationName}}) .subscribe((res: Project) => this.onSaveSuccess(res), (res: Response) => this.onSaveError(res)); } @@ -207,8 +211,9 @@ export class ProjectPopupComponent implements OnInit, OnDestroy { ngOnInit() { this.routeSub = this.route.params.subscribe((params) => { + console.log(params); this.modalRef = this.projectPopupService - .open(ProjectDialogComponent, params['projectName']); + .open(ProjectDialogComponent, params['organizationName'], params['projectName']); }); } diff --git a/src/main/webapp/app/entities/project/project-popup.service.ts b/src/main/webapp/app/entities/project/project-popup.service.ts index ab733db99..f3b69ee86 100644 --- a/src/main/webapp/app/entities/project/project-popup.service.ts +++ b/src/main/webapp/app/entities/project/project-popup.service.ts @@ -17,7 +17,7 @@ export class ProjectPopupService { ) { } - open(component: any, projectName?: string): NgbModalRef { + open(component: any, organizationName: string, projectName?: string): NgbModalRef { if (this.isOpen) { return; } @@ -27,16 +27,17 @@ export class ProjectPopupService { this.projectService.find(projectName).subscribe((project) => { project.startDate = this.datePipe.transform(project.startDate, 'yyyy-MM-ddThh:mm'); project.endDate = this.datePipe.transform(project.endDate, 'yyyy-MM-ddThh:mm'); - this.projectModalRef(component, project); + this.projectModalRef(component, organizationName, project); }); } else { - return this.projectModalRef(component, {}); + return this.projectModalRef(component, organizationName, {}); } } - projectModalRef(component: any, project: Project): NgbModalRef { + projectModalRef(component: any, organizationName: string, project: Project): NgbModalRef { const modalRef = this.modalService.open(component, {size: 'lg', backdrop: 'static'}); modalRef.componentInstance.project = project; + modalRef.componentInstance.organizationName = organizationName; modalRef.result.then((result) => { this.router.navigate([{outlets: {popup: null}}], {replaceUrl: true}); this.isOpen = false; diff --git a/src/main/webapp/app/entities/project/project.component.html b/src/main/webapp/app/entities/project/project.component.html index 082a8ea40..5f836a51b 100644 --- a/src/main/webapp/app/entities/project/project.component.html +++ b/src/main/webapp/app/entities/project/project.component.html @@ -1,7 +1,8 @@ +

    - @@ -55,14 +56,14 @@

    -

    -
    -
    -
    - -

    {{organization.name}}

    -
    -
    - -

    {{organization.location}}

    + +

    + + + {{organization.name}} + + +

    +
    +
    +
    + +

    {{organization.name}}

    +
    +
    + +

    {{organization.location}}

    +
    +

    + {{organization.description}} +

    -

    - {{organization.description}} -

    -
    -
      -
    • - - -
      • -
    • - - -
      • -
    +
      +
    • + + +
      • +
    • + + +
      • +
    -
    - - - -
    +
    + + + +
    +
    diff --git a/src/main/webapp/app/entities/organization/organization-detail.component.ts b/src/main/webapp/app/entities/organization/organization-detail.component.ts index 1977dff98..0e73d8311 100644 --- a/src/main/webapp/app/entities/organization/organization-detail.component.ts +++ b/src/main/webapp/app/entities/organization/organization-detail.component.ts @@ -1,7 +1,7 @@ import { Component, OnDestroy, OnInit } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; import { combineLatest, Observable, Subject, Subscription } from 'rxjs'; -import {Organization, OrganizationService, Principal} from '../../shared'; +import { Organization, OrganizationService, Principal } from '../../shared'; import { EventManager } from '../../shared/util/event-manager.service'; import { distinctUntilChanged, filter, @@ -18,6 +18,7 @@ import { export class OrganizationDetailComponent implements OnInit, OnDestroy { private trigger$ = new Subject(); organization$: Observable; + userIsAdmin$: Observable private eventSubscriber: Subscription; showProjects: boolean; @@ -40,9 +41,18 @@ export class OrganizationDetailComponent implements OnInit, OnDestroy { filter(orgName => !!orgName), // ensure that organization name is set distinctUntilChanged(), // no need to trigger duplicate requests switchMap((orgName) => this.organizationService.find(orgName)), // get organization - shareReplay(1), // multiple subscriptions will not trigger multiple requests ); this.eventSubscriber = this.registerChangeInOrganizations(); + this.userIsAdmin$ = combineLatest([ + this.organization$, + this.principal.account$, + ]).pipe( + map(([organization , account]) => this.principal.accountHasAnyAuthority(account, [ + 'ROLE_SYS_ADMIN', + 'ROLE_ORGANIZATION_ADMIN:' + organization.name, + ])), + ); + this.viewProjects(); } diff --git a/src/main/webapp/app/entities/project/project-detail.component.html b/src/main/webapp/app/entities/project/project-detail.component.html index afe5f11d9..1eb0d2ef2 100644 --- a/src/main/webapp/app/entities/project/project-detail.component.html +++ b/src/main/webapp/app/entities/project/project-detail.component.html @@ -54,48 +54,46 @@

    - -
    -
      -
    • - - -
      • -
    • - - -
      • -
    • - +
      +
        +
      • + -
        • -
      • - - -
        • -
      • - - -
        • -
      +
      • +
    • + + +
      • +
    • + + +
      • +
    • + + +
      • +
    • + + +
      • +
    -
    - +
    + - - + + - - - -
    + + +
    - +
    diff --git a/src/main/webapp/app/entities/project/project-detail.component.ts b/src/main/webapp/app/entities/project/project-detail.component.ts index 4e48779fa..aafeb9f1a 100644 --- a/src/main/webapp/app/entities/project/project-detail.component.ts +++ b/src/main/webapp/app/entities/project/project-detail.component.ts @@ -1,10 +1,15 @@ import { ChangeDetectionStrategy, Component, OnDestroy, OnInit } from '@angular/core'; import { ActivatedRoute, Router } from '@angular/router'; -import { BehaviorSubject, Observable, Subscription } from 'rxjs'; +import { BehaviorSubject, combineLatest, Observable, Subscription } from 'rxjs'; -import {Principal, Project, ProjectService} from '../../shared'; +import { Account, Principal, Project, ProjectService } from '../../shared'; import { EventManager } from '../../shared/util/event-manager.service'; -import { distinctUntilChanged, filter, pluck, switchMap } from "rxjs/operators"; +import { distinctUntilChanged, filter, map, pluck, shareReplay, skip, startWith, switchMap } from 'rxjs/operators'; + +interface TabOptions { + active: string | null; + available: string[]; +} @Component({ selector: 'jhi-project-detail', @@ -13,13 +18,11 @@ import { distinctUntilChanged, filter, pluck, switchMap } from "rxjs/operators"; styleUrls: ['project-detail.component.scss'], }) export class ProjectDetailComponent implements OnInit, OnDestroy { - private static availableTabs = ['subjects', 'groups', 'permissions', 'admins', 'analysts'] private subscription = new Subscription(); - private _project$ = new BehaviorSubject(null); - project$ = this._project$.asObservable(); + project$: Observable + tab$: Observable; private _activeTab$ = new BehaviorSubject('subjects'); - activeTab$: Observable; constructor( private eventManager: EventManager, @@ -28,34 +31,79 @@ export class ProjectDetailComponent implements OnInit, OnDestroy { private router: Router, public principal: Principal, ) { - this.activeTab$ = this._activeTab$.asObservable().pipe(distinctUntilChanged()); + this.project$ = this.observeProject(); + this.tab$ = this.observeTab(this.project$); + } + + ngOnInit() { this.subscription.add(this.activatedRoute.queryParams.pipe( pluck('tab'), ).subscribe(tab => this.updateActiveTab(tab))); - } - ngOnInit() { - this.subscription.add(this.registerChangesInProjectName()); - this.subscription.add(this._activeTab$.subscribe(tab => this.router.navigate([], { + this.subscription.add(this.tab$.pipe( + pluck('active'), + filter(activeTab => activeTab !== null), + skip(1), + distinctUntilChanged(), + ).subscribe(activeTab => this.router.navigate([], { relativeTo: this.activatedRoute, - queryParams: { tab }, + queryParams: { tab: activeTab }, queryParamsHandling: "merge", - }))) + }))); } ngOnDestroy() { this.subscription.unsubscribe(); - this._project$.complete(); this._activeTab$.complete(); } - private registerChangesInProjectName(): Subscription { + + private observeProject(): Observable { return this.activatedRoute.params.pipe( filter(p => !!p), pluck('projectName'), distinctUntilChanged(), switchMap(projectName => this.projectService.find(projectName)), - ).subscribe(project => this._project$.next(project)); + shareReplay(1), + ); + } + + private observeTab(project$: Observable): Observable { + return combineLatest([ + project$, + this.principal.account$, + this._activeTab$, + ]).pipe( + map(([project, account, active]) => { + const available = this.availableTabs(project, account); + return { + available, + active: ProjectDetailComponent.firstAvailableTab(active, available), + } + }), + startWith({active: null, available: []}), + distinctUntilChanged((a, b) => a.active === b.active && a.available.join(' ') === b.available.join(' ')), + ); + } + + private availableTabs(project: Project, account: Account): string[] { + if (this.principal.accountHasAnyAuthority(account, ['ROLE_SYS_ADMIN', 'ROLE_PROJECT_ADMIN:' + project.projectName])) { + return ['subjects', 'groups', 'permissions', 'admins', 'analysts']; + } else if (this.principal.accountHasAnyAuthority(account, ['ROLE_ORGANIZATION_ADMIN:' + project.organization.name])) { + return ['permissions', 'admins', 'analysts']; + } else { + return []; + } + } + + private static firstAvailableTab(tab: string, available: string[]): string { + if (available.length === 0) { + return null; + } else if (available.includes(tab)) { + return tab; + } else { + return available[0]; + } } previousState() { @@ -63,13 +111,6 @@ export class ProjectDetailComponent implements OnInit, OnDestroy { } updateActiveTab(tab?: string) { - if (!tab) { - return; - } - if (!ProjectDetailComponent.availableTabs.includes(tab)) { - window.console.log(`Cannot load unknown tab ${tab}`); - return; - } this._activeTab$.next(tab); } } diff --git a/src/main/webapp/app/shared/subject/subject.component.ts b/src/main/webapp/app/shared/subject/subject.component.ts index d2f4e402a..808b8edc1 100644 --- a/src/main/webapp/app/shared/subject/subject.component.ts +++ b/src/main/webapp/app/shared/subject/subject.component.ts @@ -229,6 +229,7 @@ export class SubjectComponent implements OnInit, OnDestroy, OnChanges { sort: sortOrder.toQueryParam(), }, queryParamsHandling: "merge", + replaceUrl: true, })), withLatestFrom(this._subjects$), switchMap(([[projectName, filter, sortOrder, page], subjects]) => { diff --git a/src/main/webapp/app/shared/user/common-user-management.component.ts b/src/main/webapp/app/shared/user/common-user-management.component.ts index 59e9cfea3..a8348bd21 100644 --- a/src/main/webapp/app/shared/user/common-user-management.component.ts +++ b/src/main/webapp/app/shared/user/common-user-management.component.ts @@ -85,7 +85,7 @@ export class CommonUserMgmtComponent implements OnInit, OnDestroy { relativeTo: this.activatedRoute, queryParams: { sort }, queryParamsHandling: "merge", - skipLocationChange: true, + replaceUrl: true, }) }), ); From 5d35582543a635f4eb0d2e1e2dde9a41b6297d81 Mon Sep 17 00:00:00 2001 From: Joris Borgdorff Date: Mon, 17 Jan 2022 15:42:54 +0100 Subject: [PATCH 322/431] Make organization detail page more similar to project detail page --- .../organization-detail.component.html | 8 ++-- .../organization-detail.component.ts | 47 +++++++++++-------- 2 files changed, 32 insertions(+), 23 deletions(-) diff --git a/src/main/webapp/app/entities/organization/organization-detail.component.html b/src/main/webapp/app/entities/organization/organization-detail.component.html index 60a08c0c1..c2f911db4 100644 --- a/src/main/webapp/app/entities/organization/organization-detail.component.html +++ b/src/main/webapp/app/entities/organization/organization-detail.component.html @@ -1,11 +1,11 @@
    - +

    {{organization.name}} - -
    +
    -
  • +
  • @@ -163,25 +163,25 @@
    • diff --git a/src/test/resources/config/application.yml b/src/test/resources/config/application.yml index fc702c0af..c24c09b6c 100644 --- a/src/test/resources/config/application.yml +++ b/src/test/resources/config/application.yml @@ -28,13 +28,13 @@ spring: type: none datasource: type: com.zaxxer.hikari.HikariDataSource - url: jdbc:h2:mem:ManagementPortal;DB_CLOSE_DELAY=-1 + url: jdbc:hsqldb:mem:ManagementPortal;DB_CLOSE_DELAY=-1 name: username: password: jpa: - database-platform: org.hibernate.dialect.H2Dialect - database: H2 + database-platform: org.hibernate.dialect.HSQLDialect + database: HSQL open-in-view: false show-sql: false hibernate: @@ -56,6 +56,8 @@ spring: track_entities_changed_in_revision: true mail: host: localhost + main: + allow-circular-references: true messages: basename: i18n/messages thymeleaf: From b51dd76bf75d5b69b678d47ce3fdfa7b053ac6a6 Mon Sep 17 00:00:00 2001 From: Joris Borgdorff Date: Wed, 19 Jan 2022 15:37:44 +0100 Subject: [PATCH 330/431] Gradle check fix --- .../org/radarbase/management/config/SecurityConfiguration.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/org/radarbase/management/config/SecurityConfiguration.java b/src/main/java/org/radarbase/management/config/SecurityConfiguration.java index 4ed1e7176..e79ff8a0b 100644 --- a/src/main/java/org/radarbase/management/config/SecurityConfiguration.java +++ b/src/main/java/org/radarbase/management/config/SecurityConfiguration.java @@ -45,6 +45,7 @@ public class SecurityConfiguration extends WebSecurityConfigurerAdapter { private final ApplicationEventPublisher applicationEventPublisher; private final PasswordEncoder passwordEncoder; + /** Security configuration constructor. */ @Autowired public SecurityConfiguration(AuthenticationManagerBuilder authenticationManagerBuilder, UserDetailsService userDetailsService, From 3cb03f8ee6413608dec13cdb178de54fcb045472 Mon Sep 17 00:00:00 2001 From: Joris Borgdorff Date: Wed, 19 Jan 2022 16:02:29 +0100 Subject: [PATCH 331/431] Add Snyk PR test --- .github/workflows/scheduled-snyk.yaml | 24 +++--------------------- .github/workflows/snyk.yaml | 16 +++------------- 2 files changed, 6 insertions(+), 34 deletions(-) diff --git a/.github/workflows/scheduled-snyk.yaml b/.github/workflows/scheduled-snyk.yaml index b0f365855..06551de4c 100644 --- a/.github/workflows/scheduled-snyk.yaml +++ b/.github/workflows/scheduled-snyk.yaml @@ -11,35 +11,17 @@ jobs: steps: - uses: actions/checkout@master - - name: Run Snyk to check for Kotlin vulnerabilities + - name: Run Snyk to check for vulnerabilities uses: snyk/actions/gradle-jdk11@master env: SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }} with: command: test json: true - args: --all-sub-projects --policy-path=.snyk + args: --all-projects --configuration-matching="^(runtime|compile)Classpath$" --policy-path=.snyk if: ${{ !cancelled() }} - - name: Report new Kotlin vulnerabilities - uses: thehyve/report-vulnerability@master - with: - report-file: snyk.json - env: - TOKEN: ${{ secrets.GITHUB_TOKEN }} - if: ${{ failure() }} - - - name: Run Snyk to check for Node vulnerabilities - uses: snyk/actions/node@master - env: - SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }} - with: - command: test - args: . --policy-path=.snyk - json: true - if: ${{ !cancelled() }} - - - name: Report new Node vulnerabilities + - name: Report new vulnerabilities uses: thehyve/report-vulnerability@master with: report-file: snyk.json diff --git a/.github/workflows/snyk.yaml b/.github/workflows/snyk.yaml index 554966c9e..ef20944d7 100644 --- a/.github/workflows/snyk.yaml +++ b/.github/workflows/snyk.yaml @@ -1,9 +1,7 @@ name: Snyk test on: - pull_request: - branches: - - master + - pull_request jobs: security: @@ -12,17 +10,9 @@ jobs: steps: - uses: actions/checkout@master - - name: Run Snyk to check for Kotlin vulnerabilities + - name: Run Snyk to check for vulnerabilities uses: snyk/actions/gradle-jdk11@master env: SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }} with: - args: --severity-threshold=high --all-sub-projects --policy-path=.snyk - - - name: Run Snyk to check for Node vulnerabilities - uses: snyk/actions/node@master - env: - SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }} - with: - args: . --severity-threshold=high --policy-path=.snyk - if: ${{ !cancelled() }} + args: --severity-threshold=high --all-projects --configuration-matching="^(runtime|compile)Classpath$" --policy-path=.snyk From caa8b20a8b2cfe56d7a1fa80e8cb414e2ff1a57a Mon Sep 17 00:00:00 2001 From: Joris Borgdorff Date: Thu, 20 Jan 2022 12:22:38 +0100 Subject: [PATCH 332/431] Don't store user session if it no longer exists --- .../radarbase/management/security/JwtAuthenticationFilter.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/org/radarbase/management/security/JwtAuthenticationFilter.java b/src/main/java/org/radarbase/management/security/JwtAuthenticationFilter.java index 28809defe..33087ed08 100644 --- a/src/main/java/org/radarbase/management/security/JwtAuthenticationFilter.java +++ b/src/main/java/org/radarbase/management/security/JwtAuthenticationFilter.java @@ -118,6 +118,7 @@ protected void doFilterInternal(@Nonnull HttpServletRequest httpRequest, .collect(Collectors.toSet()); token = token.withRoles(roles); } else { + session.removeAttribute(TOKEN_ATTRIBUTE); httpResponse.setStatus(HttpServletResponse.SC_UNAUTHORIZED); httpResponse.setHeader(HttpHeaders.WWW_AUTHENTICATE, OAuth2AccessToken.BEARER_TYPE); httpResponse.getOutputStream().println( From 3b42cd989b93e32faa1c79710e86fbfc97eafb54 Mon Sep 17 00:00:00 2001 From: Joris Borgdorff Date: Thu, 20 Jan 2022 12:25:52 +0100 Subject: [PATCH 333/431] Small reversal --- .../app/shared/organization/organization.service.ts | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/main/webapp/app/shared/organization/organization.service.ts b/src/main/webapp/app/shared/organization/organization.service.ts index cc75da125..efc602a86 100644 --- a/src/main/webapp/app/shared/organization/organization.service.ts +++ b/src/main/webapp/app/shared/organization/organization.service.ts @@ -57,7 +57,10 @@ export class OrganizationService { create(organization: Organization): Observable { return this.http.post(this.organizationUrl(), organization).pipe( tap( - () => this.reset(), + o => this.updateOrganization({ + projects: [], + ...o, + }), () => this.reset(), ), ); @@ -123,7 +126,7 @@ export class OrganizationService { ); } - private updateOrganization(organization: Organization): boolean { + private updateOrganization(organization: Organization) { const nextValue = this._organizations$.value.slice(); const idx = nextValue.findIndex(p => p.id === organization.id); let needsAuthRenewal = false; @@ -141,8 +144,7 @@ export class OrganizationService { this._organizations$.next(nextValue); if (needsAuthRenewal) { this.principal.reset(); - } - return needsAuthRenewal; + }; } findAll(): Observable { From 37afa8dbc9208a0433bf074799b7e4303f19d410 Mon Sep 17 00:00:00 2001 From: Joris Borgdorff Date: Thu, 20 Jan 2022 13:18:28 +0100 Subject: [PATCH 334/431] Remove deprecated path from Docker --- Dockerfile | 1 - 1 file changed, 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 8f438e8e1..7637d997f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -18,7 +18,6 @@ RUN yarn install COPY gradle gradle COPY gradlew build.gradle gradle.properties settings.gradle /code/ COPY radar-auth/build.gradle radar-auth/ -COPY radar-auth/deprecated-auth0/build.gradle radar-auth/deprecated-auth0/ COPY oauth-client-util/build.gradle oauth-client-util/ RUN ./gradlew downloadDependencies :radar-auth:shadowJar --no-watch-fs From 3d3d983282c45cb95ee2e74fc7ddfb847ff31354 Mon Sep 17 00:00:00 2001 From: Joris Borgdorff Date: Thu, 20 Jan 2022 13:19:20 +0100 Subject: [PATCH 335/431] Remove unused directory from docker ignore --- .dockerignore | 1 - 1 file changed, 1 deletion(-) diff --git a/.dockerignore b/.dockerignore index 07d82496d..6a0b4bfa9 100644 --- a/.dockerignore +++ b/.dockerignore @@ -10,7 +10,6 @@ node_modules oauth-client-util/build oauth-client-util/out oauth-client-util/src/test -radar-auth/deprecated-auth0/build src/test/java src/gatling .yarn/unplugged From 321fdefd00dfe4b4645ab130bc0901f0815ea91f Mon Sep 17 00:00:00 2001 From: Joris Borgdorff Date: Thu, 20 Jan 2022 13:22:33 +0100 Subject: [PATCH 336/431] Test fixes --- .../security/JwtAuthenticationFilter.java | 2 -- .../management/web/rest/ProjectResource.java | 9 +++--- .../organization-popup.service.ts | 3 +- .../entities/project/project-popup.service.ts | 13 ++++---- .../app/shared/group/group-popup.service.ts | 30 ++++++++++--------- .../organization/organization.service.ts | 23 ++------------ .../app/shared/project/project.service.ts | 5 ++-- .../app/shared/source/source-popup.service.ts | 4 ++- .../shared/subject/subject-popup.service.ts | 8 +++-- .../auth/authentication/OAuthHelper.java | 25 ++++++++++++++-- 10 files changed, 66 insertions(+), 56 deletions(-) diff --git a/src/main/java/org/radarbase/management/security/JwtAuthenticationFilter.java b/src/main/java/org/radarbase/management/security/JwtAuthenticationFilter.java index 33087ed08..ac32891b7 100644 --- a/src/main/java/org/radarbase/management/security/JwtAuthenticationFilter.java +++ b/src/main/java/org/radarbase/management/security/JwtAuthenticationFilter.java @@ -3,7 +3,6 @@ import org.radarbase.auth.authentication.TokenValidator; import org.radarbase.auth.exception.TokenValidationException; import org.radarbase.auth.token.AuthorityReference; -import org.radarbase.auth.token.JwtRadarToken; import org.radarbase.auth.token.RadarToken; import org.radarbase.management.repository.UserRepository; import org.slf4j.Logger; @@ -29,7 +28,6 @@ import java.util.ArrayList; import java.util.List; import java.util.Optional; -import java.util.Set; import java.util.stream.Collectors; /** diff --git a/src/main/java/org/radarbase/management/web/rest/ProjectResource.java b/src/main/java/org/radarbase/management/web/rest/ProjectResource.java index 51c25158d..14b99f262 100644 --- a/src/main/java/org/radarbase/management/web/rest/ProjectResource.java +++ b/src/main/java/org/radarbase/management/web/rest/ProjectResource.java @@ -5,7 +5,6 @@ import org.radarbase.auth.config.Constants; import org.radarbase.auth.exception.NotAuthorizedException; import org.radarbase.auth.token.RadarToken; -import org.radarbase.management.domain.Project; import org.radarbase.management.repository.ProjectRepository; import org.radarbase.management.service.ProjectService; import org.radarbase.management.service.ResourceUriService; @@ -48,10 +47,6 @@ import java.util.List; import java.util.Objects; -import static org.radarbase.auth.authorization.RadarAuthorization.checkGlobalPermission; -import static org.radarbase.auth.authorization.RadarAuthorization.checkPermissionOnOrganization; -import static org.radarbase.auth.authorization.RadarAuthorization.checkPermissionOnOrganizationAndProject; -import static org.radarbase.auth.authorization.RoleAuthority.PARTICIPANT; import static org.radarbase.auth.authorization.Permission.PROJECT_CREATE; import static org.radarbase.auth.authorization.Permission.PROJECT_DELETE; import static org.radarbase.auth.authorization.Permission.PROJECT_READ; @@ -59,8 +54,12 @@ import static org.radarbase.auth.authorization.Permission.ROLE_READ; import static org.radarbase.auth.authorization.Permission.SOURCE_READ; import static org.radarbase.auth.authorization.Permission.SUBJECT_READ; +import static org.radarbase.auth.authorization.RadarAuthorization.checkGlobalPermission; import static org.radarbase.auth.authorization.RadarAuthorization.checkPermission; +import static org.radarbase.auth.authorization.RadarAuthorization.checkPermissionOnOrganization; +import static org.radarbase.auth.authorization.RadarAuthorization.checkPermissionOnOrganizationAndProject; import static org.radarbase.auth.authorization.RadarAuthorization.checkPermissionOnProject; +import static org.radarbase.auth.authorization.RoleAuthority.PARTICIPANT; import static org.radarbase.management.web.rest.errors.ErrorConstants.ERR_PROJECT_NOT_EMPTY; /** diff --git a/src/main/webapp/app/entities/organization/organization-popup.service.ts b/src/main/webapp/app/entities/organization/organization-popup.service.ts index f4f4a6e1c..269043f9d 100644 --- a/src/main/webapp/app/entities/organization/organization-popup.service.ts +++ b/src/main/webapp/app/entities/organization/organization-popup.service.ts @@ -5,7 +5,7 @@ import { NgbModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap'; import { copyOrganization, Organization, OrganizationService } from '../../shared'; import { Observable, of } from 'rxjs'; -import { map, take } from 'rxjs/operators'; +import { first, map, take } from 'rxjs/operators'; @Injectable({ providedIn: 'root' }) export class OrganizationPopupService { @@ -27,6 +27,7 @@ export class OrganizationPopupService { if (organizationName) { return this.organizationService.find(organizationName).pipe( + first(), map((organization) => this.organizationModalRef(component, organization)), ) } else { diff --git a/src/main/webapp/app/entities/project/project-popup.service.ts b/src/main/webapp/app/entities/project/project-popup.service.ts index 18402a0d2..c6cd9fa73 100644 --- a/src/main/webapp/app/entities/project/project-popup.service.ts +++ b/src/main/webapp/app/entities/project/project-popup.service.ts @@ -5,7 +5,7 @@ import { NgbModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap'; import { copyProject, Project, ProjectService } from '../../shared'; import { Observable, of, throwError } from 'rxjs'; -import { map } from 'rxjs/operators'; +import { first, map } from 'rxjs/operators'; @Injectable({ providedIn: 'root' }) export class ProjectPopupService { @@ -27,11 +27,12 @@ export class ProjectPopupService { if (projectName) { return this.projectService.find(projectName).pipe( - map((project) => { - project.startDate = this.datePipe.transform(project.startDate, 'yyyy-MM-ddThh:mm'); - project.endDate = this.datePipe.transform(project.endDate, 'yyyy-MM-ddThh:mm'); - return this.projectModalRef(component, organizationName, project); - }), + map((project) => { + project.startDate = this.datePipe.transform(project.startDate, 'yyyy-MM-ddThh:mm'); + project.endDate = this.datePipe.transform(project.endDate, 'yyyy-MM-ddThh:mm'); + return this.projectModalRef(component, organizationName, project); + }), + first(), ); } else if (organizationName) { return of(this.projectModalRef(component, organizationName, {})); diff --git a/src/main/webapp/app/shared/group/group-popup.service.ts b/src/main/webapp/app/shared/group/group-popup.service.ts index fa4ec0851..4a5e21c7a 100644 --- a/src/main/webapp/app/shared/group/group-popup.service.ts +++ b/src/main/webapp/app/shared/group/group-popup.service.ts @@ -6,7 +6,7 @@ import { ProjectService } from '../project'; import { GroupService } from './group.service'; import { Group } from './group.model'; import { Observable, throwError } from 'rxjs'; -import { map } from 'rxjs/operators'; +import { first, map } from 'rxjs/operators'; @Injectable({ providedIn: 'root' }) export class GroupPopupService { @@ -27,22 +27,24 @@ export class GroupPopupService { if (id) { return this.groupService.find(id, projectName).pipe( - map((group: Group) => { - if (group) { - group.projectName = projectName; - } - return this.groupModalRef(component, group, isDelete); - }), + map((group: Group) => { + if (group) { + group.projectName = projectName; + } + return this.groupModalRef(component, group, isDelete); + }), + first(), ); } else if (projectName) { return this.projectService.find(projectName).pipe( - map((project) => { - const group: Group = { - projectId: project.id, - projectName: project.projectName, - }; - return this.groupModalRef(component, group, isDelete); - }), + map((project) => { + const group: Group = { + projectId: project.id, + projectName: project.projectName, + }; + return this.groupModalRef(component, group, isDelete); + }), + first(), ); } else { return throwError("No group given"); diff --git a/src/main/webapp/app/shared/organization/organization.service.ts b/src/main/webapp/app/shared/organization/organization.service.ts index efc602a86..4cbc46610 100644 --- a/src/main/webapp/app/shared/organization/organization.service.ts +++ b/src/main/webapp/app/shared/organization/organization.service.ts @@ -5,7 +5,7 @@ import { BehaviorSubject, combineLatest, Observable, of, Subject, throwError } f import { Organization } from './organization.model'; import { Principal } from '../auth/principal.service'; import { AlertService } from '../util/alert.service'; -import { concatMap, delay, distinctUntilChanged, first, map, retryWhen, startWith, switchMap, tap } from 'rxjs/operators'; +import { concatMap, delay, distinctUntilChanged, filter, first, map, retryWhen, startWith, switchMap, tap } from 'rxjs/operators'; import { createRequestOption } from '../model/request.utils'; @Injectable({ providedIn: 'root' }) @@ -77,25 +77,8 @@ export class OrganizationService { find(orgName: string): Observable { return this.organizations$.pipe( - switchMap(organizations => { - // cannot find organization - if (organizations.length === 0) { - return this.fetchOrganization(orgName); - } - const existingOrganization = organizations.find(o => o.name === orgName); - if (existingOrganization) { - return of(existingOrganization); - } else { - return this.fetchOrganization(orgName); - } - }), - first() - ); - } - - fetchOrganization(orgName: string): Observable { - return this.http.get(this.organizationUrl(orgName)).pipe( - tap(p => this.updateOrganization(p)), + map(organizations => organizations.find(o => o.name === orgName)), + filter(o => !!o), ); } diff --git a/src/main/webapp/app/shared/project/project.service.ts b/src/main/webapp/app/shared/project/project.service.ts index da2c811b8..ca7f49fd5 100644 --- a/src/main/webapp/app/shared/project/project.service.ts +++ b/src/main/webapp/app/shared/project/project.service.ts @@ -1,7 +1,7 @@ import { Injectable } from '@angular/core'; import { HttpClient, HttpResponse } from '@angular/common/http'; import { BehaviorSubject, combineLatest, Observable, of, Subject, throwError } from 'rxjs'; -import { concatMap, delay, distinctUntilChanged, map, pluck, retryWhen, startWith, switchMap, tap, } from 'rxjs/operators'; +import { concatMap, delay, distinctUntilChanged, filter, map, pluck, retryWhen, startWith, switchMap, tap, } from 'rxjs/operators'; import { Project } from './project.model'; import { SourceType } from '../../entities/source-type'; @@ -78,7 +78,8 @@ export class ProjectService { find(projectName: string): Observable { return this.projects$.pipe( - map(projects => projects.find(p => p.projectName === projectName)), + map(projects => projects.find(p => p.projectName === projectName)), + filter(p => !!p), ); } diff --git a/src/main/webapp/app/shared/source/source-popup.service.ts b/src/main/webapp/app/shared/source/source-popup.service.ts index 3476517c2..ff9870deb 100644 --- a/src/main/webapp/app/shared/source/source-popup.service.ts +++ b/src/main/webapp/app/shared/source/source-popup.service.ts @@ -5,7 +5,7 @@ import { NgbModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap'; import { ProjectService } from '../project/project.service'; import { Source } from './source.model'; import { SourceService } from './source.service'; -import { map } from 'rxjs/operators'; +import { first, map } from 'rxjs/operators'; import { Observable, throwError } from 'rxjs'; @Injectable({ providedIn: 'root' }) @@ -29,6 +29,7 @@ export class SourcePopupService { if (sourceName) { return this.sourceService.find(sourceName).pipe( map((source) => this.sourceModalRef(component, source)), + first(), ); } else if (projectName) { return this.projectService.find(projectName).pipe( @@ -37,6 +38,7 @@ export class SourcePopupService { source.project = project; return this.sourceModalRef(component, source); }), + first(), ); } else { return throwError("Cannot create source modal without source or project") diff --git a/src/main/webapp/app/shared/subject/subject-popup.service.ts b/src/main/webapp/app/shared/subject/subject-popup.service.ts index 769b8f029..c4e6f8d16 100644 --- a/src/main/webapp/app/shared/subject/subject-popup.service.ts +++ b/src/main/webapp/app/shared/subject/subject-popup.service.ts @@ -6,7 +6,7 @@ import { ProjectService } from '../project/project.service'; import { Subject, SubjectStatus } from './subject.model'; import { SubjectService } from './subject.service'; import { Observable, of } from 'rxjs'; -import { map } from 'rxjs/operators'; +import { first, map } from 'rxjs/operators'; @Injectable({ providedIn: 'root' }) export class SubjectPopupService { @@ -29,15 +29,17 @@ export class SubjectPopupService { if (login) { return this.subjectService.find(login).pipe( - map((subject: Subject) => this.subjectModalRef(component, subject, isDelete)), + map((subject: Subject) => this.subjectModalRef(component, subject, isDelete)), + first(), ); } else if (projectName) { return this.projectService.find(projectName).pipe( - map((project) => this.subjectModalRef(component, { + map((project) => this.subjectModalRef(component, { project, sources: [], status: SubjectStatus.ACTIVATED, }, isDelete)), + first(), ); } else { return of(this.subjectModalRef(component, { diff --git a/src/test/java/org/radarbase/auth/authentication/OAuthHelper.java b/src/test/java/org/radarbase/auth/authentication/OAuthHelper.java index f260fe5b2..9c6c745fd 100644 --- a/src/test/java/org/radarbase/auth/authentication/OAuthHelper.java +++ b/src/test/java/org/radarbase/auth/authentication/OAuthHelper.java @@ -5,6 +5,10 @@ import com.auth0.jwt.algorithms.Algorithm; import org.radarbase.auth.authorization.Permission; import org.radarbase.auth.config.TokenValidatorConfig; +import org.radarbase.management.domain.Authority; +import org.radarbase.management.domain.Role; +import org.radarbase.management.domain.User; +import org.radarbase.management.repository.UserRepository; import org.radarbase.management.security.JwtAuthenticationFilter; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -22,9 +26,14 @@ import java.util.Collections; import java.util.Date; import java.util.List; +import java.util.Optional; +import java.util.Set; import java.util.stream.Collectors; import java.util.stream.Stream; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; import static org.radarbase.management.security.jwt.ManagementPortalJwtAccessTokenConverter.RES_MANAGEMENT_PORTAL; /** @@ -40,7 +49,7 @@ public final class OAuthHelper { public static final String TEST_CHECKKEY_ALIAS = "radarbase-managementportal-rsa"; public static final String[] SCOPES = Permission.scopes(); public static final String[] AUTHORITIES = {"ROLE_SYS_ADMIN"}; - public static final String[] ROLES = {}; + public static final String[] ROLES = {"ROLE_SYS_ADMIN"}; public static final String[] SOURCES = {}; public static final String[] AUD = {RES_MANAGEMENT_PORTAL}; public static final String CLIENT = "unit_test"; @@ -128,7 +137,9 @@ public static void setUp() throws Exception { * @return an initialized JwtAuthenticationFilter */ public static JwtAuthenticationFilter createAuthenticationFilter() { - return new JwtAuthenticationFilter(createTokenValidator(), auth -> auth); + UserRepository userRepository = mock(UserRepository.class); + when(userRepository.findOneByLogin(anyString())).thenReturn(Optional.of(createAdminUser())); + return new JwtAuthenticationFilter(createTokenValidator(), auth -> auth, userRepository); } /** @@ -162,6 +173,16 @@ public List getPublicKeys() { }; } + private static User createAdminUser() { + User user = new User(); + user.setId(1L); + user.setLogin("admin"); + user.setActivated(true); + user.setRoles(Set.of( + new Role(new Authority("ROLE_SYS_ADMIN")) + )); + return user; + } private static String createValidToken(Algorithm algorithm) { Instant exp = Instant.now().plusSeconds(30 * 60); From 24565bad4145a6fadf828362e9b023c813cb25e0 Mon Sep 17 00:00:00 2001 From: Joris Borgdorff Date: Thu, 20 Jan 2022 13:25:39 +0100 Subject: [PATCH 337/431] Remove redundant project reset --- .../app/entities/organization/organization-dialog.component.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/webapp/app/entities/organization/organization-dialog.component.ts b/src/main/webapp/app/entities/organization/organization-dialog.component.ts index 1b2d8630d..8b92ea294 100644 --- a/src/main/webapp/app/entities/organization/organization-dialog.component.ts +++ b/src/main/webapp/app/entities/organization/organization-dialog.component.ts @@ -70,7 +70,6 @@ export class OrganizationDialogComponent implements OnDestroy { if (history.state?.parentComponent === 'organization-detail') { this.router.navigate(['/organization', result.name]); } - this.projectService.reset(); this.isSaving = false; this.organization = copyOrganization(result); this.activeModal.dismiss(result); From f5ecab87e6087e4863a55349e9702d3f3bd218a6 Mon Sep 17 00:00:00 2001 From: Joris Borgdorff Date: Thu, 20 Jan 2022 13:29:52 +0100 Subject: [PATCH 338/431] Find distinct project only --- src/main/webapp/app/shared/organization/organization.service.ts | 1 + src/main/webapp/app/shared/project/project.service.ts | 1 + 2 files changed, 2 insertions(+) diff --git a/src/main/webapp/app/shared/organization/organization.service.ts b/src/main/webapp/app/shared/organization/organization.service.ts index 4cbc46610..dab8ece20 100644 --- a/src/main/webapp/app/shared/organization/organization.service.ts +++ b/src/main/webapp/app/shared/organization/organization.service.ts @@ -79,6 +79,7 @@ export class OrganizationService { return this.organizations$.pipe( map(organizations => organizations.find(o => o.name === orgName)), filter(o => !!o), + distinctUntilChanged((a, b) => a === b || JSON.stringify(a) === JSON.stringify(b)), ); } diff --git a/src/main/webapp/app/shared/project/project.service.ts b/src/main/webapp/app/shared/project/project.service.ts index ca7f49fd5..d1e745c78 100644 --- a/src/main/webapp/app/shared/project/project.service.ts +++ b/src/main/webapp/app/shared/project/project.service.ts @@ -80,6 +80,7 @@ export class ProjectService { return this.projects$.pipe( map(projects => projects.find(p => p.projectName === projectName)), filter(p => !!p), + distinctUntilChanged((a, b) => a === b || JSON.stringify(a) === JSON.stringify(b)), ); } From 80b3a4bf5dc321c5ad55415857db004a256ad39b Mon Sep 17 00:00:00 2001 From: Joris Borgdorff Date: Thu, 20 Jan 2022 13:31:38 +0100 Subject: [PATCH 339/431] Remove shadowJar from build --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 7637d997f..33325c60f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -20,7 +20,7 @@ COPY gradlew build.gradle gradle.properties settings.gradle /code/ COPY radar-auth/build.gradle radar-auth/ COPY oauth-client-util/build.gradle oauth-client-util/ -RUN ./gradlew downloadDependencies :radar-auth:shadowJar --no-watch-fs +RUN ./gradlew downloadDependencies --no-watch-fs # now we copy our application source code and build it From aaa9bf789a42135ba74145c2e064d40577fe2116 Mon Sep 17 00:00:00 2001 From: Joris Borgdorff Date: Thu, 20 Jan 2022 13:33:51 +0100 Subject: [PATCH 340/431] Readability fix --- src/main/webapp/app/shared/project/project.service.ts | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/main/webapp/app/shared/project/project.service.ts b/src/main/webapp/app/shared/project/project.service.ts index d1e745c78..76bc8089e 100644 --- a/src/main/webapp/app/shared/project/project.service.ts +++ b/src/main/webapp/app/shared/project/project.service.ts @@ -96,9 +96,7 @@ export class ProjectService { fetch(): Observable { return this.query().pipe( - map(res => res.body.map(p => { - return this.convertProjectFromServer(p) - })), + map(res => res.body.map(p => this.convertProjectFromServer(p))), ); } From b236ff07ad3a4d53fec922d44eb7bb95fce2f301 Mon Sep 17 00:00:00 2001 From: Joris Borgdorff Date: Thu, 20 Jan 2022 14:13:51 +0100 Subject: [PATCH 341/431] Fix snyk command line --- .github/workflows/scheduled-snyk.yaml | 2 +- .github/workflows/snyk.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/scheduled-snyk.yaml b/.github/workflows/scheduled-snyk.yaml index 06551de4c..469480827 100644 --- a/.github/workflows/scheduled-snyk.yaml +++ b/.github/workflows/scheduled-snyk.yaml @@ -18,7 +18,7 @@ jobs: with: command: test json: true - args: --all-projects --configuration-matching="^(runtime|compile)Classpath$" --policy-path=.snyk + args: --all-projects --configuration-matching=runtimeClasspath --configuration-matching=compileClasspath --policy-path=.snyk if: ${{ !cancelled() }} - name: Report new vulnerabilities diff --git a/.github/workflows/snyk.yaml b/.github/workflows/snyk.yaml index ef20944d7..7ad1364c9 100644 --- a/.github/workflows/snyk.yaml +++ b/.github/workflows/snyk.yaml @@ -15,4 +15,4 @@ jobs: env: SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }} with: - args: --severity-threshold=high --all-projects --configuration-matching="^(runtime|compile)Classpath$" --policy-path=.snyk + args: --severity-threshold=high --all-projects --configuration-matching=runtimeClasspath --configuration-matching=compileClasspath --policy-path=.snyk From da13ba94f3ff9613d3c67005f515aa624d3bb0e8 Mon Sep 17 00:00:00 2001 From: Joris Borgdorff Date: Thu, 20 Jan 2022 14:55:01 +0100 Subject: [PATCH 342/431] Remove promises where possible --- .../organization-detail.component.spec.ts | 3 +- .../project/project-detail.component.spec.ts | 4 +- .../project/project-dialog.component.ts | 28 +++++------- .../source-type-detail.component.spec.ts | 4 +- .../app/layouts/navbar/navbar.component.html | 9 +--- .../app/layouts/navbar/navbar.component.ts | 42 +++++------------- .../layouts/profiles/page-ribbon.component.ts | 19 ++------ .../layouts/profiles/profile-info.model.ts | 2 +- .../app/layouts/profiles/profile.service.ts | 44 +++++++++++-------- .../app/shared/login/login.component.ts | 3 +- .../webapp/app/shared/login/login.service.ts | 7 +-- .../util/test/mock-principal.service.ts | 4 +- 12 files changed, 69 insertions(+), 100 deletions(-) diff --git a/src/main/webapp/app/entities/organization/organization-detail.component.spec.ts b/src/main/webapp/app/entities/organization/organization-detail.component.spec.ts index 9b40d56ba..8e8b58dc4 100644 --- a/src/main/webapp/app/entities/organization/organization-detail.component.spec.ts +++ b/src/main/webapp/app/entities/organization/organization-detail.component.spec.ts @@ -8,6 +8,7 @@ import { ManagementPortalTestModule } from '../../shared/util/test/test.module'; import { MockActivatedRoute } from '../../shared/util/test/mock-route.service'; import { ProjectService } from '../../shared/project'; import { OrganizationDetailComponent } from './organization-detail.component'; +import { first } from 'rxjs/operators'; describe('Component Tests', () => { @@ -48,7 +49,7 @@ describe('Component Tests', () => { comp.ngOnInit(); // THEN - const org = await comp.organization$.toPromise(); + const org = await comp.organization$.pipe(first()).toPromise(); expect(org).toEqual(jasmine.objectContaining({id: 10})); expect(service.find).toHaveBeenCalledWith('testOrganization'); diff --git a/src/main/webapp/app/entities/project/project-detail.component.spec.ts b/src/main/webapp/app/entities/project/project-detail.component.spec.ts index 3a37356f7..5ec7b7bca 100644 --- a/src/main/webapp/app/entities/project/project-detail.component.spec.ts +++ b/src/main/webapp/app/entities/project/project-detail.component.spec.ts @@ -8,7 +8,7 @@ import { ManagementPortalTestModule } from '../../shared/util/test/test.module'; import { MockActivatedRoute, MockRouter } from '../../shared/util/test/mock-route.service'; import { ProjectService } from '../../shared/project'; import { ProjectDetailComponent } from './project-detail.component'; -import { filter } from "rxjs/operators"; +import { filter, first } from 'rxjs/operators'; describe('Component Tests', () => { @@ -53,7 +53,7 @@ describe('Component Tests', () => { // THEN expect(service.find).toHaveBeenCalledWith('testProject'); - const result = await comp.project$.pipe(filter(p => !!p)).toPromise(); + const result = await comp.project$.pipe(filter(p => !!p), first()).toPromise(); expect(result).toEqual(jasmine.objectContaining({id: 10})) })); }); diff --git a/src/main/webapp/app/entities/project/project-dialog.component.ts b/src/main/webapp/app/entities/project/project-dialog.component.ts index 9d8cfcc07..e42673f15 100644 --- a/src/main/webapp/app/entities/project/project-dialog.component.ts +++ b/src/main/webapp/app/entities/project/project-dialog.component.ts @@ -162,32 +162,26 @@ export class ProjectDialogComponent implements OnInit, OnDestroy { let currentGroups = this.projectCopy.groups || []; let newGroup = { name: this.newGroupInputText }; if (newGroup.name.length == 0 || newGroup.name.length > 50) { - // TODO: actually show error return; } if (currentGroups.some(g => g.name === newGroup.name)) { // TODO: actually show error return; } - this.groupService.create(this.projectCopy.projectName, newGroup).toPromise() - .then(g => { - this.projectCopy.groups = [ ...currentGroups, g]; - this.newGroupInputText = ''; - }) - .catch(reason => { - // TODO: actually show error - }) + this.subscriptions.add( + this.groupService.create(this.projectCopy.projectName, newGroup).subscribe(g => { + this.projectCopy.groups = [ ...currentGroups, g]; + this.newGroupInputText = ''; + }) + ); } removeGroup(groupName: string) { - // TODO: warn that this may affect existing subjects - this.groupService.delete(this.projectCopy.projectName, groupName).toPromise() - .then(() => { - this.projectCopy.groups = this.projectCopy.groups.filter(g => g.name !== groupName); - }) - .catch(() => { - // TODO: actually show error - }); + this.subscriptions.add( + this.groupService.delete(this.projectCopy.projectName, groupName).subscribe(() => { + this.projectCopy.groups = this.projectCopy.groups.filter(g => g.name !== groupName); + }) + ); } } diff --git a/src/main/webapp/app/entities/source-type/source-type-detail.component.spec.ts b/src/main/webapp/app/entities/source-type/source-type-detail.component.spec.ts index 7a609b1e5..cf3d72279 100644 --- a/src/main/webapp/app/entities/source-type/source-type-detail.component.spec.ts +++ b/src/main/webapp/app/entities/source-type/source-type-detail.component.spec.ts @@ -9,6 +9,7 @@ import { MockActivatedRoute } from '../../shared/util/test/mock-route.service'; import { SourceTypeDetailComponent } from './source-type-detail.component'; import { SourceTypeService } from './source-type.service'; import { SourceType } from './source-type.model'; +import { first } from 'rxjs/operators'; describe('Component Tests', () => { @@ -49,8 +50,9 @@ describe('Component Tests', () => { // WHEN comp.ngOnInit(); + const sourceType = await comp.sourceType$.pipe(first()).toPromise(); // THEN - expect(await comp.sourceType$.toPromise()).toEqual(jasmine.objectContaining({id: 10})); + expect(sourceType).toEqual(jasmine.objectContaining({id: 10})); expect(service.find).toHaveBeenCalledWith('testProducer', 'testModel', 'testVersion'); })); }); diff --git a/src/main/webapp/app/layouts/navbar/navbar.component.html b/src/main/webapp/app/layouts/navbar/navbar.component.html index 08f85ceaa..e5bb976d0 100644 --- a/src/main/webapp/app/layouts/navbar/navbar.component.html +++ b/src/main/webapp/app/layouts/navbar/navbar.component.html @@ -126,19 +126,12 @@ -
  • +
    • - -
  • - - - - -
    • diff --git a/src/main/webapp/app/layouts/navbar/navbar.component.ts b/src/main/webapp/app/layouts/navbar/navbar.component.ts index 9d1cf77ae..df0b111d7 100644 --- a/src/main/webapp/app/layouts/navbar/navbar.component.ts +++ b/src/main/webapp/app/layouts/navbar/navbar.component.ts @@ -1,8 +1,7 @@ -import { ChangeDetectionStrategy, Component, OnDestroy, OnInit } from '@angular/core'; +import { ChangeDetectionStrategy, Component } from '@angular/core'; import { Router } from '@angular/router'; import { NgbModalRef } from '@ng-bootstrap/ng-bootstrap'; import { TranslateService } from '@ngx-translate/core'; -import { Subscription } from 'rxjs'; import { DEBUG_INFO_ENABLED, VERSION } from '../../app.constants'; import { @@ -18,7 +17,6 @@ import { import { EventManager } from '../../shared/util/event-manager.service'; import { ProfileService } from '../profiles/profile.service'; -import { switchMap, tap } from "rxjs/operators"; @Component({ selector: 'jhi-navbar', @@ -28,44 +26,28 @@ import { switchMap, tap } from "rxjs/operators"; 'navbar.scss', ], }) -export class NavbarComponent implements OnInit, OnDestroy { - inProduction: boolean; +export class NavbarComponent { isNavbarCollapsed: boolean; - apiDocsEnabled: boolean; modalRef: NgbModalRef; version: string; projects: Project[]; organizations: Organization[]; - private subscriptions: Subscription; - constructor( - private loginService: LoginService, - public languageHelper: JhiLanguageHelper, - public principal: Principal, - private loginModalService: LoginModalService, - private profileService: ProfileService, - private router: Router, - private eventManager: EventManager, - private translateService: TranslateService, - public projectService: ProjectService, - public organizationService: OrganizationService, + private loginService: LoginService, + public languageHelper: JhiLanguageHelper, + public principal: Principal, + private loginModalService: LoginModalService, + public profileService: ProfileService, + private router: Router, + private eventManager: EventManager, + private translateService: TranslateService, + public projectService: ProjectService, + public organizationService: OrganizationService, ) { this.version = DEBUG_INFO_ENABLED ? 'v' + VERSION : ''; this.isNavbarCollapsed = true; - this.subscriptions = new Subscription(); - } - - ngOnInit() { - this.profileService.getProfileInfo().then((profileInfo) => { - this.inProduction = profileInfo.inProduction; - this.apiDocsEnabled = profileInfo.apiDocsEnabled; - }); - } - - ngOnDestroy() { - this.subscriptions.unsubscribe(); } trackProjectName(index: number, item: Project) { diff --git a/src/main/webapp/app/layouts/profiles/page-ribbon.component.ts b/src/main/webapp/app/layouts/profiles/page-ribbon.component.ts index b06b01aa7..2e638ef4e 100644 --- a/src/main/webapp/app/layouts/profiles/page-ribbon.component.ts +++ b/src/main/webapp/app/layouts/profiles/page-ribbon.component.ts @@ -5,25 +5,14 @@ import { ProfileService } from './profile.service'; @Component({ selector: 'jhi-page-ribbon', template: ` -
    - +
    +
    `, styleUrls: [ 'page-ribbon.scss', ], }) -export class PageRibbonComponent implements OnInit { - - profileInfo: ProfileInfo; - ribbonEnv: string; - - constructor(private profileService: ProfileService) { - } - - ngOnInit() { - this.profileService.getProfileInfo().then((profileInfo) => { - this.profileInfo = profileInfo; - this.ribbonEnv = profileInfo.ribbonEnv; - }); +export class PageRibbonComponent { + constructor(public profileService: ProfileService) { } } diff --git a/src/main/webapp/app/layouts/profiles/profile-info.model.ts b/src/main/webapp/app/layouts/profiles/profile-info.model.ts index e4a090793..cd08a0058 100644 --- a/src/main/webapp/app/layouts/profiles/profile-info.model.ts +++ b/src/main/webapp/app/layouts/profiles/profile-info.model.ts @@ -1,4 +1,4 @@ -export class ProfileInfo { +export interface ProfileInfo { activeProfiles: string[]; ribbonEnv: string; inProduction: boolean; diff --git a/src/main/webapp/app/layouts/profiles/profile.service.ts b/src/main/webapp/app/layouts/profiles/profile.service.ts index 4863e1a9c..a5c4ca2d2 100644 --- a/src/main/webapp/app/layouts/profiles/profile.service.ts +++ b/src/main/webapp/app/layouts/profiles/profile.service.ts @@ -1,30 +1,38 @@ import { Injectable } from '@angular/core'; import { HttpClient } from '@angular/common/http'; -import { map } from 'rxjs/operators'; +import { first, map, switchMap, tap } from 'rxjs/operators'; import { ProfileInfo } from './profile-info.model'; +import { BehaviorSubject, Observable, of } from 'rxjs'; + +interface MinimalProfileInfo { + activeProfiles: string[], +} @Injectable({ providedIn: 'root' }) export class ProfileService { - private profileInfoUrl = 'api/profile-info'; - private profileInfo: Promise; + private _activeProfiles$: BehaviorSubject = new BehaviorSubject(null); + profileInfo$: Observable constructor(private http: HttpClient) { - } - - getProfileInfo(): Promise { - if (!this.profileInfo) { - this.profileInfo = this.http.get(this.profileInfoUrl) - .pipe(map(data => { - const pi = new ProfileInfo(); - pi.activeProfiles = data.activeProfiles; - pi.ribbonEnv = data.activeProfiles.includes('dev') ? 'dev' : '' - pi.inProduction = data.activeProfiles.includes('prod'); - pi.apiDocsEnabled = data.activeProfiles.includes('api-docs'); - return pi; - })).toPromise(); - } - return this.profileInfo; + this.profileInfo$ = this._activeProfiles$.pipe( + first(), + switchMap(p => { + if (!p) { + return this.http.get(this.profileInfoUrl).pipe( + tap(p => this._activeProfiles$.next(p)), + ) + } else { + return of(p); + } + }), + map(p => ({ + activeProfiles: p.activeProfiles, + ribbonEnv: p.activeProfiles.includes('dev') ? 'dev' : '', + inProduction: p.activeProfiles.includes('prod'), + apiDocsEnabled: p.activeProfiles.includes('api-docs'), + })), + ); } } diff --git a/src/main/webapp/app/shared/login/login.component.ts b/src/main/webapp/app/shared/login/login.component.ts index 28c6f938a..d91a3a292 100644 --- a/src/main/webapp/app/shared/login/login.component.ts +++ b/src/main/webapp/app/shared/login/login.component.ts @@ -6,6 +6,7 @@ import { AuthService, StateStorageService } from '..'; import { EventManager } from '../util/event-manager.service'; import { LoginService } from './login.service'; +import { first } from 'rxjs/operators'; @Component({ selector: 'jhi-login-modal', @@ -49,7 +50,7 @@ export class JhiLoginModalComponent implements AfterViewInit { username: this.username, password: this.password, rememberMe: this.rememberMe, - }).then(() => { + }).pipe(first()).toPromise().then(() => { this.authenticationError = false; this.activeModal.dismiss('login success'); if (this.router.url === '/register' || (/activate/.test(this.router.url)) || diff --git a/src/main/webapp/app/shared/login/login.service.ts b/src/main/webapp/app/shared/login/login.service.ts index 9d8f780e9..ead0d652c 100644 --- a/src/main/webapp/app/shared/login/login.service.ts +++ b/src/main/webapp/app/shared/login/login.service.ts @@ -3,8 +3,9 @@ import { TranslateService } from '@ngx-translate/core'; import { AuthServerProvider } from '../auth/auth-oauth2.service'; import { Principal } from '../auth/principal.service'; -import { tap } from "rxjs/operators"; +import { first, tap } from 'rxjs/operators'; import { Account } from "../user/account.model"; +import { Observable } from 'rxjs'; @Injectable({ providedIn: 'root' }) export class LoginService { @@ -15,7 +16,7 @@ export class LoginService { ) { } - login(credentials): Promise { + login(credentials): Observable { return this.authServerProvider.login(credentials).pipe( tap( (account) => { @@ -28,7 +29,7 @@ export class LoginService { }, () => this.logout() ), - ).toPromise(); + ); } logout() { diff --git a/src/main/webapp/app/shared/util/test/mock-principal.service.ts b/src/main/webapp/app/shared/util/test/mock-principal.service.ts index ca01e74cf..483c7d94c 100644 --- a/src/main/webapp/app/shared/util/test/mock-principal.service.ts +++ b/src/main/webapp/app/shared/util/test/mock-principal.service.ts @@ -1,10 +1,9 @@ import { Observable, ReplaySubject } from "rxjs"; import { Account } from "../../user/account.model"; -import { take } from "rxjs/operators"; +import { first, take } from 'rxjs/operators'; export class MockPrincipal { private _account$ = new ReplaySubject(); - identity: any; fakeResponse: any; reset: any; account$Spy: any; @@ -14,7 +13,6 @@ export class MockPrincipal { constructor() { this.fakeResponse = {}; - this.identity = jasmine.createSpy('identity').and.returnValue(this._account$.toPromise()); this.reset = jasmine.createSpy('reset').and.returnValue(this._account$.pipe(take(1))); this.account$Spy = spyOnProperty(this, 'account$', 'get').and.returnValue(this._account$.asObservable()); } From d9a1466f6b942dc2b8e3657f9c1ebff1c5924079 Mon Sep 17 00:00:00 2001 From: Joris Borgdorff Date: Thu, 20 Jan 2022 15:42:59 +0100 Subject: [PATCH 343/431] Fix save account test --- .../settings/settings.component.spec.ts | 28 ++++++++++--------- .../account/settings/settings.component.ts | 11 ++++---- 2 files changed, 20 insertions(+), 19 deletions(-) diff --git a/src/main/webapp/app/account/settings/settings.component.spec.ts b/src/main/webapp/app/account/settings/settings.component.spec.ts index 6f4b472a7..7b0463f61 100644 --- a/src/main/webapp/app/account/settings/settings.component.spec.ts +++ b/src/main/webapp/app/account/settings/settings.component.spec.ts @@ -52,7 +52,7 @@ describe('Component Tests', () => { fixture.detectChanges(); }); - it('should send the current identity upon save', function() { + it('should send the current identity upon save', waitForAsync(async function() { // GIVEN const accountValues = { firstName: 'John', @@ -68,16 +68,16 @@ describe('Component Tests', () => { // WHEN comp.settingsAccount = accountValues; - comp.save(); + await comp.saveAccount().toPromise(); // THEN expect(mockPrincipal.account$Spy).toHaveBeenCalled(); expect(mockPrincipal.reset).toHaveBeenCalled(); expect(mockAuth.save).toHaveBeenCalledWith(accountValues); expect(comp.settingsAccount).toEqual(accountValues); - }); + })); - it('should notify of success upon successful save', function() { + it('should notify of success upon successful save', waitForAsync(async function() { // GIVEN const accountValues = { firstName: 'John', @@ -87,14 +87,14 @@ describe('Component Tests', () => { mockAuth.save.and.returnValue(of(accountValues)); // WHEN - comp.save(); + await comp.saveAccount().toPromise(); // THEN expect(comp.error).toBeNull(); expect(comp.success).toBe('OK'); - }); + })); - it('should notify of error upon failed save', function() { + it('should notify of error upon failed save', waitForAsync(async function() { // GIVEN const accountValues = { firstName: 'John', @@ -109,11 +109,13 @@ describe('Component Tests', () => { // WHEN comp.settingsAccount = accountValues; - comp.save(); - - // THEN - expect(comp.error).toEqual('ERROR'); - expect(comp.success).toBeNull(); - }); + try { + await comp.saveAccount().toPromise(); + } catch (e) { + // THEN + expect(comp.error).toEqual('ERROR'); + expect(comp.success).toBeNull(); + } + })); }); }); diff --git a/src/main/webapp/app/account/settings/settings.component.ts b/src/main/webapp/app/account/settings/settings.component.ts index 9c8c275b9..2543f6591 100644 --- a/src/main/webapp/app/account/settings/settings.component.ts +++ b/src/main/webapp/app/account/settings/settings.component.ts @@ -1,6 +1,6 @@ import { Component, OnDestroy, OnInit } from '@angular/core'; import { TranslateService } from '@ngx-translate/core'; -import { Subscription } from 'rxjs'; +import { Observable, Subscription } from 'rxjs'; import { Account, AccountService, JhiLanguageHelper, Principal } from '../../shared'; import { filter, switchMap, tap } from 'rxjs/operators'; @@ -42,10 +42,10 @@ export class SettingsComponent implements OnInit, OnDestroy { } save() { - this.subscription.add(this.registerSaveAction()); + this.subscription.add(this.saveAccount().subscribe()); } - private registerSaveAction(): Subscription { + saveAccount(): Observable { const currentLangKey = this.settingsAccount.langKey; return this.account.save(this.settingsAccount).pipe( tap( @@ -59,13 +59,12 @@ export class SettingsComponent implements OnInit, OnDestroy { } ), switchMap(() => this.principal.reset()), - ).subscribe( - () => { + tap(() => { if (currentLangKey && currentLangKey !== this.previousLangKey) { this.translateService.use(currentLangKey) this.previousLangKey = currentLangKey; } - } + }), ); } } From cf2a129bd06da7f730ab44989be2da7db14b3d42 Mon Sep 17 00:00:00 2001 From: Joris Borgdorff Date: Thu, 20 Jan 2022 16:10:29 +0100 Subject: [PATCH 344/431] Ensure that gradle is stopped --- .github/workflows/main.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index bb51f4887..5b4709076 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -69,11 +69,10 @@ jobs: run: | cp src/test/resources/config/keystore.p12 src/main/resources/config/keystore.p12 ./gradlew bootRun &>mp.log Date: Thu, 20 Jan 2022 16:34:16 +0100 Subject: [PATCH 345/431] Use published snyk --- .github/workflows/scheduled-snyk.yaml | 30 ++++++++++++++++++++------- .github/workflows/snyk.yaml | 27 ++++++++++++++++++++---- 2 files changed, 46 insertions(+), 11 deletions(-) diff --git a/.github/workflows/scheduled-snyk.yaml b/.github/workflows/scheduled-snyk.yaml index 469480827..4f5944d34 100644 --- a/.github/workflows/scheduled-snyk.yaml +++ b/.github/workflows/scheduled-snyk.yaml @@ -11,15 +11,31 @@ jobs: steps: - uses: actions/checkout@master - - name: Run Snyk to check for vulnerabilities - uses: snyk/actions/gradle-jdk11@master + - uses: actions/setup-node@v2 + with: + node-version: '16' + cache: npm + + - uses: actions/setup-java@v1 + with: + java-version: 17 + cache: gradle + + - name: Install Snyk env: SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }} - with: - command: test - json: true - args: --all-projects --configuration-matching=runtimeClasspath --configuration-matching=compileClasspath --policy-path=.snyk - if: ${{ !cancelled() }} + run: | + npm install snyk@latest -g + snyk auth + + - name: Run Snyk to check for vulnerabilities + run: >- + snyk test + --all-projects + --configuration-matching=runtimeClasspath + --configuration-matching=compileClasspath + --policy-path=.snyk + --json-file-output=snyk.json - name: Report new vulnerabilities uses: thehyve/report-vulnerability@master diff --git a/.github/workflows/snyk.yaml b/.github/workflows/snyk.yaml index 7ad1364c9..8a621efef 100644 --- a/.github/workflows/snyk.yaml +++ b/.github/workflows/snyk.yaml @@ -10,9 +10,28 @@ jobs: steps: - uses: actions/checkout@master - - name: Run Snyk to check for vulnerabilities - uses: snyk/actions/gradle-jdk11@master + - uses: actions/setup-node@v2 + with: + node-version: '16' + cache: npm + + - uses: actions/setup-java@v1 + with: + java-version: 17 + cache: gradle + + - name: Install Snyk env: SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }} - with: - args: --severity-threshold=high --all-projects --configuration-matching=runtimeClasspath --configuration-matching=compileClasspath --policy-path=.snyk + run: | + npm install snyk@latest -g + snyk auth + + - name: Run Snyk to check for vulnerabilities + run: > + snyk test + --severity-threshold=high + --all-projects + --configuration-matching=runtimeClasspath + --configuration-matching=compileClasspath + --policy-path=.snyk From 252d544866348b214c7dea38872318e36c75adce Mon Sep 17 00:00:00 2001 From: Joris Borgdorff Date: Thu, 20 Jan 2022 16:43:37 +0100 Subject: [PATCH 346/431] Separate env variables --- .github/workflows/scheduled-snyk.yaml | 9 +++++---- .github/workflows/snyk.yaml | 9 +++++---- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/.github/workflows/scheduled-snyk.yaml b/.github/workflows/scheduled-snyk.yaml index 4f5944d34..0a9852738 100644 --- a/.github/workflows/scheduled-snyk.yaml +++ b/.github/workflows/scheduled-snyk.yaml @@ -16,17 +16,18 @@ jobs: node-version: '16' cache: npm - - uses: actions/setup-java@v1 + - uses: actions/setup-java@v2 with: java-version: 17 cache: gradle - name: Install Snyk + run: npm install snyk@latest -g + + - name: Log in to snyk env: SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }} - run: | - npm install snyk@latest -g - snyk auth + run: snyk auth - name: Run Snyk to check for vulnerabilities run: >- diff --git a/.github/workflows/snyk.yaml b/.github/workflows/snyk.yaml index 8a621efef..a0c4c0e44 100644 --- a/.github/workflows/snyk.yaml +++ b/.github/workflows/snyk.yaml @@ -15,17 +15,18 @@ jobs: node-version: '16' cache: npm - - uses: actions/setup-java@v1 + - uses: actions/setup-java@v2 with: java-version: 17 cache: gradle - name: Install Snyk + run: npm install snyk@latest -g + + - name: Log in to snyk env: SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }} - run: | - npm install snyk@latest -g - snyk auth + run: snyk auth - name: Run Snyk to check for vulnerabilities run: > From 662b256ff938a3836611c62457ea5b3003618f78 Mon Sep 17 00:00:00 2001 From: Joris Borgdorff Date: Thu, 20 Jan 2022 16:45:56 +0100 Subject: [PATCH 347/431] [GA] Fix java distribution --- .github/workflows/scheduled-snyk.yaml | 1 + .github/workflows/snyk.yaml | 1 + 2 files changed, 2 insertions(+) diff --git a/.github/workflows/scheduled-snyk.yaml b/.github/workflows/scheduled-snyk.yaml index 0a9852738..4bd2a56a4 100644 --- a/.github/workflows/scheduled-snyk.yaml +++ b/.github/workflows/scheduled-snyk.yaml @@ -18,6 +18,7 @@ jobs: - uses: actions/setup-java@v2 with: + distribution: zulu java-version: 17 cache: gradle diff --git a/.github/workflows/snyk.yaml b/.github/workflows/snyk.yaml index a0c4c0e44..e003150a6 100644 --- a/.github/workflows/snyk.yaml +++ b/.github/workflows/snyk.yaml @@ -17,6 +17,7 @@ jobs: - uses: actions/setup-java@v2 with: + distribution: zulu java-version: 17 cache: gradle From b3ee06e154de684bad57aebb061d8c9060201b9b Mon Sep 17 00:00:00 2001 From: Joris Borgdorff Date: Thu, 20 Jan 2022 16:51:25 +0100 Subject: [PATCH 348/431] [GA] Fix Snyk auth --- .github/workflows/scheduled-snyk.yaml | 5 +---- .github/workflows/snyk.yaml | 5 +---- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/.github/workflows/scheduled-snyk.yaml b/.github/workflows/scheduled-snyk.yaml index 4bd2a56a4..f07740347 100644 --- a/.github/workflows/scheduled-snyk.yaml +++ b/.github/workflows/scheduled-snyk.yaml @@ -25,12 +25,9 @@ jobs: - name: Install Snyk run: npm install snyk@latest -g - - name: Log in to snyk + - name: Run Snyk to check for vulnerabilities env: SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }} - run: snyk auth - - - name: Run Snyk to check for vulnerabilities run: >- snyk test --all-projects diff --git a/.github/workflows/snyk.yaml b/.github/workflows/snyk.yaml index e003150a6..3d33cf46f 100644 --- a/.github/workflows/snyk.yaml +++ b/.github/workflows/snyk.yaml @@ -24,12 +24,9 @@ jobs: - name: Install Snyk run: npm install snyk@latest -g - - name: Log in to snyk + - name: Run Snyk to check for vulnerabilities env: SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }} - run: snyk auth - - - name: Run Snyk to check for vulnerabilities run: > snyk test --severity-threshold=high From f5472afff9b2b3ac22f1242baa5eb67e94bb8275 Mon Sep 17 00:00:00 2001 From: Joris Borgdorff Date: Thu, 20 Jan 2022 17:01:15 +0100 Subject: [PATCH 349/431] Fix snyk multiple configurations --- .github/workflows/scheduled-snyk.yaml | 3 +-- .github/workflows/snyk.yaml | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/scheduled-snyk.yaml b/.github/workflows/scheduled-snyk.yaml index f07740347..38c7567b9 100644 --- a/.github/workflows/scheduled-snyk.yaml +++ b/.github/workflows/scheduled-snyk.yaml @@ -31,8 +31,7 @@ jobs: run: >- snyk test --all-projects - --configuration-matching=runtimeClasspath - --configuration-matching=compileClasspath + --configuration-matching="^(compile|runtime)Classpath$" --policy-path=.snyk --json-file-output=snyk.json diff --git a/.github/workflows/snyk.yaml b/.github/workflows/snyk.yaml index 3d33cf46f..fb05ce905 100644 --- a/.github/workflows/snyk.yaml +++ b/.github/workflows/snyk.yaml @@ -31,6 +31,5 @@ jobs: snyk test --severity-threshold=high --all-projects - --configuration-matching=runtimeClasspath - --configuration-matching=compileClasspath + --configuration-matching="^(compile|runtime)Classpath$" --policy-path=.snyk From faf4a086e00e5886723ea8639cde3d29bd2f79be Mon Sep 17 00:00:00 2001 From: Joris Borgdorff Date: Thu, 20 Jan 2022 17:12:30 +0100 Subject: [PATCH 350/431] Ignore unfixable snyk vuln --- .snyk | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 .snyk diff --git a/.snyk b/.snyk new file mode 100644 index 000000000..03c5cb9f4 --- /dev/null +++ b/.snyk @@ -0,0 +1,10 @@ +# Snyk (https://snyk.io) policy file, patches or ignores known vulnerabilities. +version: v1.22.1 +# ignores vulnerabilities until expiry date; change duration by modifying expiry date +ignore: + SNYK-JS-ANSIREGEX-1583908: + - '*': + reason: No feasible upgrade path + expires: 2022-06-30T00:00:00.000Z + created: 2022-01-20T16:12:05.743Z +patch: {} From 8cf1f014dba5de1c8d35e99c9645ea299d4274ac Mon Sep 17 00:00:00 2001 From: Joris Borgdorff Date: Thu, 20 Jan 2022 17:24:39 +0100 Subject: [PATCH 351/431] Fix dependency --- .snyk | 10 ---------- package.json | 3 +++ yarn.lock | 29 ++++------------------------- 3 files changed, 7 insertions(+), 35 deletions(-) delete mode 100644 .snyk diff --git a/.snyk b/.snyk deleted file mode 100644 index 03c5cb9f4..000000000 --- a/.snyk +++ /dev/null @@ -1,10 +0,0 @@ -# Snyk (https://snyk.io) policy file, patches or ignores known vulnerabilities. -version: v1.22.1 -# ignores vulnerabilities until expiry date; change duration by modifying expiry date -ignore: - SNYK-JS-ANSIREGEX-1583908: - - '*': - reason: No feasible upgrade path - expires: 2022-06-30T00:00:00.000Z - created: 2022-01-20T16:12:05.743Z -patch: {} diff --git a/package.json b/package.json index c63886f8e..87f99dbb3 100644 --- a/package.json +++ b/package.json @@ -55,6 +55,9 @@ "engines": { "node": ">=14.14.0" }, + "resolutions": { + "ansi-regex": "5.0.1" + }, "scripts": { "lint": "ng lint", "lint:fix": "ng lint --fix=true", diff --git a/yarn.lock b/yarn.lock index 8822cb580..9a42152a4 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2756,31 +2756,10 @@ __metadata: languageName: node linkType: hard -"ansi-regex@npm:^2.0.0": - version: 2.1.1 - resolution: "ansi-regex@npm:2.1.1" - checksum: 190abd03e4ff86794f338a31795d262c1dfe8c91f7e01d04f13f646f1dcb16c5800818f886047876f1272f065570ab86b24b99089f8b68a0e11ff19aed4ca8f1 - languageName: node - linkType: hard - -"ansi-regex@npm:^3.0.0": - version: 3.0.0 - resolution: "ansi-regex@npm:3.0.0" - checksum: 2ad11c416f81c39f5c65eafc88cf1d71aa91d76a2f766e75e457c2a3c43e8a003aadbf2966b61c497aa6a6940a36412486c975b3270cdfc3f413b69826189ec3 - languageName: node - linkType: hard - -"ansi-regex@npm:^4.1.0": - version: 4.1.0 - resolution: "ansi-regex@npm:4.1.0" - checksum: 97aa4659538d53e5e441f5ef2949a3cffcb838e57aeaad42c4194e9d7ddb37246a6526c4ca85d3940a9d1e19b11cc2e114530b54c9d700c8baf163c31779baf8 - languageName: node - linkType: hard - -"ansi-regex@npm:^5.0.0": - version: 5.0.0 - resolution: "ansi-regex@npm:5.0.0" - checksum: b1bb4e992a5d96327bb4f72eaba9f8047f1d808d273ad19d399e266bfcc7fb19a4d1a127a32f7bc61fe46f1a94a4d04ec4c424e3fbe184929aa866323d8ed4ce +"ansi-regex@npm:5.0.1": + version: 5.0.1 + resolution: "ansi-regex@npm:5.0.1" + checksum: 2aa4bb54caf2d622f1afdad09441695af2a83aa3fe8b8afa581d205e57ed4261c183c4d3877cee25794443fde5876417d859c108078ab788d6af7e4fe52eb66b languageName: node linkType: hard From a8c4dbc12772210a7a6243431ee5f261dabc54ee Mon Sep 17 00:00:00 2001 From: Joris Borgdorff Date: Thu, 20 Jan 2022 19:24:07 +0100 Subject: [PATCH 352/431] Fix checkstyle --- .../org/radarbase/management/web/rest/ProjectResource.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/radarbase/management/web/rest/ProjectResource.java b/src/main/java/org/radarbase/management/web/rest/ProjectResource.java index b92230dd3..0aa280f31 100644 --- a/src/main/java/org/radarbase/management/web/rest/ProjectResource.java +++ b/src/main/java/org/radarbase/management/web/rest/ProjectResource.java @@ -275,7 +275,8 @@ public ResponseEntity> getRolesByProject(@PathVariable String proj checkPermission(token, ROLE_READ); log.debug("REST request to get all Roles for project {}", projectName); ProjectDTO projectDto = projectService.findOneByName(projectName); - checkPermissionOnOrganizationAndProject(token, ROLE_READ, projectDto.getOrganization().getName(), projectDto.getProjectName()); + checkPermissionOnOrganizationAndProject(token, ROLE_READ, + projectDto.getOrganization().getName(), projectDto.getProjectName()); return ResponseEntity.ok(roleService.getRolesByProject(projectName)); } From a5e2800e8176d367ea6d7b6ede33e370d8cf457c Mon Sep 17 00:00:00 2001 From: Joris Borgdorff Date: Thu, 20 Jan 2022 20:49:27 +0100 Subject: [PATCH 353/431] Fix tests --- .../decorator/ProjectMapperDecorator.java | 4 ++-- .../management/web/rest/ProjectResource.java | 19 ++++++++++--------- .../web/rest/ProjectResourceIntTest.java | 4 ++++ 3 files changed, 16 insertions(+), 11 deletions(-) diff --git a/src/main/java/org/radarbase/management/service/mapper/decorator/ProjectMapperDecorator.java b/src/main/java/org/radarbase/management/service/mapper/decorator/ProjectMapperDecorator.java index ac5c9b1f3..91219392c 100644 --- a/src/main/java/org/radarbase/management/service/mapper/decorator/ProjectMapperDecorator.java +++ b/src/main/java/org/radarbase/management/service/mapper/decorator/ProjectMapperDecorator.java @@ -81,8 +81,8 @@ public Project projectDTOToProject(ProjectDTO projectDto) { var orgDto = projectDto.getOrganization(); if (orgDto != null && orgDto.getName() != null) { - var org = organizationRepository.findOneByName(orgDto.getName()).orElseThrow( - () -> new NotFoundException("Organization not found with name", + var org = organizationRepository.findOneByName(orgDto.getName()) + .orElseThrow(() -> new NotFoundException("Organization not found with name", ORGANIZATION, ErrorConstants.ERR_ORGANIZATION_NAME_NOT_FOUND, Collections.singletonMap("name", orgDto.getName()))); diff --git a/src/main/java/org/radarbase/management/web/rest/ProjectResource.java b/src/main/java/org/radarbase/management/web/rest/ProjectResource.java index 0aa280f31..018c915b6 100644 --- a/src/main/java/org/radarbase/management/web/rest/ProjectResource.java +++ b/src/main/java/org/radarbase/management/web/rest/ProjectResource.java @@ -48,8 +48,6 @@ import java.util.List; import java.util.Objects; -import static org.radarbase.auth.authorization.RoleAuthority.PARTICIPANT; -import static org.radarbase.auth.authorization.Permission.ORGANIZATION_UPDATE; import static org.radarbase.auth.authorization.Permission.PROJECT_CREATE; import static org.radarbase.auth.authorization.Permission.PROJECT_DELETE; import static org.radarbase.auth.authorization.Permission.PROJECT_READ; @@ -57,11 +55,9 @@ import static org.radarbase.auth.authorization.Permission.ROLE_READ; import static org.radarbase.auth.authorization.Permission.SOURCE_READ; import static org.radarbase.auth.authorization.Permission.SUBJECT_READ; -import static org.radarbase.auth.authorization.RadarAuthorization.checkGlobalPermission; import static org.radarbase.auth.authorization.RadarAuthorization.checkPermission; import static org.radarbase.auth.authorization.RadarAuthorization.checkPermissionOnOrganization; import static org.radarbase.auth.authorization.RadarAuthorization.checkPermissionOnOrganizationAndProject; -import static org.radarbase.auth.authorization.RadarAuthorization.checkPermissionOnProject; import static org.radarbase.auth.authorization.RoleAuthority.PARTICIPANT; import static org.radarbase.management.web.rest.errors.ErrorConstants.ERR_PROJECT_NOT_EMPTY; import static org.radarbase.management.web.rest.errors.ErrorConstants.ERR_VALIDATION; @@ -119,12 +115,15 @@ public ResponseEntity createProject(@Valid @RequestBody ProjectDTO p checkPermissionOnOrganization(token, PROJECT_CREATE, org.getName()); if (projectDto.getId() != null) { - return ResponseEntity.badRequest().headers(HeaderUtil.createFailureAlert( - ENTITY_NAME, "idexists", "A new project cannot already have an ID")).body(null); + return ResponseEntity.badRequest() + .headers(HeaderUtil.createFailureAlert( + ENTITY_NAME, "idexists", "A new project cannot already have an ID")) + .body(null); } if (projectRepository.findOneWithEagerRelationshipsByName(projectDto.getProjectName()) .isPresent()) { - return ResponseEntity.badRequest().headers(HeaderUtil.createFailureAlert( + return ResponseEntity.badRequest() + .headers(HeaderUtil.createFailureAlert( ENTITY_NAME, "nameexists", "A project with this name already exists")) .body(null); } @@ -296,7 +295,8 @@ public ResponseEntity getAllSourcesForProject(@Parameter Pageable pageable, log.debug("REST request to get all Sources"); ProjectDTO projectDto = projectService.findOneByName(projectName); RadarToken jwt = token; - checkPermissionOnOrganizationAndProject(jwt, SOURCE_READ, projectDto.getOrganization().getName(), projectDto.getProjectName()); + checkPermissionOnOrganizationAndProject(jwt, SOURCE_READ, + projectDto.getOrganization().getName(), projectDto.getProjectName()); if (!jwt.isClientCredentials() && jwt.hasAuthority(PARTICIPANT)) { throw new NotAuthorizedException("Cannot list all project sources as a participant."); } @@ -343,7 +343,8 @@ public ResponseEntity> getAllSubjects( String projectName = subjectCriteria.getProjectName(); // this checks if the project exists ProjectDTO projectDto = projectService.findOneByName(projectName); - checkPermissionOnOrganizationAndProject(token, SUBJECT_READ, projectDto.getOrganization().getName(), projectName); + checkPermissionOnOrganizationAndProject(token, SUBJECT_READ, + projectDto.getOrganization().getName(), projectName); if (!token.isClientCredentials() && token.hasAuthority(PARTICIPANT)) { throw new NotAuthorizedException("Cannot list all project subjects as a participant."); } diff --git a/src/test/java/org/radarbase/management/web/rest/ProjectResourceIntTest.java b/src/test/java/org/radarbase/management/web/rest/ProjectResourceIntTest.java index 37f3b9a05..4f0625b30 100644 --- a/src/test/java/org/radarbase/management/web/rest/ProjectResourceIntTest.java +++ b/src/test/java/org/radarbase/management/web/rest/ProjectResourceIntTest.java @@ -137,10 +137,14 @@ public void setUp() throws ServletException { * if they test an entity which requires the current entity.

    */ public static Project createEntity() { + Organization organization = new Organization(); + organization.setId(1L); + organization.setName("main"); return new Project() .projectName(DEFAULT_PROJECT_NAME) .description(DEFAULT_DESCRIPTION) .organizationName(DEFAULT_ORGANIZATION) + .organization(organization) .location(DEFAULT_LOCATION) .startDate(DEFAULT_START_DATE) .projectStatus(DEFAULT_PROJECT_STATUS) From e6153403e547e426d19807571e1ccf5508755f36 Mon Sep 17 00:00:00 2001 From: Joris Borgdorff Date: Wed, 9 Mar 2022 15:06:08 +0100 Subject: [PATCH 354/431] Use limited build platform --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 33325c60f..ceed99cc1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ # Build stage -FROM azul/zulu-openjdk-alpine:17 as builder +FROM --platform=$BUILDPLATFORM azul/zulu-openjdk-alpine:17 as builder # Install NodeJS and Yarn RUN apk add --no-cache nodejs npm && \ From 1ff64d71953a9e05b0f0b11d01a98b8d7f351f46 Mon Sep 17 00:00:00 2001 From: Joris Borgdorff Date: Thu, 24 Mar 2022 12:01:54 +0100 Subject: [PATCH 355/431] Docker arm64 support --- Dockerfile | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index ceed99cc1..8b0d5c84c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,9 +1,12 @@ # Build stage -FROM --platform=$BUILDPLATFORM azul/zulu-openjdk-alpine:17 as builder +FROM --platform=$BUILDPLATFORM eclipse-temurin:17-jdk as builder # Install NodeJS and Yarn -RUN apk add --no-cache nodejs npm && \ - npm install -g yarn +RUN curl -sL https://deb.nodesource.com/setup_16.x | bash \ + && apt-get update && apt-get install -y \ + nodejs \ + && rm -rf /var/lib/apt/lists/* \ + && npm install -g yarn ## installing the node and java packages before adding the src directory ## will allow us to re-use these image layers when only the souce code changes @@ -33,13 +36,15 @@ COPY src src RUN ./gradlew -s bootWar --no-watch-fs # Run stage -FROM azul/zulu-openjdk-alpine:17-jre-headless +FROM eclipse-temurin:17-jre ENV SPRING_OUTPUT_ANSI_ENABLED=ALWAYS \ JHIPSTER_SLEEP=0 \ JAVA_OPTS="" -RUN apk --no-cache add curl +RUN apt-get update && apt-get install -y \ + curl \ + && rm -rf /var/lib/apt/lists/* # Add the war and changelogs files from build stage COPY --from=builder /code/build/libs/*.war /app.war From f03a180b010db43010de4bac8b294a77ee1c21ac Mon Sep 17 00:00:00 2001 From: Joris Borgdorff Date: Thu, 24 Mar 2022 12:02:40 +0100 Subject: [PATCH 356/431] Fix liquibase scripts for postgres --- src/main/resources/config/application-prod.yml | 14 -------------- .../20211006170000_add_enrollment_date.xml | 2 +- ...data.xml => 20211026000000_extra_demo_data.xml} | 2 +- .../20211202145000_add_organization_demo_data.xml | 10 ++++++++-- src/main/resources/config/liquibase/master.xml | 2 +- 5 files changed, 11 insertions(+), 19 deletions(-) rename src/main/resources/config/liquibase/changelog/{20211026_extra_demo_data.xml => 20211026000000_extra_demo_data.xml} (94%) diff --git a/src/main/resources/config/application-prod.yml b/src/main/resources/config/application-prod.yml index 506252ffd..a0efe5a85 100644 --- a/src/main/resources/config/application-prod.yml +++ b/src/main/resources/config/application-prod.yml @@ -114,26 +114,12 @@ managementportal: jhipster: http: - version: V_1_1 # To use HTTP/2 you will need SSL support (see above the "server.ssl" configuration) cache: # Used by the CachingHttpHeadersFilter timeToLiveInDays: 1461 cache: # Cache configuration hazelcast: # Hazelcast distributed cache time-to-live-seconds: 3600 backup-count: 1 - metrics: # DropWizard Metrics configuration, used by MetricsConfiguration - jmx.enabled: true - graphite: - enabled: false - host: localhost - port: 2003 - prefix: ManagementPortal - prometheus: - enabled: false - endpoint: /prometheusMetrics - logs: # Reports Dropwizard metrics in the logs - enabled: false - report-frequency: 60 # in seconds logging: logstash: # Forward logs to logstash over a socket, used by LoggingConfiguration enabled: false diff --git a/src/main/resources/config/liquibase/changelog/20211006170000_add_enrollment_date.xml b/src/main/resources/config/liquibase/changelog/20211006170000_add_enrollment_date.xml index ad5f912ca..7a6809a78 100644 --- a/src/main/resources/config/liquibase/changelog/20211006170000_add_enrollment_date.xml +++ b/src/main/resources/config/liquibase/changelog/20211006170000_add_enrollment_date.xml @@ -35,7 +35,7 @@ UPDATE subject - SET subject.enrollment_date = ( + SET enrollment_date = ( SELECT MIN(r.timestamp) FROM subject_aud a INNER JOIN _revisions_info r ON a.rev = r.id diff --git a/src/main/resources/config/liquibase/changelog/20211026_extra_demo_data.xml b/src/main/resources/config/liquibase/changelog/20211026000000_extra_demo_data.xml similarity index 94% rename from src/main/resources/config/liquibase/changelog/20211026_extra_demo_data.xml rename to src/main/resources/config/liquibase/changelog/20211026000000_extra_demo_data.xml index 09e62fb59..2dc26384e 100644 --- a/src/main/resources/config/liquibase/changelog/20211026_extra_demo_data.xml +++ b/src/main/resources/config/liquibase/changelog/20211026000000_extra_demo_data.xml @@ -14,7 +14,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog https://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-4.7.xsd"> - + - insert into radar_authority(name) values ('ROLE_ORGANIZATION_ADMIN') - insert into radar_authority_aud(rev, revtype, name) VALUES (1, 0, 'ROLE_ORGANIZATION_ADMIN') + + ROLE_ORGANIZATION_ADMIN + + + 1 + 0 + ROLE_ORGANIZATION_ADMIN + - + From 8ec69e0b17617e8fc17ab1b81d9b019931afbc89 Mon Sep 17 00:00:00 2001 From: Joris Borgdorff Date: Thu, 24 Mar 2022 16:30:06 +0100 Subject: [PATCH 357/431] Login to prod fixes --- .../config/ManagementPortalSecurityConfigLoader.java | 12 ++++++++---- .../management/config/OAuth2ServerConfiguration.java | 4 +++- .../management/config/SecurityConfiguration.java | 2 ++ .../management/security/JwtAuthenticationFilter.java | 7 +++---- 4 files changed, 16 insertions(+), 9 deletions(-) diff --git a/src/main/java/org/radarbase/management/config/ManagementPortalSecurityConfigLoader.java b/src/main/java/org/radarbase/management/config/ManagementPortalSecurityConfigLoader.java index 90a6096e3..8baa13b41 100644 --- a/src/main/java/org/radarbase/management/config/ManagementPortalSecurityConfigLoader.java +++ b/src/main/java/org/radarbase/management/config/ManagementPortalSecurityConfigLoader.java @@ -106,12 +106,16 @@ public void loadOAuthClientsFromFile() { } Path file = Paths.get(path); CsvMapper mapper = new CsvMapper(); + // CsvSchema uses the @JsonPropertyOrder to define column order, it does not + // read the header. Let's read the header ourselves and provide that as + // column order + String[] columnOrder = getCsvFileColumnOrder(file); + if (columnOrder == null) { + return; + } CsvSchema schema = mapper.schemaFor(CustomBaseClientDetails.class) - // CsvSchema uses the @JsonPropertyOrder to define column order, it does not - // read the header. Let's read the header ourselves and provide that as - // column order .withColumnReordering(true) - .sortedBy(getCsvFileColumnOrder(file)) + .sortedBy(columnOrder) .withColumnSeparator(SEPARATOR) .withHeader(); ObjectReader reader = mapper diff --git a/src/main/java/org/radarbase/management/config/OAuth2ServerConfiguration.java b/src/main/java/org/radarbase/management/config/OAuth2ServerConfiguration.java index 80fa91d45..8cd952fe9 100644 --- a/src/main/java/org/radarbase/management/config/OAuth2ServerConfiguration.java +++ b/src/main/java/org/radarbase/management/config/OAuth2ServerConfiguration.java @@ -23,6 +23,7 @@ import org.springframework.security.authentication.DefaultAuthenticationEventPublisher; import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder; import org.springframework.security.config.annotation.web.builders.HttpSecurity; +import org.springframework.security.config.annotation.web.builders.WebSecurity; import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter; import org.springframework.security.config.http.SessionCreationPolicy; import org.springframework.security.core.Authentication; @@ -122,7 +123,8 @@ protected static class ResourceServerConfiguration extends ResourceServerConfigu public JwtAuthenticationFilter jwtAuthenticationFilter() { return new JwtAuthenticationFilter( - keyStoreHandler.getTokenValidator(), authenticationManager, userRepository) + keyStoreHandler.getTokenValidator(), authenticationManager, userRepository + ) .skipUrlPattern(HttpMethod.GET, "/management/health") .skipUrlPattern(HttpMethod.GET, "/api/meta-token/*"); } diff --git a/src/main/java/org/radarbase/management/config/SecurityConfiguration.java b/src/main/java/org/radarbase/management/config/SecurityConfiguration.java index e79ff8a0b..59ed7f262 100644 --- a/src/main/java/org/radarbase/management/config/SecurityConfiguration.java +++ b/src/main/java/org/radarbase/management/config/SecurityConfiguration.java @@ -85,6 +85,8 @@ public Http401UnauthorizedEntryPoint http401UnauthorizedEntryPoint() { @Override public void configure(WebSecurity web) { web.ignoring() + .antMatchers("/") + .antMatchers("/*.{js,ico,css,html}") .antMatchers(HttpMethod.OPTIONS, "/**") .antMatchers("/app/**/*.{js,html}") .antMatchers("/bower_components/**") diff --git a/src/main/java/org/radarbase/management/security/JwtAuthenticationFilter.java b/src/main/java/org/radarbase/management/security/JwtAuthenticationFilter.java index ac32891b7..c13bc0761 100644 --- a/src/main/java/org/radarbase/management/security/JwtAuthenticationFilter.java +++ b/src/main/java/org/radarbase/management/security/JwtAuthenticationFilter.java @@ -91,7 +91,7 @@ protected void doFilterInternal(@Nonnull HttpServletRequest httpRequest, logger.error(ex.getMessage()); httpResponse.setStatus(HttpServletResponse.SC_UNAUTHORIZED); httpResponse.setHeader(HttpHeaders.WWW_AUTHENTICATE, OAuth2AccessToken.BEARER_TYPE); - httpResponse.getOutputStream().println( + httpResponse.getOutputStream().print( "{\"error\": \"" + "Unauthorized" + ",\n" + "\"status\": \"" + HttpServletResponse.SC_UNAUTHORIZED + ",\n" + "\"message\": \"" + ex.getMessage() + "\",\n" @@ -119,7 +119,7 @@ protected void doFilterInternal(@Nonnull HttpServletRequest httpRequest, session.removeAttribute(TOKEN_ATTRIBUTE); httpResponse.setStatus(HttpServletResponse.SC_UNAUTHORIZED); httpResponse.setHeader(HttpHeaders.WWW_AUTHENTICATE, OAuth2AccessToken.BEARER_TYPE); - httpResponse.getOutputStream().println( + httpResponse.getOutputStream().print( "{\"error\": \"" + "Unauthorized" + ",\n" + "\"status\": \"" + HttpServletResponse.SC_UNAUTHORIZED + ",\n" + "\"message\": \"User not found\",\n" @@ -158,11 +158,10 @@ private String getToken(ServletRequest request, ServletResponse response) { // Check if the HTTP Authorization header is present and formatted correctly if (authorizationHeader == null || !authorizationHeader .startsWith(OAuth2AccessToken.BEARER_TYPE)) { - logger.error("No authorization header provided in the request"); res.setStatus(HttpServletResponse.SC_UNAUTHORIZED); res.setHeader(HttpHeaders.WWW_AUTHENTICATE, OAuth2AccessToken.BEARER_TYPE); throw new TokenValidationException("No " + OAuth2AccessToken.BEARER_TYPE + " token " - + "present in the request."); + + "present in the request to " + req.getServletPath()); } // Extract the token from the HTTP Authorization header From 00a18bde005f4ff97cbdfa06a9f4c78178ff2ad6 Mon Sep 17 00:00:00 2001 From: Joris Borgdorff Date: Thu, 24 Mar 2022 16:47:17 +0100 Subject: [PATCH 358/431] Style fixes --- .../management/config/ManagementPortalSecurityConfigLoader.java | 2 +- .../radarbase/management/config/OAuth2ServerConfiguration.java | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/main/java/org/radarbase/management/config/ManagementPortalSecurityConfigLoader.java b/src/main/java/org/radarbase/management/config/ManagementPortalSecurityConfigLoader.java index 8baa13b41..5ef6c52fe 100644 --- a/src/main/java/org/radarbase/management/config/ManagementPortalSecurityConfigLoader.java +++ b/src/main/java/org/radarbase/management/config/ManagementPortalSecurityConfigLoader.java @@ -105,7 +105,6 @@ public void loadOAuthClientsFromFile() { return; } Path file = Paths.get(path); - CsvMapper mapper = new CsvMapper(); // CsvSchema uses the @JsonPropertyOrder to define column order, it does not // read the header. Let's read the header ourselves and provide that as // column order @@ -113,6 +112,7 @@ public void loadOAuthClientsFromFile() { if (columnOrder == null) { return; } + CsvMapper mapper = new CsvMapper(); CsvSchema schema = mapper.schemaFor(CustomBaseClientDetails.class) .withColumnReordering(true) .sortedBy(columnOrder) diff --git a/src/main/java/org/radarbase/management/config/OAuth2ServerConfiguration.java b/src/main/java/org/radarbase/management/config/OAuth2ServerConfiguration.java index 8cd952fe9..9fe22b154 100644 --- a/src/main/java/org/radarbase/management/config/OAuth2ServerConfiguration.java +++ b/src/main/java/org/radarbase/management/config/OAuth2ServerConfiguration.java @@ -23,7 +23,6 @@ import org.springframework.security.authentication.DefaultAuthenticationEventPublisher; import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder; import org.springframework.security.config.annotation.web.builders.HttpSecurity; -import org.springframework.security.config.annotation.web.builders.WebSecurity; import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter; import org.springframework.security.config.http.SessionCreationPolicy; import org.springframework.security.core.Authentication; From b0b695ec3ac0dc32347c37dc4cf281ea5b277d64 Mon Sep 17 00:00:00 2001 From: Joris Borgdorff Date: Tue, 29 Mar 2022 11:04:34 +0200 Subject: [PATCH 359/431] Remove cors handling --- .../config/OAuth2ServerConfiguration.java | 4 ---- .../management/config/WebConfigurer.java | 16 ---------------- src/main/resources/config/application.yml | 8 -------- 3 files changed, 28 deletions(-) diff --git a/src/main/java/org/radarbase/management/config/OAuth2ServerConfiguration.java b/src/main/java/org/radarbase/management/config/OAuth2ServerConfiguration.java index 9fe22b154..95e71c5c1 100644 --- a/src/main/java/org/radarbase/management/config/OAuth2ServerConfiguration.java +++ b/src/main/java/org/radarbase/management/config/OAuth2ServerConfiguration.java @@ -111,9 +111,6 @@ protected static class ResourceServerConfiguration extends ResourceServerConfigu @Autowired private LogoutSuccessHandler logoutSuccessHandler; - @Autowired - private CorsFilter corsFilter; - @Autowired private AuthenticationManager authenticationManager; @@ -140,7 +137,6 @@ public void configure(HttpSecurity http) throws Exception { .and() .csrf() .disable() - .addFilterBefore(corsFilter, UsernamePasswordAuthenticationFilter.class) .addFilterBefore(jwtAuthenticationFilter(), UsernamePasswordAuthenticationFilter.class) .headers() diff --git a/src/main/java/org/radarbase/management/config/WebConfigurer.java b/src/main/java/org/radarbase/management/config/WebConfigurer.java index 38a5f4bfa..83d5bf0a5 100644 --- a/src/main/java/org/radarbase/management/config/WebConfigurer.java +++ b/src/main/java/org/radarbase/management/config/WebConfigurer.java @@ -13,9 +13,6 @@ import org.springframework.core.env.Profiles; import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; import org.springframework.security.crypto.password.PasswordEncoder; -import org.springframework.web.cors.CorsConfiguration; -import org.springframework.web.cors.UrlBasedCorsConfigurationSource; -import org.springframework.web.filter.CorsFilter; import tech.jhipster.config.JHipsterConstants; import tech.jhipster.config.JHipsterProperties; import tech.jhipster.web.filter.CachingHttpHeadersFilter; @@ -111,19 +108,6 @@ private void initCachingHttpHeadersFilter(ServletContext servletContext, cachingHttpHeadersFilter.setAsyncSupported(true); } - @Bean - public CorsFilter corsFilter() { - UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource(); - CorsConfiguration config = jHipsterProperties.getCors(); - if (config.getAllowedOrigins() != null && !config.getAllowedOrigins().isEmpty()) { - log.debug("Registering CORS filter"); - source.registerCorsConfiguration("/api/**", config); - source.registerCorsConfiguration("/v2/api-docs", config); - source.registerCorsConfiguration("/oauth/**", config); - } - return new CorsFilter(source); - } - @Bean public PasswordEncoder passwordEncoder() { return new BCryptPasswordEncoder(); diff --git a/src/main/resources/config/application.yml b/src/main/resources/config/application.yml index c751266d0..841f4a5f4 100644 --- a/src/main/resources/config/application.yml +++ b/src/main/resources/config/application.yml @@ -124,14 +124,6 @@ jhipster: core-pool-size: 2 max-pool-size: 50 queue-capacity: 10000 - # By default CORS is disabled. Uncomment to enable. - cors: - allowed-origins: '*' - allowed-methods: GET, PUT, POST, DELETE, OPTIONS, PATCH - allowed-headers: Authorization, Content-Type - #exposed-headers: - allow-credentials: true - max-age: 1800 # =================================================================== # Application specific properties From e030a64eccba1c58080ff2110d9c4de2a96ed14c Mon Sep 17 00:00:00 2001 From: Joris Borgdorff Date: Tue, 29 Mar 2022 11:07:05 +0200 Subject: [PATCH 360/431] Bump snapshot version --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 1dbc0faf9..d85183816 100644 --- a/build.gradle +++ b/build.gradle @@ -28,7 +28,7 @@ apply plugin: 'io.spring.dependency-management' allprojects { group 'org.radarbase' - version '0.8.1-SNAPSHOT' // project version + version '0.9.0-SNAPSHOT' // project version // The comment on the previous line is only there to identify the project version line easily // with a sed command, to auto-update the version number with the prepare-release-branch.sh From 014ea3b001ff28cf75a2507411b9f8719a72c1d4 Mon Sep 17 00:00:00 2001 From: Joris Borgdorff Date: Wed, 30 Mar 2022 13:34:03 +0200 Subject: [PATCH 361/431] Misc fixes --- build.gradle | 43 +++++++++--------- gradle.properties | 31 ++++++------- gradle/wrapper/gradle-wrapper.jar | Bin 59536 -> 59821 bytes gradle/wrapper/gradle-wrapper.properties | 2 +- managementportal-client/build.gradle | 9 ++-- .../radarbase/management/client/MPClient.kt | 3 +- oauth-client-util/build.gradle | 5 +- radar-auth/build.gradle | 5 +- .../config/OAuth2ServerConfiguration.java | 1 - 9 files changed, 50 insertions(+), 49 deletions(-) diff --git a/build.gradle b/build.gradle index d85183816..036a54dc4 100644 --- a/build.gradle +++ b/build.gradle @@ -14,11 +14,11 @@ buildscript { plugins { id 'application' id 'org.springframework.boot' version "${spring_boot_version}" - id "com.github.node-gradle.node" version "3.1.1" + id "com.github.node-gradle.node" version "3.2.1" id "io.spring.dependency-management" version "1.0.11.RELEASE" - id 'de.undercouch.download' version '4.1.2' apply false + id 'de.undercouch.download' version '5.0.2' apply false id "io.github.gradle-nexus.publish-plugin" version "1.1.0" - id("com.github.ben-manes.versions") version "0.41.0" + id("com.github.ben-manes.versions") version "0.42.0" } apply plugin: 'org.springframework.boot' @@ -42,7 +42,7 @@ allprojects { ext.githubRepoName = 'RADAR-base/ManagementPortal' ext.githubUrl = 'https://github.com/RADAR-base/ManagementPortal' ext.issueUrl = "https://github.com/$githubRepoName/issues" - ext.website = 'http://radar-base.org' + ext.website = 'https://radar-base.org' repositories { mavenCentral() @@ -162,35 +162,33 @@ dependencies { implementation("tech.jhipster:jhipster-framework:${jhipster_server_version}") implementation("tech.jhipster:jhipster-dependencies:${jhipster_server_version}") implementation("io.micrometer:micrometer-core") - implementation "com.fasterxml.jackson.datatype:jackson-datatype-json-org:${jackson_dataformat_version}" - implementation "com.fasterxml.jackson.datatype:jackson-datatype-hppc:${jackson_dataformat_version}" - implementation "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:${jackson_dataformat_version}" - implementation "com.fasterxml.jackson.datatype:jackson-datatype-hibernate5:${jackson_dataformat_version}" - implementation "com.fasterxml.jackson.dataformat:jackson-dataformat-csv:${jackson_dataformat_version}" - implementation "com.fasterxml.jackson.core:jackson-annotations:${jackson_dataformat_version}" - implementation "com.fasterxml.jackson.core:jackson-databind:${jackson_version}" + runtimeOnly "com.fasterxml.jackson.datatype:jackson-datatype-jsr310" + implementation "com.fasterxml.jackson.datatype:jackson-datatype-hibernate5" + implementation "com.fasterxml.jackson.dataformat:jackson-dataformat-csv" + implementation "com.fasterxml.jackson.core:jackson-annotations" + implementation "com.fasterxml.jackson.core:jackson-databind" implementation "com.hazelcast:hazelcast:${hazelcast_version}" implementation "com.hazelcast:hazelcast-spring:${hazelcast_version}" - implementation "com.hazelcast:hazelcast-hibernate53" - implementation("com.zaxxer:HikariCP:${hikaricp_version}") + runtimeOnly "com.hazelcast:hazelcast-hibernate53" + runtimeOnly("com.zaxxer:HikariCP:${hikaricp_version}") implementation group: 'com.google.code.findbugs', name: 'jsr305', version: findbugAnnotationVersion implementation("org.liquibase:liquibase-core:${liquibase_version}") - implementation "com.mattbertolini:liquibase-slf4j:${liquibase_slf4j_version}" + runtimeOnly "com.mattbertolini:liquibase-slf4j:${liquibase_slf4j_version}" implementation "org.springframework.boot:spring-boot-starter-actuator" implementation "org.springframework.boot:spring-boot-autoconfigure" implementation "org.springframework.boot:spring-boot-starter-mail" - implementation "org.springframework.boot:spring-boot-starter-logging" - implementation ("org.springframework.boot:spring-boot-starter-data-jpa") { + runtimeOnly "org.springframework.boot:spring-boot-starter-logging" + runtimeOnly ("org.springframework.boot:spring-boot-starter-data-jpa") { exclude group: 'org.hibernate', module: 'hibernate-entitymanager' } implementation "org.hibernate:hibernate-core" implementation "org.hibernate:hibernate-envers" - implementation "org.hibernate:hibernate-validator:7.0.1.Final" + implementation "org.hibernate:hibernate-validator:7.0.4.Final" - implementation "org.postgresql:postgresql:${postgresql_version}" - implementation "org.hsqldb:hsqldb:${hsqldb_version}" + runtimeOnly "org.postgresql:postgresql:${postgresql_version}" + runtimeOnly "org.hsqldb:hsqldb:${hsqldb_version}" - implementation "org.springframework.boot:spring-boot-starter-security" + runtimeOnly "org.springframework.boot:spring-boot-starter-security" implementation "org.springframework.security:spring-security-data" implementation("org.springframework.boot:spring-boot-starter-web") { @@ -203,7 +201,7 @@ dependencies { implementation("org.springframework.security.oauth:spring-security-oauth2:2.5.1.RELEASE") implementation "org.springdoc:springdoc-openapi-ui:${springdoc_version}" - implementation("javax.inject:javax.inject:1") + runtimeOnly("javax.inject:javax.inject:1") implementation project(':radar-auth') implementation "org.springframework.data:spring-data-envers" @@ -233,6 +231,7 @@ dependencies { dependencyManagement { imports { + mavenBom "com.fasterxml.jackson:jackson-bom:$jackson_version" mavenBom "org.springframework:spring-framework-bom:$spring_framework_version" mavenBom "org.springframework.boot:spring-boot-dependencies:$spring_boot_version" mavenBom "org.springframework.data:spring-data-bom:$spring_data_version" @@ -249,7 +248,7 @@ task cleanResources(type: Delete) { } wrapper { - gradleVersion '7.3.3' + gradleVersion '7.4.1' } task stage(dependsOn: 'bootWar') { diff --git a/gradle.properties b/gradle.properties index 6d311b7e2..7c25d850a 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,29 +1,28 @@ rootProject.name=management-portal profile=dev assertj_version=3.22.0 -jhipster_server_version=7.5.1 -hazelcast_version=5.0.2 +jhipster_server_version=7.7.0 +hazelcast_version=5.1.1 hikaricp_version=5.0.1 liquibase_slf4j_version=4.0.0 -liquibase_version=4.7.0 -postgresql_version=42.3.1 -springdoc_version=1.6.4 -spring_boot_version=2.6.2 -spring_framework_version=5.3.15 -spring_data_version=2021.1.1 -spring_session_version=2021.1.1 -gatling_version=3.7.4 +liquibase_version=4.9.0 +postgresql_version=42.3.3 +springdoc_version=1.6.6 +spring_boot_version=2.6.5 +spring_framework_version=5.3.17 +spring_data_version=2021.1.3 +spring_session_version=2021.1.2 +gatling_version=3.7.6 mapstruct_version=1.4.2.Final -jackson_version=2.12.6 -jackson_dataformat_version=2.12.6 +jackson_version=2.13.2.20220328 javax_xml_bind_version=2.3.3 javax_jaxb_core_version=2.3.0.1 javax_jaxb_runtime_version=2.3.4 javax_activation=1.1.1 -mockito_version=4.2.0 -slf4j_version=1.7.33 -logback_version=1.2.10 -oauth_jwt_version=3.18.3 +mockito_version=4.4.0 +slf4j_version=1.7.36 +logback_version=1.2.11 +oauth_jwt_version=3.19.0 junit_version=5.8.2 okhttp_version=4.9.3 hsqldb_version=2.6.1 diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 7454180f2ae8848c63b8b4dea2cb829da983f2fa..41d9927a4d4fb3f96a785543079b8df6723c946b 100644 GIT binary patch delta 8958 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 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 2e6e5897b..00e33edef 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/managementportal-client/build.gradle b/managementportal-client/build.gradle index 758d77682..ebb192415 100644 --- a/managementportal-client/build.gradle +++ b/managementportal-client/build.gradle @@ -26,9 +26,10 @@ dependencies { implementation group: 'com.squareup.okhttp3', name: 'okhttp', version: okhttp_version - implementation("com.fasterxml.jackson.module:jackson-module-kotlin:$jackson_version") - implementation("com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jackson_version") - runtimeOnly("com.fasterxml.jackson.datatype:jackson-datatype-jdk8:$jackson_version") + implementation(platform("com.fasterxml.jackson:jackson-bom:$jackson_version")) + implementation("com.fasterxml.jackson.module:jackson-module-kotlin") + implementation("com.fasterxml.jackson.datatype:jackson-datatype-jsr310") + runtimeOnly("com.fasterxml.jackson.datatype:jackson-datatype-jdk8") testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-api', version: junit_version testImplementation group: 'com.github.tomakehurst', name: 'wiremock', version: '2.27.2' @@ -37,7 +38,7 @@ dependencies { testRuntimeOnly group: 'org.slf4j', name: 'slf4j-simple', version: slf4j_version testRuntimeOnly group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: junit_version - testImplementation("com.fasterxml.jackson.module:jackson-module-kotlin:$jackson_version") + testImplementation("com.fasterxml.jackson.module:jackson-module-kotlin") } tasks.withType(KotlinCompile) { diff --git a/managementportal-client/src/main/kotlin/org/radarbase/management/client/MPClient.kt b/managementportal-client/src/main/kotlin/org/radarbase/management/client/MPClient.kt index 77ffa60bc..6a8537b13 100644 --- a/managementportal-client/src/main/kotlin/org/radarbase/management/client/MPClient.kt +++ b/managementportal-client/src/main/kotlin/org/radarbase/management/client/MPClient.kt @@ -15,6 +15,7 @@ import com.fasterxml.jackson.databind.ObjectMapper import com.fasterxml.jackson.databind.ObjectReader import com.fasterxml.jackson.databind.SerializationFeature import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule +import com.fasterxml.jackson.module.kotlin.KotlinFeature import com.fasterxml.jackson.module.kotlin.jsonMapper import com.fasterxml.jackson.module.kotlin.kotlinModule import okhttp3.HttpUrl @@ -48,7 +49,7 @@ class MPClient( serializationInclusion(JsonInclude.Include.NON_NULL) addModule(JavaTimeModule()) addModule(kotlinModule { - nullIsSameAsDefault(true) + enable(KotlinFeature.NullIsSameAsDefault) }) configure(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS, false) configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false) diff --git a/oauth-client-util/build.gradle b/oauth-client-util/build.gradle index 2d1db65d2..fe41b17ff 100644 --- a/oauth-client-util/build.gradle +++ b/oauth-client-util/build.gradle @@ -5,8 +5,9 @@ description = 'This library can be used by client applications that want to use dependencies { implementation group: 'com.squareup.okhttp3', name: 'okhttp', version: okhttp_version - implementation group: 'com.fasterxml.jackson.core' , name: 'jackson-databind' , version: jackson_version - implementation group: 'com.fasterxml.jackson.dataformat', name: 'jackson-dataformat-yaml', version: jackson_version + implementation(platform("com.fasterxml.jackson:jackson-bom:$jackson_version")) + implementation group: 'com.fasterxml.jackson.core' , name: 'jackson-databind' + implementation group: 'com.fasterxml.jackson.dataformat', name: 'jackson-dataformat-yaml' testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-api', version: junit_version testImplementation group: 'com.github.tomakehurst', name: 'wiremock', version: '2.27.2' diff --git a/radar-auth/build.gradle b/radar-auth/build.gradle index d27a57838..e19a4e760 100644 --- a/radar-auth/build.gradle +++ b/radar-auth/build.gradle @@ -10,8 +10,9 @@ dependencies { api group: 'com.squareup.okhttp3', name: 'okhttp', version: okhttp_version implementation group: 'org.slf4j', name: 'slf4j-api', version: slf4j_version - implementation group: 'com.fasterxml.jackson.core' , name: 'jackson-databind' , version: jackson_version - implementation group: 'com.fasterxml.jackson.dataformat', name: 'jackson-dataformat-yaml', version: jackson_version + implementation(platform("com.fasterxml.jackson:jackson-bom:$jackson_version")) + implementation group: 'com.fasterxml.jackson.core' , name: 'jackson-databind' + implementation group: 'com.fasterxml.jackson.dataformat', name: 'jackson-dataformat-yaml' testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-api', version: junit_version testImplementation group: 'com.github.tomakehurst', name: 'wiremock', version: '2.27.2' diff --git a/src/main/java/org/radarbase/management/config/OAuth2ServerConfiguration.java b/src/main/java/org/radarbase/management/config/OAuth2ServerConfiguration.java index 95e71c5c1..4c2c6e316 100644 --- a/src/main/java/org/radarbase/management/config/OAuth2ServerConfiguration.java +++ b/src/main/java/org/radarbase/management/config/OAuth2ServerConfiguration.java @@ -47,7 +47,6 @@ import org.springframework.security.oauth2.provider.token.TokenStore; import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter; import org.springframework.security.web.authentication.logout.LogoutSuccessHandler; -import org.springframework.web.filter.CorsFilter; import javax.sql.DataSource; import java.util.Arrays; From d6d560f285b33ce84291aaa15264fe72d9ba8962 Mon Sep 17 00:00:00 2001 From: Joris Borgdorff Date: Mon, 16 May 2022 10:40:37 +0200 Subject: [PATCH 362/431] Fix snyk tests --- .github/workflows/scheduled-snyk.yaml | 17 ++++++++++------- .github/workflows/snyk.yaml | 18 +++++++++++------- 2 files changed, 21 insertions(+), 14 deletions(-) diff --git a/.github/workflows/scheduled-snyk.yaml b/.github/workflows/scheduled-snyk.yaml index 38c7567b9..8ee7d1b6a 100644 --- a/.github/workflows/scheduled-snyk.yaml +++ b/.github/workflows/scheduled-snyk.yaml @@ -9,29 +9,32 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@master + - uses: actions/checkout@v3 + - uses: snyk/actions/setup@master + with: + snyk-version: v1.931.0 - uses: actions/setup-node@v2 with: node-version: '16' cache: npm - - uses: actions/setup-java@v2 + - uses: actions/setup-java@v3 with: - distribution: zulu + distribution: temurin java-version: 17 - cache: gradle - - name: Install Snyk - run: npm install snyk@latest -g + - name: Setup Gradle + uses: gradle/gradle-build-action@v2 - name: Run Snyk to check for vulnerabilities env: SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }} - run: >- + run: > snyk test --all-projects --configuration-matching="^(compile|runtime)Classpath$" + --org=radar-base --policy-path=.snyk --json-file-output=snyk.json diff --git a/.github/workflows/snyk.yaml b/.github/workflows/snyk.yaml index fb05ce905..26777748c 100644 --- a/.github/workflows/snyk.yaml +++ b/.github/workflows/snyk.yaml @@ -8,28 +8,32 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@master + - uses: actions/checkout@v3 + - uses: snyk/actions/setup@master + with: + snyk-version: v1.931.0 - uses: actions/setup-node@v2 with: node-version: '16' cache: npm - - uses: actions/setup-java@v2 + - uses: actions/setup-java@v3 with: - distribution: zulu + distribution: temurin java-version: 17 - cache: gradle - - name: Install Snyk - run: npm install snyk@latest -g + - name: Setup Gradle + uses: gradle/gradle-build-action@v2 - name: Run Snyk to check for vulnerabilities env: SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }} run: > snyk test - --severity-threshold=high --all-projects --configuration-matching="^(compile|runtime)Classpath$" + --fail-on=upgradable + --org=radar-base --policy-path=.snyk + --severity-threshold=high From 7721b99b8782d588727ba84fc1f3a30f1dbcf40f Mon Sep 17 00:00:00 2001 From: Peyman Mohtashami Date: Fri, 12 Aug 2022 11:04:49 +0200 Subject: [PATCH 363/431] Add project field to subject dialog --- .../subject/subject-dialog.component.html | 25 +++++++- .../subject/subject-dialog.component.ts | 63 ++++++++++++++----- .../shared/subject/subject-popup.service.ts | 9 +-- .../app/shared/subject/subject.component.html | 6 +- 4 files changed, 79 insertions(+), 24 deletions(-) diff --git a/src/main/webapp/app/shared/subject/subject-dialog.component.html b/src/main/webapp/app/shared/subject/subject-dialog.component.html index 5aa739af5..5f5eacecc 100644 --- a/src/main/webapp/app/shared/subject/subject-dialog.component.html +++ b/src/main/webapp/app/shared/subject/subject-dialog.component.html @@ -33,7 +33,26 @@ [(ngModel)]="subject.externalId" />
    -
    +
    + + +
    + +
    From 980ada2d2308ffcf029b2e745a23d9b18573c7ac Mon Sep 17 00:00:00 2001 From: nivethika Date: Wed, 17 Aug 2022 13:37:40 +0200 Subject: [PATCH 364/431] open delete dialog when an assigned group is deleted for confirmation --- .../webapp/app/shared/group/group-delete-dialog.component.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/webapp/app/shared/group/group-delete-dialog.component.ts b/src/main/webapp/app/shared/group/group-delete-dialog.component.ts index 77f43bc50..76e45525c 100644 --- a/src/main/webapp/app/shared/group/group-delete-dialog.component.ts +++ b/src/main/webapp/app/shared/group/group-delete-dialog.component.ts @@ -52,6 +52,6 @@ export class GroupDeletePopupComponent extends ObservablePopupComponent { } createModalRef(params: Params): Observable { - return this.groupPopupService.open(GroupDialogComponent, params['id'], true, params['projectName']); + return this.groupPopupService.open(GroupDeleteDialogComponent, params['id'], true, params['projectName']); } } From 37db0ebe70f6a513b6a2ea8cd9934763f3669d56 Mon Sep 17 00:00:00 2001 From: Peyman Mohtashami Date: Thu, 18 Aug 2022 08:36:22 +0200 Subject: [PATCH 365/431] Fix project dialog save to change organization of a project --- .../webapp/app/entities/project/project-dialog.component.ts | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/main/webapp/app/entities/project/project-dialog.component.ts b/src/main/webapp/app/entities/project/project-dialog.component.ts index e42673f15..c0fc4364f 100644 --- a/src/main/webapp/app/entities/project/project-dialog.component.ts +++ b/src/main/webapp/app/entities/project/project-dialog.component.ts @@ -84,14 +84,13 @@ export class ProjectDialogComponent implements OnInit, OnDestroy { if (this.endDate && this.calendar.isValid(NgbDate.from(this.endDate))) { this.projectCopy.endDate = this.formatter.format(this.endDate) + 'T23:59'; } - const updatedProject = {...this.projectCopy, organization: {name: this.organizationName}}; if (this.projectCopy.id !== undefined) { - this.subscriptions.add(this.projectService.update(updatedProject).subscribe( + this.subscriptions.add(this.projectService.update(this.projectCopy).subscribe( (res: Project) => this.onSaveSuccess(res), (res: Response) => this.onSaveError(res), )); } else { - this.subscriptions.add(this.projectService.create(updatedProject).subscribe( + this.subscriptions.add(this.projectService.create(this.projectCopy).subscribe( (res: Project) => this.onSaveSuccess(res), (res: Response) => this.onSaveError(res), )); From 46e04f25c372ea2a597cf2d7b7cc255503808f02 Mon Sep 17 00:00:00 2001 From: nivethika Date: Thu, 18 Aug 2022 16:59:53 +0200 Subject: [PATCH 366/431] fix bug with the password-reset --- .../finish/password-reset-finish.component.ts | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/main/webapp/app/account/password-reset/finish/password-reset-finish.component.ts b/src/main/webapp/app/account/password-reset/finish/password-reset-finish.component.ts index 98fe61352..e4c42d987 100644 --- a/src/main/webapp/app/account/password-reset/finish/password-reset-finish.component.ts +++ b/src/main/webapp/app/account/password-reset/finish/password-reset-finish.component.ts @@ -1,4 +1,4 @@ -import { AfterViewInit, Component, ElementRef, OnInit, ViewChild } from '@angular/core'; +import {AfterViewInit, Component, ElementRef, OnDestroy, OnInit, ViewChild} from '@angular/core'; import { ActivatedRoute } from '@angular/router'; import { NgbModalRef } from '@ng-bootstrap/ng-bootstrap'; @@ -12,7 +12,7 @@ import { Subscription } from 'rxjs'; selector: 'jhi-password-reset-finish', templateUrl: './password-reset-finish.component.html', }) -export class PasswordResetFinishComponent implements OnInit, AfterViewInit { +export class PasswordResetFinishComponent implements OnInit, AfterViewInit, OnDestroy { @ViewChild('passwordField') passwordField: ElementRef | null; confirmPassword: string; @@ -46,6 +46,9 @@ export class PasswordResetFinishComponent implements OnInit, AfterViewInit { if (this.passwordField) { this.passwordField.nativeElement.focus(); } + } + + ngOnDestroy() { this.subscriptions.unsubscribe(); this.modalRef?.dismiss(); } From 480aa5d47bbb43c216bf7c9a165b9e4ad4ffd54d Mon Sep 17 00:00:00 2001 From: nivethika Date: Thu, 18 Aug 2022 17:09:26 +0200 Subject: [PATCH 367/431] allow settings and password pages to ORGANIZATION_ADMIN --- src/main/webapp/app/account/password/password.route.ts | 4 ++-- src/main/webapp/app/account/settings/settings.route.ts | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/webapp/app/account/password/password.route.ts b/src/main/webapp/app/account/password/password.route.ts index a18d5b77b..402731285 100644 --- a/src/main/webapp/app/account/password/password.route.ts +++ b/src/main/webapp/app/account/password/password.route.ts @@ -1,14 +1,14 @@ import { Route } from '@angular/router'; import { UserRouteAccessService } from '../../shared'; -import { PROJECT_ADMIN, SYSTEM_ADMIN } from '../../shared/constants/common.constants'; +import { PROJECT_ADMIN, SYSTEM_ADMIN, ORGANIZATION_ADMIN} from '../../shared/constants/common.constants'; import { PasswordComponent } from './password.component'; export const passwordRoute: Route = { path: 'password', component: PasswordComponent, data: { - authorities: [SYSTEM_ADMIN, PROJECT_ADMIN, 'ROLE_USER'], + authorities: [SYSTEM_ADMIN, PROJECT_ADMIN, ORGANIZATION_ADMIN], pageTitle: 'global.menu.account.password', }, canActivate: [UserRouteAccessService], diff --git a/src/main/webapp/app/account/settings/settings.route.ts b/src/main/webapp/app/account/settings/settings.route.ts index 61dd247e8..4d48ef595 100644 --- a/src/main/webapp/app/account/settings/settings.route.ts +++ b/src/main/webapp/app/account/settings/settings.route.ts @@ -1,14 +1,14 @@ import { Route } from '@angular/router'; import { UserRouteAccessService } from '../../shared'; -import { PROJECT_ADMIN, SYSTEM_ADMIN } from '../../shared/constants/common.constants'; +import { PROJECT_ADMIN, SYSTEM_ADMIN, ORGANIZATION_ADMIN } from '../../shared/constants/common.constants'; import { SettingsComponent } from './settings.component'; export const settingsRoute: Route = { path: 'settings', component: SettingsComponent, data: { - authorities: [SYSTEM_ADMIN, PROJECT_ADMIN], + authorities: [SYSTEM_ADMIN, PROJECT_ADMIN, ORGANIZATION_ADMIN], pageTitle: 'global.menu.account.settings', }, canActivate: [UserRouteAccessService], From 94913885ab6a929370a0e8c62015f26cac5fbd40 Mon Sep 17 00:00:00 2001 From: Peyman Mohtashami Date: Mon, 22 Aug 2022 12:31:26 +0200 Subject: [PATCH 368/431] Add ORG_ADMIN role to routes --- src/main/webapp/app/account/password/password.route.ts | 4 ++-- src/main/webapp/app/account/settings/settings.route.ts | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/webapp/app/account/password/password.route.ts b/src/main/webapp/app/account/password/password.route.ts index a18d5b77b..7020e8ecd 100644 --- a/src/main/webapp/app/account/password/password.route.ts +++ b/src/main/webapp/app/account/password/password.route.ts @@ -1,14 +1,14 @@ import { Route } from '@angular/router'; import { UserRouteAccessService } from '../../shared'; -import { PROJECT_ADMIN, SYSTEM_ADMIN } from '../../shared/constants/common.constants'; +import {ORGANIZATION_ADMIN, PROJECT_ADMIN, SYSTEM_ADMIN} from '../../shared/constants/common.constants'; import { PasswordComponent } from './password.component'; export const passwordRoute: Route = { path: 'password', component: PasswordComponent, data: { - authorities: [SYSTEM_ADMIN, PROJECT_ADMIN, 'ROLE_USER'], + authorities: [SYSTEM_ADMIN, ORGANIZATION_ADMIN, PROJECT_ADMIN, 'ROLE_USER'], pageTitle: 'global.menu.account.password', }, canActivate: [UserRouteAccessService], diff --git a/src/main/webapp/app/account/settings/settings.route.ts b/src/main/webapp/app/account/settings/settings.route.ts index 61dd247e8..d96fef55f 100644 --- a/src/main/webapp/app/account/settings/settings.route.ts +++ b/src/main/webapp/app/account/settings/settings.route.ts @@ -1,14 +1,14 @@ import { Route } from '@angular/router'; import { UserRouteAccessService } from '../../shared'; -import { PROJECT_ADMIN, SYSTEM_ADMIN } from '../../shared/constants/common.constants'; +import {ORGANIZATION_ADMIN, PROJECT_ADMIN, SYSTEM_ADMIN} from '../../shared/constants/common.constants'; import { SettingsComponent } from './settings.component'; export const settingsRoute: Route = { path: 'settings', component: SettingsComponent, data: { - authorities: [SYSTEM_ADMIN, PROJECT_ADMIN], + authorities: [SYSTEM_ADMIN, ORGANIZATION_ADMIN, PROJECT_ADMIN], pageTitle: 'global.menu.account.settings', }, canActivate: [UserRouteAccessService], From aa29fad44c490588952dacb3b45339f2104946de Mon Sep 17 00:00:00 2001 From: Peyman Mohtashami Date: Mon, 22 Aug 2022 12:34:21 +0200 Subject: [PATCH 369/431] Add separator to entity title --- .../organization-detail.component.html | 2 +- .../project/project-detail.component.html | 22 +++++++++---------- .../entities/role/role-detail.component.html | 2 +- .../source-data-detail.component.html | 2 +- .../source-type-detail.component.html | 2 +- .../source/source-detail.component.html | 2 +- .../subject/subject-detail.component.html | 2 +- 7 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/main/webapp/app/entities/organization/organization-detail.component.html b/src/main/webapp/app/entities/organization/organization-detail.component.html index b993ac41f..aef3e52d4 100644 --- a/src/main/webapp/app/entities/organization/organization-detail.component.html +++ b/src/main/webapp/app/entities/organization/organization-detail.component.html @@ -2,7 +2,7 @@

    - + : {{organization.name}} -

    -

    diff --git a/src/main/webapp/app/entities/project/project-dialog.component.ts b/src/main/webapp/app/entities/project/project-dialog.component.ts index c0fc4364f..c6c39e696 100644 --- a/src/main/webapp/app/entities/project/project-dialog.component.ts +++ b/src/main/webapp/app/entities/project/project-dialog.component.ts @@ -1,9 +1,18 @@ -import { combineLatest, merge, Observable, Subject, Subscription } from 'rxjs'; -import { debounceTime, distinctUntilChanged, map } from 'rxjs/operators'; -import { Component, OnDestroy, OnInit, ViewEncapsulation } from '@angular/core'; +import {combineLatest, merge, Observable, OperatorFunction, Subject, Subscription} from 'rxjs'; +import {debounceTime, distinctUntilChanged, filter, map} from 'rxjs/operators'; +import {Component, OnDestroy, OnInit, ViewChild, ViewEncapsulation} from '@angular/core'; import {ActivatedRoute, Params, Router} from '@angular/router'; -import { NgbActiveModal, NgbCalendar, NgbDate, NgbDateParserFormatter, NgbDateStruct, NgbModalRef, NgbTypeaheadSelectItemEvent } from '@ng-bootstrap/ng-bootstrap'; +import { + NgbActiveModal, + NgbCalendar, + NgbDate, + NgbDateParserFormatter, + NgbDateStruct, + NgbModalRef, + NgbTypeahead, + NgbTypeaheadSelectItemEvent +} from '@ng-bootstrap/ng-bootstrap'; import { AlertService } from '../../shared/util/alert.service'; import { EventManager } from '../../shared/util/event-manager.service'; @@ -29,15 +38,42 @@ export class ProjectDialogComponent implements OnInit, OnDestroy { projectIdAsPrettyValue: boolean; sourceTypeInputText: string; - sourceTypeInputFocus$ = new Subject(); - - newGroupInputText: string; attributeComponentEventPrefix: 'projectAttributes'; startDate: NgbDateStruct; endDate: NgbDateStruct; + @ViewChild('instance', {static: true}) instance: NgbTypeahead; + focus$ = new Subject(); + click$ = new Subject(); + + getMatchingSourceTypes: OperatorFunction = (text$: Observable) => { + const debouncedText$ = text$.pipe(debounceTime(200), distinctUntilChanged()); + const clicksWithClosedPopup$ = this.click$.pipe(filter(() => !this.instance.isPopupOpen())); + const inputFocus$ = this.focus$; + + const availableTypes$ = this.sourceTypeService.sourceTypes$.pipe( + map(sourceTypes => { + const selectedTypeIds = new Set(this.projectCopy?.sourceTypes?.map(t => t.id) || []); + return sourceTypes.filter(t => !selectedTypeIds.has(t.id)); + }) + ); + return combineLatest([ + merge(debouncedText$, inputFocus$, clicksWithClosedPopup$), + availableTypes$ + ]).pipe( + map(([term, availableTypes]) => { + term = term.trim().toLowerCase(); + if (!term) { + return availableTypes; + } + const getTypeKey = t => this.formatSourceTypeOption(t).toLowerCase(); + return availableTypes.filter(t => getTypeKey(t).includes(term)); + }) + ) + }; + private subscriptions = new Subscription(); constructor( @@ -84,15 +120,16 @@ export class ProjectDialogComponent implements OnInit, OnDestroy { if (this.endDate && this.calendar.isValid(NgbDate.from(this.endDate))) { this.projectCopy.endDate = this.formatter.format(this.endDate) + 'T23:59'; } + const updatedProject = {...this.projectCopy, organization: {name: this.organizationName}}; if (this.projectCopy.id !== undefined) { - this.subscriptions.add(this.projectService.update(this.projectCopy).subscribe( - (res: Project) => this.onSaveSuccess(res), - (res: Response) => this.onSaveError(res), + this.subscriptions.add(this.projectService.update(updatedProject).subscribe( + (res: Project) => this.onSaveSuccess(res), + (res: Response) => this.onSaveError(res), )); } else { - this.subscriptions.add(this.projectService.create(this.projectCopy).subscribe( - (res: Project) => this.onSaveSuccess(res), - (res: Response) => this.onSaveError(res), + this.subscriptions.add(this.projectService.create(updatedProject).subscribe( + (res: Project) => this.onSaveSuccess(res), + (res: Response) => this.onSaveError(res), )); } } @@ -103,31 +140,6 @@ export class ProjectDialogComponent implements OnInit, OnDestroy { }); } - getMatchingSourceTypes(text$: Observable): Observable { - const debouncedText$ = text$.pipe(debounceTime(200), distinctUntilChanged()); - const inputFocus$ = this.sourceTypeInputFocus$; - const availableTypes$ = this.sourceTypeService.sourceTypes$.pipe( - map(sourceTypes => { - const selectedTypeIds = new Set(this.projectCopy?.sourceTypes?.map(t => t.id) || []); - return sourceTypes.filter(t => !selectedTypeIds.has(t.id)); - }) - ); - - return combineLatest([ - merge(debouncedText$, inputFocus$), - availableTypes$, - ]).pipe( - map(([term, availableTypes]) => { - term = term.trim().toLowerCase(); - if (!term) { - return availableTypes; - } - const getTypeKey = t => this.formatSourceTypeOption(t).toLowerCase(); - return availableTypes.filter(t => getTypeKey(t).includes(term)); - }), - ); - }; - private onSaveSuccess(result: Project) { if(history.state?.parentComponent === 'project-detail') { this.router.navigate(['/project', result.projectName]); @@ -156,32 +168,6 @@ export class ProjectDialogComponent implements OnInit, OnDestroy { formatSourceTypeOption(t: SourceType) { return `${t.producer}_${t.model}_${t.catalogVersion}`; } - - addGroup() { - let currentGroups = this.projectCopy.groups || []; - let newGroup = { name: this.newGroupInputText }; - if (newGroup.name.length == 0 || newGroup.name.length > 50) { - return; - } - if (currentGroups.some(g => g.name === newGroup.name)) { - // TODO: actually show error - return; - } - this.subscriptions.add( - this.groupService.create(this.projectCopy.projectName, newGroup).subscribe(g => { - this.projectCopy.groups = [ ...currentGroups, g]; - this.newGroupInputText = ''; - }) - ); - } - - removeGroup(groupName: string) { - this.subscriptions.add( - this.groupService.delete(this.projectCopy.projectName, groupName).subscribe(() => { - this.projectCopy.groups = this.projectCopy.groups.filter(g => g.name !== groupName); - }) - ); - } } @Component({ diff --git a/src/main/webapp/content/scss/global.scss b/src/main/webapp/content/scss/global.scss index 6d5e93cbd..3f46f3264 100644 --- a/src/main/webapp/content/scss/global.scss +++ b/src/main/webapp/content/scss/global.scss @@ -271,3 +271,8 @@ button.calendar, button.calendar:active { background-position: center; } +ngb-typeahead-window { + max-height: 300px; + overflow-y: auto; +} + From 0f65f8cf52c6adf13044556b6371ec91b4f5ec88 Mon Sep 17 00:00:00 2001 From: Peyman Mohtashami Date: Mon, 22 Aug 2022 22:02:06 +0200 Subject: [PATCH 372/431] Add debounce to filters in users page and modify user dialog to add/remove roles --- .../admin/user-management/role.component.html | 4 ++-- .../user-management.component.html | 22 +++++-------------- .../user-management.component.ts | 10 ++++++--- 3 files changed, 14 insertions(+), 22 deletions(-) diff --git a/src/main/webapp/app/admin/user-management/role.component.html b/src/main/webapp/app/admin/user-management/role.component.html index 514ead1e5..61cb6793c 100644 --- a/src/main/webapp/app/admin/user-management/role.component.html +++ b/src/main/webapp/app/admin/user-management/role.component.html @@ -26,7 +26,7 @@

    {{role.organizationName}} - + @@ -34,7 +34,7 @@

    -
    +
    diff --git a/src/main/webapp/app/admin/user-management/user-management.component.html b/src/main/webapp/app/admin/user-management/user-management.component.html index e21e0bfee..92fe43640 100644 --- a/src/main/webapp/app/admin/user-management/user-management.component.html +++ b/src/main/webapp/app/admin/user-management/user-management.component.html @@ -1,9 +1,6 @@

    - @@ -13,16 +10,13 @@

    - + - - - - + - +

    @@ -36,7 +30,6 @@

    - @@ -62,13 +55,8 @@

    - diff --git a/src/main/webapp/app/admin/user-management/user-management.component.ts b/src/main/webapp/app/admin/user-management/user-management.component.ts index 81a7d9c9d..c82190bc7 100644 --- a/src/main/webapp/app/admin/user-management/user-management.component.ts +++ b/src/main/webapp/app/admin/user-management/user-management.component.ts @@ -6,7 +6,8 @@ import { ITEMS_PER_PAGE, Principal, User, UserService } from '../../shared'; import { AlertService } from '../../shared/util/alert.service'; import { EventManager } from '../../shared/util/event-manager.service'; import { parseLinks } from '../../shared/util/parse-links-util'; -import { Subscription } from "rxjs"; +import { Subject, Subscription } from "rxjs"; +import {debounceTime, distinctUntilChanged} from "rxjs/operators"; @Component({ selector: 'jhi-user-mgmt', @@ -30,6 +31,8 @@ export class UserMgmtComponent implements OnInit, OnDestroy { byLogin: string; byEmail: string; + filter: Subject = new Subject(); + constructor( private userService: UserService, private alertService: AlertService, @@ -45,6 +48,8 @@ export class UserMgmtComponent implements OnInit, OnDestroy { this.reverse = data['pagingParams'].ascending; this.predicate = data['pagingParams'].predicate; })); + + this.subscriptions.add(this.filter.pipe(debounceTime(300), distinctUntilChanged()).subscribe(() => this.applyFilter())); } ngOnInit() { @@ -62,7 +67,7 @@ export class UserMgmtComponent implements OnInit, OnDestroy { ); } - onChange(event: any) { + applyFilter() { this.subscriptions.add( this.userService.query({ page: this.page - 1, @@ -77,7 +82,6 @@ export class UserMgmtComponent implements OnInit, OnDestroy { (res: HttpErrorResponse) => this.onError(res), ) ); - } loadAll() { From 3bb8a7495661193e6608728ddb9f5a5637165557 Mon Sep 17 00:00:00 2001 From: Peyman Mohtashami Date: Tue, 23 Aug 2022 14:45:13 +0200 Subject: [PATCH 373/431] Fix e2e test --- .../e2e/cypress/integration/entities/subject.spec.ts | 2 +- .../cypress/integration/entities/user-management.spec.ts | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/test/javascript/e2e/cypress/integration/entities/subject.spec.ts b/src/test/javascript/e2e/cypress/integration/entities/subject.spec.ts index 848060977..666fd6016 100644 --- a/src/test/javascript/e2e/cypress/integration/entities/subject.spec.ts +++ b/src/test/javascript/e2e/cypress/integration/entities/subject.spec.ts @@ -154,7 +154,7 @@ describe('Subject e2e test', () => { cy.get('jhi-subjects #field-order-by').click(); cy.get('jhi-subjects #order-by-desc').click(); cy.wait(100); - cy.get('jhi-subjects .subject-row').first().should('contain.text', 'test-subject-1'); + cy.get('jhi-subjects .subject-row').eq(0).should('contain.text', 'test-subject-1'); }); it('should be able to delete a subject without source', () => { diff --git a/src/test/javascript/e2e/cypress/integration/entities/user-management.spec.ts b/src/test/javascript/e2e/cypress/integration/entities/user-management.spec.ts index 7de2771c5..8dda8ac6d 100644 --- a/src/test/javascript/e2e/cypress/integration/entities/user-management.spec.ts +++ b/src/test/javascript/e2e/cypress/integration/entities/user-management.spec.ts @@ -37,13 +37,15 @@ describe('Create, edit, and delete user', () => { }); it('should be able to create new system admin user', () => { - cy.contains('button.btn-primary', 'Create an admin user').click(); + cy.get('button.btn-primary').contains('Create a new user').click(); cy.get('[name=login]').type('test-sys-admin'); cy.get('[name=firstName]').type('Alice'); cy.get('[name=lastName]').type('Bob'); cy.get('[name=email]').type('alice@radarbase.org'); + cy.get('[name=authority]').select('ROLE_SYS_ADMIN'); + cy.get('[name=addRole]').click(); - cy.contains('button.btn-primary', 'Save').click(); + cy.get('button.btn-primary').contains('Save').click(); cy.get('jhi-user-mgmt tbody tr').should('have.length', 5); }); From e4deacbd9396e2a3cdb79b97d17557a7fe22a887 Mon Sep 17 00:00:00 2001 From: nivethika Date: Fri, 26 Aug 2022 12:04:24 +0200 Subject: [PATCH 374/431] allow project and subject permissions to ORG_ADMIN --- .../java/org/radarbase/auth/authorization/Permissions.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/radar-auth/src/main/java/org/radarbase/auth/authorization/Permissions.java b/radar-auth/src/main/java/org/radarbase/auth/authorization/Permissions.java index bc24a7174..6b4668712 100644 --- a/radar-auth/src/main/java/org/radarbase/auth/authorization/Permissions.java +++ b/radar-auth/src/main/java/org/radarbase/auth/authorization/Permissions.java @@ -72,7 +72,9 @@ private static Map> createPermissions() { // Organization admin can do most things, but not view subjects or measurements rolePermissions.put(ORGANIZATION_ADMIN, Permission.stream() .filter(excludePermissions(Permission.ORGANIZATION_CREATE)) - .filter(excludeEntities(Permission.Entity.SUBJECT, Permission.Entity.MEASUREMENT))); + .filter(excludeEntities(Permission.Entity.AUDIT, + Permission.Entity.AUTHORITY, Permission.Entity.MEASUREMENT))) + .filter(excludePermissions(Permission.SOURCEDATA_CREATE, Permission.SOURCETYPE_CREATE)); // for all authorities except for SYS_ADMIN, the authority is scoped to a project, which // is checked elsewhere From e2bc541b4d014260a80e2870d937a7664694b286 Mon Sep 17 00:00:00 2001 From: nivethika Date: Fri, 26 Aug 2022 13:51:27 +0200 Subject: [PATCH 375/431] allow project and subject permissions to ORG_ADMIN --- .../java/org/radarbase/auth/authorization/Permissions.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/radar-auth/src/main/java/org/radarbase/auth/authorization/Permissions.java b/radar-auth/src/main/java/org/radarbase/auth/authorization/Permissions.java index 6b4668712..7c00b8b66 100644 --- a/radar-auth/src/main/java/org/radarbase/auth/authorization/Permissions.java +++ b/radar-auth/src/main/java/org/radarbase/auth/authorization/Permissions.java @@ -73,8 +73,8 @@ private static Map> createPermissions() { rolePermissions.put(ORGANIZATION_ADMIN, Permission.stream() .filter(excludePermissions(Permission.ORGANIZATION_CREATE)) .filter(excludeEntities(Permission.Entity.AUDIT, - Permission.Entity.AUTHORITY, Permission.Entity.MEASUREMENT))) - .filter(excludePermissions(Permission.SOURCEDATA_CREATE, Permission.SOURCETYPE_CREATE)); + Permission.Entity.AUTHORITY, Permission.Entity.MEASUREMENT)) + .filter(excludePermissions(Permission.SOURCEDATA_CREATE, Permission.SOURCETYPE_CREATE))); // for all authorities except for SYS_ADMIN, the authority is scoped to a project, which // is checked elsewhere From 45a1e96b80da1244a9977bc0f3ed1c5e3c754fec Mon Sep 17 00:00:00 2001 From: Joris Borgdorff Date: Thu, 22 Sep 2022 10:16:01 +0200 Subject: [PATCH 376/431] Expanded tests --- build.gradle | 6 ----- .../auth/authorization/Permissions.java | 3 ++- .../authorization/RadarAuthorizationTest.java | 19 +++++++++++++++ .../radarbase/auth/util/TokenTestUtils.java | 23 +++++++++++++++++++ 4 files changed, 44 insertions(+), 7 deletions(-) diff --git a/build.gradle b/build.gradle index 036a54dc4..fa45b81a1 100644 --- a/build.gradle +++ b/build.gradle @@ -136,12 +136,6 @@ test { useJUnitPlatform() } -task testReport(type: TestReport) { - destinationDir = file("$buildDir/reports/tests") - reportOn test -} - - apply from: 'gradle/liquibase.gradle' apply from: 'gradle/gatling.gradle' apply from: 'gradle/mapstruct.gradle' diff --git a/radar-auth/src/main/java/org/radarbase/auth/authorization/Permissions.java b/radar-auth/src/main/java/org/radarbase/auth/authorization/Permissions.java index 7c00b8b66..14e076854 100644 --- a/radar-auth/src/main/java/org/radarbase/auth/authorization/Permissions.java +++ b/radar-auth/src/main/java/org/radarbase/auth/authorization/Permissions.java @@ -74,7 +74,8 @@ private static Map> createPermissions() { .filter(excludePermissions(Permission.ORGANIZATION_CREATE)) .filter(excludeEntities(Permission.Entity.AUDIT, Permission.Entity.AUTHORITY, Permission.Entity.MEASUREMENT)) - .filter(excludePermissions(Permission.SOURCEDATA_CREATE, Permission.SOURCETYPE_CREATE))); + .filter(excludePermissions(Permission.SOURCEDATA_CREATE, + Permission.SOURCETYPE_CREATE))); // for all authorities except for SYS_ADMIN, the authority is scoped to a project, which // is checked elsewhere diff --git a/radar-auth/src/test/java/org/radarbase/auth/authorization/RadarAuthorizationTest.java b/radar-auth/src/test/java/org/radarbase/auth/authorization/RadarAuthorizationTest.java index d66ad0c1d..aa2fbcd99 100644 --- a/radar-auth/src/test/java/org/radarbase/auth/authorization/RadarAuthorizationTest.java +++ b/radar-auth/src/test/java/org/radarbase/auth/authorization/RadarAuthorizationTest.java @@ -45,6 +45,25 @@ void testCheckPermissionOnProject() throws NotAuthorizedException { String.format("Token should not have permission %s on project %s", p, project))); } + @Test + void testCheckPermissionOnOrganization() throws NotAuthorizedException { + JwtRadarToken token = new JwtRadarToken(TokenTestUtils.ORGANIZATION_ADMIN_TOKEN); + assertNotAuthorized(() -> { + RadarAuthorization.checkPermissionOnOrganization(token, Permission.ORGANIZATION_CREATE, + "main"); + }, "Token should not be able to create organization"); + RadarAuthorization.checkPermissionOnOrganization(token, Permission.PROJECT_CREATE, "main"); + RadarAuthorization.checkPermissionOnOrganizationAndProject(token, Permission.SUBJECT_CREATE, + "main", "PROJECT1"); + assertNotAuthorized(() -> RadarAuthorization.checkPermissionOnOrganization( + token, Permission.PROJECT_CREATE, "other"), + "Token should not be able to create organization"); + assertNotAuthorized(() -> RadarAuthorization.checkPermissionOnOrganizationAndProject( + token, Permission.SUBJECT_CREATE, "other", + "PROJECT1"), + "Token should not be able to create organization"); + } + @Test void testCheckPermission() throws NotAuthorizedException { RadarToken token = new JwtRadarToken(TokenTestUtils.SUPER_USER_TOKEN); diff --git a/radar-auth/src/test/java/org/radarbase/auth/util/TokenTestUtils.java b/radar-auth/src/test/java/org/radarbase/auth/util/TokenTestUtils.java index da88ee2f6..3536be508 100644 --- a/radar-auth/src/test/java/org/radarbase/auth/util/TokenTestUtils.java +++ b/radar-auth/src/test/java/org/radarbase/auth/util/TokenTestUtils.java @@ -28,6 +28,7 @@ public final class TokenTestUtils { public static final String EXPIRED_TOKEN; public static final String INCORRECT_ALGORITHM_TOKEN; public static final DecodedJWT SCOPE_TOKEN; + public static final DecodedJWT ORGANIZATION_ADMIN_TOKEN; public static final DecodedJWT PROJECT_ADMIN_TOKEN; public static final DecodedJWT SUPER_USER_TOKEN; public static final DecodedJWT MULTIPLE_ROLES_IN_PROJECT_TOKEN; @@ -73,6 +74,7 @@ private TokenTestUtils() { VALID_RSA_TOKEN = initValidToken(algorithm, exp, iat); SUPER_USER_TOKEN = JWT.decode(VALID_RSA_TOKEN); PROJECT_ADMIN_TOKEN = initProjectAdminToken(algorithm, exp, iat); + ORGANIZATION_ADMIN_TOKEN = initOrgananizationAdminToken(algorithm, exp, iat); MULTIPLE_ROLES_IN_PROJECT_TOKEN = initMultipleRolesToken(algorithm, exp, iat); INCORRECT_AUDIENCE_TOKEN = initIncorrectAudienceToken(algorithm, exp, iat); SCOPE_TOKEN = initTokenWithScopes(algorithm, exp, iat); @@ -189,6 +191,27 @@ private static DecodedJWT initMultipleRolesToken(Algorithm algorithm, Instant ex return JWT.decode(multipleRolesInProjectToken); } + private static DecodedJWT initOrgananizationAdminToken(Algorithm algorithm, Instant exp, + Instant iat) { + String projectAdminToken = JWT.create() + .withIssuer(ISS) + .withIssuedAt(Date.from(iat)) + .withExpiresAt(Date.from(exp)) + .withAudience(CLIENT) + .withSubject(USER) + .withArrayClaim("scope", ALL_SCOPES) + .withArrayClaim("authorities", new String[] {"ROLE_ORGANIZATION_ADMIN"}) + .withArrayClaim("roles", new String[] {"main:ROLE_ORGANIZATION_ADMIN"}) + .withArrayClaim("sources", new String[] {}) + .withClaim("client_id", CLIENT) + .withClaim("user_name", USER) + .withClaim("jti", JTI) + .withClaim("grant_type", "password") + .sign(algorithm); + + return JWT.decode(projectAdminToken); + } + private static DecodedJWT initProjectAdminToken(Algorithm algorithm, Instant exp, Instant iat) { String projectAdminToken = JWT.create() .withIssuer(ISS) From 2bbf114e9b4f646ae90767d8d5b3378e30566163 Mon Sep 17 00:00:00 2001 From: Joris Borgdorff Date: Tue, 27 Sep 2022 15:01:39 +0200 Subject: [PATCH 377/431] Avoid scopes in JWT that don't apply to the user This filters out scopes that are not applicable to the current user before the JWT is returned. It does not modify the access request form. --- .../security/ClaimsTokenEnhancer.java | 29 ++++++++++++++----- 1 file changed, 22 insertions(+), 7 deletions(-) diff --git a/src/main/java/org/radarbase/management/security/ClaimsTokenEnhancer.java b/src/main/java/org/radarbase/management/security/ClaimsTokenEnhancer.java index ec3b420a0..77c1bb192 100644 --- a/src/main/java/org/radarbase/management/security/ClaimsTokenEnhancer.java +++ b/src/main/java/org/radarbase/management/security/ClaimsTokenEnhancer.java @@ -1,12 +1,6 @@ package org.radarbase.management.security; -import java.security.Principal; -import java.time.Instant; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.stream.Collectors; - +import org.radarbase.auth.authorization.Permission; import org.radarbase.auth.token.JwtRadarToken; import org.radarbase.management.domain.Source; import org.radarbase.management.repository.SubjectRepository; @@ -25,6 +19,15 @@ import org.springframework.security.oauth2.provider.OAuth2Request; import org.springframework.security.oauth2.provider.token.TokenEnhancer; +import java.security.Principal; +import java.time.Instant; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.TreeSet; +import java.util.stream.Collectors; + public class ClaimsTokenEnhancer implements TokenEnhancer, InitializingBean { private static final Logger logger = LoggerFactory.getLogger(ClaimsTokenEnhancer.class); @@ -71,6 +74,18 @@ public OAuth2AccessToken enhance(OAuth2AccessToken accessToken, }) .collect(Collectors.toList()); additionalInfo.put(JwtRadarToken.ROLES_CLAIM, roles); + + // Do not grant scopes that cannot be given to a user. + Set newScopes = Permission.stream() + .filter(permission -> user.getRoles().stream() + .anyMatch(role -> permission.isRoleAllowed(role.getRole()))) + .map(Permission::scope) + .filter(permission -> accessToken.getScope().contains(permission)) + .collect(Collectors.toCollection(TreeSet::new)); + + if (!newScopes.equals(accessToken.getScope())) { + ((DefaultOAuth2AccessToken) accessToken).setScope(newScopes); + } }); List assignedSources = subjectRepository.findSourcesBySubjectLogin(userName); From 1fa30dafa3f50e209c9325371d072d635ead6049 Mon Sep 17 00:00:00 2001 From: Joris Borgdorff Date: Tue, 27 Sep 2022 15:06:10 +0200 Subject: [PATCH 378/431] Reduce the number of permissions that need to be compared --- .../management/security/ClaimsTokenEnhancer.java | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/src/main/java/org/radarbase/management/security/ClaimsTokenEnhancer.java b/src/main/java/org/radarbase/management/security/ClaimsTokenEnhancer.java index 77c1bb192..62cb6b288 100644 --- a/src/main/java/org/radarbase/management/security/ClaimsTokenEnhancer.java +++ b/src/main/java/org/radarbase/management/security/ClaimsTokenEnhancer.java @@ -2,6 +2,7 @@ import org.radarbase.auth.authorization.Permission; import org.radarbase.auth.token.JwtRadarToken; +import org.radarbase.management.domain.Role; import org.radarbase.management.domain.Source; import org.radarbase.management.repository.SubjectRepository; import org.radarbase.management.repository.UserRepository; @@ -76,14 +77,17 @@ public OAuth2AccessToken enhance(OAuth2AccessToken accessToken, additionalInfo.put(JwtRadarToken.ROLES_CLAIM, roles); // Do not grant scopes that cannot be given to a user. - Set newScopes = Permission.stream() - .filter(permission -> user.getRoles().stream() - .anyMatch(role -> permission.isRoleAllowed(role.getRole()))) - .map(Permission::scope) - .filter(permission -> accessToken.getScope().contains(permission)) + Set currentScopes = accessToken.getScope(); + Set newScopes = currentScopes.stream() + .filter(scope -> { + Permission permission = Permission.valueOf(scope); + return user.getRoles().stream() + .map(Role::getRole) + .anyMatch(permission::isRoleAllowed); + }) .collect(Collectors.toCollection(TreeSet::new)); - if (!newScopes.equals(accessToken.getScope())) { + if (!newScopes.equals(currentScopes)) { ((DefaultOAuth2AccessToken) accessToken).setScope(newScopes); } }); From fffd84b778f65288a7c3df33904a863df1d247eb Mon Sep 17 00:00:00 2001 From: Joris Borgdorff Date: Mon, 10 Oct 2022 11:03:44 +0200 Subject: [PATCH 379/431] Fixed permission update to scope --- .../java/org/radarbase/auth/authorization/Permission.java | 4 ++++ .../radarbase/management/security/ClaimsTokenEnhancer.java | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/radar-auth/src/main/java/org/radarbase/auth/authorization/Permission.java b/radar-auth/src/main/java/org/radarbase/auth/authorization/Permission.java index 691998f7f..7ecf199c9 100644 --- a/radar-auth/src/main/java/org/radarbase/auth/authorization/Permission.java +++ b/radar-auth/src/main/java/org/radarbase/auth/authorization/Permission.java @@ -136,6 +136,10 @@ public static Permission of(Entity entity, Operation operation) { "No permission found for given entity and operation")); } + public static Permission ofScope(String scope) { + return valueOf(scope.replace('.', '_')); + } + /** * Turn this permission into an OAuth scope name and return it. * diff --git a/src/main/java/org/radarbase/management/security/ClaimsTokenEnhancer.java b/src/main/java/org/radarbase/management/security/ClaimsTokenEnhancer.java index 62cb6b288..cf6b39cc1 100644 --- a/src/main/java/org/radarbase/management/security/ClaimsTokenEnhancer.java +++ b/src/main/java/org/radarbase/management/security/ClaimsTokenEnhancer.java @@ -80,7 +80,7 @@ public OAuth2AccessToken enhance(OAuth2AccessToken accessToken, Set currentScopes = accessToken.getScope(); Set newScopes = currentScopes.stream() .filter(scope -> { - Permission permission = Permission.valueOf(scope); + Permission permission = Permission.ofScope(scope); return user.getRoles().stream() .map(Role::getRole) .anyMatch(permission::isRoleAllowed); From aadac7b34ee6c59c64aa7061e7c1a65000d741d8 Mon Sep 17 00:00:00 2001 From: Joris Borgdorff Date: Tue, 11 Oct 2022 13:53:09 +0200 Subject: [PATCH 380/431] Fix group permissions --- .../management/web/rest/GroupResource.java | 30 ++++++++++++++----- 1 file changed, 22 insertions(+), 8 deletions(-) diff --git a/src/main/java/org/radarbase/management/web/rest/GroupResource.java b/src/main/java/org/radarbase/management/web/rest/GroupResource.java index 28f68a2b1..b11eea90f 100644 --- a/src/main/java/org/radarbase/management/web/rest/GroupResource.java +++ b/src/main/java/org/radarbase/management/web/rest/GroupResource.java @@ -9,11 +9,14 @@ package org.radarbase.management.web.rest; +import org.radarbase.auth.authorization.Permission; import org.radarbase.auth.config.Constants; import org.radarbase.auth.exception.NotAuthorizedException; import org.radarbase.auth.token.RadarToken; import org.radarbase.management.service.GroupService; +import org.radarbase.management.service.ProjectService; import org.radarbase.management.service.dto.GroupDTO; +import org.radarbase.management.service.dto.ProjectDTO; import org.radarbase.management.web.rest.errors.BadRequestException; import org.radarbase.management.web.rest.vm.GroupPatchOperation; import org.springframework.beans.factory.annotation.Autowired; @@ -37,8 +40,8 @@ import static org.radarbase.auth.authorization.Permission.PROJECT_READ; import static org.radarbase.auth.authorization.Permission.PROJECT_UPDATE; import static org.radarbase.auth.authorization.Permission.SUBJECT_UPDATE; -import static org.radarbase.auth.authorization.RadarAuthorization.checkPermissionOnProject; - +import static org.radarbase.auth.authorization.RadarAuthorization.checkPermission; +import static org.radarbase.auth.authorization.RadarAuthorization.checkPermissionOnOrganizationAndProject; import static org.radarbase.management.web.rest.errors.EntityName.GROUP; import static org.radarbase.management.web.rest.errors.ErrorConstants.ERR_VALIDATION; @@ -51,6 +54,9 @@ public class GroupResource { @Autowired private RadarToken token; + @Autowired + private ProjectService projectService; + /** * Create group. * @param projectName project name @@ -62,7 +68,7 @@ public class GroupResource { public ResponseEntity createGroup( @PathVariable String projectName, @Valid @RequestBody GroupDTO groupDto) throws NotAuthorizedException { - checkPermissionOnProject(token, PROJECT_UPDATE, projectName); + checkProjectPermission(PROJECT_UPDATE, projectName); GroupDTO groupDtoResult = groupService.createGroup(projectName, groupDto); URI location = MvcUriComponentsBuilder.fromController(getClass()) .path("/{groupName}") @@ -81,7 +87,7 @@ public ResponseEntity createGroup( @GetMapping public List listGroups( @PathVariable String projectName) throws NotAuthorizedException { - checkPermissionOnProject(token, PROJECT_READ, projectName); + checkProjectPermission(PROJECT_READ, projectName); return groupService.listGroups(projectName); } @@ -96,7 +102,7 @@ public List listGroups( public GroupDTO getGroup( @PathVariable String projectName, @PathVariable String groupName) throws NotAuthorizedException { - checkPermissionOnProject(token, PROJECT_READ, projectName); + checkProjectPermission(PROJECT_READ, projectName); return groupService.getGroup(projectName, groupName); } @@ -111,7 +117,7 @@ public ResponseEntity deleteGroup( @RequestParam(defaultValue = "false") Boolean unlinkSubjects, @PathVariable String projectName, @PathVariable String groupName) throws NotAuthorizedException { - checkPermissionOnProject(token, PROJECT_UPDATE, projectName); + checkProjectPermission(PROJECT_UPDATE, projectName); groupService.deleteGroup(projectName, groupName, unlinkSubjects); return ResponseEntity.noContent().build(); } @@ -132,8 +138,8 @@ public ResponseEntity changeGroupSubjects( // so it would make sense to check permissions per subject, // but I assume that only those who are authorized to perform project-wide actions // should be allowed to use this endpoint - checkPermissionOnProject(token, SUBJECT_UPDATE, projectName); - + checkProjectPermission(SUBJECT_UPDATE, projectName); + var addedItems = new ArrayList(); var removedItems = new ArrayList(); for (GroupPatchOperation operation : patchOperations) { @@ -155,4 +161,12 @@ public ResponseEntity changeGroupSubjects( groupService.updateGroupSubjects(projectName, groupName, addedItems, removedItems); return ResponseEntity.noContent().build(); } + + private void checkProjectPermission(Permission permission, String projectName) + throws NotAuthorizedException { + checkPermission(token, permission); + ProjectDTO project = projectService.findOneByName(projectName); + checkPermissionOnOrganizationAndProject(token, permission, + project.getOrganization().getName(), projectName); + } } From faa0e17321e0d745c9dcc0dc8e8b846000695018 Mon Sep 17 00:00:00 2001 From: Peyman Mohtashami Date: Tue, 11 Oct 2022 17:28:29 +0200 Subject: [PATCH 381/431] Modify project details for org-admin role --- .../app/entities/project/project-detail.component.ts | 4 +--- src/main/webapp/app/shared/subject/subject.component.ts | 8 +++++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/webapp/app/entities/project/project-detail.component.ts b/src/main/webapp/app/entities/project/project-detail.component.ts index 04d787706..ae65a4997 100644 --- a/src/main/webapp/app/entities/project/project-detail.component.ts +++ b/src/main/webapp/app/entities/project/project-detail.component.ts @@ -93,10 +93,8 @@ export class ProjectDetailComponent implements OnInit, OnDestroy { } private availableTabs(project: Project, account: Account): string[] { - if (project && this.principal.accountHasAnyAuthority(account, ['ROLE_SYS_ADMIN', 'ROLE_PROJECT_ADMIN:' + project.projectName])) { + if (project && this.principal.accountHasAnyAuthority(account, ['ROLE_SYS_ADMIN', 'ROLE_ORGANIZATION_ADMIN:' + project.organization.name, 'ROLE_PROJECT_ADMIN:' + project.projectName])) { return ['subjects', 'groups', 'permissions', 'admins', 'analysts']; - } else if (project && project.organization && this.principal.accountHasAnyAuthority(account, ['ROLE_ORGANIZATION_ADMIN:' + project.organization.name])) { - return ['permissions', 'admins', 'analysts']; } else { return []; } diff --git a/src/main/webapp/app/shared/subject/subject.component.ts b/src/main/webapp/app/shared/subject/subject.component.ts index fb36d32fd..e505f9a5a 100644 --- a/src/main/webapp/app/shared/subject/subject.component.ts +++ b/src/main/webapp/app/shared/subject/subject.component.ts @@ -470,9 +470,11 @@ export class SubjectComponent implements OnInit, OnDestroy, OnChanges { this.groups$, this.project$, ]).subscribe(([subjects, groups, project]) => { - modalRef.componentInstance.groups = groups; - modalRef.componentInstance.projectName = project.projectName; - modalRef.componentInstance.subjects = subjects.filter(s => s.checked); + if(modalRef.componentInstance){ + modalRef.componentInstance.groups = groups; + modalRef.componentInstance.projectName = project.projectName; + modalRef.componentInstance.subjects = subjects.filter(s => s.checked); + } })); } } From 3d91f08e455f6d1d259b73bcbed03cd2cca22370 Mon Sep 17 00:00:00 2001 From: Joris Borgdorff Date: Wed, 9 Nov 2022 11:48:56 +0100 Subject: [PATCH 382/431] Fix yarn test --- .../organization/organization-detail.component.spec.ts | 4 ++-- .../app/entities/project/project-detail.component.spec.ts | 4 ++-- .../entities/source-type/source-type-detail.component.spec.ts | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/webapp/app/entities/organization/organization-detail.component.spec.ts b/src/main/webapp/app/entities/organization/organization-detail.component.spec.ts index 8e8b58dc4..0206bb98d 100644 --- a/src/main/webapp/app/entities/organization/organization-detail.component.spec.ts +++ b/src/main/webapp/app/entities/organization/organization-detail.component.spec.ts @@ -43,14 +43,14 @@ describe('Component Tests', () => { it('Should call load all on init', waitForAsync(async () => { // GIVEN - spyOn(service, 'find').and.returnValue(of({id: 10})); + spyOn(service, 'find').and.returnValue(of({id: 10, organization: {name: 'test'}})); // WHEN comp.ngOnInit(); // THEN const org = await comp.organization$.pipe(first()).toPromise(); - expect(org).toEqual(jasmine.objectContaining({id: 10})); + expect(org).toEqual(jasmine.objectContaining({id: 10, organization: {name: 'test'}})); expect(service.find).toHaveBeenCalledWith('testOrganization'); diff --git a/src/main/webapp/app/entities/project/project-detail.component.spec.ts b/src/main/webapp/app/entities/project/project-detail.component.spec.ts index 5ec7b7bca..acfb72b23 100644 --- a/src/main/webapp/app/entities/project/project-detail.component.spec.ts +++ b/src/main/webapp/app/entities/project/project-detail.component.spec.ts @@ -46,7 +46,7 @@ describe('Component Tests', () => { describe('OnInit', () => { it('Should call load all on init', waitForAsync(async () => { // GIVEN - spyOn(service, 'find').and.returnValue(of({id: 10})); + spyOn(service, 'find').and.returnValue(of({id: 10, organization: {name: 'test'}})); // WHEN comp.ngOnInit(); @@ -54,7 +54,7 @@ describe('Component Tests', () => { // THEN expect(service.find).toHaveBeenCalledWith('testProject'); const result = await comp.project$.pipe(filter(p => !!p), first()).toPromise(); - expect(result).toEqual(jasmine.objectContaining({id: 10})) + expect(result).toEqual(jasmine.objectContaining({id: 10, organization: {name: 'test'}})) })); }); }); diff --git a/src/main/webapp/app/entities/source-type/source-type-detail.component.spec.ts b/src/main/webapp/app/entities/source-type/source-type-detail.component.spec.ts index cf3d72279..9cb762a38 100644 --- a/src/main/webapp/app/entities/source-type/source-type-detail.component.spec.ts +++ b/src/main/webapp/app/entities/source-type/source-type-detail.component.spec.ts @@ -45,14 +45,14 @@ describe('Component Tests', () => { it('Should call load all on init', waitForAsync(async () => { // GIVEN - spyOn(service, 'find').and.returnValue(of({id: 10})); + spyOn(service, 'find').and.returnValue(of({id: 10, organization: {name: 'test'}})); // WHEN comp.ngOnInit(); const sourceType = await comp.sourceType$.pipe(first()).toPromise(); // THEN - expect(sourceType).toEqual(jasmine.objectContaining({id: 10})); + expect(sourceType).toEqual(jasmine.objectContaining({id: 10, organization: {name: 'test'}})); expect(service.find).toHaveBeenCalledWith('testProducer', 'testModel', 'testVersion'); })); }); From 9f6df8ebc3913dc4bd667d368de58fb2dbb9df8d Mon Sep 17 00:00:00 2001 From: Joris Borgdorff Date: Wed, 9 Nov 2022 11:58:13 +0100 Subject: [PATCH 383/431] Fix tests --- .../web/rest/GroupResourceIntTest.java | 5 +++++ .../web/rest/UserResourceIntTest.java | 19 +++++++++++++++---- 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/src/test/java/org/radarbase/management/web/rest/GroupResourceIntTest.java b/src/test/java/org/radarbase/management/web/rest/GroupResourceIntTest.java index 366d33e87..cfac9b106 100644 --- a/src/test/java/org/radarbase/management/web/rest/GroupResourceIntTest.java +++ b/src/test/java/org/radarbase/management/web/rest/GroupResourceIntTest.java @@ -17,6 +17,7 @@ import org.radarbase.management.repository.SubjectRepository; import org.radarbase.management.security.JwtAuthenticationFilter; import org.radarbase.management.service.GroupService; +import org.radarbase.management.service.ProjectService; import org.radarbase.management.service.SubjectService; import org.radarbase.management.service.dto.GroupDTO; import org.radarbase.management.service.dto.SubjectDTO; @@ -88,6 +89,9 @@ class GroupResourceIntTest { @Autowired private GroupMapper groupMapper; + @Autowired + private ProjectService projectService; + @Autowired private PageableHandlerMethodArgumentResolver pageableArgumentResolver; @@ -112,6 +116,7 @@ public void setUp() throws ServletException { var groupResource = new GroupResource(); ReflectionTestUtils.setField(groupResource, "groupService", groupService); ReflectionTestUtils.setField(groupResource, "token", token); + ReflectionTestUtils.setField(groupResource, "projectService", projectService); JwtAuthenticationFilter filter = OAuthHelper.createAuthenticationFilter(); filter.init(new MockFilterConfig()); diff --git a/src/test/java/org/radarbase/management/web/rest/UserResourceIntTest.java b/src/test/java/org/radarbase/management/web/rest/UserResourceIntTest.java index 672d12a78..be02a99e1 100644 --- a/src/test/java/org/radarbase/management/web/rest/UserResourceIntTest.java +++ b/src/test/java/org/radarbase/management/web/rest/UserResourceIntTest.java @@ -1,5 +1,6 @@ package org.radarbase.management.web.rest; +import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -9,6 +10,7 @@ import org.radarbase.management.ManagementPortalTestApp; import org.radarbase.management.config.ManagementPortalProperties; import org.radarbase.management.domain.Authority; +import org.radarbase.management.domain.Project; import org.radarbase.management.domain.User; import org.radarbase.management.repository.ProjectRepository; import org.radarbase.management.repository.RoleRepository; @@ -117,6 +119,8 @@ class UserResourceIntTest { private User user; + private Project project; + @BeforeEach public void setUp() throws ServletException { MockitoAnnotations.initMocks(this); @@ -138,8 +142,15 @@ public void setUp() throws ServletException { .setMessageConverters(jacksonMessageConverter) .addFilter(filter) .defaultRequest(get("/").with(OAuthHelper.bearerToken())).build(); + project = null; } + @AfterEach + public void tearDown() { + if (project != null) { + projectRepository.delete(project); + } + } @BeforeEach public void initTest() { @@ -320,7 +331,7 @@ void updateUser() throws Exception { // Initialize the database userRepository.saveAndFlush(user); final int databaseSizeBeforeUpdate = userRepository.findAll().size(); - var project = ProjectResourceIntTest.createEntity(); + project = ProjectResourceIntTest.createEntity(); projectRepository.save(project); // Update the user @@ -362,7 +373,7 @@ void updateUser() throws Exception { void updateUserLogin() throws Exception { // Initialize the database userRepository.saveAndFlush(user); - var project = ProjectResourceIntTest.createEntity(); + project = ProjectResourceIntTest.createEntity(); projectRepository.save(project); final int databaseSizeBeforeUpdate = userRepository.findAll().size(); @@ -407,7 +418,7 @@ void updateUserLogin() throws Exception { void updateUserExistingEmail() throws Exception { // Initialize the database with 2 users userRepository.saveAndFlush(user); - var project = ProjectResourceIntTest.createEntity(); + project = ProjectResourceIntTest.createEntity(); projectRepository.save(project); User anotherUser = new User(); @@ -450,7 +461,7 @@ void updateUserExistingEmail() throws Exception { void updateUserExistingLogin() throws Exception { // Initialize the database userRepository.saveAndFlush(user); - var project = ProjectResourceIntTest.createEntity(); + project = ProjectResourceIntTest.createEntity(); projectRepository.save(project); User anotherUser = new User(); From 4fe2bfbd3eb094846c09dd3a378f71a94d34969a Mon Sep 17 00:00:00 2001 From: Joris Borgdorff Date: Wed, 9 Nov 2022 12:11:16 +0100 Subject: [PATCH 384/431] Update GA --- .github/workflows/main.yml | 47 ++++++++++++++------------- .github/workflows/pre-release.yml | 11 ++++--- .github/workflows/release.yml | 25 +++++++------- .github/workflows/scheduled-snyk.yaml | 2 +- .github/workflows/snyk.yaml | 2 +- Dockerfile | 6 ++-- 6 files changed, 48 insertions(+), 45 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 5b4709076..de342e7ce 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -19,23 +19,24 @@ jobs: # Steps represent a sequence of tasks that will be executed as part of the job steps: # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Use Node.js 16 - uses: actions/setup-node@v1 + uses: actions/setup-node@v3 with: node-version: 16 - name: Get yarn cache directory path id: yarn-cache-dir-path - run: echo "::set-output name=dir::.yarn/cache" + run: echo "dir=.yarn/cache" >> $GITHUB_OUTPUTS - - uses: actions/setup-java@v1 + - uses: actions/setup-java@v3 with: + distribution: temurin java-version: 17 - name: Cache - uses: actions/cache@v2 + uses: actions/cache@v3 with: path: | ${{ steps.yarn-cache-dir-path.outputs.dir }} @@ -100,28 +101,28 @@ jobs: # Steps represent a sequence of tasks that will be executed as part of the job steps: # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Check whether unity activation requests should be done id: docker_check_secret run: | echo "IS_DOCKER_SECRET_SET: ${{ secrets.DOCKERHUB_USERNAME != '' && secrets.DOCKERHUB_TOKEN != '' }}" - echo "::set-output name=IS_DOCKER_SECRET_SET::${{ secrets.DOCKERHUB_USERNAME != '' && secrets.DOCKERHUB_TOKEN != '' }}" + echo "IS_DOCKER_SECRET_SET=${{ secrets.DOCKERHUB_USERNAME != '' && secrets.DOCKERHUB_TOKEN != '' }}" >> $GITHUB_OUTPUTS - name: Login to Docker Hub if: steps.docker_check_secret.outputs.IS_DOCKER_SECRET_SET == 'true' - uses: docker/login-action@v1 + uses: docker/login-action@v2 with: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} - name: Get yarn cache directory path id: yarn-cache-dir-path - run: echo "::set-output name=dir::.yarn/cache" + run: echo "dir=.yarn/cache" >> $GITHUB_OUTPUTS - name: Cache Docker layers id: cache-buildx - uses: actions/cache@v2 + uses: actions/cache@v3 with: path: | ${{ steps.yarn-cache-dir-path.outputs.dir }} @@ -134,13 +135,13 @@ jobs: id: cache-parameters run: | if [ "${{ steps.cache-buildx.outputs.cache-hit }}" = "true" ]; then - echo "::set-output name=cache-to::" + echo "cache-to=" >> $GITHUB_OUTPUTS else - echo "::set-output name=cache-to::type=local,dest=/tmp/.buildx-cache-new,mode=max" + echo "cache-to=type=local,dest=/tmp/.buildx-cache-new,mode=max" >> $GITHUB_OUTPUTS fi - name: Use Node.js 16 - uses: actions/setup-node@v1 + uses: actions/setup-node@v3 with: node-version: 16 @@ -150,32 +151,32 @@ jobs: # Add Docker labels and tags - name: Docker meta id: docker_meta - uses: crazy-max/ghaction-docker-meta@v2 + uses: docker/metadata-action@v4 with: images: ${{ env.DOCKER_IMAGE }} # Setup docker build environment - name: Set up QEMU - uses: docker/setup-qemu-action@v1 + uses: docker/setup-qemu-action@v2 - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v1 + uses: docker/setup-buildx-action@v2 - name: Docker build parameters id: docker_params run: | if [ "${{ github.event_name == 'pull_request' }}" = "true" ]; then - echo "::set-output name=push::false" - echo "::set-output name=load::true" - echo "::set-output name=platforms::linux/amd64" + echo "push=false" >> $GITHUB_OUTPUTS + echo "load=true" >> $GITHUB_OUTPUTS + echo "platforms=linux/amd64" >> $GITHUB_OUTPUTS else - echo "::set-output name=push::true" - echo "::set-output name=load::false" - echo "::set-output name=platforms::linux/amd64,linux/arm64" + echo "push=true" >> $GITHUB_OUTPUTS + echo "load=false" >> $GITHUB_OUTPUTS + echo "platforms=linux/amd64,linux/arm64" >> $GITHUB_OUTPUTS fi - name: Build docker - uses: docker/build-push-action@v2 + uses: docker/build-push-action@v3 with: # Do not load context from Github but from local path context: . diff --git a/.github/workflows/pre-release.yml b/.github/workflows/pre-release.yml index ccc36ae5b..8b4189e8d 100644 --- a/.github/workflows/pre-release.yml +++ b/.github/workflows/pre-release.yml @@ -17,23 +17,24 @@ jobs: # Steps represent a sequence of tasks that will be executed as part of the job steps: # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Use Node.js 16 - uses: actions/setup-node@v1 + uses: actions/setup-node@v3 with: node-version: 16 - name: Get yarn cache directory path id: yarn-cache-dir-path - run: echo "::set-output name=dir::.yarn/cache" + run: echo "dir=.yarn/cache" >> $GITHUB_OUTPUTS - - uses: actions/setup-java@v1 + - uses: actions/setup-java@v3 with: + distribution: temurin java-version: 17 - name: Cache - uses: actions/cache@v2 + uses: actions/cache@v3 with: path: | ${{ steps.yarn-cache-dir-path.outputs.dir }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 82b1c0610..60fb67033 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -16,23 +16,24 @@ jobs: # Steps represent a sequence of tasks that will be executed as part of the job steps: # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Use Node.js 16 - uses: actions/setup-node@v1 + uses: actions/setup-node@v3 with: node-version: 16 - name: Get yarn cache directory path id: yarn-cache-dir-path - run: echo "::set-output name=dir::.yarn/cache" + run: echo "dir=.yarn/cache" >> $GITHUB_OUTPUTS - - uses: actions/setup-java@v1 + - uses: actions/setup-java@v3 with: + distribution: temurin java-version: 17 - name: Cache - uses: actions/cache@v2 + uses: actions/cache@v3 with: path: | ${{ steps.yarn-cache-dir-path.outputs.dir }} @@ -70,10 +71,10 @@ jobs: # Steps represent a sequence of tasks that will be executed as part of the job steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Use Node.js 16 - uses: actions/setup-node@v1 + uses: actions/setup-node@v3 with: node-version: 16 @@ -82,13 +83,13 @@ jobs: # Setup docker build environment - name: Set up QEMU - uses: docker/setup-qemu-action@v1 + uses: docker/setup-qemu-action@v2 - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v1 + uses: docker/setup-buildx-action@v2 - name: Login to DockerHub - uses: docker/login-action@v1 + uses: docker/login-action@v2 with: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} @@ -96,7 +97,7 @@ jobs: # Add Docker labels and tags - name: Docker meta id: docker_meta - uses: crazy-max/ghaction-docker-meta@v2 + uses: docker/metadata-action@v4 with: images: ${{ env.DOCKER_IMAGE }} tags: | @@ -104,7 +105,7 @@ jobs: type=semver,pattern={{major}}.{{minor}} - name: Build docker - uses: docker/build-push-action@v2 + uses: docker/build-push-action@v3 with: context: . # Allow running the image on the architectures supported by openjdk:11-jre-slim diff --git a/.github/workflows/scheduled-snyk.yaml b/.github/workflows/scheduled-snyk.yaml index 8ee7d1b6a..644070cb0 100644 --- a/.github/workflows/scheduled-snyk.yaml +++ b/.github/workflows/scheduled-snyk.yaml @@ -14,7 +14,7 @@ jobs: with: snyk-version: v1.931.0 - - uses: actions/setup-node@v2 + - uses: actions/setup-node@v3 with: node-version: '16' cache: npm diff --git a/.github/workflows/snyk.yaml b/.github/workflows/snyk.yaml index 26777748c..463dee48d 100644 --- a/.github/workflows/snyk.yaml +++ b/.github/workflows/snyk.yaml @@ -13,7 +13,7 @@ jobs: with: snyk-version: v1.931.0 - - uses: actions/setup-node@v2 + - uses: actions/setup-node@v3 with: node-version: '16' cache: npm diff --git a/Dockerfile b/Dockerfile index 8b0d5c84c..d8044ea35 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,7 +12,7 @@ RUN curl -sL https://deb.nodesource.com/setup_16.x | bash \ ## will allow us to re-use these image layers when only the souce code changes WORKDIR /code -ENV GRADLE_OPTS="-Dorg.gradle.daemon=false -Dorg.gradle.project.prod=true" +ENV GRADLE_OPTS="-Dorg.gradle.daemon=false -Dorg.gradle.project.prod=true -Dorg.gradle.vfs.watch=false" COPY package.json yarn.lock .yarnrc.yml /code/ COPY .yarn /code/.yarn @@ -23,7 +23,7 @@ COPY gradlew build.gradle gradle.properties settings.gradle /code/ COPY radar-auth/build.gradle radar-auth/ COPY oauth-client-util/build.gradle oauth-client-util/ -RUN ./gradlew downloadDependencies --no-watch-fs +RUN ./gradlew downloadDependencies # now we copy our application source code and build it @@ -33,7 +33,7 @@ COPY webpack webpack COPY radar-auth radar-auth COPY src src -RUN ./gradlew -s bootWar --no-watch-fs +RUN ./gradlew -s bootWar # Run stage FROM eclipse-temurin:17-jre From 18af7cbabc56d3e6a3827aec4e330f0b21d62f0b Mon Sep 17 00:00:00 2001 From: Joris Borgdorff Date: Wed, 9 Nov 2022 12:36:14 +0100 Subject: [PATCH 385/431] Bump Java dependencies --- build.gradle | 16 +++---- gradle.properties | 42 +++++++++--------- gradle/wrapper/gradle-wrapper.jar | Bin 59821 -> 60756 bytes gradle/wrapper/gradle-wrapper.properties | 2 +- gradlew | 6 +++ gradlew.bat | 14 +++--- managementportal-client/build.gradle | 8 ++-- oauth-client-util/build.gradle | 2 +- .../oauth/unit/OAuth2ClientTest.java | 2 +- 9 files changed, 50 insertions(+), 42 deletions(-) diff --git a/build.gradle b/build.gradle index fa45b81a1..fcaea71d0 100644 --- a/build.gradle +++ b/build.gradle @@ -14,11 +14,11 @@ buildscript { plugins { id 'application' id 'org.springframework.boot' version "${spring_boot_version}" - id "com.github.node-gradle.node" version "3.2.1" - id "io.spring.dependency-management" version "1.0.11.RELEASE" - id 'de.undercouch.download' version '5.0.2' apply false + id "com.github.node-gradle.node" version "3.5.0" + id "io.spring.dependency-management" version "1.1.0" + id 'de.undercouch.download' version '5.3.0' apply false id "io.github.gradle-nexus.publish-plugin" version "1.1.0" - id("com.github.ben-manes.versions") version "0.42.0" + id("com.github.ben-manes.versions") version "0.43.0" } apply plugin: 'org.springframework.boot' @@ -177,7 +177,7 @@ dependencies { } implementation "org.hibernate:hibernate-core" implementation "org.hibernate:hibernate-envers" - implementation "org.hibernate:hibernate-validator:7.0.4.Final" + implementation 'org.hibernate:hibernate-validator:8.0.0.Final' runtimeOnly "org.postgresql:postgresql:${postgresql_version}" runtimeOnly "org.hsqldb:hsqldb:${hsqldb_version}" @@ -193,7 +193,7 @@ dependencies { implementation("org.springframework:spring-context-support") implementation("org.springframework.session:spring-session-hazelcast") - implementation("org.springframework.security.oauth:spring-security-oauth2:2.5.1.RELEASE") + implementation('org.springframework.security.oauth:spring-security-oauth2:2.5.2.RELEASE') implementation "org.springdoc:springdoc-openapi-ui:${springdoc_version}" runtimeOnly("javax.inject:javax.inject:1") implementation project(':radar-auth') @@ -203,7 +203,7 @@ dependencies { runtimeOnly("org.glassfish.jaxb:jaxb-core:${javax_jaxb_core_version}") runtimeOnly("org.glassfish.jaxb:jaxb-runtime:${javax_jaxb_runtime_version}") runtimeOnly("javax.activation:activation:${javax_activation}") - runtimeOnly 'org.javassist:javassist:3.28.0-GA' + runtimeOnly 'org.javassist:javassist:3.29.2-GA' testImplementation "com.jayway.jsonpath:json-path" testImplementation ("org.springframework.boot:spring-boot-starter-test") { @@ -242,7 +242,7 @@ task cleanResources(type: Delete) { } wrapper { - gradleVersion '7.4.1' + gradleVersion '7.5.1' } task stage(dependsOn: 'bootWar') { diff --git a/gradle.properties b/gradle.properties index 7c25d850a..a1f44e5fe 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,31 +1,31 @@ rootProject.name=management-portal profile=dev -assertj_version=3.22.0 -jhipster_server_version=7.7.0 -hazelcast_version=5.1.1 +assertj_version=3.23.1 +jhipster_server_version=7.9.3 +hazelcast_version=5.2.0 hikaricp_version=5.0.1 -liquibase_slf4j_version=4.0.0 -liquibase_version=4.9.0 -postgresql_version=42.3.3 -springdoc_version=1.6.6 -spring_boot_version=2.6.5 -spring_framework_version=5.3.17 -spring_data_version=2021.1.3 -spring_session_version=2021.1.2 -gatling_version=3.7.6 -mapstruct_version=1.4.2.Final -jackson_version=2.13.2.20220328 +liquibase_slf4j_version=4.1.0 +liquibase_version=4.17.2 +postgresql_version=42.5.0 +springdoc_version=1.6.12 +spring_boot_version=2.7.5 +spring_framework_version=5.3.23 +spring_data_version=2021.2.5 +spring_session_version=2021.2.0 +gatling_version=3.8.4 +mapstruct_version=1.5.3.Final +jackson_version=2.14.0 javax_xml_bind_version=2.3.3 javax_jaxb_core_version=2.3.0.1 javax_jaxb_runtime_version=2.3.4 javax_activation=1.1.1 -mockito_version=4.4.0 -slf4j_version=1.7.36 -logback_version=1.2.11 -oauth_jwt_version=3.19.0 -junit_version=5.8.2 -okhttp_version=4.9.3 -hsqldb_version=2.6.1 +mockito_version=4.8.1 +slf4j_version=2.0.3 +logback_version=1.4.4 +oauth_jwt_version=4.2.1 +junit_version=5.9.1 +okhttp_version=4.10.0 +hsqldb_version=2.7.1 kotlin.code.style=official org.gradle.vfs.watch=true diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 41d9927a4d4fb3f96a785543079b8df6723c946b..249e5832f090a2944b7473328c07c9755baa3196 100644 GIT binary patch delta 10197 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 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 00e33edef..ae04661ee 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index 1b6c78733..a69d9cb6c 100755 --- a/gradlew +++ b/gradlew @@ -205,6 +205,12 @@ set -- \ org.gradle.wrapper.GradleWrapperMain \ "$@" +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + # Use "xargs" to parse quoted args. # # With -n1 it outputs one arg per line, with the quotes and backslashes removed. diff --git a/gradlew.bat b/gradlew.bat index 107acd32c..f127cfd49 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -14,7 +14,7 @@ @rem limitations under the License. @rem -@if "%DEBUG%" == "" @echo off +@if "%DEBUG%"=="" @echo off @rem ########################################################################## @rem @rem Gradle startup script for Windows @@ -25,7 +25,7 @@ if "%OS%"=="Windows_NT" setlocal set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. +if "%DIRNAME%"=="" set DIRNAME=. set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% @@ -40,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto execute +if %ERRORLEVEL% equ 0 goto execute echo. echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. @@ -75,13 +75,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar :end @rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd +if %ERRORLEVEL% equ 0 goto mainEnd :fail rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% :mainEnd if "%OS%"=="Windows_NT" endlocal diff --git a/managementportal-client/build.gradle b/managementportal-client/build.gradle index ebb192415..4079955ff 100644 --- a/managementportal-client/build.gradle +++ b/managementportal-client/build.gradle @@ -9,8 +9,8 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile * See the file LICENSE in the root of this repository. */ plugins { - id 'org.jetbrains.kotlin.jvm' version "1.6.10" - id 'org.jetbrains.dokka' version "1.6.10" + id 'org.jetbrains.kotlin.jvm' version "1.7.20" + id 'org.jetbrains.dokka' version "1.7.20" id 'maven-publish' } @@ -20,8 +20,8 @@ targetCompatibility = JavaVersion.VERSION_11 description = "Kotlin ManagementPortal client" dependencies { - api("org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.10") - implementation("org.jetbrains.kotlin:kotlin-reflect:1.6.10") + api("org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.7.20") + implementation("org.jetbrains.kotlin:kotlin-reflect:1.7.20") api(project(":oauth-client-util")) implementation group: 'com.squareup.okhttp3', name: 'okhttp', version: okhttp_version diff --git a/oauth-client-util/build.gradle b/oauth-client-util/build.gradle index fe41b17ff..5a3390cc4 100644 --- a/oauth-client-util/build.gradle +++ b/oauth-client-util/build.gradle @@ -12,7 +12,7 @@ dependencies { testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-api', version: junit_version testImplementation group: 'com.github.tomakehurst', name: 'wiremock', version: '2.27.2' testImplementation group: 'org.mockito', name: 'mockito-core', version: mockito_version - testImplementation 'org.glassfish.jersey.core:jersey-common:2.35' + testImplementation 'org.glassfish.jersey.core:jersey-common:3.1.0' testRuntimeOnly group: 'org.slf4j', name: 'slf4j-simple', version: slf4j_version testRuntimeOnly group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: junit_version } diff --git a/oauth-client-util/src/test/java/org/radarbase/oauth/unit/OAuth2ClientTest.java b/oauth-client-util/src/test/java/org/radarbase/oauth/unit/OAuth2ClientTest.java index 9b847b7e9..7f9cbd34b 100644 --- a/oauth-client-util/src/test/java/org/radarbase/oauth/unit/OAuth2ClientTest.java +++ b/oauth-client-util/src/test/java/org/radarbase/oauth/unit/OAuth2ClientTest.java @@ -13,7 +13,7 @@ import org.radarbase.oauth.OAuth2AccessTokenDetails; import org.radarbase.oauth.OAuth2Client; -import javax.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.HttpHeaders; import java.net.MalformedURLException; import java.net.URL; import java.time.Duration; From ca13dd46d20786cda562147e00bb4c8082529077 Mon Sep 17 00:00:00 2001 From: Joris Borgdorff Date: Wed, 9 Nov 2022 13:02:32 +0100 Subject: [PATCH 386/431] Fix github output naming --- .github/workflows/main.yml | 22 +++++++++++----------- .github/workflows/pre-release.yml | 2 +- .github/workflows/release.yml | 2 +- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index de342e7ce..c5a456de8 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -28,7 +28,7 @@ jobs: - name: Get yarn cache directory path id: yarn-cache-dir-path - run: echo "dir=.yarn/cache" >> $GITHUB_OUTPUTS + run: echo "dir=.yarn/cache" >> $GITHUB_OUTPUT - uses: actions/setup-java@v3 with: @@ -107,7 +107,7 @@ jobs: id: docker_check_secret run: | echo "IS_DOCKER_SECRET_SET: ${{ secrets.DOCKERHUB_USERNAME != '' && secrets.DOCKERHUB_TOKEN != '' }}" - echo "IS_DOCKER_SECRET_SET=${{ secrets.DOCKERHUB_USERNAME != '' && secrets.DOCKERHUB_TOKEN != '' }}" >> $GITHUB_OUTPUTS + echo "IS_DOCKER_SECRET_SET=${{ secrets.DOCKERHUB_USERNAME != '' && secrets.DOCKERHUB_TOKEN != '' }}" >> $GITHUB_OUTPUT - name: Login to Docker Hub if: steps.docker_check_secret.outputs.IS_DOCKER_SECRET_SET == 'true' @@ -118,7 +118,7 @@ jobs: - name: Get yarn cache directory path id: yarn-cache-dir-path - run: echo "dir=.yarn/cache" >> $GITHUB_OUTPUTS + run: echo "dir=.yarn/cache" >> $GITHUB_OUTPUT - name: Cache Docker layers id: cache-buildx @@ -135,9 +135,9 @@ jobs: id: cache-parameters run: | if [ "${{ steps.cache-buildx.outputs.cache-hit }}" = "true" ]; then - echo "cache-to=" >> $GITHUB_OUTPUTS + echo "cache-to=" >> $GITHUB_OUTPUT else - echo "cache-to=type=local,dest=/tmp/.buildx-cache-new,mode=max" >> $GITHUB_OUTPUTS + echo "cache-to=type=local,dest=/tmp/.buildx-cache-new,mode=max" >> $GITHUB_OUTPUT fi - name: Use Node.js 16 @@ -166,13 +166,13 @@ jobs: id: docker_params run: | if [ "${{ github.event_name == 'pull_request' }}" = "true" ]; then - echo "push=false" >> $GITHUB_OUTPUTS - echo "load=true" >> $GITHUB_OUTPUTS - echo "platforms=linux/amd64" >> $GITHUB_OUTPUTS + echo "push=false" >> $GITHUB_OUTPUT + echo "load=true" >> $GITHUB_OUTPUT + echo "platforms=linux/amd64" >> $GITHUB_OUTPUT else - echo "push=true" >> $GITHUB_OUTPUTS - echo "load=false" >> $GITHUB_OUTPUTS - echo "platforms=linux/amd64,linux/arm64" >> $GITHUB_OUTPUTS + echo "push=true" >> $GITHUB_OUTPUT + echo "load=false" >> $GITHUB_OUTPUT + echo "platforms=linux/amd64,linux/arm64" >> $GITHUB_OUTPUT fi - name: Build docker diff --git a/.github/workflows/pre-release.yml b/.github/workflows/pre-release.yml index 8b4189e8d..046f08341 100644 --- a/.github/workflows/pre-release.yml +++ b/.github/workflows/pre-release.yml @@ -26,7 +26,7 @@ jobs: - name: Get yarn cache directory path id: yarn-cache-dir-path - run: echo "dir=.yarn/cache" >> $GITHUB_OUTPUTS + run: echo "dir=.yarn/cache" >> $GITHUB_OUTPUT - uses: actions/setup-java@v3 with: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 60fb67033..2e8421d74 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -25,7 +25,7 @@ jobs: - name: Get yarn cache directory path id: yarn-cache-dir-path - run: echo "dir=.yarn/cache" >> $GITHUB_OUTPUTS + run: echo "dir=.yarn/cache" >> $GITHUB_OUTPUT - uses: actions/setup-java@v3 with: From afcbe8ef61b277a03fb76dd076ba9e3b76a676ac Mon Sep 17 00:00:00 2001 From: Joris Borgdorff Date: Wed, 9 Nov 2022 16:08:59 +0100 Subject: [PATCH 387/431] Added organization fetching to MPClient --- .../radarbase/management/client/MPClient.kt | 26 ++++++++++++++----- .../management/client/MPOrganization.kt | 14 ++++++++++ .../radarbase/management/client/MPProject.kt | 2 +- 3 files changed, 35 insertions(+), 7 deletions(-) create mode 100644 managementportal-client/src/main/kotlin/org/radarbase/management/client/MPOrganization.kt diff --git a/managementportal-client/src/main/kotlin/org/radarbase/management/client/MPClient.kt b/managementportal-client/src/main/kotlin/org/radarbase/management/client/MPClient.kt index 6a8537b13..8f5e2c5af 100644 --- a/managementportal-client/src/main/kotlin/org/radarbase/management/client/MPClient.kt +++ b/managementportal-client/src/main/kotlin/org/radarbase/management/client/MPClient.kt @@ -62,6 +62,7 @@ class MPClient( .readTimeout(30, TimeUnit.SECONDS) .build() + private val organizationListReader: ObjectReader by lazy { this.objectMapper.readerForListOf(MPOrganization::class.java) } private val projectListReader: ObjectReader by lazy { this.objectMapper.readerForListOf(MPProject::class.java) } private val subjectListReader: ObjectReader by lazy { this.objectMapper.readerForListOf(MPSubject::class.java) } private val clientListReader: ObjectReader by lazy { this.objectMapper.readerForListOf(MPOAuthClient::class.java) } @@ -79,13 +80,26 @@ class MPClient( val validToken: OAuth2AccessTokenDetails get() = oauth2Client.validToken + /** Request list of organizations from ManagementPortal */ + fun requestOrganizations( + page: Int = 0, + size: Int = Int.MAX_VALUE, + ): List = request( + reader = organizationListReader, + urlBuilder = { + addPathSegments("api/organizations") + addQueryParameter("page", page.toString()) + addQueryParameter("size", size.toString()) + } + ) + /** Request list of projects from ManagementPortal. */ fun requestProjects( page: Int = 0, size: Int = Int.MAX_VALUE, ): List = request( - projectListReader, - { + reader = projectListReader, + urlBuilder = { addPathSegments("api/projects") addQueryParameter("page", page.toString()) addQueryParameter("size", size.toString()) @@ -100,8 +114,8 @@ class MPClient( page: Int = 0, size: Int = Int.MAX_VALUE, ): List = request>( - subjectListReader, - { + reader = subjectListReader, + urlBuilder = { addPathSegments("api/projects/$projectId/subjects") addQueryParameter("page", page.toString()) addQueryParameter("size", size.toString()) @@ -115,8 +129,8 @@ class MPClient( page: Int = 0, size: Int = Int.MAX_VALUE, ): List = request( - clientListReader, - { + reader = clientListReader, + urlBuilder = { addPathSegments("api/oauth-clients") addQueryParameter("page", page.toString()) addQueryParameter("size", size.toString()) diff --git a/managementportal-client/src/main/kotlin/org/radarbase/management/client/MPOrganization.kt b/managementportal-client/src/main/kotlin/org/radarbase/management/client/MPOrganization.kt new file mode 100644 index 000000000..8adadce28 --- /dev/null +++ b/managementportal-client/src/main/kotlin/org/radarbase/management/client/MPOrganization.kt @@ -0,0 +1,14 @@ +package org.radarbase.management.client + +import com.fasterxml.jackson.annotation.JsonProperty + +/** ManagementPortal Project DTO. */ +data class MPOrganization( + /** Organization id, a name that identifies it uniquely. */ + @JsonProperty("name") val id: String, + /** Where a project is organized. */ + val location: String? = null, + /** Project description. */ + val description: String? = null, + val projects: List = emptyList(), +) diff --git a/managementportal-client/src/main/kotlin/org/radarbase/management/client/MPProject.kt b/managementportal-client/src/main/kotlin/org/radarbase/management/client/MPProject.kt index 986f593cd..064891568 100644 --- a/managementportal-client/src/main/kotlin/org/radarbase/management/client/MPProject.kt +++ b/managementportal-client/src/main/kotlin/org/radarbase/management/client/MPProject.kt @@ -12,7 +12,7 @@ data class MPProject( /** Where a project is organized. */ val location: String? = null, /** Organization that organizes the project. */ - val organization: String? = null, + val organization: MPOrganization? = null, /** Project description. */ val description: String? = null, /** Any other attributes. */ From 6cd8515d3f8be3c24a2d57d2cba0fdb3292de5ce Mon Sep 17 00:00:00 2001 From: Joris Borgdorff Date: Thu, 10 Nov 2022 14:17:40 +0100 Subject: [PATCH 388/431] Fix tests --- .../kotlin/org/radarbase/management/client/MPClientTest.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/managementportal-client/src/test/kotlin/org/radarbase/management/client/MPClientTest.kt b/managementportal-client/src/test/kotlin/org/radarbase/management/client/MPClientTest.kt index d3fa47599..e16677649 100644 --- a/managementportal-client/src/test/kotlin/org/radarbase/management/client/MPClientTest.kt +++ b/managementportal-client/src/test/kotlin/org/radarbase/management/client/MPClientTest.kt @@ -145,7 +145,7 @@ class MPClientTest { "projectName": "p2", "humanReadableProjectName": "P2", "description": "d2", - "organization": "Mixed", + "organization": {"id": 1, "name": "Mixed"}, "location": "here", "startDate": "2021-06-07T02:02:00Z", "projectStatus": "ONGOING", @@ -184,7 +184,7 @@ class MPClientTest { id = "p2", name = "P2", description = "d2", - organization = "Mixed", + organization = MPOrganization(id = "Mixed"), location = "here", startDate = ZonedDateTime.of(2021, 6, 7, 2, 2, 0, 0, ZoneId.of("UTC")), projectStatus = "ONGOING", From c754f1e89538f8810a234b2a169a049e858285db Mon Sep 17 00:00:00 2001 From: Joris Borgdorff Date: Wed, 16 Nov 2022 13:05:59 +0100 Subject: [PATCH 389/431] Fix project/organization list permission check --- .../org/radarbase/management/service/OrganizationService.java | 2 +- .../java/org/radarbase/management/service/ProjectService.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/radarbase/management/service/OrganizationService.java b/src/main/java/org/radarbase/management/service/OrganizationService.java index f0c59490c..0144dbb30 100644 --- a/src/main/java/org/radarbase/management/service/OrganizationService.java +++ b/src/main/java/org/radarbase/management/service/OrganizationService.java @@ -69,7 +69,7 @@ public OrganizationDTO save(OrganizationDTO organizationDto) { public List findAll() { List organizationsOfUser; - if (token.hasGlobalAuthorityForPermission(ORGANIZATION_READ)) { + if (token.hasGlobalPermission(ORGANIZATION_READ)) { organizationsOfUser = organizationRepository.findAll(); } else { List projectNames = token.getReferentsWithPermission( diff --git a/src/main/java/org/radarbase/management/service/ProjectService.java b/src/main/java/org/radarbase/management/service/ProjectService.java index 39e0e8073..15c2451c2 100644 --- a/src/main/java/org/radarbase/management/service/ProjectService.java +++ b/src/main/java/org/radarbase/management/service/ProjectService.java @@ -70,7 +70,7 @@ public ProjectDTO save(ProjectDTO projectDto) { public Page findAll(Boolean fetchMinimal, Pageable pageable) { Page projects; - if (token.hasGlobalAuthorityForPermission(PROJECT_READ)) { + if (token.hasGlobalPermission(PROJECT_READ)) { projects = projectRepository.findAllWithEagerRelationships(pageable); } else { List projectNames = token.getReferentsWithPermission( From 7edc50a4d57f24dd67f72ea4bf5c71287d31b2d6 Mon Sep 17 00:00:00 2001 From: Peyman Mohtashami Date: Tue, 31 Jan 2023 13:52:19 +0100 Subject: [PATCH 390/431] Modify routes for org-admin --- .../organization/organization.component.html | 10 +++++----- .../organization/organization.component.ts | 3 ++- .../project/project-detail.component.html | 6 ++++++ .../project/project-detail.component.ts | 2 +- .../entities/source/general-source.route.ts | 6 +++--- .../webapp/app/shared/group/group.route.ts | 6 +++--- .../app/shared/source/source.component.html | 6 +++--- .../app/shared/source/source.component.ts | 6 +++--- .../webapp/app/shared/source/source.route.ts | 10 +++++----- .../app/shared/subject/subject.route.ts | 20 +++++++++---------- src/main/webapp/app/shared/util/sort-util.ts | 1 + src/main/webapp/i18n/en/project.json | 1 + 12 files changed, 43 insertions(+), 34 deletions(-) diff --git a/src/main/webapp/app/entities/organization/organization.component.html b/src/main/webapp/app/entities/organization/organization.component.html index f5a5a5d2b..b61362c50 100644 --- a/src/main/webapp/app/entities/organization/organization.component.html +++ b/src/main/webapp/app/entities/organization/organization.component.html @@ -13,11 +13,11 @@

    {{role.authorityName}} - {{role.authorityName}} - {{role.authorityName}} -
    -     		-
    - {{role.projectName || role.organizationName }} + {{role.authorityName}}: {{role.organizationName}} + {{role.authorityName}}: {{role.projectName}}
    		{{user.createdDate | date:'dd/MM/yy HH:mm'}}
    - - - - - + + + + + diff --git a/src/main/webapp/app/entities/organization/organization.component.ts b/src/main/webapp/app/entities/organization/organization.component.ts index 9a5d093f8..98b1e643a 100644 --- a/src/main/webapp/app/entities/organization/organization.component.ts +++ b/src/main/webapp/app/entities/organization/organization.component.ts @@ -16,7 +16,7 @@ import { }) export class OrganizationComponent implements OnInit, OnDestroy { organizations$: Observable; - private _sortOrder$ = new BehaviorSubject({predicate: 'id', ascending: true}); + private _sortOrder$ = new BehaviorSubject({predicate: 'name', ascending: true}); sortOrder$: Observable; subscriptions: Subscription = new Subscription(); @@ -45,6 +45,7 @@ export class OrganizationComponent implements OnInit, OnDestroy { } sort(order: SortOrder) { + console.log('sort', order); this._sortOrder$.next(order); } diff --git a/src/main/webapp/app/entities/project/project-detail.component.html b/src/main/webapp/app/entities/project/project-detail.component.html index 5b9dedb4e..71dcd1d74 100644 --- a/src/main/webapp/app/entities/project/project-detail.component.html +++ b/src/main/webapp/app/entities/project/project-detail.component.html @@ -62,6 +62,11 @@

    [translate]="'managementPortalApp.project.subjects'"> +
  • + + +
  • @@ -88,6 +93,7 @@

    + diff --git a/src/main/webapp/app/entities/project/project-detail.component.ts b/src/main/webapp/app/entities/project/project-detail.component.ts index ae65a4997..0de866fc3 100644 --- a/src/main/webapp/app/entities/project/project-detail.component.ts +++ b/src/main/webapp/app/entities/project/project-detail.component.ts @@ -94,7 +94,7 @@ export class ProjectDetailComponent implements OnInit, OnDestroy { private availableTabs(project: Project, account: Account): string[] { if (project && this.principal.accountHasAnyAuthority(account, ['ROLE_SYS_ADMIN', 'ROLE_ORGANIZATION_ADMIN:' + project.organization.name, 'ROLE_PROJECT_ADMIN:' + project.projectName])) { - return ['subjects', 'groups', 'permissions', 'admins', 'analysts']; + return ['subjects', 'sources', 'groups', 'permissions', 'admins', 'analysts']; } else { return []; } diff --git a/src/main/webapp/app/entities/source/general-source.route.ts b/src/main/webapp/app/entities/source/general-source.route.ts index 0fccaa619..1f16c5645 100644 --- a/src/main/webapp/app/entities/source/general-source.route.ts +++ b/src/main/webapp/app/entities/source/general-source.route.ts @@ -2,7 +2,7 @@ import { Routes } from '@angular/router'; import { UserRouteAccessService } from '../../shared'; -import { PROJECT_ADMIN, SYSTEM_ADMIN } from '../../shared/constants/common.constants'; +import {ORGANIZATION_ADMIN, PROJECT_ADMIN, SYSTEM_ADMIN} from '../../shared/constants/common.constants'; import { GeneralSourcePopupComponent } from './general-source-dialog.component'; import { GeneralSourceComponent } from './general-source.component'; import { ResolvePagingParams } from '../../shared/commons'; @@ -28,7 +28,7 @@ export const sourcePopupRoute: Routes = [ path: 'general-source-new', component: GeneralSourcePopupComponent, data: { - authorities: [SYSTEM_ADMIN, PROJECT_ADMIN], + authorities: [SYSTEM_ADMIN, ORGANIZATION_ADMIN, PROJECT_ADMIN], pageTitle: 'managementPortalApp.source.home.title', }, canActivate: [UserRouteAccessService], @@ -38,7 +38,7 @@ export const sourcePopupRoute: Routes = [ path: 'general-source/:sourceName/edit', component: GeneralSourcePopupComponent, data: { - authorities: [SYSTEM_ADMIN, PROJECT_ADMIN], + authorities: [SYSTEM_ADMIN, ORGANIZATION_ADMIN, PROJECT_ADMIN], pageTitle: 'managementPortalApp.source.home.title', }, canActivate: [UserRouteAccessService], diff --git a/src/main/webapp/app/shared/group/group.route.ts b/src/main/webapp/app/shared/group/group.route.ts index 6fe9f79e8..4dfe952af 100644 --- a/src/main/webapp/app/shared/group/group.route.ts +++ b/src/main/webapp/app/shared/group/group.route.ts @@ -2,7 +2,7 @@ import { Routes } from '@angular/router'; import {UserRouteAccessService} from "../auth/user-route-access-service"; import {GroupPopupComponent} from "./group-dialog.component"; import {GroupDeletePopupComponent} from "./group-delete-dialog.component"; -import {PROJECT_ADMIN, SYSTEM_ADMIN} from "../constants/common.constants"; +import {ORGANIZATION_ADMIN, PROJECT_ADMIN, SYSTEM_ADMIN} from "../constants/common.constants"; export const groupRoute: Routes = []; @@ -11,7 +11,7 @@ export const groupPopupRoute: Routes = [ path: 'project-group-new/:projectName', component: GroupPopupComponent, data: { - authorities: [SYSTEM_ADMIN, PROJECT_ADMIN], + authorities: [SYSTEM_ADMIN, ORGANIZATION_ADMIN, PROJECT_ADMIN], pageTitle: 'managementPortalApp.group.home.title', }, canActivate: [UserRouteAccessService], @@ -21,7 +21,7 @@ export const groupPopupRoute: Routes = [ path: 'project-group/:projectName/:id/delete', component: GroupDeletePopupComponent, data: { - authorities: [SYSTEM_ADMIN], + authorities: [SYSTEM_ADMIN, ORGANIZATION_ADMIN, PROJECT_ADMIN], pageTitle: 'managementPortalApp.group.home.title', }, canActivate: [UserRouteAccessService], diff --git a/src/main/webapp/app/shared/source/source.component.html b/src/main/webapp/app/shared/source/source.component.html index 7c76d352b..1e0a4ed59 100644 --- a/src/main/webapp/app/shared/source/source.component.html +++ b/src/main/webapp/app/shared/source/source.component.html @@ -19,7 +19,7 @@


    -
    +

    • @@ -61,7 +61,7 @@

    @@ -102,7 +102,7 @@

    -
    +
    {{entry.key}}: {{entry.value}}
    -
    +
    diff --git a/src/main/webapp/app/shared/source/source.component.ts b/src/main/webapp/app/shared/source/source.component.ts index f194c0ecc..7d22e0a54 100644 --- a/src/main/webapp/app/shared/source/source.component.ts +++ b/src/main/webapp/app/shared/source/source.component.ts @@ -33,7 +33,6 @@ export class SourceComponent implements OnInit, OnDestroy, OnChanges { set project(v: Project) { this.project$.next(v); } @Input() isProjectSpecific: boolean; - sources: Source[]; eventSubscriber: Subscription; itemsPerPage: number; links: any; @@ -45,13 +44,14 @@ export class SourceComponent implements OnInit, OnDestroy, OnChanges { routeData: any; previousPage: any; + _sources$: BehaviorSubject = new BehaviorSubject([]); + constructor( private sourceService: SourceService, private alertService: AlertService, private eventManager: EventManager, private activatedRoute: ActivatedRoute, private router: Router) { - this.sources = []; this.itemsPerPage = ITEMS_PER_PAGE; this.pagingParams$ = this.activatedRoute.data.pipe(map(data => { const fallback = { page: 1, predicate: 'id', ascending: true }; @@ -145,7 +145,7 @@ export class SourceComponent implements OnInit, OnDestroy, OnChanges { this.links = parseLinks(headers.get('link')); this.totalItems = headers.get('X-Total-Count'); this.queryCount = this.totalItems; - this.sources = data; + this._sources$.next(data); } loadPage(page) { diff --git a/src/main/webapp/app/shared/source/source.route.ts b/src/main/webapp/app/shared/source/source.route.ts index 48e0634ae..6304a65ff 100644 --- a/src/main/webapp/app/shared/source/source.route.ts +++ b/src/main/webapp/app/shared/source/source.route.ts @@ -2,7 +2,7 @@ import { Routes } from '@angular/router'; import { UserRouteAccessService } from '..'; -import { PROJECT_ADMIN, SYSTEM_ADMIN } from '../constants/common.constants'; +import {ORGANIZATION_ADMIN, PROJECT_ADMIN, SYSTEM_ADMIN} from '../constants/common.constants'; import { SourceDeletePopupComponent } from './source-delete-dialog.component'; import { SourceDetailComponent } from './source-detail.component'; @@ -13,7 +13,7 @@ export const sourceRoute: Routes = [ path: 'source/:sourceName', component: SourceDetailComponent, data: { - authorities: [SYSTEM_ADMIN, PROJECT_ADMIN], + authorities: [SYSTEM_ADMIN, ORGANIZATION_ADMIN, PROJECT_ADMIN], pageTitle: 'managementPortalApp.source.home.title', }, canActivate: [UserRouteAccessService], @@ -25,7 +25,7 @@ export const sourcePopupRoute: Routes = [ path: 'project-source-new/:projectName', component: SourcePopupComponent, data: { - authorities: [SYSTEM_ADMIN, PROJECT_ADMIN], + authorities: [SYSTEM_ADMIN, ORGANIZATION_ADMIN, PROJECT_ADMIN], pageTitle: 'managementPortalApp.source.home.title', }, canActivate: [UserRouteAccessService], @@ -35,7 +35,7 @@ export const sourcePopupRoute: Routes = [ path: 'project-source/:projectName/:sourceName/edit', component: SourcePopupComponent, data: { - authorities: [SYSTEM_ADMIN, PROJECT_ADMIN], + authorities: [SYSTEM_ADMIN, ORGANIZATION_ADMIN, PROJECT_ADMIN], pageTitle: 'managementPortalApp.source.home.title', }, canActivate: [UserRouteAccessService], @@ -45,7 +45,7 @@ export const sourcePopupRoute: Routes = [ path: 'source/:sourceName/delete', component: SourceDeletePopupComponent, data: { - authorities: [SYSTEM_ADMIN, PROJECT_ADMIN], + authorities: [SYSTEM_ADMIN, ORGANIZATION_ADMIN, PROJECT_ADMIN], pageTitle: 'managementPortalApp.source.home.title', }, canActivate: [UserRouteAccessService], diff --git a/src/main/webapp/app/shared/subject/subject.route.ts b/src/main/webapp/app/shared/subject/subject.route.ts index dbd3c54de..1a56ff653 100644 --- a/src/main/webapp/app/shared/subject/subject.route.ts +++ b/src/main/webapp/app/shared/subject/subject.route.ts @@ -2,7 +2,7 @@ import { Routes } from '@angular/router'; import { UserRouteAccessService } from '../../shared'; -import { PROJECT_ADMIN, SYSTEM_ADMIN } from '../constants/common.constants'; +import {ORGANIZATION_ADMIN, PROJECT_ADMIN, SYSTEM_ADMIN} from '../constants/common.constants'; import { SubjectSourceAssignerPopupComponent } from './source-assigner/source-assigner.component'; import { SubjectDeletePopupComponent } from './subject-delete-dialog.component'; import { SubjectDetailComponent } from './subject-detail.component'; @@ -17,7 +17,7 @@ export const subjectRoute: Routes = [ path: 'subject/:login', component: SubjectDetailComponent, data: { - authorities: [SYSTEM_ADMIN, PROJECT_ADMIN], + authorities: [SYSTEM_ADMIN, ORGANIZATION_ADMIN, PROJECT_ADMIN], pageTitle: 'managementPortalApp.subject.home.title', }, canActivate: [UserRouteAccessService], @@ -29,7 +29,7 @@ export const subjectRoute: Routes = [ 'pagingParams': ResolvePagingParams, }, data: { - authorities: [SYSTEM_ADMIN, PROJECT_ADMIN], + authorities: [SYSTEM_ADMIN, ORGANIZATION_ADMIN, PROJECT_ADMIN], pageTitle: 'managementPortalApp.subject.home.title', }, canActivate: [UserRouteAccessService], @@ -38,7 +38,7 @@ export const subjectRoute: Routes = [ path: 'subject/:login/revisions/:revisionNb', component: SubjectRevisionComponent, data: { - authorities: [SYSTEM_ADMIN, PROJECT_ADMIN], + authorities: [SYSTEM_ADMIN, ORGANIZATION_ADMIN, PROJECT_ADMIN], pageTitle: 'managementPortalApp.subject.home.title', }, canActivate: [UserRouteAccessService], @@ -50,7 +50,7 @@ export const subjectPopupRoute: Routes = [ path: 'project-subject-new/:projectName', component: SubjectPopupComponent, data: { - authorities: [SYSTEM_ADMIN, PROJECT_ADMIN], + authorities: [SYSTEM_ADMIN, ORGANIZATION_ADMIN, PROJECT_ADMIN], pageTitle: 'managementPortalApp.subject.home.title', }, canActivate: [UserRouteAccessService], @@ -60,7 +60,7 @@ export const subjectPopupRoute: Routes = [ path: 'project-subject/:projectName/:login/edit', component: SubjectPopupComponent, data: { - authorities: [SYSTEM_ADMIN, PROJECT_ADMIN], + authorities: [SYSTEM_ADMIN, ORGANIZATION_ADMIN, PROJECT_ADMIN], pageTitle: 'managementPortalApp.subject.home.title', }, canActivate: [UserRouteAccessService], @@ -70,7 +70,7 @@ export const subjectPopupRoute: Routes = [ path: 'subject/:login/delete', component: SubjectDeletePopupComponent, data: { - authorities: [SYSTEM_ADMIN], + authorities: [SYSTEM_ADMIN, ORGANIZATION_ADMIN, PROJECT_ADMIN], pageTitle: 'managementPortalApp.subject.home.title', }, canActivate: [UserRouteAccessService], @@ -80,7 +80,7 @@ export const subjectPopupRoute: Routes = [ path: 'subject/:login/pairApp', component: SubjectPairPopupComponent, data: { - authorities: [SYSTEM_ADMIN, PROJECT_ADMIN], + authorities: [SYSTEM_ADMIN, ORGANIZATION_ADMIN, PROJECT_ADMIN], pageTitle: 'managementPortalApp.subject.home.title', }, canActivate: [UserRouteAccessService], @@ -90,7 +90,7 @@ export const subjectPopupRoute: Routes = [ path: 'subject/:login/sources', component: SubjectSourceAssignerPopupComponent, data: { - authorities: [SYSTEM_ADMIN, PROJECT_ADMIN], + authorities: [SYSTEM_ADMIN, ORGANIZATION_ADMIN, PROJECT_ADMIN], pageTitle: 'managementPortalApp.subject.home.title', }, canActivate: [UserRouteAccessService], @@ -100,7 +100,7 @@ export const subjectPopupRoute: Routes = [ path: 'subject/:login/discontinue', component: SubjectDeletePopupComponent, data: { - authorities: [SYSTEM_ADMIN, PROJECT_ADMIN], + authorities: [SYSTEM_ADMIN, ORGANIZATION_ADMIN, PROJECT_ADMIN], pageTitle: 'managementPortalApp.subject.home.title', }, canActivate: [UserRouteAccessService], diff --git a/src/main/webapp/app/shared/util/sort-util.ts b/src/main/webapp/app/shared/util/sort-util.ts index 9f299cba2..6739db1aa 100644 --- a/src/main/webapp/app/shared/util/sort-util.ts +++ b/src/main/webapp/app/shared/util/sort-util.ts @@ -62,6 +62,7 @@ export class SortOrderImpl implements SortOrder { } export function regularSortOrder(defaultPredicate?: string): OperatorFunction { + console.log('regularSortOrder', defaultPredicate) return pipe( map(o => SortOrderImpl.from(o, defaultPredicate)), distinctSortOrder(), diff --git a/src/main/webapp/i18n/en/project.json b/src/main/webapp/i18n/en/project.json index 15192562c..8b6d3d2d7 100644 --- a/src/main/webapp/i18n/en/project.json +++ b/src/main/webapp/i18n/en/project.json @@ -27,6 +27,7 @@ "sourceType": "Source Type", "groups": "Groups", "subjects": "Subjects", + "sources": "Sources", "permissions": "Permissions", "admins": "Admins", "analysts": "Analysts", From ede27a579b6ea7ac6081b126577befe498f8c7fd Mon Sep 17 00:00:00 2001 From: Joris Borgdorff Date: Tue, 31 Jan 2023 16:28:20 +0100 Subject: [PATCH 391/431] Indent security configuration to see builder level --- .../config/OAuth2ServerConfiguration.java | 37 ++++++++++--------- 1 file changed, 19 insertions(+), 18 deletions(-) diff --git a/src/main/java/org/radarbase/management/config/OAuth2ServerConfiguration.java b/src/main/java/org/radarbase/management/config/OAuth2ServerConfiguration.java index 4c2c6e316..3c09d5ff1 100644 --- a/src/main/java/org/radarbase/management/config/OAuth2ServerConfiguration.java +++ b/src/main/java/org/radarbase/management/config/OAuth2ServerConfiguration.java @@ -135,31 +135,32 @@ public void configure(HttpSecurity http) throws Exception { .logoutSuccessHandler(logoutSuccessHandler) .and() .csrf() - .disable() + .disable() .addFilterBefore(jwtAuthenticationFilter(), UsernamePasswordAuthenticationFilter.class) .headers() - .frameOptions().disable() + .frameOptions() + .disable() .and() .sessionManagement() - .sessionCreationPolicy(SessionCreationPolicy.ALWAYS) + .sessionCreationPolicy(SessionCreationPolicy.ALWAYS) .and() .authorizeRequests() - .antMatchers("/oauth/**").permitAll() - .antMatchers(HttpMethod.OPTIONS, "/**").permitAll() - .antMatchers("/api/register").hasAnyAuthority( - RoleAuthority.SYS_ADMIN_AUTHORITY) - .antMatchers("/api/profile-info").permitAll() - .antMatchers("/api/**").authenticated() - // Allow management/health endpoint to all to allow kubernetes to be able to - // detect the health of the service - .antMatchers("/management/health").permitAll() - .antMatchers("/management/**").hasAnyAuthority( - RoleAuthority.SYS_ADMIN_AUTHORITY) - .antMatchers("/v2/api-docs/**").permitAll() - .antMatchers("/swagger-resources/configuration/ui").permitAll() - .antMatchers("/swagger-ui/index.html") - .hasAnyAuthority(RoleAuthority.SYS_ADMIN_AUTHORITY); + .antMatchers("/oauth/**").permitAll() + .antMatchers(HttpMethod.OPTIONS, "/**").permitAll() + .antMatchers("/api/register") + .hasAnyAuthority(RoleAuthority.SYS_ADMIN_AUTHORITY) + .antMatchers("/api/profile-info").permitAll() + .antMatchers("/api/**").authenticated() + // Allow management/health endpoint to all to allow kubernetes to be able to + // detect the health of the service + .antMatchers("/management/health").permitAll() + .antMatchers("/management/**") + .hasAnyAuthority(RoleAuthority.SYS_ADMIN_AUTHORITY) + .antMatchers("/v2/api-docs/**").permitAll() + .antMatchers("/swagger-resources/configuration/ui").permitAll() + .antMatchers("/swagger-ui/index.html") + .hasAnyAuthority(RoleAuthority.SYS_ADMIN_AUTHORITY); } @Override From b832ab1dfa45d42abcaaf6c069c7180950b2989c Mon Sep 17 00:00:00 2001 From: Peyman Mohtashami Date: Tue, 31 Jan 2023 17:20:22 +0100 Subject: [PATCH 392/431] Fix changing project's organization --- .../entities/project/project-dialog.component.html | 2 +- .../entities/project/project-dialog.component.ts | 14 +++++++++++--- .../app/entities/source-type/source-type.route.ts | 3 ++- 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/src/main/webapp/app/entities/project/project-dialog.component.html b/src/main/webapp/app/entities/project/project-dialog.component.html index 0de0ede5d..b065cc3f6 100644 --- a/src/main/webapp/app/entities/project/project-dialog.component.html +++ b/src/main/webapp/app/entities/project/project-dialog.component.html @@ -74,7 +74,7 @@ for="field_organization">
    diff --git a/src/main/webapp/app/entities/project/project-dialog.component.ts b/src/main/webapp/app/entities/project/project-dialog.component.ts index c6c39e696..fe949f6ff 100644 --- a/src/main/webapp/app/entities/project/project-dialog.component.ts +++ b/src/main/webapp/app/entities/project/project-dialog.component.ts @@ -19,7 +19,7 @@ import { EventManager } from '../../shared/util/event-manager.service'; import { SourceType, SourceTypeService } from '../source-type'; import { ProjectPopupService } from './project-popup.service'; -import { GroupService, OrganizationService, Project, ProjectService } from '../../shared'; +import {GroupService, Organization, OrganizationService, Project, ProjectService} from '../../shared'; import { ObservablePopupComponent } from '../../shared/util/observable-popup.component'; @Component({ @@ -32,6 +32,8 @@ export class ProjectDialogComponent implements OnInit, OnDestroy { readonly options: string[]; organizationName: string; + organizations: Organization[]; + project: Project; projectCopy: Project; isSaving: boolean; @@ -79,7 +81,7 @@ export class ProjectDialogComponent implements OnInit, OnDestroy { constructor( public activeModal: NgbActiveModal, private alertService: AlertService, - public organizationService: OrganizationService, + private organizationService: OrganizationService, private projectService: ProjectService, private sourceTypeService: SourceTypeService, private eventManager: EventManager, @@ -94,6 +96,9 @@ export class ProjectDialogComponent implements OnInit, OnDestroy { } ngOnInit() { + const organizationSubscription = this.organizationService.organizations$.subscribe(organizations => this.organizations = organizations) + this.subscriptions.add(organizationSubscription); + this.projectCopy = Object.assign({}, this.project) if(this.projectCopy.startDate) { this.startDate = this.formatter.parse(this.projectCopy.startDate.toString()); @@ -120,13 +125,16 @@ export class ProjectDialogComponent implements OnInit, OnDestroy { if (this.endDate && this.calendar.isValid(NgbDate.from(this.endDate))) { this.projectCopy.endDate = this.formatter.format(this.endDate) + 'T23:59'; } - const updatedProject = {...this.projectCopy, organization: {name: this.organizationName}}; if (this.projectCopy.id !== undefined) { + const organization = this.organizations.find(o => o.name === this.projectCopy.organization.name) + const updatedProject = {...this.projectCopy, organization}; this.subscriptions.add(this.projectService.update(updatedProject).subscribe( (res: Project) => this.onSaveSuccess(res), (res: Response) => this.onSaveError(res), )); } else { + const organization = this.organizations.find(o => o.name === this.organizationName) + const updatedProject = {...this.projectCopy, organization}; this.subscriptions.add(this.projectService.create(updatedProject).subscribe( (res: Project) => this.onSaveSuccess(res), (res: Response) => this.onSaveError(res), diff --git a/src/main/webapp/app/entities/source-type/source-type.route.ts b/src/main/webapp/app/entities/source-type/source-type.route.ts index 890f75adc..1242518be 100644 --- a/src/main/webapp/app/entities/source-type/source-type.route.ts +++ b/src/main/webapp/app/entities/source-type/source-type.route.ts @@ -22,7 +22,8 @@ export const sourceTypeRoute: Routes = [ pageTitle: 'managementPortalApp.sourceType.home.title', }, canActivate: [UserRouteAccessService], - }, { + }, + { path: 'source-type/:sourceTypeProducer/:sourceTypeModel/:catalogVersion', component: SourceTypeDetailComponent, data: { From bbbbc35558a8c8f678b00dbfd734e655ac710286 Mon Sep 17 00:00:00 2001 From: Peyman Mohtashami Date: Tue, 31 Jan 2023 18:28:57 +0100 Subject: [PATCH 393/431] Restrict the user to remove his/her role --- .../app/shared/group/group-delete-dialog.component.html | 1 + .../webapp/app/shared/permission/permission.component.html | 4 ++-- .../webapp/app/shared/permission/permission.component.ts | 6 +++--- src/main/webapp/i18n/en/group.json | 3 ++- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/main/webapp/app/shared/group/group-delete-dialog.component.html b/src/main/webapp/app/shared/group/group-delete-dialog.component.html index 503dc5547..cfbb69e23 100644 --- a/src/main/webapp/app/shared/group/group-delete-dialog.component.html +++ b/src/main/webapp/app/shared/group/group-delete-dialog.component.html @@ -5,6 +5,7 @@

    +

    diff --git a/src/main/webapp/app/shared/permission/permission.component.html b/src/main/webapp/app/shared/permission/permission.component.html index a8d20e8b1..01709bb63 100644 --- a/src/main/webapp/app/shared/permission/permission.component.html +++ b/src/main/webapp/app/shared/permission/permission.component.html @@ -1,4 +1,4 @@ -
    +

    @@ -21,7 +21,7 @@

    diff --git a/src/main/webapp/app/shared/permission/permission.component.ts b/src/main/webapp/app/shared/permission/permission.component.ts index a1df4e145..943e7cff2 100644 --- a/src/main/webapp/app/shared/permission/permission.component.ts +++ b/src/main/webapp/app/shared/permission/permission.component.ts @@ -1,6 +1,6 @@ import { ChangeDetectorRef, Component, Input, OnChanges, OnDestroy, OnInit, SimpleChanges, } from '@angular/core'; import { Role } from '../../admin/user-management/role.model'; -import { BehaviorSubject, combineLatest, Observable, of, Subscription } from 'rxjs'; +import { combineLatest, Observable, of, Subscription } from 'rxjs'; import { Project } from '../project'; import { AuthorityService } from '../user/authority.service'; import { AlertService } from '../util/alert.service'; @@ -10,7 +10,7 @@ import { User } from '../user/user.model'; import { Organization } from '../organization'; import { UserService } from '../user/user.service'; import { Authority, Scope } from '../user/authority.model'; -import { distinctUntilChanged, first, map, switchMap, tap, combineAll } from 'rxjs/operators'; +import { distinctUntilChanged, first, map, switchMap, tap } from 'rxjs/operators'; import { Principal } from '../auth/principal.service'; interface UserRole { @@ -43,7 +43,7 @@ export class PermissionComponent implements OnInit, OnChanges, OnDestroy { private eventManager: EventManager, private userService: UserService, private changeDetectorRef: ChangeDetectorRef, - private principal: Principal, + public principal: Principal, ) {} ngOnInit() { diff --git a/src/main/webapp/i18n/en/group.json b/src/main/webapp/i18n/en/group.json index 9091874a8..3fbf6c250 100644 --- a/src/main/webapp/i18n/en/group.json +++ b/src/main/webapp/i18n/en/group.json @@ -10,7 +10,8 @@ "updated": "A Group is updated with identifier {{ param }}", "deleted": "A Group is deleted with identifier {{ param }}", "delete": { - "question": "This group has subjects, are you sure you want to delete Group {{ id }}?" + "warning": "This group has subjects.", + "question": "Are you sure you want to delete Group {{ id }}?" }, "detail": { "title": "Group" From 8b55bea6b025395941b10b91f38d4a353bb630ca Mon Sep 17 00:00:00 2001 From: Joris Borgdorff Date: Wed, 1 Feb 2023 10:48:41 +0100 Subject: [PATCH 394/431] Fix permissions in SubjectResource --- .../radarbase/management/domain/Subject.java | 19 ++ .../service/OrganizationService.java | 46 ++++ .../management/service/SubjectService.java | 110 +++++++--- .../management/web/rest/SubjectResource.java | 196 ++++++++---------- .../management/web/rest/UserResource.java | 9 +- src/main/webapp/i18n/nl/group.json | 3 +- src/main/webapp/i18n/nl/project.json | 3 +- .../web/rest/SubjectResourceIntTest.java | 5 + 8 files changed, 243 insertions(+), 148 deletions(-) diff --git a/src/main/java/org/radarbase/management/domain/Subject.java b/src/main/java/org/radarbase/management/domain/Subject.java index 946fd727d..c481da8e4 100644 --- a/src/main/java/org/radarbase/management/domain/Subject.java +++ b/src/main/java/org/radarbase/management/domain/Subject.java @@ -32,6 +32,7 @@ import java.io.Serializable; import java.time.LocalDate; import java.time.ZonedDateTime; +import java.util.Comparator; import java.util.HashMap; import java.util.HashSet; import java.util.Map; @@ -39,6 +40,7 @@ import java.util.Optional; import java.util.Set; +import static org.radarbase.auth.authorization.RoleAuthority.INACTIVE_PARTICIPANT; import static org.radarbase.auth.authorization.RoleAuthority.PARTICIPANT; /** @@ -51,6 +53,9 @@ @EntityListeners({AbstractEntityListener.class}) public class Subject extends AbstractEntity implements Serializable { private static final long serialVersionUID = 1L; + private static final Set PARTICIPANT_TYPES = Set.of( + PARTICIPANT.authority(), + INACTIVE_PARTICIPANT.authority()); @Id @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "sequenceGenerator") @@ -239,6 +244,20 @@ public Optional getActiveProject() { .map(Role::getProject); } + /** + * Get the active project of a subject, and otherwise the + * inactive project. + * @return the project a subject belongs to, if any. + */ + public Optional getAssociatedProject() { + return this.getUser().getRoles().stream() + .filter(r -> PARTICIPANT_TYPES.contains(r.getAuthority().getName())) + .sorted(Comparator.comparing(r -> r.getAuthority().getName()) + .reversed()) + .findFirst() + .map(Role::getProject); + } + @Override public boolean equals(Object o) { if (this == o) { diff --git a/src/main/java/org/radarbase/management/service/OrganizationService.java b/src/main/java/org/radarbase/management/service/OrganizationService.java index 0144dbb30..ddf2072c2 100644 --- a/src/main/java/org/radarbase/management/service/OrganizationService.java +++ b/src/main/java/org/radarbase/management/service/OrganizationService.java @@ -1,6 +1,8 @@ package org.radarbase.management.service; +import org.radarbase.auth.authorization.Permission; import org.radarbase.auth.authorization.RoleAuthority; +import org.radarbase.auth.exception.NotAuthorizedException; import org.radarbase.auth.token.RadarToken; import org.radarbase.management.domain.Organization; import org.radarbase.management.repository.OrganizationRepository; @@ -22,6 +24,8 @@ import java.util.stream.Stream; import static org.radarbase.auth.authorization.Permission.ORGANIZATION_READ; +import static org.radarbase.auth.authorization.RadarAuthorization.checkPermissionOnProject; +import static org.radarbase.auth.authorization.RadarAuthorization.checkPermissionOnSubject; /** * Service Implementation for managing Organization. @@ -119,4 +123,46 @@ public List findAllProjectsByOrganizationName(String organizationNam .map(projectMapper::projectToProjectDTO) .collect(Collectors.toList()); } + + /** + * Checks the permission of a project, also taking into + * account the organization that a project belongs to. + * @param permission permission to check + * @param projectName project name to check + * @throws NotAuthorizedException if the current user is not authorized. + */ + public void checkPermissionByProject(Permission permission, String projectName) + throws NotAuthorizedException { + if (token.hasPermissionOnProject(permission, projectName)) { + return; + } + if (hasPermissionOnOrganization(permission, projectName)) { + return; + } + checkPermissionOnProject(token, permission, projectName); + } + + /** + * Checks the permission of a subject, also taking into + * account the organization that a project belongs to. + * @param permission permission to check + * @param projectName project name to check + * @param subject subject login to check + * @throws NotAuthorizedException if the current user is not authorized. + */ + public void checkPermissionBySubject(Permission permission, String projectName, String subject) + throws NotAuthorizedException { + if (token.hasPermissionOnSubject(permission, projectName, subject)) { + return; + } + if (hasPermissionOnOrganization(permission, projectName)) { + return; + } + checkPermissionOnSubject(token, permission, projectName, subject); + } + + private boolean hasPermissionOnOrganization(Permission permission, String projectName) { + return organizationRepository.findAllByProjectNames(List.of(projectName)).stream() + .anyMatch(o -> token.hasPermissionOnOrganization(permission, o.getName())); + } } diff --git a/src/main/java/org/radarbase/management/service/SubjectService.java b/src/main/java/org/radarbase/management/service/SubjectService.java index cf0ed8ca8..f9760d491 100644 --- a/src/main/java/org/radarbase/management/service/SubjectService.java +++ b/src/main/java/org/radarbase/management/service/SubjectService.java @@ -1,36 +1,10 @@ package org.radarbase.management.service; -import static org.radarbase.auth.authorization.RoleAuthority.INACTIVE_PARTICIPANT; -import static org.radarbase.auth.authorization.RoleAuthority.PARTICIPANT; -import static org.radarbase.management.service.dto.ProjectDTO.PRIVACY_POLICY_URL; -import static org.radarbase.management.web.rest.errors.EntityName.GROUP; -import static org.radarbase.management.web.rest.errors.EntityName.OAUTH_CLIENT; -import static org.radarbase.management.web.rest.errors.EntityName.SOURCE_TYPE; -import static org.radarbase.management.web.rest.errors.EntityName.SUBJECT; -import static org.radarbase.management.web.rest.errors.ErrorConstants.ERR_GROUP_NOT_FOUND; -import static org.radarbase.management.web.rest.errors.ErrorConstants.ERR_NO_VALID_PRIVACY_POLICY_URL_CONFIGURED; -import static org.radarbase.management.web.rest.errors.ErrorConstants.ERR_SOURCE_NOT_FOUND; -import static org.radarbase.management.web.rest.errors.ErrorConstants.ERR_SUBJECT_NOT_FOUND; - -import java.net.MalformedURLException; -import java.net.URL; -import java.time.ZonedDateTime; -import java.util.Collections; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Optional; -import java.util.Set; -import java.util.function.Function; -import java.util.function.Predicate; -import java.util.stream.Collectors; -import java.util.stream.Stream; - -import javax.annotation.Nonnull; - import org.hibernate.envers.query.AuditEntity; +import org.radarbase.auth.authorization.Permission; import org.radarbase.auth.authorization.RoleAuthority; +import org.radarbase.auth.exception.NotAuthorizedException; +import org.radarbase.auth.token.RadarToken; import org.radarbase.management.config.ManagementPortalProperties; import org.radarbase.management.domain.Authority; import org.radarbase.management.domain.Group; @@ -42,6 +16,7 @@ import org.radarbase.management.domain.User; import org.radarbase.management.repository.AuthorityRepository; import org.radarbase.management.repository.GroupRepository; +import org.radarbase.management.repository.ProjectRepository; import org.radarbase.management.repository.RoleRepository; import org.radarbase.management.repository.SourceRepository; import org.radarbase.management.repository.SubjectRepository; @@ -66,6 +41,38 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import javax.annotation.Nonnull; +import java.net.MalformedURLException; +import java.net.URL; +import java.time.ZonedDateTime; +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Optional; +import java.util.Set; +import java.util.function.Function; +import java.util.function.Predicate; +import java.util.stream.Collectors; +import java.util.stream.Stream; + +import static org.radarbase.auth.authorization.Permission.SUBJECT_READ; +import static org.radarbase.auth.authorization.RadarAuthorization.checkGlobalPermission; +import static org.radarbase.auth.authorization.RadarAuthorization.checkPermission; +import static org.radarbase.auth.authorization.RadarAuthorization.checkPermissionOnOrganizationAndProject; +import static org.radarbase.auth.authorization.RoleAuthority.INACTIVE_PARTICIPANT; +import static org.radarbase.auth.authorization.RoleAuthority.PARTICIPANT; +import static org.radarbase.management.service.dto.ProjectDTO.PRIVACY_POLICY_URL; +import static org.radarbase.management.web.rest.errors.EntityName.GROUP; +import static org.radarbase.management.web.rest.errors.EntityName.OAUTH_CLIENT; +import static org.radarbase.management.web.rest.errors.EntityName.SOURCE_TYPE; +import static org.radarbase.management.web.rest.errors.EntityName.SUBJECT; +import static org.radarbase.management.web.rest.errors.ErrorConstants.ERR_GROUP_NOT_FOUND; +import static org.radarbase.management.web.rest.errors.ErrorConstants.ERR_NO_VALID_PRIVACY_POLICY_URL_CONFIGURED; +import static org.radarbase.management.web.rest.errors.ErrorConstants.ERR_SOURCE_NOT_FOUND; +import static org.radarbase.management.web.rest.errors.ErrorConstants.ERR_SUBJECT_NOT_FOUND; + /** * Created by nivethika on 26-5-17. */ @@ -108,6 +115,14 @@ public class SubjectService { @Autowired private AuthorityRepository authorityRepository; + @Autowired + private ProjectRepository projectRepository; + + @Autowired + private RadarToken token; + @Autowired + private OrganizationService organizationService; + /** * Create a new subject. * @@ -437,13 +452,18 @@ public List findSubjectSourcesFromRevisions(Subject sub * @throws NotFoundException if there was no subject with the given login at the given * revision number */ - public SubjectDTO findRevision(String login, Integer revision) throws NotFoundException { + public SubjectDTO findRevision(String login, Integer revision) + throws NotFoundException, NotAuthorizedException { + checkPermission(token, SUBJECT_READ); // first get latest known version of the subject, if it's deleted we can't load the entity // directly by e.g. findOneByLogin SubjectDTO latest = getLatestRevision(login); + organizationService.checkPermissionBySubject(SUBJECT_READ, + latest.getProject().getProjectName(), latest.getLogin()); SubjectDTO sub = revisionService .findRevision(revision, latest.getId(), Subject.class, subjectMapper::subjectToSubjectReducedProjectDTO); + if (sub == null) { throw new NotFoundException("subject not found for given login and revision.", SUBJECT, ERR_SUBJECT_NOT_FOUND, Collections.singletonMap("subjectLogin", login)); @@ -536,4 +556,34 @@ protected URL getPrivacyPolicyUrl(Subject subject) { } } + /** + * Check that the current user is authorized for the given subject. This takes + * into account project and organization affiliation. + * @param permission permission to check + * @param subject subject to check + * @param active if true, only check active project, otherwise also inactive. + * @return the project associated to the subject, if any. + * @throws NotAuthorizedException if the current user is not authorized. + */ + public Optional checkSubjectProject(Permission permission, Subject subject, + boolean active) throws NotAuthorizedException { + Optional project = (active ? subject.getActiveProject() + : subject.getAssociatedProject()) + .flatMap(p -> projectRepository.findByIdWithOrganization(p.getId())); + + if (project.isPresent()) { + Project p = project.get(); + String projectName = p.getProjectName(); + if (!token.hasPermissionOnSubject(permission, projectName, + subject.getUser().getLogin())) { + String organizationName = p.getOrganization().getName(); + checkPermissionOnOrganizationAndProject(token, permission, organizationName, + projectName); + } + } else { + checkGlobalPermission(token, permission); + } + + return project; + } } diff --git a/src/main/java/org/radarbase/management/web/rest/SubjectResource.java b/src/main/java/org/radarbase/management/web/rest/SubjectResource.java index ecf63d749..2f09cdfad 100644 --- a/src/main/java/org/radarbase/management/web/rest/SubjectResource.java +++ b/src/main/java/org/radarbase/management/web/rest/SubjectResource.java @@ -1,34 +1,5 @@ package org.radarbase.management.web.rest; -import static tech.jhipster.web.util.ResponseUtil.wrapOrNotFound; -import static org.radarbase.auth.authorization.RoleAuthority.PARTICIPANT; -import static org.radarbase.auth.authorization.Permission.SUBJECT_CREATE; -import static org.radarbase.auth.authorization.Permission.SUBJECT_DELETE; -import static org.radarbase.auth.authorization.Permission.SUBJECT_READ; -import static org.radarbase.auth.authorization.Permission.SUBJECT_UPDATE; -import static org.radarbase.auth.authorization.RadarAuthorization.checkPermissionOnProject; -import static org.radarbase.auth.authorization.RadarAuthorization.checkPermissionOnSubject; -import static org.radarbase.management.web.rest.errors.EntityName.SOURCE; -import static org.radarbase.management.web.rest.errors.EntityName.SOURCE_TYPE; -import static org.radarbase.management.web.rest.errors.EntityName.SUBJECT; -import static org.radarbase.management.web.rest.errors.EntityName.PROJECT; -import static org.radarbase.management.web.rest.errors.ErrorConstants.ERR_ACTIVE_PARTICIPANT_PROJECT_NOT_FOUND; -import static org.radarbase.management.web.rest.errors.ErrorConstants.ERR_SOURCE_TYPE_NOT_PROVIDED; -import static org.radarbase.management.web.rest.errors.ErrorConstants.ERR_SUBJECT_NOT_FOUND; -import static org.radarbase.management.web.rest.errors.ErrorConstants.ERR_VALIDATION; - -import java.net.URISyntaxException; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.NoSuchElementException; -import java.util.Objects; -import java.util.Optional; -import java.util.stream.Collectors; -import java.util.stream.Stream; -import javax.validation.Valid; - import io.micrometer.core.annotation.Timed; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.responses.ApiResponse; @@ -43,6 +14,7 @@ import org.radarbase.management.repository.ProjectRepository; import org.radarbase.management.repository.SubjectRepository; import org.radarbase.management.security.SecurityUtils; +import org.radarbase.management.service.OrganizationService; import org.radarbase.management.service.ResourceUriService; import org.radarbase.management.service.RevisionService; import org.radarbase.management.service.SourceService; @@ -78,6 +50,33 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; +import javax.validation.Valid; +import java.net.URISyntaxException; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.NoSuchElementException; +import java.util.Objects; +import java.util.Optional; +import java.util.stream.Collectors; +import java.util.stream.Stream; + +import static org.radarbase.auth.authorization.Permission.SUBJECT_CREATE; +import static org.radarbase.auth.authorization.Permission.SUBJECT_DELETE; +import static org.radarbase.auth.authorization.Permission.SUBJECT_READ; +import static org.radarbase.auth.authorization.Permission.SUBJECT_UPDATE; +import static org.radarbase.auth.authorization.RadarAuthorization.checkPermission; +import static org.radarbase.auth.authorization.RoleAuthority.PARTICIPANT; +import static org.radarbase.management.web.rest.errors.EntityName.SOURCE; +import static org.radarbase.management.web.rest.errors.EntityName.SOURCE_TYPE; +import static org.radarbase.management.web.rest.errors.EntityName.SUBJECT; +import static org.radarbase.management.web.rest.errors.ErrorConstants.ERR_ACTIVE_PARTICIPANT_PROJECT_NOT_FOUND; +import static org.radarbase.management.web.rest.errors.ErrorConstants.ERR_SOURCE_TYPE_NOT_PROVIDED; +import static org.radarbase.management.web.rest.errors.ErrorConstants.ERR_SUBJECT_NOT_FOUND; +import static org.radarbase.management.web.rest.errors.ErrorConstants.ERR_VALIDATION; +import static tech.jhipster.web.util.ResponseUtil.wrapOrNotFound; + /** * REST controller for managing Subject. */ @@ -113,6 +112,8 @@ public class SubjectResource { @Autowired private SourceService sourceService; + @Autowired + private OrganizationService organizationService; /** * POST /subjects : Create a new subject. @@ -127,33 +128,23 @@ public class SubjectResource { public ResponseEntity createSubject(@RequestBody SubjectDTO subjectDto) throws URISyntaxException, NotAuthorizedException { log.debug("REST request to save Subject : {}", subjectDto); - if (subjectDto.getProject() == null || subjectDto.getProject().getId() == null) { - return ResponseEntity.badRequest().headers(HeaderUtil - .createFailureAlert(SUBJECT, "projectrequired", - "A subject should be assigned to a project")).build(); - } - checkPermissionOnProject(token, SUBJECT_CREATE, - subjectDto.getProject().getProjectName()); + + String projectName = getProjectName(subjectDto); + organizationService.checkPermissionByProject(SUBJECT_CREATE, projectName); if (subjectDto.getId() != null) { - return ResponseEntity.badRequest().headers(HeaderUtil - .createFailureAlert(SUBJECT, "idexists", - "A new subject cannot already have an ID")).build(); + throw new BadRequestException("A new subject cannot already have an ID", + SUBJECT, "idexists"); } if (subjectDto.getLogin() == null) { - return ResponseEntity.badRequest().headers(HeaderUtil - .createFailureAlert(SUBJECT, "loginrequired", - "A subject login is required")) - .build(); + throw new BadRequestException("A subject login is required", SUBJECT, "loginrequired"); } - if (subjectDto.getExternalId() != null && !subjectDto.getExternalId().isEmpty() - && subjectRepository.findOneByProjectNameAndExternalId(subjectDto.getProject() - .getProjectName(), subjectDto.getExternalId()).isPresent()) { - return ResponseEntity.badRequest().headers(HeaderUtil - .createFailureAlert(SUBJECT, "subjectExists", - "A subject with given project-id and" - + "external-id already exists")) - .build(); + if (subjectDto.getExternalId() != null + && !subjectDto.getExternalId().isEmpty() + && subjectRepository.findOneByProjectNameAndExternalId( + projectName, subjectDto.getExternalId()).isPresent()) { + throw new BadRequestException("A subject with given project-id and" + + "external-id already exists", SUBJECT, "subjectExists"); } SubjectDTO result = subjectService.createSubject(subjectDto); @@ -162,6 +153,18 @@ public ResponseEntity createSubject(@RequestBody SubjectDTO subjectD .body(result); } + private String getProjectName(SubjectDTO subjectDto) { + if ( + subjectDto.getProject() == null + || subjectDto.getProject().getId() == null + || subjectDto.getProject().getProjectName() == null + ) { + throw new BadRequestException("A subject should be assigned to a project", SUBJECT, + "projectrequired"); + } + return subjectDto.getProject().getProjectName(); + } + /** * PUT /subjects : Updates an existing subject. * @@ -176,16 +179,12 @@ public ResponseEntity createSubject(@RequestBody SubjectDTO subjectD public ResponseEntity updateSubject(@RequestBody SubjectDTO subjectDto) throws URISyntaxException, NotAuthorizedException { log.debug("REST request to update Subject : {}", subjectDto); - if (subjectDto.getProject() == null || subjectDto.getProject().getId() == null) { - return ResponseEntity.badRequest().headers(HeaderUtil - .createFailureAlert(SUBJECT, "projectrequired", - "A subject should be assigned to a project")).body(null); - } + String projectName = getProjectName(subjectDto); + organizationService.checkPermissionBySubject(SUBJECT_UPDATE, + projectName, subjectDto.getLogin()); if (subjectDto.getId() == null) { return createSubject(subjectDto); } - checkPermissionOnSubject(token, SUBJECT_UPDATE, - subjectDto.getProject().getProjectName(), subjectDto.getLogin()); SubjectDTO result = subjectService.updateSubject(subjectDto); return ResponseEntity.ok() .headers(HeaderUtil.createEntityUpdateAlert(SUBJECT, subjectDto.getLogin())) @@ -207,18 +206,12 @@ public ResponseEntity discontinueSubject(@RequestBody SubjectDTO sub throws NotAuthorizedException { log.debug("REST request to update Subject : {}", subjectDto); if (subjectDto.getId() == null) { - return ResponseEntity.badRequest().headers(HeaderUtil - .createFailureAlert(SUBJECT, "subjectNotAvailable", "No subject found")) - .body(null); + throw new BadRequestException("No subject found", SUBJECT, "subjectNotAvailable"); } - if (subjectDto.getProject() == null || subjectDto.getProject().getId() == null) { - return ResponseEntity.badRequest().headers(HeaderUtil - .createFailureAlert(SUBJECT, "projectrequired", - "A subject should be assigned to a project")).body(null); - } - checkPermissionOnSubject(token, SUBJECT_UPDATE, - subjectDto.getProject().getProjectName(), subjectDto.getLogin()); + String projectName = getProjectName(subjectDto); + organizationService.checkPermissionBySubject(SUBJECT_UPDATE, + projectName, subjectDto.getLogin()); // In principle this is already captured by the PostUpdate event listener, adding this // event just makes it more clear a subject was discontinued. @@ -241,11 +234,11 @@ public ResponseEntity discontinueSubject(@RequestBody SubjectDTO sub public ResponseEntity> getAllSubjects( @Valid SubjectCriteria subjectCriteria ) throws NotAuthorizedException { - String projectName = subjectCriteria.getProjectName(); - checkPermissionOnProject(token, SUBJECT_READ, projectName); if (!token.isClientCredentials() && token.hasAuthority(PARTICIPANT)) { throw new NotAuthorizedException("Cannot list subjects as a participant."); } + String projectName = subjectCriteria.getProjectName(); + organizationService.checkPermissionByProject(SUBJECT_READ, projectName); String externalId = subjectCriteria.getExternalId(); log.debug("ProjectName {} and external {}", projectName, externalId); @@ -291,14 +284,9 @@ public ResponseEntity> getAllSubjects( public ResponseEntity getSubject(@PathVariable String login) throws NotAuthorizedException { log.debug("REST request to get Subject : {}", login); + checkPermission(token, SUBJECT_READ); Subject subject = subjectService.findOneByLogin(login); - Project project = subject.getActiveProject() - .flatMap(p -> projectRepository.findOneWithEagerRelationships(p.getId())) - .orElse(null); - - String projectName = project != null ? project.getProjectName() : null; - checkPermissionOnSubject(token, SUBJECT_READ, projectName, - subject.getUser().getLogin()); + subjectService.checkSubjectProject(SUBJECT_READ, subject, false); SubjectDTO subjectDto = subjectMapper.subjectToSubjectDTO(subject); @@ -317,18 +305,12 @@ public ResponseEntity getSubject(@PathVariable String login) public ResponseEntity> getSubjectRevisions( @Parameter Pageable pageable, @PathVariable String login) throws NotAuthorizedException { + checkPermission(token, SUBJECT_READ); + log.debug("REST request to get revisions for Subject : {}", login); Subject subject = subjectService.findOneByLogin(login); - String project = subject.getActiveProject() - .flatMap(p -> projectRepository.findById(p.getId())) - .map(Project::getProjectName) - .orElseThrow(() -> new NotFoundException( - "Requested subject does not have an active project", - PROJECT, - ERR_ACTIVE_PARTICIPANT_PROJECT_NOT_FOUND)); - - checkPermissionOnSubject(token, SUBJECT_READ, project, - login); + subjectService.checkSubjectProject(SUBJECT_READ, subject, false); + Page page = revisionService.getRevisionsForEntity(pageable, subject); return ResponseEntity.ok() @@ -350,10 +332,10 @@ public ResponseEntity> getSubjectRevisions( @Timed public ResponseEntity getSubjectRevision(@PathVariable String login, @PathVariable Integer revisionNb) throws NotAuthorizedException { + checkPermission(token, SUBJECT_READ); + log.debug("REST request to get Subject : {}, for revisionNb: {}", login, revisionNb); SubjectDTO subjectDto = subjectService.findRevision(login, revisionNb); - checkPermissionOnSubject(token, SUBJECT_READ, subjectDto.getProject() - .getProjectName(), subjectDto.getLogin()); return ResponseEntity.ok(subjectDto); } @@ -368,10 +350,10 @@ public ResponseEntity getSubjectRevision(@PathVariable String login, public ResponseEntity deleteSubject(@PathVariable String login) throws NotAuthorizedException { log.debug("REST request to delete Subject : {}", login); + checkPermission(token, SUBJECT_DELETE); Subject subject = subjectService.findOneByLogin(login); - String projectName = subject.getActiveProject().map(Project::getProjectName).orElse(null); - checkPermissionOnSubject(token, SUBJECT_DELETE, projectName, login); + subjectService.checkSubjectProject(SUBJECT_DELETE, subject, false); subjectService.deleteSubject(login); return ResponseEntity.ok() .headers(HeaderUtil.createEntityDeletionAlert(SUBJECT, login)).build(); @@ -408,7 +390,7 @@ public ResponseEntity deleteSubject(@PathVariable String login) public ResponseEntity assignSources(@PathVariable String login, @RequestBody MinimalSourceDetailsDTO sourceDto) throws URISyntaxException, NotAuthorizedException { - + checkPermission(token, SUBJECT_UPDATE); // find out source type id of supplied source Long sourceTypeId = sourceDto.getSourceTypeId(); if (sourceTypeId == null) { @@ -432,8 +414,7 @@ public ResponseEntity assignSources(@PathVariable Strin Subject sub = subjectService.findOneByLogin(login); // find the actively assigned project for this subject - - Project currentProject = sub.getActiveProject() + Project currentProject = subjectService.checkSubjectProject(SUBJECT_UPDATE, sub, true) .orElseThrow(() -> new InvalidRequestException( "Requested subject does not have an active project", @@ -448,13 +429,10 @@ public ResponseEntity assignSources(@PathVariable Strin SUBJECT, ERR_SOURCE_TYPE_NOT_PROVIDED) ); - checkPermissionOnSubject(token, SUBJECT_UPDATE, currentProject.getProjectName(), - sub.getUser().getLogin()); - // check if any of id, sourceID, sourceName were non-null boolean existing = Stream.of(sourceDto.getId(), sourceDto.getSourceName(), sourceDto.getSourceId()) - .map(Objects::nonNull).reduce(false, (r1, r2) -> r1 || r2); + .anyMatch(Objects::nonNull); // handle the source registration MinimalSourceDetailsDTO sourceRegistered = subjectService @@ -462,15 +440,17 @@ public ResponseEntity assignSources(@PathVariable Strin // Return the correct response type, either created if a new source was created, or ok if // an existing source was provided. If an existing source was given but not found, the - // assignOrUpdateSource would throw an error and we would not reach this point. + // assignOrUpdateSource would throw an error, and we would not reach this point. if (!existing) { return ResponseEntity.created(ResourceUriService.getUri(sourceRegistered)) .headers(HeaderUtil.createEntityCreationAlert(SOURCE, sourceRegistered.getSourceName())) .body(sourceRegistered); } else { - return ResponseEntity.ok().headers(HeaderUtil.createEntityUpdateAlert(SOURCE, - sourceRegistered.getSourceName())).body(sourceRegistered); + return ResponseEntity.ok() + .headers(HeaderUtil.createEntityUpdateAlert(SOURCE, + sourceRegistered.getSourceName())) + .body(sourceRegistered); } } @@ -486,17 +466,14 @@ public ResponseEntity> getSubjectSources( @PathVariable String login, @RequestParam(value = "withInactiveSources", required = false) Boolean withInactiveSourcesParam) throws NotAuthorizedException { + checkPermission(token, SUBJECT_READ); boolean withInactiveSources = withInactiveSourcesParam != null && withInactiveSourcesParam; // check the subject id Subject subject = subjectRepository.findOneWithEagerBySubjectLogin(login) .orElseThrow(NoSuchElementException::new); - String projectName = subject.getActiveProject() - .map(Project::getProjectName) - .orElse(null); - - checkPermissionOnSubject(token, SUBJECT_READ, projectName, login); + subjectService.checkSubjectProject(SUBJECT_READ, subject, false); if (withInactiveSources) { return ResponseEntity.ok(subjectService.findSubjectSourcesFromRevisions(subject)); @@ -535,16 +512,15 @@ public ResponseEntity> getSubjectSources( public ResponseEntity updateSubjectSource(@PathVariable String login, @PathVariable String sourceName, @RequestBody Map attributes) throws NotFoundException, NotAuthorizedException { + checkPermission(token, SUBJECT_UPDATE); + // check the subject id Subject subject = subjectRepository.findOneWithEagerBySubjectLogin(login) .orElseThrow(() -> new NotFoundException("Subject ID not found", SUBJECT, ERR_SUBJECT_NOT_FOUND, Collections.singletonMap("subjectLogin", login))); - String projectName = subject.getActiveProject() - .map(Project::getProjectName) - .orElse(null); - checkPermissionOnSubject(token, SUBJECT_UPDATE, projectName, login); + subjectService.checkSubjectProject(SUBJECT_UPDATE, subject, false); // find source under subject Source source = subject.getSources().stream() diff --git a/src/main/java/org/radarbase/management/web/rest/UserResource.java b/src/main/java/org/radarbase/management/web/rest/UserResource.java index b0f277622..3efcec4b5 100644 --- a/src/main/java/org/radarbase/management/web/rest/UserResource.java +++ b/src/main/java/org/radarbase/management/web/rest/UserResource.java @@ -15,6 +15,7 @@ import org.radarbase.management.service.UserService; import org.radarbase.management.service.dto.RoleDTO; import org.radarbase.management.service.dto.UserDTO; +import org.radarbase.management.web.rest.errors.BadRequestException; import org.radarbase.management.web.rest.errors.InvalidRequestException; import org.radarbase.management.web.rest.util.HeaderUtil; import org.radarbase.management.web.rest.util.PaginationUtil; @@ -165,17 +166,13 @@ public ResponseEntity updateUser(@RequestBody ManagedUserVM managedUser Optional existingUser = userRepository.findOneByEmail(managedUserVm.getEmail()); if (existingUser.isPresent() && (!existingUser.get().getId() .equals(managedUserVm.getId()))) { - return ResponseEntity.badRequest().headers(HeaderUtil - .createFailureAlert(USER, "emailexists", "Email already in use")) - .body(null); + throw new BadRequestException("Email already in use", USER, "emailexists"); } existingUser = userRepository.findOneByLogin(managedUserVm.getLogin() .toLowerCase(Locale.US)); if (existingUser.isPresent() && (!existingUser.get().getId() .equals(managedUserVm.getId()))) { - return ResponseEntity.badRequest().headers(HeaderUtil - .createFailureAlert(USER, "userexists", "Login already in use")) - .body(null); + throw new BadRequestException("Login already in use", USER, "emailexists"); } Optional subject = subjectRepository diff --git a/src/main/webapp/i18n/nl/group.json b/src/main/webapp/i18n/nl/group.json index df077c04d..fae0eff07 100644 --- a/src/main/webapp/i18n/nl/group.json +++ b/src/main/webapp/i18n/nl/group.json @@ -10,7 +10,8 @@ "updated": "De groep {{ param }} is gewijzigd", "deleted": "De groep {{ param }} is verwijderd", "delete": { - "question": "Deze groep heeft onderwerpen. Weet u zeker dat u groep {{ id }} wilt verwijderen?" + "question": "Deze groep heeft subjecten. Weet u zeker dat u groep {{ id }} wilt verwijderen?", + "warning": "Deze groep heeft subjecten." }, "detail": { "title": "Groep" diff --git a/src/main/webapp/i18n/nl/project.json b/src/main/webapp/i18n/nl/project.json index 3583916af..fb0347cfd 100644 --- a/src/main/webapp/i18n/nl/project.json +++ b/src/main/webapp/i18n/nl/project.json @@ -39,7 +39,8 @@ "attributeDataValue" : "Waarde", "prettyProjectName" : "Leesbare projectnaam", "prettyProjectName.fieldDescription" : "Voor mensen leesbare projectnaam die niet het urlpatroon hoeft te volgen.", - "projectIdAsPrettyName": "Wil je de project-id gebruiken als de voor mensen leesbare naam?" + "projectIdAsPrettyName": "Wil je de project-id gebruiken als de voor mensen leesbare naam?", + "sources": "Sources" }, "error" : { "projectIdNotFound" : "Er werd geen project gevonden met id {{ param0 }}", diff --git a/src/test/java/org/radarbase/management/web/rest/SubjectResourceIntTest.java b/src/test/java/org/radarbase/management/web/rest/SubjectResourceIntTest.java index 62a2196f4..3b7815e87 100644 --- a/src/test/java/org/radarbase/management/web/rest/SubjectResourceIntTest.java +++ b/src/test/java/org/radarbase/management/web/rest/SubjectResourceIntTest.java @@ -43,6 +43,7 @@ import org.radarbase.management.repository.ProjectRepository; import org.radarbase.management.repository.SubjectRepository; import org.radarbase.management.security.JwtAuthenticationFilter; +import org.radarbase.management.service.OrganizationService; import org.radarbase.management.service.SourceService; import org.radarbase.management.service.SourceTypeService; import org.radarbase.management.service.SubjectService; @@ -110,6 +111,9 @@ class SubjectResourceIntTest { private MockMvc restSubjectMockMvc; + @Autowired + private OrganizationService organizationService; + @BeforeEach public void setUp() throws ServletException { MockitoAnnotations.initMocks(this); @@ -121,6 +125,7 @@ public void setUp() throws ServletException { ReflectionTestUtils.setField(subjectResource, "sourceTypeService", sourceTypeService); ReflectionTestUtils.setField(subjectResource, "token", radarToken); ReflectionTestUtils.setField(subjectResource, "sourceService", sourceService); + ReflectionTestUtils.setField(subjectResource, "organizationService", organizationService); JwtAuthenticationFilter filter = OAuthHelper.createAuthenticationFilter(); filter.init(new MockFilterConfig()); From f237442ed1425b06c4bd35c3cd7ba8c2bdb8eee8 Mon Sep 17 00:00:00 2001 From: Joris Borgdorff Date: Wed, 1 Feb 2023 13:24:49 +0100 Subject: [PATCH 395/431] Fix SourceResource permission checks --- .../service/OrganizationService.java | 3 +++ .../management/web/rest/ProjectResource.java | 5 ++--- .../management/web/rest/SourceResource.java | 22 ++++++++++--------- .../web/rest/SourceResourceIntTest.java | 4 ++++ 4 files changed, 21 insertions(+), 13 deletions(-) diff --git a/src/main/java/org/radarbase/management/service/OrganizationService.java b/src/main/java/org/radarbase/management/service/OrganizationService.java index ddf2072c2..12d1691e4 100644 --- a/src/main/java/org/radarbase/management/service/OrganizationService.java +++ b/src/main/java/org/radarbase/management/service/OrganizationService.java @@ -162,6 +162,9 @@ public void checkPermissionBySubject(Permission permission, String projectName, } private boolean hasPermissionOnOrganization(Permission permission, String projectName) { + if (projectName == null) { + return false; + } return organizationRepository.findAllByProjectNames(List.of(projectName)).stream() .anyMatch(o -> token.hasPermissionOnOrganization(permission, o.getName())); } diff --git a/src/main/java/org/radarbase/management/web/rest/ProjectResource.java b/src/main/java/org/radarbase/management/web/rest/ProjectResource.java index 018c915b6..e8c4260c7 100644 --- a/src/main/java/org/radarbase/management/web/rest/ProjectResource.java +++ b/src/main/java/org/radarbase/management/web/rest/ProjectResource.java @@ -294,10 +294,9 @@ public ResponseEntity getAllSourcesForProject(@Parameter Pageable pageable, checkPermission(token, SOURCE_READ); log.debug("REST request to get all Sources"); ProjectDTO projectDto = projectService.findOneByName(projectName); - RadarToken jwt = token; - checkPermissionOnOrganizationAndProject(jwt, SOURCE_READ, + checkPermissionOnOrganizationAndProject(token, SOURCE_READ, projectDto.getOrganization().getName(), projectDto.getProjectName()); - if (!jwt.isClientCredentials() && jwt.hasAuthority(PARTICIPANT)) { + if (!token.isClientCredentials() && token.hasAuthority(PARTICIPANT)) { throw new NotAuthorizedException("Cannot list all project sources as a participant."); } diff --git a/src/main/java/org/radarbase/management/web/rest/SourceResource.java b/src/main/java/org/radarbase/management/web/rest/SourceResource.java index 5785d06c6..6e638c61a 100644 --- a/src/main/java/org/radarbase/management/web/rest/SourceResource.java +++ b/src/main/java/org/radarbase/management/web/rest/SourceResource.java @@ -6,6 +6,7 @@ import org.radarbase.auth.token.RadarToken; import org.radarbase.management.domain.Source; import org.radarbase.management.repository.SourceRepository; +import org.radarbase.management.service.OrganizationService; import org.radarbase.management.service.ResourceUriService; import org.radarbase.management.service.SourceService; import org.radarbase.management.service.dto.MinimalProjectDetailsDTO; @@ -38,7 +39,6 @@ import java.util.Optional; import java.util.stream.Collectors; -import static org.radarbase.auth.authorization.RoleAuthority.SYS_ADMIN; import static org.radarbase.auth.authorization.Permission.SOURCE_CREATE; import static org.radarbase.auth.authorization.Permission.SOURCE_DELETE; import static org.radarbase.auth.authorization.Permission.SOURCE_READ; @@ -46,8 +46,7 @@ import static org.radarbase.auth.authorization.Permission.SUBJECT_READ; import static org.radarbase.auth.authorization.RadarAuthorization.checkAuthorityAndPermission; import static org.radarbase.auth.authorization.RadarAuthorization.checkPermission; -import static org.radarbase.auth.authorization.RadarAuthorization.checkPermissionOnProject; -import static org.radarbase.auth.authorization.RadarAuthorization.checkPermissionOnSource; +import static org.radarbase.auth.authorization.RoleAuthority.SYS_ADMIN; import static tech.jhipster.web.util.ResponseUtil.wrapOrNotFound; /** @@ -70,6 +69,9 @@ public class SourceResource { @Autowired private RadarToken token; + @Autowired + private OrganizationService organizationService; + /** * POST /sources : Create a new source. * @@ -85,7 +87,7 @@ public ResponseEntity createSource(@Valid @RequestBody SourceDTO sour log.debug("REST request to save Source : {}", sourceDto); MinimalProjectDetailsDTO project = sourceDto.getProject(); String projectName = project != null ? project.getProjectName() : null; - checkPermissionOnProject(token, SOURCE_CREATE, projectName); + organizationService.checkPermissionByProject(SOURCE_CREATE, projectName); if (sourceDto.getId() != null) { return ResponseEntity.badRequest().headers(HeaderUtil.createFailureAlert(ENTITY_NAME, "idexists", "A new source cannot already have an ID")).build(); @@ -127,8 +129,8 @@ public ResponseEntity updateSource(@Valid @RequestBody SourceDTO sour } RadarToken jwt = token; MinimalProjectDetailsDTO project = sourceDto.getProject(); - String projectName = project != null ? project.getProjectName() : null; - checkPermissionOnProject(jwt, SOURCE_UPDATE, projectName); + var projectName = project != null ? project.getProjectName() : null; + organizationService.checkPermissionByProject(SOURCE_UPDATE, projectName); Optional updatedSource = sourceService.updateSource(sourceDto, jwt); return wrapOrNotFound(updatedSource, HeaderUtil.createEntityUpdateAlert(ENTITY_NAME, sourceDto.getSourceName())); @@ -171,8 +173,8 @@ public ResponseEntity getSource(@PathVariable String sourceName) String projectName = source.getProject() != null ? source.getProject().getProjectName() : null; - checkPermissionOnSource(token, SOURCE_READ, projectName, source.getSubjectLogin(), - source.getSourceName()); + organizationService.checkPermissionBySubject(SOURCE_READ, projectName, + source.getSubjectLogin()); } return wrapOrNotFound(sourceOpt); } @@ -198,8 +200,8 @@ public ResponseEntity deleteSource(@PathVariable String sourceName) String projectName = sourceDto.getProject() != null ? sourceDto.getProject().getProjectName() : null; - checkPermissionOnSource(jwt, SOURCE_DELETE, projectName, sourceDto.getSubjectLogin(), - sourceDto.getSourceName()); + organizationService.checkPermissionBySubject(SOURCE_READ, projectName, + sourceDto.getSubjectLogin()); if (sourceDto.getAssigned()) { return ResponseEntity.badRequest().headers(HeaderUtil.createFailureAlert(ENTITY_NAME, diff --git a/src/test/java/org/radarbase/management/web/rest/SourceResourceIntTest.java b/src/test/java/org/radarbase/management/web/rest/SourceResourceIntTest.java index ee1fd45e2..967623f0b 100644 --- a/src/test/java/org/radarbase/management/web/rest/SourceResourceIntTest.java +++ b/src/test/java/org/radarbase/management/web/rest/SourceResourceIntTest.java @@ -28,6 +28,7 @@ import org.radarbase.management.repository.ProjectRepository; import org.radarbase.management.repository.SourceRepository; import org.radarbase.management.security.JwtAuthenticationFilter; +import org.radarbase.management.service.OrganizationService; import org.radarbase.management.service.SourceService; import org.radarbase.management.service.SourceTypeService; import org.radarbase.management.service.dto.SourceDTO; @@ -103,6 +104,8 @@ class SourceResourceIntTest { private Source source; private Project project; + @Autowired + private OrganizationService organizationService; @BeforeEach public void setUp() throws ServletException { @@ -111,6 +114,7 @@ public void setUp() throws ServletException { ReflectionTestUtils.setField(sourceResource, "token", radarToken); ReflectionTestUtils.setField(sourceResource, "sourceService", sourceService); ReflectionTestUtils.setField(sourceResource, "sourceRepository", sourceRepository); + ReflectionTestUtils.setField(sourceResource, "organizationService", organizationService); JwtAuthenticationFilter filter = OAuthHelper.createAuthenticationFilter(); filter.init(new MockFilterConfig()); From 5050910a863a5167b58620ca1f9eb736e11fe1ba Mon Sep 17 00:00:00 2001 From: nivethika Date: Fri, 3 Feb 2023 11:49:03 +0100 Subject: [PATCH 396/431] remove permission check on sources on the SourceService.java --- .../java/org/radarbase/management/service/SourceService.java | 5 +---- .../org/radarbase/management/web/rest/SourceResource.java | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/src/main/java/org/radarbase/management/service/SourceService.java b/src/main/java/org/radarbase/management/service/SourceService.java index 342e72047..a4839383a 100644 --- a/src/main/java/org/radarbase/management/service/SourceService.java +++ b/src/main/java/org/radarbase/management/service/SourceService.java @@ -212,11 +212,10 @@ public MinimalSourceDetailsDTO safeUpdateOfAttributes(Source sourceToUpdate, * Does not allow to transfer if new project does not have valid source-type. * * @param sourceDto source details to update. - * @param jwt authorization token. * @return updated source. */ @Transactional - public Optional updateSource(SourceDTO sourceDto, RadarToken jwt) + public Optional updateSource(SourceDTO sourceDto) throws NotAuthorizedException { Optional existingSourceOpt = sourceRepository.findById(sourceDto.getId()); if (existingSourceOpt.isEmpty()) { @@ -231,8 +230,6 @@ public Optional updateSource(SourceDTO sourceDto, RadarToken jwt) ? existingSource.getSubject().getUser().getLogin() : null; - checkPermissionOnSource(jwt, SOURCE_UPDATE, project, user, existingSource.getSourceName()); - // if the source is being transferred to another project. if (!existingSource.getProject().getId().equals(sourceDto.getProject().getId())) { if (existingSource.isAssigned()) { diff --git a/src/main/java/org/radarbase/management/web/rest/SourceResource.java b/src/main/java/org/radarbase/management/web/rest/SourceResource.java index 6e638c61a..1c2c4f948 100644 --- a/src/main/java/org/radarbase/management/web/rest/SourceResource.java +++ b/src/main/java/org/radarbase/management/web/rest/SourceResource.java @@ -131,7 +131,7 @@ public ResponseEntity updateSource(@Valid @RequestBody SourceDTO sour MinimalProjectDetailsDTO project = sourceDto.getProject(); var projectName = project != null ? project.getProjectName() : null; organizationService.checkPermissionByProject(SOURCE_UPDATE, projectName); - Optional updatedSource = sourceService.updateSource(sourceDto, jwt); + Optional updatedSource = sourceService.updateSource(sourceDto); return wrapOrNotFound(updatedSource, HeaderUtil.createEntityUpdateAlert(ENTITY_NAME, sourceDto.getSourceName())); } From 7b47b809cc0416a362e2eed4b650ec9fe67e4c0f Mon Sep 17 00:00:00 2001 From: Peyman Mohtashami Date: Fri, 3 Feb 2023 15:45:38 +0100 Subject: [PATCH 397/431] Change delete warning text color to red --- .../app/shared/group/group-delete-dialog.component.html | 2 +- src/main/webapp/content/scss/global.scss | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/main/webapp/app/shared/group/group-delete-dialog.component.html b/src/main/webapp/app/shared/group/group-delete-dialog.component.html index cfbb69e23..9681f0569 100644 --- a/src/main/webapp/app/shared/group/group-delete-dialog.component.html +++ b/src/main/webapp/app/shared/group/group-delete-dialog.component.html @@ -5,7 +5,7 @@

    -

    +

    diff --git a/src/main/webapp/content/scss/global.scss b/src/main/webapp/content/scss/global.scss index 3f46f3264..054c8d58e 100644 --- a/src/main/webapp/content/scss/global.scss +++ b/src/main/webapp/content/scss/global.scss @@ -276,3 +276,7 @@ ngb-typeahead-window { overflow-y: auto; } +.bold-warn { + color: red; + font-weight: bold; +} From ff4aecf43e90b2b58eb54af880762dc0ae6704cc Mon Sep 17 00:00:00 2001 From: Peyman Mohtashami Date: Fri, 3 Feb 2023 15:46:14 +0100 Subject: [PATCH 398/431] Remove edit button from source-data details page --- .../entities/source-data/source-data-detail.component.html | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/main/webapp/app/entities/source-data/source-data-detail.component.html b/src/main/webapp/app/entities/source-data/source-data-detail.component.html index f47ad4e28..d2f1bf82b 100644 --- a/src/main/webapp/app/entities/source-data/source-data-detail.component.html +++ b/src/main/webapp/app/entities/source-data/source-data-detail.component.html @@ -50,10 +50,4 @@

    : {   -

    From 6a3a211020a5761f82bf7523dcd22c43736648f1 Mon Sep 17 00:00:00 2001 From: Peyman Mohtashami Date: Fri, 3 Feb 2023 15:47:13 +0100 Subject: [PATCH 399/431] Show all users that have permissions --- .../app/shared/permission/permission.component.html | 9 +++++++-- .../webapp/app/shared/permission/permission.component.ts | 9 ++++++++- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/src/main/webapp/app/shared/permission/permission.component.html b/src/main/webapp/app/shared/permission/permission.component.html index 01709bb63..22fb66c0a 100644 --- a/src/main/webapp/app/shared/permission/permission.component.html +++ b/src/main/webapp/app/shared/permission/permission.component.html @@ -19,9 +19,14 @@

    {{user.authorityName}} - + + + + diff --git a/src/main/webapp/app/shared/permission/permission.component.ts b/src/main/webapp/app/shared/permission/permission.component.ts index 943e7cff2..1e6e4e2b3 100644 --- a/src/main/webapp/app/shared/permission/permission.component.ts +++ b/src/main/webapp/app/shared/permission/permission.component.ts @@ -176,7 +176,14 @@ export class PermissionComponent implements OnInit, OnChanges, OnDestroy { let userAdded = false; user.roles.map(role => { if (this.project) { - if ( role.projectId === this.project.id || role.authorityName === 'ROLE_SYS_ADMIN') { + // if ( role.projectId === this.project.id || role.authorityName === 'ROLE_SYS_ADMIN') { + // userAdded = true; + // result.authorizedUsers.push({login: user.login, authorityName: role.authorityName}) + // } + if ( role.projectId === this.project.id || + role.organizationId === this.project.organization.id || + role.authorityName === 'ROLE_SYS_ADMIN' + ) { userAdded = true; result.authorizedUsers.push({login: user.login, authorityName: role.authorityName}) } From 3e0d72a7ed6c21aa904f262dea56e9872515b600 Mon Sep 17 00:00:00 2001 From: Peyman Mohtashami Date: Fri, 3 Feb 2023 15:48:12 +0100 Subject: [PATCH 400/431] Fetch project before saving the subject --- .../webapp/app/shared/subject/subject-dialog.component.ts | 8 +------- src/main/webapp/app/shared/subject/subject.component.ts | 2 +- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/src/main/webapp/app/shared/subject/subject-dialog.component.ts b/src/main/webapp/app/shared/subject/subject-dialog.component.ts index d1b7fa9e8..e55c64339 100644 --- a/src/main/webapp/app/shared/subject/subject-dialog.component.ts +++ b/src/main/webapp/app/shared/subject/subject-dialog.component.ts @@ -32,7 +32,6 @@ export class SubjectDialogComponent implements OnInit, OnDestroy { isInProject: boolean; projects: Project[] = []; project: Project; - projectName: string; groupName: string; @@ -56,14 +55,11 @@ export class SubjectDialogComponent implements OnInit, OnDestroy { } ngOnInit() { - this.projectName = this.subject?.project?.projectName || null; + this.project = this.subject?.project; this.groupName = this.subject.group || null; this.projectService.query().subscribe((projects) => { this.projects = projects.body; - this.project = this.projects.find((project) => - project.projectName === this.projectName - ) }) if(this.subject.dateOfBirth) { this.dateOfBirth = this.formatter.parse(this.subject.dateOfBirth.toString()); @@ -90,13 +86,11 @@ export class SubjectDialogComponent implements OnInit, OnDestroy { if (this.dateOfBirth && this.calendar.isValid(NgbDate.from(this.dateOfBirth))) { this.subject.dateOfBirth = new Date(this.formatter.format(this.dateOfBirth)); } - this.project = this.projects.find((p) => p.projectName === this.projectName); this.subject.project = this.project; this.subject.group = this.groupName; //this.project.groups.find(group => group.name === this.groupName) if (this.subject.id) { - this.subjectService.update(this.subject) .subscribe((res: Subject) => this.onSaveSuccess('UPDATE', res), (res: any) => this.onSaveError(res)); diff --git a/src/main/webapp/app/shared/subject/subject.component.ts b/src/main/webapp/app/shared/subject/subject.component.ts index e505f9a5a..022d11e85 100644 --- a/src/main/webapp/app/shared/subject/subject.component.ts +++ b/src/main/webapp/app/shared/subject/subject.component.ts @@ -472,7 +472,7 @@ export class SubjectComponent implements OnInit, OnDestroy, OnChanges { ]).subscribe(([subjects, groups, project]) => { if(modalRef.componentInstance){ modalRef.componentInstance.groups = groups; - modalRef.componentInstance.projectName = project.projectName; + modalRef.componentInstance.project = project; modalRef.componentInstance.subjects = subjects.filter(s => s.checked); } })); From 282b6aabc606c3ee6c943892ad4f67320ce515ff Mon Sep 17 00:00:00 2001 From: nivethika Date: Fri, 3 Feb 2023 16:57:01 +0100 Subject: [PATCH 401/431] add orgCheck if subject and source check fails --- .../service/OrganizationService.java | 36 +++++++++++++------ .../management/service/SourceService.java | 5 +++ .../web/rest/OAuthClientsResource.java | 12 +++---- 3 files changed, 35 insertions(+), 18 deletions(-) diff --git a/src/main/java/org/radarbase/management/service/OrganizationService.java b/src/main/java/org/radarbase/management/service/OrganizationService.java index 12d1691e4..312c4220f 100644 --- a/src/main/java/org/radarbase/management/service/OrganizationService.java +++ b/src/main/java/org/radarbase/management/service/OrganizationService.java @@ -133,13 +133,11 @@ public List findAllProjectsByOrganizationName(String organizationNam */ public void checkPermissionByProject(Permission permission, String projectName) throws NotAuthorizedException { - if (token.hasPermissionOnProject(permission, projectName)) { - return; + if (!token.hasPermissionOnProject(permission, projectName) && hasPermissionOnOrganization(permission, projectName)) { + throw new NotAuthorizedException(String.format("Client %s does not have " + + "permission %s in project %s", token.getUsername(), permission, + projectName)); } - if (hasPermissionOnOrganization(permission, projectName)) { - return; - } - checkPermissionOnProject(token, permission, projectName); } /** @@ -152,13 +150,29 @@ public void checkPermissionByProject(Permission permission, String projectName) */ public void checkPermissionBySubject(Permission permission, String projectName, String subject) throws NotAuthorizedException { - if (token.hasPermissionOnSubject(permission, projectName, subject)) { - return; + if (!token.hasPermissionOnSubject(permission, projectName, subject) && !hasPermissionOnOrganization(permission, projectName)) { + throw new NotAuthorizedException(String.format("Client %s does not have " + + "permission %s on subject %s in project %s ", token.getUsername(), + permission, subject, projectName)); } - if (hasPermissionOnOrganization(permission, projectName)) { - return; + } + + /** + * Checks the permission of a source, also taking into + * account the organization that a project belongs to. + * @param permission permission to check + * @param projectName project name to check + * @param subject subject login to check + * @param sourceId sourceId to check + * @throws NotAuthorizedException if the current user is not authorized. + */ + public void checkPermissionBySource(Permission permission, String projectName, String subject, String sourceId) + throws NotAuthorizedException { + if (!token.hasPermissionOnSource(permission, projectName, subject, sourceId) && !hasPermissionOnOrganization(permission, projectName)) { + throw new NotAuthorizedException(String.format("Client %s does not have " + + "permission %s on subject %s and source %s in project %s ", token.getUsername(), + permission, subject, sourceId, projectName)); } - checkPermissionOnSubject(token, permission, projectName, subject); } private boolean hasPermissionOnOrganization(Permission permission, String projectName) { diff --git a/src/main/java/org/radarbase/management/service/SourceService.java b/src/main/java/org/radarbase/management/service/SourceService.java index a4839383a..3f494bffe 100644 --- a/src/main/java/org/radarbase/management/service/SourceService.java +++ b/src/main/java/org/radarbase/management/service/SourceService.java @@ -55,6 +55,9 @@ public class SourceService { @Autowired private SourceTypeMapper sourceTypeMapper; + @Autowired + private OrganizationService organizationService; + /** * Save a Source. * @@ -230,6 +233,8 @@ public Optional updateSource(SourceDTO sourceDto) ? existingSource.getSubject().getUser().getLogin() : null; + organizationService.checkPermissionOnSource(SOURCE_UPDATE, project, user, existingSource.getSourceName()); + // if the source is being transferred to another project. if (!existingSource.getProject().getId().equals(sourceDto.getProject().getId())) { if (existingSource.isAssigned()) { diff --git a/src/main/java/org/radarbase/management/web/rest/OAuthClientsResource.java b/src/main/java/org/radarbase/management/web/rest/OAuthClientsResource.java index 9c5647600..ee81481ed 100644 --- a/src/main/java/org/radarbase/management/web/rest/OAuthClientsResource.java +++ b/src/main/java/org/radarbase/management/web/rest/OAuthClientsResource.java @@ -6,7 +6,6 @@ import static org.radarbase.auth.authorization.Permission.OAUTHCLIENTS_UPDATE; import static org.radarbase.auth.authorization.Permission.SUBJECT_UPDATE; import static org.radarbase.auth.authorization.RadarAuthorization.checkPermission; -import static org.radarbase.auth.authorization.RadarAuthorization.checkPermissionOnSubject; import static org.radarbase.management.service.OAuthClientService.checkProtected; import static org.radarbase.management.web.rest.errors.EntityName.OAUTH_CLIENT; @@ -22,11 +21,7 @@ import org.radarbase.management.domain.Project; import org.radarbase.management.domain.Subject; import org.radarbase.management.domain.User; -import org.radarbase.management.service.MetaTokenService; -import org.radarbase.management.service.OAuthClientService; -import org.radarbase.management.service.ResourceUriService; -import org.radarbase.management.service.SubjectService; -import org.radarbase.management.service.UserService; +import org.radarbase.management.service.*; import org.radarbase.management.service.dto.ClientDetailsDTO; import org.radarbase.management.service.dto.ClientPairInfoDTO; import org.radarbase.management.service.mapper.ClientDetailsMapper; @@ -75,6 +70,9 @@ public class OAuthClientsResource { @Autowired private UserService userService; + @Autowired + private OrganizationService organizationService; + @Autowired private AuditEventRepository eventRepository; @@ -207,7 +205,7 @@ public ResponseEntity getRefreshToken(@RequestParam String lo .orElse(null); // Users who can update a subject can also generate a refresh token for that subject - checkPermissionOnSubject(token, SUBJECT_UPDATE, project, login); + organizationService.checkPermissionBySubject(SUBJECT_UPDATE, project, login); ClientPairInfoDTO cpi = metaTokenService.createMetaToken(subject, clientId, persistent); // generate audit event From 219f4ce02c139300fa1e44eb93018a76c063626a Mon Sep 17 00:00:00 2001 From: nivethika Date: Fri, 3 Feb 2023 16:58:49 +0100 Subject: [PATCH 402/431] fix Typo --- .../java/org/radarbase/management/service/SourceService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/radarbase/management/service/SourceService.java b/src/main/java/org/radarbase/management/service/SourceService.java index 3f494bffe..b90ba5ca3 100644 --- a/src/main/java/org/radarbase/management/service/SourceService.java +++ b/src/main/java/org/radarbase/management/service/SourceService.java @@ -233,7 +233,7 @@ public Optional updateSource(SourceDTO sourceDto) ? existingSource.getSubject().getUser().getLogin() : null; - organizationService.checkPermissionOnSource(SOURCE_UPDATE, project, user, existingSource.getSourceName()); + organizationService.checkPermissionBySource(SOURCE_UPDATE, project, user, existingSource.getSourceName()); // if the source is being transferred to another project. if (!existingSource.getProject().getId().equals(sourceDto.getProject().getId())) { From 184e2f92d0b45a18bfbc53e164bdf66727dd4b3c Mon Sep 17 00:00:00 2001 From: nivethika Date: Fri, 3 Feb 2023 17:06:01 +0100 Subject: [PATCH 403/431] fix missed negation --- .../org/radarbase/management/service/OrganizationService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/radarbase/management/service/OrganizationService.java b/src/main/java/org/radarbase/management/service/OrganizationService.java index 312c4220f..2070d24eb 100644 --- a/src/main/java/org/radarbase/management/service/OrganizationService.java +++ b/src/main/java/org/radarbase/management/service/OrganizationService.java @@ -133,7 +133,7 @@ public List findAllProjectsByOrganizationName(String organizationNam */ public void checkPermissionByProject(Permission permission, String projectName) throws NotAuthorizedException { - if (!token.hasPermissionOnProject(permission, projectName) && hasPermissionOnOrganization(permission, projectName)) { + if (!token.hasPermissionOnProject(permission, projectName) && !hasPermissionOnOrganization(permission, projectName)) { throw new NotAuthorizedException(String.format("Client %s does not have " + "permission %s in project %s", token.getUsername(), permission, projectName)); From 0a5848092ab5125d0ed87647b305209ab92d53c5 Mon Sep 17 00:00:00 2001 From: nivethika Date: Fri, 3 Feb 2023 17:42:07 +0100 Subject: [PATCH 404/431] fix unable to update subjects with sources assigned --- .../org/radarbase/management/service/SubjectService.java | 4 +--- .../radarbase/management/service/mapper/SourceMapper.java | 2 +- .../service/mapper/decorator/SourceMapperDecorator.java | 6 +----- 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/src/main/java/org/radarbase/management/service/SubjectService.java b/src/main/java/org/radarbase/management/service/SubjectService.java index f9760d491..68e3acf6b 100644 --- a/src/main/java/org/radarbase/management/service/SubjectService.java +++ b/src/main/java/org/radarbase/management/service/SubjectService.java @@ -207,14 +207,12 @@ public SubjectDTO updateSubject(SubjectDTO newSubjectDto) { return createSubject(newSubjectDto); } Subject subjectFromDb = ensureSubject(newSubjectDto); - //reset all the sources assigned to a subject to unassigned Set sourcesToUpdate = subjectFromDb.getSources(); - sourcesToUpdate.forEach(s -> s.subject(null).assigned(false).deleted(true)); //set only the devices assigned to a subject as assigned subjectMapper.safeUpdateSubjectFromDTO(newSubjectDto, subjectFromDb); sourcesToUpdate.addAll(subjectFromDb.getSources()); subjectFromDb.getSources() - .forEach(s -> s.subject(subjectFromDb).assigned(true).deleted(false)); + .forEach(s -> s.subject(subjectFromDb).assigned(true)); sourceRepository.saveAll(sourcesToUpdate); // update participant role subjectFromDb.getUser().setRoles(updateParticipantRoles(subjectFromDb, newSubjectDto)); diff --git a/src/main/java/org/radarbase/management/service/mapper/SourceMapper.java b/src/main/java/org/radarbase/management/service/mapper/SourceMapper.java index 6f5d883e4..5d6f21eeb 100644 --- a/src/main/java/org/radarbase/management/service/mapper/SourceMapper.java +++ b/src/main/java/org/radarbase/management/service/mapper/SourceMapper.java @@ -43,7 +43,7 @@ public interface SourceMapper { @Mapping(target = "project", ignore = true) @Mapping(target = "subject", ignore = true) @Mapping(target = "deleted", constant = "false") - Source descriptiveDTOToSource(MinimalSourceDetailsDTO minimalSourceDetailsDto); + Source minimalSourceDTOToSource(MinimalSourceDetailsDTO minimalSourceDetailsDto); @Mapping(target = "subject", ignore = true) @Mapping(target = "deleted", constant = "false") diff --git a/src/main/java/org/radarbase/management/service/mapper/decorator/SourceMapperDecorator.java b/src/main/java/org/radarbase/management/service/mapper/decorator/SourceMapperDecorator.java index 420eba393..3e695d084 100644 --- a/src/main/java/org/radarbase/management/service/mapper/decorator/SourceMapperDecorator.java +++ b/src/main/java/org/radarbase/management/service/mapper/decorator/SourceMapperDecorator.java @@ -37,11 +37,7 @@ public abstract class SourceMapperDecorator implements SourceMapper { private SubjectRepository subjectRepository; @Override - public Source descriptiveDTOToSource(MinimalSourceDetailsDTO minimalSource) { - List allSources = sourceRepository.findAll(); - logger.info("Listing {} existing sources", allSources.size()); - allSources.forEach(s -> logger.info("Existing source: {}", s.getSourceId())); - + public Source minimalSourceDTOToSource(MinimalSourceDetailsDTO minimalSource) { Source source = sourceRepository .findOneBySourceId(minimalSource.getSourceId()) .orElseThrow(() -> new NotFoundException( From ec418767bebfeee26e12c72a520fdad2ce2c78b6 Mon Sep 17 00:00:00 2001 From: nivethika Date: Fri, 3 Feb 2023 18:02:58 +0100 Subject: [PATCH 405/431] fix style issues --- .../service/OrganizationService.java | 18 ++++++++++-------- .../management/service/SourceService.java | 9 ++++----- .../decorator/SourceMapperDecorator.java | 4 ---- .../web/rest/OAuthClientsResource.java | 7 ++++++- .../management/web/rest/SourceResource.java | 1 - 5 files changed, 20 insertions(+), 19 deletions(-) diff --git a/src/main/java/org/radarbase/management/service/OrganizationService.java b/src/main/java/org/radarbase/management/service/OrganizationService.java index 2070d24eb..4dabf831e 100644 --- a/src/main/java/org/radarbase/management/service/OrganizationService.java +++ b/src/main/java/org/radarbase/management/service/OrganizationService.java @@ -24,8 +24,6 @@ import java.util.stream.Stream; import static org.radarbase.auth.authorization.Permission.ORGANIZATION_READ; -import static org.radarbase.auth.authorization.RadarAuthorization.checkPermissionOnProject; -import static org.radarbase.auth.authorization.RadarAuthorization.checkPermissionOnSubject; /** * Service Implementation for managing Organization. @@ -133,7 +131,8 @@ public List findAllProjectsByOrganizationName(String organizationNam */ public void checkPermissionByProject(Permission permission, String projectName) throws NotAuthorizedException { - if (!token.hasPermissionOnProject(permission, projectName) && !hasPermissionOnOrganization(permission, projectName)) { + if (!token.hasPermissionOnProject(permission, projectName) + && !hasPermissionOnOrganization(permission, projectName)) { throw new NotAuthorizedException(String.format("Client %s does not have " + "permission %s in project %s", token.getUsername(), permission, projectName)); @@ -150,7 +149,8 @@ public void checkPermissionByProject(Permission permission, String projectName) */ public void checkPermissionBySubject(Permission permission, String projectName, String subject) throws NotAuthorizedException { - if (!token.hasPermissionOnSubject(permission, projectName, subject) && !hasPermissionOnOrganization(permission, projectName)) { + if (!token.hasPermissionOnSubject(permission, projectName, subject) + && !hasPermissionOnOrganization(permission, projectName)) { throw new NotAuthorizedException(String.format("Client %s does not have " + "permission %s on subject %s in project %s ", token.getUsername(), permission, subject, projectName)); @@ -166,12 +166,14 @@ public void checkPermissionBySubject(Permission permission, String projectName, * @param sourceId sourceId to check * @throws NotAuthorizedException if the current user is not authorized. */ - public void checkPermissionBySource(Permission permission, String projectName, String subject, String sourceId) + public void checkPermissionBySource(Permission permission, String projectName, String subject, + String sourceId) throws NotAuthorizedException { - if (!token.hasPermissionOnSource(permission, projectName, subject, sourceId) && !hasPermissionOnOrganization(permission, projectName)) { + if (!token.hasPermissionOnSource(permission, projectName, subject, sourceId) + && !hasPermissionOnOrganization(permission, projectName)) { throw new NotAuthorizedException(String.format("Client %s does not have " - + "permission %s on subject %s and source %s in project %s ", token.getUsername(), - permission, subject, sourceId, projectName)); + + "permission %s on subject %s and source %s in project %s ", + token.getUsername(), permission, subject, sourceId, projectName)); } } diff --git a/src/main/java/org/radarbase/management/service/SourceService.java b/src/main/java/org/radarbase/management/service/SourceService.java index b90ba5ca3..5c3148c44 100644 --- a/src/main/java/org/radarbase/management/service/SourceService.java +++ b/src/main/java/org/radarbase/management/service/SourceService.java @@ -3,7 +3,6 @@ import static org.hibernate.id.IdentifierGenerator.ENTITY_NAME; import static org.radarbase.auth.authorization.Permission.SOURCE_UPDATE; -import static org.radarbase.auth.authorization.RadarAuthorization.checkPermissionOnSource; import static org.radarbase.management.web.rest.errors.EntityName.SOURCE; import java.util.HashMap; @@ -14,7 +13,6 @@ import java.util.stream.Collectors; import org.radarbase.auth.exception.NotAuthorizedException; -import org.radarbase.auth.token.RadarToken; import org.radarbase.management.domain.Source; import org.radarbase.management.domain.SourceType; import org.radarbase.management.repository.ProjectRepository; @@ -163,7 +161,7 @@ public Page findAllByProjectId(Long projectId, Pageable pageable) { * @return list of sources */ public Page findAllMinimalSourceDetailsByProject(Long projectId, - Pageable pageable) { + Pageable pageable) { return sourceRepository.findAllSourcesByProjectId(pageable, projectId) .map(sourceMapper::sourceToMinimalSourceDetailsDTO); } @@ -197,7 +195,7 @@ public List findAllMinimalSourceDetailsByProjectAndAssi * @return Updated {@link MinimalSourceDetailsDTO} of source */ public MinimalSourceDetailsDTO safeUpdateOfAttributes(Source sourceToUpdate, - Map attributes) { + Map attributes) { // update source attributes Map updatedAttributes = new HashMap<>(); @@ -233,7 +231,8 @@ public Optional updateSource(SourceDTO sourceDto) ? existingSource.getSubject().getUser().getLogin() : null; - organizationService.checkPermissionBySource(SOURCE_UPDATE, project, user, existingSource.getSourceName()); + organizationService.checkPermissionBySource(SOURCE_UPDATE, project, user, + existingSource.getSourceName()); // if the source is being transferred to another project. if (!existingSource.getProject().getId().equals(sourceDto.getProject().getId())) { diff --git a/src/main/java/org/radarbase/management/service/mapper/decorator/SourceMapperDecorator.java b/src/main/java/org/radarbase/management/service/mapper/decorator/SourceMapperDecorator.java index 3e695d084..0980bb6fb 100644 --- a/src/main/java/org/radarbase/management/service/mapper/decorator/SourceMapperDecorator.java +++ b/src/main/java/org/radarbase/management/service/mapper/decorator/SourceMapperDecorator.java @@ -7,12 +7,9 @@ import org.radarbase.management.service.dto.SourceDTO; import org.radarbase.management.service.mapper.SourceMapper; import org.radarbase.management.web.rest.errors.NotFoundException; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; -import java.util.List; import java.util.Map; import java.util.NoSuchElementException; @@ -24,7 +21,6 @@ */ public abstract class SourceMapperDecorator implements SourceMapper { - private static final Logger logger = LoggerFactory.getLogger(SourceMapperDecorator.class); @Autowired @Qualifier("delegate") diff --git a/src/main/java/org/radarbase/management/web/rest/OAuthClientsResource.java b/src/main/java/org/radarbase/management/web/rest/OAuthClientsResource.java index ee81481ed..b3115f5df 100644 --- a/src/main/java/org/radarbase/management/web/rest/OAuthClientsResource.java +++ b/src/main/java/org/radarbase/management/web/rest/OAuthClientsResource.java @@ -21,7 +21,12 @@ import org.radarbase.management.domain.Project; import org.radarbase.management.domain.Subject; import org.radarbase.management.domain.User; -import org.radarbase.management.service.*; +import org.radarbase.management.service.MetaTokenService; +import org.radarbase.management.service.SubjectService; +import org.radarbase.management.service.UserService; +import org.radarbase.management.service.OAuthClientService; +import org.radarbase.management.service.OrganizationService; +import org.radarbase.management.service.ResourceUriService; import org.radarbase.management.service.dto.ClientDetailsDTO; import org.radarbase.management.service.dto.ClientPairInfoDTO; import org.radarbase.management.service.mapper.ClientDetailsMapper; diff --git a/src/main/java/org/radarbase/management/web/rest/SourceResource.java b/src/main/java/org/radarbase/management/web/rest/SourceResource.java index 1c2c4f948..1bfdddb02 100644 --- a/src/main/java/org/radarbase/management/web/rest/SourceResource.java +++ b/src/main/java/org/radarbase/management/web/rest/SourceResource.java @@ -127,7 +127,6 @@ public ResponseEntity updateSource(@Valid @RequestBody SourceDTO sour if (sourceDto.getId() == null) { return createSource(sourceDto); } - RadarToken jwt = token; MinimalProjectDetailsDTO project = sourceDto.getProject(); var projectName = project != null ? project.getProjectName() : null; organizationService.checkPermissionByProject(SOURCE_UPDATE, projectName); From 6e4bdfd648b644b8721981809d5d99e617378469 Mon Sep 17 00:00:00 2001 From: Joris Borgdorff Date: Mon, 6 Feb 2023 12:41:35 +0100 Subject: [PATCH 406/431] Don't allow project names to be changed in backend --- .../org/radarbase/management/web/rest/ProjectResource.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/main/java/org/radarbase/management/web/rest/ProjectResource.java b/src/main/java/org/radarbase/management/web/rest/ProjectResource.java index e8c4260c7..5d9cf3b1a 100644 --- a/src/main/java/org/radarbase/management/web/rest/ProjectResource.java +++ b/src/main/java/org/radarbase/management/web/rest/ProjectResource.java @@ -161,6 +161,12 @@ public ResponseEntity updateProject(@Valid @RequestBody ProjectDTO p // they must have permissions to modify both new & old organizations var newOrgName = org.getName(); var existingProject = projectService.findOne(projectDto.getId()); + + if (existingProject.getProjectName() != projectDto.getProjectName()) { + throw new BadRequestException("The project name cannot be modified.", ENTITY_NAME, + ERR_VALIDATION); + } + checkPermissionOnOrganizationAndProject(token, PROJECT_UPDATE, newOrgName, existingProject.getProjectName()); From 08cf1c4d5ca26cc1f2e3af79cca44800b891baab Mon Sep 17 00:00:00 2001 From: Peyman Mohtashami Date: Mon, 6 Feb 2023 13:28:30 +0100 Subject: [PATCH 407/431] Disable edit of organization and project name fields --- .../entities/organization/organization-dialog.component.html | 5 ++++- .../app/entities/project/project-dialog.component.html | 5 ++++- src/main/webapp/i18n/en/organization.json | 1 + src/main/webapp/i18n/en/project.json | 1 + 4 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/main/webapp/app/entities/organization/organization-dialog.component.html b/src/main/webapp/app/entities/organization/organization-dialog.component.html index 974c4f804..b7f2a0fca 100644 --- a/src/main/webapp/app/entities/organization/organization-dialog.component.html +++ b/src/main/webapp/app/entities/organization/organization-dialog.component.html @@ -20,7 +20,10 @@ for="field_organizationName"> + [(ngModel)]="organization.name" [readOnly]="organization.id" required pattern="[_'.@A-Za-z0-9- ]*" /> + + diff --git a/src/main/webapp/app/entities/project/project-dialog.component.html b/src/main/webapp/app/entities/project/project-dialog.component.html index b065cc3f6..9e1e9e932 100644 --- a/src/main/webapp/app/entities/project/project-dialog.component.html +++ b/src/main/webapp/app/entities/project/project-dialog.component.html @@ -20,7 +20,10 @@ for="field_projectName"> + [(ngModel)]="projectCopy.projectName" [readOnly]="projectCopy.id" required pattern="[_'.@A-Za-z0-9- ]*" /> + + diff --git a/src/main/webapp/i18n/en/organization.json b/src/main/webapp/i18n/en/organization.json index 666aebcb9..cfaaa2b0d 100644 --- a/src/main/webapp/i18n/en/organization.json +++ b/src/main/webapp/i18n/en/organization.json @@ -16,6 +16,7 @@ "title": "Organization" }, "organizationName": "Organization Id", + "organizationName.fieldWarning": "This field is not editable after creation.", "organizationName.fieldDescription": "Unique identifier of organization", "description": "Description", "organization": "Organization", diff --git a/src/main/webapp/i18n/en/project.json b/src/main/webapp/i18n/en/project.json index 8b6d3d2d7..8571f2c7f 100644 --- a/src/main/webapp/i18n/en/project.json +++ b/src/main/webapp/i18n/en/project.json @@ -16,6 +16,7 @@ "title": "Project" }, "projectName": "Project Id", + "projectName.fieldWarning": "This field is not editable after creation.", "projectName.fieldDescription": "Unique identifier of project", "description": "Description", "organization": "Organization", From 01b912424e755111b3d130f72ca474c1e41940eb Mon Sep 17 00:00:00 2001 From: Peyman Mohtashami Date: Mon, 6 Feb 2023 14:24:43 +0100 Subject: [PATCH 408/431] Modify warning on delete groups with subjects --- .../app/shared/group/group-delete-dialog.component.html | 5 +++-- src/main/webapp/content/scss/global.scss | 7 +++++-- src/main/webapp/i18n/en/group.json | 3 ++- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/src/main/webapp/app/shared/group/group-delete-dialog.component.html b/src/main/webapp/app/shared/group/group-delete-dialog.component.html index 9681f0569..b9090aeec 100644 --- a/src/main/webapp/app/shared/group/group-delete-dialog.component.html +++ b/src/main/webapp/app/shared/group/group-delete-dialog.component.html @@ -5,8 +5,9 @@

    -

    -

    +

    +

    diff --git a/src/main/webapp/content/scss/global.scss b/src/main/webapp/content/scss/global.scss index 054c8d58e..ab5a6a942 100644 --- a/src/main/webapp/content/scss/global.scss +++ b/src/main/webapp/content/scss/global.scss @@ -276,7 +276,10 @@ ngb-typeahead-window { overflow-y: auto; } -.bold-warn { - color: red; +.bold { font-weight: bold; } + +.warn { + color: red; +} diff --git a/src/main/webapp/i18n/en/group.json b/src/main/webapp/i18n/en/group.json index 3fbf6c250..8aa5bc86b 100644 --- a/src/main/webapp/i18n/en/group.json +++ b/src/main/webapp/i18n/en/group.json @@ -10,7 +10,8 @@ "updated": "A Group is updated with identifier {{ param }}", "deleted": "A Group is deleted with identifier {{ param }}", "delete": { - "warning": "This group has subjects.", + "warning": "Please note that this group has assigned subjects.", + "warningDescription": "Deleting this group will remove all subjects from this group and delete this group. This action cannot be undone.", "question": "Are you sure you want to delete Group {{ id }}?" }, "detail": { From 9f16156a0cd02f384646cea5453bf7bbbb588c9a Mon Sep 17 00:00:00 2001 From: Joris Borgdorff Date: Mon, 6 Feb 2023 15:55:22 +0100 Subject: [PATCH 409/431] Fixed project name equality --- .../java/org/radarbase/management/web/rest/ProjectResource.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/radarbase/management/web/rest/ProjectResource.java b/src/main/java/org/radarbase/management/web/rest/ProjectResource.java index 5d9cf3b1a..a131ee562 100644 --- a/src/main/java/org/radarbase/management/web/rest/ProjectResource.java +++ b/src/main/java/org/radarbase/management/web/rest/ProjectResource.java @@ -162,7 +162,7 @@ public ResponseEntity updateProject(@Valid @RequestBody ProjectDTO p var newOrgName = org.getName(); var existingProject = projectService.findOne(projectDto.getId()); - if (existingProject.getProjectName() != projectDto.getProjectName()) { + if (!existingProject.getProjectName().equals(projectDto.getProjectName())) { throw new BadRequestException("The project name cannot be modified.", ENTITY_NAME, ERR_VALIDATION); } From 49565e66f9974d2f0e292dc63330446f110531a5 Mon Sep 17 00:00:00 2001 From: Peyman Mohtashami Date: Mon, 6 Feb 2023 17:13:37 +0100 Subject: [PATCH 410/431] Disable project's organization change if the user doesn't have permission --- .../project/project-dialog.component.html | 8 ++++-- .../project/project-dialog.component.ts | 25 ++++++++++++++++++- 2 files changed, 30 insertions(+), 3 deletions(-) diff --git a/src/main/webapp/app/entities/project/project-dialog.component.html b/src/main/webapp/app/entities/project/project-dialog.component.html index 9e1e9e932..2a94a9227 100644 --- a/src/main/webapp/app/entities/project/project-dialog.component.html +++ b/src/main/webapp/app/entities/project/project-dialog.component.html @@ -71,13 +71,17 @@
    + {{hasRoleToChangeOrganization | json}} + {{availableOrganizations | json}}
    - +
    diff --git a/src/main/webapp/app/entities/project/project-dialog.component.ts b/src/main/webapp/app/entities/project/project-dialog.component.ts index fe949f6ff..8e76bbd86 100644 --- a/src/main/webapp/app/entities/project/project-dialog.component.ts +++ b/src/main/webapp/app/entities/project/project-dialog.component.ts @@ -19,7 +19,7 @@ import { EventManager } from '../../shared/util/event-manager.service'; import { SourceType, SourceTypeService } from '../source-type'; import { ProjectPopupService } from './project-popup.service'; -import {GroupService, Organization, OrganizationService, Project, ProjectService} from '../../shared'; +import {GroupService, Organization, OrganizationService, Principal, Project, ProjectService} from '../../shared'; import { ObservablePopupComponent } from '../../shared/util/observable-popup.component'; @Component({ @@ -50,6 +50,9 @@ export class ProjectDialogComponent implements OnInit, OnDestroy { focus$ = new Subject(); click$ = new Subject(); + availableOrganizations: string[]; + hasRoleToChangeOrganization: boolean = false; + getMatchingSourceTypes: OperatorFunction = (text$: Observable) => { const debouncedText$ = text$.pipe(debounceTime(200), distinctUntilChanged()); const clicksWithClosedPopup$ = this.click$.pipe(filter(() => !this.instance.isPopupOpen())); @@ -89,6 +92,7 @@ export class ProjectDialogComponent implements OnInit, OnDestroy { private calendar: NgbCalendar, public formatter: NgbDateParserFormatter, private router: Router, + public principal: Principal, ) { this.isSaving = false; this.options = ['Work-package', 'Phase', 'External-project-url', 'External-project-id', 'Privacy-policy-url']; @@ -107,6 +111,25 @@ export class ProjectDialogComponent implements OnInit, OnDestroy { this.endDate = this.formatter.parse(this.projectCopy.endDate.toString()); } this.subscriptions.add(this.registerChangesToAttributes()); + + const principalSubscription = this.principal.account$.subscribe(account => { + const isSysAdmin = account.roles.find(role => role.authorityName === 'ROLE_SYS_ADMIN') + if(isSysAdmin){ + this.hasRoleToChangeOrganization = true; + this.availableOrganizations = this.organizations.map(o => o.name) + } else { + this.hasRoleToChangeOrganization = !!account.roles.find(role => role.organizationName === this.organizationName) + if(this.hasRoleToChangeOrganization){ + this.availableOrganizations = account.roles + .filter(role => role.authorityName === "ROLE_ORGANIZATION_ADMIN") + .map(role => role.organizationName) + } else { + this.availableOrganizations = this.organizations.map(o => o.name) + } + } + }) + + this.subscriptions.add(principalSubscription); } ngOnDestroy() { From 9b7337ebb7bfb1d5035031a6787554b8a8dd0c0e Mon Sep 17 00:00:00 2001 From: Peyman Mohtashami Date: Mon, 6 Feb 2023 18:47:07 +0100 Subject: [PATCH 411/431] Fix get authorities 403 error for non SYS_ADMIN --- .../webapp/app/shared/organization/organization.service.ts | 4 ++-- src/main/webapp/app/shared/user/authority.service.ts | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/webapp/app/shared/organization/organization.service.ts b/src/main/webapp/app/shared/organization/organization.service.ts index dab8ece20..1b8040347 100644 --- a/src/main/webapp/app/shared/organization/organization.service.ts +++ b/src/main/webapp/app/shared/organization/organization.service.ts @@ -5,7 +5,7 @@ import { BehaviorSubject, combineLatest, Observable, of, Subject, throwError } f import { Organization } from './organization.model'; import { Principal } from '../auth/principal.service'; import { AlertService } from '../util/alert.service'; -import { concatMap, delay, distinctUntilChanged, filter, first, map, retryWhen, startWith, switchMap, tap } from 'rxjs/operators'; +import { concatMap, delay, distinctUntilChanged, filter, map, retryWhen, startWith, switchMap, tap } from 'rxjs/operators'; import { createRequestOption } from '../model/request.utils'; @Injectable({ providedIn: 'root' }) @@ -128,7 +128,7 @@ export class OrganizationService { this._organizations$.next(nextValue); if (needsAuthRenewal) { this.principal.reset(); - }; + } } findAll(): Observable { diff --git a/src/main/webapp/app/shared/user/authority.service.ts b/src/main/webapp/app/shared/user/authority.service.ts index 56c565802..892422ec0 100644 --- a/src/main/webapp/app/shared/user/authority.service.ts +++ b/src/main/webapp/app/shared/user/authority.service.ts @@ -25,7 +25,7 @@ export class AuthorityService { private principal: Principal, ) { this.authorities$ = this.principal.account$.pipe( - map(account => !!account), + map(account => !!account && account.authorities.includes("ROLE_SYS_ADMIN")), distinctUntilChanged(), switchMap(account => { if (account) { From bf3c58594c22672c6c8a208764384ecba0ae4bfc Mon Sep 17 00:00:00 2001 From: Peyman Mohtashami Date: Tue, 7 Feb 2023 08:36:24 +0100 Subject: [PATCH 412/431] Remove comment on project-dialog --- .../webapp/app/entities/project/project-dialog.component.html | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/main/webapp/app/entities/project/project-dialog.component.html b/src/main/webapp/app/entities/project/project-dialog.component.html index 2a94a9227..ec9dd138a 100644 --- a/src/main/webapp/app/entities/project/project-dialog.component.html +++ b/src/main/webapp/app/entities/project/project-dialog.component.html @@ -71,8 +71,6 @@
    - {{hasRoleToChangeOrganization | json}} - {{availableOrganizations | json}}