@hybridly/core 0.10.0-beta.17 → 0.10.0-beta.18

package/dist/index.mjs

@@ -585,6 +585,9 @@ function createPromiseWithResolvers() {
 		reject
 	};
 }
+function evaluateConditionalOption(options, option) {
+	return typeof option === "function" ? option(options) : option;
+}
 //#endregion
 //#region src/router/request/request.ts
 function createPendingHybridRequest(options) {
@@ -709,13 +712,10 @@ async function navigate(options) {
 	options.payload ??= payloadFromContext();
 	options.payload.view ??= payloadFromContext().view;
 	options.payload.view.properties = options.properties ?? options.payload.view.properties;
-	function evaluateConditionalOption(option) {
-		return typeof option === "function" ? option(options) : option;
-	}
-	const shouldPreserveState = evaluateConditionalOption(options.preserveState);
-	const shouldPreserveScroll = evaluateConditionalOption(options.preserveScroll);
-	const shouldReplaceHistory = evaluateConditionalOption(options.replace);
-	const shouldReplaceUrl = evaluateConditionalOption(options.preserveUrl);
+	const shouldPreserveState = evaluateConditionalOption(options, options.preserveState);
+	const shouldPreserveScroll = evaluateConditionalOption(options, options.preserveScroll);
+	const shouldReplaceHistory = evaluateConditionalOption(options, options.replace);
+	const shouldReplaceUrl = evaluateConditionalOption(options, options.preserveUrl);
 	const shouldPreserveView = !options.payload.view.component;
 	if (shouldPreserveState && getHistoryMemo() && options.payload.view.component === context.view.component) {
 		debug.history("Setting the memo from this history entry into the current context.");
@@ -888,7 +888,7 @@ async function handleHybridRequestResponse({ request, response }) {
 	if (options.mode !== "async" || context.view.component === request.view.component) {
 		const properties = (() => {
 			if (!payload.view && !isPartial(options)) return;
-			if (!payload.view.component || payload.view.component === context.view.component) return resolveProperties(context.view.properties, payload.view);
+			if (!payload.view.component || payload.view.component === context.view.component) return resolveProperties(context.view.properties, payload.view, { mergeWithOriginal: evaluateConditionalOption(options, options.preserveState) !== false });
 		})();
 		if (properties) debug.router("Merged properties:", properties);
 		await navigate({
@@ -919,13 +919,15 @@ function isHybridResponse(response) {
 	return response.headers.has(HYBRIDLY_HEADER);
 }
 function isPartial(options) {
-	return options.only !== void 0 || options.except !== void 0;
+	return options.only !== void 0 || options.except !== void 0 || options.reset !== void 0;
 }
-function resolveProperties(original, payload) {
-	const mergedPayloadProperties = merge(original, payload.properties);
-	(payload.mergeable ?? []).forEach(([mergeableProperty, prepends, uniqueBy]) => {
+function resolveProperties(original, payload, options) {
+	const mergeable = payload.mergeable ?? [];
+	const mergedPayloadProperties = options.mergeWithOriginal ? merge(original, payload.properties) : payload.properties;
+	mergeable.forEach(([mergeableProperty, prepends, uniqueBy]) => {
 		const originalValue = get(original, mergeableProperty);
 		const newValue = get(payload.properties, mergeableProperty);
+		if (!options.mergeWithOriginal && newValue === void 0) return;
 		const mergeArrays = (current, incoming) => {
 			const merged = prepends === true ? [...incoming, ...current] : [...current, ...incoming];
 			if (typeof uniqueBy !== "string") return merged;

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "@hybridly/core",
 	"type": "module",
-	"version": "0.10.0-beta.17",
+	"version": "0.10.0-beta.18",
 	"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.17",
+		"@hybridly/utils": "0.10.0-beta.18",
 		"neoqs": "^6.13.0",
 		"superjson": "^2.2.2",
 		"es-toolkit": "^1.45.1"