@hybridly/core 0.0.1-alpha.10 → 0.0.1-alpha.12

package/dist/index.cjs

@@ -2,8 +2,8 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-const utils = require('@hybridly/utils');
 const qs = require('qs');
+const utils = require('@hybridly/utils');
 const axios = require('axios');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e["default"] : e; }
@@ -165,7 +165,16 @@ function makeUrl(href, transformations = {}) {
   try {
     const base = document?.location?.href === "//" ? void 0 : document.location.href;
     const url = new URL(String(href), base);
-    Object.entries(transformations ?? {}).forEach(([key, value]) => Reflect.set(url, key, value));
+    Object.entries(transformations ?? {}).forEach(([key, value]) => {
+      if (key === "query") {
+        key = "search";
+        value = qs__default.stringify(utils.merge(qs__default.parse(url.search, { ignoreQueryPrefix: true }), value), {
+          encodeValuesOnly: true,
+          arrayFormat: "brackets"
+        });
+      }
+      Reflect.set(url, key, value);
+    });
     return url;
   } catch (error) {
     throw new TypeError(`${href} is not resolvable to a valid URL.`);
@@ -423,6 +432,17 @@ async function performHybridNavigation(options) {
         options.method = "POST";
       }
     }
+    if (!options.method) {
+      utils.debug.router("Setting method to GET because none was provided.");
+      options.method = "GET";
+    }
+    if (!(options.data instanceof FormData) && options.method === "GET" && Object.keys(options.data ?? {}).length) {
+      utils.debug.router("Transforming data to query parameters.", options.data);
+      options.url = makeUrl(options.url ?? context.url, {
+        query: options.data
+      });
+      options.data = {};
+    }
     if (!await runHooks("before", options.hooks, options, context)) {
       utils.debug.router('"before" event returned false, aborting the navigation.');
       throw new NavigationCancelledError('The navigation was cancelled by the "before" event.');
@@ -448,7 +468,7 @@ async function performHybridNavigation(options) {
     utils.debug.router("Making request with axios.");
     const response = await context.axios.request({
       url: context.pendingNavigation.url.toString(),
-      method: options.method ?? "GET",
+      method: options.method,
       data: options.method === "GET" ? {} : options.data,
       params: options.method === "GET" ? options.data : {},
       signal: context.pendingNavigation.controller.signal,

package/dist/index.d.ts

@@ -1,7 +1,7 @@
 import { RequestData } from '@hybridly/utils';
 import { AxiosResponse, Axios, AxiosProgressEvent } from 'axios';
 
-declare type MaybePromise<T> = T | Promise<T>;
+type MaybePromise<T> = T | Promise<T>;
 
 interface Hooks {
     /**
@@ -113,7 +113,7 @@ interface InternalRouterContext {
     axios: Axios;
 }
 /** Router context. */
-declare type RouterContext = Readonly<InternalRouterContext>;
+type RouterContext = Readonly<InternalRouterContext>;
 /** Adapter-specific functions. */
 interface Adapter {
     /** Resolves a component from the given name. */
@@ -138,8 +138,10 @@ interface Serializer {
 /** Gets the current context. */
 declare function getRouterContext(): RouterContext;
 
-declare type UrlResolvable = string | URL | Location;
-declare type UrlTransformable = Partial<Omit<URL, 'searchParams' | 'toJSON' | 'toString'>>;
+type UrlResolvable = string | URL | Location;
+type UrlTransformable = Partial<Omit<URL, 'searchParams' | 'toJSON' | 'toString'>> & {
+    query?: any;
+};
 /**
  * Converts an input to an URL, optionally changing its properties after initialization.
  */
@@ -149,7 +151,7 @@ declare function makeUrl(href: UrlResolvable, transformations?: UrlTransformable
  */
 declare function sameUrls(...hrefs: UrlResolvable[]): boolean;
 
-declare type ConditionalNavigationOption = boolean | ((payload: HybridPayload) => boolean);
+type ConditionalNavigationOption = boolean | ((payload: HybridPayload) => boolean);
 interface ComponentNavigationOptions {
     /** Name of the component to use. */
     component?: string;
@@ -200,7 +202,7 @@ interface NavigationOptions {
      */
     isBackForward?: boolean;
 }
-declare type Method = 'GET' | 'POST' | 'PUT' | 'PATCH' | 'DELETE';
+type Method = 'GET' | 'POST' | 'PUT' | 'PATCH' | 'DELETE';
 interface HybridRequestOptions extends Omit<NavigationOptions, 'payload'> {
     /** The URL to navigation. */
     url?: UrlResolvable;
@@ -225,6 +227,10 @@ interface HybridRequestOptions extends Omit<NavigationOptions, 'payload'> {
      * @see https://laravel.com/docs/9.x/routing#form-method-spoofing
      */
     spoof?: boolean;
+    /**
+     * If `false`, does not trigger the progress bar for this request.
+     */
+    progress?: boolean;
 }
 interface NavigationResponse {
     response?: AxiosResponse;
@@ -282,21 +288,21 @@ interface View {
     /** Properties to apply to the component. */
     properties: Properties;
 }
-declare type Property = null | string | number | boolean | Property[] | {
+type Property = null | string | number | boolean | Property[] | {
     [name: string]: Property;
 };
-declare type Properties = Record<string | number, Property>;
+type Properties = Record<string | number, Property>;
 interface SwapOptions<T> {
     /** The new component. */
     component: T;
     /** Whether to preserve the state of the component. */
     preserveState?: boolean;
 }
-declare type ViewComponent = any;
-declare type DialogComponent = any;
-declare type ResolveComponent = (name: string) => Promise<ViewComponent>;
-declare type SwapView = (options: SwapOptions<ViewComponent>) => Promise<void>;
-declare type SwapDialog = (options: SwapOptions<DialogComponent>) => Promise<void>;
+type ViewComponent = any;
+type DialogComponent = any;
+type ResolveComponent = (name: string) => Promise<ViewComponent>;
+type SwapView = (options: SwapOptions<ViewComponent>) => Promise<void>;
+type SwapDialog = (options: SwapOptions<DialogComponent>) => Promise<void>;
 /** The payload of a navigation request from the server. */
 interface HybridPayload {
     /** The view to use in this request. */

package/dist/index.mjs

@@ -1,5 +1,5 @@
-import { debug, debounce, random, hasFiles, objectToFormData, when, merge, match, showResponseErrorModal } from '@hybridly/utils';
 import qs from 'qs';
+import { debug, merge, debounce, random, hasFiles, objectToFormData, when, match, showResponseErrorModal } from '@hybridly/utils';
 import axios from 'axios';
 
 const STORAGE_EXTERNAL_KEY = "hybridly:external";
@@ -156,7 +156,16 @@ function makeUrl(href, transformations = {}) {
   try {
     const base = document?.location?.href === "//" ? void 0 : document.location.href;
     const url = new URL(String(href), base);
-    Object.entries(transformations ?? {}).forEach(([key, value]) => Reflect.set(url, key, value));
+    Object.entries(transformations ?? {}).forEach(([key, value]) => {
+      if (key === "query") {
+        key = "search";
+        value = qs.stringify(merge(qs.parse(url.search, { ignoreQueryPrefix: true }), value), {
+          encodeValuesOnly: true,
+          arrayFormat: "brackets"
+        });
+      }
+      Reflect.set(url, key, value);
+    });
     return url;
   } catch (error) {
     throw new TypeError(`${href} is not resolvable to a valid URL.`);
@@ -414,6 +423,17 @@ async function performHybridNavigation(options) {
         options.method = "POST";
       }
     }
+    if (!options.method) {
+      debug.router("Setting method to GET because none was provided.");
+      options.method = "GET";
+    }
+    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
+      });
+      options.data = {};
+    }
     if (!await runHooks("before", options.hooks, options, context)) {
       debug.router('"before" event returned false, aborting the navigation.');
       throw new NavigationCancelledError('The navigation was cancelled by the "before" event.');
@@ -439,7 +459,7 @@ async function performHybridNavigation(options) {
     debug.router("Making request with axios.");
     const response = await context.axios.request({
       url: context.pendingNavigation.url.toString(),
-      method: options.method ?? "GET",
+      method: options.method,
       data: options.method === "GET" ? {} : options.data,
       params: options.method === "GET" ? options.data : {},
       signal: context.pendingNavigation.controller.signal,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hybridly/core",
-  "version": "0.0.1-alpha.10",
+  "version": "0.0.1-alpha.12",
   "description": "A solution to develop server-driven, client-rendered applications",
   "keywords": [
     "hybridly",
@@ -36,11 +36,11 @@
     "axios": "^1"
   },
   "dependencies": {
-    "@hybridly/utils": "0.0.1-alpha.10",
+    "@hybridly/utils": "0.0.1-alpha.12",
     "qs": "^6.11.0"
   },
   "devDependencies": {
-    "defu": "^6.1.0"
+    "defu": "^6.1.1"
   },
   "scripts": {
     "build": "unbuild",