@lwrjs/router 0.24.1 → 0.24.3

package/build/cjs/modules/lwr/routerUtils/filterUtils.cjs

@@ -1,15 +1,28 @@
+"use strict";
 var __defProp = Object.defineProperty;
-var __markAsModule = (target) => __defProp(target, "__esModule", {value: true});
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
   for (var name in all)
-    __defProp(target, name, {get: all[name], enumerable: true});
+    __defProp(target, name, { get: all[name], enumerable: true });
 };
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
 // packages/@lwrjs/router/src/modules/lwr/routerUtils/filterUtils.ts
-__markAsModule(exports);
-__export(exports, {
+var filterUtils_exports = {};
+__export(filterUtils_exports, {
   createFilterChain: () => createFilterChain
 });
+module.exports = __toCommonJS(filterUtils_exports);
 function createFilterChain() {
   const filters = [];
   const empty = () => {
@@ -28,19 +41,25 @@ function createFilterChain() {
     }
   };
   const compile = (arg) => {
-    return filters.length === 0 ? Promise.resolve(true) : filters.reduce((previous, current) => {
-      return previous.then((val) => {
-        return val === false ? Promise.reject() : Promise.resolve(current(arg));
-      });
-    }, Promise.resolve(true)).then((val) => {
-      return val === false ? false : true;
-    }).catch((error) => {
-      if (error instanceof Error) {
-        throw error;
-      } else {
-        return false;
-      }
-    });
+    return filters.length === 0 ? Promise.resolve(true) : (
+      // Reduce the listener array down to a single value:
+      //      a false -> false
+      //      all truthy -> true
+      // Previous is a Promise and current is a function.
+      filters.reduce((previous, current) => {
+        return previous.then((val) => {
+          return val === false ? Promise.reject() : Promise.resolve(current(arg));
+        });
+      }, Promise.resolve(true)).then((val) => {
+        return val === false ? false : true;
+      }).catch((error) => {
+        if (error instanceof Error) {
+          throw error;
+        } else {
+          return false;
+        }
+      })
+    );
   };
   return {
     add,

package/build/cjs/modules/lwr/routerUtils/parseUtils.cjs

@@ -1,36 +1,33 @@
-var __create = Object.create;
+"use strict";
 var __defProp = Object.defineProperty;
-var __getProtoOf = Object.getPrototypeOf;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __getOwnPropNames = Object.getOwnPropertyNames;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __markAsModule = (target) => __defProp(target, "__esModule", {value: true});
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
   for (var name in all)
-    __defProp(target, name, {get: all[name], enumerable: true});
+    __defProp(target, name, { get: all[name], enumerable: true });
 };
-var __exportStar = (target, module2, desc) => {
-  if (module2 && typeof module2 === "object" || typeof module2 === "function") {
-    for (let key of __getOwnPropNames(module2))
-      if (!__hasOwnProp.call(target, key) && key !== "default")
-        __defProp(target, key, {get: () => module2[key], enumerable: !(desc = __getOwnPropDesc(module2, key)) || desc.enumerable});
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
   }
-  return target;
-};
-var __toModule = (module2) => {
-  return __exportStar(__markAsModule(__defProp(module2 != null ? __create(__getProtoOf(module2)) : {}, "default", module2 && module2.__esModule && "default" in module2 ? {get: () => module2.default, enumerable: true} : {value: module2, enumerable: true})), module2);
+  return to;
 };
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
 // packages/@lwrjs/router/src/modules/lwr/routerUtils/parseUtils.ts
-__markAsModule(exports);
-__export(exports, {
+var parseUtils_exports = {};
+__export(parseUtils_exports, {
   compileQueryObject: () => compileQueryObject,
   getQueryMatcher: () => getQueryMatcher,
   parseRoutes: () => parseRoutes
 });
-var import_routerErrors = __toModule(require("lwr/routerErrors"));
-var import_pathToRegexp = __toModule(require("./pathToRegexp.cjs"));
-var import_uriUtils = __toModule(require("./uriUtils.cjs"));
+module.exports = __toCommonJS(parseUtils_exports);
+var import_routerErrors = require("lwr/routerErrors");
+var import_pathToRegexp = require("./pathToRegexp.cjs");
+var import_uriUtils = require("./uriUtils.cjs");
 var {
   INVALID_ROUTE_QUERY,
   MISSING_ROUTE_TEMPLATE,
@@ -39,14 +36,14 @@ var {
   INVALID_URI_SYNTAX
 } = import_routerErrors.messages;
 function parseRoutes(config) {
-  const {routes, caseSensitive} = config;
+  const { routes, caseSensitive } = config;
   return routes.map((def) => {
     return parseUriRoute(def, caseSensitive);
   });
 }
 function parseUriRoute(def, caseSensitive = false) {
   const params = [];
-  const {id, uri, page} = def;
+  const { id, uri, page } = def;
   (0, import_routerErrors.invariant)(!!uri, (0, import_routerErrors.generateMessageObject)(MISSING_ROUTE_TEMPLATE, [id]));
   (0, import_routerErrors.invariant)(isValidUri(uri), (0, import_routerErrors.generateMessageObject)(INVALID_URI_SYNTAX, [id]));
   (0, import_routerErrors.invariant)(!!page, (0, import_routerErrors.generateMessageObject)(MISSING_PAGE_BINDING, [id]));
@@ -54,12 +51,13 @@ function parseUriRoute(def, caseSensitive = false) {
   const query = (0, import_uriUtils.getQueryFromUrl)(uri);
   const regex = (0, import_pathToRegexp.pathToRegexp)(path, params, {
     sensitive: caseSensitive,
+    // True if this is a leaf route, and must match URLs exactly with no trailing segments.
     end: def.exact === false ? false : true
   });
-  const toPath = (0, import_pathToRegexp.compile)(path, {encode: encodeURIComponent});
+  const toPath = (0, import_pathToRegexp.compile)(path, { encode: encodeURIComponent });
   const compiledQuery = compileQueryObject(query);
   const queryMatcher = getQueryMatcher(compiledQuery, caseSensitive);
-  const compiledRoute = {original: def, regex, params, toPath, compiledQuery, queryMatcher};
+  const compiledRoute = { original: def, regex, params, toPath, compiledQuery, queryMatcher };
   (0, import_routerErrors.invariant)(isValidPageBinding(compiledRoute), (0, import_routerErrors.generateMessageObject)(INVALID_PAGE_BINDING, [id]));
   return compiledRoute;
 }
@@ -69,14 +67,14 @@ function isValidUri(uri = "") {
   return !containsInvalidCharacter;
 }
 function isValidPageBinding(compiledDef) {
-  const {original: {page} = {}, params, compiledQuery} = compiledDef;
+  const { original: { page } = {}, params, compiledQuery } = compiledDef;
   const pageType = page ? page.type : page;
   const pageAttributes = (page ? page.attributes : page) || {};
   const pageState = (page ? page.state : page) || {};
   if (typeof pageType !== "string" || typeof pageAttributes !== "object" || typeof pageState !== "object") {
     return false;
   }
-  const pathParams = Object.values(params).map(({name}) => name);
+  const pathParams = Object.values(params).map(({ name }) => name);
   const queryParams = (0, import_uriUtils.getQueryNames)(compiledQuery);
   const allParams = [...pathParams, ...queryParams];
   const attributeBindings = Object.values(pageAttributes).filter(import_uriUtils.isParam).map(import_uriUtils.getParamName);
@@ -118,9 +116,8 @@ function getQueryMatcher(compiledQuery, caseSensitive = false) {
     const hasAllDefKeys = defKeys.every((defKey) => inputKeys.indexOf(defKey) >= 0);
     if (hasAllDefKeys) {
       return defKeys.reduce((matched, defKey) => {
-        if (matched === null)
-          return null;
-        const {literalValue, routeParamName} = compiledQuery[defKey];
+        if (matched === null) return null;
+        const { literalValue, routeParamName } = compiledQuery[defKey];
         const inputValue = queryObject[defKey];
         let literalValueMatches = true;
         if (typeof literalValue === "string") {
@@ -129,7 +126,7 @@ function getQueryMatcher(compiledQuery, caseSensitive = false) {
           literalValueMatches = inputValue === literalValue;
         }
         if (literalValueMatches) {
-          matched = {...matched, [defKey]: {value: inputValue, routeParamName}};
+          matched = { ...matched, [defKey]: { value: inputValue, routeParamName } };
         } else {
           matched = null;
         }

package/build/cjs/modules/lwr/routerUtils/pathToRegexp.cjs

@@ -1,13 +1,25 @@
+"use strict";
 var __defProp = Object.defineProperty;
-var __markAsModule = (target) => __defProp(target, "__esModule", {value: true});
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
   for (var name in all)
-    __defProp(target, name, {get: all[name], enumerable: true});
+    __defProp(target, name, { get: all[name], enumerable: true });
 };
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
 // packages/@lwrjs/router/src/modules/lwr/routerUtils/pathToRegexp.ts
-__markAsModule(exports);
-__export(exports, {
+var pathToRegexp_exports = {};
+__export(pathToRegexp_exports, {
   compile: () => compile,
   match: () => match,
   parse: () => parse,
@@ -16,25 +28,26 @@ __export(exports, {
   tokensToFunction: () => tokensToFunction,
   tokensToRegexp: () => tokensToRegexp
 });
+module.exports = __toCommonJS(pathToRegexp_exports);
 function lexer(str) {
   const tokens = [];
   let i = 0;
   while (i < str.length) {
     const char = str[i];
     if (char === "*" || char === "+" || char === "?") {
-      tokens.push({type: "MODIFIER", index: i, value: str[i++]});
+      tokens.push({ type: "MODIFIER", index: i, value: str[i++] });
       continue;
     }
     if (char === "\\") {
-      tokens.push({type: "ESCAPED_CHAR", index: i++, value: str[i++]});
+      tokens.push({ type: "ESCAPED_CHAR", index: i++, value: str[i++] });
       continue;
     }
     if (char === "{") {
-      tokens.push({type: "OPEN", index: i, value: str[i++]});
+      tokens.push({ type: "OPEN", index: i, value: str[i++] });
       continue;
     }
     if (char === "}") {
-      tokens.push({type: "CLOSE", index: i, value: str[i++]});
+      tokens.push({ type: "CLOSE", index: i, value: str[i++] });
       continue;
     }
     if (char === ":") {
@@ -42,15 +55,20 @@ function lexer(str) {
       let j = i + 1;
       while (j < str.length) {
         const code = str.charCodeAt(j);
-        if (code >= 48 && code <= 57 || code >= 65 && code <= 90 || code >= 97 && code <= 122 || code === 95) {
+        if (
+          // `0-9`
+          code >= 48 && code <= 57 || // `A-Z`
+          code >= 65 && code <= 90 || // `a-z`
+          code >= 97 && code <= 122 || // `_`
+          code === 95
+        ) {
           name += str[j++];
           continue;
         }
         break;
       }
-      if (!name)
-        throw new TypeError(`Missing parameter name at ${i}`);
-      tokens.push({type: "NAME", index: i, value: name});
+      if (!name) throw new TypeError(`Missing parameter name at ${i}`);
+      tokens.push({ type: "NAME", index: i, value: name });
       i = j;
       continue;
     }
@@ -80,17 +98,15 @@ function lexer(str) {
         }
         pattern += str[j++];
       }
-      if (count)
-        throw new TypeError(`Unbalanced pattern at ${i}`);
-      if (!pattern)
-        throw new TypeError(`Missing pattern at ${i}`);
-      tokens.push({type: "PATTERN", index: i, value: pattern});
+      if (count) throw new TypeError(`Unbalanced pattern at ${i}`);
+      if (!pattern) throw new TypeError(`Missing pattern at ${i}`);
+      tokens.push({ type: "PATTERN", index: i, value: pattern });
       i = j;
       continue;
     }
-    tokens.push({type: "CHAR", index: i, value: str[i++]});
+    tokens.push({ type: "CHAR", index: i, value: str[i++] });
   }
-  tokens.push({type: "END", index: i, value: ""});
+  tokens.push({ type: "END", index: i, value: "" });
   return tokens;
 }
 function escapeString(str) {
@@ -101,21 +117,19 @@ function flags(options) {
 }
 function parse(str, options = {}) {
   const tokens = lexer(str);
-  const {prefixes = "./"} = options;
+  const { prefixes = "./" } = options;
   const defaultPattern = `[^${escapeString(options.delimiter || "/#?")}]+?`;
   const result = [];
   let key = 0;
   let i = 0;
   let path = "";
   const tryConsume = (type) => {
-    if (i < tokens.length && tokens[i].type === type)
-      return tokens[i++].value;
+    if (i < tokens.length && tokens[i].type === type) return tokens[i++].value;
   };
   const mustConsume = (type) => {
     const value = tryConsume(type);
-    if (value !== void 0)
-      return value;
-    const {type: nextType, index} = tokens[i];
+    if (value !== void 0) return value;
+    const { type: nextType, index } = tokens[i];
     throw new TypeError(`Unexpected ${nextType} at ${index}, expected ${type}`);
   };
   const consumeText = () => {
@@ -180,7 +194,7 @@ function parse(str, options = {}) {
 }
 function tokensToFunction(tokens, options = {}) {
   const reFlags = flags(options);
-  const {encode = (x) => x, validate = true} = options;
+  const { encode = (x) => x, validate = true } = options;
   const matches = tokens.map((token) => {
     if (typeof token === "object") {
       return new RegExp(`^(?:${token.pattern})$`, reFlags);
@@ -202,14 +216,15 @@ function tokensToFunction(tokens, options = {}) {
           throw new TypeError(`Expected "${token.name}" to not repeat, but got an array`);
         }
         if (value.length === 0) {
-          if (optional)
-            continue;
+          if (optional) continue;
           throw new TypeError(`Expected "${token.name}" to not be empty`);
         }
         for (let j = 0; j < value.length; j++) {
           const segment = encode(value[j], token);
           if (validate && !matches[i].test(segment)) {
-            throw new TypeError(`Expected all "${token.name}" to match "${token.pattern}", but got "${segment}"`);
+            throw new TypeError(
+              `Expected all "${token.name}" to match "${token.pattern}", but got "${segment}"`
+            );
           }
           path += token.prefix + segment + token.suffix;
         }
@@ -218,13 +233,14 @@ function tokensToFunction(tokens, options = {}) {
       if (typeof value === "string" || typeof value === "number") {
         const segment = encode(String(value), token);
         if (validate && !matches[i].test(segment)) {
-          throw new TypeError(`Expected "${token.name}" to match "${token.pattern}", but got "${segment}"`);
+          throw new TypeError(
+            `Expected "${token.name}" to match "${token.pattern}", but got "${segment}"`
+          );
         }
         path += token.prefix + segment + token.suffix;
         continue;
       }
-      if (optional)
-        continue;
+      if (optional) continue;
       const typeOfMessage = repeat ? "an array" : "a string";
       throw new TypeError(`Expected "${token.name}" to be ${typeOfMessage}`);
     }
@@ -235,16 +251,14 @@ function compile(str, options) {
   return tokensToFunction(parse(str, options), options);
 }
 function regexpToFunction(re, keys, options = {}) {
-  const {decode = (x) => x} = options;
+  const { decode = (x) => x } = options;
   return function(pathname) {
     const m = re.exec(pathname);
-    if (!m)
-      return false;
-    const {0: path, index} = m;
-    const params = Object.create(null);
+    if (!m) return false;
+    const { 0: path, index } = m;
+    const params = /* @__PURE__ */ Object.create(null);
     for (let i = 1; i < m.length; i++) {
-      if (m[i] === void 0)
-        continue;
+      if (m[i] === void 0) continue;
       const key = keys[i - 1];
       if (key.modifier === "*" || key.modifier === "+") {
         params[key.name] = m[i].split(key.prefix + key.suffix).map((value) => {
@@ -254,12 +268,11 @@ function regexpToFunction(re, keys, options = {}) {
         params[key.name] = decode(m[i], key);
       }
     }
-    return {path, index, params};
+    return { path, index, params };
   };
 }
 function regexpToRegexp(path, keys) {
-  if (!keys)
-    return path;
+  if (!keys) return path;
   const groups = path.source.match(/\((?!\?)/g);
   if (groups) {
     for (let i = 0; i < groups.length; i++) {
@@ -275,7 +288,7 @@ function regexpToRegexp(path, keys) {
   return path;
 }
 function tokensToRegexp(tokens, keys, options = {}) {
-  const {strict = false, start = true, end = true, encode = (x) => x} = options;
+  const { strict = false, start = true, end = true, encode = (x) => x } = options;
   const endsWith = `[${escapeString(options.endsWith || "")}]|$`;
   const delimiter = `[${escapeString(options.delimiter || "/#?")}]`;
   let route = start ? "^" : "";
@@ -286,8 +299,7 @@ function tokensToRegexp(tokens, keys, options = {}) {
       const prefix = escapeString(encode(token.prefix));
       const suffix = escapeString(encode(token.suffix));
       if (token.pattern) {
-        if (keys)
-          keys.push(token);
+        if (keys) keys.push(token);
         if (prefix || suffix) {
           if (token.modifier === "+" || token.modifier === "*") {
             const mod = token.modifier === "*" ? "?" : "";
@@ -304,12 +316,14 @@ function tokensToRegexp(tokens, keys, options = {}) {
     }
   }
   if (end) {
-    if (!strict)
-      route += `${delimiter}?`;
+    if (!strict) route += `${delimiter}?`;
     route += !options.endsWith ? "$" : `(?=${endsWith})`;
   } else {
     const endToken = tokens[tokens.length - 1];
-    const isEndDelimited = typeof endToken === "string" ? delimiter.indexOf(endToken[endToken.length - 1]) > -1 : endToken === void 0;
+    const isEndDelimited = typeof endToken === "string" ? delimiter.indexOf(endToken[endToken.length - 1]) > -1 : (
+      // tslint:disable-next-line
+      endToken === void 0
+    );
     if (!strict) {
       route += `(?:${delimiter}(?=${endsWith}))?`;
     }
@@ -323,10 +337,8 @@ function stringToRegexp(path, keys, options) {
   return tokensToRegexp(parse(path, options), keys, options);
 }
 function pathToRegexp(path, keys, options) {
-  if (path instanceof RegExp)
-    return regexpToRegexp(path, keys);
-  if (Array.isArray(path))
-    return arrayToRegexp(path, keys, options);
+  if (path instanceof RegExp) return regexpToRegexp(path, keys);
+  if (Array.isArray(path)) return arrayToRegexp(path, keys, options);
   return stringToRegexp(path, keys, options);
 }
 function match(str, options) {

package/build/cjs/modules/lwr/routerUtils/routeDefUtils.cjs

@@ -1,44 +1,41 @@
-var __create = Object.create;
+"use strict";
 var __defProp = Object.defineProperty;
-var __getProtoOf = Object.getPrototypeOf;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __getOwnPropNames = Object.getOwnPropertyNames;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __markAsModule = (target) => __defProp(target, "__esModule", {value: true});
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
   for (var name in all)
-    __defProp(target, name, {get: all[name], enumerable: true});
+    __defProp(target, name, { get: all[name], enumerable: true });
 };
-var __exportStar = (target, module2, desc) => {
-  if (module2 && typeof module2 === "object" || typeof module2 === "function") {
-    for (let key of __getOwnPropNames(module2))
-      if (!__hasOwnProp.call(target, key) && key !== "default")
-        __defProp(target, key, {get: () => module2[key], enumerable: !(desc = __getOwnPropDesc(module2, key)) || desc.enumerable});
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
   }
-  return target;
-};
-var __toModule = (module2) => {
-  return __exportStar(__markAsModule(__defProp(module2 != null ? __create(__getProtoOf(module2)) : {}, "default", module2 && module2.__esModule && "default" in module2 ? {get: () => module2.default, enumerable: true} : {value: module2, enumerable: true})), module2);
+  return to;
 };
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
 // packages/@lwrjs/router/src/modules/lwr/routerUtils/routeDefUtils.ts
-__markAsModule(exports);
-__export(exports, {
+var routeDefUtils_exports = {};
+__export(routeDefUtils_exports, {
   getPageReferenceFromUriAndRouteDef: () => getPageReferenceFromUriAndRouteDef,
   getPathParams: () => getPathParams,
   getQueryParams: () => getQueryParams,
   matchRouteDefinitionByPageReference: () => matchRouteDefinitionByPageReference
 });
-var import_uriUtils = __toModule(require("./uriUtils.cjs"));
+module.exports = __toCommonJS(routeDefUtils_exports);
+var import_uriUtils = require("./uriUtils.cjs");
 function matchRouteDefinitionByPageReference(pageReference, routeDefs) {
   if (!pageReference) {
     return null;
   }
-  const {type: refType, attributes: refAttrs = {}, state: refState = {}} = pageReference;
+  const { type: refType, attributes: refAttrs = {}, state: refState = {} } = pageReference;
   if (refType) {
     const [matched] = routeDefs.filter((compiledDef) => {
       const {
-        original: {page: {type = null, attributes: pageAttrs = {}, state: pageState = {}} = {}}
+        original: { page: { type = null, attributes: pageAttrs = {}, state: pageState = {} } = {} }
       } = compiledDef;
       const matchesType = type === refType;
       const refAttributesHasAllPageKeys = Object.keys(pageAttrs).every((key) => {
@@ -63,13 +60,13 @@ function matchRouteDefinitionByPageReference(pageReference, routeDefs) {
   return null;
 }
 function getPathParams(path, routeDef) {
-  const {regex, params: definedParams} = routeDef;
+  const { regex, params: definedParams } = routeDef;
   const execArray = regex.exec(path);
   if (execArray) {
     const [, ...pathParamValues] = execArray;
     const pathParams = {};
     definedParams.forEach((param, index) => {
-      const {name: paramName} = param;
+      const { name: paramName } = param;
       const paramValue = pathParamValues[index];
       pathParams[paramName] = paramValue ? (0, import_uriUtils.decode)(paramValue) : paramValue;
     });
@@ -79,13 +76,13 @@ function getPathParams(path, routeDef) {
 }
 function getQueryParams(queryObj, routeDef) {
   if (queryObj && routeDef) {
-    const {queryMatcher} = routeDef;
+    const { queryMatcher } = routeDef;
     const matchedQuery = queryMatcher(queryObj);
     if (matchedQuery) {
       const params = {};
       Object.keys(matchedQuery).forEach((queryKeyName) => {
         const paramValue = matchedQuery[queryKeyName];
-        const {value, routeParamName} = paramValue;
+        const { value, routeParamName } = paramValue;
         const paramName = routeParamName ? routeParamName.substr(1) : queryKeyName;
         params[paramName] = value ? (0, import_uriUtils.decode)(value) : value;
       });
@@ -95,9 +92,9 @@ function getQueryParams(queryObj, routeDef) {
   return null;
 }
 function getUnboundQueries(queryObj, routeDef) {
-  const {compiledQuery} = routeDef;
+  const { compiledQuery } = routeDef;
   const boundKeys = Object.keys(compiledQuery).filter((qKey) => {
-    const {literalValue} = compiledQuery[qKey];
+    const { literalValue } = compiledQuery[qKey];
     return !literalValue;
   });
   const unbound = {};
@@ -113,7 +110,7 @@ function getPageReferenceFromUriAndRouteDef(uri, routeDef) {
   if (routeDef) {
     const {
       original: {
-        page: {type: pageType = "", attributes: pageAttributes = {}, state: pageState = {}} = {}
+        page: { type: pageType = "", attributes: pageAttributes = {}, state: pageState = {} } = {}
       } = {}
     } = routeDef;
     const path = (0, import_uriUtils.getPathFromUrl)(uri);
@@ -152,10 +149,11 @@ function getPageReferenceFromUriAndRouteDef(uri, routeDef) {
       const unboundState = getUnboundQueries(query, routeDef);
       return {
         type: pageType,
-        attributes: {...boundAttributeParams},
+        attributes: { ...boundAttributeParams },
         state: {
           ...unboundState,
           ...boundStateParams
+          // bound state params override unbound param
         }
       };
     }