arcway 0.1.11 → 0.1.12

package/client/router.js

@@ -1,5 +1,3 @@
-import { jsx, jsxs } from "react/jsx-runtime";
-import React from "react";
 import {
   createContext,
   useContext,
@@ -9,86 +7,96 @@ import {
   useMemo,
   useRef,
   useTransition,
-  createElement
-} from "react";
+  createElement,
+} from 'react';
 import {
   readClientManifest,
   loadPage,
   matchClientRoute,
   loadLoadingComponents,
-  prefetchRoute
-} from "./page-loader.js";
-import { parseQuery } from "./query.js";
-const ROUTER_CTX_KEY = "__router_context__";
-const RouterContext = globalThis[ROUTER_CTX_KEY] ??= createContext(null);
+  prefetchRoute,
+} from './page-loader.js';
+import { parseQuery } from './query.js';
+
+const ROUTER_CTX_KEY = '__router_context__';
+const RouterContext = (globalThis[ROUTER_CTX_KEY] ??= createContext(null));
+
 function wrapInLayouts(element, layouts) {
   for (let i = layouts.length - 1; i >= 0; i--) {
     element = createElement(layouts[i], null, element);
   }
   return element;
 }
+
 function useRouter() {
   const ctx = useContext(RouterContext);
   if (!ctx) {
-    throw new Error("useRouter must be used within a <Router> provider");
+    throw new Error('useRouter must be used within a <Router> provider');
   }
+
   return useMemo(
     () => ({
       pathname: ctx.pathname,
       params: ctx.params,
-      query: typeof window !== "undefined" ? parseQuery(window.location.search) : {},
+      query: typeof window !== 'undefined' ? parseQuery(window.location.search) : {},
       push: (to, options) => ctx.navigate(to, { ...options, replace: false }),
       replace: (to, options) => ctx.navigate(to, { ...options, replace: true }),
       back: () => {
-        if (typeof window !== "undefined") window.history.back();
+        if (typeof window !== 'undefined') window.history.back();
       },
       forward: () => {
-        if (typeof window !== "undefined") window.history.forward();
+        if (typeof window !== 'undefined') window.history.forward();
       },
       refresh: () => {
-        if (typeof window !== "undefined") window.location.reload();
-      }
+        if (typeof window !== 'undefined') window.location.reload();
+      },
     }),
-    [ctx.pathname, ctx.params, ctx.navigate]
+    [ctx.pathname, ctx.params, ctx.navigate],
   );
 }
+
 function usePathname() {
   return useRouter().pathname;
 }
+
 function useParams() {
   return useRouter().params;
 }
+
 function useSearchParams() {
   return useRouter().query;
 }
