@tarojs/router 3.5.0-alpha.3 → 3.5.0-alpha.4

package/dist/{router.esm.js → index.esm.js}

@@ -8,7 +8,31 @@ const addLeadingSlash = (url = '') => (url.charAt(0) === '/' ? url : '/' + url);
 const hasBasename = (path = '', prefix = '') => new RegExp('^' + prefix + '(\\/|\\?|#|$)', 'i').test(path) || path === prefix;
 const stripBasename = (path = '', prefix = '') => hasBasename(path, prefix) ? path.substr(prefix.length) : path;
 class RoutesAlias {
-    conf = [];
+    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) => arr.includes(url))
+                .reduceRight((p, a) => {
+                p.unshift(a[1]);
+                return p;
+            }, []);
+        };
+    }
     set(customRoutes = {}) {
         for (let key in customRoutes) {
             const path = customRoutes[key];
@@ -16,36 +40,15 @@ class RoutesAlias {
             if (typeof path === 'string') {
                 this.conf.push([key, addLeadingSlash(path)]);
             }
-            else if (path?.length > 0) {
+            else if ((path === null || path === void 0 ? void 0 : path.length) > 0) {
                 this.conf.push(...path.map(p => [key, addLeadingSlash(p)]));
             }
         }
     }
-    getConfig = (url = '') => {
-        const customRoute = this.conf.filter((arr) => {
-            return arr.includes(url);
-        });
-        return customRoute[0];
-    };
-    getOrigin = (url = '') => {
-        return this.getConfig(url)?.[0] || url;
-    };
-    getAlias = (url = '') => {
-        return this.getConfig(url)?.[1] || url;
-    };
-    getAll = (url = '') => {
-        return this.conf
-            .filter((arr) => arr.includes(url))
-            .reduceRight((p, a) => {
-            p.unshift(a[1]);
-            return p;
-        }, []);
-    };
 }
 const routesAlias = new RoutesAlias();
 
 class RouterConfig {
-    static __config;
     static set config(e) {
         this.__config = e;
     }
@@ -70,7 +73,12 @@ class RouterConfig {
 let history;
 let basename = '/';
 class MpaHistory {
-    action;
+    constructor() {
+        this.back = window.history.back;
+        this.forward = window.history.forward;
+        this.pushState = this.eventState('pushState');
+        this.replaceState = this.eventState('replaceState');
+    }
     get location() {
         return {
             pathname: window.location.pathname,
@@ -107,8 +115,6 @@ class MpaHistory {
     go(delta) {
         window.history.go(delta);
     }
-    back = window.history.back;
-    forward = window.history.forward;
     listen(listener) {
         function callback(e) {
             if (e.action === 'pushState') {
@@ -130,8 +136,6 @@ class MpaHistory {
     block(_blocker) {
         throw new Error('Method not implemented.');
     }
-    pushState = this.eventState('pushState');
-    replaceState = this.eventState('replaceState');
     eventState(action) {
         return (data, unused, url) => {
             const wrapper = window.history[action](data, unused, url);
@@ -165,9 +169,36 @@ function prependBasename(url = '') {
     return basename.replace(/\/$/, '') + '/' + url.replace(/^\//, '');
 }
 
+/*! *****************************************************************************
+Copyright (c) Microsoft Corporation.
+
+Permission to use, copy, modify, and/or distribute this software for any
+purpose with or without fee is hereby granted.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
+REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
+INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
+OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THIS SOFTWARE.
+***************************************************************************** */
+
+function __awaiter(thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+}
+
 class Stacks {
-    stacks = [];
-    backDelta = 0;
+    constructor() {
+        this.stacks = [];
+        this.backDelta = 0;
+    }
     set delta(delta) {
         if (delta > 0) {
             this.backDelta = delta;
@@ -196,7 +227,7 @@ class Stacks {
     }
     getLastIndex(pathname, stateWith = 1) {
         const list = [...this.stacks].reverse();
-        return list.findIndex((page, i) => i >= stateWith && page.path?.replace(/\?.*/g, '') === pathname);
+        return list.findIndex((page, i) => { var _a; return i >= stateWith && ((_a = page.path) === null || _a === void 0 ? void 0 : _a.replace(/\?.*/g, '')) === pathname; });
     }
     getDelta(pathname) {
         if (this.backDelta >= 1) {
@@ -223,9 +254,10 @@ class Stacks {
 const stacks = new Stacks();
 
 function processNavigateUrl(option) {
+    var _a;
     const pathPieces = parsePath(option.url);
     // 处理相对路径
-    if (pathPieces.pathname?.includes('./')) {
+    if ((_a = pathPieces.pathname) === null || _a === void 0 ? void 0 : _a.includes('./')) {
         const parts = routesAlias.getOrigin(history.location.pathname).split('/');
         parts.pop();
         pathPieces.pathname.split('/').forEach((item) => {
@@ -245,42 +277,44 @@ function processNavigateUrl(option) {
         pathPieces.search = '';
     return pathPieces;
 }
-async function navigate(option, method) {
-    return new Promise((resolve, reject) => {
-        const { success, complete, fail } = option;
-        const unListen = history.listen(() => {
-            const res = { errMsg: `${method}:ok` };
-            success?.(res);
-            complete?.(res);
-            resolve(res);
-            unListen();
-        });
-        try {
-            if ('url' in option) {
-                const pathPieces = processNavigateUrl(option);
-                const state = { timestamp: Date.now() };
-                if (method === 'navigateTo') {
-                    history.push(pathPieces, state);
-                }
-                else if (method === 'redirectTo' || method === 'switchTab') {
-                    history.replace(pathPieces, state);
+function navigate(option, method) {
+    return __awaiter(this, void 0, void 0, function* () {
+        return new Promise((resolve, reject) => {
+            const { success, complete, fail } = option;
+            const unListen = history.listen(() => {
+                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 {
+                if ('url' in option) {
+                    const pathPieces = processNavigateUrl(option);
+                    const state = { timestamp: Date.now() };
+                    if (method === 'navigateTo') {
+                        history.push(pathPieces, state);
+                    }
+                    else if (method === 'redirectTo' || method === 'switchTab') {
+                        history.replace(pathPieces, state);
+                    }
+                    else if (method === 'reLaunch') {
+                        stacks.delta = stacks.length;
+                        history.replace(pathPieces, state);
+                    }
                 }
-                else if (method === 'reLaunch') {
-                    stacks.delta = stacks.length;
-                    history.replace(pathPieces, state);
+                else if (method === 'navigateBack') {
+                    stacks.delta = option.delta;
+                    history.go(-option.delta);
                 }
             }
-            else if (method === 'navigateBack') {
-                stacks.delta = option.delta;
-                history.go(-option.delta);
+            catch (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);
             }
-        }
-        catch (error) {
-            const res = { errMsg: `${method}:fail ${error.message || error}` };
-            fail?.(res);
-            complete?.(res);
-            reject(res);
-        }
+        });
     });
 }
 function navigateTo(option) {
@@ -306,7 +340,7 @@ function getCurrentPages() {
         console.warn('多页面路由模式不支持使用 getCurrentPages 方法！');
     }
     const pages = stacks.get();
-    return pages.map(e => ({ ...e, route: e.path || '' }));
+    return pages.map(e => (Object.assign(Object.assign({}, e), { route: e.path || '' })));
 }
 
 /**
@@ -408,7 +442,7 @@ function initTabbar(config) {
         tabbar.conf.basename = routerConfig.basename;
     }
     const container = document.getElementById('container');
-    container?.appendChild(tabbar);
+    container === null || container === void 0 ? void 0 : container.appendChild(tabbar);
     initTabBarApis(config);
 }
 
@@ -418,13 +452,8 @@ function setDisplay(el, type = '') {
     }
 }
 class PageHandler {
-    config;
-    defaultAnimation = { duration: 300, delay: 50 };
-    unloadTimer;
-    hideTimer;
-    lastHidePage;
-    lastUnloadPage;
     constructor(config) {
+        this.defaultAnimation = { duration: 300, delay: 50 };
         this.config = config;
         this.mount();
     }
@@ -433,21 +462,23 @@ class PageHandler {
     get routerMode() { return this.router.mode || 'hash'; }
     get customRoutes() { return this.router.customRoutes || {}; }
     get routes() { return this.config.routes; }
-    get tabBarList() { return this.config.tabBar?.list || []; }
+    get tabBarList() { var _a; return ((_a = this.config.tabBar) === null || _a === void 0 ? void 0 : _a.list) || []; }
     get PullDownRefresh() { return this.config.PullDownRefresh; }
-    get animation() { return this.config?.animation ?? this.defaultAnimation; }
+    get animation() { var _a, _b; return (_b = (_a = this.config) === null || _a === void 0 ? void 0 : _a.animation) !== null && _b !== void 0 ? _b : this.defaultAnimation; }
     get animationDelay() {
+        var _a;
         return (typeof this.animation === 'object'
             ? this.animation.delay
             : this.animation
-                ? this.defaultAnimation?.delay
+                ? (_a = this.defaultAnimation) === null || _a === void 0 ? void 0 : _a.delay
                 : 0) || 0;
     }
     get animationDuration() {
+        var _a;
         return (typeof this.animation === 'object'
             ? this.animation.duration
             : this.animation
-                ? this.defaultAnimation?.duration
+                ? (_a = this.defaultAnimation) === null || _a === void 0 ? void 0 : _a.duration
                 : 0) || 0;
     }
     set pathname(p) { this.router.pathname = p; }
@@ -455,27 +486,29 @@ class PageHandler {
     get basename() { return this.router.basename || ''; }
     get pageConfig() {
         return this.routes.find(r => {
+            var _a;
             const routePath = stripBasename(this.pathname, this.basename);
             const pagePath = addLeadingSlash(r.path);
-            return pagePath === routePath || routesAlias.getConfig(pagePath)?.includes(routePath);
+            return pagePath === routePath || ((_a = routesAlias.getConfig(pagePath)) === null || _a === void 0 ? void 0 : _a.includes(routePath));
         });
     }
     get isTabBar() {
+        var _a;
         const routePath = stripBasename(this.pathname, this.basename);
-        const pagePath = Object.entries(this.customRoutes).find(([, target]) => {
+        const pagePath = ((_a = Object.entries(this.customRoutes).find(([, target]) => {
             if (typeof target === 'string') {
                 return target === routePath;
             }
-            else if (target?.length > 0) {
+            else if ((target === null || target === void 0 ? void 0 : target.length) > 0) {
                 return target.includes(routePath);
             }
             return false;
-        })?.[0] || routePath;
+        })) === null || _a === void 0 ? void 0 : _a[0]) || routePath;
         return !!pagePath && this.tabBarList.some(t => t.pagePath === pagePath);
     }
     isSamePage(page) {
         const routePath = stripBasename(this.pathname, this.basename);
-        const pagePath = stripBasename(page?.path, this.basename);
+        const pagePath = stripBasename(page === null || page === void 0 ? void 0 : page.path, this.basename);
         return pagePath.startsWith(routePath + '?');
     }
     get search() {
@@ -497,11 +530,12 @@ class PageHandler {
             ? queryString.parse(search, { decode: false })
             : {};
         query.stamp = stamp.toString();
-        return { ...query, ...options };
+        return Object.assign(Object.assign({}, query), options);
     }
     mount() {
+        var _a;
         setHistoryMode(this.routerMode, this.router.basename);
-        document.getElementById('app')?.remove();
+        (_a = document.getElementById('app')) === null || _a === void 0 ? void 0 : _a.remove();
         this.animation && loadAnimateStyle(this.animationDuration);
         const app = document.createElement('div');
         app.id = this.appId;
@@ -522,12 +556,14 @@ class PageHandler {
         }
     }
     onReady(page, onLoad = true) {
+        var _a, _b;
         const pageEl = this.getPageContainer(page);
-        if (pageEl && !pageEl?.['__isReady']) {
+        if (pageEl && !(pageEl === null || pageEl === void 0 ? void 0 : pageEl['__isReady'])) {
             const el = pageEl.firstElementChild;
-            el?.['componentOnReady']?.()?.then(() => {
+            (_b = (_a = el === null || el === void 0 ? void 0 : el['componentOnReady']) === null || _a === void 0 ? void 0 : _a.call(el)) === null || _b === void 0 ? void 0 : _b.then(() => {
                 requestAnimationFrame(() => {
-                    page.onReady?.();
+                    var _a;
+                    (_a = page.onReady) === null || _a === void 0 ? void 0 : _a.call(page);
                     pageEl['__isReady'] = true;
                 });
             });
@@ -535,6 +571,7 @@ class PageHandler {
         }
     }
     load(page, pageConfig = {}, stacksIndex = 0) {
+        var _a, _b;
         if (!page)
             return;
         // NOTE: 页面栈推入太晚可能导致 getCurrentPages 无法获取到当前页面实例
@@ -545,21 +582,23 @@ class PageHandler {
             setDisplay(pageEl);
             this.isTabBar && pageEl.classList.add('taro_tabbar_page');
             this.addAnimation(pageEl, stacksIndex === 0);
-            page.onShow?.();
+            (_a = page.onShow) === null || _a === void 0 ? void 0 : _a.call(page);
             this.bindPageEvents(page, pageEl, pageConfig);
         }
         else {
-            page.onLoad?.(param, () => {
+            (_b = page.onLoad) === null || _b === void 0 ? void 0 : _b.call(page, param, () => {
+                var _a;
                 pageEl = this.getPageContainer(page);
-                this.isTabBar && pageEl?.classList.add('taro_tabbar_page');
+                this.isTabBar && (pageEl === null || pageEl === void 0 ? void 0 : pageEl.classList.add('taro_tabbar_page'));
                 this.addAnimation(pageEl, stacksIndex === 0);
                 this.onReady(page, true);
-                page.onShow?.();
+                (_a = page.onShow) === null || _a === void 0 ? void 0 : _a.call(page);
                 this.bindPageEvents(page, pageEl, pageConfig);
             });
         }
     }
     unload(page, delta = 1, top = false) {
+        var _a, _b, _c;
         if (!page)
             return;
         stacks.delta = --delta;
@@ -567,28 +606,30 @@ class PageHandler {
         if (this.animation && top) {
             if (this.unloadTimer) {
                 clearTimeout(this.unloadTimer);
-                this.lastUnloadPage?.onUnload?.();
+                (_b = (_a = this.lastUnloadPage) === null || _a === void 0 ? void 0 : _a.onUnload) === null || _b === void 0 ? void 0 : _b.call(_a);
                 this.unloadTimer = null;
             }
             this.lastUnloadPage = page;
             const pageEl = this.getPageContainer(page);
-            pageEl?.classList.remove('taro_page_stationed');
-            pageEl?.classList.remove('taro_page_show');
+            pageEl === null || pageEl === void 0 ? void 0 : pageEl.classList.remove('taro_page_stationed');
+            pageEl === null || pageEl === void 0 ? void 0 : pageEl.classList.remove('taro_page_show');
             this.unloadTimer = setTimeout(() => {
+                var _a, _b;
                 this.unloadTimer = null;
-                this.lastUnloadPage?.onUnload?.();
+                (_b = (_a = this.lastUnloadPage) === null || _a === void 0 ? void 0 : _a.onUnload) === null || _b === void 0 ? void 0 : _b.call(_a);
             }, this.animationDuration);
         }
         else {
             const pageEl = this.getPageContainer(page);
-            pageEl?.classList.remove('taro_page_stationed');
-            pageEl?.classList.remove('taro_page_show');
-            page?.onUnload?.();
+            pageEl === null || pageEl === void 0 ? void 0 : pageEl.classList.remove('taro_page_stationed');
+            pageEl === null || pageEl === void 0 ? void 0 : pageEl.classList.remove('taro_page_show');
+            (_c = page === null || page === void 0 ? void 0 : page.onUnload) === null || _c === void 0 ? void 0 : _c.call(page);
         }
         if (delta >= 1)
             this.unload(stacks.last, delta);
     }
     show(page, pageConfig = {}, stacksIndex = 0) {
+        var _a, _b;
         if (!page)
             return;
         const param = this.getQuery(stacks.length, '', page.options);
@@ -596,20 +637,22 @@ class PageHandler {
         if (pageEl) {
             setDisplay(pageEl);
             this.addAnimation(pageEl, stacksIndex === 0);
-            page.onShow?.();
+            (_a = page.onShow) === null || _a === void 0 ? void 0 : _a.call(page);
             this.bindPageEvents(page, pageEl, pageConfig);
         }
         else {
-            page.onLoad?.(param, () => {
+            (_b = page.onLoad) === null || _b === void 0 ? void 0 : _b.call(page, param, () => {
+                var _a;
                 pageEl = this.getPageContainer(page);
                 this.addAnimation(pageEl, stacksIndex === 0);
                 this.onReady(page, false);
-                page.onShow?.();
+                (_a = page.onShow) === null || _a === void 0 ? void 0 : _a.call(page);
                 this.bindPageEvents(page, pageEl, pageConfig);
             });
         }
     }
     hide(page) {
+        var _a;
         if (!page)
             return;
         // NOTE: 修复多页并发问题，此处可能因为路由跳转过快，执行时页面可能还没有创建成功
@@ -625,7 +668,7 @@ class PageHandler {
                 this.hideTimer = null;
                 setDisplay(this.lastHidePage, 'none');
             }, this.animationDuration + this.animationDelay);
-            page.onHide?.();
+            (_a = page.onHide) === null || _a === void 0 ? void 0 : _a.call(page);
         }
         else {
             setTimeout(() => this.hide(page), 0);
@@ -648,8 +691,9 @@ class PageHandler {
         }
     }
     getPageContainer(page) {
-        const path = page ? page?.path : Current.page?.path;
-        const id = path?.replace(/([^a-z0-9\u00a0-\uffff_-])/ig, '\\$1');
+        var _a;
+        const path = page ? page === null || page === void 0 ? void 0 : page.path : (_a = Current.page) === null || _a === void 0 ? void 0 : _a.path;
+        const id = path === null || path === void 0 ? void 0 : path.replace(/([^a-z0-9\u00a0-\uffff_-])/ig, '\\$1');
         if (page) {
             return document.querySelector(`.taro_page#${id}`);
         }
@@ -660,17 +704,18 @@ class PageHandler {
         return el || window;
     }
     bindPageEvents(page, pageEl, config = {}) {
+        var _a;
         if (!pageEl) {
             pageEl = this.getPageContainer();
         }
-        const distance = config.onReachBottomDistance || this.config.window?.onReachBottomDistance || 50;
+        const distance = config.onReachBottomDistance || ((_a = this.config.window) === null || _a === void 0 ? void 0 : _a.onReachBottomDistance) || 50;
         bindPageScroll(page, pageEl, distance);
         bindPageResize(page);
     }
 }
 
-/* eslint-disable dot-notation */
 function createRouter(app, config, framework) {
+    var _a, _b, _c;
     RouterConfig.config = config;
     const handler = new PageHandler(config);
     const runtimeHooks = container.get(SERVICE_IDENTIFIER.Hooks);
@@ -680,19 +725,20 @@ function createRouter(app, config, framework) {
         path: routesAlias.getAll(addLeadingSlash(route.path)),
         action: route.load
     }));
-    const entryPagePath = config.entryPagePath || routes[0].path?.[0];
+    const entryPagePath = config.entryPagePath || ((_a = routes[0].path) === null || _a === void 0 ? void 0 : _a[0]) || '';
     const router = new UniversalRouter(routes, { baseUrl: basename || '' });
     const launchParam = handler.getQuery(stacks.length);
-    app.onLaunch?.(launchParam);
-    const render = async ({ location, action }) => {
+    (_b = app.onLaunch) === null || _b === void 0 ? void 0 : _b.call(app, launchParam);
+    const render = ({ location, action }) => __awaiter(this, void 0, void 0, function* () {
+        var _d, _e, _f, _g, _h;
         handler.pathname = decodeURI(location.pathname);
         let element;
         try {
-            element = await router.resolve(handler.router.forcePath || handler.pathname);
+            element = yield router.resolve(handler.router.forcePath || handler.pathname);
         }
         catch (error) {
             if (error.status === 404) {
-                app.onPageNotFound?.({
+                (_d = app.onPageNotFound) === null || _d === void 0 ? void 0 : _d.call(app, {
                     path: handler.pathname
                 });
             }
@@ -703,14 +749,14 @@ function createRouter(app, config, framework) {
         if (!element)
             return;
         const pageConfig = handler.pageConfig;
-        let enablePullDownRefresh = config?.window?.enablePullDownRefresh || false;
+        let enablePullDownRefresh = ((_e = config === null || config === void 0 ? void 0 : config.window) === null || _e === void 0 ? void 0 : _e.enablePullDownRefresh) || false;
         eventCenter.trigger('__taroRouterChange', {
             toLocation: {
                 path: handler.pathname
             }
         });
         if (pageConfig) {
-            document.title = pageConfig.navigationBarTitleText ?? document.title;
+            document.title = (_f = pageConfig.navigationBarTitleText) !== null && _f !== void 0 ? _f : document.title;
             if (typeof pageConfig.enablePullDownRefresh === 'boolean') {
                 enablePullDownRefresh = pageConfig.enablePullDownRefresh;
             }
@@ -752,28 +798,25 @@ function createRouter(app, config, framework) {
             shouldLoad = true;
         }
         if (shouldLoad || stacks.length < 1) {
-            const el = element.default ?? element;
-            const loadConfig = { ...pageConfig };
+            const el = (_g = element.default) !== null && _g !== void 0 ? _g : element;
+            const loadConfig = Object.assign({}, pageConfig);
             const stacksIndex = stacks.length;
             delete loadConfig['path'];
             delete loadConfig['load'];
-            const page = createPageConfig(enablePullDownRefresh ? runtimeHooks.createPullDownComponent?.(el, location.pathname, framework, handler.PullDownRefresh) : el, pathname + stringify(handler.getQuery(stacksIndex)), {}, loadConfig);
+            const page = createPageConfig(enablePullDownRefresh ? (_h = runtimeHooks.createPullDownComponent) === null || _h === void 0 ? void 0 : _h.call(runtimeHooks, el, location.pathname, framework, handler.PullDownRefresh) : el, pathname + stringify(handler.getQuery(stacksIndex)), {}, loadConfig);
             return handler.load(page, pageConfig, stacksIndex);
         }
-    };
-    if (history.location.pathname === '/') {
-        const stripped = stripBasename(history.location.pathname, handler.basename);
-        if (stripped === '/' || stripped === '') {
-            history.replace(prependBasename(entryPagePath + history.location.search));
-        }
+    });
+    const stripped = stripBasename(history.location.pathname, handler.basename);
+    if (stripped === '/' || stripped === '') {
+        history.replace(prependBasename(entryPagePath + history.location.search));
     }
     render({ location: history.location, action: Action.Push });
-    app.onShow?.(launchParam);
+    (_c = app.onShow) === null || _c === void 0 ? void 0 : _c.call(app, launchParam);
     return history.listen(render);
 }
 
 class MultiPageHandler {
-    config;
     constructor(config) {
         this.config = config;
         this.mount();
@@ -782,23 +825,24 @@ class MultiPageHandler {
     get router() { return this.config.router; }
     get routerMode() { return this.router.mode || 'hash'; }
     get customRoutes() { return this.router.customRoutes || {}; }
-    get tabBarList() { return this.config.tabBar?.list || []; }
+    get tabBarList() { var _a; return ((_a = this.config.tabBar) === null || _a === void 0 ? void 0 : _a.list) || []; }
     get PullDownRefresh() { return this.config.PullDownRefresh; }
     set pathname(p) { this.router.pathname = p; }
     get pathname() { return this.router.pathname; }
     get basename() { return this.router.basename || ''; }
     get pageConfig() { return this.config.route; }
     get isTabBar() {
+        var _a;
         const routePath = stripBasename(this.pathname, this.basename);
-        const pagePath = Object.entries(this.customRoutes).find(([, target]) => {
+        const pagePath = ((_a = Object.entries(this.customRoutes).find(([, target]) => {
             if (typeof target === 'string') {
                 return target === routePath;
             }
-            else if (target?.length > 0) {
+            else if ((target === null || target === void 0 ? void 0 : target.length) > 0) {
                 return target.includes(routePath);
             }
             return false;
-        })?.[0] || routePath;
+        })) === null || _a === void 0 ? void 0 : _a[0]) || routePath;
         return !!pagePath && this.tabBarList.some(t => t.pagePath === pagePath);
     }
     get search() { return location.search.substr(1); }
@@ -807,11 +851,12 @@ class MultiPageHandler {
         const query = search
             ? queryString.parse(search)
             : {};
-        return { ...query, ...options };
+        return Object.assign(Object.assign({}, query), options);
     }
     mount() {
+        var _a;
         setHistoryMode(this.routerMode, this.router.basename);
-        document.getElementById('app')?.remove();
+        (_a = document.getElementById('app')) === null || _a === void 0 ? void 0 : _a.remove();
         const app = document.createElement('div');
         app.id = this.appId;
         app.classList.add('taro_router');
@@ -831,27 +876,31 @@ class MultiPageHandler {
         }
     }
     onReady(page, onLoad = true) {
+        var _a;
         const pageEl = this.getPageContainer(page);
-        if (pageEl && !pageEl?.['__isReady']) {
+        if (pageEl && !(pageEl === null || pageEl === void 0 ? void 0 : pageEl['__isReady'])) {
             const el = pageEl.firstElementChild;
-            el?.['componentOnReady']?.();
+            (_a = el === null || el === void 0 ? void 0 : el['componentOnReady']) === null || _a === void 0 ? void 0 : _a.call(el);
             onLoad && (pageEl['__page'] = page);
         }
     }
     load(page, pageConfig = {}) {
+        var _a;
         if (!page)
             return;
-        page.onLoad?.(this.getQuery('', page.options), () => {
+        (_a = page.onLoad) === null || _a === void 0 ? void 0 : _a.call(page, this.getQuery('', page.options), () => {
+            var _a;
             const pageEl = this.getPageContainer(page);
-            this.isTabBar && pageEl?.classList.add('taro_tabbar_page');
+            this.isTabBar && (pageEl === null || pageEl === void 0 ? void 0 : pageEl.classList.add('taro_tabbar_page'));
             this.onReady(page, true);
-            page.onShow?.();
+            (_a = page.onShow) === null || _a === void 0 ? void 0 : _a.call(page);
             this.bindPageEvents(page, pageEl, pageConfig);
         });
     }
     getPageContainer(page) {
-        const path = page ? page?.path : Current.page?.path;
-        const id = path?.replace(/([^a-z0-9\u00a0-\uffff_-])/ig, '\\$1');
+        var _a;
+        const path = page ? page === null || page === void 0 ? void 0 : page.path : (_a = Current.page) === null || _a === void 0 ? void 0 : _a.path;
+        const id = path === null || path === void 0 ? void 0 : path.replace(/([^a-z0-9\u00a0-\uffff_-])/ig, '\\$1');
         if (page) {
             return document.querySelector(`.taro_page#${id}`);
         }
@@ -862,16 +911,16 @@ class MultiPageHandler {
         return el || window;
     }
     bindPageEvents(page, pageEl, config = {}) {
+        var _a;
         if (!pageEl) {
             pageEl = this.getPageContainer();
         }
-        const distance = config.onReachBottomDistance || this.config.window?.onReachBottomDistance || 50;
+        const distance = config.onReachBottomDistance || ((_a = this.config.window) === null || _a === void 0 ? void 0 : _a.onReachBottomDistance) || 50;
         bindPageScroll(page, pageEl, distance);
         bindPageResize(page);
     }
 }
 
-/* eslint-disable dot-notation */
 // TODO 支持多路由 (APP 生命周期仅触发一次)
 /** Note: 关于多页面应用
  * - 需要配置路由映射（根目录跳转、404 页面……）
@@ -880,43 +929,46 @@ class MultiPageHandler {
  * - TabBar 会多次加载
  * - 不支持路由动画
  */
-async function createMultiRouter(app, config, framework) {
-    RouterConfig.config = config;
-    const handler = new MultiPageHandler(config);
-    const runtimeHooks = container.get(SERVICE_IDENTIFIER.Hooks);
-    const launchParam = handler.getQuery();
-    app.onLaunch?.(launchParam);
-    const pathName = config.pageName;
-    const pageConfig = handler.pageConfig;
-    let element;
-    try {
-        element = await pageConfig.load?.();
-    }
-    catch (error) {
-        throw new Error(error);
-    }
-    if (!element)
-        return;
-    let enablePullDownRefresh = config?.window?.enablePullDownRefresh || false;
-    eventCenter.trigger('__taroRouterChange', {
-        toLocation: {
-            path: pathName
+function createMultiRouter(app, config, framework) {
+    var _a, _b, _c, _d, _e, _f, _g;
+    return __awaiter(this, void 0, void 0, function* () {
+        RouterConfig.config = config;
+        const handler = new MultiPageHandler(config);
+        const runtimeHooks = container.get(SERVICE_IDENTIFIER.Hooks);
+        const launchParam = handler.getQuery();
+        (_a = app.onLaunch) === null || _a === void 0 ? void 0 : _a.call(app, launchParam);
+        const pathName = config.pageName;
+        const pageConfig = handler.pageConfig;
+        let element;
+        try {
+            element = yield ((_b = pageConfig.load) === null || _b === void 0 ? void 0 : _b.call(pageConfig));
+        }
+        catch (error) {
+            throw new Error(error);
+        }
+        if (!element)
+            return;
+        let enablePullDownRefresh = ((_c = config === null || config === void 0 ? void 0 : config.window) === null || _c === void 0 ? void 0 : _c.enablePullDownRefresh) || false;
+        eventCenter.trigger('__taroRouterChange', {
+            toLocation: {
+                path: pathName
+            }
+        });
+        if (pageConfig) {
+            document.title = (_d = pageConfig.navigationBarTitleText) !== null && _d !== void 0 ? _d : document.title;
+            if (typeof pageConfig.enablePullDownRefresh === 'boolean') {
+                enablePullDownRefresh = pageConfig.enablePullDownRefresh;
+            }
         }
+        const el = (_e = element.default) !== null && _e !== void 0 ? _e : element;
+        const loadConfig = Object.assign({}, pageConfig);
+        delete loadConfig['path'];
+        delete loadConfig['load'];
+        const page = createPageConfig(enablePullDownRefresh ? (_f = runtimeHooks.createPullDownComponent) === null || _f === void 0 ? void 0 : _f.call(runtimeHooks, el, location.pathname, framework, config.PullDownRefresh) : el, pathName + stringify(launchParam), {}, loadConfig);
+        handler.load(page, pageConfig);
+        (_g = app.onShow) === null || _g === void 0 ? void 0 : _g.call(app, launchParam);
     });
-    if (pageConfig) {
-        document.title = pageConfig.navigationBarTitleText ?? document.title;
-        if (typeof pageConfig.enablePullDownRefresh === 'boolean') {
-            enablePullDownRefresh = pageConfig.enablePullDownRefresh;
-        }
-    }
-    const el = element.default ?? element;
-    const loadConfig = { ...pageConfig };
-    delete loadConfig['path'];
-    delete loadConfig['load'];
-    const page = createPageConfig(enablePullDownRefresh ? runtimeHooks.createPullDownComponent?.(el, location.pathname, framework, config.PullDownRefresh) : el, pathName + stringify(launchParam), {}, loadConfig);
-    handler.load(page, pageConfig);
-    app.onShow?.(launchParam);
 }
 
 export { createMultiRouter, createRouter, getCurrentPages, history, navigateBack, navigateTo, reLaunch, redirectTo, switchTab };
-//# sourceMappingURL=router.esm.js.map
+//# sourceMappingURL=index.esm.js.map