@modern-js/plugin-data-loader 2.6.1-alpha.0 → 2.8.0

package/dist/esm/cli/{generate-client.js → generateClient.js}

@@ -5,7 +5,7 @@ var generateClient = function(param) {
     var loadersMap = require(mapFile);
     var requestCode = "";
     var exportsCode = "";
-    var requestCreatorPath = path.join(__dirname, "./create-request").replace("/cjs/cli/", "/esm/cli/").replace(/\\/g, "/");
+    var requestCreatorPath = path.join(__dirname, "./createRequest").replace("/cjs/cli/", "/esm/cli/").replace(/\\/g, "/");
     var importCode = "\n    import { createRequest } from '".concat(requestCreatorPath, "';\n  ");
     if (!loaderId) {
         requestCode = Object.keys(loadersMap).map(function(loaderId2) {

package/dist/esm/cli/loader.js

@@ -122,7 +122,7 @@ var __generator = this && this.__generator || function(thisArg, body) {
         };
     }
 };
-import { generateClient } from "./generate-client";
+import { generateClient } from "./generateClient";
 function loader(source) {
     return _loader.apply(this, arguments);
 }

package/dist/esm/common/constants.js

@@ -1,3 +1,4 @@
 var LOADER_ID_PARAM = "__loader";
 var DIRECT_PARAM = "__ssrDirect";
-export { DIRECT_PARAM, LOADER_ID_PARAM };
+var CONTENT_TYPE_DEFERRED = "text/modernjs-deferred";
+export { CONTENT_TYPE_DEFERRED, DIRECT_PARAM, LOADER_ID_PARAM };

package/dist/{js/treeshaking/server → esm/runtime}/index.js

@@ -35,18 +35,12 @@ function _asyncToGenerator(fn) {
         });
     };
 }
