postgresdk 0.18.25 → 0.18.26

package/dist/cli.js

@@ -3107,7 +3107,8 @@ ${hasAuth ? `
           result.data,
           result.includeSpec,
           deps.pg,
-          ${opts.includeMethodsDepth}
+          ${opts.includeMethodsDepth},
+          body.data.includeSoftDeleted ?? false
         );
         return c.json({
           data: stitched,
@@ -4430,7 +4431,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 +4552,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 +4579,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 +4606,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 +4622,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 +4686,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 +4730,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

@@ -2146,7 +2146,8 @@ ${hasAuth ? `
           result.data,
           result.includeSpec,
           deps.pg,
-          ${opts.includeMethodsDepth}
+          ${opts.includeMethodsDepth},
+          body.data.includeSoftDeleted ?? false
         );
         return c.json({
           data: stitched,
@@ -3469,7 +3470,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 +3591,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 +3618,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 +3645,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 +3661,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 +3725,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 +3769,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/package.json

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