@modern-js/plugin-data-loader 0.0.0-next-20240315022508 → 0.0.0-next-20240315034729

package/dist/cjs/runtime/index.js

@@ -59,20 +59,66 @@ function convertModernRedirectResponse(headers, basename) {
     headers: newHeaders
   });
 }
-const handleRequest = async ({ request, serverRoutes, routes: routesConfig, context }) => {
-  const url = new URL(request.url);
-  const routeId = url.searchParams.get(import_constants2.LOADER_ID_PARAM);
-  const entry = (0, import_node2.matchEntry)(url.pathname, serverRoutes);
+const createLoaderHeaders = (requestHeaders) => {
+  const headers = new Headers();
+  for (const [key, values] of Object.entries(requestHeaders)) {
+    if (values) {
+      if (Array.isArray(values)) {
+        for (const value of values) {
+          headers.append(key, value);
+        }
+      } else {
+        headers.set(key, values);
+      }
+    }
+  }
+  return headers;
+};
+const createRequest = (context) => {
+  const origin = `${context.protocol}://${context.host}`;
+  const url = new URL(context.url, origin);
+  const controller = new AbortController();
+  const init = {
+    method: context.method,
+    headers: createLoaderHeaders(context.headers),
+    signal: controller.signal
+  };
+  if (![
+    "GET",
+    "HEAD"
+  ].includes(context.method.toUpperCase())) {
+    init.body = context.req;
+  }
+  const request = new Request(url.href, init);
+  return request;
+};
+const sendLoaderResponse = async (res, nodeResponse) => {
+  res.statusMessage = nodeResponse.statusText;
+  res.statusCode = nodeResponse.status;
+  for (const [key, value] of nodeResponse.headers.entries()) {
+    res.setHeader(key, value);
+  }
+  if (nodeResponse.body) {
+    await (0, import_node.writeReadableStreamToWritable)(nodeResponse.body, res);
+  } else {
+    res.end();
+  }
+};
+const handleRequest = async ({ context, serverRoutes, routes: routesConfig }) => {
+  const { query } = context;
+  const routeId = query[import_constants2.LOADER_ID_PARAM];
+  const entry = (0, import_node2.matchEntry)(context.path, serverRoutes);
   if (!routeId || !entry) {
     return;
   }
   const basename = entry.urlPath;
   const end = (0, import_time.time)();
-  const { logger, reporter } = context;
+  const { res, logger, reporter } = context;
   const routes = (0, import_browser.transformNestedRoutes)(routesConfig, reporter);
   const { queryRoute } = (0, import_remix_router.createStaticHandler)(routes, {
     basename
   });
+  const request = createRequest(context);
   const requestContext = (0, import_node2.createRequestContext)();
   requestContext.set(import_node2.reporterCtx, reporter);
   let response;
@@ -105,8 +151,6 @@ const handleRequest = async ({ request, serverRoutes, routes: routesConfig, cont
         }
       });
     }
-    const cost = end();
-    reporter === null || reporter === void 0 ? void 0 : reporter.reportTiming(`${import_constants.LOADER_REPORTER_NAME}-navigation`, cost);
   } catch (error) {
     const message = (0, import_remix_router.isRouteErrorResponse)(error) ? error.data : String(error);
     if (error instanceof Error) {
@@ -121,7 +165,9 @@ const handleRequest = async ({ request, serverRoutes, routes: routesConfig, cont
       }
     });
   }
-  return response;
+  const cost = end();
+  reporter.reportTiming(`${import_constants.LOADER_REPORTER_NAME}-navigation`, cost);
+  await sendLoaderResponse(res, response);
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/dist/cjs/server/index.js

