@uni-helper/vite-plugin-uni-pages 0.3.18 → 0.3.20

package/dist/index.cjs

@@ -15,10 +15,10 @@ const commentJson = require('comment-json');
 const Debug = require('debug');
 const detectIndent = require('detect-indent');
 const detectNewline = require('detect-newline');
-const lockfile = require('proper-lockfile');
 const unconfig = require('unconfig');
 const promises = require('node:fs/promises');
 const fg = require('fast-glob');
+const lockfile = require('proper-lockfile');
 const node_module = require('node:module');
 const vm = require('node:vm');
 const babelGenerator = require('@babel/generator');
@@ -51,8 +51,8 @@ const fs__default = /*#__PURE__*/_interopDefaultCompat(fs);
 const Debug__default = /*#__PURE__*/_interopDefaultCompat(Debug);
 const detectIndent__default = /*#__PURE__*/_interopDefaultCompat(detectIndent);
 const detectNewline__default = /*#__PURE__*/_interopDefaultCompat(detectNewline);
-const lockfile__default = /*#__PURE__*/_interopDefaultCompat(lockfile);
 const fg__default = /*#__PURE__*/_interopDefaultCompat(fg);
+const lockfile__default = /*#__PURE__*/_interopDefaultCompat(lockfile);
 const vm__default = /*#__PURE__*/_interopDefaultCompat(vm);
 const babelGenerator__default = /*#__PURE__*/_interopDefaultCompat(babelGenerator);
 const groupBy__default = /*#__PURE__*/_interopDefaultCompat(groupBy);
