@anievo-id/rbac-evolution-drizzle 1.1.0 → 1.3.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (40) hide show
  1. package/dist/{chunk-WE5ZHXEW.js → chunk-3AH2K6KS.js} +77 -27
  2. package/dist/chunk-3AH2K6KS.js.map +1 -0
  3. package/dist/{chunk-HDQ5ACTJ.js → chunk-CK2CKZPC.js} +49 -6
  4. package/dist/chunk-CK2CKZPC.js.map +1 -0
  5. package/dist/{chunk-D6UKXFGV.js → chunk-CQBJTVGQ.js} +48 -5
  6. package/dist/chunk-CQBJTVGQ.js.map +1 -0
  7. package/dist/{chunk-4KGIPA5W.js → chunk-SPNXRYKH.js} +48 -5
  8. package/dist/chunk-SPNXRYKH.js.map +1 -0
  9. package/dist/index.cjs +209 -30
  10. package/dist/index.cjs.map +1 -1
  11. package/dist/index.d.cts +6 -114
  12. package/dist/index.d.ts +6 -114
  13. package/dist/index.js +4 -4
  14. package/dist/mysql.cjs +119 -26
  15. package/dist/mysql.cjs.map +1 -1
  16. package/dist/mysql.d.cts +447 -5
  17. package/dist/mysql.d.ts +447 -5
  18. package/dist/mysql.js +2 -2
  19. package/dist/names-DD-kYSFO.d.cts +146 -0
  20. package/dist/names-DD-kYSFO.d.ts +146 -0
  21. package/dist/pg.cjs +119 -26
  22. package/dist/pg.cjs.map +1 -1
  23. package/dist/pg.d.cts +447 -5
  24. package/dist/pg.d.ts +447 -5
  25. package/dist/pg.js +2 -2
  26. package/dist/sqlite.cjs +119 -26
  27. package/dist/sqlite.cjs.map +1 -1
  28. package/dist/sqlite.d.cts +469 -5
  29. package/dist/sqlite.d.ts +469 -5
  30. package/dist/sqlite.js +2 -2
  31. package/package.json +5 -2
  32. package/sql/mysql-expiry.sql +9 -0
  33. package/sql/pg-expiry.sql +8 -0
  34. package/sql/sqlite-expiry.sql +10 -0
  35. package/dist/chunk-4KGIPA5W.js.map +0 -1
  36. package/dist/chunk-D6UKXFGV.js.map +0 -1
  37. package/dist/chunk-HDQ5ACTJ.js.map +0 -1
  38. package/dist/chunk-WE5ZHXEW.js.map +0 -1
  39. package/dist/names-BVofJeMN.d.cts +0 -13
  40. package/dist/names-BVofJeMN.d.ts +0 -13
