postgresdk 0.18.11 → 0.18.12

package/dist/cli.js

@@ -5,25 +5,43 @@ var __getProtoOf = Object.getPrototypeOf;
 var __defProp = Object.defineProperty;
 var __getOwnPropNames = Object.getOwnPropertyNames;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
+function __accessProp(key) {
+  return this[key];
+}
+var __toESMCache_node;
+var __toESMCache_esm;
 var __toESM = (mod, isNodeMode, target) => {
+  var canCache = mod != null && typeof mod === "object";
+  if (canCache) {
+    var cache = isNodeMode ? __toESMCache_node ??= new WeakMap : __toESMCache_esm ??= new WeakMap;
+    var cached = cache.get(mod);
+    if (cached)
+      return cached;
+  }
   target = mod != null ? __create(__getProtoOf(mod)) : {};
   const to = isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target;
   for (let key of __getOwnPropNames(mod))
     if (!__hasOwnProp.call(to, key))
       __defProp(to, key, {
-        get: () => mod[key],
+        get: __accessProp.bind(mod, key),
         enumerable: true
       });
+  if (canCache)
+    cache.set(mod, to);
   return to;
 };
 var __commonJS = (cb, mod) => () => (mod || cb((mod = { exports: {} }).exports, mod), mod.exports);
+var __returnValue = (v) => v;
+function __exportSetter(name, newValue) {
+  this[name] = __returnValue.bind(null, newValue);
+}
 var __export = (target, all) => {
   for (var name in all)
     __defProp(target, name, {
       get: all[name],
       enumerable: true,
       configurable: true,
-      set: (newValue) => all[name] = () => newValue
+      set: __exportSetter.bind(all, name)
     });
 };
 var __esm = (fn, res) => () => (fn && (res = fn(fn = 0)), res);
@@ -3168,11 +3186,15 @@ function isVectorType(pgType) {
   const t = pgType.toLowerCase();
   return t === "vector" || t === "halfvec" || t === "sparsevec" || t === "bit";
 }
