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

package/dist/index.d.mts

@@ -271,11 +271,23 @@ interface CloseDialogOptions extends HybridRequestOptions {
   local?: boolean;
 }
 //#endregion
+//#region src/query.d.ts
+type QueryArrayFormat = 'indices' | 'brackets';
+type QueryValue = string | number | boolean | null | undefined | QueryValue[] | Set<QueryValue> | {
+  [key: string]: QueryValue;
+};
+interface StringifyQueryOptions {
+  arrayFormat?: QueryArrayFormat;
+  addQueryPrefix?: boolean;
+}
+declare function parseQueryString(query: string): Record<string, any>;
+declare function stringifyQueryString(value: QueryValue, options?: StringifyQueryOptions): string;
+//#endregion
 //#region src/url.d.ts
 type UrlResolvable = string | URL | Location;
 type UrlTransformable = BaseUrlTransformable | ((string: URL) => BaseUrlTransformable);
 type BaseUrlTransformable = Partial<Omit<URL, 'searchParams' | 'toJSON' | 'toString'>> & {
-  query?: any;
+  query?: Record<string, QueryValue>;
   trailingSlash?: boolean;
 };
 /** Normalizes the given input to an URL. */
@@ -575,15 +587,6 @@ declare const router: {
 /** Creates the hybridly router. */
 declare function createRouter(options: RouterContextOptions): Promise<InternalRouterContext>;
 //#endregion
-//#region src/query.d.ts
-type QueryArrayFormat = 'indices' | 'brackets';
-interface StringifyQueryOptions {
-  arrayFormat?: QueryArrayFormat;
-  addQueryPrefix?: boolean;
-}
-declare function parseQueryString(query: string): Record<string, any>;
-declare function stringifyQueryString(value: unknown, options?: StringifyQueryOptions): string;
-//#endregion
 //#region src/authorization.d.ts
 interface Authorizable<Authorizations extends Record<string, boolean>> {
   authorization: Authorizations;

package/dist/index.mjs

@@ -1,7 +1,8 @@
 import { t as __exportAll } from "./_chunks/chunk.mjs";
 import { debug, hasFiles, merge, mergeObject, objectToFormData, random, showResponseErrorModal, wrap } from "@hybridly/utils";
 import { trimEnd } from "es-toolkit/string";
-import { parse, stringify } from "picoquery";
+import { isPlainObject } from "es-toolkit/predicate";
+import { parse, stringify } from "neoqs";
 import { debounce } from "es-toolkit/function";
 import { parse as parse$1, stringify as stringify$1 } from "superjson";
 import { get, set, uniqBy } from "es-toolkit/compat";
@@ -9,35 +10,15 @@ import { get, set, uniqBy } from "es-toolkit/compat";
 function parseQueryString(query) {
 	const source = query.startsWith("?") ? query.slice(1) : query;
 	if (!source) return {};
-	return parse(source, {
-		nesting: true,
-		nestingSyntax: "index",
-		arrayRepeat: true,
-		arrayRepeatSyntax: "bracket"
-	});
+	return parse(source);
 }
 function stringifyQueryString(value, options = {}) {
-	const normalizedQuery = unescapeBracketSyntaxInKeys(stringify(normalizeQueryValue(value), {
-		nesting: true,
-		nestingSyntax: "index",
-		arrayRepeat: (options.arrayFormat ?? "brackets") === "brackets",
-		arrayRepeatSyntax: "bracket"
-	}));
-	if (!normalizedQuery) return "";
-	return options.addQueryPrefix ? `?${normalizedQuery}` : normalizedQuery;
-}
-function unescapeBracketSyntaxInKeys(query) {
-	if (!query) return query;
-	return query.split("&").map((entry) => {
-		const separator = entry.indexOf("=");
-		if (separator < 0) return decodeBracketSyntax(entry);
-		const key = entry.slice(0, separator);
-		const value = entry.slice(separator);
-		return `${decodeBracketSyntax(key)}${value}`;
-	}).join("&");
-}
-function decodeBracketSyntax(value) {
-	return value.replace(/%5B/gi, "[").replace(/%5D/gi, "]");
+	const query = stringify(normalizeQueryValue(value), {
+		arrayFormat: options.arrayFormat ?? "brackets",
+		encodeValuesOnly: true
+	});
+	if (!query) return "";
+	return options.addQueryPrefix ? `?${query}` : query;
 }
 function normalizeQueryValue(value) {
 	if (value instanceof Set) return [...value].map((entry) => normalizeQueryValue(entry));
@@ -48,11 +29,6 @@ function normalizeQueryValue(value) {
 	}), {});
 	return value;
 }
-function isPlainObject(value) {
-	if (typeof value !== "object" || value === null) return false;
-	const prototype = Object.getPrototypeOf(value);
-	return prototype === null || prototype === Object.prototype;
-}
 //#endregion
 //#region src/url.ts
 /** Normalizes the given input to an URL. */
@@ -69,9 +45,8 @@ function makeUrl(href, transformations = {}) {
 		transformations = typeof transformations === "function" ? transformations(url) ?? {} : transformations ?? {};
 		Object.entries(transformations).forEach(([key, value]) => {
 			if (key === "query") {
-				const currentQueryParameters = merge(parseQueryString(url.search), value, { mergePlainObjects: true });
 				key = "search";
-				value = stringifyQueryString(currentQueryParameters, { arrayFormat: "brackets" });
+				value = stringifyQueryString(merge(parseQueryString(url.search), value, { mergePlainObjects: true }), { arrayFormat: "brackets" });
 			}
 			Reflect.set(url, key, value);
 		});
@@ -610,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) {
@@ -699,8 +677,8 @@ async function transformOptions(options) {
 		debug.router("Converted data to FormData.", options.data);
 	}
 	if (!(options.data instanceof FormData) && options.method === "GET" && Object.keys(options.data ?? {}).length) {
-		debug.router("Transforming data to query parameters.", options.data);
 		options.url = makeUrl(options.url ?? context.url, { query: options.data });
+		debug.router("Transforming data to query parameters.", options.data, options.url);
 		options.data = {};
 	}
 	if ([
@@ -734,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.");
@@ -913,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({
@@ -944,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.16",
+	"version": "0.10.0-beta.18",
 	"description": "Core functionality of Hybridly",
 	"author": "Enzo Innocenzi <enzo@innocenzi.dev>",
 	"license": "MIT",
@@ -40,8 +40,8 @@
 		"build:stub": "obuild --stub"
 	},
 	"dependencies": {
-		"@hybridly/utils": "0.10.0-beta.16",
-		"picoquery": "^2.5.0",
+		"@hybridly/utils": "0.10.0-beta.18",
+		"neoqs": "^6.13.0",
 		"superjson": "^2.2.2",
 		"es-toolkit": "^1.45.1"
 	},