@anievo-id/rbac-evolution-drizzle 0.2.1 → 0.3.1

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.
@@ -0,0 +1,423 @@
1
+ import { RbacAdapter } from '@anievo-id/rbac-evolution';
2
+ import * as drizzle_orm_mysql_core from 'drizzle-orm/mysql-core';
3
+ import { MySqlDatabase } from 'drizzle-orm/mysql-core';
4
+ import { R as RbacSchemaOptions } from './names-C1WIeblV.js';
5
+
6
+ /**
7
+ * Builds the rbac-evolution tables for MySQL 8 / MariaDB (mirrors spatie/laravel-permission).
8
+ *
9
+ * ```ts
10
+ * // schema.ts — export each table so drizzle-kit picks them up
11
+ * export const { permissions, roles, roleHasPermissions, modelHasRoles, modelHasPermissions } = mysqlRbacSchema()
12
+ * ```
13
+ */
14
+ declare function mysqlRbacSchema(options?: RbacSchemaOptions): {
15
+ permissions: drizzle_orm_mysql_core.MySqlTableWithColumns<{
16
+ name: string;
17
+ schema: undefined;
18
+ columns: {
19
+ createdAt: drizzle_orm_mysql_core.MySqlColumn<{
20
+ name: "created_at";
21
+ tableName: string;
22
+ dataType: "date";
23
+ columnType: "MySqlTimestamp";
24
+ data: Date;
25
+ driverParam: string | number;
26
+ notNull: true;
27
+ hasDefault: true;
28
+ isPrimaryKey: false;
29
+ isAutoincrement: false;
30
+ hasRuntimeDefault: false;
31
+ enumValues: undefined;
32
+ baseColumn: never;
33
+ identity: undefined;
34
+ generated: undefined;
35
+ }, {}, {}>;
36
+ updatedAt: drizzle_orm_mysql_core.MySqlColumn<{
37
+ name: "updated_at";
38
+ tableName: string;
39
+ dataType: "date";
40
+ columnType: "MySqlTimestamp";
41
+ data: Date;
42
+ driverParam: string | number;
43
+ notNull: true;
44
+ hasDefault: true;
45
+ isPrimaryKey: false;
46
+ isAutoincrement: false;
47
+ hasRuntimeDefault: false;
48
+ enumValues: undefined;
49
+ baseColumn: never;
50
+ identity: undefined;
51
+ generated: undefined;
52
+ }, {}, {}>;
53
+ id: drizzle_orm_mysql_core.MySqlColumn<{
54
+ name: "id";
55
+ tableName: string;
56
+ dataType: "number";
57
+ columnType: "MySqlInt";
58
+ data: number;
59
+ driverParam: string | number;
60
+ notNull: true;
61
+ hasDefault: true;
62
+ isPrimaryKey: true;
63
+ isAutoincrement: true;
64
+ hasRuntimeDefault: false;
65
+ enumValues: undefined;
66
+ baseColumn: never;
67
+ identity: undefined;
68
+ generated: undefined;
69
+ }, {}, {}>;
70
+ name: drizzle_orm_mysql_core.MySqlColumn<{
71
+ name: "name";
72
+ tableName: string;
73
+ dataType: "custom";
74
+ columnType: "MySqlCustomColumn";
75
+ data: string;
76
+ driverParam: string;
77
+ notNull: true;
78
+ hasDefault: false;
79
+ isPrimaryKey: false;
80
+ isAutoincrement: false;
81
+ hasRuntimeDefault: false;
82
+ enumValues: undefined;
83
+ baseColumn: never;
84
+ identity: undefined;
85
+ generated: undefined;
86
+ }, {}, {}>;
87
+ guardName: drizzle_orm_mysql_core.MySqlColumn<{
88
+ name: "guard_name";
89
+ tableName: string;
90
+ dataType: "custom";
91
+ columnType: "MySqlCustomColumn";
92
+ data: string;
93
+ driverParam: string;
94
+ notNull: true;
95
+ hasDefault: false;
96
+ isPrimaryKey: false;
97
+ isAutoincrement: false;
98
+ hasRuntimeDefault: false;
99
+ enumValues: undefined;
100
+ baseColumn: never;
101
+ identity: undefined;
102
+ generated: undefined;
103
+ }, {}, {}>;
104
+ };
105
+ dialect: "mysql";
106
+ }>;
107
+ roles: drizzle_orm_mysql_core.MySqlTableWithColumns<{
108
+ name: string;
109
+ schema: undefined;
110
+ columns: {
111
+ createdAt: drizzle_orm_mysql_core.MySqlColumn<{
112
+ name: "created_at";
113
+ tableName: string;
114
+ dataType: "date";
115
+ columnType: "MySqlTimestamp";
116
+ data: Date;
117
+ driverParam: string | number;
118
+ notNull: true;
119
+ hasDefault: true;
120
+ isPrimaryKey: false;
121
+ isAutoincrement: false;
122
+ hasRuntimeDefault: false;
123
+ enumValues: undefined;
124
+ baseColumn: never;
125
+ identity: undefined;
126
+ generated: undefined;
127
+ }, {}, {}>;
128
+ updatedAt: drizzle_orm_mysql_core.MySqlColumn<{
129
+ name: "updated_at";
130
+ tableName: string;
131
+ dataType: "date";
132
+ columnType: "MySqlTimestamp";
133
+ data: Date;
134
+ driverParam: string | number;
135
+ notNull: true;
136
+ hasDefault: true;
137
+ isPrimaryKey: false;
138
+ isAutoincrement: false;
139
+ hasRuntimeDefault: false;
140
+ enumValues: undefined;
141
+ baseColumn: never;
142
+ identity: undefined;
143
+ generated: undefined;
144
+ }, {}, {}>;
145
+ id: drizzle_orm_mysql_core.MySqlColumn<{
146
+ name: "id";
147
+ tableName: string;
148
+ dataType: "number";
149
+ columnType: "MySqlInt";
150
+ data: number;
151
+ driverParam: string | number;
152
+ notNull: true;
153
+ hasDefault: true;
154
+ isPrimaryKey: true;
155
+ isAutoincrement: true;
156
+ hasRuntimeDefault: false;
157
+ enumValues: undefined;
158
+ baseColumn: never;
159
+ identity: undefined;
160
+ generated: undefined;
161
+ }, {}, {}>;
162
+ name: drizzle_orm_mysql_core.MySqlColumn<{
163
+ name: "name";
164
+ tableName: string;
165
+ dataType: "custom";
166
+ columnType: "MySqlCustomColumn";
167
+ data: string;
168
+ driverParam: string;
169
+ notNull: true;
170
+ hasDefault: false;
171
+ isPrimaryKey: false;
172
+ isAutoincrement: false;
173
+ hasRuntimeDefault: false;
174
+ enumValues: undefined;
175
+ baseColumn: never;
176
+ identity: undefined;
177
+ generated: undefined;
178
+ }, {}, {}>;
179
+ guardName: drizzle_orm_mysql_core.MySqlColumn<{
180
+ name: "guard_name";
181
+ tableName: string;
182
+ dataType: "custom";
183
+ columnType: "MySqlCustomColumn";
184
+ data: string;
185
+ driverParam: string;
186
+ notNull: true;
187
+ hasDefault: false;
188
+ isPrimaryKey: false;
189
+ isAutoincrement: false;
190
+ hasRuntimeDefault: false;
191
+ enumValues: undefined;
192
+ baseColumn: never;
193
+ identity: undefined;
194
+ generated: undefined;
195
+ }, {}, {}>;
196
+ teamId: drizzle_orm_mysql_core.MySqlColumn<{
197
+ name: "team_id";
198
+ tableName: string;
199
+ dataType: "custom";
200
+ columnType: "MySqlCustomColumn";
201
+ data: string;
202
+ driverParam: string;
203
+ notNull: true;
204
+ hasDefault: true;
205
+ isPrimaryKey: false;
206
+ isAutoincrement: false;
207
+ hasRuntimeDefault: false;
208
+ enumValues: undefined;
209
+ baseColumn: never;
210
+ identity: undefined;
211
+ generated: undefined;
212
+ }, {}, {}>;
213
+ };
214
+ dialect: "mysql";
215
+ }>;
216
+ roleHasPermissions: drizzle_orm_mysql_core.MySqlTableWithColumns<{
217
+ name: string;
218
+ schema: undefined;
219
+ columns: {
220
+ roleId: drizzle_orm_mysql_core.MySqlColumn<{
221
+ name: "role_id";
222
+ tableName: string;
223
+ dataType: "number";
224
+ columnType: "MySqlInt";
225
+ data: number;
226
+ driverParam: string | number;
227
+ notNull: true;
228
+ hasDefault: false;
229
+ isPrimaryKey: false;
230
+ isAutoincrement: false;
231
+ hasRuntimeDefault: false;
232
+ enumValues: undefined;
233
+ baseColumn: never;
234
+ identity: undefined;
235
+ generated: undefined;
236
+ }, {}, {}>;
237
+ permissionId: drizzle_orm_mysql_core.MySqlColumn<{
238
+ name: "permission_id";
239
+ tableName: string;
240
+ dataType: "number";
241
+ columnType: "MySqlInt";
242
+ data: number;
243
+ driverParam: string | number;
244
+ notNull: true;
245
+ hasDefault: false;
246
+ isPrimaryKey: false;
247
+ isAutoincrement: false;
248
+ hasRuntimeDefault: false;
249
+ enumValues: undefined;
250
+ baseColumn: never;
251
+ identity: undefined;
252
+ generated: undefined;
253
+ }, {}, {}>;
254
+ };
255
+ dialect: "mysql";
256
+ }>;
257
+ modelHasRoles: drizzle_orm_mysql_core.MySqlTableWithColumns<{
258
+ name: string;
259
+ schema: undefined;
260
+ columns: {
261
+ roleId: drizzle_orm_mysql_core.MySqlColumn<{
262
+ name: "role_id";
263
+ tableName: string;
264
+ dataType: "number";
265
+ columnType: "MySqlInt";
266
+ data: number;
267
+ driverParam: string | number;
268
+ notNull: true;
269
+ hasDefault: false;
270
+ isPrimaryKey: false;
271
+ isAutoincrement: false;
272
+ hasRuntimeDefault: false;
273
+ enumValues: undefined;
274
+ baseColumn: never;
275
+ identity: undefined;
276
+ generated: undefined;
277
+ }, {}, {}>;
278
+ subjectType: drizzle_orm_mysql_core.MySqlColumn<{
279
+ name: "subject_type";
280
+ tableName: string;
281
+ dataType: "custom";
282
+ columnType: "MySqlCustomColumn";
283
+ data: string;
284
+ driverParam: string;
285
+ notNull: true;
286
+ hasDefault: false;
287
+ isPrimaryKey: false;
288
+ isAutoincrement: false;
289
+ hasRuntimeDefault: false;
290
+ enumValues: undefined;
291
+ baseColumn: never;
292
+ identity: undefined;
293
+ generated: undefined;
294
+ }, {}, {}>;
295
+ subjectId: drizzle_orm_mysql_core.MySqlColumn<{
296
+ name: "subject_id";
297
+ tableName: string;
298
+ dataType: "custom";
299
+ columnType: "MySqlCustomColumn";
300
+ data: string;
301
+ driverParam: string;
302
+ notNull: true;
303
+ hasDefault: false;
304
+ isPrimaryKey: false;
305
+ isAutoincrement: false;
306
+ hasRuntimeDefault: false;
307
+ enumValues: undefined;
308
+ baseColumn: never;
309
+ identity: undefined;
310
+ generated: undefined;
311
+ }, {}, {}>;
312
+ teamId: drizzle_orm_mysql_core.MySqlColumn<{
313
+ name: "team_id";
314
+ tableName: string;
315
+ dataType: "custom";
316
+ columnType: "MySqlCustomColumn";
317
+ data: string;
318
+ driverParam: string;
319
+ notNull: true;
320
+ hasDefault: true;
321
+ isPrimaryKey: false;
322
+ isAutoincrement: false;
323
+ hasRuntimeDefault: false;
324
+ enumValues: undefined;
325
+ baseColumn: never;
326
+ identity: undefined;
327
+ generated: undefined;
328
+ }, {}, {}>;
329
+ };
330
+ dialect: "mysql";
331
+ }>;
332
+ modelHasPermissions: drizzle_orm_mysql_core.MySqlTableWithColumns<{
333
+ name: string;
334
+ schema: undefined;
335
+ columns: {
336
+ permissionId: drizzle_orm_mysql_core.MySqlColumn<{
337
+ name: "permission_id";
338
+ tableName: string;
339
+ dataType: "number";
340
+ columnType: "MySqlInt";
341
+ data: number;
342
+ driverParam: string | number;
343
+ notNull: true;
344
+ hasDefault: false;
345
+ isPrimaryKey: false;
346
+ isAutoincrement: false;
347
+ hasRuntimeDefault: false;
348
+ enumValues: undefined;
349
+ baseColumn: never;
350
+ identity: undefined;
351
+ generated: undefined;
352
+ }, {}, {}>;
353
+ subjectType: drizzle_orm_mysql_core.MySqlColumn<{
354
+ name: "subject_type";
355
+ tableName: string;
356
+ dataType: "custom";
357
+ columnType: "MySqlCustomColumn";
358
+ data: string;
359
+ driverParam: string;
360
+ notNull: true;
361
+ hasDefault: false;
362
+ isPrimaryKey: false;
363
+ isAutoincrement: false;
364
+ hasRuntimeDefault: false;
365
+ enumValues: undefined;
366
+ baseColumn: never;
367
+ identity: undefined;
368
+ generated: undefined;
369
+ }, {}, {}>;
370
+ subjectId: drizzle_orm_mysql_core.MySqlColumn<{
371
+ name: "subject_id";
372
+ tableName: string;
373
+ dataType: "custom";
374
+ columnType: "MySqlCustomColumn";
375
+ data: string;
376
+ driverParam: string;
377
+ notNull: true;
378
+ hasDefault: false;
379
+ isPrimaryKey: false;
380
+ isAutoincrement: false;
381
+ hasRuntimeDefault: false;
382
+ enumValues: undefined;
383
+ baseColumn: never;
384
+ identity: undefined;
385
+ generated: undefined;
386
+ }, {}, {}>;
387
+ teamId: drizzle_orm_mysql_core.MySqlColumn<{
388
+ name: "team_id";
389
+ tableName: string;
390
+ dataType: "custom";
391
+ columnType: "MySqlCustomColumn";
392
+ data: string;
393
+ driverParam: string;
394
+ notNull: true;
395
+ hasDefault: true;
396
+ isPrimaryKey: false;
397
+ isAutoincrement: false;
398
+ hasRuntimeDefault: false;
399
+ enumValues: undefined;
400
+ baseColumn: never;
401
+ identity: undefined;
402
+ generated: undefined;
403
+ }, {}, {}>;
404
+ };
405
+ dialect: "mysql";
406
+ }>;
407
+ };
408
+ type MysqlRbacSchema = ReturnType<typeof mysqlRbacSchema>;
409
+
410
+ /**
411
+ * @anievo-id/rbac-evolution-drizzle/mysql — MySQL schema + adapter.
412
+ */
413
+
414
+ /**
415
+ * Creates an `RbacAdapter` backed by a Drizzle MySQL database
416
+ * (mysql2, PlanetScale, TiDB Serverless, ...).
417
+ *
418
+ * @param db any Drizzle MySQL database instance
419
+ * @param schema the tables from `mysqlRbacSchema()` (defaults to the unprefixed tables)
420
+ */
421
+ declare function drizzleMysqlAdapter(db: MySqlDatabase<any, any, any, any>, schema?: MysqlRbacSchema): RbacAdapter;
422
+
423
+ export { type MysqlRbacSchema, RbacSchemaOptions, drizzleMysqlAdapter, mysqlRbacSchema };
package/dist/mysql.js ADDED
@@ -0,0 +1,4 @@
1
+ export { drizzleMysqlAdapter, mysqlRbacSchema } from './chunk-Y7E44CIE.js';
2
+ import './chunk-OF3EGBOB.js';
3
+ //# sourceMappingURL=mysql.js.map
4
+ //# sourceMappingURL=mysql.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"sources":[],"names":[],"mappings":"","file":"mysql.js"}
package/dist/pg.cjs CHANGED
@@ -31,16 +31,20 @@ var toRole = (row) => ({
31
31
  teamId: teamFromKey(row.teamId)
32
32
  });
