nestjs-drizzle-crud 2.1.2 → 3.0.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 (48) hide show
  1. package/README.md +23 -0
  2. package/dist/core/abstract/sql-base-crud.service.d.ts +11 -9
  3. package/dist/core/abstract/sql-base-crud.service.js +26 -13
  4. package/dist/core/abstract/sql-base-crud.service.js.map +1 -1
  5. package/dist/core/interfaces/drizzle-crud-config.interface.d.ts +2 -1
  6. package/dist/core/interfaces/sql-crud-config.interface.d.ts +2 -1
  7. package/dist/core/types/sql.types.d.ts +4 -10
  8. package/dist/decorators/index.d.ts +0 -1
  9. package/dist/decorators/index.js +1 -4
  10. package/dist/decorators/index.js.map +1 -1
  11. package/dist/index.d.ts +1 -2
  12. package/dist/index.js +1 -3
  13. package/dist/index.js.map +1 -1
  14. package/dist/modules/drizzle-crud.module.js +7 -0
  15. package/dist/modules/drizzle-crud.module.js.map +1 -1
  16. package/dist/test-utils/base-crud.spec-helper.js.map +1 -1
  17. package/package.json +17 -16
  18. package/dist/decorators/crud.decorator.d.ts +0 -1
  19. package/dist/decorators/crud.decorator.js +0 -9
  20. package/dist/decorators/crud.decorator.js.map +0 -1
  21. package/dist/decorators/entity-config.decorator.d.ts +0 -13
  22. package/dist/decorators/entity-config.decorator.js +0 -12
  23. package/dist/decorators/entity-config.decorator.js.map +0 -1
  24. package/dist/interfaces/crud-config.interface.d.ts +0 -18
  25. package/dist/interfaces/crud-config.interface.js +0 -3
  26. package/dist/interfaces/crud-config.interface.js.map +0 -1
  27. package/dist/interfaces/crud-options.interface.d.ts +0 -5
  28. package/dist/interfaces/crud-options.interface.js +0 -18
  29. package/dist/interfaces/crud-options.interface.js.map +0 -1
  30. package/dist/interfaces/crud-service.interface.d.ts +0 -46
  31. package/dist/interfaces/crud-service.interface.js +0 -3
  32. package/dist/interfaces/crud-service.interface.js.map +0 -1
  33. package/dist/interfaces/operation-options.interface.d.ts +0 -23
  34. package/dist/interfaces/operation-options.interface.js +0 -3
  35. package/dist/interfaces/operation-options.interface.js.map +0 -1
  36. package/dist/modules/crud.module.d.ts +0 -5
  37. package/dist/modules/crud.module.js +0 -33
  38. package/dist/modules/crud.module.js.map +0 -1
  39. package/dist/services/base-crud.service.d.ts +0 -49
  40. package/dist/services/base-crud.service.js +0 -398
  41. package/dist/services/base-crud.service.js.map +0 -1
  42. package/dist/services/crud.service.d.ts +0 -5
  43. package/dist/services/crud.service.js +0 -29
  44. package/dist/services/crud.service.js.map +0 -1
  45. package/dist/tsconfig.build.tsbuildinfo +0 -1
  46. package/dist/utils/sql-dialect.utils.d.ts +0 -4
  47. package/dist/utils/sql-dialect.utils.js +0 -18
  48. package/dist/utils/sql-dialect.utils.js.map +0 -1
package/README.md CHANGED
@@ -230,6 +230,7 @@ export class UsersController {
230
230
  | `defaults.softDelete` | `boolean` | Enable soft delete for all entities (default `true`). |
231
231
  | `defaults.timestamps` | `boolean` | Auto-manage `created_at`/`updated_at` for all entities (default `true`). |
232
232
  | `defaults.pagination` | `{ defaultLimit, maxLimit }` | Pagination defaults (default `{ 20, 100 }`). |
233
+ | `defaults.sortOrder` | `'asc' \| 'desc'` | Opt-in default sort: entities **without** an explicit `defaultSort` fall back to ordering by their `created_at` column in this direction. Omit to leave `findAll` unsorted by default. |
233
234
  | `sql` | `{ caseSensitive, useReturning, jsonSupport, enableFullTextSearch }` | Dialect tuning. `useReturning` defaults to `true` for PostgreSQL, `false` for MySQL. |
234
235
 
235
236
  > **Provide exactly one of `connectionString` or `db`.** If your tables have no
@@ -277,6 +278,11 @@ DrizzleCrudModule.forFeature([
277
278
  primaryKey: 'uuid',
278
279
  primaryKeyType: 'uuid',
279
280
  softDelete: { enabled: true, column: 'deleted_at' },
281
+ // Default ORDER BY for findAll() when the caller passes no sortBy.
282
+ defaultSort: [
283
+ { column: 'position', order: 'asc' },
284
+ { column: 'created_at', order: 'desc' }, // tiebreaker
285
+ ],
280
286
  },
281
287
  },
282
288
  ]);
