postgresdk 0.18.14 → 0.18.15

package/dist/cli.js

@@ -2915,7 +2915,7 @@ function emitIncludeSpec(graph) {
         out += `  ${relKey}?: boolean | { select?: string[]; exclude?: string[]; include?: ${toPascal(edge.target)}IncludeSpec; limit?: number; offset?: number; orderBy?: string; order?: "asc" | "desc"; };
 `;
       } else {
-        out += `  ${relKey}?: boolean | { select?: string[]; exclude?: string[]; } | ${toPascal(edge.target)}IncludeSpec;
+        out += `  ${relKey}?: boolean | { select?: string[]; exclude?: string[]; include?: ${toPascal(edge.target)}IncludeSpec; };
 `;
       }
     }
@@ -3686,9 +3686,13 @@ function emitClient(table, graph, opts, model) {
         } else if (pattern.type === "nested" && pattern.nestedKey) {
           const key = pattern.nestedKey;
           const paramName = includeParamNames[0];
+          const nestedValue = pattern.nestedValue;
+          const requiredIncludes = Object.entries(nestedValue).map(([k, v]) => `${k}: ${JSON.stringify(v)}`).join(", ");
           transformCode = `
     const { ${destructure} } = params ?? {};
-    const includeSpec = ${paramName} ? { ${key}: ${paramName} } : ${JSON.stringify(method.includeSpec)};`;
+    const includeSpec = { ${key}: ${paramName}
+      ? { ...${paramName}, include: { ${requiredIncludes}, ...${paramName}.include } }
+      : ${JSON.stringify(nestedValue)} };`;
         }
       } else {
         transformCode = `
@@ -3735,9 +3739,13 @@ function emitClient(table, graph, opts, model) {
         } else if (pattern.type === "nested" && pattern.nestedKey) {
           const key = pattern.nestedKey;
           const paramName = includeParamNames[0];
+          const nestedValue = pattern.nestedValue;
+          const requiredIncludes = Object.entries(nestedValue).map(([k, v]) => `${k}: ${JSON.stringify(v)}`).join(", ");
           transformCode = `
     const { ${destructure}, ...baseParams } = params ?? {};
-    const includeSpec = ${paramName} ? { ${key}: ${paramName} } : ${JSON.stringify(method.includeSpec)};
+    const includeSpec = { ${key}: ${paramName}
+      ? { ...${paramName}, include: { ${requiredIncludes}, ...${paramName}.include } }
+      : ${JSON.stringify(nestedValue)} };
     return this.post<${method.returnType}>(\`\${this.resource}/list\`, { ...baseParams, include: includeSpec });`;
         }
       } else {
@@ -4762,9 +4770,15 @@ export async function loadIncludes(
         // Could be belongs-to (current has FK to target) OR has-one (target unique-FK to current)
         const specValue = s[key];
         const options: RelationOptions = {};
+        let childSpec: any = undefined;
+
         if (specValue && typeof specValue === "object" && specValue !== true) {
           if (specValue.select !== undefined) options.select = specValue.select;
           if (specValue.exclude !== undefined) options.exclude = specValue.exclude;
+          // Support { include: TargetIncludeSpec } — mirrors the many/via handler
+          if (specValue.include !== undefined) {
+            childSpec = specValue.include;
+          }
         }
 
         const currFks = (FK_INDEX as any)[table] as Array<{from:string[];toTable:string;to:string[]}>;
@@ -4784,7 +4798,7 @@ export async function loadIncludes(
             for (const r of rows) r[key] = null;
           }
         }
-        const childSpec = s[key] && typeof s[key] === "object" ? s[key] : undefined;
+
         if (childSpec) {
           const children = rows.map(r => r[key]).filter(Boolean);
           try {

package/dist/index.js

@@ -1954,7 +1954,7 @@ function emitIncludeSpec(graph) {
         out += `  ${relKey}?: boolean | { select?: string[]; exclude?: string[]; include?: ${toPascal(edge.target)}IncludeSpec; limit?: number; offset?: number; orderBy?: string; order?: "asc" | "desc"; };
 `;
       } else {
-        out += `  ${relKey}?: boolean | { select?: string[]; exclude?: string[]; } | ${toPascal(edge.target)}IncludeSpec;
+        out += `  ${relKey}?: boolean | { select?: string[]; exclude?: string[]; include?: ${toPascal(edge.target)}IncludeSpec; };
 `;
       }
     }
@@ -2725,9 +2725,13 @@ function emitClient(table, graph, opts, model) {
         } else if (pattern.type === "nested" && pattern.nestedKey) {
           const key = pattern.nestedKey;
           const paramName = includeParamNames[0];
+          const nestedValue = pattern.nestedValue;
+          const requiredIncludes = Object.entries(nestedValue).map(([k, v]) => `${k}: ${JSON.stringify(v)}`).join(", ");
           transformCode = `
     const { ${destructure} } = params ?? {};
-    const includeSpec = ${paramName} ? { ${key}: ${paramName} } : ${JSON.stringify(method.includeSpec)};`;
+    const includeSpec = { ${key}: ${paramName}
+      ? { ...${paramName}, include: { ${requiredIncludes}, ...${paramName}.include } }
+      : ${JSON.stringify(nestedValue)} };`;
         }
       } else {
         transformCode = `
@@ -2774,9 +2778,13 @@ function emitClient(table, graph, opts, model) {
         } else if (pattern.type === "nested" && pattern.nestedKey) {
           const key = pattern.nestedKey;
           const paramName = includeParamNames[0];
+          const nestedValue = pattern.nestedValue;
+          const requiredIncludes = Object.entries(nestedValue).map(([k, v]) => `${k}: ${JSON.stringify(v)}`).join(", ");
           transformCode = `
     const { ${destructure}, ...baseParams } = params ?? {};
-    const includeSpec = ${paramName} ? { ${key}: ${paramName} } : ${JSON.stringify(method.includeSpec)};
+    const includeSpec = { ${key}: ${paramName}
+      ? { ...${paramName}, include: { ${requiredIncludes}, ...${paramName}.include } }
+      : ${JSON.stringify(nestedValue)} };
     return this.post<${method.returnType}>(\`\${this.resource}/list\`, { ...baseParams, include: includeSpec });`;
         }
       } else {
@@ -3801,9 +3809,15 @@ export async function loadIncludes(
         // Could be belongs-to (current has FK to target) OR has-one (target unique-FK to current)
         const specValue = s[key];
         const options: RelationOptions = {};
+        let childSpec: any = undefined;
+
         if (specValue && typeof specValue === "object" && specValue !== true) {
           if (specValue.select !== undefined) options.select = specValue.select;
           if (specValue.exclude !== undefined) options.exclude = specValue.exclude;
+          // Support { include: TargetIncludeSpec } — mirrors the many/via handler
+          if (specValue.include !== undefined) {
+            childSpec = specValue.include;
+          }
         }
 
         const currFks = (FK_INDEX as any)[table] as Array<{from:string[];toTable:string;to:string[]}>;
@@ -3823,7 +3837,7 @@ export async function loadIncludes(
             for (const r of rows) r[key] = null;
           }
         }
-        const childSpec = s[key] && typeof s[key] === "object" ? s[key] : undefined;
+
         if (childSpec) {
           const children = rows.map(r => r[key]).filter(Boolean);
           try {

package/package.json

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