citation-js 0.7.11 → 0.7.13

package/build/citation.js

@@ -2783,14 +2783,20 @@ function _interopRequireDefault(obj) {
     "default": obj
   };
 }
-var _ref = (0, _fetchPonyfill["default"])(),
-  fetch = _ref.fetch,
-  Headers = _ref.Headers;
-var corsEnabled = typeof location !== 'undefined' && typeof document !== 'undefined';
-var userAgent = corsEnabled ? '' : "Citation.js/".concat(_package["default"].version, " Node.js/").concat(process.version);
+var isBrowser = typeof location !== 'undefined' && typeof navigator !== 'undefined';
+var _ref = typeof fetch === 'function' && isBrowser ? {
+    fetch: fetch,
+    Headers: Headers
+  } : (0, _fetchPonyfill["default"])(),
+  asyncFetch = _ref.fetch,
+  asyncHeaders = _ref.Headers;
+var userAgent = "Citation.js/".concat(_package["default"].version);
+if (process && process.release && process.release.name === 'node' && process.version) {
+  userAgent += " Node.js/".concat(process.version);
+}
 function normaliseHeaders(headers) {
   var result = {};
-  var entries = headers instanceof Headers || headers instanceof _syncFetch["default"].Headers ? Array.from(headers) : Object.entries(headers);
+  var entries = headers instanceof asyncHeaders || headers instanceof _syncFetch["default"].Headers ? Array.from(headers) : Object.entries(headers);
   var _iterator = _createForOfIteratorHelper(entries),
     _step;
   try {
@@ -2816,7 +2822,7 @@ function parseOpts() {
     method: 'GET',
     checkContentType: opts.checkContentType
   };
-  if (userAgent && !corsEnabled) {
+  if (userAgent && !isBrowser) {
     reqOpts.headers['user-agent'] = userAgent;
   }
   if (opts.body) {
@@ -2881,7 +2887,7 @@ function _fetchFileAsync() {
         case 0:
           reqOpts = parseOpts(opts);
           _logger["default"].http('[core]', reqOpts.method, url, reqOpts);
-          return _context.abrupt("return", fetch(url, reqOpts).then(function (response) {
+          return _context.abrupt("return", asyncFetch(url, reqOpts).then(function (response) {
             return checkResponse(response, reqOpts);
           }).then(function (response) {
             return response.text();
@@ -3426,7 +3432,7 @@ Translator.CONVERT_TO_TARGET = Symbol('convert to target');
 },{}],43:[function(require,module,exports){
 module.exports={
   "name": "@citation-js/core",
-  "version": "0.7.11",
+  "version": "0.7.13",
   "description": "Convert different bibliographic metadata sources",
   "keywords": [
     "citation-js",
@@ -3466,7 +3472,7 @@ module.exports={
     "fetch-ponyfill": "^7.1.0",
     "sync-fetch": "^0.4.1"
   },
-  "gitHead": "a92f6b3c20b9342feb0303a017b806b312d66486"
+  "gitHead": "9259e28a219854228c394f278c4973ee911d2bef"
 }
 
 },{}],44:[function(require,module,exports){
@@ -4269,6 +4275,7 @@ var _default = exports["default"] = {
   },
   format: {
     useIdAsLabel: false,
+    checkLabel: true,
     asciiOnly: true
   },
   biber: {
@@ -7268,6 +7275,20 @@ function _interopRequireDefault(obj) {
 var stopWords = new Set(['the', 'a', 'an']);
 var unsafeChars = /(?:<\/?.*?>|[\u0020-\u002F\u003A-\u0040\u005B-\u005E\u0060\u007B-\u007F])+/g;
 var unicode = /[^\u0020-\u007F]+/g;
+function isLabelSafe(text) {
+  return !_config["default"].format.checkLabel || !text.match(unsafeChars);
+}
+function formatLabelFromId(id) {
+  if (id === null) {
+    return 'null';
+  } else if (id === undefined) {
+    return 'undefined';
+  } else if (_config["default"].format.checkLabel) {
+    return id.toString().replace(unsafeChars, '');
+  } else {
+    return id.toString();
+  }
+}
 function firstWord(text) {
   if (!text) {
     return '';
@@ -7498,21 +7519,12 @@ var Converters = exports.Converters = {
       return [label, label];
     },
     toSource: function toSource(id, label, author, issued, suffix, title) {
-      var safeId;
-      if (id === null) {
-        safeId = 'null';
-      } else if (id === undefined) {
-        safeId = 'undefined';
-      } else {
-        safeId = id.toString().replace(unsafeChars, '');
-      }
-      if (_config["default"].format.useIdAsLabel) {
-        return safeId;
-      }
-      if (label && !unsafeChars.test(label)) {
+      if (label && isLabelSafe(label)) {
         return label;
+      } else if (_config["default"].format.useIdAsLabel) {
+        return formatLabelFromId(id);
       } else {
-        return formatLabel(author, issued, suffix, title) || safeId;
+        return formatLabel(author, issued, suffix, title) || formatLabelFromId(id);
       }
     }
   },