postgresdk 0.18.25 → 0.18.27

package/dist/cli.js

@@ -515,6 +515,19 @@ async function ensureDirs(dirs) {
   for (const d of dirs)
     await mkdir(d, { recursive: true });
 }
+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 deleteStaleFiles(generatedPaths, dirsToScan) {
   let deleted = 0;
   const filesDeleted = [];
@@ -2328,8 +2341,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 +2360,13 @@ 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 deleteResult = await deleteStaleFiles(generatedPaths, dirsToScan);
+    for (const f of deleteResult.filesDeleted) {
+      console.log(`  ✗ ${f}`);
+    }
+    const metadataPath = join3(resolvedOutput, ".postgresdk.json");
     const metadata = {
       version: sdk.version,
       pulledFrom: config.from
@@ -2361,18 +2381,27 @@ Options:`);
     if (metadataChanged) {
       await writeFile2(metadataPath, JSON.stringify(metadata, null, 2));
     }
-    if (filesWritten === 0 && !metadataChanged) {
+    if (filesWritten === 0 && !metadataChanged && deleteResult.deleted === 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 (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();
+});
 
 // src/index.ts
 var import_config = __toESM(require_config(), 1);
@@ -3107,7 +3136,8 @@ ${hasAuth ? `
           result.data,
           result.includeSpec,
           deps.pg,
-          ${opts.includeMethodsDepth}
+          ${opts.includeMethodsDepth},
+          body.data.includeSoftDeleted ?? false
         );
         return c.json({
           data: stitched,
@@ -4430,7 +4460,8 @@ export async function loadIncludes(
   parents: any[],
   spec: IncludeSpec | undefined,
   pg: { query: (text: string, params?: any[]) => Promise<{ rows: any[] }> },
-  maxDepth: number = ${maxDepth}
+  maxDepth: number = ${maxDepth},
+  includeSoftDeleted: boolean = false
 ) {
   try {
     if (!spec || !parents.length) return parents;
@@ -4550,7 +4581,7 @@ export async function loadIncludes(
     const pkCols = pkOf(target);
     const where = buildOrAndPredicate(pkCols, tuples.length, 1);
     const params = tuples.flat();
-    const sql = \`SELECT * FROM "\${target}" WHERE (\${where})\${softDeleteFilter(target)}\`;
+    const sql = \`SELECT * FROM "\${target}" WHERE (\${where})\${includeSoftDeleted ? "" : softDeleteFilter(target)}\`;
     log.debug("belongsTo SQL", { curr, target, key, sql, paramsCount: params.length });
     const { rows: targets } = await pg.query(sql, params);
 
@@ -4577,7 +4608,7 @@ export async function loadIncludes(
     // SELECT target WHERE fk IN tuples
     const where = buildOrAndPredicate(fk.from, tuples.length, 1);
     const params = tuples.flat();
-    const sql = \`SELECT * FROM "\${target}" WHERE (\${where})\${softDeleteFilter(target)}\`;
+    const sql = \`SELECT * FROM "\${target}" WHERE (\${where})\${includeSoftDeleted ? "" : softDeleteFilter(target)}\`;
     log.debug("hasOne SQL", { curr, target, key, sql, paramsCount: params.length });
     const { rows: targets } = await pg.query(sql, params);
 
@@ -4604,7 +4635,7 @@ export async function loadIncludes(
     const params = tuples.flat();
 
     // Build SQL with optional ORDER BY, LIMIT, OFFSET
-    let sql = \`SELECT * FROM "\${target}" WHERE (\${where})\${softDeleteFilter(target)}\`;
+    let sql = \`SELECT * FROM "\${target}" WHERE (\${where})\${includeSoftDeleted ? "" : softDeleteFilter(target)}\`;
 
     // If limit/offset are needed, use window functions to limit per parent
     if (options.limit !== undefined || options.offset !== undefined) {
@@ -4620,7 +4651,7 @@ export async function loadIncludes(
         SELECT * FROM (
           SELECT *, ROW_NUMBER() OVER (PARTITION BY \${partitionCols} \${orderByClause}) as __rn
           FROM "\${target}"
-          WHERE (\${where})\${softDeleteFilter(target)}
+          WHERE (\${where})\${includeSoftDeleted ? "" : softDeleteFilter(target)}
         ) __sub
         WHERE __rn > \${offset} AND __rn <= \${offset + limit}
       \`;
@@ -4684,7 +4715,7 @@ export async function loadIncludes(
                  \${toCurr.from.map((c: string) => \`j."\${c}"\`).join(' || \\',\\' || ')} as __parent_fk
           FROM "\${via}" j
           INNER JOIN "\${target}" t ON \${joinConditions}
-          WHERE (\${whereVia})\${softDeleteFilter(target, "t")}
+          WHERE (\${whereVia})\${includeSoftDeleted ? "" : softDeleteFilter(target, "t")}
         ) __numbered
         WHERE __numbered.__rn > \${offset} AND __numbered.__rn <= \${offset + limit}
       \`;
@@ -4728,7 +4759,7 @@ export async function loadIncludes(
       // 2) Load targets by distinct target fk tuples in junction
       const tTuples = distinctTuples(jrows, toTarget.from);
       const whereT = buildOrAndPredicate(pkOf(target), tTuples.length, 1);
-      const sqlT = \`SELECT * FROM "\${target}" WHERE (\${whereT})\${softDeleteFilter(target)}\`;
+      const sqlT = \`SELECT * FROM "\${target}" WHERE (\${whereT})\${includeSoftDeleted ? "" : softDeleteFilter(target)}\`;
       const paramsT = tTuples.flat();
       log.debug("manyToMany target SQL", { curr, target, via, key, sql: sqlT, paramsCount: paramsT.length });
       const { rows: targets } = await pg.query(sqlT, paramsT);

package/dist/index.js

@@ -514,6 +514,19 @@ async function ensureDirs(dirs) {
   for (const d of dirs)
     await mkdir(d, { recursive: true });
 }
+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 deleteStaleFiles(generatedPaths, dirsToScan) {
   let deleted = 0;
   const filesDeleted = [];
@@ -2146,7 +2159,8 @@ ${hasAuth ? `
           result.data,
           result.includeSpec,
           deps.pg,
-          ${opts.includeMethodsDepth}
+          ${opts.includeMethodsDepth},
+          body.data.includeSoftDeleted ?? false
         );
         return c.json({
           data: stitched,
@@ -3469,7 +3483,8 @@ export async function loadIncludes(
   parents: any[],
   spec: IncludeSpec | undefined,
   pg: { query: (text: string, params?: any[]) => Promise<{ rows: any[] }> },
-  maxDepth: number = ${maxDepth}
+  maxDepth: number = ${maxDepth},
+  includeSoftDeleted: boolean = false
 ) {
   try {
     if (!spec || !parents.length) return parents;
@@ -3589,7 +3604,7 @@ export async function loadIncludes(
     const pkCols = pkOf(target);
     const where = buildOrAndPredicate(pkCols, tuples.length, 1);
     const params = tuples.flat();
-    const sql = \`SELECT * FROM "\${target}" WHERE (\${where})\${softDeleteFilter(target)}\`;
+    const sql = \`SELECT * FROM "\${target}" WHERE (\${where})\${includeSoftDeleted ? "" : softDeleteFilter(target)}\`;
     log.debug("belongsTo SQL", { curr, target, key, sql, paramsCount: params.length });
     const { rows: targets } = await pg.query(sql, params);
 
@@ -3616,7 +3631,7 @@ export async function loadIncludes(
     // SELECT target WHERE fk IN tuples
     const where = buildOrAndPredicate(fk.from, tuples.length, 1);
     const params = tuples.flat();
-    const sql = \`SELECT * FROM "\${target}" WHERE (\${where})\${softDeleteFilter(target)}\`;
+    const sql = \`SELECT * FROM "\${target}" WHERE (\${where})\${includeSoftDeleted ? "" : softDeleteFilter(target)}\`;
     log.debug("hasOne SQL", { curr, target, key, sql, paramsCount: params.length });
     const { rows: targets } = await pg.query(sql, params);
 
@@ -3643,7 +3658,7 @@ export async function loadIncludes(
     const params = tuples.flat();
 
     // Build SQL with optional ORDER BY, LIMIT, OFFSET
-    let sql = \`SELECT * FROM "\${target}" WHERE (\${where})\${softDeleteFilter(target)}\`;
+    let sql = \`SELECT * FROM "\${target}" WHERE (\${where})\${includeSoftDeleted ? "" : softDeleteFilter(target)}\`;
 
     // If limit/offset are needed, use window functions to limit per parent
     if (options.limit !== undefined || options.offset !== undefined) {
@@ -3659,7 +3674,7 @@ export async function loadIncludes(
         SELECT * FROM (
           SELECT *, ROW_NUMBER() OVER (PARTITION BY \${partitionCols} \${orderByClause}) as __rn
           FROM "\${target}"
-          WHERE (\${where})\${softDeleteFilter(target)}
+          WHERE (\${where})\${includeSoftDeleted ? "" : softDeleteFilter(target)}
         ) __sub
         WHERE __rn > \${offset} AND __rn <= \${offset + limit}
       \`;
@@ -3723,7 +3738,7 @@ export async function loadIncludes(
                  \${toCurr.from.map((c: string) => \`j."\${c}"\`).join(' || \\',\\' || ')} as __parent_fk
           FROM "\${via}" j
           INNER JOIN "\${target}" t ON \${joinConditions}
-          WHERE (\${whereVia})\${softDeleteFilter(target, "t")}
+          WHERE (\${whereVia})\${includeSoftDeleted ? "" : softDeleteFilter(target, "t")}
         ) __numbered
         WHERE __numbered.__rn > \${offset} AND __numbered.__rn <= \${offset + limit}
       \`;
@@ -3767,7 +3782,7 @@ export async function loadIncludes(
       // 2) Load targets by distinct target fk tuples in junction
       const tTuples = distinctTuples(jrows, toTarget.from);
       const whereT = buildOrAndPredicate(pkOf(target), tTuples.length, 1);
-      const sqlT = \`SELECT * FROM "\${target}" WHERE (\${whereT})\${softDeleteFilter(target)}\`;
+      const sqlT = \`SELECT * FROM "\${target}" WHERE (\${whereT})\${includeSoftDeleted ? "" : softDeleteFilter(target)}\`;
       const paramsT = tTuples.flat();
       log.debug("manyToMany target SQL", { curr, target, via, key, sql: sqlT, paramsCount: paramsT.length });
       const { rows: targets } = await pg.query(sqlT, paramsT);

package/dist/utils.d.ts

@@ -20,6 +20,11 @@ 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[]>;
 /**
  * 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.25",
+  "version": "0.18.27",
   "description": "Generate a typed server/client SDK from a Postgres schema (includes, Zod, Hono).",
   "type": "module",
   "bin": {