hexo-component-inferno 4.2.2 → 5.1.0

package/lib/view/share/bdshare.js

@@ -17,16 +17,19 @@ function _setPrototypeOf(t, e) { return _setPrototypeOf = Object.setPrototypeOf
 /**
  * Baidu share buttons JSX component.
  * @module view/share/bdshare
+ * @deprecated Retained for compatibility only. Use AddToAny or ShareThis instead.
  */
 var _require = require('inferno'),
   Component = _require.Component;
 var _require2 = require('../../util/cache'),
   cacheComponent = _require2.cacheComponent;
+var _require3 = require('../../util/deprecate'),
+  deprecate = _require3.deprecate;
 
 /**
  * Baidu share buttons JSX component.
  *
- * @see http://share.baidu.com/code
+ * @deprecated Legacy integration with HTTP mixed content and obsolete targets. Use AddToAny or ShareThis instead.
  * @example
  * <BdShare />
  */
@@ -39,40 +42,16 @@ var BdShare = /*#__PURE__*/function (_Component) {
   return _createClass(BdShare, [{
     key: "render",
     value: function render() {
-      var js = 'window._bd_share_config = { "common": { "bdSnsKey": {}, "bdText": "", "bdMini": "2", "bdPic": "", "bdStyle": "0", "bdSize": "16" }, "share": {} }; with (document) 0[(getElementsByTagName(\'head\')[0] || body).appendChild(createElement(\'script\')).src = \'http://bdimg.share.baidu.com/static/api/js/share.js?v=89860593.js?cdnversion=\' + ~(-new Date() / 36e5)];';
-      return (0, _inferno.createFragment)([(0, _inferno.createVNode)(1, "div", "bdsharebuttonbox", [(0, _inferno.createVNode)(1, "a", "bds_more", null, 1, {
-        "href": "#",
-        "data-cmd": "more"
-      }), (0, _inferno.createVNode)(1, "a", "bds_qzone", null, 1, {
-        "href": "#",
-        "data-cmd": "qzone",
-        "title": "分享到QQ空间"
-      }), (0, _inferno.createVNode)(1, "a", "bds_tsina", null, 1, {
-        "href": "#",
-        "data-cmd": "tsina",
-        "title": "分享到新浪微博"
-      }), (0, _inferno.createVNode)(1, "a", "bds_tqq", null, 1, {
-        "href": "#",
-        "data-cmd": "tqq",
-        "title": "分享到腾讯微博"
-      }), (0, _inferno.createVNode)(1, "a", "bds_renren", null, 1, {
-        "href": "#",
-        "data-cmd": "renren",
-        "title": "分享到人人网"
-      }), (0, _inferno.createVNode)(1, "a", "bds_weixin", null, 1, {
-        "href": "#",
-        "data-cmd": "weixin",
-        "title": "分享到微信"
-      })], 4), (0, _inferno.createVNode)(1, "script", null, null, 1, {
-        "dangerouslySetInnerHTML": {
-          __html: js
-        }
-      })], 4);
+      deprecate('share.bdshare', 'HTTP mixed content; use AddToAny or ShareThis.');
+      return (0, _inferno.createVNode)(1, "div", "notification is-danger", [(0, _inferno.createTextVNode)("This legacy Baidu Share integration is deprecated because it uses HTTP assets and obsolete sharing targets. Set "), (0, _inferno.createVNode)(1, "code", null, "share.type", 16), (0, _inferno.createTextVNode)(" to "), (0, _inferno.createVNode)(1, "code", null, "web_share", 16), (0, _inferno.createTextVNode)(","), (0, _inferno.createTextVNode)(' '), (0, _inferno.createVNode)(1, "code", null, "addtoany", 16), (0, _inferno.createTextVNode)(", or "), (0, _inferno.createVNode)(1, "code", null, "sharethis", 16), (0, _inferno.createTextVNode)(".")], 0, {
+        "role": "status"
+      });
     }
   }]);
 }(Component);
 /**
  * Cacheable Baidu share buttons JSX component.
+ * @deprecated Retained for compatibility only. Use AddToAny or ShareThis instead.
  * <p>
  * This class is supposed to be used in combination with the <code>locals</code> hexo filter
  * ({@link module:hexo/filter/locals}).

package/lib/view/share/sharejs.js

@@ -15,21 +15,15 @@ function _getPrototypeOf(t) { return _getPrototypeOf = Object.setPrototypeOf ? O
 function _inherits(t, e) { if ("function" != typeof e && null !== e) throw new TypeError("Super expression must either be null or a function"); t.prototype = Object.create(e && e.prototype, { constructor: { value: t, writable: !0, configurable: !0 } }), Object.defineProperty(t, "prototype", { writable: !1 }), e && _setPrototypeOf(t, e); }
 function _setPrototypeOf(t, e) { return _setPrototypeOf = Object.setPrototypeOf ? Object.setPrototypeOf.bind() : function (t, e) { return t.__proto__ = e, t; }, _setPrototypeOf(t, e); }
 /**
- * Share.js share buttons JSX component.
+ * Retired Share.js configuration entry.
  * @module view/share/sharejs
  */
 var _require = require('inferno'),
   Component = _require.Component;
 var _require2 = require('../../util/cache'),
   cacheComponent = _require2.cacheComponent;
-
-/**
- * Share.js share buttons JSX component.
- *
- * @see https://github.com/overtrue/share.js
- * @example
- * <ShareJs cssUrl="/path/to/share.css" jsUrl="/path/to/social-share.js" />
- */
+var _require3 = require('../../util/deprecate'),
+  deprecate = _require3.deprecate;
 var ShareJs = /*#__PURE__*/function (_Component) {
   function ShareJs() {
     _classCallCheck(this, ShareJs);
@@ -39,33 +33,12 @@ var ShareJs = /*#__PURE__*/function (_Component) {
   return _createClass(ShareJs, [{
     key: "render",
     value: function render() {
-      var _this$props = this.props,
-        cssUrl = _this$props.cssUrl,
-        jsUrl = _this$props.jsUrl;
-      return (0, _inferno.createFragment)([(0, _inferno.createVNode)(1, "link", null, null, 1, {
-        "rel": "stylesheet",
-        "href": cssUrl
-      }), (0, _inferno.createVNode)(1, "div", "social-share"), (0, _inferno.createVNode)(1, "script", null, null, 1, {
-        "src": jsUrl
-      })], 4);
+      deprecate('share.sharejs', 'Retired; select web_share or addtoany.');
+      return (0, _inferno.createVNode)(1, "div", "notification is-danger", [(0, _inferno.createTextVNode)("Share.js is retired. Set "), (0, _inferno.createVNode)(1, "code", null, "share.type", 16), (0, _inferno.createTextVNode)(" to "), (0, _inferno.createVNode)(1, "code", null, "web_share", 16), (0, _inferno.createTextVNode)(" or"), (0, _inferno.createTextVNode)(' '), (0, _inferno.createVNode)(1, "code", null, "addtoany", 16), (0, _inferno.createTextVNode)(".")], 0);
     }
   }]);
 }(Component);
-/**
- * Cacheable Share.js share buttons JSX component.
- * <p>
- * This class is supposed to be used in combination with the <code>locals</code> hexo filter
- * ({@link module:hexo/filter/locals}).
- *
- * @see module:util/cache.cacheComponent
- * @example
- * <ShareJs.Cacheable helper={{ cdn: function() {...} }} />
- */
-ShareJs.Cacheable = cacheComponent(ShareJs, 'share.sharejs', function (props) {
-  var helper = props.helper;
-  return {
-    cssUrl: helper.cdn('social-share.js', '1.0.16', 'dist/css/share.min.css'),
-    jsUrl: helper.cdn('social-share.js', '1.0.16', 'dist/js/social-share.min.js')
-  };
+ShareJs.Cacheable = cacheComponent(ShareJs, 'share.sharejs', function () {
+  return {};
 });
 module.exports = ShareJs;

package/lib/view/share/sharethis.js

@@ -22,6 +22,7 @@ var _require = require('inferno'),
   Component = _require.Component;
 var _require2 = require('../../util/cache'),
   cacheComponent = _require2.cacheComponent;
+var loadScripts = require('../../util/script');
 
 /**
  * ShareThis share buttons JSX component.
@@ -39,13 +40,23 @@ var ShareThis = /*#__PURE__*/function (_Component) {
   return _createClass(ShareThis, [{
     key: "render",
     value: function render() {
-      var installUrl = this.props.installUrl;
+      var _this$props = this.props,
+        installUrl = _this$props.installUrl,
+        url = _this$props.url,
+        title = _this$props.title;
       if (!installUrl) {
         return (0, _inferno.createVNode)(1, "div", "notification is-danger", [(0, _inferno.createTextVNode)("You need to set "), (0, _inferno.createVNode)(1, "code", null, "install_url", 16), (0, _inferno.createTextVNode)(" to use ShareThis. Please set it in"), (0, _inferno.createTextVNode)(' '), (0, _inferno.createVNode)(1, "code", null, "_config.yml", 16), (0, _inferno.createTextVNode)(".")], 0);
       }
-      return (0, _inferno.createFragment)([(0, _inferno.createVNode)(1, "div", "sharethis-inline-share-buttons"), (0, _inferno.createVNode)(1, "script", null, null, 1, {
-        "src": installUrl,
-        "defer": true
+      var initialize = "\n      if (!container || !container.isConnected || container.querySelector('.st-btn')) return;\n      var sdk = window.__sharethis__;\n      // Reuse the account settings when PJAX replaces the container.\n      if (sdk && sdk.config && typeof sdk.load === 'function') {\n        var settings = Object.assign({}, sdk.config['inline-share-buttons']);\n        if (container.dataset.url) settings.url = container.dataset.url;\n        if (container.dataset.title) settings.title = container.dataset.title;\n        sdk.load('inline-share-buttons', settings);\n      }";
+      return (0, _inferno.createFragment)([(0, _inferno.createVNode)(1, "div", "sharethis-inline-share-buttons", null, 1, {
+        "id": "sharethis-share",
+        "data-share-provider": "sharethis",
+        "data-url": url,
+        "data-title": title
+      }), (0, _inferno.createVNode)(1, "script", null, null, 1, {
+        "dangerouslySetInnerHTML": {
+          __html: "(function () {\n          var container = document.getElementById('sharethis-share');\n          ".concat(loadScripts(installUrl, initialize), "\n        })();")
+        }
       })], 4);
     }
   }]);
@@ -61,9 +72,13 @@ var ShareThis = /*#__PURE__*/function (_Component) {
  * <ShareThis.Cacheable share={{ install_url: '******' }} />
  */
 ShareThis.Cacheable = cacheComponent(ShareThis, 'share.sharethis', function (props) {
-  var share = props.share;
+  var share = props.share,
+    _props$page = props.page,
+    page = _props$page === void 0 ? {} : _props$page;
   return {
-    installUrl: share.install_url
+    installUrl: share.install_url,
+    url: page.permalink,
+    title: page.title
   };
 });
 module.exports = ShareThis;

package/lib/view/share/web_share.js

@@ -0,0 +1,153 @@
+"use strict";
+
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+var _inferno = require("inferno");
+function _classCallCheck(a, n) { if (!(a instanceof n)) throw new TypeError("Cannot call a class as a function"); }
+function _defineProperties(e, r) { for (var t = 0; t < r.length; t++) { var o = r[t]; o.enumerable = o.enumerable || !1, o.configurable = !0, "value" in o && (o.writable = !0), Object.defineProperty(e, _toPropertyKey(o.key), o); } }
+function _createClass(e, r, t) { return r && _defineProperties(e.prototype, r), t && _defineProperties(e, t), Object.defineProperty(e, "prototype", { writable: !1 }), e; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : i + ""; }
+function _toPrimitive(t, e) { if ("object" != _typeof(t) || !t) return t; var r; if ("undefined" != typeof Symbol && void 0 !== (r = t[Symbol.toPrimitive])) { var i = r.call(t, e || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === e ? String : Number)(t); }
+function _callSuper(t, o, e) { return o = _getPrototypeOf(o), _possibleConstructorReturn(t, _isNativeReflectConstruct() ? Reflect.construct(o, e || [], _getPrototypeOf(t).constructor) : o.apply(t, e)); }
+function _possibleConstructorReturn(t, e) { if (e && ("object" == _typeof(e) || "function" == typeof e)) return e; if (void 0 !== e) throw new TypeError("Derived constructors may only return object or undefined"); return _assertThisInitialized(t); }
+function _assertThisInitialized(e) { if (void 0 === e) throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); return e; }
+function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
+function _getPrototypeOf(t) { return _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf.bind() : function (t) { return t.__proto__ || Object.getPrototypeOf(t); }, _getPrototypeOf(t); }
+function _inherits(t, e) { if ("function" != typeof e && null !== e) throw new TypeError("Super expression must either be null or a function"); t.prototype = Object.create(e && e.prototype, { constructor: { value: t, writable: !0, configurable: !0 } }), Object.defineProperty(t, "prototype", { writable: !1 }), e && _setPrototypeOf(t, e); }
+function _setPrototypeOf(t, e) { return _setPrototypeOf = Object.setPrototypeOf ? Object.setPrototypeOf.bind() : function (t, e) { return t.__proto__ = e, t; }, _setPrototypeOf(t, e); }
+/**
+ * Native Web Share button JSX component.
+ * @module view/share/web_share
+ */
+var _require = require('inferno'),
+  Component = _require.Component;
+var _require2 = require('../../util/cache'),
+  cacheComponent = _require2.cacheComponent;
+
+// Brand colors only: the consuming theme owns button geometry and interaction.
+var NETWORKS = [{
+  id: 'x',
+  name: 'X',
+  background: '#000000',
+  foreground: '#ffffff'
+}, {
+  id: 'facebook',
+  name: 'Facebook',
+  icon: 'fab fa-facebook-f',
+  background: '#0866ff',
+  foreground: '#ffffff'
+}, {
+  id: 'weibo',
+  name: 'Weibo',
+  icon: 'fab fa-weibo',
+  background: '#e6162d',
+  foreground: '#ffffff'
+}, {
+  id: 'telegram',
+  name: 'Telegram',
+  icon: 'fab fa-telegram-plane',
+  background: '#26a5e4',
+  foreground: '#ffffff'
+}, {
+  id: 'linkedin',
+  name: 'LinkedIn',
+  icon: 'fab fa-linkedin-in',
+  background: '#0a66c2',
+  foreground: '#ffffff'
+}];
+function shareUrl(network, url, title) {
+  var link = encodeURIComponent(url);
+  var text = encodeURIComponent(title);
+  return {
+    x: 'https://twitter.com/intent/tweet?url=' + link + '&text=' + text,
+    facebook: 'https://www.facebook.com/sharer/sharer.php?u=' + link,
+    weibo: 'https://service.weibo.com/share/share.php?url=' + link + '&title=' + text,
+    telegram: 'https://t.me/share/url?url=' + link + '&text=' + text,
+    linkedin: 'https://www.linkedin.com/sharing/share-offsite/?url=' + link
+  }[network];
+}
+
+/**
+ * Native Web Share button JSX component.
+ *
+ * @example
+ * <WebShare />
+ */
+var WebShare = /*#__PURE__*/function (_Component) {
+  function WebShare() {
+    _classCallCheck(this, WebShare);
+    return _callSuper(this, WebShare, arguments);
+  }
+  _inherits(WebShare, _Component);
+  return _createClass(WebShare, [{
+    key: "render",
+    value: function render() {
+      var _this$props = this.props,
+        _this$props$label = _this$props.label,
+        label = _this$props$label === void 0 ? 'More' : _this$props$label,
+        url = _this$props.url,
+        title = _this$props.title;
+      var js = "(function () {\n      ".concat(shareUrl.toString(), "\n      document.querySelectorAll('.hexo-component-share').forEach(function (container) {\n        var button = container.querySelector('button');\n        var status = container.querySelector('[role=\"status\"]');\n        var native = container.querySelector('[data-share-native]');\n        var data = { title: container.dataset.title || document.title, url: container.dataset.url || window.location.href };\n        container.querySelectorAll('[data-share-network]').forEach(function (link) {\n          link.href = shareUrl(link.dataset.shareNetwork, data.url, data.title);\n        });\n        button.hidden = false;\n        native.hidden = false;\n        button.disabled = typeof navigator.share !== 'function';\n        status.hidden = !button.disabled;\n        button.onclick = async function () {\n          status.hidden = true;\n          try {\n            await navigator.share({ title: container.dataset.title || document.title, url: container.dataset.url || window.location.href });\n          } catch (error) {\n            if (error && error.name === 'AbortError') return;\n            status.hidden = false;\n          }\n        };\n      });\n    })();");
+      return (0, _inferno.createFragment)([(0, _inferno.createVNode)(1, "div", "hexo-component-share", [(0, _inferno.createVNode)(1, "div", "buttons is-centered", [NETWORKS.map(function (network) {
+        return (0, _inferno.createVNode)(1, "a", "button", [(0, _inferno.createVNode)(1, "span", "icon", network.icon ? (0, _inferno.createVNode)(1, "i", network.icon) : (0, _inferno.createVNode)(32, "svg", null, (0, _inferno.createVNode)(32, "path", null, null, 1, {
+          "d": "M18.9 2H22l-6.8 7.8L23.2 22h-6.3L12 14.6 5.5 22H2.4l7.9-9L.8 2h6.5l4.5 6.7L18.9 2Zm-1.1 18h1.7L6.4 3.9H4.6L17.8 20Z"
+        }), 2, {
+          "width": "1em",
+          "height": "1em",
+          "viewBox": "0 0 24 24",
+          "fill": "currentColor"
+        }), 0, {
+          "aria-hidden": "true"
+        }), (0, _inferno.createVNode)(1, "span", null, network.name, 0)], 4, {
+          "style": "background-color:".concat(network.background, ";border-color:").concat(network.background, ";color:").concat(network.foreground),
+          "data-share-network": network.id,
+          "href": shareUrl(network.id, url || '', title || ''),
+          "target": "_blank",
+          "rel": "noopener noreferrer",
+          "aria-label": "Share on ".concat(network.name)
+        }, network.id);
+      }), (0, _inferno.createVNode)(1, "span", "has-text-centered", (0, _inferno.createVNode)(1, "button", "button", [(0, _inferno.createVNode)(1, "span", "icon", (0, _inferno.createVNode)(1, "i", "fas fa-share-alt"), 2, {
+        "aria-hidden": "true"
+      }), (0, _inferno.createVNode)(1, "span", null, label, 0)], 4, {
+        "type": "button",
+        "hidden": true
+      }), 2, {
+        "data-share-native": "",
+        "hidden": true
+      })], 0), (0, _inferno.createVNode)(1, "p", null, "System sharing is unavailable in this browser. You can use the platform buttons above.", 16, {
+        "role": "status",
+        "hidden": true
+      })], 4, {
+        "data-share-provider": "web_share",
+        "data-url": url,
+        "data-title": title
+      }), (0, _inferno.createVNode)(1, "script", null, null, 1, {
+        "dangerouslySetInnerHTML": {
+          __html: js
+        }
+      })], 4);
+    }
+  }]);
+}(Component);
+/**
+ * Cacheable Web Share button JSX component.
+ * <p>
+ * This class is supposed to be used in combination with the <code>locals</code> hexo filter
+ * ({@link module:hexo/filter/locals}).
+ *
+ * @see module:util/cache.cacheComponent
+ * @example
+ * <WebShare.Cacheable />
+ */
+WebShare.Cacheable = cacheComponent(WebShare, 'share.web_share', function (_ref) {
+  var _ref$config = _ref.config,
+    config = _ref$config === void 0 ? {} : _ref$config,
+    _ref$page = _ref.page,
+    page = _ref$page === void 0 ? {} : _ref$page;
+  var language = page.lang || page.language || config.language || 'en';
+  return {
+    label: /^zh(?:-|$)/i.test([].concat(language)[0]) ? '更多' : 'More',
+    url: page.permalink,
+    title: page.title
+  };
+});
+module.exports = WebShare;

package/lib/view/widget/archives.js

@@ -24,39 +24,9 @@ var _require2 = require('../../util/cache'),
   cacheComponent = _require2.cacheComponent;
 var _require3 = require('../../util/i18n'),
   translate = _require3.translate;
-
-/**
- * Get the first value that is set, i.e., neither null nor undefined.
- * @private
- */
-function firstSet() {
-  for (var _len = arguments.length, values = new Array(_len), _key = 0; _key < _len; _key++) {
-    values[_key] = arguments[_key];
-  }
-  return values.find(function (value) {
-    return value !== null && typeof value !== 'undefined';
-  });
-}
-
-/**
- * Convert a Hexo language code into a Moment.js locale name.
- * <p>
- * Same as Hexo's internal <code>toMomentLocale</code>, copied here so that the component does not
- * depend on Hexo's private modules.
- *
- * @param {string} lang Hexo language code, such as <code>zh-CN</code> or <code>en_US</code>.
- * @returns {string|undefined} Moment.js locale name.
- */
-function toMomentLocale(lang) {
-  if (lang === undefined) {
-    return undefined;
-  }
-  // moment.locale('') and moment.locale(null) both equal moment.locale('en')
-  if (!lang || lang === 'en' || lang === 'default') {
-    return 'en';
-  }
-  return lang.toLowerCase().replace('_', '-');
-}
+var _require4 = require('../../util/archives'),
+  resolveArchiveOptions = _require4.resolveArchiveOptions,
+  groupArchives = _require4.groupArchives;
 
 /**
  * Archives widget JSX component.
@@ -137,13 +107,12 @@ Archives.Cacheable = cacheComponent(Archives, 'widget.archives', function (props
     page = props.page,
     helper = props.helper,
     widget = props.widget;
-  // Options left empty in the config are null, which also take the defaults
-  var groupBy = firstSet(widget.group_by, 'monthly');
-  var order = firstSet(widget.order, -1);
-  var format = widget.format,
-    amount = widget.amount;
-  // show_count, like the tags widget, or showCount, which this widget used to read
-  var showCount = firstSet(widget.show_count, widget.showCount, true);
+  var _resolveArchiveOption = resolveArchiveOptions(widget),
+    groupBy = _resolveArchiveOption.groupBy,
+    order = _resolveArchiveOption.order,
+    format = _resolveArchiveOption.format,
+    amount = _resolveArchiveOption.amount,
+    showCount = _resolveArchiveOption.showCount;
   var url_for = helper.url_for,
     _p = helper._p,
     __ = helper.__;
@@ -151,33 +120,15 @@ Archives.Cacheable = cacheComponent(Archives, 'widget.archives', function (props
   if (!posts.length) {
     return null;
   }
-  var language = toMomentLocale(page.lang || page.language || config.language);
-  var data = [];
-  var length = 0;
-  posts.forEach(function (post) {
-    // Clone the date object to avoid pollution
-    var date = post.date.clone();
-    if (config.timezone) {
-      date = date.tz(config.timezone);
-    }
-    if (language) {
-      date = date.locale(language);
-    }
-    var year = date.year();
-    var month = date.month() + 1;
-    var name = date.format(format || (groupBy === 'monthly' ? 'MMMM YYYY' : 'YYYY'));
-    var lastData = data[length - 1];
-    if (!lastData || lastData.name !== name) {
-      length = data.push({
-        name: name,
-        year: year,
-        month: month,
-        count: 1
-      });
-    } else {
-      lastData.count++;
-    }
-  });
+  var _groupArchives = groupArchives(posts, {
+      groupBy: groupBy,
+      format: format,
+      amount: amount,
+      language: page.lang || page.language || config.language,
+      timezone: config.timezone
+    }),
+    groups = _groupArchives.groups,
+    hasMore = _groupArchives.hasMore;
   var link = function link(item) {
     var url = "".concat(config.archive_dir, "/").concat(item.year, "/");
     if (groupBy === 'monthly') {
@@ -186,11 +137,8 @@ Archives.Cacheable = cacheComponent(Archives, 'widget.archives', function (props
     }
     return url_for(url);
   };
-
-  // Link to the archive page when some of the archives are not shown
-  var hasMore = amount > 0 && data.length > amount;
   return {
-    items: (hasMore ? data.slice(0, amount) : data).map(function (item) {
+    items: groups.map(function (item) {
       return {
         name: item.name,
         count: item.count,

package/lib/view/widget/categories.js

@@ -24,19 +24,10 @@ var _require2 = require('../../util/cache'),
   cacheComponent = _require2.cacheComponent;
 var _require3 = require('../../util/i18n'),
   translate = _require3.translate;
-
-/**
- * Get the first value that is set, i.e., neither null nor undefined.
- * @private
- */
-function firstSet() {
-  for (var _len = arguments.length, values = new Array(_len), _key = 0; _key < _len; _key++) {
-    values[_key] = arguments[_key];
-  }
-  return values.find(function (value) {
-    return value !== null && typeof value !== 'undefined';
-  });
-}
+var _require4 = require('../../util/categories'),
+  resolveCategoryOptions = _require4.resolveCategoryOptions,
+  resolveCategoryDepth = _require4.resolveCategoryDepth,
+  prepareCategories = _require4.prepareCategories;
 
 /**
  * Categories widget JSX component.
@@ -128,68 +119,30 @@ Categories.Cacheable = cacheComponent(Categories, 'widget.categories', function
   var _widget$categories = widget.categories,
     categories = _widget$categories === void 0 ? props.site.categories : _widget$categories,
     amount = widget.amount;
-  // Options left empty in the config are null, which also take the defaults
-  var order = firstSet(widget.order, 1);
-  // Snake case, like the tags widget, or camel case, which this widget used to read
-  var orderBy = firstSet(widget.order_by, widget.orderBy, 'name');
-  var showCurrent = firstSet(widget.show_current, widget.showCurrent, false);
-  var showCount = firstSet(widget.show_count, widget.showCount, true);
+  var _resolveCategoryOptio = resolveCategoryOptions(widget),
+    order = _resolveCategoryOptio.order,
+    orderBy = _resolveCategoryOptio.orderBy,
+    showCurrent = _resolveCategoryOptio.showCurrent,
+    showCount = _resolveCategoryOptio.showCount;
   var url_for = helper.url_for,
     _p = helper._p,
     __ = helper.__;
   if (!categories || !categories.length) {
     return null;
   }
-
-  // 0 or no depth shows all levels
-  var depth = parseInt(firstSet(widget.depth, props.depth), 10) || 0;
-  function prepareQuery(parent) {
-    var query = {};
-    if (parent) {
-      query.parent = parent;
-    } else {
-      query.parent = {
-        $exists: false
-      };
-    }
-    return categories.find(query).sort(orderBy, order).filter(function (cat) {
-      return cat.length;
-    });
-  }
-  function hierarchicalList(level, parent) {
-    return prepareQuery(parent).map(function (cat, i) {
-      var children = [];
-      if (!depth || level + 1 < depth) {
-        children = hierarchicalList(level + 1, cat._id);
-      }
-      var isCurrent = false;
-      if (showCurrent && page) {
-        for (var j = 0; j < cat.length; j++) {
-          var post = cat.posts.data[j];
-          if (post && post._id === page._id) {
-            isCurrent = true;
-            break;
-          }
-        }
-        // special case: category page
-        isCurrent = isCurrent || page.base && page.base.startsWith(cat.path);
-      }
-      return {
-        children: children,
-        isCurrent: isCurrent,
-        name: cat.name,
-        count: cat.length,
-        url: url_for(cat.path)
-      };
-    });
-  }
-
-  // Only limit the top-level categories, and link to the category page when some are not shown
-  var list = hierarchicalList(0);
-  var hasMore = amount > 0 && list.length > amount;
+  var depth = resolveCategoryDepth(widget.depth, props.depth);
+  var _prepareCategories = prepareCategories(categories, {
+      order: order,
+      orderBy: orderBy,
+      showCurrent: showCurrent,
+      depth: depth,
+      amount: amount
+    }, page, url_for),
+    list = _prepareCategories.categories,
+    hasMore = _prepareCategories.hasMore;
   return {
     showCount: showCount,
-    categories: hasMore ? list.slice(0, amount) : list,
+    categories: list,
     title: _p('common.category', Infinity),
     moreUrl: hasMore ? url_for('categories/') : null,
     moreTitle: translate(__, 'widget.more', 'More')