@modern-js/plugin-data-loader 2.35.1 → 2.36.0

package/dist/esm-node/cli/generateClient.js

@@ -1,36 +1,32 @@
 import path from "path";
-export const generateClient = ({ mapFile, loaderId }) => {
-  delete require.cache[mapFile];
-  const loadersMap = require(mapFile);
+const generateClient = ({ inline, action, routeId }) => {
   let requestCode = ``;
-  let exportsCode = ``;
   const requestCreatorPath = path.join(__dirname, "./createRequest").replace("/cjs/cli/", "/esm/cli/").replace(/\\/g, "/");
   const importCode = `
-    import { createRequest } from '${requestCreatorPath}';
+    import { createRequest, createActionRequest } from '${requestCreatorPath}';
   `;
-  if (!loaderId) {
-    requestCode = Object.keys(loadersMap).map((loaderId2) => {
-      const { routeId } = loadersMap[loaderId2];
-      return `
-      const ${loaderId2} = createRequest('${routeId}');
+  if (inline) {
+    if (action) {
+      requestCode = `
+      export const loader = createRequest('${routeId}');
+      export const action = createActionRequest('${routeId}')
+    `;
+    } else {
+      requestCode = `
+      export const loader = createRequest('${routeId}');
     `;
-    }).join("");
-    exportsCode = `export {`;
-    for (const loader of Object.keys(loadersMap)) {
-      exportsCode += `${loader},`;
     }
-    exportsCode += "}";
   } else {
-    const loader = loadersMap[loaderId];
     requestCode = `
-      const loader = createRequest('${loader.routeId}');
-    `;
-    exportsCode = `export default loader;`;
+    export default createRequest('${routeId}');
+  `;
   }
   const generatedCode = `
     ${importCode}
     ${requestCode}
-    ${exportsCode}
   `;
   return generatedCode;
 };
+export {
+  generateClient
+};

package/dist/esm-node/cli/loader.js

@@ -1,7 +1,7 @@
 import { promisify } from "util";
 import { logger } from "@modern-js/utils/logger";
 import { generateClient } from "./generateClient";
-export default async function loader(source) {
+async function loader(source) {
   var _this__compiler;
   this.cacheable();
   const target = (_this__compiler = this._compiler) === null || _this__compiler === void 0 ? void 0 : _this__compiler.options.target;
@@ -12,17 +12,14 @@ export default async function loader(source) {
     return source;
   }
   const { resourceQuery } = this;
-  const options = resourceQuery.slice(1).split("&").map((item) => {
-    return item.split("=");
-  }).reduce((pre, cur) => {
-    const [key, value] = cur;
-    if (!key || !value) {
-      return pre;
+  const options = resourceQuery.slice(1).split("&").reduce((pre, cur) => {
+    const [key, value] = cur.split("=");
+    if (key && value) {
+      pre[key] = value === "true" ? true : value === "false" ? false : value;
     }
-    pre[key] = value;
     return pre;
   }, {});
-  if (!options.mapFile) {
+  if (!options.loaderId) {
     return source;
   }
   if (options.clientData) {
@@ -38,8 +35,12 @@ export default async function loader(source) {
     }
   }
   const code = generateClient({
-    mapFile: options.mapFile,
-    loaderId: options.loaderId
+    inline: options.inline,
+    action: options.action,
+    routeId: options.routeId
   });
   return code;
 }
+export {
+  loader as default
+};

package/dist/esm-node/common/constants.js

@@ -1,3 +1,8 @@
-export const LOADER_ID_PARAM = "__loader";
-export const DIRECT_PARAM = "__ssrDirect";
-export const CONTENT_TYPE_DEFERRED = "text/modernjs-deferred";
+const LOADER_ID_PARAM = "__loader";
+const DIRECT_PARAM = "__ssrDirect";
+const CONTENT_TYPE_DEFERRED = "text/modernjs-deferred";
+export {
+  CONTENT_TYPE_DEFERRED,
+  DIRECT_PARAM,
+  LOADER_ID_PARAM
+};

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

@@ -15,10 +15,10 @@ const redirectStatusCodes = /* @__PURE__ */ new Set([
   307,
   308
 ]);
-export function isRedirectResponse(status) {
+function isRedirectResponse(status) {
   return redirectStatusCodes.has(status);
 }
-export function isResponse(value) {
+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) {
@@ -49,7 +49,7 @@ const createLoaderHeaders = (requestHeaders) => {
   }
   return headers;
 };
-const createLoaderRequest = (context) => {
+const createRequest = (context) => {
   const origin = `${context.protocol}://${context.host}`;
   const url = new URL(context.url, origin);
   const controller = new AbortController();
@@ -58,7 +58,14 @@ const createLoaderRequest = (context) => {
     headers: createLoaderHeaders(context.headers),
     signal: controller.signal
   };
-  return new Request(url.href, init);
+  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;
@@ -72,16 +79,13 @@ const sendLoaderResponse = async (res, nodeResponse) => {
     res.end();
   }
 };
-export const handleRequest = async ({ context, serverRoutes, routes: routesConfig }) => {
-  const { method, query } = context;
+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;
   }
-  if (method.toLowerCase() !== "get") {
-    throw new Error("CSR data loader request only support http GET method");
-  }
   const basename = entry.urlPath;
   const end = time();
   const { res, logger, reporter } = context;
@@ -89,7 +93,7 @@ export const handleRequest = async ({ context, serverRoutes, routes: routesConfi
   const { queryRoute } = createStaticHandler(routes, {
     basename
   });
-  const request = createLoaderRequest(context);
+  const request = createRequest(context);
   const requestContext = createRequestContext();
   requestContext.set(reporterCtx, reporter);
   let response;
@@ -124,7 +128,11 @@ export const handleRequest = async ({ context, serverRoutes, routes: routesConfi
     }
   } catch (error) {
     const message = error instanceof ErrorResponse ? error.data : String(error);
-    logger === null || logger === void 0 ? void 0 : logger.error(message);
+    if (error instanceof Error) {
+      logger === null || logger === void 0 ? void 0 : logger.error(error);
+    } else {
+      logger === null || logger === void 0 ? void 0 : logger.error(message);
+    }
     response = new NodeResponse(message, {
       status: 500,
       headers: {
@@ -136,3 +144,8 @@ export const handleRequest = async ({ context, serverRoutes, routes: routesConfi
   reporter.reportTiming(`${LOADER_REPORTER_NAME}-navigation`, cost);
   await sendLoaderResponse(res, response);
 };
+export {
+  handleRequest,
+  isRedirectResponse,
+  isResponse
+};

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

@@ -4,7 +4,7 @@ function isTrackedPromise(value) {
   return value != null && typeof value.then === "function" && value._tracked === true;
 }
 const DEFERRED_VALUE_PLACEHOLDER_PREFIX = "__deferred_promise:";
-export function createDeferredReadableStream(deferredData, signal) {
+function createDeferredReadableStream(deferredData, signal) {
   const encoder = new TextEncoder();
   const stream = new ReadableStream({
     async start(controller) {
@@ -58,3 +58,6 @@ function enqueueTrackedPromise(controller, encoder, settledKey, promise) {
 `));
   }
 }
+export {
+  createDeferredReadableStream
+};

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

@@ -2,7 +2,7 @@ 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";
-export default () => ({
+var server_default = () => ({
   name: "@modern-js/plugin-data-loader",
   setup: () => ({
     prepareLoaderHandler({ serverRoutes, distDir }) {
@@ -28,3 +28,6 @@ export default () => ({
     }
   })
 });
+export {
+  server_default as default
+};

package/dist/types/cli/createRequest.d.ts

@@ -14,4 +14,11 @@ export declare const createRequest: (routeId: string, method?: string) => ({
 }: {
   params: Record<string, string>;
   request: Request;
-}) => Promise<DeferredData | Response>;
+}) => Promise<DeferredData | Response>;
+export declare const createActionRequest: (routeId: string) => ({
+  params,
+  request
+}: {
+  params: Record<string, string>;
+  request: Request;
+}) => Promise<Response>;

package/dist/types/cli/generateClient.d.ts

@@ -1,7 +1,9 @@
 export declare const generateClient: ({
-  mapFile,
-  loaderId
+  inline,
+  action,
+  routeId
 }: {
-  mapFile: string;
-  loaderId?: string | undefined;
+  inline: boolean;
+  action?: boolean | undefined;
+  routeId: string;
 }) => string;

package/dist/types/cli/loader.d.ts

@@ -2,8 +2,11 @@
 import type { LoaderContext } from 'webpack';
 type Context = {
   mapFile: string;
-  loaderId?: string;
+  loaderId: string;
   clientData?: boolean;
+  action: boolean;
+  inline: boolean;
+  routeId: string;
 };
 export default function loader(this: LoaderContext<Context>, source: string): Promise<string | Buffer | undefined>;
 export {};

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.35.1",
+  "version": "2.36.0",
   "engines": {
     "node": ">=14.17.6"
   },
@@ -58,8 +58,8 @@
     "@remix-run/node": "^1.12.0",
     "path-to-regexp": "^6.2.0",
     "@swc/helpers": "0.5.1",
-    "@modern-js/utils": "2.35.1",
-    "@modern-js/runtime-utils": "2.35.1"
+    "@modern-js/utils": "2.36.0",
+    "@modern-js/runtime-utils": "2.36.0"
   },
   "devDependencies": {
     "@types/babel__core": "^7.20.0",
@@ -75,11 +75,11 @@
     "webpack": "^5.88.1",
     "react": "^18",
     "react-dom": "^18",
-    "@modern-js/types": "2.35.1",
-    "@modern-js/core": "2.35.1",
-    "@modern-js/server-core": "2.35.1",
-    "@scripts/build": "2.35.1",
-    "@scripts/jest-config": "2.35.1"
+    "@modern-js/server-core": "2.36.0",
+    "@scripts/build": "2.36.0",
+    "@modern-js/types": "2.36.0",
+    "@modern-js/core": "2.36.0",
+    "@scripts/jest-config": "2.36.0"
   },
   "peerDependencies": {
     "react": ">=17.0.0"