postgresdk 0.6.7 → 0.6.10

package/dist/cli.js

@@ -561,13 +561,6 @@ export default {
    */
   // includeDepthLimit: 3,
   
-  /**
-   * How to handle date/timestamp columns in TypeScript
-   * - "date": Use JavaScript Date objects
-   * - "string": Use ISO 8601 strings
-   * @default "date"
-   */
-  // dateType: "date",
   
   /**
    * Server framework for generated API routes
@@ -1005,7 +998,7 @@ function emitZod(table, opts) {
   const Type = pascal(table.name);
   const zFor = (pg) => {
     if (pg === "uuid")
-      return `z.string().uuid()`;
+      return `z.string()`;
     if (pg === "bool" || pg === "boolean")
       return `z.boolean()`;
     if (pg === "int2" || pg === "int4" || pg === "int8")
@@ -1015,7 +1008,7 @@ function emitZod(table, opts) {
     if (pg === "jsonb" || pg === "json")
       return `z.unknown()`;
     if (pg === "date" || pg.startsWith("timestamp"))
-      return opts.dateType === "date" ? `z.date()` : `z.string()`;
+      return `z.string()`;
     if (pg.startsWith("_"))
       return `z.array(${zFor(pg.slice(1))})`;
     return `z.string()`;
@@ -1764,7 +1757,7 @@ function tsTypeFor(pgType, opts) {
     return opts.numericMode === "number" ? "number" : "string";
   }
   if (t === "date" || t.startsWith("timestamp"))
-    return opts.dateType === "date" ? "Date" : "string";
+    return "string";
   if (t === "json" || t === "jsonb")
     return "unknown";
   return "string";
@@ -2364,14 +2357,57 @@ export async function deleteRecord(
 }
 
 // src/emit-tests.ts
-function emitTableTest(table, clientPath, framework = "vitest") {
+function emitTableTest(table, model, clientPath, framework = "vitest") {
   const Type = pascal(table.name);
   const tableName = table.name;
   const imports = getFrameworkImports(framework);
+  const isJunctionTable = table.pk.length > 1;
   const hasForeignKeys = table.fks.length > 0;
-  const foreignKeySetup = hasForeignKeys ? generateForeignKeySetup(table, clientPath) : null;
+  const foreignKeySetup = hasForeignKeys ? generateForeignKeySetup(table, model, clientPath) : null;
   const sampleData = generateSampleDataFromSchema(table, hasForeignKeys);
   const updateData = generateUpdateDataFromSchema(table);
+  if (isJunctionTable) {
+    return `${imports}
+import { SDK } from '${clientPath}';
+import type { Insert${Type}, Update${Type}, Select${Type} } from '${clientPath}/types/${tableName}';
+${foreignKeySetup?.imports || ""}
+
+/**
+ * Basic tests for ${tableName} table operations
+ * 
+ * This is a junction table with composite primary key.
+ * Tests are simplified since it represents a many-to-many relationship.
+ */
+describe('${Type} SDK Operations', () => {
+  let sdk: SDK;
+  ${foreignKeySetup?.variables || ""}
+  
+  beforeAll(async () => {
+    sdk = new SDK({ 
+      baseUrl: process.env.API_URL || 'http://localhost:3000',
+      auth: process.env.API_KEY ? { apiKey: process.env.API_KEY } : undefined
+    });
+    ${foreignKeySetup?.setup || ""}
+  });
+  
+  ${foreignKeySetup?.cleanup ? `afterAll(async () => {
+    ${foreignKeySetup.cleanup}
+  });
+  
+  ` : ""}it('should create a ${tableName} relationship', async () => {
+    const data: Insert${Type} = ${sampleData};
+    
+    const created = await sdk.${tableName}.create(data);
+    expect(created).toBeDefined();
+  });
+  
+  it('should list ${tableName} relationships', async () => {
+    const list = await sdk.${tableName}.list({ limit: 10 });
+    expect(Array.isArray(list)).toBe(true);
+  });
+});
+`;
+  }
   return `${imports}
 import { SDK } from '${clientPath}';
 import type { Insert${Type}, Update${Type}, Select${Type} } from '${clientPath}/types/${tableName}';
@@ -2632,33 +2668,56 @@ echo "  - To reset the database: docker-compose -f $SCRIPT_DIR/docker-compose.ym
 exit $TEST_EXIT_CODE
 `;
 }
-function generateForeignKeySetup(table, clientPath) {
+function generateForeignKeySetup(table, model, clientPath) {
   const imports = [];
   const variables = [];
   const setupStatements = [];
   const cleanupStatements = [];
-  const foreignTables = new Set;
+  const foreignTablesData = new Map;
   for (const fk of table.fks) {
-    const foreignTable = fk.toTable;
-    if (!foreignTables.has(foreignTable)) {
-      foreignTables.add(foreignTable);
-      const ForeignType = pascal(foreignTable);
-      imports.push(`import type { Insert${ForeignType} } from '${clientPath}/types/${foreignTable}';`);
-      variables.push(`let ${foreignTable}Id: string;`);
-      setupStatements.push(`
-    // Create parent ${foreignTable} record for foreign key reference
-    const ${foreignTable}Data: Insert${ForeignType} = ${generateMinimalDataForTable(foreignTable)};
-    const created${ForeignType} = await sdk.${foreignTable}.create(${foreignTable}Data);
-    ${foreignTable}Id = created${ForeignType}.id;`);
-      cleanupStatements.push(`
-    // Clean up parent ${foreignTable} record
-    if (${foreignTable}Id) {
+    const foreignTableName = fk.toTable;
+    if (!foreignTablesData.has(foreignTableName)) {
+      const foreignTable = model.tables[foreignTableName];
+      if (!foreignTable)
+        continue;
+      foreignTablesData.set(foreignTableName, foreignTable);
+      const ForeignType = pascal(foreignTableName);
+      imports.push(`import type { Insert${ForeignType} } from '${clientPath}/types/${foreignTableName}';`);
+      if (foreignTable.pk.length === 1) {
+        variables.push(`let ${foreignTableName}Id: string;`);
+        const foreignData = generateSampleDataFromSchema(foreignTable, false);
+        setupStatements.push(`
+    // Create parent ${foreignTableName} record for foreign key reference
+    const ${foreignTableName}Data: Insert${ForeignType} = ${foreignData};
+    const created${ForeignType} = await sdk.${foreignTableName}.create(${foreignTableName}Data);
+    ${foreignTableName}Id = created${ForeignType}.${foreignTable.pk[0]};`);
+        cleanupStatements.push(`
+    // Clean up parent ${foreignTableName} record
+    if (${foreignTableName}Id) {
+      try {
+        await sdk.${foreignTableName}.delete(${foreignTableName}Id);
+      } catch (e) {
+        // Parent might already be deleted due to cascading
+      }
+    }`);
+      } else {
+        variables.push(`let ${foreignTableName}Key: any;`);
+        const foreignData = generateSampleDataFromSchema(foreignTable, false);
+        setupStatements.push(`
+    // Create parent ${foreignTableName} record for foreign key reference
+    const ${foreignTableName}Data: Insert${ForeignType} = ${foreignData};
+    const created${ForeignType} = await sdk.${foreignTableName}.create(${foreignTableName}Data);
+    ${foreignTableName}Key = { ${foreignTable.pk.map((pk) => `${pk}: created${ForeignType}.${pk}`).join(", ")} };`);
+        cleanupStatements.push(`
+    // Clean up parent ${foreignTableName} record
+    if (${foreignTableName}Key) {
       try {
-        await sdk.${foreignTable}.delete(${foreignTable}Id);
+        await sdk.${foreignTableName}.delete(${foreignTableName}Key);
       } catch (e) {
         // Parent might already be deleted due to cascading
       }
     }`);
+      }
     }
   }
   return {
@@ -2670,30 +2729,6 @@ function generateForeignKeySetup(table, clientPath) {
     cleanup: cleanupStatements.join("")
   };
 }
-function generateMinimalDataForTable(tableName) {
-  if (tableName.includes("author")) {
-    return `{ name: 'Test Author' }`;
-  }
-  if (tableName.includes("book")) {
-    return `{ title: 'Test Book' }`;
-  }
-  if (tableName.includes("tag")) {
-    return `{ name: 'Test Tag' }`;
-  }
-  if (tableName.includes("user")) {
-    return `{ name: 'Test User', email: 'test@example.com' }`;
-  }
-  if (tableName.includes("category") || tableName.includes("categories")) {
-    return `{ name: 'Test Category' }`;
-  }
-  if (tableName.includes("product")) {
-    return `{ name: 'Test Product', price: 10.99 }`;
-  }
-  if (tableName.includes("order")) {
-    return `{ total: 100.00, status: 'pending' }`;
-  }
-  return `{ name: 'Test ${pascal(tableName)}' }`;
-}
 function getTestCommand(framework, baseCommand) {
   switch (framework) {
     case "vitest":
@@ -2732,31 +2767,22 @@ function generateSampleDataFromSchema(table, hasForeignKeys = false) {
     }
   }
   for (const col of table.columns) {
-    if (col.hasDefault) {
-      const autoGenerated = ["id", "created_at", "updated_at", "created", "updated", "modified_at"];
-      if (autoGenerated.includes(col.name.toLowerCase())) {
-        continue;
-      }
+    const isAutoGenerated = col.hasDefault && ["id", "created_at", "updated_at", "created", "updated", "modified_at"].includes(col.name.toLowerCase());
+    const isPrimaryKey = table.pk.includes(col.name);
+    if (isPrimaryKey && col.hasDefault) {
+      continue;
     }
-    if (col.name === "deleted_at" || col.name === "deleted") {
+    if (isAutoGenerated) {
       continue;
     }
-    if (!col.nullable) {
-      const foreignTable = foreignKeyColumns.get(col.name);
+    const foreignTable = foreignKeyColumns.get(col.name);
+    if (!col.nullable || foreignTable || isPrimaryKey) {
       if (foreignTable) {
         fields.push(`    ${col.name}: ${foreignTable}Id`);
       } else {
         const value = generateValueForColumn(col);
         fields.push(`    ${col.name}: ${value}`);
       }
-    } else {
-      const foreignTable = foreignKeyColumns.get(col.name);
-      if (foreignTable) {
-        fields.push(`    ${col.name}: ${foreignTable}Id`);
-      } else if (shouldIncludeNullableColumn(col)) {
-        const value = generateValueForColumn(col);
-        fields.push(`    ${col.name}: ${value}`);
-      }
     }
   }
   return fields.length > 0 ? `{
@@ -2767,126 +2793,50 @@ ${fields.join(`,
 function generateUpdateDataFromSchema(table) {
   const fields = [];
   for (const col of table.columns) {
-    if (table.pk.includes(col.name) || col.hasDefault) {
-      const autoGenerated = ["id", "created_at", "updated_at", "created", "updated", "modified_at"];
-      if (autoGenerated.includes(col.name.toLowerCase())) {
-        continue;
-      }
+    if (table.pk.includes(col.name)) {
+      continue;
     }
-    if (col.name.endsWith("_id")) {
+    const isAutoGenerated = col.hasDefault && ["id", "created_at", "updated_at", "created", "updated", "modified_at"].includes(col.name.toLowerCase());
+    if (isAutoGenerated) {
       continue;
     }
-    if (col.name === "deleted_at" || col.name === "deleted") {
+    if (col.name.endsWith("_id")) {
       continue;
     }
-    if (!col.nullable || shouldIncludeNullableColumn(col)) {
+    if (!col.nullable) {
       const value = generateValueForColumn(col, true);
       fields.push(`    ${col.name}: ${value}`);
       break;
     }
   }
+  if (fields.length === 0) {
+    for (const col of table.columns) {
+      if (table.pk.includes(col.name) || col.name.endsWith("_id")) {
+        continue;
+      }
+      const isAutoGenerated = col.hasDefault && ["id", "created_at", "updated_at", "created", "updated", "modified_at"].includes(col.name.toLowerCase());
+      if (!isAutoGenerated) {
+        const value = generateValueForColumn(col, true);
+        fields.push(`    ${col.name}: ${value}`);
+        break;
+      }
+    }
+  }
   return fields.length > 0 ? `{
 ${fields.join(`,
 `)}
   }` : "{}";
 }
-function shouldIncludeNullableColumn(col) {
-  const importantPatterns = [
-    "_id",
-    "_by",
-    "email",
-    "name",
-    "title",
-    "description",
-    "phone",
-    "address",
-    "status",
-    "type",
-    "category",
-    "price",
-    "amount",
-    "quantity",
-    "url",
-    "slug"
-  ];
-  const name = col.name.toLowerCase();
-  return importantPatterns.some((pattern) => name.includes(pattern));
-}
 function generateValueForColumn(col, isUpdate = false) {
-  const name = col.name.toLowerCase();
   const type = col.pgType.toLowerCase();
-  if (name.includes("email")) {
-    return `'test${isUpdate ? ".updated" : ""}@example.com'`;
-  }
-  if (name.includes("phone")) {
-    return `'555-${isUpdate ? "0200" : "0100"}'`;
-  }
-  if (name.includes("url") || name.includes("website")) {
-    return `'https://example.com${isUpdate ? "/updated" : ""}'`;
-  }
-  if (name.includes("password")) {
-    return `'hashedPassword123'`;
-  }
-  if (name === "name" || name.includes("_name") || name.includes("name_")) {
-    return `'Test ${pascal(col.name)}${isUpdate ? " Updated" : ""}'`;
-  }
-  if (name === "title" || name.includes("title")) {
-    return `'Test Title${isUpdate ? " Updated" : ""}'`;
-  }
-  if (name.includes("description") || name === "bio" || name === "about") {
-    return `'Test description${isUpdate ? " updated" : ""}'`;
-  }
-  if (name === "slug") {
-    return `'test-slug${isUpdate ? "-updated" : ""}'`;
-  }
-  if (name === "status") {
-    return `'${isUpdate ? "updated" : "active"}'`;
-  }
-  if (name === "type" || name === "kind" || name === "category") {
-    return `'${isUpdate ? "type2" : "type1"}'`;
-  }
-  if (name === "color" || name === "colour") {
-    return `'${isUpdate ? "#FF0000" : "#0000FF"}'`;
-  }
-  if (name === "gender") {
-    return `'${isUpdate ? "F" : "M"}'`;
-  }
-  if (name.includes("price") || name === "cost" || name === "amount") {
-    return isUpdate ? "99.99" : "10.50";
-  }
-  if (name === "quantity" || name === "count" || name.includes("qty")) {
-    return isUpdate ? "5" : "1";
-  }
-  if (name === "age") {
-    return isUpdate ? "30" : "25";
-  }
-  if (name.includes("percent") || name === "rate" || name === "ratio") {
-    return isUpdate ? "0.75" : "0.5";
-  }
-  if (name.includes("latitude") || name === "lat") {
-    return "40.7128";
-  }
-  if (name.includes("longitude") || name === "lng" || name === "lon") {
-    return "-74.0060";
-  }
-  if (type.includes("date") || type.includes("timestamp")) {
-    if (name.includes("birth") || name === "dob") {
-      return `new Date('1990-01-01')`;
-    }
-    if (name.includes("end") || name.includes("expire")) {
-      return `new Date('2025-12-31')`;
-    }
-    if (name.includes("start") || name.includes("begin")) {
-      return `new Date('2024-01-01')`;
-    }
-    return `new Date()`;
-  }
   switch (type) {
     case "text":
     case "varchar":
     case "char":
     case "character varying":
-      return `'test_value${isUpdate ? "_updated" : ""}'`;
+    case "bpchar":
+    case "name":
+      return `'str_${Math.random().toString(36).substring(7)}'`;
     case "int":
     case "int2":
     case "int4":
@@ -2894,6 +2844,8 @@ function generateValueForColumn(col, isUpdate = false) {
     case "integer":
     case "smallint":
     case "bigint":
+    case "serial":
+    case "bigserial":
       return isUpdate ? "42" : "1";
     case "decimal":
     case "numeric":
@@ -2902,60 +2854,98 @@ function generateValueForColumn(col, isUpdate = false) {
     case "float":
     case "float4":
     case "float8":
+    case "money":
       return isUpdate ? "99.99" : "10.50";
     case "boolean":
     case "bool":
       return isUpdate ? "false" : "true";
+    case "date":
+      return `'2024-01-01'`;
+    case "timestamp":
+    case "timestamptz":
+    case "timestamp without time zone":
+    case "timestamp with time zone":
+      return `'2024-01-01T00:00:00.000Z'`;
+    case "time":
+    case "timetz":
+    case "time without time zone":
+    case "time with time zone":
+      return `'12:00:00'`;
+    case "interval":
+      return `'1 day'`;
     case "json":
     case "jsonb":
-      return `{ key: '${isUpdate ? "updated" : "value"}' }`;
+      return `{}`;
     case "uuid":
-      return `'${isUpdate ? "550e8400-e29b-41d4-a716-446655440001" : "550e8400-e29b-41d4-a716-446655440000"}'`;
+      return `'${generateUUID()}'`;
     case "inet":
-      return `'${isUpdate ? "192.168.1.2" : "192.168.1.1"}'`;
+      return `'192.168.1.1'`;
     case "cidr":
       return `'192.168.1.0/24'`;
     case "macaddr":
-      return `'08:00:2b:01:02:0${isUpdate ? "4" : "3"}'`;
+    case "macaddr8":
+      return `'08:00:2b:01:02:03'`;
+    case "point":
+      return `'(1,2)'`;
+    case "line":
+      return `'{1,2,3}'`;
+    case "lseg":
+      return `'[(0,0),(1,1)]'`;
+    case "box":
+      return `'((0,0),(1,1))'`;
+    case "path":
+      return `'[(0,0),(1,1),(2,0)]'`;
+    case "polygon":
+      return `'((0,0),(1,1),(1,0))'`;
+    case "circle":
+      return `'<(0,0),1>'`;
+    case "bit":
+    case "bit varying":
+    case "varbit":
+      return `'101'`;
+    case "bytea":
+      return `'\\\\x0102'`;
     case "xml":
-      return `'<root>${isUpdate ? "updated" : "value"}</root>'`;
+      return `'<root/>'`;
+    case "tsvector":
+      return `'a fat cat'`;
+    case "tsquery":
+      return `'fat & cat'`;
+    case "oid":
+    case "regproc":
+    case "regprocedure":
+    case "regoper":
+    case "regoperator":
+    case "regclass":
+    case "regtype":
+    case "regconfig":
+    case "regdictionary":
+      return "1";
     default:
-      if (type.endsWith("[]")) {
-        const baseType = type.slice(0, -2);
-        if (baseType === "text" || baseType === "varchar") {
-          return `['item1', 'item2${isUpdate ? "_updated" : ""}']`;
-        }
-        if (baseType === "int" || baseType === "integer") {
-          return `[1, 2, ${isUpdate ? "3" : ""}]`;
-        }
+      if (type.endsWith("[]") || type.startsWith("_")) {
         return `[]`;
       }
-      return `'test${isUpdate ? "_updated" : ""}'`;
+      return `'value1'`;
   }
 }
+function generateUUID() {
+  return "xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx".replace(/[xy]/g, function(c) {
+    const r = Math.random() * 16 | 0;
+    const v = c === "x" ? r : r & 3 | 8;
+    return v.toString(16);
+  });
+}
 function generateTestCases(table, sampleData, updateData, hasForeignKeys = false) {
   const Type = pascal(table.name);
   const hasData = sampleData !== "{}";
-  const isJunctionTable = table.pk.length > 1 && table.columns.every((col) => table.pk.includes(col.name) || col.name.endsWith("_id"));
-  if (isJunctionTable) {
-    return `it('should create a ${table.name} relationship', async () => {
-    // This is a junction table for M:N relationships
-    // Test data depends on parent records created in other tests
-    expect(true).toBe(true);
-  });
-  
-  it('should list ${table.name} relationships', async () => {
-    const list = await sdk.${table.name}.list({ limit: 10 });
-    expect(Array.isArray(list)).toBe(true);
-  });`;
-  }
+  const hasSinglePK = table.pk.length === 1;
   return `it('should create a ${table.name}', async () => {
     const data: Insert${Type} = ${sampleData};
     ${hasData ? `
     const created = await sdk.${table.name}.create(data);
     expect(created).toBeDefined();
-    expect(created.id).toBeDefined();
-    createdId = created.id;
+    ${hasSinglePK ? `expect(created.${table.pk[0]}).toBeDefined();
+    createdId = created.${table.pk[0]};` : ""}
     ` : `
     // Table has only auto-generated columns
     // Skip create test or add your own test data
@@ -2968,7 +2958,7 @@ function generateTestCases(table, sampleData, updateData, hasForeignKeys = false
     expect(Array.isArray(list)).toBe(true);
   });
   
-  ${hasData ? `it('should get ${table.name} by id', async () => {
+  ${hasData && hasSinglePK ? `it('should get ${table.name} by id', async () => {
     if (!createdId) {
       console.warn('No ID from create test, skipping get test');
       return;
@@ -2976,7 +2966,7 @@ function generateTestCases(table, sampleData, updateData, hasForeignKeys = false
     
     const item = await sdk.${table.name}.getByPk(createdId);
     expect(item).toBeDefined();
-    expect(item?.id).toBe(createdId);
+    expect(item?.${table.pk[0]}).toBe(createdId);
   });
   
   ${updateData !== "{}" ? `it('should update ${table.name}', async () => {
@@ -3334,7 +3324,6 @@ async function generate(configPath) {
   if (sameDirectory) {
     clientDir = join(originalClientDir, "sdk");
   }
-  const normDateType = cfg.dateType === "string" ? "string" : "date";
   const serverFramework = cfg.serverFramework || "hono";
   const generateTests = cfg.tests?.generate ?? false;
   const originalTestDir = cfg.tests?.output || "./api/tests";
@@ -3378,12 +3367,12 @@ async function generate(configPath) {
     content: emitCoreOperations()
   });
   for (const table of Object.values(model.tables)) {
-    const typesSrc = emitTypes(table, { dateType: normDateType, numericMode: "string" });
+    const typesSrc = emitTypes(table, { numericMode: "string" });
     files.push({ path: join(serverDir, "types", `${table.name}.ts`), content: typesSrc });
     files.push({ path: join(clientDir, "types", `${table.name}.ts`), content: typesSrc });
     files.push({
       path: join(serverDir, "zod", `${table.name}.ts`),
-      content: emitZod(table, { dateType: normDateType, numericMode: "string" })
+      content: emitZod(table, { numericMode: "string" })
     });
     let routeContent;
     if (serverFramework === "hono") {
@@ -3454,7 +3443,7 @@ async function generate(configPath) {
     for (const table of Object.values(model.tables)) {
       files.push({
         path: join(testDir, `${table.name}.test.ts`),
-        content: emitTableTest(table, relativeClientPath, testFramework)
+        content: emitTableTest(table, model, relativeClientPath, testFramework)
       });
     }
   }

package/dist/emit-tests.d.ts

@@ -1,8 +1,8 @@
-import type { Table } from "./introspect";
+import type { Table, Model } from "./introspect";
 /**
  * Generate basic SDK tests for a table
  */
-export declare function emitTableTest(table: Table, clientPath: string, framework?: "vitest" | "jest" | "bun"): string;
+export declare function emitTableTest(table: Table, model: Model, clientPath: string, framework?: "vitest" | "jest" | "bun"): string;
 /**
  * Generate a test setup file
  */

package/dist/emit-types.d.ts

@@ -1,5 +1,4 @@
 import type { Table } from "./introspect";
 export declare function emitTypes(table: Table, opts: {
-    dateType: "date" | "string";
     numericMode: "string" | "number";
 }): string;

package/dist/emit-zod.d.ts

@@ -1,5 +1,4 @@
 import type { Table } from "./introspect";
 export declare function emitZod(table: Table, opts: {
-    dateType: "date" | "string";
     numericMode: "string" | "number";
 }): string;

package/dist/index.js

@@ -735,7 +735,7 @@ function emitZod(table, opts) {
   const Type = pascal(table.name);
   const zFor = (pg) => {
     if (pg === "uuid")
-      return `z.string().uuid()`;
+      return `z.string()`;
     if (pg === "bool" || pg === "boolean")
       return `z.boolean()`;
     if (pg === "int2" || pg === "int4" || pg === "int8")
@@ -745,7 +745,7 @@ function emitZod(table, opts) {
     if (pg === "jsonb" || pg === "json")
       return `z.unknown()`;
     if (pg === "date" || pg.startsWith("timestamp"))
-      return opts.dateType === "date" ? `z.date()` : `z.string()`;
+      return `z.string()`;
     if (pg.startsWith("_"))
       return `z.array(${zFor(pg.slice(1))})`;
     return `z.string()`;
@@ -1494,7 +1494,7 @@ function tsTypeFor(pgType, opts) {
     return opts.numericMode === "number" ? "number" : "string";
   }
   if (t === "date" || t.startsWith("timestamp"))
-    return opts.dateType === "date" ? "Date" : "string";
+    return "string";
   if (t === "json" || t === "jsonb")
     return "unknown";
   return "string";
@@ -2094,14 +2094,57 @@ export async function deleteRecord(
 }
 
 // src/emit-tests.ts
-function emitTableTest(table, clientPath, framework = "vitest") {
+function emitTableTest(table, model, clientPath, framework = "vitest") {
   const Type = pascal(table.name);
   const tableName = table.name;
   const imports = getFrameworkImports(framework);
+  const isJunctionTable = table.pk.length > 1;
   const hasForeignKeys = table.fks.length > 0;
-  const foreignKeySetup = hasForeignKeys ? generateForeignKeySetup(table, clientPath) : null;
+  const foreignKeySetup = hasForeignKeys ? generateForeignKeySetup(table, model, clientPath) : null;
   const sampleData = generateSampleDataFromSchema(table, hasForeignKeys);
   const updateData = generateUpdateDataFromSchema(table);
+  if (isJunctionTable) {
+    return `${imports}
+import { SDK } from '${clientPath}';
+import type { Insert${Type}, Update${Type}, Select${Type} } from '${clientPath}/types/${tableName}';
+${foreignKeySetup?.imports || ""}
+
+/**
+ * Basic tests for ${tableName} table operations
+ * 
+ * This is a junction table with composite primary key.
+ * Tests are simplified since it represents a many-to-many relationship.
+ */
+describe('${Type} SDK Operations', () => {
+  let sdk: SDK;
+  ${foreignKeySetup?.variables || ""}
+  
+  beforeAll(async () => {
+    sdk = new SDK({ 
+      baseUrl: process.env.API_URL || 'http://localhost:3000',
+      auth: process.env.API_KEY ? { apiKey: process.env.API_KEY } : undefined
+    });
+    ${foreignKeySetup?.setup || ""}
+  });
+  
+  ${foreignKeySetup?.cleanup ? `afterAll(async () => {
+    ${foreignKeySetup.cleanup}
+  });
+  
+  ` : ""}it('should create a ${tableName} relationship', async () => {
+    const data: Insert${Type} = ${sampleData};
+    
+    const created = await sdk.${tableName}.create(data);
+    expect(created).toBeDefined();
+  });
+  
+  it('should list ${tableName} relationships', async () => {
+    const list = await sdk.${tableName}.list({ limit: 10 });
+    expect(Array.isArray(list)).toBe(true);
+  });
+});
+`;
+  }
   return `${imports}
 import { SDK } from '${clientPath}';
 import type { Insert${Type}, Update${Type}, Select${Type} } from '${clientPath}/types/${tableName}';
@@ -2362,33 +2405,56 @@ echo "  - To reset the database: docker-compose -f $SCRIPT_DIR/docker-compose.ym
 exit $TEST_EXIT_CODE
 `;
 }
-function generateForeignKeySetup(table, clientPath) {
+function generateForeignKeySetup(table, model, clientPath) {
   const imports = [];
   const variables = [];
   const setupStatements = [];
   const cleanupStatements = [];
-  const foreignTables = new Set;
+  const foreignTablesData = new Map;
   for (const fk of table.fks) {
-    const foreignTable = fk.toTable;
-    if (!foreignTables.has(foreignTable)) {
-      foreignTables.add(foreignTable);
-      const ForeignType = pascal(foreignTable);
-      imports.push(`import type { Insert${ForeignType} } from '${clientPath}/types/${foreignTable}';`);
-      variables.push(`let ${foreignTable}Id: string;`);
-      setupStatements.push(`
-    // Create parent ${foreignTable} record for foreign key reference
-    const ${foreignTable}Data: Insert${ForeignType} = ${generateMinimalDataForTable(foreignTable)};
-    const created${ForeignType} = await sdk.${foreignTable}.create(${foreignTable}Data);
-    ${foreignTable}Id = created${ForeignType}.id;`);
-      cleanupStatements.push(`
-    // Clean up parent ${foreignTable} record
-    if (${foreignTable}Id) {
+    const foreignTableName = fk.toTable;
+    if (!foreignTablesData.has(foreignTableName)) {
+      const foreignTable = model.tables[foreignTableName];
+      if (!foreignTable)
+        continue;
+      foreignTablesData.set(foreignTableName, foreignTable);
+      const ForeignType = pascal(foreignTableName);
+      imports.push(`import type { Insert${ForeignType} } from '${clientPath}/types/${foreignTableName}';`);
+      if (foreignTable.pk.length === 1) {
+        variables.push(`let ${foreignTableName}Id: string;`);
+        const foreignData = generateSampleDataFromSchema(foreignTable, false);
+        setupStatements.push(`
+    // Create parent ${foreignTableName} record for foreign key reference
+    const ${foreignTableName}Data: Insert${ForeignType} = ${foreignData};
+    const created${ForeignType} = await sdk.${foreignTableName}.create(${foreignTableName}Data);
+    ${foreignTableName}Id = created${ForeignType}.${foreignTable.pk[0]};`);
+        cleanupStatements.push(`
+    // Clean up parent ${foreignTableName} record
+    if (${foreignTableName}Id) {
+      try {
+        await sdk.${foreignTableName}.delete(${foreignTableName}Id);
+      } catch (e) {
+        // Parent might already be deleted due to cascading
+      }
+    }`);
+      } else {
+        variables.push(`let ${foreignTableName}Key: any;`);
+        const foreignData = generateSampleDataFromSchema(foreignTable, false);
+        setupStatements.push(`
+    // Create parent ${foreignTableName} record for foreign key reference
+    const ${foreignTableName}Data: Insert${ForeignType} = ${foreignData};
+    const created${ForeignType} = await sdk.${foreignTableName}.create(${foreignTableName}Data);
+    ${foreignTableName}Key = { ${foreignTable.pk.map((pk) => `${pk}: created${ForeignType}.${pk}`).join(", ")} };`);
+        cleanupStatements.push(`
+    // Clean up parent ${foreignTableName} record
+    if (${foreignTableName}Key) {
       try {
-        await sdk.${foreignTable}.delete(${foreignTable}Id);
+        await sdk.${foreignTableName}.delete(${foreignTableName}Key);
       } catch (e) {
         // Parent might already be deleted due to cascading
       }
     }`);
+      }
     }
   }
   return {
@@ -2400,30 +2466,6 @@ function generateForeignKeySetup(table, clientPath) {
     cleanup: cleanupStatements.join("")
   };
 }
-function generateMinimalDataForTable(tableName) {
-  if (tableName.includes("author")) {
-    return `{ name: 'Test Author' }`;
-  }
-  if (tableName.includes("book")) {
-    return `{ title: 'Test Book' }`;
-  }
-  if (tableName.includes("tag")) {
-    return `{ name: 'Test Tag' }`;
-  }
-  if (tableName.includes("user")) {
-    return `{ name: 'Test User', email: 'test@example.com' }`;
-  }
-  if (tableName.includes("category") || tableName.includes("categories")) {
-    return `{ name: 'Test Category' }`;
-  }
-  if (tableName.includes("product")) {
-    return `{ name: 'Test Product', price: 10.99 }`;
-  }
-  if (tableName.includes("order")) {
-    return `{ total: 100.00, status: 'pending' }`;
-  }
-  return `{ name: 'Test ${pascal(tableName)}' }`;
-}
 function getTestCommand(framework, baseCommand) {
   switch (framework) {
     case "vitest":
@@ -2462,31 +2504,22 @@ function generateSampleDataFromSchema(table, hasForeignKeys = false) {
     }
   }
   for (const col of table.columns) {
-    if (col.hasDefault) {
-      const autoGenerated = ["id", "created_at", "updated_at", "created", "updated", "modified_at"];
-      if (autoGenerated.includes(col.name.toLowerCase())) {
-        continue;
-      }
+    const isAutoGenerated = col.hasDefault && ["id", "created_at", "updated_at", "created", "updated", "modified_at"].includes(col.name.toLowerCase());
+    const isPrimaryKey = table.pk.includes(col.name);
+    if (isPrimaryKey && col.hasDefault) {
+      continue;
     }
-    if (col.name === "deleted_at" || col.name === "deleted") {
+    if (isAutoGenerated) {
       continue;
     }
-    if (!col.nullable) {
-      const foreignTable = foreignKeyColumns.get(col.name);
+    const foreignTable = foreignKeyColumns.get(col.name);
+    if (!col.nullable || foreignTable || isPrimaryKey) {
       if (foreignTable) {
         fields.push(`    ${col.name}: ${foreignTable}Id`);
       } else {
         const value = generateValueForColumn(col);
         fields.push(`    ${col.name}: ${value}`);
       }
-    } else {
-      const foreignTable = foreignKeyColumns.get(col.name);
-      if (foreignTable) {
-        fields.push(`    ${col.name}: ${foreignTable}Id`);
-      } else if (shouldIncludeNullableColumn(col)) {
-        const value = generateValueForColumn(col);
-        fields.push(`    ${col.name}: ${value}`);
-      }
     }
   }
   return fields.length > 0 ? `{
@@ -2497,126 +2530,50 @@ ${fields.join(`,
 function generateUpdateDataFromSchema(table) {
   const fields = [];
   for (const col of table.columns) {
-    if (table.pk.includes(col.name) || col.hasDefault) {
-      const autoGenerated = ["id", "created_at", "updated_at", "created", "updated", "modified_at"];
-      if (autoGenerated.includes(col.name.toLowerCase())) {
-        continue;
-      }
+    if (table.pk.includes(col.name)) {
+      continue;
     }
-    if (col.name.endsWith("_id")) {
+    const isAutoGenerated = col.hasDefault && ["id", "created_at", "updated_at", "created", "updated", "modified_at"].includes(col.name.toLowerCase());
+    if (isAutoGenerated) {
       continue;
     }
-    if (col.name === "deleted_at" || col.name === "deleted") {
+    if (col.name.endsWith("_id")) {
       continue;
     }
-    if (!col.nullable || shouldIncludeNullableColumn(col)) {
+    if (!col.nullable) {
       const value = generateValueForColumn(col, true);
       fields.push(`    ${col.name}: ${value}`);
       break;
     }
   }
+  if (fields.length === 0) {
+    for (const col of table.columns) {
+      if (table.pk.includes(col.name) || col.name.endsWith("_id")) {
+        continue;
+      }
+      const isAutoGenerated = col.hasDefault && ["id", "created_at", "updated_at", "created", "updated", "modified_at"].includes(col.name.toLowerCase());
+      if (!isAutoGenerated) {
+        const value = generateValueForColumn(col, true);
+        fields.push(`    ${col.name}: ${value}`);
+        break;
+      }
+    }
+  }
   return fields.length > 0 ? `{
 ${fields.join(`,
 `)}
   }` : "{}";
 }
-function shouldIncludeNullableColumn(col) {
-  const importantPatterns = [
-    "_id",
-    "_by",
-    "email",
-    "name",
-    "title",
-    "description",
-    "phone",
-    "address",
-    "status",
-    "type",
-    "category",
-    "price",
-    "amount",
-    "quantity",
-    "url",
-    "slug"
-  ];
-  const name = col.name.toLowerCase();
-  return importantPatterns.some((pattern) => name.includes(pattern));
-}
 function generateValueForColumn(col, isUpdate = false) {
-  const name = col.name.toLowerCase();
   const type = col.pgType.toLowerCase();
-  if (name.includes("email")) {
-    return `'test${isUpdate ? ".updated" : ""}@example.com'`;
-  }
-  if (name.includes("phone")) {
-    return `'555-${isUpdate ? "0200" : "0100"}'`;
-  }
-  if (name.includes("url") || name.includes("website")) {
-    return `'https://example.com${isUpdate ? "/updated" : ""}'`;
-  }
-  if (name.includes("password")) {
-    return `'hashedPassword123'`;
-  }
-  if (name === "name" || name.includes("_name") || name.includes("name_")) {
-    return `'Test ${pascal(col.name)}${isUpdate ? " Updated" : ""}'`;
-  }
-  if (name === "title" || name.includes("title")) {
-    return `'Test Title${isUpdate ? " Updated" : ""}'`;
-  }
-  if (name.includes("description") || name === "bio" || name === "about") {
-    return `'Test description${isUpdate ? " updated" : ""}'`;
-  }
-  if (name === "slug") {
-    return `'test-slug${isUpdate ? "-updated" : ""}'`;
-  }
-  if (name === "status") {
-    return `'${isUpdate ? "updated" : "active"}'`;
-  }
-  if (name === "type" || name === "kind" || name === "category") {
-    return `'${isUpdate ? "type2" : "type1"}'`;
-  }
-  if (name === "color" || name === "colour") {
-    return `'${isUpdate ? "#FF0000" : "#0000FF"}'`;
-  }
-  if (name === "gender") {
-    return `'${isUpdate ? "F" : "M"}'`;
-  }
-  if (name.includes("price") || name === "cost" || name === "amount") {
-    return isUpdate ? "99.99" : "10.50";
-  }
-  if (name === "quantity" || name === "count" || name.includes("qty")) {
-    return isUpdate ? "5" : "1";
-  }
-  if (name === "age") {
-    return isUpdate ? "30" : "25";
-  }
-  if (name.includes("percent") || name === "rate" || name === "ratio") {
-    return isUpdate ? "0.75" : "0.5";
-  }
-  if (name.includes("latitude") || name === "lat") {
-    return "40.7128";
-  }
-  if (name.includes("longitude") || name === "lng" || name === "lon") {
-    return "-74.0060";
-  }
-  if (type.includes("date") || type.includes("timestamp")) {
-    if (name.includes("birth") || name === "dob") {
-      return `new Date('1990-01-01')`;
-    }
-    if (name.includes("end") || name.includes("expire")) {
-      return `new Date('2025-12-31')`;
-    }
-    if (name.includes("start") || name.includes("begin")) {
-      return `new Date('2024-01-01')`;
-    }
-    return `new Date()`;
-  }
   switch (type) {
     case "text":
     case "varchar":
     case "char":
     case "character varying":
-      return `'test_value${isUpdate ? "_updated" : ""}'`;
+    case "bpchar":
+    case "name":
+      return `'str_${Math.random().toString(36).substring(7)}'`;
     case "int":
     case "int2":
     case "int4":
@@ -2624,6 +2581,8 @@ function generateValueForColumn(col, isUpdate = false) {
     case "integer":
     case "smallint":
     case "bigint":
+    case "serial":
+    case "bigserial":
       return isUpdate ? "42" : "1";
     case "decimal":
     case "numeric":
@@ -2632,60 +2591,98 @@ function generateValueForColumn(col, isUpdate = false) {
     case "float":
     case "float4":
     case "float8":
+    case "money":
       return isUpdate ? "99.99" : "10.50";
     case "boolean":
     case "bool":
       return isUpdate ? "false" : "true";
+    case "date":
+      return `'2024-01-01'`;
+    case "timestamp":
+    case "timestamptz":
+    case "timestamp without time zone":
+    case "timestamp with time zone":
+      return `'2024-01-01T00:00:00.000Z'`;
+    case "time":
+    case "timetz":
+    case "time without time zone":
+    case "time with time zone":
+      return `'12:00:00'`;
+    case "interval":
+      return `'1 day'`;
     case "json":
     case "jsonb":
-      return `{ key: '${isUpdate ? "updated" : "value"}' }`;
+      return `{}`;
     case "uuid":
-      return `'${isUpdate ? "550e8400-e29b-41d4-a716-446655440001" : "550e8400-e29b-41d4-a716-446655440000"}'`;
+      return `'${generateUUID()}'`;
     case "inet":
-      return `'${isUpdate ? "192.168.1.2" : "192.168.1.1"}'`;
+      return `'192.168.1.1'`;
     case "cidr":
       return `'192.168.1.0/24'`;
     case "macaddr":
-      return `'08:00:2b:01:02:0${isUpdate ? "4" : "3"}'`;
+    case "macaddr8":
+      return `'08:00:2b:01:02:03'`;
+    case "point":
+      return `'(1,2)'`;
+    case "line":
+      return `'{1,2,3}'`;
+    case "lseg":
+      return `'[(0,0),(1,1)]'`;
+    case "box":
+      return `'((0,0),(1,1))'`;
+    case "path":
+      return `'[(0,0),(1,1),(2,0)]'`;
+    case "polygon":
+      return `'((0,0),(1,1),(1,0))'`;
+    case "circle":
+      return `'<(0,0),1>'`;
+    case "bit":
+    case "bit varying":
+    case "varbit":
+      return `'101'`;
+    case "bytea":
+      return `'\\\\x0102'`;
     case "xml":
-      return `'<root>${isUpdate ? "updated" : "value"}</root>'`;
+      return `'<root/>'`;
+    case "tsvector":
+      return `'a fat cat'`;
+    case "tsquery":
+      return `'fat & cat'`;
+    case "oid":
+    case "regproc":
+    case "regprocedure":
+    case "regoper":
+    case "regoperator":
+    case "regclass":
+    case "regtype":
+    case "regconfig":
+    case "regdictionary":
+      return "1";
     default:
-      if (type.endsWith("[]")) {
-        const baseType = type.slice(0, -2);
-        if (baseType === "text" || baseType === "varchar") {
-          return `['item1', 'item2${isUpdate ? "_updated" : ""}']`;
-        }
-        if (baseType === "int" || baseType === "integer") {
-          return `[1, 2, ${isUpdate ? "3" : ""}]`;
-        }
+      if (type.endsWith("[]") || type.startsWith("_")) {
         return `[]`;
       }
-      return `'test${isUpdate ? "_updated" : ""}'`;
+      return `'value1'`;
   }
 }
+function generateUUID() {
+  return "xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx".replace(/[xy]/g, function(c) {
+    const r = Math.random() * 16 | 0;
+    const v = c === "x" ? r : r & 3 | 8;
+    return v.toString(16);
+  });
+}
 function generateTestCases(table, sampleData, updateData, hasForeignKeys = false) {
   const Type = pascal(table.name);
   const hasData = sampleData !== "{}";
-  const isJunctionTable = table.pk.length > 1 && table.columns.every((col) => table.pk.includes(col.name) || col.name.endsWith("_id"));
-  if (isJunctionTable) {
-    return `it('should create a ${table.name} relationship', async () => {
-    // This is a junction table for M:N relationships
-    // Test data depends on parent records created in other tests
-    expect(true).toBe(true);
-  });
-  
-  it('should list ${table.name} relationships', async () => {
-    const list = await sdk.${table.name}.list({ limit: 10 });
-    expect(Array.isArray(list)).toBe(true);
-  });`;
-  }
+  const hasSinglePK = table.pk.length === 1;
   return `it('should create a ${table.name}', async () => {
     const data: Insert${Type} = ${sampleData};
     ${hasData ? `
     const created = await sdk.${table.name}.create(data);
     expect(created).toBeDefined();
-    expect(created.id).toBeDefined();
-    createdId = created.id;
+    ${hasSinglePK ? `expect(created.${table.pk[0]}).toBeDefined();
+    createdId = created.${table.pk[0]};` : ""}
     ` : `
     // Table has only auto-generated columns
     // Skip create test or add your own test data
@@ -2698,7 +2695,7 @@ function generateTestCases(table, sampleData, updateData, hasForeignKeys = false
     expect(Array.isArray(list)).toBe(true);
   });
   
-  ${hasData ? `it('should get ${table.name} by id', async () => {
+  ${hasData && hasSinglePK ? `it('should get ${table.name} by id', async () => {
     if (!createdId) {
       console.warn('No ID from create test, skipping get test');
       return;
@@ -2706,7 +2703,7 @@ function generateTestCases(table, sampleData, updateData, hasForeignKeys = false
     
     const item = await sdk.${table.name}.getByPk(createdId);
     expect(item).toBeDefined();
-    expect(item?.id).toBe(createdId);
+    expect(item?.${table.pk[0]}).toBe(createdId);
   });
   
   ${updateData !== "{}" ? `it('should update ${table.name}', async () => {
@@ -3064,7 +3061,6 @@ async function generate(configPath) {
   if (sameDirectory) {
     clientDir = join(originalClientDir, "sdk");
   }
-  const normDateType = cfg.dateType === "string" ? "string" : "date";
   const serverFramework = cfg.serverFramework || "hono";
   const generateTests = cfg.tests?.generate ?? false;
   const originalTestDir = cfg.tests?.output || "./api/tests";
@@ -3108,12 +3104,12 @@ async function generate(configPath) {
     content: emitCoreOperations()
   });
   for (const table of Object.values(model.tables)) {
-    const typesSrc = emitTypes(table, { dateType: normDateType, numericMode: "string" });
+    const typesSrc = emitTypes(table, { numericMode: "string" });
     files.push({ path: join(serverDir, "types", `${table.name}.ts`), content: typesSrc });
     files.push({ path: join(clientDir, "types", `${table.name}.ts`), content: typesSrc });
     files.push({
       path: join(serverDir, "zod", `${table.name}.ts`),
-      content: emitZod(table, { dateType: normDateType, numericMode: "string" })
+      content: emitZod(table, { numericMode: "string" })
     });
     let routeContent;
     if (serverFramework === "hono") {
@@ -3184,7 +3180,7 @@ async function generate(configPath) {
     for (const table of Object.values(model.tables)) {
       files.push({
         path: join(testDir, `${table.name}.test.ts`),
-        content: emitTableTest(table, relativeClientPath, testFramework)
+        content: emitTableTest(table, model, relativeClientPath, testFramework)
       });
     }
   }

package/dist/types.d.ts

@@ -25,7 +25,6 @@ export interface Config {
     outClient?: string;
     softDeleteColumn?: string | null;
     includeDepthLimit?: number;
-    dateType?: "date" | "string";
     serverFramework?: "hono" | "express" | "fastify";
     auth?: AuthConfigInput;
     pull?: PullConfig;

package/package.json

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