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

package/dist/index.cjs

@@ -164,7 +164,7 @@ function mergePageMetaDataArray(pageMetaData) {
   }
   return result;
 }
-async function execScript(options) {
+async function parseCode(options) {
   const { imports = [], code, filename } = options;
   let jsCode = "";
   try {
@@ -215,7 +215,24 @@ async function execScript(options) {
       __filename: filename,
       __dirname: dir,
       require: node_module.createRequire(dir),
-      import: (id) => import(id)
+      import: (id) => import(id),
+      // 定时器相关
+      setTimeout,
+      clearTimeout,
+      setInterval,
+      clearInterval,
+      setImmediate,
+      clearImmediate,
+      // 控制台相关
+      console,
+      // URL 处理
+      URL,
+      URLSearchParams,
+      // 进程和性能相关
+      performance,
+      // 全局对象引用
+      global: globalThis,
+      globalThis
     };
     const script = new vm__default.Script(jsCode, { filename });
     await script.runInNewContext(vmContext, {
@@ -223,10 +240,7 @@ async function execScript(options) {
       // 设置超时避免长时间运行
     });
     const result = vmContext.exports.default || vmContext.exports;
-    if (typeof result === "function") {
-      return Promise.resolve(result());
-    }
-    return Promise.resolve(result);
+    return result;
   } catch (error) {
     throw new Error(`EXEC SCRIPT FAIL IN ${filename}: ${error.message} 
 
@@ -473,7 +487,7 @@ class Page {
     if (forceUpdate || !this.meta) {
       await this.read();
     }
-    const { path, tabBar: _, ...others } = this.meta;
+    const { path, tabBar: _, ...others } = this.meta || {};
     return {
       path: path ?? this.uri,
       ...others
@@ -550,14 +564,15 @@ async function tryPageMetaFromMacro(sfc) {
     const imports = findImports(ast.body).filter((imp) => !!imp.specifiers.length).map((imp) => babelGenerate(imp).code);
     const [macroOption] = macro.arguments;
     const code = babelGenerate(macroOption).code;
-    const result = await execScript({
+    const parsed = await parseCode({
       imports,
       code,
       filename: sfc.filename
     });
+    const res = typeof parsed === "function" ? await Promise.resolve(parsed()) : await Promise.resolve(parsed);
     return {
       type: "page",
-      ...result
+      ...res
     };
   }
   return void 0;
@@ -1220,7 +1235,6 @@ exports.checkPagesJsonFileSync = checkPagesJsonFileSync;
 exports.debug = debug;
 exports.default = VitePluginUniPages;
 exports.defineUniPages = defineUniPages;
-exports.execScript = execScript;
 exports.extsToGlob = extsToGlob;
 exports.findImports = findImports;
 exports.findMacro = findMacro;
@@ -1230,6 +1244,7 @@ exports.getRouteSfcBlock = getRouteSfcBlock;
 exports.invalidatePagesModule = invalidatePagesModule;
 exports.isTargetFile = isTargetFile;
 exports.mergePageMetaDataArray = mergePageMetaDataArray;
+exports.parseCode = parseCode;
 exports.parseCustomBlock = parseCustomBlock;
 exports.parseSFC = parseSFC;
 exports.resolveOptions = resolveOptions;

package/dist/index.d.cts

@@ -3024,7 +3024,7 @@ declare function isTargetFile(path: string): boolean;
  */
 declare function mergePageMetaDataArray(pageMetaData: PageMetaDatum[]): PageMetaDatum[];
 /**
- * 执行一段 TypeScript / JavaScript 脚本代码，并返回执行结果
+ * 将 TypeScript / JavaScript 脚本代码，转换为对象/函数
  *
  * @param options - 执行脚本所需的配置项
  * @param options.imports - 需要引入的模块导入语句列表
@@ -3032,7 +3032,7 @@ declare function mergePageMetaDataArray(pageMetaData: PageMetaDatum[]): PageMeta
  * @param options.filename - 脚本文件名，用于错误定位和上下文环境
  * @returns 返回脚本执行后的结果，若导出的是函数则执行后返回其返回值
  */
-declare function execScript(options: {
+declare function parseCode(options: {
     imports: string[];
     code: string;
     filename: string;
@@ -3214,5 +3214,5 @@ 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, execScript, extsToGlob, findImports, findMacro, getPageFiles, getRouteBlock, getRouteSfcBlock, invalidatePagesModule, isTargetFile, mergePageMetaDataArray, parseCustomBlock, parseSFC, resolveOptions, resolvePageDirs, sleep, tryPageMetaFromCustomBlock, tryPageMetaFromMacro, writeFileWithLock };
+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 };

package/dist/index.d.mts

@@ -3024,7 +3024,7 @@ declare function isTargetFile(path: string): boolean;
  */
 declare function mergePageMetaDataArray(pageMetaData: PageMetaDatum[]): PageMetaDatum[];
 /**
- * 执行一段 TypeScript / JavaScript 脚本代码，并返回执行结果
+ * 将 TypeScript / JavaScript 脚本代码，转换为对象/函数
  *
  * @param options - 执行脚本所需的配置项
  * @param options.imports - 需要引入的模块导入语句列表
@@ -3032,7 +3032,7 @@ declare function mergePageMetaDataArray(pageMetaData: PageMetaDatum[]): PageMeta
  * @param options.filename - 脚本文件名，用于错误定位和上下文环境
  * @returns 返回脚本执行后的结果，若导出的是函数则执行后返回其返回值
  */
-declare function execScript(options: {
+declare function parseCode(options: {
     imports: string[];
     code: string;
     filename: string;
@@ -3214,5 +3214,5 @@ 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, execScript, extsToGlob, findImports, findMacro, getPageFiles, getRouteBlock, getRouteSfcBlock, invalidatePagesModule, isTargetFile, mergePageMetaDataArray, parseCustomBlock, parseSFC, resolveOptions, resolvePageDirs, sleep, tryPageMetaFromCustomBlock, tryPageMetaFromMacro, writeFileWithLock };
+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 };

package/dist/index.d.ts

@@ -3024,7 +3024,7 @@ declare function isTargetFile(path: string): boolean;
  */
 declare function mergePageMetaDataArray(pageMetaData: PageMetaDatum[]): PageMetaDatum[];
 /**
- * 执行一段 TypeScript / JavaScript 脚本代码，并返回执行结果
+ * 将 TypeScript / JavaScript 脚本代码，转换为对象/函数
  *
  * @param options - 执行脚本所需的配置项
  * @param options.imports - 需要引入的模块导入语句列表
@@ -3032,7 +3032,7 @@ declare function mergePageMetaDataArray(pageMetaData: PageMetaDatum[]): PageMeta
  * @param options.filename - 脚本文件名，用于错误定位和上下文环境
  * @returns 返回脚本执行后的结果，若导出的是函数则执行后返回其返回值
  */
-declare function execScript(options: {
+declare function parseCode(options: {
     imports: string[];
     code: string;
     filename: string;
@@ -3214,5 +3214,5 @@ 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, execScript, extsToGlob, findImports, findMacro, getPageFiles, getRouteBlock, getRouteSfcBlock, invalidatePagesModule, isTargetFile, mergePageMetaDataArray, parseCustomBlock, parseSFC, resolveOptions, resolvePageDirs, sleep, tryPageMetaFromCustomBlock, tryPageMetaFromMacro, writeFileWithLock };
+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 };

package/dist/index.mjs

@@ -129,7 +129,7 @@ function mergePageMetaDataArray(pageMetaData) {
   }
   return result;
 }
-async function execScript(options) {
+async function parseCode(options) {
   const { imports = [], code, filename } = options;
   let jsCode = "";
   try {
@@ -180,7 +180,24 @@ async function execScript(options) {
       __filename: filename,
       __dirname: dir,
       require: createRequire(dir),
-      import: (id) => import(id)
+      import: (id) => import(id),
+      // 定时器相关
+      setTimeout,
+      clearTimeout,
+      setInterval,
+      clearInterval,
+      setImmediate,
+      clearImmediate,
+      // 控制台相关
+      console,
+      // URL 处理
+      URL,
+      URLSearchParams,
+      // 进程和性能相关
+      performance,
+      // 全局对象引用
+      global: globalThis,
+      globalThis
     };
     const script = new vm.Script(jsCode, { filename });
     await script.runInNewContext(vmContext, {
@@ -188,10 +205,7 @@ async function execScript(options) {
       // 设置超时避免长时间运行
     });
     const result = vmContext.exports.default || vmContext.exports;
-    if (typeof result === "function") {
-      return Promise.resolve(result());
-    }
-    return Promise.resolve(result);
+    return result;
   } catch (error) {
     throw new Error(`EXEC SCRIPT FAIL IN ${filename}: ${error.message} 
 
@@ -438,7 +452,7 @@ class Page {
     if (forceUpdate || !this.meta) {
       await this.read();
     }
-    const { path, tabBar: _, ...others } = this.meta;
+    const { path, tabBar: _, ...others } = this.meta || {};
     return {
       path: path ?? this.uri,
       ...others
@@ -515,14 +529,15 @@ async function tryPageMetaFromMacro(sfc) {
     const imports = findImports(ast.body).filter((imp) => !!imp.specifiers.length).map((imp) => babelGenerate(imp).code);
     const [macroOption] = macro.arguments;
     const code = babelGenerate(macroOption).code;
-    const result = await execScript({
+    const parsed = await parseCode({
       imports,
       code,
       filename: sfc.filename
     });
+    const res = typeof parsed === "function" ? await Promise.resolve(parsed()) : await Promise.resolve(parsed);
     return {
       type: "page",
-      ...result
+      ...res
     };
   }
   return void 0;
@@ -1173,4 +1188,4 @@ function VitePluginUniPages(userOptions = {}) {
   };
 }
 
-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 };
+export { FILE_EXTENSIONS, MODULE_ID_VIRTUAL, OUTPUT_NAME, Page, PageContext, RESOLVED_MODULE_ID_VIRTUAL, VitePluginUniPages, babelGenerate, checkPagesJsonFileSync, debug, VitePluginUniPages as default, defineUniPages, extsToGlob, findImports, findMacro, getPageFiles, getRouteBlock, getRouteSfcBlock, invalidatePagesModule, isTargetFile, mergePageMetaDataArray, parseCode, 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.17",
+  "version": "0.3.18",
   "description": "File system based routing for uni-app applications using Vite",
   "author": "KeJun",
   "maintainers": [