@tanstack/solid-router 2.0.0-alpha.1 → 2.0.0-alpha.3

package/dist/esm/ScriptOnce.js

@@ -1,24 +1,21 @@
-import { template, effect, setAttribute } from "@solidjs/web";
-import { isServer } from "@tanstack/router-core/isServer";
 import { useRouter } from "./useRouter.js";
+import { effect, setAttribute, template } from "@solidjs/web";
+import { isServer } from "@tanstack/router-core/isServer";
+//#region src/ScriptOnce.tsx
 var _tmpl$ = /* @__PURE__ */ template(`<script class=$tsr>`);
-function ScriptOnce({
-  children
-}) {
-  const router = useRouter();
-  if (!(isServer ?? router.isServer)) {
-    return null;
-  }
-  return (() => {
-    var _el$ = _tmpl$();
-    _el$.innerHTML = children + ";document.currentScript.remove()";
-    effect(() => router.options.ssr?.nonce, (_v$) => {
-      setAttribute(_el$, "nonce", _v$);
-    });
-    return _el$;
-  })();
+function ScriptOnce({ children }) {
+	const router = useRouter();
+	if (!(isServer ?? router.isServer)) return null;
+	return (() => {
+		var _el$ = _tmpl$();
+		_el$.innerHTML = children + ";document.currentScript.remove()";
+		effect(() => router.options.ssr?.nonce, (_v$) => {
+			setAttribute(_el$, "nonce", _v$);
+		});
+		return _el$;
+	})();
 }
-export {
-  ScriptOnce
-};
-//# sourceMappingURL=ScriptOnce.js.map
+//#endregion
+export { ScriptOnce };
+
+//# sourceMappingURL=ScriptOnce.js.map

package/dist/esm/ScriptOnce.js.map

@@ -1 +1 @@
-{"version":3,"file":"ScriptOnce.js","sources":["../../src/ScriptOnce.tsx"],"sourcesContent":["import { isServer } from '@tanstack/router-core/isServer'\nimport { useRouter } from './useRouter'\n\nexport function ScriptOnce({\n  children,\n}: {\n  children: string\n  log?: boolean\n  sync?: boolean\n}) {\n  const router = useRouter()\n  if (!(isServer ?? router.isServer)) {\n    return null\n  }\n  return (\n    <script\n      nonce={router.options.ssr?.nonce}\n      class=\"$tsr\"\n      innerHTML={children + ';document.currentScript.remove()'}\n    />\n  )\n}\n"],"names":["ScriptOnce","children","router","useRouter","isServer","_el$","_tmpl$","innerHTML","_$effect","options","ssr","nonce","_v$","_$setAttribute"],"mappings":";;;;AAGO,SAASA,WAAW;AAAA,EACzBC;AAKF,GAAG;AACD,QAAMC,SAASC,UAAAA;AACf,MAAI,EAAEC,YAAYF,OAAOE,WAAW;AAClC,WAAO;AAAA,EACT;AACA,UAAA,MAAA;AAAA,QAAAC,OAAAC,OAAAA;AAAAD,SAAAE,YAIeN,WAAW;AAAkCO,WAAA,MAFjDN,OAAOO,QAAQC,KAAKC,OAAKC,CAAAA,QAAA;AAAAC,mBAAAR,MAAA,SAAAO,GAAA;AAAA,IAAA,CAAA;AAAA,WAAAP;AAAAA,EAAA,GAAA;AAKtC;"}
+{"version":3,"file":"ScriptOnce.js","names":["isServer","useRouter","ScriptOnce","children","log","sync","router","_el$","_tmpl$","innerHTML","_$effect","options","ssr","nonce","_v$","_$setAttribute"],"sources":["../../src/ScriptOnce.tsx"],"sourcesContent":["import { isServer } from '@tanstack/router-core/isServer'\nimport { useRouter } from './useRouter'\n\nexport function ScriptOnce({\n  children,\n}: {\n  children: string\n  log?: boolean\n  sync?: boolean\n}) {\n  const router = useRouter()\n  if (!(isServer ?? router.isServer)) {\n    return null\n  }\n  return (\n    <script\n      nonce={router.options.ssr?.nonce}\n      class=\"$tsr\"\n      innerHTML={children + ';document.currentScript.remove()'}\n    />\n  )\n}\n"],"mappings":";;;;;AAGA,SAAgBE,WAAW,EACzBC,YAKC;CACD,MAAMG,SAASL,WAAW;AAC1B,KAAI,EAAED,YAAYM,OAAON,UACvB,QAAO;AAET,eAAA;EAAA,IAAAO,OAAAC,QAAA;AAAAD,OAAAE,YAIeN,WAAW;AAAkCO,eAFjDJ,OAAOK,QAAQC,KAAKC,QAAKC,QAAA;AAAAC,gBAAAR,MAAA,SAAAO,IAAA;IAAA;AAAA,SAAAP;KAAA"}

package/dist/esm/Scripts.js

@@ -1,60 +1,44 @@
-import { createComponent, NoHydration } from "@solidjs/web";
-import { Asset } from "./Asset.js";
-import { useRouterState } from "./useRouterState.js";
 import { useRouter } from "./useRouter.js";
-const Scripts = () => {
-  const router = useRouter();
-  const nonce = router.options.ssr?.nonce;
-  const assetScripts = useRouterState({
-    select: (state) => {
-      const assetScripts2 = [];
-      const manifest = router.ssr?.manifest;
-      if (!manifest) {
-        return [];
-      }
-      state.matches.map((match) => router.looseRoutesById[match.routeId]).forEach((route) => manifest.routes[route.id]?.assets?.filter((d) => d.tag === "script").forEach((asset) => {
-        assetScripts2.push({
-          tag: "script",
-          attrs: {
-            ...asset.attrs,
-            nonce
-          },
-          children: asset.children
-        });
-      }));
-      return assetScripts2;
-    }
-  });
-  const scripts = useRouterState({
-    select: (state) => ({
-      scripts: state.matches.map((match) => match.scripts).flat(1).filter(Boolean).map(({
-        children,
-        ...script
-      }) => ({
-        tag: "script",
-        attrs: {
-          ...script,
-          nonce
-        },
-        children
-      }))
-    })
-  });
-  let serverBufferedScript = void 0;
-  if (router.serverSsr) {
-    serverBufferedScript = router.serverSsr.takeBufferedScripts();
-  }
-  const allScripts = [...scripts().scripts, ...assetScripts()];
-  if (serverBufferedScript) {
-    allScripts.unshift(serverBufferedScript);
-  }
-  return createComponent(NoHydration, {
-    get children() {
-      return allScripts.map((asset, _i) => createComponent(Asset, asset));
-    }
-  });
-};
-export {
-  Scripts
+import { useRouterState } from "./useRouterState.js";
+import { Asset } from "./Asset.js";
+import { NoHydration, createComponent } from "@solidjs/web";
+//#region src/Scripts.tsx
+var Scripts = () => {
+	const router = useRouter();
+	const nonce = router.options.ssr?.nonce;
+	const assetScripts = useRouterState({ select: (state) => {
+		const assetScripts = [];
+		const manifest = router.ssr?.manifest;
+		if (!manifest) return [];
+		state.matches.map((match) => router.looseRoutesById[match.routeId]).forEach((route) => manifest.routes[route.id]?.assets?.filter((d) => d.tag === "script").forEach((asset) => {
+			assetScripts.push({
+				tag: "script",
+				attrs: {
+					...asset.attrs,
+					nonce
+				},
+				children: asset.children
+			});
+		}));
+		return assetScripts;
+	} });
+	const scripts = useRouterState({ select: (state) => ({ scripts: state.matches.map((match) => match.scripts).flat(1).filter(Boolean).map(({ children, ...script }) => ({
+		tag: "script",
+		attrs: {
+			...script,
+			nonce
+		},
+		children
+	})) }) });
+	let serverBufferedScript = void 0;
+	if (router.serverSsr) serverBufferedScript = router.serverSsr.takeBufferedScripts();
+	const allScripts = [...scripts().scripts, ...assetScripts()];
+	if (serverBufferedScript) allScripts.unshift(serverBufferedScript);
+	return createComponent(NoHydration, { get children() {
+		return allScripts.map((asset, _i) => createComponent(Asset, asset));
+	} });
 };
-//# sourceMappingURL=Scripts.js.map
+//#endregion
+export { Scripts };
+
+//# sourceMappingURL=Scripts.js.map

package/dist/esm/Scripts.js.map

@@ -1 +1 @@
-{"version":3,"file":"Scripts.js","sources":["../../src/Scripts.tsx"],"sourcesContent":["import { NoHydration } from '@solidjs/web'\nimport { Asset } from './Asset'\nimport { useRouterState } from './useRouterState'\nimport { useRouter } from './useRouter'\nimport type { RouterManagedTag } from '@tanstack/router-core'\n\nexport const Scripts = () => {\n  const router = useRouter()\n  const nonce = router.options.ssr?.nonce\n  const assetScripts = useRouterState({\n    select: (state) => {\n      const assetScripts: Array<RouterManagedTag> = []\n      const manifest = router.ssr?.manifest\n\n      if (!manifest) {\n        return []\n      }\n\n      state.matches\n        .map((match) => router.looseRoutesById[match.routeId]!)\n        .forEach((route) =>\n          manifest.routes[route.id]?.assets\n            ?.filter((d) => d.tag === 'script')\n            .forEach((asset) => {\n              assetScripts.push({\n                tag: 'script',\n                attrs: { ...asset.attrs, nonce },\n                children: asset.children,\n              } as any)\n            }),\n        )\n\n      return assetScripts\n    },\n  })\n\n  const scripts = useRouterState({\n    select: (state) => ({\n      scripts: (\n        state.matches\n          .map((match) => match.scripts!)\n          .flat(1)\n          .filter(Boolean) as Array<RouterManagedTag>\n      ).map(({ children, ...script }) => ({\n        tag: 'script',\n        attrs: {\n          ...script,\n          nonce,\n        },\n        children,\n      })),\n    }),\n  })\n\n  let serverBufferedScript: RouterManagedTag | undefined = undefined\n\n  if (router.serverSsr) {\n    serverBufferedScript = router.serverSsr.takeBufferedScripts()\n  }\n\n  const allScripts = [\n    ...scripts().scripts,\n    ...assetScripts(),\n  ] as Array<RouterManagedTag>\n\n  if (serverBufferedScript) {\n    allScripts.unshift(serverBufferedScript)\n  }\n\n  return (\n    <NoHydration>\n      {allScripts.map((asset, _i) => (\n        <Asset {...asset} />\n      ))}\n    </NoHydration>\n  )\n}\n"],"names":["Scripts","router","useRouter","nonce","options","ssr","assetScripts","useRouterState","select","state","manifest","matches","map","match","looseRoutesById","routeId","forEach","route","routes","id","assets","filter","d","tag","asset","push","attrs","children","scripts","flat","Boolean","script","serverBufferedScript","undefined","serverSsr","takeBufferedScripts","allScripts","unshift","_$createComponent","NoHydration","_i","Asset"],"mappings":";;;;AAMO,MAAMA,UAAUA,MAAM;AAC3B,QAAMC,SAASC,UAAAA;AACf,QAAMC,QAAQF,OAAOG,QAAQC,KAAKF;AAClC,QAAMG,eAAeC,eAAe;AAAA,IAClCC,QAASC,CAAAA,UAAU;AACjB,YAAMH,gBAAwC,CAAA;AAC9C,YAAMI,WAAWT,OAAOI,KAAKK;AAE7B,UAAI,CAACA,UAAU;AACb,eAAO,CAAA;AAAA,MACT;AAEAD,YAAME,QACHC,IAAKC,CAAAA,UAAUZ,OAAOa,gBAAgBD,MAAME,OAAO,CAAE,EACrDC,QAASC,CAAAA,UACRP,SAASQ,OAAOD,MAAME,EAAE,GAAGC,QACvBC,OAAQC,CAAAA,MAAMA,EAAEC,QAAQ,QAAQ,EACjCP,QAASQ,CAAAA,UAAU;AAClBlB,sBAAamB,KAAK;AAAA,UAChBF,KAAK;AAAA,UACLG,OAAO;AAAA,YAAE,GAAGF,MAAME;AAAAA,YAAOvB;AAAAA,UAAAA;AAAAA,UACzBwB,UAAUH,MAAMG;AAAAA,QAAAA,CACV;AAAA,MACV,CAAC,CACL;AAEF,aAAOrB;AAAAA,IACT;AAAA,EAAA,CACD;AAED,QAAMsB,UAAUrB,eAAe;AAAA,IAC7BC,QAASC,CAAAA,WAAW;AAAA,MAClBmB,SACEnB,MAAME,QACHC,IAAKC,WAAUA,MAAMe,OAAQ,EAC7BC,KAAK,CAAC,EACNR,OAAOS,OAAO,EACjBlB,IAAI,CAAC;AAAA,QAAEe;AAAAA,QAAU,GAAGI;AAAAA,MAAAA,OAAc;AAAA,QAClCR,KAAK;AAAA,QACLG,OAAO;AAAA,UACL,GAAGK;AAAAA,UACH5B;AAAAA,QAAAA;AAAAA,QAEFwB;AAAAA,MAAAA,EACA;AAAA,IAAA;AAAA,EACJ,CACD;AAED,MAAIK,uBAAqDC;AAEzD,MAAIhC,OAAOiC,WAAW;AACpBF,2BAAuB/B,OAAOiC,UAAUC,oBAAAA;AAAAA,EAC1C;AAEA,QAAMC,aAAa,CACjB,GAAGR,QAAAA,EAAUA,SACb,GAAGtB,cAAc;AAGnB,MAAI0B,sBAAsB;AACxBI,eAAWC,QAAQL,oBAAoB;AAAA,EACzC;AAEA,SAAAM,gBACGC,aAAW;AAAA,IAAA,IAAAZ,WAAA;AAAA,aACTS,WAAWxB,IAAI,CAACY,OAAOgB,OAAEF,gBACvBG,OAAUjB,KAAK,CACjB;AAAA,IAAC;AAAA,EAAA,CAAA;AAGR;"}
+{"version":3,"file":"Scripts.js","names":["NoHydration","Asset","useRouterState","useRouter","RouterManagedTag","Scripts","router","nonce","options","ssr","assetScripts","select","state","Array","manifest","matches","map","match","looseRoutesById","routeId","forEach","route","routes","id","assets","filter","d","tag","asset","push","attrs","children","scripts","flat","Boolean","script","serverBufferedScript","undefined","serverSsr","takeBufferedScripts","allScripts","unshift","_$createComponent","_i"],"sources":["../../src/Scripts.tsx"],"sourcesContent":["import { NoHydration } from '@solidjs/web'\nimport { Asset } from './Asset'\nimport { useRouterState } from './useRouterState'\nimport { useRouter } from './useRouter'\nimport type { RouterManagedTag } from '@tanstack/router-core'\n\nexport const Scripts = () => {\n  const router = useRouter()\n  const nonce = router.options.ssr?.nonce\n  const assetScripts = useRouterState({\n    select: (state) => {\n      const assetScripts: Array<RouterManagedTag> = []\n      const manifest = router.ssr?.manifest\n\n      if (!manifest) {\n        return []\n      }\n\n      state.matches\n        .map((match) => router.looseRoutesById[match.routeId]!)\n        .forEach((route) =>\n          manifest.routes[route.id]?.assets\n            ?.filter((d) => d.tag === 'script')\n            .forEach((asset) => {\n              assetScripts.push({\n                tag: 'script',\n                attrs: { ...asset.attrs, nonce },\n                children: asset.children,\n              } as any)\n            }),\n        )\n\n      return assetScripts\n    },\n  })\n\n  const scripts = useRouterState({\n    select: (state) => ({\n      scripts: (\n        state.matches\n          .map((match) => match.scripts!)\n          .flat(1)\n          .filter(Boolean) as Array<RouterManagedTag>\n      ).map(({ children, ...script }) => ({\n        tag: 'script',\n        attrs: {\n          ...script,\n          nonce,\n        },\n        children,\n      })),\n    }),\n  })\n\n  let serverBufferedScript: RouterManagedTag | undefined = undefined\n\n  if (router.serverSsr) {\n    serverBufferedScript = router.serverSsr.takeBufferedScripts()\n  }\n\n  const allScripts = [\n    ...scripts().scripts,\n    ...assetScripts(),\n  ] as Array<RouterManagedTag>\n\n  if (serverBufferedScript) {\n    allScripts.unshift(serverBufferedScript)\n  }\n\n  return (\n    <NoHydration>\n      {allScripts.map((asset, _i) => (\n        <Asset {...asset} />\n      ))}\n    </NoHydration>\n  )\n}\n"],"mappings":";;;;;AAMA,IAAaK,gBAAgB;CAC3B,MAAMC,SAASH,WAAW;CAC1B,MAAMI,QAAQD,OAAOE,QAAQC,KAAKF;CAClC,MAAMG,eAAeR,eAAe,EAClCS,SAASC,UAAU;EACjB,MAAMF,eAAwC,EAAE;EAChD,MAAMI,WAAWR,OAAOG,KAAKK;AAE7B,MAAI,CAACA,SACH,QAAO,EAAE;AAGXF,QAAMG,QACHC,KAAKC,UAAUX,OAAOY,gBAAgBD,MAAME,SAAU,CACtDC,SAASC,UACRP,SAASQ,OAAOD,MAAME,KAAKC,QACvBC,QAAQC,MAAMA,EAAEC,QAAQ,SAAS,CAClCP,SAASQ,UAAU;AAClBlB,gBAAamB,KAAK;IAChBF,KAAK;IACLG,OAAO;KAAE,GAAGF,MAAME;KAAOvB;KAAO;IAChCwB,UAAUH,MAAMG;IACjB,CAAQ;IAEf,CAAC;AAEH,SAAOrB;IAEV,CAAC;CAEF,MAAMsB,UAAU9B,eAAe,EAC7BS,SAASC,WAAW,EAClBoB,SACEpB,MAAMG,QACHC,KAAKC,UAAUA,MAAMe,QAAS,CAC9BC,KAAK,EAAE,CACPR,OAAOS,QAAQ,CAClBlB,KAAK,EAAEe,UAAU,GAAGI,cAAc;EAClCR,KAAK;EACLG,OAAO;GACL,GAAGK;GACH5B;GACD;EACDwB;EACD,EAAC,EACH,GACF,CAAC;CAEF,IAAIK,uBAAqDC,KAAAA;AAEzD,KAAI/B,OAAOgC,UACTF,wBAAuB9B,OAAOgC,UAAUC,qBAAqB;CAG/D,MAAMC,aAAa,CACjB,GAAGR,SAAS,CAACA,SACb,GAAGtB,cAAc,CAClB;AAED,KAAI0B,qBACFI,YAAWC,QAAQL,qBAAqB;AAG1C,QAAAM,gBACG1C,aAAW,EAAA,IAAA+B,WAAA;AAAA,SACTS,WAAWxB,KAAKY,OAAOe,OAAED,gBACvBzC,OAAU2B,MACZ,CAAC;IAAA,CAAA"}

package/dist/esm/ScrollRestoration.js

@@ -1,36 +1,32 @@
-import { defaultGetScrollRestorationKey, getCssSelector, scrollRestorationCache, setupScrollRestoration } from "@tanstack/router-core";
 import { useRouter } from "./useRouter.js";
+import { defaultGetScrollRestorationKey, getCssSelector, scrollRestorationCache, setupScrollRestoration } from "@tanstack/router-core";
+//#region src/ScrollRestoration.tsx
 function useScrollRestoration() {
-  const router = useRouter();
-  setupScrollRestoration(router, true);
+	setupScrollRestoration(useRouter(), true);
 }
+/**
+* @deprecated use createRouter's `scrollRestoration` option instead
+*/
 function ScrollRestoration(_props) {
-  useScrollRestoration();
-  if (process.env.NODE_ENV === "development") {
-    console.warn("The ScrollRestoration component is deprecated. Use createRouter's `scrollRestoration` option instead.");
-  }
-  return null;
+	useScrollRestoration();
+	if (process.env.NODE_ENV === "development") console.warn("The ScrollRestoration component is deprecated. Use createRouter's `scrollRestoration` option instead.");
+	return null;
 }
 function useElementScrollRestoration(options) {
-  useScrollRestoration();
-  const router = useRouter();
-  const getKey = options.getKey || defaultGetScrollRestorationKey;
-  let elementSelector = "";
-  if (options.id) {
-    elementSelector = `[data-scroll-restoration-id="${options.id}"]`;
-  } else {
-    const element = options.getElement?.();
-    if (!element) {
-      return;
-    }
-    elementSelector = element instanceof Window ? "window" : getCssSelector(element);
-  }
-  const restoreKey = getKey(router.latestLocation);
-  const byKey = scrollRestorationCache?.state[restoreKey];
-  return byKey?.[elementSelector];
+	useScrollRestoration();
+	const router = useRouter();
+	const getKey = options.getKey || defaultGetScrollRestorationKey;
+	let elementSelector = "";
+	if (options.id) elementSelector = `[data-scroll-restoration-id="${options.id}"]`;
+	else {
+		const element = options.getElement?.();
+		if (!element) return;
+		elementSelector = element instanceof Window ? "window" : getCssSelector(element);
+	}
+	const restoreKey = getKey(router.latestLocation);
+	return (scrollRestorationCache?.state[restoreKey])?.[elementSelector];
 }
-export {
-  ScrollRestoration,
-  useElementScrollRestoration
-};
-//# sourceMappingURL=ScrollRestoration.js.map
+//#endregion
+export { ScrollRestoration, useElementScrollRestoration };
+
+//# sourceMappingURL=ScrollRestoration.js.map

package/dist/esm/ScrollRestoration.js.map

@@ -1 +1 @@
-{"version":3,"file":"ScrollRestoration.js","sources":["../../src/ScrollRestoration.tsx"],"sourcesContent":["import {\n  defaultGetScrollRestorationKey,\n  getCssSelector,\n  scrollRestorationCache,\n  setupScrollRestoration,\n} from '@tanstack/router-core'\nimport { useRouter } from './useRouter'\nimport type {\n  ParsedLocation,\n  ScrollRestorationEntry,\n  ScrollRestorationOptions,\n} from '@tanstack/router-core'\n\nfunction useScrollRestoration() {\n  const router = useRouter()\n  setupScrollRestoration(router, true)\n}\n\n/**\n * @deprecated use createRouter's `scrollRestoration` option instead\n */\nexport function ScrollRestoration(_props: ScrollRestorationOptions) {\n  useScrollRestoration()\n\n  if (process.env.NODE_ENV === 'development') {\n    console.warn(\n      \"The ScrollRestoration component is deprecated. Use createRouter's `scrollRestoration` option instead.\",\n    )\n  }\n\n  return null\n}\n\nexport function useElementScrollRestoration(\n  options: (\n    | {\n        id: string\n        getElement?: () => Window | Element | undefined | null\n      }\n    | {\n        id?: string\n        getElement: () => Window | Element | undefined | null\n      }\n  ) & {\n    getKey?: (location: ParsedLocation) => string\n  },\n): ScrollRestorationEntry | undefined {\n  useScrollRestoration()\n\n  const router = useRouter()\n  const getKey = options.getKey || defaultGetScrollRestorationKey\n\n  let elementSelector = ''\n\n  if (options.id) {\n    elementSelector = `[data-scroll-restoration-id=\"${options.id}\"]`\n  } else {\n    const element = options.getElement?.()\n    if (!element) {\n      return\n    }\n    elementSelector =\n      element instanceof Window ? 'window' : getCssSelector(element)\n  }\n\n  const restoreKey = getKey(router.latestLocation)\n  const byKey = scrollRestorationCache?.state[restoreKey]\n  return byKey?.[elementSelector]\n}\n"],"names":["useScrollRestoration","router","useRouter","setupScrollRestoration","ScrollRestoration","_props","process","env","NODE_ENV","console","warn","useElementScrollRestoration","options","getKey","defaultGetScrollRestorationKey","elementSelector","id","element","getElement","Window","getCssSelector","restoreKey","latestLocation","byKey","scrollRestorationCache","state"],"mappings":";;AAaA,SAASA,uBAAuB;AAC9B,QAAMC,SAASC,UAAAA;AACfC,yBAAuBF,QAAQ,IAAI;AACrC;AAKO,SAASG,kBAAkBC,QAAkC;AAClEL,uBAAAA;AAEA,MAAIM,QAAQC,IAAIC,aAAa,eAAe;AAC1CC,YAAQC,KACN,uGACF;AAAA,EACF;AAEA,SAAO;AACT;AAEO,SAASC,4BACdC,SAYoC;AACpCZ,uBAAAA;AAEA,QAAMC,SAASC,UAAAA;AACf,QAAMW,SAASD,QAAQC,UAAUC;AAEjC,MAAIC,kBAAkB;AAEtB,MAAIH,QAAQI,IAAI;AACdD,sBAAkB,gCAAgCH,QAAQI,EAAE;AAAA,EAC9D,OAAO;AACL,UAAMC,UAAUL,QAAQM,aAAAA;AACxB,QAAI,CAACD,SAAS;AACZ;AAAA,IACF;AACAF,sBACEE,mBAAmBE,SAAS,WAAWC,eAAeH,OAAO;AAAA,EACjE;AAEA,QAAMI,aAAaR,OAAOZ,OAAOqB,cAAc;AAC/C,QAAMC,QAAQC,wBAAwBC,MAAMJ,UAAU;AACtD,SAAOE,QAAQR,eAAe;AAChC;"}
+{"version":3,"file":"ScrollRestoration.js","names":["defaultGetScrollRestorationKey","getCssSelector","scrollRestorationCache","setupScrollRestoration","useRouter","ParsedLocation","ScrollRestorationEntry","ScrollRestorationOptions","useScrollRestoration","router","ScrollRestoration","_props","process","env","NODE_ENV","console","warn","useElementScrollRestoration","options","id","getElement","Window","Element","getKey","location","elementSelector","element","restoreKey","latestLocation","byKey","state"],"sources":["../../src/ScrollRestoration.tsx"],"sourcesContent":["import {\n  defaultGetScrollRestorationKey,\n  getCssSelector,\n  scrollRestorationCache,\n  setupScrollRestoration,\n} from '@tanstack/router-core'\nimport { useRouter } from './useRouter'\nimport type {\n  ParsedLocation,\n  ScrollRestorationEntry,\n  ScrollRestorationOptions,\n} from '@tanstack/router-core'\n\nfunction useScrollRestoration() {\n  const router = useRouter()\n  setupScrollRestoration(router, true)\n}\n\n/**\n * @deprecated use createRouter's `scrollRestoration` option instead\n */\nexport function ScrollRestoration(_props: ScrollRestorationOptions) {\n  useScrollRestoration()\n\n  if (process.env.NODE_ENV === 'development') {\n    console.warn(\n      \"The ScrollRestoration component is deprecated. Use createRouter's `scrollRestoration` option instead.\",\n    )\n  }\n\n  return null\n}\n\nexport function useElementScrollRestoration(\n  options: (\n    | {\n        id: string\n        getElement?: () => Window | Element | undefined | null\n      }\n    | {\n        id?: string\n        getElement: () => Window | Element | undefined | null\n      }\n  ) & {\n    getKey?: (location: ParsedLocation) => string\n  },\n): ScrollRestorationEntry | undefined {\n  useScrollRestoration()\n\n  const router = useRouter()\n  const getKey = options.getKey || defaultGetScrollRestorationKey\n\n  let elementSelector = ''\n\n  if (options.id) {\n    elementSelector = `[data-scroll-restoration-id=\"${options.id}\"]`\n  } else {\n    const element = options.getElement?.()\n    if (!element) {\n      return\n    }\n    elementSelector =\n      element instanceof Window ? 'window' : getCssSelector(element)\n  }\n\n  const restoreKey = getKey(router.latestLocation)\n  const byKey = scrollRestorationCache?.state[restoreKey]\n  return byKey?.[elementSelector]\n}\n"],"mappings":";;;AAaA,SAASQ,uBAAuB;AAE9BL,wBADeC,WAAW,EACK,KAAK;;;;;AAMtC,SAAgBM,kBAAkBC,QAAkC;AAClEH,uBAAsB;AAEtB,KAAA,QAAA,IAAA,aAA6B,cAC3BO,SAAQC,KACN,wGACD;AAGH,QAAO;;AAGT,SAAgBC,4BACdC,SAYoC;AACpCV,uBAAsB;CAEtB,MAAMC,SAASL,WAAW;CAC1B,MAAMmB,SAASL,QAAQK,UAAUvB;CAEjC,IAAIyB,kBAAkB;AAEtB,KAAIP,QAAQC,GACVM,mBAAkB,gCAAgCP,QAAQC,GAAE;MACvD;EACL,MAAMO,UAAUR,QAAQE,cAAc;AACtC,MAAI,CAACM,QACH;AAEFD,oBACEC,mBAAmBL,SAAS,WAAWpB,eAAeyB,QAAQ;;CAGlE,MAAMC,aAAaJ,OAAOd,OAAOmB,eAAe;AAEhD,SADc1B,wBAAwB4B,MAAMH,eAC7BF"}

package/dist/esm/Transitioner.js

@@ -1,110 +1,92 @@
-import * as Solid from "solid-js";
-import { trimPathRight, getLocationChangeInfo, handleHashScroll } from "@tanstack/router-core";
 import { useRouter } from "./useRouter.js";
 import { useRouterState } from "./useRouterState.js";
 import { usePrevious } from "./utils.js";
+import { getLocationChangeInfo, handleHashScroll, trimPathRight } from "@tanstack/router-core";
+import * as Solid from "solid-js";
+//#region src/Transitioner.tsx
 function Transitioner() {
-  const router = useRouter();
-  let mountLoadForRouter = {
-    router,
-    mounted: false
-  };
-  const isLoading = useRouterState({
-    select: ({
-      isLoading: isLoading2
-    }) => isLoading2
-  });
-  const [isSolidTransitioning] = [() => false];
-  const hasPendingMatches = useRouterState({
-    select: (s) => s.matches.some((d) => d.status === "pending")
-  });
-  const previousIsLoading = usePrevious(isLoading);
-  const isAnyPending = () => isLoading() || isSolidTransitioning() || hasPendingMatches();
-  const previousIsAnyPending = usePrevious(isAnyPending);
-  const isPagePending = () => isLoading() || hasPendingMatches();
-  const previousIsPagePending = usePrevious(isPagePending);
-  router.startTransition = (fn) => {
-    Solid.runWithOwner(null, fn);
-  };
-  Solid.onSettled(() => {
-    const unsub = router.history.subscribe(router.load);
-    router.updateLatestLocation();
-    const nextLocation = router.buildLocation({
-      to: router.latestLocation.pathname,
-      search: true,
-      params: true,
-      hash: true,
-      state: true,
-      _includeValidateSearch: true
-    });
-    if (trimPathRight(router.latestLocation.publicHref) !== trimPathRight(nextLocation.publicHref)) {
-      router.commitLocation({
-        ...nextLocation,
-        replace: true
-      });
-    }
-    Solid.onCleanup(() => {
-      unsub();
-    });
-  });
-  Solid.createTrackedEffect(() => {
-    Solid.untrack(() => {
-      if (
-        // if we are hydrating from SSR, loading is triggered in ssr-client
-        typeof window !== "undefined" && router.ssr || mountLoadForRouter.router === router && mountLoadForRouter.mounted
-      ) {
-        return;
-      }
-      mountLoadForRouter = {
-        router,
-        mounted: true
-      };
-      const tryLoad = async () => {
-        try {
-          await router.load();
-        } catch (err) {
-          console.error(err);
-        }
-      };
-      tryLoad();
-    });
-  });
-  Solid.createEffect(() => [previousIsLoading(), isLoading()], ([previousIsLoading2, isLoading2]) => {
-    if (previousIsLoading2.previous && !isLoading2) {
-      router.emit({
-        type: "onLoad",
-        ...getLocationChangeInfo(router.state)
-      });
-    }
-  });
-  Solid.createEffect(() => [isPagePending(), previousIsPagePending()], ([isPagePending2, previousIsPagePending2]) => {
-    if (previousIsPagePending2.previous && !isPagePending2) {
-      router.emit({
-        type: "onBeforeRouteMount",
-        ...getLocationChangeInfo(router.state)
-      });
-    }
-  });
-  Solid.createEffect(() => [isAnyPending(), previousIsAnyPending()], ([isAnyPending2, previousIsAnyPending2]) => {
-    if (previousIsAnyPending2.previous && !isAnyPending2) {
-      const changeInfo = getLocationChangeInfo(router.state);
-      router.emit({
-        type: "onResolved",
-        ...changeInfo
-      });
-      router.__store.setState((s) => ({
-        ...s,
-        status: "idle",
-        resolvedLocation: s.location
-      }));
-      if (changeInfo.hrefChanged) {
-        handleHashScroll(router);
-      }
-    }
-  });
-  return null;
+	const router = useRouter();
+	let mountLoadForRouter = {
+		router,
+		mounted: false
+	};
+	const isLoading = useRouterState({ select: ({ isLoading }) => isLoading });
+	const [isSolidTransitioning] = [() => false];
+	const hasPendingMatches = useRouterState({ select: (s) => s.matches.some((d) => d.status === "pending") });
+	const previousIsLoading = usePrevious(isLoading);
+	const isAnyPending = () => isLoading() || isSolidTransitioning() || hasPendingMatches();
+	const previousIsAnyPending = usePrevious(isAnyPending);
+	const isPagePending = () => isLoading() || hasPendingMatches();
+	const previousIsPagePending = usePrevious(isPagePending);
+	router.startTransition = (fn) => {
+		Solid.runWithOwner(null, fn);
+	};
+	Solid.onSettled(() => {
+		const unsub = router.history.subscribe(router.load);
+		router.updateLatestLocation();
+		const nextLocation = router.buildLocation({
+			to: router.latestLocation.pathname,
+			search: true,
+			params: true,
+			hash: true,
+			state: true,
+			_includeValidateSearch: true
+		});
+		if (trimPathRight(router.latestLocation.publicHref) !== trimPathRight(nextLocation.publicHref)) router.commitLocation({
+			...nextLocation,
+			replace: true
+		});
+		Solid.onCleanup(() => {
+			unsub();
+		});
+	});
+	Solid.createTrackedEffect(() => {
+		Solid.untrack(() => {
+			if (typeof window !== "undefined" && router.ssr || mountLoadForRouter.router === router && mountLoadForRouter.mounted) return;
+			mountLoadForRouter = {
+				router,
+				mounted: true
+			};
+			const tryLoad = async () => {
+				try {
+					await router.load();
+				} catch (err) {
+					console.error(err);
+				}
+			};
+			tryLoad();
+		});
+	});
+	Solid.createEffect(() => [previousIsLoading(), isLoading()], ([previousIsLoading, isLoading]) => {
+		if (previousIsLoading.previous && !isLoading) router.emit({
+			type: "onLoad",
+			...getLocationChangeInfo(router.state)
+		});
+	});
+	Solid.createEffect(() => [isPagePending(), previousIsPagePending()], ([isPagePending, previousIsPagePending]) => {
+		if (previousIsPagePending.previous && !isPagePending) router.emit({
+			type: "onBeforeRouteMount",
+			...getLocationChangeInfo(router.state)
+		});
+	});
+	Solid.createEffect(() => [isAnyPending(), previousIsAnyPending()], ([isAnyPending, previousIsAnyPending]) => {
+		if (previousIsAnyPending.previous && !isAnyPending) {
+			const changeInfo = getLocationChangeInfo(router.state);
+			router.emit({
+				type: "onResolved",
+				...changeInfo
+			});
+			router.__store.setState((s) => ({
+				...s,
+				status: "idle",
+				resolvedLocation: s.location
+			}));
+			if (changeInfo.hrefChanged) handleHashScroll(router);
+		}
+	});
+	return null;
 }
-export {
-  Transitioner
-};
-//# sourceMappingURL=Transitioner.js.map
+//#endregion
+export { Transitioner };
+
+//# sourceMappingURL=Transitioner.js.map

package/dist/esm/Transitioner.js.map

@@ -1 +1 @@
-{"version":3,"file":"Transitioner.js","sources":["../../src/Transitioner.tsx"],"sourcesContent":["import * as Solid from 'solid-js'\nimport {\n  getLocationChangeInfo,\n  handleHashScroll,\n  trimPathRight,\n} from '@tanstack/router-core'\nimport { useRouter } from './useRouter'\nimport { useRouterState } from './useRouterState'\nimport { usePrevious } from './utils'\n\nexport function Transitioner() {\n  const router = useRouter()\n  let mountLoadForRouter = { router, mounted: false }\n  const isLoading = useRouterState({\n    select: ({ isLoading }) => isLoading,\n  })\n\n  const [isSolidTransitioning] = [() => false]\n\n  // Track pending state changes\n  const hasPendingMatches = useRouterState({\n    select: (s) => s.matches.some((d) => d.status === 'pending'),\n  })\n\n  const previousIsLoading = usePrevious(isLoading)\n\n  const isAnyPending = () =>\n    isLoading() || isSolidTransitioning() || hasPendingMatches()\n  const previousIsAnyPending = usePrevious(isAnyPending)\n\n  const isPagePending = () => isLoading() || hasPendingMatches()\n  const previousIsPagePending = usePrevious(isPagePending)\n\n  router.startTransition = (fn: () => void | Promise<void>) => {\n    Solid.runWithOwner(null, fn)\n  }\n\n  // Subscribe to location changes\n  // and try to load the new location\n  Solid.onSettled(() => {\n    const unsub = router.history.subscribe(router.load)\n\n    // Refresh latestLocation from the current browser URL before comparing.\n    // The URL may have been changed synchronously (e.g. via replaceState) after\n    // render() but before this effect ran, so we must not use the stale\n    // render-time location here.\n    router.updateLatestLocation()\n\n    const nextLocation = router.buildLocation({\n      to: router.latestLocation.pathname,\n      search: true,\n      params: true,\n      hash: true,\n      state: true,\n      _includeValidateSearch: true,\n    })\n\n    // Check if the current URL matches the canonical form.\n    // Compare publicHref (browser-facing URL) for consistency with\n    // the server-side redirect check in router.beforeLoad.\n    if (\n      trimPathRight(router.latestLocation.publicHref) !==\n      trimPathRight(nextLocation.publicHref)\n    ) {\n      router.commitLocation({ ...nextLocation, replace: true })\n    }\n\n    Solid.onCleanup(() => {\n      unsub()\n    })\n  })\n\n  // Try to load the initial location\n  Solid.createTrackedEffect(() => {\n    Solid.untrack(() => {\n      if (\n        // if we are hydrating from SSR, loading is triggered in ssr-client\n        (typeof window !== 'undefined' && router.ssr) ||\n        (mountLoadForRouter.router === router && mountLoadForRouter.mounted)\n      ) {\n        return\n      }\n      mountLoadForRouter = { router, mounted: true }\n      const tryLoad = async () => {\n        try {\n          await router.load()\n        } catch (err) {\n          console.error(err)\n        }\n      }\n      tryLoad()\n    })\n  })\n\n  Solid.createEffect(\n    () => [previousIsLoading(), isLoading()] as const,\n    ([previousIsLoading, isLoading]) => {\n      if (previousIsLoading.previous && !isLoading) {\n        router.emit({\n          type: 'onLoad',\n          ...getLocationChangeInfo(router.state),\n        })\n      }\n    },\n  )\n\n  Solid.createEffect(\n    () => [isPagePending(), previousIsPagePending()] as const,\n    ([isPagePending, previousIsPagePending]) => {\n      // emit onBeforeRouteMount\n      if (previousIsPagePending.previous && !isPagePending) {\n        router.emit({\n          type: 'onBeforeRouteMount',\n          ...getLocationChangeInfo(router.state),\n        })\n      }\n    },\n  )\n\n  Solid.createEffect(\n    () => [isAnyPending(), previousIsAnyPending()] as const,\n    ([isAnyPending, previousIsAnyPending]) => {\n      if (previousIsAnyPending.previous && !isAnyPending) {\n        const changeInfo = getLocationChangeInfo(router.state)\n        router.emit({\n          type: 'onResolved',\n          ...changeInfo,\n        })\n\n        router.__store.setState((s) => ({\n          ...s,\n          status: 'idle',\n          resolvedLocation: s.location,\n        }))\n\n        if (changeInfo.hrefChanged) {\n          handleHashScroll(router)\n        }\n      }\n    },\n  )\n\n  return null\n}\n"],"names":["Transitioner","router","useRouter","mountLoadForRouter","mounted","isLoading","useRouterState","select","isSolidTransitioning","hasPendingMatches","s","matches","some","d","status","previousIsLoading","usePrevious","isAnyPending","previousIsAnyPending","isPagePending","previousIsPagePending","startTransition","fn","Solid","runWithOwner","onSettled","unsub","history","subscribe","load","updateLatestLocation","nextLocation","buildLocation","to","latestLocation","pathname","search","params","hash","state","_includeValidateSearch","trimPathRight","publicHref","commitLocation","replace","onCleanup","createTrackedEffect","untrack","window","ssr","tryLoad","err","console","error","createEffect","previous","emit","type","getLocationChangeInfo","changeInfo","__store","setState","resolvedLocation","location","hrefChanged","handleHashScroll"],"mappings":"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"}
+{"version":3,"file":"Transitioner.js","names":["Solid","getLocationChangeInfo","handleHashScroll","trimPathRight","useRouter","useRouterState","usePrevious","Transitioner","router","mountLoadForRouter","mounted","isLoading","select","isSolidTransitioning","hasPendingMatches","s","matches","some","d","status","previousIsLoading","isAnyPending","previousIsAnyPending","isPagePending","previousIsPagePending","startTransition","fn","Promise","runWithOwner","onSettled","unsub","history","subscribe","load","updateLatestLocation","nextLocation","buildLocation","to","latestLocation","pathname","search","params","hash","state","_includeValidateSearch","publicHref","commitLocation","replace","onCleanup","createTrackedEffect","untrack","window","ssr","tryLoad","err","console","error","createEffect","const","previous","emit","type","changeInfo","__store","setState","resolvedLocation","location","hrefChanged"],"sources":["../../src/Transitioner.tsx"],"sourcesContent":["import * as Solid from 'solid-js'\nimport {\n  getLocationChangeInfo,\n  handleHashScroll,\n  trimPathRight,\n} from '@tanstack/router-core'\nimport { useRouter } from './useRouter'\nimport { useRouterState } from './useRouterState'\nimport { usePrevious } from './utils'\n\nexport function Transitioner() {\n  const router = useRouter()\n  let mountLoadForRouter = { router, mounted: false }\n  const isLoading = useRouterState({\n    select: ({ isLoading }) => isLoading,\n  })\n\n  const [isSolidTransitioning] = [() => false]\n\n  // Track pending state changes\n  const hasPendingMatches = useRouterState({\n    select: (s) => s.matches.some((d) => d.status === 'pending'),\n  })\n\n  const previousIsLoading = usePrevious(isLoading)\n\n  const isAnyPending = () =>\n    isLoading() || isSolidTransitioning() || hasPendingMatches()\n  const previousIsAnyPending = usePrevious(isAnyPending)\n\n  const isPagePending = () => isLoading() || hasPendingMatches()\n  const previousIsPagePending = usePrevious(isPagePending)\n\n  router.startTransition = (fn: () => void | Promise<void>) => {\n    Solid.runWithOwner(null, fn)\n  }\n\n  // Subscribe to location changes\n  // and try to load the new location\n  Solid.onSettled(() => {\n    const unsub = router.history.subscribe(router.load)\n\n    // Refresh latestLocation from the current browser URL before comparing.\n    // The URL may have been changed synchronously (e.g. via replaceState) after\n    // render() but before this effect ran, so we must not use the stale\n    // render-time location here.\n    router.updateLatestLocation()\n\n    const nextLocation = router.buildLocation({\n      to: router.latestLocation.pathname,\n      search: true,\n      params: true,\n      hash: true,\n      state: true,\n      _includeValidateSearch: true,\n    })\n\n    // Check if the current URL matches the canonical form.\n    // Compare publicHref (browser-facing URL) for consistency with\n    // the server-side redirect check in router.beforeLoad.\n    if (\n      trimPathRight(router.latestLocation.publicHref) !==\n      trimPathRight(nextLocation.publicHref)\n    ) {\n      router.commitLocation({ ...nextLocation, replace: true })\n    }\n\n    Solid.onCleanup(() => {\n      unsub()\n    })\n  })\n\n  // Try to load the initial location\n  Solid.createTrackedEffect(() => {\n    Solid.untrack(() => {\n      if (\n        // if we are hydrating from SSR, loading is triggered in ssr-client\n        (typeof window !== 'undefined' && router.ssr) ||\n        (mountLoadForRouter.router === router && mountLoadForRouter.mounted)\n      ) {\n        return\n      }\n      mountLoadForRouter = { router, mounted: true }\n      const tryLoad = async () => {\n        try {\n          await router.load()\n        } catch (err) {\n          console.error(err)\n        }\n      }\n      tryLoad()\n    })\n  })\n\n  Solid.createEffect(\n    () => [previousIsLoading(), isLoading()] as const,\n    ([previousIsLoading, isLoading]) => {\n      if (previousIsLoading.previous && !isLoading) {\n        router.emit({\n          type: 'onLoad',\n          ...getLocationChangeInfo(router.state),\n        })\n      }\n    },\n  )\n\n  Solid.createEffect(\n    () => [isPagePending(), previousIsPagePending()] as const,\n    ([isPagePending, previousIsPagePending]) => {\n      // emit onBeforeRouteMount\n      if (previousIsPagePending.previous && !isPagePending) {\n        router.emit({\n          type: 'onBeforeRouteMount',\n          ...getLocationChangeInfo(router.state),\n        })\n      }\n    },\n  )\n\n  Solid.createEffect(\n    () => [isAnyPending(), previousIsAnyPending()] as const,\n    ([isAnyPending, previousIsAnyPending]) => {\n      if (previousIsAnyPending.previous && !isAnyPending) {\n        const changeInfo = getLocationChangeInfo(router.state)\n        router.emit({\n          type: 'onResolved',\n          ...changeInfo,\n        })\n\n        router.__store.setState((s) => ({\n          ...s,\n          status: 'idle',\n          resolvedLocation: s.location,\n        }))\n\n        if (changeInfo.hrefChanged) {\n          handleHashScroll(router)\n        }\n      }\n    },\n  )\n\n  return null\n}\n"],"mappings":";;;;;;AAUA,SAAgBO,eAAe;CAC7B,MAAMC,SAASJ,WAAW;CAC1B,IAAIK,qBAAqB;EAAED;EAAQE,SAAS;EAAO;CACnD,MAAMC,YAAYN,eAAe,EAC/BO,SAAS,EAAED,gBAAgBA,WAC5B,CAAC;CAEF,MAAM,CAACE,wBAAwB,OAAO,MAAM;CAG5C,MAAMC,oBAAoBT,eAAe,EACvCO,SAASG,MAAMA,EAAEC,QAAQC,MAAMC,MAAMA,EAAEC,WAAW,UAAS,EAC5D,CAAC;CAEF,MAAMC,oBAAoBd,YAAYK,UAAU;CAEhD,MAAMU,qBACJV,WAAW,IAAIE,sBAAsB,IAAIC,mBAAmB;CAC9D,MAAMQ,uBAAuBhB,YAAYe,aAAa;CAEtD,MAAME,sBAAsBZ,WAAW,IAAIG,mBAAmB;CAC9D,MAAMU,wBAAwBlB,YAAYiB,cAAc;AAExDf,QAAOiB,mBAAmBC,OAAmC;AAC3D1B,QAAM4B,aAAa,MAAMF,GAAG;;AAK9B1B,OAAM6B,gBAAgB;EACpB,MAAMC,QAAQtB,OAAOuB,QAAQC,UAAUxB,OAAOyB,KAAK;AAMnDzB,SAAO0B,sBAAsB;EAE7B,MAAMC,eAAe3B,OAAO4B,cAAc;GACxCC,IAAI7B,OAAO8B,eAAeC;GAC1BC,QAAQ;GACRC,QAAQ;GACRC,MAAM;GACNC,OAAO;GACPC,wBAAwB;GACzB,CAAC;AAKF,MACEzC,cAAcK,OAAO8B,eAAeO,WAAW,KAC/C1C,cAAcgC,aAAaU,WAAW,CAEtCrC,QAAOsC,eAAe;GAAE,GAAGX;GAAcY,SAAS;GAAM,CAAC;AAG3D/C,QAAMgD,gBAAgB;AACpBlB,UAAO;IACP;GACF;AAGF9B,OAAMiD,0BAA0B;AAC9BjD,QAAMkD,cAAc;AAClB,OAEG,OAAOC,WAAW,eAAe3C,OAAO4C,OACxC3C,mBAAmBD,WAAWA,UAAUC,mBAAmBC,QAE5D;AAEFD,wBAAqB;IAAED;IAAQE,SAAS;IAAM;GAC9C,MAAM2C,UAAU,YAAY;AAC1B,QAAI;AACF,WAAM7C,OAAOyB,MAAM;aACZqB,KAAK;AACZC,aAAQC,MAAMF,IAAI;;;AAGtBD,YAAS;IACT;GACF;AAEFrD,OAAMyD,mBACE,CAACrC,mBAAmB,EAAET,WAAW,CAAC,GACvC,CAACS,mBAAmBT,eAAe;AAClC,MAAIS,kBAAkBuC,YAAY,CAAChD,UACjCH,QAAOoD,KAAK;GACVC,MAAM;GACN,GAAG5D,sBAAsBO,OAAOmC,MAAK;GACtC,CAAC;GAGP;AAED3C,OAAMyD,mBACE,CAAClC,eAAe,EAAEC,uBAAuB,CAAC,GAC/C,CAACD,eAAeC,2BAA2B;AAE1C,MAAIA,sBAAsBmC,YAAY,CAACpC,cACrCf,QAAOoD,KAAK;GACVC,MAAM;GACN,GAAG5D,sBAAsBO,OAAOmC,MAAK;GACtC,CAAC;GAGP;AAED3C,OAAMyD,mBACE,CAACpC,cAAc,EAAEC,sBAAsB,CAAC,GAC7C,CAACD,cAAcC,0BAA0B;AACxC,MAAIA,qBAAqBqC,YAAY,CAACtC,cAAc;GAClD,MAAMyC,aAAa7D,sBAAsBO,OAAOmC,MAAM;AACtDnC,UAAOoD,KAAK;IACVC,MAAM;IACN,GAAGC;IACJ,CAAC;AAEFtD,UAAOuD,QAAQC,UAAUjD,OAAO;IAC9B,GAAGA;IACHI,QAAQ;IACR8C,kBAAkBlD,EAAEmD;IACrB,EAAE;AAEH,OAAIJ,WAAWK,YACbjE,kBAAiBM,OAAO;;GAI/B;AAED,QAAO"}

package/dist/esm/awaited.js

@@ -1,43 +1,35 @@
+import { TSR_DEFERRED_PROMISE, defer } from "@tanstack/router-core";
 import { createComponent } from "@solidjs/web";
 import * as Solid from "solid-js";
-import { defer, TSR_DEFERRED_PROMISE } from "@tanstack/router-core";
-function useAwaited({
-  promise: _promise
-}) {
-  const promise = defer(_promise);
-  if (promise[TSR_DEFERRED_PROMISE].status === "pending") {
-    throw promise;
-  }
-  if (promise[TSR_DEFERRED_PROMISE].status === "error") {
-    throw promise[TSR_DEFERRED_PROMISE].error;
-  }
-  return [promise[TSR_DEFERRED_PROMISE].data, promise];
+//#region src/awaited.tsx
+function useAwaited({ promise: _promise }) {
+	const promise = defer(_promise);
+	if (promise[TSR_DEFERRED_PROMISE].status === "pending") throw promise;
+	if (promise[TSR_DEFERRED_PROMISE].status === "error") throw promise[TSR_DEFERRED_PROMISE].error;
+	return [promise[TSR_DEFERRED_PROMISE].data, promise];
 }
 function InnerAwait(props) {
-  const [data] = useAwaited({
-    promise: props.promise
-  });
-  return props.children(data);
+	const [data] = useAwaited({ promise: props.promise });
+	return props.children(data);
 }
 function Await(props) {
-  return createComponent(Solid.Loading, {
-    get fallback() {
-      return props.fallback;
-    },
-    get children() {
-      return createComponent(InnerAwait, {
-        get promise() {
-          return props.promise;
-        },
-        get children() {
-          return props.children;
-        }
-      });
-    }
-  });
+	return createComponent(Solid.Loading, {
+		get fallback() {
+			return props.fallback;
+		},
+		get children() {
+			return createComponent(InnerAwait, {
+				get promise() {
+					return props.promise;
+				},
+				get children() {
+					return props.children;
+				}
+			});
+		}
+	});
 }
-export {
-  Await,
-  useAwaited
-};
-//# sourceMappingURL=awaited.js.map
+//#endregion
+export { Await, useAwaited };
+
+//# sourceMappingURL=awaited.js.map

package/dist/esm/awaited.js.map

@@ -1 +1 @@
-{"version":3,"file":"awaited.js","sources":["../../src/awaited.tsx"],"sourcesContent":["import * as Solid from 'solid-js'\n\nimport { TSR_DEFERRED_PROMISE, defer } from '@tanstack/router-core'\nimport type { DeferredPromise } from '@tanstack/router-core'\nimport type { SolidNode } from './route'\n\nexport type AwaitOptions<T> = {\n  promise: Promise<T>\n}\n\nexport function useAwaited<T>({\n  promise: _promise,\n}: AwaitOptions<T>): [T, DeferredPromise<T>] {\n  const promise = defer(_promise)\n\n  if (promise[TSR_DEFERRED_PROMISE].status === 'pending') {\n    throw promise\n  }\n\n  if (promise[TSR_DEFERRED_PROMISE].status === 'error') {\n    throw promise[TSR_DEFERRED_PROMISE].error\n  }\n\n  return [promise[TSR_DEFERRED_PROMISE].data, promise]\n}\n\nfunction InnerAwait<T>(props: {\n  promise: Promise<T>\n  children: (res: T) => SolidNode\n}) {\n  const [data] = useAwaited({ promise: props.promise })\n  return props.children(data) as any\n}\n\nexport function Await<T>(\n  props: AwaitOptions<T> & {\n    fallback?: SolidNode\n    children: (result: T) => SolidNode\n  },\n) {\n  return (\n    <Solid.Loading fallback={props.fallback as any}>\n      <InnerAwait promise={props.promise}>{props.children}</InnerAwait>\n    </Solid.Loading>\n  )\n}\n"],"names":["useAwaited","promise","_promise","defer","TSR_DEFERRED_PROMISE","status","error","data","InnerAwait","props","children","Await","_$createComponent","Solid","Loading","fallback"],"mappings":";;;AAUO,SAASA,WAAc;AAAA,EAC5BC,SAASC;AACM,GAA4B;AAC3C,QAAMD,UAAUE,MAAMD,QAAQ;AAE9B,MAAID,QAAQG,oBAAoB,EAAEC,WAAW,WAAW;AACtD,UAAMJ;AAAAA,EACR;AAEA,MAAIA,QAAQG,oBAAoB,EAAEC,WAAW,SAAS;AACpD,UAAMJ,QAAQG,oBAAoB,EAAEE;AAAAA,EACtC;AAEA,SAAO,CAACL,QAAQG,oBAAoB,EAAEG,MAAMN,OAAO;AACrD;AAEA,SAASO,WAAcC,OAGpB;AACD,QAAM,CAACF,IAAI,IAAIP,WAAW;AAAA,IAAEC,SAASQ,MAAMR;AAAAA,EAAAA,CAAS;AACpD,SAAOQ,MAAMC,SAASH,IAAI;AAC5B;AAEO,SAASI,MACdF,OAIA;AACA,SAAAG,gBACGC,MAAMC,SAAO;AAAA,IAAA,IAACC,WAAQ;AAAA,aAAEN,MAAMM;AAAAA,IAAe;AAAA,IAAA,IAAAL,WAAA;AAAA,aAAAE,gBAC3CJ,YAAU;AAAA,QAAA,IAACP,UAAO;AAAA,iBAAEQ,MAAMR;AAAAA,QAAO;AAAA,QAAA,IAAAS,WAAA;AAAA,iBAAGD,MAAMC;AAAAA,QAAQ;AAAA,MAAA,CAAA;AAAA,IAAA;AAAA,EAAA,CAAA;AAGzD;"}
+{"version":3,"file":"awaited.js","names":["Solid","TSR_DEFERRED_PROMISE","defer","DeferredPromise","SolidNode","AwaitOptions","promise","Promise","T","useAwaited","_promise","status","error","data","InnerAwait","props","children","res","Await","fallback","result","_$createComponent","Loading"],"sources":["../../src/awaited.tsx"],"sourcesContent":["import * as Solid from 'solid-js'\n\nimport { TSR_DEFERRED_PROMISE, defer } from '@tanstack/router-core'\nimport type { DeferredPromise } from '@tanstack/router-core'\nimport type { SolidNode } from './route'\n\nexport type AwaitOptions<T> = {\n  promise: Promise<T>\n}\n\nexport function useAwaited<T>({\n  promise: _promise,\n}: AwaitOptions<T>): [T, DeferredPromise<T>] {\n  const promise = defer(_promise)\n\n  if (promise[TSR_DEFERRED_PROMISE].status === 'pending') {\n    throw promise\n  }\n\n  if (promise[TSR_DEFERRED_PROMISE].status === 'error') {\n    throw promise[TSR_DEFERRED_PROMISE].error\n  }\n\n  return [promise[TSR_DEFERRED_PROMISE].data, promise]\n}\n\nfunction InnerAwait<T>(props: {\n  promise: Promise<T>\n  children: (res: T) => SolidNode\n}) {\n  const [data] = useAwaited({ promise: props.promise })\n  return props.children(data) as any\n}\n\nexport function Await<T>(\n  props: AwaitOptions<T> & {\n    fallback?: SolidNode\n    children: (result: T) => SolidNode\n  },\n) {\n  return (\n    <Solid.Loading fallback={props.fallback as any}>\n      <InnerAwait promise={props.promise}>{props.children}</InnerAwait>\n    </Solid.Loading>\n  )\n}\n"],"mappings":";;;;AAUA,SAAgBS,WAAc,EAC5BH,SAASI,YACkC;CAC3C,MAAMJ,UAAUJ,MAAMQ,SAAS;AAE/B,KAAIJ,QAAQL,sBAAsBU,WAAW,UAC3C,OAAML;AAGR,KAAIA,QAAQL,sBAAsBU,WAAW,QAC3C,OAAML,QAAQL,sBAAsBW;AAGtC,QAAO,CAACN,QAAQL,sBAAsBY,MAAMP,QAAQ;;AAGtD,SAASQ,WAAcC,OAGpB;CACD,MAAM,CAACF,QAAQJ,WAAW,EAAEH,SAASS,MAAMT,SAAS,CAAC;AACrD,QAAOS,MAAMC,SAASH,KAAK;;AAG7B,SAAgBK,MACdH,OAIA;AACA,QAAAM,gBACGrB,MAAMsB,SAAO;EAAA,IAACH,WAAQ;AAAA,UAAEJ,MAAMI;;EAAe,IAAAH,WAAA;AAAA,UAAAK,gBAC3CP,YAAU;IAAA,IAACR,UAAO;AAAA,YAAES,MAAMT;;IAAO,IAAAU,WAAA;AAAA,YAAGD,MAAMC;;IAAQ,CAAA;;EAAA,CAAA"}