@modern-js/app-tools 2.0.0-beta.3 → 2.0.0-beta.6

package/dist/js/node/analyze/nestedRoutes.js

@@ -1,63 +1,118 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.walk = void 0;
-var path = _interopRequireWildcard(require("path"));
-var _utils = require("@modern-js/utils");
-var _constants = require("./constants");
-var _utils2 = require("./utils");
-function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-function _interopRequireWildcard(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; }
-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; }
-const LAYOUT_FILE = 'layout';
-const PAGE_FILE = 'page';
-const LOADING_FILE = 'loading';
-const ERROR_FILE = 'error';
-const LOADER_FILE = 'loader';
-const conventionNames = [LAYOUT_FILE, PAGE_FILE, LOADING_FILE, ERROR_FILE, LOADER_FILE];
-const getLoaderPath = async filename => {
-  if (await (0, _utils2.hasLoader)(filename)) {
-    return (0, _utils.normalizeToPosixPath)(filename);
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __defProps = Object.defineProperties;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getOwnPropSymbols = Object.getOwnPropertySymbols;
+var __getProtoOf = Object.getPrototypeOf;
+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 __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 undefined;
+  return to;
 };
-const replaceDynamicPath = routePath => {
-  return routePath.replace(/\[(.*?)\]/g, ':$1');
+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 __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());
+  });
+};
+var nestedRoutes_exports = {};
+__export(nestedRoutes_exports, {
+  walk: () => walk
+});
+module.exports = __toCommonJS(nestedRoutes_exports);
+var path = __toESM(require("path"));
+var import_utils = require("@modern-js/utils");
+var import_constants = require("./constants");
+var import_utils2 = require("./utils");
+const conventionNames = Object.values(import_constants.NESTED_ROUTE);
+const getLoaderPath = (filename) => __async(void 0, null, function* () {
+  if (yield (0, import_utils2.hasLoader)(filename)) {
+    return filename;
+  }
+  return void 0;
+});
+const replaceDynamicPath = (routePath) => {
+  return routePath.replace(/\[(.*?)\]/g, ":$1");
 };
 const createIndexRoute = (routeInfo, rootDir, filename, entryName) => {
-  return createRoute(_objectSpread(_objectSpread({}, routeInfo), {}, {
-    index: true,
-    children: undefined
-  }), rootDir, filename, entryName);
+  return createRoute(
+    __spreadProps(__spreadValues({}, routeInfo), {
+      index: true,
+      children: void 0
+    }),
+    rootDir,
+    filename,
+    entryName
+  );
 };
 const createRoute = (routeInfo, rootDir, filename, entryName) => {
-  const id = (0, _utils.getRouteId)(filename, rootDir, entryName);
-  return _objectSpread(_objectSpread({}, routeInfo), {}, {
+  const id = (0, import_utils.getRouteId)(filename, rootDir, entryName);
+  return __spreadProps(__spreadValues({}, routeInfo), {
     id,
-    type: 'nested'
+    type: "nested"
   });
 };
-const walk = async (dirname, rootDir, alias, entryName) => {
-  if (!(await _utils.fs.pathExists(dirname))) {
+const walk = (dirname, rootDir, alias, entryName) => __async(void 0, null, function* () {
+  var _a, _b;
+  if (!(yield import_utils.fs.pathExists(dirname))) {
     return null;
   }
-  const isDirectory = (await _utils.fs.stat(dirname)).isDirectory();
+  const isDirectory = (yield import_utils.fs.stat(dirname)).isDirectory();
   if (!isDirectory) {
     return null;
   }
   const relativeDir = path.relative(rootDir, dirname);
   const pathSegments = relativeDir.split(path.sep);
   const lastSegment = pathSegments[pathSegments.length - 1];
-  const isRoot = lastSegment === '';
-  const isPathlessLayout = lastSegment.startsWith('__');
-  const isWithoutLayoutPath = lastSegment.includes('.');
-  let routePath = isRoot || isPathlessLayout ? '/' : `${lastSegment}`;
+  const isRoot = lastSegment === "";
+  const isPathlessLayout = lastSegment.startsWith("__");
+  const isWithoutLayoutPath = lastSegment.includes(".");
+  let routePath = isRoot || isPathlessLayout ? "/" : `${lastSegment}`;
   if (isWithoutLayoutPath) {
-    routePath = lastSegment.split('.').join('/');
+    routePath = lastSegment.split(".").join("/");
   }
   routePath = replaceDynamicPath(routePath);
   const route = {
@@ -65,58 +120,74 @@ const walk = async (dirname, rootDir, alias, entryName) => {
     children: [],
     isRoot
   };
-  const items = await _utils.fs.readdir(dirname);
+  let pageLoaderFile = "";
+  let pageRoute = null;
+  const items = yield import_utils.fs.readdir(dirname);
   for (const item of items) {
     const itemPath = path.join(dirname, item);
     const extname = path.extname(item);
     const itemWithoutExt = item.slice(0, -extname.length);
-    const isDirectory = (await _utils.fs.stat(itemPath)).isDirectory();
-    if (isDirectory) {
-      const childRoute = await walk(itemPath, rootDir, alias, entryName);
+    const isDirectory2 = (yield import_utils.fs.stat(itemPath)).isDirectory();
+    if (isDirectory2) {
+      const childRoute = yield walk(itemPath, rootDir, alias, entryName);
       if (childRoute) {
-        var _route$children;
-        (_route$children = route.children) === null || _route$children === void 0 ? void 0 : _route$children.push(childRoute);
+        (_a = route.children) == null ? void 0 : _a.push(childRoute);
       }
     }
-    if (extname && (!_constants.JS_EXTENSIONS.includes(extname) || !conventionNames.includes(itemWithoutExt))) {
+    if (extname && (!import_constants.JS_EXTENSIONS.includes(extname) || !conventionNames.includes(itemWithoutExt))) {
       continue;
     }
-    if (itemWithoutExt === LAYOUT_FILE) {
-      route._component = (0, _utils2.replaceWithAlias)(alias.basename, itemPath, alias.name);
-      route.loader = await getLoaderPath(itemPath);
+    if (itemWithoutExt === import_constants.NESTED_ROUTE.LAYOUT_LOADER_FILE) {
+      if (!route.loader) {
+        route.loader = itemPath;
+      }
     }
-    if (itemWithoutExt === PAGE_FILE) {
-      var _route$children2;
-      const childRoute = createIndexRoute({
-        _component: (0, _utils2.replaceWithAlias)(alias.basename, itemPath, alias.name)
-      }, rootDir, itemPath, entryName);
-      childRoute.loader = await getLoaderPath(itemPath);
-      (_route$children2 = route.children) === null || _route$children2 === void 0 ? void 0 : _route$children2.push(childRoute);
+    if (itemWithoutExt === import_constants.NESTED_ROUTE.LAYOUT_FILE) {
+      route._component = (0, import_utils2.replaceWithAlias)(alias.basename, itemPath, alias.name);
+      const loaderPath = yield getLoaderPath(itemPath);
+      if (loaderPath) {
+        route.loader = loaderPath;
+      }
     }
-
-    // if (itemWithoutExt === LOADER_FILE) {
-    //   route.loader = replaceWithAlias(alias.basename, itemPath, alias.name);
-    // }
-
-    if (itemWithoutExt === LOADING_FILE) {
-      route.loading = (0, _utils2.replaceWithAlias)(alias.basename, itemPath, alias.name);
+    if (itemWithoutExt === import_constants.NESTED_ROUTE.PAGE_LOADER_FILE) {
+      pageLoaderFile = itemPath;
+    }
+    if (itemWithoutExt === import_constants.NESTED_ROUTE.PAGE_FILE) {
+      pageRoute = createIndexRoute(
+        {
+          _component: (0, import_utils2.replaceWithAlias)(alias.basename, itemPath, alias.name)
+        },
+        rootDir,
+        itemPath,
+        entryName
+      );
+      const loaderPath = yield getLoaderPath(itemPath);
+      if (loaderPath) {
+        pageRoute.loader = loaderPath;
+      } else if (pageLoaderFile) {
+        pageRoute.loader = pageLoaderFile;
+      }
+      (_b = route.children) == null ? void 0 : _b.push(pageRoute);
     }
-    if (itemWithoutExt === ERROR_FILE) {
-      route.error = (0, _utils2.replaceWithAlias)(alias.basename, itemPath, alias.name);
+    if (itemWithoutExt === import_constants.NESTED_ROUTE.LOADING_FILE) {
+      route.loading = (0, import_utils2.replaceWithAlias)(alias.basename, itemPath, alias.name);
+    }
+    if (itemWithoutExt === import_constants.NESTED_ROUTE.ERROR_FILE) {
+      route.error = (0, import_utils2.replaceWithAlias)(alias.basename, itemPath, alias.name);
     }
   }
-  const finalRoute = createRoute(route, rootDir, path.join(dirname, `${LAYOUT_FILE}.ts`), entryName);
-
-  /**
-   * when the url is /, the __auth/layout.tsx component should not be rendered
-   * - routes
-   *  - __auth
-   *    - layout.tsx
-   *  - layout.tsx
-   */
+  const finalRoute = createRoute(
+    route,
+    rootDir,
+    path.join(dirname, `${import_constants.NESTED_ROUTE.LAYOUT_FILE}.ts`),
+    entryName
+  );
   if (isPathlessLayout) {
     delete finalRoute.path;
   }
   return finalRoute;
-};
-exports.walk = walk;
+});
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  walk
+});