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

package/dist/index.d.mts

@@ -500,8 +500,7 @@ interface View {
   /** Deferred properties for this view. */
   deferred: Record<string, string | string[]>;
   /** Properties that should be merged with the existing payload. */
-  mergeable: Array<[string, boolean, // true = prepend, false = append
-  string | null]>;
+  mergeable: MergeableProperty[];
 }
 interface Dialog extends Required<View> {
   /** URL that is the base background view when navigating to the dialog directly. */
@@ -511,6 +510,8 @@ interface Dialog extends Required<View> {
   /** Unique identifier for this modal's lifecycle. */
   key: string;
 }
+type MergeableProperty = [string, boolean, // true = prepend, false = append
+string | null, string[]];
 type Property = null | string | number | boolean | Property[] | {
   [name: string]: Property;
 };
@@ -587,16 +588,6 @@ declare const router: {
 /** Creates the hybridly router. */
 declare function createRouter(options: RouterContextOptions): Promise<InternalRouterContext>;
 //#endregion
-//#region src/authorization.d.ts
-interface Authorizable<Authorizations extends Record<string, boolean>> {
-  authorization: Authorizations;
-}
-/**
- * Checks whether the given data has the authorization for the given action.
- * If the data object has no authorization definition corresponding to the given action, this method will return `false`.
- */
-declare function can<Authorizations extends Record<string, boolean>, Data extends Authorizable<Authorizations>, Action extends keyof Data['authorization']>(resource: Data, action: Action): Authorizations[Action];
-//#endregion
 //#region src/routing/route.d.ts
 /**
  * Generates a route from the given route name.
@@ -649,4 +640,4 @@ declare const VERSION_HEADER = "x-hybrid-version";
 declare const ERROR_BAG_HEADER = "x-hybrid-error-bag";
 declare const SCROLL_REGION_ATTRIBUTE = "scroll-region";
 //#endregion
-export { type AsyncInterruptionScope, type Authorizable, type DynamicConfiguration, type Errors, type GlobalHybridlyProperties, type GlobalRouteCollection, type HttpClient, type HttpErrorCode, type HttpErrorKind, type HttpRequest, type HttpResponse, type HttpUploadProgressEvent, type HybridPayload, type HybridRequestOptions, MaybePromise, type Method, type NavigationResponse, type PendingHybridRequest, type Plugin, type Progress, type QueryArrayFormat, type RequestMode, type ResolveComponent, type RouteDefinition, type RouteName, type RouteParameters, type Router, type RouterContext, type RouterContextOptions, type RoutingConfiguration, type StringifyQueryOptions, type UrlResolvable, type Validation, can, constants_d_exports as constants, createRouter, createXhrHttpClient, definePlugin, getRouterContext, isHttpAbortError, isHttpError, makeUrl, parseQueryString, registerHook, route, router, sameUrls, stringifyQueryString };
+export { type AsyncInterruptionScope, type DynamicConfiguration, type Errors, type GlobalHybridlyProperties, type GlobalRouteCollection, type HttpClient, type HttpErrorCode, type HttpErrorKind, type HttpRequest, type HttpResponse, type HttpUploadProgressEvent, type HybridPayload, type HybridRequestOptions, MaybePromise, type Method, type NavigationResponse, type PendingHybridRequest, type Plugin, type Progress, type QueryArrayFormat, type RequestMode, type ResolveComponent, type RouteDefinition, type RouteName, type RouteParameters, type Router, type RouterContext, type RouterContextOptions, type RoutingConfiguration, type StringifyQueryOptions, type UrlResolvable, type Validation, constants_d_exports as constants, createRouter, createXhrHttpClient, definePlugin, getRouterContext, isHttpAbortError, isHttpError, makeUrl, parseQueryString, registerHook, route, router, sameUrls, stringifyQueryString };

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,40 +919,53 @@ function isHybridResponse(response) {
 	return response.headers.has(HYBRIDLY_HEADER);
 }
 function isPartial(options) {
-	return options.only !== void 0 || options.except !== void 0;
-}
-function resolveProperties(original, payload) {
-	const mergedPayloadProperties = merge(original, payload.properties);
-	(payload.mergeable ?? []).forEach(([mergeableProperty, prepends, uniqueBy]) => {
-		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;
-			const getUniqueKey = (entry) => {
-				const key = get(entry, uniqueBy);
-				return key === void 0 ? Symbol() : key;
-			};
-			if (prepends === true) return uniqBy(merged, getUniqueKey);
-			const orderedKeys = [];
-			const valuesByKey = /* @__PURE__ */ new Map();
-			for (const entry of merged) {
-				const key = getUniqueKey(entry);
-				if (!valuesByKey.has(key)) orderedKeys.push(key);
-				valuesByKey.set(key, entry);
-			}
-			return orderedKeys.map((key) => valuesByKey.get(key));
-		};
-		let value = newValue;
-		if (Array.isArray(originalValue)) value = mergeArrays(originalValue, Array.isArray(newValue) ? newValue : newValue === void 0 ? [] : [newValue]);
-		else if (originalValue instanceof Object && newValue instanceof Object) value = merge(originalValue, newValue, {
-			overwriteArray: false,
-			arrayMerge: (current, incoming) => mergeArrays(current, incoming)
-		});
-		set(mergedPayloadProperties, mergeableProperty, value);
-	});
+	return options.only !== void 0 || options.except !== void 0 || options.reset !== void 0;
+}
+function resolveProperties(original, payload, options) {
+	const mergeable = payload.mergeable ?? [];
+	const mergedPayloadProperties = options.mergeWithOriginal ? merge(original, payload.properties) : payload.properties;
+	for (const [property, shouldPrepend, uniqueBy, mergePaths] of mergeable) {
+		const originalValue = get(original, property);
+		const newValue = get(payload.properties, property);
+		if (!options.mergeWithOriginal && newValue === void 0) continue;
+		set(mergedPayloadProperties, property, mergeMergeableProperty(originalValue, newValue, get(mergedPayloadProperties, property), mergePaths, {
+			prepend: shouldPrepend,
+			uniqueBy
+		}));
+	}
 	return mergedPayloadProperties;
 }
