postgresdk 0.16.1 → 0.16.4

package/dist/cli.js

@@ -1035,7 +1035,7 @@ function postgresTypeToTsType(column, enums) {
         return "string";
       case "json":
       case "jsonb":
-        return "Record<string, any>";
+        return "JsonValue";
       case "uuid":
         return "string";
       case "text[]":
@@ -2940,9 +2940,14 @@ export interface PaginatedResponse<T> {
 
 // src/emit-routes-hono.ts
 init_utils();
+function isVectorType(pgType) {
+  const t = pgType.toLowerCase();
+  return t === "vector" || t === "halfvec" || t === "sparsevec" || t === "bit";
+}
 function emitHonoRoutes(table, _graph, opts) {
   const fileTableName = table.name;
   const Type = pascal(table.name);
+  const hasVectorColumns = table.columns.some((c) => isVectorType(c.pgType));
   const rawPk = table.pk;
   const pkCols = Array.isArray(rawPk) ? rawPk : rawPk ? [rawPk] : [];
   const safePkCols = pkCols.length ? pkCols : ["id"];
@@ -2978,13 +2983,13 @@ const listSchema = z.object({
   limit: z.number().int().positive().max(1000).optional(),
   offset: z.number().int().min(0).optional(),
   orderBy: z.union([columnEnum, z.array(columnEnum)]).optional(),
-  order: z.union([z.enum(["asc", "desc"]), z.array(z.enum(["asc", "desc"]))]).optional(),
+  order: z.union([z.enum(["asc", "desc"]), z.array(z.enum(["asc", "desc"]))]).optional(),${hasVectorColumns ? `
   vector: z.object({
     field: z.string(),
     query: z.array(z.number()),
     metric: z.enum(["cosine", "l2", "inner"]).optional(),
     maxDistance: z.number().optional()
-  }).optional()
+  }).optional()` : ""}
 });
 
 /**
@@ -3166,14 +3171,25 @@ ${hasAuth ? `
 // src/emit-client.ts
 init_utils();
 init_emit_include_methods();
-function isVectorType(pgType) {
+function isVectorType2(pgType) {
   const t = pgType.toLowerCase();
   return t === "vector" || t === "halfvec" || t === "sparsevec" || t === "bit";
 }
+function isJsonbType(pgType) {
+  const t = pgType.toLowerCase();
+  return t === "json" || t === "jsonb";
+}
 function emitClient(table, graph, opts, model) {
   const Type = pascal(table.name);
   const ext = opts.useJsExtensions ? ".js" : "";
-  const hasVectorColumns = table.columns.some((c) => isVectorType(c.pgType));
+  const hasVectorColumns = table.columns.some((c) => isVectorType2(c.pgType));
+  const hasJsonbColumns = table.columns.some((c) => isJsonbType(c.pgType));
+  if (process.env.SDK_DEBUG) {
+    const vectorCols = table.columns.filter((c) => isVectorType2(c.pgType));
+    if (vectorCols.length > 0) {
+      console.log(`[DEBUG] Table ${table.name}: Found ${vectorCols.length} vector columns:`, vectorCols.map((c) => `${c.name} (${c.pgType})`));
+    }
+  }
   const pkCols = Array.isArray(table.pk) ? table.pk : table.pk ? [table.pk] : [];
   const safePk = pkCols.length ? pkCols : ["id"];
   const hasCompositePk = safePk.length > 1;
@@ -3253,60 +3269,58 @@ ${typeImports}
 ${otherTableImports.join(`
 `)}
 
-/**
- * Helper type to merge JSONB type overrides into base types
- * @example
- * type UserWithMetadata = MergeJsonb<SelectUser, { metadata: { tags: string[] } }>;
- */
-type MergeJsonb<TBase, TJsonb> = Omit<TBase, keyof TJsonb> & TJsonb;
-
 /**
  * Client for ${table.name} table operations
  */
 export class ${Type}Client extends BaseClient {
   private readonly resource = "/v1/${table.name}";
 
-  /**
+${hasJsonbColumns ? `  /**
    * Create a new ${table.name} record
    * @param data - The data to insert
    * @returns The created record
-   */
-  async create(data: Insert${Type}): Promise<Select${Type}>;
-  /**
-   * Create a new ${table.name} record with JSONB type overrides
-   * @param data - The data to insert
-   * @returns The created record with typed JSONB fields
    * @example
+   * // With JSONB type override:
    * type Metadata = { tags: string[]; prefs: { theme: 'light' | 'dark' } };
    * const user = await client.create<{ metadata: Metadata }>({ name: 'Alice', metadata: { tags: [], prefs: { theme: 'light' } } });
    */
-  async create<TJsonb extends Partial<Select${Type}>>(
-    data: MergeJsonb<Insert${Type}, TJsonb>
-  ): Promise<MergeJsonb<Select${Type}, TJsonb>>;
-  async create(data: any): Promise<any> {
-    return this.post<any>(this.resource, data);
-  }
+  async create<TJsonb extends Partial<Select${Type}> = {}>(
+    data: Insert${Type}<TJsonb>
+  ): Promise<Select${Type}<TJsonb>> {
+    return this.post<Select${Type}<TJsonb>>(this.resource, data);
+  }` : `  /**
+   * Create a new ${table.name} record
+   * @param data - The data to insert
+   * @returns The created record
+   */
+  async create(data: Insert${Type}): Promise<Select${Type}> {
+    return this.post<Select${Type}>(this.resource, data);
+  }`}
 
-  /**
+${hasJsonbColumns ? `  /**
    * Get a ${table.name} record by primary key
    * @param pk - The primary key value${hasCompositePk ? "s" : ""}
    * @returns The record if found, null otherwise
+   * @example
+   * // With JSONB type override:
+   * const user = await client.getByPk<{ metadata: Metadata }>('user-id');
    */
-  async getByPk(pk: ${pkType}): Promise<Select${Type} | null>;
-  /**
-   * Get a ${table.name} record by primary key with JSONB type overrides
+  async getByPk<TJsonb extends Partial<Select${Type}> = {}>(
+    pk: ${pkType}
+  ): Promise<Select${Type}<TJsonb> | null> {
+    const path = ${pkPathExpr};
+    return this.get<Select${Type}<TJsonb> | null>(\`\${this.resource}/\${path}\`);
+  }` : `  /**
+   * Get a ${table.name} record by primary key
    * @param pk - The primary key value${hasCompositePk ? "s" : ""}
-   * @returns The record with typed JSONB fields if found, null otherwise
+   * @returns The record if found, null otherwise
    */
-  async getByPk<TJsonb extends Partial<Select${Type}>>(
-    pk: ${pkType}
-  ): Promise<MergeJsonb<Select${Type}, TJsonb> | null>;
-  async getByPk(pk: ${pkType}): Promise<any> {
+  async getByPk(pk: ${pkType}): Promise<Select${Type} | null> {
     const path = ${pkPathExpr};
-    return this.get<any>(\`\${this.resource}/\${path}\`);
-  }
+    return this.get<Select${Type} | null>(\`\${this.resource}/\${path}\`);
+  }`}
 
-  /**
+${hasJsonbColumns ? `  /**
    * List ${table.name} records with pagination and filtering
    * @param params - Query parameters
    * @param params.where - Filter conditions using operators like $eq, $gt, $in, $like, etc.
@@ -3316,45 +3330,41 @@ export class ${Type}Client extends BaseClient {
    * @param params.offset - Number of records to skip for pagination
    * @param params.include - Related records to include (see listWith* methods for typed includes)
    * @returns Paginated results with data, total count, and hasMore flag
+   * @example
+   * // With JSONB type override:
+   * const users = await client.list<{ metadata: Metadata }>({ where: { status: 'active' } });
    */
-  async list(params?: {
-    include?: any;
-    limit?: number;
-    offset?: number;
-    where?: Where<Select${Type}>;
-    orderBy?: string | string[];
-    order?: "asc" | "desc" | ("asc" | "desc")[];
-  }): Promise<PaginatedResponse<Select${Type}>>;${hasVectorColumns ? `
-  /**
-   * List ${table.name} records with vector similarity search
-   * @param params - Query parameters with vector search enabled
-   * @param params.vector - Vector similarity search configuration
-   * @returns Paginated results with _distance field included
-   */
-  async list(params: {
+  async list<TJsonb extends Partial<Select${Type}> = {}>(params?: {
     include?: any;
     limit?: number;
     offset?: number;
-    where?: Where<Select${Type}>;
-    vector: {
+    where?: Where<Select${Type}<TJsonb>>;${hasVectorColumns ? `
+    vector?: {
       field: string;
       query: number[];
       metric?: "cosine" | "l2" | "inner";
       maxDistance?: number;
-    };
+    };` : ""}
     orderBy?: string | string[];
     order?: "asc" | "desc" | ("asc" | "desc")[];
-  }): Promise<PaginatedResponse<Select${Type} & { _distance: number }>>;` : ""}
-  /**
-   * List ${table.name} records with pagination and filtering, with JSONB type overrides
-   * @param params - Query parameters with typed JSONB fields in where clause
-   * @returns Paginated results with typed JSONB fields
+  }): Promise<PaginatedResponse<Select${Type}<TJsonb>${hasVectorColumns ? " & { _distance?: number }" : ""}>> {
+    return this.post<PaginatedResponse<Select${Type}<TJsonb>${hasVectorColumns ? " & { _distance?: number }" : ""}>>(\`\${this.resource}/list\`, params ?? {});
+  }` : `  /**
+   * List ${table.name} records with pagination and filtering
+   * @param params - Query parameters
+   * @param params.where - Filter conditions using operators like $eq, $gt, $in, $like, etc.
+   * @param params.orderBy - Column(s) to sort by
+   * @param params.order - Sort direction(s): "asc" or "desc"
+   * @param params.limit - Maximum number of records to return (default: 50, max: 100)
+   * @param params.offset - Number of records to skip for pagination
+   * @param params.include - Related records to include (see listWith* methods for typed includes)
+   * @returns Paginated results with data, total count, and hasMore flag
    */
-  async list<TJsonb extends Partial<Select${Type}>>(params?: {
+  async list(params?: {
     include?: any;
     limit?: number;
     offset?: number;
-    where?: Where<MergeJsonb<Select${Type}, TJsonb>>;${hasVectorColumns ? `
+    where?: Where<Select${Type}>;${hasVectorColumns ? `
     vector?: {
       field: string;
       query: number[];
@@ -3363,51 +3373,58 @@ export class ${Type}Client extends BaseClient {
     };` : ""}
     orderBy?: string | string[];
     order?: "asc" | "desc" | ("asc" | "desc")[];
-  }): Promise<PaginatedResponse<MergeJsonb<Select${Type}, TJsonb>>>;
-  async list(params?: any): Promise<any> {
-    return this.post<any>(\`\${this.resource}/list\`, params ?? {});
-  }
+  }): Promise<PaginatedResponse<Select${Type}${hasVectorColumns ? " & { _distance?: number }" : ""}>> {
+    return this.post<PaginatedResponse<Select${Type}${hasVectorColumns ? " & { _distance?: number }" : ""}>>(\`\${this.resource}/list\`, params ?? {});
+  }`}
 
-  /**
+${hasJsonbColumns ? `  /**
    * Update a ${table.name} record by primary key
    * @param pk - The primary key value${hasCompositePk ? "s" : ""}
    * @param patch - Partial data to update
    * @returns The updated record if found, null otherwise
+   * @example
+   * // With JSONB type override:
+   * const user = await client.update<{ metadata: Metadata }>('user-id', { metadata: { tags: ['new'] } });
    */
-  async update(pk: ${pkType}, patch: Update${Type}): Promise<Select${Type} | null>;
-  /**
-   * Update a ${table.name} record by primary key with JSONB type overrides
+  async update<TJsonb extends Partial<Select${Type}> = {}>(
+    pk: ${pkType},
+    patch: Update${Type}<TJsonb>
+  ): Promise<Select${Type}<TJsonb> | null> {
+    const path = ${pkPathExpr};
+    return this.patch<Select${Type}<TJsonb> | null>(\`\${this.resource}/\${path}\`, patch);
+  }` : `  /**
+   * Update a ${table.name} record by primary key
    * @param pk - The primary key value${hasCompositePk ? "s" : ""}
-   * @param patch - Partial data to update with typed JSONB fields
-   * @returns The updated record with typed JSONB fields if found, null otherwise
+   * @param patch - Partial data to update
+   * @returns The updated record if found, null otherwise
    */
-  async update<TJsonb extends Partial<Select${Type}>>(
-    pk: ${pkType},
-    patch: MergeJsonb<Update${Type}, TJsonb>
-  ): Promise<MergeJsonb<Select${Type}, TJsonb> | null>;
-  async update(pk: ${pkType}, patch: any): Promise<any> {
+  async update(pk: ${pkType}, patch: Update${Type}): Promise<Select${Type} | null> {
     const path = ${pkPathExpr};
-    return this.patch<any>(\`\${this.resource}/\${path}\`, patch);
-  }
+    return this.patch<Select${Type} | null>(\`\${this.resource}/\${path}\`, patch);
+  }`}
 
-  /**
+${hasJsonbColumns ? `  /**
    * Delete a ${table.name} record by primary key
    * @param pk - The primary key value${hasCompositePk ? "s" : ""}
    * @returns The deleted record if found, null otherwise
+   * @example
+   * // With JSONB type override:
+   * const user = await client.delete<{ metadata: Metadata }>('user-id');
    */
-  async delete(pk: ${pkType}): Promise<Select${Type} | null>;
-  /**
-   * Delete a ${table.name} record by primary key with JSONB type overrides
+  async delete<TJsonb extends Partial<Select${Type}> = {}>(
+    pk: ${pkType}
+  ): Promise<Select${Type}<TJsonb> | null> {
+    const path = ${pkPathExpr};
+    return this.del<Select${Type}<TJsonb> | null>(\`\${this.resource}/\${path}\`);
+  }` : `  /**
+   * Delete a ${table.name} record by primary key
    * @param pk - The primary key value${hasCompositePk ? "s" : ""}
-   * @returns The deleted record with typed JSONB fields if found, null otherwise
+   * @returns The deleted record if found, null otherwise
    */
-  async delete<TJsonb extends Partial<Select${Type}>>(
-    pk: ${pkType}
-  ): Promise<MergeJsonb<Select${Type}, TJsonb> | null>;
-  async delete(pk: ${pkType}): Promise<any> {
+  async delete(pk: ${pkType}): Promise<Select${Type} | null> {
     const path = ${pkPathExpr};
-    return this.del<any>(\`\${this.resource}/\${path}\`);
-  }
+    return this.del<Select${Type} | null>(\`\${this.resource}/\${path}\`);
+  }`}
 ${includeMethodsCode}}
 `;
 }
@@ -3975,9 +3992,14 @@ function tsTypeFor(pgType, opts, enums) {
     return "unknown";
   return "string";
 }
+function isJsonbType2(pgType) {
+  const t = pgType.toLowerCase();
+  return t === "json" || t === "jsonb";
+}
 var pascal2 = (s) => s.split(/[_\s-]+/).map((w) => w?.[0] ? w[0].toUpperCase() + w.slice(1) : "").join("");
 function emitTypes(table, opts, enums) {
   const Type = pascal2(table.name);
+  const hasJsonbColumns = table.columns.some((col) => isJsonbType2(col.pgType));
   const insertFields = table.columns.map((col) => {
     const base = tsTypeFor(col.pgType, opts, enums);
     const optional = col.hasDefault || col.nullable ? "?" : "";
@@ -3991,6 +4013,57 @@ function emitTypes(table, opts, enums) {
     return `  ${col.name}: ${valueType};`;
   }).join(`
 `);
+  const baseInsertType = `type _Insert${Type}Base = {
+${insertFields}
+};`;
+  const baseSelectType = `type _Select${Type}Base = {
+${selectFields}
+};`;
+  if (hasJsonbColumns) {
+    return `/**
+ * AUTO-GENERATED FILE - DO NOT EDIT
+ *
+ * This file was automatically generated by PostgreSDK.
+ * Any manual changes will be overwritten on the next generation.
+ *
+ * To make changes, modify your schema or configuration and regenerate.
+ */
+
+${baseInsertType}
+
+${baseSelectType}
+
+/**
+ * Type for inserting a new ${table.name} record.
+ * Fields with defaults or nullable columns are optional.
+ *
+ * Generic parameter TJsonb allows overriding JSONB column types:
+ * @example Insert${Type}<{ metadata: MyMetadataType }>
+ */
+export type Insert${Type}<TJsonb extends Partial<_Insert${Type}Base> = {}> =
+  Omit<_Insert${Type}Base, keyof TJsonb> & TJsonb;
+
+/**
+ * Type for updating an existing ${table.name} record.
+ * All fields are optional, allowing partial updates.
+ *
+ * Generic parameter TJsonb allows overriding JSONB column types:
+ * @example Update${Type}<{ metadata: MyMetadataType }>
+ */
+export type Update${Type}<TJsonb extends Partial<_Select${Type}Base> = {}> =
+  Partial<Omit<_Insert${Type}Base, keyof TJsonb> & TJsonb>;
+
+/**
+ * Type representing a ${table.name} record from the database.
+ * All fields are included as returned by SELECT queries.
+ *
+ * Generic parameter TJsonb allows overriding JSONB column types:
+ * @example Select${Type}<{ metadata: MyMetadataType }>
+ */
+export type Select${Type}<TJsonb extends Partial<_Select${Type}Base> = {}> =
+  Omit<_Select${Type}Base, keyof TJsonb> & TJsonb;
+`;
+  }
   return `/**
  * AUTO-GENERATED FILE - DO NOT EDIT
  *

package/dist/index.js

@@ -1034,7 +1034,7 @@ function postgresTypeToTsType(column, enums) {
         return "string";
       case "json":
       case "jsonb":
-        return "Record<string, any>";
+        return "JsonValue";
       case "uuid":
         return "string";
       case "text[]":
@@ -2111,9 +2111,14 @@ export interface PaginatedResponse<T> {
 
 // src/emit-routes-hono.ts
 init_utils();
+function isVectorType(pgType) {
+  const t = pgType.toLowerCase();
+  return t === "vector" || t === "halfvec" || t === "sparsevec" || t === "bit";
+}
 function emitHonoRoutes(table, _graph, opts) {
   const fileTableName = table.name;
   const Type = pascal(table.name);
+  const hasVectorColumns = table.columns.some((c) => isVectorType(c.pgType));
   const rawPk = table.pk;
   const pkCols = Array.isArray(rawPk) ? rawPk : rawPk ? [rawPk] : [];
   const safePkCols = pkCols.length ? pkCols : ["id"];
@@ -2149,13 +2154,13 @@ const listSchema = z.object({
   limit: z.number().int().positive().max(1000).optional(),
   offset: z.number().int().min(0).optional(),
   orderBy: z.union([columnEnum, z.array(columnEnum)]).optional(),
-  order: z.union([z.enum(["asc", "desc"]), z.array(z.enum(["asc", "desc"]))]).optional(),
+  order: z.union([z.enum(["asc", "desc"]), z.array(z.enum(["asc", "desc"]))]).optional(),${hasVectorColumns ? `
   vector: z.object({
     field: z.string(),
     query: z.array(z.number()),
     metric: z.enum(["cosine", "l2", "inner"]).optional(),
     maxDistance: z.number().optional()
-  }).optional()
+  }).optional()` : ""}
 });
 
 /**
@@ -2337,14 +2342,25 @@ ${hasAuth ? `
 // src/emit-client.ts
 init_utils();
 init_emit_include_methods();
-function isVectorType(pgType) {
+function isVectorType2(pgType) {
   const t = pgType.toLowerCase();
   return t === "vector" || t === "halfvec" || t === "sparsevec" || t === "bit";
 }
+function isJsonbType(pgType) {
+  const t = pgType.toLowerCase();
+  return t === "json" || t === "jsonb";
+}
 function emitClient(table, graph, opts, model) {
   const Type = pascal(table.name);
   const ext = opts.useJsExtensions ? ".js" : "";
-  const hasVectorColumns = table.columns.some((c) => isVectorType(c.pgType));
+  const hasVectorColumns = table.columns.some((c) => isVectorType2(c.pgType));
+  const hasJsonbColumns = table.columns.some((c) => isJsonbType(c.pgType));
+  if (process.env.SDK_DEBUG) {
+    const vectorCols = table.columns.filter((c) => isVectorType2(c.pgType));
+    if (vectorCols.length > 0) {
+      console.log(`[DEBUG] Table ${table.name}: Found ${vectorCols.length} vector columns:`, vectorCols.map((c) => `${c.name} (${c.pgType})`));
+    }
+  }
   const pkCols = Array.isArray(table.pk) ? table.pk : table.pk ? [table.pk] : [];
   const safePk = pkCols.length ? pkCols : ["id"];
   const hasCompositePk = safePk.length > 1;
@@ -2424,60 +2440,58 @@ ${typeImports}
 ${otherTableImports.join(`
 `)}
 
-/**
- * Helper type to merge JSONB type overrides into base types
- * @example
- * type UserWithMetadata = MergeJsonb<SelectUser, { metadata: { tags: string[] } }>;
- */
-type MergeJsonb<TBase, TJsonb> = Omit<TBase, keyof TJsonb> & TJsonb;
-
 /**
  * Client for ${table.name} table operations
  */
 export class ${Type}Client extends BaseClient {
   private readonly resource = "/v1/${table.name}";
 
-  /**
+${hasJsonbColumns ? `  /**
    * Create a new ${table.name} record
    * @param data - The data to insert
    * @returns The created record
-   */
-  async create(data: Insert${Type}): Promise<Select${Type}>;
-  /**
-   * Create a new ${table.name} record with JSONB type overrides
-   * @param data - The data to insert
-   * @returns The created record with typed JSONB fields
    * @example
+   * // With JSONB type override:
    * type Metadata = { tags: string[]; prefs: { theme: 'light' | 'dark' } };
    * const user = await client.create<{ metadata: Metadata }>({ name: 'Alice', metadata: { tags: [], prefs: { theme: 'light' } } });
    */
-  async create<TJsonb extends Partial<Select${Type}>>(
-    data: MergeJsonb<Insert${Type}, TJsonb>
-  ): Promise<MergeJsonb<Select${Type}, TJsonb>>;
-  async create(data: any): Promise<any> {
-    return this.post<any>(this.resource, data);
-  }
+  async create<TJsonb extends Partial<Select${Type}> = {}>(
+    data: Insert${Type}<TJsonb>
+  ): Promise<Select${Type}<TJsonb>> {
+    return this.post<Select${Type}<TJsonb>>(this.resource, data);
+  }` : `  /**
+   * Create a new ${table.name} record
+   * @param data - The data to insert
+   * @returns The created record
+   */
+  async create(data: Insert${Type}): Promise<Select${Type}> {
+    return this.post<Select${Type}>(this.resource, data);
+  }`}
 
-  /**
+${hasJsonbColumns ? `  /**
    * Get a ${table.name} record by primary key
    * @param pk - The primary key value${hasCompositePk ? "s" : ""}
    * @returns The record if found, null otherwise
+   * @example
+   * // With JSONB type override:
+   * const user = await client.getByPk<{ metadata: Metadata }>('user-id');
    */
-  async getByPk(pk: ${pkType}): Promise<Select${Type} | null>;
-  /**
-   * Get a ${table.name} record by primary key with JSONB type overrides
+  async getByPk<TJsonb extends Partial<Select${Type}> = {}>(
+    pk: ${pkType}
+  ): Promise<Select${Type}<TJsonb> | null> {
+    const path = ${pkPathExpr};
+    return this.get<Select${Type}<TJsonb> | null>(\`\${this.resource}/\${path}\`);
+  }` : `  /**
+   * Get a ${table.name} record by primary key
    * @param pk - The primary key value${hasCompositePk ? "s" : ""}
-   * @returns The record with typed JSONB fields if found, null otherwise
+   * @returns The record if found, null otherwise
    */
-  async getByPk<TJsonb extends Partial<Select${Type}>>(
-    pk: ${pkType}
-  ): Promise<MergeJsonb<Select${Type}, TJsonb> | null>;
-  async getByPk(pk: ${pkType}): Promise<any> {
+  async getByPk(pk: ${pkType}): Promise<Select${Type} | null> {
     const path = ${pkPathExpr};
-    return this.get<any>(\`\${this.resource}/\${path}\`);
-  }
+    return this.get<Select${Type} | null>(\`\${this.resource}/\${path}\`);
+  }`}
 
-  /**
+${hasJsonbColumns ? `  /**
    * List ${table.name} records with pagination and filtering
    * @param params - Query parameters
    * @param params.where - Filter conditions using operators like $eq, $gt, $in, $like, etc.
@@ -2487,45 +2501,41 @@ export class ${Type}Client extends BaseClient {
    * @param params.offset - Number of records to skip for pagination
    * @param params.include - Related records to include (see listWith* methods for typed includes)
    * @returns Paginated results with data, total count, and hasMore flag
+   * @example
+   * // With JSONB type override:
+   * const users = await client.list<{ metadata: Metadata }>({ where: { status: 'active' } });
    */
-  async list(params?: {
-    include?: any;
-    limit?: number;
-    offset?: number;
-    where?: Where<Select${Type}>;
-    orderBy?: string | string[];
-    order?: "asc" | "desc" | ("asc" | "desc")[];
-  }): Promise<PaginatedResponse<Select${Type}>>;${hasVectorColumns ? `
-  /**
-   * List ${table.name} records with vector similarity search
-   * @param params - Query parameters with vector search enabled
-   * @param params.vector - Vector similarity search configuration
-   * @returns Paginated results with _distance field included
-   */
-  async list(params: {
+  async list<TJsonb extends Partial<Select${Type}> = {}>(params?: {
     include?: any;
     limit?: number;
     offset?: number;
-    where?: Where<Select${Type}>;
-    vector: {
+    where?: Where<Select${Type}<TJsonb>>;${hasVectorColumns ? `
+    vector?: {
       field: string;
       query: number[];
       metric?: "cosine" | "l2" | "inner";
       maxDistance?: number;
-    };
+    };` : ""}
     orderBy?: string | string[];
     order?: "asc" | "desc" | ("asc" | "desc")[];
-  }): Promise<PaginatedResponse<Select${Type} & { _distance: number }>>;` : ""}
-  /**
-   * List ${table.name} records with pagination and filtering, with JSONB type overrides
-   * @param params - Query parameters with typed JSONB fields in where clause
-   * @returns Paginated results with typed JSONB fields
+  }): Promise<PaginatedResponse<Select${Type}<TJsonb>${hasVectorColumns ? " & { _distance?: number }" : ""}>> {
+    return this.post<PaginatedResponse<Select${Type}<TJsonb>${hasVectorColumns ? " & { _distance?: number }" : ""}>>(\`\${this.resource}/list\`, params ?? {});
+  }` : `  /**
+   * List ${table.name} records with pagination and filtering
+   * @param params - Query parameters
+   * @param params.where - Filter conditions using operators like $eq, $gt, $in, $like, etc.
+   * @param params.orderBy - Column(s) to sort by
+   * @param params.order - Sort direction(s): "asc" or "desc"
+   * @param params.limit - Maximum number of records to return (default: 50, max: 100)
+   * @param params.offset - Number of records to skip for pagination
+   * @param params.include - Related records to include (see listWith* methods for typed includes)
+   * @returns Paginated results with data, total count, and hasMore flag
    */
-  async list<TJsonb extends Partial<Select${Type}>>(params?: {
+  async list(params?: {
     include?: any;
     limit?: number;
     offset?: number;
-    where?: Where<MergeJsonb<Select${Type}, TJsonb>>;${hasVectorColumns ? `
+    where?: Where<Select${Type}>;${hasVectorColumns ? `
     vector?: {
       field: string;
       query: number[];
@@ -2534,51 +2544,58 @@ export class ${Type}Client extends BaseClient {
     };` : ""}
     orderBy?: string | string[];
     order?: "asc" | "desc" | ("asc" | "desc")[];
-  }): Promise<PaginatedResponse<MergeJsonb<Select${Type}, TJsonb>>>;
-  async list(params?: any): Promise<any> {
-    return this.post<any>(\`\${this.resource}/list\`, params ?? {});
-  }
+  }): Promise<PaginatedResponse<Select${Type}${hasVectorColumns ? " & { _distance?: number }" : ""}>> {
+    return this.post<PaginatedResponse<Select${Type}${hasVectorColumns ? " & { _distance?: number }" : ""}>>(\`\${this.resource}/list\`, params ?? {});
+  }`}
 
-  /**
+${hasJsonbColumns ? `  /**
    * Update a ${table.name} record by primary key
    * @param pk - The primary key value${hasCompositePk ? "s" : ""}
    * @param patch - Partial data to update
    * @returns The updated record if found, null otherwise
+   * @example
+   * // With JSONB type override:
+   * const user = await client.update<{ metadata: Metadata }>('user-id', { metadata: { tags: ['new'] } });
    */
-  async update(pk: ${pkType}, patch: Update${Type}): Promise<Select${Type} | null>;
-  /**
-   * Update a ${table.name} record by primary key with JSONB type overrides
+  async update<TJsonb extends Partial<Select${Type}> = {}>(
+    pk: ${pkType},
+    patch: Update${Type}<TJsonb>
+  ): Promise<Select${Type}<TJsonb> | null> {
+    const path = ${pkPathExpr};
+    return this.patch<Select${Type}<TJsonb> | null>(\`\${this.resource}/\${path}\`, patch);
+  }` : `  /**
+   * Update a ${table.name} record by primary key
    * @param pk - The primary key value${hasCompositePk ? "s" : ""}
-   * @param patch - Partial data to update with typed JSONB fields
-   * @returns The updated record with typed JSONB fields if found, null otherwise
+   * @param patch - Partial data to update
+   * @returns The updated record if found, null otherwise
    */
-  async update<TJsonb extends Partial<Select${Type}>>(
-    pk: ${pkType},
-    patch: MergeJsonb<Update${Type}, TJsonb>
-  ): Promise<MergeJsonb<Select${Type}, TJsonb> | null>;
-  async update(pk: ${pkType}, patch: any): Promise<any> {
+  async update(pk: ${pkType}, patch: Update${Type}): Promise<Select${Type} | null> {
     const path = ${pkPathExpr};
-    return this.patch<any>(\`\${this.resource}/\${path}\`, patch);
-  }
+    return this.patch<Select${Type} | null>(\`\${this.resource}/\${path}\`, patch);
+  }`}
 
-  /**
+${hasJsonbColumns ? `  /**
    * Delete a ${table.name} record by primary key
    * @param pk - The primary key value${hasCompositePk ? "s" : ""}
    * @returns The deleted record if found, null otherwise
+   * @example
+   * // With JSONB type override:
+   * const user = await client.delete<{ metadata: Metadata }>('user-id');
    */
-  async delete(pk: ${pkType}): Promise<Select${Type} | null>;
-  /**
-   * Delete a ${table.name} record by primary key with JSONB type overrides
+  async delete<TJsonb extends Partial<Select${Type}> = {}>(
+    pk: ${pkType}
+  ): Promise<Select${Type}<TJsonb> | null> {
+    const path = ${pkPathExpr};
+    return this.del<Select${Type}<TJsonb> | null>(\`\${this.resource}/\${path}\`);
+  }` : `  /**
+   * Delete a ${table.name} record by primary key
    * @param pk - The primary key value${hasCompositePk ? "s" : ""}
-   * @returns The deleted record with typed JSONB fields if found, null otherwise
+   * @returns The deleted record if found, null otherwise
    */
-  async delete<TJsonb extends Partial<Select${Type}>>(
-    pk: ${pkType}
-  ): Promise<MergeJsonb<Select${Type}, TJsonb> | null>;
-  async delete(pk: ${pkType}): Promise<any> {
+  async delete(pk: ${pkType}): Promise<Select${Type} | null> {
     const path = ${pkPathExpr};
-    return this.del<any>(\`\${this.resource}/\${path}\`);
-  }
+    return this.del<Select${Type} | null>(\`\${this.resource}/\${path}\`);
+  }`}
 ${includeMethodsCode}}
 `;
 }
@@ -3146,9 +3163,14 @@ function tsTypeFor(pgType, opts, enums) {
     return "unknown";
   return "string";
 }
+function isJsonbType2(pgType) {
+  const t = pgType.toLowerCase();
+  return t === "json" || t === "jsonb";
+}
 var pascal2 = (s) => s.split(/[_\s-]+/).map((w) => w?.[0] ? w[0].toUpperCase() + w.slice(1) : "").join("");
 function emitTypes(table, opts, enums) {
   const Type = pascal2(table.name);
+  const hasJsonbColumns = table.columns.some((col) => isJsonbType2(col.pgType));
   const insertFields = table.columns.map((col) => {
     const base = tsTypeFor(col.pgType, opts, enums);
     const optional = col.hasDefault || col.nullable ? "?" : "";
@@ -3162,6 +3184,57 @@ function emitTypes(table, opts, enums) {
     return `  ${col.name}: ${valueType};`;
   }).join(`
 `);
+  const baseInsertType = `type _Insert${Type}Base = {
+${insertFields}
+};`;
+  const baseSelectType = `type _Select${Type}Base = {
+${selectFields}
+};`;
+  if (hasJsonbColumns) {
+    return `/**
+ * AUTO-GENERATED FILE - DO NOT EDIT
+ *
+ * This file was automatically generated by PostgreSDK.
+ * Any manual changes will be overwritten on the next generation.
+ *
+ * To make changes, modify your schema or configuration and regenerate.
+ */
+
+${baseInsertType}
+
+${baseSelectType}
+
+/**
+ * Type for inserting a new ${table.name} record.
+ * Fields with defaults or nullable columns are optional.
+ *
+ * Generic parameter TJsonb allows overriding JSONB column types:
+ * @example Insert${Type}<{ metadata: MyMetadataType }>
+ */
+export type Insert${Type}<TJsonb extends Partial<_Insert${Type}Base> = {}> =
+  Omit<_Insert${Type}Base, keyof TJsonb> & TJsonb;
+
+/**
+ * Type for updating an existing ${table.name} record.
+ * All fields are optional, allowing partial updates.
+ *
+ * Generic parameter TJsonb allows overriding JSONB column types:
+ * @example Update${Type}<{ metadata: MyMetadataType }>
+ */
+export type Update${Type}<TJsonb extends Partial<_Select${Type}Base> = {}> =
+  Partial<Omit<_Insert${Type}Base, keyof TJsonb> & TJsonb>;
+
+/**
+ * Type representing a ${table.name} record from the database.
+ * All fields are included as returned by SELECT queries.
+ *
+ * Generic parameter TJsonb allows overriding JSONB column types:
+ * @example Select${Type}<{ metadata: MyMetadataType }>
+ */
+export type Select${Type}<TJsonb extends Partial<_Select${Type}Base> = {}> =
+  Omit<_Select${Type}Base, keyof TJsonb> & TJsonb;
+`;
+  }
   return `/**
  * AUTO-GENERATED FILE - DO NOT EDIT
  *

package/package.json

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