+
 function Router({
   initialPath,
   initialParams,
   initialComponent,
   initialLayouts,
   initialLoadings,
-  children
+  children,
 }) {
   const [pathname, setPathname] = useState(
-    () => initialPath ?? (typeof window !== "undefined" ? window.location.pathname : "/")
+    () => initialPath ?? (typeof window !== 'undefined' ? window.location.pathname : '/'),
   );
   const [pageState, setPageState] = useState({
     component: initialComponent ?? null,
     layouts: initialLayouts ?? [],
     loadings: initialLoadings ?? [],
-    params: initialParams ?? {}
+    params: initialParams ?? {},
   });
   const [isNavigating, setIsNavigating] = useState(false);
   const [isPending, startTransition] = useTransition();
   const manifestRef = useRef(null);
+
   useEffect(() => {
     manifestRef.current = readClientManifest();
     const onManifestUpdate = () => {
       manifestRef.current = readClientManifest();
     };
-    window.addEventListener("manifest-update", onManifestUpdate);
-    return () => window.removeEventListener("manifest-update", onManifestUpdate);
+    window.addEventListener('manifest-update', onManifestUpdate);
+    return () => window.removeEventListener('manifest-update', onManifestUpdate);
   }, []);
+
   const applyLoaded = useCallback((loaded, newPath) => {
     startTransition(() => {
       setPathname(newPath);
@@ -96,67 +104,78 @@ function Router({
         component: loaded.component,
         layouts: loaded.layouts,
         loadings: loaded.loadings,
-        params: loaded.params
+        params: loaded.params,
       });
       setIsNavigating(false);
     });
   }, []);
+
   const navigateToPage = useCallback(
     async (to, options) => {
       const scroll = options?.scroll !== false;
       const replace = options?.replace === true;
       if (to === pathname) return;
+
       const manifest = manifestRef.current;
       if (!manifest) {
         window.location.href = to;
         return;
       }
+
       const matched = matchClientRoute(manifest, to);
       if (!matched) {
         window.location.href = to;
         return;
       }
+
       setIsNavigating(true);
       if (replace) {
-        window.history.replaceState(null, "", to);
+        window.history.replaceState(null, '', to);
       } else {
-        window.history.pushState(null, "", to);
+        window.history.pushState(null, '', to);
       }
+
       const targetLoadings = await loadLoadingComponents(matched.route);
       if (targetLoadings.length > 0) {
         setPathname(to);
         setPageState((prev) => ({
           ...prev,
           loadings: targetLoadings,
-          params: matched.params
+          params: matched.params,
         }));
       }
+
       try {
         const loaded = await loadPage(manifest, to);
         if (!loaded) {
           window.location.href = to;
           return;
         }
+
         applyLoaded(loaded, to);
+
         if (scroll) {
           window.scrollTo(0, 0);
         }
       } catch (err) {
-        console.error("Client navigation failed, falling back to full page load:", err);
+        console.error('Client navigation failed, falling back to full page load:', err);
         window.location.href = to;
       }
     },
-    [pathname, applyLoaded]
+    [pathname, applyLoaded],
   );
+
   useEffect(() => {
     async function onPopState() {
       const newPath = window.location.pathname;
       const manifest = manifestRef.current;
+
       if (!manifest) {
         setPathname(newPath);
         setPageState((prev) => ({ ...prev, params: {} }));
         return;
       }
+
       try {
         const loaded = await loadPage(manifest, newPath);
         if (loaded) {
@@ -168,60 +187,71 @@ function Router({
         window.location.reload();
       }
     }
-    window.addEventListener("popstate", onPopState);
-    return () => window.removeEventListener("popstate", onPopState);
+
+    window.addEventListener('popstate', onPopState);
+    return () => window.removeEventListener('popstate', onPopState);
   }, [applyLoaded]);
+
   const { component: PageComponent, layouts, loadings, params } = pageState;
+
   let content;
   if (PageComponent) {
-    const inner = isNavigating && loadings.length > 0 ? createElement(loadings.at(-1)) : createElement(PageComponent, params);
+    const inner =
+      isNavigating && loadings.length > 0
+        ? createElement(loadings.at(-1))
+        : createElement(PageComponent, params);
     content = wrapInLayouts(inner, layouts);
   } else {
     content = children;
   }
-  return /* @__PURE__ */ jsxs(
+
+  const progressBar =
+    isNavigating && loadings.length === 0 && !isPending
+      ? createElement('div', {
+          style: {
+            position: 'fixed',
+            top: 0,
+            left: 0,
+            width: '100%',
+            height: '2px',
+            backgroundColor: '#0070f3',
+            zIndex: 99999,
+            animation: 'nav-progress 1s ease-in-out infinite',
+          },
+        })
+      : null;
+
+  return createElement(
     RouterContext.Provider,
     {
       value: {
         pathname,
         params,
-        navigate: navigateToPage
+        navigate: navigateToPage,
       },
-      children: [
-        content,
-        isNavigating && loadings.length === 0 && !isPending && /* @__PURE__ */ jsx(
-          "div",
-          {
-            style: {
-              position: "fixed",
-              top: 0,
-              left: 0,
-              width: "100%",
-              height: "2px",
-              backgroundColor: "#0070f3",
-              zIndex: 99999,
-              animation: "nav-progress 1s ease-in-out infinite"
-            }
-          }
-        )
-      ]
-    }
+    },
+    content,
+    progressBar,
   );
 }
-function Link({ href, children, onClick, scroll, replace, prefetch = "hover", ...rest }) {
+
+function Link({ href, children, onClick, scroll, replace, prefetch = 'hover', ...rest }) {
   const router = useContext(RouterContext);
   const linkRef = useRef(null);
+
   const handleMouseEnter = useCallback(() => {
-    if (prefetch !== "hover") return;
+    if (prefetch !== 'hover') return;
     const manifest = readClientManifest();
     if (manifest) {
       prefetchRoute(manifest, href);
     }
   }, [href, prefetch]);
+
   useEffect(() => {
-    if (prefetch !== "viewport") return;
+    if (prefetch !== 'viewport') return;
     const el = linkRef.current;
-    if (!el || typeof IntersectionObserver === "undefined") return;
+    if (!el || typeof IntersectionObserver === 'undefined') return;
+
     const observer = new IntersectionObserver(
       (entries) => {
         for (const entry of entries) {
@@ -235,40 +265,42 @@ function Link({ href, children, onClick, scroll, replace, prefetch = "hover", ..
           }
         }
       },
-      { rootMargin: "200px" }
+      { rootMargin: '200px' },
     );
+
     observer.observe(el);
     return () => observer.disconnect();
   }, [href, prefetch]);
+
   function handleClick(e) {
     if (onClick) onClick(e);
     if (e.defaultPrevented) return;
     if (e.metaKey || e.ctrlKey || e.shiftKey || e.altKey) return;
     if (e.button !== 0) return;
-    if (rest.target === "_blank" || rest.download !== void 0) return;
+    if (rest.target === '_blank' || rest.download !== undefined) return;
+
     try {
       const url = new URL(href, window.location.origin);
       if (url.origin !== window.location.origin) return;
     } catch {
       return;
     }
+
     e.preventDefault();
     if (router) {
       router.navigate(href, { scroll, replace });
     } else {
-      window.history.pushState(null, "", href);
-      window.dispatchEvent(new PopStateEvent("popstate"));
+      window.history.pushState(null, '', href);
+      window.dispatchEvent(new PopStateEvent('popstate'));
     }
   }
-  return /* @__PURE__ */ jsx("a", { ref: linkRef, href, onClick: handleClick, onMouseEnter: handleMouseEnter, ...rest, children });
+
+  return createElement(
+    'a',
+    { ref: linkRef, href, onClick: handleClick, onMouseEnter: handleMouseEnter, ...rest },
+    children,
+  );
 }
+
 const SoloRouter = Router;
-export {
-  Link,
-  Router,
-  SoloRouter,
-  useParams,
-  usePathname,
-  useRouter,
-  useSearchParams
-};
+export { Link, Router, SoloRouter, useParams, usePathname, useRouter, useSearchParams };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "arcway",
-  "version": "0.1.11",
+  "version": "0.1.12",
   "description": "A convention-based framework for building modular monoliths with strict domain boundaries.",
   "license": "MIT",
   "type": "module",
@@ -29,7 +29,6 @@
     "./ui/style-mira.css": "./client/ui/style-mira.css"
   },
   "scripts": {
-    "prepare": "esbuild client/router.jsx --outfile=client/router.js --format=esm --jsx=automatic",
     "test": "vitest run --project=unit",
     "test:storybook": "TMPDIR=~/tmp PLAYWRIGHT_BROWSERS_PATH=~/.cache/playwright vitest run --project=storybook",
     "test:all": "TMPDIR=~/tmp PLAYWRIGHT_BROWSERS_PATH=~/.cache/playwright vitest run",

package/client/router.jsx

@@ -1,303 +0,0 @@
-import React from 'react';
-import {
-  createContext,
-  useContext,
-  useState,
-  useEffect,
-  useCallback,
-  useMemo,
-  useRef,
-  useTransition,
-  createElement,
-} from 'react';
-import {
-  readClientManifest,
-  loadPage,
-  matchClientRoute,
-  loadLoadingComponents,
-  prefetchRoute,
-} from './page-loader.js';
-import { parseQuery } from './query.js';
-
-const ROUTER_CTX_KEY = '__router_context__';
-const RouterContext = (globalThis[ROUTER_CTX_KEY] ??= createContext(null));
-
-function wrapInLayouts(element, layouts) {
-  for (let i = layouts.length - 1; i >= 0; i--) {
-    element = createElement(layouts[i], null, element);
-  }
-  return element;
-}
-
-function useRouter() {
-  const ctx = useContext(RouterContext);
-  if (!ctx) {
-    throw new Error('useRouter must be used within a <Router> provider');
-  }
-
-  return useMemo(
-    () => ({
-      pathname: ctx.pathname,
-      params: ctx.params,
-      query: typeof window !== 'undefined' ? parseQuery(window.location.search) : {},
-      push: (to, options) => ctx.navigate(to, { ...options, replace: false }),
-      replace: (to, options) => ctx.navigate(to, { ...options, replace: true }),
-      back: () => {
-        if (typeof window !== 'undefined') window.history.back();
-      },
-      forward: () => {
-        if (typeof window !== 'undefined') window.history.forward();
-      },
-      refresh: () => {
-        if (typeof window !== 'undefined') window.location.reload();
-      },
-    }),
-    [ctx.pathname, ctx.params, ctx.navigate],
-  );
-}
-
-function usePathname() {
-  return useRouter().pathname;
-}
-
-function useParams() {
-  return useRouter().params;
-}
-
-function useSearchParams() {
-  return useRouter().query;
-}
-
-function Router({
-  initialPath,
-  initialParams,
-  initialComponent,
-  initialLayouts,
-  initialLoadings,
-  children,
-}) {
-  const [pathname, setPathname] = useState(
-    () => initialPath ?? (typeof window !== 'undefined' ? window.location.pathname : '/'),
-  );
-  const [pageState, setPageState] = useState({
-    component: initialComponent ?? null,
-    layouts: initialLayouts ?? [],
-    loadings: initialLoadings ?? [],
-    params: initialParams ?? {},
-  });
-  const [isNavigating, setIsNavigating] = useState(false);
-  const [isPending, startTransition] = useTransition();
-  const manifestRef = useRef(null);
-
-  useEffect(() => {
-    manifestRef.current = readClientManifest();
-    const onManifestUpdate = () => {
-      manifestRef.current = readClientManifest();
-    };
-    window.addEventListener('manifest-update', onManifestUpdate);
-    return () => window.removeEventListener('manifest-update', onManifestUpdate);
-  }, []);
-
-  const applyLoaded = useCallback((loaded, newPath) => {
-    startTransition(() => {
-      setPathname(newPath);
-      setPageState({
-        component: loaded.component,
-        layouts: loaded.layouts,
-        loadings: loaded.loadings,
-        params: loaded.params,
-      });
-      setIsNavigating(false);
-    });
-  }, []);
-
-  const navigateToPage = useCallback(
-    async (to, options) => {
-      const scroll = options?.scroll !== false;
-      const replace = options?.replace === true;
-      if (to === pathname) return;
-
-      const manifest = manifestRef.current;
-      if (!manifest) {
-        window.location.href = to;
-        return;
-      }
-
-      const matched = matchClientRoute(manifest, to);
-      if (!matched) {
-        window.location.href = to;
-        return;
-      }
-
-      setIsNavigating(true);
-      if (replace) {
-        window.history.replaceState(null, '', to);
-      } else {
-        window.history.pushState(null, '', to);
-      }
-
-      const targetLoadings = await loadLoadingComponents(matched.route);
-      if (targetLoadings.length > 0) {
-        setPathname(to);
-        setPageState((prev) => ({
-          ...prev,
-          loadings: targetLoadings,
-          params: matched.params,
-        }));
-      }
-
-      try {
-        const loaded = await loadPage(manifest, to);
-        if (!loaded) {
-          window.location.href = to;
-          return;
-        }
-
-        applyLoaded(loaded, to);
-
-        if (scroll) {
-          window.scrollTo(0, 0);
-        }
-      } catch (err) {
-        console.error('Client navigation failed, falling back to full page load:', err);
-        window.location.href = to;
-      }
-    },
-    [pathname, applyLoaded],
-  );
-
-  useEffect(() => {
-    async function onPopState() {
-      const newPath = window.location.pathname;
-      const manifest = manifestRef.current;
-
-      if (!manifest) {
-        setPathname(newPath);
-        setPageState((prev) => ({ ...prev, params: {} }));
-        return;
-      }
-
-      try {
-        const loaded = await loadPage(manifest, newPath);
-        if (loaded) {
-          applyLoaded(loaded, newPath);
-        } else {
-          window.location.reload();
-        }
-      } catch {
-        window.location.reload();
-      }
-    }
-
-    window.addEventListener('popstate', onPopState);
-    return () => window.removeEventListener('popstate', onPopState);
-  }, [applyLoaded]);
-
-  const { component: PageComponent, layouts, loadings, params } = pageState;
-
-  let content;
-  if (PageComponent) {
-    const inner = isNavigating && loadings.length > 0
-      ? createElement(loadings.at(-1))
-      : createElement(PageComponent, params);
-    content = wrapInLayouts(inner, layouts);
-  } else {
-    content = children;
-  }
-
-  return (
-    <RouterContext.Provider
-      value={{
-        pathname,
-        params,
-        navigate: navigateToPage,
-      }}
-    >
-      {content}
-      {isNavigating && loadings.length === 0 && !isPending && (
-        <div
-          style={{
-            position: 'fixed',
-            top: 0,
-            left: 0,
-            width: '100%',
-            height: '2px',
-            backgroundColor: '#0070f3',
-            zIndex: 99999,
-            animation: 'nav-progress 1s ease-in-out infinite',
-          }}
-        />
-      )}
-    </RouterContext.Provider>
-  );
-}
-
-function Link({ href, children, onClick, scroll, replace, prefetch = 'hover', ...rest }) {
-  const router = useContext(RouterContext);
-  const linkRef = useRef(null);
-
-  const handleMouseEnter = useCallback(() => {
-    if (prefetch !== 'hover') return;
-    const manifest = readClientManifest();
-    if (manifest) {
-      prefetchRoute(manifest, href);
-    }
-  }, [href, prefetch]);
-
-  useEffect(() => {
-    if (prefetch !== 'viewport') return;
-    const el = linkRef.current;
-    if (!el || typeof IntersectionObserver === 'undefined') return;
-
-    const observer = new IntersectionObserver(
-      (entries) => {
-        for (const entry of entries) {
-          if (entry.isIntersecting) {
-            const manifest = readClientManifest();
-            if (manifest) {
-              prefetchRoute(manifest, href);
-            }
-            observer.unobserve(el);
-            break;
-          }
-        }
-      },
-      { rootMargin: '200px' },
-    );
-
-    observer.observe(el);
-    return () => observer.disconnect();
-  }, [href, prefetch]);
-
-  function handleClick(e) {
-    if (onClick) onClick(e);
-    if (e.defaultPrevented) return;
-    if (e.metaKey || e.ctrlKey || e.shiftKey || e.altKey) return;
-    if (e.button !== 0) return;
-    if (rest.target === '_blank' || rest.download !== undefined) return;
-
-    try {
-      const url = new URL(href, window.location.origin);
-      if (url.origin !== window.location.origin) return;
-    } catch {
-      return;
-    }
-
-    e.preventDefault();
-    if (router) {
-      router.navigate(href, { scroll, replace });
-    } else {
-      window.history.pushState(null, '', href);
-      window.dispatchEvent(new PopStateEvent('popstate'));
-    }
-  }
-
-  return (
-    <a ref={linkRef} href={href} onClick={handleClick} onMouseEnter={handleMouseEnter} {...rest}>
-      {children}
-    </a>
-  );
-}
-
-const SoloRouter = Router;
-export { Link, Router, SoloRouter, useParams, usePathname, useRouter, useSearchParams };