@jokio/rpc 0.5.3 → 0.5.4

package/dist/index.js

@@ -75,7 +75,7 @@ var createClient = (routes, options) => {
   return client;
 };
 var registerExpressRoutes = (router, routes, handlers) => {
-  const { validation = false, schemaFilePath } = handlers;
+  const { validation = true, schemaFilePath } = handlers;
   router = Object.keys(routes.GET).reduce(
     (r, x) => r.get(x, async (req, res, next) => {
       try {

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/client.ts","../src/server.ts","../src/types.ts"],"names":["options","readFile"],"mappings":"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","file":"index.js","sourcesContent":["import type { InferRouteConfig, RouterConfig } from \"./types\"\n\nexport type RouterClient<T extends RouterConfig> = {\n  GET: <K extends keyof T[\"GET\"]>(\n    path: K,\n    options?: Omit<Omit<InferRouteConfig<T[\"GET\"][K]>, \"body\">, \"response\">\n  ) => Promise<InferRouteConfig<T[\"GET\"][K]>[\"response\"]>\n  POST: <K extends keyof T[\"POST\"]>(\n    path: K,\n    body: InferRouteConfig<T[\"POST\"][K]>[\"body\"],\n    options?: Omit<InferRouteConfig<T[\"POST\"][K]>, \"body\" | \"response\">\n  ) => Promise<InferRouteConfig<T[\"POST\"][K]>[\"response\"]>\n}\n\ntype FetchFunction = (url: string, options: RequestInit) => Promise<Response>\n\ntype CreateClientOptions = {\n  baseUrl: string\n  getHeaders?: () => Promise<Record<string, string>> | Record<string, string>\n  fetch?: FetchFunction\n  validate?: boolean\n  debug?: boolean\n}\n\nexport const createClient = <T extends RouterConfig>(\n  routes: T,\n  options: CreateClientOptions\n): RouterClient<T> => {\n  const {\n    baseUrl,\n    getHeaders = () => Promise.resolve({}),\n    fetch: customFetch = fetch,\n    validate = false,\n  } = options\n\n  const client = {\n    GET: {} as any,\n    POST: {} as any,\n  }\n\n  client.GET = async (path: string, options?: any) => {\n    if (validate && options?.queryParams) {\n      routes.GET[path]?.queryParams?.parse(options.queryParams)\n    }\n\n    const queryString = options?.queryParams\n      ? \"?\" + new URLSearchParams(options.queryParams).toString()\n      : \"\"\n\n    const response = await customFetch(`${baseUrl}${path}${queryString}`, {\n      method: \"GET\",\n      headers: {\n        \"Content-Type\": \"application/json\",\n        ...(await getHeaders()),\n      },\n    })\n\n    if (!response.ok) {\n      const error: any = await response.json()\n\n      if (options.debug) {\n        console.debug(error)\n      }\n\n      throw new Error(error.message)\n    }\n\n    if (routes.GET[path].response.type === \"void\") {\n      await response.text()\n      return\n    }\n\n    const json = await response.json()\n\n    return validate ? routes.GET[path]?.response.parse(json) : json\n  }\n\n  client.POST = async (path: string, body: any, options?: any) => {\n    if (validate) {\n      if (body) {\n        routes.POST[path]?.body?.parse(body)\n      }\n      if (options?.queryParams) {\n        routes.POST[path]?.queryParams?.parse(options.queryParams)\n      }\n    }\n\n    const queryString = options?.queryParams\n      ? \"?\" + new URLSearchParams(options.queryParams).toString()\n      : \"\"\n\n    const response = await customFetch(`${baseUrl}${path}${queryString}`, {\n      method: \"POST\",\n      headers: {\n        \"Content-Type\": \"application/json\",\n        ...(await getHeaders()),\n      },\n      body: JSON.stringify(body),\n    })\n\n    if (!response.ok) {\n      const error: any = await response.json()\n\n      if (options.debug) {\n        console.debug(error)\n      }\n\n      throw new Error(error.message)\n    }\n\n    if (routes.POST[path].response.type === \"void\") {\n      await response.text()\n      return\n    }\n\n    const json = await response.json()\n\n    return validate ? routes.POST[path]?.response.parse(json) : json\n  }\n\n  return client\n}\n","import type { Request, Router } from \"express\"\nimport { readFile } from \"node:fs/promises\"\nimport type { InferRouteConfig, RouterConfig } from \"./types\"\n\n// Extract path parameters from route string\n// e.g., \"/user/:id\" -> { id: string }, \"/user/:id/post/:postId\" -> { id: string, postId: string }\ntype ExtractRouteParams<T extends string> =\n  T extends `${infer _Start}:${infer Param}/${infer Rest}`\n    ? { [K in Param | keyof ExtractRouteParams<`/${Rest}`>]: string }\n    : T extends `${infer _Start}:${infer Param}`\n    ? { [K in Param]: string }\n    : Record<string, never>\n\nexport type RouteHandlers<T extends RouterConfig, TContext> = {\n  GET: {\n    [K in keyof T[\"GET\"]]: (\n      data: Omit<Omit<InferRouteConfig<T[\"GET\"][K]>, \"body\">, \"response\"> & {\n        params: K extends string ? ExtractRouteParams<K> : unknown\n      },\n      ctx: TContext\n    ) =>\n      | Promise<InferRouteConfig<T[\"GET\"][K]>[\"response\"]>\n      | InferRouteConfig<T[\"GET\"][K]>[\"response\"]\n  }\n  POST: {\n    [K in keyof T[\"POST\"]]: (\n      data: Omit<InferRouteConfig<T[\"POST\"][K]>, \"response\"> & {\n        params: K extends string ? ExtractRouteParams<K> : unknown\n      },\n      ctx: TContext\n    ) =>\n      | Promise<InferRouteConfig<T[\"POST\"][K]>[\"response\"]>\n      | InferRouteConfig<T[\"POST\"][K]>[\"response\"]\n  }\n}\n\nexport const registerExpressRoutes = <T extends RouterConfig, TContext>(\n  router: Router,\n  routes: T,\n  handlers: RouteHandlers<T, TContext> & {\n    ctx?: (req: Request) => TContext\n    schemaFilePath?: string\n    validation?: boolean\n  }\n) => {\n  const { validation = false, schemaFilePath } = handlers\n\n  router = Object.keys(routes.GET).reduce(\n    (r, x) =>\n      r.get(x, async (req, res, next) => {\n        try {\n          const ctx = (handlers.ctx?.(req) ?? {}) as TContext\n\n          const data = {\n            params: req.params,\n            queryParams: routes.GET[x]?.queryParams?.parse(req.query),\n          }\n          const result = await handlers.GET[x]?.(data as any, ctx)\n\n          res.json(validation ? routes.GET[x]?.response.parse(result) : result)\n        } catch (err) {\n          next(err)\n        }\n      }),\n    router\n  )\n\n  if (schemaFilePath) {\n    router = router.get(\"/__schema\", async (_, res) =>\n      res\n        .contentType(\"text/plain\")\n        .send(await readFile(schemaFilePath!, \"utf8\"))\n    )\n  }\n\n  router = Object.keys(routes.POST).reduce(\n    (r, x) =>\n      r.post(x, async (req, res, next) => {\n        try {\n          const ctx = (handlers.ctx?.(req) ?? {}) as TContext\n\n          const data = {\n            params: req.params,\n            body: routes.POST[x]?.body.parse(req.body),\n            queryParams: routes.POST[x]?.queryParams?.parse(req.query),\n          }\n          const result = await handlers.POST[x]?.(data as any, ctx)\n\n          res.json(validation ? routes.POST[x]?.response.parse(result) : result)\n        } catch (err) {\n          next(err)\n        }\n      }),\n    router\n  )\n\n  return router\n}\n","import type z from \"zod\"\n\nexport type RouteConfig = {\n  body: z.ZodType\n  queryParams?: z.ZodType\n  response: z.ZodType\n}\n\nexport type RouterConfig = {\n  GET: Record<string, Omit<RouteConfig, \"body\">>\n  POST: Record<string, RouteConfig>\n}\n\nexport type InferRouteConfig<\n  T extends RouteConfig | Omit<RouteConfig, \"body\">\n> = {\n  [K in keyof T]: T[K] extends z.ZodType ? z.infer<T[K]> : never\n}\n\nexport const defineRoutes = <T extends RouterConfig>(routes: T): T =>\n  routes\n"]}
+{"version":3,"sources":["../src/client.ts","../src/server.ts","../src/types.ts"],"names":["options","readFile"],"mappings":"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","file":"index.js","sourcesContent":["import type { InferRouteConfig, RouterConfig } from \"./types\"\n\nexport type RouterClient<T extends RouterConfig> = {\n  GET: <K extends keyof T[\"GET\"]>(\n    path: K,\n    options?: Omit<Omit<InferRouteConfig<T[\"GET\"][K]>, \"body\">, \"response\">\n  ) => Promise<InferRouteConfig<T[\"GET\"][K]>[\"response\"]>\n  POST: <K extends keyof T[\"POST\"]>(\n    path: K,\n    body: InferRouteConfig<T[\"POST\"][K]>[\"body\"],\n    options?: Omit<InferRouteConfig<T[\"POST\"][K]>, \"body\" | \"response\">\n  ) => Promise<InferRouteConfig<T[\"POST\"][K]>[\"response\"]>\n}\n\ntype FetchFunction = (url: string, options: RequestInit) => Promise<Response>\n\ntype CreateClientOptions = {\n  baseUrl: string\n  getHeaders?: () => Promise<Record<string, string>> | Record<string, string>\n  fetch?: FetchFunction\n  validate?: boolean\n  debug?: boolean\n}\n\nexport const createClient = <T extends RouterConfig>(\n  routes: T,\n  options: CreateClientOptions\n): RouterClient<T> => {\n  const {\n    baseUrl,\n    getHeaders = () => Promise.resolve({}),\n    fetch: customFetch = fetch,\n    validate = false,\n  } = options\n\n  const client = {\n    GET: {} as any,\n    POST: {} as any,\n  }\n\n  client.GET = async (path: string, options?: any) => {\n    if (validate && options?.queryParams) {\n      routes.GET[path]?.queryParams?.parse(options.queryParams)\n    }\n\n    const queryString = options?.queryParams\n      ? \"?\" + new URLSearchParams(options.queryParams).toString()\n      : \"\"\n\n    const response = await customFetch(`${baseUrl}${path}${queryString}`, {\n      method: \"GET\",\n      headers: {\n        \"Content-Type\": \"application/json\",\n        ...(await getHeaders()),\n      },\n    })\n\n    if (!response.ok) {\n      const error: any = await response.json()\n\n      if (options.debug) {\n        console.debug(error)\n      }\n\n      throw new Error(error.message)\n    }\n\n    if (routes.GET[path].response.type === \"void\") {\n      await response.text()\n      return\n    }\n\n    const json = await response.json()\n\n    return validate ? routes.GET[path]?.response.parse(json) : json\n  }\n\n  client.POST = async (path: string, body: any, options?: any) => {\n    if (validate) {\n      if (body) {\n        routes.POST[path]?.body?.parse(body)\n      }\n      if (options?.queryParams) {\n        routes.POST[path]?.queryParams?.parse(options.queryParams)\n      }\n    }\n\n    const queryString = options?.queryParams\n      ? \"?\" + new URLSearchParams(options.queryParams).toString()\n      : \"\"\n\n    const response = await customFetch(`${baseUrl}${path}${queryString}`, {\n      method: \"POST\",\n      headers: {\n        \"Content-Type\": \"application/json\",\n        ...(await getHeaders()),\n      },\n      body: JSON.stringify(body),\n    })\n\n    if (!response.ok) {\n      const error: any = await response.json()\n\n      if (options.debug) {\n        console.debug(error)\n      }\n\n      throw new Error(error.message)\n    }\n\n    if (routes.POST[path].response.type === \"void\") {\n      await response.text()\n      return\n    }\n\n    const json = await response.json()\n\n    return validate ? routes.POST[path]?.response.parse(json) : json\n  }\n\n  return client\n}\n","import type { Request, Router } from \"express\"\nimport { readFile } from \"node:fs/promises\"\nimport type { InferRouteConfig, RouterConfig } from \"./types\"\n\n// Extract path parameters from route string\n// e.g., \"/user/:id\" -> { id: string }, \"/user/:id/post/:postId\" -> { id: string, postId: string }\ntype ExtractRouteParams<T extends string> =\n  T extends `${infer _Start}:${infer Param}/${infer Rest}`\n    ? { [K in Param | keyof ExtractRouteParams<`/${Rest}`>]: string }\n    : T extends `${infer _Start}:${infer Param}`\n    ? { [K in Param]: string }\n    : Record<string, never>\n\nexport type RouteHandlers<T extends RouterConfig, TContext> = {\n  GET: {\n    [K in keyof T[\"GET\"]]: (\n      data: Omit<Omit<InferRouteConfig<T[\"GET\"][K]>, \"body\">, \"response\"> & {\n        params: K extends string ? ExtractRouteParams<K> : unknown\n      },\n      ctx: TContext\n    ) =>\n      | Promise<InferRouteConfig<T[\"GET\"][K]>[\"response\"]>\n      | InferRouteConfig<T[\"GET\"][K]>[\"response\"]\n  }\n  POST: {\n    [K in keyof T[\"POST\"]]: (\n      data: Omit<InferRouteConfig<T[\"POST\"][K]>, \"response\"> & {\n        params: K extends string ? ExtractRouteParams<K> : unknown\n      },\n      ctx: TContext\n    ) =>\n      | Promise<InferRouteConfig<T[\"POST\"][K]>[\"response\"]>\n      | InferRouteConfig<T[\"POST\"][K]>[\"response\"]\n  }\n}\n\nexport const registerExpressRoutes = <T extends RouterConfig, TContext>(\n  router: Router,\n  routes: T,\n  handlers: RouteHandlers<T, TContext> & {\n    ctx?: (req: Request) => TContext\n    schemaFilePath?: string\n    validation?: boolean\n  }\n) => {\n  const { validation = true, schemaFilePath } = handlers\n\n  router = Object.keys(routes.GET).reduce(\n    (r, x) =>\n      r.get(x, async (req, res, next) => {\n        try {\n          const ctx = (handlers.ctx?.(req) ?? {}) as TContext\n\n          const data = {\n            params: req.params,\n            queryParams: routes.GET[x]?.queryParams?.parse(req.query),\n          }\n          const result = await handlers.GET[x]?.(data as any, ctx)\n\n          res.json(validation ? routes.GET[x]?.response.parse(result) : result)\n        } catch (err) {\n          next(err)\n        }\n      }),\n    router\n  )\n\n  if (schemaFilePath) {\n    router = router.get(\"/__schema\", async (_, res) =>\n      res\n        .contentType(\"text/plain\")\n        .send(await readFile(schemaFilePath!, \"utf8\"))\n    )\n  }\n\n  router = Object.keys(routes.POST).reduce(\n    (r, x) =>\n      r.post(x, async (req, res, next) => {\n        try {\n          const ctx = (handlers.ctx?.(req) ?? {}) as TContext\n\n          const data = {\n            params: req.params,\n            body: routes.POST[x]?.body.parse(req.body),\n            queryParams: routes.POST[x]?.queryParams?.parse(req.query),\n          }\n          const result = await handlers.POST[x]?.(data as any, ctx)\n\n          res.json(validation ? routes.POST[x]?.response.parse(result) : result)\n        } catch (err) {\n          next(err)\n        }\n      }),\n    router\n  )\n\n  return router\n}\n","import type z from \"zod\"\n\nexport type RouteConfig = {\n  body: z.ZodType\n  queryParams?: z.ZodType\n  response: z.ZodType\n}\n\nexport type RouterConfig = {\n  GET: Record<string, Omit<RouteConfig, \"body\">>\n  POST: Record<string, RouteConfig>\n}\n\nexport type InferRouteConfig<\n  T extends RouteConfig | Omit<RouteConfig, \"body\">\n> = {\n  [K in keyof T]: T[K] extends z.ZodType ? z.infer<T[K]> : never\n}\n\nexport const defineRoutes = <T extends RouterConfig>(routes: T): T =>\n  routes\n"]}

package/dist/index.mjs

@@ -73,7 +73,7 @@ var createClient = (routes, options) => {
   return client;
 };
 var registerExpressRoutes = (router, routes, handlers) => {
-  const { validation = false, schemaFilePath } = handlers;
+  const { validation = true, schemaFilePath } = handlers;
   router = Object.keys(routes.GET).reduce(
     (r, x) => r.get(x, async (req, res, next) => {
       try {

package/dist/index.mjs.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/client.ts","../src/server.ts","../src/types.ts"],"names":["options"],"mappings":"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","file":"index.mjs","sourcesContent":["import type { InferRouteConfig, RouterConfig } from \"./types\"\n\nexport type RouterClient<T extends RouterConfig> = {\n  GET: <K extends keyof T[\"GET\"]>(\n    path: K,\n    options?: Omit<Omit<InferRouteConfig<T[\"GET\"][K]>, \"body\">, \"response\">\n  ) => Promise<InferRouteConfig<T[\"GET\"][K]>[\"response\"]>\n  POST: <K extends keyof T[\"POST\"]>(\n    path: K,\n    body: InferRouteConfig<T[\"POST\"][K]>[\"body\"],\n    options?: Omit<InferRouteConfig<T[\"POST\"][K]>, \"body\" | \"response\">\n  ) => Promise<InferRouteConfig<T[\"POST\"][K]>[\"response\"]>\n}\n\ntype FetchFunction = (url: string, options: RequestInit) => Promise<Response>\n\ntype CreateClientOptions = {\n  baseUrl: string\n  getHeaders?: () => Promise<Record<string, string>> | Record<string, string>\n  fetch?: FetchFunction\n  validate?: boolean\n  debug?: boolean\n}\n\nexport const createClient = <T extends RouterConfig>(\n  routes: T,\n  options: CreateClientOptions\n): RouterClient<T> => {\n  const {\n    baseUrl,\n    getHeaders = () => Promise.resolve({}),\n    fetch: customFetch = fetch,\n    validate = false,\n  } = options\n\n  const client = {\n    GET: {} as any,\n    POST: {} as any,\n  }\n\n  client.GET = async (path: string, options?: any) => {\n    if (validate && options?.queryParams) {\n      routes.GET[path]?.queryParams?.parse(options.queryParams)\n    }\n\n    const queryString = options?.queryParams\n      ? \"?\" + new URLSearchParams(options.queryParams).toString()\n      : \"\"\n\n    const response = await customFetch(`${baseUrl}${path}${queryString}`, {\n      method: \"GET\",\n      headers: {\n        \"Content-Type\": \"application/json\",\n        ...(await getHeaders()),\n      },\n    })\n\n    if (!response.ok) {\n      const error: any = await response.json()\n\n      if (options.debug) {\n        console.debug(error)\n      }\n\n      throw new Error(error.message)\n    }\n\n    if (routes.GET[path].response.type === \"void\") {\n      await response.text()\n      return\n    }\n\n    const json = await response.json()\n\n    return validate ? routes.GET[path]?.response.parse(json) : json\n  }\n\n  client.POST = async (path: string, body: any, options?: any) => {\n    if (validate) {\n      if (body) {\n        routes.POST[path]?.body?.parse(body)\n      }\n      if (options?.queryParams) {\n        routes.POST[path]?.queryParams?.parse(options.queryParams)\n      }\n    }\n\n    const queryString = options?.queryParams\n      ? \"?\" + new URLSearchParams(options.queryParams).toString()\n      : \"\"\n\n    const response = await customFetch(`${baseUrl}${path}${queryString}`, {\n      method: \"POST\",\n      headers: {\n        \"Content-Type\": \"application/json\",\n        ...(await getHeaders()),\n      },\n      body: JSON.stringify(body),\n    })\n\n    if (!response.ok) {\n      const error: any = await response.json()\n\n      if (options.debug) {\n        console.debug(error)\n      }\n\n      throw new Error(error.message)\n    }\n\n    if (routes.POST[path].response.type === \"void\") {\n      await response.text()\n      return\n    }\n\n    const json = await response.json()\n\n    return validate ? routes.POST[path]?.response.parse(json) : json\n  }\n\n  return client\n}\n","import type { Request, Router } from \"express\"\nimport { readFile } from \"node:fs/promises\"\nimport type { InferRouteConfig, RouterConfig } from \"./types\"\n\n// Extract path parameters from route string\n// e.g., \"/user/:id\" -> { id: string }, \"/user/:id/post/:postId\" -> { id: string, postId: string }\ntype ExtractRouteParams<T extends string> =\n  T extends `${infer _Start}:${infer Param}/${infer Rest}`\n    ? { [K in Param | keyof ExtractRouteParams<`/${Rest}`>]: string }\n    : T extends `${infer _Start}:${infer Param}`\n    ? { [K in Param]: string }\n    : Record<string, never>\n\nexport type RouteHandlers<T extends RouterConfig, TContext> = {\n  GET: {\n    [K in keyof T[\"GET\"]]: (\n      data: Omit<Omit<InferRouteConfig<T[\"GET\"][K]>, \"body\">, \"response\"> & {\n        params: K extends string ? ExtractRouteParams<K> : unknown\n      },\n      ctx: TContext\n    ) =>\n      | Promise<InferRouteConfig<T[\"GET\"][K]>[\"response\"]>\n      | InferRouteConfig<T[\"GET\"][K]>[\"response\"]\n  }\n  POST: {\n    [K in keyof T[\"POST\"]]: (\n      data: Omit<InferRouteConfig<T[\"POST\"][K]>, \"response\"> & {\n        params: K extends string ? ExtractRouteParams<K> : unknown\n      },\n      ctx: TContext\n    ) =>\n      | Promise<InferRouteConfig<T[\"POST\"][K]>[\"response\"]>\n      | InferRouteConfig<T[\"POST\"][K]>[\"response\"]\n  }\n}\n\nexport const registerExpressRoutes = <T extends RouterConfig, TContext>(\n  router: Router,\n  routes: T,\n  handlers: RouteHandlers<T, TContext> & {\n    ctx?: (req: Request) => TContext\n    schemaFilePath?: string\n    validation?: boolean\n  }\n) => {\n  const { validation = false, schemaFilePath } = handlers\n\n  router = Object.keys(routes.GET).reduce(\n    (r, x) =>\n      r.get(x, async (req, res, next) => {\n        try {\n          const ctx = (handlers.ctx?.(req) ?? {}) as TContext\n\n          const data = {\n            params: req.params,\n            queryParams: routes.GET[x]?.queryParams?.parse(req.query),\n          }\n          const result = await handlers.GET[x]?.(data as any, ctx)\n\n          res.json(validation ? routes.GET[x]?.response.parse(result) : result)\n        } catch (err) {\n          next(err)\n        }\n      }),\n    router\n  )\n\n  if (schemaFilePath) {\n    router = router.get(\"/__schema\", async (_, res) =>\n      res\n        .contentType(\"text/plain\")\n        .send(await readFile(schemaFilePath!, \"utf8\"))\n    )\n  }\n\n  router = Object.keys(routes.POST).reduce(\n    (r, x) =>\n      r.post(x, async (req, res, next) => {\n        try {\n          const ctx = (handlers.ctx?.(req) ?? {}) as TContext\n\n          const data = {\n            params: req.params,\n            body: routes.POST[x]?.body.parse(req.body),\n            queryParams: routes.POST[x]?.queryParams?.parse(req.query),\n          }\n          const result = await handlers.POST[x]?.(data as any, ctx)\n\n          res.json(validation ? routes.POST[x]?.response.parse(result) : result)\n        } catch (err) {\n          next(err)\n        }\n      }),\n    router\n  )\n\n  return router\n}\n","import type z from \"zod\"\n\nexport type RouteConfig = {\n  body: z.ZodType\n  queryParams?: z.ZodType\n  response: z.ZodType\n}\n\nexport type RouterConfig = {\n  GET: Record<string, Omit<RouteConfig, \"body\">>\n  POST: Record<string, RouteConfig>\n}\n\nexport type InferRouteConfig<\n  T extends RouteConfig | Omit<RouteConfig, \"body\">\n> = {\n  [K in keyof T]: T[K] extends z.ZodType ? z.infer<T[K]> : never\n}\n\nexport const defineRoutes = <T extends RouterConfig>(routes: T): T =>\n  routes\n"]}
+{"version":3,"sources":["../src/client.ts","../src/server.ts","../src/types.ts"],"names":["options"],"mappings":"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","file":"index.mjs","sourcesContent":["import type { InferRouteConfig, RouterConfig } from \"./types\"\n\nexport type RouterClient<T extends RouterConfig> = {\n  GET: <K extends keyof T[\"GET\"]>(\n    path: K,\n    options?: Omit<Omit<InferRouteConfig<T[\"GET\"][K]>, \"body\">, \"response\">\n  ) => Promise<InferRouteConfig<T[\"GET\"][K]>[\"response\"]>\n  POST: <K extends keyof T[\"POST\"]>(\n    path: K,\n    body: InferRouteConfig<T[\"POST\"][K]>[\"body\"],\n    options?: Omit<InferRouteConfig<T[\"POST\"][K]>, \"body\" | \"response\">\n  ) => Promise<InferRouteConfig<T[\"POST\"][K]>[\"response\"]>\n}\n\ntype FetchFunction = (url: string, options: RequestInit) => Promise<Response>\n\ntype CreateClientOptions = {\n  baseUrl: string\n  getHeaders?: () => Promise<Record<string, string>> | Record<string, string>\n  fetch?: FetchFunction\n  validate?: boolean\n  debug?: boolean\n}\n\nexport const createClient = <T extends RouterConfig>(\n  routes: T,\n  options: CreateClientOptions\n): RouterClient<T> => {\n  const {\n    baseUrl,\n    getHeaders = () => Promise.resolve({}),\n    fetch: customFetch = fetch,\n    validate = false,\n  } = options\n\n  const client = {\n    GET: {} as any,\n    POST: {} as any,\n  }\n\n  client.GET = async (path: string, options?: any) => {\n    if (validate && options?.queryParams) {\n      routes.GET[path]?.queryParams?.parse(options.queryParams)\n    }\n\n    const queryString = options?.queryParams\n      ? \"?\" + new URLSearchParams(options.queryParams).toString()\n      : \"\"\n\n    const response = await customFetch(`${baseUrl}${path}${queryString}`, {\n      method: \"GET\",\n      headers: {\n        \"Content-Type\": \"application/json\",\n        ...(await getHeaders()),\n      },\n    })\n\n    if (!response.ok) {\n      const error: any = await response.json()\n\n      if (options.debug) {\n        console.debug(error)\n      }\n\n      throw new Error(error.message)\n    }\n\n    if (routes.GET[path].response.type === \"void\") {\n      await response.text()\n      return\n    }\n\n    const json = await response.json()\n\n    return validate ? routes.GET[path]?.response.parse(json) : json\n  }\n\n  client.POST = async (path: string, body: any, options?: any) => {\n    if (validate) {\n      if (body) {\n        routes.POST[path]?.body?.parse(body)\n      }\n      if (options?.queryParams) {\n        routes.POST[path]?.queryParams?.parse(options.queryParams)\n      }\n    }\n\n    const queryString = options?.queryParams\n      ? \"?\" + new URLSearchParams(options.queryParams).toString()\n      : \"\"\n\n    const response = await customFetch(`${baseUrl}${path}${queryString}`, {\n      method: \"POST\",\n      headers: {\n        \"Content-Type\": \"application/json\",\n        ...(await getHeaders()),\n      },\n      body: JSON.stringify(body),\n    })\n\n    if (!response.ok) {\n      const error: any = await response.json()\n\n      if (options.debug) {\n        console.debug(error)\n      }\n\n      throw new Error(error.message)\n    }\n\n    if (routes.POST[path].response.type === \"void\") {\n      await response.text()\n      return\n    }\n\n    const json = await response.json()\n\n    return validate ? routes.POST[path]?.response.parse(json) : json\n  }\n\n  return client\n}\n","import type { Request, Router } from \"express\"\nimport { readFile } from \"node:fs/promises\"\nimport type { InferRouteConfig, RouterConfig } from \"./types\"\n\n// Extract path parameters from route string\n// e.g., \"/user/:id\" -> { id: string }, \"/user/:id/post/:postId\" -> { id: string, postId: string }\ntype ExtractRouteParams<T extends string> =\n  T extends `${infer _Start}:${infer Param}/${infer Rest}`\n    ? { [K in Param | keyof ExtractRouteParams<`/${Rest}`>]: string }\n    : T extends `${infer _Start}:${infer Param}`\n    ? { [K in Param]: string }\n    : Record<string, never>\n\nexport type RouteHandlers<T extends RouterConfig, TContext> = {\n  GET: {\n    [K in keyof T[\"GET\"]]: (\n      data: Omit<Omit<InferRouteConfig<T[\"GET\"][K]>, \"body\">, \"response\"> & {\n        params: K extends string ? ExtractRouteParams<K> : unknown\n      },\n      ctx: TContext\n    ) =>\n      | Promise<InferRouteConfig<T[\"GET\"][K]>[\"response\"]>\n      | InferRouteConfig<T[\"GET\"][K]>[\"response\"]\n  }\n  POST: {\n    [K in keyof T[\"POST\"]]: (\n      data: Omit<InferRouteConfig<T[\"POST\"][K]>, \"response\"> & {\n        params: K extends string ? ExtractRouteParams<K> : unknown\n      },\n      ctx: TContext\n    ) =>\n      | Promise<InferRouteConfig<T[\"POST\"][K]>[\"response\"]>\n      | InferRouteConfig<T[\"POST\"][K]>[\"response\"]\n  }\n}\n\nexport const registerExpressRoutes = <T extends RouterConfig, TContext>(\n  router: Router,\n  routes: T,\n  handlers: RouteHandlers<T, TContext> & {\n    ctx?: (req: Request) => TContext\n    schemaFilePath?: string\n    validation?: boolean\n  }\n) => {\n  const { validation = true, schemaFilePath } = handlers\n\n  router = Object.keys(routes.GET).reduce(\n    (r, x) =>\n      r.get(x, async (req, res, next) => {\n        try {\n          const ctx = (handlers.ctx?.(req) ?? {}) as TContext\n\n          const data = {\n            params: req.params,\n            queryParams: routes.GET[x]?.queryParams?.parse(req.query),\n          }\n          const result = await handlers.GET[x]?.(data as any, ctx)\n\n          res.json(validation ? routes.GET[x]?.response.parse(result) : result)\n        } catch (err) {\n          next(err)\n        }\n      }),\n    router\n  )\n\n  if (schemaFilePath) {\n    router = router.get(\"/__schema\", async (_, res) =>\n      res\n        .contentType(\"text/plain\")\n        .send(await readFile(schemaFilePath!, \"utf8\"))\n    )\n  }\n\n  router = Object.keys(routes.POST).reduce(\n    (r, x) =>\n      r.post(x, async (req, res, next) => {\n        try {\n          const ctx = (handlers.ctx?.(req) ?? {}) as TContext\n\n          const data = {\n            params: req.params,\n            body: routes.POST[x]?.body.parse(req.body),\n            queryParams: routes.POST[x]?.queryParams?.parse(req.query),\n          }\n          const result = await handlers.POST[x]?.(data as any, ctx)\n\n          res.json(validation ? routes.POST[x]?.response.parse(result) : result)\n        } catch (err) {\n          next(err)\n        }\n      }),\n    router\n  )\n\n  return router\n}\n","import type z from \"zod\"\n\nexport type RouteConfig = {\n  body: z.ZodType\n  queryParams?: z.ZodType\n  response: z.ZodType\n}\n\nexport type RouterConfig = {\n  GET: Record<string, Omit<RouteConfig, \"body\">>\n  POST: Record<string, RouteConfig>\n}\n\nexport type InferRouteConfig<\n  T extends RouteConfig | Omit<RouteConfig, \"body\">\n> = {\n  [K in keyof T]: T[K] extends z.ZodType ? z.infer<T[K]> : never\n}\n\nexport const defineRoutes = <T extends RouterConfig>(routes: T): T =>\n  routes\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jokio/rpc",
-  "version": "0.5.3",
+  "version": "0.5.4",
   "description": "Type-safe RPC framework with Zod validation for Express and TypeScript",
   "main": "./dist/index.js",
   "module": "./dist/index.mjs",