@@ -413,6 +419,23 @@ await service.findAll(
413
419
 
414
420
  `limit` is capped at `pagination.maxLimit`. `sortOrder` defaults to `'desc'`.
415
421
 
422
+ ### Default sort
423
+
424
+ When the caller passes no `sortBy`, `findAll` falls back to the entity's
425
+ `defaultSort` — an ordered list of columns applied as the `ORDER BY` (primary
426
+ sort first, then tiebreakers). An explicit `sortBy` **replaces** the default
427
+ entirely. Per-column `order` defaults to `'asc'`; unknown columns are skipped.
428
+
429
+ ```typescript
430
+ // config.defaultSort: [{ column: 'position', order: 'asc' }, { column: 'created_at', order: 'desc' }]
431
+ await service.findAll(); // ORDER BY position ASC, created_at DESC
432
+ await service.findAll({}, { sortBy: 'name' }); // ORDER BY name DESC (default ignored)
433
+ ```
434
+
435
+ Set it per entity in [`forFeature`](#drizzlecrudmoduleforfeatureentities) config (or via
436
+ `@CrudService`). Alternatively, set [`defaults.sortOrder`](#drizzlecrudmoduleforrootconfig)
437
+ in `forRoot` to apply a `created_at` fallback to every entity that doesn't define its own.
438
+
416
439
  ---
417
440
 
418
441
  ## Relations
@@ -1,5 +1,6 @@
1
1
  import { ICrudService, PaginationOptions } from "../interfaces/crud-service.interface";
2
2
  import { SqlCrudConfig, SqlOperationOptions } from "../interfaces/sql-crud-config.interface";
3
+ import { SortOrder } from "../types/sql.types";
3
4
  export declare abstract class SqlBaseCrudService<T extends Record<string, any>, CreateDto, UpdateDto, FilterDto> implements ICrudService<T, CreateDto, UpdateDto, FilterDto> {
4
5
  protected readonly config: SqlCrudConfig;
5
6
  protected readonly defaultConfig: SqlCrudConfig;
@@ -13,20 +14,21 @@ export declare abstract class SqlBaseCrudService<T extends Record<string, any>,
13
14
  protected mapCreateDtoToEntity(data: CreateDto): Record<string, any>;
14
15
  protected mapUpdateDtoToEntity(data: UpdateDto): Record<string, any>;
15
16
  protected beforeCreate(data: CreateDto): Promise<CreateDto>;
16
- protected afterCreate(entity: T): Promise<void>;
17
- protected beforeUpdate(id: any, data: UpdateDto): Promise<UpdateDto>;
18
- protected afterUpdate(entity: T): Promise<void>;
19
- protected beforeDelete(id: any): Promise<void>;
20
- protected afterDelete(id: any): Promise<void>;
21
- protected beforeSoftDelete(id: any): Promise<void>;
22
- protected afterSoftDelete(id: any): Promise<void>;
23
- protected beforeRestore(id: any): Promise<void>;
24
- protected afterRestore(entity: T): Promise<void>;
17
+ protected afterCreate(_entity: T): Promise<void>;
18
+ protected beforeUpdate(_id: any, data: UpdateDto): Promise<UpdateDto>;
19
+ protected afterUpdate(_entity: T): Promise<void>;
20
+ protected beforeDelete(_id: any): Promise<void>;
21
+ protected afterDelete(_id: any): Promise<void>;
22
+ protected beforeSoftDelete(_id: any): Promise<void>;
23
+ protected afterSoftDelete(_id: any): Promise<void>;
24
+ protected beforeRestore(_id: any): Promise<void>;
25
+ protected afterRestore(_entity: T): Promise<void>;
25
26
  protected eagerRelations(relations: string[]): string[];
26
27
  protected buildSelection(select: string[], eager: string[]): Record<string, any>;
27
28
  protected startSelect(db: any, select: string[], eager: string[], hasJoins?: boolean): any;
28
29
  protected applyJoins(query: any, relationNames: string[]): any;
29
30
  protected normalizeRelations(rows: any[], eager: string[]): any[];
31
+ protected buildOrderBy(sortBy?: string, sortOrder?: SortOrder): any[];
30
32
  find(id: any, options?: SqlOperationOptions): Promise<T | null>;
31
33
  findOne(where: Partial<T>, options?: SqlOperationOptions): Promise<T | null>;
32
34
  findAll(filters?: FilterDto, pagination?: PaginationOptions, options?: SqlOperationOptions): Promise<{
@@ -90,17 +90,17 @@ class SqlBaseCrudService {
90
90
  async beforeCreate(data) {
91
91
  return data;
92
92
  }
93
- async afterCreate(entity) { }
94
- async beforeUpdate(id, data) {
93
+ async afterCreate(_entity) { }
94
+ async beforeUpdate(_id, data) {
95
95
  return data;
96
96
  }
97
- async afterUpdate(entity) { }
98
- async beforeDelete(id) { }
99
- async afterDelete(id) { }
100
- async beforeSoftDelete(id) { }
101
- async afterSoftDelete(id) { }
102
- async beforeRestore(id) { }
103
- async afterRestore(entity) { }
97
+ async afterUpdate(_entity) { }
98
+ async beforeDelete(_id) { }
99
+ async afterDelete(_id) { }
100
+ async beforeSoftDelete(_id) { }
101
+ async afterSoftDelete(_id) { }
102
+ async beforeRestore(_id) { }
103
+ async afterRestore(_entity) { }
104
104
  eagerRelations(relations) {
105
105
  const configured = this.config.relations || {};
106
106
  return (relations || []).filter((name) => !!configured[name]);
@@ -166,6 +166,20 @@ class SqlBaseCrudService {
166
166
  return out;
167
167
  });
168
168
  }
169
+ buildOrderBy(sortBy, sortOrder = "desc") {
170
+ if (sortBy && this.config.table[sortBy]) {
171
+ const col = this.config.table[sortBy];
172
+ return [sortOrder === "desc" ? (0, drizzle_orm_1.desc)(col) : (0, drizzle_orm_1.asc)(col)];
173
+ }
174
+ const out = [];
175
+ for (const spec of this.config.defaultSort ?? []) {
176
+ const col = this.config.table[spec.column];
177
+ if (!col)
178
+ continue;
179
+ out.push(spec.order === "desc" ? (0, drizzle_orm_1.desc)(col) : (0, drizzle_orm_1.asc)(col));
180
+ }
181
+ return out;
182
+ }
169
183
  async find(id, options) {
170
184
  const { transaction, relations = [], select = [] } = options || {};
171
185
  const db = transaction || this.config.db;
@@ -213,10 +227,9 @@ class SqlBaseCrudService {
213
227
  if (conditions.length > 0) {
214
228
  dataQuery = dataQuery.where((0, drizzle_orm_1.and)(...conditions));
215
229
  }
216
- if (sortBy && this.config.table[sortBy]) {
217
- dataQuery = dataQuery.orderBy(sortOrder === "desc"
218
- ? (0, drizzle_orm_1.desc)(this.config.table[sortBy])
219
- : (0, drizzle_orm_1.asc)(this.config.table[sortBy]));
230
+ const orderBy = this.buildOrderBy(sortBy, sortOrder);
231
+ if (orderBy.length > 0) {
232
+ dataQuery = dataQuery.orderBy(...orderBy);
220
233
  }
221
234
  dataQuery = dataQuery.limit(safeLimit).offset(offset);
222
235
  let countQuery = db
@@ -1 +1 @@
1
- {"version":3,"file":"sql-base-crud.service.js","sourceRoot":"","sources":["../../../src/core/abstract/sql-base-crud.service.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"sql-base-crud.service.js","sourceRoot":"","sources":["../../../src/core/abstract/sql-base-crud.service.ts"],"names":[],"mappings":"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"}
@@ -1,4 +1,4 @@
1
- import { SqlDialect } from "../types/sql.types";
1
+ import { SortOrder, SqlDialect } from "../types/sql.types";
2
2
  export interface DrizzleCrudConfig {
3
3
  dialect: SqlDialect;
4
4
  db?: any;
@@ -11,6 +11,7 @@ export interface DrizzleCrudConfig {
11
11
  defaultLimit: number;
12
12
  maxLimit: number;
13
13
  };
14
+ sortOrder?: SortOrder;
14
15
  };
15
16
  sql?: {
16
17
  caseSensitive: boolean;
@@ -1,4 +1,4 @@
1
- import { PrimaryKeyType, SqlDialect } from "../types/sql.types";
1
+ import { PrimaryKeyType, SortColumn, SqlDialect } from "../types/sql.types";
2
2
  export interface RelationConfig {
3
3
  table: any;
4
4
  localKey: string;
@@ -23,6 +23,7 @@ export interface SqlCrudConfig {
23
23
  defaultLimit: number;
24
24
  maxLimit: number;
25
25
  };
26
+ defaultSort?: SortColumn[];
26
27
  sql?: {
27
28
  caseSensitive: boolean;
28
29
  useReturning: boolean;
@@ -1,13 +1,7 @@
1
1
  export type SqlDialect = "postgresql" | "mysql";
2
2
  export type PrimaryKeyType = "serial" | "bigserial" | "int" | "bigint" | "uuid";
3
- export interface SqlQueryBuilder {
4
- where: (conditions: any[]) => any;
5
- limit: (count: number) => any;
6
- offset: (count: number) => any;
7
- orderBy: (column: any, direction: "asc" | "desc") => any;
8
- }
9
- export interface SqlFilterCondition {
10
- field: string;
11
- operator: "eq" | "ne" | "gt" | "gte" | "lt" | "lte" | "in" | "like" | "ilike" | "isNull" | "isNotNull";
12
- value: any;
3
+ export type SortOrder = "asc" | "desc";
4
+ export interface SortColumn {
5
+ column: string;
6
+ order?: SortOrder;
13
7
  }
@@ -1,2 +1 @@
1
1
  export { CrudService } from "./crud-service.decorator";
2
- export { ENTITY_CONFIG_METADATA, EntityConfig, } from "./entity-config.decorator";
@@ -1,9 +1,6 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.EntityConfig = exports.ENTITY_CONFIG_METADATA = exports.CrudService = void 0;
3
+ exports.CrudService = void 0;
4
4
  var crud_service_decorator_1 = require("./crud-service.decorator");
5
5
  Object.defineProperty(exports, "CrudService", { enumerable: true, get: function () { return crud_service_decorator_1.CrudService; } });
6
- var entity_config_decorator_1 = require("./entity-config.decorator");
7
- Object.defineProperty(exports, "ENTITY_CONFIG_METADATA", { enumerable: true, get: function () { return entity_config_decorator_1.ENTITY_CONFIG_METADATA; } });
8
- Object.defineProperty(exports, "EntityConfig", { enumerable: true, get: function () { return entity_config_decorator_1.EntityConfig; } });
9
6
  //# sourceMappingURL=index.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/decorators/index.ts"],"names":[],"mappings":";;;AAAA,mEAAuD;AAA9C,qHAAA,WAAW,OAAA;AACpB,qEAGmC;AAFlC,iIAAA,sBAAsB,OAAA;AACtB,uHAAA,YAAY,OAAA"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/decorators/index.ts"],"names":[],"mappings":";;;AAAA,mEAAuD;AAA9C,qHAAA,WAAW,OAAA"}
package/dist/index.d.ts CHANGED
@@ -3,9 +3,8 @@ export { SqlBaseCrudService } from "./core/abstract/sql-base-crud.service";
3
3
  export type { ICrudService } from "./core/interfaces/crud-service.interface";
4
4
  export type { CrudFeature, DrizzleCrudConfig, } from "./core/interfaces/drizzle-crud-config.interface";
5
5
  export type { RelationConfig, RelationsConfig, SqlCrudConfig, SqlOperationOptions, } from "./core/interfaces/sql-crud-config.interface";
6
- export type { PrimaryKeyType, SqlDialect, SqlFilterCondition, } from "./core/types/sql.types";
6
+ export type { PrimaryKeyType, SortColumn, SortOrder, SqlDialect, } from "./core/types/sql.types";
7
7
  export { CrudService } from "./decorators/crud-service.decorator";
8
- export { EntityConfig } from "./decorators/entity-config.decorator";
9
8
  export { BulkOperationException, DatabaseConnectionException, DuplicateEntityException, EntityNotFoundException, TransactionException, ValidationFailedException, } from "./exceptions/crud.exceptions";
10
9
  export { DrizzleCrudModule } from "./modules/drizzle-crud.module";
11
10
  export { DRIZZLE_CONNECTION, DRIZZLE_CRUD_CONFIG, DRIZZLE_DB, DrizzleConnection, } from "./modules/drizzle-connection";
package/dist/index.js CHANGED
@@ -1,6 +1,6 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.TestCrudFactory = exports.BaseCrudSpecHelper = exports.DrizzleConnection = exports.DRIZZLE_DB = exports.DRIZZLE_CRUD_CONFIG = exports.DRIZZLE_CONNECTION = exports.DrizzleCrudModule = exports.ValidationFailedException = exports.TransactionException = exports.EntityNotFoundException = exports.DuplicateEntityException = exports.DatabaseConnectionException = exports.BulkOperationException = exports.EntityConfig = exports.CrudService = exports.SqlBaseCrudService = exports.sql = exports.or = exports.ne = exports.lte = exports.lt = exports.like = exports.isNull = exports.isNotNull = exports.inArray = exports.ilike = exports.gte = exports.gt = exports.eq = exports.desc = exports.asc = exports.and = void 0;
3
+ exports.TestCrudFactory = exports.BaseCrudSpecHelper = exports.DrizzleConnection = exports.DRIZZLE_DB = exports.DRIZZLE_CRUD_CONFIG = exports.DRIZZLE_CONNECTION = exports.DrizzleCrudModule = exports.ValidationFailedException = exports.TransactionException = exports.EntityNotFoundException = exports.DuplicateEntityException = exports.DatabaseConnectionException = exports.BulkOperationException = exports.CrudService = exports.SqlBaseCrudService = exports.sql = exports.or = exports.ne = exports.lte = exports.lt = exports.like = exports.isNull = exports.isNotNull = exports.inArray = exports.ilike = exports.gte = exports.gt = exports.eq = exports.desc = exports.asc = exports.and = void 0;
4
4
  var drizzle_orm_1 = require("drizzle-orm");
5
5
  Object.defineProperty(exports, "and", { enumerable: true, get: function () { return drizzle_orm_1.and; } });
6
6
  Object.defineProperty(exports, "asc", { enumerable: true, get: function () { return drizzle_orm_1.asc; } });
@@ -22,8 +22,6 @@ var sql_base_crud_service_1 = require("./core/abstract/sql-base-crud.service");
22
22
  Object.defineProperty(exports, "SqlBaseCrudService", { enumerable: true, get: function () { return sql_base_crud_service_1.SqlBaseCrudService; } });
23
23
  var crud_service_decorator_1 = require("./decorators/crud-service.decorator");
24
24
  Object.defineProperty(exports, "CrudService", { enumerable: true, get: function () { return crud_service_decorator_1.CrudService; } });
25
- var entity_config_decorator_1 = require("./decorators/entity-config.decorator");
26
- Object.defineProperty(exports, "EntityConfig", { enumerable: true, get: function () { return entity_config_decorator_1.EntityConfig; } });
27
25
  var crud_exceptions_1 = require("./exceptions/crud.exceptions");
28
26
  Object.defineProperty(exports, "BulkOperationException", { enumerable: true, get: function () { return crud_exceptions_1.BulkOperationException; } });
29
27
  Object.defineProperty(exports, "DatabaseConnectionException", { enumerable: true, get: function () { return crud_exceptions_1.DatabaseConnectionException; } });
package/dist/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;AAMA,2CAiBqB;AAhBpB,kGAAA,GAAG,OAAA;AACH,kGAAA,GAAG,OAAA;AACH,mGAAA,IAAI,OAAA;AACJ,iGAAA,EAAE,OAAA;AACF,iGAAA,EAAE,OAAA;AACF,kGAAA,GAAG,OAAA;AACH,oGAAA,KAAK,OAAA;AACL,sGAAA,OAAO,OAAA;AACP,wGAAA,SAAS,OAAA;AACT,qGAAA,MAAM,OAAA;AACN,mGAAA,IAAI,OAAA;AACJ,iGAAA,EAAE,OAAA;AACF,kGAAA,GAAG,OAAA;AACH,iGAAA,EAAE,OAAA;AACF,iGAAA,EAAE,OAAA;AACF,kGAAA,GAAG,OAAA;AAGJ,+EAA2E;AAAlE,2HAAA,kBAAkB,OAAA;AAoB3B,8EAAkE;AAAzD,qHAAA,WAAW,OAAA;AACpB,gFAAoE;AAA3D,uHAAA,YAAY,OAAA;AAErB,gEAOsC;AANrC,yHAAA,sBAAsB,OAAA;AACtB,8HAAA,2BAA2B,OAAA;AAC3B,2HAAA,wBAAwB,OAAA;AACxB,0HAAA,uBAAuB,OAAA;AACvB,uHAAA,oBAAoB,OAAA;AACpB,4HAAA,yBAAyB,OAAA;AAG1B,qEAAkE;AAAzD,wHAAA,iBAAiB,OAAA;AAC1B,mEAKsC;AAJrC,wHAAA,kBAAkB,OAAA;AAClB,yHAAA,mBAAmB,OAAA;AACnB,gHAAA,UAAU,OAAA;AACV,uHAAA,iBAAiB,OAAA;AAGlB,4EAAwE;AAA/D,2HAAA,kBAAkB,OAAA;AAC3B,0DAA4D;AAAnD,+GAAA,eAAe,OAAA"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;AAMA,2CAiBqB;AAhBpB,kGAAA,GAAG,OAAA;AACH,kGAAA,GAAG,OAAA;AACH,mGAAA,IAAI,OAAA;AACJ,iGAAA,EAAE,OAAA;AACF,iGAAA,EAAE,OAAA;AACF,kGAAA,GAAG,OAAA;AACH,oGAAA,KAAK,OAAA;AACL,sGAAA,OAAO,OAAA;AACP,wGAAA,SAAS,OAAA;AACT,qGAAA,MAAM,OAAA;AACN,mGAAA,IAAI,OAAA;AACJ,iGAAA,EAAE,OAAA;AACF,kGAAA,GAAG,OAAA;AACH,iGAAA,EAAE,OAAA;AACF,iGAAA,EAAE,OAAA;AACF,kGAAA,GAAG,OAAA;AAGJ,+EAA2E;AAAlE,2HAAA,kBAAkB,OAAA;AAqB3B,8EAAkE;AAAzD,qHAAA,WAAW,OAAA;AAEpB,gEAOsC;AANrC,yHAAA,sBAAsB,OAAA;AACtB,8HAAA,2BAA2B,OAAA;AAC3B,2HAAA,wBAAwB,OAAA;AACxB,0HAAA,uBAAuB,OAAA;AACvB,uHAAA,oBAAoB,OAAA;AACpB,4HAAA,yBAAyB,OAAA;AAG1B,qEAAkE;AAAzD,wHAAA,iBAAiB,OAAA;AAC1B,mEAKsC;AAJrC,wHAAA,kBAAkB,OAAA;AAClB,yHAAA,mBAAmB,OAAA;AACnB,gHAAA,UAAU,OAAA;AACV,uHAAA,iBAAiB,OAAA;AAGlB,4EAAwE;AAA/D,2HAAA,kBAAkB,OAAA;AAC3B,0DAA4D;AAAnD,+GAAA,eAAe,OAAA"}
@@ -55,6 +55,13 @@ function buildEntityConfig(service, table, entityConfig, db, globalConfig) {
55
55
  finalConfig.sql = globalConfig.sql;
56
56
  Object.assign(finalConfig, perEntity);
57
57
  finalConfig.table = table ?? perEntity.table;
58
+ if (!finalConfig.defaultSort &&
59
+ gd.sortOrder &&
60
+ finalConfig.timestamps?.createdAt) {
61
+ finalConfig.defaultSort = [
62
+ { column: finalConfig.timestamps.createdAt, order: gd.sortOrder },
63
+ ];
64
+ }
58
65
  return finalConfig;
59
66
  }
60
67
  function connectionProviders(rawConfigProvider) {
@@ -1 +1 @@
1
- {"version":3,"file":"drizzle-crud.module.js","sourceRoot":"","sources":["../../src/modules/drizzle-crud.module.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"drizzle-crud.module.js","sourceRoot":"","sources":["../../src/modules/drizzle-crud.module.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"base-crud.spec-helper.js","sourceRoot":"","sources":["../../src/test-utils/base-crud.spec-helper.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"base-crud.spec-helper.js","sourceRoot":"","sources":["../../src/test-utils/base-crud.spec-helper.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "nestjs-drizzle-crud",
3
- "version": "2.1.2",
3
+ "version": "3.0.0",
4
4
  "description": "A complete CRUD abstraction layer for Drizzle ORM in NestJS applications",
5
5
  "main": "dist/index.js",
6
6
  "types": "dist/index.d.ts",
@@ -10,13 +10,14 @@
10
10
  "LICENSE"
11
11
  ],
12
12
  "scripts": {
13
+ "prebuild": "rm -rf dist *.tsbuildinfo",
13
14
  "build": "tsc -p tsconfig.build.json",
14
15
  "build:watch": "tsc -p tsconfig.build.json --watch",
15
16
  "prepublishOnly": "npm run build && npm test",
16
17
  "test": "jest",
17
18
  "test:watch": "jest --watch",
18
19
  "test:cov": "jest --coverage",
19
- "lint": "eslint src/**/*.ts",
20
+ "lint": "eslint src",
20
21
  "format": "prettier --write src/**/*.ts"
21
22
  },
22
23
  "keywords": [
@@ -55,22 +56,22 @@
55
56
  }
56
57
  },
57
58
  "devDependencies": {
58
- "@jest/globals": "^29.7.0",
59
- "@nestjs/common": "^11.0.0",
60
- "@nestjs/core": "^11.0.0",
61
- "@nestjs/testing": "^11.0.0",
62
- "@types/jest": "^29.5.14",
63
- "@types/node": "^20.0.0",
64
- "@typescript-eslint/eslint-plugin": "^6.0.0",
65
- "@typescript-eslint/parser": "^6.0.0",
66
- "drizzle-orm": "^0.45.0",
67
- "eslint": "^8.0.0",
68
- "jest": "^29.5.0",
69
- "postgres": "^3.4.0",
59
+ "@jest/globals": "^30.0.0",
60
+ "@nestjs/common": "^11.1.27",
61
+ "@nestjs/core": "^11.1.27",
62
+ "@nestjs/testing": "^11.1.27",
63
+ "@types/jest": "^30.0.0",
64
+ "@types/node": "^26.0.0",
65
+ "@typescript-eslint/eslint-plugin": "^8.61.1",
66
+ "@typescript-eslint/parser": "^8.61.1",
67
+ "drizzle-orm": "^0.45.2",
68
+ "eslint": "^10.5.0",
69
+ "jest": "^30.4.2",
70
+ "postgres": "^3.4.9",
70
71
  "prettier": "^3.0.0",
71
72
  "reflect-metadata": "^0.2.0",
72
- "ts-jest": "^29.1.0",
73
- "typescript": "^5.0.0"
73
+ "ts-jest": "^29.4.11",
74
+ "typescript": "^6.0.3"
74
75
  },
75
76
  "engines": {
76
77
  "node": ">=18.0.0"
@@ -1 +0,0 @@
1
- export declare const CrudDecorator: (...dataOrPipes: unknown[]) => ParameterDecorator;
@@ -1,9 +0,0 @@
1
- "use strict";
2
- Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.CrudDecorator = void 0;
4
- const common_1 = require("@nestjs/common");
5
- exports.CrudDecorator = (0, common_1.createParamDecorator)((data, ctx) => {
6
- const request = ctx.switchToHttp().getRequest();
7
- return request.user;
8
- });
9
- //# sourceMappingURL=crud.decorator.js.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"crud.decorator.js","sourceRoot":"","sources":["../../src/decorators/crud.decorator.ts"],"names":[],"mappings":";;;AACA,2CAAwE;AAE3D,QAAA,aAAa,GAAG,IAAA,6BAAoB,EAChD,CAAC,IAAa,EAAE,GAAqB,EAAE,EAAE;IACxC,MAAM,OAAO,GAAG,GAAG,CAAC,YAAY,EAAE,CAAC,UAAU,EAAE,CAAC;IAChD,OAAO,OAAO,CAAC,IAAI,CAAC;AACrB,CAAC,CACD,CAAC"}
@@ -1,13 +0,0 @@
1
- export declare const ENTITY_CONFIG_METADATA = "ENTITY_CONFIG_METADATA";
2
- export interface EntityConfig {
3
- table: any;
4
- primaryKey?: string;
5
- primaryKeyType?: "serial" | "bigserial" | "int" | "bigint" | "uuid";
6
- softDelete?: boolean;
7
- softDeleteColumn?: string;
8
- timestamps?: {
9
- createdAt: string;
10
- updatedAt: string;
11
- };
12
- }
13
- export declare function EntityConfig(config: EntityConfig): ClassDecorator;
@@ -1,12 +0,0 @@
1
- "use strict";
2
- Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.ENTITY_CONFIG_METADATA = void 0;
4
- exports.EntityConfig = EntityConfig;
5
- const common_1 = require("@nestjs/common");
6
- exports.ENTITY_CONFIG_METADATA = "ENTITY_CONFIG_METADATA";
7
- function EntityConfig(config) {
8
- return (target) => {
9
- (0, common_1.SetMetadata)(exports.ENTITY_CONFIG_METADATA, config)(target);
10
- };
11
- }
12
- //# sourceMappingURL=entity-config.decorator.js.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"entity-config.decorator.js","sourceRoot":"","sources":["../../src/decorators/entity-config.decorator.ts"],"names":[],"mappings":";;;AAgBA,oCAIC;AApBD,2CAA6C;AAEhC,QAAA,sBAAsB,GAAG,wBAAwB,CAAC;AAc/D,SAAgB,YAAY,CAAC,MAAoB;IAChD,OAAO,CAAC,MAAW,EAAE,EAAE;QACtB,IAAA,oBAAW,EAAC,8BAAsB,EAAE,MAAM,CAAC,CAAC,MAAM,CAAC,CAAC;IACrD,CAAC,CAAC;AACH,CAAC"}
@@ -1,18 +0,0 @@
1
- export interface CrudConfig {
2
- softDelete?: {
3
- enabled: boolean;
4
- column: string;
5
- };
6
- timestamps?: {
7
- createdAt: string;
8
- updatedAt: string;
9
- };
10
- primaryKey?: string;
11
- pagination?: {
12
- defaultLimit: number;
13
- maxLimit: number;
14
- };
15
- validation?: {
16
- strict: boolean;
17
- };
18
- }
@@ -1,3 +0,0 @@
1
- "use strict";
2
- Object.defineProperty(exports, "__esModule", { value: true });
3
- //# sourceMappingURL=crud-config.interface.js.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"crud-config.interface.js","sourceRoot":"","sources":["../../src/interfaces/crud-config.interface.ts"],"names":[],"mappings":""}
@@ -1,5 +0,0 @@
1
- export interface CrudOptions {
2
- someOption: string;
3
- isGlobal?: boolean;
4
- }
5
- export * from "./crud-options.interface";
@@ -1,18 +0,0 @@
1
- "use strict";
2
- var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
3
- if (k2 === undefined) k2 = k;
4
- var desc = Object.getOwnPropertyDescriptor(m, k);
5
- if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
6
- desc = { enumerable: true, get: function() { return m[k]; } };
7
- }
8
- Object.defineProperty(o, k2, desc);
9
- }) : (function(o, m, k, k2) {
10
- if (k2 === undefined) k2 = k;
11
- o[k2] = m[k];
12
- }));
13
- var __exportStar = (this && this.__exportStar) || function(m, exports) {
14
- for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
15
- };
16
- Object.defineProperty(exports, "__esModule", { value: true });
17
- __exportStar(require("./crud-options.interface"), exports);
18
- //# sourceMappingURL=crud-options.interface.js.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"crud-options.interface.js","sourceRoot":"","sources":["../../src/interfaces/crud-options.interface.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAOA,2DAAyC"}