@@ -0,0 +1,63 @@
+"use strict";
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var server_exports = {};
+__export(server_exports, {
+  default: () => server_default
+});
+module.exports = __toCommonJS(server_exports);
+var import_path = __toESM(require("path"));
+var import_fs = __toESM(require("fs"));
+var import_utils = require("@modern-js/utils");
+var import_node = require("@modern-js/runtime-utils/node");
+var server_default = () => ({
+  name: "@modern-js/plugin-data-loader",
+  setup: () => ({
+    prepareLoaderHandler({ serverRoutes, distDir }) {
+      return async (context) => {
+        const entry = (0, import_node.matchEntry)(context.path, serverRoutes);
+        if (!entry) {
+          return;
+        }
+        const routesPath = import_path.default.join(distDir, import_utils.SERVER_BUNDLE_DIRECTORY, `${entry.entryName || import_utils.MAIN_ENTRY_NAME}-server-loaders.js`);
+        if (!import_fs.default.existsSync(routesPath)) {
+          return;
+        }
+        const { routes, handleRequest } = await Promise.resolve().then(() => __toESM(require(routesPath)));
+        if (!routes) {
+          return;
+        }
+        return handleRequest({
+          serverRoutes,
+          context,
+          routes
+        });
+      };
+    }
+  })
+});

package/dist/esm/runtime/index.js

@@ -1,7 +1,8 @@
 import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
 import { _ as _instanceof } from "@swc/helpers/_/_instanceof";
+import { _ as _sliced_to_array } from "@swc/helpers/_/_sliced_to_array";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
-import { installGlobals, Response as NodeResponse } from "@remix-run/node";
+import { installGlobals, writeReadableStreamToWritable, Response as NodeResponse } from "@remix-run/node";
 import { createStaticHandler, UNSAFE_DEFERRED_SYMBOL as DEFERRED_SYMBOL, isRouteErrorResponse } from "@modern-js/runtime-utils/remix-router";
 import { transformNestedRoutes } from "@modern-js/runtime-utils/browser";
 import { isPlainObject } from "@modern-js/utils/lodash";
@@ -37,16 +38,140 @@ function convertModernRedirectResponse(headers, basename) {
     headers: newHeaders
   });
 }
