citation-js 0.6.5 → 0.6.7

package/build/citation.js

@@ -5664,7 +5664,7 @@ var lexer = _moo["default"].states({
     text: /[^{$}\s~\\]+/
   }),
   namesLiteral: _objectSpread(_objectSpread({
-    and: /\s+and\s+/,
+    and: /\s+[aA][nN][dD]\s+/,
     comma: ',',
     hyphen: '-',
     equals: '='
@@ -7938,6 +7938,12 @@ function bibliography(data) {
 },{"./attr.js":77,"./engines.js":80,"@citation-js/core":10}],79:[function(require,module,exports){
 "use strict";
 
+function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
+function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
+function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
 Object.defineProperty(exports, "__esModule", {
   value: true
@@ -7950,6 +7956,28 @@ function _interopRequireDefault(obj) {
     "default": obj
   };
 }
+function prepareCiteItem(citeItem) {
+  return _typeof(citeItem) === 'object' ? citeItem : {
+    id: citeItem
+  };
+}
+function prepareCitation(citation) {
+  if (citation.citationItems) {
+    return citation;
+  }
+  return {
+    citationItems: [].concat(citation).map(prepareCiteItem),
+    properties: {
+      noteIndex: 0
+    }
+  };
+}
+function prepareCitations(context) {
+  if (!context) {
+    return [];
+  }
+  return context.map(prepareCitation);
+}
 function citation(data) {
   var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
   var _options$template = options.template,
@@ -7964,22 +7992,11 @@ function citation(data) {
   var entries = options.entry ? [].concat(options.entry) : ids;
   data = _core.util.downgradeCsl(data);
   var citeproc = (0, _engines["default"])(data, template, lang, format);
-  citeproc.updateItems(ids);
-  var _options$citationsPre = options.citationsPre,
-    citationsPre = _options$citationsPre === void 0 ? [] : _options$citationsPre,
-    _options$citationsPos = options.citationsPost,
-    citationsPost = _options$citationsPos === void 0 ? [] : _options$citationsPos;
-  var citation = citeproc.previewCitationCluster({
-    citationItems: entries.map(function (id) {
-      return _typeof(id) === 'object' ? id : {
-        id: id
-      };
-    }),
-    properties: {
-      noteIndex: 0
-    }
-  }, citationsPre, citationsPost, format);
-  return citation;
+  var before = prepareCitations(options.citationsPre);
+  var citation = prepareCitation(entries);
+  var after = prepareCitations(options.citationsPost);
+  var output = citeproc.rebuildProcessorState([].concat(_toConsumableArray(before), [citation], _toConsumableArray(after)), format, []);
+  return output[before.length][2];
 }
 
 },{"./engines.js":80,"@citation-js/core":10}],80:[function(require,module,exports){
@@ -8332,6 +8349,15 @@ var formats = {
       "extends": '@else/url'
     }
   },
+  '@doi/short-url': {
+    parse: function parse(url) {
+      return url.replace(/^(\s*)/, '$1https://');
+    },
+    parseType: {
+      dataType: 'String',
+      predicate: /^\s*((?:dx\.)?doi\.org\/(10.\d{4,9}\/[-._;()/:A-Z0-9]+))\s*$/i
+    }
+  },
   '@doi/id': {
     parse: id.parse,
     parseType: {