@uni-helper/vite-plugin-uni-pages 0.4.7 → 0.4.8

package/dist/index.cjs

@@ -312,27 +312,6 @@ function getDefaultExport(expr) {
 }
 /** Babel code generator for converting AST back to code */
 const babelGenerate = getDefaultExport(_babel_generator.default);
-function stripType(item) {
-	const { type, ...rest } = item;
-	return rest;
-}
-/**
-* Remove the internal `type` marker (`'home'` / `'page'`) from every element of
-* a `CommentArray` *in place* and return the same array.
-*
-* Unlike `items.map(stripType)`, this preserves the `Symbol.for('before:N')` /
-* `Symbol.for('after:N')` comment slots that `comment-json` attaches to the
-* array, so multi-platform `#ifdef` / `#endif` conditional-compilation blocks
-* survive serialization into pages.json. `.map()` rebuilds the array and drops
-* those symbol-keyed comments.
-*
-* @param items - CommentArray (or plain array) of page/tabBar metadata
-* @returns The same array reference, with `type` removed from each element
-*/
-function stripTypeInPlace(items) {
-	for (const item of items) if (item && "type" in item) delete item.type;
-	return items;
-}
 //#endregion
 //#region src/files.ts
 /**
@@ -1043,17 +1022,14 @@ var PageContext = class {
 	* @returns JSON string of main package page metadata
 	*/
 	resolveRoutes() {
-		return (0, comment_json.stringify)(this.pageMetaData.map(stripType), null, 2);
+		return (0, comment_json.stringify)(this.pageMetaData, null, 2);
 	}
 	/**
 	* Resolve sub-package route data to JSON string
 	* @returns JSON string of sub-package page metadata
 	*/
 	resolveSubRoutes() {
-		return (0, comment_json.stringify)(this.subPageMetaData.map(({ pages, ...rest }) => ({
-			...rest,
-			pages: pages.map(stripType)
-		})), null, 2);
+		return (0, comment_json.stringify)(this.subPageMetaData, null, 2);
 	}
 	/**
 	* Resolve tabBar configuration
@@ -1093,7 +1069,7 @@ var PageContext = class {
 		const { pages: oldPages, subPackages: oldSubPackages, tabBar: oldTabBar } = (0, comment_json.parse)(await node_fs.default.promises.readFile(this.resolvedPagesJSONPath, { encoding: "utf-8" }).catch(() => "") || "{}");
 		const { pages: _pages, subPackages: _subPackages, tabBar: _tabBar, ...pageJson } = this.pagesGlobConfig || {};
 		const currentPlatform = _uni_helper_uni_env.platform.toUpperCase();
-		pageJson.pages = stripTypeInPlace(mergePlatformItems(oldPages, currentPlatform, this.pageMetaData, "path"));
+		pageJson.pages = mergePlatformItems(oldPages, currentPlatform, this.pageMetaData, "path");
 		if (pageJson.pages && pageJson.pages.length > 0) {
 			const pagesArray = pageJson.pages;
 			const homeIndex = pagesArray.findIndex((page) => page.type === "home");
@@ -1108,7 +1084,7 @@ var PageContext = class {
 		for (const existing of pageJson.subPackages) {
 			const sub = newSubPackages.get(existing.root);
 			if (sub) {
-				existing.pages = stripTypeInPlace(mergePlatformItems(existing.pages, currentPlatform, sub.pages, "path"));
+				existing.pages = mergePlatformItems(existing.pages, currentPlatform, sub.pages, "path");
 				if (sub.plugins) existing.plugins = sub.plugins;
 				newSubPackages.delete(existing.root);
 			}
@@ -1116,7 +1092,7 @@ var PageContext = class {
 		for (const [_, newSub] of newSubPackages) {
 			const subPackage = {
 				root: newSub.root,
-				pages: stripTypeInPlace(mergePlatformItems(void 0, currentPlatform, newSub.pages, "path"))
+				pages: mergePlatformItems(void 0, currentPlatform, newSub.pages, "path")
 			};
 			if (newSub.plugins) subPackage.plugins = newSub.plugins;
 			pageJson.subPackages.push(subPackage);
@@ -1186,6 +1162,13 @@ function mergePlatformItems(source, currentPlatform, items, uniqueKeyName) {
 		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 stringifyForCompare = (val) => {
+		if (val && typeof val === "object" && "type" in val) {
+			const { type: _type, ...rest } = val;
+			return JSON.stringify(rest);
+		}
+		return JSON.stringify(val);
+	};
 	const tmpMap = /* @__PURE__ */ new Map();
 	for (let i = 0; i < src.length; i++) {
 		const item = src[i];
@@ -1201,19 +1184,12 @@ function mergePlatformItems(source, currentPlatform, items, uniqueKeyName) {
 		const existing = tmpMap.get(uniqueKey) || [];
 		existing.push({
 			item,
-			itemStr: JSON.stringify(item),
+			itemStr: stringifyForCompare(item),
 			platforms,
 			platformStr: platforms.join(" || ")
 		});
 		tmpMap.set(uniqueKey, existing);
 	}
-	const stringifyForCompare = (val) => {
-		if (val && typeof val === "object" && "type" in val) {
-			const { type: _type, ...rest } = val;
-			return JSON.stringify(rest);
-		}
-		return JSON.stringify(val);
-	};
 	for (const item of items) {
 		const newItem = item;
 		const uniqueKey = item[uniqueKeyName];
@@ -1418,8 +1394,6 @@ exports.parseSFC = parseSFC;
 exports.resolveOptions = resolveOptions;
 exports.resolvePageDirs = resolvePageDirs;
 exports.sleep = sleep;
-exports.stripType = stripType;
-exports.stripTypeInPlace = stripTypeInPlace;
 exports.tryPageMetaFromMacro = tryPageMetaFromMacro;
 exports.withFileLock = withFileLock;
 exports.writeFileWithLock = writeFileWithLock;

package/dist/index.d.cts

@@ -336,21 +336,6 @@ declare function parseCode(options: {
 declare function sleep(ms: number): Promise<unknown>;
 /** Babel code generator for converting AST back to code */
 declare const babelGenerate: typeof babelGenerator;
-declare function stripType<T extends Record<string, unknown>>(item: T): Omit<T, 'type'>;
-/**
- * Remove the internal `type` marker (`'home'` / `'page'`) from every element of
- * a `CommentArray` *in place* and return the same array.
- *
- * Unlike `items.map(stripType)`, this preserves the `Symbol.for('before:N')` /
- * `Symbol.for('after:N')` comment slots that `comment-json` attaches to the
- * array, so multi-platform `#ifdef` / `#endif` conditional-compilation blocks
- * survive serialization into pages.json. `.map()` rebuilds the array and drops
- * those symbol-keyed comments.
- *
- * @param items - CommentArray (or plain array) of page/tabBar metadata
- * @returns The same array reference, with `type` removed from each element
- */
-declare function stripTypeInPlace<T extends Record<string, unknown>>(items: T[]): T[];
 //#endregion
 //#region src/types.d.ts
 /** Debug log type, corresponding to methods in the debug object */
@@ -565,7 +550,7 @@ declare function resolveOptions(userOptions: UserOptions, viteRoot?: string): Re
  */
 declare function resolvePageDirs(dir: string, root: string, exclude: string[]): string[];
 declare namespace index_d_exports {
-  export { ConfigSource, DefinePage, ExcludeIndexSignature, FILE_EXTENSIONS, MODULE_ID_VIRTUAL, MaybeCallable, MaybePromise, MaybePromiseCallable, OUTPUT_NAME, Options, Page, PageContext, PageMetaDatum, PagePath, RESOLVED_MODULE_ID_VIRTUAL, ResolvedOptions, SubPackageConfig, SubPageMetaDatum, UserOptions, UserPageMeta, UserTabBarItem, VitePluginUniPages, babelGenerate, checkPagesJsonFileSync, debug, debugType, VitePluginUniPages as default, definePage, defineUniPages, extsToGlob, findImports, findMacro, getPageFiles, invalidatePagesModule, isTargetFile, mergePageMetaDataArray, parseCode, parseSFC, resolveOptions, resolvePageDirs, sleep, stripType, stripTypeInPlace, tryPageMetaFromMacro, withFileLock, writeFileWithLock };
+  export { ConfigSource, DefinePage, ExcludeIndexSignature, FILE_EXTENSIONS, MODULE_ID_VIRTUAL, MaybeCallable, MaybePromise, MaybePromiseCallable, OUTPUT_NAME, Options, Page, PageContext, PageMetaDatum, PagePath, RESOLVED_MODULE_ID_VIRTUAL, ResolvedOptions, SubPackageConfig, SubPageMetaDatum, UserOptions, UserPageMeta, UserTabBarItem, VitePluginUniPages, babelGenerate, checkPagesJsonFileSync, debug, debugType, VitePluginUniPages as default, definePage, defineUniPages, extsToGlob, findImports, findMacro, getPageFiles, invalidatePagesModule, isTargetFile, mergePageMetaDataArray, parseCode, parseSFC, resolveOptions, resolvePageDirs, sleep, tryPageMetaFromMacro, withFileLock, writeFileWithLock };
 }
 /**
  * vite-plugin-uni-pages plugin main entry
@@ -581,4 +566,4 @@ declare namespace index_d_exports {
  */
 declare function VitePluginUniPages(userOptions?: UserOptions): Plugin;
 //#endregion
-export { ConfigSource, type DefinePage, type ExcludeIndexSignature, FILE_EXTENSIONS, MODULE_ID_VIRTUAL, type MaybeCallable, type MaybePromise, type MaybePromiseCallable, OUTPUT_NAME, Options, Page, PageContext, type PageMetaDatum, PagePath, RESOLVED_MODULE_ID_VIRTUAL, ResolvedOptions, SubPackageConfig, type SubPageMetaDatum, UserOptions, type UserPageMeta, type UserTabBarItem, VitePluginUniPages, VitePluginUniPages as default, babelGenerate, checkPagesJsonFileSync, debug, debugType, type definePage, defineUniPages, extsToGlob, findImports, findMacro, getPageFiles, invalidatePagesModule, isTargetFile, mergePageMetaDataArray, parseCode, parseSFC, resolveOptions, resolvePageDirs, sleep, stripType, stripTypeInPlace, tryPageMetaFromMacro, withFileLock, writeFileWithLock };
+export { ConfigSource, type DefinePage, type ExcludeIndexSignature, FILE_EXTENSIONS, MODULE_ID_VIRTUAL, type MaybeCallable, type MaybePromise, type MaybePromiseCallable, OUTPUT_NAME, Options, Page, PageContext, type PageMetaDatum, PagePath, RESOLVED_MODULE_ID_VIRTUAL, ResolvedOptions, SubPackageConfig, type SubPageMetaDatum, UserOptions, type UserPageMeta, type UserTabBarItem, VitePluginUniPages, VitePluginUniPages as default, babelGenerate, checkPagesJsonFileSync, debug, debugType, type definePage, defineUniPages, extsToGlob, findImports, findMacro, getPageFiles, invalidatePagesModule, isTargetFile, mergePageMetaDataArray, parseCode, parseSFC, resolveOptions, resolvePageDirs, sleep, tryPageMetaFromMacro, withFileLock, writeFileWithLock };

package/dist/index.d.mts

@@ -337,21 +337,6 @@ declare function parseCode(options: {
 declare function sleep(ms: number): Promise<unknown>;
 /** Babel code generator for converting AST back to code */
 declare const babelGenerate: typeof babelGenerator;
-declare function stripType<T extends Record<string, unknown>>(item: T): Omit<T, 'type'>;
-/**
- * Remove the internal `type` marker (`'home'` / `'page'`) from every element of
- * a `CommentArray` *in place* and return the same array.
- *
- * Unlike `items.map(stripType)`, this preserves the `Symbol.for('before:N')` /
- * `Symbol.for('after:N')` comment slots that `comment-json` attaches to the
- * array, so multi-platform `#ifdef` / `#endif` conditional-compilation blocks
- * survive serialization into pages.json. `.map()` rebuilds the array and drops
- * those symbol-keyed comments.
- *
- * @param items - CommentArray (or plain array) of page/tabBar metadata
- * @returns The same array reference, with `type` removed from each element
- */
-declare function stripTypeInPlace<T extends Record<string, unknown>>(items: T[]): T[];
 //#endregion
 //#region src/types.d.ts
 /** Debug log type, corresponding to methods in the debug object */
@@ -566,7 +551,7 @@ declare function resolveOptions(userOptions: UserOptions, viteRoot?: string): Re
  */
 declare function resolvePageDirs(dir: string, root: string, exclude: string[]): string[];
 declare namespace index_d_exports {
-  export { ConfigSource, DefinePage, ExcludeIndexSignature, FILE_EXTENSIONS, MODULE_ID_VIRTUAL, MaybeCallable, MaybePromise, MaybePromiseCallable, OUTPUT_NAME, Options, Page, PageContext, PageMetaDatum, PagePath, RESOLVED_MODULE_ID_VIRTUAL, ResolvedOptions, SubPackageConfig, SubPageMetaDatum, UserOptions, UserPageMeta, UserTabBarItem, VitePluginUniPages, babelGenerate, checkPagesJsonFileSync, debug, debugType, VitePluginUniPages as default, definePage, defineUniPages, extsToGlob, findImports, findMacro, getPageFiles, invalidatePagesModule, isTargetFile, mergePageMetaDataArray, parseCode, parseSFC, resolveOptions, resolvePageDirs, sleep, stripType, stripTypeInPlace, tryPageMetaFromMacro, withFileLock, writeFileWithLock };
+  export { ConfigSource, DefinePage, ExcludeIndexSignature, FILE_EXTENSIONS, MODULE_ID_VIRTUAL, MaybeCallable, MaybePromise, MaybePromiseCallable, OUTPUT_NAME, Options, Page, PageContext, PageMetaDatum, PagePath, RESOLVED_MODULE_ID_VIRTUAL, ResolvedOptions, SubPackageConfig, SubPageMetaDatum, UserOptions, UserPageMeta, UserTabBarItem, VitePluginUniPages, babelGenerate, checkPagesJsonFileSync, debug, debugType, VitePluginUniPages as default, definePage, defineUniPages, extsToGlob, findImports, findMacro, getPageFiles, invalidatePagesModule, isTargetFile, mergePageMetaDataArray, parseCode, parseSFC, resolveOptions, resolvePageDirs, sleep, tryPageMetaFromMacro, withFileLock, writeFileWithLock };
 }
 /**
  * vite-plugin-uni-pages plugin main entry
@@ -582,4 +567,4 @@ declare namespace index_d_exports {
  */
 declare function VitePluginUniPages(userOptions?: UserOptions): Plugin;
 //#endregion
-export { ConfigSource, type DefinePage, type ExcludeIndexSignature, FILE_EXTENSIONS, MODULE_ID_VIRTUAL, type MaybeCallable, type MaybePromise, type MaybePromiseCallable, OUTPUT_NAME, Options, Page, PageContext, type PageMetaDatum, PagePath, RESOLVED_MODULE_ID_VIRTUAL, ResolvedOptions, SubPackageConfig, type SubPageMetaDatum, UserOptions, type UserPageMeta, type UserTabBarItem, VitePluginUniPages, VitePluginUniPages as default, babelGenerate, checkPagesJsonFileSync, debug, debugType, type definePage, defineUniPages, extsToGlob, findImports, findMacro, getPageFiles, invalidatePagesModule, isTargetFile, mergePageMetaDataArray, parseCode, parseSFC, resolveOptions, resolvePageDirs, sleep, stripType, stripTypeInPlace, tryPageMetaFromMacro, withFileLock, writeFileWithLock };
+export { ConfigSource, type DefinePage, type ExcludeIndexSignature, FILE_EXTENSIONS, MODULE_ID_VIRTUAL, type MaybeCallable, type MaybePromise, type MaybePromiseCallable, OUTPUT_NAME, Options, Page, PageContext, type PageMetaDatum, PagePath, RESOLVED_MODULE_ID_VIRTUAL, ResolvedOptions, SubPackageConfig, type SubPageMetaDatum, UserOptions, type UserPageMeta, type UserTabBarItem, VitePluginUniPages, VitePluginUniPages as default, babelGenerate, checkPagesJsonFileSync, debug, debugType, type definePage, defineUniPages, extsToGlob, findImports, findMacro, getPageFiles, invalidatePagesModule, isTargetFile, mergePageMetaDataArray, parseCode, parseSFC, resolveOptions, resolvePageDirs, sleep, tryPageMetaFromMacro, withFileLock, writeFileWithLock };

package/dist/index.mjs

@@ -271,27 +271,6 @@ function getDefaultExport(expr) {
 }
 /** Babel code generator for converting AST back to code */
 const babelGenerate = getDefaultExport(babelGenerator);
-function stripType(item) {
-	const { type, ...rest } = item;
-	return rest;
-}
-/**
-* Remove the internal `type` marker (`'home'` / `'page'`) from every element of
-* a `CommentArray` *in place* and return the same array.
-*
-* Unlike `items.map(stripType)`, this preserves the `Symbol.for('before:N')` /
-* `Symbol.for('after:N')` comment slots that `comment-json` attaches to the
-* array, so multi-platform `#ifdef` / `#endif` conditional-compilation blocks
-* survive serialization into pages.json. `.map()` rebuilds the array and drops
-* those symbol-keyed comments.
-*
-* @param items - CommentArray (or plain array) of page/tabBar metadata
-* @returns The same array reference, with `type` removed from each element
-*/
-function stripTypeInPlace(items) {
-	for (const item of items) if (item && "type" in item) delete item.type;
-	return items;
-}
 //#endregion
 //#region src/files.ts
 /**
@@ -1002,17 +981,14 @@ var PageContext = class {
 	* @returns JSON string of main package page metadata
 	*/
 	resolveRoutes() {
-		return stringify(this.pageMetaData.map(stripType), null, 2);
+		return stringify(this.pageMetaData, null, 2);
 	}
 	/**
 	* Resolve sub-package route data to JSON string
 	* @returns JSON string of sub-package page metadata
 	*/
 	resolveSubRoutes() {
-		return stringify(this.subPageMetaData.map(({ pages, ...rest }) => ({
-			...rest,
-			pages: pages.map(stripType)
-		})), null, 2);
+		return stringify(this.subPageMetaData, null, 2);
 	}
 	/**
 	* Resolve tabBar configuration
@@ -1052,7 +1028,7 @@ var PageContext = class {
 		const { pages: oldPages, subPackages: oldSubPackages, tabBar: oldTabBar } = parse(await fs.promises.readFile(this.resolvedPagesJSONPath, { encoding: "utf-8" }).catch(() => "") || "{}");
 		const { pages: _pages, subPackages: _subPackages, tabBar: _tabBar, ...pageJson } = this.pagesGlobConfig || {};
 		const currentPlatform = platform.toUpperCase();
-		pageJson.pages = stripTypeInPlace(mergePlatformItems(oldPages, currentPlatform, this.pageMetaData, "path"));
+		pageJson.pages = mergePlatformItems(oldPages, currentPlatform, this.pageMetaData, "path");
 		if (pageJson.pages && pageJson.pages.length > 0) {
 			const pagesArray = pageJson.pages;
 			const homeIndex = pagesArray.findIndex((page) => page.type === "home");
@@ -1067,7 +1043,7 @@ var PageContext = class {
 		for (const existing of pageJson.subPackages) {
 			const sub = newSubPackages.get(existing.root);
 			if (sub) {
-				existing.pages = stripTypeInPlace(mergePlatformItems(existing.pages, currentPlatform, sub.pages, "path"));
+				existing.pages = mergePlatformItems(existing.pages, currentPlatform, sub.pages, "path");
 				if (sub.plugins) existing.plugins = sub.plugins;
 				newSubPackages.delete(existing.root);
 			}
@@ -1075,7 +1051,7 @@ var PageContext = class {
 		for (const [_, newSub] of newSubPackages) {
 			const subPackage = {
 				root: newSub.root,
-				pages: stripTypeInPlace(mergePlatformItems(void 0, currentPlatform, newSub.pages, "path"))
+				pages: mergePlatformItems(void 0, currentPlatform, newSub.pages, "path")
 			};
 			if (newSub.plugins) subPackage.plugins = newSub.plugins;
 			pageJson.subPackages.push(subPackage);
@@ -1145,6 +1121,13 @@ function mergePlatformItems(source, currentPlatform, items, uniqueKeyName) {
 		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 stringifyForCompare = (val) => {
+		if (val && typeof val === "object" && "type" in val) {
+			const { type: _type, ...rest } = val;
+			return JSON.stringify(rest);
+		}
+		return JSON.stringify(val);
+	};
 	const tmpMap = /* @__PURE__ */ new Map();
 	for (let i = 0; i < src.length; i++) {
 		const item = src[i];
@@ -1160,19 +1143,12 @@ function mergePlatformItems(source, currentPlatform, items, uniqueKeyName) {
 		const existing = tmpMap.get(uniqueKey) || [];
 		existing.push({
 			item,
-			itemStr: JSON.stringify(item),
+			itemStr: stringifyForCompare(item),
 			platforms,
 			platformStr: platforms.join(" || ")
 		});
 		tmpMap.set(uniqueKey, existing);
 	}
-	const stringifyForCompare = (val) => {
-		if (val && typeof val === "object" && "type" in val) {
-			const { type: _type, ...rest } = val;
-			return JSON.stringify(rest);
-		}
-		return JSON.stringify(val);
-	};
 	for (const item of items) {
 		const newItem = item;
 		const uniqueKey = item[uniqueKeyName];
@@ -1353,4 +1329,4 @@ function VitePluginUniPages(userOptions = {}) {
 	};
 }
 //#endregion
-export { FILE_EXTENSIONS, MODULE_ID_VIRTUAL, OUTPUT_NAME, Page, PageContext, RESOLVED_MODULE_ID_VIRTUAL, VitePluginUniPages, VitePluginUniPages as default, babelGenerate, checkPagesJsonFileSync, debug, defineUniPages, extsToGlob, findImports, findMacro, getPageFiles, invalidatePagesModule, isTargetFile, mergePageMetaDataArray, parseCode, parseSFC, resolveOptions, resolvePageDirs, sleep, stripType, stripTypeInPlace, tryPageMetaFromMacro, withFileLock, writeFileWithLock };
+export { FILE_EXTENSIONS, MODULE_ID_VIRTUAL, OUTPUT_NAME, Page, PageContext, RESOLVED_MODULE_ID_VIRTUAL, VitePluginUniPages, VitePluginUniPages as default, babelGenerate, checkPagesJsonFileSync, debug, defineUniPages, extsToGlob, findImports, findMacro, getPageFiles, invalidatePagesModule, isTargetFile, mergePageMetaDataArray, parseCode, parseSFC, resolveOptions, resolvePageDirs, sleep, tryPageMetaFromMacro, withFileLock, writeFileWithLock };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@uni-helper/vite-plugin-uni-pages",
   "type": "module",
-  "version": "0.4.7",
+  "version": "0.4.8",
   "description": "File system based routing for uni-app applications using Vite",
   "author": "KeJun",
   "maintainers": [
@@ -72,7 +72,7 @@
     "unconfig": "^7.5.0",
     "write-file-atomic": "^7.0.1",
     "yaml": "^2.9.0",
-    "@uni-helper/uni-pages-types": "0.4.7"
+    "@uni-helper/uni-pages-types": "0.4.8"
   },
   "devDependencies": {
     "@antfu/utils": "^9.3.0",