@jokio/rpc 0.1.1 → 0.2.0

package/dist/index.d.mts

@@ -7,21 +7,17 @@ type RouteConfig = {
     result: z.ZodType;
 };
 type RouterConfig = {
-    GET: Record<string, Omit<RouteConfig, 'body'>>;
+    GET: Record<string, Omit<RouteConfig, "body">>;
     POST: Record<string, RouteConfig>;
 };
-declare const defineRouterConfig: <T extends RouterConfig>(config: T) => T;
-
-type InferRouteConfig$1<T extends RouteConfig | Omit<RouteConfig, "body">> = {
+type InferRouteConfig<T extends RouteConfig | Omit<RouteConfig, "body">> = {
     [K in keyof T]: T[K] extends z.ZodType ? z.infer<T[K]> : never;
 };
+declare const defineRouterConfig: <T extends RouterConfig>(config: T) => T;
+
 type RouterClient<T extends RouterConfig> = {
-    GET: {
-        [K in keyof T["GET"]]: (data?: Omit<Omit<InferRouteConfig$1<T["GET"][K]>, "body">, "result">) => Promise<InferRouteConfig$1<T["GET"][K]>["result"]>;
-    };
-    POST: {
-        [K in keyof T["POST"]]: (data: Omit<InferRouteConfig$1<T["POST"][K]>, "result">) => Promise<InferRouteConfig$1<T["POST"][K]>["result"]>;
-    };
+    GET: <K extends keyof T["GET"]>(path: K, options?: Omit<Omit<InferRouteConfig<T["GET"][K]>, "body">, "result">) => Promise<InferRouteConfig<T["GET"][K]>["result"]>;
+    POST: <K extends keyof T["POST"]>(path: K, body: InferRouteConfig<T["POST"][K]>["body"], options?: Omit<InferRouteConfig<T["POST"][K]>, "body" | "result">) => Promise<InferRouteConfig<T["POST"][K]>["result"]>;
 };
 type FetchFunction = (url: string, options: RequestInit) => Promise<Response>;
 type CreateClientOptions = {
@@ -32,9 +28,6 @@ type CreateClientOptions = {
 };
 declare const createClient: <T extends RouterConfig>(config: T, options: CreateClientOptions) => RouterClient<T>;
 
-type InferRouteConfig<T extends RouteConfig | Omit<RouteConfig, "body">> = {
-    [K in keyof T]: T[K] extends z.ZodType ? z.infer<T[K]> : never;
-};
 type RouterHandlerConfig<T extends RouterConfig> = {
     GET: {
         [K in keyof T["GET"]]: (data: Omit<Omit<InferRouteConfig<T["GET"][K]>, "body">, "result">) => Promise<InferRouteConfig<T["GET"][K]>["result"]>;
@@ -45,4 +38,4 @@ type RouterHandlerConfig<T extends RouterConfig> = {
 };
 declare const applyConfigToExpressRouter: <T extends RouterConfig>(router: Router, config: T, handlers: RouterHandlerConfig<T>) => Router;
 
-export { type RouteConfig, type RouterClient, type RouterConfig, type RouterHandlerConfig, applyConfigToExpressRouter, createClient, defineRouterConfig };
+export { type InferRouteConfig, type RouteConfig, type RouterClient, type RouterConfig, type RouterHandlerConfig, applyConfigToExpressRouter, createClient, defineRouterConfig };

package/dist/index.d.ts

@@ -7,21 +7,17 @@ type RouteConfig = {
     result: z.ZodType;
 };
 type RouterConfig = {
-    GET: Record<string, Omit<RouteConfig, 'body'>>;
+    GET: Record<string, Omit<RouteConfig, "body">>;
     POST: Record<string, RouteConfig>;
 };
-declare const defineRouterConfig: <T extends RouterConfig>(config: T) => T;
-
-type InferRouteConfig$1<T extends RouteConfig | Omit<RouteConfig, "body">> = {
+type InferRouteConfig<T extends RouteConfig | Omit<RouteConfig, "body">> = {
     [K in keyof T]: T[K] extends z.ZodType ? z.infer<T[K]> : never;
 };
+declare const defineRouterConfig: <T extends RouterConfig>(config: T) => T;
+
 type RouterClient<T extends RouterConfig> = {
-    GET: {
-        [K in keyof T["GET"]]: (data?: Omit<Omit<InferRouteConfig$1<T["GET"][K]>, "body">, "result">) => Promise<InferRouteConfig$1<T["GET"][K]>["result"]>;
-    };
-    POST: {
-        [K in keyof T["POST"]]: (data: Omit<InferRouteConfig$1<T["POST"][K]>, "result">) => Promise<InferRouteConfig$1<T["POST"][K]>["result"]>;
-    };
+    GET: <K extends keyof T["GET"]>(path: K, options?: Omit<Omit<InferRouteConfig<T["GET"][K]>, "body">, "result">) => Promise<InferRouteConfig<T["GET"][K]>["result"]>;
+    POST: <K extends keyof T["POST"]>(path: K, body: InferRouteConfig<T["POST"][K]>["body"], options?: Omit<InferRouteConfig<T["POST"][K]>, "body" | "result">) => Promise<InferRouteConfig<T["POST"][K]>["result"]>;
 };
 type FetchFunction = (url: string, options: RequestInit) => Promise<Response>;
 type CreateClientOptions = {
@@ -32,9 +28,6 @@ type CreateClientOptions = {
 };
 declare const createClient: <T extends RouterConfig>(config: T, options: CreateClientOptions) => RouterClient<T>;
 
-type InferRouteConfig<T extends RouteConfig | Omit<RouteConfig, "body">> = {
-    [K in keyof T]: T[K] extends z.ZodType ? z.infer<T[K]> : never;
-};
 type RouterHandlerConfig<T extends RouterConfig> = {
     GET: {
         [K in keyof T["GET"]]: (data: Omit<Omit<InferRouteConfig<T["GET"][K]>, "body">, "result">) => Promise<InferRouteConfig<T["GET"][K]>["result"]>;
@@ -45,4 +38,4 @@ type RouterHandlerConfig<T extends RouterConfig> = {
 };
 declare const applyConfigToExpressRouter: <T extends RouterConfig>(router: Router, config: T, handlers: RouterHandlerConfig<T>) => Router;
 
-export { type RouteConfig, type RouterClient, type RouterConfig, type RouterHandlerConfig, applyConfigToExpressRouter, createClient, defineRouterConfig };
+export { type InferRouteConfig, type RouteConfig, type RouterClient, type RouterConfig, type RouterHandlerConfig, applyConfigToExpressRouter, createClient, defineRouterConfig };

package/dist/index.js

@@ -1,8 +1,5 @@
 'use strict';
 
-// src/types.ts
-var defineRouterConfig = (config) => config;
-
 // src/client.ts
 var createClient = (config, options) => {
   const {
@@ -15,52 +12,52 @@ var createClient = (config, options) => {
     GET: {},
     POST: {}
   };
-  Object.keys(config.GET).forEach((path) => {
-    client.GET[path] = async (data) => {
-      if (validateRequest && data?.query) {
-        config.GET[path]?.query?.parse(data.query);
+  client.GET = async (path, data) => {
+    if (validateRequest && data?.query) {
+      config.GET[path]?.query?.parse(data.query);
+    }
+    const queryString = data?.query ? "?" + new URLSearchParams(data.query).toString() : "";
+    const response = await customFetch(`${baseUrl}${path}${queryString}`, {
+      method: "GET",
+      headers: {
+        "Content-Type": "application/json",
+        ...headers
       }
-      const queryString = data?.query ? "?" + new URLSearchParams(data.query).toString() : "";
-      const response = await customFetch(`${baseUrl}${path}${queryString}`, {
-        method: "GET",
-        headers: {
-          "Content-Type": "application/json",
-          ...headers
-        }
-      });
-      if (!response.ok) {
-        throw new Error(`HTTP error! status: ${response.status}`);
-      }
-      const json = await response.json();
-      return config.GET[path]?.result.parse(json);
-    };
-  });
-  Object.keys(config.POST).forEach((path) => {
-    client.POST[path] = async (data) => {
-      if (validateRequest) {
-        if (data?.body) {
-          config.POST[path]?.body?.parse(data.body);
-        }
-        if (data?.query) {
-          config.POST[path]?.query?.parse(data.query);
-        }
+    });
+    if (!response.ok) {
+      const error = await response.json();
+      console.error(error);
+      throw new Error(error.message);
+    }
+    const json = await response.json();
+    return config.GET[path]?.result.parse(json);
+  };
+  client.POST = async (path, body, rest) => {
+    if (validateRequest) {
+      if (body) {
+        config.POST[path]?.body?.parse(body);
       }
-      const queryString = data?.query ? "?" + new URLSearchParams(data.query).toString() : "";
-      const response = await customFetch(`${baseUrl}${path}${queryString}`, {
-        method: "POST",
-        headers: {
-          "Content-Type": "application/json",
-          ...headers
-        },
-        body: JSON.stringify(data.body)
-      });
-      if (!response.ok) {
-        throw new Error(`HTTP error! status: ${response.status}`);
+      if (rest?.query) {
+        config.POST[path]?.query?.parse(rest.query);
       }
-      const json = await response.json();
-      return config.POST[path]?.result.parse(json);
-    };
-  });
+    }
+    const queryString = rest?.query ? "?" + new URLSearchParams(rest.query).toString() : "";
+    const response = await customFetch(`${baseUrl}${path}${queryString}`, {
+      method: "POST",
+      headers: {
+        "Content-Type": "application/json",
+        ...headers
+      },
+      body: JSON.stringify(body)
+    });
+    if (!response.ok) {
+      const error = await response.json();
+      console.error(error);
+      throw new Error(error.message);
+    }
+    const json = await response.json();
+    return config.POST[path]?.result.parse(json);
+  };
   return client;
 };
 
@@ -101,6 +98,9 @@ var applyConfigToExpressRouter = (router, config, handlers) => {
   return router;
 };
 
+// src/types.ts
+var defineRouterConfig = (config) => config;
+
 exports.applyConfigToExpressRouter = applyConfigToExpressRouter;
 exports.createClient = createClient;
 exports.defineRouterConfig = defineRouterConfig;

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/types.ts","../src/client.ts","../src/server.ts"],"names":[],"mappings":"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","file":"index.js","sourcesContent":["import type z from 'zod'\n\nexport type RouteConfig = {\n  body: z.ZodType\n  query?: z.ZodType\n  result: z.ZodType\n}\n\nexport type RouterConfig = {\n  GET: Record<string, Omit<RouteConfig, 'body'>>\n  POST: Record<string, RouteConfig>\n}\n\nexport const defineRouterConfig = <T extends RouterConfig>(config: T): T => config\n","import type z from \"zod\";\nimport type { RouteConfig, RouterConfig } from \"./types\";\n\ntype InferRouteConfig<T extends RouteConfig | Omit<RouteConfig, \"body\">> = {\n  [K in keyof T]: T[K] extends z.ZodType ? z.infer<T[K]> : never;\n};\n\nexport type RouterClient<T extends RouterConfig> = {\n  GET: {\n    [K in keyof T[\"GET\"]]: (\n      data?: Omit<Omit<InferRouteConfig<T[\"GET\"][K]>, \"body\">, \"result\">\n    ) => Promise<InferRouteConfig<T[\"GET\"][K]>[\"result\"]>;\n  };\n  POST: {\n    [K in keyof T[\"POST\"]]: (\n      data: Omit<InferRouteConfig<T[\"POST\"][K]>, \"result\">\n    ) => Promise<InferRouteConfig<T[\"POST\"][K]>[\"result\"]>;\n  };\n};\n\ntype FetchFunction = (url: string, options: RequestInit) => Promise<Response>;\n\ntype CreateClientOptions = {\n  baseUrl: string;\n  headers?: Record<string, string>;\n  fetch?: FetchFunction;\n  validateRequest?: boolean;\n};\n\nexport const createClient = <T extends RouterConfig>(\n  config: T,\n  options: CreateClientOptions\n): RouterClient<T> => {\n  const {\n    baseUrl,\n    headers = {},\n    fetch: customFetch = fetch,\n    validateRequest = false,\n  } = options;\n\n  const client = {\n    GET: {} as RouterClient<T>[\"GET\"],\n    POST: {} as RouterClient<T>[\"POST\"],\n  };\n\n  Object.keys(config.GET).forEach((path) => {\n    (client.GET[path as keyof T[\"GET\"]] as any) = async (data?: any) => {\n      if (validateRequest && data?.query) {\n        config.GET[path]?.query?.parse(data.query);\n      }\n      const queryString = data?.query\n        ? \"?\" + new URLSearchParams(data.query).toString()\n        : \"\";\n      const response = await customFetch(`${baseUrl}${path}${queryString}`, {\n        method: \"GET\",\n        headers: {\n          \"Content-Type\": \"application/json\",\n          ...headers,\n        },\n      });\n      if (!response.ok) {\n        throw new Error(`HTTP error! status: ${response.status}`);\n      }\n      const json = await response.json();\n\n      return config.GET[path]?.result.parse(json);\n    };\n  });\n\n  Object.keys(config.POST).forEach((path) => {\n    (client.POST[path as keyof T[\"POST\"]] as any) = async (data: any) => {\n      if (validateRequest) {\n        if (data?.body) {\n          config.POST[path]?.body?.parse(data.body);\n        }\n        if (data?.query) {\n          config.POST[path]?.query?.parse(data.query);\n        }\n      }\n      const queryString = data?.query\n        ? \"?\" + new URLSearchParams(data.query).toString()\n        : \"\";\n      const response = await customFetch(`${baseUrl}${path}${queryString}`, {\n        method: \"POST\",\n        headers: {\n          \"Content-Type\": \"application/json\",\n          ...headers,\n        },\n        body: JSON.stringify(data.body),\n      });\n      if (!response.ok) {\n        throw new Error(`HTTP error! status: ${response.status}`);\n      }\n      const json = await response.json();\n\n      return config.POST[path]?.result.parse(json);\n    };\n  });\n\n  return client;\n};\n","import type { Router } from \"express\";\nimport type z from \"zod\";\nimport type { RouteConfig, RouterConfig } from \"./types\";\n\ntype InferRouteConfig<T extends RouteConfig | Omit<RouteConfig, \"body\">> = {\n  [K in keyof T]: T[K] extends z.ZodType ? z.infer<T[K]> : never;\n};\n\nexport type RouterHandlerConfig<T extends RouterConfig> = {\n  GET: {\n    [K in keyof T[\"GET\"]]: (\n      data: Omit<Omit<InferRouteConfig<T[\"GET\"][K]>, \"body\">, \"result\">\n    ) => Promise<InferRouteConfig<T[\"GET\"][K]>[\"result\"]>;\n  };\n  POST: {\n    [K in keyof T[\"POST\"]]: (\n      data: Omit<InferRouteConfig<T[\"POST\"][K]>, \"result\">\n    ) => Promise<InferRouteConfig<T[\"POST\"][K]>[\"result\"]>;\n  };\n};\n\nexport const applyConfigToExpressRouter = <T extends RouterConfig>(\n  router: Router,\n  config: T,\n  handlers: RouterHandlerConfig<T>\n) => {\n  const routes = Object.keys(config.GET);\n\n  routes.reduce(\n    (r, x) =>\n      r.get(x, async (req, res, next) => {\n        try {\n          const data = {\n            query: config.GET[x]?.query?.parse(req.query),\n          };\n          const result = await handlers.GET[x]?.(data as any);\n          const validatedResult = config.GET[x]?.result.parse(result);\n          res.json(validatedResult);\n        } catch (err) {\n          next(err);\n        }\n      }),\n    router\n  );\n\n  routes.reduce(\n    (r, x) =>\n      r.post(x, async (req, res, next) => {\n        try {\n          const data = {\n            body: config.POST[x]?.body.parse(req.body),\n            query: config.POST[x]?.query?.parse(req.query),\n          };\n          const result = await handlers.POST[x]?.(data as any);\n          const validatedResult = config.POST[x]?.result.parse(result);\n          res.json(validatedResult);\n        } catch (err) {\n          next(err);\n        }\n      }),\n    router\n  );\n\n  return router;\n};\n"]}
+{"version":3,"sources":["../src/client.ts","../src/server.ts","../src/types.ts"],"names":[],"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\">, \"result\">\n  ) => Promise<InferRouteConfig<T[\"GET\"][K]>[\"result\"]>\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\" | \"result\">\n  ) => Promise<InferRouteConfig<T[\"POST\"][K]>[\"result\"]>\n}\n\ntype FetchFunction = (url: string, options: RequestInit) => Promise<Response>\n\ntype CreateClientOptions = {\n  baseUrl: string\n  headers?: Record<string, string>\n  fetch?: FetchFunction\n  validateRequest?: boolean\n}\n\nexport const createClient = <T extends RouterConfig>(\n  config: T,\n  options: CreateClientOptions\n): RouterClient<T> => {\n  const {\n    baseUrl,\n    headers = {},\n    fetch: customFetch = fetch,\n    validateRequest = false,\n  } = options\n\n  const client = {\n    GET: {} as any,\n    POST: {} as any,\n  }\n\n  client.GET = async (path: string, data?: any) => {\n    if (validateRequest && data?.query) {\n      config.GET[path]?.query?.parse(data.query)\n    }\n    const queryString = data?.query\n      ? \"?\" + new URLSearchParams(data.query).toString()\n      : \"\"\n    const response = await customFetch(`${baseUrl}${path}${queryString}`, {\n      method: \"GET\",\n      headers: {\n        \"Content-Type\": \"application/json\",\n        ...headers,\n      },\n    })\n\n    if (!response.ok) {\n      const error: any = await response.json()\n      console.error(error)\n      throw new Error(error.message)\n    }\n\n    const json = await response.json()\n\n    return config.GET[path]?.result.parse(json)\n  }\n\n  client.POST = async (path: string, body: any, rest?: any) => {\n    if (validateRequest) {\n      if (body) {\n        config.POST[path]?.body?.parse(body)\n      }\n      if (rest?.query) {\n        config.POST[path]?.query?.parse(rest.query)\n      }\n    }\n    const queryString = rest?.query\n      ? \"?\" + new URLSearchParams(rest.query).toString()\n      : \"\"\n    const response = await customFetch(`${baseUrl}${path}${queryString}`, {\n      method: \"POST\",\n      headers: {\n        \"Content-Type\": \"application/json\",\n        ...headers,\n      },\n      body: JSON.stringify(body),\n    })\n\n    if (!response.ok) {\n      const error: any = await response.json()\n      console.error(error)\n      throw new Error(error.message)\n    }\n\n    const json = await response.json()\n\n    return config.POST[path]?.result.parse(json)\n  }\n\n  return client\n}\n","import type { Router } from \"express\";\nimport type { InferRouteConfig, RouterConfig } from \"./types\";\n\nexport type RouterHandlerConfig<T extends RouterConfig> = {\n  GET: {\n    [K in keyof T[\"GET\"]]: (\n      data: Omit<Omit<InferRouteConfig<T[\"GET\"][K]>, \"body\">, \"result\">\n    ) => Promise<InferRouteConfig<T[\"GET\"][K]>[\"result\"]>;\n  };\n  POST: {\n    [K in keyof T[\"POST\"]]: (\n      data: Omit<InferRouteConfig<T[\"POST\"][K]>, \"result\">\n    ) => Promise<InferRouteConfig<T[\"POST\"][K]>[\"result\"]>;\n  };\n};\n\nexport const applyConfigToExpressRouter = <T extends RouterConfig>(\n  router: Router,\n  config: T,\n  handlers: RouterHandlerConfig<T>\n) => {\n  const routes = Object.keys(config.GET);\n\n  routes.reduce(\n    (r, x) =>\n      r.get(x, async (req, res, next) => {\n        try {\n          const data = {\n            query: config.GET[x]?.query?.parse(req.query),\n          };\n          const result = await handlers.GET[x]?.(data as any);\n          const validatedResult = config.GET[x]?.result.parse(result);\n          res.json(validatedResult);\n        } catch (err) {\n          next(err);\n        }\n      }),\n    router\n  );\n\n  routes.reduce(\n    (r, x) =>\n      r.post(x, async (req, res, next) => {\n        try {\n          const data = {\n            body: config.POST[x]?.body.parse(req.body),\n            query: config.POST[x]?.query?.parse(req.query),\n          };\n          const result = await handlers.POST[x]?.(data as any);\n          const validatedResult = config.POST[x]?.result.parse(result);\n          res.json(validatedResult);\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  query?: z.ZodType;\n  result: 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 defineRouterConfig = <T extends RouterConfig>(config: T): T =>\n  config;\n"]}

package/dist/index.mjs

@@ -1,6 +1,3 @@
-// src/types.ts
-var defineRouterConfig = (config) => config;
-
 // src/client.ts
 var createClient = (config, options) => {
   const {
@@ -13,52 +10,52 @@ var createClient = (config, options) => {
     GET: {},
     POST: {}
   };
-  Object.keys(config.GET).forEach((path) => {
-    client.GET[path] = async (data) => {
-      if (validateRequest && data?.query) {
-        config.GET[path]?.query?.parse(data.query);
+  client.GET = async (path, data) => {
+    if (validateRequest && data?.query) {
+      config.GET[path]?.query?.parse(data.query);
+    }
+    const queryString = data?.query ? "?" + new URLSearchParams(data.query).toString() : "";
+    const response = await customFetch(`${baseUrl}${path}${queryString}`, {
+      method: "GET",
+      headers: {
+        "Content-Type": "application/json",
+        ...headers
       }
-      const queryString = data?.query ? "?" + new URLSearchParams(data.query).toString() : "";
-      const response = await customFetch(`${baseUrl}${path}${queryString}`, {
-        method: "GET",
-        headers: {
-          "Content-Type": "application/json",
-          ...headers
-        }
-      });
-      if (!response.ok) {
-        throw new Error(`HTTP error! status: ${response.status}`);
-      }
-      const json = await response.json();
-      return config.GET[path]?.result.parse(json);
-    };
-  });
-  Object.keys(config.POST).forEach((path) => {
-    client.POST[path] = async (data) => {
-      if (validateRequest) {
-        if (data?.body) {
-          config.POST[path]?.body?.parse(data.body);
-        }
-        if (data?.query) {
-          config.POST[path]?.query?.parse(data.query);
-        }
+    });
+    if (!response.ok) {
+      const error = await response.json();
+      console.error(error);
+      throw new Error(error.message);
+    }
+    const json = await response.json();
+    return config.GET[path]?.result.parse(json);
+  };
+  client.POST = async (path, body, rest) => {
+    if (validateRequest) {
+      if (body) {
+        config.POST[path]?.body?.parse(body);
       }
-      const queryString = data?.query ? "?" + new URLSearchParams(data.query).toString() : "";
-      const response = await customFetch(`${baseUrl}${path}${queryString}`, {
-        method: "POST",
-        headers: {
-          "Content-Type": "application/json",
-          ...headers
-        },
-        body: JSON.stringify(data.body)
-      });
-      if (!response.ok) {
-        throw new Error(`HTTP error! status: ${response.status}`);
+      if (rest?.query) {
+        config.POST[path]?.query?.parse(rest.query);
       }
-      const json = await response.json();
-      return config.POST[path]?.result.parse(json);
-    };
-  });
+    }
+    const queryString = rest?.query ? "?" + new URLSearchParams(rest.query).toString() : "";
+    const response = await customFetch(`${baseUrl}${path}${queryString}`, {
+      method: "POST",
+      headers: {
+        "Content-Type": "application/json",
+        ...headers
+      },
+      body: JSON.stringify(body)
+    });
+    if (!response.ok) {
+      const error = await response.json();
+      console.error(error);
+      throw new Error(error.message);
+    }
+    const json = await response.json();
+    return config.POST[path]?.result.parse(json);
+  };
   return client;
 };
 
@@ -99,6 +96,9 @@ var applyConfigToExpressRouter = (router, config, handlers) => {
   return router;
 };
 
+// src/types.ts
+var defineRouterConfig = (config) => config;
+
 export { applyConfigToExpressRouter, createClient, defineRouterConfig };
 //# sourceMappingURL=index.mjs.map
 //# sourceMappingURL=index.mjs.map

package/dist/index.mjs.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/types.ts","../src/client.ts","../src/server.ts"],"names":[],"mappings":"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","file":"index.mjs","sourcesContent":["import type z from 'zod'\n\nexport type RouteConfig = {\n  body: z.ZodType\n  query?: z.ZodType\n  result: z.ZodType\n}\n\nexport type RouterConfig = {\n  GET: Record<string, Omit<RouteConfig, 'body'>>\n  POST: Record<string, RouteConfig>\n}\n\nexport const defineRouterConfig = <T extends RouterConfig>(config: T): T => config\n","import type z from \"zod\";\nimport type { RouteConfig, RouterConfig } from \"./types\";\n\ntype InferRouteConfig<T extends RouteConfig | Omit<RouteConfig, \"body\">> = {\n  [K in keyof T]: T[K] extends z.ZodType ? z.infer<T[K]> : never;\n};\n\nexport type RouterClient<T extends RouterConfig> = {\n  GET: {\n    [K in keyof T[\"GET\"]]: (\n      data?: Omit<Omit<InferRouteConfig<T[\"GET\"][K]>, \"body\">, \"result\">\n    ) => Promise<InferRouteConfig<T[\"GET\"][K]>[\"result\"]>;\n  };\n  POST: {\n    [K in keyof T[\"POST\"]]: (\n      data: Omit<InferRouteConfig<T[\"POST\"][K]>, \"result\">\n    ) => Promise<InferRouteConfig<T[\"POST\"][K]>[\"result\"]>;\n  };\n};\n\ntype FetchFunction = (url: string, options: RequestInit) => Promise<Response>;\n\ntype CreateClientOptions = {\n  baseUrl: string;\n  headers?: Record<string, string>;\n  fetch?: FetchFunction;\n  validateRequest?: boolean;\n};\n\nexport const createClient = <T extends RouterConfig>(\n  config: T,\n  options: CreateClientOptions\n): RouterClient<T> => {\n  const {\n    baseUrl,\n    headers = {},\n    fetch: customFetch = fetch,\n    validateRequest = false,\n  } = options;\n\n  const client = {\n    GET: {} as RouterClient<T>[\"GET\"],\n    POST: {} as RouterClient<T>[\"POST\"],\n  };\n\n  Object.keys(config.GET).forEach((path) => {\n    (client.GET[path as keyof T[\"GET\"]] as any) = async (data?: any) => {\n      if (validateRequest && data?.query) {\n        config.GET[path]?.query?.parse(data.query);\n      }\n      const queryString = data?.query\n        ? \"?\" + new URLSearchParams(data.query).toString()\n        : \"\";\n      const response = await customFetch(`${baseUrl}${path}${queryString}`, {\n        method: \"GET\",\n        headers: {\n          \"Content-Type\": \"application/json\",\n          ...headers,\n        },\n      });\n      if (!response.ok) {\n        throw new Error(`HTTP error! status: ${response.status}`);\n      }\n      const json = await response.json();\n\n      return config.GET[path]?.result.parse(json);\n    };\n  });\n\n  Object.keys(config.POST).forEach((path) => {\n    (client.POST[path as keyof T[\"POST\"]] as any) = async (data: any) => {\n      if (validateRequest) {\n        if (data?.body) {\n          config.POST[path]?.body?.parse(data.body);\n        }\n        if (data?.query) {\n          config.POST[path]?.query?.parse(data.query);\n        }\n      }\n      const queryString = data?.query\n        ? \"?\" + new URLSearchParams(data.query).toString()\n        : \"\";\n      const response = await customFetch(`${baseUrl}${path}${queryString}`, {\n        method: \"POST\",\n        headers: {\n          \"Content-Type\": \"application/json\",\n          ...headers,\n        },\n        body: JSON.stringify(data.body),\n      });\n      if (!response.ok) {\n        throw new Error(`HTTP error! status: ${response.status}`);\n      }\n      const json = await response.json();\n\n      return config.POST[path]?.result.parse(json);\n    };\n  });\n\n  return client;\n};\n","import type { Router } from \"express\";\nimport type z from \"zod\";\nimport type { RouteConfig, RouterConfig } from \"./types\";\n\ntype InferRouteConfig<T extends RouteConfig | Omit<RouteConfig, \"body\">> = {\n  [K in keyof T]: T[K] extends z.ZodType ? z.infer<T[K]> : never;\n};\n\nexport type RouterHandlerConfig<T extends RouterConfig> = {\n  GET: {\n    [K in keyof T[\"GET\"]]: (\n      data: Omit<Omit<InferRouteConfig<T[\"GET\"][K]>, \"body\">, \"result\">\n    ) => Promise<InferRouteConfig<T[\"GET\"][K]>[\"result\"]>;\n  };\n  POST: {\n    [K in keyof T[\"POST\"]]: (\n      data: Omit<InferRouteConfig<T[\"POST\"][K]>, \"result\">\n    ) => Promise<InferRouteConfig<T[\"POST\"][K]>[\"result\"]>;\n  };\n};\n\nexport const applyConfigToExpressRouter = <T extends RouterConfig>(\n  router: Router,\n  config: T,\n  handlers: RouterHandlerConfig<T>\n) => {\n  const routes = Object.keys(config.GET);\n\n  routes.reduce(\n    (r, x) =>\n      r.get(x, async (req, res, next) => {\n        try {\n          const data = {\n            query: config.GET[x]?.query?.parse(req.query),\n          };\n          const result = await handlers.GET[x]?.(data as any);\n          const validatedResult = config.GET[x]?.result.parse(result);\n          res.json(validatedResult);\n        } catch (err) {\n          next(err);\n        }\n      }),\n    router\n  );\n\n  routes.reduce(\n    (r, x) =>\n      r.post(x, async (req, res, next) => {\n        try {\n          const data = {\n            body: config.POST[x]?.body.parse(req.body),\n            query: config.POST[x]?.query?.parse(req.query),\n          };\n          const result = await handlers.POST[x]?.(data as any);\n          const validatedResult = config.POST[x]?.result.parse(result);\n          res.json(validatedResult);\n        } catch (err) {\n          next(err);\n        }\n      }),\n    router\n  );\n\n  return router;\n};\n"]}
+{"version":3,"sources":["../src/client.ts","../src/server.ts","../src/types.ts"],"names":[],"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\">, \"result\">\n  ) => Promise<InferRouteConfig<T[\"GET\"][K]>[\"result\"]>\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\" | \"result\">\n  ) => Promise<InferRouteConfig<T[\"POST\"][K]>[\"result\"]>\n}\n\ntype FetchFunction = (url: string, options: RequestInit) => Promise<Response>\n\ntype CreateClientOptions = {\n  baseUrl: string\n  headers?: Record<string, string>\n  fetch?: FetchFunction\n  validateRequest?: boolean\n}\n\nexport const createClient = <T extends RouterConfig>(\n  config: T,\n  options: CreateClientOptions\n): RouterClient<T> => {\n  const {\n    baseUrl,\n    headers = {},\n    fetch: customFetch = fetch,\n    validateRequest = false,\n  } = options\n\n  const client = {\n    GET: {} as any,\n    POST: {} as any,\n  }\n\n  client.GET = async (path: string, data?: any) => {\n    if (validateRequest && data?.query) {\n      config.GET[path]?.query?.parse(data.query)\n    }\n    const queryString = data?.query\n      ? \"?\" + new URLSearchParams(data.query).toString()\n      : \"\"\n    const response = await customFetch(`${baseUrl}${path}${queryString}`, {\n      method: \"GET\",\n      headers: {\n        \"Content-Type\": \"application/json\",\n        ...headers,\n      },\n    })\n\n    if (!response.ok) {\n      const error: any = await response.json()\n      console.error(error)\n      throw new Error(error.message)\n    }\n\n    const json = await response.json()\n\n    return config.GET[path]?.result.parse(json)\n  }\n\n  client.POST = async (path: string, body: any, rest?: any) => {\n    if (validateRequest) {\n      if (body) {\n        config.POST[path]?.body?.parse(body)\n      }\n      if (rest?.query) {\n        config.POST[path]?.query?.parse(rest.query)\n      }\n    }\n    const queryString = rest?.query\n      ? \"?\" + new URLSearchParams(rest.query).toString()\n      : \"\"\n    const response = await customFetch(`${baseUrl}${path}${queryString}`, {\n      method: \"POST\",\n      headers: {\n        \"Content-Type\": \"application/json\",\n        ...headers,\n      },\n      body: JSON.stringify(body),\n    })\n\n    if (!response.ok) {\n      const error: any = await response.json()\n      console.error(error)\n      throw new Error(error.message)\n    }\n\n    const json = await response.json()\n\n    return config.POST[path]?.result.parse(json)\n  }\n\n  return client\n}\n","import type { Router } from \"express\";\nimport type { InferRouteConfig, RouterConfig } from \"./types\";\n\nexport type RouterHandlerConfig<T extends RouterConfig> = {\n  GET: {\n    [K in keyof T[\"GET\"]]: (\n      data: Omit<Omit<InferRouteConfig<T[\"GET\"][K]>, \"body\">, \"result\">\n    ) => Promise<InferRouteConfig<T[\"GET\"][K]>[\"result\"]>;\n  };\n  POST: {\n    [K in keyof T[\"POST\"]]: (\n      data: Omit<InferRouteConfig<T[\"POST\"][K]>, \"result\">\n    ) => Promise<InferRouteConfig<T[\"POST\"][K]>[\"result\"]>;\n  };\n};\n\nexport const applyConfigToExpressRouter = <T extends RouterConfig>(\n  router: Router,\n  config: T,\n  handlers: RouterHandlerConfig<T>\n) => {\n  const routes = Object.keys(config.GET);\n\n  routes.reduce(\n    (r, x) =>\n      r.get(x, async (req, res, next) => {\n        try {\n          const data = {\n            query: config.GET[x]?.query?.parse(req.query),\n          };\n          const result = await handlers.GET[x]?.(data as any);\n          const validatedResult = config.GET[x]?.result.parse(result);\n          res.json(validatedResult);\n        } catch (err) {\n          next(err);\n        }\n      }),\n    router\n  );\n\n  routes.reduce(\n    (r, x) =>\n      r.post(x, async (req, res, next) => {\n        try {\n          const data = {\n            body: config.POST[x]?.body.parse(req.body),\n            query: config.POST[x]?.query?.parse(req.query),\n          };\n          const result = await handlers.POST[x]?.(data as any);\n          const validatedResult = config.POST[x]?.result.parse(result);\n          res.json(validatedResult);\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  query?: z.ZodType;\n  result: 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 defineRouterConfig = <T extends RouterConfig>(config: T): T =>\n  config;\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jokio/rpc",
-  "version": "0.1.1",
+  "version": "0.2.0",
   "description": "Type-safe RPC framework with Zod validation for Express and TypeScript",
   "main": "./dist/index.js",
   "module": "./dist/index.mjs",
@@ -15,6 +15,9 @@
       "types": "./dist/index.d.ts"
     }
   },
+  "prettier": {
+    "semi": false
+  },
   "scripts": {
     "build": "tsup",
     "dev": "tsup --watch",