vite-plugin-uni-inject 0.3.0 → 0.4.0

package/dist/index.cjs

@@ -24,12 +24,10 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 let _babel_parser = require("@babel/parser");
 let _vue_compiler_sfc = require("@vue/compiler-sfc");
 let fs = require("fs");
-fs = __toESM(fs);
+fs = __toESM(fs, 1);
 let path = require("path");
-path = __toESM(path);
-let magic_string = require("magic-string");
-magic_string = __toESM(magic_string);
-//#region src/inject.ts
+path = __toESM(path, 1);
+//#region src/modules/inject/index.ts
 /**
 * 注入代码插件
 */
@@ -84,25 +82,35 @@ function uniInject(opts) {
 				const start = newDescriptor.scriptSetup.loc.start.offset;
 				const end = newDescriptor.scriptSetup.loc.end.offset;
 				const scriptCode = newDescriptor.scriptSetup.content;
-				const s = new magic_string.default(scriptCode);
 				const ast = (0, _babel_parser.parse)(scriptCode, {
 					sourceType: "module",
 					plugins: ["typescript"]
 				});
 				const imports = [];
-				for (const node of ast.program.body) if (node.type === "ImportDeclaration") {
-					imports.push(scriptCode.slice(node.start, node.end));
-					s.remove(node.start, node.end + 1);
+				for (const node of ast.program.body) if (node.type === "ImportDeclaration" && typeof node.start === "number" && typeof node.end === "number") imports.push({
+					code: scriptCode.slice(node.start, node.end),
+					start: node.start,
+					end: node.end
+				});
+				let nextScriptCode = scriptCode;
+				if (imports.length) {
+					const ranges = [...imports].sort((a, b) => b.start - a.start);
+					for (const { start: rangeStart, end: rangeEnd } of ranges) {
+						let removeEnd = rangeEnd;
+						if (nextScriptCode.startsWith("\r\n", removeEnd)) removeEnd += 2;
+						else if (nextScriptCode[removeEnd] === "\n") removeEnd += 1;
+						nextScriptCode = nextScriptCode.slice(0, rangeStart) + nextScriptCode.slice(removeEnd);
+					}
+					nextScriptCode = `\n${imports.map((item) => item.code).join("\n")}${nextScriptCode}`;
 				}
-				if (imports.length) s.prepend("\n" + imports.join("\n"));
-				newCode = newCode.slice(0, start) + s.toString() + newCode.slice(end);
+				newCode = newCode.slice(0, start) + nextScriptCode + newCode.slice(end);
 			}
 			return { code: newCode };
 		}
 	};
 }
 //#endregion
-//#region src/auto-pages.ts
+//#region src/modules/auto-pages/index.ts
 function toPosixPath(value) {
 	return value.replace(/\\/g, "/");
 }
@@ -169,6 +177,8 @@ function hasPagesJsonChanged(current, next) {
 	});
 }
 function getPagesByFileRoute(routes, pagesJson, subPackageRoots) {
+	const originPages = pagesJson.pages ?? [];
+	const originSubPackages = pagesJson.subPackages ?? [];
 	const mainRoutes = [];
 	const subRouteMap = /* @__PURE__ */ new Map();
 	const normalizedSubRoots = subPackageRoots.map(normalizeDir);
@@ -183,12 +193,17 @@ function getPagesByFileRoute(routes, pagesJson, subPackageRoots) {
 			subRouteMap.set(matchedRoot, list);
 		} else mainRoutes.push(route);
 	}
