@manyducks.co/dolla 0.75.1 → 0.76.0

package/lib/index.js

@@ -2995,6 +2995,9 @@ function resolvePath(base, part) {
 function parseQueryParams(query) {
   if (!query)
     return {};
+  if (query.startsWith("?")) {
+    query = query.slice(1);
+  }
   const entries = query.split("&").filter((x) => x.trim() !== "").map((entry) => {
     const [key, value] = entry.split("=").map((x) => x.trim());
     if (value.toLowerCase() === "true") {
@@ -3252,21 +3255,19 @@ function RouterStore(ctx) {
   const $$pattern = $$(null);
   const $$path = $$("");
   const $$params = $$({});
-  const $$query = $$({});
-  let isRouteChange = true;
+  const $$query = $$(parseQueryParams(window.location.search));
   ctx.observe($$query, (current) => {
-    if (isRouteChange) {
-      isRouteChange = false;
-      return;
-    }
     const params = new URLSearchParams();
     for (const key in current) {
       params.set(key, String(current[key]));
     }
-    history.replace({
-      pathname: history.location.pathname,
-      search: "?" + params.toString()
-    });
+    const search = "?" + params.toString();
+    if (search != history.location.search) {
+      history.replace({
+        pathname: history.location.pathname,
+        search
+      });
+    }
   });
   ctx.onConnected(() => {
     history.listen(onRouteChange);
@@ -3286,8 +3287,7 @@ function RouterStore(ctx) {
   const onRouteChange = async ({ location }) => {
     if (location.search !== lastQuery) {
       lastQuery = location.search;
-      isRouteChange = true;
-      $$query.set(parseQueryParams(location.search.startsWith("?") ? location.search.slice(1) : location.search));
+      $$query.set(parseQueryParams(location.search));
     }
     const matched = matchRoutes(routes, location.pathname);
     if (!matched) {
@@ -3399,6 +3399,9 @@ function RouterStore(ctx) {
       joined = path.toString();
     }
     joined = resolvePath(history.location.pathname, joined);
+    if (options.preserveQuery) {
+      joined += history.location.search;
+    }
     if (options.replace) {
       history.replace(joined);
     } else {