@bb-labs/next-router 0.0.3 → 0.0.5

package/README.md

@@ -145,7 +145,7 @@ const searchParamsSchema = {
 };
 
 export function MyComponent() {
-  const { data } = useSearchParams(searchParamsSchema, {
+  const { data, error } = useSearchParams(searchParamsSchema, {
     onSuccess: (data) => {
       console.log("Valid params:", data.email);
     },
@@ -155,7 +155,7 @@ export function MyComponent() {
     },
   });
 
-  if (!data) return <div>Error</div>;
+  if (error) return <div>Error: {error}</div>;
 
   return <div>Email: {data.email}</div>;
 }
@@ -164,18 +164,19 @@ export function MyComponent() {
 ### Hook API
 
 ```tsx
-const { data } = useRouteParams(schema, options?);
-const { data } = useSearchParams(schema, options?);
+const { data, error } = useRouteParams(schema, options?);
+const { data, error } = useSearchParams(schema, options?);
 ```
 
 **Options:**
 
 - `onSuccess?: (data: T) => void` — Called when params are successfully validated
-- `onError?: (error: Error) => void` — Called when validation fails (defaults to redirecting to "/404")
+- `onError?: (error: z.ZodError) => void` — Called when validation fails (defaults to redirecting to "/404")
 
 **Returns:**
 
 - `data` — The validated params, or `null` if validation failed
+- `error` — The error message string, or `null` if validation succeeded
 
 ---
 

package/dist/client/z-page/index.d.ts

@@ -1,13 +1,9 @@
-import type { InferZodObjectShapeOutput, ZodObjectShape } from "../../utils/types";
+import type { InferZodObjectShapeOutput, T_DataError, ZodObjectShape } from "../../utils/types";
 import type { OnZodError } from "../../server/z-page/utils/types";
 type HookOptions<T> = {
     onSuccess?: (data: T) => void;
     onError?: OnZodError;
 };
-export declare function useRouteParams<T extends ZodObjectShape>(schema: T, options?: HookOptions<InferZodObjectShapeOutput<T>>): {
-    data: InferZodObjectShapeOutput<T> | null;
-};
-export declare function useSearchParams<T extends ZodObjectShape>(schema: T, options?: HookOptions<InferZodObjectShapeOutput<T>>): {
-    data: InferZodObjectShapeOutput<T> | null;
-};
+export declare function useRouteParams<T extends ZodObjectShape>(schema: T, options?: HookOptions<InferZodObjectShapeOutput<T>>): T_DataError<InferZodObjectShapeOutput<T>>;
+export declare function useSearchParams<T extends ZodObjectShape>(schema: T, options?: HookOptions<InferZodObjectShapeOutput<T>>): T_DataError<InferZodObjectShapeOutput<T>>;
 export {};

package/dist/client/z-page/index.js

@@ -26,7 +26,7 @@ export function useRouteParams(schema, options) {
             options?.onSuccess?.(result.data);
         }
     }, [result, options, router]);
-    return { data: result.data };
+    return result.error ? { data: null, error: result.error.message } : { data: result.data, error: null };
 }
 export function useSearchParams(schema, options) {
     const nextSearchParams = useNextSearchParams();
@@ -53,5 +53,5 @@ export function useSearchParams(schema, options) {
             options?.onSuccess?.(result.data);
         }
     }, [result, options, router]);
-    return { data: result.data };
+    return result.error ? { data: null, error: result.error.message } : { data: result.data, error: null };
 }

package/dist/server/index.d.ts

@@ -1 +1,2 @@
 export * from "./z-page";
+export * from "./z-server-action";

package/dist/server/index.js

@@ -1 +1,2 @@
 export * from "./z-page";
+export * from "./z-server-action";

package/dist/server/z-page/fns/z-page.d.ts

@@ -12,7 +12,7 @@ export declare function zPage<RP extends ZodObjectShape, SP extends ZodObjectSha
     resolve?: true;
     onError?: OnZodError;
     loadingHandler?: React.ReactNode;
