postgresdk 0.18.29 → 0.18.30

package/dist/cli.js

@@ -2712,7 +2712,7 @@ function emitIncludeResolver(graph, useJsExtensions) {
     const edges = graph[table] || {};
     const edgeEntries = Object.entries(edges);
     if (edgeEntries.length === 0) {
-      out += `export type ${Type}WithIncludes<TInclude extends ${Type}IncludeSpec> = Select${Type};
+      out += `export type ${Type}WithIncludes<_TInclude extends ${Type}IncludeSpec> = Select${Type};
 
 `;
       continue;
@@ -3343,15 +3343,19 @@ function emitClient(table, graph, opts, model) {
     skipJunctionTables: opts.skipJunctionTables ?? true
   }, allTables);
   const importedTypes = new Set;
+  const usedIncludeSpecTypes = new Set([table.name]);
   importedTypes.add(table.name);
   for (const method of includeMethods) {
     for (const target of method.targets) {
       importedTypes.add(target);
     }
+    const pattern = analyzeIncludeSpec(method.includeSpec);
+    if (pattern.type === "nested" && method.targets[0]) {
+      usedIncludeSpecTypes.add(method.targets[0]);
+    }
   }
   const typeImports = `import type { Insert${Type}, Update${Type}, Select${Type} } from "./types/${table.name}${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 includeSpecImport = `import type { ${Array.from(usedIncludeSpecTypes).map((t) => `${pascal(t)}IncludeSpec`).join(", ")} } from "./include-spec${ext}";`;
   const includeResolverImport = `import type { ${Type}WithIncludes } from "./include-resolver${ext}";`;
   const otherTableImports = [];
   for (const target of Array.from(importedTypes)) {
@@ -5566,8 +5570,6 @@ function emitCoreOperations() {
  * These functions handle the actual database logic and can be used by any framework adapter.
  */
 
-import type { z } from "zod";
-
 export interface DatabaseClient {
   query: (text: string, params?: any[]) => Promise<{ rows: any[] }>;
 }

package/dist/index.js

@@ -1733,7 +1733,7 @@ function emitIncludeResolver(graph, useJsExtensions) {
     const edges = graph[table] || {};
     const edgeEntries = Object.entries(edges);
     if (edgeEntries.length === 0) {
-      out += `export type ${Type}WithIncludes<TInclude extends ${Type}IncludeSpec> = Select${Type};
+      out += `export type ${Type}WithIncludes<_TInclude extends ${Type}IncludeSpec> = Select${Type};
 
 `;
       continue;
@@ -2364,15 +2364,19 @@ function emitClient(table, graph, opts, model) {
     skipJunctionTables: opts.skipJunctionTables ?? true
   }, allTables);
   const importedTypes = new Set;
+  const usedIncludeSpecTypes = new Set([table.name]);
   importedTypes.add(table.name);
   for (const method of includeMethods) {
     for (const target of method.targets) {
       importedTypes.add(target);
     }
+    const pattern = analyzeIncludeSpec(method.includeSpec);
+    if (pattern.type === "nested" && method.targets[0]) {
+      usedIncludeSpecTypes.add(method.targets[0]);
+    }
   }
   const typeImports = `import type { Insert${Type}, Update${Type}, Select${Type} } from "./types/${table.name}${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 includeSpecImport = `import type { ${Array.from(usedIncludeSpecTypes).map((t) => `${pascal(t)}IncludeSpec`).join(", ")} } from "./include-spec${ext}";`;
   const includeResolverImport = `import type { ${Type}WithIncludes } from "./include-resolver${ext}";`;
   const otherTableImports = [];
   for (const target of Array.from(importedTypes)) {
@@ -4587,8 +4591,6 @@ function emitCoreOperations() {
  * These functions handle the actual database logic and can be used by any framework adapter.
  */
 
-import type { z } from "zod";
-
 export interface DatabaseClient {
   query: (text: string, params?: any[]) => Promise<{ rows: any[] }>;
 }

package/package.json

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