@umijs/core 4.0.5 → 4.0.8

package/dist/route/defineRoutes.js

@@ -1,31 +1,55 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.defineRoutes = void 0;
-const utils_1 = require("./utils");
+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);
+
+// defineRoutes.ts
+var defineRoutes_exports = {};
+__export(defineRoutes_exports, {
+  defineRoutes: () => defineRoutes
+});
+module.exports = __toCommonJS(defineRoutes_exports);
+var import_utils = require("./utils");
 function defineRoutes(callback) {
-    const routes = Object.create(null);
-    const parentRoutes = [];
-    const defineRoute = (opts) => {
-        opts.options = opts.options || {};
-        const parentRoute = parentRoutes.length > 0 ? parentRoutes[parentRoutes.length - 1] : null;
-        const parentId = parentRoute === null || parentRoute === void 0 ? void 0 : parentRoute.id;
-        const parentAbsPath = parentRoute === null || parentRoute === void 0 ? void 0 : parentRoute.absPath;
-        const absPath = [parentAbsPath, opts.path].join('/');
-        const route = {
-            path: opts.path || '/',
-            id: (0, utils_1.createRouteId)(opts.file),
-            parentId,
-            file: opts.file,
-            absPath,
-        };
-        routes[route.id] = route;
-        if (opts.children) {
-            parentRoutes.push(route);
-            opts.children();
-            parentRoutes.pop();
-        }
+  const routes = /* @__PURE__ */ Object.create(null);
+  const parentRoutes = [];
+  const defineRoute = (opts) => {
+    opts.options = opts.options || {};
+    const parentRoute = parentRoutes.length > 0 ? parentRoutes[parentRoutes.length - 1] : null;
+    const parentId = parentRoute == null ? void 0 : parentRoute.id;
+    const parentAbsPath = parentRoute == null ? void 0 : parentRoute.absPath;
+    const absPath = [parentAbsPath, opts.path].join("/");
+    const route = {
+      path: opts.path || "/",
+      id: (0, import_utils.createRouteId)(opts.file),
+      parentId,
+      file: opts.file,
+      absPath
     };
-    callback(defineRoute);
-    return routes;
+    routes[route.id] = route;
+    if (opts.children) {
+      parentRoutes.push(route);
+      opts.children();
+      parentRoutes.pop();
+    }
+  };
+  callback(defineRoute);
+  return routes;
 }
-exports.defineRoutes = defineRoutes;
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  defineRoutes
+});

package/dist/route/route.js

@@ -1,23 +1,21 @@
-"use strict";
-// TODO
-// [x] convention route
-// config route
-// programming route
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+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;
 };
-Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./routesConfig"), exports);
-__exportStar(require("./routesConvention"), exports);
-__exportStar(require("./routeUtils"), exports);
+var __reExport = (target, mod, secondTarget) => (__copyProps(target, mod, "default"), secondTarget && __copyProps(secondTarget, mod, "default"));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// route.ts
+var route_exports = {};
+module.exports = __toCommonJS(route_exports);
+__reExport(route_exports, require("./routesConfig"), module.exports);
+__reExport(route_exports, require("./routesConvention"), module.exports);
+__reExport(route_exports, require("./routeUtils"), module.exports);

package/dist/route/routeUtils.js

@@ -1,24 +1,44 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.addParentRoute = void 0;
+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);
+
+// routeUtils.ts
+var routeUtils_exports = {};
+__export(routeUtils_exports, {
+  addParentRoute: () => addParentRoute
+});
+module.exports = __toCommonJS(routeUtils_exports);
 function addParentRoute(opts) {
-    if (opts.addToAll) {
-        for (const id of Object.keys(opts.routes)) {
-            if (opts.routes[id].parentId === undefined &&
-                (!opts.test || opts.test(opts.routes[id]))) {
-                opts.routes[id].parentId = opts.target.id;
-            }
-        }
+  if (opts.addToAll) {
+    for (const id of Object.keys(opts.routes)) {
+      if (opts.routes[id].parentId === void 0 && (!opts.test || opts.test(opts.routes[id]))) {
+        opts.routes[id].parentId = opts.target.id;
+      }
     }
-    else if (opts.id) {
-        if (!opts.test || opts.test(opts.routes[opts.id])) {
-            opts.routes[opts.id].parentId = opts.target.id;
-        }
+  } else if (opts.id) {
+    if (!opts.test || opts.test(opts.routes[opts.id])) {
+      opts.routes[opts.id].parentId = opts.target.id;
     }
-    else {
-        throw new Error(`addParentRoute failed, opts.addToAll or opts.id must be supplied.`);
-    }
-    // add new route
-    opts.routes[opts.target.id] = opts.target;
+  } else {
+    throw new Error(`addParentRoute failed, opts.addToAll or opts.id must be supplied.`);
+  }
+  opts.routes[opts.target.id] = opts.target;
 }
-exports.addParentRoute = addParentRoute;
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  addParentRoute
+});

