eddev 0.1.39 → 0.1.40-beta-1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eddev",
-  "version": "0.1.39",
+  "version": "0.1.40-beta-1",
   "main": "./index.js",
   "license": "MIT",
   "bin": {

package/routing/remoteProps.js

@@ -42,6 +42,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.hasCachedProps = exports.fetchProps = exports.isSameOrigin = exports.setInitialProps = exports.parseURL = void 0;
 var url_parse_1 = __importDefault(require("url-parse"));
 var qs_1 = __importDefault(require("qs"));
+var pending = {};
 var cache = {};
 function parseURL(url) {
     return (0, url_parse_1.default)(url, qs_1.default.parse);
@@ -63,26 +64,26 @@ function isSameOrigin(url) {
 exports.isSameOrigin = isSameOrigin;
 function fetchProps(url) {
     return __awaiter(this, void 0, void 0, function () {
-        var parsed, cacheKey, requestUrl, response, data;
+        var parsed, cacheKey, requestUrl, promise;
         return __generator(this, function (_a) {
-            switch (_a.label) {
-                case 0:
-                    parsed = parseURL(url);
-                    cacheKey = getRouteCacheKey(url);
-                    // Cached value?
-                    if (cache[cacheKey])
-                        return [2 /*return*/, Promise.resolve(cache[cacheKey])];
-                    parsed.query["_props"] = "1";
-                    requestUrl = parsed.toString();
-                    return [4 /*yield*/, fetch(requestUrl)];
-                case 1:
-                    response = _a.sent();
-                    return [4 /*yield*/, response.json()];
-                case 2:
-                    data = _a.sent();
-                    cache[cacheKey] = data;
-                    return [2 /*return*/, data];
-            }
+            parsed = parseURL(url);
+            cacheKey = getRouteCacheKey(url);
+            // Cached value?
+            if (cacheKey in cache)
+                return [2 /*return*/, Promise.resolve(cache[cacheKey])];
+            if (cacheKey in pending)
+                return [2 /*return*/, pending[cacheKey]];
+            parsed.query["_props"] = "1";
+            requestUrl = parsed.toString();
+            promise = fetch(requestUrl)
+                .then(function (response) { return response.json(); })
+                .then(function (data) {
+                delete pending[cacheKey];
+                cache[cacheKey] = data;
+                return data;
+            });
+            pending[cacheKey] = promise;
+            return [2 /*return*/, promise];
         });
     });
 }