@modern-js/plugin-data-loader 2.14.0 → 2.16.0

package/dist/esm/server/index.js

@@ -1,185 +1,192 @@
 function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) {
-    try {
-        var info = gen[key](arg);
-        var value = info.value;
-    } catch (error) {
-        reject(error);
-        return;
-    }
-    if (info.done) {
-        resolve(value);
-    } else {
-        Promise.resolve(value).then(_next, _throw);
-    }
+  try {
+    var info = gen[key](arg);
+    var value = info.value;
+  } catch (error) {
+    reject(error);
+    return;
+  }
+  if (info.done) {
+    resolve(value);
+  } else {
+    Promise.resolve(value).then(_next, _throw);
+  }
 }
-function _asyncToGenerator(fn) {
-    return function() {
-        var self = this, args = arguments;
-        return new Promise(function(resolve, reject) {
-            var gen = fn.apply(self, args);
-            function _next(value) {
-                asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value);
-            }
-            function _throw(err) {
-                asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err);
-            }
-            _next(undefined);
-        });
-    };
+function _async_to_generator(fn) {
+  return function() {
+    var self = this, args = arguments;
+    return new Promise(function(resolve, reject) {
+      var gen = fn.apply(self, args);
+      function _next(value) {
+        asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value);
+      }
+      function _throw(err) {
+        asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err);
+      }
+      _next(void 0);
+    });
+  };
 }
-var __generator = this && this.__generator || function(thisArg, body) {
-    var f, y, t, g, _ = {
-        label: 0,
-        sent: function() {
-            if (t[0] & 1) throw t[1];
-            return t[1];
-        },
-        trys: [],
-        ops: []
+var __generator = function(thisArg, body) {
+  var f, y, t, g, _ = {
+    label: 0,
+    sent: function() {
+      if (t[0] & 1)
+        throw t[1];
+      return t[1];
+    },
+    trys: [],
+    ops: []
+  };
+  return g = {
+    next: verb(0),
+    "throw": verb(1),
+    "return": verb(2)
+  }, typeof Symbol === "function" && (g[Symbol.iterator] = function() {
+    return this;
+  }), g;
+  function verb(n) {
+    return function(v) {
+      return step([
+        n,
+        v
+      ]);
     };
-    return(g = {
-        next: verb(0),
-        "throw": verb(1),
-        "return": verb(2)
-    }, typeof Symbol === "function" && (g[Symbol.iterator] = function() {
-        return this;
-    }), g);
-    function verb(n) {
-        return function(v) {
-            return step([
-                n,
-                v
-            ]);
-        };
-    }
-    function step(op) {
-        if (f) throw new TypeError("Generator is already executing.");
-        while(_)try {
-            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
-            if (y = 0, t) op = [
-                op[0] & 2,
-                t.value
-            ];
-            switch(op[0]){
-                case 0:
-                case 1:
-                    t = op;
-                    break;
-                case 4:
-                    _.label++;
-                    return {
-                        value: op[1],
-                        done: false
-                    };
-                case 5:
-                    _.label++;
-                    y = op[1];
-                    op = [
-                        0
-                    ];
-                    continue;
-                case 7:
-                    op = _.ops.pop();
-                    _.trys.pop();
-                    continue;
-                default:
-                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) {
-                        _ = 0;
-                        continue;
-                    }
-                    if (op[0] === 3 && (!t || op[1] > t[0] && op[1] < t[3])) {
-                        _.label = op[1];
-                        break;
-                    }
-                    if (op[0] === 6 && _.label < t[1]) {
-                        _.label = t[1];
-                        t = op;
-                        break;
-                    }
-                    if (t && _.label < t[2]) {
-                        _.label = t[2];
-                        _.ops.push(op);
-                        break;
-                    }
-                    if (t[2]) _.ops.pop();
-                    _.trys.pop();
-                    continue;
-            }
-            op = body.call(thisArg, _);
-        } catch (e) {
+  }
+  function step(op) {
+    if (f)
+      throw new TypeError("Generator is already executing.");
+    while (_)
+      try {
+        if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done)
+          return t;
+        if (y = 0, t)
+          op = [
+            op[0] & 2,
+            t.value
+          ];
+        switch (op[0]) {
+          case 0:
+          case 1:
+            t = op;
+            break;
+          case 4:
+            _.label++;
+            return {
+              value: op[1],
+              done: false
+            };
+          case 5:
+            _.label++;
+            y = op[1];
             op = [
-                6,
-                e
+              0
             ];
-            y = 0;
-        } finally{
-            f = t = 0;
+            continue;
+          case 7:
+            op = _.ops.pop();
+            _.trys.pop();
+            continue;
+          default:
+            if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) {
+              _ = 0;
+              continue;
+            }
+            if (op[0] === 3 && (!t || op[1] > t[0] && op[1] < t[3])) {
+              _.label = op[1];
+              break;
+            }
+            if (op[0] === 6 && _.label < t[1]) {
+              _.label = t[1];
+              t = op;
+              break;
+            }
+            if (t && _.label < t[2]) {
+              _.label = t[2];
+              _.ops.push(op);
+              break;
+            }
+            if (t[2])
+              _.ops.pop();
+            _.trys.pop();
+            continue;
         }
-        if (op[0] & 5) throw op[1];
-        return {
-            value: op[0] ? op[1] : void 0,
-            done: true
-        };
-    }
+        op = body.call(thisArg, _);
+      } catch (e) {
+        op = [
+          6,
+          e
+        ];
+        y = 0;
+      } finally {
+        f = t = 0;
+      }
+    if (op[0] & 5)
+      throw op[1];
+    return {
+      value: op[0] ? op[1] : void 0,
+      done: true
+    };
+  }
 };
 import path from "path";
 import fs from "fs";
 import { MAIN_ENTRY_NAME, SERVER_BUNDLE_DIRECTORY } from "@modern-js/utils/constants";
 import { matchEntry } from "../common/utils";
