([\s\S]+?)<\/pre>/)[1];
+ // Z.debug(bibText)
+ let translator = Zotero.loadTranslator("import");
+ translator.setTranslator('9cb70025-a888-4a29-a210-93ec52da40d4');
+ translator.setString(bibText);
+ translator.setHandler('itemDone', (_obj, item) => {
+ if (pdfUrl) {
+ item.attachments.push({ url: pdfUrl, title: "Full Text PDF", mimeType: "application/pdf" });
+ }
+ delete item.itemID;
+ if (item.itemType == "thesis" && !item.university) {
+ item.university = thesisUniversity;
+ }
+ item.abstractNote = abstract;
+ item.itemType = getItemType(doc);
+ item.extra = "";
+ item.complete();
+ });
+ await translator.translate();
+}
+
+/** BEGIN TEST CASES **/
+var testCases = [
+ {
+ "type": "web",
+ "url": "https://cds.cern.ch/search?ln=en&sc=1&p=testing&action_search=Search&op1=a&m1=a&p1=&f1=&c=Articles+%26+Preprints&c=Books+%26+Proceedings&c=Presentations+%26+Talks&c=Periodicals+%26+Progress+Reports&c=Multimedia+%26+Outreach&c=International+Collaborations",
+ "detectedItemType": "multiple",
+ "items": "multiple"
+ },
+ {
+ "type": "web",
+ "url": "https://cds.cern.ch/record/2855572?ln=en",
+ "detectedItemType": "preprint",
+ "items": [
+ {
+ "itemType": "preprint",
+ "title": "A short history of Internet protocols at CERN",
+ "creators": [
+ {
+ "firstName": "Ben",
+ "lastName": "Segal",
+ "creatorType": "author"
+ }
+ ],
+ "date": "1995",
+ "libraryCatalog": "CERN Document Server",
+ "place": "Geneva",
+ "repository": "CERN",
+ "url": "https://cds.cern.ch/record/2855572",
+ "attachments": [
+ {
+ "title": "Full Text PDF",
+ "mimeType": "application/pdf"
+ }
+ ],
+ "tags": [],
+ "notes": [],
+ "seeAlso": []
+ }
+ ]
+ },
+ {
+ "type": "web",
+ "url": "https://cds.cern.ch/collection/Published%20Articles?ln=en",
+ "detectedItemType": "multiple",
+ "items": "multiple"
+ },
+ {
+ "type": "web",
+ "url": "https://cds.cern.ch/record/2855446?ln=de",
+ "detectedItemType": "journalArticle",
+ "items": [
+ {
+ "itemType": "journalArticle",
+ "title": "Production of Σ⁰ Hyperon and Search of Σ⁰ Hypernuclei at LHC with ALICE",
+ "creators": [
+ {
+ "firstName": "Alexander",
+ "lastName": "Borissov",
+ "creatorType": "author"
+ },
+ {
+ "firstName": "Sergei",
+ "lastName": "Solokhin",
+ "creatorType": "author"
+ }
+ ],
+ "date": "2023",
+ "DOI": "10.1134/S1063778823010131",
+ "abstractNote": "The first measurements of the transverse momentum ($p_{{{T}}}$) spectra and integrated yields and mean $p_{{T}}$ of $\\Sigma^{0}$ and $\\overline{\\Sigma}^{0}$ hyperons in $pp$ collisions at $\\sqrt{s}=7$ TeV at the LHC are presented. The $\\Sigma^{0}$($\\overline{\\Sigma}^{0}$) is reconstructed via its electromagnetic decay channel $\\Lambda$($\\overline{\\Lambda})+\\gamma$. The $\\Lambda$ ($\\overline{\\Lambda}$) baryon is reconstructed via its decay into $p+\\pi^{-}$ ($\\overline{{{p}}}+\\pi^{+}$), while the photon is detected by exploiting the unique capability of the ALICE detector to measure low-energy photons via conversion into $e^{+}e^{-}$ pairs in the detector material. The yield of $\\Sigma^{0}$ is compared to that of the $\\Lambda$ baryon, which has the same quark content but different isospin. These data contribute to the understanding of hadron production mechanisms and provide a reference for constraining QCD-inspired models and tuning Monte Carlo event generators such as PYTHIA. In addition, the feasibility of a search for a bound state of proton, neutron and $\\Sigma^{0}$($\\Sigma^{0}$ hypernuclei ${}^{3}_{\\Sigma^{0}}$H) is presented, based on the luminosities foreseen for the LHC Runs 3 and 4.",
+ "issue": "6",
+ "libraryCatalog": "CERN Document Server",
+ "pages": "970-975",
+ "publicationTitle": "Phys. At. Nucl.",
+ "url": "https://cds.cern.ch/record/2855446",
+ "volume": "85",
+ "attachments": [],
+ "tags": [],
+ "notes": [],
+ "seeAlso": []
+ }
+ ]
+ },
+ {
+ "type": "web",
+ "url": "https://cds.cern.ch/record/2854594?ln=en",
+ "detectedItemType": "report",
+ "items": [
+ {
+ "itemType": "report",
+ "title": "Notes on the machine studies team informal seminars on transitional phenomena",
+ "creators": [
+ {
+ "firstName": "O",
+ "lastName": "Barbalat",
+ "creatorType": "author"
+ }
+ ],
+ "date": "1968",
+ "institution": "CERN",
+ "libraryCatalog": "CERN Document Server",
+ "place": "Geneva",
+ "url": "https://cds.cern.ch/record/2854594",
+ "attachments": [
+ {
+ "title": "Full Text PDF",
+ "mimeType": "application/pdf"
+ }
+ ],
+ "tags": [],
+ "notes": [],
+ "seeAlso": []
+ }
+ ]
+ },
+ {
+ "type": "web",
+ "url": "https://cds.cern.ch/record/2854931?ln=en",
+ "detectedItemType": "thesis",
+ "items": [
+ {
+ "itemType": "thesis",
+ "title": "Pathlength-dependent jet quenching in the quark–gluon plasma at ALICE",
+ "creators": [
+ {
+ "firstName": "Caitlin",
+ "lastName": "Beattie",
+ "creatorType": "author"
+ }
+ ],
+ "date": "2023",
+ "abstractNote": "At extremely high temperatures, the quarks and gluons that compose the fundamental building blocks of our universe undergo a phase transition from stable hadronic matter to become a deconfined quark--gluon plasma (QGP). One way to study this medium is through collisions of heavy ions, where extraordinarily high energy densities produce just such a deconfined state. Of particular interest are jets, collimated showers of hadrons that originate early in the collision and undergo modification as they traverse the QGP, thus probing the medium's properties and enabling the study of quantum chromodynamics at multiple scales. Notably, jets lose energy as they propagate through the medium, the pathlength dependence of which remains an open question. The answer is of significant interest, however, given that quantitative constraints on this dependence are closely related to the underlying mechanisms that drive jet quenching phenomena. This thesis will discuss the first measurement of jets using a technique known as event-shape engineering (ESE), a measurement made in an effort to constrain the pathlength dependence of jet energy loss. For this thesis, charged jets were measured in Pb--Pb collisions using the ALICE detector at the CERN Large Hadron Collider. These jets were then classified according to their angle with respect to the event plane, as well as the shape of the event that they traversed. No sensitivity of the jet spectra to the event shape was observed; however, the yields were seen to be dependent on the event-plane angle. Moreover, this dependence was stronger for highly-elliptical events and weaker for highly-isotropic events. Such results are consistent with descriptions of pathlength distributions that were studied in Trajectum and the assumption that jets lose energy in a pathlength-dependent manner. Further theoretical models are required to extract quantitative constraints from this study.",
+ "libraryCatalog": "CERN Document Server",
+ "university": "Yale University (US)",
+ "url": "https://cds.cern.ch/record/2854931",
+ "attachments": [
+ {
+ "title": "Full Text PDF",
+ "mimeType": "application/pdf"
+ }
+ ],
+ "tags": [],
+ "notes": [
+ {
+ "note": "Presented 07 Mar 2023
"
+ }
+ ],
+ "seeAlso": []
+ }
+ ]
+ }
+]
+/** END TEST CASES **/
From 6d165ddda073ebdb67bcc4e7d672f37669789d7f Mon Sep 17 00:00:00 2001
From: Brendan O'Connell <68507084+brendan-oconnell@users.noreply.github.com>
Date: Wed, 19 Apr 2023 00:44:05 +0200
Subject: [PATCH 016/125] Cambridge Core: Remove footnote links from end of
title (#3018)
---
Cambridge Core.js | 85 +++++++++++++++++++++++++++++++++++++++++++++--
1 file changed, 83 insertions(+), 2 deletions(-)
diff --git a/Cambridge Core.js b/Cambridge Core.js
index ecb5b81463c..9b843d2815c 100644
--- a/Cambridge Core.js
+++ b/Cambridge Core.js
@@ -9,7 +9,7 @@
"inRepository": true,
"translatorType": 4,
"browserSupport": "gcsibv",
- "lastUpdated": "2021-10-09 00:36:31"
+ "lastUpdated": "2023-04-17 08:48:37"
}
/*
@@ -53,7 +53,7 @@ function detectWeb(doc, url) {
}
else return "book";
}
-
+
// now let's check for multiples again, just to be sure. this handles some
// rare listing page URLs that might not be included in the multiples
// regex above.
@@ -156,6 +156,11 @@ function scrape(doc, url) {
if (item.date.includes("undefined")) {
item.date = attr('meta[name="citation_online_date"]', "content");
}
+ // remove asterisk or 1 at end of title, e.g. https://www.cambridge.org/core/journals/american-political-science-review/article/abs/violence-in-premodern-societies-rural-colombia/A14B0BB4130A2BA6BE79E2853597526E
+ const titleElem = doc.querySelector("#maincontent h1");
+ if (titleElem.querySelector('a:last-child')) {
+ item.title = titleElem.firstChild.textContent;
+ }
item.complete();
});
@@ -453,6 +458,82 @@ var testCases = [
"type": "web",
"url": "https://www.cambridge.org/core/journals/ajs-review/latest-issue",
"items": "multiple"
+ },
+ {
+ "type": "web",
+ "url": "https://www.cambridge.org/core/journals/american-political-science-review/article/abs/violence-in-premodern-societies-rural-colombia/A14B0BB4130A2BA6BE79E2853597526E",
+ "items": [
+ {
+ "itemType": "journalArticle",
+ "title": "Violence in Pre-Modern Societies: Rural Colombia",
+ "creators": [
+ {
+ "firstName": "Richard S.",
+ "lastName": "Weinert",
+ "creatorType": "author"
+ }
+ ],
+ "date": "1966/06",
+ "DOI": "10.2307/1953360",
+ "ISSN": "0003-0554, 1537-5943",
+ "abstractNote": "Violence is a common phenomenon in developing polities which has received little attention. Clearly a Peronist riot in Buenos Aires, a land invasion in Lima, and a massacre in rural Colombia are all different. Yet we have no typology which relates types of violence to stages or patterns of economic or social development. We know little of the causes, incidence or functions of different forms of violence. This article is an effort to understand one type of violence which can occur in societies in transition.Violence in Colombia has traditionally accompanied transfers of power at the national level. This can account for its outbreak in 1946, when the Conservative Party replaced the Liberals. It cannot account for the intensity or duration of rural violence for two decades. This article focuses primarily on the violence from 1946 to 1953, and explains its intensification and duration as the defense of a traditional sacred order against secular modernizing tendencies undermining that order. We shall discuss violence since 1953 in the concluding section.",
+ "issue": "2",
+ "language": "en",
+ "libraryCatalog": "Cambridge University Press",
+ "pages": "340-347",
+ "publicationTitle": "American Political Science Review",
+ "shortTitle": "Violence in Pre-Modern Societies",
+ "url": "https://www.cambridge.org/core/journals/american-political-science-review/article/abs/violence-in-premodern-societies-rural-colombia/A14B0BB4130A2BA6BE79E2853597526E",
+ "volume": "60",
+ "attachments": [
+ {
+ "title": "Full Text PDF",
+ "mimeType": "application/pdf"
+ }
+ ],
+ "tags": [],
+ "notes": [],
+ "seeAlso": []
+ }
+ ]
+ },
+ {
+ "type": "web",
+ "url": "https://www.cambridge.org/core/journals/journal-of-public-policy/article/abs/when-consumers-oppose-consumer-protection-the-politics-of-regulatory-backlash/2C8E6B9BB6881A233B8936D9AD2C6305",
+ "items": [
+ {
+ "itemType": "journalArticle",
+ "title": "When Consumers Oppose Consumer Protection: The Politics of Regulatory Backlash",
+ "creators": [
+ {
+ "firstName": "David",
+ "lastName": "Vogel",
+ "creatorType": "author"
+ }
+ ],
+ "date": "1990/10",
+ "DOI": "10.1017/S0143814X00006085",
+ "ISSN": "1469-7815, 0143-814X",
+ "abstractNote": "This article examines a neglected phenomenon in the existing literature on social regulation, namely political opposition to regulation that comes not from business but from consumers. It examines four cases of successful grass-roots consumer opposition to government health and safety regulations in the United States. Two involve rules issued by the National Highway Traffic Safety Administration, a 1974 requirement that all new automobiles be equipped with an engine-interlock system, and a 1967 rule that denied federal highway funds to states that did not require motorcyclists to wear a helmet. In 1977, Congress overturned the Food and Drug Administration's ban on the artificial sweetener, saccharin. Beginning in 1987, the FDA began to yield to pressures from the gay community by agreeing to streamline its procedures for the testing and approval of new drugs designed to fight AIDS and other fatal diseases. The article identifies what these regulations have in common and examines their significance for our understanding the politics of social regulation in the United States and other industrial nations.",
+ "issue": "4",
+ "language": "en",
+ "libraryCatalog": "Cambridge University Press",
+ "pages": "449-470",
+ "publicationTitle": "Journal of Public Policy",
+ "shortTitle": "When Consumers Oppose Consumer Protection",
+ "url": "https://www.cambridge.org/core/journals/journal-of-public-policy/article/abs/when-consumers-oppose-consumer-protection-the-politics-of-regulatory-backlash/2C8E6B9BB6881A233B8936D9AD2C6305",
+ "volume": "10",
+ "attachments": [
+ {
+ "title": "Full Text PDF",
+ "mimeType": "application/pdf"
+ }
+ ],
+ "tags": [],
+ "notes": [],
+ "seeAlso": []
+ }
+ ]
}
]
/** END TEST CASES **/
From 3bd1342daf10530a37e2634e83d2d1f3190601e7 Mon Sep 17 00:00:00 2001
From: Abe Jellinek
Date: Wed, 19 Apr 2023 10:30:07 -0400
Subject: [PATCH 017/125] MARCXML: Throw on invalid XML, skip empty records
---
MARCXML.js | 44 +++++++++++++++++++++++++++++++++++---------
1 file changed, 35 insertions(+), 9 deletions(-)
diff --git a/MARCXML.js b/MARCXML.js
index 085ce47cc18..a443daf5201 100644
--- a/MARCXML.js
+++ b/MARCXML.js
@@ -8,10 +8,9 @@
"priority": 100,
"inRepository": true,
"translatorType": 1,
- "lastUpdated": "2019-07-11 13:12:18"
+ "lastUpdated": "2023-04-19 14:30:00"
}
-
/*
***** BEGIN LICENSE BLOCK *****
@@ -53,23 +52,22 @@ function detectImport() {
function doImport() {
- var text = "";
- var line;
- while ((line = Zotero.read()) !== false) {
- text += line;
- }
// call MARC translator
var translator = Zotero.loadTranslator("import");
translator.setTranslator("a6ee60df-1ddc-4aae-bb25-45e0537be973");
translator.getTranslatorObject(function (marc) {
- var parser = new DOMParser();
- var xml = parser.parseFromString(text, 'text/xml');
+ var xml = Zotero.getXML();
// define the marc namespace
var ns = {
marc: "http://www.loc.gov/MARC21/slim"
};
var records = ZU.xpath(xml, '//marc:record', ns);
for (let rec of records) {
+ if (!ZU.xpath(rec, "./marc:datafield", ns).length) {
+ Zotero.debug('Skipping empty record');
+ continue;
+ }
+
// create one new item per record
var record = new marc.record();
var newItem = new Zotero.Item();
@@ -366,6 +364,34 @@ var testCases = [
"seeAlso": []
}
]
+ },
+ {
+ "type": "import",
+ "input": "\n\nMARC21-xml \nxml \n\n\n00000pam a2200000 cc4500 \n1242883924 \nDE-101 \n20230125220155.0 \ntu \n211010s2023 gw ||||| |||| 00||||ger \n\n23,A04 \n21,N41 \ndnb \n \n\nDE-101 \n1242883924 \n \n\n9783525560624 \nFesteinband : EUR 85.00 (DE), EUR 88.00 (AT) \n978-3-525-56062-4 \n \n\n3525560621 \n3-525-56062-1 \n \n\n9783525560624 \n \n\nBestellnummer: VUR0008785 \n \n\n(DE-599)DNB1242883924 \n \n\n(OCoLC)1365383776 \n \n\n(OCoLC)1275381065 \n \n\n1245 \nger \nDE-101 \n9999 \nrda \n \n\nger \n \n\nXA-DE \n \n\n230 \n943 \nDE-101 \n23sdnb \n \n\n(DE-588)111415403 \nhttps://d-nb.info/gnd/111415403 \n(DE-101)111415403 \nErhart, Hannelore \n1927-2013 \nVerfasser \naut \ngnd \n \n\nKatharina Staritz \nBand 2. \n\n1903-1953 / Ilse Meseberg-Haubold, Dietgard Meyer ; unter Mitarbeit von Hannelore Erhart †\n \n\nHannelore Erhart ; Ilse Meseberg-Haubold ; Dietgard Meyer. Mit einem Exkurs Elisabeth Schmitz\n \n \n\nGöttingen \nVandenhoeck & Ruprecht \n[2023] \n \n\nXV, 629 Seiten \nIllustrationen \n1094 g \n \n\nText \ntxt \nrdacontent \n \n\nohne Hilfsmittel zu benutzen \nn \nrdamedia \n \n\nBand \nnc \nrdacarrier \n \n \n \n2 \n ",
+ "items": [
+ {
+ "itemType": "book",
+ "title": "Katharina Staritz. Band 2: 1903-1953 / Ilse Meseberg-Haubold, Dietgard Meyer ; unter Mitarbeit von Hannelore Erhart †",
+ "creators": [
+ {
+ "firstName": "Hannelore",
+ "lastName": "Erhart",
+ "creatorType": "author"
+ }
+ ],
+ "date": "2023",
+ "ISBN": "9783525560624 3525560621",
+ "callNumber": "230 943",
+ "language": "ger",
+ "numPages": "629",
+ "place": "Göttingen",
+ "publisher": "Vandenhoeck & Ruprecht",
+ "attachments": [],
+ "tags": [],
+ "notes": [],
+ "seeAlso": []
+ }
+ ]
}
]
/** END TEST CASES **/
From ed47524212070bfd174ebee047176ebb01cbec04 Mon Sep 17 00:00:00 2001
From: Sebastian Karcher
Date: Wed, 19 Apr 2023 17:09:56 -0400
Subject: [PATCH 018/125] Update Zenodo for Dataset item type (#3021)
---
Zenodo.js | 141 ++++++++++++++++++++++++++++++------------------------
1 file changed, 78 insertions(+), 63 deletions(-)
diff --git a/Zenodo.js b/Zenodo.js
index 6712de9e500..d9026151222 100644
--- a/Zenodo.js
+++ b/Zenodo.js
@@ -9,7 +9,7 @@
"inRepository": true,
"translatorType": 4,
"browserSupport": "gcsibv",
- "lastUpdated": "2021-06-07 05:21:23"
+ "lastUpdated": "2023-04-19 20:55:45"
}
/*
@@ -35,59 +35,65 @@
***** END LICENSE BLOCK *****
*/
+const datasetType = ZU.fieldIsValidForType('title', 'dataset')
+ ? 'dataset'
+ : 'document';
+
function detectWeb(doc, url) {
if (url.includes('/record/')) {
var collections = ZU.xpath(doc, '//span[@class="pull-right"]/span[contains(@class, "label-default")]');
- for (var i=0; i
Date: Thu, 20 Apr 2023 18:23:06 +0200
Subject: [PATCH 019/125] dblp translator: fixes selector and some typos
(#3023)
---
DBLP Computer Science Bibliography.js | 68 +++++++++++++++++++++++++--
1 file changed, 64 insertions(+), 4 deletions(-)
diff --git a/DBLP Computer Science Bibliography.js b/DBLP Computer Science Bibliography.js
index eb345f2f907..132e55913da 100644
--- a/DBLP Computer Science Bibliography.js
+++ b/DBLP Computer Science Bibliography.js
@@ -9,7 +9,7 @@
"inRepository": true,
"translatorType": 4,
"browserSupport": "gcsibv",
- "lastUpdated": "2021-09-20 19:47:25"
+ "lastUpdated": "2023-04-20 13:37:43"
}
/*
@@ -64,7 +64,7 @@ function detectWeb(doc, url) {
function scrape(doc, _url) {
- let allData = doc.querySelectorAll('#bibtex-section');
+ let allData = doc.querySelectorAll('#bibtex-section > pre');
let firstData = allData[0];
var firstDataText = firstData.textContent.replace(/ ee\s*=/, " url ="); // e.g. ee = {http://dx.doi.org/10.1007/978-3-319-00035-0_37},
@@ -103,7 +103,7 @@ function scrapeMainPart(firstDataText, secondDataItem) {
trans.setHandler('itemDone', function (obj, item) {
if (secondDataItem) {
if (secondDataItem.title && item.itemType == "conferencePaper") item.proceedingsTitle = secondDataItem.title;
- if (secondDataItem.title && item.itemType == "bookSection") item.booktitle = secondDataItem.titel;
+ if (secondDataItem.title && item.itemType == "bookSection") item.bookTitle = secondDataItem.title;
if (secondDataItem.creators && secondDataItem.creators.length > 0) item.creators = item.creators.concat(secondDataItem.creators);
if (secondDataItem.publisher && !item.publisher) item.publisher = secondDataItem.publisher;
if (secondDataItem.series && !item.series) item.series = secondDataItem.series;
@@ -115,7 +115,7 @@ function scrapeMainPart(firstDataText, secondDataItem) {
// yet contain a doi, then save the doi and delete the url.
// If the item contains the doi corresponding to the url
// then just delete the url and keep the doi.
- if (item.url && item.url.search(/^https?:\/\/(?:dx\.)?doi\.org\/10\./i) != -1) {
+ if (item.url && /^https?:\/\/(?:dx\.)?doi\.org\/10\./i.test(item.url)) {
var doi = ZU.cleanDOI(item.url);
if (doi && (!item.DOI || item.DOI == doi)) {
item.DOI = doi;
@@ -397,6 +397,66 @@ var testCases = [
"seeAlso": []
}
]
+ },
+ {
+ "type": "web",
+ "url": "https://dblp.org/rec/reference/choice/LangX16.html?view=bibtex¶m=2",
+ "detectedItemType": "bookSection",
+ "items": [
+ {
+ "itemType": "bookSection",
+ "title": "Voting in Combinatorial Domains",
+ "creators": [
+ {
+ "firstName": "Jérôme",
+ "lastName": "Lang",
+ "creatorType": "author"
+ },
+ {
+ "firstName": "Lirong",
+ "lastName": "Xia",
+ "creatorType": "author"
+ },
+ {
+ "firstName": "Felix",
+ "lastName": "Brandt",
+ "creatorType": "editor"
+ },
+ {
+ "firstName": "Vincent",
+ "lastName": "Conitzer",
+ "creatorType": "editor"
+ },
+ {
+ "firstName": "Ulle",
+ "lastName": "Endriss",
+ "creatorType": "editor"
+ },
+ {
+ "firstName": "Jérôme",
+ "lastName": "Lang",
+ "creatorType": "editor"
+ },
+ {
+ "firstName": "Ariel D.",
+ "lastName": "Procaccia",
+ "creatorType": "editor"
+ }
+ ],
+ "date": "2016",
+ "ISBN": "9781107446984",
+ "bookTitle": "Handbook of Computational Social Choice",
+ "extra": "DOI: 10.1017/CBO9781107446984.010",
+ "itemID": "DBLP:reference/choice/LangX16",
+ "libraryCatalog": "DBLP Computer Science Bibliography",
+ "pages": "197–222",
+ "publisher": "Cambridge University Press",
+ "attachments": [],
+ "tags": [],
+ "notes": [],
+ "seeAlso": []
+ }
+ ]
}
]
/** END TEST CASES **/
From 9d1a05070bac47c91e1e73ccae371f0f32b7a0ac Mon Sep 17 00:00:00 2001
From: Abe Jellinek
Date: Fri, 21 Apr 2023 12:06:27 -0400
Subject: [PATCH 020/125] CI: Upgrade dependencies
---
.../bin/teslint.js | 6 +-
.../package-lock.json | 151 ++++++
.../package.json | 2 +-
package-lock.json | 430 +++++++++---------
package.json | 3 +-
5 files changed, 359 insertions(+), 233 deletions(-)
create mode 100644 .ci/eslint-plugin-zotero-translator/package-lock.json
diff --git a/.ci/eslint-plugin-zotero-translator/bin/teslint.js b/.ci/eslint-plugin-zotero-translator/bin/teslint.js
index e8286b462c2..dc5680fd2a0 100755
--- a/.ci/eslint-plugin-zotero-translator/bin/teslint.js
+++ b/.ci/eslint-plugin-zotero-translator/bin/teslint.js
@@ -4,7 +4,7 @@
const fs = require('fs');
const path = require('path');
-const find = require('recursive-readdir-synchronous');
+const find = require('recursive-readdir');
const { ESLint } = require("eslint");
const argv = require('commander');
@@ -35,7 +35,7 @@ async function main() {
let allResults = [];
function findIgnore(file, stats) {
- if (stats.isDirectory()) return (path.basename(file) == "node_modules");
+ if (stats.isDirectory()) return (path.basename(file) == "node_modules" || path.basename(file) == ".ci");
return !file.endsWith('.js');
}
for (const target of argv.args) {
@@ -43,7 +43,7 @@ async function main() {
console.error(`Target file '${target}' does not exist; skipping`); // eslint-disable-line no-console
continue;
}
- const files = fs.lstatSync(target).isDirectory() ? find(target, [findIgnore]) : [target];
+ const files = fs.lstatSync(target).isDirectory() ? await find(target, [findIgnore]) : [target];
for (const file of files) {
if (path.dirname(path.resolve(file)) === translators.cache.repo) {
const translator = translators.cache.get(file);
diff --git a/.ci/eslint-plugin-zotero-translator/package-lock.json b/.ci/eslint-plugin-zotero-translator/package-lock.json
new file mode 100644
index 00000000000..b0b16874ada
--- /dev/null
+++ b/.ci/eslint-plugin-zotero-translator/package-lock.json
@@ -0,0 +1,151 @@
+{
+ "name": "eslint-plugin-zotero-translator",
+ "version": "0.0.1",
+ "lockfileVersion": 2,
+ "requires": true,
+ "packages": {
+ "": {
+ "name": "eslint-plugin-zotero-translator",
+ "version": "0.0.1",
+ "license": "ISC",
+ "dependencies": {
+ "commander": "^2.19.0",
+ "find-root": "^1.1.0",
+ "recursive-readdir": "^2.2.3",
+ "require-dir": "^1.2.0",
+ "uuid": "^3.3.2"
+ },
+ "bin": {
+ "teslint": "bin/teslint.js"
+ },
+ "engines": {
+ "node": ">=16.0.0"
+ }
+ },
+ "node_modules/balanced-match": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
+ "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw=="
+ },
+ "node_modules/brace-expansion": {
+ "version": "1.1.11",
+ "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+ "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+ "dependencies": {
+ "balanced-match": "^1.0.0",
+ "concat-map": "0.0.1"
+ }
+ },
+ "node_modules/commander": {
+ "version": "2.20.3",
+ "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
+ "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ=="
+ },
+ "node_modules/concat-map": {
+ "version": "0.0.1",
+ "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+ "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg=="
+ },
+ "node_modules/find-root": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/find-root/-/find-root-1.1.0.tgz",
+ "integrity": "sha512-NKfW6bec6GfKc0SGx1e07QZY9PE99u0Bft/0rzSD5k3sO/vwkVUpDUKVm5Gpp5Ue3YfShPFTX2070tDs5kB9Ng=="
+ },
+ "node_modules/minimatch": {
+ "version": "3.1.2",
+ "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+ "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+ "dependencies": {
+ "brace-expansion": "^1.1.7"
+ },
+ "engines": {
+ "node": "*"
+ }
+ },
+ "node_modules/recursive-readdir": {
+ "version": "2.2.3",
+ "resolved": "https://registry.npmjs.org/recursive-readdir/-/recursive-readdir-2.2.3.tgz",
+ "integrity": "sha512-8HrF5ZsXk5FAH9dgsx3BlUer73nIhuj+9OrQwEbLTPOBzGkL1lsFCR01am+v+0m2Cmbs1nP12hLDl5FA7EszKA==",
+ "dependencies": {
+ "minimatch": "^3.0.5"
+ },
+ "engines": {
+ "node": ">=6.0.0"
+ }
+ },
+ "node_modules/require-dir": {
+ "version": "1.2.0",
+ "resolved": "https://registry.npmjs.org/require-dir/-/require-dir-1.2.0.tgz",
+ "integrity": "sha512-LY85DTSu+heYgDqq/mK+7zFHWkttVNRXC9NKcKGyuGLdlsfbjEPrIEYdCVrx6hqnJb+xSu3Lzaoo8VnmOhhjNA==",
+ "engines": {
+ "node": "*"
+ }
+ },
+ "node_modules/uuid": {
+ "version": "3.4.0",
+ "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz",
+ "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==",
+ "deprecated": "Please upgrade to version 7 or higher. Older versions may use Math.random() in certain circumstances, which is known to be problematic. See https://v8.dev/blog/math-random for details.",
+ "bin": {
+ "uuid": "bin/uuid"
+ }
+ }
+ },
+ "dependencies": {
+ "balanced-match": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
+ "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw=="
+ },
+ "brace-expansion": {
+ "version": "1.1.11",
+ "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+ "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+ "requires": {
+ "balanced-match": "^1.0.0",
+ "concat-map": "0.0.1"
+ }
+ },
+ "commander": {
+ "version": "2.20.3",
+ "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
+ "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ=="
+ },
+ "concat-map": {
+ "version": "0.0.1",
+ "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+ "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg=="
+ },
+ "find-root": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/find-root/-/find-root-1.1.0.tgz",
+ "integrity": "sha512-NKfW6bec6GfKc0SGx1e07QZY9PE99u0Bft/0rzSD5k3sO/vwkVUpDUKVm5Gpp5Ue3YfShPFTX2070tDs5kB9Ng=="
+ },
+ "minimatch": {
+ "version": "3.1.2",
+ "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+ "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+ "requires": {
+ "brace-expansion": "^1.1.7"
+ }
+ },
+ "recursive-readdir": {
+ "version": "2.2.3",
+ "resolved": "https://registry.npmjs.org/recursive-readdir/-/recursive-readdir-2.2.3.tgz",
+ "integrity": "sha512-8HrF5ZsXk5FAH9dgsx3BlUer73nIhuj+9OrQwEbLTPOBzGkL1lsFCR01am+v+0m2Cmbs1nP12hLDl5FA7EszKA==",
+ "requires": {
+ "minimatch": "^3.0.5"
+ }
+ },
+ "require-dir": {
+ "version": "1.2.0",
+ "resolved": "https://registry.npmjs.org/require-dir/-/require-dir-1.2.0.tgz",
+ "integrity": "sha512-LY85DTSu+heYgDqq/mK+7zFHWkttVNRXC9NKcKGyuGLdlsfbjEPrIEYdCVrx6hqnJb+xSu3Lzaoo8VnmOhhjNA=="
+ },
+ "uuid": {
+ "version": "3.4.0",
+ "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz",
+ "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A=="
+ }
+ }
+}
diff --git a/.ci/eslint-plugin-zotero-translator/package.json b/.ci/eslint-plugin-zotero-translator/package.json
index ec79ad4b0de..85cc8220cc5 100644
--- a/.ci/eslint-plugin-zotero-translator/package.json
+++ b/.ci/eslint-plugin-zotero-translator/package.json
@@ -14,7 +14,7 @@
"dependencies": {
"commander": "^2.19.0",
"find-root": "^1.1.0",
- "recursive-readdir-synchronous": "0.0.4",
+ "recursive-readdir": "^2.2.3",
"require-dir": "^1.2.0",
"uuid": "^3.3.2"
}
diff --git a/package-lock.json b/package-lock.json
index 8f49ab3e115..b8e7c8d2f33 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -10,9 +10,8 @@
"license": "CC0-1.0",
"devDependencies": {
"@zotero/eslint-config": "^1.0.5",
- "chalk": "^4.1.0",
"chromedriver": "^95.0.0",
- "eslint": "^8.29.0",
+ "eslint": "^8.38.0",
"eslint-plugin-zotero-translator": "file:.ci/eslint-plugin-zotero-translator",
"selenium-webdriver": "^4.0.0-alpha.7"
}
@@ -24,7 +23,7 @@
"dependencies": {
"commander": "^2.19.0",
"find-root": "^1.1.0",
- "recursive-readdir-synchronous": "0.0.4",
+ "recursive-readdir": "^2.2.3",
"require-dir": "^1.2.0",
"uuid": "^3.3.2"
},
@@ -35,16 +34,40 @@
"node": ">=16.0.0"
}
},
+ "node_modules/@eslint-community/eslint-utils": {
+ "version": "4.4.0",
+ "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz",
+ "integrity": "sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==",
+ "dev": true,
+ "dependencies": {
+ "eslint-visitor-keys": "^3.3.0"
+ },
+ "engines": {
+ "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+ },
+ "peerDependencies": {
+ "eslint": "^6.0.0 || ^7.0.0 || >=8.0.0"
+ }
+ },
+ "node_modules/@eslint-community/regexpp": {
+ "version": "4.5.0",
+ "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.5.0.tgz",
+ "integrity": "sha512-vITaYzIcNmjn5tF5uxcZ/ft7/RXGrMUIS9HalWckEOF6ESiwXKoMzAQf2UW0aVd6rnOeExTJVd5hmWXucBKGXQ==",
+ "dev": true,
+ "engines": {
+ "node": "^12.0.0 || ^14.0.0 || >=16.0.0"
+ }
+ },
"node_modules/@eslint/eslintrc": {
- "version": "1.3.3",
- "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.3.3.tgz",
- "integrity": "sha512-uj3pT6Mg+3t39fvLrj8iuCIJ38zKO9FpGtJ4BBJebJhEwjoT+KLVNCcHT5QC9NGRIEi7fZ0ZR8YRb884auB4Lg==",
+ "version": "2.0.2",
+ "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.0.2.tgz",
+ "integrity": "sha512-3W4f5tDUra+pA+FzgugqL2pRimUTDJWKr7BINqOpkZrC0uYI0NIc0/JFgBROCU07HR6GieA5m3/rsPIhDmCXTQ==",
"dev": true,
"dependencies": {
"ajv": "^6.12.4",
"debug": "^4.3.2",
- "espree": "^9.4.0",
- "globals": "^13.15.0",
+ "espree": "^9.5.1",
+ "globals": "^13.19.0",
"ignore": "^5.2.0",
"import-fresh": "^3.2.1",
"js-yaml": "^4.1.0",
@@ -58,6 +81,15 @@
"url": "https://opencollective.com/eslint"
}
},
+ "node_modules/@eslint/js": {
+ "version": "8.38.0",
+ "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.38.0.tgz",
+ "integrity": "sha512-IoD2MfUnOV58ghIHCiil01PcohxjbYR/qCxsoC+xNgUwh1EY8jOOrYmu3d3a71+tJJ23uscEV4X2HJWMsPJu4g==",
+ "dev": true,
+ "engines": {
+ "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+ }
+ },
"node_modules/@humanwhocodes/config-array": {
"version": "0.11.8",
"resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.8.tgz",
@@ -133,9 +165,9 @@
"dev": true
},
"node_modules/@types/node": {
- "version": "18.11.15",
- "resolved": "https://registry.npmjs.org/@types/node/-/node-18.11.15.tgz",
- "integrity": "sha512-VkhBbVo2+2oozlkdHXLrb3zjsRkpdnaU2bXmX8Wgle3PUi569eLRaHGlgETQHR7lLL1w7GiG3h9SnePhxNDecw==",
+ "version": "18.15.13",
+ "resolved": "https://registry.npmjs.org/@types/node/-/node-18.15.13.tgz",
+ "integrity": "sha512-N+0kuo9KgrUQ1Sn/ifDXsvg0TTleP7rIy4zOBGECxAljqvqfqpTfzx0Q1NUedOixRMBfe2Whhb056a42cWs26Q==",
"dev": true,
"optional": true
},
@@ -159,9 +191,9 @@
}
},
"node_modules/acorn": {
- "version": "8.8.1",
- "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.1.tgz",
- "integrity": "sha512-7zFpHzhnqYKrkYdUjF1HI1bzd0VygEGX8lFk4k5zVMqHEoES+P+7TKI+EvLO9WVMJ8eekdO0aDEK044xTXwPPA==",
+ "version": "8.8.2",
+ "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.2.tgz",
+ "integrity": "sha512-xjIYgE8HBrkpd/sJqOGNspf8uHG+NOHGOw6a/Urj8taM2EXfdNAH2oFcPeIFfsv3+kz/mJrS5VuMqbNLjCa2vw==",
"dev": true,
"bin": {
"acorn": "bin/acorn"
@@ -502,13 +534,16 @@
}
},
"node_modules/eslint": {
- "version": "8.29.0",
- "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.29.0.tgz",
- "integrity": "sha512-isQ4EEiyUjZFbEKvEGJKKGBwXtvXX+zJbkVKCgTuB9t/+jUBcy8avhkEwWJecI15BkRkOYmvIM5ynbhRjEkoeg==",
+ "version": "8.38.0",
+ "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.38.0.tgz",
+ "integrity": "sha512-pIdsD2jwlUGf/U38Jv97t8lq6HpaU/G9NKbYmpWpZGw3LdTNhZLbJePqxOXGB5+JEKfOPU/XLxYxFh03nr1KTg==",
"dev": true,
"dependencies": {
- "@eslint/eslintrc": "^1.3.3",
- "@humanwhocodes/config-array": "^0.11.6",
+ "@eslint-community/eslint-utils": "^4.2.0",
+ "@eslint-community/regexpp": "^4.4.0",
+ "@eslint/eslintrc": "^2.0.2",
+ "@eslint/js": "8.38.0",
+ "@humanwhocodes/config-array": "^0.11.8",
"@humanwhocodes/module-importer": "^1.0.1",
"@nodelib/fs.walk": "^1.2.8",
"ajv": "^6.10.0",
@@ -518,16 +553,15 @@
"doctrine": "^3.0.0",
"escape-string-regexp": "^4.0.0",
"eslint-scope": "^7.1.1",
- "eslint-utils": "^3.0.0",
- "eslint-visitor-keys": "^3.3.0",
- "espree": "^9.4.0",
- "esquery": "^1.4.0",
+ "eslint-visitor-keys": "^3.4.0",
+ "espree": "^9.5.1",
+ "esquery": "^1.4.2",
"esutils": "^2.0.2",
"fast-deep-equal": "^3.1.3",
"file-entry-cache": "^6.0.1",
"find-up": "^5.0.0",
"glob-parent": "^6.0.2",
- "globals": "^13.15.0",
+ "globals": "^13.19.0",
"grapheme-splitter": "^1.0.4",
"ignore": "^5.2.0",
"import-fresh": "^3.0.0",
@@ -542,7 +576,6 @@
"minimatch": "^3.1.2",
"natural-compare": "^1.4.0",
"optionator": "^0.9.1",
- "regexpp": "^3.2.0",
"strip-ansi": "^6.0.1",
"strip-json-comments": "^3.1.0",
"text-table": "^0.2.0"
@@ -562,9 +595,9 @@
"link": true
},
"node_modules/eslint-scope": {
- "version": "7.1.1",
- "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.1.1.tgz",
- "integrity": "sha512-QKQM/UXpIiHcLqJ5AOyIW7XZmzjkzQXYE54n1++wb0u9V/abW3l9uQnxX8Z5Xd18xyKIMTUAyQ0k1e8pz6LUrw==",
+ "version": "7.2.0",
+ "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.0.tgz",
+ "integrity": "sha512-DYj5deGlHBfMt15J7rdtyKNq/Nqlv5KfU4iodrQ019XESsRnwXH9KAE0y3cwtUHDo2ob7CypAnCqefh6vioWRw==",
"dev": true,
"dependencies": {
"esrecurse": "^4.3.0",
@@ -572,53 +605,32 @@
},
"engines": {
"node": "^12.22.0 || ^14.17.0 || >=16.0.0"
- }
- },
- "node_modules/eslint-utils": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-3.0.0.tgz",
- "integrity": "sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==",
- "dev": true,
- "dependencies": {
- "eslint-visitor-keys": "^2.0.0"
- },
- "engines": {
- "node": "^10.0.0 || ^12.0.0 || >= 14.0.0"
},
"funding": {
- "url": "https://github.com/sponsors/mysticatea"
- },
- "peerDependencies": {
- "eslint": ">=5"
- }
- },
- "node_modules/eslint-utils/node_modules/eslint-visitor-keys": {
- "version": "2.1.0",
- "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz",
- "integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==",
- "dev": true,
- "engines": {
- "node": ">=10"
+ "url": "https://opencollective.com/eslint"
}
},
"node_modules/eslint-visitor-keys": {
- "version": "3.3.0",
- "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz",
- "integrity": "sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==",
+ "version": "3.4.0",
+ "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.0.tgz",
+ "integrity": "sha512-HPpKPUBQcAsZOsHAFwTtIKcYlCje62XB7SEAcxjtmW6TD1WVpkS6i6/hOVtTZIl4zGj/mBqpFVGvaDneik+VoQ==",
"dev": true,
"engines": {
"node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+ },
+ "funding": {
+ "url": "https://opencollective.com/eslint"
}
},
"node_modules/espree": {
- "version": "9.4.1",
- "resolved": "https://registry.npmjs.org/espree/-/espree-9.4.1.tgz",
- "integrity": "sha512-XwctdmTO6SIvCzd9810yyNzIrOrqNYV9Koizx4C/mRhf9uq0o4yHoCEU/670pOxOL/MSraektvSAji79kX90Vg==",
+ "version": "9.5.1",
+ "resolved": "https://registry.npmjs.org/espree/-/espree-9.5.1.tgz",
+ "integrity": "sha512-5yxtHSZXRSW5pvv3hAlXM5+/Oswi1AUFqBmbibKb5s6bp3rGIDkyXU6xCoyuuLhijr4SFwPrXRoZjz0AZDN9tg==",
"dev": true,
"dependencies": {
"acorn": "^8.8.0",
"acorn-jsx": "^5.3.2",
- "eslint-visitor-keys": "^3.3.0"
+ "eslint-visitor-keys": "^3.4.0"
},
"engines": {
"node": "^12.22.0 || ^14.17.0 || >=16.0.0"
@@ -628,9 +640,9 @@
}
},
"node_modules/esquery": {
- "version": "1.4.0",
- "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.4.0.tgz",
- "integrity": "sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w==",
+ "version": "1.5.0",
+ "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.5.0.tgz",
+ "integrity": "sha512-YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg==",
"dev": true,
"dependencies": {
"estraverse": "^5.1.0"
@@ -736,9 +748,9 @@
"dev": true
},
"node_modules/fastq": {
- "version": "1.14.0",
- "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.14.0.tgz",
- "integrity": "sha512-eR2D+V9/ExcbF9ls441yIuN6TI2ED1Y2ZcA5BmMtJsOkWOFRJQ0Jt0g1UwqXJJVAb+V+umH5Dfr8oh4EVP7VVg==",
+ "version": "1.15.0",
+ "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.15.0.tgz",
+ "integrity": "sha512-wBrocU2LCXXa+lWBt8RoIRD89Fi8OdABODa/kEnyeyjS5aZO5/GNvI5sEINADqP/h8M29UHTHUb53sUu5Ihqdw==",
"dev": true,
"dependencies": {
"reusify": "^1.0.4"
@@ -892,9 +904,9 @@
}
},
"node_modules/globals": {
- "version": "13.19.0",
- "resolved": "https://registry.npmjs.org/globals/-/globals-13.19.0.tgz",
- "integrity": "sha512-dkQ957uSRWHw7CFXLUtUHQI3g3aWApYhfNR2O6jn/907riyTYKVBmxYVROkBcY614FSSeSJh7Xm7SrUWCxvJMQ==",
+ "version": "13.20.0",
+ "resolved": "https://registry.npmjs.org/globals/-/globals-13.20.0.tgz",
+ "integrity": "sha512-Qg5QtVkCy/kv3FUSlu4ukeZDVf9ee0iXLAUYX13gbR17bnejFTzr4iS9bY7kwCf1NztRNm1t91fjOiyx4CSwPQ==",
"dev": true,
"dependencies": {
"type-fest": "^0.20.2"
@@ -927,9 +939,9 @@
}
},
"node_modules/graceful-fs": {
- "version": "4.2.10",
- "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz",
- "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==",
+ "version": "4.2.11",
+ "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz",
+ "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==",
"dev": true
},
"node_modules/grapheme-splitter": {
@@ -961,9 +973,9 @@
}
},
"node_modules/ignore": {
- "version": "5.2.1",
- "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.1.tgz",
- "integrity": "sha512-d2qQLzTJ9WxQftPAuEQpSPmKqzxePjzVbpAVv62AQ64NTL+wR4JkrVqR/LqFsFEUsHDAiId52mJteHDFuDkElA==",
+ "version": "5.2.4",
+ "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.4.tgz",
+ "integrity": "sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ==",
"dev": true,
"engines": {
"node": ">= 4"
@@ -1115,9 +1127,9 @@
"dev": true
},
"node_modules/js-sdsl": {
- "version": "4.2.0",
- "resolved": "https://registry.npmjs.org/js-sdsl/-/js-sdsl-4.2.0.tgz",
- "integrity": "sha512-dyBIzQBDkCqCu+0upx25Y2jGdbTGxE9fshMsCdK0ViOongpV+n5tXRcZY9v7CaVQ79AGS9KA1KHtojxiM7aXSQ==",
+ "version": "4.4.0",
+ "resolved": "https://registry.npmjs.org/js-sdsl/-/js-sdsl-4.4.0.tgz",
+ "integrity": "sha512-FfVSdx6pJ41Oa+CF7RDaFmTnCaFhua+SNYQX74riGOpl96x+2jQCqEfQ2bnXu/5DPCqlRuiqyvTJM0Qjz26IVg==",
"dev": true,
"funding": {
"type": "opencollective",
@@ -1424,9 +1436,9 @@
}
},
"node_modules/punycode": {
- "version": "2.1.1",
- "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
- "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==",
+ "version": "2.3.0",
+ "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.0.tgz",
+ "integrity": "sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA==",
"dev": true,
"engines": {
"node": ">=6"
@@ -1453,9 +1465,9 @@
]
},
"node_modules/readable-stream": {
- "version": "2.3.7",
- "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
- "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+ "version": "2.3.8",
+ "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz",
+ "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==",
"dev": true,
"dependencies": {
"core-util-is": "~1.0.0",
@@ -1467,40 +1479,16 @@
"util-deprecate": "~1.0.1"
}
},
- "node_modules/recursive-readdir-synchronous": {
- "version": "0.0.4",
- "resolved": "https://registry.npmjs.org/recursive-readdir-synchronous/-/recursive-readdir-synchronous-0.0.4.tgz",
- "integrity": "sha512-TKglvNd53H9nSeSIX0j6wVpYfO7wc7/Lb9ugL+Qa/yNL17SmAZjZeNdaPtsAsdwp+0iO3zq25NKocEcEec/uRw==",
- "dev": true,
- "dependencies": {
- "minimatch": "3.0.4"
- },
- "engines": {
- "node": ">=0.6.6"
- }
- },
- "node_modules/recursive-readdir-synchronous/node_modules/minimatch": {
- "version": "3.0.4",
- "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
- "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
+ "node_modules/recursive-readdir": {
+ "version": "2.2.3",
+ "resolved": "https://registry.npmjs.org/recursive-readdir/-/recursive-readdir-2.2.3.tgz",
+ "integrity": "sha512-8HrF5ZsXk5FAH9dgsx3BlUer73nIhuj+9OrQwEbLTPOBzGkL1lsFCR01am+v+0m2Cmbs1nP12hLDl5FA7EszKA==",
"dev": true,
"dependencies": {
- "brace-expansion": "^1.1.7"
+ "minimatch": "^3.0.5"
},
"engines": {
- "node": "*"
- }
- },
- "node_modules/regexpp": {
- "version": "3.2.0",
- "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.2.0.tgz",
- "integrity": "sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==",
- "dev": true,
- "engines": {
- "node": ">=8"
- },
- "funding": {
- "url": "https://github.com/sponsors/mysticatea"
+ "node": ">=6.0.0"
}
},
"node_modules/require-dir": {
@@ -1576,14 +1564,14 @@
"dev": true
},
"node_modules/selenium-webdriver": {
- "version": "4.7.1",
- "resolved": "https://registry.npmjs.org/selenium-webdriver/-/selenium-webdriver-4.7.1.tgz",
- "integrity": "sha512-IfTM9OE8HtCKjOJwyudbAVtAHQKOJK8mu2qrXXbKyj4lqgXF+2lYW4rSZXCV6SLQRWZ+DVGkomCmFzq5orD/ZA==",
+ "version": "4.9.0",
+ "resolved": "https://registry.npmjs.org/selenium-webdriver/-/selenium-webdriver-4.9.0.tgz",
+ "integrity": "sha512-QGaPoREo7sgOVhTiAvCasoi1f4ruTaJDtp0RKNFIbfyns5smK5+iCwnRTIPXb0R3CAYdaqUXd6BHduh37DorzQ==",
"dev": true,
"dependencies": {
- "jszip": "^3.10.0",
+ "jszip": "^3.10.1",
"tmp": "^0.2.1",
- "ws": ">=8.7.0"
+ "ws": ">=8.13.0"
},
"engines": {
"node": ">= 14.20.0"
@@ -1807,16 +1795,16 @@
"dev": true
},
"node_modules/ws": {
- "version": "8.11.0",
- "resolved": "https://registry.npmjs.org/ws/-/ws-8.11.0.tgz",
- "integrity": "sha512-HPG3wQd9sNQoT9xHyNCXoDUa+Xw/VevmY9FoHyQ+g+rrMn4j6FB4np7Z0OhdTgjx6MgQLK7jwSy1YecU1+4Asg==",
+ "version": "8.13.0",
+ "resolved": "https://registry.npmjs.org/ws/-/ws-8.13.0.tgz",
+ "integrity": "sha512-x9vcZYTrFPC7aSIbj7sRCYo7L/Xb8Iy+pW0ng0wt2vCJv7M9HOMy0UoN3rr+IFC7hb7vXoqS+P9ktyLLLhO+LA==",
"dev": true,
"engines": {
"node": ">=10.0.0"
},
"peerDependencies": {
"bufferutil": "^4.0.1",
- "utf-8-validate": "^5.0.2"
+ "utf-8-validate": ">=5.0.2"
},
"peerDependenciesMeta": {
"bufferutil": {
@@ -1851,16 +1839,31 @@
}
},
"dependencies": {
+ "@eslint-community/eslint-utils": {
+ "version": "4.4.0",
+ "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz",
+ "integrity": "sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==",
+ "dev": true,
+ "requires": {
+ "eslint-visitor-keys": "^3.3.0"
+ }
+ },
+ "@eslint-community/regexpp": {
+ "version": "4.5.0",
+ "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.5.0.tgz",
+ "integrity": "sha512-vITaYzIcNmjn5tF5uxcZ/ft7/RXGrMUIS9HalWckEOF6ESiwXKoMzAQf2UW0aVd6rnOeExTJVd5hmWXucBKGXQ==",
+ "dev": true
+ },
"@eslint/eslintrc": {
- "version": "1.3.3",
- "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.3.3.tgz",
- "integrity": "sha512-uj3pT6Mg+3t39fvLrj8iuCIJ38zKO9FpGtJ4BBJebJhEwjoT+KLVNCcHT5QC9NGRIEi7fZ0ZR8YRb884auB4Lg==",
+ "version": "2.0.2",
+ "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.0.2.tgz",
+ "integrity": "sha512-3W4f5tDUra+pA+FzgugqL2pRimUTDJWKr7BINqOpkZrC0uYI0NIc0/JFgBROCU07HR6GieA5m3/rsPIhDmCXTQ==",
"dev": true,
"requires": {
"ajv": "^6.12.4",
"debug": "^4.3.2",
- "espree": "^9.4.0",
- "globals": "^13.15.0",
+ "espree": "^9.5.1",
+ "globals": "^13.19.0",
"ignore": "^5.2.0",
"import-fresh": "^3.2.1",
"js-yaml": "^4.1.0",
@@ -1868,6 +1871,12 @@
"strip-json-comments": "^3.1.1"
}
},
+ "@eslint/js": {
+ "version": "8.38.0",
+ "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.38.0.tgz",
+ "integrity": "sha512-IoD2MfUnOV58ghIHCiil01PcohxjbYR/qCxsoC+xNgUwh1EY8jOOrYmu3d3a71+tJJ23uscEV4X2HJWMsPJu4g==",
+ "dev": true
+ },
"@humanwhocodes/config-array": {
"version": "0.11.8",
"resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.8.tgz",
@@ -1924,9 +1933,9 @@
"dev": true
},
"@types/node": {
- "version": "18.11.15",
- "resolved": "https://registry.npmjs.org/@types/node/-/node-18.11.15.tgz",
- "integrity": "sha512-VkhBbVo2+2oozlkdHXLrb3zjsRkpdnaU2bXmX8Wgle3PUi569eLRaHGlgETQHR7lLL1w7GiG3h9SnePhxNDecw==",
+ "version": "18.15.13",
+ "resolved": "https://registry.npmjs.org/@types/node/-/node-18.15.13.tgz",
+ "integrity": "sha512-N+0kuo9KgrUQ1Sn/ifDXsvg0TTleP7rIy4zOBGECxAljqvqfqpTfzx0Q1NUedOixRMBfe2Whhb056a42cWs26Q==",
"dev": true,
"optional": true
},
@@ -1948,9 +1957,9 @@
"requires": {}
},
"acorn": {
- "version": "8.8.1",
- "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.1.tgz",
- "integrity": "sha512-7zFpHzhnqYKrkYdUjF1HI1bzd0VygEGX8lFk4k5zVMqHEoES+P+7TKI+EvLO9WVMJ8eekdO0aDEK044xTXwPPA==",
+ "version": "8.8.2",
+ "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.2.tgz",
+ "integrity": "sha512-xjIYgE8HBrkpd/sJqOGNspf8uHG+NOHGOw6a/Urj8taM2EXfdNAH2oFcPeIFfsv3+kz/mJrS5VuMqbNLjCa2vw==",
"dev": true
},
"acorn-jsx": {
@@ -2204,13 +2213,16 @@
"dev": true
},
"eslint": {
- "version": "8.29.0",
- "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.29.0.tgz",
- "integrity": "sha512-isQ4EEiyUjZFbEKvEGJKKGBwXtvXX+zJbkVKCgTuB9t/+jUBcy8avhkEwWJecI15BkRkOYmvIM5ynbhRjEkoeg==",
+ "version": "8.38.0",
+ "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.38.0.tgz",
+ "integrity": "sha512-pIdsD2jwlUGf/U38Jv97t8lq6HpaU/G9NKbYmpWpZGw3LdTNhZLbJePqxOXGB5+JEKfOPU/XLxYxFh03nr1KTg==",
"dev": true,
"requires": {
- "@eslint/eslintrc": "^1.3.3",
- "@humanwhocodes/config-array": "^0.11.6",
+ "@eslint-community/eslint-utils": "^4.2.0",
+ "@eslint-community/regexpp": "^4.4.0",
+ "@eslint/eslintrc": "^2.0.2",
+ "@eslint/js": "8.38.0",
+ "@humanwhocodes/config-array": "^0.11.8",
"@humanwhocodes/module-importer": "^1.0.1",
"@nodelib/fs.walk": "^1.2.8",
"ajv": "^6.10.0",
@@ -2220,16 +2232,15 @@
"doctrine": "^3.0.0",
"escape-string-regexp": "^4.0.0",
"eslint-scope": "^7.1.1",
- "eslint-utils": "^3.0.0",
- "eslint-visitor-keys": "^3.3.0",
- "espree": "^9.4.0",
- "esquery": "^1.4.0",
+ "eslint-visitor-keys": "^3.4.0",
+ "espree": "^9.5.1",
+ "esquery": "^1.4.2",
"esutils": "^2.0.2",
"fast-deep-equal": "^3.1.3",
"file-entry-cache": "^6.0.1",
"find-up": "^5.0.0",
"glob-parent": "^6.0.2",
- "globals": "^13.15.0",
+ "globals": "^13.19.0",
"grapheme-splitter": "^1.0.4",
"ignore": "^5.2.0",
"import-fresh": "^3.0.0",
@@ -2244,7 +2255,6 @@
"minimatch": "^3.1.2",
"natural-compare": "^1.4.0",
"optionator": "^0.9.1",
- "regexpp": "^3.2.0",
"strip-ansi": "^6.0.1",
"strip-json-comments": "^3.1.0",
"text-table": "^0.2.0"
@@ -2255,59 +2265,42 @@
"requires": {
"commander": "^2.19.0",
"find-root": "^1.1.0",
- "recursive-readdir-synchronous": "0.0.4",
+ "recursive-readdir": "^2.2.3",
"require-dir": "^1.2.0",
"uuid": "^3.3.2"
}
},
"eslint-scope": {
- "version": "7.1.1",
- "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.1.1.tgz",
- "integrity": "sha512-QKQM/UXpIiHcLqJ5AOyIW7XZmzjkzQXYE54n1++wb0u9V/abW3l9uQnxX8Z5Xd18xyKIMTUAyQ0k1e8pz6LUrw==",
+ "version": "7.2.0",
+ "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.0.tgz",
+ "integrity": "sha512-DYj5deGlHBfMt15J7rdtyKNq/Nqlv5KfU4iodrQ019XESsRnwXH9KAE0y3cwtUHDo2ob7CypAnCqefh6vioWRw==",
"dev": true,
"requires": {
"esrecurse": "^4.3.0",
"estraverse": "^5.2.0"
}
},
- "eslint-utils": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-3.0.0.tgz",
- "integrity": "sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==",
- "dev": true,
- "requires": {
- "eslint-visitor-keys": "^2.0.0"
- },
- "dependencies": {
- "eslint-visitor-keys": {
- "version": "2.1.0",
- "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz",
- "integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==",
- "dev": true
- }
- }
- },
"eslint-visitor-keys": {
- "version": "3.3.0",
- "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz",
- "integrity": "sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==",
+ "version": "3.4.0",
+ "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.0.tgz",
+ "integrity": "sha512-HPpKPUBQcAsZOsHAFwTtIKcYlCje62XB7SEAcxjtmW6TD1WVpkS6i6/hOVtTZIl4zGj/mBqpFVGvaDneik+VoQ==",
"dev": true
},
"espree": {
- "version": "9.4.1",
- "resolved": "https://registry.npmjs.org/espree/-/espree-9.4.1.tgz",
- "integrity": "sha512-XwctdmTO6SIvCzd9810yyNzIrOrqNYV9Koizx4C/mRhf9uq0o4yHoCEU/670pOxOL/MSraektvSAji79kX90Vg==",
+ "version": "9.5.1",
+ "resolved": "https://registry.npmjs.org/espree/-/espree-9.5.1.tgz",
+ "integrity": "sha512-5yxtHSZXRSW5pvv3hAlXM5+/Oswi1AUFqBmbibKb5s6bp3rGIDkyXU6xCoyuuLhijr4SFwPrXRoZjz0AZDN9tg==",
"dev": true,
"requires": {
"acorn": "^8.8.0",
"acorn-jsx": "^5.3.2",
- "eslint-visitor-keys": "^3.3.0"
+ "eslint-visitor-keys": "^3.4.0"
}
},
"esquery": {
- "version": "1.4.0",
- "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.4.0.tgz",
- "integrity": "sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w==",
+ "version": "1.5.0",
+ "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.5.0.tgz",
+ "integrity": "sha512-YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg==",
"dev": true,
"requires": {
"estraverse": "^5.1.0"
@@ -2389,9 +2382,9 @@
"dev": true
},
"fastq": {
- "version": "1.14.0",
- "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.14.0.tgz",
- "integrity": "sha512-eR2D+V9/ExcbF9ls441yIuN6TI2ED1Y2ZcA5BmMtJsOkWOFRJQ0Jt0g1UwqXJJVAb+V+umH5Dfr8oh4EVP7VVg==",
+ "version": "1.15.0",
+ "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.15.0.tgz",
+ "integrity": "sha512-wBrocU2LCXXa+lWBt8RoIRD89Fi8OdABODa/kEnyeyjS5aZO5/GNvI5sEINADqP/h8M29UHTHUb53sUu5Ihqdw==",
"dev": true,
"requires": {
"reusify": "^1.0.4"
@@ -2501,9 +2494,9 @@
}
},
"globals": {
- "version": "13.19.0",
- "resolved": "https://registry.npmjs.org/globals/-/globals-13.19.0.tgz",
- "integrity": "sha512-dkQ957uSRWHw7CFXLUtUHQI3g3aWApYhfNR2O6jn/907riyTYKVBmxYVROkBcY614FSSeSJh7Xm7SrUWCxvJMQ==",
+ "version": "13.20.0",
+ "resolved": "https://registry.npmjs.org/globals/-/globals-13.20.0.tgz",
+ "integrity": "sha512-Qg5QtVkCy/kv3FUSlu4ukeZDVf9ee0iXLAUYX13gbR17bnejFTzr4iS9bY7kwCf1NztRNm1t91fjOiyx4CSwPQ==",
"dev": true,
"requires": {
"type-fest": "^0.20.2"
@@ -2524,9 +2517,9 @@
}
},
"graceful-fs": {
- "version": "4.2.10",
- "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz",
- "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==",
+ "version": "4.2.11",
+ "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz",
+ "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==",
"dev": true
},
"grapheme-splitter": {
@@ -2552,9 +2545,9 @@
}
},
"ignore": {
- "version": "5.2.1",
- "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.1.tgz",
- "integrity": "sha512-d2qQLzTJ9WxQftPAuEQpSPmKqzxePjzVbpAVv62AQ64NTL+wR4JkrVqR/LqFsFEUsHDAiId52mJteHDFuDkElA==",
+ "version": "5.2.4",
+ "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.4.tgz",
+ "integrity": "sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ==",
"dev": true
},
"immediate": {
@@ -2670,9 +2663,9 @@
"dev": true
},
"js-sdsl": {
- "version": "4.2.0",
- "resolved": "https://registry.npmjs.org/js-sdsl/-/js-sdsl-4.2.0.tgz",
- "integrity": "sha512-dyBIzQBDkCqCu+0upx25Y2jGdbTGxE9fshMsCdK0ViOongpV+n5tXRcZY9v7CaVQ79AGS9KA1KHtojxiM7aXSQ==",
+ "version": "4.4.0",
+ "resolved": "https://registry.npmjs.org/js-sdsl/-/js-sdsl-4.4.0.tgz",
+ "integrity": "sha512-FfVSdx6pJ41Oa+CF7RDaFmTnCaFhua+SNYQX74riGOpl96x+2jQCqEfQ2bnXu/5DPCqlRuiqyvTJM0Qjz26IVg==",
"dev": true
},
"js-yaml": {
@@ -2909,9 +2902,9 @@
}
},
"punycode": {
- "version": "2.1.1",
- "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
- "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==",
+ "version": "2.3.0",
+ "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.0.tgz",
+ "integrity": "sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA==",
"dev": true
},
"queue-microtask": {
@@ -2921,9 +2914,9 @@
"dev": true
},
"readable-stream": {
- "version": "2.3.7",
- "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
- "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+ "version": "2.3.8",
+ "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz",
+ "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==",
"dev": true,
"requires": {
"core-util-is": "~1.0.0",
@@ -2935,32 +2928,15 @@
"util-deprecate": "~1.0.1"
}
},
- "recursive-readdir-synchronous": {
- "version": "0.0.4",
- "resolved": "https://registry.npmjs.org/recursive-readdir-synchronous/-/recursive-readdir-synchronous-0.0.4.tgz",
- "integrity": "sha512-TKglvNd53H9nSeSIX0j6wVpYfO7wc7/Lb9ugL+Qa/yNL17SmAZjZeNdaPtsAsdwp+0iO3zq25NKocEcEec/uRw==",
+ "recursive-readdir": {
+ "version": "2.2.3",
+ "resolved": "https://registry.npmjs.org/recursive-readdir/-/recursive-readdir-2.2.3.tgz",
+ "integrity": "sha512-8HrF5ZsXk5FAH9dgsx3BlUer73nIhuj+9OrQwEbLTPOBzGkL1lsFCR01am+v+0m2Cmbs1nP12hLDl5FA7EszKA==",
"dev": true,
"requires": {
- "minimatch": "3.0.4"
- },
- "dependencies": {
- "minimatch": {
- "version": "3.0.4",
- "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
- "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
- "dev": true,
- "requires": {
- "brace-expansion": "^1.1.7"
- }
- }
+ "minimatch": "^3.0.5"
}
},
- "regexpp": {
- "version": "3.2.0",
- "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.2.0.tgz",
- "integrity": "sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==",
- "dev": true
- },
"require-dir": {
"version": "1.2.0",
"resolved": "https://registry.npmjs.org/require-dir/-/require-dir-1.2.0.tgz",
@@ -3004,14 +2980,14 @@
"dev": true
},
"selenium-webdriver": {
- "version": "4.7.1",
- "resolved": "https://registry.npmjs.org/selenium-webdriver/-/selenium-webdriver-4.7.1.tgz",
- "integrity": "sha512-IfTM9OE8HtCKjOJwyudbAVtAHQKOJK8mu2qrXXbKyj4lqgXF+2lYW4rSZXCV6SLQRWZ+DVGkomCmFzq5orD/ZA==",
+ "version": "4.9.0",
+ "resolved": "https://registry.npmjs.org/selenium-webdriver/-/selenium-webdriver-4.9.0.tgz",
+ "integrity": "sha512-QGaPoREo7sgOVhTiAvCasoi1f4ruTaJDtp0RKNFIbfyns5smK5+iCwnRTIPXb0R3CAYdaqUXd6BHduh37DorzQ==",
"dev": true,
"requires": {
- "jszip": "^3.10.0",
+ "jszip": "^3.10.1",
"tmp": "^0.2.1",
- "ws": ">=8.7.0"
+ "ws": ">=8.13.0"
}
},
"setimmediate": {
@@ -3177,9 +3153,9 @@
"dev": true
},
"ws": {
- "version": "8.11.0",
- "resolved": "https://registry.npmjs.org/ws/-/ws-8.11.0.tgz",
- "integrity": "sha512-HPG3wQd9sNQoT9xHyNCXoDUa+Xw/VevmY9FoHyQ+g+rrMn4j6FB4np7Z0OhdTgjx6MgQLK7jwSy1YecU1+4Asg==",
+ "version": "8.13.0",
+ "resolved": "https://registry.npmjs.org/ws/-/ws-8.13.0.tgz",
+ "integrity": "sha512-x9vcZYTrFPC7aSIbj7sRCYo7L/Xb8Iy+pW0ng0wt2vCJv7M9HOMy0UoN3rr+IFC7hb7vXoqS+P9ktyLLLhO+LA==",
"dev": true,
"requires": {}
},
diff --git a/package.json b/package.json
index 6421bfb527c..7572b75b5b4 100644
--- a/package.json
+++ b/package.json
@@ -15,9 +15,8 @@
},
"devDependencies": {
"@zotero/eslint-config": "^1.0.5",
- "chalk": "^4.1.0",
"chromedriver": "^95.0.0",
- "eslint": "^8.29.0",
+ "eslint": "^8.38.0",
"eslint-plugin-zotero-translator": "file:.ci/eslint-plugin-zotero-translator",
"selenium-webdriver": "^4.0.0-alpha.7"
}
From 8c803339b6b0a1b833716a85769da17afe3fc3f1 Mon Sep 17 00:00:00 2001
From: Sebastian Karcher
Date: Mon, 24 Apr 2023 21:24:18 -0400
Subject: [PATCH 021/125] EM: Detect chaper for inbook_title (#3028)
---
Embedded Metadata.js | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/Embedded Metadata.js b/Embedded Metadata.js
index 24d748d3121..5b7f264aac9 100644
--- a/Embedded Metadata.js
+++ b/Embedded Metadata.js
@@ -9,7 +9,7 @@
"inRepository": true,
"translatorType": 4,
"browserSupport": "gcsibv",
- "lastUpdated": "2023-01-23 17:12:53"
+ "lastUpdated": "2023-04-24 14:42:56"
}
/*
@@ -316,6 +316,7 @@ function init(doc, url, callback, forceLoadRDF) {
hwType = "conferencePaper";
break;
case "citation_book_title":
+ case "citation_inbook_title":
hwType = "bookSection";
break;
case "citation_dissertation_institution":
@@ -735,7 +736,7 @@ function tryOgAuthors(doc) {
var authors = [];
var ogAuthors = ZU.xpath(doc, '//meta[@property="article:author" or @property="video:director" or @property="music:musician"]');
for (var i = 0; i < ogAuthors.length; i++) {
- if (ogAuthors[i].content && ogAuthors[i].content.search(/(https?:\/\/)?[\da-z.-]+\.[a-z.]{2,6}/) < 0 && ogAuthors[i].content !== "false") {
+ if (ogAuthors[i].content && /(https?:\/\/)?[\da-z.-]+\.[a-z.]{2,6}/.test(ogAuthors[i].content) && ogAuthors[i].content !== "false") {
authors.push(ZU.cleanAuthor(ogAuthors[i].content, "author"));
}
}
From ecb80fad3bcd83e07c27420e9d86ef2286ff2c96 Mon Sep 17 00:00:00 2001
From: Dan Stillman
Date: Thu, 27 Apr 2023 05:24:31 -0400
Subject: [PATCH 022/125] Lulu: Switch to HTTPS and disable ISBN search
Translator probably has to be rewritten if we still want it, but for now
don't use it for ISBN lookup.
---
Lulu.js | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/Lulu.js b/Lulu.js
index 3b9fe072be8..cb9752c3765 100644
--- a/Lulu.js
+++ b/Lulu.js
@@ -9,7 +9,7 @@
"inRepository": true,
"translatorType": 12,
"browserSupport": "gcsibv",
- "lastUpdated": "2016-11-04 21:18:44"
+ "lastUpdated": "2023-04-27 09:24:18"
}
function getSearchResults(doc) {
@@ -101,6 +101,9 @@ function makeItem(doc, url) {
}
function detectSearch(items) {
+ // Disabled -- no longer working
+ return false;
+
if (items.ISBN) return true;
if (!items.length) return;
@@ -120,7 +123,7 @@ function doSearch(items) {
var isbn;
if (items[i].ISBN && (isbn = ZU.cleanISBN('' + items[i].ISBN))) {
(function(item, isbn) {
- ZU.processDocuments('http://www.lulu.com/shop/search.ep?keyWords=' + isbn, function(doc, url) {
+ ZU.processDocuments('https://www.lulu.com/shop/search.ep?keyWords=' + isbn, function(doc, url) {
var results = getSearchResults(doc);
if (!results.length) {
if (item.complete) item.complete();
@@ -258,4 +261,4 @@ var testCases = [
]
}
]
-/** END TEST CASES **/
\ No newline at end of file
+/** END TEST CASES **/
From 402c668fb35d5207a204a0f0292c137cb8ba476b Mon Sep 17 00:00:00 2001
From: Sebastian Karcher
Date: Fri, 28 Apr 2023 07:07:46 -0400
Subject: [PATCH 023/125] Don't detect J-Stage PDFs (#3030)
---
J-Stage.js | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/J-Stage.js b/J-Stage.js
index c8dfa00f3a2..0371b96cc84 100644
--- a/J-Stage.js
+++ b/J-Stage.js
@@ -9,7 +9,7 @@
"inRepository": true,
"translatorType": 4,
"browserSupport": "gcsibv",
- "lastUpdated": "2019-06-15 19:04:11"
+ "lastUpdated": "2023-04-27 13:09:03"
}
/*
@@ -35,7 +35,8 @@
*/
function detectWeb(doc, url) {
- if (url.includes("/article/")) {
+ // don't detect on PDF pages
+ if (url.includes("/article/") && !url.includes("/_pdf")) {
return "journalArticle";
}
else if ((url.includes("/result/") || url.includes("/browse/"))
From 8a7b9fac0ba35eeb6e28b7b50160712eaf186c9f Mon Sep 17 00:00:00 2001
From: Brendan O'Connell <68507084+brendan-oconnell@users.noreply.github.com>
Date: Fri, 5 May 2023 03:14:38 +0200
Subject: [PATCH 024/125] Fixed selector for getting abstract from page (#3033)
---
SAGE Journals.js | 91 ++++++++++++++++++++++++++++++------------------
1 file changed, 57 insertions(+), 34 deletions(-)
diff --git a/SAGE Journals.js b/SAGE Journals.js
index 8999cadc142..c48c26dacd3 100644
--- a/SAGE Journals.js
+++ b/SAGE Journals.js
@@ -9,7 +9,7 @@
"inRepository": true,
"translatorType": 4,
"browserSupport": "gcsibv",
- "lastUpdated": "2020-12-06 18:57:06"
+ "lastUpdated": "2023-05-04 14:14:25"
}
/*
@@ -107,7 +107,7 @@ function scrape(doc, url) {
if (text.includes("DA - ")) {
text = text.replace(/Y1[ ]{2}- .*\r?\n/, '');
}
-
+
var translator = Zotero.loadTranslator("import");
translator.setTranslator("32d59d2d-b65a-4da4-b0a3-bdd3cfb979e7");
translator.setString(text);
@@ -125,12 +125,11 @@ function scrape(doc, url) {
}
// The encoding of apostrophs in the RIS are incorrect and
// therefore we extract the abstract again from the website.
- var abstract = ZU.xpathText(doc, '//article//div[contains(@class, "abstractSection")]/p');
+ var abstract = doc.querySelector("#abstract > div").innerText;
if (abstract) {
item.abstractNote = abstract;
}
-
-
+
for (let tag of tags) {
item.tags.push(tag.textContent);
}
@@ -142,7 +141,7 @@ function scrape(doc, url) {
item.creators[i] = ZU.cleanAuthor(item.creators[i].lastName, type, comma);
}
}
-
+
item.notes = [];
item.language = ZU.xpathText(doc, '//meta[@name="dc.Language"]/@content');
item.attachments.push({
@@ -160,24 +159,24 @@ function scrape(doc, url) {
var testCases = [
{
"type": "web",
- "url": "http://journals.sagepub.com/doi/abs/10.1177/1754073910380971",
+ "url": "https://journals.sagepub.com/doi/abs/10.1177/1754073910380971",
+ "detectedItemType": "journalArticle",
"items": [
{
"itemType": "journalArticle",
"title": "Emotion and Regulation are One!",
"creators": [
{
- "firstName": "Arvid",
"lastName": "Kappas",
+ "firstName": "Arvid",
"creatorType": "author"
}
],
- "date": "January 1, 2011",
+ "date": "2011-01-01",
"DOI": "10.1177/1754073910380971",
"ISSN": "1754-0739",
"abstractNote": "Emotions are foremost self-regulating processes that permit rapid responses and adaptations to situations of personal concern. They have biological bases and are shaped ontogenetically via learning and experience. Many situations and events of personal concern are social in nature. Thus, social exchanges play an important role in learning about rules and norms that shape regulation processes. I argue that (a) emotions often are actively auto-regulating—the behavior implied by the emotional reaction bias to the eliciting event or situation modifies or terminates the situation; (b) certain emotion components are likely to habituate dynamically, modifying the emotional states; (c) emotions are typically intra- and interpersonal processes at the same time, and modulating forces at these different levels interact; (d) emotions are not just regulated—they regulate. Important conclusions of my arguments are that the scientific analysis of emotion should not exclude regulatory processes, and that effortful emotion regulation should be seen relative to a backdrop of auto-regulation and habituation, and not the ideal notion of a neutral baseline. For all practical purposes unregulated emotion is not a realistic concept.",
"issue": "1",
- "journalAbbreviation": "Emotion Review",
"language": "en",
"libraryCatalog": "SAGE Journals",
"pages": "17-25",
@@ -190,17 +189,7 @@ var testCases = [
"mimeType": "application/pdf"
}
],
- "tags": [
- {
- "tag": "emotion regulation"
- },
- {
- "tag": "facial expression"
- },
- {
- "tag": "facial feedback"
- }
- ],
+ "tags": [],
"notes": [],
"seeAlso": []
}
@@ -208,8 +197,9 @@ var testCases = [
},
{
"type": "web",
- "url": "http://journals.sagepub.com/toc/rera/86/3",
- "items": "multiple"
+ "url": "https://journals.sagepub.com/toc/rera/86/3",
+ "detectedItemType": false,
+ "items": []
},
{
"type": "web",
@@ -359,6 +349,7 @@ var testCases = [
{
"type": "web",
"url": "https://journals.sagepub.com/doi/10.1177/0263276404046059",
+ "detectedItemType": "journalArticle",
"items": [
{
"itemType": "journalArticle",
@@ -370,12 +361,11 @@ var testCases = [
"creatorType": "author"
}
],
- "date": "October 1, 2004",
+ "date": "2004-10-01",
"DOI": "10.1177/0263276404046059",
"ISSN": "0263-2764",
"abstractNote": "This article is concerned with how to conceptualize and theorize the nature of the ‘car system’ that is a particularly key, if surprisingly neglected, element in ‘globalization’. The article deploys the notion of systems as self-reproducing or autopoietic. This notion is used to understand the origins of the 20th-century car system and especially how its awesome pattern of path dependency was established and exerted a particularly powerful and self-expanding pattern of domination across the globe. The article further considers whether and how the 20th-century car system may be transcended. It elaborates a number of small changes that are now occurring in various test sites, factories, ITC sites, cities and societies. The article briefly considers whether these small changes may in their contingent ordering end this current car system. The article assesses whether such a new system could emerge well before the end of this century, whether in other words some small changes now may produce the very large effect of a new post-car system that would have great implications for urban life, for mobility and for limiting projected climate change.",
"issue": "4-5",
- "journalAbbreviation": "Theory, Culture & Society",
"language": "en",
"libraryCatalog": "SAGE Journals",
"pages": "25-39",
@@ -388,23 +378,56 @@ var testCases = [
"mimeType": "application/pdf"
}
],
- "tags": [
- {
- "tag": "automobility"
- },
+ "tags": [],
+ "notes": [],
+ "seeAlso": []
+ }
+ ]
+ },
+ {
+ "type": "web",
+ "url": "https://journals.sagepub.com/doi/10.1177/1071181322661302",
+ "detectedItemType": "journalArticle",
+ "items": [
+ {
+ "itemType": "journalArticle",
+ "title": "Deidentification of Drivers’ Face Videos: Scope and Challenges in Human Factors Research",
+ "creators": [
{
- "tag": "path dependence"
+ "lastName": "Thapa",
+ "firstName": "Surendrabikram",
+ "creatorType": "author"
},
{
- "tag": "technology"
+ "lastName": "Cook",
+ "firstName": "Julie",
+ "creatorType": "author"
},
{
- "tag": "time-space"
- },
+ "lastName": "Sarkar",
+ "firstName": "Abhijit",
+ "creatorType": "author"
+ }
+ ],
+ "date": "2022-09-01",
+ "DOI": "10.1177/1071181322661302",
+ "ISSN": "2169-5067",
+ "abstractNote": "Data sharing across disciplines helps to build collaboration, and advance research. With recent development in data-driven models, there is an unprecedented need for data. However, data collected from human research subjects are required to follow proper ethical guidelines. Researchers have an obligation to protect the privacy of research participants and address ethical and safety concerns when data contains personally identifying information (PII). This paper addresses this problem with a focus on sharing drivers’ face videos for transportation research. The paper first gives an overview of the multitude of problems that are associated with sharing drivers’ videos. Then it demonstrates the possible directions for data sharing by de-identifying drivers’ faces using artificial intelligence-based techniques. The results achieved through the proposed techniques were evaluated qualitatively and quantitatively to prove the validity of the suggested methods. We specifically demonstrated how face-swapping algorithms can effectively de-identify faces while still preserving important attributes related to human factor research including eye movements, head movements, mouth movements, etc. Finally, we discuss possible measures to share such de-identified videos with the greater research community.",
+ "issue": "1",
+ "language": "en",
+ "libraryCatalog": "SAGE Journals",
+ "pages": "1509-1513",
+ "publicationTitle": "Proceedings of the Human Factors and Ergonomics Society Annual Meeting",
+ "shortTitle": "Deidentification of Drivers’ Face Videos",
+ "url": "https://doi.org/10.1177/1071181322661302",
+ "volume": "66",
+ "attachments": [
{
- "tag": "tipping point"
+ "title": "SAGE PDF Full Text",
+ "mimeType": "application/pdf"
}
],
+ "tags": [],
"notes": [],
"seeAlso": []
}
From 6300365a9ea34fae81d3c93ceebd075cb0973fb1 Mon Sep 17 00:00:00 2001
From: Sebastian Karcher
Date: Mon, 8 May 2023 07:46:46 -0400
Subject: [PATCH 025/125] Add Dataset to RIS (#3022)
---
RIS.js | 1211 ++++++++++++++++++++++++++++++++------------------------
1 file changed, 701 insertions(+), 510 deletions(-)
diff --git a/RIS.js b/RIS.js
index b74a3cb989b..9fd7761af8f 100644
--- a/RIS.js
+++ b/RIS.js
@@ -17,9 +17,33 @@
},
"inRepository": true,
"translatorType": 3,
- "lastUpdated": "2022-07-14 15:44:17"
+ "lastUpdated": "2023-04-20 19:03:44"
}
+/*
+ ***** BEGIN LICENSE BLOCK *****
+
+ Copyright © 2006-2023 Simon Kornblith, Aurimas Vinckevicus, Abe Jellinek
+
+ This file is part of Zotero.
+
+ Zotero is free software: you can redistribute it and/or modify
+ it under the terms of the GNU Affero General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ Zotero is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU Affero General Public License for more details.
+
+ You should have received a copy of the GNU Affero General Public License
+ along with Zotero. If not, see 85
|| (lastLineLength !== undefined && lastLineLength < 65)
|| cleanLine.length == 0)
- ) {
-
+ ) {
cleanLine = "\n" + cleanLine;
newLineAdded = true;
}
//don't remove new lines from keywords or attachments
- if (!newLineAdded && preserveNewLines.indexOf(tagValue.tag) != -1) {
+ if (!newLineAdded && preserveNewLines.includes(tagValue.tag)) {
cleanLine = "\n" + cleanLine;
newLineAdded = true;
}
//check if we need to add a space before concatenating
- if (!newLineAdded && tagValue.value.charAt(tagValue.value.length-1) != ' ') {
+ if (!newLineAdded && tagValue.value.charAt(tagValue.value.length - 1) != ' ') {
cleanLine = ' ' + cleanLine;
}
@@ -743,9 +788,11 @@ var RISReader = new function() {
}
if (tagValue) return tagValue;
+ return false;
}
var _lineBuffer = [];
+
/**
* private
* Gets the next line in the buffer or file
@@ -757,7 +804,7 @@ var RISReader = new function() {
// because we may have an empty line, which could be meaningful
if (_lineBuffer.length) return _lineBuffer.pop();
var line = Zotero.read();
- if (line && (line.indexOf('\u2028') != -1 || line.indexOf('\u2029') != -1)) {
+ if (line && (line.includes('\u2028') || line.includes('\u2029'))) {
// Apparently some services think that it's cool to break up single
// lines in RIS into shorter lines using Unicode "LINE SEPARATOR"
// character. Well, that sucks for us, because . (dot) in regexp does
@@ -776,6 +823,7 @@ var RISReader = new function() {
* Generic methods for cleaning RIS tags
*/
var TagCleaner = {
+
/**
* public
* Changes the RIS tag for an indicated tag-value pair. If more than one tag
@@ -785,25 +833,26 @@ var TagCleaner = {
* @param (Integer) at Index in entry of the tag-value pair to alter
* @param (String[]) toTags Array of tags to change to
*/
- changeTag: function(entry, at, toTags) {
+ changeTag: function (entry, at, toTags) {
var source = entry[at], byTag = entry.tags[source.tag];
//clean up "tags" list
- byTag.splice(byTag.indexOf(source),1);
+ byTag.splice(byTag.indexOf(source), 1);
if (!byTag.length) delete entry.tags[source.tag];
if (!toTags || !toTags.length) {
//then we just remove
- entry.splice(at,1);
- } else {
+ entry.splice(at, 1);
+ }
+ else {
source.tag = toTags[0]; //re-use the same pair for first tag
if (!entry.tags[toTags[0]]) entry.tags[toTags[0]] = [];
entry.tags[toTags[0]].push(source);
//if we're changing to more than one tag, we need to add extras
- for (var i=1, n=toTags.length; i Zotero field map
this.proCiteMap = {
'Author Role': { //special case
- 'actor': 'cast-member',
- 'author': 'author',
- 'cartographer': 'cartographer',
- 'composer': 'composer',
- 'composed': 'composer',
- 'director': 'director',
- 'directed': 'director',
- 'performer': 'performer',
- 'performed': 'performer',
- 'producer': 'producer',
- 'produced': 'producer',
- 'editor': 'editor',
- 'ed': 'editor',
- 'edited': 'editor',
+ actor: 'cast-member',
+ author: 'author',
+ cartographer: 'cartographer',
+ composer: 'composer',
+ composed: 'composer',
+ director: 'director',
+ directed: 'director',
+ performer: 'performer',
+ performed: 'performer',
+ producer: 'producer',
+ produced: 'producer',
+ editor: 'editor',
+ ed: 'editor',
+ edited: 'editor',
'editor-in-chief': 'editor',
- 'compiler': 'editor',
- 'compiled': 'editor',
- 'collected': 'editor',
- 'assembled': 'editor',
- 'presenter': 'presenter',
- 'presented': 'presenter',
- 'translator': 'translator',
- 'translated':'translator',
- 'introduction': 'contributor'
+ compiler: 'editor',
+ compiled: 'editor',
+ collected: 'editor',
+ assembled: 'editor',
+ presenter: 'presenter',
+ presented: 'presenter',
+ translator: 'translator',
+ translated: 'translator',
+ introduction: 'contributor'
//conductor
//illustrator
//librettist
},
'Call Number': 'callNumber',
- 'Edition': 'edition',
- 'ISBN': 'ISBN',
- 'Language': 'language',
+ Edition: 'edition',
+ ISBN: 'ISBN',
+ Language: 'language',
'Publisher Name': 'publisher',
'Series Title': 'series',
'Proceedings Title': 'proceedingsTitle',
@@ -862,10 +911,10 @@ var ProCiteCleaner = new function() {
'Issue ID': 'issue',
'Issue Identification': 'issue',
'Series Volume ID': 'seriesNumber',
- 'Scale': 'scale',
+ Scale: 'scale',
'Place of Publication': 'place',
- 'Histroy': 'history', // yes, it's misspelled in their export filter
- 'Size': 'artworkSize'
+ Histroy: 'history', // yes, it's misspelled in their export filter
+ Size: 'artworkSize'
};
var tagValueSplit = /([A-Za-z,\s]+)\s*:\s*([\s\S]*)/; //ProCite version
@@ -876,7 +925,7 @@ var ProCiteCleaner = new function() {
* @param (RISReader entry) entry Entry to be cleaned up in-place
* @param (Zotero.Item) item Indicates item type for proper mapping
*/
- this.cleanTags = function(entry, item) {
+ this.cleanTags = function (entry, item) {
// We _must_ change some tags before mapping from notes, otherwise
// there will be ambiguity
var ty;
@@ -889,12 +938,12 @@ var ProCiteCleaner = new function() {
}
- var notes = entry.tags.N1, extentOfWork, packagingMethod;
+ var extentOfWork, packagingMethod;
//go through all the notes
- for (var i=0; notes && notes.length && i=0; i--) {
-
+ for (let i = start - 1; i >= 0; i--) {
if (tag && entry[i].tag !== tag) {
//different from the tags we changed previously. Don't continue
return added ? added : true;
}
tag = entry[i].tag;
- if (allowedTags.indexOf(tag) === -1) {
+ if (!(allowedTags.includes(tag))) {
//not allowed to remap this tag
- Z.debug('RIS: nothing to remap');
- return;
+ // Z.debug('RIS: nothing to remap');
+ return false;
}
this._changeTag(entry, i, risTags); //don't need to adjust i, since we're traversing backwards
@@ -1163,33 +1213,36 @@ var ProCiteCleaner = new function() {
//we should not end up at the begining of entry,
//since we will probably never be replacing TY, but just in case
if (tag) return added ? added : true;
+ return false;
};
-}
+};
+
/**
* @singleton Fixes some EndNote bugs, makes it more conveninent to import
*/
-var EndNoteCleaner = new function() {
+var EndNoteCleaner = new function () {
+ // eslint-disable-next-line lines-around-comment
/**
* public
- *
+ *
* @param (RISReader entry) entry Entry to be cleaned up in-place
* @param (Zotero.Item) item Indicates item type for proper mapping
*/
- this.cleanTags = function(entry, item) {
+ this.cleanTags = function (entry) {
// for edited books, treat authors as editors
if (entry.tags.TY && entry.tags.TY[0].value == 'EDBOOK' && entry.tags.AU) {
- for (var i = entry.tags.AU.length-1; i>=0; i--) {
+ for (let i = entry.tags.AU.length - 1; i >= 0; i--) {
TagCleaner.changeTag(entry, entry.indexOf(entry.tags.AU[i]), ['A3']);
}
}
- }
+ };
};
/**
* @singleton Deals with some Citavi specific nuances
*/
-var CitaviCleaner = new function() {
- this.cleanTags = function(entry, item) {
+var CitaviCleaner = new function () {
+ this.cleanTags = function (entry) {
// Citavi uses multiple H1 and H2 tags to list mutliple libraries and call
// numbers for items. We can only store one, so we will transform the first
// set of H1+H2 tags to DP+CN tags
@@ -1199,27 +1252,27 @@ var CitaviCleaner = new function() {
if (!entry.tags.H1) {
// Only have a call number (maybe multiple, so take the first)
- var at = entry.tags.indexOf(entry.tags.H2[0]);
+ let at = entry.tags.indexOf(entry.tags.H2[0]);
TagCleaner.changeTag(entry, at, 'CN');
return;
}
if (!entry.tags.H1) {
// Only have a library
- var at = entry.tags.indexOf(entry.tags.H1[0]);
+ let at = entry.tags.indexOf(entry.tags.H1[0]);
TagCleaner.changeTag(entry, at, 'DP');
}
// We have pairs, so find the first set and change it
- for (var i=0; i]+>/)) { //from cleanTags
+ }
+ else if (!value.match(/<[^>]+>/)) { //from cleanTags
value = ''
+ value.replace(/\n\n/g, '
')
- .replace(/\n/g, '
')
- .replace(/\t/g, ' ')
- .replace(/ /g, ' ')
+ .replace(/\n/g, '
')
+ .replace(/\t/g, ' ')
+ .replace(/ {2}/g, ' ')
+ '
';
}
- break;
+ break;
case "EP":
if (item.pages) {
- if (item.pages.indexOf('-') == -1) {
+ if (!(item.pages.includes('-'))) {
item.pages = item.pages + '-' + value;
- } else {
+ }
+ else {
item.backupNumPages = value;
}
value = undefined;
- } else {
+ }
+ else {
item.backupEndPage = value; //store this for an odd case where SP comes after EP
value = undefined;
}
- break;
+ break;
case "M1":
//Endnote exports access date for webpages to M1
//It makes much more sense to export to Y2
@@ -1289,11 +1345,11 @@ function processTag(item, tagValue, risEntry, allowDeprecated) {
item.backupAccessDate = {
field: zField[0],
value: dateRIStoZotero(value, zField[0])
- }
+ };
value = undefined;
processFields = false;
}
- break;
+ break;
case "M3":
// This is DOI when coming from EndNote, but it can be used for
// publication type as well
@@ -1301,11 +1357,12 @@ function processTag(item, tagValue, risEntry, allowDeprecated) {
var cleanDOI = ZU.cleanDOI(value);
if (cleanDOI) {
value = cleanDOI;
- } else {
- zField[0] = 'unknown'
+ }
+ else {
+ zField[0] = 'unknown';
}
}
- break;
+ break;
case "VL":
if (zField[0] == "accessDate") {
//EndNote screws up webpage entries. VL is access year, but access date is available
@@ -1318,7 +1375,7 @@ function processTag(item, tagValue, risEntry, allowDeprecated) {
value = undefined;
processFields = false;
}
- break;
+ break;
//PY is typically less complete than other dates. We'll store it as backup
case "PY":
item.backupDate = {
@@ -1327,35 +1384,35 @@ function processTag(item, tagValue, risEntry, allowDeprecated) {
};
value = undefined;
processFields = false;
- break;
+ break;
case "UR":
//REFMAN places PMIDS in UR sometimes
- if (value.indexOf('PM:') != -1) {
+ if (value.includes('PM:')) {
value = 'PMID: ' + value.substr(3);
zField = ['extra'];
}
- break;
+ break;
}
//zField based manipulations
- if (processFields){
+ if (processFields) {
switch (zField[0]) {
case "__ignore":
value = undefined;
- break;
+ break;
case "backupPublicationTitle":
item.backupPublicationTitle = value;
value = undefined;
- break;
+ break;
case "creators":
var lName = value.split(/\s*,\s*/)[0];
var fName = value.substr(lName.length).replace(/^\s*,\s*/, '');
- value = {lastName: lName, firstName:fName, creatorType:zField[1]};
+ value = { lastName: lName, firstName: fName, creatorType: zField[1] };
if (!value.firstName) { //corporate
delete value.firstName;
value.fieldMode = 1;
}
- break;
+ break;
case "date":
case "accessDate":
case "filingDate":
@@ -1363,7 +1420,7 @@ function processTag(item, tagValue, risEntry, allowDeprecated) {
case "dateEnacted":
case "dateDecided":
value = dateRIStoZotero(value, zField[0]);
- break;
+ break;
case "tags":
//allow new lines or semicolons. Commas, might be more problematic
//%K part is a hack for REFMAN exports
@@ -1373,29 +1430,29 @@ function processTag(item, tagValue, risEntry, allowDeprecated) {
//but it will still allow a blank tag if there is a newline or
//semicolon at the begining or the end
if (!value[0]) value.shift();
- if (value.length && !value[value.length-1]) value.pop();
+ if (value.length && !value[value.length - 1]) value.pop();
if (!value.length) {
value = undefined;
}
- break;
+ break;
case "notes":
- value = {note:value};
+ value = { note: value };
//we can specify note title in the field mapping table
if (zField[1]) {
value.note = zField[1] + ': ' + value.note;
}
- break;
+ break;
case "attachments":
var values = value.split('\n');
var title, mimeType, url;
- for (var i=0, n=values.length; i
" + note;
- item.notes.push({note: note.trim(), tags: ['_RIS import']});
+ item.notes.push({ note: note.trim(), tags: ['_RIS import'] });
}
}
item.unsupportedFields = undefined;
item.unknownFields = undefined;
-
+
return item.complete();
}
@@ -1758,6 +1824,7 @@ function doImport() {
throw e;
}
);
+ return false;
}
else {
return new Promise(function (resolve, reject) {
@@ -1775,11 +1842,11 @@ function startImport(resolve, reject) {
//prepare some configurable options
if (Zotero.getHiddenPref) {
- var pref = Zotero.getHiddenPref("RIS.import.ignoreUnknown");
+ let pref = Zotero.getHiddenPref("RIS.import.ignoreUnknown");
if (pref != undefined) {
ignoreUnknown = pref;
}
- var pref = Zotero.getHiddenPref("RIS.import.keepID");
+ pref = Zotero.getHiddenPref("RIS.import.keepID");
if (pref === true) {
degenerateImportFieldMap.ID = pref;
}
@@ -1795,6 +1862,7 @@ function startImport(resolve, reject) {
function importNext(resolve, reject) {
try {
var entry;
+ // eslint-disable-next-line no-cond-assign
while (entry = RISReader.nextEntry()) {
//determine item type
var itemType = exportedOptions.itemType;
@@ -1811,11 +1879,12 @@ function importNext(resolve, reject) {
//we allow entries without TY and just use default type
if (!itemType) {
var defaultType = exportedOptions.defaultItemType || DEFAULT_IMPORT_TYPE;
+
if (entry.tags.TY) {
- Z.debug("RIS: Unknown item type: " + entry.tags.TY[0].value
- + ". Defaulting to " + defaultType);
- } else {
- Z.debug("RIS: TY tag not specified. Defaulting to " + defaultType);
+ // Z.debug("RIS: Unknown item type: " + entry.tags.TY[0].value + ". Defaulting to " + defaultType);
+ }
+ else {
+ // Z.debug("RIS: TY tag not specified. Defaulting to " + defaultType);
}
itemType = defaultType;
@@ -1827,20 +1896,18 @@ function importNext(resolve, reject) {
CitaviCleaner.cleanTags(entry, item);
var deferredEntries = [];
-
- for (var i=0, n=entry.length; i
Date: Sat, 20 May 2023 13:55:28 -0400
Subject: [PATCH 026/125] Update DV to work properly for datasets (#3024)
* Asyncify and improve short titles
* Update regex
* use description from schema
---
Dataverse.js | 145 +++++++++++++++++++++++++++++++++++++++------------
1 file changed, 113 insertions(+), 32 deletions(-)
diff --git a/Dataverse.js b/Dataverse.js
index 723ac356733..2575d88c336 100644
--- a/Dataverse.js
+++ b/Dataverse.js
@@ -1,21 +1,21 @@
{
"translatorID": "aedf3fb0-9a50-47b3-ba2f-3206552b82a9",
"label": "Dataverse",
- "creator": "Abe Jellinek",
- "target": "^https?://(www\\.)?((open|research-|hei)?data|dvn|e?da[td]os|sodha\\.be|repositoriodedados|archive\\.data\\.jhu\\.edu|repositoriopesquisas|darus)",
+ "creator": "Abe Jellinek, Sebastian Karcher",
+ "target": "^https?://(www\\.)?((open|research-?|hei|planetary-|osna|in|bonn|borealis|lida\\.|archaeology\\.|entrepot\\.recherche\\.|archive\\.|redape\\.)?(data|e?da[td]os)|dvn|sodha\\.be|repositorio(\\.|dedados|pesquisas)|abacus\\.library\\.ubc\\.ca|dorel\\.univ-lorraine\\.fr|darus\\.uni-stuttgart\\.de|dunas\\.ua\\.pt|edmond\\.mpdl\\.mpg\\.de|keen\\.zih\\.tu-dresden\\.de|rdr\\.kuleuven\\.be|portal\\.odissei\\.nl)",
"minVersion": "3.0",
"maxVersion": "",
"priority": 100,
"inRepository": true,
"translatorType": 4,
"browserSupport": "gcsibv",
- "lastUpdated": "2021-08-11 18:10:33"
+ "lastUpdated": "2023-05-01 12:09:04"
}
/*
***** BEGIN LICENSE BLOCK *****
- Copyright © 2021 Abe Jellinek
+ Copyright © 2023 Abe Jellinek & Sebastian Karcher
This file is part of Zotero.
@@ -35,6 +35,9 @@
***** END LICENSE BLOCK *****
*/
+const datasetType = ZU.fieldIsValidForType('title', 'dataset')
+ ? 'dataset'
+ : 'document';
function detectWeb(doc, url) {
if (!doc.querySelector('#dataverseHeader')) {
@@ -42,7 +45,7 @@ function detectWeb(doc, url) {
}
if (url.includes('/dataset.xhtml')) {
- return "document";
+ return datasetType;
}
else if (getSearchResults(doc, true)) {
return "multiple";
@@ -65,34 +68,58 @@ function getSearchResults(doc, checkOnly) {
return found ? items : false;
}
-function doWeb(doc, url) {
- if (detectWeb(doc, url) == "multiple") {
- Zotero.selectItems(getSearchResults(doc, false), function (items) {
- if (items) ZU.processDocuments(Object.keys(items), scrape);
- });
+async function doWeb(doc, url) {
+ if (detectWeb(doc, url) == 'multiple') {
+ let items = await Zotero.selectItems(getSearchResults(doc, false));
+ if (!items) return;
+ for (let url of Object.keys(items)) {
+ await scrape(await requestDocument(url));
+ }
}
else {
- scrape(doc, url);
+ await scrape(doc, url);
}
}
-function scrape(doc, url) {
- var translator = Zotero.loadTranslator('web');
+async function scrape(doc, url = doc.location.href) {
+ let jsonLD = text(doc, 'script[type="application/ld+json"]');
+ // Z.debug(jsonLD)
+ let schema = JSON.parse(jsonLD);
+ let license = schema.license;
+ let abstract = schema.description;
+ // License can be stored as a string or an object (should be a string)
+ if (typeof (license) == "object") {
+ license = schema.license.text;
+ }
+ let version = schema.version;
+ let translator = Zotero.loadTranslator('web');
// Embedded Metadata
translator.setTranslator('951c027d-74ac-47d4-a107-9c3069ab7b48');
translator.setDocument(doc);
- translator.setHandler('itemDone', function (obj, item) {
+ translator.setHandler('itemDone', (_obj, item) => {
item.libraryCatalog = text(doc, '#breadcrumbLnk0');
+ // we commonly have two colons in titles. The first one just labels the data as data
+ if (/^(Replication )?[Dd]ata for:/.test(item.title)) {
+ item.shortTitle = item.title.match(/(^(Replication )?[Dd]ata for:.*?)(:|$)/)[1];
+ }
+ if (license) {
+ item.rights = ZU.cleanTags(license).trim();
+ }
+ if (abstract) {
+ item.abstractNote = abstract;
+ }
+ if (version && version > 1) item.versionNumber = version;
item.complete();
});
- translator.getTranslatorObject(function (trans) {
- trans.itemType = 'document';
- trans.doWeb(doc, url);
- });
+ let em = await translator.getTranslatorObject();
+ em.itemType = datasetType;
+ await em.doWeb(doc, url);
}
+
+
/** BEGIN TEST CASES **/
var testCases = [
{
@@ -100,7 +127,7 @@ var testCases = [
"url": "https://dataverse.harvard.edu/dataset.xhtml?persistentId=doi:10.7910/DVN/3OUPKS",
"items": [
{
- "itemType": "document",
+ "itemType": "dataset",
"title": "Survey seed production and seed contract",
"creators": [
{
@@ -110,11 +137,12 @@ var testCases = [
}
],
"date": "2021-08-04",
+ "DOI": "10.7910/DVN/3OUPKS",
"abstractNote": "The data is collected as part of a seed contract experiment conducted in Telengana state, India",
- "extra": "Type: dataset\nDOI: 10.7910/DVN/3OUPKS",
"language": "en",
"libraryCatalog": "Harvard Dataverse",
- "publisher": "Harvard Dataverse",
+ "repository": "Harvard Dataverse",
+ "rights": "CC0",
"url": "https://dataverse.harvard.edu/dataset.xhtml?persistentId=doi:10.7910/DVN/3OUPKS",
"attachments": [
{
@@ -140,9 +168,10 @@ var testCases = [
{
"type": "web",
"url": "https://datos.uchile.cl/dataset.xhtml?persistentId=doi:10.34691/FK2/UMWJDU",
+ "detectedItemType": "dataset",
"items": [
{
- "itemType": "document",
+ "itemType": "dataset",
"title": "Replicar los datos para: Genetic diversity in a restricted-dispersal kissing bug: The Center-Periphery Hypothesis halfway",
"creators": [
{
@@ -172,11 +201,13 @@ var testCases = [
}
],
"date": "2021-07-19",
+ "DOI": "10.34691/FK2/UMWJDU",
"abstractNote": "The center-periphery hypothesis (CPH) postulates that populations close to the center of a species’ distribution will exhibit higher genetic diversity and lower genetic differentiation than populations located at the edge of the distribution. The center of a species distribution might represent an optimum for the environmental factors influencing the species absolute fitness and therefore, genetic diversity. In species with wide distribution, the geographical variation of biotic and abiotic variables is crucial to understand the underlying mechanisms of the CPH. We evaluated the CPH and specifically tested which environmental variables better explained the patterns of genetic diversity in the kissing-bug Mepraia spinolai, one of the main wild vectors of Chagas disease in southern South America, distributing across three Mediterranean climatic ecoregions in Chile. We analyzed 2380 neutral Single Nucleotide Polymorphisms (SNP) to estimate genetic diversity. The mean winter temperature, the mean summer temperature, vegetation cover, population abundance, proportion of winged individuals and female abdomen area were measured for each kissing bug population to construct a model. Lower genetic diversity was detected in populations at the edge of the distribution compared to those in the center. However, genetic differentiation was not higher in the periphery. Genetic diversity was related to climatic and biological variables; there was a positive relationship with mean winter temperature and a negative association with mean summer temperature and body size. These results partially support the CPH and identify biotic (abdomen area) and abiotic (winter/summer temperatures) factors that would affect genetic diversity in this restricted-dispersal species of epidemiological relevance.",
- "extra": "Type: dataset\nDOI: 10.34691/FK2/UMWJDU",
+ "extra": "Type: dataset",
"language": "en",
- "libraryCatalog": "Universidad de Chile",
- "publisher": "Universidad de Chile",
+ "libraryCatalog": "Repositorio de datos de investigación de la Universidad de Chile",
+ "repository": "Repositorio de datos de investigación de la Universidad de Chile",
+ "rights": "CC0",
"shortTitle": "Replicar los datos para",
"url": "https://datos.uchile.cl/dataset.xhtml?persistentId=doi:10.34691/FK2/UMWJDU",
"attachments": [
@@ -205,7 +236,7 @@ var testCases = [
"url": "https://www.sodha.be/dataset.xhtml?persistentId=doi:10.34934/DVN/HEABHJ",
"items": [
{
- "itemType": "document",
+ "itemType": "dataset",
"title": "World Value Surveys 1981",
"creators": [
{
@@ -215,11 +246,13 @@ var testCases = [
}
],
"date": "2021-07-30",
- "abstractNote": "The series is designed to enable a crossnational comparison of values and norms on a wide variety of topics and to monitor changes in values and at...",
- "extra": "Type: dataset\nDOI: 10.34934/DVN/HEABHJ",
+ "DOI": "10.34934/DVN/HEABHJ",
+ "abstractNote": "The series is designed to enable a crossnational comparison of values and norms on a wide variety of topics and to monitor changes in values and attitudes across the world in 1981.",
+ "extra": "Type: dataset",
"language": "en",
"libraryCatalog": "Social Sciences and Digital Humanities Archive – SODHA",
- "publisher": "Social Sciences and Digital Humanities Archive – SODHA",
+ "repository": "Social Sciences and Digital Humanities Archive – SODHA",
+ "rights": "This work is licensed under a Creative Commons Attribution 4.0 International License (CC-BY).",
"url": "https://www.sodha.be/dataset.xhtml?persistentId=doi:10.34934/DVN/HEABHJ",
"attachments": [
{
@@ -242,7 +275,7 @@ var testCases = [
"url": "https://data.worldagroforestry.org/dataset.xhtml?persistentId=doi:10.34725/DVN/NGGXCZ",
"items": [
{
- "itemType": "document",
+ "itemType": "dataset",
"title": "Replication Data for: Agroforestry governance for operationalising the landscape approach: connecting conservation and farming actors",
"creators": [
{
@@ -307,11 +340,12 @@ var testCases = [
}
],
"date": "2021-08-05",
+ "DOI": "10.34725/DVN/NGGXCZ",
"abstractNote": "The expansion and intensifcation of agriculture as well as the associated land clearing are threatening both biodiversity and human wellbeing in tr...",
- "extra": "Type: dataset\nDOI: 10.34725/DVN/NGGXCZ",
"language": "en",
"libraryCatalog": "World Agroforestry - Research Data Repository",
- "publisher": "World Agroforestry - Research Data Repository",
+ "repository": "World Agroforestry - Research Data Repository",
+ "rights": "This dataset is made available under the Creative Commons Attribution 4.0 International (CC-BY-4.0). The license allows you, the user, to copy and redistribute the material in any medium or format and/or transform, and build upon the material\r\nfor any purpose, even commercially.",
"shortTitle": "Replication Data for",
"url": "https://data.worldagroforestry.org/dataset.xhtml?persistentId=doi:10.34725/DVN/NGGXCZ",
"attachments": [
@@ -332,6 +366,53 @@ var testCases = [
"seeAlso": []
}
]
+ },
+ {
+ "type": "web",
+ "url": "https://dataverse.no/dataset.xhtml?persistentId=doi:10.18710/GUX2O8",
+ "detectedItemType": "dataset",
+ "items": [
+ {
+ "itemType": "dataset",
+ "title": "Replication Data for: Spatial changes in gas transport and sediment stiffness influenced by regional stress: observations from piezometer data along the Vestnesa Ridge, eastern Fram Strait",
+ "creators": [
+ {
+ "firstName": "Andreia",
+ "lastName": "Plaza-Faverola",
+ "creatorType": "author"
+ },
+ {
+ "firstName": "Nabil",
+ "lastName": "Sultan",
+ "creatorType": "author"
+ }
+ ],
+ "date": "2023-04-11",
+ "DOI": "10.18710/GUX2O8",
+ "abstractNote": "This database comprises piezometer pore-pressure and temperature data, analyses from Calypso sediment cores (grain sizes and logs) and results from...",
+ "extra": "Type: dataset",
+ "language": "en",
+ "libraryCatalog": "DataverseNO",
+ "repository": "DataverseNO",
+ "rights": "http://creativecommons.org/publicdomain/zero/1.0",
+ "shortTitle": "Replication Data for",
+ "url": "https://dataverse.no/dataset.xhtml?persistentId=doi:10.18710/GUX2O8",
+ "versionNumber": "2",
+ "attachments": [
+ {
+ "title": "Snapshot",
+ "mimeType": "text/html"
+ }
+ ],
+ "tags": [
+ {
+ "tag": "Earth and Environmental Sciences"
+ }
+ ],
+ "notes": [],
+ "seeAlso": []
+ }
+ ]
}
]
/** END TEST CASES **/
From 5556c3173b02d2f6a1a06ceba44728d6af479f58 Mon Sep 17 00:00:00 2001
From: Sebastian Karcher
Date: Sat, 20 May 2023 13:55:57 -0400
Subject: [PATCH 027/125] Add Databrary Translator (#3020)
---
Databrary.js | 184 +++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 184 insertions(+)
create mode 100644 Databrary.js
diff --git a/Databrary.js b/Databrary.js
new file mode 100644
index 00000000000..ae71bf0b97f
--- /dev/null
+++ b/Databrary.js
@@ -0,0 +1,184 @@
+{
+ "translatorID": "45ece855-7303-41d2-8c9f-1151f684943c",
+ "label": "Databrary",
+ "creator": "Sebastian Karcher",
+ "target": "^https?://nyu\\.databrary\\.org/(volume|search)",
+ "minVersion": "5.0",
+ "maxVersion": "",
+ "priority": 100,
+ "inRepository": true,
+ "translatorType": 4,
+ "browserSupport": "gcsibv",
+ "lastUpdated": "2023-04-19 16:49:05"
+}
+
+/*
+ ***** BEGIN LICENSE BLOCK *****
+
+ Copyright © 2023 Sebastian Karcher
+
+ This file is part of Zotero.
+
+ Zotero is free software: you can redistribute it and/or modify
+ it under the terms of the GNU Affero General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ Zotero is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU Affero General Public License for more details.
+
+ You should have received a copy of the GNU Affero General Public License
+ along with Zotero. If not, see
Date: Sat, 20 May 2023 14:14:18 -0400
Subject: [PATCH 028/125] Add dataset import support to RDF (#3029)
Export still todo
---
RDF.js | 22 ++++++++++++++--------
1 file changed, 14 insertions(+), 8 deletions(-)
diff --git a/RDF.js b/RDF.js
index 75e9b8d7ed5..f39e9a5cf92 100644
--- a/RDF.js
+++ b/RDF.js
@@ -12,7 +12,7 @@
},
"inRepository": true,
"translatorType": 1,
- "lastUpdated": "2022-09-22 02:12:48"
+ "lastUpdated": "2023-04-24 15:51:01"
}
/*
@@ -39,6 +39,9 @@
***** END LICENSE BLOCK *****
*/
+const datasetType = ZU.fieldIsValidForType('title', 'dataset')
+ ? 'dataset'
+ : 'document';
function detectImport() {
// Make sure there are actually nodes
@@ -444,8 +447,7 @@ function detectType(newItem, node, ret) {
t.so = 'artwork'; break;
case 'datacatalog':
case 'dataset':
- t.so = 'journalArticle'; break; // until dataset gets implemented
-
+ t.so = datasetType; break;
// specials cases
case "article":
// choose between journal, newspaper, and magazine articles
@@ -532,8 +534,10 @@ function detectType(newItem, node, ret) {
case 'conferenceposter':
t.dc = 'conferencePaper';
break;
+ case 'dataset':
+ t.dc = datasetType;
+ break;
case 'article': // from http://www.idealliance.org/specifications/prism/specifications/prism-controlled-vocabularies/prism-12-controlled-vocabularies
- case 'dataset': // until dataset gets implemented
case 'journalitem':
case 'journalarticle':
case 'submittedjournalarticle':
@@ -616,7 +620,7 @@ function detectType(newItem, node, ret) {
// very broad
t.dcGuess = 'journalArticle';
break;
- // collection, dataset, interactiveresource, physicalobject,
+ // collection, interactiveresource, physicalobject,
// service
}
}
@@ -644,10 +648,12 @@ function detectType(newItem, node, ret) {
case 'conferenceposter':
t.eprints = 'conferencePaper';
break;
+ case 'dataset':
+ t.eprints = datasetType;
+ break;
case 'journalitem':
case 'journalarticle':
case 'submittedjournalarticle':
- case 'dataset': // map to dataset once we have it as item type
case 'article':
t.eprints = 'journalArticle';
break;
@@ -1220,8 +1226,8 @@ function importItem(newItem, node) {
// type
let type = getFirstResults(node, [n.dc + "type", n.dc1_0 + "type", n.dcterms + "type"], true);
- /** CUSTOM ITEM TYPE -- Currently only Dataset **/
- if (type && (type.toLowerCase() == "dataset" || type.toLowerCase() == "datacatalog")) {
+ /** CUSTOM ITEM TYPE -- Keeping for <6.0.24 clients w/o dataset support **/
+ if (datasetType != "dataset" && type && (type.toLowerCase() == "dataset" || type.toLowerCase() == "datacatalog")) {
if (newItem.extra) {
newItem.extra += "\nType: dataset";
}
From 1af44d1eaec8808339b851e1ba0678577833179d Mon Sep 17 00:00:00 2001
From: Sebastian Karcher
Date: Sat, 20 May 2023 14:29:29 -0400
Subject: [PATCH 029/125] SEP update & make work for archive pages (#3034)
https://forums.zotero.org/discussion/103528/stanford-encyclopedia-of-philosophy-oddities#latest
---
Stanford Encyclopedia of Philosophy.js | 262 ++++++++++++++++++-------
1 file changed, 195 insertions(+), 67 deletions(-)
diff --git a/Stanford Encyclopedia of Philosophy.js b/Stanford Encyclopedia of Philosophy.js
index db9505fd0d3..e1e7cb2b195 100644
--- a/Stanford Encyclopedia of Philosophy.js
+++ b/Stanford Encyclopedia of Philosophy.js
@@ -2,22 +2,20 @@
"translatorID": "5aabfa6e-79e6-4791-a9d2-46c9cb137561",
"label": "Stanford Encyclopedia of Philosophy",
"creator": "Sebastian Karcher",
- "target": "^https?://plato\\.stanford\\.edu/(entries|search)",
+ "target": "^https?://plato\\.stanford\\.edu/(archives/[a-z]{3}\\d{4}/)?(entries|search)",
"minVersion": "2.1",
"maxVersion": "",
"priority": 100,
"inRepository": true,
"translatorType": 4,
"browserSupport": "gcsibv",
- "lastUpdated": "2014-07-05 10:41:59"
+ "lastUpdated": "2023-05-04 15:33:21"
}
/*
***** BEGIN LICENSE BLOCK *****
- Copyright © 2011 Sebastian Karcher and the Center for History and New Media
- George Mason University, Fairfax, Virginia, USA
- http://zotero.org
+ Copyright © 2011-2023 Sebastian Karcher and Zotero
This file is part of Zotero.
@@ -38,66 +36,77 @@
*/
function detectWeb(doc, url) {
- if (url.match(/\/search\//)) return "multiple";
- if (url.match(/\entries\//)) return "bookSection";
+ if (url.includes("/search/") && getSearchResults(doc, true)) return "multiple";
+ else if (url.includes("/entries/")) return "bookSection";
+ return false;
}
-function doWeb(doc, url){
+function getSearchResults(doc, checkOnly) {
+ var items = {};
+ var found = false;
+ var rows = doc.querySelectorAll('div.result_title > a');
+ for (let row of rows) {
+ let href = row.href;
+ let title = ZU.trimInternal(row.textContent);
+ if (!href || !title) continue;
+ if (checkOnly) return true;
+ found = true;
+ items[href] = title;
+ }
+ return found ? items : false;
+}
- var articles = new Array();
- if (detectWeb(doc, url) == "multiple") {
- var items = {};
- var titles = doc.evaluate('//div[@class="result_title"]/a', doc, null, XPathResult.ANY_TYPE, null);
- var title;
- while (title = titles.iterateNext()) {
- items[title.href] = title.textContent;
+async function doWeb(doc, url) {
+ if (detectWeb(doc, url) == 'multiple') {
+ let items = await Zotero.selectItems(getSearchResults(doc, false));
+ if (!items) return;
+ for (let url of Object.keys(items)) {
+ await scrape(await requestDocument(url));
}
- Zotero.selectItems(items, function (items) {
- if (!items) {
- return true;
- }
- for (var i in items) {
- articles.push(i);
- }
- Zotero.Utilities.processDocuments(articles, scrape);
- });
- } else {
- scrape(doc, url);
+ }
+ else {
+ await scrape(doc, url);
}
}
-// help function
-function scrape(doc, url){
+
+async function scrape(doc, url = doc.location.href) {
//get abstract and tags from article plage
- //the xpaths aren't great , but seem reliable across pages
- var abs = ZU.xpathText(doc,'//div[@id="preamble"]/p').replace(/\n/g, "");
- var tags = ZU.xpathText(doc, '//div[@id="article-content"]//h2[a[@name="Rel" or @id="Rel"]]/following-sibling::p');
+ var abs = text(doc, 'div#preamble>p').replace(/\n/g, "");
+ var tags = text(doc, 'div#related-entries >p');
+ // Z.debug(tags);
if (tags) tags = tags.replace(/\n/g, "").split(/\|/);
- for (i in tags){
- tags[i] = ZU.trimInternal(tags[i])
- }
+ for (let i = 0; i < tags.length; i++) {
+ tags[i] = ZU.trimInternal(tags[i]);
+ }
//get BibTex Link
- var bibtexurl = url.replace(/entries\//,"cgi-bin/encyclopedia/archinfo.cgi?entry=").replace(/\/(index\.html)?(#.+)?$/, "");
- //Z.debug(bibtexurl)
- Zotero.Utilities.HTTP.doGet(bibtexurl, function (text) {
- //Z.debug(text)
- //remove line breaks, then match match the bibtex, then remove the odd /t in it.
- bibtex = text.replace(/\n/g, "").match(/.+<\/pre>/)[0].replace(/\/t/g, "")
- //Zotero.debug(bibtex)
-
- var translator = Zotero.loadTranslator("import");
- translator.setTranslator("9cb70025-a888-4a29-a210-93ec52da40d4");
- translator.setString(bibtex);
- translator.setHandler("itemDone", function(obj, item) {
- if (abs) item.abstractNote = abs;
- if (tags) item.tags = tags;
- item.attachments = [{url:item.url, title: "SEP - Snapshot", mimeType: "text/html"}];
- item.complete();
- });
- translator.translate();
+ var bibtexUrl = url.replace(/entries\//, "cgi-bin/encyclopedia/archinfo.cgi?entry=").replace(/\/(index\.html)?(#.+)?$/, "");
+ if (bibtexUrl.includes("/archives/")) {
+ // we're on archive page
+ let archive = bibtexUrl.match(/\/(archives\/[a-z]{3}\d{4})/)[1];
+ bibtexUrl = bibtexUrl.replace(archive, "/") + "&" + archive.replace("s/", "=");
+ // Z.debug(bibtexUrl);
+ }
+
+ // Z.debug(bibtexUrl)
+ let bibtex = await requestText(bibtexUrl);
+ // remove line breaks, then match match the bibtex, then remove the odd /t in it.
+ bibtex = bibtex.replace(/\n/g, "").match(/.+<\/pre>/)[0].replace(/\/t/g, "");
+ // Zotero.debug(bibtex)
+ var translator = Zotero.loadTranslator("import");
+ translator.setTranslator("9cb70025-a888-4a29-a210-93ec52da40d4");
+ translator.setString(bibtex);
+ translator.setHandler("itemDone", (_obj, item) => {
+ if (abs) item.abstractNote = abs;
+ if (tags) item.tags = tags;
+ item.attachments = [{ document: doc, title: "SEP - Snapshot", mimeType: "text/html" }];
+ item.complete();
});
-}/** BEGIN TEST CASES **/
+ await translator.translate();
+}
+
+/** BEGIN TEST CASES **/
var testCases = [
{
"type": "web",
@@ -123,14 +132,91 @@ var testCases = [
"creatorType": "editor"
}
],
- "date": "2015",
- "abstractNote": "Plato (429?–347 B.C.E.) is, by any reckoning, one of the mostdazzling writers in the Western literary tradition and one of the mostpenetrating, wide-ranging, and influential authors in the history ofphilosophy. An Athenian citizen of high status, he displays in hisworks his absorption in the political events and intellectual movementsof his time, but the questions he raises are so profound and thestrategies he uses for tackling them so richly suggestive andprovocative that educated readers of nearly every period have in someway been influenced by him, and in practically every age there havebeen philosophers who count themselves Platonists in some importantrespects. He was not the first thinker or writer to whom the word“philosopher” should be applied. But he was soself-conscious about how philosophy should be conceived, and what itsscope and ambitions properly are, and he so transformed theintellectual currents with which he grappled, that the subject ofphilosophy, as it is often conceived—a rigorous and systematicexamination of ethical, political, metaphysical, and epistemologicalissues, armed with a distinctive method—can be called hisinvention. Few other authors in the history of Western philosophy approximatehim in depth and range: perhaps only Aristotle (who studied with him),Aquinas, and Kant would be generally agreed to be of the same rank.",
+ "date": "2022",
+ "abstractNote": "Plato (429?–347 B.C.E.) is, by any reckoning, one of the mostdazzling writers in the Western literary tradition and one of the mostpenetrating, wide-ranging, and influential authors in the history ofphilosophy. An Athenian citizen of high status, he displays in hisworks his absorption in the political events and intellectualmovements of his time, but the questions he raises are so profound andthe strategies he uses for tackling them so richly suggestive andprovocative that educated readers of nearly every period have in someway been influenced by him, and in practically every age there havebeen philosophers who count themselves Platonists in some importantrespects. He was not the first thinker or writer to whom the word“philosopher” should be applied. But he was soself-conscious about how philosophy should be conceived, and what itsscope and ambitions properly are, and he so transformed theintellectual currents with which he grappled, that the subject ofphilosophy, as it is often conceived—a rigorous and systematicexamination of ethical, political, metaphysical, and epistemologicalissues, armed with a distinctive method—can be called hisinvention. Few other authors in the history of Western philosophyapproximate him in depth and range: perhaps only Aristotle (whostudied with him), Aquinas, and Kant would be generally agreed to beof the same rank.",
"bookTitle": "The Stanford Encyclopedia of Philosophy",
- "edition": "Spring 2015",
+ "edition": "Spring 2022",
"itemID": "sep-plato",
"libraryCatalog": "Stanford Encyclopedia of Philosophy",
"publisher": "Metaphysics Research Lab, Stanford University",
- "url": "https://plato.stanford.edu/archives/spr2015/entries/plato/",
+ "url": "https://plato.stanford.edu/archives/spr2022/entries/plato/",
+ "attachments": [
+ {
+ "title": "SEP - Snapshot",
+ "mimeType": "text/html"
+ }
+ ],
+ "tags": [
+ {
+ "tag": "Aristotle"
+ },
+ {
+ "tag": "Plato: ethics and politics in The Republic"
+ },
+ {
+ "tag": "Socrates"
+ },
+ {
+ "tag": "Socratic Dialogues"
+ },
+ {
+ "tag": "abstract objects"
+ },
+ {
+ "tag": "education, philosophy of"
+ },
+ {
+ "tag": "epistemology"
+ },
+ {
+ "tag": "metaphysics"
+ },
+ {
+ "tag": "religion: and morality"
+ }
+ ],
+ "notes": [],
+ "seeAlso": []
+ }
+ ]
+ },
+ {
+ "type": "web",
+ "url": "https://plato.stanford.edu/archives/win2022/entries/logic-classical/",
+ "items": [
+ {
+ "itemType": "bookSection",
+ "title": "Classical Logic",
+ "creators": [
+ {
+ "firstName": "Stewart",
+ "lastName": "Shapiro",
+ "creatorType": "author"
+ },
+ {
+ "firstName": "Teresa",
+ "lastName": "Kouri Kissel",
+ "creatorType": "author"
+ },
+ {
+ "firstName": "Edward N.",
+ "lastName": "Zalta",
+ "creatorType": "editor"
+ },
+ {
+ "firstName": "Uri",
+ "lastName": "Nodelman",
+ "creatorType": "editor"
+ }
+ ],
+ "date": "2022",
+ "abstractNote": "Typically, a logic consists of a formal or informal languagetogether with a deductive system and/or a model-theoretic semantics.The language has components that correspond to a part of a naturallanguage like English or Greek. The deductive system is to capture,codify, or simply record arguments that are validfor the given language, and the semantics is to capture, codify, orrecord the meanings, or truth-conditions for at least part of thelanguage.",
+ "bookTitle": "The Stanford Encyclopedia of Philosophy",
+ "edition": "Winter 2022",
+ "itemID": "sep-logic-classical",
+ "libraryCatalog": "Stanford Encyclopedia of Philosophy",
+ "publisher": "Metaphysics Research Lab, Stanford University",
+ "url": "https://plato.stanford.edu/archives/win2022/entries/logic-classical/",
"attachments": [
{
"title": "SEP - Snapshot",
@@ -138,15 +224,57 @@ var testCases = [
}
],
"tags": [
- "Aristotle",
- "Plato: ethics and politics in The Republic",
- "Socrates",
- "Socratic Dialogues",
- "abstract objects",
- "education, philosophy of",
- "epistemology",
- "metaphysics",
- "religion: and morality"
+ {
+ "tag": "logic: free"
+ },
+ {
+ "tag": "logic: infinitary"
+ },
+ {
+ "tag": "logic: intuitionistic"
+ },
+ {
+ "tag": "logic: linear"
+ },
+ {
+ "tag": "logic: modal"
+ },
+ {
+ "tag": "logic: paraconsistent"
+ },
+ {
+ "tag": "logic: relevance"
+ },
+ {
+ "tag": "logic: second-order and higher-order"
+ },
+ {
+ "tag": "logic: substructural"
+ },
+ {
+ "tag": "logic: temporal"
+ },
+ {
+ "tag": "logical consequence"
+ },
+ {
+ "tag": "logical form"
+ },
+ {
+ "tag": "logical truth"
+ },
+ {
+ "tag": "model theory"
+ },
+ {
+ "tag": "model theory: first-order"
+ },
+ {
+ "tag": "paradox: Skolem’s"
+ },
+ {
+ "tag": "proof theory: development of"
+ }
],
"notes": [],
"seeAlso": []
@@ -154,4 +282,4 @@ var testCases = [
]
}
]
-/** END TEST CASES **/
\ No newline at end of file
+/** END TEST CASES **/
From ab8a83ebba9a165ad44ace10b24c582c1bd52424 Mon Sep 17 00:00:00 2001
From: Sebastian Karcher
Date: Sat, 20 May 2023 14:36:41 -0400
Subject: [PATCH 030/125] Add CFF export (#3032)
---
CFF.js | 113 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 113 insertions(+)
create mode 100644 CFF.js
diff --git a/CFF.js b/CFF.js
new file mode 100644
index 00000000000..8ce6213d1bc
--- /dev/null
+++ b/CFF.js
@@ -0,0 +1,113 @@
+{
+ "translatorID": "e782b521-99ed-47c7-b021-62351a0a4f91",
+ "label": "CFF",
+ "creator": "Sebastian Karcher",
+ "target": "cff",
+ "minVersion": "5.0",
+ "maxVersion": "",
+ "priority": 100,
+ "inRepository": true,
+ "translatorType": 2,
+ "lastUpdated": "2023-05-04 13:21:10"
+}
+
+/*
+ ***** BEGIN LICENSE BLOCK *****
+
+ Copyright © 2023 Sebastian Karcher
+
+ This file is part of Zotero.
+
+ Zotero is free software: you can redistribute it and/or modify
+ it under the terms of the GNU Affero General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ Zotero is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU Affero General Public License for more details.
+
+ You should have received a copy of the GNU Affero General Public License
+ along with Zotero. If not, see >>4&15)+m.charAt(15&_);return f}function rstr2binl(d){for(var _=Array(d.length>>2),m=0;m<_.length;m++)_[m]=0;for(m=0;m<8*d.length;m+=8)_[m>>5]|=(255&d.charCodeAt(m/8))<>5]>>>m%32&255);return _}function binl_md5(d,_){d[_>>5]|=128<<_%32,d[14+(_+64>>>9<<4)]=_;for(var m=1732584193,f=-271733879,r=-1732584194,i=271733878,n=0;n>16)+(_>>16)+(m>>16)<<16|65535&m}function bit_rol(d,_){return d<<_|d>>>32-_}return rstr2hex(binl2rstr(binl_md5(rstr2binl(d),8*d.length)))}
+/* eslint-enable */
+
/** BEGIN TEST CASES **/
var testCases = [
{
From 6bae3cf344e3213879fda975ab5db7c13093e4c4 Mon Sep 17 00:00:00 2001
From: Dan Stillman
Date: Mon, 12 Jun 2023 01:59:49 -0400
Subject: [PATCH 033/125] Update `ecmaVersion` to 2018
Spread operator, async iteration, and some other things that were
supported in Firefox 60 (where these still have to run until Zotero 7)
---
.eslintrc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.eslintrc b/.eslintrc
index 4369f8576a7..3ad2bebfd66 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -7,7 +7,7 @@
"@zotero"
],
"parserOptions": {
- "ecmaVersion": 2017
+ "ecmaVersion": 2018
},
"globals": {
"Zotero": "readonly",
From e9a8ceacc26ddec57aff4930f1c5cb5c7a135939 Mon Sep 17 00:00:00 2001
From: Abe Jellinek
Date: Mon, 12 Jun 2023 10:52:55 -0400
Subject: [PATCH 034/125] Update Web of Science Nextgen SID extraction
Fixes #3050
---
Web of Science Nextgen.js | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Web of Science Nextgen.js b/Web of Science Nextgen.js
index e1e828e3bd2..dffe5e1140a 100644
--- a/Web of Science Nextgen.js
+++ b/Web of Science Nextgen.js
@@ -9,7 +9,7 @@
"inRepository": true,
"translatorType": 4,
"browserSupport": "gcsibv",
- "lastUpdated": "2022-04-22 20:47:13"
+ "lastUpdated": "2023-06-12 14:52:18"
}
/*
@@ -156,7 +156,7 @@ function getItemID(url) {
}
function getSessionID(doc, callback) {
- const sidRegex = /sid=([a-zA-Z0-9]+)/i;
+ const sidRegex = /(?:sid=|"SID":")([a-zA-Z0-9]+)/i;
// session ID is embedded in the static page inside an inline