storyblok-js-client - npm Package Compare versions

Comparing version 2.0.6 to 2.0.7

dist/index.js

@@ -5,10 +5,14 @@ 'use strict';
 
+var _parseInt2 = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/parse-int"));
+
+var _promise = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/promise"));
+
 var _regenerator = _interopRequireDefault(require("@babel/runtime-corejs3/regenerator"));
 
-var _parseInt2 = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/parse-int"));
+var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/toConsumableArray"));
 
+var _values = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/object/values"));
+
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/asyncToGenerator"));
 
-var _indexOf = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/index-of"));
-
 var _forEach = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/for-each"));
@@ -24,6 +28,2 @@
 
-var _setTimeout2 = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/set-timeout"));
-
-var _promise = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/promise"));
-
 var qs = require('qs');
@@ -35,8 +35,2 @@
 
-var delay = function delay(ms) {
-  return new _promise.default(function (res) {
-    return (0, _setTimeout2.default)(res, ms);
-  });
-};
-
 var RichTextResolver = require('./richTextResolver');
@@ -46,2 +40,7 @@
 
+var _require = require('./helpers'),
+    delay = _require.delay,
+    getOptionsPage = _require.getOptionsPage,
+    isCDNUrl = _require.isCDNUrl;
+
 var Storyblok =
@@ -54,7 +53,7 @@ /*#__PURE__*/
     if (!endpoint) {
-      var _context, _context2, _context3;
+      var _context;
 
-      var region = config.region ? (0, _concat.default)(_context = "-").call(_context, config.region) : '';
+      var region = config.region ? "-".concat(config.region) : '';
       var protocol = config.https === false ? 'http' : 'https';
-      endpoint = (0, _concat.default)(_context2 = (0, _concat.default)(_context3 = "").call(_context3, protocol, "://api")).call(_context2, region, ".storyblok.com/v1");
+      endpoint = (0, _concat.default)(_context = "".concat(protocol, "://api")).call(_context, region, ".storyblok.com/v1");
     }