-var server_default = function() {
-    return {
-        name: "@modern-js/plugin-data-loader",
-        setup: function() {
-            return {
-                prepareLoaderHandler: function prepareLoaderHandler(param) {
-                    var serverRoutes = param.serverRoutes, distDir = param.distDir;
-                    return function() {
-                        var _ref = _asyncToGenerator(function(context) {
-                            var entry, routesPath, _ref, routes, handleRequest;
-                            return __generator(this, function(_state) {
-                                switch(_state.label){
-                                    case 0:
-                                        entry = matchEntry(context.path, serverRoutes);
-                                        if (!entry) {
-                                            return [
-                                                2
-                                            ];
-                                        }
-                                        routesPath = path.join(distDir, SERVER_BUNDLE_DIRECTORY, "".concat(entry.entryName || MAIN_ENTRY_NAME, "-server-loaders.js"));
-                                        if (!fs.existsSync(routesPath)) {
-                                            return [
-                                                2
-                                            ];
-                                        }
-                                        return [
-                                            4,
-                                            import(routesPath)
-                                        ];
-                                    case 1:
-                                        _ref = _state.sent(), routes = _ref.routes, handleRequest = _ref.handleRequest;
-                                        if (!routes) {
-                                            return [
-                                                2
-                                            ];
-                                        }
-                                        return [
-                                            2,
-                                            handleRequest({
-                                                serverRoutes: serverRoutes,
-                                                context: context,
-                                                routes: routes
-                                            })
-                                        ];
-                                }
-                            });
-                        });
-                        return function(context) {
-                            return _ref.apply(this, arguments);
-                        };
-                    }();
+export default function() {
+  return {
+    name: "@modern-js/plugin-data-loader",
+    setup: function() {
+      return {
+        prepareLoaderHandler: function prepareLoaderHandler(param) {
+          var serverRoutes = param.serverRoutes, distDir = param.distDir;
+          return function() {
+            var _ref = _async_to_generator(function(context) {
+              var entry, routesPath, _ref2, routes, handleRequest;
+              return __generator(this, function(_state) {
+                switch (_state.label) {
+                  case 0:
+                    entry = matchEntry(context.path, serverRoutes);
+                    if (!entry) {
+                      return [
+                        2
+                      ];
+                    }
+                    routesPath = path.join(distDir, SERVER_BUNDLE_DIRECTORY, "".concat(entry.entryName || MAIN_ENTRY_NAME, "-server-loaders.js"));
+                    if (!fs.existsSync(routesPath)) {
+                      return [
+                        2
+                      ];
+                    }
+                    return [
+                      4,
+                      import(routesPath)
+                    ];
+                  case 1:
+                    _ref2 = _state.sent(), routes = _ref2.routes, handleRequest = _ref2.handleRequest;
+                    if (!routes) {
+                      return [
+                        2
+                      ];
+                    }
+                    return [
+                      2,
+                      handleRequest({
+                        serverRoutes,
+                        context,
+                        routes
+                      })
+                    ];
                 }
+              });
+            });
+            return function(context) {
+              return _ref.apply(this, arguments);
             };
+          }();
         }
-    };
-};
-export { server_default as default };
+      };
+    }
+  };
+}
+;

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

@@ -1,16 +1,8 @@
 import { compile } from "path-to-regexp";
 import { redirect } from "react-router-dom";
-import {
-  LOADER_ID_PARAM,
-  DIRECT_PARAM,
-  CONTENT_TYPE_DEFERRED
-} from "../common/constants";
+import { LOADER_ID_PARAM, DIRECT_PARAM, CONTENT_TYPE_DEFERRED } from "../common/constants";
 import { parseDeferredReadableStream } from "./data";
-const getRequestUrl = ({
-  params,
-  request,
-  routeId
-}) => {
+export const getRequestUrl = ({ params, request, routeId }) => {
   const url = new URL(request.url);
   const toPath = compile(url.pathname, {
     encode: encodeURIComponent
@@ -30,18 +22,19 @@ const handleRedirectResponse = (res) => {
   return res;
 };
 const handleDeferredResponse = async (res) => {
-  var _a;
-  if (((_a = res.headers.get("Content-Type")) == null ? void 0 : _a.match(CONTENT_TYPE_DEFERRED)) && res.body) {
+  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(CONTENT_TYPE_DEFERRED)) && res.body) {
     return await parseDeferredReadableStream(res.body);
   }
   return res;
 };
-const createRequest = (routeId, method = "get") => {
-  return async ({
-    params,
-    request
-  }) => {
-    const url = getRequestUrl({ params, request, routeId });
+export const createRequest = (routeId, method = "get") => {
+  return async ({ params, request }) => {
+    const url = getRequestUrl({
+      params,
+      request,
+      routeId
+    });
     let res;
     res = await fetch(url, {
       method,
@@ -55,7 +48,3 @@ const createRequest = (routeId, method = "get") => {
     return res;
   };
 };
-export {
-  createRequest,
-  getRequestUrl
-};

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

@@ -1,9 +1,6 @@
-import {
-  UNSAFE_DeferredData as DeferredData,
-  AbortedDeferredError
-} from "@modern-js/utils/universal/remix-router";
+import { UNSAFE_DeferredData as DeferredData, AbortedDeferredError } from "@modern-js/utils/universal/remix-router";
 const DEFERRED_VALUE_PLACEHOLDER_PREFIX = "__deferred_promise:";
-async function parseDeferredReadableStream(stream) {
+export async function parseDeferredReadableStream(stream) {
   if (!stream) {
     throw new Error("parseDeferredReadableStream requires stream argument");
   }
@@ -60,9 +57,7 @@ async function parseDeferredReadableStream(stream) {
           }
         }
         for (const [key, resolver] of Object.entries(deferredResolvers)) {
-          resolver.reject(
-            new AbortedDeferredError(`Deferred ${key} will never resolved`)
-          );
+          resolver.reject(new AbortedDeferredError(`Deferred ${key} will never resolved`));
         }
       } catch (error) {
         for (const resolver of Object.values(deferredResolvers)) {
@@ -70,7 +65,10 @@ async function parseDeferredReadableStream(stream) {
         }
       }
     })();
-    return new DeferredData({ ...criticalData, ...deferredData });
+    return new DeferredData({
+      ...criticalData,
+      ...deferredData
+    });
   } catch (error) {
     for (const resolver of Object.values(deferredResolvers)) {
       resolver.reject(error);
@@ -101,7 +99,9 @@ async function* readStreamSections(stream) {
         const splitSections = bufferedString.split("\n\n");
         if (splitSections.length >= 2) {
           sections.push(...splitSections.slice(0, -1));
-          buffer = [encoder.encode(splitSections.slice(-1).join("\n\n"))];
+          buffer = [
+            encoder.encode(splitSections.slice(-1).join("\n\n"))
+          ];
         }
         if (sections.length > 0) {
           break;
@@ -127,9 +127,7 @@ async function* readStreamSections(stream) {
   }
 }
 function mergeArrays(...arrays) {
-  const out = new Uint8Array(
-    arrays.reduce((total, arr) => total + arr.length, 0)
-  );
+  const out = new Uint8Array(arrays.reduce((total, arr) => total + arr.length, 0));
   let offset = 0;
   for (const arr of arrays) {
     out.set(arr, offset);
@@ -137,6 +135,3 @@ function mergeArrays(...arrays) {
   }
   return out;
 }
-export {
-  parseDeferredReadableStream
-};

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

@@ -1,8 +1,5 @@
 import path from "path";
-const generateClient = ({
-  mapFile,
-  loaderId
-}) => {
+export const generateClient = ({ mapFile, loaderId }) => {
   delete require.cache[mapFile];
   const loadersMap = require(mapFile);
   let requestCode = ``;
@@ -37,6 +34,3 @@ const generateClient = ({
   `;
   return generatedCode;
 };
-export {
-  generateClient
-};

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

@@ -1,8 +1,8 @@
 import { generateClient } from "./generateClient";
-async function loader(source) {
-  var _a;
+export default async function loader(source) {
+  var _this__compiler;
   this.cacheable();
-  const target = (_a = this._compiler) == null ? void 0 : _a.options.target;
+  const target = (_this__compiler = this._compiler) === null || _this__compiler === void 0 ? void 0 : _this__compiler.options.target;
   if (target === "node") {
     return source;
   }
@@ -29,6 +29,3 @@ async function loader(source) {
   });
   return code;
 }
-export {
-  loader as default
-};

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

@@ -1,8 +1,3 @@
-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
-};
+export const LOADER_ID_PARAM = "__loader";
+export const DIRECT_PARAM = "__ssrDirect";
+export const CONTENT_TYPE_DEFERRED = "text/modernjs-deferred";

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

@@ -12,10 +12,7 @@ function sortByUrlPath(entries) {
   });
   return entries;
 }
-const matchEntry = (pathname, entries) => {
+export const matchEntry = (pathname, entries) => {
   sortByUrlPath(entries);
   return entries.find((entry) => pathname.startsWith(entry.urlPath));
 };
-export {
-  matchEntry
-};

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

@@ -1,24 +1,22 @@
-import {
-  installGlobals,
-  writeReadableStreamToWritable,
-  Response as NodeResponse
-} from "@remix-run/node";
-import {
-  createStaticHandler,
-  ErrorResponse,
-  UNSAFE_DEFERRED_SYMBOL as DEFERRED_SYMBOL
-} from "@modern-js/utils/universal/remix-router";
+import { installGlobals, writeReadableStreamToWritable, Response as NodeResponse } from "@remix-run/node";
+import { createStaticHandler, ErrorResponse, UNSAFE_DEFERRED_SYMBOL as DEFERRED_SYMBOL } from "@modern-js/utils/universal/remix-router";
 import { isPlainObject } from "@modern-js/utils/lodash";
 import { transformNestedRoutes } from "@modern-js/utils/universal/nestedRoutes";
 import { CONTENT_TYPE_DEFERRED, LOADER_ID_PARAM } from "../common/constants";
 import { matchEntry } from "../common/utils";
 import { createDeferredReadableStream } from "./response";
 installGlobals();
-const redirectStatusCodes = /* @__PURE__ */ new Set([301, 302, 303, 307, 308]);
-function isRedirectResponse(status) {
+const redirectStatusCodes = /* @__PURE__ */ new Set([
+  301,
+  302,
+  303,
+  307,
+  308
+]);
+export function isRedirectResponse(status) {
   return redirectStatusCodes.has(status);
 }
-function isResponse(value) {
+export 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,11 +70,7 @@ const sendLoaderResponse = async (res, nodeResponse) => {
     res.end();
   }
 };
-const handleRequest = async ({
-  context,
-  serverRoutes,
-  routes: routesConfig
-}) => {
+export const handleRequest = async ({ context, serverRoutes, routes: routesConfig }) => {
   const { method, query } = context;
   const routeId = query[LOADER_ID_PARAM];
   const entry = matchEntry(context.path, serverRoutes);
@@ -108,10 +102,7 @@ const handleRequest = async ({
         if (!init.headers) {
           throw new Error("redirect response includes no headers");
         }
-        response = convertModernRedirectResponse(
-          new Headers(init.headers),
-          basename
-        );
+        response = convertModernRedirectResponse(new Headers(init.headers), basename);
       } else {
         const headers = new Headers(init.headers);
         headers.set("Content-Type", `${CONTENT_TYPE_DEFERRED}; charset=UTF-8`);
@@ -127,7 +118,7 @@ const handleRequest = async ({
     }
   } catch (error) {
     const message = error instanceof ErrorResponse ? error.data : String(error);
-    logger == null ? void 0 : logger.error(message);
+    logger === null || logger === void 0 ? void 0 : logger.error(message);
     response = new NodeResponse(message, {
       status: 500,
       headers: {
@@ -137,8 +128,3 @@ const handleRequest = async ({
   }
   await sendLoaderResponse(res, response);
 };
-export {
-  handleRequest,
-  isRedirectResponse,
-  isResponse
-};