@rpcbase/client 0.344.0 → 0.346.0

package/dist/apiClient/getServerApiClient.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getServerApiClient.d.ts","sourceRoot":"","sources":["../../src/apiClient/getServerApiClient.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAA8B,MAAM,SAAS,CAAA;AAGjE,KAAK,GAAG,GAAG,GAAG,CAAA;AAGd,eAAO,MAAM,kBAAkB,GAAS,KAAK,WAAW;UAqGtC,SAAS,kCACf,MAAM,WACH,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,QAC1B,GAAG,KACR,OAAO,CAAC,SAAS,CAAC;WAJP,SAAS,kCACf,MAAM,WACH,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,QAC1B,GAAG,KACR,OAAO,CAAC,SAAS,CAAC;UAJP,SAAS,kCACf,MAAM,WACH,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,QAC1B,GAAG,KACR,OAAO,CAAC,SAAS,CAAC;aAJP,SAAS,kCACf,MAAM,WACH,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,QAC1B,GAAG,KACR,OAAO,CAAC,SAAS,CAAC;EAkBxB,CAAA;AAED,eAAe,kBAAkB,CAAA"}
+{"version":3,"file":"getServerApiClient.d.ts","sourceRoot":"","sources":["../../src/apiClient/getServerApiClient.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAA8B,MAAM,SAAS,CAAA;AAGjE,KAAK,GAAG,GAAG,GAAG,CAAA;AAGd,eAAO,MAAM,kBAAkB,GAAS,KAAK,WAAW;UAuKtC,SAAS,kCACf,MAAM,WACH,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,QAC1B,GAAG,KACR,OAAO,CAAC,SAAS,CAAC;WAJP,SAAS,kCACf,MAAM,WACH,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,QAC1B,GAAG,KACR,OAAO,CAAC,SAAS,CAAC;UAJP,SAAS,kCACf,MAAM,WACH,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,QAC1B,GAAG,KACR,OAAO,CAAC,SAAS,CAAC;aAJP,SAAS,kCACf,MAAM,WACH,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,QAC1B,GAAG,KACR,OAAO,CAAC,SAAS,CAAC;EAyBxB,CAAA;AAED,eAAe,kBAAkB,CAAA"}

package/dist/{getServerApiClient-CHA4nyjq.js → getServerApiClient-C51U2cM0.js}

@@ -1,11 +1,11 @@
 const getServerApiClient = async (app) => {
-  const callRoute = async (app2, method, path, req, res) => {
+  const callRoute = async (app2, method, matchPath, requestUrl, req, res) => {
     return new Promise((resolve, reject) => {
       let isEnded = false;
       const mockReq = {
         ...req,
         method: method.toUpperCase(),
-        url: path
+        url: requestUrl
       };
       const mockRes = {
         ...res,
@@ -29,7 +29,7 @@ const getServerApiClient = async (app) => {
       const processLayer = async (index) => {
         if (index >= apiStack.length || isEnded) return;
         const layer = apiStack[index];
-        const isNonMatchingLayer = !layer.match(path);
+        const isNonMatchingLayer = !layer.match(matchPath);
         if (isNonMatchingLayer) {
           await processLayer(index + 1);
           return;
@@ -71,13 +71,70 @@ const getServerApiClient = async (app) => {
       }, 3e4);
     });
   };
+  const mergeQueryValues = (target, key, value) => {
+    const existing = target[key];
+    if (Array.isArray(existing)) {
+      existing.push(value);
+      return;
+    }
+    if (typeof existing === "string") {
+      target[key] = [existing, value];
+      return;
+    }
+    target[key] = value;
+  };
+  const toQueryValue = (value) => {
+    if (typeof value === "string") return value;
+    if (typeof value === "number") return Number.isFinite(value) ? String(value) : null;
+    if (typeof value === "boolean") return value ? "true" : "false";
+    if (typeof value === "bigint") return String(value);
+    if (value instanceof Date) return value.toISOString();
+    return null;
+  };
+  const buildQuery = (path, payload) => {
+    const url = new URL(path, "http://localhost");
+    const query = {};
+    for (const [key, value] of url.searchParams) {
+      mergeQueryValues(query, key, value);
+    }
+    for (const [key, rawValue] of Object.entries(payload)) {
+      if (!key) continue;
+      if (Array.isArray(rawValue)) {
+        for (const item of rawValue) {
+          const converted2 = toQueryValue(item);
+          if (converted2 !== null) mergeQueryValues(query, key, converted2);
+        }
+        continue;
+      }
+      const converted = toQueryValue(rawValue);
+      if (converted !== null) mergeQueryValues(query, key, converted);
+    }
+    const searchParams = new URLSearchParams();
+    for (const [key, rawValue] of Object.entries(query)) {
+      if (Array.isArray(rawValue)) {
+        for (const value of rawValue) {
+          searchParams.append(key, value);
+        }
+        continue;
+      }
+      searchParams.append(key, rawValue);
+    }
+    const matchPath = url.pathname;
+    const requestUrl = `${matchPath}${searchParams.toString() ? `?${searchParams.toString()}` : ""}`;
+    return { matchPath, requestUrl, query };
+  };
   const createMethod = (method) => {
     return async (path, payload, ctx) => {
       if (!ctx) {
         throw new Error("Context must be provided in SSR mode");
       }
-      ctx.req.body = payload;
-      return callRoute(app, method, path, ctx.req, ctx.res);
+      const normalizedMethod = method.toLowerCase();
+      if (normalizedMethod === "get") {
+        const { matchPath: matchPath2, requestUrl: requestUrl2, query: query2 } = buildQuery(path, payload);
+        return callRoute(app, method, matchPath2, requestUrl2, { ...ctx.req, body: {}, query: query2 }, ctx.res);
+      }
+      const { matchPath, requestUrl, query } = buildQuery(path, {});
+      return callRoute(app, method, matchPath, requestUrl, { ...ctx.req, body: payload, query }, ctx.res);
     };
   };
   const apiClient = {

package/dist/index.js

@@ -14,7 +14,7 @@ const initApiClient = async (args) => {
     if (!args) {
       throw new Error("Server args must be provided in SSR mode");
     }
-    const { getServerApiClient } = await import("./getServerApiClient-CHA4nyjq.js");
+    const { getServerApiClient } = await import("./getServerApiClient-C51U2cM0.js");
     apiClient = await getServerApiClient(args.app);
   } else {
     const axios = (await import("axios/dist/browser/axios.cjs")).default;
@@ -30,7 +30,7 @@ const initApiClient = async (args) => {
         const config = {
           method,
           url: path,
-          data: payload,
+          ...method === "get" ? { params: payload } : { data: payload },
           headers: {
             // ...(typeof ctxOrPath !== 'string' && {
             //   // 'X-Custom-Header': ctxOrPath.someHeaderValue,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rpcbase/client",
-  "version": "0.344.0",
+  "version": "0.346.0",
   "type": "module",
   "files": [
     "dist"