nyte 1.3.2 → 1.3.3

package/dist/client/rpc.d.ts

@@ -1,8 +1,29 @@
+export type RpcClientFn = <TReturn = unknown>(...args: any[]) => Promise<TReturn>;
+type DropFirst<T extends any[]> = T extends [any, ...infer R] ? R : T;
+type ClientArgs<Fn> = Fn extends (...args: infer A) => any ? DropFirst<A> : any[];
+type ClientReturn<Fn> = Fn extends (...args: any[]) => infer R ? Awaited<R> : unknown;
+export type RpcClient<TApi extends Record<string, any> = Record<string, any>> = {
+    /** Debug helper to inspect which file was passed to importServer() */
+    __file: string;
+} & {
+    [K in keyof TApi]: TApi[K] extends (...args: any[]) => any ? <TReturn = ClientReturn<TApi[K]>>(...args: ClientArgs<TApi[K]>) => Promise<TReturn> : RpcClientFn;
+} & {
+    [key: string]: RpcClientFn;
+};
 /**
  * `importServer("src/backend/index.ts")` returns a Proxy where every property is
  * a function that performs a POST to `/api/rpc`.
  *
+ * Typing:
+ * - Without a generic: `const api = importServer('...')` -> `api.anyFn<MyReturn>()`
+ * - With a generic: `importServer<typeof import('../../backend/helper')>('...')`
+ *   gives argument + default return types, while still allowing overrides.
+ *
+ * Note: server functions can be defined as `(req, ...args)`; the first arg is injected
+ * by the server, so the client signature automatically drops that first parameter.
+ *
  * Security note: the server will still validate allowlisted directories.
  * @param {string} file
  */
-export declare function importServer<T extends Record<string, any> = Record<string, any>>(file: string): T;
+export declare function importServer<TApi extends Record<string, any> = Record<string, any>>(file: string): RpcClient<TApi>;
+export {};

package/dist/client/rpc.js

@@ -32,6 +32,14 @@ function asErrorMessage(err) {
  * `importServer("src/backend/index.ts")` returns a Proxy where every property is
  * a function that performs a POST to `/api/rpc`.
  *
+ * Typing:
+ * - Without a generic: `const api = importServer('...')` -> `api.anyFn<MyReturn>()`
+ * - With a generic: `importServer<typeof import('../../backend/helper')>('...')`
+ *   gives argument + default return types, while still allowing overrides.
+ *
+ * Note: server functions can be defined as `(req, ...args)`; the first arg is injected
+ * by the server, so the client signature automatically drops that first parameter.
+ *
  * Security note: the server will still validate allowlisted directories.
  * @param {string} file
  */
@@ -47,7 +55,7 @@ function importServer(file) {
             if (prop === 'then')
                 return undefined; // prevent await Proxy issues
             const fnName = String(prop);
-            return async (...args) => {
+            const rpcFn = async (...args) => {
                 const payload = {
                     file,
                     fn: fnName,
@@ -91,6 +99,7 @@ function importServer(file) {
                 }
                 throw new Error(data.error || 'RPC Error');
             };
+            return rpcFn;
         }
     };
     return new Proxy({}, handler);

package/dist/rpc/server.js

@@ -172,7 +172,14 @@ async function executeRpc(ctx, payload) {
         }
         // ------------------------------------------
         const rpcRequest = ctx.request ? new http_1.NyteRequest(ctx.request) : buildRpcRequestFromPayload(payload);
-        const result = await fnValue(rpcRequest, ...payload.args);
+        // If the function declares a first parameter, we assume it's the injected request.
+        // Otherwise, call it only with payload args.
+        // NOTE: `.length` counts only required params; if the function is declared as (req?: NyteRequest, ...)
+        // it might be 0, so we treat length>=1 as "expects req".
+        const expectsReq = fnValue.length >= 1;
+        const result = expectsReq
+            ? await fnValue(rpcRequest, ...payload.args)
+            : await fnValue(...payload.args);
         return { success: true, return: result };
     }
     catch (err) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nyte",
-  "version": "1.3.2",
+  "version": "1.3.3",
   "description": "Nyte.js is a high-level framework for building web applications with ease and speed. It provides a robust set of tools and features to streamline development and enhance productivity.",
   "types": "dist/index.d.ts",
   "author": "itsmuzin",