alepha 0.22.0 → 0.24.0

package/dist/orm/core/index.js

@@ -1,6 +1,6 @@
-import "./chunk-B4FMCO8f.js";
+import "./rolldown-runtime-B4FMCO8f.js";
 import { createRequire } from "node:module";
-import { $atom, $context, $env, $hook, $inject, $mode, $module, $state, Alepha, AlephaError, KIND, Primitive, SchemaValidator, createMiddleware, createPagination, createPrimitive, pageQuerySchema, pageSchema, pageSchema as pageSchema$1, t } from "alepha";
+import { $atom, $context, $env, $hook, $inject, $mode, $module, $state, Alepha, AlephaError, KIND, Primitive, SchemaValidator, createMiddleware, createPagination, createPrimitive, pageQuerySchema, pageSchema, pageSchema as pageSchema$1, z } from "alepha";
 import { AlephaDateTime, DateTimeProvider } from "alepha/datetime";
 import { mkdir, stat } from "node:fs/promises";
 import { $logger } from "alepha/logger";
@@ -41,8 +41,8 @@ var DbError = class extends AlephaError {
 * - `d1://BINDING_NAME` — Cloudflare D1
 * - `hyperdrive://BINDING_NAME` — Cloudflare Hyperdrive
 */
-const databaseEnvSchema = t.object({
-	DATABASE_URL: t.optional(t.text()),
+const databaseEnvSchema = z.object({
+	DATABASE_URL: z.text().optional(),
 	/**
 	* Enable or disable push-based schema synchronization (drizzle-kit push).
 	*
@@ -50,7 +50,7 @@ const databaseEnvSchema = t.object({
 	* Set to `false` in development to skip automatic schema sync
 	* (e.g. when managing migrations manually).
 	*/
-	DATABASE_SYNC: t.optional(t.boolean())
+	DATABASE_SYNC: z.boolean().optional()
 });
 //#endregion
 //#region ../../src/orm/core/providers/DrizzleKitProvider.ts
@@ -516,25 +516,26 @@ const PG_SERIAL = Symbol.for("Alepha.Postgres.Serial");
 //#region ../../src/orm/core/schemas/insertSchema.ts
 const insertSchema = (obj) => {
 	const newProperties = {};
-	for (const key in obj.properties) {
-		const prop = obj.properties[key];
+	for (const key in obj.shape) {
+		const prop = obj.shape[key];
 		if (PG_GENERATED in prop) continue;
-		if (PG_DEFAULT in prop || PG_ORGANIZATION in prop) newProperties[key] = t.optional(prop);
+		if (PG_DEFAULT in prop || PG_ORGANIZATION in prop) newProperties[key] = prop.optional();
+		else if (z.schema.isOptional(prop)) newProperties[key] = z.schema.unwrap(prop).nullable().optional();
 		else newProperties[key] = prop;
 	}
-	return t.object(newProperties, "options" in obj && typeof obj.options === "object" ? { ...obj.options } : {});
+	return z.object(newProperties);
 };
 //#endregion
 //#region ../../src/orm/core/schemas/updateSchema.ts
 const updateSchema = (schema) => {
 	const newProperties = {};
-	for (const key in schema.properties) {
-		const prop = schema.properties[key];
+	for (const key in schema.shape) {
+		const prop = schema.shape[key];
 		if (PG_GENERATED in prop) continue;
-		if (t.schema.isOptional(prop)) newProperties[key] = t.optional(t.union([prop, t.null()]));
+		if (z.schema.isOptional(prop)) newProperties[key] = z.union([prop, z.null()]).optional();
 		else newProperties[key] = prop;
 	}
-	return t.object(newProperties, "options" in schema && typeof schema.options === "object" ? { ...schema.options } : {});
+	return z.object(newProperties);
 };
 //#endregion
 //#region ../../src/orm/core/primitives/$entity.ts
@@ -543,15 +544,15 @@ const updateSchema = (schema) => {
 *
 * @example
 * ```ts
-* import { t } from "alepha";
+* import { z } from "alepha";
 * import { $entity } from "alepha/orm";
 *
 * const userEntity = $entity({
 *   name: "users",
-*   schema: t.object({
+*   schema: z.object({
 *     id: pg.primaryKey(),
-*     name: t.text(),
-*     email: t.email(),
+*     name: z.text(),
+*     email: z.email(),
 *   }),
 * });
 * ```
@@ -585,11 +586,15 @@ var EntityPrimitive = class EntityPrimitive {
 	get schema() {
 		return this.options.schema;
 	}
+	_insertSchema;
 	get insertSchema() {
-		return insertSchema(this.options.schema);
+		this._insertSchema ??= insertSchema(this.options.schema);
+		return this._insertSchema;
 	}
+	_updateSchema;
 	get updateSchema() {
-		return updateSchema(this.options.schema);
+		this._updateSchema ??= updateSchema(this.options.schema);
+		return this._updateSchema;
 	}
 };
 $entity[KIND] = EntityPrimitive;
@@ -602,11 +607,11 @@ $entity[KIND] = EntityPrimitive;
 *
 * @example
 * ```ts
-* import { t } from "alepha";
+* import { z } from "alepha";
 * import { PG_UPDATED_AT } from "../constants/PG_SYMBOLS";
 *
 * export const updatedAtSchema = pgAttr(
-*   t.datetime(), PG_UPDATED_AT,
+*   z.datetime(), PG_UPDATED_AT,
 * );
 * ```
 */
@@ -619,8 +624,8 @@ const pgAttr = (type, attr, value) => {
 */
 const getAttrFields = (schema, name) => {
 	const fields = [];
-	for (const key of Object.keys(schema.properties)) {
-		const value = schema.properties[key];
+	for (const key of Object.keys(schema.shape)) {
+		const value = schema.shape[key];
 		if (name in value) fields.push({
 			type: value,
 			key,
@@ -636,20 +641,20 @@ var DatabaseTypeProvider = class {
 	/**
 	* Creates a primary key with an identity column.
 	*/
-	identityPrimaryKey = (identity, options) => pgAttr(pgAttr(pgAttr(t.integer(options), PG_PRIMARY_KEY), PG_IDENTITY, identity), PG_DEFAULT);
+	identityPrimaryKey = (identity) => pgAttr(pgAttr(pgAttr(z.integer(), PG_PRIMARY_KEY), PG_IDENTITY, identity), PG_DEFAULT);
 	/**
 	* Creates a primary key with a big identity column. (default)
 	*/
-	bigIdentityPrimaryKey = (identity, options) => pgAttr(pgAttr(pgAttr(t.int64(options), PG_PRIMARY_KEY), PG_IDENTITY, identity), PG_DEFAULT);
+	bigIdentityPrimaryKey = (identity) => pgAttr(pgAttr(pgAttr(z.int64(), PG_PRIMARY_KEY), PG_IDENTITY, identity), PG_DEFAULT);
 	/**
 	* Creates a primary key with a UUID column.
 	*/
-	uuidPrimaryKey = () => pgAttr(pgAttr(t.uuid(), PG_PRIMARY_KEY), PG_DEFAULT);
-	primaryKey(type, options, identity) {
-		if (!type || t.schema.isInteger(type)) return pgAttr(pgAttr(pgAttr(t.integer(options), PG_PRIMARY_KEY), PG_IDENTITY, identity), PG_DEFAULT);
-		if (t.schema.isString(type) && type.format === "uuid") return pgAttr(pgAttr(t.uuid(), PG_PRIMARY_KEY), PG_DEFAULT);
-		if (t.schema.isNumber(type) && type.format === "int64") return pgAttr(pgAttr(pgAttr(t.number(options), PG_PRIMARY_KEY), PG_IDENTITY, identity), PG_DEFAULT);
-		if (t.schema.isBigInt(type)) return pgAttr(pgAttr(pgAttr(t.bigint(options), PG_PRIMARY_KEY), PG_IDENTITY, identity), PG_DEFAULT);
+	uuidPrimaryKey = () => pgAttr(pgAttr(z.uuid(), PG_PRIMARY_KEY), PG_DEFAULT);
+	primaryKey(type, _options, identity) {
+		if (!type || z.schema.isInteger(type)) return pgAttr(pgAttr(pgAttr(z.integer(), PG_PRIMARY_KEY), PG_IDENTITY, identity), PG_DEFAULT);
+		if (z.schema.isString(type) && z.schema.format(type) === "uuid") return pgAttr(pgAttr(z.uuid(), PG_PRIMARY_KEY), PG_DEFAULT);
+		if (z.schema.isNumber(type) && z.schema.format(type) === "int64") return pgAttr(pgAttr(pgAttr(z.number(), PG_PRIMARY_KEY), PG_IDENTITY, identity), PG_DEFAULT);
+		if (z.schema.isBigInt(type)) return pgAttr(pgAttr(pgAttr(z.bigint(), PG_PRIMARY_KEY), PG_IDENTITY, identity), PG_DEFAULT);
 		throw new AlephaError(`Unsupported type for primary key: ${type}`);
 	}
 	/**
@@ -670,21 +675,21 @@ var DatabaseTypeProvider = class {
 	* @see {@link RepositoryPrimitive#save}
 	* @see {@link PgVersionMismatchError}
 	*/
-	version = (options = {}) => this.default(pgAttr(t.integer(options), PG_VERSION), 0);
+	version = () => this.default(pgAttr(z.integer(), PG_VERSION), 0);
 	/**
 	* Creates a column Created At. So just a datetime column with a default value of the current timestamp.
 	*/
-	createdAt = (options) => pgAttr(pgAttr(t.datetime(options), PG_CREATED_AT), PG_DEFAULT);
+	createdAt = () => pgAttr(pgAttr(z.datetime(), PG_CREATED_AT), PG_DEFAULT);
 	/**
 	* Creates a column Updated At. Like createdAt, but it is updated on every update of the row.
 	*/
-	updatedAt = (options) => pgAttr(pgAttr(t.datetime(options), PG_UPDATED_AT), PG_DEFAULT);
+	updatedAt = () => pgAttr(pgAttr(z.datetime(), PG_UPDATED_AT), PG_DEFAULT);
 	/**
 	* Creates a column Deleted At for soft delete functionality.
 	* This is used to mark rows as deleted without actually removing them from the database.
 	* The column is nullable - NULL means not deleted, timestamp means deleted.
 	*/
-	deletedAt = (options) => pgAttr(t.optional(t.datetime(options)), PG_DELETED_AT);
+	deletedAt = () => pgAttr(z.datetime().optional(), PG_DELETED_AT);
 	/**
 	* Creates an organization column for multi-tenant row scoping.
 	*
@@ -693,17 +698,24 @@ var DatabaseTypeProvider = class {
 	*
 	* @param options.nullable - When `false`, the column is NOT NULL in the database and
 	*   the ORM rejects inserts that arrive without an organization context.
-	*   Defaults to `true` (nullable) for backward compatibility: NULL rows are visible
-	*   to every tenant, which is the historic "global row" semantics.
+	*   Defaults to `true` (nullable) — unless `strict` is set, which flips the
+	*   default to non-nullable. NULL rows are visible to every tenant (the
+	*   historic "global row" semantics) only when the column is nullable AND
+	*   not strict.
+	* @param options.strict - Fail-closed tenant scoping for security-sensitive
+	*   tables. Refuses reads/writes with no resolved tenant (instead of a
+	*   fail-open "see/write everything") and drops the `OR org IS NULL` escape
+	*   so a scoped tenant never sees global rows. Defaults to `false`.
 	*/
 	organization = (options) => {
-		return pgAttr(options?.nullable ?? true ? t.optional(t.uuid()) : t.uuid(), PG_ORGANIZATION);
+		const strict = options?.strict ?? false;
+		return pgAttr(options?.nullable ?? !strict ? z.uuid().optional() : z.uuid(), PG_ORGANIZATION, { strict });
 	};
 	/**
 	* Creates a reference to another table or schema. Basically a foreign key.
 	*/
 	ref = (type, ref, actions) => {
-		const finalActions = actions ?? { onDelete: t.schema.isOptional(type) ? "set null" : "cascade" };
+		const finalActions = actions ?? { onDelete: z.schema.isOptional(type) ? "set null" : "cascade" };
 		return this.attr(type, PG_REF, {
 			ref,
 			actions: finalActions
@@ -713,8 +725,8 @@ var DatabaseTypeProvider = class {
 	* Creates a page schema for a given object schema.
 	* It's used by {@link Repository#paginate} method.
 	*/
-	page = (resource, options) => {
-		return pageSchema$1(resource, options);
+	page = (resource) => {
+		return pageSchema$1(resource);
 	};
 };
 /**
@@ -751,16 +763,16 @@ const db = new DatabaseTypeProvider();
 */
 const alephaSequences = $entity({
 	name: "alepha_sequences",
-	schema: t.object({
-		id: db.primaryKey(t.uuid()),
+	schema: z.object({
+		id: db.primaryKey(z.uuid()),
 		createdAt: db.createdAt(),
 		updatedAt: db.updatedAt(),
-		name: t.text({ description: "Sequence primitive name (from $sequence's property key)." }),
-		scope: t.text({
+		name: z.text({ description: "Sequence primitive name (from $sequence's property key)." }),
+		scope: z.text({
 			description: "Caller-provided sub-scope. Defaults to 'default' for the unscoped form.",
 			default: "default"
 		}),
-		value: t.integer({ description: "Current counter value, advanced atomically on each call." })
+		value: z.integer().describe("Current counter value, advanced atomically on each call.")
 	}),
 	indexes: [{
 		columns: ["name", "scope"],
@@ -803,7 +815,8 @@ var DbColumnNotFoundError = class DbColumnNotFoundError extends DbError {
 		if (pgMatch) {
 			const column = pgMatch[1];
 			const table = pgMatch[2];
-			return new DbColumnNotFoundError(table ? `Column '${column}' does not exist in table '${table}'` : `Column '${column}' does not exist`, error, {
+			const msg = table ? `Column '${column}' does not exist in table '${table}'` : `Column '${column}' does not exist`;
+			return new DbColumnNotFoundError(msg, error, {
 				column,
 				table
 			});
@@ -812,7 +825,8 @@ var DbColumnNotFoundError = class DbColumnNotFoundError extends DbError {
 		if (sqliteMatch) {
 			const table = sqliteMatch[1];
 			const column = sqliteMatch[2];
-			return new DbColumnNotFoundError(table ? `Column '${column}' does not exist in table '${table}'` : `Column '${column}' does not exist`, error, {
+			const msg = table ? `Column '${column}' does not exist in table '${table}'` : `Column '${column}' does not exist`;
+			return new DbColumnNotFoundError(msg, error, {
 				column,
 				table
 			});
@@ -1112,7 +1126,7 @@ var PgRelationManager = class {
 			const childJoins = joins.filter((j) => j.parent === joinPath);
 			let joinSchema = join.schema;
 			if (childJoins.length > 0) joinSchema = this.buildSchemaWithJoins(join.schema, joins, joinPath);
-			schema.properties[join.key] = t.optional(joinSchema);
+			schema.properties[join.key] = joinSchema.optional();
 		}
 		return schema;
 	}
@@ -1167,8 +1181,16 @@ var QueryManager = class {
 							dialect: options.dialect
 						});
 					}).filter((it) => it != null);
-					if (key === "and") return and(...operations);
-					if (key === "or") return or(...operations);
+					if (key === "and") {
+						const combined = and(...operations);
+						if (combined) conditions.push(combined);
+						continue;
+					}
+					if (key === "or") {
+						const combined = or(...operations);
+						if (combined) conditions.push(combined);
+						continue;
+					}
 				}
 				if (key === "not") {
 					const where = this.toSQL(operator, {
@@ -1555,19 +1577,11 @@ var Repository = class Repository {
 		try {
 			let rows = await builder.execute();
 			let schema = this.entity.schema;
-			if (columns) schema = t.pick(schema, columns);
-			if (joins.length) rows = rows.map((row) => {
-				const rowSchema = {
-					...schema,
-					properties: { ...schema.properties }
-				};
-				return this.relationManager.mapRowWithJoins(row[this.tableName], row, rowSchema, joins);
-			});
+			if (columns) schema = schema.pick(Object.fromEntries(columns.map((c) => [c, true])));
+			const joinedSchema = joins.length ? this.relationManager.buildSchemaWithJoins(schema, joins) : null;
+			if (joins.length) rows = rows.map((row) => this.relationManager.mapRowWithJoins(row[this.tableName], row, schema, joins));
 			rows = rows.map((row) => {
-				if (joins.length) {
-					const joinedSchema = this.relationManager.buildSchemaWithJoins(schema, joins);
-					return this.cleanWithJoins(row, joinedSchema, joins);
-				}
+				if (joinedSchema) return this.cleanWithJoins(row, joinedSchema, joins);
 				return this.clean(row, schema);
 			});
 			await this.alepha.events.emit("repository:read:after", {
@@ -1623,10 +1637,10 @@ var Repository = class Repository {
 		};
 		const tasks = [];
 		tasks.push(this.findMany({
+			...query,
 			offset,
 			limit: limit + 1,
-			orderBy,
-			...query
+			orderBy
 		}, opts).then((it) => {
 			timers.query = this.dateTimeProvider.nowMillis() - timers.query;
 			return it;
@@ -2071,7 +2085,8 @@ var Repository = class Repository {
 		if (query.orderBy) {
 			const clauses = this.queryManager.normalizeOrderBy(query.orderBy);
 			builder = builder.orderBy(...clauses.map((clause) => {
-				const col = flatFields[clause.column.includes(".") ? clause.column.replace(".", AGG_SEPARATOR) : clause.column];
+				const colName = clause.column.includes(".") ? clause.column.replace(".", AGG_SEPARATOR) : clause.column;
+				const col = flatFields[colName];
 				if (!col) throw new AlephaError(`Invalid orderBy column '${clause.column}' in aggregate query`);
 				return clause.direction === "desc" ? desc(col) : asc(col);
 			}));
@@ -2126,16 +2141,24 @@ var Repository = class Repository {
 	withOrganization(where) {
 		const orgField = this.organizationField();
 		if (!orgField) return where;
+		const strict = orgField.data?.strict === true;
 		const value = this.resolveOrganizationValue();
-		if (!value) return where;
-		return { and: [where, { or: [{ [orgField.key]: { eq: value } }, { [orgField.key]: { isNull: true } }] }] };
+		if (!value) {
+			if (strict) throw new AlephaError(`Refusing to query tenant-scoped entity '${this.tableName}' with no resolved tenant/organization in context (strict tenancy).`);
+			return where;
+		}
+		return { and: [where, strict ? { [orgField.key]: { eq: value } } : { or: [{ [orgField.key]: { eq: value } }, { [orgField.key]: { isNull: true } }] }] };
 	}
 	stampOrganization(data) {
 		const orgField = this.organizationField();
 		if (!orgField) return;
-		if (data[orgField.key] != null) return;
+		if (orgField.key in data && data[orgField.key] !== void 0) return;
 		const value = this.resolveOrganizationValue();
-		if (value) data[orgField.key] = value;
+		if (value) {
+			data[orgField.key] = value;
+			return;
+		}
+		if (orgField.data?.strict === true) throw new AlephaError(`Refusing to insert into tenant-scoped entity '${this.tableName}' with no organization set and no resolved tenant in context (strict tenancy).`);
 	}
 	/**
 	* Resolve the value used for `PG_ORGANIZATION` scoping.
@@ -2160,7 +2183,7 @@ var Repository = class Repository {
 	* Convert something to valid Pg Insert Value.
 	*/
 	cast(data, insert) {
-		const schema = insert ? this.entity.insertSchema : t.partial(this.entity.updateSchema);
+		const schema = insert ? this.entity.insertSchema : this.entity.updateSchema.partial();
 		const sqlValues = {};
 		const scalarData = {};
 		for (const key of Object.keys(data)) {
@@ -2168,8 +2191,12 @@ var Repository = class Repository {
 			if (value != null && isSQLWrapper(value)) sqlValues[key] = value;
 			else scalarData[key] = value;
 		}
+		const encoded = this.alepha.codec.encode(schema, scalarData);
 		return {
-			...this.alepha.codec.encode(schema, scalarData),
+			...insert ? encoded : Object.keys(scalarData).reduce((acc, key) => {
+				acc[key] = encoded[key];
+				return acc;
+			}, {}),
 			...sqlValues
 		};
 	}
@@ -2178,12 +2205,17 @@ var Repository = class Repository {
 	*/
 	clean(row, schema) {
 		for (const key of Object.keys(schema.properties)) {
-			const value = schema.properties[key];
+			const prop = schema.properties[key];
+			const value = z.schema.unwrap(prop);
+			if (row[key] === null && z.schema.isOptional(prop)) {
+				delete row[key];
+				continue;
+			}
 			if (typeof row[key] === "string") {
-				if (t.schema.isDateTime(value)) row[key] = this.dateTimeProvider.of(row[key]).toISOString();
-				else if (t.schema.isDate(value)) row[key] = this.dateTimeProvider.of(`${row[key]}T00:00:00Z`).toISOString().split("T")[0];
+				if (z.schema.isDateTime(value)) row[key] = this.dateTimeProvider.of(row[key]).toISOString();
+				else if (z.schema.isDate(value)) row[key] = this.dateTimeProvider.of(`${row[key]}T00:00:00Z`).toISOString().split("T")[0];
 			}
-			if (typeof row[key] === "bigint" && t.schema.isBigInt(value)) row[key] = row[key].toString();
+			if ((typeof row[key] === "bigint" || typeof row[key] === "number") && z.schema.isBigInt(value)) row[key] = String(row[key]);
 		}
 		return this.alepha.codec.decode(schema, row);
 	}
@@ -2235,7 +2267,7 @@ var Repository = class Repository {
 	* @returns The where clause for the ID.
 	*/
 	getWhereId(id) {
-		return { [this.id.key]: { eq: t.schema.isString(this.id.type) ? String(id) : Number(id) } };
+		return { [this.id.key]: { eq: z.schema.isString(this.id.type) ? String(id) : Number(id) } };
 	}
 	/**
 	* Find a primary key in the schema.
@@ -2574,7 +2606,8 @@ var SqliteModelBuilder = class extends ModelBuilder {
 	schemaToSqliteColumns = (tableName, schema, enums, tables) => {
 		return Object.entries(schema.properties).reduce((columns, [key, value]) => {
 			let col = this.mapFieldToSqliteColumn(tableName, key, value, enums);
-			if ("default" in value && value.default != null) col = col.default(value.default);
+			const defaultValue = z.schema.getDefault(value);
+			if (defaultValue != null) col = col.default(defaultValue);
 			if (PG_PRIMARY_KEY in value) col = col.primaryKey();
 			if (PG_REF in value) {
 				const config = value[PG_REF];
@@ -2591,55 +2624,56 @@ var SqliteModelBuilder = class extends ModelBuilder {
 				const gen = value[PG_GENERATED];
 				col = col.generatedAlwaysAs(gen.expression, { mode: gen.mode ?? "virtual" });
 			}
-			if (schema.required?.includes(key)) col = col.notNull();
+			if (z.schema.requiredKeys(schema).includes(key)) col = col.notNull();
 			columns[key] = col;
 			return columns;
 		}, {});
 	};
 	mapFieldToSqliteColumn = (tableName, fieldName, value, enums) => {
 		const key = this.toColumnName(fieldName);
-		if ("anyOf" in value && Array.isArray(value.anyOf) && value.anyOf.length === 2 && value.anyOf.some((it) => t.schema.isNull(it))) value = value.anyOf.find((it) => !t.schema.isNull(it));
-		if (t.schema.isInteger(value)) {
+		value = z.schema.unwrap(value);
+		if (z.schema.isInteger(value)) {
 			if (PG_SERIAL in value || PG_IDENTITY in value) return pg.integer(key, { mode: "number" }).primaryKey({ autoIncrement: true });
 			return pg.integer(key);
 		}
-		if (t.schema.isBigInt(value)) {
+		if (z.schema.isBigInt(value)) {
 			if (PG_PRIMARY_KEY in value || PG_IDENTITY in value) return pg.integer(key, { mode: "number" }).primaryKey({ autoIncrement: true });
 			return pg.integer(key, { mode: "number" });
 		}
-		if (t.schema.isNumber(value)) {
+		if (z.schema.isNumber(value)) {
 			if (PG_IDENTITY in value) return pg.integer(key, { mode: "number" }).primaryKey({ autoIncrement: true });
-			return pg.numeric(key);
-		}
-		if (t.schema.isString(value)) return this.mapStringToSqliteColumn(key, value);
-		if (t.schema.isBoolean(value)) return this.sqliteBool(key, value);
-		if (t.schema.isObject(value)) return this.sqliteJson(key, value);
-		if (t.schema.isRecord(value)) return this.sqliteJson(key, value);
-		if (t.schema.isAny(value)) return this.sqliteJson(key, value);
-		if (t.schema.isArray(value)) {
-			if (t.schema.isObject(value.items)) return this.sqliteJson(key, value);
-			if (t.schema.isRecord(value.items)) return this.sqliteJson(key, value);
-			if (t.schema.isAny(value.items)) return this.sqliteJson(key, value);
-			if (t.schema.isString(value.items)) return this.sqliteJson(key, value);
-			if (t.schema.isInteger(value.items)) return this.sqliteJson(key, value);
-			if (t.schema.isNumber(value.items)) return this.sqliteJson(key, value);
-			if (t.schema.isBoolean(value.items)) return this.sqliteJson(key, value);
-		}
-		if (t.schema.isUnsafe(value) && "type" in value && value.type === "string") return this.mapStringToSqliteColumn(key, value);
+			return pg.real(key);
+		}
+		if (z.schema.isString(value)) return this.mapStringToSqliteColumn(key, value);
+		if (z.schema.isBoolean(value)) return this.sqliteBool(key, value);
+		if (z.schema.isObject(value)) return this.sqliteJson(key, value);
+		if (z.schema.isRecord(value)) return this.sqliteJson(key, value);
+		if (z.schema.isAny(value)) return this.sqliteJson(key, value);
+		if (z.schema.isArray(value)) {
+			if (z.schema.isObject(value.items)) return this.sqliteJson(key, value);
+			if (z.schema.isRecord(value.items)) return this.sqliteJson(key, value);
+			if (z.schema.isAny(value.items)) return this.sqliteJson(key, value);
+			if (z.schema.isString(value.items)) return this.sqliteJson(key, value);
+			if (z.schema.isInteger(value.items)) return this.sqliteJson(key, value);
+			if (z.schema.isNumber(value.items)) return this.sqliteJson(key, value);
+			if (z.schema.isBoolean(value.items)) return this.sqliteJson(key, value);
+			if (z.schema.isEnum(value.items)) return this.sqliteJson(key, value);
+		}
+		if (z.schema.isEnum(value)) return this.mapStringToSqliteColumn(key, value);
 		throw new AlephaError(`Unsupported schema for field '${tableName}.${fieldName}' (schema: ${JSON.stringify(value)})`);
 	};
 	mapStringToSqliteColumn = (key, value) => {
-		if (value.format === "uuid") {
+		if (z.schema.format(value) === "uuid") {
 			if (PG_PRIMARY_KEY in value) return pg.text(key).primaryKey().$defaultFn(() => randomUUID());
 			return pg.text(key);
 		}
-		if (value.format === "byte") return this.sqliteJson(key, value);
-		if (value.format === "date-time") {
+		if (z.schema.format(value) === "binary") return this.sqliteJson(key, value);
+		if (z.schema.format(value) === "date-time") {
 			if (PG_CREATED_AT in value) return this.sqliteDateTime(key, {}).default(sql$1`(unixepoch('subsec') * 1000)`);
 			if (PG_UPDATED_AT in value) return this.sqliteDateTime(key, {}).default(sql$1`(unixepoch('subsec') * 1000)`);
 			return this.sqliteDateTime(key, {});
 		}
-		if (value.format === "date") return this.sqliteDate(key, {});
+		if (z.schema.format(value) === "date") return this.sqliteDate(key, {});
 		return pg.text(key);
 	};
 	sqliteJson = (name, document) => pg.customType({
@@ -2677,7 +2711,7 @@ const envSchema$1 = databaseEnvSchema;
 */
 const bunSqliteOptions = $atom({
 	name: "alepha.postgres.bun-sqlite.options",
-	schema: t.object({ path: t.optional(t.string({ description: "Filepath or :memory:. If empty, provider will use DATABASE_URL from env." })) }),
+	schema: z.object({ path: z.string().describe("Filepath or :memory:. If empty, provider will use DATABASE_URL from env.").optional() }),
 	default: {}
 });
 /**
@@ -2780,7 +2814,7 @@ var BunSqliteProvider = class extends DatabaseProvider {
 */
 var CloudflareD1Provider = class extends DatabaseProvider {
 	builder = $inject(SqliteModelBuilder);
-	env = $env(t.object({ DATABASE_URL: t.string({ description: "Expect to be 'd1://binding'" }) }));
+	env = $env(z.object({ DATABASE_URL: z.string().describe("Expect to be 'd1://binding'") }));
 	d1;
 	drizzleDb;
 	get name() {
@@ -2877,7 +2911,7 @@ const envSchema = databaseEnvSchema;
 */
 const nodeSqliteOptions = $atom({
 	name: "alepha.postgres.node-sqlite.options",
-	schema: t.object({ path: t.optional(t.string({ description: "Filepath or :memory:. If empty, provider will use DATABASE_URL from env." })) }),
+	schema: z.object({ path: z.string().describe("Filepath or :memory:. If empty, provider will use DATABASE_URL from env.").optional() }),
 	default: {}
 });
 /**
@@ -2983,7 +3017,8 @@ var NodeSqliteProvider = class NodeSqliteProvider extends DatabaseProvider {
 		};
 		const origPrepare = db.prepare.bind(db);
 		db.prepare = (sql) => {
-			const stmt = origPrepare(NodeSqliteProvider.aliasSelectColumns(sql));
+			const aliased = NodeSqliteProvider.aliasSelectColumns(sql);
+			const stmt = origPrepare(aliased);
 			if (!stmt.raw) stmt.raw = () => ({
 				all: (...args) => stmt.all(...args).map((row) => Object.values(row)),
 				get: (...args) => {
@@ -3136,7 +3171,7 @@ var DbConnectionError = class DbConnectionError extends DbError {
 /**
 * @deprecated Use `pg.primaryKey()` instead.
 */
-const legacyIdSchema = pgAttr(pgAttr(pgAttr(t.integer(), PG_PRIMARY_KEY), PG_SERIAL), PG_DEFAULT);
+const legacyIdSchema = pgAttr(pgAttr(pgAttr(z.integer(), PG_PRIMARY_KEY), PG_SERIAL), PG_DEFAULT);
 //#endregion
 //#region ../../src/orm/core/primitives/$seed.ts
 /**