@modern-js/plugin-data-loader 0.0.0-next-20230921083429 → 0.0.0-next-20230922063312

package/dist/cjs/cli/createRequest.js

@@ -1,49 +1,54 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-function _export(target, all) {
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
   for (var name in all)
-    Object.defineProperty(target, name, {
-      enumerable: true,
-      get: all[name]
-    });
-}
-_export(exports, {
-  getRequestUrl: function() {
-    return getRequestUrl;
-  },
-  createRequest: function() {
-    return createRequest;
+    __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 __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var createRequest_exports = {};
+__export(createRequest_exports, {
+  createRequest: () => createRequest,
+  getRequestUrl: () => getRequestUrl
 });
-const _pathtoregexp = require("path-to-regexp");
-const _router = require("@modern-js/runtime-utils/router");
-const _constants = require("../common/constants");
-const _data = require("./data");
+module.exports = __toCommonJS(createRequest_exports);
+var import_path_to_regexp = require("path-to-regexp");
+var import_router = require("@modern-js/runtime-utils/router");
+var import_constants = require("../common/constants");
+var import_data = require("./data");
 const getRequestUrl = ({ params, request, routeId }) => {
   const url = new URL(request.url);
-  const toPath = (0, _pathtoregexp.compile)(url.pathname, {
+  const toPath = (0, import_path_to_regexp.compile)(url.pathname, {
     encode: encodeURIComponent
   });
   const newPathName = toPath(params);
   url.pathname = newPathName;
-  url.searchParams.append(_constants.LOADER_ID_PARAM, routeId);
-  url.searchParams.append(_constants.DIRECT_PARAM, "true");
+  url.searchParams.append(import_constants.LOADER_ID_PARAM, routeId);
+  url.searchParams.append(import_constants.DIRECT_PARAM, "true");
   return url;
 };
 const handleRedirectResponse = (res) => {
   const { headers } = res;
   const location = headers.get("X-Modernjs-Redirect");
   if (location) {
-    throw (0, _router.redirect)(location);
+    throw (0, import_router.redirect)(location);
   }
   return res;
 };
 const handleDeferredResponse = async (res) => {
   var _res_headers_get;
-  if (((_res_headers_get = res.headers.get("Content-Type")) === null || _res_headers_get === void 0 ? void 0 : _res_headers_get.match(_constants.CONTENT_TYPE_DEFERRED)) && res.body) {
-    return await (0, _data.parseDeferredReadableStream)(res.body);
+  if (((_res_headers_get = res.headers.get("Content-Type")) === null || _res_headers_get === void 0 ? void 0 : _res_headers_get.match(import_constants.CONTENT_TYPE_DEFERRED)) && res.body) {
+    return await (0, import_data.parseDeferredReadableStream)(res.body);
   }
   return res;
 };
@@ -67,3 +72,8 @@ const createRequest = (routeId, method = "get") => {
     return res;
   };
 };
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  createRequest,
+  getRequestUrl
+});

package/dist/cjs/cli/data.js

@@ -1,14 +1,27 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-Object.defineProperty(exports, "parseDeferredReadableStream", {
-  enumerable: true,
-  get: function() {
-    return parseDeferredReadableStream;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+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 __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var data_exports = {};
+__export(data_exports, {
+  parseDeferredReadableStream: () => parseDeferredReadableStream
 });
-const _remixrouter = require("@modern-js/runtime-utils/remix-router");
+module.exports = __toCommonJS(data_exports);
+var import_remix_router = require("@modern-js/runtime-utils/remix-router");
 const DEFERRED_VALUE_PLACEHOLDER_PREFIX = "__deferred_promise:";
 async function parseDeferredReadableStream(stream) {
   if (!stream) {
@@ -67,7 +80,7 @@ async function parseDeferredReadableStream(stream) {
           }
         }
         for (const [key, resolver] of Object.entries(deferredResolvers)) {
-          resolver.reject(new _remixrouter.AbortedDeferredError(`Deferred ${key} will never resolved`));
+          resolver.reject(new import_remix_router.AbortedDeferredError(`Deferred ${key} will never resolved`));
         }
       } catch (error) {
         for (const resolver of Object.values(deferredResolvers)) {
@@ -75,7 +88,7 @@ async function parseDeferredReadableStream(stream) {
         }
       }
     })();
-    return new _remixrouter.UNSAFE_DeferredData({
+    return new import_remix_router.UNSAFE_DeferredData({
       ...criticalData,
       ...deferredData
     });
@@ -145,3 +158,7 @@ function mergeArrays(...arrays) {
   }
   return out;
 }
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  parseDeferredReadableStream
+});

package/dist/cjs/cli/generateClient.js

@@ -1,21 +1,43 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-Object.defineProperty(exports, "generateClient", {
-  enumerable: true,
-  get: function() {
-    return generateClient;
+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 generateClient_exports = {};
+__export(generateClient_exports, {
+  generateClient: () => generateClient
 });
-const _interop_require_default = require("@swc/helpers/_/_interop_require_default");
-const _path = /* @__PURE__ */ _interop_require_default._(require("path"));
+module.exports = __toCommonJS(generateClient_exports);
+var import_path = __toESM(require("path"));
 const generateClient = ({ mapFile, loaderId }) => {
   delete require.cache[mapFile];
   const loadersMap = require(mapFile);
   let requestCode = ``;
   let exportsCode = ``;
-  const requestCreatorPath = _path.default.join(__dirname, "./createRequest").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}';
   `;
@@ -45,3 +67,7 @@ const generateClient = ({ mapFile, loaderId }) => {
   `;
   return generatedCode;
 };
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  generateClient
+});

package/dist/cjs/cli/loader.js

@@ -1,16 +1,29 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-Object.defineProperty(exports, "default", {
-  enumerable: true,
-  get: function() {
-    return loader;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+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 __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var loader_exports = {};
+__export(loader_exports, {
+  default: () => loader
 });
-const _util = require("util");
-const _logger = require("@modern-js/utils/logger");
-const _generateClient = require("./generateClient");
+module.exports = __toCommonJS(loader_exports);
+var import_util = require("util");
+var import_logger = require("@modern-js/utils/logger");
+var import_generateClient = require("./generateClient");
 async function loader(source) {
   var _this__compiler;
   this.cacheable();
@@ -36,18 +49,18 @@ async function loader(source) {
     return source;
   }
   if (options.clientData) {
-    const readFile = (0, _util.promisify)(this.fs.readFile);
+    const readFile = (0, import_util.promisify)(this.fs.readFile);
     try {
       const clientDataPath = this.resourcePath.includes(".loader.") ? this.resourcePath.replace(".loader.", ".data.client.") : this.resourcePath.replace(".data.", ".data.client.");
       const clientDataContent = await readFile(clientDataPath);
       return clientDataContent;
     } catch (error) {
       if (process.env.NODE_ENV === "development") {
-        _logger.logger.error(`Failed to read the clientData file ${options.clientData}`);
+        import_logger.logger.error(`Failed to read the clientData file ${options.clientData}`);
       }
     }
   }
-  const code = (0, _generateClient.generateClient)({
+  const code = (0, import_generateClient.generateClient)({
     mapFile: options.mapFile,
     loaderId: options.loaderId
   });

package/dist/cjs/common/constants.js

@@ -1,25 +1,34 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-function _export(target, all) {
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
   for (var name in all)
-    Object.defineProperty(target, name, {
-      enumerable: true,
-      get: all[name]
-    });
-}
-_export(exports, {
-  LOADER_ID_PARAM: function() {
-    return LOADER_ID_PARAM;
-  },
-  DIRECT_PARAM: function() {
-    return DIRECT_PARAM;
-  },
-  CONTENT_TYPE_DEFERRED: function() {
-    return CONTENT_TYPE_DEFERRED;
+    __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 __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var constants_exports = {};
+__export(constants_exports, {
+  CONTENT_TYPE_DEFERRED: () => CONTENT_TYPE_DEFERRED,
+  DIRECT_PARAM: () => DIRECT_PARAM,
+  LOADER_ID_PARAM: () => LOADER_ID_PARAM
 });
+module.exports = __toCommonJS(constants_exports);
 const LOADER_ID_PARAM = "__loader";
 const DIRECT_PARAM = "__ssrDirect";
 const CONTENT_TYPE_DEFERRED = "text/modernjs-deferred";
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  CONTENT_TYPE_DEFERRED,
+  DIRECT_PARAM,
+  LOADER_ID_PARAM
+});

package/dist/cjs/runtime/index.js

@@ -1,35 +1,38 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-function _export(target, all) {
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
   for (var name in all)
-    Object.defineProperty(target, name, {
-      enumerable: true,
-      get: all[name]
-    });
-}
-_export(exports, {
-  isRedirectResponse: function() {
-    return isRedirectResponse;
-  },
-  isResponse: function() {
-    return isResponse;
-  },
-  handleRequest: function() {
-    return handleRequest;
+    __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 __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var runtime_exports = {};
+__export(runtime_exports, {
+  handleRequest: () => handleRequest,
+  isRedirectResponse: () => isRedirectResponse,
+  isResponse: () => isResponse
 });
-const _node = require("@remix-run/node");
-const _remixrouter = require("@modern-js/runtime-utils/remix-router");
-const _browser = require("@modern-js/runtime-utils/browser");
-const _lodash = require("@modern-js/utils/lodash");
-const _node1 = require("@modern-js/runtime-utils/node");
-const _time = require("@modern-js/runtime-utils/time");
-const _constants = require("@modern-js/utils/universal/constants");
-const _constants1 = require("../common/constants");
-const _response = require("./response");
-(0, _node.installGlobals)();
+module.exports = __toCommonJS(runtime_exports);
+var import_node = require("@remix-run/node");
+var import_remix_router = require("@modern-js/runtime-utils/remix-router");
+var import_browser = require("@modern-js/runtime-utils/browser");
+var import_lodash = require("@modern-js/utils/lodash");
+var import_node2 = require("@modern-js/runtime-utils/node");
+var import_time = require("@modern-js/runtime-utils/time");
+var import_constants = require("@modern-js/utils/universal/constants");
+var import_constants2 = require("../common/constants");
+var import_response = require("./response");
+(0, import_node.installGlobals)();
 const redirectStatusCodes = /* @__PURE__ */ new Set([
   301,
   302,
@@ -51,7 +54,7 @@ function convertModernRedirectResponse(headers, basename) {
   }
   newHeaders.set("X-Modernjs-Redirect", redirectUrl);
   newHeaders.delete("Location");
-  return new _node.Response(null, {
+  return new import_node.Response(null, {
     status: 204,
     headers: newHeaders
   });
@@ -89,15 +92,15 @@ const sendLoaderResponse = async (res, nodeResponse) => {
     res.setHeader(key, value);
   }
   if (nodeResponse.body) {
-    await (0, _node.writeReadableStreamToWritable)(nodeResponse.body, res);
+    await (0, import_node.writeReadableStreamToWritable)(nodeResponse.body, res);
   } else {
     res.end();
   }
 };
 const handleRequest = async ({ context, serverRoutes, routes: routesConfig }) => {
   const { method, query } = context;
-  const routeId = query[_constants1.LOADER_ID_PARAM];
-  const entry = (0, _node1.matchEntry)(context.path, serverRoutes);
+  const routeId = query[import_constants2.LOADER_ID_PARAM];
+  const entry = (0, import_node2.matchEntry)(context.path, serverRoutes);
   if (!routeId || !entry) {
     return;
   }
@@ -105,15 +108,15 @@ const handleRequest = async ({ context, serverRoutes, routes: routesConfig }) =>
     throw new Error("CSR data loader request only support http GET method");
   }
   const basename = entry.urlPath;
-  const end = (0, _time.time)();
+  const end = (0, import_time.time)();
   const { res, logger, reporter } = context;
-  const routes = (0, _browser.transformNestedRoutes)(routesConfig, reporter);
-  const { queryRoute } = (0, _remixrouter.createStaticHandler)(routes, {
+  const routes = (0, import_browser.transformNestedRoutes)(routesConfig, reporter);
+  const { queryRoute } = (0, import_remix_router.createStaticHandler)(routes, {
     basename
   });
   const request = createLoaderRequest(context);
-  const requestContext = (0, _node1.createRequestContext)();
-  requestContext.set(_node1.reporterCtx, reporter);
+  const requestContext = (0, import_node2.createRequestContext)();
+  requestContext.set(import_node2.reporterCtx, reporter);
   let response;
   try {
     response = await queryRoute(request, {
@@ -122,9 +125,9 @@ const handleRequest = async ({ context, serverRoutes, routes: routesConfig }) =>
     });
     if (isResponse(response) && isRedirectResponse(response.status)) {
       response = convertModernRedirectResponse(response.headers, basename);
-    } else if ((0, _lodash.isPlainObject)(response) && _remixrouter.UNSAFE_DEFERRED_SYMBOL in response) {
-      const deferredData = response[_remixrouter.UNSAFE_DEFERRED_SYMBOL];
-      const body = (0, _response.createDeferredReadableStream)(deferredData, request.signal);
+    } 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) {
@@ -133,21 +136,22 @@ const handleRequest = async ({ context, serverRoutes, routes: routesConfig }) =>
         response = convertModernRedirectResponse(new Headers(init.headers), basename);
       } else {
         const headers = new Headers(init.headers);
-        headers.set("Content-Type", `${_constants1.CONTENT_TYPE_DEFERRED}; charset=UTF-8`);
+        headers.set("Content-Type", `${import_constants2.CONTENT_TYPE_DEFERRED}; charset=UTF-8`);
         init.headers = headers;
-        response = new _node.Response(body, init);
+        response = new import_node.Response(body, init);
       }
     } else {
-      response = isResponse(response) ? response : new _node.Response(JSON.stringify(response), {
+      response = isResponse(response) ? response : new import_node.Response(JSON.stringify(response), {
         headers: {
           "Content-Type": "application/json; charset=utf-8"
         }
       });
     }
   } catch (error) {
-    const message = error instanceof _remixrouter.ErrorResponse ? error.data : String(error);
-    logger === null || logger === void 0 ? void 0 : logger.error(message);
-    response = new _node.Response(message, {
+    var _logger;
+    const message = error instanceof import_remix_router.ErrorResponse ? error.data : String(error);
+    (_logger = logger) === null || _logger === void 0 ? void 0 : _logger.error(message);
+    response = new import_node.Response(message, {
       status: 500,
       headers: {
         "Content-Type": "text/plain"
@@ -155,6 +159,12 @@ const handleRequest = async ({ context, serverRoutes, routes: routesConfig }) =>
     });
   }
   const cost = end();
-  reporter.reportTiming(`${_constants.LOADER_REPORTER_NAME}-navigation`, cost);
+  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 = {
+  handleRequest,
+  isRedirectResponse,
+  isResponse
+});

package/dist/cjs/runtime/response.js

@@ -1,21 +1,34 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-Object.defineProperty(exports, "createDeferredReadableStream", {
-  enumerable: true,
-  get: function() {
-    return createDeferredReadableStream;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+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 __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var response_exports = {};
+__export(response_exports, {
+  createDeferredReadableStream: () => createDeferredReadableStream
 });
-const _util = require("util");
-const _node = require("@modern-js/runtime-utils/node");
+module.exports = __toCommonJS(response_exports);
+var import_util = require("util");
+var import_node = require("@modern-js/runtime-utils/node");
 function isTrackedPromise(value) {
   return value != null && typeof value.then === "function" && value._tracked === true;
 }
 const DEFERRED_VALUE_PLACEHOLDER_PREFIX = "__deferred_promise:";
 function createDeferredReadableStream(deferredData, signal) {
-  const encoder = new _util.TextEncoder();
+  const encoder = new import_util.TextEncoder();
   const stream = new ReadableStream({
     async start(controller) {
       const criticalData = {};
@@ -51,7 +64,7 @@ function createDeferredReadableStream(deferredData, signal) {
 function enqueueTrackedPromise(controller, encoder, settledKey, promise) {
   if ("_error" in promise) {
     const { _error } = promise;
-    controller.enqueue(encoder.encode(`error:${(0, _node.serializeJson)({
+    controller.enqueue(encoder.encode(`error:${(0, import_node.serializeJson)({
       [settledKey]: {
         message: _error.message,
         stack: _error.stack
@@ -68,3 +81,7 @@ function enqueueTrackedPromise(controller, encoder, settledKey, promise) {
 `));
   }
 }
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  createDeferredReadableStream
+});

package/dist/cjs/server/index.js

@@ -1,33 +1,54 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-Object.defineProperty(exports, "default", {
-  enumerable: true,
-  get: function() {
-    return _default;
+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
 });
-const _interop_require_default = require("@swc/helpers/_/_interop_require_default");
-const _interop_require_wildcard = require("@swc/helpers/_/_interop_require_wildcard");
-const _path = /* @__PURE__ */ _interop_require_default._(require("path"));
-const _fs = /* @__PURE__ */ _interop_require_default._(require("fs"));
-const _utils = require("@modern-js/utils");
-const _node = require("@modern-js/runtime-utils/node");
-const _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, _node.matchEntry)(context.path, serverRoutes);
+        const entry = (0, import_node.matchEntry)(context.path, serverRoutes);
         if (!entry) {
           return;
         }
-        const routesPath = _path.default.join(distDir, _utils.SERVER_BUNDLE_DIRECTORY, `${entry.entryName || _utils.MAIN_ENTRY_NAME}-server-loaders.js`);
-        if (!_fs.default.existsSync(routesPath)) {
+        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(routesPath).then((p) => /* @__PURE__ */ _interop_require_wildcard._(require(p)));
+        const { routes, handleRequest } = await Promise.resolve().then(() => __toESM(require(routesPath)));
         if (!routes) {
           return;
         }

package/dist/esm/cli/createRequest.js

@@ -4,7 +4,7 @@ import { compile } from "path-to-regexp";
 import { redirect } from "@modern-js/runtime-utils/router";
 import { LOADER_ID_PARAM, DIRECT_PARAM, CONTENT_TYPE_DEFERRED } from "../common/constants";
 import { parseDeferredReadableStream } from "./data";
-export var getRequestUrl = function(param) {
+var getRequestUrl = function(param) {
   var params = param.params, request = param.request, routeId = param.routeId;
   var url = new URL(request.url);
   var toPath = compile(url.pathname, {
@@ -56,7 +56,7 @@ var handleDeferredResponse = function() {
     return _ref.apply(this, arguments);
   };
 }();
-export var createRequest = function(routeId) {
+var createRequest = function(routeId) {
   var method = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : "get";
   return function() {
     var _ref = _async_to_generator(function(param) {
@@ -66,14 +66,14 @@ export var createRequest = function(routeId) {
           case 0:
             params = param.params, request = param.request;
             url = getRequestUrl({
-              params: params,
-              request: request,
-              routeId: routeId
+              params,
+              request,
+              routeId
             });
             return [
               4,
               fetch(url, {
-                method: method,
+                method,
                 signal: request.signal
               })
             ];
@@ -101,3 +101,7 @@ export var createRequest = function(routeId) {
     };
   }();
 };
+export {
+  createRequest,
+  getRequestUrl
+};

package/dist/esm/cli/data.js

@@ -9,7 +9,7 @@ import { _ as _wrap_async_generator } from "@swc/helpers/_/_wrap_async_generator
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 import { UNSAFE_DeferredData as DeferredData, AbortedDeferredError } from "@modern-js/runtime-utils/remix-router";
 var DEFERRED_VALUE_PLACEHOLDER_PREFIX = "__deferred_promise:";
-export function parseDeferredReadableStream(stream) {
+function parseDeferredReadableStream(stream) {
   return _parseDeferredReadableStream.apply(this, arguments);
 }
 function _parseDeferredReadableStream() {
@@ -485,3 +485,6 @@ function mergeArrays() {
   }
   return out;
 }
+export {
+  parseDeferredReadableStream
+};

package/dist/esm/cli/generateClient.js

@@ -1,5 +1,5 @@
 import path from "path";
-export var generateClient = function(param) {
+var generateClient = function(param) {
   var mapFile = param.mapFile, loaderId = param.loaderId;
   delete require.cache[mapFile];
   var loadersMap = require(mapFile);
@@ -42,3 +42,6 @@ export var generateClient = function(param) {
   var generatedCode = "\n    ".concat(importCode, "\n    ").concat(requestCode, "\n    ").concat(exportsCode, "\n  ");
   return generatedCode;
 };
+export {
+  generateClient
+};

package/dist/esm/cli/loader.js

@@ -4,7 +4,7 @@ import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 import { promisify } from "util";
 import { logger } from "@modern-js/utils/logger";
 import { generateClient } from "./generateClient";
-export default function loader(source) {
+function loader(source) {
   return _loader.apply(this, arguments);
 }
 function _loader() {
@@ -92,3 +92,6 @@ function _loader() {
   });
   return _loader.apply(this, arguments);
 }
+export {
+  loader as default
+};

package/dist/esm/common/constants.js

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

package/dist/esm/runtime/index.js

@@ -19,10 +19,10 @@ var 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) {
@@ -155,9 +155,9 @@ var sendLoaderResponse = function() {
     return _ref.apply(this, arguments);
   };
 }();
-export var handleRequest = function() {
+var handleRequest = function() {
   var _ref = _async_to_generator(function(param) {
-    var context, serverRoutes, routesConfig, method, query, routeId, entry, basename, end, res, logger, reporter, routes, queryRoute, request, requestContext, response, deferredData, body, init, headers, error, message, cost;
+    var context, serverRoutes, routesConfig, method, query, routeId, entry, basename, end, res, logger, reporter, routes, queryRoute, request, requestContext, response, deferredData, body, init, headers, error, _logger, message, cost;
     return _ts_generator(this, function(_state) {
       switch (_state.label) {
         case 0:
@@ -178,7 +178,7 @@ export var handleRequest = function() {
           res = context.res, logger = context.logger, reporter = context.reporter;
           routes = transformNestedRoutes(routesConfig, reporter);
           queryRoute = createStaticHandler(routes, {
-            basename: basename
+            basename
           }).queryRoute;
           request = createLoaderRequest(context);
           requestContext = createRequestContext();
@@ -194,8 +194,8 @@ export var handleRequest = function() {
           return [
             4,
             queryRoute(request, {
-              routeId: routeId,
-              requestContext: requestContext
+              routeId,
+              requestContext
             })
           ];
         case 2:
@@ -231,7 +231,7 @@ export var handleRequest = function() {
         case 3:
           error = _state.sent();
           message = _instanceof(error, ErrorResponse) ? error.data : String(error);
-          logger === null || logger === void 0 ? void 0 : logger.error(message);
+          (_logger = logger) === null || _logger === void 0 ? void 0 : _logger.error(message);
           response = new NodeResponse(message, {
             status: 500,
             headers: {
@@ -261,3 +261,8 @@ export var handleRequest = function() {
     return _ref.apply(this, arguments);
   };
 }();
+export {
+  handleRequest,
+  isRedirectResponse,
+  isResponse
+};

package/dist/esm/runtime/response.js

@@ -8,7 +8,7 @@ function isTrackedPromise(value) {
   return value != null && typeof value.then === "function" && value._tracked === true;
 }
 var DEFERRED_VALUE_PLACEHOLDER_PREFIX = "__deferred_promise:";
-export function createDeferredReadableStream(deferredData, signal) {
+function createDeferredReadableStream(deferredData, signal) {
   var encoder = new TextEncoder();
   var stream = new ReadableStream({
     start: function start(controller) {
@@ -102,3 +102,6 @@ function enqueueTrackedPromise(controller, encoder, settledKey, promise) {
     controller.enqueue(encoder.encode("data:".concat(JSON.stringify(_define_property({}, settledKey, (_promise__data = promise._data) !== null && _promise__data !== void 0 ? _promise__data : null)), "\n\n")));
   }
 }
+export {
+  createDeferredReadableStream
+};

package/dist/esm/server/index.js

@@ -4,7 +4,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 function() {
+function server_default() {
   return {
     name: "@modern-js/plugin-data-loader",
     setup: function() {
@@ -43,9 +43,9 @@ export default function() {
                     return [
                       2,
                       handleRequest({
-                        serverRoutes: serverRoutes,
-                        context: context,
-                        routes: routes
+                        serverRoutes,
+                        context,
+                        routes
                       })
                     ];
                 }
@@ -61,3 +61,6 @@ export default function() {
   };
 }
 ;
+export {
+  server_default as default
+};

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

@@ -2,7 +2,7 @@ import { compile } from "path-to-regexp";
 import { redirect } from "@modern-js/runtime-utils/router";
 import { LOADER_ID_PARAM, DIRECT_PARAM, CONTENT_TYPE_DEFERRED } from "../common/constants";
 import { parseDeferredReadableStream } from "./data";
-export const getRequestUrl = ({ params, request, routeId }) => {
+const getRequestUrl = ({ params, request, routeId }) => {
   const url = new URL(request.url);
   const toPath = compile(url.pathname, {
     encode: encodeURIComponent
@@ -28,7 +28,7 @@ const handleDeferredResponse = async (res) => {
   }
   return res;
 };
-export const createRequest = (routeId, method = "get") => {
+const createRequest = (routeId, method = "get") => {
   return async ({ params, request }) => {
     const url = getRequestUrl({
       params,
@@ -48,3 +48,7 @@ export const createRequest = (routeId, method = "get") => {
     return res;
   };
 };
+export {
+  createRequest,
+  getRequestUrl
+};

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

@@ -1,6 +1,6 @@
 import { UNSAFE_DeferredData as DeferredData, AbortedDeferredError } from "@modern-js/runtime-utils/remix-router";
 const DEFERRED_VALUE_PLACEHOLDER_PREFIX = "__deferred_promise:";
-export async function parseDeferredReadableStream(stream) {
+async function parseDeferredReadableStream(stream) {
   if (!stream) {
     throw new Error("parseDeferredReadableStream requires stream argument");
   }
@@ -135,3 +135,6 @@ function mergeArrays(...arrays) {
   }
   return out;
 }
+export {
+  parseDeferredReadableStream
+};

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

@@ -1,5 +1,5 @@
 import path from "path";
-export const generateClient = ({ mapFile, loaderId }) => {
+const generateClient = ({ mapFile, loaderId }) => {
   delete require.cache[mapFile];
   const loadersMap = require(mapFile);
   let requestCode = ``;
@@ -34,3 +34,6 @@ export const generateClient = ({ mapFile, loaderId }) => {
   `;
   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;
@@ -43,3 +43,6 @@ export default async function loader(source) {
   });
   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) {
@@ -72,7 +72,7 @@ const sendLoaderResponse = async (res, nodeResponse) => {
     res.end();
   }
 };
-export const handleRequest = async ({ context, serverRoutes, routes: routesConfig }) => {
+const handleRequest = async ({ context, serverRoutes, routes: routesConfig }) => {
   const { method, query } = context;
   const routeId = query[LOADER_ID_PARAM];
   const entry = matchEntry(context.path, serverRoutes);
@@ -123,8 +123,9 @@ export const handleRequest = async ({ context, serverRoutes, routes: routesConfi
       });
     }
   } catch (error) {
+    var _logger;
     const message = error instanceof ErrorResponse ? error.data : String(error);
-    logger === null || logger === void 0 ? void 0 : logger.error(message);
+    (_logger = logger) === null || _logger === void 0 ? void 0 : _logger.error(message);
     response = new NodeResponse(message, {
       status: 500,
       headers: {
@@ -136,3 +137,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/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "0.0.0-next-20230921083429",
+  "version": "0.0.0-next-20230922063312",
   "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": "0.0.0-next-20230921083429",
-    "@modern-js/runtime-utils": "0.0.0-next-20230921083429"
+    "@modern-js/utils": "0.0.0-next-20230922063312",
+    "@modern-js/runtime-utils": "0.0.0-next-20230922063312"
   },
   "devDependencies": {
     "@types/babel__core": "^7.20.0",
@@ -75,11 +75,11 @@
     "webpack": "^5.88.1",
     "react": "^18",
     "react-dom": "^18",
-    "@modern-js/core": "0.0.0-next-20230921083429",
-    "@modern-js/server-core": "0.0.0-next-20230921083429",
-    "@modern-js/types": "0.0.0-next-20230921083429",
-    "@scripts/build": "0.0.0-next-20230921083429",
-    "@scripts/jest-config": "0.0.0-next-20230921083429"
+    "@modern-js/server-core": "0.0.0-next-20230922063312",
+    "@modern-js/types": "0.0.0-next-20230922063312",
+    "@modern-js/core": "0.0.0-next-20230922063312",
+    "@scripts/jest-config": "0.0.0-next-20230922063312",
+    "@scripts/build": "0.0.0-next-20230922063312"
   },
   "peerDependencies": {
     "react": ">=17.0.0"