package/dist/route/routesConfig.js

@@ -1,81 +1,128 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
+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 __objRest = (source, exclude) => {
+  var target = {};
+  for (var prop in source)
+    if (__hasOwnProp.call(source, prop) && exclude.indexOf(prop) < 0)
+      target[prop] = source[prop];
+  if (source != null && __getOwnPropSymbols)
+    for (var prop of __getOwnPropSymbols(source)) {
+      if (exclude.indexOf(prop) < 0 && __propIsEnum.call(source, prop))
+        target[prop] = source[prop];
+    }
+  return target;
+};
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
 };
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getConfigRoutes = void 0;
-const assert_1 = __importDefault(require("assert"));
+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);
+
+// routesConfig.ts
+var routesConfig_exports = {};
+__export(routesConfig_exports, {
+  getConfigRoutes: () => getConfigRoutes
+});
+module.exports = __toCommonJS(routesConfig_exports);
+var import_assert = __toESM(require("assert"));
 function getConfigRoutes(opts) {
-    const memo = { ret: {}, id: 1 };
-    transformRoutes({
-        routes: opts.routes,
-        parentId: undefined,
-        memo,
-        onResolveComponent: opts.onResolveComponent,
-    });
-    return memo.ret;
+  const memo = { ret: {}, id: 1 };
+  transformRoutes({
+    routes: opts.routes,
+    parentId: void 0,
+    memo,
+    onResolveComponent: opts.onResolveComponent
+  });
+  return memo.ret;
 }
