@tinkoff/router 0.2.11 → 0.2.13

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (10) hide show
  1. package/lib/tree/constants.browser.js +2 -1
  2. package/lib/tree/constants.d.ts +1 -0
  3. package/lib/tree/constants.es.js +2 -1
  4. package/lib/tree/constants.js +2 -0
  5. package/lib/tree/tree.d.ts +1 -1
  6. package/lib/tree/utils.browser.js +2 -2
  7. package/lib/tree/utils.es.js +2 -2
  8. package/lib/tree/utils.js +1 -1
  9. package/lib/types.d.ts +4 -1
  10. package/package.json +1 -1
package/lib/tree/constants.browser.js CHANGED
@@ -1,6 +1,7 @@
1
1
  const PARAMETER_DELIMITER = ':';
2
2
  const WILDCARD_REGEXP = /\*/;
3
3
  const HISTORY_FALLBACK_REGEXP = /<history-fallback>/;
4
+ const PARAM_MATCH_REGEXP = /:.+$/;
4
5
  const PARAM_PARSER_REGEXP = /([^(?]+)(?:\((.+)\))?(\?)?/;
5
6
 
6
- export { HISTORY_FALLBACK_REGEXP, PARAMETER_DELIMITER, PARAM_PARSER_REGEXP, WILDCARD_REGEXP };
7
+ export { HISTORY_FALLBACK_REGEXP, PARAMETER_DELIMITER, PARAM_MATCH_REGEXP, PARAM_PARSER_REGEXP, WILDCARD_REGEXP };
package/lib/tree/constants.d.ts CHANGED
@@ -1,4 +1,5 @@
1
1
  export declare const PARAMETER_DELIMITER = ":";
2
2
  export declare const WILDCARD_REGEXP: RegExp;
3
3
  export declare const HISTORY_FALLBACK_REGEXP: RegExp;
4
+ export declare const PARAM_MATCH_REGEXP: RegExp;
4
5
  export declare const PARAM_PARSER_REGEXP: RegExp;
package/lib/tree/constants.es.js CHANGED
@@ -1,6 +1,7 @@
1
1
  const PARAMETER_DELIMITER = ':';
2
2
  const WILDCARD_REGEXP = /\*/;
3
3
  const HISTORY_FALLBACK_REGEXP = /<history-fallback>/;
4
+ const PARAM_MATCH_REGEXP = /:.+$/;
4
5
  const PARAM_PARSER_REGEXP = /([^(?]+)(?:\((.+)\))?(\?)?/;
5
6
 
6
- export { HISTORY_FALLBACK_REGEXP, PARAMETER_DELIMITER, PARAM_PARSER_REGEXP, WILDCARD_REGEXP };
7
+ export { HISTORY_FALLBACK_REGEXP, PARAMETER_DELIMITER, PARAM_MATCH_REGEXP, PARAM_PARSER_REGEXP, WILDCARD_REGEXP };
package/lib/tree/constants.js CHANGED
@@ -5,9 +5,11 @@ Object.defineProperty(exports, '__esModule', { value: true });
5
5
  const PARAMETER_DELIMITER = ':';
6
6
  const WILDCARD_REGEXP = /\*/;
7
7
  const HISTORY_FALLBACK_REGEXP = /<history-fallback>/;
8
+ const PARAM_MATCH_REGEXP = /:.+$/;
8
9
  const PARAM_PARSER_REGEXP = /([^(?]+)(?:\((.+)\))?(\?)?/;
9
10
 
10
11
  exports.HISTORY_FALLBACK_REGEXP = HISTORY_FALLBACK_REGEXP;
11
12
  exports.PARAMETER_DELIMITER = PARAMETER_DELIMITER;
13
+ exports.PARAM_MATCH_REGEXP = PARAM_MATCH_REGEXP;
12
14
  exports.PARAM_PARSER_REGEXP = PARAM_PARSER_REGEXP;
13
15
  exports.WILDCARD_REGEXP = WILDCARD_REGEXP;
package/lib/tree/tree.d.ts CHANGED
@@ -13,7 +13,7 @@ export declare class RouteTree {
13
13
  path: string;
14
14
  redirect?: string | import("../types").NavigateOptions;
15
15
  alias?: string;
16
- config?: Record<string, any>;
16
+ config?: import("../types").RouteConfig;
17
17
  };
18
18
  private findRoute;
19
19
  }
package/lib/tree/utils.browser.js CHANGED
@@ -1,5 +1,5 @@
1
1
  import map from '@tinkoff/utils/array/map';
2
- import { HISTORY_FALLBACK_REGEXP, WILDCARD_REGEXP, PARAMETER_DELIMITER, PARAM_PARSER_REGEXP } from './constants.browser.js';
2
+ import { HISTORY_FALLBACK_REGEXP, WILDCARD_REGEXP, PARAM_MATCH_REGEXP, PARAMETER_DELIMITER, PARAM_PARSER_REGEXP } from './constants.browser.js';
3
3
  import { normalizeTrailingSlash } from '../utils.browser.js';
4
4
 
5
5
  const getParts = (pathname) => pathname
@@ -12,7 +12,7 @@ const isWildcard = (part) => {
12
12
  return WILDCARD_REGEXP.test(part);
13
13
  };
14
14
  const isParameterized = (part) => {
15
- return part.includes(PARAMETER_DELIMITER);
15
+ return !!part.match(PARAM_MATCH_REGEXP);
16
16
  };
17
17
  const parseParameter = (part) => {
18
18
  const [prefix = '', param, postfix = ''] = part.split(PARAMETER_DELIMITER);
package/lib/tree/utils.es.js CHANGED
@@ -1,5 +1,5 @@
1
1
  import map from '@tinkoff/utils/array/map';
2
- import { HISTORY_FALLBACK_REGEXP, WILDCARD_REGEXP, PARAMETER_DELIMITER, PARAM_PARSER_REGEXP } from './constants.es.js';
2
+ import { HISTORY_FALLBACK_REGEXP, WILDCARD_REGEXP, PARAM_MATCH_REGEXP, PARAMETER_DELIMITER, PARAM_PARSER_REGEXP } from './constants.es.js';
3
3
  import { normalizeTrailingSlash } from '../utils.es.js';
4
4
 
5
5
  const getParts = (pathname) => pathname
@@ -12,7 +12,7 @@ const isWildcard = (part) => {
12
12
  return WILDCARD_REGEXP.test(part);
13
13
  };
14
14
  const isParameterized = (part) => {
15
- return part.includes(PARAMETER_DELIMITER);
15
+ return !!part.match(PARAM_MATCH_REGEXP);
16
16
  };
17
17
  const parseParameter = (part) => {
18
18
  const [prefix = '', param, postfix = ''] = part.split(PARAMETER_DELIMITER);
package/lib/tree/utils.js CHANGED
@@ -20,7 +20,7 @@ const isWildcard = (part) => {
20
20
  return constants.WILDCARD_REGEXP.test(part);
21
21
  };
22
22
  const isParameterized = (part) => {
23
- return part.includes(constants.PARAMETER_DELIMITER);
23
+ return !!part.match(constants.PARAM_MATCH_REGEXP);
24
24
  };
25
25
  const parseParameter = (part) => {
26
26
  const [prefix = '', param, postfix = ''] = part.split(constants.PARAMETER_DELIMITER);
package/lib/types.d.ts CHANGED
@@ -1,11 +1,14 @@
1
1
  import type { Url, Query } from '@tinkoff/url';
2
2
  export type Params = Record<string, string>;
3
+ export interface RouteConfig {
4
+ [key: string]: any;
5
+ }
3
6
  export interface Route {
4
7
  name: string;
5
8
  path: string;
6
9
  redirect?: string | NavigateOptions;
7
10
  alias?: string;
8
- config?: Record<string, any>;
11
+ config?: RouteConfig;
9
12
  }
10
13
  export interface NavigationRoute extends Route {
11
14
  actualPath: string;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@tinkoff/router",
3
- "version": "0.2.11",
3
+ "version": "0.2.13",
4
4
  "description": "router",
5
5
  "main": "lib/index.js",
6
6
  "typings": "lib/index.d.ts",