@uni-helper/vite-plugin-uni-pages 0.3.16 → 0.3.17

package/dist/index.cjs

@@ -235,6 +235,9 @@ ${jsCode}
 `);
   }
 }
+function sleep(ms) {
+  return new Promise((resolve) => setTimeout(resolve, ms));
+}
 function getDefaultExport(expr) {
   return expr.default === void 0 ? expr : expr.default;
 }
@@ -250,33 +253,73 @@ function getPageFiles(path, options) {
   });
   return files;
 }
-async function checkPagesJsonFile(path) {
+function checkPagesJsonFileSync(path) {
   const createEmptyFile = (path2) => {
-    return fs__default.promises.writeFile(path2, JSON.stringify({ pages: [{ path: "" }] }, null, 2), { encoding: "utf-8" }).then(() => true).catch(() => false);
+    try {
+      fs__default.writeFileSync(
+        path2,
+        JSON.stringify({ pages: [{ path: "" }] }, null, 2),
+        { encoding: "utf-8" }
+      );
+      return true;
+    } catch {
+      return false;
+    }
   };
-  const unlink = (path2) => {
-    return fs__default.promises.unlink(path2).then(() => true).catch(() => false);
+  const unlinkFile = (path2) => {
+    try {
+      fs__default.unlinkSync(path2);
+      return true;
+    } catch {
+      return false;
+    }
   };
   try {
-    const stat = await fs__default.promises.stat(path);
+    try {
+      fs__default.accessSync(path, fs__default.constants.F_OK);
+    } catch {
+      return createEmptyFile(path);
+    }
+    const stat = fs__default.statSync(path);
     if (!stat.isFile()) {
-      if (!await unlink(path)) {
+      if (!unlinkFile(path)) {
         return false;
       }
       return createEmptyFile(path);
     }
-    const access = await fs__default.promises.access(path, fs__default.constants.W_OK | fs__default.constants.R_OK).then(() => true).catch(() => false);
-    if (!access) {
-      if (!await unlink(path)) {
+    try {
+      fs__default.accessSync(path, fs__default.constants.R_OK | fs__default.constants.W_OK);
+      return true;
+    } catch {
+      if (!unlinkFile(path)) {
         return false;
       }
       return createEmptyFile(path);
     }
-    return true;
   } catch {
     return createEmptyFile(path);
   }
 }
+async function writeFileWithLock(path, content, retry = 3) {
+  if (retry <= 0) {
+    debug.error(`${path} \u83B7\u53D6\u6587\u4EF6\u9501\u5931\u8D25\uFF0C\u5199\u5165\u5931\u8D25`);
+    return;
+  }
+  let relase;
+  try {
+    try {
+      relase = 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();
+    }
+  }
+}
 
 function resolveOptions(userOptions, viteRoot = process__default.cwd()) {
   const {
@@ -569,7 +612,6 @@ var __publicField = (obj, key, value) => {
   __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
   return value;
 };
-let lsatPagesJson = "";
 class PageContext {
   constructor(userOptions, viteRoot = process__default.cwd()) {
     __publicField(this, "_server");
@@ -593,6 +635,7 @@ class PageContext {
     __publicField(this, "options");
     __publicField(this, "logger");
     __publicField(this, "withUniPlatform", false);
+    __publicField(this, "lastPagesJson", "");
     this.rawOptions = userOptions;
     this.root = slash(viteRoot);
     debug.options("root", this.root);
@@ -819,7 +862,7 @@ class PageContext {
         }
       }
     }
-    await checkPagesJsonFile(this.resolvedPagesJSONPath);
+    checkPagesJsonFileSync(this.resolvedPagesJSONPath);
     this.options.onBeforeLoadUserConfig(this);
     await this.loadUserPagesConfig();
     this.options.onAfterLoadUserConfig(this);
@@ -841,29 +884,19 @@ class PageContext {
     pages.forEach((v) => pagesMap.set(v.path, v));
     this.pageMetaData = [...pagesMap.values()];
     this.options.onBeforeWriteFile(this);
-    const data = {
-      ...this.pagesGlobConfig,
-      pages: this.pageMetaData,
-      subPackages: this.subPageMetaData,
-      tabBar: await this.getTabBarMerged()
-    };
+    const data = await this.genratePagesJSON();
     const pagesJson = commentJson.stringify(
       data,
       null,
       this.options.minify ? void 0 : await this.getIndent()
     ) + (await this.getEndOfLine() ? await this.getNewline() : "");
     this.generateDeclaration();
-    if (lsatPagesJson === pagesJson) {
+    if (this.lastPagesJson === pagesJson) {
       debug.pages("PagesJson Not have change");
       return false;
     }
-    const relase = await lockfile__default.lock(this.resolvedPagesJSONPath, { realpath: false });
-    try {
-      await fs__default.promises.writeFile(this.resolvedPagesJSONPath, pagesJson, { encoding: "utf-8" });
-    } finally {
-      await relase();
-    }
-    lsatPagesJson = pagesJson;
+    await writeFileWithLock(this.resolvedPagesJSONPath, pagesJson);
+    this.lastPagesJson = pagesJson;
     this.options.onAfterWriteFile(this);
     return true;
   }
@@ -884,6 +917,64 @@ 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 currentPlatform = uniEnv.platform.toUpperCase();
+    pageJson.pages = mergePlatformItems(pageJson?.pages, currentPlatform, this.pageMetaData, "path");
+    pageJson.subPackages = pageJson?.subPackages || new commentJson.CommentArray();
+    const newSubPackages = /* @__PURE__ */ new Map();
+    for (const item of this.subPageMetaData) {
+      newSubPackages.set(item.root, item);
+    }
+    for (const existing of pageJson.subPackages) {
+      const sub = newSubPackages.get(existing.root);
+      if (sub) {
+        existing.pages = mergePlatformItems(existing.pages, currentPlatform, sub.pages, "path");
+        newSubPackages.delete(existing.root);
+      }
+    }
+    for (const [_2, newSub] of newSubPackages) {
+      pageJson.subPackages.push({
+        root: newSub.root,
+        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;
+      }
+    }
+    return pageJson;
+  }
   async readInfoFromPagesJSON() {
     const resolvedPagesJSONContent = await fs__default.promises.readFile(this.resolvedPagesJSONPath, { encoding: "utf-8" }).catch(() => "");
     this.resolvedPagesJSONIndent = detectIndent__default(resolvedPagesJSONContent).indent || "  ";
@@ -920,19 +1011,125 @@ function getPagePaths(dir, options) {
   }));
   return pagePaths;
 }
+function mergePlatformItems(source, currentPlatform, items, uniqueKeyName) {
+  const src = source || new commentJson.CommentArray();
+  currentPlatform = currentPlatform.toUpperCase();
+  let lastPlatforms = [];
+  for (const comment of src[Symbol.for("before:0")] || []) {
+    const trimed = comment.value.trim();
+    if (trimed.startsWith("GENERATED BY UNI-PAGES, PLATFORM:")) {
+      lastPlatforms = trimed.split(":")[1].split("||").map((s) => s.trim()).filter((s) => s !== currentPlatform).sort();
+    }
+  }
+  const tmpMap = /* @__PURE__ */ new Map();
+  for (let i = 0; i < src.length; i++) {
+    const item = src[i];
+    const uniqueKey = item[uniqueKeyName];
+    if (!uniqueKey) {
+      continue;
+    }
+    const beforeComments = src[Symbol.for(`before:${i}`)];
+    const ifdefComment = beforeComments?.find((c) => c.value.trim().startsWith("#ifdef"));
+    let platforms = [...lastPlatforms];
+    if (ifdefComment) {
+      const match = ifdefComment.value.match(/#ifdef\s+(.+)/);
+      if (match) {
+        platforms = match[1].split("||").map((p) => p.trim()).filter((s) => s !== currentPlatform).sort();
+      }
+    }
+    if (platforms.length === 0) {
+      continue;
+    }
+    const existing = tmpMap.get(uniqueKey) || [];
+    existing.push({ item, platforms, platformStr: platforms.join(" || ") });
+    tmpMap.set(uniqueKey, existing);
+  }
+  for (const item of items) {
+    const newItem = item;
+    const uniqueKey = item[uniqueKeyName];
+    if (!uniqueKey) {
+      continue;
+    }
+    if (!tmpMap.has(uniqueKey)) {
+      tmpMap.set(uniqueKey, [{
+        item: newItem,
+        platforms: [currentPlatform],
+        platformStr: currentPlatform
+      }]);
+      continue;
+    }
+    const existing = tmpMap.get(uniqueKey);
+    const newItemStr = JSON.stringify(newItem);
+    const equalObj = existing.find((val) => JSON.stringify(val.item) === newItemStr);
+    if (equalObj) {
+      equalObj.platforms.push(currentPlatform);
+      equalObj.platformStr = equalObj.platforms.join(" || ");
+    } else {
+      existing.push({
+        item: newItem,
+        platforms: [currentPlatform],
+        platformStr: currentPlatform
+      });
+    }
+  }
+  const result = new commentJson.CommentArray();
+  const platformUsage = {};
+  tmpMap.forEach((val) => {
+    Object.values(val).forEach((v) => {
+      platformUsage[v.platformStr] = (platformUsage[v.platformStr] || 0) + 1;
+    });
+  });
+  const usageKeys = Object.keys(platformUsage);
+  const defaultPlatformStr = usageKeys.length ? usageKeys.reduce((a, b) => platformUsage[a] > platformUsage[b] ? a : b) : currentPlatform;
+  result[Symbol.for("before:0")] = [{
+    type: "LineComment",
+    value: ` GENERATED BY UNI-PAGES, PLATFORM: ${defaultPlatformStr}`,
+    inline: false,
+    loc: {
+      start: { line: 0, column: 0 },
+      end: { line: 0, column: 0 }
+    }
+  }];
+  for (const [_, list] of tmpMap) {
+    for (const { item, platformStr } of list) {
+      result.push(item);
+      if (platformStr !== defaultPlatformStr) {
+        result[Symbol.for(`before:${result.length - 1}`)] = [{
+          type: "LineComment",
+          value: ` #ifdef ${platformStr}`,
+          inline: false,
+          loc: {
+            start: { line: 0, column: 0 },
+            end: { line: 0, column: 0 }
+          }
+        }];
+        result[Symbol.for(`after:${result.length - 1}`)] = [{
+          type: "LineComment",
+          value: " #endif",
+          inline: false,
+          loc: {
+            start: { line: 0, column: 0 },
+            end: { line: 0, column: 0 }
+          }
+        }];
+      }
+    }
+  }
+  return result;
+}
 
 function defineUniPages(config) {
   return config;
 }
 
