@modern-js/plugin-data-loader 2.5.0-alpha.0 → 2.5.1-alpha.0

package/dist/js/treeshaking/cli/generate-client.js

@@ -0,0 +1,45 @@
+import path from "path";
+var generateClient = function(param) {
+    var mapFile = param.mapFile, loaderId = param.loaderId;
+    delete require.cache[mapFile];
+    var loadersMap = require(mapFile);
+    var requestCode = "";
+    var exportsCode = "";
+    var requestCreatorPath = path.join(__dirname, "./create-request").replace("/node/cli/", "/treeshaking/cli/").replace(/\\/g, "/");
+    var importCode = "\n    import { createRequest } from '".concat(requestCreatorPath, "';\n  ");
+    if (!loaderId) {
+        requestCode = Object.keys(loadersMap).map(function(loaderId2) {
+            var routeId = loadersMap[loaderId2].routeId;
+            return "\n      const ".concat(loaderId2, " = createRequest('").concat(routeId, "');\n    ");
+        }).join("");
+        exportsCode = "export {";
+        var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
+        try {
+            for(var _iterator = Object.keys(loadersMap)[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true){
+                var loader = _step.value;
+                exportsCode += "".concat(loader, ",");
+            }
+        } catch (err) {
+            _didIteratorError = true;
+            _iteratorError = err;
+        } finally{
+            try {
+                if (!_iteratorNormalCompletion && _iterator.return != null) {
+                    _iterator.return();
+                }
+            } finally{
+                if (_didIteratorError) {
+                    throw _iteratorError;
+                }
+            }
+        }
+        exportsCode += "}";
+    } else {
+        var loader1 = loadersMap[loaderId];
+        requestCode = "\n      const loader = createRequest('".concat(loader1.routeId, "');\n    ");
+        exportsCode = "export default loader;";
+    }
+    var generatedCode = "\n    ".concat(importCode, "\n    ").concat(requestCode, "\n    ").concat(exportsCode, "\n  ");
+    return generatedCode;
+};
+export { generateClient };

package/dist/js/treeshaking/cli/loader.js

@@ -0,0 +1,154 @@
+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);
+        });
+    };
+}
+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 { generateClient } from "./generate-client";
+function loader(source) {
+    return _loader.apply(this, arguments);
+}
+function _loader() {
+    _loader = _asyncToGenerator(function(source) {
+        var _this__compiler, target, options, code;
+        return __generator(this, function(_state) {
+            this.cacheable();
+            target = (_this__compiler = this._compiler) === null || _this__compiler === void 0 ? void 0 : _this__compiler.options.target;
+            if (target === "node") {
+                return [
+                    2,
+                    source
+                ];
+            }
+            options = this.getOptions();
+            code = generateClient({
+                mapFile: options.mapFile,
+                loaderId: options.loaderId
+            });
+            return [
+                2,
+                code
+            ];
+        });
+    });
+    return _loader.apply(this, arguments);
+}
+export { loader as default };

package/dist/js/treeshaking/common/constants.js

@@ -0,0 +1,3 @@
+var LOADER_ID_PARAM = "__loader";
+var DIRECT_PARAM = "__ssrDirect";
+export { DIRECT_PARAM, LOADER_ID_PARAM };

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

@@ -35,12 +35,18 @@ function _asyncToGenerator(fn) {
         });
     };
 }
-function _instanceof(left, right) {
-    if (right != null && typeof Symbol !== "undefined" && right[Symbol.hasInstance]) {
-        return !!right[Symbol.hasInstance](left);
+function _defineProperty(obj, key, value) {
+    if (key in obj) {
+        Object.defineProperty(obj, key, {
+            value: value,
+            enumerable: true,
+            configurable: true,
+            writable: true
+        });
     } else {
-        return left instanceof right;
+        obj[key] = value;
     }
+    return obj;
 }
 function _iterableToArrayLimit(arr, i) {
     var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"];
@@ -69,6 +75,45 @@ 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();
 }
@@ -175,11 +220,11 @@ var __generator = this && this.__generator || function(thisArg, body) {
         };
     }
 };
+import path from "path";
 import { installGlobals, writeReadableStreamToWritable, Response as NodeResponse } from "@remix-run/node";
