alepha 0.20.6 → 0.20.7

package/dist/orm/core/index.js

@@ -15,7 +15,7 @@ import { migrate } from "drizzle-orm/better-sqlite3/migrator";
 import { BetterSQLiteSession } from "drizzle-orm/better-sqlite3/session";
 import { BaseSQLiteDatabase } from "drizzle-orm/sqlite-core/db";
 import { SQLiteSyncDialect } from "drizzle-orm/sqlite-core/dialect";
-import { currentUserAtom } from "alepha/security";
+import { currentTenantAtom, 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
@@ -318,7 +318,7 @@ var DatabaseProvider = class {
 	* Migration tracking table name, scoped by schema.
 	*
 	* Returns `migrations_{schema}` so that multiple schemas sharing the same
-	* database each get their own migration history (e.g. `migrations_roadmap`,
+	* database each get their own migration history (e.g. `migrations_lore`,
 	* `migrations_public`).
 	*/
 	get migrationsTable() {
@@ -518,7 +518,7 @@ const insertSchema = (obj) => {
 	for (const key in obj.properties) {
 		const prop = obj.properties[key];
 		if (PG_GENERATED in prop) continue;
-		if (PG_DEFAULT in prop) newProperties[key] = t.optional(prop);
+		if (PG_DEFAULT in prop || PG_ORGANIZATION in prop) newProperties[key] = t.optional(prop);
 		else newProperties[key] = prop;
 	}
 	return t.object(newProperties, "options" in obj && typeof obj.options === "object" ? { ...obj.options } : {});
@@ -2623,16 +2623,31 @@ var Repository = class Repository {
 	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 } }] }] };
+		const value = this.resolveOrganizationValue();
+		if (!value) return where;
+		return { and: [where, { or: [{ [orgField.key]: { eq: value } }, { [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;
+		const value = this.resolveOrganizationValue();
+		if (value) data[orgField.key] = value;
+	}
+	/**
+	* Resolve the value used for `PG_ORGANIZATION` scoping.
+	*
+	* Priority:
+	* 1. Request-bound tenant (`currentTenantAtom`) — set by an app-level
+	*    middleware from the request `Host`. Lets cross-tenant users (admins,
+	*    agency operators) be scoped to the tenant they are acting in rather
+	*    than the one they belong to.
+	* 2. Authenticated user's `organization` — the legacy single-tenant case.
+	*/
+	resolveOrganizationValue() {
+		const tenant = this.alepha.store.get(currentTenantAtom);
+		if (tenant?.id) return tenant.id;
+		return this.alepha.store.get(currentUserAtom)?.organization;
 	}
 	organizationField() {
 		const fields = getAttrFields(this.entity.schema, PG_ORGANIZATION);
@@ -2881,10 +2896,16 @@ var DatabaseTypeProvider = class {
 	* 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.
+	*
+	* @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.
 	*/
-	organization = () => pgAttr(t.optional(t.uuid()), PG_ORGANIZATION);
+	organization = (options) => {
+		return pgAttr(options?.nullable ?? true ? t.optional(t.uuid()) : t.uuid(), PG_ORGANIZATION);
+	};
 	/**
 	* Creates a reference to another table or schema. Basically a foreign key.
 	*/