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

package/dist/cjs/runtime/response.js

@@ -1,33 +1,19 @@
-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
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+Object.defineProperty(exports, "createDeferredReadableStream", {
+  enumerable: true,
+  get: () => createDeferredReadableStream
 });
-module.exports = __toCommonJS(response_exports);
-var import_util = require("util");
-var import_serialize = require("@modern-js/utils/universal/serialize");
+const _util = require("util");
+const _serialize = require("@modern-js/utils/universal/serialize");
 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 import_util.TextEncoder();
+  const encoder = new _util.TextEncoder();
   const stream = new ReadableStream({
     async start(controller) {
       const criticalData = {};
@@ -46,21 +32,11 @@ function createDeferredReadableStream(deferredData, signal) {
 
 `));
       for (const preresolvedKey of preresolvedKeys) {
-        enqueueTrackedPromise(
-          controller,
-          encoder,
-          preresolvedKey,
-          deferredData.data[preresolvedKey]
-        );
+        enqueueTrackedPromise(controller, encoder, preresolvedKey, deferredData.data[preresolvedKey]);
       }
       const unsubscribe = deferredData.subscribe((aborted, settledKey) => {
         if (settledKey) {
-          enqueueTrackedPromise(
-            controller,
-            encoder,
-            settledKey,
-            deferredData.data[settledKey]
-          );
+          enqueueTrackedPromise(controller, encoder, settledKey, deferredData.data[settledKey]);
         }
       });
       await deferredData.resolveData(signal);
@@ -71,32 +47,22 @@ function createDeferredReadableStream(deferredData, signal) {
   return stream;
 }
 function enqueueTrackedPromise(controller, encoder, settledKey, promise) {
-  var _a;
   if ("_error" in promise) {
     const { _error } = promise;
-    controller.enqueue(
-      encoder.encode(
-        `error:${(0, import_serialize.serializeJson)({
-          [settledKey]: {
-            message: _error.message,
-            stack: _error.stack
-          }
-        })}
+    controller.enqueue(encoder.encode(`error:${(0, _serialize.serializeJson)({
+      [settledKey]: {
+        message: _error.message,
+        stack: _error.stack
+      }
+    })}
 
-`
-      )
-    );
+`));
   } else {
-    controller.enqueue(
-      encoder.encode(
-        `data:${JSON.stringify({ [settledKey]: (_a = promise._data) != null ? _a : null })}
+    var _promise__data;
+    controller.enqueue(encoder.encode(`data:${JSON.stringify({
+      [settledKey]: (_promise__data = promise._data) !== null && _promise__data !== void 0 ? _promise__data : null
+    })}
 
-`
-      )
-    );
+`));
   }
 }
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  createDeferredReadableStream
-});

package/dist/cjs/server/index.js

@@ -1,60 +1,74 @@
-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
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+Object.defineProperty(exports, "default", {
+  enumerable: true,
+  get: () => _default
 });
-module.exports = __toCommonJS(server_exports);
-var import_path = __toESM(require("path"));
-var import_fs = __toESM(require("fs"));
-var import_constants = require("@modern-js/utils/constants");
-var import_utils = require("../common/utils");
-var server_default = () => ({
+const _path = /* @__PURE__ */ _interop_require_default(require("path"));
+const _fs = /* @__PURE__ */ _interop_require_default(require("fs"));
+const _constants = require("@modern-js/utils/constants");
+const _utils = require("../common/utils");
+function _interop_require_default(obj) {
+  return obj && obj.__esModule ? obj : {
+    default: obj
+  };
+}
+function _getRequireWildcardCache(nodeInterop) {
+  if (typeof WeakMap !== "function")
+    return null;
+  var cacheBabelInterop = /* @__PURE__ */ new WeakMap();
+  var cacheNodeInterop = /* @__PURE__ */ new WeakMap();
+  return (_getRequireWildcardCache = function(nodeInterop2) {
+    return nodeInterop2 ? cacheNodeInterop : cacheBabelInterop;
+  })(nodeInterop);
+}
+function _interop_require_wildcard(obj, nodeInterop) {
+  if (!nodeInterop && obj && obj.__esModule) {
+    return obj;
+  }
+  if (obj === null || typeof obj !== "object" && typeof obj !== "function") {
+    return {
+      default: obj
+    };
+  }
+  var cache = _getRequireWildcardCache(nodeInterop);
+  if (cache && cache.has(obj)) {
+    return cache.get(obj);
+  }
+  var newObj = {};
+  var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor;
+  for (var key in obj) {
+    if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) {
+      var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null;
+      if (desc && (desc.get || desc.set)) {
+        Object.defineProperty(newObj, key, desc);
+      } else {
+        newObj[key] = obj[key];
+      }
+    }
+  }
+  newObj.default = obj;
+  if (cache) {
+    cache.set(obj, newObj);
+  }
+  return newObj;
+}
+const _default = () => ({
   name: "@modern-js/plugin-data-loader",
   setup: () => ({
-    prepareLoaderHandler({
-      serverRoutes,
-      distDir
-    }) {
+    prepareLoaderHandler({ serverRoutes, distDir }) {
       return async (context) => {
-        const entry = (0, import_utils.matchEntry)(context.path, serverRoutes);
+        const entry = (0, _utils.matchEntry)(context.path, serverRoutes);
         if (!entry) {
           return;
         }
-        const routesPath = import_path.default.join(
-          distDir,
-          import_constants.SERVER_BUNDLE_DIRECTORY,
-          `${entry.entryName || import_constants.MAIN_ENTRY_NAME}-server-loaders.js`
-        );
-        if (!import_fs.default.existsSync(routesPath)) {
+        const routesPath = _path.default.join(distDir, _constants.SERVER_BUNDLE_DIRECTORY, `${entry.entryName || _constants.MAIN_ENTRY_NAME}-server-loaders.js`);
+        if (!_fs.default.existsSync(routesPath)) {
           return;
         }
-        const { routes, handleRequest } = await Promise.resolve().then(() => __toESM(require(routesPath)));
+        const { routes, handleRequest } = await Promise.resolve(routesPath).then((p) => /* @__PURE__ */ _interop_require_wildcard(require(p)));
         if (!routes) {
           return;
         }
@@ -67,5 +81,3 @@ var server_default = () => ({
     }
   })
 });
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {});

package/dist/esm/cli/createRequest.js

@@ -1,225 +1,232 @@
 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 { compile } from "path-to-regexp";
 import { redirect } from "react-router-dom";
 import { LOADER_ID_PARAM, DIRECT_PARAM, CONTENT_TYPE_DEFERRED } from "../common/constants";
 import { parseDeferredReadableStream } from "./data";
-var getRequestUrl = function(param) {
-    var params = param.params, request = param.request, routeId = param.routeId;
-    var url = new URL(request.url);
-    var toPath = compile(url.pathname, {
-        encode: encodeURIComponent
-    });
-    var newPathName = toPath(params);
-    url.pathname = newPathName;
-    url.searchParams.append(LOADER_ID_PARAM, routeId);
-    url.searchParams.append(DIRECT_PARAM, "true");
-    return url;
+export 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, {
+    encode: encodeURIComponent
+  });
+  var newPathName = toPath(params);
+  url.pathname = newPathName;
+  url.searchParams.append(LOADER_ID_PARAM, routeId);
+  url.searchParams.append(DIRECT_PARAM, "true");
+  return url;
 };
 var handleRedirectResponse = function(res) {
-    var headers = res.headers;
-    var location = headers.get("X-Modernjs-Redirect");
-    if (location) {
-        throw redirect(location);
-    }
-    return res;
+  var headers = res.headers;
+  var location = headers.get("X-Modernjs-Redirect");
+  if (location) {
+    throw redirect(location);
+  }
+  return res;
 };
 var handleDeferredResponse = function() {
-    var _ref = _asyncToGenerator(function(res) {
-        var _res_headers_get;
-        return __generator(this, function(_state) {
-            switch(_state.label){
-                case 0:
-                    if (!(((_res_headers_get = res.headers.get("Content-Type")) === null || _res_headers_get === void 0 ? void 0 : _res_headers_get.match(CONTENT_TYPE_DEFERRED)) && res.body)) return [
-                        3,
-                        2
-                    ];
-                    return [
-                        4,
-                        parseDeferredReadableStream(res.body)
-                    ];
-                case 1:
-                    return [
-                        2,
-                        _state.sent()
-                    ];
-                case 2:
-                    return [
-                        2,
-                        res
-                    ];
-            }
-        });
+  var _ref = _async_to_generator(function(res) {
+    var _res_headers_get;
+    return __generator(this, function(_state) {
+      switch (_state.label) {
+        case 0:
+          if (!(((_res_headers_get = res.headers.get("Content-Type")) === null || _res_headers_get === void 0 ? void 0 : _res_headers_get.match(CONTENT_TYPE_DEFERRED)) && res.body))
+            return [
+              3,
+              2
+            ];
+          return [
+            4,
+            parseDeferredReadableStream(res.body)
+          ];
+        case 1:
+          return [
+            2,
+            _state.sent()
+          ];
+        case 2:
+          return [
+            2,
+            res
+          ];
+      }
     });
-    return function handleDeferredResponse(res) {
-        return _ref.apply(this, arguments);
-    };
+  });
+  return function handleDeferredResponse2(res) {
+    return _ref.apply(this, arguments);
+  };
 }();
-var createRequest = function(routeId) {
-    var method = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : "get";
-    return function() {
-        var _ref = _asyncToGenerator(function(param) {
-            var params, request, url, res;
-            return __generator(this, function(_state) {
-                switch(_state.label){
-                    case 0:
-                        params = param.params, request = param.request;
-                        url = getRequestUrl({
-                            params: params,
-                            request: request,
-                            routeId: routeId
-                        });
-                        return [
-                            4,
-                            fetch(url, {
-                                method: method,
-                                signal: request.signal
-                            })
-                        ];
-                    case 1:
-                        res = _state.sent();
-                        if (!res.ok) {
-                            throw res;
-                        }
-                        res = handleRedirectResponse(res);
-                        return [
-                            4,
-                            handleDeferredResponse(res)
-                        ];
-                    case 2:
-                        res = _state.sent();
-                        return [
-                            2,
-                            res
-                        ];
-                }
+export 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) {
+      var params, request, url, res;
+      return __generator(this, function(_state) {
+        switch (_state.label) {
+          case 0:
+            params = param.params, request = param.request;
+            url = getRequestUrl({
+              params,
+              request,
+              routeId
             });
-        });
-        return function(_) {
-            return _ref.apply(this, arguments);
-        };
-    }();
+            return [
+              4,
+              fetch(url, {
+                method,
+                signal: request.signal
+              })
+            ];
+          case 1:
+            res = _state.sent();
+            if (!res.ok) {
+              throw res;
+            }
+            res = handleRedirectResponse(res);
+            return [
+              4,
+              handleDeferredResponse(res)
+            ];
+          case 2:
+            res = _state.sent();
+            return [
+              2,
+              res
+            ];
+        }
+      });
+    });
+    return function(_) {
+      return _ref.apply(this, arguments);
+    };
+  }();
 };
-export { createRequest, getRequestUrl };