@@ -99,6 +98,6 @@
       this.richTextResolver.addNode('blok', function (node) {
-        var _context4;
+        var _context2;
 
         var html = '';
-        (0, _forEach.default)(_context4 = node.attrs.body).call(_context4, function (blok) {
+        (0, _forEach.default)(_context2 = node.attrs.body).call(_context2, function (blok) {
           html += resolver(blok.component, blok);
@@ -112,31 +111,120 @@ });
   }, {
-    key: "get",
-    value: function get(slug, params) {
-      var _context5;
+    key: "parseParams",
+    value: function parseParams() {
+      var params = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
 
-      var query = params || {};
-      var url = (0, _concat.default)(_context5 = "/").call(_context5, slug);
+      if (!params.version) {
+        params.version = 'published';
+      }
 
-      if ((0, _indexOf.default)(url).call(url, '/cdn/') > -1) {
-        if (!query.version) {
-          query.version = 'published';
-        }
+      if (!params.cv) {
+        params.cv = this.cacheVersion;
+      }
 
-        if (!query.cv) {
-          query.cv = this.cacheVersion;
-        }
+      if (!params.token) {
+        params.token = this.getToken();
+      }
 
-        if (!query.token) {
-          query.token = this.getToken();
-        }
+      return params;
+    }
+  }, {
+    key: "factoryParamOptions",
+    value: function factoryParamOptions(url) {
+      var params = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+
+      if (isCDNUrl(url)) {
+        return this.parseParams(params);
       }
 
+      return params;
+    }
+  }, {
+    key: "makeRequest",
+    value: function makeRequest(url, params, per_page, page) {
+      var options = this.factoryParamOptions(url, getOptionsPage(params, per_page, page));
+      return this.cacheResponse(url, options);
+    }
+  }, {
+    key: "get",
+    value: function get(slug, params) {
+      var url = "/".concat(slug);
+      var query = this.factoryParamOptions(url, params);
       return this.cacheResponse(url, query);
     }
   }, {
+    key: "getAll",
+    value: function () {
+      var _getAll = (0, _asyncToGenerator2.default)(
+      /*#__PURE__*/
+      _regenerator.default.mark(function _callee(slug) {
+        var params,
+            entity,
+            perPage,
+            page,
+            url,
+            urlParts,
+            res,
+            all,
+            total,
+            lastPage,
+            _context3,
+            _args = arguments;
+
+        return _regenerator.default.wrap(function _callee$(_context4) {
+          while (1) {
+            switch (_context4.prev = _context4.next) {
+              case 0:
+                params = _args.length > 1 && _args[1] !== undefined ? _args[1] : {};
+                entity = _args.length > 2 ? _args[2] : undefined;
+                perPage = params.per_page || 25;
+                page = 1;
+                url = "/".concat(slug);
+                urlParts = url.split('/');
+                entity = entity || urlParts[urlParts.length - 1];
+                _context4.next = 9;
+                return this.makeRequest(url, params, perPage, page);
+
+              case 9:
+                res = _context4.sent;
+                all = (0, _values.default)(res.data[entity]);
+                total = res.total;
+                lastPage = Math.ceil(total / perPage);
+
+              case 13:
+                if (!(page < lastPage)) {
+                  _context4.next = 21;
+                  break;
+                }
+
+                page++;
+                _context4.next = 17;
+                return this.makeRequest(url, params, perPage, page);
+
+              case 17:
+                res = _context4.sent;
+                all = (0, _concat.default)(_context3 = []).call(_context3, (0, _toConsumableArray2.default)(all), (0, _toConsumableArray2.default)((0, _values.default)(res.data[entity])));
+                _context4.next = 13;
+                break;
+
+              case 21:
+                return _context4.abrupt("return", all);
+
+              case 22:
+              case "end":
+                return _context4.stop();
+            }
+          }
+        }, _callee, this);
+      }));
+
+      function getAll(_x) {
+        return _getAll.apply(this, arguments);
+      }
+
+      return getAll;
+    }()
+  }, {
     key: "post",
     value: function post(slug, params) {
-      var _context6;
-
-      var url = (0, _concat.default)(_context6 = "/").call(_context6, slug);
+      var url = "/".concat(slug);
       return this.throttle('post', url, params);
@@ -147,5 +235,3 @@ }
     value: function put(slug, params) {
-      var _context7;
-
-      var url = (0, _concat.default)(_context7 = "/").call(_context7, slug);
+      var url = "/".concat(slug);
       return this.throttle('put', url, params);
@@ -156,5 +242,3 @@ }
     value: function _delete(slug, params) {
-      var _context8;
-
-      var url = (0, _concat.default)(_context8 = "/").call(_context8, slug);
+      var url = "/".concat(slug);
       return this.throttle('delete', url, params);
@@ -170,5 +254,3 @@ }
     value: function getStory(slug, params) {
-      var _context9;
-
-      return this.get((0, _concat.default)(_context9 = "cdn/stories/").call(_context9, slug), params);
+      return this.get("cdn/stories/".concat(slug), params);
     }
@@ -199,8 +281,7 @@ }, {
         /*#__PURE__*/
-        _regenerator.default.mark(function _callee(resolve, reject) {
-          var cacheKey, provider, cache, res, response, _context10;
-
-          return _regenerator.default.wrap(function _callee$(_context11) {
+        _regenerator.default.mark(function _callee2(resolve, reject) {
+          var cacheKey, provider, cache, res, response;
+          return _regenerator.default.wrap(function _callee2$(_context5) {
             while (1) {
-              switch (_context11.prev = _context11.next) {
+              switch (_context5.prev = _context5.next) {
                 case 0:
@@ -216,7 +297,7 @@ cacheKey = qs.stringify({
                   if (!(_this.cache.clear === 'auto' && params.version === 'draft')) {
-                    _context11.next = 5;
+                    _context5.next = 5;
                     break;
                   }
 
-                  _context11.next = 5;
+                  _context5.next = 5;
                   return _this.flushCache();
@@ -226,22 +307,22 @@
                   if (!(params.version === 'published')) {
-                    _context11.next = 11;
+                    _context5.next = 11;
                     break;
                   }
 
-                  _context11.next = 8;
+                  _context5.next = 8;
                   return provider.get(cacheKey);
 
                 case 8:
-                  cache = _context11.sent;
+                  cache = _context5.sent;
 
                   if (!cache) {
-                    _context11.next = 11;
+                    _context5.next = 11;
                     break;
                   }
 
-                  return _context11.abrupt("return", resolve(cache));
+                  return _context5.abrupt("return", resolve(cache));
 
                 case 11:
-                  _context11.prev = 11;
-                  _context11.next = 14;
+                  _context5.prev = 11;
+                  _context5.next = 14;
                   return _this.throttle('get', url, {
@@ -257,3 +338,3 @@ params: params,
                 case 14:
-                  res = _context11.sent;
+                  res = _context5.sent;
                   response = {
@@ -272,7 +353,7 @@ data: res.data,
                   if (!(res.status != 200)) {
-                    _context11.next = 19;
+                    _context5.next = 19;
                     break;
                   }
 
-                  return _context11.abrupt("return", reject(res));
+                  return _context5.abrupt("return", reject(res));
 
@@ -285,11 +366,11 @@ case 19:
                   resolve(response);
-                  _context11.next = 33;
+                  _context5.next = 33;
                   break;
 
                 case 23:
-                  _context11.prev = 23;
-                  _context11.t0 = _context11["catch"](11);
+                  _context5.prev = 23;
+                  _context5.t0 = _context5["catch"](11);
 
-                  if (!(_context11.t0.response && _context11.t0.response.status === 429)) {
-                    _context11.next = 32;
+                  if (!(_context5.t0.response && _context5.t0.response.status === 429)) {
+                    _context5.next = 32;
                     break;
@@ -301,25 +382,25 @@ }
                   if (!(retries < _this.maxRetries)) {
-                    _context11.next = 32;
+                    _context5.next = 32;
                     break;
                   }
 
-                  console.log((0, _concat.default)(_context10 = "Hit rate limit. Retrying in ").call(_context10, retries, " seconds."));
-                  _context11.next = 31;
+                  console.log("Hit rate limit. Retrying in ".concat(retries, " seconds."));
+                  _context5.next = 31;
                   return delay(1000 * retries);
 
                 case 31:
-                  return _context11.abrupt("return", _this.cacheResponse(url, params, retries).then(resolve).catch(reject));
+                  return _context5.abrupt("return", _this.cacheResponse(url, params, retries).then(resolve).catch(reject));
 
                 case 32:
-                  reject(_context11.t0);
+                  reject(_context5.t0);
 
                 case 33:
                 case "end":
-                  return _context11.stop();
+                  return _context5.stop();
               }
             }
-          }, _callee, null, [[11, 23]]);
+          }, _callee2, null, [[11, 23]]);
         }));
 
-        return function (_x, _x2) {
+        return function (_x2, _x3) {
           return _ref.apply(this, arguments);
@@ -370,20 +451,20 @@ };
       /*#__PURE__*/
-      _regenerator.default.mark(function _callee2() {
-        return _regenerator.default.wrap(function _callee2$(_context12) {
+      _regenerator.default.mark(function _callee3() {
+        return _regenerator.default.wrap(function _callee3$(_context6) {
           while (1) {
-            switch (_context12.prev = _context12.next) {
+            switch (_context6.prev = _context6.next) {
               case 0:
                 this.cacheVersion = this.newVersion();
-                _context12.next = 3;
+                _context6.next = 3;
                 return this.cacheProvider().flush();
 
               case 3:
-                return _context12.abrupt("return", this);
+                return _context6.abrupt("return", this);
 
               case 4:
               case "end":
-                return _context12.stop();
+                return _context6.stop();
             }
           }
-        }, _callee2, this);
+        }, _callee3, this);
       }));
@@ -390,0 +471,0 @@

dist/richTextResolver.js

@@ -131,5 +131,5 @@ "use strict";
       if (tags.constructor === String) {
-        var _context6, _context7;
+        var _context6;
 
-        return (0, _concat.default)(_context6 = (0, _concat.default)(_context7 = "<").call(_context7, tags)).call(_context6, ending, ">");
+        return (0, _concat.default)(_context6 = "<".concat(tags)).call(_context6, ending, ">");
       }
@@ -139,9 +139,9 @@
         if (tag.constructor === String) {
-          var _context8, _context9;
+          var _context7;
 
-          return (0, _concat.default)(_context8 = (0, _concat.default)(_context9 = "<").call(_context9, tag)).call(_context8, ending, ">");
+          return (0, _concat.default)(_context7 = "<".concat(tag)).call(_context7, ending, ">");
         } else {
-          var _context10, _context13, _context14;
+          var _context9;
 
-          var h = (0, _concat.default)(_context10 = "<").call(_context10, tag.tag);
+          var h = "<".concat(tag.tag);
 
@@ -153,5 +153,5 @@ if (tag.attrs) {
               if (value !== null) {
-                var _context11, _context12;
+                var _context8;
 
-                h += (0, _concat.default)(_context11 = (0, _concat.default)(_context12 = " ").call(_context12, key, "=\"")).call(_context11, value, "\"");
+                h += (0, _concat.default)(_context8 = " ".concat(key, "=\"")).call(_context8, value, "\"");
               }
@@ -161,3 +161,3 @@ }
 
-          return (0, _concat.default)(_context13 = (0, _concat.default)(_context14 = "").call(_context14, h)).call(_context13, ending, ">");
+          return (0, _concat.default)(_context9 = "".concat(h)).call(_context9, ending, ">");
         }
@@ -175,19 +175,13 @@ });
     value: function renderClosingTag(tags) {
-      var _context16;
+      var _context10;
 
       if (tags.constructor === String) {
-        var _context15;
-
-        return (0, _concat.default)(_context15 = "</").call(_context15, tags, ">");
+        return "</".concat(tags, ">");
       }
 
-      var all = (0, _map.default)(_context16 = (0, _reverse.default)(tags).call(tags)).call(_context16, function (tag) {
+      var all = (0, _map.default)(_context10 = (0, _reverse.default)(tags).call(tags)).call(_context10, function (tag) {
         if (tag.constructor === String) {
-          var _context17;
-
-          return (0, _concat.default)(_context17 = "</").call(_context17, tag, ">");
+          return "</".concat(tag, ">");
         } else {
-          var _context18;
-
-          return (0, _concat.default)(_context18 = "</").call(_context18, tag.tag, ">");
+          return "</".concat(tag.tag, ">");
         }
@@ -194,0 +188,0 @@ });

dist/schema.js

@@ -5,4 +5,2 @@ "use strict";
 
-var _concat = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/concat"));
-
 var _indexOf = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/index-of"));
@@ -59,6 +57,4 @@
     heading: function heading(node) {
-      var _context;
-
       return {
-        tag: (0, _concat.default)(_context = "h").call(_context, node.attrs.level)
+        tag: "h".concat(node.attrs.level)
       };
@@ -65,0 +61,0 @@ },

package.json

 {
   "name": "storyblok-js-client",
-  "version": "2.0.6",
+  "version": "2.0.7",
   "description": "Universal JavaScript SDK for Storyblok's API",
@@ -5,0 +5,0 @@ "main": "./dist/index.js",

No alert changes

Improved metrics

Total package byte prevSize

60459

increased by5.98%

Number of package files

21

increased by5%

Lines of code

1752

increased by7.09%

No dependency changes