@forinda/kickjs-drizzle 1.2.7 → 1.2.9

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.
package/dist/index.d.ts CHANGED
@@ -104,6 +104,95 @@ interface DrizzleQueryConfig {
104
104
  /** Columns to search across when a search string is provided */
105
105
  searchColumns?: string[];
106
106
  }
107
+ /**
108
+ * Type-safe Drizzle query configuration using Column objects.
109
+ *
110
+ * Use this instead of `DrizzleQueryConfig` for type-safe column references
111
+ * that are validated at compile time. Column objects carry `dataType` metadata
112
+ * enabling automatic type coercion of filter values.
113
+ *
114
+ * @example
115
+ * ```ts
116
+ * import { users } from './schema'
117
+ * import type { DrizzleColumnQueryConfig } from '@forinda/kickjs-drizzle'
118
+ *
119
+ * const config: DrizzleColumnQueryConfig = {
120
+ * columns: {
121
+ * status: users.status,
122
+ * isActive: users.isActive,
123
+ * createdAt: users.createdAt,
124
+ * },
125
+ * sortable: {
126
+ * name: users.name,
127
+ * createdAt: users.createdAt,
128
+ * },
129
+ * searchColumns: [users.firstName, users.lastName, users.email],
130
+ * baseCondition: eq(users.tenantId, tenantId),
131
+ * }
132
+ * ```
133
+ */
134
+ interface DrizzleColumnQueryConfig {
135
+ /**
136
+ * Map of filterable field names to Drizzle Column objects.
137
+ * Keys are the query parameter names, values are the actual schema columns.
138
+ * The column's `dataType` is used for automatic type coercion.
139
+ */
140
+ columns: Record<string, any>;
141
+ /**
142
+ * Map of sortable field names to Drizzle Column objects.
143
+ * If not provided, falls back to `columns` for sort lookups.
144
+ */
145
+ sortable?: Record<string, any>;
146
+ /**
147
+ * Column objects to search across when a search string is provided.
148
+ * Each entry should be a Drizzle Column (not a string).
149
+ */
150
+ searchColumns?: any[];
151
+ /**
152
+ * A pre-built SQL condition that is always prepended to the WHERE clause.
153
+ * Use for scoping queries by tenant, workspace, or other invariants.
154
+ *
155
+ * @example
156
+ * ```ts
157
+ * baseCondition: and(eq(tasks.tenantId, tid), eq(tasks.workspaceId, wid))
158
+ * ```
159
+ */
160
+ baseCondition?: any;
161
+ }
162
+ /**
163
+ * Configuration type for defining query param schemas with Drizzle Column objects.
164
+ *
165
+ * Used in constants files to define which columns are filterable, sortable, and searchable.
166
+ * This type is consumed by both `DrizzleQueryAdapter.buildFromColumns()` and `@ApiQueryParams()`.
167
+ *
168
+ * @example
169
+ * ```ts
170
+ * import type { DrizzleQueryParamsConfig } from '@forinda/kickjs-drizzle'
171
+ * import { tasks } from '@/db/schema'
172
+ *
173
+ * export const TASK_QUERY_CONFIG: DrizzleQueryParamsConfig = {
174
+ * columns: {
175
+ * status: tasks.status,
176
+ * priority: tasks.priority,
177
+ * },
178
+ * sortable: {
179
+ * title: tasks.title,
180
+ * createdAt: tasks.createdAt,
181
+ * },
182
+ * searchColumns: [tasks.title, tasks.key],
183
+ * }
184
+ * ```
185
+ */
186
+ interface DrizzleQueryParamsConfig {
187
+ /** Filterable columns: keys are query param names, values are Drizzle Column objects */
188
+ columns: Record<string, any>;
189
+ /** Sortable columns: keys are query param names, values are Drizzle Column objects */
190
+ sortable?: Record<string, any>;
191
+ /** Columns for text search */
192
+ searchColumns?: any[];
193
+ /** Optional base condition for scoping (tenant, workspace, etc.) */
194
+ baseCondition?: any;
195
+ }
107
196
  /**
108
197
  * Result shape compatible with Drizzle's query builder.
109
198
  * Use with `db.select().from(table).where(result.where).orderBy(...result.orderBy).limit(result.limit).offset(result.offset)`
@@ -124,10 +213,10 @@ interface DrizzleQueryResult {
124
213
  *
125
214
  * @example
126
215
  * ```ts
127
- * import { eq, ne, gt, gte, lt, lte, ilike, inArray, and, or, asc, desc } from 'drizzle-orm'
216
+ * import { eq, ne, gt, gte, lt, lte, ilike, inArray, between, and, or, asc, desc } from 'drizzle-orm'
128
217
  *
129
218
  * const adapter = new DrizzleQueryAdapter({
130
- * eq, ne, gt, gte, lt, lte, ilike, inArray, and, or, asc, desc,
219
+ * eq, ne, gt, gte, lt, lte, ilike, inArray, between, and, or, asc, desc,
131
220
  * })
132
221
  * ```
133
222
  */