-    handler: (input: {
+    handler: (inputs: {
         routeParams: InferOutput<RP>;
         searchParams: InferOutput<SP>;
     }) => React.ReactNode | Promise<React.ReactNode>;
@@ -25,7 +25,7 @@ export declare function zPage<RP extends ZodObjectShape>(cfg: {
     resolve?: true;
     onError?: OnZodError;
     loadingHandler?: React.ReactNode;
-    handler: (input: {
+    handler: (inputs: {
         routeParams: InferOutput<RP>;
     }) => React.ReactNode | Promise<React.ReactNode>;
 }): ZPageReturn;
@@ -37,7 +37,7 @@ export declare function zPage<SP extends ZodObjectShape>(cfg: {
     resolve?: true;
     onError?: OnZodError;
     loadingHandler?: React.ReactNode;
-    handler: (input: {
+    handler: (inputs: {
         searchParams: InferOutput<SP>;
     }) => React.ReactNode | Promise<React.ReactNode>;
 }): ZPageReturn;
@@ -49,7 +49,7 @@ export declare function zPage<RP extends ZodObjectShape, SP extends ZodObjectSha
     resolve: false;
     onError?: never;
     loadingHandler?: never;
-    handler: (input: {
+    handler: (inputs: {
         routeParams: Promise<InferOutput<RP>>;
         searchParams: Promise<InferOutput<SP>>;
     }) => React.ReactNode | Promise<React.ReactNode>;
@@ -62,7 +62,7 @@ export declare function zPage<RP extends ZodObjectShape>(cfg: {
     resolve: false;
     onError?: never;
     loadingHandler?: never;
-    handler: (input: {
+    handler: (inputs: {
         routeParams: Promise<InferOutput<RP>>;
     }) => React.ReactNode | Promise<React.ReactNode>;
 }): ZPageReturn;
@@ -74,7 +74,7 @@ export declare function zPage<SP extends ZodObjectShape>(cfg: {
     resolve: false;
     onError?: never;
     loadingHandler?: never;
-    handler: (input: {
+    handler: (inputs: {
         searchParams: Promise<InferOutput<SP>>;
     }) => React.ReactNode | Promise<React.ReactNode>;
 }): ZPageReturn;

package/dist/server/z-page/fns/z-page.js

@@ -9,10 +9,10 @@ export function zPage(cfg) {
         return async (props) => cfg.handler(createValidatedPromises(props));
     }
     async function Inner({ promises }) {
-        const input = await resolveParams(promises);
-        if (!Object.keys(input).length)
+        const inputs = await resolveParams(promises);
+        if (!Object.keys(inputs).length)
             return null;
-        return cfg.handler(input);
+        return cfg.handler(inputs);
     }
     return (props) => (_jsx(Suspense, { fallback: cfg.loadingHandler ?? null, children: _jsx(Inner, { promises: createValidatedPromises(props) }) }));
 }

package/dist/server/z-server-action/fns/z-server-action.d.ts

@@ -0,0 +1,5 @@
+import { ZodObjectShape, InferZodObjectShapeOutput } from "../../../utils/types";
+export declare function zServerAction<P extends ZodObjectShape, R>(cfg: {
+    params: P;
+    handler: (inputs: InferZodObjectShapeOutput<P>) => Promise<R>;
+}): (inputs: InferZodObjectShapeOutput<P>) => Promise<R>;

package/dist/server/z-server-action/fns/z-server-action.js

@@ -0,0 +1,8 @@
+import { toZodObject } from "../../../utils/to-zod-object";
+export function zServerAction(cfg) {
+    const schema = toZodObject(cfg.params);
+    return async (inputs) => {
+        const parsed = schema.parse(inputs);
+        return cfg.handler(parsed);
+    };
+}

package/dist/server/z-server-action/index.d.ts

@@ -0,0 +1 @@
+export * from "./fns/z-server-action";

package/dist/server/z-server-action/index.js

@@ -0,0 +1 @@
+export * from "./fns/z-server-action";

package/dist/utils/types.d.ts

@@ -5,3 +5,10 @@ export type ZodObject<T extends ZodRawShape = ZodRawShape> = z.ZodObject<T>;
 export type ZodObjectShape = ZodRawShape | ZodObject;
 /** Infer output type from either raw shape or ZodObject */
 export type InferZodObjectShapeOutput<T extends ZodObjectShape> = T extends ZodObject<infer S> ? z.output<z.ZodObject<S>> : T extends ZodRawShape ? z.output<z.ZodObject<T>> : never;
+export type T_DataError<T> = {
+    data: T;
+    error: null;
+} | {
+    data: null;
+    error: string;
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bb-labs/next-router",
-  "version": "0.0.3",
+  "version": "0.0.5",
   "author": "Beepbop",
   "homepage": "https://github.com/beepbop-labs/next-router",
   "keywords": [