+function mergeMergeableProperty(originalValue, newValue, currentValue, mergePaths, options) {
+	if (!mergePaths?.length) return mergeMergeableValue(originalValue, newValue, options);
+	const value = currentValue instanceof Object ? currentValue : {};
+	for (const mergePath of mergePaths) set(value, mergePath, mergeMergeableValue(get(originalValue, mergePath), get(newValue, mergePath), options));
+	return value;
+}
+function mergeMergeableValue(originalValue, newValue, options) {
+	if (Array.isArray(originalValue)) return mergeMergeableArrays(originalValue, Array.isArray(newValue) ? newValue : newValue === void 0 ? [] : [newValue], options);
+	if (originalValue instanceof Object && newValue instanceof Object) return merge(originalValue, newValue, {
+		overwriteArray: false,
+		arrayMerge: (current, incoming) => mergeMergeableArrays(current, incoming, options)
+	});
+	return newValue;
+}
+function mergeMergeableArrays(current, incoming, options) {
+	const merged = options.prepend ? [...incoming, ...current] : [...current, ...incoming];
+	if (typeof options.uniqueBy !== "string") return merged;
+	const getUniqueKey = (entry) => {
+		const key = get(entry, options.uniqueBy);
+		return key === void 0 ? Symbol() : key;
+	};
+	if (options.prepend) return uniqBy(merged, getUniqueKey);
+	const orderedKeys = [];
+	const valuesByKey = /* @__PURE__ */ new Map();
+	for (const entry of merged) {
+		const key = getUniqueKey(entry);
+		if (!valuesByKey.has(key)) orderedKeys.push(key);
+		valuesByKey.set(key, entry);
+	}
+	return orderedKeys.map((key) => valuesByKey.get(key));
+}
 function mergeValidation(current, next, errorBag) {
 	if (!errorBag) return next;
 	return {
@@ -1592,13 +1605,4 @@ async function initializeRouter() {
 	return context;
 }
 //#endregion
-//#region src/authorization.ts
-/**
-* Checks whether the given data has the authorization for the given action.
-* If the data object has no authorization definition corresponding to the given action, this method will return `false`.
-*/
-function can(resource, action) {
-	return resource.authorization?.[action] ?? false;
-}
-//#endregion
-export { can, constants_exports as constants, createRouter, createXhrHttpClient, definePlugin, getRouterContext, isHttpAbortError, isHttpError, makeUrl, parseQueryString, registerHook, route, router, sameUrls, stringifyQueryString };
+export { constants_exports as constants, createRouter, createXhrHttpClient, definePlugin, getRouterContext, isHttpAbortError, isHttpError, makeUrl, parseQueryString, registerHook, route, router, sameUrls, stringifyQueryString };

package/package.json

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