@modern-js/plugin-data-loader 2.0.0-beta.2 → 2.0.0-beta.4

package/dist/js/modern/cli/create-request.js

@@ -1,9 +1,26 @@
-// eslint-disable-next-line eslint-comments/disable-enable-pair
-/* eslint-disable node/prefer-global/url */
-// eslint-disable-next-line eslint-comments/disable-enable-pair
-/* eslint-disable node/no-unsupported-features/node-builtins */
-import { compile } from 'path-to-regexp';
-export const getRequestUrl = ({
+var __async = (__this, __arguments, generator) => {
+  return new Promise((resolve, reject) => {
+    var fulfilled = (value) => {
+      try {
+        step(generator.next(value));
+      } catch (e) {
+        reject(e);
+      }
+    };
+    var rejected = (value) => {
+      try {
+        step(generator.throw(value));
+      } catch (e) {
+        reject(e);
+      }
+    };
+    var step = (x) => x.done ? resolve(x.value) : Promise.resolve(x.value).then(fulfilled, rejected);
+    step((generator = generator.apply(__this, __arguments)).next());
+  });
+};
+import { compile } from "path-to-regexp";
+import { redirect } from "react-router-dom";
+const getRequestUrl = ({
   params,
   request,
   routeId
@@ -14,28 +31,34 @@ export const getRequestUrl = ({
   });
   const newPathName = toPath(params);
   url.pathname = newPathName;
-  url.searchParams.append('_loader', routeId);
+  url.searchParams.append("_loader", routeId);
   return url;
 };
-export const createRequest = (routeId, method = 'get') => {
-  return async ({
+const handleRedirectResponse = (res) => {
+  const { headers } = res;
+  const location = headers.get("X-Modernjs-Redirect");
+  if (location) {
+    return redirect(location);
+  }
+  return res;
+};
+const createRequest = (routeId, method = "get") => {
+  return (_0) => __async(void 0, [_0], function* ({
     params,
     request
-  }) => {
-    const url = getRequestUrl({
-      params,
-      request,
-      routeId
+  }) {
+    const url = getRequestUrl({ params, request, routeId });
+    const res = yield fetch(url, {
+      method,
+      signal: request.signal
     });
-    try {
-      const res = await fetch(url, {
-        method,
-        signal: request.signal
-      });
-      return res;
-    } catch (error) {
-      console.error(error);
-      throw error;
+    if (!res.ok) {
+      throw res;
     }
-  };
-};
+    return handleRedirectResponse(res);
+  });
+};
+export {
+  createRequest,
+  getRequestUrl
+};

package/dist/js/modern/cli/generate-client.js

@@ -1,24 +1,27 @@
-import path from 'path';
-import { getRouteId } from '@modern-js/utils';
-export const generateClient = ({
-  basedir,
-  filename,
-  entryName
-}) => {
-  // TODO: loader 的约定变更
-  const componentPath = path.join(path.dirname(filename), 'layout.ts');
-  const routeId = getRouteId(componentPath, basedir, entryName);
-  const requestCreatorPath = path.join(__dirname, './create-request').replace('node', 'treeshaking').replace(/\\/g, '/');
+import path from "path";
+const generateClient = ({ mapFile }) => {
+  const loadersMap = require(mapFile);
+  const requestCode = Object.keys(loadersMap).map((loaderId) => {
+    const routeId = loadersMap[loaderId];
+    return `
+      const ${loaderId} = createRequest('${routeId}');
+    `;
+  }).join("");
+  let exportsCode = `export {`;
+  for (const loader of Object.keys(loadersMap)) {
+    exportsCode += `${loader},`;
+  }
+  exportsCode += "}";
+  const requestCreatorPath = path.join(__dirname, "./create-request").replace("/node/cli/", "/treeshaking/cli/").replace(/\\/g, "/");
   const importCode = `
     import { createRequest } from '${requestCreatorPath}';
   `;
-  const requestCode = `
-    const loader = createRequest('${routeId}');
-    export default loader;
-    export { loader };
-  `;
   return `
     ${importCode}
     ${requestCode}
+    ${exportsCode}
   `;
-};
+};
+export {
+  generateClient
+};

package/dist/js/modern/cli/loader.js

@@ -1,19 +1,39 @@
-// eslint-disable-next-line eslint-comments/disable-enable-pair
-/* eslint-disable @babel/no-invalid-this */
-
+var __async = (__this, __arguments, generator) => {
+  return new Promise((resolve, reject) => {
+    var fulfilled = (value) => {
+      try {
+        step(generator.next(value));
+      } catch (e) {
+        reject(e);
+      }
+    };
+    var rejected = (value) => {
+      try {
+        step(generator.throw(value));
+      } catch (e) {
+        reject(e);
+      }
+    };
+    var step = (x) => x.done ? resolve(x.value) : Promise.resolve(x.value).then(fulfilled, rejected);
+    step((generator = generator.apply(__this, __arguments)).next());
+  });
+};
 import { generateClient } from "./generate-client";
-export default 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;
-  if (target === 'node') {
-    return source;
-  }
-  const options = this.getOptions();
-  const code = generateClient({
-    basedir: options.routesDir,
-    filename: this.resourcePath,
-    entryName: options.entryName
+function loader(source) {
+  return __async(this, null, function* () {
+    var _a;
+    this.cacheable();
+    const target = (_a = this._compiler) == null ? void 0 : _a.options.target;
+    if (target === "node") {
+      return source;
+    }
+    const options = this.getOptions();
+    const code = generateClient({
+      mapFile: options.mapFile
+    });
+    return code;
   });
-  return code;
-}
+}
+export {
+  loader as default
+};

package/dist/js/modern/server/index.js

@@ -1,46 +1,86 @@
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-import { installGlobals, writeReadableStreamToWritable, Response as NodeResponse } from '@remix-run/node';
-import { matchRoutes } from 'react-router-dom';
-// Polyfill Web Fetch API
+var __defProp = Object.defineProperty;
+var __defProps = Object.defineProperties;
+var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
+var __getOwnPropSymbols = Object.getOwnPropertySymbols;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __propIsEnum = Object.prototype.propertyIsEnumerable;
+var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues = (a, b) => {
+  for (var prop in b || (b = {}))
+    if (__hasOwnProp.call(b, prop))
+      __defNormalProp(a, prop, b[prop]);
+  if (__getOwnPropSymbols)
+    for (var prop of __getOwnPropSymbols(b)) {
+      if (__propIsEnum.call(b, prop))
+        __defNormalProp(a, prop, b[prop]);
+    }
+  return a;
+};
+var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
+var __async = (__this, __arguments, generator) => {
+  return new Promise((resolve, reject) => {
+    var fulfilled = (value) => {
+      try {
+        step(generator.next(value));
+      } catch (e) {
+        reject(e);
+      }
+    };
+    var rejected = (value) => {
+      try {
+        step(generator.throw(value));
+      } catch (e) {
+        reject(e);
+      }
+    };
+    var step = (x) => x.done ? resolve(x.value) : Promise.resolve(x.value).then(fulfilled, rejected);
+    step((generator = generator.apply(__this, __arguments)).next());
+  });
+};
+import path from "path";
+import {
+  installGlobals,
+  writeReadableStreamToWritable,
+  Response as NodeResponse
+} from "@remix-run/node";
+import {
+  matchRoutes
+} from "react-router-dom";
+import { LOADER_ROUTES_DIR, MAIN_ENTRY_NAME } from "@modern-js/utils";
 installGlobals();
-const LOADER_SEARCH_PARAM = '_loader';
-const redirectStatusCodes = new Set([301, 302, 303, 307, 308]);
-export function isRedirectResponse(response) {
+const LOADER_SEARCH_PARAM = "_loader";
+const redirectStatusCodes = /* @__PURE__ */ new Set([301, 302, 303, 307, 308]);
+function isRedirectResponse(response) {
   return redirectStatusCodes.has(response.status);
 }
-export function isResponse(value) {
-  return value != null && typeof value.status === 'number' && typeof value.statusText === 'string' && typeof value.headers === 'object' && typeof value.body !== 'undefined';
+function isResponse(value) {
+  return value != null && typeof value.status === "number" && typeof value.statusText === "string" && typeof value.headers === "object" && typeof value.body !== "undefined";
 }
 const json = (data, init = {}) => {
-  const responseInit = typeof init === 'number' ? {
-    status: init
-  } : init;
+  const responseInit = typeof init === "number" ? { status: init } : init;
   const headers = new Headers(responseInit.headers);
-  if (!headers.has('Content-Type')) {
-    headers.set('Content-Type', 'application/json; charset=utf-8');
+  if (!headers.has("Content-Type")) {
+    headers.set("Content-Type", "application/json; charset=utf-8");
   }
-  return new NodeResponse(JSON.stringify(data), _objectSpread(_objectSpread({}, responseInit), {}, {
+  return new NodeResponse(JSON.stringify(data), __spreadProps(__spreadValues({}, responseInit), {
     headers
   }));
 };
-
-// TODO: 添加 context
-const callRouteLoader = async ({
+const callRouteLoader = (_0) => __async(void 0, [_0], function* ({
   routeId,
   loader,
   params,
   request,
-  // eslint-disable-next-line @typescript-eslint/no-unused-vars
   loadContext
-}) => {
+}) {
   if (!loader) {
-    throw new Error(`You made a ${request.method} request to ${request.url} but did not provide ` + `a default component or \`loader\` for route "${routeId}", ` + `so there is no way to handle the request.`);
+    throw new Error(
+      `You made a ${request.method} request to ${request.url} but did not provide a default component or \`loader\` for route "${routeId}", so there is no way to handle the request.`
+    );
   }
   let result;
   try {
-    result = await loader({
+    result = yield loader({
       request,
       params
     });
@@ -50,12 +90,14 @@ const callRouteLoader = async ({
     }
     result = error;
   }
-  if (result === undefined) {
-    throw new Error(`You defined a loader for route "${routeId}" but didn't return ` + `anything from your \`loader\` function. Please return a value or \`null\`.`);
+  if (result === void 0) {
+    throw new Error(
+      `You defined a loader for route "${routeId}" but didn't return anything from your \`loader\` function. Please return a value or \`null\`.`
+    );
   }
   return isResponse(result) ? result : json(result);
-};
-const createLoaderHeaders = requestHeaders => {
+});
+const createLoaderHeaders = (requestHeaders) => {
   const headers = new Headers();
   for (const [key, values] of Object.entries(requestHeaders)) {
     if (values) {
@@ -70,9 +112,8 @@ const createLoaderHeaders = requestHeaders => {
   }
   return headers;
 };
-const createLoaderRequest = context => {
+const createLoaderRequest = (context) => {
   const origin = `${context.protocol}://${context.host}`;
-  // eslint-disable-next-line node/no-unsupported-features/node-builtins, node/prefer-global/url
   const url = new URL(context.url, origin);
   const controller = new AbortController();
   const init = {
@@ -82,53 +123,51 @@ const createLoaderRequest = context => {
   };
   return new Request(url.href, init);
 };
-const sendLoaderResponse = async (res, nodeResponse) => {
+const sendLoaderResponse = (res, nodeResponse) => __async(void 0, null, function* () {
   res.statusMessage = nodeResponse.statusText;
   res.statusCode = nodeResponse.status;
   for (const [key, value] of nodeResponse.headers.entries()) {
     res.setHeader(key, value);
   }
   if (nodeResponse.body) {
-    await writeReadableStreamToWritable(nodeResponse.body, res);
+    yield writeReadableStreamToWritable(nodeResponse.body, res);
   } else {
     res.end();
   }
-};
-export const getPathWithoutEntry = (pathname, entryPath) => {
-  if (entryPath === '/') {
+});
+const getPathWithoutEntry = (pathname, entryPath) => {
+  if (entryPath === "/") {
     return pathname;
   }
-  return pathname.replace(entryPath, '');
+  return pathname.replace(entryPath, "");
 };
 const matchEntry = (pathname, entries) => {
-  return entries.find(entry => pathname.startsWith(entry.urlPath));
+  return entries.find((entry) => pathname.startsWith(entry.urlPath));
 };
-export const handleRequest = async ({
+const handleRequest = (_0) => __async(void 0, [_0], function* ({
   context,
   serverRoutes,
   distDir
-}) => {
-  const {
-    method,
-    query
-  } = context;
+}) {
+  const { method, query } = context;
   const routeId = query[LOADER_SEARCH_PARAM];
-  if (!routeId || method.toLowerCase() !== 'get') {
+  if (!routeId || method.toLowerCase() !== "get") {
     return;
   }
   const entry = matchEntry(context.path, serverRoutes);
   if (!entry) {
     return;
   }
-  const {
-    routes
-  } = await import(`${distDir}/loader-routes/${entry.entryName}`);
+  const routesPath = path.join(
+    distDir,
+    LOADER_ROUTES_DIR,
+    entry.entryName || MAIN_ENTRY_NAME
+  );
+  const { routes } = yield import(routesPath);
   if (!routes) {
     return;
   }
-  const {
-    res
-  } = context;
+  const { res } = context;
   const pathname = getPathWithoutEntry(context.path, entry.urlPath);
   const matches = matchRoutes(routes, pathname);
   if (!matches) {
@@ -136,7 +175,7 @@ export const handleRequest = async ({
     res.end(`Route ${pathname} was not matched`);
     return;
   }
-  const match = matches === null || matches === void 0 ? void 0 : matches.find(match => match.route.id === routeId);
+  const match = matches == null ? void 0 : matches.find((match2) => match2.route.id === routeId);
   if (!match) {
     res.statusCode = 403;
     res.end(`Route ${routeId} does not match URL ${context.path}`);
@@ -145,39 +184,54 @@ export const handleRequest = async ({
   const request = createLoaderRequest(context);
   let response;
   try {
-    response = await callRouteLoader({
+    response = yield callRouteLoader({
       loader: match.route.loader,
       routeId: match.route.id,
       params: match.params,
       request,
       loadContext: {}
     });
-    // TODO: 处理 redirect
+    if (isRedirectResponse(response)) {
+      const headers = new Headers(response.headers);
+      headers.set("X-Modernjs-Redirect", headers.get("Location"));
+      headers.delete("Location");
+      response = new NodeResponse(null, {
+        status: 204,
+        headers
+      });
+    }
   } catch (error) {
     const message = String(error);
     response = new NodeResponse(message, {
       status: 500,
       headers: {
-        'Content-Type': 'text/plain'
+        "Content-Type": "text/plain"
       }
     });
   }
   sendLoaderResponse(res, response);
-};
-export default (() => ({
-  name: '@modern-js/plugin-data-loader',
+});
+var server_default = () => ({
+  name: "@modern-js/plugin-data-loader",
   setup: () => ({
     preparebeforeRouteHandler({
       serverRoutes,
       distDir
     }) {
-      return async context => {
+      return (context) => __async(this, null, function* () {
         return handleRequest({
           serverRoutes,
           distDir,
           context
         });
-      };
+      });
     }
   })
-}));
+});
+export {
+  server_default as default,
+  getPathWithoutEntry,
+  handleRequest,
+  isRedirectResponse,
+  isResponse
+};

package/dist/js/node/cli/create-request.js

@@ -1,50 +1,83 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
+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 stdin_exports = {};
+__export(stdin_exports, {
+  createRequest: () => createRequest,
+  getRequestUrl: () => getRequestUrl
 });
-exports.getRequestUrl = exports.createRequest = void 0;
-var _pathToRegexp = require("path-to-regexp");
-// eslint-disable-next-line eslint-comments/disable-enable-pair
-/* eslint-disable node/prefer-global/url */
-// eslint-disable-next-line eslint-comments/disable-enable-pair
-/* eslint-disable node/no-unsupported-features/node-builtins */
-
+module.exports = __toCommonJS(stdin_exports);
+var import_path_to_regexp = require("path-to-regexp");
+var import_react_router_dom = require("react-router-dom");
+var __async = (__this, __arguments, generator) => {
+  return new Promise((resolve, reject) => {
+    var fulfilled = (value) => {
+      try {
+        step(generator.next(value));
+      } catch (e) {
+        reject(e);
+      }
+    };
+    var rejected = (value) => {
+      try {
+        step(generator.throw(value));
+      } catch (e) {
+        reject(e);
+      }
+    };
+    var step = (x) => x.done ? resolve(x.value) : Promise.resolve(x.value).then(fulfilled, rejected);
+    step((generator = generator.apply(__this, __arguments)).next());
+  });
+};
 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('_loader', routeId);
+  url.searchParams.append("_loader", routeId);
   return url;
 };
-exports.getRequestUrl = getRequestUrl;
-const createRequest = (routeId, method = 'get') => {
-  return async ({
+const handleRedirectResponse = (res) => {
+  const { headers } = res;
+  const location = headers.get("X-Modernjs-Redirect");
+  if (location) {
+    return (0, import_react_router_dom.redirect)(location);
+  }
+  return res;
+};
+const createRequest = (routeId, method = "get") => {
+  return (_0) => __async(void 0, [_0], function* ({
     params,
     request
-  }) => {
-    const url = getRequestUrl({
-      params,
-      request,
-      routeId
+  }) {
+    const url = getRequestUrl({ params, request, routeId });
+    const res = yield fetch(url, {
+      method,
+      signal: request.signal
     });
-    try {
-      const res = await fetch(url, {
-        method,
-        signal: request.signal
-      });
-      return res;
-    } catch (error) {
-      console.error(error);
-      throw error;
+    if (!res.ok) {
+      throw res;
     }
-  };
+    return handleRedirectResponse(res);
+  });
 };
-exports.createRequest = createRequest;

package/dist/js/node/cli/generate-client.js

@@ -1,32 +1,52 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
+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(
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var stdin_exports = {};
+__export(stdin_exports, {
+  generateClient: () => generateClient
 });
-exports.generateClient = void 0;
-var _path = _interopRequireDefault(require("path"));
-var _utils = require("@modern-js/utils");
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-const generateClient = ({
-  basedir,
-  filename,
-  entryName
-}) => {
-  // TODO: loader 的约定变更
-  const componentPath = _path.default.join(_path.default.dirname(filename), 'layout.ts');
-  const routeId = (0, _utils.getRouteId)(componentPath, basedir, entryName);
-  const requestCreatorPath = _path.default.join(__dirname, './create-request').replace('node', 'treeshaking').replace(/\\/g, '/');
+module.exports = __toCommonJS(stdin_exports);
+var import_path = __toESM(require("path"));
+const generateClient = ({ mapFile }) => {
+  const loadersMap = require(mapFile);
+  const requestCode = Object.keys(loadersMap).map((loaderId) => {
+    const routeId = loadersMap[loaderId];
+    return `
+      const ${loaderId} = createRequest('${routeId}');
+    `;
+  }).join("");
+  let exportsCode = `export {`;
+  for (const loader of Object.keys(loadersMap)) {
+    exportsCode += `${loader},`;
+  }
+  exportsCode += "}";
+  const requestCreatorPath = import_path.default.join(__dirname, "./create-request").replace("/node/cli/", "/treeshaking/cli/").replace(/\\/g, "/");
   const importCode = `
     import { createRequest } from '${requestCreatorPath}';
   `;
-  const requestCode = `
-    const loader = createRequest('${routeId}');
-    export default loader;
-    export { loader };
-  `;
   return `
     ${importCode}
     ${requestCode}
+    ${exportsCode}
   `;
 };
-exports.generateClient = generateClient;