postgresdk 0.18.7 → 0.18.9

package/dist/cli.js

@@ -605,7 +605,7 @@ function generateIncludeMethods(table, graph, opts, allTables) {
       });
       explore(edge.target, newPath, newIsMany, newTargets, new Set([...visited, edge.target]), depth + 1);
     }
-    if (depth === 1 && Object.keys(currentEdges).length > 1 && Object.keys(currentEdges).length <= 3) {
+    if (depth === 1 && Object.keys(currentEdges).length > 1 && Object.keys(currentEdges).length <= 6) {
       const edgeEntries = Object.entries(currentEdges);
       if (edgeEntries.length >= 2) {
         for (let i = 0;i < edgeEntries.length - 1; i++) {
@@ -3460,7 +3460,8 @@ function emitClient(table, graph, opts, model) {
     }
   }
   const typeImports = `import type { Insert${Type}, Update${Type}, Select${Type} } from "./types/${table.name}${ext}";`;
-  const includeSpecImport = `import type { ${Type}IncludeSpec } from "./include-spec${ext}";`;
+  const includeSpecTypes = [table.name, ...Array.from(importedTypes).filter((t) => t !== table.name)];
+  const includeSpecImport = `import type { ${includeSpecTypes.map((t) => `${pascal(t)}IncludeSpec`).join(", ")} } from "./include-spec${ext}";`;
   const otherTableImports = [];
   for (const target of Array.from(importedTypes)) {
     if (target !== table.name) {
@@ -3528,6 +3529,8 @@ function emitClient(table, graph, opts, model) {
     } else if (pattern.type === "nested" && pattern.nestedKey) {
       const paramName = toIncludeParamName(pattern.nestedKey);
       includeParamNames.push(paramName);
+      const targetTable = method.targets[0];
+      const targetType = targetTable ? pascal(targetTable) : Type;
       paramsType = `{
     select?: string[];
     exclude?: string[];
@@ -3543,7 +3546,7 @@ function emitClient(table, graph, opts, model) {
       order?: "asc" | "desc";
       limit?: number;
       offset?: number;
-      include?: ${Type}IncludeSpec;
+      include?: ${targetType}IncludeSpec;
     };
   }`;
     }

package/dist/index.js

@@ -604,7 +604,7 @@ function generateIncludeMethods(table, graph, opts, allTables) {
       });
       explore(edge.target, newPath, newIsMany, newTargets, new Set([...visited, edge.target]), depth + 1);
     }
-    if (depth === 1 && Object.keys(currentEdges).length > 1 && Object.keys(currentEdges).length <= 3) {
+    if (depth === 1 && Object.keys(currentEdges).length > 1 && Object.keys(currentEdges).length <= 6) {
       const edgeEntries = Object.entries(currentEdges);
       if (edgeEntries.length >= 2) {
         for (let i = 0;i < edgeEntries.length - 1; i++) {
@@ -2499,7 +2499,8 @@ function emitClient(table, graph, opts, model) {
     }
   }
   const typeImports = `import type { Insert${Type}, Update${Type}, Select${Type} } from "./types/${table.name}${ext}";`;
-  const includeSpecImport = `import type { ${Type}IncludeSpec } from "./include-spec${ext}";`;
+  const includeSpecTypes = [table.name, ...Array.from(importedTypes).filter((t) => t !== table.name)];
+  const includeSpecImport = `import type { ${includeSpecTypes.map((t) => `${pascal(t)}IncludeSpec`).join(", ")} } from "./include-spec${ext}";`;
   const otherTableImports = [];
   for (const target of Array.from(importedTypes)) {
     if (target !== table.name) {
@@ -2567,6 +2568,8 @@ function emitClient(table, graph, opts, model) {
     } else if (pattern.type === "nested" && pattern.nestedKey) {
       const paramName = toIncludeParamName(pattern.nestedKey);
       includeParamNames.push(paramName);
+      const targetTable = method.targets[0];
+      const targetType = targetTable ? pascal(targetTable) : Type;
       paramsType = `{
     select?: string[];
     exclude?: string[];
@@ -2582,7 +2585,7 @@ function emitClient(table, graph, opts, model) {
       order?: "asc" | "desc";
       limit?: number;
       offset?: number;
-      include?: ${Type}IncludeSpec;
+      include?: ${targetType}IncludeSpec;
     };
   }`;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "postgresdk",
-  "version": "0.18.7",
+  "version": "0.18.9",
   "description": "Generate a typed server/client SDK from a Postgres schema (includes, Zod, Hono).",
   "type": "module",
   "bin": {