@emeryld/rrroutes-client 2.2.11 → 2.2.12

package/dist/index.mjs

@@ -33,11 +33,20 @@ import {
   useMutation,
   useQuery
 } from "@tanstack/react-query";
+import { z } from "zod";
 import {
   buildCacheKey,
   compilePath
 } from "@emeryld/rrroutes-contract";
 var toUpper = (m) => m.toUpperCase();
+var defaultFeedQuerySchema = z.object({
+  cursor: z.string().optional(),
+  limit: z.coerce.number().min(1).max(100).default(20)
+});
+var defaultFeedOutputSchema = z.object({
+  items: z.array(z.unknown()),
+  nextCursor: z.string().optional()
+});
 function zParse(value, schema) {
   return schema ? schema.parse(value) : value;
 }
@@ -139,6 +148,37 @@ function extractArgs(args) {
 function toArgsTuple(args) {
   return typeof args === "undefined" ? [] : [args];
 }
+function augmentFeedQuerySchema(schema) {
+  if (!schema) return defaultFeedQuerySchema;
+  if (schema instanceof z.ZodObject) {
+    const shape = schema.shape ? schema.shape : schema._def?.shape?.();
+    return schema.extend({
+      ...shape ?? {},
+      cursor: defaultFeedQuerySchema.shape.cursor,
+      limit: defaultFeedQuerySchema.shape.limit
+    });
+  }
+  return z.intersection(schema, defaultFeedQuerySchema);
+}
+function augmentFeedOutputSchema(schema) {
+  if (!schema) return defaultFeedOutputSchema;
+  if (schema instanceof z.ZodObject) {
+    const shape = schema.shape ? schema.shape : schema._def?.shape?.();
+    const hasItems = Boolean(shape?.items);
+    if (hasItems) return schema.extend({ nextCursor: z.string().optional() });
+    return z.object({
+      items: z.array(schema),
+      nextCursor: z.string().optional()
+    });
+  }
+  if (schema instanceof z.ZodArray) {
+    return z.object({
+      items: schema,
+      nextCursor: z.string().optional()
+    });
+  }
+  return defaultFeedOutputSchema;
+}
 function buildUrl(leaf, baseUrl, params, query) {
   const normalizedParams = zParse(params, leaf.cfg.paramsSchema);
   const normalizedQuery = zParse(query, leaf.cfg.querySchema);
@@ -167,8 +207,13 @@ function createRouteClient(opts) {
   function buildInternal(leaf, rqOpts, meta) {
     const isGet = leaf.method === "get";
     const isFeed = !!leaf.cfg.feed;
+    const leafCfg = isFeed ? {
+      ...leaf.cfg,
+      querySchema: augmentFeedQuerySchema(leaf.cfg.querySchema),
+      outputSchema: augmentFeedOutputSchema(leaf.cfg.outputSchema)
+    } : leaf.cfg;
     const method = toUpper(leaf.method);
-    const expectsArgs = Boolean(leaf.cfg.paramsSchema || leaf.cfg.querySchema);
+    const expectsArgs = Boolean(leafCfg.paramsSchema || leafCfg.querySchema);
     const leafLabel = `${leaf.method.toUpperCase()} ${String(leaf.path)}`;
     const debugName = meta?.name;
     const emit = (event) => emitDebug(event, debugName);
@@ -212,13 +257,18 @@ function createRouteClient(opts) {
       const a = extractArgs(tuple);
       const params = a?.params;
       const query = options?.queryOverride ?? a?.query;
-      const { url, normalizedQuery, normalizedParams } = buildUrl(leaf, baseUrl, params, query);
+      const { url, normalizedQuery, normalizedParams } = buildUrl(
+        { ...leaf, cfg: leafCfg },
+        baseUrl,
+        params,
+        query
+      );
       let payload;
-      const acceptsBody = Boolean(leaf.cfg.bodySchema);
+      const acceptsBody = Boolean(leafCfg.bodySchema);
       const requiresBody = options?.requireBody ?? (!isGet && acceptsBody);
       if (typeof options?.body !== "undefined") {
-        const normalizedBody = zParse(options.body, leaf.cfg.bodySchema);
-        const isMultipart = Array.isArray(leaf.cfg.bodyFiles) && leaf.cfg.bodyFiles.length > 0;
+        const normalizedBody = zParse(options.body, leafCfg.bodySchema);
+        const isMultipart = Array.isArray(leafCfg.bodyFiles) && leafCfg.bodyFiles.length > 0;
         payload = isMultipart ? toFormData(normalizedBody) : normalizedBody;
       } else if (requiresBody) {
         throw new Error("Body is required when invoking a mutation fetch.");
@@ -242,7 +292,7 @@ function createRouteClient(opts) {
         const out = await fetcher(
           payload === void 0 ? { url, method } : { url, method, body: payload }
         );
-        const parsed = zParse(out, leaf.cfg.outputSchema);
+        const parsed = zParse(out, leafCfg.outputSchema);
         emit(
           decorateDebugEvent(
             {
@@ -278,7 +328,7 @@ function createRouteClient(opts) {
       }
     };
     const fetchGet = (...tupleWithBody) => {
-      const acceptsBody = Boolean(leaf.cfg.bodySchema);
+      const acceptsBody = Boolean(leafCfg.bodySchema);
       const tupleLength = tupleWithBody.length;
       const maybeBodyIndex = expectsArgs ? 1 : 0;
       const hasBodyCandidate = acceptsBody && tupleLength > maybeBodyIndex;
@@ -311,7 +361,12 @@ function createRouteClient(opts) {
           },
           []
         );
-        const { normalizedQuery, normalizedParams } = buildUrl(leaf, baseUrl, params, query);
+        const { normalizedQuery, normalizedParams } = buildUrl(
+          { ...leaf, cfg: leafCfg },
+          baseUrl,
+          params,
+          query
+        );
         const queryResult = useInfiniteQuery({
           ...buildOptions,
           queryKey: getQueryKeys(...tuple),
@@ -365,7 +420,7 @@ function createRouteClient(opts) {
           },
           []
         );
-        buildUrl(leaf, baseUrl, params, query);
+        buildUrl({ ...leaf, cfg: leafCfg }, baseUrl, params, query);
         const queryResult = useQuery({
           ...buildOptions,
           queryKey: getQueryKeys(...tuple),
@@ -453,9 +508,9 @@ function toFormData(body) {
 }
 
 // src/sockets/socket.client.sys.ts
-import { z } from "zod";
-var roomValueSchema = z.union([z.array(z.string()), z.string()]);
-var buildRoomPayloadSchema = (metaSchema) => z.object({
+import { z as z2 } from "zod";
+var roomValueSchema = z2.union([z2.array(z2.string()), z2.string()]);
+var buildRoomPayloadSchema = (metaSchema) => z2.object({
   rooms: roomValueSchema,
   meta: metaSchema
 });