alepha 0.19.1 → 0.19.3

package/dist/orm/core/index.js

@@ -1,6 +1,6 @@
 import "./chunk-o8xxKEmq.js";
 import { createRequire } from "node:module";
-import { $atom, $context, $env, $hook, $inject, $mode, $module, $use, Alepha, AlephaError, KIND, Primitive, Value, 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, Value, createMiddleware, createPagination, createPrimitive, pageQuerySchema, pageSchema, pageSchema as pageSchema$1, t } from "alepha";
 import { AlephaDateTime, DateTimeProvider } from "alepha/datetime";
 import { mkdir, stat } from "node:fs/promises";
 import { $logger } from "alepha/logger";
@@ -11,6 +11,7 @@ import { dirname } from "node:path";
 import { randomUUID } from "node:crypto";
 import * as pg from "drizzle-orm/sqlite-core";
 import { check, foreignKey, index, sqliteTable, sqliteView, unique, uniqueIndex } from "drizzle-orm/sqlite-core";
+import { currentUserAtom } from "alepha/security";
 import { isSQLWrapper as isSQLWrapper$1 } from "drizzle-orm/sql/sql";
 export * from "drizzle-orm/pg-core";
 //#region ../../src/orm/core/errors/DbError.ts
@@ -63,7 +64,7 @@ var DrizzleKitProvider = class {
 		}
 		if (this.alepha.isTest()) {
 			const { statements } = await this.generateMigration(provider);
-			await this.executeFallbackStatements(statements, provider);
+			await this.executeStatements(statements.map((s) => s.replace(/^CREATE SCHEMA /i, "CREATE SCHEMA IF NOT EXISTS ")), provider);
 			return;
 		}
 		const now = this.dateTime.nowMillis();
@@ -79,9 +80,9 @@ var DrizzleKitProvider = class {
 		} catch (error) {
 			this.log.debug("Push sync not available, falling back to migration generation", { error });
 			const { statements } = await this.generateMigration(provider);
-			await this.executeFallbackStatements(statements, provider);
+			await this.executeStatementsLenient(statements, provider);
 		}
-		this.log.info(`Sync with '${provider.name}' OK [${this.dateTime.nowMillis() - now}ms]`);
+		this.log.info(`Synchronization of '${provider.name}' OK [${this.dateTime.nowMillis() - now}ms]`);
 	}
 	/**
 	* Generate SQL migration statements by diffing two schema states.
@@ -180,10 +181,10 @@ var DrizzleKitProvider = class {
 			hasDataLoss: false
 		};
 		let result;
-		if (provider.dialect === "sqlite") result = await this.muteSpinner(() => kit.pushSQLiteSchema(models, provider.db));
+		if (provider.dialect === "sqlite") result = await kit.pushSQLiteSchema(models, provider.db);
 		else {
 			const wrappedDb = this.wrapDbForDrizzleKit(provider.db);
-			result = await this.muteSpinner(() => kit.pushSchema(models, wrappedDb, [provider.schema]));
+			result = await kit.pushSchema(models, wrappedDb, [provider.schema]);
 		}
 		return {
 			statements: result.statementsToExecute,
@@ -192,8 +193,8 @@ var DrizzleKitProvider = class {
 		};
 	}
 	async pushSqlite(kit, models, provider) {
-		const result = await this.muteSpinner(() => kit.pushSQLiteSchema(models, provider.db));
-		await this.runPushResult(result, provider);
+		const { statementsToExecute } = await kit.pushSQLiteSchema(models, provider.db);
+		await this.executeStatements(statementsToExecute, provider);
 	}
 	/**
 	* Push schema changes to PostgreSQL using Drizzle Kit's pushSchema with schema filters.
@@ -201,39 +202,32 @@ var DrizzleKitProvider = class {
 	async pushPostgres(kit, models, provider) {
 		if (provider.schema !== "public") await this.createSchemaIfNotExists(provider, provider.schema);
 		const wrappedDb = this.wrapDbForDrizzleKit(provider.db);
-		const result = await this.muteSpinner(() => kit.pushSchema(models, wrappedDb, [provider.schema]));
-		await this.runPushResult(result, provider);
+		const { statementsToExecute } = await kit.pushSchema(models, wrappedDb, [provider.schema]);
+		await this.executeStatements(statementsToExecute, provider);
 	}
 	/**
-	* Run the statements returned by Drizzle Kit's pushSchema, with safety filters and logging.
+	* Execute a list of SQL statements against the provider.
 	*/