-exports.getConfigRoutes = getConfigRoutes;
 function transformRoutes(opts) {
-    opts.routes.forEach((route) => {
-        transformRoute({
-            route,
-            parentId: opts.parentId,
-            memo: opts.memo,
-            onResolveComponent: opts.onResolveComponent,
-        });
+  opts.routes.forEach((route) => {
+    transformRoute({
+      route,
+      parentId: opts.parentId,
+      memo: opts.memo,
+      onResolveComponent: opts.onResolveComponent
     });
+  });
 }
 function transformRoute(opts) {
-    (0, assert_1.default)(!opts.route.children, 'children is not allowed in route props, use routes instead.');
-    const id = String(opts.memo.id++);
-    const { routes, component, wrappers, ...routeProps } = opts.route;
-    let absPath = opts.route.path;
-    if ((absPath === null || absPath === void 0 ? void 0 : absPath.charAt(0)) !== '/') {
-        const parentAbsPath = opts.parentId
-            ? opts.memo.ret[opts.parentId].absPath.replace(/\/+$/, '/') // to remove '/'s on the tail
-            : '/';
-        absPath = parentAbsPath + absPath;
-    }
-    opts.memo.ret[id] = {
-        ...routeProps,
-        path: opts.route.path,
-        ...(component
-            ? {
-                file: opts.onResolveComponent
-                    ? opts.onResolveComponent(component)
-                    : component,
-            }
-            : {}),
-        parentId: opts.parentId,
-        id,
-    };
-    if (absPath) {
-        opts.memo.ret[id].absPath = absPath;
-    }
-    if (wrappers === null || wrappers === void 0 ? void 0 : wrappers.length) {
-        let parentId = opts.parentId;
-        let path = opts.route.path;
-        wrappers.forEach((wrapper) => {
-            const { id } = transformRoute({
-                route: { path, component: wrapper },
-                parentId,
-                memo: opts.memo,
-                onResolveComponent: opts.onResolveComponent,
-            });
-            parentId = id;
-            path = '';
-        });
-        opts.memo.ret[id].parentId = parentId;
-        opts.memo.ret[id].path = path;
-    }
-    if (opts.route.routes) {
-        transformRoutes({
-            routes: opts.route.routes,
-            parentId: id,
-            memo: opts.memo,
-            onResolveComponent: opts.onResolveComponent,
-        });
-    }
-    return { id };
+  (0, import_assert.default)(!opts.route.children, "children is not allowed in route props, use routes instead.");
+  const id = String(opts.memo.id++);
+  const _a = opts.route, { routes, component, wrappers } = _a, routeProps = __objRest(_a, ["routes", "component", "wrappers"]);
+  let absPath = opts.route.path;
+  if ((absPath == null ? void 0 : absPath.charAt(0)) !== "/") {
+    const parentAbsPath = opts.parentId ? opts.memo.ret[opts.parentId].absPath.replace(/\/+$/, "/") : "/";
+    absPath = parentAbsPath + absPath;
+  }
+  opts.memo.ret[id] = __spreadProps(__spreadValues(__spreadProps(__spreadValues({}, routeProps), {
+    path: opts.route.path
+  }), component ? {
+    file: opts.onResolveComponent ? opts.onResolveComponent(component) : component
+  } : {}), {
+    parentId: opts.parentId,
+    id
+  });
+  if (absPath) {
+    opts.memo.ret[id].absPath = absPath;
+  }
+  if (wrappers == null ? void 0 : wrappers.length) {
+    let parentId = opts.parentId;
+    let path = opts.route.path;
+    wrappers.forEach((wrapper) => {
+      const { id: id2 } = transformRoute({
+        route: { path, component: wrapper, isWrapper: true },
+        parentId,
+        memo: opts.memo,
+        onResolveComponent: opts.onResolveComponent
+      });
+      parentId = id2;
+      path = "";
+    });
+    opts.memo.ret[id].parentId = parentId;
+    opts.memo.ret[id].path = path;
+    opts.memo.ret[id].originPath = opts.route.path;
+  }
+  if (opts.route.routes) {
+    transformRoutes({
+      routes: opts.route.routes,
+      parentId: id,
+      memo: opts.memo,
+      onResolveComponent: opts.onResolveComponent
+    });
+  }
+  return { id };
 }
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  getConfigRoutes
+});

package/dist/route/routesConvention.js

