postgresdk 0.8.0 → 0.9.0

package/dist/cli.js

@@ -1979,7 +1979,7 @@ function buildIncludeSpec(path) {
   const rootKey = path[0];
   return rootKey ? { [rootKey]: spec } : {};
 }
-function generateIncludeMethods(table, graph, opts) {
+function generateIncludeMethods(table, graph, opts, allTables) {
   const methods = [];
   const baseTableName = table.name;
   if (opts.skipJunctionTables && isJunctionTable(table)) {
@@ -1993,9 +1993,11 @@ function generateIncludeMethods(table, graph, opts) {
     for (const [key, edge] of Object.entries(currentEdges)) {
       if (visited.has(edge.target))
         continue;
-      const targetTable = Object.values(graph).find((t) => Object.values(t).some((e) => e.target === edge.target));
-      if (opts.skipJunctionTables && edge.target.includes("_")) {
-        continue;
+      if (opts.skipJunctionTables && allTables) {
+        const targetTable = allTables.find((t) => t.name === edge.target);
+        if (targetTable && isJunctionTable(targetTable)) {
+          continue;
+        }
       }
       const newPath = [...path, key];
       const newIsMany = [...isMany, edge.kind === "many"];
@@ -2063,7 +2065,7 @@ function generateIncludeMethods(table, graph, opts) {
 }
 
 // src/emit-client.ts
-function emitClient(table, graph, opts) {
+function emitClient(table, graph, opts, model) {
   const Type = pascal(table.name);
   const ext = opts.useJsExtensions ? ".js" : "";
   const pkCols = Array.isArray(table.pk) ? table.pk : table.pk ? [table.pk] : [];
@@ -2071,10 +2073,11 @@ function emitClient(table, graph, opts) {
   const hasCompositePk = safePk.length > 1;
   const pkType = hasCompositePk ? `{ ${safePk.map((c) => `${c}: string`).join("; ")} }` : `string`;
   const pkPathExpr = hasCompositePk ? safePk.map((c) => `pk.${c}`).join(` + "/" + `) : `pk`;
+  const allTables = model ? Object.values(model.tables) : undefined;
   const includeMethods = generateIncludeMethods(table, graph, {
     maxDepth: opts.includeMethodsDepth ?? 2,
     skipJunctionTables: opts.skipJunctionTables ?? true
-  });
+  }, allTables);
   const importedTypes = new Set;
   importedTypes.add(table.name);
   for (const method of includeMethods) {
@@ -2084,7 +2087,7 @@ function emitClient(table, graph, opts) {
   }
   const typeImports = `import type { Insert${Type}, Update${Type}, Select${Type} } from "./types/${table.name}${ext}";`;
   const otherTableImports = [];
-  for (const target of importedTypes) {
+  for (const target of Array.from(importedTypes)) {
     if (target !== table.name) {
       otherTableImports.push(`import type { Select${pascal(target)} } from "./types/${target}${ext}";`);
     }
@@ -4083,11 +4086,11 @@ async function generate(configPath) {
   files.push({ path: join(clientDir, "base-client.ts"), content: emitBaseClient() });
   files.push({
     path: join(serverDir, "include-builder.ts"),
-    content: emitIncludeBuilder(graph, cfg.includeDepthLimit || 3)
+    content: emitIncludeBuilder(graph, cfg.includeMethodsDepth || 2)
   });
   files.push({
     path: join(serverDir, "include-loader.ts"),
-    content: emitIncludeLoader(graph, model, cfg.includeDepthLimit || 3, cfg.useJsExtensions)
+    content: emitIncludeLoader(graph, model, cfg.includeMethodsDepth || 2, cfg.useJsExtensions)
   });
   files.push({ path: join(serverDir, "logger.ts"), content: emitLogger() });
   if (normalizedAuth?.strategy && normalizedAuth.strategy !== "none") {
@@ -4113,7 +4116,7 @@ async function generate(configPath) {
     if (serverFramework === "hono") {
       routeContent = emitHonoRoutes(table, graph, {
         softDeleteColumn: cfg.softDeleteColumn || null,
-        includeDepthLimit: cfg.includeDepthLimit || 3,
+        includeDepthLimit: cfg.includeMethodsDepth || 2,
         authStrategy: normalizedAuth?.strategy,
         useJsExtensions: cfg.useJsExtensions
       });
@@ -4130,7 +4133,7 @@ async function generate(configPath) {
         useJsExtensions: cfg.useJsExtensionsClient,
         includeMethodsDepth: cfg.includeMethodsDepth ?? 2,
         skipJunctionTables: cfg.skipJunctionTables ?? true
-      })
+      }, model)
     });
   }
   files.push({

package/dist/emit-client.d.ts

@@ -1,8 +1,8 @@
-import type { Table } from "./introspect";
+import type { Table, Model } from "./introspect";
 import type { Graph } from "./rel-classify";
 export declare function emitClient(table: Table, graph: Graph, opts: {
     useJsExtensions?: boolean;
     includeMethodsDepth?: number;
     skipJunctionTables?: boolean;
-}): string;
+}, model?: Model): string;
 export declare function emitClientIndex(tables: Table[], useJsExtensions?: boolean): string;

package/dist/emit-include-methods.d.ts

@@ -14,4 +14,4 @@ export type IncludeMethod = {
 export declare function generateIncludeMethods(table: Table, graph: Graph, opts: {
     maxDepth: number;
     skipJunctionTables: boolean;
-}): IncludeMethod[];
+}, allTables?: Table[]): IncludeMethod[];

package/dist/index.js

@@ -1716,7 +1716,7 @@ function buildIncludeSpec(path) {
   const rootKey = path[0];
   return rootKey ? { [rootKey]: spec } : {};
 }
-function generateIncludeMethods(table, graph, opts) {
+function generateIncludeMethods(table, graph, opts, allTables) {
   const methods = [];
   const baseTableName = table.name;
   if (opts.skipJunctionTables && isJunctionTable(table)) {
@@ -1730,9 +1730,11 @@ function generateIncludeMethods(table, graph, opts) {
     for (const [key, edge] of Object.entries(currentEdges)) {
       if (visited.has(edge.target))
         continue;
-      const targetTable = Object.values(graph).find((t) => Object.values(t).some((e) => e.target === edge.target));
-      if (opts.skipJunctionTables && edge.target.includes("_")) {
-        continue;
+      if (opts.skipJunctionTables && allTables) {
+        const targetTable = allTables.find((t) => t.name === edge.target);
+        if (targetTable && isJunctionTable(targetTable)) {
+          continue;
+        }
       }
       const newPath = [...path, key];
       const newIsMany = [...isMany, edge.kind === "many"];
@@ -1800,7 +1802,7 @@ function generateIncludeMethods(table, graph, opts) {
 }
 
 // src/emit-client.ts
-function emitClient(table, graph, opts) {
+function emitClient(table, graph, opts, model) {
   const Type = pascal(table.name);
   const ext = opts.useJsExtensions ? ".js" : "";
   const pkCols = Array.isArray(table.pk) ? table.pk : table.pk ? [table.pk] : [];
@@ -1808,10 +1810,11 @@ function emitClient(table, graph, opts) {
   const hasCompositePk = safePk.length > 1;
   const pkType = hasCompositePk ? `{ ${safePk.map((c) => `${c}: string`).join("; ")} }` : `string`;
   const pkPathExpr = hasCompositePk ? safePk.map((c) => `pk.${c}`).join(` + "/" + `) : `pk`;
+  const allTables = model ? Object.values(model.tables) : undefined;
   const includeMethods = generateIncludeMethods(table, graph, {
     maxDepth: opts.includeMethodsDepth ?? 2,
     skipJunctionTables: opts.skipJunctionTables ?? true
-  });
+  }, allTables);
   const importedTypes = new Set;
   importedTypes.add(table.name);
   for (const method of includeMethods) {
@@ -1821,7 +1824,7 @@ function emitClient(table, graph, opts) {
   }
   const typeImports = `import type { Insert${Type}, Update${Type}, Select${Type} } from "./types/${table.name}${ext}";`;
   const otherTableImports = [];
-  for (const target of importedTypes) {
+  for (const target of Array.from(importedTypes)) {
     if (target !== table.name) {
       otherTableImports.push(`import type { Select${pascal(target)} } from "./types/${target}${ext}";`);
     }
@@ -3820,11 +3823,11 @@ async function generate(configPath) {
   files.push({ path: join(clientDir, "base-client.ts"), content: emitBaseClient() });
   files.push({
     path: join(serverDir, "include-builder.ts"),
-    content: emitIncludeBuilder(graph, cfg.includeDepthLimit || 3)
+    content: emitIncludeBuilder(graph, cfg.includeMethodsDepth || 2)
   });
   files.push({
     path: join(serverDir, "include-loader.ts"),
-    content: emitIncludeLoader(graph, model, cfg.includeDepthLimit || 3, cfg.useJsExtensions)
+    content: emitIncludeLoader(graph, model, cfg.includeMethodsDepth || 2, cfg.useJsExtensions)
   });
   files.push({ path: join(serverDir, "logger.ts"), content: emitLogger() });
   if (normalizedAuth?.strategy && normalizedAuth.strategy !== "none") {
@@ -3850,7 +3853,7 @@ async function generate(configPath) {
     if (serverFramework === "hono") {
       routeContent = emitHonoRoutes(table, graph, {
         softDeleteColumn: cfg.softDeleteColumn || null,
-        includeDepthLimit: cfg.includeDepthLimit || 3,
+        includeDepthLimit: cfg.includeMethodsDepth || 2,
         authStrategy: normalizedAuth?.strategy,
         useJsExtensions: cfg.useJsExtensions
       });
@@ -3867,7 +3870,7 @@ async function generate(configPath) {
         useJsExtensions: cfg.useJsExtensionsClient,
         includeMethodsDepth: cfg.includeMethodsDepth ?? 2,
         skipJunctionTables: cfg.skipJunctionTables ?? true
-      })
+      }, model)
     });
   }
   files.push({

package/dist/types.d.ts

@@ -24,7 +24,7 @@ export interface Config {
     outServer?: string;
     outClient?: string;
     softDeleteColumn?: string | null;
-    includeDepthLimit?: number;
+    dateType?: "date" | "string";
     includeMethodsDepth?: number;
     skipJunctionTables?: boolean;
     serverFramework?: "hono" | "express" | "fastify";

package/package.json

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