diff --git a/CHANGELOG.md b/CHANGELOG.md index 0b1815cbfe..5a519834e2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,57 @@ All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines. +### [0.11.3](https://github.com/webern-unibas-ch/awg-app/compare/v0.11.2...v0.11.3) (2024-01-19) + +### Features + +- **assets:** add files for M 31 ([#844](https://github.com/webern-unibas-ch/awg-app/issues/844)) ([1a5347b](https://github.com/webern-unibas-ch/awg-app/commit/1a5347b80d3a7338e988adf4d72ee4a06009dee4); thanks to [@chael-mi](https://github.com/chael-mi)) +- **edition:** add edition complex M 31 ([b66bb54](https://github.com/webern-unibas-ch/awg-app/commit/b66bb54b5aa5c9e806af8ec2d5872c0c6d9e3d6c)) +- **edition:** adjust selectSvgSheet for cross-complex linking ([81a9940](https://github.com/webern-unibas-ch/awg-app/commit/81a99408e9a0462e21f35b4e04a6a5d27a0fbc45)) + +### Bug Fixes + +- **app:** avoid conditional expression for default assignment ([ae21c7f](https://github.com/webern-unibas-ch/awg-app/commit/ae21c7f3daa313815e8934b5c929e12812078d9b)) +- **app:** fix unexpected lexical declaration in case blocks ([ff30f8d](https://github.com/webern-unibas-ch/awg-app/commit/ff30f8d8df397c806b317df44a4ea717f4f3316b)) +- **app:** fix unnecessary use of boolean literals ([a2e999e](https://github.com/webern-unibas-ch/awg-app/commit/a2e999ec760a1a801ed82176d6abe21a27ba7c7c)) +- **app:** prefer object chaining for object checks ([e4c3749](https://github.com/webern-unibas-ch/awg-app/commit/e4c37493ab680a9f85f8ce5100ca1bc046dd5964)) +- **assets:** activate Textfassung 1 for m30 and m31 ([9ad3657](https://github.com/webern-unibas-ch/awg-app/commit/9ad36578f780d816d82881e089ae634ca7244f6f)) +- **assets:** add firm signs for m30, m31, m34, and m37 ([47692d0](https://github.com/webern-unibas-ch/awg-app/commit/47692d0aa3c9846a147a7263dc8f8d3bc2bf70cd)) +- **assets:** add linkBoxes for m30 ([2d0cf21](https://github.com/webern-unibas-ch/awg-app/commit/2d0cf21db080846302373dc9f046e14b4fbdb757)) +- **assets:** add missing data files and placeholders for m31 ([dac88d0](https://github.com/webern-unibas-ch/awg-app/commit/dac88d037ce295f505e1c2cb6955e03ffdc087b4)) +- **assets:** adjust data after changes to svg link models ([1ee7268](https://github.com/webern-unibas-ch/awg-app/commit/1ee72685f4f72886e795ad6483e21873bf861c71)) +- **assets:** adjust folio convolute for m34 and m37 ([957feb9](https://github.com/webern-unibas-ch/awg-app/commit/957feb90da833ff5acf2ec072979aae47c4a1ab9)) +- **assets:** fix folio convolute file for m30 ([d5dc23a](https://github.com/webern-unibas-ch/awg-app/commit/d5dc23a0e11388a44976978408707bb495407cb9)) +- **assets:** fix link box for m37 ([7ee69f0](https://github.com/webern-unibas-ch/awg-app/commit/7ee69f0722fa715ca4676699be6ade5dcee5d0a5)) +- **assets:** fix source descriptions for m34 and m37 ([bfd2e83](https://github.com/webern-unibas-ch/awg-app/commit/bfd2e83e120dcb261dd20d5d84f68ff3c47b7623)) +- **assets:** format textcritics files ([0db6905](https://github.com/webern-unibas-ch/awg-app/commit/0db69053d149983115980c59f3b3a8d7d4f6eb2d)) +- **assets:** rename svg file for m 31 ([6b49eae](https://github.com/webern-unibas-ch/awg-app/commit/6b49eaeca64ac6cfd7fa9fe9c6c511ce6aa4e0c0)) +- **assets:** unify naming of sources ([bbb444b](https://github.com/webern-unibas-ch/awg-app/commit/bbb444b220d17cc8814fe91238ad6d06f971b224)) +- **assets:** update files for m30, m31, and m37 ([#1308](https://github.com/webern-unibas-ch/awg-app/issues/1308)) ([e87a7e0](https://github.com/webern-unibas-ch/awg-app/commit/e87a7e06448c7ba2f7e03eae6888678ddc9e92a4)) +- **assets:** update source description for m30 ([a6ab069](https://github.com/webern-unibas-ch/awg-app/commit/a6ab069884e62bd27ec0ce0e177ee8ec5ea00934)) +- **assets:** update source evaluation for Textfassung 1 for m34 and m37 ([3b7b728](https://github.com/webern-unibas-ch/awg-app/commit/3b7b7283bf596242da777ce719d28b753a3af7d9)) +- **edition:** add graph query example for edition complexes ([fe0bce0](https://github.com/webern-unibas-ch/awg-app/commit/fe0bce0ed9dbee92987e313d5d75be0e711af693)) +- **edition:** adjust folio model for non-selectable items ([e8fb6ee](https://github.com/webern-unibas-ch/awg-app/commit/e8fb6eeced313a54c4556ca522100f8c07c31411)) +- **edition:** fix naming and formatting of graph RDF triples ([6dfd59b](https://github.com/webern-unibas-ch/awg-app/commit/6dfd59b29e285612f7671cf222c27ef564ab17ca)) +- **edition:** remove unused method from sheet viewer ([8fe1e8a](https://github.com/webern-unibas-ch/awg-app/commit/8fe1e8a79388b59933b1d9fd2a96ffd9932fb1d1)) + +### Tests + +- **edition:** adjust tests after changes to svg link models ([08e687f](https://github.com/webern-unibas-ch/awg-app/commit/08e687f10169bf6848bb9e4ec1c11ac7fba3de3f)) + +### Code Refactoring + +- **edition:** move tka description into separate component ([5a2fab9](https://github.com/webern-unibas-ch/awg-app/commit/5a2fab90742da512ec3f945f96bef8c8483615a7)) +- **search:** simplify methods in bibliography format pipe ([eebc87d](https://github.com/webern-unibas-ch/awg-app/commit/eebc87dde827c8e3917f0a29faa7bfbe2de8a444)) + +### Build System + +- **deps-dev:** bump prettier from 3.1.1 to 3.2.2 ([01b85dd](https://github.com/webern-unibas-ch/awg-app/commit/01b85dd64c43ce744e70005b4359ea4e950c240b)) +- **deps-dev:** bump the angular-cli-devkit group with 2 updates ([06c26a9](https://github.com/webern-unibas-ch/awg-app/commit/06c26a92297113138a01b23ae7aecb17379fa295)) +- **deps-dev:** bump the typescript-eslint group with 2 updates ([01f5691](https://github.com/webern-unibas-ch/awg-app/commit/01f569174ee7fd25760e1366aa9f5eb466c1b1c9)) +- **deps:** bump the angular group with 11 updates ([d5c2895](https://github.com/webern-unibas-ch/awg-app/commit/d5c28958b1ce7d76d34b88eb7c64034adc20e6d8)) +- **deps:** bump the angular group with 11 updates ([930dd6f](https://github.com/webern-unibas-ch/awg-app/commit/930dd6fc7f838d1c7fddeac4de0882ccfa12ea67)) + ### [0.11.2](https://github.com/webern-unibas-ch/awg-app/compare/v0.11.1...v0.11.2) (2024-01-10) ### Features diff --git a/package.json b/package.json index 584ae31498..911c105a95 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "awg-app", - "version": "0.11.2", + "version": "0.11.3", "license": "MIT", "author": { "name": "Stefan Münnich", @@ -82,16 +82,16 @@ "deploy:ci": "ng deploy --no-build --message=\"Release $npm_package_name (v$npm_package_version) on gh-pages\"" }, "dependencies": { - "@angular/animations": "^17.0.8", - "@angular/common": "^17.0.8", - "@angular/compiler": "^17.0.8", - "@angular/core": "^17.0.8", - "@angular/forms": "^17.0.8", - "@angular/localize": "^17.0.8", - "@angular/platform-browser": "^17.0.8", - "@angular/platform-browser-dynamic": "^17.0.8", - "@angular/platform-server": "^17.0.8", - "@angular/router": "^17.0.8", + "@angular/animations": "^17.1.0", + "@angular/common": "^17.1.0", + "@angular/compiler": "^17.1.0", + "@angular/core": "^17.1.0", + "@angular/forms": "^17.1.0", + "@angular/localize": "^17.1.0", + "@angular/platform-browser": "^17.1.0", + "@angular/platform-browser-dynamic": "^17.1.0", + "@angular/platform-server": "^17.1.0", + "@angular/router": "^17.1.0", "@codemirror/legacy-modes": "^6.3.3", "@fortawesome/angular-fontawesome": "^0.14.1", "@fortawesome/fontawesome-svg-core": "^6.5.1", @@ -118,22 +118,22 @@ "zone.js": "~0.14.2" }, "devDependencies": { - "@angular-devkit/build-angular": "^17.0.10", + "@angular-devkit/build-angular": "^17.1.0", "@angular-eslint/builder": "^17.2.0", "@angular-eslint/eslint-plugin": "^17.2.0", "@angular-eslint/eslint-plugin-template": "^17.2.0", "@angular-eslint/schematics": "^17.2.0", "@angular-eslint/template-parser": "^17.2.0", - "@angular/cli": "^17.0.10", - "@angular/compiler-cli": "^17.0.8", + "@angular/cli": "^17.1.0", + "@angular/compiler-cli": "^17.1.0", "@commitlint/cli": "^18.4.4", "@commitlint/config-angular": "^18.4.4", "@compodoc/compodoc": "^1.1.23", "@types/d3": "^7.4.3", "@types/jasmine": "~5.1.4", "@types/node": "^18.19.6", - "@typescript-eslint/eslint-plugin": "^6.18.1", - "@typescript-eslint/parser": "^6.18.1", + "@typescript-eslint/eslint-plugin": "^6.19.0", + "@typescript-eslint/parser": "^6.19.0", "angular-cli-ghpages": "^1.0.7", "conventional-recommended-bump": "^9.0.0", "eslint": "^8.56.0", @@ -152,7 +152,7 @@ "karma-jasmine": "~5.1.0", "karma-jasmine-html-reporter": "^2.1.0", "lint-staged": "^15.2.0", - "prettier": "^3.1.1", + "prettier": "^3.2.2", "source-map-explorer": "^2.5.3", "standard-version": "^9.5.0", "typescript": "~5.2.2", diff --git a/src/app/app.globals.ts b/src/app/app.globals.ts index 05b01b3993..9ce99c0f87 100644 --- a/src/app/app.globals.ts +++ b/src/app/app.globals.ts @@ -1,15 +1,15 @@ // THIS IS AN AUTO-GENERATED FILE. DO NOT CHANGE IT MANUALLY! -// Generated last time on Wed, Jan 10, 2024 9:50:54 PM +// Generated last time on Fri, Jan 19, 2024 10:06:33 PM /** * The latest version of the AWG App */ -export const appVersion = '0.11.2'; +export const appVersion = '0.11.3'; /** * The release date of the latest version of the AWG App */ -export const appVersionReleaseDate = '10. Januar 2024'; +export const appVersionReleaseDate = '19. Januar 2024'; /** * The URL of the AWG App diff --git a/src/app/core/services/conversion-service/conversion.service.ts b/src/app/core/services/conversion-service/conversion.service.ts index b84eab09c7..c5d95edbd1 100644 --- a/src/app/core/services/conversion-service/conversion.service.ts +++ b/src/app/core/services/conversion-service/conversion.service.ts @@ -279,7 +279,7 @@ export class ConversionService extends ApiService { * @returns {ResourceDetail} The converted resource detail object. */ convertResourceData(resourceData: IResourceDataResponse, resourceId: string): ResourceDetail { - if (!resourceData || !resourceData[0] || !resourceData[0].access) { + if (!resourceData?.[0]?.access) { return new ResourceDetail(undefined, undefined); } if (resourceData[0].access === 'OK') { diff --git a/src/app/core/services/gnd-service/gnd.service.ts b/src/app/core/services/gnd-service/gnd.service.ts index 8ac9207409..85504caacf 100644 --- a/src/app/core/services/gnd-service/gnd.service.ts +++ b/src/app/core/services/gnd-service/gnd.service.ts @@ -98,7 +98,7 @@ export class GndService extends StorageService { * @returns {void} It exposes or removes the event to/from the storage. */ exposeGnd(gndEvent: GndEvent) { - if (!gndEvent || !gndEvent.type) { + if (!gndEvent?.type) { return; } switch (gndEvent.type) { diff --git a/src/app/core/services/http-cache/http-cache.service.ts b/src/app/core/services/http-cache/http-cache.service.ts index 4ffbf3b58f..d5f4487a23 100644 --- a/src/app/core/services/http-cache/http-cache.service.ts +++ b/src/app/core/services/http-cache/http-cache.service.ts @@ -55,9 +55,7 @@ export class HttpCacheService implements HttpCache { * @returns {HttpResponse | null} A cached response or null. */ get(req: HttpRequest): HttpResponse | null { - return this._cachedResponses && this._cachedResponses.has(req.urlWithParams) - ? this._cachedResponses.get(req.urlWithParams) - : null; + return this._cachedResponses?.has(req.urlWithParams) ? this._cachedResponses.get(req.urlWithParams) : null; } /** diff --git a/src/app/shared/modal/data/modal-content-snippets.data.ts b/src/app/shared/modal/data/modal-content-snippets.data.ts index 332e08196a..ad5604472d 100644 --- a/src/app/shared/modal/data/modal-content-snippets.data.ts +++ b/src/app/shared/modal/data/modal-content-snippets.data.ts @@ -16,10 +16,10 @@ export const MODAL_CONTENT_SNIPPETS = { '

Die Beschreibung der Quellen A sowie C–D einschließlich der darin gegebenenfalls enthaltenen Korrekturen erfolgt im Zusammenhang der vollständigen Edition der Drei Gesänge aus Viae Inviae von Hildegard Jone op. 23 in AWG I/5.

', OP24_SOURCE_NOT_AVAILABLE: '

Die Beschreibung der Quellen A sowie C–D einschließlich der darin gegebenenfalls enthaltenen Korrekturen erfolgt im Zusammenhang der vollständigen Edition des Konzert für neun Instrumente op. 24 in AWG I/1.

', - OP25_SHEET_COMING_SOON: - 'Die edierten Notentexte weiterer Skizzen der Drei Lieder nach Gedichten von Hildegard Jone op. 25 erscheinen in Kürze (02/2022).', OP25_SOURCE_NOT_AVAILABLE: '

Die Beschreibung der Quellen D und E einschließlich der darin gegebenenfalls enthaltenen Korrekturen erfolgt im Zusammenhang der vollständigen Edition der Drei Lieder nach Gedichten von Hildegard Jone op. 25 in AWG I/5.

', + VOL_2A_EDITION_COMING_SOON: + '

Die Einleitungen, edierten Notentexte und Kritischen Berichte zu

  • Studienkomposition für Klavier M* 402,
  • Studienkomposition für Klavier M* 403

erscheinen im Zusammenhang der vollständigen Edition der Studienkompositionen für Klavier in AWG II/2a.

', M198: '

Das Fragment „Schien mir’s als ich sah die Sonne“ (M 198) für Chor und Orchester wird in AWG II/3 ediert.

', HINT_EDITION_SHEETS: '

\n' + diff --git a/src/app/shared/table/table.component.ts b/src/app/shared/table/table.component.ts index d34f3c4895..3f6fac97b0 100644 --- a/src/app/shared/table/table.component.ts +++ b/src/app/shared/table/table.component.ts @@ -246,7 +246,7 @@ export class TableComponent implements OnInit { if (rowEntry === null || rowEntry === undefined) { return false; } - return rowEntry['label'] && rowEntry['label'].toString().toLowerCase().includes(term); + return rowEntry['label']?.toString().toLowerCase().includes(term); }) ); return this.tableData.filteredRows; diff --git a/src/app/views/data-view/data-outlets/bibliography/bibliography-format.pipe.ts b/src/app/views/data-view/data-outlets/bibliography/bibliography-format.pipe.ts index 1668339248..087208e4bb 100644 --- a/src/app/views/data-view/data-outlets/bibliography/bibliography-format.pipe.ts +++ b/src/app/views/data-view/data-outlets/bibliography/bibliography-format.pipe.ts @@ -321,30 +321,29 @@ export class BibliographyFormatPipe implements PipeTransform { console.warn('Verlag fehlt: "' + out + '" (' + this._bibEntry['Kurztitel'] + ')'); } } - } else { - if (pub) { - out += pubPlace + ': '; - // Publisher == object - // Case: "Wien: Böhlau, Lafite, " - if (typeof pub === 'object') { - const publ = Object.keys(pub).length; - for (let i = 0; i < publ; i++) { - out += pub[i] + ', '; - } - } else { - // Publisher == String - // Case: "Wien: Böhlau," - out += pub + ', '; + } else if (pub) { + out += pubPlace + ': '; + // Publisher == object + // Case: "Wien: Böhlau, Lafite, " + if (typeof pub === 'object') { + const publ = Object.keys(pub).length; + for (let i = 0; i < publ; i++) { + out += pub[i] + ', '; } } else { - // Place without publisher (e.g. "Hochschulschriften") - // Case: "Wien, " - if (!this._bibEntry['unpubliziert']) { - console.warn('Verlag fehlt: "' + out + '" (' + this._bibEntry['Kurztitel'] + ')'); - } - out += pubPlace + ', '; + // Publisher == String + // Case: "Wien: Böhlau," + out += pub + ', '; } + } else { + // Place without publisher (e.g. "Hochschulschriften") + // Case: "Wien, " + if (!this._bibEntry['unpubliziert']) { + console.warn('Verlag fehlt: "' + out + '" (' + this._bibEntry['Kurztitel'] + ')'); + } + out += pubPlace + ', '; } + return out; } @@ -429,15 +428,11 @@ export class BibliographyFormatPipe implements PipeTransform { * @returns {string} The splitted name(s). */ private _splitName(name: string, preDelimiter: string): string { - let tmp = []; - if (name.match(',')) { - tmp = name.split(', '); - // Changes positions of first and last name - // Look here: http://stackoverflow.com/a/5306832 - tmp.splice(1, 0, tmp.splice(0, 1)[0]); - return preDelimiter + tmp[0] + ' ' + tmp[1]; + if (name.includes(',')) { + const [lastName, firstName] = name.split(', '); + return `${preDelimiter}${firstName} ${lastName}`; } else { - return preDelimiter + name; + return `${preDelimiter}${name}`; } } } diff --git a/src/app/views/data-view/data-outlets/resource-detail/resource-detail-html/resource-detail-html-content/props/props.component.ts b/src/app/views/data-view/data-outlets/resource-detail/resource-detail-html/resource-detail-html-content/props/props.component.ts index a1f60de698..4fe41ffba9 100644 --- a/src/app/views/data-view/data-outlets/resource-detail/resource-detail-html/resource-detail-html-content/props/props.component.ts +++ b/src/app/views/data-view/data-outlets/resource-detail/resource-detail-html/resource-detail-html-content/props/props.component.ts @@ -82,7 +82,7 @@ export class ResourceDetailHtmlContentPropsComponent implements OnChanges, OnDes * @returns {void} Emits the event. */ exposeGnd(gndEvent: GndEvent): void { - if (!gndEvent || !gndEvent.type) { + if (!gndEvent?.type) { return; } this.gndRequest.emit(gndEvent); diff --git a/src/app/views/data-view/data-outlets/resource-detail/resource-detail-html/resource-detail-html-content/resource-detail-html-content.component.ts b/src/app/views/data-view/data-outlets/resource-detail/resource-detail-html/resource-detail-html-content/resource-detail-html-content.component.ts index 019f48e8b8..d7894e1504 100644 --- a/src/app/views/data-view/data-outlets/resource-detail/resource-detail-html/resource-detail-html-content/resource-detail-html-content.component.ts +++ b/src/app/views/data-view/data-outlets/resource-detail/resource-detail-html/resource-detail-html-content/resource-detail-html-content.component.ts @@ -54,7 +54,7 @@ export class ResourceDetailHtmlContentComponent { * @returns {void} Emits the event. */ exposeGnd(gndEvent: GndEvent): void { - if (!gndEvent || !gndEvent.type) { + if (!gndEvent?.type) { return; } this.gndRequest.emit(gndEvent); diff --git a/src/app/views/data-view/data-outlets/resource-detail/resource-detail-html/resource-detail-html.component.ts b/src/app/views/data-view/data-outlets/resource-detail/resource-detail-html/resource-detail-html.component.ts index 2b049a4f60..9c8709f4de 100644 --- a/src/app/views/data-view/data-outlets/resource-detail/resource-detail-html/resource-detail-html.component.ts +++ b/src/app/views/data-view/data-outlets/resource-detail/resource-detail-html/resource-detail-html.component.ts @@ -52,7 +52,7 @@ export class ResourceDetailHtmlComponent { * @returns {void} Emits the event. */ exposeGnd(gndEvent: GndEvent): void { - if (!gndEvent || !gndEvent.type) { + if (!gndEvent?.type) { return; } this.gndRequest.emit(gndEvent); diff --git a/src/app/views/data-view/models/resource-detail-header.model.ts b/src/app/views/data-view/models/resource-detail-header.model.ts index 50474056b1..7517336dc8 100644 --- a/src/app/views/data-view/models/resource-detail-header.model.ts +++ b/src/app/views/data-view/models/resource-detail-header.model.ts @@ -75,7 +75,7 @@ export class ResourceDetailHeader { // Extract restype specific title for header switch (info.restype_id) { // CHRONOLOGIE - case '28': + case '28': { // Richtext value has already been converted in detail using plugin "htmlConverter" let htmlstr = props['webern-onto:event'].toHtml[0]; @@ -84,42 +84,48 @@ export class ResourceDetailHeader { this.title = htmlstr; break; + } // KORRESPONDENZ (same as SUPPLEMENT) - case '29': + case '29': { this.title = props['dc:title'].toHtml[0] + '
' + props['dc:date'].toHtml[0]; break; + } // SUPPLEMENT - case '125': + case '125': { this.title = props['dc:title'].toHtml[0] + '
' + props['dc:date'].toHtml[0]; break; + } // MUSIKSTÜCK (Moldenhauer-Nummer) - case '36': + case '36': { this.title = '[M ' + props['webern-onto:mnr'].toHtml[0] + '] ' + props['dc:title'].toHtml[0]; break; - + } // WERK - case '43': + case '43': { this.title = props['dc:title'].toHtml[0]; break; - + } // PERSON - case '45': + case '45': { const lname: string = props['salsah:lastname'].toHtml[0]; const fname: string = props['salsah:firstname'].toHtml[0]; this.title = fname + ' ' + lname; break; + } // BIBLIOGRAPHIE - case '126': + case '126': { this.title = props['webern-onto:bibl_title_short'].toHtml[0]; break; + } // DEFAULT - default: + default: { this.title = info.restype_description; + } } } else { // Header for undefined & restricted object diff --git a/src/app/views/data-view/services/data-api.service.ts b/src/app/views/data-view/services/data-api.service.ts index c03bd932d4..5a42ab3f7b 100644 --- a/src/app/views/data-view/services/data-api.service.ts +++ b/src/app/views/data-view/services/data-api.service.ts @@ -1,7 +1,7 @@ import { HttpClient, HttpParams } from '@angular/common/http'; import { Injectable } from '@angular/core'; -import { forkJoin as observableForkJoin, Observable, of as observableOf } from 'rxjs'; +import { Observable, forkJoin as observableForkJoin, of as observableOf } from 'rxjs'; import { defaultIfEmpty, map } from 'rxjs/operators'; import { ApiService, ConversionService } from '@awg-core/services/'; @@ -186,10 +186,10 @@ export class DataApiService extends ApiService { * @returns {Observable} The observable with the SearchResponseJson data. */ getSearchData(searchParams: SearchParams): Observable { - if (!searchParams || !searchParams.query) { - return observableOf(new SearchResponseJson()); - } - if (typeof searchParams.query === 'object' && !searchParams.query['filterByRestype']) { + if ( + !searchParams?.query || + (typeof searchParams?.query === 'object' && !searchParams?.query?.['filterByRestype']) + ) { return observableOf(new SearchResponseJson()); } diff --git a/src/app/views/edition-view/data/edition-complexes.data.ts b/src/app/views/edition-view/data/edition-complexes.data.ts index 3d1615e6df..f17fb6027f 100644 --- a/src/app/views/edition-view/data/edition-complexes.data.ts +++ b/src/app/views/edition-view/data/edition-complexes.data.ts @@ -36,6 +36,29 @@ export class EDITION_COMPLEXES { EDITION_TYPE_CONSTANTS.SKETCH_EDITION ); + /** + * An EditionComplex object for M 31. + */ + static readonly M31: EditionComplex = new EditionComplex( + { + title: 'Studienkomposition für Klavier', + catalogueType: EDITION_CATALOGUE_TYPE_CONSTANTS.MNR, + catalogueNumber: '31', + }, + { + editors: [ + { + name: 'Michael Matter', + homepage: AppConfig.AWG_PROJECT_URL + 'index.php?id=3', + }, + ], + lastModified: '22. Februar 2023', + }, + EDITION_ROUTE_CONSTANTS.SERIES_2, + EDITION_ROUTE_CONSTANTS.SECTION_2A, + EDITION_TYPE_CONSTANTS.SKETCH_EDITION + ); + /** * An EditionComplex object for M 34. */ diff --git a/src/app/views/edition-view/data/edition-firm-signs.data.ts b/src/app/views/edition-view/data/edition-firm-signs.data.ts index 6347767939..a35861a3dc 100644 --- a/src/app/views/edition-view/data/edition-firm-signs.data.ts +++ b/src/app/views/edition-view/data/edition-firm-signs.data.ts @@ -32,6 +32,33 @@ export const EDITION_FIRM_SIGNS_DATA = { full: 'J. E. & Co. [diagonal ansteigend auf schildförmiger Papierrolle, rechts von einem Löwen gehalten, links und unten Blattgirlande] | Protokoll. Schutzmarke | No. 3 | 14 linig.', }, + /** + * The path to the assets image of a firm sign: JE No. 5, 18 Lines. + */ + FIRM_JE_NO_5_LIN_18B: { + route: 'assets/img/edition/firm-signs/firm_je_no5_lin18b.png', + short: '[JE] | No. 5 | 18 linig.', + full: 'J. E. & Co. [diagonal ansteigend auf schildförmiger Papierrolle, rechts von einem Löwen gehalten, links und unten Blattgirlande] | Protokoll. Schutzmarke | No. 5 | 18 linig.', + }, + + /** + * The path to the assets image of a firm sign: JE No. 5, 18 Lines. + */ + FIRM_JE_NO_5_LIN_18C: { + route: 'assets/img/edition/firm-signs/firm_je_no5_lin18c.png', + short: '[JE] | No. 5 | 18 linig.', + full: 'J. E. & Co. [diagonal ansteigend auf schildförmiger Papierrolle, rechts von einem Löwen gehalten, links und unten Blattgirlande] | Protokoll. Schutzmarke | No. 5 | 18 linig.', + }, + + /** + * The path to the assets image of a firm sign: JE No. 5, 18 Lines. + */ + FIRM_JE_NO_5_LIN_18D: { + route: 'assets/img/edition/firm-signs/firm_je_no5_lin18d.png', + short: '[JE] | No. 5 | 18 linig.', + full: 'J. E. & Co. [diagonal ansteigend auf schildförmiger Papierrolle, rechts von einem Löwen gehalten, links und unten Blattgirlande] | Protokoll. Schutzmarke | No. 5 | 18 linig.', + }, + /** * The path to the assets image of a firm sign: JE No. 6, 20 Lines. */ diff --git a/src/app/views/edition-view/data/edition-outline.data.ts b/src/app/views/edition-view/data/edition-outline.data.ts index 3f57bed9e5..893a19ae25 100644 --- a/src/app/views/edition-view/data/edition-outline.data.ts +++ b/src/app/views/edition-view/data/edition-outline.data.ts @@ -66,6 +66,7 @@ export const EDITION_OUTLINE_DATA: EditionOutlineSeries[] = [ opus: [], mnr: [ { complex: EDITION_COMPLEXES.M30, disabled: false }, + { complex: EDITION_COMPLEXES.M31, disabled: false }, { complex: EDITION_COMPLEXES.M34, disabled: false }, { complex: EDITION_COMPLEXES.M37, disabled: false }, ], diff --git a/src/app/views/edition-view/edition-outlets/edition-complex/edition-detail/edition-graph/graph-visualizer/construct-results/construct-results.component.html b/src/app/views/edition-view/edition-outlets/edition-complex/edition-detail/edition-graph/graph-visualizer/construct-results/construct-results.component.html index 264d027537..62c08798ab 100644 --- a/src/app/views/edition-view/edition-outlets/edition-complex/edition-detail/edition-graph/graph-visualizer/construct-results/construct-results.component.html +++ b/src/app/views/edition-view/edition-outlets/edition-complex/edition-detail/edition-graph/graph-visualizer/construct-results/construct-results.component.html @@ -14,7 +14,7 @@ diff --git a/src/app/views/edition-view/edition-outlets/edition-complex/edition-detail/edition-graph/graph-visualizer/construct-results/construct-results.component.spec.ts b/src/app/views/edition-view/edition-outlets/edition-complex/edition-detail/edition-graph/graph-visualizer/construct-results/construct-results.component.spec.ts index cf4f49698a..1cb81bb56d 100644 --- a/src/app/views/edition-view/edition-outlets/edition-complex/edition-detail/edition-graph/graph-visualizer/construct-results/construct-results.component.spec.ts +++ b/src/app/views/edition-view/edition-outlets/edition-complex/edition-detail/edition-graph/graph-visualizer/construct-results/construct-results.component.spec.ts @@ -24,7 +24,7 @@ import { ConstructResultsComponent } from './construct-results.component'; // Mock components @Component({ selector: 'awg-force-graph', template: '' }) class ForceGraphStubComponent { - @Input() queryResultTriples: Triple[]; + @Input() currentQueryResultTriples: Triple[]; @Input() height: number; @Output() clickedNodeRequest: EventEmitter = new EventEmitter(); } @@ -502,7 +502,7 @@ describe('ConstructResultsComponent (DONE)', () => { ForceGraphStubComponent ) as ForceGraphStubComponent; - expectToEqual(forceGraphCmp.queryResultTriples, [expectedQueryResult]); + expectToEqual(forceGraphCmp.currentQueryResultTriples, [expectedQueryResult]); expectToBe(forceGraphCmp.height, expectedHeight); }); }); @@ -852,7 +852,7 @@ describe('ConstructResultsComponent (DONE)', () => { ForceGraphStubComponent ) as ForceGraphStubComponent; - expectToEqual(forceGraphCmp.queryResultTriples, [expectedQueryResult]); + expectToEqual(forceGraphCmp.currentQueryResultTriples, [expectedQueryResult]); expectToBe(forceGraphCmp.height, expectedHeight); }); }); diff --git a/src/app/views/edition-view/edition-outlets/edition-complex/edition-detail/edition-graph/graph-visualizer/construct-results/construct-results.component.ts b/src/app/views/edition-view/edition-outlets/edition-complex/edition-detail/edition-graph/graph-visualizer/construct-results/construct-results.component.ts index 562f138a3e..e728c02e64 100644 --- a/src/app/views/edition-view/edition-outlets/edition-complex/edition-detail/edition-graph/graph-visualizer/construct-results/construct-results.component.ts +++ b/src/app/views/edition-view/edition-outlets/edition-complex/edition-detail/edition-graph/graph-visualizer/construct-results/construct-results.component.ts @@ -77,7 +77,7 @@ export class ConstructResultsComponent { * @returns {boolean} The boolean value of the comparison. */ isAccordionItemDisabled(): boolean { - return this.isFullscreen ? true : false; + return this.isFullscreen; } /** diff --git a/src/app/views/edition-view/edition-outlets/edition-complex/edition-detail/edition-graph/graph-visualizer/force-graph/force-graph.component.html b/src/app/views/edition-view/edition-outlets/edition-complex/edition-detail/edition-graph/graph-visualizer/force-graph/force-graph.component.html index 8c6386209a..ed5c77fcff 100644 --- a/src/app/views/edition-view/edition-outlets/edition-complex/edition-detail/edition-graph/graph-visualizer/force-graph/force-graph.component.html +++ b/src/app/views/edition-view/edition-outlets/edition-complex/edition-detail/edition-graph/graph-visualizer/force-graph/force-graph.component.html @@ -26,13 +26,13 @@ - @if (queryResultTriples) { + @if (currentQueryResultTriples) {

+ [disabled]="currentQueryResultTriples.length === 0">
@for (limitValue of limitValues; track limitValue) { - @if (queryResultTriples.length > limitValue) { + @if (currentQueryResultTriples.length > limitValue) { } } -
diff --git a/src/app/views/edition-view/edition-outlets/edition-complex/edition-detail/edition-graph/graph-visualizer/force-graph/force-graph.component.ts b/src/app/views/edition-view/edition-outlets/edition-complex/edition-detail/edition-graph/graph-visualizer/force-graph/force-graph.component.ts index d405315ad8..ca889c76e8 100644 --- a/src/app/views/edition-view/edition-outlets/edition-complex/edition-detail/edition-graph/graph-visualizer/force-graph/force-graph.component.ts +++ b/src/app/views/edition-view/edition-outlets/edition-complex/edition-detail/edition-graph/graph-visualizer/force-graph/force-graph.component.ts @@ -69,11 +69,11 @@ const FORCES = { }) export class ForceGraphComponent implements OnInit, OnChanges, OnDestroy { /** - * Input variable: queryResultTriples. + * Input variable: currentQueryResultTriples. * * It keeps the triples of the query result. */ - @Input() queryResultTriples: Triple[]; + @Input() currentQueryResultTriples: Triple[]; /** * Input variable: height. @@ -224,7 +224,7 @@ export class ForceGraphComponent implements OnInit, OnChanges, OnDestroy { */ @HostListener('window:resize') onResize() { // Guard against resize before view is rendered - if (!this._graphContainer || !this.queryResultTriples) { + if (!this._graphContainer || !this.currentQueryResultTriples) { return; } @@ -259,12 +259,10 @@ export class ForceGraphComponent implements OnInit, OnChanges, OnDestroy { * @param {SimpleChanges} changes The changes of the input. */ ngOnChanges(changes: SimpleChanges) { - if ( - changes['queryResultTriples'] && - changes['queryResultTriples'].currentValue && - !changes['queryResultTriples'].isFirstChange() - ) { - this.queryResultTriples = changes['queryResultTriples'].currentValue; + const { queryResultTriples } = changes; + + if (queryResultTriples?.currentValue && !queryResultTriples.isFirstChange()) { + this.currentQueryResultTriples = queryResultTriples.currentValue; this._redraw(); } } @@ -351,7 +349,7 @@ export class ForceGraphComponent implements OnInit, OnChanges, OnDestroy { * @returns {void} Redraws the graph. */ private _redraw(): void { - if (this.queryResultTriples) { + if (this.currentQueryResultTriples) { this._cleanSVG(); this._createSVG(); this._attachData(); @@ -427,7 +425,7 @@ export class ForceGraphComponent implements OnInit, OnChanges, OnDestroy { */ private _attachData(): void { // Limit result length - const triples: Triple[] = this.graphVisualizerService.limitTriples(this.queryResultTriples, this.limit); + const triples: Triple[] = this.graphVisualizerService.limitTriples(this.currentQueryResultTriples, this.limit); // If type of triples is text/turtle (not array) // The triples must be parsed to objects instead @@ -787,7 +785,7 @@ export class ForceGraphComponent implements OnInit, OnChanges, OnDestroy { * @returns { width: number; height: number } The container dimensions. */ private _getContainerDimensions(container: ElementRef): { width: number; height: number } { - if (!container || !container.nativeElement) { + if (!container?.nativeElement) { return null; } return { width: container.nativeElement.clientWidth, height: container.nativeElement.clientHeight }; diff --git a/src/app/views/edition-view/edition-outlets/edition-complex/edition-detail/edition-graph/graph-visualizer/graph-visualizer.component.ts b/src/app/views/edition-view/edition-outlets/edition-complex/edition-detail/edition-graph/graph-visualizer/graph-visualizer.component.ts index 3be62f7e0f..e4b01f4861 100644 --- a/src/app/views/edition-view/edition-outlets/edition-complex/edition-detail/edition-graph/graph-visualizer/graph-visualizer.component.ts +++ b/src/app/views/edition-view/edition-outlets/edition-complex/edition-detail/edition-graph/graph-visualizer/graph-visualizer.component.ts @@ -227,7 +227,7 @@ export class GraphVisualizerComponent implements OnInit { * @returns {void} Shows the error message. */ showErrorMessage(toastMessage: ToastMessage): void { - if (!toastMessage || !toastMessage.message) { + if (!toastMessage?.message) { return; } diff --git a/src/app/views/edition-view/edition-outlets/edition-complex/edition-detail/edition-graph/graph-visualizer/models/d3-force-simulation.model.ts b/src/app/views/edition-view/edition-outlets/edition-complex/edition-detail/edition-graph/graph-visualizer/models/d3-force-simulation.model.ts index 9606c18971..b70c74efd9 100644 --- a/src/app/views/edition-view/edition-outlets/edition-complex/edition-detail/edition-graph/graph-visualizer/models/d3-force-simulation.model.ts +++ b/src/app/views/edition-view/edition-outlets/edition-complex/edition-detail/edition-graph/graph-visualizer/models/d3-force-simulation.model.ts @@ -131,7 +131,7 @@ export class D3ForceSimulation { * @returns {void} It inits the simulation. */ private _initSimulation(options: D3ForceSimulationOptions): void { - if (!options || !options.width || !options.height) { + if (!options?.width || !options?.height) { throw new Error('Missing options when initializing simulation'); } diff --git a/src/app/views/edition-view/edition-outlets/edition-complex/edition-detail/edition-graph/graph-visualizer/prefix-pipe/prefix.pipe.ts b/src/app/views/edition-view/edition-outlets/edition-complex/edition-detail/edition-graph/graph-visualizer/prefix-pipe/prefix.pipe.ts index d2293ee620..8632fcb9ee 100644 --- a/src/app/views/edition-view/edition-outlets/edition-complex/edition-detail/edition-graph/graph-visualizer/prefix-pipe/prefix.pipe.ts +++ b/src/app/views/edition-view/edition-outlets/edition-complex/edition-detail/edition-graph/graph-visualizer/prefix-pipe/prefix.pipe.ts @@ -45,14 +45,15 @@ export class PrefixPipe implements PipeTransform { }); break; } - default: + default: { // This branch should not be reached const exhaustiveCheck: never = prefixForm; throw new Error( `The prefixForm must be ${PrefixForm.SHORT} or ${PrefixForm.LONG}, but was: ${exhaustiveCheck}.` ); + } } // If the value was not transformed, return the original value - return transformedValue ? transformedValue : value; + return transformedValue || value; } } diff --git a/src/app/views/edition-view/edition-outlets/edition-complex/edition-detail/edition-graph/graph-visualizer/select-results/select-results.component.ts b/src/app/views/edition-view/edition-outlets/edition-complex/edition-detail/edition-graph/graph-visualizer/select-results/select-results.component.ts index 8b9eccfd9f..6c16ec1548 100644 --- a/src/app/views/edition-view/edition-outlets/edition-complex/edition-detail/edition-graph/graph-visualizer/select-results/select-results.component.ts +++ b/src/app/views/edition-view/edition-outlets/edition-complex/edition-detail/edition-graph/graph-visualizer/select-results/select-results.component.ts @@ -68,7 +68,7 @@ export class SelectResultsComponent { * @returns {boolean} The boolean value of the comparison. */ isAccordionItemDisabled(): boolean { - return this.isFullscreen ? true : false; + return this.isFullscreen; } /** diff --git a/src/app/views/edition-view/edition-outlets/edition-complex/edition-detail/edition-graph/graph-visualizer/services/graph-visualizer.service.ts b/src/app/views/edition-view/edition-outlets/edition-complex/edition-detail/edition-graph/graph-visualizer/services/graph-visualizer.service.ts index 08eee97761..fa996a0668 100644 --- a/src/app/views/edition-view/edition-outlets/edition-complex/edition-detail/edition-graph/graph-visualizer/services/graph-visualizer.service.ts +++ b/src/app/views/edition-view/edition-outlets/edition-complex/edition-detail/edition-graph/graph-visualizer/services/graph-visualizer.service.ts @@ -11,8 +11,8 @@ import { Namespace, NamespaceType, PrefixForm, - QueryTypeIndex, QueryResult, + QueryTypeIndex, RDFStoreConstructResponse, RDFStoreConstructResponseTriple, RDFStoreSelectResponse, @@ -392,16 +392,19 @@ export class GraphVisualizerService { let prefixStr; switch (type) { - case NamespaceType.TURTLE: + case NamespaceType.TURTLE: { prefixStr = '@prefix'.toLowerCase(); break; - case NamespaceType.SPARQL: + } + case NamespaceType.SPARQL: { prefixStr = 'PREFIX'.toLowerCase(); break; - default: + } + default: { // This branch should not be reached const exhaustiveCheck: never = type; throw new Error(`The type must be TURTLE or SPARQL, but was: ${exhaustiveCheck}.`); + } } // Get index of all occurrences of prefix string diff --git a/src/app/views/edition-view/edition-outlets/edition-complex/edition-detail/edition-graph/graph-visualizer/sparql-editor/sparql-editor.component.ts b/src/app/views/edition-view/edition-outlets/edition-complex/edition-detail/edition-graph/graph-visualizer/sparql-editor/sparql-editor.component.ts index 2e613fdc40..fa9e4e5eef 100644 --- a/src/app/views/edition-view/edition-outlets/edition-complex/edition-detail/edition-graph/graph-visualizer/sparql-editor/sparql-editor.component.ts +++ b/src/app/views/edition-view/edition-outlets/edition-complex/edition-detail/edition-graph/graph-visualizer/sparql-editor/sparql-editor.component.ts @@ -190,27 +190,31 @@ export class SparqlEditorComponent implements OnInit, OnChanges { */ switchQueryType(viewType: ViewHandleTypes): void { switch (viewType) { - case ViewHandleTypes.TABLE: + case ViewHandleTypes.TABLE: { if (this.query.queryType === 'construct' && this.query.queryString.includes('CONSTRUCT')) { this.query.queryString = this.query.queryString.replace('CONSTRUCT', 'SELECT *'); this.query.queryType = 'select'; } break; - case ViewHandleTypes.GRAPH: + } + case ViewHandleTypes.GRAPH: { if (this.query.queryType === 'select' && this.query.queryString.includes('SELECT')) { this.query.queryString = this.query.queryString.replace(/SELECT.*\n/, 'CONSTRUCT\n'); this.query.queryType = 'construct'; } break; - case ViewHandleTypes.GRID: + } + case ViewHandleTypes.GRID: { // Do nothing break; - default: + } + default: { // This branch should not be reached const exhaustiveCheck: never = viewType; throw new Error( `The view must be ${ViewHandleTypes.GRAPH} or ${ViewHandleTypes.TABLE}, but was: ${exhaustiveCheck}.` ); + } } } @@ -222,13 +226,7 @@ export class SparqlEditorComponent implements OnInit, OnChanges { * @returns {boolean} The boolean value of the check result. */ isExampleQueriesEnabled(): boolean { - return !!( - this.query && - this.query.queryType && - this.query.queryLabel && - this.query.queryString && - this.queryList - ); + return !!(this.query?.queryType && this.query?.queryLabel && this.query?.queryString && this.queryList); } /** @@ -307,7 +305,7 @@ export class SparqlEditorComponent implements OnInit, OnChanges { * @returns {boolean} The boolean value of the comparison. */ isAccordionItemCollapsed(): boolean { - return this.isFullscreen ? false : true; + return !this.isFullscreen; } /** @@ -319,6 +317,6 @@ export class SparqlEditorComponent implements OnInit, OnChanges { * @returns {boolean} The boolean value of the comparison. */ isAccordionItemDisabled(): boolean { - return this.isFullscreen ? true : false; + return this.isFullscreen; } } diff --git a/src/app/views/edition-view/edition-outlets/edition-complex/edition-detail/edition-graph/graph-visualizer/triples-editor/triples-editor.component.ts b/src/app/views/edition-view/edition-outlets/edition-complex/edition-detail/edition-graph/graph-visualizer/triples-editor/triples-editor.component.ts index 8fae0a265a..ceb53a691e 100644 --- a/src/app/views/edition-view/edition-outlets/edition-complex/edition-detail/edition-graph/graph-visualizer/triples-editor/triples-editor.component.ts +++ b/src/app/views/edition-view/edition-outlets/edition-complex/edition-detail/edition-graph/graph-visualizer/triples-editor/triples-editor.component.ts @@ -124,7 +124,7 @@ export class TriplesEditorComponent { * @returns {boolean} The boolean value of the comparison. */ isAccordionItemCollapsed(): boolean { - return this.isFullscreen ? false : true; + return !this.isFullscreen; } /** @@ -136,6 +136,6 @@ export class TriplesEditorComponent { * @returns {boolean} The boolean value of the comparison. */ isAccordionItemDisabled(): boolean { - return this.isFullscreen ? true : false; + return this.isFullscreen; } } diff --git a/src/app/views/edition-view/edition-outlets/edition-complex/edition-detail/edition-graph/graph-visualizer/unsupported-type-results/unsupported-type-results.component.ts b/src/app/views/edition-view/edition-outlets/edition-complex/edition-detail/edition-graph/graph-visualizer/unsupported-type-results/unsupported-type-results.component.ts index fa1cf32aef..5c98858ba2 100644 --- a/src/app/views/edition-view/edition-outlets/edition-complex/edition-detail/edition-graph/graph-visualizer/unsupported-type-results/unsupported-type-results.component.ts +++ b/src/app/views/edition-view/edition-outlets/edition-complex/edition-detail/edition-graph/graph-visualizer/unsupported-type-results/unsupported-type-results.component.ts @@ -38,6 +38,6 @@ export class UnsupportedTypeResultsComponent { * @returns {boolean} The boolean value of the comparison. */ isAccordionItemDisabled(): boolean { - return this.isFullscreen ? true : false; + return this.isFullscreen; } } diff --git a/src/app/views/edition-view/edition-outlets/edition-complex/edition-detail/edition-intro/edition-intro.component.spec.ts b/src/app/views/edition-view/edition-outlets/edition-complex/edition-detail/edition-intro/edition-intro.component.spec.ts index 7b98fece95..bb4d27f1b6 100644 --- a/src/app/views/edition-view/edition-outlets/edition-complex/edition-detail/edition-intro/edition-intro.component.spec.ts +++ b/src/app/views/edition-view/edition-outlets/edition-complex/edition-detail/edition-intro/edition-intro.component.spec.ts @@ -48,6 +48,8 @@ describe('IntroComponent (DONE)', () => { let expectedEditionComplex: EditionComplex; let expectedEditionComplexBaseRoute: string; + let expectedComplexId: string; + let expectedNextComplexId: string; let expectedEditionIntroData: IntroList; let expectedEditionIntroEmptyData: IntroList; let expectedFragment: string; @@ -101,6 +103,8 @@ describe('IntroComponent (DONE)', () => { // Test data expectedEditionComplex = EDITION_COMPLEXES.OP12; expectedEditionComplexBaseRoute = '/edition/complex/op12/'; + expectedComplexId = 'testComplex1'; + expectedNextComplexId = 'testComplex2'; expectedFragment = 'source_A'; expectedModalSnippet = mockEditionData.mockModalSnippet; expectedEditionIntroData = mockEditionData.mockIntroData; @@ -457,58 +461,120 @@ describe('IntroComponent (DONE)', () => { // CLick on anchor (with selectSvgSheet call) clickAndAwaitChanges(anchorDes[0], fixture); - expectSpyCall(selectSvgSheetSpy, 1, expectedSvgSheet.id); + expectSpyCall(selectSvgSheetSpy, 1, [expectedComplexId, expectedSvgSheet.id]); })); - it('... should navigate to id if given', () => { - component.selectSvgSheet(expectedSvgSheet.id); + it('... should navigate within same complex to id if given', () => { + expectedComplexId = expectedEditionComplex.complexId.route.replace('/', ''); + const expectedSheetRoute = [ + expectedEditionComplexBaseRoute, + expectedEditionRouteConstants.EDITION_SHEETS.route, + ]; + const qp = { + queryParams: { id: expectedSvgSheet.id }, + queryParamsHandling: '', + }; + + component.selectSvgSheet(expectedComplexId, expectedSvgSheet.id); + fixture.detectChanges(); + + expectSpyCall(selectSvgSheetSpy, 1, [expectedComplexId, expectedSvgSheet.id]); + expectSpyCall(navigationSpy, 1, [expectedSheetRoute, qp]); + + qp.queryParams.id = expectedNextSvgSheet.id; + + component.selectSvgSheet(expectedComplexId, expectedNextSvgSheet.id); fixture.detectChanges(); + expectSpyCall(selectSvgSheetSpy, 2, [expectedComplexId, expectedNextSvgSheet.id]); + expectSpyCall(navigationSpy, 2, [expectedSheetRoute, qp]); + }); + + it('... should navigate within same complex without id if none is given', () => { + expectedComplexId = expectedEditionComplex.complexId.route.replace('/', ''); + const expectedSheetRoute = [ + expectedEditionComplexBaseRoute, + expectedEditionRouteConstants.EDITION_SHEETS.route, + ]; const qp = { queryParams: { id: expectedSvgSheet.id }, queryParamsHandling: '', }; - expectSpyCall(selectSvgSheetSpy, 1, expectedSvgSheet.id); - expectSpyCall(navigationSpy, 1, [ - [expectedEditionComplexBaseRoute, expectedEditionRouteConstants.EDITION_SHEETS.route], - qp, - ]); - component.selectSvgSheet(expectedNextSvgSheet.id); + component.selectSvgSheet(expectedComplexId, expectedSvgSheet.id); fixture.detectChanges(); - qp.queryParams.id = expectedNextSvgSheet.id; - expectSpyCall(selectSvgSheetSpy, 2, expectedNextSvgSheet.id); - expectSpyCall(navigationSpy, 2, [ - [expectedEditionComplexBaseRoute, expectedEditionRouteConstants.EDITION_SHEETS.route], - qp, - ]); + expectSpyCall(selectSvgSheetSpy, 1, [expectedComplexId, expectedSvgSheet.id]); + expectSpyCall(navigationSpy, 1, [expectedSheetRoute, qp]); + + const noId = ''; + qp.queryParams.id = noId; + + component.selectSvgSheet(expectedComplexId, noId); + fixture.detectChanges(); + + expectSpyCall(selectSvgSheetSpy, 2, [expectedComplexId, '']); + expectSpyCall(navigationSpy, 2, [expectedSheetRoute, qp]); }); + it('... should navigate to id of antoher complex if given', () => { + expectedComplexId = expectedEditionComplex.complexId.route.replace('/', ''); + const expectedSheetRoute = [ + expectedEditionComplexBaseRoute, + expectedEditionRouteConstants.EDITION_SHEETS.route, + ]; + const qp = { + queryParams: { id: expectedSvgSheet.id }, + queryParamsHandling: '', + }; - it('... should navigate without id if none is given', () => { - component.selectSvgSheet(expectedSvgSheet.id); + component.selectSvgSheet(expectedComplexId, expectedSvgSheet.id); fixture.detectChanges(); + expectSpyCall(selectSvgSheetSpy, 1, [expectedComplexId, expectedSvgSheet.id]); + expectSpyCall(navigationSpy, 1, [expectedSheetRoute, qp]); + + const expectedNextSheetRoute = [ + `/edition/complex/${expectedNextComplexId}/`, + expectedEditionRouteConstants.EDITION_SHEETS.route, + ]; + qp.queryParams.id = expectedNextSvgSheet.id; + + component.selectSvgSheet(expectedNextComplexId, expectedNextSvgSheet.id); + fixture.detectChanges(); + + expectSpyCall(selectSvgSheetSpy, 2, [expectedNextComplexId, expectedNextSvgSheet.id]); + expectSpyCall(navigationSpy, 2, [expectedNextSheetRoute, qp]); + }); + + it('... should navigate to another complex without id if none is given', () => { + expectedComplexId = expectedEditionComplex.complexId.route.replace('/', ''); + const expectedSheetRoute = [ + expectedEditionComplexBaseRoute, + expectedEditionRouteConstants.EDITION_SHEETS.route, + ]; const qp = { queryParams: { id: expectedSvgSheet.id }, queryParamsHandling: '', }; - expectSpyCall(selectSvgSheetSpy, 1, expectedSvgSheet.id); - expectSpyCall(navigationSpy, 1, [ - [expectedEditionComplexBaseRoute, expectedEditionRouteConstants.EDITION_SHEETS.route], - qp, - ]); + + component.selectSvgSheet(expectedComplexId, expectedSvgSheet.id); + fixture.detectChanges(); + + expectSpyCall(selectSvgSheetSpy, 1, [expectedComplexId, expectedSvgSheet.id]); + expectSpyCall(navigationSpy, 1, [expectedSheetRoute, qp]); const noId = ''; qp.queryParams.id = noId; - component.selectSvgSheet(noId); + const expectedNextSheetRoute = [ + `/edition/complex/${expectedNextComplexId}/`, + expectedEditionRouteConstants.EDITION_SHEETS.route, + ]; + + component.selectSvgSheet(expectedNextComplexId, noId); fixture.detectChanges(); - expectSpyCall(selectSvgSheetSpy, 2, ''); - expectSpyCall(navigationSpy, 2, [ - [expectedEditionComplexBaseRoute, expectedEditionRouteConstants.EDITION_SHEETS.route], - qp, - ]); + expectSpyCall(selectSvgSheetSpy, 2, [expectedNextComplexId, '']); + expectSpyCall(navigationSpy, 2, [expectedNextSheetRoute, qp]); }); }); }); diff --git a/src/app/views/edition-view/edition-outlets/edition-complex/edition-detail/edition-intro/edition-intro.component.ts b/src/app/views/edition-view/edition-outlets/edition-complex/edition-detail/edition-intro/edition-intro.component.ts index e97dbf0433..57a555f6dd 100644 --- a/src/app/views/edition-view/edition-outlets/edition-complex/edition-detail/edition-intro/edition-intro.component.ts +++ b/src/app/views/edition-view/edition-outlets/edition-complex/edition-detail/edition-intro/edition-intro.component.ts @@ -162,24 +162,23 @@ export class EditionIntroComponent implements OnInit { /** * Public method: selectSvgSheet. * - * It navigates to the '/edition/complex/{baseRoute}/sheets/{id}' + * It navigates to the '/edition/complex/{complexRoute}/sheets/{sheetsId}' * route with the given id. * - * @param {string} sheetId The given svg sheet id. - * @returns {void} Navigates to the edition detail. + * @param {string} complexId The given complex id. + * @param {string} sheetId The given sheet id. + * @returns {void} Navigates to the given svg sheet id. */ - selectSvgSheet(sheetId: string): void { - if (!sheetId) { - sheetId = ''; - } + selectSvgSheet(complexId: string, sheetId: string): void { + // Set default id if none is given + const complexRoute = complexId ? `/edition/complex/${complexId}/` : this.editionComplex.baseRoute; + const sheetRoute = sheetId ? sheetId : ''; + const navigationExtras: NavigationExtras = { queryParams: { id: sheetId }, queryParamsHandling: '', }; - this.router.navigate( - [this.editionComplex.baseRoute, this.editionRouteConstants.EDITION_SHEETS.route], - navigationExtras - ); + this.router.navigate([complexRoute, this.editionRouteConstants.EDITION_SHEETS.route], navigationExtras); } } diff --git a/src/app/views/edition-view/edition-outlets/edition-complex/edition-detail/edition-report/edition-report.component.spec.ts b/src/app/views/edition-view/edition-outlets/edition-complex/edition-detail/edition-report/edition-report.component.spec.ts index 13df324e41..5b379b1cc0 100644 --- a/src/app/views/edition-view/edition-outlets/edition-complex/edition-detail/edition-report/edition-report.component.spec.ts +++ b/src/app/views/edition-view/edition-outlets/edition-complex/edition-detail/edition-report/edition-report.component.spec.ts @@ -11,6 +11,8 @@ import { NgbAccordionModule, NgbConfig, NgbModalModule } from '@ng-bootstrap/ng- import { cleanStylesFromDOM } from '@testing/clean-up-helper'; import { expectSpyCall, + expectToBe, + expectToEqual, getAndExpectDebugElementByCss, getAndExpectDebugElementByDirective, } from '@testing/expect-helper'; @@ -53,7 +55,7 @@ class SourceDescriptionStubComponent { @Output() openModalRequest: EventEmitter = new EventEmitter(); @Output() - selectSvgSheetRequest: EventEmitter = new EventEmitter(); + selectSvgSheetRequest: EventEmitter<{ complexId: string; sheetId: string }> = new EventEmitter(); } @Component({ selector: 'awg-source-evaluation', template: '' }) @@ -67,7 +69,7 @@ class SourceEvaluationStubComponent { @Output() openModalRequest: EventEmitter = new EventEmitter(); @Output() - selectSvgSheetRequest: EventEmitter = new EventEmitter(); + selectSvgSheetRequest: EventEmitter<{ complexId: string; sheetId: string }> = new EventEmitter(); } @Component({ selector: 'awg-textcritics-list', template: '' }) @@ -77,7 +79,7 @@ export class TextcriticsListStubComponent { @Output() openModalRequest: EventEmitter = new EventEmitter(); @Output() - selectSvgSheetRequest: EventEmitter = new EventEmitter(); + selectSvgSheetRequest: EventEmitter<{ complexId: string; sheetId: string }> = new EventEmitter(); } describe('EditionReportComponent', () => { @@ -103,7 +105,8 @@ describe('EditionReportComponent', () => { let expectedSvgSheet: EditionSvgSheet; let expectedNextSvgSheet: EditionSvgSheet; let expectedPanelId: string; - + let expectedComplexId: string; + let expectedNextComplexId: string; let expectedEditionComplexBaseRoute: string; const expectedEditionRouteConstants: typeof EDITION_ROUTE_CONSTANTS = EDITION_ROUTE_CONSTANTS; @@ -173,9 +176,9 @@ describe('EditionReportComponent', () => { expectedPanelId = 'awg-sources-panel'; expectedFragment = 'source_A'; expectedEditionComplex = EDITION_COMPLEXES.OP12; - expectedEditionComplexBaseRoute = '/edition/complex/op12/'; - + expectedComplexId = 'testComplex1'; + expectedNextComplexId = 'testComplex2'; expectedModalSnippet = mockEditionData.mockModalSnippet; expectedSvgSheet = mockEditionData.mockSvgSheet_Sk1; expectedNextSvgSheet = mockEditionData.mockSvgSheet_Sk2; @@ -225,10 +228,7 @@ describe('EditionReportComponent', () => { }); it('... should have `editionRouteConstants`', () => { - expect(component.editionRouteConstants).toBeDefined(); - expect(component.editionRouteConstants) - .withContext(`should be ${expectedEditionRouteConstants}`) - .toBe(expectedEditionRouteConstants); + expectToBe(component.editionRouteConstants, expectedEditionRouteConstants); }); describe('VIEW', () => { @@ -276,10 +276,7 @@ describe('EditionReportComponent', () => { }); it('... should have editionComplex', () => { - expect(component.editionComplex).toBeDefined(); - expect(component.editionComplex) - .withContext(`should equal ${expectedEditionComplex}`) - .toEqual(expectedEditionComplex); + expectToEqual(component.editionComplex, expectedEditionComplex); }); it('... should have editionReportData$', waitForAsync(() => { @@ -315,10 +312,7 @@ describe('EditionReportComponent', () => { const sourceListDes = getAndExpectDebugElementByDirective(compDe, SourceListStubComponent, 1, 1); const sourceListCmp = sourceListDes[0].injector.get(SourceListStubComponent) as SourceListStubComponent; - expect(sourceListCmp.sourceListData).toBeTruthy(); - expect(sourceListCmp.sourceListData) - .withContext(`should equal ${expectedSourceListData}`) - .toEqual(expectedSourceListData); + expectToEqual(sourceListCmp.sourceListData, expectedSourceListData); }); it('... should pass down sourceDescriptionListData to SourceDescriptionComponent', () => { @@ -332,10 +326,7 @@ describe('EditionReportComponent', () => { SourceDescriptionStubComponent ) as SourceDescriptionStubComponent; - expect(descriptionCmp.sourceDescriptionListData).toBeTruthy(); - expect(descriptionCmp.sourceDescriptionListData) - .withContext(`should equal ${expectedSourceDescriptionListData}`) - .toEqual(expectedSourceDescriptionListData); + expectToEqual(descriptionCmp.sourceDescriptionListData, expectedSourceDescriptionListData); }); it('... should pass down sourceEvaluationListData to SourceEvaluationComponent', () => { @@ -344,10 +335,7 @@ describe('EditionReportComponent', () => { SourceEvaluationStubComponent ) as SourceEvaluationStubComponent; - expect(evaluationCmp.sourceEvaluationListData).toBeTruthy(); - expect(evaluationCmp.sourceEvaluationListData) - .withContext(`should equal ${expectedSourceEvaluationListData}`) - .toEqual(expectedSourceEvaluationListData); + expectToEqual(evaluationCmp.sourceEvaluationListData, expectedSourceEvaluationListData); }); it('... should pass down textcriticsListData to TextcriticsListComponent', () => { @@ -356,10 +344,7 @@ describe('EditionReportComponent', () => { TextcriticsListStubComponent ) as TextcriticsListStubComponent; - expect(textcriticsCmp.textcriticsData).toBeTruthy(); - expect(textcriticsCmp.textcriticsData) - .withContext(`should equal ${expectedTextcriticsData}`) - .toEqual(expectedTextcriticsData); + expectToEqual(textcriticsCmp.textcriticsData, expectedTextcriticsData); }); }); @@ -375,10 +360,7 @@ describe('EditionReportComponent', () => { it('... should have got `editionComplex` from editionService', () => { expectSpyCall(getEditionComplexSpy, 1); - expect(component.editionComplex).toBeTruthy(); - expect(component.editionComplex) - .withContext(`should equal ${expectedEditionComplex}`) - .toEqual(expectedEditionComplex); + expectToEqual(component.editionComplex, expectedEditionComplex); }); it('... should have got editionReportData from editionDataService', () => { @@ -678,6 +660,40 @@ describe('EditionReportComponent', () => { describe('... should trigger on event from', () => { describe('... SourceDescriptionComponent if', () => { + it('... sheet ids are undefined', () => { + const descriptionDes = getAndExpectDebugElementByDirective( + compDe, + SourceDescriptionStubComponent, + 1, + 1 + ); + const descriptionCmp = descriptionDes[0].injector.get( + SourceDescriptionStubComponent + ) as SourceDescriptionStubComponent; + + const expectedSheetIds = { complexId: undefined, sheetId: undefined }; + descriptionCmp.selectSvgSheetRequest.emit(expectedSheetIds); + + expectSpyCall(selectSvgSheetSpy, 1, expectedSheetIds); + }); + + it('... complex id is undefined', () => { + const descriptionDes = getAndExpectDebugElementByDirective( + compDe, + SourceDescriptionStubComponent, + 1, + 1 + ); + const descriptionCmp = descriptionDes[0].injector.get( + SourceDescriptionStubComponent + ) as SourceDescriptionStubComponent; + + const expectedSheetIds = { complexId: undefined, sheetId: expectedSvgSheet.id }; + descriptionCmp.selectSvgSheetRequest.emit(expectedSheetIds); + + expectSpyCall(selectSvgSheetSpy, 1, expectedSheetIds); + }); + it('... svg sheet id is undefined', () => { const descriptionDes = getAndExpectDebugElementByDirective( compDe, @@ -689,12 +705,13 @@ describe('EditionReportComponent', () => { SourceDescriptionStubComponent ) as SourceDescriptionStubComponent; - descriptionCmp.selectSvgSheetRequest.emit(undefined); + const expectedSheetIds = { complexId: expectedComplexId, sheetId: undefined }; + descriptionCmp.selectSvgSheetRequest.emit(expectedSheetIds); - expectSpyCall(selectSvgSheetSpy, 1, undefined); + expectSpyCall(selectSvgSheetSpy, 1, expectedSheetIds); }); - it('... svg sheet id is given', () => { + it('... both sheet ids are given', () => { const descriptionDes = getAndExpectDebugElementByDirective( compDe, SourceDescriptionStubComponent, @@ -705,13 +722,46 @@ describe('EditionReportComponent', () => { SourceDescriptionStubComponent ) as SourceDescriptionStubComponent; - descriptionCmp.selectSvgSheetRequest.emit(expectedSvgSheet.id); + const expectedSheetIds = { complexId: expectedComplexId, sheetId: expectedSvgSheet.id }; + descriptionCmp.selectSvgSheetRequest.emit(expectedSheetIds); - expectSpyCall(selectSvgSheetSpy, 1, expectedSvgSheet.id); + expectSpyCall(selectSvgSheetSpy, 1, expectedSheetIds); }); }); describe('... SourceEvaluationComponent if', () => { + it('... sheet ids are undefined', () => { + const evaluationDes = getAndExpectDebugElementByDirective( + compDe, + SourceEvaluationStubComponent, + 1, + 1 + ); + const evaluationCmp = evaluationDes[0].injector.get( + SourceEvaluationStubComponent + ) as SourceEvaluationStubComponent; + + const expectedSheetIds = { complexId: undefined, sheetId: undefined }; + evaluationCmp.selectSvgSheetRequest.emit(expectedSheetIds); + + expectSpyCall(selectSvgSheetSpy, 1, expectedSheetIds); + }); + it('... complex id is undefined', () => { + const evaluationDes = getAndExpectDebugElementByDirective( + compDe, + SourceEvaluationStubComponent, + 1, + 1 + ); + const evaluationCmp = evaluationDes[0].injector.get( + SourceEvaluationStubComponent + ) as SourceEvaluationStubComponent; + + const expectedSheetIds = { complexId: undefined, sheetId: expectedSvgSheet.id }; + evaluationCmp.selectSvgSheetRequest.emit(expectedSheetIds); + + expectSpyCall(selectSvgSheetSpy, 1, expectedSheetIds); + }); it('... svg sheet id is undefined', () => { const evaluationDes = getAndExpectDebugElementByDirective( compDe, @@ -723,12 +773,13 @@ describe('EditionReportComponent', () => { SourceEvaluationStubComponent ) as SourceEvaluationStubComponent; - evaluationCmp.selectSvgSheetRequest.emit(undefined); + const expectedSheetIds = { complexId: expectedComplexId, sheetId: undefined }; + evaluationCmp.selectSvgSheetRequest.emit(expectedSheetIds); - expectSpyCall(selectSvgSheetSpy, 1, undefined); + expectSpyCall(selectSvgSheetSpy, 1, expectedSheetIds); }); - it('... svg sheet id is given', () => { + it('... both sheet ids are given', () => { const evaluationDes = getAndExpectDebugElementByDirective( compDe, SourceEvaluationStubComponent, @@ -739,13 +790,48 @@ describe('EditionReportComponent', () => { SourceEvaluationStubComponent ) as SourceEvaluationStubComponent; - evaluationCmp.selectSvgSheetRequest.emit(expectedSvgSheet.id); + const expectedSheetIds = { complexId: expectedComplexId, sheetId: expectedSvgSheet.id }; + evaluationCmp.selectSvgSheetRequest.emit(expectedSheetIds); - expectSpyCall(selectSvgSheetSpy, 1, expectedSvgSheet.id); + expectSpyCall(selectSvgSheetSpy, 1, expectedSheetIds); }); }); describe('... TextcriticsListComponent if', () => { + it('... sheet ids are undefined', () => { + const textcriticsDes = getAndExpectDebugElementByDirective( + compDe, + TextcriticsListStubComponent, + 1, + 1 + ); + const textcriticsCmp = textcriticsDes[0].injector.get( + TextcriticsListStubComponent + ) as TextcriticsListStubComponent; + + const expectedSheetIds = { complexId: undefined, sheetId: undefined }; + textcriticsCmp.selectSvgSheetRequest.emit(expectedSheetIds); + + expectSpyCall(selectSvgSheetSpy, 1, expectedSheetIds); + }); + + it('... complex id is undefined', () => { + const textcriticsDes = getAndExpectDebugElementByDirective( + compDe, + TextcriticsListStubComponent, + 1, + 1 + ); + const textcriticsCmp = textcriticsDes[0].injector.get( + TextcriticsListStubComponent + ) as TextcriticsListStubComponent; + + const expectedSheetIds = { complexId: undefined, sheetId: expectedSvgSheet.id }; + textcriticsCmp.selectSvgSheetRequest.emit(expectedSheetIds); + + expectSpyCall(selectSvgSheetSpy, 1, expectedSheetIds); + }); + it('... svg sheet id is undefined', () => { const textcriticsDes = getAndExpectDebugElementByDirective( compDe, @@ -757,12 +843,13 @@ describe('EditionReportComponent', () => { TextcriticsListStubComponent ) as TextcriticsListStubComponent; - textcriticsCmp.selectSvgSheetRequest.emit(undefined); + const expectedSheetIds = { complexId: expectedComplexId, sheetId: undefined }; + textcriticsCmp.selectSvgSheetRequest.emit(expectedSheetIds); - expectSpyCall(selectSvgSheetSpy, 1, undefined); + expectSpyCall(selectSvgSheetSpy, 1, expectedSheetIds); }); - it('... svg sheet id is given', () => { + it('... both sheet ids are given', () => { const textcriticsDes = getAndExpectDebugElementByDirective( compDe, TextcriticsListStubComponent, @@ -773,60 +860,129 @@ describe('EditionReportComponent', () => { TextcriticsListStubComponent ) as TextcriticsListStubComponent; - textcriticsCmp.selectSvgSheetRequest.emit(expectedSvgSheet.id); + const expectedSheetIds = { complexId: expectedComplexId, sheetId: expectedSvgSheet.id }; + textcriticsCmp.selectSvgSheetRequest.emit(expectedSheetIds); - expectSpyCall(selectSvgSheetSpy, 1, expectedSvgSheet.id); + expectSpyCall(selectSvgSheetSpy, 1, expectedSheetIds); }); }); }); - it('... should navigate to id if given', () => { - component.onSvgSheetSelect(expectedSvgSheet.id); + it('... should navigate within same complex to id if given', () => { + expectedComplexId = expectedEditionComplex.complexId.route.replace('/', ''); + let expectedSheetIds = { complexId: expectedComplexId, sheetId: expectedSvgSheet.id }; + const expectedSheetRoute = [ + expectedEditionComplexBaseRoute, + expectedEditionRouteConstants.EDITION_SHEETS.route, + ]; + const qp = { + queryParams: { id: expectedSvgSheet.id }, + }; + + component.onSvgSheetSelect(expectedSheetIds); fixture.detectChanges(); + expectSpyCall(selectSvgSheetSpy, 1, expectedSheetIds); + expectSpyCall(navigationSpy, 1, [expectedSheetRoute, qp]); + + expectedSheetIds = { complexId: expectedComplexId, sheetId: expectedNextSvgSheet.id }; + qp.queryParams.id = expectedNextSvgSheet.id; + + component.onSvgSheetSelect(expectedSheetIds); + fixture.detectChanges(); + + expectSpyCall(selectSvgSheetSpy, 2, expectedSheetIds); + expectSpyCall(navigationSpy, 2, [expectedSheetRoute, qp]); + }); + + it('... should navigate within same complex without id if none is given', () => { + expectedComplexId = expectedEditionComplex.complexId.route.replace('/', ''); + let expectedSheetIds = { complexId: expectedComplexId, sheetId: expectedSvgSheet.id }; + const expectedSheetRoute = [ + expectedEditionComplexBaseRoute, + expectedEditionRouteConstants.EDITION_SHEETS.route, + ]; const qp = { queryParams: { id: expectedSvgSheet.id }, }; - expectSpyCall(selectSvgSheetSpy, 1, expectedSvgSheet.id); - expectSpyCall(navigationSpy, 1, [ - [expectedEditionComplexBaseRoute, expectedEditionRouteConstants.EDITION_SHEETS.route], - qp, - ]); - component.onSvgSheetSelect(expectedNextSvgSheet.id); + component.onSvgSheetSelect(expectedSheetIds); fixture.detectChanges(); - qp.queryParams.id = expectedNextSvgSheet.id; - expectSpyCall(selectSvgSheetSpy, 2, expectedNextSvgSheet.id); - expectSpyCall(navigationSpy, 2, [ - [expectedEditionComplexBaseRoute, expectedEditionRouteConstants.EDITION_SHEETS.route], - qp, - ]); + expectSpyCall(selectSvgSheetSpy, 1, expectedSheetIds); + expectSpyCall(navigationSpy, 1, [expectedSheetRoute, qp]); + + const noId = ''; + qp.queryParams.id = noId; + expectedSheetIds = { complexId: expectedComplexId, sheetId: noId }; + + component.onSvgSheetSelect(expectedSheetIds); + fixture.detectChanges(); + + expectSpyCall(selectSvgSheetSpy, 2, expectedSheetIds); + expectSpyCall(navigationSpy, 2, [expectedSheetRoute, qp]); }); + it('... should navigate to id of antoher complex if given', () => { + expectedComplexId = expectedEditionComplex.complexId.route.replace('/', ''); + const expectedSheetIds = { complexId: expectedComplexId, sheetId: expectedSvgSheet.id }; + const expectedSheetRoute = [ + expectedEditionComplexBaseRoute, + expectedEditionRouteConstants.EDITION_SHEETS.route, + ]; + const qp = { + queryParams: { id: expectedSvgSheet.id }, + }; + + component.onSvgSheetSelect(expectedSheetIds); + fixture.detectChanges(); - it('... should navigate without id if none is given', () => { - component.onSvgSheetSelect(expectedSvgSheet.id); + expectSpyCall(selectSvgSheetSpy, 1, expectedSheetIds); + expectSpyCall(navigationSpy, 1, [expectedSheetRoute, qp]); + + const expectedNextSheetIds = { complexId: expectedNextComplexId, sheetId: expectedNextSvgSheet.id }; + const expectedNextSheetRoute = [ + `/edition/complex/${expectedNextComplexId}/`, + expectedEditionRouteConstants.EDITION_SHEETS.route, + ]; + qp.queryParams.id = expectedNextSvgSheet.id; + + component.onSvgSheetSelect(expectedNextSheetIds); fixture.detectChanges(); + expectSpyCall(selectSvgSheetSpy, 2, expectedNextSheetIds); + expectSpyCall(navigationSpy, 2, [expectedNextSheetRoute, qp]); + }); + + it('... should navigate to another complex without id if none is given', () => { + expectedComplexId = expectedEditionComplex.complexId.route.replace('/', ''); + const expectedSheetIds = { complexId: expectedComplexId, sheetId: expectedSvgSheet.id }; + const expectedSheetRoute = [ + expectedEditionComplexBaseRoute, + expectedEditionRouteConstants.EDITION_SHEETS.route, + ]; const qp = { queryParams: { id: expectedSvgSheet.id }, }; - expectSpyCall(selectSvgSheetSpy, 1, expectedSvgSheet.id); - expectSpyCall(navigationSpy, 1, [ - [expectedEditionComplexBaseRoute, expectedEditionRouteConstants.EDITION_SHEETS.route], - qp, - ]); + + component.onSvgSheetSelect(expectedSheetIds); + fixture.detectChanges(); + + expectSpyCall(selectSvgSheetSpy, 1, expectedSheetIds); + expectSpyCall(navigationSpy, 1, [expectedSheetRoute, qp]); const noId = ''; qp.queryParams.id = noId; - component.onSvgSheetSelect(noId); + const expectedNextSheetIds = { complexId: expectedNextComplexId, sheetId: noId }; + const expectedNextSheetRoute = [ + `/edition/complex/${expectedNextComplexId}/`, + expectedEditionRouteConstants.EDITION_SHEETS.route, + ]; + + component.onSvgSheetSelect(expectedNextSheetIds); fixture.detectChanges(); - expectSpyCall(selectSvgSheetSpy, 2, ''); - expectSpyCall(navigationSpy, 2, [ - [expectedEditionComplexBaseRoute, expectedEditionRouteConstants.EDITION_SHEETS.route], - qp, - ]); + expectSpyCall(selectSvgSheetSpy, 2, expectedNextSheetIds); + expectSpyCall(navigationSpy, 2, [expectedNextSheetRoute, qp]); }); }); }); diff --git a/src/app/views/edition-view/edition-outlets/edition-complex/edition-detail/edition-report/edition-report.component.ts b/src/app/views/edition-view/edition-outlets/edition-complex/edition-detail/edition-report/edition-report.component.ts index fb9ea92d29..aa6e1bfe39 100644 --- a/src/app/views/edition-view/edition-outlets/edition-complex/edition-detail/edition-report/edition-report.component.ts +++ b/src/app/views/edition-view/edition-outlets/edition-complex/edition-detail/edition-report/edition-report.component.ts @@ -170,24 +170,25 @@ export class EditionReportComponent implements OnInit { /** * Public method: onSvgSheetSelect. * - * It navigates to the '/edition/complex/{baseRoute}/sheets' - * route with the given id. + * It selects a SVG sheet by its edition complex + * and sheet ids and navigates to the edition sheets route + * with this given id. * - * @param {string} sheetId The given svg sheet id. - * @returns {void} Navigates to the edition detail. + * @param {object} sheetIds The given sheet ids as { complexId: string, sheetId: string }. + * @returns {void} Navigates to the edition sheets. */ - onSvgSheetSelect(sheetId: string): void { - if (!sheetId) { - sheetId = ''; - } + onSvgSheetSelect(sheetIds: { complexId: string; sheetId: string }): void { + // Set default id if none is given + const complexRoute = sheetIds.complexId + ? `/edition/complex/${sheetIds.complexId}/` + : this.editionComplex.baseRoute; + const sheetRoute = sheetIds.sheetId ? sheetIds.sheetId : ''; + const navigationExtras: NavigationExtras = { - queryParams: { id: sheetId }, + queryParams: { id: sheetRoute }, // .queryParamsHandling: '', }; - this.router.navigate( - [this.editionComplex.baseRoute, this.editionRouteConstants.EDITION_SHEETS.route], - navigationExtras - ); + this.router.navigate([complexRoute, this.editionRouteConstants.EDITION_SHEETS.route], navigationExtras); } } diff --git a/src/app/views/edition-view/edition-outlets/edition-complex/edition-detail/edition-report/edition-report.module.ts b/src/app/views/edition-view/edition-outlets/edition-complex/edition-detail/edition-report/edition-report.module.ts index 043a787664..ef22f63b5d 100644 --- a/src/app/views/edition-view/edition-outlets/edition-complex/edition-detail/edition-report/edition-report.module.ts +++ b/src/app/views/edition-view/edition-outlets/edition-complex/edition-detail/edition-report/edition-report.module.ts @@ -1,6 +1,7 @@ import { NgModule } from '@angular/core'; import { SharedModule } from '@awg-shared/shared.module'; +import { EditionTkaDescriptionModule } from '../edition-tka-description/edition-tka-description.module'; import { EditionTkaTableModule } from '../edition-tka-table/edition-tka-table.module'; import { SourceDescriptionComponent } from './source-description'; @@ -20,7 +21,7 @@ import { EditionReportRoutingModule, routedEditionReportComponents } from './edi * {@link SourceDescriptionComponent}, and {@link SourceEvaluationComponent}. */ @NgModule({ - imports: [SharedModule, EditionTkaTableModule, EditionReportRoutingModule], + imports: [SharedModule, EditionTkaTableModule, EditionTkaDescriptionModule, EditionReportRoutingModule], declarations: [ TextcriticsListComponent, SourceDescriptionComponent, diff --git a/src/app/views/edition-view/edition-outlets/edition-complex/edition-detail/edition-report/source-description/source-description.component.html b/src/app/views/edition-view/edition-outlets/edition-complex/edition-detail/edition-report/source-description/source-description.component.html index ed79e58f5e..605127fa56 100644 --- a/src/app/views/edition-view/edition-outlets/edition-complex/edition-detail/edition-report/source-description/source-description.component.html +++ b/src/app/views/edition-view/edition-outlets/edition-complex/edition-detail/edition-report/source-description/source-description.component.html @@ -145,12 +145,18 @@ @if (content.item || content.itemDescription) { - @if (content.itemLinkTo) { - {{ content.item }} } - @if (!content.itemLinkTo) { + @if (!utils.isNotEmptyObject(content.itemLinkTo)) { {{ content.item }} } @if (content.itemDescription) { @@ -173,7 +179,13 @@ tab: content.item }"> @if (folio.folioLinkTo) { - @if (system.linkTo) { - @if (system.linkTo) { - -
@@ -16,9 +19,11 @@ @if (utils.isNotEmptyArray(textcritic.description)) {

Skizzenkommentar:

- @for (description of textcritic.description; track description) { -

- } +
} @if (utils.isNotEmptyArray(textcritic.comments)) { diff --git a/src/app/views/edition-view/edition-outlets/edition-complex/edition-detail/edition-report/textcritics-list/textcritics-list.component.spec.ts b/src/app/views/edition-view/edition-outlets/edition-complex/edition-detail/edition-report/textcritics-list/textcritics-list.component.spec.ts index d806db7b4e..bd66eacabb 100644 --- a/src/app/views/edition-view/edition-outlets/edition-complex/edition-detail/edition-report/textcritics-list/textcritics-list.component.spec.ts +++ b/src/app/views/edition-view/edition-outlets/edition-complex/edition-detail/edition-report/textcritics-list/textcritics-list.component.spec.ts @@ -22,7 +22,19 @@ import { TextcriticalComment, TextcriticsList } from '@awg-views/edition-view/mo import { TextcriticsListComponent } from './textcritics-list.component'; -// Mock tka table component +// Mock components +@Component({ selector: 'awg-edition-tka-description', template: '' }) +class EditionTkaDescriptionStubComponent { + @Input() + textcriticalDescriptions: string[]; + @Output() + navigateToReportFragmentRequest: EventEmitter = new EventEmitter(); + @Output() + openModalRequest: EventEmitter = new EventEmitter(); + @Output() + selectSvgSheetRequest: EventEmitter<{ complexId: string; sheetId: string }> = new EventEmitter(); +} + @Component({ selector: 'awg-edition-tka-table', template: '' }) class EditionTkaTableStubComponent { @Input() @@ -34,7 +46,7 @@ class EditionTkaTableStubComponent { @Output() openModalRequest: EventEmitter = new EventEmitter(); @Output() - selectSvgSheetRequest: EventEmitter = new EventEmitter(); + selectSvgSheetRequest: EventEmitter<{ complexId: string; sheetId: string }> = new EventEmitter(); } describe('TextcriticsListComponent (DONE)', () => { @@ -44,6 +56,8 @@ describe('TextcriticsListComponent (DONE)', () => { let utils: UtilityService; + let expectedComplexId: string; + let expectedNextComplexId: string; let expectedFragment: string; let expectedModalSnippet: string; let expectedNextSheetId: string; @@ -69,7 +83,12 @@ describe('TextcriticsListComponent (DONE)', () => { beforeEach(waitForAsync(() => { TestBed.configureTestingModule({ imports: [NgbAccordionWithConfigModule], - declarations: [TextcriticsListComponent, CompileHtmlComponent, EditionTkaTableStubComponent], + declarations: [ + TextcriticsListComponent, + CompileHtmlComponent, + EditionTkaDescriptionStubComponent, + EditionTkaTableStubComponent, + ], providers: [UtilityService], }).compileComponents(); })); @@ -82,6 +101,8 @@ describe('TextcriticsListComponent (DONE)', () => { utils = TestBed.inject(UtilityService); // Test data + expectedComplexId = 'testComplex1'; + expectedNextComplexId = 'testComplex2'; expectedFragment = 'source_A'; expectedModalSnippet = mockEditionData.mockModalSnippet; expectedNextSheetId = 'test_item_id_2'; @@ -402,7 +423,7 @@ describe('TextcriticsListComponent (DONE)', () => { detectChangesOnPush(fixture); }); - it('... should contain no item body with div and paragraphs if description array is empty', () => { + it('... should contain no item body with div and paragraphs if description and comment arrays are empty', () => { const textcritics = expectedTextcriticsData.textcritics[0]; const bodyDes = getAndExpectDebugElementByCss( compDe, @@ -415,7 +436,7 @@ describe('TextcriticsListComponent (DONE)', () => { getAndExpectDebugElementByCss(bodyDes[0], 'div', 0, 0); }); - it('... should contain item body with as many paragraphs in first div as textcritics.description if description array is not empty', () => { + it('... should contain item body with div, paragraph and EditionTkaDescriptionComponent if description array is not empty', () => { const textcritics = expectedTextcriticsData.textcritics[1]; const bodyDes = getAndExpectDebugElementByCss( compDe, @@ -426,26 +447,13 @@ describe('TextcriticsListComponent (DONE)', () => { ); const divDes = getAndExpectDebugElementByCss(bodyDes[0], 'div:first-child', 1, 1); - - // Number of paragraphs = description array length + 1 (heading) - const pDes = getAndExpectDebugElementByCss( - divDes[0], - 'p', - textcritics.description.length + 1, - textcritics.description.length + 1 - ); + const pDes = getAndExpectDebugElementByCss(divDes[0], 'p', 1, 1); const pEl0 = pDes[0].nativeElement; expectToBe(pEl0.textContent, 'Skizzenkommentar:'); - pDes.forEach((pDe, index) => { - if (index === 0) { - return; - } - const pEl = pDe.nativeElement; - - expectToBe(pEl.textContent, textcritics.description[index - 1]); - }); + // EditionTkaDescriptionStubComponent + getAndExpectDebugElementByDirective(divDes[0], EditionTkaDescriptionStubComponent, 1, 1); }); it('... should contain item body with div, paragraph and EditionTkaTableComponent if comments array is not empty', () => { @@ -468,6 +476,23 @@ describe('TextcriticsListComponent (DONE)', () => { getAndExpectDebugElementByDirective(bodyDes[0], EditionTkaTableStubComponent, 1, 1); }); + it('... should pass down `description` data to EditionTkaDescriptionComponent (stubbed)', () => { + const editionTkaDescriptionDes = getAndExpectDebugElementByDirective( + compDe, + EditionTkaDescriptionStubComponent, + 1, + 1 + ); + const editionTkaDescriptionCmp = editionTkaDescriptionDes[0].injector.get( + EditionTkaDescriptionStubComponent + ) as EditionTkaDescriptionStubComponent; + + expectToEqual( + editionTkaDescriptionCmp.textcriticalDescriptions, + expectedTextcriticsData.textcritics[1].description + ); + }); + it('... should pass down `comments` and `rowtable` data to EditionTkaTableComponent (stubbed)', () => { const editionTkaTableDes = getAndExpectDebugElementByDirective( compDe, @@ -623,64 +648,118 @@ describe('TextcriticsListComponent (DONE)', () => { expect(component.selectSvgSheet).toBeDefined(); }); - it('... should trigger on event from EditionTkaTableComponent', () => { - // Open second item - const header1Des = getAndExpectDebugElementByCss( - compDe, - `div#${expectedTextcriticsData.textcritics[1].id} > div.accordion-header`, - 1, - 1 - ); + describe('... should trigger on event from ...', () => { + it('... EditionTkaDescriptionComponent', () => { + // Open second item + const header1Des = getAndExpectDebugElementByCss( + compDe, + `div#${expectedTextcriticsData.textcritics[1].id} > div.accordion-header`, + 1, + 1 + ); - // Header Button - const btn1Des = getAndExpectDebugElementByCss(header1Des[0], 'div.accordion-button > button.btn', 2, 2); - const btn1El = btn1Des[0].nativeElement; + // Header Button + const btn1Des = getAndExpectDebugElementByCss( + header1Des[0], + 'div.accordion-button > button.btn', + 2, + 2 + ); + const btn1El = btn1Des[0].nativeElement; - // Click header buttons to open body - click(btn1El as HTMLElement); - detectChangesOnPush(fixture); + // Click header buttons to open body + click(btn1El as HTMLElement); + detectChangesOnPush(fixture); - const editionTkaTableDes = getAndExpectDebugElementByDirective( - compDe, - EditionTkaTableStubComponent, - 1, - 1 - ); - const editionTkaTableCmp = editionTkaTableDes[0].injector.get( - EditionTkaTableStubComponent - ) as EditionTkaTableStubComponent; + const editionTkaDescriptionDes = getAndExpectDebugElementByDirective( + compDe, + EditionTkaDescriptionStubComponent, + 1, + 1 + ); + const editionTkaDescriptionCmp = editionTkaDescriptionDes[0].injector.get( + EditionTkaDescriptionStubComponent + ) as EditionTkaDescriptionStubComponent; - editionTkaTableCmp.selectSvgSheetRequest.emit(expectedSheetId); + const expectedSheetIds = { complexId: expectedComplexId, sheetId: expectedSheetId }; + editionTkaDescriptionCmp.selectSvgSheetRequest.emit(expectedSheetIds); - expectSpyCall(selectSvgSheetSpy, 1, expectedSheetId); - }); + expectSpyCall(selectSvgSheetSpy, 1, expectedSheetIds); + }); - describe('... should not emit anything if ', () => { - it('... id is undefined', () => { - component.selectSvgSheet(undefined); + it('... EditionTkaTableComponent', () => { + // Open second item + const header1Des = getAndExpectDebugElementByCss( + compDe, + `div#${expectedTextcriticsData.textcritics[1].id} > div.accordion-header`, + 1, + 1 + ); - expectSpyCall(selectSvgSheetRequestEmitSpy, 0); - }); - it('... id is null', () => { - component.selectSvgSheet(null); + // Header Button + const btn1Des = getAndExpectDebugElementByCss( + header1Des[0], + 'div.accordion-button > button.btn', + 2, + 2 + ); + const btn1El = btn1Des[0].nativeElement; - expectSpyCall(selectSvgSheetRequestEmitSpy, 0); - }); - it('... id is empty string', () => { - component.selectSvgSheet(''); + // Click header buttons to open body + click(btn1El as HTMLElement); + detectChangesOnPush(fixture); - expectSpyCall(selectSvgSheetRequestEmitSpy, 0); + const editionTkaTableDes = getAndExpectDebugElementByDirective( + compDe, + EditionTkaTableStubComponent, + 1, + 1 + ); + const editionTkaTableCmp = editionTkaTableDes[0].injector.get( + EditionTkaTableStubComponent + ) as EditionTkaTableStubComponent; + + const expectedSheetIds = { complexId: expectedComplexId, sheetId: expectedSheetId }; + editionTkaTableCmp.selectSvgSheetRequest.emit(expectedSheetIds); + + expectSpyCall(selectSvgSheetSpy, 1, expectedSheetIds); }); }); - it('... should emit id of selected svg sheet', () => { - component.selectSvgSheet(expectedSheetId); + it('... should not emit anything if no id is provided', () => { + const expectedSheetIds = undefined; + component.selectSvgSheet(expectedSheetIds); + + expectSpyCall(selectSvgSheetRequestEmitSpy, 0, undefined); + + const expectedNextSheetIds = { complexId: undefined, sheetId: undefined }; + component.selectSvgSheet(expectedNextSheetIds); + + expectSpyCall(selectSvgSheetRequestEmitSpy, 0, undefined); + }); + + it('... should emit id of selected svg sheet within same complex', () => { + const expectedSheetIds = { complexId: expectedComplexId, sheetId: expectedSheetId }; + component.selectSvgSheet(expectedSheetIds); + + expectSpyCall(selectSvgSheetRequestEmitSpy, 1, expectedSheetIds); + + const expectedNextSheetIds = { complexId: expectedComplexId, sheetId: expectedNextSheetId }; + component.selectSvgSheet(expectedNextSheetIds); + + expectSpyCall(selectSvgSheetRequestEmitSpy, 2, expectedNextSheetIds); + }); + + it('... should emit id of selected svg sheet for another complex', () => { + const expectedSheetIds = { complexId: expectedComplexId, sheetId: expectedSheetId }; + component.selectSvgSheet(expectedSheetIds); - expectSpyCall(selectSvgSheetRequestEmitSpy, 1, expectedSheetId); + expectSpyCall(selectSvgSheetRequestEmitSpy, 1, expectedSheetIds); - component.selectSvgSheet(expectedNextSheetId); + const expectedNextSheetIds = { complexId: expectedNextComplexId, sheetId: expectedNextSheetId }; + component.selectSvgSheet(expectedNextSheetIds); - expectSpyCall(selectSvgSheetRequestEmitSpy, 2, expectedNextSheetId); + expectSpyCall(selectSvgSheetRequestEmitSpy, 2, expectedNextSheetIds); }); }); }); diff --git a/src/app/views/edition-view/edition-outlets/edition-complex/edition-detail/edition-report/textcritics-list/textcritics-list.component.ts b/src/app/views/edition-view/edition-outlets/edition-complex/edition-detail/edition-report/textcritics-list/textcritics-list.component.ts index fdcecfe5ba..7f7057ec1a 100644 --- a/src/app/views/edition-view/edition-outlets/edition-complex/edition-detail/edition-report/textcritics-list/textcritics-list.component.ts +++ b/src/app/views/edition-view/edition-outlets/edition-complex/edition-detail/edition-report/textcritics-list/textcritics-list.component.ts @@ -45,10 +45,10 @@ export class TextcriticsListComponent { /** * Output variable: selectSvgSheetRequest. * - * It keeps an event emitter for the selected id of an svg sheet. + * It keeps an event emitter for the selected ids of an edition complex and svg sheet. */ @Output() - selectSvgSheetRequest: EventEmitter = new EventEmitter(); + selectSvgSheetRequest: EventEmitter<{ complexId: string; sheetId: string }> = new EventEmitter(); /** * Self-referring variable needed for CompileHtml library. @@ -102,16 +102,16 @@ export class TextcriticsListComponent { /** * Public method: selectSvgSheet. * - * It emits a given id of a selected svg sheet - * to the {@link selectSvgSheetRequest}. + * It emits the given ids of a selected edition complex + * and svg sheet to the {@link selectSvgSheetRequest}. * - * @param {string} id The given sheet id. - * @returns {void} Emits the id. + * @param {object} sheetIds The given sheet ids as { complexId: string, sheetId: string }. + * @returns {void} Emits the ids. */ - selectSvgSheet(id: string): void { - if (!id) { + selectSvgSheet(sheetIds: { complexId: string; sheetId: string }): void { + if (!sheetIds || !sheetIds?.sheetId) { return; } - this.selectSvgSheetRequest.emit(id); + this.selectSvgSheetRequest.emit(sheetIds); } } diff --git a/src/app/views/edition-view/edition-outlets/edition-complex/edition-detail/edition-sheets/edition-accolade/edition-accolade.component.html b/src/app/views/edition-view/edition-outlets/edition-complex/edition-detail/edition-sheets/edition-accolade/edition-accolade.component.html index 9c4a097257..6281ecb117 100644 --- a/src/app/views/edition-view/edition-outlets/edition-complex/edition-detail/edition-sheets/edition-accolade/edition-accolade.component.html +++ b/src/app/views/edition-view/edition-outlets/edition-complex/edition-detail/edition-sheets/edition-accolade/edition-accolade.component.html @@ -27,8 +27,7 @@ [selectedSvgSheet]="selectedSvgSheet" (browseSvgSheetRequest)="browseSvgSheet($event)" (selectLinkBoxRequest)="selectLinkBox($event)" - (selectOverlaysRequest)="selectOverlays($event)" - (selectSvgSheetRequest)="selectSvgSheet($event)"> + (selectOverlaysRequest)="selectOverlays($event)"> } diff --git a/src/app/views/edition-view/edition-outlets/edition-complex/edition-detail/edition-sheets/edition-accolade/edition-accolade.component.spec.ts b/src/app/views/edition-view/edition-outlets/edition-complex/edition-detail/edition-sheets/edition-accolade/edition-accolade.component.spec.ts index 71783f2671..70c0ae6d41 100644 --- a/src/app/views/edition-view/edition-outlets/edition-complex/edition-detail/edition-sheets/edition-accolade/edition-accolade.component.spec.ts +++ b/src/app/views/edition-view/edition-outlets/edition-complex/edition-detail/edition-sheets/edition-accolade/edition-accolade.component.spec.ts @@ -34,7 +34,7 @@ class EditionSvgSheetNavStubComponent { @Input() selectedSvgSheet: EditionSvgSheet; @Output() - selectSvgSheetRequest: EventEmitter = new EventEmitter(); + selectSvgSheetRequest: EventEmitter<{ complexId: string; sheetId: string }> = new EventEmitter(); } @Component({ selector: 'awg-edition-svg-sheet-viewer', template: '' }) @@ -50,7 +50,7 @@ class EditionSvgSheetViewerStubComponent { @Output() selectOverlaysRequest: EventEmitter = new EventEmitter(); @Output() - selectSvgSheetRequest: EventEmitter = new EventEmitter(); + selectSvgSheetRequest: EventEmitter<{ complexId: string; sheetId: string }> = new EventEmitter(); } @Component({ selector: 'awg-edition-svg-sheet-footer', template: '' }) @@ -66,7 +66,7 @@ class EditionSvgSheetFooterStubComponent { @Output() openModalRequest: EventEmitter = new EventEmitter(); @Output() - selectSvgSheetRequest: EventEmitter = new EventEmitter(); + selectSvgSheetRequest: EventEmitter<{ complexId: string; sheetId: string }> = new EventEmitter(); } describe('EditionAccoladeComponent (DONE)', () => { @@ -87,6 +87,8 @@ describe('EditionAccoladeComponent (DONE)', () => { let selectSvgSheetSpy: Spy; let selectSvgSheetRequestEmitSpy: Spy; + let expectedComplexId: string; + let expectedNextComplexId: string; let expectedFragment: string; let expectedSvgSheetsData: EditionSvgSheetList; let expectedOverlays: EditionSvgOverlay[]; @@ -125,6 +127,8 @@ describe('EditionAccoladeComponent (DONE)', () => { compDe = fixture.debugElement; // Test data + expectedComplexId = 'testComplex1'; + expectedNextComplexId = 'testComplex2'; expectedFragment = 'source_A'; expectedModalSnippet = mockEditionData.mockModalSnippet; expectedSvgSheet = mockEditionData.mockSvgSheet_Sk1; @@ -619,53 +623,74 @@ describe('EditionAccoladeComponent (DONE)', () => { expect(component.selectSvgSheet).toBeDefined(); }); - it('... should trigger on selectSvgSheetRequest event from EditionSvgSheetNavComponent', () => { - const sheetNavDes = getAndExpectDebugElementByDirective(compDe, EditionSvgSheetNavStubComponent, 1, 1); - const sheetNavCmp = sheetNavDes[0].injector.get( - EditionSvgSheetNavStubComponent - ) as EditionSvgSheetNavStubComponent; + describe('... should trigger on selectSvgSheetRequest event from ...', () => { + it('... EditionSvgSheetNavComponent', () => { + const sheetNavDes = getAndExpectDebugElementByDirective( + compDe, + EditionSvgSheetNavStubComponent, + 1, + 1 + ); + const sheetNavCmp = sheetNavDes[0].injector.get( + EditionSvgSheetNavStubComponent + ) as EditionSvgSheetNavStubComponent; - sheetNavCmp.selectSvgSheetRequest.emit(expectedNextSvgSheet.id); + const expectedSheetIds = { complexId: expectedComplexId, sheetId: expectedNextSvgSheet.id }; + sheetNavCmp.selectSvgSheetRequest.emit(expectedSheetIds); - expectSpyCall(selectSvgSheetSpy, 1, expectedNextSvgSheet.id); - }); + expectSpyCall(selectSvgSheetSpy, 1, expectedSheetIds); + }); - it('... should trigger on selectSvgSheetRequest event from EditionSvgSheetViewerComponent', () => { - const sheetDes = getAndExpectDebugElementByDirective(compDe, EditionSvgSheetViewerStubComponent, 1, 1); - const sheetCmp = sheetDes[0].injector.get( - EditionSvgSheetViewerStubComponent - ) as EditionSvgSheetViewerStubComponent; + it('... EditionSvgSheetFooterStubComponent', () => { + const tableDes = getAndExpectDebugElementByDirective( + compDe, + EditionSvgSheetFooterStubComponent, + 1, + 1 + ); + const tableCmp = tableDes[0].injector.get( + EditionSvgSheetFooterStubComponent + ) as EditionSvgSheetFooterStubComponent; - sheetCmp.selectSvgSheetRequest.emit(expectedNextSvgSheet.id); + const expectedSheetIds = { complexId: expectedComplexId, sheetId: expectedNextSvgSheet.id }; + tableCmp.selectSvgSheetRequest.emit(expectedSheetIds); - expectSpyCall(selectSvgSheetSpy, 1, expectedNextSvgSheet.id); + expectSpyCall(selectSvgSheetSpy, 1, expectedSheetIds); + }); }); - it('... should trigger on selectSvgSheetRequest event from EditionSvgSheetFooterStubComponent', () => { - const tableDes = getAndExpectDebugElementByDirective(compDe, EditionSvgSheetFooterStubComponent, 1, 1); - const tableCmp = tableDes[0].injector.get( - EditionSvgSheetFooterStubComponent - ) as EditionSvgSheetFooterStubComponent; + it('... should not emit anything if no id is provided', () => { + component.selectSvgSheet(undefined); + + expectSpyCall(selectSvgSheetRequestEmitSpy, 0, undefined); - tableCmp.selectSvgSheetRequest.emit(expectedNextSvgSheet.id); + component.selectSvgSheet({ complexId: undefined, sheetId: undefined }); - expectSpyCall(selectSvgSheetSpy, 1, expectedNextSvgSheet.id); + expectSpyCall(selectSvgSheetRequestEmitSpy, 0, {}); }); - it('... should not emit anything if no id is provided', () => { - component.selectSvgSheet(undefined); + it('... should emit id of selected svg sheet within same complex', () => { + const expectedSheetIds = { complexId: expectedComplexId, sheetId: expectedSvgSheet.id }; + component.selectSvgSheet(expectedSheetIds); - expectSpyCall(selectSvgSheetRequestEmitSpy, 0, undefined); + expectSpyCall(selectSvgSheetRequestEmitSpy, 1, expectedSheetIds); + + const expectedNextSheetIds = { complexId: expectedComplexId, sheetId: expectedNextSvgSheet.id }; + component.selectSvgSheet(expectedNextSheetIds); + + expectSpyCall(selectSvgSheetRequestEmitSpy, 2, expectedNextSheetIds); }); - it('... should emit id of selected svg sheet', () => { - component.selectSvgSheet(expectedSvgSheet.id); + it('... should emit id of selected svg sheet for another complex', () => { + const expectedSheetIds = { complexId: expectedComplexId, sheetId: expectedSvgSheet.id }; + component.selectSvgSheet(expectedSheetIds); - expectSpyCall(selectSvgSheetRequestEmitSpy, 1, expectedSvgSheet.id); + expectSpyCall(selectSvgSheetRequestEmitSpy, 1, expectedSheetIds); - component.selectSvgSheet(expectedNextSvgSheet.id); + const expectedNextSheetIds = { complexId: expectedNextComplexId, sheetId: expectedNextSvgSheet.id }; + component.selectSvgSheet(expectedNextSheetIds); - expectSpyCall(selectSvgSheetRequestEmitSpy, 2, expectedNextSvgSheet.id); + expectSpyCall(selectSvgSheetRequestEmitSpy, 2, expectedNextSheetIds); }); }); }); diff --git a/src/app/views/edition-view/edition-outlets/edition-complex/edition-detail/edition-sheets/edition-accolade/edition-accolade.component.ts b/src/app/views/edition-view/edition-outlets/edition-complex/edition-detail/edition-sheets/edition-accolade/edition-accolade.component.ts index f15a0e3c1e..87bfce7d20 100644 --- a/src/app/views/edition-view/edition-outlets/edition-complex/edition-detail/edition-sheets/edition-accolade/edition-accolade.component.ts +++ b/src/app/views/edition-view/edition-outlets/edition-complex/edition-detail/edition-sheets/edition-accolade/edition-accolade.component.ts @@ -108,10 +108,10 @@ export class EditionAccoladeComponent { /** * Output variable: selectSvgSheetRequest. * - * It keeps an event emitter for the selected id of an svg sheet. + * It keeps an event emitter for the selected ids of an edition complex and svg sheet. */ @Output() - selectSvgSheetRequest: EventEmitter = new EventEmitter(); + selectSvgSheetRequest: EventEmitter<{ complexId: string; sheetId: string }> = new EventEmitter(); /** * Public method: browseSvgSheet. @@ -192,16 +192,16 @@ export class EditionAccoladeComponent { /** * Public method: selectSvgSheet. * - * It emits a given id of a selected svg sheet - * to the {@link selectSvgSheetRequest}. + * It emits the given ids of a selected edition complex + * and svg sheet to the {@link selectSvgSheetRequest}. * - * @param {string} id The given sheet id. - * @returns {void} Emits the id. + * @param {object} sheetIds The given sheet ids as { complexId: string, sheetId: string }. + * @returns {void} Emits the ids. */ - selectSvgSheet(id: string): void { - if (!id) { + selectSvgSheet(sheetIds: { complexId: string; sheetId: string }): void { + if (!sheetIds || !sheetIds?.sheetId) { return; } - this.selectSvgSheetRequest.emit(id); + this.selectSvgSheetRequest.emit(sheetIds); } } diff --git a/src/app/views/edition-view/edition-outlets/edition-complex/edition-detail/edition-sheets/edition-accolade/edition-accolade.module.ts b/src/app/views/edition-view/edition-outlets/edition-complex/edition-detail/edition-sheets/edition-accolade/edition-accolade.module.ts index ce909ad862..aeb6cd79fe 100644 --- a/src/app/views/edition-view/edition-outlets/edition-complex/edition-detail/edition-sheets/edition-accolade/edition-accolade.module.ts +++ b/src/app/views/edition-view/edition-outlets/edition-complex/edition-detail/edition-sheets/edition-accolade/edition-accolade.module.ts @@ -1,6 +1,7 @@ import { NgModule } from '@angular/core'; import { SharedModule } from '@awg-shared/shared.module'; +import { EditionTkaDescriptionModule } from '../../edition-tka-description/edition-tka-description.module'; import { EditionTkaTableModule } from '../../edition-tka-table/edition-tka-table.module'; import { EditionAccoladeComponent } from './edition-accolade.component'; @@ -17,7 +18,7 @@ import { EditionSvgSheetViewerComponent } from './edition-svg-sheet-viewer'; * {@link EditionSvgSheetViewerComponent}, {@link EditionTkaTableModule} and {@link SharedModule}. */ @NgModule({ - imports: [SharedModule, EditionTkaTableModule], + imports: [SharedModule, EditionTkaDescriptionModule, EditionTkaTableModule], declarations: [ EditionAccoladeComponent, EditionSvgSheetFooterComponent, diff --git a/src/app/views/edition-view/edition-outlets/edition-complex/edition-detail/edition-sheets/edition-accolade/edition-svg-sheet-footer/edition-svg-sheet-footer.component.html b/src/app/views/edition-view/edition-outlets/edition-complex/edition-detail/edition-sheets/edition-accolade/edition-svg-sheet-footer/edition-svg-sheet-footer.component.html index 24441da807..8c358dc61e 100644 --- a/src/app/views/edition-view/edition-outlets/edition-complex/edition-detail/edition-sheets/edition-accolade/edition-svg-sheet-footer/edition-svg-sheet-footer.component.html +++ b/src/app/views/edition-view/edition-outlets/edition-complex/edition-detail/edition-sheets/edition-accolade/edition-svg-sheet-footer/edition-svg-sheet-footer.component.html @@ -15,12 +15,12 @@ @if ( showTextcritics && selectedTextcritics.description && utils.isNotEmptyArray(selectedTextcritics.description) ) { - @for (description of selectedTextcritics.description; track description) { -

- } + + }
@if (showTkA) { diff --git a/src/app/views/edition-view/edition-outlets/edition-complex/edition-detail/edition-sheets/edition-accolade/edition-svg-sheet-footer/edition-svg-sheet-footer.component.spec.ts b/src/app/views/edition-view/edition-outlets/edition-complex/edition-detail/edition-sheets/edition-accolade/edition-svg-sheet-footer/edition-svg-sheet-footer.component.spec.ts index b22a18d94b..05c4b4ab5c 100644 --- a/src/app/views/edition-view/edition-outlets/edition-complex/edition-detail/edition-sheets/edition-accolade/edition-svg-sheet-footer/edition-svg-sheet-footer.component.spec.ts +++ b/src/app/views/edition-view/edition-outlets/edition-complex/edition-detail/edition-sheets/edition-accolade/edition-svg-sheet-footer/edition-svg-sheet-footer.component.spec.ts @@ -9,6 +9,8 @@ import { faChevronRight, faChevronUp } from '@fortawesome/free-solid-svg-icons'; import { detectChangesOnPush } from '@testing/detect-changes-on-push-helper'; import { expectSpyCall, + expectToBe, + expectToEqual, getAndExpectDebugElementByCss, getAndExpectDebugElementByDirective, } from '@testing/expect-helper'; @@ -20,6 +22,18 @@ import { EditionSvgSheet, TextcriticalComment, Textcritics } from '@awg-app/view import { CompileHtmlComponent } from '@awg-app/shared/compile-html'; import { EditionSvgSheetFooterComponent } from './edition-svg-sheet-footer.component'; +// Mock components +@Component({ selector: 'awg-edition-tka-description', template: '' }) +class EditionTkaDescriptionStubComponent { + @Input() + textcriticalDescriptions: string[]; + @Output() + navigateToReportFragmentRequest: EventEmitter = new EventEmitter(); + @Output() + openModalRequest: EventEmitter = new EventEmitter(); + @Output() + selectSvgSheetRequest: EventEmitter<{ complexId: string; sheetId: string }> = new EventEmitter(); +} @Component({ selector: 'awg-edition-tka-table', template: '' }) class EditionTkaTableStubComponent { @Input() @@ -31,7 +45,7 @@ class EditionTkaTableStubComponent { @Output() openModalRequest: EventEmitter = new EventEmitter(); @Output() - selectSvgSheetRequest: EventEmitter = new EventEmitter(); + selectSvgSheetRequest: EventEmitter<{ complexId: string; sheetId: string }> = new EventEmitter(); } describe('EditionSvgSheetFooterComponent (DONE)', () => { @@ -48,6 +62,8 @@ describe('EditionSvgSheetFooterComponent (DONE)', () => { let selectSvgSheetSpy: Spy; let selectSvgSheetRequestEmitSpy: Spy; + let expectedComplexId: string; + let expectedNextComplexId: string; let expectedFragment: string; let expectedSvgSheet: EditionSvgSheet; let expectedNextSvgSheet: EditionSvgSheet; @@ -62,7 +78,12 @@ describe('EditionSvgSheetFooterComponent (DONE)', () => { beforeEach(async () => { await TestBed.configureTestingModule({ imports: [FontAwesomeTestingModule], - declarations: [EditionSvgSheetFooterComponent, CompileHtmlComponent, EditionTkaTableStubComponent], + declarations: [ + EditionSvgSheetFooterComponent, + CompileHtmlComponent, + EditionTkaDescriptionStubComponent, + EditionTkaTableStubComponent, + ], providers: [UtilityService], }).compileComponents(); @@ -73,6 +94,8 @@ describe('EditionSvgSheetFooterComponent (DONE)', () => { utils = TestBed.inject(UtilityService); // Test data + expectedComplexId = 'testComplex1'; + expectedNextComplexId = 'testComplex2'; expectedFragment = 'source_A'; expectedModalSnippet = mockEditionData.mockModalSnippet; expectedSvgSheet = mockEditionData.mockSvgSheet_Sk1; @@ -116,15 +139,9 @@ describe('EditionSvgSheetFooterComponent (DONE)', () => { }); it('... should have fontawesome icons', () => { - expect(component.faChevronRight).toBeTruthy(); - expect(component.faChevronRight) - .withContext(`should equal ${expectedChevronRightIcon}`) - .toEqual(expectedChevronRightIcon); - - expect(component.faChevronUp).toBeTruthy(); - expect(component.faChevronUp) - .withContext(`should equal ${expectedChevronUpIcon}`) - .toEqual(expectedChevronUpIcon); + expectToEqual(component.faChevronRight, expectedChevronRightIcon); + + expectToEqual(component.faChevronUp, expectedChevronUpIcon); }); it('... should have `ref`', () => { @@ -132,8 +149,7 @@ describe('EditionSvgSheetFooterComponent (DONE)', () => { }); it('... should have `showTextcritics = false`', () => { - expect(component.showTextcritics).toBeDefined(); - expect(component.showTextcritics).toBe(false); + expectToBe(component.showTextcritics, false); }); describe('VIEW', () => { @@ -162,22 +178,15 @@ describe('EditionSvgSheetFooterComponent (DONE)', () => { }); it('... should have `selectedTextcritics` input', () => { - expect(component.selectedTextcritics).toBeDefined(); - expect(component.selectedTextcritics) - .withContext(`should be ${expectedSelectedTextcritics}`) - .toBe(expectedSelectedTextcritics); + expectToEqual(component.selectedTextcritics, expectedSelectedTextcritics); }); it('... should have `selectedTextcriticalComments` input', () => { - expect(component.selectedTextcriticalComments).toBeDefined(); - expect(component.selectedTextcriticalComments) - .withContext(`should equal ${expectedSelectedTextcriticalComments}`) - .toEqual(expectedSelectedTextcriticalComments); + expectToEqual(component.selectedTextcriticalComments, expectedSelectedTextcriticalComments); }); it('... should have `showTkA` input', () => { - expect(component.showTkA).toBeDefined(); - expect(component.showTkA).withContext(`should be ${expectedShowTka}`).toBe(expectedShowTka); + expectToBe(component.showTkA, expectedShowTka); }); describe('VIEW', () => { @@ -239,8 +248,7 @@ describe('EditionSvgSheetFooterComponent (DONE)', () => { const spanDes = getAndExpectDebugElementByCss(pDes[0], 'span.caps', 1, 1); const spanEl = spanDes[0].nativeElement; - expect(spanEl.textContent).toBeDefined(); - expect(spanEl.textContent).withContext(`should be 'Skizzenkommentar:'`).toBe('Skizzenkommentar:'); + expectToBe(spanEl.textContent, 'Skizzenkommentar:'); }); it('... should contain a second span in p with "---" if selectedTextcritics.description is empty', () => { @@ -258,40 +266,35 @@ describe('EditionSvgSheetFooterComponent (DONE)', () => { const spanDes = getAndExpectDebugElementByCss(pDes[0], 'span', 2, 2); const spanEl = spanDes[1].nativeElement; - expect(spanEl.textContent).toBeTruthy(); - expect(spanEl.textContent.trim()).withContext(`should be '---'`).toBe('---'); + expectToBe(spanEl.textContent.trim(), `---`); }); - it('... should contain no description paragraphs if showTextcritics = false', () => { - getAndExpectDebugElementByCss(compDe, 'p.awg-edition-svg-sheet-footer-evaluation-desc', 0, 0); - }); + describe('... should contain no EditionTkaDescriptionComponent if ...', () => { + it('... showTextcritics = false', () => { + getAndExpectDebugElementByCss(compDe, 'p.awg-edition-svg-sheet-footer-evaluation-desc', 0, 0); + }); - it('... should contain no description paragraphs if descriptions are empty', () => { - component.showTextcritics = true; - component.selectedTextcritics = mockEditionData.mockTextcriticsData.textcritics[0]; - detectChangesOnPush(fixture); + it('... descriptions array is empty', () => { + component.showTextcritics = true; + component.selectedTextcritics = mockEditionData.mockTextcriticsData.textcritics[0]; + detectChangesOnPush(fixture); - getAndExpectDebugElementByCss(compDe, 'p.awg-edition-svg-sheet-footer-evaluation-desc', 0, 0); + getAndExpectDebugElementByCss(compDe, 'p.awg-edition-svg-sheet-footer-evaluation-desc', 0, 0); + }); }); - it('... should contain as many description paragraphs as there are textcritics.description if showTextcritics = true', () => { + it('... should contain one EditionTkaDescriptionComponent (stubbed) in evaluation div if showTextcritics = true', () => { component.showTextcritics = true; detectChangesOnPush(fixture); - const pDes = getAndExpectDebugElementByCss( + const divDes = getAndExpectDebugElementByCss( compDe, - 'p.awg-edition-svg-sheet-footer-evaluation-desc', - expectedSelectedTextcritics.description.length, - expectedSelectedTextcritics.description.length + 'div.awg-edition-svg-sheet-footer-evaluation', + 1, + 1 ); - pDes.forEach((pDe, index) => { - const pEl = pDe.nativeElement; - - expect(pEl.textContent) - .withContext(`should be ${expectedSelectedTextcritics.description[index]}`) - .toBe(expectedSelectedTextcritics.description[index]); - }); + getAndExpectDebugElementByDirective(divDes[0], EditionTkaDescriptionStubComponent, 1, 1); }); it('... should contain no textcritics div if showTka is false', () => { @@ -321,10 +324,7 @@ describe('EditionSvgSheetFooterComponent (DONE)', () => { expect(pEl.classList).toBeDefined(); expect(pEl.classList).toContain('caps'); - expect(pEl.textContent).toBeTruthy(); - expect(pEl.textContent.trim()) - .withContext(`should be 'Textkritischer Kommentar:`) - .toBe(`Textkritischer Kommentar:`); + expectToBe(pEl.textContent, `Textkritischer Kommentar:`); }); it('... should contain one EditionTkaTableComponent (stubbed) in textcritics div', () => { @@ -338,24 +338,17 @@ describe('EditionSvgSheetFooterComponent (DONE)', () => { getAndExpectDebugElementByDirective(divDes[0], EditionTkaTableStubComponent, 1, 1); }); - it('... should pass down selectedTextcriticalComments to the EditionTkaTableComponent', () => { + it('... should pass down `selectedTextcriticalComments` and `isRowTable` to the EditionTkaTableComponent', () => { const tableDes = getAndExpectDebugElementByDirective(compDe, EditionTkaTableStubComponent, 1, 1); const tableCmp = tableDes[0].injector.get(EditionTkaTableStubComponent) as EditionTkaTableStubComponent; - expect(tableCmp.textcriticalComments).toBeTruthy(); - expect(tableCmp.textcriticalComments) - .withContext(`should equal ${expectedSelectedTextcriticalComments}`) - .toEqual(expectedSelectedTextcriticalComments); + expectToEqual(tableCmp.textcriticalComments, expectedSelectedTextcriticalComments); + expectToBe(tableCmp.isRowTable, expectedSelectedTextcritics.rowtable); }); it('... should pass down isRowTable to the EditionTkaTableComponent', () => { const tableDes = getAndExpectDebugElementByDirective(compDe, EditionTkaTableStubComponent, 1, 1); const tableCmp = tableDes[0].injector.get(EditionTkaTableStubComponent) as EditionTkaTableStubComponent; - - expect(tableCmp.isRowTable).toBeTruthy(); - expect(tableCmp.isRowTable) - .withContext(`should equal ${expectedSelectedTextcritics.rowtable}`) - .toEqual(expectedSelectedTextcritics.rowtable); }); }); @@ -460,25 +453,46 @@ describe('EditionSvgSheetFooterComponent (DONE)', () => { EditionTkaTableStubComponent ) as EditionTkaTableStubComponent; - editionTkaTableCmp.selectSvgSheetRequest.emit(expectedNextSvgSheet.id); + const expectedSheetIds = { complexId: expectedComplexId, sheetId: expectedSvgSheet.id }; + editionTkaTableCmp.selectSvgSheetRequest.emit(expectedSheetIds); - expectSpyCall(selectSvgSheetSpy, 1, expectedNextSvgSheet.id); + expectSpyCall(selectSvgSheetSpy, 1, expectedSheetIds); }); it('... should not emit anything if no id is provided', () => { - component.selectSvgSheet(undefined); + const expectedSheetIds = undefined; + component.selectSvgSheet(expectedSheetIds); + + expectSpyCall(selectSvgSheetRequestEmitSpy, 0, expectedSheetIds); + + const expectedNextSheetIds = { complexId: undefined, sheetId: undefined }; + component.selectSvgSheet(expectedNextSheetIds); + + expectSpyCall(selectSvgSheetRequestEmitSpy, 0, expectedNextSheetIds); + }); + + it('... should emit id of selected svg sheet within same complex', () => { + const expectedSheetIds = { complexId: expectedComplexId, sheetId: expectedSvgSheet.id }; + component.selectSvgSheet(expectedSheetIds); + + expectSpyCall(selectSvgSheetRequestEmitSpy, 1, expectedSheetIds); + + const expectedNextSheetIds = { complexId: expectedComplexId, sheetId: expectedNextSvgSheet.id }; + component.selectSvgSheet(expectedNextSheetIds); - expectSpyCall(selectSvgSheetRequestEmitSpy, 0, undefined); + expectSpyCall(selectSvgSheetRequestEmitSpy, 2, expectedNextSheetIds); }); - it('... should emit id of selected svg sheet', () => { - component.selectSvgSheet(expectedSvgSheet.id); + it('... should emit id of selected svg sheet for another complex', () => { + const expectedSheetIds = { complexId: expectedComplexId, sheetId: expectedSvgSheet.id }; + component.selectSvgSheet(expectedSheetIds); - expectSpyCall(selectSvgSheetRequestEmitSpy, 1, expectedSvgSheet.id); + expectSpyCall(selectSvgSheetRequestEmitSpy, 1, expectedSheetIds); - component.selectSvgSheet(expectedNextSvgSheet.id); + const expectedNextSheetIds = { complexId: expectedNextComplexId, sheetId: expectedNextSvgSheet.id }; + component.selectSvgSheet(expectedNextSheetIds); - expectSpyCall(selectSvgSheetRequestEmitSpy, 2, expectedNextSvgSheet.id); + expectSpyCall(selectSvgSheetRequestEmitSpy, 2, expectedNextSheetIds); }); }); diff --git a/src/app/views/edition-view/edition-outlets/edition-complex/edition-detail/edition-sheets/edition-accolade/edition-svg-sheet-footer/edition-svg-sheet-footer.component.ts b/src/app/views/edition-view/edition-outlets/edition-complex/edition-detail/edition-sheets/edition-accolade/edition-svg-sheet-footer/edition-svg-sheet-footer.component.ts index b2eec5e502..ac7d224a2e 100644 --- a/src/app/views/edition-view/edition-outlets/edition-complex/edition-detail/edition-sheets/edition-accolade/edition-svg-sheet-footer/edition-svg-sheet-footer.component.ts +++ b/src/app/views/edition-view/edition-outlets/edition-complex/edition-detail/edition-sheets/edition-accolade/edition-svg-sheet-footer/edition-svg-sheet-footer.component.ts @@ -63,10 +63,10 @@ export class EditionSvgSheetFooterComponent { /** * Output variable: selectSvgSheetRequest. * - * It keeps an event emitter for the selected id of an svg sheet. + * It keeps an event emitter for the selected ids of an edition complex and svg sheet. */ @Output() - selectSvgSheetRequest: EventEmitter = new EventEmitter(); + selectSvgSheetRequest: EventEmitter<{ complexId: string; sheetId: string }> = new EventEmitter(); /** * Public variable: faChevronRight. @@ -141,17 +141,17 @@ export class EditionSvgSheetFooterComponent { /** * Public method: selectSvgSheet. * - * It emits a given id of a selected svg sheet - * to the {@link selectSvgSheetRequest}. + * It emits the given ids of a selected edition complex + * and svg sheet to the {@link selectSvgSheetRequest}. * - * @param {string} id The given sheet id. - * @returns {void} Emits the id. + * @param {object} sheetIds The given sheet ids as { complexId: string, sheetId: string }. + * @returns {void} Emits the ids. */ - selectSvgSheet(id: string): void { - if (!id) { + selectSvgSheet(sheetIds: { complexId: string; sheetId: string }): void { + if (!sheetIds || !sheetIds?.sheetId) { return; } - this.selectSvgSheetRequest.emit(id); + this.selectSvgSheetRequest.emit(sheetIds); } /** diff --git a/src/app/views/edition-view/edition-outlets/edition-complex/edition-detail/edition-sheets/edition-accolade/edition-svg-sheet-nav/edition-svg-sheet-nav-item/edition-svg-sheet-nav-item.component.html b/src/app/views/edition-view/edition-outlets/edition-complex/edition-detail/edition-sheets/edition-accolade/edition-svg-sheet-nav/edition-svg-sheet-nav-item/edition-svg-sheet-nav-item.component.html index bb5d2fadf0..48865896fe 100644 --- a/src/app/views/edition-view/edition-outlets/edition-complex/edition-detail/edition-sheets/edition-accolade/edition-svg-sheet-nav/edition-svg-sheet-nav-item/edition-svg-sheet-nav-item.component.html +++ b/src/app/views/edition-view/edition-outlets/edition-complex/edition-detail/edition-sheets/edition-accolade/edition-svg-sheet-nav/edition-svg-sheet-nav-item/edition-svg-sheet-nav-item.component.html @@ -9,7 +9,7 @@
+ (click)="selectSvgSheet('', svgSheet.id)"> {{ svgSheet.label }} } @@ -33,7 +33,7 @@
active: isSelectedSvgSheet(svgSheet.id, svgSheetContent.partial), 'text-muted': !isSelectedSvgSheet(svgSheet.id, svgSheetContent.partial) }" - (click)="selectSvgSheet(svgSheet.id + svgSheetContent.partial)" + (click)="selectSvgSheet('', svgSheet.id + svgSheetContent.partial)" >{{ svgSheet.label }} [{{ i + 1 }}/{{ svgSheet.content.length }}] diff --git a/src/app/views/edition-view/edition-outlets/edition-complex/edition-detail/edition-sheets/edition-accolade/edition-svg-sheet-nav/edition-svg-sheet-nav-item/edition-svg-sheet-nav-item.component.spec.ts b/src/app/views/edition-view/edition-outlets/edition-complex/edition-detail/edition-sheets/edition-accolade/edition-svg-sheet-nav/edition-svg-sheet-nav-item/edition-svg-sheet-nav-item.component.spec.ts index b0c716df32..f8702bc528 100644 --- a/src/app/views/edition-view/edition-outlets/edition-complex/edition-detail/edition-sheets/edition-accolade/edition-svg-sheet-nav/edition-svg-sheet-nav-item/edition-svg-sheet-nav-item.component.spec.ts +++ b/src/app/views/edition-view/edition-outlets/edition-complex/edition-detail/edition-sheets/edition-accolade/edition-svg-sheet-nav/edition-svg-sheet-nav-item/edition-svg-sheet-nav-item.component.spec.ts @@ -22,6 +22,8 @@ describe('EditionSvgSheetNavItemComponent (DONE)', () => { let fixture: ComponentFixture; let compDe: DebugElement; + let expectedComplexId: string; + let expectedNextComplexId: string; let expectedNavItemLabel: string; let expectedSvgSheets: EditionSvgSheet[]; let expectedSheetsWithoutPartials: EditionSvgSheet[]; @@ -47,6 +49,8 @@ describe('EditionSvgSheetNavItemComponent (DONE)', () => { // Test data expectedNavItemLabel = 'Testeditionslabel'; + expectedComplexId = 'testComplex1'; + expectedNextComplexId = 'testComplex2'; expectedSvgSheets = mockEditionData.mockSvgSheetList.sheets['sketchEditions']; expectedSheetsWithoutPartials = expectedSvgSheets.filter(sheet => sheet.content.length === 1); expectedSheetsWithPartials = expectedSvgSheets.filter(sheet => sheet.content.length > 1); @@ -442,7 +446,7 @@ describe('EditionSvgSheetNavItemComponent (DONE)', () => { describe('... should trigger on click', () => { it('... on direct anchors', fakeAsync(() => { - const expectedId = expectedSvgSheet.id; + const expectedSheetId = expectedSvgSheet.id; const anchorDes = getAndExpectDebugElementByCss( compDe, @@ -454,12 +458,12 @@ describe('EditionSvgSheetNavItemComponent (DONE)', () => { // Trigger click with click helper & wait for changes clickAndAwaitChanges(anchorDes[0], fixture); - expectSpyCall(selectSvgSheetSpy, 1, expectedId); + expectSpyCall(selectSvgSheetSpy, 1, ['', expectedSheetId]); // Trigger click with click helper & wait for changes clickAndAwaitChanges(anchorDes[1], fixture); - expectSpyCall(selectSvgSheetSpy, 2, expectedNextSvgSheet.id); + expectSpyCall(selectSvgSheetSpy, 2, ['', expectedNextSvgSheet.id]); })); it('... on dropdown anchors', fakeAsync(() => { @@ -483,34 +487,64 @@ describe('EditionSvgSheetNavItemComponent (DONE)', () => { const expectedIdWithPartial = sheet.id + sheet.content[anchorIndex].partial; - expectSpyCall(selectSvgSheetSpy, index * 2 + anchorIndex + 1, expectedIdWithPartial); + expectSpyCall(selectSvgSheetSpy, index * 2 + anchorIndex + 1, ['', expectedIdWithPartial]); }); }); })); }); it('... should not emit anything if no id is provided', () => { - component.selectSvgSheet(undefined); + component.selectSvgSheet(undefined, undefined); expectSpyCall(selectSvgSheetRequestEmitSpy, 0, undefined); + + component.selectSvgSheet('', ''); + + expectSpyCall(selectSvgSheetRequestEmitSpy, 0, undefined); + }); + + it('... should emit id of selected svg sheet within same complex', () => { + const expectedSheetIds = { complexId: expectedComplexId, sheetId: expectedSvgSheet.id }; + component.selectSvgSheet(expectedSheetIds.complexId, expectedSheetIds.sheetId); + + expectSpyCall(selectSvgSheetRequestEmitSpy, 1, expectedSheetIds); + + const expectedNextSheetIds = { complexId: expectedComplexId, sheetId: expectedNextSvgSheet.id }; + component.selectSvgSheet(expectedNextSheetIds.complexId, expectedNextSheetIds.sheetId); + + expectSpyCall(selectSvgSheetRequestEmitSpy, 2, expectedNextSheetIds); + }); + + it('... should emit id of selected svg sheet with partial within same complex', () => { + const expectedSheetId = + expectedSvgSheetWithPartialA.id + expectedSvgSheetWithPartialA.content[0].partial; + const expectedSheetIds = { complexId: expectedComplexId, sheetId: expectedSheetId }; + + component.selectSvgSheet(expectedSheetIds.complexId, expectedSheetIds.sheetId); + + expectSpyCall(selectSvgSheetRequestEmitSpy, 1, expectedSheetIds); }); - it('... should emit id of selected svg sheet', () => { - component.selectSvgSheet(expectedSvgSheet.id); + it('... should emit id of selected svg sheet for another complex', () => { + const expectedSheetIds = { complexId: expectedComplexId, sheetId: expectedSvgSheet.id }; + component.selectSvgSheet(expectedSheetIds.complexId, expectedSheetIds.sheetId); - expectSpyCall(selectSvgSheetRequestEmitSpy, 1, expectedSvgSheet.id); + expectSpyCall(selectSvgSheetRequestEmitSpy, 1, expectedSheetIds); - component.selectSvgSheet(expectedNextSvgSheet.id); + const expectedNextSheetIds = { complexId: expectedNextComplexId, sheetId: expectedNextSvgSheet.id }; + component.selectSvgSheet(expectedNextSheetIds.complexId, expectedNextSheetIds.sheetId); - expectSpyCall(selectSvgSheetRequestEmitSpy, 2, expectedNextSvgSheet.id); + expectSpyCall(selectSvgSheetRequestEmitSpy, 2, expectedNextSheetIds); }); - it('... should emit id of selected svg sheet with partial', () => { - const expectedId = expectedSvgSheetWithPartialA.id + expectedSvgSheetWithPartialA.content[0].partial; + it('... should emit id of selected svg sheet with partial for another complex', () => { + const expectedSheetId = + expectedSvgSheetWithPartialA.id + expectedSvgSheetWithPartialA.content[0].partial; + const expectedSheetIds = { complexId: expectedNextComplexId, sheetId: expectedSheetId }; - component.selectSvgSheet(expectedId); + component.selectSvgSheet(expectedSheetIds.complexId, expectedSheetIds.sheetId); - expectSpyCall(selectSvgSheetRequestEmitSpy, 1, expectedId); + expectSpyCall(selectSvgSheetRequestEmitSpy, 1, expectedSheetIds); }); }); }); diff --git a/src/app/views/edition-view/edition-outlets/edition-complex/edition-detail/edition-sheets/edition-accolade/edition-svg-sheet-nav/edition-svg-sheet-nav-item/edition-svg-sheet-nav-item.component.ts b/src/app/views/edition-view/edition-outlets/edition-complex/edition-detail/edition-sheets/edition-accolade/edition-svg-sheet-nav/edition-svg-sheet-nav-item/edition-svg-sheet-nav-item.component.ts index 2671494a2c..255014de83 100644 --- a/src/app/views/edition-view/edition-outlets/edition-complex/edition-detail/edition-sheets/edition-accolade/edition-svg-sheet-nav/edition-svg-sheet-nav-item/edition-svg-sheet-nav-item.component.ts +++ b/src/app/views/edition-view/edition-outlets/edition-complex/edition-detail/edition-sheets/edition-accolade/edition-svg-sheet-nav/edition-svg-sheet-nav-item/edition-svg-sheet-nav-item.component.ts @@ -42,10 +42,10 @@ export class EditionSvgSheetNavItemComponent { /** * Output variable: selectSvgSheetRequest. * - * It keeps an event emitter for the selected id of an svg sheet. + * It keeps an event emitter for the selected ids of an edition complex and svg sheet. */ @Output() - selectSvgSheetRequest: EventEmitter = new EventEmitter(); + selectSvgSheetRequest: EventEmitter<{ complexId: string; sheetId: string }> = new EventEmitter(); /** * Constructor of the EditionSvgSheetNavItemComponent. @@ -83,16 +83,17 @@ export class EditionSvgSheetNavItemComponent { /** * Public method: selectSvgSheet. * - * It emits a given id of a selected svg sheet - * to the {@link selectSvgSheetRequest}. + * It emits the given ids of a selected edition complex + * and svg sheet to the {@link selectSvgSheetRequest}. * - * @param {string} id The given sheet id. - * @returns {void} Emits the id. + * @param {string} complexId The given complex id. + * @param {string} sheetId The given sheet id. + * @returns {void} Emits the ids. */ - selectSvgSheet(id: string): void { - if (!id) { + selectSvgSheet(complexId: string, sheetId: string): void { + if (!sheetId) { return; } - this.selectSvgSheetRequest.emit(id); + this.selectSvgSheetRequest.emit({ complexId: complexId, sheetId: sheetId }); } } diff --git a/src/app/views/edition-view/edition-outlets/edition-complex/edition-detail/edition-sheets/edition-accolade/edition-svg-sheet-nav/edition-svg-sheet-nav.component.spec.ts b/src/app/views/edition-view/edition-outlets/edition-complex/edition-detail/edition-sheets/edition-accolade/edition-svg-sheet-nav/edition-svg-sheet-nav.component.spec.ts index 710779eaef..f67c63ed01 100644 --- a/src/app/views/edition-view/edition-outlets/edition-complex/edition-detail/edition-sheets/edition-accolade/edition-svg-sheet-nav/edition-svg-sheet-nav.component.spec.ts +++ b/src/app/views/edition-view/edition-outlets/edition-complex/edition-detail/edition-sheets/edition-accolade/edition-svg-sheet-nav/edition-svg-sheet-nav.component.spec.ts @@ -27,7 +27,7 @@ class EditionSvgSheetNavItemStubComponent { selectedSvgSheet: EditionSvgSheet; @Output() - selectSvgSheetRequest: EventEmitter = new EventEmitter(); + selectSvgSheetRequest: EventEmitter<{ complexId: string; sheetId: string }> = new EventEmitter(); } describe('EditionSvgSheetNavComponent (DONE)', () => { @@ -35,6 +35,8 @@ describe('EditionSvgSheetNavComponent (DONE)', () => { let fixture: ComponentFixture; let compDe: DebugElement; + let expectedComplexId: string; + let expectedNextComplexId: string; let expectedSvgSheetsData: EditionSvgSheetList; let expectedSvgSheet: EditionSvgSheet; let expectedSvgSheetWithPartials: EditionSvgSheet; @@ -56,6 +58,8 @@ describe('EditionSvgSheetNavComponent (DONE)', () => { compDe = fixture.debugElement; // Test data + expectedComplexId = 'testComplex1'; + expectedNextComplexId = 'testComplex2'; expectedSvgSheet = mockEditionData.mockSvgSheet_Sk1; expectedNextSvgSheet = mockEditionData.mockSvgSheet_Sk4; expectedSvgSheetWithPartials = mockEditionData.mockSvgSheet_Sk2; @@ -243,41 +247,75 @@ describe('EditionSvgSheetNavComponent (DONE)', () => { de => de.injector.get(EditionSvgSheetNavItemStubComponent) as EditionSvgSheetNavItemStubComponent ); - sheetNavItemCmp[0].selectSvgSheetRequest.emit(expectedNextSvgSheet.id); + let expectedSheetIds = { complexId: expectedComplexId, sheetId: expectedNextSvgSheet.id }; + sheetNavItemCmp[0].selectSvgSheetRequest.emit(expectedSheetIds); - expectSpyCall(selectSvgSheetSpy, 1, expectedNextSvgSheet.id); + expectSpyCall(selectSvgSheetSpy, 1, expectedSheetIds); - sheetNavItemCmp[1].selectSvgSheetRequest.emit(expectedSvgSheet.id); + expectedSheetIds = { complexId: expectedComplexId, sheetId: expectedSvgSheet.id }; + sheetNavItemCmp[1].selectSvgSheetRequest.emit(expectedSheetIds); - expectSpyCall(selectSvgSheetSpy, 2, expectedSvgSheet.id); + expectSpyCall(selectSvgSheetSpy, 2, expectedSheetIds); - sheetNavItemCmp[2].selectSvgSheetRequest.emit(expectedSvgSheet.id); + sheetNavItemCmp[2].selectSvgSheetRequest.emit(expectedSheetIds); - expectSpyCall(selectSvgSheetSpy, 3, expectedSvgSheet.id); + expectSpyCall(selectSvgSheetSpy, 3, expectedSheetIds); }); it('... should not emit anything if no id is provided', () => { - component.selectSvgSheet(undefined); + const expectedSheetIds = undefined; + component.selectSvgSheet(expectedSheetIds); - expectSpyCall(selectSvgSheetRequestEmitSpy, 0, undefined); + expectSpyCall(selectSvgSheetRequestEmitSpy, 0, expectedSheetIds); + + const expectedNextSheetIds = { complexId: undefined, sheetId: undefined }; + component.selectSvgSheet(expectedNextSheetIds); + + expectSpyCall(selectSvgSheetRequestEmitSpy, 0, expectedNextSheetIds); + }); + + it('... should emit id of selected svg sheet within same complex', () => { + const expectedSheetIds = { complexId: expectedComplexId, sheetId: expectedSvgSheet.id }; + component.selectSvgSheet(expectedSheetIds); + + expectSpyCall(selectSvgSheetRequestEmitSpy, 1, expectedSheetIds); + + const expectedNextSheetIds = { complexId: expectedComplexId, sheetId: expectedNextSvgSheet.id }; + component.selectSvgSheet(expectedNextSheetIds); + + expectSpyCall(selectSvgSheetRequestEmitSpy, 2, expectedNextSheetIds); + }); + + it('... should emit id of selected svg sheet with partial within same complex', () => { + const expectedSheetId = + expectedSvgSheetWithPartialA.id + expectedSvgSheetWithPartialA.content[0].partial; + const expectedSheetIds = { complexId: expectedComplexId, sheetId: expectedSheetId }; + + component.selectSvgSheet(expectedSheetIds); + + expectSpyCall(selectSvgSheetRequestEmitSpy, 1, expectedSheetIds); }); - it('... should emit id of selected svg sheet', () => { - component.selectSvgSheet(expectedSvgSheet.id); + it('... should emit id of selected svg sheet for another complex', () => { + const expectedSheetIds = { complexId: expectedComplexId, sheetId: expectedSvgSheet.id }; + component.selectSvgSheet(expectedSheetIds); - expectSpyCall(selectSvgSheetRequestEmitSpy, 1, expectedSvgSheet.id); + expectSpyCall(selectSvgSheetRequestEmitSpy, 1, expectedSheetIds); - component.selectSvgSheet(expectedNextSvgSheet.id); + const expectedNextSheetIds = { complexId: expectedNextComplexId, sheetId: expectedNextSvgSheet.id }; + component.selectSvgSheet(expectedNextSheetIds); - expectSpyCall(selectSvgSheetRequestEmitSpy, 2, expectedNextSvgSheet.id); + expectSpyCall(selectSvgSheetRequestEmitSpy, 2, expectedNextSheetIds); }); - it('... should emit id of selected svg sheet with partial', () => { - const expectedId = expectedSvgSheetWithPartialA.id + expectedSvgSheetWithPartialA.content[0].partial; + it('... should emit id of selected svg sheet with partial for another complex', () => { + const expectedSheetId = + expectedSvgSheetWithPartialA.id + expectedSvgSheetWithPartialA.content[0].partial; + const expectedSheetIds = { complexId: expectedComplexId, sheetId: expectedSheetId }; - component.selectSvgSheet(expectedId); + component.selectSvgSheet(expectedSheetIds); - expectSpyCall(selectSvgSheetRequestEmitSpy, 1, expectedId); + expectSpyCall(selectSvgSheetRequestEmitSpy, 1, expectedSheetIds); }); }); }); diff --git a/src/app/views/edition-view/edition-outlets/edition-complex/edition-detail/edition-sheets/edition-accolade/edition-svg-sheet-nav/edition-svg-sheet-nav.component.ts b/src/app/views/edition-view/edition-outlets/edition-complex/edition-detail/edition-sheets/edition-accolade/edition-svg-sheet-nav/edition-svg-sheet-nav.component.ts index 58ed9c657f..f5efb04a41 100644 --- a/src/app/views/edition-view/edition-outlets/edition-complex/edition-detail/edition-sheets/edition-accolade/edition-svg-sheet-nav/edition-svg-sheet-nav.component.ts +++ b/src/app/views/edition-view/edition-outlets/edition-complex/edition-detail/edition-sheets/edition-accolade/edition-svg-sheet-nav/edition-svg-sheet-nav.component.ts @@ -35,24 +35,24 @@ export class EditionSvgSheetNavComponent { /** * Output variable: selectSvgSheetRequest. * - * It keeps an event emitter for the selected id of an svg sheet. + * It keeps an event emitter for the selected ids of an edition complex and svg sheet. */ @Output() - selectSvgSheetRequest: EventEmitter = new EventEmitter(); + selectSvgSheetRequest: EventEmitter<{ complexId: string; sheetId: string }> = new EventEmitter(); /** * Public method: selectSvgSheet. * - * It emits a given id of a selected svg sheet - * to the {@link selectSvgSheetRequest}. + * It emits the given ids of a selected edition complex + * and svg sheet to the {@link selectSvgSheetRequest}. * - * @param {string} id The given sheet id. - * @returns {void} Emits the id. + * @param {object} sheetIds The given sheet ids as { complexId: string, sheetId: string }. + * @returns {void} Emits the ids. */ - selectSvgSheet(id: string): void { - if (!id) { + selectSvgSheet(sheetIds: { complexId: string; sheetId: string }): void { + if (!sheetIds || !sheetIds?.sheetId) { return; } - this.selectSvgSheetRequest.emit(id); + this.selectSvgSheetRequest.emit(sheetIds); } } diff --git a/src/app/views/edition-view/edition-outlets/edition-complex/edition-detail/edition-sheets/edition-accolade/edition-svg-sheet-viewer/edition-svg-sheet-viewer.component.spec.ts b/src/app/views/edition-view/edition-outlets/edition-complex/edition-detail/edition-sheets/edition-accolade/edition-svg-sheet-viewer/edition-svg-sheet-viewer.component.spec.ts index c5a3833d26..a0fa5f00dd 100644 --- a/src/app/views/edition-view/edition-outlets/edition-complex/edition-detail/edition-sheets/edition-accolade/edition-svg-sheet-viewer/edition-svg-sheet-viewer.component.spec.ts +++ b/src/app/views/edition-view/edition-outlets/edition-complex/edition-detail/edition-sheets/edition-accolade/edition-svg-sheet-viewer/edition-svg-sheet-viewer.component.spec.ts @@ -44,9 +44,9 @@ describe('EditionSvgSheetViewerComponent', () => { let rescaleZoomSpy: Spy; let resetZoomSpy: Spy; let retranslateZoomSpy: Spy; - let selectSvgSheetSpy: Spy; - let selectSvgSheetRequestEmitSpy: Spy; + let expectedComplexId: string; + let expectedNextComplexId: string; let expectedCompressIcon: IconDefinition; let expectedSliderConfig: SliderConfig; let expectedSvgSheet: EditionSvgSheet; @@ -86,6 +86,8 @@ describe('EditionSvgSheetViewerComponent', () => { expectedCompressIcon = faCompressArrowsAlt; expectedSliderConfig = new SliderConfig(1, 0.1, 10, 1 / 100, 1); + expectedComplexId = 'testComplex1'; + expectedNextComplexId = 'testComplex2'; expectedSvgSheet = mockEditionData.mockSvgSheet_Sk1; expectedNextSvgSheet = mockEditionData.mockSvgSheet_Sk2; @@ -96,9 +98,6 @@ describe('EditionSvgSheetViewerComponent', () => { browseSvgSheetRequestEmitSpy = spyOn(component.browseSvgSheetRequest, 'emit').and.callThrough(); onZoomChangeSpy = spyOn(component, 'onZoomChange').and.callThrough(); resetZoomSpy = spyOn(component, 'resetZoom').and.callThrough(); - selectSvgSheetSpy = spyOn(component, 'selectSvgSheet').and.callThrough(); - selectSvgSheetRequestEmitSpy = spyOn(component.selectSvgSheetRequest, 'emit').and.callThrough(); - rescaleZoomSpy = spyOn(component, '_rescaleZoom').and.callFake(() => {}); // TODO: Check if a more meaningful replacement can be found retranslateZoomSpy = spyOn(component, '_retranslateZoom').and.callFake(() => {}); @@ -561,38 +560,5 @@ describe('EditionSvgSheetViewerComponent', () => { expectSpyCall(retranslateZoomSpy, 1); }); }); - - describe('#selectSvgSheet()', () => { - it('... should have a method `selectSvgSheet`', () => { - expect(component.selectSvgSheet).toBeDefined(); - }); - - /* It('... should trigger on click on linkbox', () => { - const sheetNavDes = getAndExpectDebugElementByDirective(compDe, EditionSvgSheetNavStubComponent, 1, 1); - const sheetNavCmp = sheetNavDes[0].injector.get( - EditionSvgSheetNavStubComponent - ) as EditionSvgSheetNavStubComponent; - - sheetNavCmp.selectSvgSheetRequest.emit(expectedNextSvgSheet.id); - - expectSpyCall(selectSvgSheetSpy, 1, expectedNextSvgSheet.id); - }); */ - - it('... should not emit anything if no id is provided', () => { - component.selectSvgSheet(undefined); - - expectSpyCall(selectSvgSheetRequestEmitSpy, 0, undefined); - }); - - it('... should emit id of selected svg sheet', () => { - component.selectSvgSheet(expectedSvgSheet.id); - - expectSpyCall(selectSvgSheetRequestEmitSpy, 1, expectedSvgSheet.id); - - component.selectSvgSheet(expectedNextSvgSheet.id); - - expectSpyCall(selectSvgSheetRequestEmitSpy, 2, expectedNextSvgSheet.id); - }); - }); }); }); diff --git a/src/app/views/edition-view/edition-outlets/edition-complex/edition-detail/edition-sheets/edition-accolade/edition-svg-sheet-viewer/edition-svg-sheet-viewer.component.ts b/src/app/views/edition-view/edition-outlets/edition-complex/edition-detail/edition-sheets/edition-accolade/edition-svg-sheet-viewer/edition-svg-sheet-viewer.component.ts index a356ccf924..bccb04f22c 100644 --- a/src/app/views/edition-view/edition-outlets/edition-complex/edition-detail/edition-sheets/edition-accolade/edition-svg-sheet-viewer/edition-svg-sheet-viewer.component.ts +++ b/src/app/views/edition-view/edition-outlets/edition-complex/edition-detail/edition-sheets/edition-accolade/edition-svg-sheet-viewer/edition-svg-sheet-viewer.component.ts @@ -106,14 +106,6 @@ export class EditionSvgSheetViewerComponent implements OnChanges, OnDestroy, Aft @Output() selectOverlaysRequest: EventEmitter = new EventEmitter(); - /** - * Output variable: selectSvgSheetRequest. - * - * It keeps an event emitter for the selected id of an svg sheet. - */ - @Output() - selectSvgSheetRequest: EventEmitter = new EventEmitter(); - /** * Public variable: faCompressArrowsAlt. * @@ -351,23 +343,6 @@ export class EditionSvgSheetViewerComponent implements OnChanges, OnDestroy, Aft this._retranslateZoom(); } - /** - * Public method: selectSvgSheet. - * - * It emits a given id of a selected svg sheet - * to the {@link selectSvgSheetRequest}. - * - * @param {string} id The given sheet id. - * - * @returns {void} Emits the id. - */ - selectSvgSheet(id: string): void { - if (!id) { - return; - } - this.selectSvgSheetRequest.emit(id); - } - /** * Private method: _clearSVG. * @@ -581,7 +556,7 @@ export class EditionSvgSheetViewerComponent implements OnChanges, OnDestroy, Aft } /** - * Private method: onOverlaySelect. + * Private method: _onOverlaySelect. * * It emits the given svg overlays * to the {@link selectOverlaysRequest}. @@ -595,7 +570,7 @@ export class EditionSvgSheetViewerComponent implements OnChanges, OnDestroy, Aft } /** - * Private method: onLinkBoxSelect. + * Private method: _onLinkBoxSelect. * * It emits the given link box id * to the {@link selectLinkBoxRequest}. @@ -686,12 +661,12 @@ export class EditionSvgSheetViewerComponent implements OnChanges, OnDestroy, Aft zoomContext.attr('transform', currentTransform); // Update view - if (this.sliderInput && this.sliderInput.nativeElement) { + if (this.sliderInput?.nativeElement) { this.sliderInput.nativeElement.value = roundedTransformValue; this.sliderConfig.value = roundedTransformValue; } // Needed because d3 listener does not update ngModel - if (this.sliderInputLabel && this.sliderInputLabel.nativeElement) { + if (this.sliderInputLabel?.nativeElement) { this.sliderInputLabel.nativeElement.innerText = roundedTransformValue + 'x'; } }; diff --git a/src/app/views/edition-view/edition-outlets/edition-complex/edition-detail/edition-sheets/edition-convolute/edition-convolute.component.spec.ts b/src/app/views/edition-view/edition-outlets/edition-complex/edition-detail/edition-sheets/edition-convolute/edition-convolute.component.spec.ts index 488f217a69..b3b2cc2c7c 100644 --- a/src/app/views/edition-view/edition-outlets/edition-complex/edition-detail/edition-sheets/edition-convolute/edition-convolute.component.spec.ts +++ b/src/app/views/edition-view/edition-outlets/edition-complex/edition-detail/edition-sheets/edition-convolute/edition-convolute.component.spec.ts @@ -35,7 +35,7 @@ class EditionFolioViewerStubComponent { @Output() openModalRequest: EventEmitter = new EventEmitter(); @Output() - selectSvgSheetRequest: EventEmitter = new EventEmitter(); + selectSvgSheetRequest: EventEmitter<{ complexId: string; sheetId: string }> = new EventEmitter(); } describe('EditionConvoluteComponent (DONE)', () => { @@ -52,6 +52,8 @@ describe('EditionConvoluteComponent (DONE)', () => { let selectSvgSheetRequestEmitSpy: Spy; let expectedSelectedConvolute: FolioConvolute; + let expectedComplexId: string; + let expectedNextComplexId: string; let expectedSvgSheet: EditionSvgSheet; let expectedNextSvgSheet: EditionSvgSheet; let expectedFolioLegends: IFolioLegend[]; @@ -80,6 +82,8 @@ describe('EditionConvoluteComponent (DONE)', () => { // Test data expectedSelectedConvolute = mockEditionData.mockFolioConvoluteData.convolutes[0]; + expectedComplexId = 'testComplex1'; + expectedNextComplexId = 'testComplex2'; expectedSvgSheet = mockEditionData.mockSvgSheet_Sk1; expectedNextSvgSheet = mockEditionData.mockSvgSheet_Sk2; expectedFragment = `source${expectedSelectedConvolute.convoluteId}`; @@ -309,25 +313,46 @@ describe('EditionConvoluteComponent (DONE)', () => { EditionFolioViewerStubComponent ) as EditionFolioViewerStubComponent; - folioCmp.selectSvgSheetRequest.emit(expectedNextSvgSheet.id); + const expectedSheetIds = { complexId: expectedComplexId, sheetId: expectedNextSvgSheet.id }; + folioCmp.selectSvgSheetRequest.emit(expectedSheetIds); - expectSpyCall(selectSvgSheetSpy, 1, expectedNextSvgSheet.id); + expectSpyCall(selectSvgSheetSpy, 1, expectedSheetIds); }); it('... should not emit anything if no id is provided', () => { - component.selectSvgSheet(undefined); + const expectedSheetIds = undefined; + component.selectSvgSheet(expectedSheetIds); - expectSpyCall(selectSvgSheetRequestEmitSpy, 0, undefined); + expectSpyCall(selectSvgSheetRequestEmitSpy, 0, expectedSheetIds); + + const expectedNextSheetIds = { complexId: undefined, sheetId: undefined }; + component.selectSvgSheet(expectedNextSheetIds); + + expectSpyCall(selectSvgSheetRequestEmitSpy, 0, expectedNextSheetIds); + }); + + it('... should emit id of selected svg sheet within same complex', () => { + const expectedSheetIds = { complexId: expectedComplexId, sheetId: expectedSvgSheet.id }; + component.selectSvgSheet(expectedSheetIds); + + expectSpyCall(selectSvgSheetRequestEmitSpy, 1, expectedSheetIds); + + const expectedNextSheetIds = { complexId: expectedComplexId, sheetId: expectedNextSvgSheet.id }; + component.selectSvgSheet(expectedNextSheetIds); + + expectSpyCall(selectSvgSheetRequestEmitSpy, 2, expectedNextSheetIds); }); - it('... should emit id of selected svg sheet', () => { - component.selectSvgSheet(expectedSvgSheet.id); + it('... should emit id of selected svg sheet for another complex', () => { + const expectedSheetIds = { complexId: expectedComplexId, sheetId: expectedSvgSheet.id }; + component.selectSvgSheet(expectedSheetIds); - expectSpyCall(selectSvgSheetRequestEmitSpy, 1, expectedSvgSheet.id); + expectSpyCall(selectSvgSheetRequestEmitSpy, 1, expectedSheetIds); - component.selectSvgSheet(expectedNextSvgSheet.id); + const expectedNextSheetIds = { complexId: expectedNextComplexId, sheetId: expectedNextSvgSheet.id }; + component.selectSvgSheet(expectedNextSheetIds); - expectSpyCall(selectSvgSheetRequestEmitSpy, 2, expectedNextSvgSheet.id); + expectSpyCall(selectSvgSheetRequestEmitSpy, 2, expectedNextSheetIds); }); }); diff --git a/src/app/views/edition-view/edition-outlets/edition-complex/edition-detail/edition-sheets/edition-convolute/edition-convolute.component.ts b/src/app/views/edition-view/edition-outlets/edition-complex/edition-detail/edition-sheets/edition-convolute/edition-convolute.component.ts index 248dcf6827..4dc69e1a64 100644 --- a/src/app/views/edition-view/edition-outlets/edition-complex/edition-detail/edition-sheets/edition-convolute/edition-convolute.component.ts +++ b/src/app/views/edition-view/edition-outlets/edition-complex/edition-detail/edition-sheets/edition-convolute/edition-convolute.component.ts @@ -64,10 +64,10 @@ export class EditionConvoluteComponent { /** * Output variable: selectSvgSheetRequest. * - * It keeps an event emitter for the selected id of an svg sheet. + * It keeps an event emitter for the selected ids of an edition complex and svg sheet. */ @Output() - selectSvgSheetRequest: EventEmitter = new EventEmitter(); + selectSvgSheetRequest: EventEmitter<{ complexId: string; sheetId: string }> = new EventEmitter(); /** * Public variable: faSquare. @@ -115,16 +115,16 @@ export class EditionConvoluteComponent { /** * Public method: selectSvgSheet. * - * It emits a given id of a selected svg sheet - * to the {@link selectSvgSheetRequest}. + * It emits the given ids of a selected edition complex + * and svg sheet to the {@link selectSvgSheetRequest}. * - * @param {string} id The given sheet id. - * @returns {void} Emits the id. + * @param {object} sheetIds The given sheet ids as { complexId: string, sheetId: string }. + * @returns {void} Emits the ids. */ - selectSvgSheet(id: string): void { - if (!id) { + selectSvgSheet(sheetIds: { complexId: string; sheetId: string }): void { + if (!sheetIds || !sheetIds?.sheetId) { return; } - this.selectSvgSheetRequest.emit(id); + this.selectSvgSheetRequest.emit(sheetIds); } } diff --git a/src/app/views/edition-view/edition-outlets/edition-complex/edition-detail/edition-sheets/edition-convolute/edition-folio-viewer/edition-folio-viewer.component.ts b/src/app/views/edition-view/edition-outlets/edition-complex/edition-detail/edition-sheets/edition-convolute/edition-folio-viewer/edition-folio-viewer.component.ts index 3faa29596a..67f8b1ae2e 100644 --- a/src/app/views/edition-view/edition-outlets/edition-complex/edition-detail/edition-sheets/edition-convolute/edition-folio-viewer/edition-folio-viewer.component.ts +++ b/src/app/views/edition-view/edition-outlets/edition-complex/edition-detail/edition-sheets/edition-convolute/edition-folio-viewer/edition-folio-viewer.component.ts @@ -68,10 +68,10 @@ export class EditionFolioViewerComponent implements OnChanges, AfterViewChecked /** * Output variable: selectSvgSheetRequest. * - * It keeps an event emitter for the selected id of an svg sheet. + * It keeps an event emitter for the selected ids of an edition complex and svg sheet. */ @Output() - selectSvgSheetRequest: EventEmitter = new EventEmitter(); + selectSvgSheetRequest: EventEmitter<{ complexId: string; sheetId: string }> = new EventEmitter(); /** * Public variable: canvasArray. @@ -305,13 +305,17 @@ export class EditionFolioViewerComponent implements OnChanges, AfterViewChecked /** * Public method: selectSvgSheet. * - * It emits a given id of a selected svg sheet - * to the {@link selectSvgSheetRequest}. + * It emits the given ids of a selected edition complex + * and svg sheet to the {@link selectSvgSheetRequest}. * - * @param {string} id The given sheet id. - * @returns {void} Emits the id. + * @param {string} complexId The given complex id. + * @param {string} sheetId The given sheet id. + * @returns {void} Emits the ids. */ - selectSvgSheet(id: string): void { - this.selectSvgSheetRequest.emit(id); + selectSvgSheet(complexId: string, sheetId: string): void { + if (!sheetId) { + return; + } + this.selectSvgSheetRequest.emit({ complexId: complexId, sheetId: sheetId }); } } diff --git a/src/app/views/edition-view/edition-outlets/edition-complex/edition-detail/edition-sheets/edition-convolute/edition-folio-viewer/folio.service.ts b/src/app/views/edition-view/edition-outlets/edition-complex/edition-detail/edition-sheets/edition-convolute/edition-folio-viewer/folio.service.ts index 2a3162fd3f..0ad8336bcc 100644 --- a/src/app/views/edition-view/edition-outlets/edition-complex/edition-detail/edition-sheets/edition-convolute/edition-folio-viewer/folio.service.ts +++ b/src/app/views/edition-view/edition-outlets/edition-complex/edition-detail/edition-sheets/edition-convolute/edition-folio-viewer/folio.service.ts @@ -340,7 +340,7 @@ export class FolioService { const snapItemGroup: any = snapCanvas.group(snapItemLink); snapItemGroup.attr({ itemGroupId: itemLabelArray, - itemId: contentItem.id, + itemId: contentItem.sheetId, class: 'item-group', }); @@ -357,7 +357,7 @@ export class FolioService { fill: 'grey', }); } else { - snapItemGroup.click(() => this.ref.selectSvgSheet(contentItem.id)); + snapItemGroup.click(() => this.ref.selectSvgSheet(contentItem.complexId, contentItem.sheetId)); snapItemGroup.attr({ stroke: fgColor, fill: fgColor, diff --git a/src/app/views/edition-view/edition-outlets/edition-complex/edition-detail/edition-sheets/edition-sheets.component.spec.ts b/src/app/views/edition-view/edition-outlets/edition-complex/edition-detail/edition-sheets/edition-sheets.component.spec.ts index 764254b6a4..621752ba2d 100644 --- a/src/app/views/edition-view/edition-outlets/edition-complex/edition-detail/edition-sheets/edition-sheets.component.spec.ts +++ b/src/app/views/edition-view/edition-outlets/edition-complex/edition-detail/edition-sheets/edition-sheets.component.spec.ts @@ -54,7 +54,7 @@ class EditionAccoladeStubComponent { @Output() selectOverlaysRequest: EventEmitter = new EventEmitter(); @Output() - selectSvgSheetRequest: EventEmitter = new EventEmitter(); + selectSvgSheetRequest: EventEmitter<{ complexId: string; sheetId: string }> = new EventEmitter(); } @Component({ selector: 'awg-edition-convolute', template: '' }) @@ -66,7 +66,7 @@ class EditionConvoluteStubComponent { @Output() openModalRequest: EventEmitter = new EventEmitter(); @Output() - selectSvgSheetRequest: EventEmitter = new EventEmitter(); + selectSvgSheetRequest: EventEmitter<{ complexId: string; sheetId: string }> = new EventEmitter(); } describe('EditionSheetsComponent', () => { diff --git a/src/app/views/edition-view/edition-outlets/edition-complex/edition-detail/edition-sheets/edition-sheets.component.ts b/src/app/views/edition-view/edition-outlets/edition-complex/edition-detail/edition-sheets/edition-sheets.component.ts index d7dc9f5464..a2cd02dd6f 100644 --- a/src/app/views/edition-view/edition-outlets/edition-complex/edition-detail/edition-sheets/edition-sheets.component.ts +++ b/src/app/views/edition-view/edition-outlets/edition-complex/edition-detail/edition-sheets/edition-sheets.component.ts @@ -215,8 +215,8 @@ export class EditionSheetsComponent implements OnInit, OnDestroy { const selectedLinkBox = this.selectedTextcritics.linkBoxes.find(linkBox => linkBox.svgGroupId === linkBoxId); if (selectedLinkBox) { - const linkToSvgSheet = selectedLinkBox.linkTo; - this.onSvgSheetSelect(linkToSvgSheet); + const linkedSheetIds = selectedLinkBox.linkTo; + this.onSvgSheetSelect(linkedSheetIds); } } @@ -284,34 +284,32 @@ export class EditionSheetsComponent implements OnInit, OnDestroy { editionTypeSheets ); - this.onSvgSheetSelect(nextSheetId); + this.onSvgSheetSelect({ complexId: '', sheetId: nextSheetId }); } /** * Public method: onSvgSheetSelect. * - * It selects a SVG sheet by its id and - * navigates to the edition sheets route + * It selects a SVG sheet by its edition complex + * and sheet ids and navigates to the edition sheets route * with this given id. * - * @param {string} id The given SVG sheet id. + * @param {object} sheetIds The given sheet ids as { complexId: string, sheetId: string }. * @returns {void} Navigates to the edition sheets. */ - onSvgSheetSelect(sheetId: string): void { + onSvgSheetSelect(sheetIds: { complexId: string; sheetId: string }): void { // Set default id if none is given - if (!sheetId) { - sheetId = this.svgSheetsData.sheets.sketchEditions[0].id; - } + const complexRoute = sheetIds.complexId + ? `/edition/complex/${sheetIds.complexId}` + : this.editionComplex.baseRoute; + const sheetRoute = sheetIds.sheetId ? sheetIds.sheetId : this.svgSheetsData.sheets.sketchEditions[0].id; const navigationExtras: NavigationExtras = { - queryParams: { id: sheetId }, + queryParams: { id: sheetRoute }, queryParamsHandling: 'merge', }; - this.router.navigate( - [this.editionComplex.baseRoute, this.editionRouteConstants.EDITION_SHEETS.route], - navigationExtras - ); + this.router.navigate([complexRoute, this.editionRouteConstants.EDITION_SHEETS.route], navigationExtras); } /** diff --git a/src/app/views/edition-view/edition-outlets/edition-complex/edition-detail/edition-tka-description/edition-tka-description.component.html b/src/app/views/edition-view/edition-outlets/edition-complex/edition-detail/edition-tka-description/edition-tka-description.component.html new file mode 100644 index 0000000000..59cf4db67a --- /dev/null +++ b/src/app/views/edition-view/edition-outlets/edition-complex/edition-detail/edition-tka-description/edition-tka-description.component.html @@ -0,0 +1,3 @@ +@for (description of textcriticalDescriptions; track description) { +

+} diff --git a/src/app/views/edition-view/edition-outlets/edition-complex/edition-detail/edition-tka-description/edition-tka-description.component.scss b/src/app/views/edition-view/edition-outlets/edition-complex/edition-detail/edition-tka-description/edition-tka-description.component.scss new file mode 100644 index 0000000000..e69de29bb2 diff --git a/src/app/views/edition-view/edition-outlets/edition-complex/edition-detail/edition-tka-description/edition-tka-description.component.spec.ts b/src/app/views/edition-view/edition-outlets/edition-complex/edition-detail/edition-tka-description/edition-tka-description.component.spec.ts new file mode 100644 index 0000000000..5a7a6d89ef --- /dev/null +++ b/src/app/views/edition-view/edition-outlets/edition-complex/edition-detail/edition-tka-description/edition-tka-description.component.spec.ts @@ -0,0 +1,302 @@ +import { DebugElement } from '@angular/core'; +import { ComponentFixture, TestBed, fakeAsync, waitForAsync } from '@angular/core/testing'; + +import Spy = jasmine.Spy; + +import { clickAndAwaitChanges } from '@testing/click-helper'; +import { + expectSpyCall, + expectToBe, + getAndExpectDebugElementByCss, + getAndExpectDebugElementByDirective, +} from '@testing/expect-helper'; +import { mockEditionData } from '@testing/mock-data'; + +import { CompileHtmlComponent } from '@awg-app/shared/compile-html'; +import { EditionSvgSheet } from '@awg-views/edition-view/models'; + +import { DOCUMENT } from '@angular/common'; +import { EditionTkaDescriptionComponent } from './edition-tka-description.component'; + +describe('EditionTkaDescriptionComponent (DONE)', () => { + let component: EditionTkaDescriptionComponent; + let fixture: ComponentFixture; + let compDe: DebugElement; + + let mockDocument: Document; + + let navigateToReportFragmentSpy: Spy; + let navigateToReportFragmentRequestEmitSpy: Spy; + let openModalSpy: Spy; + let openModalRequestEmitSpy: Spy; + let selectSvgSheetSpy: Spy; + let selectSvgSheetRequestEmitSpy: Spy; + + let expectedComplexId: string; + let expectedNextComplexId: string; + let expectedFragment: string; + let expectedModalSnippet: string; + let expectedSvgSheet: EditionSvgSheet; + let expectedNextSvgSheet: EditionSvgSheet; + let expectedTextcriticalDescriptions: string[]; + + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + declarations: [EditionTkaDescriptionComponent, CompileHtmlComponent], + }).compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(EditionTkaDescriptionComponent); + component = fixture.componentInstance; + compDe = fixture.debugElement; + + // Test data + expectedComplexId = 'testComplex1'; + expectedNextComplexId = 'testComplex2'; + expectedFragment = 'source_B'; + expectedModalSnippet = mockEditionData.mockModalSnippet; + expectedSvgSheet = mockEditionData.mockSvgSheet_Sk1; + expectedNextSvgSheet = mockEditionData.mockSvgSheet_Sk2; + expectedTextcriticalDescriptions = mockEditionData.mockTextcriticsData.textcritics.at(1).description; + + mockDocument = TestBed.inject(DOCUMENT); + + // Spies on component functions + // `.and.callThrough` will track the spy down the nested describes, see + // https://jasmine.github.io/2.0/introduction.html#section-Spies:_%3Ccode%3Eand.callThrough%3C/code%3E + navigateToReportFragmentSpy = spyOn(component, 'navigateToReportFragment').and.callThrough(); + navigateToReportFragmentRequestEmitSpy = spyOn( + component.navigateToReportFragmentRequest, + 'emit' + ).and.callThrough(); + openModalSpy = spyOn(component, 'openModal').and.callThrough(); + openModalRequestEmitSpy = spyOn(component.openModalRequest, 'emit').and.callThrough(); + selectSvgSheetSpy = spyOn(component, 'selectSvgSheet').and.callThrough(); + selectSvgSheetRequestEmitSpy = spyOn(component.selectSvgSheetRequest, 'emit').and.callThrough(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); + + describe('BEFORE initial data binding', () => { + it('... should not have textcriticalDescriptions', () => { + expect(component.textcriticalDescriptions).toBeUndefined(); + }); + + it('... should have `ref`', () => { + expectToBe(component.ref, component); + }); + + describe('VIEW', () => { + it('... should contain no paragraphs with edition-tka-description class yet', () => { + const pDes = getAndExpectDebugElementByCss(compDe, 'p.awg-edition-tka-description', 0, 0); + }); + }); + }); + + describe('AFTER initial data binding', () => { + beforeEach(() => { + // Simulate the parent setting the input properties + component.textcriticalDescriptions = expectedTextcriticalDescriptions; + + // Trigger initial data binding + fixture.detectChanges(); + }); + + it('... should have textcriticalDescriptions', () => { + expectToBe(component.textcriticalDescriptions, expectedTextcriticalDescriptions); + }); + + describe('VIEW', () => { + it('... should contain as many paragraphs with edition-tka-description class as textcriticalDescriptions length', () => { + getAndExpectDebugElementByCss( + compDe, + 'p.awg-edition-tka-description', + expectedTextcriticalDescriptions.length, + expectedTextcriticalDescriptions.length + ); + }); + + it('... should contain CompileHtmlComponent in each paragraph', () => { + const pDes = getAndExpectDebugElementByCss( + compDe, + 'p.awg-edition-tka-description', + expectedTextcriticalDescriptions.length, + expectedTextcriticalDescriptions.length + ); + pDes.forEach(pDe => { + getAndExpectDebugElementByDirective(pDe, CompileHtmlComponent, 0, 0); + }); + }); + + it('... should display the textcriticalDescriptions in each paragraph', () => { + const pDes = getAndExpectDebugElementByCss( + compDe, + 'p.awg-edition-tka-description', + expectedTextcriticalDescriptions.length, + expectedTextcriticalDescriptions.length + ); + pDes.forEach((pDe, index) => { + const pEl = pDe.nativeElement; + + const htmlDescriptionEntry = mockDocument.createElement('p'); + htmlDescriptionEntry.innerHTML = expectedTextcriticalDescriptions[index]; + + expectToBe(pEl.textContent.trim(), htmlDescriptionEntry.textContent.trim()); + }); + }); + }); + + describe('#navigateToReportFragment()', () => { + it('... should have a method `navigateToReportFragment`', () => { + expect(component.navigateToReportFragment).toBeDefined(); + }); + + it('... should trigger on click', fakeAsync(() => { + // Find paragraphs + const pDes = getAndExpectDebugElementByCss( + compDe, + 'p.awg-edition-tka-description', + expectedTextcriticalDescriptions.length, + expectedTextcriticalDescriptions.length + ); + + // Find anchor in second paragraph + const anchorDes = getAndExpectDebugElementByCss(pDes[1], 'a', 3, 3); + + // Click on anchor (with navigateToReportFragment call) + clickAndAwaitChanges(anchorDes[1], fixture); + + expectSpyCall(navigateToReportFragmentSpy, 1, expectedFragment); + })); + + describe('... should not emit anything if', () => { + it('... id is undefined', () => { + component.navigateToReportFragment(undefined); + + expectSpyCall(navigateToReportFragmentRequestEmitSpy, 0); + }); + it('... id is null', () => { + component.navigateToReportFragment(null); + + expectSpyCall(navigateToReportFragmentRequestEmitSpy, 0); + }); + it('... id is empty string', () => { + component.navigateToReportFragment(''); + + expectSpyCall(navigateToReportFragmentRequestEmitSpy, 0); + }); + }); + + it('... should emit id of selected report fragment', () => { + component.navigateToReportFragment(expectedFragment); + + expectSpyCall(navigateToReportFragmentRequestEmitSpy, 1, expectedFragment); + + const otherFragment = 'source_B'; + component.navigateToReportFragment(otherFragment); + + expectSpyCall(navigateToReportFragmentRequestEmitSpy, 2, otherFragment); + }); + }); + + describe('#openModal()', () => { + it('... should have a method `openModal`', () => { + expect(component.openModal).toBeDefined(); + }); + + it('... should trigger on click', fakeAsync(() => { + // Find paragraphs + const pDes = getAndExpectDebugElementByCss( + compDe, + 'p.awg-edition-tka-description', + expectedTextcriticalDescriptions.length, + expectedTextcriticalDescriptions.length + ); + + // Find anchor in second paragraph + const anchorDes = getAndExpectDebugElementByCss(pDes[1], 'a', 3, 3); + + // Click on anchor (with openModal call) + clickAndAwaitChanges(anchorDes[2], fixture); + + expectSpyCall(openModalSpy, 1, expectedModalSnippet); + })); + + it('... should not emit anything if no id is provided', () => { + component.openModal(undefined); + + expectSpyCall(openModalRequestEmitSpy, 0, undefined); + }); + + it('... should emit id of given modal snippet', () => { + component.openModal(expectedModalSnippet); + + expectSpyCall(openModalRequestEmitSpy, 1, expectedModalSnippet); + }); + }); + + describe('#selectSvgSheet()', () => { + it('... should have a method `selectSvgSheet`', () => { + expect(component.selectSvgSheet).toBeDefined(); + }); + + it('... should trigger on click', fakeAsync(() => { + // Find paragraphs + const pDes = getAndExpectDebugElementByCss( + compDe, + 'p.awg-edition-tka-description', + expectedTextcriticalDescriptions.length, + expectedTextcriticalDescriptions.length + ); + + // Find anchor in second paragraph + const anchorDes = getAndExpectDebugElementByCss(pDes[1], 'a', 3, 3); + + // Click on anchor (with selectSvgSheet call) + clickAndAwaitChanges(anchorDes[0], fixture); + + expectSpyCall(selectSvgSheetSpy, 1, [expectedComplexId, expectedSvgSheet.id]); + })); + + it('... should not emit anything if no id is provided', () => { + component.selectSvgSheet(undefined, undefined); + + expectSpyCall(selectSvgSheetRequestEmitSpy, 0, undefined); + + component.selectSvgSheet('', ''); + + expectSpyCall(selectSvgSheetRequestEmitSpy, 0, undefined); + }); + + it('... should emit id of selected svg sheet within same complex', () => { + const expectedSheetIds = { complexId: expectedComplexId, sheetId: expectedSvgSheet.id }; + component.selectSvgSheet(expectedSheetIds.complexId, expectedSheetIds.sheetId); + + expectSpyCall(selectSvgSheetRequestEmitSpy, 1, expectedSheetIds); + + const expectedNextSheetIds = { complexId: expectedComplexId, sheetId: expectedNextSvgSheet.id }; + component.selectSvgSheet(expectedNextSheetIds.complexId, expectedNextSheetIds.sheetId); + + expectSpyCall(selectSvgSheetRequestEmitSpy, 2, { + complexId: expectedComplexId, + sheetId: expectedNextSvgSheet.id, + }); + }); + + it('... should emit id of selected svg sheet for another complex', () => { + const expectedSheetIds = { complexId: expectedComplexId, sheetId: expectedSvgSheet.id }; + component.selectSvgSheet(expectedSheetIds.complexId, expectedSheetIds.sheetId); + + expectSpyCall(selectSvgSheetRequestEmitSpy, 1, expectedSheetIds); + + const expectedNextSheetIds = { complexId: expectedNextComplexId, sheetId: expectedNextSvgSheet.id }; + component.selectSvgSheet(expectedNextSheetIds.complexId, expectedNextSheetIds.sheetId); + + expectSpyCall(selectSvgSheetRequestEmitSpy, 2, expectedNextSheetIds); + }); + }); + }); +}); diff --git a/src/app/views/edition-view/edition-outlets/edition-complex/edition-detail/edition-tka-description/edition-tka-description.component.ts b/src/app/views/edition-view/edition-outlets/edition-complex/edition-detail/edition-tka-description/edition-tka-description.component.ts new file mode 100644 index 0000000000..6309beb8c6 --- /dev/null +++ b/src/app/views/edition-view/edition-outlets/edition-complex/edition-detail/edition-tka-description/edition-tka-description.component.ts @@ -0,0 +1,111 @@ +import { ChangeDetectionStrategy, Component, EventEmitter, Input, Output } from '@angular/core'; + +/** + * The EditionTkaDescription component. + * + * It contains the desription for the textcritical comments + * of the edition view of the app. + */ +@Component({ + selector: 'awg-edition-tka-description', + templateUrl: './edition-tka-description.component.html', + styleUrl: './edition-tka-description.component.scss', + changeDetection: ChangeDetectionStrategy.OnPush, +}) +export class EditionTkaDescriptionComponent { + /** + * Input variable: textcriticalComments. + * + * It keeps the textcritical comments. + */ + @Input() + textcriticalDescriptions: string[]; + + /** + * Output variable: navigateToReportFragment. + * + * It keeps an event emitter for a fragment id of the edition report. + */ + @Output() + navigateToReportFragmentRequest: EventEmitter = new EventEmitter(); + + /** + * Output variable: openModalRequest. + * + * It keeps an event emitter to open the modal + * with the selected modal text snippet. + */ + @Output() + openModalRequest: EventEmitter = new EventEmitter(); + + /** + * Output variable: selectSvgSheetRequest. + * + * It keeps an event emitter for the selected ids of an edition complex and svg sheet. + */ + @Output() + selectSvgSheetRequest: EventEmitter<{ complexId: string; sheetId: string }> = new EventEmitter(); + + /** + * Self-referring variable needed for CompileHtml library. + */ + ref: EditionTkaDescriptionComponent; + + /** + * Constructor of the EditionTkaDescriptionComponent. + * + * It initializes the self-referring ref variable needed for CompileHtml library. + */ + constructor() { + this.ref = this; + } + + /** + * Public method: navigateToReportFragment. + * + * It emits a given id of a fragment of the edition report + * to the {@link navigateToReportFragmentRequest}. + * + * @param {string} id The given fragment id. + * @returns {void} Navigates to the edition report. + */ + navigateToReportFragment(id: string): void { + if (!id) { + return; + } + this.navigateToReportFragmentRequest.emit(id); + } + + /** + * Public method: openModal. + * + * It emits a given id of a modal snippet text + * to the {@link openModalRequest}. + * + * @param {string} id The given modal snippet id. + * @returns {void} Emits the id. + */ + openModal(id: string): void { + if (!id) { + return; + } + this.openModalRequest.emit(id); + } + + /** + * Public method: selectSvgSheet. + * + * It emits the given ids of a selected edition complex + * and svg sheet to the {@link selectSvgSheetRequest}. + * + * @param {string} complexId The given complex id. + * @param {string} sheetId The given sheet id. + * @returns {void} Emits the ids. + */ + selectSvgSheet(complexId: string, sheetId: string): void { + if (!sheetId) { + return; + } + this.selectSvgSheetRequest.emit({ complexId: complexId, sheetId: sheetId }); + } +} diff --git a/src/app/views/edition-view/edition-outlets/edition-complex/edition-detail/edition-tka-description/edition-tka-description.module.ts b/src/app/views/edition-view/edition-outlets/edition-complex/edition-detail/edition-tka-description/edition-tka-description.module.ts new file mode 100644 index 0000000000..21529ea903 --- /dev/null +++ b/src/app/views/edition-view/edition-outlets/edition-complex/edition-detail/edition-tka-description/edition-tka-description.module.ts @@ -0,0 +1,17 @@ +import { NgModule } from '@angular/core'; +import { SharedModule } from '@awg-shared/shared.module'; + +import { EditionTkaDescriptionComponent } from './edition-tka-description.component'; + +/** + * The edition TkA description module. + * + * It embeds the {@link EditionTkaDescriptionComponent} + * as well as the {@link SharedModule}. + */ +@NgModule({ + imports: [SharedModule], + declarations: [EditionTkaDescriptionComponent], + exports: [EditionTkaDescriptionComponent], +}) +export class EditionTkaDescriptionModule {} diff --git a/src/app/views/edition-view/edition-outlets/edition-complex/edition-detail/edition-tka-table/edition-tka-table.component.spec.ts b/src/app/views/edition-view/edition-outlets/edition-complex/edition-detail/edition-tka-table/edition-tka-table.component.spec.ts index 4d6916369d..4edc0f2c42 100644 --- a/src/app/views/edition-view/edition-outlets/edition-complex/edition-detail/edition-tka-table/edition-tka-table.component.spec.ts +++ b/src/app/views/edition-view/edition-outlets/edition-complex/edition-detail/edition-tka-table/edition-tka-table.component.spec.ts @@ -40,8 +40,10 @@ describe('EditionTkaTableComponent (DONE)', () => { let expectedGlyphs: typeof EDITION_GLYPHS_DATA; let expectedIsRowTable: boolean; let expectedModalSnippet: string; - let expectedNextSvgSheet: EditionSvgSheet; + let expectedComplexId: string; + let expectedNextComplexId: string; let expectedSvgSheet: EditionSvgSheet; + let expectedNextSvgSheet: EditionSvgSheet; let expectedTextcriticalComments: TextcriticalComment[]; let expectedTableHeaderStrings: { default: { reference: string; label: string }[]; @@ -62,6 +64,8 @@ describe('EditionTkaTableComponent (DONE)', () => { mockDocument = TestBed.inject(DOCUMENT); // Test data + expectedComplexId = 'testComplex1'; + expectedNextComplexId = 'testComplex2'; expectedFragment = 'source_A'; expectedGlyphs = EDITION_GLYPHS_DATA; expectedModalSnippet = mockEditionData.mockModalSnippet; @@ -167,10 +171,7 @@ describe('EditionTkaTableComponent (DONE)', () => { columnDes.forEach((columnDe, index) => { const columnEl = columnDe.nativeElement; - expect(columnEl.textContent).toBeDefined(); - expect(columnEl.textContent.trim()) - .withContext(`should be '${expectedTableHeaderStrings.default[index].label}'`) - .toBe(expectedTableHeaderStrings.default[index].label); + expectToBe(columnEl.textContent.trim(), expectedTableHeaderStrings.default[index].label); }); }); @@ -183,10 +184,7 @@ describe('EditionTkaTableComponent (DONE)', () => { columnDes.forEach((columnDe, index) => { const columnEl = columnDe.nativeElement; - expect(columnEl.textContent).toBeDefined(); - expect(columnEl.textContent.trim()) - .withContext(`should be '${expectedTableHeaderStrings.rowTable[index].label}'`) - .toBe(expectedTableHeaderStrings.rowTable[index].label); + expectToBe(columnEl.textContent.trim(), expectedTableHeaderStrings.rowTable[index].label); }); }); @@ -286,12 +284,12 @@ describe('EditionTkaTableComponent (DONE)', () => { }); it('... should return the correct hex value for a valid glyph alt value', () => { - expect(component.getGlyph('[bb]')).withContext(`should be '\uD834\uDD2B'`).toBe('\uD834\uDD2B'); // DOUBLE_FLAT - expect(component.getGlyph('[x]')).withContext(`should be '\uD834\uDD2A'`).toBe('\uD834\uDD2A'); // DOUBLE_SHARP - expect(component.getGlyph('[b]')).withContext(`should be '\u266D'`).toBe('\u266D'); // FLAT - expect(component.getGlyph('[#]')).withContext(`should be '\u266F'`).toBe('\u266F'); // SHARP - expect(component.getGlyph('[a]')).withContext(`should be '\u266E'`).toBe('\u266E'); // NATURAL - expect(component.getGlyph('[f]')).withContext(`should be '\uD834\uDD91'`).toBe('\uD834\uDD91'); // FORTE + expectToBe(component.getGlyph('[bb]'), '\uD834\uDD2B'); // DOUBLE_FLAT + expectToBe(component.getGlyph('[x]'), '\uD834\uDD2A'); // DOUBLE_SHARP + expectToBe(component.getGlyph('[b]'), '\u266D'); // FLAT + expectToBe(component.getGlyph('[#]'), '\u266F'); // SHARP + expectToBe(component.getGlyph('[a]'), '\u266E'); // NATURAL + expectToBe(component.getGlyph('[f]'), '\uD834\uDD91'); // FORTE }); it('... should return an empty string for an invalid glyph alt value', () => { @@ -451,23 +449,44 @@ describe('EditionTkaTableComponent (DONE)', () => { // CLick on second anchor (with selectSvgSheet call) clickAndAwaitChanges(anchorDes[2], fixture); - expectSpyCall(selectSvgSheetSpy, 1, expectedSvgSheet.id); + expectSpyCall(selectSvgSheetSpy, 1, [expectedComplexId, expectedSvgSheet.id]); })); it('... should not emit anything if no id is provided', () => { - component.selectSvgSheet(undefined); + component.selectSvgSheet(undefined, undefined); + + expectSpyCall(selectSvgSheetRequestEmitSpy, 0, undefined); + + component.selectSvgSheet('', ''); expectSpyCall(selectSvgSheetRequestEmitSpy, 0, undefined); }); - it('... should emit id of selected svg sheet', () => { - component.selectSvgSheet(expectedSvgSheet.id); + it('... should emit id of selected svg sheet within same complex', () => { + const expectedSheetIds = { complexId: expectedComplexId, sheetId: expectedSvgSheet.id }; + component.selectSvgSheet(expectedSheetIds.complexId, expectedSheetIds.sheetId); + + expectSpyCall(selectSvgSheetRequestEmitSpy, 1, expectedSheetIds); + + const expectedNextSheetIds = { complexId: expectedComplexId, sheetId: expectedNextSvgSheet.id }; + component.selectSvgSheet(expectedNextSheetIds.complexId, expectedNextSheetIds.sheetId); + + expectSpyCall(selectSvgSheetRequestEmitSpy, 2, { + complexId: expectedComplexId, + sheetId: expectedNextSvgSheet.id, + }); + }); + + it('... should emit id of selected svg sheet for another complex', () => { + const expectedSheetIds = { complexId: expectedComplexId, sheetId: expectedSvgSheet.id }; + component.selectSvgSheet(expectedSheetIds.complexId, expectedSheetIds.sheetId); - expectSpyCall(selectSvgSheetRequestEmitSpy, 1, expectedSvgSheet.id); + expectSpyCall(selectSvgSheetRequestEmitSpy, 1, expectedSheetIds); - component.selectSvgSheet(expectedNextSvgSheet.id); + const expectedNextSheetIds = { complexId: expectedNextComplexId, sheetId: expectedNextSvgSheet.id }; + component.selectSvgSheet(expectedNextSheetIds.complexId, expectedNextSheetIds.sheetId); - expectSpyCall(selectSvgSheetRequestEmitSpy, 2, expectedNextSvgSheet.id); + expectSpyCall(selectSvgSheetRequestEmitSpy, 2, expectedNextSheetIds); }); }); }); diff --git a/src/app/views/edition-view/edition-outlets/edition-complex/edition-detail/edition-tka-table/edition-tka-table.component.ts b/src/app/views/edition-view/edition-outlets/edition-complex/edition-detail/edition-tka-table/edition-tka-table.component.ts index 3df02b88b6..8cdf886073 100644 --- a/src/app/views/edition-view/edition-outlets/edition-complex/edition-detail/edition-tka-table/edition-tka-table.component.ts +++ b/src/app/views/edition-view/edition-outlets/edition-complex/edition-detail/edition-tka-table/edition-tka-table.component.ts @@ -52,10 +52,10 @@ export class EditionTkaTableComponent { /** * Output variable: selectSvgSheetRequest. * - * It keeps an event emitter for the selected id of an svg sheet. + * It keeps an event emitter for the selected ids of an edition complex and svg sheet. */ @Output() - selectSvgSheetRequest: EventEmitter = new EventEmitter(); + selectSvgSheetRequest: EventEmitter<{ complexId: string; sheetId: string }> = new EventEmitter(); /** * Readonly variable: GLYPHS. @@ -160,16 +160,17 @@ export class EditionTkaTableComponent { /** * Public method: selectSvgSheet. * - * It emits a given id of a selected svg sheet - * to the {@link selectSvgSheetRequest}. + * It emits the given ids of a selected edition complex + * and svg sheet to the {@link selectSvgSheetRequest}. * - * @param {string} id The given sheet id. - * @returns {void} Emits the id. + * @param {string} complexId The given complex id. + * @param {string} sheetId The given sheet id. + * @returns {void} Emits the ids. */ - selectSvgSheet(id: string): void { - if (!id) { + selectSvgSheet(complexId: string, sheetId: string): void { + if (!sheetId) { return; } - this.selectSvgSheetRequest.emit(id); + this.selectSvgSheetRequest.emit({ complexId: complexId, sheetId: sheetId }); } } diff --git a/src/app/views/edition-view/models/edition-complex.model.ts b/src/app/views/edition-view/models/edition-complex.model.ts index e7b75bec36..43ca317d09 100644 --- a/src/app/views/edition-view/models/edition-complex.model.ts +++ b/src/app/views/edition-view/models/edition-complex.model.ts @@ -108,7 +108,7 @@ export class EditionComplex { section?: EditionRouteConstant, type?: EditionRouteConstant ) { - if (!titleStatement || !titleStatement.catalogueType || !titleStatement.catalogueNumber) { + if (!titleStatement?.catalogueType || !titleStatement?.catalogueNumber) { return; } @@ -117,10 +117,8 @@ export class EditionComplex { const spacer = ' '; // Set dynamic routes - this.titleStatement = titleStatement ? titleStatement : new EditionTitleStatement(); - this.responsibilityStatement = responsibilityStatement - ? responsibilityStatement - : new EditionResponsibilityStatement(); + this.titleStatement = titleStatement || new EditionTitleStatement(); + this.responsibilityStatement = responsibilityStatement || new EditionResponsibilityStatement(); this.complexId = new EditionRouteConstant(); if (this.titleStatement.catalogueType === EDITION_CATALOGUE_TYPE_CONSTANTS.OPUS) { @@ -134,16 +132,13 @@ export class EditionComplex { this.complexId.short = this.titleStatement.catalogueType.short + spacer + this.titleStatement.catalogueNumber; this.complexId.full = this.titleStatement.title + spacer + this.complexId.short; - this.series = series ? series : new EditionRouteConstant(); // EditionConstants.SERIES_1; - this.section = section ? section : new EditionRouteConstant(); // EditionConstants.SECTION_5; - this.type = type ? type : new EditionRouteConstant(); // EditionConstants.SKETCH_EDITION; + this.series = series || new EditionRouteConstant(); + this.section = section || new EditionRouteConstant(); + this.type = type || new EditionRouteConstant(); // Set base route - let rootPath = EDITION_ROUTE_CONSTANTS.EDITION.route; // '/edition' - // RootPath += this.series.route; // '/series' - // RootPath += this.section.route; // '/section' - rootPath += EDITION_ROUTE_CONSTANTS.COMPLEX.route; // '/complex' - // RootPath += this.type.route; // '/sketches' or // '/texts' + let rootPath = EDITION_ROUTE_CONSTANTS.EDITION.route; + rootPath += EDITION_ROUTE_CONSTANTS.COMPLEX.route; this.baseRoute = rootPath + this.complexId.route + delimiter; } diff --git a/src/app/views/edition-view/models/edition-svg-link-box.model.ts b/src/app/views/edition-view/models/edition-svg-link-box.model.ts index 5ff6a368f3..b09d216cb3 100644 --- a/src/app/views/edition-view/models/edition-svg-link-box.model.ts +++ b/src/app/views/edition-view/models/edition-svg-link-box.model.ts @@ -14,5 +14,5 @@ export class EditionSvgLinkBox { /** * The link to another svg. */ - linkTo: string; + linkTo: { complexId: string; sheetId: string }; } diff --git a/src/app/views/edition-view/models/folio-calculation.model.ts b/src/app/views/edition-view/models/folio-calculation.model.ts index c0c1697663..469c562346 100644 --- a/src/app/views/edition-view/models/folio-calculation.model.ts +++ b/src/app/views/edition-view/models/folio-calculation.model.ts @@ -221,10 +221,15 @@ export class FolioCalculationContentItem { */ previous: FolioCalculationContentItemCache; + /** + * The label for the id of the edition complex of the content item (string). + */ + complexId: string; + /** * The label for the id of the content item (string). */ - id: string; + sheetId: string; /** * The label for the sigle of the content item (string). @@ -431,7 +436,7 @@ export class FolioCalculation { * @param {number} [itemsOffsetCorrection] The optional given itemsOffset correction. */ constructor(folioSettings: FolioSettings, folioData: Folio, itemsOffsetCorrection?: number) { - this.itemsOffsetCorrection = itemsOffsetCorrection ? itemsOffsetCorrection : 0; + this.itemsOffsetCorrection = itemsOffsetCorrection || 0; this.numberOfSystems = folioData.systems ? parseInt(folioData.systems, 10) : 0; this.zoomFactor = folioSettings.factor; @@ -582,15 +587,12 @@ export class FolioCalculation { calculatedContentItem ); - calculatedContentItem.id = content.id; + calculatedContentItem.complexId = content.complexId; + calculatedContentItem.sheetId = content.sheetId; calculatedContentItem.sigle = content.sigle; calculatedContentItem.sigleAddendum = content.sigleAddendum; - calculatedContentItem.selectable = true; - calculatedContentItem.linkTo = ''; - if (content['selectable'] === false && content['linkTo']) { - calculatedContentItem.selectable = content.selectable; - calculatedContentItem.linkTo = content.linkTo; - } + calculatedContentItem.selectable = content.selectable ?? true; + calculatedContentItem.linkTo = content.linkTo || ''; calculatedContentItems.push(calculatedContentItem); }); diff --git a/src/app/views/edition-view/models/folio-svg-data.model.ts b/src/app/views/edition-view/models/folio-svg-data.model.ts index 0a330e59f9..7ad2956442 100644 --- a/src/app/views/edition-view/models/folio-svg-data.model.ts +++ b/src/app/views/edition-view/models/folio-svg-data.model.ts @@ -100,9 +100,14 @@ class FolioSvgSystems { */ class FolioSvgContentItem { /** - * The id for the label of a content item (string). + * The id for the label of a content item edition complex (string). */ - id: string; + complexId: string; + + /** + * The id for the label of a content item sheet (string). + */ + sheetId: string; /** * The sigle for the label of a content item (string). @@ -158,7 +163,8 @@ class FolioSvgContentItem { * @param {FolioCalculationContentItem} calculatedContentItem The given calculated folio content item. */ constructor(calculatedContentItem: FolioCalculationContentItem) { - this.id = calculatedContentItem.id; + this.complexId = calculatedContentItem.complexId; + this.sheetId = calculatedContentItem.sheetId; this.sigle = calculatedContentItem.sigle; this.sigleAddendum = calculatedContentItem.sigleAddendum; this.selectable = calculatedContentItem.selectable; diff --git a/src/app/views/edition-view/models/folio.model.ts b/src/app/views/edition-view/models/folio.model.ts index 8ebb1b9788..f50fb79d2f 100644 --- a/src/app/views/edition-view/models/folio.model.ts +++ b/src/app/views/edition-view/models/folio.model.ts @@ -98,9 +98,14 @@ export class FolioFormat { */ export class FolioContent { /** - * The folio content's id (string). + * The folio content's complex id (string). */ - id: string; + complexId: string; + + /** + * The folio content's sheet id (string). + */ + sheetId: string; /** * The folio content's sigle (string). diff --git a/src/app/views/edition-view/models/source-description.model.ts b/src/app/views/edition-view/models/source-description.model.ts index b99d5bf4a4..594821f334 100644 --- a/src/app/views/edition-view/models/source-description.model.ts +++ b/src/app/views/edition-view/models/source-description.model.ts @@ -46,7 +46,7 @@ export class SourceDescriptionSystem { measure?: string; /** - * The measure link (optional). + * The link to a certain measure range of an svg sheet (optional). */ linkTo?: string; @@ -101,7 +101,7 @@ export class SourceDescriptionContent { /** * The content item link (optional). */ - itemLinkTo?: string; + itemLinkTo?: { complexId?: string; sheetId?: string }; /** * The content item description (optional). diff --git a/src/app/views/edition-view/services/edition-svg-drawing.service.spec.ts b/src/app/views/edition-view/services/edition-svg-drawing.service.spec.ts index bddcab3e20..d291c49302 100644 --- a/src/app/views/edition-view/services/edition-svg-drawing.service.spec.ts +++ b/src/app/views/edition-view/services/edition-svg-drawing.service.spec.ts @@ -79,7 +79,10 @@ describe('EditionSvgDrawingService (DONE)', () => { expectedLinkBoxes = [ { svgGroupId: 'link-box-1', - linkTo: 'Test_Sk_1', + linkTo: { + complexId: 'testComplex', + sheetId: 'Test_Sk_1', + }, }, ]; diff --git a/src/assets/data/edition/series/1/section/1/op24/folio-convolute.json b/src/assets/data/edition/series/1/section/1/op24/folio-convolute.json index 50c4da2ef7..415bb4a45a 100644 --- a/src/assets/data/edition/series/1/section/1/op24/folio-convolute.json +++ b/src/assets/data/edition/series/1/section/1/op24/folio-convolute.json @@ -13,7 +13,8 @@ }, "content": [ { - "id": "SkRTa", + "complexId": "op24", + "sheetId": "SkRTa", "sigle": "M 316 Sk# / M 318 Sk# / M 319 Sk# / M 320 Sk# (Reihentabelle op. 24)", "sigleAddendum": "Reihenformen 1–24", "sectionPartition": 1, @@ -45,7 +46,8 @@ }, "content": [ { - "id": "SkRTb", + "complexId": "op24", + "sheetId": "SkRTb", "sigle": "M 316 Sk# / M 318 Sk# / M 319 Sk# / M 320 Sk# (Reihentabelle op. 24)", "sigleAddendum": "Reihenformen 25–48", "sectionPartition": 1, diff --git a/src/assets/data/edition/series/1/section/1/op24/source-description.json b/src/assets/data/edition/series/1/section/1/op24/source-description.json index 573c3cd3ef..fd3e7dba47 100644 --- a/src/assets/data/edition/series/1/section/1/op24/source-description.json +++ b/src/assets/data/edition/series/1/section/1/op24/source-description.json @@ -21,7 +21,10 @@ "content": [ { "item": "M 316 Sk# / M 318 Sk# / M 319 Sk# / M 320 Sk#", - "itemLinkTo": "SkRTa", + "itemLinkTo": { + "complexId": "op24", + "sheetId": "SkRTa" + }, "itemDescription": "(Reihentabelle op. 24)", "folios": [ { diff --git a/src/assets/data/edition/series/1/section/2/op22/folio-convolute.json b/src/assets/data/edition/series/1/section/2/op22/folio-convolute.json index 2c49831f39..b5387d405c 100644 --- a/src/assets/data/edition/series/1/section/2/op22/folio-convolute.json +++ b/src/assets/data/edition/series/1/section/2/op22/folio-convolute.json @@ -13,7 +13,8 @@ }, "content": [ { - "id": "SkRTa", + "complexId": "op22", + "sheetId": "SkRTa", "sigle": "M 305 Sk# / M 308 Sk# / M 309 Sk# (Reihentabelle op. 22)", "sigleAddendum": "Reihenformen 1–16", "sectionPartition": 1, @@ -45,7 +46,8 @@ }, "content": [ { - "id": "SkRTb", + "complexId": "op22", + "sheetId": "SkRTb", "sigle": "M 305 Sk# / M 308 Sk# / M 309 Sk# (Reihentabelle op. 22)", "sigleAddendum": "Reihenformen 17–32", "sectionPartition": 1, @@ -77,7 +79,8 @@ }, "content": [ { - "id": "SkRTc", + "complexId": "op22", + "sheetId": "SkRTc", "sigle": "M 305 Sk# / M 308 Sk# / M 309 Sk# (Reihentabelle op. 22)", "sigleAddendum": "Reihenformen 33–48", "sectionPartition": 1, diff --git a/src/assets/data/edition/series/1/section/2/op22/source-description.json b/src/assets/data/edition/series/1/section/2/op22/source-description.json index bfefa8cce1..a2868954e2 100644 --- a/src/assets/data/edition/series/1/section/2/op22/source-description.json +++ b/src/assets/data/edition/series/1/section/2/op22/source-description.json @@ -24,7 +24,10 @@ "content": [ { "item": "M 305 Sk# / M 308 Sk# / M 309 Sk#", - "itemLinkTo": "SkRT", + "itemLinkTo": { + "complexId": "op22", + "sheetId": "SkRT" + }, "itemDescription": "(Reihentabelle op. 22)", "folios": [ { @@ -580,7 +583,7 @@ }, { "item": "", - "itemLinkTo": "", + "itemLinkTo": {}, "itemDescription": "", "folios": [ { @@ -593,7 +596,7 @@ }, { "item": "", - "itemLinkTo": "", + "itemLinkTo": {}, "itemDescription": "", "folios": [ { diff --git a/src/assets/data/edition/series/1/section/2/op27/folio-convolute.json b/src/assets/data/edition/series/1/section/2/op27/folio-convolute.json index 198a87d662..53c618ce0a 100644 --- a/src/assets/data/edition/series/1/section/2/op27/folio-convolute.json +++ b/src/assets/data/edition/series/1/section/2/op27/folio-convolute.json @@ -13,7 +13,8 @@ }, "content": [ { - "id": "SkRTa", + "complexId": "op27", + "sheetId": "SkRTa", "sigle": "M 325 Sk# / M 326 Sk1 / M 327 Sk1 (Reihentabelle op. 27)", "sigleAddendum": "Reihenformen 1–16", "sectionPartition": 1, @@ -45,7 +46,8 @@ }, "content": [ { - "id": "SkRTb", + "complexId": "op27", + "sheetId": "SkRTb", "sigle": "M 325 Sk# / M 326 Sk1 / M 327 Sk1 (Reihentabelle op. 27)", "sigleAddendum": "Reihenformen 17–32", "sectionPartition": 1, @@ -77,7 +79,8 @@ }, "content": [ { - "id": "SkRTc", + "complexId": "op27", + "sheetId": "SkRTc", "sigle": "M 325 Sk# / M 326 Sk1 / M 327 Sk1 (Reihentabelle op. 27)", "sigleAddendum": "Reihenformen 33–48", "sectionPartition": 1, diff --git a/src/assets/data/edition/series/1/section/2/op27/source-description.json b/src/assets/data/edition/series/1/section/2/op27/source-description.json index e9f1cd8948..ad70f5ee75 100644 --- a/src/assets/data/edition/series/1/section/2/op27/source-description.json +++ b/src/assets/data/edition/series/1/section/2/op27/source-description.json @@ -1,7 +1,7 @@ { "sources": [ { - "id": "sourceB", + "id": "source_B", "siglum": "B", "type": "Reihentabelle.", "location": "CH-Bps, Sammlung Anton Webern.", @@ -19,7 +19,10 @@ "content": [ { "item": "M 325 Sk# / M 326 Sk1 / M 327 Sk1", - "itemLinkTo": "SkRTa", + "itemLinkTo": { + "complexId": "op27", + "sheetId": "SkRTa" + }, "itemDescription": "(Reihentabelle op. 27)", "folios": [ { diff --git a/src/assets/data/edition/series/1/section/2/op27/source-list.json b/src/assets/data/edition/series/1/section/2/op27/source-list.json index dff9ed545a..864979f10d 100644 --- a/src/assets/data/edition/series/1/section/2/op27/source-list.json +++ b/src/assets/data/edition/series/1/section/2/op27/source-list.json @@ -5,7 +5,7 @@ "type": "Reihentabelle.", "location": "CH-Bps, Sammlung Anton Webern.", "hasDescription": true, - "linkTo": "sourceB" + "linkTo": "source_B" } ] } diff --git a/src/assets/data/edition/series/1/section/3/op19/folio-convolute.json b/src/assets/data/edition/series/1/section/3/op19/folio-convolute.json index 9a270eb5eb..cde23b46d5 100644 --- a/src/assets/data/edition/series/1/section/3/op19/folio-convolute.json +++ b/src/assets/data/edition/series/1/section/3/op19/folio-convolute.json @@ -13,7 +13,8 @@ }, "content": [ { - "id": "SkRT", + "complexId": "op19", + "sheetId": "SkRT", "sigle": "M 286 Sk# / M 287 Sk# (Reihentabelle op. 19)", "sigleAddendum": "Reihenformen 1–8", "sectionPartition": 1, diff --git a/src/assets/data/edition/series/1/section/3/op19/source-description.json b/src/assets/data/edition/series/1/section/3/op19/source-description.json index c28997f6a3..c5e5c9ebf0 100644 --- a/src/assets/data/edition/series/1/section/3/op19/source-description.json +++ b/src/assets/data/edition/series/1/section/3/op19/source-description.json @@ -20,7 +20,10 @@ "content": [ { "item": "M 286 Sk# / M 287 Sk#", - "itemLinkTo": "SkRT", + "itemLinkTo": { + "complexId": "op19", + "sheetId": "SkRT" + }, "itemDescription": "(Reihentabelle op. 19)", "folios": [ { diff --git a/src/assets/data/edition/series/1/section/5/op12/folio-convolute.json b/src/assets/data/edition/series/1/section/5/op12/folio-convolute.json index 580616e286..0714d88943 100644 --- a/src/assets/data/edition/series/1/section/5/op12/folio-convolute.json +++ b/src/assets/data/edition/series/1/section/5/op12/folio-convolute.json @@ -13,7 +13,8 @@ }, "content": [ { - "id": "M_212_Sk1a", + "complexId": "op12", + "sheetId": "M_212_Sk1a", "sigle": "M 212 Sk1", "sigleAddendum": "T. 1–6", "sectionPartition": 1, @@ -25,7 +26,8 @@ ] }, { - "id": "M_212_Sk1b", + "complexId": "op12", + "sheetId": "M_212_Sk1b", "sigle": "M 212 Sk1", "sigleAddendum": "T. 7–12", "sectionPartition": 1, @@ -38,7 +40,8 @@ ] }, { - "id": "M_212_Sk1c", + "complexId": "op12", + "sheetId": "M_212_Sk1c", "sigle": "M 212 Sk1", "sigleAddendum": "T. 13–17", "sectionPartition": 1, @@ -61,7 +64,8 @@ }, "content": [ { - "id": "M_212_Sk4", + "complexId": "op12", + "sheetId": "M_212_Sk4", "sigle": "M 212 Sk4", "sigleAddendum": "T. 10–11", "sectionPartition": 2, @@ -74,7 +78,8 @@ ] }, { - "id": "M_212_Sk5", + "complexId": "op12", + "sheetId": "M_212_Sk5", "sigle": "M 212 Sk5", "sigleAddendum": "T. 10–11", "sectionPartition": 2, @@ -87,7 +92,8 @@ ] }, { - "id": "M_212_Sk3", + "complexId": "op12", + "sheetId": "M_212_Sk3", "sigle": "M 212 Sk3", "sigleAddendum": "T. 10–11", "sectionPartition": 2, @@ -100,7 +106,8 @@ ] }, { - "id": "M_212_Sk2", + "complexId": "op12", + "sheetId": "M_212_Sk2", "sigle": "M 212 Sk2", "sigleAddendum": "T. 10–12", "sectionPartition": 2, @@ -123,7 +130,8 @@ }, "content": [ { - "id": "M_212_Sk1d", + "complexId": "op12", + "sheetId": "M_212_Sk1d", "sigle": "M 212 Sk1", "sigleAddendum": "T. 18–22", "sections": [ @@ -134,7 +142,8 @@ ] }, { - "id": "M_212_Sk1e", + "complexId": "op12", + "sheetId": "M_212_Sk1e", "sigle": "M 212 Sk1", "sigleAddendum": "T. 23–24", "sectionPartition": 1, diff --git a/src/assets/data/edition/series/1/section/5/op12/source-description.json b/src/assets/data/edition/series/1/section/5/op12/source-description.json index 3c7dbf7f18..9af2abbd86 100644 --- a/src/assets/data/edition/series/1/section/5/op12/source-description.json +++ b/src/assets/data/edition/series/1/section/5/op12/source-description.json @@ -26,7 +26,10 @@ "content": [ { "item": "M 212 Sk1", - "itemLinkTo": "M_212_Sk1a", + "itemLinkTo": { + "complexId": "op12", + "sheetId": "M_212_Sk1a" + }, "itemDescription": "(Skizze zu „Der Tag ist vergangen“ M 212)", "folios": [ { @@ -82,7 +85,10 @@ }, { "item": "M 212 Sk2", - "itemLinkTo": "M_212_Sk2", + "itemLinkTo": { + "complexId": "op12", + "sheetId": "M_212_Sk2" + }, "itemDescription": "(Skizze zu „Der Tag ist vergangen“ M 212: Textfassung 2)", "folios": [ { @@ -103,7 +109,10 @@ }, { "item": "M 212 Sk3", - "itemLinkTo": "M_212_Sk3", + "itemLinkTo": { + "complexId": "op12", + "sheetId": "M_212_Sk3" + }, "itemDescription": "(Skizze zu „Der Tag ist vergangen“ M 212: Textfassung 2)", "folios": [ { @@ -124,7 +133,10 @@ }, { "item": "M 212 Sk5", - "itemLinkTo": "M_212_Sk5", + "itemLinkTo": { + "complexId": "op12", + "sheetId": "M_212_Sk5" + }, "itemDescription": "(Skizze zu „Der Tag ist vergangen“ M 212: Textfassung 2)", "folios": [ { @@ -145,7 +157,10 @@ }, { "item": "M 212 Sk4", - "itemLinkTo": "M_212_Sk4", + "itemLinkTo": { + "complexId": "op12", + "sheetId": "M_212_Sk4" + }, "itemDescription": "(Skizze zu „Der Tag ist vergangen“ M 212: Textfassung 2)", "folios": [ { @@ -166,7 +181,7 @@ }, { "item": "", - "itemLinkTo": "", + "itemLinkTo": {}, "itemDescription": "", "folios": [ { @@ -204,8 +219,8 @@ "content": [ { "item": " ", - "itemLinkTo": "", - "itemDescription": "Autograph von „Der Tag ist vergangen“ M 212: Textfassung 1→2", + "itemLinkTo": {}, + "itemDescription": "Autograph von „Der Tag ist vergangen“ M 212: Textfassung 1→2", "folios": [ { "folio": "1r", diff --git a/src/assets/data/edition/series/1/section/5/op12/textcritics.json b/src/assets/data/edition/series/1/section/5/op12/textcritics.json index a8c6dc4e1c..d30a127551 100644 --- a/src/assets/data/edition/series/1/section/5/op12/textcritics.json +++ b/src/assets/data/edition/series/1/section/5/op12/textcritics.json @@ -1,10 +1,117 @@ { "textcritics": [ + { + "id": "M_212_TF1", + "label": "M 212 Textfassung 1", + "description": [ + "##Quellenbewertung:## Für die Edition von „Der Tag ist vergangen“ M 212 Textfassung 1 ist B einzige relevante Quelle.
Die Korrekturen in B betreffen Textfassung 2.
Hauptquelle für die Textedition von „Der Tag ist vergangen“ M 212 Textfassung 1 ist B ante correcturam." + ], + "comments": [ + { + "svgGroupId": "text200", + "measure": "1", + "system": "Klav.", + "position": "2/8 bis 2/4", + "comment": "Crescendogabel versetzt von über Klav. o." + }, + { + "svgGroupId": "text262", + "measure": "2", + "system": "Klav.", + "position": "1–4/8", + "comment": "Decrescendogabel versetzt von über Klav. o." + }, + { + "svgGroupId": "g5702", + "measure": "2", + "system": "Klav. o.", + "position": "1. Note", + "comment": "{{ref.getGlyph('[#]')}} zu gis1 ergänzt mit Blick auf Textfassung 2 und Textfassung 3 (op. 12/1)." + }, + { + "svgGroupId": "text748", + "measure": "5", + "system": "Klav. o.", + "position": "(1/4)", + "comment": "Triolenklammer versetzt von über Klav. u." + }, + { + "svgGroupId": "text766", + "measure": "5", + "system": "Klav.", + "position": "1. Note", + "comment": "{{ref.getGlyph('[pp]')}} versetzt von unter Klav. u." + }, + { + "svgGroupId": "g5708", + "measure": "5", + "system": "Ges.", + "position": "3/8", + "comment": "Text: Komma nach (ver-gan-)gen ergänzt mit Blick auf Rosegger_PM." + }, + { + "svgGroupId": "text902", + "measure": "6", + "system": "Klav.", + "position": "1. Note", + "comment": "Ende der Crescendogabel versetzt von Ende T. 5." + }, + { + "svgGroupId": "g5714", + "measure": "9", + "system": "Ges.", + "position": "2. Note", + "comment": "Text: Komma nach (Ma-ri-)a ergänzt mit Blick auf Rosegger_PM." + }, + { + "svgGroupId": "text318", + "measure": "13", + "system": "Ges.", + "position": "2/8", + "comment": "{{ref.getGlyph('[ppp]')}}: Entzifferung unsicher, Tinte stark verschmiert." + }, + { + "svgGroupId": "text484", + "measure": "14", + "system": "Klav. u.", + "position": "1/8", + "comment": "({{ref.getGlyph('[a]')}}) zu e/a als redundant weggelassen. B: Akkoladenwechsel nach T. 12." + }, + { + "svgGroupId": "g6096", + "measure": "14", + "system": "Ges.", + "position": "2. Note", + "comment": "Text: Komma nach (ver-gan-)gen ergänzt mit Blick auf Rosegger_PM." + }, + { + "svgGroupId": "", + "measure": "18", + "system": "Ges.", + "position": "1. Note", + "comment": "Text sic: (Ver-)storb(-nen) ohne Binnen-Apostroph. Rosegger_PM: Verstorb’nen." + }, + { + "svgGroupId": "text1556", + "measure": "22", + "system": "Klav. o.", + "position": "", + "comment": "Anfang der Ligaturbögen zu H/g ergänzt analog Fortsetzung der Bögen in T. 23. B: Akkoladenwechsel nach T. 22." + }, + { + "svgGroupId": "text1600", + "measure": "23", + "system": "Klav.", + "position": "1/8", + "comment": "({{ref.getGlyph('[#]')}}) zu Gis1/Cis und ({{ref.getGlyph('[a]')}}) zu H/g als redundant weggelassen. B: Akkoladenwechsel nach T. 22." + } + ] + }, { "id": "M_212_Sk1", "label": "M 212 Sk1", "description": [ - "Sk1 ist die Verlaufsskizze zu „Der Tag ist vergangen“ M 212: Textfassung 1." + "Sk1 ist die Verlaufsskizze zu „Der Tag ist vergangen“ M 212: Textfassung 1." ], "comments": [ { @@ -160,7 +267,7 @@ "id": "M_212_Sk2", "label": "M 212 Sk2", "description": [ - "In Sk2 werden T. 11–12 aus Sk1 bzw. T. 10–11 aus B („Der Tag ist vergangen“ M 212: Textfassung 1) neu skizziert, in Sk3, Sk4 und Sk5 weiter modifiziert und zu einer Formulierung gebracht, die T. 10–11 aus C („Der Tag ist vergangen“ M 212: Textfassung 2) entspricht. Da T. 10–11 in B offensichtlich zunächst aus Sk1 übernommen wurden und Korrekturen in B mit Bleistift auf die Formulierung von Sk2 hindeuten, sind Sk2–5 offensichtlich erst nach der Niederschrift von B und während oder nach den dort vorhandenen Korrekturen, vermutlich als Arbeitsvorlage für C entstanden.
Sk2 übernimmt bestimmte Merkmale der Korrekturen in B, die bei einem gleichbleibenden Metrum (das allerdings weder durch einen Taktstrich vor T. 12 kenntlich gemacht noch durch eine neue Taktartvorzeichnung explizit geändert wird) zu einer Erweiterung der vormals zweitaktigen zu einer dreitaktigen Figur führen. Im Klavier (System 13–12) wird die rhythmische Konstellation der Zweiklänge F/e im unteren System und es1/as1 im oberen System geändert sowie der letzte Zweiklang im unteren System aus Sk1 bzw. B (Gis/cis) getilgt." + "In Sk2 werden T. 11–12 aus Sk1 bzw. T. 10–11 aus B („Der Tag ist vergangen“ M 212: Textfassung 1) neu skizziert, in Sk3, Sk4 und Sk5 weiter modifiziert und zu einer Formulierung gebracht, die T. 10–11 aus C („Der Tag ist vergangen“ M 212: Textfassung 2) entspricht. Da T. 10–11 in B offensichtlich zunächst aus Sk1 übernommen wurden und Korrekturen in B mit Bleistift auf die Formulierung von Sk2 hindeuten, sind Sk2–5 offensichtlich erst nach der Niederschrift von B und während oder nach den dort vorhandenen Korrekturen, vermutlich als Arbeitsvorlage für C entstanden.
Sk2 übernimmt bestimmte Merkmale der Korrekturen in B, die bei einem gleichbleibenden Metrum (das allerdings weder durch einen Taktstrich vor T. 12 kenntlich gemacht noch durch eine neue Taktartvorzeichnung explizit geändert wird) zu einer Erweiterung der vormals zweitaktigen zu einer dreitaktigen Figur führen. Im Klavier (System 13–12) wird die rhythmische Konstellation der Zweiklänge F/e im unteren System und es1/as1 im oberen System geändert sowie der letzte Zweiklang im unteren System aus Sk1 bzw. B (Gis/cis) getilgt." ], "comments": [ { @@ -175,7 +282,7 @@ "measure": "10", "system": "12", "position": "2. Note", - "comment": "{{ref.getGlyph('[a]')}}e oder {{ref.getGlyph('[b]')}}es (?). (Siehe auch System 13 2/4: e1/as1 oder [{{ref.getGlyph('[b]')}}]es1/as1?) Vorgeschlagene Entzifferung mit Blick auf eindeutig entzifferbare Akzidenzien an entsprechender Stelle in Sk1 T. 11, Sk3 und Sk5 sowie in den Reinschrift- bzw. Druckfassungen aus B, C, E, F und G." + "comment": "{{ref.getGlyph('[a]')}}e oder {{ref.getGlyph('[b]')}}es (?). (Siehe auch System 13 2/4: e1/as1 oder [{{ref.getGlyph('[b]')}}]es1/as1?) Vorgeschlagene Entzifferung mit Blick auf eindeutig entzifferbare Akzidenzien an entsprechender Stelle in Sk1 T. 11, Sk3 und Sk5 sowie in den Reinschrift- bzw. Druckfassungen aus B, C, E, F und G." }, { "svgGroupId": "g1006", @@ -195,7 +302,10 @@ "linkBoxes": [ { "svgGroupId": "g3816", - "linkTo": "M_212_Sk3" + "linkTo": { + "complexId": "op12", + "sheetId": "M_212_Sk3" + } } ] }, @@ -203,7 +313,7 @@ "id": "M_212_Sk3", "label": "M 212 Sk3", "description": [ - "Sk3 verkürzt die Figur wieder zu einer zweitaktigen, wobei in System 11 zunächst die Verlängerung des ersten Tons der Singstimme („e–[wig]“) wie in Sk2 tendenziell übernommen, dann in System 12 wieder in die rhythmische Ausgangs-Konfiguration geführt wird. Die Klavierstimme (System 10–9) bringt in der letzten Korrekturschicht bereits die in Sk5 formulierte und in C verwendete Variante." + "Sk3 verkürzt die Figur wieder zu einer zweitaktigen, wobei in System 11 zunächst die Verlängerung des ersten Tons der Singstimme („e–[wig]“) wie in Sk2 tendenziell übernommen, dann in System 12 wieder in die rhythmische Ausgangs-Konfiguration geführt wird. Die Klavierstimme (System 10–9) bringt in der letzten Korrekturschicht bereits die in Sk5 formulierte und in C verwendete Variante." ], "comments": [ { @@ -231,11 +341,17 @@ "linkBoxes": [ { "svgGroupId": "g4399", - "linkTo": "M_212_Sk2" + "linkTo": { + "complexId": "op12", + "sheetId": "M_212_Sk2" + } }, { "svgGroupId": "g4410", - "linkTo": "M_212_Sk5" + "linkTo": { + "complexId": "op12", + "sheetId": "M_212_Sk5" + } } ] }, @@ -264,7 +380,10 @@ "linkBoxes": [ { "svgGroupId": "g4957", - "linkTo": "M_212_Sk5" + "linkTo": { + "complexId": "op12", + "sheetId": "M_212_Sk5" + } } ] }, @@ -294,118 +413,17 @@ "linkBoxes": [ { "svgGroupId": "g5508", - "linkTo": "M_212_Sk3" + "linkTo": { + "complexId": "op12", + "sheetId": "M_212_Sk3" + } }, { "svgGroupId": "g5497", - "linkTo": "M_212_Sk4" - } - ] - }, - { - "id": "M_212_TF1", - "label": "M 212 Textfassung 1", - "description": [ - "##Quellenbewertung:## Für die Edition von „Der Tag ist vergangen“ M 212 Textfassung 1 ist B einzige relevante Quelle.
Die Korrekturen in B betreffen Textfassung 2.
Hauptquelle für die Textedition von „Der Tag ist vergangen“ M 212 Textfassung 1 ist B ante correcturam." - ], - "comments": [ - { - "svgGroupId": "text200", - "measure": "1", - "system": "Klav.", - "position": "2/8 bis 2/4", - "comment": "Crescendogabel versetzt von über Klav. o." - }, - { - "svgGroupId": "text262", - "measure": "2", - "system": "Klav.", - "position": "1–4/8", - "comment": "Decrescendogabel versetzt von über Klav. o." - }, - { - "svgGroupId": "g5702", - "measure": "2", - "system": "Klav. o.", - "position": "1. Note", - "comment": "{{ref.getGlyph('[#]')}} zu gis1 ergänzt mit Blick auf Textfassung 2 und Textfassung 3 (op. 12/1)." - }, - { - "svgGroupId": "text748", - "measure": "5", - "system": "Klav. o.", - "position": "(1/4)", - "comment": "Triolenklammer versetzt von über Klav. u." - }, - { - "svgGroupId": "text766", - "measure": "5", - "system": "Klav.", - "position": "1. Note", - "comment": "{{ref.getGlyph('[pp]')}} versetzt von unter Klav. u." - }, - { - "svgGroupId": "g5708", - "measure": "5", - "system": "Ges.", - "position": "3/8", - "comment": "Text: Komma nach (ver-gan-)gen ergänzt mit Blick auf Rosegger_PM." - }, - { - "svgGroupId": "text902", - "measure": "6", - "system": "Klav.", - "position": "1. Note", - "comment": "Ende der Crescendogabel versetzt von Ende T. 5." - }, - { - "svgGroupId": "g5714", - "measure": "9", - "system": "Ges.", - "position": "2. Note", - "comment": "Text: Komma nach (Ma-ri-)a ergänzt mit Blick auf Rosegger_PM." - }, - { - "svgGroupId": "text318", - "measure": "13", - "system": "Ges.", - "position": "2/8", - "comment": "{{ref.getGlyph('[ppp]')}}: Entzifferung unsicher, Tinte stark verschmiert." - }, - { - "svgGroupId": "text484", - "measure": "14", - "system": "Klav. u.", - "position": "1/8", - "comment": "({{ref.getGlyph('[a]')}}) zu e/a als redundant weggelassen. B: Akkoladenwechsel nach T. 12." - }, - { - "svgGroupId": "g6096", - "measure": "14", - "system": "Ges.", - "position": "2. Note", - "comment": "Text: Komma nach (ver-gan-)gen ergänzt mit Blick auf Rosegger_PM." - }, - { - "svgGroupId": "", - "measure": "18", - "system": "Ges.", - "position": "1. Note", - "comment": "Text sic: (Ver-)storb(-nen) ohne Binnen-Apostroph. Rosegger_PM: Verstorb’nen." - }, - { - "svgGroupId": "text1556", - "measure": "22", - "system": "Klav. o.", - "position": "", - "comment": "Anfang der Ligaturbögen zu H/g ergänzt analog Fortsetzung der Bögen in T. 23. B: Akkoladenwechsel nach T. 22." - }, - { - "svgGroupId": "text1600", - "measure": "23", - "system": "Klav.", - "position": "1/8", - "comment": "({{ref.getGlyph('[#]')}}) zu Gis1/Cis und ({{ref.getGlyph('[a]')}}) zu H/g als redundant weggelassen. B: Akkoladenwechsel nach T. 22." + "linkTo": { + "complexId": "op12", + "sheetId": "M_212_Sk4" + } } ] } diff --git a/src/assets/data/edition/series/1/section/5/op23/folio-convolute.json b/src/assets/data/edition/series/1/section/5/op23/folio-convolute.json index 9bcf2d3ab9..df7db7eee1 100644 --- a/src/assets/data/edition/series/1/section/5/op23/folio-convolute.json +++ b/src/assets/data/edition/series/1/section/5/op23/folio-convolute.json @@ -13,7 +13,8 @@ }, "content": [ { - "id": "SkRT", + "complexId": "op23", + "sheetId": "SkRT", "sigle": "M 312 Sk5 / M 313 Sk1 / M 314 Sk1 (Reihentabelle op. 23)", "sigleAddendum": "Reihenformen 1–8", "sectionPartition": 1, diff --git a/src/assets/data/edition/series/1/section/5/op23/source-description.json b/src/assets/data/edition/series/1/section/5/op23/source-description.json index a7de55c057..84e89c9dd6 100644 --- a/src/assets/data/edition/series/1/section/5/op23/source-description.json +++ b/src/assets/data/edition/series/1/section/5/op23/source-description.json @@ -21,7 +21,10 @@ "content": [ { "item": "M 312 Sk5 / M 313 Sk1 / M 314 Sk1", - "itemLinkTo": "SkRT", + "itemLinkTo": { + "complexId": "op23", + "sheetId": "SkRT" + }, "itemDescription": "(Reihentabelle op. 23)", "folios": [ { diff --git a/src/assets/data/edition/series/1/section/5/op25/folio-convolute.json b/src/assets/data/edition/series/1/section/5/op25/folio-convolute.json index e6f506c6fa..2c9f65793e 100644 --- a/src/assets/data/edition/series/1/section/5/op25/folio-convolute.json +++ b/src/assets/data/edition/series/1/section/5/op25/folio-convolute.json @@ -13,7 +13,8 @@ }, "content": [ { - "id": "M_317_Sk2", + "complexId": "op25", + "sheetId": "M_317_Sk2", "sigle": "M 317 Sk2", "sigleAddendum": "", "sectionPartition": 5, @@ -26,7 +27,8 @@ ] }, { - "id": "M_317_Sk1", + "complexId": "op25", + "sheetId": "M_317_Sk1", "sigle": "M 317 Sk1", "sigleAddendum": "", "sectionPartition": 5, @@ -39,7 +41,8 @@ ] }, { - "id": "M_317_Sk2_1", + "complexId": "op25", + "sheetId": "M_317_Sk2_1", "sigle": "M 317 Sk2.1", "sigleAddendum": "", "sectionPartition": 5, @@ -52,7 +55,8 @@ ] }, { - "id": "M_317_Sk2_1_1", + "complexId": "op25", + "sheetId": "M_317_Sk2_1_1", "sigle": "M 317 Sk2.1.1", "sigleAddendum": "", "sectionPartition": 5, @@ -65,7 +69,8 @@ ] }, { - "id": "M_317_Sk2_1_2", + "complexId": "op25", + "sheetId": "M_317_Sk2_1_2", "sigle": "M 317 Sk2.1.2", "sigleAddendum": "", "sectionPartition": 5, @@ -78,7 +83,8 @@ ] }, { - "id": "M_317_Sk2_1_2_1", + "complexId": "op25", + "sheetId": "M_317_Sk2_1_2_1", "sigle": "M 317 Sk2.1.2.1", "sigleAddendum": "", "sectionPartition": 8, @@ -91,7 +97,8 @@ ] }, { - "id": "M_317_Sk2_1_3", + "complexId": "op25", + "sheetId": "M_317_Sk2_1_3", "sigle": "M 317 Sk2.1.3", "sigleAddendum": "", "sectionPartition": 12, @@ -104,7 +111,8 @@ ] }, { - "id": "M_317_Sk3", + "complexId": "op25", + "sheetId": "M_317_Sk3", "sigle": "M 317 Sk3", "sigleAddendum": "", "sectionPartition": 3, @@ -117,7 +125,8 @@ ] }, { - "id": "M_317_Sk3_1", + "complexId": "op25", + "sheetId": "M_317_Sk3_1", "sigle": "M 317 Sk3.1", "sigleAddendum": "", "sectionPartition": 6, @@ -130,7 +139,8 @@ ] }, { - "id": "M_317_Sk3_1_1", + "complexId": "op25", + "sheetId": "M_317_Sk3_1_1", "sigle": "M 317 Sk3.1.1", "sigleAddendum": "", "sectionPartition": 10, @@ -143,7 +153,8 @@ ] }, { - "id": "M_317_Sk3_1_2", + "complexId": "op25", + "sheetId": "M_317_Sk3_1_2", "sigle": "M 317 Sk3.1.2", "sigleAddendum": "", "sectionPartition": 5, @@ -156,7 +167,8 @@ ] }, { - "id": "M_317_Sk3_1_3", + "complexId": "op25", + "sheetId": "M_317_Sk3_1_3", "sigle": "M 317 Sk3.1.3", "sigleAddendum": "", "sectionPartition": 5, @@ -169,7 +181,8 @@ ] }, { - "id": "M_317_Sk3_1_3_1", + "complexId": "op25", + "sheetId": "M_317_Sk3_1_3_1", "sigle": "M 317 Sk3.1.3.1", "sigleAddendum": "", "sectionPartition": 3, @@ -182,7 +195,8 @@ ] }, { - "id": "M_317_Sk4a", + "complexId": "op25", + "sheetId": "M_317_Sk4a", "sigle": "M 317 Sk4", "sigleAddendum": "T. {1A}–3A", "sectionPartition": 1, @@ -195,7 +209,8 @@ ] }, { - "id": "M_317_Sk4_1", + "complexId": "op25", + "sheetId": "M_317_Sk4_1", "sigle": "M 317 Sk4.1", "sigleAddendum": "", "sectionPartition": 3, @@ -218,7 +233,8 @@ }, "content": [ { - "id": "M_317_Sk4b", + "complexId": "op25", + "sheetId": "M_317_Sk4b", "sigle": "M 317 Sk4", "sigleAddendum": "T. 3B–6", "sectionPartition": 1, @@ -231,7 +247,8 @@ ] }, { - "id": "M_317_Sk4c", + "complexId": "op25", + "sheetId": "M_317_Sk4c", "sigle": "M 317 Sk4", "sigleAddendum": "T. 7–12", "sectionPartition": 1, @@ -244,7 +261,8 @@ ] }, { - "id": "M_317_Sk4d", + "complexId": "op25", + "sheetId": "M_317_Sk4d", "sigle": "M 317 Sk4", "sigleAddendum": "T. 13–15", "sectionPartition": 4, @@ -257,7 +275,8 @@ ] }, { - "id": "M_317_Sk4_2", + "complexId": "op25", + "sheetId": "M_317_Sk4_2", "sigle": "M 317 Sk4.2", "sigleAddendum": "", "sectionPartition": 4, @@ -270,7 +289,8 @@ ] }, { - "id": "M_317_Sk4_3", + "complexId": "op25", + "sheetId": "M_317_Sk4_3", "sigle": "M 317 Sk4.3", "sigleAddendum": "", "sectionPartition": 7, @@ -299,7 +319,8 @@ }, "content": [ { - "id": "SkRT", + "complexId": "op25", + "sheetId": "SkRT", "sigle": "M 317 Sk5 / M 321 Sk1 / M322 Sk1 (Reihentabelle op. 25)", "sigleAddendum": "Reihenformen 1–8", "sectionPartition": 1, diff --git a/src/assets/data/edition/series/1/section/5/op25/graph.json b/src/assets/data/edition/series/1/section/5/op25/graph.json index 5cbf31e604..8105b8fcab 100644 --- a/src/assets/data/edition/series/1/section/5/op25/graph.json +++ b/src/assets/data/edition/series/1/section/5/op25/graph.json @@ -11,10 +11,15 @@ "queryLabel": "Finde alle RDF-Triples", "queryString": "PREFIX dc: \nPREFIX rdf: \nPREFIX rdfs: \nPREFIX owl: \nPREFIX awg: \n\n CONSTRUCT \n WHERE { \n\t ?subject ?predicate ?object . \n }" }, + { + "queryType": "construct", + "queryLabel": "Finde alle Editionskomplexe", + "queryString": "PREFIX dc: \nPREFIX rdf: \nPREFIX rdfs: \nPREFIX owl: \nPREFIX awg: \n\n CONSTRUCT \n WHERE { \n\t ?complex a awg:EditionComplex; rdfs:label ?label . \n }" + }, { "queryType": "construct", "queryLabel": "Finde alle Skizzen von op. 25", - "queryString": "PREFIX dc: \nPREFIX rdf: \nPREFIX rdfs: \nPREFIX owl: \nPREFIX awg: \n\n CONSTRUCT \n WHERE { \n\t ?sketch a awg:Sketch \n }" + "queryString": "PREFIX dc: \nPREFIX rdf: \nPREFIX rdfs: \nPREFIX owl: \nPREFIX awg: \n\n CONSTRUCT \n WHERE { \n\t ?sketch a awg:Sketch . \n }" }, { "queryType": "construct", @@ -24,7 +29,7 @@ { "queryType": "construct", "queryLabel": "Finde alle mit Skizze Sk4 verknüpften Objekte", - "queryString": "PREFIX dc: \nPREFIX rdf: \nPREFIX rdfs: \nPREFIX owl: \nPREFIX awg: \n\n CONSTRUCT \n WHERE { \n\t awg:M317_Sk4 ?predicate ?object . \n }" + "queryString": "PREFIX dc: \nPREFIX rdf: \nPREFIX rdfs: \nPREFIX owl: \nPREFIX awg: \n\n CONSTRUCT \n WHERE { \n\t awg:M_317_Sk4 ?predicate ?object . \n }" }, { "queryType": "construct", @@ -44,7 +49,12 @@ { "queryType": "select", "queryLabel": "Finde alle Ressource-Klassen und zähle deren Vorkommen", - "queryString": "PREFIX dc: \nPREFIX rdf: \nPREFIX rdfs: \nPREFIX owl: \nPREFIX awg: \n\n SELECT ?resource_class (COUNT (?resource_class) AS ?count) \n WHERE { \n\t ?resource a ?resource_class . \n } \n GROUP BY ?resource_class \n ORDER BY ?count \n LIMIT 100" + "queryString": "PREFIX dc: \nPREFIX rdf: \nPREFIX rdfs: \nPREFIX owl: \nPREFIX awg: \n\n\t SELECT ?resource_class (COUNT (?resource_class) AS ?count) \n WHERE { \n\t ?resource a ?resource_class . \n } \n GROUP BY ?resource_class \n ORDER BY ?count \n LIMIT 100" + }, + { + "queryType": "select", + "queryLabel": "Finde alle Editionskomplexe", + "queryString": "PREFIX dc: \nPREFIX rdf: \nPREFIX rdfs: \nPREFIX owl: \nPREFIX awg: \n\n SELECT * \n WHERE { \n\t ?complex a awg:EditionComplex; rdfs:label ?label . \n }" }, { "queryType": "select", @@ -59,7 +69,7 @@ { "queryType": "select", "queryLabel": "Finde alle mit Skizze Sk4 verknüpften Objekte", - "queryString": "PREFIX dc: \nPREFIX rdf: \nPREFIX rdfs: \nPREFIX owl: \nPREFIX awg: \n\n SELECT * \n WHERE { \n\t awg:M317_Sk4 ?predicate ?object . \n }" + "queryString": "PREFIX dc: \nPREFIX rdf: \nPREFIX rdfs: \nPREFIX owl: \nPREFIX awg: \n\n SELECT * \n WHERE { \n\t awg:M_317_Sk4 ?predicate ?object . \n }" }, { "queryType": "select", @@ -72,7 +82,7 @@ "queryString": "PREFIX dc: \nPREFIX rdf: \nPREFIX rdfs: \nPREFIX owl: \nPREFIX awg: \n\n SELECT * \n WHERE { \n\t ?resource a ?resource_class ; awg:precedes ?preceding_sketch .\n ?preceding_sketch awg:concomitates ?concomitating_sketch . \n }" } ], - "triples": "@prefix dc: .\n@prefix rdf: .\n@prefix rdfs: .\n@prefix owl: .\n@prefix awg: .\n\n\n# ONTO\nawg:follows a rdf:Property .\n\nawg:precedes a owl:TransitiveProperty .\nawg:precedes_scripture rdfs:subPropertyOf awg:precedes .\nawg:precedes_content rdfs:subPropertyOf awg:precedes .\n\nawg:concomitates owl:inverseOf awg:is_concomitated_by .\nawg:concomitates_unsure rdfs:subPropertyOf awg:concomitates .\n\nawg:WorkComplex a owl:Thing .\nawg:Sketch a owl:Thing .\nawg:Paratext a owl:Thing .\n\n# DATA\n# Work complexes\nawg:Op24_1 a awg:WorkComplex ;\n\t\t\trdfs:label \"Op. 24/1\" .\n\nawg:Op25_1 a awg:WorkComplex ;\n\t\t\trdfs:label \"Op. 25/1\" .\n\n# Sk1\nawg:M317_Sk1 a awg:Sketch ;\n awg:precedes_scripture awg:M317_Sk2 ;\n\trdfs:label \"Sk1\" .\n\n#Sk2\nawg:M317_Sk2 a awg:Sketch ;\n awg:precedes_content awg:M317_Sk3 ;\n\t\t\trdfs:label \"Sk2\" .\n\nawg:M317_Sk2_1 a awg:Sketch ;\n awg:concomitates awg:M317_Sk2 ;\n\t\t\t\trdfs:label \"Sk2.1\" .\n\nawg:M317_Sk2_1_1 a awg:Sketch ;\n awg:concomitates awg:M317_Sk2_1 ;\n awg:precedes awg:M317_Sk2_1_2 ;\n\t\t\t\t\trdfs:label \"Sk2.1.1\" .\n\nawg:M317_Sk2_1_2 a awg:Sketch ;\n awg:concomitates awg:M317_Sk2_1 ;\n\t\t\t\t\trdfs:label \"Sk2.1.2\" .\n\nawg:M317_Sk2_1_3 a awg:Sketch ;\n awg:concomitates awg:M317_Sk2_1 ;\n\t\t\t\t\trdfs:label \"Sk2.1.3\" .\n\nawg:M317_Sk2_1_2_1 a awg:Sketch ;\n awg:concomitates awg:M317_Sk2_1_2 ;\n\t\t\t\t\t\trdfs:label \"Sk2.1.2.1\" .\n\n# Sk3\nawg:M317_Sk3 a awg:Sketch ;\n awg:precedes awg:M317_Sk4 ;\n\t\t\trdfs:label \"Sk3\" .\n\nawg:M317_Sk3_1 a awg:Sketch ;\n awg:concomitates awg:M317_Sk3 ;\n\t\t\trdfs:label \"Sk3.1\" .\n\nawg:M317_Sk3_1_1 a awg:Sketch ;\n awg:concomitates awg:M317_Sk3_1 ;\n\t\t\trdfs:label \"Sk3.1.1\" .\n\nawg:M317_Sk3_1_2 a awg:Sketch ;\n awg:concomitates awg:M317_Sk3_1 ;\n\t\t\trdfs:label \"Sk3.1.2\" .\n\nawg:M317_Sk3_1_3 a awg:Sketch ;\n awg:concomitates awg:M317_Sk3_1 ;\n\t rdfs:label \"Sk3.1.3 (Reihentabelle)\" .\n\nawg:M317_Sk3_1_3_1 a awg:Sketch ;\n awg:concomitates awg:M317_Sk3_1_3 ;\n\t\t\trdfs:label \"Sk3.1.3.1\" .\n\n# Sk4\nawg:M317_Sk4 a awg:Sketch ;\n rdfs:label \"Sk4 (Verlaufskizze)\" ;\n\t dc:hasPart awg:M317_Sk4_T1A_3A , awg:M317_Sk4_T3B_6 , awg:M317_Sk4_T7_12 , awg:M317_Sk4_T13_15 ;\n\t awg:precedes awg:PT_SB3_38v_6_page75 ;\n\t awg:precedes awg:PT_SB3_39r_3_page76 ;\n\t awg:precedes awg:PT_SB3_39r_2_date_19340716 .\n\nawg:M317_Sk4_T1A_3A a awg:Sketch ;\n\t rdfs:label \"Sk4 T. 1A–3A\" ;\n\t awg:concomitates awg:M317_Sk4_1 ;\n\t awg:concomitates awg:PT_SB3_38v_4_Akk14_16 ;\n\t awg:precedes awg:M317_Sk4_T3B_6 .\n\nawg:M317_Sk4_T3B_6 a awg:Sketch ;\n\t rdfs:label \"Sk4 T. 3B–6\" ;\n\t awg:precedes awg:M317_Sk4_T7_12 .\n\nawg:M317_Sk4_T7_12 a awg:Sketch ;\n\t rdfs:label \"Sk4 T. 7–12\" ;\n\t awg:precedes awg:M317_Sk4_T13_15 .\n\nawg:M317_Sk4_T13_15 a awg:Sketch ;\n\t rdfs:label \"Sk4 T. 13–15\" ;\n\t awg:concomitates awg:M317_Sk4_2 ;\n\t awg:concomitates awg:M317_Sk4_3 .\n\nawg:M317_Sk4_1 a awg:Sketch ;\n\t awg:concomitates awg:M317_Sk4 ;\n\t rdfs:label \"Sk4.1\" .\n\nawg:M317_Sk4_2 a awg:Sketch ;\n\t awg:concomitates awg:M317_Sk4 ;\n\t rdfs:label \"Sk4.2\" .\n\nawg:M317_Sk4_3 a awg:Sketch ;\n\t awg:concomitates awg:M317_Sk4 ;\n\t rdfs:label \"Sk4.3\" .\n\n# Paratexts\nawg:PT_SB3_39r_1_Akk a awg:Paratext ;\n \t\trdfs:label \"Akkolade\" ;\n \t\tawg:precedes awg:M317_Sk1 ;\n\t\tdc:isPartOf awg:Op24_1 .\n\nawg:PT_SB3_38v_1_Akk1_4 a awg:Paratext ;\n \t\trdfs:label \"Akkoladenstrich: System 1–4\" ;\n \t\tawg:precedes awg:M317_Sk1 ;\n\t\tdc:isPartOf awg:Op24_1 .\n\nawg:PT_SB3_38v_4_Akk14_16 a awg:Paratext ;\n\t\trdfs:label \"Akkoladenstrich: System 14–16\" ;\n\t\tawg:precedes awg:M317_Sk4_1 ;\n\t\tdc:isPartOf awg:Op25_1 .\n\nawg:PT_SB3_38v_2_date_19340704 a awg:Paratext ;\n \t\trdfs:label \"Datierung: 4.VII 34\" ;\n \t\tawg:concomitates awg:M317_Sk1, awg:M317_Sk2 ;\n\t\tdc:isPartOf awg:Op25_1 .\n\nawg:PT_SB3_38v_3_timesignature2 a awg:Paratext ;\n \t\trdfs:label \"Schlüssel- und Taktvorzeichnung\" ;\n \t\tawg:precedes_scripture awg:M317_Sk3 ;\n\t\tdc:isPartOf awg:Op25_1 .\n\nawg:PT_SB3_39r_2_date_19340716 a awg:Paratext ;\n \t\trdfs:label \"Schlussdatierung: Maria Enzersdorf 16.VII.34\" ;\n\t\tawg:precedes awg:PT_SB3_38v_5_Titel ;\n\t\tdc:isPartOf awg:Op25_1 .\n\nawg:PT_SB3_38v_5_Titel a awg:Paratext ;\n \t\trdfs:label \"„Wie bin ich froh!“\" ;\n\t\tdc:isPartOf awg:Op25_1 .\n\nawg:PT_SB3_38v_6_page75 a awg:Paratext ;\n \t\trdfs:label \"Seitenzahl: 75\" ;\n\t\tdc:isPartOf awg:Op25_1 .\n\nawg:PT_SB3_39r_3_page76 a awg:Paratext ;\n \t\trdfs:label \"Seitenzahl: 76\" ;\n\t\tdc:isPartOf awg:Op25_1 .\n" + "triples": "@prefix dc: .\n@prefix rdf: .\n@prefix rdfs: .\n@prefix owl: .\n@prefix awg: .\n\n\n# ONTO\nawg:follows a rdf:Property .\n\nawg:precedes a owl:TransitiveProperty .\nawg:precedes_scripture rdfs:subPropertyOf awg:precedes .\nawg:precedes_content rdfs:subPropertyOf awg:precedes .\n\nawg:concomitates owl:inverseOf awg:is_concomitated_by .\nawg:concomitates_unsure rdfs:subPropertyOf awg:concomitates .\n\nawg:EditionComplex a owl:Thing .\nawg:Sketch a owl:Thing .\nawg:Paratext a owl:Thing .\n\n# DATA\n# Work complexes\nawg:Op24_1 a awg:EditionComplex ;\n\t rdfs:label \"Op. 24/1\" .\n\nawg:Op25_1 a awg:EditionComplex ;\n\t rdfs:label \"Op. 25/1\" .\n\n# Sk1\nawg:M_317_Sk1 a awg:Sketch ;\n\t awg:precedes_scripture awg:M_317_Sk2 ;\n\t rdfs:label \"Sk1\" .\n\n#Sk2\nawg:M_317_Sk2 a awg:Sketch ;\n\t awg:precedes_content awg:M_317_Sk3 ;\n\t rdfs:label \"Sk2\" .\n\nawg:M_317_Sk2_1 a awg:Sketch ;\n\t awg:concomitates awg:M_317_Sk2 ;\n\t rdfs:label \"Sk2.1\" .\n\nawg:M_317_Sk2_1_1 a awg:Sketch ;\n\t awg:concomitates awg:M_317_Sk2_1 ;\n\t awg:precedes awg:M_317_Sk2_1_2 ;\n\t rdfs:label \"Sk2.1.1\" .\n\nawg:M_317_Sk2_1_2 a awg:Sketch ;\n\t awg:concomitates awg:M_317_Sk2_1 ;\n\t rdfs:label \"Sk2.1.2\" .\n\nawg:M_317_Sk2_1_3 a awg:Sketch ;\n\t awg:concomitates awg:M_317_Sk2_1 ;\n\t rdfs:label \"Sk2.1.3\" .\n\nawg:M_317_Sk2_1_2_1 a awg:Sketch ;\n\t awg:concomitates awg:M_317_Sk2_1_2 ;\n\t rdfs:label \"Sk2.1.2.1\" .\n\n# Sk3\nawg:M_317_Sk3 a awg:Sketch ;\n\t awg:precedes awg:M_317_Sk4 ;\n\t rdfs:label \"Sk3\" .\n\nawg:M_317_Sk3_1 a awg:Sketch ;\n\t awg:concomitates awg:M_317_Sk3 ;\n\t rdfs:label \"Sk3.1\" .\n\nawg:M_317_Sk3_1_1 a awg:Sketch ;\n\t awg:concomitates awg:M_317_Sk3_1 ;\n\t rdfs:label \"Sk3.1.1\" .\n\nawg:M_317_Sk3_1_2 a awg:Sketch ;\n\t awg:concomitates awg:M_317_Sk3_1 ;\n\t rdfs:label \"Sk3.1.2\" .\n\nawg:M_317_Sk3_1_3 a awg:Sketch ;\n\t awg:concomitates awg:M_317_Sk3_1 ;\n\t rdfs:label \"Sk3.1.3 (Reihentabelle)\" .\n\nawg:M_317_Sk3_1_3_1 a awg:Sketch ;\n\t awg:concomitates awg:M_317_Sk3_1_3 ;\n\t rdfs:label \"Sk3.1.3.1\" .\n\n# Sk4\nawg:M_317_Sk4 a awg:Sketch ;\n\t rdfs:label \"Sk4 (Verlaufskizze)\" ;\n\t dc:hasPart awg:M_317_Sk4a , awg:M_317_Sk4b , awg:M_317_Sk4c , awg:M_317_Sk4d ;\n\t awg:precedes awg:PT_SB3_38v_6_page75 ;\n\t awg:precedes awg:PT_SB3_39r_3_page76 ;\n\t awg:precedes awg:PT_SB3_39r_2_date_19340716 .\n\nawg:M_317_Sk4a a awg:Sketch ;\n\t rdfs:label \"Sk4 T. 1A–3A\" ;\n\t awg:concomitates awg:M_317_Sk4_1 ;\n\t awg:concomitates awg:PT_SB3_38v_4_Akk14_16 ;\n\t awg:precedes awg:M_317_Sk4b .\n\nawg:M_317_Sk4b a awg:Sketch ;\n\t rdfs:label \"Sk4 T. 3B–6\" ;\n\t awg:precedes awg:M_317_Sk4c .\n\nawg:M_317_Sk4c a awg:Sketch ;\n\t rdfs:label \"Sk4 T. 7–12\" ;\n\t awg:precedes awg:M_317_Sk4d .\n\nawg:M_317_Sk4d a awg:Sketch ;\n\t rdfs:label \"Sk4 T. 13–15\" ;\n\t awg:concomitates awg:M_317_Sk4_2 ;\n\t awg:concomitates awg:M_317_Sk4_3 .\n\nawg:M_317_Sk4_1 a awg:Sketch ;\n\t awg:concomitates awg:M_317_Sk4 ;\n\t rdfs:label \"Sk4.1\" .\n\nawg:M_317_Sk4_2 a awg:Sketch ;\n\t awg:concomitates awg:M_317_Sk4 ;\n\t rdfs:label \"Sk4.2\" .\n\nawg:M_317_Sk4_3 a awg:Sketch ;\n\t awg:concomitates awg:M_317_Sk4 ;\n\t rdfs:label \"Sk4.3\" .\n\n# Paratexts\nawg:PT_SB3_39r_1_Akk a awg:Paratext ;\n\t rdfs:label \"Akkolade\" ;\n\t awg:precedes awg:M_317_Sk1 ;\n\t dc:isPartOf awg:Op24_1 .\n\nawg:PT_SB3_38v_1_Akk1_4 a awg:Paratext ;\n\t rdfs:label \"Akkoladenstrich: System 1–4\" ;\n\t awg:precedes awg:M_317_Sk1 ;\n\t dc:isPartOf awg:Op24_1 .\n\nawg:PT_SB3_38v_4_Akk14_16 a awg:Paratext ;\n\t rdfs:label \"Akkoladenstrich: System 14–16\" ;\n\t awg:precedes awg:M_317_Sk4_1 ;\n\t dc:isPartOf awg:Op25_1 .\n\nawg:PT_SB3_38v_2_date_19340704 a awg:Paratext ;\n\t rdfs:label \"Datierung: 4.VII 34\" ;\n\t awg:concomitates awg:M_317_Sk1, awg:M_317_Sk2 ;\n\t dc:isPartOf awg:Op25_1 .\n\nawg:PT_SB3_38v_3_timesignature2 a awg:Paratext ;\n\t rdfs:label \"Schlüssel- und Taktvorzeichnung\" ;\n\t awg:precedes_scripture awg:M_317_Sk3 ;\n\t dc:isPartOf awg:Op25_1 .\n\nawg:PT_SB3_39r_2_date_19340716 a awg:Paratext ;\n\t rdfs:label \"Schlussdatierung: Maria Enzersdorf 16.VII.34\" ;\n\t awg:precedes awg:PT_SB3_38v_5_Titel ;\n\t dc:isPartOf awg:Op25_1 .\n\nawg:PT_SB3_38v_5_Titel a awg:Paratext ;\n\t rdfs:label \"„Wie bin ich froh!“\" ;\n\t dc:isPartOf awg:Op25_1 .\n\nawg:PT_SB3_38v_6_page75 a awg:Paratext ;\n\t rdfs:label \"Seitenzahl: 75\" ;\n\t dc:isPartOf awg:Op25_1 .\n\nawg:PT_SB3_39r_3_page76 a awg:Paratext ;\n\t rdfs:label \"Seitenzahl: 76\" ;\n\t dc:isPartOf awg:Op25_1 .\n" }, "staticImage": "\"graphOp25\"" } diff --git a/src/assets/data/edition/series/1/section/5/op25/source-description.json b/src/assets/data/edition/series/1/section/5/op25/source-description.json index 9cfecd1bb0..2efeafddc7 100644 --- a/src/assets/data/edition/series/1/section/5/op25/source-description.json +++ b/src/assets/data/edition/series/1/section/5/op25/source-description.json @@ -15,13 +15,16 @@ }, "title": "„Wie bin ich froh!“ auf Bl. 38v oben links mit schwarzem Buntstift.", "date": "", - "measureNumbers": "Taktzahlen 1–2, 3–6 und 9–15 in M 317 Sk4 sowie 2–3 in M 317 Sk4.1 mit schwarzem Buntstift; Taktzahlen 7–8 in M 317 Sk4 mit Bleistift und nachgezogen mit schwarzem Buntstift.
Taktzahl 52 (zu op. 24/1) auf Bl. 39r oben links mit schwarzem Buntstift.", + "measureNumbers": "Taktzahlen 1–2, 3–6 und 9–15 in M 317 Sk4 sowie 2–3 in M 317 Sk4.1 mit schwarzem Buntstift; Taktzahlen 7–8 in M 317 Sk4 mit Bleistift und nachgezogen mit schwarzem Buntstift.
Taktzahl 52 (zu op. 24/1) auf Bl. 39r oben links mit schwarzem Buntstift.", "instrumentation": "Akkoladenstrich und teilweise Schlüsselvorsatz auf Bl. 38v System 1–4 (zu op. 24/1).
Akkoladenstrich und Schlüsselvorsatz auf Bl. 39r System 1–4 (zu op. 24/1), eingekreist und gestrichen mit rotem Buntstift.", - "annotations": "Reihe auf Bl. 38v System 5 links (zu M 317 Sk3.1.3) mit schwarzem Buntstift.", + "annotations": "Reihe auf Bl. 38v System 5 links (zu M 317 Sk3.1.3) mit schwarzem Buntstift.", "content": [ { "item": "M 317 Sk2", - "itemLinkTo": "M_317_Sk2", + "itemLinkTo": { + "complexId": "op25", + "sheetId": "M_317_Sk2" + }, "itemDescription": "(Skizze zu „Wie bin ich froh!“ M 317)", "folios": [ { @@ -43,7 +46,10 @@ }, { "item": "M 317 Sk1", - "itemLinkTo": "M_317_Sk1", + "itemLinkTo": { + "complexId": "op25", + "sheetId": "M_317_Sk1" + }, "itemDescription": "(Skizze zu „Wie bin ich froh!“ M 317)", "folios": [ { @@ -64,7 +70,10 @@ }, { "item": "M 317 Sk2.1", - "itemLinkTo": "M_317_Sk2_1", + "itemLinkTo": { + "complexId": "op25", + "sheetId": "M_317_Sk2_1" + }, "itemDescription": "(Skizze zu „Wie bin ich froh!“ M 317)", "folios": [ { @@ -85,7 +94,10 @@ }, { "item": "M 317 Sk2.1.1", - "itemLinkTo": "M_317_Sk2_1_1", + "itemLinkTo": { + "complexId": "op25", + "sheetId": "M_317_Sk2_1_1" + }, "itemDescription": "(Skizze zu „Wie bin ich froh!“ M 317)", "folios": [ { @@ -106,7 +118,10 @@ }, { "item": "M 317 Sk2.1.2", - "itemLinkTo": "M_317_Sk2_1_2", + "itemLinkTo": { + "complexId": "op25", + "sheetId": "M_317_Sk2_1_2" + }, "itemDescription": "(Skizze zu „Wie bin ich froh!“ M 317)", "folios": [ { @@ -127,7 +142,10 @@ }, { "item": "M 317 Sk2.1.2.1", - "itemLinkTo": "M_317_Sk2_1_2_1", + "itemLinkTo": { + "complexId": "op25", + "sheetId": "M_317_Sk2_1_2_1" + }, "itemDescription": "(Skizze zu „Wie bin ich froh!“ M 317)", "folios": [ { @@ -148,7 +166,10 @@ }, { "item": "M 317 Sk2.1.3", - "itemLinkTo": "M_317_Sk2_1_3", + "itemLinkTo": { + "complexId": "op25", + "sheetId": "M_317_Sk2_1_3" + }, "itemDescription": "(Skizze zu „Wie bin ich froh!“ M 317)", "folios": [ { @@ -170,7 +191,10 @@ }, { "item": "M 317 Sk3", - "itemLinkTo": "M_317_Sk3", + "itemLinkTo": { + "complexId": "op25", + "sheetId": "M_317_Sk3" + }, "itemDescription": "(Skizze zu „Wie bin ich froh!“ M 317)", "folios": [ { @@ -191,7 +215,10 @@ }, { "item": "M 317 Sk3.1", - "itemLinkTo": "M_317_Sk3_1", + "itemLinkTo": { + "complexId": "op25", + "sheetId": "M_317_Sk3_1" + }, "itemDescription": "(Skizze zu „Wie bin ich froh!“ M 317)", "folios": [ { @@ -212,7 +239,10 @@ }, { "item": "M 317 Sk3.1.1", - "itemLinkTo": "M_317_Sk3_1_1", + "itemLinkTo": { + "complexId": "op25", + "sheetId": "M_317_Sk3_1_1" + }, "itemDescription": "(Skizze zu „Wie bin ich froh!“ M 317)", "folios": [ { @@ -233,7 +263,10 @@ }, { "item": "M 317 Sk3.1.2", - "itemLinkTo": "M_317_Sk3_1_2", + "itemLinkTo": { + "complexId": "op25", + "sheetId": "M_317_Sk3_1_2" + }, "itemDescription": "(Skizze zu „Wie bin ich froh!“ M 317)", "folios": [ { @@ -254,7 +287,10 @@ }, { "item": "M 317 Sk3.1.3", - "itemLinkTo": "M_317_Sk3_1_3", + "itemLinkTo": { + "complexId": "op25", + "sheetId": "M_317_Sk3_1_3" + }, "itemDescription": "(Reihentabelle zu „Wie bin ich froh!“ M 317)", "folios": [ { @@ -312,7 +348,10 @@ }, { "item": "M 317 Sk3.1.3.1", - "itemLinkTo": "M_317_Sk3_1_3_1", + "itemLinkTo": { + "complexId": "op25", + "sheetId": "M_317_Sk3_1_3_1" + }, "itemDescription": "(Skizze zu „Wie bin ich froh!“ M 317)", "folios": [ { @@ -334,7 +373,10 @@ }, { "item": "M 317 Sk4", - "itemLinkTo": "M_317_Sk4a", + "itemLinkTo": { + "complexId": "op25", + "sheetId": "M_317_Sk4a" + }, "itemDescription": "(Skizze zu „Wie bin ich froh!“ M 317)", "folios": [ { @@ -383,7 +425,10 @@ }, { "item": "M 317 Sk4.1", - "itemLinkTo": "M_317_Sk4_1", + "itemLinkTo": { + "complexId": "op25", + "sheetId": "M_317_Sk4_1" + }, "itemDescription": "(Skizze zu „Wie bin ich froh!“ M 317)", "folios": [ { @@ -404,7 +449,10 @@ }, { "item": "M 317 Sk4.2", - "itemLinkTo": "M_317_Sk4_2", + "itemLinkTo": { + "complexId": "op25", + "sheetId": "M_317_Sk4_2" + }, "itemDescription": "(Skizze zu „Wie bin ich froh!“ M 317)", "folios": [ { @@ -425,7 +473,10 @@ }, { "item": "M 317 Sk4.3", - "itemLinkTo": "M_317_Sk4_3", + "itemLinkTo": { + "complexId": "op25", + "sheetId": "M_317_Sk4_3" + }, "itemDescription": "(Skizze zu „Wie bin ich froh!“ M 317)", "folios": [ { @@ -468,8 +519,8 @@ "content": [ { "item": " ", - "itemLinkTo": "", - "itemDescription": "Autograph von „Wie bin ich froh!“ M 317: Textfassung 1", + "itemLinkTo": {}, + "itemDescription": "Autograph von „Wie bin ich froh!“ M 317: Textfassung 1", "folios": [ { "folio": "1r", @@ -571,7 +622,10 @@ "content": [ { "item": "M 317 Sk5 / M321 Sk1 / M 322 Sk1", - "itemLinkTo": "SkRT", + "itemLinkTo": { + "complexId": "op25", + "sheetId": "SkRT" + }, "itemDescription": "(Reihentabelle op. 25)", "folios": [ { diff --git a/src/assets/data/edition/series/1/section/5/op25/textcritics.json b/src/assets/data/edition/series/1/section/5/op25/textcritics.json index 463b678e98..d26d2d7e5f 100644 --- a/src/assets/data/edition/series/1/section/5/op25/textcritics.json +++ b/src/assets/data/edition/series/1/section/5/op25/textcritics.json @@ -1,10 +1,40 @@ { "textcritics": [ + { + "id": "M_317_TF1", + "label": "M 317 Textfassung 1", + "description": [ + "##Quellenbewertung:## Für die Edition von „Wie bin ich froh!“ M 317 Textfassung 1 sind B und E relevante Quellen.
Korrekturschicht 1 in E etabliert Textfassung 1, wobei dese Überarbeitung vor oder gleichzeitig mit der Niederschrift von B stattgefunden haben dürfte. Korrekturschicht 2 in E betrifft Textfassung 2. Der Zustand von E vor Korrekturschicht 2 lässt sich nicht immer eindeutig entziffern.
Hauptquelle der Textedition von „Wie bin ich froh!“ M 317 Textfassung 1 ist B." + ], + "comments": [ + { + "svgGroupId": "g1145", + "measure": "1", + "system": "", + "position": "4/8", + "comment": "rit. versetzt von ungenauer Position zwischen 4/8 und 5/8 mit Blick auf M 317 Sk4." + }, + { + "svgGroupId": "g1198", + "measure": "3", + "system": "Ges.", + "position": "1. Note", + "comment": "{{ref.getGlyph('[f]')}} versetzt von 1. Pause." + }, + { + "svgGroupId": "g1204", + "measure": "6", + "system": "Ges.", + "position": "1. Note", + "comment": "{{ref.getGlyph('[f]')}} versetzt von 3/8." + } + ] + }, { "id": "M_317_Sk1", "label": "M 317 Sk1", "description": [ - "Sk1 entwirft eine viertönige Figur, die in ihrem Tonvorrat und ihrer rhythmischen Kontur dem Anfang der Singstimme von „Wie bin ich froh!“ M 317 entspricht. Dass es sich um die erste Skizzeneinheit zu dem Lied handelt, erschließt sich aus dem skripturalen Zusammenhang mit der links danebenstehenden Einheit Sk2: Diese weist an ihrem rechten Ende ein deutlich zusammengedrängtes Schriftbild auf, was sich durch den bereits von Sk1 beanspruchten Raum auf der Seite erklärt.
Noch vor der Niederschrift von Sk1 war die Seite am linken Rand vermutlich mit dem Akkoladenstrich von System 1–4 sowie der Schlüsselung in System 2–3 versehen: Diese präparieren die Seite für die Fortsetzung der (bereits im Sommer 1931 begonnenen) Verlaufsskizze zu op. 24/I auf Bl. 22v–26r, 31v–33r und 36v–38r im Skizzenbuch. (Siehe auch Akkoladenstrich, Schlüsselung und Taktziffer am linken Rand von Bl. 39r System 1–4, die ebenfalls als Präparierung der Verlaufskizze zu op. 24/1 fungieren [Sk4 T. 3B–6].)
Die Datierung 4. VII. 34 oberhalb vom linken Rand von System 1 ist möglicherweise bereits im Zusammenhang mit Sk1, vielleicht aber auch erst mit Sk2 notiert worden.
Der über System 1 stehende Titel „Wie bin ich froh!“ ist allerdings sehr wahrscheinlich erst nach Abschluss der Verlaufskizze Sk4, möglicherweise erst bei einer späteren Redaktion des gesamten Skizzenbuches eingetragen worden, worauf der auch für andere entsprechende Titel im Skizzenbuch verwendete Schreibstoff und Schreibduktus hinweist." + "Sk1 entwirft eine viertönige Figur, die in ihrem Tonvorrat und ihrer rhythmischen Kontur dem Anfang der Singstimme von „Wie bin ich froh!“ M 317 entspricht. Dass es sich um die erste Skizzeneinheit zu dem Lied handelt, erschließt sich aus dem skripturalen Zusammenhang mit der links danebenstehenden Einheit Sk2: Diese weist an ihrem rechten Ende ein deutlich zusammengedrängtes Schriftbild auf, was sich durch den bereits von Sk1 beanspruchten Raum auf der Seite erklärt.
Noch vor der Niederschrift von Sk1 war die Seite am linken Rand vermutlich mit dem Akkoladenstrich von System 1–4 sowie der Schlüsselung in System 2–3 versehen: Diese präparieren die Seite für die Fortsetzung der (bereits im Sommer 1931 begonnenen) Verlaufsskizze zu op. 24/I auf Bl. 22v–26r, 31v–33r und 36v–38r im Skizzenbuch. (Siehe auch Akkoladenstrich, Schlüsselung und Taktziffer am linken Rand von Bl. 39r System 1–4, die ebenfalls als Präparierung der Verlaufskizze zu op. 24/1 fungieren [Sk4 T. 3B–6].)
Die Datierung 4. VII. 34 oberhalb vom linken Rand von System 1 ist möglicherweise bereits im Zusammenhang mit Sk1, vielleicht aber auch erst mit Sk2 notiert worden.
Der über System 1 stehende Titel „Wie bin ich froh!“ ist allerdings sehr wahrscheinlich erst nach Abschluss der Verlaufskizze Sk4, möglicherweise erst bei einer späteren Redaktion des gesamten Skizzenbuches eingetragen worden, worauf der auch für andere entsprechende Titel im Skizzenbuch verwendete Schreibstoff und Schreibduktus hinweist." ], "comments": [ { @@ -18,39 +48,66 @@ "linkBoxes": [ { "svgGroupId": "g6407", - "linkTo": "M_317_Sk2" + "linkTo": { + "complexId": "op25", + "sheetId": "M_317_Sk2" + } }, { "svgGroupId": "g6443", - "linkTo": "M_317_Sk2_1" + "linkTo": { + "complexId": "op25", + "sheetId": "M_317_Sk2_1" + } }, { "svgGroupId": "g6490", - "linkTo": "M_317_Sk2_1_1" + "linkTo": { + "complexId": "op25", + "sheetId": "M_317_Sk2_1_1" + } }, { "svgGroupId": "g6454", - "linkTo": "M_317_Sk2_1_2" + "linkTo": { + "complexId": "op25", + "sheetId": "M_317_Sk2_1_2" + } }, { "svgGroupId": "g6468", - "linkTo": "M_317_Sk2_1_2_1" + "linkTo": { + "complexId": "op25", + "sheetId": "M_317_Sk2_1_2_1" + } }, { "svgGroupId": "g6479", - "linkTo": "M_317_Sk2_1_3" + "linkTo": { + "complexId": "op25", + "sheetId": "M_317_Sk2_1_3" + } }, { "svgGroupId": "g6414", - "linkTo": "M_317_Sk3" + "linkTo": { + "complexId": "op25", + "sheetId": "M_317_Sk3" + } }, { "svgGroupId": "g6434", - "linkTo": "M_317_Sk3_1" + "linkTo": { + "complexId": "op25", + "sheetId": "M_317_Sk3_1" + } }, { "svgGroupId": "g6425", - "linkTo": "M_317_Sk3_1_2" + "linkTo": { + "complexId": "op25", + "sheetId": "M_317_Sk3_1_2" + } } ] }, @@ -58,7 +115,7 @@ "id": "M_317_Sk2", "label": "M 317 Sk2", "description": [ - "Sk2 entwirft eine Zwölftonreihe in zwei Anläufen. Reihe A umfasst lediglich fünf Töne, Reihe B ergänzt nach einer Permutation des 3.–4. Reihentons die Reihe zur vollständigen Zwölftönigkeit. Die ersten fünf Töne beider Reihen ergänzen den ungeordneten Tonvorrat von Sk1 um den Anfangston cis. Die Niederschrift von Reihe B erfolgt dann im dynamischen Abgleich mit Sk2.1, Sk2.1.1, Sk2.1.2, Sk2.1.2.1 und Sk2.1.3." + "Sk2 entwirft eine Zwölftonreihe in zwei Anläufen. Reihe A umfasst lediglich fünf Töne, Reihe B ergänzt nach einer Permutation des 3.–4. Reihentons die Reihe zur vollständigen Zwölftönigkeit. Die ersten fünf Töne beider Reihen ergänzen den ungeordneten Tonvorrat von Sk1 um den Anfangston cis. Die Niederschrift von Reihe B erfolgt dann im dynamischen Abgleich mit Sk2.1, Sk2.1.1, Sk2.1.2, Sk2.1.2.1 und Sk2.1.3." ], "rowtable": true, "comments": [ @@ -87,39 +144,66 @@ "linkBoxes": [ { "svgGroupId": "g536", - "linkTo": "M_317_Sk1" + "linkTo": { + "complexId": "op25", + "sheetId": "M_317_Sk1" + } }, { "svgGroupId": "g572", - "linkTo": "M_317_Sk2_1" + "linkTo": { + "complexId": "op25", + "sheetId": "M_317_Sk2_1" + } }, { "svgGroupId": "g608", - "linkTo": "M_317_Sk2_1_1" + "linkTo": { + "complexId": "op25", + "sheetId": "M_317_Sk2_1_1" + } }, { "svgGroupId": "g583", - "linkTo": "M_317_Sk2_1_2" + "linkTo": { + "complexId": "op25", + "sheetId": "M_317_Sk2_1_2" + } }, { "svgGroupId": "g597", - "linkTo": "M_317_Sk2_1_2_1" + "linkTo": { + "complexId": "op25", + "sheetId": "M_317_Sk2_1_2_1" + } }, { "svgGroupId": "g619", - "linkTo": "M_317_Sk2_1_3" + "linkTo": { + "complexId": "op25", + "sheetId": "M_317_Sk2_1_3" + } }, { "svgGroupId": "g554", - "linkTo": "M_317_Sk3" + "linkTo": { + "complexId": "op25", + "sheetId": "M_317_Sk3" + } }, { "svgGroupId": "g563", - "linkTo": "M_317_Sk3_1" + "linkTo": { + "complexId": "op25", + "sheetId": "M_317_Sk3_1" + } }, { "svgGroupId": "g547", - "linkTo": "M_317_Sk3_1_2" + "linkTo": { + "complexId": "op25", + "sheetId": "M_317_Sk3_1_2" + } } ] }, @@ -127,7 +211,7 @@ "id": "M_317_Sk2_1", "label": "M 317 Sk2.1", "description": [ - "Sk2.1 entwirft auf der Grundlage der rhythmischen Kontur von Sk1 eine Melodielinie mit Text, die in ihrer ausführlichsten und vermutlich letzten Schicht (T. 1 bis T. 2 1. TH: System 1; T. 2 2. TH bis T. 4: System 2) Reihe B aus Sk2 artikuliert. Die Niederschrift erfolgt im dynamischen Abgleich mit Sk2.1.1, Sk2.1.2, Sk2.1.2.1 und Sk2.1.3." + "Sk2.1 entwirft auf der Grundlage der rhythmischen Kontur von Sk1 eine Melodielinie mit Text, die in ihrer ausführlichsten und vermutlich letzten Schicht (T. 1 bis T. 2 1. TH: System 1; T. 2 2. TH bis T. 4: System 2) Reihe B aus Sk2 artikuliert. Die Niederschrift erfolgt im dynamischen Abgleich mit Sk2.1.1, Sk2.1.2, Sk2.1.2.1 und Sk2.1.3." ], "comments": [ { @@ -177,7 +261,7 @@ "measure": "3", "system": "1", "position": "3. Note", - "comment": "Klammerung rechts zeigt Tilgung an. Es ist nicht eindeutig, ob die so angezeigte Tilgung ab T. 2 4/8 beginnt (mit den Varianten in System 2–3) oder ob sie sich auch auf T. 1 ff. bezieht (mit den Varianten in Sk2.1.1 und Sk2.1.2." + "comment": "Klammerung rechts zeigt Tilgung an. Es ist nicht eindeutig, ob die so angezeigte Tilgung ab T. 2 4/8 beginnt (mit den Varianten in System 2–3) oder ob sie sich auch auf T. 1 ff. bezieht (mit den Varianten in Sk2.1.1 und Sk2.1.2." }, { "svgGroupId": "g1295", @@ -190,39 +274,66 @@ "linkBoxes": [ { "svgGroupId": "g1210", - "linkTo": "M_317_Sk1" + "linkTo": { + "complexId": "op25", + "sheetId": "M_317_Sk1" + } }, { "svgGroupId": "g1203", - "linkTo": "M_317_Sk2" + "linkTo": { + "complexId": "op25", + "sheetId": "M_317_Sk2" + } }, { "svgGroupId": "g1221", - "linkTo": "M_317_Sk2_1_1" + "linkTo": { + "complexId": "op25", + "sheetId": "M_317_Sk2_1_1" + } }, { "svgGroupId": "g1232", - "linkTo": "M_317_Sk2_1_2" + "linkTo": { + "complexId": "op25", + "sheetId": "M_317_Sk2_1_2" + } }, { "svgGroupId": "g1273", - "linkTo": "M_317_Sk2_1_2_1" + "linkTo": { + "complexId": "op25", + "sheetId": "M_317_Sk2_1_2_1" + } }, { "svgGroupId": "g1284", - "linkTo": "M_317_Sk2_1_3" + "linkTo": { + "complexId": "op25", + "sheetId": "M_317_Sk2_1_3" + } }, { "svgGroupId": "g1239", - "linkTo": "M_317_Sk3" + "linkTo": { + "complexId": "op25", + "sheetId": "M_317_Sk3" + } }, { "svgGroupId": "g1259", - "linkTo": "M_317_Sk3_1" + "linkTo": { + "complexId": "op25", + "sheetId": "M_317_Sk3_1" + } }, { "svgGroupId": "g1250", - "linkTo": "M_317_Sk3_1_2" + "linkTo": { + "complexId": "op25", + "sheetId": "M_317_Sk3_1_2" + } } ] }, @@ -230,46 +341,73 @@ "id": "M_317_Sk2_1_1", "label": "M 317 Sk2.1.1", "description": [ - "Sk2.1.1 formuliert eine Variante des Anfangs von Sk2.1 auf der Grundlage des 1.–5. Reihentons von Reihe B in Sk2.", + "Sk2.1.1 formuliert eine Variante des Anfangs von Sk2.1 auf der Grundlage des 1.–5. Reihentons von Reihe B in Sk2.", "[Zu dieser Skizze gibt es keine textkritischen Kommentare.]" ], "comments": [], "linkBoxes": [ { "svgGroupId": "g1022", - "linkTo": "M_317_Sk1" + "linkTo": { + "complexId": "op25", + "sheetId": "M_317_Sk1" + } }, { "svgGroupId": "g1015", - "linkTo": "M_317_Sk2" + "linkTo": { + "complexId": "op25", + "sheetId": "M_317_Sk2" + } }, { "svgGroupId": "g1031", - "linkTo": "M_317_Sk2_1" + "linkTo": { + "complexId": "op25", + "sheetId": "M_317_Sk2_1" + } }, { "svgGroupId": "g1042", - "linkTo": "M_317_Sk2_1_2" + "linkTo": { + "complexId": "op25", + "sheetId": "M_317_Sk2_1_2" + } }, { "svgGroupId": "g1083", - "linkTo": "M_317_Sk2_1_2_1" + "linkTo": { + "complexId": "op25", + "sheetId": "M_317_Sk2_1_2_1" + } }, { "svgGroupId": "g1094", - "linkTo": "M_317_Sk2_1_3" + "linkTo": { + "complexId": "op25", + "sheetId": "M_317_Sk2_1_3" + } }, { "svgGroupId": "g1049", - "linkTo": "M_317_Sk3" + "linkTo": { + "complexId": "op25", + "sheetId": "M_317_Sk3" + } }, { "svgGroupId": "g1069", - "linkTo": "M_317_Sk3_1" + "linkTo": { + "complexId": "op25", + "sheetId": "M_317_Sk3_1" + } }, { "svgGroupId": "g1060", - "linkTo": "M_317_Sk3_1_2" + "linkTo": { + "complexId": "op25", + "sheetId": "M_317_Sk3_1_2" + } } ] }, @@ -277,7 +415,7 @@ "id": "M_317_Sk2_1_2", "label": "M 317 Sk2.1.2", "description": [ - "Sk2.1.2 ist vermutlich eine inhaltliche Fortsetzung von Sk2.1.1 (als T. 3): Hierfür spricht der Anfangston b1 an entsprechender Stelle von Varianten in Sk2.1 (System 1 und 2) sowie die dort ebenfalls anzutreffende Ligatur über den Taktstrich (System 1 und 3). Allerdings artikuliert Sk2.1.2 einen anderen Reihenverlauf als Reihe B in Sk2." + "Sk2.1.2 ist vermutlich eine inhaltliche Fortsetzung von Sk2.1.1 (als T. 3): Hierfür spricht der Anfangston b1 an entsprechender Stelle von Varianten in Sk2.1 (System 1 und 2) sowie die dort ebenfalls anzutreffende Ligatur über den Taktstrich (System 1 und 3). Allerdings artikuliert Sk2.1.2 einen anderen Reihenverlauf als Reihe B in Sk2." ], "comments": [ { @@ -291,39 +429,66 @@ "linkBoxes": [ { "svgGroupId": "g1029", - "linkTo": "M_317_Sk1" + "linkTo": { + "complexId": "op25", + "sheetId": "M_317_Sk1" + } }, { "svgGroupId": "g1022", - "linkTo": "M_317_Sk2" + "linkTo": { + "complexId": "op25", + "sheetId": "M_317_Sk2" + } }, { "svgGroupId": "g1038", - "linkTo": "M_317_Sk2_1" + "linkTo": { + "complexId": "op25", + "sheetId": "M_317_Sk2_1" + } }, { "svgGroupId": "g1049", - "linkTo": "M_317_Sk2_1_1" + "linkTo": { + "complexId": "op25", + "sheetId": "M_317_Sk2_1_1" + } }, { "svgGroupId": "g1090", - "linkTo": "M_317_Sk2_1_2_1" + "linkTo": { + "complexId": "op25", + "sheetId": "M_317_Sk2_1_2_1" + } }, { "svgGroupId": "g1101", - "linkTo": "M_317_Sk2_1_3" + "linkTo": { + "complexId": "op25", + "sheetId": "M_317_Sk2_1_3" + } }, { "svgGroupId": "g1056", - "linkTo": "M_317_Sk3" + "linkTo": { + "complexId": "op25", + "sheetId": "M_317_Sk3" + } }, { "svgGroupId": "g1076", - "linkTo": "M_317_Sk3_1" + "linkTo": { + "complexId": "op25", + "sheetId": "M_317_Sk3_1" + } }, { "svgGroupId": "g1067", - "linkTo": "M_317_Sk3_1_2" + "linkTo": { + "complexId": "op25", + "sheetId": "M_317_Sk3_1_2" + } } ] }, @@ -331,46 +496,73 @@ "id": "M_317_Sk2_1_2_1", "label": "M 317 Sk2.1.2.1", "description": [ - "Sk2.1.2.1 formuliert eine rhythmisch-metrische Variante des Anfangs von Sk2.1.2.", + "Sk2.1.2.1 formuliert eine rhythmisch-metrische Variante des Anfangs von Sk2.1.2.", "[Zu dieser Skizze gibt es keine textkritischen Kommentare.]" ], "comments": [], "linkBoxes": [ { "svgGroupId": "g1009", - "linkTo": "M_317_Sk1" + "linkTo": { + "complexId": "op25", + "sheetId": "M_317_Sk1" + } }, { "svgGroupId": "g1002", - "linkTo": "M_317_Sk2" + "linkTo": { + "complexId": "op25", + "sheetId": "M_317_Sk2" + } }, { "svgGroupId": "g1018", - "linkTo": "M_317_Sk2_1" + "linkTo": { + "complexId": "op25", + "sheetId": "M_317_Sk2_1" + } }, { "svgGroupId": "g1029", - "linkTo": "M_317_Sk2_1_1" + "linkTo": { + "complexId": "op25", + "sheetId": "M_317_Sk2_1_1" + } }, { "svgGroupId": "g1040", - "linkTo": "M_317_Sk2_1_2" + "linkTo": { + "complexId": "op25", + "sheetId": "M_317_Sk2_1_2" + } }, { "svgGroupId": "g1078", - "linkTo": "M_317_Sk2_1_3" + "linkTo": { + "complexId": "op25", + "sheetId": "M_317_Sk2_1_3" + } }, { "svgGroupId": "g1047", - "linkTo": "M_317_Sk3" + "linkTo": { + "complexId": "op25", + "sheetId": "M_317_Sk3" + } }, { "svgGroupId": "g1067", - "linkTo": "M_317_Sk3_1" + "linkTo": { + "complexId": "op25", + "sheetId": "M_317_Sk3_1" + } }, { "svgGroupId": "g1058", - "linkTo": "M_317_Sk3_1_2" + "linkTo": { + "complexId": "op25", + "sheetId": "M_317_Sk3_1_2" + } } ] }, @@ -378,46 +570,73 @@ "id": "M_317_Sk2_1_3", "label": "M 317 Sk2.1.3", "description": [ - "Die in Sk2.1.3 notierten Tonbuchstaben c, f, gis und a beziehen sich vermutlich auf noch fehlende Reihentöne bei der Niederschrift von Sk2 (Reihe B), Sk2.1 und Sk2.1.2.", + "Die in Sk2.1.3 notierten Tonbuchstaben c, f, gis und a beziehen sich vermutlich auf noch fehlende Reihentöne bei der Niederschrift von Sk2 (Reihe B), Sk2.1 und Sk2.1.2.", "[Zu dieser Skizze gibt es keine textkritischen Kommentare.]" ], "comments": [], "linkBoxes": [ { "svgGroupId": "g988", - "linkTo": "M_317_Sk1" + "linkTo": { + "complexId": "op25", + "sheetId": "M_317_Sk1" + } }, { "svgGroupId": "g981", - "linkTo": "M_317_Sk2" + "linkTo": { + "complexId": "op25", + "sheetId": "M_317_Sk2" + } }, { "svgGroupId": "g997", - "linkTo": "M_317_Sk2_1" + "linkTo": { + "complexId": "op25", + "sheetId": "M_317_Sk2_1" + } }, { "svgGroupId": "g1008", - "linkTo": "M_317_Sk2_1_1" + "linkTo": { + "complexId": "op25", + "sheetId": "M_317_Sk2_1_1" + } }, { "svgGroupId": "g1019", - "linkTo": "M_317_Sk2_1_2" + "linkTo": { + "complexId": "op25", + "sheetId": "M_317_Sk2_1_2" + } }, { "svgGroupId": "g1060", - "linkTo": "M_317_Sk2_1_2_1" + "linkTo": { + "complexId": "op25", + "sheetId": "M_317_Sk2_1_2_1" + } }, { "svgGroupId": "g1026", - "linkTo": "M_317_Sk3" + "linkTo": { + "complexId": "op25", + "sheetId": "M_317_Sk3" + } }, { "svgGroupId": "g1046", - "linkTo": "M_317_Sk3_1" + "linkTo": { + "complexId": "op25", + "sheetId": "M_317_Sk3_1" + } }, { "svgGroupId": "g1037", - "linkTo": "M_317_Sk3_1_2" + "linkTo": { + "complexId": "op25", + "sheetId": "M_317_Sk3_1_2" + } } ] }, @@ -425,7 +644,7 @@ "id": "M_317_Sk3", "label": "M 317 Sk3", "description": [ - "Sk3 stellt gegenüber Sk2 und deren begleitenden Skizzeneinheiten einen inhaltlichen Neuansatz dar, insofern die in Sk2 notierte vollständige Zwölftonreihe (Reihe B) nicht mehr verwendet wird. Stattdessen formuliert Sk3 auf der Grundlage des permutierten Tonvorrats von Sk1 einen neuen zwölftönigen Verlauf. Im dynamischen Abgleich mit Sk3.1, Sk3.1.1 und Sk3.1.2 wird dieser Verlauf weiter verändert und als rhythmisch abstrahierte Zwölftonreihe in Sk3.1.3 und Sk3.1.3.1 notiert." + "Sk3 stellt gegenüber Sk2 und deren begleitenden Skizzeneinheiten einen inhaltlichen Neuansatz dar, insofern die in Sk2 notierte vollständige Zwölftonreihe (Reihe B) nicht mehr verwendet wird. Stattdessen formuliert Sk3 auf der Grundlage des permutierten Tonvorrats von Sk1 einen neuen zwölftönigen Verlauf. Im dynamischen Abgleich mit Sk3.1, Sk3.1.1 und Sk3.1.2 wird dieser Verlauf weiter verändert und als rhythmisch abstrahierte Zwölftonreihe in Sk3.1.3 und Sk3.1.3.1 notiert." ], "comments": [ { @@ -447,45 +666,72 @@ "measure": "2", "system": "3", "position": "1. Note", - "comment": "Pfeil zur Variante der Fortsetzung in Sk3.1." + "comment": "Pfeil zur Variante der Fortsetzung in Sk3.1." } ], "linkBoxes": [ { "svgGroupId": "g588", - "linkTo": "M_317_Sk1" + "linkTo": { + "complexId": "op25", + "sheetId": "M_317_Sk1" + } }, { "svgGroupId": "g581", - "linkTo": "M_317_Sk2" + "linkTo": { + "complexId": "op25", + "sheetId": "M_317_Sk2" + } }, { "svgGroupId": "g628", - "linkTo": "M_317_Sk2_1" + "linkTo": { + "complexId": "op25", + "sheetId": "M_317_Sk2_1" + } }, { "svgGroupId": "g653", - "linkTo": "M_317_Sk2_1_1" + "linkTo": { + "complexId": "op25", + "sheetId": "M_317_Sk2_1_1" + } }, { "svgGroupId": "g619", - "linkTo": "M_317_Sk2_1_2" + "linkTo": { + "complexId": "op25", + "sheetId": "M_317_Sk2_1_2" + } }, { "svgGroupId": "g642", - "linkTo": "M_317_Sk2_1_2_1" + "linkTo": { + "complexId": "op25", + "sheetId": "M_317_Sk2_1_2_1" + } }, { "svgGroupId": "g664", - "linkTo": "M_317_Sk2_1_3" + "linkTo": { + "complexId": "op25", + "sheetId": "M_317_Sk2_1_3" + } }, { "svgGroupId": "g608", - "linkTo": "M_317_Sk3_1" + "linkTo": { + "complexId": "op25", + "sheetId": "M_317_Sk3_1" + } }, { "svgGroupId": "g599", - "linkTo": "M_317_Sk3_1_2" + "linkTo": { + "complexId": "op25", + "sheetId": "M_317_Sk3_1_2" + } } ] }, @@ -493,7 +739,7 @@ "id": "M_317_Sk3_1", "label": "M 317 Sk3.1", "description": [ - "Sk3.1 führt den Anfang von Sk3 ab dem Auftakt zu T. 3 in Varianten weiter bis T. {{ '{' }}6{{ '}' }}." + "Sk3.1 führt den Anfang von Sk3 ab dem Auftakt zu T. 3 in Varianten weiter bis T. {{ '{' }}6{{ '}' }}." ], "comments": [ { @@ -508,7 +754,7 @@ "measure": "3", "system": "4", "position": "Taktanfang", - "comment": "Asterisk verweist auf Variante der Fortsetzung in Sk3.1.2." + "comment": "Asterisk verweist auf Variante der Fortsetzung in Sk3.1.2." }, { "svgGroupId": "g1213", @@ -529,14 +775,14 @@ "measure": "{5}", "system": "4", "position": "1. Note", - "comment": "Pfeil unten rechts von Variante T. 4 in Sk3.1.1." + "comment": "Pfeil unten rechts von Variante T. 4 in Sk3.1.1." }, { "svgGroupId": "text228", "measure": "{5}", "system": "4", "position": "6/8", - "comment": "I markiert hier als Reihenziffer vermutlich den wiederholten Beginn der in Sk3 T. 1–2 1. Note und in Sk3.1 fortgeführten Zwölftonreihe. Diese Reihe ist nicht identisch mit Gg in den Reihentabellen Sk3.1.3 und M 317 Sk5 / M 321 Sk1 / M 322 Sk1 in C (dort jeweils mit arabischer Ziffer 1 bezeichnet)." + "comment": "I markiert hier als Reihenziffer vermutlich den wiederholten Beginn der in Sk3 T. 1–2 1. Note und in Sk3.1 fortgeführten Zwölftonreihe. Diese Reihe ist nicht identisch mit Gg in den Reihentabellen Sk3.1.3 und M 317 Sk5 / M 321 Sk1 / M 322 Sk1 in C (dort jeweils mit arabischer Ziffer 1 bezeichnet)." }, { "svgGroupId": "g1241", @@ -556,47 +802,80 @@ "linkBoxes": [ { "svgGroupId": "g1214", - "linkTo": "M_317_Sk1" + "linkTo": { + "complexId": "op25", + "sheetId": "M_317_Sk1" + } }, { "svgGroupId": "g698", - "linkTo": "M_317_Sk2" + "linkTo": { + "complexId": "op25", + "sheetId": "M_317_Sk2" + } }, { "svgGroupId": "g725", - "linkTo": "M_317_Sk2_1" + "linkTo": { + "complexId": "op25", + "sheetId": "M_317_Sk2_1" + } }, { "svgGroupId": "g761", - "linkTo": "M_317_Sk2_1_1" + "linkTo": { + "complexId": "op25", + "sheetId": "M_317_Sk2_1_1" + } }, { "svgGroupId": "g736", - "linkTo": "M_317_Sk2_1_2" + "linkTo": { + "complexId": "op25", + "sheetId": "M_317_Sk2_1_2" + } }, { "svgGroupId": "g750", - "linkTo": "M_317_Sk2_1_2_1" + "linkTo": { + "complexId": "op25", + "sheetId": "M_317_Sk2_1_2_1" + } }, { "svgGroupId": "g772", - "linkTo": "M_317_Sk2_1_3" + "linkTo": { + "complexId": "op25", + "sheetId": "M_317_Sk2_1_3" + } }, { "svgGroupId": "g705", - "linkTo": "M_317_Sk3" + "linkTo": { + "complexId": "op25", + "sheetId": "M_317_Sk3" + } }, { "svgGroupId": "g716", - "linkTo": "M_317_Sk3_1_1" + "linkTo": { + "complexId": "op25", + "sheetId": "M_317_Sk3_1_1" + } }, { "svgGroupId": "g691", - "linkTo": "M_317_Sk3_1_2" + "linkTo": { + "complexId": "op25", + "sheetId": "M_317_Sk3_1_2" + } }, { "svgGroupId": "g680", - "linkTo": "M_317_Sk3_1_3" + "linkTo": { + "complexId": "op25", + "sheetId": "M_317_Sk3_1_3" + } } ] }, @@ -604,7 +883,7 @@ "id": "M_317_Sk3_1_1", "label": "M 317 Sk3.1.1", "description": [ - "Sk3.1.1 formuliert Varianten von T. 4–5 in Sk3.1." + "Sk3.1.1 formuliert Varianten von T. 4–5 in Sk3.1." ], "comments": [ { @@ -618,15 +897,24 @@ "linkBoxes": [ { "svgGroupId": "g441", - "linkTo": "M_317_Sk3_1" + "linkTo": { + "complexId": "op25", + "sheetId": "M_317_Sk3_1" + } }, { "svgGroupId": "g432", - "linkTo": "M_317_Sk3_1_3" + "linkTo": { + "complexId": "op25", + "sheetId": "M_317_Sk3_1_3" + } }, { "svgGroupId": "g454", - "linkTo": "M_317_Sk3_1_3_1" + "linkTo": { + "complexId": "op25", + "sheetId": "M_317_Sk3_1_3_1" + } } ] }, @@ -634,7 +922,7 @@ "id": "M_317_Sk3_1_2", "label": "M 317 Sk3.1.2", "description": [ - "Sk3.1.2 formuliert eine Variante von Sk3.1 ab T. 3. Zusammen mit Sk3 T. 1–2 1. Note und Sk3.1 Auftakt zu T. 3 ergibt sich eine Tonfolge, die der Reihenform Gg (1) der Zwölftonreihe in Sk3.1.3 und Sk3.1.3.1 entspricht." + "Sk3.1.2 formuliert eine Variante von Sk3.1 ab T. 3. Zusammen mit Sk3 T. 1–2 1. Note und Sk3.1 Auftakt zu T. 3 ergibt sich eine Tonfolge, die der Reihenform Gg (1) der Zwölftonreihe in Sk3.1.3 und Sk3.1.3.1 entspricht." ], "comments": [ { @@ -649,7 +937,7 @@ "measure": "3", "system": "4", "position": "Taktanfang", - "comment": "Asterisk verweist auf Anschluss von Sk3.1." + "comment": "Asterisk verweist auf Anschluss von Sk3.1." }, { "svgGroupId": "g809", @@ -670,45 +958,72 @@ "measure": "5", "system": "4", "position": "nach 1. Note", - "comment": "Durch Einklammerung abgegrenzt von Sk3.1." + "comment": "Durch Einklammerung abgegrenzt von Sk3.1." } ], "linkBoxes": [ { "svgGroupId": "g1091", - "linkTo": "M_317_Sk1" + "linkTo": { + "complexId": "op25", + "sheetId": "M_317_Sk1" + } }, { "svgGroupId": "g559", - "linkTo": "M_317_Sk2" + "linkTo": { + "complexId": "op25", + "sheetId": "M_317_Sk2" + } }, { "svgGroupId": "g584", - "linkTo": "M_317_Sk2_1" + "linkTo": { + "complexId": "op25", + "sheetId": "M_317_Sk2_1" + } }, { "svgGroupId": "g631", - "linkTo": "M_317_Sk2_1_1" + "linkTo": { + "complexId": "op25", + "sheetId": "M_317_Sk2_1_1" + } }, { "svgGroupId": "g595", - "linkTo": "M_317_Sk2_1_2" + "linkTo": { + "complexId": "op25", + "sheetId": "M_317_Sk2_1_2" + } }, { "svgGroupId": "g609", - "linkTo": "M_317_Sk2_1_2_1" + "linkTo": { + "complexId": "op25", + "sheetId": "M_317_Sk2_1_2_1" + } }, { "svgGroupId": "g620", - "linkTo": "M_317_Sk2_1_3" + "linkTo": { + "complexId": "op25", + "sheetId": "M_317_Sk2_1_3" + } }, { "svgGroupId": "g566", - "linkTo": "M_317_Sk3" + "linkTo": { + "complexId": "op25", + "sheetId": "M_317_Sk3" + } }, { "svgGroupId": "g575", - "linkTo": "M_317_Sk3_1" + "linkTo": { + "complexId": "op25", + "sheetId": "M_317_Sk3_1" + } } ] }, @@ -716,7 +1031,7 @@ "id": "M_317_Sk3_1_3", "label": "M 317 Sk3.1.3", "description": [ - "Sk3.1.3 notiert die vier in M 317 verwendeten Reihenformen in einer tabellarischen Anordnung und versieht sie mit den ebenfalls in Sk4 und Sk4.1 verwendeten Reihenziffern 1 bis 4. Die Permutation des 10.–11. Reihentons von Gg und Ug bzw. des 2.–3. Reihentons von Kgis und KUfis ist bereits in Sk3.1.2 vollzogen. " + "Sk3.1.3 notiert die vier in M 317 verwendeten Reihenformen in einer tabellarischen Anordnung und versieht sie mit den ebenfalls in Sk4 und Sk4.1 verwendeten Reihenziffern 1 bis 4. Die Permutation des 10.–11. Reihentons von Gg und Ug bzw. des 2.–3. Reihentons von Kgis und KUfis ist bereits in Sk3.1.2 vollzogen. " ], "rowtable": true, "comments": [ @@ -801,15 +1116,24 @@ "linkBoxes": [ { "svgGroupId": "g631", - "linkTo": "M_317_Sk3_1" + "linkTo": { + "complexId": "op25", + "sheetId": "M_317_Sk3_1" + } }, { "svgGroupId": "g642", - "linkTo": "M_317_Sk3_1_1" + "linkTo": { + "complexId": "op25", + "sheetId": "M_317_Sk3_1_1" + } }, { "svgGroupId": "g655", - "linkTo": "M_317_Sk3_1_3_1" + "linkTo": { + "complexId": "op25", + "sheetId": "M_317_Sk3_1_3_1" + } } ] }, @@ -817,18 +1141,24 @@ "id": "M_317_Sk3_1_3_1", "label": "M 317 Sk3.1.3.1", "description": [ - "Sk3.1.3.1 notiert das Ergebnis der in Sk3.1.3 erkennbaren Änderung des 10.–11. Reihentons von Gg und Ug bzw. des 2.–3. Reihentons von Kgis und KUfis am Beispiel von Gg noch einmal in einem einheitlichen Oktavregister.", + "Sk3.1.3.1 notiert das Ergebnis der in Sk3.1.3 erkennbaren Änderung des 10.–11. Reihentons von Gg und Ug bzw. des 2.–3. Reihentons von Kgis und KUfis am Beispiel von Gg noch einmal in einem einheitlichen Oktavregister.", "[Zu dieser Skizze gibt es keine textkritischen Kommentare.]" ], "comments": [], "linkBoxes": [ { "svgGroupId": "g410", - "linkTo": "M_317_Sk3_1_3" + "linkTo": { + "complexId": "op25", + "sheetId": "M_317_Sk3_1_3" + } }, { "svgGroupId": "g421", - "linkTo": "M_317_Sk3_1_1" + "linkTo": { + "complexId": "op25", + "sheetId": "M_317_Sk3_1_1" + } } ] }, @@ -836,8 +1166,8 @@ "id": "M_317_Sk4", "label": "M 317 Sk4", "description": [ - "Sk4 ist eine vollständige Verlaufskizze des Liedes „Wie bin ich froh!“. Die Verlaufskizze erstreckt sich über vier Akkoladen (T. {{ '{' }}1A{{ '}' }}–3A, T. 3B–6, T. 7–12 und T. 13–15) und umfasst im Unterschied zu den Reinschriften von Textfassung 1 und Textfassung 2 nicht zwölf, sondern 15 gültige Takte.
Bereits vor der Niederschrift von Sk4 war Bl. 39r mit Akkoladenstrich, Schlüsselung und Taktziffer am linken Rand von System 1–4 versehen (Sk4 T. 3B–6): Diese präparieren die Seite für die Fortsetzung der (bereits im Sommer 1931 begonnenen) Verlaufskizze zu M 316 (op. 24/I) auf Bl. 22v–26r, 31v–33r, und 36v–38r im selben Skizzenbuch.
(Siehe auch Akkoladenstrich von System 1–4 sowie die Schlüsselung in System 2–3 am linken Rand von Bl. 38v, die ebenfalls als Präparierung der Verlaufskizze zu M 316 fungieren [Sk1 bis Sk3.1.2].)
Sk4 ist laut der nach T. 15 folgenden Datierung am 16. Juli 1934 beendet worden.", - "Die Ziffern 1 (Gg), 2 (Kgis), 3 (Ug) und 4 (KUfis) bezeichnen in der Regel den Anfang von Reihenformen gemäß den Reihentabellen Sk3.1.3 und M 317 Sk5 / M 321 Sk1 / M 322 Sk1. Winkel markieren in der Regel deren Ende (┐, ┘) oder Anfang (┌, └)." + "Sk4 ist eine vollständige Verlaufskizze des Liedes „Wie bin ich froh!“. Die Verlaufskizze erstreckt sich über vier Akkoladen (T. {{ '{' }}1A{{ '}' }}–3A, T. 3B–6, T. 7–12 und T. 13–15) und umfasst im Unterschied zu den Reinschriften von Textfassung 1 und Textfassung 2 nicht zwölf, sondern 15 gültige Takte.
Bereits vor der Niederschrift von Sk4 war Bl. 39r mit Akkoladenstrich, Schlüsselung und Taktziffer am linken Rand von System 1–4 versehen (Sk4 T. 3B–6): Diese präparieren die Seite für die Fortsetzung der (bereits im Sommer 1931 begonnenen) Verlaufskizze zu M 316 (op. 24/I) auf Bl. 22v–26r, 31v–33r, und 36v–38r im selben Skizzenbuch.
(Siehe auch Akkoladenstrich von System 1–4 sowie die Schlüsselung in System 2–3 am linken Rand von Bl. 38v, die ebenfalls als Präparierung der Verlaufskizze zu M 316 fungieren [Sk1 bis Sk3.1.2].)
Sk4 ist laut der nach T. 15 folgenden Datierung am 16. Juli 1934 beendet worden.", + "Die Ziffern 1 (Gg), 2 (Kgis), 3 (Ug) und 4 (KUfis) bezeichnen in der Regel den Anfang von Reihenformen gemäß den Reihentabellen Sk3.1.3 und M 317 Sk5 / M 321 Sk1 / M 322 Sk1. Winkel markieren in der Regel deren Ende (┐, ┘) oder Anfang (┌, └)." ], "comments": [ { @@ -1285,35 +1615,59 @@ "linkBoxes": [ { "svgGroupId": "g802", - "linkTo": "M_317_Sk4_1" + "linkTo": { + "complexId": "op25", + "sheetId": "M_317_Sk4_1" + } }, { "svgGroupId": "g1363", - "linkTo": "M_317_Sk4c" + "linkTo": { + "complexId": "op25", + "sheetId": "M_317_Sk4c" + } }, { "svgGroupId": "g1344", - "linkTo": "M_317_Sk4b" + "linkTo": { + "complexId": "op25", + "sheetId": "M_317_Sk4b" + } }, { "svgGroupId": "g1367", - "linkTo": "M_317_Sk4d" + "linkTo": { + "complexId": "op25", + "sheetId": "M_317_Sk4d" + } }, { "svgGroupId": "g1353", - "linkTo": "M_317_Sk4_2" + "linkTo": { + "complexId": "op25", + "sheetId": "M_317_Sk4_2" + } }, { "svgGroupId": "g809", - "linkTo": "M_317_Sk4c" + "linkTo": { + "complexId": "op25", + "sheetId": "M_317_Sk4c" + } }, { "svgGroupId": "g796", - "linkTo": "M_317_Sk4_2" + "linkTo": { + "complexId": "op25", + "sheetId": "M_317_Sk4_2" + } }, { "svgGroupId": "g818", - "linkTo": "M_317_Sk4_3" + "linkTo": { + "complexId": "op25", + "sheetId": "M_317_Sk4_3" + } } ] }, @@ -1321,7 +1675,7 @@ "id": "M_317_Sk4_1", "label": "M 317 Sk4.1", "description": [ - "Sk4.1 formuliert eine rhythmisch-metrische Variante von Sk4 T. 2–3A. Der dort im Klavier offen gelassene Takt 3A wird in Sk4.1 ansatzweise gefüllt, aber dann insgesamt gestrichen (T. {{ '{' }}3{{ '}' }}): möglicherweise auch auf Grund des in skripturaler Hinsicht engen Raumes. Der Takt wird in Sk4 T. 3B weiter ausgearbeitet.
Vor der Niederschrift von Sk4.1 war die Seite am linken Rand von System 14–16 mit einer Akkoladenklammer beschriftet, die offensichtlich einer Präparierung der Fortsetzung von Sk4 nach T. {{ '{' }}1A{{ '}' }}–3A dient. Nach der Niederschrift von Sk4.1 erfolgt die Fortsetzung von Sk4 jedoch auf Bl. 39r (Sk4 T. 3B–6)." + "Sk4.1 formuliert eine rhythmisch-metrische Variante von Sk4 T. 2–3A. Der dort im Klavier offen gelassene Takt 3A wird in Sk4.1 ansatzweise gefüllt, aber dann insgesamt gestrichen (T. {{ '{' }}3{{ '}' }}): möglicherweise auch auf Grund des in skripturaler Hinsicht engen Raumes. Der Takt wird in Sk4 T. 3B weiter ausgearbeitet.
Vor der Niederschrift von Sk4.1 war die Seite am linken Rand von System 14–16 mit einer Akkoladenklammer beschriftet, die offensichtlich einer Präparierung der Fortsetzung von Sk4 nach T. {{ '{' }}1A{{ '}' }}–3A dient. Nach der Niederschrift von Sk4.1 erfolgt die Fortsetzung von Sk4 jedoch auf Bl. 39r (Sk4 T. 3B–6)." ], "comments": [ { @@ -1356,7 +1710,10 @@ "linkBoxes": [ { "svgGroupId": "g604", - "linkTo": "M_317_Sk4a" + "linkTo": { + "complexId": "op25", + "sheetId": "M_317_Sk4a" + } } ] }, @@ -1364,18 +1721,24 @@ "id": "M_317_Sk4_2", "label": "M 317 Sk4.2", "description": [ - "Sk4.2 formuliert vermutlich den Ansatz zu einer Variante der Singstimme in Sk4 T. 13.", + "Sk4.2 formuliert vermutlich den Ansatz zu einer Variante der Singstimme in Sk4 T. 13.", "[Zu dieser Skizze gibt es keine textkritischen Kommentare.]" ], "comments": [], "linkBoxes": [ { "svgGroupId": "g371", - "linkTo": "M_317_Sk4d" + "linkTo": { + "complexId": "op25", + "sheetId": "M_317_Sk4d" + } }, { "svgGroupId": "g388", - "linkTo": "M_317_Sk4c" + "linkTo": { + "complexId": "op25", + "sheetId": "M_317_Sk4c" + } } ] }, @@ -1383,7 +1746,7 @@ "id": "M_317_Sk4_3", "label": "M 317 Sk4.3", "description": [ - "Sk4.3 formuliert eine fragmentarische Variante von Sk4 T. 13." + "Sk4.3 formuliert eine fragmentarische Variante von Sk4 T. 13." ], "comments": [ { @@ -1391,7 +1754,7 @@ "measure": "13", "system": "16", "position": "1. Note", - "comment": "sic: Verweisstrich führt zu Sk4 T. 14. Inhaltlich bezieht sich Sk4.3 jedoch auf Sk4 T. 13. " + "comment": "sic: Verweisstrich führt zu Sk4 T. 14. Inhaltlich bezieht sich Sk4.3 jedoch auf Sk4 T. 13. " }, { "svgGroupId": "g36576", @@ -1404,41 +1767,17 @@ "linkBoxes": [ { "svgGroupId": "g453", - "linkTo": "M_317_Sk4d" + "linkTo": { + "complexId": "op25", + "sheetId": "M_317_Sk4d" + } }, { "svgGroupId": "g466", - "linkTo": "M_317_Sk4c" - } - ] - }, - { - "id": "M_317_TF1", - "label": "M 317 Textfassung 1", - "description": [ - "##Quellenbewertung:## Für die Edition von „Wie bin ich froh!“ M 317 Textfassung 1 sind B und E relevante Quellen.
Korrekturschicht 1 in E etabliert Textfassung 1, wobei dese Überarbeitung vor oder gleichzeitig mit der Niederschrift von B stattgefunden haben dürfte. Korrekturschicht 2 in E betrifft Textfassung 2. Der Zustand von E vor Korrekturschicht 2 lässt sich nicht immer eindeutig entziffern.
Hauptquelle der Textedition von „Wie bin ich froh!“ M 317 Textfassung 1 ist B." - ], - "comments": [ - { - "svgGroupId": "g1145", - "measure": "1", - "system": "", - "position": "4/8", - "comment": "rit. versetzt von ungenauer Position zwischen 4/8 und 5/8 mit Blick auf M 317 Sk4." - }, - { - "svgGroupId": "g1198", - "measure": "3", - "system": "Ges.", - "position": "1. Note", - "comment": "{{ref.getGlyph('[f]')}} versetzt von 1. Pause." - }, - { - "svgGroupId": "g1204", - "measure": "6", - "system": "Ges.", - "position": "1. Note", - "comment": "{{ref.getGlyph('[f]')}} versetzt von 3/8." + "linkTo": { + "complexId": "op25", + "sheetId": "M_317_Sk4c" + } } ] }, @@ -1446,7 +1785,7 @@ "id": "SkRT", "label": "M 317 Sk5 / M 321 Sk1 / M 322 Sk1 (Reihentabelle op. 25)", "description": [ - "Die Reihentabelle op. 25 weist neben den vier bereits in Sk3.1.3 tabellarisch notierten Reihenformen 1–4 die entsprechenden Transpositionen der Unterquint (Reihenformen 5–8) auf, die lediglich im 2. Lied (M 322) kompositorisch verwendet werden." + "Die Reihentabelle op. 25 weist neben den vier bereits in Sk3.1.3 tabellarisch notierten Reihenformen 1–4 die entsprechenden Transpositionen der Unterquint (Reihenformen 5–8) auf, die lediglich im 2. Lied (M 322) kompositorisch verwendet werden." ], "rowtable": true, "comments": [ diff --git a/src/assets/data/edition/series/2/section/2a/m30/folio-convolute.json b/src/assets/data/edition/series/2/section/2a/m30/folio-convolute.json index 12e5cd8e03..b4293114e9 100644 --- a/src/assets/data/edition/series/2/section/2a/m30/folio-convolute.json +++ b/src/assets/data/edition/series/2/section/2a/m30/folio-convolute.json @@ -11,7 +11,132 @@ "height": 349, "width": 265 }, - "content": [] + "content": [ + { + "complexId": "m31", + "sheetId": "M_31_Sk3c", + "sigle": "M 31 Sk3", + "sigleAddendum": "T. 11–16", + "sectionPartition": 1, + "sections": [ + { + "startSystem": 1, + "endSystem": 2 + } + ] + }, + { + "complexId": "m31", + "sheetId": "M_31_Sk3d", + "sigle": "M 31 Sk3", + "sigleAddendum": "T. 17–18", + "sectionPartition": 3, + "sections": [ + { + "position": 1, + "startSystem": 5, + "endSystem": 6 + } + ] + }, + { + "complexId": "m31", + "sheetId": "M_31_Sk3_1", + "sigle": "M 31 Sk3.1", + "sigleAddendum": "T. 10+1", + "sectionPartition": 3, + "sections": [ + { + "position": 2, + "startSystem": 5, + "endSystem": 6 + } + ] + }, + { + "complexId": "m31", + "sheetId": "M_31_Sk3_2", + "sigle": "M 31 Sk3.2", + "sigleAddendum": "T. 17–18", + "sectionPartition": 3, + "sections": [ + { + "position": 3, + "startSystem": 5, + "endSystem": 6 + } + ] + }, + { + "complexId": "m31", + "sheetId": "M_31_Sk4a", + "sigle": "M 31 Sk4", + "sigleAddendum": "T. 12–15, {16A–18A}", + "sectionPartition": 1, + "sections": [ + { + "startSystem": 8, + "endSystem": 9 + } + ] + }, + { + "complexId": "m31", + "sheetId": "M_31_Sk4b", + "sigle": "M 31 Sk4", + "sigleAddendum": "T. {19A, 19B}", + "sectionPartition": 1, + "sections": [ + { + "startSystem": 10, + "endSystem": 11 + } + ] + }, + { + "complexId": "m31", + "sheetId": "M_31_Sk4c", + "sigle": "M 31 Sk4", + "sigleAddendum": "T. {16B–18B}, 16C–17C", + "sectionPartition": 1, + "sections": [ + { + "startSystem": 13, + "endSystem": 14 + } + ] + }, + { + "complexId": "m_plus403", + "sheetId": "M*_403_Sk1a", + "sigle": "M* 403 Sk1", + "sigleAddendum": "T. 1–10", + "selectable": false, + "linkTo": "VOL_2A_EDITION_COMING_SOON", + "sectionPartition": 1, + "sections": [ + { + "startSystem": 16, + "endSystem": 17 + } + ] + }, + { + "complexId": "m_plus403", + "sheetId": "M*_403_Sk1b", + "sigle": "M* 403 Sk1", + "sigleAddendum": "T. 11–15", + "selectable": false, + "linkTo": "VOL_2A_EDITION_COMING_SOON", + "sectionPartition": 1, + "sections": [ + { + "startSystem": 18, + "endSystem": 18 + } + ] + } + ] }, { "folioId": "1v", @@ -22,7 +147,8 @@ }, "content": [ { - "id": "M_30_Sk1a", + "complexId": "m30", + "sheetId": "M_30_Sk1a", "sigle": "M 30 Sk1", "sigleAddendum": "T. 1–6", "sectionPartition": 1, @@ -34,7 +160,8 @@ ] }, { - "id": "M_30_Sk1b", + "complexId": "m30", + "sheetId": "M_30_Sk1b", "sigle": "M 30 Sk1", "sigleAddendum": "T. {7A–10B}", "sectionPartition": 1, @@ -46,7 +173,8 @@ ] }, { - "id": "M_30_Sk1c", + "complexId": "m30", + "sheetId": "M_30_Sk1c", "sigle": "M 30 Sk1", "sigleAddendum": "T. {11A–16A}", "sectionPartition": 1, @@ -58,7 +186,8 @@ ] }, { - "id": "M_30_Sk1d", + "complexId": "m30", + "sheetId": "M_30_Sk1d", "sigle": "M 30 Sk1", "sigleAddendum": "T. 7B–8B, 9C–10C", "sectionPartition": 1, @@ -70,7 +199,8 @@ ] }, { - "id": "M_30_Sk1e", + "complexId": "m30", + "sheetId": "M_30_Sk1e", "sigle": "M 30 Sk1", "sigleAddendum": "T. {9D–12B}", "sectionPartition": 1, @@ -82,7 +212,8 @@ ] }, { - "id": "M_30_Sk1f", + "complexId": "m30", + "sheetId": "M_30_Sk1f", "sigle": "M 30 Sk1", "sigleAddendum": "T. 9E–{15B}", "sectionPartition": 1, @@ -94,7 +225,8 @@ ] }, { - "id": "M_30_Sk1g", + "complexId": "m30", + "sheetId": "M_30_Sk1g", "sigle": "M 30 Sk1", "sigleAddendum": "T. 16B–15C", "sectionPartition": 1, @@ -114,7 +246,109 @@ "height": 349, "width": 265 }, - "content": [] + "content": [ + { + "complexId": "m31", + "sheetId": "M_31_Sk5a", + "sigle": "M 31 Sk5", + "sigleAddendum": "T. {20–24}", + "sectionPartition": 1, + "sections": [ + { + "startSystem": 1, + "endSystem": 2 + } + ] + }, + { + "complexId": "m31", + "sheetId": "M_31_Sk5b", + "sigle": "M 31 Sk5", + "sigleAddendum": "T. {25–29}", + "sectionPartition": 1, + "sections": [ + { + "startSystem": 4, + "endSystem": 5 + } + ] + }, + { + "complexId": "m31", + "sheetId": "M_31_Sk5c", + "sigle": "M 31 Sk5", + "sigleAddendum": "T. {30}", + "sectionPartition": 2, + "sections": [ + { + "position": 1, + "startSystem": 7, + "endSystem": 8 + } + ] + }, + { + "complexId": "m_plus403", + "sheetId": "M*_403_Sk2a", + "sigle": "M* 403 Sk2", + "sigleAddendum": "T. 1–8", + "selectable": false, + "linkTo": "VOL_2A_EDITION_COMING_SOON", + "sectionPartition": 1, + "sections": [ + { + "startSystem": 12, + "endSystem": 15 + } + ] + }, + { + "complexId": "m_plus403", + "sheetId": "M*_403_Sk2b", + "sigle": "M* 403 Sk2", + "sigleAddendum": "T. 9–12", + "selectable": false, + "linkTo": "VOL_2A_EDITION_COMING_SOON", + "sectionPartition": 1, + "sections": [ + { + "startSystem": 10, + "endSystem": 11 + } + ] + }, + { + "complexId": "m_plus403", + "sheetId": "M*_403_Sk2c", + "sigle": "M* 403 Sk2", + "sigleAddendum": "T. 13–15", + "selectable": false, + "linkTo": "VOL_2A_EDITION_COMING_SOON", + "sectionPartition": 2, + "sections": [ + { + "position": 2, + "startSystem": 7, + "endSystem": 8 + } + ] + }, + { + "complexId": "m_plus403", + "sheetId": "M*_403_Sk2d", + "sigle": "M* 403 Sk2", + "sigleAddendum": "T. x+16 bis x+23", + "selectable": false, + "linkTo": "VOL_2A_EDITION_COMING_SOON", + "sectionPartition": 1, + "sections": [ + { + "startSystem": 16, + "endSystem": 17 + } + ] + } + ] }, { "folioId": "2v", @@ -125,7 +359,8 @@ }, "content": [ { - "id": "M_30_Sk1h", + "complexId": "m30", + "sheetId": "M_30_Sk1h", "sigle": "M 30 Sk1", "sigleAddendum": "T. 17–21", "sectionPartition": 1, @@ -137,7 +372,8 @@ ] }, { - "id": "M_30_Sk1i", + "complexId": "m30", + "sheetId": "M_30_Sk1i", "sigle": "M 30 Sk1", "sigleAddendum": "T. 22–25(1–3/8)", "sectionPartition": 1, @@ -149,7 +385,8 @@ ] }, { - "id": "M_30_Sk1j", + "complexId": "m30", + "sheetId": "M_30_Sk1j", "sigle": "M 30 Sk1", "sigleAddendum": "T. 25(4–6/8)–29B", "sectionPartition": 1, @@ -161,7 +398,8 @@ ] }, { - "id": "M_30_Sk1k", + "complexId": "m30", + "sheetId": "M_30_Sk1k", "sigle": "M 30 Sk1", "sigleAddendum": "T. 28C–29C", "sectionPartition": 2, @@ -172,6 +410,74 @@ "endSystem": 11 } ] + }, + { + "complexId": "m31", + "sheetId": "M_31_Sk1a", + "sigle": "M 31 Sk1", + "sigleAddendum": "T. 1–4", + "sectionPartition": 2, + "sections": [ + { + "position": 2, + "startSystem": 10, + "endSystem": 10 + } + ] + }, + { + "complexId": "m31", + "sheetId": "M_31_Sk1b", + "sigle": "M 31 Sk1", + "sigleAddendum": "T. 5–9", + "sectionPartition": 2, + "sections": [ + { + "position": 2, + "startSystem": 11, + "endSystem": 11 + } + ] + }, + { + "complexId": "m31", + "sheetId": "M_31_Sk2", + "sigle": "M 31 Sk2", + "sigleAddendum": "T. x+1 bis x+4", + "sectionPartition": 2, + "sections": [ + { + "position": 2, + "startSystem": 13, + "endSystem": 13 + } + ] + }, + { + "complexId": "m31", + "sheetId": "M_31_Sk3a", + "sigle": "M 31 Sk3", + "sigleAddendum": "T. 1–5", + "sectionPartition": 1, + "sections": [ + { + "startSystem": 15, + "endSystem": 16 + } + ] + }, + { + "complexId": "m31", + "sheetId": "M_31_Sk3b", + "sigle": "M 31 Sk3", + "sigleAddendum": "T. 6–10", + "sectionPartition": 1, + "sections": [ + { + "startSystem": 17, + "endSystem": 18 + } + ] } ] } diff --git a/src/assets/data/edition/series/2/section/2a/m30/source-description.json b/src/assets/data/edition/series/2/section/2a/m30/source-description.json index b4251a590e..a06dc3690e 100644 --- a/src/assets/data/edition/series/2/section/2a/m30/source-description.json +++ b/src/assets/data/edition/series/2/section/2a/m30/source-description.json @@ -24,7 +24,10 @@ "content": [ { "item": "M 31 Sk3", - "itemLinkTo": "", + "itemLinkTo": { + "complexId": "m31", + "sheetId": "M_31_Sk3c" + }, "itemDescription": "(Skizze zu Studienkomposition für Klavier M 31)", "folios": [ { @@ -36,14 +39,14 @@ { "system": "1–2", "measure": "11–16", - "linkTo": "" + "linkTo": "M_31_Sk3c" } ], [ { "system": "5a–6a", "measure": "17–18", - "linkTo": "" + "linkTo": "M_31_Sk3d" } ] ] @@ -52,7 +55,10 @@ }, { "item": "M 31 Sk3.1", - "itemLinkTo": "", + "itemLinkTo": { + "complexId": "m31", + "sheetId": "M_31_Sk3_1" + }, "itemDescription": "(Skizze zu Studienkomposition für Klavier M 31)", "folios": [ { @@ -73,7 +79,10 @@ }, { "item": "M 31 Sk3.2", - "itemLinkTo": "", + "itemLinkTo": { + "complexId": "m31", + "sheetId": "M_31_Sk3_2" + }, "itemDescription": "(Skizze zu Studienkomposition für Klavier M 31)", "folios": [ { @@ -84,7 +93,7 @@ [ { "system": "5c–6c", - "measure": "17–8", + "measure": "17–18", "linkTo": "" } ] @@ -94,7 +103,10 @@ }, { "item": "M 31 Sk4", - "itemLinkTo": "", + "itemLinkTo": { + "complexId": "m31", + "sheetId": "M_31_Sk4" + }, "itemDescription": "(Skizze zu Studienkomposition für Klavier M 31)", "folios": [ { @@ -106,21 +118,21 @@ { "system": "8–9", "measure": "12–15, {16A–18A}", - "linkTo": "" + "linkTo": "M_31_Sk4a" } ], [ { "system": "10–11", "measure": "{19A, 19B}", - "linkTo": "" + "linkTo": "M_31_Sk4b" } ], [ { "system": "13–14", "measure": "{16B–18B}, 16C–17C", - "linkTo": "" + "linkTo": "M_31_Sk4c" } ] ] @@ -129,7 +141,7 @@ }, { "item": "M* 403 Sk1", - "itemLinkTo": "", + "itemLinkTo": {}, "itemDescription": "(Skizze zu Studienkomposition für Klavier M* 403)", "folios": [ { @@ -157,7 +169,10 @@ }, { "item": "M 30 Sk1", - "itemLinkTo": "M_30_Sk1", + "itemLinkTo": { + "complexId": "m30", + "sheetId": "M_30_Sk1" + }, "itemDescription": "(Skizze zu Studienkomposition für Klavier M 30)", "folios": [ { @@ -220,7 +235,10 @@ }, { "item": "M 31 Sk5", - "itemLinkTo": "", + "itemLinkTo": { + "complexId": "m31", + "sheetId": "M_31_Sk5" + }, "itemDescription": "(Skizze zu Studienkomposition für Klavier M 31)", "folios": [ { @@ -232,21 +250,21 @@ { "system": "1–2", "measure": "{20–24}", - "linkTo": "" + "linkTo": "M_31_Sk5a" } ], [ { "system": "4–5", "measure": "{25–26, 27A, 27B, 28–29}", - "linkTo": "" + "linkTo": "M_31_Sk5b" } ], [ { "system": "7a–8a", "measure": "{30}", - "linkTo": "" + "linkTo": "M_31_Sk5c" } ] ] @@ -255,7 +273,7 @@ }, { "item": "M* 403 Sk2", - "itemLinkTo": "", + "itemLinkTo": {}, "itemDescription": "(Skizze zu Studienkomposition für Klavier M* 403)", "folios": [ { @@ -297,7 +315,10 @@ }, { "item": "M 30 Sk1", - "itemLinkTo": "M_30_Sk1", + "itemLinkTo": { + "complexId": "m30", + "sheetId": "M_30_Sk1h" + }, "itemDescription": "(Skizze zu Studienkomposition für Klavier M 30)", "folios": [ { @@ -339,7 +360,10 @@ }, { "item": "M 31 Sk1", - "itemLinkTo": "", + "itemLinkTo": { + "complexId": "m31", + "sheetId": "M_31_Sk1" + }, "itemDescription": "(Skizze zu Studienkomposition für Klavier M 31)", "folios": [ { @@ -351,14 +375,14 @@ { "system": "10b", "measure": "1–4", - "linkTo": "" + "linkTo": "M_31_Sk1a" } ], [ { "system": "11b", "measure": "5–9", - "linkTo": "" + "linkTo": "M_31_Sk1b" } ] ] @@ -367,7 +391,10 @@ }, { "item": "M 31 Sk2", - "itemLinkTo": "", + "itemLinkTo": { + "complexId": "m31", + "sheetId": "M_31_Sk2" + }, "itemDescription": "(Skizze zu Studienkomposition für Klavier M 31)", "folios": [ { @@ -388,7 +415,10 @@ }, { "item": "M 31 Sk3", - "itemLinkTo": "", + "itemLinkTo": { + "complexId": "m31", + "sheetId": "M_31_Sk3" + }, "itemDescription": "(Skizze zu Studienkomposition für Klavier M 31)", "folios": [ { @@ -400,14 +430,14 @@ { "system": "15–16", "measure": "1–5", - "linkTo": "" + "linkTo": "M_31_Sk3a" } ], [ { "system": "17–18", "measure": "6–10", - "linkTo": "" + "linkTo": "M_31_Sk3b" } ] ] @@ -425,7 +455,7 @@ "location": "CH-Bps, Sammlung Anton Webern.", "description": { "desc": ["1 Blatt. Schnittspuren am rechten Rand: von Bogen abgeschnitten."], - "writingMaterial": "Notenpapier, 18 Systeme, Format: hoch 347 × 265 mm, Firmenzeichen: [J.E. & Co.] | No. 5 | 18 linig. unten links auf Bl. 1v.", + "writingMaterial": "Notenpapier, 18 Systeme, Format: hoch 347 × 265 mm, Firmenzeichen:

unten links auf Bl. 1v.", "writingInstruments": { "main": "schwarze Tinte", "secondary": ["Bleistift"] @@ -439,7 +469,10 @@ "content": [ { "item": "M 31", - "itemLinkTo": "", + "itemLinkTo": { + "complexId": "m31", + "sheetId": "M_31_TF1" + }, "itemDescription": "(Tintenniederschrift von Studienkomposition für Klavier M 31)", "folios": [ { @@ -495,7 +528,10 @@ }, { "item": "M 30", - "itemLinkTo": "", + "itemLinkTo": { + "complexId": "m30", + "sheetId": "M_30_TF1" + }, "itemDescription": "(Tintenniederschrift von Studienkomposition für Klavier M 30)", "folios": [ { @@ -544,7 +580,7 @@ }, { "item": "M* 402 Sk1", - "itemLinkTo": "", + "itemLinkTo": {}, "itemDescription": "(Skizze zu Studienkomposition für Klavier M* 402)", "folios": [ { diff --git a/src/assets/data/edition/series/2/section/2a/m30/svg-sheets.json b/src/assets/data/edition/series/2/section/2a/m30/svg-sheets.json index 58b224f033..65520e2bcb 100644 --- a/src/assets/data/edition/series/2/section/2a/m30/svg-sheets.json +++ b/src/assets/data/edition/series/2/section/2a/m30/svg-sheets.json @@ -1,7 +1,25 @@ { "sheets": { "workEditions": [], - "textEditions": [], + "textEditions": [ + { + "id": "M_30_TF1", + "label": "M 30 einzige Textfassung", + "content": [ + { + "svg": "assets/img/edition/series/2/section/2a/m30/M30_Textfassung1-1von2-final.svg", + "image": "", + "partial": "a" + }, + { + "svg": "assets/img/edition/series/2/section/2a/m30/M30_Textfassung1-2von2-final.svg", + "image": "", + "partial": "b" + } + ], + "convolute": "" + } + ], "sketchEditions": [ { "id": "M_30_Sk1", diff --git a/src/assets/data/edition/series/2/section/2a/m30/textcritics.json b/src/assets/data/edition/series/2/section/2a/m30/textcritics.json index c7bec90113..f67bcfa32a 100644 --- a/src/assets/data/edition/series/2/section/2a/m30/textcritics.json +++ b/src/assets/data/edition/series/2/section/2a/m30/textcritics.json @@ -1,5 +1,56 @@ { "textcritics": [ + { + "id": "M_30_TF1", + "label": "M 30 einzige Textfassung", + "description": [ + "##Quellenbewertung:## Für die Textedition der Studienkomposition für Klavier M 31 ist B relevante Quelle. A enthält Skizzen.
B weist zwei unterscheidbare Korrekturschichten auf: Korrekturen 1 mit Tinte sowie die später entstandenen Korrekturen 2 mit Bleistift. Der Zustand vor Korrekturen 1 ist nicht immer zu entziffern.
Hauptquelle für die Textedition der Studienkomposition für Klavier M 31 ist B nach Korrekturen 1." + ], + "comments": [ + { + "svgGroupId": "g2815", + "measure": "8", + "system": "Klav. u.", + "position": "2/8", + "comment": "Oberstimmenschicht: Augmentationspunkt weggelassen mit Blick auf metrischen Kontext." + }, + { + "svgGroupId": "g6275", + "measure": "14", + "system": "Klav. o.", + "position": "6/8", + "comment": "Unterstimmenschicht: Hilfslinie unter dem Notenkopf weggelassen (vgl. auch Korrekturen mit Bleistift)." + }, + { + "svgGroupId": "g6279", + "measure": "15", + "system": "Klav. u.", + "position": "4/8", + "comment": "Gemeinsamer Notenkopf für Ober- und Unterstimmenschicht korrigiert zu zwei separate Notenköpfe." + }, + { + "svgGroupId": "g6283", + "measure": "20", + "system": "Klav. u.", + "position": "1–2/8", + "comment": "Oberstimmenschicht: Viertelnoten b/es1–a/es1 korrigiert zu Achtelnoten mit Blick auf metrischen Kontext." + }, + { + "svgGroupId": "g6318", + "measure": "22", + "system": "Klav. u.", + "position": "1–3/8", + "comment": "sic." + }, + { + "svgGroupId": "g6321", + "measure": "24", + "system": "Klav.", + "position": "Taktende", + "comment": "sic. B: Kein Schlussstrich vorhanden (vgl. auch Sk1)." + } + ] + }, { "id": "M_30_Sk1", "label": "M 30 Sk1", @@ -406,6 +457,22 @@ "position": "(1/4)", "comment": "Viertelnote As/es gestrichen." } + ], + "linkBoxes": [ + { + "svgGroupId": "g5", + "linkTo": { + "complexId": "m31", + "sheetId": "M_31_Sk1a" + } + }, + { + "svgGroupId": "g6", + "linkTo": { + "complexId": "m31", + "sheetId": "M_31_Sk1b" + } + } ] } ] diff --git a/src/assets/data/edition/series/2/section/2a/m31/folio-convolute.json b/src/assets/data/edition/series/2/section/2a/m31/folio-convolute.json new file mode 100644 index 0000000000..b4293114e9 --- /dev/null +++ b/src/assets/data/edition/series/2/section/2a/m31/folio-convolute.json @@ -0,0 +1,492 @@ +{ + "convolutes": [ + { + "convoluteId": "A", + "convoluteLabel": "A Skizzen (CH-Bps)", + "folios": [ + { + "folioId": "1r", + "systems": "18", + "format": { + "height": 349, + "width": 265 + }, + "content": [ + { + "complexId": "m31", + "sheetId": "M_31_Sk3c", + "sigle": "M 31 Sk3", + "sigleAddendum": "T. 11–16", + "sectionPartition": 1, + "sections": [ + { + "startSystem": 1, + "endSystem": 2 + } + ] + }, + { + "complexId": "m31", + "sheetId": "M_31_Sk3d", + "sigle": "M 31 Sk3", + "sigleAddendum": "T. 17–18", + "sectionPartition": 3, + "sections": [ + { + "position": 1, + "startSystem": 5, + "endSystem": 6 + } + ] + }, + { + "complexId": "m31", + "sheetId": "M_31_Sk3_1", + "sigle": "M 31 Sk3.1", + "sigleAddendum": "T. 10+1", + "sectionPartition": 3, + "sections": [ + { + "position": 2, + "startSystem": 5, + "endSystem": 6 + } + ] + }, + { + "complexId": "m31", + "sheetId": "M_31_Sk3_2", + "sigle": "M 31 Sk3.2", + "sigleAddendum": "T. 17–18", + "sectionPartition": 3, + "sections": [ + { + "position": 3, + "startSystem": 5, + "endSystem": 6 + } + ] + }, + { + "complexId": "m31", + "sheetId": "M_31_Sk4a", + "sigle": "M 31 Sk4", + "sigleAddendum": "T. 12–15, {16A–18A}", + "sectionPartition": 1, + "sections": [ + { + "startSystem": 8, + "endSystem": 9 + } + ] + }, + { + "complexId": "m31", + "sheetId": "M_31_Sk4b", + "sigle": "M 31 Sk4", + "sigleAddendum": "T. {19A, 19B}", + "sectionPartition": 1, + "sections": [ + { + "startSystem": 10, + "endSystem": 11 + } + ] + }, + { + "complexId": "m31", + "sheetId": "M_31_Sk4c", + "sigle": "M 31 Sk4", + "sigleAddendum": "T. {16B–18B}, 16C–17C", + "sectionPartition": 1, + "sections": [ + { + "startSystem": 13, + "endSystem": 14 + } + ] + }, + { + "complexId": "m_plus403", + "sheetId": "M*_403_Sk1a", + "sigle": "M* 403 Sk1", + "sigleAddendum": "T. 1–10", + "selectable": false, + "linkTo": "VOL_2A_EDITION_COMING_SOON", + "sectionPartition": 1, + "sections": [ + { + "startSystem": 16, + "endSystem": 17 + } + ] + }, + { + "complexId": "m_plus403", + "sheetId": "M*_403_Sk1b", + "sigle": "M* 403 Sk1", + "sigleAddendum": "T. 11–15", + "selectable": false, + "linkTo": "VOL_2A_EDITION_COMING_SOON", + "sectionPartition": 1, + "sections": [ + { + "startSystem": 18, + "endSystem": 18 + } + ] + } + ] + }, + { + "folioId": "1v", + "systems": "18", + "format": { + "height": 349, + "width": 265 + }, + "content": [ + { + "complexId": "m30", + "sheetId": "M_30_Sk1a", + "sigle": "M 30 Sk1", + "sigleAddendum": "T. 1–6", + "sectionPartition": 1, + "sections": [ + { + "startSystem": 1, + "endSystem": 2 + } + ] + }, + { + "complexId": "m30", + "sheetId": "M_30_Sk1b", + "sigle": "M 30 Sk1", + "sigleAddendum": "T. {7A–10B}", + "sectionPartition": 1, + "sections": [ + { + "startSystem": 4, + "endSystem": 5 + } + ] + }, + { + "complexId": "m30", + "sheetId": "M_30_Sk1c", + "sigle": "M 30 Sk1", + "sigleAddendum": "T. {11A–16A}", + "sectionPartition": 1, + "sections": [ + { + "startSystem": 7, + "endSystem": 9 + } + ] + }, + { + "complexId": "m30", + "sheetId": "M_30_Sk1d", + "sigle": "M 30 Sk1", + "sigleAddendum": "T. 7B–8B, 9C–10C", + "sectionPartition": 1, + "sections": [ + { + "startSystem": 9, + "endSystem": 11 + } + ] + }, + { + "complexId": "m30", + "sheetId": "M_30_Sk1e", + "sigle": "M 30 Sk1", + "sigleAddendum": "T. {9D–12B}", + "sectionPartition": 1, + "sections": [ + { + "startSystem": 13, + "endSystem": 13 + } + ] + }, + { + "complexId": "m30", + "sheetId": "M_30_Sk1f", + "sigle": "M 30 Sk1", + "sigleAddendum": "T. 9E–{15B}", + "sectionPartition": 1, + "sections": [ + { + "startSystem": 14, + "endSystem": 15 + } + ] + }, + { + "complexId": "m30", + "sheetId": "M_30_Sk1g", + "sigle": "M 30 Sk1", + "sigleAddendum": "T. 16B–15C", + "sectionPartition": 1, + "sections": [ + { + "startSystem": 16, + "endSystem": 18 + } + ] + } + ] + }, + { + "folioId": "2r", + "systems": "18", + "format": { + "height": 349, + "width": 265 + }, + "content": [ + { + "complexId": "m31", + "sheetId": "M_31_Sk5a", + "sigle": "M 31 Sk5", + "sigleAddendum": "T. {20–24}", + "sectionPartition": 1, + "sections": [ + { + "startSystem": 1, + "endSystem": 2 + } + ] + }, + { + "complexId": "m31", + "sheetId": "M_31_Sk5b", + "sigle": "M 31 Sk5", + "sigleAddendum": "T. {25–29}", + "sectionPartition": 1, + "sections": [ + { + "startSystem": 4, + "endSystem": 5 + } + ] + }, + { + "complexId": "m31", + "sheetId": "M_31_Sk5c", + "sigle": "M 31 Sk5", + "sigleAddendum": "T. {30}", + "sectionPartition": 2, + "sections": [ + { + "position": 1, + "startSystem": 7, + "endSystem": 8 + } + ] + }, + { + "complexId": "m_plus403", + "sheetId": "M*_403_Sk2a", + "sigle": "M* 403 Sk2", + "sigleAddendum": "T. 1–8", + "selectable": false, + "linkTo": "VOL_2A_EDITION_COMING_SOON", + "sectionPartition": 1, + "sections": [ + { + "startSystem": 12, + "endSystem": 15 + } + ] + }, + { + "complexId": "m_plus403", + "sheetId": "M*_403_Sk2b", + "sigle": "M* 403 Sk2", + "sigleAddendum": "T. 9–12", + "selectable": false, + "linkTo": "VOL_2A_EDITION_COMING_SOON", + "sectionPartition": 1, + "sections": [ + { + "startSystem": 10, + "endSystem": 11 + } + ] + }, + { + "complexId": "m_plus403", + "sheetId": "M*_403_Sk2c", + "sigle": "M* 403 Sk2", + "sigleAddendum": "T. 13–15", + "selectable": false, + "linkTo": "VOL_2A_EDITION_COMING_SOON", + "sectionPartition": 2, + "sections": [ + { + "position": 2, + "startSystem": 7, + "endSystem": 8 + } + ] + }, + { + "complexId": "m_plus403", + "sheetId": "M*_403_Sk2d", + "sigle": "M* 403 Sk2", + "sigleAddendum": "T. x+16 bis x+23", + "selectable": false, + "linkTo": "VOL_2A_EDITION_COMING_SOON", + "sectionPartition": 1, + "sections": [ + { + "startSystem": 16, + "endSystem": 17 + } + ] + } + ] + }, + { + "folioId": "2v", + "systems": "18", + "format": { + "height": 349, + "width": 265 + }, + "content": [ + { + "complexId": "m30", + "sheetId": "M_30_Sk1h", + "sigle": "M 30 Sk1", + "sigleAddendum": "T. 17–21", + "sectionPartition": 1, + "sections": [ + { + "startSystem": 1, + "endSystem": 2 + } + ] + }, + { + "complexId": "m30", + "sheetId": "M_30_Sk1i", + "sigle": "M 30 Sk1", + "sigleAddendum": "T. 22–25(1–3/8)", + "sectionPartition": 1, + "sections": [ + { + "startSystem": 4, + "endSystem": 5 + } + ] + }, + { + "complexId": "m30", + "sheetId": "M_30_Sk1j", + "sigle": "M 30 Sk1", + "sigleAddendum": "T. 25(4–6/8)–29B", + "sectionPartition": 1, + "sections": [ + { + "startSystem": 7, + "endSystem": 8 + } + ] + }, + { + "complexId": "m30", + "sheetId": "M_30_Sk1k", + "sigle": "M 30 Sk1", + "sigleAddendum": "T. 28C–29C", + "sectionPartition": 2, + "sections": [ + { + "position": 1, + "startSystem": 10, + "endSystem": 11 + } + ] + }, + { + "complexId": "m31", + "sheetId": "M_31_Sk1a", + "sigle": "M 31 Sk1", + "sigleAddendum": "T. 1–4", + "sectionPartition": 2, + "sections": [ + { + "position": 2, + "startSystem": 10, + "endSystem": 10 + } + ] + }, + { + "complexId": "m31", + "sheetId": "M_31_Sk1b", + "sigle": "M 31 Sk1", + "sigleAddendum": "T. 5–9", + "sectionPartition": 2, + "sections": [ + { + "position": 2, + "startSystem": 11, + "endSystem": 11 + } + ] + }, + { + "complexId": "m31", + "sheetId": "M_31_Sk2", + "sigle": "M 31 Sk2", + "sigleAddendum": "T. x+1 bis x+4", + "sectionPartition": 2, + "sections": [ + { + "position": 2, + "startSystem": 13, + "endSystem": 13 + } + ] + }, + { + "complexId": "m31", + "sheetId": "M_31_Sk3a", + "sigle": "M 31 Sk3", + "sigleAddendum": "T. 1–5", + "sectionPartition": 1, + "sections": [ + { + "startSystem": 15, + "endSystem": 16 + } + ] + }, + { + "complexId": "m31", + "sheetId": "M_31_Sk3b", + "sigle": "M 31 Sk3", + "sigleAddendum": "T. 6–10", + "sectionPartition": 1, + "sections": [ + { + "startSystem": 17, + "endSystem": 18 + } + ] + } + ] + } + ] + }, + { + "convoluteId": "B", + "convoluteLabel": "B Tintenniederschrift (CH-Bps)", + "folios": [] + } + ] +} diff --git a/src/assets/data/edition/series/2/section/2a/m31/graph.json b/src/assets/data/edition/series/2/section/2a/m31/graph.json new file mode 100644 index 0000000000..6716ac89e8 --- /dev/null +++ b/src/assets/data/edition/series/2/section/2a/m31/graph.json @@ -0,0 +1,13 @@ +{ + "graph": [ + { + "id": "m31", + "title": "Skizzengraph M 31", + "description": [], + "rdfData": { + "queryList": [], + "triples": "" + } + } + ] +} diff --git a/src/assets/data/edition/series/2/section/2a/m31/intro.json b/src/assets/data/edition/series/2/section/2a/m31/intro.json new file mode 100644 index 0000000000..2ff6aa7acb --- /dev/null +++ b/src/assets/data/edition/series/2/section/2a/m31/intro.json @@ -0,0 +1,8 @@ +{ + "intro": [ + { + "id": "m31", + "content": [] + } + ] +} diff --git a/src/assets/data/edition/series/2/section/2a/m31/source-description.json b/src/assets/data/edition/series/2/section/2a/m31/source-description.json new file mode 100644 index 0000000000..7d3c8bf6c1 --- /dev/null +++ b/src/assets/data/edition/series/2/section/2a/m31/source-description.json @@ -0,0 +1,613 @@ +{ + "sources": [ + { + "id": "source_A", + "siglum": "A", + "siglumAddendum": "", + "type": "Skizzen.", + "location": "CH-Bps, Sammlung Anton Webern.", + "description": { + "desc": [ + "2 Blätter (Bl. 1–2). Schnittspuren am rechten Rand von Bl. 1: von Bogen abgeschnitten. Riss unten Mitte sowie Ecke oben links abgetrennt auf Bl. 1. Rissspuren am rechten Rand von Bl. 2: von Bogen abgetrennt. Kleiner Risse am linken Rand von Bl. 2." + ], + "writingMaterial": "Notenpapier, 18 Systeme, Format: hoch 349 × 265 mm, Firmenzeichen: [J.E. & Co.] | No. 5 | 18 linig. unten links auf Bl. 1v–2v.", + "writingInstruments": { + "main": "Bleistift", + "secondary": [] + }, + "title": "", + "date": "", + "pagination": "", + "measureNumbers": "", + "instrumentation": "", + "annotations": "", + "content": [ + { + "item": "M 31 Sk3", + "itemLinkTo": { + "complexId": "m31", + "sheetId": "M_31_Sk3c" + }, + "itemDescription": "(Skizze zu Studienkomposition für Klavier M 31)", + "folios": [ + { + "folio": "1r", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "1–2", + "measure": "11–16", + "linkTo": "M_31_Sk3c" + } + ], + [ + { + "system": "5a–6a", + "measure": "17–18", + "linkTo": "M_31_Sk3d" + } + ] + ] + } + ] + }, + { + "item": "M 31 Sk3.1", + "itemLinkTo": { + "complexId": "m31", + "sheetId": "M_31_Sk3_1" + }, + "itemDescription": "(Skizze zu Studienkomposition für Klavier M 31)", + "folios": [ + { + "folio": "1r", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "5b–6b", + "measure": "10+1", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M 31 Sk3.2", + "itemLinkTo": { + "complexId": "m31", + "sheetId": "M_31_Sk3_2" + }, + "itemDescription": "(Skizze zu Studienkomposition für Klavier M 31)", + "folios": [ + { + "folio": "1r", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "5c–6c", + "measure": "17–18", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M 31 Sk4", + "itemLinkTo": { + "complexId": "m31", + "sheetId": "M_31_Sk4" + }, + "itemDescription": "(Skizze zu Studienkomposition für Klavier M 31)", + "folios": [ + { + "folio": "1r", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "8–9", + "measure": "12–15, {16A–18A}", + "linkTo": "M_31_Sk4a" + } + ], + [ + { + "system": "10–11", + "measure": "{19A, 19B}", + "linkTo": "M_31_Sk4b" + } + ], + [ + { + "system": "13–14", + "measure": "{16B–18B}, 16C–17C", + "linkTo": "M_31_Sk4c" + } + ] + ] + } + ] + }, + { + "item": "M* 403 Sk1", + "itemLinkTo": {}, + "itemDescription": "(Skizze zu Studienkomposition für Klavier M* 403)", + "folios": [ + { + "folio": "1r", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "16–17", + "measure": "1–10", + "linkTo": "" + } + ], + [ + { + "system": "18", + "measure": "11–15", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M 30 Sk1", + "itemLinkTo": { + "complexId": "m30", + "sheetId": "M_30_Sk1" + }, + "itemDescription": "(Skizze zu Studienkomposition für Klavier M 30)", + "folios": [ + { + "folio": "1v", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "1–2", + "measure": "1–6", + "linkTo": "M_30_Sk1a" + } + ], + [ + { + "system": "4–5", + "measure": "{7A–10A, 9B–10B}", + "linkTo": "M_30_Sk1b" + } + ], + [ + { + "system": "7–9", + "measure": "{11A–16A}", + "linkTo": "M_30_Sk1c" + } + ], + [ + { + "system": "9–11", + "measure": "7B–8B, 9C–10C", + "linkTo": "M_30_Sk1d" + } + ], + [ + { + "system": "13", + "measure": "{9D–12B}", + "linkTo": "M_30_Sk1e" + } + ], + [ + { + "system": "14–15", + "measure": "9E–10E, 11C–12C, {13B–15B}", + "linkTo": "M_30_Sk1f" + } + ], + [ + { + "system": "16–18", + "measure": "16B, {13C}, 13D, 14C–15C", + "linkTo": "M_30_Sk1g" + } + ] + ] + } + ] + }, + { + "item": "M 31 Sk5", + "itemLinkTo": { + "complexId": "m31", + "sheetId": "M_31_Sk5" + }, + "itemDescription": "(Skizze zu Studienkomposition für Klavier M 31)", + "folios": [ + { + "folio": "2r", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "1–2", + "measure": "{20–24}", + "linkTo": "M_31_Sk5a" + } + ], + [ + { + "system": "4–5", + "measure": "{25–26, 27A, 27B, 28–29}", + "linkTo": "M_31_Sk5b" + } + ], + [ + { + "system": "7a–8a", + "measure": "{30}", + "linkTo": "M_31_Sk5c" + } + ] + ] + } + ] + }, + { + "item": "M* 403 Sk2", + "itemLinkTo": {}, + "itemDescription": "(Skizze zu Studienkomposition für Klavier M* 403)", + "folios": [ + { + "folio": "2r", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "12–15", + "measure": "1–8", + "linkTo": "" + } + ], + [ + { + "system": "10–11", + "measure": "9–12", + "linkTo": "" + } + ], + [ + { + "system": "7b–8b", + "measure": "13–15", + "linkTo": "" + } + ], + [ + { + "system": "16–17", + "measure": "x+16 bis x+23", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M 30 Sk1", + "itemLinkTo": { + "complexId": "m30", + "sheetId": "M_30_Sk1h" + }, + "itemDescription": "(Skizze zu Studienkomposition für Klavier M 30)", + "folios": [ + { + "folio": "2v", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "1–2", + "measure": "17–21", + "linkTo": "M_30_Sk1h" + } + ], + [ + { + "system": "4–5", + "measure": "22, {23A}, 23B, {24A}, 24B, 25(1–3/8)", + "linkTo": "M_30_Sk1i" + } + ], + [ + { + "system": "7–8", + "measure": "25(4–6/8)–27, {28A–29A}, 28B–29B", + "linkTo": "M_30_Sk1j" + } + ], + [ + { + "system": "10a–11a", + "measure": "28C–29C", + "linkTo": "M_30_Sk1k" + } + ] + ] + } + ] + }, + { + "item": "M 31 Sk1", + "itemLinkTo": { + "complexId": "m31", + "sheetId": "M_31_Sk1" + }, + "itemDescription": "(Skizze zu Studienkomposition für Klavier M 31)", + "folios": [ + { + "folio": "2v", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "10b", + "measure": "1–4", + "linkTo": "M_31_Sk1a" + } + ], + [ + { + "system": "11b", + "measure": "5–9", + "linkTo": "M_31_Sk1b" + } + ] + ] + } + ] + }, + { + "item": "M 31 Sk2", + "itemLinkTo": { + "complexId": "m31", + "sheetId": "M_31_Sk2" + }, + "itemDescription": "(Skizze zu Studienkomposition für Klavier M 31)", + "folios": [ + { + "folio": "2v", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "13", + "measure": "x+1 bis x+4", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M 31 Sk3", + "itemLinkTo": { + "complexId": "m31", + "sheetId": "M_31_Sk3" + }, + "itemDescription": "(Skizze zu Studienkomposition für Klavier M 31)", + "folios": [ + { + "folio": "2v", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "15–16", + "measure": "1–5", + "linkTo": "M_31_Sk3a" + } + ], + [ + { + "system": "17–18", + "measure": "6–10", + "linkTo": "M_31_Sk3b" + } + ] + ] + } + ] + } + ] + } + }, + { + "id": "source_B", + "siglum": "B", + "siglumAddendum": "", + "type": "Tintenniederschrift.", + "location": "CH-Bps, Sammlung Anton Webern.", + "description": { + "desc": ["1 Blatt. Schnittspuren am rechten Rand: von Bogen abgeschnitten."], + "writingMaterial": "Notenpapier, 18 Systeme, Format: hoch 347 × 265 mm, Firmenzeichen:

unten links auf Bl. 1v.", + "writingInstruments": { + "main": "schwarze Tinte", + "secondary": ["Bleistift"] + }, + "title": "", + "date": "", + "pagination": "", + "measureNumbers": "", + "instrumentation": "", + "annotations": "", + "content": [ + { + "item": "M 31", + "itemLinkTo": { + "complexId": "m31", + "sheetId": "M_31_TF1" + }, + "itemDescription": "(Tintenniederschrift von Studienkomposition für Klavier M 31)", + "folios": [ + { + "folio": "1r", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "1–2", + "measure": "1–5", + "linkTo": "" + } + ], + [ + { + "system": "4–5", + "measure": "6–10", + "linkTo": "" + } + ], + [ + { + "system": "7–8", + "measure": "11–17", + "linkTo": "" + } + ], + [ + { + "system": "9–11", + "measure": "18–22", + "linkTo": "" + } + ], + [ + { + "system": "13–14", + "measure": "23–27", + "linkTo": "" + } + ], + [ + { + "system": "16–17", + "measure": "28–30", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M 30", + "itemLinkTo": { + "complexId": "m30", + "sheetId": "M_30_TF1" + }, + "itemDescription": "(Tintenniederschrift von Studienkomposition für Klavier M 30)", + "folios": [ + { + "folio": "1v", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "1–2", + "measure": "1–5", + "linkTo": "" + } + ], + [ + { + "system": "4–5", + "measure": "6–10", + "linkTo": "" + } + ], + [ + { + "system": "7–8", + "measure": "11–15", + "linkTo": "" + } + ], + [ + { + "system": "10–11", + "measure": "16–20", + "linkTo": "" + } + ], + [ + { + "system": "13–14", + "measure": "21–24", + "linkTo": "" + } + ] + ] + } + ] + }, + { + "item": "M* 402 Sk1", + "itemLinkTo": {}, + "itemDescription": "(Skizze zu Studienkomposition für Klavier M* 402)", + "folios": [ + { + "folio": "1v", + "folioLinkTo": "", + "folioDescription": "", + "systemGroups": [ + [ + { + "system": "16–17", + "measure": "1–5", + "linkTo": "" + } + ], + [ + { + "system": "18", + "measure": "6–7, 8A, 8B, 9", + "linkTo": "" + } + ] + ] + } + ] + } + ] + } + } + ] +} diff --git a/src/assets/data/edition/series/2/section/2a/m31/source-evaluation.json b/src/assets/data/edition/series/2/section/2a/m31/source-evaluation.json new file mode 100644 index 0000000000..80d1e9716e --- /dev/null +++ b/src/assets/data/edition/series/2/section/2a/m31/source-evaluation.json @@ -0,0 +1,8 @@ +{ + "sources": [ + { + "id": "m31", + "content": [] + } + ] +} diff --git a/src/assets/data/edition/series/2/section/2a/m31/source-list.json b/src/assets/data/edition/series/2/section/2a/m31/source-list.json new file mode 100644 index 0000000000..a474e79e31 --- /dev/null +++ b/src/assets/data/edition/series/2/section/2a/m31/source-list.json @@ -0,0 +1,18 @@ +{ + "sources": [ + { + "siglum": "A", + "type": "Skizzen zu
Studienkomposition für Klavier M 31.
Enthält auch Skizzen zu Studienkomposition für Klavier M 30 und M* 403.", + "location": "CH-Bps, Sammlung Anton Webern.", + "hasDescription": true, + "linkTo": "source_A" + }, + { + "siglum": "B", + "type": "Tintenniederschrift von
Studienkomposition für Klavier M 31.
Enthält auch Tintenniederschrift von Studienkomposition für Klavier M 30 sowie Skizzen zu Studienkomposition für Klavier M* 402.", + "location": "CH-Bps, Sammlung Anton Webern.", + "hasDescription": true, + "linkTo": "source_B" + } + ] +} diff --git a/src/assets/data/edition/series/2/section/2a/m31/svg-sheets.json b/src/assets/data/edition/series/2/section/2a/m31/svg-sheets.json new file mode 100644 index 0000000000..6ff8a1355d --- /dev/null +++ b/src/assets/data/edition/series/2/section/2a/m31/svg-sheets.json @@ -0,0 +1,150 @@ +{ + "sheets": { + "workEditions": [], + "textEditions": [ + { + "id": "M_31_TF1", + "label": "M 31 einzige Textfassung", + "content": [ + { + "svg": "assets/img/edition/series/2/section/2a/m31/M31_Textfassung1-1von2-final.svg", + "image": "", + "partial": "a" + }, + { + "svg": "assets/img/edition/series/2/section/2a/m31/M31_Textfassung1-2von2-final.svg", + "image": "", + "partial": "b" + } + ], + "convolute": "" + } + ], + "sketchEditions": [ + { + "id": "M_31_Sk1", + "label": "M 31 Sk1", + "content": [ + { + "svg": "assets/img/edition/series/2/section/2a/m31/M31_Sk1-1von2-final.svg", + "image": "", + "partial": "a" + }, + { + "svg": "assets/img/edition/series/2/section/2a/m31/M31_Sk1-2von2-final.svg", + "image": "", + "partial": "b" + } + ], + "convolute": "A" + }, + { + "id": "M_31_Sk2", + "label": "M 31 Sk2", + "content": [ + { + "svg": "assets/img/edition/series/2/section/2a/m31/M31_Sk2-1von1-final.svg", + "image": "", + "partial": "" + } + ], + "convolute": "A" + }, + { + "id": "M_31_Sk3", + "label": "M 31 Sk3", + "content": [ + { + "svg": "assets/img/edition/series/2/section/2a/m31/M31_Sk3-1von4-final.svg", + "image": "", + "partial": "a" + }, + { + "svg": "assets/img/edition/series/2/section/2a/m31/M31_Sk3-2von4-final.svg", + "image": "", + "partial": "b" + }, + { + "svg": "assets/img/edition/series/2/section/2a/m31/M31_Sk3-3von4-final.svg", + "image": "", + "partial": "c" + }, + { + "svg": "assets/img/edition/series/2/section/2a/m31/M31_Sk3-4von4-final.svg", + "image": "", + "partial": "d" + } + ], + "convolute": "A" + }, + { + "id": "M_31_Sk3_1", + "label": "M 31 Sk3.1", + "content": [ + { + "svg": "assets/img/edition/series/2/section/2a/m31/M31_Sk3_1-1von1-final.svg", + "image": "", + "partial": "" + } + ], + "convolute": "A" + }, + { + "id": "M_31_Sk3_2", + "label": "M 31 Sk3.2", + "content": [ + { + "svg": "assets/img/edition/series/2/section/2a/m31/M31_Sk3_2-1von1-final.svg", + "image": "", + "partial": "" + } + ], + "convolute": "A" + }, + { + "id": "M_31_Sk4", + "label": "M 31 Sk4", + "content": [ + { + "svg": "assets/img/edition/series/2/section/2a/m31/M31_Sk4-1von3-final.svg", + "image": "", + "partial": "a" + }, + { + "svg": "assets/img/edition/series/2/section/2a/m31/M31_Sk4-2von3-final.svg", + "image": "", + "partial": "b" + }, + { + "svg": "assets/img/edition/series/2/section/2a/m31/M31_Sk4-3von3-final.svg", + "image": "", + "partial": "c" + } + ], + "convolute": "A" + }, + { + "id": "M_31_Sk5", + "label": "M 31 Sk5", + "content": [ + { + "svg": "assets/img/edition/series/2/section/2a/m31/M31_Sk5-1von3-final.svg", + "image": "", + "partial": "a" + }, + { + "svg": "assets/img/edition/series/2/section/2a/m31/M31_Sk5-2von3-final.svg", + "image": "", + "partial": "b" + }, + { + "svg": "assets/img/edition/series/2/section/2a/m31/M31_Sk5-3von3-final.svg", + "image": "", + "partial": "c" + } + ], + "convolute": "A" + } + ] + } +} diff --git a/src/assets/data/edition/series/2/section/2a/m31/textcritics.json b/src/assets/data/edition/series/2/section/2a/m31/textcritics.json new file mode 100644 index 0000000000..de32af20a3 --- /dev/null +++ b/src/assets/data/edition/series/2/section/2a/m31/textcritics.json @@ -0,0 +1,377 @@ +{ + "textcritics": [ + { + "id": "M_31_TF1", + "label": "M 31 einzige Textfassung", + "description": [ + "##Quellenbewertung:## Für die Textedition der Studienkomposition für Klavier M 31 ist B relevante Quelle. A enthält Skizzen.
B weist zwei unterscheidbare Korrekturschichten auf: Korrekturen 1 mit Tinte sowie die später entstandenen Korrekturen 2 mit Bleistift. Der Zustand vor Korrekturen 1 ist nicht immer zu entziffern.
Hauptquelle für die Textedition der Studienkomposition für Klavier M 31 ist B nach Korrekturen 1." + ], + "comments": [ + { + "svgGroupId": "g3298", + "measure": "1", + "system": "Klav.", + "position": "4/16", + "comment": "{{ref.getGlyph('[pp]')}} versetzt von 3/8." + }, + { + "svgGroupId": "g3302", + "measure": "5", + "system": "Klav. u.", + "position": "3/16", + "comment": "Augmentationspunkt weggelassen mit Blick auf metrischen Kontext." + }, + { + "svgGroupId": "g3306", + "measure": "6", + "system": "Klav.", + "position": "4/16", + "comment": "{{ref.getGlyph('[pp]')}} versetzt von 3/8." + }, + { + "svgGroupId": "g2028", + "measure": "15", + "system": "Klav.", + "position": "Taktende", + "comment": "Taktstrich ergänzt (vgl. Korrekturen 2)." + }, + { + "svgGroupId": "g3042", + "measure": "16", + "system": "Klav.", + "position": "Taktende", + "comment": "Taktstrich ergänzt (vgl. Korrekturen 2)." + }, + { + "svgGroupId": "g3046", + "measure": "18", + "system": "Klav.", + "position": "4/16", + "comment": "{{ref.getGlyph('[pp]')}} versetzt von zwischen 3/8 und 4/8." + }, + { + "svgGroupId": "g3050", + "measure": "23", + "system": "Klav.", + "position": "4/16", + "comment": "{{ref.getGlyph('[p]')}} versetzt von 3/8." + }, + { + "svgGroupId": "g3054", + "measure": "28", + "system": "Klav.", + "position": "8/16", + "comment": "{{ref.getGlyph('[pp]')}} versetzt von 5/8." + } + ] + }, + { + "id": "M_31_Sk1", + "label": "M 31 Sk1", + "description": [ + "M 31 Sk1 enthält eine erste rhythmische Skizze zum Hauptthema der Studienkomposition für Klavier M 31." + ], + "comments": [ + { + "svgGroupId": "g964", + "measure": "1", + "system": "10", + "position": "(2/4)", + "comment": "Zwei Achtelnoten überschreiben Viertelnote." + } + ] + }, + { + "id": "M_31_Sk2", + "label": "M 31 Sk2", + "description": [ + "M 31 Sk2 formuliert ein kontrastierendes Thema in E-Dur für den B-Teil, das von der Tintenniederschrift jedoch noch stark abweicht." + ], + "comments": [ + { + "svgGroupId": "g952", + "measure": "x+2", + "system": "10", + "position": "1. Note", + "comment": "Halbe Note überschreibt Viertelnote." + } + ] + }, + { + "id": "M_31_Sk3", + "label": "M 31 Sk3", + "description": [ + "M 31 Sk3 beinhaltet eine Verlaufsskizze vom A-Teil und B-Teil der Studienkomposition für Klavier M 31, deren Übergang zur Reprise von der Tintenniederschrift abweicht." + ], + "comments": [ + { + "svgGroupId": "g1140", + "measure": "2", + "system": "16", + "position": "1/4", + "comment": "Im Bassschlüssel zu lesende Viertelnote as/c1 gestrichen." + }, + { + "svgGroupId": "g1146", + "measure": "3", + "system": "16", + "position": "1. Note", + "comment": "Viertelnote überschreibt Halbe Note." + }, + { + "svgGroupId": "g1150", + "measure": "3", + "system": "16", + "position": "2/4", + "comment": "g gestrichen." + }, + { + "svgGroupId": "g1169", + "measure": "4", + "system": "15", + "position": "1. Note", + "comment": "[a] überschreibt [b]." + }, + { + "svgGroupId": "g1164", + "measure": "4", + "system": "15", + "position": "letzte Note", + "comment": "g1/c2/e2 überschreibt f2." + }, + { + "svgGroupId": "g1090", + "measure": "8", + "system": "17", + "position": "2/8", + "comment": "a2 gestrichen." + }, + { + "svgGroupId": "g1166", + "measure": "10", + "system": "18", + "position": "(2–3/4)", + "comment": "Punktierte Viertelnote G/d mit Achtelnote g überschreibt Halbe Note G/d; Augmentationspunkte gestrichen und Achtelnote d auf 5/8 hinzugefügt und mit g auf 6/8 zusammengebalkt." + }, + { + "svgGroupId": "g1131", + "measure": "10", + "system": "17", + "position": "3/4", + "comment": "h1 gestrichen." + }, + { + "svgGroupId": "g1155", + "measure": "11", + "system": "2", + "position": "", + "comment": "Violinschlüssel und Noten radiert." + }, + { + "svgGroupId": "g1128", + "measure": "15", + "system": "1", + "position": "3–6/8", + "comment": "d2–c2–h1–gis1 überschreibt f2–e2–d2–h1." + } + ] + }, + { + "id": "M_31_Sk3.1", + "label": "M 31 Sk3.1", + "description": [ + "M 31 Sk3.1 fügt einen zusätzlichen Takt zwischen T. 10 und T. 11 von Sk3 ein." + ], + "comments": [ + { + "svgGroupId": "g961", + "measure": "10+1", + "system": "6", + "position": "1. Note", + "comment": "Punktierte Viertelnote überschreibt Halbe Note." + } + ] + }, + { + "id": "M_31_Sk3.2", + "label": "M 31 Sk3.2", + "description": [ + "M 31 Sk3.2 skizziert vermutlich das Vorhaben, den Übergang zur Reprise in M 31 Sk3 von D nach G um eine Quinte nach unten zu transponieren." + ], + "comments": [ + { + "svgGroupId": "g963", + "measure": "17", + "system": "5", + "position": "3/4", + "comment": "e1 überschreibt f1." + } + ] + }, + { + "id": "M_31_Sk4", + "label": "M 31 Sk4", + "description": [ + "M 31 Sk4 setzt erneut beim B-Teil an, um einen – unter erheblichen Korrekturvorgängen – mit der Tintenniederschrift nahezu übereinstimmenden Verlauf des Mittelteils zu formulieren." + ], + "comments": [ + { + "svgGroupId": "g1170", + "measure": "12", + "system": "9", + "position": "4–5/8", + "comment": "H–H überschreibt e–gis." + }, + { + "svgGroupId": "g1203", + "measure": "15", + "system": "8", + "position": "1–6/8", + "comment": "Sechs Achtelnoten durch Streichung der Balkierung aufgelöst und geändert zu drei Achtelnoten, Viertelnote und Achtelnote; Achtelnote e2 auf 5/8 aufgrund der Änderung getilgt." + }, + { + "svgGroupId": "path1933", + "measure": "{16A–18A}", + "system": "8–9", + "position": "", + "comment": "Takte zusammen mit T. {19B} und T. {16B–18B} durch Einkreisung getilgt." + }, + { + "svgGroupId": "g1222", + "measure": "{17A}", + "system": "8", + "position": "2/4", + "comment": "f3 überschreibt c3." + }, + { + "svgGroupId": "g1227", + "measure": "{17A}", + "system": "8", + "position": "2/4–6/8", + "comment": "Drei Achtelnoten durch Streichung der Balkierung aufgelöst und geändert zu Viertelnote und zwei Achtelnoten." + }, + { + "svgGroupId": "g1259", + "measure": "{18A}", + "system": "8", + "position": "", + "comment": "Noten gestrichen." + }, + { + "svgGroupId": "polyline110", + "measure": "{19A}", + "system": "11", + "position": "", + "comment": "Noten gestrichen." + }, + { + "svgGroupId": "path 1933", + "measure": "{19B}", + "system": "", + "position": "", + "comment": "Takt zusammen mit T. {16A–18A} und T. {16B–18B} durch Einkreisung getilgt." + }, + { + "svgGroupId": "g956", + "measure": "{19B}", + "system": "11", + "position": "5/8", + "comment": "d2 überschreibt c2." + }, + { + "svgGroupId": "polyline130", + "measure": "{16B–18B}", + "system": "13–14", + "position": "", + "comment": "Takte pauschal gestrichen." + }, + { + "svgGroupId": "path 1933", + "measure": "{16B–18B}", + "system": "13–14", + "position": "", + "comment": "Takte zusammen mit T. {16A–18A} und T. {19B} durch Einkreisung getilgt." + }, + { + "svgGroupId": "g1066", + "measure": "16C", + "system": "13", + "position": "4/8", + "comment": "f1 überschreibt d1." + }, + { + "svgGroupId": "g1079", + "measure": "16C", + "system": "14", + "position": "5–6/8", + "comment": "a–d überschreibt F–D." + } + ] + }, + { + "id": "M_31_Sk5", + "label": "M 31 Sk5", + "description": [ + "M 31 Sk5 enthält die Reprise des A-Teils zur Studienkomposition für Klavier M 31. Obwohl sämtliche Takte gestrichen sind, entsprechen sie der späteren Tintenniederschrift." + ], + "comments": [ + { + "svgGroupId": "g1068", + "measure": "{20–24}", + "system": "1–2", + "position": "6/8", + "comment": "Takte pauschal gestrichen." + }, + { + "svgGroupId": "g1073", + "measure": "{21}", + "system": "2", + "position": "1/4", + "comment": "Viertelnote G gestrichen.." + }, + { + "svgGroupId": "g1090", + "measure": "{25–29}", + "system": "4–5", + "position": "", + "comment": "Takte pauschal gestrichen." + }, + { + "svgGroupId": "g1081", + "measure": "{25}", + "system": "5", + "position": "1/4", + "comment": "Viertelnote d1 gestrichen." + }, + { + "svgGroupId": "g1086", + "measure": "{27A}", + "system": "4–5", + "position": "", + "comment": "Takt pauschal gestrichen." + }, + { + "svgGroupId": "g1094", + "measure": "{27B}", + "system": "5", + "position": "1. Pause", + "comment": "Achtelpause gestrichen." + }, + { + "svgGroupId": "g1115", + "measure": "{28}", + "system": "4", + "position": "1/4", + "comment": "Oberstimmenschicht: Viertelpause überschreibt Achtelpause." + }, + { + "svgGroupId": "g1111", + "measure": "{28}", + "system": "4", + "position": "5–6/8", + "comment": "f1/a1–d1/f1 überschreibt e1/g1–c1/e1." + } + ] + } + ] +} diff --git a/src/assets/data/edition/series/2/section/2a/m34/folio-convolute.json b/src/assets/data/edition/series/2/section/2a/m34/folio-convolute.json index 0ccd2009ff..6f21b6dfca 100644 --- a/src/assets/data/edition/series/2/section/2a/m34/folio-convolute.json +++ b/src/assets/data/edition/series/2/section/2a/m34/folio-convolute.json @@ -13,7 +13,8 @@ }, "content": [ { - "id": "M_34_Sk1a", + "complexId": "m34", + "sheetId": "M_34_Sk1a", "sigle": "M 34 Sk1", "sigleAddendum": "T. 1–7", "sectionPartition": 1, @@ -25,7 +26,8 @@ ] }, { - "id": "M_34_Sk1b", + "complexId": "m34", + "sheetId": "M_34_Sk1b", "sigle": "M 34 Sk1", "sigleAddendum": "T. 8–14", "sectionPartition": 1, @@ -37,7 +39,8 @@ ] }, { - "id": "M_34_Sk1c", + "complexId": "m34", + "sheetId": "M_34_Sk1c", "sigle": "M 34 Sk1", "sigleAddendum": "T. 15–16", "sectionPartition": 2, @@ -50,7 +53,8 @@ ] }, { - "id": "M_34_Sk1_1", + "complexId": "m34", + "sheetId": "M_34_Sk1_1", "sigle": "M 34 Sk1.1", "sigleAddendum": "T. 5–8", "sectionPartition": 2, @@ -80,7 +84,36 @@ "height": 349, "width": 265 }, - "content": [] + "content": [ + { + "complexId": "m37", + "sheetId": "M_37_Sk1", + "sigle": "M 37 Sk1", + "sigleAddendum": "", + "sectionPartition": 3, + "sections": [ + { + "position": 1, + "startSystem": 18, + "endSystem": 18 + } + ] + }, + { + "complexId": "m37", + "sheetId": "M_37_Sk2", + "sigle": "M 37 Sk2", + "sigleAddendum": "", + "sectionPartition": 3, + "sections": [ + { + "position": 2, + "startSystem": 18, + "endSystem": 18 + } + ] + } + ] }, { "folioId": "2v", @@ -89,7 +122,47 @@ "height": 349, "width": 265 }, - "content": [] + "content": [ + { + "complexId": "m37", + "sheetId": "M_37_Sk3a", + "sigle": "M 37 Sk3", + "sigleAddendum": "T. 1–6", + "sectionPartition": 1, + "sections": [ + { + "startSystem": 7, + "endSystem": 8 + } + ] + }, + { + "complexId": "m37", + "sheetId": "M_37_Sk3b", + "sigle": "M 37 Sk3", + "sigleAddendum": "T. 7–14", + "sectionPartition": 1, + "sections": [ + { + "startSystem": 10, + "endSystem": 11 + } + ] + }, + { + "complexId": "m37", + "sheetId": "M_37_Sk3c", + "sigle": "M 37 Sk3", + "sigleAddendum": "T. 15–21", + "sectionPartition": 1, + "sections": [ + { + "startSystem": 13, + "endSystem": 14 + } + ] + } + ] } ] }, diff --git a/src/assets/data/edition/series/2/section/2a/m34/source-description.json b/src/assets/data/edition/series/2/section/2a/m34/source-description.json index c0403d5acb..ae46885651 100644 --- a/src/assets/data/edition/series/2/section/2a/m34/source-description.json +++ b/src/assets/data/edition/series/2/section/2a/m34/source-description.json @@ -4,21 +4,30 @@ "id": "source_A", "siglum": "A", "siglumAddendum": "", - "type": "Skizzen.", + "type": "Skizzen zu
Studienkomposition für Klavier M 34.
Enthält auch Skizzen zu Studienkomposition für Klavier M 35–38, M 39 Textfassung 1→2 und M* 404.", "location": "CH-Bps, Sammlung Anton Webern.", "description": { "desc": [ "1 Bogen (Bl. 1/2): Der Bogen ist Bestandteil (Bl. 1/2) eines größeren Konvoluts aus 2 Bögen (Bl. 1/2, 3/4), 2 Blättern (Bl. 5–6) und 1 Bogen (Bl. 7/8)." ], - "writingMaterial": "Notenpapier, 18 Systeme, Format (hoch): 349 × 265 mm, Firmenzeichen [JE] | Protokoll. Schutzmarke | No. 5 | 18 linig. unten links auf Bl. 1r–2r.", + "writingMaterial": "Notenpapier, 18 Systeme, Format: hoch 349 × 265 mm, Firmenzeichen:

unten links auf Bl. 1r–2r.", "writingInstruments": { "main": "Bleistift", "secondary": [] }, + "title": "", + "date": "", + "pagination": "", + "measureNumbers": "", + "instrumentation": "", + "annotations": "", "content": [ { "item": "M 34 Sk1", - "itemLinkTo": "M_34_Sk1a", + "itemLinkTo": { + "complexId": "m34", + "sheetId": "M_34_Sk1a" + }, "itemDescription": "(Skizze zu Studienkomposition für Klavier M 34)", "folios": [ { @@ -53,7 +62,10 @@ }, { "item": "M 34 Sk1.1", - "itemLinkTo": "M_34_Sk1_1", + "itemLinkTo": { + "complexId": "m34", + "sheetId": "M_34_Sk1_1" + }, "itemDescription": "(Skizze zu Studienkomposition für Klavier M 34)", "folios": [ { @@ -63,7 +75,7 @@ "systemGroups": [ [ { - "system": "7b–8b", + "system": "6–8b", "measure": "5–8", "linkTo": "" } @@ -73,9 +85,9 @@ ] }, { - "item": "M 35 Sk1", - "itemLinkTo": "", - "itemDescription": "(Skizze zu Studienkomposition für Klavier M 35)", + "item": "M 35/42 Sk1", + "itemLinkTo": {}, + "itemDescription": "(Skizze zu Studienkomposition für Klavier M 35/42)", "folios": [ { "folio": "1r", @@ -102,7 +114,7 @@ }, { "item": "M 36 Sk1", - "itemLinkTo": "", + "itemLinkTo": {}, "itemDescription": "(Skizze zu Studienkomposition für Klavier M 36)", "folios": [ { @@ -119,14 +131,14 @@ ], [ { - "system": "14c, 15b", + "system": "14c–15b", "measure": "7", "linkTo": "" } ], [ { - "system": "13–14", + "system": "13b–14b", "measure": "8–11", "linkTo": "" } @@ -151,7 +163,7 @@ }, { "item": "M* 404 Sk1", - "itemLinkTo": "", + "itemLinkTo": {}, "itemDescription": "(Skizze zu Studienkomposition für Klavier M* 404)", "folios": [ { @@ -200,7 +212,7 @@ }, { "item": "M* 404 Sk1.1", - "itemLinkTo": "", + "itemLinkTo": {}, "itemDescription": "(Skizze zu Studienkomposition für Klavier M* 404)", "folios": [ { @@ -221,7 +233,7 @@ }, { "item": "M* 404 Sk1.2", - "itemLinkTo": "", + "itemLinkTo": {}, "itemDescription": "(Skizze zu Studienkomposition für Klavier M* 404)", "folios": [ { @@ -242,7 +254,7 @@ }, { "item": "M* 404 Sk1.3", - "itemLinkTo": "", + "itemLinkTo": {}, "itemDescription": "(Skizze zu Studienkomposition für Klavier M* 404)", "folios": [ { @@ -263,7 +275,7 @@ }, { "item": "M* 404 Sk1.4", - "itemLinkTo": "", + "itemLinkTo": {}, "itemDescription": "(Skizze zu Studienkomposition für Klavier M* 404)", "folios": [ { @@ -284,7 +296,7 @@ }, { "item": "M 38 Sk3", - "itemLinkTo": "", + "itemLinkTo": {}, "itemDescription": "(Skizze zu Studienkomposition für Klavier M 38)", "folios": [ { @@ -294,7 +306,7 @@ "systemGroups": [ [ { - "system": "15, 16c", + "system": "15–16c", "measure": "1–4", "linkTo": "" } @@ -308,7 +320,7 @@ ], [ { - "system": "17c, 18", + "system": "17c–18", "measure": "6–8", "linkTo": "" } @@ -340,7 +352,7 @@ }, { "item": "M 39 Sk1", - "itemLinkTo": "", + "itemLinkTo": {}, "itemDescription": "(Skizze zu Studienkomposition für Klavier M 39)", "folios": [ { @@ -392,7 +404,7 @@ ], [ { - "system": "9c, 10", + "system": "9c–10", "measure": "{9B}", "linkTo": "" } @@ -424,7 +436,7 @@ }, { "item": "M 39 Sk1.1", - "itemLinkTo": "", + "itemLinkTo": {}, "itemDescription": "(Skizze zu Studienkomposition für Klavier M 39)", "folios": [ { @@ -444,8 +456,11 @@ ] }, { - "item": "M 37 Sk2", - "itemLinkTo": "", + "item": "M 37 Sk1", + "itemLinkTo": { + "complexId": "m37", + "sheetId": "M_37_Sk1" + }, "itemDescription": "(Skizze zu Studienkomposition für Klavier M 37)", "folios": [ { @@ -456,7 +471,7 @@ [ { "system": "18a", - "measure": "9–12", + "measure": "1–4", "linkTo": "" } ] @@ -465,8 +480,11 @@ ] }, { - "item": "M 37 Sk3", - "itemLinkTo": "", + "item": "M 37 Sk2", + "itemLinkTo": { + "complexId": "m37", + "sheetId": "M_37_Sk2" + }, "itemDescription": "(Skizze zu Studienkomposition für Klavier M 37)", "folios": [ { @@ -477,7 +495,7 @@ [ { "system": "18b", - "measure": "9–13", + "measure": "1, {2A}, 2B, 3–5", "linkTo": "" } ] @@ -487,7 +505,7 @@ }, { "item": "M 38 Sk2", - "itemLinkTo": "", + "itemLinkTo": {}, "itemDescription": "(Skizze zu Studienkomposition für Klavier M 38)", "folios": [ { @@ -508,7 +526,7 @@ }, { "item": "M 38 Sk1", - "itemLinkTo": "", + "itemLinkTo": {}, "itemDescription": "(Skizze zu Studienkomposition für Klavier M 38)", "folios": [ { @@ -528,8 +546,11 @@ ] }, { - "item": "M 37 Sk1", - "itemLinkTo": "", + "item": "M 37 Sk3", + "itemLinkTo": { + "complexId": "m37", + "sheetId": "M_37_Sk3" + }, "itemDescription": "(Skizze zu Studienkomposition für Klavier M 37)", "folios": [ { @@ -541,21 +562,21 @@ { "system": "7–8", "measure": "1–6", - "linkTo": "" + "linkTo": "M_37_Sk3a" } ], [ { "system": "10–11", "measure": "7–14", - "linkTo": "" + "linkTo": "M_37_Sk3b" } ], [ { "system": "13–14", "measure": "15–21", - "linkTo": "" + "linkTo": "M_37_Sk3c" } ] ] @@ -569,21 +590,30 @@ "id": "source_B", "siglum": "B", "siglumAddendum": "", - "type": "Tintenniederschrift.", + "type": "Tintenniederschrift von
Studienkomposition für Klavier M 34.
Enthält auch Tintenniederschrift von Studienkomposition für Klavier M 35–38, M 39 Textfassung 1→2 und M 41 sowie Skizzen zu Studienkomposition für Klavier M 35/42 und M 39 Textfassung 2.", "location": "CH-Bps, Sammlung Anton Webern.", "description": { "desc": [ "1 Bogen (Bl. 1/2): Der Bogen ist Bestandteil (Bl. 3/4) eines größeren Konvoluts aus 2 Bögen (Bl. 1/2, 3/4), 2 Blättern (Bl. 5–6) und 1 Bogen (Bl. 7/8). Stockfleck und rötliche Verfärbung mittig am oberen Rand des Bogens." ], - "writingMaterial": "Notenpapier, 18 Systeme, Format (hoch): 349 × 267 mm, Firmenzeichen [JE] | Protokoll. Schutzmarke | No. 5 | 18 linig. unten links auf Bl. 1r–2r.", + "writingMaterial": "Notenpapier, 18 Systeme, Format: hoch 349 × 267 mm, Firmenzeichen:

unten links auf Bl. 1r–2r.", "writingInstruments": { "main": "schwarze Tinte", "secondary": ["Bleistift"] }, + "title": "", + "date": "", + "pagination": "", + "measureNumbers": "", + "instrumentation": "", + "annotations": "", "content": [ { "item": "M 34", - "itemLinkTo": "", + "itemLinkTo": { + "complexId": "m34", + "sheetId": "M_34_TF1" + }, "itemDescription": "(Tintenniederschrift von Studienkomposition für Klavier M 34)", "folios": [ { @@ -610,9 +640,9 @@ ] }, { - "item": "M 35", - "itemLinkTo": "", - "itemDescription": "(Tintenniederschrift von Studienkomposition für Klavier M 35)", + "item": "M 35/42", + "itemLinkTo": {}, + "itemDescription": "(Tintenniederschrift von Studienkomposition für Klavier M 35/42)", "folios": [ { "folio": "1r", @@ -638,9 +668,9 @@ ] }, { - "item": "M 35 Sk2", - "itemLinkTo": "", - "itemDescription": "(Skizze zu Studienkomposition für Klavier M 35)", + "item": "M 35/42 Sk2", + "itemLinkTo": {}, + "itemDescription": "(Skizze zu Studienkomposition für Klavier M 35/42)", "folios": [ { "folio": "1r", @@ -660,7 +690,7 @@ }, { "item": "M 36", - "itemLinkTo": "", + "itemLinkTo": {}, "itemDescription": "(Tintenniederschrift von Studienkomposition für Klavier M 36)", "folios": [ { @@ -702,7 +732,10 @@ }, { "item": "M 37", - "itemLinkTo": "", + "itemLinkTo": { + "complexId": "m37", + "sheetId": "M_37_TF1" + }, "itemDescription": "(Tintenniederschrift von Studienkomposition für Klavier M 37)", "folios": [ { @@ -737,7 +770,7 @@ }, { "item": "M 38", - "itemLinkTo": "", + "itemLinkTo": {}, "itemDescription": "(Tintenniederschrift von Studienkomposition für Klavier M 38)", "folios": [ { @@ -772,7 +805,7 @@ }, { "item": "M 39", - "itemLinkTo": "", + "itemLinkTo": {}, "itemDescription": "(Tintenniederschrift von Studienkomposition für Klavier M 39: Textfassung 1→2)", "folios": [ { @@ -821,7 +854,7 @@ }, { "item": "M 39 Sk2", - "itemLinkTo": "", + "itemLinkTo": {}, "itemDescription": "(Skizze zu Studienkomposition für Klavier M 39: Textfassung 2)", "folios": [ { @@ -842,7 +875,7 @@ }, { "item": "M 39 Sk3", - "itemLinkTo": "", + "itemLinkTo": {}, "itemDescription": "(Skizze zu Studienkomposition für Klavier M 39: Textfassung 2)", "folios": [ { @@ -870,7 +903,7 @@ }, { "item": "M 41", - "itemLinkTo": "", + "itemLinkTo": {}, "itemDescription": "(Tintenniederschrift von Studienkomposition für Klavier M 41)", "folios": [ { diff --git a/src/assets/data/edition/series/2/section/2a/m34/textcritics.json b/src/assets/data/edition/series/2/section/2a/m34/textcritics.json index 35bcecbdc7..5ad49c40a2 100644 --- a/src/assets/data/edition/series/2/section/2a/m34/textcritics.json +++ b/src/assets/data/edition/series/2/section/2a/m34/textcritics.json @@ -1,5 +1,21 @@ { "textcritics": [ + { + "id": "M_34_TF1", + "label": "M 34 einzige Textfassung", + "description": [ + "##Quellenbewertung:## Für die Textedition der Studienkomposition für Klavier M 34 ist B relevante Quelle. A enthält Skizzen.
B weist zwei unterscheidbare Korrekturschichten auf: Korrekturen 1 mit Tinte sowie die später entstandenen Korrekturen 2 mit Bleistift. Der Zustand vor Korrekturen 1 ist nicht immer zu entziffern.
Hauptquelle für die Textedition der Studienkomposition für Klavier M 34 ist B nach Korrekturen 1." + ], + "comments": [ + { + "svgGroupId": "g5789", + "measure": "7", + "system": "Klav. o.", + "position": "1. Note", + "comment": "Achtelnote g1 aufgrund des horizontal verschobenen Notenhalses auch als Viertelnote lesbar (vgl. Korrekturschicht 1). Eine Deutung als Viertelnote ist mit Blick auf Sk1 und Sk1.1 aber sehr unwahrscheinlich." + } + ] + }, { "id": "M_34_Sk1", "label": "M 34 Sk1", @@ -102,7 +118,10 @@ "linkBoxes": [ { "svgGroupId": "g3378", - "linkTo": "M_34_Sk1_1" + "linkTo": { + "complexId": "m34", + "sheetId": "M_34_Sk1_1" + } } ] }, @@ -110,7 +129,7 @@ "id": "M_34_Sk1_1", "label": "M 34 Sk1.1", "description": [ - "M 34 Sk1.1 entwirft auf der Basis von M 34 Sk1 eine alternative Fortsetzung ab T. 5, die zu einer Verkürzung auf eine achttaktige Periode analog der späteren Tintenniederschrift führt." + "M 34 Sk1.1 entwirft auf der Basis von M 34 Sk1 eine alternative Fortsetzung ab T. 5, die zu einer Verkürzung auf eine achttaktige Periode analog der späteren Tintenniederschrift führt." ], "comments": [ { @@ -145,23 +164,10 @@ "linkBoxes": [ { "svgGroupId": "g1228", - "linkTo": "M_34_Sk1c" - } - ] - }, - { - "id": "M_34_TF1", - "label": "M 34 einzige Textfassung", - "description": [ - "##Quellenbewertung:## Maßgebend für die hier vorgelegte Textedition der Studienkomposition für Klavier M 34 ist die autographe Niederschrift mit Tinte inklusive Korrekturschicht 1 (Tinte).
Hauptquelle ist B." - ], - "comments": [ - { - "svgGroupId": "g5789", - "measure": "7", - "system": "Klav. o.", - "position": "1. Note", - "comment": "Achtelnote g1 aufgrund des horizontal verschobenen Notenhalses auch als Viertelnote lesbar (vgl. Korrekturschicht 1). Eine Deutung als Viertelnote ist mit Blick auf Sk1 und Sk1.1 aber sehr unwahrscheinlich." + "linkTo": { + "complexId": "m34", + "sheetId": "M_34_Sk1c" + } } ] } diff --git a/src/assets/data/edition/series/2/section/2a/m37/folio-convolute.json b/src/assets/data/edition/series/2/section/2a/m37/folio-convolute.json index fa596cb943..6f21b6dfca 100644 --- a/src/assets/data/edition/series/2/section/2a/m37/folio-convolute.json +++ b/src/assets/data/edition/series/2/section/2a/m37/folio-convolute.json @@ -11,7 +11,62 @@ "height": 349, "width": 265 }, - "content": [] + "content": [ + { + "complexId": "m34", + "sheetId": "M_34_Sk1a", + "sigle": "M 34 Sk1", + "sigleAddendum": "T. 1–7", + "sectionPartition": 1, + "sections": [ + { + "startSystem": 1, + "endSystem": 2 + } + ] + }, + { + "complexId": "m34", + "sheetId": "M_34_Sk1b", + "sigle": "M 34 Sk1", + "sigleAddendum": "T. 8–14", + "sectionPartition": 1, + "sections": [ + { + "startSystem": 4, + "endSystem": 5 + } + ] + }, + { + "complexId": "m34", + "sheetId": "M_34_Sk1c", + "sigle": "M 34 Sk1", + "sigleAddendum": "T. 15–16", + "sectionPartition": 2, + "sections": [ + { + "position": 1, + "startSystem": 7, + "endSystem": 8 + } + ] + }, + { + "complexId": "m34", + "sheetId": "M_34_Sk1_1", + "sigle": "M 34 Sk1.1", + "sigleAddendum": "T. 5–8", + "sectionPartition": 2, + "sections": [ + { + "position": 2, + "startSystem": 7, + "endSystem": 8 + } + ] + } + ] }, { "folioId": "1v", @@ -31,7 +86,8 @@ }, "content": [ { - "id": "M_37_Sk1", + "complexId": "m37", + "sheetId": "M_37_Sk1", "sigle": "M 37 Sk1", "sigleAddendum": "", "sectionPartition": 3, @@ -44,7 +100,8 @@ ] }, { - "id": "M_37_Sk2", + "complexId": "m37", + "sheetId": "M_37_Sk2", "sigle": "M 37 Sk2", "sigleAddendum": "", "sectionPartition": 3, @@ -67,7 +124,8 @@ }, "content": [ { - "id": "M_37_Sk3a", + "complexId": "m37", + "sheetId": "M_37_Sk3a", "sigle": "M 37 Sk3", "sigleAddendum": "T. 1–6", "sectionPartition": 1, @@ -79,7 +137,8 @@ ] }, { - "id": "M_37_Sk3b", + "complexId": "m37", + "sheetId": "M_37_Sk3b", "sigle": "M 37 Sk3", "sigleAddendum": "T. 7–14", "sectionPartition": 1, @@ -91,7 +150,8 @@ ] }, { - "id": "M_37_Sk3c", + "complexId": "m37", + "sheetId": "M_37_Sk3c", "sigle": "M 37 Sk3", "sigleAddendum": "T. 15–21", "sectionPartition": 1, diff --git a/src/assets/data/edition/series/2/section/2a/m37/source-description.json b/src/assets/data/edition/series/2/section/2a/m37/source-description.json index 41ec3bb65d..f9c6d11398 100644 --- a/src/assets/data/edition/series/2/section/2a/m37/source-description.json +++ b/src/assets/data/edition/series/2/section/2a/m37/source-description.json @@ -1,7 +1,7 @@ { "sources": [ { - "id": "sourceA", + "id": "source_A", "siglum": "A", "siglumAddendum": "", "type": "Skizzen zu
Studienkomposition für Klavier M 37.
Enthält auch Skizzen zu Studienkomposition für Klavier M 34–36, M 38, M 39 Textfassung 1→2 und M* 404.", @@ -10,7 +10,7 @@ "desc": [ "1 Bogen (Bl. 1/2): Der Bogen ist Bestandteil (Bl. 1/2) eines größeren Konvoluts aus 2 Bögen (Bl. 1/2, 3/4), 2 Blättern (Bl. 5–6) und 1 Bogen (Bl. 7/8)." ], - "writingMaterial": "Notenpapier, 18 Systeme, Format: hoch 349 × 265 mm, Firmenzeichen: ##[JE]## | Protokoll. Schutzmarke | No. 5 | 18 linig. unten links auf Bl. 1r–2r.", + "writingMaterial": "Notenpapier, 18 Systeme, Format: hoch 349 × 265 mm, Firmenzeichen:

unten links auf Bl. 1r–2r.", "writingInstruments": { "main": "Bleistift", "secondary": [] @@ -24,7 +24,10 @@ "content": [ { "item": "M 34 Sk1", - "itemLinkTo": "M_34_Sk1", + "itemLinkTo": { + "complexId": "m34", + "sheetId": "M_34_Sk1a" + }, "itemDescription": "(Skizze zu Studienkomposition für Klavier M 34)", "folios": [ { @@ -36,21 +39,21 @@ { "system": "1–2", "measure": "1–7", - "linkTo": "" + "linkTo": "M_34_Sk1a" } ], [ { "system": "4–5", "measure": "8–14", - "linkTo": "" + "linkTo": "M_34_Sk1b" } ], [ { "system": "7a–8a", "measure": "15–16", - "linkTo": "" + "linkTo": "M_34_Sk1c" } ] ] @@ -59,7 +62,10 @@ }, { "item": "M 34 Sk1.1", - "itemLinkTo": "M_34_Sk1_1", + "itemLinkTo": { + "complexId": "m34", + "sheetId": "M_34_Sk1_1" + }, "itemDescription": "(Skizze zu Studienkomposition für Klavier M 34)", "folios": [ { @@ -69,7 +75,7 @@ "systemGroups": [ [ { - "system": "7b–8b", + "system": "6–8b", "measure": "5–8", "linkTo": "" } @@ -80,7 +86,7 @@ }, { "item": "M 35/42 Sk1", - "itemLinkTo": "", + "itemLinkTo": {}, "itemDescription": "(Skizze zu Studienkomposition für Klavier M 35/42)", "folios": [ { @@ -98,7 +104,7 @@ [ { "system": "13a–14a", - "measure": "8(1–/4), {8(3/4)A–9A, 10}, 8(3/4)B–9B", + "measure": "8(1–2/4), {8(3/4)A–9A, 10}, 8(3/4)B–9B", "linkTo": "" } ] @@ -108,7 +114,7 @@ }, { "item": "M 36 Sk1", - "itemLinkTo": "", + "itemLinkTo": {}, "itemDescription": "(Skizze zu Studienkomposition für Klavier M 36)", "folios": [ { @@ -125,7 +131,7 @@ ], [ { - "system": "14c, 15b", + "system": "14c–15b", "measure": "7", "linkTo": "" } @@ -157,7 +163,7 @@ }, { "item": "M* 404 Sk1", - "itemLinkTo": "", + "itemLinkTo": {}, "itemDescription": "(Skizze zu Studienkomposition für Klavier M* 404)", "folios": [ { @@ -206,7 +212,7 @@ }, { "item": "M* 404 Sk1.1", - "itemLinkTo": "", + "itemLinkTo": {}, "itemDescription": "(Skizze zu Studienkomposition für Klavier M* 404)", "folios": [ { @@ -227,7 +233,7 @@ }, { "item": "M* 404 Sk1.2", - "itemLinkTo": "", + "itemLinkTo": {}, "itemDescription": "(Skizze zu Studienkomposition für Klavier M* 404)", "folios": [ { @@ -248,7 +254,7 @@ }, { "item": "M* 404 Sk1.3", - "itemLinkTo": "", + "itemLinkTo": {}, "itemDescription": "(Skizze zu Studienkomposition für Klavier M* 404)", "folios": [ { @@ -269,7 +275,7 @@ }, { "item": "M* 404 Sk1.4", - "itemLinkTo": "", + "itemLinkTo": {}, "itemDescription": "(Skizze zu Studienkomposition für Klavier M* 404)", "folios": [ { @@ -290,7 +296,7 @@ }, { "item": "M 38 Sk3", - "itemLinkTo": "", + "itemLinkTo": {}, "itemDescription": "(Skizze zu Studienkomposition für Klavier M 38)", "folios": [ { @@ -300,7 +306,7 @@ "systemGroups": [ [ { - "system": "15, 16c", + "system": "15–16c", "measure": "1–4", "linkTo": "" } @@ -314,7 +320,7 @@ ], [ { - "system": "17c, 18", + "system": "17c–18", "measure": "6–8", "linkTo": "" } @@ -346,7 +352,7 @@ }, { "item": "M 39 Sk1", - "itemLinkTo": "", + "itemLinkTo": {}, "itemDescription": "(Skizze zu Studienkomposition für Klavier M 39)", "folios": [ { @@ -398,7 +404,7 @@ ], [ { - "system": "9c, 10", + "system": "9c–10", "measure": "{9B}", "linkTo": "" } @@ -430,7 +436,7 @@ }, { "item": "M 39 Sk1.1", - "itemLinkTo": "", + "itemLinkTo": {}, "itemDescription": "(Skizze zu Studienkomposition für Klavier M 39)", "folios": [ { @@ -450,8 +456,11 @@ ] }, { - "item": "M 37 Sk2", - "itemLinkTo": "M_37_Sk2", + "item": "M 37 Sk1", + "itemLinkTo": { + "complexId": "m37", + "sheetId": "M_37_Sk1" + }, "itemDescription": "(Skizze zu Studienkomposition für Klavier M 37)", "folios": [ { @@ -462,7 +471,7 @@ [ { "system": "18a", - "measure": "9–12", + "measure": "1–4", "linkTo": "" } ] @@ -471,8 +480,11 @@ ] }, { - "item": "M 37 Sk3", - "itemLinkTo": "M_37_Sk3", + "item": "M 37 Sk2", + "itemLinkTo": { + "complexId": "m37", + "sheetId": "M_37_Sk2" + }, "itemDescription": "(Skizze zu Studienkomposition für Klavier M 37)", "folios": [ { @@ -483,7 +495,7 @@ [ { "system": "18b", - "measure": "9–13", + "measure": "1, {2A}, 2B, 3–5", "linkTo": "" } ] @@ -493,7 +505,7 @@ }, { "item": "M 38 Sk2", - "itemLinkTo": "", + "itemLinkTo": {}, "itemDescription": "(Skizze zu Studienkomposition für Klavier M 38)", "folios": [ { @@ -514,7 +526,7 @@ }, { "item": "M 38 Sk1", - "itemLinkTo": "", + "itemLinkTo": {}, "itemDescription": "(Skizze zu Studienkomposition für Klavier M 38)", "folios": [ { @@ -534,8 +546,11 @@ ] }, { - "item": "M 37 Sk1", - "itemLinkTo": "M_37_Sk1", + "item": "M 37 Sk3", + "itemLinkTo": { + "complexId": "m37", + "sheetId": "M_37_Sk3" + }, "itemDescription": "(Skizze zu Studienkomposition für Klavier M 37)", "folios": [ { @@ -547,21 +562,21 @@ { "system": "7–8", "measure": "1–6", - "linkTo": "" + "linkTo": "M_37_Sk3a" } ], [ { "system": "10–11", "measure": "7–14", - "linkTo": "" + "linkTo": "M_37_Sk3b" } ], [ { "system": "13–14", "measure": "15–21", - "linkTo": "" + "linkTo": "M_37_Sk3c" } ] ] @@ -572,7 +587,7 @@ } }, { - "id": "sourceB", + "id": "source_B", "siglum": "B", "siglumAddendum": "", "type": "Tintenniederschrift von
Studienkomposition für Klavier M 37.
Enthält auch Tintenniederschrift von Studienkomposition für Klavier M 34–36, M 38, M 39 Textfassung 1→2 und M 41 sowie Skizzen zu Studienkomposition für Klavier M 35/42 und 39 Textfassung 2.", @@ -581,7 +596,7 @@ "desc": [ "1 Bogen (Bl. 1/2): Der Bogen ist Bestandteil (Bl. 3/4) eines größeren Konvoluts aus 2 Bögen (Bl. 1/2, 3/4), 2 Blättern (Bl. 5–6) und 1 Bogen (Bl. 7/8). Stockfleck und rötliche Verfärbung mittig am oberen Rand des Bogens." ], - "writingMaterial": "Notenpapier, 18 Systeme, Format (hoch): 349 × 267 mm, Firmenzeichen [JE] | Protokoll. Schutzmarke | No. 5 | 18 linig. unten links auf Bl. 1r–2r.", + "writingMaterial": "Notenpapier, 18 Systeme, Format: hoch 349 × 267 mm, Firmenzeichen:

unten links auf Bl. 1r–2r.", "writingInstruments": { "main": "schwarze Tinte", "secondary": ["Bleistift"] @@ -595,7 +610,10 @@ "content": [ { "item": "M 34", - "itemLinkTo": "M_34_TF1", + "itemLinkTo": { + "complexId": "m34", + "sheetId": "M_34_TF1" + }, "itemDescription": "(Tintenniederschrift von Studienkomposition für Klavier M 34)", "folios": [ { @@ -623,7 +641,7 @@ }, { "item": "M 35/42", - "itemLinkTo": "", + "itemLinkTo": {}, "itemDescription": "(Tintenniederschrift von Studienkomposition für Klavier M 35/42)", "folios": [ { @@ -651,7 +669,7 @@ }, { "item": "M 35/42 Sk2", - "itemLinkTo": "", + "itemLinkTo": {}, "itemDescription": "(Skizze zu Studienkomposition für Klavier M 35/42)", "folios": [ { @@ -672,7 +690,7 @@ }, { "item": "M 36", - "itemLinkTo": "", + "itemLinkTo": {}, "itemDescription": "(Tintenniederschrift von Studienkomposition für Klavier M 36)", "folios": [ { @@ -714,7 +732,10 @@ }, { "item": "M 37", - "itemLinkTo": "M_37_TF1", + "itemLinkTo": { + "complexId": "m37", + "sheetId": "M_37_TF1" + }, "itemDescription": "(Tintenniederschrift von Studienkomposition für Klavier M 37)", "folios": [ { @@ -725,7 +746,7 @@ [ { "system": "4–5", - "measure": "17", + "measure": "1–7", "linkTo": "" } ], @@ -749,7 +770,7 @@ }, { "item": "M 38", - "itemLinkTo": "", + "itemLinkTo": {}, "itemDescription": "(Tintenniederschrift von Studienkomposition für Klavier M 38)", "folios": [ { @@ -784,8 +805,8 @@ }, { "item": "M 39", - "itemLinkTo": "", - "itemDescription": "(Tintenniederschrift von Studienkomposition für Klavier M 39: Textfassung 1→)", + "itemLinkTo": {}, + "itemDescription": "(Tintenniederschrift von Studienkomposition für Klavier M 39: Textfassung 1→2)", "folios": [ { "folio": "2r", @@ -833,7 +854,7 @@ }, { "item": "M 39 Sk2", - "itemLinkTo": "", + "itemLinkTo": {}, "itemDescription": "(Skizze zu Studienkomposition für Klavier M 39: Textfassung 2)", "folios": [ { @@ -854,7 +875,7 @@ }, { "item": "M 39 Sk3", - "itemLinkTo": "", + "itemLinkTo": {}, "itemDescription": "(Skizze zu Studienkomposition für Klavier M 39: Textfassung 2)", "folios": [ { @@ -868,14 +889,7 @@ "measure": "16–17(1–2/4)", "linkTo": "" } - ] - ] - }, - { - "folio": "", - "folioLinkTo": "", - "folioDescription": "", - "systemGroups": [ + ], [ { "system": "16b–17b (Bleistift)", @@ -889,7 +903,7 @@ }, { "item": "M 41", - "itemLinkTo": "", + "itemLinkTo": {}, "itemDescription": "(Tintenniederschrift von Studienkomposition für Klavier M 41)", "folios": [ { diff --git a/src/assets/data/edition/series/2/section/2a/m37/source-list.json b/src/assets/data/edition/series/2/section/2a/m37/source-list.json index 8543fd99e8..2157c566c6 100644 --- a/src/assets/data/edition/series/2/section/2a/m37/source-list.json +++ b/src/assets/data/edition/series/2/section/2a/m37/source-list.json @@ -5,14 +5,14 @@ "type": "Skizzen zu
Studienkomposition für Klavier M 37.
Enthält auch Skizzen zu Studienkomposition für Klavier M 34–36, M 38, M 39 Textfassung 1→2 und M* 404.", "location": "CH-Bps, Sammlung Anton Webern.", "hasDescription": true, - "linkTo": "sourceA" + "linkTo": "source_A" }, { "siglum": "B", "type": "Tintenniederschrift von
Studienkomposition für Klavier M 37.
Enthält auch Tintenniederschrift von Studienkomposition für Klavier M 34–36, M 38, M 39 Textfassung 1→2 und M 41 sowie Skizzen zu Studienkomposition für Klavier M 35/42 und 39 Textfassung 2.", "location": "CH-Bps, Sammlung Anton Webern.", "hasDescription": true, - "linkTo": "sourceB" + "linkTo": "source_B" } ] } diff --git a/src/assets/data/edition/series/2/section/2a/m37/textcritics.json b/src/assets/data/edition/series/2/section/2a/m37/textcritics.json index 0330e13509..8cc5175450 100644 --- a/src/assets/data/edition/series/2/section/2a/m37/textcritics.json +++ b/src/assets/data/edition/series/2/section/2a/m37/textcritics.json @@ -1,15 +1,62 @@ { "textcritics": [ + { + "id": "M_37_TF1", + "label": "M 37 einzige Textfassung", + "description": [ + "##Quellenbewertung:## Für die Textedition der Studienkomposition für Klavier M 37 ist B relevante Quelle. A enthält Skizzen.
B weist zwei unterscheidbare Korrekturschichten auf: Korrekturen 1 mit Tinte sowie die später entstandenen Korrekturen 2 mit Bleistift. Der Zustand vor Korrekturen 1 ist nicht immer zu entziffern.
Hauptquelle für die Textedition der Studienkomposition für Klavier M 37 ist B nach Korrekturen 1." + ], + "comments": [ + { + "svgGroupId": "g4640", + "measure": "6", + "system": "Klav. u.", + "position": "3/4", + "comment": "Notenhals und nur im Ansatz vorhandenes {{ref.getGlyph('[#]')}} ergänzt." + }, + { + "svgGroupId": "g4643", + "measure": "10", + "system": "Klav.", + "position": "(2/4)", + "comment": "Gestrichelte Linie zwischen den Systemen zur Verdeutlichung des in B verschobenen Untersatzes weggelassen.###Grafik###." + }, + { + "svgGroupId": "g4646", + "measure": "19", + "system": "Klav. u.", + "position": "2/4", + "comment": "Augmentationspunkt weggelassen mit Blick auf metrischen Kontext." + }, + { + "svgGroupId": "g4649", + "measure": "21", + "system": "Klav. u.", + "position": "1. Note", + "comment": "g korrigiert zu a mit Blick auf harmonischen Kontext." + } + ] + }, { "id": "M_37_Sk1", "label": "M 37 Sk1", "description": [ - "M 37 Sk1 skizziert möglicherweise eine erste melodische Linie für M 37. Die Zugehörigkeit zu der Studienkomposition für Klavier M 37 ist allerdings nicht eindeutig." + "Sk1 skizziert möglicherweise eine erste melodische Linie für M 37. Die Zugehörigkeit zu der Studienkomposition für Klavier M 37 ist allerdings nicht eindeutig." ], "linkBoxes": [ { - "svgGroupId": "TODO", - "linkTo": "M_37_Sk2" + "svgGroupId": "g1365", + "linkTo": { + "complexId": "m37", + "sheetId": "M_37_Sk2" + } + }, + { + "svgGroupId": "g8434", + "linkTo": { + "complexId": "m38", + "sheetId": "M_38_Sk2" + } } ] }, @@ -17,7 +64,7 @@ "id": "M_37_Sk2", "label": "M 37 Sk2", "description": [ - "M 37 Sk2 skizziert möglicherweise eine Variante zu der ersten melodischen Linie aus Sk1. Die Zugehörigkeit zu der Studienkomposition für Klavier M 37 ist allerdings nicht eindeutig." + "Sk2 skizziert möglicherweise eine Variante zu der ersten melodischen Linie aus Sk1. Die Zugehörigkeit zu der Studienkomposition für Klavier M 37 ist allerdings nicht eindeutig." ], "comments": [ { @@ -38,16 +85,24 @@ "linkBoxes": [ { "svgGroupId": "g17377", - "linkTo": "M_37_Sk1" + "linkTo": { + "complexId": "m37", + "sheetId": "M_37_Sk1" + } + }, + { + "svgGroupId": "g18107", + "linkTo": { + "complexId": "m38", + "sheetId": "M_38_Sk2" + } } ] }, { "id": "M_37_Sk3", "label": "M 37 Sk3", - "description": [ - "M 37 Sk3 ist die Verlaufsskizze zu der Studienkomposition für Klavier M 37." - ], + "description": ["Sk3 ist die Verlaufsskizze zu der Studienkomposition für Klavier M 37."], "comments": [ { "svgGroupId": "g56588", @@ -169,43 +224,6 @@ "comment": "Viertelnote überschreibt Halbe Note." } ] - }, - { - "id": "M_37_TF1", - "label": "M 37 einzige Textfassung", - "description": [ - "##Quellenbewertung:## Maßgebend für die hier vorgelegte Textedition der Studienkomposition für Klavier M 37 ist die autographe Niederschrift mit Tinte inklusive Korrekturschicht 1 (Tinte).
Hauptquelle ist B." - ], - "comments": [ - { - "svgGroupId": "g4640", - "measure": "6", - "system": "Klav. u.", - "position": "3/4", - "comment": "Notenhals und nur im Ansatz vorhandenes [#] ergänzt." - }, - { - "svgGroupId": "g4643", - "measure": "10", - "system": "Klav.", - "position": "(2/4)", - "comment": "Gestrichelte Linie zwischen den Systemen zur Verdeutlichung des in B verschobenen Untersatzes weggelassen.###Grafik###." - }, - { - "svgGroupId": "g4646", - "measure": "19", - "system": "Klav. u.", - "position": "2/4", - "comment": "Augmentationspunkt weggelassen mit Blick auf metrischen Kontext." - }, - { - "svgGroupId": "g4649", - "measure": "21", - "system": "Klav. u.", - "position": "1. Note", - "comment": "g korrigiert zu a mit Blick auf harmonischen Kontext." - } - ] } ] } diff --git a/src/assets/img/edition/firm-signs/firm_je_no5_lin18b.png b/src/assets/img/edition/firm-signs/firm_je_no5_lin18b.png new file mode 100644 index 0000000000..98e2f514eb Binary files /dev/null and b/src/assets/img/edition/firm-signs/firm_je_no5_lin18b.png differ diff --git a/src/assets/img/edition/firm-signs/firm_je_no5_lin18c.png b/src/assets/img/edition/firm-signs/firm_je_no5_lin18c.png new file mode 100644 index 0000000000..25494d50d4 Binary files /dev/null and b/src/assets/img/edition/firm-signs/firm_je_no5_lin18c.png differ diff --git a/src/assets/img/edition/firm-signs/firm_je_no5_lin18d.png b/src/assets/img/edition/firm-signs/firm_je_no5_lin18d.png new file mode 100644 index 0000000000..10bde66fbf Binary files /dev/null and b/src/assets/img/edition/firm-signs/firm_je_no5_lin18d.png differ diff --git a/src/assets/img/edition/series/1/section/5/op25/M317_Sk4-1von4-final.svg b/src/assets/img/edition/series/1/section/5/op25/M317_Sk4-1von4-final.svg index b9974ea732..8ec7667cc8 100644 --- a/src/assets/img/edition/series/1/section/5/op25/M317_Sk4-1von4-final.svg +++ b/src/assets/img/edition/series/1/section/5/op25/M317_Sk4-1von4-final.svg @@ -7,13 +7,13 @@ - + - + - + @@ -54,44 +54,44 @@ - + - + - + - + - + - + - + - + @@ -103,18 +103,18 @@ - + - + - + @@ -132,27 +132,27 @@ - + - + - + - + @@ -161,17 +161,17 @@ - + - + - + - + @@ -181,10 +181,10 @@ - + - + @@ -194,10 +194,10 @@ - + - + @@ -206,14 +206,14 @@ - + - + - + @@ -226,20 +226,20 @@ - + - + - + - + @@ -248,33 +248,33 @@ - + - + - + - + - + - + @@ -283,7 +283,7 @@ - + @@ -293,36 +293,36 @@ - + - + - + - + - + - + - + @@ -330,11 +330,11 @@ - + - - + + @@ -344,7 +344,7 @@ - + @@ -356,10 +356,10 @@ - + - + @@ -371,7 +371,7 @@ - + @@ -381,10 +381,10 @@ - + - + @@ -392,17 +392,17 @@ - + - + - + - + @@ -414,21 +414,21 @@ - + - + - + - + @@ -439,14 +439,14 @@ - + - + @@ -456,14 +456,14 @@ - + - + - + @@ -474,36 +474,36 @@ - + - + - + - + - + - + - + @@ -513,7 +513,7 @@ - + @@ -525,33 +525,33 @@ - + - + - + - + - + - + - + @@ -560,27 +560,27 @@ - + - + - + - + - + @@ -589,7 +589,7 @@ - + @@ -601,14 +601,14 @@ - + - + @@ -616,16 +616,16 @@ - + - + - - + + - + @@ -636,10 +636,10 @@ - + - + @@ -647,19 +647,19 @@ - + - + - + - + @@ -667,7 +667,7 @@ - + diff --git a/src/assets/img/edition/series/2/section/2a/m30/M30_Sk1-10von11-final.svg b/src/assets/img/edition/series/2/section/2a/m30/M30_Sk1-10von11-final.svg index 749cdabf44..135b5a504f 100644 --- a/src/assets/img/edition/series/2/section/2a/m30/M30_Sk1-10von11-final.svg +++ b/src/assets/img/edition/series/2/section/2a/m30/M30_Sk1-10von11-final.svg @@ -1,4 +1,4 @@ - + @@ -7,8 +7,8 @@ - - + + @@ -18,15 +18,15 @@ - - - - - + + + + + - - - + + + @@ -34,14 +34,14 @@ - - + + - + - + - + @@ -52,22 +52,22 @@ - - + + - - - - - - + + + + + + - + - + @@ -86,42 +86,42 @@ - + - + - + - + - + - + - + - + - + - + @@ -131,200 +131,200 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -335,93 +335,95 @@ - + - - + + - + - + - + - + - + - + - + - + - + - - - - - - - - + + + + + + + + + + - - + + - - + + - + - - + + - + - + - + - + @@ -429,16 +431,16 @@ - + - + - + - + @@ -450,16 +452,16 @@ - + - + - + @@ -468,10 +470,10 @@ - + - + diff --git a/src/assets/img/edition/series/2/section/2a/m30/M30_Sk1-11von11-final.svg b/src/assets/img/edition/series/2/section/2a/m30/M30_Sk1-11von11-final.svg index 52d6c35d0c..0c10d3bf60 100644 --- a/src/assets/img/edition/series/2/section/2a/m30/M30_Sk1-11von11-final.svg +++ b/src/assets/img/edition/series/2/section/2a/m30/M30_Sk1-11von11-final.svg @@ -1,21 +1,18 @@ - + - - - - - - - + + + + - + @@ -24,19 +21,19 @@ - - + + - + - - - - - - - + + + + + + + @@ -45,19 +42,19 @@ - - + + - - - + + + - + - + @@ -73,41 +70,43 @@ - + - + - + - + - - - - - - - - + + + + + + + + + + - + - + - + @@ -115,127 +114,129 @@ - + - - - - - - - - - - - - + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - - - - - - - - + + + + + + + + + + - - + + - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + + + + - - diff --git a/src/assets/img/edition/series/2/section/2a/m30/M30_Sk1-1von11-final.svg b/src/assets/img/edition/series/2/section/2a/m30/M30_Sk1-1von11-final.svg index 6839ce1034..447a5a0f43 100644 --- a/src/assets/img/edition/series/2/section/2a/m30/M30_Sk1-1von11-final.svg +++ b/src/assets/img/edition/series/2/section/2a/m30/M30_Sk1-1von11-final.svg @@ -6,15 +6,15 @@ - - - - - - + + + + + + - - + + @@ -22,16 +22,16 @@ - - + + - + - + - - + + @@ -39,43 +39,43 @@ - + - + - - + + - + - + - + - + - + - + - + - + - + - + @@ -95,20 +95,22 @@ - + - + - - - - - + + + + + + + - + @@ -116,10 +118,10 @@ - + - + @@ -135,31 +137,31 @@ - + - + - + - + - + - + @@ -173,11 +175,8 @@ - - - - + @@ -191,7 +190,7 @@ - + @@ -210,17 +209,17 @@ - + - + - + @@ -228,13 +227,13 @@ - + - + - + @@ -244,29 +243,26 @@ - - - - + - + - + - + - + @@ -280,21 +276,21 @@ - + - + - + - + - + @@ -319,20 +315,20 @@ - + - + - + - + @@ -340,27 +336,24 @@ - - - - + - + - + - + - + @@ -369,7 +362,7 @@ - + @@ -377,7 +370,7 @@ - + @@ -395,14 +388,14 @@ - + - + @@ -416,15 +409,15 @@ - + - + - + @@ -433,7 +426,7 @@ - + @@ -441,27 +434,24 @@ - - - - + - + - + - + - + @@ -473,7 +463,7 @@ - + @@ -483,11 +473,11 @@ - + - + @@ -496,28 +486,28 @@ - + - + - + - + - + @@ -529,29 +519,26 @@ - + - + - - - - + - + - + - + @@ -564,11 +551,11 @@ - + - + @@ -582,19 +569,19 @@ - + - + - + - + @@ -605,11 +592,28 @@ - + - - + + + + + + + + + + + + + + + + + + + @@ -631,19 +635,21 @@ - - - - - - - - + + + + + + + + + + - - + + @@ -659,17 +665,17 @@ - + - + - + diff --git a/src/assets/img/edition/series/2/section/2a/m30/M30_Sk1-2von11-final.svg b/src/assets/img/edition/series/2/section/2a/m30/M30_Sk1-2von11-final.svg index 1fbcdc7c4c..e2eee7006a 100644 --- a/src/assets/img/edition/series/2/section/2a/m30/M30_Sk1-2von11-final.svg +++ b/src/assets/img/edition/series/2/section/2a/m30/M30_Sk1-2von11-final.svg @@ -1,4 +1,4 @@ - + @@ -6,15 +6,15 @@ - - - - - - + + + + + + - - + + @@ -22,14 +22,14 @@ - - + + - + - + - + @@ -37,48 +37,48 @@ - - + + - + - - - - - - + + + + + + - + - + - + - + - + - + - + - + - + - + @@ -95,39 +95,39 @@ - + - - - + + + - + - + - + - + - + - + @@ -136,41 +136,41 @@ - + - + - + - + - + - + - + - + - + @@ -179,43 +179,39 @@ - + - + - + - + - - - - - - - - - - - + + + + + + + - + - + - + - + @@ -223,48 +219,48 @@ - + - + - + - + - + - + - + - + - + - + - + @@ -273,126 +269,101 @@ - + - + - + - + - + - + - - - - - - - + - + - + - + - + - - - - - - - - - - - - - - + - + - + - + - + - + - + - + - + - + - + - - - - - - - + @@ -400,77 +371,112 @@ - + - + - + - + - + - + - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - + + + + + + + + + + - - + + - + - + - + - + - + diff --git a/src/assets/img/edition/series/2/section/2a/m30/M30_Sk1-3von11-final.svg b/src/assets/img/edition/series/2/section/2a/m30/M30_Sk1-3von11-final.svg index 880a9e1aae..7136d7b72e 100644 --- a/src/assets/img/edition/series/2/section/2a/m30/M30_Sk1-3von11-final.svg +++ b/src/assets/img/edition/series/2/section/2a/m30/M30_Sk1-3von11-final.svg @@ -1,4 +1,4 @@ - + @@ -6,14 +6,14 @@ - - - - - - + + + + + + - + @@ -21,15 +21,15 @@ - - + + - + - - + + @@ -37,24 +37,24 @@ - + - + - - + + - - - - + + + + - + - + @@ -67,14 +67,14 @@ - - - - - + + + + + - + @@ -82,268 +82,274 @@ - + - - - - - - - - - - - - + + + + + + + - + - + - + - + - + - + - + - + - + - + - + - - - - - - - - + - + - + - + - + - + - + - + - + - + - - - - - - - - + - + - + - + - + - + - - - - - - - - + - + - + - + - + - + - + - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - + + - + - - - - - - - - + + + + + + + + + + - - + + - + - + - + - + - + - + - + - + - + - + - + diff --git a/src/assets/img/edition/series/2/section/2a/m30/M30_Sk1-4von11-final.svg b/src/assets/img/edition/series/2/section/2a/m30/M30_Sk1-4von11-final.svg index fe3860abaa..39b0e0c197 100644 --- a/src/assets/img/edition/series/2/section/2a/m30/M30_Sk1-4von11-final.svg +++ b/src/assets/img/edition/series/2/section/2a/m30/M30_Sk1-4von11-final.svg @@ -1,4 +1,4 @@ - + @@ -6,16 +6,16 @@ - - - - - - + + + + + + - - - + + + @@ -23,12 +23,12 @@ - - + + - - + + @@ -36,46 +36,46 @@ - - + + - - - - - - + + + + + + - + - + - + - + - + - + - + - + - + - + @@ -97,36 +97,36 @@ - + - + - + - + - + - + @@ -138,134 +138,132 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - - - - - - - - - - + + + + + + + + + + + + - + - + - + - + @@ -273,109 +271,101 @@ - + - + - + - + - + - - - - - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - + - + - + - + - + @@ -389,68 +379,82 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - + + + + + + + + + + + + + + + + + + @@ -460,19 +464,21 @@ - - - - - - - - + + + + + + + + + + - - + + @@ -482,79 +488,81 @@ - + - - - - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + + + + + + + + - - - + - + - + - + - + - + - + - + - + - + - + @@ -565,24 +573,24 @@ - + - + - + - + - + - + @@ -591,24 +599,28 @@ - + - - - + + + + + + + - - - - - - + + + + + + diff --git a/src/assets/img/edition/series/2/section/2a/m30/M30_Sk1-5von11-final.svg b/src/assets/img/edition/series/2/section/2a/m30/M30_Sk1-5von11-final.svg index 61db9c7a9a..662b4d77f2 100644 --- a/src/assets/img/edition/series/2/section/2a/m30/M30_Sk1-5von11-final.svg +++ b/src/assets/img/edition/series/2/section/2a/m30/M30_Sk1-5von11-final.svg @@ -1,4 +1,4 @@ - + @@ -6,12 +6,12 @@ - - - - + + + + - + @@ -19,14 +19,14 @@ - - + + - - + + @@ -34,211 +34,217 @@ - - + + - - - - - - + + + + + + - - - - - - - - + + + + + + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - - - - + + + + + + + + + + - - + + - - - + + + - + - + - - - - - - - - - - - - - + + + + - - + + + + + + + + + + + + + + + - - - + - - - + + + - + - - + + - + - + - - + + - + @@ -246,13 +252,13 @@ - + - + - + @@ -260,21 +266,21 @@ - + - + - + - + diff --git a/src/assets/img/edition/series/2/section/2a/m30/M30_Sk1-6von11-final.svg b/src/assets/img/edition/series/2/section/2a/m30/M30_Sk1-6von11-final.svg index d12df06214..71219decbb 100644 --- a/src/assets/img/edition/series/2/section/2a/m30/M30_Sk1-6von11-final.svg +++ b/src/assets/img/edition/series/2/section/2a/m30/M30_Sk1-6von11-final.svg @@ -1,4 +1,4 @@ - + @@ -7,13 +7,13 @@ - - - - - + + + + + - + @@ -21,13 +21,13 @@ - - + + - + - + @@ -35,22 +35,22 @@ - - + + - + - - - - - - - + + + + + + + - + @@ -69,137 +69,130 @@ - - + + - - + + - + - + - + - + - + - + - + - + - + - + - + - - - - - - - - - - - + + + + + + + + + - + - + - + - + - - - - - - + - + - + - + - + - + - + - + - + - + @@ -209,95 +202,82 @@ - - - - - - + - + - + - + - + - + - + - - - - + - + - + - + - + - + - + - + - + - + - - - - - @@ -310,15 +290,15 @@ - + - + - + @@ -327,159 +307,184 @@ - + - + - + - - - - - - - - + - + - + - + - + - + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - - - - - - - + + + + + + + + + + - - + + - + - + - - - - - - - - - - - - - - - - - + - - - - - - - - + + + + - - + + - - + + - - + + + + + + + + + + + + + + + + + + + + + + + + + - - + - + - + - + - + @@ -493,70 +498,75 @@ - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + + + + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -565,34 +575,34 @@ - - - - + + + + + + - - - + - + - + - + - + - + @@ -603,10 +613,10 @@ - + - + diff --git a/src/assets/img/edition/series/2/section/2a/m30/M30_Sk1-7von11-final.svg b/src/assets/img/edition/series/2/section/2a/m30/M30_Sk1-7von11-final.svg index e1d3a86734..feb3aaf150 100644 --- a/src/assets/img/edition/series/2/section/2a/m30/M30_Sk1-7von11-final.svg +++ b/src/assets/img/edition/series/2/section/2a/m30/M30_Sk1-7von11-final.svg @@ -1,4 +1,4 @@ - + @@ -7,13 +7,13 @@ - - - - - + + + + + - + @@ -21,13 +21,13 @@ - - + + - + - - + + @@ -35,22 +35,22 @@ - - + + - - + + - - - - - - + + + + + + - + @@ -68,64 +68,64 @@ - - + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -139,129 +139,114 @@ - + - - - - - + - - - - - - - - - + - - - - + + + + + + + + + + + + + - + - + - + - + - - - - - - - - + - + - + - + - + - + - + - + - + - + - - - - - - + @@ -274,23 +259,23 @@ - + - + - + - + - + @@ -300,30 +285,25 @@ - + - - - - - - + - + - + - + @@ -335,34 +315,34 @@ - + - + - + - + - + - + - + @@ -370,11 +350,11 @@ - + - + @@ -382,23 +362,47 @@ - + - + - + - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -407,19 +411,21 @@ - - - - - - - - + + + + + + + + + + - - + + @@ -427,126 +433,107 @@ - + - - + + - - - - - - - - + + + + - - + + + + + + + + + + + + + + + - - + + + + - - + + + + + + + + + + + + + - + + - - - - - - - - + + + - - + + - - + + - - + + + + - - - - - - - - - - - - - - - - - - - + - + - - - - - - - - - - + + + - - - - - - - - + - - - - - - - - + + + + - - - + + + - - - - - - - - + + + + + @@ -554,11 +541,34 @@ - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - diff --git a/src/assets/img/edition/series/2/section/2a/m30/M30_Sk1-8von11-final.svg b/src/assets/img/edition/series/2/section/2a/m30/M30_Sk1-8von11-final.svg index 451008de5a..c0448aa873 100644 --- a/src/assets/img/edition/series/2/section/2a/m30/M30_Sk1-8von11-final.svg +++ b/src/assets/img/edition/series/2/section/2a/m30/M30_Sk1-8von11-final.svg @@ -1,4 +1,4 @@ - + @@ -6,14 +6,14 @@ - - - - - - + + + + + + - + @@ -21,14 +21,14 @@ - - + + - + - - - + + + @@ -37,25 +37,25 @@ - - - + + + - + - - - - - + + + + + - + - + @@ -74,209 +74,199 @@ - + - + - - - - - + + + + + + + - + - + - + - - - - - + - + - + - + - + - + - - - - - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - + - + - + - + - + - + - + - + - + - + - + - + @@ -285,50 +275,50 @@ - + - + - + - + - + - + - + - + - + - + - + @@ -336,147 +326,161 @@ - + - + - + - + - + - + - + - + - - - - - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - + + + + + + + + + + + + + + + + + + + + + - + @@ -484,7 +488,7 @@ - + @@ -495,24 +499,26 @@ - + - - - - - - - - + + + + + + + + + + - - + + @@ -522,76 +528,80 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + + + + - - - + - + - + - + - + - + - - - + + + + + + + - - diff --git a/src/assets/img/edition/series/2/section/2a/m30/M30_Sk1-9von11-final.svg b/src/assets/img/edition/series/2/section/2a/m30/M30_Sk1-9von11-final.svg index 22b5a56a4d..998eccd6bf 100644 --- a/src/assets/img/edition/series/2/section/2a/m30/M30_Sk1-9von11-final.svg +++ b/src/assets/img/edition/series/2/section/2a/m30/M30_Sk1-9von11-final.svg @@ -1,4 +1,4 @@ - + @@ -6,7 +6,7 @@ - + @@ -15,15 +15,15 @@ - - - - - - + + + + + + - - + + @@ -31,12 +31,12 @@ - - + + - - + + @@ -46,18 +46,18 @@ - + - + - - - - + + + + - - + + @@ -75,56 +75,55 @@ - - - + + - + - + - + - + - + - + - + - + - + - + - + - + @@ -132,31 +131,31 @@ - + - + - + - + - + - + - + - + @@ -164,46 +163,51 @@ - + - + - + - + - - - - - - + + + + + + + + - + - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + @@ -215,30 +219,30 @@ - + - + - + - + - + - + @@ -246,48 +250,48 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -297,156 +301,158 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -461,101 +467,105 @@ - - - - - - - - + + + + + + + + + + - - + + - - + + - - + + - + - + - - - - - - - - - - - - - - + + + + + - - + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - + + + - - + + + + + + + + + + + + + + + - - + - + - + - + @@ -563,6 +573,6 @@ - + diff --git a/src/assets/img/edition/series/2/section/2a/m30/M30_Textfassung1-1von2-final.svg b/src/assets/img/edition/series/2/section/2a/m30/M30_Textfassung1-1von2-final.svg new file mode 100644 index 0000000000..5468452c34 --- /dev/null +++ b/src/assets/img/edition/series/2/section/2a/m30/M30_Textfassung1-1von2-final.svg @@ -0,0 +1,829 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/assets/img/edition/series/2/section/2a/m30/M30_Textfassung1-2von2-final.svg b/src/assets/img/edition/series/2/section/2a/m30/M30_Textfassung1-2von2-final.svg new file mode 100644 index 0000000000..a697131644 --- /dev/null +++ b/src/assets/img/edition/series/2/section/2a/m30/M30_Textfassung1-2von2-final.svg @@ -0,0 +1,1649 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/assets/img/edition/series/2/section/2a/m31/M31_Sk1-1von2-final.svg b/src/assets/img/edition/series/2/section/2a/m31/M31_Sk1-1von2-final.svg new file mode 100644 index 0000000000..b57e24735e --- /dev/null +++ b/src/assets/img/edition/series/2/section/2a/m31/M31_Sk1-1von2-final.svg @@ -0,0 +1,239 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/assets/img/edition/series/2/section/2a/m31/M31_Sk1-2von2-final.svg b/src/assets/img/edition/series/2/section/2a/m31/M31_Sk1-2von2-final.svg new file mode 100644 index 0000000000..1867cc782b --- /dev/null +++ b/src/assets/img/edition/series/2/section/2a/m31/M31_Sk1-2von2-final.svg @@ -0,0 +1,254 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/assets/img/edition/series/2/section/2a/m31/M31_Sk2-1von1-final.svg b/src/assets/img/edition/series/2/section/2a/m31/M31_Sk2-1von1-final.svg new file mode 100644 index 0000000000..3091142289 --- /dev/null +++ b/src/assets/img/edition/series/2/section/2a/m31/M31_Sk2-1von1-final.svg @@ -0,0 +1,224 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/assets/img/edition/series/2/section/2a/m31/M31_Sk3-1von4-final.svg b/src/assets/img/edition/series/2/section/2a/m31/M31_Sk3-1von4-final.svg new file mode 100644 index 0000000000..a0b7703965 --- /dev/null +++ b/src/assets/img/edition/series/2/section/2a/m31/M31_Sk3-1von4-final.svg @@ -0,0 +1,506 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/assets/img/edition/series/2/section/2a/m31/M31_Sk3-2von4-final.svg b/src/assets/img/edition/series/2/section/2a/m31/M31_Sk3-2von4-final.svg new file mode 100644 index 0000000000..515b49395d --- /dev/null +++ b/src/assets/img/edition/series/2/section/2a/m31/M31_Sk3-2von4-final.svg @@ -0,0 +1,494 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/assets/img/edition/series/2/section/2a/m31/M31_Sk3-3von4-final.svg b/src/assets/img/edition/series/2/section/2a/m31/M31_Sk3-3von4-final.svg new file mode 100644 index 0000000000..2d8df6eefc --- /dev/null +++ b/src/assets/img/edition/series/2/section/2a/m31/M31_Sk3-3von4-final.svg @@ -0,0 +1,455 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/assets/img/edition/series/2/section/2a/m31/M31_Sk3-4von4-final.svg b/src/assets/img/edition/series/2/section/2a/m31/M31_Sk3-4von4-final.svg new file mode 100644 index 0000000000..5c03128e90 --- /dev/null +++ b/src/assets/img/edition/series/2/section/2a/m31/M31_Sk3-4von4-final.svg @@ -0,0 +1,207 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/assets/img/edition/series/2/section/2a/m31/M31_Sk3_1-1von1-final.svg b/src/assets/img/edition/series/2/section/2a/m31/M31_Sk3_1-1von1-final.svg new file mode 100644 index 0000000000..ed73033066 --- /dev/null +++ b/src/assets/img/edition/series/2/section/2a/m31/M31_Sk3_1-1von1-final.svg @@ -0,0 +1,189 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/assets/img/edition/series/2/section/2a/m31/M31_Sk3_2-1von1-final.svg b/src/assets/img/edition/series/2/section/2a/m31/M31_Sk3_2-1von1-final.svg new file mode 100644 index 0000000000..21c1ca3f45 --- /dev/null +++ b/src/assets/img/edition/series/2/section/2a/m31/M31_Sk3_2-1von1-final.svg @@ -0,0 +1,187 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/assets/img/edition/series/2/section/2a/m31/M31_Sk4-1von3-final.svg b/src/assets/img/edition/series/2/section/2a/m31/M31_Sk4-1von3-final.svg new file mode 100644 index 0000000000..44b55a79b0 --- /dev/null +++ b/src/assets/img/edition/series/2/section/2a/m31/M31_Sk4-1von3-final.svg @@ -0,0 +1,598 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/assets/img/edition/series/2/section/2a/m31/M31_Sk4-2von3-final.svg b/src/assets/img/edition/series/2/section/2a/m31/M31_Sk4-2von3-final.svg new file mode 100644 index 0000000000..cd705a86ca --- /dev/null +++ b/src/assets/img/edition/series/2/section/2a/m31/M31_Sk4-2von3-final.svg @@ -0,0 +1,231 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/assets/img/edition/series/2/section/2a/m31/M31_Sk4-3von3-final.svg b/src/assets/img/edition/series/2/section/2a/m31/M31_Sk4-3von3-final.svg new file mode 100644 index 0000000000..6e2da453bf --- /dev/null +++ b/src/assets/img/edition/series/2/section/2a/m31/M31_Sk4-3von3-final.svg @@ -0,0 +1,463 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/assets/img/edition/series/2/section/2a/m31/M31_Sk5-1von3-final.svg b/src/assets/img/edition/series/2/section/2a/m31/M31_Sk5-1von3-final.svg new file mode 100644 index 0000000000..4853fa648b --- /dev/null +++ b/src/assets/img/edition/series/2/section/2a/m31/M31_Sk5-1von3-final.svg @@ -0,0 +1,510 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/assets/img/edition/series/2/section/2a/m31/M31_Sk5-2von3-final.svg b/src/assets/img/edition/series/2/section/2a/m31/M31_Sk5-2von3-final.svg new file mode 100644 index 0000000000..76743a346e --- /dev/null +++ b/src/assets/img/edition/series/2/section/2a/m31/M31_Sk5-2von3-final.svg @@ -0,0 +1,532 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/assets/img/edition/series/2/section/2a/m31/M31_Sk5-3von3-final.svg b/src/assets/img/edition/series/2/section/2a/m31/M31_Sk5-3von3-final.svg new file mode 100644 index 0000000000..8882debfea --- /dev/null +++ b/src/assets/img/edition/series/2/section/2a/m31/M31_Sk5-3von3-final.svg @@ -0,0 +1,161 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/assets/img/edition/series/2/section/2a/m31/M31_Textfassung1-1von2-final.svg b/src/assets/img/edition/series/2/section/2a/m31/M31_Textfassung1-1von2-final.svg new file mode 100644 index 0000000000..22db44d7d1 --- /dev/null +++ b/src/assets/img/edition/series/2/section/2a/m31/M31_Textfassung1-1von2-final.svg @@ -0,0 +1,1467 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/assets/img/edition/series/2/section/2a/m31/M31_Textfassung1-2von2-final.svg b/src/assets/img/edition/series/2/section/2a/m31/M31_Textfassung1-2von2-final.svg new file mode 100644 index 0000000000..2373bf4256 --- /dev/null +++ b/src/assets/img/edition/series/2/section/2a/m31/M31_Textfassung1-2von2-final.svg @@ -0,0 +1,1292 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/assets/img/edition/series/2/section/2a/m37/M37_Sk1-1von1-final.svg b/src/assets/img/edition/series/2/section/2a/m37/M37_Sk1-1von1-final.svg index fa10e32b69..adaff57519 100644 --- a/src/assets/img/edition/series/2/section/2a/m37/M37_Sk1-1von1-final.svg +++ b/src/assets/img/edition/series/2/section/2a/m37/M37_Sk1-1von1-final.svg @@ -1,4 +1,4 @@ - + @@ -6,11 +6,11 @@ - - + + - - + + @@ -20,18 +20,18 @@ - - + + - + - - - - - + + + + + @@ -39,11 +39,11 @@ - - + + - - + + @@ -62,44 +62,44 @@ - + - + - + - + - + - + - + - + - + - + @@ -110,21 +110,21 @@ - + - - - + + + - + - + @@ -141,17 +141,16 @@ - + - + - - + 2 diff --git a/src/assets/img/edition/series/2/section/2a/m37/M37_Sk2-1von1-final.svg b/src/assets/img/edition/series/2/section/2a/m37/M37_Sk2-1von1-final.svg index 9b8e574fd5..fc9be1c964 100644 --- a/src/assets/img/edition/series/2/section/2a/m37/M37_Sk2-1von1-final.svg +++ b/src/assets/img/edition/series/2/section/2a/m37/M37_Sk2-1von1-final.svg @@ -1,4 +1,4 @@ - + @@ -7,11 +7,11 @@ - - - - - + + + + + @@ -21,19 +21,19 @@ - - + + - + - + - - - - - + + + + + @@ -41,12 +41,12 @@ - - + + - - - + + + @@ -66,59 +66,59 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -126,32 +126,32 @@ - + - + - + - + - - - + + + - + - + @@ -167,15 +167,15 @@ - + - + - + - + @@ -185,19 +185,19 @@ - + - + - + - + diff --git a/src/assets/img/edition/series/2/section/2a/m37/M37_Sk3-1von3-final.svg b/src/assets/img/edition/series/2/section/2a/m37/M37_Sk3-1von3-final.svg index cac121220e..06a96894ce 100644 --- a/src/assets/img/edition/series/2/section/2a/m37/M37_Sk3-1von3-final.svg +++ b/src/assets/img/edition/series/2/section/2a/m37/M37_Sk3-1von3-final.svg @@ -1,4 +1,4 @@ - + @@ -7,14 +7,14 @@ - - - - + + + + - - - + + + @@ -22,12 +22,12 @@ - - + + - - + + @@ -35,21 +35,21 @@ - + - + - - + + - + - + - + @@ -68,214 +68,214 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -288,36 +288,36 @@ - + - + - + - + - + - + - + - + @@ -325,89 +325,89 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -415,10 +415,10 @@ - + - + @@ -440,7 +440,7 @@ - + @@ -448,7 +448,7 @@ - + @@ -456,15 +456,15 @@ - + - + - + diff --git a/src/assets/img/edition/series/2/section/2a/m37/M37_Sk3-2von3-final.svg b/src/assets/img/edition/series/2/section/2a/m37/M37_Sk3-2von3-final.svg index 7d75195ae4..542da9bf84 100644 --- a/src/assets/img/edition/series/2/section/2a/m37/M37_Sk3-2von3-final.svg +++ b/src/assets/img/edition/series/2/section/2a/m37/M37_Sk3-2von3-final.svg @@ -1,4 +1,4 @@ - + @@ -7,13 +7,13 @@ - - - - - - - + + + + + + + @@ -21,13 +21,13 @@ - - + + - + - - + + @@ -35,21 +35,21 @@ - - + + - + - - + + - + - + @@ -72,62 +72,62 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -136,15 +136,15 @@ - + - + - + @@ -158,141 +158,141 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -302,24 +302,24 @@ - + - + - + - + - + @@ -329,39 +329,39 @@ - + - + - + - + - + - + - + - + - + @@ -369,14 +369,14 @@ - + - + - + @@ -384,30 +384,30 @@ - + - + - + - + - + - + - + @@ -415,56 +415,56 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -472,38 +472,38 @@ - + - + - + - + - + - + - + - + - + @@ -529,7 +529,7 @@ - + @@ -537,14 +537,14 @@ - - - + + + - + - + diff --git a/src/assets/img/edition/series/2/section/2a/m37/M37_Sk3-3von3-final.svg b/src/assets/img/edition/series/2/section/2a/m37/M37_Sk3-3von3-final.svg index 973a736a5b..ff1ea819c2 100644 --- a/src/assets/img/edition/series/2/section/2a/m37/M37_Sk3-3von3-final.svg +++ b/src/assets/img/edition/series/2/section/2a/m37/M37_Sk3-3von3-final.svg @@ -1,4 +1,4 @@ - + @@ -7,14 +7,14 @@ - - - - + + + + - - - + + + @@ -22,14 +22,14 @@ - + - + - - + + @@ -37,16 +37,16 @@ - - + + - + - - + + - - + + @@ -68,18 +68,18 @@ - + - + - + - + @@ -93,96 +93,96 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -197,27 +197,27 @@ - + - + - + - + - + @@ -227,13 +227,13 @@ - + - + @@ -247,89 +247,89 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -337,26 +337,26 @@ - + - + - + - + - + - + @@ -364,15 +364,15 @@ - + - + - + @@ -382,7 +382,7 @@ - + @@ -390,30 +390,30 @@ - - - + + + - + - + - + - + - + diff --git a/src/assets/img/edition/series/2/section/2a/m37/M37_Textfassung1-1von1-final.svg b/src/assets/img/edition/series/2/section/2a/m37/M37_Textfassung1-1von1-final.svg index 96171ea0b6..d5812180a2 100644 --- a/src/assets/img/edition/series/2/section/2a/m37/M37_Textfassung1-1von1-final.svg +++ b/src/assets/img/edition/series/2/section/2a/m37/M37_Textfassung1-1von1-final.svg @@ -1,60 +1,54 @@ - + - - - - + - + - + - + - + - + - + - + - + - - - - + - + - + - + @@ -63,67 +57,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -147,13 +81,13 @@ - + - + - + @@ -168,7 +102,7 @@ - + @@ -180,7 +114,7 @@ - + @@ -189,13 +123,13 @@ - + - + @@ -436,7 +370,7 @@ - + @@ -566,10 +500,10 @@ - + - - + + @@ -694,8 +628,8 @@ - - + + diff --git a/src/testing/mock-data/mockEditionData.ts b/src/testing/mock-data/mockEditionData.ts index 00e1b2e9dd..8ea1f5b4ac 100644 --- a/src/testing/mock-data/mockEditionData.ts +++ b/src/testing/mock-data/mockEditionData.ts @@ -28,7 +28,8 @@ export const mockEditionData = { }, content: [ { - id: 'M_212_Sk1', + complexId: 'op12', + sheetId: 'M_212_Sk1', sigle: 'M 212 Sk1', sigleAddendum: 'T. 1–2, [3–6]', selectable: false, @@ -84,7 +85,7 @@ export const mockEditionData = { id: 'op12', content: [ 'Die Skizzen in A enthalten datierte Verlaufsskizzen zu allen vier Liedern.', - 'In Test Sk1 werden T. [11]–[12] aus Test Sk1 neu skizziert', + "In Test Sk1 werden T. [11]–[12] aus Test Sk1 neu skizziert", ], }, ], @@ -241,7 +242,10 @@ export const mockEditionData = { content: [ { item: 'Test item', - itemLinkTo: 'test_item_id_1', + itemLinkTo: { + complexId: 'testComplex1', + sheetId: 'test_item_id_1', + }, itemDescription: '(test description)', folios: [ { @@ -291,7 +295,7 @@ export const mockEditionData = { }, { item: 'Test item 2 without link', - itemLinkTo: '', + itemLinkTo: {}, itemDescription: '(test description 2)', folios: [ { @@ -400,13 +404,16 @@ export const mockEditionData = { }, { item: 'Test item 3 without description', - itemLinkTo: 'test_item_id_2', + itemLinkTo: { + complexId: 'testComplex1', + sheetId: 'test_item_id_2', + }, itemDescription: '', folios: [], }, { item: '', - itemLinkTo: '', + itemLinkTo: {}, itemDescription: '', folios: [ { @@ -434,7 +441,7 @@ export const mockEditionData = { id: 'op25', content: [ '[Die Quellenbewertung zum gesamten Editionskomplex Drei Lieder nach Gedichten von Hildegard Jone op. 25 erscheint im Zusammenhang der vollständigen Edition von Opus 25 in AWG I/5.]', - 'Die Skizzen in A enthalten u. a. Test Sk1 (13. Januar 1915) als Korrekturen einer in B und in Test Sk1 vorformulierten Fassung dar.', + "Die Skizzen in A enthalten u. a. Test Sk1 (13. Januar 1915) als Korrekturen einer in B und in Test Sk1 vorformulierten Fassung dar.", ], }, ], @@ -848,7 +855,10 @@ export const mockEditionData = { { id: 'test-2', label: 'test2', - description: ['test description 1', 'test description 2'], + description: [ + 'test description 1', + "In Sk2 werden T. 11–12 aus Sk1 bzw. T. 10–11 aus B neu skizziert, weiter modifiziert und zu einer Formulierung gebracht, die T. 10–11 aus C entspricht.", + ], rowtable: true, comments: [ { @@ -864,7 +874,7 @@ export const mockEditionData = { system: '12', position: '2. Note', comment: - 'Die Skizzen in A enthalten datierte Verlaufsskizzen zu allen vier Liedern. Siehe Test SkXYZ T. [11] und Test Sk1.', + "Die Skizzen in A enthalten datierte Verlaufsskizzen zu allen vier Liedern. Siehe Test SkXYZ T. [11] und Test Sk1.", }, { svgGroupId: 'svg-group-3', diff --git a/src/testing/mock-helper/mock-cache.ts b/src/testing/mock-helper/mock-cache.ts index 3fff859bc8..912730f9cd 100644 --- a/src/testing/mock-helper/mock-cache.ts +++ b/src/testing/mock-helper/mock-cache.ts @@ -39,9 +39,7 @@ export const mockCache: IMockCache = { cachedResponses.set(req.urlWithParams, resp.clone()); }, get(req: HttpRequest): HttpResponse | null { - return cachedResponses && cachedResponses.has(req.urlWithParams) - ? cachedResponses.get(req.urlWithParams) - : null; + return cachedResponses?.has(req.urlWithParams) ? cachedResponses.get(req.urlWithParams) : null; }, clear(): void { cachedResponses = new Map>(); diff --git a/yarn.lock b/yarn.lock index 83336f4983..78e502a540 100644 --- a/yarn.lock +++ b/yarn.lock @@ -20,50 +20,48 @@ "@jridgewell/gen-mapping" "^0.3.0" "@jridgewell/trace-mapping" "^0.3.9" -"@angular-devkit/architect@0.1700.10": - version "0.1700.10" - resolved "https://registry.yarnpkg.com/@angular-devkit/architect/-/architect-0.1700.10.tgz#cf3bb2dfca17bb7d78639b7e55e13bb16627fa62" - integrity sha512-JD/3jkdN1jrFMIDEk9grKdbjutIoxUDMRazq1LZooWjTkzlYk09i/s6HwvIPao7zvxJfelD6asTPspgkjOMP5A== +"@angular-devkit/architect@0.1701.0": + version "0.1701.0" + resolved "https://registry.yarnpkg.com/@angular-devkit/architect/-/architect-0.1701.0.tgz#993ff25c079c6f439e0eec90d85953639f789a75" + integrity sha512-VP6mjptKFn0HO2dn4bH0mFMe4CrexlWlgnTHyAUbL7ZFaV9w4VQuE/vXr60wMlQ+83NIGUeJImjt1QVNlIjJnQ== dependencies: - "@angular-devkit/core" "17.0.10" + "@angular-devkit/core" "17.1.0" rxjs "7.8.1" -"@angular-devkit/build-angular@^17.0.10": - version "17.0.10" - resolved "https://registry.yarnpkg.com/@angular-devkit/build-angular/-/build-angular-17.0.10.tgz#d18b6d4609f6d971805ebace94732355938dcf6d" - integrity sha512-RWVu5Pdg6VdO3v1i0oI+HGr/NE4rhbNelM43w+9TqrzDtwmvckWsadSp0H88cPhQ4YGY5ldGKyQufO1UItR26w== +"@angular-devkit/build-angular@^17.1.0": + version "17.1.0" + resolved "https://registry.yarnpkg.com/@angular-devkit/build-angular/-/build-angular-17.1.0.tgz#c3edbf9a3ec005d1f8baa154d3990798cd508384" + integrity sha512-N9B2SlKewD48qKFgRPKDH1X2EvOGll1ocMlFxi95mT9aXuFd2d75JUYHzS1v3FQRU3peoAoFKxCV7OuIL/cmTA== dependencies: "@ampproject/remapping" "2.2.1" - "@angular-devkit/architect" "0.1700.10" - "@angular-devkit/build-webpack" "0.1700.10" - "@angular-devkit/core" "17.0.10" - "@babel/core" "7.23.2" - "@babel/generator" "7.23.0" + "@angular-devkit/architect" "0.1701.0" + "@angular-devkit/build-webpack" "0.1701.0" + "@angular-devkit/core" "17.1.0" + "@babel/core" "7.23.7" + "@babel/generator" "7.23.6" "@babel/helper-annotate-as-pure" "7.22.5" "@babel/helper-split-export-declaration" "7.22.6" - "@babel/plugin-transform-async-generator-functions" "7.23.2" - "@babel/plugin-transform-async-to-generator" "7.22.5" - "@babel/plugin-transform-runtime" "7.23.2" - "@babel/preset-env" "7.23.2" - "@babel/runtime" "7.23.2" + "@babel/plugin-transform-async-generator-functions" "7.23.7" + "@babel/plugin-transform-async-to-generator" "7.23.3" + "@babel/plugin-transform-runtime" "7.23.7" + "@babel/preset-env" "7.23.7" + "@babel/runtime" "7.23.7" "@discoveryjs/json-ext" "0.5.7" - "@ngtools/webpack" "17.0.10" - "@vitejs/plugin-basic-ssl" "1.0.1" + "@ngtools/webpack" "17.1.0" + "@vitejs/plugin-basic-ssl" "1.0.2" ansi-colors "4.1.3" autoprefixer "10.4.16" babel-loader "9.1.3" babel-plugin-istanbul "6.1.1" - browser-sync "2.29.3" browserslist "^4.21.5" - chokidar "3.5.3" copy-webpack-plugin "11.0.0" critters "0.0.20" css-loader "6.8.1" - esbuild-wasm "0.19.5" - fast-glob "3.3.1" + esbuild-wasm "0.19.11" + fast-glob "3.3.2" http-proxy-middleware "2.0.6" https-proxy-agent "7.0.2" - inquirer "9.2.11" + inquirer "9.2.12" jsonc-parser "3.2.0" karma-source-map-support "1.4.0" less "4.2.0" @@ -72,41 +70,42 @@ loader-utils "3.2.1" magic-string "0.30.5" mini-css-extract-plugin "2.7.6" - mrmime "1.0.1" + mrmime "2.0.0" open "8.4.2" ora "5.4.1" parse5-html-rewriting-stream "7.0.0" picomatch "3.0.1" - piscina "4.1.0" - postcss "8.4.31" - postcss-loader "7.3.3" + piscina "4.2.1" + postcss "8.4.33" + postcss-loader "7.3.4" resolve-url-loader "5.0.0" rxjs "7.8.1" - sass "1.69.5" - sass-loader "13.3.2" + sass "1.69.7" + sass-loader "13.3.3" semver "7.5.4" - source-map-loader "4.0.1" + source-map-loader "5.0.0" source-map-support "0.5.21" - terser "5.24.0" + terser "5.26.0" text-table "0.2.0" tree-kill "1.2.2" tslib "2.6.2" - undici "5.27.2" - vite "4.5.1" + undici "6.2.1" + vite "5.0.11" + watchpack "2.4.0" webpack "5.89.0" webpack-dev-middleware "6.1.1" webpack-dev-server "4.15.1" webpack-merge "5.10.0" webpack-subresource-integrity "5.1.0" optionalDependencies: - esbuild "0.19.5" + esbuild "0.19.11" -"@angular-devkit/build-webpack@0.1700.10": - version "0.1700.10" - resolved "https://registry.yarnpkg.com/@angular-devkit/build-webpack/-/build-webpack-0.1700.10.tgz#c3837bd15735caef3b4bd651f01dec23dbeb84cd" - integrity sha512-jjcH5zGWre+adnVqjBdAr04Yto8oG6j7fFWuoiBVWEtK8AmesukGJQY8+QKX5UcrsyjP7COsfbz5WeJk3g1KOg== +"@angular-devkit/build-webpack@0.1701.0": + version "0.1701.0" + resolved "https://registry.yarnpkg.com/@angular-devkit/build-webpack/-/build-webpack-0.1701.0.tgz#41a5235c4c9cfb728a43a01cb7da59edc18ae412" + integrity sha512-AUQbdnAXMdXKPj51RWr+0SusTh5M1EWEpXtEZgDSO5Vab6ak+xsX+k1IhjlEoliF0prHjD5WzBegr6WKCjZ30w== dependencies: - "@angular-devkit/architect" "0.1700.10" + "@angular-devkit/architect" "0.1701.0" rxjs "7.8.1" "@angular-devkit/core@14.2.12": @@ -120,10 +119,10 @@ rxjs "6.6.7" source-map "0.7.4" -"@angular-devkit/core@17.0.10": - version "17.0.10" - resolved "https://registry.yarnpkg.com/@angular-devkit/core/-/core-17.0.10.tgz#dce8b3cd4b90d694ed5ccf405c8f25e45938b310" - integrity sha512-93N6oHnmtRt0hL3AXxvnk47sN1rHndfj+pqI5haEY41AGWzIWv9cSBsqlM0PWltNpo6VivcExZESvbLJ71wqbQ== +"@angular-devkit/core@17.1.0": + version "17.1.0" + resolved "https://registry.yarnpkg.com/@angular-devkit/core/-/core-17.1.0.tgz#51fad193655f34b73675b252883a02211926ef64" + integrity sha512-w7HeJjyM6YtjXrwFdmFIsp9lzDPAFJov8hVCD18DZaCwryRixz+o8egfw2SkpI4L8kuGAiGxpaCTRsTQtmR4/w== dependencies: ajv "8.12.0" ajv-formats "2.1.1" @@ -143,12 +142,12 @@ ora "5.4.1" rxjs "6.6.7" -"@angular-devkit/schematics@17.0.10": - version "17.0.10" - resolved "https://registry.yarnpkg.com/@angular-devkit/schematics/-/schematics-17.0.10.tgz#700067a2db9cd89883ec838b674c111c9cafdcc4" - integrity sha512-hjf4gaMx2uB6ZhBstBSH0Q2hzfp6kxI4IiJ5i1QrxPNE1MdGnb2h+LgPTRCdO72a7PGeWcSxFRE7cxrXeQy19g== +"@angular-devkit/schematics@17.1.0": + version "17.1.0" + resolved "https://registry.yarnpkg.com/@angular-devkit/schematics/-/schematics-17.1.0.tgz#00036eb9126cbf89417341ed62ef578d1d83b2f4" + integrity sha512-7q4Bk3+ePBdzrmMWxWBnNdN4kmBe2jJwa3vAofaMqZiIBEor85YcOsrUJvcWM/3+/TusgZr4p/4+oJgiYDrj5A== dependencies: - "@angular-devkit/core" "17.0.10" + "@angular-devkit/core" "17.1.0" jsonc-parser "3.2.0" magic-string "0.30.5" ora "5.4.1" @@ -216,48 +215,48 @@ "@angular-eslint/bundled-angular-compiler" "17.2.0" "@typescript-eslint/utils" "6.18.0" -"@angular/animations@^17.0.8": - version "17.0.8" - resolved "https://registry.yarnpkg.com/@angular/animations/-/animations-17.0.8.tgz#e2fde878c1c9d93f03eab5347f7cbaf83d5d6768" - integrity sha512-iKJ2s4ZqVoGS9tSRBuuwYEWTV+Rw6b4zDY1rqiXvbZrpNRxfzYr6s+aYsLQQEindZ4hzxgp9j60FJ8aE/g4w6A== +"@angular/animations@^17.1.0": + version "17.1.0" + resolved "https://registry.yarnpkg.com/@angular/animations/-/animations-17.1.0.tgz#6367e5d0a127b4dd121b50af2f9f2faa0207e21f" + integrity sha512-EzyJsla/CnRX4ARmHe9J1m3Pl+J4m5hznzeQFyZpJehikaHKAGGJTGM/+DFAX9TuR1ZpCmS0z0oWsYzag2Q7RA== dependencies: tslib "^2.3.0" -"@angular/cli@^17.0.10": - version "17.0.10" - resolved "https://registry.yarnpkg.com/@angular/cli/-/cli-17.0.10.tgz#24a9cdbdf2d19eb4138c9ccada5eebd4202014b4" - integrity sha512-52rd8KmOMe3NJDp/wA+Mwj21qd4HR8fuLtfrErgVnZaJZKX2Bzi/z7FHQD3gdgMAdzUiG0OJWGM0h75Ls9X6Gw== +"@angular/cli@^17.1.0": + version "17.1.0" + resolved "https://registry.yarnpkg.com/@angular/cli/-/cli-17.1.0.tgz#5ec9341b7a55018b649500c2ec2dbce7d4421881" + integrity sha512-mZh8ibV94CqHls+GTHok9rF78UvrtKZx+o1QOcG50ZM1L5O5s2NYrBhf+QXVeTTmzhSH1wXQb7ueyuLNLVB/eA== dependencies: - "@angular-devkit/architect" "0.1700.10" - "@angular-devkit/core" "17.0.10" - "@angular-devkit/schematics" "17.0.10" - "@schematics/angular" "17.0.10" + "@angular-devkit/architect" "0.1701.0" + "@angular-devkit/core" "17.1.0" + "@angular-devkit/schematics" "17.1.0" + "@schematics/angular" "17.1.0" "@yarnpkg/lockfile" "1.1.0" ansi-colors "4.1.3" ini "4.1.1" - inquirer "9.2.11" + inquirer "9.2.12" jsonc-parser "3.2.0" npm-package-arg "11.0.1" npm-pick-manifest "9.0.0" open "8.4.2" ora "5.4.1" - pacote "17.0.4" + pacote "17.0.5" resolve "1.22.8" semver "7.5.4" symbol-observable "4.0.0" yargs "17.7.2" -"@angular/common@^17.0.8": - version "17.0.8" - resolved "https://registry.yarnpkg.com/@angular/common/-/common-17.0.8.tgz#f9e348965633d3cdcc1f2ca0f7d3824e8706c1ed" - integrity sha512-fFfwtdg7H+OkqnvV/ENu8F8KGfgIiH16DDbQqYY5KQyyQB+SMsoVW29F1fGx6Y30s7ZlsLOy6cHhgrw74itkSw== +"@angular/common@^17.1.0": + version "17.1.0" + resolved "https://registry.yarnpkg.com/@angular/common/-/common-17.1.0.tgz#5e1edc2fccd580300cd75c72c5a70c538823cdf2" + integrity sha512-0Zg62iSynyRr2QslC8dVwSo46mkKrVENnwcBvsgTJ8rfGiuRdKMX8nWm5EUEm3ohKmYLfHvyEjsKDRn//UefVw== dependencies: tslib "^2.3.0" -"@angular/compiler-cli@^17.0.8": - version "17.0.8" - resolved "https://registry.yarnpkg.com/@angular/compiler-cli/-/compiler-cli-17.0.8.tgz#9b007efa11610216dc2b98bd49fb587fc2c244f7" - integrity sha512-ny2SMVgl+icjMuU5ZM57yFGUrhjR0hNxfCn0otAD3jUFliz/Onu9l6EPRKA5Cr8MZx3mg3rTLSBMD17YT8rsOg== +"@angular/compiler-cli@^17.1.0": + version "17.1.0" + resolved "https://registry.yarnpkg.com/@angular/compiler-cli/-/compiler-cli-17.1.0.tgz#19b0d50514f4668585a09d549d21816eeaeb4576" + integrity sha512-WDpO4WvC5ItjaRexnpFpKPpT+cu+5GYkWF8h74iHhfxOgU+gaQiMWERHylWCqF25AzmhKu0iI3ZZtaIJ6qqwog== dependencies: "@babel/core" "7.23.2" "@jridgewell/sourcemap-codec" "^1.4.14" @@ -268,62 +267,63 @@ tslib "^2.3.0" yargs "^17.2.1" -"@angular/compiler@^17.0.8": - version "17.0.8" - resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-17.0.8.tgz#87e1d0e5199df3613188e843c5473ba383141361" - integrity sha512-48jWypuhBGTrUUbkz1vB9gjbKKZ3hpuJ2DUUncd331Yw4tqkqZQbBa/E3ei4IHiCxEvW2uX3lI4AwlhuozmUtA== +"@angular/compiler@^17.1.0": + version "17.1.0" + resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-17.1.0.tgz#51057f798dbce4427cd3ba628d00f8f4f30dfadb" + integrity sha512-gF4i/WtPSiSvT4YNasTNnckOxdxuSNwi0EsncrtewwveBcCatjqaXNssUCiF5TgxlC2sKTmsPcMqDJrfX2LMpw== dependencies: tslib "^2.3.0" -"@angular/core@^17.0.8": - version "17.0.8" - resolved "https://registry.yarnpkg.com/@angular/core/-/core-17.0.8.tgz#c29b6827553e1213751947572495bc0058c3bdbf" - integrity sha512-tzYsK24LdkNuKNJK6efF4XOqspvF/qOe9j/n1Y61a6mNvFwsJFGbcmdZMby4hI/YRm6oIDoIIFjSep8ycp6Pbw== +"@angular/core@^17.1.0": + version "17.1.0" + resolved "https://registry.yarnpkg.com/@angular/core/-/core-17.1.0.tgz#69dfc831a266ba7da63e5888f64cf2c904bd8977" + integrity sha512-9OvRRZq+46S+ICZLRYIGVU2pknuPz23B+5V3jz7cDA5V43GVcMnfmAbMClPQxm7kRGnqtQ+yzBjn+HubCerE6g== dependencies: tslib "^2.3.0" -"@angular/forms@^17.0.8": - version "17.0.8" - resolved "https://registry.yarnpkg.com/@angular/forms/-/forms-17.0.8.tgz#3872f7c9e03d4376e1bd99d8360f6b750430086f" - integrity sha512-WZBHbMQjaSovAzOMhKqZN+m7eUPGfOzh9rKFKvj6UQLIJ9qSpEpqlvL0omU1z/47s3XXeLiBzomMiRfQISJvvw== +"@angular/forms@^17.1.0": + version "17.1.0" + resolved "https://registry.yarnpkg.com/@angular/forms/-/forms-17.1.0.tgz#7bf2621ae89ceb5ff06310b92fbc6b0cd4b26089" + integrity sha512-JD9IAxa5gQnjzxYJXm3H+lBuyv/dCnPHl6fpvb/JGrxY6xi4gfndyI8AkAb/wOAQgZDsIPaq5s4eWDjhr7CpyA== dependencies: tslib "^2.3.0" -"@angular/localize@^17.0.8": - version "17.0.8" - resolved "https://registry.yarnpkg.com/@angular/localize/-/localize-17.0.8.tgz#f2d4d1e2b2e573350c2dae9666a7cf7720be2d36" - integrity sha512-1zW8qWKNMH3r/x4KpwzzUmVY+iN76vYdhjA6gzZDnpJxpon9eyljNEildj9+zSWeNUr2LgJ6HnkIX9q1f3mXfA== +"@angular/localize@^17.1.0": + version "17.1.0" + resolved "https://registry.yarnpkg.com/@angular/localize/-/localize-17.1.0.tgz#f57b0f63a9a99c18eed74f09a26603773344fcc9" + integrity sha512-GW+1F72lRnCwppu2GzGP04d3UhtdhqMHlCbBdZzQUbv8XQfU+22MOGZx/Ry8sXnanZDgH+u+2A4bvrKZPsVgZg== dependencies: "@babel/core" "7.23.2" + "@types/babel__core" "7.20.2" fast-glob "3.3.1" yargs "^17.2.1" -"@angular/platform-browser-dynamic@^17.0.8": - version "17.0.8" - resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-17.0.8.tgz#a7376c17391b3932c84f31d2b2c23b4c0e621932" - integrity sha512-BIXNKnfBZb8sdluQ7WIhIXFuVnsJJ0SV+aiMKzQ7B6XhWoAXZQnlvON2thydjIIVuCvaF3YmWTbILI2K8YZ2jQ== +"@angular/platform-browser-dynamic@^17.1.0": + version "17.1.0" + resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-17.1.0.tgz#22efff906107764cff5cddfa1445dfccee5eabd5" + integrity sha512-rqPRZZx6VcSx81HIQr1XMBgb7fYSj6pOZNTJGZkn2KNxrz6hyU3A3qaom1VSVRK5vvNb1cFn35mg/zyOIliTIg== dependencies: tslib "^2.3.0" -"@angular/platform-browser@^17.0.8": - version "17.0.8" - resolved "https://registry.yarnpkg.com/@angular/platform-browser/-/platform-browser-17.0.8.tgz#f393535fc10e04681acb5413b5a536060dd0fd27" - integrity sha512-XaI+p2AxQaIHzR761lhPUf4OcOp46WDW0IfbvOzaezHE+8r81joZyVSDQPgXSa/aRfI58YhcfUavuGqyU3PphA== +"@angular/platform-browser@^17.1.0": + version "17.1.0" + resolved "https://registry.yarnpkg.com/@angular/platform-browser/-/platform-browser-17.1.0.tgz#a20406f038ba965a2e802781da27f5855f41a49b" + integrity sha512-Klq92ZUX0+ZsxLvbYtIEP3GtVEfMLYPxmBP0pWNZyYIeJCg/YxPS76QSvEhBaMqFelk4RzkDQEIfixC16UIgOA== dependencies: tslib "^2.3.0" -"@angular/platform-server@^17.0.8": - version "17.0.8" - resolved "https://registry.yarnpkg.com/@angular/platform-server/-/platform-server-17.0.8.tgz#ebb37aa2d0f70589fd6e22d71bfcd0e317f1610f" - integrity sha512-1ePN6OhVtPXYfIh6oSJwiOdUk+T4puzH6rhAtHfaiEI3gAoAlz170RBZzcDKc6ow5kQ8zo1DPWc61/FbOJFFew== +"@angular/platform-server@^17.1.0": + version "17.1.0" + resolved "https://registry.yarnpkg.com/@angular/platform-server/-/platform-server-17.1.0.tgz#b3278b875f43d55329252290629e03f72c41aa31" + integrity sha512-UdP97SMIzNybss2GoFFAQNwSu0XdK0PbY992nDWVhwP8PAWO0aBKiVP6HyuPmw7REkKEd4gTqtQoPrcz+rAfsg== dependencies: tslib "^2.3.0" xhr2 "^0.2.0" -"@angular/router@^17.0.8": - version "17.0.8" - resolved "https://registry.yarnpkg.com/@angular/router/-/router-17.0.8.tgz#65962626dc08be54e1474f607199001007e907b9" - integrity sha512-ptphcRe1RG/mIS60R7ZPilkkrxautqB0sOhds3h5VP3g628G1a2HWzvnmvjEfpJWDMFivV32VJMMBtTLqGr+0Q== +"@angular/router@^17.1.0": + version "17.1.0" + resolved "https://registry.yarnpkg.com/@angular/router/-/router-17.1.0.tgz#7b9f1575667573fe62b3dbe90f6945ac21bba414" + integrity sha512-VDeVLiiS4iEwqwgsLyL9hqA1djFW3yveMnhZIwviJlnp9vG2r/ggMKhNmdP1Hb2iaNgflyhyhwafJ0gi9SLi5A== dependencies: tslib "^2.3.0" @@ -347,34 +347,29 @@ "@babel/highlight" "^7.22.13" chalk "^2.4.2" -"@babel/code-frame@^7.23.4": - version "7.23.4" - resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.23.4.tgz#03ae5af150be94392cb5c7ccd97db5a19a5da6aa" - integrity sha512-r1IONyb6Ia+jYR2vvIDhdWdlTGhqbBoFqLTQidzZ4kepUFH15ejXvFHxCVbtl7BOXIudsIubf4E81xeA3h3IXA== +"@babel/code-frame@^7.23.5": + version "7.23.5" + resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.23.5.tgz#9009b69a8c602293476ad598ff53e4562e15c244" + integrity sha512-CgH3s1a96LipHCmSUmYFPwY7MNx8C3avkq7i4Wl3cfa662ldtUe4VM1TPXX70pfmrlWTb6jLqTYrZyT2ZTJBgA== dependencies: "@babel/highlight" "^7.23.4" chalk "^2.4.2" -"@babel/compat-data@^7.22.5": - version "7.22.5" - resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.22.5.tgz#b1f6c86a02d85d2dd3368a2b67c09add8cd0c255" - integrity sha512-4Jc/YuIaYqKnDDz892kPIledykKg12Aw1PYX5i/TY28anJtacvM1Rrr8wbieB9GfEJwlzqT0hUEao0CxEebiDA== - "@babel/compat-data@^7.22.6", "@babel/compat-data@^7.22.9": version "7.22.9" resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.22.9.tgz#71cdb00a1ce3a329ce4cbec3a44f9fef35669730" integrity sha512-5UamI7xkUcJ3i9qVDS+KFDEK8/7oJ55/sJMB1Ge7IEapr7KfdfV/HErR+koZwOfd+SgtFKOKRhRakdg++DcJpQ== -"@babel/compat-data@^7.23.2": - version "7.23.5" - resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.23.5.tgz#ffb878728bb6bdcb6f4510aa51b1be9afb8cfd98" - integrity sha512-uU27kfDRlhfKl+w1U6vp16IuvSLtjAxdArVXPa9BvLkrr7CYIsxH5adpHObeAGY/41+syctUWOZ140a2Rvkgjw== - "@babel/compat-data@^7.23.3": version "7.23.3" resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.23.3.tgz#3febd552541e62b5e883a25eb3effd7c7379db11" integrity sha512-BmR4bWbDIoFJmJ9z2cZ8Gmm2MXgEDgjdWgpKmKWUt54UGFJdlj31ECtbaDvCG/qVdG3AQ1SfpZEs01lUFbzLOQ== +"@babel/compat-data@^7.23.5": + version "7.23.5" + resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.23.5.tgz#ffb878728bb6bdcb6f4510aa51b1be9afb8cfd98" + integrity sha512-uU27kfDRlhfKl+w1U6vp16IuvSLtjAxdArVXPa9BvLkrr7CYIsxH5adpHObeAGY/41+syctUWOZ140a2Rvkgjw== + "@babel/core@7.23.2": version "7.23.2" resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.23.2.tgz#ed10df0d580fff67c5f3ee70fd22e2e4c90a9f94" @@ -396,43 +391,33 @@ json5 "^2.2.3" semver "^6.3.1" -"@babel/core@^7.12.3", "@babel/core@^7.23.3": - version "7.23.3" - resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.23.3.tgz#5ec09c8803b91f51cc887dedc2654a35852849c9" - integrity sha512-Jg+msLuNuCJDyBvFv5+OKOUjWMZgd85bKjbICd3zWrKAo+bJ49HJufi7CQE0q0uR8NGyO6xkCACScNqyjHSZew== +"@babel/core@7.23.7", "@babel/core@^7.12.3", "@babel/core@^7.23.3": + version "7.23.7" + resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.23.7.tgz#4d8016e06a14b5f92530a13ed0561730b5c6483f" + integrity sha512-+UpDgowcmqe36d4NwqvKsyPMlOLNGMsfMmQ5WGCu+siCe3t3dfe9njrzGfdN4qq+bcNUt0+Vw6haRxBOycs4dw== dependencies: "@ampproject/remapping" "^2.2.0" - "@babel/code-frame" "^7.22.13" - "@babel/generator" "^7.23.3" - "@babel/helper-compilation-targets" "^7.22.15" + "@babel/code-frame" "^7.23.5" + "@babel/generator" "^7.23.6" + "@babel/helper-compilation-targets" "^7.23.6" "@babel/helper-module-transforms" "^7.23.3" - "@babel/helpers" "^7.23.2" - "@babel/parser" "^7.23.3" + "@babel/helpers" "^7.23.7" + "@babel/parser" "^7.23.6" "@babel/template" "^7.22.15" - "@babel/traverse" "^7.23.3" - "@babel/types" "^7.23.3" + "@babel/traverse" "^7.23.7" + "@babel/types" "^7.23.6" convert-source-map "^2.0.0" debug "^4.1.0" gensync "^1.0.0-beta.2" json5 "^2.2.3" semver "^6.3.1" -"@babel/generator@7.23.0": - version "7.23.0" - resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.23.0.tgz#df5c386e2218be505b34837acbcb874d7a983420" - integrity sha512-lN85QRR+5IbYrMWM6Y4pE/noaQtg4pNiqeNGX60eqOfo6gtEj6uw/JagelB8vVztSd7R6M5n1+PQkDbHbBRU4g== - dependencies: - "@babel/types" "^7.23.0" - "@jridgewell/gen-mapping" "^0.3.2" - "@jridgewell/trace-mapping" "^0.3.17" - jsesc "^2.5.1" - -"@babel/generator@^7.23.0", "@babel/generator@^7.23.3", "@babel/generator@^7.23.4": - version "7.23.4" - resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.23.4.tgz#4a41377d8566ec18f807f42962a7f3551de83d1c" - integrity sha512-esuS49Cga3HcThFNebGhlgsrVLkvhqvYDTzgjfFFlHJcIfLe5jFmRRfCQ1KuBfc4Jrtn3ndLgKWAKjBE+IraYQ== +"@babel/generator@7.23.6", "@babel/generator@^7.23.0", "@babel/generator@^7.23.6": + version "7.23.6" + resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.23.6.tgz#9e1fca4811c77a10580d17d26b57b036133f3c2e" + integrity sha512-qrSfCYxYQB5owCmGLbl8XRpX1ytXlpueOb0N0UmQwA073KZxejgQTzAmJezxvpwQD9uGtK2shHdi55QT+MbjIw== dependencies: - "@babel/types" "^7.23.4" + "@babel/types" "^7.23.6" "@jridgewell/gen-mapping" "^0.3.2" "@jridgewell/trace-mapping" "^0.3.17" jsesc "^2.5.1" @@ -451,13 +436,6 @@ dependencies: "@babel/types" "^7.22.15" -"@babel/helper-builder-binary-assignment-operator-visitor@^7.22.5": - version "7.22.5" - resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.22.5.tgz#a3f4758efdd0190d8927fcffd261755937c71878" - integrity sha512-m1EP3lVOPptR+2DwD125gziZNcmoNSHGmJROKoy87loWUQyJaVXDgpmruWqDARZSmtYQ+Dl25okU8+qhVzuykw== - dependencies: - "@babel/types" "^7.22.5" - "@babel/helper-compilation-targets@^7.22.15": version "7.22.15" resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.22.15.tgz#0698fc44551a26cf29f18d4662d5bf545a6cfc52" @@ -469,17 +447,6 @@ lru-cache "^5.1.1" semver "^6.3.1" -"@babel/helper-compilation-targets@^7.22.5": - version "7.22.5" - resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.22.5.tgz#fc7319fc54c5e2fa14b2909cf3c5fd3046813e02" - integrity sha512-Ji+ywpHeuqxB8WDxraCiqR0xfhYjiDE/e6k7FuIaANnoOFxAHskHChz4vA1mJC9Lbm01s1PVAGhQY4FUKSkGZw== - dependencies: - "@babel/compat-data" "^7.22.5" - "@babel/helper-validator-option" "^7.22.5" - browserslist "^4.21.3" - lru-cache "^5.1.1" - semver "^6.3.0" - "@babel/helper-compilation-targets@^7.22.6": version "7.22.10" resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.22.10.tgz#01d648bbc25dd88f513d862ee0df27b7d4e67024" @@ -491,6 +458,17 @@ lru-cache "^5.1.1" semver "^6.3.1" +"@babel/helper-compilation-targets@^7.23.6": + version "7.23.6" + resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.23.6.tgz#4d79069b16cbcf1461289eccfbbd81501ae39991" + integrity sha512-9JB548GZoQVmzrFgp8o7KxdgkTGm6xs9DW0o/Pim72UDjzr5ObUQ6ZzYPqA+g9OTS2bBQoctLJrky0RDCAWRgQ== + dependencies: + "@babel/compat-data" "^7.23.5" + "@babel/helper-validator-option" "^7.23.5" + browserslist "^4.22.2" + lru-cache "^5.1.1" + semver "^6.3.1" + "@babel/helper-create-class-features-plugin@^7.18.6", "@babel/helper-create-class-features-plugin@^7.22.15": version "7.22.15" resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.22.15.tgz#97a61b385e57fe458496fad19f8e63b63c867de4" @@ -506,21 +484,6 @@ "@babel/helper-split-export-declaration" "^7.22.6" semver "^6.3.1" -"@babel/helper-create-class-features-plugin@^7.22.5": - version "7.22.5" - resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.22.5.tgz#2192a1970ece4685fbff85b48da2c32fcb130b7c" - integrity sha512-xkb58MyOYIslxu3gKmVXmjTtUPvBU4odYzbiIQbWwLKIHCsx6UGZGX6F1IznMFVnDdirseUZopzN+ZRt8Xb33Q== - dependencies: - "@babel/helper-annotate-as-pure" "^7.22.5" - "@babel/helper-environment-visitor" "^7.22.5" - "@babel/helper-function-name" "^7.22.5" - "@babel/helper-member-expression-to-functions" "^7.22.5" - "@babel/helper-optimise-call-expression" "^7.22.5" - "@babel/helper-replace-supers" "^7.22.5" - "@babel/helper-skip-transparent-expression-wrappers" "^7.22.5" - "@babel/helper-split-export-declaration" "^7.22.5" - semver "^6.3.0" - "@babel/helper-create-regexp-features-plugin@^7.18.6", "@babel/helper-create-regexp-features-plugin@^7.22.5": version "7.22.5" resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.22.5.tgz#bb2bf0debfe39b831986a4efbf4066586819c6e4" @@ -539,10 +502,21 @@ regexpu-core "^5.3.1" semver "^6.3.1" -"@babel/helper-define-polyfill-provider@^0.4.3": - version "0.4.3" - resolved "https://registry.yarnpkg.com/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.4.3.tgz#a71c10f7146d809f4a256c373f462d9bba8cf6ba" - integrity sha512-WBrLmuPP47n7PNwsZ57pqam6G/RGo1vw/87b0Blc53tZNGZ4x7YvZ6HgQe2vo1W/FR20OgjeZuGXzudPiXHFug== +"@babel/helper-define-polyfill-provider@^0.4.4": + version "0.4.4" + resolved "https://registry.yarnpkg.com/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.4.4.tgz#64df615451cb30e94b59a9696022cffac9a10088" + integrity sha512-QcJMILQCu2jm5TFPGA3lCpJJTeEP+mqeXooG/NZbg/h5FTFi6V0+99ahlRsW8/kRLyb24LZVCCiclDedhLKcBA== + dependencies: + "@babel/helper-compilation-targets" "^7.22.6" + "@babel/helper-plugin-utils" "^7.22.5" + debug "^4.1.1" + lodash.debounce "^4.0.8" + resolve "^1.14.2" + +"@babel/helper-define-polyfill-provider@^0.5.0": + version "0.5.0" + resolved "https://registry.yarnpkg.com/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.5.0.tgz#465805b7361f461e86c680f1de21eaf88c25901b" + integrity sha512-NovQquuQLAQ5HuyjCz7WQP9MjRj7dx++yspwiyUiGl9ZyadHRSql1HZh5ogRd8W8w6YM6EQ/NTB8rgjLt5W65Q== dependencies: "@babel/helper-compilation-targets" "^7.22.6" "@babel/helper-plugin-utils" "^7.22.5" @@ -590,13 +564,6 @@ dependencies: "@babel/types" "^7.23.0" -"@babel/helper-member-expression-to-functions@^7.22.5": - version "7.22.5" - resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.22.5.tgz#0a7c56117cad3372fbf8d2fb4bf8f8d64a1e76b2" - integrity sha512-aBiH1NKMG0H2cGZqspNvsaBe6wNGjbJjuLy29aU+eDZjSbbN53BaxlpB02xm9v34pLTZ1nIQPFYn2qMZoa5BQQ== - dependencies: - "@babel/types" "^7.22.5" - "@babel/helper-module-imports@^7.22.15": version "7.22.15" resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.22.15.tgz#16146307acdc40cc00c3b2c647713076464bdbf0" @@ -604,27 +571,6 @@ dependencies: "@babel/types" "^7.22.15" -"@babel/helper-module-imports@^7.22.5": - version "7.22.5" - resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.22.5.tgz#1a8f4c9f4027d23f520bd76b364d44434a72660c" - integrity sha512-8Dl6+HD/cKifutF5qGd/8ZJi84QeAKh+CEe1sBzz8UayBBGg1dAIJrdHOcOM5b2MpzWL2yuotJTtGjETq0qjXg== - dependencies: - "@babel/types" "^7.22.5" - -"@babel/helper-module-transforms@^7.22.5": - version "7.22.5" - resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.22.5.tgz#0f65daa0716961b6e96b164034e737f60a80d2ef" - integrity sha512-+hGKDt/Ze8GFExiVHno/2dvG5IdstpzCq0y4Qc9OJ25D4q3pKfiIP/4Vp3/JvhDkLKsDK2api3q3fpIgiIF5bw== - dependencies: - "@babel/helper-environment-visitor" "^7.22.5" - "@babel/helper-module-imports" "^7.22.5" - "@babel/helper-simple-access" "^7.22.5" - "@babel/helper-split-export-declaration" "^7.22.5" - "@babel/helper-validator-identifier" "^7.22.5" - "@babel/template" "^7.22.5" - "@babel/traverse" "^7.22.5" - "@babel/types" "^7.22.5" - "@babel/helper-module-transforms@^7.23.0": version "7.23.0" resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.23.0.tgz#3ec246457f6c842c0aee62a01f60739906f7047e" @@ -668,16 +614,6 @@ "@babel/helper-environment-visitor" "^7.22.20" "@babel/helper-wrap-function" "^7.22.20" -"@babel/helper-remap-async-to-generator@^7.22.5": - version "7.22.5" - resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.22.5.tgz#14a38141a7bf2165ad38da61d61cf27b43015da2" - integrity sha512-cU0Sq1Rf4Z55fgz7haOakIyM7+x/uCFwXpLPaeRzfoUtAEAuUZjZvFPjL/rk5rW693dIgn2hng1W7xbT7lWT4g== - dependencies: - "@babel/helper-annotate-as-pure" "^7.22.5" - "@babel/helper-environment-visitor" "^7.22.5" - "@babel/helper-wrap-function" "^7.22.5" - "@babel/types" "^7.22.5" - "@babel/helper-replace-supers@^7.22.20", "@babel/helper-replace-supers@^7.22.9": version "7.22.20" resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.22.20.tgz#e37d367123ca98fe455a9887734ed2e16eb7a793" @@ -687,18 +623,6 @@ "@babel/helper-member-expression-to-functions" "^7.22.15" "@babel/helper-optimise-call-expression" "^7.22.5" -"@babel/helper-replace-supers@^7.22.5": - version "7.22.5" - resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.22.5.tgz#71bc5fb348856dea9fdc4eafd7e2e49f585145dc" - integrity sha512-aLdNM5I3kdI/V9xGNyKSF3X/gTyMUBohTZ+/3QdQKAA9vxIiy12E+8E2HoOP1/DjeqU+g6as35QHJNMDDYpuCg== - dependencies: - "@babel/helper-environment-visitor" "^7.22.5" - "@babel/helper-member-expression-to-functions" "^7.22.5" - "@babel/helper-optimise-call-expression" "^7.22.5" - "@babel/template" "^7.22.5" - "@babel/traverse" "^7.22.5" - "@babel/types" "^7.22.5" - "@babel/helper-simple-access@^7.22.5": version "7.22.5" resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.22.5.tgz#4938357dc7d782b80ed6dbb03a0fba3d22b1d5de" @@ -713,7 +637,7 @@ dependencies: "@babel/types" "^7.22.5" -"@babel/helper-split-export-declaration@7.22.6", "@babel/helper-split-export-declaration@^7.22.5", "@babel/helper-split-export-declaration@^7.22.6": +"@babel/helper-split-export-declaration@7.22.6", "@babel/helper-split-export-declaration@^7.22.6": version "7.22.6" resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.22.6.tgz#322c61b7310c0997fe4c323955667f18fcefb91c" integrity sha512-AsUnxuLhRYsisFiaJwvp1QF+I3KjD5FOxut14q/GzovUe6orHLesW2C7d754kRm53h5gqrz6sFl6sxc4BVtE/g== @@ -750,6 +674,11 @@ resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.22.5.tgz#de52000a15a177413c8234fa3a8af4ee8102d0ac" integrity sha512-R3oB6xlIVKUnxNUxbmgq7pKjxpru24zlimpE8WK47fACIlM0II/Hm1RS8IaOI7NgCr6LNS+jl5l75m20npAziw== +"@babel/helper-validator-option@^7.23.5": + version "7.23.5" + resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.23.5.tgz#907a3fbd4523426285365d1206c423c4c5520307" + integrity sha512-85ttAOMLsr53VgXkTbkx8oA6YTfT4q7/HzXSLEYmjcSTJPMPQtvq1BD79Byep5xMUYbGRzEpDsjUf3dyp54IKw== + "@babel/helper-wrap-function@^7.22.20": version "7.22.20" resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.22.20.tgz#15352b0b9bfb10fc9c76f79f6342c00e3411a569" @@ -759,16 +688,6 @@ "@babel/template" "^7.22.15" "@babel/types" "^7.22.19" -"@babel/helper-wrap-function@^7.22.5": - version "7.22.5" - resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.22.5.tgz#44d205af19ed8d872b4eefb0d2fa65f45eb34f06" - integrity sha512-bYqLIBSEshYcYQyfks8ewYA8S30yaGSeRslcvKMvoUk6HHPySbxHq9YRi6ghhzEU+yhQv9bP/jXnygkStOcqZw== - dependencies: - "@babel/helper-function-name" "^7.22.5" - "@babel/template" "^7.22.5" - "@babel/traverse" "^7.22.5" - "@babel/types" "^7.22.5" - "@babel/helpers@^7.23.2": version "7.23.2" resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.23.2.tgz#2832549a6e37d484286e15ba36a5330483cac767" @@ -778,6 +697,15 @@ "@babel/traverse" "^7.23.2" "@babel/types" "^7.23.0" +"@babel/helpers@^7.23.7": + version "7.23.8" + resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.23.8.tgz#fc6b2d65b16847fd50adddbd4232c76378959e34" + integrity sha512-KDqYz4PiOWvDFrdHLPhKtCThtIcKVy6avWD2oG4GEvyQ+XDZwHD4YQd+H2vNMnq2rkdxsDkU82T+Vk8U/WXHRQ== + dependencies: + "@babel/template" "^7.22.15" + "@babel/traverse" "^7.23.7" + "@babel/types" "^7.23.6" + "@babel/highlight@^7.22.13": version "7.22.20" resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.22.20.tgz#4ca92b71d80554b01427815e06f2df965b9c1f54" @@ -805,6 +733,11 @@ chalk "^2.4.2" js-tokens "^4.0.0" +"@babel/parser@^7.1.0", "@babel/parser@^7.20.7", "@babel/parser@^7.23.6": + version "7.23.6" + resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.23.6.tgz#ba1c9e512bda72a47e285ae42aff9d2a635a9e3b" + integrity sha512-Z2uID7YJ7oNvAI20O9X0bblw7Qqs8Q2hFy0R9tAfnfLkp5MW0UH9eUvnDSnFwKZ0AvgS1ucqR4KzvVHgnke1VQ== + "@babel/parser@^7.14.7": version "7.22.5" resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.22.5.tgz#721fd042f3ce1896238cf1b341c77eb7dee7dbea" @@ -815,19 +748,14 @@ resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.23.0.tgz#da950e622420bf96ca0d0f2909cdddac3acd8719" integrity sha512-vvPKKdMemU85V9WE/l5wZEmImpCtLqbnTvqDS2U1fJ96KrxoW7KrXhNsNCblQlg8Ck4b85yxdTyelsMUgFUXiw== -"@babel/parser@^7.23.3", "@babel/parser@^7.23.4": - version "7.23.4" - resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.23.4.tgz#409fbe690c333bb70187e2de4021e1e47a026661" - integrity sha512-vf3Xna6UEprW+7t6EtOmFpHNAuxw3xqPZghy+brsnusscJRW5BMUzzHZc5ICjULee81WeUV2jjakG09MDglJXQ== - -"@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.22.15", "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.23.3": +"@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.23.3": version "7.23.3" resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.23.3.tgz#5cd1c87ba9380d0afb78469292c954fee5d2411a" integrity sha512-iRkKcCqb7iGnq9+3G6rZ+Ciz5VywC4XNRHe57lKM+jOeYAoR0lVqdeeDRfh0tQcTfw/+vBhHn926FmQhLtlFLQ== dependencies: "@babel/helper-plugin-utils" "^7.22.5" -"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@^7.22.15", "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@^7.23.3": +"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@^7.23.3": version "7.23.3" resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.23.3.tgz#f6652bb16b94f8f9c20c50941e16e9756898dc5d" integrity sha512-WwlxbfMNdVEpQjZmK5mhm7oSwD3dS6eU+Iwsi4Knl9wAletWem7kaRsGOG+8UEbRyqxY4SS5zvtfXwX+jMxUwQ== @@ -836,10 +764,10 @@ "@babel/helper-skip-transparent-expression-wrappers" "^7.22.5" "@babel/plugin-transform-optional-chaining" "^7.23.3" -"@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly@^7.23.3": - version "7.23.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly/-/plugin-bugfix-v8-static-class-fields-redefine-readonly-7.23.3.tgz#20c60d4639d18f7da8602548512e9d3a4c8d7098" - integrity sha512-XaJak1qcityzrX0/IU5nKHb34VaibwP3saKqG6a/tppelgllOH13LUann4ZCIBcVOeE6H18K4Vx9QKkVww3z/w== +"@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly@^7.23.7": + version "7.23.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly/-/plugin-bugfix-v8-static-class-fields-redefine-readonly-7.23.7.tgz#516462a95d10a9618f197d39ad291a9b47ae1d7b" + integrity sha512-LlRT7HgaifEpQA1ZgLVOIJZZFVPWN5iReq/7/JixwBtwcoeVGDBD53ZV28rrsLYOZs1Y/EHhA8N/Z6aazHR8cw== dependencies: "@babel/helper-environment-visitor" "^7.22.20" "@babel/helper-plugin-utils" "^7.22.5" @@ -892,13 +820,6 @@ dependencies: "@babel/helper-plugin-utils" "^7.8.3" -"@babel/plugin-syntax-import-assertions@^7.22.5": - version "7.22.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.22.5.tgz#07d252e2aa0bc6125567f742cd58619cb14dce98" - integrity sha512-rdV97N7KqsRzeNGoWUOK6yUsWarLjE5Su/Snk9IYPU9CwkWHs4t+rTGOvffTR8XGkJMTAdLfO0xVnXm8wugIJg== - dependencies: - "@babel/helper-plugin-utils" "^7.22.5" - "@babel/plugin-syntax-import-assertions@^7.23.3": version "7.23.3" resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.23.3.tgz#9c05a7f592982aff1a2768260ad84bcd3f0c77fc" @@ -906,13 +827,6 @@ dependencies: "@babel/helper-plugin-utils" "^7.22.5" -"@babel/plugin-syntax-import-attributes@^7.22.5": - version "7.22.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.22.5.tgz#ab840248d834410b829f569f5262b9e517555ecb" - integrity sha512-KwvoWDeNKPETmozyFE0P2rOLqh39EoQHNjqizrI5B8Vt0ZNS7M56s7dAiAqbYfiAYOuIzIh96z3iR2ktgu3tEg== - dependencies: - "@babel/helper-plugin-utils" "^7.22.5" - "@babel/plugin-syntax-import-attributes@^7.23.3": version "7.23.3" resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.23.3.tgz#992aee922cf04512461d7dae3ff6951b90a2dc06" @@ -998,13 +912,6 @@ "@babel/helper-create-regexp-features-plugin" "^7.18.6" "@babel/helper-plugin-utils" "^7.18.6" -"@babel/plugin-transform-arrow-functions@^7.22.5": - version "7.22.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.22.5.tgz#e5ba566d0c58a5b2ba2a8b795450641950b71958" - integrity sha512-26lTNXoVRdAnsaDXPpvCNUq+OVWEVC6bx7Vvz9rC53F2bagUWW4u4ii2+h8Fejfh7RYqPxn+libeFBBck9muEw== - dependencies: - "@babel/helper-plugin-utils" "^7.22.5" - "@babel/plugin-transform-arrow-functions@^7.23.3": version "7.23.3" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.23.3.tgz#94c6dcfd731af90f27a79509f9ab7fb2120fc38b" @@ -1012,36 +919,17 @@ dependencies: "@babel/helper-plugin-utils" "^7.22.5" -"@babel/plugin-transform-async-generator-functions@7.23.2": - version "7.23.2" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.23.2.tgz#054afe290d64c6f576f371ccc321772c8ea87ebb" - integrity sha512-BBYVGxbDVHfoeXbOwcagAkOQAm9NxoTdMGfTqghu1GrvadSaw6iW3Je6IcL5PNOw8VwjxqBECXy50/iCQSY/lQ== - dependencies: - "@babel/helper-environment-visitor" "^7.22.20" - "@babel/helper-plugin-utils" "^7.22.5" - "@babel/helper-remap-async-to-generator" "^7.22.20" - "@babel/plugin-syntax-async-generators" "^7.8.4" - -"@babel/plugin-transform-async-generator-functions@^7.23.2", "@babel/plugin-transform-async-generator-functions@^7.23.3": - version "7.23.4" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.23.4.tgz#93ac8e3531f347fba519b4703f9ff2a75c6ae27a" - integrity sha512-efdkfPhHYTtn0G6n2ddrESE91fgXxjlqLsnUtPWnJs4a4mZIbUaK7ffqKIIUKXSHwcDvaCVX6GXkaJJFqtX7jw== +"@babel/plugin-transform-async-generator-functions@7.23.7", "@babel/plugin-transform-async-generator-functions@^7.23.7": + version "7.23.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.23.7.tgz#3aa0b4f2fa3788b5226ef9346cf6d16ec61f99cd" + integrity sha512-PdxEpL71bJp1byMG0va5gwQcXHxuEYC/BgI/e88mGTtohbZN28O5Yit0Plkkm/dBzCF/BxmbNcses1RH1T+urA== dependencies: "@babel/helper-environment-visitor" "^7.22.20" "@babel/helper-plugin-utils" "^7.22.5" "@babel/helper-remap-async-to-generator" "^7.22.20" "@babel/plugin-syntax-async-generators" "^7.8.4" -"@babel/plugin-transform-async-to-generator@7.22.5": - version "7.22.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.22.5.tgz#c7a85f44e46f8952f6d27fe57c2ed3cc084c3775" - integrity sha512-b1A8D8ZzE/VhNDoV1MSJTnpKkCG5bJo+19R4o4oy03zM7ws8yEMK755j61Dc3EyvdysbqH5BOOTquJ7ZX9C6vQ== - dependencies: - "@babel/helper-module-imports" "^7.22.5" - "@babel/helper-plugin-utils" "^7.22.5" - "@babel/helper-remap-async-to-generator" "^7.22.5" - -"@babel/plugin-transform-async-to-generator@^7.22.5", "@babel/plugin-transform-async-to-generator@^7.23.3": +"@babel/plugin-transform-async-to-generator@7.23.3", "@babel/plugin-transform-async-to-generator@^7.23.3": version "7.23.3" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.23.3.tgz#d1f513c7a8a506d43f47df2bf25f9254b0b051fa" integrity sha512-A7LFsKi4U4fomjqXJlZg/u0ft/n8/7n7lpffUP/ZULx/DtV9SGlNKZolHH6PE8Xl1ngCc0M11OaeZptXVkfKSw== @@ -1050,13 +938,6 @@ "@babel/helper-plugin-utils" "^7.22.5" "@babel/helper-remap-async-to-generator" "^7.22.20" -"@babel/plugin-transform-block-scoped-functions@^7.22.5": - version "7.22.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.22.5.tgz#27978075bfaeb9fa586d3cb63a3d30c1de580024" - integrity sha512-tdXZ2UdknEKQWKJP1KMNmuF5Lx3MymtMN/pvA+p/VEkhK8jVcQ1fzSy8KM9qRYhAf2/lV33hoMPKI/xaI9sADA== - dependencies: - "@babel/helper-plugin-utils" "^7.22.5" - "@babel/plugin-transform-block-scoped-functions@^7.23.3": version "7.23.3" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.23.3.tgz#fe1177d715fb569663095e04f3598525d98e8c77" @@ -1064,21 +945,13 @@ dependencies: "@babel/helper-plugin-utils" "^7.22.5" -"@babel/plugin-transform-block-scoping@^7.23.0", "@babel/plugin-transform-block-scoping@^7.23.3": +"@babel/plugin-transform-block-scoping@^7.23.4": version "7.23.4" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.23.4.tgz#b2d38589531c6c80fbe25e6b58e763622d2d3cf5" integrity sha512-0QqbP6B6HOh7/8iNR4CQU2Th/bbRtBp4KS9vcaZd1fZ0wSh5Fyssg0UCIHwxh+ka+pNDREbVLQnHCMHKZfPwfw== dependencies: "@babel/helper-plugin-utils" "^7.22.5" -"@babel/plugin-transform-class-properties@^7.22.5": - version "7.22.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-class-properties/-/plugin-transform-class-properties-7.22.5.tgz#97a56e31ad8c9dc06a0b3710ce7803d5a48cca77" - integrity sha512-nDkQ0NfkOhPTq8YCLiWNxp1+f9fCobEjCb0n8WdbNUBc4IB5V7P1QnX9IjpSoquKrXF5SKojHleVNs2vGeHCHQ== - dependencies: - "@babel/helper-create-class-features-plugin" "^7.22.5" - "@babel/helper-plugin-utils" "^7.22.5" - "@babel/plugin-transform-class-properties@^7.23.3": version "7.23.3" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-class-properties/-/plugin-transform-class-properties-7.23.3.tgz#35c377db11ca92a785a718b6aa4e3ed1eb65dc48" @@ -1087,7 +960,7 @@ "@babel/helper-create-class-features-plugin" "^7.22.15" "@babel/helper-plugin-utils" "^7.22.5" -"@babel/plugin-transform-class-static-block@^7.22.11", "@babel/plugin-transform-class-static-block@^7.23.3": +"@babel/plugin-transform-class-static-block@^7.23.4": version "7.23.4" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-class-static-block/-/plugin-transform-class-static-block-7.23.4.tgz#2a202c8787a8964dd11dfcedf994d36bfc844ab5" integrity sha512-nsWu/1M+ggti1SOALj3hfx5FXzAY06fwPJsUZD4/A5e1bWi46VUIWtD+kOX6/IdhXGsXBWllLFDSnqSCdUNydQ== @@ -1096,44 +969,20 @@ "@babel/helper-plugin-utils" "^7.22.5" "@babel/plugin-syntax-class-static-block" "^7.14.5" -"@babel/plugin-transform-classes@^7.22.15": - version "7.23.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.23.5.tgz#e7a75f815e0c534cc4c9a39c56636c84fc0d64f2" - integrity sha512-jvOTR4nicqYC9yzOHIhXG5emiFEOpappSJAl73SDSEDcybD+Puuze8Tnpb9p9qEyYup24tq891gkaygIFvWDqg== - dependencies: - "@babel/helper-annotate-as-pure" "^7.22.5" - "@babel/helper-compilation-targets" "^7.22.15" - "@babel/helper-environment-visitor" "^7.22.20" - "@babel/helper-function-name" "^7.23.0" - "@babel/helper-optimise-call-expression" "^7.22.5" - "@babel/helper-plugin-utils" "^7.22.5" - "@babel/helper-replace-supers" "^7.22.20" - "@babel/helper-split-export-declaration" "^7.22.6" - globals "^11.1.0" - -"@babel/plugin-transform-classes@^7.23.3": - version "7.23.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.23.3.tgz#73380c632c095b03e8503c24fd38f95ad41ffacb" - integrity sha512-FGEQmugvAEu2QtgtU0uTASXevfLMFfBeVCIIdcQhn/uBQsMTjBajdnAtanQlOcuihWh10PZ7+HWvc7NtBwP74w== +"@babel/plugin-transform-classes@^7.23.5": + version "7.23.8" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.23.8.tgz#d08ae096c240347badd68cdf1b6d1624a6435d92" + integrity sha512-yAYslGsY1bX6Knmg46RjiCiNSwJKv2IUC8qOdYKqMMr0491SXFhcHqOdRDeCRohOOIzwN/90C6mQ9qAKgrP7dg== dependencies: "@babel/helper-annotate-as-pure" "^7.22.5" - "@babel/helper-compilation-targets" "^7.22.15" + "@babel/helper-compilation-targets" "^7.23.6" "@babel/helper-environment-visitor" "^7.22.20" "@babel/helper-function-name" "^7.23.0" - "@babel/helper-optimise-call-expression" "^7.22.5" "@babel/helper-plugin-utils" "^7.22.5" "@babel/helper-replace-supers" "^7.22.20" "@babel/helper-split-export-declaration" "^7.22.6" globals "^11.1.0" -"@babel/plugin-transform-computed-properties@^7.22.5": - version "7.22.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.22.5.tgz#cd1e994bf9f316bd1c2dafcd02063ec261bb3869" - integrity sha512-4GHWBgRf0krxPX+AaPtgBAlTgTeZmqDynokHOX7aqqAB4tHs3U2Y02zH6ETFdLZGcg9UQSD1WCmkVrE9ErHeOg== - dependencies: - "@babel/helper-plugin-utils" "^7.22.5" - "@babel/template" "^7.22.5" - "@babel/plugin-transform-computed-properties@^7.23.3": version "7.23.3" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.23.3.tgz#652e69561fcc9d2b50ba4f7ac7f60dcf65e86474" @@ -1142,21 +991,13 @@ "@babel/helper-plugin-utils" "^7.22.5" "@babel/template" "^7.22.15" -"@babel/plugin-transform-destructuring@^7.23.0", "@babel/plugin-transform-destructuring@^7.23.3": +"@babel/plugin-transform-destructuring@^7.23.3": version "7.23.3" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.23.3.tgz#8c9ee68228b12ae3dff986e56ed1ba4f3c446311" integrity sha512-n225npDqjDIr967cMScVKHXJs7rout1q+tt50inyBCPkyZ8KxeI6d+GIbSBTT/w/9WdlWDOej3V9HE5Lgk57gw== dependencies: "@babel/helper-plugin-utils" "^7.22.5" -"@babel/plugin-transform-dotall-regex@^7.22.5": - version "7.22.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.22.5.tgz#dbb4f0e45766eb544e193fb00e65a1dd3b2a4165" - integrity sha512-5/Yk9QxCQCl+sOIB1WelKnVRxTJDSAIxtJLL2/pqL14ZVlbH0fUQUZa/T5/UnQtBNgghR7mfB8ERBKyKPCi7Vw== - dependencies: - "@babel/helper-create-regexp-features-plugin" "^7.22.5" - "@babel/helper-plugin-utils" "^7.22.5" - "@babel/plugin-transform-dotall-regex@^7.23.3": version "7.23.3" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.23.3.tgz#3f7af6054882ede89c378d0cf889b854a993da50" @@ -1165,13 +1006,6 @@ "@babel/helper-create-regexp-features-plugin" "^7.22.15" "@babel/helper-plugin-utils" "^7.22.5" -"@babel/plugin-transform-duplicate-keys@^7.22.5": - version "7.22.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.22.5.tgz#b6e6428d9416f5f0bba19c70d1e6e7e0b88ab285" - integrity sha512-dEnYD+9BBgld5VBXHnF/DbYGp3fqGMsyxKbtD1mDyIA7AkTSpKXFhCVuj/oQVOoALfBs77DudA0BE4d5mcpmqw== - dependencies: - "@babel/helper-plugin-utils" "^7.22.5" - "@babel/plugin-transform-duplicate-keys@^7.23.3": version "7.23.3" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.23.3.tgz#664706ca0a5dfe8d066537f99032fc1dc8b720ce" @@ -1179,7 +1013,7 @@ dependencies: "@babel/helper-plugin-utils" "^7.22.5" -"@babel/plugin-transform-dynamic-import@^7.22.11", "@babel/plugin-transform-dynamic-import@^7.23.3": +"@babel/plugin-transform-dynamic-import@^7.23.4": version "7.23.4" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dynamic-import/-/plugin-transform-dynamic-import-7.23.4.tgz#c7629e7254011ac3630d47d7f34ddd40ca535143" integrity sha512-V6jIbLhdJK86MaLh4Jpghi8ho5fGzt3imHOBu/x0jlBaPYqDoWz4RDXjmMOfnh+JWNaQleEAByZLV0QzBT4YQQ== @@ -1187,14 +1021,6 @@ "@babel/helper-plugin-utils" "^7.22.5" "@babel/plugin-syntax-dynamic-import" "^7.8.3" -"@babel/plugin-transform-exponentiation-operator@^7.22.5": - version "7.22.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.22.5.tgz#402432ad544a1f9a480da865fda26be653e48f6a" - integrity sha512-vIpJFNM/FjZ4rh1myqIya9jXwrwwgFRHPjT3DkUA9ZLHuzox8jiXkOLvwm1H+PQIP3CqfC++WPKeuDi0Sjdj1g== - dependencies: - "@babel/helper-builder-binary-assignment-operator-visitor" "^7.22.5" - "@babel/helper-plugin-utils" "^7.22.5" - "@babel/plugin-transform-exponentiation-operator@^7.23.3": version "7.23.3" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.23.3.tgz#ea0d978f6b9232ba4722f3dbecdd18f450babd18" @@ -1203,7 +1029,7 @@ "@babel/helper-builder-binary-assignment-operator-visitor" "^7.22.15" "@babel/helper-plugin-utils" "^7.22.5" -"@babel/plugin-transform-export-namespace-from@^7.22.11", "@babel/plugin-transform-export-namespace-from@^7.23.3": +"@babel/plugin-transform-export-namespace-from@^7.23.4": version "7.23.4" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-export-namespace-from/-/plugin-transform-export-namespace-from-7.23.4.tgz#084c7b25e9a5c8271e987a08cf85807b80283191" integrity sha512-GzuSBcKkx62dGzZI1WVgTWvkkz84FZO5TC5T8dl/Tht/rAla6Dg/Mz9Yhypg+ezVACf/rgDuQt3kbWEv7LdUDQ== @@ -1211,7 +1037,7 @@ "@babel/helper-plugin-utils" "^7.22.5" "@babel/plugin-syntax-export-namespace-from" "^7.8.3" -"@babel/plugin-transform-for-of@^7.22.15": +"@babel/plugin-transform-for-of@^7.23.6": version "7.23.6" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.23.6.tgz#81c37e24171b37b370ba6aaffa7ac86bcb46f94e" integrity sha512-aYH4ytZ0qSuBbpfhuofbg/e96oQ7U2w1Aw/UQmKT+1l39uEhUPoFS3fHevDc1G0OvewyDudfMKY1OulczHzWIw== @@ -1219,22 +1045,6 @@ "@babel/helper-plugin-utils" "^7.22.5" "@babel/helper-skip-transparent-expression-wrappers" "^7.22.5" -"@babel/plugin-transform-for-of@^7.23.3": - version "7.23.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.23.3.tgz#afe115ff0fbce735e02868d41489093c63e15559" - integrity sha512-X8jSm8X1CMwxmK878qsUGJRmbysKNbdpTv/O1/v0LuY/ZkZrng5WYiekYSdg9m09OTmDDUWeEDsTE+17WYbAZw== - dependencies: - "@babel/helper-plugin-utils" "^7.22.5" - -"@babel/plugin-transform-function-name@^7.22.5": - version "7.22.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.22.5.tgz#935189af68b01898e0d6d99658db6b164205c143" - integrity sha512-UIzQNMS0p0HHiQm3oelztj+ECwFnj+ZRV4KnguvlsD2of1whUeM6o7wGNj6oLwcDoAXQ8gEqfgC24D+VdIcevg== - dependencies: - "@babel/helper-compilation-targets" "^7.22.5" - "@babel/helper-function-name" "^7.22.5" - "@babel/helper-plugin-utils" "^7.22.5" - "@babel/plugin-transform-function-name@^7.23.3": version "7.23.3" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.23.3.tgz#8f424fcd862bf84cb9a1a6b42bc2f47ed630f8dc" @@ -1244,7 +1054,7 @@ "@babel/helper-function-name" "^7.23.0" "@babel/helper-plugin-utils" "^7.22.5" -"@babel/plugin-transform-json-strings@^7.22.11", "@babel/plugin-transform-json-strings@^7.23.3": +"@babel/plugin-transform-json-strings@^7.23.4": version "7.23.4" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-json-strings/-/plugin-transform-json-strings-7.23.4.tgz#a871d9b6bd171976efad2e43e694c961ffa3714d" integrity sha512-81nTOqM1dMwZ/aRXQ59zVubN9wHGqk6UtqRK+/q+ciXmRy8fSolhGVvG09HHRGo4l6fr/c4ZhXUQH0uFW7PZbg== @@ -1252,13 +1062,6 @@ "@babel/helper-plugin-utils" "^7.22.5" "@babel/plugin-syntax-json-strings" "^7.8.3" -"@babel/plugin-transform-literals@^7.22.5": - version "7.22.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.22.5.tgz#e9341f4b5a167952576e23db8d435849b1dd7920" - integrity sha512-fTLj4D79M+mepcw3dgFBTIDYpbcB9Sm0bpm4ppXPaO+U+PKFFyV9MGRvS0gvGw62sd10kT5lRMKXAADb9pWy8g== - dependencies: - "@babel/helper-plugin-utils" "^7.22.5" - "@babel/plugin-transform-literals@^7.23.3": version "7.23.3" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.23.3.tgz#8214665f00506ead73de157eba233e7381f3beb4" @@ -1266,7 +1069,7 @@ dependencies: "@babel/helper-plugin-utils" "^7.22.5" -"@babel/plugin-transform-logical-assignment-operators@^7.22.11", "@babel/plugin-transform-logical-assignment-operators@^7.23.3": +"@babel/plugin-transform-logical-assignment-operators@^7.23.4": version "7.23.4" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-logical-assignment-operators/-/plugin-transform-logical-assignment-operators-7.23.4.tgz#e599f82c51d55fac725f62ce55d3a0886279ecb5" integrity sha512-Mc/ALf1rmZTP4JKKEhUwiORU+vcfarFVLfcFiolKUo6sewoxSEgl36ak5t+4WamRsNr6nzjZXQjM35WsU+9vbg== @@ -1274,13 +1077,6 @@ "@babel/helper-plugin-utils" "^7.22.5" "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4" -"@babel/plugin-transform-member-expression-literals@^7.22.5": - version "7.22.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.22.5.tgz#4fcc9050eded981a468347dd374539ed3e058def" - integrity sha512-RZEdkNtzzYCFl9SE9ATaUMTj2hqMb4StarOJLrZRbqqU4HSBE7UlBw9WBWQiDzrJZJdUWiMTVDI6Gv/8DPvfew== - dependencies: - "@babel/helper-plugin-utils" "^7.22.5" - "@babel/plugin-transform-member-expression-literals@^7.23.3": version "7.23.3" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.23.3.tgz#e37b3f0502289f477ac0e776b05a833d853cabcc" @@ -1288,7 +1084,7 @@ dependencies: "@babel/helper-plugin-utils" "^7.22.5" -"@babel/plugin-transform-modules-amd@^7.23.0", "@babel/plugin-transform-modules-amd@^7.23.3": +"@babel/plugin-transform-modules-amd@^7.23.3": version "7.23.3" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.23.3.tgz#e19b55436a1416829df0a1afc495deedfae17f7d" integrity sha512-vJYQGxeKM4t8hYCKVBlZX/gtIY2I7mRGFNcm85sgXGMTBcoV3QdVtdpbcWEbzbfUIUZKwvgFT82mRvaQIebZzw== @@ -1296,7 +1092,7 @@ "@babel/helper-module-transforms" "^7.23.3" "@babel/helper-plugin-utils" "^7.22.5" -"@babel/plugin-transform-modules-commonjs@^7.23.0", "@babel/plugin-transform-modules-commonjs@^7.23.3": +"@babel/plugin-transform-modules-commonjs@^7.23.3": version "7.23.3" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.23.3.tgz#661ae831b9577e52be57dd8356b734f9700b53b4" integrity sha512-aVS0F65LKsdNOtcz6FRCpE4OgsP2OFnW46qNxNIX9h3wuzaNcSQsJysuMwqSibC98HPrf2vCgtxKNwS0DAlgcA== @@ -1305,7 +1101,7 @@ "@babel/helper-plugin-utils" "^7.22.5" "@babel/helper-simple-access" "^7.22.5" -"@babel/plugin-transform-modules-systemjs@^7.23.0", "@babel/plugin-transform-modules-systemjs@^7.23.3": +"@babel/plugin-transform-modules-systemjs@^7.23.3": version "7.23.3" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.23.3.tgz#fa7e62248931cb15b9404f8052581c302dd9de81" integrity sha512-ZxyKGTkF9xT9YJuKQRo19ewf3pXpopuYQd8cDXqNzc3mUNbOME0RKMoZxviQk74hwzfQsEe66dE92MaZbdHKNQ== @@ -1315,14 +1111,6 @@ "@babel/helper-plugin-utils" "^7.22.5" "@babel/helper-validator-identifier" "^7.22.20" -"@babel/plugin-transform-modules-umd@^7.22.5": - version "7.22.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.22.5.tgz#4694ae40a87b1745e3775b6a7fe96400315d4f98" - integrity sha512-+S6kzefN/E1vkSsKx8kmQuqeQsvCKCd1fraCM7zXm4SFoggI099Tr4G8U81+5gtMdUeMQ4ipdQffbKLX0/7dBQ== - dependencies: - "@babel/helper-module-transforms" "^7.22.5" - "@babel/helper-plugin-utils" "^7.22.5" - "@babel/plugin-transform-modules-umd@^7.23.3": version "7.23.3" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.23.3.tgz#5d4395fccd071dfefe6585a4411aa7d6b7d769e9" @@ -1339,13 +1127,6 @@ "@babel/helper-create-regexp-features-plugin" "^7.22.5" "@babel/helper-plugin-utils" "^7.22.5" -"@babel/plugin-transform-new-target@^7.22.5": - version "7.22.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.22.5.tgz#1b248acea54ce44ea06dfd37247ba089fcf9758d" - integrity sha512-AsF7K0Fx/cNKVyk3a+DW0JLo+Ua598/NxMRvxDnkpCIGFh43+h/v2xyhRUYf6oD8gE4QtL83C7zZVghMjHd+iw== - dependencies: - "@babel/helper-plugin-utils" "^7.22.5" - "@babel/plugin-transform-new-target@^7.23.3": version "7.23.3" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.23.3.tgz#5491bb78ed6ac87e990957cea367eab781c4d980" @@ -1353,7 +1134,7 @@ dependencies: "@babel/helper-plugin-utils" "^7.22.5" -"@babel/plugin-transform-nullish-coalescing-operator@^7.22.11", "@babel/plugin-transform-nullish-coalescing-operator@^7.23.3": +"@babel/plugin-transform-nullish-coalescing-operator@^7.23.4": version "7.23.4" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-nullish-coalescing-operator/-/plugin-transform-nullish-coalescing-operator-7.23.4.tgz#45556aad123fc6e52189ea749e33ce090637346e" integrity sha512-jHE9EVVqHKAQx+VePv5LLGHjmHSJR76vawFPTdlxR/LVJPfOEGxREQwQfjuZEOPTwG92X3LINSh3M40Rv4zpVA== @@ -1361,7 +1142,7 @@ "@babel/helper-plugin-utils" "^7.22.5" "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3" -"@babel/plugin-transform-numeric-separator@^7.22.11", "@babel/plugin-transform-numeric-separator@^7.23.3": +"@babel/plugin-transform-numeric-separator@^7.23.4": version "7.23.4" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-numeric-separator/-/plugin-transform-numeric-separator-7.23.4.tgz#03d08e3691e405804ecdd19dd278a40cca531f29" integrity sha512-mps6auzgwjRrwKEZA05cOwuDc9FAzoyFS4ZsG/8F43bTLf/TgkJg7QXOrPO1JO599iA3qgK9MXdMGOEC8O1h6Q== @@ -1369,7 +1150,7 @@ "@babel/helper-plugin-utils" "^7.22.5" "@babel/plugin-syntax-numeric-separator" "^7.10.4" -"@babel/plugin-transform-object-rest-spread@^7.22.15", "@babel/plugin-transform-object-rest-spread@^7.23.3": +"@babel/plugin-transform-object-rest-spread@^7.23.4": version "7.23.4" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.23.4.tgz#2b9c2d26bf62710460bdc0d1730d4f1048361b83" integrity sha512-9x9K1YyeQVw0iOXJlIzwm8ltobIIv7j2iLyP2jIhEbqPRQ7ScNgwQufU2I0Gq11VjyG4gI4yMXt2VFags+1N3g== @@ -1380,14 +1161,6 @@ "@babel/plugin-syntax-object-rest-spread" "^7.8.3" "@babel/plugin-transform-parameters" "^7.23.3" -"@babel/plugin-transform-object-super@^7.22.5": - version "7.22.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.22.5.tgz#794a8d2fcb5d0835af722173c1a9d704f44e218c" - integrity sha512-klXqyaT9trSjIUrcsYIfETAzmOEZL3cBYqOYLJxBHfMFFggmXOv+NYSX/Jbs9mzMVESw/WycLFPRx8ba/b2Ipw== - dependencies: - "@babel/helper-plugin-utils" "^7.22.5" - "@babel/helper-replace-supers" "^7.22.5" - "@babel/plugin-transform-object-super@^7.23.3": version "7.23.3" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.23.3.tgz#81fdb636dcb306dd2e4e8fd80db5b2362ed2ebcd" @@ -1396,7 +1169,7 @@ "@babel/helper-plugin-utils" "^7.22.5" "@babel/helper-replace-supers" "^7.22.20" -"@babel/plugin-transform-optional-catch-binding@^7.22.11", "@babel/plugin-transform-optional-catch-binding@^7.23.3": +"@babel/plugin-transform-optional-catch-binding@^7.23.4": version "7.23.4" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-optional-catch-binding/-/plugin-transform-optional-catch-binding-7.23.4.tgz#318066de6dacce7d92fa244ae475aa8d91778017" integrity sha512-XIq8t0rJPHf6Wvmbn9nFxU6ao4c7WhghTR5WyV8SrJfUFzyxhCm4nhC+iAp3HFhbAKLfYpgzhJ6t4XCtVwqO5A== @@ -1404,7 +1177,7 @@ "@babel/helper-plugin-utils" "^7.22.5" "@babel/plugin-syntax-optional-catch-binding" "^7.8.3" -"@babel/plugin-transform-optional-chaining@^7.23.0", "@babel/plugin-transform-optional-chaining@^7.23.3": +"@babel/plugin-transform-optional-chaining@^7.23.3", "@babel/plugin-transform-optional-chaining@^7.23.4": version "7.23.4" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.23.4.tgz#6acf61203bdfc4de9d4e52e64490aeb3e52bd017" integrity sha512-ZU8y5zWOfjM5vZ+asjgAPwDaBjJzgufjES89Rs4Lpq63O300R/kOz30WCLo6BxxX6QVEilwSlpClnG5cZaikTA== @@ -1413,21 +1186,13 @@ "@babel/helper-skip-transparent-expression-wrappers" "^7.22.5" "@babel/plugin-syntax-optional-chaining" "^7.8.3" -"@babel/plugin-transform-parameters@^7.22.15", "@babel/plugin-transform-parameters@^7.23.3": +"@babel/plugin-transform-parameters@^7.23.3": version "7.23.3" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.23.3.tgz#83ef5d1baf4b1072fa6e54b2b0999a7b2527e2af" integrity sha512-09lMt6UsUb3/34BbECKVbVwrT9bO6lILWln237z7sLaWnMsTi7Yc9fhX5DLpkJzAGfaReXI22wP41SZmnAA3Vw== dependencies: "@babel/helper-plugin-utils" "^7.22.5" -"@babel/plugin-transform-private-methods@^7.22.5": - version "7.22.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-private-methods/-/plugin-transform-private-methods-7.22.5.tgz#21c8af791f76674420a147ae62e9935d790f8722" - integrity sha512-PPjh4gyrQnGe97JTalgRGMuU4icsZFnWkzicB/fUtzlKUqvsWBKEpPPfr5a2JiyirZkHxnAqkQMO5Z5B2kK3fA== - dependencies: - "@babel/helper-create-class-features-plugin" "^7.22.5" - "@babel/helper-plugin-utils" "^7.22.5" - "@babel/plugin-transform-private-methods@^7.23.3": version "7.23.3" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-private-methods/-/plugin-transform-private-methods-7.23.3.tgz#b2d7a3c97e278bfe59137a978d53b2c2e038c0e4" @@ -1436,7 +1201,7 @@ "@babel/helper-create-class-features-plugin" "^7.22.15" "@babel/helper-plugin-utils" "^7.22.5" -"@babel/plugin-transform-private-property-in-object@^7.22.11", "@babel/plugin-transform-private-property-in-object@^7.23.3": +"@babel/plugin-transform-private-property-in-object@^7.23.4": version "7.23.4" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-private-property-in-object/-/plugin-transform-private-property-in-object-7.23.4.tgz#3ec711d05d6608fd173d9b8de39872d8dbf68bf5" integrity sha512-9G3K1YqTq3F4Vt88Djx1UZ79PDyj+yKRnUy7cZGSMe+a7jkwD259uKKuUzQlPkGam7R+8RJwh5z4xO27fA1o2A== @@ -1446,13 +1211,6 @@ "@babel/helper-plugin-utils" "^7.22.5" "@babel/plugin-syntax-private-property-in-object" "^7.14.5" -"@babel/plugin-transform-property-literals@^7.22.5": - version "7.22.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.22.5.tgz#b5ddabd73a4f7f26cd0e20f5db48290b88732766" - integrity sha512-TiOArgddK3mK/x1Qwf5hay2pxI6wCZnvQqrFSqbtg1GLl2JcNMitVH/YnqjP+M31pLUeTfzY1HAXFDnUBV30rQ== - dependencies: - "@babel/helper-plugin-utils" "^7.22.5" - "@babel/plugin-transform-property-literals@^7.23.3": version "7.23.3" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.23.3.tgz#54518f14ac4755d22b92162e4a852d308a560875" @@ -1460,7 +1218,7 @@ dependencies: "@babel/helper-plugin-utils" "^7.22.5" -"@babel/plugin-transform-regenerator@^7.22.10", "@babel/plugin-transform-regenerator@^7.23.3": +"@babel/plugin-transform-regenerator@^7.23.3": version "7.23.3" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.23.3.tgz#141afd4a2057298602069fce7f2dc5173e6c561c" integrity sha512-KP+75h0KghBMcVpuKisx3XTu9Ncut8Q8TuvGO4IhY+9D5DFEckQefOuIsB/gQ2tG71lCke4NMrtIPS8pOj18BQ== @@ -1468,13 +1226,6 @@ "@babel/helper-plugin-utils" "^7.22.5" regenerator-transform "^0.15.2" -"@babel/plugin-transform-reserved-words@^7.22.5": - version "7.22.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.22.5.tgz#832cd35b81c287c4bcd09ce03e22199641f964fb" - integrity sha512-DTtGKFRQUDm8svigJzZHzb/2xatPc6TzNvAIJ5GqOKDsGFYgAskjRulbR/vGsPKq3OPqtexnz327qYpP57RFyA== - dependencies: - "@babel/helper-plugin-utils" "^7.22.5" - "@babel/plugin-transform-reserved-words@^7.23.3": version "7.23.3" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.23.3.tgz#4130dcee12bd3dd5705c587947eb715da12efac8" @@ -1482,25 +1233,18 @@ dependencies: "@babel/helper-plugin-utils" "^7.22.5" -"@babel/plugin-transform-runtime@7.23.2": - version "7.23.2" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.23.2.tgz#c956a3f8d1aa50816ff6c30c6288d66635c12990" - integrity sha512-XOntj6icgzMS58jPVtQpiuF6ZFWxQiJavISGx5KGjRj+3gqZr8+N6Kx+N9BApWzgS+DOjIZfXXj0ZesenOWDyA== +"@babel/plugin-transform-runtime@7.23.7": + version "7.23.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.23.7.tgz#52bbd20054855beb9deae3bee9ceb05289c343e6" + integrity sha512-fa0hnfmiXc9fq/weK34MUV0drz2pOL/vfKWvN7Qw127hiUPabFCUMgAbYWcchRzMJit4o5ARsK/s+5h0249pLw== dependencies: "@babel/helper-module-imports" "^7.22.15" "@babel/helper-plugin-utils" "^7.22.5" - babel-plugin-polyfill-corejs2 "^0.4.6" - babel-plugin-polyfill-corejs3 "^0.8.5" - babel-plugin-polyfill-regenerator "^0.5.3" + babel-plugin-polyfill-corejs2 "^0.4.7" + babel-plugin-polyfill-corejs3 "^0.8.7" + babel-plugin-polyfill-regenerator "^0.5.4" semver "^6.3.1" -"@babel/plugin-transform-shorthand-properties@^7.22.5": - version "7.22.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.22.5.tgz#6e277654be82b5559fc4b9f58088507c24f0c624" - integrity sha512-vM4fq9IXHscXVKzDv5itkO1X52SmdFBFcMIBZ2FRn2nqVYqw6dBexUgMvAjHW+KXpPPViD/Yo3GrDEBaRC0QYA== - dependencies: - "@babel/helper-plugin-utils" "^7.22.5" - "@babel/plugin-transform-shorthand-properties@^7.23.3": version "7.23.3" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.23.3.tgz#97d82a39b0e0c24f8a981568a8ed851745f59210" @@ -1508,14 +1252,6 @@ dependencies: "@babel/helper-plugin-utils" "^7.22.5" -"@babel/plugin-transform-spread@^7.22.5": - version "7.22.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.22.5.tgz#6487fd29f229c95e284ba6c98d65eafb893fea6b" - integrity sha512-5ZzDQIGyvN4w8+dMmpohL6MBo+l2G7tfC/O2Dg7/hjpgeWvUx8FzfeOKxGog9IimPa4YekaQ9PlDqTLOljkcxg== - dependencies: - "@babel/helper-plugin-utils" "^7.22.5" - "@babel/helper-skip-transparent-expression-wrappers" "^7.22.5" - "@babel/plugin-transform-spread@^7.23.3": version "7.23.3" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.23.3.tgz#41d17aacb12bde55168403c6f2d6bdca563d362c" @@ -1524,13 +1260,6 @@ "@babel/helper-plugin-utils" "^7.22.5" "@babel/helper-skip-transparent-expression-wrappers" "^7.22.5" -"@babel/plugin-transform-sticky-regex@^7.22.5": - version "7.22.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.22.5.tgz#295aba1595bfc8197abd02eae5fc288c0deb26aa" - integrity sha512-zf7LuNpHG0iEeiyCNwX4j3gDg1jgt1k3ZdXBKbZSoA3BbGQGvMiSvfbZRR3Dr3aeJe3ooWFZxOOG3IRStYp2Bw== - dependencies: - "@babel/helper-plugin-utils" "^7.22.5" - "@babel/plugin-transform-sticky-regex@^7.23.3": version "7.23.3" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.23.3.tgz#dec45588ab4a723cb579c609b294a3d1bd22ff04" @@ -1538,13 +1267,6 @@ dependencies: "@babel/helper-plugin-utils" "^7.22.5" -"@babel/plugin-transform-template-literals@^7.22.5": - version "7.22.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.22.5.tgz#8f38cf291e5f7a8e60e9f733193f0bcc10909bff" - integrity sha512-5ciOehRNf+EyUeewo8NkbQiUs4d6ZxiHo6BcBcnFlgiJfu16q0bQUw9Jvo0b0gBKFG1SMhDSjeKXSYuJLeFSMA== - dependencies: - "@babel/helper-plugin-utils" "^7.22.5" - "@babel/plugin-transform-template-literals@^7.23.3": version "7.23.3" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.23.3.tgz#5f0f028eb14e50b5d0f76be57f90045757539d07" @@ -1552,13 +1274,6 @@ dependencies: "@babel/helper-plugin-utils" "^7.22.5" -"@babel/plugin-transform-typeof-symbol@^7.22.5": - version "7.22.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.22.5.tgz#5e2ba478da4b603af8673ff7c54f75a97b716b34" - integrity sha512-bYkI5lMzL4kPii4HHEEChkD0rkc+nvnlR6+o/qdqR6zrm0Sv/nodmyLhlq2DO0YKLUNd2VePmPRjJXSBh9OIdA== - dependencies: - "@babel/helper-plugin-utils" "^7.22.5" - "@babel/plugin-transform-typeof-symbol@^7.23.3": version "7.23.3" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.23.3.tgz#9dfab97acc87495c0c449014eb9c547d8966bca4" @@ -1566,21 +1281,13 @@ dependencies: "@babel/helper-plugin-utils" "^7.22.5" -"@babel/plugin-transform-unicode-escapes@^7.22.10", "@babel/plugin-transform-unicode-escapes@^7.23.3": +"@babel/plugin-transform-unicode-escapes@^7.23.3": version "7.23.3" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.23.3.tgz#1f66d16cab01fab98d784867d24f70c1ca65b925" integrity sha512-OMCUx/bU6ChE3r4+ZdylEqAjaQgHAgipgW8nsCfu5pGqDcFytVd91AwRvUJSBZDz0exPGgnjoqhgRYLRjFZc9Q== dependencies: "@babel/helper-plugin-utils" "^7.22.5" -"@babel/plugin-transform-unicode-property-regex@^7.22.5": - version "7.22.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-property-regex/-/plugin-transform-unicode-property-regex-7.22.5.tgz#098898f74d5c1e86660dc112057b2d11227f1c81" - integrity sha512-HCCIb+CbJIAE6sXn5CjFQXMwkCClcOfPCzTlilJ8cUatfzwHlWQkbtV0zD338u9dZskwvuOYTuuaMaA8J5EI5A== - dependencies: - "@babel/helper-create-regexp-features-plugin" "^7.22.5" - "@babel/helper-plugin-utils" "^7.22.5" - "@babel/plugin-transform-unicode-property-regex@^7.23.3": version "7.23.3" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-property-regex/-/plugin-transform-unicode-property-regex-7.23.3.tgz#19e234129e5ffa7205010feec0d94c251083d7ad" @@ -1589,14 +1296,6 @@ "@babel/helper-create-regexp-features-plugin" "^7.22.15" "@babel/helper-plugin-utils" "^7.22.5" -"@babel/plugin-transform-unicode-regex@^7.22.5": - version "7.22.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.22.5.tgz#ce7e7bb3ef208c4ff67e02a22816656256d7a183" - integrity sha512-028laaOKptN5vHJf9/Arr/HiJekMd41hOEZYvNsrsXqJ7YPYuX2bQxh31fkZzGmq3YqHRJzYFFAVYvKfMPKqyg== - dependencies: - "@babel/helper-create-regexp-features-plugin" "^7.22.5" - "@babel/helper-plugin-utils" "^7.22.5" - "@babel/plugin-transform-unicode-regex@^7.23.3": version "7.23.3" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.23.3.tgz#26897708d8f42654ca4ce1b73e96140fbad879dc" @@ -1605,14 +1304,6 @@ "@babel/helper-create-regexp-features-plugin" "^7.22.15" "@babel/helper-plugin-utils" "^7.22.5" -"@babel/plugin-transform-unicode-sets-regex@^7.22.5": - version "7.22.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-sets-regex/-/plugin-transform-unicode-sets-regex-7.22.5.tgz#77788060e511b708ffc7d42fdfbc5b37c3004e91" - integrity sha512-lhMfi4FC15j13eKrh3DnYHjpGj6UKQHtNKTbtc1igvAhRy4+kLhV07OpLcsN0VgDEw/MjAvJO4BdMJsHwMhzCg== - dependencies: - "@babel/helper-create-regexp-features-plugin" "^7.22.5" - "@babel/helper-plugin-utils" "^7.22.5" - "@babel/plugin-transform-unicode-sets-regex@^7.23.3": version "7.23.3" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-sets-regex/-/plugin-transform-unicode-sets-regex-7.23.3.tgz#4fb6f0a719c2c5859d11f6b55a050cc987f3799e" @@ -1621,104 +1312,18 @@ "@babel/helper-create-regexp-features-plugin" "^7.22.15" "@babel/helper-plugin-utils" "^7.22.5" -"@babel/preset-env@7.23.2": - version "7.23.2" - resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.23.2.tgz#1f22be0ff0e121113260337dbc3e58fafce8d059" - integrity sha512-BW3gsuDD+rvHL2VO2SjAUNTBe5YrjsTiDyqamPDWY723na3/yPQ65X5oQkFVJZ0o50/2d+svm1rkPoJeR1KxVQ== - dependencies: - "@babel/compat-data" "^7.23.2" - "@babel/helper-compilation-targets" "^7.22.15" - "@babel/helper-plugin-utils" "^7.22.5" - "@babel/helper-validator-option" "^7.22.15" - "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression" "^7.22.15" - "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining" "^7.22.15" - "@babel/plugin-proposal-private-property-in-object" "7.21.0-placeholder-for-preset-env.2" - "@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-import-assertions" "^7.22.5" - "@babel/plugin-syntax-import-attributes" "^7.22.5" - "@babel/plugin-syntax-import-meta" "^7.10.4" - "@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-syntax-unicode-sets-regex" "^7.18.6" - "@babel/plugin-transform-arrow-functions" "^7.22.5" - "@babel/plugin-transform-async-generator-functions" "^7.23.2" - "@babel/plugin-transform-async-to-generator" "^7.22.5" - "@babel/plugin-transform-block-scoped-functions" "^7.22.5" - "@babel/plugin-transform-block-scoping" "^7.23.0" - "@babel/plugin-transform-class-properties" "^7.22.5" - "@babel/plugin-transform-class-static-block" "^7.22.11" - "@babel/plugin-transform-classes" "^7.22.15" - "@babel/plugin-transform-computed-properties" "^7.22.5" - "@babel/plugin-transform-destructuring" "^7.23.0" - "@babel/plugin-transform-dotall-regex" "^7.22.5" - "@babel/plugin-transform-duplicate-keys" "^7.22.5" - "@babel/plugin-transform-dynamic-import" "^7.22.11" - "@babel/plugin-transform-exponentiation-operator" "^7.22.5" - "@babel/plugin-transform-export-namespace-from" "^7.22.11" - "@babel/plugin-transform-for-of" "^7.22.15" - "@babel/plugin-transform-function-name" "^7.22.5" - "@babel/plugin-transform-json-strings" "^7.22.11" - "@babel/plugin-transform-literals" "^7.22.5" - "@babel/plugin-transform-logical-assignment-operators" "^7.22.11" - "@babel/plugin-transform-member-expression-literals" "^7.22.5" - "@babel/plugin-transform-modules-amd" "^7.23.0" - "@babel/plugin-transform-modules-commonjs" "^7.23.0" - "@babel/plugin-transform-modules-systemjs" "^7.23.0" - "@babel/plugin-transform-modules-umd" "^7.22.5" - "@babel/plugin-transform-named-capturing-groups-regex" "^7.22.5" - "@babel/plugin-transform-new-target" "^7.22.5" - "@babel/plugin-transform-nullish-coalescing-operator" "^7.22.11" - "@babel/plugin-transform-numeric-separator" "^7.22.11" - "@babel/plugin-transform-object-rest-spread" "^7.22.15" - "@babel/plugin-transform-object-super" "^7.22.5" - "@babel/plugin-transform-optional-catch-binding" "^7.22.11" - "@babel/plugin-transform-optional-chaining" "^7.23.0" - "@babel/plugin-transform-parameters" "^7.22.15" - "@babel/plugin-transform-private-methods" "^7.22.5" - "@babel/plugin-transform-private-property-in-object" "^7.22.11" - "@babel/plugin-transform-property-literals" "^7.22.5" - "@babel/plugin-transform-regenerator" "^7.22.10" - "@babel/plugin-transform-reserved-words" "^7.22.5" - "@babel/plugin-transform-shorthand-properties" "^7.22.5" - "@babel/plugin-transform-spread" "^7.22.5" - "@babel/plugin-transform-sticky-regex" "^7.22.5" - "@babel/plugin-transform-template-literals" "^7.22.5" - "@babel/plugin-transform-typeof-symbol" "^7.22.5" - "@babel/plugin-transform-unicode-escapes" "^7.22.10" - "@babel/plugin-transform-unicode-property-regex" "^7.22.5" - "@babel/plugin-transform-unicode-regex" "^7.22.5" - "@babel/plugin-transform-unicode-sets-regex" "^7.22.5" - "@babel/preset-modules" "0.1.6-no-external-plugins" - "@babel/types" "^7.23.0" - babel-plugin-polyfill-corejs2 "^0.4.6" - babel-plugin-polyfill-corejs3 "^0.8.5" - babel-plugin-polyfill-regenerator "^0.5.3" - core-js-compat "^3.31.0" - semver "^6.3.1" - -"@babel/preset-env@^7.23.3": - version "7.23.3" - resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.23.3.tgz#d299e0140a7650684b95c62be2db0ef8c975143e" - integrity sha512-ovzGc2uuyNfNAs/jyjIGxS8arOHS5FENZaNn4rtE7UdKMMkqHCvboHfcuhWLZNX5cB44QfcGNWjaevxMzzMf+Q== +"@babel/preset-env@7.23.7", "@babel/preset-env@^7.23.3": + version "7.23.7" + resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.23.7.tgz#e5d69b9f14db8a13bae4d8e5ce7f360973626241" + integrity sha512-SY27X/GtTz/L4UryMNJ6p4fH4nsgWbz84y9FE0bQeWJP6O5BhgVCt53CotQKHCOeXJel8VyhlhujhlltKms/CA== dependencies: - "@babel/compat-data" "^7.23.3" - "@babel/helper-compilation-targets" "^7.22.15" + "@babel/compat-data" "^7.23.5" + "@babel/helper-compilation-targets" "^7.23.6" "@babel/helper-plugin-utils" "^7.22.5" - "@babel/helper-validator-option" "^7.22.15" + "@babel/helper-validator-option" "^7.23.5" "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression" "^7.23.3" "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining" "^7.23.3" - "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly" "^7.23.3" + "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly" "^7.23.7" "@babel/plugin-proposal-private-property-in-object" "7.21.0-placeholder-for-preset-env.2" "@babel/plugin-syntax-async-generators" "^7.8.4" "@babel/plugin-syntax-class-properties" "^7.12.13" @@ -1739,25 +1344,25 @@ "@babel/plugin-syntax-top-level-await" "^7.14.5" "@babel/plugin-syntax-unicode-sets-regex" "^7.18.6" "@babel/plugin-transform-arrow-functions" "^7.23.3" - "@babel/plugin-transform-async-generator-functions" "^7.23.3" + "@babel/plugin-transform-async-generator-functions" "^7.23.7" "@babel/plugin-transform-async-to-generator" "^7.23.3" "@babel/plugin-transform-block-scoped-functions" "^7.23.3" - "@babel/plugin-transform-block-scoping" "^7.23.3" + "@babel/plugin-transform-block-scoping" "^7.23.4" "@babel/plugin-transform-class-properties" "^7.23.3" - "@babel/plugin-transform-class-static-block" "^7.23.3" - "@babel/plugin-transform-classes" "^7.23.3" + "@babel/plugin-transform-class-static-block" "^7.23.4" + "@babel/plugin-transform-classes" "^7.23.5" "@babel/plugin-transform-computed-properties" "^7.23.3" "@babel/plugin-transform-destructuring" "^7.23.3" "@babel/plugin-transform-dotall-regex" "^7.23.3" "@babel/plugin-transform-duplicate-keys" "^7.23.3" - "@babel/plugin-transform-dynamic-import" "^7.23.3" + "@babel/plugin-transform-dynamic-import" "^7.23.4" "@babel/plugin-transform-exponentiation-operator" "^7.23.3" - "@babel/plugin-transform-export-namespace-from" "^7.23.3" - "@babel/plugin-transform-for-of" "^7.23.3" + "@babel/plugin-transform-export-namespace-from" "^7.23.4" + "@babel/plugin-transform-for-of" "^7.23.6" "@babel/plugin-transform-function-name" "^7.23.3" - "@babel/plugin-transform-json-strings" "^7.23.3" + "@babel/plugin-transform-json-strings" "^7.23.4" "@babel/plugin-transform-literals" "^7.23.3" - "@babel/plugin-transform-logical-assignment-operators" "^7.23.3" + "@babel/plugin-transform-logical-assignment-operators" "^7.23.4" "@babel/plugin-transform-member-expression-literals" "^7.23.3" "@babel/plugin-transform-modules-amd" "^7.23.3" "@babel/plugin-transform-modules-commonjs" "^7.23.3" @@ -1765,15 +1370,15 @@ "@babel/plugin-transform-modules-umd" "^7.23.3" "@babel/plugin-transform-named-capturing-groups-regex" "^7.22.5" "@babel/plugin-transform-new-target" "^7.23.3" - "@babel/plugin-transform-nullish-coalescing-operator" "^7.23.3" - "@babel/plugin-transform-numeric-separator" "^7.23.3" - "@babel/plugin-transform-object-rest-spread" "^7.23.3" + "@babel/plugin-transform-nullish-coalescing-operator" "^7.23.4" + "@babel/plugin-transform-numeric-separator" "^7.23.4" + "@babel/plugin-transform-object-rest-spread" "^7.23.4" "@babel/plugin-transform-object-super" "^7.23.3" - "@babel/plugin-transform-optional-catch-binding" "^7.23.3" - "@babel/plugin-transform-optional-chaining" "^7.23.3" + "@babel/plugin-transform-optional-catch-binding" "^7.23.4" + "@babel/plugin-transform-optional-chaining" "^7.23.4" "@babel/plugin-transform-parameters" "^7.23.3" "@babel/plugin-transform-private-methods" "^7.23.3" - "@babel/plugin-transform-private-property-in-object" "^7.23.3" + "@babel/plugin-transform-private-property-in-object" "^7.23.4" "@babel/plugin-transform-property-literals" "^7.23.3" "@babel/plugin-transform-regenerator" "^7.23.3" "@babel/plugin-transform-reserved-words" "^7.23.3" @@ -1787,9 +1392,9 @@ "@babel/plugin-transform-unicode-regex" "^7.23.3" "@babel/plugin-transform-unicode-sets-regex" "^7.23.3" "@babel/preset-modules" "0.1.6-no-external-plugins" - babel-plugin-polyfill-corejs2 "^0.4.6" - babel-plugin-polyfill-corejs3 "^0.8.5" - babel-plugin-polyfill-regenerator "^0.5.3" + babel-plugin-polyfill-corejs2 "^0.4.7" + babel-plugin-polyfill-corejs3 "^0.8.7" + babel-plugin-polyfill-regenerator "^0.5.4" core-js-compat "^3.31.0" semver "^6.3.1" @@ -1807,17 +1412,10 @@ resolved "https://registry.yarnpkg.com/@babel/regjsgen/-/regjsgen-0.8.0.tgz#f0ba69b075e1f05fb2825b7fad991e7adbb18310" integrity sha512-x/rqGMdzj+fWZvCOYForTghzbtqPDZ5gPwaoNGHdgDfF2QA/XZbCBp4Moo5scrkAMPhB7z26XM/AaHuIJdgauA== -"@babel/runtime@7.23.2": - version "7.23.2" - resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.23.2.tgz#062b0ac103261d68a966c4c7baf2ae3e62ec3885" - integrity sha512-mM8eg4yl5D6i3lu2QKPuPH4FArvJ8KhTofbE7jwMUv9KX5mBvwPAqnV3MlyBNqdp9RyRKP6Yck8TrfYrPvX3bg== - dependencies: - regenerator-runtime "^0.14.0" - -"@babel/runtime@^7.23.2", "@babel/runtime@^7.8.4": - version "7.23.4" - resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.23.4.tgz#36fa1d2b36db873d25ec631dcc4923fdc1cf2e2e" - integrity sha512-2Yv65nlWnWlSpe3fXEyX5i7fx5kIKo4Qbcj+hMO0odwaneFjfXw5fdum+4yL20O0QiaHpia0cYQ9xpNMqrBwHg== +"@babel/runtime@7.23.7", "@babel/runtime@^7.23.2", "@babel/runtime@^7.8.4": + version "7.23.7" + resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.23.7.tgz#dd7c88deeb218a0f8bd34d5db1aa242e0f203193" + integrity sha512-w06OXVOFso7LcbzMiDGt+3X7Rh7Ho8MmgPoWU3rarH+8upf+wSU/grlGbWzQyr3DkdN6ZeuMFjpdwW0Q+HxobA== dependencies: regenerator-runtime "^0.14.0" @@ -1830,7 +1428,7 @@ "@babel/parser" "^7.22.15" "@babel/types" "^7.22.15" -"@babel/traverse@^7.22.5", "@babel/traverse@^7.23.2": +"@babel/traverse@^7.23.2": version "7.23.2" resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.23.2.tgz#329c7a06735e144a506bdb2cad0268b7f46f4ad8" integrity sha512-azpe59SQ48qG6nu2CzcMLbxUudtN+dOM9kDbUqGq3HXUJRlo7i8fvPoxQUzYgLZ4cMVmuZgm8vvBpNeRhd6XSw== @@ -1846,22 +1444,31 @@ debug "^4.1.0" globals "^11.1.0" -"@babel/traverse@^7.23.3": - version "7.23.4" - resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.23.4.tgz#c2790f7edf106d059a0098770fe70801417f3f85" - integrity sha512-IYM8wSUwunWTB6tFC2dkKZhxbIjHoWemdK+3f8/wq8aKhbUscxD5MX72ubd90fxvFknaLPeGw5ycU84V1obHJg== +"@babel/traverse@^7.23.7": + version "7.23.7" + resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.23.7.tgz#9a7bf285c928cb99b5ead19c3b1ce5b310c9c305" + integrity sha512-tY3mM8rH9jM0YHFGyfC0/xf+SB5eKUu7HPj7/k3fpi9dAlsMc5YbQvDi0Sh2QTPXqMhyaAtzAr807TIyfQrmyg== dependencies: - "@babel/code-frame" "^7.23.4" - "@babel/generator" "^7.23.4" + "@babel/code-frame" "^7.23.5" + "@babel/generator" "^7.23.6" "@babel/helper-environment-visitor" "^7.22.20" "@babel/helper-function-name" "^7.23.0" "@babel/helper-hoist-variables" "^7.22.5" "@babel/helper-split-export-declaration" "^7.22.6" - "@babel/parser" "^7.23.4" - "@babel/types" "^7.23.4" - debug "^4.1.0" + "@babel/parser" "^7.23.6" + "@babel/types" "^7.23.6" + debug "^4.3.1" globals "^11.1.0" +"@babel/types@^7.0.0", "@babel/types@^7.20.7", "@babel/types@^7.23.6": + version "7.23.6" + resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.23.6.tgz#be33fdb151e1f5a56877d704492c240fc71c7ccd" + integrity sha512-+uarb83brBzPKN38NX1MkB6vb6+mwvR6amUulqAE7ccQw1pEl+bCia9TbdG1lsnFP7lZySvUn37CHyXQdfTwzg== + dependencies: + "@babel/helper-string-parser" "^7.23.4" + "@babel/helper-validator-identifier" "^7.22.20" + to-fast-properties "^2.0.0" + "@babel/types@^7.22.15", "@babel/types@^7.22.19", "@babel/types@^7.23.0": version "7.23.0" resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.23.0.tgz#8c1f020c9df0e737e4e247c0619f58c68458aaeb" @@ -1880,15 +1487,6 @@ "@babel/helper-validator-identifier" "^7.22.5" to-fast-properties "^2.0.0" -"@babel/types@^7.23.3", "@babel/types@^7.23.4": - version "7.23.4" - resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.23.4.tgz#7206a1810fc512a7f7f7d4dace4cb4c1c9dbfb8e" - integrity sha512-7uIFwVYpoplT5jp/kVv6EF93VaJ8H+Yn5IczYiaAi98ajzjfoZfslet/e0sLh+wVBjb2qqIut1b0S26VSafsSQ== - dependencies: - "@babel/helper-string-parser" "^7.23.4" - "@babel/helper-validator-identifier" "^7.22.20" - to-fast-properties "^2.0.0" - "@codemirror/autocomplete@^6.0.0": version "6.8.1" resolved "https://registry.yarnpkg.com/@codemirror/autocomplete/-/autocomplete-6.8.1.tgz#3f3daa9f591186901db07f58d17256656242e841" @@ -2237,225 +1835,120 @@ esquery "^1.5.0" jsdoc-type-pratt-parser "~4.0.0" -"@esbuild/android-arm64@0.18.20": - version "0.18.20" - resolved "https://registry.yarnpkg.com/@esbuild/android-arm64/-/android-arm64-0.18.20.tgz#984b4f9c8d0377443cc2dfcef266d02244593622" - integrity sha512-Nz4rJcchGDtENV0eMKUNa6L12zz2zBDXuhj/Vjh18zGqB44Bi7MBMSXjgunJgjRhCmKOjnPuZp4Mb6OKqtMHLQ== - -"@esbuild/android-arm64@0.19.5": - version "0.19.5" - resolved "https://registry.yarnpkg.com/@esbuild/android-arm64/-/android-arm64-0.19.5.tgz#276c5f99604054d3dbb733577e09adae944baa90" - integrity sha512-5d1OkoJxnYQfmC+Zd8NBFjkhyCNYwM4n9ODrycTFY6Jk1IGiZ+tjVJDDSwDt77nK+tfpGP4T50iMtVi4dEGzhQ== - -"@esbuild/android-arm@0.18.20": - version "0.18.20" - resolved "https://registry.yarnpkg.com/@esbuild/android-arm/-/android-arm-0.18.20.tgz#fedb265bc3a589c84cc11f810804f234947c3682" - integrity sha512-fyi7TDI/ijKKNZTUJAQqiG5T7YjJXgnzkURqmGj13C6dCqckZBLdl4h7bkhHt/t0WP+zO9/zwroDvANaOqO5Sw== - -"@esbuild/android-arm@0.19.5": - version "0.19.5" - resolved "https://registry.yarnpkg.com/@esbuild/android-arm/-/android-arm-0.19.5.tgz#4a3cbf14758166abaae8ba9c01a80e68342a4eec" - integrity sha512-bhvbzWFF3CwMs5tbjf3ObfGqbl/17ict2/uwOSfr3wmxDE6VdS2GqY/FuzIPe0q0bdhj65zQsvqfArI9MY6+AA== - -"@esbuild/android-x64@0.18.20": - version "0.18.20" - resolved "https://registry.yarnpkg.com/@esbuild/android-x64/-/android-x64-0.18.20.tgz#35cf419c4cfc8babe8893d296cd990e9e9f756f2" - integrity sha512-8GDdlePJA8D6zlZYJV/jnrRAi6rOiNaCC/JclcXpB+KIuvfBN4owLtgzY2bsxnx666XjJx2kDPUmnTtR8qKQUg== - -"@esbuild/android-x64@0.19.5": - version "0.19.5" - resolved "https://registry.yarnpkg.com/@esbuild/android-x64/-/android-x64-0.19.5.tgz#21a3d11cd4613d2d3c5ccb9e746c254eb9265b0a" - integrity sha512-9t+28jHGL7uBdkBjL90QFxe7DVA+KGqWlHCF8ChTKyaKO//VLuoBricQCgwhOjA1/qOczsw843Fy4cbs4H3DVA== - -"@esbuild/darwin-arm64@0.18.20": - version "0.18.20" - resolved "https://registry.yarnpkg.com/@esbuild/darwin-arm64/-/darwin-arm64-0.18.20.tgz#08172cbeccf95fbc383399a7f39cfbddaeb0d7c1" - integrity sha512-bxRHW5kHU38zS2lPTPOyuyTm+S+eobPUnTNkdJEfAddYgEcll4xkT8DB9d2008DtTbl7uJag2HuE5NZAZgnNEA== - -"@esbuild/darwin-arm64@0.19.5": - version "0.19.5" - resolved "https://registry.yarnpkg.com/@esbuild/darwin-arm64/-/darwin-arm64-0.19.5.tgz#714cb839f467d6a67b151ee8255886498e2b9bf6" - integrity sha512-mvXGcKqqIqyKoxq26qEDPHJuBYUA5KizJncKOAf9eJQez+L9O+KfvNFu6nl7SCZ/gFb2QPaRqqmG0doSWlgkqw== - -"@esbuild/darwin-x64@0.18.20": - version "0.18.20" - resolved "https://registry.yarnpkg.com/@esbuild/darwin-x64/-/darwin-x64-0.18.20.tgz#d70d5790d8bf475556b67d0f8b7c5bdff053d85d" - integrity sha512-pc5gxlMDxzm513qPGbCbDukOdsGtKhfxD1zJKXjCCcU7ju50O7MeAZ8c4krSJcOIJGFR+qx21yMMVYwiQvyTyQ== - -"@esbuild/darwin-x64@0.19.5": - version "0.19.5" - resolved "https://registry.yarnpkg.com/@esbuild/darwin-x64/-/darwin-x64-0.19.5.tgz#2c553e97a6d2b4ae76a884e35e6cbab85a990bbf" - integrity sha512-Ly8cn6fGLNet19s0X4unjcniX24I0RqjPv+kurpXabZYSXGM4Pwpmf85WHJN3lAgB8GSth7s5A0r856S+4DyiA== - -"@esbuild/freebsd-arm64@0.18.20": - version "0.18.20" - resolved "https://registry.yarnpkg.com/@esbuild/freebsd-arm64/-/freebsd-arm64-0.18.20.tgz#98755cd12707f93f210e2494d6a4b51b96977f54" - integrity sha512-yqDQHy4QHevpMAaxhhIwYPMv1NECwOvIpGCZkECn8w2WFHXjEwrBn3CeNIYsibZ/iZEUemj++M26W3cNR5h+Tw== - -"@esbuild/freebsd-arm64@0.19.5": - version "0.19.5" - resolved "https://registry.yarnpkg.com/@esbuild/freebsd-arm64/-/freebsd-arm64-0.19.5.tgz#d554f556718adb31917a0da24277bf84b6ee87f3" - integrity sha512-GGDNnPWTmWE+DMchq1W8Sd0mUkL+APvJg3b11klSGUDvRXh70JqLAO56tubmq1s2cgpVCSKYywEiKBfju8JztQ== - -"@esbuild/freebsd-x64@0.18.20": - version "0.18.20" - resolved "https://registry.yarnpkg.com/@esbuild/freebsd-x64/-/freebsd-x64-0.18.20.tgz#c1eb2bff03915f87c29cece4c1a7fa1f423b066e" - integrity sha512-tgWRPPuQsd3RmBZwarGVHZQvtzfEBOreNuxEMKFcd5DaDn2PbBxfwLcj4+aenoh7ctXcbXmOQIn8HI6mCSw5MQ== - -"@esbuild/freebsd-x64@0.19.5": - version "0.19.5" - resolved "https://registry.yarnpkg.com/@esbuild/freebsd-x64/-/freebsd-x64-0.19.5.tgz#288f7358a3bb15d99e73c65c9adaa3dabb497432" - integrity sha512-1CCwDHnSSoA0HNwdfoNY0jLfJpd7ygaLAp5EHFos3VWJCRX9DMwWODf96s9TSse39Br7oOTLryRVmBoFwXbuuQ== - -"@esbuild/linux-arm64@0.18.20": - version "0.18.20" - resolved "https://registry.yarnpkg.com/@esbuild/linux-arm64/-/linux-arm64-0.18.20.tgz#bad4238bd8f4fc25b5a021280c770ab5fc3a02a0" - integrity sha512-2YbscF+UL7SQAVIpnWvYwM+3LskyDmPhe31pE7/aoTMFKKzIc9lLbyGUpmmb8a8AixOL61sQ/mFh3jEjHYFvdA== - -"@esbuild/linux-arm64@0.19.5": - version "0.19.5" - resolved "https://registry.yarnpkg.com/@esbuild/linux-arm64/-/linux-arm64-0.19.5.tgz#95933ae86325c93cb6b5e8333d22120ecfdc901b" - integrity sha512-o3vYippBmSrjjQUCEEiTZ2l+4yC0pVJD/Dl57WfPwwlvFkrxoSO7rmBZFii6kQB3Wrn/6GwJUPLU5t52eq2meA== - -"@esbuild/linux-arm@0.18.20": - version "0.18.20" - resolved "https://registry.yarnpkg.com/@esbuild/linux-arm/-/linux-arm-0.18.20.tgz#3e617c61f33508a27150ee417543c8ab5acc73b0" - integrity sha512-/5bHkMWnq1EgKr1V+Ybz3s1hWXok7mDFUMQ4cG10AfW3wL02PSZi5kFpYKrptDsgb2WAJIvRcDm+qIvXf/apvg== - -"@esbuild/linux-arm@0.19.5": - version "0.19.5" - resolved "https://registry.yarnpkg.com/@esbuild/linux-arm/-/linux-arm-0.19.5.tgz#0acef93aa3e0579e46d33b666627bddb06636664" - integrity sha512-lrWXLY/vJBzCPC51QN0HM71uWgIEpGSjSZZADQhq7DKhPcI6NH1IdzjfHkDQws2oNpJKpR13kv7/pFHBbDQDwQ== - -"@esbuild/linux-ia32@0.18.20": - version "0.18.20" - resolved "https://registry.yarnpkg.com/@esbuild/linux-ia32/-/linux-ia32-0.18.20.tgz#699391cccba9aee6019b7f9892eb99219f1570a7" - integrity sha512-P4etWwq6IsReT0E1KHU40bOnzMHoH73aXp96Fs8TIT6z9Hu8G6+0SHSw9i2isWrD2nbx2qo5yUqACgdfVGx7TA== - -"@esbuild/linux-ia32@0.19.5": - version "0.19.5" - resolved "https://registry.yarnpkg.com/@esbuild/linux-ia32/-/linux-ia32-0.19.5.tgz#b6e5c9e80b42131cbd6b1ddaa48c92835f1ed67f" - integrity sha512-MkjHXS03AXAkNp1KKkhSKPOCYztRtK+KXDNkBa6P78F8Bw0ynknCSClO/ztGszILZtyO/lVKpa7MolbBZ6oJtQ== - -"@esbuild/linux-loong64@0.18.20": - version "0.18.20" - resolved "https://registry.yarnpkg.com/@esbuild/linux-loong64/-/linux-loong64-0.18.20.tgz#e6fccb7aac178dd2ffb9860465ac89d7f23b977d" - integrity sha512-nXW8nqBTrOpDLPgPY9uV+/1DjxoQ7DoB2N8eocyq8I9XuqJ7BiAMDMf9n1xZM9TgW0J8zrquIb/A7s3BJv7rjg== - -"@esbuild/linux-loong64@0.19.5": - version "0.19.5" - resolved "https://registry.yarnpkg.com/@esbuild/linux-loong64/-/linux-loong64-0.19.5.tgz#e5f0cf95a180158b01ff5f417da796a1c09dfbea" - integrity sha512-42GwZMm5oYOD/JHqHska3Jg0r+XFb/fdZRX+WjADm3nLWLcIsN27YKtqxzQmGNJgu0AyXg4HtcSK9HuOk3v1Dw== - -"@esbuild/linux-mips64el@0.18.20": - version "0.18.20" - resolved "https://registry.yarnpkg.com/@esbuild/linux-mips64el/-/linux-mips64el-0.18.20.tgz#eeff3a937de9c2310de30622a957ad1bd9183231" - integrity sha512-d5NeaXZcHp8PzYy5VnXV3VSd2D328Zb+9dEq5HE6bw6+N86JVPExrA6O68OPwobntbNJ0pzCpUFZTo3w0GyetQ== - -"@esbuild/linux-mips64el@0.19.5": - version "0.19.5" - resolved "https://registry.yarnpkg.com/@esbuild/linux-mips64el/-/linux-mips64el-0.19.5.tgz#ae36fb86c7d5f641f3a0c8472e83dcb6ea36a408" - integrity sha512-kcjndCSMitUuPJobWCnwQ9lLjiLZUR3QLQmlgaBfMX23UEa7ZOrtufnRds+6WZtIS9HdTXqND4yH8NLoVVIkcg== - -"@esbuild/linux-ppc64@0.18.20": - version "0.18.20" - resolved "https://registry.yarnpkg.com/@esbuild/linux-ppc64/-/linux-ppc64-0.18.20.tgz#2f7156bde20b01527993e6881435ad79ba9599fb" - integrity sha512-WHPyeScRNcmANnLQkq6AfyXRFr5D6N2sKgkFo2FqguP44Nw2eyDlbTdZwd9GYk98DZG9QItIiTlFLHJHjxP3FA== - -"@esbuild/linux-ppc64@0.19.5": - version "0.19.5" - resolved "https://registry.yarnpkg.com/@esbuild/linux-ppc64/-/linux-ppc64-0.19.5.tgz#7960cb1666f0340ddd9eef7b26dcea3835d472d0" - integrity sha512-yJAxJfHVm0ZbsiljbtFFP1BQKLc8kUF6+17tjQ78QjqjAQDnhULWiTA6u0FCDmYT1oOKS9PzZ2z0aBI+Mcyj7Q== - -"@esbuild/linux-riscv64@0.18.20": - version "0.18.20" - resolved "https://registry.yarnpkg.com/@esbuild/linux-riscv64/-/linux-riscv64-0.18.20.tgz#6628389f210123d8b4743045af8caa7d4ddfc7a6" - integrity sha512-WSxo6h5ecI5XH34KC7w5veNnKkju3zBRLEQNY7mv5mtBmrP/MjNBCAlsM2u5hDBlS3NGcTQpoBvRzqBcRtpq1A== - -"@esbuild/linux-riscv64@0.19.5": - version "0.19.5" - resolved "https://registry.yarnpkg.com/@esbuild/linux-riscv64/-/linux-riscv64-0.19.5.tgz#32207df26af60a3a9feea1783fc21b9817bade19" - integrity sha512-5u8cIR/t3gaD6ad3wNt1MNRstAZO+aNyBxu2We8X31bA8XUNyamTVQwLDA1SLoPCUehNCymhBhK3Qim1433Zag== - -"@esbuild/linux-s390x@0.18.20": - version "0.18.20" - resolved "https://registry.yarnpkg.com/@esbuild/linux-s390x/-/linux-s390x-0.18.20.tgz#255e81fb289b101026131858ab99fba63dcf0071" - integrity sha512-+8231GMs3mAEth6Ja1iK0a1sQ3ohfcpzpRLH8uuc5/KVDFneH6jtAJLFGafpzpMRO6DzJ6AvXKze9LfFMrIHVQ== - -"@esbuild/linux-s390x@0.19.5": - version "0.19.5" - resolved "https://registry.yarnpkg.com/@esbuild/linux-s390x/-/linux-s390x-0.19.5.tgz#b38d5681db89a3723862dfa792812397b1510a7d" - integrity sha512-Z6JrMyEw/EmZBD/OFEFpb+gao9xJ59ATsoTNlj39jVBbXqoZm4Xntu6wVmGPB/OATi1uk/DB+yeDPv2E8PqZGw== - -"@esbuild/linux-x64@0.18.20": - version "0.18.20" - resolved "https://registry.yarnpkg.com/@esbuild/linux-x64/-/linux-x64-0.18.20.tgz#c7690b3417af318a9b6f96df3031a8865176d338" - integrity sha512-UYqiqemphJcNsFEskc73jQ7B9jgwjWrSayxawS6UVFZGWrAAtkzjxSqnoclCXxWtfwLdzU+vTpcNYhpn43uP1w== - -"@esbuild/linux-x64@0.19.5": - version "0.19.5" - resolved "https://registry.yarnpkg.com/@esbuild/linux-x64/-/linux-x64-0.19.5.tgz#46feba2ad041a241379d150f415b472fe3885075" - integrity sha512-psagl+2RlK1z8zWZOmVdImisMtrUxvwereIdyJTmtmHahJTKb64pAcqoPlx6CewPdvGvUKe2Jw+0Z/0qhSbG1A== - -"@esbuild/netbsd-x64@0.18.20": - version "0.18.20" - resolved "https://registry.yarnpkg.com/@esbuild/netbsd-x64/-/netbsd-x64-0.18.20.tgz#30e8cd8a3dded63975e2df2438ca109601ebe0d1" - integrity sha512-iO1c++VP6xUBUmltHZoMtCUdPlnPGdBom6IrO4gyKPFFVBKioIImVooR5I83nTew5UOYrk3gIJhbZh8X44y06A== - -"@esbuild/netbsd-x64@0.19.5": - version "0.19.5" - resolved "https://registry.yarnpkg.com/@esbuild/netbsd-x64/-/netbsd-x64-0.19.5.tgz#3b5c1fb068f26bfc681d31f682adf1bea4ef0702" - integrity sha512-kL2l+xScnAy/E/3119OggX8SrWyBEcqAh8aOY1gr4gPvw76la2GlD4Ymf832UCVbmuWeTf2adkZDK+h0Z/fB4g== - -"@esbuild/openbsd-x64@0.18.20": - version "0.18.20" - resolved "https://registry.yarnpkg.com/@esbuild/openbsd-x64/-/openbsd-x64-0.18.20.tgz#7812af31b205055874c8082ea9cf9ab0da6217ae" - integrity sha512-e5e4YSsuQfX4cxcygw/UCPIEP6wbIL+se3sxPdCiMbFLBWu0eiZOJ7WoD+ptCLrmjZBK1Wk7I6D/I3NglUGOxg== - -"@esbuild/openbsd-x64@0.19.5": - version "0.19.5" - resolved "https://registry.yarnpkg.com/@esbuild/openbsd-x64/-/openbsd-x64-0.19.5.tgz#ca6830316ca68056c5c88a875f103ad3235e00db" - integrity sha512-sPOfhtzFufQfTBgRnE1DIJjzsXukKSvZxloZbkJDG383q0awVAq600pc1nfqBcl0ice/WN9p4qLc39WhBShRTA== - -"@esbuild/sunos-x64@0.18.20": - version "0.18.20" - resolved "https://registry.yarnpkg.com/@esbuild/sunos-x64/-/sunos-x64-0.18.20.tgz#d5c275c3b4e73c9b0ecd38d1ca62c020f887ab9d" - integrity sha512-kDbFRFp0YpTQVVrqUd5FTYmWo45zGaXe0X8E1G/LKFC0v8x0vWrhOWSLITcCn63lmZIxfOMXtCfti/RxN/0wnQ== - -"@esbuild/sunos-x64@0.19.5": - version "0.19.5" - resolved "https://registry.yarnpkg.com/@esbuild/sunos-x64/-/sunos-x64-0.19.5.tgz#9efc4eb9539a7be7d5a05ada52ee43cda0d8e2dd" - integrity sha512-dGZkBXaafuKLpDSjKcB0ax0FL36YXCvJNnztjKV+6CO82tTYVDSH2lifitJ29jxRMoUhgkg9a+VA/B03WK5lcg== - -"@esbuild/win32-arm64@0.18.20": - version "0.18.20" - resolved "https://registry.yarnpkg.com/@esbuild/win32-arm64/-/win32-arm64-0.18.20.tgz#73bc7f5a9f8a77805f357fab97f290d0e4820ac9" - integrity sha512-ddYFR6ItYgoaq4v4JmQQaAI5s7npztfV4Ag6NrhiaW0RrnOXqBkgwZLofVTlq1daVTQNhtI5oieTvkRPfZrePg== - -"@esbuild/win32-arm64@0.19.5": - version "0.19.5" - resolved "https://registry.yarnpkg.com/@esbuild/win32-arm64/-/win32-arm64-0.19.5.tgz#29f8184afa7a02a956ebda4ed638099f4b8ff198" - integrity sha512-dWVjD9y03ilhdRQ6Xig1NWNgfLtf2o/STKTS+eZuF90fI2BhbwD6WlaiCGKptlqXlURVB5AUOxUj09LuwKGDTg== - -"@esbuild/win32-ia32@0.18.20": - version "0.18.20" - resolved "https://registry.yarnpkg.com/@esbuild/win32-ia32/-/win32-ia32-0.18.20.tgz#ec93cbf0ef1085cc12e71e0d661d20569ff42102" - integrity sha512-Wv7QBi3ID/rROT08SABTS7eV4hX26sVduqDOTe1MvGMjNd3EjOz4b7zeexIR62GTIEKrfJXKL9LFxTYgkyeu7g== - -"@esbuild/win32-ia32@0.19.5": - version "0.19.5" - resolved "https://registry.yarnpkg.com/@esbuild/win32-ia32/-/win32-ia32-0.19.5.tgz#f3de07afb292ecad651ae4bb8727789de2d95b05" - integrity sha512-4liggWIA4oDgUxqpZwrDhmEfAH4d0iljanDOK7AnVU89T6CzHon/ony8C5LeOdfgx60x5cnQJFZwEydVlYx4iw== - -"@esbuild/win32-x64@0.18.20": - version "0.18.20" - resolved "https://registry.yarnpkg.com/@esbuild/win32-x64/-/win32-x64-0.18.20.tgz#786c5f41f043b07afb1af37683d7c33668858f6d" - integrity sha512-kTdfRcSiDfQca/y9QIkng02avJ+NCaQvrMejlsB3RRv5sE9rRoeBPISaZpKxHELzRxZyLvNts1P27W3wV+8geQ== - -"@esbuild/win32-x64@0.19.5": - version "0.19.5" - resolved "https://registry.yarnpkg.com/@esbuild/win32-x64/-/win32-x64-0.19.5.tgz#faad84c41ba12e3a0acb52571df9bff37bee75f6" - integrity sha512-czTrygUsB/jlM8qEW5MD8bgYU2Xg14lo6kBDXW6HdxKjh8M5PzETGiSHaz9MtbXBYDloHNUAUW2tMiKW4KM9Mw== +"@esbuild/aix-ppc64@0.19.11": + version "0.19.11" + resolved "https://registry.yarnpkg.com/@esbuild/aix-ppc64/-/aix-ppc64-0.19.11.tgz#2acd20be6d4f0458bc8c784103495ff24f13b1d3" + integrity sha512-FnzU0LyE3ySQk7UntJO4+qIiQgI7KoODnZg5xzXIrFJlKd2P2gwHsHY4927xj9y5PJmJSzULiUCWmv7iWnNa7g== + +"@esbuild/android-arm64@0.19.11": + version "0.19.11" + resolved "https://registry.yarnpkg.com/@esbuild/android-arm64/-/android-arm64-0.19.11.tgz#b45d000017385c9051a4f03e17078abb935be220" + integrity sha512-aiu7K/5JnLj//KOnOfEZ0D90obUkRzDMyqd/wNAUQ34m4YUPVhRZpnqKV9uqDGxT7cToSDnIHsGooyIczu9T+Q== + +"@esbuild/android-arm@0.19.11": + version "0.19.11" + resolved "https://registry.yarnpkg.com/@esbuild/android-arm/-/android-arm-0.19.11.tgz#f46f55414e1c3614ac682b29977792131238164c" + integrity sha512-5OVapq0ClabvKvQ58Bws8+wkLCV+Rxg7tUVbo9xu034Nm536QTII4YzhaFriQ7rMrorfnFKUsArD2lqKbFY4vw== + +"@esbuild/android-x64@0.19.11": + version "0.19.11" + resolved "https://registry.yarnpkg.com/@esbuild/android-x64/-/android-x64-0.19.11.tgz#bfc01e91740b82011ef503c48f548950824922b2" + integrity sha512-eccxjlfGw43WYoY9QgB82SgGgDbibcqyDTlk3l3C0jOVHKxrjdc9CTwDUQd0vkvYg5um0OH+GpxYvp39r+IPOg== + +"@esbuild/darwin-arm64@0.19.11": + version "0.19.11" + resolved "https://registry.yarnpkg.com/@esbuild/darwin-arm64/-/darwin-arm64-0.19.11.tgz#533fb7f5a08c37121d82c66198263dcc1bed29bf" + integrity sha512-ETp87DRWuSt9KdDVkqSoKoLFHYTrkyz2+65fj9nfXsaV3bMhTCjtQfw3y+um88vGRKRiF7erPrh/ZuIdLUIVxQ== + +"@esbuild/darwin-x64@0.19.11": + version "0.19.11" + resolved "https://registry.yarnpkg.com/@esbuild/darwin-x64/-/darwin-x64-0.19.11.tgz#62f3819eff7e4ddc656b7c6815a31cf9a1e7d98e" + integrity sha512-fkFUiS6IUK9WYUO/+22omwetaSNl5/A8giXvQlcinLIjVkxwTLSktbF5f/kJMftM2MJp9+fXqZ5ezS7+SALp4g== + +"@esbuild/freebsd-arm64@0.19.11": + version "0.19.11" + resolved "https://registry.yarnpkg.com/@esbuild/freebsd-arm64/-/freebsd-arm64-0.19.11.tgz#d478b4195aa3ca44160272dab85ef8baf4175b4a" + integrity sha512-lhoSp5K6bxKRNdXUtHoNc5HhbXVCS8V0iZmDvyWvYq9S5WSfTIHU2UGjcGt7UeS6iEYp9eeymIl5mJBn0yiuxA== + +"@esbuild/freebsd-x64@0.19.11": + version "0.19.11" + resolved "https://registry.yarnpkg.com/@esbuild/freebsd-x64/-/freebsd-x64-0.19.11.tgz#7bdcc1917409178257ca6a1a27fe06e797ec18a2" + integrity sha512-JkUqn44AffGXitVI6/AbQdoYAq0TEullFdqcMY/PCUZ36xJ9ZJRtQabzMA+Vi7r78+25ZIBosLTOKnUXBSi1Kw== + +"@esbuild/linux-arm64@0.19.11": + version "0.19.11" + resolved "https://registry.yarnpkg.com/@esbuild/linux-arm64/-/linux-arm64-0.19.11.tgz#58ad4ff11685fcc735d7ff4ca759ab18fcfe4545" + integrity sha512-LneLg3ypEeveBSMuoa0kwMpCGmpu8XQUh+mL8XXwoYZ6Be2qBnVtcDI5azSvh7vioMDhoJFZzp9GWp9IWpYoUg== + +"@esbuild/linux-arm@0.19.11": + version "0.19.11" + resolved "https://registry.yarnpkg.com/@esbuild/linux-arm/-/linux-arm-0.19.11.tgz#ce82246d873b5534d34de1e5c1b33026f35e60e3" + integrity sha512-3CRkr9+vCV2XJbjwgzjPtO8T0SZUmRZla+UL1jw+XqHZPkPgZiyWvbDvl9rqAN8Zl7qJF0O/9ycMtjU67HN9/Q== + +"@esbuild/linux-ia32@0.19.11": + version "0.19.11" + resolved "https://registry.yarnpkg.com/@esbuild/linux-ia32/-/linux-ia32-0.19.11.tgz#cbae1f313209affc74b80f4390c4c35c6ab83fa4" + integrity sha512-caHy++CsD8Bgq2V5CodbJjFPEiDPq8JJmBdeyZ8GWVQMjRD0sU548nNdwPNvKjVpamYYVL40AORekgfIubwHoA== + +"@esbuild/linux-loong64@0.19.11": + version "0.19.11" + resolved "https://registry.yarnpkg.com/@esbuild/linux-loong64/-/linux-loong64-0.19.11.tgz#5f32aead1c3ec8f4cccdb7ed08b166224d4e9121" + integrity sha512-ppZSSLVpPrwHccvC6nQVZaSHlFsvCQyjnvirnVjbKSHuE5N24Yl8F3UwYUUR1UEPaFObGD2tSvVKbvR+uT1Nrg== + +"@esbuild/linux-mips64el@0.19.11": + version "0.19.11" + resolved "https://registry.yarnpkg.com/@esbuild/linux-mips64el/-/linux-mips64el-0.19.11.tgz#38eecf1cbb8c36a616261de858b3c10d03419af9" + integrity sha512-B5x9j0OgjG+v1dF2DkH34lr+7Gmv0kzX6/V0afF41FkPMMqaQ77pH7CrhWeR22aEeHKaeZVtZ6yFwlxOKPVFyg== + +"@esbuild/linux-ppc64@0.19.11": + version "0.19.11" + resolved "https://registry.yarnpkg.com/@esbuild/linux-ppc64/-/linux-ppc64-0.19.11.tgz#9c5725a94e6ec15b93195e5a6afb821628afd912" + integrity sha512-MHrZYLeCG8vXblMetWyttkdVRjQlQUb/oMgBNurVEnhj4YWOr4G5lmBfZjHYQHHN0g6yDmCAQRR8MUHldvvRDA== + +"@esbuild/linux-riscv64@0.19.11": + version "0.19.11" + resolved "https://registry.yarnpkg.com/@esbuild/linux-riscv64/-/linux-riscv64-0.19.11.tgz#2dc4486d474a2a62bbe5870522a9a600e2acb916" + integrity sha512-f3DY++t94uVg141dozDu4CCUkYW+09rWtaWfnb3bqe4w5NqmZd6nPVBm+qbz7WaHZCoqXqHz5p6CM6qv3qnSSQ== + +"@esbuild/linux-s390x@0.19.11": + version "0.19.11" + resolved "https://registry.yarnpkg.com/@esbuild/linux-s390x/-/linux-s390x-0.19.11.tgz#4ad8567df48f7dd4c71ec5b1753b6f37561a65a8" + integrity sha512-A5xdUoyWJHMMlcSMcPGVLzYzpcY8QP1RtYzX5/bS4dvjBGVxdhuiYyFwp7z74ocV7WDc0n1harxmpq2ePOjI0Q== + +"@esbuild/linux-x64@0.19.11": + version "0.19.11" + resolved "https://registry.yarnpkg.com/@esbuild/linux-x64/-/linux-x64-0.19.11.tgz#b7390c4d5184f203ebe7ddaedf073df82a658766" + integrity sha512-grbyMlVCvJSfxFQUndw5mCtWs5LO1gUlwP4CDi4iJBbVpZcqLVT29FxgGuBJGSzyOxotFG4LoO5X+M1350zmPA== + +"@esbuild/netbsd-x64@0.19.11": + version "0.19.11" + resolved "https://registry.yarnpkg.com/@esbuild/netbsd-x64/-/netbsd-x64-0.19.11.tgz#d633c09492a1721377f3bccedb2d821b911e813d" + integrity sha512-13jvrQZJc3P230OhU8xgwUnDeuC/9egsjTkXN49b3GcS5BKvJqZn86aGM8W9pd14Kd+u7HuFBMVtrNGhh6fHEQ== + +"@esbuild/openbsd-x64@0.19.11": + version "0.19.11" + resolved "https://registry.yarnpkg.com/@esbuild/openbsd-x64/-/openbsd-x64-0.19.11.tgz#17388c76e2f01125bf831a68c03a7ffccb65d1a2" + integrity sha512-ysyOGZuTp6SNKPE11INDUeFVVQFrhcNDVUgSQVDzqsqX38DjhPEPATpid04LCoUr2WXhQTEZ8ct/EgJCUDpyNw== + +"@esbuild/sunos-x64@0.19.11": + version "0.19.11" + resolved "https://registry.yarnpkg.com/@esbuild/sunos-x64/-/sunos-x64-0.19.11.tgz#e320636f00bb9f4fdf3a80e548cb743370d41767" + integrity sha512-Hf+Sad9nVwvtxy4DXCZQqLpgmRTQqyFyhT3bZ4F2XlJCjxGmRFF0Shwn9rzhOYRB61w9VMXUkxlBy56dk9JJiQ== + +"@esbuild/win32-arm64@0.19.11": + version "0.19.11" + resolved "https://registry.yarnpkg.com/@esbuild/win32-arm64/-/win32-arm64-0.19.11.tgz#c778b45a496e90b6fc373e2a2bb072f1441fe0ee" + integrity sha512-0P58Sbi0LctOMOQbpEOvOL44Ne0sqbS0XWHMvvrg6NE5jQ1xguCSSw9jQeUk2lfrXYsKDdOe6K+oZiwKPilYPQ== + +"@esbuild/win32-ia32@0.19.11": + version "0.19.11" + resolved "https://registry.yarnpkg.com/@esbuild/win32-ia32/-/win32-ia32-0.19.11.tgz#481a65fee2e5cce74ec44823e6b09ecedcc5194c" + integrity sha512-6YOrWS+sDJDmshdBIQU+Uoyh7pQKrdykdefC1avn76ss5c+RN6gut3LZA4E2cH5xUEp5/cA0+YxRaVtRAb0xBg== + +"@esbuild/win32-x64@0.19.11": + version "0.19.11" + resolved "https://registry.yarnpkg.com/@esbuild/win32-x64/-/win32-x64-0.19.11.tgz#a5d300008960bb39677c46bf16f53ec70d8dee04" + integrity sha512-vfkhltrjCAb603XaFhqhAF4LGDi2M4OrCRrFusyQ+iTLQ/o60QQXxc9cZC/FFpihBI9N1Grn6SMKVJ4KP7Fuiw== "@eslint-community/eslint-utils@^4.2.0", "@eslint-community/eslint-utils@^4.4.0": version "4.4.0" @@ -2707,7 +2200,7 @@ dependencies: "@lezer/common" "^1.0.0" -"@ljharb/through@^2.3.9": +"@ljharb/through@^2.3.11": version "2.3.11" resolved "https://registry.yarnpkg.com/@ljharb/through/-/through-2.3.11.tgz#783600ff12c06f21a76cc26e33abd0b1595092f9" integrity sha512-ccfcIDlogiXNq5KcbAwbaO7lMh3Tm1i3khMPYpxlK8hH/W53zN81KM9coerRLOnTGu3nfXIniAmQbRI9OxbC0w== @@ -2736,10 +2229,10 @@ dependencies: tslib "^2.3.0" -"@ngtools/webpack@17.0.10": - version "17.0.10" - resolved "https://registry.yarnpkg.com/@ngtools/webpack/-/webpack-17.0.10.tgz#5e6d5ec4a2c89be5b79513b7317519a8c457d471" - integrity sha512-UCiLrV2aLrtR7Wr/jJi0nH2Xzb7ETenrPWU/EcW9V3lnlDun5g1J0y01jRzvcipxNTOmFfI4lqv288nKSmSOAA== +"@ngtools/webpack@17.1.0": + version "17.1.0" + resolved "https://registry.yarnpkg.com/@ngtools/webpack/-/webpack-17.1.0.tgz#e88acf71eaeea44377d1311209936bac583fd066" + integrity sha512-FAp5Vh4Y4DFDnrxEitggEkeDwHCml7m6hZUgohvA6n6mwrMT0ZZXnk3MIrKRnT6A9cr1wcnxMW+jIXx/cJZGlw== "@nodelib/fs.scandir@2.1.5": version "2.1.5" @@ -2946,13 +2439,78 @@ resolved "https://registry.yarnpkg.com/@popperjs/core/-/core-2.11.8.tgz#6b79032e760a0899cd4204710beede972a3a185f" integrity sha512-P1st0aksCrn9sGZhp8GMYwBnQsbvAWsZAX44oXNNvLHGqAOcoVxmjZiohstwQ7SqKnbR47akdNi+uleWD8+g6A== -"@schematics/angular@17.0.10": - version "17.0.10" - resolved "https://registry.yarnpkg.com/@schematics/angular/-/angular-17.0.10.tgz#cd3a918ac47032591138b6169fddc35706625b13" - integrity sha512-rRBlDMXfVPkW3CqVQxazFqkuJXd0BFnD1zjI9WtDiNt3o2pTHbLzuWJnXKuIt5rzv0x/bFwNqIt4CPW2DYGNMg== - dependencies: - "@angular-devkit/core" "17.0.10" - "@angular-devkit/schematics" "17.0.10" +"@rollup/rollup-android-arm-eabi@4.9.5": + version "4.9.5" + resolved "https://registry.yarnpkg.com/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.9.5.tgz#b752b6c88a14ccfcbdf3f48c577ccc3a7f0e66b9" + integrity sha512-idWaG8xeSRCfRq9KpRysDHJ/rEHBEXcHuJ82XY0yYFIWnLMjZv9vF/7DOq8djQ2n3Lk6+3qfSH8AqlmHlmi1MA== + +"@rollup/rollup-android-arm64@4.9.5": + version "4.9.5" + resolved "https://registry.yarnpkg.com/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.9.5.tgz#33757c3a448b9ef77b6f6292d8b0ec45c87e9c1a" + integrity sha512-f14d7uhAMtsCGjAYwZGv6TwuS3IFaM4ZnGMUn3aCBgkcHAYErhV1Ad97WzBvS2o0aaDv4mVz+syiN0ElMyfBPg== + +"@rollup/rollup-darwin-arm64@4.9.5": + version "4.9.5" + resolved "https://registry.yarnpkg.com/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.9.5.tgz#5234ba62665a3f443143bc8bcea9df2cc58f55fb" + integrity sha512-ndoXeLx455FffL68OIUrVr89Xu1WLzAG4n65R8roDlCoYiQcGGg6MALvs2Ap9zs7AHg8mpHtMpwC8jBBjZrT/w== + +"@rollup/rollup-darwin-x64@4.9.5": + version "4.9.5" + resolved "https://registry.yarnpkg.com/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.9.5.tgz#981256c054d3247b83313724938d606798a919d1" + integrity sha512-UmElV1OY2m/1KEEqTlIjieKfVwRg0Zwg4PLgNf0s3glAHXBN99KLpw5A5lrSYCa1Kp63czTpVll2MAqbZYIHoA== + +"@rollup/rollup-linux-arm-gnueabihf@4.9.5": + version "4.9.5" + resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.9.5.tgz#120678a5a2b3a283a548dbb4d337f9187a793560" + integrity sha512-Q0LcU61v92tQB6ae+udZvOyZ0wfpGojtAKrrpAaIqmJ7+psq4cMIhT/9lfV6UQIpeItnq/2QDROhNLo00lOD1g== + +"@rollup/rollup-linux-arm64-gnu@4.9.5": + version "4.9.5" + resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.9.5.tgz#c99d857e2372ece544b6f60b85058ad259f64114" + integrity sha512-dkRscpM+RrR2Ee3eOQmRWFjmV/payHEOrjyq1VZegRUa5OrZJ2MAxBNs05bZuY0YCtpqETDy1Ix4i/hRqX98cA== + +"@rollup/rollup-linux-arm64-musl@4.9.5": + version "4.9.5" + resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.9.5.tgz#3064060f568a5718c2a06858cd6e6d24f2ff8632" + integrity sha512-QaKFVOzzST2xzY4MAmiDmURagWLFh+zZtttuEnuNn19AiZ0T3fhPyjPPGwLNdiDT82ZE91hnfJsUiDwF9DClIQ== + +"@rollup/rollup-linux-riscv64-gnu@4.9.5": + version "4.9.5" + resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.9.5.tgz#987d30b5d2b992fff07d055015991a57ff55fbad" + integrity sha512-HeGqmRJuyVg6/X6MpE2ur7GbymBPS8Np0S/vQFHDmocfORT+Zt76qu+69NUoxXzGqVP1pzaY6QIi0FJWLC3OPA== + +"@rollup/rollup-linux-x64-gnu@4.9.5": + version "4.9.5" + resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.9.5.tgz#85946ee4d068bd12197aeeec2c6f679c94978a49" + integrity sha512-Dq1bqBdLaZ1Gb/l2e5/+o3B18+8TI9ANlA1SkejZqDgdU/jK/ThYaMPMJpVMMXy2uRHvGKbkz9vheVGdq3cJfA== + +"@rollup/rollup-linux-x64-musl@4.9.5": + version "4.9.5" + resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.9.5.tgz#fe0b20f9749a60eb1df43d20effa96c756ddcbd4" + integrity sha512-ezyFUOwldYpj7AbkwyW9AJ203peub81CaAIVvckdkyH8EvhEIoKzaMFJj0G4qYJ5sw3BpqhFrsCc30t54HV8vg== + +"@rollup/rollup-win32-arm64-msvc@4.9.5": + version "4.9.5" + resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.9.5.tgz#422661ef0e16699a234465d15b2c1089ef963b2a" + integrity sha512-aHSsMnUw+0UETB0Hlv7B/ZHOGY5bQdwMKJSzGfDfvyhnpmVxLMGnQPGNE9wgqkLUs3+gbG1Qx02S2LLfJ5GaRQ== + +"@rollup/rollup-win32-ia32-msvc@4.9.5": + version "4.9.5" + resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.9.5.tgz#7b73a145891c202fbcc08759248983667a035d85" + integrity sha512-AiqiLkb9KSf7Lj/o1U3SEP9Zn+5NuVKgFdRIZkvd4N0+bYrTOovVd0+LmYCPQGbocT4kvFyK+LXCDiXPBF3fyA== + +"@rollup/rollup-win32-x64-msvc@4.9.5": + version "4.9.5" + resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.9.5.tgz#10491ccf4f63c814d4149e0316541476ea603602" + integrity sha512-1q+mykKE3Vot1kaFJIDoUFv5TuW+QQVaf2FmTT9krg86pQrGStOSJJ0Zil7CFagyxDuouTepzt5Y5TVzyajOdQ== + +"@schematics/angular@17.1.0": + version "17.1.0" + resolved "https://registry.yarnpkg.com/@schematics/angular/-/angular-17.1.0.tgz#d8a1e1a9646627b7952a8752b20b6918d2b1d162" + integrity sha512-u9pCesRWb6mVtLnFLSfZ8R21TDz8YCebAxViefWsJlb0+p0yknesVL1nG/Oi9tgfhczS991HGIVsLT41bZthUw== + dependencies: + "@angular-devkit/core" "17.1.0" + "@angular-devkit/schematics" "17.1.0" jsonc-parser "3.2.0" "@sigstore/bundle@^2.1.0": @@ -3032,6 +2590,39 @@ "@tufjs/canonical-json" "2.0.0" minimatch "^9.0.3" +"@types/babel__core@7.20.2": + version "7.20.2" + resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.20.2.tgz#215db4f4a35d710256579784a548907237728756" + integrity sha512-pNpr1T1xLUc2l3xJKuPtsEky3ybxN3m4fJkknfIpTCTfIZCDW57oAg+EfCgIIp2rvCe0Wn++/FfodDS4YXxBwA== + dependencies: + "@babel/parser" "^7.20.7" + "@babel/types" "^7.20.7" + "@types/babel__generator" "*" + "@types/babel__template" "*" + "@types/babel__traverse" "*" + +"@types/babel__generator@*": + version "7.6.8" + resolved "https://registry.yarnpkg.com/@types/babel__generator/-/babel__generator-7.6.8.tgz#f836c61f48b1346e7d2b0d93c6dacc5b9535d3ab" + integrity sha512-ASsj+tpEDsEiFr1arWrlN6V3mdfjRMZt6LtK/Vp/kreFLnr5QH5+DhvD5nINYZXzwJvXeGq+05iUXcAzVrqWtw== + dependencies: + "@babel/types" "^7.0.0" + +"@types/babel__template@*": + version "7.4.4" + resolved "https://registry.yarnpkg.com/@types/babel__template/-/babel__template-7.4.4.tgz#5672513701c1b2199bc6dad636a9d7491586766f" + integrity sha512-h/NUaSyG5EyxBIp8YRxo4RMe2/qQgvyowRwVMzhYhBCONbW8PUsg4lkFMrhgZhUe5z3L3MiLDuvyJ/CaPa2A8A== + dependencies: + "@babel/parser" "^7.1.0" + "@babel/types" "^7.0.0" + +"@types/babel__traverse@*": + version "7.20.5" + resolved "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.20.5.tgz#7b7502be0aa80cc4ef22978846b983edaafcd4dd" + integrity sha512-WXCyOcRtH37HAUkpXhUduaxdm82b4GSlyTqajXviN4EfiuPgNYR109xMCKvpl6zPIpua0DGlMEDCq+g8EdoheQ== + dependencies: + "@babel/types" "^7.20.7" + "@types/body-parser@*": version "1.19.2" resolved "https://registry.yarnpkg.com/@types/body-parser/-/body-parser-1.19.2.tgz#aea2059e28b7658639081347ac4fab3de166e6f0" @@ -3305,6 +2896,11 @@ resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.1.tgz#aa22750962f3bf0e79d753d3cc067f010c95f194" integrity sha512-LG4opVs2ANWZ1TJoKc937iMmNstM/d0ae1vNbnBvBhqCSezgVUOzcLCqbI5elV8Vy6WKwKjaqR+zO9VKirBBCA== +"@types/estree@1.0.5": + version "1.0.5" + resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.5.tgz#a6ce3e556e00fd9895dd872dd172ad0d4bd687f4" + integrity sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw== + "@types/express-serve-static-core@*", "@types/express-serve-static-core@^4.17.33": version "4.17.35" resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.17.35.tgz#c95dd4424f0d32e525d23812aa8ab8e4d3906c4f" @@ -3447,16 +3043,16 @@ dependencies: "@types/node" "*" -"@typescript-eslint/eslint-plugin@^6.18.1": - version "6.18.1" - resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.18.1.tgz#0df881a47da1c1a9774f39495f5f7052f86b72e0" - integrity sha512-nISDRYnnIpk7VCFrGcu1rnZfM1Dh9LRHnfgdkjcbi/l7g16VYRri3TjXi9Ir4lOZSw5N/gnV/3H7jIPQ8Q4daA== +"@typescript-eslint/eslint-plugin@^6.19.0": + version "6.19.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.19.0.tgz#db03f3313b57a30fbbdad2e6929e88fc7feaf9ba" + integrity sha512-DUCUkQNklCQYnrBSSikjVChdc84/vMPDQSgJTHBZ64G9bA9w0Crc0rd2diujKbTdp6w2J47qkeHQLoi0rpLCdg== dependencies: "@eslint-community/regexpp" "^4.5.1" - "@typescript-eslint/scope-manager" "6.18.1" - "@typescript-eslint/type-utils" "6.18.1" - "@typescript-eslint/utils" "6.18.1" - "@typescript-eslint/visitor-keys" "6.18.1" + "@typescript-eslint/scope-manager" "6.19.0" + "@typescript-eslint/type-utils" "6.19.0" + "@typescript-eslint/utils" "6.19.0" + "@typescript-eslint/visitor-keys" "6.19.0" debug "^4.3.4" graphemer "^1.4.0" ignore "^5.2.4" @@ -3464,15 +3060,15 @@ semver "^7.5.4" ts-api-utils "^1.0.1" -"@typescript-eslint/parser@^6.18.1": - version "6.18.1" - resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-6.18.1.tgz#3c3987e186b38c77b30b6bfa5edf7c98ae2ec9d3" - integrity sha512-zct/MdJnVaRRNy9e84XnVtRv9Vf91/qqe+hZJtKanjojud4wAVy/7lXxJmMyX6X6J+xc6c//YEWvpeif8cAhWA== +"@typescript-eslint/parser@^6.19.0": + version "6.19.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-6.19.0.tgz#80344086f362181890ade7e94fc35fe0480bfdf5" + integrity sha512-1DyBLG5SH7PYCd00QlroiW60YJ4rWMuUGa/JBV0iZuqi4l4IK3twKPq5ZkEebmGqRjXWVgsUzfd3+nZveewgow== dependencies: - "@typescript-eslint/scope-manager" "6.18.1" - "@typescript-eslint/types" "6.18.1" - "@typescript-eslint/typescript-estree" "6.18.1" - "@typescript-eslint/visitor-keys" "6.18.1" + "@typescript-eslint/scope-manager" "6.19.0" + "@typescript-eslint/types" "6.19.0" + "@typescript-eslint/typescript-estree" "6.19.0" + "@typescript-eslint/visitor-keys" "6.19.0" debug "^4.3.4" "@typescript-eslint/scope-manager@6.18.0": @@ -3483,13 +3079,13 @@ "@typescript-eslint/types" "6.18.0" "@typescript-eslint/visitor-keys" "6.18.0" -"@typescript-eslint/scope-manager@6.18.1": - version "6.18.1" - resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-6.18.1.tgz#28c31c60f6e5827996aa3560a538693cb4bd3848" - integrity sha512-BgdBwXPFmZzaZUuw6wKiHKIovms97a7eTImjkXCZE04TGHysG+0hDQPmygyvgtkoB/aOQwSM/nWv3LzrOIQOBw== +"@typescript-eslint/scope-manager@6.19.0": + version "6.19.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-6.19.0.tgz#b6d2abb825b29ab70cb542d220e40c61c1678116" + integrity sha512-dO1XMhV2ehBI6QN8Ufi7I10wmUovmLU0Oru3n5LVlM2JuzB4M+dVphCPLkVpKvGij2j/pHBWuJ9piuXx+BhzxQ== dependencies: - "@typescript-eslint/types" "6.18.1" - "@typescript-eslint/visitor-keys" "6.18.1" + "@typescript-eslint/types" "6.19.0" + "@typescript-eslint/visitor-keys" "6.19.0" "@typescript-eslint/type-utils@6.18.0": version "6.18.0" @@ -3501,13 +3097,13 @@ debug "^4.3.4" ts-api-utils "^1.0.1" -"@typescript-eslint/type-utils@6.18.1": - version "6.18.1" - resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-6.18.1.tgz#115cf535f8b39db8301677199ce51151e2daee96" - integrity sha512-wyOSKhuzHeU/5pcRDP2G2Ndci+4g653V43gXTpt4nbyoIOAASkGDA9JIAgbQCdCkcr1MvpSYWzxTz0olCn8+/Q== +"@typescript-eslint/type-utils@6.19.0": + version "6.19.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-6.19.0.tgz#522a494ef0d3e9fdc5e23a7c22c9331bbade0101" + integrity sha512-mcvS6WSWbjiSxKCwBcXtOM5pRkPQ6kcDds/juxcy/727IQr3xMEcwr/YLHW2A2+Fp5ql6khjbKBzOyjuPqGi/w== dependencies: - "@typescript-eslint/typescript-estree" "6.18.1" - "@typescript-eslint/utils" "6.18.1" + "@typescript-eslint/typescript-estree" "6.19.0" + "@typescript-eslint/utils" "6.19.0" debug "^4.3.4" ts-api-utils "^1.0.1" @@ -3516,10 +3112,10 @@ resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-6.18.0.tgz#ffce610a1540c17cf7d8ecf2bb34b8b0e2e77101" integrity sha512-/RFVIccwkwSdW/1zeMx3hADShWbgBxBnV/qSrex6607isYjj05t36P6LyONgqdUrNLl5TYU8NIKdHUYpFvExkA== -"@typescript-eslint/types@6.18.1": - version "6.18.1" - resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-6.18.1.tgz#91617d8080bcd99ac355d9157079970d1d49fefc" - integrity sha512-4TuMAe+tc5oA7wwfqMtB0Y5OrREPF1GeJBAjqwgZh1lEMH5PJQgWgHGfYufVB51LtjD+peZylmeyxUXPfENLCw== +"@typescript-eslint/types@6.19.0": + version "6.19.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-6.19.0.tgz#689b0498c436272a6a2059b09f44bcbd90de294a" + integrity sha512-lFviGV/vYhOy3m8BJ/nAKoAyNhInTdXpftonhWle66XHAtT1ouBlkjL496b5H5hb8dWXHwtypTqgtb/DEa+j5A== "@typescript-eslint/typescript-estree@6.18.0": version "6.18.0" @@ -3535,13 +3131,13 @@ semver "^7.5.4" ts-api-utils "^1.0.1" -"@typescript-eslint/typescript-estree@6.18.1": - version "6.18.1" - resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-6.18.1.tgz#a12b6440175b4cbc9d09ab3c4966c6b245215ab4" - integrity sha512-fv9B94UAhywPRhUeeV/v+3SBDvcPiLxRZJw/xZeeGgRLQZ6rLMG+8krrJUyIf6s1ecWTzlsbp0rlw7n9sjufHA== +"@typescript-eslint/typescript-estree@6.19.0": + version "6.19.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-6.19.0.tgz#0813ba364a409afb4d62348aec0202600cb468fa" + integrity sha512-o/zefXIbbLBZ8YJ51NlkSAt2BamrK6XOmuxSR3hynMIzzyMY33KuJ9vuMdFSXW+H0tVvdF9qBPTHA91HDb4BIQ== dependencies: - "@typescript-eslint/types" "6.18.1" - "@typescript-eslint/visitor-keys" "6.18.1" + "@typescript-eslint/types" "6.19.0" + "@typescript-eslint/visitor-keys" "6.19.0" debug "^4.3.4" globby "^11.1.0" is-glob "^4.0.3" @@ -3562,17 +3158,17 @@ "@typescript-eslint/typescript-estree" "6.18.0" semver "^7.5.4" -"@typescript-eslint/utils@6.18.1", "@typescript-eslint/utils@^6.0.0": - version "6.18.1" - resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-6.18.1.tgz#3451cfe2e56babb6ac657e10b6703393d4b82955" - integrity sha512-zZmTuVZvD1wpoceHvoQpOiewmWu3uP9FuTWo8vqpy2ffsmfCE8mklRPi+vmnIYAIk9t/4kOThri2QCDgor+OpQ== +"@typescript-eslint/utils@6.19.0", "@typescript-eslint/utils@^6.0.0": + version "6.19.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-6.19.0.tgz#557b72c3eeb4f73bef8037c85dae57b21beb1a4b" + integrity sha512-QR41YXySiuN++/dC9UArYOg4X86OAYP83OWTewpVx5ct1IZhjjgTLocj7QNxGhWoTqknsgpl7L+hGygCO+sdYw== dependencies: "@eslint-community/eslint-utils" "^4.4.0" "@types/json-schema" "^7.0.12" "@types/semver" "^7.5.0" - "@typescript-eslint/scope-manager" "6.18.1" - "@typescript-eslint/types" "6.18.1" - "@typescript-eslint/typescript-estree" "6.18.1" + "@typescript-eslint/scope-manager" "6.19.0" + "@typescript-eslint/types" "6.19.0" + "@typescript-eslint/typescript-estree" "6.19.0" semver "^7.5.4" "@typescript-eslint/visitor-keys@6.18.0": @@ -3583,12 +3179,12 @@ "@typescript-eslint/types" "6.18.0" eslint-visitor-keys "^3.4.1" -"@typescript-eslint/visitor-keys@6.18.1": - version "6.18.1" - resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-6.18.1.tgz#704d789bda2565a15475e7d22f145b8fe77443f4" - integrity sha512-/kvt0C5lRqGoCfsbmm7/CwMqoSkY3zzHLIjdhHZQW3VFrnz7ATecOHR7nb7V+xn4286MBxfnQfQhAmCI0u+bJA== +"@typescript-eslint/visitor-keys@6.19.0": + version "6.19.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-6.19.0.tgz#4565e0ecd63ca1f81b96f1dd76e49f746c6b2b49" + integrity sha512-hZaUCORLgubBvtGpp1JEFEazcuEdfxta9j4iUwdSAr7mEsYYAp3EAUyCZk3VEEqGj6W+AV4uWyrDGtrlawAsgQ== dependencies: - "@typescript-eslint/types" "6.18.1" + "@typescript-eslint/types" "6.19.0" eslint-visitor-keys "^3.4.1" "@ungap/structured-clone@^1.2.0": @@ -3596,10 +3192,10 @@ resolved "https://registry.yarnpkg.com/@ungap/structured-clone/-/structured-clone-1.2.0.tgz#756641adb587851b5ccb3e095daf27ae581c8406" integrity sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ== -"@vitejs/plugin-basic-ssl@1.0.1": - version "1.0.1" - resolved "https://registry.yarnpkg.com/@vitejs/plugin-basic-ssl/-/plugin-basic-ssl-1.0.1.tgz#48c46eab21e0730921986ce742563ae83fe7fe34" - integrity sha512-pcub+YbFtFhaGRTo1832FQHQSHvMrlb43974e2eS8EKleR3p1cDdkJFPci1UhwkEf1J9Bz+wKBSzqpKp7nNj2A== +"@vitejs/plugin-basic-ssl@1.0.2": + version "1.0.2" + resolved "https://registry.yarnpkg.com/@vitejs/plugin-basic-ssl/-/plugin-basic-ssl-1.0.2.tgz#bac6553842b215f17b052d27c82e2b2ef29236dc" + integrity sha512-DKHKVtpI+eA5fvObVgQ3QtTGU70CcCnedalzqmGSR050AzKZMdUzgC8KmlOneHWH8dF2hJ3wkC9+8FDVAaDRCw== "@webassemblyjs/ast@1.11.6", "@webassemblyjs/ast@^1.11.5": version "1.11.6" @@ -3760,11 +3356,6 @@ JSONStream@^1.0.4, JSONStream@^1.3.5: jsonparse "^1.2.0" through ">=2.2.7 <3" -abab@^2.0.6: - version "2.0.6" - resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.6.tgz#41b80f2c871d19686216b82309231cfd3cb3d291" - integrity sha512-j2afSsaIENvHZN2B8GOpF566vZ5WVk5opAiMTvWgaQT8DkbOqsTfvNAvHoRGU2zzP8cPoqys+xHTRDWW8L+/BA== - abbrev@1: version "1.1.1" resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8" @@ -4178,12 +3769,7 @@ ast-types@^0.7.0: resolved "https://registry.yarnpkg.com/ast-types/-/ast-types-0.7.8.tgz#902d2e0d60d071bdcd46dc115e1809ed11c138a9" integrity sha512-RIOpVnVlltB6PcBJ5BMLx+H+6JJ/zjDGU0t7f0L6c2M1dqcK92VQopLBlPQ9R80AVXelfqYgjcPLtHtDbNFg0Q== -async-each-series@0.1.1: - version "0.1.1" - resolved "https://registry.yarnpkg.com/async-each-series/-/async-each-series-0.1.1.tgz#7617c1917401fd8ca4a28aadce3dbae98afeb432" - integrity sha512-p4jj6Fws4Iy2m0iCmI2am2ZNZCgbdgE+P8F/8csmn2vx7ixXrO2zGcuNsD46X5uZSVecmkEy/M06X2vG8KD6dQ== - -async@^2.6.0, async@^2.6.1: +async@^2.6.1: version "2.6.4" resolved "https://registry.yarnpkg.com/async/-/async-2.6.4.tgz#706b7ff6084664cd7eae713f6f965433b5504221" integrity sha512-mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA== @@ -4222,13 +3808,6 @@ available-typed-arrays@^1.0.5: resolved "https://registry.yarnpkg.com/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz#92f95616501069d07d10edb2fc37d3e1c65123b7" integrity sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw== -axios@0.21.4: - version "0.21.4" - resolved "https://registry.yarnpkg.com/axios/-/axios-0.21.4.tgz#c67b90dc0568e5c1cf2b0b858c43ba28e2eda575" - integrity sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg== - dependencies: - follow-redirects "^1.14.0" - axios@^1.5.1: version "1.6.2" resolved "https://registry.yarnpkg.com/axios/-/axios-1.6.2.tgz#de67d42c755b571d3e698df1b6504cde9b0ee9f2" @@ -4264,29 +3843,29 @@ babel-plugin-istanbul@6.1.1: istanbul-lib-instrument "^5.0.4" test-exclude "^6.0.0" -babel-plugin-polyfill-corejs2@^0.4.6: - version "0.4.6" - resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.4.6.tgz#b2df0251d8e99f229a8e60fc4efa9a68b41c8313" - integrity sha512-jhHiWVZIlnPbEUKSSNb9YoWcQGdlTLq7z1GHL4AjFxaoOUMuuEVJ+Y4pAaQUGOGk93YsVCKPbqbfw3m0SM6H8Q== +babel-plugin-polyfill-corejs2@^0.4.7: + version "0.4.8" + resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.4.8.tgz#dbcc3c8ca758a290d47c3c6a490d59429b0d2269" + integrity sha512-OtIuQfafSzpo/LhnJaykc0R/MMnuLSSVjVYy9mHArIZ9qTCSZ6TpWCuEKZYVoN//t8HqBNScHrOtCrIK5IaGLg== dependencies: "@babel/compat-data" "^7.22.6" - "@babel/helper-define-polyfill-provider" "^0.4.3" + "@babel/helper-define-polyfill-provider" "^0.5.0" semver "^6.3.1" -babel-plugin-polyfill-corejs3@^0.8.5: - version "0.8.5" - resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.8.5.tgz#a75fa1b0c3fc5bd6837f9ec465c0f48031b8cab1" - integrity sha512-Q6CdATeAvbScWPNLB8lzSO7fgUVBkQt6zLgNlfyeCr/EQaEQR+bWiBYYPYAFyE528BMjRhL+1QBMOI4jc/c5TA== +babel-plugin-polyfill-corejs3@^0.8.7: + version "0.8.7" + resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.8.7.tgz#941855aa7fdaac06ed24c730a93450d2b2b76d04" + integrity sha512-KyDvZYxAzkC0Aj2dAPyDzi2Ym15e5JKZSK+maI7NAwSqofvuFglbSsxE7wUOvTg9oFVnHMzVzBKcqEb4PJgtOA== dependencies: - "@babel/helper-define-polyfill-provider" "^0.4.3" - core-js-compat "^3.32.2" + "@babel/helper-define-polyfill-provider" "^0.4.4" + core-js-compat "^3.33.1" -babel-plugin-polyfill-regenerator@^0.5.3: - version "0.5.3" - resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.5.3.tgz#d4c49e4b44614607c13fb769bcd85c72bb26a4a5" - integrity sha512-8sHeDOmXC8csczMrYEOf0UTNa4yE2SxV5JGeT/LP1n0OYVDUUFPxG9vdk2AlDlIit4t+Kf0xCtpgXPBwnn/9pw== +babel-plugin-polyfill-regenerator@^0.5.4: + version "0.5.5" + resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.5.5.tgz#8b0c8fc6434239e5d7b8a9d1f832bb2b0310f06a" + integrity sha512-OJGYZlhLqBh2DDHeqAxWB1XIvr49CxiJ2gIt61/PU55CQK4Z58OzMqjDe1zwQdQk+rBYsRc+1rJmdajM3gimHg== dependencies: - "@babel/helper-define-polyfill-provider" "^0.4.3" + "@babel/helper-define-polyfill-provider" "^0.5.0" balanced-match@^1.0.0: version "1.0.2" @@ -4466,63 +4045,6 @@ browser-resolve@^1.8.1: dependencies: resolve "1.1.7" -browser-sync-client@^2.29.3: - version "2.29.3" - resolved "https://registry.yarnpkg.com/browser-sync-client/-/browser-sync-client-2.29.3.tgz#9300b97f42abc2c4f95ca29b5a9781b5c492f14a" - integrity sha512-4tK5JKCl7v/3aLbmCBMzpufiYLsB1+UI+7tUXCCp5qF0AllHy/jAqYu6k7hUF3hYtlClKpxExWaR+rH+ny07wQ== - dependencies: - etag "1.8.1" - fresh "0.5.2" - mitt "^1.1.3" - -browser-sync-ui@^2.29.3: - version "2.29.3" - resolved "https://registry.yarnpkg.com/browser-sync-ui/-/browser-sync-ui-2.29.3.tgz#35e2ce3b470dce6b7219307cac7278bf324a0f16" - integrity sha512-kBYOIQjU/D/3kYtUIJtj82e797Egk1FB2broqItkr3i4eF1qiHbFCG6srksu9gWhfmuM/TNG76jMfzAdxEPakg== - dependencies: - async-each-series "0.1.1" - chalk "4.1.2" - connect-history-api-fallback "^1" - immutable "^3" - server-destroy "1.0.1" - socket.io-client "^4.4.1" - stream-throttle "^0.1.3" - -browser-sync@2.29.3: - version "2.29.3" - resolved "https://registry.yarnpkg.com/browser-sync/-/browser-sync-2.29.3.tgz#c2a3ff00c659eb87a13cae9d7a427e1b4b580ee1" - integrity sha512-NiM38O6XU84+MN+gzspVmXV2fTOoe+jBqIBx3IBdhZrdeURr6ZgznJr/p+hQ+KzkKEiGH/GcC4SQFSL0jV49bg== - dependencies: - browser-sync-client "^2.29.3" - browser-sync-ui "^2.29.3" - bs-recipes "1.3.4" - chalk "4.1.2" - chokidar "^3.5.1" - connect "3.6.6" - connect-history-api-fallback "^1" - dev-ip "^1.0.1" - easy-extender "^2.3.4" - eazy-logger "^4.0.1" - etag "^1.8.1" - fresh "^0.5.2" - fs-extra "3.0.1" - http-proxy "^1.18.1" - immutable "^3" - localtunnel "^2.0.1" - micromatch "^4.0.2" - opn "5.3.0" - portscanner "2.2.0" - raw-body "^2.3.2" - resp-modifier "6.0.2" - rx "4.1.0" - send "0.16.2" - serve-index "1.9.1" - serve-static "1.13.2" - server-destroy "1.0.1" - socket.io "^4.4.1" - ua-parser-js "^1.0.33" - yargs "^17.3.1" - browserify-optional@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/browserify-optional/-/browserify-optional-1.0.1.tgz#1e13722cfde0d85f121676c2a72ced533a018869" @@ -4532,7 +4054,7 @@ browserify-optional@^1.0.1: ast-types "^0.7.0" browser-resolve "^1.8.1" -browserslist@^4.14.5, browserslist@^4.21.10, browserslist@^4.21.3, browserslist@^4.21.5, browserslist@^4.21.9, browserslist@^4.22.1: +browserslist@^4.14.5, browserslist@^4.21.10, browserslist@^4.21.5, browserslist@^4.21.9, browserslist@^4.22.2: version "4.22.2" resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.22.2.tgz#704c4943072bd81ea18997f3bd2180e89c77874b" integrity sha512-0UgcrvQmBDvZHFGdYUehrCNIazki7/lUP3kkoi/r3YB2amZbFM9J43ZRkJTXBUZK4gmx56+Sqk9+Vs9mwZx9+A== @@ -4542,11 +4064,6 @@ browserslist@^4.14.5, browserslist@^4.21.10, browserslist@^4.21.3, browserslist@ node-releases "^2.0.14" update-browserslist-db "^1.0.13" -bs-recipes@1.3.4: - version "1.3.4" - resolved "https://registry.yarnpkg.com/bs-recipes/-/bs-recipes-1.3.4.tgz#0d2d4d48a718c8c044769fdc4f89592dc8b69585" - integrity sha512-BXvDkqhDNxXEjeGM8LFkSbR+jzmP/CYpCiVKYn+soB1dDldeU15EBNDkwVXndKuX35wnNUaPd0qSoQEAkmQtMw== - btoa@^1.2.1: version "1.2.1" resolved "https://registry.yarnpkg.com/btoa/-/btoa-1.2.1.tgz#01a9909f8b2c93f6bf680ba26131eb30f7fa3d73" @@ -4752,7 +4269,7 @@ cheerio@^1.0.0-rc.12: parse5 "^7.0.0" parse5-htmlparser2-tree-adapter "^7.0.0" -chokidar@3.5.3, "chokidar@>=3.0.0 <4.0.0", chokidar@^3.0.0, chokidar@^3.5.1, chokidar@^3.5.2, chokidar@^3.5.3: +"chokidar@>=3.0.0 <4.0.0", chokidar@^3.0.0, chokidar@^3.5.1, chokidar@^3.5.2, chokidar@^3.5.3: version "3.5.3" resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.3.tgz#1cf37c8707b932bd1af1ae22c0432e2acd1903bd" integrity sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw== @@ -4925,7 +4442,7 @@ commander@7, commander@^7.2.0: resolved "https://registry.yarnpkg.com/commander/-/commander-7.2.0.tgz#a36cb57d0b501ce108e4d20559a150a391d97ab7" integrity sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw== -commander@^2.18.0, commander@^2.2.0, commander@^2.20.0: +commander@^2.18.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== @@ -5003,26 +4520,11 @@ concat-stream@~1.6.0: readable-stream "^2.2.2" typedarray "^0.0.6" -connect-history-api-fallback@^1: - 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-history-api-fallback@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/connect-history-api-fallback/-/connect-history-api-fallback-2.0.0.tgz#647264845251a0daf25b97ce87834cace0f5f1c8" integrity sha512-U73+6lQFmfiNPrYbXqr6kZ1i1wiRqXnp2nhMsINseWXO8lDau0LGEffJ8kQi4EjLZympVgRdvqjAgiZ1tgzDDA== -connect@3.6.6: - version "3.6.6" - resolved "https://registry.yarnpkg.com/connect/-/connect-3.6.6.tgz#09eff6c55af7236e137135a72574858b6786f524" - integrity sha512-OO7axMmPpu/2XuX1+2Yrg0ddju31B6xLZMWkJ5rYBu4YRmRVlOjvlY6kw2FJKiAzyxGwnrDUAG4s1Pf0sbBMCQ== - dependencies: - debug "2.6.9" - finalhandler "1.1.0" - parseurl "~1.3.2" - utils-merge "1.0.1" - connect@^3.7.0: version "3.7.0" resolved "https://registry.yarnpkg.com/connect/-/connect-3.7.0.tgz#5d49348910caa5e07a01800b030d0c35f20484f8" @@ -5303,12 +4805,12 @@ core-js-compat@^3.31.0: dependencies: browserslist "^4.21.9" -core-js-compat@^3.32.2: - version "3.33.1" - resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.33.1.tgz#debe80464107d75419e00c2ee29f35982118ff84" - integrity sha512-6pYKNOgD/j/bkC5xS5IIg6bncid3rfrI42oBH1SQJbsmYPKF7rhzcFzYCcxYMmNQQ0rCEB8WqpW7QHndOggaeQ== +core-js-compat@^3.33.1: + version "3.35.0" + resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.35.0.tgz#c149a3d1ab51e743bc1da61e39cb51f461a41873" + integrity sha512-5blwFAddknKeNgsjBzilkdQ0+YK8L1PfqPYq40NOYMYFSS38qj+hpTcLLWwpIwA2A5bje/x5jmVn2tzUMg9IVw== dependencies: - browserslist "^4.22.1" + browserslist "^4.22.2" core-util-is@~1.0.0: version "1.0.3" @@ -5330,7 +4832,7 @@ cosmiconfig-typescript-loader@^5.0.0: dependencies: jiti "^1.19.1" -cosmiconfig@^8.2.0, cosmiconfig@^8.3.6: +cosmiconfig@^8.3.5, cosmiconfig@^8.3.6: version "8.3.6" resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-8.3.6.tgz#060a2b871d66dba6c8538ea1118ba1ac16f5fae3" integrity sha512-kcZ6+W5QzcJ3P1Mt+83OUv/oHFqZHIx8DuxG6eZ5RGMERoLqp4BuGjhHLYGK+Kf5XVkQvqBSmAy/nGWN3qDgEA== @@ -5547,27 +5049,20 @@ debounce@^1.2.1: resolved "https://registry.yarnpkg.com/debounce/-/debounce-1.2.1.tgz#38881d8f4166a5c5848020c11827b834bcb3e0a5" integrity sha512-XRRe6Glud4rd/ZGQfiV1ruXSfbvfJedlV9Y6zOlP+2K04vBYiJEte6stfFkCP03aMnY5tsipamumUjL14fofug== -debug@2.6.9, debug@^2.2.0: +debug@2.6.9: 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.4, debug@^4.1.0, debug@^4.1.1, debug@^4.3.2, debug@^4.3.3, debug@^4.3.4, debug@~4.3.1, debug@~4.3.2: +debug@4, debug@4.3.4, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2, debug@^4.3.3, debug@^4.3.4, debug@~4.3.1, debug@~4.3.2: version "4.3.4" resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865" integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ== dependencies: ms "2.1.2" -debug@4.3.2: - 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@^3.2.6, debug@^3.2.7: version "3.2.7" resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.7.tgz#72580b7e9145fb39b6676f9c5e5fb100b934179a" @@ -5725,11 +5220,6 @@ destroy@1.2.0: resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.2.0.tgz#4803735509ad8be552934c67df614f94e66fa015" integrity sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg== -destroy@~1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.0.4.tgz#978857442c44749e4206613e37946205826abd80" - integrity sha512-3NdhDuEXnfun/z7x9GOElY49LoqVHoGScmOKwmxhsS8N5Y+Z8KyPPDnaSzqWgYt/ji4mqwfTS34Htrk0zPIXVg== - detect-indent@^6.0.0: version "6.1.0" resolved "https://registry.yarnpkg.com/detect-indent/-/detect-indent-6.1.0.tgz#592485ebbbf6b3b1ab2be175c8393d04ca0d57e6" @@ -5750,11 +5240,6 @@ detect-node@^2.0.4: resolved "https://registry.yarnpkg.com/detect-node/-/detect-node-2.1.0.tgz#c9c70775a49c3d03bc2c06d9a73be550f978f8b1" integrity sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g== -dev-ip@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/dev-ip/-/dev-ip-1.0.1.tgz#a76a3ed1855be7a012bb8ac16cb80f3c00dc28f0" - integrity sha512-LmVkry/oDShEgSZPNgqCIp2/TlqtExeGmymru3uCELnfyjY11IzpAproLYs+1X88fXO6DBoYP3ul2Xo2yz2j6A== - dfa@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/dfa/-/dfa-1.2.0.tgz#96ac3204e2d29c49ea5b57af8d92c2ae12790657" @@ -5905,20 +5390,6 @@ eastasianwidth@^0.2.0: resolved "https://registry.yarnpkg.com/eastasianwidth/-/eastasianwidth-0.2.0.tgz#696ce2ec0aa0e6ea93a397ffcf24aa7840c827cb" integrity sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA== -easy-extender@^2.3.4: - version "2.3.4" - resolved "https://registry.yarnpkg.com/easy-extender/-/easy-extender-2.3.4.tgz#298789b64f9aaba62169c77a2b3b64b4c9589b8f" - integrity sha512-8cAwm6md1YTiPpOvDULYJL4ZS6WfM5/cTeVVh4JsvyYZAoqlRVUpHL9Gr5Fy7HA6xcSZicUia3DeAgO3Us8E+Q== - dependencies: - lodash "^4.17.10" - -eazy-logger@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/eazy-logger/-/eazy-logger-4.0.1.tgz#2e9fe487fb14ed6ac20d5f01d90dff377d403041" - integrity sha512-2GSFtnnC6U4IEKhEI7+PvdxrmjJ04mdsj3wHZTFiw0tUtG4HCWzTr13ZYTk8XOGnA1xQMaDljoBOYlk3D/MMSw== - dependencies: - chalk "4.1.2" - ee-first@1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d" @@ -5966,7 +5437,7 @@ emojis-list@^3.0.0: resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-3.0.0.tgz#5570662046ad29e2e916e71aae260abdff4f6a78" integrity sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q== -encodeurl@~1.0.1, encodeurl@~1.0.2: +encodeurl@~1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59" integrity sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w== @@ -5985,27 +5456,11 @@ end-of-stream@^1.0.0, end-of-stream@^1.1.0, end-of-stream@^1.4.1: dependencies: once "^1.4.0" -engine.io-client@~6.5.2: - version "6.5.3" - resolved "https://registry.yarnpkg.com/engine.io-client/-/engine.io-client-6.5.3.tgz#4cf6fa24845029b238f83c628916d9149c399bc5" - integrity sha512-9Z0qLB0NIisTRt1DZ/8U2k12RJn8yls/nXMZLn+/N8hANT3TcYjKFKcwbw5zFQiN4NTde3TSY9zb79e1ij6j9Q== - dependencies: - "@socket.io/component-emitter" "~3.1.0" - debug "~4.3.1" - engine.io-parser "~5.2.1" - ws "~8.11.0" - xmlhttprequest-ssl "~2.0.0" - engine.io-parser@~5.1.0: version "5.1.0" resolved "https://registry.yarnpkg.com/engine.io-parser/-/engine.io-parser-5.1.0.tgz#d593d6372d7f79212df48f807b8cace1ea1cb1b8" integrity sha512-enySgNiK5tyZFynt3z7iqBR+Bto9EVVVvDFuTT0ioHCGbzirZVGDGiQjZzEp8hWl6hd5FSVytJGuScX1C1C35w== -engine.io-parser@~5.2.1: - version "5.2.1" - resolved "https://registry.yarnpkg.com/engine.io-parser/-/engine.io-parser-5.2.1.tgz#9f213c77512ff1a6cc0c7a86108a7ffceb16fcfb" - integrity sha512-9JktcM3u18nU9N2Lz3bWeBgxVgOKpw7yhRaoxQA3FUDZzzw+9WlA6p4G4u0RixNkg14fH7EfEc/RhpurtiROTQ== - engine.io@~6.5.0: version "6.5.0" resolved "https://registry.yarnpkg.com/engine.io/-/engine.io-6.5.0.tgz#02b9d9941c0d3ab2d46628e98ac3331dd533dff0" @@ -6216,66 +5671,39 @@ es6-symbol@^3.1.1, es6-symbol@^3.1.3, es6-symbol@~3.1.1: d "^1.0.1" ext "^1.1.2" -esbuild-wasm@0.19.5: - version "0.19.5" - resolved "https://registry.yarnpkg.com/esbuild-wasm/-/esbuild-wasm-0.19.5.tgz#28f4563d7e3bcbe9462813e376b2fb6024931fd9" - integrity sha512-7zmLLn2QCj93XfMmHtzrDJ1UBuOHB2CZz1ghoCEZiRajxjUvHsF40PnbzFIY/pmesqPRaEtEWii0uzsTbnAgrA== +esbuild-wasm@0.19.11: + version "0.19.11" + resolved "https://registry.yarnpkg.com/esbuild-wasm/-/esbuild-wasm-0.19.11.tgz#4ed96cdd1a289bc08432a25fd38b7331d3eac98d" + integrity sha512-MIhnpc1TxERUHomteO/ZZHp+kUawGEc03D/8vMHGzffLvbFLeDe6mwxqEZwlqBNY7SLWbyp6bBQAcCen8+wpjQ== -esbuild@0.19.5: - version "0.19.5" - resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.19.5.tgz#53a0e19dfbf61ba6c827d51a80813cf071239a8c" - integrity sha512-bUxalY7b1g8vNhQKdB24QDmHeY4V4tw/s6Ak5z+jJX9laP5MoQseTOMemAr0gxssjNcH0MCViG8ONI2kksvfFQ== - optionalDependencies: - "@esbuild/android-arm" "0.19.5" - "@esbuild/android-arm64" "0.19.5" - "@esbuild/android-x64" "0.19.5" - "@esbuild/darwin-arm64" "0.19.5" - "@esbuild/darwin-x64" "0.19.5" - "@esbuild/freebsd-arm64" "0.19.5" - "@esbuild/freebsd-x64" "0.19.5" - "@esbuild/linux-arm" "0.19.5" - "@esbuild/linux-arm64" "0.19.5" - "@esbuild/linux-ia32" "0.19.5" - "@esbuild/linux-loong64" "0.19.5" - "@esbuild/linux-mips64el" "0.19.5" - "@esbuild/linux-ppc64" "0.19.5" - "@esbuild/linux-riscv64" "0.19.5" - "@esbuild/linux-s390x" "0.19.5" - "@esbuild/linux-x64" "0.19.5" - "@esbuild/netbsd-x64" "0.19.5" - "@esbuild/openbsd-x64" "0.19.5" - "@esbuild/sunos-x64" "0.19.5" - "@esbuild/win32-arm64" "0.19.5" - "@esbuild/win32-ia32" "0.19.5" - "@esbuild/win32-x64" "0.19.5" - -esbuild@^0.18.10: - version "0.18.20" - resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.18.20.tgz#4709f5a34801b43b799ab7d6d82f7284a9b7a7a6" - integrity sha512-ceqxoedUrcayh7Y7ZX6NdbbDzGROiyVBgC4PriJThBKSVPWnnFHZAkfI1lJT8QFkOwH4qOS2SJkS4wvpGl8BpA== +esbuild@0.19.11, esbuild@^0.19.3: + version "0.19.11" + resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.19.11.tgz#4a02dca031e768b5556606e1b468fe72e3325d96" + integrity sha512-HJ96Hev2hX/6i5cDVwcqiJBBtuo9+FeIJOtZ9W1kA5M6AMJRHUZlpYZ1/SbEwtO0ioNAW8rUooVpC/WehY2SfA== optionalDependencies: - "@esbuild/android-arm" "0.18.20" - "@esbuild/android-arm64" "0.18.20" - "@esbuild/android-x64" "0.18.20" - "@esbuild/darwin-arm64" "0.18.20" - "@esbuild/darwin-x64" "0.18.20" - "@esbuild/freebsd-arm64" "0.18.20" - "@esbuild/freebsd-x64" "0.18.20" - "@esbuild/linux-arm" "0.18.20" - "@esbuild/linux-arm64" "0.18.20" - "@esbuild/linux-ia32" "0.18.20" - "@esbuild/linux-loong64" "0.18.20" - "@esbuild/linux-mips64el" "0.18.20" - "@esbuild/linux-ppc64" "0.18.20" - "@esbuild/linux-riscv64" "0.18.20" - "@esbuild/linux-s390x" "0.18.20" - "@esbuild/linux-x64" "0.18.20" - "@esbuild/netbsd-x64" "0.18.20" - "@esbuild/openbsd-x64" "0.18.20" - "@esbuild/sunos-x64" "0.18.20" - "@esbuild/win32-arm64" "0.18.20" - "@esbuild/win32-ia32" "0.18.20" - "@esbuild/win32-x64" "0.18.20" + "@esbuild/aix-ppc64" "0.19.11" + "@esbuild/android-arm" "0.19.11" + "@esbuild/android-arm64" "0.19.11" + "@esbuild/android-x64" "0.19.11" + "@esbuild/darwin-arm64" "0.19.11" + "@esbuild/darwin-x64" "0.19.11" + "@esbuild/freebsd-arm64" "0.19.11" + "@esbuild/freebsd-x64" "0.19.11" + "@esbuild/linux-arm" "0.19.11" + "@esbuild/linux-arm64" "0.19.11" + "@esbuild/linux-ia32" "0.19.11" + "@esbuild/linux-loong64" "0.19.11" + "@esbuild/linux-mips64el" "0.19.11" + "@esbuild/linux-ppc64" "0.19.11" + "@esbuild/linux-riscv64" "0.19.11" + "@esbuild/linux-s390x" "0.19.11" + "@esbuild/linux-x64" "0.19.11" + "@esbuild/netbsd-x64" "0.19.11" + "@esbuild/openbsd-x64" "0.19.11" + "@esbuild/sunos-x64" "0.19.11" + "@esbuild/win32-arm64" "0.19.11" + "@esbuild/win32-ia32" "0.19.11" + "@esbuild/win32-x64" "0.19.11" escalade@^3.1.1: version "3.1.1" @@ -6542,7 +5970,7 @@ esutils@~1.0.0: resolved "https://registry.yarnpkg.com/esutils/-/esutils-1.0.0.tgz#8151d358e20c8acc7fb745e7472c0025fe496570" integrity sha512-x/iYH53X3quDwfHRz4y8rn4XcEwwCJeWsul9pF1zldMbGtgOtMNBEOuYWwB1EQlK2LRa1fev3YAgym/RElp5Cg== -etag@1.8.1, etag@^1.8.1, etag@~1.8.1: +etag@~1.8.1: version "1.8.1" resolved "https://registry.yarnpkg.com/etag/-/etag-1.8.1.tgz#41ae2eeb65efa62268aebfea83ac7d79299b0887" integrity sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg== @@ -6578,11 +6006,6 @@ event-target-shim@^5.0.0: resolved "https://registry.yarnpkg.com/event-target-shim/-/event-target-shim-5.0.1.tgz#5d4d3ebdf9583d63a5333ce2deb7480ab2b05789" integrity sha512-i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ== -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== - eventemitter3@^4.0.0: version "4.0.7" resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-4.0.7.tgz#2de9b68f6528d5644ef5c59526a1b4a07306169f" @@ -6749,7 +6172,7 @@ fast-glob@3.3.1: merge2 "^1.3.0" micromatch "^4.0.4" -fast-glob@^3.2.11, fast-glob@^3.2.12, fast-glob@^3.2.9, fast-glob@^3.3.0, fast-glob@^3.3.2: +fast-glob@3.3.2, fast-glob@^3.2.11, fast-glob@^3.2.12, fast-glob@^3.2.9, fast-glob@^3.3.0, fast-glob@^3.3.2: version "3.3.2" resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.3.2.tgz#a904501e57cfdd2ffcded45e99a54fef55e46129" integrity sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow== @@ -6842,19 +6265,6 @@ fill-range@^7.0.1: dependencies: to-regex-range "^5.0.1" -finalhandler@1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.1.0.tgz#ce0b6855b45853e791b2fcc680046d88253dd7f5" - integrity sha512-ejnvM9ZXYzp6PUPUyQBMBf0Co5VX2gr5H2VQe2Ui2jWXNlxv+PYZo8wpAymJNJdLsG1R4p+M4aynF8KuoUEwRw== - dependencies: - debug "2.6.9" - encodeurl "~1.0.1" - escape-html "~1.0.3" - on-finished "~2.3.0" - parseurl "~1.3.2" - statuses "~1.3.1" - unpipe "~1.0.0" - finalhandler@1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.1.2.tgz#b7e7d000ffd11938d0fdb053506f6ebabe9f587d" @@ -6954,7 +6364,7 @@ flatted@^3.1.0, flatted@^3.2.7: resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.2.7.tgz#609f39207cb614b89d0765b477cb2d437fbf9787" integrity sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ== -follow-redirects@^1.0.0, follow-redirects@^1.14.0, follow-redirects@^1.15.0: +follow-redirects@^1.0.0, follow-redirects@^1.15.0: version "1.15.4" resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.4.tgz#cdc7d308bf6493126b17ea2191ea0ccf3e535adf" integrity sha512-Cr4D/5wlrb0z9dgERpUL3LrmPKVDsETIJhaCMeDfuFYcqa5bldGV6wBsAN6X/vxlXQtFBMrXdXxdL8CbDTGniw== @@ -7005,7 +6415,7 @@ fraction.js@^4.3.6: resolved "https://registry.yarnpkg.com/fraction.js/-/fraction.js-4.3.7.tgz#06ca0085157e42fda7f9e726e79fefc4068840f7" integrity sha512-ZsDfxO51wGAXREY55a7la9LScWpwv9RxIrYABrlvOFBlH/ShPnrtsXeuUIfXKKOVicNxQ+o8JTbJvjS4M89yew== -fresh@0.5.2, fresh@^0.5.2: +fresh@0.5.2: version "0.5.2" resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.2.tgz#3d8cadd90d976569fa835ab1f8e4b23a105605a7" integrity sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q== @@ -7020,15 +6430,6 @@ fs-constants@^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@3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-3.0.1.tgz#3794f378c58b342ea7dbbb23095109c4b3b62291" - integrity sha512-V3Z3WZWVUYd8hoCL5xfXJCaHWYzmtwW5XWYSlLgERi8PWd8bx1kUHUk8L1BT57e49oKnDDD180mjfrHc1yA9rg== - dependencies: - graceful-fs "^4.1.2" - jsonfile "^3.0.0" - universalify "^0.1.0" - fs-extra@^11.1.0, fs-extra@^11.1.1: version "11.1.1" resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-11.1.1.tgz#da69f7c39f3b002378b0954bb6ae7efdc0876e2d" @@ -7086,6 +6487,11 @@ fsevents@~2.3.2: resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.2.tgz#8a526f78b8fdf4623b709e0b975c52c24c02fd1a" integrity sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA== +fsevents@~2.3.3: + version "2.3.3" + resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.3.tgz#cac6407785d03675a2a5e1a5305c697b347d90d6" + integrity sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw== + function-bind@^1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d" @@ -7765,11 +7171,6 @@ image-size@~0.5.0: resolved "https://registry.yarnpkg.com/image-size/-/image-size-0.5.5.tgz#09dfd4ab9d20e29eb1c3e80b8990378df9e3cb9c" integrity sha512-6TDAlDPZxUFCv+fuOkIoXT/V/f3Qbq8e37p+YOiYrUv3v9cc3/6x78VdfPgFVaB9dZYeLUfKgHRebpkm/oP2VQ== -immutable@^3: - version "3.8.2" - resolved "https://registry.yarnpkg.com/immutable/-/immutable-3.8.2.tgz#c2439951455bb39913daf281376f1530e104adf3" - integrity sha512-15gZoQ38eYjEjxkorfbcgBKBL6R7T459OuK+CpcWt7O3KF4uPCx2tD0uFETlUDIyo+1789crbMhTvQBSR5yBMg== - immutable@^4.0.0: version "4.3.0" resolved "https://registry.yarnpkg.com/immutable/-/immutable-4.3.0.tgz#eb1738f14ffb39fd068b1dbe1296117484dd34be" @@ -7835,12 +7236,12 @@ ini@^1.3.2, ini@^1.3.4: resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c" integrity sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew== -inquirer@9.2.11: - version "9.2.11" - resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-9.2.11.tgz#e9003755c233a414fceda1891c23bd622cad4a95" - integrity sha512-B2LafrnnhbRzCWfAdOXisUzL89Kg8cVJlYmhqoi3flSiV/TveO+nsXwgKr9h9PIo+J1hz7nBSk6gegRIMBBf7g== +inquirer@9.2.12: + version "9.2.12" + resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-9.2.12.tgz#0348e9311765b7c93fce143bb1c0ef1ae879b1d7" + integrity sha512-mg3Fh9g2zfuVWJn6lhST0O7x4n03k7G8Tx5nvikJkbq8/CK47WDVm+UznF0G6s5Zi0KcyUisr6DU8T67N5U+1Q== dependencies: - "@ljharb/through" "^2.3.9" + "@ljharb/through" "^2.3.11" ansi-escapes "^4.3.2" chalk "^5.3.0" cli-cursor "^3.1.0" @@ -8016,13 +7417,6 @@ is-negative-zero@^2.0.2: resolved "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.2.tgz#7bf6f03a28003b8b3965de3ac26f664d765f3150" integrity sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA== -is-number-like@^1.0.3: - version "1.0.8" - resolved "https://registry.yarnpkg.com/is-number-like/-/is-number-like-1.0.8.tgz#2e129620b50891042e44e9bbbb30593e75cfbbe3" - integrity sha512-6rZi3ezCyFcn5L71ywzz2bS5b2Igl1En3eTlZlvKjpz1n3IZLAYMbKYAIQgFmEu0GENg92ziU/faEOA/aixjbA== - dependencies: - lodash.isfinite "^3.3.2" - is-number-object@^1.0.4: version "1.0.7" resolved "https://registry.yarnpkg.com/is-number-object/-/is-number-object-1.0.7.tgz#59d50ada4c45251784e9904f5246c742f07a42fc" @@ -8178,11 +7572,6 @@ is-what@^3.14.1: resolved "https://registry.yarnpkg.com/is-what/-/is-what-3.14.1.tgz#e1222f46ddda85dead0fd1c9df131760e77755c1" integrity sha512-sNxgpk9793nzSs7bA6JQJGeIuRBQhAaNGG77kzYQgMkrID+lS6SlK07K5LaptscDlSaIgH+GPFzf+d75FVxozA== -is-wsl@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-1.1.0.tgz#1f16e4aa22b04d1336b66188a66af3c600c3a66d" - integrity sha512-gfygJYZ2gLTDlmbWMI0CE2MwnFzSN/2SZfkMlItC4K/JBlsWVDB0bO6XhqcY13YXE7iMcAJnzTCJjPiTeJJ0Mw== - is-wsl@^2.1.1, is-wsl@^2.2.0: version "2.2.0" resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-2.2.0.tgz#74a4c76e77ca9fd3f932f290c17ea326cd157271" @@ -8320,12 +7709,7 @@ jest-worker@^27.4.5: merge-stream "^2.0.0" supports-color "^8.0.0" -jiti@^1.18.2: - version "1.18.2" - resolved "https://registry.yarnpkg.com/jiti/-/jiti-1.18.2.tgz#80c3ef3d486ebf2450d9335122b32d121f2a83cd" - integrity sha512-QAdOptna2NYiSSpv0O/BwoHBSmz4YhpzJHyi+fnMRTXFjp7B8i/YG5Z8IfusxB1ufjcD2Sre1F3R+nX3fvy7gg== - -jiti@^1.19.1: +jiti@^1.19.1, jiti@^1.20.0: version "1.21.0" resolved "https://registry.yarnpkg.com/jiti/-/jiti-1.21.0.tgz#7c97f8fe045724e136a397f7340475244156105d" integrity sha512-gFqAIbuKyyso/3G2qhiO2OM6shY6EPP/R0+mkDbyspxKazh8BXDC5FiFsUjlczgdNz/vfra0da2y+aHrusLG/Q== @@ -8427,13 +7811,6 @@ jsonc-parser@3.2.0: resolved "https://registry.yarnpkg.com/jsonc-parser/-/jsonc-parser-3.2.0.tgz#31ff3f4c2b9793f89c67212627c51c6394f88e76" integrity sha512-gfFQZrcTc8CnKXp6Y4/CBT3fTc0OVuDofpre4aEeEpSBPV5X5v4+Vmx+8snU7RLPrNHPKSgLxGo9YuQzz20o+w== -jsonfile@^3.0.0: - version "3.0.1" - resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-3.0.1.tgz#a5ecc6f65f53f662c4415c7675a0331d0992ec66" - integrity sha512-oBko6ZHlubVB5mRFkur5vgYR1UyqX+S6Y/oCfLhqNdcc2fYFlDpIoNc7AfKS1KOGcnNAkvsr0grLck9ANM815w== - optionalDependencies: - graceful-fs "^4.1.6" - jsonfile@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-4.0.0.tgz#8771aae0799b64076b76640fca058f9c10e33ecb" @@ -8621,11 +7998,6 @@ lilconfig@3.0.0: resolved "https://registry.yarnpkg.com/lilconfig/-/lilconfig-3.0.0.tgz#f8067feb033b5b74dab4602a5f5029420be749bc" integrity sha512-K2U4W2Ff5ibV7j7ydLr+zLAkIg5JJ4lPn1Ltsdt+Tz/IjQ8buJ55pZAxoP34lqIiwtF9iAvtLv3JGv7CAyAg+g== -limiter@^1.0.5: - version "1.1.5" - resolved "https://registry.yarnpkg.com/limiter/-/limiter-1.1.5.tgz#8f92a25b3b16c6131293a0cc834b4a838a2aa7c2" - integrity sha512-FWWMIEOxz3GwUI4Ts/IvgVy6LPvoMPgjMdQ185nN6psJyBJ4yOpzqm695/h5umdLJg2vW3GR5iG11MAkR2AzJA== - lines-and-columns@^1.1.6: version "1.2.4" resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.2.4.tgz#eca284f75d2965079309dc0ad9255abb2ebc1632" @@ -8693,16 +8065,6 @@ loader-utils@^2.0.0: emojis-list "^3.0.0" json5 "^2.1.2" -localtunnel@^2.0.1: - version "2.0.2" - resolved "https://registry.yarnpkg.com/localtunnel/-/localtunnel-2.0.2.tgz#528d50087151c4790f89c2db374fe7b0a48501f0" - integrity sha512-n418Cn5ynvJd7m/N1d9WVJISLJF/ellZnfsLnx8WBWGzxv/ntNcFkJ1o6se5quUhCplfLGBNL5tYHiq5WF3Nug== - dependencies: - axios "0.21.4" - debug "4.3.2" - openurl "1.1.1" - yargs "17.1.1" - locate-path@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-2.0.0.tgz#2b568b265eec944c6d9c0de9c3dbbbca0354cd8e" @@ -8750,11 +8112,6 @@ lodash.debounce@^4.0.8: resolved "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz#82d79bff30a67c4005ffd5e2515300ad9ca4d7af" integrity sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow== -lodash.isfinite@^3.3.2: - version "3.3.2" - resolved "https://registry.yarnpkg.com/lodash.isfinite/-/lodash.isfinite-3.3.2.tgz#fb89b65a9a80281833f0b7478b3a5104f898ebb3" - integrity sha512-7FGG40uhC8Mm633uKW1r58aElFlBlxCrg9JfSi3P6aYiWmfiWF0PgMd86ZUsxE5GwWPdHoS2+48bwTh2VPkIQA== - lodash.isfunction@^3.0.9: version "3.0.9" resolved "https://registry.yarnpkg.com/lodash.isfunction/-/lodash.isfunction-3.0.9.tgz#06de25df4db327ac931981d1bdb067e5af68d051" @@ -8805,7 +8162,7 @@ lodash.upperfirst@^4.3.1: resolved "https://registry.yarnpkg.com/lodash.upperfirst/-/lodash.upperfirst-4.3.1.tgz#1365edf431480481ef0d1c68957a5ed99d49f7ce" integrity sha512-sReKOYJIJf74dhJONhU4e0/shzi1trVbSWDOhKYE5XV2O+H7Sb2Dihwuc7xWxVl+DgFPyTqIN3zMfT9cq5iWDg== -lodash@^4.17.10, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.20, lodash@^4.17.21: +lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.20, lodash@^4.17.21: version "4.17.21" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c" integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg== @@ -9060,11 +8417,6 @@ mime-types@^2.1.12, mime-types@^2.1.27, mime-types@^2.1.31, mime-types@~2.1.17, dependencies: mime-db "1.52.0" -mime@1.4.1: - version "1.4.1" - resolved "https://registry.yarnpkg.com/mime/-/mime-1.4.1.tgz#121f9ebc49e3766f311a76e1fa1c8003c4b03aa6" - integrity sha512-KI1+qOZu5DcW6wayYHSzR/tXKCDC5Om4s1z2QJjDULzLcmf3DvzS7oluY4HCTrc+9FiKmWUgeNLg7W3uIQvxtQ== - mime@1.6.0, mime@^1.4.1: version "1.6.0" resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1" @@ -9116,7 +8468,7 @@ minimatch@9.0.3, minimatch@^9.0.0, minimatch@^9.0.1, minimatch@^9.0.3: dependencies: brace-expansion "^2.0.1" -minimatch@^3.0.2, minimatch@^3.0.4, minimatch@^3.0.5, minimatch@^3.1.1, minimatch@^3.1.2: +minimatch@^3.0.4, minimatch@^3.0.5, minimatch@^3.1.1, minimatch@^3.1.2: version "3.1.2" resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b" integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw== @@ -9241,11 +8593,6 @@ minizlib@^2.0.0, minizlib@^2.1.1, minizlib@^2.1.2: minipass "^3.0.0" yallist "^4.0.0" -mitt@^1.1.3: - version "1.2.0" - resolved "https://registry.yarnpkg.com/mitt/-/mitt-1.2.0.tgz#cb24e6569c806e31bd4e3995787fe38a04fdf90d" - integrity sha512-r6lj77KlwqLhIUku9UWYes7KJtsczvolZkzp8hbaDPPaE24OmWl5s539Mytlj22siEQKosZ26qCBgda2PKwoJw== - mkdirp@^0.5.1, mkdirp@^0.5.5: version "0.5.6" resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.6.tgz#7def03d2432dcae4ba1d611445c48396062255f6" @@ -9284,7 +8631,12 @@ morgan@^1.10.0: on-finished "~2.3.0" on-headers "~1.0.2" -mrmime@1.0.1, mrmime@^1.0.0: +mrmime@2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/mrmime/-/mrmime-2.0.0.tgz#151082a6e06e59a9a39b46b3e14d5cfe92b3abb4" + integrity sha512-eu38+hdgojoyq63s+yTpN4XMBdt5l8HhMhc4VKLO9KM5caLIBvUm4thi7fFaxyTmCKeNnXZ5pAlBwCUnhA09uw== + +mrmime@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/mrmime/-/mrmime-1.0.1.tgz#5f90c825fad4bdd41dc914eff5d1a8cfdaf24f27" integrity sha512-hzzEagAgDyoU1Q6yg5uI+AorQgdvMCur3FcKf7NhMKWsaYg+RnbTyHRa/9IlLF9rf455MOCtcqqrQQ83pPP7Uw== @@ -9330,11 +8682,6 @@ n3@^1.17.2: queue-microtask "^1.1.2" readable-stream "^4.0.0" -nanoid@^3.3.6: - version "3.3.6" - resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.6.tgz#443380c856d6e9f9824267d960b4236ad583ea4c" - integrity sha512-BGcqMMJuToF7i1rt+2PWSNVnWIkGCU78jBG3RxO/bZlnZPK2Cmi2QaffxGO/2RvWi9sL+FAiRiXMgsyxQ1DIDA== - nanoid@^3.3.7: version "3.3.7" resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.7.tgz#d0c301a691bc8d54efa0a2226ccf3fe2fd656bd8" @@ -9829,18 +9176,6 @@ opener@^1.5.2: resolved "https://registry.yarnpkg.com/opener/-/opener-1.5.2.tgz#5d37e1f35077b9dcac4301372271afdeb2a13598" integrity sha512-ur5UIdyw5Y7yEj9wLzhqXiy6GZ3Mwx0yGI+5sMn2r0N0v3cKJvUmFH5yPP+WXh9e0xfyzyJX95D8l088DNFj7A== -openurl@1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/openurl/-/openurl-1.1.1.tgz#3875b4b0ef7a52c156f0db41d4609dbb0f94b387" - integrity sha512-d/gTkTb1i1GKz5k3XE3XFV/PxQ1k45zDqGP2OA7YhgsaLoqm6qRvARAZOFer1fcXritWlGBRCu/UgeS4HAnXAA== - -opn@5.3.0: - version "5.3.0" - resolved "https://registry.yarnpkg.com/opn/-/opn-5.3.0.tgz#64871565c863875f052cfdf53d3e3cb5adb53b1c" - integrity sha512-bYJHo/LOmoTd+pfiYhfZDnf9zekVJrY+cnS2a5F2x+w5ppvTqObojTP7WiFG+kVZs9Inw+qQ/lw7TroWwhdd2g== - dependencies: - is-wsl "^1.1.0" - optionator@^0.8.1: version "0.8.3" resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.8.3.tgz#84fa1d036fe9d3c7e21d99884b601167ec8fb495" @@ -9981,10 +9316,10 @@ p-try@^2.0.0: resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6" integrity sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ== -pacote@17.0.4: - version "17.0.4" - resolved "https://registry.yarnpkg.com/pacote/-/pacote-17.0.4.tgz#4bac6c0745967bde96985ec12fbbfc8dea7140e8" - integrity sha512-eGdLHrV/g5b5MtD5cTPyss+JxOlaOloSMG3UwPMAvL8ywaLJ6beONPF40K4KKl/UI6q5hTKCJq5rCu8tkF+7Dg== +pacote@17.0.5: + version "17.0.5" + resolved "https://registry.yarnpkg.com/pacote/-/pacote-17.0.5.tgz#e9854edee7a073635cdd36b0c07cd4f2ab1757b6" + integrity sha512-TAE0m20zSDMnchPja9vtQjri19X3pZIyRpm2TJVeI+yU42leJBBDTRYhOcWFsPhaMxf+3iwQkFiKz16G9AEeeA== dependencies: "@npmcli/git" "^5.0.0" "@npmcli/installed-package-contents" "^2.0.1" @@ -10224,12 +9559,11 @@ pinkie@^2.0.0: resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870" integrity sha512-MnUuEycAemtSaeFSjXKW/aroV7akBbY+Sv+RkyqFjgAe73F+MR0TBWKBRDkmfWq/HiFmdavfZ1G7h4SPZXaCSg== -piscina@4.1.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/piscina/-/piscina-4.1.0.tgz#809578ee3ab2ecf4cf71c2a062100b4b95a85b96" - integrity sha512-sjbLMi3sokkie+qmtZpkfMCUJTpbxJm/wvaPzU28vmYSsTSW8xk9JcFUsbqGJdtPpIQ9tuj+iDcTtgZjwnOSig== +piscina@4.2.1: + version "4.2.1" + resolved "https://registry.yarnpkg.com/piscina/-/piscina-4.2.1.tgz#efb7f009d3a961e02ae08f1909bd24b5423e77fa" + integrity sha512-LShp0+lrO+WIzB9LXO+ZmO4zGHxtTJNZhEO56H9SSu+JPaUQb6oLcTCzWi5IL2DS8/vIkCE88ElahuSSw4TAkA== dependencies: - eventemitter-asyncresource "^1.0.0" hdr-histogram-js "^2.0.1" hdr-histogram-percentiles-obj "^3.0.0" optionalDependencies: @@ -10254,22 +9588,14 @@ png-js@^1.0.0: resolved "https://registry.yarnpkg.com/png-js/-/png-js-1.0.0.tgz#e5484f1e8156996e383aceebb3789fd75df1874d" integrity sha512-k+YsbhpA9e+EFfKjTCH3VW6aoKlyNYI6NYdTfDL4CIvFnvsuO84ttonmZE7rc+v23SLTH8XX+5w/Ak9v0xGY4g== -portscanner@2.2.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/portscanner/-/portscanner-2.2.0.tgz#6059189b3efa0965c9d96a56b958eb9508411cf1" - integrity sha512-IFroCz/59Lqa2uBvzK3bKDbDDIEaAY8XJ1jFxcLWTqosrsc32//P4VuSB2vZXoHiHqOmx8B5L5hnKOxL/7FlPw== - dependencies: - async "^2.6.0" - is-number-like "^1.0.3" - -postcss-loader@7.3.3: - version "7.3.3" - resolved "https://registry.yarnpkg.com/postcss-loader/-/postcss-loader-7.3.3.tgz#6da03e71a918ef49df1bb4be4c80401df8e249dd" - integrity sha512-YgO/yhtevGO/vJePCQmTxiaEwER94LABZN0ZMT4A0vsak9TpO+RvKRs7EmJ8peIlB9xfXCsS7M8LjqncsUZ5HA== +postcss-loader@7.3.4: + version "7.3.4" + resolved "https://registry.yarnpkg.com/postcss-loader/-/postcss-loader-7.3.4.tgz#aed9b79ce4ed7e9e89e56199d25ad1ec8f606209" + integrity sha512-iW5WTTBSC5BfsBJ9daFMPVrLT36MrNiC6fqOZTTaHjBNX6Pfd5p+hSBqe/fEeNd7pc13QiAyGt7VdGMw4eRC4A== dependencies: - cosmiconfig "^8.2.0" - jiti "^1.18.2" - semver "^7.3.8" + cosmiconfig "^8.3.5" + jiti "^1.20.0" + semver "^7.5.4" postcss-modules-extract-imports@^3.0.0: version "3.0.0" @@ -10312,19 +9638,10 @@ postcss-value-parser@^4.1.0, postcss-value-parser@^4.2.0: resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz#723c09920836ba6d3e5af019f92bc0971c02e514" integrity sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ== -postcss@8.4.31: - version "8.4.31" - resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.31.tgz#92b451050a9f914da6755af352bdc0192508656d" - integrity sha512-PS08Iboia9mts/2ygV3eLpY5ghnUcfLV/EXTOW1E2qYxJKGGBUtNjN76FYHnMs36RmARn41bC0AZmn+rR0OVpQ== - dependencies: - nanoid "^3.3.6" - picocolors "^1.0.0" - source-map-js "^1.0.2" - -postcss@^8.2.14, postcss@^8.4.21, postcss@^8.4.23, postcss@^8.4.27: - version "8.4.32" - resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.32.tgz#1dac6ac51ab19adb21b8b34fd2d93a86440ef6c9" - integrity sha512-D/kj5JNu6oo2EIy+XL/26JEDTlIbB8hw85G8StOE6L74RQAVVP5rej6wxCNqyMbR4RkPfqvezVbPw81Ngd6Kcw== +postcss@8.4.33, postcss@^8.2.14, postcss@^8.4.21, postcss@^8.4.23, postcss@^8.4.32: + version "8.4.33" + resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.33.tgz#1378e859c9f69bf6f638b990a0212f43e2aaa742" + integrity sha512-Kkpbhhdjw2qQs2O2DGX+8m5OVqEcbB9HRBvuYM9pgrjEFUg30A9LmXNlTAUj4S9kgtGyrMbTzVjH7E+s5Re2yg== dependencies: nanoid "^3.3.7" picocolors "^1.0.0" @@ -10347,10 +9664,10 @@ prettier-linter-helpers@^1.0.0: dependencies: fast-diff "^1.1.2" -prettier@^3.1.1: - version "3.1.1" - resolved "https://registry.yarnpkg.com/prettier/-/prettier-3.1.1.tgz#6ba9f23165d690b6cbdaa88cb0807278f7019848" - integrity sha512-22UbSzg8luF4UuZtzgiUOfcGM8s4tjBv6dJRT7j275NXsy2jb4aJa4NNveul5x4eqlF1wuhuR2RElK71RvmVaw== +prettier@^3.2.2: + version "3.2.2" + resolved "https://registry.yarnpkg.com/prettier/-/prettier-3.2.2.tgz#96e580f7ca9c96090ad054616c0c4597e2844b65" + integrity sha512-HTByuKZzw7utPiDO523Tt2pLtEyK7OibUD9suEJQrPUCYQqrHr74GGX6VidMrovbf/I50mPqr8j/II6oBAuc5A== pretty-bytes@^5.3.0: version "5.6.0" @@ -10499,7 +9816,7 @@ randombytes@^2.1.0: dependencies: safe-buffer "^5.1.0" -range-parser@^1.2.1, range-parser@~1.2.0, range-parser@~1.2.1: +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== @@ -10514,7 +9831,7 @@ raw-body@2.5.1: iconv-lite "0.4.24" unpipe "1.0.0" -raw-body@2.5.2, raw-body@^2.3.2: +raw-body@2.5.2: version "2.5.2" resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.5.2.tgz#99febd83b90e08975087e8f1f9419a149366b68a" integrity sha512-8zGqypfENjCIqGhgXToC8aB2r7YrBX+AQAfIPs/Mlk+BtPTztOvTS01NRW/3Eh60J+a48lt8qsCzirQ6loCVfA== @@ -10775,14 +10092,6 @@ resolve@1.22.8, resolve@^1.1.5, resolve@^1.10.0, resolve@^1.14.2, resolve@^1.22. path-parse "^1.0.7" supports-preserve-symlinks-flag "^1.0.0" -resp-modifier@6.0.2: - version "6.0.2" - resolved "https://registry.yarnpkg.com/resp-modifier/-/resp-modifier-6.0.2.tgz#b124de5c4fbafcba541f48ffa73970f4aa456b4f" - integrity sha512-U1+0kWC/+4ncRFYqQWTx/3qkfE6a4B/h3XXgmXypfa0SPZ3t7cbbaFk297PjQS/yov24R18h6OZe6iZwj3NSLw== - dependencies: - debug "^2.2.0" - minimatch "^3.0.2" - restore-cursor@^3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-3.1.0.tgz#39f67c54b3a7a58cea5236d95cf0034239631f7e" @@ -10833,11 +10142,26 @@ rimraf@~2.6.2: dependencies: glob "^7.1.3" -rollup@^3.27.1: - version "3.29.4" - resolved "https://registry.yarnpkg.com/rollup/-/rollup-3.29.4.tgz#4d70c0f9834146df8705bfb69a9a19c9e1109981" - integrity sha512-oWzmBZwvYrU0iJHtDmhsm662rC15FRXmcjCk1xD771dFDx5jJ02ufAQQTn0etB2emNk4J9EZg/yWKpsn9BWGRw== +rollup@^4.2.0: + version "4.9.5" + resolved "https://registry.yarnpkg.com/rollup/-/rollup-4.9.5.tgz#62999462c90f4c8b5d7c38fc7161e63b29101b05" + integrity sha512-E4vQW0H/mbNMw2yLSqJyjtkHY9dslf/p0zuT1xehNRqUTBOFMqEjguDvqhXr7N7r/4ttb2jr4T41d3dncmIgbQ== + dependencies: + "@types/estree" "1.0.5" optionalDependencies: + "@rollup/rollup-android-arm-eabi" "4.9.5" + "@rollup/rollup-android-arm64" "4.9.5" + "@rollup/rollup-darwin-arm64" "4.9.5" + "@rollup/rollup-darwin-x64" "4.9.5" + "@rollup/rollup-linux-arm-gnueabihf" "4.9.5" + "@rollup/rollup-linux-arm64-gnu" "4.9.5" + "@rollup/rollup-linux-arm64-musl" "4.9.5" + "@rollup/rollup-linux-riscv64-gnu" "4.9.5" + "@rollup/rollup-linux-x64-gnu" "4.9.5" + "@rollup/rollup-linux-x64-musl" "4.9.5" + "@rollup/rollup-win32-arm64-msvc" "4.9.5" + "@rollup/rollup-win32-ia32-msvc" "4.9.5" + "@rollup/rollup-win32-x64-msvc" "4.9.5" fsevents "~2.3.2" run-applescript@^5.0.0: @@ -10864,11 +10188,6 @@ rw@1: resolved "https://registry.yarnpkg.com/rw/-/rw-1.3.3.tgz#3f862dfa91ab766b14885ef4d01124bfda074fb4" integrity sha512-PdhdWy89SiZogBLaw42zdeqtRJ//zFd2PgQavcICDUgJT5oW10QCRKbJ6bg4r0/UY2M6BWd5tkxuGFRvCkgfHQ== -rx@4.1.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/rx/-/rx-4.1.0.tgz#a5f13ff79ef3b740fe30aa803fb09f98805d4782" - integrity sha512-CiaiuN6gapkdl+cZUr67W6I8jquN4lkak3vtIsIWCl4XIPP8ffsoyN6/+PuGXnQy8Cu8W2y9Xxh31Rq4M6wUug== - rxjs@6.6.7: version "6.6.7" resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.6.7.tgz#90ac018acabf491bf65044235d5863c4dab804c9" @@ -10917,17 +10236,17 @@ safe-regex-test@^1.0.0: resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a" integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg== -sass-loader@13.3.2: - version "13.3.2" - resolved "https://registry.yarnpkg.com/sass-loader/-/sass-loader-13.3.2.tgz#460022de27aec772480f03de17f5ba88fa7e18c6" - integrity sha512-CQbKl57kdEv+KDLquhC+gE3pXt74LEAzm+tzywcA0/aHZuub8wTErbjAoNI57rPUWRYRNC5WUnNl8eGJNbDdwg== +sass-loader@13.3.3: + version "13.3.3" + resolved "https://registry.yarnpkg.com/sass-loader/-/sass-loader-13.3.3.tgz#60df5e858788cffb1a3215e5b92e9cba61e7e133" + integrity sha512-mt5YN2F1MOZr3d/wBRcZxeFgwgkH44wVc2zohO2YF6JiOMkiXe4BYRZpSu2sO1g71mo/j16txzUhsKZlqjVGzA== dependencies: neo-async "^2.6.2" -sass@1.69.5: - version "1.69.5" - resolved "https://registry.yarnpkg.com/sass/-/sass-1.69.5.tgz#23e18d1c757a35f2e52cc81871060b9ad653dfde" - integrity sha512-qg2+UCJibLr2LCVOt3OlPhr/dqVHWOa9XtZf2OjbLs/T4VPSJ00udtgJxH3neXZm+QqX8B+3cU7RaLqp1iVfcQ== +sass@1.69.7: + version "1.69.7" + resolved "https://registry.yarnpkg.com/sass/-/sass-1.69.7.tgz#6e7e1c8f51e8162faec3e9619babc7da780af3b7" + integrity sha512-rzj2soDeZ8wtE2egyLXgOOHQvaC2iosZrkF6v3EUG+tBwEvhqUCzm0VP3k9gHF9LXbSrRhT5SksoI56Iw8NPnQ== dependencies: chokidar ">=3.0.0 <4.0.0" immutable "^4.0.0" @@ -11006,25 +10325,6 @@ semver@^6.0.0, semver@^6.3.0, semver@^6.3.1: resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.1.tgz#556d2ef8689146e46dcea4bfdd095f3434dffcb4" integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA== -send@0.16.2: - version "0.16.2" - resolved "https://registry.yarnpkg.com/send/-/send-0.16.2.tgz#6ecca1e0f8c156d141597559848df64730a6bbc1" - integrity sha512-E64YFPUssFHEFBvpbbjr44NCLtI1AohxQ8ZSiJjQLskAdKuriYEP6VyGEsRDH8ScozGpkaX1BGvhanqCwkcEZw== - 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.6.2" - mime "1.4.1" - ms "2.0.0" - on-finished "~2.3.0" - range-parser "~1.2.0" - statuses "~1.4.0" - send@0.18.0, send@latest: version "0.18.0" resolved "https://registry.yarnpkg.com/send/-/send-0.18.0.tgz#670167cc654b05f5aa4a767f9113bb371bc706be" @@ -11051,7 +10351,7 @@ serialize-javascript@^6.0.0, serialize-javascript@^6.0.1: dependencies: randombytes "^2.1.0" -serve-index@1.9.1, serve-index@^1.9.1: +serve-index@^1.9.1: version "1.9.1" resolved "https://registry.yarnpkg.com/serve-index/-/serve-index-1.9.1.tgz#d3768d69b1e7d82e5ce050fff5b453bea12a9239" integrity sha512-pXHfKNP4qujrtteMrSBb0rc8HJ9Ms/GrXwcUtUtD5s4ewDJI8bT3Cz2zTVRMKtri49pLx2e0Ya8ziP5Ya2pZZw== @@ -11064,16 +10364,6 @@ serve-index@1.9.1, serve-index@^1.9.1: mime-types "~2.1.17" parseurl "~1.3.2" -serve-static@1.13.2: - version "1.13.2" - resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.13.2.tgz#095e8472fd5b46237db50ce486a43f4b86c6cec1" - integrity sha512-p/tdJrO4U387R9oMjb1oj7qSMaMfmOyd4j9hOFoxZe2baQszgHcSWjuya/CiT5kgZZKRudHNOA0pYXOl8rQ5nw== - dependencies: - encodeurl "~1.0.2" - escape-html "~1.0.3" - parseurl "~1.3.2" - send "0.16.2" - serve-static@1.15.0: version "1.15.0" resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.15.0.tgz#faaef08cffe0a1a62f60cad0c4e513cff0ac9540" @@ -11084,11 +10374,6 @@ serve-static@1.15.0: parseurl "~1.3.3" send "0.18.0" -server-destroy@1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/server-destroy/-/server-destroy-1.0.1.tgz#f13bf928e42b9c3e79383e61cc3998b5d14e6cdd" - integrity sha512-rb+9B5YBIEzYcD6x2VKidaa+cqYBJQKnU4oe4E3ANwRRN56yk/ua1YCJT1n21NTS8w6CcOclAKNP3PhdCXKYtQ== - set-blocking@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7" @@ -11255,16 +10540,6 @@ socket.io-adapter@~2.5.2: dependencies: ws "~8.11.0" -socket.io-client@^4.4.1: - version "4.7.2" - resolved "https://registry.yarnpkg.com/socket.io-client/-/socket.io-client-4.7.2.tgz#f2f13f68058bd4e40f94f2a1541f275157ff2c08" - integrity sha512-vtA0uD4ibrYD793SOIAwlo8cj6haOeMHrGvwPxJsxH7CeIksqJ+3Zc06RvWTIFgiSqx4A3sOnTXpfAEE2Zyz6w== - dependencies: - "@socket.io/component-emitter" "~3.1.0" - debug "~4.3.2" - engine.io-client "~6.5.2" - socket.io-parser "~4.2.4" - socket.io-parser@~4.2.4: version "4.2.4" resolved "https://registry.yarnpkg.com/socket.io-parser/-/socket.io-parser-4.2.4.tgz#c806966cf7270601e47469ddeec30fbdfda44c83" @@ -11344,12 +10619,11 @@ source-map-explorer@^2.5.3: resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.0.2.tgz#adbc361d9c62df380125e7f161f71c826f1e490c" integrity sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw== -source-map-loader@4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/source-map-loader/-/source-map-loader-4.0.1.tgz#72f00d05f5d1f90f80974eda781cbd7107c125f2" - integrity sha512-oqXpzDIByKONVY8g1NUPOTQhe0UTU5bWUl32GSkqK2LjJj0HmwTMVKxcUip0RgAYhY1mqgOxjbQM48a0mmeNfA== +source-map-loader@5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/source-map-loader/-/source-map-loader-5.0.0.tgz#f593a916e1cc54471cfc8851b905c8a845fc7e38" + integrity sha512-k2Dur7CbSLcAH73sBcIkV5xjPV4SzqO1NJ7+XaQl8if3VODDUj3FNchNGpqgJSKbvUfJuhVdv8K2Eu8/TNl2eA== dependencies: - abab "^2.0.6" iconv-lite "^0.6.3" source-map-js "^1.0.2" @@ -11551,16 +10825,6 @@ statuses@2.0.1: resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c" integrity sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA== -statuses@~1.3.1: - version "1.3.1" - resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.3.1.tgz#faf51b9eb74aaef3b3acf4ad5f61abf24cb7b93e" - integrity sha512-wuTCPGlJONk/a1kqZ4fQM2+908lC7fa7nPYpTC1EhnvqLX/IICbeP1OZGDtA374trpSq68YubKUMo8oRhN46yg== - -statuses@~1.4.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.4.0.tgz#bb73d446da2796106efcc1b601a253d6c46bd087" - integrity sha512-zhSCtt8v2NDrRlPQpCNtw/heZLtfUDqxBM1udqikb/Hbk52LK4nQSwr10u77iopCW5LsyHpuXS0GnEc48mLeew== - stop-iteration-iterator@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/stop-iteration-iterator/-/stop-iteration-iterator-1.0.0.tgz#6a60be0b4ee757d1ed5254858ec66b10c49285e4" @@ -11581,14 +10845,6 @@ stream-shift@^1.0.0: resolved "https://registry.yarnpkg.com/stream-shift/-/stream-shift-1.0.1.tgz#d7088281559ab2778424279b0877da3c392d5a3d" integrity sha512-AiisoFqQ0vbGcZgQPY1cdP2I76glaVA/RauYR4G4thNFgkTqr90yXTo4LYX60Jl+sIlPNHHdGSwo01AvbKUSVQ== -stream-throttle@^0.1.3: - version "0.1.3" - resolved "https://registry.yarnpkg.com/stream-throttle/-/stream-throttle-0.1.3.tgz#add57c8d7cc73a81630d31cd55d3961cfafba9c3" - integrity sha512-889+B9vN9dq7/vLbGyuHeZ6/ctf5sNuGWsDy89uNxkFTAgzy0eK7+w5fL3KLNRTkLle7EgZGvHUphZW0Q26MnQ== - dependencies: - commander "^2.2.0" - limiter "^1.0.5" - stream@^0.0.2: version "0.0.2" resolved "https://registry.yarnpkg.com/stream/-/stream-0.0.2.tgz#7f5363f057f6592c5595f00bc80a27f5cec1f0ef" @@ -11849,10 +11105,10 @@ terser-webpack-plugin@^5.3.7: serialize-javascript "^6.0.1" terser "^5.16.8" -terser@5.24.0, terser@^5.16.8: - version "5.24.0" - resolved "https://registry.yarnpkg.com/terser/-/terser-5.24.0.tgz#4ae50302977bca4831ccc7b4fef63a3c04228364" - integrity sha512-ZpGR4Hy3+wBEzVEnHvstMvqpD/nABNelQn/z2r0fjVWGQsN3bpOLzQlqDxmb4CDZnXq5lpjnQ+mHQLAOpfM5iw== +terser@5.26.0, terser@^5.16.8: + version "5.26.0" + resolved "https://registry.yarnpkg.com/terser/-/terser-5.26.0.tgz#ee9f05d929f4189a9c28a0feb889d96d50126fe1" + integrity sha512-dytTGoE2oHgbNV9nTzgBEPaqAWvcJNl66VZ0BkJqlvp71IjO8CxdBx/ykCNb47cLnCmCvRZ6ZR0tLkqvZCdVBQ== dependencies: "@jridgewell/source-map" "^0.3.3" acorn "^8.8.2" @@ -12165,11 +11421,6 @@ ua-parser-js@^0.7.30: resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.35.tgz#8bda4827be4f0b1dda91699a29499575a1f1d307" integrity sha512-veRf7dawaj9xaWEu9HoTVn5Pggtc/qj+kqTOFvNiN1l0YdxwC1kvel57UCjThjGa3BHBihE8/UJAHI+uQHmd/g== -ua-parser-js@^1.0.33: - version "1.0.37" - resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-1.0.37.tgz#b5dc7b163a5c1f0c510b08446aed4da92c46373f" - integrity sha512-bhTyI94tZofjo+Dn8SN6Zv8nBDvyXTymAdM3LDI/0IboIUwTu1rEhW7v2TfiVsoYWgkQ4kOVqnI8APUFbIQIFQ== - uglify-js@^3.1.4: version "3.17.4" resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.17.4.tgz#61678cf5fa3f5b7eb789bb345df29afb8257c22c" @@ -12195,7 +11446,14 @@ undici-types@~5.26.4: resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-5.26.5.tgz#bcd539893d00b56e964fd2657a4866b221a65617" integrity sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA== -undici@5.27.2, undici@^5.21.2: +undici@6.2.1: + version "6.2.1" + resolved "https://registry.yarnpkg.com/undici/-/undici-6.2.1.tgz#554293044619e065d986c37a4c92185c3bc02121" + integrity sha512-7Wa9thEM6/LMnnKtxJHlc8SrTlDmxqJecgz1iy8KlsN0/iskQXOQCuPkrZLXbElPaSw5slFFyKIKXyJ3UtbApw== + dependencies: + "@fastify/busboy" "^2.0.0" + +undici@^5.21.2: version "5.27.2" resolved "https://registry.yarnpkg.com/undici/-/undici-5.27.2.tgz#a270c563aea5b46cc0df2550523638c95c5d4411" integrity sha512-iS857PdOEy/y3wlM3yRp+6SNQQ6xU0mmZcwRSriqk+et/cwWAtwmIGf6WkoDN2EK/AMdCO/dfXzIwi+rFMrjjQ== @@ -12365,16 +11623,16 @@ vis@^4.21.0-EOL: moment "^2.18.1" propagating-hammerjs "^1.4.6" -vite@4.5.1: - version "4.5.1" - resolved "https://registry.yarnpkg.com/vite/-/vite-4.5.1.tgz#3370986e1ed5dbabbf35a6c2e1fb1e18555b968a" - integrity sha512-AXXFaAJ8yebyqzoNB9fu2pHoo/nWX+xZlaRwoeYUxEqBO+Zj4msE5G+BhGBll9lYEKv9Hfks52PAF2X7qDYXQA== +vite@5.0.11: + version "5.0.11" + resolved "https://registry.yarnpkg.com/vite/-/vite-5.0.11.tgz#31562e41e004cb68e1d51f5d2c641ab313b289e4" + integrity sha512-XBMnDjZcNAw/G1gEiskiM1v6yzM4GE5aMGvhWTlHAYYhxb7S3/V1s3m2LDHa8Vh6yIWYYB0iJwsEaS523c4oYA== dependencies: - esbuild "^0.18.10" - postcss "^8.4.27" - rollup "^3.27.1" + esbuild "^0.19.3" + postcss "^8.4.32" + rollup "^4.2.0" optionalDependencies: - fsevents "~2.3.2" + fsevents "~2.3.3" void-elements@^2.0.0: version "2.0.1" @@ -12386,7 +11644,7 @@ w3c-keyname@^2.2.4: resolved "https://registry.yarnpkg.com/w3c-keyname/-/w3c-keyname-2.2.8.tgz#7b17c8c6883d4e8b86ac8aba79d39e880f8869c5" integrity sha512-dpojBhNsCNN7T82Tm7k26A6G9ML3NkhDsnw9n/eoxSRlVBB4CEtIQ/KTCLI2Fwf3ataSXRhYFkQi3SlnFwPvPQ== -watchpack@^2.4.0: +watchpack@2.4.0, watchpack@^2.4.0: version "2.4.0" resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-2.4.0.tgz#fa33032374962c78113f93c7f2fb4c54c9862a5d" integrity sha512-Lcvm7MGST/4fup+ifyKi2hjyIAwcdI4HRgtvTpIUxBRhB+RFtUh8XtDOxUfctVCnhVi+QQj49i91OyvzkJl6cg== @@ -12730,11 +11988,6 @@ xmldoc@^1.1.2: dependencies: sax "^1.2.4" -xmlhttprequest-ssl@~2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/xmlhttprequest-ssl/-/xmlhttprequest-ssl-2.0.0.tgz#91360c86b914e67f44dce769180027c0da618c67" - integrity sha512-QKxVRxiRACQcVuQEYFsI1hhkrMlrXHPegbbd1yn9UHOmRxY+si12nQYzri3vbzt8VdTTRviqcKxcyllFas5z2A== - xtend@^4.0.2, xtend@~4.0.1: version "4.0.2" resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.2.tgz#bb72779f5fa465186b1f438f674fa347fdb5db54" @@ -12770,20 +12023,7 @@ yargs-parser@^20.2.2, yargs-parser@^20.2.3: resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.9.tgz#2eb7dc3b0289718fc295f362753845c41a0c94ee" integrity sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w== -yargs@17.1.1: - 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" - -yargs@17.7.2, yargs@^17.0.0, yargs@^17.2.1, yargs@^17.3.1, yargs@^17.6.2: +yargs@17.7.2, yargs@^17.0.0, yargs@^17.2.1, yargs@^17.6.2: version "17.7.2" resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.7.2.tgz#991df39aca675a192b816e1e0363f9d75d2aa269" integrity sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==