33
33
  var DrizzleRbacAdapter = class _DrizzleRbacAdapter {
34
- constructor(db, t) {
34
+ constructor(db, t, dialect = "pg") {
35
35
  this.db = db;
36
36
  this.t = t;
37
+ this.dialect = dialect;
37
38
  }
38
39
  db;
39
40
  t;
41
+ dialect;
40
42
  // ---------------------------------------------------------------- permissions
41
43
  async createPermission(data) {
42
44
  const { permissions: p } = this.t;
43
- const rows = await this.db.insert(p).values({ name: data.name, guardName: data.guardName }).returning({ id: p.id, name: p.name, guardName: p.guardName });
45
+ const values = { name: data.name, guardName: data.guardName };
46
+ if (this.dialect === "mysql") return { id: await this.insertReturningId(p, values), ...values };
47
+ const rows = await this.db.insert(p).values(values).returning({ id: p.id, name: p.name, guardName: p.guardName });
44
48
  return toPermission(_DrizzleRbacAdapter.first(rows));
45
49
  }
46
50
  async findPermissions(query = {}) {
@@ -70,7 +74,9 @@ var DrizzleRbacAdapter = class _DrizzleRbacAdapter {
70
74
  // ---------------------------------------------------------------------- roles
71
75
  async createRole(data) {
72
76
  const { roles: r } = this.t;
73
- const rows = await this.db.insert(r).values({ name: data.name, guardName: data.guardName, teamId: teamKey(data.teamId) }).returning({ id: r.id, name: r.name, guardName: r.guardName, teamId: r.teamId });
77
+ const values = { name: data.name, guardName: data.guardName, teamId: teamKey(data.teamId) };
78
+ if (this.dialect === "mysql") return toRole({ id: await this.insertReturningId(r, values), ...values });
79
+ const rows = await this.db.insert(r).values(values).returning({ id: r.id, name: r.name, guardName: r.guardName, teamId: r.teamId });
74
80
  return toRole(_DrizzleRbacAdapter.first(rows));
75
81
  }
76
82
  async findRoles(query = {}) {
@@ -113,7 +119,13 @@ var DrizzleRbacAdapter = class _DrizzleRbacAdapter {
113
119
  const rid = toIntId(roleId);
114
120
  const ids = toIntIds(permissionIds);
115
121
  if (rid === null || ids.length === 0) return;
116
- await this.db.insert(this.t.roleHasPermissions).values(ids.map((permissionId) => ({ roleId: rid, permissionId }))).onConflictDoNothing();
122
+ const { roleHasPermissions: l } = this.t;
123
+ await this.insertIgnoringDuplicates(
124
+ l,
125
+ ids.map((permissionId) => ({ roleId: rid, permissionId })),
126
+ "roleId",
127
+ l.roleId
128
+ );
117
129
  }
118
130
  async detachRolePermissions(roleId, permissionIds) {
119
131
  const rid = toIntId(roleId);
@@ -170,6 +182,24 @@ var DrizzleRbacAdapter = class _DrizzleRbacAdapter {
170
182
  if (row === void 0) throw new Error("rbac-evolution-drizzle: INSERT ... RETURNING returned no row");
171
183
  return row;
172
184
  }
185
+ /** MySQL has no `INSERT ... RETURNING`: insert, then read the generated auto-increment id. */
186
+ async insertReturningId(table, values) {
187
+ const rows = await this.db.insert(table).values(values).$returningId();
188
+ return Number(_DrizzleRbacAdapter.first(rows).id);
189
+ }
190
+ /**
191
+ * Idempotent multi-row insert into a link table (every column is part of the primary key).
192
+ * PostgreSQL / SQLite: `ON CONFLICT DO NOTHING`. MySQL: `ON DUPLICATE KEY UPDATE col = col`, a no-op
193
+ * update that — unlike `INSERT IGNORE` — still reports foreign-key and other errors.
194
+ */
195
+ async insertIgnoringDuplicates(table, rows, keyProperty, keyColumn) {
196
+ const insert = this.db.insert(table).values(rows);
197
+ if (this.dialect === "mysql") {
198
+ await insert.onDuplicateKeyUpdate({ set: { [keyProperty]: drizzleOrm.sql`${drizzleOrm.sql.identifier(keyColumn.name)}` } });
199
+ } else {
200
+ await insert.onConflictDoNothing();
201
+ }
202
+ }
173
203
  static subjectWhere(table, subject, teamId) {
174
204
  return [
175
205
  drizzleOrm.eq(table.subjectType, subject.type),
@@ -185,7 +215,12 @@ var DrizzleRbacAdapter = class _DrizzleRbacAdapter {
185
215
  const ids = toIntIds(targetIds);
186
216
  if (ids.length === 0) return;
187
217
  const base = { subjectType: subject.type, subjectId: String(subject.id), teamId: teamKey(teamId) };
188
- await this.db.insert(table).values(ids.map((id) => ({ ...base, [targetKey]: id }))).onConflictDoNothing();
218
+ await this.insertIgnoringDuplicates(
219
+ table,
220
+ ids.map((id) => ({ ...base, [targetKey]: id })),
221
+ "subjectType",
222
+ table.subjectType
223
+ );
189
224
  }
190
225
  async detach(table, target, subject, targetIds, teamId) {
191
226
  const where = _DrizzleRbacAdapter.subjectWhere(table, subject, teamId);
@@ -292,7 +327,7 @@ function pgRbacSchema(options = {}) {
292
327
 
293
328
  // src/pg.ts
294
329
  function drizzlePgAdapter(db, schema = pgRbacSchema()) {
295
- return new DrizzleRbacAdapter(db, schema);
330
+ return new DrizzleRbacAdapter(db, schema, "pg");
296
331
  }
297
332
 
298
333
  exports.drizzlePgAdapter = drizzlePgAdapter;