@rebasepro/server-postgresql 0.6.0 → 0.6.1

package/dist/index.es.js

@@ -4,8 +4,8 @@ const require = __createRequire(import.meta.url);
 import { Client, Pool } from "pg";
 import { drizzle } from "drizzle-orm/node-postgres";
 import { createEmailService, extractUserFromToken, logger } from "@rebasepro/server-core";
-import { and, asc, count, desc, eq, getTableName, gt, ilike, inArray, isTable, lt, or, relations, sql } from "drizzle-orm";
-import { PgChar, PgText, PgVarchar, boolean, getTableConfig, jsonb, pgSchema, pgTable, text, timestamp, unique, uuid, varchar } from "drizzle-orm/pg-core";
+import { and, asc, count, desc, eq, getTableColumns, getTableName, gt, ilike, inArray, isTable, lt, or, relations, sql } from "drizzle-orm";
+import { PgArray, PgChar, PgTable, PgText, PgVarchar, boolean, getTableConfig, jsonb, pgSchema, pgTable, text, timestamp, unique, uuid, varchar } from "drizzle-orm/pg-core";
 import { createHash, randomUUID } from "crypto";
 import * as fs from "fs";
 import { promises } from "fs";
@@ -3720,8 +3720,10 @@ function serializePropertyToServer(value, property) {
 						};
 					});
 				}
+				return value;
 			}
-			return value;
+			logger.warn(`Expected array value for array property, got ${typeof value}. Coercing to empty array.`);
+			return [];
 		case "map":
 			if (typeof value === "object" && property.properties) {
 				const result = {};
@@ -3943,6 +3945,9 @@ function parsePropertyFromServer(value, property, collection, propertyKey) {
 						};
 					});
 				}
+			} else {
+				logger.warn(`Expected array value from DB for array property, got ${typeof value}. Coercing to array.`);
+				return typeof value === "string" ? [value] : [];
 			}
 			return value;
 		case "map":
@@ -5929,12 +5934,12 @@ var EntityPersistService = class {
 				}
 			}
 		}
-		const serializedResult = serializeDataToServer(otherValues, collection.properties, collection, this.registry);
-		const inverseRelationUpdates = serializedResult.inverseRelationUpdates;
-		const joinPathRelationUpdates = serializedResult.joinPathRelationUpdates;
-		const entityData = sanitizeAndConvertDates(serializedResult.scalarData);
 		let savedId;
 		try {
+			const serializedResult = serializeDataToServer(otherValues, collection.properties, collection, this.registry);
+			const inverseRelationUpdates = serializedResult.inverseRelationUpdates;
+			const joinPathRelationUpdates = serializedResult.joinPathRelationUpdates;
+			const entityData = sanitizeAndConvertDates(serializedResult.scalarData);
 			savedId = await this.db.transaction(async (tx) => {
 				let currentId;
 				if (entityId) {
@@ -10552,6 +10557,39 @@ async function ensureHistoryTableExists(db) {
 	}
 }
 //#endregion
+//#region src/utils/pg-array-null-patch.ts
+/**
+* Patches all PgArray columns on the given tables to handle NULL values safely.
+*
+* Drizzle ORM's `PgArray.mapFromDriverValue` calls `value.map(...)` without
+* guarding against `null`. When a PostgreSQL native array column (`text[]`,
+* `integer[]`, etc.) contains NULL, the pg driver returns `null` in JavaScript,
+* and `null.map(...)` throws `TypeError: value.map is not a function`.
+*
+* This function walks every column of every registered table and, for any
+* `PgArray` column, wraps its `mapFromDriverValue` to return `null` when the
+* database value is nullish.
+*
+* This is a workaround for a known Drizzle ORM issue. Should be removed once
+* Drizzle handles nullable arrays natively.
+*/
+function patchPgArrayNullSafety(tables) {
+	let patchedCount = 0;
+	for (const tableOrRelation of Object.values(tables)) {
+		if (!(tableOrRelation instanceof PgTable)) continue;
+		const columns = getTableColumns(tableOrRelation);
+		for (const column of Object.values(columns)) if (column instanceof PgArray) {
+			const original = column.mapFromDriverValue.bind(column);
+			column.mapFromDriverValue = function(value) {
+				if (value == null) return null;
+				return original(value);
+			};
+			patchedCount++;
+		}
+	}
+	if (patchedCount > 0) logger.debug(`[PgArray] Patched ${patchedCount} array column(s) for null-safety`);
+}
+//#endregion
 //#region src/PostgresBootstrapper.ts
 /**
 * PostgresBootstrapper
@@ -10587,6 +10625,7 @@ function createPostgresBootstrapper(pgConfig) {
 			});
 			if (pgConfig.schema?.enums) registry.registerEnums(pgConfig.schema.enums);
 			if (pgConfig.schema?.relations) registry.registerRelations(pgConfig.schema.relations);
+			if (pgConfig.schema?.tables) patchPgArrayNullSafety(pgConfig.schema.tables);
 			const mergedSchema = {
 				...pgConfig.schema?.tables,
 				...pgConfig.schema?.relations || {}