From d1426bb99721f46dbee39e63df83d440ff2fbe2f Mon Sep 17 00:00:00 2001 From: Aaron Helton Date: Fri, 22 Mar 2024 08:04:40 -0400 Subject: [PATCH 01/22] scaffolding --- dlx_rest/static/js/modals/export.js | 59 +++++++++++++++++++++++++++++ dlx_rest/static/js/search/search.js | 10 ++++- 2 files changed, 68 insertions(+), 1 deletion(-) create mode 100644 dlx_rest/static/js/modals/export.js diff --git a/dlx_rest/static/js/modals/export.js b/dlx_rest/static/js/modals/export.js new file mode 100644 index 00000000..6e8d035e --- /dev/null +++ b/dlx_rest/static/js/modals/export.js @@ -0,0 +1,59 @@ +import { Jmarc } from "../jmarc.mjs" + +export let exportmodal = { + props: ["links"], + template: `
+ +
+
+
+
+
+
Export Results
+ +
+
+ +
+
+
+ +
+
+
+
+
+ +
`, + data: function() { + return { + collection: null, + recordId: null, + showModal: false, + record: null, + showSpinner: false + } + }, + methods: { + show: async function() { + Jmarc.apiUrl = this.api_prefix + if (this.collection && this.recordId) { + this.showSpinner = true + Jmarc.get(this.collection, this.recordId).then(jmarc => { + // The normal way to set things like this is to use a reactive data property + // But we can also just set the innerText to what we get here, which preserves + // the newline characters + let previewText = document.getElementById("preview-text") + previewText.innerText = jmarc.toStr() + }).then( () => {this.showSpinner = false}) + } else { + this.showModal = false + } + this.showModal = true + } + } +} \ No newline at end of file diff --git a/dlx_rest/static/js/search/search.js b/dlx_rest/static/js/search/search.js index adbfff59..b81538e0 100644 --- a/dlx_rest/static/js/search/search.js +++ b/dlx_rest/static/js/search/search.js @@ -3,6 +3,7 @@ import { countcomponent } from "./count.js"; import basket from "../api/basket.js"; import user from "../api/user.js"; import { Jmarc } from "../jmarc.mjs"; +import { exportmodal } from "../modals/export.js"; export let searchcomponent = { // onclick="addRemoveBasket("add","{{record['id']}}","{{coll}}","{{prefix}}")" @@ -155,6 +156,7 @@ export let searchcomponent = { None Send Selected to Basket (limit: 100) Speech Review +
@@ -215,6 +217,7 @@ export let searchcomponent = {
  • Next
    • +
    `, data: function () { let myParams = this.search_url.split("?")[1]; @@ -812,10 +815,15 @@ export let searchcomponent = { let toggleButton = document.getElementById("preview-toggle-" + recordId); toggleButton.className = "fas fa-file preview-toggle"; toggleButton.title = "preview record"; + }, + showExportModal() { + console.log(this.links.format) + this.$refs.exportmodal.show() } }, components: { 'sortcomponent': sortcomponent, - 'countcomponent': countcomponent + 'countcomponent': countcomponent, + 'exportmodal': exportmodal } } \ No newline at end of file From c1656c02392bb3f96838850cec2c682ad970de20 Mon Sep 17 00:00:00 2001 From: Aaron Helton Date: Fri, 22 Mar 2024 09:58:45 -0400 Subject: [PATCH 02/22] add format selector --- dlx_rest/static/js/modals/export.js | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlx_rest/static/js/modals/export.js b/dlx_rest/static/js/modals/export.js index 6e8d035e..a0981023 100644 --- a/dlx_rest/static/js/modals/export.js +++ b/dlx_rest/static/js/modals/export.js @@ -19,6 +19,14 @@ export let exportmodal = { Loading...
    +
    + Select format + +
    From 633a13961c6119ecb39618dede12dda255bf1371 Mon Sep 17 00:00:00 2001 From: Aaron Helton Date: Fri, 22 Mar 2024 15:49:58 -0400 Subject: [PATCH 03/22] Basic interaction --- dlx_rest/static/js/modals/export.js | 40 ++++++++++++++--------------- 1 file changed, 19 insertions(+), 21 deletions(-) diff --git a/dlx_rest/static/js/modals/export.js b/dlx_rest/static/js/modals/export.js index a0981023..9730fac9 100644 --- a/dlx_rest/static/js/modals/export.js +++ b/dlx_rest/static/js/modals/export.js @@ -22,12 +22,16 @@ export let exportmodal = {
    Select format
    -
    +
    +
    + {{record.toString()}} +
    +
    @@ -39,29 +43,23 @@ export let exportmodal = {
    `, data: function() { return { - collection: null, - recordId: null, showModal: false, - record: null, - showSpinner: false + showSpinner: false, + selectedExportUrl: this["links"], + results: [] } }, methods: { show: async function() { - Jmarc.apiUrl = this.api_prefix - if (this.collection && this.recordId) { - this.showSpinner = true - Jmarc.get(this.collection, this.recordId).then(jmarc => { - // The normal way to set things like this is to use a reactive data property - // But we can also just set the innerText to what we get here, which preserves - // the newline characters - let previewText = document.getElementById("preview-text") - previewText.innerText = jmarc.toStr() - }).then( () => {this.showSpinner = false}) - } else { - this.showModal = false - } this.showModal = true + }, + setFormat(format) { + let exportUrl = this["links"][format.toUpperCase()] + let previewUrl = this["links"]["brief"].replace(/\&limit=\d{1,3}/, "&limit=5") + fetch(previewUrl).then(response => response.json().then( jsonData => { + console.log(jsonData) + this.results = jsonData.data + })) } } } \ No newline at end of file From 4d8a2230187cdb5c084796801261809ce771e8a1 Mon Sep 17 00:00:00 2001 From: Aaron Helton Date: Fri, 5 Apr 2024 09:05:43 -0400 Subject: [PATCH 04/22] use links object and enable download --- dlx_rest/static/js/modals/export.js | 45 ++++++++++++++++++++++------- dlx_rest/static/js/search/search.js | 6 ++-- 2 files changed, 37 insertions(+), 14 deletions(-) diff --git a/dlx_rest/static/js/modals/export.js b/dlx_rest/static/js/modals/export.js index 9730fac9..bc63ce3d 100644 --- a/dlx_rest/static/js/modals/export.js +++ b/dlx_rest/static/js/modals/export.js @@ -1,7 +1,11 @@ import { Jmarc } from "../jmarc.mjs" export let exportmodal = { - props: ["links"], + props: { + links: { + type: Object + } + }, template: `
    @@ -22,9 +26,9 @@ export let exportmodal = {
    Select format
    @@ -45,7 +49,7 @@ export let exportmodal = { return { showModal: false, showSpinner: false, - selectedExportUrl: this["links"], + selectedExportUrl: null, results: [] } }, @@ -54,12 +58,31 @@ export let exportmodal = { this.showModal = true }, setFormat(format) { - let exportUrl = this["links"][format.toUpperCase()] - let previewUrl = this["links"]["brief"].replace(/\&limit=\d{1,3}/, "&limit=5") - fetch(previewUrl).then(response => response.json().then( jsonData => { - console.log(jsonData) - this.results = jsonData.data - })) + this.selectedExportUrl = this.links.format[format.toUpperCase()] + this.submitExport(format) + }, + setOutputFields(fields) { + if (this.selectedExportUrl) { + this.selectedExportUrl = `${this.selectedExportUrl}&of=${encodeURIComponent(fields)}` + } + }, + submitExport(format) { + fetch(this.selectedExportUrl).then( response => { + response.blob().then( blob => { + this.download(blob, `export.${format}`) + }) + }) + }, + download(blob, filename) { + const url = window.URL.createObjectURL(blob) + const a = document.createElement("a") + a.style.display = "none" + a.href = url + a.download = filename + document.body.appendChild(a) + a.click() + document.body.removeChild(a) + window.URL.revokeObjectURL(url) } } } \ No newline at end of file diff --git a/dlx_rest/static/js/search/search.js b/dlx_rest/static/js/search/search.js index b81538e0..b5931d0a 100644 --- a/dlx_rest/static/js/search/search.js +++ b/dlx_rest/static/js/search/search.js @@ -217,7 +217,7 @@ export let searchcomponent = {
  • Next
    • - +
    `, data: function () { let myParams = this.search_url.split("?")[1]; @@ -339,7 +339,7 @@ export let searchcomponent = { this.vcoll = "089:'B23'" this.collectionTitle = "votes" } - console.log(this.collectionTitle) + //console.log(this.collectionTitle) let myEnd = component.params.start + component.params.limit -1; component.end = myEnd; @@ -817,7 +817,7 @@ export let searchcomponent = { toggleButton.title = "preview record"; }, showExportModal() { - console.log(this.links.format) + //console.log(this.links.format) this.$refs.exportmodal.show() } }, From ddd4aea1dd51e8914ddcb3d0930e19b62a07829e Mon Sep 17 00:00:00 2001 From: jbukhari Date: Wed, 17 Apr 2024 13:41:16 -0400 Subject: [PATCH 05/22] Merge master (#1400) * Re-apply URI encoding for browse URLs (#1326) * Encode URI components in browse * encode additional uri components in browse.js * Add 596 to speeches search results (#1376) * exploring issue * add 596 to brief output * Display 596 in speech results Fixes #1361 * Display all 491 and 591 subfields in authority results (#1375) Fixes #1344 * Add UI for uploading MARC records (#1377) * start scaffolding upload * start parsing * basic functionality * restructure * continue building import * get auth choices? * auth lookup scaffold * parse mrk for multiple records and complete POST; styling * styling * interactivity * styling * testing * use different authExists function * deactivate import UI for records that have fatal errors * set workflow state and enable select all/none * finish select options and tie into mass submit * improve messaging and reinit * add link to review * move import link * 1377 patch: implement auth validation at subfield level (#1378) * implement auth validation at subfield level * bugfix; error handling --------- Co-authored-by: jbukhari --------- Co-authored-by: jbukhari Co-authored-by: jbukhari * MRK import optimization/UX (#1380) * Employ concurrency in xref lookup/assign; add pending spinner while waiting for preview * records detected spinner * cleanup; update symbolInUse --------- Co-authored-by: jbukhari * newline split (#1382) Co-authored-by: jbukhari Co-authored-by: Aaron Helton * Bump werkzeug from 2.2.3 to 2.3.8 (#1386) * Bump werkzeug from 2.2.3 to 2.3.8 Bumps [werkzeug](https://github.com/pallets/werkzeug) from 2.2.3 to 2.3.8. - [Release notes](https://github.com/pallets/werkzeug/releases) - [Changelog](https://github.com/pallets/werkzeug/blob/main/CHANGES.rst) - [Commits](https://github.com/pallets/werkzeug/compare/2.2.3...2.3.8) --- updated-dependencies: - dependency-name: werkzeug dependency-type: direct:production ... Signed-off-by: dependabot[bot] * upgrade click, upgrade Flask, upgrade flask-wtf, upgrade lxml, upgrade PyYaml and replace flask-mongoengine (dead) with flask-mongoengine-3 --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Aaron Helton * Basket optimizations (#1383) * item lock db query optimization * pass tests * adding items to basket optimization * move back to __init__for now * regex char escape --------- Co-authored-by: jbukhari * Browse index bugfix (#1390) * update dlx * update requirements for compatiblity --------- Co-authored-by: J. Bukhari * update dlx (#1391) Co-authored-by: J. Bukhari * remove unsafe use of locals() to pass route parameters (#1393) Co-authored-by: J. Bukhari * revert lost changes (#1396) Co-authored-by: J. Bukhari * Bump idna from 3.3 to 3.7 (#1394) Bumps [idna](https://github.com/kjd/idna) from 3.3 to 3.7. - [Release notes](https://github.com/kjd/idna/releases) - [Changelog](https://github.com/kjd/idna/blob/master/HISTORY.rst) - [Commits](https://github.com/kjd/idna/compare/v3.3...v3.7) --- updated-dependencies: - dependency-name: idna dependency-type: direct:production ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --------- Signed-off-by: dependabot[bot] Co-authored-by: Aaron Helton Co-authored-by: jbukhari Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- dlx_rest/api/__init__.py | 86 ++++---- dlx_rest/api/utils.py | 30 ++- dlx_rest/config.py | 2 +- dlx_rest/models.py | 10 +- dlx_rest/routes.py | 9 +- dlx_rest/static/js/import.js | 293 +++++++++++++++++++++++++++ dlx_rest/static/js/jmarc.mjs | 139 ++++++++++++- dlx_rest/static/js/modals/preview.js | 6 +- dlx_rest/static/js/search/browse.js | 14 +- dlx_rest/static/js/search/search.js | 4 + dlx_rest/static/js/speech_review.js | 2 +- dlx_rest/static/js/vm_import.js | 6 + dlx_rest/templates/base.html | 6 + dlx_rest/templates/import_marc.html | 9 + dlx_rest/tests/test_api.py | 5 - requirements.txt | 22 +- 16 files changed, 556 insertions(+), 87 deletions(-) create mode 100644 dlx_rest/static/js/import.js create mode 100644 dlx_rest/static/js/vm_import.js create mode 100644 dlx_rest/templates/import_marc.html diff --git a/dlx_rest/api/__init__.py b/dlx_rest/api/__init__.py index 188457ec..c0012aed 100644 --- a/dlx_rest/api/__init__.py +++ b/dlx_rest/api/__init__.py @@ -210,8 +210,6 @@ class RecordsList(Resource): @ns.doc(description='Return a list of MARC Bibliographic or Authority Records') @ns.expect(args) def get(self, collection): - route_params = locals() - route_params.pop('self') cls = ClassDispatch.batch_by_collection(collection) or abort(404) args = RecordsList.args.parse_args() @@ -250,14 +248,14 @@ def get(self, collection): abort(404, 'Maximum limit is 1000') if fmt == 'brief': - tags = ['191', '245', '269', '700', '710', '711', '791', '989', '991', '992'] if collection == 'bibs' \ - else ['100', '110', '111', '130', '150', '151', '190', '191', '400', '410', '411', '430', '450', '451', '490', '491'] + tags = ['191', '245', '269', '596', '700', '710', '711', '791', '989', '991', '992'] if collection == 'bibs' \ + else ['100', '110', '111', '130', '150', '151', '190', '191', '400', '410', '411', '430', '450', '451', '490', '491', '591'] # make sure logical fields are available for sorting tags += (list(DlxConfig.bib_logical_fields.keys()) + list(DlxConfig.auth_logical_fields.keys())) project = dict.fromkeys(tags, True) elif fmt == 'brief_speech': - tags = ['269', '700', '710', '711', '791', '991', '992'] + tags = ['269', '596', '700', '710', '711', '791', '991', '992'] # make sure logical fields are available for sorting tags += (list(DlxConfig.bib_logical_fields.keys()) + list(DlxConfig.auth_logical_fields.keys())) @@ -322,7 +320,7 @@ def get(self, collection): data.append(this_d) else: schema_name='api.urllist' - data = [URL('api_record', record_id=r.id, **route_params).to_str() for r in recordset] + data = [URL('api_record', collection=collection, record_id=r.id).to_str() for r in recordset] new_direction = 'desc' if args.direction in (None, 'asc') else 'asc' @@ -332,14 +330,14 @@ def get(self, collection): } links = { - '_self': URL('api_records_list', collection=collection, start=start, limit=limit, search=search, format=fmt, sort=sort_by, direction=args.direction).to_str(), + '_self': URL('api_records_list', collection=collection, **request.args).to_str(), '_next': URL('api_records_list', collection=collection, start=start+limit, limit=limit, search=search, format=fmt, sort=sort_by, direction=args.direction).to_str(), '_prev': URL('api_records_list', collection=collection, start=start-limit, limit=limit, search=search, format=fmt, sort=sort_by, direction=args.direction).to_str() if start - limit > 0 else None, 'format': { 'brief': URL('api_records_list', collection=collection, start=start, limit=limit, search=search, format='brief', sort=sort_by, direction=args.direction).to_str(), - 'list': URL('api_records_list', start=start, limit=limit, search=search, sort=sort_by, direction=args.direction, **route_params).to_str(), - 'XML': URL('api_records_list', start=start, limit=limit, search=search, format='xml', sort=sort_by, direction=args.direction, **route_params).to_str(), - 'MRK': URL('api_records_list', start=start, limit=limit, search=search, format='mrk', sort=sort_by, direction=args.direction, **route_params).to_str(), + 'list': URL('api_records_list', collection=collection, start=start, limit=limit, search=search, sort=sort_by, direction=args.direction).to_str(), + 'XML': URL('api_records_list', collection=collection, start=start, limit=limit, search=search, format='xml', sort=sort_by, direction=args.direction).to_str(), + 'MRK': URL('api_records_list', collection=collection, start=start, limit=limit, search=search, format='mrk', sort=sort_by, direction=args.direction).to_str(), }, 'sort': { 'updated': URL('api_records_list', collection=collection, start=start, limit=limit, search=search, format=fmt, sort='updated', direction=new_direction).to_str() @@ -364,13 +362,19 @@ def post(self, collection): user = current_user if request_loader(request) is None else request_loader(request) if args.format == 'mrk': - record = cls.from_mrk(request.data.decode()) if not has_permission(user, "createRecord", record, collection): abort(403, f'The current user is not authorized to perform this action.') try: - record.commit(user=user.username) + result = record.commit(user=user.username) + + if result: + data = {'result': URL('api_record', collection=collection, record_id=record.id).to_str()} + return data, 201 + else: + abort(500, 'POST request failed for unknown reasons') + except Exception as e: abort(400, str(e)) else: @@ -481,7 +485,7 @@ def get(self, collection): args = RecordsListBrowse.args.parse_args() cls = ClassDispatch.batch_by_collection(collection) or abort(404) querystring = request.args.get('search') or abort(400, 'Param "search" required') - match = re.match('^(\w+):(.*)', querystring) or abort(400, 'Invalid search string') + match = re.match('^(\\w+):(.*)', querystring) or abort(400, 'Invalid search string') field = match.group(1) value = match.group(2) logical_fields = DlxConfig.bib_logical_fields if collection == 'bibs' else DlxConfig.auth_logical_fields @@ -755,8 +759,6 @@ def get(self, collection, record_id): class RecordFieldsList(Resource): @ns.doc(description='Return a list of the fields in the record with the given record ID') def get(self, collection, record_id): - route_params = locals() - route_params.pop('self') cls = ClassDispatch.by_collection(collection) or abort(404) record = cls.from_id(record_id) or abort(404) @@ -775,7 +777,7 @@ def get(self, collection, record_id): ) links = { - '_self': URL('api_record_fields_list', **route_params).to_str(), + '_self': URL('api_record_fields_list', collection=collection, record_id=record_id).to_str(), 'related': { 'subfields': URL('api_record_subfields_list', collection=collection, record_id=record_id).to_str(), 'record': URL('api_record', collection=collection, record_id=record_id).to_str() @@ -798,9 +800,6 @@ def get(self, collection, record_id): class RecordFieldPlaceList(Resource): @ns.doc(description='Return a list of the instances of the field in the record') def get(self, collection, record_id, field_tag): - route_params = locals() - route_params.pop('self') - cls = ClassDispatch.by_collection(collection) or abort(404) record = cls.from_id(record_id) or abort(404) places = len(list(record.get_fields(field_tag))) @@ -808,11 +807,11 @@ def get(self, collection, record_id, field_tag): for place in range(0, places): field_places.append( - URL('api_record_field_place', field_place=place, **route_params).to_str() + URL('api_record_field_place', collection=collection, record_id=record_id, field_tag=field_tag, field_place=place).to_str() ) links = { - '_self': URL('api_record_field_place_list', **route_params).to_str(), + '_self': URL('api_record_field_place_list', collection=collection, record_id=record_id, field_tag=field_tag).to_str(), 'related': { 'fields': URL('api_record_fields_list', collection=collection, record_id=record_id).to_str(), 'subfields': URL('api_record_subfields_list', collection=collection, record_id=record_id).to_str() @@ -886,9 +885,6 @@ def post(self, collection, record_id, field_tag): class RecordFieldPlace(Resource): @ns.doc(description='Return the field at the given place in the record') def get(self, collection, record_id, field_tag, field_place): - route_params = locals() - route_params.pop('self') - cls = ClassDispatch.by_collection(collection) or abort(404) record = cls.from_id(record_id) or abort(404) field = record.get_field(field_tag, place=field_place) or abort(404) @@ -897,9 +893,9 @@ def get(self, collection, record_id, field_tag, field_place): links = { 'related': { 'fields': URL('api_record_fields_list', collection=collection, record_id=record_id).to_str(), - 'subfields': URL('api_record_field_place_subfield_list', **route_params).to_str() + 'subfields': URL('api_record_field_place_subfield_list', collection=collection, record_id=record_id, field_tag=field_tag, field_place=field_place).to_str() }, - '_self': URL('api_record_field_place', **route_params).to_str(), + '_self': URL('api_record_field_place', collection=collection, record_id=record_id, field_tag=field_tag, field_place=field_place).to_str(), } meta = { @@ -987,9 +983,6 @@ def delete(self, collection, record_id, field_tag, field_place): class RecordFieldPlaceSubfieldList(Resource): @ns.doc(description='Return a list of the subfields in the field') def get(self, collection, record_id, field_tag, field_place): - route_params = locals() - route_params.pop('self') - cls = ClassDispatch.by_collection(collection) or abort(404) record = cls.from_id(record_id) or abort(404) field = record.get_field(field_tag, place=field_place) or abort(404) @@ -997,25 +990,20 @@ def get(self, collection, record_id, field_tag, field_place): subfields, seen, place = [], {}, 0 for sub in field.subfields: - new_route_params = copy(route_params) - new_route_params['subfield_code'] = sub.code - if sub.code in seen: place += 1 else: place = 0 seen[sub.code] = True - - new_route_params['subfield_place'] = place subfields.append( - URL('api_record_field_subfield_value', subfield_place=place, subfield_code=sub.code, **route_params).to_str() + URL('api_record_field_subfield_value', collection=collection, record_id=record_id, field_tag=field_tag, field_place=field_place, subfield_place=place, subfield_code=sub.code).to_str() ) links = { - '_self': URL('api_record_field_place_subfield_list', **route_params).to_str(), + '_self': URL('api_record_field_place_subfield_list', collection=collection, record_id=record_id, field_tag=field_tag, field_place=field_place).to_str(), 'related': { - 'field': URL('api_record_field_place', **route_params).to_str() + 'field': URL('api_record_field_place', collection=collection, record_id=record_id, field_tag=field_tag, field_place=field_place,).to_str() } } @@ -1036,9 +1024,6 @@ def get(self, collection, record_id, field_tag, field_place): class RecordFieldPlaceSubfieldPlaceList(Resource): @ns.doc(description='Return a list of the subfields with the given code') def get(self, collection, record_id, field_tag, field_place, subfield_code): - route_params = locals() - route_params.pop('self') - cls = ClassDispatch.by_collection(collection) or abort(404) record = cls.from_id(record_id) or abort(404) @@ -1049,11 +1034,11 @@ def get(self, collection, record_id, field_tag, field_place, subfield_code): for place in range(0, len(list(subfields))): subfield_places.append( - URL('api_record_field_subfield_value', subfield_place=place, **route_params).to_str() + URL('api_record_field_subfield_value', collection=collection, record_id=record_id, field_tag=field_tag, field_place=field_place, subfield_code=subfield_code, subfield_place=place).to_str() ) links = { - '_self': URL('api_record_field_place_subfield_place_list', **route_params).to_str(), + '_self': URL('api_record_field_place_subfield_place_list', collection=collection, record_id=record_id, field_tag=field_tag, field_place=field_place, subfield_code=subfield_code, subfield_place=place).to_str(), 'related': { 'subfields': URL('api_record_field_place_subfield_list', collection=collection, record_id=record_id, field_tag=field_tag, field_place=field_place).to_str() } @@ -1077,15 +1062,12 @@ def get(self, collection, record_id, field_tag, field_place, subfield_code): class RecordFieldSubfieldValue(Resource): @ns.doc(description='Return the value of the subfield') def get(self, collection, record_id, field_tag, field_place, subfield_code, subfield_place): - route_params = locals() - route_params.pop('self') - cls = ClassDispatch.by_collection(collection) or abort(404) record = cls.from_id(record_id) or abort(404) value = record.get_value(field_tag, subfield_code, address=[field_place, subfield_place]) or abort(404) links = { - '_self': URL('api_record_field_subfield_value', **route_params).to_str(), + '_self': URL('api_record_field_subfield_value', collection=collection, record_id=record_id, field_tag=field_tag, field_place=field_place, subfield_code=subfield_code, subfield_place=subfield_place).to_str(), 'related': { #'record':URL('api_record', collection=collection, record_id=record_id).to_str(), 'subfields': URL('api_record_field_place_subfield_list', collection=collection, record_id=record_id,field_tag=field_tag, field_place=field_place).to_str() @@ -1106,9 +1088,6 @@ def get(self, collection, record_id, field_tag, field_place, subfield_code, subf class RecordSubfieldsList(Resource): @ns.doc(description='Return a list of all the subfields in the record with the given record') def get(self, collection, record_id): - route_params = locals() - route_params.pop('self') - cls = ClassDispatch.by_collection(collection) or abort(404) record = cls.from_id(record_id) or abort(404) @@ -1130,16 +1109,17 @@ def get(self, collection, record_id): subfields.append( URL( 'api_record_field_subfield_value', + collection=collection, + record_id=record_id, field_tag=field.tag, field_place=field_place, subfield_code=subfield.code, - subfield_place=subfield_place, - **route_params + subfield_place=subfield_place ).to_str() ) links = { - '_self': URL('api_record_subfields_list', **route_params).to_str(), + '_self': URL('api_record_subfields_list', collection=collection, record_id=record_id).to_str(), 'related': { 'record': URL('api_record', collection=collection, record_id=record_id).to_str() } @@ -1738,8 +1718,10 @@ def post(self): override = False if "override" in item.keys(): override = item["override"] + lock_status = item_locked(item['collection'], item['record_id']) this_u = User.objects.get(id=current_user.id) + if lock_status["locked"] == True: if lock_status["by"] == this_u.email: # It's locked, but by the current user diff --git a/dlx_rest/api/utils.py b/dlx_rest/api/utils.py index 1447d7c5..62f96928 100644 --- a/dlx_rest/api/utils.py +++ b/dlx_rest/api/utils.py @@ -5,10 +5,11 @@ import requests, json, jsonschema from copy import deepcopy from datetime import datetime, timezone +from dlx import DB from dlx import Config as DlxConfig from dlx_rest.config import Config from dlx.marc import Bib, BibSet, Auth, AuthSet -from dlx_rest.models import Basket +from dlx_rest.models import Basket, User from flask import abort as flask_abort, url_for, jsonify from flask_restx import reqparse @@ -203,8 +204,10 @@ def brief_bib(record): head = None agendas = [] + f596 = [] if "Speeches" in ctypes: agendas = [' '.join(field.get_values('a', 'b', 'c','d')) for field in record.get_fields('991')] + f596 = [' '.join(field.get_values('a')) for field in record.get_fields('596')] return { '_id': record.id, @@ -213,7 +216,8 @@ def brief_bib(record): 'title': head or '[No Title]', 'date': '; '.join(record.get_values('992', 'a') or record.get_values('269', 'a')), 'types': '; '.join(ctypes), - 'agendas': agendas + 'agendas': agendas, + 'f596': f596, } def brief_speech(record): @@ -237,16 +241,36 @@ def brief_speech(record): def brief_auth(record): digits = record.heading_field.tag[1:3] alt_tag = '4' + digits + alt_field = '; '.join(record.get_values(alt_tag)) + + if record.heading_field.tag == '191': + f491 = '; '.join(record.get_values('491','a','b','c','d')) + f591 = '; '.join(record.get_values('591','a','b','c','d')) + heading_alt_ary = [] + for f in [f491, f591]: + if len(f) > 0: + heading_alt_ary.append(f) + alt_field = '; '.join(heading_alt_ary) return { '_id': record.id, 'url': URL('api_record', collection='auths', record_id=record.id).to_str(), 'heading': '; '.join(map(lambda x: x.value, record.heading_field.subfields)), - 'alt': '; '.join(record.get_values(alt_tag, 'a')), + 'alt': alt_field, 'heading_tag': record.heading_field.tag } def item_locked(collection, record_id): + # mongoengine _get_collection method allows regular pymongo queries + basket = Basket._get_collection().find_one({"items.collection": collection, "items.record_id": str(record_id)}) + + if basket: + owner = User._get_collection().find_one({"_id": basket["owner"]}) + return {"locked": True, "in": basket["name"], "by": owner["email"], "item_id": basket["items"][0]['id']} + else: + return {"locked": False} + + # old for basket in Basket.objects: try: lock = list(filter(lambda x: x['record_id'] == str(record_id) and x['collection'] == collection, basket.items)) diff --git a/dlx_rest/config.py b/dlx_rest/config.py index 13badd01..75a7ba5d 100644 --- a/dlx_rest/config.py +++ b/dlx_rest/config.py @@ -14,7 +14,7 @@ class Config(object): connect_string = 'mongomock://localhost' TESTING = True LOGIN_DISABLED = True - dbname = 'dlx' + dbname = 'testing' ssl = False sync_log_collection = 'sync_log' elif 'DLX_REST_LOCAL' in os.environ: diff --git a/dlx_rest/models.py b/dlx_rest/models.py index df754cab..e772b465 100644 --- a/dlx_rest/models.py +++ b/dlx_rest/models.py @@ -161,11 +161,15 @@ def get_item_by_id(self, item_id): return this_item def get_item_by_coll_and_rid(self, collection, record_id): - return list(filter(lambda x: x['record_id'] == record_id and x['collection'] == collection, self.items))[0] + basket = Basket.objects(__raw__={"items.collection": collection, "items.record_id": str(record_id)}).first() + + if basket: + return next(filter(lambda x: x['collection'] == collection and x['record_id'] == record_id, basket.items), None) def add_item(self, item): - existing_item = list(filter(lambda x: x['collection'] == item['collection'] and x['record_id'] == item['record_id'], self.items)) - if len(existing_item) == 0: + existing_item = Basket._get_collection().find_one({"items.collection": item['collection'], "items.record_id": item['record_id']}) + + if not existing_item: ulid = ULID() item['id'] = str(ulid.to_uuid()) self.items.append(item) diff --git a/dlx_rest/routes.py b/dlx_rest/routes.py index d44cf2a3..6dad704a 100644 --- a/dlx_rest/routes.py +++ b/dlx_rest/routes.py @@ -763,8 +763,15 @@ def update_file(): except Exception as e: return e +@app.route('/import') +@login_required +#@requires_permission('importMarc') +def import_marc(): + this_prefix = url_for('doc', _external=True) + print(this_prefix) + return render_template('import_marc.html', api_prefix=this_prefix) @app.route('/reports/dashboard01', methods=["GET"]) @login_required def show_dashboard01(): - return render_template('dashboard01.html',vcoll="dashboard01", user=current_user.username) \ No newline at end of file + return render_template('dashboard01.html',vcoll="dashboard01", user=current_user.username) diff --git a/dlx_rest/static/js/import.js b/dlx_rest/static/js/import.js new file mode 100644 index 00000000..11371260 --- /dev/null +++ b/dlx_rest/static/js/import.js @@ -0,0 +1,293 @@ +import { Jmarc } from './jmarc.mjs' + +export let importcomponent = { + props: ["api_prefix"], + template: ` +
    +

    Import Records

    +
    +
    Select Files
    +

    Ensure that all records in the file are of the same type (bibs or auths).

    +
    +
    + Select Collection: + +
    +
    +
    +
    +

    Drag and Drop

    +

    or

    +

    + + +
    +
    +
    +
    +
    Preview
    +
    +
    +
    + Target collection: {{collection}}
    + Records detected: {{records.length}} + + +
    + Records with fatal errors preventing import: {{unimportableRecords}}
    + Invalid records that can still be imported: {{invalidRecords}} +
    +
    + +
    +
    Select All | None
    +
    +
    +
    +
    + +
    +
    + + +
    + +
    +
    +
    {{records.length}} {{this.collection.replace("s","")}} record(s)
    +
    +
    + +
    + +
    +
    +
    +
    {{flag.message}}
    +
    +
    +
    {{flag.message}}
    +
    + +
    + {{field.tag}} + + \${{subfield.code}}{{subfield.value}} + +
    +
    +
    +
    +
    + + +
    +
    +
    +
    +
    +
    Review
    +
    +
    + Imported record ID: {{record.jmarc.recordId}}
    +
    + {{field.tag}} + + \${{subfield.code}}{{subfield.value}} + +
    +
    +
    + +
    +
    `, + data: function () { + return { + // Setting the import type here lets us expand this later + importType: "records", + // And choose different kinds of uploads we want to accept + accept: ".mrk, .xml", + fileList: [], + collection: "bibs", + records: [], + state: "init", + showPreviewModal: false, + issues: 0, + uiBase: "", + showErrors: false, + detectedSpinner: false + } + }, + created: function () { + Jmarc.apiUrl = this.api_prefix + this.uiBase = this.api_prefix.replace("/api", "") + }, + computed: { + unimportableRecords: function () { + let count = 0 + for (let record of this.records) { + if (record.fatalErrors.length > 0) { + count = count + 1 + } + } + return count + }, + invalidRecords: function () { + let count = 0 + for (let record of this.records) { + if (record.validationErrors.length > 0 && record.fatalErrors.length === 0) { + count = count + 1 + } + } + return count + } + }, + methods: { + reinitApp: function () { + this.records = [] + this.showErrors=false + this.state = 'init' + this.collection = "bibs" + }, + setCollection: function (e) { + this.collection = e.target.value + }, + handleChange: function () { + // This replaces the list of files each time. It would be better to concatenate... + this.fileList = [...this.$refs.import.files] + if (this.importType == "records") { + this.parse(this.fileList[0]) + } + }, + handleClick: function () { + this.$refs.import.click() + }, + handleDragEnter: function (event) { + event.preventDefault() + if (!event.currentTarget.classList.contains('bg-dark')) { + event.currentTarget.classList.add("bg-dark") + } + }, + handleDragLeave: function (event) { + event.currentTarget.classList.remove("bg-dark") + }, + handleDrop: function (event) { + event.preventDefault() + this.$refs.import.files = event.dataTransfer.files + event.currentTarget.classList.remove("bg-dark") + this.handleChange() + }, + parse(file) { + /* + Take the file and split it, in case it contains multiple records, + then check if all authorities exist and that it's not a duplicate + symbol. + */ + this.state = "preview" + const reader = new FileReader() + let fileText = "" + reader.readAsText(file) + const promises = [] + this.detectedSpinner = true + reader.onload = (res) => { + for (let mrk of res.target.result.split(/(\r\n *\r\n|\n *\n)/)) { + let promise = Jmarc.fromMrk(this.collection, mrk).then( jmarc => { + // The only classes of validation errors we care about are: + // 1. Is there a duplicate symbol? If so, warn but allow import. + // 2. Do all the auth controlled fields match existing auth + // records? If not, error and prevent import. + let validationErrors = [] + let fatalErrors = [] + + if (jmarc.fields.length > 0) { + jmarc.symbolInUse().then( symbolInUse => { + if (symbolInUse) { + this.issues += 1 + validationErrors.push({"message": "Duplicate Symbol Warning: The symbol for this record is already in use."}) + } + }); + + for (let field of jmarc.fields.filter(x => ! x.tag.match(/^00/))) { + for (let subfield of field.subfields.filter(x => 'xref' in x)) { + if (subfield.xref instanceof Error) { + // unresolved xrefs are set to an Error object + fatalErrors.push({"message": `Fatal: ${field.tag}$${subfield.code} ${subfield.xref.message}: ${subfield.value}`}) + } + } + } + + this.records.push({"jmarc": jmarc, "mrk": mrk, "validationErrors": validationErrors, "fatalErrors": fatalErrors, "checked": false}) + } + }).catch(error => { + throw error + }) + + promises.push(promise) + } + + Promise.all(promises).then(x => this.detectedSpinner = false) + } + + }, + selectAll() { + for (let record of this.records) { + if (record.fatalErrors.length == 0) { + record.checked = true + } + } + }, + selectNone() { + for (let record of this.records) { + record.checked = false + } + }, + submitSelected() { + this.state = "review" + for (let record of this.records) { + if (record.checked) { + console.log("Submitting record...") + this.submit(record) + } + } + }, + async submit(record) { + let binary = new Blob([record['mrk']]) + let jmarc = record['jmarc'] + // Only allow one click, so we don't accidentally post multiple records + //e.target.classList.add("disabled") + return jmarc.post() + .catch(error => { + // may need some user notifcation here? + throw error + }) + }, + filterView(e) { + let values = [e.target.value] + // Empty the array if the input is empty, otherwise we get an empty string in the array + if (e.target.value.length == 0) { + values = [] + } + // Split the input value if it includes a comma + if (e.target.value.includes(",")) { + values = e.target.value.split(",") + } + for (let el of document.getElementsByClassName("field")) { + let found = values.find((v) => el.dataset.tag.startsWith(v)) + if (e.target.value > 0 || values.length > 0){ + if (!found) { + el.style.display = "none" + } else { + el.style.display = "" + } + } else { + el.style.display = "" + } + } + } + } +} \ No newline at end of file diff --git a/dlx_rest/static/js/jmarc.mjs b/dlx_rest/static/js/jmarc.mjs index 16468873..fc384c13 100644 --- a/dlx_rest/static/js/jmarc.mjs +++ b/dlx_rest/static/js/jmarc.mjs @@ -147,6 +147,43 @@ export class Subfield { return flags } + + async detectAndSetXref() { + /* Tries to look up and set the subfield xref given the subfield value. + Sets xref to an error object if the xref is not found or ambiguous */ + + const field = this.parentField; + const jmarc = field.parentRecord; + const isAuthorityControlled = jmarc.isAuthorityControlled(field.tag, this.code); + + if (isAuthorityControlled) { + const searchStr = + field.subfields + .filter(x => Object.keys(authMap[jmarc.collection][field.tag]).includes(x.code)) + .map(x => `${authMap[jmarc.collection][field.tag][x.code]}__${x.code}:'${x.value}'`) + .join(" AND "); + + return fetch(Jmarc.apiUrl + "marc/auths/records?search=" + encodeURIComponent(searchStr)) + .then(response => response.json()) + .then(json => { + const recordsList = json['data']; + let xref; + + if (recordsList.length === 0) { + xref = new Error("Unmatched heading") + } else if (recordsList.length > 1) { + xref = new Error("Ambiguous heading") + } else { + // get the xref from the URL + const parts = recordsList[0].split("/"); + xref = parts[parts.length - 1]; + } + + this.xref = xref; + return xref + }).catch(error => {throw error}) + } + } } class LinkedSubfield extends Subfield { @@ -203,7 +240,7 @@ export class DataField { this.parentRecord.deleteField(this); } } else if (this.tag in amap && subfield.code in amap[this.tag] && ! subfield.xref) { - throw new Error("Invalid authority-controlled value") + throw new Error(`Invalid authority-controlled value: ${this.tag} ${subfield.code} ${subfield.value}`) } } } @@ -382,7 +419,7 @@ export class Jmarc { if (! Jmarc.apiUrl) {throw new Error("Jmarc.apiUrl must be set")}; Jmarc.apiUrl = Jmarc.apiUrl.slice(-1) == '/' ? Jmarc.apiUrl : Jmarc.apiUrl + '/'; - if (! collection) {throw new Error("Collection required")}; + if (! collection) {throw new Error("Collection required (\"bibs\" or \"auths\")")}; this.collection = collection; this.recordClass = collection === "bibs" ? Bib : Auth; this.collectionUrl = Jmarc.apiUrl + `marc/${collection}`; @@ -698,6 +735,53 @@ export class Jmarc { } return true; } + + static async fromMrk(collection, mrk) { + if (! ["bibs", "auths"].includes(collection)) { + throw new Error("First argument must be \"bibs\" or \"auths\"") + } + + let jmarc = new Jmarc(collection) + const promises = []; + + for (let line of mrk.split(/(\r\n|\n)/)) { + let match = line.match(/=(\w{3}) (.*)/) + + if (match != null){ + let tag = match[1] + let rest = match[2] + if (tag == 'LDR') { + tag = '000' + } + + let field = jmarc.createField(tag); + if (field instanceof(ControlField)) { + field.value = rest; + continue + } else { + let indicators = rest.substring(0,2).replace(/\\/g, " ") + field.indicators = [indicators.charAt(0), indicators.charAt(1)] + + for (let subfield of rest.substring(2, rest.length).split("$")) { + if (subfield.length > 0) { + let code = subfield.substring(0,1) + let value = subfield.substring(1, subfield.length) + if (code.length > 0 && value.length > 0) { + let newSub = field.createSubfield(code) + newSub.value = value + promises.push(newSub.detectAndSetXref()); + } + } + } + } + } + } + + // wait until all the xrefs have been set + await Promise.all(promises); + + return jmarc + } async post() { if (this.recordId) { @@ -1108,6 +1192,57 @@ export class Jmarc { return flags.flat() } + async symbolInUse() { + // Determine if a symbol is already being used. + if (this.collection !== "bibs") return + + let inUse = false; + + for (const tag of ['191', '791']) { + // only look in same symbol fields in other records + for (const field of this.getFields(tag)) { + const searchStr = `${tag}__a:'${field.getSubfield("a").value}'`; + const url = Jmarc.apiUrl + "/marc/bibs/records?search=" + encodeURIComponent(searchStr) + '&limit=1'; + const res = await fetch(url); + const json = await res.json(); + const results = json['data']; + + if (results.length > 0) inUse = true + } + } + + return inUse + } + + async authExists() { + /* + Similar to authHeadingInUse, but doesn't care about returning ambiguous results. + + We want this to evaluate to true, but don't need regex since we already have + other ways to force exact matching. + */ + if (this.collection !== "auths") return + let headingField = (this.fields.filter(x => x.tag.match(/^1/)) || [null])[0]; + + if (! headingField) return + + let searchStr = + headingField.subfields + .map(x => `${headingField.tag}__${x.code}:'${x.value}'`) + .join(" AND ") + + let url = Jmarc.apiUrl + "/marc/auths/records/count?search=" + encodeURIComponent(searchStr) + let res = await fetch(url) + let json = await res.json() + let count = json['data'] + + if (count === 1) { + return true + } else { + return false + } + } + async authHeadingInUse() { if (this.collection !== "auths") return diff --git a/dlx_rest/static/js/modals/preview.js b/dlx_rest/static/js/modals/preview.js index 93419a2b..dc544043 100644 --- a/dlx_rest/static/js/modals/preview.js +++ b/dlx_rest/static/js/modals/preview.js @@ -5,6 +5,10 @@ export let previewmodal = { api_prefix: { type: String, required: true + }, + collection_name: { + type: String, + required: true } }, template: `
    @@ -14,7 +18,7 @@ export let previewmodal = {
    -
    Speeches / {{recordId}}
    +
    {{collection_name}} / {{recordId}}
    diff --git a/dlx_rest/static/js/search/browse.js b/dlx_rest/static/js/search/browse.js index 6ce42cec..ef33737b 100644 --- a/dlx_rest/static/js/search/browse.js +++ b/dlx_rest/static/js/search/browse.js @@ -182,8 +182,8 @@ export let browsecomponent = { let matches = window.location.search.match(/type=(\w+)/) let recordType = this.recordType; - let beforeBrowse = `${this.api_prefix}marc/${this.collection}/records/browse?type=${this.recordType}&search=${this.index}:${this.q}&compare=less&limit=3` - let afterBrowse = `${this.api_prefix}marc/${this.collection}/records/browse?type=${this.recordType}&search=${this.index}:${this.q}&compare=greater&limit=50` + let beforeBrowse = `${this.api_prefix}marc/${this.collection}/records/browse?type=${encodeURIComponent(this.recordType)}&search=${this.index}:${encodeURIComponent(this.q)}&compare=less&limit=3` + let afterBrowse = `${this.api_prefix}marc/${this.collection}/records/browse?type=${encodeURIComponent(this.recordType)}&search=${this.index}:${encodeURIComponent(this.q)}&compare=greater&limit=50` document.title = document.title + ` Browse (${this.recordType})` @@ -200,15 +200,15 @@ export let browsecomponent = { let field = searchStr.split(":")[0]; // the logical field that is being browsed on if (url === beforeBrowse) { - this.prev = `${this.base_url}/records/${this.collection}/browse/${field}?type=${this.recordType}&q=${jsondata.data[0].value}`; + this.prev = `${this.base_url}/records/${this.collection}/browse/${field}?type=${encodeURIComponent(this.recordType)}&q=${encodeURIComponent(jsondata.data[0].value)}`; } else { - this.next = `${this.base_url}/records/${this.collection}/browse/${field}?type=${this.recordType}&q=${jsondata.data[jsondata.data.length-1].value}`; + this.next = `${this.base_url}/records/${this.collection}/browse/${field}?type=${encodeURIComponent(this.recordType)}&q=${encodeURIComponent(jsondata.data[jsondata.data.length-1].value)}`; } for (let result of jsondata.data) { // tanslate api search to app search let searchStr = result.search.split('search=')[1]; - let searchUrl = `${this.base_url}/records/${this.collection}/search?q=${searchStr}`; + let searchUrl = `${this.base_url}/records/${this.collection}/search?q=${encodeURIComponent(searchStr)}`; resultsList.push({'value': result.value, 'url': searchUrl}); // get the count @@ -300,7 +300,7 @@ export let browsecomponent = { let el = document.getElementById(id) let val = el.value - let targetUrl = `${this.api_prefix.replace('/api','')}records/${this.collection}/browse/${id}?q=${val}&type=${this.recordType}` + let targetUrl = `${this.api_prefix.replace('/api','')}records/${this.collection}/browse/${id}?q=${encodeURIComponent(val)}&type=${this.recordType}` if (val) { history.pushState({}, window.location.href); setTimeout(function(){ @@ -310,7 +310,7 @@ export let browsecomponent = { }, resubmitBrowse(index) { let val = document.getElementById("searchAgain").value - let targetUrl = `${this.api_prefix.replace('/api','')}records/${this.collection}/browse/${index}?q=${val}&type=${this.recordType}` + let targetUrl = `${this.api_prefix.replace('/api','')}records/${this.collection}/browse/${index}?q=${encodeURIComponent(val)}&type=${this.recordType}` history.pushState({}, window.location.href); setTimeout(function(){ window.location.href=targetUrl; diff --git a/dlx_rest/static/js/search/search.js b/dlx_rest/static/js/search/search.js index b5931d0a..0c6e3d44 100644 --- a/dlx_rest/static/js/search/search.js +++ b/dlx_rest/static/js/search/search.js @@ -188,6 +188,9 @@ export let searchcomponent = {
    {{agenda}}
    +
    + {{val}} +
    @@ -418,6 +421,7 @@ export let searchcomponent = { myResult["second_line"] = [result["symbol"], result["date"], rtype[rtype.length - 1]].filter(Boolean).join(" | ") if (this.vcoll == "089:'B22'") { myResult["agendas"] = result["agendas"] + myResult["f596"] = result["f596"] } } else if (component.collection == "auths") { myResult["first_line"] = result["heading"] diff --git a/dlx_rest/static/js/speech_review.js b/dlx_rest/static/js/speech_review.js index dfd497c7..6c878b29 100644 --- a/dlx_rest/static/js/speech_review.js +++ b/dlx_rest/static/js/speech_review.js @@ -102,7 +102,7 @@ export let speechreviewcomponent = {
    {{agenda}}
    - +
    `, data: function() { diff --git a/dlx_rest/static/js/vm_import.js b/dlx_rest/static/js/vm_import.js new file mode 100644 index 00000000..6ae611e9 --- /dev/null +++ b/dlx_rest/static/js/vm_import.js @@ -0,0 +1,6 @@ +import { importcomponent } from "./import.js" + +export let vm_import = new Vue({ + el: "#import_marc", + components: { importcomponent } +}) \ No newline at end of file diff --git a/dlx_rest/templates/base.html b/dlx_rest/templates/base.html index a7ca298f..5608442b 100644 --- a/dlx_rest/templates/base.html +++ b/dlx_rest/templates/base.html @@ -127,8 +127,14 @@
    Upload Files Manage Files + Import Records
    + {% if current_user.is_authenticated %} + {% if current_user.has_permission('importMarc') %} +
  • Import
    • + {% endif %} + {% endif %} {% if current_user.is_authenticated %} {% if current_user.has_permission('updateRecord') %} {% if vcoll=="editor" %} diff --git a/dlx_rest/templates/import_marc.html b/dlx_rest/templates/import_marc.html new file mode 100644 index 00000000..2abbc170 --- /dev/null +++ b/dlx_rest/templates/import_marc.html @@ -0,0 +1,9 @@ +{% extends 'base.html' %} {% block content %} +
    +
    + + +
    +
    + +{% endblock %} \ No newline at end of file diff --git a/dlx_rest/tests/test_api.py b/dlx_rest/tests/test_api.py index 68457f37..c5e18723 100644 --- a/dlx_rest/tests/test_api.py +++ b/dlx_rest/tests/test_api.py @@ -744,14 +744,12 @@ def test_api_userbasket(client, default_users, users, marc): # Get the current user's basket, which should be created if it doesn't exist username = default_users['admin']['email'] password = default_users['admin']['password'] - credentials = b64encode(bytes(f"{username}:{password}", "utf-8")).decode("utf-8") # GET the basket. It should have zero items. res = client.get("/api/userprofile/my_profile/basket", headers={"Authorization": f"Basic {credentials}"}) assert res.status_code == 200 data = json.loads(res.data) - #print(data) assert data['_meta']['returns'] == f'{API}/schemas/api.basket' assert len(data['data']['items']) == 0 @@ -766,7 +764,6 @@ def test_api_userbasket(client, default_users, users, marc): # GET the basket again. Now it should have one item. res = client.get("/api/userprofile/my_profile/basket", headers={"Authorization": f"Basic {credentials}"}) data = json.loads(res.data) - #print(data) assert len(data['data']['items']) == 1 # GET the basket item. Its collection and record_id should match what we POSTed. @@ -775,7 +772,6 @@ def test_api_userbasket(client, default_users, users, marc): res = client.get(item_url, headers={"Authorization": f"Basic {credentials}"}) assert res.status_code == 200 data = json.loads(res.data) - #print(data) assert data['data']['collection'] == 'bibs' assert data['data']['record_id'] == '1' @@ -784,7 +780,6 @@ def test_api_userbasket(client, default_users, users, marc): assert res.status_code == 200 res = client.get("/api/userprofile/my_profile/basket", headers={"Authorization": f"Basic {credentials}"}) data = json.loads(res.data) - #print(data) assert len(data['data']['items']) == 1 # Now DELETE the item from the basket and verify the basket contains zero items. diff --git a/requirements.txt b/requirements.txt index 6aa722fb..df7fba26 100644 --- a/requirements.txt +++ b/requirements.txt @@ -6,43 +6,43 @@ certifi==2023.7.22 cffi==1.15.0 cfn-flip==1.3.0 charset-normalizer==2.0.12 -click==8.1.2 +click==8.1.3 cryptography==42.0.4 -dlx @ git+https://github.com/dag-hammarskjold-library/dlx@805accd810d00fdcd72a3e35b6ec35729fe2a02a +dlx @ git+https://github.com/dag-hammarskjold-library/dlx@v1.4.0 dnspython==2.3.0 email-validator==1.1.3 -Flask==2.1.1 +Flask==2.3.3 Flask-Cors==3.0.10 Flask-Login==0.6.0 -flask-mongoengine==1.0.0 +flask-mongoengine-3==1.0.9 flask-restx==1.1.0 Flask-Session==0.4.0 -Flask-WTF==1.0.1 -idna==3.3 +Flask-WTF==1.2.1 +idna==3.7 importlib-metadata==4.11.3 iniconfig==1.1.1 itsdangerous==2.1.2 Jinja2==3.1.3 jmespath==1.0.0 jsonschema==4.0.0 -lxml==4.9.1 +lxml==5.2.1 MarkupSafe==2.1.1 mongoengine==0.24.1 -mongomock==3.23.0 +mongomock==4.1.2 moto==2.3.1 nltk==3.6.7 packaging==21.3 pluggy==1.0.0 py==1.11.0 pycparser==2.21 -pymongo==3.12.3 +pymongo==4.6.3 pyparsing==3.0.7 pyrsistent==0.18.1 pytest==7.1.1 python-dateutil==2.8.2 python-ulid==1.1.0 pytz==2022.1 -PyYAML==6.0 +PyYAML==6.0.1 requests==2.31.0 responses==0.20.0 s3transfer==0.5.2 @@ -52,7 +52,7 @@ six==1.16.0 tomli==2.0.1 troposphere==4.0.1 urllib3==1.26.18 -Werkzeug==2.2.3 +Werkzeug==2.3.8 WTForms==3.0.1 xlrd==1.2.0 xmldiff==2.4 From a7aa4dd25add941d00ca0afb0b0f7b1da6c823e0 Mon Sep 17 00:00:00 2001 From: Aaron Helton Date: Thu, 18 Apr 2024 12:18:57 -0400 Subject: [PATCH 06/22] Set output fields and chenge format select to radio --- dlx_rest/static/js/modals/export.js | 53 ++++++++++++++++++----------- 1 file changed, 33 insertions(+), 20 deletions(-) diff --git a/dlx_rest/static/js/modals/export.js b/dlx_rest/static/js/modals/export.js index bc63ce3d..ad66854a 100644 --- a/dlx_rest/static/js/modals/export.js +++ b/dlx_rest/static/js/modals/export.js @@ -23,21 +23,29 @@ export let exportmodal = { Loading...
    -
    - Select format - -
    +
    -
    - {{record.toString()}} +
    + Select format: +
    + + +
    +
    + + +
    +
    + + +
    +
    + Output Fields:
    - + +
    @@ -49,27 +57,32 @@ export let exportmodal = { return { showModal: false, showSpinner: false, - selectedExportUrl: null, - results: [] + selectedFormat: 'mrk', + selectedFields: null, + selectedExportUrl: null } }, methods: { show: async function() { this.showModal = true + this.setFormat('mrk') }, setFormat(format) { + this.selectedFormat = format this.selectedExportUrl = this.links.format[format.toUpperCase()] - this.submitExport(format) }, - setOutputFields(fields) { - if (this.selectedExportUrl) { - this.selectedExportUrl = `${this.selectedExportUrl}&of=${encodeURIComponent(fields)}` - } + setOutputFields(e) { + this.selectedFields = e.target.value + let url = new URL(this.selectedExportUrl) + let search = new URLSearchParams(url.search) + search.set("of", e.target.value) + url.search = search + this.selectedExportUrl = url }, - submitExport(format) { + submitExport() { fetch(this.selectedExportUrl).then( response => { response.blob().then( blob => { - this.download(blob, `export.${format}`) + this.download(blob, `export.${this.selectedFormat}`) }) }) }, From 5a08dd22910c06b2141e1fd87c300ed908f01ced Mon Sep 17 00:00:00 2001 From: jbukhari Date: Wed, 5 Jun 2024 11:26:00 -0400 Subject: [PATCH 07/22] Jbukhari/patch/aaronhelton/issue779 (#1439) * disable non functional inputs * create download tag inside template --- dlx_rest/static/js/modals/export.js | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/dlx_rest/static/js/modals/export.js b/dlx_rest/static/js/modals/export.js index ad66854a..48cf9a82 100644 --- a/dlx_rest/static/js/modals/export.js +++ b/dlx_rest/static/js/modals/export.js @@ -26,11 +26,7 @@ export let exportmodal = {
    - Select format: -
    - - -
    + Select format:
    @@ -39,13 +35,21 @@ export let exportmodal = {
    +
    + + +

    - Output Fields: + Output Fields: +
    - - + + + + +
    @@ -79,7 +83,7 @@ export let exportmodal = { url.search = search this.selectedExportUrl = url }, - submitExport() { + /* submitExport() { fetch(this.selectedExportUrl).then( response => { response.blob().then( blob => { this.download(blob, `export.${this.selectedFormat}`) @@ -96,6 +100,6 @@ export let exportmodal = { a.click() document.body.removeChild(a) window.URL.revokeObjectURL(url) - } + } */ } } \ No newline at end of file From fb519f2713dc44fea1f8cce9f87e292c83f00bce Mon Sep 17 00:00:00 2001 From: Aaron Helton Date: Wed, 19 Jun 2024 15:07:40 -0400 Subject: [PATCH 08/22] enable CSV in export --- dlx_rest/api/__init__.py | 7 ++++++- dlx_rest/static/js/modals/export.js | 4 ++-- requirements.txt | 2 +- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/dlx_rest/api/__init__.py b/dlx_rest/api/__init__.py index 17637bc7..13be56c2 100644 --- a/dlx_rest/api/__init__.py +++ b/dlx_rest/api/__init__.py @@ -193,7 +193,7 @@ class RecordsList(Resource): args.add_argument( 'format', type=str, - choices=['json', 'xml', 'mrk', 'mrc', 'brief', 'brief_speech'], + choices=['json', 'xml', 'mrk', 'mrc', 'csv', 'tsv', 'brief', 'brief_speech'], help='Formats the list as a batch of records in the specified format' ) args.add_argument( @@ -301,6 +301,10 @@ def get(self, collection): return Response(recordset.to_xml(), mimetype='text/xml') elif fmt == 'mrk': return Response(recordset.to_mrk(), mimetype='text/plain') + elif fmt == 'csv': + return Response(recordset.to_csv(), mimetype='text/csv') + elif fmt == 'tsv': + return Response(recordset.to_csv(), mimetype='text/tab-separated-values') elif fmt == 'brief': schema_name='api.brieflist' make_brief = brief_bib if recordset.record_class == Bib else brief_auth @@ -345,6 +349,7 @@ def get(self, collection): 'list': URL('api_records_list', collection=collection, start=start, limit=limit, search=search, sort=sort_by, direction=args.direction, subtype=args.subtype).to_str(), 'XML': URL('api_records_list', collection=collection, start=start, limit=limit, search=search, format='xml', sort=sort_by, direction=args.direction, subtype=args.subtype).to_str(), 'MRK': URL('api_records_list', collection=collection, start=start, limit=limit, search=search, format='mrk', sort=sort_by, direction=args.direction, subtype=args.subtype).to_str(), + 'CSV': URL('api_records_list', collection=collection, start=start, limit=limit, search=search, format='csv', sort=sort_by, direction=args.direction, subtype=args.subtype).to_str(), }, 'sort': { 'updated': URL('api_records_list', collection=collection, start=start, limit=limit, search=search, format=fmt, sort='updated', direction=new_direction, subtype=args.subtype).to_str() diff --git a/dlx_rest/static/js/modals/export.js b/dlx_rest/static/js/modals/export.js index 48cf9a82..ddcbe5b9 100644 --- a/dlx_rest/static/js/modals/export.js +++ b/dlx_rest/static/js/modals/export.js @@ -36,8 +36,8 @@ export let exportmodal = {
    - - + +

    Output Fields: diff --git a/requirements.txt b/requirements.txt index bb6ee420..c3ed4ffa 100644 --- a/requirements.txt +++ b/requirements.txt @@ -10,7 +10,7 @@ cfn-flip==1.3.0 charset-normalizer==3.3.2 click==8.1.7 cryptography==42.0.7 -dlx @ git+https://github.com/dag-hammarskjold-library/dlx@v1.4.3 +dlx @ git+https://github.com/dag-hammarskjold-library/dlx@v1.4.4 dnspython==2.6.1 email-validator==1.1.3 exceptiongroup==1.2.1 From dd09719181f26258e6d52c0ed6ebbadceba5f6cc Mon Sep 17 00:00:00 2001 From: Aaron Helton Date: Thu, 20 Jun 2024 09:33:59 -0400 Subject: [PATCH 09/22] set output fields --- dlx_rest/api/__init__.py | 14 ++++++++++++++ dlx_rest/static/js/modals/export.js | 2 +- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/dlx_rest/api/__init__.py b/dlx_rest/api/__init__.py index 13be56c2..91a51dce 100644 --- a/dlx_rest/api/__init__.py +++ b/dlx_rest/api/__init__.py @@ -206,6 +206,11 @@ class RecordsList(Resource): type=str, choices=['default', 'speech', 'vote', 'all', ''] ) + args.add_argument( + 'of', + type=str, + help='Comma separated list of fields you want returned (e.g., for export)' + ) @ns.doc(description='Return a list of MARC Bibliographic or Authority Records') @ns.expect(args) @@ -267,6 +272,15 @@ def get(self, collection): # make sure logical fields are available for sorting tags += (list(DlxConfig.bib_logical_fields.keys()) + list(DlxConfig.auth_logical_fields.keys())) project = dict.fromkeys(tags, True) + elif fmt in ['mrk', 'xml', 'csv']: + project = None + output_fields = args.get("of") + if output_fields is not None: + tags = output_fields.split(',') + # make sure logical fields are available for sorting + tags += (list(DlxConfig.bib_logical_fields.keys()) + list(DlxConfig.auth_logical_fields.keys())) + project = dict.fromkeys(tags, True) + elif fmt: project = None else: diff --git a/dlx_rest/static/js/modals/export.js b/dlx_rest/static/js/modals/export.js index ddcbe5b9..af6fbe57 100644 --- a/dlx_rest/static/js/modals/export.js +++ b/dlx_rest/static/js/modals/export.js @@ -41,7 +41,7 @@ export let exportmodal = {
    Output Fields: - +
    From c8037d274e2c19c5a02d389de6f49034eba2dff8 Mon Sep 17 00:00:00 2001 From: Aaron Helton Date: Thu, 20 Jun 2024 10:39:55 -0400 Subject: [PATCH 10/22] fix duplicate format handling --- dlx_rest/api/__init__.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlx_rest/api/__init__.py b/dlx_rest/api/__init__.py index 91a51dce..1f7aded4 100644 --- a/dlx_rest/api/__init__.py +++ b/dlx_rest/api/__init__.py @@ -276,7 +276,7 @@ def get(self, collection): project = None output_fields = args.get("of") if output_fields is not None: - tags = output_fields.split(',') + tags = [f.strip() for f in output_fields.split(',')] # make sure logical fields are available for sorting tags += (list(DlxConfig.bib_logical_fields.keys()) + list(DlxConfig.auth_logical_fields.keys())) project = dict.fromkeys(tags, True) @@ -318,7 +318,7 @@ def get(self, collection): elif fmt == 'csv': return Response(recordset.to_csv(), mimetype='text/csv') elif fmt == 'tsv': - return Response(recordset.to_csv(), mimetype='text/tab-separated-values') + return Response(recordset.to_tsv(), mimetype='text/tab-separated-values') elif fmt == 'brief': schema_name='api.brieflist' make_brief = brief_bib if recordset.record_class == Bib else brief_auth From 53cb98c1fb4dd0b2af856e6cee88d1e0e9957638 Mon Sep 17 00:00:00 2001 From: Aaron Helton Date: Thu, 20 Jun 2024 10:48:21 -0400 Subject: [PATCH 11/22] update messaging for output fields --- dlx_rest/static/js/modals/export.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlx_rest/static/js/modals/export.js b/dlx_rest/static/js/modals/export.js index af6fbe57..2bf0b94c 100644 --- a/dlx_rest/static/js/modals/export.js +++ b/dlx_rest/static/js/modals/export.js @@ -40,8 +40,8 @@ export let exportmodal = {

    - Output Fields: - + Output Fields: +
    From 7b7d929acb6f6772a93882f15901ca9b1a3641ba Mon Sep 17 00:00:00 2001 From: Aaron Helton Date: Fri, 21 Jun 2024 15:22:56 -0400 Subject: [PATCH 12/22] change parameter name from "of" to "fields" --- dlx_rest/api/__init__.py | 4 ++-- dlx_rest/static/js/modals/export.js | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlx_rest/api/__init__.py b/dlx_rest/api/__init__.py index 1f7aded4..14616e30 100644 --- a/dlx_rest/api/__init__.py +++ b/dlx_rest/api/__init__.py @@ -207,7 +207,7 @@ class RecordsList(Resource): choices=['default', 'speech', 'vote', 'all', ''] ) args.add_argument( - 'of', + 'fields', type=str, help='Comma separated list of fields you want returned (e.g., for export)' ) @@ -274,7 +274,7 @@ def get(self, collection): project = dict.fromkeys(tags, True) elif fmt in ['mrk', 'xml', 'csv']: project = None - output_fields = args.get("of") + output_fields = args.get("fields") if output_fields is not None: tags = [f.strip() for f in output_fields.split(',')] # make sure logical fields are available for sorting diff --git a/dlx_rest/static/js/modals/export.js b/dlx_rest/static/js/modals/export.js index 2bf0b94c..ce67c9c4 100644 --- a/dlx_rest/static/js/modals/export.js +++ b/dlx_rest/static/js/modals/export.js @@ -79,7 +79,7 @@ export let exportmodal = { this.selectedFields = e.target.value let url = new URL(this.selectedExportUrl) let search = new URLSearchParams(url.search) - search.set("of", e.target.value) + search.set("fields", e.target.value) url.search = search this.selectedExportUrl = url }, From 0fd96fff6a7a9abc684dfbed4f0a9f7910648c56 Mon Sep 17 00:00:00 2001 From: Aaron Helton Date: Wed, 3 Jul 2024 09:01:53 -0400 Subject: [PATCH 13/22] bump dlx to 1.4.5 to include 001 in CSV --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index c3ed4ffa..c5a70b57 100644 --- a/requirements.txt +++ b/requirements.txt @@ -10,7 +10,7 @@ cfn-flip==1.3.0 charset-normalizer==3.3.2 click==8.1.7 cryptography==42.0.7 -dlx @ git+https://github.com/dag-hammarskjold-library/dlx@v1.4.4 +dlx @ git+https://github.com/dag-hammarskjold-library/dlx@v1.4.5 dnspython==2.6.1 email-validator==1.1.3 exceptiongroup==1.2.1 From a22e24205433d129e4845872374ce81919e2796f Mon Sep 17 00:00:00 2001 From: Aaron Helton Date: Wed, 3 Jul 2024 09:07:00 -0400 Subject: [PATCH 14/22] bump urllib3 to 1.26.19 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index c5a70b57..257fd5f6 100644 --- a/requirements.txt +++ b/requirements.txt @@ -57,7 +57,7 @@ six==1.16.0 tomli==2.0.1 tqdm==4.66.4 troposphere==4.0.1 -urllib3==1.26.18 +urllib3==1.26.19 Werkzeug==3.0.3 WTForms==3.0.1 xlrd==1.2.0 From 357641e980d6ef9b08de77c8fac99efe618b2406 Mon Sep 17 00:00:00 2001 From: jbukhari Date: Wed, 10 Jul 2024 09:47:48 -0400 Subject: [PATCH 15/22] syntax (#1477) --- dlx_rest/api/__init__.py | 1 + 1 file changed, 1 insertion(+) diff --git a/dlx_rest/api/__init__.py b/dlx_rest/api/__init__.py index ffcbcd64..0649205f 100644 --- a/dlx_rest/api/__init__.py +++ b/dlx_rest/api/__init__.py @@ -209,6 +209,7 @@ class RecordsList(Resource): 'fields', type=str, help='Comma separated list of fields you want returned (e.g., for export)' + ) # This is so we can benchmark the two search formats args.add_argument( 'engine', From 065f87be5865cc048054326562c470a7eaff3330 Mon Sep 17 00:00:00 2001 From: jbukhari Date: Tue, 16 Jul 2024 14:43:09 -0400 Subject: [PATCH 16/22] resolve merge conflict (#1478) * Bump zipp from 3.8.0 to 3.19.1 (#1476) Bumps [zipp](https://github.com/jaraco/zipp) from 3.8.0 to 3.19.1. - [Release notes](https://github.com/jaraco/zipp/releases) - [Changelog](https://github.com/jaraco/zipp/blob/main/NEWS.rst) - [Commits](https://github.com/jaraco/zipp/compare/v3.8.0...v3.19.1) --- updated-dependencies: - dependency-name: zipp dependency-type: direct:production ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * NOT xref; $ regex search; CSV serialization (#1450) * update dlx * enable csv and tsv formatted records list api response * update dlx and urllib3 * Enable subtype=all search and count (#1465) * enable subtype=all search and count * enable subtype=all from record editor and highlight all bibs collections (#1467) * enable subtype=all from record editor and highlight all bibs collections * Update count component to link to subtype=all searches for auths --------- Co-authored-by: Aaron Helton * delete 999 on auth clone (#1468) * Update python-tests.yml (#1473) Run tests on PRs against all branches * browse list bugfixes (#1475) --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Aaron Helton --- .github/workflows/python-tests.yml | 2 +- dlx_rest/api/__init__.py | 51 ++++++++++++++---------------- dlx_rest/routes.py | 2 ++ dlx_rest/static/js/record.js | 4 ++- dlx_rest/static/js/search/count.js | 2 +- dlx_rest/templates/base.html | 6 ++-- requirements.txt | 2 +- 7 files changed, 35 insertions(+), 34 deletions(-) diff --git a/.github/workflows/python-tests.yml b/.github/workflows/python-tests.yml index 30ef4bde..82c1aa3b 100644 --- a/.github/workflows/python-tests.yml +++ b/.github/workflows/python-tests.yml @@ -5,7 +5,7 @@ name: Python package on: pull_request: - branches: [ main ] + types: [ opened ] env: DLX_REST_TESTING: True diff --git a/dlx_rest/api/__init__.py b/dlx_rest/api/__init__.py index 0649205f..90338b5d 100644 --- a/dlx_rest/api/__init__.py +++ b/dlx_rest/api/__init__.py @@ -242,26 +242,25 @@ def get(self, collection): # search search = unquote(args.search) if args.search else None # subtype - type_condition = Raw({'_record_type': args.subtype if args.subtype else 'default'}) + type_condition = Raw( + {'_record_type': {'$in': ['default', 'speech', 'vote']} if args.subtype == 'all' else args.subtype if args.subtype else 'default'} + ) if args.engine in (None, "community"): - print("Using Community search type") - try: query = Query.from_string(search, record_type=collection[:-1]) if search else Query() - query.conditions.append(type_condition) except InvalidQueryString as e: abort(422, str(e)) - elif args.engine == "atlas": - print("Using Atlas search type") + query.conditions.append(type_condition) + elif args.engine == "atlas": try: query = AtlasQuery.from_string(search, record_type=collection[:-1]) if search else AtlasQuery() if hasattr(query, 'match'): if query.match: # todo: fix this in dlx. `query.match.conditions` should be an array instad of tuple - query.match.conditions = [*query.match.conditions] + query.match.conditions = [*query.match.conditions] query.match.conditions.append(type_condition) else: query.match = Query(type_condition) @@ -272,8 +271,6 @@ def get(self, collection): else: query = Query({}) - print(query.compile()) - # start start = 1 if args.start is None else int(args.start) @@ -333,13 +330,13 @@ def get(self, collection): # process if fmt == 'xml': - return Response(recordset.to_xml(), mimetype='text/xml') + return Response(recordset.to_xml(write_id=True), mimetype='text/xml') elif fmt == 'mrk': - return Response(recordset.to_mrk(), mimetype='text/plain') + return Response(recordset.to_mrk(write_id=True), mimetype='text/plain') elif fmt == 'csv': - return Response(recordset.to_csv(), mimetype='text/csv') + return Response(recordset.to_csv(write_id=True), mimetype='text/csv') elif fmt == 'tsv': - return Response(recordset.to_tsv(), mimetype='text/tab-separated-values') + return Response(recordset.to_tsv(write_id=True), mimetype='text/tab-separated-values') elif fmt == 'brief': schema_name='api.brieflist' make_brief = brief_bib if recordset.record_class == Bib else brief_auth @@ -356,7 +353,6 @@ def get(self, collection): # Determine lock status first, then resolve whether the item is in the current user's basket lock_status = list(filter(lambda x: x['record_id'] == str(r.id) and x['collection'] == collection, all_basket_objects)) if len(lock_status) > 0: - print(lock_status) this_d["locked"] = True basket_contains = list(filter(lambda x: x['record_id'] == str(r.id) and x['collection'] == 'bibs', this_basket.items)) @@ -385,6 +381,7 @@ def get(self, collection): 'XML': URL('api_records_list', collection=collection, start=start, limit=limit, search=search, format='xml', sort=sort_by, direction=args.direction, subtype=args.subtype).to_str(), 'MRK': URL('api_records_list', collection=collection, start=start, limit=limit, search=search, format='mrk', sort=sort_by, direction=args.direction, subtype=args.subtype).to_str(), 'CSV': URL('api_records_list', collection=collection, start=start, limit=limit, search=search, format='csv', sort=sort_by, direction=args.direction, subtype=args.subtype).to_str(), + 'TSV': URL('api_records_list', collection=collection, start=start, limit=limit, search=search, format='tsv', sort=sort_by, direction=args.direction, subtype=args.subtype).to_str(), }, 'sort': { 'updated': URL('api_records_list', collection=collection, start=start, limit=limit, search=search, format=fmt, sort='updated', direction=new_direction, subtype=args.subtype).to_str() @@ -459,7 +456,9 @@ class RecordsListCount(Resource): def get(self, collection): cls = ClassDispatch.batch_by_collection(collection) or abort(404) args = RecordsList.args.parse_args() - type_condition = Raw({'_record_type': args.subtype if args.subtype else 'default'}) + type_condition = Raw( + {'_record_type': {'$in': ['default', 'speech', 'vote']} if args.subtype == 'all' else args.subtype if args.subtype else 'default'} + ) if args.search: search = unquote(args.search) @@ -561,7 +560,7 @@ def get(self, collection): logical_fields = DlxConfig.bib_logical_fields if collection == 'bibs' else DlxConfig.auth_logical_fields field in logical_fields or abort(400, 'Search must be by "logical field". No recognized logical field was detected') operator = '$lt' if args.compare == 'less' else '$gte' - direction = 1 if args.compare == 'less' else -1 + direction = -1 if args.compare == 'less' else 1 args.subtype = args.subtype or 'default' #subq = {'$and': [{'_record_type': 'default'}, {'_record_type': {'$nin': ['speech', 'vote']}}]} from dlx.util import Tokenizer @@ -569,23 +568,21 @@ def get(self, collection): query = {'$and': [{'text': {operator: f' {Tokenizer.scrub(value)} '}}]} query['$and'].append({'_record_type': args.subtype}) - if args.subtype == 'default': - # browse index documents might have more than one subtype - query['$and'] += [{'_record_type': {'$ne': 'speech'}}, {'_record_type': {'$ne': 'vote'}}] - if Config.TESTING: # collation is not implemented in mongomock collation = None else: collation = DlxConfig.marc_index_default_collation - + start, limit = int(args.start), int(args.limit) - values = list(DB.handle[f'_index_{field}'].find( - query, - skip=start-1, - limit=limit, - sort=[('text', direction)], - collation=collation) + values = list( + DB.handle[f'_index_{field}'].find( + query, + skip=start-1, + limit=limit, + sort=[('text', direction)], + collation=collation + ) ) ''' diff --git a/dlx_rest/routes.py b/dlx_rest/routes.py index c5ae6521..3cd39422 100644 --- a/dlx_rest/routes.py +++ b/dlx_rest/routes.py @@ -459,6 +459,8 @@ def search_records(coll): vcoll = "speeches" elif request.args.get('subtype') == 'vote': vcoll = "votes" + elif request.args.get('subtype') == 'all': + vcoll = "all" sort = request.args.get('sort') direction = request.args.get('direction') #, 'desc' if sort == 'updated' else '') diff --git a/dlx_rest/static/js/record.js b/dlx_rest/static/js/record.js index a849ef12..47a8b63f 100644 --- a/dlx_rest/static/js/record.js +++ b/dlx_rest/static/js/record.js @@ -594,6 +594,8 @@ export let multiplemarcrecordcomponent = { field.createSubfield("b").value = "" } } + } else if (recup.collection === 'auths') { + recup.deleteField("999") } this.callChangeStyling("Record " + jmarc.recordId + " has been cloned and removed from the editor. Displaying new record", "d-flex w-100 alert-success") @@ -2173,7 +2175,7 @@ export let multiplemarcrecordcomponent = { fetch(url).then( response => response.json() ).then( json => { - controlButton.innerHTML = `(${json.data})` + controlButton.innerHTML = `(${json.data})` controlButton.title = "Authority use count (bibs)" }) } else if (control["name"] == "idField") { diff --git a/dlx_rest/static/js/search/count.js b/dlx_rest/static/js/search/count.js index 64f76701..9484f837 100644 --- a/dlx_rest/static/js/search/count.js +++ b/dlx_rest/static/js/search/count.js @@ -2,7 +2,7 @@ export let countcomponent = { props: ["api_prefix", "recordId"], - template: `({{search_count}})`, + template: `({{search_count}})`, data: function() { let uiBase = this.api_prefix.replace("/api", "") return { diff --git a/dlx_rest/templates/base.html b/dlx_rest/templates/base.html index 604592ef..aaa4969e 100644 --- a/dlx_rest/templates/base.html +++ b/dlx_rest/templates/base.html @@ -80,17 +80,17 @@
    From c6b45cd958deb0f493a91d3da9205581441c1595 Mon Sep 17 00:00:00 2001 From: Aaron Helton Date: Fri, 26 Jul 2024 15:55:06 -0400 Subject: [PATCH 19/22] add export "list type" in search args and try to use it in export.js --- dlx_rest/api/__init__.py | 22 ++++++++++++++-------- dlx_rest/static/js/modals/export.js | 8 ++++++++ 2 files changed, 22 insertions(+), 8 deletions(-) diff --git a/dlx_rest/api/__init__.py b/dlx_rest/api/__init__.py index e9a1659c..7547de4d 100644 --- a/dlx_rest/api/__init__.py +++ b/dlx_rest/api/__init__.py @@ -218,6 +218,13 @@ class RecordsList(Resource): help='Toggle the search type between Atas and Community', default='community' ) + args.add_argument( + 'listtype', + type=str, + choices=['default','export'], + help='Choose whether this is a record export or not', + default='default' + ) @ns.doc(description='Return a list of MARC Bibliographic or Authority Records') @ns.expect(args) @@ -276,12 +283,17 @@ def get(self, collection): # limit limit = int(args.limit or 100) + + # List type + list_type = args.listtype or 'default' + print(list_type) # format fmt = args['format'] or None - if fmt != 'brief_speech' and limit > 1000: - abort(404, 'Maximum limit is 1000') + if limit > 1000: + if fmt != brief_speech and list_type != 'export': + abort(404, 'Maximum limit is 1000') if fmt == 'brief': tags = ['191', '245', '269', '520', '596', '700', '710', '711', '791', '989', '991', '992'] if collection == 'bibs' \ @@ -448,12 +460,6 @@ def post(self, collection): else: abort(500, 'POST request failed for unknown reasons') -# Records Export -@ns.route('/marc//records/export') -@ns.param('collection', "bibs" or "auths") -class RecordsExport(Resource): - def post(self): - pass # Records list count @ns.route('/marc//records/count') diff --git a/dlx_rest/static/js/modals/export.js b/dlx_rest/static/js/modals/export.js index 0bed148e..28285728 100644 --- a/dlx_rest/static/js/modals/export.js +++ b/dlx_rest/static/js/modals/export.js @@ -74,12 +74,20 @@ export let exportmodal = { setFormat(format) { this.selectedFormat = format this.selectedExportUrl = this.links.format[format.toUpperCase()] + let url = new URL(this.selectedExportUrl) + let search = new URLSearchParams(url.search) + search.set("limit", 10000) + search.set("listtype", "export") + url.search = search + this.selectedExportUrl = url }, setOutputFields(e) { this.selectedFields = e.target.value let url = new URL(this.selectedExportUrl) let search = new URLSearchParams(url.search) search.set("fields", e.target.value) + search.set("limit", 10000) + search.set("listtype", "export") url.search = search this.selectedExportUrl = url }, From 8f2283a9411ddd6eca13369b4e54116fb02be69e Mon Sep 17 00:00:00 2001 From: jbukhari Date: Fri, 2 Aug 2024 13:30:16 -0400 Subject: [PATCH 20/22] Use API pagination to build export file (#1501) * Bump zipp from 3.8.0 to 3.19.1 (#1476) Bumps [zipp](https://github.com/jaraco/zipp) from 3.8.0 to 3.19.1. - [Release notes](https://github.com/jaraco/zipp/releases) - [Changelog](https://github.com/jaraco/zipp/blob/main/NEWS.rst) - [Commits](https://github.com/jaraco/zipp/compare/v3.8.0...v3.19.1) --- updated-dependencies: - dependency-name: zipp dependency-type: direct:production ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * NOT xref; $ regex search; CSV serialization (#1450) * update dlx * enable csv and tsv formatted records list api response * update dlx and urllib3 * Enable subtype=all search and count (#1465) * enable subtype=all search and count * enable subtype=all from record editor and highlight all bibs collections (#1467) * enable subtype=all from record editor and highlight all bibs collections * Update count component to link to subtype=all searches for auths --------- Co-authored-by: Aaron Helton * delete 999 on auth clone (#1468) * Update python-tests.yml (#1473) Run tests on PRs against all branches * browse list bugfixes (#1475) * Build auth cache on startup (#1480) * build auth cache on startup * Update dlx * update dlx * Update workflow triggers (#1481) * Bump sentry-sdk from 1.25.1 to 2.8.0 (#1482) Bumps [sentry-sdk](https://github.com/getsentry/sentry-python) from 1.25.1 to 2.8.0. - [Release notes](https://github.com/getsentry/sentry-python/releases) - [Changelog](https://github.com/getsentry/sentry-python/blob/master/CHANGELOG.md) - [Commits](https://github.com/getsentry/sentry-python/compare/1.25.1...2.8.0) --- updated-dependencies: - dependency-name: sentry-sdk dependency-type: direct:production ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * make a new read-only record view (#1483) * make a new read-only record view * add edit link and control fields * downgrade Vue 2 because the latest release breaks advanced search (#1485) * Bump version to 2.10.12 (#1494) Fixes #1486 * Add subtype filtering to bibs search pages (#1497) * build export file by paginating api * adjust xml buffer * spinner and layout tweaks * reload window on modal close to cancel ongoing page fetching * show api page traversal status * xml node list syntax bugfix --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Aaron Helton --- .github/workflows/python-tests.yml | 2 +- dlx_rest/api/__init__.py | 30 +- dlx_rest/api/utils.py | 2 - dlx_rest/config.py | 2 +- dlx_rest/routes.py | 4 +- dlx_rest/static/js/modals/export.js | 103 +- dlx_rest/static/js/readonly_record.js | 29 + dlx_rest/static/js/search/sort.js | 24 +- dlx_rest/static/js/vue/vue2.js | 12020 +++++++++++++++++++++++- dlx_rest/templates/record.html | 15 +- requirements.txt | 4 +- 11 files changed, 12168 insertions(+), 67 deletions(-) create mode 100644 dlx_rest/static/js/readonly_record.js diff --git a/.github/workflows/python-tests.yml b/.github/workflows/python-tests.yml index 82c1aa3b..baf40c02 100644 --- a/.github/workflows/python-tests.yml +++ b/.github/workflows/python-tests.yml @@ -5,7 +5,7 @@ name: Python package on: pull_request: - types: [ opened ] + types: [ opened, synchronize, reponend ] env: DLX_REST_TESTING: True diff --git a/dlx_rest/api/__init__.py b/dlx_rest/api/__init__.py index 7547de4d..9a443b26 100644 --- a/dlx_rest/api/__init__.py +++ b/dlx_rest/api/__init__.py @@ -31,13 +31,13 @@ from dlx_rest.api.utils import ClassDispatch, URL, ApiResponse, Schemas, abort, brief_bib, brief_auth, brief_speech, item_locked, has_permission # Init -authorizations = { - 'basic': { - 'type': 'basic' - } -} -api = Api(app, doc='/api/', authorizations=authorizations) +# build the auth cache in a non blocking thread +def build_cache(): Auth.build_cache() + +threading.Thread(target=build_cache, args=[]).start() + +api = Api(app, doc='/api/', authorizations={'basic': {'type': 'basic'}}) ns = api.namespace('api', description='DLX MARC REST API') # Set up the login manager for the API @@ -218,13 +218,6 @@ class RecordsList(Resource): help='Toggle the search type between Atas and Community', default='community' ) - args.add_argument( - 'listtype', - type=str, - choices=['default','export'], - help='Choose whether this is a record export or not', - default='default' - ) @ns.doc(description='Return a list of MARC Bibliographic or Authority Records') @ns.expect(args) @@ -283,17 +276,12 @@ def get(self, collection): # limit limit = int(args.limit or 100) - - # List type - list_type = args.listtype or 'default' - print(list_type) # format fmt = args['format'] or None - if limit > 1000: - if fmt != brief_speech and list_type != 'export': - abort(404, 'Maximum limit is 1000') + if fmt != 'brief_speech' and limit > 1000: + abort(404, 'Maximum limit is 1000') if fmt == 'brief': tags = ['191', '245', '269', '520', '596', '700', '710', '711', '791', '989', '991', '992'] if collection == 'bibs' \ @@ -304,7 +292,7 @@ def get(self, collection): project = dict.fromkeys(tags, True) elif fmt == 'brief_speech': tags = ['269', '596', '700', '710', '711', '791', '991', '992'] - + # make sure logical fields are available for sorting tags += (list(DlxConfig.bib_logical_fields.keys()) + list(DlxConfig.auth_logical_fields.keys())) project = dict.fromkeys(tags, True) diff --git a/dlx_rest/api/utils.py b/dlx_rest/api/utils.py index 060598d8..0e28cd33 100644 --- a/dlx_rest/api/utils.py +++ b/dlx_rest/api/utils.py @@ -211,7 +211,6 @@ def brief_bib(record): # Should be truncated in display with hover showing the rest f520 = [record.get_value('520', 'a')] - print(f520) return { '_id': record.id, @@ -323,7 +322,6 @@ def has_permission(user, action, record, collection): bool_list.append("F") else: bool_list.append("F") - #print("boolean list:",bool_list) if "F" in bool_list: return False else: diff --git a/dlx_rest/config.py b/dlx_rest/config.py index 771b07fa..1844229e 100644 --- a/dlx_rest/config.py +++ b/dlx_rest/config.py @@ -6,7 +6,7 @@ class Config(object): DEBUG = False TESTING = False - VERSION = "v2.10.10" # Set this in each new milestone/release. + VERSION = "v2.10.12" # Set this in each new milestone/release. bucket = 'undl-files' diff --git a/dlx_rest/routes.py b/dlx_rest/routes.py index 3cd39422..34fd92ee 100644 --- a/dlx_rest/routes.py +++ b/dlx_rest/routes.py @@ -575,10 +575,8 @@ def review_speeches(): @app.route('/records//', methods=['GET']) @login_required def get_record_by_id(coll,id): - # register the permission, but don't require it yet, TBI - #register_permission('updateRecord') this_prefix = url_for('doc', _external=True) - return render_template('record.html', coll=coll, record_id=id, prefix=this_prefix) + return render_template('record.html', collection=coll, record_id=id, api_prefix=this_prefix) @app.route('/records//new') @login_required diff --git a/dlx_rest/static/js/modals/export.js b/dlx_rest/static/js/modals/export.js index 28285728..bdc5b12b 100644 --- a/dlx_rest/static/js/modals/export.js +++ b/dlx_rest/static/js/modals/export.js @@ -11,19 +11,13 @@ export let exportmodal = {
    -
    +
    Export Results
    -
    - -
    -
    Select format: @@ -45,11 +39,16 @@ export let exportmodal = {
    - - - - - +
    + +
    +  {{ currentPage }} +
    +
    + +
    @@ -63,7 +62,8 @@ export let exportmodal = { showSpinner: false, selectedFormat: 'mrk', selectedFields: null, - selectedExportUrl: null + selectedExportUrl: null, + currentPage: null } }, methods: { @@ -76,8 +76,9 @@ export let exportmodal = { this.selectedExportUrl = this.links.format[format.toUpperCase()] let url = new URL(this.selectedExportUrl) let search = new URLSearchParams(url.search) - search.set("limit", 10000) - search.set("listtype", "export") + search.set("start", 1) + search.set("limit", 100) + //search.set("listtype", "export") url.search = search this.selectedExportUrl = url }, @@ -86,17 +87,67 @@ export let exportmodal = { let url = new URL(this.selectedExportUrl) let search = new URLSearchParams(url.search) search.set("fields", e.target.value) - search.set("limit", 10000) + search.set("limit", 100) search.set("listtype", "export") url.search = search this.selectedExportUrl = url }, - /* submitExport() { - fetch(this.selectedExportUrl).then( response => { - response.blob().then( blob => { - this.download(blob, `export.${this.selectedFormat}`) - }) - }) + async submitExport() { + this.currentPage = null; + this.showSpinner = true; + const url = new URL(this.selectedExportUrl); + const params = new URLSearchParams(url.search); + const format = params.get("format"); + const countUrl = this.selectedExportUrl.toString().replace('/records', '/records/count'); + const total = await fetch(countUrl).then(response => response.json()).then(json => json['data']); + let currentUrl = this.selectedExportUrl; + let page = 0; + let mimetype = null; + let buffer = ''; + let xml = format === 'xml' ? + // XMLDocument object will be used to combine xml from each page + (new DOMParser()).parseFromString("", "text/xml") : + null; + + while (true) { + // cycle through pages synchronously until no more records are found + const response = await fetch(currentUrl); + const blob = await response.blob(); + const text = await blob.text(); + mimetype = response.headers.get("Content-Type"); + + if (mimetype.match('^text/xml')) { + const pageXml = (new DOMParser()).parseFromString(text, "text/xml") + const recordNodes = pageXml.getElementsByTagName("record") + + if (recordNodes.length > 0) { + for (const recordXml of [...recordNodes]) { // have to use the "..." operator on the node list to treat it as an array + xml.getElementsByTagName("collection")[0].appendChild(recordXml); + } + } else { + // end of results + break + } + } else if (text) { + // mrk, csv are plain text + buffer += text + } else { + // end of results + break + } + + let newUrl = new URL(currentUrl); + let params = new URLSearchParams(newUrl.search); + params.set("start", Number(params.get("start")) + Number(params.get("limit"))); + newUrl.search = params; + currentUrl = newUrl; + this.currentPage = `page: ${++page} / ${Math.ceil(total / 100)}`; + } + + const blob = new File([format === 'xml' ? (new XMLSerializer()).serializeToString(xml) : buffer], {"type": mimetype}); + this.download(blob, `export.${this.selectedFormat}`); + this.showSpinner = false; + this.currentPage = "Done!" }, download(blob, filename) { const url = window.URL.createObjectURL(blob) @@ -108,6 +159,10 @@ export let exportmodal = { a.click() document.body.removeChild(a) window.URL.revokeObjectURL(url) - } */ + }, + reloadPage() { + // this doesn't work when embedded in the template for some reason + location.reload() + } } } \ No newline at end of file diff --git a/dlx_rest/static/js/readonly_record.js b/dlx_rest/static/js/readonly_record.js new file mode 100644 index 00000000..2896ff50 --- /dev/null +++ b/dlx_rest/static/js/readonly_record.js @@ -0,0 +1,29 @@ +import { Jmarc } from "./jmarc.mjs" + +export let readonlyrecord = { + props: ["api_prefix", "collection", "record_id"], + template: `
    +
    {{record.getVirtualCollection()}}/{{record_id}}
    +
    + {{field.tag}} + {{field.value}} + + \${{subfield.code}}{{subfield.value}} + +
    +
    `, + data: function () { + return { + record: {} + } + }, + created: function () { + Jmarc.apiUrl = this.api_prefix + + let promise = Jmarc.get(this.collection, this.record_id) + + promise.then( jmarc => { + this.record = jmarc + }) + } +} \ No newline at end of file diff --git a/dlx_rest/static/js/search/sort.js b/dlx_rest/static/js/search/sort.js index ecb8e172..977e9341 100644 --- a/dlx_rest/static/js/search/sort.js +++ b/dlx_rest/static/js/search/sort.js @@ -5,6 +5,7 @@ export let sortcomponent = {
    Results per page
    Sort
    +
    Filter
    Direction
    @@ -24,6 +25,26 @@ export let sortcomponent = {
    +
    + +
    • @@ -90,7 +111,8 @@ export let sortcomponent = { {"displayName": "asc", "searchString": "asc"}, {"displayName": "desc", "searchString": "desc"} ], - freeText: this.isFreeText + freeText: this.isFreeText, + vcoll: vcoll } }, mounted: function() { diff --git a/dlx_rest/static/js/vue/vue2.js b/dlx_rest/static/js/vue/vue2.js index 5b49427d..954292cc 100644 --- a/dlx_rest/static/js/vue/vue2.js +++ b/dlx_rest/static/js/vue/vue2.js @@ -1,11 +1,12015 @@ /*! - * Vue.js v2.7.16 - * (c) 2014-2023 Evan You + * Vue.js v2.6.14 + * (c) 2014-2021 Evan You * Released under the MIT License. */ -/*! - * Vue.js v2.7.16 - * (c) 2014-2023 Evan You - * Released under the MIT License. - */ -!function(t,e){"object"==typeof exports&&"undefined"!=typeof module?module.exports=e():"function"==typeof define&&define.amd?define(e):(t="undefined"!=typeof globalThis?globalThis:t||self).Vue=e()}(this,(function(){"use strict";var t=Object.freeze({}),e=Array.isArray;function n(t){return null==t}function r(t){return null!=t}function o(t){return!0===t}function i(t){return"string"==typeof t||"number"==typeof t||"symbol"==typeof t||"boolean"==typeof t}function a(t){return"function"==typeof t}function s(t){return null!==t&&"object"==typeof t}var c=Object.prototype.toString;function u(t){return"[object Object]"===c.call(t)}function l(t){var e=parseFloat(String(t));return e>=0&&Math.floor(e)===e&&isFinite(t)}function f(t){return r(t)&&"function"==typeof t.then&&"function"==typeof t.catch}function d(t){return null==t?"":Array.isArray(t)||u(t)&&t.toString===c?JSON.stringify(t,p,2):String(t)}function p(t,e){return e&&e.__v_isRef?e.value:e}function v(t){var e=parseFloat(t);return isNaN(e)?t:e}function h(t,e){for(var n=Object.create(null),r=t.split(","),o=0;o-1)return t.splice(r,1)}}var _=Object.prototype.hasOwnProperty;function b(t,e){return _.call(t,e)}function $(t){var e=Object.create(null);return function(n){return e[n]||(e[n]=t(n))}}var w=/-(\w)/g,x=$((function(t){return t.replace(w,(function(t,e){return e?e.toUpperCase():""}))})),C=$((function(t){return t.charAt(0).toUpperCase()+t.slice(1)})),k=/\B([A-Z])/g,S=$((function(t){return t.replace(k,"-$1").toLowerCase()}));var O=Function.prototype.bind?function(t,e){return t.bind(e)}:function(t,e){function n(n){var r=arguments.length;return r?r>1?t.apply(e,arguments):t.call(e,n):t.call(e)}return n._length=t.length,n};function T(t,e){e=e||0;for(var n=t.length-e,r=new Array(n);n--;)r[n]=t[n+e];return r}function A(t,e){for(var n in e)t[n]=e[n];return t}function j(t){for(var e={},n=0;n0,X=W&&W.indexOf("edge/")>0;W&&W.indexOf("android");var Y=W&&/iphone|ipad|ipod|ios/.test(W);W&&/chrome\/\d+/.test(W),W&&/phantomjs/.test(W);var Q,tt=W&&W.match(/firefox\/(\d+)/),et={}.watch,nt=!1;if(q)try{var rt={};Object.defineProperty(rt,"passive",{get:function(){nt=!0}}),window.addEventListener("test-passive",null,rt)}catch(t){}var ot=function(){return void 0===Q&&(Q=!q&&"undefined"!=typeof global&&(global.process&&"server"===global.process.env.VUE_ENV)),Q},it=q&&window.__VUE_DEVTOOLS_GLOBAL_HOOK__;function at(t){return"function"==typeof t&&/native code/.test(t.toString())}var st,ct="undefined"!=typeof Symbol&&at(Symbol)&&"undefined"!=typeof Reflect&&at(Reflect.ownKeys);st="undefined"!=typeof Set&&at(Set)?Set:function(){function t(){this.set=Object.create(null)}return t.prototype.has=function(t){return!0===this.set[t]},t.prototype.add=function(t){this.set[t]=!0},t.prototype.clear=function(){this.set=Object.create(null)},t}();var ut=null;function lt(t){void 0===t&&(t=null),t||ut&&ut._scope.off(),ut=t,t&&t._scope.on()}var ft=function(){function t(t,e,n,r,o,i,a,s){this.tag=t,this.data=e,this.children=n,this.text=r,this.elm=o,this.ns=void 0,this.context=i,this.fnContext=void 0,this.fnOptions=void 0,this.fnScopeId=void 0,this.key=e&&e.key,this.componentOptions=a,this.componentInstance=void 0,this.parent=void 0,this.raw=!1,this.isStatic=!1,this.isRootInsert=!0,this.isComment=!1,this.isCloned=!1,this.isOnce=!1,this.asyncFactory=s,this.asyncMeta=void 0,this.isAsyncPlaceholder=!1}return Object.defineProperty(t.prototype,"child",{get:function(){return this.componentInstance},enumerable:!1,configurable:!0}),t}(),dt=function(t){void 0===t&&(t="");var e=new ft;return e.text=t,e.isComment=!0,e};function pt(t){return new ft(void 0,void 0,void 0,String(t))}function vt(t){var e=new ft(t.tag,t.data,t.children&&t.children.slice(),t.text,t.elm,t.context,t.componentOptions,t.asyncFactory);return e.ns=t.ns,e.isStatic=t.isStatic,e.key=t.key,e.isComment=t.isComment,e.fnContext=t.fnContext,e.fnOptions=t.fnOptions,e.fnScopeId=t.fnScopeId,e.asyncMeta=t.asyncMeta,e.isCloned=!0,e}"function"==typeof SuppressedError&&SuppressedError;var ht=0,mt=[],gt=function(){for(var t=0;t0&&(ne((c=re(c,"".concat(a||"","_").concat(s)))[0])&&ne(l)&&(f[u]=pt(l.text+c[0].text),c.shift()),f.push.apply(f,c)):i(c)?ne(l)?f[u]=pt(l.text+c):""!==c&&f.push(pt(c)):ne(c)&&ne(l)?f[u]=pt(l.text+c.text):(o(t._isVList)&&r(c.tag)&&n(c.key)&&r(a)&&(c.key="__vlist".concat(a,"_").concat(s,"__")),f.push(c)));return f}var oe=1,ie=2;function ae(t,n,c,u,l,f){return(e(c)||i(c))&&(l=u,u=c,c=void 0),o(f)&&(l=ie),function(t,n,o,i,c){if(r(o)&&r(o.__ob__))return dt();r(o)&&r(o.is)&&(n=o.is);if(!n)return dt();e(i)&&a(i[0])&&((o=o||{}).scopedSlots={default:i[0]},i.length=0);c===ie?i=ee(i):c===oe&&(i=function(t){for(var n=0;n0,s=n?!!n.$stable:!a,c=n&&n.$key;if(n){if(n._normalized)return n._normalized;if(s&&o&&o!==t&&c===o.$key&&!a&&!o.$hasNormal)return o;for(var u in i={},n)n[u]&&"$"!==u[0]&&(i[u]=Oe(e,r,u,n[u]))}else i={};for(var l in r)l in i||(i[l]=Te(r,l));return n&&Object.isExtensible(n)&&(n._normalized=i),V(i,"$stable",s),V(i,"$key",c),V(i,"$hasNormal",a),i}function Oe(t,n,r,o){var i=function(){var n=ut;lt(t);var r=arguments.length?o.apply(null,arguments):o({}),i=(r=r&&"object"==typeof r&&!e(r)?[r]:ee(r))&&r[0];return lt(n),r&&(!i||1===r.length&&i.isComment&&!ke(i))?void 0:r};return o.proxy&&Object.defineProperty(n,r,{get:i,enumerable:!0,configurable:!0}),i}function Te(t,e){return function(){return t[e]}}function Ae(e){return{get attrs(){if(!e._attrsProxy){var n=e._attrsProxy={};V(n,"_v_attr_proxy",!0),je(n,e.$attrs,t,e,"$attrs")}return e._attrsProxy},get listeners(){e._listenersProxy||je(e._listenersProxy={},e.$listeners,t,e,"$listeners");return e._listenersProxy},get slots(){return function(t){t._slotsProxy||Ne(t._slotsProxy={},t.$scopedSlots);return t._slotsProxy}(e)},emit:O(e.$emit,e),expose:function(t){t&&Object.keys(t).forEach((function(n){return zt(e,t,n)}))}}}function je(t,e,n,r,o){var i=!1;for(var a in e)a in t?e[a]!==n[a]&&(i=!0):(i=!0,Ee(t,a,r,o));for(var a in t)a in e||(i=!0,delete t[a]);return i}function Ee(t,e,n,r){Object.defineProperty(t,e,{enumerable:!0,configurable:!0,get:function(){return n[r][e]}})}function Ne(t,e){for(var n in e)t[n]=e[n];for(var n in t)n in e||delete t[n]}function Pe(){var t=ut;return t._setupContext||(t._setupContext=Ae(t))}var De,Me,Ie=null;function Le(t,e){return(t.__esModule||ct&&"Module"===t[Symbol.toStringTag])&&(t=t.default),s(t)?e.extend(t):t}function Re(t){if(e(t))for(var n=0;ndocument.createEvent("Event").timeStamp&&(on=function(){return an.now()})}var sn=function(t,e){if(t.post){if(!e.post)return 1}else if(e.post)return-1;return t.id-e.id};function cn(){var t,e;for(rn=on(),en=!0,Xe.sort(sn),nn=0;nnnn&&Xe[n].id>t.id;)n--;Xe.splice(n+1,0,t)}else Xe.push(t);tn||(tn=!0,En(cn))}}var ln="watcher",fn="".concat(ln," callback"),dn="".concat(ln," getter"),pn="".concat(ln," cleanup");function vn(t,e){return mn(t,null,{flush:"post"})}var hn={};function mn(n,r,o){var i=void 0===o?t:o,s=i.immediate,c=i.deep,u=i.flush,l=void 0===u?"pre":u;i.onTrack,i.onTrigger;var f,d,p=ut,v=function(t,e,n){void 0===n&&(n=null);var r=_n(t,null,n,p,e);return c&&r&&r.__ob__&&r.__ob__.dep.depend(),r},h=!1,m=!1;if(Bt(n)?(f=function(){return n.value},h=Rt(n)):Lt(n)?(f=function(){return n.__ob__.dep.depend(),n},c=!0):e(n)?(m=!0,h=n.some((function(t){return Lt(t)||Rt(t)})),f=function(){return n.map((function(t){return Bt(t)?t.value:Lt(t)?(t.__ob__.dep.depend(),Wn(t)):a(t)?v(t,dn):void 0}))}):f=a(n)?r?function(){return v(n,dn)}:function(){if(!p||!p._isDestroyed)return d&&d(),v(n,ln,[y])}:E,r&&c){var g=f;f=function(){return Wn(g())}}var y=function(t){d=_.onStop=function(){v(t,pn)}};if(ot())return y=E,r?s&&v(r,fn,[f(),m?[]:void 0,y]):f(),E;var _=new Xn(ut,f,E,{lazy:!0});_.noRecurse=!r;var b=m?[]:hn;return _.run=function(){if(_.active)if(r){var t=_.get();(c||h||(m?t.some((function(t,e){return L(t,b[e])})):L(t,b)))&&(d&&d(),v(r,fn,[t,b===hn?void 0:b,y]),b=t)}else _.get()},"sync"===l?_.update=_.run:"post"===l?(_.post=!0,_.update=function(){return un(_)}):_.update=function(){if(p&&p===ut&&!p._isMounted){var t=p._preWatchers||(p._preWatchers=[]);t.indexOf(_)<0&&t.push(_)}else un(_)},r?s?_.run():b=_.get():"post"===l&&p?p.$once("hook:mounted",(function(){return _.get()})):_.get(),function(){_.teardown()}}function gn(t){var e=t._provided,n=t.$parent&&t.$parent._provided;return n===e?t._provided=Object.create(n):e}function yn(t,e,n){bt();try{if(e)for(var r=e;r=r.$parent;){var o=r.$options.errorCaptured;if(o)for(var i=0;i1)return n&&a(e)?e.call(r):e}},h:function(t,e,n){return ae(ut,t,e,n,2,!0)},getCurrentInstance:function(){return ut&&{proxy:ut}},useSlots:function(){return Pe().slots},useAttrs:function(){return Pe().attrs},useListeners:function(){return Pe().listeners},mergeDefaults:function(t,n){var r=e(t)?t.reduce((function(t,e){return t[e]={},t}),{}):t;for(var o in n){var i=r[o];i?e(i)||a(i)?r[o]={type:i,default:n[o]}:i.default=n[o]:null===i&&(r[o]={default:n[o]})}return r},nextTick:En,set:Nt,del:Pt,useCssModule:function(e){return t},useCssVars:function(t){if(q){var e=ut;e&&vn((function(){var n=e.$el,r=t(e,e._setupProxy);if(n&&1===n.nodeType){var o=n.style;for(var i in r)o.setProperty("--".concat(i),r[i])}}))}},defineAsyncComponent:function(t){a(t)&&(t={loader:t});var e=t.loader,n=t.loadingComponent,r=t.errorComponent,o=t.delay,i=void 0===o?200:o,s=t.timeout;t.suspensible;var c=t.onError,u=null,l=0,f=function(){var t;return u||(t=u=e().catch((function(t){if(t=t instanceof Error?t:new Error(String(t)),c)return new Promise((function(e,n){c(t,(function(){return e((l++,u=null,f()))}),(function(){return n(t)}),l+1)}));throw t})).then((function(e){return t!==u&&u?u:(e&&(e.__esModule||"Module"===e[Symbol.toStringTag])&&(e=e.default),e)})))};return function(){return{component:f(),delay:i,timeout:s,error:r,loading:n}}},onBeforeMount:Pn,onMounted:Dn,onBeforeUpdate:Mn,onUpdated:In,onBeforeUnmount:Ln,onUnmounted:Rn,onActivated:Fn,onDeactivated:Hn,onServerPrefetch:Bn,onRenderTracked:Un,onRenderTriggered:zn,onErrorCaptured:function(t,e){void 0===e&&(e=ut),Vn(t,e)}}),qn=new st;function Wn(t){return Zn(t,qn),qn.clear(),t}function Zn(t,n){var r,o,i=e(t);if(!(!i&&!s(t)||t.__v_skip||Object.isFrozen(t)||t instanceof ft)){if(t.__ob__){var a=t.__ob__.dep.id;if(n.has(a))return;n.add(a)}if(i)for(r=t.length;r--;)Zn(t[r],n);else if(Bt(t))Zn(t.value,n);else for(r=(o=Object.keys(t)).length;r--;)Zn(t[o[r]],n)}}var Gn=0,Xn=function(){function t(t,e,n,r,o){!function(t,e){void 0===e&&(e=Me),e&&e.active&&e.effects.push(t)}(this,Me&&!Me._vm?Me:t?t._scope:void 0),(this.vm=t)&&o&&(t._watcher=this),r?(this.deep=!!r.deep,this.user=!!r.user,this.lazy=!!r.lazy,this.sync=!!r.sync,this.before=r.before):this.deep=this.user=this.lazy=this.sync=!1,this.cb=n,this.id=++Gn,this.active=!0,this.post=!1,this.dirty=this.lazy,this.deps=[],this.newDeps=[],this.depIds=new st,this.newDepIds=new st,this.expression="",a(e)?this.getter=e:(this.getter=function(t){if(!K.test(t)){var e=t.split(".");return function(t){for(var n=0;n-1)if(i&&!b(o,"default"))s=!1;else if(""===s||s===S(t)){var u=jr(String,o.type);(u<0||c-1:"string"==typeof t?t.split(",").indexOf(n)>-1:(r=t,"[object RegExp]"===c.call(r)&&t.test(n));var r}function Mr(t,e){var n=t.cache,r=t.keys,o=t._vnode,i=t.$vnode;for(var a in n){var s=n[a];if(s){var c=s.name;c&&!e(c)&&Ir(n,a,r,o)}}i.componentOptions.children=void 0}function Ir(t,e,n,r){var o=t[e];!o||r&&o.tag===r.tag||o.componentInstance.$destroy(),t[e]=null,y(n,e)}!function(e){e.prototype._init=function(e){var n=this;n._uid=sr++,n._isVue=!0,n.__v_skip=!0,n._scope=new ze(!0),n._scope.parent=void 0,n._scope._vm=!0,e&&e._isComponent?function(t,e){var n=t.$options=Object.create(t.constructor.options),r=e._parentVnode;n.parent=e.parent,n._parentVnode=r;var o=r.componentOptions;n.propsData=o.propsData,n._parentListeners=o.listeners,n._renderChildren=o.children,n._componentTag=o.tag,e.render&&(n.render=e.render,n.staticRenderFns=e.staticRenderFns)}(n,e):n.$options=Cr(cr(n.constructor),e||{},n),n._renderProxy=n,n._self=n,function(t){var e=t.$options,n=e.parent;if(n&&!e.abstract){for(;n.$options.abstract&&n.$parent;)n=n.$parent;n.$children.push(t)}t.$parent=n,t.$root=n?n.$root:t,t.$children=[],t.$refs={},t._provided=n?n._provided:Object.create(null),t._watcher=null,t._inactive=null,t._directInactive=!1,t._isMounted=!1,t._isDestroyed=!1,t._isBeingDestroyed=!1}(n),function(t){t._events=Object.create(null),t._hasHookEvent=!1;var e=t.$options._parentListeners;e&&Ue(t,e)}(n),function(e){e._vnode=null,e._staticTrees=null;var n=e.$options,r=e.$vnode=n._parentVnode,o=r&&r.context;e.$slots=xe(n._renderChildren,o),e.$scopedSlots=r?Se(e.$parent,r.data.scopedSlots,e.$slots):t,e._c=function(t,n,r,o){return ae(e,t,n,r,o,!1)},e.$createElement=function(t,n,r,o){return ae(e,t,n,r,o,!0)};var i=r&&r.data;Et(e,"$attrs",i&&i.attrs||t,null,!0),Et(e,"$listeners",n._parentListeners||t,null,!0)}(n),Ge(n,"beforeCreate",void 0,!1),function(t){var e=ar(t.$options.inject,t);e&&(Ot(!1),Object.keys(e).forEach((function(n){Et(t,n,e[n])})),Ot(!0))}(n),tr(n),function(t){var e=t.$options.provide;if(e){var n=a(e)?e.call(t):e;if(!s(n))return;for(var r=gn(t),o=ct?Reflect.ownKeys(n):Object.keys(n),i=0;i1?T(n):n;for(var r=T(arguments,1),o='event handler for "'.concat(t,'"'),i=0,a=n.length;iparseInt(this.max)&&Ir(e,n[0],n,this._vnode),this.vnodeToCache=null}}},created:function(){this.cache=Object.create(null),this.keys=[]},destroyed:function(){for(var t in this.cache)Ir(this.cache,t,this.keys)},mounted:function(){var t=this;this.cacheVNode(),this.$watch("include",(function(e){Mr(t,(function(t){return Dr(e,t)}))})),this.$watch("exclude",(function(e){Mr(t,(function(t){return!Dr(e,t)}))}))},updated:function(){this.cacheVNode()},render:function(){var t=this.$slots.default,e=Re(t),n=e&&e.componentOptions;if(n){var r=Pr(n),o=this.include,i=this.exclude;if(o&&(!r||!Dr(o,r))||i&&r&&Dr(i,r))return e;var a=this.cache,s=this.keys,c=null==e.key?n.Ctor.cid+(n.tag?"::".concat(n.tag):""):e.key;a[c]?(e.componentInstance=a[c].componentInstance,y(s,c),s.push(c)):(this.vnodeToCache=e,this.keyToCache=c),e.data.keepAlive=!0}return e||t&&t[0]}},Fr={KeepAlive:Rr};!function(t){var e={get:function(){return B}};Object.defineProperty(t,"config",e),t.util={warn:gr,extend:A,mergeOptions:Cr,defineReactive:Et},t.set=Nt,t.delete=Pt,t.nextTick=En,t.observable=function(t){return jt(t),t},t.options=Object.create(null),F.forEach((function(e){t.options[e+"s"]=Object.create(null)})),t.options._base=t,A(t.options.components,Fr),function(t){t.use=function(t){var e=this._installedPlugins||(this._installedPlugins=[]);if(e.indexOf(t)>-1)return this;var n=T(arguments,1);return n.unshift(this),a(t.install)?t.install.apply(t,n):a(t)&&t.apply(null,n),e.push(t),this}}(t),function(t){t.mixin=function(t){return this.options=Cr(this.options,t),this}}(t),Nr(t),function(t){F.forEach((function(e){t[e]=function(t,n){return n?("component"===e&&u(n)&&(n.name=n.name||t,n=this.options._base.extend(n)),"directive"===e&&a(n)&&(n={bind:n,update:n}),this.options[e+"s"][t]=n,n):this.options[e+"s"][t]}}))}(t)}(Er),Object.defineProperty(Er.prototype,"$isServer",{get:ot}),Object.defineProperty(Er.prototype,"$ssrContext",{get:function(){return this.$vnode&&this.$vnode.ssrContext}}),Object.defineProperty(Er,"FunctionalRenderContext",{value:ur}),Er.version=Kn;var Hr=h("style,class"),Br=h("input,textarea,option,select,progress"),Ur=function(t,e,n){return"value"===n&&Br(t)&&"button"!==e||"selected"===n&&"option"===t||"checked"===n&&"input"===t||"muted"===n&&"video"===t},zr=h("contenteditable,draggable,spellcheck"),Vr=h("events,caret,typing,plaintext-only"),Kr=function(t,e){return Gr(e)||"false"===e?"false":"contenteditable"===t&&Vr(e)?e:"true"},Jr=h("allowfullscreen,async,autofocus,autoplay,checked,compact,controls,declare,default,defaultchecked,defaultmuted,defaultselected,defer,disabled,enabled,formnovalidate,hidden,indeterminate,inert,ismap,itemscope,loop,multiple,muted,nohref,noresize,noshade,novalidate,nowrap,open,pauseonexit,readonly,required,reversed,scoped,seamless,selected,sortable,truespeed,typemustmatch,visible"),qr="http://www.w3.org/1999/xlink",Wr=function(t){return":"===t.charAt(5)&&"xlink"===t.slice(0,5)},Zr=function(t){return Wr(t)?t.slice(6,t.length):""},Gr=function(t){return null==t||!1===t};function Xr(t){for(var e=t.data,n=t,o=t;r(o.componentInstance);)(o=o.componentInstance._vnode)&&o.data&&(e=Yr(o.data,e));for(;r(n=n.parent);)n&&n.data&&(e=Yr(e,n.data));return function(t,e){if(r(t)||r(e))return Qr(t,to(e));return""}(e.staticClass,e.class)}function Yr(t,e){return{staticClass:Qr(t.staticClass,e.staticClass),class:r(t.class)?[t.class,e.class]:e.class}}function Qr(t,e){return t?e?t+" "+e:t:e||""}function to(t){return Array.isArray(t)?function(t){for(var e,n="",o=0,i=t.length;o-1?Oo(t,e,n):Jr(e)?Gr(n)?t.removeAttribute(e):(n="allowfullscreen"===e&&"EMBED"===t.tagName?"true":e,t.setAttribute(e,n)):zr(e)?t.setAttribute(e,Kr(e,n)):Wr(e)?Gr(n)?t.removeAttributeNS(qr,Zr(e)):t.setAttributeNS(qr,e,n):Oo(t,e,n)}function Oo(t,e,n){if(Gr(n))t.removeAttribute(e);else{if(Z&&!G&&"TEXTAREA"===t.tagName&&"placeholder"===e&&""!==n&&!t.__ieph){var r=function(e){e.stopImmediatePropagation(),t.removeEventListener("input",r)};t.addEventListener("input",r),t.__ieph=!0}t.setAttribute(e,n)}}var To={create:ko,update:ko};function Ao(t,e){var o=e.elm,i=e.data,a=t.data;if(!(n(i.staticClass)&&n(i.class)&&(n(a)||n(a.staticClass)&&n(a.class)))){var s=Xr(e),c=o._transitionClasses;r(c)&&(s=Qr(s,to(c))),s!==o._prevClass&&(o.setAttribute("class",s),o._prevClass=s)}}var jo,Eo,No,Po,Do,Mo,Io={create:Ao,update:Ao},Lo=/[\w).+\-_$\]]/;function Ro(t){var e,n,r,o,i,a=!1,s=!1,c=!1,u=!1,l=0,f=0,d=0,p=0;for(r=0;r=0&&" "===(h=t.charAt(v));v--);h&&Lo.test(h)||(u=!0)}}else void 0===o?(p=r+1,o=t.slice(0,r).trim()):m();function m(){(i||(i=[])).push(t.slice(p,r).trim()),p=r+1}if(void 0===o?o=t.slice(0,r).trim():0!==p&&m(),i)for(r=0;r-1?{exp:t.slice(0,Po),key:'"'+t.slice(Po+1)+'"'}:{exp:t,key:null};Eo=t,Po=Do=Mo=0;for(;!ei();)ni(No=ti())?oi(No):91===No&&ri(No);return{exp:t.slice(0,Do),key:t.slice(Do+1,Mo)}}(t);return null===n.key?"".concat(t,"=").concat(e):"$set(".concat(n.exp,", ").concat(n.key,", ").concat(e,")")}function ti(){return Eo.charCodeAt(++Po)}function ei(){return Po>=jo}function ni(t){return 34===t||39===t}function ri(t){var e=1;for(Do=Po;!ei();)if(ni(t=ti()))oi(t);else if(91===t&&e++,93===t&&e--,0===e){Mo=Po;break}}function oi(t){for(var e=t;!ei()&&(t=ti())!==e;);}var ii,ai="__r",si="__c";function ci(t,e,n){var r=ii;return function o(){null!==e.apply(null,arguments)&&fi(t,o,n,r)}}var ui=xn&&!(tt&&Number(tt[1])<=53);function li(t,e,n,r){if(ui){var o=rn,i=e;e=i._wrapper=function(t){if(t.target===t.currentTarget||t.timeStamp>=o||t.timeStamp<=0||t.target.ownerDocument!==document)return i.apply(this,arguments)}}ii.addEventListener(t,e,nt?{capture:n,passive:r}:n)}function fi(t,e,n,r){(r||ii).removeEventListener(t,e._wrapper||e,n)}function di(t,e){if(!n(t.data.on)||!n(e.data.on)){var o=e.data.on||{},i=t.data.on||{};ii=e.elm||t.elm,function(t){if(r(t[ai])){var e=Z?"change":"input";t[e]=[].concat(t[ai],t[e]||[]),delete t[ai]}r(t[si])&&(t.change=[].concat(t[si],t.change||[]),delete t[si])}(o),Yt(o,i,li,fi,ci,e.context),ii=void 0}}var pi,vi={create:di,update:di,destroy:function(t){return di(t,vo)}};function hi(t,e){if(!n(t.data.domProps)||!n(e.data.domProps)){var i,a,s=e.elm,c=t.data.domProps||{},u=e.data.domProps||{};for(i in(r(u.__ob__)||o(u._v_attr_proxy))&&(u=e.data.domProps=A({},u)),c)i in u||(s[i]="");for(i in u){if(a=u[i],"textContent"===i||"innerHTML"===i){if(e.children&&(e.children.length=0),a===c[i])continue;1===s.childNodes.length&&s.removeChild(s.childNodes[0])}if("value"===i&&"PROGRESS"!==s.tagName){s._value=a;var l=n(a)?"":String(a);mi(s,l)&&(s.value=l)}else if("innerHTML"===i&&ro(s.tagName)&&n(s.innerHTML)){(pi=pi||document.createElement("div")).innerHTML="".concat(a,"");for(var f=pi.firstChild;s.firstChild;)s.removeChild(s.firstChild);for(;f.firstChild;)s.appendChild(f.firstChild)}else if(a!==c[i])try{s[i]=a}catch(t){}}}}function mi(t,e){return!t.composing&&("OPTION"===t.tagName||function(t,e){var n=!0;try{n=document.activeElement!==t}catch(t){}return n&&t.value!==e}(t,e)||function(t,e){var n=t.value,o=t._vModifiers;if(r(o)){if(o.number)return v(n)!==v(e);if(o.trim)return n.trim()!==e.trim()}return n!==e}(t,e))}var gi={create:hi,update:hi},yi=$((function(t){var e={},n=/:(.+)/;return t.split(/;(?![^(]*\))/g).forEach((function(t){if(t){var r=t.split(n);r.length>1&&(e[r[0].trim()]=r[1].trim())}})),e}));function _i(t){var e=bi(t.style);return t.staticStyle?A(t.staticStyle,e):e}function bi(t){return Array.isArray(t)?j(t):"string"==typeof t?yi(t):t}var $i,wi=/^--/,xi=/\s*!important$/,Ci=function(t,e,n){if(wi.test(e))t.style.setProperty(e,n);else if(xi.test(n))t.style.setProperty(S(e),n.replace(xi,""),"important");else{var r=Si(e);if(Array.isArray(n))for(var o=0,i=n.length;o-1?e.split(Ai).forEach((function(e){return t.classList.add(e)})):t.classList.add(e);else{var n=" ".concat(t.getAttribute("class")||""," ");n.indexOf(" "+e+" ")<0&&t.setAttribute("class",(n+e).trim())}}function Ei(t,e){if(e&&(e=e.trim()))if(t.classList)e.indexOf(" ")>-1?e.split(Ai).forEach((function(e){return t.classList.remove(e)})):t.classList.remove(e),t.classList.length||t.removeAttribute("class");else{for(var n=" ".concat(t.getAttribute("class")||""," "),r=" "+e+" ";n.indexOf(r)>=0;)n=n.replace(r," ");(n=n.trim())?t.setAttribute("class",n):t.removeAttribute("class")}}function Ni(t){if(t){if("object"==typeof t){var e={};return!1!==t.css&&A(e,Pi(t.name||"v")),A(e,t),e}return"string"==typeof t?Pi(t):void 0}}var Pi=$((function(t){return{enterClass:"".concat(t,"-enter"),enterToClass:"".concat(t,"-enter-to"),enterActiveClass:"".concat(t,"-enter-active"),leaveClass:"".concat(t,"-leave"),leaveToClass:"".concat(t,"-leave-to"),leaveActiveClass:"".concat(t,"-leave-active")}})),Di=q&&!G,Mi="transition",Ii="animation",Li="transition",Ri="transitionend",Fi="animation",Hi="animationend";Di&&(void 0===window.ontransitionend&&void 0!==window.onwebkittransitionend&&(Li="WebkitTransition",Ri="webkitTransitionEnd"),void 0===window.onanimationend&&void 0!==window.onwebkitanimationend&&(Fi="WebkitAnimation",Hi="webkitAnimationEnd"));var Bi=q?window.requestAnimationFrame?window.requestAnimationFrame.bind(window):setTimeout:function(t){return t()};function Ui(t){Bi((function(){Bi(t)}))}function zi(t,e){var n=t._transitionClasses||(t._transitionClasses=[]);n.indexOf(e)<0&&(n.push(e),ji(t,e))}function Vi(t,e){t._transitionClasses&&y(t._transitionClasses,e),Ei(t,e)}function Ki(t,e,n){var r=qi(t,e),o=r.type,i=r.timeout,a=r.propCount;if(!o)return n();var s=o===Mi?Ri:Hi,c=0,u=function(){t.removeEventListener(s,l),n()},l=function(e){e.target===t&&++c>=a&&u()};setTimeout((function(){c0&&(n=Mi,l=a,f=i.length):e===Ii?u>0&&(n=Ii,l=u,f=c.length):f=(n=(l=Math.max(a,u))>0?a>u?Mi:Ii:null)?n===Mi?i.length:c.length:0,{type:n,timeout:l,propCount:f,hasTransform:n===Mi&&Ji.test(r[Li+"Property"])}}function Wi(t,e){for(;t.length1}function ta(t,e){!0!==e.data.show&&Gi(e)}var ea=function(t){var a,s,c={},u=t.modules,l=t.nodeOps;for(a=0;av?b(t,n(o[g+1])?null:o[g+1].elm,o,p,g,i):p>g&&w(e,f,v)}(f,h,m,i,u):r(m)?(r(t.text)&&l.setTextContent(f,""),b(f,null,m,0,m.length-1,i)):r(h)?w(h,0,h.length-1):r(t.text)&&l.setTextContent(f,""):t.text!==e.text&&l.setTextContent(f,e.text),r(v)&&r(p=v.hook)&&r(p=p.postpatch)&&p(t,e)}}}function S(t,e,n){if(o(n)&&r(t.parent))t.parent.data.pendingInsert=e;else for(var i=0;i-1,a.selected!==i&&(a.selected=i);else if(D(aa(a),r))return void(t.selectedIndex!==s&&(t.selectedIndex=s));o||(t.selectedIndex=-1)}}function ia(t,e){return e.every((function(e){return!D(e,t)}))}function aa(t){return"_value"in t?t._value:t.value}function sa(t){t.target.composing=!0}function ca(t){t.target.composing&&(t.target.composing=!1,ua(t.target,"input"))}function ua(t,e){var n=document.createEvent("HTMLEvents");n.initEvent(e,!0,!0),t.dispatchEvent(n)}function la(t){return!t.componentInstance||t.data&&t.data.transition?t:la(t.componentInstance._vnode)}var fa={bind:function(t,e,n){var r=e.value,o=(n=la(n)).data&&n.data.transition,i=t.__vOriginalDisplay="none"===t.style.display?"":t.style.display;r&&o?(n.data.show=!0,Gi(n,(function(){t.style.display=i}))):t.style.display=r?i:"none"},update:function(t,e,n){var r=e.value;!r!=!e.oldValue&&((n=la(n)).data&&n.data.transition?(n.data.show=!0,r?Gi(n,(function(){t.style.display=t.__vOriginalDisplay})):Xi(n,(function(){t.style.display="none"}))):t.style.display=r?t.__vOriginalDisplay:"none")},unbind:function(t,e,n,r,o){o||(t.style.display=t.__vOriginalDisplay)}},da={model:na,show:fa},pa={name:String,appear:Boolean,css:Boolean,mode:String,type:String,enterClass:String,leaveClass:String,enterToClass:String,leaveToClass:String,enterActiveClass:String,leaveActiveClass:String,appearClass:String,appearActiveClass:String,appearToClass:String,duration:[Number,String,Object]};function va(t){var e=t&&t.componentOptions;return e&&e.Ctor.options.abstract?va(Re(e.children)):t}function ha(t){var e={},n=t.$options;for(var r in n.propsData)e[r]=t[r];var o=n._parentListeners;for(var r in o)e[x(r)]=o[r];return e}function ma(t,e){if(/\d-keep-alive$/.test(e.tag))return t("keep-alive",{props:e.componentOptions.propsData})}var ga=function(t){return t.tag||ke(t)},ya=function(t){return"show"===t.name},_a={name:"transition",props:pa,abstract:!0,render:function(t){var e=this,n=this.$slots.default;if(n&&(n=n.filter(ga)).length){var r=this.mode,o=n[0];if(function(t){for(;t=t.parent;)if(t.data.transition)return!0}(this.$vnode))return o;var a=va(o);if(!a)return o;if(this._leaving)return ma(t,o);var s="__transition-".concat(this._uid,"-");a.key=null==a.key?a.isComment?s+"comment":s+a.tag:i(a.key)?0===String(a.key).indexOf(s)?a.key:s+a.key:a.key;var c=(a.data||(a.data={})).transition=ha(this),u=this._vnode,l=va(u);if(a.data.directives&&a.data.directives.some(ya)&&(a.data.show=!0),l&&l.data&&!function(t,e){return e.key===t.key&&e.tag===t.tag}(a,l)&&!ke(l)&&(!l.componentInstance||!l.componentInstance._vnode.isComment)){var f=l.data.transition=A({},c);if("out-in"===r)return this._leaving=!0,Qt(f,"afterLeave",(function(){e._leaving=!1,e.$forceUpdate()})),ma(t,o);if("in-out"===r){if(ke(a))return u;var d,p=function(){d()};Qt(c,"afterEnter",p),Qt(c,"enterCancelled",p),Qt(f,"delayLeave",(function(t){d=t}))}}return o}}},ba=A({tag:String,moveClass:String},pa);delete ba.mode;var $a={props:ba,beforeMount:function(){var t=this,e=this._update;this._update=function(n,r){var o=Je(t);t.__patch__(t._vnode,t.kept,!1,!0),t._vnode=t.kept,o(),e.call(t,n,r)}},render:function(t){for(var e=this.tag||this.$vnode.data.tag||"span",n=Object.create(null),r=this.prevChildren=this.children,o=this.$slots.default||[],i=this.children=[],a=ha(this),s=0;s-1?ao[t]=e.constructor===window.HTMLUnknownElement||e.constructor===window.HTMLElement:ao[t]=/HTMLUnknownElement/.test(e.toString())},A(Er.options.directives,da),A(Er.options.components,ka),Er.prototype.__patch__=q?ea:E,Er.prototype.$mount=function(t,e){return function(t,e,n){var r;t.$el=e,t.$options.render||(t.$options.render=dt),Ge(t,"beforeMount"),r=function(){t._update(t._render(),n)},new Xn(t,r,E,{before:function(){t._isMounted&&!t._isDestroyed&&Ge(t,"beforeUpdate")}},!0),n=!1;var o=t._preWatchers;if(o)for(var i=0;i\/=]+)(?:\s*(=)\s*(?:"([^"]*)"+|'([^']*)'+|([^\s"'=<>`]+)))?/,La=/^\s*((?:v-[\w-]+:|@|:|#)\[[^=]+?\][^\s"'<>\/=]*)(?:\s*(=)\s*(?:"([^"]*)"+|'([^']*)'+|([^\s"'=<>`]+)))?/,Ra="[a-zA-Z_][\\-\\.0-9_a-zA-Z".concat(U.source,"]*"),Fa="((?:".concat(Ra,"\\:)?").concat(Ra,")"),Ha=new RegExp("^<".concat(Fa)),Ba=/^\s*(\/?)>/,Ua=new RegExp("^<\\/".concat(Fa,"[^>]*>")),za=/^]+>/i,Va=/^",""":'"',"&":"&"," ":"\n"," ":"\t","'":"'"},Za=/&(?:lt|gt|quot|amp|#39);/g,Ga=/&(?:lt|gt|quot|amp|#39|#10|#9);/g,Xa=h("pre,textarea",!0),Ya=function(t,e){return t&&Xa(t)&&"\n"===e[0]};function Qa(t,e){var n=e?Ga:Za;return t.replace(n,(function(t){return Wa[t]}))}function ts(t,e){for(var n,r,o=[],i=e.expectHTML,a=e.isUnaryTag||N,s=e.canBeLeftOpenTag||N,c=0,u=function(){if(n=t,r&&Ja(r)){var u=0,d=r.toLowerCase(),p=qa[d]||(qa[d]=new RegExp("([\\s\\S]*?)(]*>)","i"));w=t.replace(p,(function(t,n,r){return u=r.length,Ja(d)||"noscript"===d||(n=n.replace(//g,"$1").replace(//g,"$1")),Ya(d,n)&&(n=n.slice(1)),e.chars&&e.chars(n),""}));c+=t.length-w.length,t=w,f(d,c-u,c)}else{var v=t.indexOf("<");if(0===v){if(Va.test(t)){var h=t.indexOf("--\x3e");if(h>=0)return e.shouldKeepComment&&e.comment&&e.comment(t.substring(4,h),c,c+h+3),l(h+3),"continue"}if(Ka.test(t)){var m=t.indexOf("]>");if(m>=0)return l(m+2),"continue"}var g=t.match(za);if(g)return l(g[0].length),"continue";var y=t.match(Ua);if(y){var _=c;return l(y[0].length),f(y[1],_,c),"continue"}var b=function(){var e=t.match(Ha);if(e){var n={tagName:e[1],attrs:[],start:c};l(e[0].length);for(var r=void 0,o=void 0;!(r=t.match(Ba))&&(o=t.match(La)||t.match(Ia));)o.start=c,l(o[0].length),o.end=c,n.attrs.push(o);if(r)return n.unarySlash=r[1],l(r[0].length),n.end=c,n}}();if(b)return function(t){var n=t.tagName,c=t.unarySlash;i&&("p"===r&&Ma(n)&&f(r),s(n)&&r===n&&f(n));for(var u=a(n)||!!c,l=t.attrs.length,d=new Array(l),p=0;p=0){for(w=t.slice(v);!(Ua.test(w)||Ha.test(w)||Va.test(w)||Ka.test(w)||(x=w.indexOf("<",1))<0);)v+=x,w=t.slice(v);$=t.substring(0,v)}v<0&&($=t),$&&l($.length),e.chars&&$&&e.chars($,c-$.length,c)}if(t===n)return e.chars&&e.chars(t),"break"};t;){if("break"===u())break}function l(e){c+=e,t=t.substring(e)}function f(t,n,i){var a,s;if(null==n&&(n=c),null==i&&(i=c),t)for(s=t.toLowerCase(),a=o.length-1;a>=0&&o[a].lowerCasedTag!==s;a--);else a=0;if(a>=0){for(var u=o.length-1;u>=a;u--)e.end&&e.end(o[u].tag,n,i);o.length=a,r=a&&o[a-1].tag}else"br"===s?e.start&&e.start(t,[],!0,n,i):"p"===s&&(e.start&&e.start(t,[],!1,n,i),e.end&&e.end(t,n,i))}f()}var es,ns,rs,os,is,as,ss,cs,us=/^@|^v-on:/,ls=/^v-|^@|^:|^#/,fs=/([\s\S]*?)\s+(?:in|of)\s+([\s\S]*)/,ds=/,([^,\}\]]*)(?:,([^,\}\]]*))?$/,ps=/^\(|\)$/g,vs=/^\[.*\]$/,hs=/:(.*)$/,ms=/^:|^\.|^v-bind:/,gs=/\.[^.\]]+(?=[^\]]*$)/g,ys=/^v-slot(:|$)|^#/,_s=/[\r\n]/,bs=/[ \f\t\r\n]+/g,$s=$(Na),ws="_empty_";function xs(t,e,n){return{type:1,tag:t,attrsList:e,attrsMap:js(e),rawAttrsMap:{},parent:n,children:[]}}function Cs(t,e){es=e.warn||Ho,as=e.isPreTag||N,ss=e.mustUseProp||N,cs=e.getTagNamespace||N,e.isReservedTag,rs=Bo(e.modules,"transformNode"),os=Bo(e.modules,"preTransformNode"),is=Bo(e.modules,"postTransformNode"),ns=e.delimiters;var n,r,o=[],i=!1!==e.preserveWhitespace,a=e.whitespace,s=!1,c=!1;function u(t){if(l(t),s||t.processed||(t=ks(t,e)),o.length||t===n||n.if&&(t.elseif||t.else)&&Os(n,{exp:t.elseif,block:t}),r&&!t.forbidden)if(t.elseif||t.else)a=t,u=function(t){for(var e=t.length;e--;){if(1===t[e].type)return t[e];t.pop()}}(r.children),u&&u.if&&Os(u,{exp:a.elseif,block:a});else{if(t.slotScope){var i=t.slotTarget||'"default"';(r.scopedSlots||(r.scopedSlots={}))[i]=t}r.children.push(t),t.parent=r}var a,u;t.children=t.children.filter((function(t){return!t.slotScope})),l(t),t.pre&&(s=!1),as(t.tag)&&(c=!1);for(var f=0;fc&&(s.push(i=t.slice(c,o)),a.push(JSON.stringify(i)));var u=Ro(r[1].trim());a.push("_s(".concat(u,")")),s.push({"@binding":u}),c=o+r[0].length}return c-1")+("true"===i?":(".concat(e,")"):":_q(".concat(e,",").concat(i,")"))),qo(t,"change","var $$a=".concat(e,",")+"$$el=$event.target,"+"$$c=$$el.checked?(".concat(i,"):(").concat(a,");")+"if(Array.isArray($$a)){"+"var $$v=".concat(r?"_n("+o+")":o,",")+"$$i=_i($$a,$$v);"+"if($$el.checked){$$i<0&&(".concat(Qo(e,"$$a.concat([$$v])"),")}")+"else{$$i>-1&&(".concat(Qo(e,"$$a.slice(0,$$i).concat($$a.slice($$i+1))"),")}")+"}else{".concat(Qo(e,"$$c"),"}"),null,!0)}(t,r,o);else if("input"===i&&"radio"===a)!function(t,e,n){var r=n&&n.number,o=Wo(t,"value")||"null";o=r?"_n(".concat(o,")"):o,Uo(t,"checked","_q(".concat(e,",").concat(o,")")),qo(t,"change",Qo(e,o),null,!0)}(t,r,o);else if("input"===i||"textarea"===i)!function(t,e,n){var r=t.attrsMap.type,o=n||{},i=o.lazy,a=o.number,s=o.trim,c=!i&&"range"!==r,u=i?"change":"range"===r?ai:"input",l="$event.target.value";s&&(l="$event.target.value.trim()");a&&(l="_n(".concat(l,")"));var f=Qo(e,l);c&&(f="if($event.target.composing)return;".concat(f));Uo(t,"value","(".concat(e,")")),qo(t,u,f,null,!0),(s||a)&&qo(t,"blur","$forceUpdate()")}(t,r,o);else if(!B.isReservedTag(i))return Yo(t,r,o),!1;return!0},text:function(t,e){e.value&&Uo(t,"textContent","_s(".concat(e.value,")"),e)},html:function(t,e){e.value&&Uo(t,"innerHTML","_s(".concat(e.value,")"),e)}},Rs={expectHTML:!0,modules:Ds,directives:Ls,isPreTag:function(t){return"pre"===t},isUnaryTag:Pa,mustUseProp:Ur,canBeLeftOpenTag:Da,isReservedTag:oo,getTagNamespace:io,staticKeys:function(t){return t.reduce((function(t,e){return t.concat(e.staticKeys||[])}),[]).join(",")}(Ds)},Fs=$((function(t){return h("type,tag,attrsList,attrsMap,plain,parent,children,attrs,start,end,rawAttrsMap"+(t?","+t:""))}));function Hs(t,e){t&&(Ms=Fs(e.staticKeys||""),Is=e.isReservedTag||N,Bs(t),Us(t,!1))}function Bs(t){if(t.static=function(t){if(2===t.type)return!1;if(3===t.type)return!0;return!(!t.pre&&(t.hasBindings||t.if||t.for||m(t.tag)||!Is(t.tag)||function(t){for(;t.parent;){if("template"!==(t=t.parent).tag)return!1;if(t.for)return!0}return!1}(t)||!Object.keys(t).every(Ms)))}(t),1===t.type){if(!Is(t.tag)&&"slot"!==t.tag&&null==t.attrsMap["inline-template"])return;for(var e=0,n=t.children.length;e|^function(?:\s+[\w$]+)?\s*\(/,Vs=/\([^)]*?\);*$/,Ks=/^[A-Za-z_$][\w$]*(?:\.[A-Za-z_$][\w$]*|\['[^']*?']|\["[^"]*?"]|\[\d+]|\[[A-Za-z_$][\w$]*])*$/,Js={esc:27,tab:9,enter:13,space:32,up:38,left:37,right:39,down:40,delete:[8,46]},qs={esc:["Esc","Escape"],tab:"Tab",enter:"Enter",space:[" ","Spacebar"],up:["Up","ArrowUp"],left:["Left","ArrowLeft"],right:["Right","ArrowRight"],down:["Down","ArrowDown"],delete:["Backspace","Delete","Del"]},Ws=function(t){return"if(".concat(t,")return null;")},Zs={stop:"$event.stopPropagation();",prevent:"$event.preventDefault();",self:Ws("$event.target !== $event.currentTarget"),ctrl:Ws("!$event.ctrlKey"),shift:Ws("!$event.shiftKey"),alt:Ws("!$event.altKey"),meta:Ws("!$event.metaKey"),left:Ws("'button' in $event && $event.button !== 0"),middle:Ws("'button' in $event && $event.button !== 1"),right:Ws("'button' in $event && $event.button !== 2")};function Gs(t,e){var n=e?"nativeOn:":"on:",r="",o="";for(var i in t){var a=Xs(t[i]);t[i]&&t[i].dynamic?o+="".concat(i,",").concat(a,","):r+='"'.concat(i,'":').concat(a,",")}return r="{".concat(r.slice(0,-1),"}"),o?n+"_d(".concat(r,",[").concat(o.slice(0,-1),"])"):n+r}function Xs(t){if(!t)return"function(){}";if(Array.isArray(t))return"[".concat(t.map((function(t){return Xs(t)})).join(","),"]");var e=Ks.test(t.value),n=zs.test(t.value),r=Ks.test(t.value.replace(Vs,""));if(t.modifiers){var o="",i="",a=[],s=function(e){if(Zs[e])i+=Zs[e],Js[e]&&a.push(e);else if("exact"===e){var n=t.modifiers;i+=Ws(["ctrl","shift","alt","meta"].filter((function(t){return!n[t]})).map((function(t){return"$event.".concat(t,"Key")})).join("||"))}else a.push(e)};for(var c in t.modifiers)s(c);a.length&&(o+=function(t){return"if(!$event.type.indexOf('key')&&"+"".concat(t.map(Ys).join("&&"),")return null;")}(a)),i&&(o+=i);var u=e?"return ".concat(t.value,".apply(null, arguments)"):n?"return (".concat(t.value,").apply(null, arguments)"):r?"return ".concat(t.value):t.value;return"function($event){".concat(o).concat(u,"}")}return e||n?t.value:"function($event){".concat(r?"return ".concat(t.value):t.value,"}")}function Ys(t){var e=parseInt(t,10);if(e)return"$event.keyCode!==".concat(e);var n=Js[t],r=qs[t];return"_k($event.keyCode,"+"".concat(JSON.stringify(t),",")+"".concat(JSON.stringify(n),",")+"$event.key,"+"".concat(JSON.stringify(r))+")"}var Qs={on:function(t,e){t.wrapListeners=function(t){return"_g(".concat(t,",").concat(e.value,")")}},bind:function(t,e){t.wrapData=function(n){return"_b(".concat(n,",'").concat(t.tag,"',").concat(e.value,",").concat(e.modifiers&&e.modifiers.prop?"true":"false").concat(e.modifiers&&e.modifiers.sync?",true":"",")")}},cloak:E},tc=function(t){this.options=t,this.warn=t.warn||Ho,this.transforms=Bo(t.modules,"transformCode"),this.dataGenFns=Bo(t.modules,"genData"),this.directives=A(A({},Qs),t.directives);var e=t.isReservedTag||N;this.maybeComponent=function(t){return!!t.component||!e(t.tag)},this.onceId=0,this.staticRenderFns=[],this.pre=!1};function ec(t,e){var n=new tc(e),r=t?"script"===t.tag?"null":nc(t,n):'_c("div")';return{render:"with(this){return ".concat(r,"}"),staticRenderFns:n.staticRenderFns}}function nc(t,e){if(t.parent&&(t.pre=t.pre||t.parent.pre),t.staticRoot&&!t.staticProcessed)return rc(t,e);if(t.once&&!t.onceProcessed)return oc(t,e);if(t.for&&!t.forProcessed)return sc(t,e);if(t.if&&!t.ifProcessed)return ic(t,e);if("template"!==t.tag||t.slotTarget||e.pre){if("slot"===t.tag)return function(t,e){var n=t.slotName||'"default"',r=fc(t,e),o="_t(".concat(n).concat(r?",function(){return ".concat(r,"}"):""),i=t.attrs||t.dynamicAttrs?vc((t.attrs||[]).concat(t.dynamicAttrs||[]).map((function(t){return{name:x(t.name),value:t.value,dynamic:t.dynamic}}))):null,a=t.attrsMap["v-bind"];!i&&!a||r||(o+=",null");i&&(o+=",".concat(i));a&&(o+="".concat(i?"":",null",",").concat(a));return o+")"}(t,e);var n=void 0;if(t.component)n=function(t,e,n){var r=e.inlineTemplate?null:fc(e,n,!0);return"_c(".concat(t,",").concat(cc(e,n)).concat(r?",".concat(r):"",")")}(t.component,t,e);else{var r=void 0,o=e.maybeComponent(t);(!t.plain||t.pre&&o)&&(r=cc(t,e));var i=void 0,a=e.options.bindings;o&&a&&!1!==a.__isScriptSetup&&(i=function(t,e){var n=x(e),r=C(n),o=function(o){return t[e]===o?e:t[n]===o?n:t[r]===o?r:void 0},i=o("setup-const")||o("setup-reactive-const");if(i)return i;var a=o("setup-let")||o("setup-ref")||o("setup-maybe-ref");if(a)return a}(a,t.tag)),i||(i="'".concat(t.tag,"'"));var s=t.inlineTemplate?null:fc(t,e,!0);n="_c(".concat(i).concat(r?",".concat(r):"").concat(s?",".concat(s):"",")")}for(var c=0;c>>0}(a)):"",")")}(t,t.scopedSlots,e),",")),t.model&&(n+="model:{value:".concat(t.model.value,",callback:").concat(t.model.callback,",expression:").concat(t.model.expression,"},")),t.inlineTemplate){var i=function(t,e){var n=t.children[0];if(n&&1===n.type){var r=ec(n,e.options);return"inlineTemplate:{render:function(){".concat(r.render,"},staticRenderFns:[").concat(r.staticRenderFns.map((function(t){return"function(){".concat(t,"}")})).join(","),"]}")}}(t,e);i&&(n+="".concat(i,","))}return n=n.replace(/,$/,"")+"}",t.dynamicAttrs&&(n="_b(".concat(n,',"').concat(t.tag,'",').concat(vc(t.dynamicAttrs),")")),t.wrapData&&(n=t.wrapData(n)),t.wrapListeners&&(n=t.wrapListeners(n)),n}function uc(t){return 1===t.type&&("slot"===t.tag||t.children.some(uc))}function lc(t,e){var n=t.attrsMap["slot-scope"];if(t.if&&!t.ifProcessed&&!n)return ic(t,e,lc,"null");if(t.for&&!t.forProcessed)return sc(t,e,lc);var r=t.slotScope===ws?"":String(t.slotScope),o="function(".concat(r,"){")+"return ".concat("template"===t.tag?t.if&&n?"(".concat(t.if,")?").concat(fc(t,e)||"undefined",":undefined"):fc(t,e)||"undefined":nc(t,e),"}"),i=r?"":",proxy:true";return"{key:".concat(t.slotTarget||'"default"',",fn:").concat(o).concat(i,"}")}function fc(t,e,n,r,o){var i=t.children;if(i.length){var a=i[0];if(1===i.length&&a.for&&"template"!==a.tag&&"slot"!==a.tag){var s=n?e.maybeComponent(a)?",1":",0":"";return"".concat((r||nc)(a,e)).concat(s)}var c=n?function(t,e){for(var n=0,r=0;r':'
      ',_c.innerHTML.indexOf(" ")>0}var xc=!!q&&wc(!1),Cc=!!q&&wc(!0),kc=$((function(t){var e=co(t);return e&&e.innerHTML})),Sc=Er.prototype.$mount;return Er.prototype.$mount=function(t,e){if((t=t&&co(t))===document.body||t===document.documentElement)return this;var n=this.$options;if(!n.render){var r=n.template;if(r)if("string"==typeof r)"#"===r.charAt(0)&&(r=kc(r));else{if(!r.nodeType)return this;r=r.innerHTML}else t&&(r=function(t){if(t.outerHTML)return t.outerHTML;var e=document.createElement("div");return e.appendChild(t.cloneNode(!0)),e.innerHTML}(t));if(r){var o=$c(r,{outputSourceRange:!1,shouldDecodeNewlines:xc,shouldDecodeNewlinesForHref:Cc,delimiters:n.delimiters,comments:n.comments},this),i=o.render,a=o.staticRenderFns;n.render=i,n.staticRenderFns=a}}return Sc.call(this,t,e)},Er.compile=$c,A(Er,Jn),Er.effect=function(t,e){var n=new Xn(ut,t,E,{sync:!0});e&&(n.update=function(){e((function(){return n.run()}))})},Er})); \ No newline at end of file +(function (global, factory) { + typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory() : + typeof define === 'function' && define.amd ? define(factory) : + (global = global || self, global.Vue = factory()); + }(this, function () { 'use strict'; + + /* */ + + var emptyObject = Object.freeze({}); + + // These helpers produce better VM code in JS engines due to their + // explicitness and function inlining. + function isUndef (v) { + return v === undefined || v === null + } + + function isDef (v) { + return v !== undefined && v !== null + } + + function isTrue (v) { + return v === true + } + + function isFalse (v) { + return v === false + } + + /** + * Check if value is primitive. + */ + function isPrimitive (value) { + return ( + typeof value === 'string' || + typeof value === 'number' || + // $flow-disable-line + typeof value === 'symbol' || + typeof value === 'boolean' + ) + } + + /** + * Quick object check - this is primarily used to tell + * Objects from primitive values when we know the value + * is a JSON-compliant type. + */ + function isObject (obj) { + return obj !== null && typeof obj === 'object' + } + + /** + * Get the raw type string of a value, e.g., [object Object]. + */ + var _toString = Object.prototype.toString; + + function toRawType (value) { + return _toString.call(value).slice(8, -1) + } + + /** + * Strict object type check. Only returns true + * for plain JavaScript objects. + */ + function isPlainObject (obj) { + return _toString.call(obj) === '[object Object]' + } + + function isRegExp (v) { + return _toString.call(v) === '[object RegExp]' + } + + /** + * Check if val is a valid array index. + */ + function isValidArrayIndex (val) { + var n = parseFloat(String(val)); + return n >= 0 && Math.floor(n) === n && isFinite(val) + } + + function isPromise (val) { + return ( + isDef(val) && + typeof val.then === 'function' && + typeof val.catch === 'function' + ) + } + + /** + * Convert a value to a string that is actually rendered. + */ + function toString (val) { + return val == null + ? '' + : Array.isArray(val) || (isPlainObject(val) && val.toString === _toString) + ? JSON.stringify(val, null, 2) + : String(val) + } + + /** + * Convert an input value to a number for persistence. + * If the conversion fails, return original string. + */ + function toNumber (val) { + var n = parseFloat(val); + return isNaN(n) ? val : n + } + + /** + * Make a map and return a function for checking if a key + * is in that map. + */ + function makeMap ( + str, + expectsLowerCase + ) { + var map = Object.create(null); + var list = str.split(','); + for (var i = 0; i < list.length; i++) { + map[list[i]] = true; + } + return expectsLowerCase + ? function (val) { return map[val.toLowerCase()]; } + : function (val) { return map[val]; } + } + + /** + * Check if a tag is a built-in tag. + */ + var isBuiltInTag = makeMap('slot,component', true); + + /** + * Check if an attribute is a reserved attribute. + */ + var isReservedAttribute = makeMap('key,ref,slot,slot-scope,is'); + + /** + * Remove an item from an array. + */ + function remove (arr, item) { + if (arr.length) { + var index = arr.indexOf(item); + if (index > -1) { + return arr.splice(index, 1) + } + } + } + + /** + * Check whether an object has the property. + */ + var hasOwnProperty = Object.prototype.hasOwnProperty; + function hasOwn (obj, key) { + return hasOwnProperty.call(obj, key) + } + + /** + * Create a cached version of a pure function. + */ + function cached (fn) { + var cache = Object.create(null); + return (function cachedFn (str) { + var hit = cache[str]; + return hit || (cache[str] = fn(str)) + }) + } + + /** + * Camelize a hyphen-delimited string. + */ + var camelizeRE = /-(\w)/g; + var camelize = cached(function (str) { + return str.replace(camelizeRE, function (_, c) { return c ? c.toUpperCase() : ''; }) + }); + + /** + * Capitalize a string. + */ + var capitalize = cached(function (str) { + return str.charAt(0).toUpperCase() + str.slice(1) + }); + + /** + * Hyphenate a camelCase string. + */ + var hyphenateRE = /\B([A-Z])/g; + var hyphenate = cached(function (str) { + return str.replace(hyphenateRE, '-$1').toLowerCase() + }); + + /** + * Simple bind polyfill for environments that do not support it, + * e.g., PhantomJS 1.x. Technically, we don't need this anymore + * since native bind is now performant enough in most browsers. + * But removing it would mean breaking code that was able to run in + * PhantomJS 1.x, so this must be kept for backward compatibility. + */ + + /* istanbul ignore next */ + function polyfillBind (fn, ctx) { + function boundFn (a) { + var l = arguments.length; + return l + ? l > 1 + ? fn.apply(ctx, arguments) + : fn.call(ctx, a) + : fn.call(ctx) + } + + boundFn._length = fn.length; + return boundFn + } + + function nativeBind (fn, ctx) { + return fn.bind(ctx) + } + + var bind = Function.prototype.bind + ? nativeBind + : polyfillBind; + + /** + * Convert an Array-like object to a real Array. + */ + function toArray (list, start) { + start = start || 0; + var i = list.length - start; + var ret = new Array(i); + while (i--) { + ret[i] = list[i + start]; + } + return ret + } + + /** + * Mix properties into target object. + */ + function extend (to, _from) { + for (var key in _from) { + to[key] = _from[key]; + } + return to + } + + /** + * Merge an Array of Objects into a single Object. + */ + function toObject (arr) { + var res = {}; + for (var i = 0; i < arr.length; i++) { + if (arr[i]) { + extend(res, arr[i]); + } + } + return res + } + + /* eslint-disable no-unused-vars */ + + /** + * Perform no operation. + * Stubbing args to make Flow happy without leaving useless transpiled code + * with ...rest (https://flow.org/blog/2017/05/07/Strict-Function-Call-Arity/). + */ + function noop (a, b, c) {} + + /** + * Always return false. + */ + var no = function (a, b, c) { return false; }; + + /* eslint-enable no-unused-vars */ + + /** + * Return the same value. + */ + var identity = function (_) { return _; }; + + /** + * Generate a string containing static keys from compiler modules. + */ + function genStaticKeys (modules) { + return modules.reduce(function (keys, m) { + return keys.concat(m.staticKeys || []) + }, []).join(',') + } + + /** + * Check if two values are loosely equal - that is, + * if they are plain objects, do they have the same shape? + */ + function looseEqual (a, b) { + if (a === b) { return true } + var isObjectA = isObject(a); + var isObjectB = isObject(b); + if (isObjectA && isObjectB) { + try { + var isArrayA = Array.isArray(a); + var isArrayB = Array.isArray(b); + if (isArrayA && isArrayB) { + return a.length === b.length && a.every(function (e, i) { + return looseEqual(e, b[i]) + }) + } else if (a instanceof Date && b instanceof Date) { + return a.getTime() === b.getTime() + } else if (!isArrayA && !isArrayB) { + var keysA = Object.keys(a); + var keysB = Object.keys(b); + return keysA.length === keysB.length && keysA.every(function (key) { + return looseEqual(a[key], b[key]) + }) + } else { + /* istanbul ignore next */ + return false + } + } catch (e) { + /* istanbul ignore next */ + return false + } + } else if (!isObjectA && !isObjectB) { + return String(a) === String(b) + } else { + return false + } + } + + /** + * Return the first index at which a loosely equal value can be + * found in the array (if value is a plain object, the array must + * contain an object of the same shape), or -1 if it is not present. + */ + function looseIndexOf (arr, val) { + for (var i = 0; i < arr.length; i++) { + if (looseEqual(arr[i], val)) { return i } + } + return -1 + } + + /** + * Ensure a function is called only once. + */ + function once (fn) { + var called = false; + return function () { + if (!called) { + called = true; + fn.apply(this, arguments); + } + } + } + + var SSR_ATTR = 'data-server-rendered'; + + var ASSET_TYPES = [ + 'component', + 'directive', + 'filter' + ]; + + var LIFECYCLE_HOOKS = [ + 'beforeCreate', + 'created', + 'beforeMount', + 'mounted', + 'beforeUpdate', + 'updated', + 'beforeDestroy', + 'destroyed', + 'activated', + 'deactivated', + 'errorCaptured', + 'serverPrefetch' + ]; + + /* */ + + + + var config = ({ + /** + * Option merge strategies (used in core/util/options) + */ + // $flow-disable-line + optionMergeStrategies: Object.create(null), + + /** + * Whether to suppress warnings. + */ + silent: false, + + /** + * Show production mode tip message on boot? + */ + productionTip: "development" !== 'production', + + /** + * Whether to enable devtools + */ + devtools: "development" !== 'production', + + /** + * Whether to record perf + */ + performance: false, + + /** + * Error handler for watcher errors + */ + errorHandler: null, + + /** + * Warn handler for watcher warns + */ + warnHandler: null, + + /** + * Ignore certain custom elements + */ + ignoredElements: [], + + /** + * Custom user key aliases for v-on + */ + // $flow-disable-line + keyCodes: Object.create(null), + + /** + * Check if a tag is reserved so that it cannot be registered as a + * component. This is platform-dependent and may be overwritten. + */ + isReservedTag: no, + + /** + * Check if an attribute is reserved so that it cannot be used as a component + * prop. This is platform-dependent and may be overwritten. + */ + isReservedAttr: no, + + /** + * Check if a tag is an unknown element. + * Platform-dependent. + */ + isUnknownElement: no, + + /** + * Get the namespace of an element + */ + getTagNamespace: noop, + + /** + * Parse the real tag name for the specific platform. + */ + parsePlatformTagName: identity, + + /** + * Check if an attribute must be bound using property, e.g. value + * Platform-dependent. + */ + mustUseProp: no, + + /** + * Perform updates asynchronously. Intended to be used by Vue Test Utils + * This will significantly reduce performance if set to false. + */ + async: true, + + /** + * Exposed for legacy reasons + */ + _lifecycleHooks: LIFECYCLE_HOOKS + }); + + /* */ + + /** + * unicode letters used for parsing html tags, component names and property paths. + * using https://www.w3.org/TR/html53/semantics-scripting.html#potentialcustomelementname + * skipping \u10000-\uEFFFF due to it freezing up PhantomJS + */ + var unicodeRegExp = /a-zA-Z\u00B7\u00C0-\u00D6\u00D8-\u00F6\u00F8-\u037D\u037F-\u1FFF\u200C-\u200D\u203F-\u2040\u2070-\u218F\u2C00-\u2FEF\u3001-\uD7FF\uF900-\uFDCF\uFDF0-\uFFFD/; + + /** + * Check if a string starts with $ or _ + */ + function isReserved (str) { + var c = (str + '').charCodeAt(0); + return c === 0x24 || c === 0x5F + } + + /** + * Define a property. + */ + function def (obj, key, val, enumerable) { + Object.defineProperty(obj, key, { + value: val, + enumerable: !!enumerable, + writable: true, + configurable: true + }); + } + + /** + * Parse simple path. + */ + var bailRE = new RegExp(("[^" + (unicodeRegExp.source) + ".$_\\d]")); + function parsePath (path) { + if (bailRE.test(path)) { + return + } + var segments = path.split('.'); + return function (obj) { + for (var i = 0; i < segments.length; i++) { + if (!obj) { return } + obj = obj[segments[i]]; + } + return obj + } + } + + /* */ + + // can we use __proto__? + var hasProto = '__proto__' in {}; + + // Browser environment sniffing + var inBrowser = typeof window !== 'undefined'; + var inWeex = typeof WXEnvironment !== 'undefined' && !!WXEnvironment.platform; + var weexPlatform = inWeex && WXEnvironment.platform.toLowerCase(); + var UA = inBrowser && window.navigator.userAgent.toLowerCase(); + var isIE = UA && /msie|trident/.test(UA); + var isIE9 = UA && UA.indexOf('msie 9.0') > 0; + var isEdge = UA && UA.indexOf('edge/') > 0; + var isAndroid = (UA && UA.indexOf('android') > 0) || (weexPlatform === 'android'); + var isIOS = (UA && /iphone|ipad|ipod|ios/.test(UA)) || (weexPlatform === 'ios'); + var isChrome = UA && /chrome\/\d+/.test(UA) && !isEdge; + var isPhantomJS = UA && /phantomjs/.test(UA); + var isFF = UA && UA.match(/firefox\/(\d+)/); + + // Firefox has a "watch" function on Object.prototype... + var nativeWatch = ({}).watch; + + var supportsPassive = false; + if (inBrowser) { + try { + var opts = {}; + Object.defineProperty(opts, 'passive', ({ + get: function get () { + /* istanbul ignore next */ + supportsPassive = true; + } + })); // https://github.com/facebook/flow/issues/285 + window.addEventListener('test-passive', null, opts); + } catch (e) {} + } + + // this needs to be lazy-evaled because vue may be required before + // vue-server-renderer can set VUE_ENV + var _isServer; + var isServerRendering = function () { + if (_isServer === undefined) { + /* istanbul ignore if */ + if (!inBrowser && !inWeex && typeof global !== 'undefined') { + // detect presence of vue-server-renderer and avoid + // Webpack shimming the process + _isServer = global['process'] && global['process'].env.VUE_ENV === 'server'; + } else { + _isServer = false; + } + } + return _isServer + }; + + // detect devtools + var devtools = inBrowser && window.__VUE_DEVTOOLS_GLOBAL_HOOK__; + + /* istanbul ignore next */ + function isNative (Ctor) { + return typeof Ctor === 'function' && /native code/.test(Ctor.toString()) + } + + var hasSymbol = + typeof Symbol !== 'undefined' && isNative(Symbol) && + typeof Reflect !== 'undefined' && isNative(Reflect.ownKeys); + + var _Set; + /* istanbul ignore if */ // $flow-disable-line + if (typeof Set !== 'undefined' && isNative(Set)) { + // use native Set when available. + _Set = Set; + } else { + // a non-standard Set polyfill that only works with primitive keys. + _Set = /*@__PURE__*/(function () { + function Set () { + this.set = Object.create(null); + } + Set.prototype.has = function has (key) { + return this.set[key] === true + }; + Set.prototype.add = function add (key) { + this.set[key] = true; + }; + Set.prototype.clear = function clear () { + this.set = Object.create(null); + }; + + return Set; + }()); + } + + /* */ + + var warn = noop; + var tip = noop; + var generateComponentTrace = (noop); // work around flow check + var formatComponentName = (noop); + + { + var hasConsole = typeof console !== 'undefined'; + var classifyRE = /(?:^|[-_])(\w)/g; + var classify = function (str) { return str + .replace(classifyRE, function (c) { return c.toUpperCase(); }) + .replace(/[-_]/g, ''); }; + + warn = function (msg, vm) { + var trace = vm ? generateComponentTrace(vm) : ''; + + if (config.warnHandler) { + config.warnHandler.call(null, msg, vm, trace); + } else if (hasConsole && (!config.silent)) { + console.error(("[Vue warn]: " + msg + trace)); + } + }; + + tip = function (msg, vm) { + if (hasConsole && (!config.silent)) { + console.warn("[Vue tip]: " + msg + ( + vm ? generateComponentTrace(vm) : '' + )); + } + }; + + formatComponentName = function (vm, includeFile) { + if (vm.$root === vm) { + return '' + } + var options = typeof vm === 'function' && vm.cid != null + ? vm.options + : vm._isVue + ? vm.$options || vm.constructor.options + : vm; + var name = options.name || options._componentTag; + var file = options.__file; + if (!name && file) { + var match = file.match(/([^/\\]+)\.vue$/); + name = match && match[1]; + } + + return ( + (name ? ("<" + (classify(name)) + ">") : "") + + (file && includeFile !== false ? (" at " + file) : '') + ) + }; + + var repeat = function (str, n) { + var res = ''; + while (n) { + if (n % 2 === 1) { res += str; } + if (n > 1) { str += str; } + n >>= 1; + } + return res + }; + + generateComponentTrace = function (vm) { + if (vm._isVue && vm.$parent) { + var tree = []; + var currentRecursiveSequence = 0; + while (vm) { + if (tree.length > 0) { + var last = tree[tree.length - 1]; + if (last.constructor === vm.constructor) { + currentRecursiveSequence++; + vm = vm.$parent; + continue + } else if (currentRecursiveSequence > 0) { + tree[tree.length - 1] = [last, currentRecursiveSequence]; + currentRecursiveSequence = 0; + } + } + tree.push(vm); + vm = vm.$parent; + } + return '\n\nfound in\n\n' + tree + .map(function (vm, i) { return ("" + (i === 0 ? '---> ' : repeat(' ', 5 + i * 2)) + (Array.isArray(vm) + ? ((formatComponentName(vm[0])) + "... (" + (vm[1]) + " recursive calls)") + : formatComponentName(vm))); }) + .join('\n') + } else { + return ("\n\n(found in " + (formatComponentName(vm)) + ")") + } + }; + } + + /* */ + + var uid = 0; + + /** + * A dep is an observable that can have multiple + * directives subscribing to it. + */ + var Dep = function Dep () { + this.id = uid++; + this.subs = []; + }; + + Dep.prototype.addSub = function addSub (sub) { + this.subs.push(sub); + }; + + Dep.prototype.removeSub = function removeSub (sub) { + remove(this.subs, sub); + }; + + Dep.prototype.depend = function depend () { + if (Dep.target) { + Dep.target.addDep(this); + } + }; + + Dep.prototype.notify = function notify () { + // stabilize the subscriber list first + var subs = this.subs.slice(); + if (!config.async) { + // subs aren't sorted in scheduler if not running async + // we need to sort them now to make sure they fire in correct + // order + subs.sort(function (a, b) { return a.id - b.id; }); + } + for (var i = 0, l = subs.length; i < l; i++) { + subs[i].update(); + } + }; + + // The current target watcher being evaluated. + // This is globally unique because only one watcher + // can be evaluated at a time. + Dep.target = null; + var targetStack = []; + + function pushTarget (target) { + targetStack.push(target); + Dep.target = target; + } + + function popTarget () { + targetStack.pop(); + Dep.target = targetStack[targetStack.length - 1]; + } + + /* */ + + var VNode = function VNode ( + tag, + data, + children, + text, + elm, + context, + componentOptions, + asyncFactory + ) { + this.tag = tag; + this.data = data; + this.children = children; + this.text = text; + this.elm = elm; + this.ns = undefined; + this.context = context; + this.fnContext = undefined; + this.fnOptions = undefined; + this.fnScopeId = undefined; + this.key = data && data.key; + this.componentOptions = componentOptions; + this.componentInstance = undefined; + this.parent = undefined; + this.raw = false; + this.isStatic = false; + this.isRootInsert = true; + this.isComment = false; + this.isCloned = false; + this.isOnce = false; + this.asyncFactory = asyncFactory; + this.asyncMeta = undefined; + this.isAsyncPlaceholder = false; + }; + + var prototypeAccessors = { child: { configurable: true } }; + + // DEPRECATED: alias for componentInstance for backwards compat. + /* istanbul ignore next */ + prototypeAccessors.child.get = function () { + return this.componentInstance + }; + + Object.defineProperties( VNode.prototype, prototypeAccessors ); + + var createEmptyVNode = function (text) { + if ( text === void 0 ) text = ''; + + var node = new VNode(); + node.text = text; + node.isComment = true; + return node + }; + + function createTextVNode (val) { + return new VNode(undefined, undefined, undefined, String(val)) + } + + // optimized shallow clone + // used for static nodes and slot nodes because they may be reused across + // multiple renders, cloning them avoids errors when DOM manipulations rely + // on their elm reference. + function cloneVNode (vnode) { + var cloned = new VNode( + vnode.tag, + vnode.data, + // #7975 + // clone children array to avoid mutating original in case of cloning + // a child. + vnode.children && vnode.children.slice(), + vnode.text, + vnode.elm, + vnode.context, + vnode.componentOptions, + vnode.asyncFactory + ); + cloned.ns = vnode.ns; + cloned.isStatic = vnode.isStatic; + cloned.key = vnode.key; + cloned.isComment = vnode.isComment; + cloned.fnContext = vnode.fnContext; + cloned.fnOptions = vnode.fnOptions; + cloned.fnScopeId = vnode.fnScopeId; + cloned.asyncMeta = vnode.asyncMeta; + cloned.isCloned = true; + return cloned + } + + /* + * not type checking this file because flow doesn't play well with + * dynamically accessing methods on Array prototype + */ + + var arrayProto = Array.prototype; + var arrayMethods = Object.create(arrayProto); + + var methodsToPatch = [ + 'push', + 'pop', + 'shift', + 'unshift', + 'splice', + 'sort', + 'reverse' + ]; + + /** + * Intercept mutating methods and emit events + */ + methodsToPatch.forEach(function (method) { + // cache original method + var original = arrayProto[method]; + def(arrayMethods, method, function mutator () { + var args = [], len = arguments.length; + while ( len-- ) args[ len ] = arguments[ len ]; + + var result = original.apply(this, args); + var ob = this.__ob__; + var inserted; + switch (method) { + case 'push': + case 'unshift': + inserted = args; + break + case 'splice': + inserted = args.slice(2); + break + } + if (inserted) { ob.observeArray(inserted); } + // notify change + ob.dep.notify(); + return result + }); + }); + + /* */ + + var arrayKeys = Object.getOwnPropertyNames(arrayMethods); + + /** + * In some cases we may want to disable observation inside a component's + * update computation. + */ + var shouldObserve = true; + + function toggleObserving (value) { + shouldObserve = value; + } + + /** + * Observer class that is attached to each observed + * object. Once attached, the observer converts the target + * object's property keys into getter/setters that + * collect dependencies and dispatch updates. + */ + var Observer = function Observer (value) { + this.value = value; + this.dep = new Dep(); + this.vmCount = 0; + def(value, '__ob__', this); + if (Array.isArray(value)) { + if (hasProto) { + protoAugment(value, arrayMethods); + } else { + copyAugment(value, arrayMethods, arrayKeys); + } + this.observeArray(value); + } else { + this.walk(value); + } + }; + + /** + * Walk through all properties and convert them into + * getter/setters. This method should only be called when + * value type is Object. + */ + Observer.prototype.walk = function walk (obj) { + var keys = Object.keys(obj); + for (var i = 0; i < keys.length; i++) { + defineReactive$$1(obj, keys[i]); + } + }; + + /** + * Observe a list of Array items. + */ + Observer.prototype.observeArray = function observeArray (items) { + for (var i = 0, l = items.length; i < l; i++) { + observe(items[i]); + } + }; + + // helpers + + /** + * Augment a target Object or Array by intercepting + * the prototype chain using __proto__ + */ + function protoAugment (target, src) { + /* eslint-disable no-proto */ + target.__proto__ = src; + /* eslint-enable no-proto */ + } + + /** + * Augment a target Object or Array by defining + * hidden properties. + */ + /* istanbul ignore next */ + function copyAugment (target, src, keys) { + for (var i = 0, l = keys.length; i < l; i++) { + var key = keys[i]; + def(target, key, src[key]); + } + } + + /** + * Attempt to create an observer instance for a value, + * returns the new observer if successfully observed, + * or the existing observer if the value already has one. + */ + function observe (value, asRootData) { + if (!isObject(value) || value instanceof VNode) { + return + } + var ob; + if (hasOwn(value, '__ob__') && value.__ob__ instanceof Observer) { + ob = value.__ob__; + } else if ( + shouldObserve && + !isServerRendering() && + (Array.isArray(value) || isPlainObject(value)) && + Object.isExtensible(value) && + !value._isVue + ) { + ob = new Observer(value); + } + if (asRootData && ob) { + ob.vmCount++; + } + return ob + } + + /** + * Define a reactive property on an Object. + */ + function defineReactive$$1 ( + obj, + key, + val, + customSetter, + shallow + ) { + var dep = new Dep(); + + var property = Object.getOwnPropertyDescriptor(obj, key); + if (property && property.configurable === false) { + return + } + + // cater for pre-defined getter/setters + var getter = property && property.get; + var setter = property && property.set; + if ((!getter || setter) && arguments.length === 2) { + val = obj[key]; + } + + var childOb = !shallow && observe(val); + Object.defineProperty(obj, key, { + enumerable: true, + configurable: true, + get: function reactiveGetter () { + var value = getter ? getter.call(obj) : val; + if (Dep.target) { + dep.depend(); + if (childOb) { + childOb.dep.depend(); + if (Array.isArray(value)) { + dependArray(value); + } + } + } + return value + }, + set: function reactiveSetter (newVal) { + var value = getter ? getter.call(obj) : val; + /* eslint-disable no-self-compare */ + if (newVal === value || (newVal !== newVal && value !== value)) { + return + } + /* eslint-enable no-self-compare */ + if (customSetter) { + customSetter(); + } + // #7981: for accessor properties without setter + if (getter && !setter) { return } + if (setter) { + setter.call(obj, newVal); + } else { + val = newVal; + } + childOb = !shallow && observe(newVal); + dep.notify(); + } + }); + } + + /** + * Set a property on an object. Adds the new property and + * triggers change notification if the property doesn't + * already exist. + */ + function set (target, key, val) { + if (isUndef(target) || isPrimitive(target) + ) { + warn(("Cannot set reactive property on undefined, null, or primitive value: " + ((target)))); + } + if (Array.isArray(target) && isValidArrayIndex(key)) { + target.length = Math.max(target.length, key); + target.splice(key, 1, val); + return val + } + if (key in target && !(key in Object.prototype)) { + target[key] = val; + return val + } + var ob = (target).__ob__; + if (target._isVue || (ob && ob.vmCount)) { + warn( + 'Avoid adding reactive properties to a Vue instance or its root $data ' + + 'at runtime - declare it upfront in the data option.' + ); + return val + } + if (!ob) { + target[key] = val; + return val + } + defineReactive$$1(ob.value, key, val); + ob.dep.notify(); + return val + } + + /** + * Delete a property and trigger change if necessary. + */ + function del (target, key) { + if (isUndef(target) || isPrimitive(target) + ) { + warn(("Cannot delete reactive property on undefined, null, or primitive value: " + ((target)))); + } + if (Array.isArray(target) && isValidArrayIndex(key)) { + target.splice(key, 1); + return + } + var ob = (target).__ob__; + if (target._isVue || (ob && ob.vmCount)) { + warn( + 'Avoid deleting properties on a Vue instance or its root $data ' + + '- just set it to null.' + ); + return + } + if (!hasOwn(target, key)) { + return + } + delete target[key]; + if (!ob) { + return + } + ob.dep.notify(); + } + + /** + * Collect dependencies on array elements when the array is touched, since + * we cannot intercept array element access like property getters. + */ + function dependArray (value) { + for (var e = (void 0), i = 0, l = value.length; i < l; i++) { + e = value[i]; + e && e.__ob__ && e.__ob__.dep.depend(); + if (Array.isArray(e)) { + dependArray(e); + } + } + } + + /* */ + + /** + * Option overwriting strategies are functions that handle + * how to merge a parent option value and a child option + * value into the final value. + */ + var strats = config.optionMergeStrategies; + + /** + * Options with restrictions + */ + { + strats.el = strats.propsData = function (parent, child, vm, key) { + if (!vm) { + warn( + "option \"" + key + "\" can only be used during instance " + + 'creation with the `new` keyword.' + ); + } + return defaultStrat(parent, child) + }; + } + + /** + * Helper that recursively merges two data objects together. + */ + function mergeData (to, from) { + if (!from) { return to } + var key, toVal, fromVal; + + var keys = hasSymbol + ? Reflect.ownKeys(from) + : Object.keys(from); + + for (var i = 0; i < keys.length; i++) { + key = keys[i]; + // in case the object is already observed... + if (key === '__ob__') { continue } + toVal = to[key]; + fromVal = from[key]; + if (!hasOwn(to, key)) { + set(to, key, fromVal); + } else if ( + toVal !== fromVal && + isPlainObject(toVal) && + isPlainObject(fromVal) + ) { + mergeData(toVal, fromVal); + } + } + return to + } + + /** + * Data + */ + function mergeDataOrFn ( + parentVal, + childVal, + vm + ) { + if (!vm) { + // in a Vue.extend merge, both should be functions + if (!childVal) { + return parentVal + } + if (!parentVal) { + return childVal + } + // when parentVal & childVal are both present, + // we need to return a function that returns the + // merged result of both functions... no need to + // check if parentVal is a function here because + // it has to be a function to pass previous merges. + return function mergedDataFn () { + return mergeData( + typeof childVal === 'function' ? childVal.call(this, this) : childVal, + typeof parentVal === 'function' ? parentVal.call(this, this) : parentVal + ) + } + } else { + return function mergedInstanceDataFn () { + // instance merge + var instanceData = typeof childVal === 'function' + ? childVal.call(vm, vm) + : childVal; + var defaultData = typeof parentVal === 'function' + ? parentVal.call(vm, vm) + : parentVal; + if (instanceData) { + return mergeData(instanceData, defaultData) + } else { + return defaultData + } + } + } + } + + strats.data = function ( + parentVal, + childVal, + vm + ) { + if (!vm) { + if (childVal && typeof childVal !== 'function') { + warn( + 'The "data" option should be a function ' + + 'that returns a per-instance value in component ' + + 'definitions.', + vm + ); + + return parentVal + } + return mergeDataOrFn(parentVal, childVal) + } + + return mergeDataOrFn(parentVal, childVal, vm) + }; + + /** + * Hooks and props are merged as arrays. + */ + function mergeHook ( + parentVal, + childVal + ) { + var res = childVal + ? parentVal + ? parentVal.concat(childVal) + : Array.isArray(childVal) + ? childVal + : [childVal] + : parentVal; + return res + ? dedupeHooks(res) + : res + } + + function dedupeHooks (hooks) { + var res = []; + for (var i = 0; i < hooks.length; i++) { + if (res.indexOf(hooks[i]) === -1) { + res.push(hooks[i]); + } + } + return res + } + + LIFECYCLE_HOOKS.forEach(function (hook) { + strats[hook] = mergeHook; + }); + + /** + * Assets + * + * When a vm is present (instance creation), we need to do + * a three-way merge between constructor options, instance + * options and parent options. + */ + function mergeAssets ( + parentVal, + childVal, + vm, + key + ) { + var res = Object.create(parentVal || null); + if (childVal) { + assertObjectType(key, childVal, vm); + return extend(res, childVal) + } else { + return res + } + } + + ASSET_TYPES.forEach(function (type) { + strats[type + 's'] = mergeAssets; + }); + + /** + * Watchers. + * + * Watchers hashes should not overwrite one + * another, so we merge them as arrays. + */ + strats.watch = function ( + parentVal, + childVal, + vm, + key + ) { + // work around Firefox's Object.prototype.watch... + if (parentVal === nativeWatch) { parentVal = undefined; } + if (childVal === nativeWatch) { childVal = undefined; } + /* istanbul ignore if */ + if (!childVal) { return Object.create(parentVal || null) } + { + assertObjectType(key, childVal, vm); + } + if (!parentVal) { return childVal } + var ret = {}; + extend(ret, parentVal); + for (var key$1 in childVal) { + var parent = ret[key$1]; + var child = childVal[key$1]; + if (parent && !Array.isArray(parent)) { + parent = [parent]; + } + ret[key$1] = parent + ? parent.concat(child) + : Array.isArray(child) ? child : [child]; + } + return ret + }; + + /** + * Other object hashes. + */ + strats.props = + strats.methods = + strats.inject = + strats.computed = function ( + parentVal, + childVal, + vm, + key + ) { + if (childVal && "development" !== 'production') { + assertObjectType(key, childVal, vm); + } + if (!parentVal) { return childVal } + var ret = Object.create(null); + extend(ret, parentVal); + if (childVal) { extend(ret, childVal); } + return ret + }; + strats.provide = mergeDataOrFn; + + /** + * Default strategy. + */ + var defaultStrat = function (parentVal, childVal) { + return childVal === undefined + ? parentVal + : childVal + }; + + /** + * Validate component names + */ + function checkComponents (options) { + for (var key in options.components) { + validateComponentName(key); + } + } + + function validateComponentName (name) { + if (!new RegExp(("^[a-zA-Z][\\-\\.0-9_" + (unicodeRegExp.source) + "]*$")).test(name)) { + warn( + 'Invalid component name: "' + name + '". Component names ' + + 'should conform to valid custom element name in html5 specification.' + ); + } + if (isBuiltInTag(name) || config.isReservedTag(name)) { + warn( + 'Do not use built-in or reserved HTML elements as component ' + + 'id: ' + name + ); + } + } + + /** + * Ensure all props option syntax are normalized into the + * Object-based format. + */ + function normalizeProps (options, vm) { + var props = options.props; + if (!props) { return } + var res = {}; + var i, val, name; + if (Array.isArray(props)) { + i = props.length; + while (i--) { + val = props[i]; + if (typeof val === 'string') { + name = camelize(val); + res[name] = { type: null }; + } else { + warn('props must be strings when using array syntax.'); + } + } + } else if (isPlainObject(props)) { + for (var key in props) { + val = props[key]; + name = camelize(key); + res[name] = isPlainObject(val) + ? val + : { type: val }; + } + } else { + warn( + "Invalid value for option \"props\": expected an Array or an Object, " + + "but got " + (toRawType(props)) + ".", + vm + ); + } + options.props = res; + } + + /** + * Normalize all injections into Object-based format + */ + function normalizeInject (options, vm) { + var inject = options.inject; + if (!inject) { return } + var normalized = options.inject = {}; + if (Array.isArray(inject)) { + for (var i = 0; i < inject.length; i++) { + normalized[inject[i]] = { from: inject[i] }; + } + } else if (isPlainObject(inject)) { + for (var key in inject) { + var val = inject[key]; + normalized[key] = isPlainObject(val) + ? extend({ from: key }, val) + : { from: val }; + } + } else { + warn( + "Invalid value for option \"inject\": expected an Array or an Object, " + + "but got " + (toRawType(inject)) + ".", + vm + ); + } + } + + /** + * Normalize raw function directives into object format. + */ + function normalizeDirectives (options) { + var dirs = options.directives; + if (dirs) { + for (var key in dirs) { + var def$$1 = dirs[key]; + if (typeof def$$1 === 'function') { + dirs[key] = { bind: def$$1, update: def$$1 }; + } + } + } + } + + function assertObjectType (name, value, vm) { + if (!isPlainObject(value)) { + warn( + "Invalid value for option \"" + name + "\": expected an Object, " + + "but got " + (toRawType(value)) + ".", + vm + ); + } + } + + /** + * Merge two option objects into a new one. + * Core utility used in both instantiation and inheritance. + */ + function mergeOptions ( + parent, + child, + vm + ) { + { + checkComponents(child); + } + + if (typeof child === 'function') { + child = child.options; + } + + normalizeProps(child, vm); + normalizeInject(child, vm); + normalizeDirectives(child); + + // Apply extends and mixins on the child options, + // but only if it is a raw options object that isn't + // the result of another mergeOptions call. + // Only merged options has the _base property. + if (!child._base) { + if (child.extends) { + parent = mergeOptions(parent, child.extends, vm); + } + if (child.mixins) { + for (var i = 0, l = child.mixins.length; i < l; i++) { + parent = mergeOptions(parent, child.mixins[i], vm); + } + } + } + + var options = {}; + var key; + for (key in parent) { + mergeField(key); + } + for (key in child) { + if (!hasOwn(parent, key)) { + mergeField(key); + } + } + function mergeField (key) { + var strat = strats[key] || defaultStrat; + options[key] = strat(parent[key], child[key], vm, key); + } + return options + } + + /** + * Resolve an asset. + * This function is used because child instances need access + * to assets defined in its ancestor chain. + */ + function resolveAsset ( + options, + type, + id, + warnMissing + ) { + /* istanbul ignore if */ + if (typeof id !== 'string') { + return + } + var assets = options[type]; + // check local registration variations first + if (hasOwn(assets, id)) { return assets[id] } + var camelizedId = camelize(id); + if (hasOwn(assets, camelizedId)) { return assets[camelizedId] } + var PascalCaseId = capitalize(camelizedId); + if (hasOwn(assets, PascalCaseId)) { return assets[PascalCaseId] } + // fallback to prototype chain + var res = assets[id] || assets[camelizedId] || assets[PascalCaseId]; + if (warnMissing && !res) { + warn( + 'Failed to resolve ' + type.slice(0, -1) + ': ' + id, + options + ); + } + return res + } + + /* */ + + + + function validateProp ( + key, + propOptions, + propsData, + vm + ) { + var prop = propOptions[key]; + var absent = !hasOwn(propsData, key); + var value = propsData[key]; + // boolean casting + var booleanIndex = getTypeIndex(Boolean, prop.type); + if (booleanIndex > -1) { + if (absent && !hasOwn(prop, 'default')) { + value = false; + } else if (value === '' || value === hyphenate(key)) { + // only cast empty string / same name to boolean if + // boolean has higher priority + var stringIndex = getTypeIndex(String, prop.type); + if (stringIndex < 0 || booleanIndex < stringIndex) { + value = true; + } + } + } + // check default value + if (value === undefined) { + value = getPropDefaultValue(vm, prop, key); + // since the default value is a fresh copy, + // make sure to observe it. + var prevShouldObserve = shouldObserve; + toggleObserving(true); + observe(value); + toggleObserving(prevShouldObserve); + } + { + assertProp(prop, key, value, vm, absent); + } + return value + } + + /** + * Get the default value of a prop. + */ + function getPropDefaultValue (vm, prop, key) { + // no default, return undefined + if (!hasOwn(prop, 'default')) { + return undefined + } + var def = prop.default; + // warn against non-factory defaults for Object & Array + if (isObject(def)) { + warn( + 'Invalid default value for prop "' + key + '": ' + + 'Props with type Object/Array must use a factory function ' + + 'to return the default value.', + vm + ); + } + // the raw prop value was also undefined from previous render, + // return previous default value to avoid unnecessary watcher trigger + if (vm && vm.$options.propsData && + vm.$options.propsData[key] === undefined && + vm._props[key] !== undefined + ) { + return vm._props[key] + } + // call factory function for non-Function types + // a value is Function if its prototype is function even across different execution context + return typeof def === 'function' && getType(prop.type) !== 'Function' + ? def.call(vm) + : def + } + + /** + * Assert whether a prop is valid. + */ + function assertProp ( + prop, + name, + value, + vm, + absent + ) { + if (prop.required && absent) { + warn( + 'Missing required prop: "' + name + '"', + vm + ); + return + } + if (value == null && !prop.required) { + return + } + var type = prop.type; + var valid = !type || type === true; + var expectedTypes = []; + if (type) { + if (!Array.isArray(type)) { + type = [type]; + } + for (var i = 0; i < type.length && !valid; i++) { + var assertedType = assertType(value, type[i], vm); + expectedTypes.push(assertedType.expectedType || ''); + valid = assertedType.valid; + } + } + + var haveExpectedTypes = expectedTypes.some(function (t) { return t; }); + if (!valid && haveExpectedTypes) { + warn( + getInvalidTypeMessage(name, value, expectedTypes), + vm + ); + return + } + var validator = prop.validator; + if (validator) { + if (!validator(value)) { + warn( + 'Invalid prop: custom validator check failed for prop "' + name + '".', + vm + ); + } + } + } + + var simpleCheckRE = /^(String|Number|Boolean|Function|Symbol|BigInt)$/; + + function assertType (value, type, vm) { + var valid; + var expectedType = getType(type); + if (simpleCheckRE.test(expectedType)) { + var t = typeof value; + valid = t === expectedType.toLowerCase(); + // for primitive wrapper objects + if (!valid && t === 'object') { + valid = value instanceof type; + } + } else if (expectedType === 'Object') { + valid = isPlainObject(value); + } else if (expectedType === 'Array') { + valid = Array.isArray(value); + } else { + try { + valid = value instanceof type; + } catch (e) { + warn('Invalid prop type: "' + String(type) + '" is not a constructor', vm); + valid = false; + } + } + return { + valid: valid, + expectedType: expectedType + } + } + + var functionTypeCheckRE = /^\s*function (\w+)/; + + /** + * Use function string name to check built-in types, + * because a simple equality check will fail when running + * across different vms / iframes. + */ + function getType (fn) { + var match = fn && fn.toString().match(functionTypeCheckRE); + return match ? match[1] : '' + } + + function isSameType (a, b) { + return getType(a) === getType(b) + } + + function getTypeIndex (type, expectedTypes) { + if (!Array.isArray(expectedTypes)) { + return isSameType(expectedTypes, type) ? 0 : -1 + } + for (var i = 0, len = expectedTypes.length; i < len; i++) { + if (isSameType(expectedTypes[i], type)) { + return i + } + } + return -1 + } + + function getInvalidTypeMessage (name, value, expectedTypes) { + var message = "Invalid prop: type check failed for prop \"" + name + "\"." + + " Expected " + (expectedTypes.map(capitalize).join(', ')); + var expectedType = expectedTypes[0]; + var receivedType = toRawType(value); + // check if we need to specify expected value + if ( + expectedTypes.length === 1 && + isExplicable(expectedType) && + isExplicable(typeof value) && + !isBoolean(expectedType, receivedType) + ) { + message += " with value " + (styleValue(value, expectedType)); + } + message += ", got " + receivedType + " "; + // check if we need to specify received value + if (isExplicable(receivedType)) { + message += "with value " + (styleValue(value, receivedType)) + "."; + } + return message + } + + function styleValue (value, type) { + if (type === 'String') { + return ("\"" + value + "\"") + } else if (type === 'Number') { + return ("" + (Number(value))) + } else { + return ("" + value) + } + } + + var EXPLICABLE_TYPES = ['string', 'number', 'boolean']; + function isExplicable (value) { + return EXPLICABLE_TYPES.some(function (elem) { return value.toLowerCase() === elem; }) + } + + function isBoolean () { + var args = [], len = arguments.length; + while ( len-- ) args[ len ] = arguments[ len ]; + + return args.some(function (elem) { return elem.toLowerCase() === 'boolean'; }) + } + + /* */ + + function handleError (err, vm, info) { + // Deactivate deps tracking while processing error handler to avoid possible infinite rendering. + // See: https://github.com/vuejs/vuex/issues/1505 + pushTarget(); + try { + if (vm) { + var cur = vm; + while ((cur = cur.$parent)) { + var hooks = cur.$options.errorCaptured; + if (hooks) { + for (var i = 0; i < hooks.length; i++) { + try { + var capture = hooks[i].call(cur, err, vm, info) === false; + if (capture) { return } + } catch (e) { + globalHandleError(e, cur, 'errorCaptured hook'); + } + } + } + } + } + globalHandleError(err, vm, info); + } finally { + popTarget(); + } + } + + function invokeWithErrorHandling ( + handler, + context, + args, + vm, + info + ) { + var res; + try { + res = args ? handler.apply(context, args) : handler.call(context); + if (res && !res._isVue && isPromise(res) && !res._handled) { + res.catch(function (e) { return handleError(e, vm, info + " (Promise/async)"); }); + // issue #9511 + // avoid catch triggering multiple times when nested calls + res._handled = true; + } + } catch (e) { + handleError(e, vm, info); + } + return res + } + + function globalHandleError (err, vm, info) { + if (config.errorHandler) { + try { + return config.errorHandler.call(null, err, vm, info) + } catch (e) { + // if the user intentionally throws the original error in the handler, + // do not log it twice + if (e !== err) { + logError(e, null, 'config.errorHandler'); + } + } + } + logError(err, vm, info); + } + + function logError (err, vm, info) { + { + warn(("Error in " + info + ": \"" + (err.toString()) + "\""), vm); + } + /* istanbul ignore else */ + if ((inBrowser || inWeex) && typeof console !== 'undefined') { + console.error(err); + } else { + throw err + } + } + + /* */ + + var isUsingMicroTask = false; + + var callbacks = []; + var pending = false; + + function flushCallbacks () { + pending = false; + var copies = callbacks.slice(0); + callbacks.length = 0; + for (var i = 0; i < copies.length; i++) { + copies[i](); + } + } + + // Here we have async deferring wrappers using microtasks. + // In 2.5 we used (macro) tasks (in combination with microtasks). + // However, it has subtle problems when state is changed right before repaint + // (e.g. #6813, out-in transitions). + // Also, using (macro) tasks in event handler would cause some weird behaviors + // that cannot be circumvented (e.g. #7109, #7153, #7546, #7834, #8109). + // So we now use microtasks everywhere, again. + // A major drawback of this tradeoff is that there are some scenarios + // where microtasks have too high a priority and fire in between supposedly + // sequential events (e.g. #4521, #6690, which have workarounds) + // or even between bubbling of the same event (#6566). + var timerFunc; + + // The nextTick behavior leverages the microtask queue, which can be accessed + // via either native Promise.then or MutationObserver. + // MutationObserver has wider support, however it is seriously bugged in + // UIWebView in iOS >= 9.3.3 when triggered in touch event handlers. It + // completely stops working after triggering a few times... so, if native + // Promise is available, we will use it: + /* istanbul ignore next, $flow-disable-line */ + if (typeof Promise !== 'undefined' && isNative(Promise)) { + var p = Promise.resolve(); + timerFunc = function () { + p.then(flushCallbacks); + // In problematic UIWebViews, Promise.then doesn't completely break, but + // it can get stuck in a weird state where callbacks are pushed into the + // microtask queue but the queue isn't being flushed, until the browser + // needs to do some other work, e.g. handle a timer. Therefore we can + // "force" the microtask queue to be flushed by adding an empty timer. + if (isIOS) { setTimeout(noop); } + }; + isUsingMicroTask = true; + } else if (!isIE && typeof MutationObserver !== 'undefined' && ( + isNative(MutationObserver) || + // PhantomJS and iOS 7.x + MutationObserver.toString() === '[object MutationObserverConstructor]' + )) { + // Use MutationObserver where native Promise is not available, + // e.g. PhantomJS, iOS7, Android 4.4 + // (#6466 MutationObserver is unreliable in IE11) + var counter = 1; + var observer = new MutationObserver(flushCallbacks); + var textNode = document.createTextNode(String(counter)); + observer.observe(textNode, { + characterData: true + }); + timerFunc = function () { + counter = (counter + 1) % 2; + textNode.data = String(counter); + }; + isUsingMicroTask = true; + } else if (typeof setImmediate !== 'undefined' && isNative(setImmediate)) { + // Fallback to setImmediate. + // Technically it leverages the (macro) task queue, + // but it is still a better choice than setTimeout. + timerFunc = function () { + setImmediate(flushCallbacks); + }; + } else { + // Fallback to setTimeout. + timerFunc = function () { + setTimeout(flushCallbacks, 0); + }; + } + + function nextTick (cb, ctx) { + var _resolve; + callbacks.push(function () { + if (cb) { + try { + cb.call(ctx); + } catch (e) { + handleError(e, ctx, 'nextTick'); + } + } else if (_resolve) { + _resolve(ctx); + } + }); + if (!pending) { + pending = true; + timerFunc(); + } + // $flow-disable-line + if (!cb && typeof Promise !== 'undefined') { + return new Promise(function (resolve) { + _resolve = resolve; + }) + } + } + + /* */ + + var mark; + var measure; + + { + var perf = inBrowser && window.performance; + /* istanbul ignore if */ + if ( + perf && + perf.mark && + perf.measure && + perf.clearMarks && + perf.clearMeasures + ) { + mark = function (tag) { return perf.mark(tag); }; + measure = function (name, startTag, endTag) { + perf.measure(name, startTag, endTag); + perf.clearMarks(startTag); + perf.clearMarks(endTag); + // perf.clearMeasures(name) + }; + } + } + + /* not type checking this file because flow doesn't play well with Proxy */ + + var initProxy; + + { + var allowedGlobals = makeMap( + 'Infinity,undefined,NaN,isFinite,isNaN,' + + 'parseFloat,parseInt,decodeURI,decodeURIComponent,encodeURI,encodeURIComponent,' + + 'Math,Number,Date,Array,Object,Boolean,String,RegExp,Map,Set,JSON,Intl,BigInt,' + + 'require' // for Webpack/Browserify + ); + + var warnNonPresent = function (target, key) { + warn( + "Property or method \"" + key + "\" is not defined on the instance but " + + 'referenced during render. Make sure that this property is reactive, ' + + 'either in the data option, or for class-based components, by ' + + 'initializing the property. ' + + 'See: https://vuejs.org/v2/guide/reactivity.html#Declaring-Reactive-Properties.', + target + ); + }; + + var warnReservedPrefix = function (target, key) { + warn( + "Property \"" + key + "\" must be accessed with \"$data." + key + "\" because " + + 'properties starting with "$" or "_" are not proxied in the Vue instance to ' + + 'prevent conflicts with Vue internals. ' + + 'See: https://vuejs.org/v2/api/#data', + target + ); + }; + + var hasProxy = + typeof Proxy !== 'undefined' && isNative(Proxy); + + if (hasProxy) { + var isBuiltInModifier = makeMap('stop,prevent,self,ctrl,shift,alt,meta,exact'); + config.keyCodes = new Proxy(config.keyCodes, { + set: function set (target, key, value) { + if (isBuiltInModifier(key)) { + warn(("Avoid overwriting built-in modifier in config.keyCodes: ." + key)); + return false + } else { + target[key] = value; + return true + } + } + }); + } + + var hasHandler = { + has: function has (target, key) { + var has = key in target; + var isAllowed = allowedGlobals(key) || + (typeof key === 'string' && key.charAt(0) === '_' && !(key in target.$data)); + if (!has && !isAllowed) { + if (key in target.$data) { warnReservedPrefix(target, key); } + else { warnNonPresent(target, key); } + } + return has || !isAllowed + } + }; + + var getHandler = { + get: function get (target, key) { + if (typeof key === 'string' && !(key in target)) { + if (key in target.$data) { warnReservedPrefix(target, key); } + else { warnNonPresent(target, key); } + } + return target[key] + } + }; + + initProxy = function initProxy (vm) { + if (hasProxy) { + // determine which proxy handler to use + var options = vm.$options; + var handlers = options.render && options.render._withStripped + ? getHandler + : hasHandler; + vm._renderProxy = new Proxy(vm, handlers); + } else { + vm._renderProxy = vm; + } + }; + } + + /* */ + + var seenObjects = new _Set(); + + /** + * Recursively traverse an object to evoke all converted + * getters, so that every nested property inside the object + * is collected as a "deep" dependency. + */ + function traverse (val) { + _traverse(val, seenObjects); + seenObjects.clear(); + } + + function _traverse (val, seen) { + var i, keys; + var isA = Array.isArray(val); + if ((!isA && !isObject(val)) || Object.isFrozen(val) || val instanceof VNode) { + return + } + if (val.__ob__) { + var depId = val.__ob__.dep.id; + if (seen.has(depId)) { + return + } + seen.add(depId); + } + if (isA) { + i = val.length; + while (i--) { _traverse(val[i], seen); } + } else { + keys = Object.keys(val); + i = keys.length; + while (i--) { _traverse(val[keys[i]], seen); } + } + } + + /* */ + + var normalizeEvent = cached(function (name) { + var passive = name.charAt(0) === '&'; + name = passive ? name.slice(1) : name; + var once$$1 = name.charAt(0) === '~'; // Prefixed last, checked first + name = once$$1 ? name.slice(1) : name; + var capture = name.charAt(0) === '!'; + name = capture ? name.slice(1) : name; + return { + name: name, + once: once$$1, + capture: capture, + passive: passive + } + }); + + function createFnInvoker (fns, vm) { + function invoker () { + var arguments$1 = arguments; + + var fns = invoker.fns; + if (Array.isArray(fns)) { + var cloned = fns.slice(); + for (var i = 0; i < cloned.length; i++) { + invokeWithErrorHandling(cloned[i], null, arguments$1, vm, "v-on handler"); + } + } else { + // return handler return value for single handlers + return invokeWithErrorHandling(fns, null, arguments, vm, "v-on handler") + } + } + invoker.fns = fns; + return invoker + } + + function updateListeners ( + on, + oldOn, + add, + remove$$1, + createOnceHandler, + vm + ) { + var name, def$$1, cur, old, event; + for (name in on) { + def$$1 = cur = on[name]; + old = oldOn[name]; + event = normalizeEvent(name); + if (isUndef(cur)) { + warn( + "Invalid handler for event \"" + (event.name) + "\": got " + String(cur), + vm + ); + } else if (isUndef(old)) { + if (isUndef(cur.fns)) { + cur = on[name] = createFnInvoker(cur, vm); + } + if (isTrue(event.once)) { + cur = on[name] = createOnceHandler(event.name, cur, event.capture); + } + add(event.name, cur, event.capture, event.passive, event.params); + } else if (cur !== old) { + old.fns = cur; + on[name] = old; + } + } + for (name in oldOn) { + if (isUndef(on[name])) { + event = normalizeEvent(name); + remove$$1(event.name, oldOn[name], event.capture); + } + } + } + + /* */ + + function mergeVNodeHook (def, hookKey, hook) { + if (def instanceof VNode) { + def = def.data.hook || (def.data.hook = {}); + } + var invoker; + var oldHook = def[hookKey]; + + function wrappedHook () { + hook.apply(this, arguments); + // important: remove merged hook to ensure it's called only once + // and prevent memory leak + remove(invoker.fns, wrappedHook); + } + + if (isUndef(oldHook)) { + // no existing hook + invoker = createFnInvoker([wrappedHook]); + } else { + /* istanbul ignore if */ + if (isDef(oldHook.fns) && isTrue(oldHook.merged)) { + // already a merged invoker + invoker = oldHook; + invoker.fns.push(wrappedHook); + } else { + // existing plain hook + invoker = createFnInvoker([oldHook, wrappedHook]); + } + } + + invoker.merged = true; + def[hookKey] = invoker; + } + + /* */ + + function extractPropsFromVNodeData ( + data, + Ctor, + tag + ) { + // we are only extracting raw values here. + // validation and default values are handled in the child + // component itself. + var propOptions = Ctor.options.props; + if (isUndef(propOptions)) { + return + } + var res = {}; + var attrs = data.attrs; + var props = data.props; + if (isDef(attrs) || isDef(props)) { + for (var key in propOptions) { + var altKey = hyphenate(key); + { + var keyInLowerCase = key.toLowerCase(); + if ( + key !== keyInLowerCase && + attrs && hasOwn(attrs, keyInLowerCase) + ) { + tip( + "Prop \"" + keyInLowerCase + "\" is passed to component " + + (formatComponentName(tag || Ctor)) + ", but the declared prop name is" + + " \"" + key + "\". " + + "Note that HTML attributes are case-insensitive and camelCased " + + "props need to use their kebab-case equivalents when using in-DOM " + + "templates. You should probably use \"" + altKey + "\" instead of \"" + key + "\"." + ); + } + } + checkProp(res, props, key, altKey, true) || + checkProp(res, attrs, key, altKey, false); + } + } + return res + } + + function checkProp ( + res, + hash, + key, + altKey, + preserve + ) { + if (isDef(hash)) { + if (hasOwn(hash, key)) { + res[key] = hash[key]; + if (!preserve) { + delete hash[key]; + } + return true + } else if (hasOwn(hash, altKey)) { + res[key] = hash[altKey]; + if (!preserve) { + delete hash[altKey]; + } + return true + } + } + return false + } + + /* */ + + // The template compiler attempts to minimize the need for normalization by + // statically analyzing the template at compile time. + // + // For plain HTML markup, normalization can be completely skipped because the + // generated render function is guaranteed to return Array. There are + // two cases where extra normalization is needed: + + // 1. When the children contains components - because a functional component + // may return an Array instead of a single root. In this case, just a simple + // normalization is needed - if any child is an Array, we flatten the whole + // thing with Array.prototype.concat. It is guaranteed to be only 1-level deep + // because functional components already normalize their own children. + function simpleNormalizeChildren (children) { + for (var i = 0; i < children.length; i++) { + if (Array.isArray(children[i])) { + return Array.prototype.concat.apply([], children) + } + } + return children + } + + // 2. When the children contains constructs that always generated nested Arrays, + // e.g.