@tarojs/router 3.5.0-alpha.1 → 3.5.0-alpha.2

package/dist/router/spa.js

@@ -1,110 +0,0 @@
-/* eslint-disable dot-notation */
-import { container, createPageConfig, Current, eventCenter, SERVICE_IDENTIFIER, stringify } from '@tarojs/runtime';
-import { Action as LocationAction } from 'history';
-import UniversalRouter from 'universal-router';
-import { history, prependBasename } from '../history';
-import PageHandler from './page';
-import stacks from './stack';
-import { addLeadingSlash, routesAlias, stripBasename } from '../utils';
-import { RouterConfig } from '.';
-export function createRouter(app, config, framework) {
-    RouterConfig.config = config;
-    const handler = new PageHandler(config);
-    const runtimeHooks = container.get(SERVICE_IDENTIFIER.Hooks);
-    routesAlias.set(handler.router.customRoutes);
-    const basename = handler.router.basename;
-    const routes = handler.routes.map(route => ({
-        path: routesAlias.getAll(addLeadingSlash(route.path)),
-        action: route.load
-    }));
-    const entryPagePath = config.entryPagePath || routes[0].path?.[0];
-    const router = new UniversalRouter(routes, { baseUrl: basename || '' });
-    const launchParam = handler.getQuery(stacks.length);
-    app.onLaunch?.(launchParam);
-    const render = async ({ location, action }) => {
-        handler.pathname = decodeURI(location.pathname);
-        let element;
-        try {
-            element = await router.resolve(handler.router.forcePath || handler.pathname);
-        }
-        catch (error) {
-            if (error.status === 404) {
-                app.onPageNotFound?.({
-                    path: handler.pathname
-                });
-            }
-            else {
-                throw new Error(error);
-            }
-        }
-        if (!element)
-            return;
-        const pageConfig = handler.pageConfig;
-        let enablePullDownRefresh = config?.window?.enablePullDownRefresh || false;
-        eventCenter.trigger('__taroRouterChange', {
-            toLocation: {
-                path: handler.pathname
-            }
-        });
-        if (pageConfig) {
-            document.title = pageConfig.navigationBarTitleText ?? document.title;
-            if (typeof pageConfig.enablePullDownRefresh === 'boolean') {
-                enablePullDownRefresh = pageConfig.enablePullDownRefresh;
-            }
-        }
-        const currentPage = Current.page;
-        const pathname = handler.pathname;
-        let shouldLoad = false;
-        if (action === 'POP') {
-            // NOTE: 浏览器事件退后多次时，该事件只会被触发一次
-            const prevIndex = stacks.getPrevIndex(pathname);
-            const delta = stacks.getDelta(pathname);
-            handler.unload(currentPage, delta, prevIndex > -1);
-            if (prevIndex > -1) {
-                handler.show(stacks.getItem(prevIndex), pageConfig, prevIndex);
-            }
-            else {
-                shouldLoad = true;
-            }
-        }
-        else {
-            if (handler.isTabBar) {
-                if (handler.isSamePage(currentPage))
-                    return;
-                const prevIndex = stacks.getPrevIndex(pathname, 0);
-                handler.hide(currentPage);
-                if (prevIndex > -1) {
-                    // NOTE: tabbar 页且之前出现过，直接复用
-                    return handler.show(stacks.getItem(prevIndex), pageConfig, prevIndex);
-                }
-            }
-            else if (action === 'REPLACE') {
-                const delta = stacks.getDelta(pathname);
-                // NOTE: 页面路由记录并不会清空，只是移除掉缓存的 stack 以及页面
-                handler.unload(currentPage, delta);
-            }
-            else if (action === 'PUSH') {
-                handler.hide(currentPage);
-            }
-            shouldLoad = true;
-        }
-        if (shouldLoad || stacks.length < 1) {
-            const el = element.default ?? element;
-            const loadConfig = { ...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);
-            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));
-        }
-    }
-    render({ location: history.location, action: LocationAction.Push });
-    app.onShow?.(launchParam);
-    return history.listen(render);
-}

package/dist/router/stack.js

@@ -1,57 +0,0 @@
-class Stacks {
-    stacks = [];
-    backDelta = 0;
-    set delta(delta) {
-        if (delta > 0) {
-            this.backDelta = delta;
-        }
-        else if (this.backDelta > 0) {
-            --this.backDelta;
-        }
-        else {
-            this.backDelta = 0;
-        }
-    }
-    get delta() {
-        return this.backDelta;
-    }
-    get length() {
-        return this.stacks.length;
-    }
-    get last() {
-        return this.stacks[this.length - 1];
-    }
-    get() {
-        return this.stacks;
-    }
-    getItem(index) {
-        return this.stacks[index];
-    }
-    getLastIndex(pathname, stateWith = 1) {
-        const list = [...this.stacks].reverse();
-        return list.findIndex((page, i) => i >= stateWith && page.path?.replace(/\?.*/g, '') === pathname);
-    }
-    getDelta(pathname) {
-        if (this.backDelta >= 1) {
-            return this.backDelta;
-        }
-        const index = this.getLastIndex(pathname);
-        // NOTE: 此处为了修复浏览器后退多级页面，在大量重复路由状况下可能出现判断错误的情况 （增强判断能力只能考虑在 query 中新增参数来判断，暂时搁置）
-        return index > 0 ? index : 1;
-    }
-    getPrevIndex(pathname, stateWith = 1) {
-        const lastIndex = this.getLastIndex(pathname, stateWith);
-        if (lastIndex < 0) {
-            return -1;
-        }
-        return this.length - 1 - lastIndex;
-    }
-    pop() {
-        return this.stacks.pop();
-    }
-    push(page) {
-        return this.stacks.push(page);
-    }
-}
-const stacks = new Stacks();
-export default stacks;

package/dist/tabbar.js

@@ -1,29 +0,0 @@
-// @ts-nocheck
-import { initTabBarApis } from '@tarojs/taro';
-import { history } from './history';
-export function initTabbar(config) {
-    if (config.tabBar == null) {
-        return;
-    }
-    // TODO: custom-tab-bar
-    const tabbar = document.createElement('taro-tabbar');
-    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;
-    tabbar.conf.mode = routerConfig && routerConfig.mode ? routerConfig.mode : 'hash';
-    if (routerConfig.customRoutes) {
-        tabbar.conf.custom = true;
-        tabbar.conf.customRoutes = routerConfig.customRoutes;
-    }
-    else {
-        tabbar.conf.custom = false;
-        tabbar.conf.customRoutes = {};
-    }
-    if (typeof routerConfig.basename !== 'undefined') {
-        tabbar.conf.basename = routerConfig.basename;
-    }
-    const container = document.getElementById('container');
-    container?.appendChild(tabbar);
-    initTabBarApis(config);
-}

package/dist/utils.js

@@ -1,39 +0,0 @@
-export const addLeadingSlash = (url = '') => (url.charAt(0) === '/' ? url : '/' + url);
-export const hasBasename = (path = '', prefix = '') => new RegExp('^' + prefix + '(\\/|\\?|#|$)', 'i').test(path) || path === prefix;
-export const stripBasename = (path = '', prefix = '') => hasBasename(path, prefix) ? path.substr(prefix.length) : path;
-class RoutesAlias {
-    conf = [];
-    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?.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;
-        }, []);
-    };
-}
-export const routesAlias = new RoutesAlias();