@@ -777,8 +777,11 @@ class PageContext {
     const generatedPageMetaData = await Promise.all(jobs);
     const customPageMetaData = overrides || [];
     const result = customPageMetaData.length ? mergePageMetaDataArray(generatedPageMetaData.concat(customPageMetaData)) : generatedPageMetaData;
-    const parseMeta = result.filter(
-      (page, index, self) => self.findLastIndex((item) => page.path === item.path) === index
+    const parseMeta = Array.from(
+      result.reduce((map, page) => {
+        map.set(page.path, page);
+        return map;
+      }, /* @__PURE__ */ new Map()).values()
     );
     return type === "main" ? this.setHomePage(parseMeta) : parseMeta;
   }
@@ -932,35 +935,13 @@ class PageContext {
     debug.declaration("generating");
     return writeDeclaration(this, this.options.dts);
   }
-  async writePagesJSONFile(pagesJson, retry = 3) {
-    if (retry <= 0) {
-      debug.error(`${this.resolvedPagesJSONPath} \u83B7\u53D6\u6587\u4EF6\u9501\u5931\u8D25\uFF0C\u5199\u5165\u5931\u8D25`);
-      return;
-    }
-    let relase;
-    try {
-      try {
-        relase = await lockfile__default.lock(this.resolvedPagesJSONPath, { realpath: false });
-      } catch {
-        return this.writePagesJSONFile(pagesJson, retry - 1);
-      }
-      await fs__default.promises.writeFile(this.resolvedPagesJSONPath, pagesJson, { encoding: "utf-8" });
-    } finally {
-      if (relase) {
-        await relase();
-      }
-    }
-  }
   async genratePagesJSON() {
     const content = await fs__default.promises.readFile(this.resolvedPagesJSONPath, { encoding: "utf-8" }).catch(() => "");
-    let pageJson = commentJson.parse(content || "{}");
-    const { pages: _, subPackages: __, tabBar: ___, ...others } = this.pagesGlobConfig || {};
-    pageJson = Object.assign(pageJson, {
-      ...others
-    });
+    const { pages: oldPages, subPackages: oldSubPackages, tabBar: oldTabBar } = commentJson.parse(content || "{}");
+    const { pages: _, subPackages: __, tabBar: ___, ...pageJson } = this.pagesGlobConfig || {};
     const currentPlatform = uniEnv.platform.toUpperCase();
-    pageJson.pages = mergePlatformItems(pageJson?.pages, currentPlatform, this.pageMetaData, "path");
-    pageJson.subPackages = pageJson?.subPackages || new commentJson.CommentArray();
+    pageJson.pages = mergePlatformItems(oldPages, currentPlatform, this.pageMetaData, "path");
+    pageJson.subPackages = oldSubPackages || new commentJson.CommentArray();
     const newSubPackages = /* @__PURE__ */ new Map();
     for (const item of this.subPageMetaData) {
       newSubPackages.set(item.root, item);
@@ -978,15 +959,17 @@ class PageContext {
         pages: mergePlatformItems(void 0, currentPlatform, newSub.pages, "path")
       });
     }
-    const tabBar = await this.getTabBarMerged();
-    if (tabBar) {
-      const list = mergePlatformItems(pageJson?.tabBar?.list, currentPlatform, tabBar.list, "pagePath");
-      if (pageJson?.tabBar?.list) {
-        pageJson.tabBar.list = list;
-      } else {
-        pageJson.tabBar = pageJson.tabBar || {};
-        pageJson.tabBar.list = list;
-      }
+    const { list, ...tabBarOthers } = await this.getTabBarMerged() || {};
+    if (list) {
+      const { list: oldList } = oldTabBar || {};
+      const newList = mergePlatformItems(oldList, currentPlatform, list, "pagePath");
+      pageJson.tabBar = {
+        ...tabBarOthers,
+        // 每次都直接更新除 list 外的其他属性
+        list: newList
+      };
+    } else {
+      pageJson.tabBar = void 0;
     }
     return pageJson;
   }
@@ -1056,7 +1039,7 @@ function mergePlatformItems(source, currentPlatform, items, uniqueKeyName) {
       continue;
     }
     const existing = tmpMap.get(uniqueKey) || [];
-    existing.push({ item, platforms, platformStr: platforms.join(" || ") });
+    existing.push({ item, itemStr: JSON.stringify(item), platforms, platformStr: platforms.join(" || ") });
     tmpMap.set(uniqueKey, existing);
   }
   for (const item of items) {
@@ -1068,6 +1051,7 @@ function mergePlatformItems(source, currentPlatform, items, uniqueKeyName) {
     if (!tmpMap.has(uniqueKey)) {
       tmpMap.set(uniqueKey, [{
         item: newItem,
+        itemStr: JSON.stringify(newItem),
         platforms: [currentPlatform],
         platformStr: currentPlatform
       }]);
@@ -1075,13 +1059,14 @@ function mergePlatformItems(source, currentPlatform, items, uniqueKeyName) {
     }
     const existing = tmpMap.get(uniqueKey);
     const newItemStr = JSON.stringify(newItem);
-    const equalObj = existing.find((val) => JSON.stringify(val.item) === newItemStr);
+    const equalObj = existing.find((val) => val.itemStr === newItemStr);
     if (equalObj) {
       equalObj.platforms.push(currentPlatform);
       equalObj.platformStr = equalObj.platforms.join(" || ");
     } else {
       existing.push({
         item: newItem,
+        itemStr: newItemStr,
         platforms: [currentPlatform],
         platformStr: currentPlatform
       });

package/dist/index.d.cts

@@ -2995,7 +2995,6 @@ declare class PageContext {
     resolveRoutes(): string;
     resolveSubRoutes(): string;
     generateDeclaration(): Promise<void> | undefined;
-    private writePagesJSONFile;
     private genratePagesJSON;
     private readInfoFromPagesJSON;
     private getIndent;
@@ -3153,6 +3152,9 @@ interface PageMetaDatum {
     needLogin?: boolean;
     [x: string]: any;
 }
+type ExcludeIndexSignature<T> = {
+    [K in keyof T as string extends K ? never : number extends K ? never : K]: T[K];
+};
 interface SubPageMetaDatum {
     root: string;
     pages: PageMetaDatum[];
@@ -3215,4 +3217,4 @@ declare function resolvePageDirs(dir: string, root: string, exclude: string[]):
 declare function VitePluginUniPages(userOptions?: UserOptions): Plugin;
 
 export { FILE_EXTENSIONS, MODULE_ID_VIRTUAL, OUTPUT_NAME, Page, PageContext, RESOLVED_MODULE_ID_VIRTUAL, VitePluginUniPages, babelGenerate, checkPagesJsonFileSync, debug, VitePluginUniPages as default, definePage, defineUniPages, extsToGlob, findImports, findMacro, getPageFiles, getRouteBlock, getRouteSfcBlock, invalidatePagesModule, isTargetFile, mergePageMetaDataArray, parseCode, parseCustomBlock, parseSFC, resolveOptions, resolvePageDirs, sleep, tryPageMetaFromCustomBlock, tryPageMetaFromMacro, writeFileWithLock };
-export type { Condition, ConditionItem, ConfigSource, CustomBlock, DefinePage, EasyCom, GlobalStyle, MaybeCallable, MaybePromise, MaybePromiseCallable, Options, PageMetaDatum, PagePath, PagesConfig, ResolvedOptions, RouteBlockLang, SubPackage, SubPackages, SubPageMetaDatum, TabBar, TabBarIconFont, TabBarItem, TabBarMidButton, TheWindow, UniIdRouter, UserOptions, UserPageMeta, UserPagesConfig, UserTabBarItem, debugType };
+export type { Condition, ConditionItem, ConfigSource, CustomBlock, DefinePage, EasyCom, ExcludeIndexSignature, GlobalStyle, MaybeCallable, MaybePromise, MaybePromiseCallable, Options, PageMetaDatum, PagePath, PagesConfig, ResolvedOptions, RouteBlockLang, SubPackage, SubPackages, SubPageMetaDatum, TabBar, TabBarIconFont, TabBarItem, TabBarMidButton, TheWindow, UniIdRouter, UserOptions, UserPageMeta, UserPagesConfig, UserTabBarItem, debugType };

package/dist/index.d.mts

@@ -2995,7 +2995,6 @@ declare class PageContext {
     resolveRoutes(): string;
     resolveSubRoutes(): string;
     generateDeclaration(): Promise<void> | undefined;
-    private writePagesJSONFile;
     private genratePagesJSON;
     private readInfoFromPagesJSON;
     private getIndent;
@@ -3153,6 +3152,9 @@ interface PageMetaDatum {
     needLogin?: boolean;
     [x: string]: any;
 }
+type ExcludeIndexSignature<T> = {
+    [K in keyof T as string extends K ? never : number extends K ? never : K]: T[K];
+};
 interface SubPageMetaDatum {
     root: string;
     pages: PageMetaDatum[];
@@ -3215,4 +3217,4 @@ declare function resolvePageDirs(dir: string, root: string, exclude: string[]):
 declare function VitePluginUniPages(userOptions?: UserOptions): Plugin;
 
 export { FILE_EXTENSIONS, MODULE_ID_VIRTUAL, OUTPUT_NAME, Page, PageContext, RESOLVED_MODULE_ID_VIRTUAL, VitePluginUniPages, babelGenerate, checkPagesJsonFileSync, debug, VitePluginUniPages as default, definePage, defineUniPages, extsToGlob, findImports, findMacro, getPageFiles, getRouteBlock, getRouteSfcBlock, invalidatePagesModule, isTargetFile, mergePageMetaDataArray, parseCode, parseCustomBlock, parseSFC, resolveOptions, resolvePageDirs, sleep, tryPageMetaFromCustomBlock, tryPageMetaFromMacro, writeFileWithLock };
-export type { Condition, ConditionItem, ConfigSource, CustomBlock, DefinePage, EasyCom, GlobalStyle, MaybeCallable, MaybePromise, MaybePromiseCallable, Options, PageMetaDatum, PagePath, PagesConfig, ResolvedOptions, RouteBlockLang, SubPackage, SubPackages, SubPageMetaDatum, TabBar, TabBarIconFont, TabBarItem, TabBarMidButton, TheWindow, UniIdRouter, UserOptions, UserPageMeta, UserPagesConfig, UserTabBarItem, debugType };
+export type { Condition, ConditionItem, ConfigSource, CustomBlock, DefinePage, EasyCom, ExcludeIndexSignature, GlobalStyle, MaybeCallable, MaybePromise, MaybePromiseCallable, Options, PageMetaDatum, PagePath, PagesConfig, ResolvedOptions, RouteBlockLang, SubPackage, SubPackages, SubPageMetaDatum, TabBar, TabBarIconFont, TabBarItem, TabBarMidButton, TheWindow, UniIdRouter, UserOptions, UserPageMeta, UserPagesConfig, UserTabBarItem, debugType };

package/dist/index.d.ts

@@ -2995,7 +2995,6 @@ declare class PageContext {
     resolveRoutes(): string;
     resolveSubRoutes(): string;
     generateDeclaration(): Promise<void> | undefined;
-    private writePagesJSONFile;
     private genratePagesJSON;
     private readInfoFromPagesJSON;
     private getIndent;
@@ -3153,6 +3152,9 @@ interface PageMetaDatum {
     needLogin?: boolean;
     [x: string]: any;
 }
+type ExcludeIndexSignature<T> = {
+    [K in keyof T as string extends K ? never : number extends K ? never : K]: T[K];
+};
 interface SubPageMetaDatum {
     root: string;
     pages: PageMetaDatum[];
@@ -3215,4 +3217,4 @@ declare function resolvePageDirs(dir: string, root: string, exclude: string[]):
 declare function VitePluginUniPages(userOptions?: UserOptions): Plugin;
 
 export { FILE_EXTENSIONS, MODULE_ID_VIRTUAL, OUTPUT_NAME, Page, PageContext, RESOLVED_MODULE_ID_VIRTUAL, VitePluginUniPages, babelGenerate, checkPagesJsonFileSync, debug, VitePluginUniPages as default, definePage, defineUniPages, extsToGlob, findImports, findMacro, getPageFiles, getRouteBlock, getRouteSfcBlock, invalidatePagesModule, isTargetFile, mergePageMetaDataArray, parseCode, parseCustomBlock, parseSFC, resolveOptions, resolvePageDirs, sleep, tryPageMetaFromCustomBlock, tryPageMetaFromMacro, writeFileWithLock };
-export type { Condition, ConditionItem, ConfigSource, CustomBlock, DefinePage, EasyCom, GlobalStyle, MaybeCallable, MaybePromise, MaybePromiseCallable, Options, PageMetaDatum, PagePath, PagesConfig, ResolvedOptions, RouteBlockLang, SubPackage, SubPackages, SubPageMetaDatum, TabBar, TabBarIconFont, TabBarItem, TabBarMidButton, TheWindow, UniIdRouter, UserOptions, UserPageMeta, UserPagesConfig, UserTabBarItem, debugType };
+export type { Condition, ConditionItem, ConfigSource, CustomBlock, DefinePage, EasyCom, ExcludeIndexSignature, GlobalStyle, MaybeCallable, MaybePromise, MaybePromiseCallable, Options, PageMetaDatum, PagePath, PagesConfig, ResolvedOptions, RouteBlockLang, SubPackage, SubPackages, SubPageMetaDatum, TabBar, TabBarIconFont, TabBarItem, TabBarMidButton, TheWindow, UniIdRouter, UserOptions, UserPageMeta, UserPagesConfig, UserTabBarItem, debugType };

package/dist/index.mjs

@@ -11,10 +11,10 @@ import { parse, assign, stringify, CommentArray } from 'comment-json';
 import Debug from 'debug';
 import detectIndent from 'detect-indent';
 import detectNewline from 'detect-newline';
-import lockfile from 'proper-lockfile';
 import { loadConfig } from 'unconfig';
 import { readFile, mkdir, writeFile as writeFile$1 } from 'node:fs/promises';
 import fg from 'fast-glob';
+import lockfile from 'proper-lockfile';
 import { createRequire } from 'node:module';
 import vm from 'node:vm';
 import babelGenerator from '@babel/generator';
@@ -742,8 +742,11 @@ class PageContext {
     const generatedPageMetaData = await Promise.all(jobs);
     const customPageMetaData = overrides || [];
     const result = customPageMetaData.length ? mergePageMetaDataArray(generatedPageMetaData.concat(customPageMetaData)) : generatedPageMetaData;
-    const parseMeta = result.filter(
-      (page, index, self) => self.findLastIndex((item) => page.path === item.path) === index
+    const parseMeta = Array.from(
+      result.reduce((map, page) => {
+        map.set(page.path, page);
+        return map;
+      }, /* @__PURE__ */ new Map()).values()
     );
     return type === "main" ? this.setHomePage(parseMeta) : parseMeta;
   }
@@ -897,35 +900,13 @@ class PageContext {
     debug.declaration("generating");
     return writeDeclaration(this, this.options.dts);
   }
-  async writePagesJSONFile(pagesJson, retry = 3) {
-    if (retry <= 0) {
-      debug.error(`${this.resolvedPagesJSONPath} \u83B7\u53D6\u6587\u4EF6\u9501\u5931\u8D25\uFF0C\u5199\u5165\u5931\u8D25`);
-      return;
-    }
-    let relase;
-    try {
-      try {
-        relase = await lockfile.lock(this.resolvedPagesJSONPath, { realpath: false });
-      } catch {
-        return this.writePagesJSONFile(pagesJson, retry - 1);
-      }
-      await fs.promises.writeFile(this.resolvedPagesJSONPath, pagesJson, { encoding: "utf-8" });
-    } finally {
-      if (relase) {
-        await relase();
-      }
-    }
-  }
   async genratePagesJSON() {
     const content = await fs.promises.readFile(this.resolvedPagesJSONPath, { encoding: "utf-8" }).catch(() => "");
-    let pageJson = parse(content || "{}");
-    const { pages: _, subPackages: __, tabBar: ___, ...others } = this.pagesGlobConfig || {};
-    pageJson = Object.assign(pageJson, {
-      ...others
-    });
+    const { pages: oldPages, subPackages: oldSubPackages, tabBar: oldTabBar } = parse(content || "{}");
+    const { pages: _, subPackages: __, tabBar: ___, ...pageJson } = this.pagesGlobConfig || {};
     const currentPlatform = platform.toUpperCase();
-    pageJson.pages = mergePlatformItems(pageJson?.pages, currentPlatform, this.pageMetaData, "path");
-    pageJson.subPackages = pageJson?.subPackages || new CommentArray();
+    pageJson.pages = mergePlatformItems(oldPages, currentPlatform, this.pageMetaData, "path");
+    pageJson.subPackages = oldSubPackages || new CommentArray();
     const newSubPackages = /* @__PURE__ */ new Map();
     for (const item of this.subPageMetaData) {
       newSubPackages.set(item.root, item);
@@ -943,15 +924,17 @@ class PageContext {
         pages: mergePlatformItems(void 0, currentPlatform, newSub.pages, "path")
       });
     }
-    const tabBar = await this.getTabBarMerged();
-    if (tabBar) {
-      const list = mergePlatformItems(pageJson?.tabBar?.list, currentPlatform, tabBar.list, "pagePath");
-      if (pageJson?.tabBar?.list) {
-        pageJson.tabBar.list = list;
-      } else {
-        pageJson.tabBar = pageJson.tabBar || {};
-        pageJson.tabBar.list = list;
-      }
+    const { list, ...tabBarOthers } = await this.getTabBarMerged() || {};
+    if (list) {
+      const { list: oldList } = oldTabBar || {};
+      const newList = mergePlatformItems(oldList, currentPlatform, list, "pagePath");
+      pageJson.tabBar = {
+        ...tabBarOthers,
+        // 每次都直接更新除 list 外的其他属性
+        list: newList
+      };
+    } else {
+      pageJson.tabBar = void 0;
     }
     return pageJson;
   }
@@ -1021,7 +1004,7 @@ function mergePlatformItems(source, currentPlatform, items, uniqueKeyName) {
       continue;
     }
     const existing = tmpMap.get(uniqueKey) || [];
-    existing.push({ item, platforms, platformStr: platforms.join(" || ") });
+    existing.push({ item, itemStr: JSON.stringify(item), platforms, platformStr: platforms.join(" || ") });
     tmpMap.set(uniqueKey, existing);
   }
   for (const item of items) {
@@ -1033,6 +1016,7 @@ function mergePlatformItems(source, currentPlatform, items, uniqueKeyName) {
     if (!tmpMap.has(uniqueKey)) {
       tmpMap.set(uniqueKey, [{
         item: newItem,
+        itemStr: JSON.stringify(newItem),
         platforms: [currentPlatform],
         platformStr: currentPlatform
       }]);
@@ -1040,13 +1024,14 @@ function mergePlatformItems(source, currentPlatform, items, uniqueKeyName) {
     }
     const existing = tmpMap.get(uniqueKey);
     const newItemStr = JSON.stringify(newItem);
-    const equalObj = existing.find((val) => JSON.stringify(val.item) === newItemStr);
+    const equalObj = existing.find((val) => val.itemStr === newItemStr);
     if (equalObj) {
       equalObj.platforms.push(currentPlatform);
       equalObj.platformStr = equalObj.platforms.join(" || ");
     } else {
       existing.push({
         item: newItem,
+        itemStr: newItemStr,
         platforms: [currentPlatform],
         platformStr: currentPlatform
       });

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@uni-helper/vite-plugin-uni-pages",
   "type": "module",
-  "version": "0.3.18",
+  "version": "0.3.20",
   "description": "File system based routing for uni-app applications using Vite",
   "author": "KeJun",
   "maintainers": [