@@ -1,72 +1,99 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getConventionRoutes = void 0;
-const utils_1 = require("@umijs/utils");
-const fs_1 = require("fs");
-const path_1 = require("path");
-const defineRoutes_1 = require("./defineRoutes");
-const utils_2 = require("./utils");
-// opts.base: path of pages
+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 __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 to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// routesConvention.ts
+var routesConvention_exports = {};
+__export(routesConvention_exports, {
+  getConventionRoutes: () => getConventionRoutes
+});
+module.exports = __toCommonJS(routesConvention_exports);
+var import_utils = require("@umijs/utils");
+var import_fs = require("fs");
+var import_path = require("path");
+var import_defineRoutes = require("./defineRoutes");
+var import_utils2 = require("./utils");
 function getConventionRoutes(opts) {
-    const files = {};
-    if (!((0, fs_1.existsSync)(opts.base) && (0, fs_1.statSync)(opts.base).isDirectory())) {
-        return {};
+  const files = {};
+  if (!((0, import_fs.existsSync)(opts.base) && (0, import_fs.statSync)(opts.base).isDirectory())) {
+    return {};
+  }
+  visitFiles({
+    dir: opts.base,
+    visitor: (file) => {
+      const routeId = (0, import_utils2.createRouteId)(file);
+      if ((0, import_utils2.isRouteModuleFile)({ file: (0, import_utils.winPath)(file), exclude: opts.exclude })) {
+        files[routeId] = (0, import_utils.winPath)(file);
+      }
     }
-    visitFiles({
-        dir: opts.base,
-        visitor: (file) => {
-            const routeId = (0, utils_2.createRouteId)(file);
-            if ((0, utils_2.isRouteModuleFile)({ file: (0, utils_1.winPath)(file), exclude: opts.exclude })) {
-                files[routeId] = (0, utils_1.winPath)(file);
-            }
-        },
-    });
-    const routeIds = Object.keys(files).sort(utils_2.byLongestFirst);
-    function defineNestedRoutes(defineRoute, parentId) {
-        const childRouteIds = routeIds.filter((id) => (0, utils_2.findParentRouteId)(routeIds, id) === parentId);
-        for (let routeId of childRouteIds) {
-            let routePath = createRoutePath(parentId ? routeId.slice(parentId.length + 1) : routeId);
-            defineRoute({
-                path: routePath,
-                file: `${opts.prefix || ''}${files[routeId]}`,
-                children() {
-                    defineNestedRoutes(defineRoute, routeId);
-                },
-            });
+  });
+  const routeIds = Object.keys(files).sort(import_utils2.byLongestFirst);
+  function defineNestedRoutes(defineRoute, parentId) {
+    const childRouteIds = routeIds.filter((id) => (0, import_utils2.findParentRouteId)(routeIds, id) === parentId);
+    for (let routeId of childRouteIds) {
+      let routePath = createRoutePath(parentId ? routeId.slice(parentId.length + 1) : routeId);
+      defineRoute({
+        path: routePath,
+        file: `${opts.prefix || ""}${files[routeId]}`,
+        children() {
+          defineNestedRoutes(defineRoute, routeId);
         }
+      });
     }
-    return (0, defineRoutes_1.defineRoutes)(defineNestedRoutes);
+  }
+  return (0, import_defineRoutes.defineRoutes)(defineNestedRoutes);
 }
-exports.getConventionRoutes = getConventionRoutes;
 function visitFiles(opts) {
-    opts.baseDir = opts.baseDir || opts.dir;
-    for (let filename of (0, fs_1.readdirSync)(opts.dir)) {
-        let file = (0, path_1.resolve)(opts.dir, filename);
-        let stat = (0, fs_1.lstatSync)(file);
-        if (stat.isDirectory()) {
-            visitFiles({ ...opts, dir: file });
-        }
-        else if (stat.isFile() &&
-            ['.tsx', '.ts', '.js', '.jsx', '.md', '.mdx', '.vue'].includes((0, path_1.extname)(file))) {
-            opts.visitor((0, path_1.relative)(opts.baseDir, file));
-        }
+  opts.baseDir = opts.baseDir || opts.dir;
+  for (let filename of (0, import_fs.readdirSync)(opts.dir)) {
+    let file = (0, import_path.resolve)(opts.dir, filename);
+    let stat = (0, import_fs.lstatSync)(file);
+    if (stat.isDirectory()) {
+      visitFiles(__spreadProps(__spreadValues({}, opts), { dir: file }));
+    } else if (stat.isFile() && [".tsx", ".ts", ".js", ".jsx", ".md", ".mdx", ".vue"].includes((0, import_path.extname)(file))) {
+      opts.visitor((0, import_path.relative)(opts.baseDir, file));
     }
+  }
 }
 function createRoutePath(routeId) {
-    let path = routeId
-        // routes/$ -> routes/*
-        // routes/nested/$.tsx (with a "routes/nested.tsx" layout)
-        .replace(/^\$$/, '*')
-        // routes/docs.$ -> routes/docs/*
-        // routes/docs/$ -> routes/docs/*
-        .replace(/(\/|\.)\$$/, '/*')
-        // routes/$user -> routes/:user
-        .replace(/\$/g, ':')
-        // routes/not.nested -> routes/not/nested
-        .replace(/\./g, '/');
-    // /index/index -> /
-    path = /\b\/?index\/index$/.test(path) ? path.replace(/\/?index$/, '') : path;
-    path = /\b\/?index$/.test(path) ? path.replace(/\/?index$/, '') : path;
-    path = /\b\/?README$/.test(path) ? path.replace(/\/?README$/, '') : path;
-    return path;
+  let path = routeId.replace(/^\$$/, "*").replace(/(\/|\.)\$$/, "/*").replace(/\$/g, ":").replace(/\./g, "/");
+  path = /\b\/?index\/index$/.test(path) ? path.replace(/\/?index$/, "") : path;
+  path = /\b\/?(?<!:)index$/.test(path) ? path.replace(/\/?index$/, "") : path;
+  path = /\b\/?README$/.test(path) ? path.replace(/\/?README$/, "") : path;
+  return path;
 }
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  getConventionRoutes
+});