-	const pages = mergePages(mainRoutes, pagesJson.pages ?? []);
-	const existSubs = pagesJson.subPackages ?? [];
+	const homePage = originPages[0]?.path;
+	if (mainRoutes.includes(homePage)) {
+		const idx = mainRoutes.indexOf(homePage);
+		mainRoutes.splice(idx, 1);
+		mainRoutes.unshift(homePage);
+	}
+	const pages = mergePages(mainRoutes, originPages);
 	const subPackages = normalizedSubRoots.map((root) => {
 		return {
 			root,
-			pages: mergePages(subRouteMap.get(root) ?? [], existSubs.find((s) => {
+			pages: mergePages(subRouteMap.get(root) ?? [], originSubPackages.find((s) => {
 				return normalizeDir(s.root) === root;
 			})?.pages ?? [])
 		};
@@ -234,11 +249,13 @@ function uniAutoPages(opts) {
 			if (!pagesJson) return;
 			const routes = collectFileRoutes(srcRoot, getScanDirs(dir, subPackages));
 			const { merged, changed } = getPagesByFileRoute(routes, pagesJson, subPackages);
-			if (changed) fs.default.writeFileSync(pagesJsonPath, JSON.stringify(merged, null, 2) + "\n");
-			if (dts) {
-				const dtsFilePath = resolveDtsFilePath(srcRoot, dts);
-				const dtsContent = buildRouteDts(routes);
-				fs.default.writeFileSync(dtsFilePath, dtsContent);
+			if (changed) {
+				if (dts) {
+					const dtsFilePath = resolveDtsFilePath(srcRoot, dts);
+					const dtsContent = buildRouteDts(routes);
+					fs.default.writeFileSync(dtsFilePath, dtsContent);
+				}
+				fs.default.writeFileSync(pagesJsonPath, JSON.stringify(merged, null, 2) + "\n");
 			}
 		}
 	};

package/dist/index.d.cts

@@ -3,7 +3,7 @@
 interface InjectPluginOptions {
   /**
    * 注入的文件路径
-   * @default 'src/App.inject.vue'
+   * @default './App.inject.vue'
    */
   path?: string;
 }
@@ -14,19 +14,19 @@ interface AutoPagesPluginOptions {
    * @default 'pages'
    */
   dir?: string;
+  /**
+   * 输出类型
+   * @default './uni-pages.d.ts'
+   */
+  dts?: string;
   /**
    * 分包目录
    * @default []
    */
   subPackages?: string[];
-  /**
-   * 生成类型声明
-   * @default 'src/uni-pages.d.ts'
-   */
-  dts?: string;
 }
 //#endregion
-//#region src/inject.d.ts
+//#region src/modules/inject/index.d.ts
 /**
  * 注入代码插件
  */
@@ -41,7 +41,7 @@ declare function uniInject(opts?: InjectPluginOptions): {
   } | undefined;
 };
 //#endregion
-//#region src/auto-pages.d.ts
+//#region src/modules/auto-pages/index.d.ts
 /**
  * 自动补全 pages.json 插件
  */

package/dist/index.d.mts

@@ -3,7 +3,7 @@
 interface InjectPluginOptions {
   /**
    * 注入的文件路径
-   * @default 'src/App.inject.vue'
+   * @default './App.inject.vue'
    */
   path?: string;
 }
@@ -14,19 +14,19 @@ interface AutoPagesPluginOptions {
    * @default 'pages'
    */
   dir?: string;
+  /**
+   * 输出类型
+   * @default './uni-pages.d.ts'
+   */
+  dts?: string;
   /**
    * 分包目录
    * @default []
    */
   subPackages?: string[];
-  /**
-   * 生成类型声明
-   * @default 'src/uni-pages.d.ts'
-   */
-  dts?: string;
 }
 //#endregion
-//#region src/inject.d.ts
+//#region src/modules/inject/index.d.ts
 /**
  * 注入代码插件
  */
@@ -41,7 +41,7 @@ declare function uniInject(opts?: InjectPluginOptions): {
   } | undefined;
 };
 //#endregion
-//#region src/auto-pages.d.ts
+//#region src/modules/auto-pages/index.d.ts
 /**
  * 自动补全 pages.json 插件
  */

package/dist/index.mjs

@@ -2,8 +2,7 @@ import { parse } from "@babel/parser";
 import { parse as parse$1 } from "@vue/compiler-sfc";
 import fs from "fs";
 import path from "path";
-import MagicString from "magic-string";
-//#region src/inject.ts
+//#region src/modules/inject/index.ts
 /**
 * 注入代码插件
 */
@@ -58,25 +57,35 @@ function uniInject(opts) {
 				const start = newDescriptor.scriptSetup.loc.start.offset;
 				const end = newDescriptor.scriptSetup.loc.end.offset;
 				const scriptCode = newDescriptor.scriptSetup.content;
-				const s = new MagicString(scriptCode);
 				const ast = parse(scriptCode, {
 					sourceType: "module",
 					plugins: ["typescript"]
 				});
 				const imports = [];
-				for (const node of ast.program.body) if (node.type === "ImportDeclaration") {
-					imports.push(scriptCode.slice(node.start, node.end));
-					s.remove(node.start, node.end + 1);
+				for (const node of ast.program.body) if (node.type === "ImportDeclaration" && typeof node.start === "number" && typeof node.end === "number") imports.push({
+					code: scriptCode.slice(node.start, node.end),
+					start: node.start,
+					end: node.end
+				});
+				let nextScriptCode = scriptCode;
+				if (imports.length) {
+					const ranges = [...imports].sort((a, b) => b.start - a.start);
+					for (const { start: rangeStart, end: rangeEnd } of ranges) {
+						let removeEnd = rangeEnd;
+						if (nextScriptCode.startsWith("\r\n", removeEnd)) removeEnd += 2;
+						else if (nextScriptCode[removeEnd] === "\n") removeEnd += 1;
+						nextScriptCode = nextScriptCode.slice(0, rangeStart) + nextScriptCode.slice(removeEnd);
+					}
+					nextScriptCode = `\n${imports.map((item) => item.code).join("\n")}${nextScriptCode}`;
 				}
-				if (imports.length) s.prepend("\n" + imports.join("\n"));
-				newCode = newCode.slice(0, start) + s.toString() + newCode.slice(end);
+				newCode = newCode.slice(0, start) + nextScriptCode + newCode.slice(end);
 			}
 			return { code: newCode };
 		}
 	};
 }
 //#endregion
-//#region src/auto-pages.ts
+//#region src/modules/auto-pages/index.ts
 function toPosixPath(value) {
 	return value.replace(/\\/g, "/");
 }
@@ -143,6 +152,8 @@ function hasPagesJsonChanged(current, next) {
 	});
 }
 function getPagesByFileRoute(routes, pagesJson, subPackageRoots) {
+	const originPages = pagesJson.pages ?? [];
+	const originSubPackages = pagesJson.subPackages ?? [];
 	const mainRoutes = [];
 	const subRouteMap = /* @__PURE__ */ new Map();
 	const normalizedSubRoots = subPackageRoots.map(normalizeDir);
@@ -157,12 +168,17 @@ function getPagesByFileRoute(routes, pagesJson, subPackageRoots) {
 			subRouteMap.set(matchedRoot, list);
 		} else mainRoutes.push(route);
 	}
