@modern-js/plugin-data-loader 0.0.0-next-20230224023631 → 0.0.0-next-20230224025154

package/CHANGELOG.md

@@ -1,13 +1,12 @@
 # @modern-js/plugin-data-loader
 
-## 0.0.0-next-20230224023631
+## 0.0.0-next-20230224025154
 
-### Minor Changes
+### Patch Changes
 
-- 590dae1c3: feat: support deferred data for streaming ssr
-  feat: 流式渲染支持 deferred data
+- 7fff9020e1: chore: make file naming consistent
 
-### Patch Changes
+  chore: 统一文件命名为小驼峰格式
 
-- Updated dependencies [590dae1c3]
-  - @modern-js/utils@0.0.0-next-20230224023631
+- Updated dependencies [7fff9020e1]
+  - @modern-js/utils@0.0.0-next-20230224025154

package/dist/cjs/cli/{create-request.js → createRequest.js}

@@ -15,16 +15,15 @@ var __copyProps = (to, from, except, desc) => {
   return to;
 };
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var create_request_exports = {};
-__export(create_request_exports, {
+var createRequest_exports = {};
+__export(createRequest_exports, {
   createRequest: () => createRequest,
   getRequestUrl: () => getRequestUrl
 });
-module.exports = __toCommonJS(create_request_exports);
+module.exports = __toCommonJS(createRequest_exports);
 var import_path_to_regexp = require("path-to-regexp");
 var import_react_router_dom = require("react-router-dom");
 var import_constants = require("../common/constants");
-var import_data = require("./data");
 const getRequestUrl = ({
   params,
   request,
@@ -44,14 +43,7 @@ const handleRedirectResponse = (res) => {
   const { headers } = res;
   const location = headers.get("X-Modernjs-Redirect");
   if (location) {
-    throw (0, import_react_router_dom.redirect)(location);
-  }
-  return res;
-};
-const handleDeferredResponse = async (res) => {
-  var _a;
-  if (((_a = res.headers.get("Content-Type")) == null ? void 0 : _a.match(/text\/modernjs-deferred/)) && res.body) {
-    return await (0, import_data.parseDeferredReadableStream)(res.body);
+    return (0, import_react_router_dom.redirect)(location);
   }
   return res;
 };
@@ -61,17 +53,14 @@ const createRequest = (routeId, method = "get") => {
     request
   }) => {
     const url = getRequestUrl({ params, request, routeId });
-    let res;
-    res = await fetch(url, {
+    const res = await fetch(url, {
       method,
       signal: request.signal
     });
     if (!res.ok) {
       throw res;
     }
-    res = handleRedirectResponse(res);
-    res = await handleDeferredResponse(res);
-    return res;
+    return handleRedirectResponse(res);
   };
 };
 // Annotate the CommonJS export names for ESM import in node:

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

@@ -25,11 +25,11 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   mod
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var generate_client_exports = {};
-__export(generate_client_exports, {
+var generateClient_exports = {};
+__export(generateClient_exports, {
   generateClient: () => generateClient
 });
-module.exports = __toCommonJS(generate_client_exports);
+module.exports = __toCommonJS(generateClient_exports);
 var import_path = __toESM(require("path"));
 const generateClient = ({
   mapFile,
@@ -39,7 +39,7 @@ const generateClient = ({
   const loadersMap = require(mapFile);
   let requestCode = ``;
   let exportsCode = ``;
-  const requestCreatorPath = import_path.default.join(__dirname, "./create-request").replace("/cjs/cli/", "/esm/cli/").replace(/\\/g, "/");
+  const requestCreatorPath = import_path.default.join(__dirname, "./createRequest").replace("/cjs/cli/", "/esm/cli/").replace(/\\/g, "/");
   const importCode = `
     import { createRequest } from '${requestCreatorPath}';
   `;

package/dist/cjs/cli/loader.js

@@ -20,7 +20,7 @@ __export(loader_exports, {
   default: () => loader
 });
 module.exports = __toCommonJS(loader_exports);
-var import_generate_client = require("./generate-client");
+var import_generateClient = require("./generateClient");
 async function loader(source) {
   var _a;
   this.cacheable();
@@ -32,7 +32,7 @@ async function loader(source) {
     return source;
   }
   const options = this.getOptions();
-  const code = (0, import_generate_client.generateClient)({
+  const code = (0, import_generateClient.generateClient)({
     mapFile: options.mapFile,
     loaderId: options.loaderId
   });

package/dist/cjs/server/index.js

@@ -27,13 +27,183 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var server_exports = {};
 __export(server_exports, {
-  default: () => server_default
+  default: () => server_default,
+  getPathWithoutEntry: () => getPathWithoutEntry,
+  handleRequest: () => handleRequest,
+  isRedirectResponse: () => isRedirectResponse,
+  isResponse: () => isResponse
 });
 module.exports = __toCommonJS(server_exports);
 var import_path = __toESM(require("path"));
-var import_fs = __toESM(require("fs"));
+var import_node = require("@remix-run/node");
+var import_react_router_dom = require("react-router-dom");
 var import_utils = require("@modern-js/utils");
-var import_runtime2 = require("../runtime");
+var import_constants = require("../common/constants");
+(0, import_node.installGlobals)();
+const redirectStatusCodes = /* @__PURE__ */ new Set([301, 302, 303, 307, 308]);
+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";
+}
+const json = (data, init = {}) => {
+  const responseInit = typeof init === "number" ? { status: init } : init;
+  const headers = new Headers(responseInit.headers);
+  if (!headers.has("Content-Type")) {
+    headers.set("Content-Type", "application/json; charset=utf-8");
+  }
+  return new import_node.Response(JSON.stringify(data), {
+    ...responseInit,
+    headers
+  });
+};
+const callRouteLoader = async ({
+  routeId,
+  loader,
+  params,
+  request,
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
+  loadContext
+}) => {
+  if (!loader) {
+    throw new Error(
+      `You made a ${request.method} request to ${request.url} but did not provide a default component or \`loader\` for route "${routeId}", so there is no way to handle the request.`
+    );
+  }
+  let result;
+  try {
+    result = await loader({
+      request,
+      params
+    });
+  } catch (error) {
+    if (!isResponse(error)) {
+      throw error;
+    }
+    result = error;
+  }
+  if (result === void 0) {
+    throw new Error(
+      `You defined a loader for route "${routeId}" but didn't return anything from your \`loader\` function. Please return a value or \`null\`.`
+    );
+  }
+  return isResponse(result) ? result : json(result);
+};
+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 createLoaderRequest = (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
+  };
+  return new Request(url.href, init);
+};
+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 getPathWithoutEntry = (pathname, entryPath) => {
+  if (entryPath === "/") {
+    return pathname;
+  }
+  return pathname.replace(entryPath, "");
+};
+const matchEntry = (pathname, entries) => {
+  return entries.find((entry) => pathname.startsWith(entry.urlPath));
+};
+const handleRequest = async ({
+  context,
+  serverRoutes,
+  distDir
+}) => {
+  const { method, query } = context;
+  const routeId = query[import_constants.LOADER_ID_PARAM];
+  if (!routeId || method.toLowerCase() !== "get") {
+    return;
+  }
+  const entry = 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`
+  );
+  const { routes } = await Promise.resolve().then(() => __toESM(require(routesPath)));
+  if (!routes) {
+    return;
+  }
+  const { res } = context;
+  const pathname = getPathWithoutEntry(context.path, entry.urlPath);
+  const matches = (0, import_react_router_dom.matchRoutes)(routes, pathname);
+  if (!matches) {
+    res.statusCode = 403;
+    res.end(`Route ${pathname} was not matched`);
+    return;
+  }
+  const match = matches == null ? void 0 : matches.find((match2) => match2.route.id === routeId);
+  if (!match) {
+    res.statusCode = 403;
+    res.end(`Route ${routeId} does not match URL ${context.path}`);
+    return;
+  }
+  const request = createLoaderRequest(context);
+  let response;
+  try {
+    response = await callRouteLoader({
+      loader: match.route.loader,
+      routeId: match.route.id,
+      params: match.params,
+      request,
+      loadContext: {}
+    });
+    if (isRedirectResponse(response)) {
+      const headers = new Headers(response.headers);
+      headers.set("X-Modernjs-Redirect", headers.get("Location"));
+      headers.delete("Location");
+      response = new import_node.Response(null, {
+        status: 204,
+        headers
+      });
+    }
+  } catch (error) {
+    const message = String(error);
+    response = new import_node.Response(message, {
+      status: 500,
+      headers: {
+        "Content-Type": "text/plain"
+      }
+    });
+  }
+  sendLoaderResponse(res, response);
+};
 var server_default = () => ({
   name: "@modern-js/plugin-data-loader",
   setup: () => ({
@@ -42,30 +212,19 @@ var server_default = () => ({
       distDir
     }) {
       return async (context) => {
-        const entry = (0, import_runtime2.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
+          distDir,
+          context
         });
       };
     }
   })
 });
 // Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {});
+0 && (module.exports = {
+  getPathWithoutEntry,
+  handleRequest,
+  isRedirectResponse,
+  isResponse
+});

package/dist/esm/cli/{create-request.js → createRequest.js}

@@ -125,7 +125,6 @@ var __generator = this && this.__generator || function(thisArg, body) {
 import { compile } from "path-to-regexp";
 import { redirect } from "react-router-dom";
 import { LOADER_ID_PARAM, DIRECT_PARAM } from "../common/constants";
-import { parseDeferredReadableStream } from "./data";
 var getRequestUrl = function(param) {
     var params = param.params, request = param.request, routeId = param.routeId;
     var url = new URL(request.url);
@@ -142,41 +141,10 @@ var handleRedirectResponse = function(res) {
     var headers = res.headers;
     var location = headers.get("X-Modernjs-Redirect");
     if (location) {
-        throw redirect(location);
+        return redirect(location);
     }
     return res;
 };
-var handleDeferredResponse = function() {
-    var _ref = _asyncToGenerator(function(res) {
-        var _res_headers_get;
-        return __generator(this, function(_state) {
-            switch(_state.label){
-                case 0:
-                    if (!(((_res_headers_get = res.headers.get("Content-Type")) === null || _res_headers_get === void 0 ? void 0 : _res_headers_get.match(/text\/modernjs-deferred/)) && res.body)) return [
-                        3,
-                        2
-                    ];
-                    return [
-                        4,
-                        parseDeferredReadableStream(res.body)
-                    ];
-                case 1:
-                    return [
-                        2,
-                        _state.sent()
-                    ];
-                case 2:
-                    return [
-                        2,
-                        res
-                    ];
-            }
-        });
-    });
-    return function handleDeferredResponse(res) {
-        return _ref.apply(this, arguments);
-    };
-}();
 var createRequest = function(routeId) {
     var method = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : "get";
     return function() {
@@ -203,16 +171,9 @@ var createRequest = function(routeId) {
                         if (!res.ok) {
                             throw res;
                         }
-                        res = handleRedirectResponse(res);
-                        return [
-                            4,
-                            handleDeferredResponse(res)
-                        ];
-                    case 2:
-                        res = _state.sent();
                         return [
                             2,
-                            res
+                            handleRedirectResponse(res)
                         ];
                 }
             });

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);
 }