postgresdk 0.18.26 → 0.18.28

package/dist/cli-utils.d.ts

@@ -0,0 +1,14 @@
+/** Parse --force / -y / --yes from CLI args */
+export declare function parseForceFlag(args: string[]): boolean;
+/**
+ * For each stale file, prompt the user to confirm deletion (shadcn-style per-file).
+ * If `force` is true, all files are deleted without prompting.
+ * If stdout is not a TTY (e.g. CI), files are skipped with a warning unless `force` is true.
+ *
+ * Returns counts of deleted and skipped files.
+ */
+export declare function confirmAndDeleteStaleFiles(staleFiles: string[], force: boolean): Promise<{
+    deleted: number;
+    skipped: number;
+    filesDeleted: string[];
+}>;

package/dist/cli.js

@@ -515,9 +515,21 @@ async function ensureDirs(dirs) {
   for (const d of dirs)
     await mkdir(d, { recursive: true });
 }
-async function deleteStaleFiles(generatedPaths, dirsToScan) {
-  let deleted = 0;
-  const filesDeleted = [];
+async function collectDirsRecursively(root) {
+  if (!existsSync(root))
+    return [];
+  const dirs = [root];
+  const entries = await readdir(root, { withFileTypes: true });
+  for (const entry of entries) {
+    if (!entry.isDirectory())
+      continue;
+    const sub = join(root, entry.name);
+    dirs.push(...await collectDirsRecursively(sub));
+  }
+  return dirs;
+}
+async function findStaleFiles(generatedPaths, dirsToScan) {
+  const stale = [];
   for (const dir of dirsToScan) {
     if (!existsSync(dir))
       continue;
@@ -529,13 +541,11 @@ async function deleteStaleFiles(generatedPaths, dirsToScan) {
         continue;
       const fullPath = join(dir, entry.name);
       if (!generatedPaths.has(fullPath)) {
-        await unlink(fullPath);
-        deleted++;
-        filesDeleted.push(fullPath);
+        stale.push(fullPath);
       }
     }
   }
-  return { deleted, filesDeleted };
+  return stale;
 }
 var pascal = (s) => s.split(/[_\s-]+/).map((w) => w?.[0] ? w[0].toUpperCase() + w.slice(1) : "").join("");
 var init_utils = () => {};
@@ -1414,6 +1424,50 @@ var init_emit_sdk_contract = __esm(() => {
   init_emit_include_methods();
 });
 
+// src/cli-utils.ts
+import { unlink as unlink2 } from "fs/promises";
+import prompts from "prompts";
+function parseForceFlag(args) {
+  return args.includes("--force") || args.includes("-y") || args.includes("--yes");
+}
+async function confirmAndDeleteStaleFiles(staleFiles, force) {
+  if (staleFiles.length === 0)
+    return { deleted: 0, skipped: 0, filesDeleted: [] };
+  if (!force && !process.stdout.isTTY) {
+    console.log(`⚠️  ${staleFiles.length} stale file(s) not deleted (non-interactive shell). Re-run with --force to delete.`);
+    return { deleted: 0, skipped: staleFiles.length, filesDeleted: [] };
+  }
+  let deleted = 0;
+  let skipped = 0;
+  const filesDeleted = [];
+  for (const filePath of staleFiles) {
+    let shouldDelete = force;
+    if (!force) {
+      const { confirmed } = await prompts({
+        type: "confirm",
+        name: "confirmed",
+        message: `Delete stale file: ${filePath}?`,
+        initial: false
+      });
+      if (confirmed === undefined) {
+        console.log("Stale file deletion aborted.");
+        break;
+      }
+      shouldDelete = confirmed;
+    }
+    if (shouldDelete) {
+      await unlink2(filePath);
+      console.log(`  ✗ ${filePath}`);
+      filesDeleted.push(filePath);
+      deleted++;
+    } else {
+      skipped++;
+    }
+  }
+  return { deleted, skipped, filesDeleted };
+}
+var init_cli_utils = () => {};
+
 // src/cli-config-utils.ts
 function extractConfigFields(configContent) {
   const fields = [];
@@ -1835,7 +1889,7 @@ __export(exports_cli_init, {
 });
 import { existsSync as existsSync3, writeFileSync, readFileSync as readFileSync2, copyFileSync } from "fs";
 import { resolve } from "path";
-import prompts from "prompts";
+import prompts2 from "prompts";
 async function initCommand(args) {
   console.log(`\uD83D\uDE80 Initializing postgresdk configuration...
 `);
@@ -1860,7 +1914,7 @@ async function initCommand(args) {
       }
     });
     console.log();
-    const { mergeStrategy } = await prompts({
+    const { mergeStrategy } = await prompts2({
       type: "select",
       name: "mergeStrategy",
       message: "How would you like to proceed?",
@@ -1900,7 +1954,7 @@ async function initCommand(args) {
 \uD83D\uDD04 Let's review your configuration:
 `);
       for (const field of existingFields.filter((f) => !f.isCommented)) {
-        const { choice } = await prompts({
+        const { choice } = await prompts2({
           type: "select",
           name: "choice",
           message: `${field.description}:
@@ -1932,7 +1986,7 @@ async function initCommand(args) {
 \uD83D\uDCE6 New configuration options available:
 `);
         for (const option of missingOptions) {
-          const { addOption } = await prompts({
+          const { addOption } = await prompts2({
             type: "confirm",
             name: "addOption",
             message: `Add ${option.description} configuration? (commented out by default)`,
@@ -1971,7 +2025,7 @@ async function initCommand(args) {
   } else if (isSdkSide) {
     projectType = "sdk";
   } else {
-    const response = await prompts({
+    const response = await prompts2({
       type: "select",
       name: "projectType",
       message: "What type of project is this?",
@@ -2267,6 +2321,7 @@ async function pullCommand(args) {
       console.error("⚠️  Failed to load config file:", err);
     }
   }
+  const force = parseForceFlag(args);
   const cliConfig = {
     from: args.find((a) => a.startsWith("--from="))?.split("=")[1],
     output: args.find((a) => a.startsWith("--output="))?.split("=")[1],
@@ -2328,8 +2383,9 @@ Options:`);
     let filesWritten = 0;
     let filesUnchanged = 0;
     const changedFiles = [];
+    const resolvedOutput = resolve2(config.output);
     for (const [path, content] of Object.entries(sdk.files)) {
-      const fullPath = join3(config.output, path);
+      const fullPath = join3(resolvedOutput, path);
       await mkdir2(dirname3(fullPath), { recursive: true });
       let shouldWrite = true;
       if (existsSync4(fullPath)) {
@@ -2346,7 +2402,11 @@ Options:`);
         console.log(`  ✓ ${path}`);
       }
     }
-    const metadataPath = join3(config.output, ".postgresdk.json");
+    const generatedPaths = new Set(Object.keys(sdk.files).map((p) => join3(resolvedOutput, p)));
+    const dirsToScan = await collectDirsRecursively(resolvedOutput);
+    const staleFiles = await findStaleFiles(generatedPaths, dirsToScan);
+    const deleteResult = await confirmAndDeleteStaleFiles(staleFiles, force);
+    const metadataPath = join3(resolvedOutput, ".postgresdk.json");
     const metadata = {
       version: sdk.version,
       pulledFrom: config.from
@@ -2361,18 +2421,30 @@ Options:`);
     if (metadataChanged) {
       await writeFile2(metadataPath, JSON.stringify(metadata, null, 2));
     }
-    if (filesWritten === 0 && !metadataChanged) {
+    if (filesWritten === 0 && !metadataChanged && deleteResult.deleted === 0 && deleteResult.skipped === 0) {
       console.log(`✅ SDK up-to-date (${filesUnchanged} files unchanged)`);
     } else {
+      const parts = [];
+      if (filesWritten > 0)
+        parts.push(`updated ${filesWritten} files`);
+      if (deleteResult.deleted > 0)
+        parts.push(`deleted ${deleteResult.deleted} stale files`);
+      if (deleteResult.skipped > 0)
+        parts.push(`skipped ${deleteResult.skipped} stale files`);
+      if (filesUnchanged > 0)
+        parts.push(`${filesUnchanged} unchanged`);
       console.log(`✅ SDK pulled successfully to ${config.output}`);
-      console.log(`   Updated: ${filesWritten} files, Unchanged: ${filesUnchanged} files`);
+      console.log(`   ${parts.join(", ")}`);
     }
   } catch (err) {
     console.error(`❌ Pull failed:`, err);
     process.exit(1);
   }
 }
-var init_cli_pull = () => {};
+var init_cli_pull = __esm(() => {
+  init_utils();
+  init_cli_utils();
+});
 
 // src/index.ts
 var import_config = __toESM(require_config(), 1);
@@ -7082,6 +7154,7 @@ function generateTestCases(table, sampleData, updateData, hasForeignKeys = false
 // src/index.ts
 init_emit_sdk_contract();
 init_utils();
+init_cli_utils();
 var __filename2 = fileURLToPath(import.meta.url);
 var __dirname2 = dirname2(__filename2);
 var { version: CLI_VERSION } = JSON.parse(readFileSync(join2(__dirname2, "../package.json"), "utf-8"));
@@ -7091,7 +7164,7 @@ function resolveSoftDeleteColumn(cfg, tableName) {
     return overrides[tableName] ?? null;
   return cfg.softDeleteColumn ?? null;
 }
-async function generate(configPath) {
+async function generate(configPath, options) {
   if (!existsSync2(configPath)) {
     throw new Error(`Config file not found: ${configPath}
 
@@ -7286,7 +7359,7 @@ async function generate(configPath) {
   }
   console.log("✍️  Writing files...");
   const writeResult = await writeFilesIfChanged(files);
-  let deleteResult = { deleted: 0, filesDeleted: [] };
+  let deleteResult = { deleted: 0, skipped: 0, filesDeleted: [] };
   if (cfg.clean !== false) {
     const dirsToScan = [
       serverDir,
@@ -7302,9 +7375,10 @@ async function generate(configPath) {
     if (generateTests)
       dirsToScan.push(testDir);
     const generatedPaths = new Set(files.map((f) => f.path));
-    deleteResult = await deleteStaleFiles(generatedPaths, dirsToScan);
+    const staleFiles = await findStaleFiles(generatedPaths, dirsToScan);
+    deleteResult = await confirmAndDeleteStaleFiles(staleFiles, options?.force ?? false);
   }
-  if (writeResult.written === 0 && deleteResult.deleted === 0) {
+  if (writeResult.written === 0 && deleteResult.deleted === 0 && deleteResult.skipped === 0) {
     console.log(`✅ All ${writeResult.unchanged} files up-to-date (no changes)`);
   } else {
     const parts = [];
@@ -7312,6 +7386,8 @@ async function generate(configPath) {
       parts.push(`updated ${writeResult.written} files`);
     if (deleteResult.deleted > 0)
       parts.push(`deleted ${deleteResult.deleted} stale files`);
+    if (deleteResult.skipped > 0)
+      parts.push(`skipped ${deleteResult.skipped} stale files`);
     if (writeResult.unchanged > 0)
       parts.push(`${writeResult.unchanged} unchanged`);
     console.log(`✅ ${parts.join(", ")}`);
@@ -7354,6 +7430,7 @@ 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 join4 } from "node:path";
+init_cli_utils();
 var __filename3 = fileURLToPath2(import.meta.url);
 var __dirname3 = dirname4(__filename3);
 var packageJson = JSON.parse(readFileSync3(join4(__dirname3, "../package.json"), "utf-8"));
@@ -7383,11 +7460,13 @@ Init Options:
 
 Generate Options:
   -c, --config <path>  Path to config file (default: postgresdk.config.ts)
+  --force, -y          Delete stale files without prompting
 
 Pull Options:
   --from <url>         API URL to pull SDK from
   --output <path>      Output directory (default: ./src/sdk)
   --token <token>      Authentication token
+  --force, -y          Delete stale files without prompting
   -c, --config <path>  Path to config file with pull settings
 
 Examples:
@@ -7409,8 +7488,9 @@ if (command === "init") {
   if (configIndex !== -1 && args[configIndex + 1]) {
     configPath = args[configIndex + 1];
   }
+  const force = parseForceFlag(args);
   try {
-    await generate(resolve3(process.cwd(), configPath));
+    await generate(resolve3(process.cwd(), configPath), { force });
   } catch (err) {
     console.error("❌ Generation failed:", err);
     process.exit(1);

package/dist/index.d.ts

@@ -2,4 +2,6 @@ import "dotenv/config";
 import type { Config } from "./types";
 /** Resolves the effective soft delete column for a given table, respecting per-table overrides. */
 export declare function resolveSoftDeleteColumn(cfg: Pick<Config, "softDeleteColumn" | "softDeleteColumnOverrides">, tableName: string): string | null;
-export declare function generate(configPath: string): Promise<void>;
+export declare function generate(configPath: string, options?: {
+    force?: boolean;
+}): Promise<void>;

package/dist/index.js

@@ -514,9 +514,21 @@ async function ensureDirs(dirs) {
   for (const d of dirs)
     await mkdir(d, { recursive: true });
 }
-async function deleteStaleFiles(generatedPaths, dirsToScan) {
-  let deleted = 0;
-  const filesDeleted = [];
+async function collectDirsRecursively(root) {
+  if (!existsSync(root))
+    return [];
+  const dirs = [root];
+  const entries = await readdir(root, { withFileTypes: true });
+  for (const entry of entries) {
+    if (!entry.isDirectory())
+      continue;
+    const sub = join(root, entry.name);
+    dirs.push(...await collectDirsRecursively(sub));
+  }
+  return dirs;
+}
+async function findStaleFiles(generatedPaths, dirsToScan) {
+  const stale = [];
   for (const dir of dirsToScan) {
     if (!existsSync(dir))
       continue;
@@ -528,13 +540,11 @@ async function deleteStaleFiles(generatedPaths, dirsToScan) {
         continue;
       const fullPath = join(dir, entry.name);
       if (!generatedPaths.has(fullPath)) {
-        await unlink(fullPath);
-        deleted++;
-        filesDeleted.push(fullPath);
+        stale.push(fullPath);
       }
     }
   }
-  return { deleted, filesDeleted };
+  return stale;
 }
 var pascal = (s) => s.split(/[_\s-]+/).map((w) => w?.[0] ? w[0].toUpperCase() + w.slice(1) : "").join("");
 var init_utils = () => {};
@@ -1413,6 +1423,50 @@ var init_emit_sdk_contract = __esm(() => {
   init_emit_include_methods();
 });
 
+// src/cli-utils.ts
+import { unlink as unlink2 } from "fs/promises";
+import prompts from "prompts";
+function parseForceFlag(args) {
+  return args.includes("--force") || args.includes("-y") || args.includes("--yes");
+}
+async function confirmAndDeleteStaleFiles(staleFiles, force) {
+  if (staleFiles.length === 0)
+    return { deleted: 0, skipped: 0, filesDeleted: [] };
+  if (!force && !process.stdout.isTTY) {
+    console.log(`⚠️  ${staleFiles.length} stale file(s) not deleted (non-interactive shell). Re-run with --force to delete.`);
+    return { deleted: 0, skipped: staleFiles.length, filesDeleted: [] };
+  }
+  let deleted = 0;
+  let skipped = 0;
+  const filesDeleted = [];
+  for (const filePath of staleFiles) {
+    let shouldDelete = force;
+    if (!force) {
+      const { confirmed } = await prompts({
+        type: "confirm",
+        name: "confirmed",
+        message: `Delete stale file: ${filePath}?`,
+        initial: false
+      });
+      if (confirmed === undefined) {
+        console.log("Stale file deletion aborted.");
+        break;
+      }
+      shouldDelete = confirmed;
+    }
+    if (shouldDelete) {
+      await unlink2(filePath);
+      console.log(`  ✗ ${filePath}`);
+      filesDeleted.push(filePath);
+      deleted++;
+    } else {
+      skipped++;
+    }
+  }
+  return { deleted, skipped, filesDeleted };
+}
+var init_cli_utils = () => {};
+
 // src/index.ts
 var import_config = __toESM(require_config(), 1);
 import { join as join2, relative, dirname as dirname2 } from "node:path";
@@ -6121,6 +6175,7 @@ function generateTestCases(table, sampleData, updateData, hasForeignKeys = false
 // src/index.ts
 init_emit_sdk_contract();
 init_utils();
+init_cli_utils();
 var __filename2 = fileURLToPath(import.meta.url);
 var __dirname2 = dirname2(__filename2);
 var { version: CLI_VERSION } = JSON.parse(readFileSync(join2(__dirname2, "../package.json"), "utf-8"));
@@ -6130,7 +6185,7 @@ function resolveSoftDeleteColumn(cfg, tableName) {
     return overrides[tableName] ?? null;
   return cfg.softDeleteColumn ?? null;
 }
-async function generate(configPath) {
+async function generate(configPath, options) {
   if (!existsSync2(configPath)) {
     throw new Error(`Config file not found: ${configPath}
 
@@ -6325,7 +6380,7 @@ async function generate(configPath) {
   }
   console.log("✍️  Writing files...");
   const writeResult = await writeFilesIfChanged(files);
-  let deleteResult = { deleted: 0, filesDeleted: [] };
+  let deleteResult = { deleted: 0, skipped: 0, filesDeleted: [] };
   if (cfg.clean !== false) {
     const dirsToScan = [
       serverDir,
@@ -6341,9 +6396,10 @@ async function generate(configPath) {
     if (generateTests)
       dirsToScan.push(testDir);
     const generatedPaths = new Set(files.map((f) => f.path));
-    deleteResult = await deleteStaleFiles(generatedPaths, dirsToScan);
+    const staleFiles = await findStaleFiles(generatedPaths, dirsToScan);
+    deleteResult = await confirmAndDeleteStaleFiles(staleFiles, options?.force ?? false);
   }
-  if (writeResult.written === 0 && deleteResult.deleted === 0) {
+  if (writeResult.written === 0 && deleteResult.deleted === 0 && deleteResult.skipped === 0) {
     console.log(`✅ All ${writeResult.unchanged} files up-to-date (no changes)`);
   } else {
     const parts = [];
@@ -6351,6 +6407,8 @@ async function generate(configPath) {
       parts.push(`updated ${writeResult.written} files`);
     if (deleteResult.deleted > 0)
       parts.push(`deleted ${deleteResult.deleted} stale files`);
+    if (deleteResult.skipped > 0)
+      parts.push(`skipped ${deleteResult.skipped} stale files`);
     if (writeResult.unchanged > 0)
       parts.push(`${writeResult.unchanged} unchanged`);
     console.log(`✅ ${parts.join(", ")}`);

package/dist/utils.d.ts

@@ -20,6 +20,16 @@ export declare function writeFilesIfChanged(files: Array<{
  */
 export declare function hashContent(content: string): string;
 export declare function ensureDirs(dirs: string[]): Promise<void>;
+/**
+ * Recursively collect all subdirectory paths under `root`, including root itself.
+ * Returns an empty array if `root` does not exist.
+ */
+export declare function collectDirsRecursively(root: string): Promise<string[]>;
+/**
+ * Find files in the given directories that are not in the set of generated paths,
+ * without deleting them. Used to identify stale files before prompting for confirmation.
+ */
+export declare function findStaleFiles(generatedPaths: Set<string>, dirsToScan: string[]): Promise<string[]>;
 /**
  * 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.

package/package.json

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