routesync 1.0.23 → 1.0.25

package/dist/cli.js

@@ -9108,22 +9108,42 @@ var NextActionGenerator = class {
         const ContractName = `${TitleCaseGroup}${TitleCaseAction}Contract`;
         const hasBody = route.schema && route.schema.rules && Object.keys(route.schema.rules).length > 0;
         const hasQuery = route.method === "GET";
-        const hasParams = route.path.includes(":");
-        let payloadType = "never";
-        if (hasBody) payloadType = `${ContractName}['request']['body']`;
-        else if (hasQuery) payloadType = `${ContractName}['request']['query']`;
-        else if (hasParams) payloadType = `${ContractName}['request']['params']`;
-        const payloadParam = hasBody || hasQuery || hasParams ? `payload: ${payloadType}` : `payload?: unknown`;
-        lines.push(`export async function ${actionName}Action(${payloadParam}) {`);
+        const hasParams = route.path.includes("{");
+        const count = (hasBody ? 1 : 0) + (hasQuery ? 1 : 0) + (hasParams ? 1 : 0);
+        let payloadParam = "";
         const args = [];
-        if (hasParams) {
-          args.push(`params: payload`);
-        }
-        if (hasQuery) {
-          args.push(`query: payload`);
-        } else if (hasBody) {
-          args.push(`body: payload`);
+        if (count > 1) {
+          const props = [];
+          if (hasParams) {
+            props.push(`params: ${ContractName}['request']['params']`);
+            args.push(`params: payload.params`);
+          }
+          if (hasQuery) {
+            props.push(`query?: ${ContractName}['request']['query']`);
+            args.push(`query: payload.query`);
+          }
+          if (hasBody) {
+            props.push(`body: ${ContractName}['request']['body']`);
+            args.push(`body: payload.body`);
+          }
+          payloadParam = `payload: { ${props.join(", ")} }`;
+        } else if (count === 1) {
+          if (hasParams) {
+            payloadParam = `payload: ${ContractName}['request']['params']`;
+            args.push(`params: payload`);
+          }
+          if (hasQuery) {
+            payloadParam = `payload?: ${ContractName}['request']['query']`;
+            args.push(`query: payload`);
+          }
+          if (hasBody) {
+            payloadParam = `payload: ${ContractName}['request']['body']`;
+            args.push(`body: payload`);
+          }
+        } else {
+          payloadParam = `payload?: unknown`;
         }
+        lines.push(`export async function ${actionName}Action(${payloadParam}) {`);
         if (route.auth) {
           args.push(`headers: await getAuthHeaders()`);
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "routesync",
-  "version": "1.0.23",
+  "version": "1.0.25",
   "description": "Laravel routes to typed frontend SDKs.",
   "main": "./dist/sdk.js",
   "module": "./dist/sdk.mjs",