routesync 1.0.14 → 1.0.15

package/dist/cli.js

@@ -8689,11 +8689,11 @@ var SDKGenerator = class _SDKGenerator {
         if (r.startsWith("min:")) min = r.split(":")[1];
         if (r.startsWith("max:")) max = r.split(":")[1];
       }
-      let zType = "z.any()";
+      let zType = "z.unknown()";
       if (isString) zType = "z.string()";
       else if (isNumeric) zType = "z.number()";
       else if (isBoolean) zType = "z.boolean()";
-      else if (isArray) zType = "z.array(z.any())";
+      else if (isArray) zType = "z.array(z.unknown())";
       else if (isEmail) zType = "z.string()";
       if (isEmail && zType === "z.string()") zType += ".email()";
       if (min && !isNaN(Number(min))) zType += `.min(${min})`;
@@ -8742,18 +8742,32 @@ var TypeGenerator = class {
     lines.push(`  status?: number`);
     lines.push(`}`);
     lines.push(``);
-    const resources = new Set(
-      manifest.routes.map((r) => r.path.replace(/^\//, "").split("/")[0])
-    );
-    for (const resource of resources) {
-      const typeName = toTypeName(resource ?? "");
-      lines.push(`export interface ${typeName} {`);
-      lines.push(`  id: number`);
-      lines.push(`  // TODO: Add ${resource} fields`);
-      lines.push(`  created_at?: string`);
-      lines.push(`  updated_at?: string`);
-      lines.push(`}`);
-      lines.push(``);
+    if (manifest.models && manifest.models.length > 0) {
+      for (const model of manifest.models) {
+        lines.push(`export interface ${model.name} {`);
+        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 ? "?" : "";
+          lines.push(`  ${col.name}${isOptional}: ${tsType}`);
+        }
+        lines.push(`}`);
+        lines.push(``);
+      }
+    } else {
+      const resources = new Set(
+        manifest.routes.map((r) => r.path.replace(/^\//, "").split("/")[0])
+      );
+      for (const resource of resources) {
+        const typeName = toTypeName(resource ?? "");
+        lines.push(`export interface ${typeName} {`);
+        lines.push(`  id: number`);
+        lines.push(`  // TODO: Add ${resource} fields`);
+        lines.push(`  created_at?: string`);
+        lines.push(`  updated_at?: string`);
+        lines.push(`}`);
+        lines.push(``);
+      }
     }
     if (hasSchemas) {
       for (const route of manifest.routes) {
@@ -8773,9 +8787,9 @@ var TypeGenerator = class {
             }
             if (ruleStr.includes("email")) zodRule += ".email()";
             if (ruleStr.includes("url")) zodRule += ".url()";
-            const matchMin = ruleStr.match(/min:(\\d+)/);
+            const matchMin = ruleStr.match(/min:(\d+)/);
             if (matchMin) zodRule += ".min(" + matchMin[1] + ")";
-            const matchMax = ruleStr.match(/max:(\\d+)/);
+            const matchMax = ruleStr.match(/max:(\d+)/);
             if (matchMax) zodRule += ".max(" + matchMax[1] + ")";
             if (!ruleStr.includes("required")) {
               zodRule += ".optional()";
@@ -8793,6 +8807,13 @@ var TypeGenerator = class {
     }
     await import_fs_extra4.default.writeFile(import_path3.default.join(outputDir, "types.ts"), lines.join("\n"));
   }
+  static mapSqlTypeToTs(sqlType) {
+    const type = sqlType.toLowerCase();
+    if (type.includes("int") || type.includes("decimal") || type.includes("float") || type.includes("double")) return "number";
+    if (type.includes("bool") || type.includes("tinyint(1)")) return "boolean";
+    if (type.includes("json")) return "unknown";
+    return "string";
+  }
 };
 
 // packages/cli/src/generators/HookGenerator.ts
@@ -8805,26 +8826,38 @@ var HookGenerator = class _HookGenerator {
     lines.push(``);
     lines.push(`import { useQuery, useMutation, useQueryClient } from '@tanstack/react-query'`);
     lines.push(`import { api } from './api'`);
+    lines.push(`import * as Types from './types'`);
     lines.push(``);
     const grouped = buildGeneratedRoutes(manifest.routes);
+    const modelNames = (manifest.models || []).map((m) => m.name);
     for (const [group, routes] of Object.entries(grouped)) {
       for (const route of routes) {
         const method = route.method.toUpperCase();
         const hookName = _HookGenerator.toHookName(group, route.actionName);
         const queryKey = `['${group}', '${route.actionName}']`;
+        const possibleModel = _HookGenerator.findMatchingModel(group, modelNames);
+        let responseType = "unknown";
+        if (possibleModel) {
+          if (route.actionName === "get" || route.actionName === "index" || !route.runtimePath.includes(":") && method === "GET") {
+            responseType = `Types.${possibleModel}[]`;
+          } else {
+            responseType = `Types.${possibleModel}`;
+          }
+        }
+        const returnType = possibleModel ? `Types.ApiResponse<${responseType}>` : `unknown`;
         if (method === "GET") {
-          lines.push(`export function ${hookName}(params?: Record<string, unknown>) {`);
-          lines.push(`  return useQuery({`);
+          lines.push(`export function ${hookName}<TData = ${returnType}>(params?: Record<string, unknown>) {`);
+          lines.push(`  return useQuery<TData>({`);
           lines.push(`    queryKey: ${queryKey},`);
-          lines.push(`    queryFn: () => api.${group}.${route.actionName}({ query: params })`);
+          lines.push(`    queryFn: () => api.${group}.${route.actionName}({ query: params }) as Promise<TData>`);
           lines.push(`  })`);
           lines.push(`}`);
           lines.push(``);
         } else {
-          lines.push(`export function ${hookName}() {`);
+          lines.push(`export function ${hookName}<TData = ${returnType}>() {`);
           lines.push(`  const queryClient = useQueryClient()`);
-          lines.push(`  return useMutation({`);
-          lines.push(`    mutationFn: (data: Record<string, unknown>) => api.${group}.${route.actionName}({ body: data }),`);
+          lines.push(`  return useMutation<TData, Error, Record<string, unknown>>({`);
+          lines.push(`    mutationFn: (data: Record<string, unknown>) => api.${group}.${route.actionName}({ body: data }) as Promise<TData>,`);
           lines.push(`    onSuccess: () => {`);
           lines.push(`      queryClient.invalidateQueries({ queryKey: ['${group}'] })`);
           lines.push(`    }`);
@@ -8839,6 +8872,16 @@ var HookGenerator = class _HookGenerator {
   static toHookName(group, actionName) {
     return `use${toTypeName(group)}${toTypeName(actionName)}`;
   }
+  static findMatchingModel(group, modelNames) {
+    const exact = modelNames.find((m) => m.toLowerCase() === group.toLowerCase());
+    if (exact) return exact;
+    const singularGroup = group.toLowerCase().replace(/ies$/, "y").replace(/s$/, "");
+    const singularMatch = modelNames.find((m) => m.toLowerCase() === singularGroup);
+    if (singularMatch) return singularMatch;
+    const prefixMatch = modelNames.find((m) => m.toLowerCase().startsWith(group.toLowerCase()) || m.toLowerCase().startsWith(singularGroup));
+    if (prefixMatch) return prefixMatch;
+    return void 0;
+  }
 };
 
 // packages/cli/src/generators/NextActionGenerator.ts

package/dist/react.d.mts

@@ -45,7 +45,7 @@ type CallOptions = {
     headers?: Record<string, string>;
 };
 interface EndpointCallable {
-    (options?: CallOptions): Promise<any>;
+    <TResponse = unknown>(options?: CallOptions): Promise<TResponse>;
     /** Original RouteDefinition — used by useApiQuery / useApiMutation */
     $def: RouteDefinition;
     /** Stable TanStack query key: [group, action] */

package/dist/react.d.ts

@@ -45,7 +45,7 @@ type CallOptions = {
     headers?: Record<string, string>;
 };
 interface EndpointCallable {
-    (options?: CallOptions): Promise<any>;
+    <TResponse = unknown>(options?: CallOptions): Promise<TResponse>;
     /** Original RouteDefinition — used by useApiQuery / useApiMutation */
     $def: RouteDefinition;
     /** Stable TanStack query key: [group, action] */

package/dist/sdk.d.mts

@@ -106,7 +106,7 @@ type CallOptions = {
     headers?: Record<string, string>;
 };
 interface EndpointCallable {
-    (options?: CallOptions): Promise<any>;
+    <TResponse = unknown>(options?: CallOptions): Promise<TResponse>;
     /** Original RouteDefinition — used by useApiQuery / useApiMutation */
     $def: RouteDefinition;
     /** Stable TanStack query key: [group, action] */

package/dist/sdk.d.ts

@@ -106,7 +106,7 @@ type CallOptions = {
     headers?: Record<string, string>;
 };
 interface EndpointCallable {
-    (options?: CallOptions): Promise<any>;
+    <TResponse = unknown>(options?: CallOptions): Promise<TResponse>;
     /** Original RouteDefinition — used by useApiQuery / useApiMutation */
     $def: RouteDefinition;
     /** Stable TanStack query key: [group, action] */

package/package.json

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