-async function VitePluginUniPages(userOptions = {}) {
+function VitePluginUniPages(userOptions = {}) {
   let ctx;
   const resolvedPagesJSONPath = path__default.join(
     process__default.env.VITE_ROOT_DIR || process__default.cwd(),
     userOptions.outDir ?? "src",
     OUTPUT_NAME
   );
-  await checkPagesJsonFile(resolvedPagesJSONPath);
+  checkPagesJsonFileSync(resolvedPagesJSONPath);
   return {
     name: "vite-plugin-uni-pages",
     enforce: "pre",
@@ -1019,7 +1216,7 @@ exports.PageContext = PageContext;
 exports.RESOLVED_MODULE_ID_VIRTUAL = RESOLVED_MODULE_ID_VIRTUAL;
 exports.VitePluginUniPages = VitePluginUniPages;
 exports.babelGenerate = babelGenerate;
-exports.checkPagesJsonFile = checkPagesJsonFile;
+exports.checkPagesJsonFileSync = checkPagesJsonFileSync;
 exports.debug = debug;
 exports.default = VitePluginUniPages;
 exports.defineUniPages = defineUniPages;
@@ -1037,5 +1234,7 @@ exports.parseCustomBlock = parseCustomBlock;
 exports.parseSFC = parseSFC;
 exports.resolveOptions = resolveOptions;
 exports.resolvePageDirs = resolvePageDirs;
+exports.sleep = sleep;
 exports.tryPageMetaFromCustomBlock = tryPageMetaFromCustomBlock;
 exports.tryPageMetaFromMacro = tryPageMetaFromMacro;
+exports.writeFileWithLock = writeFileWithLock;

package/dist/index.d.cts

@@ -2964,6 +2964,7 @@ declare class PageContext {
     options: ResolvedOptions;
     logger?: Logger;
     withUniPlatform: boolean;
+    private lastPagesJson;
     constructor(userOptions: UserOptions, viteRoot?: string);
     setLogger(logger: Logger): void;
     loadUserPagesConfig(): Promise<void>;
@@ -2994,6 +2995,8 @@ declare class PageContext {
     resolveRoutes(): string;
     resolveSubRoutes(): string;
     generateDeclaration(): Promise<void> | undefined;
+    private writePagesJSONFile;
+    private genratePagesJSON;
     private readInfoFromPagesJSON;
     private getIndent;
     private getNewline;
@@ -3034,6 +3037,7 @@ declare function execScript(options: {
     code: string;
     filename: string;
 }): Promise<any>;
+declare function sleep(ms: number): Promise<unknown>;
 declare const babelGenerate: typeof babelGenerator;
 
 interface CustomBlock {
@@ -3195,11 +3199,12 @@ declare function getRouteBlock(path: string, blockStr: SFCBlock | undefined, rou
  */
 declare function getPageFiles(path: string, options: ResolvedOptions): string[];
 /**
- * 检查指定路径的pages.json文件，如果文件不存在或不是有效文件则创建一个空的pages.json文件
+ * 检查指定路径的 pages.json 文件，如果文件不存在或不是有效文件则创建一个空的 pages.json 文件
  * @param path - 要检查的文件路径
- * @returns Promise<void> - 无返回值的异步函数
+ * @returns boolean - 返回操作是否成功
  */
-declare function checkPagesJsonFile(path: fs.PathLike): Promise<boolean>;
+declare function checkPagesJsonFileSync(path: fs.PathLike): boolean;
+declare function writeFileWithLock(path: string, content: string, retry?: number): Promise<void>;
 
 declare function resolveOptions(userOptions: UserOptions, viteRoot?: string): ResolvedOptions;
 /**
@@ -3207,7 +3212,7 @@ declare function resolveOptions(userOptions: UserOptions, viteRoot?: string): Re
  */
 declare function resolvePageDirs(dir: string, root: string, exclude: string[]): string[];
 
-declare function VitePluginUniPages(userOptions?: UserOptions): Promise<Plugin>;
+declare function VitePluginUniPages(userOptions?: UserOptions): Plugin;
 
-export { FILE_EXTENSIONS, MODULE_ID_VIRTUAL, OUTPUT_NAME, Page, PageContext, RESOLVED_MODULE_ID_VIRTUAL, VitePluginUniPages, babelGenerate, checkPagesJsonFile, debug, VitePluginUniPages as default, definePage, defineUniPages, execScript, extsToGlob, findImports, findMacro, getPageFiles, getRouteBlock, getRouteSfcBlock, invalidatePagesModule, isTargetFile, mergePageMetaDataArray, parseCustomBlock, parseSFC, resolveOptions, resolvePageDirs, tryPageMetaFromCustomBlock, tryPageMetaFromMacro };
+export { FILE_EXTENSIONS, MODULE_ID_VIRTUAL, OUTPUT_NAME, Page, PageContext, RESOLVED_MODULE_ID_VIRTUAL, VitePluginUniPages, babelGenerate, checkPagesJsonFileSync, debug, VitePluginUniPages as default, definePage, defineUniPages, execScript, extsToGlob, findImports, findMacro, getPageFiles, getRouteBlock, getRouteSfcBlock, invalidatePagesModule, isTargetFile, mergePageMetaDataArray, 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 };

package/dist/index.d.mts

@@ -2964,6 +2964,7 @@ declare class PageContext {
     options: ResolvedOptions;
     logger?: Logger;
     withUniPlatform: boolean;
+    private lastPagesJson;
     constructor(userOptions: UserOptions, viteRoot?: string);
     setLogger(logger: Logger): void;
     loadUserPagesConfig(): Promise<void>;
@@ -2994,6 +2995,8 @@ declare class PageContext {
     resolveRoutes(): string;
     resolveSubRoutes(): string;
     generateDeclaration(): Promise<void> | undefined;
+    private writePagesJSONFile;
+    private genratePagesJSON;
     private readInfoFromPagesJSON;
     private getIndent;
     private getNewline;
@@ -3034,6 +3037,7 @@ declare function execScript(options: {
     code: string;
     filename: string;
 }): Promise<any>;
+declare function sleep(ms: number): Promise<unknown>;
 declare const babelGenerate: typeof babelGenerator;
 
 interface CustomBlock {
@@ -3195,11 +3199,12 @@ declare function getRouteBlock(path: string, blockStr: SFCBlock | undefined, rou
  */
 declare function getPageFiles(path: string, options: ResolvedOptions): string[];
 /**
- * 检查指定路径的pages.json文件，如果文件不存在或不是有效文件则创建一个空的pages.json文件
+ * 检查指定路径的 pages.json 文件，如果文件不存在或不是有效文件则创建一个空的 pages.json 文件
  * @param path - 要检查的文件路径
- * @returns Promise<void> - 无返回值的异步函数
+ * @returns boolean - 返回操作是否成功
  */
-declare function checkPagesJsonFile(path: fs.PathLike): Promise<boolean>;
+declare function checkPagesJsonFileSync(path: fs.PathLike): boolean;
+declare function writeFileWithLock(path: string, content: string, retry?: number): Promise<void>;
 
 declare function resolveOptions(userOptions: UserOptions, viteRoot?: string): ResolvedOptions;
 /**
@@ -3207,7 +3212,7 @@ declare function resolveOptions(userOptions: UserOptions, viteRoot?: string): Re
  */
 declare function resolvePageDirs(dir: string, root: string, exclude: string[]): string[];
 
-declare function VitePluginUniPages(userOptions?: UserOptions): Promise<Plugin>;
+declare function VitePluginUniPages(userOptions?: UserOptions): Plugin;
 
-export { FILE_EXTENSIONS, MODULE_ID_VIRTUAL, OUTPUT_NAME, Page, PageContext, RESOLVED_MODULE_ID_VIRTUAL, VitePluginUniPages, babelGenerate, checkPagesJsonFile, debug, VitePluginUniPages as default, definePage, defineUniPages, execScript, extsToGlob, findImports, findMacro, getPageFiles, getRouteBlock, getRouteSfcBlock, invalidatePagesModule, isTargetFile, mergePageMetaDataArray, parseCustomBlock, parseSFC, resolveOptions, resolvePageDirs, tryPageMetaFromCustomBlock, tryPageMetaFromMacro };
+export { FILE_EXTENSIONS, MODULE_ID_VIRTUAL, OUTPUT_NAME, Page, PageContext, RESOLVED_MODULE_ID_VIRTUAL, VitePluginUniPages, babelGenerate, checkPagesJsonFileSync, debug, VitePluginUniPages as default, definePage, defineUniPages, execScript, extsToGlob, findImports, findMacro, getPageFiles, getRouteBlock, getRouteSfcBlock, invalidatePagesModule, isTargetFile, mergePageMetaDataArray, 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 };

package/dist/index.d.ts

@@ -2964,6 +2964,7 @@ declare class PageContext {
     options: ResolvedOptions;
     logger?: Logger;
     withUniPlatform: boolean;
+    private lastPagesJson;
     constructor(userOptions: UserOptions, viteRoot?: string);
     setLogger(logger: Logger): void;
     loadUserPagesConfig(): Promise<void>;
@@ -2994,6 +2995,8 @@ declare class PageContext {
     resolveRoutes(): string;
     resolveSubRoutes(): string;
     generateDeclaration(): Promise<void> | undefined;
+    private writePagesJSONFile;
+    private genratePagesJSON;
     private readInfoFromPagesJSON;
     private getIndent;
     private getNewline;
@@ -3034,6 +3037,7 @@ declare function execScript(options: {
     code: string;
     filename: string;
 }): Promise<any>;
+declare function sleep(ms: number): Promise<unknown>;
 declare const babelGenerate: typeof babelGenerator;
 
 interface CustomBlock {
@@ -3195,11 +3199,12 @@ declare function getRouteBlock(path: string, blockStr: SFCBlock | undefined, rou
  */
 declare function getPageFiles(path: string, options: ResolvedOptions): string[];
 /**
- * 检查指定路径的pages.json文件，如果文件不存在或不是有效文件则创建一个空的pages.json文件
+ * 检查指定路径的 pages.json 文件，如果文件不存在或不是有效文件则创建一个空的 pages.json 文件
  * @param path - 要检查的文件路径
- * @returns Promise<void> - 无返回值的异步函数
+ * @returns boolean - 返回操作是否成功
  */
-declare function checkPagesJsonFile(path: fs.PathLike): Promise<boolean>;
+declare function checkPagesJsonFileSync(path: fs.PathLike): boolean;
+declare function writeFileWithLock(path: string, content: string, retry?: number): Promise<void>;
 
 declare function resolveOptions(userOptions: UserOptions, viteRoot?: string): ResolvedOptions;
 /**
@@ -3207,7 +3212,7 @@ declare function resolveOptions(userOptions: UserOptions, viteRoot?: string): Re
  */
 declare function resolvePageDirs(dir: string, root: string, exclude: string[]): string[];
 
-declare function VitePluginUniPages(userOptions?: UserOptions): Promise<Plugin>;
+declare function VitePluginUniPages(userOptions?: UserOptions): Plugin;
 
-export { FILE_EXTENSIONS, MODULE_ID_VIRTUAL, OUTPUT_NAME, Page, PageContext, RESOLVED_MODULE_ID_VIRTUAL, VitePluginUniPages, babelGenerate, checkPagesJsonFile, debug, VitePluginUniPages as default, definePage, defineUniPages, execScript, extsToGlob, findImports, findMacro, getPageFiles, getRouteBlock, getRouteSfcBlock, invalidatePagesModule, isTargetFile, mergePageMetaDataArray, parseCustomBlock, parseSFC, resolveOptions, resolvePageDirs, tryPageMetaFromCustomBlock, tryPageMetaFromMacro };
+export { FILE_EXTENSIONS, MODULE_ID_VIRTUAL, OUTPUT_NAME, Page, PageContext, RESOLVED_MODULE_ID_VIRTUAL, VitePluginUniPages, babelGenerate, checkPagesJsonFileSync, debug, VitePluginUniPages as default, definePage, defineUniPages, execScript, extsToGlob, findImports, findMacro, getPageFiles, getRouteBlock, getRouteSfcBlock, invalidatePagesModule, isTargetFile, mergePageMetaDataArray, 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 };

package/dist/index.mjs

@@ -7,7 +7,7 @@ import MagicString from 'magic-string';
 import { normalizePath, createLogger } from 'vite';
 import fs, { existsSync } from 'node:fs';
 import { platform } from '@uni-helper/uni-env';
-import { parse, assign, stringify } from 'comment-json';
+import { parse, assign, stringify, CommentArray } from 'comment-json';
 import Debug from 'debug';
 import detectIndent from 'detect-indent';
 import detectNewline from 'detect-newline';
@@ -200,6 +200,9 @@ ${jsCode}
 `);
   }
 }
+function sleep(ms) {
+  return new Promise((resolve) => setTimeout(resolve, ms));
+}
 function getDefaultExport(expr) {
   return expr.default === void 0 ? expr : expr.default;
 }
@@ -215,33 +218,73 @@ function getPageFiles(path, options) {
   });
   return files;
 }
-async function checkPagesJsonFile(path) {
+function checkPagesJsonFileSync(path) {
   const createEmptyFile = (path2) => {
-    return fs.promises.writeFile(path2, JSON.stringify({ pages: [{ path: "" }] }, null, 2), { encoding: "utf-8" }).then(() => true).catch(() => false);
+    try {
+      fs.writeFileSync(
+        path2,
+        JSON.stringify({ pages: [{ path: "" }] }, null, 2),
+        { encoding: "utf-8" }
+      );
+      return true;
+    } catch {
+      return false;
+    }
   };
-  const unlink = (path2) => {
-    return fs.promises.unlink(path2).then(() => true).catch(() => false);
+  const unlinkFile = (path2) => {
+    try {
+      fs.unlinkSync(path2);
+      return true;
+    } catch {
+      return false;
+    }
   };
   try {
-    const stat = await fs.promises.stat(path);
+    try {
+      fs.accessSync(path, fs.constants.F_OK);
+    } catch {
+      return createEmptyFile(path);
+    }
+    const stat = fs.statSync(path);
     if (!stat.isFile()) {
-      if (!await unlink(path)) {
+      if (!unlinkFile(path)) {
         return false;
       }
       return createEmptyFile(path);
     }
-    const access = await fs.promises.access(path, fs.constants.W_OK | fs.constants.R_OK).then(() => true).catch(() => false);
-    if (!access) {
-      if (!await unlink(path)) {
+    try {
+      fs.accessSync(path, fs.constants.R_OK | fs.constants.W_OK);
+      return true;
+    } catch {
+      if (!unlinkFile(path)) {
         return false;
       }
       return createEmptyFile(path);
     }
-    return true;
   } catch {
     return createEmptyFile(path);
   }
 }
+async function writeFileWithLock(path, content, retry = 3) {
+  if (retry <= 0) {
+    debug.error(`${path} \u83B7\u53D6\u6587\u4EF6\u9501\u5931\u8D25\uFF0C\u5199\u5165\u5931\u8D25`);
+    return;
+  }
+  let relase;
+  try {
+    try {
+      relase = 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();
+    }
+  }
+}
 
 function resolveOptions(userOptions, viteRoot = process.cwd()) {
   const {
@@ -534,7 +577,6 @@ var __publicField = (obj, key, value) => {
   __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
   return value;
 };
-let lsatPagesJson = "";
 class PageContext {
   constructor(userOptions, viteRoot = process.cwd()) {
     __publicField(this, "_server");
@@ -558,6 +600,7 @@ class PageContext {
     __publicField(this, "options");
     __publicField(this, "logger");
     __publicField(this, "withUniPlatform", false);
+    __publicField(this, "lastPagesJson", "");
     this.rawOptions = userOptions;
     this.root = slash(viteRoot);
     debug.options("root", this.root);
@@ -784,7 +827,7 @@ class PageContext {
         }
       }
     }
-    await checkPagesJsonFile(this.resolvedPagesJSONPath);
+    checkPagesJsonFileSync(this.resolvedPagesJSONPath);
     this.options.onBeforeLoadUserConfig(this);
     await this.loadUserPagesConfig();
     this.options.onAfterLoadUserConfig(this);
@@ -806,29 +849,19 @@ class PageContext {
     pages.forEach((v) => pagesMap.set(v.path, v));
     this.pageMetaData = [...pagesMap.values()];
     this.options.onBeforeWriteFile(this);
-    const data = {
-      ...this.pagesGlobConfig,
-      pages: this.pageMetaData,
-      subPackages: this.subPageMetaData,
-      tabBar: await this.getTabBarMerged()
-    };
+    const data = await this.genratePagesJSON();
     const pagesJson = stringify(
       data,
       null,
       this.options.minify ? void 0 : await this.getIndent()
     ) + (await this.getEndOfLine() ? await this.getNewline() : "");
     this.generateDeclaration();
-    if (lsatPagesJson === pagesJson) {
+    if (this.lastPagesJson === pagesJson) {
       debug.pages("PagesJson Not have change");
       return false;
     }
-    const relase = await lockfile.lock(this.resolvedPagesJSONPath, { realpath: false });
-    try {
-      await fs.promises.writeFile(this.resolvedPagesJSONPath, pagesJson, { encoding: "utf-8" });
-    } finally {
-      await relase();
-    }
-    lsatPagesJson = pagesJson;
+    await writeFileWithLock(this.resolvedPagesJSONPath, pagesJson);
+    this.lastPagesJson = pagesJson;
     this.options.onAfterWriteFile(this);
     return true;
   }
@@ -849,6 +882,64 @@ 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 currentPlatform = platform.toUpperCase();
+    pageJson.pages = mergePlatformItems(pageJson?.pages, currentPlatform, this.pageMetaData, "path");
+    pageJson.subPackages = pageJson?.subPackages || new CommentArray();
+    const newSubPackages = /* @__PURE__ */ new Map();
+    for (const item of this.subPageMetaData) {
+      newSubPackages.set(item.root, item);
+    }
+    for (const existing of pageJson.subPackages) {
+      const sub = newSubPackages.get(existing.root);
+      if (sub) {
+        existing.pages = mergePlatformItems(existing.pages, currentPlatform, sub.pages, "path");
+        newSubPackages.delete(existing.root);
+      }
+    }
+    for (const [_2, newSub] of newSubPackages) {
+      pageJson.subPackages.push({
+        root: newSub.root,
+        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;
+      }
+    }
+    return pageJson;
+  }
   async readInfoFromPagesJSON() {
     const resolvedPagesJSONContent = await fs.promises.readFile(this.resolvedPagesJSONPath, { encoding: "utf-8" }).catch(() => "");
     this.resolvedPagesJSONIndent = detectIndent(resolvedPagesJSONContent).indent || "  ";
@@ -885,19 +976,125 @@ function getPagePaths(dir, options) {
   }));
   return pagePaths;
 }
+function mergePlatformItems(source, currentPlatform, items, uniqueKeyName) {
+  const src = source || new CommentArray();
+  currentPlatform = currentPlatform.toUpperCase();
+  let lastPlatforms = [];
+  for (const comment of src[Symbol.for("before:0")] || []) {
+    const trimed = comment.value.trim();
+    if (trimed.startsWith("GENERATED BY UNI-PAGES, PLATFORM:")) {
+      lastPlatforms = trimed.split(":")[1].split("||").map((s) => s.trim()).filter((s) => s !== currentPlatform).sort();
+    }
+  }
+  const tmpMap = /* @__PURE__ */ new Map();
+  for (let i = 0; i < src.length; i++) {
+    const item = src[i];
+    const uniqueKey = item[uniqueKeyName];
+    if (!uniqueKey) {
+      continue;
+    }
+    const beforeComments = src[Symbol.for(`before:${i}`)];
+    const ifdefComment = beforeComments?.find((c) => c.value.trim().startsWith("#ifdef"));
+    let platforms = [...lastPlatforms];
+    if (ifdefComment) {
+      const match = ifdefComment.value.match(/#ifdef\s+(.+)/);
+      if (match) {
+        platforms = match[1].split("||").map((p) => p.trim()).filter((s) => s !== currentPlatform).sort();
+      }
+    }
+    if (platforms.length === 0) {
+      continue;
+    }
+    const existing = tmpMap.get(uniqueKey) || [];
+    existing.push({ item, platforms, platformStr: platforms.join(" || ") });
+    tmpMap.set(uniqueKey, existing);
+  }
+  for (const item of items) {
+    const newItem = item;
+    const uniqueKey = item[uniqueKeyName];
+    if (!uniqueKey) {
+      continue;
+    }
+    if (!tmpMap.has(uniqueKey)) {
+      tmpMap.set(uniqueKey, [{
+        item: newItem,
+        platforms: [currentPlatform],
+        platformStr: currentPlatform
+      }]);
+      continue;
+    }
+    const existing = tmpMap.get(uniqueKey);
+    const newItemStr = JSON.stringify(newItem);
+    const equalObj = existing.find((val) => JSON.stringify(val.item) === newItemStr);
+    if (equalObj) {
+      equalObj.platforms.push(currentPlatform);
+      equalObj.platformStr = equalObj.platforms.join(" || ");
+    } else {
+      existing.push({
+        item: newItem,
+        platforms: [currentPlatform],
+        platformStr: currentPlatform
+      });
+    }
+  }
+  const result = new CommentArray();
+  const platformUsage = {};
+  tmpMap.forEach((val) => {
+    Object.values(val).forEach((v) => {
+      platformUsage[v.platformStr] = (platformUsage[v.platformStr] || 0) + 1;
+    });
+  });
+  const usageKeys = Object.keys(platformUsage);
+  const defaultPlatformStr = usageKeys.length ? usageKeys.reduce((a, b) => platformUsage[a] > platformUsage[b] ? a : b) : currentPlatform;
+  result[Symbol.for("before:0")] = [{
+    type: "LineComment",
+    value: ` GENERATED BY UNI-PAGES, PLATFORM: ${defaultPlatformStr}`,
+    inline: false,
+    loc: {
+      start: { line: 0, column: 0 },
+      end: { line: 0, column: 0 }
+    }
+  }];
+  for (const [_, list] of tmpMap) {
+    for (const { item, platformStr } of list) {
+      result.push(item);
+      if (platformStr !== defaultPlatformStr) {
+        result[Symbol.for(`before:${result.length - 1}`)] = [{
+          type: "LineComment",
+          value: ` #ifdef ${platformStr}`,
+          inline: false,
+          loc: {
+            start: { line: 0, column: 0 },
+            end: { line: 0, column: 0 }
+          }
+        }];
+        result[Symbol.for(`after:${result.length - 1}`)] = [{
+          type: "LineComment",
+          value: " #endif",
+          inline: false,
+          loc: {
+            start: { line: 0, column: 0 },
+            end: { line: 0, column: 0 }
+          }
+        }];
+      }
+    }
+  }
+  return result;
+}
 
 function defineUniPages(config) {
   return config;
 }
 
-async function VitePluginUniPages(userOptions = {}) {
+function VitePluginUniPages(userOptions = {}) {
   let ctx;
   const resolvedPagesJSONPath = path.join(
     process.env.VITE_ROOT_DIR || process.cwd(),
     userOptions.outDir ?? "src",
     OUTPUT_NAME
   );
-  await checkPagesJsonFile(resolvedPagesJSONPath);
+  checkPagesJsonFileSync(resolvedPagesJSONPath);
   return {
     name: "vite-plugin-uni-pages",
     enforce: "pre",
@@ -976,4 +1173,4 @@ async function VitePluginUniPages(userOptions = {}) {
   };
 }
 
-export { FILE_EXTENSIONS, MODULE_ID_VIRTUAL, OUTPUT_NAME, Page, PageContext, RESOLVED_MODULE_ID_VIRTUAL, VitePluginUniPages, babelGenerate, checkPagesJsonFile, debug, VitePluginUniPages as default, defineUniPages, execScript, extsToGlob, findImports, findMacro, getPageFiles, getRouteBlock, getRouteSfcBlock, invalidatePagesModule, isTargetFile, mergePageMetaDataArray, parseCustomBlock, parseSFC, resolveOptions, resolvePageDirs, tryPageMetaFromCustomBlock, tryPageMetaFromMacro };
+export { FILE_EXTENSIONS, MODULE_ID_VIRTUAL, OUTPUT_NAME, Page, PageContext, RESOLVED_MODULE_ID_VIRTUAL, VitePluginUniPages, babelGenerate, checkPagesJsonFileSync, debug, VitePluginUniPages as default, defineUniPages, execScript, extsToGlob, findImports, findMacro, getPageFiles, getRouteBlock, getRouteSfcBlock, invalidatePagesModule, isTargetFile, mergePageMetaDataArray, parseCustomBlock, parseSFC, resolveOptions, resolvePageDirs, sleep, tryPageMetaFromCustomBlock, tryPageMetaFromMacro, writeFileWithLock };

package/package.json

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