@tarojs/router 3.3.16 → 3.3.17

package/dist/index.js

@@ -3,6 +3,7 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var runtime = require('@tarojs/runtime');
+var taro = require('@tarojs/taro');
 
 function _extends() {
   _extends = Object.assign || function (target) {
@@ -88,7 +89,7 @@ Stacks.prototype.getItem = function getItem (index) {
 };
 Stacks.prototype.getLastIndex = function getLastIndex (pathname) {
     var list = [].concat( this.stacks ).reverse();
-    return list.findIndex(function (page) { var _a; return ((_a = page.path) === null || _a === void 0 ? void 0 : _a.replace(/\?.*/g, '')) === pathname; });
+    return list.findIndex(function (page, i) { var _a; return i !== 0 && ((_a = page.path) === null || _a === void 0 ? void 0 : _a.replace(/\?.*/g, '')) === pathname; });
 };
 Stacks.prototype.getDelta = function getDelta (pathname) {
     if (this.backDelta >= 1) {
@@ -114,16 +115,58 @@ Stacks.prototype.push = function push (page) {
 Object.defineProperties( Stacks.prototype, prototypeAccessors );
 var stacks = new Stacks();
 
-var routesAlias = {};
-function setRoutesAlias(alias) {
-    routesAlias = alias;
-}
 function addLeadingSlash(path) {
     if (path == null) {
         return '';
     }
     return path.charAt(0) === '/' ? path : '/' + path;
 }
+var RoutesAlias = function RoutesAlias() {
+    var this$1 = this;
+
+    this.conf = [];
+    this.getConfig = function (url) {
+        var customRoute = this$1.conf.filter(function (arr) {
+            return arr.includes(url);
+        });
+        return customRoute[0];
+    };
+    this.getOrigin = function (url) {
+        var _a;
+        return ((_a = this$1.getConfig(url)) === null || _a === void 0 ? void 0 : _a[0]) || url;
+    };
+    this.getAlias = function (url) {
+        var _a;
+        return ((_a = this$1.getConfig(url)) === null || _a === void 0 ? void 0 : _a[1]) || url;
+    };
+    this.getAll = function (url) {
+        return this$1.conf.filter(function (arr) {
+            return arr.includes(url);
+        }).reduce(function (p, a) {
+            p.push(a[1]);
+            return p;
+        }, [url]);
+    };
+};
+RoutesAlias.prototype.set = function set (customRoutes) {
+        var this$1 = this;
+        var ref;
+
+        if ( customRoutes === void 0 ) customRoutes = {};
+    var loop = function ( key ) {
+        var path = customRoutes[key];
+        key = addLeadingSlash(key);
+        if (typeof path === 'string') {
+            this$1.conf.push([key, addLeadingSlash(path)]);
+        }
+        else if ((path === null || path === void 0 ? void 0 : path.length) > 0) {
+            (ref = this$1.conf).push.apply(ref, path.map(function (p) { return [key, addLeadingSlash(p)]; }));
+        }
+    };
+
+        for (var key in customRoutes) loop( key );
+};
+var routesAlias = new RoutesAlias();
 var isTabBar = function (config) {
     var _a, _b;
     var ref = config.router;
@@ -133,8 +176,14 @@ var isTabBar = function (config) {
     var routePath = stripBasename(pathname, basename);
     var pagePath = ((_a = Object.entries(customRoutes).find(function (ref) {
         var target = ref[1];
-
-        return target === routePath;
+
+        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(function (t) { return t.pagePath === pagePath; });
 };
@@ -143,11 +192,7 @@ function processNavigateUrl(option) {
     var _a;
     var pathPieces = J(option.url);
     // 处理自定义路由
-    Object.keys(routesAlias).forEach(function (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('./')) {
         var parts = exports.history.location.pathname.split('/');
@@ -173,9 +218,10 @@ async function navigate(option, method) {
         var complete = option.complete;
         var fail = option.fail;
         var unListen = exports.history.listen(function () {
-            success === null || success === void 0 ? void 0 : success();
-            complete === null || complete === void 0 ? void 0 : complete();
-            resolve();
+            var 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 {
@@ -185,7 +231,11 @@ async function navigate(option, method) {
                 if (method === 'navigateTo') {
                     exports.history.push(pathPieces, state);
                 }
-                else if (method === 'redirectTo') {
+                else if (method === 'redirectTo' || method === 'switchTab') {
+                    exports.history.replace(pathPieces, state);
+                }
+                else if (method === 'reLaunch') {
+                    stacks.delta = stacks.length;
                     exports.history.replace(pathPieces, state);
                 }
             }
@@ -195,9 +245,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);
+            var 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);
         }
     });
 }
@@ -216,15 +267,14 @@ function navigateBack(options) {
     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();
+    var pages = stacks.get();
+    return pages.map(function (e) { return (Object.assign(Object.assign({}, e), { route: e.path || '' })); });
 }
 
 /**
@@ -870,14 +920,14 @@ var UniversalRouter = function () {
 
 UniversalRouter.pathToRegexp = pathToRegexp_1;
 
-var Taro = require('@tarojs/taro-h5');
+// @ts-nocheck
 function initTabbar(config) {
     if (config.tabBar == null) {
         return;
     }
     // TODO: 找到 tabbar 的类型
     var tabbar = document.createElement('taro-tabbar');
-    var homePage = config.pages ? config.pages[0] : '';
+    var homePage = config.entryPagePath || (config.pages ? config.pages[0] : '');
     tabbar.conf = config.tabBar;
     tabbar.conf.homePage = exports.history.location.pathname === '/' ? homePage : exports.history.location.pathname;
     var routerConfig = config.router;
@@ -896,7 +946,7 @@ function initTabbar(config) {
     var container = document.getElementById('container');
     // eslint-disable-next-line no-unused-expressions
     container === null || container === void 0 ? void 0 : container.appendChild(tabbar);
-    Taro.initTabBarApis(config);
+    taro.initTabBarApis(config);
 }
 
 var routerConfig = Object.create(null);
@@ -1634,14 +1684,13 @@ function createRouter(app, config, framework) {
     var _a;
     init(config);
     var routes = [];
-    var alias = (_a = config.router.customRoutes) !== null && _a !== void 0 ? _a : {};
     var runtimeHooks = runtime.container.get(runtime.SERVICE_IDENTIFIER.Hooks);
-    setRoutesAlias(alias);
+    routesAlias.set(config.router.customRoutes);
     for (var i = 0; i < config.routes.length; i++) {
         var route = config.routes[i];
         var path = addLeadingSlash(route.path);
         routes.push({
-            path: alias[path] || path,
+            path: routesAlias.getAll(path),
             action: route.load
         });
     }
@@ -1671,8 +1720,10 @@ function createRouter(app, config, framework) {
         if (!element)
             { return; }
         var pageConfig = config.routes.find(function (r) {
+            var _a;
             var path = addLeadingSlash(r.path);
-            return path === location.pathname || alias[path] === location.pathname;
+            var urlPath = stripBasename(location.pathname, routerConfig.router.basename);
+            return path === urlPath || ((_a = routesAlias.getConfig(path)) === null || _a === void 0 ? void 0 : _a.includes(urlPath));
         });
         var enablePullDownRefresh = false;
         runtime.eventCenter.trigger('__taroRouterChange', {
@@ -1713,7 +1764,9 @@ function createRouter(app, config, framework) {
                 }
             }
             else {
-                unloadPage(currentPage);
+                var delta$1 = stacks.getDelta(pathname);
+                // NOTE: 页面路由记录并不会清空，只是移除掉缓存的 stack 以及页面
+                unloadPage(currentPage, delta$1);
             }
             shouldLoad = true;
         }
@@ -1728,7 +1781,7 @@ function createRouter(app, config, framework) {
         }
     };
     if (exports.history.location.pathname === '/') {
-        exports.history.replace(prependBasename(routes[0].path + exports.history.location.search));
+        exports.history.replace(prependBasename((config.entryPagePath || ((_a = routes[0].path) === null || _a === void 0 ? void 0 : _a[0])) + exports.history.location.search));
     }
     render({ location: exports.history.location, action: r.Push });
     app.onShow(qs(stacks.length));