Organize url helpers in a single file and rename "mergeQueryStringsWi…

…thData" to "mergeQueryStringWithData"

packages/inertia-react/src/Link.js

@@ -1,4 +1,4 @@
-import { hrefToUrl, Inertia, mergeQueryStringsWithData, shouldIntercept } from '@inertiajs/inertia'
+import { hrefToUrl, Inertia, mergeQueryStringWithData, shouldIntercept } from '@inertiajs/inertia'
 import { createElement, useCallback, forwardRef } from 'react'
 
 const noop = () => undefined
@@ -65,7 +65,7 @@ export default forwardRef(function InertiaLink({
     ],
   )
 
-  const [url, _data] = mergeQueryStringsWithData(method, hrefToUrl(href), data)
+  const [url, _data] = mergeQueryStringWithData(method, hrefToUrl(href), data)
   href = url.href
   data = _data
 

packages/inertia-vue/src/link.js

@@ -1,4 +1,4 @@
-import { hrefToUrl, Inertia, mergeQueryStringsWithData, shouldIntercept } from '@inertiajs/inertia'
+import { hrefToUrl, Inertia, mergeQueryStringWithData, shouldIntercept } from '@inertiajs/inertia'
 
 export default {
   functional: true,
@@ -48,7 +48,7 @@ export default {
       ...(data.on || {}),
     }
 
-    let [url, propsData] = mergeQueryStringsWithData(
+    let [url, propsData] = mergeQueryStringWithData(
       props.method,
       hrefToUrl(props.href),
       props.data,

packages/inertia-vue3/src/link.js

@@ -1,5 +1,5 @@
 import { h } from 'vue'
-import { hrefToUrl, Inertia, mergeQueryStringsWithData, shouldIntercept } from '@inertiajs/inertia'
+import { hrefToUrl, Inertia, mergeQueryStringWithData, shouldIntercept } from '@inertiajs/inertia'
 
 export default {
   props: {
@@ -38,7 +38,7 @@ export default {
   },
   setup(props, { slots, attrs }) {
     return props => {
-      let [url, data] = mergeQueryStringsWithData(
+      let [url, data] = mergeQueryStringWithData(
         props.method,
         hrefToUrl(props.href),
         props.data,

packages/inertia/src/index.js

@@ -1,5 +1,3 @@
-export { default as hrefToUrl } from './hrefToUrl'
 export { default as Inertia } from './inertia'
-export { default as mergeQueryStringsWithData } from './mergeQueryStringsWithData'
 export { default as shouldIntercept } from './shouldIntercept'
-export { default as urlWithoutHash } from './urlWithoutHash'
+export { hrefToUrl, mergeQueryStringWithData, urlWithoutHash } from './url'

packages/inertia/src/inertia.js

@@ -1,9 +1,7 @@
 import Axios from 'axios'
 import debounce from './debounce'
-import hrefToUrl from './hrefToUrl'
-import mergeQueryStringsWithData from './mergeQueryStringsWithData'
 import modal from './modal'
-import urlWithoutHash from './urlWithoutHash'
+import { hrefToUrl, mergeQueryStringWithData, urlWithoutHash } from './url'
 
 export default {
   resolveComponent: null,
@@ -165,7 +163,7 @@ export default {
     onCancel = () => ({}),
     onSuccess = () => ({}),
   } = {}) {
-    [url, data] = mergeQueryStringsWithData(method, hrefToUrl(url), data)
+    [url, data] = mergeQueryStringWithData(method, hrefToUrl(url), data)
 
     let visit = { url, ...arguments[1] }
     if (onStart(visit) === false || !this.fireEvent('start', { cancelable: true, detail: { visit } } )) {

packages/inertia/src/url.js

@@ -0,0 +1,28 @@
+import qs from 'qs'
+import deepmerge from 'deepmerge'
+
+export function hrefToUrl(href) {
+  try {
+    if (href.startsWith('#')) {
+      return new URL(`${urlWithoutHash(window.location)}${href}`)
+    } else {
+      return new URL(href)
+    }
+  } catch (error) {
+    return new URL(`${window.location.origin}${href}`)
+  }
+}
+
+export function mergeQueryStringWithData(method, url, data) {
+  if (method === 'get' && Object.keys(data).length) {
+    url.search = qs.stringify(deepmerge(qs.parse(url.search, { ignoreQueryPrefix: true }), data))
+    data = {}
+  }
+  return [url, data]
+}
+
+export function urlWithoutHash(url) {
+  url = new URL(url.href)
+  url.hash = ''
+  return url
+}