@uni-helper/vite-plugin-uni-pages 0.3.19 → 0.3.21

package/dist/index.cjs

@@ -319,18 +319,18 @@ async function writeFileWithLock(path, content, retry = 3) {
     debug.error(`${path} \u83B7\u53D6\u6587\u4EF6\u9501\u5931\u8D25\uFF0C\u5199\u5165\u5931\u8D25`);
     return;
   }
-  let relase;
+  let release;
   try {
     try {
-      relase = await lockfile__default.lock(path, { realpath: false });
+      release = await lockfile__default.lock(path, { realpath: false });
     } catch {
       await sleep(500);
       return writeFileWithLock(path, content, retry - 1);
     }
     await fs__default.promises.writeFile(path, content, { encoding: "utf-8" });
   } finally {
-    if (relase) {
-      await relase();
+    if (release) {
+      await release();
     }
   }
 }
@@ -809,6 +809,9 @@ class PageContext {
     return result;
   }
   async mergePageMetaData() {
+    const subPageAbsolutePaths = Array.from(this.subPages.values()).flatMap((v) => Array.from(v.keys()));
+    for (const subPageAbsolutePath of subPageAbsolutePaths)
+      this.pages.delete(subPageAbsolutePath);
     const pageMetaData = await this.parsePages(this.pages, "main", this.pagesGlobConfig?.pages);
     this.pageMetaData = pageMetaData;
     debug.pages(this.pageMetaData);
@@ -938,8 +941,7 @@ class PageContext {
   async genratePagesJSON() {
     const content = await fs__default.promises.readFile(this.resolvedPagesJSONPath, { encoding: "utf-8" }).catch(() => "");
     const { pages: oldPages, subPackages: oldSubPackages, tabBar: oldTabBar } = commentJson.parse(content || "{}");
-    const { pages: _, subPackages: __, tabBar: ___, ...others } = this.pagesGlobConfig || {};
-    const pageJson = { ...others };
+    const { pages: _, subPackages: __, tabBar: ___, ...pageJson } = this.pagesGlobConfig || {};
     const currentPlatform = uniEnv.platform.toUpperCase();
     pageJson.pages = mergePlatformItems(oldPages, currentPlatform, this.pageMetaData, "path");
     pageJson.subPackages = oldSubPackages || new commentJson.CommentArray();
@@ -1040,7 +1042,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) {
@@ -1052,6 +1054,7 @@ function mergePlatformItems(source, currentPlatform, items, uniqueKeyName) {
     if (!tmpMap.has(uniqueKey)) {
       tmpMap.set(uniqueKey, [{
         item: newItem,
+        itemStr: JSON.stringify(newItem),
         platforms: [currentPlatform],
         platformStr: currentPlatform
       }]);
@@ -1059,13 +1062,15 @@ 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.platforms.sort();
       equalObj.platformStr = equalObj.platforms.join(" || ");
     } else {
       existing.push({
         item: newItem,
+        itemStr: newItemStr,
         platforms: [currentPlatform],
         platformStr: currentPlatform
       });

package/dist/index.d.cts

@@ -3152,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[];
@@ -3214,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

@@ -3152,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[];
@@ -3214,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

@@ -3152,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[];
@@ -3214,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

@@ -284,18 +284,18 @@ async function writeFileWithLock(path, content, retry = 3) {
     debug.error(`${path} \u83B7\u53D6\u6587\u4EF6\u9501\u5931\u8D25\uFF0C\u5199\u5165\u5931\u8D25`);
     return;
   }
-  let relase;
+  let release;
   try {
     try {
-      relase = await lockfile.lock(path, { realpath: false });
+      release = await lockfile.lock(path, { realpath: false });
     } catch {
       await sleep(500);
       return writeFileWithLock(path, content, retry - 1);
     }
     await fs.promises.writeFile(path, content, { encoding: "utf-8" });
   } finally {
-    if (relase) {
-      await relase();
+    if (release) {
+      await release();
     }
   }
 }
@@ -774,6 +774,9 @@ class PageContext {
     return result;
   }
   async mergePageMetaData() {
+    const subPageAbsolutePaths = Array.from(this.subPages.values()).flatMap((v) => Array.from(v.keys()));
+    for (const subPageAbsolutePath of subPageAbsolutePaths)
+      this.pages.delete(subPageAbsolutePath);
     const pageMetaData = await this.parsePages(this.pages, "main", this.pagesGlobConfig?.pages);
     this.pageMetaData = pageMetaData;
     debug.pages(this.pageMetaData);
@@ -903,8 +906,7 @@ class PageContext {
   async genratePagesJSON() {
     const content = await fs.promises.readFile(this.resolvedPagesJSONPath, { encoding: "utf-8" }).catch(() => "");
     const { pages: oldPages, subPackages: oldSubPackages, tabBar: oldTabBar } = parse(content || "{}");
-    const { pages: _, subPackages: __, tabBar: ___, ...others } = this.pagesGlobConfig || {};
-    const pageJson = { ...others };
+    const { pages: _, subPackages: __, tabBar: ___, ...pageJson } = this.pagesGlobConfig || {};
     const currentPlatform = platform.toUpperCase();
     pageJson.pages = mergePlatformItems(oldPages, currentPlatform, this.pageMetaData, "path");
     pageJson.subPackages = oldSubPackages || new CommentArray();
@@ -1005,7 +1007,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) {
@@ -1017,6 +1019,7 @@ function mergePlatformItems(source, currentPlatform, items, uniqueKeyName) {
     if (!tmpMap.has(uniqueKey)) {
       tmpMap.set(uniqueKey, [{
         item: newItem,
+        itemStr: JSON.stringify(newItem),
         platforms: [currentPlatform],
         platformStr: currentPlatform
       }]);
@@ -1024,13 +1027,15 @@ 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.platforms.sort();
       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.19",
+  "version": "0.3.21",
   "description": "File system based routing for uni-app applications using Vite",
   "author": "KeJun",
   "maintainers": [