postgresdk 0.18.17 → 0.18.19

package/dist/cli.js

@@ -489,8 +489,8 @@ var require_config = __commonJS(() => {
 });
 
 // src/utils.ts
-import { mkdir, writeFile, readFile } from "fs/promises";
-import { dirname } from "path";
+import { mkdir, writeFile, readFile, readdir, unlink } from "fs/promises";
+import { dirname, join } from "path";
 import { existsSync } from "fs";
 async function writeFilesIfChanged(files) {
   let written = 0;
@@ -515,6 +515,28 @@ async function ensureDirs(dirs) {
   for (const d of dirs)
     await mkdir(d, { recursive: true });
 }
+async function deleteStaleFiles(generatedPaths, dirsToScan) {
+  let deleted = 0;
+  const filesDeleted = [];
+  for (const dir of dirsToScan) {
+    if (!existsSync(dir))
+      continue;
+    const entries = await readdir(dir, { withFileTypes: true });
+    for (const entry of entries) {
+      if (!entry.isFile())
+        continue;
+      if (!/\.(ts|md|yml|sh)$/.test(entry.name))
+        continue;
+      const fullPath = join(dir, entry.name);
+      if (!generatedPaths.has(fullPath)) {
+        await unlink(fullPath);
+        deleted++;
+        filesDeleted.push(fullPath);
+      }
+    }
+  }
+  return { deleted, filesDeleted };
+}
 var pascal = (s) => s.split(/[_\s-]+/).map((w) => w?.[0] ? w[0].toUpperCase() + w.slice(1) : "").join("");
 var init_utils = () => {};
 
@@ -2559,7 +2581,7 @@ __export(exports_cli_pull, {
   pullCommand: () => pullCommand
 });
 import { writeFile as writeFile2, mkdir as mkdir2, readFile as readFile2 } from "fs/promises";
-import { join as join2, dirname as dirname3, resolve as resolve2 } from "path";
+import { join as join3, dirname as dirname3, resolve as resolve2 } from "path";
 import { existsSync as existsSync4 } from "fs";
 import { pathToFileURL as pathToFileURL2 } from "url";
 async function pullCommand(args) {
@@ -2645,7 +2667,7 @@ Options:`);
     let filesUnchanged = 0;
     const changedFiles = [];
     for (const [path, content] of Object.entries(sdk.files)) {
-      const fullPath = join2(config.output, path);
+      const fullPath = join3(config.output, path);
       await mkdir2(dirname3(fullPath), { recursive: true });
       let shouldWrite = true;
       if (existsSync4(fullPath)) {
@@ -2662,7 +2684,7 @@ Options:`);
         console.log(`  ✓ ${path}`);
       }
     }