-import { transformNestedRoutes } from "@modern-js/utils";
-import { createStaticHandler, ErrorResponse, UNSAFE_DEFERRED_SYMBOL as DEFERRED_SYMBOL } from "@modern-js/utils/remix-router";
+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 { createDeferredReadableStream } from "./response";
 installGlobals();
 var redirectStatusCodes = /* @__PURE__ */ new Set([
     301,
@@ -188,21 +233,81 @@ var redirectStatusCodes = /* @__PURE__ */ new Set([
     307,
     308
 ]);
-function isRedirectResponse(status) {
-    return redirectStatusCodes.has(status);
+function isRedirectResponse(response) {
+    return redirectStatusCodes.has(response.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) {
-    var newHeaders = new Headers(headers);
-    newHeaders.set("X-Modernjs-Redirect", headers.get("Location"));
-    newHeaders.delete("Location");
-    return new NodeResponse(null, {
-        status: 204,
-        headers: newHeaders
+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");
+    }
+    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)
+                    ];
+            }
+        });
     });
-}
+    return function callRouteLoader(_) {
+        return _ref.apply(this, arguments);
+    };
+}();
 var createLoaderHeaders = function(requestHeaders) {
     var headers = new Headers();
     var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
@@ -319,6 +424,12 @@ 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) {
     return entries.find(function(entry) {
         return pathname.startsWith(entry.urlPath);
@@ -326,77 +437,93 @@ var matchEntry = function(pathname, entries) {
 };
 var handleRequest = function() {
     var _ref = _asyncToGenerator(function(param) {
-        var context, serverRoutes, routes, method, query, routeId, entry, dataRoutes, staticHandler, res, request, response, deferredData, body, init, headers, error, message;
+        var context, serverRoutes, distDir, method, query, routeId, entry, routesPath, routes, res, pathname, matches, match, request, response, headers, error, message;
         return __generator(this, function(_state) {
             switch(_state.label){
                 case 0:
-                    context = param.context, serverRoutes = param.serverRoutes, routes = param.routes;
+                    context = param.context, serverRoutes = param.serverRoutes, distDir = param.distDir;
                     method = context.method, query = context.query;
                     routeId = query[LOADER_ID_PARAM];
-                    if (!routeId) {
-                        throw new Error("Missing parameter: ".concat(LOADER_ID_PARAM));
-                    }
-                    if (method.toLowerCase() !== "get") {
-                        throw new Error("Only support httpp GET method");
+                    if (!routeId || method.toLowerCase() !== "get") {
+                        return [
+                            2
+                        ];
                     }
                     entry = matchEntry(context.path, serverRoutes);
                     if (!entry) {
-                        throw new Error("Route is not matched");
+                        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) {
+                        return [
+                            2
+                        ];
                     }
-                    dataRoutes = transformNestedRoutes(routes);
-                    staticHandler = createStaticHandler(dataRoutes, {
-                        basename: entry.urlPath
-                    });
                     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
+                        ];
+                    }
+                    match = matches === null || matches === void 0 ? void 0 : matches.find(function(match2) {
+                        return match2.route.id === routeId;
+                    });
+                    if (!match) {
+                        res.statusCode = 403;
+                        res.end("Route ".concat(routeId, " does not match URL ").concat(context.path));
+                        return [
+                            2
+                        ];
+                    }
                     request = createLoaderRequest(context);
-                    _state.label = 1;
-                case 1:
+                    _state.label = 2;
+                case 2:
                     _state.trys.push([
-                        1,
-                        3,
+                        2,
+                        4,
                         ,
-                        4
+                        5
                     ]);
                     return [
                         4,
-                        staticHandler.queryRoute(request, {
-                            routeId: routeId,
-                            requestContext: context
+                        callRouteLoader({
+                            loader: match.route.loader,
+                            routeId: match.route.id,
+                            params: match.params,
+                            request: request,
+                            loadContext: {}
                         })
                     ];
-                case 2:
+                case 3:
                     response = _state.sent();
-                    if (isResponse(response) && isRedirectResponse(response.status)) {
-                        response = convertModernRedirectResponse(response.headers);
-                    } else if (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));
-                        } else {
-                            headers = new Headers(init.headers);
-                            headers.set("Content-Type", "text/modernjs-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"
-                            }
+                    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
                         });
                     }
                     return [
                         3,
-                        4
+                        5
                     ];
-                case 3:
+                case 4:
                     error = _state.sent();
-                    message = _instanceof(error, ErrorResponse) ? error.data : String(error);
+                    message = String(error);
                     response = new NodeResponse(message, {
                         status: 500,
                         headers: {
@@ -405,9 +532,9 @@ var handleRequest = function() {
                     });
                     return [
                         3,
-                        4
+                        5
                     ];
-                case 4:
+                case 5:
                     sendLoaderResponse(res, response);
                     return [
                         2
@@ -419,4 +546,33 @@ var handleRequest = function() {
         return _ref.apply(this, arguments);
     };
 }();
-export { handleRequest, isRedirectResponse, isResponse, matchEntry };
+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 };

package/dist/types/cli/create-request.d.ts

@@ -1,4 +1,3 @@
-import { type UNSAFE_DeferredData as DeferredData } from '@modern-js/utils/remix-router';
 export declare const getRequestUrl: ({
   params,
   request,
@@ -14,4 +13,4 @@ export declare const createRequest: (routeId: string, method?: string) => ({
 }: {
   params: Record<string, string>;
   request: Request;
-}) => Promise<DeferredData | Response>;
+}) => Promise<Response>;

package/dist/types/server/index.d.ts

@@ -1,4 +1,19 @@
 import type { ServerPlugin } from '@modern-js/server-core';
+import type { ModernServerContext, ServerRoute } from '@modern-js/types';
+import { Response as NodeResponse } from '@remix-run/node';
+export type ServerContext = Pick<ModernServerContext, 'req' | 'res' | 'params' | 'headers' | 'method' | 'url' | 'host' | 'protocol' | 'origin' | 'href' | 'path' | 'query'>;
+export declare function isRedirectResponse(response: NodeResponse): boolean;
+export declare function isResponse(value: any): value is NodeResponse;
+export declare const getPathWithoutEntry: (pathname: string, entryPath: string) => string;
+export declare const handleRequest: ({
+  context,
+  serverRoutes,
+  distDir
+}: {
+  context: ServerContext;
+  serverRoutes: ServerRoute[];
+  distDir: string;
+}) => Promise<void>;
 
 declare const _default: () => ServerPlugin;
 

package/package.json

@@ -11,10 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.5.0-alpha.0",
-  "engines": {
-    "node": ">=14.17.6"
-  },
+  "version": "2.5.1-alpha.0",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/cjs/index.js",
@@ -27,10 +24,6 @@
     "./server": {
       "jsnext:source": "./src/server/index.ts",
       "default": "./dist/cjs/server/index.js"
-    },
-    "./runtime": {
-      "jsnext:source": "./src/runtime/index.ts",
-      "default": "./dist/esm/runtime/index.js"
     }
   },
   "typesVersions": {
@@ -40,21 +33,23 @@
       ],
       "server": [
         "./dist/types/server/index.d.ts"
-      ],
-      "runtime": [
-        "./dist/types/runtime/index.d.ts"
       ]
     }
   },
   "dependencies": {
     "@babel/core": "^7.18.0",
     "@babel/runtime": "^7.18.0",
-    "@remix-run/node": "^1.12.0",
+    "@modern-js/utils": "2.5.0",
+    "@remix-run/node": "^1.9.0",
     "path-to-regexp": "^6.2.0",
-    "react-router-dom": "^6.8.1",
-    "@modern-js/utils": "2.5.0-alpha.0"
+    "react-router-dom": "^6.6.0"
   },
   "devDependencies": {
+    "@modern-js/core": "2.5.0",
+    "@modern-js/server-core": "2.5.0",
+    "@modern-js/types": "2.5.0",
+    "@scripts/build": "2.5.0",
+    "@scripts/jest-config": "2.5.0",
     "@types/babel__core": "^7.1.15",
     "@types/jest": "^27",
     "@types/node": "^14",
@@ -66,13 +61,7 @@
     "ts-jest": "^27.0.5",
     "typescript": "^4",
     "webpack": "^5.75.0",
-    "webpack-chain": "^6.5.1",
-    "@modern-js/core": "2.5.0",
-    "@modern-js/types": "2.5.0",
-    "@scripts/build": "2.5.0",
-    "@modern-js/server-core": "2.5.0",
-    "@modern-js/plugin-module-babel": "2.5.0",
-    "@scripts/jest-config": "2.5.0"
+    "webpack-chain": "^6.5.1"
   },
   "sideEffects": false,
   "publishConfig": {