npm - @modern-js/plugin-data-loader - Versions diffs - 2.65.1 → 2.65.2 - Mend

@modern-js/plugin-data-loader 2.65.1 → 2.65.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (5) hide show

package/dist/cjs/runtime/index.js +61 -52
package/dist/esm/runtime/index.js +109 -94
package/dist/esm-node/runtime/index.js +61 -52
package/dist/types/runtime/index.d.ts +2 -12
package/package.json +8 -8

package/dist/cjs/runtime/index.js CHANGED Viewed

@@ -25,9 +25,11 @@ __export(runtime_exports, {
 module.exports = __toCommonJS(runtime_exports);
 var import_browser = require("@modern-js/runtime-utils/browser");
 var import_node = require("@modern-js/runtime-utils/node");
+var import_node2 = require("@modern-js/runtime-utils/node");
 var import_remix_router = require("@modern-js/runtime-utils/remix-router");
 var import_server = require("@modern-js/runtime-utils/server");
 var import_time = require("@modern-js/runtime-utils/time");
+var import_request = require("@modern-js/runtime-utils/universal/request");
 var import_lodash = require("@modern-js/utils/lodash");
 var import_constants = require("@modern-js/utils/universal/constants");
 var import_constants2 = require("../common/constants");
@@ -68,63 +70,70 @@ const handleRequest = async ({ request, serverRoutes, routes: routesConfig, cont
   }
   const basename = entry.urlPath;
   const end = (0, import_time.time)();
-  const { reporter, loaderContext } = context;
-  const routes = (0, import_browser.transformNestedRoutes)(routesConfig, reporter);
-  const { queryRoute } = (0, import_remix_router.createStaticHandler)(routes, {
-    basename
-  });
-  const requestContext = (0, import_node.createRequestContext)(loaderContext);
-  requestContext.set(import_node.reporterCtx, reporter);
-  let response;
-  try {
-    response = await queryRoute(request, {
-      routeId,
-      requestContext
+  const { reporter, loaderContext, monitors } = context;
+  const headersData = (0, import_request.parseHeaders)(request);
+  return import_node2.storage.run({
+    headers: headersData,
+    monitors,
+    request
+  }, async () => {
+    const routes = (0, import_browser.transformNestedRoutes)(routesConfig);
+    const { queryRoute } = (0, import_remix_router.createStaticHandler)(routes, {
+      basename
     });
-    if (isResponse(response) && isRedirectResponse(response.status)) {
-      response = convertModernRedirectResponse(response.headers, basename);
-    } else if ((0, import_lodash.isPlainObject)(response) && import_remix_router.UNSAFE_DEFERRED_SYMBOL in response) {
-      const deferredData = response[import_remix_router.UNSAFE_DEFERRED_SYMBOL];
-      const body = (0, import_response.createDeferredReadableStream)(deferredData, request.signal);
-      const init = deferredData.init || {};
-      if (init.status && isRedirectResponse(init.status)) {
-        if (!init.headers) {
-          throw new Error("redirect response includes no headers");
+    const requestContext = (0, import_node.createRequestContext)(loaderContext);
+    requestContext.set(import_node.reporterCtx, reporter);
+    let response;
+    try {
+      response = await queryRoute(request, {
+        routeId,
+        requestContext
+      });
+      if (isResponse(response) && isRedirectResponse(response.status)) {
+        response = convertModernRedirectResponse(response.headers, basename);
+      } else if ((0, import_lodash.isPlainObject)(response) && import_remix_router.UNSAFE_DEFERRED_SYMBOL in response) {
+        const deferredData = response[import_remix_router.UNSAFE_DEFERRED_SYMBOL];
+        const body = (0, import_response.createDeferredReadableStream)(deferredData, request.signal);
+        const 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 {
+          const headers = new Headers(init.headers);
+          headers.set("Content-Type", `${import_constants2.CONTENT_TYPE_DEFERRED}; charset=UTF-8`);
+          init.headers = headers;
+          response = new Response(body, init);
         }
-        response = convertModernRedirectResponse(new Headers(init.headers), basename);
       } else {
-        const headers = new Headers(init.headers);
-        headers.set("Content-Type", `${import_constants2.CONTENT_TYPE_DEFERRED}; charset=UTF-8`);
-        init.headers = headers;
-        response = new Response(body, init);
+        response = isResponse(response) ? response : new Response(JSON.stringify(response), {
+          headers: {
+            "Content-Type": "application/json; charset=utf-8"
+          }
+        });
+      }
+      const cost = end();
+      response.headers.set("X-Modernjs-Response", "yes");
+      onTiming === null || onTiming === void 0 ? void 0 : onTiming(`${import_constants.LOADER_REPORTER_NAME}-navigation`, cost);
+    } catch (error) {
+      if (isResponse(error)) {
+        error.headers.set("X-Modernjs-Catch", "yes");
+        response = error;
+      } else if ((0, import_remix_router.isRouteErrorResponse)(error)) {
+        response = (0, import_errors.errorResponseToJson)(error);
+      } else {
+        const errorInstance = error instanceof Error || error instanceof DOMException ? error : new Error("Unexpected Server Error");
+        response = (0, import_remix_router.json)((0, import_errors.serializeError)(errorInstance), {
+          status: 500,
+          headers: {
+            "X-Modernjs-Error": "yes"
+          }
+        });
       }
-    } else {
-      response = isResponse(response) ? response : new Response(JSON.stringify(response), {
-        headers: {
-          "Content-Type": "application/json; charset=utf-8"
-        }
-      });
-    }
-    const cost = end();
-    response.headers.set("X-Modernjs-Response", "yes");
-    onTiming === null || onTiming === void 0 ? void 0 : onTiming(`${import_constants.LOADER_REPORTER_NAME}-navigation`, cost);
-  } catch (error) {
-    if (isResponse(error)) {
-      error.headers.set("X-Modernjs-Catch", "yes");
-      response = error;
-    } else if ((0, import_remix_router.isRouteErrorResponse)(error)) {
-      response = (0, import_errors.errorResponseToJson)(error);
-    } else {
-      const errorInstance = error instanceof Error || error instanceof DOMException ? error : new Error("Unexpected Server Error");
-      response = (0, import_remix_router.json)((0, import_errors.serializeError)(errorInstance), {
-        status: 500,
-        headers: {
-          "X-Modernjs-Error": "yes"
-        }
-      });
     }
-  }
-  return response;
+    return response;
+  });
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/dist/esm/runtime/index.js CHANGED Viewed

@@ -4,9 +4,11 @@ import { _ as _type_of } from "@swc/helpers/_/_type_of";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 import { transformNestedRoutes } from "@modern-js/runtime-utils/browser";
 import { createRequestContext, reporterCtx } from "@modern-js/runtime-utils/node";
+import { storage } from "@modern-js/runtime-utils/node";
 import { UNSAFE_DEFERRED_SYMBOL as DEFERRED_SYMBOL, createStaticHandler, isRouteErrorResponse, json } from "@modern-js/runtime-utils/remix-router";
 import { matchEntry } from "@modern-js/runtime-utils/server";
 import { time } from "@modern-js/runtime-utils/time";
+import { parseHeaders } from "@modern-js/runtime-utils/universal/request";
 import { isPlainObject } from "@modern-js/utils/lodash";
 import { LOADER_REPORTER_NAME } from "@modern-js/utils/universal/constants";
 import { CONTENT_TYPE_DEFERRED, LOADER_ID_PARAM } from "../common/constants";
@@ -40,102 +42,115 @@ function convertModernRedirectResponse(headers, basename) {
 }
 var handleRequest = function() {
   var _ref = _async_to_generator(function(param) {
-    var request, serverRoutes, routesConfig, context, onTiming, url, routeId, entry, basename, end, reporter, loaderContext, routes, queryRoute, requestContext, response, deferredData, body, init, headers, cost, error, errorInstance;
+    var request, serverRoutes, routesConfig, context, onTiming, url, routeId, entry, basename, end, reporter, loaderContext, monitors, headersData;
     return _ts_generator(this, function(_state) {
-      switch (_state.label) {
-        case 0:
-          request = param.request, serverRoutes = param.serverRoutes, routesConfig = param.routes, context = param.context, onTiming = param.onTiming;
-          url = new URL(request.url);
-          routeId = url.searchParams.get(LOADER_ID_PARAM);
-          entry = matchEntry(url.pathname, serverRoutes);
-          if (!routeId || !entry) {
-            return [
-              2
-            ];
-          }
-          basename = entry.urlPath;
-          end = time();
-          reporter = context.reporter, loaderContext = context.loaderContext;
-          routes = transformNestedRoutes(routesConfig, reporter);
-          queryRoute = createStaticHandler(routes, {
-            basename
-          }).queryRoute;
-          requestContext = createRequestContext(loaderContext);
-          requestContext.set(reporterCtx, reporter);
-          _state.label = 1;
-        case 1:
-          _state.trys.push([
-            1,
-            3,
-            ,
-            4
-          ]);
-          return [
-            4,
-            queryRoute(request, {
-              routeId,
-              requestContext
-            })
-          ];
-        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", "".concat(CONTENT_TYPE_DEFERRED, "; charset=UTF-8"));
-              init.headers = headers;
-              response = new Response(body, init);
-            }
-          } else {
-            response = isResponse(response) ? response : new Response(JSON.stringify(response), {
-              headers: {
-                "Content-Type": "application/json; charset=utf-8"
-              }
-            });
-          }
-          cost = end();
-          response.headers.set("X-Modernjs-Response", "yes");
-          onTiming === null || onTiming === void 0 ? void 0 : onTiming("".concat(LOADER_REPORTER_NAME, "-navigation"), cost);
-          return [
-            3,
-            4
-          ];
-        case 3:
-          error = _state.sent();
-          if (isResponse(error)) {
-            error.headers.set("X-Modernjs-Catch", "yes");
-            response = error;
-          } else if (isRouteErrorResponse(error)) {
-            response = errorResponseToJson(error);
-          } else {
-            errorInstance = _instanceof(error, Error) || _instanceof(error, DOMException) ? error : new Error("Unexpected Server Error");
-            response = json(serializeError(errorInstance), {
-              status: 500,
-              headers: {
-                "X-Modernjs-Error": "yes"
-              }
-            });
-          }
-          return [
-            3,
-            4
-          ];
-        case 4:
-          return [
-            2,
-            response
-          ];
+      request = param.request, serverRoutes = param.serverRoutes, routesConfig = param.routes, context = param.context, onTiming = param.onTiming;
+      url = new URL(request.url);
+      routeId = url.searchParams.get(LOADER_ID_PARAM);
+      entry = matchEntry(url.pathname, serverRoutes);
+      if (!routeId || !entry) {
+        return [
+          2
+        ];
       }
+      basename = entry.urlPath;
+      end = time();
+      reporter = context.reporter, loaderContext = context.loaderContext, monitors = context.monitors;
+      headersData = parseHeaders(request);
+      return [
+        2,
+        storage.run({
+          headers: headersData,
+          monitors,
+          request
+        }, /* @__PURE__ */ _async_to_generator(function() {
+          var routes, queryRoute, requestContext, response, deferredData, body, init, headers, cost, error, errorInstance;
+          return _ts_generator(this, function(_state2) {
+            switch (_state2.label) {
+              case 0:
+                routes = transformNestedRoutes(routesConfig);
+                queryRoute = createStaticHandler(routes, {
+                  basename
+                }).queryRoute;
+                requestContext = createRequestContext(loaderContext);
+                requestContext.set(reporterCtx, reporter);
+                _state2.label = 1;
+              case 1:
+                _state2.trys.push([
+                  1,
+                  3,
+                  ,
+                  4
+                ]);
+                return [
+                  4,
+                  queryRoute(request, {
+                    routeId,
+                    requestContext
+                  })
+                ];
+              case 2:
+                response = _state2.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", "".concat(CONTENT_TYPE_DEFERRED, "; charset=UTF-8"));
+                    init.headers = headers;
+                    response = new Response(body, init);
+                  }
+                } else {
+                  response = isResponse(response) ? response : new Response(JSON.stringify(response), {
+                    headers: {
+                      "Content-Type": "application/json; charset=utf-8"
+                    }
+                  });
+                }
+                cost = end();
+                response.headers.set("X-Modernjs-Response", "yes");
+                onTiming === null || onTiming === void 0 ? void 0 : onTiming("".concat(LOADER_REPORTER_NAME, "-navigation"), cost);
+                return [
+                  3,
+                  4
+                ];
+              case 3:
+                error = _state2.sent();
+                if (isResponse(error)) {
+                  error.headers.set("X-Modernjs-Catch", "yes");
+                  response = error;
+                } else if (isRouteErrorResponse(error)) {
+                  response = errorResponseToJson(error);
+                } else {
+                  errorInstance = _instanceof(error, Error) || _instanceof(error, DOMException) ? error : new Error("Unexpected Server Error");
+                  response = json(serializeError(errorInstance), {
+                    status: 500,
+                    headers: {
+                      "X-Modernjs-Error": "yes"
+                    }
+                  });
+                }
+                return [
+                  3,
+                  4
+                ];
+              case 4:
+                return [
+                  2,
+                  response
+                ];
+            }
+          });
+        }))
+      ];
     });
   });
   return function handleRequest2(_) {

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

@@ -1,8 +1,10 @@
 import { transformNestedRoutes } from "@modern-js/runtime-utils/browser";
 import { createRequestContext, reporterCtx } from "@modern-js/runtime-utils/node";
+import { storage } from "@modern-js/runtime-utils/node";
 import { UNSAFE_DEFERRED_SYMBOL as DEFERRED_SYMBOL, createStaticHandler, isRouteErrorResponse, json } from "@modern-js/runtime-utils/remix-router";
 import { matchEntry } from "@modern-js/runtime-utils/server";
 import { time } from "@modern-js/runtime-utils/time";
+import { parseHeaders } from "@modern-js/runtime-utils/universal/request";
 import { isPlainObject } from "@modern-js/utils/lodash";
 import { LOADER_REPORTER_NAME } from "@modern-js/utils/universal/constants";
 import { CONTENT_TYPE_DEFERRED, LOADER_ID_PARAM } from "../common/constants";
@@ -43,63 +45,70 @@ const handleRequest = async ({ request, serverRoutes, routes: routesConfig, cont
   }
   const basename = entry.urlPath;
   const end = time();
-  const { reporter, loaderContext } = context;
-  const routes = transformNestedRoutes(routesConfig, reporter);
-  const { queryRoute } = createStaticHandler(routes, {
-    basename
-  });
-  const requestContext = createRequestContext(loaderContext);
-  requestContext.set(reporterCtx, reporter);
-  let response;
-  try {
-    response = await queryRoute(request, {
-      routeId,
-      requestContext
+  const { reporter, loaderContext, monitors } = context;
+  const headersData = parseHeaders(request);
+  return storage.run({
+    headers: headersData,
+    monitors,
+    request
+  }, async () => {
+    const routes = transformNestedRoutes(routesConfig);
+    const { queryRoute } = createStaticHandler(routes, {
+      basename
     });
-    if (isResponse(response) && isRedirectResponse(response.status)) {
-      response = convertModernRedirectResponse(response.headers, basename);
-    } else if (isPlainObject(response) && DEFERRED_SYMBOL in response) {
-      const deferredData = response[DEFERRED_SYMBOL];
-      const body = createDeferredReadableStream(deferredData, request.signal);
-      const init = deferredData.init || {};
-      if (init.status && isRedirectResponse(init.status)) {
-        if (!init.headers) {
-          throw new Error("redirect response includes no headers");
+    const requestContext = createRequestContext(loaderContext);
+    requestContext.set(reporterCtx, reporter);
+    let response;
+    try {
+      response = await queryRoute(request, {
+        routeId,
+        requestContext
+      });
+      if (isResponse(response) && isRedirectResponse(response.status)) {
+        response = convertModernRedirectResponse(response.headers, basename);
+      } else if (isPlainObject(response) && DEFERRED_SYMBOL in response) {
+        const deferredData = response[DEFERRED_SYMBOL];
+        const body = createDeferredReadableStream(deferredData, request.signal);
+        const 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 {
+          const headers = new Headers(init.headers);
+          headers.set("Content-Type", `${CONTENT_TYPE_DEFERRED}; charset=UTF-8`);
+          init.headers = headers;
+          response = new Response(body, init);
         }
-        response = convertModernRedirectResponse(new Headers(init.headers), basename);
       } else {
-        const headers = new Headers(init.headers);
-        headers.set("Content-Type", `${CONTENT_TYPE_DEFERRED}; charset=UTF-8`);
-        init.headers = headers;
-        response = new Response(body, init);
+        response = isResponse(response) ? response : new Response(JSON.stringify(response), {
+          headers: {
+            "Content-Type": "application/json; charset=utf-8"
+          }
+        });
+      }
+      const cost = end();
+      response.headers.set("X-Modernjs-Response", "yes");
+      onTiming === null || onTiming === void 0 ? void 0 : onTiming(`${LOADER_REPORTER_NAME}-navigation`, cost);
+    } catch (error) {
+      if (isResponse(error)) {
+        error.headers.set("X-Modernjs-Catch", "yes");
+        response = error;
+      } else if (isRouteErrorResponse(error)) {
+        response = errorResponseToJson(error);
+      } else {
+        const errorInstance = error instanceof Error || error instanceof DOMException ? error : new Error("Unexpected Server Error");
+        response = json(serializeError(errorInstance), {
+          status: 500,
+          headers: {
+            "X-Modernjs-Error": "yes"
+          }
+        });
       }
-    } else {
-      response = isResponse(response) ? response : new Response(JSON.stringify(response), {
-        headers: {
-          "Content-Type": "application/json; charset=utf-8"
-        }
-      });
-    }
-    const cost = end();
-    response.headers.set("X-Modernjs-Response", "yes");
-    onTiming === null || onTiming === void 0 ? void 0 : onTiming(`${LOADER_REPORTER_NAME}-navigation`, cost);
-  } catch (error) {
-    if (isResponse(error)) {
-      error.headers.set("X-Modernjs-Catch", "yes");
-      response = error;
-    } else if (isRouteErrorResponse(error)) {
-      response = errorResponseToJson(error);
-    } else {
-      const errorInstance = error instanceof Error || error instanceof DOMException ? error : new Error("Unexpected Server Error");
-      response = json(serializeError(errorInstance), {
-        status: 500,
-        headers: {
-          "X-Modernjs-Error": "yes"
-        }
-      });
     }
-  }
-  return response;
+    return response;
+  });
 };
 export {
   handleRequest,

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

@@ -1,14 +1,4 @@
-import type { NestedRoute, Reporter, ServerRoute } from '@modern-js/types';
+import type { ServerLoaderBundle } from '@modern-js/server-core';
 export declare function isRedirectResponse(status: number): boolean;
 export declare function isResponse(value: any): value is Response;
-export declare const handleRequest: ({ request, serverRoutes, routes: routesConfig, context, onTiming, }: {
-    request: Request;
-    serverRoutes: ServerRoute[];
-    routes: NestedRoute[];
-    onError?: ((error: unknown) => void) | undefined;
-    onTiming?: ((name: string, dur: number) => void) | undefined;
-    context: {
-        loaderContext?: Map<string, unknown>;
-        reporter?: Reporter;
-    };
-}) => Promise<Response | void>;
+export declare const handleRequest: ServerLoaderBundle['handleRequest'];

package/package.json CHANGED Viewed

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.65.1",
+  "version": "2.65.2",
   "engines": {
     "node": ">=16.2.0"
   },
@@ -49,8 +49,8 @@
     "@babel/core": "^7.26.0",
     "@swc/helpers": "0.5.13",
     "path-to-regexp": "^6.2.0",
-    "@modern-js/runtime-utils": "2.65.1",
-    "@modern-js/utils": "2.65.1"
+    "@modern-js/runtime-utils": "2.65.2",
+    "@modern-js/utils": "2.65.2"
   },
   "devDependencies": {
     "@types/babel__core": "^7.20.5",
@@ -66,11 +66,11 @@
     "ts-jest": "^29.1.0",
     "typescript": "^5",
     "webpack": "^5.98.0",
-    "@modern-js/core": "2.65.1",
-    "@modern-js/server-core": "2.65.1",
-    "@modern-js/types": "2.65.1",
-    "@scripts/build": "2.65.1",
-    "@scripts/jest-config": "2.65.1"
+    "@modern-js/core": "2.65.2",
+    "@modern-js/server-core": "2.65.2",
+    "@modern-js/types": "2.65.2",
+    "@scripts/jest-config": "2.65.2",
+    "@scripts/build": "2.65.2"
   },
   "peerDependencies": {
     "react": ">=17.0.0"