kitcn 0.15.0 → 0.15.1

package/dist/auth/start/index.d.ts

@@ -2,10 +2,36 @@ import { t as GetTokenOptions } from "../../token-B9Bjcqug.js";
 import { FunctionReference, FunctionReturnType, OptionalRestArgs } from "convex/server";
 
 //#region src/auth-start/index.d.ts
+type MaybePromise<T> = Promise<T> | T;
+type StartLoaderAuthClient = {
+  clearAuth: () => void;
+  setAuth: (fetchToken: () => Promise<string | null>) => void;
+};
+type StartLoaderServerHttpClient = {
+  clearAuth?: () => void;
+  setAuth: (token: string) => void;
+};
+type StartLoaderConvexQueryClient = {
+  convexClient: StartLoaderAuthClient;
+  serverHttpClient?: StartLoaderServerHttpClient;
+};
+type StartLoaderAuthTarget = StartLoaderAuthClient | StartLoaderConvexQueryClient;
+type SyncConvexAuthForStartLoaderOptions = {
+  convex: StartLoaderAuthTarget;
+  getToken: () => MaybePromise<null | string | undefined>;
+};
+type StartLoaderAuthState = {
+  isAuthenticated: boolean;
+  token: null | string;
+};
 type ConvexBetterAuthReactStartOptions = Omit<GetTokenOptions, 'forceRefresh'> & {
   convexSiteUrl: string;
   convexUrl: string;
 };
+declare const syncConvexAuthForStartLoader: ({
+  convex,
+  getToken
+}: SyncConvexAuthForStartLoaderOptions) => Promise<StartLoaderAuthState>;
 declare const convexBetterAuthReactStart: (opts: ConvexBetterAuthReactStartOptions) => {
   getToken: () => Promise<string | undefined>;
   handler: (request: Request) => Promise<Response>;
@@ -14,4 +40,4 @@ declare const convexBetterAuthReactStart: (opts: ConvexBetterAuthReactStartOptio
   fetchAuthAction: <Action extends FunctionReference<"action">>(action: Action, ...args: OptionalRestArgs<Action>) => Promise<FunctionReturnType<Action>>;
 };
 //#endregion
-export { convexBetterAuthReactStart };
+export { MaybePromise, StartLoaderAuthClient, StartLoaderAuthState, StartLoaderAuthTarget, StartLoaderConvexQueryClient, StartLoaderServerHttpClient, SyncConvexAuthForStartLoaderOptions, convexBetterAuthReactStart, syncConvexAuthForStartLoader };

package/dist/auth/start/index.js

@@ -8,6 +8,32 @@ const fallbackCache = (fn) => fn;
 const cache = React.cache ?? fallbackCache;
 const TANSTACK_REACT_START_SERVER = "@tanstack/react-start/server";
 const TRAILING_COLON_RE = /:$/;
+const startLoaderAuthTokens = /* @__PURE__ */ new WeakMap();
+const isStartLoaderConvexQueryClient = (target) => "convexClient" in target;
+const syncConvexAuthForStartLoader = async ({ convex, getToken }) => {
+	const authClient = isStartLoaderConvexQueryClient(convex) ? convex.convexClient : convex;
+	const serverHttpClient = isStartLoaderConvexQueryClient(convex) ? convex.serverHttpClient : void 0;
+	const token = await getToken() ?? null;
+	if (startLoaderAuthTokens.get(convex) === token) return {
+		isAuthenticated: token !== null,
+		token
+	};
+	startLoaderAuthTokens.set(convex, token);
+	if (token === null) {
+		authClient.clearAuth();
+		serverHttpClient?.clearAuth?.();
+		return {
+			isAuthenticated: false,
+			token
+		};
+	}
+	authClient.setAuth(async () => token);
+	serverHttpClient?.setAuth(token);
+	return {
+		isAuthenticated: true,
+		token
+	};
+};
 function setupClient(options) {
 	const client = new ConvexHttpClient(options.convexUrl);
 	if (options.token !== void 0) client.setAuth(options.token);
@@ -124,4 +150,4 @@ const convexBetterAuthReactStart = (opts) => {
 };
 
 //#endregion
-export { convexBetterAuthReactStart };
+export { convexBetterAuthReactStart, syncConvexAuthForStartLoader };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kitcn",
-  "version": "0.15.0",
+  "version": "0.15.1",
   "description": "kitcn - React Query integration and CLI tools for Convex",
   "keywords": [
     "convex",

package/skills/kitcn/references/setup/start.md

@@ -48,6 +48,40 @@ export const {
 });
 ```
 
+For client-side route loaders that fetch protected Convex queries through the
+router `queryClient`, prime the shared Convex client in the root `beforeLoad`
+before child loaders run:
+
+```tsx
+import type { QueryClient } from "@tanstack/react-query";
+import { createRootRouteWithContext } from "@tanstack/react-router";
+import { createServerFn } from "@tanstack/react-start";
+import { syncConvexAuthForStartLoader } from "kitcn/auth/start";
+import type { ConvexQueryClient } from "kitcn/react";
+
+import { getToken } from "@/lib/convex/auth-server";
+
+const getLoaderToken = createServerFn({ method: "GET" }).handler(async () => {
+  return await getToken();
+});
+
+export const Route = createRootRouteWithContext<{
+  convexQueryClient: ConvexQueryClient;
+  queryClient: QueryClient;
+}>()({
+  beforeLoad: async ({ context }) => {
+    return await syncConvexAuthForStartLoader({
+      convex: context.convexQueryClient,
+      getToken: getLoaderToken,
+    });
+  },
+});
+```
+
+Use `runServerCall` or `fetchAuthQuery` for server-side loaders. Use
+`syncConvexAuthForStartLoader` only for client/router loaders that execute
+shared `ConvexQueryClient` queries before `ConvexAuthProvider` mounts.
+
 ### 8.B.2 Auth API endpoint
 
 **Create:** `src/routes/api/auth/$.ts`