@tanstack/solid-router 2.0.0-alpha.5 → 2.0.0-alpha.7

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 (219) hide show
  1. package/dist/cjs/Asset.cjs +2 -2
  2. package/dist/cjs/Asset.cjs.map +1 -1
  3. package/dist/cjs/HeadContent.cjs +11 -1
  4. package/dist/cjs/HeadContent.cjs.map +1 -1
  5. package/dist/cjs/HeadContent.dev.cjs +11 -1
  6. package/dist/cjs/HeadContent.dev.cjs.map +1 -1
  7. package/dist/cjs/Match.cjs +265 -248
  8. package/dist/cjs/Match.cjs.map +1 -1
  9. package/dist/cjs/Match.d.cts +1 -3
  10. package/dist/cjs/Matches.cjs +35 -34
  11. package/dist/cjs/Matches.cjs.map +1 -1
  12. package/dist/cjs/RouterProvider.cjs +12 -8
  13. package/dist/cjs/RouterProvider.cjs.map +1 -1
  14. package/dist/cjs/RouterProvider.d.cts +1 -1
  15. package/dist/cjs/Scripts.cjs +23 -12
  16. package/dist/cjs/Scripts.cjs.map +1 -1
  17. package/dist/cjs/Scripts.d.cts +2 -1
  18. package/dist/cjs/Transitioner.cjs +57 -36
  19. package/dist/cjs/Transitioner.cjs.map +1 -1
  20. package/dist/cjs/headContentUtils.cjs +26 -23
  21. package/dist/cjs/headContentUtils.cjs.map +1 -1
  22. package/dist/cjs/headContentUtils.d.cts +2 -1
  23. package/dist/cjs/index.cjs +1 -1
  24. package/dist/cjs/index.dev.cjs +1 -1
  25. package/dist/cjs/link.cjs +143 -101
  26. package/dist/cjs/link.cjs.map +1 -1
  27. package/dist/cjs/matchContext.cjs +7 -5
  28. package/dist/cjs/matchContext.cjs.map +1 -1
  29. package/dist/cjs/matchContext.d.cts +8 -2
  30. package/dist/cjs/not-found.cjs +8 -4
  31. package/dist/cjs/not-found.cjs.map +1 -1
  32. package/dist/cjs/not-found.d.cts +1 -1
  33. package/dist/cjs/router.cjs +2 -1
  34. package/dist/cjs/router.cjs.map +1 -1
  35. package/dist/cjs/routerStores.cjs +75 -0
  36. package/dist/cjs/routerStores.cjs.map +1 -0
  37. package/dist/cjs/routerStores.d.cts +10 -0
  38. package/dist/cjs/ssr/RouterClient.cjs +1 -1
  39. package/dist/cjs/ssr/RouterClient.cjs.map +1 -1
  40. package/dist/cjs/ssr/renderRouterToStream.cjs +1 -1
  41. package/dist/cjs/ssr/renderRouterToStream.cjs.map +1 -1
  42. package/dist/cjs/ssr/renderRouterToString.cjs +1 -1
  43. package/dist/cjs/ssr/renderRouterToString.cjs.map +1 -1
  44. package/dist/cjs/useBlocker.cjs +12 -3
  45. package/dist/cjs/useBlocker.cjs.map +1 -1
  46. package/dist/cjs/useCanGoBack.cjs +6 -2
  47. package/dist/cjs/useCanGoBack.cjs.map +1 -1
  48. package/dist/cjs/useCanGoBack.d.cts +2 -1
  49. package/dist/cjs/useLoaderDeps.cjs +2 -3
  50. package/dist/cjs/useLoaderDeps.cjs.map +1 -1
  51. package/dist/cjs/useLocation.cjs +13 -2
  52. package/dist/cjs/useLocation.cjs.map +1 -1
  53. package/dist/cjs/useMatch.cjs +27 -15
  54. package/dist/cjs/useMatch.cjs.map +1 -1
  55. package/dist/cjs/useParams.cjs +1 -1
  56. package/dist/cjs/useParams.cjs.map +1 -1
  57. package/dist/cjs/useRouterState.cjs +12 -30
  58. package/dist/cjs/useRouterState.cjs.map +1 -1
  59. package/dist/cjs/useSearch.cjs +2 -1
  60. package/dist/cjs/useSearch.cjs.map +1 -1
  61. package/dist/cjs/utils.cjs +3 -17
  62. package/dist/cjs/utils.cjs.map +1 -1
  63. package/dist/cjs/utils.d.cts +0 -5
  64. package/dist/esm/Asset.js +6 -6
  65. package/dist/esm/Asset.js.map +1 -1
  66. package/dist/esm/HeadContent.dev.js +12 -2
  67. package/dist/esm/HeadContent.dev.js.map +1 -1
  68. package/dist/esm/HeadContent.js +12 -2
  69. package/dist/esm/HeadContent.js.map +1 -1
  70. package/dist/esm/Match.d.ts +1 -3
  71. package/dist/esm/Match.js +267 -250
  72. package/dist/esm/Match.js.map +1 -1
  73. package/dist/esm/Matches.js +40 -39
  74. package/dist/esm/Matches.js.map +1 -1
  75. package/dist/esm/RouterProvider.d.ts +1 -1
  76. package/dist/esm/RouterProvider.js +10 -7
  77. package/dist/esm/RouterProvider.js.map +1 -1
  78. package/dist/esm/ScriptOnce.js +2 -2
  79. package/dist/esm/ScriptOnce.js.map +1 -1
  80. package/dist/esm/Scripts.d.ts +2 -1
  81. package/dist/esm/Scripts.js +21 -11
  82. package/dist/esm/Scripts.js.map +1 -1
  83. package/dist/esm/Transitioner.js +58 -37
  84. package/dist/esm/Transitioner.js.map +1 -1
  85. package/dist/esm/headContentUtils.d.ts +2 -1
  86. package/dist/esm/headContentUtils.js +26 -23
  87. package/dist/esm/headContentUtils.js.map +1 -1
  88. package/dist/esm/index.dev.js +1 -1
  89. package/dist/esm/index.js +1 -1
  90. package/dist/esm/link.js +146 -104
  91. package/dist/esm/link.js.map +1 -1
  92. package/dist/esm/matchContext.d.ts +8 -2
  93. package/dist/esm/matchContext.js +7 -4
  94. package/dist/esm/matchContext.js.map +1 -1
  95. package/dist/esm/not-found.d.ts +1 -1
  96. package/dist/esm/not-found.js +6 -3
  97. package/dist/esm/not-found.js.map +1 -1
  98. package/dist/esm/router.js +2 -1
  99. package/dist/esm/router.js.map +1 -1
  100. package/dist/esm/routerStores.d.ts +10 -0
  101. package/dist/esm/routerStores.js +73 -0
  102. package/dist/esm/routerStores.js.map +1 -0
  103. package/dist/esm/scroll-restoration.js +2 -2
  104. package/dist/esm/scroll-restoration.js.map +1 -1
  105. package/dist/esm/ssr/RouterClient.js +1 -1
  106. package/dist/esm/ssr/RouterClient.js.map +1 -1
  107. package/dist/esm/ssr/renderRouterToStream.js +1 -1
  108. package/dist/esm/ssr/renderRouterToStream.js.map +1 -1
  109. package/dist/esm/ssr/renderRouterToString.js +1 -1
  110. package/dist/esm/ssr/renderRouterToString.js.map +1 -1
  111. package/dist/esm/useBlocker.js +12 -3
  112. package/dist/esm/useBlocker.js.map +1 -1
  113. package/dist/esm/useCanGoBack.d.ts +2 -1
  114. package/dist/esm/useCanGoBack.js +4 -2
  115. package/dist/esm/useCanGoBack.js.map +1 -1
  116. package/dist/esm/useLoaderDeps.js +2 -3
  117. package/dist/esm/useLoaderDeps.js.map +1 -1
  118. package/dist/esm/useLocation.js +11 -2
  119. package/dist/esm/useLocation.js.map +1 -1
  120. package/dist/esm/useMatch.js +28 -16
  121. package/dist/esm/useMatch.js.map +1 -1
  122. package/dist/esm/useParams.js +1 -1
  123. package/dist/esm/useParams.js.map +1 -1
  124. package/dist/esm/useRouterState.js +11 -30
  125. package/dist/esm/useRouterState.js.map +1 -1
  126. package/dist/esm/useSearch.js +2 -1
  127. package/dist/esm/useSearch.js.map +1 -1
  128. package/dist/esm/utils.d.ts +0 -5
  129. package/dist/esm/utils.js +4 -17
  130. package/dist/esm/utils.js.map +1 -1
  131. package/dist/source/Asset.jsx +3 -3
  132. package/dist/source/Asset.jsx.map +1 -1
  133. package/dist/source/HeadContent.dev.jsx +5 -1
  134. package/dist/source/HeadContent.dev.jsx.map +1 -1
  135. package/dist/source/HeadContent.jsx +5 -1
  136. package/dist/source/HeadContent.jsx.map +1 -1
  137. package/dist/source/Match.d.ts +1 -3
  138. package/dist/source/Match.jsx +260 -264
  139. package/dist/source/Match.jsx.map +1 -1
  140. package/dist/source/Matches.jsx +46 -46
  141. package/dist/source/Matches.jsx.map +1 -1
  142. package/dist/source/RouterProvider.d.ts +1 -1
  143. package/dist/source/RouterProvider.jsx +13 -9
  144. package/dist/source/RouterProvider.jsx.map +1 -1
  145. package/dist/source/Scripts.d.ts +2 -1
  146. package/dist/source/Scripts.jsx +46 -47
  147. package/dist/source/Scripts.jsx.map +1 -1
  148. package/dist/source/Transitioner.jsx +80 -44
  149. package/dist/source/Transitioner.jsx.map +1 -1
  150. package/dist/source/headContentUtils.d.ts +2 -1
  151. package/dist/source/headContentUtils.jsx +79 -80
  152. package/dist/source/headContentUtils.jsx.map +1 -1
  153. package/dist/source/link.jsx +145 -112
  154. package/dist/source/link.jsx.map +1 -1
  155. package/dist/source/matchContext.d.ts +8 -2
  156. package/dist/source/matchContext.jsx +7 -3
  157. package/dist/source/matchContext.jsx.map +1 -1
  158. package/dist/source/not-found.d.ts +1 -1
  159. package/dist/source/not-found.jsx +6 -5
  160. package/dist/source/not-found.jsx.map +1 -1
  161. package/dist/source/router.js +2 -1
  162. package/dist/source/router.js.map +1 -1
  163. package/dist/source/routerStores.d.ts +10 -0
  164. package/dist/source/routerStores.js +82 -0
  165. package/dist/source/routerStores.js.map +1 -0
  166. package/dist/source/ssr/RouterClient.jsx +1 -1
  167. package/dist/source/ssr/RouterClient.jsx.map +1 -1
  168. package/dist/source/ssr/renderRouterToStream.jsx +1 -1
  169. package/dist/source/ssr/renderRouterToStream.jsx.map +1 -1
  170. package/dist/source/ssr/renderRouterToString.jsx +1 -1
  171. package/dist/source/ssr/renderRouterToString.jsx.map +1 -1
  172. package/dist/source/useBlocker.jsx +19 -8
  173. package/dist/source/useBlocker.jsx.map +1 -1
  174. package/dist/source/useCanGoBack.d.ts +2 -1
  175. package/dist/source/useCanGoBack.js +4 -2
  176. package/dist/source/useCanGoBack.js.map +1 -1
  177. package/dist/source/useLoaderDeps.jsx +2 -3
  178. package/dist/source/useLoaderDeps.jsx.map +1 -1
  179. package/dist/source/useLocation.jsx +13 -3
  180. package/dist/source/useLocation.jsx.map +1 -1
  181. package/dist/source/useMatch.jsx +33 -23
  182. package/dist/source/useMatch.jsx.map +1 -1
  183. package/dist/source/useParams.jsx +1 -1
  184. package/dist/source/useParams.jsx.map +1 -1
  185. package/dist/source/useRouterState.jsx +14 -55
  186. package/dist/source/useRouterState.jsx.map +1 -1
  187. package/dist/source/useSearch.jsx +2 -1
  188. package/dist/source/useSearch.jsx.map +1 -1
  189. package/dist/source/utils.d.ts +0 -5
  190. package/dist/source/utils.js +2 -15
  191. package/dist/source/utils.js.map +1 -1
  192. package/package.json +7 -7
  193. package/skills/solid-router/SKILL.md +2 -0
  194. package/src/Asset.tsx +3 -3
  195. package/src/HeadContent.dev.tsx +10 -1
  196. package/src/HeadContent.tsx +10 -1
  197. package/src/Match.tsx +395 -349
  198. package/src/Matches.tsx +55 -54
  199. package/src/RouterProvider.tsx +13 -10
  200. package/src/Scripts.tsx +55 -54
  201. package/src/Transitioner.tsx +103 -60
  202. package/src/headContentUtils.tsx +104 -96
  203. package/src/link.tsx +188 -146
  204. package/src/matchContext.tsx +16 -7
  205. package/src/not-found.tsx +6 -6
  206. package/src/router.ts +2 -1
  207. package/src/routerStores.ts +119 -0
  208. package/src/ssr/RouterClient.tsx +1 -1
  209. package/src/ssr/renderRouterToStream.tsx +1 -1
  210. package/src/ssr/renderRouterToString.tsx +1 -1
  211. package/src/useBlocker.tsx +80 -63
  212. package/src/useCanGoBack.ts +6 -2
  213. package/src/useLoaderDeps.tsx +2 -3
  214. package/src/useLocation.tsx +18 -5
  215. package/src/useMatch.tsx +37 -38
  216. package/src/useParams.tsx +2 -3
  217. package/src/useRouterState.tsx +21 -67
  218. package/src/useSearch.tsx +2 -1
  219. package/src/utils.ts +2 -24
