From da15d2fe21ab4731a952d4f63d0bf79019e61070 Mon Sep 17 00:00:00 2001 From: Kobi Date: Thu, 28 Apr 2022 17:06:12 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=97=A0JIRA=E4=BB=BB=E5=8A=A1=20router?= =?UTF-8?q?=E6=94=AF=E6=8C=81base=E5=92=8Cmode?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/router/router.js | 820 ++++++++++++++++++++++--------------------- 1 file changed, 411 insertions(+), 409 deletions(-) diff --git a/src/router/router.js b/src/router/router.js index efcf2f777..d5aa14c80 100644 --- a/src/router/router.js +++ b/src/router/router.js @@ -8,41 +8,41 @@ typeof define === 'function' && define.amd ? define(factory) : (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory()); }(this, (function () { 'use strict'; - + /* */ - + function assert (condition, message) { if (!condition) { throw new Error(("[vue-router] " + message)) } } - + function warn (condition, message) { if (!condition) { typeof console !== 'undefined' && console.warn(("[vue-router] " + message)); } } - + function extend (a, b) { for (var key in b) { a[key] = b[key]; } return a } - + /* */ - + var encodeReserveRE = /[!'()*]/g; var encodeReserveReplacer = function (c) { return '%' + c.charCodeAt(0).toString(16); }; var commaRE = /%2C/g; - + // fixed encodeURIComponent which is more conformant to RFC3986: // - escapes [!'()*] // - preserve commas var encode = function (str) { return encodeURIComponent(str) .replace(encodeReserveRE, encodeReserveReplacer) .replace(commaRE, ','); }; - + function decode (str) { try { return decodeURIComponent(str) @@ -53,14 +53,14 @@ } return str } - + function resolveQuery ( query, extraQuery, _parseQuery ) { if ( extraQuery === void 0 ) extraQuery = {}; - + var parse = _parseQuery || parseQuery; var parsedQuery; try { @@ -77,23 +77,23 @@ } return parsedQuery } - + var castQueryParamValue = function (value) { return (value == null || typeof value === 'object' ? value : String(value)); }; - + function parseQuery (query) { var res = {}; - + query = query.trim().replace(/^(\?|#|&)/, ''); - + if (!query) { return res } - + query.split('&').forEach(function (param) { var parts = param.replace(/\+/g, ' ').split('='); var key = decode(parts.shift()); var val = parts.length > 0 ? decode(parts.join('=')) : null; - + if (res[key] === undefined) { res[key] = val; } else if (Array.isArray(res[key])) { @@ -102,24 +102,24 @@ res[key] = [res[key], val]; } }); - + return res } - + function stringifyQuery (obj) { var res = obj ? Object.keys(obj) .map(function (key) { var val = obj[key]; - + if (val === undefined) { return '' } - + if (val === null) { return encode(key) } - + if (Array.isArray(val)) { var result = []; val.forEach(function (val2) { @@ -134,7 +134,7 @@ }); return result.join('&') } - + return encode(key) + '=' + encode(val) }) .filter(function (x) { return x.length > 0; }) @@ -142,11 +142,11 @@ : null; return res ? ("?" + res) : '' } - + /* */ - + var trailingSlashRE = /\/?$/; - + function createRoute ( record, location, @@ -154,12 +154,12 @@ router ) { var stringifyQuery = router && router.options.stringifyQuery; - + var query = location.query || {}; try { query = clone(query); } catch (e) {} - + var route = { name: location.name || (record && record.name), meta: (record && record.meta) || {}, @@ -175,7 +175,7 @@ } return Object.freeze(route) } - + function clone (value) { if (Array.isArray(value)) { return value.map(clone) @@ -189,12 +189,12 @@ return value } } - + // the starting route that represents the initial state var START = createRoute(null, { path: '/' }); - + function formatMatch (record) { var res = []; while (record) { @@ -203,7 +203,7 @@ } return res } - + function getFullPath ( ref, _stringifyQuery @@ -211,11 +211,11 @@ var path = ref.path; var query = ref.query; if ( query === void 0 ) query = {}; var hash = ref.hash; if ( hash === void 0 ) hash = ''; - + var stringify = _stringifyQuery || stringifyQuery; return (path || '/') + stringify(query) + hash } - + function isSameRoute (a, b, onlyPath) { if (b === START) { return a === b @@ -238,11 +238,11 @@ return false } } - + function isObjectEqual (a, b) { if ( a === void 0 ) a = {}; if ( b === void 0 ) b = {}; - + // handle null value #1566 if (!a || !b) { return a === b } var aKeys = Object.keys(a).sort(); @@ -264,7 +264,7 @@ return String(aVal) === String(bVal) }) } - + function isIncludedRoute (current, target) { return ( current.path.replace(trailingSlashRE, '/').indexOf( @@ -274,7 +274,7 @@ queryIncludes(current.query, target.query) ) } - + function queryIncludes (current, target) { for (var key in target) { if (!(key in current)) { @@ -283,7 +283,7 @@ } return true } - + function handleRouteEntered (route) { for (var i = 0; i < route.matched.length; i++) { var record = route.matched[i]; @@ -298,7 +298,7 @@ } } } - + // var View = { // name: 'RouterView', // functional: true, @@ -313,17 +313,17 @@ // var children = ref.children; // var parent = ref.parent; // var data = ref.data; - + // // used by devtools to display a router-view badge // data.routerView = true; - + // // directly use parent context's createElement() function // // so that components rendered by router-view can resolve named slots // var h = parent.$createElement; // var name = props.name; // var route = parent.$route; // var cache = parent._routerViewCache || (parent._routerViewCache = {}); - + // // determine current view depth, also check to see if the tree // // has been toggled inactive but kept-alive. // var depth = 0; @@ -339,7 +339,7 @@ // parent = parent.$parent; // } // data.routerViewDepth = depth; - + // // render previous view if the tree is inactive and kept-alive // if (inactive) { // var cachedData = cache[name]; @@ -356,19 +356,19 @@ // return h() // } // } - + // var matched = route.matched[depth]; // var component = matched && matched.components[name]; - + // // render empty node if no matched route or no config component // if (!matched || !component) { // cache[name] = null; // return h() // } - + // // cache component // cache[name] = { component: component }; - + // // attach instance registration hook // // this will be called in the instance's injected lifecycle hooks // data.registerRouteInstance = function (vm, val) { @@ -381,13 +381,13 @@ // matched.instances[name] = val; // } // } - + // // also register instance in prepatch hook // // in case the same component instance is reused across different routes // ;(data.hook || (data.hook = {})).prepatch = function (_, vnode) { // matched.instances[name] = vnode.componentInstance; // }; - + // // register instance in init hook // // in case kept-alive component be actived when routes changed // data.hook.init = function (vnode) { @@ -397,13 +397,13 @@ // ) { // matched.instances[name] = vnode.componentInstance; // } - + // // if the route transition has already been confirmed then we weren't // // able to call the cbs during confirmation as the component was not // // registered yet, so we call it here. // handleRouteEntered(route); // }; - + // var configProps = matched.props && matched.props[name]; // // save route and configProps in cache // if (configProps) { @@ -413,11 +413,11 @@ // }); // fillPropsinData(component, data, route, configProps); // } - + // return h(component, data, children) // } // }; - + // function fillPropsinData (component, data, route, configProps) { // // resolve props // var propsToPass = data.props = resolveProps(route, configProps); @@ -434,7 +434,7 @@ // } // } // } - + // function resolveProps (route, config) { // switch (typeof config) { // case 'undefined': @@ -455,9 +455,9 @@ // } // } // } - + /* */ - + function resolvePath ( relative, base, @@ -467,20 +467,20 @@ if (firstChar === '/') { return relative } - + if (firstChar === '?' || firstChar === '#') { return base + relative } - + var stack = base.split('/'); - + // remove trailing segment if: // - not appending // - appending to trailing slash (last segment is empty) if (!append || !stack[stack.length - 1]) { stack.pop(); } - + // resolve relative path var segments = relative.replace(/^\//, '').split('/'); for (var i = 0; i < segments.length; i++) { @@ -491,46 +491,46 @@ stack.push(segment); } } - + // ensure leading slash if (stack[0] !== '') { stack.unshift(''); } - + return stack.join('/') } - + function parsePath (path) { var hash = ''; var query = ''; - + var hashIndex = path.indexOf('#'); if (hashIndex >= 0) { hash = path.slice(hashIndex); path = path.slice(0, hashIndex); } - + var queryIndex = path.indexOf('?'); if (queryIndex >= 0) { query = path.slice(queryIndex + 1); path = path.slice(0, queryIndex); } - + return { path: path, query: query, hash: hash } } - + function cleanPath (path) { return path.replace(/\/\//g, '/') } - + var isarray = Array.isArray || function (arr) { return Object.prototype.toString.call(arr) == '[object Array]'; }; - + /** * Expose `pathToRegexp`. */ @@ -539,7 +539,7 @@ var compile_1 = compile; var tokensToFunction_1 = tokensToFunction; var tokensToRegExp_1 = tokensToRegExp; - + /** * The main path matching regexp utility. * @@ -557,7 +557,7 @@ // "/*" => ["/", undefined, undefined, undefined, undefined, "*"] '([\\/.])?(?:(?:\\:(\\w+)(?:\\(((?:\\\\.|[^\\\\()])+)\\))?|\\(((?:\\\\.|[^\\\\()])+)\\))([+*?])?|(\\*))' ].join('|'), 'g'); - + /** * Parse a string for the raw tokens. * @@ -572,20 +572,20 @@ var path = ''; var defaultDelimiter = options && options.delimiter || '/'; var res; - + while ((res = PATH_REGEXP.exec(str)) != null) { var m = res[0]; var escaped = res[1]; var offset = res.index; path += str.slice(index, offset); index = offset + m.length; - + // Ignore already escaped sequences. if (escaped) { path += escaped[1]; continue } - + var next = str[index]; var prefix = res[2]; var name = res[3]; @@ -593,19 +593,19 @@ var group = res[5]; var modifier = res[6]; var asterisk = res[7]; - + // Push the current path onto the tokens. if (path) { tokens.push(path); path = ''; } - + var partial = prefix != null && next != null && next !== prefix; var repeat = modifier === '+' || modifier === '*'; var optional = modifier === '?' || modifier === '*'; var delimiter = res[2] || defaultDelimiter; var pattern = capture || group; - + tokens.push({ name: name || key++, prefix: prefix || '', @@ -617,20 +617,20 @@ pattern: pattern ? escapeGroup(pattern) : (asterisk ? '.*' : '[^' + escapeString(delimiter) + ']+?') }); } - + // Match any characters still remaining. if (index < str.length) { path += str.substr(index); } - + // If the path exists, push it onto the end. if (path) { tokens.push(path); } - + return tokens } - + /** * Compile a string to a template function for the path. * @@ -641,7 +641,7 @@ function compile (str, options) { return tokensToFunction(parse(str, options), options) } - + /** * Prettier encoding of URI path segments. * @@ -653,7 +653,7 @@ return '%' + c.charCodeAt(0).toString(16).toUpperCase() }) } - + /** * Encode the asterisk parameter. Similar to `pretty`, but allows slashes. * @@ -665,57 +665,57 @@ return '%' + c.charCodeAt(0).toString(16).toUpperCase() }) } - + /** * Expose a method for transforming tokens into the path function. */ function tokensToFunction (tokens, options) { // Compile all the tokens into regexps. var matches = new Array(tokens.length); - + // Compile all the patterns before compilation. for (var i = 0; i < tokens.length; i++) { if (typeof tokens[i] === 'object') { matches[i] = new RegExp('^(?:' + tokens[i].pattern + ')$', flags(options)); } } - + return function (obj, opts) { var path = ''; var data = obj || {}; var options = opts || {}; var encode = options.pretty ? encodeURIComponentPretty : encodeURIComponent; - + for (var i = 0; i < tokens.length; i++) { var token = tokens[i]; - + if (typeof token === 'string') { path += token; - + continue } - + var value = data[token.name]; var segment; - + if (value == null) { if (token.optional) { // Prepend partial segment prefixes. if (token.partial) { path += token.prefix; } - + continue } else { throw new TypeError('Expected "' + token.name + '" to be defined') } } - + if (isarray(value)) { if (!token.repeat) { throw new TypeError('Expected "' + token.name + '" to not repeat, but received `' + JSON.stringify(value) + '`') } - + if (value.length === 0) { if (token.optional) { continue @@ -723,33 +723,33 @@ throw new TypeError('Expected "' + token.name + '" to not be empty') } } - + for (var j = 0; j < value.length; j++) { segment = encode(value[j]); - + if (!matches[i].test(segment)) { throw new TypeError('Expected all "' + token.name + '" to match "' + token.pattern + '", but received `' + JSON.stringify(segment) + '`') } - + path += (j === 0 ? token.prefix : token.delimiter) + segment; } - + continue } - + segment = token.asterisk ? encodeAsterisk(value) : encode(value); - + if (!matches[i].test(segment)) { throw new TypeError('Expected "' + token.name + '" to match "' + token.pattern + '", but received "' + segment + '"') } - + path += token.prefix + segment; } - + return path } } - + /** * Escape a regular expression string. * @@ -759,7 +759,7 @@ function escapeString (str) { return str.replace(/([.+*?=^!:${}()[\]|\/\\])/g, '\\$1') } - + /** * Escape the capturing group by escaping special characters and meaning. * @@ -769,7 +769,7 @@ function escapeGroup (group) { return group.replace(/([=!:$\/()])/g, '\\$1') } - + /** * Attach the keys as a property of the regexp. * @@ -781,7 +781,7 @@ re.keys = keys; return re } - + /** * Get the flags for a regexp from the options. * @@ -791,7 +791,7 @@ function flags (options) { return options && options.sensitive ? '' : 'i' } - + /** * Pull out keys from a regexp. * @@ -802,7 +802,7 @@ function regexpToRegexp (path, keys) { // Use a negative lookahead to match only capturing groups. var groups = path.source.match(/\((?!\?)/g); - + if (groups) { for (var i = 0; i < groups.length; i++) { keys.push({ @@ -817,10 +817,10 @@ }); } } - + return attachKeys(path, keys) } - + /** * Transform an array into a regexp. * @@ -831,16 +831,16 @@ */ function arrayToRegexp (path, keys, options) { var parts = []; - + for (var i = 0; i < path.length; i++) { parts.push(pathToRegexp(path[i], keys, options).source); } - + var regexp = new RegExp('(?:' + parts.join('|') + ')', flags(options)); - + return attachKeys(regexp, keys) } - + /** * Create a path regexp from string input. * @@ -852,7 +852,7 @@ function stringToRegexp (path, keys, options) { return tokensToRegExp(parse(path, options), keys, options) } - + /** * Expose a function for taking tokens and returning a RegExp. * @@ -866,29 +866,29 @@ options = /** @type {!Object} */ (keys || options); keys = []; } - + options = options || {}; - + var strict = options.strict; var end = options.end !== false; var route = ''; - + // Iterate over the tokens and create our regexp string. for (var i = 0; i < tokens.length; i++) { var token = tokens[i]; - + if (typeof token === 'string') { route += escapeString(token); } else { var prefix = escapeString(token.prefix); var capture = '(?:' + token.pattern + ')'; - + keys.push(token); - + if (token.repeat) { capture += '(?:' + prefix + capture + ')*'; } - + if (token.optional) { if (!token.partial) { capture = '(?:' + prefix + '(' + capture + '))?'; @@ -898,14 +898,14 @@ } else { capture = prefix + '(' + capture + ')'; } - + route += capture; } } - + var delimiter = escapeString(options.delimiter || '/'); var endsWithDelimiter = route.slice(-delimiter.length) === delimiter; - + // In non-strict mode we allow a slash at the end of match. If the path to // match already ends with a slash, we remove it for consistency. The slash // is valid at the end of a path match, not in the middle. This is important @@ -913,7 +913,7 @@ if (!strict) { route = (endsWithDelimiter ? route.slice(0, -delimiter.length) : route) + '(?:' + delimiter + '(?=$))?'; } - + if (end) { route += '$'; } else { @@ -921,10 +921,10 @@ // possible by using a positive lookahead to the end or next path segment. route += strict && endsWithDelimiter ? '' : '(?=' + delimiter + '|$)'; } - + return attachKeys(new RegExp('^' + route, flags(options)), keys) } - + /** * Normalize the given path string, returning a regular expression. * @@ -942,29 +942,29 @@ options = /** @type {!Object} */ (keys || options); keys = []; } - + options = options || {}; - + if (path instanceof RegExp) { return regexpToRegexp(path, /** @type {!Array} */ (keys)) } - + if (isarray(path)) { return arrayToRegexp(/** @type {!Array} */ (path), /** @type {!Array} */ (keys), options) } - + return stringToRegexp(/** @type {string} */ (path), /** @type {!Array} */ (keys), options) } pathToRegexp_1.parse = parse_1; pathToRegexp_1.compile = compile_1; pathToRegexp_1.tokensToFunction = tokensToFunction_1; pathToRegexp_1.tokensToRegExp = tokensToRegExp_1; - + /* */ - + // $flow-disable-line var regexpCompileCache = Object.create(null); - + function fillParams ( path, params, @@ -975,11 +975,11 @@ var filler = regexpCompileCache[path] || (regexpCompileCache[path] = pathToRegexp_1.compile(path)); - + // Fix #2505 resolving asterisk routes { name: 'not-found', params: { pathMatch: '/not-found' }} // and fix #3106 so that you can work with location descriptor object having params.pathMatch equal to empty string if (typeof params.pathMatch === 'string') { params[0] = params.pathMatch; } - + return filler(params, { pretty: true }) } catch (e) { { @@ -992,9 +992,9 @@ delete params[0]; } } - + /* */ - + function normalizeLocation ( raw, current, @@ -1013,7 +1013,7 @@ } return next } - + // relative params if (!next.path && next.params && current) { next = extend({}, next); @@ -1030,24 +1030,24 @@ } return next } - + var parsedPath = parsePath(next.path || ''); var basePath = (current && current.path) || '/'; var path = parsedPath.path ? resolvePath(parsedPath.path, basePath, append || next.append) : basePath; - + var query = resolveQuery( parsedPath.query, next.query, router && router.options.parseQuery ); - + var hash = next.hash || parsedPath.hash; if (hash && hash.charAt(0) !== '#') { hash = "#" + hash; } - + return { _normalized: true, path: path, @@ -1055,16 +1055,16 @@ hash: hash } } - + // var toTypes = [String, Object]; // var eventTypes = [String, Array]; - + // var noop = function () {}; - + // var warnedCustomSlot; // var warnedTagProp; // var warnedEventProp; - + // var Link = { // name: 'RouterLink', // props: { @@ -1094,7 +1094,7 @@ // }, // render: function render (h) { // var this$1 = this; - + // var router = this.$router; // var current = this.$route; // var ref = router.resolve( @@ -1105,7 +1105,7 @@ // var location = ref.location; // var route = ref.route; // var href = ref.href; - + // var classes = {}; // var globalActiveClass = router.options.linkActiveClass; // var globalExactActiveClass = router.options.linkExactActiveClass; @@ -1122,18 +1122,18 @@ // this.exactActiveClass == null // ? exactActiveClassFallback // : this.exactActiveClass; - + // var compareTarget = route.redirectedFrom // ? createRoute(null, normalizeLocation(route.redirectedFrom), null, router) // : route; - + // classes[exactActiveClass] = isSameRoute(current, compareTarget, this.exactPath); // classes[activeClass] = this.exact || this.exactPath // ? classes[exactActiveClass] // : isIncludedRoute(current, compareTarget); - + // var ariaCurrentValue = classes[exactActiveClass] ? this.ariaCurrentValue : null; - + // var handler = function (e) { // if (guardEvent(e)) { // if (this$1.replace) { @@ -1143,7 +1143,7 @@ // } // } // }; - + // var on = { click: guardEvent }; // if (Array.isArray(this.event)) { // this.event.forEach(function (e) { @@ -1152,9 +1152,9 @@ // } else { // on[this.event] = handler; // } - + // var data = { class: classes }; - + // var scopedSlot = // !this.$scopedSlots.$hasNormal && // this.$scopedSlots.default && @@ -1165,7 +1165,7 @@ // isActive: classes[activeClass], // isExactActive: classes[exactActiveClass] // }); - + // if (scopedSlot) { // if (!this.custom) { // !warnedCustomSlot && warn(false, 'In Vue Router 4, the v-slot API will by default wrap its content with an element. Use the custom prop to remove this warning:\n\n'); @@ -1183,7 +1183,7 @@ // return scopedSlot.length === 0 ? h() : h('span', {}, scopedSlot) // } // } - + // { // if ('tag' in this.$options.propsData && !warnedTagProp) { // warn( @@ -1200,7 +1200,7 @@ // warnedEventProp = true; // } // } - + // if (this.tag === 'a') { // data.on = on; // data.attrs = { href: href, 'aria-current': ariaCurrentValue }; @@ -1228,7 +1228,7 @@ // aData.on[event$1] = handler; // } // } - + // var aAttrs = (a.data.attrs = extend({}, a.data.attrs)); // aAttrs.href = href; // aAttrs['aria-current'] = ariaCurrentValue; @@ -1237,11 +1237,11 @@ // data.on = on; // } // } - + // return h(this.tag, data, this.$slots.default) // } // }; - + function guardEvent (e) { // don't redirect with control keys if (e.metaKey || e.altKey || e.ctrlKey || e.shiftKey) { return } @@ -1260,7 +1260,7 @@ } return true } - + function findAnchor (children) { if (children) { var child; @@ -1275,24 +1275,24 @@ } } } - + // var _Vue; - + // function install (Vue) { // if (install.installed && _Vue === Vue) { return } // install.installed = true; - + // _Vue = Vue; - + // var isDef = function (v) { return v !== undefined; }; - + // var registerInstance = function (vm, callVal) { // var i = vm.$options._parentVnode; // if (isDef(i) && isDef(i = i.data) && isDef(i = i.registerRouteInstance)) { // i(vm, callVal); // } // }; - + // Vue.mixin({ // beforeCreate: function beforeCreate () { // if (isDef(this.$options.router)) { @@ -1309,29 +1309,29 @@ // registerInstance(this); // } // }); - + // Object.defineProperty(Vue.prototype, '$router', { // get: function get () { return this._routerRoot._router } // }); - + // Object.defineProperty(Vue.prototype, '$route', { // get: function get () { return this._routerRoot._route } // }); - + // Vue.component('RouterView', View); // Vue.component('RouterLink', Link); - + // var strats = Vue.config.optionMergeStrategies; // // use the same hook merging strategy for route hooks // strats.beforeRouteEnter = strats.beforeRouteLeave = strats.beforeRouteUpdate = strats.created; // } - + /* */ - + var inBrowser = typeof window !== 'undefined'; - + /* */ - + function createRouteMap ( routes, oldPathList, @@ -1345,11 +1345,11 @@ var pathMap = oldPathMap || Object.create(null); // $flow-disable-line var nameMap = oldNameMap || Object.create(null); - + routes.forEach(function (route) { addRouteRecord(pathList, pathMap, nameMap, route, parentRoute); }); - + // ensure wildcard routes are always at the end for (var i = 0, l = pathList.length; i < l; i++) { if (pathList[i] === '*') { @@ -1358,26 +1358,26 @@ i--; } } - + { // warn if routes do not include leading slashes var found = pathList // check for missing leading slash .filter(function (path) { return path && path.charAt(0) !== '*' && path.charAt(0) !== '/'; }); - + if (found.length > 0) { var pathNames = found.map(function (path) { return ("- " + path); }).join('\n'); warn(false, ("Non-nested routes must include a leading slash character. Fix the following routes: \n" + pathNames)); } } - + return { pathList: pathList, pathMap: pathMap, nameMap: nameMap } } - + function addRouteRecord ( pathList, pathMap, @@ -1396,7 +1396,7 @@ path || name )) + " cannot be a " + "string id. Use an actual component instead." ); - + warn( // eslint-disable-next-line no-control-regex !/[^\u0000-\u007F]+/.test(path), @@ -1405,15 +1405,15 @@ "encodeURI to encode static segments of your path." ); } - + var pathToRegexpOptions = route.pathToRegexpOptions || {}; var normalizedPath = normalizePath(path, parent, pathToRegexpOptions.strict); - + if (typeof route.caseSensitive === 'boolean') { pathToRegexpOptions.sensitive = route.caseSensitive; } - + var record = { path: normalizedPath, regex: compileRouteRegex(normalizedPath, pathToRegexpOptions), @@ -1438,7 +1438,7 @@ ? route.props : { default: route.props } }; - + if (route.children) { // Warn if route is named, does not redirect and has a default child route. // If users navigate to this route by name, the default child will @@ -1466,12 +1466,12 @@ addRouteRecord(pathList, pathMap, nameMap, child, record, childMatchAs); }); } - + if (!pathMap[record.path]) { pathList.push(record.path); pathMap[record.path] = record; } - + if (route.alias !== undefined) { var aliases = Array.isArray(route.alias) ? route.alias : [route.alias]; for (var i = 0; i < aliases.length; ++i) { @@ -1484,7 +1484,7 @@ // skip in dev to make it work continue } - + var aliasRoute = { path: alias, children: route.children @@ -1499,7 +1499,7 @@ ); } } - + if (name) { if (!nameMap[name]) { nameMap[name] = record; @@ -1512,7 +1512,7 @@ } } } - + function compileRouteRegex ( path, pathToRegexpOptions @@ -1530,7 +1530,7 @@ } return regex } - + function normalizePath ( path, parent, @@ -1541,11 +1541,11 @@ if (parent == null) { return path } return cleanPath(((parent.path) + "/" + path)) } - + /* */ - - - + + + function createMatcher ( routes, router @@ -1554,16 +1554,16 @@ var pathList = ref.pathList; var pathMap = ref.pathMap; var nameMap = ref.nameMap; - + function addRoutes (routes) { createRouteMap(routes, pathList, pathMap, nameMap); } - + function addRoute (parentOrRoute, route) { var parent = (typeof parentOrRoute !== 'object') ? nameMap[parentOrRoute] : undefined; // $flow-disable-line createRouteMap([route || parentOrRoute], pathList, pathMap, nameMap, parent); - + // add aliases of parent if (parent && parent.alias.length) { createRouteMap( @@ -1576,11 +1576,11 @@ ); } } - + function getRoutes () { return pathList.map(function (path) { return pathMap[path]; }) } - + function match ( raw, currentRoute, @@ -1588,7 +1588,7 @@ ) { var location = normalizeLocation(raw, currentRoute, false, router); var name = location.name; - + if (name) { var record = nameMap[name]; { @@ -1598,11 +1598,11 @@ var paramNames = record.regex.keys .filter(function (key) { return !key.optional; }) .map(function (key) { return key.name; }); - + if (typeof location.params !== 'object') { location.params = {}; } - + if (currentRoute && typeof currentRoute.params === 'object') { for (var key in currentRoute.params) { if (!(key in location.params) && paramNames.indexOf(key) > -1) { @@ -1610,7 +1610,7 @@ } } } - + location.path = fillParams(record.path, location.params, ("named route \"" + name + "\"")); return _createRoute(record, location, redirectedFrom) } else if (location.path) { @@ -1626,7 +1626,7 @@ // no match return _createRoute(null, location) } - + function redirect ( record, location @@ -1635,11 +1635,11 @@ var redirect = typeof originalRedirect === 'function' ? originalRedirect(createRoute(record, location, null, router)) : originalRedirect; - + if (typeof redirect === 'string') { redirect = { path: redirect }; } - + if (!redirect || typeof redirect !== 'object') { { warn( @@ -1648,7 +1648,7 @@ } return _createRoute(null, location) } - + var re = redirect; var name = re.name; var path = re.path; @@ -1658,7 +1658,7 @@ query = re.hasOwnProperty('query') ? re.query : query; hash = re.hasOwnProperty('hash') ? re.hash : hash; params = re.hasOwnProperty('params') ? re.params : params; - + if (name) { // resolved named direct var targetRecord = nameMap[name]; @@ -1689,9 +1689,10 @@ warn(false, ("invalid redirect option: " + (JSON.stringify(redirect)))); } return _createRoute(null, location) + } } - + function alias ( record, location, @@ -1710,7 +1711,7 @@ } return _createRoute(null, location) } - + function _createRoute ( record, location, @@ -1724,7 +1725,7 @@ } return createRoute(record, location, redirectedFrom, router) } - + return { match: match, addRoute: addRoute, @@ -1732,20 +1733,20 @@ addRoutes: addRoutes } } - + function matchRoute ( regex, path, params ) { var m = path.match(regex); - + if (!m) { return false } else if (!params) { return true } - + for (var i = 1, len = m.length; i < len; ++i) { var key = regex.keys[i - 1]; if (key) { @@ -1753,40 +1754,40 @@ params[key.name || 'pathMatch'] = typeof m[i] === 'string' ? decode(m[i]) : m[i]; } } - + return true } - + function resolveRecordPath (path, record) { return resolvePath(path, record.parent ? record.parent.path : '/', true) } - + /* */ - + // use User Timing api (if present) for more accurate key precision var Time = inBrowser && window.performance && window.performance.now ? window.performance : Date; - + function genStateKey () { return Time.now().toFixed(3) } - + var _key = genStateKey(); - + function getStateKey () { return _key } - + function setStateKey (key) { return (_key = key) } - + /* */ - + var positionStore = Object.create(null); - + function setupScroll () { // Prevent browser scroll behavior on History popstate if ('scrollRestoration' in window.history) { @@ -1808,7 +1809,7 @@ window.removeEventListener('popstate', handlePopState); } } - + function handleScroll ( router, to, @@ -1818,16 +1819,16 @@ if (!router.app) { return } - + var behavior = router.options.scrollBehavior; if (!behavior) { return } - + { assert(typeof behavior === 'function', "scrollBehavior must be a function"); } - + // wait until re-render finishes before scrolling BI.nextTick(function () { var position = getScrollPosition(); @@ -1837,11 +1838,11 @@ from, isPop ? position : null ); - + if (!shouldScroll) { return } - + if (typeof shouldScroll.then === 'function') { shouldScroll .then(function (shouldScroll) { @@ -1857,7 +1858,7 @@ } }); } - + function saveScrollPosition () { var key = getStateKey(); if (key) { @@ -1867,21 +1868,21 @@ }; } } - + function handlePopState (e) { saveScrollPosition(); if (e.state && e.state.key) { setStateKey(e.state.key); } } - + function getScrollPosition () { var key = getStateKey(); if (key) { return positionStore[key] } } - + function getElementPosition (el, offset) { var docEl = document.documentElement; var docRect = docEl.getBoundingClientRect(); @@ -1891,31 +1892,31 @@ y: elRect.top - docRect.top - offset.y } } - + function isValidPosition (obj) { return isNumber(obj.x) || isNumber(obj.y) } - + function normalizePosition (obj) { return { x: isNumber(obj.x) ? obj.x : window.pageXOffset, y: isNumber(obj.y) ? obj.y : window.pageYOffset } } - + function normalizeOffset (obj) { return { x: isNumber(obj.x) ? obj.x : 0, y: isNumber(obj.y) ? obj.y : 0 } } - + function isNumber (v) { return typeof v === 'number' } - + var hashStartsWithNumberRE = /^#\d/; - + function scrollToPosition (shouldScroll, position) { var isObject = typeof shouldScroll === 'object'; if (isObject && typeof shouldScroll.selector === 'string') { @@ -1924,7 +1925,7 @@ var el = hashStartsWithNumberRE.test(shouldScroll.selector) // $flow-disable-line ? document.getElementById(shouldScroll.selector.slice(1)) // $flow-disable-line : document.querySelector(shouldScroll.selector); - + if (el) { var offset = shouldScroll.offset && typeof shouldScroll.offset === 'object' @@ -1938,7 +1939,7 @@ } else if (isObject && isValidPosition(shouldScroll)) { position = normalizePosition(shouldScroll); } - + if (position) { // $flow-disable-line if ('scrollBehavior' in document.documentElement.style) { @@ -1953,14 +1954,14 @@ } } } - + /* */ - + var supportsPushState = inBrowser && (function () { var ua = window.navigator.userAgent; - + if ( (ua.indexOf('Android 2.') !== -1 || ua.indexOf('Android 4.0') !== -1) && ua.indexOf('Mobile Safari') !== -1 && @@ -1969,10 +1970,10 @@ ) { return false } - + return window.history && typeof window.history.pushState === 'function' })(); - + function pushState (url, replace) { saveScrollPosition(); // try...catch the pushState call to get around Safari @@ -1991,13 +1992,13 @@ window.location[replace ? 'replace' : 'assign'](url); } } - + function replaceState (url) { pushState(url, true); } - + /* */ - + function runQueue (queue, fn, cb) { var step = function (index) { if (index >= queue.length) { @@ -2014,7 +2015,7 @@ }; step(0); } - + // When changing thing, also edit router.d.ts var NavigationFailureType = { redirected: 2, @@ -2022,7 +2023,7 @@ cancelled: 8, duplicated: 16 }; - + function createNavigationRedirectedError (from, to) { return createRouterError( from, @@ -2033,7 +2034,7 @@ )) + "\" via a navigation guard.") ) } - + function createNavigationDuplicatedError (from, to) { var error = createRouterError( from, @@ -2045,7 +2046,7 @@ error.name = 'NavigationDuplicated'; return error } - + function createNavigationCancelledError (from, to) { return createRouterError( from, @@ -2054,7 +2055,7 @@ ("Navigation cancelled from \"" + (from.fullPath) + "\" to \"" + (to.fullPath) + "\" with a new navigation.") ) } - + function createNavigationAbortedError (from, to) { return createRouterError( from, @@ -2063,19 +2064,19 @@ ("Navigation aborted from \"" + (from.fullPath) + "\" to \"" + (to.fullPath) + "\" via a navigation guard.") ) } - + function createRouterError (from, to, type, message) { var error = new Error(message); error._isRouter = true; error.from = from; error.to = to; error.type = type; - + return error } - + var propertiesToLog = ['params', 'query', 'hash']; - + function stringifyRoute (to) { if (typeof to === 'string') { return to } if ('path' in to) { return to.path } @@ -2085,11 +2086,11 @@ }); return JSON.stringify(location, null, 2) } - + function isError (err) { return Object.prototype.toString.call(err).indexOf('Error') > -1 } - + function isNavigationFailure (err, errorType) { return ( isError(err) && @@ -2097,15 +2098,15 @@ (errorType == null || err.type === errorType) ) } - + /* */ - + function resolveAsyncComponents (matched) { return function (to, from, next) { var hasAsync = false; var pending = 0; var error = null; - + flatMapComponents(matched, function (def, _, match, key) { // if it's a function and doesn't have cid attached, // assume it's an async component resolve function. @@ -2115,7 +2116,7 @@ if (typeof def === 'function' && def.cid === undefined) { hasAsync = true; pending++; - + var resolve = once(function (resolvedDef) { if (isESModule(resolvedDef)) { resolvedDef = resolvedDef.default; @@ -2128,7 +2129,7 @@ next(); } }); - + var reject = once(function (reason) { var msg = "Failed to resolve async component " + key + ": " + reason; warn(false, msg); @@ -2139,7 +2140,7 @@ next(error); } }); - + var res; try { res = def(resolve, reject); @@ -2159,11 +2160,11 @@ } } }); - + if (!hasAsync) { next(); } } } - + function flatMapComponents ( matched, fn @@ -2176,19 +2177,19 @@ ); }) })) } - + function flatten (arr) { return Array.prototype.concat.apply([], arr) } - + var hasSymbol = typeof Symbol === 'function' && typeof Symbol.toStringTag === 'symbol'; - + function isESModule (obj) { return obj.__esModule || (hasSymbol && obj[Symbol.toStringTag] === 'Module') } - + // in Webpack 2, require.ensure now also returns a Promise // so the resolve/reject functions may get called an extra time // if the user uses an arrow function shorthand that happens to @@ -2198,15 +2199,15 @@ return function () { var args = [], len = arguments.length; while ( len-- ) args[ len ] = arguments[ len ]; - + if (called) { return } called = true; return fn.apply(this, args) } } - + /* */ - + var History = function History (router, base) { this.router = router; this.base = normalizeBase(base); @@ -2219,11 +2220,11 @@ this.errorCbs = []; this.listeners = []; }; - + History.prototype.listen = function listen (cb) { this.cb = cb; }; - + History.prototype.onReady = function onReady (cb, errorCb) { if (this.ready) { cb(); @@ -2234,18 +2235,18 @@ } } }; - + History.prototype.onError = function onError (errorCb) { this.errorCbs.push(errorCb); }; - + History.prototype.transitionTo = function transitionTo ( location, onComplete, onAbort ) { var this$1 = this; - + var route; // catch redirect option https://github.com/vuejs/vue-router/issues/3201 try { @@ -2267,7 +2268,7 @@ this$1.router.afterHooks.forEach(function (hook) { hook && hook(route, prev); }); - + // fire ready cbs once if (!this$1.ready) { this$1.ready = true; @@ -2295,10 +2296,10 @@ } ); }; - + History.prototype.confirmTransition = function confirmTransition (route, onComplete, onAbort) { var this$1 = this; - + var current = this.current; this.pending = route; var abort = function (err) { @@ -2328,7 +2329,7 @@ this.ensureURL(); return abort(createNavigationDuplicatedError(current, route)) } - + var ref = resolveQueue( this.current.matched, route.matched @@ -2336,7 +2337,7 @@ var updated = ref.updated; var deactivated = ref.deactivated; var activated = ref.activated; - + var queue = [].concat( // in-component leave guards extractLeaveGuards(deactivated), @@ -2349,7 +2350,7 @@ // async components resolveAsyncComponents(activated) ); - + var iterator = function (hook, next) { if (this$1.pending !== route) { return abort(createNavigationCancelledError(current, route)) @@ -2384,7 +2385,7 @@ abort(e); } }; - + runQueue(queue, iterator, function () { // wait until async components are resolved before // extracting in-component enter guards @@ -2404,16 +2405,16 @@ }); }); }; - + History.prototype.updateRoute = function updateRoute (route) { this.current = route; this.cb && this.cb(route); }; - + History.prototype.setupListeners = function setupListeners () { // Default implementation is empty }; - + History.prototype.teardown = function teardown () { // clean up event listeners // https://github.com/vuejs/vue-router/issues/2341 @@ -2421,13 +2422,13 @@ cleanupListener(); }); this.listeners = []; - + // reset current history route // https://github.com/vuejs/vue-router/issues/3294 this.current = START; this.pending = null; }; - + function normalizeBase (base) { if (!base) { if (inBrowser) { @@ -2447,7 +2448,7 @@ // remove trailing slash return base.replace(/\/$/, '') } - + function resolveQueue ( current, next @@ -2465,7 +2466,7 @@ deactivated: current.slice(i) } } - + function extractGuards ( records, name, @@ -2482,7 +2483,7 @@ }); return flatten(reverse ? guards.reverse() : guards) } - + function extractGuard ( def, key @@ -2493,15 +2494,15 @@ } return def[key] } - + function extractLeaveGuards (deactivated) { return extractGuards(deactivated, 'beforeRouteLeave', bindGuard, true) } - + function extractUpdateHooks (updated) { return extractGuards(updated, 'beforeRouteUpdate', bindGuard) } - + function bindGuard (guard, instance) { if (instance) { return function boundRouteGuard () { @@ -2509,7 +2510,7 @@ } } } - + function extractEnterGuards ( activated ) { @@ -2521,7 +2522,7 @@ } ) } - + function bindEnterGuard ( guard, match, @@ -2539,45 +2540,45 @@ }) } } - + /* */ - + var HTML5History = /*@__PURE__*/(function (History) { function HTML5History (router, base) { History.call(this, router, base); - + this._startLocation = getLocation(this.base); } - + if ( History ) HTML5History.__proto__ = History; HTML5History.prototype = Object.create( History && History.prototype ); HTML5History.prototype.constructor = HTML5History; - + HTML5History.prototype.setupListeners = function setupListeners () { var this$1 = this; - + if (this.listeners.length > 0) { return } - + var router = this.router; var expectScroll = router.options.scrollBehavior; var supportsScroll = supportsPushState && expectScroll; - + if (supportsScroll) { this.listeners.push(setupScroll()); } - + var handleRoutingEvent = function () { var current = this$1.current; - + // Avoiding first `popstate` event dispatched in some browsers but first // history route not updated since async guard at the same time. var location = getLocation(this$1.base); if (this$1.current === START && location === this$1._startLocation) { return } - + this$1.transitionTo(location, function (route) { if (supportsScroll) { handleScroll(router, route, current, true); @@ -2589,14 +2590,14 @@ window.removeEventListener('popstate', handleRoutingEvent); }); }; - + HTML5History.prototype.go = function go (n) { window.history.go(n); }; - + HTML5History.prototype.push = function push (location, onComplete, onAbort) { var this$1 = this; - + var ref = this; var fromRoute = ref.current; this.transitionTo(location, function (route) { @@ -2605,10 +2606,10 @@ onComplete && onComplete(route); }, onAbort); }; - + HTML5History.prototype.replace = function replace (location, onComplete, onAbort) { var this$1 = this; - + var ref = this; var fromRoute = ref.current; this.transitionTo(location, function (route) { @@ -2617,21 +2618,21 @@ onComplete && onComplete(route); }, onAbort); }; - + HTML5History.prototype.ensureURL = function ensureURL (push) { if (getLocation(this.base) !== this.current.fullPath) { var current = cleanPath(this.base + this.current.fullPath); push ? pushState(current) : replaceState(current); } }; - + HTML5History.prototype.getCurrentLocation = function getCurrentLocation () { return getLocation(this.base) }; - + return HTML5History; }(History)); - + function getLocation (base) { var path = window.location.pathname; var pathLowerCase = path.toLowerCase(); @@ -2645,9 +2646,9 @@ } return (path || '/') + window.location.search + window.location.hash } - + /* */ - + var HashHistory = /*@__PURE__*/(function (History) { function HashHistory (router, base, fallback) { History.call(this, router, base); @@ -2657,28 +2658,28 @@ } ensureSlash(); } - + if ( History ) HashHistory.__proto__ = History; HashHistory.prototype = Object.create( History && History.prototype ); HashHistory.prototype.constructor = HashHistory; - + // this is delayed until the app mounts // to avoid the hashchange listener being fired too early HashHistory.prototype.setupListeners = function setupListeners () { var this$1 = this; - + if (this.listeners.length > 0) { return } - + var router = this.router; var expectScroll = router.options.scrollBehavior; var supportsScroll = supportsPushState && expectScroll; - + if (supportsScroll) { this.listeners.push(setupScroll()); } - + var handleRoutingEvent = function () { var current = this$1.current; if (!ensureSlash()) { @@ -2702,10 +2703,10 @@ window.removeEventListener(eventType, handleRoutingEvent); }); }; - + HashHistory.prototype.push = function push (location, onComplete, onAbort) { var this$1 = this; - + var ref = this; var fromRoute = ref.current; this.transitionTo( @@ -2718,10 +2719,10 @@ onAbort ); }; - + HashHistory.prototype.replace = function replace (location, onComplete, onAbort) { var this$1 = this; - + var ref = this; var fromRoute = ref.current; this.transitionTo( @@ -2734,25 +2735,25 @@ onAbort ); }; - + HashHistory.prototype.go = function go (n) { window.history.go(n); }; - + HashHistory.prototype.ensureURL = function ensureURL (push) { var current = this.current.fullPath; if (getHash() !== current) { push ? pushHash(current) : replaceHash(current); } }; - + HashHistory.prototype.getCurrentLocation = function getCurrentLocation () { return getHash() }; - + return HashHistory; }(History)); - + function checkFallback (base) { var location = getLocation(base); if (!/^\/#/.test(location)) { @@ -2760,7 +2761,7 @@ return true } } - + function ensureSlash () { var path = getHash(); if (path.charAt(0) === '/') { @@ -2769,7 +2770,7 @@ replaceHash('/' + path); return false } - + function getHash () { // We can't use window.location.hash here because it's not // consistent across browsers - Firefox will pre-decode it! @@ -2777,19 +2778,19 @@ var index = href.indexOf('#'); // empty path if (index < 0) { return '' } - + href = href.slice(index + 1); - + return href } - + function getUrl (path) { var href = window.location.href; var i = href.indexOf('#'); var base = i >= 0 ? href.slice(0, i) : href; return (base + "#" + path) } - + function pushHash (path) { if (supportsPushState) { pushState(getUrl(path)); @@ -2797,7 +2798,7 @@ window.location.hash = path; } } - + function replaceHash (path) { if (supportsPushState) { replaceState(getUrl(path)); @@ -2805,23 +2806,23 @@ window.location.replace(getUrl(path)); } } - + /* */ - + var AbstractHistory = /*@__PURE__*/(function (History) { function AbstractHistory (router, base) { History.call(this, router, base); this.stack = []; this.index = -1; } - + if ( History ) AbstractHistory.__proto__ = History; AbstractHistory.prototype = Object.create( History && History.prototype ); AbstractHistory.prototype.constructor = AbstractHistory; - + AbstractHistory.prototype.push = function push (location, onComplete, onAbort) { var this$1 = this; - + this.transitionTo( location, function (route) { @@ -2832,10 +2833,10 @@ onAbort ); }; - + AbstractHistory.prototype.replace = function replace (location, onComplete, onAbort) { var this$1 = this; - + this.transitionTo( location, function (route) { @@ -2845,10 +2846,10 @@ onAbort ); }; - + AbstractHistory.prototype.go = function go (n) { var this$1 = this; - + var targetIndex = this.index + n; if (targetIndex < 0 || targetIndex >= this.stack.length) { return @@ -2871,24 +2872,24 @@ } ); }; - + AbstractHistory.prototype.getCurrentLocation = function getCurrentLocation () { var current = this.stack[this.stack.length - 1]; return current ? current.fullPath : '/' }; - + AbstractHistory.prototype.ensureURL = function ensureURL () { // noop }; - + return AbstractHistory; }(History)); - + /* */ - + var VueRouter = function VueRouter (options) { if ( options === void 0 ) options = {}; - + this.app = null; this.apps = []; this.options = options; @@ -2896,7 +2897,7 @@ this.resolveHooks = []; this.afterHooks = []; this.matcher = createMatcher(options.routes || [], this); - + var mode = options.mode || 'hash'; this.fallback = mode === 'history' && !supportsPushState && options.fallback !== false; @@ -2907,7 +2908,7 @@ mode = 'abstract'; } this.mode = mode; - + switch (mode) { case 'history': this.history = new HTML5History(this, options.base); @@ -2924,22 +2925,22 @@ } } }; - + var prototypeAccessors = { currentRoute: { configurable: true } }; - + VueRouter.prototype.match = function match (raw, current, redirectedFrom) { return this.matcher.match(raw, current, redirectedFrom) }; - + prototypeAccessors.currentRoute.get = function () { return this.history && this.history.current }; - + VueRouter.prototype.init = function init (app /* Vue component instance */) { var this$1 = this; - + this.apps.push(app); - + // set up app destroyed handler // https://github.com/vuejs/vue-router/issues/2639 app.once('hook:destroyed', function () { @@ -2949,26 +2950,26 @@ // ensure we still have a main app or null if no apps // we do not release the router so it can be reused if (this$1.app === app) { this$1.app = this$1.apps[0] || null; } - + if (!this$1.app) { this$1.history.teardown(); } }); - + // main app previously initialized // return as we don't need to set up new history listener if (this.app) { return } - + this.app = app; - + var history = this.history; - + if (history instanceof HTML5History || history instanceof HashHistory) { var handleInitialScroll = function (routeOrError) { var from = history.current; var expectScroll = this$1.options.scrollBehavior; var supportsScroll = supportsPushState && expectScroll; - + if (supportsScroll && 'fullPath' in routeOrError) { handleScroll(this$1, routeOrError, from, false); } @@ -2983,37 +2984,37 @@ setupListeners ); } - + history.listen(function (route) { this$1.apps.forEach(function (app) { app._router.history.current = route; }); }); }; - + VueRouter.prototype.beforeEach = function beforeEach (fn) { return registerHook(this.beforeHooks, fn) }; - + VueRouter.prototype.beforeResolve = function beforeResolve (fn) { return registerHook(this.resolveHooks, fn) }; - + VueRouter.prototype.afterEach = function afterEach (fn) { return registerHook(this.afterHooks, fn) }; - + VueRouter.prototype.onReady = function onReady (cb, errorCb) { this.history.onReady(cb, errorCb); }; - + VueRouter.prototype.onError = function onError (errorCb) { this.history.onError(errorCb); }; - + VueRouter.prototype.push = function push (location, onComplete, onAbort) { var this$1 = this; - + // $flow-disable-line if (!onComplete && !onAbort && typeof Promise !== 'undefined') { return new Promise(function (resolve, reject) { @@ -3023,10 +3024,10 @@ this.history.push(location, onComplete, onAbort); } }; - + VueRouter.prototype.replace = function replace (location, onComplete, onAbort) { var this$1 = this; - + // $flow-disable-line if (!onComplete && !onAbort && typeof Promise !== 'undefined') { return new Promise(function (resolve, reject) { @@ -3036,19 +3037,19 @@ this.history.replace(location, onComplete, onAbort); } }; - + VueRouter.prototype.go = function go (n) { this.history.go(n); }; - + VueRouter.prototype.back = function back () { this.go(-1); }; - + VueRouter.prototype.forward = function forward () { this.go(1); }; - + VueRouter.prototype.getMatchedComponents = function getMatchedComponents (to) { var route = to ? to.matched @@ -3067,7 +3068,7 @@ }) ) }; - + VueRouter.prototype.resolve = function resolve ( to, current, @@ -3088,20 +3089,20 @@ resolved: route } }; - + VueRouter.prototype.getRoutes = function getRoutes () { return this.matcher.getRoutes() }; - + VueRouter.prototype.addRoute = function addRoute (parentOrRoute, route) { this.matcher.addRoute(parentOrRoute, route); if (this.history.current !== START) { this.history.transitionTo(this.history.getCurrentLocation()); } }; - + Object.defineProperties( VueRouter.prototype, prototypeAccessors ); - + function registerHook (list, fn) { list.push(fn); return function () { @@ -3109,24 +3110,26 @@ if (i > -1) { list.splice(i, 1); } } } - + function createHref (base, fullPath, mode) { var path = mode === 'hash' ? '#' + fullPath : fullPath; return base ? cleanPath(base + '/' + path) : path } - + // VueRouter.install = install; VueRouter.version = '3.5.2'; VueRouter.isNavigationFailure = isNavigationFailure; VueRouter.NavigationFailureType = NavigationFailureType; VueRouter.START_LOCATION = START; - - + + var $router, cbs = []; BI.RouterWidget = BI.inherit(BI.Widget, { init: function () { this.$router = this._router = BI.Router.$router = $router = new VueRouter({ - routes: this.options.routes + routes: this.options.routes, + mode: this.options.mode, + base: this.options.base, }); this.$router.beforeEach(function (to, from, next) { if (to.matched.length === 0) { @@ -3144,7 +3147,7 @@ } }); BI.shortcut("bi.router", BI.RouterWidget); - + BI.RouterView = BI.inherit(BI.Widget, { props: { baseCls: 'bi-router-view', @@ -3158,7 +3161,7 @@ // 匹配的路径名(/component/:id) var matchedPath = current.matched[o.deps] && current.matched[o.deps].path; var component = current.matched[o.deps] && current.matched[o.deps].components[o.name]; - + if (BI.isNotNull(component)) { if (matchedPath) { BI.each(current.params, function (key, value) { @@ -3195,10 +3198,9 @@ } }); BI.shortcut("bi.router_view", BI.RouterView); - + BI.Router = BI.Router || VueRouter; BI.Router.isSameRoute = isSameRoute; return VueRouter; - + }))); - \ No newline at end of file From 591723012b161564080b18a74afe5bea9bcce8a5 Mon Sep 17 00:00:00 2001 From: Kobi Date: Thu, 28 Apr 2022 17:07:54 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E6=97=A0JIRA=E4=BB=BB=E5=8A=A1=20router?= =?UTF-8?q?=E6=94=AF=E6=8C=81base=E5=92=8Cmode?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/router/router.js | 5024 +++++++++++++++++++++--------------------- 1 file changed, 2512 insertions(+), 2512 deletions(-) diff --git a/src/router/router.js b/src/router/router.js index d5aa14c80..f82516d73 100644 --- a/src/router/router.js +++ b/src/router/router.js @@ -4,1847 +4,1846 @@ * @license MIT */ (function (global, factory) { - typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory() : - typeof define === 'function' && define.amd ? define(factory) : - (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory()); - }(this, (function () { 'use strict'; + typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory() : + typeof define === 'function' && define.amd ? define(factory) : + (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory()); +}(this, (function () { 'use strict'; - /* */ + /* */ - function assert (condition, message) { - if (!condition) { - throw new Error(("[vue-router] " + message)) - } + function assert (condition, message) { + if (!condition) { + throw new Error(("[vue-router] " + message)) } + } - function warn (condition, message) { - if (!condition) { - typeof console !== 'undefined' && console.warn(("[vue-router] " + message)); - } + function warn (condition, message) { + if (!condition) { + typeof console !== 'undefined' && console.warn(("[vue-router] " + message)); } + } - function extend (a, b) { - for (var key in b) { - a[key] = b[key]; - } - return a + function extend (a, b) { + for (var key in b) { + a[key] = b[key]; } + return a + } - /* */ + /* */ - var encodeReserveRE = /[!'()*]/g; - var encodeReserveReplacer = function (c) { return '%' + c.charCodeAt(0).toString(16); }; - var commaRE = /%2C/g; + var encodeReserveRE = /[!'()*]/g; + var encodeReserveReplacer = function (c) { return '%' + c.charCodeAt(0).toString(16); }; + var commaRE = /%2C/g; - // fixed encodeURIComponent which is more conformant to RFC3986: - // - escapes [!'()*] - // - preserve commas - var encode = function (str) { return encodeURIComponent(str) - .replace(encodeReserveRE, encodeReserveReplacer) - .replace(commaRE, ','); }; + // fixed encodeURIComponent which is more conformant to RFC3986: + // - escapes [!'()*] + // - preserve commas + var encode = function (str) { return encodeURIComponent(str) + .replace(encodeReserveRE, encodeReserveReplacer) + .replace(commaRE, ','); }; - function decode (str) { - try { - return decodeURIComponent(str) - } catch (err) { - { - warn(false, ("Error decoding \"" + str + "\". Leaving it intact.")); - } + function decode (str) { + try { + return decodeURIComponent(str) + } catch (err) { + { + warn(false, ("Error decoding \"" + str + "\". Leaving it intact.")); } - return str } + return str + } - function resolveQuery ( + function resolveQuery ( query, extraQuery, _parseQuery - ) { - if ( extraQuery === void 0 ) extraQuery = {}; - - var parse = _parseQuery || parseQuery; - var parsedQuery; - try { - parsedQuery = parse(query || ''); - } catch (e) { - warn(false, e.message); - parsedQuery = {}; - } - for (var key in extraQuery) { - var value = extraQuery[key]; - parsedQuery[key] = Array.isArray(value) + ) { + if ( extraQuery === void 0 ) extraQuery = {}; + + var parse = _parseQuery || parseQuery; + var parsedQuery; + try { + parsedQuery = parse(query || ''); + } catch (e) { + warn(false, e.message); + parsedQuery = {}; + } + for (var key in extraQuery) { + var value = extraQuery[key]; + parsedQuery[key] = Array.isArray(value) ? value.map(castQueryParamValue) : castQueryParamValue(value); - } - return parsedQuery } + return parsedQuery + } - var castQueryParamValue = function (value) { return (value == null || typeof value === 'object' ? value : String(value)); }; + var castQueryParamValue = function (value) { return (value == null || typeof value === 'object' ? value : String(value)); }; - function parseQuery (query) { - var res = {}; + function parseQuery (query) { + var res = {}; - query = query.trim().replace(/^(\?|#|&)/, ''); + query = query.trim().replace(/^(\?|#|&)/, ''); - if (!query) { - return res - } + if (!query) { + return res + } - query.split('&').forEach(function (param) { - var parts = param.replace(/\+/g, ' ').split('='); - var key = decode(parts.shift()); - var val = parts.length > 0 ? decode(parts.join('=')) : null; + query.split('&').forEach(function (param) { + var parts = param.replace(/\+/g, ' ').split('='); + var key = decode(parts.shift()); + var val = parts.length > 0 ? decode(parts.join('=')) : null; - if (res[key] === undefined) { - res[key] = val; - } else if (Array.isArray(res[key])) { - res[key].push(val); - } else { - res[key] = [res[key], val]; - } - }); + if (res[key] === undefined) { + res[key] = val; + } else if (Array.isArray(res[key])) { + res[key].push(val); + } else { + res[key] = [res[key], val]; + } + }); - return res - } + return res + } - function stringifyQuery (obj) { - var res = obj + function stringifyQuery (obj) { + var res = obj ? Object.keys(obj) - .map(function (key) { - var val = obj[key]; + .map(function (key) { + var val = obj[key]; - if (val === undefined) { - return '' - } + if (val === undefined) { + return '' + } - if (val === null) { - return encode(key) - } + if (val === null) { + return encode(key) + } - if (Array.isArray(val)) { - var result = []; - val.forEach(function (val2) { - if (val2 === undefined) { - return - } - if (val2 === null) { - result.push(encode(key)); - } else { - result.push(encode(key) + '=' + encode(val2)); - } - }); - return result.join('&') - } + if (Array.isArray(val)) { + var result = []; + val.forEach(function (val2) { + if (val2 === undefined) { + return + } + if (val2 === null) { + result.push(encode(key)); + } else { + result.push(encode(key) + '=' + encode(val2)); + } + }); + return result.join('&') + } - return encode(key) + '=' + encode(val) - }) - .filter(function (x) { return x.length > 0; }) - .join('&') + return encode(key) + '=' + encode(val) + }) + .filter(function (x) { return x.length > 0; }) + .join('&') : null; - return res ? ("?" + res) : '' - } + return res ? ("?" + res) : '' + } - /* */ + /* */ - var trailingSlashRE = /\/?$/; + var trailingSlashRE = /\/?$/; - function createRoute ( + function createRoute ( record, location, redirectedFrom, router - ) { - var stringifyQuery = router && router.options.stringifyQuery; - - var query = location.query || {}; - try { - query = clone(query); - } catch (e) {} - - var route = { - name: location.name || (record && record.name), - meta: (record && record.meta) || {}, - path: location.path || '/', - hash: location.hash || '', - query: query, - params: location.params || {}, - fullPath: getFullPath(location, stringifyQuery), - matched: record ? formatMatch(record) : [] - }; - if (redirectedFrom) { - route.redirectedFrom = getFullPath(redirectedFrom, stringifyQuery); - } - return Object.freeze(route) + ) { + var stringifyQuery = router && router.options.stringifyQuery; + + var query = location.query || {}; + try { + query = clone(query); + } catch (e) {} + + var route = { + name: location.name || (record && record.name), + meta: (record && record.meta) || {}, + path: location.path || '/', + hash: location.hash || '', + query: query, + params: location.params || {}, + fullPath: getFullPath(location, stringifyQuery), + matched: record ? formatMatch(record) : [] + }; + if (redirectedFrom) { + route.redirectedFrom = getFullPath(redirectedFrom, stringifyQuery); } + return Object.freeze(route) + } - function clone (value) { - if (Array.isArray(value)) { - return value.map(clone) - } else if (value && typeof value === 'object') { - var res = {}; - for (var key in value) { - res[key] = clone(value[key]); - } - return res - } else { - return value + function clone (value) { + if (Array.isArray(value)) { + return value.map(clone) + } else if (value && typeof value === 'object') { + var res = {}; + for (var key in value) { + res[key] = clone(value[key]); } + return res + } else { + return value } + } - // the starting route that represents the initial state - var START = createRoute(null, { - path: '/' - }); + // the starting route that represents the initial state + var START = createRoute(null, { + path: '/' + }); - function formatMatch (record) { - var res = []; - while (record) { - res.unshift(record); - record = record.parent; - } - return res + function formatMatch (record) { + var res = []; + while (record) { + res.unshift(record); + record = record.parent; } + return res + } - function getFullPath ( + function getFullPath ( ref, _stringifyQuery - ) { - var path = ref.path; - var query = ref.query; if ( query === void 0 ) query = {}; - var hash = ref.hash; if ( hash === void 0 ) hash = ''; - - var stringify = _stringifyQuery || stringifyQuery; - return (path || '/') + stringify(query) + hash - } - - function isSameRoute (a, b, onlyPath) { - if (b === START) { - return a === b - } else if (!b) { - return false - } else if (a.path && b.path) { - return a.path.replace(trailingSlashRE, '') === b.path.replace(trailingSlashRE, '') && (onlyPath || + ) { + var path = ref.path; + var query = ref.query; if ( query === void 0 ) query = {}; + var hash = ref.hash; if ( hash === void 0 ) hash = ''; + + var stringify = _stringifyQuery || stringifyQuery; + return (path || '/') + stringify(query) + hash + } + + function isSameRoute (a, b, onlyPath) { + if (b === START) { + return a === b + } else if (!b) { + return false + } else if (a.path && b.path) { + return a.path.replace(trailingSlashRE, '') === b.path.replace(trailingSlashRE, '') && (onlyPath || a.hash === b.hash && isObjectEqual(a.query, b.query)) - } else if (a.name && b.name) { - return ( + } else if (a.name && b.name) { + return ( a.name === b.name && (onlyPath || ( - a.hash === b.hash && - isObjectEqual(a.query, b.query) && - isObjectEqual(a.params, b.params)) + a.hash === b.hash && + isObjectEqual(a.query, b.query) && + isObjectEqual(a.params, b.params)) ) - ) - } else { - return false - } + ) + } else { + return false } + } - function isObjectEqual (a, b) { - if ( a === void 0 ) a = {}; - if ( b === void 0 ) b = {}; + function isObjectEqual (a, b) { + if ( a === void 0 ) a = {}; + if ( b === void 0 ) b = {}; - // handle null value #1566 - if (!a || !b) { return a === b } - var aKeys = Object.keys(a).sort(); - var bKeys = Object.keys(b).sort(); - if (aKeys.length !== bKeys.length) { - return false - } - return aKeys.every(function (key, i) { - var aVal = a[key]; - var bKey = bKeys[i]; - if (bKey !== key) { return false } - var bVal = b[key]; - // query values can be null and undefined - if (aVal == null || bVal == null) { return aVal === bVal } - // check nested equality - if (typeof aVal === 'object' && typeof bVal === 'object') { - return isObjectEqual(aVal, bVal) - } - return String(aVal) === String(bVal) - }) + // handle null value #1566 + if (!a || !b) { return a === b } + var aKeys = Object.keys(a).sort(); + var bKeys = Object.keys(b).sort(); + if (aKeys.length !== bKeys.length) { + return false } - - function isIncludedRoute (current, target) { - return ( + return aKeys.every(function (key, i) { + var aVal = a[key]; + var bKey = bKeys[i]; + if (bKey !== key) { return false } + var bVal = b[key]; + // query values can be null and undefined + if (aVal == null || bVal == null) { return aVal === bVal } + // check nested equality + if (typeof aVal === 'object' && typeof bVal === 'object') { + return isObjectEqual(aVal, bVal) + } + return String(aVal) === String(bVal) + }) + } + + function isIncludedRoute (current, target) { + return ( current.path.replace(trailingSlashRE, '/').indexOf( - target.path.replace(trailingSlashRE, '/') + target.path.replace(trailingSlashRE, '/') ) === 0 && (!target.hash || current.hash === target.hash) && queryIncludes(current.query, target.query) - ) - } + ) + } - function queryIncludes (current, target) { - for (var key in target) { - if (!(key in current)) { - return false - } + function queryIncludes (current, target) { + for (var key in target) { + if (!(key in current)) { + return false } - return true } + return true + } - function handleRouteEntered (route) { - for (var i = 0; i < route.matched.length; i++) { - var record = route.matched[i]; - for (var name in record.instances) { - var instance = record.instances[name]; - var cbs = record.enteredCbs[name]; - if (!instance || !cbs) { continue } - delete record.enteredCbs[name]; - for (var i$1 = 0; i$1 < cbs.length; i$1++) { - if (!instance._isBeingDestroyed) { cbs[i$1](instance); } - } + function handleRouteEntered (route) { + for (var i = 0; i < route.matched.length; i++) { + var record = route.matched[i]; + for (var name in record.instances) { + var instance = record.instances[name]; + var cbs = record.enteredCbs[name]; + if (!instance || !cbs) { continue } + delete record.enteredCbs[name]; + for (var i$1 = 0; i$1 < cbs.length; i$1++) { + if (!instance._isBeingDestroyed) { cbs[i$1](instance); } } } } - - // var View = { - // name: 'RouterView', - // functional: true, - // props: { - // name: { - // type: String, - // default: 'default' - // } - // }, - // render: function render (_, ref) { - // var props = ref.props; - // var children = ref.children; - // var parent = ref.parent; - // var data = ref.data; - - // // used by devtools to display a router-view badge - // data.routerView = true; - - // // directly use parent context's createElement() function - // // so that components rendered by router-view can resolve named slots - // var h = parent.$createElement; - // var name = props.name; - // var route = parent.$route; - // var cache = parent._routerViewCache || (parent._routerViewCache = {}); - - // // determine current view depth, also check to see if the tree - // // has been toggled inactive but kept-alive. - // var depth = 0; - // var inactive = false; - // while (parent && parent._routerRoot !== parent) { - // var vnodeData = parent.$vnode ? parent.$vnode.data : {}; - // if (vnodeData.routerView) { - // depth++; - // } - // if (vnodeData.keepAlive && parent._directInactive && parent._inactive) { - // inactive = true; - // } - // parent = parent.$parent; - // } - // data.routerViewDepth = depth; - - // // render previous view if the tree is inactive and kept-alive - // if (inactive) { - // var cachedData = cache[name]; - // var cachedComponent = cachedData && cachedData.component; - // if (cachedComponent) { - // // #2301 - // // pass props - // if (cachedData.configProps) { - // fillPropsinData(cachedComponent, data, cachedData.route, cachedData.configProps); - // } - // return h(cachedComponent, data, children) - // } else { - // // render previous empty view - // return h() - // } - // } - - // var matched = route.matched[depth]; - // var component = matched && matched.components[name]; - - // // render empty node if no matched route or no config component - // if (!matched || !component) { - // cache[name] = null; - // return h() - // } - - // // cache component - // cache[name] = { component: component }; - - // // attach instance registration hook - // // this will be called in the instance's injected lifecycle hooks - // data.registerRouteInstance = function (vm, val) { - // // val could be undefined for unregistration - // var current = matched.instances[name]; - // if ( - // (val && current !== vm) || - // (!val && current === vm) - // ) { - // matched.instances[name] = val; - // } - // } - - // // also register instance in prepatch hook - // // in case the same component instance is reused across different routes - // ;(data.hook || (data.hook = {})).prepatch = function (_, vnode) { - // matched.instances[name] = vnode.componentInstance; - // }; - - // // register instance in init hook - // // in case kept-alive component be actived when routes changed - // data.hook.init = function (vnode) { - // if (vnode.data.keepAlive && - // vnode.componentInstance && - // vnode.componentInstance !== matched.instances[name] - // ) { - // matched.instances[name] = vnode.componentInstance; - // } - - // // if the route transition has already been confirmed then we weren't - // // able to call the cbs during confirmation as the component was not - // // registered yet, so we call it here. - // handleRouteEntered(route); - // }; - - // var configProps = matched.props && matched.props[name]; - // // save route and configProps in cache - // if (configProps) { - // extend(cache[name], { - // route: route, - // configProps: configProps - // }); - // fillPropsinData(component, data, route, configProps); - // } - - // return h(component, data, children) - // } - // }; - - // function fillPropsinData (component, data, route, configProps) { - // // resolve props - // var propsToPass = data.props = resolveProps(route, configProps); - // if (propsToPass) { - // // clone to prevent mutation - // propsToPass = data.props = extend({}, propsToPass); - // // pass non-declared props as attrs - // var attrs = data.attrs = data.attrs || {}; - // for (var key in propsToPass) { - // if (!component.props || !(key in component.props)) { - // attrs[key] = propsToPass[key]; - // delete propsToPass[key]; - // } - // } - // } - // } - - // function resolveProps (route, config) { - // switch (typeof config) { - // case 'undefined': - // return - // case 'object': - // return config - // case 'function': - // return config(route) - // case 'boolean': - // return config ? route.params : undefined - // default: - // { - // warn( - // false, - // "props in \"" + (route.path) + "\" is a " + (typeof config) + ", " + - // "expecting an object, function or boolean." - // ); - // } - // } - // } - - /* */ - - function resolvePath ( + } + + // var View = { + // name: 'RouterView', + // functional: true, + // props: { + // name: { + // type: String, + // default: 'default' + // } + // }, + // render: function render (_, ref) { + // var props = ref.props; + // var children = ref.children; + // var parent = ref.parent; + // var data = ref.data; + + // // used by devtools to display a router-view badge + // data.routerView = true; + + // // directly use parent context's createElement() function + // // so that components rendered by router-view can resolve named slots + // var h = parent.$createElement; + // var name = props.name; + // var route = parent.$route; + // var cache = parent._routerViewCache || (parent._routerViewCache = {}); + + // // determine current view depth, also check to see if the tree + // // has been toggled inactive but kept-alive. + // var depth = 0; + // var inactive = false; + // while (parent && parent._routerRoot !== parent) { + // var vnodeData = parent.$vnode ? parent.$vnode.data : {}; + // if (vnodeData.routerView) { + // depth++; + // } + // if (vnodeData.keepAlive && parent._directInactive && parent._inactive) { + // inactive = true; + // } + // parent = parent.$parent; + // } + // data.routerViewDepth = depth; + + // // render previous view if the tree is inactive and kept-alive + // if (inactive) { + // var cachedData = cache[name]; + // var cachedComponent = cachedData && cachedData.component; + // if (cachedComponent) { + // // #2301 + // // pass props + // if (cachedData.configProps) { + // fillPropsinData(cachedComponent, data, cachedData.route, cachedData.configProps); + // } + // return h(cachedComponent, data, children) + // } else { + // // render previous empty view + // return h() + // } + // } + + // var matched = route.matched[depth]; + // var component = matched && matched.components[name]; + + // // render empty node if no matched route or no config component + // if (!matched || !component) { + // cache[name] = null; + // return h() + // } + + // // cache component + // cache[name] = { component: component }; + + // // attach instance registration hook + // // this will be called in the instance's injected lifecycle hooks + // data.registerRouteInstance = function (vm, val) { + // // val could be undefined for unregistration + // var current = matched.instances[name]; + // if ( + // (val && current !== vm) || + // (!val && current === vm) + // ) { + // matched.instances[name] = val; + // } + // } + + // // also register instance in prepatch hook + // // in case the same component instance is reused across different routes + // ;(data.hook || (data.hook = {})).prepatch = function (_, vnode) { + // matched.instances[name] = vnode.componentInstance; + // }; + + // // register instance in init hook + // // in case kept-alive component be actived when routes changed + // data.hook.init = function (vnode) { + // if (vnode.data.keepAlive && + // vnode.componentInstance && + // vnode.componentInstance !== matched.instances[name] + // ) { + // matched.instances[name] = vnode.componentInstance; + // } + + // // if the route transition has already been confirmed then we weren't + // // able to call the cbs during confirmation as the component was not + // // registered yet, so we call it here. + // handleRouteEntered(route); + // }; + + // var configProps = matched.props && matched.props[name]; + // // save route and configProps in cache + // if (configProps) { + // extend(cache[name], { + // route: route, + // configProps: configProps + // }); + // fillPropsinData(component, data, route, configProps); + // } + + // return h(component, data, children) + // } + // }; + + // function fillPropsinData (component, data, route, configProps) { + // // resolve props + // var propsToPass = data.props = resolveProps(route, configProps); + // if (propsToPass) { + // // clone to prevent mutation + // propsToPass = data.props = extend({}, propsToPass); + // // pass non-declared props as attrs + // var attrs = data.attrs = data.attrs || {}; + // for (var key in propsToPass) { + // if (!component.props || !(key in component.props)) { + // attrs[key] = propsToPass[key]; + // delete propsToPass[key]; + // } + // } + // } + // } + + // function resolveProps (route, config) { + // switch (typeof config) { + // case 'undefined': + // return + // case 'object': + // return config + // case 'function': + // return config(route) + // case 'boolean': + // return config ? route.params : undefined + // default: + // { + // warn( + // false, + // "props in \"" + (route.path) + "\" is a " + (typeof config) + ", " + + // "expecting an object, function or boolean." + // ); + // } + // } + // } + + /* */ + + function resolvePath ( relative, base, append - ) { - var firstChar = relative.charAt(0); - if (firstChar === '/') { - return relative - } - - if (firstChar === '?' || firstChar === '#') { - return base + relative - } - - var stack = base.split('/'); - - // remove trailing segment if: - // - not appending - // - appending to trailing slash (last segment is empty) - if (!append || !stack[stack.length - 1]) { - stack.pop(); - } - - // resolve relative path - var segments = relative.replace(/^\//, '').split('/'); - for (var i = 0; i < segments.length; i++) { - var segment = segments[i]; - if (segment === '..') { - stack.pop(); - } else if (segment !== '.') { - stack.push(segment); - } - } - - // ensure leading slash - if (stack[0] !== '') { - stack.unshift(''); - } - - return stack.join('/') - } - - function parsePath (path) { - var hash = ''; - var query = ''; - - var hashIndex = path.indexOf('#'); - if (hashIndex >= 0) { - hash = path.slice(hashIndex); - path = path.slice(0, hashIndex); - } - - var queryIndex = path.indexOf('?'); - if (queryIndex >= 0) { - query = path.slice(queryIndex + 1); - path = path.slice(0, queryIndex); - } - - return { - path: path, - query: query, - hash: hash - } + ) { + var firstChar = relative.charAt(0); + if (firstChar === '/') { + return relative } - function cleanPath (path) { - return path.replace(/\/\//g, '/') + if (firstChar === '?' || firstChar === '#') { + return base + relative } - var isarray = Array.isArray || function (arr) { - return Object.prototype.toString.call(arr) == '[object Array]'; - }; - - /** - * Expose `pathToRegexp`. - */ - var pathToRegexp_1 = pathToRegexp; - var parse_1 = parse; - var compile_1 = compile; - var tokensToFunction_1 = tokensToFunction; - var tokensToRegExp_1 = tokensToRegExp; - - /** - * The main path matching regexp utility. - * - * @type {RegExp} - */ - var PATH_REGEXP = new RegExp([ - // Match escaped characters that would otherwise appear in future matches. - // This allows the user to escape special characters that won't transform. - '(\\\\.)', - // Match Express-style parameters and un-named parameters with a prefix - // and optional suffixes. Matches appear as: - // - // "/:test(\\d+)?" => ["/", "test", "\d+", undefined, "?", undefined] - // "/route(\\d+)" => [undefined, undefined, undefined, "\d+", undefined, undefined] - // "/*" => ["/", undefined, undefined, undefined, undefined, "*"] - '([\\/.])?(?:(?:\\:(\\w+)(?:\\(((?:\\\\.|[^\\\\()])+)\\))?|\\(((?:\\\\.|[^\\\\()])+)\\))([+*?])?|(\\*))' - ].join('|'), 'g'); - - /** - * Parse a string for the raw tokens. - * - * @param {string} str - * @param {Object=} options - * @return {!Array} - */ - function parse (str, options) { - var tokens = []; - var key = 0; - var index = 0; - var path = ''; - var defaultDelimiter = options && options.delimiter || '/'; - var res; - - while ((res = PATH_REGEXP.exec(str)) != null) { - var m = res[0]; - var escaped = res[1]; - var offset = res.index; - path += str.slice(index, offset); - index = offset + m.length; - - // Ignore already escaped sequences. - if (escaped) { - path += escaped[1]; - continue - } - - var next = str[index]; - var prefix = res[2]; - var name = res[3]; - var capture = res[4]; - var group = res[5]; - var modifier = res[6]; - var asterisk = res[7]; - - // Push the current path onto the tokens. - if (path) { - tokens.push(path); - path = ''; - } - - var partial = prefix != null && next != null && next !== prefix; - var repeat = modifier === '+' || modifier === '*'; - var optional = modifier === '?' || modifier === '*'; - var delimiter = res[2] || defaultDelimiter; - var pattern = capture || group; - - tokens.push({ - name: name || key++, - prefix: prefix || '', - delimiter: delimiter, - optional: optional, - repeat: repeat, - partial: partial, - asterisk: !!asterisk, - pattern: pattern ? escapeGroup(pattern) : (asterisk ? '.*' : '[^' + escapeString(delimiter) + ']+?') - }); - } + var stack = base.split('/'); - // Match any characters still remaining. - if (index < str.length) { - path += str.substr(index); - } + // remove trailing segment if: + // - not appending + // - appending to trailing slash (last segment is empty) + if (!append || !stack[stack.length - 1]) { + stack.pop(); + } - // If the path exists, push it onto the end. + // resolve relative path + var segments = relative.replace(/^\//, '').split('/'); + for (var i = 0; i < segments.length; i++) { + var segment = segments[i]; + if (segment === '..') { + stack.pop(); + } else if (segment !== '.') { + stack.push(segment); + } + } + + // ensure leading slash + if (stack[0] !== '') { + stack.unshift(''); + } + + return stack.join('/') + } + + function parsePath (path) { + var hash = ''; + var query = ''; + + var hashIndex = path.indexOf('#'); + if (hashIndex >= 0) { + hash = path.slice(hashIndex); + path = path.slice(0, hashIndex); + } + + var queryIndex = path.indexOf('?'); + if (queryIndex >= 0) { + query = path.slice(queryIndex + 1); + path = path.slice(0, queryIndex); + } + + return { + path: path, + query: query, + hash: hash + } + } + + function cleanPath (path) { + return path.replace(/\/\//g, '/') + } + + var isarray = Array.isArray || function (arr) { + return Object.prototype.toString.call(arr) == '[object Array]'; + }; + + /** + * Expose `pathToRegexp`. + */ + var pathToRegexp_1 = pathToRegexp; + var parse_1 = parse; + var compile_1 = compile; + var tokensToFunction_1 = tokensToFunction; + var tokensToRegExp_1 = tokensToRegExp; + + /** + * The main path matching regexp utility. + * + * @type {RegExp} + */ + var PATH_REGEXP = new RegExp([ + // Match escaped characters that would otherwise appear in future matches. + // This allows the user to escape special characters that won't transform. + '(\\\\.)', + // Match Express-style parameters and un-named parameters with a prefix + // and optional suffixes. Matches appear as: + // + // "/:test(\\d+)?" => ["/", "test", "\d+", undefined, "?", undefined] + // "/route(\\d+)" => [undefined, undefined, undefined, "\d+", undefined, undefined] + // "/*" => ["/", undefined, undefined, undefined, undefined, "*"] + '([\\/.])?(?:(?:\\:(\\w+)(?:\\(((?:\\\\.|[^\\\\()])+)\\))?|\\(((?:\\\\.|[^\\\\()])+)\\))([+*?])?|(\\*))' + ].join('|'), 'g'); + + /** + * Parse a string for the raw tokens. + * + * @param {string} str + * @param {Object=} options + * @return {!Array} + */ + function parse (str, options) { + var tokens = []; + var key = 0; + var index = 0; + var path = ''; + var defaultDelimiter = options && options.delimiter || '/'; + var res; + + while ((res = PATH_REGEXP.exec(str)) != null) { + var m = res[0]; + var escaped = res[1]; + var offset = res.index; + path += str.slice(index, offset); + index = offset + m.length; + + // Ignore already escaped sequences. + if (escaped) { + path += escaped[1]; + continue + } + + var next = str[index]; + var prefix = res[2]; + var name = res[3]; + var capture = res[4]; + var group = res[5]; + var modifier = res[6]; + var asterisk = res[7]; + + // Push the current path onto the tokens. if (path) { tokens.push(path); - } - - return tokens - } - - /** - * Compile a string to a template function for the path. - * - * @param {string} str - * @param {Object=} options - * @return {!function(Object=, Object=)} - */ - function compile (str, options) { - return tokensToFunction(parse(str, options), options) - } - - /** - * Prettier encoding of URI path segments. - * - * @param {string} - * @return {string} - */ - function encodeURIComponentPretty (str) { - return encodeURI(str).replace(/[\/?#]/g, function (c) { - return '%' + c.charCodeAt(0).toString(16).toUpperCase() - }) - } - - /** - * Encode the asterisk parameter. Similar to `pretty`, but allows slashes. - * - * @param {string} - * @return {string} - */ - function encodeAsterisk (str) { - return encodeURI(str).replace(/[?#]/g, function (c) { - return '%' + c.charCodeAt(0).toString(16).toUpperCase() - }) + path = ''; + } + + var partial = prefix != null && next != null && next !== prefix; + var repeat = modifier === '+' || modifier === '*'; + var optional = modifier === '?' || modifier === '*'; + var delimiter = res[2] || defaultDelimiter; + var pattern = capture || group; + + tokens.push({ + name: name || key++, + prefix: prefix || '', + delimiter: delimiter, + optional: optional, + repeat: repeat, + partial: partial, + asterisk: !!asterisk, + pattern: pattern ? escapeGroup(pattern) : (asterisk ? '.*' : '[^' + escapeString(delimiter) + ']+?') + }); } - /** - * Expose a method for transforming tokens into the path function. - */ - function tokensToFunction (tokens, options) { - // Compile all the tokens into regexps. - var matches = new Array(tokens.length); + // Match any characters still remaining. + if (index < str.length) { + path += str.substr(index); + } + + // If the path exists, push it onto the end. + if (path) { + tokens.push(path); + } + + return tokens + } + + /** + * Compile a string to a template function for the path. + * + * @param {string} str + * @param {Object=} options + * @return {!function(Object=, Object=)} + */ + function compile (str, options) { + return tokensToFunction(parse(str, options), options) + } + + /** + * Prettier encoding of URI path segments. + * + * @param {string} + * @return {string} + */ + function encodeURIComponentPretty (str) { + return encodeURI(str).replace(/[\/?#]/g, function (c) { + return '%' + c.charCodeAt(0).toString(16).toUpperCase() + }) + } + + /** + * Encode the asterisk parameter. Similar to `pretty`, but allows slashes. + * + * @param {string} + * @return {string} + */ + function encodeAsterisk (str) { + return encodeURI(str).replace(/[?#]/g, function (c) { + return '%' + c.charCodeAt(0).toString(16).toUpperCase() + }) + } + + /** + * Expose a method for transforming tokens into the path function. + */ + function tokensToFunction (tokens, options) { + // Compile all the tokens into regexps. + var matches = new Array(tokens.length); + + // Compile all the patterns before compilation. + for (var i = 0; i < tokens.length; i++) { + if (typeof tokens[i] === 'object') { + matches[i] = new RegExp('^(?:' + tokens[i].pattern + ')$', flags(options)); + } + } + + return function (obj, opts) { + var path = ''; + var data = obj || {}; + var options = opts || {}; + var encode = options.pretty ? encodeURIComponentPretty : encodeURIComponent; - // Compile all the patterns before compilation. for (var i = 0; i < tokens.length; i++) { - if (typeof tokens[i] === 'object') { - matches[i] = new RegExp('^(?:' + tokens[i].pattern + ')$', flags(options)); - } - } + var token = tokens[i]; + + if (typeof token === 'string') { + path += token; - return function (obj, opts) { - var path = ''; - var data = obj || {}; - var options = opts || {}; - var encode = options.pretty ? encodeURIComponentPretty : encodeURIComponent; + continue + } - for (var i = 0; i < tokens.length; i++) { - var token = tokens[i]; + var value = data[token.name]; + var segment; - if (typeof token === 'string') { - path += token; + if (value == null) { + if (token.optional) { + // Prepend partial segment prefixes. + if (token.partial) { + path += token.prefix; + } continue + } else { + throw new TypeError('Expected "' + token.name + '" to be defined') } + } - var value = data[token.name]; - var segment; + if (isarray(value)) { + if (!token.repeat) { + throw new TypeError('Expected "' + token.name + '" to not repeat, but received `' + JSON.stringify(value) + '`') + } - if (value == null) { + if (value.length === 0) { if (token.optional) { - // Prepend partial segment prefixes. - if (token.partial) { - path += token.prefix; - } - continue } else { - throw new TypeError('Expected "' + token.name + '" to be defined') + throw new TypeError('Expected "' + token.name + '" to not be empty') } } - if (isarray(value)) { - if (!token.repeat) { - throw new TypeError('Expected "' + token.name + '" to not repeat, but received `' + JSON.stringify(value) + '`') - } - - if (value.length === 0) { - if (token.optional) { - continue - } else { - throw new TypeError('Expected "' + token.name + '" to not be empty') - } - } - - for (var j = 0; j < value.length; j++) { - segment = encode(value[j]); - - if (!matches[i].test(segment)) { - throw new TypeError('Expected all "' + token.name + '" to match "' + token.pattern + '", but received `' + JSON.stringify(segment) + '`') - } + for (var j = 0; j < value.length; j++) { + segment = encode(value[j]); - path += (j === 0 ? token.prefix : token.delimiter) + segment; + if (!matches[i].test(segment)) { + throw new TypeError('Expected all "' + token.name + '" to match "' + token.pattern + '", but received `' + JSON.stringify(segment) + '`') } - continue - } - - segment = token.asterisk ? encodeAsterisk(value) : encode(value); - - if (!matches[i].test(segment)) { - throw new TypeError('Expected "' + token.name + '" to match "' + token.pattern + '", but received "' + segment + '"') + path += (j === 0 ? token.prefix : token.delimiter) + segment; } - path += token.prefix + segment; + continue } - return path - } - } + segment = token.asterisk ? encodeAsterisk(value) : encode(value); - /** - * Escape a regular expression string. - * - * @param {string} str - * @return {string} - */ - function escapeString (str) { - return str.replace(/([.+*?=^!:${}()[\]|\/\\])/g, '\\$1') - } - - /** - * Escape the capturing group by escaping special characters and meaning. - * - * @param {string} group - * @return {string} - */ - function escapeGroup (group) { - return group.replace(/([=!:$\/()])/g, '\\$1') - } - - /** - * Attach the keys as a property of the regexp. - * - * @param {!RegExp} re - * @param {Array} keys - * @return {!RegExp} - */ - function attachKeys (re, keys) { - re.keys = keys; - return re - } - - /** - * Get the flags for a regexp from the options. - * - * @param {Object} options - * @return {string} - */ - function flags (options) { - return options && options.sensitive ? '' : 'i' - } - - /** - * Pull out keys from a regexp. - * - * @param {!RegExp} path - * @param {!Array} keys - * @return {!RegExp} - */ - function regexpToRegexp (path, keys) { - // Use a negative lookahead to match only capturing groups. - var groups = path.source.match(/\((?!\?)/g); - - if (groups) { - for (var i = 0; i < groups.length; i++) { - keys.push({ - name: i, - prefix: null, - delimiter: null, - optional: false, - repeat: false, - partial: false, - asterisk: false, - pattern: null - }); + if (!matches[i].test(segment)) { + throw new TypeError('Expected "' + token.name + '" to match "' + token.pattern + '", but received "' + segment + '"') } - } - - return attachKeys(path, keys) - } - - /** - * Transform an array into a regexp. - * - * @param {!Array} path - * @param {Array} keys - * @param {!Object} options - * @return {!RegExp} - */ - function arrayToRegexp (path, keys, options) { - var parts = []; - for (var i = 0; i < path.length; i++) { - parts.push(pathToRegexp(path[i], keys, options).source); - } - - var regexp = new RegExp('(?:' + parts.join('|') + ')', flags(options)); - - return attachKeys(regexp, keys) - } - - /** - * Create a path regexp from string input. - * - * @param {string} path - * @param {!Array} keys - * @param {!Object} options - * @return {!RegExp} - */ - function stringToRegexp (path, keys, options) { - return tokensToRegExp(parse(path, options), keys, options) - } - - /** - * Expose a function for taking tokens and returning a RegExp. - * - * @param {!Array} tokens - * @param {(Array|Object)=} keys - * @param {Object=} options - * @return {!RegExp} - */ - function tokensToRegExp (tokens, keys, options) { - if (!isarray(keys)) { - options = /** @type {!Object} */ (keys || options); - keys = []; + path += token.prefix + segment; + } + + return path + } + } + + /** + * Escape a regular expression string. + * + * @param {string} str + * @return {string} + */ + function escapeString (str) { + return str.replace(/([.+*?=^!:${}()[\]|\/\\])/g, '\\$1') + } + + /** + * Escape the capturing group by escaping special characters and meaning. + * + * @param {string} group + * @return {string} + */ + function escapeGroup (group) { + return group.replace(/([=!:$\/()])/g, '\\$1') + } + + /** + * Attach the keys as a property of the regexp. + * + * @param {!RegExp} re + * @param {Array} keys + * @return {!RegExp} + */ + function attachKeys (re, keys) { + re.keys = keys; + return re + } + + /** + * Get the flags for a regexp from the options. + * + * @param {Object} options + * @return {string} + */ + function flags (options) { + return options && options.sensitive ? '' : 'i' + } + + /** + * Pull out keys from a regexp. + * + * @param {!RegExp} path + * @param {!Array} keys + * @return {!RegExp} + */ + function regexpToRegexp (path, keys) { + // Use a negative lookahead to match only capturing groups. + var groups = path.source.match(/\((?!\?)/g); + + if (groups) { + for (var i = 0; i < groups.length; i++) { + keys.push({ + name: i, + prefix: null, + delimiter: null, + optional: false, + repeat: false, + partial: false, + asterisk: false, + pattern: null + }); } + } - options = options || {}; - - var strict = options.strict; - var end = options.end !== false; - var route = ''; - - // Iterate over the tokens and create our regexp string. - for (var i = 0; i < tokens.length; i++) { - var token = tokens[i]; - - if (typeof token === 'string') { - route += escapeString(token); - } else { - var prefix = escapeString(token.prefix); - var capture = '(?:' + token.pattern + ')'; + return attachKeys(path, keys) + } + + /** + * Transform an array into a regexp. + * + * @param {!Array} path + * @param {Array} keys + * @param {!Object} options + * @return {!RegExp} + */ + function arrayToRegexp (path, keys, options) { + var parts = []; + + for (var i = 0; i < path.length; i++) { + parts.push(pathToRegexp(path[i], keys, options).source); + } + + var regexp = new RegExp('(?:' + parts.join('|') + ')', flags(options)); + + return attachKeys(regexp, keys) + } + + /** + * Create a path regexp from string input. + * + * @param {string} path + * @param {!Array} keys + * @param {!Object} options + * @return {!RegExp} + */ + function stringToRegexp (path, keys, options) { + return tokensToRegExp(parse(path, options), keys, options) + } + + /** + * Expose a function for taking tokens and returning a RegExp. + * + * @param {!Array} tokens + * @param {(Array|Object)=} keys + * @param {Object=} options + * @return {!RegExp} + */ + function tokensToRegExp (tokens, keys, options) { + if (!isarray(keys)) { + options = /** @type {!Object} */ (keys || options); + keys = []; + } + + options = options || {}; + + var strict = options.strict; + var end = options.end !== false; + var route = ''; + + // Iterate over the tokens and create our regexp string. + for (var i = 0; i < tokens.length; i++) { + var token = tokens[i]; + + if (typeof token === 'string') { + route += escapeString(token); + } else { + var prefix = escapeString(token.prefix); + var capture = '(?:' + token.pattern + ')'; - keys.push(token); + keys.push(token); - if (token.repeat) { - capture += '(?:' + prefix + capture + ')*'; - } + if (token.repeat) { + capture += '(?:' + prefix + capture + ')*'; + } - if (token.optional) { - if (!token.partial) { - capture = '(?:' + prefix + '(' + capture + '))?'; - } else { - capture = prefix + '(' + capture + ')?'; - } + if (token.optional) { + if (!token.partial) { + capture = '(?:' + prefix + '(' + capture + '))?'; } else { - capture = prefix + '(' + capture + ')'; + capture = prefix + '(' + capture + ')?'; } - - route += capture; + } else { + capture = prefix + '(' + capture + ')'; } + + route += capture; } + } - var delimiter = escapeString(options.delimiter || '/'); - var endsWithDelimiter = route.slice(-delimiter.length) === delimiter; + var delimiter = escapeString(options.delimiter || '/'); + var endsWithDelimiter = route.slice(-delimiter.length) === delimiter; - // In non-strict mode we allow a slash at the end of match. If the path to - // match already ends with a slash, we remove it for consistency. The slash - // is valid at the end of a path match, not in the middle. This is important - // in non-ending mode, where "/test/" shouldn't match "/test//route". - if (!strict) { - route = (endsWithDelimiter ? route.slice(0, -delimiter.length) : route) + '(?:' + delimiter + '(?=$))?'; - } + // In non-strict mode we allow a slash at the end of match. If the path to + // match already ends with a slash, we remove it for consistency. The slash + // is valid at the end of a path match, not in the middle. This is important + // in non-ending mode, where "/test/" shouldn't match "/test//route". + if (!strict) { + route = (endsWithDelimiter ? route.slice(0, -delimiter.length) : route) + '(?:' + delimiter + '(?=$))?'; + } - if (end) { - route += '$'; - } else { - // In non-ending mode, we need the capturing groups to match as much as - // possible by using a positive lookahead to the end or next path segment. - route += strict && endsWithDelimiter ? '' : '(?=' + delimiter + '|$)'; - } + if (end) { + route += '$'; + } else { + // In non-ending mode, we need the capturing groups to match as much as + // possible by using a positive lookahead to the end or next path segment. + route += strict && endsWithDelimiter ? '' : '(?=' + delimiter + '|$)'; + } - return attachKeys(new RegExp('^' + route, flags(options)), keys) - } - - /** - * Normalize the given path string, returning a regular expression. - * - * An empty array can be passed in for the keys, which will hold the - * placeholder key descriptions. For example, using `/user/:id`, `keys` will - * contain `[{ name: 'id', delimiter: '/', optional: false, repeat: false }]`. - * - * @param {(string|RegExp|Array)} path - * @param {(Array|Object)=} keys - * @param {Object=} options - * @return {!RegExp} - */ - function pathToRegexp (path, keys, options) { - if (!isarray(keys)) { - options = /** @type {!Object} */ (keys || options); - keys = []; - } + return attachKeys(new RegExp('^' + route, flags(options)), keys) + } - options = options || {}; + /** + * Normalize the given path string, returning a regular expression. + * + * An empty array can be passed in for the keys, which will hold the + * placeholder key descriptions. For example, using `/user/:id`, `keys` will + * contain `[{ name: 'id', delimiter: '/', optional: false, repeat: false }]`. + * + * @param {(string|RegExp|Array)} path + * @param {(Array|Object)=} keys + * @param {Object=} options + * @return {!RegExp} + */ + function pathToRegexp (path, keys, options) { + if (!isarray(keys)) { + options = /** @type {!Object} */ (keys || options); + keys = []; + } - if (path instanceof RegExp) { - return regexpToRegexp(path, /** @type {!Array} */ (keys)) - } + options = options || {}; - if (isarray(path)) { - return arrayToRegexp(/** @type {!Array} */ (path), /** @type {!Array} */ (keys), options) - } + if (path instanceof RegExp) { + return regexpToRegexp(path, /** @type {!Array} */ (keys)) + } - return stringToRegexp(/** @type {string} */ (path), /** @type {!Array} */ (keys), options) + if (isarray(path)) { + return arrayToRegexp(/** @type {!Array} */ (path), /** @type {!Array} */ (keys), options) } - pathToRegexp_1.parse = parse_1; - pathToRegexp_1.compile = compile_1; - pathToRegexp_1.tokensToFunction = tokensToFunction_1; - pathToRegexp_1.tokensToRegExp = tokensToRegExp_1; - /* */ + return stringToRegexp(/** @type {string} */ (path), /** @type {!Array} */ (keys), options) + } + pathToRegexp_1.parse = parse_1; + pathToRegexp_1.compile = compile_1; + pathToRegexp_1.tokensToFunction = tokensToFunction_1; + pathToRegexp_1.tokensToRegExp = tokensToRegExp_1; - // $flow-disable-line - var regexpCompileCache = Object.create(null); + /* */ - function fillParams ( + // $flow-disable-line + var regexpCompileCache = Object.create(null); + + function fillParams ( path, params, routeMsg - ) { - params = params || {}; - try { - var filler = + ) { + params = params || {}; + try { + var filler = regexpCompileCache[path] || (regexpCompileCache[path] = pathToRegexp_1.compile(path)); - // Fix #2505 resolving asterisk routes { name: 'not-found', params: { pathMatch: '/not-found' }} - // and fix #3106 so that you can work with location descriptor object having params.pathMatch equal to empty string - if (typeof params.pathMatch === 'string') { params[0] = params.pathMatch; } + // Fix #2505 resolving asterisk routes { name: 'not-found', params: { pathMatch: '/not-found' }} + // and fix #3106 so that you can work with location descriptor object having params.pathMatch equal to empty string + if (typeof params.pathMatch === 'string') { params[0] = params.pathMatch; } - return filler(params, { pretty: true }) - } catch (e) { - { - // Fix #3072 no warn if `pathMatch` is string - warn(typeof params.pathMatch === 'string', ("missing param for " + routeMsg + ": " + (e.message))); - } - return '' - } finally { - // delete the 0 if it was added - delete params[0]; + return filler(params, { pretty: true }) + } catch (e) { + { + // Fix #3072 no warn if `pathMatch` is string + warn(typeof params.pathMatch === 'string', ("missing param for " + routeMsg + ": " + (e.message))); } + return '' + } finally { + // delete the 0 if it was added + delete params[0]; } + } - /* */ + /* */ - function normalizeLocation ( + function normalizeLocation ( raw, current, append, router - ) { - var next = typeof raw === 'string' ? { path: raw } : raw; - // named target - if (next._normalized) { - return next - } else if (next.name) { - next = extend({}, raw); - var params = next.params; - if (params && typeof params === 'object') { - next.params = extend({}, params); - } - return next - } - - // relative params - if (!next.path && next.params && current) { - next = extend({}, next); - next._normalized = true; - var params$1 = extend(extend({}, current.params), next.params); - if (current.name) { - next.name = current.name; - next.params = params$1; - } else if (current.matched.length) { - var rawPath = current.matched[current.matched.length - 1].path; - next.path = fillParams(rawPath, params$1, ("path " + (current.path))); - } else { - warn(false, "relative params navigation requires a current route."); - } - return next + ) { + var next = typeof raw === 'string' ? { path: raw } : raw; + // named target + if (next._normalized) { + return next + } else if (next.name) { + next = extend({}, raw); + var params = next.params; + if (params && typeof params === 'object') { + next.params = extend({}, params); + } + return next + } + + // relative params + if (!next.path && next.params && current) { + next = extend({}, next); + next._normalized = true; + var params$1 = extend(extend({}, current.params), next.params); + if (current.name) { + next.name = current.name; + next.params = params$1; + } else if (current.matched.length) { + var rawPath = current.matched[current.matched.length - 1].path; + next.path = fillParams(rawPath, params$1, ("path " + (current.path))); + } else { + warn(false, "relative params navigation requires a current route."); } + return next + } - var parsedPath = parsePath(next.path || ''); - var basePath = (current && current.path) || '/'; - var path = parsedPath.path + var parsedPath = parsePath(next.path || ''); + var basePath = (current && current.path) || '/'; + var path = parsedPath.path ? resolvePath(parsedPath.path, basePath, append || next.append) : basePath; - var query = resolveQuery( + var query = resolveQuery( parsedPath.query, next.query, router && router.options.parseQuery - ); - - var hash = next.hash || parsedPath.hash; - if (hash && hash.charAt(0) !== '#') { - hash = "#" + hash; - } - - return { - _normalized: true, - path: path, - query: query, - hash: hash - } - } - - // var toTypes = [String, Object]; - // var eventTypes = [String, Array]; - - // var noop = function () {}; - - // var warnedCustomSlot; - // var warnedTagProp; - // var warnedEventProp; - - // var Link = { - // name: 'RouterLink', - // props: { - // to: { - // type: toTypes, - // required: true - // }, - // tag: { - // type: String, - // default: 'a' - // }, - // custom: Boolean, - // exact: Boolean, - // exactPath: Boolean, - // append: Boolean, - // replace: Boolean, - // activeClass: String, - // exactActiveClass: String, - // ariaCurrentValue: { - // type: String, - // default: 'page' - // }, - // event: { - // type: eventTypes, - // default: 'click' - // } - // }, - // render: function render (h) { - // var this$1 = this; - - // var router = this.$router; - // var current = this.$route; - // var ref = router.resolve( - // this.to, - // current, - // this.append - // ); - // var location = ref.location; - // var route = ref.route; - // var href = ref.href; - - // var classes = {}; - // var globalActiveClass = router.options.linkActiveClass; - // var globalExactActiveClass = router.options.linkExactActiveClass; - // // Support global empty active class - // var activeClassFallback = - // globalActiveClass == null ? 'router-link-active' : globalActiveClass; - // var exactActiveClassFallback = - // globalExactActiveClass == null - // ? 'router-link-exact-active' - // : globalExactActiveClass; - // var activeClass = - // this.activeClass == null ? activeClassFallback : this.activeClass; - // var exactActiveClass = - // this.exactActiveClass == null - // ? exactActiveClassFallback - // : this.exactActiveClass; - - // var compareTarget = route.redirectedFrom - // ? createRoute(null, normalizeLocation(route.redirectedFrom), null, router) - // : route; - - // classes[exactActiveClass] = isSameRoute(current, compareTarget, this.exactPath); - // classes[activeClass] = this.exact || this.exactPath - // ? classes[exactActiveClass] - // : isIncludedRoute(current, compareTarget); - - // var ariaCurrentValue = classes[exactActiveClass] ? this.ariaCurrentValue : null; - - // var handler = function (e) { - // if (guardEvent(e)) { - // if (this$1.replace) { - // router.replace(location, noop); - // } else { - // router.push(location, noop); - // } - // } - // }; - - // var on = { click: guardEvent }; - // if (Array.isArray(this.event)) { - // this.event.forEach(function (e) { - // on[e] = handler; - // }); - // } else { - // on[this.event] = handler; - // } - - // var data = { class: classes }; - - // var scopedSlot = - // !this.$scopedSlots.$hasNormal && - // this.$scopedSlots.default && - // this.$scopedSlots.default({ - // href: href, - // route: route, - // navigate: handler, - // isActive: classes[activeClass], - // isExactActive: classes[exactActiveClass] - // }); - - // if (scopedSlot) { - // if (!this.custom) { - // !warnedCustomSlot && warn(false, 'In Vue Router 4, the v-slot API will by default wrap its content with an element. Use the custom prop to remove this warning:\n\n'); - // warnedCustomSlot = true; - // } - // if (scopedSlot.length === 1) { - // return scopedSlot[0] - // } else if (scopedSlot.length > 1 || !scopedSlot.length) { - // { - // warn( - // false, - // (" with to=\"" + (this.to) + "\" is trying to use a scoped slot but it didn't provide exactly one child. Wrapping the content with a span element.") - // ); - // } - // return scopedSlot.length === 0 ? h() : h('span', {}, scopedSlot) - // } - // } - - // { - // if ('tag' in this.$options.propsData && !warnedTagProp) { - // warn( - // false, - // "'s tag prop is deprecated and has been removed in Vue Router 4. Use the v-slot API to remove this warning: https://next.router.vuejs.org/guide/migration/#removal-of-event-and-tag-props-in-router-link." - // ); - // warnedTagProp = true; - // } - // if ('event' in this.$options.propsData && !warnedEventProp) { - // warn( - // false, - // "'s event prop is deprecated and has been removed in Vue Router 4. Use the v-slot API to remove this warning: https://next.router.vuejs.org/guide/migration/#removal-of-event-and-tag-props-in-router-link." - // ); - // warnedEventProp = true; - // } - // } - - // if (this.tag === 'a') { - // data.on = on; - // data.attrs = { href: href, 'aria-current': ariaCurrentValue }; - // } else { - // // find the first child and apply listener and href - // var a = findAnchor(this.$slots.default); - // if (a) { - // // in case the is a static node - // a.isStatic = false; - // var aData = (a.data = extend({}, a.data)); - // aData.on = aData.on || {}; - // // transform existing events in both objects into arrays so we can push later - // for (var event in aData.on) { - // var handler$1 = aData.on[event]; - // if (event in on) { - // aData.on[event] = Array.isArray(handler$1) ? handler$1 : [handler$1]; - // } - // } - // // append new listeners for router-link - // for (var event$1 in on) { - // if (event$1 in aData.on) { - // // on[event] is always a function - // aData.on[event$1].push(on[event$1]); - // } else { - // aData.on[event$1] = handler; - // } - // } - - // var aAttrs = (a.data.attrs = extend({}, a.data.attrs)); - // aAttrs.href = href; - // aAttrs['aria-current'] = ariaCurrentValue; - // } else { - // // doesn't have child, apply listener to self - // data.on = on; - // } - // } - - // return h(this.tag, data, this.$slots.default) - // } - // }; - - function guardEvent (e) { - // don't redirect with control keys - if (e.metaKey || e.altKey || e.ctrlKey || e.shiftKey) { return } - // don't redirect when preventDefault called - if (e.defaultPrevented) { return } - // don't redirect on right click - if (e.button !== undefined && e.button !== 0) { return } - // don't redirect if `target="_blank"` - if (e.currentTarget && e.currentTarget.getAttribute) { - var target = e.currentTarget.getAttribute('target'); - if (/\b_blank\b/i.test(target)) { return } - } - // this may be a Weex event which doesn't have this method - if (e.preventDefault) { - e.preventDefault(); - } - return true - } - - function findAnchor (children) { - if (children) { - var child; - for (var i = 0; i < children.length; i++) { - child = children[i]; - if (child.tag === 'a') { - return child - } - if (child.children && (child = findAnchor(child.children))) { - return child - } + ); + + var hash = next.hash || parsedPath.hash; + if (hash && hash.charAt(0) !== '#') { + hash = "#" + hash; + } + + return { + _normalized: true, + path: path, + query: query, + hash: hash + } + } + + // var toTypes = [String, Object]; + // var eventTypes = [String, Array]; + + // var noop = function () {}; + + // var warnedCustomSlot; + // var warnedTagProp; + // var warnedEventProp; + + // var Link = { + // name: 'RouterLink', + // props: { + // to: { + // type: toTypes, + // required: true + // }, + // tag: { + // type: String, + // default: 'a' + // }, + // custom: Boolean, + // exact: Boolean, + // exactPath: Boolean, + // append: Boolean, + // replace: Boolean, + // activeClass: String, + // exactActiveClass: String, + // ariaCurrentValue: { + // type: String, + // default: 'page' + // }, + // event: { + // type: eventTypes, + // default: 'click' + // } + // }, + // render: function render (h) { + // var this$1 = this; + + // var router = this.$router; + // var current = this.$route; + // var ref = router.resolve( + // this.to, + // current, + // this.append + // ); + // var location = ref.location; + // var route = ref.route; + // var href = ref.href; + + // var classes = {}; + // var globalActiveClass = router.options.linkActiveClass; + // var globalExactActiveClass = router.options.linkExactActiveClass; + // // Support global empty active class + // var activeClassFallback = + // globalActiveClass == null ? 'router-link-active' : globalActiveClass; + // var exactActiveClassFallback = + // globalExactActiveClass == null + // ? 'router-link-exact-active' + // : globalExactActiveClass; + // var activeClass = + // this.activeClass == null ? activeClassFallback : this.activeClass; + // var exactActiveClass = + // this.exactActiveClass == null + // ? exactActiveClassFallback + // : this.exactActiveClass; + + // var compareTarget = route.redirectedFrom + // ? createRoute(null, normalizeLocation(route.redirectedFrom), null, router) + // : route; + + // classes[exactActiveClass] = isSameRoute(current, compareTarget, this.exactPath); + // classes[activeClass] = this.exact || this.exactPath + // ? classes[exactActiveClass] + // : isIncludedRoute(current, compareTarget); + + // var ariaCurrentValue = classes[exactActiveClass] ? this.ariaCurrentValue : null; + + // var handler = function (e) { + // if (guardEvent(e)) { + // if (this$1.replace) { + // router.replace(location, noop); + // } else { + // router.push(location, noop); + // } + // } + // }; + + // var on = { click: guardEvent }; + // if (Array.isArray(this.event)) { + // this.event.forEach(function (e) { + // on[e] = handler; + // }); + // } else { + // on[this.event] = handler; + // } + + // var data = { class: classes }; + + // var scopedSlot = + // !this.$scopedSlots.$hasNormal && + // this.$scopedSlots.default && + // this.$scopedSlots.default({ + // href: href, + // route: route, + // navigate: handler, + // isActive: classes[activeClass], + // isExactActive: classes[exactActiveClass] + // }); + + // if (scopedSlot) { + // if (!this.custom) { + // !warnedCustomSlot && warn(false, 'In Vue Router 4, the v-slot API will by default wrap its content with an element. Use the custom prop to remove this warning:\n\n'); + // warnedCustomSlot = true; + // } + // if (scopedSlot.length === 1) { + // return scopedSlot[0] + // } else if (scopedSlot.length > 1 || !scopedSlot.length) { + // { + // warn( + // false, + // (" with to=\"" + (this.to) + "\" is trying to use a scoped slot but it didn't provide exactly one child. Wrapping the content with a span element.") + // ); + // } + // return scopedSlot.length === 0 ? h() : h('span', {}, scopedSlot) + // } + // } + + // { + // if ('tag' in this.$options.propsData && !warnedTagProp) { + // warn( + // false, + // "'s tag prop is deprecated and has been removed in Vue Router 4. Use the v-slot API to remove this warning: https://next.router.vuejs.org/guide/migration/#removal-of-event-and-tag-props-in-router-link." + // ); + // warnedTagProp = true; + // } + // if ('event' in this.$options.propsData && !warnedEventProp) { + // warn( + // false, + // "'s event prop is deprecated and has been removed in Vue Router 4. Use the v-slot API to remove this warning: https://next.router.vuejs.org/guide/migration/#removal-of-event-and-tag-props-in-router-link." + // ); + // warnedEventProp = true; + // } + // } + + // if (this.tag === 'a') { + // data.on = on; + // data.attrs = { href: href, 'aria-current': ariaCurrentValue }; + // } else { + // // find the first child and apply listener and href + // var a = findAnchor(this.$slots.default); + // if (a) { + // // in case the is a static node + // a.isStatic = false; + // var aData = (a.data = extend({}, a.data)); + // aData.on = aData.on || {}; + // // transform existing events in both objects into arrays so we can push later + // for (var event in aData.on) { + // var handler$1 = aData.on[event]; + // if (event in on) { + // aData.on[event] = Array.isArray(handler$1) ? handler$1 : [handler$1]; + // } + // } + // // append new listeners for router-link + // for (var event$1 in on) { + // if (event$1 in aData.on) { + // // on[event] is always a function + // aData.on[event$1].push(on[event$1]); + // } else { + // aData.on[event$1] = handler; + // } + // } + + // var aAttrs = (a.data.attrs = extend({}, a.data.attrs)); + // aAttrs.href = href; + // aAttrs['aria-current'] = ariaCurrentValue; + // } else { + // // doesn't have child, apply listener to self + // data.on = on; + // } + // } + + // return h(this.tag, data, this.$slots.default) + // } + // }; + + function guardEvent (e) { + // don't redirect with control keys + if (e.metaKey || e.altKey || e.ctrlKey || e.shiftKey) { return } + // don't redirect when preventDefault called + if (e.defaultPrevented) { return } + // don't redirect on right click + if (e.button !== undefined && e.button !== 0) { return } + // don't redirect if `target="_blank"` + if (e.currentTarget && e.currentTarget.getAttribute) { + var target = e.currentTarget.getAttribute('target'); + if (/\b_blank\b/i.test(target)) { return } + } + // this may be a Weex event which doesn't have this method + if (e.preventDefault) { + e.preventDefault(); + } + return true + } + + function findAnchor (children) { + if (children) { + var child; + for (var i = 0; i < children.length; i++) { + child = children[i]; + if (child.tag === 'a') { + return child + } + if (child.children && (child = findAnchor(child.children))) { + return child } } } + } - // var _Vue; + // var _Vue; - // function install (Vue) { - // if (install.installed && _Vue === Vue) { return } - // install.installed = true; + // function install (Vue) { + // if (install.installed && _Vue === Vue) { return } + // install.installed = true; - // _Vue = Vue; + // _Vue = Vue; - // var isDef = function (v) { return v !== undefined; }; + // var isDef = function (v) { return v !== undefined; }; - // var registerInstance = function (vm, callVal) { - // var i = vm.$options._parentVnode; - // if (isDef(i) && isDef(i = i.data) && isDef(i = i.registerRouteInstance)) { - // i(vm, callVal); - // } - // }; + // var registerInstance = function (vm, callVal) { + // var i = vm.$options._parentVnode; + // if (isDef(i) && isDef(i = i.data) && isDef(i = i.registerRouteInstance)) { + // i(vm, callVal); + // } + // }; - // Vue.mixin({ - // beforeCreate: function beforeCreate () { - // if (isDef(this.$options.router)) { - // this._routerRoot = this; - // this._router = this.$options.router; - // this._router.init(this); - // Vue.util.defineReactive(this, '_route', this._router.history.current); - // } else { - // this._routerRoot = (this.$parent && this.$parent._routerRoot) || this; - // } - // registerInstance(this, this); - // }, - // destroyed: function destroyed () { - // registerInstance(this); - // } - // }); + // Vue.mixin({ + // beforeCreate: function beforeCreate () { + // if (isDef(this.$options.router)) { + // this._routerRoot = this; + // this._router = this.$options.router; + // this._router.init(this); + // Vue.util.defineReactive(this, '_route', this._router.history.current); + // } else { + // this._routerRoot = (this.$parent && this.$parent._routerRoot) || this; + // } + // registerInstance(this, this); + // }, + // destroyed: function destroyed () { + // registerInstance(this); + // } + // }); - // Object.defineProperty(Vue.prototype, '$router', { - // get: function get () { return this._routerRoot._router } - // }); + // Object.defineProperty(Vue.prototype, '$router', { + // get: function get () { return this._routerRoot._router } + // }); - // Object.defineProperty(Vue.prototype, '$route', { - // get: function get () { return this._routerRoot._route } - // }); + // Object.defineProperty(Vue.prototype, '$route', { + // get: function get () { return this._routerRoot._route } + // }); - // Vue.component('RouterView', View); - // Vue.component('RouterLink', Link); + // Vue.component('RouterView', View); + // Vue.component('RouterLink', Link); - // var strats = Vue.config.optionMergeStrategies; - // // use the same hook merging strategy for route hooks - // strats.beforeRouteEnter = strats.beforeRouteLeave = strats.beforeRouteUpdate = strats.created; - // } + // var strats = Vue.config.optionMergeStrategies; + // // use the same hook merging strategy for route hooks + // strats.beforeRouteEnter = strats.beforeRouteLeave = strats.beforeRouteUpdate = strats.created; + // } - /* */ + /* */ - var inBrowser = typeof window !== 'undefined'; + var inBrowser = typeof window !== 'undefined'; - /* */ + /* */ - function createRouteMap ( + function createRouteMap ( routes, oldPathList, oldPathMap, oldNameMap, parentRoute - ) { - // the path list is used to control path matching priority - var pathList = oldPathList || []; - // $flow-disable-line - var pathMap = oldPathMap || Object.create(null); - // $flow-disable-line - var nameMap = oldNameMap || Object.create(null); + ) { + // the path list is used to control path matching priority + var pathList = oldPathList || []; + // $flow-disable-line + var pathMap = oldPathMap || Object.create(null); + // $flow-disable-line + var nameMap = oldNameMap || Object.create(null); - routes.forEach(function (route) { - addRouteRecord(pathList, pathMap, nameMap, route, parentRoute); - }); + routes.forEach(function (route) { + addRouteRecord(pathList, pathMap, nameMap, route, parentRoute); + }); - // ensure wildcard routes are always at the end - for (var i = 0, l = pathList.length; i < l; i++) { - if (pathList[i] === '*') { - pathList.push(pathList.splice(i, 1)[0]); - l--; - i--; - } + // ensure wildcard routes are always at the end + for (var i = 0, l = pathList.length; i < l; i++) { + if (pathList[i] === '*') { + pathList.push(pathList.splice(i, 1)[0]); + l--; + i--; } + } - { - // warn if routes do not include leading slashes - var found = pathList - // check for missing leading slash + { + // warn if routes do not include leading slashes + var found = pathList + // check for missing leading slash .filter(function (path) { return path && path.charAt(0) !== '*' && path.charAt(0) !== '/'; }); - if (found.length > 0) { - var pathNames = found.map(function (path) { return ("- " + path); }).join('\n'); - warn(false, ("Non-nested routes must include a leading slash character. Fix the following routes: \n" + pathNames)); - } + if (found.length > 0) { + var pathNames = found.map(function (path) { return ("- " + path); }).join('\n'); + warn(false, ("Non-nested routes must include a leading slash character. Fix the following routes: \n" + pathNames)); } + } - return { - pathList: pathList, - pathMap: pathMap, - nameMap: nameMap - } + return { + pathList: pathList, + pathMap: pathMap, + nameMap: nameMap } + } - function addRouteRecord ( + function addRouteRecord ( pathList, pathMap, nameMap, route, parent, matchAs - ) { - var path = route.path; - var name = route.name; - { - assert(path != null, "\"path\" is required in a route configuration."); - assert( + ) { + var path = route.path; + var name = route.name; + { + assert(path != null, "\"path\" is required in a route configuration."); + assert( typeof route.component !== 'string', "route config \"component\" for path: " + (String( - path || name + path || name )) + " cannot be a " + "string id. Use an actual component instead." - ); + ); - warn( + warn( // eslint-disable-next-line no-control-regex !/[^\u0000-\u007F]+/.test(path), "Route with path \"" + path + "\" contains unencoded characters, make sure " + - "your path is correctly encoded before passing it to the router. Use " + - "encodeURI to encode static segments of your path." - ); - } + "your path is correctly encoded before passing it to the router. Use " + + "encodeURI to encode static segments of your path." + ); + } - var pathToRegexpOptions = + var pathToRegexpOptions = route.pathToRegexpOptions || {}; - var normalizedPath = normalizePath(path, parent, pathToRegexpOptions.strict); + var normalizedPath = normalizePath(path, parent, pathToRegexpOptions.strict); - if (typeof route.caseSensitive === 'boolean') { - pathToRegexpOptions.sensitive = route.caseSensitive; - } + if (typeof route.caseSensitive === 'boolean') { + pathToRegexpOptions.sensitive = route.caseSensitive; + } - var record = { - path: normalizedPath, - regex: compileRouteRegex(normalizedPath, pathToRegexpOptions), - components: route.components || { default: route.component }, - alias: route.alias + var record = { + path: normalizedPath, + regex: compileRouteRegex(normalizedPath, pathToRegexpOptions), + components: route.components || { default: route.component }, + alias: route.alias ? typeof route.alias === 'string' - ? [route.alias] - : route.alias + ? [route.alias] + : route.alias : [], - instances: {}, - enteredCbs: {}, - name: name, - parent: parent, - matchAs: matchAs, - redirect: route.redirect, - beforeEnter: route.beforeEnter, - meta: route.meta || {}, - props: + instances: {}, + enteredCbs: {}, + name: name, + parent: parent, + matchAs: matchAs, + redirect: route.redirect, + beforeEnter: route.beforeEnter, + meta: route.meta || {}, + props: route.props == null - ? {} - : route.components + ? {} + : route.components ? route.props : { default: route.props } - }; + }; - if (route.children) { - // Warn if route is named, does not redirect and has a default child route. - // If users navigate to this route by name, the default child will - // not be rendered (GH Issue #629) - { - if ( + if (route.children) { + // Warn if route is named, does not redirect and has a default child route. + // If users navigate to this route by name, the default child will + // not be rendered (GH Issue #629) + { + if ( route.name && !route.redirect && route.children.some(function (child) { return /^\/?$/.test(child.path); }) - ) { - warn( + ) { + warn( false, "Named Route '" + (route.name) + "' has a default child route. " + - "When navigating to this named route (:to=\"{name: '" + (route.name) + "'\"), " + - "the default child route will not be rendered. Remove the name from " + - "this route and use the name of the default child route for named " + - "links instead." - ); - } + "When navigating to this named route (:to=\"{name: '" + (route.name) + "'\"), " + + "the default child route will not be rendered. Remove the name from " + + "this route and use the name of the default child route for named " + + "links instead." + ); } - route.children.forEach(function (child) { - var childMatchAs = matchAs + } + route.children.forEach(function (child) { + var childMatchAs = matchAs ? cleanPath((matchAs + "/" + (child.path))) : undefined; - addRouteRecord(pathList, pathMap, nameMap, child, record, childMatchAs); - }); - } + addRouteRecord(pathList, pathMap, nameMap, child, record, childMatchAs); + }); + } - if (!pathMap[record.path]) { - pathList.push(record.path); - pathMap[record.path] = record; - } + if (!pathMap[record.path]) { + pathList.push(record.path); + pathMap[record.path] = record; + } - if (route.alias !== undefined) { - var aliases = Array.isArray(route.alias) ? route.alias : [route.alias]; - for (var i = 0; i < aliases.length; ++i) { - var alias = aliases[i]; - if (alias === path) { - warn( + if (route.alias !== undefined) { + var aliases = Array.isArray(route.alias) ? route.alias : [route.alias]; + for (var i = 0; i < aliases.length; ++i) { + var alias = aliases[i]; + if (alias === path) { + warn( false, ("Found an alias with the same value as the path: \"" + path + "\". You have to remove that alias. It will be ignored in development.") - ); - // skip in dev to make it work - continue - } + ); + // skip in dev to make it work + continue + } - var aliasRoute = { - path: alias, - children: route.children - }; - addRouteRecord( + var aliasRoute = { + path: alias, + children: route.children + }; + addRouteRecord( pathList, pathMap, nameMap, aliasRoute, parent, record.path || '/' // matchAs - ); - } + ); } + } - if (name) { - if (!nameMap[name]) { - nameMap[name] = record; - } else if (!matchAs) { - warn( + if (name) { + if (!nameMap[name]) { + nameMap[name] = record; + } else if (!matchAs) { + warn( false, "Duplicate named routes definition: " + - "{ name: \"" + name + "\", path: \"" + (record.path) + "\" }" - ); - } + "{ name: \"" + name + "\", path: \"" + (record.path) + "\" }" + ); } } + } - function compileRouteRegex ( + function compileRouteRegex ( path, pathToRegexpOptions - ) { - var regex = pathToRegexp_1(path, [], pathToRegexpOptions); - { - var keys = Object.create(null); - regex.keys.forEach(function (key) { - warn( + ) { + var regex = pathToRegexp_1(path, [], pathToRegexpOptions); + { + var keys = Object.create(null); + regex.keys.forEach(function (key) { + warn( !keys[key.name], ("Duplicate param keys in route with path: \"" + path + "\"") - ); - keys[key.name] = true; - }); - } - return regex + ); + keys[key.name] = true; + }); } + return regex + } - function normalizePath ( + function normalizePath ( path, parent, strict - ) { - if (!strict) { path = path.replace(/\/$/, ''); } - if (path[0] === '/') { return path } - if (parent == null) { return path } - return cleanPath(((parent.path) + "/" + path)) - } + ) { + if (!strict) { path = path.replace(/\/$/, ''); } + if (path[0] === '/') { return path } + if (parent == null) { return path } + return cleanPath(((parent.path) + "/" + path)) + } - /* */ + /* */ - function createMatcher ( + function createMatcher ( routes, router - ) { - var ref = createRouteMap(routes); - var pathList = ref.pathList; - var pathMap = ref.pathMap; - var nameMap = ref.nameMap; + ) { + var ref = createRouteMap(routes); + var pathList = ref.pathList; + var pathMap = ref.pathMap; + var nameMap = ref.nameMap; - function addRoutes (routes) { - createRouteMap(routes, pathList, pathMap, nameMap); - } + function addRoutes (routes) { + createRouteMap(routes, pathList, pathMap, nameMap); + } - function addRoute (parentOrRoute, route) { - var parent = (typeof parentOrRoute !== 'object') ? nameMap[parentOrRoute] : undefined; - // $flow-disable-line - createRouteMap([route || parentOrRoute], pathList, pathMap, nameMap, parent); + function addRoute (parentOrRoute, route) { + var parent = (typeof parentOrRoute !== 'object') ? nameMap[parentOrRoute] : undefined; + // $flow-disable-line + createRouteMap([route || parentOrRoute], pathList, pathMap, nameMap, parent); - // add aliases of parent - if (parent && parent.alias.length) { - createRouteMap( + // add aliases of parent + if (parent && parent.alias.length) { + createRouteMap( // $flow-disable-line route is defined if parent is parent.alias.map(function (alias) { return ({ path: alias, children: [route] }); }), pathList, pathMap, nameMap, parent - ); - } + ); } + } - function getRoutes () { - return pathList.map(function (path) { return pathMap[path]; }) - } + function getRoutes () { + return pathList.map(function (path) { return pathMap[path]; }) + } - function match ( + function match ( raw, currentRoute, redirectedFrom - ) { - var location = normalizeLocation(raw, currentRoute, false, router); - var name = location.name; - - if (name) { - var record = nameMap[name]; - { - warn(record, ("Route with name '" + name + "' does not exist")); - } - if (!record) { return _createRoute(null, location) } - var paramNames = record.regex.keys + ) { + var location = normalizeLocation(raw, currentRoute, false, router); + var name = location.name; + + if (name) { + var record = nameMap[name]; + { + warn(record, ("Route with name '" + name + "' does not exist")); + } + if (!record) { return _createRoute(null, location) } + var paramNames = record.regex.keys .filter(function (key) { return !key.optional; }) .map(function (key) { return key.name; }); - if (typeof location.params !== 'object') { - location.params = {}; - } + if (typeof location.params !== 'object') { + location.params = {}; + } - if (currentRoute && typeof currentRoute.params === 'object') { - for (var key in currentRoute.params) { - if (!(key in location.params) && paramNames.indexOf(key) > -1) { - location.params[key] = currentRoute.params[key]; - } + if (currentRoute && typeof currentRoute.params === 'object') { + for (var key in currentRoute.params) { + if (!(key in location.params) && paramNames.indexOf(key) > -1) { + location.params[key] = currentRoute.params[key]; } } + } - location.path = fillParams(record.path, location.params, ("named route \"" + name + "\"")); - return _createRoute(record, location, redirectedFrom) - } else if (location.path) { - location.params = {}; - for (var i = 0; i < pathList.length; i++) { - var path = pathList[i]; - var record$1 = pathMap[path]; - if (matchRoute(record$1.regex, location.path, location.params)) { - return _createRoute(record$1, location, redirectedFrom) - } + location.path = fillParams(record.path, location.params, ("named route \"" + name + "\"")); + return _createRoute(record, location, redirectedFrom) + } else if (location.path) { + location.params = {}; + for (var i = 0; i < pathList.length; i++) { + var path = pathList[i]; + var record$1 = pathMap[path]; + if (matchRoute(record$1.regex, location.path, location.params)) { + return _createRoute(record$1, location, redirectedFrom) } } - // no match - return _createRoute(null, location) } + // no match + return _createRoute(null, location) + } - function redirect ( + function redirect ( record, location - ) { - var originalRedirect = record.redirect; - var redirect = typeof originalRedirect === 'function' + ) { + var originalRedirect = record.redirect; + var redirect = typeof originalRedirect === 'function' ? originalRedirect(createRoute(record, location, null, router)) : originalRedirect; - if (typeof redirect === 'string') { - redirect = { path: redirect }; - } + if (typeof redirect === 'string') { + redirect = { path: redirect }; + } - if (!redirect || typeof redirect !== 'object') { - { - warn( + if (!redirect || typeof redirect !== 'object') { + { + warn( false, ("invalid redirect option: " + (JSON.stringify(redirect))) - ); - } - return _createRoute(null, location) + ); } + return _createRoute(null, location) + } - var re = redirect; - var name = re.name; - var path = re.path; - var query = location.query; - var hash = location.hash; - var params = location.params; - query = re.hasOwnProperty('query') ? re.query : query; - hash = re.hasOwnProperty('hash') ? re.hash : hash; - params = re.hasOwnProperty('params') ? re.params : params; - - if (name) { - // resolved named direct - var targetRecord = nameMap[name]; - { - assert(targetRecord, ("redirect failed: named route \"" + name + "\" not found.")); - } - return match({ - _normalized: true, - name: name, - query: query, - hash: hash, - params: params - }, undefined, location) - } else if (path) { - // 1. resolve relative redirect - var rawPath = resolveRecordPath(path, record); - // 2. resolve params - var resolvedPath = fillParams(rawPath, params, ("redirect route with path \"" + rawPath + "\"")); - // 3. rematch with existing query and hash - return match({ - _normalized: true, - path: resolvedPath, - query: query, - hash: hash - }, undefined, location) - } else { - { - warn(false, ("invalid redirect option: " + (JSON.stringify(redirect)))); - } - return _createRoute(null, location) + var re = redirect; + var name = re.name; + var path = re.path; + var query = location.query; + var hash = location.hash; + var params = location.params; + query = re.hasOwnProperty('query') ? re.query : query; + hash = re.hasOwnProperty('hash') ? re.hash : hash; + params = re.hasOwnProperty('params') ? re.params : params; + if (name) { + // resolved named direct + var targetRecord = nameMap[name]; + { + assert(targetRecord, ("redirect failed: named route \"" + name + "\" not found.")); + } + return match({ + _normalized: true, + name: name, + query: query, + hash: hash, + params: params + }, undefined, location) + } else if (path) { + // 1. resolve relative redirect + var rawPath = resolveRecordPath(path, record); + // 2. resolve params + var resolvedPath = fillParams(rawPath, params, ("redirect route with path \"" + rawPath + "\"")); + // 3. rematch with existing query and hash + return match({ + _normalized: true, + path: resolvedPath, + query: query, + hash: hash + }, undefined, location) + } else { + { + warn(false, ("invalid redirect option: " + (JSON.stringify(redirect)))); } + return _createRoute(null, location) } + } - function alias ( + function alias ( record, location, matchAs - ) { - var aliasedPath = fillParams(matchAs, location.params, ("aliased route with path \"" + matchAs + "\"")); - var aliasedMatch = match({ - _normalized: true, - path: aliasedPath - }); - if (aliasedMatch) { - var matched = aliasedMatch.matched; - var aliasedRecord = matched[matched.length - 1]; - location.params = aliasedMatch.params; - return _createRoute(aliasedRecord, location) - } - return _createRoute(null, location) + ) { + var aliasedPath = fillParams(matchAs, location.params, ("aliased route with path \"" + matchAs + "\"")); + var aliasedMatch = match({ + _normalized: true, + path: aliasedPath + }); + if (aliasedMatch) { + var matched = aliasedMatch.matched; + var aliasedRecord = matched[matched.length - 1]; + location.params = aliasedMatch.params; + return _createRoute(aliasedRecord, location) } + return _createRoute(null, location) + } - function _createRoute ( + function _createRoute ( record, location, redirectedFrom - ) { - if (record && record.redirect) { - return redirect(record, redirectedFrom || location) - } - if (record && record.matchAs) { - return alias(record, location, record.matchAs) - } - return createRoute(record, location, redirectedFrom, router) + ) { + if (record && record.redirect) { + return redirect(record, redirectedFrom || location) } - - return { - match: match, - addRoute: addRoute, - getRoutes: getRoutes, - addRoutes: addRoutes + if (record && record.matchAs) { + return alias(record, location, record.matchAs) } + return createRoute(record, location, redirectedFrom, router) + } + + return { + match: match, + addRoute: addRoute, + getRoutes: getRoutes, + addRoutes: addRoutes } + } - function matchRoute ( + function matchRoute ( regex, path, params - ) { - var m = path.match(regex); - - if (!m) { - return false - } else if (!params) { - return true - } - - for (var i = 1, len = m.length; i < len; ++i) { - var key = regex.keys[i - 1]; - if (key) { - // Fix #1994: using * with props: true generates a param named 0 - params[key.name || 'pathMatch'] = typeof m[i] === 'string' ? decode(m[i]) : m[i]; - } - } + ) { + var m = path.match(regex); + if (!m) { + return false + } else if (!params) { return true } - function resolveRecordPath (path, record) { - return resolvePath(path, record.parent ? record.parent.path : '/', true) - } - - /* */ - - // use User Timing api (if present) for more accurate key precision - var Time = - inBrowser && window.performance && window.performance.now - ? window.performance - : Date; - - function genStateKey () { - return Time.now().toFixed(3) - } - - var _key = genStateKey(); - - function getStateKey () { - return _key - } - - function setStateKey (key) { - return (_key = key) + for (var i = 1, len = m.length; i < len; ++i) { + var key = regex.keys[i - 1]; + if (key) { + // Fix #1994: using * with props: true generates a param named 0 + params[key.name || 'pathMatch'] = typeof m[i] === 'string' ? decode(m[i]) : m[i]; + } } - /* */ + return true + } - var positionStore = Object.create(null); + function resolveRecordPath (path, record) { + return resolvePath(path, record.parent ? record.parent.path : '/', true) + } - function setupScroll () { - // Prevent browser scroll behavior on History popstate - if ('scrollRestoration' in window.history) { - window.history.scrollRestoration = 'manual'; - } - // Fix for #1585 for Firefox - // Fix for #2195 Add optional third attribute to workaround a bug in safari https://bugs.webkit.org/show_bug.cgi?id=182678 - // Fix for #2774 Support for apps loaded from Windows file shares not mapped to network drives: replaced location.origin with - // window.location.protocol + '//' + window.location.host - // location.host contains the port and location.hostname doesn't - var protocolAndPath = window.location.protocol + '//' + window.location.host; - var absolutePath = window.location.href.replace(protocolAndPath, ''); - // preserve existing history state as it could be overriden by the user - var stateCopy = extend({}, window.history.state); - stateCopy.key = getStateKey(); - window.history.replaceState(stateCopy, '', absolutePath); - window.addEventListener('popstate', handlePopState); - return function () { - window.removeEventListener('popstate', handlePopState); - } - } + /* */ - function handleScroll ( + // use User Timing api (if present) for more accurate key precision + var Time = + inBrowser && window.performance && window.performance.now + ? window.performance + : Date; + + function genStateKey () { + return Time.now().toFixed(3) + } + + var _key = genStateKey(); + + function getStateKey () { + return _key + } + + function setStateKey (key) { + return (_key = key) + } + + /* */ + + var positionStore = Object.create(null); + + function setupScroll () { + // Prevent browser scroll behavior on History popstate + if ('scrollRestoration' in window.history) { + window.history.scrollRestoration = 'manual'; + } + // Fix for #1585 for Firefox + // Fix for #2195 Add optional third attribute to workaround a bug in safari https://bugs.webkit.org/show_bug.cgi?id=182678 + // Fix for #2774 Support for apps loaded from Windows file shares not mapped to network drives: replaced location.origin with + // window.location.protocol + '//' + window.location.host + // location.host contains the port and location.hostname doesn't + var protocolAndPath = window.location.protocol + '//' + window.location.host; + var absolutePath = window.location.href.replace(protocolAndPath, ''); + // preserve existing history state as it could be overriden by the user + var stateCopy = extend({}, window.history.state); + stateCopy.key = getStateKey(); + window.history.replaceState(stateCopy, '', absolutePath); + window.addEventListener('popstate', handlePopState); + return function () { + window.removeEventListener('popstate', handlePopState); + } + } + + function handleScroll ( router, to, from, isPop - ) { - if (!router.app) { - return - } + ) { + if (!router.app) { + return + } - var behavior = router.options.scrollBehavior; - if (!behavior) { - return - } + var behavior = router.options.scrollBehavior; + if (!behavior) { + return + } - { - assert(typeof behavior === 'function', "scrollBehavior must be a function"); - } + { + assert(typeof behavior === 'function', "scrollBehavior must be a function"); + } - // wait until re-render finishes before scrolling - BI.nextTick(function () { - var position = getScrollPosition(); - var shouldScroll = behavior.call( + // wait until re-render finishes before scrolling + BI.nextTick(function () { + var position = getScrollPosition(); + var shouldScroll = behavior.call( router, to, from, isPop ? position : null - ); + ); - if (!shouldScroll) { - return - } + if (!shouldScroll) { + return + } - if (typeof shouldScroll.then === 'function') { - shouldScroll + if (typeof shouldScroll.then === 'function') { + shouldScroll .then(function (shouldScroll) { scrollToPosition((shouldScroll), position); }) @@ -1853,120 +1852,120 @@ assert(false, err.toString()); } }); - } else { - scrollToPosition(shouldScroll, position); - } - }); - } - - function saveScrollPosition () { - var key = getStateKey(); - if (key) { - positionStore[key] = { - x: window.pageXOffset, - y: window.pageYOffset - }; + } else { + scrollToPosition(shouldScroll, position); } + }); + } + + function saveScrollPosition () { + var key = getStateKey(); + if (key) { + positionStore[key] = { + x: window.pageXOffset, + y: window.pageYOffset + }; } + } - function handlePopState (e) { - saveScrollPosition(); - if (e.state && e.state.key) { - setStateKey(e.state.key); - } + function handlePopState (e) { + saveScrollPosition(); + if (e.state && e.state.key) { + setStateKey(e.state.key); } + } - function getScrollPosition () { - var key = getStateKey(); - if (key) { - return positionStore[key] - } + function getScrollPosition () { + var key = getStateKey(); + if (key) { + return positionStore[key] } + } - function getElementPosition (el, offset) { - var docEl = document.documentElement; - var docRect = docEl.getBoundingClientRect(); - var elRect = el.getBoundingClientRect(); - return { - x: elRect.left - docRect.left - offset.x, - y: elRect.top - docRect.top - offset.y - } + function getElementPosition (el, offset) { + var docEl = document.documentElement; + var docRect = docEl.getBoundingClientRect(); + var elRect = el.getBoundingClientRect(); + return { + x: elRect.left - docRect.left - offset.x, + y: elRect.top - docRect.top - offset.y } + } - function isValidPosition (obj) { - return isNumber(obj.x) || isNumber(obj.y) - } + function isValidPosition (obj) { + return isNumber(obj.x) || isNumber(obj.y) + } - function normalizePosition (obj) { - return { - x: isNumber(obj.x) ? obj.x : window.pageXOffset, - y: isNumber(obj.y) ? obj.y : window.pageYOffset - } + function normalizePosition (obj) { + return { + x: isNumber(obj.x) ? obj.x : window.pageXOffset, + y: isNumber(obj.y) ? obj.y : window.pageYOffset } + } - function normalizeOffset (obj) { - return { - x: isNumber(obj.x) ? obj.x : 0, - y: isNumber(obj.y) ? obj.y : 0 - } + function normalizeOffset (obj) { + return { + x: isNumber(obj.x) ? obj.x : 0, + y: isNumber(obj.y) ? obj.y : 0 } + } - function isNumber (v) { - return typeof v === 'number' - } + function isNumber (v) { + return typeof v === 'number' + } - var hashStartsWithNumberRE = /^#\d/; + var hashStartsWithNumberRE = /^#\d/; - function scrollToPosition (shouldScroll, position) { - var isObject = typeof shouldScroll === 'object'; - if (isObject && typeof shouldScroll.selector === 'string') { - // getElementById would still fail if the selector contains a more complicated query like #main[data-attr] - // but at the same time, it doesn't make much sense to select an element with an id and an extra selector - var el = hashStartsWithNumberRE.test(shouldScroll.selector) // $flow-disable-line + function scrollToPosition (shouldScroll, position) { + var isObject = typeof shouldScroll === 'object'; + if (isObject && typeof shouldScroll.selector === 'string') { + // getElementById would still fail if the selector contains a more complicated query like #main[data-attr] + // but at the same time, it doesn't make much sense to select an element with an id and an extra selector + var el = hashStartsWithNumberRE.test(shouldScroll.selector) // $flow-disable-line ? document.getElementById(shouldScroll.selector.slice(1)) // $flow-disable-line : document.querySelector(shouldScroll.selector); - if (el) { - var offset = + if (el) { + var offset = shouldScroll.offset && typeof shouldScroll.offset === 'object' - ? shouldScroll.offset - : {}; - offset = normalizeOffset(offset); - position = getElementPosition(el, offset); - } else if (isValidPosition(shouldScroll)) { - position = normalizePosition(shouldScroll); - } - } else if (isObject && isValidPosition(shouldScroll)) { + ? shouldScroll.offset + : {}; + offset = normalizeOffset(offset); + position = getElementPosition(el, offset); + } else if (isValidPosition(shouldScroll)) { position = normalizePosition(shouldScroll); } + } else if (isObject && isValidPosition(shouldScroll)) { + position = normalizePosition(shouldScroll); + } - if (position) { - // $flow-disable-line - if ('scrollBehavior' in document.documentElement.style) { - window.scrollTo({ - left: position.x, - top: position.y, - // $flow-disable-line - behavior: shouldScroll.behavior - }); - } else { - window.scrollTo(position.x, position.y); - } + if (position) { + // $flow-disable-line + if ('scrollBehavior' in document.documentElement.style) { + window.scrollTo({ + left: position.x, + top: position.y, + // $flow-disable-line + behavior: shouldScroll.behavior + }); + } else { + window.scrollTo(position.x, position.y); } } + } - /* */ + /* */ - var supportsPushState = + var supportsPushState = inBrowser && (function () { var ua = window.navigator.userAgent; if ( - (ua.indexOf('Android 2.') !== -1 || ua.indexOf('Android 4.0') !== -1) && - ua.indexOf('Mobile Safari') !== -1 && - ua.indexOf('Chrome') === -1 && - ua.indexOf('Windows Phone') === -1 + (ua.indexOf('Android 2.') !== -1 || ua.indexOf('Android 4.0') !== -1) && + ua.indexOf('Mobile Safari') !== -1 && + ua.indexOf('Chrome') === -1 && + ua.indexOf('Windows Phone') === -1 ) { return false } @@ -1974,292 +1973,292 @@ return window.history && typeof window.history.pushState === 'function' })(); - function pushState (url, replace) { - saveScrollPosition(); - // try...catch the pushState call to get around Safari - // DOM Exception 18 where it limits to 100 pushState calls - var history = window.history; - try { - if (replace) { - // preserve existing history state as it could be overriden by the user - var stateCopy = extend({}, history.state); - stateCopy.key = getStateKey(); - history.replaceState(stateCopy, '', url); - } else { - history.pushState({ key: setStateKey(genStateKey()) }, '', url); - } - } catch (e) { - window.location[replace ? 'replace' : 'assign'](url); + function pushState (url, replace) { + saveScrollPosition(); + // try...catch the pushState call to get around Safari + // DOM Exception 18 where it limits to 100 pushState calls + var history = window.history; + try { + if (replace) { + // preserve existing history state as it could be overriden by the user + var stateCopy = extend({}, history.state); + stateCopy.key = getStateKey(); + history.replaceState(stateCopy, '', url); + } else { + history.pushState({ key: setStateKey(genStateKey()) }, '', url); } + } catch (e) { + window.location[replace ? 'replace' : 'assign'](url); } + } - function replaceState (url) { - pushState(url, true); - } + function replaceState (url) { + pushState(url, true); + } - /* */ + /* */ - function runQueue (queue, fn, cb) { - var step = function (index) { - if (index >= queue.length) { - cb(); - } else { - if (queue[index]) { - fn(queue[index], function () { - step(index + 1); - }); - } else { + function runQueue (queue, fn, cb) { + var step = function (index) { + if (index >= queue.length) { + cb(); + } else { + if (queue[index]) { + fn(queue[index], function () { step(index + 1); - } + }); + } else { + step(index + 1); } - }; - step(0); - } - - // When changing thing, also edit router.d.ts - var NavigationFailureType = { - redirected: 2, - aborted: 4, - cancelled: 8, - duplicated: 16 + } }; - - function createNavigationRedirectedError (from, to) { - return createRouterError( + step(0); + } + + // When changing thing, also edit router.d.ts + var NavigationFailureType = { + redirected: 2, + aborted: 4, + cancelled: 8, + duplicated: 16 + }; + + function createNavigationRedirectedError (from, to) { + return createRouterError( from, to, NavigationFailureType.redirected, ("Redirected when going from \"" + (from.fullPath) + "\" to \"" + (stringifyRoute( - to + to )) + "\" via a navigation guard.") - ) - } + ) + } - function createNavigationDuplicatedError (from, to) { - var error = createRouterError( + function createNavigationDuplicatedError (from, to) { + var error = createRouterError( from, to, NavigationFailureType.duplicated, ("Avoided redundant navigation to current location: \"" + (from.fullPath) + "\".") - ); - // backwards compatible with the first introduction of Errors - error.name = 'NavigationDuplicated'; - return error - } - - function createNavigationCancelledError (from, to) { - return createRouterError( + ); + // backwards compatible with the first introduction of Errors + error.name = 'NavigationDuplicated'; + return error + } + + function createNavigationCancelledError (from, to) { + return createRouterError( from, to, NavigationFailureType.cancelled, ("Navigation cancelled from \"" + (from.fullPath) + "\" to \"" + (to.fullPath) + "\" with a new navigation.") - ) - } + ) + } - function createNavigationAbortedError (from, to) { - return createRouterError( + function createNavigationAbortedError (from, to) { + return createRouterError( from, to, NavigationFailureType.aborted, ("Navigation aborted from \"" + (from.fullPath) + "\" to \"" + (to.fullPath) + "\" via a navigation guard.") - ) - } - - function createRouterError (from, to, type, message) { - var error = new Error(message); - error._isRouter = true; - error.from = from; - error.to = to; - error.type = type; - - return error - } - - var propertiesToLog = ['params', 'query', 'hash']; - - function stringifyRoute (to) { - if (typeof to === 'string') { return to } - if ('path' in to) { return to.path } - var location = {}; - propertiesToLog.forEach(function (key) { - if (key in to) { location[key] = to[key]; } - }); - return JSON.stringify(location, null, 2) - } + ) + } + + function createRouterError (from, to, type, message) { + var error = new Error(message); + error._isRouter = true; + error.from = from; + error.to = to; + error.type = type; + + return error + } + + var propertiesToLog = ['params', 'query', 'hash']; + + function stringifyRoute (to) { + if (typeof to === 'string') { return to } + if ('path' in to) { return to.path } + var location = {}; + propertiesToLog.forEach(function (key) { + if (key in to) { location[key] = to[key]; } + }); + return JSON.stringify(location, null, 2) + } - function isError (err) { - return Object.prototype.toString.call(err).indexOf('Error') > -1 - } + function isError (err) { + return Object.prototype.toString.call(err).indexOf('Error') > -1 + } - function isNavigationFailure (err, errorType) { - return ( + function isNavigationFailure (err, errorType) { + return ( isError(err) && err._isRouter && (errorType == null || err.type === errorType) - ) - } - - /* */ - - function resolveAsyncComponents (matched) { - return function (to, from, next) { - var hasAsync = false; - var pending = 0; - var error = null; - - flatMapComponents(matched, function (def, _, match, key) { - // if it's a function and doesn't have cid attached, - // assume it's an async component resolve function. - // we are not using Vue's default async resolving mechanism because - // we want to halt the navigation until the incoming component has been - // resolved. - if (typeof def === 'function' && def.cid === undefined) { - hasAsync = true; - pending++; - - var resolve = once(function (resolvedDef) { - if (isESModule(resolvedDef)) { - resolvedDef = resolvedDef.default; - } - // save resolved on async factory in case it's used elsewhere - def.resolved = resolvedDef; - match.components[key] = resolvedDef; - pending--; - if (pending <= 0) { - next(); - } - }); + ) + } + + /* */ + + function resolveAsyncComponents (matched) { + return function (to, from, next) { + var hasAsync = false; + var pending = 0; + var error = null; + + flatMapComponents(matched, function (def, _, match, key) { + // if it's a function and doesn't have cid attached, + // assume it's an async component resolve function. + // we are not using Vue's default async resolving mechanism because + // we want to halt the navigation until the incoming component has been + // resolved. + if (typeof def === 'function' && def.cid === undefined) { + hasAsync = true; + pending++; + + var resolve = once(function (resolvedDef) { + if (isESModule(resolvedDef)) { + resolvedDef = resolvedDef.default; + } + // save resolved on async factory in case it's used elsewhere + def.resolved = resolvedDef; + match.components[key] = resolvedDef; + pending--; + if (pending <= 0) { + next(); + } + }); - var reject = once(function (reason) { - var msg = "Failed to resolve async component " + key + ": " + reason; - warn(false, msg); - if (!error) { - error = isError(reason) + var reject = once(function (reason) { + var msg = "Failed to resolve async component " + key + ": " + reason; + warn(false, msg); + if (!error) { + error = isError(reason) ? reason : new Error(msg); - next(error); - } - }); - - var res; - try { - res = def(resolve, reject); - } catch (e) { - reject(e); + next(error); } - if (res) { - if (typeof res.then === 'function') { - res.then(resolve, reject); - } else { - // new syntax in Vue 2.3 - var comp = res.component; - if (comp && typeof comp.then === 'function') { - comp.then(resolve, reject); - } + }); + + var res; + try { + res = def(resolve, reject); + } catch (e) { + reject(e); + } + if (res) { + if (typeof res.then === 'function') { + res.then(resolve, reject); + } else { + // new syntax in Vue 2.3 + var comp = res.component; + if (comp && typeof comp.then === 'function') { + comp.then(resolve, reject); } } } - }); + } + }); - if (!hasAsync) { next(); } - } + if (!hasAsync) { next(); } } + } - function flatMapComponents ( + function flatMapComponents ( matched, fn - ) { - return flatten(matched.map(function (m) { - return Object.keys(m.components).map(function (key) { return fn( + ) { + return flatten(matched.map(function (m) { + return Object.keys(m.components).map(function (key) { return fn( m.components[key], m.instances[key], m, key - ); }) - })) - } + ); }) + })) + } - function flatten (arr) { - return Array.prototype.concat.apply([], arr) - } + function flatten (arr) { + return Array.prototype.concat.apply([], arr) + } - var hasSymbol = + var hasSymbol = typeof Symbol === 'function' && typeof Symbol.toStringTag === 'symbol'; - function isESModule (obj) { - return obj.__esModule || (hasSymbol && obj[Symbol.toStringTag] === 'Module') - } - - // in Webpack 2, require.ensure now also returns a Promise - // so the resolve/reject functions may get called an extra time - // if the user uses an arrow function shorthand that happens to - // return that Promise. - function once (fn) { - var called = false; - return function () { - var args = [], len = arguments.length; - while ( len-- ) args[ len ] = arguments[ len ]; - - if (called) { return } - called = true; - return fn.apply(this, args) - } - } - - /* */ - - var History = function History (router, base) { - this.router = router; - this.base = normalizeBase(base); - // start with a route object that stands for "nowhere" - this.current = START; - this.pending = null; - this.ready = false; - this.readyCbs = []; - this.readyErrorCbs = []; - this.errorCbs = []; - this.listeners = []; - }; - - History.prototype.listen = function listen (cb) { - this.cb = cb; - }; - - History.prototype.onReady = function onReady (cb, errorCb) { - if (this.ready) { - cb(); - } else { - this.readyCbs.push(cb); - if (errorCb) { - this.readyErrorCbs.push(errorCb); - } - } - }; - - History.prototype.onError = function onError (errorCb) { - this.errorCbs.push(errorCb); - }; - - History.prototype.transitionTo = function transitionTo ( + function isESModule (obj) { + return obj.__esModule || (hasSymbol && obj[Symbol.toStringTag] === 'Module') + } + + // in Webpack 2, require.ensure now also returns a Promise + // so the resolve/reject functions may get called an extra time + // if the user uses an arrow function shorthand that happens to + // return that Promise. + function once (fn) { + var called = false; + return function () { + var args = [], len = arguments.length; + while ( len-- ) args[ len ] = arguments[ len ]; + + if (called) { return } + called = true; + return fn.apply(this, args) + } + } + + /* */ + + var History = function History (router, base) { + this.router = router; + this.base = normalizeBase(base); + // start with a route object that stands for "nowhere" + this.current = START; + this.pending = null; + this.ready = false; + this.readyCbs = []; + this.readyErrorCbs = []; + this.errorCbs = []; + this.listeners = []; + }; + + History.prototype.listen = function listen (cb) { + this.cb = cb; + }; + + History.prototype.onReady = function onReady (cb, errorCb) { + if (this.ready) { + cb(); + } else { + this.readyCbs.push(cb); + if (errorCb) { + this.readyErrorCbs.push(errorCb); + } + } + }; + + History.prototype.onError = function onError (errorCb) { + this.errorCbs.push(errorCb); + }; + + History.prototype.transitionTo = function transitionTo ( location, onComplete, onAbort - ) { - var this$1 = this; - - var route; - // catch redirect option https://github.com/vuejs/vue-router/issues/3201 - try { - route = this.router.match(location, this.current); - } catch (e) { - this.errorCbs.forEach(function (cb) { - cb(e); - }); - // Exception should still be thrown - throw e - } - var prev = this.current; - this.confirmTransition( + ) { + var this$1 = this; + + var route; + // catch redirect option https://github.com/vuejs/vue-router/issues/3201 + try { + route = this.router.match(location, this.current); + } catch (e) { + this.errorCbs.forEach(function (cb) { + cb(e); + }); + // Exception should still be thrown + throw e + } + var prev = this.current; + this.confirmTransition( route, function () { this$1.updateRoute(route); @@ -2294,51 +2293,51 @@ } } } - ); - }; - - History.prototype.confirmTransition = function confirmTransition (route, onComplete, onAbort) { - var this$1 = this; - - var current = this.current; - this.pending = route; - var abort = function (err) { - // changed after adding errors with - // https://github.com/vuejs/vue-router/pull/3047 before that change, - // redirect and aborted navigation would produce an err == null - if (!isNavigationFailure(err) && isError(err)) { - if (this$1.errorCbs.length) { - this$1.errorCbs.forEach(function (cb) { - cb(err); - }); - } else { - warn(false, 'uncaught error during route navigation:'); - console.error(err); - } + ); + }; + + History.prototype.confirmTransition = function confirmTransition (route, onComplete, onAbort) { + var this$1 = this; + + var current = this.current; + this.pending = route; + var abort = function (err) { + // changed after adding errors with + // https://github.com/vuejs/vue-router/pull/3047 before that change, + // redirect and aborted navigation would produce an err == null + if (!isNavigationFailure(err) && isError(err)) { + if (this$1.errorCbs.length) { + this$1.errorCbs.forEach(function (cb) { + cb(err); + }); + } else { + warn(false, 'uncaught error during route navigation:'); + console.error(err); } - onAbort && onAbort(err); - }; - var lastRouteIndex = route.matched.length - 1; - var lastCurrentIndex = current.matched.length - 1; - if ( + } + onAbort && onAbort(err); + }; + var lastRouteIndex = route.matched.length - 1; + var lastCurrentIndex = current.matched.length - 1; + if ( isSameRoute(route, current) && // in the case the route map has been dynamically appended to lastRouteIndex === lastCurrentIndex && route.matched[lastRouteIndex] === current.matched[lastCurrentIndex] - ) { - this.ensureURL(); - return abort(createNavigationDuplicatedError(current, route)) - } + ) { + this.ensureURL(); + return abort(createNavigationDuplicatedError(current, route)) + } - var ref = resolveQueue( + var ref = resolveQueue( this.current.matched, route.matched - ); - var updated = ref.updated; - var deactivated = ref.deactivated; - var activated = ref.activated; + ); + var updated = ref.updated; + var deactivated = ref.deactivated; + var activated = ref.activated; - var queue = [].concat( + var queue = [].concat( // in-component leave guards extractLeaveGuards(deactivated), // global before hooks @@ -2349,367 +2348,367 @@ activated.map(function (m) { return m.beforeEnter; }), // async components resolveAsyncComponents(activated) - ); + ); - var iterator = function (hook, next) { - if (this$1.pending !== route) { - return abort(createNavigationCancelledError(current, route)) - } - try { - hook(route, current, function (to) { - if (to === false) { - // next(false) -> abort navigation, ensure current URL - this$1.ensureURL(true); - abort(createNavigationAbortedError(current, route)); - } else if (isError(to)) { - this$1.ensureURL(true); - abort(to); - } else if ( + var iterator = function (hook, next) { + if (this$1.pending !== route) { + return abort(createNavigationCancelledError(current, route)) + } + try { + hook(route, current, function (to) { + if (to === false) { + // next(false) -> abort navigation, ensure current URL + this$1.ensureURL(true); + abort(createNavigationAbortedError(current, route)); + } else if (isError(to)) { + this$1.ensureURL(true); + abort(to); + } else if ( typeof to === 'string' || (typeof to === 'object' && - (typeof to.path === 'string' || typeof to.name === 'string')) - ) { - // next('/') or next({ path: '/' }) -> redirect - abort(createNavigationRedirectedError(current, route)); - if (typeof to === 'object' && to.replace) { - this$1.replace(to); - } else { - this$1.push(to); - } + (typeof to.path === 'string' || typeof to.name === 'string')) + ) { + // next('/') or next({ path: '/' }) -> redirect + abort(createNavigationRedirectedError(current, route)); + if (typeof to === 'object' && to.replace) { + this$1.replace(to); } else { - // confirm transition and pass on the value - next(to); + this$1.push(to); } - }); - } catch (e) { - abort(e); - } - }; - - runQueue(queue, iterator, function () { - // wait until async components are resolved before - // extracting in-component enter guards - var enterGuards = extractEnterGuards(activated); - var queue = enterGuards.concat(this$1.router.resolveHooks); - runQueue(queue, iterator, function () { - if (this$1.pending !== route) { - return abort(createNavigationCancelledError(current, route)) - } - this$1.pending = null; - onComplete(route); - if (this$1.router.app) { - BI.nextTick(function () { - handleRouteEntered(route); - }); + } else { + // confirm transition and pass on the value + next(to); } }); - }); - }; - - History.prototype.updateRoute = function updateRoute (route) { - this.current = route; - this.cb && this.cb(route); - }; - - History.prototype.setupListeners = function setupListeners () { - // Default implementation is empty - }; - - History.prototype.teardown = function teardown () { - // clean up event listeners - // https://github.com/vuejs/vue-router/issues/2341 - this.listeners.forEach(function (cleanupListener) { - cleanupListener(); - }); - this.listeners = []; - - // reset current history route - // https://github.com/vuejs/vue-router/issues/3294 - this.current = START; - this.pending = null; + } catch (e) { + abort(e); + } }; - function normalizeBase (base) { - if (!base) { - if (inBrowser) { - // respect tag - var baseEl = document.querySelector('base'); - base = (baseEl && baseEl.getAttribute('href')) || '/'; - // strip full URL origin - base = base.replace(/^https?:\/\/[^\/]+/, ''); - } else { - base = '/'; + runQueue(queue, iterator, function () { + // wait until async components are resolved before + // extracting in-component enter guards + var enterGuards = extractEnterGuards(activated); + var queue = enterGuards.concat(this$1.router.resolveHooks); + runQueue(queue, iterator, function () { + if (this$1.pending !== route) { + return abort(createNavigationCancelledError(current, route)) } + this$1.pending = null; + onComplete(route); + if (this$1.router.app) { + BI.nextTick(function () { + handleRouteEntered(route); + }); + } + }); + }); + }; + + History.prototype.updateRoute = function updateRoute (route) { + this.current = route; + this.cb && this.cb(route); + }; + + History.prototype.setupListeners = function setupListeners () { + // Default implementation is empty + }; + + History.prototype.teardown = function teardown () { + // clean up event listeners + // https://github.com/vuejs/vue-router/issues/2341 + this.listeners.forEach(function (cleanupListener) { + cleanupListener(); + }); + this.listeners = []; + + // reset current history route + // https://github.com/vuejs/vue-router/issues/3294 + this.current = START; + this.pending = null; + }; + + function normalizeBase (base) { + if (!base) { + if (inBrowser) { + // respect tag + var baseEl = document.querySelector('base'); + base = (baseEl && baseEl.getAttribute('href')) || '/'; + // strip full URL origin + base = base.replace(/^https?:\/\/[^\/]+/, ''); + } else { + base = '/'; } - // make sure there's the starting slash - if (base.charAt(0) !== '/') { - base = '/' + base; - } - // remove trailing slash - return base.replace(/\/$/, '') } + // make sure there's the starting slash + if (base.charAt(0) !== '/') { + base = '/' + base; + } + // remove trailing slash + return base.replace(/\/$/, '') + } - function resolveQueue ( + function resolveQueue ( current, next - ) { - var i; - var max = Math.max(current.length, next.length); - for (i = 0; i < max; i++) { - if (current[i] !== next[i]) { - break - } - } - return { - updated: next.slice(0, i), - activated: next.slice(i), - deactivated: current.slice(i) + ) { + var i; + var max = Math.max(current.length, next.length); + for (i = 0; i < max; i++) { + if (current[i] !== next[i]) { + break } } + return { + updated: next.slice(0, i), + activated: next.slice(i), + deactivated: current.slice(i) + } + } - function extractGuards ( + function extractGuards ( records, name, bind, reverse - ) { - var guards = flatMapComponents(records, function (def, instance, match, key) { - var guard = extractGuard(def, name); - if (guard) { - return Array.isArray(guard) + ) { + var guards = flatMapComponents(records, function (def, instance, match, key) { + var guard = extractGuard(def, name); + if (guard) { + return Array.isArray(guard) ? guard.map(function (guard) { return bind(guard, instance, match, key); }) : bind(guard, instance, match, key) - } - }); - return flatten(reverse ? guards.reverse() : guards) - } + } + }); + return flatten(reverse ? guards.reverse() : guards) + } - function extractGuard ( + function extractGuard ( def, key - ) { - if (typeof def !== 'function') { - // extend now so that global mixins are applied. - // def = _Vue.extend(def); - } - return def[key] + ) { + if (typeof def !== 'function') { + // extend now so that global mixins are applied. + // def = _Vue.extend(def); } + return def[key] + } - function extractLeaveGuards (deactivated) { - return extractGuards(deactivated, 'beforeRouteLeave', bindGuard, true) - } + function extractLeaveGuards (deactivated) { + return extractGuards(deactivated, 'beforeRouteLeave', bindGuard, true) + } - function extractUpdateHooks (updated) { - return extractGuards(updated, 'beforeRouteUpdate', bindGuard) - } + function extractUpdateHooks (updated) { + return extractGuards(updated, 'beforeRouteUpdate', bindGuard) + } - function bindGuard (guard, instance) { - if (instance) { - return function boundRouteGuard () { - return guard.apply(instance, arguments) - } + function bindGuard (guard, instance) { + if (instance) { + return function boundRouteGuard () { + return guard.apply(instance, arguments) } } + } - function extractEnterGuards ( + function extractEnterGuards ( activated - ) { - return extractGuards( + ) { + return extractGuards( activated, 'beforeRouteEnter', function (guard, _, match, key) { return bindEnterGuard(guard, match, key) } - ) - } + ) + } - function bindEnterGuard ( + function bindEnterGuard ( guard, match, key - ) { - return function routeEnterGuard (to, from, next) { - return guard(to, from, function (cb) { - if (typeof cb === 'function') { - if (!match.enteredCbs[key]) { - match.enteredCbs[key] = []; - } - match.enteredCbs[key].push(cb); + ) { + return function routeEnterGuard (to, from, next) { + return guard(to, from, function (cb) { + if (typeof cb === 'function') { + if (!match.enteredCbs[key]) { + match.enteredCbs[key] = []; } - next(cb); - }) - } + match.enteredCbs[key].push(cb); + } + next(cb); + }) } + } - /* */ + /* */ - var HTML5History = /*@__PURE__*/(function (History) { - function HTML5History (router, base) { - History.call(this, router, base); + var HTML5History = /*@__PURE__*/(function (History) { + function HTML5History (router, base) { + History.call(this, router, base); - this._startLocation = getLocation(this.base); - } + this._startLocation = getLocation(this.base); + } - if ( History ) HTML5History.__proto__ = History; - HTML5History.prototype = Object.create( History && History.prototype ); - HTML5History.prototype.constructor = HTML5History; + if ( History ) HTML5History.__proto__ = History; + HTML5History.prototype = Object.create( History && History.prototype ); + HTML5History.prototype.constructor = HTML5History; - HTML5History.prototype.setupListeners = function setupListeners () { - var this$1 = this; + HTML5History.prototype.setupListeners = function setupListeners () { + var this$1 = this; - if (this.listeners.length > 0) { - return - } + if (this.listeners.length > 0) { + return + } - var router = this.router; - var expectScroll = router.options.scrollBehavior; - var supportsScroll = supportsPushState && expectScroll; + var router = this.router; + var expectScroll = router.options.scrollBehavior; + var supportsScroll = supportsPushState && expectScroll; - if (supportsScroll) { - this.listeners.push(setupScroll()); - } + if (supportsScroll) { + this.listeners.push(setupScroll()); + } - var handleRoutingEvent = function () { - var current = this$1.current; + var handleRoutingEvent = function () { + var current = this$1.current; - // Avoiding first `popstate` event dispatched in some browsers but first - // history route not updated since async guard at the same time. - var location = getLocation(this$1.base); - if (this$1.current === START && location === this$1._startLocation) { - return - } + // Avoiding first `popstate` event dispatched in some browsers but first + // history route not updated since async guard at the same time. + var location = getLocation(this$1.base); + if (this$1.current === START && location === this$1._startLocation) { + return + } - this$1.transitionTo(location, function (route) { - if (supportsScroll) { - handleScroll(router, route, current, true); - } - }); - }; - window.addEventListener('popstate', handleRoutingEvent); - this.listeners.push(function () { - window.removeEventListener('popstate', handleRoutingEvent); + this$1.transitionTo(location, function (route) { + if (supportsScroll) { + handleScroll(router, route, current, true); + } }); }; + window.addEventListener('popstate', handleRoutingEvent); + this.listeners.push(function () { + window.removeEventListener('popstate', handleRoutingEvent); + }); + }; - HTML5History.prototype.go = function go (n) { - window.history.go(n); - }; + HTML5History.prototype.go = function go (n) { + window.history.go(n); + }; - HTML5History.prototype.push = function push (location, onComplete, onAbort) { - var this$1 = this; + HTML5History.prototype.push = function push (location, onComplete, onAbort) { + var this$1 = this; - var ref = this; - var fromRoute = ref.current; - this.transitionTo(location, function (route) { - pushState(cleanPath(this$1.base + route.fullPath)); - handleScroll(this$1.router, route, fromRoute, false); - onComplete && onComplete(route); - }, onAbort); - }; + var ref = this; + var fromRoute = ref.current; + this.transitionTo(location, function (route) { + pushState(cleanPath(this$1.base + route.fullPath)); + handleScroll(this$1.router, route, fromRoute, false); + onComplete && onComplete(route); + }, onAbort); + }; - HTML5History.prototype.replace = function replace (location, onComplete, onAbort) { - var this$1 = this; + HTML5History.prototype.replace = function replace (location, onComplete, onAbort) { + var this$1 = this; - var ref = this; - var fromRoute = ref.current; - this.transitionTo(location, function (route) { - replaceState(cleanPath(this$1.base + route.fullPath)); - handleScroll(this$1.router, route, fromRoute, false); - onComplete && onComplete(route); - }, onAbort); - }; + var ref = this; + var fromRoute = ref.current; + this.transitionTo(location, function (route) { + replaceState(cleanPath(this$1.base + route.fullPath)); + handleScroll(this$1.router, route, fromRoute, false); + onComplete && onComplete(route); + }, onAbort); + }; - HTML5History.prototype.ensureURL = function ensureURL (push) { - if (getLocation(this.base) !== this.current.fullPath) { - var current = cleanPath(this.base + this.current.fullPath); - push ? pushState(current) : replaceState(current); - } - }; + HTML5History.prototype.ensureURL = function ensureURL (push) { + if (getLocation(this.base) !== this.current.fullPath) { + var current = cleanPath(this.base + this.current.fullPath); + push ? pushState(current) : replaceState(current); + } + }; - HTML5History.prototype.getCurrentLocation = function getCurrentLocation () { - return getLocation(this.base) - }; + HTML5History.prototype.getCurrentLocation = function getCurrentLocation () { + return getLocation(this.base) + }; - return HTML5History; - }(History)); - - function getLocation (base) { - var path = window.location.pathname; - var pathLowerCase = path.toLowerCase(); - var baseLowerCase = base.toLowerCase(); - // base="/a" shouldn't turn path="/app" into "/a/pp" - // https://github.com/vuejs/vue-router/issues/3555 - // so we ensure the trailing slash in the base - if (base && ((pathLowerCase === baseLowerCase) || + return HTML5History; + }(History)); + + function getLocation (base) { + var path = window.location.pathname; + var pathLowerCase = path.toLowerCase(); + var baseLowerCase = base.toLowerCase(); + // base="/a" shouldn't turn path="/app" into "/a/pp" + // https://github.com/vuejs/vue-router/issues/3555 + // so we ensure the trailing slash in the base + if (base && ((pathLowerCase === baseLowerCase) || (pathLowerCase.indexOf(cleanPath(baseLowerCase + '/')) === 0))) { - path = path.slice(base.length); - } - return (path || '/') + window.location.search + window.location.hash + path = path.slice(base.length); } + return (path || '/') + window.location.search + window.location.hash + } - /* */ + /* */ - var HashHistory = /*@__PURE__*/(function (History) { - function HashHistory (router, base, fallback) { - History.call(this, router, base); - // check history fallback deeplinking - if (fallback && checkFallback(this.base)) { - return - } - ensureSlash(); + var HashHistory = /*@__PURE__*/(function (History) { + function HashHistory (router, base, fallback) { + History.call(this, router, base); + // check history fallback deeplinking + if (fallback && checkFallback(this.base)) { + return } + ensureSlash(); + } - if ( History ) HashHistory.__proto__ = History; - HashHistory.prototype = Object.create( History && History.prototype ); - HashHistory.prototype.constructor = HashHistory; + if ( History ) HashHistory.__proto__ = History; + HashHistory.prototype = Object.create( History && History.prototype ); + HashHistory.prototype.constructor = HashHistory; - // this is delayed until the app mounts - // to avoid the hashchange listener being fired too early - HashHistory.prototype.setupListeners = function setupListeners () { - var this$1 = this; + // this is delayed until the app mounts + // to avoid the hashchange listener being fired too early + HashHistory.prototype.setupListeners = function setupListeners () { + var this$1 = this; - if (this.listeners.length > 0) { - return - } + if (this.listeners.length > 0) { + return + } - var router = this.router; - var expectScroll = router.options.scrollBehavior; - var supportsScroll = supportsPushState && expectScroll; + var router = this.router; + var expectScroll = router.options.scrollBehavior; + var supportsScroll = supportsPushState && expectScroll; - if (supportsScroll) { - this.listeners.push(setupScroll()); - } + if (supportsScroll) { + this.listeners.push(setupScroll()); + } - var handleRoutingEvent = function () { - var current = this$1.current; - if (!ensureSlash()) { - return + var handleRoutingEvent = function () { + var current = this$1.current; + if (!ensureSlash()) { + return + } + this$1.transitionTo(getHash(), function (route) { + if (supportsScroll) { + handleScroll(this$1.router, route, current, true); + } + if (!supportsPushState) { + replaceHash(route.fullPath); } - this$1.transitionTo(getHash(), function (route) { - if (supportsScroll) { - handleScroll(this$1.router, route, current, true); - } - if (!supportsPushState) { - replaceHash(route.fullPath); - } - }); - }; - var eventType = supportsPushState ? 'popstate' : 'hashchange'; - window.addEventListener( - eventType, - handleRoutingEvent - ); - this.listeners.push(function () { - window.removeEventListener(eventType, handleRoutingEvent); }); }; + var eventType = supportsPushState ? 'popstate' : 'hashchange'; + window.addEventListener( + eventType, + handleRoutingEvent + ); + this.listeners.push(function () { + window.removeEventListener(eventType, handleRoutingEvent); + }); + }; - HashHistory.prototype.push = function push (location, onComplete, onAbort) { - var this$1 = this; + HashHistory.prototype.push = function push (location, onComplete, onAbort) { + var this$1 = this; - var ref = this; - var fromRoute = ref.current; - this.transitionTo( + var ref = this; + var fromRoute = ref.current; + this.transitionTo( location, function (route) { pushHash(route.fullPath); @@ -2717,15 +2716,15 @@ onComplete && onComplete(route); }, onAbort - ); - }; + ); + }; - HashHistory.prototype.replace = function replace (location, onComplete, onAbort) { - var this$1 = this; + HashHistory.prototype.replace = function replace (location, onComplete, onAbort) { + var this$1 = this; - var ref = this; - var fromRoute = ref.current; - this.transitionTo( + var ref = this; + var fromRoute = ref.current; + this.transitionTo( location, function (route) { replaceHash(route.fullPath); @@ -2733,97 +2732,97 @@ onComplete && onComplete(route); }, onAbort - ); - }; + ); + }; - HashHistory.prototype.go = function go (n) { - window.history.go(n); - }; + HashHistory.prototype.go = function go (n) { + window.history.go(n); + }; - HashHistory.prototype.ensureURL = function ensureURL (push) { - var current = this.current.fullPath; - if (getHash() !== current) { - push ? pushHash(current) : replaceHash(current); - } - }; + HashHistory.prototype.ensureURL = function ensureURL (push) { + var current = this.current.fullPath; + if (getHash() !== current) { + push ? pushHash(current) : replaceHash(current); + } + }; - HashHistory.prototype.getCurrentLocation = function getCurrentLocation () { - return getHash() - }; + HashHistory.prototype.getCurrentLocation = function getCurrentLocation () { + return getHash() + }; - return HashHistory; - }(History)); + return HashHistory; + }(History)); - function checkFallback (base) { - var location = getLocation(base); - if (!/^\/#/.test(location)) { - window.location.replace(cleanPath(base + '/#' + location)); - return true - } + function checkFallback (base) { + var location = getLocation(base); + if (!/^\/#/.test(location)) { + window.location.replace(cleanPath(base + '/#' + location)); + return true } + } - function ensureSlash () { - var path = getHash(); - if (path.charAt(0) === '/') { - return true - } - replaceHash('/' + path); - return false + function ensureSlash () { + var path = getHash(); + if (path.charAt(0) === '/') { + return true } + replaceHash('/' + path); + return false + } - function getHash () { - // We can't use window.location.hash here because it's not - // consistent across browsers - Firefox will pre-decode it! - var href = window.location.href; - var index = href.indexOf('#'); - // empty path - if (index < 0) { return '' } + function getHash () { + // We can't use window.location.hash here because it's not + // consistent across browsers - Firefox will pre-decode it! + var href = window.location.href; + var index = href.indexOf('#'); + // empty path + if (index < 0) { return '' } - href = href.slice(index + 1); + href = href.slice(index + 1); - return href - } + return href + } - function getUrl (path) { - var href = window.location.href; - var i = href.indexOf('#'); - var base = i >= 0 ? href.slice(0, i) : href; - return (base + "#" + path) - } + function getUrl (path) { + var href = window.location.href; + var i = href.indexOf('#'); + var base = i >= 0 ? href.slice(0, i) : href; + return (base + "#" + path) + } - function pushHash (path) { - if (supportsPushState) { - pushState(getUrl(path)); - } else { - window.location.hash = path; - } + function pushHash (path) { + if (supportsPushState) { + pushState(getUrl(path)); + } else { + window.location.hash = path; } + } - function replaceHash (path) { - if (supportsPushState) { - replaceState(getUrl(path)); - } else { - window.location.replace(getUrl(path)); - } + function replaceHash (path) { + if (supportsPushState) { + replaceState(getUrl(path)); + } else { + window.location.replace(getUrl(path)); } + } - /* */ + /* */ - var AbstractHistory = /*@__PURE__*/(function (History) { - function AbstractHistory (router, base) { - History.call(this, router, base); - this.stack = []; - this.index = -1; - } + var AbstractHistory = /*@__PURE__*/(function (History) { + function AbstractHistory (router, base) { + History.call(this, router, base); + this.stack = []; + this.index = -1; + } - if ( History ) AbstractHistory.__proto__ = History; - AbstractHistory.prototype = Object.create( History && History.prototype ); - AbstractHistory.prototype.constructor = AbstractHistory; + if ( History ) AbstractHistory.__proto__ = History; + AbstractHistory.prototype = Object.create( History && History.prototype ); + AbstractHistory.prototype.constructor = AbstractHistory; - AbstractHistory.prototype.push = function push (location, onComplete, onAbort) { - var this$1 = this; + AbstractHistory.prototype.push = function push (location, onComplete, onAbort) { + var this$1 = this; - this.transitionTo( + this.transitionTo( location, function (route) { this$1.stack = this$1.stack.slice(0, this$1.index + 1).concat(route); @@ -2831,31 +2830,31 @@ onComplete && onComplete(route); }, onAbort - ); - }; + ); + }; - AbstractHistory.prototype.replace = function replace (location, onComplete, onAbort) { - var this$1 = this; + AbstractHistory.prototype.replace = function replace (location, onComplete, onAbort) { + var this$1 = this; - this.transitionTo( + this.transitionTo( location, function (route) { this$1.stack = this$1.stack.slice(0, this$1.index).concat(route); onComplete && onComplete(route); }, onAbort - ); - }; + ); + }; - AbstractHistory.prototype.go = function go (n) { - var this$1 = this; + AbstractHistory.prototype.go = function go (n) { + var this$1 = this; - var targetIndex = this.index + n; - if (targetIndex < 0 || targetIndex >= this.stack.length) { - return - } - var route = this.stack[targetIndex]; - this.confirmTransition( + var targetIndex = this.index + n; + if (targetIndex < 0 || targetIndex >= this.stack.length) { + return + } + var route = this.stack[targetIndex]; + this.confirmTransition( route, function () { var prev = this$1.current; @@ -2870,337 +2869,338 @@ this$1.index = targetIndex; } } - ); - }; + ); + }; - AbstractHistory.prototype.getCurrentLocation = function getCurrentLocation () { - var current = this.stack[this.stack.length - 1]; - return current ? current.fullPath : '/' - }; + AbstractHistory.prototype.getCurrentLocation = function getCurrentLocation () { + var current = this.stack[this.stack.length - 1]; + return current ? current.fullPath : '/' + }; - AbstractHistory.prototype.ensureURL = function ensureURL () { - // noop - }; + AbstractHistory.prototype.ensureURL = function ensureURL () { + // noop + }; - return AbstractHistory; - }(History)); + return AbstractHistory; + }(History)); - /* */ + /* */ - var VueRouter = function VueRouter (options) { - if ( options === void 0 ) options = {}; + var VueRouter = function VueRouter (options) { + if ( options === void 0 ) options = {}; - this.app = null; - this.apps = []; - this.options = options; - this.beforeHooks = []; - this.resolveHooks = []; - this.afterHooks = []; - this.matcher = createMatcher(options.routes || [], this); + this.app = null; + this.apps = []; + this.options = options; + this.beforeHooks = []; + this.resolveHooks = []; + this.afterHooks = []; + this.matcher = createMatcher(options.routes || [], this); - var mode = options.mode || 'hash'; - this.fallback = + var mode = options.mode || 'hash'; + this.fallback = mode === 'history' && !supportsPushState && options.fallback !== false; - if (this.fallback) { - mode = 'hash'; - } - if (!inBrowser) { - mode = 'abstract'; - } - this.mode = mode; - - switch (mode) { - case 'history': - this.history = new HTML5History(this, options.base); - break - case 'hash': - this.history = new HashHistory(this, options.base, this.fallback); - break - case 'abstract': - this.history = new AbstractHistory(this, options.base); - break - default: - { - assert(false, ("invalid mode: " + mode)); - } + if (this.fallback) { + mode = 'hash'; + } + if (!inBrowser) { + mode = 'abstract'; + } + this.mode = mode; + + switch (mode) { + case 'history': + this.history = new HTML5History(this, options.base); + break + case 'hash': + this.history = new HashHistory(this, options.base, this.fallback); + break + case 'abstract': + this.history = new AbstractHistory(this, options.base); + break + default: + { + assert(false, ("invalid mode: " + mode)); } - }; + } + }; - var prototypeAccessors = { currentRoute: { configurable: true } }; + var prototypeAccessors = { currentRoute: { configurable: true } }; - VueRouter.prototype.match = function match (raw, current, redirectedFrom) { - return this.matcher.match(raw, current, redirectedFrom) - }; + VueRouter.prototype.match = function match (raw, current, redirectedFrom) { + return this.matcher.match(raw, current, redirectedFrom) + }; - prototypeAccessors.currentRoute.get = function () { - return this.history && this.history.current - }; + prototypeAccessors.currentRoute.get = function () { + return this.history && this.history.current + }; - VueRouter.prototype.init = function init (app /* Vue component instance */) { - var this$1 = this; + VueRouter.prototype.init = function init (app /* Vue component instance */) { + var this$1 = this; - this.apps.push(app); + this.apps.push(app); - // set up app destroyed handler - // https://github.com/vuejs/vue-router/issues/2639 - app.once('hook:destroyed', function () { - // clean out app from this.apps array once destroyed - var index = this$1.apps.indexOf(app); - if (index > -1) { this$1.apps.splice(index, 1); } - // ensure we still have a main app or null if no apps - // we do not release the router so it can be reused - if (this$1.app === app) { this$1.app = this$1.apps[0] || null; } + // set up app destroyed handler + // https://github.com/vuejs/vue-router/issues/2639 + app.once('hook:destroyed', function () { + // clean out app from this.apps array once destroyed + var index = this$1.apps.indexOf(app); + if (index > -1) { this$1.apps.splice(index, 1); } + // ensure we still have a main app or null if no apps + // we do not release the router so it can be reused + if (this$1.app === app) { this$1.app = this$1.apps[0] || null; } - if (!this$1.app) { this$1.history.teardown(); } - }); + if (!this$1.app) { this$1.history.teardown(); } + }); - // main app previously initialized - // return as we don't need to set up new history listener - if (this.app) { - return - } + // main app previously initialized + // return as we don't need to set up new history listener + if (this.app) { + return + } - this.app = app; + this.app = app; - var history = this.history; + var history = this.history; - if (history instanceof HTML5History || history instanceof HashHistory) { - var handleInitialScroll = function (routeOrError) { - var from = history.current; - var expectScroll = this$1.options.scrollBehavior; - var supportsScroll = supportsPushState && expectScroll; + if (history instanceof HTML5History || history instanceof HashHistory) { + var handleInitialScroll = function (routeOrError) { + var from = history.current; + var expectScroll = this$1.options.scrollBehavior; + var supportsScroll = supportsPushState && expectScroll; - if (supportsScroll && 'fullPath' in routeOrError) { - handleScroll(this$1, routeOrError, from, false); - } - }; - var setupListeners = function (routeOrError) { - history.setupListeners(); - handleInitialScroll(routeOrError); - }; - history.transitionTo( + if (supportsScroll && 'fullPath' in routeOrError) { + handleScroll(this$1, routeOrError, from, false); + } + }; + var setupListeners = function (routeOrError) { + history.setupListeners(); + handleInitialScroll(routeOrError); + }; + history.transitionTo( history.getCurrentLocation(), setupListeners, setupListeners - ); - } + ); + } - history.listen(function (route) { - this$1.apps.forEach(function (app) { - app._router.history.current = route; - }); + history.listen(function (route) { + this$1.apps.forEach(function (app) { + app._router.history.current = route; }); - }; + }); + }; - VueRouter.prototype.beforeEach = function beforeEach (fn) { - return registerHook(this.beforeHooks, fn) - }; + VueRouter.prototype.beforeEach = function beforeEach (fn) { + return registerHook(this.beforeHooks, fn) + }; - VueRouter.prototype.beforeResolve = function beforeResolve (fn) { - return registerHook(this.resolveHooks, fn) - }; + VueRouter.prototype.beforeResolve = function beforeResolve (fn) { + return registerHook(this.resolveHooks, fn) + }; - VueRouter.prototype.afterEach = function afterEach (fn) { - return registerHook(this.afterHooks, fn) - }; + VueRouter.prototype.afterEach = function afterEach (fn) { + return registerHook(this.afterHooks, fn) + }; - VueRouter.prototype.onReady = function onReady (cb, errorCb) { - this.history.onReady(cb, errorCb); - }; + VueRouter.prototype.onReady = function onReady (cb, errorCb) { + this.history.onReady(cb, errorCb); + }; - VueRouter.prototype.onError = function onError (errorCb) { - this.history.onError(errorCb); - }; + VueRouter.prototype.onError = function onError (errorCb) { + this.history.onError(errorCb); + }; - VueRouter.prototype.push = function push (location, onComplete, onAbort) { - var this$1 = this; + VueRouter.prototype.push = function push (location, onComplete, onAbort) { + var this$1 = this; - // $flow-disable-line - if (!onComplete && !onAbort && typeof Promise !== 'undefined') { - return new Promise(function (resolve, reject) { - this$1.history.push(location, resolve, reject); - }) - } else { - this.history.push(location, onComplete, onAbort); - } - }; + // $flow-disable-line + if (!onComplete && !onAbort && typeof Promise !== 'undefined') { + return new Promise(function (resolve, reject) { + this$1.history.push(location, resolve, reject); + }) + } else { + this.history.push(location, onComplete, onAbort); + } + }; - VueRouter.prototype.replace = function replace (location, onComplete, onAbort) { - var this$1 = this; + VueRouter.prototype.replace = function replace (location, onComplete, onAbort) { + var this$1 = this; - // $flow-disable-line - if (!onComplete && !onAbort && typeof Promise !== 'undefined') { - return new Promise(function (resolve, reject) { - this$1.history.replace(location, resolve, reject); - }) - } else { - this.history.replace(location, onComplete, onAbort); - } - }; + // $flow-disable-line + if (!onComplete && !onAbort && typeof Promise !== 'undefined') { + return new Promise(function (resolve, reject) { + this$1.history.replace(location, resolve, reject); + }) + } else { + this.history.replace(location, onComplete, onAbort); + } + }; - VueRouter.prototype.go = function go (n) { - this.history.go(n); - }; + VueRouter.prototype.go = function go (n) { + this.history.go(n); + }; - VueRouter.prototype.back = function back () { - this.go(-1); - }; + VueRouter.prototype.back = function back () { + this.go(-1); + }; - VueRouter.prototype.forward = function forward () { - this.go(1); - }; + VueRouter.prototype.forward = function forward () { + this.go(1); + }; - VueRouter.prototype.getMatchedComponents = function getMatchedComponents (to) { - var route = to + VueRouter.prototype.getMatchedComponents = function getMatchedComponents (to) { + var route = to ? to.matched - ? to - : this.resolve(to).route + ? to + : this.resolve(to).route : this.currentRoute; - if (!route) { - return [] - } - return [].concat.apply( + if (!route) { + return [] + } + return [].concat.apply( [], route.matched.map(function (m) { return Object.keys(m.components).map(function (key) { return m.components[key] }) }) - ) - }; + ) + }; - VueRouter.prototype.resolve = function resolve ( + VueRouter.prototype.resolve = function resolve ( to, current, append - ) { - current = current || this.history.current; - var location = normalizeLocation(to, current, append, this); - var route = this.match(location, current); - var fullPath = route.redirectedFrom || route.fullPath; - var base = this.history.base; - var href = createHref(base, fullPath, this.mode); + ) { + current = current || this.history.current; + var location = normalizeLocation(to, current, append, this); + var route = this.match(location, current); + var fullPath = route.redirectedFrom || route.fullPath; + var base = this.history.base; + var href = createHref(base, fullPath, this.mode); + return { + location: location, + route: route, + href: href, + // for backwards compat + normalizedTo: location, + resolved: route + } + }; + + VueRouter.prototype.getRoutes = function getRoutes () { + return this.matcher.getRoutes() + }; + + VueRouter.prototype.addRoute = function addRoute (parentOrRoute, route) { + this.matcher.addRoute(parentOrRoute, route); + if (this.history.current !== START) { + this.history.transitionTo(this.history.getCurrentLocation()); + } + }; + + Object.defineProperties( VueRouter.prototype, prototypeAccessors ); + + function registerHook (list, fn) { + list.push(fn); + return function () { + var i = list.indexOf(fn); + if (i > -1) { list.splice(i, 1); } + } + } + + function createHref (base, fullPath, mode) { + var path = mode === 'hash' ? '#' + fullPath : fullPath; + return base ? cleanPath(base + '/' + path) : path + } + + // VueRouter.install = install; + VueRouter.version = '3.5.2'; + VueRouter.isNavigationFailure = isNavigationFailure; + VueRouter.NavigationFailureType = NavigationFailureType; + VueRouter.START_LOCATION = START; + + + var $router, cbs = []; + BI.RouterWidget = BI.inherit(BI.Widget, { + init: function () { + this.$router = this._router = BI.Router.$router = $router = new VueRouter({ + routes: this.options.routes, + mode: this.options.mode, + base: this.options.base + }); + this.$router.beforeEach(function (to, from, next) { + if (to.matched.length === 0) { + //如果上级也未匹配到路由则跳转主页面，如果上级能匹配到则转上级路由 + from.path ? next({ path: from.path }) : next('/'); + } else { + //如果匹配到正确跳转 + next(); + } + }); + this.$router.afterEach(function () { + cbs.forEach(function (cb) {cb();}); + }); + this.$router.init(this); + } + }); + BI.shortcut("bi.router", BI.RouterWidget); + + BI.RouterView = BI.inherit(BI.Widget, { + props: { + baseCls: 'bi-router-view', + deps: 0, + name: 'default' + }, + created: function () { + var self = this, o = this.options; + cbs.push(this._callbackListener = function () { + var current = $router.history.current; + // 匹配的路径名(/component/:id) + var matchedPath = current.matched[o.deps] && current.matched[o.deps].path; + var component = current.matched[o.deps] && current.matched[o.deps].components[o.name]; + + if (BI.isNotNull(component)) { + if (matchedPath) { + BI.each(current.params, function (key, value) { + // 把 :id 替换成具体的值(/component/demo.td) + matchedPath = matchedPath.replace(`:${key}`, value); + }); + } + self.tab.setSelect(matchedPath || "/"); + } + }); + // "bi.router_view"是由"bi.tab"实现的，cardCreator是一个异步过程，在"bi.router_view"创建之前，cbs里不会有创建子组件的方法，在初始化路由时，没法直接渲染到子组件，所以这里手动加了一次调用 + this._callbackListener(); + }, + render: function () { + var self = this, o = this.options; return { - location: location, - route: route, - href: href, - // for backwards compat - normalizedTo: location, - resolved: route - } - }; - - VueRouter.prototype.getRoutes = function getRoutes () { - return this.matcher.getRoutes() - }; - - VueRouter.prototype.addRoute = function addRoute (parentOrRoute, route) { - this.matcher.addRoute(parentOrRoute, route); - if (this.history.current !== START) { - this.history.transitionTo(this.history.getCurrentLocation()); - } - }; - - Object.defineProperties( VueRouter.prototype, prototypeAccessors ); - - function registerHook (list, fn) { - list.push(fn); - return function () { - var i = list.indexOf(fn); - if (i > -1) { list.splice(i, 1); } - } - } - - function createHref (base, fullPath, mode) { - var path = mode === 'hash' ? '#' + fullPath : fullPath; - return base ? cleanPath(base + '/' + path) : path + type: "bi.tab", + ref: function (_ref) { + self.tab = _ref; + }, + single: o.single, // 是不是单页面 + keepAlives: o.keepAlives, + logic: { + dynamic: false + }, + showIndex: false, + cardCreator: function (v) { + return $router.history.current.matched[o.deps].components[o.name]; + } + }; + }, + destroyed: function () { + BI.remove(cbs, this._callbackListener); } + }); + BI.shortcut("bi.router_view", BI.RouterView); - // VueRouter.install = install; - VueRouter.version = '3.5.2'; - VueRouter.isNavigationFailure = isNavigationFailure; - VueRouter.NavigationFailureType = NavigationFailureType; - VueRouter.START_LOCATION = START; - - - var $router, cbs = []; - BI.RouterWidget = BI.inherit(BI.Widget, { - init: function () { - this.$router = this._router = BI.Router.$router = $router = new VueRouter({ - routes: this.options.routes, - mode: this.options.mode, - base: this.options.base, - }); - this.$router.beforeEach(function (to, from, next) { - if (to.matched.length === 0) { - //如果上级也未匹配到路由则跳转主页面，如果上级能匹配到则转上级路由 - from.path ? next({ path: from.path }) : next('/'); - } else { - //如果匹配到正确跳转 - next(); - } - }); - this.$router.afterEach(function () { - cbs.forEach(function (cb) {cb();}); - }); - this.$router.init(this); - } - }); - BI.shortcut("bi.router", BI.RouterWidget); - - BI.RouterView = BI.inherit(BI.Widget, { - props: { - baseCls: 'bi-router-view', - deps: 0, - name: 'default' - }, - created: function () { - var self = this, o = this.options; - cbs.push(this._callbackListener = function () { - var current = $router.history.current; - // 匹配的路径名(/component/:id) - var matchedPath = current.matched[o.deps] && current.matched[o.deps].path; - var component = current.matched[o.deps] && current.matched[o.deps].components[o.name]; - - if (BI.isNotNull(component)) { - if (matchedPath) { - BI.each(current.params, function (key, value) { - // 把 :id 替换成具体的值(/component/demo.td) - matchedPath = matchedPath.replace(`:${key}`, value); - }); - } - self.tab.setSelect(matchedPath || "/"); - } - }); - // "bi.router_view"是由"bi.tab"实现的，cardCreator是一个异步过程，在"bi.router_view"创建之前，cbs里不会有创建子组件的方法，在初始化路由时，没法直接渲染到子组件，所以这里手动加了一次调用 - this._callbackListener(); - }, - render: function () { - var self = this, o = this.options; - return { - type: "bi.tab", - ref: function (_ref) { - self.tab = _ref; - }, - single: o.single, // 是不是单页面 - keepAlives: o.keepAlives, - logic: { - dynamic: false - }, - showIndex: false, - cardCreator: function (v) { - return $router.history.current.matched[o.deps].components[o.name]; - } - }; - }, - destroyed: function () { - BI.remove(cbs, this._callbackListener); - } - }); - BI.shortcut("bi.router_view", BI.RouterView); + BI.Router = BI.Router || VueRouter; + BI.Router.isSameRoute = isSameRoute; + return VueRouter; - BI.Router = BI.Router || VueRouter; - BI.Router.isSameRoute = isSameRoute; - return VueRouter; +}))); - }))); From 44a311773d42fbe160425b3c145253145d075fe9 Mon Sep 17 00:00:00 2001 From: Kobi Date: Thu, 28 Apr 2022 17:16:00 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E6=97=A0JIRA=E4=BB=BB=E5=8A=A1=20=E6=A0=BC?= =?UTF-8?q?=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/router/router.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/router/router.js b/src/router/router.js index 77dfd7d20..54488f77f 100644 --- a/src/router/router.js +++ b/src/router/router.js @@ -3128,7 +3128,7 @@ this.$router = this._router = BI.Router.$router = $router = new VueRouter({ mode: this.options.mode, routes: this.options.routes, - base: this.options.base + base: this.options.base, }); this.$router.beforeEach(function (to, from, next) { if (to.matched.length === 0) { From b36b1a4690ead1975157263f5d6efc6ab8e75662 Mon Sep 17 00:00:00 2001 From: Kobi Date: Sun, 15 May 2022 20:20:32 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E6=97=A0JIRA=E4=BB=BB=E5=8A=A1=20=E8=B7=AF?= =?UTF-8?q?=E7=94=B1=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/router/router.js | 38 +++++++++++++++++++++----------------- 1 file changed, 21 insertions(+), 17 deletions(-) diff --git a/src/router/router.js b/src/router/router.js index 7a44bb5d9..25dbabc44 100644 --- a/src/router/router.js +++ b/src/router/router.js @@ -3155,24 +3155,27 @@ }, created: function () { var self = this, o = this.options; - cbs.push(this._callbackListener = function () { - var current = $router.history.current; - // 匹配的路径名(/component/:id) - var matchedPath = current.matched[o.deps] && current.matched[o.deps].path; - var component = current.matched[o.deps] && current.matched[o.deps].components[o.name]; - - if (BI.isNotNull(component)) { - if (matchedPath) { - BI.each(current.params, function (key, value) { - // 把 :id 替换成具体的值(/component/demo.td) - matchedPath = matchedPath.replace(`:${key}`, value); - }); + // 嵌套路由 + single 下父亲执行setSelect后会执行一遍push + _callbackListener，之后在cbs.forEach下会执行到刚push进去的_callbackListener导致执行两次，这里加一个nextTick让forEach走不到新push进去的方法。 + BI.nextTick(function () { + cbs.push(self._callbackListener = function () { + var current = $router.history.current; + // 匹配的路径名(/component/:id) + var matchedPath = current.matched[o.deps] && current.matched[o.deps].path; + var component = current.matched[o.deps] && current.matched[o.deps].components[o.name]; + + if (BI.isNotNull(component)) { + if (matchedPath) { + BI.each(current.params, function (key, value) { + // 把 :id 替换成具体的值(/component/demo.td) + matchedPath = matchedPath.replace(`:${key}`, value); + }); + } + self.tab.setSelect(matchedPath || "/"); } - self.tab.setSelect(matchedPath || "/"); - } + }); + // "bi.router_view"是由"bi.tab"实现的，cardCreator是一个异步过程，在"bi.router_view"创建之前，cbs里不会有创建子组件的方法，在初始化路由时，没法直接渲染到子组件，所以这里手动加了一次调用 + self._callbackListener(); }); - // "bi.router_view"是由"bi.tab"实现的，cardCreator是一个异步过程，在"bi.router_view"创建之前，cbs里不会有创建子组件的方法，在初始化路由时，没法直接渲染到子组件，所以这里手动加了一次调用 - this._callbackListener(); }, render: function () { var self = this, o = this.options; @@ -3193,7 +3196,8 @@ }; }, destroyed: function () { - BI.remove(cbs, this._callbackListener); + // BI.remove方法会把第二个参数当迭代器执行导致方法多执行一遍 + cbs.splice(cbs.indexOf(this._callbackListener), 1); } }); BI.shortcut("bi.router_view", BI.RouterView);