@uni-helper/vite-plugin-uni-pages 0.3.8 → 0.3.10

package/client.d.ts

@@ -6,6 +6,8 @@ declare module 'virtual:uni-pages' {
   export const subPackages: SubPackage[]
 }
 
-declare namespace globalThis {
-  export const definePage: import('.').DefinePage
+declare global {
+  const definePage: import('.').DefinePage
 }
+
+export {}

package/dist/index.cjs

@@ -81,8 +81,11 @@ function getDeclaration(ctx) {
 // @ts-nocheck
 // Generated by vite-plugin-uni-pages
 
+type _LocationUrl =
+  ${allPagesPath.join(" |\n  ")};
+
 interface NavigateToOptions {
-  url: ${allPagesPath.join(" |\n       ")};
+  url: _LocationUrl;
 }
 interface RedirectToOptions extends NavigateToOptions {}
 
@@ -98,6 +101,10 @@ declare interface Uni {
   switchTab(options: UniNamespace.SwitchTabOptions & SwitchTabOptions): void;
   reLaunch(options: UniNamespace.ReLaunchOptions & ReLaunchOptions): void;
 }
+
+declare module "virtual:uni-pages" {
+  export type LocationUrl = _LocationUrl;
+}
 `;
   return code;
 }
@@ -497,21 +504,21 @@ async function tryPageMetaFromCustomBlock(sfc, routeBlockLang) {
   return pageMeta;
 }
 function findMacro(stmts, filename) {
-  const nodes = stmts.map((raw) => {
-    let node = raw;
-    if (raw.type === "ExpressionStatement")
-      node = raw.expression;
-    return astKit.isCallOf(node, "definePage") ? node : void 0;
-  }).filter((node) => !!node);
-  if (!nodes.length)
-    return;
-  if (nodes.length > 1) {
-    throw new Error(`\u6BCF\u4E2A\u6587\u4EF6\u53EA\u5141\u8BB8\u8C03\u7528\u4E00\u6B21 definePage(): ${filename}`);
+  let macro;
+  for (const stmt of stmts) {
+    let node = stmt;
+    if (stmt.type === "ExpressionStatement")
+      node = stmt.expression;
+    if (astKit.isCallOf(node, "definePage")) {
+      macro = node;
+      break;
+    }
   }
-  const macro = nodes[0];
+  if (!macro)
+    return;
   const [opt] = macro.arguments;
   if (opt && !t__namespace.isFunctionExpression(opt) && !t__namespace.isArrowFunctionExpression(opt) && !t__namespace.isObjectExpression(opt)) {
-    debug.definePage(`definePage() only accept argument in function or object: ${filename}`);
+    debug.definePage(`definePage() \u53C2\u6570\u4EC5\u652F\u6301\u51FD\u6570\u6216\u5BF9\u8C61\uFF1A${filename}`);
     return;
   }
   return macro;

package/dist/index.mjs

@@ -47,8 +47,11 @@ function getDeclaration(ctx) {
 // @ts-nocheck
 // Generated by vite-plugin-uni-pages
 
+type _LocationUrl =
+  ${allPagesPath.join(" |\n  ")};
+
 interface NavigateToOptions {
-  url: ${allPagesPath.join(" |\n       ")};
+  url: _LocationUrl;
 }
 interface RedirectToOptions extends NavigateToOptions {}
 
@@ -64,6 +67,10 @@ declare interface Uni {
   switchTab(options: UniNamespace.SwitchTabOptions & SwitchTabOptions): void;
   reLaunch(options: UniNamespace.ReLaunchOptions & ReLaunchOptions): void;
 }
+
+declare module "virtual:uni-pages" {
+  export type LocationUrl = _LocationUrl;
+}
 `;
   return code;
 }
@@ -463,21 +470,21 @@ async function tryPageMetaFromCustomBlock(sfc, routeBlockLang) {
   return pageMeta;
 }
 function findMacro(stmts, filename) {
-  const nodes = stmts.map((raw) => {
-    let node = raw;
-    if (raw.type === "ExpressionStatement")
-      node = raw.expression;
-    return isCallOf(node, "definePage") ? node : void 0;
-  }).filter((node) => !!node);
-  if (!nodes.length)
-    return;
-  if (nodes.length > 1) {
-    throw new Error(`\u6BCF\u4E2A\u6587\u4EF6\u53EA\u5141\u8BB8\u8C03\u7528\u4E00\u6B21 definePage(): ${filename}`);
+  let macro;
+  for (const stmt of stmts) {
+    let node = stmt;
+    if (stmt.type === "ExpressionStatement")
+      node = stmt.expression;
+    if (isCallOf(node, "definePage")) {
+      macro = node;
+      break;
+    }
   }
-  const macro = nodes[0];
+  if (!macro)
+    return;
   const [opt] = macro.arguments;
   if (opt && !t.isFunctionExpression(opt) && !t.isArrowFunctionExpression(opt) && !t.isObjectExpression(opt)) {
-    debug.definePage(`definePage() only accept argument in function or object: ${filename}`);
+    debug.definePage(`definePage() \u53C2\u6570\u4EC5\u652F\u6301\u51FD\u6570\u6216\u5BF9\u8C61\uFF1A${filename}`);
     return;
   }
   return macro;

package/package.json

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