befly-vite 1.1.12 → 1.2.0

package/index.js

@@ -91,7 +91,7 @@ export function createBeflyViteConfig(options = {}) {
     const { root, scanViews, resolvers = {}, manualChunks, userConfig = {} } = options;
 
     // 计算根目录（如果未提供）
-    const projectRoot = root || process.cwd();
+    const appRoot = root || process.cwd();
 
     const baseConfig = defineConfig({
         base: "./",
@@ -112,7 +112,7 @@ export function createBeflyViteConfig(options = {}) {
 
         resolve: {
             alias: {
-                "@": fileURLToPath(new URL("src", `file:///${projectRoot.replace(/\\/g, "/")}/`))
+                "@": fileURLToPath(new URL("src", `file:///${appRoot.replace(/\\/g, "/")}/`))
             }
         },
 

package/package.json

@@ -1,6 +1,7 @@
 {
     "name": "befly-vite",
-    "version": "1.1.12",
+    "version": "1.2.0",
+    "gitHead": "faa8189c7d23cf45885c03d1425cba8f5bf45df9",
     "private": false,
     "description": "Befly Vite 配置预设和插件集合",
     "keywords": [
@@ -11,29 +12,37 @@
         "vue"
     ],
     "homepage": "https://chensuiyi.me",
-    "author": "chensuiyi <bimostyle@qq.com>",
     "license": "Apache-2.0",
-    "type": "module",
-    "main": "index.js",
-    "exports": {
-        ".": "./index.js",
-        "./utils/*": "./utils/*.js"
-    },
+    "author": "chensuiyi <bimostyle@qq.com>",
     "files": [
-        "README.md",
-        "configs/",
         "index.js",
         "package.json",
+        "README.md",
+        "configs/",
         "plugins/",
         "utils/"
     ],
+    "type": "module",
+    "main": "index.js",
+    "exports": {
+        ".": "./index.js",
+        "./utils/*": "./utils/*.js"
+    },
+    "publishConfig": {
+        "access": "public",
+        "registry": "https://registry.npmjs.org"
+    },
+    "scripts": {
+        "scanViewsDir": "bun ./bin/scanViewsDir.ts"
+    },
     "dependencies": {
-        "@unocss/preset-attributify": "^66.5.10",
-        "@unocss/preset-uno": "^66.5.10",
+        "@unocss/preset-attributify": "^66.5.11",
+        "@unocss/preset-uno": "^66.5.11",
         "@vitejs/plugin-vue": "^6.0.3",
         "@vue-macros/reactivity-transform": "^3.1.1",
-        "sass": "^1.96.0",
-        "unocss": "^66.5.10",
+        "befly-shared": "1.0.0",
+        "sass": "^1.97.1",
+        "unocss": "^66.5.11",
         "unplugin-auto-import": "^20.3.0",
         "unplugin-icons": "^22.5.0",
         "unplugin-vue-components": "^30.0.0",
@@ -43,15 +52,10 @@
         "vite-plugin-vue-devtools": "^8.0.5"
     },
     "peerDependencies": {
-        "vite": "^8.0.0-beta.3",
+        "vite": "^8.0.0-beta.5",
         "vue": "^3.5.26"
     },
     "engines": {
         "bun": ">=1.3.0"
-    },
-    "publishConfig": {
-        "access": "public",
-        "registry": "https://registry.npmjs.org"
-    },
-    "gitHead": "d42bf60ba6b8b11fef7e759fa008ada075829772"
+    }
 }

package/utils/arrayToTree.js

@@ -4,6 +4,7 @@
  * @property {string=} pidField
  * @property {string=} childrenField
  * @property {any=} rootPid
+ * @property {string=} sortField
  * @property {(node: any) => any=} mapFn
  */
 
@@ -18,29 +19,50 @@ export function arrayToTree(items, options = {}) {
     const pidField = typeof options.pidField === "string" ? options.pidField : "pid";
     const childrenField = typeof options.childrenField === "string" ? options.childrenField : "children";
     const rootPid = "rootPid" in options ? options.rootPid : 0;
+    const sortField = "sortField" in options ? (typeof options.sortField === "string" && options.sortField.length > 0 ? options.sortField : null) : "sort";
     const mapFn = typeof options.mapFn === "function" ? options.mapFn : null;
 
-    /** @type {T[]} */
-    const tree = [];
+    /**
+     * pid -> items[]
+     * @type {Map<any, T[]>}
+     */
+    const pidMap = new Map();
 
     for (const item of items) {
         // @ts-ignore
-        const pid = item[pidField];
+        const pid = item ? item[pidField] : undefined;
+        const list = pidMap.get(pid);
+        if (list) {
+            list.push(item);
+        } else {
+            pidMap.set(pid, [item]);
+        }
+    }
 
-        if (Object.is(pid, rootPid)) {
+    /**
+     * @param {any} pid
+     * @param {Set<any>} stack
+     * @returns {T[]}
+     */
+    const build = (pid, stack) => {
+        /** @type {T[]} */
+        const tree = [];
+        const list = pidMap.get(pid) || [];
+
+        for (const item of list) {
             const node = Object.assign({}, item);
             const mappedNode = mapFn ? mapFn(node) : node;
 
             // 子节点 rootPid = node[id]
             // @ts-ignore
-            const nextRootPid = mappedNode[idField];
-            const children = arrayToTree(items, {
-                idField: idField,
-                pidField: pidField,
-                childrenField: childrenField,
-                rootPid: nextRootPid,
-                mapFn: mapFn
-            });
+            const nextRootPid = mappedNode ? mappedNode[idField] : undefined;
+
+            let children = [];
+            if (!stack.has(nextRootPid)) {
+                stack.add(nextRootPid);
+                children = build(nextRootPid, stack);
+                stack.delete(nextRootPid);
+            }
 
             if (children.length > 0) {
                 // @ts-ignore
@@ -49,7 +71,30 @@ export function arrayToTree(items, options = {}) {
 
             tree.push(mappedNode);
         }
-    }
 
-    return tree;
+        if (sortField) {
+            tree.sort((a, b) => {
+                // @ts-ignore
+                const av = a ? a[sortField] : undefined;
+                // @ts-ignore
+                const bv = b ? b[sortField] : undefined;
+
+                const aMissing = av === undefined || av === null;
+                const bMissing = bv === undefined || bv === null;
+                if (aMissing && bMissing) return 0;
+                if (aMissing) return 1;
+                if (bMissing) return -1;
+
+                if (typeof av === "number" && typeof bv === "number") {
+                    return av - bv;
+                }
+
+                return String(av).localeCompare(String(bv), undefined, { numeric: true, sensitivity: "base" });
+            });
+        }
+
+        return tree;
+    };
+
+    return build(rootPid, new Set());
 }

package/utils/scanViews.js

@@ -2,29 +2,33 @@ import { existsSync, readdirSync, realpathSync } from "node:fs";
 import { join } from "node:path";
 
 /**
- * 扫描项目和所有 @befly-addon 包的 views 目录
+ * 扫描项目和所有 @befly-addon 包的视图目录
  * 用于 unplugin-vue-router 的 routesFolder 配置
+ *
+ * 约定：addon 只允许从 adminViews 扫描路由：
+ * - <addonRoot>/adminViews
+ *
  * 注意：此函数只能在 vite.config.js 中使用（Node.js 环境），不能在浏览器中使用
  * @returns {Array<{ src: string, path: string, exclude: string[] }>} 路由文件夹配置数组
  */
 export function scanViews() {
-    const projectRoot = process.cwd();
-    const addonBasePath = join(projectRoot, "node_modules", "@befly-addon");
+    const appRoot = process.cwd();
+    const addonBasePath = join(appRoot, "node_modules", "@befly-addon");
 
     /** @type {Array<{ src: string, path: string, exclude: string[] }>} */
     const routesFolders = [];
 
     // 1. 项目自身 views
-    const projectViewsPath = join(projectRoot, "src", "views");
-    if (existsSync(projectViewsPath)) {
+    const appViewsPath = join(appRoot, "src", "views");
+    if (existsSync(appViewsPath)) {
         routesFolders.push({
-            src: realpathSync(projectViewsPath),
+            src: realpathSync(appViewsPath),
             path: "",
             exclude: ["**/components/**"]
         });
     }
 
-    // 2. 扫描 @befly-addon/*/views
+    // 2. 扫描 @befly-addon/*/adminViews（仅此目录允许生成 addon 路由）
     if (!existsSync(addonBasePath)) {
         return routesFolders;
     }
@@ -38,10 +42,10 @@ export function scanViews() {
                 continue;
             }
 
-            const viewsPath = join(addonPath, "views");
-            if (existsSync(viewsPath)) {
+            const adminViewsPath = join(addonPath, "adminViews");
+            if (existsSync(adminViewsPath)) {
                 routesFolders.push({
-                    src: realpathSync(viewsPath),
+                    src: realpathSync(adminViewsPath),
                     path: `addon/${addonName}/`,
                     exclude: ["**/components/**"]
                 });