-	async runPushResult(result, provider) {
-		const safe = result.statementsToExecute.filter((s) => {
-			const upper = s.trimStart().toUpperCase();
-			if (upper.startsWith("DROP SCHEMA") || upper.startsWith("DROP TABLE")) {
-				this.log.warn("Skipping destructive statement", { statement: s });
-				return false;
-			}
-			return true;
-		});
-		if (result.hasDataLoss) this.log.warn("Push would cause data loss", {
-			warnings: result.warnings,
-			statements: result.statementsToExecute
-		});
-		if (safe.length > 0) {
-			this.log.debug(`Pushing ${safe.length} statements ...`, { statements: safe });
-			for (const statement of safe) await provider.execute(sql$1.raw(statement));
-		}
+	async executeStatements(statements, provider) {
+		if (statements.length > 0) this.log.debug(`Executing ${statements.length} statements ...`, { statements });
+		for (const statement of statements) await provider.execute(sql$1.raw(statement));
 	}
 	/**
-	* Execute migration statements as a fallback when push sync is not available.
-	* Used for drivers that don't support Drizzle Kit introspection (e.g. PgLite).
+	* Execute SQL statements, ignoring "already exists" errors.
+	*
+	* Used by the fallback migration path where push may have partially
+	* applied changes before erroring, leaving some objects already created.
 	*/
-	async executeFallbackStatements(statements, provider) {
-		for (const statement of statements) {
-			const upper = statement.trimStart().toUpperCase();
-			if (upper.startsWith("DROP SCHEMA") || upper.startsWith("CREATE SCHEMA")) continue;
+	async executeStatementsLenient(statements, provider) {
+		if (statements.length > 0) this.log.debug(`Executing ${statements.length} statements (lenient) ...`, { statements });
+		for (const statement of statements) try {
 			await provider.execute(sql$1.raw(statement));
+		} catch (error) {
+			if ((error?.message ?? "").includes("already exists")) {
+				this.log.debug(`Skipped (already exists): ${statement.slice(0, 80)}`);
+				continue;
+			}
+			throw error;
 		}
 	}
 	async createSchemaIfNotExists(provider, schemaName) {
@@ -264,30 +258,6 @@ var DrizzleKitProvider = class {
 		} });
 	}
 	/**
-	* Suppress Drizzle Kit's spinner output during a callback.
-	*
-	* Drizzle Kit uses hanji's renderWithTask with a setInterval-based spinner.
-	* If the wrapped task throws, the interval is never cleared and leaks
-	* spinner frames to stdout. We keep the filter active until the next
-	* tick after the promise settles to catch any straggling writes.
-	*/
-	async muteSpinner(fn) {
-		const originalWrite = process.stdout.write;
-		const filter = (chunk, ...args) => {
-			const str = typeof chunk === "string" ? chunk : chunk?.toString?.() ?? "";
-			if (str.includes("Pulling schema from database")) return true;
-			if (str.includes("\x1B[1A")) return true;
-			return originalWrite.call(process.stdout, chunk, ...args);
-		};
-		process.stdout.write = filter;
-		try {
-			return await fn();
-		} finally {
-			await new Promise((r) => setTimeout(r, 200));
-			process.stdout.write = originalWrite;
-		}
-	}
-	/**
 	* Try to load the official Drizzle Kit API.
 	*/
 	importDrizzleKit() {
@@ -528,6 +498,7 @@ const PG_IDENTITY = Symbol.for("Alepha.Postgres.Identity");
 const PG_ENUM = Symbol.for("Alepha.Postgres.Enum");
 const PG_REF = Symbol.for("Alepha.Postgres.Ref");
 const PG_GENERATED = Symbol.for("Alepha.Postgres.Generated");
+const PG_ORGANIZATION = Symbol.for("Alepha.Postgres.Organization");
 /**
 * @deprecated Use `PG_IDENTITY` instead.
 */
@@ -732,6 +703,13 @@ var ModelBuilder = class {
 							if ("where" in indexDef && indexDef.where) idx = idx.where(indexDef.where);
 							configs.push(idx);
 						}
+					} else if ("expressions" in indexDef) {
+						const parts = indexDef.expressions(self);
+						if (parts.length > 0) {
+							let idx = indexDef.unique ? builders.uniqueIndex(indexDef.name).on(...parts) : builders.index(indexDef.name).on(...parts);
+							if ("where" in indexDef && indexDef.where) idx = idx.where(indexDef.where);
+							configs.push(idx);
+						}
 					} else if ("columns" in indexDef) {
 						const columnNames = indexDef.columns.map((col) => this.toColumnName(col));
 						const indexName = indexDef.name || `${entity.name}_${columnNames.join("_")}_idx`;
@@ -965,7 +943,7 @@ const bunSqliteOptions = $atom({
 var BunSqliteProvider = class extends DatabaseProvider {
 	env = $env(envSchema$1);
 	builder = $inject(SqliteModelBuilder);
-	options = $use(bunSqliteOptions);
+	options = $state(bunSqliteOptions);
 	sqlite;
 	bunDb;
 	get name() {
@@ -1152,7 +1130,7 @@ const nodeSqliteOptions = $atom({
 var NodeSqliteProvider = class NodeSqliteProvider extends DatabaseProvider {
 	env = $env(envSchema);
 	builder = $inject(SqliteModelBuilder);
-	options = $use(nodeSqliteOptions);
+	options = $state(nodeSqliteOptions);
 	sqlite;
 	drizzleDb;
 	get name() {
@@ -1214,7 +1192,7 @@ var NodeSqliteProvider = class NodeSqliteProvider extends DatabaseProvider {
 			this.sqlite = new DatabaseSync(filepath);
 			this.initDrizzle();
 			if (!this.alepha.isServerless()) await this.migrate();
-			this.log.info(`SQLite database OK`, { at: filepath });
+			this.log.info(`Sqlite connection OK`, { at: filepath });
 		}
 	});
 	/**
@@ -1856,8 +1834,10 @@ var QueryManager = class {
 		if (operator?.isNotNull != null) conditions.push(isNotNull(column));
 		if (operator?.like != null) conditions.push(like(column, encodeValue(operator.like)));
 		if (operator?.notLike != null) conditions.push(notLike(column, encodeValue(operator.notLike)));
-		if (operator?.ilike != null) conditions.push(ilike(column, encodeValue(operator.ilike)));
-		if (operator?.notIlike != null) conditions.push(notIlike(column, encodeValue(operator.notIlike)));
+		if (operator?.ilike != null) if (dialect === "sqlite") conditions.push(sql$1`LOWER(${column}) LIKE LOWER(${encodeValue(operator.ilike)})`);
+		else conditions.push(ilike(column, encodeValue(operator.ilike)));
+		if (operator?.notIlike != null) if (dialect === "sqlite") conditions.push(sql$1`LOWER(${column}) NOT LIKE LOWER(${encodeValue(operator.notIlike)})`);
+		else conditions.push(notIlike(column, encodeValue(operator.notIlike)));
 		if (operator?.contains != null) {
 			const escapedValue = String(operator.contains).replace(/\\/g, "\\\\").replace(/%/g, "\\%").replace(/_/g, "\\_");
 			if (dialect === "sqlite") conditions.push(sql$1`LOWER(${column}) LIKE LOWER(${encodeValue(`%${escapedValue}%`)}) ESCAPE '\\'`);
@@ -2134,7 +2114,7 @@ var Repository = class Repository {
 		const builder = query.distinct ? this.rawSelectDistinct(opts, query.distinct) : this.rawSelect(opts);
 		const joins = [];
 		if (query.with) this.relationManager.buildJoins(this.provider, builder, joins, query.with, this.table);
-		const where = this.withDeletedAt(query.where ?? {}, opts);
+		const where = this.withOrganization(this.withDeletedAt(query.where ?? {}, opts));
 		builder.where(() => this.toSQL(where, joins));
 		if (query.offset) {
 			builder.offset(query.offset);
@@ -2230,7 +2210,7 @@ var Repository = class Repository {
 			return it;
 		}));
 		if (opts.count) {
-			const countWhere = this.withDeletedAt(query.where ?? {}, opts);
+			const countWhere = this.withOrganization(this.withDeletedAt(query.where ?? {}, opts));
 			tasks.push(this.db.$count(this.table, this.toSQL(countWhere)).then((it) => {
 				timers.count = this.dateTimeProvider.nowMillis() - timers.count;
 				return it;
@@ -2279,6 +2259,7 @@ var Repository = class Repository {
 	*/
 	async create(data, opts = {}) {
 		this.assertWritable();
+		this.stampOrganization(data);
 		await this.alepha.events.emit("repository:create:before", {
 			tableName: this.tableName,
 			data
@@ -2308,6 +2289,7 @@ var Repository = class Repository {
 	async createMany(values, opts = {}) {
 		this.assertWritable();
 		if (values.length === 0) return [];
+		for (const value of values) this.stampOrganization(value);
 		await this.alepha.events.emit("repository:create:before", {
 			tableName: this.tableName,
 			data: values
@@ -2362,6 +2344,7 @@ var Repository = class Repository {
 	*/
 	async upsert(data, opts = {}) {
 		this.assertWritable();
+		this.stampOrganization(data);
 		await this.alepha.events.emit("repository:create:before", {
 			tableName: this.tableName,
 			data
@@ -2406,7 +2389,7 @@ var Repository = class Repository {
 		let row = data;
 		const updatedAtField = getAttrFields(this.entity.schema, PG_UPDATED_AT)?.[0];
 		if (updatedAtField) row[updatedAtField.key] = opts.now ?? this.dateTimeProvider.nowISOString();
-		where = this.withDeletedAt(where, opts);
+		where = this.withOrganization(this.withDeletedAt(where, opts));
 		row = this.cast(row, false);
 		delete row[this.id.key];
 		const response = await this.rawUpdate(opts).set(row).where(this.toSQL(where)).returning(this.table).catch((error) => {
@@ -2494,7 +2477,7 @@ var Repository = class Repository {
 		});
 		const updatedAtField = getAttrFields(this.entity.schema, PG_UPDATED_AT)?.[0];
 		if (updatedAtField) data[updatedAtField.key] = opts.now ?? this.dateTimeProvider.nowISOString();
-		where = this.withDeletedAt(where, opts);
+		where = this.withOrganization(this.withDeletedAt(where, opts));
 		data = this.cast(data, false);
 		try {
 			const entities = await this.rawUpdate(opts).set(data).where(this.toSQL(where)).returning();
@@ -2518,6 +2501,7 @@ var Repository = class Repository {
 		this.assertWritable();
 		const deletedAt = this.deletedAt();
 		if (deletedAt && !opts.force) return await this.updateMany(where, { [deletedAt.key]: opts.now ?? this.dateTimeProvider.nowISOString() }, opts);
+		where = this.withOrganization(where);
 		await this.alepha.events.emit("repository:delete:before", {
 			tableName: this.tableName,
 			where
@@ -2581,7 +2565,7 @@ var Repository = class Repository {
 	* Count entities.
 	*/
 	async count(where = {}, opts = {}) {
-		where = this.withDeletedAt(where, opts);
+		where = this.withOrganization(this.withDeletedAt(where, opts));
 		return (opts.tx === null ? this.provider.db : opts.tx ?? this.db).$count(this.table, this.toSQL(where));
 	}
 	/**
@@ -2616,7 +2600,7 @@ var Repository = class Repository {
 		}
 		let builder = (opts.tx === null ? this.provider.db : opts.tx ?? this.db).select(flatFields).from(this.table);
 		if (query.where) {
-			const where = this.withDeletedAt(query.where, opts);
+			const where = this.withOrganization(this.withDeletedAt(query.where, opts));
 			builder = builder.where(this.toSQL(where));
 		}
 		if (query.groupBy) builder = builder.groupBy(...query.groupBy.map((key) => this.col(key)));
@@ -2706,6 +2690,24 @@ var Repository = class Repository {
 		const deletedAtFields = getAttrFields(this.entity.schema, PG_DELETED_AT);
 		if (deletedAtFields.length > 0) return deletedAtFields[0];
 	}
+	withOrganization(where) {
+		const orgField = this.organizationField();
+		if (!orgField) return where;
+		const user = this.alepha.store.get(currentUserAtom);
+		if (!user?.organization) return where;
+		return { and: [where, { or: [{ [orgField.key]: { eq: user.organization } }, { [orgField.key]: { isNull: true } }] }] };
+	}
+	stampOrganization(data) {
+		const orgField = this.organizationField();
+		if (!orgField) return;
+		if (data[orgField.key] != null) return;
+		const user = this.alepha.store.get(currentUserAtom);
+		if (user?.organization) data[orgField.key] = user.organization;
+	}
+	organizationField() {
+		const fields = getAttrFields(this.entity.schema, PG_ORGANIZATION);
+		if (fields.length > 0) return fields[0];
+	}
 	/**
 	* Convert something to valid Pg Insert Value.
 	*/
@@ -3267,6 +3269,14 @@ var DatabaseTypeProvider = class {
 	*/
 	deletedAt = (options) => pgAttr(t.optional(t.datetime(options)), PG_DELETED_AT);
 	/**
+	* Creates an organization column for multi-tenant row scoping.
+	*
+	* When present, queries are automatically filtered by the current user's organization.
+	* Rows with `null` organization are considered global and visible to everyone.
+	* On create, the column is auto-stamped with the current user's organization.
+	*/
+	organization = () => pgAttr(t.optional(t.uuid()), PG_ORGANIZATION);
+	/**
 	* Creates a Postgres ENUM type.
 	*
 	* > By default, `t.enum()` is mapped to a TEXT column in Postgres.
@@ -3468,6 +3478,6 @@ const AlephaOrm = $module({
 	}
 });
 //#endregion
-export { $entity, $repository, $seed, $sequence, $transactional, $view, AlephaOrm, BunSqliteProvider, CloudflareD1Provider, DatabaseProvider, DatabaseTypeProvider, DbCacheProvider, DbColumnNotFoundError, DbConflictError, DbConnectionError, DbDeadlockError, DbEntityNotFoundError, DbError, DbForeignKeyError, DbMigrationError, DbMigrationMode, DbNotNullError, DbTableNotFoundError, DbVersionMismatchError, DrizzleKitProvider, EntityPrimitive, ModelBuilder, NodeSqliteProvider, PG_CREATED_AT, PG_DEFAULT, PG_DELETED_AT, PG_ENUM, PG_GENERATED, PG_IDENTITY, PG_PRIMARY_KEY, PG_REF, PG_SERIAL, PG_UPDATED_AT, PG_VERSION, Repository, RepositoryProvider, SequencePrimitive, SqliteProvider, ViewPrimitive, buildQueryString, bunSqliteOptions, databaseEnvSchema, db, drizzle, getAttrFields, insertSchema, legacyIdSchema, nodeSqliteOptions, pageQuerySchema, pageSchema, parseQueryString, pgAttr, schema, sql, updateSchema };
+export { $entity, $repository, $seed, $sequence, $transactional, $view, AlephaOrm, BunSqliteProvider, CloudflareD1Provider, DatabaseProvider, DatabaseTypeProvider, DbCacheProvider, DbColumnNotFoundError, DbConflictError, DbConnectionError, DbDeadlockError, DbEntityNotFoundError, DbError, DbForeignKeyError, DbMigrationError, DbMigrationMode, DbNotNullError, DbTableNotFoundError, DbVersionMismatchError, DrizzleKitProvider, EntityPrimitive, ModelBuilder, NodeSqliteProvider, PG_CREATED_AT, PG_DEFAULT, PG_DELETED_AT, PG_ENUM, PG_GENERATED, PG_IDENTITY, PG_ORGANIZATION, PG_PRIMARY_KEY, PG_REF, PG_SERIAL, PG_UPDATED_AT, PG_VERSION, Repository, RepositoryProvider, SequencePrimitive, SqliteProvider, ViewPrimitive, buildQueryString, bunSqliteOptions, databaseEnvSchema, db, drizzle, getAttrFields, insertSchema, legacyIdSchema, nodeSqliteOptions, pageQuerySchema, pageSchema, parseQueryString, pgAttr, schema, sql, updateSchema };
 
 //# sourceMappingURL=index.js.map