+function isJsonbType(pgType) {
+  return pgType.toLowerCase() === "json" || pgType.toLowerCase() === "jsonb";
+}
 function emitHonoRoutes(table, _graph, opts) {
   const fileTableName = table.name;
   const Type = pascal(table.name);
   const hasVectorColumns = table.columns.some((c) => isVectorType(c.pgType));
   const vectorColumns = table.columns.filter((c) => isVectorType(c.pgType)).map((c) => c.name);
+  const jsonbColumns = table.columns.filter((c) => isJsonbType(c.pgType)).map((c) => c.name);
   const rawPk = table.pk;
   const pkCols = Array.isArray(rawPk) ? rawPk : rawPk ? [rawPk] : [];
   const safePkCols = pkCols.length ? pkCols : ["id"];
@@ -3259,7 +3281,8 @@ export function register${Type}Routes(app: Hono, deps: { pg: { query: (text: str
     softDeleteColumn: ${softDel ? `"${softDel}"` : "null"},
     includeMethodsDepth: ${opts.includeMethodsDepth},
     allColumnNames: [${table.columns.map((c) => `"${c.name}"`).join(", ")}]${vectorColumns.length > 0 ? `,
-    vectorColumns: ${JSON.stringify(vectorColumns)}` : ""}
+    vectorColumns: ${JSON.stringify(vectorColumns)}` : ""}${jsonbColumns.length > 0 ? `,
+    jsonbColumns: ${JSON.stringify(jsonbColumns)}` : ""}
   };
 ${hasAuth ? `
   // \uD83D\uDD10 Auth: protect all routes for this table
@@ -3477,7 +3500,7 @@ function isVectorType2(pgType) {
   const t = pgType.toLowerCase();
   return t === "vector" || t === "halfvec" || t === "sparsevec" || t === "bit";
 }
-function isJsonbType(pgType) {
+function isJsonbType2(pgType) {
   const t = pgType.toLowerCase();
   return t === "json" || t === "jsonb";
 }
@@ -3503,7 +3526,7 @@ function emitClient(table, graph, opts, model) {
   const Type = pascal(table.name);
   const ext = opts.useJsExtensions ? ".js" : "";
   const hasVectorColumns = table.columns.some((c) => isVectorType2(c.pgType));
-  const hasJsonbColumns = table.columns.some((c) => isJsonbType(c.pgType));
+  const hasJsonbColumns = table.columns.some((c) => isJsonbType2(c.pgType));
   if (process.env.SDK_DEBUG) {
     const vectorCols = table.columns.filter((c) => isVectorType2(c.pgType));
     if (vectorCols.length > 0) {
@@ -4973,14 +4996,14 @@ function tsTypeFor(pgType, opts, enums) {
     return "number[]";
   return "string";
 }
-function isJsonbType2(pgType) {
+function isJsonbType3(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 hasJsonbColumns = table.columns.some((col) => isJsonbType3(col.pgType));
   const insertFields = table.columns.map((col) => {
     const base = tsTypeFor(col.pgType, opts, enums);
     const optional = col.hasDefault || col.nullable ? "?" : "";
@@ -5694,6 +5717,7 @@ export interface OperationContext {
   softDeleteColumn?: string | null;
   includeMethodsDepth: number;
   vectorColumns?: string[];
+  jsonbColumns?: string[];
   allColumnNames?: string[];
   select?: string[];
   exclude?: string[];
@@ -5748,22 +5772,6 @@ function buildColumnList(
   return finalColumns.map(col => \`"\${col}"\`).join(", ");
 }
 
-/**
- * Prepare query parameters for PostgreSQL.
- * The pg library should handle JSONB automatically, but there are edge cases
- * where explicit stringification is needed (e.g., certain pg versions or when
- * objects have been through serialization/deserialization).
- */
-function prepareParams(params: any[]): any[] {
-  return params.map(p => {
-    if (p === null || p === undefined) return p;
-    // Stringify objects/arrays for JSONB - while pg should handle this automatically,
-    // we've observed cases where it fails without explicit stringification
-    if (typeof p === 'object') return JSON.stringify(p);
-    return p;
-  });
-}
-
 /**
  * Parse vector columns in retrieved rows.
  * pgvector returns vectors as strings (e.g., "[1.5,2.5,3.5]") which need to be
@@ -5809,8 +5817,13 @@ export async function createRecord(
                    VALUES (\${placeholders})
                    RETURNING \${returningClause}\`;
 
-    log.debug("SQL:", text, "vals:", vals);
-    const { rows } = await ctx.pg.query(text, prepareParams(vals));
+    const preparedVals = vals.map((v, i) =>
+      v !== null && v !== undefined && typeof v === 'object' && ctx.jsonbColumns?.includes(cols[i])
+        ? JSON.stringify(v)
+        : v
+    );
+    log.debug("SQL:", text, "vals:", preparedVals);
+    const { rows } = await ctx.pg.query(text, preparedVals);
     const parsedRows = parseVectorColumns(rows, ctx.vectorColumns);
 
     return { data: parsedRows[0] ?? null, status: parsedRows[0] ? 201 : 500 };
@@ -5852,7 +5865,7 @@ export async function getByPk(
     const text = \`SELECT \${columns} FROM "\${ctx.table}" WHERE \${wherePkSql} LIMIT 1\`;
     log.debug(\`GET \${ctx.table} by PK:\`, pkValues, "SQL:", text);
 
-    const { rows } = await ctx.pg.query(text, prepareParams(pkValues));
+    const { rows } = await ctx.pg.query(text, pkValues);
     const parsedRows = parseVectorColumns(rows, ctx.vectorColumns);
 
     if (!parsedRows[0]) {
@@ -6324,10 +6337,15 @@ export async function updateRecord(
 
     const returningClause = buildColumnList(ctx.select, ctx.exclude, ctx.allColumnNames);
     const text = \`UPDATE "\${ctx.table}" SET \${setSql} WHERE \${wherePkSql} RETURNING \${returningClause}\`;
-    const params = [...pkValues, ...Object.values(filteredData)];
+    const updateVals = Object.entries(filteredData).map(([col, v]) =>
+      v !== null && v !== undefined && typeof v === 'object' && ctx.jsonbColumns?.includes(col)
+        ? JSON.stringify(v)
+        : v
+    );
+    const params = [...pkValues, ...updateVals];
 
     log.debug(\`PATCH \${ctx.table} SQL:\`, text, "params:", params);
-    const { rows } = await ctx.pg.query(text, prepareParams(params));
+    const { rows } = await ctx.pg.query(text, params);
     const parsedRows = parseVectorColumns(rows, ctx.vectorColumns);
 
     if (!parsedRows[0]) {
@@ -6378,7 +6396,7 @@ export async function deleteRecord(
       : \`DELETE FROM "\${ctx.table}" WHERE \${wherePkSql} RETURNING \${returningClause}\`;
 
     log.debug(\`DELETE \${ctx.softDeleteColumn ? '(soft)' : ''} \${ctx.table} SQL:\`, text, "pk:", pkValues);
-    const { rows } = await ctx.pg.query(text, prepareParams(pkValues));
+    const { rows } = await ctx.pg.query(text, pkValues);
     const parsedRows = parseVectorColumns(rows, ctx.vectorColumns);
 
     if (!parsedRows[0]) {

package/dist/index.js

@@ -4,25 +4,43 @@ var __getProtoOf = Object.getPrototypeOf;
 var __defProp = Object.defineProperty;
 var __getOwnPropNames = Object.getOwnPropertyNames;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
+function __accessProp(key) {
+  return this[key];
+}
+var __toESMCache_node;
+var __toESMCache_esm;
 var __toESM = (mod, isNodeMode, target) => {
+  var canCache = mod != null && typeof mod === "object";
+  if (canCache) {
+    var cache = isNodeMode ? __toESMCache_node ??= new WeakMap : __toESMCache_esm ??= new WeakMap;
+    var cached = cache.get(mod);
+    if (cached)
+      return cached;
+  }
   target = mod != null ? __create(__getProtoOf(mod)) : {};
   const to = isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target;
   for (let key of __getOwnPropNames(mod))
     if (!__hasOwnProp.call(to, key))
       __defProp(to, key, {
-        get: () => mod[key],
+        get: __accessProp.bind(mod, key),
         enumerable: true
       });
+  if (canCache)
+    cache.set(mod, to);
   return to;
 };
 var __commonJS = (cb, mod) => () => (mod || cb((mod = { exports: {} }).exports, mod), mod.exports);
+var __returnValue = (v) => v;
+function __exportSetter(name, newValue) {
+  this[name] = __returnValue.bind(null, newValue);
+}
 var __export = (target, all) => {
   for (var name in all)
     __defProp(target, name, {
       get: all[name],
       enumerable: true,
       configurable: true,
-      set: (newValue) => all[name] = () => newValue
+      set: __exportSetter.bind(all, name)
     });
 };
 var __esm = (fn, res) => () => (fn && (res = fn(fn = 0)), res);
@@ -2207,11 +2225,15 @@ function isVectorType(pgType) {
   const t = pgType.toLowerCase();
   return t === "vector" || t === "halfvec" || t === "sparsevec" || t === "bit";
 }
+function isJsonbType(pgType) {
+  return pgType.toLowerCase() === "json" || pgType.toLowerCase() === "jsonb";
+}
 function emitHonoRoutes(table, _graph, opts) {
   const fileTableName = table.name;
   const Type = pascal(table.name);
   const hasVectorColumns = table.columns.some((c) => isVectorType(c.pgType));
   const vectorColumns = table.columns.filter((c) => isVectorType(c.pgType)).map((c) => c.name);
+  const jsonbColumns = table.columns.filter((c) => isJsonbType(c.pgType)).map((c) => c.name);
   const rawPk = table.pk;
   const pkCols = Array.isArray(rawPk) ? rawPk : rawPk ? [rawPk] : [];
   const safePkCols = pkCols.length ? pkCols : ["id"];
@@ -2298,7 +2320,8 @@ export function register${Type}Routes(app: Hono, deps: { pg: { query: (text: str
     softDeleteColumn: ${softDel ? `"${softDel}"` : "null"},
     includeMethodsDepth: ${opts.includeMethodsDepth},
     allColumnNames: [${table.columns.map((c) => `"${c.name}"`).join(", ")}]${vectorColumns.length > 0 ? `,
-    vectorColumns: ${JSON.stringify(vectorColumns)}` : ""}
+    vectorColumns: ${JSON.stringify(vectorColumns)}` : ""}${jsonbColumns.length > 0 ? `,
+    jsonbColumns: ${JSON.stringify(jsonbColumns)}` : ""}
   };
 ${hasAuth ? `
   // \uD83D\uDD10 Auth: protect all routes for this table
@@ -2516,7 +2539,7 @@ function isVectorType2(pgType) {
   const t = pgType.toLowerCase();
   return t === "vector" || t === "halfvec" || t === "sparsevec" || t === "bit";
 }
-function isJsonbType(pgType) {
+function isJsonbType2(pgType) {
   const t = pgType.toLowerCase();
   return t === "json" || t === "jsonb";
 }
@@ -2542,7 +2565,7 @@ function emitClient(table, graph, opts, model) {
   const Type = pascal(table.name);
   const ext = opts.useJsExtensions ? ".js" : "";
   const hasVectorColumns = table.columns.some((c) => isVectorType2(c.pgType));
-  const hasJsonbColumns = table.columns.some((c) => isJsonbType(c.pgType));
+  const hasJsonbColumns = table.columns.some((c) => isJsonbType2(c.pgType));
   if (process.env.SDK_DEBUG) {
     const vectorCols = table.columns.filter((c) => isVectorType2(c.pgType));
     if (vectorCols.length > 0) {
@@ -4012,14 +4035,14 @@ function tsTypeFor(pgType, opts, enums) {
     return "number[]";
   return "string";
 }
-function isJsonbType2(pgType) {
+function isJsonbType3(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 hasJsonbColumns = table.columns.some((col) => isJsonbType3(col.pgType));
   const insertFields = table.columns.map((col) => {
     const base = tsTypeFor(col.pgType, opts, enums);
     const optional = col.hasDefault || col.nullable ? "?" : "";
@@ -4733,6 +4756,7 @@ export interface OperationContext {
   softDeleteColumn?: string | null;
   includeMethodsDepth: number;
   vectorColumns?: string[];
+  jsonbColumns?: string[];
   allColumnNames?: string[];
   select?: string[];
   exclude?: string[];
@@ -4787,22 +4811,6 @@ function buildColumnList(
   return finalColumns.map(col => \`"\${col}"\`).join(", ");
 }
 
-/**
- * Prepare query parameters for PostgreSQL.
- * The pg library should handle JSONB automatically, but there are edge cases
- * where explicit stringification is needed (e.g., certain pg versions or when
- * objects have been through serialization/deserialization).
- */
-function prepareParams(params: any[]): any[] {
-  return params.map(p => {
-    if (p === null || p === undefined) return p;
-    // Stringify objects/arrays for JSONB - while pg should handle this automatically,
-    // we've observed cases where it fails without explicit stringification
-    if (typeof p === 'object') return JSON.stringify(p);
-    return p;
-  });
-}
-
 /**
  * Parse vector columns in retrieved rows.
  * pgvector returns vectors as strings (e.g., "[1.5,2.5,3.5]") which need to be
@@ -4848,8 +4856,13 @@ export async function createRecord(
                    VALUES (\${placeholders})
                    RETURNING \${returningClause}\`;
 
-    log.debug("SQL:", text, "vals:", vals);
-    const { rows } = await ctx.pg.query(text, prepareParams(vals));
+    const preparedVals = vals.map((v, i) =>
+      v !== null && v !== undefined && typeof v === 'object' && ctx.jsonbColumns?.includes(cols[i])
+        ? JSON.stringify(v)
+        : v
+    );
+    log.debug("SQL:", text, "vals:", preparedVals);
+    const { rows } = await ctx.pg.query(text, preparedVals);
     const parsedRows = parseVectorColumns(rows, ctx.vectorColumns);
 
     return { data: parsedRows[0] ?? null, status: parsedRows[0] ? 201 : 500 };
@@ -4891,7 +4904,7 @@ export async function getByPk(
     const text = \`SELECT \${columns} FROM "\${ctx.table}" WHERE \${wherePkSql} LIMIT 1\`;
     log.debug(\`GET \${ctx.table} by PK:\`, pkValues, "SQL:", text);
 
-    const { rows } = await ctx.pg.query(text, prepareParams(pkValues));
+    const { rows } = await ctx.pg.query(text, pkValues);
     const parsedRows = parseVectorColumns(rows, ctx.vectorColumns);
 
     if (!parsedRows[0]) {
@@ -5363,10 +5376,15 @@ export async function updateRecord(
 
     const returningClause = buildColumnList(ctx.select, ctx.exclude, ctx.allColumnNames);
     const text = \`UPDATE "\${ctx.table}" SET \${setSql} WHERE \${wherePkSql} RETURNING \${returningClause}\`;
-    const params = [...pkValues, ...Object.values(filteredData)];
+    const updateVals = Object.entries(filteredData).map(([col, v]) =>
+      v !== null && v !== undefined && typeof v === 'object' && ctx.jsonbColumns?.includes(col)
+        ? JSON.stringify(v)
+        : v
+    );
+    const params = [...pkValues, ...updateVals];
 
     log.debug(\`PATCH \${ctx.table} SQL:\`, text, "params:", params);
-    const { rows } = await ctx.pg.query(text, prepareParams(params));
+    const { rows } = await ctx.pg.query(text, params);
     const parsedRows = parseVectorColumns(rows, ctx.vectorColumns);
 
     if (!parsedRows[0]) {
@@ -5417,7 +5435,7 @@ export async function deleteRecord(
       : \`DELETE FROM "\${ctx.table}" WHERE \${wherePkSql} RETURNING \${returningClause}\`;
 
     log.debug(\`DELETE \${ctx.softDeleteColumn ? '(soft)' : ''} \${ctx.table} SQL:\`, text, "pk:", pkValues);
-    const { rows } = await ctx.pg.query(text, prepareParams(pkValues));
+    const { rows } = await ctx.pg.query(text, pkValues);
     const parsedRows = parseVectorColumns(rows, ctx.vectorColumns);
 
     if (!parsedRows[0]) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "postgresdk",
-  "version": "0.18.11",
+  "version": "0.18.12",
   "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",
+    "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",
     "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",