@tarojs/router 3.3.16 → 3.3.17

package/dist/router.esm.js

@@ -1,4 +1,5 @@
 import { requestAnimationFrame, container, SERVICE_IDENTIFIER, eventCenter, Current, createPageConfig, stringify } from '@tarojs/runtime';
+import { initTabBarApis } from '@tarojs/taro';
 
 function _extends() {
   _extends = Object.assign || function (target) {
@@ -78,7 +79,7 @@ class Stacks {
     }
     getLastIndex(pathname) {
         const list = [...this.stacks].reverse();
-        return list.findIndex(page => { var _a; return ((_a = page.path) === null || _a === void 0 ? void 0 : _a.replace(/\?.*/g, '')) === pathname; });
+        return list.findIndex((page, i) => { var _a; return i !== 0 && ((_a = page.path) === null || _a === void 0 ? void 0 : _a.replace(/\?.*/g, '')) === pathname; });
     }
     getDelta(pathname) {
         if (this.backDelta >= 1) {
@@ -103,21 +104,65 @@ class Stacks {
 }
 const stacks = new Stacks();
 
-let routesAlias = {};
-function setRoutesAlias(alias) {
-    routesAlias = alias;
-}
 function addLeadingSlash(path) {
     if (path == null) {
         return '';
     }
     return path.charAt(0) === '/' ? path : '/' + path;
 }
+class RoutesAlias {
+    constructor() {
+        this.conf = [];
+        this.getConfig = (url) => {
+            const customRoute = this.conf.filter((arr) => {
+                return arr.includes(url);
+            });
+            return customRoute[0];
+        };
+        this.getOrigin = (url) => {
+            var _a;
+            return ((_a = this.getConfig(url)) === null || _a === void 0 ? void 0 : _a[0]) || url;
+        };
+        this.getAlias = (url) => {
+            var _a;
+            return ((_a = this.getConfig(url)) === null || _a === void 0 ? void 0 : _a[1]) || url;
+        };
+        this.getAll = (url) => {
+            return this.conf.filter((arr) => {
+                return arr.includes(url);
+            }).reduce((p, a) => {
+                p.push(a[1]);
+                return p;
+            }, [url]);
+        };
+    }
+    set(customRoutes = {}) {
+        for (let key in customRoutes) {
+            const path = customRoutes[key];
+            key = addLeadingSlash(key);
+            if (typeof path === 'string') {
+                this.conf.push([key, addLeadingSlash(path)]);
+            }
+            else if ((path === null || path === void 0 ? void 0 : path.length) > 0) {
+                this.conf.push(...path.map(p => [key, addLeadingSlash(p)]));
+            }
+        }
+    }
+}
+const routesAlias = new RoutesAlias();
 const isTabBar = (config) => {
     var _a, _b;
     const { customRoutes = {}, basename = '', pathname } = config.router;
     const routePath = stripBasename(pathname, basename);
-    const pagePath = ((_a = Object.entries(customRoutes).find(([, target]) => target === routePath)) === null || _a === void 0 ? void 0 : _a[0]) || routePath;
+    const pagePath = ((_a = Object.entries(customRoutes).find(([, target]) => {
+        if (typeof target === 'string') {
+            return target === routePath;
+        }
+        else if ((target === null || target === void 0 ? void 0 : target.length) > 0) {
+            return target.includes(routePath);
+        }
+        return false;
+    })) === null || _a === void 0 ? void 0 : _a[0]) || routePath;
     return !!pagePath && (((_b = config.tabBar) === null || _b === void 0 ? void 0 : _b.list) || []).some(t => t.pagePath === pagePath);
 };
 
@@ -125,11 +170,7 @@ function processNavigateUrl(option) {
     var _a;
     const pathPieces = J(option.url);
     // 处理自定义路由
-    Object.keys(routesAlias).forEach(key => {
-        if (addLeadingSlash(key) === addLeadingSlash(pathPieces.pathname)) {
-            pathPieces.pathname = routesAlias[key];
-        }
-    });
+    pathPieces.pathname = routesAlias.getAlias(addLeadingSlash(pathPieces.pathname));
     // 处理相对路径
     if ((_a = pathPieces === null || pathPieces === void 0 ? void 0 : pathPieces.pathname) === null || _a === void 0 ? void 0 : _a.includes('./')) {
         const parts = history.location.pathname.split('/');
@@ -153,9 +194,10 @@ async function navigate(option, method) {
     return new Promise((resolve, reject) => {
         const { success, complete, fail } = option;
         const unListen = history.listen(() => {
-            success === null || success === void 0 ? void 0 : success();
-            complete === null || complete === void 0 ? void 0 : complete();
-            resolve();
+            const res = { errMsg: `${method}: ok` };
+            success === null || success === void 0 ? void 0 : success(res);
+            complete === null || complete === void 0 ? void 0 : complete(res);
+            resolve(res);
             unListen();
         });
         try {
@@ -165,7 +207,11 @@ async function navigate(option, method) {
                 if (method === 'navigateTo') {
                     history.push(pathPieces, state);
                 }
-                else if (method === 'redirectTo') {
+                else if (method === 'redirectTo' || method === 'switchTab') {
+                    history.replace(pathPieces, state);
+                }
+                else if (method === 'reLaunch') {
+                    stacks.delta = stacks.length;
                     history.replace(pathPieces, state);
                 }
             }
@@ -175,9 +221,10 @@ async function navigate(option, method) {
             }
         }
         catch (error) {
-            fail === null || fail === void 0 ? void 0 : fail(error);
-            complete === null || complete === void 0 ? void 0 : complete();
-            reject(error);
+            const res = { errMsg: `${method}: fail ${error.message || error}` };
+            fail === null || fail === void 0 ? void 0 : fail(res);
+            complete === null || complete === void 0 ? void 0 : complete(res);
+            reject(res);
         }
     });
 }
@@ -194,15 +241,14 @@ function navigateBack(options = { delta: 1 }) {
     return navigate(options, 'navigateBack');
 }
 function switchTab(option) {
-    // TODO: 清除掉所有的栈去目标页面
-    return redirectTo(option);
+    return navigate(option, 'switchTab');
 }
 function reLaunch(option) {
-    // TODO: 清除掉所有的栈去目标页面
-    return redirectTo(option);
+    return navigate(option, 'reLaunch');
 }
 function getCurrentPages() {
-    return stacks.get();
+    const pages = stacks.get();
+    return pages.map(e => (Object.assign(Object.assign({}, e), { route: e.path || '' })));
 }
 
 /**
@@ -848,14 +894,14 @@ var UniversalRouter = function () {
 
 UniversalRouter.pathToRegexp = pathToRegexp_1;
 
-const Taro = require('@tarojs/taro-h5');
+// @ts-nocheck
 function initTabbar(config) {
     if (config.tabBar == null) {
         return;
     }
     // TODO: 找到 tabbar 的类型
     const tabbar = document.createElement('taro-tabbar');
-    const homePage = config.pages ? config.pages[0] : '';
+    const homePage = config.entryPagePath || (config.pages ? config.pages[0] : '');
     tabbar.conf = config.tabBar;
     tabbar.conf.homePage = history.location.pathname === '/' ? homePage : history.location.pathname;
     const routerConfig = config.router;
@@ -874,7 +920,7 @@ function initTabbar(config) {
     const container = document.getElementById('container');
     // eslint-disable-next-line no-unused-expressions
     container === null || container === void 0 ? void 0 : container.appendChild(tabbar);
-    Taro.initTabBarApis(config);
+    initTabBarApis(config);
 }
 
 const routerConfig = Object.create(null);
@@ -1595,14 +1641,13 @@ function createRouter(app, config, framework) {
     var _a;
     init(config);
     const routes = [];
-    const alias = (_a = config.router.customRoutes) !== null && _a !== void 0 ? _a : {};
     const runtimeHooks = container.get(SERVICE_IDENTIFIER.Hooks);
-    setRoutesAlias(alias);
+    routesAlias.set(config.router.customRoutes);
     for (let i = 0; i < config.routes.length; i++) {
         const route = config.routes[i];
         const path = addLeadingSlash(route.path);
         routes.push({
-            path: alias[path] || path,
+            path: routesAlias.getAll(path),
             action: route.load
         });
     }
@@ -1629,8 +1674,10 @@ function createRouter(app, config, framework) {
         if (!element)
             return;
         const pageConfig = config.routes.find(r => {
+            var _a;
             const path = addLeadingSlash(r.path);
-            return path === location.pathname || alias[path] === location.pathname;
+            const urlPath = stripBasename(location.pathname, routerConfig.router.basename);
+            return path === urlPath || ((_a = routesAlias.getConfig(path)) === null || _a === void 0 ? void 0 : _a.includes(urlPath));
         });
         let enablePullDownRefresh = false;
         eventCenter.trigger('__taroRouterChange', {
@@ -1671,7 +1718,9 @@ function createRouter(app, config, framework) {
                 }
             }
             else {
-                unloadPage(currentPage);
+                const delta = stacks.getDelta(pathname);
+                // NOTE: 页面路由记录并不会清空，只是移除掉缓存的 stack 以及页面
+                unloadPage(currentPage, delta);
             }
             shouldLoad = true;
         }
@@ -1686,7 +1735,7 @@ function createRouter(app, config, framework) {
         }
     };
     if (history.location.pathname === '/') {
-        history.replace(prependBasename(routes[0].path + history.location.search));
+        history.replace(prependBasename((config.entryPagePath || ((_a = routes[0].path) === null || _a === void 0 ? void 0 : _a[0])) + history.location.search));
     }
     render({ location: history.location, action: r.Push });
     app.onShow(qs(stacks.length));