citation-js 0.5.1 → 0.5.2

package/build/citation.js

@@ -2854,19 +2854,11 @@ var TypeParser = function () {
       var constraints = [].concat(this.data.propertyConstraint || []);
       return constraints.map(function (_ref) {
         var props = _ref.props,
-            _ref$match = _ref.match,
-            match = _ref$match === void 0 ? 'every' : _ref$match,
+            match = _ref.match,
             value = _ref.value;
         props = [].concat(props);
 
         switch (match) {
-          case 'every':
-            return function (input) {
-              return props.every(function (prop) {
-                return prop in input && (!value || value(input[prop]));
-              });
-            };
-
           case 'any':
           case 'some':
             return function (input) {
@@ -2881,6 +2873,14 @@ var TypeParser = function () {
                 return prop in input && (!value || value(input[prop]));
               });
             };
+
+          case 'every':
+          default:
+            return function (input) {
+              return props.every(function (prop) {
+                return prop in input && (!value || value(input[prop]));
+              });
+            };
         }
       });
     }
@@ -4204,7 +4204,7 @@ Translator.CONVERT_TO_TARGET = Symbol('convert to target');
 },{}],43:[function(require,module,exports){
 module.exports={
   "name": "@citation-js/core",
-  "version": "0.5.1",
+  "version": "0.5.2",
   "description": "Convert different bibliographic metadata sources",
   "keywords": [
     "citation-js",
@@ -4243,7 +4243,7 @@ module.exports={
   "devDependencies": {
     "@babel/plugin-proposal-class-properties": "^7.12.1"
   },
-  "gitHead": "3f3eee0813c7d578a454c34e402fa342d0693cfa"
+  "gitHead": "a902e8781abc685e8f99dbb9c5d35424bb02065c"
 }
 
 },{}],44:[function(require,module,exports){
@@ -7332,7 +7332,7 @@ var _default = new _core.util.Translator([].concat(aliases, nonSpec, [{
   target: 'issued',
   convert: _shared.Converters.DATE
 }, {
-  source: ['year', 'month'],
+  source: ['year', 'month', 'day'],
   target: 'issued',
   convert: _shared.Converters.YEAR_MONTH,
   when: {
@@ -7718,7 +7718,7 @@ var _default = new _core.util.Translator([{
     }
   }
 }, {
-  source: ['year', 'month'],
+  source: ['year', 'month', 'day'],
   target: 'issued',
   convert: _shared.Converters.YEAR_MONTH
 }, {
@@ -8344,11 +8344,15 @@ var Converters = {
     }
   },
   YEAR_MONTH: {
-    toTarget: function toTarget(year, month) {
+    toTarget: function toTarget(year, month, day) {
       if (isNaN(+year)) {
         return {
           literal: year
         };
+      } else if (!isNaN(+day) && !isNaN(+month)) {
+        return {
+          'date-parts': [[+year, +month, +day]]
+        };
       } else {
         return {
           'date-parts': [[+year].concat(_toConsumableArray(parseMonth(month)))]
@@ -8984,6 +8988,16 @@ for (var format in _citeproc["default"].Output.Formats) {
   _citeproc["default"].Output.Formats[format]['@bibliography/entry'] = getWrapperProxy(original);
 }
 
+function retrieveLocale(lang) {
+  var unnormalised = lang.replace('-', '_');
+
+  if (_locales.locales.has(lang)) {
+    return _locales.locales.get(lang);
+  } else if (_locales.locales.has(unnormalised)) {
+    return _locales.locales.get(unnormalised);
+  }
+}
+
 var engines = {};
 
 var fetchEngine = function fetchEngine(style, lang, template, retrieveItem, retrieveLocale) {
@@ -9017,7 +9031,7 @@ var prepareEngine = function prepareEngine(data, templateName, language, format)
   language = _locales.locales.has(language) ? language : 'en-US';
   var engine = fetchEngine(templateName, language, template, function (key) {
     return items[key];
-  }, _locales.locales.get.bind(_locales.locales));
+  }, retrieveLocale);
   engine.setOutputFormat(format);
   return engine;
 };
@@ -16055,18 +16069,18 @@ function completeResponse(entities, old) {
   if (!old) {
     var allIds = [];
 
-    for (var _id2 in entities) {
-      var _ids = collectAdditionalIds(entities[_id2], FETCH_ADDITIONAL);
+    for (var id in entities) {
+      var _ids = collectAdditionalIds(entities[id], FETCH_ADDITIONAL);
 
       var _iterator = _createForOfIteratorHelper(_ids),
           _step;
 
       try {
         for (_iterator.s(); !(_step = _iterator.n()).done;) {
-          var _id3 = _step.value;
+          var _id2 = _step.value;
 
-          if (!allIds.includes(_id3)) {
-            allIds.push(_id3);
+          if (!allIds.includes(_id2)) {
+            allIds.push(_id2);
           }
         }
       } catch (err) {
@@ -16086,8 +16100,8 @@ function completeResponse(entities, old) {
 
   try {
     for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
-      var id = _step2.value;
-      var entity = entities[id];
+      var _id3 = _step2.value;
+      var entity = entities[_id3];
 
       if (!entity._needed) {
         continue;
@@ -35728,6 +35742,12 @@ var truthyPropertyClaims = function truthyPropertyClaims(propClaims) {
   return aggregate.preferred || aggregate.normal || [];
 };
 
+var nonDeprecatedPropertyClaims = function nonDeprecatedPropertyClaims(propClaims) {
+  return propClaims.filter(function (claim) {
+    return claim.rank !== 'deprecated';
+  });
+};
+
 var aggregatePerRank = function aggregatePerRank(aggregate, claim) {
   var rank = claim.rank;
   aggregate[rank] || (aggregate[rank] = []);
@@ -35745,7 +35765,8 @@ var truthyClaims = function truthyClaims(claims) {
 
 module.exports = {
   truthyClaims: truthyClaims,
-  truthyPropertyClaims: truthyPropertyClaims
+  truthyPropertyClaims: truthyPropertyClaims,
+  nonDeprecatedPropertyClaims: nonDeprecatedPropertyClaims
 };
 
 },{}],509:[function(require,module,exports){
@@ -35827,7 +35848,8 @@ var _require2 = require('../utils/utils'),
     uniq = _require2.uniq;
 
 var _require3 = require('./rank'),
-    truthyPropertyClaims = _require3.truthyPropertyClaims;
+    truthyPropertyClaims = _require3.truthyPropertyClaims,
+    nonDeprecatedPropertyClaims = _require3.nonDeprecatedPropertyClaims;
 
 var simplifyClaims = function simplifyClaims(claims) {
   for (var _len = arguments.length, options = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
@@ -35861,9 +35883,12 @@ var simplifyPropertyClaims = function simplifyPropertyClaims(propClaims) {
 
   var _parseOptions2 = parseOptions(options),
       keepNonTruthy = _parseOptions2.keepNonTruthy,
+      keepNonDeprecated = _parseOptions2.keepNonDeprecated,
       areSubSnaks = _parseOptions2.areSubSnaks;
 
-  if (!(keepNonTruthy || areSubSnaks)) {
+  if (keepNonDeprecated) {
+    propClaims = nonDeprecatedPropertyClaims(propClaims);
+  } else if (!(keepNonTruthy || areSubSnaks)) {
     propClaims = truthyPropertyClaims(propClaims);
   }
 
@@ -36181,6 +36206,11 @@ module.exports = function (sitelinks) {
 
 var aggregateValues = function aggregateValues(sitelinks, addUrl) {
   return function (index, key) {
+    if (sitelinks[key] == null) {
+      index[key] = sitelinks[key];
+      return index;
+    }
+
     var title = sitelinks[key].title;
 
     if (addUrl) {
@@ -36572,7 +36602,7 @@ module.exports = {
 },{"../utils/utils":531,"./helpers":505,"./sitelinks_languages":518}],518:[function(require,module,exports){
 "use strict";
 
-module.exports = ['aa', 'ab', 'ace', 'ady', 'af', 'ak', 'als', 'alt', 'am', 'ang', 'an', 'arc', 'ar', 'ary', 'arz', 'ast', 'as', 'atj', 'avk', 'av', 'awa', 'ay', 'azb', 'az', 'ban', 'bar', 'bat_smg', 'ba', 'bcl', 'be_x_old', 'be', 'bg', 'bh', 'bi', 'bjn', 'bm', 'bn', 'bo', 'bpy', 'br', 'bs', 'bug', 'bxr', 'ca', 'cbk_zam', 'cdo', 'ceb', 'ce', 'cho', 'chr', 'ch', 'chy', 'ckb', 'co', 'crh', 'cr', 'csb', 'cs', 'cu', 'cv', 'cy', 'da', 'de', 'din', 'diq', 'dsb', 'dty', 'dv', 'dz', 'ee', 'el', 'eml', 'en', 'eo', 'es', 'et', 'eu', 'ext', 'fa', 'ff', 'fiu_vro', 'fi', 'fj', 'fo', 'frp', 'frr', 'fr', 'fur', 'fy', 'gag', 'gan', 'ga', 'gcr', 'gd', 'glk', 'gl', 'gn', 'gom', 'gor', 'got', 'gu', 'gv', 'hak', 'ha', 'haw', 'he', 'hif', 'hi', 'ho', 'hr', 'hsb', 'ht', 'hu', 'hy', 'hyw', 'hz', 'ia', 'id', 'ie', 'ig', 'ii', 'ik', 'ilo', 'inh', 'io', 'is', 'it', 'iu', 'jam', 'ja', 'jbo', 'jv', 'kaa', 'kab', 'ka', 'kbd', 'kbp', 'kg', 'ki', 'kj', 'kk', 'kl', 'km', 'kn', 'koi', 'ko', 'krc', 'kr', 'ksh', 'ks', 'ku', 'kv', 'kw', 'ky', 'lad', 'la', 'lbe', 'lb', 'lez', 'lfn', 'lg', 'lij', 'li', 'lld', 'lmo', 'ln', 'lo', 'lrc', 'ltg', 'lt', 'lv', 'mad', 'mai', 'map_bms', 'mdf', 'mg', 'mhr', 'mh', 'min', 'mi', 'mk', 'ml', 'mni', 'mn', 'mnw', 'mo', 'mrj', 'mr', 'ms', 'mt', 'mus', 'mwl', 'myv', 'my', 'mzn', 'nah', 'nap', 'na', 'nds_nl', 'nds', 'ne', 'new', 'ng', 'nia', 'nl', 'nn', 'nov', 'no', 'nqo', 'nrm', 'nso', 'nv', 'ny', 'oc', 'olo', 'om', 'or', 'os', 'pag', 'pam', 'pap', 'pa', 'pcd', 'pdc', 'pfl', 'pih', 'pi', 'pl', 'pms', 'pnb', 'pnt', 'ps', 'pt', 'qu', 'rm', 'rmy', 'rn', 'roa_rup', 'roa_tara', 'ro', 'rue', 'ru', 'rw', 'sah', 'sat', 'sa', 'scn', 'sco', 'sc', 'sd', 'se', 'sg', 'shn', 'sh', 'shy', 'simple', 'si', 'skr', 'sk', 'sl', 'smn', 'sm', 'sn', 'sources', 'so', 'sq', 'srn', 'sr', 'ss', 'stq', 'st', 'su', 'sv', 'sw', 'szl', 'szy', 'ta', 'tay', 'tcy', 'tet', 'te', 'tg', 'th', 'ti', 'tk', 'tl', 'tn', 'to', 'tpi', 'trv', 'tr', 'ts', 'tt', 'tum', 'tw', 'tyv', 'ty', 'udm', 'ug', 'uk', 'ur', 'uz', 'vec', 'vep', 've', 'vi', 'vls', 'vo', 'war', 'wa', 'wo', 'wuu', 'xal', 'xh', 'xmf', 'yi', 'yo', 'yue', 'za', 'zea', 'zh_classical', 'zh_min_nan', 'zh_yue', 'zh', 'zu'];
+module.exports = ['aa', 'ab', 'ace', 'ady', 'af', 'ak', 'als', 'alt', 'am', 'ang', 'an', 'arc', 'ar', 'ary', 'arz', 'ast', 'as', 'atj', 'avk', 'av', 'awa', 'ay', 'azb', 'az', 'ban', 'bar', 'bat_smg', 'ba', 'bcl', 'be_x_old', 'be', 'bg', 'bh', 'bi', 'bjn', 'bm', 'bn', 'bo', 'bpy', 'br', 'bs', 'bug', 'bxr', 'ca', 'cbk_zam', 'cdo', 'ceb', 'ce', 'cho', 'chr', 'ch', 'chy', 'ckb', 'co', 'crh', 'cr', 'csb', 'cs', 'cu', 'cv', 'cy', 'dag', 'da', 'de', 'din', 'diq', 'dsb', 'dty', 'dv', 'dz', 'ee', 'el', 'eml', 'en', 'eo', 'es', 'et', 'eu', 'ext', 'fa', 'ff', 'fiu_vro', 'fi', 'fj', 'fo', 'frp', 'frr', 'fr', 'fur', 'fy', 'gag', 'gan', 'ga', 'gcr', 'gd', 'glk', 'gl', 'gn', 'gom', 'gor', 'got', 'gu', 'gv', 'hak', 'ha', 'haw', 'he', 'hif', 'hi', 'ho', 'hr', 'hsb', 'ht', 'hu', 'hy', 'hyw', 'hz', 'ia', 'id', 'ie', 'ig', 'ii', 'ik', 'ilo', 'inh', 'io', 'is', 'it', 'iu', 'jam', 'ja', 'jbo', 'jv', 'kaa', 'kab', 'ka', 'kbd', 'kbp', 'kg', 'ki', 'kj', 'kk', 'kl', 'km', 'kn', 'koi', 'ko', 'krc', 'kr', 'ksh', 'ks', 'ku', 'kv', 'kw', 'ky', 'lad', 'la', 'lbe', 'lb', 'lez', 'lfn', 'lg', 'lij', 'li', 'lld', 'lmo', 'ln', 'lo', 'lrc', 'ltg', 'lt', 'lv', 'mad', 'mai', 'map_bms', 'mdf', 'mg', 'mhr', 'mh', 'min', 'mi', 'mk', 'ml', 'mni', 'mn', 'mnw', 'mo', 'mrj', 'mr', 'ms', 'mt', 'mus', 'mwl', 'myv', 'my', 'mzn', 'nah', 'nap', 'na', 'nds_nl', 'nds', 'ne', 'new', 'ng', 'nia', 'nl', 'nn', 'nov', 'no', 'nqo', 'nrm', 'nso', 'nv', 'ny', 'oc', 'olo', 'om', 'or', 'os', 'pag', 'pam', 'pap', 'pa', 'pcd', 'pdc', 'pfl', 'pih', 'pi', 'pl', 'pms', 'pnb', 'pnt', 'ps', 'pt', 'qu', 'rm', 'rmy', 'rn', 'roa_rup', 'roa_tara', 'ro', 'rue', 'ru', 'rw', 'sah', 'sat', 'sa', 'scn', 'sco', 'sc', 'sd', 'se', 'sg', 'shi', 'shn', 'sh', 'shy', 'simple', 'si', 'skr', 'sk', 'sl', 'smn', 'sm', 'sn', 'sources', 'so', 'sq', 'srn', 'sr', 'ss', 'stq', 'st', 'su', 'sv', 'sw', 'szl', 'szy', 'ta', 'tay', 'tcy', 'tet', 'te', 'tg', 'th', 'ti', 'tk', 'tl', 'tn', 'to', 'tpi', 'trv', 'tr', 'ts', 'tt', 'tum', 'tw', 'tyv', 'ty', 'udm', 'ug', 'uk', 'ur', 'uz', 'vec', 'vep', 've', 'vi', 'vls', 'vo', 'war', 'wa', 'wo', 'wuu', 'xal', 'xh', 'xmf', 'yi', 'yo', 'yue', 'za', 'zea', 'zh_classical', 'zh_min_nan', 'zh_yue', 'zh', 'zu'];
 
 },{}],519:[function(require,module,exports){
 "use strict";
@@ -36842,7 +36872,7 @@ var validate = require('../helpers/validate');
 var _require = require('../utils/utils'),
     isPlainObject = _require.isPlainObject;
 
-module.exports = function (instance) {
+module.exports = function (instance, wgScriptPath) {
   return function (id, revision) {
     if (isPlainObject(id)) {
       revision = id.revision;
@@ -36851,7 +36881,7 @@ module.exports = function (instance) {
 
     validate.entityId(id);
     validate.revisionId(revision);
-    return "".concat(instance, "/w/index.php?title=Special:EntityData/").concat(id, ".json&revision=").concat(revision);
+    return "".concat(instance, "/").concat(wgScriptPath, "/index.php?title=Special:EntityData/").concat(id, ".json&revision=").concat(revision);
   };
 };
 
@@ -37140,6 +37170,9 @@ var WBK = function WBK(config) {
   if (!isPlainObject(config)) throw new Error('invalid config');
   var instance = config.instance,
       sparqlEndpoint = config.sparqlEndpoint;
+  var _config$wgScriptPath = config.wgScriptPath,
+      wgScriptPath = _config$wgScriptPath === void 0 ? 'w' : _config$wgScriptPath;
+  wgScriptPath = wgScriptPath.replace(/^\//, '');
 
   if (!(instance || sparqlEndpoint)) {
     throw new Error("one of instance or sparqlEndpoint should be set at initialization.\n".concat(tip));
@@ -37149,8 +37182,8 @@ var WBK = function WBK(config) {
 
   if (instance) {
     validateEndpoint('instance', instance);
-    instanceRoot = instance.replace(/\/$/, '').replace('/w/api.php', '');
-    instanceApiEndpoint = "".concat(instanceRoot, "/w/api.php");
+    instanceRoot = instance.replace(/\/$/, '').replace("/".concat(wgScriptPath, "/api.php"), '');
+    instanceApiEndpoint = "".concat(instanceRoot, "/").concat(wgScriptPath, "/api.php");
 
     var buildUrl = require('./utils/build_url')(instanceApiEndpoint);
 
@@ -37160,7 +37193,7 @@ var WBK = function WBK(config) {
       getEntities: require('./queries/get_entities')(buildUrl),
       getManyEntities: require('./queries/get_many_entities')(buildUrl),
       getRevisions: require('./queries/get_revisions')(buildUrl),
-      getEntityRevision: require('./queries/get_entity_revision')(instance),
+      getEntityRevision: require('./queries/get_entity_revision')(instance, wgScriptPath),
       getEntitiesFromSitelinks: require('./queries/get_entities_from_sitelinks')(buildUrl)
     };
   } else {