-function _defineProperty(obj, key, value) {
-    if (key in obj) {
-        Object.defineProperty(obj, key, {
-            value: value,
-            enumerable: true,
-            configurable: true,
-            writable: true
-        });
+function _instanceof(left, right) {
+    if (right != null && typeof Symbol !== "undefined" && right[Symbol.hasInstance]) {
+        return !!right[Symbol.hasInstance](left);
     } else {
-        obj[key] = value;
+        return left instanceof right;
     }
-    return obj;
 }
 function _iterableToArrayLimit(arr, i) {
     var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"];
@@ -75,45 +69,6 @@ function _iterableToArrayLimit(arr, i) {
 function _nonIterableRest() {
     throw new TypeError("Invalid attempt to destructure non-iterable instance.\\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
 }
-function _objectSpread(target) {
-    for(var i = 1; i < arguments.length; i++){
-        var source = arguments[i] != null ? arguments[i] : {};
-        var ownKeys = Object.keys(source);
-        if (typeof Object.getOwnPropertySymbols === "function") {
-            ownKeys = ownKeys.concat(Object.getOwnPropertySymbols(source).filter(function(sym) {
-                return Object.getOwnPropertyDescriptor(source, sym).enumerable;
-            }));
-        }
-        ownKeys.forEach(function(key) {
-            _defineProperty(target, key, source[key]);
-        });
-    }
-    return target;
-}
-function ownKeys(object, enumerableOnly) {
-    var keys = Object.keys(object);
-    if (Object.getOwnPropertySymbols) {
-        var symbols = Object.getOwnPropertySymbols(object);
-        if (enumerableOnly) {
-            symbols = symbols.filter(function(sym) {
-                return Object.getOwnPropertyDescriptor(object, sym).enumerable;
-            });
-        }
-        keys.push.apply(keys, symbols);
-    }
-    return keys;
-}
-function _objectSpreadProps(target, source) {
-    source = source != null ? source : {};
-    if (Object.getOwnPropertyDescriptors) {
-        Object.defineProperties(target, Object.getOwnPropertyDescriptors(source));
-    } else {
-        ownKeys(Object(source)).forEach(function(key) {
-            Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key));
-        });
-    }
-    return target;
-}
 function _slicedToArray(arr, i) {
     return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest();
 }
@@ -220,11 +175,12 @@ var __generator = this && this.__generator || function(thisArg, body) {
         };
     }
 };
-import path from "path";
 import { installGlobals, writeReadableStreamToWritable, Response as NodeResponse } from "@remix-run/node";
-import { matchRoutes } from "react-router-dom";
-import { MAIN_ENTRY_NAME, SERVER_BUNDLE_DIRECTORY } from "@modern-js/utils";
-import { LOADER_ID_PARAM } from "../common/constants";
+import { transformNestedRoutes } from "@modern-js/utils/nestedRoutes";
+import { createStaticHandler, ErrorResponse, UNSAFE_DEFERRED_SYMBOL as DEFERRED_SYMBOL } from "@modern-js/utils/remix-router";
+import { isPlainObject } from "@modern-js/utils/lodash";
+import { CONTENT_TYPE_DEFERRED, LOADER_ID_PARAM } from "../common/constants";
+import { createDeferredReadableStream } from "./response";
 installGlobals();
 var redirectStatusCodes = /* @__PURE__ */ new Set([
     301,
@@ -233,81 +189,39 @@ var redirectStatusCodes = /* @__PURE__ */ new Set([
     307,
     308
 ]);
-function isRedirectResponse(response) {
-    return redirectStatusCodes.has(response.status);
+function isRedirectResponse(status) {
+    return redirectStatusCodes.has(status);
 }
 function isResponse(value) {
     return value != null && typeof value.status === "number" && typeof value.statusText === "string" && typeof value.headers === "object" && typeof value.body !== "undefined";
 }
-var json = function(data) {
-    var init = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : {};
-    var responseInit = typeof init === "number" ? {
-        status: init
-    } : init;
-    var headers = new Headers(responseInit.headers);
-    if (!headers.has("Content-Type")) {
-        headers.set("Content-Type", "application/json; charset=utf-8");
+function sortByUrlPath(entries) {
+    entries.sort(function(a, b) {
+        var length1 = a.urlPath.length;
+        var length2 = b.urlPath.length;
+        if (length1 < length2) {
+            return 1;
+        }
+        if (length1 > length2) {
+            return -1;
+        }
+        return 0;
+    });
+    return entries;
+}
+function convertModernRedirectResponse(headers, basename) {
+    var newHeaders = new Headers(headers);
+    var redirectUrl = headers.get("Location");
+    if (basename !== "/") {
+        redirectUrl = redirectUrl.replace(basename, "");
     }
-    return new NodeResponse(JSON.stringify(data), _objectSpreadProps(_objectSpread({}, responseInit), {
-        headers: headers
-    }));
-};
-var callRouteLoader = function() {
-    var _ref = _asyncToGenerator(function(param) {
-        var routeId, loader, params, request, loadContext, result, error;
-        return __generator(this, function(_state) {
-            switch(_state.label){
-                case 0:
-                    routeId = param.routeId, loader = param.loader, params = param.params, request = param.request, loadContext = param.loadContext;
-                    if (!loader) {
-                        throw new Error("You made a ".concat(request.method, " request to ").concat(request.url, ' but did not provide a default component or `loader` for route "').concat(routeId, '", so there is no way to handle the request.'));
-                    }
-                    _state.label = 1;
-                case 1:
-                    _state.trys.push([
-                        1,
-                        3,
-                        ,
-                        4
-                    ]);
-                    return [
-                        4,
-                        loader({
-                            request: request,
-                            params: params
-                        })
-                    ];
-                case 2:
-                    result = _state.sent();
-                    return [
-                        3,
-                        4
-                    ];
-                case 3:
-                    error = _state.sent();
-                    if (!isResponse(error)) {
-                        throw error;
-                    }
-                    result = error;
-                    return [
-                        3,
-                        4
-                    ];
-                case 4:
-                    if (result === void 0) {
-                        throw new Error('You defined a loader for route "'.concat(routeId, "\" but didn't return anything from your `loader` function. Please return a value or `null`."));
-                    }
-                    return [
-                        2,
-                        isResponse(result) ? result : json(result)
-                    ];
-            }
-        });
+    newHeaders.set("X-Modernjs-Redirect", redirectUrl);
+    newHeaders.delete("Location");
+    return new NodeResponse(null, {
+        status: 204,
+        headers: newHeaders
     });
-    return function callRouteLoader(_) {
-        return _ref.apply(this, arguments);
-    };
-}();
+}
 var createLoaderHeaders = function(requestHeaders) {
     var headers = new Headers();
     var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
@@ -424,106 +338,85 @@ var sendLoaderResponse = function() {
         return _ref.apply(this, arguments);
     };
 }();
-var getPathWithoutEntry = function(pathname, entryPath) {
-    if (entryPath === "/") {
-        return pathname;
-    }
-    return pathname.replace(entryPath, "");
-};
 var matchEntry = function(pathname, entries) {
+    sortByUrlPath(entries);
     return entries.find(function(entry) {
         return pathname.startsWith(entry.urlPath);
     });
 };
 var handleRequest = function() {
     var _ref = _asyncToGenerator(function(param) {
-        var context, serverRoutes, distDir, method, query, routeId, entry, routesPath, routes, res, pathname, matches, match, request, response, headers, error, message;
+        var context, serverRoutes, routes, method, query, routeId, entry, basename, dataRoutes, staticHandler, res, request, response, deferredData, body, init, headers, error, message;
         return __generator(this, function(_state) {
             switch(_state.label){
                 case 0:
-                    context = param.context, serverRoutes = param.serverRoutes, distDir = param.distDir;
+                    context = param.context, serverRoutes = param.serverRoutes, routes = param.routes;
                     method = context.method, query = context.query;
                     routeId = query[LOADER_ID_PARAM];
-                    if (!routeId || method.toLowerCase() !== "get") {
-                        return [
-                            2
-                        ];
-                    }
                     entry = matchEntry(context.path, serverRoutes);
-                    if (!entry) {
-                        return [
-                            2
-                        ];
-                    }
-                    routesPath = path.join(distDir, SERVER_BUNDLE_DIRECTORY, "".concat(entry.entryName || MAIN_ENTRY_NAME, "-server-loaders"));
-                    return [
-                        4,
-                        import(routesPath)
-                    ];
-                case 1:
-                    routes = _state.sent().routes;
-                    if (!routes) {
+                    if (!routeId || !entry) {
                         return [
                             2
                         ];
                     }
-                    res = context.res;
-                    pathname = getPathWithoutEntry(context.path, entry.urlPath);
-                    matches = matchRoutes(routes, pathname);
-                    if (!matches) {
-                        res.statusCode = 403;
-                        res.end("Route ".concat(pathname, " was not matched"));
-                        return [
-                            2
-                        ];
+                    if (method.toLowerCase() !== "get") {
+                        throw new Error("CSR data loader request only support http GET method");
                     }
-                    match = matches === null || matches === void 0 ? void 0 : matches.find(function(match2) {
-                        return match2.route.id === routeId;
+                    basename = entry.urlPath;
+                    dataRoutes = transformNestedRoutes(routes);
+                    staticHandler = createStaticHandler(dataRoutes, {
+                        basename: basename
                     });
-                    if (!match) {
-                        res.statusCode = 403;
-                        res.end("Route ".concat(routeId, " does not match URL ").concat(context.path));
-                        return [
-                            2
-                        ];
-                    }
+                    res = context.res;
                     request = createLoaderRequest(context);
-                    _state.label = 2;
-                case 2:
+                    _state.label = 1;
+                case 1:
                     _state.trys.push([
-                        2,
-                        4,
+                        1,
+                        3,
                         ,
-                        5
+                        4
                     ]);
                     return [
                         4,
-                        callRouteLoader({
-                            loader: match.route.loader,
-                            routeId: match.route.id,
-                            params: match.params,
-                            request: request,
-                            loadContext: {}
+                        staticHandler.queryRoute(request, {
+                            routeId: routeId,
+                            requestContext: context
                         })
                     ];
-                case 3:
+                case 2:
                     response = _state.sent();
-                    if (isRedirectResponse(response)) {
-                        headers = new Headers(response.headers);
-                        headers.set("X-Modernjs-Redirect", headers.get("Location"));
-                        headers.delete("Location");
-                        response = new NodeResponse(null, {
-                            status: 204,
-                            headers: headers
+                    if (isResponse(response) && isRedirectResponse(response.status)) {
+                        response = convertModernRedirectResponse(response.headers, basename);
+                    } else if (isPlainObject(response) && DEFERRED_SYMBOL in response) {
+                        deferredData = response[DEFERRED_SYMBOL];
+                        body = createDeferredReadableStream(deferredData, request.signal);
+                        init = deferredData.init || {};
+                        if (init.status && isRedirectResponse(init.status)) {
+                            if (!init.headers) {
+                                throw new Error("redirect response includes no headers");
+                            }
+                            response = convertModernRedirectResponse(new Headers(init.headers), basename);
+                        } else {
+                            headers = new Headers(init.headers);
+                            headers.set("Content-Type", CONTENT_TYPE_DEFERRED);
+                            init.headers = headers;
+                            response = new NodeResponse(body, init);
+                        }
+                    } else {
+                        response = isResponse(response) ? response : new NodeResponse(JSON.stringify(response), {
+                            headers: {
+                                "Content-Type": "application/json; charset=utf-8"
+                            }
                         });
                     }
                     return [
                         3,
-                        5
+                        4
                     ];
-                case 4:
+                case 3:
                     error = _state.sent();
-                    message = String(error);
+                    message = _instanceof(error, ErrorResponse) ? error.data : String(error);
                     response = new NodeResponse(message, {
                         status: 500,
                         headers: {
@@ -532,9 +425,9 @@ var handleRequest = function() {
                     });
                     return [
                         3,
-                        5
+                        4
                     ];
-                case 5:
+                case 4:
                     sendLoaderResponse(res, response);
                     return [
                         2
@@ -546,33 +439,4 @@ var handleRequest = function() {
         return _ref.apply(this, arguments);
     };
 }();
-var server_default = function() {
-    return {
-        name: "@modern-js/plugin-data-loader",
-        setup: function() {
-            return {
-                preparebeforeRouteHandler: function preparebeforeRouteHandler(param) {
-                    var serverRoutes = param.serverRoutes, distDir = param.distDir;
-                    return function() {
-                        var _ref = _asyncToGenerator(function(context) {
-                            return __generator(this, function(_state) {
-                                return [
-                                    2,
-                                    handleRequest({
-                                        serverRoutes: serverRoutes,
-                                        distDir: distDir,
-                                        context: context
-                                    })
-                                ];
-                            });
-                        });
-                        return function(context) {
-                            return _ref.apply(this, arguments);
-                        };
-                    }();
-                }
-            };
-        }
-    };
-};
-export { server_default as default, getPathWithoutEntry, handleRequest, isRedirectResponse, isResponse };
+export { handleRequest, isRedirectResponse, isResponse, matchEntry };