@@ -0,0 +1 @@
1
+ {"version":3,"sources":["../src/sqlite-schema.ts","../src/sqlite.ts"],"names":[],"mappings":"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","file":"chunk-SPNXRYKH.js","sourcesContent":["import { sql } from 'drizzle-orm'\nimport { index, integer, primaryKey, sqliteTable, text, uniqueIndex } from 'drizzle-orm/sqlite-core'\nimport { type RbacSchemaOptions, tableNames } from './names'\n\n/**\n * spatie-style `created_at` / `updated_at` (only on `permissions` and `roles`), stored as unix seconds\n * and exposed as `Date` by Drizzle. `strftime('%s','now')` works on every SQLite version (unlike `unixepoch()`).\n */\nconst timestamps = () => ({\n createdAt: integer('created_at', { mode: 'timestamp' })\n .notNull()\n .default(sql`(cast(strftime('%s', 'now') as integer))`),\n updatedAt: integer('updated_at', { mode: 'timestamp' })\n .notNull()\n .default(sql`(cast(strftime('%s', 'now') as integer))`),\n})\n\n/**\n * Builds the rbac-evolution tables for SQLite — libsql / Turso, better-sqlite3, D1, bun:sqlite... (mirrors spatie/laravel-permission).\n *\n * ```ts\n * // schema.ts — export each table so drizzle-kit picks them up\n * export const { permissions, roles, roleHasPermissions, modelHasRoles, modelHasPermissions } = sqliteRbacSchema()\n * ```\n */\nexport function sqliteRbacSchema(options: RbacSchemaOptions & { expiry: true }): SqliteRbacExpirySchema\nexport function sqliteRbacSchema(options?: RbacSchemaOptions): SqliteRbacSchema\nexport function sqliteRbacSchema(options: RbacSchemaOptions = {}): SqliteRbacSchema | SqliteRbacExpirySchema {\n return options.expiry === true ? buildSqliteExpiry(options) : buildSqlite(options)\n}\n\n/** The five tables, as in 1.1. */\nfunction buildSqlite(options: RbacSchemaOptions) {\n const n = tableNames(options)\n\n const permissions = sqliteTable(\n n.permissions,\n {\n id: integer('id').primaryKey({ autoIncrement: true }),\n name: text('name').notNull(),\n guardName: text('guard_name').notNull(),\n ...timestamps(),\n },\n (t) => [uniqueIndex(`${n.permissions}_name_guard_name_unique`).on(t.name, t.guardName)],\n )\n\n const roles = sqliteTable(\n n.roles,\n {\n id: integer('id').primaryKey({ autoIncrement: true }),\n name: text('name').notNull(),\n guardName: text('guard_name').notNull(),\n /** `''` = global role (no team). */\n teamId: text('team_id').notNull().default(''),\n ...timestamps(),\n },\n (t) => [uniqueIndex(`${n.roles}_name_guard_name_team_id_unique`).on(t.name, t.guardName, t.teamId)],\n )\n\n const roleHasPermissions = sqliteTable(\n n.roleHasPermissions,\n {\n roleId: integer('role_id')\n .notNull()\n .references(() => roles.id, { onDelete: 'cascade' }),\n permissionId: integer('permission_id')\n .notNull()\n .references(() => permissions.id, { onDelete: 'cascade' }),\n },\n (t) => [\n primaryKey({ name: `${n.roleHasPermissions}_pkey`, columns: [t.roleId, t.permissionId] }),\n index(`${n.roleHasPermissions}_permission_id_index`).on(t.permissionId),\n ],\n )\n\n const modelHasRoles = sqliteTable(\n n.modelHasRoles,\n {\n roleId: integer('role_id')\n .notNull()\n .references(() => roles.id, { onDelete: 'cascade' }),\n subjectType: text('subject_type').notNull(),\n subjectId: text('subject_id').notNull(),\n /** `''` = global (no team). */\n teamId: text('team_id').notNull().default(''),\n },\n (t) => [\n primaryKey({ name: `${n.modelHasRoles}_pkey`, columns: [t.subjectType, t.subjectId, t.teamId, t.roleId] }),\n index(`${n.modelHasRoles}_role_id_index`).on(t.roleId),\n ],\n )\n\n const modelHasPermissions = sqliteTable(\n n.modelHasPermissions,\n {\n permissionId: integer('permission_id')\n .notNull()\n .references(() => permissions.id, { onDelete: 'cascade' }),\n subjectType: text('subject_type').notNull(),\n subjectId: text('subject_id').notNull(),\n /** `''` = global (no team). */\n teamId: text('team_id').notNull().default(''),\n },\n (t) => [\n primaryKey({\n name: `${n.modelHasPermissions}_pkey`,\n columns: [t.subjectType, t.subjectId, t.teamId, t.permissionId],\n }),\n index(`${n.modelHasPermissions}_permission_id_index`).on(t.permissionId),\n ],\n )\n\n return { permissions, roles, roleHasPermissions, modelHasRoles, modelHasPermissions }\n}\n\n/**\n * The tables of `sqliteRbacSchema({ expiry: true })`: the 1.1 tables, with a nullable `expires_at` column on\n * `model_has_roles` and `model_has_permissions` (1.2).\n */\nfunction buildSqliteExpiry(options: RbacSchemaOptions) {\n const n = tableNames(options)\n const { permissions, roles, roleHasPermissions } = buildSqlite(options)\n\n const modelHasRoles = sqliteTable(\n n.modelHasRoles,\n {\n roleId: integer('role_id')\n .notNull()\n .references(() => roles.id, { onDelete: 'cascade' }),\n subjectType: text('subject_type').notNull(),\n subjectId: text('subject_id').notNull(),\n /** `''` = global (no team). */\n teamId: text('team_id').notNull().default(''),\n /** When the link ends (`NULL` = never). Only used by an adapter created with `{ expiry: true }`. */\n expiresAt: integer('expires_at', { mode: 'timestamp_ms' }),\n },\n (t) => [\n primaryKey({ name: `${n.modelHasRoles}_pkey`, columns: [t.subjectType, t.subjectId, t.teamId, t.roleId] }),\n index(`${n.modelHasRoles}_role_id_index`).on(t.roleId),\n ],\n )\n\n const modelHasPermissions = sqliteTable(\n n.modelHasPermissions,\n {\n permissionId: integer('permission_id')\n .notNull()\n .references(() => permissions.id, { onDelete: 'cascade' }),\n subjectType: text('subject_type').notNull(),\n subjectId: text('subject_id').notNull(),\n /** `''` = global (no team). */\n teamId: text('team_id').notNull().default(''),\n /** When the link ends (`NULL` = never). Only used by an adapter created with `{ expiry: true }`. */\n expiresAt: integer('expires_at', { mode: 'timestamp_ms' }),\n },\n (t) => [\n primaryKey({\n name: `${n.modelHasPermissions}_pkey`,\n columns: [t.subjectType, t.subjectId, t.teamId, t.permissionId],\n }),\n index(`${n.modelHasPermissions}_permission_id_index`).on(t.permissionId),\n ],\n )\n\n return { permissions, roles, roleHasPermissions, modelHasRoles, modelHasPermissions }\n}\n\n/** The tables of `sqliteRbacSchema()`. */\nexport type SqliteRbacSchema = ReturnType<typeof buildSqlite>\n/** The tables of `sqliteRbacSchema({ expiry: true })`: the subject-link tables have an `expiresAt` column. */\nexport type SqliteRbacExpirySchema = ReturnType<typeof buildSqliteExpiry>\n","/**\n * @anievo-id/rbac-evolution-drizzle/sqlite — SQLite schema + adapter.\n */\nimport type { RbacAdapter } from '@anievo-id/rbac-evolution'\nimport type { BaseSQLiteDatabase } from 'drizzle-orm/sqlite-core'\nimport { type DrizzleAdapterOptions, DrizzleRbacAdapter } from './adapter'\nimport { type SqliteRbacExpirySchema, type SqliteRbacSchema, sqliteRbacSchema } from './sqlite-schema'\n\nexport { sqliteRbacSchema } from './sqlite-schema'\nexport type { SqliteRbacExpirySchema, SqliteRbacSchema } from './sqlite-schema'\nexport type { DrizzleAdapterOptions } from './adapter'\nexport type { RbacSchemaOptions } from './names'\n\n/**\n * Creates an `RbacAdapter` backed by a Drizzle SQLite database\n * (libsql / Turso, better-sqlite3, Bun SQLite, Cloudflare D1, ...).\n *\n * @param db any Drizzle SQLite database instance\n * @param schema the tables from `sqliteRbacSchema()` (defaults to the unprefixed tables)\n * @param options `{ expiry: true }` to store an expiry per link (needs `sqliteRbacSchema({ expiry: true })`)\n */\nexport function drizzleSqliteAdapter(\n // eslint-disable-next-line @typescript-eslint/no-explicit-any\n db: BaseSQLiteDatabase<'sync' | 'async', any, any, any>,\n schema: SqliteRbacSchema | SqliteRbacExpirySchema = sqliteRbacSchema(),\n options: DrizzleAdapterOptions = {},\n): RbacAdapter {\n return new DrizzleRbacAdapter(db, schema, 'sqlite', options)\n}\n"]}
package/dist/index.cjs CHANGED
@@ -34,16 +34,37 @@ var toRole = (row) => ({
34
34
  guardName: row.guardName,
35
35
  teamId: teamFromKey(row.teamId)
36
36
  });
