@askrjs/askr 0.0.50 → 0.0.52

package/dist/router/internal-types.d.ts

@@ -27,5 +27,4 @@ type RegistrationSession = {
   authConfigured: boolean;
 };
 //#endregion
-export { AccessScopeState, AnyRouteComponent, InternalRoute, InternalRouteRecord, RegistrationScope, RegistrationSession };
-//# sourceMappingURL=internal-types.d.ts.map
+export { AccessScopeState, AnyRouteComponent, InternalRoute, InternalRouteRecord, RegistrationScope, RegistrationSession };

package/dist/router/lazy.d.ts

@@ -15,5 +15,4 @@ declare function associateRouteSourceLazy(registry: RouteRegistry, manifest: Rou
 declare function clearPendingLazy(): void;
 declare function restorePendingLazy(lazyImports: readonly Promise<unknown>[]): void;
 //#endregion
-export { lazy };
-//# sourceMappingURL=lazy.d.ts.map
+export { lazy };

package/dist/router/lazy.js

@@ -48,5 +48,3 @@ function restorePendingLazy(lazyImports) {
 }
 //#endregion
 export { _drainLazy, _snapshotLazy, _snapshotRouteSourceLazy, associateRouteSourceLazy, clearPendingLazy, lazy, restorePendingLazy };
-
-//# sourceMappingURL=lazy.js.map

package/dist/router/manifest.d.ts

@@ -6,5 +6,4 @@ declare function _applyManifest(manifest: RouteManifest): void;
 declare function clearRoutes(): void;
 declare function createRouteRegistry(definition: RouteDefinition, options?: RegisterRoutesOptions): RouteRegistry;
 //#endregion
-export { clearRoutes, createRouteRegistry, getManifest };
-//# sourceMappingURL=manifest.d.ts.map
+export { clearRoutes, createRouteRegistry, getManifest };

package/dist/router/manifest.js

@@ -45,5 +45,3 @@ function createRouteRegistry(definition, options = {}) {
 }
 //#endregion
 export { _applyManifest, clearRoutes, createRouteRegistry, getManifest };
-
-//# sourceMappingURL=manifest.js.map

package/dist/router/match.js

@@ -118,5 +118,3 @@ function matchSegments(urlParts, segments) {
 }
 //#endregion
 export { computeRank, matchSegments, normalizeRouteSegmentName, parseSegments, splitPathSegments };
-
-//# sourceMappingURL=match.js.map

package/dist/router/navigate.d.ts

@@ -7,5 +7,4 @@ declare function navigate(path: string, options?: NavigateOptions): void;
 declare function initializeNavigation(): void;
 declare function cleanupNavigation(): void;
 //#endregion
-export { type HistoryScrollBehavior, type NavigateOptions, type NavigationScrollBehavior, type RouteQueryParamInput, type RouteQueryParamValue, type RouteQueryUpdater, type RouteQueryUpdates, type ScrollRestorationOptions, type UpdateRouteQueryOptions, navigate, updateRouteQuery };
-//# sourceMappingURL=navigate.d.ts.map
+export { type HistoryScrollBehavior, type NavigateOptions, type NavigationScrollBehavior, type RouteQueryParamInput, type RouteQueryParamValue, type RouteQueryUpdater, type RouteQueryUpdates, type ScrollRestorationOptions, type UpdateRouteQueryOptions, navigate, updateRouteQuery };

package/dist/router/navigate.js

@@ -1,7 +1,7 @@
-import { logger } from "../dev/logger.js";
+import { logger } from "../common/logger.js";
 import { isPromiseLike } from "../common/promise.js";
-import { configureScrollRestoration, saveScrollPosition } from "./navigation-scroll.js";
 import { configureNavigationRegistryHost, getCurrentHref, hasRegisteredApps, parseTargetUrl, registerAppInstance, unregisterAppInstance } from "./navigation-registry.js";
+import { configureScrollRestoration } from "./navigation-scroll.js";
 import { applyNavigationTargets, applyPopStateNavigationTargets, beginRouteRequest, cancelRouteRequests, isStaleRouteRequest, resolveNavigationTargetsForApps } from "./navigation-targets.js";
 import { updateRouteQuery } from "./route-query.js";
 //#region src/router/navigate.ts
@@ -29,7 +29,7 @@ function navigateWithRedirectState(path, options, redirectState) {
 		Promise.resolve(resolvedTargets).then((targets) => {
 			if (isStaleRouteRequest(request.id)) return;
 			try {
-				applyNavigationTargets(path, options, redirectState, pathname, href, targets, navigateWithRedirectState);
+				applyNavigationTargets(request.id, path, options, redirectState, pathname, href, targets, navigateWithRedirectState);
 			} catch (error) {
 				logger.error("[Askr] navigation failed:", error);
 			}
@@ -38,18 +38,17 @@ function navigateWithRedirectState(path, options, redirectState) {
 		});
 		return;
 	}
-	applyNavigationTargets(path, options, redirectState, pathname, href, resolvedTargets, navigateWithRedirectState);
+	applyNavigationTargets(request.id, path, options, redirectState, pathname, href, resolvedTargets, navigateWithRedirectState);
 }
 function handlePopState(event) {
 	const request = beginRouteRequest();
 	const previousHref = getCurrentHref();
 	const pathname = window.location.pathname;
 	const href = `${window.location.pathname}${window.location.search}${window.location.hash}`;
-	saveScrollPosition(previousHref);
 	if (!hasRegisteredApps()) return;
 	const applyResolved = (targets) => {
 		try {
-			applyPopStateNavigationTargets(request.id, pathname, href, event.state, targets, navigate);
+			applyPopStateNavigationTargets(request.id, previousHref, { path: previousHref }, pathname, href, event.state, targets, navigate);
 		} catch (error) {
 			logger.error("[Askr] popstate navigation failed:", error);
 		}
@@ -72,5 +71,3 @@ function initializeNavigation() {
 }
 //#endregion
 export { configureScrollRestoration, initializeNavigation, navigate, registerAppInstance, unregisterAppInstance, updateRouteQuery };
-
-//# sourceMappingURL=navigate.js.map

package/dist/router/navigation-registry.d.ts

@@ -28,5 +28,4 @@ declare function syncRegisteredRouteSnapshot(): void;
 declare function registerAppInstance(instance: ComponentInstance, path: string, source?: AppNavigationSource): void;
 declare function unregisterAppInstance(instance: ComponentInstance): void;
 //#endregion
-export { AppNavigationSource, AppRegistration };
-//# sourceMappingURL=navigation-registry.d.ts.map
+export { AppNavigationSource, AppRegistration };

package/dist/router/navigation-registry.js

@@ -1,6 +1,6 @@
 import { isProductionEnvironment } from "../common/env.js";
 import { lockRouteRegistration } from "./store.js";
-import { computeRouteActivityMatches } from "./resolution.js";
+import { computeRouteActivityMatches } from "./route-matching.js";
 import { syncCurrentRouteSnapshot } from "./activity.js";
 import "./route.js";
 //#region src/router/navigation-registry.ts
@@ -101,5 +101,3 @@ function unregisterAppInstance(instance) {
 }
 //#endregion
 export { configureNavigationRegistryHost, getCurrentHref, getCurrentPathname, getRegisteredAppsSnapshot, getWindowHref, hasRegisteredApps, parseTargetUrl, registerAppInstance, setCurrentRouteLocation, syncAppRegistrationLocation, syncRegisteredRouteSnapshot, unregisterAppInstance };
-
-//# sourceMappingURL=navigation-registry.js.map

package/dist/router/navigation-scroll.d.ts

@@ -10,5 +10,4 @@ declare function applyNavigationScroll(behavior?: NavigationScrollBehavior): voi
 declare function applyHistoryScroll(href: string, state: PopStateEvent['state']): void;
 declare function configureScrollRestoration(options?: boolean | ScrollRestorationOptions): void;
 //#endregion
-export { HistoryScrollBehavior, NavigationScrollBehavior, ScrollRestorationOptions };
-//# sourceMappingURL=navigation-scroll.d.ts.map
+export { HistoryScrollBehavior, NavigationScrollBehavior, ScrollRestorationOptions };

package/dist/router/navigation-scroll.js

@@ -89,5 +89,3 @@ function configureScrollRestoration(options) {
 }
 //#endregion
 export { applyHistoryScroll, applyNavigationScroll, configureScrollRestoration, saveScrollPosition };
-
-//# sourceMappingURL=navigation-scroll.js.map

package/dist/router/navigation-targets.d.ts

@@ -24,8 +24,7 @@ declare function isStaleRouteRequest(requestId: number): boolean;
 declare function cancelRouteRequests(): void;
 declare function getRedirectHistoryMode(replace: boolean | undefined): 'push' | 'replace';
 declare function resolveNavigationTargetsForApps(pathname: string, href: string, signal: AbortSignal): AppNavigationTarget[] | Promise<AppNavigationTarget[]>;
-declare function applyNavigationTargets(path: string, options: NavigateOptions, redirectState: NavigationRedirectState, pathname: string, href: string, targets: AppNavigationTarget[], navigateWithRedirectState: (path: string, options: NavigateOptions, redirectState: NavigationRedirectState) => void): void;
-declare function applyPopStateNavigationTargets(requestId: number, pathname: string, href: string, state: unknown, targets: AppNavigationTarget[], navigate: (path: string, options: NavigateOptions) => void): void;
+declare function applyNavigationTargets(requestId: number, path: string, options: NavigateOptions, redirectState: NavigationRedirectState, pathname: string, href: string, targets: AppNavigationTarget[], navigateWithRedirectState: (path: string, options: NavigateOptions, redirectState: NavigationRedirectState) => void): void;
+declare function applyPopStateNavigationTargets(requestId: number, previousHref: string, previousState: unknown, pathname: string, href: string, state: unknown, targets: AppNavigationTarget[], navigate: (path: string, options: NavigateOptions) => void): void;
 //#endregion
-export { AppNavigationTarget, NavigateOptions, NavigationRedirectState };
-//# sourceMappingURL=navigation-targets.d.ts.map
+export { AppNavigationTarget, NavigateOptions, NavigationRedirectState };