befly-vite 1.1.12 → 1.1.13

package/package.json

@@ -1,6 +1,7 @@
 {
     "name": "befly-vite",
-    "version": "1.1.12",
+    "version": "1.1.13",
+    "gitHead": "3a0df4a847cf3da97bb2d09455fabba62027e6c0",
     "private": false,
     "description": "Befly Vite 配置预设和插件集合",
     "keywords": [
@@ -11,22 +12,26 @@
         "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"
+    },
     "dependencies": {
         "@unocss/preset-attributify": "^66.5.10",
         "@unocss/preset-uno": "^66.5.10",
@@ -48,10 +53,5 @@
     },
     "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());
 }