Skip to content

Commit 841189d

Browse files
author
Training
committed
更新结构
1 parent 7529e72 commit 841189d

File tree

7 files changed

+148
-139
lines changed

7 files changed

+148
-139
lines changed

‎bin/config.json‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1 @@
1-
{
2-
"version": 2,
3-
"excludeDir": null,
4-
"excludeReg": "((component(s)?)|(utils)|(route(r)?))",
5-
"excludePath": null,
6-
"pagePath": "pages",
7-
"type": "simple"
8-
}
1+
{"version":2,"excludeDir":null,"excludeReg":"((component(s)?)|(utils)|(route(r)?))","excludePath":null,"pagePath":"views","type":"simple"}

‎bin/index.js‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,12 @@
11
#!/usr/bin/env node
2-
import * as v3 from "../v3.js"
3-
import * as v2 from "../v2.js"
42
import {program} from "commander"
5-
import fs from "fs"
63
import path from "path"
7-
import config from "./config.json" assert {type:'json'}
84
import {fileURLToPath} from 'url';
9-
import {watchPages} from "../v2.js";
10-
import {setConfig} from "../index.js";
5+
import {getConfig, setConfig} from "../comm.js";
116

127
const __filename = fileURLToPath(import.meta.url); // 当前文件路径
138
const __dirname = path.dirname(__filename); // 当前文件所处的文件夹路径
14-
9+
let config = getConfig();
1510
let v = config.version;
1611

1712
program.command("set")
@@ -29,21 +24,26 @@ program.command("set")
2924
if (excludeDir){
3025
params.excludeDir = excludeDir.split(";");
3126
}
32-
config = setConfig(params);
27+
config = setConfig(params);
3328
})
3429

3530
program.command("render")
3631
.description("手动编译所有路由")
3732
.action(async (params,options)=>{
33+
let model;
3834
switch (v){
3935
case 2:
40-
v2.renderAll();
36+
model = await import("../v2.js");
4137
break
4238
case 3:
43-
v3.renderAll();
39+
model = await import("../v3.js");
4440
break;
41+
default:
42+
console.log("版本设置错误！");
43+
return;
4544

4645
}
46+
model.renderAll();
4747
// console.log(options);
4848
})
4949
program.command("watch")

‎comm.js‎

Lines changed: 118 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,118 @@
1+
// 获取路径信息
2+
import {fileURLToPath} from "url";
3+
import path from "path";
4+
import fs from "fs";
5+
const srcInfo = getSrcInfo();
6+
const __filename=srcInfo.filename;
7+
const __dirname=srcInfo.dirname;
8+
9+
/**
10+
* 设置配置
11+
* @param options
12+
*/
13+
export function setConfig(options){
14+
let config = getConfig();
15+
if (options.version){
16+
options.version = Number(options.version)
17+
}
18+
config = Object.assign(config,options);
19+
if(options.excludeReg){
20+
config.excludeDir = null;
21+
}else if(options.excludeDir){
22+
config.excludeReg = null;
23+
}
24+
// console.log(config);
25+
fs.writeFileSync(path.join(__dirname,"bin/config.json"),JSON.stringify(config),{encoding:'utf-8'});
26+
return config;
27+
}
28+
29+
/**
30+
* 获取配置
31+
* @return {any}
32+
*/
33+
export function getConfig() {
34+
return getJsonFile(path.join(__dirname,"bin/config.json"));
35+
}
36+
37+
/**
38+
* 从Json文件中获取JSON数据
39+
* @param dir 路径
40+
* @return {JSON}
41+
*/
42+
export function getJsonFile(dir) {
43+
try {
44+
let res = fs.readFileSync(dir,{encoding:'utf-8'});
45+
return JSON.parse(res);
46+
}catch (e){
47+
return null;
48+
}
49+
}
50+
/**
51+
* 获取基础路径信息
52+
* @return {{filename: string, dir: string, dirname: string}}
53+
*/
54+
export function getSrcInfo(){
55+
let __filename = fileURLToPath(import.meta.url);
56+
return {
57+
filename: __filename, // 当前文件路径
58+
dirname: path.dirname(__filename), // 当前文件所处的文件夹路径
59+
dir: path.resolve() // 执行命令时的路径
60+
}
61+
}
62+
63+
64+
/**
65+
* @desc 生成GUID
66+
* @param format 格式
67+
* @return {string}
68+
*/
69+
export function GUID(format = "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx") {
70+
let char = ['A', 'B', 'C', 'D', 'E', 'F', 1, 2, 3, 4, 5, 6, 7, 8, 9, 0];
71+
let len = 0;
72+
for (let i in format)
73+
if (format[i] === 'x') len += 1;
74+
let random = () => {
75+
let i = parseInt(Math.random() * 15);
76+
77+
return char[i];
78+
};
79+
return format.replace(/x/g, res => random())
80+
}
81+
82+
const config = getConfig();
83+
/**
84+
* 遍历文件夹
85+
* @param dir 文件夹路径
86+
* @param callback 回调 ， 包含三个参数 status:(-1 ,错误 ， 0 文件夹 ， 1 文件 2.遍历完成) ， info(-1 ，错误信息 ， 0,1 文件 ， 2 完成信息） ， fullPath：当状态为0,1时有此参数 , result 上一级递归的回调值(当状态为0,1时有此参数)
87+
* @param result 回调结果
88+
*/
89+
export function traverseFolder(dir,callback,result) {
90+
fs.readdir(dir, { withFileTypes: true },(err,dirs)=>{
91+
if (err) return callback(-1,err);
92+
dirs.forEach(dirent => {
93+
const fullPath = path.join(dir, dirent.name);
94+
95+
if (dirent.isDirectory()) {
96+
if (config.excludePath && config.excludePath.filter(e => fullPath.includes(path.join(e))).length){
97+
return callback(2,"Traversal complete. The src <" + fullPath + ">was excluded.")
98+
}
99+
if (config.excludeReg && (new RegExp(config.excludeReg)).test(dirent.name)){
100+
return callback(2,"Traversal complete. The src <" + fullPath + ">was excluded.")
101+
}else if(config.excludeDir && config.excludeDir.includes(dirent.name)){
102+
return callback(2,"Traversal complete. The src <" + fullPath + ">was excluded.")
103+
}
104+
let res = callback(0,dirent,fullPath,result)
105+
traverseFolder(fullPath, callback,res);
106+
107+
} else {
108+
let extname = path.extname(fullPath);
109+
if (extname === ".vue")
110+
return callback(1,dirent,fullPath,result)
111+
else return callback(2,"Traversal complete. The src <" + fullPath + ">is not a vue file.")
112+
}
113+
});
114+
// 可以在此处添加一个回调来通知整个目录遍历完成
115+
callback(2, 'Traversal complete');
116+
});
117+
}
118+

