@fluixi/core 1.0.0-alpha.92 → 1.0.0-alpha.94

package/dist/src/lib/client/{router-PHLUYVQU.mjs → router-BDVPLLYX.mjs}

@@ -1,11 +1,7 @@
-/*! @fluixi/core v1.0.0-alpha.92 | (c) 2026 Ibrahima Touré and Fluixi contributors | MIT */
+/*! @fluixi/core v1.0.0-alpha.94 | (c) 2026 Ibrahima Touré and Fluixi contributors | MIT */
 import {
-  getHydrationData,
-  isHydrating,
-  isServerEnvironment,
-  lazy,
-  setHydrationData
-} from "./chunk-VB567ABU.mjs";
+  lazy
+} from "./chunk-TSXM2PNY.mjs";
 
 // src/lib/router/index.ts
 import {
@@ -13,8 +9,10 @@ import {
   createMemo,
   createResource as createResource2,
   createEffect,
-  getOwner,
+  createRoot,
+  getOwner as getOwner2,
   onCleanup,
+  runWithOwner,
   untrack,
   flush
 } from "@fluixi/reactive/signal";
@@ -83,42 +81,35 @@ import {
   matchRoutes,
   matchPath
 } from "@fluixi/router";
-import {
-  createMemoryHistory,
-  createBrowserHistory as createBrowserHistory2,
-  matchRoutes as matchRoutes2,
-  matchPath as matchPath2
-} from "@fluixi/router";
 
 // src/lib/router/data.ts
 import {
   createResource,
   createSignal
 } from "@fluixi/reactive/signal";
+import { currentResourceCache } from "@fluixi/reactive/signal";
 
 // src/lib/context/context.ts
 import { asProvider } from "@fluixi/dom";
-import { createContext as createReactiveContext, useContext as useReactiveContext } from "@fluixi/reactive/signal";
 import {
-  readChildren
+  createContext as createReactiveContext,
+  getOwner,
+  useContext as useReactiveContext
 } from "@fluixi/reactive/signal";
 function createContext(defaultValue, name) {
   const context = createReactiveContext(defaultValue, name);
-  const Provider = (props) => {
-    if (props.debug === true) {
-    }
-    return context.Provider({
+  const Provider = (props) => (
+    // Children stay a getter: the reactive Provider reads them after stamping the value on
+    // its owner. Reading `props.children` here would render them, and any <Outlet/> in them,
+    // before the context exists.
+    context.Provider({
       value: props.value,
       get children() {
         return props.children;
       },
       debug: props.debug
-    });
-  };
-  if (typeof Symbol !== "undefined" && Symbol.for) {
-    Provider.$$typeof = /* @__PURE__ */ Symbol.for("react.provider");
-  }
-  Provider.$$typeof = /* @__PURE__ */ Symbol.for("react.provider");
+    })
+  );
   return {
     id: context.id,
     Provider: asProvider(Provider),
@@ -127,53 +118,73 @@ function createContext(defaultValue, name) {
 }
 
 // src/lib/router/data.ts
-var globalCache = /* @__PURE__ */ new Map();
-var inflightRequests = /* @__PURE__ */ new Map();
-function cache(fn, name) {
-  return async (...args) => {
+var revalidationListeners = /* @__PURE__ */ new Set();
+function onRevalidate(listener) {
+  revalidationListeners.add(listener);
+  return () => void revalidationListeners.delete(listener);
+}
+var reloadMounted = () => {
+  for (const listener of [...revalidationListeners]) listener();
+};
+function cache(fn, name, options = {}) {
+  const { ttl = Infinity, staleWhileRevalidate = true } = options;
+  return (...args) => {
+    const store = options.cache ?? currentResourceCache();
     const key = name + ":" + JSON.stringify(args);
-    if (isHydrating() || typeof window !== "undefined") {
-      const hydrated = getHydrationData(key);
-      if (hydrated !== void 0) {
-        return hydrated;
-      }
-    }
-    if (globalCache.has(key)) {
-      return globalCache.get(key);
-    }
-    if (inflightRequests.has(key)) {
-      return inflightRequests.get(key);
-    }
-    const promise = Promise.resolve(fn(...args)).then(
-      (val) => {
-        globalCache.set(key, val);
-        inflightRequests.delete(key);
-        if (isServerEnvironment()) {
-          setHydrationData(key, val);
+    const fetchFresh = () => {
+      const running = store.inflight.get(key);
+      if (running) return running;
+      const promise = Promise.resolve(fn(...args)).then(
+        (value) => {
+          store.set(key, { value, timestamp: Date.now() });
+          store.inflight.delete(key);
+          return value;
+        },
+        (error) => {
+          store.inflight.delete(key);
+          throw error;
         }
-        return val;
-      },
-      (err) => {
-        inflightRequests.delete(key);
-        throw err;
-      }
-    );
-    inflightRequests.set(key, promise);
-    return promise;
+      );
+      store.inflight.set(key, promise);
+      return promise;
+    };
+    const hit = store.get(key);
+    if (hit && (ttl === Infinity || Date.now() - hit.timestamp <= ttl)) return Promise.resolve(hit.value);
+    if (hit && staleWhileRevalidate) {
+      fetchFresh().then(reloadMounted, () => void 0);
+      return Promise.resolve(hit.value);
+    }
+    return fetchFresh();
   };
 }
-var [revalidationVersion, setRevalidationVersion] = createSignal(0);
-var revalidationKeys = /* @__PURE__ */ new Set();
-function revalidate(key) {
-  const predicate = typeof key === "string" ? (k) => k.startsWith(key) : key;
-  for (const k of globalCache.keys()) {
-    if (predicate(k)) {
-      globalCache.delete(k);
-      revalidationKeys.add(k);
-    }
+function revalidate(key, store) {
+  const names = typeof key === "string" ? [key] : Array.isArray(key) ? key : null;
+  drop(names ?? key, store ?? currentResourceCache());
+  if (names && !store) tellOtherTabs(names);
+}
+function drop(what, store) {
+  const matches = Array.isArray(what) ? (k) => what.some((n) => k === n || k.startsWith(n + ":")) : what;
+  for (const k of [...store.keys()]) if (matches(k)) store.delete(k);
+  reloadMounted();
+}
+var TABS_KEY = "fluixi:revalidate";
+function tellOtherTabs(names) {
+  try {
+    localStorage.setItem(TABS_KEY, JSON.stringify({ names, at: Date.now() + Math.random() }));
+  } catch {
   }
-  setRevalidationVersion((v) => v + 1);
 }
+if (typeof window !== "undefined") {
+  window.addEventListener("storage", (event) => {
+    if (event.key !== TABS_KEY || !event.newValue) return;
+    try {
+      const names = JSON.parse(event.newValue).names;
+      if (Array.isArray(names) && names.every((n) => typeof n === "string")) drop(names, currentResourceCache());
+    } catch {
+    }
+  });
+}
+globalThis[/* @__PURE__ */ Symbol.for("fluixi.revalidate")] = (names) => revalidate(names);
 function createAsync(fetcher, source) {
   const [data] = createResource(source || (() => true), fetcher);
   return data;
@@ -188,19 +199,39 @@ function getSubmissionSignal(url) {
   }
   return submissionState.get(url);
 }
-function action(fn, name) {
+var submissionsState = /* @__PURE__ */ new Map();
+function getSubmissionsSignal(url) {
+  if (!submissionsState.has(url)) submissionsState.set(url, createSignal([]));
+  return submissionsState.get(url);
+}
+function action(fn, name, options = {}) {
   const actionUrl = name || fn.name || "action";
   const submit = async (input) => {
     const [, setSubmission] = getSubmissionSignal(actionUrl);
-    const clear = () => setSubmission(void 0);
-    const retry = () => submit(input);
-    setSubmission({
+    const [, setSubmissions] = getSubmissionsSignal(actionUrl);
+    let entry;
+    const drop2 = () => setSubmissions((list) => list.filter((s) => s !== entry));
+    const settle = (next) => {
+      setSubmissions((list) => list.map((s) => s === entry ? next : s));
+      entry = next;
+    };
+    const clear = () => {
+      setSubmission(void 0);
+      drop2();
+    };
+    const retry = () => {
+      drop2();
+      return submit(input);
+    };
+    entry = {
       input,
       // Approximate type for tracking
       pending: true,
       clear,
       retry
-    });
+    };
+    setSubmission(entry);
+    setSubmissions((list) => [...list, entry]);
     try {
       const result = await fn(input);
       setSubmission({
@@ -210,26 +241,35 @@ function action(fn, name) {
         clear,
         retry
       });
+      drop2();
+      const stale = typeof options.invalidates === "function" ? options.invalidates(result) : options.invalidates;
+      for (const key of stale ?? []) revalidate(key);
       return result;
     } catch (error) {
-      setSubmission({
+      const failed = {
         input,
         error,
         pending: false,
         clear,
         retry
-      });
+      };
+      setSubmission(failed);
+      settle(failed);
       throw error;
     }
   };
   submit.url = actionUrl;
-  submit.with = (args) => action((...a) => fn(args, ...a), name);
+  submit.with = (args) => action((...a) => fn(args, ...a), name, options);
   return submit;
 }
 function useSubmission(actionFn) {
   const [submission] = getSubmissionSignal(actionFn.url);
   return submission;
 }
+function useSubmissions(actionFn) {
+  const [submissions] = getSubmissionsSignal(actionFn.url);
+  return submissions;
+}
 function useAction(actionFn) {
   return actionFn;
 }
@@ -237,7 +277,13 @@ var RouteDataContext = createContext(void 0, "route-data");
 var RouteDataProvider = RouteDataContext.Provider;
 
 // src/lib/router/index.ts
-import { runWithOwner } from "@fluixi/reactive/signal";
+import {
+  createMemoryHistory,
+  createBrowserHistory as createBrowserHistory2,
+  matchRoutes as matchRoutes2,
+  matchPath as matchPath2
+} from "@fluixi/router";
+import { runWithOwner as runWithOwner2 } from "@fluixi/reactive/signal";
 var RouterContext = createContext2(void 0, "router");
 var OutletContext = createContext2(void 0, "outlet");
 var LevelParamsContext = createContext2(void 0, "route-params");
@@ -250,11 +296,33 @@ function renderLayer(m, depth, base) {
     onCleanup(() => {
       cancelled = true;
     });
-    const owner = getOwner();
-    const [resource] = createResource2(
-      () => loader({ params: base.params, location: base.location }, owner, () => cancelled)
-    );
-    data = resource;
+    const owner = getOwner2();
+    const router = useContext2(RouterContext);
+    let watching = false;
+    const trackDeps = (deps) => {
+      if (watching || cancelled) return;
+      watching = true;
+      runWithOwner(owner, () => {
+        let first = true;
+        createEffect(() => {
+          deps();
+          if (first) first = false;
+          else untrack(() => void refetch());
+        });
+      });
+    };
+    const [resource, { refetch }] = createResource2(() => {
+      const result = loader({ params: base.params, location: base.location }, owner, () => cancelled, trackDeps);
+      return router ? router.trackLoad(result) : result;
+    });
+    onCleanup(onRevalidate(() => void refetch()));
+    data = () => {
+      const error = resource.error;
+      if (error !== void 0 && error !== null) throw error;
+      return resource();
+    };
+    Object.defineProperty(data, "loading", { get: () => resource.loading });
+    Object.defineProperty(data, "state", { get: () => resource.state });
   }
   const buildPage = () => RouteDataContext2.Provider({
     value: data,
@@ -272,12 +340,15 @@ function renderLayer(m, depth, base) {
       });
     }
   });
-  if (!data) return buildPage();
+  if (!data) return { view: buildPage(), ready: () => true };
   const res = data;
-  const isLoading = () => res.loading;
+  const isLoading = () => {
+    const state = res.state;
+    return state === void 0 ? res.loading : state === "pending" || state === "unresolved";
+  };
   const [ready, setReady] = createSignal2(untrack(() => !isLoading()));
   createEffect(() => setReady(!isLoading()));
-  return createMemo(() => ready() ? buildPage() : null);
+  return { view: createMemo(() => ready() ? buildPage() : null), ready };
 }
 function renderChild(ctx) {
   const childIdx = ctx.depth + 1;
@@ -288,17 +359,43 @@ function renderChild(ctx) {
     const c = ctx.matched()[childIdx]?.component;
     if (untrack(childComp) !== c) setChildComp(() => c);
   });
-  return createMemo(() => {
+  const owner = getOwner2();
+  let shown = null;
+  let pending = null;
+  const drop2 = (layer) => layer?.dispose();
+  onCleanup(() => {
+    drop2(shown);
+    drop2(pending);
+    shown = pending = null;
+  });
+  const incoming = createMemo(() => {
     const component = childComp();
-    if (!component) {
+    if (!component) return null;
+    const m = untrack(() => ctx.matched())[childIdx];
+    return runWithOwner(
+      owner,
+      () => createRoot((dispose) => ({
+        ...renderLayer(m, childIdx, { matched: ctx.matched, params: ctx.params, location: ctx.location }),
+        dispose
+      }))
+    );
+  });
+  return createMemo(() => {
+    const next = incoming();
+    if (!next) {
+      drop2(shown);
+      drop2(pending);
+      shown = pending = null;
       return ctx.notFound ? ctx.notFound() : null;
     }
-    const m = untrack(() => ctx.matched())[childIdx];
-    return renderLayer(m, childIdx, {
-      matched: ctx.matched,
-      params: ctx.params,
-      location: ctx.location
-    });
+    if (next === shown) return shown.view;
+    if (pending && pending !== next) drop2(pending);
+    pending = next;
+    if (shown && !next.ready()) return shown.view;
+    drop2(shown);
+    shown = next;
+    pending = null;
+    return shown.view;
   });
 }
 function renderNotFound(notFound) {
@@ -333,6 +430,8 @@ function Router(props) {
     history
   });
   const [state, setState] = createSignal2(router.state());
+  const [navigating, setNavigating] = createSignal2(false);
+  const [loads, setLoads] = createSignal2(0);
   let navigationId = 0;
   const takeMode = () => {
     const mode = pendingTransitionMode ?? (props.transition ?? "auto");
@@ -342,12 +441,15 @@ function Router(props) {
   const unsub = router.subscribe((next) => {
     const id = ++navigationId;
     const mode = takeMode();
+    setNavigating(true);
     const prepared = prepareComponents(
       (next.match?.matched ?? []).map((m) => m.component).filter(Boolean)
     );
     const commit = () => {
       setState(next);
-      return flush();
+      const flushed = flush();
+      if (id === navigationId) setNavigating(false);
+      return flushed;
     };
     if (!prepared) {
       void runTransition(mode, commit);
@@ -369,7 +471,18 @@ function Router(props) {
   const ctx = {
     router,
     location: createMemo(() => state().location),
-    params: createMemo(() => state().match?.params ?? {})
+    params: createMemo(() => state().match?.params ?? {}),
+    isRouting: () => navigating() || loads() > 0,
+    // Counted by the promise, not by an owner: a load a newer navigation superseded still
+    // settles and uncounts itself, and a resource seeded from the server never calls it.
+    trackLoad(result) {
+      if (result && typeof result.finally === "function") {
+        setLoads((n) => n + 1);
+        void result.finally(() => setLoads((n) => n - 1)).catch(() => {
+        });
+      }
+      return result;
+    }
   };
   const root = {
     depth: -1,
@@ -392,6 +505,21 @@ function Outlet() {
   if (!ctx) return null;
   return renderChild(ctx);
 }
+function useIsRouting(options = {}) {
+  const routing = useContext2(RouterContext)?.isRouting ?? (() => false);
+  const delay = options.delay ?? 0;
+  if (delay <= 0) return routing;
+  const [late, setLate] = createSignal2(false);
+  createEffect(() => {
+    if (!routing()) {
+      setLate(false);
+      return;
+    }
+    const timer = setTimeout(() => setLate(true), delay);
+    onCleanup(() => clearTimeout(timer));
+  });
+  return () => routing() && late();
+}
 function Redirect(props) {
   const ctx = useContext2(RouterContext);
   if (ctx && typeof window !== "undefined") {
@@ -407,7 +535,9 @@ var _ssrRouterStub = {
   router: { navigate: () => {
   } },
   location: () => ({ pathname: "", search: "", hash: "", query: {} }),
-  params: () => ({})
+  params: () => ({}),
+  isRouting: () => false,
+  trackLoad: (result) => result
 };
 function useRouter() {
   const ctx = useContext2(RouterContext);
@@ -522,18 +652,31 @@ var LINK_OWN_PROPS = /* @__PURE__ */ new Set([
 ]);
 function Link(props) {
   const ctx = useContext2(RouterContext);
-  const navigate = () => ctx?.router.navigate(read(props.href) ?? "", { replace: read(props.replace) });
+  const navigate = () => ctx.router.navigate(read(props.href) ?? "", { replace: read(props.replace) });
   const a = createNativeElement("a");
   setAttribute(a, "href", read(props.href) ?? "");
   if (props.slot) setAttribute(a, "slot", read(props.slot));
   for (const k of Object.keys(props)) {
     if (LINK_OWN_PROPS.has(k)) continue;
     const v = props[k];
-    if (v != null && typeof v !== "function") setAttribute(a, k, String(v));
+    if (typeof v === "function") {
+      if (/^on[A-Z]/.test(k)) continue;
+      const read2 = v;
+      const apply = () => {
+        const value = read2();
+        if (value == null || value === false) a.removeAttribute?.(k);
+        else setAttribute(a, k, String(value));
+      };
+      if (typeof a.addEventListener === "function") createEffect(apply);
+      else apply();
+      continue;
+    }
+    if (v != null) setAttribute(a, k, String(v));
   }
   if (typeof a.addEventListener === "function") {
     a.addEventListener("click", (e) => {
       if (e.metaKey || e.ctrlKey || e.shiftKey || e.altKey) return;
+      if (!ctx) return;
       e.preventDefault();
       navigate();
     });
@@ -612,10 +755,11 @@ export {
   prefersReducedMotion,
   preloadRoutes,
   revalidate,
-  runWithOwner,
+  runWithOwner2 as runWithOwner,
   select,
   supportsViewTransitions,
   useAction,
+  useIsRouting,
   useLevelParams,
   useLinkNavigation,
   useLocation,
@@ -627,5 +771,6 @@ export {
   useRouteData,
   useRouter,
   useSearchParams,
-  useSubmission
+  useSubmission,
+  useSubmissions
 };

package/dist/src/lib/context/context.cjs

@@ -21,91 +21,28 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var context_exports = {};
 __export(context_exports, {
   composeProviders: () => composeProviders,
-  createConsumer: () => createConsumer,
   createContext: () => createContext,
-  createContextWithProvider: () => createContextWithProvider,
   createProvider: () => createProvider,
-  useContext: () => useContext,
-  useProvide: () => useProvide
+  requireContext: () => requireContext,
+  useContext: () => useContext
 });
 module.exports = __toCommonJS(context_exports);
 var import_dom = require("@fluixi/dom");
 var import_signal = require("@fluixi/reactive/signal");
-var import_signal2 = require("@fluixi/reactive/signal");
-var _warnedEagerProvider = false;
-function warnEagerProvider() {
-  if (_warnedEagerProvider) return;
-  _warnedEagerProvider = true;
-  if (typeof process !== "undefined" && true) return;
-  console.warn(
-    "[fluixi] createProvider({ context, value, children }) reads `children` eagerly: the object literal materialises `children` BEFORE the context is stamped, so a routed <Outlet/> that has siblings inside the provider renders detached and its descendants see no context under SSR. Use the lazy form instead:\n  createProvider(Context, value, props)   // children stays a getter\n  // or JSX:  <Context.Provider value={...}>{props.children}</Context.Provider>"
-  );
-}
-function createProvider(a, value, childProps) {
-  const isLazyForm = !!a?.Provider;
-  const context = isLazyForm ? a : a.context;
-  const rawValue = isLazyForm ? value : a.value;
-  const debug = isLazyForm ? false : a.debug ?? false;
-  if (!isLazyForm) warnEagerProvider();
-  const resolvedValue = typeof rawValue === "function" ? rawValue() : rawValue;
-  const sourceProps = isLazyForm ? childProps : a;
-  return context.Provider({
-    value: resolvedValue,
-    get children() {
-      return sourceProps?.children;
-    },
-    debug
-  });
-}
-function createContextWithProvider(defaultValue) {
-  const context = createContext(defaultValue);
-  const provider = (props) => {
-    return createProvider(context, props.value, props);
-  };
-  return [context, provider];
-}
-function composeProviders(contexts, children) {
-  if (contexts.length === 0) {
-    return (0, import_signal2.readChildren)(() => children);
-  }
-  const [context, value] = contexts[0];
-  const remaining = contexts.slice(1);
-  return createProvider(context, value, {
-    get children() {
-      return composeProviders(remaining, children);
-    }
-  });
-}
-function createConsumer(context) {
-  return (props) => {
-    const value = useContext(context);
-    return props.children(value);
-  };
-}
-function useProvide(context, factory) {
-  const existing = useContext(context);
-  if (existing === context.defaultValue) {
-    return factory();
-  }
-  return existing;
-}
 function createContext(defaultValue, name) {
   const context = (0, import_signal.createContext)(defaultValue, name);
-  const Provider = (props) => {
-    if (props.debug === true) {
-    }
-    return context.Provider({
+  const Provider = (props) => (
+    // Children stay a getter: the reactive Provider reads them after stamping the value on
+    // its owner. Reading `props.children` here would render them, and any <Outlet/> in them,
+    // before the context exists.
+    context.Provider({
       value: props.value,
       get children() {
         return props.children;
       },
       debug: props.debug
-    });
-  };
-  if (typeof Symbol !== "undefined" && Symbol.for) {
-    Provider.$$typeof = /* @__PURE__ */ Symbol.for("react.provider");
-  }
-  Provider.$$typeof = /* @__PURE__ */ Symbol.for("react.provider");
+    })
+  );
   return {
     id: context.id,
     Provider: (0, import_dom.asProvider)(Provider),
@@ -116,3 +53,29 @@ function useContext(context) {
   const value = (0, import_signal.useContext)(context);
   return value !== void 0 ? value : context.defaultValue;
 }
+function createProvider(context, value, props) {
+  const resolved = typeof value === "function" ? value() : value;
+  return context.Provider({
+    value: resolved,
+    get children() {
+      return props.children;
+    }
+  });
+}
+function composeProviders(providers, props) {
+  const outermost = providers.reduceRight(
+    (inner, [context, value]) => ({
+      get children() {
+        return createProvider(context, value, inner);
+      }
+    }),
+    props
+  );
+  return outermost.children;
+}
+function requireContext(context, message) {
+  for (let owner = (0, import_signal.getOwner)(); owner; owner = owner.parent) {
+    if (owner.contexts?.has(context.id)) return useContext(context);
+  }
+  throw new Error(message ?? `[fluixi] No Provider for ${context.id.description ?? "this context"} above this component.`);
+}