新增 新增配置路由入口位置项

Author: xiazhigang

.codegen/config.json

@@ -1,4 +1,5 @@
 {
+	"routerEntry": "content",
 	"iconRoot": "./example/icons/source",
 	"iconTarget": "./example/icons",
 	"templateFile": "./.codegen/templates/icon.handlebars",

example/routes/routes.json

@@ -1,6 +1,6 @@
 {
   "tabs": {
-    "Home": "pages/tabs/Home/index"
+    "home": "pages/tabs/home/index"
   },
   "packages": {
     "pages/packages/pkgname": [
@@ -20,36 +20,36 @@
     }
   ],
   "pages": [
-    "pages/tabs/Home/index",
     "pages/content/index",
-    "pages/question/index"
+    "pages/question/index",
+    "pages/tabs/home/index"
   ],
   "source": {
     "content": "pages/content/index",
     "center": "pages/packages/pkgname/center/index",
     "user": "pages/packages/pkgname/user/index",
     "question": "pages/question/index",
-    "Home": "pages/tabs/Home/index"
+    "home": "pages/tabs/home/index"
   },
   "routeMap": {
     "content": "/pages/content/index",
     "center": "/pages/packages/pkgname/center/index",
     "user": "/pages/packages/pkgname/user/index",
     "question": "/pages/question/index",
-    "Home": "/pages/tabs/Home/index"
+    "home": "/pages/tabs/home/index"
   },
   "names": [
     "content",
     "center",
     "user",
     "question",
-    "Home"
+    "home"
   ],
   "customRoutes": {
     "/pages/content/index": "/content",
     "/pages/packages/pkgname/center/index": "/center",
     "/pages/packages/pkgname/user/index": "/user",
     "/pages/question/index": "/question",
-    "/pages/tabs/Home/index": "/-home"
+    "/pages/tabs/home/index": "/home"
   }
 }

example/routes/types.ts

@@ -1,2 +1,2 @@
-export type RoutesName = "content" | "center" | "user" | "question" | "Home"
+export type RoutesName = "content" | "center" | "user" | "question" | "home"
 

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@yocdev/tarocodegen",
-	"version": "1.1.10",
+	"version": "1.1.11",
 	"author": "[email protected]",
 	"license": "MIT",
 	"bin": {

src/config/index.ts

@@ -27,4 +27,4 @@ export const addToConfig = (configPart: any) => {
 	return { ...config, ...configPart };
 };
 
-export default config
+export default config;

src/helper/readConfig.ts

@@ -6,10 +6,11 @@ import readExtraConfig from "../util/readExtraConfig";
 const configSchema = {
 	type: "object",
 	properties: {
+		routerEntry: { type: "string" },
 		iconRoot: { type: "string" },
 		iconTarget: { type: "string" },
 		templateFile: { type: "string" },
-		prefix: {type: 'string'},
+		prefix: { type: "string" },
 		svgr: {
 			type: "object",
 			properties: {

src/routes/index.ts

@@ -4,6 +4,7 @@ import rd from "rd";
 import Ajv from "ajv";
 import chalk from "chalk";
 import config from "../config";
+import readConfig from "../helper/readConfig";
 
 const packageConfig = {
 	type: "object",
@@ -18,14 +19,17 @@ const pkgConfigValidate = ajv.compile(packageConfig);
 
 const normalRouterReg = /pages\/([a-zA-Z]+)\/index.(tsx|js|ts|jsx)$/;
 const tabRouterReg = /pages\/tabs\/([a-zA-Z]+)\/index.(tsx|js|ts|jsx)$/;
-const packageRouterReg = /pages\/packages\/([a-zA-Z]+)\/([a-zA-Z]+)\/index.(tsx|js|ts|jsx)$/;
+const packageRouterReg =
+	/pages\/packages\/([a-zA-Z]+)\/([a-zA-Z]+)\/index.(tsx|js|ts|jsx)$/;
 
 enum RouteType {
 	NORMAL = "normal",
 	TAB = "tab",
 	PACKAGE = "package",
 }
 
+const extraConfig = readConfig();
+
 export default function generateRoutes() {
 	// 获得当前执行node命令时候的文件夹目录名
 	const commandPath = process.cwd();
@@ -91,10 +95,11 @@ export default function generateRoutes() {
 				routes.source[name] = routeUsefulPath;
 				routes.routeMap[name] = `/${routeUsefulPath}`;
 				const shortLink = name.replace(/([A-Z])/g, "-$1").toLowerCase();
-				routes.customRoutes[`/${routeUsefulPath}`] =
-					`/${shortLink.startsWith('-') ? shortLink.slice(1) : shortLink}`;
+				routes.customRoutes[`/${routeUsefulPath}`] = `/${
+					shortLink.startsWith("-") ? shortLink.slice(1) : shortLink
+				}`;
 				routes.names.push(name);
-				routes.pages = moveHomeToFirst(routes.pages)
+				routes.pages = moveHomeToFirst(routes.pages, extraConfig.routerEntry);
 			}
 		}
 	});
@@ -177,17 +182,18 @@ function removeExtname(filepath: string) {
 
 // 入口页面置顶
 // @ts-ignore
-function moveHomeToFirst(pages: string[]) {
-	const pagesCopy = pages
-	const homeObject = pages.filter((it) =>
-		/home|Home/.test(it)
-	);
+function moveHomeToFirst(pages: string[], entryPage?: string) {
+	const entryPageReg = entryPage
+		? new RegExp(`/home|Home|${entryPage}/`)
+		: new RegExp(`/home|Home/`);
+	const pagesCopy = pages;
+	const homeObject = pages.filter((it) => entryPageReg.test(it));
 	if (homeObject.length > 0) {
-		const homeIndex = pages.indexOf(homeObject[0] as string)
+		const homeIndex = pages.indexOf(homeObject[0] as string);
 		if (homeIndex !== 0) {
-			pagesCopy.splice(homeIndex,1)
+			pagesCopy.splice(homeIndex, 1);
 			pagesCopy.unshift(homeObject[0] as string);
 		}
 	}
-	return pagesCopy
+	return pagesCopy;
 }