‎index.js‎

Lines changed: 4 additions & 113 deletions
Original file line numberDiff line numberDiff line change
@@ -1,121 +1,12 @@
1-
// 获取路径信息
2-
import {fileURLToPath} from "url";
3-
import path from "path";
4-
import fs from "fs";
5-
import * as v3 from "./v3.js";
6-
import * as v2 from "./v2.js";
7-
const srcInfo = getSrcInfo();
8-
const __filename=srcInfo.filename;
9-
const __dirname=srcInfo.dirname;
10-
11-
/**
12-
* 设置配置
13-
* @param options
14-
*/
15-
export function setConfig(options){
16-
let config = getConfig();
17-
options.version = Number(options.version);
18-
config = Object.assign(config,options);
19-
if(options.excludeReg){
20-
config.excludeDir = null;
21-
}else if(options.excludeDir){
22-
config.excludeReg = null;
23-
}
24-
fs.writeFileSync(path.join(__dirname,"bin/config.json"),JSON.stringify(config),{encoding:'utf-8'});
25-
return config;
26-
}
271

28-
/**
29-
* 获取配置
30-
* @return {JSON}
31-
*/
32-
export function getConfig() {
33-
return getJsonFile(path.join(__dirname,"bin/config.json"));
34-
}
352

36-
/**
37-
* 从Json文件中获取JSON数据
38-
* @param dir 路径
39-
* @return {JSON}
40-
*/
41-
export function getJsonFile(dir) {
42-
try {
43-
let res = fs.readFileSync(dir,{encoding:'utf-8'});
44-
return JSON.parse(res);
45-
}catch (e){
46-
return null;
47-
}
48-
}
49-
/**
50-
* 获取基础路径信息
51-
* @return {{filename: string, dir: string, dirname: string}}
52-
*/
53-
export function getSrcInfo(){
54-
let __filename = fileURLToPath(import.meta.url);
55-
return {
56-
filename: __filename, // 当前文件路径
57-
dirname: path.dirname(__filename), // 当前文件所处的文件夹路径
58-
dir: path.resolve() // 执行命令时的路径
59-
}
60-
}
613

624