-    const metadataPath = join2(config.output, ".postgresdk.json");
+    const metadataPath = join3(config.output, ".postgresdk.json");
     const metadata = {
       version: sdk.version,
       pulledFrom: config.from
@@ -2692,7 +2714,7 @@ var init_cli_pull = () => {};
 
 // src/index.ts
 var import_config = __toESM(require_config(), 1);
-import { join, relative, dirname as dirname2 } from "node:path";
+import { join as join2, relative, dirname as dirname2 } from "node:path";
 import { pathToFileURL, fileURLToPath } from "node:url";
 import { existsSync as existsSync2, readFileSync } from "node:fs";
 
@@ -3607,6 +3629,7 @@ function emitClient(table, graph, opts, model) {
     where?: Where<Select${Type}>;
     orderBy?: string | string[];
     order?: "asc" | "desc" | ("asc" | "desc")[];
+    distinctOn?: string | string[];
     ${paramName}?: {
       select?: string[];
       exclude?: string[];
@@ -3639,6 +3662,7 @@ function emitClient(table, graph, opts, model) {
     where?: Where<Select${Type}>;
     orderBy?: string | string[];
     order?: "asc" | "desc" | ("asc" | "desc")[];
+    distinctOn?: string | string[];
     ${includeParams};
   }`;
     } else if (pattern.type === "nested" && pattern.nestedKey) {
@@ -3654,6 +3678,7 @@ function emitClient(table, graph, opts, model) {
     where?: Where<Select${Type}>;
     orderBy?: string | string[];
     order?: "asc" | "desc" | ("asc" | "desc")[];
+    distinctOn?: string | string[];
     ${paramName}?: {
       select?: string[];
       exclude?: string[];
@@ -6216,6 +6241,12 @@ function getVectorDistanceOperator(metric?: string): string {
   }
 }
 
+/** Builds a SQL ORDER BY clause from parallel cols/dirs arrays. Returns "" when cols is empty. */
+function buildOrderBySQL(cols: string[], dirs: ("asc" | "desc")[]): string {
+  if (cols.length === 0) return "";
+  return \`ORDER BY \${cols.map((c, i) => \`"\${c}" \${(dirs[i] ?? "asc").toUpperCase()}\`).join(", ")}\`;
+}
+
 /**
  * LIST operation - Get multiple records with optional filters and vector search
  */
@@ -6244,6 +6275,17 @@ export async function listRecords(
     const distinctCols: string[] | null = distinctOn ? (Array.isArray(distinctOn) ? distinctOn : [distinctOn]) : null;
     const _distinctOnColsSQL = distinctCols ? distinctCols.map(c => '"' + c + '"').join(', ') : '';
 
+    // Pre-compute user order cols (reused in ORDER BY block and useSubquery check)
+    const userOrderCols: string[] = orderBy ? (Array.isArray(orderBy) ? orderBy : [orderBy]) : [];
+
+    // Auto-detect subquery form: needed when distinctOn is set AND the caller wants to order
+    // by a column outside of distinctOn (inline DISTINCT ON can't satisfy that without silently
+    // overriding the requested ordering). Vector search always stays inline.
+    const useSubquery: boolean =
+      distinctCols !== null &&
+      !vector &&
+      userOrderCols.some(col => !distinctCols.includes(col));
+
     // Get distance operator if vector search
     const distanceOp = vector ? getVectorDistanceOperator(vector.metric) : "";
 
@@ -6309,41 +6351,35 @@ export async function listRecords(
 
     // Build ORDER BY clause
     let orderBySQL = "";
+    const userDirs: ("asc" | "desc")[] = userOrderCols.length > 0
+      ? (Array.isArray(order) ? order : (order ? Array(userOrderCols.length).fill(order) : Array(userOrderCols.length).fill("asc")))
+      : [];
+
     if (vector) {
-      // For vector search, always order by distance
+      // Vector search always orders by distance; DISTINCT ON + vector stays inline
       orderBySQL = \`ORDER BY "\${vector.field}" \${distanceOp} ($1)::vector\`;
-    } else {
-      const userCols = orderBy ? (Array.isArray(orderBy) ? orderBy : [orderBy]) : [];
-      const userDirs: ("asc" | "desc")[] = orderBy
-        ? (Array.isArray(order) ? order : (order ? Array(userCols.length).fill(order) : Array(userCols.length).fill("asc")))
-        : [];
-
+    } else if (useSubquery) {
+      // Subquery form: outer query gets the user's full ORDER BY.
+      // Inner query only needs to satisfy PG's DISTINCT ON prefix requirement (built at query assembly).
+      orderBySQL = buildOrderBySQL(userOrderCols, userDirs);
+    } else if (distinctCols) {
+      // Inline DISTINCT ON: prepend distinctCols as the leftmost ORDER BY prefix (PG requirement)
       const finalCols: string[] = [];
-      const finalDirs: string[] = [];
-
-      if (distinctCols) {
-        // DISTINCT ON requires its columns to be the leftmost ORDER BY prefix
-        for (const col of distinctCols) {
-          const userIdx = userCols.indexOf(col);
-          finalCols.push(col);
-          finalDirs.push(userIdx >= 0 ? (userDirs[userIdx] || "asc") : "asc");
-        }
-        // Append remaining user-specified cols not already covered by distinctOn
-        for (let i = 0; i < userCols.length; i++) {
-          if (!distinctCols.includes(userCols[i]!)) {
-            finalCols.push(userCols[i]!);
-            finalDirs.push(userDirs[i] || "asc");
-          }
-        }
-      } else {
-        finalCols.push(...userCols);
-        finalDirs.push(...userDirs.map(d => d || "asc"));
+      const finalDirs: ("asc" | "desc")[] = [];
+      for (const col of distinctCols) {
+        const userIdx = userOrderCols.indexOf(col);
+        finalCols.push(col);
+        finalDirs.push(userIdx >= 0 ? (userDirs[userIdx] ?? "asc") : "asc");
       }
-
-      if (finalCols.length > 0) {
-        const orderParts = finalCols.map((c, i) => \`"\${c}" \${finalDirs[i]!.toUpperCase()}\`);
-        orderBySQL = \`ORDER BY \${orderParts.join(", ")}\`;
+      for (let i = 0; i < userOrderCols.length; i++) {
+        if (!distinctCols.includes(userOrderCols[i]!)) {
+          finalCols.push(userOrderCols[i]!);
+          finalDirs.push(userDirs[i] ?? "asc");
+        }
       }
+      orderBySQL = buildOrderBySQL(finalCols, finalDirs);
+    } else {
+      orderBySQL = buildOrderBySQL(userOrderCols, userDirs);
     }
 
     // Add limit and offset params
@@ -6360,7 +6396,15 @@ export async function listRecords(
     const total = parseInt(countResult.rows[0].count, 10);
 
     // Get paginated data
-    const text = \`SELECT \${selectClause} FROM "\${ctx.table}" \${whereSQL} \${orderBySQL} LIMIT \${limitParam} OFFSET \${offsetParam}\`;
+    let text: string;
+    if (useSubquery) {
+      // Inner query: DISTINCT ON with only the distinctCols ORDER BY prefix (PG requirement).
+      // Outer query: free ORDER BY from the user's full orderBy list, plus LIMIT/OFFSET.
+      const innerQuery = \`SELECT DISTINCT ON (\${_distinctOnColsSQL}) \${baseColumns} FROM "\${ctx.table}" \${whereSQL} ORDER BY \${_distinctOnColsSQL}\`;
+      text = \`SELECT * FROM (\${innerQuery}) __distinct \${orderBySQL} LIMIT \${limitParam} OFFSET \${offsetParam}\`;
+    } else {
+      text = \`SELECT \${selectClause} FROM "\${ctx.table}" \${whereSQL} \${orderBySQL} LIMIT \${limitParam} OFFSET \${offsetParam}\`;
+    }
     log.debug(\`LIST \${ctx.table} SQL:\`, text, "params:", allParams);
 
     const { rows } = await ctx.pg.query(text, allParams);
@@ -7247,7 +7291,7 @@ init_emit_sdk_contract();
 init_utils();
 var __filename2 = fileURLToPath(import.meta.url);
 var __dirname2 = dirname2(__filename2);
-var { version: CLI_VERSION } = JSON.parse(readFileSync(join(__dirname2, "../package.json"), "utf-8"));
+var { version: CLI_VERSION } = JSON.parse(readFileSync(join2(__dirname2, "../package.json"), "utf-8"));
 async function generate(configPath) {
   if (!existsSync2(configPath)) {
     throw new Error(`Config file not found: ${configPath}
@@ -7280,26 +7324,26 @@ async function generate(configPath) {
   const sameDirectory = serverDir === originalClientDir;
   let clientDir = originalClientDir;
   if (sameDirectory) {
-    clientDir = join(originalClientDir, "sdk");
+    clientDir = join2(originalClientDir, "sdk");
   }
   const serverFramework = cfg.serverFramework || "hono";
   const generateTests = cfg.tests?.generate ?? false;
   const originalTestDir = cfg.tests?.output || "./api/tests";
   let testDir = originalTestDir;
   if (generateTests && (originalTestDir === serverDir || originalTestDir === originalClientDir)) {
-    testDir = join(originalTestDir, "tests");
+    testDir = join2(originalTestDir, "tests");
   }
   const testFramework = cfg.tests?.framework || "vitest";
   console.log("\uD83D\uDCC1 Creating directories...");
   const dirs = [
     serverDir,
-    join(serverDir, "types"),
-    join(serverDir, "zod"),
-    join(serverDir, "routes"),
+    join2(serverDir, "types"),
+    join2(serverDir, "zod"),
+    join2(serverDir, "routes"),
     clientDir,
-    join(clientDir, "types"),
-    join(clientDir, "zod"),
-    join(clientDir, "params")
+    join2(clientDir, "types"),
+    join2(clientDir, "zod"),
+    join2(clientDir, "params")
   ];
   if (generateTests) {
     dirs.push(testDir);
@@ -7307,28 +7351,28 @@ async function generate(configPath) {
   await ensureDirs(dirs);
   const files = [];
   const includeSpec = emitIncludeSpec(graph);
-  files.push({ path: join(serverDir, "include-spec.ts"), content: includeSpec });
-  files.push({ path: join(clientDir, "include-spec.ts"), content: includeSpec });
+  files.push({ path: join2(serverDir, "include-spec.ts"), content: includeSpec });
+  files.push({ path: join2(clientDir, "include-spec.ts"), content: includeSpec });
   const includeResolver = emitIncludeResolver(graph, cfg.useJsExtensions);
-  files.push({ path: join(clientDir, "include-resolver.ts"), content: includeResolver });
-  files.push({ path: join(clientDir, "params", "shared.ts"), content: emitSharedParamsZod() });
-  files.push({ path: join(clientDir, "types", "shared.ts"), content: emitSharedTypes() });
-  files.push({ path: join(clientDir, "base-client.ts"), content: emitBaseClient() });
-  files.push({ path: join(clientDir, "where-types.ts"), content: emitWhereTypes() });
+  files.push({ path: join2(clientDir, "include-resolver.ts"), content: includeResolver });
+  files.push({ path: join2(clientDir, "params", "shared.ts"), content: emitSharedParamsZod() });
+  files.push({ path: join2(clientDir, "types", "shared.ts"), content: emitSharedTypes() });
+  files.push({ path: join2(clientDir, "base-client.ts"), content: emitBaseClient() });
+  files.push({ path: join2(clientDir, "where-types.ts"), content: emitWhereTypes() });
   files.push({
-    path: join(serverDir, "include-builder.ts"),
+    path: join2(serverDir, "include-builder.ts"),
     content: emitIncludeBuilder(graph, cfg.includeMethodsDepth || 2)
   });
   files.push({
-    path: join(serverDir, "include-loader.ts"),
+    path: join2(serverDir, "include-loader.ts"),
     content: emitIncludeLoader(graph, model, cfg.includeMethodsDepth || 2, cfg.useJsExtensions)
   });
-  files.push({ path: join(serverDir, "logger.ts"), content: emitLogger() });
+  files.push({ path: join2(serverDir, "logger.ts"), content: emitLogger() });
   if (getAuthStrategy(normalizedAuth) !== "none") {
-    files.push({ path: join(serverDir, "auth.ts"), content: emitAuth(normalizedAuth) });
+    files.push({ path: join2(serverDir, "auth.ts"), content: emitAuth(normalizedAuth) });
   }
   files.push({
-    path: join(serverDir, "core", "operations.ts"),
+    path: join2(serverDir, "core", "operations.ts"),
     content: emitCoreOperations()
   });
   if (process.env.SDK_DEBUG) {
@@ -7337,13 +7381,13 @@ async function generate(configPath) {
   for (const table of Object.values(model.tables)) {
     const numericMode = cfg.numericMode ?? "auto";
     const typesSrc = emitTypes(table, { numericMode }, model.enums);
-    files.push({ path: join(serverDir, "types", `${table.name}.ts`), content: typesSrc });
-    files.push({ path: join(clientDir, "types", `${table.name}.ts`), content: typesSrc });
+    files.push({ path: join2(serverDir, "types", `${table.name}.ts`), content: typesSrc });
+    files.push({ path: join2(clientDir, "types", `${table.name}.ts`), content: typesSrc });
     const zodSrc = emitZod(table, { numericMode }, model.enums);
-    files.push({ path: join(serverDir, "zod", `${table.name}.ts`), content: zodSrc });
-    files.push({ path: join(clientDir, "zod", `${table.name}.ts`), content: zodSrc });
+    files.push({ path: join2(serverDir, "zod", `${table.name}.ts`), content: zodSrc });
+    files.push({ path: join2(clientDir, "zod", `${table.name}.ts`), content: zodSrc });
     const paramsZodSrc = emitParamsZod(table, graph);
-    files.push({ path: join(clientDir, "params", `${table.name}.ts`), content: paramsZodSrc });
+    files.push({ path: join2(clientDir, "params", `${table.name}.ts`), content: paramsZodSrc });
     let routeContent;
     if (serverFramework === "hono") {
       routeContent = emitHonoRoutes(table, graph, {
@@ -7357,11 +7401,11 @@ async function generate(configPath) {
       throw new Error(`Framework "${serverFramework}" is not yet supported. Currently only "hono" is available.`);
     }
     files.push({
-      path: join(serverDir, "routes", `${table.name}.ts`),
+      path: join2(serverDir, "routes", `${table.name}.ts`),
       content: routeContent
     });
     files.push({
-      path: join(clientDir, `${table.name}.ts`),
+      path: join2(clientDir, `${table.name}.ts`),
       content: emitClient(table, graph, {
         useJsExtensions: cfg.useJsExtensionsClient,
         includeMethodsDepth: cfg.includeMethodsDepth ?? 2,
@@ -7370,12 +7414,12 @@ async function generate(configPath) {
     });
   }
   files.push({
-    path: join(clientDir, "index.ts"),
+    path: join2(clientDir, "index.ts"),
     content: emitClientIndex(Object.values(model.tables), cfg.useJsExtensionsClient, graph, { maxDepth: cfg.includeMethodsDepth ?? 2, skipJunctionTables: cfg.skipJunctionTables ?? true })
   });
   if (serverFramework === "hono") {
     files.push({
-      path: join(serverDir, "router.ts"),
+      path: join2(serverDir, "router.ts"),
       content: emitHonoRouter(Object.values(model.tables), getAuthStrategy(normalizedAuth) !== "none", cfg.useJsExtensions, cfg.pullToken)
     });
   }
@@ -7385,63 +7429,88 @@ async function generate(configPath) {
   }
   const contract = generateUnifiedContract2(model, cfg, graph);
   files.push({
-    path: join(serverDir, "CONTRACT.md"),
+    path: join2(serverDir, "CONTRACT.md"),
     content: generateUnifiedContractMarkdown2(contract)
   });
   files.push({
-    path: join(clientDir, "CONTRACT.md"),
+    path: join2(clientDir, "CONTRACT.md"),
     content: generateUnifiedContractMarkdown2(contract)
   });
   const contractCode = emitUnifiedContract(model, cfg, graph);
   files.push({
-    path: join(serverDir, "contract.ts"),
+    path: join2(serverDir, "contract.ts"),
     content: contractCode
   });
   const clientFiles = files.filter((f) => {
     return f.path.includes(clientDir);
   });
   files.push({
-    path: join(serverDir, "sdk-bundle.ts"),
+    path: join2(serverDir, "sdk-bundle.ts"),
     content: emitSdkBundle(clientFiles, clientDir, CLI_VERSION)
   });
   if (generateTests) {
     console.log("\uD83E\uDDEA Generating tests...");
     const relativeClientPath = relative(testDir, clientDir);
     files.push({
-      path: join(testDir, "setup.ts"),
+      path: join2(testDir, "setup.ts"),
       content: emitTestSetup(relativeClientPath, testFramework)
     });
     files.push({
-      path: join(testDir, "docker-compose.yml"),
+      path: join2(testDir, "docker-compose.yml"),
       content: emitDockerCompose()
     });
     files.push({
-      path: join(testDir, "run-tests.sh"),
+      path: join2(testDir, "run-tests.sh"),
       content: emitTestScript(testFramework, testDir)
     });
     files.push({
-      path: join(testDir, ".gitignore"),
+      path: join2(testDir, ".gitignore"),
       content: emitTestGitignore()
     });
     if (testFramework === "vitest") {
       files.push({
-        path: join(testDir, "vitest.config.ts"),
+        path: join2(testDir, "vitest.config.ts"),
         content: emitVitestConfig()
       });
     }
     for (const table of Object.values(model.tables)) {
       files.push({
-        path: join(testDir, `${table.name}.test.ts`),
+        path: join2(testDir, `${table.name}.test.ts`),
         content: emitTableTest(table, model, relativeClientPath, testFramework)
       });
     }
   }
   console.log("✍️  Writing files...");
   const writeResult = await writeFilesIfChanged(files);
-  if (writeResult.written === 0) {
+  let deleteResult = { deleted: 0, filesDeleted: [] };
+  if (cfg.clean !== false) {
+    const dirsToScan = [
+      serverDir,
+      join2(serverDir, "types"),
+      join2(serverDir, "zod"),
+      join2(serverDir, "routes"),
+      join2(serverDir, "core"),
+      clientDir,
+      join2(clientDir, "types"),
+      join2(clientDir, "zod"),
+      join2(clientDir, "params")
+    ];
+    if (generateTests)
+      dirsToScan.push(testDir);
+    const generatedPaths = new Set(files.map((f) => f.path));
+    deleteResult = await deleteStaleFiles(generatedPaths, dirsToScan);
+  }
+  if (writeResult.written === 0 && deleteResult.deleted === 0) {
     console.log(`✅ All ${writeResult.unchanged} files up-to-date (no changes)`);
   } else {
-    console.log(`✅ Updated ${writeResult.written} files, ${writeResult.unchanged} unchanged`);
+    const parts = [];
+    if (writeResult.written > 0)
+      parts.push(`updated ${writeResult.written} files`);
+    if (deleteResult.deleted > 0)
+      parts.push(`deleted ${deleteResult.deleted} stale files`);
+    if (writeResult.unchanged > 0)
+      parts.push(`${writeResult.unchanged} unchanged`);
+    console.log(`✅ ${parts.join(", ")}`);
   }
   console.log(`  Server: ${serverDir}`);
   console.log(`  Client: ${sameDirectory ? clientDir + " (in sdk subdir due to same output dir)" : clientDir}`);
@@ -7480,10 +7549,10 @@ var import_config2 = __toESM(require_config(), 1);
 import { resolve as resolve3 } from "node:path";
 import { readFileSync as readFileSync3 } from "node:fs";
 import { fileURLToPath as fileURLToPath2 } from "node:url";
-import { dirname as dirname4, join as join3 } from "node:path";
+import { dirname as dirname4, join as join4 } from "node:path";
 var __filename3 = fileURLToPath2(import.meta.url);
 var __dirname3 = dirname4(__filename3);
-var packageJson = JSON.parse(readFileSync3(join3(__dirname3, "../package.json"), "utf-8"));
+var packageJson = JSON.parse(readFileSync3(join4(__dirname3, "../package.json"), "utf-8"));
 var VERSION = packageJson.version;
 var args = process.argv.slice(2);
 var command = args[0];

package/dist/index.js

@@ -488,8 +488,8 @@ var require_config = __commonJS(() => {
 });
 
 // src/utils.ts
-import { mkdir, writeFile, readFile } from "fs/promises";
-import { dirname } from "path";
+import { mkdir, writeFile, readFile, readdir, unlink } from "fs/promises";
+import { dirname, join } from "path";
 import { existsSync } from "fs";
 async function writeFilesIfChanged(files) {
   let written = 0;
@@ -514,6 +514,28 @@ async function ensureDirs(dirs) {
   for (const d of dirs)
     await mkdir(d, { recursive: true });
 }
+async function deleteStaleFiles(generatedPaths, dirsToScan) {
+  let deleted = 0;
+  const filesDeleted = [];
+  for (const dir of dirsToScan) {
+    if (!existsSync(dir))
+      continue;
+    const entries = await readdir(dir, { withFileTypes: true });
+    for (const entry of entries) {
+      if (!entry.isFile())
+        continue;
+      if (!/\.(ts|md|yml|sh)$/.test(entry.name))
+        continue;
+      const fullPath = join(dir, entry.name);
+      if (!generatedPaths.has(fullPath)) {
+        await unlink(fullPath);
+        deleted++;
+        filesDeleted.push(fullPath);
+      }
+    }
+  }
+  return { deleted, filesDeleted };
+}
 var pascal = (s) => s.split(/[_\s-]+/).map((w) => w?.[0] ? w[0].toUpperCase() + w.slice(1) : "").join("");
 var init_utils = () => {};
 
@@ -1731,7 +1753,7 @@ var init_emit_sdk_contract = __esm(() => {
 
 // src/index.ts
 var import_config = __toESM(require_config(), 1);
-import { join, relative, dirname as dirname2 } from "node:path";
+import { join as join2, relative, dirname as dirname2 } from "node:path";
 import { pathToFileURL, fileURLToPath } from "node:url";
 import { existsSync as existsSync2, readFileSync } from "node:fs";
 
@@ -2646,6 +2668,7 @@ function emitClient(table, graph, opts, model) {
     where?: Where<Select${Type}>;
     orderBy?: string | string[];
     order?: "asc" | "desc" | ("asc" | "desc")[];
+    distinctOn?: string | string[];
     ${paramName}?: {
       select?: string[];
       exclude?: string[];
@@ -2678,6 +2701,7 @@ function emitClient(table, graph, opts, model) {
     where?: Where<Select${Type}>;
     orderBy?: string | string[];
     order?: "asc" | "desc" | ("asc" | "desc")[];
+    distinctOn?: string | string[];
     ${includeParams};
   }`;
     } else if (pattern.type === "nested" && pattern.nestedKey) {
@@ -2693,6 +2717,7 @@ function emitClient(table, graph, opts, model) {
     where?: Where<Select${Type}>;
     orderBy?: string | string[];
     order?: "asc" | "desc" | ("asc" | "desc")[];
+    distinctOn?: string | string[];
     ${paramName}?: {
       select?: string[];
       exclude?: string[];
@@ -5255,6 +5280,12 @@ function getVectorDistanceOperator(metric?: string): string {
   }
 }
 
+/** Builds a SQL ORDER BY clause from parallel cols/dirs arrays. Returns "" when cols is empty. */
+function buildOrderBySQL(cols: string[], dirs: ("asc" | "desc")[]): string {
+  if (cols.length === 0) return "";
+  return \`ORDER BY \${cols.map((c, i) => \`"\${c}" \${(dirs[i] ?? "asc").toUpperCase()}\`).join(", ")}\`;
+}
+
 /**
  * LIST operation - Get multiple records with optional filters and vector search
  */
@@ -5283,6 +5314,17 @@ export async function listRecords(
     const distinctCols: string[] | null = distinctOn ? (Array.isArray(distinctOn) ? distinctOn : [distinctOn]) : null;
     const _distinctOnColsSQL = distinctCols ? distinctCols.map(c => '"' + c + '"').join(', ') : '';
 
+    // Pre-compute user order cols (reused in ORDER BY block and useSubquery check)
+    const userOrderCols: string[] = orderBy ? (Array.isArray(orderBy) ? orderBy : [orderBy]) : [];
+
+    // Auto-detect subquery form: needed when distinctOn is set AND the caller wants to order
+    // by a column outside of distinctOn (inline DISTINCT ON can't satisfy that without silently
+    // overriding the requested ordering). Vector search always stays inline.
+    const useSubquery: boolean =
+      distinctCols !== null &&
+      !vector &&
+      userOrderCols.some(col => !distinctCols.includes(col));
+
     // Get distance operator if vector search
     const distanceOp = vector ? getVectorDistanceOperator(vector.metric) : "";
 
@@ -5348,41 +5390,35 @@ export async function listRecords(
 
     // Build ORDER BY clause
     let orderBySQL = "";
+    const userDirs: ("asc" | "desc")[] = userOrderCols.length > 0
+      ? (Array.isArray(order) ? order : (order ? Array(userOrderCols.length).fill(order) : Array(userOrderCols.length).fill("asc")))
+      : [];
+
     if (vector) {
-      // For vector search, always order by distance
+      // Vector search always orders by distance; DISTINCT ON + vector stays inline
       orderBySQL = \`ORDER BY "\${vector.field}" \${distanceOp} ($1)::vector\`;
-    } else {
-      const userCols = orderBy ? (Array.isArray(orderBy) ? orderBy : [orderBy]) : [];
-      const userDirs: ("asc" | "desc")[] = orderBy
-        ? (Array.isArray(order) ? order : (order ? Array(userCols.length).fill(order) : Array(userCols.length).fill("asc")))
-        : [];
-
+    } else if (useSubquery) {
+      // Subquery form: outer query gets the user's full ORDER BY.
+      // Inner query only needs to satisfy PG's DISTINCT ON prefix requirement (built at query assembly).
+      orderBySQL = buildOrderBySQL(userOrderCols, userDirs);
+    } else if (distinctCols) {
+      // Inline DISTINCT ON: prepend distinctCols as the leftmost ORDER BY prefix (PG requirement)
       const finalCols: string[] = [];
-      const finalDirs: string[] = [];
-
-      if (distinctCols) {
-        // DISTINCT ON requires its columns to be the leftmost ORDER BY prefix
-        for (const col of distinctCols) {
-          const userIdx = userCols.indexOf(col);
-          finalCols.push(col);
-          finalDirs.push(userIdx >= 0 ? (userDirs[userIdx] || "asc") : "asc");
-        }
-        // Append remaining user-specified cols not already covered by distinctOn
-        for (let i = 0; i < userCols.length; i++) {
-          if (!distinctCols.includes(userCols[i]!)) {
-            finalCols.push(userCols[i]!);
-            finalDirs.push(userDirs[i] || "asc");
-          }
-        }
-      } else {
-        finalCols.push(...userCols);
-        finalDirs.push(...userDirs.map(d => d || "asc"));
+      const finalDirs: ("asc" | "desc")[] = [];
+      for (const col of distinctCols) {
+        const userIdx = userOrderCols.indexOf(col);
+        finalCols.push(col);
+        finalDirs.push(userIdx >= 0 ? (userDirs[userIdx] ?? "asc") : "asc");
       }
-
-      if (finalCols.length > 0) {
-        const orderParts = finalCols.map((c, i) => \`"\${c}" \${finalDirs[i]!.toUpperCase()}\`);
-        orderBySQL = \`ORDER BY \${orderParts.join(", ")}\`;
+      for (let i = 0; i < userOrderCols.length; i++) {
+        if (!distinctCols.includes(userOrderCols[i]!)) {
+          finalCols.push(userOrderCols[i]!);
+          finalDirs.push(userDirs[i] ?? "asc");
+        }
       }
+      orderBySQL = buildOrderBySQL(finalCols, finalDirs);
+    } else {
+      orderBySQL = buildOrderBySQL(userOrderCols, userDirs);
     }
 
     // Add limit and offset params
@@ -5399,7 +5435,15 @@ export async function listRecords(
     const total = parseInt(countResult.rows[0].count, 10);
 
     // Get paginated data
-    const text = \`SELECT \${selectClause} FROM "\${ctx.table}" \${whereSQL} \${orderBySQL} LIMIT \${limitParam} OFFSET \${offsetParam}\`;
+    let text: string;
+    if (useSubquery) {
+      // Inner query: DISTINCT ON with only the distinctCols ORDER BY prefix (PG requirement).
+      // Outer query: free ORDER BY from the user's full orderBy list, plus LIMIT/OFFSET.
+      const innerQuery = \`SELECT DISTINCT ON (\${_distinctOnColsSQL}) \${baseColumns} FROM "\${ctx.table}" \${whereSQL} ORDER BY \${_distinctOnColsSQL}\`;
+      text = \`SELECT * FROM (\${innerQuery}) __distinct \${orderBySQL} LIMIT \${limitParam} OFFSET \${offsetParam}\`;
+    } else {
+      text = \`SELECT \${selectClause} FROM "\${ctx.table}" \${whereSQL} \${orderBySQL} LIMIT \${limitParam} OFFSET \${offsetParam}\`;
+    }
     log.debug(\`LIST \${ctx.table} SQL:\`, text, "params:", allParams);
 
     const { rows } = await ctx.pg.query(text, allParams);
@@ -6286,7 +6330,7 @@ init_emit_sdk_contract();
 init_utils();
 var __filename2 = fileURLToPath(import.meta.url);
 var __dirname2 = dirname2(__filename2);
-var { version: CLI_VERSION } = JSON.parse(readFileSync(join(__dirname2, "../package.json"), "utf-8"));
+var { version: CLI_VERSION } = JSON.parse(readFileSync(join2(__dirname2, "../package.json"), "utf-8"));
 async function generate(configPath) {
   if (!existsSync2(configPath)) {
     throw new Error(`Config file not found: ${configPath}
@@ -6319,26 +6363,26 @@ async function generate(configPath) {
   const sameDirectory = serverDir === originalClientDir;
   let clientDir = originalClientDir;
   if (sameDirectory) {
-    clientDir = join(originalClientDir, "sdk");
+    clientDir = join2(originalClientDir, "sdk");
   }
   const serverFramework = cfg.serverFramework || "hono";
   const generateTests = cfg.tests?.generate ?? false;
   const originalTestDir = cfg.tests?.output || "./api/tests";
   let testDir = originalTestDir;
   if (generateTests && (originalTestDir === serverDir || originalTestDir === originalClientDir)) {
-    testDir = join(originalTestDir, "tests");
+    testDir = join2(originalTestDir, "tests");
   }
   const testFramework = cfg.tests?.framework || "vitest";
   console.log("\uD83D\uDCC1 Creating directories...");
   const dirs = [
     serverDir,
-    join(serverDir, "types"),
-    join(serverDir, "zod"),
-    join(serverDir, "routes"),
+    join2(serverDir, "types"),
+    join2(serverDir, "zod"),
+    join2(serverDir, "routes"),
     clientDir,
-    join(clientDir, "types"),
-    join(clientDir, "zod"),
-    join(clientDir, "params")
+    join2(clientDir, "types"),
+    join2(clientDir, "zod"),
+    join2(clientDir, "params")
   ];
   if (generateTests) {
     dirs.push(testDir);
@@ -6346,28 +6390,28 @@ async function generate(configPath) {
   await ensureDirs(dirs);
   const files = [];
   const includeSpec = emitIncludeSpec(graph);
-  files.push({ path: join(serverDir, "include-spec.ts"), content: includeSpec });
-  files.push({ path: join(clientDir, "include-spec.ts"), content: includeSpec });
+  files.push({ path: join2(serverDir, "include-spec.ts"), content: includeSpec });
+  files.push({ path: join2(clientDir, "include-spec.ts"), content: includeSpec });
   const includeResolver = emitIncludeResolver(graph, cfg.useJsExtensions);
-  files.push({ path: join(clientDir, "include-resolver.ts"), content: includeResolver });
-  files.push({ path: join(clientDir, "params", "shared.ts"), content: emitSharedParamsZod() });
-  files.push({ path: join(clientDir, "types", "shared.ts"), content: emitSharedTypes() });
-  files.push({ path: join(clientDir, "base-client.ts"), content: emitBaseClient() });
-  files.push({ path: join(clientDir, "where-types.ts"), content: emitWhereTypes() });
+  files.push({ path: join2(clientDir, "include-resolver.ts"), content: includeResolver });
+  files.push({ path: join2(clientDir, "params", "shared.ts"), content: emitSharedParamsZod() });
+  files.push({ path: join2(clientDir, "types", "shared.ts"), content: emitSharedTypes() });
+  files.push({ path: join2(clientDir, "base-client.ts"), content: emitBaseClient() });
+  files.push({ path: join2(clientDir, "where-types.ts"), content: emitWhereTypes() });
   files.push({
-    path: join(serverDir, "include-builder.ts"),
+    path: join2(serverDir, "include-builder.ts"),
     content: emitIncludeBuilder(graph, cfg.includeMethodsDepth || 2)
   });
   files.push({
-    path: join(serverDir, "include-loader.ts"),
+    path: join2(serverDir, "include-loader.ts"),
     content: emitIncludeLoader(graph, model, cfg.includeMethodsDepth || 2, cfg.useJsExtensions)
   });
-  files.push({ path: join(serverDir, "logger.ts"), content: emitLogger() });
+  files.push({ path: join2(serverDir, "logger.ts"), content: emitLogger() });
   if (getAuthStrategy(normalizedAuth) !== "none") {
-    files.push({ path: join(serverDir, "auth.ts"), content: emitAuth(normalizedAuth) });
+    files.push({ path: join2(serverDir, "auth.ts"), content: emitAuth(normalizedAuth) });
   }
   files.push({
-    path: join(serverDir, "core", "operations.ts"),
+    path: join2(serverDir, "core", "operations.ts"),
     content: emitCoreOperations()
   });
   if (process.env.SDK_DEBUG) {
@@ -6376,13 +6420,13 @@ async function generate(configPath) {
   for (const table of Object.values(model.tables)) {
     const numericMode = cfg.numericMode ?? "auto";
     const typesSrc = emitTypes(table, { numericMode }, model.enums);
-    files.push({ path: join(serverDir, "types", `${table.name}.ts`), content: typesSrc });
-    files.push({ path: join(clientDir, "types", `${table.name}.ts`), content: typesSrc });
+    files.push({ path: join2(serverDir, "types", `${table.name}.ts`), content: typesSrc });
+    files.push({ path: join2(clientDir, "types", `${table.name}.ts`), content: typesSrc });
     const zodSrc = emitZod(table, { numericMode }, model.enums);
-    files.push({ path: join(serverDir, "zod", `${table.name}.ts`), content: zodSrc });
-    files.push({ path: join(clientDir, "zod", `${table.name}.ts`), content: zodSrc });
+    files.push({ path: join2(serverDir, "zod", `${table.name}.ts`), content: zodSrc });
+    files.push({ path: join2(clientDir, "zod", `${table.name}.ts`), content: zodSrc });
     const paramsZodSrc = emitParamsZod(table, graph);
-    files.push({ path: join(clientDir, "params", `${table.name}.ts`), content: paramsZodSrc });
+    files.push({ path: join2(clientDir, "params", `${table.name}.ts`), content: paramsZodSrc });
     let routeContent;
     if (serverFramework === "hono") {
       routeContent = emitHonoRoutes(table, graph, {
@@ -6396,11 +6440,11 @@ async function generate(configPath) {
       throw new Error(`Framework "${serverFramework}" is not yet supported. Currently only "hono" is available.`);
     }
     files.push({
-      path: join(serverDir, "routes", `${table.name}.ts`),
+      path: join2(serverDir, "routes", `${table.name}.ts`),
       content: routeContent
     });
     files.push({
-      path: join(clientDir, `${table.name}.ts`),
+      path: join2(clientDir, `${table.name}.ts`),
       content: emitClient(table, graph, {
         useJsExtensions: cfg.useJsExtensionsClient,
         includeMethodsDepth: cfg.includeMethodsDepth ?? 2,
@@ -6409,12 +6453,12 @@ async function generate(configPath) {
     });
   }
   files.push({
-    path: join(clientDir, "index.ts"),
+    path: join2(clientDir, "index.ts"),
     content: emitClientIndex(Object.values(model.tables), cfg.useJsExtensionsClient, graph, { maxDepth: cfg.includeMethodsDepth ?? 2, skipJunctionTables: cfg.skipJunctionTables ?? true })
   });
   if (serverFramework === "hono") {
     files.push({
-      path: join(serverDir, "router.ts"),
+      path: join2(serverDir, "router.ts"),
       content: emitHonoRouter(Object.values(model.tables), getAuthStrategy(normalizedAuth) !== "none", cfg.useJsExtensions, cfg.pullToken)
     });
   }
@@ -6424,63 +6468,88 @@ async function generate(configPath) {
   }
   const contract = generateUnifiedContract2(model, cfg, graph);
   files.push({
-    path: join(serverDir, "CONTRACT.md"),
+    path: join2(serverDir, "CONTRACT.md"),
     content: generateUnifiedContractMarkdown2(contract)
   });
   files.push({
-    path: join(clientDir, "CONTRACT.md"),
+    path: join2(clientDir, "CONTRACT.md"),
     content: generateUnifiedContractMarkdown2(contract)
   });
   const contractCode = emitUnifiedContract(model, cfg, graph);
   files.push({
-    path: join(serverDir, "contract.ts"),
+    path: join2(serverDir, "contract.ts"),
     content: contractCode
   });
   const clientFiles = files.filter((f) => {
     return f.path.includes(clientDir);
   });
   files.push({
-    path: join(serverDir, "sdk-bundle.ts"),
+    path: join2(serverDir, "sdk-bundle.ts"),
     content: emitSdkBundle(clientFiles, clientDir, CLI_VERSION)
   });
   if (generateTests) {
     console.log("\uD83E\uDDEA Generating tests...");
     const relativeClientPath = relative(testDir, clientDir);
     files.push({
-      path: join(testDir, "setup.ts"),
+      path: join2(testDir, "setup.ts"),
       content: emitTestSetup(relativeClientPath, testFramework)
     });
     files.push({
-      path: join(testDir, "docker-compose.yml"),
+      path: join2(testDir, "docker-compose.yml"),
       content: emitDockerCompose()
     });
     files.push({
-      path: join(testDir, "run-tests.sh"),
+      path: join2(testDir, "run-tests.sh"),
       content: emitTestScript(testFramework, testDir)
     });
     files.push({
-      path: join(testDir, ".gitignore"),
+      path: join2(testDir, ".gitignore"),
       content: emitTestGitignore()
     });
     if (testFramework === "vitest") {
       files.push({
-        path: join(testDir, "vitest.config.ts"),
+        path: join2(testDir, "vitest.config.ts"),
         content: emitVitestConfig()
       });
     }
     for (const table of Object.values(model.tables)) {
       files.push({
-        path: join(testDir, `${table.name}.test.ts`),
+        path: join2(testDir, `${table.name}.test.ts`),
         content: emitTableTest(table, model, relativeClientPath, testFramework)
       });
     }
   }
   console.log("✍️  Writing files...");
   const writeResult = await writeFilesIfChanged(files);
-  if (writeResult.written === 0) {
+  let deleteResult = { deleted: 0, filesDeleted: [] };
+  if (cfg.clean !== false) {
+    const dirsToScan = [
+      serverDir,
+      join2(serverDir, "types"),
+      join2(serverDir, "zod"),
+      join2(serverDir, "routes"),
+      join2(serverDir, "core"),
+      clientDir,
+      join2(clientDir, "types"),
+      join2(clientDir, "zod"),
+      join2(clientDir, "params")
+    ];
+    if (generateTests)
+      dirsToScan.push(testDir);
+    const generatedPaths = new Set(files.map((f) => f.path));
+    deleteResult = await deleteStaleFiles(generatedPaths, dirsToScan);
+  }
+  if (writeResult.written === 0 && deleteResult.deleted === 0) {
     console.log(`✅ All ${writeResult.unchanged} files up-to-date (no changes)`);
   } else {
-    console.log(`✅ Updated ${writeResult.written} files, ${writeResult.unchanged} unchanged`);
+    const parts = [];
+    if (writeResult.written > 0)
+      parts.push(`updated ${writeResult.written} files`);
+    if (deleteResult.deleted > 0)
+      parts.push(`deleted ${deleteResult.deleted} stale files`);
+    if (writeResult.unchanged > 0)
+      parts.push(`${writeResult.unchanged} unchanged`);
+    console.log(`✅ ${parts.join(", ")}`);
   }
   console.log(`  Server: ${serverDir}`);
   console.log(`  Client: ${sameDirectory ? clientDir + " (in sdk subdir due to same output dir)" : clientDir}`);

package/dist/types.d.ts

@@ -34,6 +34,7 @@ export interface Config {
     pull?: PullConfig;
     useJsExtensions?: boolean;
     useJsExtensionsClient?: boolean;
+    clean?: boolean;
     tests?: {
         generate?: boolean;
         output?: string;

package/dist/utils.d.ts

@@ -20,3 +20,11 @@ export declare function writeFilesIfChanged(files: Array<{
  */
 export declare function hashContent(content: string): string;
 export declare function ensureDirs(dirs: string[]): Promise<void>;
+/**
+ * Delete files in the given directories that are not in the set of generated paths.
+ * Used to remove stale files for tables that no longer exist in the schema.
+ */
+export declare function deleteStaleFiles(generatedPaths: Set<string>, dirsToScan: string[]): Promise<{
+    deleted: number;
+    filesDeleted: string[];
+}>;

package/package.json

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