@hybridly/core 0.10.0-beta.15 → 0.10.0-beta.16

package/dist/index.d.mts

@@ -109,7 +109,7 @@ interface RequestHooks {
    */
   fail: (error: Error, request: PendingHybridRequest, context: InternalRouterContext) => MaybePromise<any>;
   /**
-   * Called after a request has been made, even if it didn't succeed.
+   * Called after a response has been received, even if it didn't succeed in a navigation.
    */
   after: (request: PendingHybridRequest, context: InternalRouterContext) => MaybePromise<any>;
 }
@@ -553,7 +553,7 @@ type Validation = Record<string, Errors>;
 declare const router: {
   abort: () => void;
   navigate: (options: HybridRequestOptions) => Promise<NavigationResponse>;
-  reload: (options: HybridRequestOptions | undefined) => Promise<NavigationResponse>;
+  reload: (options?: HybridRequestOptions | undefined) => Promise<NavigationResponse>;
   get: (url: UrlResolvable, options?: Omit<HybridRequestOptions, "method" | "url"> | undefined) => Promise<NavigationResponse>;
   post: (url: UrlResolvable, options?: Omit<HybridRequestOptions, "method" | "url"> | undefined) => Promise<NavigationResponse>;
   put: (url: UrlResolvable, options?: Omit<HybridRequestOptions, "method" | "url"> | undefined) => Promise<NavigationResponse>;
@@ -561,8 +561,8 @@ declare const router: {
   delete: (url: UrlResolvable, options?: Omit<HybridRequestOptions, "method" | "url"> | undefined) => Promise<NavigationResponse>;
   local: (url: UrlResolvable, options?: ComponentNavigationOptions) => Promise<void>;
   external: (url: UrlResolvable, data?: _hybridly_utils0.RequestData) => void;
-  to: <T extends RouteName>(name: T, parameters: Record<string, any> | undefined, options: Omit<HybridRequestOptions, "url"> | undefined) => Promise<NavigationResponse>;
-  matches: <T extends RouteName>(name: T, parameters: Record<string, any> | undefined) => boolean;
+  to: <T extends RouteName>(name: T, parameters?: Record<string, any> | undefined, options?: Omit<HybridRequestOptions, "url"> | undefined) => Promise<NavigationResponse>;
+  matches: <T extends RouteName>(name: T, parameters?: Record<string, any> | undefined) => boolean;
   current: () => string | undefined;
   dialog: {
     close: (options?: CloseDialogOptions | undefined) => Promise<void | NavigationResponse>;

package/dist/index.mjs

@@ -1,5 +1,5 @@
 import { t as __exportAll } from "./_chunks/chunk.mjs";
-import { debug, getByPath, hasFiles, merge, mergeObject, objectToFormData, random, showResponseErrorModal, wrap } from "@hybridly/utils";
+import { debug, hasFiles, merge, mergeObject, objectToFormData, random, showResponseErrorModal, wrap } from "@hybridly/utils";
 import { trimEnd } from "es-toolkit/string";
 import { parse, stringify } from "picoquery";
 import { debounce } from "es-toolkit/function";
@@ -949,8 +949,8 @@ function isPartial(options) {
 function resolveProperties(original, payload) {
 	const mergedPayloadProperties = merge(original, payload.properties);
 	(payload.mergeable ?? []).forEach(([mergeableProperty, prepends, uniqueBy]) => {
-		const originalValue = getByPath(original, mergeableProperty);
-		const newValue = getByPath(payload.properties, mergeableProperty);
+		const originalValue = get(original, mergeableProperty);
+		const newValue = get(payload.properties, mergeableProperty);
 		const mergeArrays = (current, incoming) => {
 			const merged = prepends === true ? [...incoming, ...current] : [...current, ...incoming];
 			if (typeof uniqueBy !== "string") return merged;
@@ -1014,7 +1014,12 @@ async function processNextResponse() {
 		return;
 	}
 	debug.queue("Processing response", response);
-	response.request.resolve(await handleHybridRequestResponse(response));
+	try {
+		response.request.resolve(await handleHybridRequestResponse(response));
+	} finally {
+		debug.router("Ended navigation.", response.request);
+		await runHooks("after", response.request.options.hooks, response.request, getInternalRouterContext());
+	}
 	return await processNextResponse();
 }
 //#endregion
@@ -1071,8 +1076,6 @@ async function processRequest(request, onFinally) {
 		await handleTransportError(request, error);
 	} finally {
 		request.completed = true;
-		debug.router("Ended navigation.", request);
-		await runHooks("after", request.options.hooks, request, getRouterContext());
 		onFinally();
 	}
 }
@@ -1535,7 +1538,7 @@ async function closeDialog(options) {
 const router = {
 	abort: () => cancelNavigationRequest(),
 	navigate: async (options) => await performHybridNavigation(options),
-	reload: async (options) => await performHybridNavigation({
+	reload: async (options = {}) => await performHybridNavigation({
 		preserveScroll: true,
 		preserveState: true,
 		replace: true,
@@ -1573,7 +1576,7 @@ const router = {
 	}),
 	local: async (url, options = {}) => await performLocalNavigation(url, options),
 	external: (url, data = {}) => navigateToExternalUrl(url, data),
-	to: async (name, parameters, options) => {
+	to: async (name, parameters = void 0, options = {}) => {
 		const url = generateRouteFromName(name, parameters);
 		const method = getRouteDefinition(name).method.at(0);
 		return await performHybridNavigation({
@@ -1582,7 +1585,7 @@ const router = {
 			method
 		});
 	},
-	matches: (name, parameters) => currentRouteMatches(name, parameters),
+	matches: (name, parameters = void 0) => currentRouteMatches(name, parameters),
 	current: () => getCurrentRouteName(),
 	dialog: { close: (options = {}) => closeDialog(options) },
 	history: {

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "@hybridly/core",
 	"type": "module",
-	"version": "0.10.0-beta.15",
+	"version": "0.10.0-beta.16",
 	"description": "Core functionality of Hybridly",
 	"author": "Enzo Innocenzi <enzo@innocenzi.dev>",
 	"license": "MIT",
@@ -40,7 +40,7 @@
 		"build:stub": "obuild --stub"
 	},
 	"dependencies": {
-		"@hybridly/utils": "0.10.0-beta.15",
+		"@hybridly/utils": "0.10.0-beta.16",
 		"picoquery": "^2.5.0",
 		"superjson": "^2.2.2",
 		"es-toolkit": "^1.45.1"