@xfe-repo/web-router 1.1.0 → 1.1.5

package/dist/index.d.mts

@@ -3,6 +3,7 @@ import { LoadableComponent, loadableReady } from '@loadable/component';
 import { ParsedQuery } from 'query-string';
 import React, { ReactElement, PropsWithChildren, ComponentType } from 'react';
 import { RegisterComponentStatic } from '@xfe-repo/web-register';
+import { LinkProps as LinkProps$1 } from 'react-router-dom';
 export * from 'react-router-dom';
 import * as react_jsx_runtime from 'react/jsx-runtime';
 
@@ -13,9 +14,12 @@ type RouteConfig = {
 };
 type GetRoutesConfig = {
     pagesIndexPath: string[];
+    getRoutePath?: (path: string) => string;
     getPageComponents: (path: string) => Promise<any>;
     fallback?: ReactElement;
 };
+declare const routerIndexRegx: RegExp;
+declare const routerDynamicRegx: RegExp;
 declare const getRoutes: (config: GetRoutesConfig) => RouteConfig[];
 
 type RouterProps = PropsWithChildren<{
@@ -26,13 +30,11 @@ type RouterProps = PropsWithChildren<{
 }>;
 declare const Router: React.MemoExoticComponent<(props: RouterProps) => react_jsx_runtime.JSX.Element>;
 
-type LinkProps = PropsWithChildren<{
+type LinkProps = Omit<LinkProps$1, 'to'> & {
     to: string;
     reLaunch?: boolean;
-    replace?: boolean;
     preload?: boolean;
-    className?: string;
-}>;
+};
 declare const Link: React.MemoExoticComponent<(props: LinkProps) => react_jsx_runtime.JSX.Element>;
 
 type NavigatorStack = {
@@ -54,4 +56,4 @@ declare function createNavigator(options: CreateNavigatorOptions): NavigatorType
 declare const getClientNavigator: () => NavigatorType;
 declare const routerReady: typeof loadableReady;
 
-export { type CreateNavigatorOptions, type GetRoutesConfig, Link, type NavigatorStack, type NavigatorType, type PageComponent, type RouteConfig, Router, createNavigator, getClientNavigator, getRoutes, routerReady };
+export { type CreateNavigatorOptions, type GetRoutesConfig, Link, type NavigatorStack, type NavigatorType, type PageComponent, type RouteConfig, Router, createNavigator, getClientNavigator, getRoutes, routerDynamicRegx, routerIndexRegx, routerReady };

package/dist/index.d.ts

@@ -3,6 +3,7 @@ import { LoadableComponent, loadableReady } from '@loadable/component';
 import { ParsedQuery } from 'query-string';
 import React, { ReactElement, PropsWithChildren, ComponentType } from 'react';
 import { RegisterComponentStatic } from '@xfe-repo/web-register';
+import { LinkProps as LinkProps$1 } from 'react-router-dom';
 export * from 'react-router-dom';
 import * as react_jsx_runtime from 'react/jsx-runtime';
 
@@ -13,9 +14,12 @@ type RouteConfig = {
 };
 type GetRoutesConfig = {
     pagesIndexPath: string[];
+    getRoutePath?: (path: string) => string;
     getPageComponents: (path: string) => Promise<any>;
     fallback?: ReactElement;
 };
+declare const routerIndexRegx: RegExp;
+declare const routerDynamicRegx: RegExp;
 declare const getRoutes: (config: GetRoutesConfig) => RouteConfig[];
 
 type RouterProps = PropsWithChildren<{
@@ -26,13 +30,11 @@ type RouterProps = PropsWithChildren<{
 }>;
 declare const Router: React.MemoExoticComponent<(props: RouterProps) => react_jsx_runtime.JSX.Element>;
 
-type LinkProps = PropsWithChildren<{
+type LinkProps = Omit<LinkProps$1, 'to'> & {
     to: string;
     reLaunch?: boolean;
-    replace?: boolean;
     preload?: boolean;
-    className?: string;
-}>;
+};
 declare const Link: React.MemoExoticComponent<(props: LinkProps) => react_jsx_runtime.JSX.Element>;
 
 type NavigatorStack = {
@@ -54,4 +56,4 @@ declare function createNavigator(options: CreateNavigatorOptions): NavigatorType
 declare const getClientNavigator: () => NavigatorType;
 declare const routerReady: typeof loadableReady;
 
-export { type CreateNavigatorOptions, type GetRoutesConfig, Link, type NavigatorStack, type NavigatorType, type PageComponent, type RouteConfig, Router, createNavigator, getClientNavigator, getRoutes, routerReady };
+export { type CreateNavigatorOptions, type GetRoutesConfig, Link, type NavigatorStack, type NavigatorType, type PageComponent, type RouteConfig, Router, createNavigator, getClientNavigator, getRoutes, routerDynamicRegx, routerIndexRegx, routerReady };

package/dist/index.js

@@ -276,6 +276,12 @@ __export(src_exports, {
     getRoutes: function() {
         return getRoutes;
     },
+    routerDynamicRegx: function() {
+        return routerDynamicRegx;
+    },
+    routerIndexRegx: function() {
+        return routerIndexRegx;
+    },
     routerReady: function() {
         return routerReady;
     }
@@ -285,29 +291,34 @@ var import_history = require("history");
 var import_component2 = require("@loadable/component");
 var import_react_router_dom3 = require("react-router-dom");
 var import_query_string = __toESM(require("query-string"));
+var import_env = require("@xfe-repo/web-utils/env");
 __reExport(src_exports, require("react-router-dom"), module.exports);
 // src/routes.ts
 var import_component = __toESM(require("@loadable/component"));
+var routerIndexRegx = /^(?!.*component)(.*)?\/index(\[[^.]+])?\.(ts|js)x?$/;
+var routerDynamicRegx = /\[([^.]+)]/;
 var getRoutes = function(config) {
-    var pagesIndexPath = config.pagesIndexPath, getPageComponents = config.getPageComponents, fallback = config.fallback;
+    var pagesIndexPath = config.pagesIndexPath, getRoutePath = config.getRoutePath, getPageComponents = config.getPageComponents, fallback = config.fallback;
     var routes = [];
     pagesIndexPath.forEach(function(pageIndexPath) {
+        var _pageIndexPath_match;
         if (pageIndexPath.startsWith("./")) return;
-        var regExpResult = pageIndexPath.match(RegExp("(?<=pages\\/).*(?=\\/index.(?:tsx|js))"));
-        var pageRelativePath = regExpResult ? regExpResult[0].toLowerCase() : "";
         var pageComponent = (0, import_component.default)(function() {
-            return getPageComponents(pageRelativePath);
+            return getPageComponents(pageIndexPath);
         }, {
             fallback: fallback
         });
-        var routerPath = "/".concat(pageRelativePath);
-        if (routerPath === "/home" || routerPath === "/index") routerPath = "/";
+        var routerPath = getRoutePath ? getRoutePath(pageIndexPath) : pageIndexPath.replace(routerIndexRegx, "$1");
+        if (routerPath === "home" || routerPath === "index") routerPath = "/";
+        var dynamicRoute = ((_pageIndexPath_match = pageIndexPath.match(routerDynamicRegx)) === null || _pageIndexPath_match === void 0 ? void 0 : _pageIndexPath_match[1]) || "";
+        if (dynamicRoute) routerPath = "".concat(routerPath, "/").concat(dynamicRoute);
         var config2 = {
             path: routerPath,
             Component: pageComponent
         };
         routes.push(config2);
     });
+    console.log("routes", routes);
     return routes;
 };
 // src/Router.tsx
@@ -454,7 +465,7 @@ function createNavigator(options) {
         } else if (action === "POP") {
             stack.pop();
         }
-        console.log("router", action, pathname, stack);
+        if (!import_env.isProduction) console.log("router", action, pathname, stack);
     });
     _navigator.reLaunch = function(path, state) {
         var _stack_;
@@ -541,5 +552,7 @@ var routerReady = import_component2.loadableReady;
     createNavigator: createNavigator,
     getClientNavigator: getClientNavigator,
     getRoutes: getRoutes,
+    routerDynamicRegx: routerDynamicRegx,
+    routerIndexRegx: routerIndexRegx,
     routerReady: routerReady
 }, require("react-router-dom")));

package/dist/index.mjs

@@ -201,29 +201,34 @@ import { createHashHistory, createBrowserHistory, createMemoryHistory } from "hi
 import { loadableReady } from "@loadable/component";
 import { matchRoutes } from "react-router-dom";
 import queryString from "query-string";
+import { isProduction } from "@xfe-repo/web-utils/env";
 export * from "react-router-dom";
 // src/routes.ts
 import loadable from "@loadable/component";
+var routerIndexRegx = /^(?!.*component)(.*)?\/index(\[[^.]+])?\.(ts|js)x?$/;
+var routerDynamicRegx = /\[([^.]+)]/;
 var getRoutes = function(config) {
-    var pagesIndexPath = config.pagesIndexPath, getPageComponents = config.getPageComponents, fallback = config.fallback;
+    var pagesIndexPath = config.pagesIndexPath, getRoutePath = config.getRoutePath, getPageComponents = config.getPageComponents, fallback = config.fallback;
     var routes = [];
     pagesIndexPath.forEach(function(pageIndexPath) {
+        var _pageIndexPath_match;
         if (pageIndexPath.startsWith("./")) return;
-        var regExpResult = pageIndexPath.match(RegExp("(?<=pages\\/).*(?=\\/index.(?:tsx|js))"));
-        var pageRelativePath = regExpResult ? regExpResult[0].toLowerCase() : "";
         var pageComponent = loadable(function() {
-            return getPageComponents(pageRelativePath);
+            return getPageComponents(pageIndexPath);
         }, {
             fallback: fallback
         });
-        var routerPath = "/".concat(pageRelativePath);
-        if (routerPath === "/home" || routerPath === "/index") routerPath = "/";
+        var routerPath = getRoutePath ? getRoutePath(pageIndexPath) : pageIndexPath.replace(routerIndexRegx, "$1");
+        if (routerPath === "home" || routerPath === "index") routerPath = "/";
+        var dynamicRoute = ((_pageIndexPath_match = pageIndexPath.match(routerDynamicRegx)) === null || _pageIndexPath_match === void 0 ? void 0 : _pageIndexPath_match[1]) || "";
+        if (dynamicRoute) routerPath = "".concat(routerPath, "/").concat(dynamicRoute);
         var config2 = {
             path: routerPath,
             Component: pageComponent
         };
         routes.push(config2);
     });
+    console.log("routes", routes);
     return routes;
 };
 // src/Router.tsx
@@ -370,7 +375,7 @@ function createNavigator(options) {
         } else if (action === "POP") {
             stack.pop();
         }
-        console.log("router", action, pathname, stack);
+        if (!isProduction) console.log("router", action, pathname, stack);
     });
     _navigator.reLaunch = function(path, state) {
         var _stack_;
@@ -450,4 +455,4 @@ var getClientNavigator = function() {
     return _navigator;
 };
 var routerReady = loadableReady;
-export { Link, Router, createNavigator, getClientNavigator, getRoutes, routerReady };
+export { Link, Router, createNavigator, getClientNavigator, getRoutes, routerDynamicRegx, routerIndexRegx, routerReady };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xfe-repo/web-router",
-  "version": "1.1.0",
+  "version": "1.1.5",
   "sideEffects": false,
   "module": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -23,15 +23,16 @@
     "@loadable/component": "^5.16.4",
     "history": "^5.3.0",
     "query-string": "^7.1.3",
-    "react-router-dom": "^6.26.2"
+    "react-router-dom": "^6.26.2",
+    "@xfe-repo/web-utils": "1.1.3"
   },
   "devDependencies": {
     "@types/loadable__component": "^5.13.9",
     "@types/node": "^20.16.5",
     "@types/react": "^18",
-    "@xfe-repo/eslint-config": "0.0.2",
-    "@xfe-repo/typescript-config": "0.0.3",
-    "@xfe-repo/web-register": "1.1.0"
+    "@xfe-repo/eslint-config": "0.0.4",
+    "@xfe-repo/typescript-config": "0.0.6",
+    "@xfe-repo/web-register": "1.1.3"
   },
   "scripts": {
     "build": "tsup",