postgresdk 0.19.2 → 0.19.3

package/dist/cli.js

@@ -583,7 +583,8 @@ function buildReturnType(baseTable, path, isMany, targets, graph) {
       continue;
     const targetType = `Select${pascal(target)}`;
     if (i === 0) {
-      parts.push(`${key}: ${isMany[i] ? `${targetType}[]` : targetType}`);
+      const edgeNull = !isMany[i] && graph[baseTable]?.[key]?.nullable ? " | null" : "";
+      parts.push(`${key}: ${isMany[i] ? `${targetType}[]` : `${targetType}${edgeNull}`}`);
     } else {
       let nestedType = targetType;
       for (let j = i;j < path.length; j++) {
@@ -593,13 +594,26 @@ function buildReturnType(baseTable, path, isMany, targets, graph) {
           if (!nestedKey || !nestedTarget)
             continue;
           const nestedTargetType = `Select${pascal(nestedTarget)}`;
-          nestedType = `${nestedType} & { ${nestedKey}: ${isMany[j] ? `${nestedTargetType}[]` : nestedTargetType} }`;
+          const nestedSource = targets[j - 1];
+          const nestedNull = !isMany[j] && graph[nestedSource]?.[nestedKey]?.nullable ? " | null" : "";
+          nestedType = `${nestedType} & { ${nestedKey}: ${isMany[j] ? `${nestedTargetType}[]` : `${nestedTargetType}${nestedNull}`} }`;
         }
       }
       const prevKey = path[i - 1];
       const prevTarget = targets[i - 1];
       if (prevKey && prevTarget) {
-        parts[parts.length - 1] = `${prevKey}: ${isMany[i - 1] ? `(Select${pascal(prevTarget)} & { ${key}: ${isMany[i] ? `${targetType}[]` : targetType} })[]` : `Select${pascal(prevTarget)} & { ${key}: ${isMany[i] ? `${targetType}[]` : targetType} }`}`;
+        const prevSource = i - 1 === 0 ? baseTable : targets[i - 2];
+        const innerNull = !isMany[i] && graph[prevTarget]?.[key]?.nullable ? " | null" : "";
+        const prevNullable = !isMany[i - 1] && graph[prevSource]?.[prevKey]?.nullable;
+        const inner = isMany[i] ? `${targetType}[]` : `${targetType}${innerNull}`;
+        const composite = `Select${pascal(prevTarget)} & { ${key}: ${inner} }`;
+        if (isMany[i - 1]) {
+          parts[parts.length - 1] = `${prevKey}: (${composite})[]`;
+        } else if (prevNullable) {
+          parts[parts.length - 1] = `${prevKey}: (${composite}) | null`;
+        } else {
+          parts[parts.length - 1] = `${prevKey}: ${composite}`;
+        }
       }
       break;
     }
@@ -689,8 +703,10 @@ function generateIncludeMethods(table, graph, opts, allTables) {
             }
             const combinedPath = [key1, key2];
             const combinedSuffix = `With${pascal(key1)}And${pascal(key2)}`;
-            const type1 = `${key1}: ${edge1.kind === "many" ? `Select${pascal(edge1.target)}[]` : `Select${pascal(edge1.target)}`}`;
-            const type2 = `${key2}: ${edge2.kind === "many" ? `Select${pascal(edge2.target)}[]` : `Select${pascal(edge2.target)}`}`;
+            const null1 = edge1.kind === "one" && edge1.nullable ? " | null" : "";
+            const null2 = edge2.kind === "one" && edge2.nullable ? " | null" : "";
+            const type1 = `${key1}: ${edge1.kind === "many" ? `Select${pascal(edge1.target)}[]` : `Select${pascal(edge1.target)}${null1}`}`;
+            const type2 = `${key2}: ${edge2.kind === "many" ? `Select${pascal(edge2.target)}[]` : `Select${pascal(edge2.target)}${null2}`}`;
             const combinedBaseType = `Select${pascal(baseTableName)} & { ${type1}; ${type2} }`;
             const combinedTypeName = `Select${pascal(baseTableName)}${combinedSuffix}`;
             methods.push({
@@ -2639,7 +2655,14 @@ function buildGraph(model) {
       const upKey = singular(parent.name);
       const downKey = plural(child.name);
       if (!(upKey in childNode)) {
-        childNode[upKey] = { from: child.name, key: upKey, kind: "one", target: parent.name };
+        const fkNullable = fk.from.some((colName) => child.columns.find((c) => c.name === colName)?.nullable);
+        childNode[upKey] = {
+          from: child.name,
+          key: upKey,
+          kind: "one",
+          target: parent.name,
+          ...fkNullable && { nullable: true }
+        };
       }
       if (!(downKey in parentNode)) {
         parentNode[downKey] = { from: parent.name, key: downKey, kind: "many", target: child.name };
@@ -2757,10 +2780,11 @@ function emitIncludeResolver(graph, useJsExtensions) {
           : Select${targetType}[]
       )`;
       } else {
+        const nullSuffix = edge.nullable ? " | null" : "";
         out += `(
         TInclude[K] extends { include: infer U extends ${targetType}IncludeSpec }
-          ? ${targetType}WithIncludes<U>
-          : Select${targetType}
+          ? ${targetType}WithIncludes<U>${nullSuffix}
+          : Select${targetType}${nullSuffix}
       )`;
       }
       out += ` :${isLast ? `

package/dist/index.js

@@ -582,7 +582,8 @@ function buildReturnType(baseTable, path, isMany, targets, graph) {
       continue;
     const targetType = `Select${pascal(target)}`;
     if (i === 0) {
-      parts.push(`${key}: ${isMany[i] ? `${targetType}[]` : targetType}`);
+      const edgeNull = !isMany[i] && graph[baseTable]?.[key]?.nullable ? " | null" : "";
+      parts.push(`${key}: ${isMany[i] ? `${targetType}[]` : `${targetType}${edgeNull}`}`);
     } else {
       let nestedType = targetType;
       for (let j = i;j < path.length; j++) {
@@ -592,13 +593,26 @@ function buildReturnType(baseTable, path, isMany, targets, graph) {
           if (!nestedKey || !nestedTarget)
             continue;
           const nestedTargetType = `Select${pascal(nestedTarget)}`;
-          nestedType = `${nestedType} & { ${nestedKey}: ${isMany[j] ? `${nestedTargetType}[]` : nestedTargetType} }`;
+          const nestedSource = targets[j - 1];
+          const nestedNull = !isMany[j] && graph[nestedSource]?.[nestedKey]?.nullable ? " | null" : "";
+          nestedType = `${nestedType} & { ${nestedKey}: ${isMany[j] ? `${nestedTargetType}[]` : `${nestedTargetType}${nestedNull}`} }`;
         }
       }
       const prevKey = path[i - 1];
       const prevTarget = targets[i - 1];
       if (prevKey && prevTarget) {
-        parts[parts.length - 1] = `${prevKey}: ${isMany[i - 1] ? `(Select${pascal(prevTarget)} & { ${key}: ${isMany[i] ? `${targetType}[]` : targetType} })[]` : `Select${pascal(prevTarget)} & { ${key}: ${isMany[i] ? `${targetType}[]` : targetType} }`}`;
+        const prevSource = i - 1 === 0 ? baseTable : targets[i - 2];
+        const innerNull = !isMany[i] && graph[prevTarget]?.[key]?.nullable ? " | null" : "";
+        const prevNullable = !isMany[i - 1] && graph[prevSource]?.[prevKey]?.nullable;
+        const inner = isMany[i] ? `${targetType}[]` : `${targetType}${innerNull}`;
+        const composite = `Select${pascal(prevTarget)} & { ${key}: ${inner} }`;
+        if (isMany[i - 1]) {
+          parts[parts.length - 1] = `${prevKey}: (${composite})[]`;
+        } else if (prevNullable) {
+          parts[parts.length - 1] = `${prevKey}: (${composite}) | null`;
+        } else {
+          parts[parts.length - 1] = `${prevKey}: ${composite}`;
+        }
       }
       break;
     }
@@ -688,8 +702,10 @@ function generateIncludeMethods(table, graph, opts, allTables) {
             }
             const combinedPath = [key1, key2];
             const combinedSuffix = `With${pascal(key1)}And${pascal(key2)}`;
-            const type1 = `${key1}: ${edge1.kind === "many" ? `Select${pascal(edge1.target)}[]` : `Select${pascal(edge1.target)}`}`;
-            const type2 = `${key2}: ${edge2.kind === "many" ? `Select${pascal(edge2.target)}[]` : `Select${pascal(edge2.target)}`}`;
+            const null1 = edge1.kind === "one" && edge1.nullable ? " | null" : "";
+            const null2 = edge2.kind === "one" && edge2.nullable ? " | null" : "";
+            const type1 = `${key1}: ${edge1.kind === "many" ? `Select${pascal(edge1.target)}[]` : `Select${pascal(edge1.target)}${null1}`}`;
+            const type2 = `${key2}: ${edge2.kind === "many" ? `Select${pascal(edge2.target)}[]` : `Select${pascal(edge2.target)}${null2}`}`;
             const combinedBaseType = `Select${pascal(baseTableName)} & { ${type1}; ${type2} }`;
             const combinedTypeName = `Select${pascal(baseTableName)}${combinedSuffix}`;
             methods.push({
@@ -1679,7 +1695,14 @@ function buildGraph(model) {
       const upKey = singular(parent.name);
       const downKey = plural(child.name);
       if (!(upKey in childNode)) {
-        childNode[upKey] = { from: child.name, key: upKey, kind: "one", target: parent.name };
+        const fkNullable = fk.from.some((colName) => child.columns.find((c) => c.name === colName)?.nullable);
+        childNode[upKey] = {
+          from: child.name,
+          key: upKey,
+          kind: "one",
+          target: parent.name,
+          ...fkNullable && { nullable: true }
+        };
       }
       if (!(downKey in parentNode)) {
         parentNode[downKey] = { from: parent.name, key: downKey, kind: "many", target: child.name };
@@ -1797,10 +1820,11 @@ function emitIncludeResolver(graph, useJsExtensions) {
           : Select${targetType}[]
       )`;
       } else {
+        const nullSuffix = edge.nullable ? " | null" : "";
         out += `(
         TInclude[K] extends { include: infer U extends ${targetType}IncludeSpec }
-          ? ${targetType}WithIncludes<U>
-          : Select${targetType}
+          ? ${targetType}WithIncludes<U>${nullSuffix}
+          : Select${targetType}${nullSuffix}
       )`;
       }
       out += ` :${isLast ? `

package/dist/rel-classify.d.ts

@@ -5,6 +5,8 @@ export type Edge = {
     kind: "one" | "many";
     target: string;
     via?: string;
+    /** True when the FK column(s) are nullable (belongs-to may return null). */
+    nullable?: boolean;
 };
 export type Graph = Record<string, Record<string, Edge>>;
 export declare function buildGraph(model: Model): Graph;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "postgresdk",
-  "version": "0.19.2",
+  "version": "0.19.3",
   "description": "Generate a typed server/client SDK from a Postgres schema (includes, Zod, Hono).",
   "type": "module",
   "bin": {
@@ -22,7 +22,7 @@
   },
   "scripts": {
     "build": "bun build src/cli.ts src/index.ts --outdir dist --target node --format esm --external=pg --external=zod --external=hono --external=prompts --external=node:* && tsc -p tsconfig.build.json --emitDeclarationOnly",
-    "test": "bun test:write-files && bun test:init && bun test:gen && bun test test/test-where-clause.test.ts && bun test test/test-where-or-and.test.ts && bun test test/test-nested-include-options.test.ts && bun test test/test-include-methods-with-options.test.ts && bun test:gen-with-tests && bun test:pull && bun test:enums && bun test:typecheck && bun test:drizzle-e2e && bun test test/test-numeric-mode-integration.test.ts && bun test test/test-jsonb-array-serialization.test.ts && bun test test/test-trigram-search.test.ts && bun test test/test-soft-delete-config.test.ts && bun test test/test-soft-delete-include-loader.test.ts && bun test test/test-soft-delete-nested-include.test.ts && bun test test/test-transaction.test.ts",
+    "test": "bun test:write-files && bun test:init && bun test:gen && bun test test/test-where-clause.test.ts && bun test test/test-where-or-and.test.ts && bun test test/test-nested-include-options.test.ts && bun test test/test-include-methods-with-options.test.ts && bun test:gen-with-tests && bun test:pull && bun test:enums && bun test:typecheck && bun test:drizzle-e2e && bun test test/test-numeric-mode-integration.test.ts && bun test test/test-jsonb-array-serialization.test.ts && bun test test/test-trigram-search.test.ts && bun test test/test-soft-delete-config.test.ts && bun test test/test-soft-delete-include-loader.test.ts && bun test test/test-soft-delete-nested-include.test.ts && bun test test/test-transaction.test.ts && bun test test/test-nullable-belongs-to.test.ts",
     "test:write-files": "bun test/test-write-files-if-changed.ts",
     "test:init": "bun test/test-init.ts",
     "test:gen": "bun test/test-gen.ts",