63-
/**
64-
* @desc 生成GUID
65-
* @param format 格式
66-
* @return {string}
67-
*/
68-
export function GUID(format = "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx") {
69-
let char = ['A', 'B', 'C', 'D', 'E', 'F', 1, 2, 3, 4, 5, 6, 7, 8, 9, 0];
70-
let len = 0;
71-
for (let i in format)
72-
if (format[i] === 'x') len += 1;
73-
let random = () => {
74-
let i = parseInt(Math.random() * 15);
75-
76-
return char[i];
77-
};
78-
return format.replace(/x/g, res => random())
79-
}
80-
81-
const config = getConfig();
82-
/**
83-
* 遍历文件夹
84-
* @param dir 文件夹路径
85-
* @param callback 回调 ， 包含三个参数 status:(-1 ,错误 ， 0 文件夹 ， 1 文件 2.遍历完成) ， info(-1 ，错误信息 ， 0,1 文件 ， 2 完成信息） ， fullPath：当状态为0,1时有此参数 , result 上一级递归的回调值(当状态为0,1时有此参数)
86-
* @param result 回调结果
87-
*/
88-
export function traverseFolder(dir,callback,result) {
89-
fs.readdir(dir, { withFileTypes: true },(err,dirs)=>{
90-
if (err) return callback(-1,err);
91-
dirs.forEach(dirent => {
92-
const fullPath = path.join(dir, dirent.name);
93-
94-
if (dirent.isDirectory()) {
95-
if (config.excludePath && config.excludePath.filter(e => fullPath.includes(path.join(e))).length){
96-
return callback(2,"Traversal complete. The src <" + fullPath + ">was excluded.")
97-
}
98-
if (config.excludeReg && (new RegExp(config.excludeReg)).test(dirent.name)){
99-
return callback(2,"Traversal complete. The src <" + fullPath + ">was excluded.")
100-
}else if(config.excludeDir && config.excludeDir.includes(dirent.name)){
101-
return callback(2,"Traversal complete. The src <" + fullPath + ">was excluded.")
102-
}
103-
let res = callback(0,dirent,fullPath,result)
104-
traverseFolder(fullPath, callback,res);
105-
106-
} else {
107-
let extname = path.extname(fullPath);
108-
if (extname === ".vue")
109-
return callback(1,dirent,fullPath,result)
110-
else return callback(2,"Traversal complete. The src <" + fullPath + ">is not a vue file.")
111-
}
112-
});
113-
// 可以在此处添加一个回调来通知整个目录遍历完成
114-
callback(2, 'Traversal complete');
115-
});
116-
}
117-
1185
// vite插件
6+
import * as v3 from "./v3.js";
7+
import * as v2 from "./v2.js";
8+
import {getConfig, setConfig} from "./comm.js";
9+
11910
export function vitePluginVueAutoRouter(options){
12011
let config,command;
12112
let model = v3;

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "auto-router-vue3",
3-
"version": "1.2.1",
3+
"version": "1.2.2",
44
"description": "生成router, 基于vue",
55
"main": "index.js",
66
"type": "module",

‎v2.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import {compileScript, parse} from "vue/compiler-sfc"
22
import path from "path"
33
import fs from "fs"
44
import watch from "watch"
5-
import {getConfig, getJsonFile, getSrcInfo, GUID, setConfig, traverseFolder} from "./index.js";
5+
import {getConfig, getJsonFile, getSrcInfo, GUID, setConfig, traverseFolder} from "./comm.js";
66
import clipboardy from 'clipboardy';
77
import {analysisVue} from "./v3.js";
88

@@ -99,7 +99,7 @@ function analysisRouteConfig(callback){
9999
// 当路由配置为被排除 ， 则不执行后续操作
100100
if (route.exclude)return result;
101101
let rePath = fullPath.replace(dir,path.join("/",config.pagePath)).replaceAll("\\","/"); // 相对路径
102-
let routePath = rePath.replace("/pages","").replace(".vue",""); // 路由路径
102+
let routePath = rePath.replace("/views","").replace(".vue",""); // 路由路径
103103

104104
let p = isAbsolute(route.path)?route.path:path.posix.join(result.path,route.path);
105105
let child = {

‎v3.js‎

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,21 @@
22
import path from "path"
33
import fs from "fs"
44
import watch from "watch"
5-
import {getSrcInfo,GUID} from "./index.js";
5+
import {getConfig, getSrcInfo, GUID} from "./comm.js";
66

7+
const _config = getConfig();
78
const dirInfo = getSrcInfo();
89
const __filename = dirInfo.filename; // 当前文件路径
910
const __dirname = dirInfo.dirname; // 当前文件所处的文件夹路径
1011
const __dir = dirInfo.dir; // 执行命令时的路径
11-
const pages = path.join(__dir, "/src/pages");
12-
const files = fs.readdirSync(pages);
12+
const pages = path.join(__dir, "/src",_config.pagePath);
13+
let files;
14+
try {
15+
files = fs.readdirSync(pages);
16+
}catch (e){
17+
throw new Error("未找到pages文件夹 ， 请确认是否配置正确。 尝试使用auto-router set -p <path> 重新设置页面目录！")
18+
}
19+
1320
const routeDir = path.join(__dir,"src/router");
1421
const ignoreDirs = /(components|utils)/;
1522

@@ -115,8 +122,8 @@ export function analysisVue(filepath) {
115122
function analysisRouteConfig(filepath){
116123
if (!filepath)return;
117124
let config = analysisVue(filepath);
118-
let rePath = filepath.replace(pages,"/pages").replaceAll("\\","/"); // 相对路径
119-
let routePath = rePath.replace("/pages","").replace(".vue",""); // 路由路径
125+
let rePath = filepath.replace(pages,"/views").replaceAll("\\","/"); // 相对路径
126+
let routePath = rePath.replace("/views","").replace(".vue",""); // 路由路径
120127
let routePathArr = routePath.split("/"); // 相对路径转数组
121128
let res = {};
122129
// 没有配置config的情况 or 没有配置route

0 commit comments

Comments
 (0)