@domql/router 2.31.0 → 2.31.1

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 (4) hide show
  1. package/dist/cjs/index.js +8 -1
  2. package/dist/esm/index.js +8 -1
  3. package/index.js +14 -5
  4. package/package.json +4 -4
package/dist/cjs/index.js CHANGED
@@ -68,7 +68,14 @@ const router = async function(path, el, state = {}, options = {}) {
68
68
  const { pathname, search, hash } = urlObj;
69
69
  const rootNode = element.node;
70
70
  const route = getActiveRoute(opts.level, pathname);
71
- const content = element.routes[route] || element.routes[pathname] || element.routes["/"] || element.routes["/*"];
71
+ let content;
72
+ const singlePathContent = element.routes[route];
73
+ const fullpathnameContent = element.routes[pathname];
74
+ if (route !== pathname && !(singlePathContent == null ? void 0 : singlePathContent.routes) && fullpathnameContent) {
75
+ content = fullpathnameContent;
76
+ } else {
77
+ content = singlePathContent || fullpathnameContent || element.routes["/"] || element.routes["/*"];
78
+ }
72
79
  const scrollNode = opts.scrollToNode ? rootNode : opts.scrollNode;
73
80
  const hashChanged = hash && hash !== win.location.hash.slice(1);
74
81
  const pathChanged = pathname !== lastPathname;
package/dist/esm/index.js CHANGED
@@ -56,7 +56,14 @@ const router = async function(path, el, state = {}, options = {}) {
56
56
  const { pathname, search, hash } = urlObj;
57
57
  const rootNode = element.node;
58
58
  const route = getActiveRoute(opts.level, pathname);
59
- const content = element.routes[route] || element.routes[pathname] || element.routes["/"] || element.routes["/*"];
59
+ let content;
60
+ const singlePathContent = element.routes[route];
61
+ const fullpathnameContent = element.routes[pathname];
62
+ if (route !== pathname && !(singlePathContent == null ? void 0 : singlePathContent.routes) && fullpathnameContent) {
63
+ content = fullpathnameContent;
64
+ } else {
65
+ content = singlePathContent || fullpathnameContent || element.routes["/"] || element.routes["/*"];
66
+ }
60
67
  const scrollNode = opts.scrollToNode ? rootNode : opts.scrollNode;
61
68
  const hashChanged = hash && hash !== win.location.hash.slice(1);
62
69
  const pathChanged = pathname !== lastPathname;
package/index.js CHANGED
@@ -54,11 +54,20 @@ export const router = async function (path, el, state = {}, options = {}) {
54
54
 
55
55
  const rootNode = element.node
56
56
  const route = getActiveRoute(opts.level, pathname)
57
- const content =
58
- element.routes[route] ||
59
- element.routes[pathname] ||
60
- element.routes['/'] ||
61
- element.routes['/*']
57
+
58
+ let content
59
+ const singlePathContent = element.routes[route]
60
+ const fullpathnameContent = element.routes[pathname]
61
+ if (route !== pathname && !singlePathContent?.routes && fullpathnameContent) {
62
+ content = fullpathnameContent
63
+ } else {
64
+ content =
65
+ singlePathContent ||
66
+ fullpathnameContent ||
67
+ element.routes['/'] ||
68
+ element.routes['/*']
69
+ }
70
+
62
71
  const scrollNode = opts.scrollToNode ? rootNode : opts.scrollNode
63
72
  const hashChanged = hash && hash !== win.location.hash.slice(1)
64
73
  const pathChanged = pathname !== lastPathname
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@domql/router",
3
- "version": "2.31.0",
3
+ "version": "2.31.1",
4
4
  "license": "MIT",
5
5
  "type": "module",
6
6
  "module": "dist/esm/index.js",
@@ -22,10 +22,10 @@
22
22
  "prepublish": "npx rimraf -I dist && npm run build && npm run copy:package:cjs"
23
23
  },
24
24
  "dependencies": {
25
- "@domql/event": "^2.31.0",
26
- "@domql/utils": "^2.31.0"
25
+ "@domql/event": "^2.31.1",
26
+ "@domql/utils": "^2.31.1"
27
27
  },
28
- "gitHead": "dd5c64895320d678f28ca585c9fd4e4550a483cd",
28
+ "gitHead": "6ac409576cc3b2ac653e9601d5a8c2bed90b83de",
29
29
  "devDependencies": {
30
30
  "@babel/core": "^7.27.1"
31
31
  }