37
+ var expiryOf = (row) => row.expiresAt === void 0 ? {} : { expiresAt: row.expiresAt ?? null };
38
+ var toRoleLink = (row) => ({
39
+ subject: { type: row.subjectType, id: row.subjectId },
40
+ roleId: Number(row.id),
41
+ teamId: teamFromKey(row.teamId),
42
+ ...expiryOf(row)
43
+ });
44
+ var toPermissionLink = (row) => ({
45
+ subject: { type: row.subjectType, id: row.subjectId },
46
+ permissionId: Number(row.id),
47
+ teamId: teamFromKey(row.teamId),
48
+ ...expiryOf(row)
49
+ });
37
50
  var sameLink = (row, subjectType, subjectId, team) => row.subjectType === subjectType && (subjectId === void 0 || row.subjectId === subjectId) && row.teamId === team;
38
51
  var DrizzleRbacAdapter = class _DrizzleRbacAdapter {
39
- constructor(db, t, dialect = "pg") {
52
+ constructor(db, t, dialect = "pg", options = {}) {
40
53
  this.db = db;
41
54
  this.t = t;
42
55
  this.dialect = dialect;
56
+ this.supportsExpiry = options.expiry === true;
57
+ if (this.supportsExpiry && (t.modelHasRoles.expiresAt === void 0 || t.modelHasPermissions.expiresAt === void 0)) {
58
+ throw new TypeError(
59
+ "rbac-evolution-drizzle: `{ expiry: true }` needs the tables with the `expiresAt` column: build them with `{ expiry: true }`."
60
+ );
61
+ }
43
62
  }
44
63
  db;
45
64
  t;
46
65
  dialect;
66
+ /** `true` with `{ expiry: true }`: the engine may then pass `expiresAt`. */
67
+ supportsExpiry;
47
68
  /**
48
69
  * Runs `fn` in a transaction (a savepoint when `db` is already a transaction). SQLite runs without one:
49
70
  * better-sqlite3 and bun:sqlite only accept synchronous transaction callbacks, and libsql `:memory:` would
@@ -168,8 +189,8 @@ var DrizzleRbacAdapter = class _DrizzleRbacAdapter {
168
189
  getSubjectRoleIds(subject, teamId) {
169
190
  return this.getLinks(this.t.modelHasRoles, this.t.modelHasRoles.roleId, subject, teamId);
170
191
  }
171
- attachSubjectRoles(subject, roleIds, teamId) {
172
- return this.attach(this.t.modelHasRoles, "roleId", subject, roleIds, teamId);
192
+ attachSubjectRoles(subject, roleIds, teamId, options) {
193
+ return this.attach(this.t.modelHasRoles, "roleId", this.t.modelHasRoles.roleId, subject, roleIds, teamId, options);
173
194
  }
174
195
  detachSubjectRoles(subject, roleIds, teamId) {
175
196
  return this.detach(this.t.modelHasRoles, this.t.modelHasRoles.roleId, subject, roleIds, teamId);
@@ -177,8 +198,9 @@ var DrizzleRbacAdapter = class _DrizzleRbacAdapter {
177
198
  getSubjectPermissionIds(subject, teamId) {
178
199
  return this.getLinks(this.t.modelHasPermissions, this.t.modelHasPermissions.permissionId, subject, teamId);
179
200
  }
180
- attachSubjectPermissions(subject, permissionIds, teamId) {
181
- return this.attach(this.t.modelHasPermissions, "permissionId", subject, permissionIds, teamId);
201
+ attachSubjectPermissions(subject, permissionIds, teamId, options) {
202
+ const { modelHasPermissions: table } = this.t;
203
+ return this.attach(table, "permissionId", table.permissionId, subject, permissionIds, teamId, options);
182
204
  }
183
205
  detachSubjectPermissions(subject, permissionIds, teamId) {
184
206
  return this.detach(
@@ -189,18 +211,41 @@ var DrizzleRbacAdapter = class _DrizzleRbacAdapter {
189
211
  teamId
190
212
  );
191
213
  }
192
- getSubjectIdsWithRoles(subjectType, roleIds, teamId) {
193
- return this.reverse(this.t.modelHasRoles, this.t.modelHasRoles.roleId, subjectType, roleIds, teamId);
214
+ getSubjectIdsWithRoles(subjectType, roleIds, teamId, options) {
215
+ return this.reverse(this.t.modelHasRoles, this.t.modelHasRoles.roleId, subjectType, roleIds, teamId, options);
194
216
  }
195
- getSubjectIdsWithPermissions(subjectType, permissionIds, teamId) {
217
+ getSubjectIdsWithPermissions(subjectType, permissionIds, teamId, options) {
196
218
  return this.reverse(
197
219
  this.t.modelHasPermissions,
198
220
  this.t.modelHasPermissions.permissionId,
199
221
  subjectType,
200
222
  permissionIds,
201
- teamId
223
+ teamId,
224
+ options
202
225
  );
203
226
  }
227
+ // ----------------------------------------------------------- expiry (optional)
228
+ async getSubjectRoleLinks(subject, teamId) {
229
+ return (await this.linkRows(this.t.modelHasRoles, this.t.modelHasRoles.roleId, subject, teamId)).map(toRoleLink);
230
+ }
231
+ async getSubjectPermissionLinks(subject, teamId) {
232
+ const { modelHasPermissions: table } = this.t;
233
+ return (await this.linkRows(table, table.permissionId, subject, teamId)).map(toPermissionLink);
234
+ }
235
+ async deleteExpiredLinks(now) {
236
+ if (!this.supportsExpiry) return { roles: 0, permissions: 0 };
237
+ const remove = async (table, target) => {
238
+ const query = this.db.delete(table).where(drizzleOrm.lte(table.expiresAt, now));
239
+ if (this.dialect !== "mysql") return (await query.returning({ id: target })).length;
240
+ const result = await query;
241
+ const header = Array.isArray(result) ? result[0] : result;
242
+ return Number(header?.affectedRows ?? header?.rowsAffected ?? 0);
243
+ };
244
+ return {
245
+ roles: await remove(this.t.modelHasRoles, this.t.modelHasRoles.roleId),
246
+ permissions: await remove(this.t.modelHasPermissions, this.t.modelHasPermissions.permissionId)
247
+ };
248
+ }
204
249
  // ------------------------------------------------------------- bulk (optional)
205
250
  async getSubjectLinks(subject) {
206
251
  const where = { subjectType: subject.type, subjectId: String(subject.id) };
@@ -247,21 +292,18 @@ var DrizzleRbacAdapter = class _DrizzleRbacAdapter {
247
292
  if (where.subjectType !== void 0) filters.push(drizzleOrm.eq(table.subjectType, where.subjectType));
248
293
  if (where.subjectId !== void 0) filters.push(drizzleOrm.eq(table.subjectId, where.subjectId));
249
294
  if (where.teamId !== void 0) filters.push(drizzleOrm.eq(table.teamId, where.teamId));
250
- const rows = await db.select({ id: target, subjectType: table.subjectType, subjectId: table.subjectId, teamId: table.teamId }).from(table).where(drizzleOrm.and(...filters));
295
+ const rows = await db.select(this.linkColumns(table, target)).from(table).where(drizzleOrm.and(...filters));
251
296
  return rows.filter(
252
297
  (row) => (where.subjectType === void 0 || row.subjectType === where.subjectType) && (where.subjectId === void 0 || row.subjectId === where.subjectId) && (where.teamId === void 0 || row.teamId === where.teamId)
253
298
  );
254
299
  }
255
300
  static toSubjectLinks(roles, permissions) {
256
- const subject = (row) => ({ type: row.subjectType, id: row.subjectId });
257
- return {
258
- roles: roles.map((row) => ({ subject: subject(row), roleId: Number(row.id), teamId: teamFromKey(row.teamId) })),
259
- permissions: permissions.map((row) => ({
260
- subject: subject(row),
261
- permissionId: Number(row.id),
262
- teamId: teamFromKey(row.teamId)
263
- }))
264
- };
301
+ return { roles: roles.map(toRoleLink), permissions: permissions.map(toPermissionLink) };
302
+ }
303
+ /** The columns of a link row; `expiresAt` only with `{ expiry: true }` (1.1 tables don't have it). */
304
+ linkColumns(table, target) {
305
+ const columns = { id: target, subjectType: table.subjectType, subjectId: table.subjectId, teamId: table.teamId };
306
+ return this.supportsExpiry ? { ...columns, expiresAt: table.expiresAt } : columns;
265
307
  }
266
308
  // -------------------------------------------------------------------- helpers
267
309
  static first(rows) {
@@ -296,22 +338,28 @@ var DrizzleRbacAdapter = class _DrizzleRbacAdapter {
296
338
  }
297
339
  /** The subject's link rows, compared exactly (see `sameLink`). */
298
340
  async linkRows(table, target, subject, teamId) {
299
- const rows = await this.db.select({ id: target, subjectType: table.subjectType, subjectId: table.subjectId, teamId: table.teamId }).from(table).where(drizzleOrm.and(..._DrizzleRbacAdapter.subjectWhere(table, subject, teamId)));
341
+ const rows = await this.db.select(this.linkColumns(table, target)).from(table).where(drizzleOrm.and(..._DrizzleRbacAdapter.subjectWhere(table, subject, teamId)));
300
342
  return rows.filter((row) => sameLink(row, subject.type, String(subject.id), teamKey(teamId)));
301
343
  }
302
344
  async getLinks(table, target, subject, teamId) {
303
345
  return (await this.linkRows(table, target, subject, teamId)).map((row) => Number(row.id));
304
346
  }
305
- async attach(table, targetKey, subject, targetIds, teamId) {
347
+ async attach(table, targetKey, target, subject, targetIds, teamId, options) {
306
348
  const ids = toIntIds(targetIds);
307
349
  if (ids.length === 0) return;
308
350
  const base = { subjectType: subject.type, subjectId: String(subject.id), teamId: teamKey(teamId) };
351
+ const expiry = this.supportsExpiry ? { expiresAt: options?.expiresAt ?? null } : {};
309
352
  await this.insertIgnoringDuplicates(
310
353
  table,
311
- ids.map((id) => ({ ...base, [targetKey]: id })),
354
+ ids.map((id) => ({ ...base, [targetKey]: id, ...expiry })),
312
355
  "subjectType",
313
356
  table.subjectType
314
357
  );
358
+ if (expiry.expiresAt === void 0) return;
359
+ const wanted = new Set(ids);
360
+ const held = (await this.linkRows(table, target, subject, teamId)).map((row) => Number(row.id)).filter((id) => wanted.has(id));
361
+ if (held.length === 0) return;
362
+ await this.db.update(table).set({ expiresAt: expiry.expiresAt }).where(drizzleOrm.and(..._DrizzleRbacAdapter.subjectWhere(table, subject, teamId), drizzleOrm.inArray(target, held)));
315
363
  }
316
364
  async detach(table, target, subject, targetIds, teamId) {
317
365
  const wanted = targetIds === void 0 ? void 0 : new Set(toIntIds(targetIds));
@@ -320,11 +368,13 @@ var DrizzleRbacAdapter = class _DrizzleRbacAdapter {
320
368
  if (ids.length === 0) return;
321
369
  await this.db.delete(table).where(drizzleOrm.and(..._DrizzleRbacAdapter.subjectWhere(table, subject, teamId), drizzleOrm.inArray(target, ids)));
322
370
  }
323
- async reverse(table, target, subjectType, targetIds, teamId) {
371
+ async reverse(table, target, subjectType, targetIds, teamId, options) {
324
372
  const ids = toIntIds(targetIds);
325
373
  if (ids.length === 0) return [];
326
374
  const team = teamKey(teamId);
327
- const rows = await this.db.selectDistinct({ subjectType: table.subjectType, subjectId: table.subjectId, teamId: table.teamId }).from(table).where(drizzleOrm.and(drizzleOrm.eq(table.subjectType, subjectType), drizzleOrm.eq(table.teamId, team), drizzleOrm.inArray(target, ids)));
375
+ const where = [drizzleOrm.eq(table.subjectType, subjectType), drizzleOrm.eq(table.teamId, team), drizzleOrm.inArray(target, ids)];
376
+ if (this.supportsExpiry && options) where.push(drizzleOrm.or(drizzleOrm.isNull(table.expiresAt), drizzleOrm.gt(table.expiresAt, options.now)));
377
+ const rows = await this.db.selectDistinct({ subjectType: table.subjectType, subjectId: table.subjectId, teamId: table.teamId }).from(table).where(drizzleOrm.and(...where));
328
378
  const exact = rows.filter((row) => sameLink(row, subjectType, void 0, team));
329
379
  return [...new Set(exact.map((row) => row.subjectId))];
330
380
  }
@@ -348,6 +398,9 @@ var timestamps = () => ({
348
398
  updatedAt: pgCore.timestamp("updated_at", { withTimezone: true }).notNull().defaultNow()
349
399
  });
350
400
  function pgRbacSchema(options = {}) {
401
+ return options.expiry === true ? buildPgExpiry(options) : buildPg(options);
402
+ }
403
+ function buildPg(options) {
351
404
  const n = tableNames(options);
352
405
  const permissions = pgCore.pgTable(
353
406
  n.permissions,
@@ -415,16 +468,59 @@ function pgRbacSchema(options = {}) {
415
468
  );
416
469
  return { permissions, roles, roleHasPermissions, modelHasRoles, modelHasPermissions };
417
470
  }
471
+ function buildPgExpiry(options) {
472
+ const n = tableNames(options);
473
+ const { permissions, roles, roleHasPermissions } = buildPg(options);
474
+ const modelHasRoles = pgCore.pgTable(
475
+ n.modelHasRoles,
476
+ {
477
+ roleId: pgCore.integer("role_id").notNull().references(() => roles.id, { onDelete: "cascade" }),
478
+ subjectType: pgCore.text("subject_type").notNull(),
479
+ subjectId: pgCore.text("subject_id").notNull(),
480
+ /** `''` = global (no team). */
481
+ teamId: pgCore.text("team_id").notNull().default(""),
482
+ /** When the link ends (`NULL` = never). Only used by an adapter created with `{ expiry: true }`. */
483
+ expiresAt: pgCore.timestamp("expires_at", { withTimezone: true, mode: "date" })
484
+ },
485
+ (t) => [
486
+ pgCore.primaryKey({ name: `${n.modelHasRoles}_pkey`, columns: [t.subjectType, t.subjectId, t.teamId, t.roleId] }),
487
+ pgCore.index(`${n.modelHasRoles}_role_id_index`).on(t.roleId)
488
+ ]
489
+ );
490
+ const modelHasPermissions = pgCore.pgTable(
491
+ n.modelHasPermissions,
492
+ {
493
+ permissionId: pgCore.integer("permission_id").notNull().references(() => permissions.id, { onDelete: "cascade" }),
494
+ subjectType: pgCore.text("subject_type").notNull(),
495
+ subjectId: pgCore.text("subject_id").notNull(),
496
+ /** `''` = global (no team). */
497
+ teamId: pgCore.text("team_id").notNull().default(""),
498
+ /** When the link ends (`NULL` = never). Only used by an adapter created with `{ expiry: true }`. */
499
+ expiresAt: pgCore.timestamp("expires_at", { withTimezone: true, mode: "date" })
500
+ },
501
+ (t) => [
502
+ pgCore.primaryKey({
503
+ name: `${n.modelHasPermissions}_pkey`,
504
+ columns: [t.subjectType, t.subjectId, t.teamId, t.permissionId]
505
+ }),
506
+ pgCore.index(`${n.modelHasPermissions}_permission_id_index`).on(t.permissionId)
507
+ ]
508
+ );
509
+ return { permissions, roles, roleHasPermissions, modelHasRoles, modelHasPermissions };
510
+ }
418
511
 
419
512
  // src/pg.ts
420
- function drizzlePgAdapter(db, schema = pgRbacSchema()) {
421
- return new DrizzleRbacAdapter(db, schema, "pg");
513
+ function drizzlePgAdapter(db, schema = pgRbacSchema(), options = {}) {
514
+ return new DrizzleRbacAdapter(db, schema, "pg", options);
422
515
  }
423
516
  var timestamps2 = () => ({
424
517
  createdAt: sqliteCore.integer("created_at", { mode: "timestamp" }).notNull().default(drizzleOrm.sql`(cast(strftime('%s', 'now') as integer))`),
425
518
  updatedAt: sqliteCore.integer("updated_at", { mode: "timestamp" }).notNull().default(drizzleOrm.sql`(cast(strftime('%s', 'now') as integer))`)
426
519
  });
427
520
  function sqliteRbacSchema(options = {}) {
521
+ return options.expiry === true ? buildSqliteExpiry(options) : buildSqlite(options);
522
+ }
523
+ function buildSqlite(options) {
428
524
  const n = tableNames(options);
429
525
  const permissions = sqliteCore.sqliteTable(
430
526
  n.permissions,
@@ -492,10 +588,50 @@ function sqliteRbacSchema(options = {}) {
492
588
  );
493
589
  return { permissions, roles, roleHasPermissions, modelHasRoles, modelHasPermissions };
494
590
  }
591
+ function buildSqliteExpiry(options) {
592
+ const n = tableNames(options);
593
+ const { permissions, roles, roleHasPermissions } = buildSqlite(options);
594
+ const modelHasRoles = sqliteCore.sqliteTable(
595
+ n.modelHasRoles,
596
+ {
597
+ roleId: sqliteCore.integer("role_id").notNull().references(() => roles.id, { onDelete: "cascade" }),
598
+ subjectType: sqliteCore.text("subject_type").notNull(),
599
+ subjectId: sqliteCore.text("subject_id").notNull(),
600
+ /** `''` = global (no team). */
601
+ teamId: sqliteCore.text("team_id").notNull().default(""),
602
+ /** When the link ends (`NULL` = never). Only used by an adapter created with `{ expiry: true }`. */
603
+ expiresAt: sqliteCore.integer("expires_at", { mode: "timestamp_ms" })
604
+ },
605
+ (t) => [
606
+ sqliteCore.primaryKey({ name: `${n.modelHasRoles}_pkey`, columns: [t.subjectType, t.subjectId, t.teamId, t.roleId] }),
607
+ sqliteCore.index(`${n.modelHasRoles}_role_id_index`).on(t.roleId)
608
+ ]
609
+ );
610
+ const modelHasPermissions = sqliteCore.sqliteTable(
611
+ n.modelHasPermissions,
612
+ {
613
+ permissionId: sqliteCore.integer("permission_id").notNull().references(() => permissions.id, { onDelete: "cascade" }),
614
+ subjectType: sqliteCore.text("subject_type").notNull(),
615
+ subjectId: sqliteCore.text("subject_id").notNull(),
616
+ /** `''` = global (no team). */
617
+ teamId: sqliteCore.text("team_id").notNull().default(""),
618
+ /** When the link ends (`NULL` = never). Only used by an adapter created with `{ expiry: true }`. */
619
+ expiresAt: sqliteCore.integer("expires_at", { mode: "timestamp_ms" })
620
+ },
621
+ (t) => [
622
+ sqliteCore.primaryKey({
623
+ name: `${n.modelHasPermissions}_pkey`,
624
+ columns: [t.subjectType, t.subjectId, t.teamId, t.permissionId]
625
+ }),
626
+ sqliteCore.index(`${n.modelHasPermissions}_permission_id_index`).on(t.permissionId)
627
+ ]
628
+ );
629
+ return { permissions, roles, roleHasPermissions, modelHasRoles, modelHasPermissions };
630
+ }
495
631
 
496
632
  // src/sqlite.ts
497
- function drizzleSqliteAdapter(db, schema = sqliteRbacSchema()) {
498
- return new DrizzleRbacAdapter(db, schema, "sqlite");
633
+ function drizzleSqliteAdapter(db, schema = sqliteRbacSchema(), options = {}) {
634
+ return new DrizzleRbacAdapter(db, schema, "sqlite", options);
499
635
  }
500
636
  var MYSQL_LENGTHS = {
501
637
  name: 255,
@@ -512,6 +648,9 @@ var timestamps3 = () => ({
512
648
  updatedAt: mysqlCore.timestamp("updated_at", { mode: "date" }).notNull().defaultNow()
513
649
  });
514
650
  function mysqlRbacSchema(options = {}) {
651
+ return options.expiry === true ? buildMysqlExpiry(options) : buildMysql(options);
652
+ }
653
+ function buildMysql(options) {
515
654
  const n = tableNames(options);
516
655
  const permissions = mysqlCore.mysqlTable(
517
656
  n.permissions,
@@ -579,10 +718,50 @@ function mysqlRbacSchema(options = {}) {
579
718
  );
580
719
  return { permissions, roles, roleHasPermissions, modelHasRoles, modelHasPermissions };
581
720
  }
721
+ function buildMysqlExpiry(options) {
722
+ const n = tableNames(options);
723
+ const { permissions, roles, roleHasPermissions } = buildMysql(options);
724
+ const modelHasRoles = mysqlCore.mysqlTable(
725
+ n.modelHasRoles,
726
+ {
727
+ roleId: mysqlCore.int("role_id").notNull().references(() => roles.id, { onDelete: "cascade" }),
728
+ subjectType: exactVarchar("subject_type", { length: MYSQL_LENGTHS.subjectType }).notNull(),
729
+ subjectId: exactVarchar("subject_id", { length: MYSQL_LENGTHS.subjectId }).notNull(),
730
+ /** `''` = global (no team). */
731
+ teamId: exactVarchar("team_id", { length: MYSQL_LENGTHS.teamId }).notNull().default(""),
732
+ /** When the link ends (`NULL` = never). Only used by an adapter created with `{ expiry: true }`. */
733
+ expiresAt: mysqlCore.datetime("expires_at", { mode: "date", fsp: 3 })
734
+ },
735
+ (t) => [
736
+ mysqlCore.primaryKey({ name: `${n.modelHasRoles}_pkey`, columns: [t.subjectType, t.subjectId, t.teamId, t.roleId] }),
737
+ mysqlCore.index(`${n.modelHasRoles}_role_id_index`).on(t.roleId)
738
+ ]
739
+ );
740
+ const modelHasPermissions = mysqlCore.mysqlTable(
741
+ n.modelHasPermissions,
742
+ {
743
+ permissionId: mysqlCore.int("permission_id").notNull().references(() => permissions.id, { onDelete: "cascade" }),
744
+ subjectType: exactVarchar("subject_type", { length: MYSQL_LENGTHS.subjectType }).notNull(),
745
+ subjectId: exactVarchar("subject_id", { length: MYSQL_LENGTHS.subjectId }).notNull(),
746
+ /** `''` = global (no team). */
747
+ teamId: exactVarchar("team_id", { length: MYSQL_LENGTHS.teamId }).notNull().default(""),
748
+ /** When the link ends (`NULL` = never). Only used by an adapter created with `{ expiry: true }`. */
749
+ expiresAt: mysqlCore.datetime("expires_at", { mode: "date", fsp: 3 })
750
+ },
751
+ (t) => [
752
+ mysqlCore.primaryKey({
753
+ name: `${n.modelHasPermissions}_pkey`,
754
+ columns: [t.subjectType, t.subjectId, t.teamId, t.permissionId]
755
+ }),
756
+ mysqlCore.index(`${n.modelHasPermissions}_permission_id_index`).on(t.permissionId)
757
+ ]
758
+ );
759
+ return { permissions, roles, roleHasPermissions, modelHasRoles, modelHasPermissions };
760
+ }
582
761
 
583
762
  // src/mysql.ts
584
- function drizzleMysqlAdapter(db, schema = mysqlRbacSchema()) {
585
- return new DrizzleRbacAdapter(db, schema, "mysql");
763
+ function drizzleMysqlAdapter(db, schema = mysqlRbacSchema(), options = {}) {
764
+ return new DrizzleRbacAdapter(db, schema, "mysql", options);
586
765
  }
587
766
 
588
767
  exports.DrizzleRbacAdapter = DrizzleRbacAdapter;