@modern-js/plugin-data-loader 2.6.0 → 2.7.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/esm/runtime/index.js

@@ -0,0 +1,427 @@
+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 _arrayWithHoles(arr) {
+    if (Array.isArray(arr)) return arr;
+}
+function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) {
+    try {
+        var info = gen[key](arg);
+        var value = info.value;
+    } catch (error) {
+        reject(error);
+        return;
+    }
+    if (info.done) {
+        resolve(value);
+    } else {
+        Promise.resolve(value).then(_next, _throw);
+    }
+}
+function _asyncToGenerator(fn) {
+    return function() {
+        var self = this, args = arguments;
+        return new Promise(function(resolve, reject) {
+            var gen = fn.apply(self, args);
+            function _next(value) {
+                asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value);
+            }
+            function _throw(err) {
+                asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err);
+            }
+            _next(undefined);
+        });
+    };
+}
+function _instanceof(left, right) {
+    if (right != null && typeof Symbol !== "undefined" && right[Symbol.hasInstance]) {
+        return !!right[Symbol.hasInstance](left);
+    } else {
+        return left instanceof right;
+    }
+}
+function _iterableToArrayLimit(arr, i) {
+    var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"];
+    if (_i == null) return;
+    var _arr = [];
+    var _n = true;
+    var _d = false;
+    var _s, _e;
+    try {
+        for(_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true){
+            _arr.push(_s.value);
+            if (i && _arr.length === i) break;
+        }
+    } catch (err) {
+        _d = true;
+        _e = err;
+    } finally{
+        try {
+            if (!_n && _i["return"] != null) _i["return"]();
+        } finally{
+            if (_d) throw _e;
+        }
+    }
+    return _arr;
+}
+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 _slicedToArray(arr, i) {
+    return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest();
+}
+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(n);
+    if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen);
+}
+var __generator = this && this.__generator || function(thisArg, body) {
+    var f, y, t, g, _ = {
+        label: 0,
+        sent: function() {
+            if (t[0] & 1) throw t[1];
+            return t[1];
+        },
+        trys: [],
+        ops: []
+    };
+    return(g = {
+        next: verb(0),
+        "throw": verb(1),
+        "return": verb(2)
+    }, typeof Symbol === "function" && (g[Symbol.iterator] = function() {
+        return this;
+    }), g);
+    function verb(n) {
+        return function(v) {
+            return step([
+                n,
+                v
+            ]);
+        };
+    }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while(_)try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [
+                op[0] & 2,
+                t.value
+            ];
+            switch(op[0]){
+                case 0:
+                case 1:
+                    t = op;
+                    break;
+                case 4:
+                    _.label++;
+                    return {
+                        value: op[1],
+                        done: false
+                    };
+                case 5:
+                    _.label++;
+                    y = op[1];
+                    op = [
+                        0
+                    ];
+                    continue;
+                case 7:
+                    op = _.ops.pop();
+                    _.trys.pop();
+                    continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) {
+                        _ = 0;
+                        continue;
+                    }
+                    if (op[0] === 3 && (!t || op[1] > t[0] && op[1] < t[3])) {
+                        _.label = op[1];
+                        break;
+                    }
+                    if (op[0] === 6 && _.label < t[1]) {
+                        _.label = t[1];
+                        t = op;
+                        break;
+                    }
+                    if (t && _.label < t[2]) {
+                        _.label = t[2];
+                        _.ops.push(op);
+                        break;
+                    }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop();
+                    continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) {
+            op = [
+                6,
+                e
+            ];
+            y = 0;
+        } finally{
+            f = t = 0;
+        }
+        if (op[0] & 5) throw op[1];
+        return {
+            value: op[0] ? op[1] : void 0,
+            done: true
+        };
+    }
+};
+import { installGlobals, writeReadableStreamToWritable, Response as NodeResponse } from "@remix-run/node";
+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,
+    302,
+    303,
+    307,
+    308
+]);
+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";
+}
+function convertModernRedirectResponse(headers, basename) {
+    var newHeaders = new Headers(headers);
+    var redirectUrl = headers.get("Location");
+    if (basename !== "/") {
+        redirectUrl = redirectUrl.replace(basename, "");
+    }
+    newHeaders.set("X-Modernjs-Redirect", redirectUrl);
+    newHeaders.delete("Location");
+    return new NodeResponse(null, {
+        status: 204,
+        headers: newHeaders
+    });
+}
+var createLoaderHeaders = function(requestHeaders) {
+    var headers = new Headers();
+    var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
+    try {
+        for(var _iterator = Object.entries(requestHeaders)[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true){
+            var _step_value = _slicedToArray(_step.value, 2), key = _step_value[0], values = _step_value[1];
+            if (values) {
+                if (Array.isArray(values)) {
+                    var _iteratorNormalCompletion1 = true, _didIteratorError1 = false, _iteratorError1 = undefined;
+                    try {
+                        for(var _iterator1 = values[Symbol.iterator](), _step1; !(_iteratorNormalCompletion1 = (_step1 = _iterator1.next()).done); _iteratorNormalCompletion1 = true){
+                            var value = _step1.value;
+                            headers.append(key, value);
+                        }
+                    } catch (err) {
+                        _didIteratorError1 = true;
+                        _iteratorError1 = err;
+                    } finally{
+                        try {
+                            if (!_iteratorNormalCompletion1 && _iterator1.return != null) {
+                                _iterator1.return();
+                            }
+                        } finally{
+                            if (_didIteratorError1) {
+                                throw _iteratorError1;
+                            }
+                        }
+                    }
+                } else {
+                    headers.set(key, values);
+                }
+            }
+        }
+    } catch (err) {
+        _didIteratorError = true;
+        _iteratorError = err;
+    } finally{
+        try {
+            if (!_iteratorNormalCompletion && _iterator.return != null) {
+                _iterator.return();
+            }
+        } finally{
+            if (_didIteratorError) {
+                throw _iteratorError;
+            }
+        }
+    }
+    return headers;
+};
+var createLoaderRequest = function(context) {
+    var origin = "".concat(context.protocol, "://").concat(context.host);
+    var url = new URL(context.url, origin);
+    var controller = new AbortController();
+    var init = {
+        method: context.method,
+        headers: createLoaderHeaders(context.headers),
+        signal: controller.signal
+    };
+    return new Request(url.href, init);
+};
+var sendLoaderResponse = function() {
+    var _ref = _asyncToGenerator(function(res, nodeResponse) {
+        var _iteratorNormalCompletion, _didIteratorError, _iteratorError, _iterator, _step, _step_value, key, value;
+        return __generator(this, function(_state) {
+            switch(_state.label){
+                case 0:
+                    res.statusMessage = nodeResponse.statusText;
+                    res.statusCode = nodeResponse.status;
+                    _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
+                    try {
+                        for(_iterator = nodeResponse.headers.entries()[Symbol.iterator](); !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true){
+                            _step_value = _slicedToArray(_step.value, 2), key = _step_value[0], value = _step_value[1];
+                            res.setHeader(key, value);
+                        }
+                    } catch (err) {
+                        _didIteratorError = true;
+                        _iteratorError = err;
+                    } finally{
+                        try {
+                            if (!_iteratorNormalCompletion && _iterator.return != null) {
+                                _iterator.return();
+                            }
+                        } finally{
+                            if (_didIteratorError) {
+                                throw _iteratorError;
+                            }
+                        }
+                    }
+                    if (!nodeResponse.body) return [
+                        3,
+                        2
+                    ];
+                    return [
+                        4,
+                        writeReadableStreamToWritable(nodeResponse.body, res)
+                    ];
+                case 1:
+                    _state.sent();
+                    return [
+                        3,
+                        3
+                    ];
+                case 2:
+                    res.end();
+                    _state.label = 3;
+                case 3:
+                    return [
+                        2
+                    ];
+            }
+        });
+    });
+    return function sendLoaderResponse(res, nodeResponse) {
+        return _ref.apply(this, arguments);
+    };
+}();
+var matchEntry = function(pathname, entries) {
+    return entries.find(function(entry) {
+        return pathname.startsWith(entry.urlPath);
+    });
+};
+var handleRequest = function() {
+    var _ref = _asyncToGenerator(function(param) {
+        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, routes = param.routes;
+                    method = context.method, query = context.query;
+                    routeId = query[LOADER_ID_PARAM];
+                    entry = matchEntry(context.path, serverRoutes);
+                    if (!routeId || !entry) {
+                        return [
+                            2
+                        ];
+                    }
+                    if (method.toLowerCase() !== "get") {
+                        throw new Error("CSR data loader request only support http GET method");
+                    }
+                    basename = entry.urlPath;
+                    dataRoutes = transformNestedRoutes(routes);
+                    staticHandler = createStaticHandler(dataRoutes, {
+                        basename: basename
+                    });
+                    res = context.res;
+                    request = createLoaderRequest(context);
+                    _state.label = 1;
+                case 1:
+                    _state.trys.push([
+                        1,
+                        3,
+                        ,
+                        4
+                    ]);
+                    return [
+                        4,
+                        staticHandler.queryRoute(request, {
+                            routeId: routeId,
+                            requestContext: context
+                        })
+                    ];
+                case 2:
+                    response = _state.sent();
+                    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,
+                        4
+                    ];
+                case 3:
+                    error = _state.sent();
+                    message = _instanceof(error, ErrorResponse) ? error.data : String(error);
+                    response = new NodeResponse(message, {
+                        status: 500,
+                        headers: {
+                            "Content-Type": "text/plain"
+                        }
+                    });
+                    return [
+                        3,
+                        4
+                    ];
+                case 4:
+                    sendLoaderResponse(res, response);
+                    return [
+                        2
+                    ];
+            }
+        });
+    });
+    return function handleRequest(_) {
+        return _ref.apply(this, arguments);
+    };
+}();
+export { handleRequest, isRedirectResponse, isResponse, matchEntry };