routesync 1.0.25 → 1.0.26

package/dist/cli.js

@@ -8773,9 +8773,9 @@ var SDKGenerator = class {
         const responseType = route.response ? `Types.${route.response.type}${route.response.collection ? "[]" : ""}` : `unknown`;
         lines.push(`export type ${ContractName} = {`);
         lines.push(`  request: {`);
-        lines.push(`    params: ${paramsType}`);
+        lines.push(`    params${paramsType === "unknown" ? "?" : ""}: ${paramsType}`);
         lines.push(`    query?: Record<string, unknown>`);
-        lines.push(`    body: ${bodyType}`);
+        lines.push(`    body${bodyType === "unknown" ? "?" : ""}: ${bodyType}`);
         lines.push(`  }`);
         lines.push(`  response: ${responseType}`);
         lines.push(`}`);
@@ -8887,9 +8887,9 @@ var TypeGenerator = class {
         for (const col of model.columns) {
           if (model.hidden && model.hidden.includes(col.name)) continue;
           const tsType = this.mapSqlTypeToTs(col.type);
-          const isOptional = col.nullable ? "?" : "";
+          const finalTsType = col.nullable ? `${tsType} | null` : tsType;
           const safeName = camelCase(col.name).match(/^[a-zA-Z_$][a-zA-Z0-9_$]*$/) ? camelCase(col.name) : `"${camelCase(col.name)}"`;
-          lines.push(`  ${safeName}${isOptional}: ${tsType}`);
+          lines.push(`  ${safeName}: ${finalTsType}`);
         }
         if (model.appends && model.appends.length > 0) {
           for (const append of model.appends) {
@@ -9007,7 +9007,7 @@ var SchemaGenerator = class {
       return "z.boolean()";
     }
     if (type.includes("json")) {
-      return "z.record(z.unknown())";
+      return "z.record(z.string(), z.unknown())";
     }
     const enumMatch = type.match(/^enum\((.*)\)$/);
     if (enumMatch && enumMatch[1]) {
@@ -9025,7 +9025,7 @@ var SchemaGenerator = class {
       return "z.boolean()";
     }
     if (type.includes("array") || type.includes("json") || type.includes("collection") || type.includes("object")) {
-      return "z.record(z.unknown())";
+      return "z.record(z.string(), z.unknown())";
     }
     if (type.includes("date") || type.includes("datetime") || type.includes("string")) {
       return "z.string()";
@@ -9052,13 +9052,18 @@ var HookGenerator = class _HookGenerator {
         const method = route.method.toUpperCase();
         const hookName = _HookGenerator.toHookName(group, route.actionName);
         const queryKey = `['${group}', '${route.actionName}']`;
+        const contractName = `${toTypeName(group)}${toTypeName(route.actionName)}Contract`;
+        const hasParams = route.path.includes(":") || route.path.includes("{");
+        const hasQuery = route.schema?.query || route.method.toUpperCase() === "GET";
+        const hasBody = route.schema?.body;
+        const requiresOptions = hasParams || hasBody || hasQuery && route.method.toUpperCase() !== "GET";
         if (method === "GET") {
           lines.push(`/**`);
           lines.push(` * @deprecated Generated hooks will become optional in v2.`);
           lines.push(` * Prefer \`useApiQuery(api.${group}.${route.actionName}, ...args)\` for future compatibility.`);
           lines.push(` */`);
-          lines.push(`export function ${hookName}(...args: Parameters<typeof api.${group}.${route.actionName}>) {`);
-          lines.push(`  return useApiQuery(api.${group}.${route.actionName}, ...args as any)`);
+          lines.push(`export function ${hookName}(...args: [options${requiresOptions ? "" : "?"}: import('./api').${contractName}['request'], queryOptions?: import('routesync/react').ApiQueryOptions<import('./api').${contractName}['response'], import('./types').ApiError>]) {`);
+          lines.push(`  return useApiQuery<import('./api').${contractName}['response'], import('./api').${contractName}['request']['params'], import('./api').${contractName}['request']['body'], import('./types').ApiError>(api.${group}.${route.actionName}, ...args)`);
           lines.push(`}`);
           lines.push(``);
         } else {
@@ -9089,7 +9094,7 @@ var NextActionGenerator = class {
     lines.push(`// Auto-generated Next.js Server Actions. Do not edit manually.`);
     lines.push(`"use server";`);
     lines.push(``);
-    lines.push(`import { api } from './api'`);
+    lines.push(`IMPORT_PLACEHOLDER`);
     lines.push(`import { cookies } from 'next/headers'`);
     lines.push(``);
     lines.push(`// Helper to auto-inject token from cookies if available`);
@@ -9100,58 +9105,33 @@ var NextActionGenerator = class {
     lines.push(`}`);
     lines.push(``);
     const grouped = buildGeneratedRoutes(manifest.routes);
+    const usedContracts = /* @__PURE__ */ new Set();
     for (const [groupName, routes] of Object.entries(grouped)) {
       for (const route of routes) {
-        const actionName = `${groupName}${toTypeName(route.actionName)}`;
         const TitleCaseGroup = groupName.charAt(0).toUpperCase() + groupName.slice(1);
         const TitleCaseAction = route.actionName.charAt(0).toUpperCase() + route.actionName.slice(1);
         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("{");
-        const count = (hasBody ? 1 : 0) + (hasQuery ? 1 : 0) + (hasParams ? 1 : 0);
-        let payloadParam = "";
-        const args = [];
-        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()`);
-        }
-        const argsString = args.length > 0 ? `{ ${args.join(", ")} }` : "";
-        const apiCall = `await api.${groupName}.${route.actionName}(${argsString})`;
+        const actionFnName = `${groupName}${TitleCaseAction}Action`;
+        const pathParams = Array.from(route.runtimePath.matchAll(/:([a-zA-Z0-9_]+)/g)).map((m) => m[1]);
+        const hasParams = pathParams.length > 0;
+        const hasBody = ["POST", "PUT", "PATCH", "DELETE"].includes(route.method) && route.schema?.rules && Object.keys(route.schema.rules).length > 0;
+        const hasQuery = route.method === "GET" || route.method === "DELETE";
+        usedContracts.add(ContractName);
+        const sigParts = [];
+        if (hasParams) sigParts.push(`params: ${ContractName}['request']['params']`);
+        if (hasQuery) sigParts.push(`query?: ${ContractName}['request']['query']`);
+        if (hasBody) sigParts.push(`body?: ${ContractName}['request']['body']`);
+        const fnParam = sigParts.length > 0 ? `payload${hasParams ? "" : "?"}: { ${sigParts.join(", ")} }` : "";
+        const callArgs = [];
+        if (hasParams) callArgs.push(`params: payload.params`);
+        if (hasQuery) callArgs.push(`query: payload?.query`);
+        if (hasBody) callArgs.push(`body: payload?.body`);
+        if (route.auth) callArgs.push(`headers: await getAuthHeaders()`);
+        const argsStr = callArgs.length > 0 ? `{ ${callArgs.join(", ")} }` : "";
+        lines.push(`export async function ${actionFnName}(${fnParam}) {`);
         lines.push(`  try {`);
-        lines.push(`    const response = ${apiCall}`);
-        lines.push(`    return { success: true, data: response }`);
+        lines.push(`    const data = await api.${groupName}.${route.actionName}(${argsStr})`);
+        lines.push(`    return { success: true, data }`);
         lines.push(`  } catch (error: unknown) {`);
         lines.push(`    return { success: false, error: error instanceof Error ? error.message : String(error) }`);
         lines.push(`  }`);
@@ -9159,11 +9139,10 @@ var NextActionGenerator = class {
         lines.push(``);
       }
     }
-    lines.splice(3, 1, `import { api, type ${Object.values(grouped).flatMap((routes) => routes.map((r) => {
-      const g = r.groupName || Object.keys(grouped).find((k) => grouped[k] === routes) || "";
-      return g.charAt(0).toUpperCase() + g.slice(1) + r.actionName.charAt(0).toUpperCase() + r.actionName.slice(1) + "Contract";
-    })).join(", type ")} } from './api'`);
-    await import_fs_extra7.default.writeFile(import_path6.default.join(outputDir, "actions.ts"), lines.join("\n"));
+    const contractsToImport = Array.from(usedContracts);
+    const importStr = contractsToImport.length > 0 ? `import { api, type ${contractsToImport.join(", type ")} } from './api'` : `import { api } from './api'`;
+    const output = lines.join("\n").replace("IMPORT_PLACEHOLDER", importStr);
+    await import_fs_extra7.default.writeFile(import_path6.default.join(outputDir, "actions.ts"), output);
   }
 };
 

package/dist/react.d.mts

@@ -47,7 +47,9 @@ interface RouteDefinition<TResponse = unknown, TParams = unknown, TBody = unknow
 
 type EndpointCallableOptions<TParams, TBody> = (unknown extends TParams ? {} : {
     params: TParams;
-}) & (unknown extends TBody ? {} : {
+}) & (unknown extends TBody ? {
+    body?: unknown;
+} : {
     body: TBody;
 }) & {
     query?: Record<string, any>;
@@ -76,6 +78,7 @@ interface EndpointCallable<TResponse = unknown, TParams = unknown, TBody = unkno
  *   const { data, isLoading } = useApiQuery(api.produk.list)
  *   const { data } = useApiQuery(api.produk.detail, { params: { id: 10 } })
  */
+type ApiQueryOptions<TResponse, TError = ApiError, TData = TResponse> = Omit<UseQueryOptions<TResponse, TError, TData>, 'queryKey' | 'queryFn'>;
 declare function useApiQuery<TResponse = unknown, TParams = unknown, TBody = unknown, TError = ApiError, TData = TResponse>(endpoint: EndpointCallable<TResponse, TParams, TBody>, ...args: [
     ...OptionalIfEmpty<EndpointCallableOptions<TParams, TBody>>,
     queryOptions?: Omit<UseQueryOptions<TResponse, TError, TData>, 'queryKey' | 'queryFn'>
@@ -171,4 +174,4 @@ interface UseFormSetError<TFieldValues extends Record<string, any>> {
  */
 declare function setFormErrors<TFieldValues extends Record<string, any>>(error: unknown, setError: UseFormSetError<TFieldValues>): void;
 
-export { type ApiMutationOptions, createHooks, setFormErrors, useApiInfiniteQuery, useApiMutation, useApiQuery, useApiQueryClient, useApiSuspenseQuery };
+export { type ApiMutationOptions, type ApiQueryOptions, createHooks, setFormErrors, useApiInfiniteQuery, useApiMutation, useApiQuery, useApiQueryClient, useApiSuspenseQuery };

package/dist/react.d.ts

@@ -47,7 +47,9 @@ interface RouteDefinition<TResponse = unknown, TParams = unknown, TBody = unknow
 
 type EndpointCallableOptions<TParams, TBody> = (unknown extends TParams ? {} : {
     params: TParams;
-}) & (unknown extends TBody ? {} : {
+}) & (unknown extends TBody ? {
+    body?: unknown;
+} : {
     body: TBody;
 }) & {
     query?: Record<string, any>;
@@ -76,6 +78,7 @@ interface EndpointCallable<TResponse = unknown, TParams = unknown, TBody = unkno
  *   const { data, isLoading } = useApiQuery(api.produk.list)
  *   const { data } = useApiQuery(api.produk.detail, { params: { id: 10 } })
  */
+type ApiQueryOptions<TResponse, TError = ApiError, TData = TResponse> = Omit<UseQueryOptions<TResponse, TError, TData>, 'queryKey' | 'queryFn'>;
 declare function useApiQuery<TResponse = unknown, TParams = unknown, TBody = unknown, TError = ApiError, TData = TResponse>(endpoint: EndpointCallable<TResponse, TParams, TBody>, ...args: [
     ...OptionalIfEmpty<EndpointCallableOptions<TParams, TBody>>,
     queryOptions?: Omit<UseQueryOptions<TResponse, TError, TData>, 'queryKey' | 'queryFn'>
@@ -171,4 +174,4 @@ interface UseFormSetError<TFieldValues extends Record<string, any>> {
  */
 declare function setFormErrors<TFieldValues extends Record<string, any>>(error: unknown, setError: UseFormSetError<TFieldValues>): void;
 
-export { type ApiMutationOptions, createHooks, setFormErrors, useApiInfiniteQuery, useApiMutation, useApiQuery, useApiQueryClient, useApiSuspenseQuery };
+export { type ApiMutationOptions, type ApiQueryOptions, createHooks, setFormErrors, useApiInfiniteQuery, useApiMutation, useApiQuery, useApiQueryClient, useApiSuspenseQuery };

package/dist/sdk.d.mts

@@ -123,7 +123,9 @@ type CallOptions<TParams = unknown, TBody = unknown> = {
 };
 type EndpointCallableOptions<TParams, TBody> = (unknown extends TParams ? {} : {
     params: TParams;
-}) & (unknown extends TBody ? {} : {
+}) & (unknown extends TBody ? {
+    body?: unknown;
+} : {
     body: TBody;
 }) & {
     query?: Record<string, any>;

package/dist/sdk.d.ts

@@ -123,7 +123,9 @@ type CallOptions<TParams = unknown, TBody = unknown> = {
 };
 type EndpointCallableOptions<TParams, TBody> = (unknown extends TParams ? {} : {
     params: TParams;
-}) & (unknown extends TBody ? {} : {
+}) & (unknown extends TBody ? {
+    body?: unknown;
+} : {
     body: TBody;
 }) & {
     query?: Record<string, any>;

package/package.json

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