package/dist/cjs/link.cjs CHANGED
@@ -1,7 +1,6 @@
1
1
  const require_runtime = require("./_virtual/_rolldown/runtime.cjs");
2
2
  const require_ClientOnly = require("./ClientOnly.cjs");
3
3
  const require_useRouter = require("./useRouter.cjs");
4
- const require_useRouterState = require("./useRouterState.cjs");
5
4
  const require_utils = require("./utils.cjs");
6
5
  let _tanstack_router_core = require("@tanstack/router-core");
7
6
  let _solidjs_web = require("@solidjs/web");
@@ -9,7 +8,7 @@ let solid_js = require("solid-js");
9
8
  solid_js = require_runtime.__toESM(solid_js);
10
9
  let _tanstack_router_core_isServer = require("@tanstack/router-core/isServer");
11
10
  //#region src/link.tsx
12
- var _tmpl$ = /* @__PURE__ */ (0, _solidjs_web.template)(`<svg><a>`);
11
+ var _tmpl$ = /* @__PURE__ */ (0, _solidjs_web.template)(`<svg><a>`), _tmpl$2 = /* @__PURE__ */ (0, _solidjs_web.template)(`<a>`);
13
12
  function mergeRefs(...refs) {
14
13
  return (el) => {
15
14
  for (const ref of refs) if (typeof ref === "function") ref(el);
@@ -26,8 +25,8 @@ function useLinkProps(options) {
26
25
  const hasHydrated = require_ClientOnly.useHydrated();
27
26
  let hasRenderFetched = false;
28
27
  const [local, rest] = splitProps(solid_js.merge({
29
- activeProps: () => ({ class: "active" }),
30
- inactiveProps: () => ({})
28
+ activeProps: STATIC_ACTIVE_PROPS_GET,
29
+ inactiveProps: STATIC_INACTIVE_PROPS_GET
31
30
  }, options), [
32
31
  "activeProps",
33
32
  "inactiveProps",
@@ -63,25 +62,14 @@ function useLinkProps(options) {
63
62
  "reloadDocument",
64
63
  "unsafeRelative"
65
64
  ]);
66
- const currentLocation = require_useRouterState.useRouterState({ select: (s) => s.location });
67
- const buildLocationKey = require_useRouterState.useRouterState({ select: (s) => {
68
- const leaf = s.matches[s.matches.length - 1];
69
- return {
70
- search: leaf?.search,
71
- hash: s.location.hash,
72
- path: leaf?.pathname
73
- };
74
- } });
75
- const from = options.from;
76
- const _options = () => {
77
- return {
78
- ...options,
79
- from
80
- };
81
- };
65
+ const currentLocation = solid_js.createMemo(() => router.stores.location.state, void 0, { equals: (prev, next) => prev?.href === next?.href });
66
+ const _options = () => options;
82
67
  const next = solid_js.createMemo(() => {
83
- buildLocationKey();
84
- return router.buildLocation(_options());
68
+ const options = {
69
+ _fromLocation: currentLocation(),
70
+ ..._options()
71
+ };
72
+ return solid_js.untrack(() => router.buildLocation(options));
85
73
  });
86
74
  const hrefOption = solid_js.createMemo(() => {
87
75
  if (_options().disabled) return void 0;
@@ -106,7 +94,8 @@ function useLinkProps(options) {
106
94
  return _href.href;
107
95
  }
108
96
  const to = _options().to;
109
- if (typeof to === "string" && to.charCodeAt(0) === 47 && to.charCodeAt(1) !== 47) return void 0;
97
+ if (isSafeInternal(to)) return void 0;
98
+ if (typeof to !== "string" || to.indexOf(":") === -1) return void 0;
110
99
  try {
111
100
  new URL(to);
112
101
  if ((0, _tanstack_router_core.isDangerousProtocol)(to, router.protocolAllowlist)) {
@@ -123,22 +112,29 @@ function useLinkProps(options) {
123
112
  const preloadDelay = () => local.preloadDelay ?? router.options.defaultPreloadDelay ?? 0;
124
113
  const isActive = solid_js.createMemo(() => {
125
114
  if (externalLink()) return false;
126
- if (local.activeOptions?.exact) {
127
- if (!(0, _tanstack_router_core.exactPathTest)(currentLocation().pathname, next().pathname, router.basepath)) return false;
115
+ const activeOptions = local.activeOptions;
116
+ const current = currentLocation();
117
+ const nextLocation = next();
118
+ if (activeOptions?.exact) {
119
+ if (!(0, _tanstack_router_core.exactPathTest)(current.pathname, nextLocation.pathname, router.basepath)) return false;
128
120
  } else {
129
- const currentPathSplit = (0, _tanstack_router_core.removeTrailingSlash)(currentLocation().pathname, router.basepath).split("/");
130
- if (!((0, _tanstack_router_core.removeTrailingSlash)(next()?.pathname, router.basepath)?.split("/"))?.every((d, i) => d === currentPathSplit[i])) return false;
121
+ const currentPath = (0, _tanstack_router_core.removeTrailingSlash)(current.pathname, router.basepath);
122
+ const nextPath = (0, _tanstack_router_core.removeTrailingSlash)(nextLocation.pathname, router.basepath);
123
+ if (!(currentPath.startsWith(nextPath) && (currentPath.length === nextPath.length || currentPath[nextPath.length] === "/"))) return false;
131
124
  }
132
- if (local.activeOptions?.includeSearch ?? true) {
133
- if (!(0, _tanstack_router_core.deepEqual)(currentLocation().search, next().search, {
134
- partial: !local.activeOptions?.exact,
135
- ignoreUndefined: !local.activeOptions?.explicitUndefined
125
+ if (activeOptions?.includeSearch ?? true) {
126
+ if (!(0, _tanstack_router_core.deepEqual)(current.search, nextLocation.search, {
127
+ partial: !activeOptions?.exact,
128
+ ignoreUndefined: !activeOptions?.explicitUndefined
136
129
  })) return false;
137
130
  }
138
- if (local.activeOptions?.includeHash) return (shouldHydrateHash && !hasHydrated() ? "" : currentLocation().hash) === next().hash;
131
+ if (activeOptions?.includeHash) return (shouldHydrateHash && !hasHydrated() ? "" : current.hash) === nextLocation.hash;
139
132
  return true;
140
133
  });
141
- const doPreload = () => router.preloadRoute(_options()).catch((err) => {
134
+ const doPreload = () => router.preloadRoute({
135
+ ..._options(),
136
+ _builtLocation: next()
137
+ }).catch((err) => {
142
138
  console.warn(err);
143
139
  console.warn(_tanstack_router_core.preloadWarning);
144
140
  });
@@ -155,33 +151,40 @@ function useLinkProps(options) {
155
151
  solid_js.createEffect(preload, (preloadValue) => {
156
152
  if (hasRenderFetched) return;
157
153
  if (!local.disabled && preloadValue === "render") {
158
- doPreload();
154
+ solid_js.untrack(() => doPreload());
159
155
  hasRenderFetched = true;
160
156
  }
161
157
  });
162
- if (solid_js.untrack(externalLink)) return solid_js.merge(propsSafeToSpread, { href: externalLink() }, splitProps(local, [
163
- "target",
164
- "disabled",
165
- "style",
166
- "class",
167
- "onClick",
168
- "onBlur",
169
- "onFocus",
170
- "onMouseEnter",
171
- "onMouseLeave",
172
- "onMouseOut",
173
- "onMouseOver",
174
- "onTouchStart"
175
- ])[0]);
158
+ if (solid_js.untrack(externalLink)) {
159
+ const externalHref = solid_js.untrack(externalLink);
160
+ return solid_js.merge(propsSafeToSpread, { href: externalHref }, splitProps(local, [
161
+ "target",
162
+ "disabled",
163
+ "style",
164
+ "class",
165
+ "onClick",
166
+ "onBlur",
167
+ "onFocus",
168
+ "onMouseEnter",
169
+ "onMouseLeave",
170
+ "onMouseOut",
171
+ "onMouseOver",
172
+ "onTouchStart"
173
+ ])[0]);
174
+ }
176
175
  const handleClick = (e) => {
177
176
  const elementTarget = e.currentTarget.getAttribute("target");
178
177
  const effectiveTarget = local.target !== void 0 ? local.target : elementTarget;
179
178
  if (!local.disabled && !isCtrlEvent(e) && !e.defaultPrevented && (!effectiveTarget || effectiveTarget === "_self") && e.button === 0) {
180
179
  e.preventDefault();
181
- setIsTransitioning(true);
180
+ solid_js.runWithOwner(null, () => {
181
+ setIsTransitioning(true);
182
+ });
182
183
  const unsub = router.subscribe("onResolved", () => {
183
184
  unsub();
184
- setIsTransitioning(false);
185
+ solid_js.runWithOwner(null, () => {
186
+ setIsTransitioning(false);
187
+ });
185
188
  });
186
189
  router.navigate({
187
190
  ..._options(),
@@ -220,62 +223,89 @@ function useLinkProps(options) {
220
223
  timeoutMap.delete(eventTarget);
221
224
  }
222
225
  };
223
- /** Call a JSX.EventHandlerUnion with the event. */
224
- function callHandler(event, handler) {
225
- if (handler) if (typeof handler === "function") handler(event);
226
- else handler[0](handler[1], event);
227
- return event.defaultPrevented;
228
- }
229
- function composeEventHandlers(handlers) {
230
- return (event) => {
231
- for (const handler of handlers) callHandler(event, handler);
232
- };
233
- }
234
- const resolvedActiveProps = () => isActive() ? (0, _tanstack_router_core.functionalUpdate)(local.activeProps, {}) ?? {} : {};
235
- const resolvedInactiveProps = () => isActive() ? {} : (0, _tanstack_router_core.functionalUpdate)(local.inactiveProps, {});
236
- const resolvedClassName = () => [
237
- local.class,
238
- resolvedActiveProps().class,
239
- resolvedInactiveProps().class
240
- ].filter(Boolean).join(" ");
241
- const resolvedStyle = () => ({
242
- ...local.style,
243
- ...resolvedActiveProps().style,
244
- ...resolvedInactiveProps().style
245
- });
246
- return solid_js.merge(propsSafeToSpread, resolvedActiveProps, resolvedInactiveProps, () => {
247
- return {
226
+ const simpleStyling = solid_js.createMemo(() => local.activeProps === STATIC_ACTIVE_PROPS_GET && local.inactiveProps === STATIC_INACTIVE_PROPS_GET && local.class === void 0 && local.style === void 0);
227
+ const onClick = createComposedHandler(() => local.onClick, handleClick);
228
+ const onBlur = createComposedHandler(() => local.onBlur, handleLeave);
229
+ const onFocus = createComposedHandler(() => local.onFocus, enqueueIntentPreload);
230
+ const onMouseEnter = createComposedHandler(() => local.onMouseEnter, enqueueIntentPreload);
231
+ const onMouseOver = createComposedHandler(() => local.onMouseOver, enqueueIntentPreload);
232
+ const onMouseLeave = createComposedHandler(() => local.onMouseLeave, handleLeave);
233
+ const onMouseOut = createComposedHandler(() => local.onMouseOut, handleLeave);
234
+ const onTouchStart = createComposedHandler(() => local.onTouchStart, handleTouchStart);
235
+ const resolvedProps = solid_js.createMemo(() => {
236
+ const active = isActive();
237
+ const base = {
248
238
  href: hrefOption()?.href,
249
239
  ref: mergeRefs(setRef, _options().ref),
250
- onClick: composeEventHandlers([local.onClick, handleClick]),
251
- onBlur: composeEventHandlers([local.onBlur, handleLeave]),
252
- onFocus: composeEventHandlers([local.onFocus, enqueueIntentPreload]),
253
- onMouseEnter: composeEventHandlers([local.onMouseEnter, enqueueIntentPreload]),
254
- onMouseOver: composeEventHandlers([local.onMouseOver, enqueueIntentPreload]),
255
- onMouseLeave: composeEventHandlers([local.onMouseLeave, handleLeave]),
256
- onMouseOut: composeEventHandlers([local.onMouseOut, handleLeave]),
257
- onTouchStart: composeEventHandlers([local.onTouchStart, handleTouchStart]),
240
+ onClick,
241
+ onBlur,
242
+ onFocus,
243
+ onMouseEnter,
244
+ onMouseOver,
245
+ onMouseLeave,
246
+ onMouseOut,
247
+ onTouchStart,
258
248
  disabled: !!local.disabled,
259
249
  target: local.target,
260
- ...(() => {
261
- const s = resolvedStyle();
262
- return Object.keys(s).length ? { style: s } : {};
263
- })(),
264
- ...(() => {
265
- const c = resolvedClassName();
266
- return c ? { class: c } : {};
267
- })(),
268
- ...local.disabled && {
269
- role: "link",
270
- "aria-disabled": "true"
271
- },
272
- ...isActive() && {
273
- "data-status": "active",
274
- "aria-current": "page"
275
- },
276
- ...isTransitioning() && { "data-transitioning": "transitioning" }
250
+ ...local.disabled && STATIC_DISABLED_PROPS,
251
+ ...isTransitioning() && STATIC_TRANSITIONING_ATTRIBUTES
252
+ };
253
+ if (simpleStyling()) return {
254
+ ...base,
255
+ ...active && STATIC_DEFAULT_ACTIVE_ATTRIBUTES
256
+ };
257
+ const activeProps = active ? (0, _tanstack_router_core.functionalUpdate)(local.activeProps, {}) ?? EMPTY_OBJECT : EMPTY_OBJECT;
258
+ const inactiveProps = active ? EMPTY_OBJECT : (0, _tanstack_router_core.functionalUpdate)(local.inactiveProps, {});
259
+ const style = {
260
+ ...local.style,
261
+ ...activeProps.style,
262
+ ...inactiveProps.style
263
+ };
264
+ const className = [
265
+ local.class,
266
+ activeProps.class,
267
+ inactiveProps.class
268
+ ].filter(Boolean).join(" ");
269
+ return {
270
+ ...activeProps,
271
+ ...inactiveProps,
272
+ ...base,
273
+ ...Object.keys(style).length ? { style } : void 0,
274
+ ...className ? { class: className } : void 0,
275
+ ...active && STATIC_ACTIVE_ATTRIBUTES
277
276
  };
278
277
  });
278
+ return solid_js.merge(propsSafeToSpread, resolvedProps);
279
+ }
280
+ var STATIC_ACTIVE_PROPS = { class: "active" };
281
+ var STATIC_ACTIVE_PROPS_GET = () => STATIC_ACTIVE_PROPS;
282
+ var EMPTY_OBJECT = {};
283
+ var STATIC_INACTIVE_PROPS_GET = () => EMPTY_OBJECT;
284
+ var STATIC_DEFAULT_ACTIVE_ATTRIBUTES = {
285
+ class: "active",
286
+ "data-status": "active",
287
+ "aria-current": "page"
288
+ };
289
+ var STATIC_DISABLED_PROPS = {
290
+ role: "link",
291
+ "aria-disabled": "true"
292
+ };
293
+ var STATIC_ACTIVE_ATTRIBUTES = {
294
+ "data-status": "active",
295
+ "aria-current": "page"
296
+ };
297
+ var STATIC_TRANSITIONING_ATTRIBUTES = { "data-transitioning": "transitioning" };
298
+ /** Call a JSX.EventHandlerUnion with the event. */
299
+ function callHandler(event, handler) {
300
+ if (typeof handler === "function") handler(event);
301
+ else handler[0](handler[1], event);
302
+ return event.defaultPrevented;
303
+ }
304
+ function createComposedHandler(getHandler, fallback) {
305
+ return (event) => {
306
+ const handler = getHandler();
307
+ if (!handler || !callHandler(event, handler)) fallback(event);
308
+ };
279
309
  }
280
310
  function createLink(Comp) {
281
311
  return (props) => (0, _solidjs_web.createComponent)(Link, (0, _solidjs_web.mergeProps)(props, { _asChild: Comp }));
@@ -305,8 +335,14 @@ var Link = (props) => {
305
335
  return _el$;
306
336
  })();
307
337
  }
338
+ if (!local._asChild) return (() => {
339
+ var _el$3 = _tmpl$2();
340
+ (0, _solidjs_web.spread)(_el$3, linkProps, false, true);
341
+ (0, _solidjs_web.insert)(_el$3, children);
342
+ return _el$3;
343
+ })();
308
344
  return (0, _solidjs_web.createComponent)(_solidjs_web.Dynamic, (0, _solidjs_web.mergeProps)({ get component() {
309
- return (0, _solidjs_web.memo)(() => !!local._asChild)() ? local._asChild : "a";
345
+ return local._asChild;
310
346
  } }, linkProps, { get children() {
311
347
  return children();
312
348
  } }));
@@ -314,6 +350,12 @@ var Link = (props) => {
314
350
  function isCtrlEvent(e) {
315
351
  return !!(e.metaKey || e.altKey || e.ctrlKey || e.shiftKey);
316
352
  }
353
+ function isSafeInternal(to) {
354
+ if (typeof to !== "string") return false;
355
+ const zero = to.charCodeAt(0);
356
+ if (zero === 47) return to.charCodeAt(1) !== 47;
357
+ return zero === 46;
358
+ }
317
359
  var linkOptions = (options) => {
318
360
  return options;
319
361
  };
@@ -1 +1 @@
1
- {"version":3,"file":"link.cjs","names":["Solid","deepEqual","exactPathTest","functionalUpdate","isDangerousProtocol","preloadWarning","removeTrailingSlash","isServer","Dynamic","useRouterState","useRouter","useIntersectionObserver","useHydrated","AnyRouter","Constrain","LinkOptions","RegisteredRouter","RoutePaths","ValidateLinkOptions","ValidateLinkOptionsArray","mergeRefs","refs","Array","el","T","ref","splitProps","Record","props","keys","ReadonlyArray","TKey","Pick","Omit","_local","_rest","omit","timeoutMap","WeakMap","EventTarget","ReturnType","setTimeout","useLinkProps","TRouter","TFrom","options","UseLinkPropsOptions","TTo","TMaskFrom","TMaskTo","ComponentProps","router","isTransitioning","setIsTransitioning","createSignal","shouldHydrateHash","ssr","hasHydrated","hasRenderFetched","local","rest","merge","activeProps","class","inactiveProps","_","propsSafeToSpread","currentLocation","select","s","location","buildLocationKey","leaf","matches","length","search","hash","path","pathname","from","_options","result","next","createMemo","buildLocation","hrefOption","disabled","undefined","maskedLocation","publicHref","external","href","history","createHref","externalLink","_href","protocolAllowlist","process","env","NODE_ENV","console","warn","to","isSafeInternal","charCodeAt","URL","preload","reloadDocument","defaultPreload","preloadDelay","defaultPreloadDelay","isActive","activeOptions","exact","testExact","basepath","currentPathSplit","split","nextPathSplit","pathIsFuzzyEqual","every","d","i","includeSearch","searchTest","partial","ignoreUndefined","explicitUndefined","includeHash","currentHash","doPreload","preloadRoute","catch","err","preloadViewportIoCallback","entry","IntersectionObserverEntry","isIntersecting","setRefSignal","Element","setRef","runWithOwner","rootMargin","untrack","createEffect","preloadValue","handleClick","e","MouseEvent","elementTarget","currentTarget","HTMLAnchorElement","SVGAElement","getAttribute","effectiveTarget","target","isCtrlEvent","defaultPrevented","button","preventDefault","unsub","subscribe","navigate","replace","resetScroll","hashScrollIntoView","startTransition","viewTransition","ignoreBlocker","enqueueIntentPreload","FocusEvent","eventTarget","has","set","delete","handleTouchStart","TouchEvent","handleLeave","id","get","clearTimeout","callHandler","Event","event","TEvent","handler","JSX","EventHandlerUnion","composeEventHandlers","handlers","resolvedActiveProps","style","CSSProperties","resolvedInactiveProps","resolvedClassName","filter","Boolean","join","resolvedStyle","onClick","onBlur","onFocus","onMouseEnter","onMouseOver","onMouseLeave","onMouseOut","onTouchStart","Object","c","role","ActiveLinkOptions","ActiveLinkOptionProps","TComp","ActiveLinkProps","Partial","LinkComponentSolidProps","key","LinkProps","LinkPropsChildren","children","state","ValidComponent","CreateLinkProps","LinkComponentProps","LinkComponent","TDefaultFrom","LinkComponentRoute","defaultFrom","createLink","Comp","_$createComponent","Link","_$mergeProps","_asChild","linkProps","resolvedChildren","ch","Function","svgLinkProps","_el$","_tmpl$","_el$2","firstChild","_$spread","_$insert","component","_$memo","metaKey","altKey","ctrlKey","shiftKey","LinkOptionsFnOptions","TOptions","LinkOptionsFn","linkOptions"],"sources":["../../src/link.tsx"],"sourcesContent":["import * as Solid from 'solid-js'\n\nimport {\n deepEqual,\n exactPathTest,\n functionalUpdate,\n isDangerousProtocol,\n preloadWarning,\n removeTrailingSlash,\n} from '@tanstack/router-core'\n\nimport { isServer } from '@tanstack/router-core/isServer'\nimport { Dynamic } from '@solidjs/web'\nimport { useRouterState } from './useRouterState'\nimport { useRouter } from './useRouter'\n\nimport { useIntersectionObserver } from './utils'\n\nimport { useHydrated } from './ClientOnly'\nimport type {\n AnyRouter,\n Constrain,\n LinkOptions,\n RegisteredRouter,\n RoutePaths,\n} from '@tanstack/router-core'\nimport type {\n ValidateLinkOptions,\n ValidateLinkOptionsArray,\n} from './typePrimitives'\n\nfunction mergeRefs<T>(\n ...refs: Array<((el: T) => void) | undefined>\n): (el: T) => void {\n return (el: T) => {\n for (const ref of refs) {\n if (typeof ref === 'function') {\n ref(el)\n }\n }\n }\n}\n\nfunction splitProps<T extends Record<string, any>, TKey extends keyof T>(\n props: T,\n keys: ReadonlyArray<TKey>,\n): [Pick<T, TKey>, Omit<T, TKey>] {\n const _local = {} as Pick<T, TKey>\n const _rest = {} as Omit<T, TKey>\n\n // A safe way to polyfill splitProps if native getter copy is too complex\n // is just to return [props, Solid.omit(props, keys)] but it modifies typing.\n // Actually, Solid.omit exists!\n // Note: Solid.omit uses rest params (...keys), so we must spread the array.\n return [props as any, Solid.omit(props, ...(keys as any)) as any]\n}\nconst timeoutMap = new WeakMap<EventTarget, ReturnType<typeof setTimeout>>()\n\nexport function useLinkProps<\n TRouter extends AnyRouter = RegisteredRouter,\n TFrom extends RoutePaths<TRouter['routeTree']> | string = string,\n TTo extends string = '',\n TMaskFrom extends RoutePaths<TRouter['routeTree']> | string = TFrom,\n TMaskTo extends string = '',\n>(\n options: UseLinkPropsOptions<TRouter, TFrom, TTo, TMaskFrom, TMaskTo>,\n): Solid.ComponentProps<'a'> {\n const router = useRouter()\n const [isTransitioning, setIsTransitioning] = Solid.createSignal(false)\n const shouldHydrateHash = !isServer && !!router.options.ssr\n const hasHydrated = useHydrated()\n\n let hasRenderFetched = false\n\n const [local, rest] = splitProps(\n Solid.merge(\n {\n activeProps: () => ({ class: 'active' }),\n inactiveProps: () => ({}),\n },\n options,\n ),\n [\n 'activeProps',\n 'inactiveProps',\n 'activeOptions',\n 'to',\n 'preload',\n 'preloadDelay',\n 'hashScrollIntoView',\n 'replace',\n 'startTransition',\n 'resetScroll',\n 'viewTransition',\n 'target',\n 'disabled',\n 'style',\n 'class',\n 'onClick',\n 'onBlur',\n 'onFocus',\n 'onMouseEnter',\n 'onMouseLeave',\n 'onMouseOver',\n 'onMouseOut',\n 'onTouchStart',\n 'ignoreBlocker',\n ],\n )\n\n const [_, propsSafeToSpread] = splitProps(rest, [\n 'params',\n 'search',\n 'hash',\n 'state',\n 'mask',\n 'reloadDocument',\n 'unsafeRelative',\n ] as any)\n\n const currentLocation = useRouterState({\n select: (s) => s.location,\n })\n\n const buildLocationKey = useRouterState({\n select: (s) => {\n const leaf = s.matches[s.matches.length - 1]\n return {\n search: leaf?.search,\n hash: s.location.hash,\n path: leaf?.pathname, // path + params\n }\n },\n })\n\n const from = options.from\n\n const _options = () => {\n const result = {\n ...options,\n from,\n }\n return result\n }\n\n const next = Solid.createMemo(() => {\n buildLocationKey()\n return router.buildLocation(_options() as any)\n })\n\n const hrefOption = Solid.createMemo(() => {\n if (_options().disabled) return undefined\n // Use publicHref - it contains the correct href for display\n // When a rewrite changes the origin, publicHref is the full URL\n // Otherwise it's the origin-stripped path\n // This avoids constructing URL objects in the hot path\n const location = next().maskedLocation ?? next()\n const publicHref = location.publicHref\n const external = location.external\n\n if (external) {\n return { href: publicHref, external: true }\n }\n\n return {\n href: router.history.createHref(publicHref) || '/',\n external: false,\n }\n })\n\n const externalLink = Solid.createMemo(() => {\n const _href = hrefOption()\n if (_href?.external) {\n // Block dangerous protocols for external links\n if (isDangerousProtocol(_href.href, router.protocolAllowlist)) {\n if (process.env.NODE_ENV !== 'production') {\n console.warn(`Blocked Link with dangerous protocol: ${_href.href}`)\n }\n return undefined\n }\n return _href.href\n }\n const to = _options().to\n const isSafeInternal =\n typeof to === 'string' &&\n to.charCodeAt(0) === 47 && // '/'\n to.charCodeAt(1) !== 47 // but not '//'\n if (isSafeInternal) return undefined\n try {\n new URL(to as any)\n // Block dangerous protocols like javascript:, blob:, data:\n if (isDangerousProtocol(to as string, router.protocolAllowlist)) {\n if (process.env.NODE_ENV !== 'production') {\n console.warn(`Blocked Link with dangerous protocol: ${to}`)\n }\n return undefined\n }\n return to\n } catch {}\n return undefined\n })\n\n const preload = Solid.createMemo(() => {\n if (_options().reloadDocument || externalLink()) {\n return false\n }\n return local.preload ?? router.options.defaultPreload\n })\n const preloadDelay = () =>\n local.preloadDelay ?? router.options.defaultPreloadDelay ?? 0\n\n const isActive = Solid.createMemo(() => {\n if (externalLink()) return false\n if (local.activeOptions?.exact) {\n const testExact = exactPathTest(\n currentLocation().pathname,\n next().pathname,\n router.basepath,\n )\n if (!testExact) {\n return false\n }\n } else {\n const currentPathSplit = removeTrailingSlash(\n currentLocation().pathname,\n router.basepath,\n ).split('/')\n const nextPathSplit = removeTrailingSlash(\n next()?.pathname,\n router.basepath,\n )?.split('/')\n\n const pathIsFuzzyEqual = nextPathSplit?.every(\n (d, i) => d === currentPathSplit[i],\n )\n if (!pathIsFuzzyEqual) {\n return false\n }\n }\n\n if (local.activeOptions?.includeSearch ?? true) {\n const searchTest = deepEqual(currentLocation().search, next().search, {\n partial: !local.activeOptions?.exact,\n ignoreUndefined: !local.activeOptions?.explicitUndefined,\n })\n if (!searchTest) {\n return false\n }\n }\n\n if (local.activeOptions?.includeHash) {\n const currentHash =\n shouldHydrateHash && !hasHydrated() ? '' : currentLocation().hash\n return currentHash === next().hash\n }\n return true\n })\n\n const doPreload = () =>\n router.preloadRoute(_options() as any).catch((err: any) => {\n console.warn(err)\n console.warn(preloadWarning)\n })\n\n const preloadViewportIoCallback = (\n entry: IntersectionObserverEntry | undefined,\n ) => {\n if (entry?.isIntersecting) {\n doPreload()\n }\n }\n\n const [ref, setRefSignal] = Solid.createSignal<Element | null>(null)\n\n const setRef = (el: Element | null) => {\n Solid.runWithOwner(null, () => {\n setRefSignal(el)\n })\n }\n\n useIntersectionObserver(\n ref,\n preloadViewportIoCallback,\n { rootMargin: '100px' },\n { disabled: !!local.disabled || !(Solid.untrack(preload) === 'viewport') },\n )\n\n Solid.createEffect(preload, (preloadValue) => {\n if (hasRenderFetched) {\n return\n }\n if (!local.disabled && preloadValue === 'render') {\n doPreload()\n hasRenderFetched = true\n }\n })\n\n if (Solid.untrack(externalLink)) {\n return Solid.merge(\n propsSafeToSpread,\n {\n // ref: mergeRefs(setRef, _options().ref),\n href: externalLink(),\n },\n splitProps(local, [\n 'target',\n 'disabled',\n 'style',\n 'class',\n 'onClick',\n 'onBlur',\n 'onFocus',\n 'onMouseEnter',\n 'onMouseLeave',\n 'onMouseOut',\n 'onMouseOver',\n 'onTouchStart',\n ])[0],\n ) as any\n }\n\n // The click handler\n const handleClick = (e: MouseEvent) => {\n // Check actual element's target attribute as fallback\n const elementTarget = (\n e.currentTarget as HTMLAnchorElement | SVGAElement\n ).getAttribute('target')\n const effectiveTarget =\n local.target !== undefined ? local.target : elementTarget\n\n if (\n !local.disabled &&\n !isCtrlEvent(e) &&\n !e.defaultPrevented &&\n (!effectiveTarget || effectiveTarget === '_self') &&\n e.button === 0\n ) {\n e.preventDefault()\n\n setIsTransitioning(true)\n\n const unsub = router.subscribe('onResolved', () => {\n unsub()\n setIsTransitioning(false)\n })\n\n // All is well? Navigate!\n // N.B. we don't call `router.commitLocation(next) here because we want to run `validateSearch` before committing\n router.navigate({\n ..._options(),\n replace: local.replace,\n resetScroll: local.resetScroll,\n hashScrollIntoView: local.hashScrollIntoView,\n startTransition: local.startTransition,\n viewTransition: local.viewTransition,\n ignoreBlocker: local.ignoreBlocker,\n })\n }\n }\n\n const enqueueIntentPreload = (e: MouseEvent | FocusEvent) => {\n if (local.disabled || preload() !== 'intent') return\n\n if (!preloadDelay()) {\n doPreload()\n return\n }\n\n const eventTarget = e.currentTarget || e.target\n\n if (!eventTarget || timeoutMap.has(eventTarget)) return\n\n timeoutMap.set(\n eventTarget,\n setTimeout(() => {\n timeoutMap.delete(eventTarget)\n doPreload()\n }, preloadDelay()),\n )\n }\n\n const handleTouchStart = (_: TouchEvent) => {\n if (local.disabled || preload() !== 'intent') return\n doPreload()\n }\n\n const handleLeave = (e: MouseEvent | FocusEvent) => {\n if (local.disabled) return\n const eventTarget = e.currentTarget || e.target\n\n if (eventTarget) {\n const id = timeoutMap.get(eventTarget)\n clearTimeout(id)\n timeoutMap.delete(eventTarget)\n }\n }\n\n /** Call a JSX.EventHandlerUnion with the event. */\n function callHandler<T, TEvent extends Event>(\n event: TEvent & { currentTarget: T; target: Element },\n handler: Solid.JSX.EventHandlerUnion<T, TEvent> | undefined,\n ) {\n if (handler) {\n if (typeof handler === 'function') {\n handler(event)\n } else {\n handler[0](handler[1], event)\n }\n }\n\n return event.defaultPrevented\n }\n\n function composeEventHandlers<T>(\n handlers: Array<Solid.JSX.EventHandlerUnion<T, any> | undefined>,\n ) {\n return (event: any) => {\n for (const handler of handlers) {\n callHandler(event, handler)\n }\n }\n }\n\n // Get the active props\n const resolvedActiveProps: () => Omit<Solid.ComponentProps<'a'>, 'style'> & {\n style?: Solid.JSX.CSSProperties\n } = () =>\n isActive() ? (functionalUpdate(local.activeProps as any, {}) ?? {}) : {}\n\n // Get the inactive props\n const resolvedInactiveProps: () => Omit<\n Solid.ComponentProps<'a'>,\n 'style'\n > & { style?: Solid.JSX.CSSProperties } = () =>\n isActive() ? {} : functionalUpdate(local.inactiveProps, {})\n\n const resolvedClassName = () =>\n [local.class, resolvedActiveProps().class, resolvedInactiveProps().class]\n .filter(Boolean)\n .join(' ')\n\n const resolvedStyle = () => ({\n ...local.style,\n ...resolvedActiveProps().style,\n ...resolvedInactiveProps().style,\n })\n\n return Solid.merge(\n propsSafeToSpread,\n resolvedActiveProps,\n resolvedInactiveProps,\n () => {\n return {\n href: hrefOption()?.href,\n ref: mergeRefs(setRef, (_options() as any).ref),\n onClick: composeEventHandlers([local.onClick, handleClick]),\n onBlur: composeEventHandlers([local.onBlur, handleLeave]),\n onFocus: composeEventHandlers([local.onFocus, enqueueIntentPreload]),\n onMouseEnter: composeEventHandlers([\n local.onMouseEnter,\n enqueueIntentPreload,\n ]),\n onMouseOver: composeEventHandlers([\n local.onMouseOver,\n enqueueIntentPreload,\n ]),\n onMouseLeave: composeEventHandlers([local.onMouseLeave, handleLeave]),\n onMouseOut: composeEventHandlers([local.onMouseOut, handleLeave]),\n onTouchStart: composeEventHandlers([\n local.onTouchStart,\n handleTouchStart,\n ]),\n disabled: !!local.disabled,\n target: local.target,\n ...(() => {\n const s = resolvedStyle()\n return Object.keys(s).length ? { style: s } : {}\n })(),\n ...(() => {\n const c = resolvedClassName()\n return c ? { class: c } : {}\n })(),\n ...(local.disabled && {\n role: 'link',\n 'aria-disabled': 'true',\n }),\n ...(isActive() && { 'data-status': 'active', 'aria-current': 'page' }),\n ...(isTransitioning() && { 'data-transitioning': 'transitioning' }),\n }\n },\n ) as any\n}\n\nexport type UseLinkPropsOptions<\n TRouter extends AnyRouter = RegisteredRouter,\n TFrom extends RoutePaths<TRouter['routeTree']> | string = string,\n TTo extends string | undefined = '.',\n TMaskFrom extends RoutePaths<TRouter['routeTree']> | string = TFrom,\n TMaskTo extends string = '.',\n> = ActiveLinkOptions<'a', TRouter, TFrom, TTo, TMaskFrom, TMaskTo> &\n Omit<Solid.ComponentProps<'a'>, 'style'> & { style?: Solid.JSX.CSSProperties }\n\nexport type ActiveLinkOptions<\n TComp = 'a',\n TRouter extends AnyRouter = RegisteredRouter,\n TFrom extends string = string,\n TTo extends string | undefined = '.',\n TMaskFrom extends string = TFrom,\n TMaskTo extends string = '.',\n> = LinkOptions<TRouter, TFrom, TTo, TMaskFrom, TMaskTo> &\n ActiveLinkOptionProps<TComp>\n\ntype ActiveLinkProps<TComp> = Partial<\n LinkComponentSolidProps<TComp> & {\n [key: `data-${string}`]: unknown\n }\n>\n\nexport interface ActiveLinkOptionProps<TComp = 'a'> {\n /**\n * A function that returns additional props for the `active` state of this link.\n * These props override other props passed to the link (`style`'s are merged, `class`'s are concatenated)\n */\n activeProps?: ActiveLinkProps<TComp> | (() => ActiveLinkProps<TComp>)\n /**\n * A function that returns additional props for the `inactive` state of this link.\n * These props override other props passed to the link (`style`'s are merged, `class`'s are concatenated)\n */\n inactiveProps?: ActiveLinkProps<TComp> | (() => ActiveLinkProps<TComp>)\n}\n\nexport type LinkProps<\n TComp = 'a',\n TRouter extends AnyRouter = RegisteredRouter,\n TFrom extends string = string,\n TTo extends string | undefined = '.',\n TMaskFrom extends string = TFrom,\n TMaskTo extends string = '.',\n> = ActiveLinkOptions<TComp, TRouter, TFrom, TTo, TMaskFrom, TMaskTo> &\n LinkPropsChildren\n\nexport interface LinkPropsChildren {\n // If a function is passed as a child, it will be given the `isActive` boolean to aid in further styling on the element it returns\n children?:\n | Solid.JSX.Element\n | ((state: {\n isActive: boolean\n isTransitioning: boolean\n }) => Solid.JSX.Element)\n}\n\ntype LinkComponentSolidProps<TComp> = TComp extends Solid.ValidComponent\n ? Omit<Solid.ComponentProps<TComp>, keyof CreateLinkProps>\n : never\n\nexport type LinkComponentProps<\n TComp = 'a',\n TRouter extends AnyRouter = RegisteredRouter,\n TFrom extends string = string,\n TTo extends string | undefined = '.',\n TMaskFrom extends string = TFrom,\n TMaskTo extends string = '.',\n> = LinkComponentSolidProps<TComp> &\n LinkProps<TComp, TRouter, TFrom, TTo, TMaskFrom, TMaskTo>\n\nexport type CreateLinkProps = LinkProps<\n any,\n any,\n string,\n string,\n string,\n string\n>\n\nexport type LinkComponent<\n in out TComp,\n in out TDefaultFrom extends string = string,\n> = <\n TRouter extends AnyRouter = RegisteredRouter,\n const TFrom extends string = TDefaultFrom,\n const TTo extends string | undefined = undefined,\n const TMaskFrom extends string = TFrom,\n const TMaskTo extends string = '',\n>(\n props: LinkComponentProps<TComp, TRouter, TFrom, TTo, TMaskFrom, TMaskTo>,\n) => Solid.JSX.Element\n\nexport interface LinkComponentRoute<\n in out TDefaultFrom extends string = string,\n> {\n defaultFrom: TDefaultFrom;\n <\n TRouter extends AnyRouter = RegisteredRouter,\n const TTo extends string | undefined = undefined,\n const TMaskTo extends string = '',\n >(\n props: LinkComponentProps<\n 'a',\n TRouter,\n this['defaultFrom'],\n TTo,\n this['defaultFrom'],\n TMaskTo\n >,\n ): Solid.JSX.Element\n}\n\nexport function createLink<const TComp>(\n Comp: Constrain<TComp, any, (props: CreateLinkProps) => Solid.JSX.Element>,\n): LinkComponent<TComp> {\n return (props) => <Link {...props} _asChild={Comp} />\n}\n\nexport const Link: LinkComponent<'a'> = (props) => {\n const [local, rest] = splitProps(props as typeof props & { _asChild: any }, [\n '_asChild',\n 'children',\n ])\n\n const [_, linkProps] = splitProps(useLinkProps(rest as unknown as any), [\n 'type',\n ])\n\n // Resolve children once using Solid.children to avoid\n // re-accessing the children getter (which in Solid 2.0 would\n // re-invoke createComponent each time for JSX children).\n const resolvedChildren = Solid.children(\n () => local.children as Solid.JSX.Element,\n )\n\n const children = () => {\n const ch = resolvedChildren()\n if (typeof ch === 'function') {\n return (ch as Function)({\n get isActive() {\n return (linkProps as any)['data-status'] === 'active'\n },\n get isTransitioning() {\n return (linkProps as any)['data-transitioning'] === 'transitioning'\n },\n })\n }\n\n return ch\n }\n\n if (local._asChild === 'svg') {\n const [_, svgLinkProps] = splitProps(linkProps as any, ['class'])\n return (\n <svg>\n <a {...svgLinkProps}>{children()}</a>\n </svg>\n )\n }\n\n return (\n <Dynamic component={local._asChild ? local._asChild : 'a'} {...linkProps}>\n {children()}\n </Dynamic>\n )\n}\n\nfunction isCtrlEvent(e: MouseEvent) {\n return !!(e.metaKey || e.altKey || e.ctrlKey || e.shiftKey)\n}\n\nexport type LinkOptionsFnOptions<\n TOptions,\n TComp,\n TRouter extends AnyRouter = RegisteredRouter,\n> =\n TOptions extends ReadonlyArray<any>\n ? ValidateLinkOptionsArray<TRouter, TOptions, string, TComp>\n : ValidateLinkOptions<TRouter, TOptions, string, TComp>\n\nexport type LinkOptionsFn<TComp> = <\n const TOptions,\n TRouter extends AnyRouter = RegisteredRouter,\n>(\n options: LinkOptionsFnOptions<TOptions, TComp, TRouter>,\n) => TOptions\n\nexport const linkOptions: LinkOptionsFn<'a'> = (options) => {\n return options as any\n}\n"],"mappings":"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"}
1
+ {"version":3,"file":"link.cjs","names":["Solid","deepEqual","exactPathTest","functionalUpdate","isDangerousProtocol","preloadWarning","removeTrailingSlash","isServer","Dynamic","useRouter","useIntersectionObserver","useHydrated","AnyRouter","Constrain","LinkOptions","RegisteredRouter","RoutePaths","ValidateLinkOptions","ValidateLinkOptionsArray","mergeRefs","refs","Array","el","T","ref","splitProps","Record","props","keys","ReadonlyArray","TKey","Pick","Omit","_local","_rest","omit","timeoutMap","WeakMap","EventTarget","ReturnType","setTimeout","useLinkProps","TRouter","TFrom","options","UseLinkPropsOptions","TTo","TMaskFrom","TMaskTo","ComponentProps","router","isTransitioning","setIsTransitioning","createSignal","shouldHydrateHash","ssr","hasHydrated","hasRenderFetched","local","rest","merge","activeProps","STATIC_ACTIVE_PROPS_GET","inactiveProps","STATIC_INACTIVE_PROPS_GET","_","propsSafeToSpread","currentLocation","createMemo","stores","location","state","undefined","equals","prev","next","href","_options","_fromLocation","untrack","buildLocation","hrefOption","disabled","maskedLocation","publicHref","external","history","createHref","externalLink","_href","protocolAllowlist","process","env","NODE_ENV","console","warn","to","safeInternal","isSafeInternal","indexOf","URL","preload","reloadDocument","defaultPreload","preloadDelay","defaultPreloadDelay","isActive","activeOptions","current","nextLocation","exact","testExact","pathname","basepath","currentPath","nextPath","pathIsFuzzyEqual","startsWith","length","includeSearch","searchTest","search","partial","ignoreUndefined","explicitUndefined","includeHash","currentHash","hash","doPreload","preloadRoute","_builtLocation","catch","err","preloadViewportIoCallback","entry","IntersectionObserverEntry","isIntersecting","setRefSignal","Element","setRef","runWithOwner","rootMargin","createEffect","preloadValue","externalHref","handleClick","e","MouseEvent","elementTarget","currentTarget","HTMLAnchorElement","SVGAElement","getAttribute","effectiveTarget","target","isCtrlEvent","defaultPrevented","button","preventDefault","unsub","subscribe","navigate","replace","resetScroll","hashScrollIntoView","startTransition","viewTransition","ignoreBlocker","enqueueIntentPreload","FocusEvent","eventTarget","has","set","delete","handleTouchStart","TouchEvent","handleLeave","id","get","clearTimeout","simpleStyling","class","style","onClick","createComposedHandler","onBlur","onFocus","onMouseEnter","onMouseOver","onMouseLeave","onMouseOut","onTouchStart","ResolvedLinkStateProps","JSX","CSSProperties","resolvedProps","active","base","STATIC_DISABLED_PROPS","STATIC_TRANSITIONING_ATTRIBUTES","STATIC_DEFAULT_ACTIVE_ATTRIBUTES","EMPTY_OBJECT","className","filter","Boolean","join","Object","STATIC_ACTIVE_ATTRIBUTES","STATIC_ACTIVE_PROPS","role","callHandler","Event","event","TEvent","handler","EventHandlerUnion","getHandler","fallback","ActiveLinkOptions","ActiveLinkOptionProps","TComp","ActiveLinkProps","Partial","LinkComponentSolidProps","key","LinkProps","LinkPropsChildren","children","ValidComponent","CreateLinkProps","LinkComponentProps","LinkComponent","TDefaultFrom","LinkComponentRoute","defaultFrom","createLink","Comp","_$createComponent","Link","_$mergeProps","_asChild","linkProps","resolvedChildren","ch","Function","svgLinkProps","_el$","_tmpl$","_el$2","firstChild","_$spread","_$insert","_el$3","_tmpl$2","component","metaKey","altKey","ctrlKey","shiftKey","zero","charCodeAt","LinkOptionsFnOptions","TOptions","LinkOptionsFn","linkOptions"],"sources":["../../src/link.tsx"],"sourcesContent":["import * as Solid from 'solid-js'\n\nimport {\n deepEqual,\n exactPathTest,\n functionalUpdate,\n isDangerousProtocol,\n preloadWarning,\n removeTrailingSlash,\n} from '@tanstack/router-core'\n\nimport { isServer } from '@tanstack/router-core/isServer'\nimport { Dynamic } from '@solidjs/web'\nimport { useRouter } from './useRouter'\n\nimport { useIntersectionObserver } from './utils'\n\nimport { useHydrated } from './ClientOnly'\nimport type {\n AnyRouter,\n Constrain,\n LinkOptions,\n RegisteredRouter,\n RoutePaths,\n} from '@tanstack/router-core'\nimport type {\n ValidateLinkOptions,\n ValidateLinkOptionsArray,\n} from './typePrimitives'\n\nfunction mergeRefs<T>(\n ...refs: Array<((el: T) => void) | undefined>\n): (el: T) => void {\n return (el: T) => {\n for (const ref of refs) {\n if (typeof ref === 'function') {\n ref(el)\n }\n }\n }\n}\n\nfunction splitProps<T extends Record<string, any>, TKey extends keyof T>(\n props: T,\n keys: ReadonlyArray<TKey>,\n): [Pick<T, TKey>, Omit<T, TKey>] {\n const _local = {} as Pick<T, TKey>\n const _rest = {} as Omit<T, TKey>\n\n // A safe way to polyfill splitProps if native getter copy is too complex\n // is just to return [props, Solid.omit(props, keys)] but it modifies typing.\n // Actually, Solid.omit exists!\n // Note: Solid.omit uses rest params (...keys), so we must spread the array.\n return [props as any, Solid.omit(props, ...(keys as any)) as any]\n}\nconst timeoutMap = new WeakMap<EventTarget, ReturnType<typeof setTimeout>>()\n\nexport function useLinkProps<\n TRouter extends AnyRouter = RegisteredRouter,\n TFrom extends RoutePaths<TRouter['routeTree']> | string = string,\n TTo extends string = '',\n TMaskFrom extends RoutePaths<TRouter['routeTree']> | string = TFrom,\n TMaskTo extends string = '',\n>(\n options: UseLinkPropsOptions<TRouter, TFrom, TTo, TMaskFrom, TMaskTo>,\n): Solid.ComponentProps<'a'> {\n const router = useRouter()\n const [isTransitioning, setIsTransitioning] = Solid.createSignal(false)\n const shouldHydrateHash = !isServer && !!router.options.ssr\n const hasHydrated = useHydrated()\n\n let hasRenderFetched = false\n\n const [local, rest] = splitProps(\n Solid.merge(\n {\n activeProps: STATIC_ACTIVE_PROPS_GET,\n inactiveProps: STATIC_INACTIVE_PROPS_GET,\n },\n options,\n ),\n [\n 'activeProps',\n 'inactiveProps',\n 'activeOptions',\n 'to',\n 'preload',\n 'preloadDelay',\n 'hashScrollIntoView',\n 'replace',\n 'startTransition',\n 'resetScroll',\n 'viewTransition',\n 'target',\n 'disabled',\n 'style',\n 'class',\n 'onClick',\n 'onBlur',\n 'onFocus',\n 'onMouseEnter',\n 'onMouseLeave',\n 'onMouseOver',\n 'onMouseOut',\n 'onTouchStart',\n 'ignoreBlocker',\n ],\n )\n\n const [_, propsSafeToSpread] = splitProps(rest, [\n 'params',\n 'search',\n 'hash',\n 'state',\n 'mask',\n 'reloadDocument',\n 'unsafeRelative',\n ] as any)\n\n const currentLocation = Solid.createMemo(\n () => router.stores.location.state,\n undefined,\n { equals: (prev, next) => prev?.href === next?.href },\n )\n\n const _options = () => options\n\n const next = Solid.createMemo(() => {\n // Rebuild when inherited search/hash or the current route context changes.\n const _fromLocation = currentLocation()\n const options = { _fromLocation, ..._options() } as any\n // untrack because router-core will also access stores, which are signals in solid\n return Solid.untrack(() => router.buildLocation(options))\n })\n\n const hrefOption = Solid.createMemo(() => {\n if (_options().disabled) return undefined\n // Use publicHref - it contains the correct href for display\n // When a rewrite changes the origin, publicHref is the full URL\n // Otherwise it's the origin-stripped path\n // This avoids constructing URL objects in the hot path\n const location = next().maskedLocation ?? next()\n const publicHref = location.publicHref\n const external = location.external\n\n if (external) {\n return { href: publicHref, external: true }\n }\n\n return {\n href: router.history.createHref(publicHref) || '/',\n external: false,\n }\n })\n\n const externalLink = Solid.createMemo(() => {\n const _href = hrefOption()\n if (_href?.external) {\n // Block dangerous protocols for external links\n if (isDangerousProtocol(_href.href, router.protocolAllowlist)) {\n if (process.env.NODE_ENV !== 'production') {\n console.warn(`Blocked Link with dangerous protocol: ${_href.href}`)\n }\n return undefined\n }\n return _href.href\n }\n const to = _options().to\n const safeInternal = isSafeInternal(to)\n if (safeInternal) return undefined\n if (typeof to !== 'string' || to.indexOf(':') === -1) return undefined\n try {\n new URL(to as any)\n // Block dangerous protocols like javascript:, blob:, data:\n if (isDangerousProtocol(to, router.protocolAllowlist)) {\n if (process.env.NODE_ENV !== 'production') {\n console.warn(`Blocked Link with dangerous protocol: ${to}`)\n }\n return undefined\n }\n return to\n } catch {}\n return undefined\n })\n\n const preload = Solid.createMemo(() => {\n if (_options().reloadDocument || externalLink()) {\n return false\n }\n return local.preload ?? router.options.defaultPreload\n })\n const preloadDelay = () =>\n local.preloadDelay ?? router.options.defaultPreloadDelay ?? 0\n\n const isActive = Solid.createMemo(() => {\n if (externalLink()) return false\n const activeOptions = local.activeOptions\n const current = currentLocation()\n const nextLocation = next()\n\n if (activeOptions?.exact) {\n const testExact = exactPathTest(\n current.pathname,\n nextLocation.pathname,\n router.basepath,\n )\n if (!testExact) {\n return false\n }\n } else {\n const currentPath = removeTrailingSlash(current.pathname, router.basepath)\n const nextPath = removeTrailingSlash(\n nextLocation.pathname,\n router.basepath,\n )\n\n const pathIsFuzzyEqual =\n currentPath.startsWith(nextPath) &&\n (currentPath.length === nextPath.length ||\n currentPath[nextPath.length] === '/')\n if (!pathIsFuzzyEqual) {\n return false\n }\n }\n\n if (activeOptions?.includeSearch ?? true) {\n const searchTest = deepEqual(current.search, nextLocation.search, {\n partial: !activeOptions?.exact,\n ignoreUndefined: !activeOptions?.explicitUndefined,\n })\n if (!searchTest) {\n return false\n }\n }\n\n if (activeOptions?.includeHash) {\n const currentHash =\n shouldHydrateHash && !hasHydrated() ? '' : current.hash\n return currentHash === nextLocation.hash\n }\n return true\n })\n\n const doPreload = () =>\n router\n .preloadRoute({ ..._options(), _builtLocation: next() } as any)\n .catch((err: any) => {\n console.warn(err)\n console.warn(preloadWarning)\n })\n\n const preloadViewportIoCallback = (\n entry: IntersectionObserverEntry | undefined,\n ) => {\n if (entry?.isIntersecting) {\n doPreload()\n }\n }\n\n const [ref, setRefSignal] = Solid.createSignal<Element | null>(null)\n\n const setRef = (el: Element | null) => {\n Solid.runWithOwner(null, () => {\n setRefSignal(el)\n })\n }\n\n useIntersectionObserver(\n ref,\n preloadViewportIoCallback,\n { rootMargin: '100px' },\n { disabled: !!local.disabled || !(Solid.untrack(preload) === 'viewport') },\n )\n\n Solid.createEffect(preload, (preloadValue) => {\n if (hasRenderFetched) {\n return\n }\n if (!local.disabled && preloadValue === 'render') {\n Solid.untrack(() => doPreload())\n hasRenderFetched = true\n }\n })\n\n if (Solid.untrack(externalLink)) {\n const externalHref = Solid.untrack(externalLink)\n return Solid.merge(\n propsSafeToSpread,\n {\n // ref: mergeRefs(setRef, _options().ref),\n href: externalHref,\n },\n splitProps(local, [\n 'target',\n 'disabled',\n 'style',\n 'class',\n 'onClick',\n 'onBlur',\n 'onFocus',\n 'onMouseEnter',\n 'onMouseLeave',\n 'onMouseOut',\n 'onMouseOver',\n 'onTouchStart',\n ])[0],\n ) as any\n }\n\n // The click handler\n const handleClick = (e: MouseEvent) => {\n // Check actual element's target attribute as fallback\n const elementTarget = (\n e.currentTarget as HTMLAnchorElement | SVGAElement\n ).getAttribute('target')\n const effectiveTarget =\n local.target !== undefined ? local.target : elementTarget\n\n if (\n !local.disabled &&\n !isCtrlEvent(e) &&\n !e.defaultPrevented &&\n (!effectiveTarget || effectiveTarget === '_self') &&\n e.button === 0\n ) {\n e.preventDefault()\n\n Solid.runWithOwner(null, () => {\n setIsTransitioning(true)\n })\n\n const unsub = router.subscribe('onResolved', () => {\n unsub()\n Solid.runWithOwner(null, () => {\n setIsTransitioning(false)\n })\n })\n\n // All is well? Navigate!\n // N.B. we don't call `router.commitLocation(next) here because we want to run `validateSearch` before committing\n router.navigate({\n ..._options(),\n replace: local.replace,\n resetScroll: local.resetScroll,\n hashScrollIntoView: local.hashScrollIntoView,\n startTransition: local.startTransition,\n viewTransition: local.viewTransition,\n ignoreBlocker: local.ignoreBlocker,\n })\n }\n }\n\n const enqueueIntentPreload = (e: MouseEvent | FocusEvent) => {\n if (local.disabled || preload() !== 'intent') return\n\n if (!preloadDelay()) {\n doPreload()\n return\n }\n\n const eventTarget = e.currentTarget || e.target\n\n if (!eventTarget || timeoutMap.has(eventTarget)) return\n\n timeoutMap.set(\n eventTarget,\n setTimeout(() => {\n timeoutMap.delete(eventTarget)\n doPreload()\n }, preloadDelay()),\n )\n }\n\n const handleTouchStart = (_: TouchEvent) => {\n if (local.disabled || preload() !== 'intent') return\n doPreload()\n }\n\n const handleLeave = (e: MouseEvent | FocusEvent) => {\n if (local.disabled) return\n const eventTarget = e.currentTarget || e.target\n\n if (eventTarget) {\n const id = timeoutMap.get(eventTarget)\n clearTimeout(id)\n timeoutMap.delete(eventTarget)\n }\n }\n\n const simpleStyling = Solid.createMemo(\n () =>\n local.activeProps === STATIC_ACTIVE_PROPS_GET &&\n local.inactiveProps === STATIC_INACTIVE_PROPS_GET &&\n local.class === undefined &&\n local.style === undefined,\n )\n\n const onClick = createComposedHandler(() => local.onClick, handleClick)\n const onBlur = createComposedHandler(() => local.onBlur, handleLeave)\n const onFocus = createComposedHandler(\n () => local.onFocus,\n enqueueIntentPreload,\n )\n const onMouseEnter = createComposedHandler(\n () => local.onMouseEnter,\n enqueueIntentPreload,\n )\n const onMouseOver = createComposedHandler(\n () => local.onMouseOver,\n enqueueIntentPreload,\n )\n const onMouseLeave = createComposedHandler(\n () => local.onMouseLeave,\n handleLeave,\n )\n const onMouseOut = createComposedHandler(() => local.onMouseOut, handleLeave)\n const onTouchStart = createComposedHandler(\n () => local.onTouchStart,\n handleTouchStart,\n )\n\n type ResolvedLinkStateProps = Omit<Solid.ComponentProps<'a'>, 'style'> & {\n style?: Solid.JSX.CSSProperties\n }\n\n const resolvedProps = Solid.createMemo(() => {\n const active = isActive()\n\n const base = {\n href: hrefOption()?.href,\n ref: mergeRefs(setRef, _options().ref as any),\n onClick,\n onBlur,\n onFocus,\n onMouseEnter,\n onMouseOver,\n onMouseLeave,\n onMouseOut,\n onTouchStart,\n disabled: !!local.disabled,\n target: local.target,\n ...(local.disabled && STATIC_DISABLED_PROPS),\n ...(isTransitioning() && STATIC_TRANSITIONING_ATTRIBUTES),\n }\n\n if (simpleStyling()) {\n return {\n ...base,\n ...(active && STATIC_DEFAULT_ACTIVE_ATTRIBUTES),\n }\n }\n\n const activeProps: ResolvedLinkStateProps = active\n ? (functionalUpdate(local.activeProps as any, {}) ?? EMPTY_OBJECT)\n : EMPTY_OBJECT\n const inactiveProps: ResolvedLinkStateProps = active\n ? EMPTY_OBJECT\n : functionalUpdate(local.inactiveProps, {})\n const style = {\n ...local.style,\n ...activeProps.style,\n ...inactiveProps.style,\n }\n const className = [local.class, activeProps.class, inactiveProps.class]\n .filter(Boolean)\n .join(' ')\n\n return {\n ...activeProps,\n ...inactiveProps,\n ...base,\n ...(Object.keys(style).length ? { style } : undefined),\n ...(className ? { class: className } : undefined),\n ...(active && STATIC_ACTIVE_ATTRIBUTES),\n } as ResolvedLinkStateProps\n })\n\n return Solid.merge(propsSafeToSpread, resolvedProps) as any\n}\n\nconst STATIC_ACTIVE_PROPS = { class: 'active' }\nconst STATIC_ACTIVE_PROPS_GET = () => STATIC_ACTIVE_PROPS\nconst EMPTY_OBJECT = {}\nconst STATIC_INACTIVE_PROPS_GET = () => EMPTY_OBJECT\nconst STATIC_DEFAULT_ACTIVE_ATTRIBUTES = {\n class: 'active',\n 'data-status': 'active',\n 'aria-current': 'page',\n}\nconst STATIC_DISABLED_PROPS = {\n role: 'link',\n 'aria-disabled': 'true',\n}\nconst STATIC_ACTIVE_ATTRIBUTES = {\n 'data-status': 'active',\n 'aria-current': 'page',\n}\nconst STATIC_TRANSITIONING_ATTRIBUTES = {\n 'data-transitioning': 'transitioning',\n}\n\n/** Call a JSX.EventHandlerUnion with the event. */\nfunction callHandler<T, TEvent extends Event>(\n event: TEvent & { currentTarget: T; target: Element },\n handler: Solid.JSX.EventHandlerUnion<T, TEvent>,\n) {\n if (typeof handler === 'function') {\n handler(event)\n } else {\n handler[0](handler[1], event)\n }\n return event.defaultPrevented\n}\n\nfunction createComposedHandler<T, TEvent extends Event>(\n getHandler: () => Solid.JSX.EventHandlerUnion<T, TEvent> | undefined,\n fallback: (event: TEvent) => void,\n) {\n return (event: TEvent & { currentTarget: T; target: Element }) => {\n const handler = getHandler()\n if (!handler || !callHandler(event, handler)) fallback(event)\n }\n}\n\nexport type UseLinkPropsOptions<\n TRouter extends AnyRouter = RegisteredRouter,\n TFrom extends RoutePaths<TRouter['routeTree']> | string = string,\n TTo extends string | undefined = '.',\n TMaskFrom extends RoutePaths<TRouter['routeTree']> | string = TFrom,\n TMaskTo extends string = '.',\n> = ActiveLinkOptions<'a', TRouter, TFrom, TTo, TMaskFrom, TMaskTo> &\n Omit<Solid.ComponentProps<'a'>, 'style'> & { style?: Solid.JSX.CSSProperties }\n\nexport type ActiveLinkOptions<\n TComp = 'a',\n TRouter extends AnyRouter = RegisteredRouter,\n TFrom extends string = string,\n TTo extends string | undefined = '.',\n TMaskFrom extends string = TFrom,\n TMaskTo extends string = '.',\n> = LinkOptions<TRouter, TFrom, TTo, TMaskFrom, TMaskTo> &\n ActiveLinkOptionProps<TComp>\n\ntype ActiveLinkProps<TComp> = Partial<\n LinkComponentSolidProps<TComp> & {\n [key: `data-${string}`]: unknown\n }\n>\n\nexport interface ActiveLinkOptionProps<TComp = 'a'> {\n /**\n * A function that returns additional props for the `active` state of this link.\n * These props override other props passed to the link (`style`'s are merged, `class`'s are concatenated)\n */\n activeProps?: ActiveLinkProps<TComp> | (() => ActiveLinkProps<TComp>)\n /**\n * A function that returns additional props for the `inactive` state of this link.\n * These props override other props passed to the link (`style`'s are merged, `class`'s are concatenated)\n */\n inactiveProps?: ActiveLinkProps<TComp> | (() => ActiveLinkProps<TComp>)\n}\n\nexport type LinkProps<\n TComp = 'a',\n TRouter extends AnyRouter = RegisteredRouter,\n TFrom extends string = string,\n TTo extends string | undefined = '.',\n TMaskFrom extends string = TFrom,\n TMaskTo extends string = '.',\n> = ActiveLinkOptions<TComp, TRouter, TFrom, TTo, TMaskFrom, TMaskTo> &\n LinkPropsChildren\n\nexport interface LinkPropsChildren {\n // If a function is passed as a child, it will be given the `isActive` boolean to aid in further styling on the element it returns\n children?:\n | Solid.JSX.Element\n | ((state: {\n isActive: boolean\n isTransitioning: boolean\n }) => Solid.JSX.Element)\n}\n\ntype LinkComponentSolidProps<TComp> = TComp extends Solid.ValidComponent\n ? Omit<Solid.ComponentProps<TComp>, keyof CreateLinkProps>\n : never\n\nexport type LinkComponentProps<\n TComp = 'a',\n TRouter extends AnyRouter = RegisteredRouter,\n TFrom extends string = string,\n TTo extends string | undefined = '.',\n TMaskFrom extends string = TFrom,\n TMaskTo extends string = '.',\n> = LinkComponentSolidProps<TComp> &\n LinkProps<TComp, TRouter, TFrom, TTo, TMaskFrom, TMaskTo>\n\nexport type CreateLinkProps = LinkProps<\n any,\n any,\n string,\n string,\n string,\n string\n>\n\nexport type LinkComponent<\n in out TComp,\n in out TDefaultFrom extends string = string,\n> = <\n TRouter extends AnyRouter = RegisteredRouter,\n const TFrom extends string = TDefaultFrom,\n const TTo extends string | undefined = undefined,\n const TMaskFrom extends string = TFrom,\n const TMaskTo extends string = '',\n>(\n props: LinkComponentProps<TComp, TRouter, TFrom, TTo, TMaskFrom, TMaskTo>,\n) => Solid.JSX.Element\n\nexport interface LinkComponentRoute<\n in out TDefaultFrom extends string = string,\n> {\n defaultFrom: TDefaultFrom;\n <\n TRouter extends AnyRouter = RegisteredRouter,\n const TTo extends string | undefined = undefined,\n const TMaskTo extends string = '',\n >(\n props: LinkComponentProps<\n 'a',\n TRouter,\n this['defaultFrom'],\n TTo,\n this['defaultFrom'],\n TMaskTo\n >,\n ): Solid.JSX.Element\n}\n\nexport function createLink<const TComp>(\n Comp: Constrain<TComp, any, (props: CreateLinkProps) => Solid.JSX.Element>,\n): LinkComponent<TComp> {\n return (props) => <Link {...props} _asChild={Comp} />\n}\n\nexport const Link: LinkComponent<'a'> = (props) => {\n const [local, rest] = splitProps(props as typeof props & { _asChild: any }, [\n '_asChild',\n 'children',\n ])\n\n const [_, linkProps] = splitProps(useLinkProps(rest as unknown as any), [\n 'type',\n ])\n\n // Resolve children once using Solid.children to avoid\n // re-accessing the children getter (which in Solid 2.0 would\n // re-invoke createComponent each time for JSX children).\n const resolvedChildren = Solid.children(\n () => local.children as Solid.JSX.Element,\n )\n\n const children = () => {\n const ch = resolvedChildren()\n if (typeof ch === 'function') {\n return (ch as Function)({\n get isActive() {\n return (linkProps as any)['data-status'] === 'active'\n },\n get isTransitioning() {\n return (linkProps as any)['data-transitioning'] === 'transitioning'\n },\n })\n }\n\n return ch\n }\n\n if (local._asChild === 'svg') {\n const [_, svgLinkProps] = splitProps(linkProps as any, ['class'])\n return (\n <svg>\n <a {...svgLinkProps}>{children()}</a>\n </svg>\n )\n }\n\n if (!local._asChild) {\n return <a {...linkProps}>{children()}</a>\n }\n\n return (\n <Dynamic component={local._asChild as Solid.ValidComponent} {...linkProps}>\n {children()}\n </Dynamic>\n )\n}\n\nfunction isCtrlEvent(e: MouseEvent) {\n return !!(e.metaKey || e.altKey || e.ctrlKey || e.shiftKey)\n}\n\nfunction isSafeInternal(to: unknown) {\n if (typeof to !== 'string') return false\n const zero = to.charCodeAt(0)\n if (zero === 47) return to.charCodeAt(1) !== 47 // '/' but not '//'\n return zero === 46 // '.', '..', './', '../'\n}\n\nexport type LinkOptionsFnOptions<\n TOptions,\n TComp,\n TRouter extends AnyRouter = RegisteredRouter,\n> =\n TOptions extends ReadonlyArray<any>\n ? ValidateLinkOptionsArray<TRouter, TOptions, string, TComp>\n : ValidateLinkOptions<TRouter, TOptions, string, TComp>\n\nexport type LinkOptionsFn<TComp> = <\n const TOptions,\n TRouter extends AnyRouter = RegisteredRouter,\n>(\n options: LinkOptionsFnOptions<TOptions, TComp, TRouter>,\n) => TOptions\n\nexport const linkOptions: LinkOptionsFn<'a'> = (options) => {\n return options as any\n}\n"],"mappings":"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"}
@@ -1,11 +1,13 @@
1
1
  const require_runtime = require("./_virtual/_rolldown/runtime.cjs");
2
2
  let solid_js = require("solid-js");
3
3
  solid_js = require_runtime.__toESM(solid_js);
4
- //#region src/matchContext.tsx
5
- var matchContext = solid_js.createContext(() => void 0);
6
- var dummyMatchContext = solid_js.createContext(() => void 0);
4
+ var nearestMatchContext = solid_js.createContext({
5
+ matchId: () => void 0,
6
+ routeId: () => void 0,
7
+ match: () => void 0,
8
+ hasPending: () => false
9
+ });
7
10
  //#endregion
8
- exports.dummyMatchContext = dummyMatchContext;
9
- exports.matchContext = matchContext;
11
+ exports.nearestMatchContext = nearestMatchContext;
10
12
 
11
13
  //# sourceMappingURL=matchContext.cjs.map
@@ -1 +1 @@
1
- {"version":3,"file":"matchContext.cjs","names":["Solid","matchContext","createContext","Accessor","undefined","dummyMatchContext"],"sources":["../../src/matchContext.tsx"],"sourcesContent":["import * as Solid from 'solid-js'\n\nexport const matchContext = Solid.createContext<\n Solid.Accessor<string | undefined>\n>(() => undefined)\n\n// N.B. this only exists so we can conditionally call useContext on it when we are not interested in the nearest match\nexport const dummyMatchContext = Solid.createContext<\n Solid.Accessor<string | undefined>\n>(() => undefined)\n"],"mappings":";;;;AAEA,IAAaC,eAAeD,SAAME,oBAE1BE,KAAAA,EAAU;AAGlB,IAAaC,oBAAoBL,SAAME,oBAE/BE,KAAAA,EAAU"}
1
+ {"version":3,"file":"matchContext.cjs","names":["Solid","AnyRouteMatch","NearestMatchContextValue","matchId","Accessor","routeId","match","hasPending","defaultNearestMatchContext","undefined","nearestMatchContext","createContext"],"sources":["../../src/matchContext.tsx"],"sourcesContent":["import * as Solid from 'solid-js'\nimport type { AnyRouteMatch } from '@tanstack/router-core'\n\nexport type NearestMatchContextValue = {\n matchId: Solid.Accessor<string | undefined>\n routeId: Solid.Accessor<string | undefined>\n match: Solid.Accessor<AnyRouteMatch | undefined>\n hasPending: Solid.Accessor<boolean>\n}\n\nconst defaultNearestMatchContext: NearestMatchContextValue = {\n matchId: () => undefined,\n routeId: () => undefined,\n match: () => undefined,\n hasPending: () => false,\n}\n\nexport const nearestMatchContext =\n Solid.createContext<NearestMatchContextValue>(defaultNearestMatchContext)\n"],"mappings":";;;AAiBA,IAAaU,sBACXV,SAAMW,cARqD;CAC3DR,eAAeM,KAAAA;CACfJ,eAAeI,KAAAA;CACfH,aAAaG,KAAAA;CACbF,kBAAkB;CACnB,CAG0E"}
@@ -1,3 +1,9 @@
1
+ import { AnyRouteMatch } from '@tanstack/router-core';
1
2
  import * as Solid from 'solid-js';
2
- export declare const matchContext: Solid.Context<Solid.Accessor<string | undefined>>;
3
- export declare const dummyMatchContext: Solid.Context<Solid.Accessor<string | undefined>>;
3
+ export type NearestMatchContextValue = {
4
+ matchId: Solid.Accessor<string | undefined>;
5
+ routeId: Solid.Accessor<string | undefined>;
6
+ match: Solid.Accessor<AnyRouteMatch | undefined>;
7
+ hasPending: Solid.Accessor<boolean>;
8
+ };
9
+ export declare const nearestMatchContext: Solid.Context<NearestMatchContextValue>;
@@ -1,14 +1,18 @@
1
- require("./_virtual/_rolldown/runtime.cjs");
1
+ const require_runtime = require("./_virtual/_rolldown/runtime.cjs");
2
2
  const require_CatchBoundary = require("./CatchBoundary.cjs");
3
- const require_useRouterState = require("./useRouterState.cjs");
3
+ const require_useRouter = require("./useRouter.cjs");
4
4
  let _tanstack_router_core = require("@tanstack/router-core");
5
5
  let _solidjs_web = require("@solidjs/web");
6
+ let solid_js = require("solid-js");
7
+ solid_js = require_runtime.__toESM(solid_js);
6
8
  //#region src/not-found.tsx
7
9
  var _tmpl$ = /* @__PURE__ */ (0, _solidjs_web.template)(`<p>Not Found`);
8
10
  function CatchNotFound(props) {
9
- const resetKey = require_useRouterState.useRouterState({ select: (s) => `not-found-${s.location.pathname}-${s.status}` });
11
+ const router = require_useRouter.useRouter();
12
+ const pathname = solid_js.createMemo(() => router.stores.location.state.pathname);
13
+ const status = solid_js.createMemo(() => router.stores.status.state);
10
14
  return (0, _solidjs_web.createComponent)(require_CatchBoundary.CatchBoundary, {
11
- getResetKey: () => resetKey(),
15
+ getResetKey: () => `not-found-${pathname()}-${status()}`,
12
16
  onCatch: (error) => {
13
17
  if ((0, _tanstack_router_core.isNotFound)(error)) props.onCatch?.(error);
14
18
  else throw error;
@@ -1 +1 @@
1
- {"version":3,"file":"not-found.cjs","names":["isNotFound","CatchBoundary","useRouterState","Solid","NotFoundError","CatchNotFound","props","fallback","error","JSX","Element","onCatch","Error","children","resetKey","select","s","location","pathname","status","_$createComponent","getResetKey","errorComponent","DefaultGlobalNotFound","_tmpl$"],"sources":["../../src/not-found.tsx"],"sourcesContent":["import { isNotFound } from '@tanstack/router-core'\nimport { CatchBoundary } from './CatchBoundary'\nimport { useRouterState } from './useRouterState'\nimport type * as Solid from 'solid-js'\nimport type { NotFoundError } from '@tanstack/router-core'\n\nexport function CatchNotFound(props: {\n fallback?: (error: NotFoundError) => Solid.JSX.Element\n onCatch?: (error: Error) => void\n children: Solid.JSX.Element\n}) {\n // TODO: Some way for the user to programmatically reset the not-found boundary?\n const resetKey = useRouterState({\n select: (s) => `not-found-${s.location.pathname}-${s.status}`,\n })\n\n return (\n <CatchBoundary\n getResetKey={() => resetKey()}\n onCatch={(error) => {\n if (isNotFound(error)) {\n props.onCatch?.(error)\n } else {\n throw error\n }\n }}\n errorComponent={({ error }) => {\n if (isNotFound(error)) {\n return props.fallback?.(error)\n } else {\n throw error\n }\n }}\n >\n {props.children}\n </CatchBoundary>\n )\n}\n\nexport function DefaultGlobalNotFound() {\n return <p>Not Found</p>\n}\n"],"mappings":";;;;;;;AAMA,SAAgBK,cAAcC,OAI3B;CAED,MAAMQ,WAAWZ,uBAAAA,eAAe,EAC9Ba,SAASC,MAAM,aAAaA,EAAEC,SAASC,SAAQ,GAAIF,EAAEG,UACtD,CAAC;AAEF,SAAA,GAAA,aAAA,iBACGlB,sBAAAA,eAAa;EACZoB,mBAAmBP,UAAU;EAC7BH,UAAUH,UAAU;AAClB,QAAA,GAAA,sBAAA,YAAeA,MAAM,CACnBF,OAAMK,UAAUH,MAAM;OAEtB,OAAMA;;EAGVc,iBAAiB,EAAEd,YAAY;AAC7B,QAAA,GAAA,sBAAA,YAAeA,MAAM,CACnB,QAAOF,MAAMC,WAAWC,MAAM;OAE9B,OAAMA;;EAET,IAAAK,WAAA;AAAA,UAEAP,MAAMO;;EAAQ,CAAA;;AAKrB,SAAgBU,wBAAwB;AACtC,QAAAC,QAAA"}
1
+ {"version":3,"file":"not-found.cjs","names":["isNotFound","Solid","CatchBoundary","useRouter","NotFoundError","CatchNotFound","props","fallback","error","JSX","Element","onCatch","Error","children","router","pathname","createMemo","stores","location","state","status","_$createComponent","getResetKey","errorComponent","DefaultGlobalNotFound","_tmpl$"],"sources":["../../src/not-found.tsx"],"sourcesContent":["import { isNotFound } from '@tanstack/router-core'\nimport * as Solid from 'solid-js'\nimport { CatchBoundary } from './CatchBoundary'\nimport { useRouter } from './useRouter'\nimport type { NotFoundError } from '@tanstack/router-core'\n\nexport function CatchNotFound(props: {\n fallback?: (error: NotFoundError) => Solid.JSX.Element\n onCatch?: (error: Error) => void\n children: Solid.JSX.Element\n}) {\n const router = useRouter()\n // TODO: Some way for the user to programmatically reset the not-found boundary?\n const pathname = Solid.createMemo(() => router.stores.location.state.pathname)\n const status = Solid.createMemo(() => router.stores.status.state)\n\n return (\n <CatchBoundary\n getResetKey={() => `not-found-${pathname()}-${status()}`}\n onCatch={(error) => {\n if (isNotFound(error)) {\n props.onCatch?.(error)\n } else {\n throw error\n }\n }}\n errorComponent={({ error }) => {\n if (isNotFound(error)) {\n return props.fallback?.(error)\n } else {\n throw error\n }\n }}\n >\n {props.children}\n </CatchBoundary>\n )\n}\n\nexport function DefaultGlobalNotFound() {\n return <p>Not Found</p>\n}\n"],"mappings":";;;;;;;;;AAMA,SAAgBK,cAAcC,OAI3B;CACD,MAAMQ,SAASX,kBAAAA,WAAW;CAE1B,MAAMY,WAAWd,SAAMe,iBAAiBF,OAAOG,OAAOC,SAASC,MAAMJ,SAAS;CAC9E,MAAMK,SAASnB,SAAMe,iBAAiBF,OAAOG,OAAOG,OAAOD,MAAM;AAEjE,SAAA,GAAA,aAAA,iBACGjB,sBAAAA,eAAa;EACZoB,mBAAmB,aAAaP,UAAU,CAAA,GAAIK,QAAQ;EACtDT,UAAUH,UAAU;AAClB,QAAA,GAAA,sBAAA,YAAeA,MAAM,CACnBF,OAAMK,UAAUH,MAAM;OAEtB,OAAMA;;EAGVe,iBAAiB,EAAEf,YAAY;AAC7B,QAAA,GAAA,sBAAA,YAAeA,MAAM,CACnB,QAAOF,MAAMC,WAAWC,MAAM;OAE9B,OAAMA;;EAET,IAAAK,WAAA;AAAA,UAEAP,MAAMO;;EAAQ,CAAA;;AAKrB,SAAgBW,wBAAwB;AACtC,QAAAC,QAAA"}
@@ -1,5 +1,5 @@
1
1
  import { NotFoundError } from '@tanstack/router-core';
2
- import type * as Solid from 'solid-js';
2
+ import * as Solid from 'solid-js';
3
3
  export declare function CatchNotFound(props: {
4
4
  fallback?: (error: NotFoundError) => Solid.JSX.Element;
5
5
  onCatch?: (error: Error) => void;
@@ -1,5 +1,6 @@
1
1
  require("./_virtual/_rolldown/runtime.cjs");
2
2
  const require_fileRoute = require("./fileRoute.cjs");
3
+ const require_routerStores = require("./routerStores.cjs");
3
4
  let _tanstack_router_core = require("@tanstack/router-core");
4
5
  //#region src/router.ts
5
6
  var createRouter = (options) => {
@@ -7,7 +8,7 @@ var createRouter = (options) => {
7
8
  };
8
9
  var Router = class extends _tanstack_router_core.RouterCore {
9
10
  constructor(options) {
10
- super(options);
11
+ super(options, require_routerStores.getStoreFactory);
11
12
  }
12
13
  };
13
14
  if (typeof globalThis !== "undefined") {