+var createLoaderHeaders = function(requestHeaders) {
+  var headers = new Headers();
+  var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = void 0;
+  try {
+    for (var _iterator = Object.entries(requestHeaders)[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
+      var _step_value = _sliced_to_array(_step.value, 2), key = _step_value[0], values = _step_value[1];
+      if (values) {
+        if (Array.isArray(values)) {
+          var _iteratorNormalCompletion1 = true, _didIteratorError1 = false, _iteratorError1 = void 0;
+          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 createRequest = 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
+  };
+  if (![
+    "GET",
+    "HEAD"
+  ].includes(context.method.toUpperCase())) {
+    init.body = context.req;
+  }
+  var request = new Request(url.href, init);
+  return request;
+};
+var sendLoaderResponse = function() {
+  var _ref = _async_to_generator(function(res, nodeResponse) {
+    var _iteratorNormalCompletion, _didIteratorError, _iteratorError, _iterator, _step, _step_value, key, value;
+    return _ts_generator(this, function(_state) {
+      switch (_state.label) {
+        case 0:
+          res.statusMessage = nodeResponse.statusText;
+          res.statusCode = nodeResponse.status;
+          _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = void 0;
+          try {
+            for (_iterator = nodeResponse.headers.entries()[Symbol.iterator](); !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
+              _step_value = _sliced_to_array(_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 sendLoaderResponse2(res, nodeResponse) {
+    return _ref.apply(this, arguments);
+  };
+}();
 var handleRequest = function() {
   var _ref = _async_to_generator(function(param) {
-    var request, serverRoutes, routesConfig, context, url, routeId, entry, basename, end, logger, reporter, routes, queryRoute, requestContext, response, deferredData, body, init, headers, cost, error, message;
+    var context, serverRoutes, routesConfig, query, routeId, entry, basename, end, res, logger, reporter, routes, queryRoute, request, requestContext, response, deferredData, body, init, headers, error, message, cost;
     return _ts_generator(this, function(_state) {
       switch (_state.label) {
         case 0:
-          request = param.request, serverRoutes = param.serverRoutes, routesConfig = param.routes, context = param.context;
-          url = new URL(request.url);
-          routeId = url.searchParams.get(LOADER_ID_PARAM);
-          entry = matchEntry(url.pathname, serverRoutes);
+          context = param.context, serverRoutes = param.serverRoutes, routesConfig = param.routes;
+          query = context.query;
+          routeId = query[LOADER_ID_PARAM];
+          entry = matchEntry(context.path, serverRoutes);
           if (!routeId || !entry) {
             return [
               2
@@ -54,11 +179,12 @@ var handleRequest = function() {
           }
           basename = entry.urlPath;
           end = time();
-          logger = context.logger, reporter = context.reporter;
+          res = context.res, logger = context.logger, reporter = context.reporter;
           routes = transformNestedRoutes(routesConfig, reporter);
           queryRoute = createStaticHandler(routes, {
             basename
           }).queryRoute;
+          request = createRequest(context);
           requestContext = createRequestContext();
           requestContext.set(reporterCtx, reporter);
           _state.label = 1;
@@ -102,8 +228,6 @@ var handleRequest = function() {
               }
             });
           }
-          cost = end();
-          reporter === null || reporter === void 0 ? void 0 : reporter.reportTiming("".concat(LOADER_REPORTER_NAME, "-navigation"), cost);
           return [
             3,
             4
@@ -127,9 +251,16 @@ var handleRequest = function() {
             4
           ];
         case 4:
+          cost = end();
+          reporter.reportTiming("".concat(LOADER_REPORTER_NAME, "-navigation"), cost);
+          return [
+            4,
+            sendLoaderResponse(res, response)
+          ];
+        case 5:
+          _state.sent();
           return [
-            2,
-            response
+            2
           ];
       }
     });

package/dist/esm/server/index.js

@@ -0,0 +1,66 @@
+import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
+import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
+import path from "path";
+import fs from "fs";
+import { MAIN_ENTRY_NAME, SERVER_BUNDLE_DIRECTORY } from "@modern-js/utils";
+import { matchEntry } from "@modern-js/runtime-utils/node";
+function server_default() {
+  return {
+    name: "@modern-js/plugin-data-loader",
+    setup: function() {
+      return {
+        prepareLoaderHandler: function prepareLoaderHandler(param) {
+          var serverRoutes = param.serverRoutes, distDir = param.distDir;
+          return function() {
+            var _ref = _async_to_generator(function(context) {
+              var entry, routesPath, _ref2, routes, handleRequest;
+              return _ts_generator(this, function(_state) {
+                switch (_state.label) {
+                  case 0:
+                    entry = matchEntry(context.path, serverRoutes);
+                    if (!entry) {
+                      return [
+                        2
+                      ];
+                    }
+                    routesPath = path.join(distDir, SERVER_BUNDLE_DIRECTORY, "".concat(entry.entryName || MAIN_ENTRY_NAME, "-server-loaders.js"));
+                    if (!fs.existsSync(routesPath)) {
+                      return [
+                        2
+                      ];
+                    }
+                    return [
+                      4,
+                      import(routesPath)
+                    ];
+                  case 1:
+                    _ref2 = _state.sent(), routes = _ref2.routes, handleRequest = _ref2.handleRequest;
+                    if (!routes) {
+                      return [
+                        2
+                      ];
+                    }
+                    return [
+                      2,
+                      handleRequest({
+                        serverRoutes,
+                        context,
+                        routes
+                      })
+                    ];
+                }
+              });
+            });
+            return function(context) {
+              return _ref.apply(this, arguments);
+            };
+          }();
+        }
+      };
+    }
+  };
+}
+;
+export {
+  server_default as default
+};

package/dist/esm-node/runtime/index.js

@@ -1,4 +1,4 @@
-import { installGlobals, Response as NodeResponse } from "@remix-run/node";
+import { installGlobals, writeReadableStreamToWritable, Response as NodeResponse } from "@remix-run/node";
 import { createStaticHandler, UNSAFE_DEFERRED_SYMBOL as DEFERRED_SYMBOL, isRouteErrorResponse } from "@modern-js/runtime-utils/remix-router";
 import { transformNestedRoutes } from "@modern-js/runtime-utils/browser";
 import { isPlainObject } from "@modern-js/utils/lodash";
@@ -34,20 +34,66 @@ function convertModernRedirectResponse(headers, basename) {
     headers: newHeaders
   });
 }
-const handleRequest = async ({ request, serverRoutes, routes: routesConfig, context }) => {
-  const url = new URL(request.url);
-  const routeId = url.searchParams.get(LOADER_ID_PARAM);
-  const entry = matchEntry(url.pathname, serverRoutes);
+const createLoaderHeaders = (requestHeaders) => {
+  const headers = new Headers();
+  for (const [key, values] of Object.entries(requestHeaders)) {
+    if (values) {
+      if (Array.isArray(values)) {
+        for (const value of values) {
+          headers.append(key, value);
+        }
+      } else {
+        headers.set(key, values);
+      }
+    }
+  }
+  return headers;
+};
+const createRequest = (context) => {
+  const origin = `${context.protocol}://${context.host}`;
+  const url = new URL(context.url, origin);
+  const controller = new AbortController();
+  const init = {
+    method: context.method,
+    headers: createLoaderHeaders(context.headers),
+    signal: controller.signal
+  };
+  if (![
+    "GET",
+    "HEAD"
+  ].includes(context.method.toUpperCase())) {
+    init.body = context.req;
+  }
+  const request = new Request(url.href, init);
+  return request;
+};
+const sendLoaderResponse = async (res, nodeResponse) => {
+  res.statusMessage = nodeResponse.statusText;
+  res.statusCode = nodeResponse.status;
+  for (const [key, value] of nodeResponse.headers.entries()) {
+    res.setHeader(key, value);
+  }
+  if (nodeResponse.body) {
+    await writeReadableStreamToWritable(nodeResponse.body, res);
+  } else {
+    res.end();
+  }
+};
+const handleRequest = async ({ context, serverRoutes, routes: routesConfig }) => {
+  const { query } = context;
+  const routeId = query[LOADER_ID_PARAM];
+  const entry = matchEntry(context.path, serverRoutes);
   if (!routeId || !entry) {
     return;
   }
   const basename = entry.urlPath;
   const end = time();
-  const { logger, reporter } = context;
+  const { res, logger, reporter } = context;
   const routes = transformNestedRoutes(routesConfig, reporter);
   const { queryRoute } = createStaticHandler(routes, {
     basename
   });
+  const request = createRequest(context);
   const requestContext = createRequestContext();
   requestContext.set(reporterCtx, reporter);
   let response;
@@ -80,8 +126,6 @@ const handleRequest = async ({ request, serverRoutes, routes: routesConfig, cont
         }
       });
     }
-    const cost = end();
-    reporter === null || reporter === void 0 ? void 0 : reporter.reportTiming(`${LOADER_REPORTER_NAME}-navigation`, cost);
   } catch (error) {
     const message = isRouteErrorResponse(error) ? error.data : String(error);
     if (error instanceof Error) {
@@ -96,7 +140,9 @@ const handleRequest = async ({ request, serverRoutes, routes: routesConfig, cont
       }
     });
   }
-  return response;
+  const cost = end();
+  reporter.reportTiming(`${LOADER_REPORTER_NAME}-navigation`, cost);
+  await sendLoaderResponse(res, response);
 };
 export {
   handleRequest,

package/dist/esm-node/server/index.js

@@ -0,0 +1,33 @@
+import path from "path";
+import fs from "fs";
+import { MAIN_ENTRY_NAME, SERVER_BUNDLE_DIRECTORY } from "@modern-js/utils";
+import { matchEntry } from "@modern-js/runtime-utils/node";
+var server_default = () => ({
+  name: "@modern-js/plugin-data-loader",
+  setup: () => ({
+    prepareLoaderHandler({ serverRoutes, distDir }) {
+      return async (context) => {
+        const entry = matchEntry(context.path, serverRoutes);
+        if (!entry) {
+          return;
+        }
+        const routesPath = path.join(distDir, SERVER_BUNDLE_DIRECTORY, `${entry.entryName || MAIN_ENTRY_NAME}-server-loaders.js`);
+        if (!fs.existsSync(routesPath)) {
+          return;
+        }
+        const { routes, handleRequest } = await import(routesPath);
+        if (!routes) {
+          return;
+        }
+        return handleRequest({
+          serverRoutes,
+          context,
+          routes
+        });
+      };
+    }
+  })
+});
+export {
+  server_default as default
+};

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

@@ -1,13 +1,10 @@
-import type { Logger, NestedRoute, Reporter, ServerRoute } from '@modern-js/types';
+import type { NestedRoute, ServerRoute } from '@modern-js/types';
 import { Response as NodeResponse } from '@remix-run/node';
+import { ServerContext } from '@modern-js/runtime-utils/node';
 export declare function isRedirectResponse(status: number): boolean;
 export declare function isResponse(value: any): value is NodeResponse;
-export declare const handleRequest: ({ request, serverRoutes, routes: routesConfig, context, }: {
-    request: Request;
+export declare const handleRequest: ({ context, serverRoutes, routes: routesConfig, }: {
+    context: ServerContext;
     serverRoutes: ServerRoute[];
     routes: NestedRoute[];
-    context: {
-        logger: Logger;
-        reporter?: Reporter;
-    };
-}) => Promise<Response | void>;
+}) => Promise<void>;

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

@@ -0,0 +1,3 @@
+import type { ServerPlugin } from '@modern-js/server-core';
+declare const _default: () => ServerPlugin;
+export default _default;

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "0.0.0-next-20240315022508",
+  "version": "0.0.0-next-20240315034729",
   "engines": {
     "node": ">=14.17.6"
   },
@@ -29,6 +29,11 @@
       "jsnext:source": "./src/cli/loader.ts",
       "default": "./dist/cjs/cli/loader.js"
     },
+    "./server": {
+      "types": "./dist/types/server/index.d.ts",
+      "jsnext:source": "./src/server/index.ts",
+      "default": "./dist/cjs/server/index.js"
+    },
     "./runtime": {
       "types": "./dist/types/runtime/index.d.ts",
       "jsnext:source": "./src/runtime/index.ts",
@@ -40,6 +45,9 @@
       "loader": [
         "./dist/types/cli/loader.d.ts"
       ],
+      "server": [
+        "./dist/types/server/index.d.ts"
+      ],
       "runtime": [
         "./dist/types/runtime/index.d.ts"
       ]
@@ -50,8 +58,8 @@
     "@remix-run/node": "^1.12.0",
     "path-to-regexp": "^6.2.0",
     "@swc/helpers": "0.5.3",
-    "@modern-js/utils": "0.0.0-next-20240315022508",
-    "@modern-js/runtime-utils": "0.0.0-next-20240315022508"
+    "@modern-js/runtime-utils": "0.0.0-next-20240315034729",
+    "@modern-js/utils": "0.0.0-next-20240315034729"
   },
   "devDependencies": {
     "@types/babel__core": "^7.20.1",
@@ -67,11 +75,11 @@
     "webpack": "^5.89.0",
     "react": "^18",
     "react-dom": "^18",
-    "@modern-js/core": "0.0.0-next-20240315022508",
-    "@modern-js/server-core": "0.0.0-next-20240315022508",
-    "@modern-js/types": "0.0.0-next-20240315022508",
-    "@scripts/build": "0.0.0-next-20240315022508",
-    "@scripts/jest-config": "0.0.0-next-20240315022508"
+    "@modern-js/server-core": "0.0.0-next-20240315034729",
+    "@modern-js/core": "0.0.0-next-20240315034729",
+    "@modern-js/types": "0.0.0-next-20240315034729",
+    "@scripts/build": "0.0.0-next-20240315034729",
+    "@scripts/jest-config": "0.0.0-next-20240315034729"
   },
   "peerDependencies": {
     "react": ">=17.0.0"