@@ -140,6 +229,7 @@ interface DrizzleOps {
140
229
  lte: (column: any, value: any) => any;
141
230
  ilike: (column: any, value: string) => any;
142
231
  inArray: (column: any, values: any[]) => any;
232
+ between?: (column: any, min: any, max: any) => any;
143
233
  and: (...conditions: any[]) => any;
144
234
  or: (...conditions: any[]) => any;
145
235
  asc: (column: any) => any;
@@ -148,20 +238,24 @@ interface DrizzleOps {
148
238
  /**
149
239
  * Translates a ParsedQuery into Drizzle-compatible query parts.
150
240
  *
241
+ * Supports two modes:
242
+ * 1. **String-based** (legacy): `build(parsed, { table, searchColumns })` — looks up columns by string name
243
+ * 2. **Column-based** (recommended): `buildFromColumns(parsed, config)` — uses actual Column objects for type safety
244
+ *
151
245
  * @example
152
246
  * ```ts
153
- * import { eq, ne, gt, gte, lt, lte, ilike, inArray, and, or, asc, desc } from 'drizzle-orm'
154
- * import { users } from './schema'
247
+ * // String-based (legacy)
248
+ * const query = adapter.build(parsed, { table: users, searchColumns: ['name', 'email'] })
155
249
  *
156
- * const adapter = new DrizzleQueryAdapter({
157
- * eq, ne, gt, gte, lt, lte, ilike, inArray, and, or, asc, desc,
250
+ * // Column-based (recommended)
251
+ * const query = adapter.buildFromColumns(parsed, {
252
+ * columns: { status: users.status, isActive: users.isActive },
253
+ * searchColumns: [users.name, users.email],
254
+ * baseCondition: eq(users.tenantId, tid),
158
255
  * })
159
- * const parsed = ctx.qs({ filters: ['name', 'email'], sort: ['name'] })
160
- * const query = adapter.build(parsed, { table: users, searchColumns: ['name', 'email'] })
161
256
  *
162
257
  * const results = await db
163
- * .select()
164
- * .from(users)
258
+ * .select().from(users)
165
259
  * .where(query.where)
166
260
  * .orderBy(...query.orderBy)
167
261
  * .limit(query.limit)
@@ -172,13 +266,52 @@ declare class DrizzleQueryAdapter implements QueryBuilderAdapter<DrizzleQueryRes
172
266
  private ops;
173
267
  readonly name = "DrizzleQueryAdapter";
174
268
  constructor(ops: DrizzleOps);
269
+ /**
270
+ * Build query from string-based config (legacy API).
271
+ * Prefer `buildFromColumns()` for type safety.
272
+ */
175
273
  build(parsed: ParsedQuery, config?: DrizzleQueryConfig): DrizzleQueryResult;
176
- /** Map a single FilterItem to a Drizzle condition */
274
+ /**
275
+ * Build query using Column objects for type-safe filtering, sorting, and search.
276
+ *
277
+ * Features over `build()`:
278
+ * - Column references validated at compile time
279
+ * - Automatic type coercion based on `column.dataType` (boolean, number, date)
280
+ * - `baseCondition` support for tenant/workspace scoping
281
+ * - Native `between` operator support
282
+ * - Separate `sortable` map so filterable and sortable columns can differ
283
+ *
284
+ * @example
285
+ * ```ts
286
+ * const query = adapter.buildFromColumns(parsed, {
287
+ * columns: { status: tasks.status, priority: tasks.priority },
288
+ * sortable: { title: tasks.title, createdAt: tasks.createdAt },
289
+ * searchColumns: [tasks.title, tasks.key],
290
+ * baseCondition: eq(tasks.workspaceId, wid),
291
+ * })
292
+ * ```
293
+ */
294
+ buildFromColumns(parsed: ParsedQuery, config: DrizzleColumnQueryConfig): DrizzleQueryResult;
295
+ /** Map a single FilterItem to a Drizzle condition using string-based table lookup */
177
296
  private buildFilter;
297
+ /**
298
+ * Map a FilterItem to a Drizzle condition using a Column object.
299
+ * Coerces values based on `column.dataType` for type-safe filtering.
300
+ */
301
+ private buildColumnFilter;
178
302
  /** Build Drizzle orderBy from SortItem[] */
179
303
  private buildSort;
180
304
  /** Attempt to coerce a string value to a number or boolean if appropriate */
181
305
  private coerce;
306
+ /**
307
+ * Coerce a string value based on the column's dataType.
308
+ *
309
+ * - `'boolean'` → `true`/`false`
310
+ * - `'number'` / `'bigint'` → `Number(value)`
311
+ * - `'date'` → `new Date(value)` (ISO 8601 strings)
312
+ * - Everything else → original string
313
+ */
314
+ private coerceByDataType;
182
315
  }
183
316
 
184
- export { DRIZZLE_DB, DrizzleAdapter, type DrizzleAdapterOptions, type DrizzleOps, DrizzleQueryAdapter, type DrizzleQueryConfig, type DrizzleQueryResult };
317
+ export { DRIZZLE_DB, DrizzleAdapter, type DrizzleAdapterOptions, type DrizzleColumnQueryConfig, type DrizzleOps, DrizzleQueryAdapter, type DrizzleQueryConfig, type DrizzleQueryParamsConfig, type DrizzleQueryResult };
package/dist/index.js CHANGED
@@ -49,6 +49,10 @@ var DrizzleQueryAdapter = class {
49
49
  constructor(ops) {
50
50
  this.ops = ops;
51
51
  }
52
+ /**
53
+ * Build query from string-based config (legacy API).
54
+ * Prefer `buildFromColumns()` for type safety.
55
+ */
52
56
  build(parsed, config = {}) {
53
57
  const result = {
54
58
  orderBy: [],
@@ -74,7 +78,58 @@ var DrizzleQueryAdapter = class {
74
78
  result.orderBy = this.buildSort(config.table, parsed.sort);
75
79
  return result;
76
80
  }
77
- /** Map a single FilterItem to a Drizzle condition */
81
+ /**
82
+ * Build query using Column objects for type-safe filtering, sorting, and search.
83
+ *
84
+ * Features over `build()`:
85
+ * - Column references validated at compile time
86
+ * - Automatic type coercion based on `column.dataType` (boolean, number, date)
87
+ * - `baseCondition` support for tenant/workspace scoping
88
+ * - Native `between` operator support
89
+ * - Separate `sortable` map so filterable and sortable columns can differ
90
+ *
91
+ * @example
92
+ * ```ts
93
+ * const query = adapter.buildFromColumns(parsed, {
94
+ * columns: { status: tasks.status, priority: tasks.priority },
95
+ * sortable: { title: tasks.title, createdAt: tasks.createdAt },
96
+ * searchColumns: [tasks.title, tasks.key],
97
+ * baseCondition: eq(tasks.workspaceId, wid),
98
+ * })
99
+ * ```
100
+ */
101
+ buildFromColumns(parsed, config) {
102
+ const result = {
103
+ orderBy: [],
104
+ limit: parsed.pagination.limit,
105
+ offset: parsed.pagination.offset
106
+ };
107
+ const conditions = [];
108
+ if (config.baseCondition) {
109
+ conditions.push(config.baseCondition);
110
+ }
111
+ for (const filter of parsed.filters) {
112
+ const column = config.columns[filter.field];
113
+ if (!column) continue;
114
+ const condition = this.buildColumnFilter(column, filter);
115
+ if (condition) conditions.push(condition);
116
+ }
117
+ if (parsed.search && config.searchColumns && config.searchColumns.length > 0) {
118
+ const searchConditions = config.searchColumns.map((col) => this.ops.ilike(col, `%${parsed.search}%`));
119
+ if (searchConditions.length > 0) {
120
+ conditions.push(this.ops.or(...searchConditions));
121
+ }
122
+ }
123
+ if (conditions.length === 1) {
124
+ result.where = conditions[0];
125
+ } else if (conditions.length > 1) {
126
+ result.where = this.ops.and(...conditions);
127
+ }
128
+ const sortMap = config.sortable ?? config.columns;
129
+ result.orderBy = parsed.sort.filter((item) => sortMap[item.field]).map((item) => item.direction === "desc" ? this.ops.desc(sortMap[item.field]) : this.ops.asc(sortMap[item.field]));
130
+ return result;
131
+ }
132
+ /** Map a single FilterItem to a Drizzle condition using string-based table lookup */
78
133
  buildFilter(table, filter) {
79
134
  const column = table[filter.field];
80
135
  if (!column) return null;
@@ -110,6 +165,48 @@ var DrizzleQueryAdapter = class {
110
165
  return this.ops.eq(column, value);
111
166
  }
112
167
  }
168
+ /**
169
+ * Map a FilterItem to a Drizzle condition using a Column object.
170
+ * Coerces values based on `column.dataType` for type-safe filtering.
171
+ */
172
+ buildColumnFilter(column, filter) {
173
+ const value = this.coerceByDataType(filter.value, column.dataType);
174
+ switch (filter.operator) {
175
+ case "eq":
176
+ return this.ops.eq(column, value);
177
+ case "neq":
178
+ return this.ops.ne(column, value);
179
+ case "gt":
180
+ return this.ops.gt(column, value);
181
+ case "gte":
182
+ return this.ops.gte(column, value);
183
+ case "lt":
184
+ return this.ops.lt(column, value);
185
+ case "lte":
186
+ return this.ops.lte(column, value);
187
+ case "contains":
188
+ return this.ops.ilike(column, `%${filter.value}%`);
189
+ case "starts":
190
+ return this.ops.ilike(column, `${filter.value}%`);
191
+ case "ends":
192
+ return this.ops.ilike(column, `%${filter.value}`);
193
+ case "in": {
194
+ const values = filter.value.split(",").map((v) => this.coerceByDataType(v.trim(), column.dataType));
195
+ return this.ops.inArray(column, values);
196
+ }
197
+ case "between": {
198
+ const [minStr, maxStr] = filter.value.split(",").map((v) => v.trim());
199
+ const min = this.coerceByDataType(minStr, column.dataType);
200
+ const max = this.coerceByDataType(maxStr, column.dataType);
201
+ if (this.ops.between) {
202
+ return this.ops.between(column, min, max);
203
+ }
204
+ return this.ops.and(this.ops.gte(column, min), this.ops.lte(column, max));
205
+ }
206
+ default:
207
+ return this.ops.eq(column, value);
208
+ }
209
+ }
113
210
  /** Build Drizzle orderBy from SortItem[] */
114
211
  buildSort(table, sort) {
115
212
  return sort.filter((item) => table[item.field]).map((item) => item.direction === "desc" ? this.ops.desc(table[item.field]) : this.ops.asc(table[item.field]));
@@ -122,6 +219,34 @@ var DrizzleQueryAdapter = class {
122
219
  if (!Number.isNaN(num) && value.trim() !== "") return num;
123
220
  return value;
124
221
  }
222
+ /**
223
+ * Coerce a string value based on the column's dataType.
224
+ *
225
+ * - `'boolean'` → `true`/`false`
226
+ * - `'number'` / `'bigint'` → `Number(value)`
227
+ * - `'date'` → `new Date(value)` (ISO 8601 strings)
228
+ * - Everything else → original string
229
+ */
230
+ coerceByDataType(value, dataType) {
231
+ if (!dataType) return this.coerce(value);
232
+ switch (dataType) {
233
+ case "boolean":
234
+ return value === "true" || value === "1";
235
+ case "number":
236
+ case "bigint": {
237
+ const num = Number(value);
238
+ return Number.isNaN(num) ? value : num;
239
+ }
240
+ case "date":
241
+ case "localDate":
242
+ case "localDateTime": {
243
+ const date = new Date(value);
244
+ return Number.isNaN(date.getTime()) ? value : date;
245
+ }
246
+ default:
247
+ return value;
248
+ }
249
+ }
125
250
  };
126
251
  export {
127
252
  DRIZZLE_DB,
package/dist/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"sources":["../src/drizzle.adapter.ts","../src/types.ts","../src/query-adapter.ts"],"sourcesContent":["import { Logger, type AppAdapter, type Container, Scope } from '@forinda/kickjs-core'\nimport { DRIZZLE_DB, type DrizzleAdapterOptions } from './types'\n\nconst log = Logger.for('DrizzleAdapter')\n\n/**\n * Drizzle ORM adapter — registers a Drizzle database instance in the DI\n * container and manages its lifecycle.\n *\n * Works with any Drizzle driver: `drizzle-orm/postgres-js`, `drizzle-orm/node-postgres`,\n * `drizzle-orm/mysql2`, `drizzle-orm/better-sqlite3`, `drizzle-orm/libsql`, etc.\n *\n * The adapter is generic — the db type is inferred from what you pass in,\n * so services can inject the fully-typed database instance.\n *\n * @example\n * ```ts\n * import { drizzle } from 'drizzle-orm/better-sqlite3'\n * import * as schema from './schema'\n * import { DrizzleAdapter } from '@forinda/kickjs-drizzle'\n *\n * const db = drizzle({ client: sqlite, schema })\n *\n * bootstrap({\n * modules,\n * adapters: [\n * new DrizzleAdapter({ db, onShutdown: () => sqlite.close() }),\n * ],\n * })\n * ```\n *\n * Inject the typed db instance in services:\n * ```ts\n * import type { BetterSQLite3Database } from 'drizzle-orm/better-sqlite3'\n * import * as schema from './schema'\n *\n * @Service()\n * class UserService {\n * constructor(@Inject(DRIZZLE_DB) private db: BetterSQLite3Database<typeof schema>) {}\n * }\n * ```\n */\nexport class DrizzleAdapter<TDb = unknown> implements AppAdapter {\n name = 'DrizzleAdapter'\n private db: TDb\n private onShutdown?: () => void | Promise<void>\n\n constructor(private options: DrizzleAdapterOptions<TDb>) {\n this.db = options.db\n this.onShutdown = options.onShutdown\n }\n\n /** Register the Drizzle db instance in the DI container */\n beforeStart(_app: unknown, container: Container): void {\n if (this.options.logging) {\n log.info('Query logging enabled')\n }\n\n container.registerFactory(DRIZZLE_DB, () => this.db, Scope.SINGLETON)\n\n log.info('Drizzle database registered in DI container')\n }\n\n /** Close the underlying connection on shutdown */\n async shutdown(): Promise<void> {\n if (this.onShutdown) {\n await this.onShutdown()\n log.info('Drizzle connection closed')\n }\n }\n}\n","import type { MaybePromise } from '@forinda/kickjs-core'\n\n/** DI token for resolving the Drizzle database instance from the container */\nexport const DRIZZLE_DB = Symbol('DrizzleDB')\n\nexport interface DrizzleAdapterOptions<TDb = unknown> {\n /**\n * Drizzle database instance — the return value of `drizzle()`.\n * Preserves the full type so services can inject it type-safely.\n *\n * @example\n * ```ts\n * import { drizzle } from 'drizzle-orm/better-sqlite3'\n * import * as schema from './schema'\n *\n * const db = drizzle({ client: sqlite, schema })\n * // db is BetterSQLite3Database<typeof schema>\n *\n * new DrizzleAdapter({ db })\n * // TDb is inferred as BetterSQLite3Database<typeof schema>\n * ```\n */\n db: TDb\n\n /** Enable query logging (default: false) */\n logging?: boolean\n\n /**\n * Optional shutdown function to close the underlying connection pool.\n * Drizzle doesn't expose a universal disconnect — this lets you pass your\n * driver's cleanup (e.g., `pool.end()` for postgres, `client.close()` for libsql).\n *\n * @example\n * ```ts\n * const pool = new Pool({ connectionString: '...' })\n * const db = drizzle(pool)\n *\n * new DrizzleAdapter({\n * db,\n * onShutdown: () => pool.end(),\n * })\n * ```\n */\n onShutdown?: () => MaybePromise<any>\n}\n","import type { QueryBuilderAdapter, ParsedQuery, FilterItem, SortItem } from '@forinda/kickjs-http'\n\n/**\n * Configuration for the Drizzle query builder adapter.\n *\n * Unlike Prisma which uses its own query builder API, Drizzle uses SQL-like\n * operators (`eq`, `gt`, `like`, etc.) from `drizzle-orm`. This adapter\n * produces a config object that can be spread into Drizzle's `select().from().where()`.\n */\nexport interface DrizzleQueryConfig {\n /** The Drizzle table schema object (e.g., `users` from your schema) */\n table: Record<string, any>\n /** Columns to search across when a search string is provided */\n searchColumns?: string[]\n}\n\n/**\n * Result shape compatible with Drizzle's query builder.\n * Use with `db.select().from(table).where(result.where).orderBy(...result.orderBy).limit(result.limit).offset(result.offset)`\n */\nexport interface DrizzleQueryResult {\n /** SQL condition — pass to `.where()` */\n where?: any\n /** Array of order expressions — spread into `.orderBy()` */\n orderBy: any[]\n /** Row limit — pass to `.limit()` */\n limit: number\n /** Row offset — pass to `.offset()` */\n offset: number\n}\n\n/**\n * Drizzle operator functions required by the query adapter.\n * Pass these from your `drizzle-orm` import to avoid version coupling.\n *\n * @example\n * ```ts\n * import { eq, ne, gt, gte, lt, lte, ilike, inArray, and, or, asc, desc } from 'drizzle-orm'\n *\n * const adapter = new DrizzleQueryAdapter({\n * eq, ne, gt, gte, lt, lte, ilike, inArray, and, or, asc, desc,\n * })\n * ```\n */\nexport interface DrizzleOps {\n eq: (column: any, value: any) => any\n ne: (column: any, value: any) => any\n gt: (column: any, value: any) => any\n gte: (column: any, value: any) => any\n lt: (column: any, value: any) => any\n lte: (column: any, value: any) => any\n ilike: (column: any, value: string) => any\n inArray: (column: any, values: any[]) => any\n and: (...conditions: any[]) => any\n or: (...conditions: any[]) => any\n asc: (column: any) => any\n desc: (column: any) => any\n}\n\n/**\n * Translates a ParsedQuery into Drizzle-compatible query parts.\n *\n * @example\n * ```ts\n * import { eq, ne, gt, gte, lt, lte, ilike, inArray, and, or, asc, desc } from 'drizzle-orm'\n * import { users } from './schema'\n *\n * const adapter = new DrizzleQueryAdapter({\n * eq, ne, gt, gte, lt, lte, ilike, inArray, and, or, asc, desc,\n * })\n * const parsed = ctx.qs({ filters: ['name', 'email'], sort: ['name'] })\n * const query = adapter.build(parsed, { table: users, searchColumns: ['name', 'email'] })\n *\n * const results = await db\n * .select()\n * .from(users)\n * .where(query.where)\n * .orderBy(...query.orderBy)\n * .limit(query.limit)\n * .offset(query.offset)\n * ```\n */\nexport class DrizzleQueryAdapter implements QueryBuilderAdapter<\n DrizzleQueryResult,\n DrizzleQueryConfig\n> {\n readonly name = 'DrizzleQueryAdapter'\n\n constructor(private ops: DrizzleOps) {}\n\n build(\n parsed: ParsedQuery,\n config: DrizzleQueryConfig = {} as DrizzleQueryConfig,\n ): DrizzleQueryResult {\n const result: DrizzleQueryResult = {\n orderBy: [],\n limit: parsed.pagination.limit,\n offset: parsed.pagination.offset,\n }\n\n // Build where conditions\n const conditions: any[] = []\n\n // Filters\n for (const filter of parsed.filters) {\n const condition = this.buildFilter(config.table, filter)\n if (condition) conditions.push(condition)\n }\n\n // Search\n if (parsed.search && config.searchColumns && config.searchColumns.length > 0) {\n const searchConditions = config.searchColumns\n .filter((col) => config.table[col])\n .map((col) => this.ops.ilike(config.table[col], `%${parsed.search}%`))\n\n if (searchConditions.length > 0) {\n conditions.push(this.ops.or(...searchConditions))\n }\n }\n\n // Combine conditions\n if (conditions.length === 1) {\n result.where = conditions[0]\n } else if (conditions.length > 1) {\n result.where = this.ops.and(...conditions)\n }\n\n // Sort\n result.orderBy = this.buildSort(config.table, parsed.sort)\n\n return result\n }\n\n /** Map a single FilterItem to a Drizzle condition */\n private buildFilter(table: Record<string, any>, filter: FilterItem): any {\n const column = table[filter.field]\n if (!column) return null\n\n const value = this.coerce(filter.value)\n\n switch (filter.operator) {\n case 'eq':\n return this.ops.eq(column, value)\n case 'neq':\n return this.ops.ne(column, value)\n case 'gt':\n return this.ops.gt(column, value)\n case 'gte':\n return this.ops.gte(column, value)\n case 'lt':\n return this.ops.lt(column, value)\n case 'lte':\n return this.ops.lte(column, value)\n case 'contains':\n return this.ops.ilike(column, `%${filter.value}%`)\n case 'starts':\n return this.ops.ilike(column, `${filter.value}%`)\n case 'ends':\n return this.ops.ilike(column, `%${filter.value}`)\n case 'in': {\n const values = filter.value.split(',').map((v) => this.coerce(v.trim()))\n return this.ops.inArray(column, values)\n }\n case 'between': {\n const [min, max] = filter.value.split(',').map((v) => this.coerce(v.trim()))\n return this.ops.and(this.ops.gte(column, min), this.ops.lte(column, max))\n }\n default:\n return this.ops.eq(column, value)\n }\n }\n\n /** Build Drizzle orderBy from SortItem[] */\n private buildSort(table: Record<string, any>, sort: SortItem[]): any[] {\n return sort\n .filter((item) => table[item.field])\n .map((item) =>\n item.direction === 'desc'\n ? this.ops.desc(table[item.field])\n : this.ops.asc(table[item.field]),\n )\n }\n\n /** Attempt to coerce a string value to a number or boolean if appropriate */\n private coerce(value: string): string | number | boolean {\n if (value === 'true') return true\n if (value === 'false') return false\n const num = Number(value)\n if (!Number.isNaN(num) && value.trim() !== '') return num\n return value\n }\n}\n"],"mappings":"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","names":["Logger","Scope","DRIZZLE_DB","Symbol","log","Logger","for","DrizzleAdapter","name","db","onShutdown","options","beforeStart","_app","container","logging","info","registerFactory","DRIZZLE_DB","Scope","SINGLETON","shutdown","DrizzleQueryAdapter","name","ops","build","parsed","config","result","orderBy","limit","pagination","offset","conditions","filter","filters","condition","buildFilter","table","push","search","searchColumns","length","searchConditions","col","map","ilike","or","where","and","buildSort","sort","column","field","value","coerce","operator","eq","ne","gt","gte","lt","lte","values","split","v","trim","inArray","min","max","item","direction","desc","asc","num","Number","isNaN"]}
1
+ {"version":3,"sources":["../src/drizzle.adapter.ts","../src/types.ts","../src/query-adapter.ts"],"sourcesContent":["import { Logger, type AppAdapter, type Container, Scope } from '@forinda/kickjs-core'\nimport { DRIZZLE_DB, type DrizzleAdapterOptions } from './types'\n\nconst log = Logger.for('DrizzleAdapter')\n\n/**\n * Drizzle ORM adapter — registers a Drizzle database instance in the DI\n * container and manages its lifecycle.\n *\n * Works with any Drizzle driver: `drizzle-orm/postgres-js`, `drizzle-orm/node-postgres`,\n * `drizzle-orm/mysql2`, `drizzle-orm/better-sqlite3`, `drizzle-orm/libsql`, etc.\n *\n * The adapter is generic — the db type is inferred from what you pass in,\n * so services can inject the fully-typed database instance.\n *\n * @example\n * ```ts\n * import { drizzle } from 'drizzle-orm/better-sqlite3'\n * import * as schema from './schema'\n * import { DrizzleAdapter } from '@forinda/kickjs-drizzle'\n *\n * const db = drizzle({ client: sqlite, schema })\n *\n * bootstrap({\n * modules,\n * adapters: [\n * new DrizzleAdapter({ db, onShutdown: () => sqlite.close() }),\n * ],\n * })\n * ```\n *\n * Inject the typed db instance in services:\n * ```ts\n * import type { BetterSQLite3Database } from 'drizzle-orm/better-sqlite3'\n * import * as schema from './schema'\n *\n * @Service()\n * class UserService {\n * constructor(@Inject(DRIZZLE_DB) private db: BetterSQLite3Database<typeof schema>) {}\n * }\n * ```\n */\nexport class DrizzleAdapter<TDb = unknown> implements AppAdapter {\n name = 'DrizzleAdapter'\n private db: TDb\n private onShutdown?: () => void | Promise<void>\n\n constructor(private options: DrizzleAdapterOptions<TDb>) {\n this.db = options.db\n this.onShutdown = options.onShutdown\n }\n\n /** Register the Drizzle db instance in the DI container */\n beforeStart(_app: unknown, container: Container): void {\n if (this.options.logging) {\n log.info('Query logging enabled')\n }\n\n container.registerFactory(DRIZZLE_DB, () => this.db, Scope.SINGLETON)\n\n log.info('Drizzle database registered in DI container')\n }\n\n /** Close the underlying connection on shutdown */\n async shutdown(): Promise<void> {\n if (this.onShutdown) {\n await this.onShutdown()\n log.info('Drizzle connection closed')\n }\n }\n}\n","import type { MaybePromise } from '@forinda/kickjs-core'\n\n/** DI token for resolving the Drizzle database instance from the container */\nexport const DRIZZLE_DB = Symbol('DrizzleDB')\n\nexport interface DrizzleAdapterOptions<TDb = unknown> {\n /**\n * Drizzle database instance — the return value of `drizzle()`.\n * Preserves the full type so services can inject it type-safely.\n *\n * @example\n * ```ts\n * import { drizzle } from 'drizzle-orm/better-sqlite3'\n * import * as schema from './schema'\n *\n * const db = drizzle({ client: sqlite, schema })\n * // db is BetterSQLite3Database<typeof schema>\n *\n * new DrizzleAdapter({ db })\n * // TDb is inferred as BetterSQLite3Database<typeof schema>\n * ```\n */\n db: TDb\n\n /** Enable query logging (default: false) */\n logging?: boolean\n\n /**\n * Optional shutdown function to close the underlying connection pool.\n * Drizzle doesn't expose a universal disconnect — this lets you pass your\n * driver's cleanup (e.g., `pool.end()` for postgres, `client.close()` for libsql).\n *\n * @example\n * ```ts\n * const pool = new Pool({ connectionString: '...' })\n * const db = drizzle(pool)\n *\n * new DrizzleAdapter({\n * db,\n * onShutdown: () => pool.end(),\n * })\n * ```\n */\n onShutdown?: () => MaybePromise<any>\n}\n","import type { QueryBuilderAdapter, ParsedQuery, FilterItem, SortItem } from '@forinda/kickjs-http'\n\n/**\n * Configuration for the Drizzle query builder adapter.\n *\n * Unlike Prisma which uses its own query builder API, Drizzle uses SQL-like\n * operators (`eq`, `gt`, `like`, etc.) from `drizzle-orm`. This adapter\n * produces a config object that can be spread into Drizzle's `select().from().where()`.\n */\nexport interface DrizzleQueryConfig {\n /** The Drizzle table schema object (e.g., `users` from your schema) */\n table: Record<string, any>\n /** Columns to search across when a search string is provided */\n searchColumns?: string[]\n}\n\n/**\n * Type-safe Drizzle query configuration using Column objects.\n *\n * Use this instead of `DrizzleQueryConfig` for type-safe column references\n * that are validated at compile time. Column objects carry `dataType` metadata\n * enabling automatic type coercion of filter values.\n *\n * @example\n * ```ts\n * import { users } from './schema'\n * import type { DrizzleColumnQueryConfig } from '@forinda/kickjs-drizzle'\n *\n * const config: DrizzleColumnQueryConfig = {\n * columns: {\n * status: users.status,\n * isActive: users.isActive,\n * createdAt: users.createdAt,\n * },\n * sortable: {\n * name: users.name,\n * createdAt: users.createdAt,\n * },\n * searchColumns: [users.firstName, users.lastName, users.email],\n * baseCondition: eq(users.tenantId, tenantId),\n * }\n * ```\n */\nexport interface DrizzleColumnQueryConfig {\n /**\n * Map of filterable field names to Drizzle Column objects.\n * Keys are the query parameter names, values are the actual schema columns.\n * The column's `dataType` is used for automatic type coercion.\n */\n columns: Record<string, any>\n\n /**\n * Map of sortable field names to Drizzle Column objects.\n * If not provided, falls back to `columns` for sort lookups.\n */\n sortable?: Record<string, any>\n\n /**\n * Column objects to search across when a search string is provided.\n * Each entry should be a Drizzle Column (not a string).\n */\n searchColumns?: any[]\n\n /**\n * A pre-built SQL condition that is always prepended to the WHERE clause.\n * Use for scoping queries by tenant, workspace, or other invariants.\n *\n * @example\n * ```ts\n * baseCondition: and(eq(tasks.tenantId, tid), eq(tasks.workspaceId, wid))\n * ```\n */\n baseCondition?: any\n}\n\n/**\n * Configuration type for defining query param schemas with Drizzle Column objects.\n *\n * Used in constants files to define which columns are filterable, sortable, and searchable.\n * This type is consumed by both `DrizzleQueryAdapter.buildFromColumns()` and `@ApiQueryParams()`.\n *\n * @example\n * ```ts\n * import type { DrizzleQueryParamsConfig } from '@forinda/kickjs-drizzle'\n * import { tasks } from '@/db/schema'\n *\n * export const TASK_QUERY_CONFIG: DrizzleQueryParamsConfig = {\n * columns: {\n * status: tasks.status,\n * priority: tasks.priority,\n * },\n * sortable: {\n * title: tasks.title,\n * createdAt: tasks.createdAt,\n * },\n * searchColumns: [tasks.title, tasks.key],\n * }\n * ```\n */\nexport interface DrizzleQueryParamsConfig {\n /** Filterable columns: keys are query param names, values are Drizzle Column objects */\n columns: Record<string, any>\n /** Sortable columns: keys are query param names, values are Drizzle Column objects */\n sortable?: Record<string, any>\n /** Columns for text search */\n searchColumns?: any[]\n /** Optional base condition for scoping (tenant, workspace, etc.) */\n baseCondition?: any\n}\n\n/**\n * Result shape compatible with Drizzle's query builder.\n * Use with `db.select().from(table).where(result.where).orderBy(...result.orderBy).limit(result.limit).offset(result.offset)`\n */\nexport interface DrizzleQueryResult {\n /** SQL condition — pass to `.where()` */\n where?: any\n /** Array of order expressions — spread into `.orderBy()` */\n orderBy: any[]\n /** Row limit — pass to `.limit()` */\n limit: number\n /** Row offset — pass to `.offset()` */\n offset: number\n}\n\n/**\n * Drizzle operator functions required by the query adapter.\n * Pass these from your `drizzle-orm` import to avoid version coupling.\n *\n * @example\n * ```ts\n * import { eq, ne, gt, gte, lt, lte, ilike, inArray, between, and, or, asc, desc } from 'drizzle-orm'\n *\n * const adapter = new DrizzleQueryAdapter({\n * eq, ne, gt, gte, lt, lte, ilike, inArray, between, and, or, asc, desc,\n * })\n * ```\n */\nexport interface DrizzleOps {\n eq: (column: any, value: any) => any\n ne: (column: any, value: any) => any\n gt: (column: any, value: any) => any\n gte: (column: any, value: any) => any\n lt: (column: any, value: any) => any\n lte: (column: any, value: any) => any\n ilike: (column: any, value: string) => any\n inArray: (column: any, values: any[]) => any\n between?: (column: any, min: any, max: any) => any\n and: (...conditions: any[]) => any\n or: (...conditions: any[]) => any\n asc: (column: any) => any\n desc: (column: any) => any\n}\n\n/**\n * Translates a ParsedQuery into Drizzle-compatible query parts.\n *\n * Supports two modes:\n * 1. **String-based** (legacy): `build(parsed, { table, searchColumns })` — looks up columns by string name\n * 2. **Column-based** (recommended): `buildFromColumns(parsed, config)` — uses actual Column objects for type safety\n *\n * @example\n * ```ts\n * // String-based (legacy)\n * const query = adapter.build(parsed, { table: users, searchColumns: ['name', 'email'] })\n *\n * // Column-based (recommended)\n * const query = adapter.buildFromColumns(parsed, {\n * columns: { status: users.status, isActive: users.isActive },\n * searchColumns: [users.name, users.email],\n * baseCondition: eq(users.tenantId, tid),\n * })\n *\n * const results = await db\n * .select().from(users)\n * .where(query.where)\n * .orderBy(...query.orderBy)\n * .limit(query.limit)\n * .offset(query.offset)\n * ```\n */\nexport class DrizzleQueryAdapter implements QueryBuilderAdapter<\n DrizzleQueryResult,\n DrizzleQueryConfig\n> {\n readonly name = 'DrizzleQueryAdapter'\n\n constructor(private ops: DrizzleOps) {}\n\n /**\n * Build query from string-based config (legacy API).\n * Prefer `buildFromColumns()` for type safety.\n */\n build(\n parsed: ParsedQuery,\n config: DrizzleQueryConfig = {} as DrizzleQueryConfig,\n ): DrizzleQueryResult {\n const result: DrizzleQueryResult = {\n orderBy: [],\n limit: parsed.pagination.limit,\n offset: parsed.pagination.offset,\n }\n\n // Build where conditions\n const conditions: any[] = []\n\n // Filters\n for (const filter of parsed.filters) {\n const condition = this.buildFilter(config.table, filter)\n if (condition) conditions.push(condition)\n }\n\n // Search\n if (parsed.search && config.searchColumns && config.searchColumns.length > 0) {\n const searchConditions = config.searchColumns\n .filter((col) => config.table[col])\n .map((col) => this.ops.ilike(config.table[col], `%${parsed.search}%`))\n\n if (searchConditions.length > 0) {\n conditions.push(this.ops.or(...searchConditions))\n }\n }\n\n // Combine conditions\n if (conditions.length === 1) {\n result.where = conditions[0]\n } else if (conditions.length > 1) {\n result.where = this.ops.and(...conditions)\n }\n\n // Sort\n result.orderBy = this.buildSort(config.table, parsed.sort)\n\n return result\n }\n\n /**\n * Build query using Column objects for type-safe filtering, sorting, and search.\n *\n * Features over `build()`:\n * - Column references validated at compile time\n * - Automatic type coercion based on `column.dataType` (boolean, number, date)\n * - `baseCondition` support for tenant/workspace scoping\n * - Native `between` operator support\n * - Separate `sortable` map so filterable and sortable columns can differ\n *\n * @example\n * ```ts\n * const query = adapter.buildFromColumns(parsed, {\n * columns: { status: tasks.status, priority: tasks.priority },\n * sortable: { title: tasks.title, createdAt: tasks.createdAt },\n * searchColumns: [tasks.title, tasks.key],\n * baseCondition: eq(tasks.workspaceId, wid),\n * })\n * ```\n */\n buildFromColumns(parsed: ParsedQuery, config: DrizzleColumnQueryConfig): DrizzleQueryResult {\n const result: DrizzleQueryResult = {\n orderBy: [],\n limit: parsed.pagination.limit,\n offset: parsed.pagination.offset,\n }\n\n const conditions: any[] = []\n\n // Prepend base condition (tenant/workspace scoping)\n if (config.baseCondition) {\n conditions.push(config.baseCondition)\n }\n\n // Filters — resolve column from the columns map\n for (const filter of parsed.filters) {\n const column = config.columns[filter.field]\n if (!column) continue\n const condition = this.buildColumnFilter(column, filter)\n if (condition) conditions.push(condition)\n }\n\n // Search — use Column objects directly\n if (parsed.search && config.searchColumns && config.searchColumns.length > 0) {\n const searchConditions = config.searchColumns.map((col) =>\n this.ops.ilike(col, `%${parsed.search}%`),\n )\n if (searchConditions.length > 0) {\n conditions.push(this.ops.or(...searchConditions))\n }\n }\n\n // Combine conditions\n if (conditions.length === 1) {\n result.where = conditions[0]\n } else if (conditions.length > 1) {\n result.where = this.ops.and(...conditions)\n }\n\n // Sort — use sortable map, falling back to columns\n const sortMap = config.sortable ?? config.columns\n result.orderBy = parsed.sort\n .filter((item) => sortMap[item.field])\n .map((item) =>\n item.direction === 'desc'\n ? this.ops.desc(sortMap[item.field])\n : this.ops.asc(sortMap[item.field]),\n )\n\n return result\n }\n\n /** Map a single FilterItem to a Drizzle condition using string-based table lookup */\n private buildFilter(table: Record<string, any>, filter: FilterItem): any {\n const column = table[filter.field]\n if (!column) return null\n\n const value = this.coerce(filter.value)\n\n switch (filter.operator) {\n case 'eq':\n return this.ops.eq(column, value)\n case 'neq':\n return this.ops.ne(column, value)\n case 'gt':\n return this.ops.gt(column, value)\n case 'gte':\n return this.ops.gte(column, value)\n case 'lt':\n return this.ops.lt(column, value)\n case 'lte':\n return this.ops.lte(column, value)\n case 'contains':\n return this.ops.ilike(column, `%${filter.value}%`)\n case 'starts':\n return this.ops.ilike(column, `${filter.value}%`)\n case 'ends':\n return this.ops.ilike(column, `%${filter.value}`)\n case 'in': {\n const values = filter.value.split(',').map((v) => this.coerce(v.trim()))\n return this.ops.inArray(column, values)\n }\n case 'between': {\n const [min, max] = filter.value.split(',').map((v) => this.coerce(v.trim()))\n return this.ops.and(this.ops.gte(column, min), this.ops.lte(column, max))\n }\n default:\n return this.ops.eq(column, value)\n }\n }\n\n /**\n * Map a FilterItem to a Drizzle condition using a Column object.\n * Coerces values based on `column.dataType` for type-safe filtering.\n */\n private buildColumnFilter(column: any, filter: FilterItem): any {\n const value = this.coerceByDataType(filter.value, column.dataType)\n\n switch (filter.operator) {\n case 'eq':\n return this.ops.eq(column, value)\n case 'neq':\n return this.ops.ne(column, value)\n case 'gt':\n return this.ops.gt(column, value)\n case 'gte':\n return this.ops.gte(column, value)\n case 'lt':\n return this.ops.lt(column, value)\n case 'lte':\n return this.ops.lte(column, value)\n case 'contains':\n return this.ops.ilike(column, `%${filter.value}%`)\n case 'starts':\n return this.ops.ilike(column, `${filter.value}%`)\n case 'ends':\n return this.ops.ilike(column, `%${filter.value}`)\n case 'in': {\n const values = filter.value\n .split(',')\n .map((v) => this.coerceByDataType(v.trim(), column.dataType))\n return this.ops.inArray(column, values)\n }\n case 'between': {\n const [minStr, maxStr] = filter.value.split(',').map((v) => v.trim())\n const min = this.coerceByDataType(minStr, column.dataType)\n const max = this.coerceByDataType(maxStr, column.dataType)\n if (this.ops.between) {\n return this.ops.between(column, min, max)\n }\n return this.ops.and(this.ops.gte(column, min), this.ops.lte(column, max))\n }\n default:\n return this.ops.eq(column, value)\n }\n }\n\n /** Build Drizzle orderBy from SortItem[] */\n private buildSort(table: Record<string, any>, sort: SortItem[]): any[] {\n return sort\n .filter((item) => table[item.field])\n .map((item) =>\n item.direction === 'desc'\n ? this.ops.desc(table[item.field])\n : this.ops.asc(table[item.field]),\n )\n }\n\n /** Attempt to coerce a string value to a number or boolean if appropriate */\n private coerce(value: string): string | number | boolean {\n if (value === 'true') return true\n if (value === 'false') return false\n const num = Number(value)\n if (!Number.isNaN(num) && value.trim() !== '') return num\n return value\n }\n\n /**\n * Coerce a string value based on the column's dataType.\n *\n * - `'boolean'` → `true`/`false`\n * - `'number'` / `'bigint'` → `Number(value)`\n * - `'date'` → `new Date(value)` (ISO 8601 strings)\n * - Everything else → original string\n */\n private coerceByDataType(value: string, dataType?: string): string | number | boolean | Date {\n if (!dataType) return this.coerce(value)\n\n switch (dataType) {\n case 'boolean':\n return value === 'true' || value === '1'\n case 'number':\n case 'bigint': {\n const num = Number(value)\n return Number.isNaN(num) ? value : num\n }\n case 'date':\n case 'localDate':\n case 'localDateTime': {\n const date = new Date(value)\n return Number.isNaN(date.getTime()) ? value : date\n }\n default:\n return value\n }\n }\n}\n"],"mappings":"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","names":["Logger","Scope","DRIZZLE_DB","Symbol","log","Logger","for","DrizzleAdapter","name","db","onShutdown","options","beforeStart","_app","container","logging","info","registerFactory","DRIZZLE_DB","Scope","SINGLETON","shutdown","DrizzleQueryAdapter","name","ops","build","parsed","config","result","orderBy","limit","pagination","offset","conditions","filter","filters","condition","buildFilter","table","push","search","searchColumns","length","searchConditions","col","map","ilike","or","where","and","buildSort","sort","buildFromColumns","baseCondition","column","columns","field","buildColumnFilter","sortMap","sortable","item","direction","desc","asc","value","coerce","operator","eq","ne","gt","gte","lt","lte","values","split","v","trim","inArray","min","max","coerceByDataType","dataType","minStr","maxStr","between","num","Number","isNaN","date","Date","getTime"]}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@forinda/kickjs-drizzle",
3
- "version": "1.2.7",
3
+ "version": "1.2.9",
4
4
  "description": "Drizzle ORM adapter with DI integration, transaction support, and query building for KickJS",
5
5
  "keywords": [
6
6
  "kickjs",
@@ -44,8 +44,8 @@
44
44
  ],
45
45
  "dependencies": {
46
46
  "reflect-metadata": "^0.2.2",
47
- "@forinda/kickjs-core": "1.2.7",
48
- "@forinda/kickjs-http": "1.2.7"
47
+ "@forinda/kickjs-core": "1.2.9",
48
+ "@forinda/kickjs-http": "1.2.9"
49
49
  },
50
50
  "peerDependencies": {
51
51
  "drizzle-orm": ">=0.30.0"