@manyducks.co/dolla 0.73.0 → 0.75.0

package/lib/index.js

@@ -738,6 +738,9 @@ var Conditional = class {
       handle.disconnect();
     }
     this.connectedContent = [];
+    if (this.node.parentNode == null) {
+      return;
+    }
     if (value && this.thenContent) {
       this.connectedContent = renderMarkupToDOM(this.thenContent, this);
     } else if (!value && this.elseContent) {
@@ -1573,7 +1576,6 @@ function initView(config) {
       }
     },
     async setChildren(children) {
-      console.log("setChildren", { name: ctx.name, children });
       $$children.set(children);
     }
   };
@@ -3175,7 +3177,6 @@ function RouterStore(ctx) {
           redirect = "/" + redirect;
         }
       }
-      console.log({ parts, route, parents, layers });
       routes2.push({
         pattern: "/" + joinPath([...parts, ...splitPath(route.path)]),
         meta: {
@@ -3219,20 +3220,19 @@ function RouterStore(ctx) {
     if (route.meta.redirect) {
       let redirectPath;
       if (isFunction(route.meta.redirect)) {
-        throw new Error(`Redirect functions are not yet supported.`);
       } else if (isString(route.meta.redirect)) {
         redirectPath = route.meta.redirect;
+        const match = matchRoutes(routes, redirectPath, {
+          willMatch(r) {
+            return r !== route;
+          }
+        });
+        if (!match) {
+          throw new Error(`Found a redirect to an undefined URL. From '${route.pattern}' to '${route.meta.redirect}'`);
+        }
       } else {
         throw new TypeError(`Expected a string or redirect function. Got: ${route.meta.redirect}`);
       }
-      const match = matchRoutes(routes, redirectPath, {
-        willMatch(r) {
-          return r !== route;
-        }
-      });
-      if (!match) {
-        throw new Error(`Found a redirect to an undefined URL. From '${route.pattern}' to '${route.meta.redirect}'`);
-      }
     }
   }
   ctx.onConnected(() => {
@@ -3260,8 +3260,10 @@ function RouterStore(ctx) {
   ctx.onConnected(() => {
     history.listen(onRouteChange);
     onRouteChange(history);
+    ctx.info("Intercepting <a> clicks within root element:", appContext.rootElement);
     catchLinks(appContext.rootElement, (anchor) => {
       let href = anchor.getAttribute("href");
+      ctx.info("Intercepted link click", anchor, href);
       if (!/^https?:\/\/|^\//.test(href)) {
         href = joinPath([history.location.pathname, href]);
       }
@@ -3326,14 +3328,25 @@ function RouterStore(ctx) {
     ctx.info(`Matched route: '${matched.pattern}' ('${matched.path}')`);
     if (matched.meta.redirect != null) {
       if (typeof matched.meta.redirect === "string") {
-        let path = matched.meta.redirect;
-        for (const key in matched.params) {
-          path = path.replace(":" + key, matched.params[key].toString());
-        }
+        const path = replaceParams(matched.meta.redirect, matched.params);
         ctx.info(`Redirecting to: '${path}'`);
         history.replace(path);
       } else if (typeof matched.meta.redirect === "function") {
-        throw new Error(`Redirect functions aren't implemented yet.`);
+        const redirectContext = {
+          path: matched.path,
+          pattern: matched.pattern,
+          params: matched.params,
+          query: matched.query
+        };
+        let path = await matched.meta.redirect(redirectContext);
+        if (typeof path !== "string") {
+          throw new Error(`Redirect function must return a path to redirect to.`);
+        }
+        if (!path.startsWith("/")) {
+          path = resolvePath(matched.path, path);
+        }
+        ctx.info(`Redirecting to: '${path}'`);
+        history.replace(path);
       } else {
         throw new TypeError(`Redirect must either be a path string or a function.`);
       }
@@ -3358,7 +3371,6 @@ function RouterStore(ctx) {
             }
             if (parentLayer) {
               parentLayer.handle.setChildren(rendered);
-              ctx.log({ rendered, markup: matchedLayer.markup });
             } else {
               appContext.rootView.setChildren(rendered);
             }
@@ -3421,6 +3433,14 @@ function RouterStore(ctx) {
      * @param args - One or more path segments optionally followed by an options object.
      */
     navigate
+    /**
+     * Updates a query param in place.
+     */
+    // updateQuery(key: string, value: string) {},
+    /**
+     * Updates a route param in place.
+     */
+    // updateParam(key: string, value: string) {},
   };
 }
 var safeExternalLink = /(noopener|noreferrer) (noopener|noreferrer)/;
@@ -3454,6 +3474,13 @@ function catchLinks(root, callback, _window = window) {
     root.removeEventListener("click", handler);
   };
 }
+function replaceParams(path, params) {
+  for (const key in params) {
+    const value = params[key].toString();
+    path = path.replace(`{${key}}`, value).replace(`{#${key}}`, value);
+  }
+  return path;
+}
 
 // src/stores/language.ts
 function LanguageStore(ctx) {