-	const pages = mergePages(mainRoutes, pagesJson.pages ?? []);
-	const existSubs = pagesJson.subPackages ?? [];
+	const homePage = originPages[0]?.path;
+	if (mainRoutes.includes(homePage)) {
+		const idx = mainRoutes.indexOf(homePage);
+		mainRoutes.splice(idx, 1);
+		mainRoutes.unshift(homePage);
+	}
+	const pages = mergePages(mainRoutes, originPages);
 	const subPackages = normalizedSubRoots.map((root) => {
 		return {
 			root,
-			pages: mergePages(subRouteMap.get(root) ?? [], existSubs.find((s) => {
+			pages: mergePages(subRouteMap.get(root) ?? [], originSubPackages.find((s) => {
 				return normalizeDir(s.root) === root;
 			})?.pages ?? [])
 		};
@@ -208,11 +224,13 @@ function uniAutoPages(opts) {
 			if (!pagesJson) return;
 			const routes = collectFileRoutes(srcRoot, getScanDirs(dir, subPackages));
 			const { merged, changed } = getPagesByFileRoute(routes, pagesJson, subPackages);
-			if (changed) fs.writeFileSync(pagesJsonPath, JSON.stringify(merged, null, 2) + "\n");
-			if (dts) {
-				const dtsFilePath = resolveDtsFilePath(srcRoot, dts);
-				const dtsContent = buildRouteDts(routes);
-				fs.writeFileSync(dtsFilePath, dtsContent);
+			if (changed) {
+				if (dts) {
+					const dtsFilePath = resolveDtsFilePath(srcRoot, dts);
+					const dtsContent = buildRouteDts(routes);
+					fs.writeFileSync(dtsFilePath, dtsContent);
+				}
+				fs.writeFileSync(pagesJsonPath, JSON.stringify(merged, null, 2) + "\n");
 			}
 		}
 	};

package/package.json

@@ -4,7 +4,7 @@
   "author": "Kriac",
   "license": "MIT",
   "type": "module",
-  "version": "0.3.0",
+  "version": "0.4.0",
   "homepage": "https://github.com/Kriac/vite-plugin-uni-inject",
   "repository": {
     "type": "git",
@@ -20,12 +20,11 @@
   },
   "dependencies": {
     "@vue/compiler-sfc": "3.5.27",
-    "@babel/parser": "7.29.0",
-    "magic-string": "0.30.21"
+    "@babel/parser": "7.29.0"
   },
   "devDependencies": {
     "@types/node": "25.0.10",
-    "tsdown": "0.21.0",
+    "tsdown": "0.22.0",
     "vue-tsc": "3.2.1"
   },
   "files": [