@gennext/lb-infra 0.2.2 → 0.2.3

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 (68) hide show
  1. package/README.md +116 -18
  2. package/dist/base/applications/base.application.d.ts +12 -21
  3. package/dist/base/applications/base.application.d.ts.map +1 -1
  4. package/dist/base/applications/base.application.js +25 -27
  5. package/dist/base/applications/base.application.js.map +1 -1
  6. package/dist/base/hono/hono-adapter.d.ts +10 -0
  7. package/dist/base/hono/hono-adapter.d.ts.map +1 -0
  8. package/dist/base/hono/hono-adapter.js +27 -0
  9. package/dist/base/hono/hono-adapter.js.map +1 -0
  10. package/dist/base/models/base.model.d.ts +2 -1
  11. package/dist/base/models/base.model.d.ts.map +1 -1
  12. package/dist/base/models/base.model.js +2 -1
  13. package/dist/base/models/base.model.js.map +1 -1
  14. package/dist/base/models/column-defs.d.ts +2 -2
  15. package/dist/base/models/decorators.d.ts +15 -0
  16. package/dist/base/models/decorators.d.ts.map +1 -0
  17. package/dist/base/models/decorators.js +19 -0
  18. package/dist/base/models/decorators.js.map +1 -0
  19. package/dist/base/models/index.d.ts +2 -0
  20. package/dist/base/models/index.d.ts.map +1 -1
  21. package/dist/base/models/index.js +2 -0
  22. package/dist/base/models/index.js.map +1 -1
  23. package/dist/base/models/model.helper.d.ts +7 -0
  24. package/dist/base/models/model.helper.d.ts.map +1 -0
  25. package/dist/base/models/model.helper.js +16 -0
  26. package/dist/base/models/model.helper.js.map +1 -0
  27. package/dist/base/repository/default-crud.repository.d.ts +3 -3
  28. package/dist/base/repository/default-crud.repository.d.ts.map +1 -1
  29. package/dist/base/repository/default-crud.repository.js +20 -17
  30. package/dist/base/repository/default-crud.repository.js.map +1 -1
  31. package/dist/base/repository/filter.builder.d.ts +7 -0
  32. package/dist/base/repository/filter.builder.d.ts.map +1 -0
  33. package/dist/base/repository/filter.builder.js +74 -0
  34. package/dist/base/repository/filter.builder.js.map +1 -0
  35. package/dist/base/repository/readable.repository.d.ts +10 -8
  36. package/dist/base/repository/readable.repository.d.ts.map +1 -1
  37. package/dist/base/repository/readable.repository.js +26 -19
  38. package/dist/base/repository/readable.repository.js.map +1 -1
  39. package/dist/base/repository/soft-deletable.repository.d.ts +3 -2
  40. package/dist/base/repository/soft-deletable.repository.d.ts.map +1 -1
  41. package/dist/base/repository/soft-deletable.repository.js +26 -15
  42. package/dist/base/repository/soft-deletable.repository.js.map +1 -1
  43. package/dist/boot/base/base-artifact-booter.d.ts +3 -0
  44. package/dist/boot/base/base-artifact-booter.d.ts.map +1 -1
  45. package/dist/boot/base/base-artifact-booter.js +3 -0
  46. package/dist/boot/base/base-artifact-booter.js.map +1 -1
  47. package/dist/boot/boot.mixin.d.ts.map +1 -1
  48. package/dist/boot/boot.mixin.js +10 -4
  49. package/dist/boot/boot.mixin.js.map +1 -1
  50. package/dist/boot/booters/controller.booter.d.ts.map +1 -1
  51. package/dist/boot/booters/controller.booter.js +5 -1
  52. package/dist/boot/booters/controller.booter.js.map +1 -1
  53. package/dist/common/constants.d.ts +2 -0
  54. package/dist/common/constants.d.ts.map +1 -1
  55. package/dist/common/constants.js +2 -0
  56. package/dist/common/constants.js.map +1 -1
  57. package/dist/helpers/logger/config.d.ts.map +1 -1
  58. package/dist/helpers/logger/config.js +1 -2
  59. package/dist/helpers/logger/config.js.map +1 -1
  60. package/dist/index.d.ts +1 -1
  61. package/dist/index.d.ts.map +1 -1
  62. package/dist/index.js +2 -2
  63. package/dist/index.js.map +1 -1
  64. package/dist/utilities/migration.utility.d.ts +13 -0
  65. package/dist/utilities/migration.utility.d.ts.map +1 -1
  66. package/dist/utilities/migration.utility.js +39 -0
  67. package/dist/utilities/migration.utility.js.map +1 -1
  68. package/package.json +9 -1
@@ -1,12 +1,12 @@
1
- import type { SQL } from 'drizzle-orm';
2
1
  import type { TTableSchema, TTableInsert, TTableObject } from '../models/drizzle.types';
3
2
  import { ReadableRepository } from './readable.repository';
3
+ import type { Where } from '@loopback/repository';
4
4
  export declare class DefaultCRUDRepository<S extends TTableSchema> extends ReadableRepository<S> {
5
5
  create(data: TTableInsert<S>): Promise<TTableObject<S>>;
6
6
  createMany(data: TTableInsert<S>[]): Promise<TTableObject<S>[]>;
7
7
  updateById(id: string | number, data: Partial<TTableInsert<S>>): Promise<TTableObject<S> | null>;
8
- updateWhere(where: SQL, data: Partial<TTableInsert<S>>): Promise<TTableObject<S>[]>;
8
+ updateAll(data: Partial<TTableInsert<S>>, where?: Where<TTableObject<S>>): Promise<TTableObject<S>[]>;
9
9
  deleteById(id: string | number): Promise<boolean>;
10
- deleteWhere(where: SQL): Promise<number>;
10
+ deleteAll(where?: Where<TTableObject<S>>): Promise<number>;
11
11
  }
12
12
  //# sourceMappingURL=default-crud.repository.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"default-crud.repository.d.ts","sourceRoot":"","sources":["../../../src/base/repository/default-crud.repository.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,aAAa,CAAC;AAEvC,OAAO,KAAK,EAAE,YAAY,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AACxF,OAAO,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAE3D,qBAAa,qBAAqB,CAAC,CAAC,SAAS,YAAY,CAAE,SAAQ,kBAAkB,CAAC,CAAC,CAAC;IAChF,MAAM,CAAC,IAAI,EAAE,YAAY,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;IAQvD,UAAU,CAAC,IAAI,EAAE,YAAY,CAAC,CAAC,CAAC,EAAE,GAAG,OAAO,CAAC,YAAY,CAAC,CAAC,CAAC,EAAE,CAAC;IAQ/D,UAAU,CACd,EAAE,EAAE,MAAM,GAAG,MAAM,EACnB,IAAI,EAAE,OAAO,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,GAC7B,OAAO,CAAC,YAAY,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC;IAa5B,WAAW,CAAC,KAAK,EAAE,GAAG,EAAE,IAAI,EAAE,OAAO,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,YAAY,CAAC,CAAC,CAAC,EAAE,CAAC;IASnF,UAAU,CAAC,EAAE,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAYjD,WAAW,CAAC,KAAK,EAAE,GAAG,GAAG,OAAO,CAAC,MAAM,CAAC;CAO/C"}
1
+ {"version":3,"file":"default-crud.repository.d.ts","sourceRoot":"","sources":["../../../src/base/repository/default-crud.repository.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AACxF,OAAO,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAC3D,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,sBAAsB,CAAC;AAElD,qBAAa,qBAAqB,CAAC,CAAC,SAAS,YAAY,CAAE,SAAQ,kBAAkB,CAAC,CAAC,CAAC;IAChF,MAAM,CAAC,IAAI,EAAE,YAAY,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;IAQvD,UAAU,CAAC,IAAI,EAAE,YAAY,CAAC,CAAC,CAAC,EAAE,GAAG,OAAO,CAAC,YAAY,CAAC,CAAC,CAAC,EAAE,CAAC;IAQ/D,UAAU,CACd,EAAE,EAAE,MAAM,GAAG,MAAM,EACnB,IAAI,EAAE,OAAO,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,GAC7B,OAAO,CAAC,YAAY,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC;IAa5B,SAAS,CACb,IAAI,EAAE,OAAO,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,EAC9B,KAAK,CAAC,EAAE,KAAK,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,GAC7B,OAAO,CAAC,YAAY,CAAC,CAAC,CAAC,EAAE,CAAC;IAUvB,UAAU,CAAC,EAAE,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAYjD,SAAS,CAAC,KAAK,CAAC,EAAE,KAAK,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,MAAM,CAAC;CASjE"}
@@ -6,54 +6,57 @@ const readable_repository_1 = require("./readable.repository");
6
6
  class DefaultCRUDRepository extends readable_repository_1.ReadableRepository {
7
7
  async create(data) {
8
8
  const result = await this.db
9
- .insert(this.table)
9
+ .insert(this.entity.schema)
10
10
  .values(data)
11
11
  .returning();
12
12
  return result[0];
13
13
  }
14
14
  async createMany(data) {
15
15
  const result = await this.db
16
- .insert(this.table)
16
+ .insert(this.entity.schema)
17
17
  .values(data)
18
18
  .returning();
19
19
  return result;
20
20
  }
21
21
  async updateById(id, data) {
22
- const pk = this.table.id;
22
+ const pk = this.entity.schema.id;
23
23
  if (!pk) {
24
24
  throw new Error('Table has no id column');
25
25
  }
26
26
  const result = await this.db
27
- .update(this.table)
27
+ .update(this.entity.schema)
28
28
  .set(data)
29
29
  .where((0, drizzle_orm_1.eq)(pk, id))
30
30
  .returning();
31
31
  return result[0] || null;
32
32
  }
33
- async updateWhere(where, data) {
34
- const result = await this.db
35
- .update(this.table)
36
- .set(data)
37
- .where(where)
38
- .returning();
33
+ async updateAll(data, where) {
34
+ const whereSql = this.filterBuilder.buildWhere(this.entity.schema, where);
35
+ let query = this.db.update(this.entity.schema).set(data);
36
+ if (whereSql) {
37
+ query = query.where(whereSql);
38
+ }
39
+ const result = await query.returning();
39
40
  return result;
40
41
  }
41
42
  async deleteById(id) {
42
- const pk = this.table.id;
43
+ const pk = this.entity.schema.id;
43
44
  if (!pk) {
44
45
  throw new Error('Table has no id column');
45
46
  }
46
47
  const result = await this.db
47
- .delete(this.table)
48
+ .delete(this.entity.schema)
48
49
  .where((0, drizzle_orm_1.eq)(pk, id))
49
50
  .returning();
50
51
  return result.length > 0;
51
52
  }
52
- async deleteWhere(where) {
53
- const result = await this.db
54
- .delete(this.table)
55
- .where(where)
56
- .returning();
53
+ async deleteAll(where) {
54
+ const whereSql = this.filterBuilder.buildWhere(this.entity.schema, where);
55
+ let query = this.db.delete(this.entity.schema);
56
+ if (whereSql) {
57
+ query = query.where(whereSql);
58
+ }
59
+ const result = await query.returning();
57
60
  return result.length;
58
61
  }
59
62
  }
@@ -1 +1 @@
1
- {"version":3,"file":"default-crud.repository.js","sourceRoot":"","sources":["../../../src/base/repository/default-crud.repository.ts"],"names":[],"mappings":";;;AACA,6CAAiC;AAEjC,+DAA2D;AAE3D,MAAa,qBAA8C,SAAQ,wCAAqB;IACtF,KAAK,CAAC,MAAM,CAAC,IAAqB;QAChC,MAAM,MAAM,GAAQ,MAAM,IAAI,CAAC,EAAE;aAC9B,MAAM,CAAC,IAAI,CAAC,KAAY,CAAC;aACzB,MAAM,CAAC,IAAW,CAAC;aACnB,SAAS,EAAE,CAAC;QACf,OAAO,MAAM,CAAC,CAAC,CAAQ,CAAC;IAC1B,CAAC;IAED,KAAK,CAAC,UAAU,CAAC,IAAuB;QACtC,MAAM,MAAM,GAAQ,MAAM,IAAI,CAAC,EAAE;aAC9B,MAAM,CAAC,IAAI,CAAC,KAAY,CAAC;aACzB,MAAM,CAAC,IAAW,CAAC;aACnB,SAAS,EAAE,CAAC;QACf,OAAO,MAAa,CAAC;IACvB,CAAC;IAED,KAAK,CAAC,UAAU,CACd,EAAmB,EACnB,IAA8B;QAE9B,MAAM,EAAE,GAAI,IAAI,CAAC,KAAa,CAAC,EAAE,CAAC;QAClC,IAAI,CAAC,EAAE,EAAE,CAAC;YACR,MAAM,IAAI,KAAK,CAAC,wBAAwB,CAAC,CAAC;QAC5C,CAAC;QACD,MAAM,MAAM,GAAQ,MAAM,IAAI,CAAC,EAAE;aAC9B,MAAM,CAAC,IAAI,CAAC,KAAY,CAAC;aACzB,GAAG,CAAC,IAAW,CAAC;aAChB,KAAK,CAAC,IAAA,gBAAE,EAAC,EAAE,EAAE,EAAE,CAAC,CAAC;aACjB,SAAS,EAAE,CAAC;QACf,OAAQ,MAAM,CAAC,CAAC,CAAS,IAAI,IAAI,CAAC;IACpC,CAAC;IAED,KAAK,CAAC,WAAW,CAAC,KAAU,EAAE,IAA8B;QAC1D,MAAM,MAAM,GAAQ,MAAM,IAAI,CAAC,EAAE;aAC9B,MAAM,CAAC,IAAI,CAAC,KAAY,CAAC;aACzB,GAAG,CAAC,IAAW,CAAC;aAChB,KAAK,CAAC,KAAK,CAAC;aACZ,SAAS,EAAE,CAAC;QACf,OAAO,MAAa,CAAC;IACvB,CAAC;IAED,KAAK,CAAC,UAAU,CAAC,EAAmB;QAClC,MAAM,EAAE,GAAI,IAAI,CAAC,KAAa,CAAC,EAAE,CAAC;QAClC,IAAI,CAAC,EAAE,EAAE,CAAC;YACR,MAAM,IAAI,KAAK,CAAC,wBAAwB,CAAC,CAAC;QAC5C,CAAC;QACD,MAAM,MAAM,GAAQ,MAAM,IAAI,CAAC,EAAE;aAC9B,MAAM,CAAC,IAAI,CAAC,KAAY,CAAC;aACzB,KAAK,CAAC,IAAA,gBAAE,EAAC,EAAE,EAAE,EAAE,CAAC,CAAC;aACjB,SAAS,EAAE,CAAC;QACf,OAAO,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC;IAC3B,CAAC;IAED,KAAK,CAAC,WAAW,CAAC,KAAU;QAC1B,MAAM,MAAM,GAAQ,MAAM,IAAI,CAAC,EAAE;aAC9B,MAAM,CAAC,IAAI,CAAC,KAAY,CAAC;aACzB,KAAK,CAAC,KAAK,CAAC;aACZ,SAAS,EAAE,CAAC;QACf,OAAO,MAAM,CAAC,MAAM,CAAC;IACvB,CAAC;CACF;AA7DD,sDA6DC"}
1
+ {"version":3,"file":"default-crud.repository.js","sourceRoot":"","sources":["../../../src/base/repository/default-crud.repository.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,7 @@
1
+ import { type SQL } from 'drizzle-orm';
2
+ import type { TTableSchema, TTableObject } from '../models/drizzle.types';
3
+ import type { Where } from '@loopback/repository';
4
+ export declare class FilterBuilder {
5
+ buildWhere<S extends TTableSchema>(schema: S, where?: Where<TTableObject<S>>): SQL | undefined;
6
+ }
7
+ //# sourceMappingURL=filter.builder.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"filter.builder.d.ts","sourceRoot":"","sources":["../../../src/base/repository/filter.builder.ts"],"names":[],"mappings":"AAAA,OAAO,EAaL,KAAK,GAAG,EACT,MAAM,aAAa,CAAC;AACrB,OAAO,KAAK,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAC1E,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,sBAAsB,CAAC;AAElD,qBAAa,aAAa;IACxB,UAAU,CAAC,CAAC,SAAS,YAAY,EAAE,MAAM,EAAE,CAAC,EAAE,KAAK,CAAC,EAAE,KAAK,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,GAAG,GAAG,GAAG,SAAS;CAsE/F"}
@@ -0,0 +1,74 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.FilterBuilder = void 0;
4
+ const drizzle_orm_1 = require("drizzle-orm");
5
+ class FilterBuilder {
6
+ buildWhere(schema, where) {
7
+ if (!where) {
8
+ return undefined;
9
+ }
10
+ const conditions = [];
11
+ for (const [key, value] of Object.entries(where)) {
12
+ const column = schema[key];
13
+ if (!column) {
14
+ continue;
15
+ }
16
+ if (key === 'and' && Array.isArray(value)) {
17
+ const subConditions = value.map(v => this.buildWhere(schema, v)).filter(Boolean);
18
+ if (subConditions.length) {
19
+ conditions.push((0, drizzle_orm_1.and)(...subConditions));
20
+ }
21
+ continue;
22
+ }
23
+ if (key === 'or' && Array.isArray(value)) {
24
+ const subConditions = value.map(v => this.buildWhere(schema, v)).filter(Boolean);
25
+ if (subConditions.length) {
26
+ conditions.push((0, drizzle_orm_1.or)(...subConditions));
27
+ }
28
+ continue;
29
+ }
30
+ if (value === null) {
31
+ conditions.push((0, drizzle_orm_1.isNull)(column));
32
+ }
33
+ else if (typeof value === 'object' && value !== null) {
34
+ for (const [op, val] of Object.entries(value)) {
35
+ switch (op) {
36
+ case 'eq':
37
+ conditions.push((0, drizzle_orm_1.eq)(column, val));
38
+ break;
39
+ case 'neq':
40
+ conditions.push((0, drizzle_orm_1.ne)(column, val));
41
+ break;
42
+ case 'gt':
43
+ conditions.push((0, drizzle_orm_1.gt)(column, val));
44
+ break;
45
+ case 'gte':
46
+ conditions.push((0, drizzle_orm_1.gte)(column, val));
47
+ break;
48
+ case 'lt':
49
+ conditions.push((0, drizzle_orm_1.lt)(column, val));
50
+ break;
51
+ case 'lte':
52
+ conditions.push((0, drizzle_orm_1.lte)(column, val));
53
+ break;
54
+ case 'inq':
55
+ conditions.push((0, drizzle_orm_1.inArray)(column, Array.isArray(val) ? val : [val]));
56
+ break;
57
+ case 'nin':
58
+ conditions.push((0, drizzle_orm_1.sql) `${column} NOT IN ${val}`);
59
+ break;
60
+ case 'like':
61
+ conditions.push((0, drizzle_orm_1.like)(column, val));
62
+ break;
63
+ }
64
+ }
65
+ }
66
+ else {
67
+ conditions.push((0, drizzle_orm_1.eq)(column, value));
68
+ }
69
+ }
70
+ return conditions.length > 0 ? (0, drizzle_orm_1.and)(...conditions) : undefined;
71
+ }
72
+ }
73
+ exports.FilterBuilder = FilterBuilder;
74
+ //# sourceMappingURL=filter.builder.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"filter.builder.js","sourceRoot":"","sources":["../../../src/base/repository/filter.builder.ts"],"names":[],"mappings":"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"}
@@ -1,23 +1,25 @@
1
1
  import type { NodePgDatabase } from 'drizzle-orm/node-postgres';
2
- import type { SQL } from 'drizzle-orm';
3
- import type { BaseEntity } from '../models';
2
+ import { BaseEntity } from '../models';
4
3
  import type { TTableSchema, TTableObject } from '../models/drizzle.types';
5
4
  import type { IBaseDataSource } from '../datasources';
5
+ import type { Filter, Where } from '@loopback/repository';
6
+ import { FilterBuilder } from './filter.builder';
6
7
  export declare class ReadableRepository<S extends TTableSchema> {
7
8
  protected readonly db: NodePgDatabase<any>;
8
- protected readonly table: S;
9
- protected readonly entityClass: BaseEntity<S>;
9
+ protected readonly entity: BaseEntity<S>;
10
+ protected readonly filterBuilder: FilterBuilder;
10
11
  constructor(opts: {
11
12
  dataSource: IBaseDataSource<any, NodePgDatabase<any>>;
12
- entityClass: BaseEntity<S>;
13
+ entityClass: new (...args: any[]) => BaseEntity<S>;
13
14
  });
15
+ find(filter?: Filter<TTableObject<S>>): Promise<TTableObject<S>[]>;
14
16
  findAll(opts?: {
15
17
  limit?: number;
16
18
  offset?: number;
17
19
  }): Promise<TTableObject<S>[]>;
18
20
  findById(id: string | number): Promise<TTableObject<S> | null>;
19
- findOne(where: SQL): Promise<TTableObject<S> | null>;
20
- count(where?: SQL): Promise<number>;
21
- exists(where: SQL): Promise<boolean>;
21
+ findOne(filter?: Filter<TTableObject<S>>): Promise<TTableObject<S> | null>;
22
+ count(where?: Where<TTableObject<S>>): Promise<number>;
23
+ exists(where: Where<TTableObject<S>>): Promise<boolean>;
22
24
  }
23
25
  //# sourceMappingURL=readable.repository.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"readable.repository.d.ts","sourceRoot":"","sources":["../../../src/base/repository/readable.repository.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAChE,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,aAAa,CAAC;AAEvC,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;AAC5C,OAAO,KAAK,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAC1E,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AAEtD,qBAAa,kBAAkB,CAAC,CAAC,SAAS,YAAY;IACpD,SAAS,CAAC,QAAQ,CAAC,EAAE,EAAE,cAAc,CAAC,GAAG,CAAC,CAAC;IAC3C,SAAS,CAAC,QAAQ,CAAC,KAAK,EAAE,CAAC,CAAC;IAC5B,SAAS,CAAC,QAAQ,CAAC,WAAW,EAAE,UAAU,CAAC,CAAC,CAAC,CAAC;gBAElC,IAAI,EAAE;QAChB,UAAU,EAAE,eAAe,CAAC,GAAG,EAAE,cAAc,CAAC,GAAG,CAAC,CAAC,CAAC;QACtD,WAAW,EAAE,UAAU,CAAC,CAAC,CAAC,CAAC;KAC5B;IAMK,OAAO,CAAC,IAAI,CAAC,EAAE;QAAE,KAAK,CAAC,EAAE,MAAM,CAAC;QAAC,MAAM,CAAC,EAAE,MAAM,CAAA;KAAE,GAAG,OAAO,CAAC,YAAY,CAAC,CAAC,CAAC,EAAE,CAAC;IAW/E,QAAQ,CAAC,EAAE,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC,YAAY,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC;IAa9D,OAAO,CAAC,KAAK,EAAE,GAAG,GAAG,OAAO,CAAC,YAAY,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC;IASpD,KAAK,CAAC,KAAK,CAAC,EAAE,GAAG,GAAG,OAAO,CAAC,MAAM,CAAC;IASnC,MAAM,CAAC,KAAK,EAAE,GAAG,GAAG,OAAO,CAAC,OAAO,CAAC;CAI3C"}
1
+ {"version":3,"file":"readable.repository.d.ts","sourceRoot":"","sources":["../../../src/base/repository/readable.repository.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAEhE,OAAO,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;AACvC,OAAO,KAAK,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAC1E,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AACtD,OAAO,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,sBAAsB,CAAC;AAC1D,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAEjD,qBAAa,kBAAkB,CAAC,CAAC,SAAS,YAAY;IACpD,SAAS,CAAC,QAAQ,CAAC,EAAE,EAAE,cAAc,CAAC,GAAG,CAAC,CAAC;IAC3C,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC,CAAC,CAAC;IACzC,SAAS,CAAC,QAAQ,CAAC,aAAa,EAAE,aAAa,CAAC;gBAEpC,IAAI,EAAE;QAChB,UAAU,EAAE,eAAe,CAAC,GAAG,EAAE,cAAc,CAAC,GAAG,CAAC,CAAC,CAAC;QACtD,WAAW,EAAE,KAAK,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,UAAU,CAAC,CAAC,CAAC,CAAC;KACpD;IAMK,IAAI,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,YAAY,CAAC,CAAC,CAAC,EAAE,CAAC;IAkBlE,OAAO,CAAC,IAAI,CAAC,EAAE;QAAE,KAAK,CAAC,EAAE,MAAM,CAAC;QAAC,MAAM,CAAC,EAAE,MAAM,CAAA;KAAE,GAAG,OAAO,CAAC,YAAY,CAAC,CAAC,CAAC,EAAE,CAAC;IAI/E,QAAQ,CAAC,EAAE,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC,YAAY,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC;IAa9D,OAAO,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,YAAY,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC;IAK1E,KAAK,CAAC,KAAK,CAAC,EAAE,KAAK,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,MAAM,CAAC;IAYtD,MAAM,CAAC,KAAK,EAAE,KAAK,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,OAAO,CAAC;CAI9D"}
@@ -2,46 +2,53 @@
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.ReadableRepository = void 0;
4
4
  const drizzle_orm_1 = require("drizzle-orm");
5
+ const filter_builder_1 = require("./filter.builder");
5
6
  class ReadableRepository {
6
7
  constructor(opts) {
7
8
  this.db = opts.dataSource.getConnector();
8
- this.table = opts.entityClass.schema;
9
- this.entityClass = opts.entityClass;
9
+ this.entity = new opts.entityClass();
10
+ this.filterBuilder = new filter_builder_1.FilterBuilder();
10
11
  }
11
- async findAll(opts) {
12
- let query = this.db.select().from(this.table);
13
- if (opts?.limit) {
14
- query = query.limit(opts.limit);
12
+ async find(filter) {
13
+ let query = this.db.select().from(this.entity.schema);
14
+ const where = this.filterBuilder.buildWhere(this.entity.schema, filter?.where);
15
+ if (where) {
16
+ query = query.where(where);
17
+ }
18
+ if (filter?.limit) {
19
+ query = query.limit(filter.limit);
15
20
  }
16
- if (opts?.offset) {
17
- query = query.offset(opts.offset);
21
+ if (filter?.offset) {
22
+ query = query.offset(filter.offset);
18
23
  }
19
24
  return (await query);
20
25
  }
26
+ async findAll(opts) {
27
+ return this.find(opts);
28
+ }
21
29
  async findById(id) {
22
- const pk = this.table.id;
30
+ const pk = this.entity.schema.id;
23
31
  if (!pk) {
24
32
  throw new Error('Table has no id column');
25
33
  }
26
34
  const result = await this.db
27
35
  .select()
28
- .from(this.table)
36
+ .from(this.entity.schema)
29
37
  .where((0, drizzle_orm_1.eq)(pk, id))
30
38
  .limit(1);
31
39
  return result[0] || null;
32
40
  }
33
- async findOne(where) {
34
- const result = await this.db
35
- .select()
36
- .from(this.table)
37
- .where(where)
38
- .limit(1);
41
+ async findOne(filter) {
42
+ const result = await this.find({ ...filter, limit: 1 });
39
43
  return result[0] || null;
40
44
  }
41
45
  async count(where) {
42
- const query = this.db.select({ count: (0, drizzle_orm_1.sql) `count(*)`.mapWith(Number) }).from(this.table);
43
- if (where) {
44
- query.where(where);
46
+ let query = this.db
47
+ .select({ count: (0, drizzle_orm_1.sql) `count(*)`.mapWith(Number) })
48
+ .from(this.entity.schema);
49
+ const whereSql = this.filterBuilder.buildWhere(this.entity.schema, where);
50
+ if (whereSql) {
51
+ query = query.where(whereSql);
45
52
  }
46
53
  const result = await query;
47
54
  return result[0].count;
@@ -1 +1 @@
1
- {"version":3,"file":"readable.repository.js","sourceRoot":"","sources":["../../../src/base/repository/readable.repository.ts"],"names":[],"mappings":";;;AAEA,6CAAsC;AAKtC,MAAa,kBAAkB;IAK7B,YAAY,IAGX;QACC,IAAI,CAAC,EAAE,GAAG,IAAI,CAAC,UAAU,CAAC,YAAY,EAAE,CAAC;QACzC,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC;QACrC,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,WAAW,CAAC;IACtC,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,IAA0C;QACtD,IAAI,KAAK,GAAG,IAAI,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,KAAY,CAAC,CAAC;QACrD,IAAI,IAAI,EAAE,KAAK,EAAE,CAAC;YAChB,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAQ,CAAC;QACzC,CAAC;QACD,IAAI,IAAI,EAAE,MAAM,EAAE,CAAC;YACjB,KAAK,GAAG,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAQ,CAAC;QAC3C,CAAC;QACD,OAAO,CAAC,MAAM,KAAK,CAAQ,CAAC;IAC9B,CAAC;IAED,KAAK,CAAC,QAAQ,CAAC,EAAmB;QAChC,MAAM,EAAE,GAAI,IAAI,CAAC,KAAa,CAAC,EAAE,CAAC;QAClC,IAAI,CAAC,EAAE,EAAE,CAAC;YACR,MAAM,IAAI,KAAK,CAAC,wBAAwB,CAAC,CAAC;QAC5C,CAAC;QACD,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,EAAE;aACzB,MAAM,EAAE;aACR,IAAI,CAAC,IAAI,CAAC,KAAY,CAAC;aACvB,KAAK,CAAC,IAAA,gBAAE,EAAC,EAAE,EAAE,EAAE,CAAC,CAAC;aACjB,KAAK,CAAC,CAAC,CAAC,CAAC;QACZ,OAAQ,MAAM,CAAC,CAAC,CAAS,IAAI,IAAI,CAAC;IACpC,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,KAAU;QACtB,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,EAAE;aACzB,MAAM,EAAE;aACR,IAAI,CAAC,IAAI,CAAC,KAAY,CAAC;aACvB,KAAK,CAAC,KAAK,CAAC;aACZ,KAAK,CAAC,CAAC,CAAC,CAAC;QACZ,OAAQ,MAAM,CAAC,CAAC,CAAS,IAAI,IAAI,CAAC;IACpC,CAAC;IAED,KAAK,CAAC,KAAK,CAAC,KAAW;QACrB,MAAM,KAAK,GAAG,IAAI,CAAC,EAAE,CAAC,MAAM,CAAC,EAAE,KAAK,EAAE,IAAA,iBAAG,EAAA,UAAU,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,KAAY,CAAC,CAAC;QAC/F,IAAI,KAAK,EAAE,CAAC;YACV,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;QACrB,CAAC;QACD,MAAM,MAAM,GAAG,MAAM,KAAK,CAAC;QAC3B,OAAO,MAAM,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;IACzB,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,KAAU;QACrB,MAAM,CAAC,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;QAClC,OAAO,CAAC,GAAG,CAAC,CAAC;IACf,CAAC;CACF;AA5DD,gDA4DC"}
1
+ {"version":3,"file":"readable.repository.js","sourceRoot":"","sources":["../../../src/base/repository/readable.repository.ts"],"names":[],"mappings":"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"}
@@ -1,6 +1,7 @@
1
1
  import type { SQL, AnyColumn } from 'drizzle-orm';
2
2
  import type { TTableSchema, TTableObject } from '../models/drizzle.types';
3
3
  import { DefaultCRUDRepository } from './default-crud.repository';
4
+ import type { Filter, Where } from '@loopback/repository';
4
5
  type TWithSoftDelete = {
5
6
  deletedAt: AnyColumn;
6
7
  };
@@ -13,8 +14,8 @@ export declare class SoftDeletableRepository<S extends TTableSchema & TWithSoftD
13
14
  offset?: number;
14
15
  }): Promise<TTableObject<S>[]>;
15
16
  findById(id: string | number): Promise<TTableObject<S> | null>;
16
- findOne(where: SQL): Promise<TTableObject<S> | null>;
17
- count(where?: SQL): Promise<number>;
17
+ findOne(filter?: Filter<TTableObject<S>>): Promise<TTableObject<S> | null>;
18
+ count(where?: Where<TTableObject<S>>): Promise<number>;
18
19
  hardDeleteById(id: string | number): Promise<boolean>;
19
20
  hardDeleteWhere(where: SQL): Promise<number>;
20
21
  restore(id: string | number): Promise<TTableObject<S> | null>;
@@ -1 +1 @@
1
- {"version":3,"file":"soft-deletable.repository.d.ts","sourceRoot":"","sources":["../../../src/base/repository/soft-deletable.repository.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,GAAG,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAElD,OAAO,KAAK,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAC1E,OAAO,EAAE,qBAAqB,EAAE,MAAM,2BAA2B,CAAC;AAElE,KAAK,eAAe,GAAG;IAAE,SAAS,EAAE,SAAS,CAAA;CAAE,CAAC;AAEhD,qBAAa,uBAAuB,CAClC,CAAC,SAAS,YAAY,GAAG,eAAe,CACxC,SAAQ,qBAAqB,CAAC,CAAC,CAAC;IAChC,OAAO,KAAK,YAAY,GAEvB;IAEc,UAAU,CAAC,EAAE,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAKjD,WAAW,CAAC,KAAK,EAAE,GAAG,GAAG,OAAO,CAAC,MAAM,CAAC;IAKxC,OAAO,CAAC,IAAI,CAAC,EAAE;QAAE,KAAK,CAAC,EAAE,MAAM,CAAC;QAAC,MAAM,CAAC,EAAE,MAAM,CAAA;KAAE,GAAG,OAAO,CAAC,YAAY,CAAC,CAAC,CAAC,EAAE,CAAC;IAc/E,QAAQ,CAAC,EAAE,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC,YAAY,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC;IAa9D,OAAO,CAAC,KAAK,EAAE,GAAG,GAAG,OAAO,CAAC,YAAY,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC;IASpD,KAAK,CAAC,KAAK,CAAC,EAAE,GAAG,GAAG,OAAO,CAAC,MAAM,CAAC;IAK5C,cAAc,CAAC,EAAE,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAIrD,eAAe,CAAC,KAAK,EAAE,GAAG,GAAG,OAAO,CAAC,MAAM,CAAC;IAI5C,OAAO,CAAC,EAAE,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC,YAAY,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC;IAI7D,WAAW,CAAC,IAAI,CAAC,EAAE;QAAE,KAAK,CAAC,EAAE,MAAM,CAAC;QAAC,MAAM,CAAC,EAAE,MAAM,CAAA;KAAE,GAAG,OAAO,CAAC,YAAY,CAAC,CAAC,CAAC,EAAE,CAAC;CAa1F"}
1
+ {"version":3,"file":"soft-deletable.repository.d.ts","sourceRoot":"","sources":["../../../src/base/repository/soft-deletable.repository.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,GAAG,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAElD,OAAO,KAAK,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAC1E,OAAO,EAAE,qBAAqB,EAAE,MAAM,2BAA2B,CAAC;AAClE,OAAO,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,sBAAsB,CAAC;AAE1D,KAAK,eAAe,GAAG;IAAE,SAAS,EAAE,SAAS,CAAA;CAAE,CAAC;AAEhD,qBAAa,uBAAuB,CAClC,CAAC,SAAS,YAAY,GAAG,eAAe,CACxC,SAAQ,qBAAqB,CAAC,CAAC,CAAC;IAChC,OAAO,KAAK,YAAY,GAEvB;IAEc,UAAU,CAAC,EAAE,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAK1D,WAAW,CAAC,KAAK,EAAE,GAAG,GAAG,OAAO,CAAC,MAAM,CAAC;IAS/B,OAAO,CAAC,IAAI,CAAC,EAAE;QAAE,KAAK,CAAC,EAAE,MAAM,CAAC;QAAC,MAAM,CAAC,EAAE,MAAM,CAAA;KAAE,GAAG,OAAO,CAAC,YAAY,CAAC,CAAC,CAAC,EAAE,CAAC;IAc/E,QAAQ,CAAC,EAAE,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC,YAAY,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC;IAa9D,OAAO,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,YAAY,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC;IAU1E,KAAK,CAAC,KAAK,CAAC,EAAE,KAAK,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,MAAM,CAAC;IAO/D,cAAc,CAAC,EAAE,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAIrD,eAAe,CAAC,KAAK,EAAE,GAAG,GAAG,OAAO,CAAC,MAAM,CAAC;IAQ5C,OAAO,CAAC,EAAE,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC,YAAY,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC;IAI7D,WAAW,CAAC,IAAI,CAAC,EAAE;QAAE,KAAK,CAAC,EAAE,MAAM,CAAC;QAAC,MAAM,CAAC,EAAE,MAAM,CAAA;KAAE,GAAG,OAAO,CAAC,YAAY,CAAC,CAAC,CAAC,EAAE,CAAC;CAa1F"}
@@ -5,20 +5,24 @@ const drizzle_orm_1 = require("drizzle-orm");
5
5
  const default_crud_repository_1 = require("./default-crud.repository");
6
6
  class SoftDeletableRepository extends default_crud_repository_1.DefaultCRUDRepository {
7
7
  get deletedAtCol() {
8
- return this.table.deleted_at;
8
+ return this.entity.schema.deletedAt;
9
9
  }
10
10
  async deleteById(id) {
11
11
  const result = await this.updateById(id, { deletedAt: new Date() });
12
12
  return !!result;
13
13
  }
14
14
  async deleteWhere(where) {
15
- const result = await this.updateWhere(where, { deletedAt: new Date() });
15
+ const result = await this.db
16
+ .update(this.entity.schema)
17
+ .set({ deletedAt: new Date() })
18
+ .where(where)
19
+ .returning();
16
20
  return result.length;
17
21
  }
18
22
  async findAll(opts) {
19
23
  let query = this.db
20
24
  .select()
21
- .from(this.table)
25
+ .from(this.entity.schema)
22
26
  .where((0, drizzle_orm_1.isNull)(this.deletedAtCol));
23
27
  if (opts?.limit) {
24
28
  query = query.limit(opts.limit);
@@ -29,34 +33,41 @@ class SoftDeletableRepository extends default_crud_repository_1.DefaultCRUDRepos
29
33
  return (await query);
30
34
  }
31
35
  async findById(id) {
32
- const pk = this.table.id;
36
+ const pk = this.entity.schema.id;
33
37
  if (!pk) {
34
38
  throw new Error('Table has no id column');
35
39
  }
36
40
  const result = await this.db
37
41
  .select()
38
- .from(this.table)
42
+ .from(this.entity.schema)
39
43
  .where((0, drizzle_orm_1.and)((0, drizzle_orm_1.eq)(pk, id), (0, drizzle_orm_1.isNull)(this.deletedAtCol)))
40
44
  .limit(1);
41
45
  return result[0] || null;
42
46
  }
43
- async findOne(where) {
44
- const result = await this.db
45
- .select()
46
- .from(this.table)
47
- .where((0, drizzle_orm_1.and)(where, (0, drizzle_orm_1.isNull)(this.deletedAtCol)))
48
- .limit(1);
49
- return result[0] || null;
47
+ async findOne(filter) {
48
+ const mergedFilter = {
49
+ ...filter,
50
+ where: filter?.where
51
+ ? { and: [filter.where, { deletedAt: null }] }
52
+ : { deletedAt: null },
53
+ };
54
+ return super.findOne(mergedFilter);
50
55
  }
51
56
  async count(where) {
52
- const cond = where ? (0, drizzle_orm_1.and)(where, (0, drizzle_orm_1.isNull)(this.deletedAtCol)) : (0, drizzle_orm_1.isNull)(this.deletedAtCol);
57
+ const cond = where
58
+ ? { and: [where, { deletedAt: null }] }
59
+ : { deletedAt: null };
53
60
  return super.count(cond);
54
61
  }
55
62
  async hardDeleteById(id) {
56
63
  return super.deleteById(id);
57
64
  }
58
65
  async hardDeleteWhere(where) {
59
- return super.deleteWhere(where);
66
+ const result = await this.db
67
+ .delete(this.entity.schema)
68
+ .where(where)
69
+ .returning();
70
+ return result.length;
60
71
  }
61
72
  async restore(id) {
62
73
  return this.updateById(id, { deletedAt: null });
@@ -64,7 +75,7 @@ class SoftDeletableRepository extends default_crud_repository_1.DefaultCRUDRepos
64
75
  async findTrashed(opts) {
65
76
  let query = this.db
66
77
  .select()
67
- .from(this.table)
78
+ .from(this.entity.schema)
68
79
  .where((0, drizzle_orm_1.sql) `${this.deletedAtCol} IS NOT NULL`);
69
80
  if (opts?.limit) {
70
81
  query = query.limit(opts.limit);
@@ -1 +1 @@
1
- {"version":3,"file":"soft-deletable.repository.js","sourceRoot":"","sources":["../../../src/base/repository/soft-deletable.repository.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"soft-deletable.repository.js","sourceRoot":"","sources":["../../../src/base/repository/soft-deletable.repository.ts"],"names":[],"mappings":"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"}
@@ -1,7 +1,10 @@
1
+ import type { Application } from '@loopback/core';
1
2
  export declare abstract class BaseArtifactBooter {
3
+ protected app: Application;
2
4
  abstract dirs: string[];
3
5
  abstract extensions: string[];
4
6
  abstract glob: string;
7
+ constructor(app: Application);
5
8
  discover(): Promise<string[]>;
6
9
  load(): Promise<void>;
7
10
  abstract bind(): Promise<void>;
@@ -1 +1 @@
1
- {"version":3,"file":"base-artifact-booter.d.ts","sourceRoot":"","sources":["../../../src/boot/base/base-artifact-booter.ts"],"names":[],"mappings":"AAAA,8BAAsB,kBAAkB;IACtC,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,CAAC;IACxB,QAAQ,CAAC,UAAU,EAAE,MAAM,EAAE,CAAC;IAC9B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IAEhB,QAAQ,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;IAG7B,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAC3B,QAAQ,CAAC,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;CAC/B"}
1
+ {"version":3,"file":"base-artifact-booter.d.ts","sourceRoot":"","sources":["../../../src/boot/base/base-artifact-booter.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAElD,8BAAsB,kBAAkB;IAK1B,SAAS,CAAC,GAAG,EAAE,WAAW;IAJtC,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,CAAC;IACxB,QAAQ,CAAC,UAAU,EAAE,MAAM,EAAE,CAAC;IAC9B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;gBAEA,GAAG,EAAE,WAAW;IAEhC,QAAQ,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;IAG7B,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAC3B,QAAQ,CAAC,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;CAC/B"}
@@ -2,6 +2,9 @@
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.BaseArtifactBooter = void 0;
4
4
  class BaseArtifactBooter {
5
+ constructor(app) {
6
+ this.app = app;
7
+ }
5
8
  async discover() {
6
9
  return [];
7
10
  }
@@ -1 +1 @@
1
- {"version":3,"file":"base-artifact-booter.js","sourceRoot":"","sources":["../../../src/boot/base/base-artifact-booter.ts"],"names":[],"mappings":";;;AAAA,MAAsB,kBAAkB;IAKtC,KAAK,CAAC,QAAQ;QACZ,OAAO,EAAE,CAAC;IACZ,CAAC;IACD,KAAK,CAAC,IAAI,KAAmB,CAAC;CAE/B;AAVD,gDAUC"}
1
+ {"version":3,"file":"base-artifact-booter.js","sourceRoot":"","sources":["../../../src/boot/base/base-artifact-booter.ts"],"names":[],"mappings":";;;AAEA,MAAsB,kBAAkB;IAKtC,YAAsB,GAAgB;QAAhB,QAAG,GAAH,GAAG,CAAa;IAAG,CAAC;IAE1C,KAAK,CAAC,QAAQ;QACZ,OAAO,EAAE,CAAC;IACZ,CAAC;IACD,KAAK,CAAC,IAAI,KAAmB,CAAC;CAE/B;AAZD,gDAYC"}
@@ -1 +1 @@
1
- {"version":3,"file":"boot.mixin.d.ts","sourceRoot":"","sources":["../../src/boot/boot.mixin.ts"],"names":[],"mappings":"AAAA,wBAAgB,SAAS,CAAC,CAAC,SAAS,KAAK,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,GAAG,EAAE,UAAU,EAAE,CAAC;kBAA5B,GAAG,EAAE;;;;MAStD"}
1
+ {"version":3,"file":"boot.mixin.d.ts","sourceRoot":"","sources":["../../src/boot/boot.mixin.ts"],"names":[],"mappings":"AAEA,wBAAgB,SAAS,CAAC,CAAC,SAAS,KAAK,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,GAAG,EAAE,UAAU,EAAE,CAAC;kBAA5B,GAAG,EAAE;;;;MAetD"}
@@ -1,13 +1,19 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.bootMixin = bootMixin;
4
+ const booters_1 = require("./booters");
4
5
  function bootMixin(superClass) {
5
6
  return class extends superClass {
6
7
  async boot() {
7
- // 1. datasource
8
- // 2. repository
9
- // 3. service
10
- // 4. controller
8
+ const booters = [
9
+ new booters_1.ControllerBooter(this),
10
+ new booters_1.RepositoryBooter(this),
11
+ new booters_1.ServiceBooter(this),
12
+ new booters_1.DataSourceBooter(this),
13
+ ];
14
+ for (const booter of booters) {
15
+ await booter.bind();
16
+ }
11
17
  }
12
18
  };
13
19
  }
@@ -1 +1 @@
1
- {"version":3,"file":"boot.mixin.js","sourceRoot":"","sources":["../../src/boot/boot.mixin.ts"],"names":[],"mappings":";;AAAA,8BASC;AATD,SAAgB,SAAS,CAAwC,UAAa;IAC5E,OAAO,KAAM,SAAQ,UAAU;QAC7B,KAAK,CAAC,IAAI;YACR,gBAAgB;YAChB,gBAAgB;YAChB,aAAa;YACb,gBAAgB;QAClB,CAAC;KACF,CAAC;AACJ,CAAC"}
1
+ {"version":3,"file":"boot.mixin.js","sourceRoot":"","sources":["../../src/boot/boot.mixin.ts"],"names":[],"mappings":";;AAEA,8BAeC;AAjBD,uCAAgG;AAEhG,SAAgB,SAAS,CAAwC,UAAa;IAC5E,OAAO,KAAM,SAAQ,UAAU;QAC7B,KAAK,CAAC,IAAI;YACR,MAAM,OAAO,GAAG;gBACd,IAAI,0BAAgB,CAAC,IAAW,CAAC;gBACjC,IAAI,0BAAgB,CAAC,IAAW,CAAC;gBACjC,IAAI,uBAAa,CAAC,IAAW,CAAC;gBAC9B,IAAI,0BAAgB,CAAC,IAAW,CAAC;aAClC,CAAC;YAEF,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE,CAAC;gBAC7B,MAAM,MAAM,CAAC,IAAI,EAAE,CAAC;YACtB,CAAC;QACH,CAAC;KACF,CAAC;AACJ,CAAC"}
@@ -1 +1 @@
1
- {"version":3,"file":"controller.booter.d.ts","sourceRoot":"","sources":["../../../src/boot/booters/controller.booter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,8BAA8B,CAAC;AAElE,qBAAa,gBAAiB,SAAQ,kBAAkB;IACtD,IAAI,WAAmB;IACvB,UAAU,WAAwC;IAClD,IAAI,SAA6B;IAE3B,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;CAC5B"}
1
+ {"version":3,"file":"controller.booter.d.ts","sourceRoot":"","sources":["../../../src/boot/booters/controller.booter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,8BAA8B,CAAC;AAElE,qBAAa,gBAAiB,SAAQ,kBAAkB;IACtD,IAAI,WAAmB;IACvB,UAAU,WAAwC;IAClD,IAAI,SAA6B;IAE3B,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;CAK5B"}
@@ -9,7 +9,11 @@ class ControllerBooter extends base_artifact_booter_1.BaseArtifactBooter {
9
9
  this.extensions = ['.controller.ts', '.controller.js'];
10
10
  this.glob = '**/*.controller.{ts,js}';
11
11
  }
12
- async bind() { }
12
+ async bind() {
13
+ // In a real LB4 app, this would use Metadata to find classes
14
+ // and this.app.controller(cls) to bind them.
15
+ // For now, we are setting up the structure.
16
+ }
13
17
  }
14
18
  exports.ControllerBooter = ControllerBooter;
15
19
  //# sourceMappingURL=controller.booter.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"controller.booter.js","sourceRoot":"","sources":["../../../src/boot/booters/controller.booter.ts"],"names":[],"mappings":";;;AAAA,uEAAkE;AAElE,MAAa,gBAAiB,SAAQ,yCAAkB;IAAxD;;QACE,SAAI,GAAG,CAAC,aAAa,CAAC,CAAC;QACvB,eAAU,GAAG,CAAC,gBAAgB,EAAE,gBAAgB,CAAC,CAAC;QAClD,SAAI,GAAG,yBAAyB,CAAC;IAGnC,CAAC;IADC,KAAK,CAAC,IAAI,KAAmB,CAAC;CAC/B;AAND,4CAMC"}
1
+ {"version":3,"file":"controller.booter.js","sourceRoot":"","sources":["../../../src/boot/booters/controller.booter.ts"],"names":[],"mappings":";;;AAAA,uEAAkE;AAElE,MAAa,gBAAiB,SAAQ,yCAAkB;IAAxD;;QACE,SAAI,GAAG,CAAC,aAAa,CAAC,CAAC;QACvB,eAAU,GAAG,CAAC,gBAAgB,EAAE,gBAAgB,CAAC,CAAC;QAClD,SAAI,GAAG,yBAAyB,CAAC;IAOnC,CAAC;IALC,KAAK,CAAC,IAAI;QACR,6DAA6D;QAC7D,6CAA6C;QAC7C,4CAA4C;IAC9C,CAAC;CACF;AAVD,4CAUC"}
@@ -1,5 +1,7 @@
1
1
  export declare class App {
2
2
  static readonly APPLICATION_NAME: string;
3
+ static readonly APPLICATION_VERSION: string;
4
+ static readonly APPLICATION_LOGGER_FOLDER_PATH: string;
3
5
  static readonly APPLICATION_SECRET: string;
4
6
  static readonly DEFAULT_LOCALE = "en.UTF-8";
5
7
  static readonly DEFAULT_EXPLORER_PATH = "/explorer";
@@ -1 +1 @@
1
- {"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../src/common/constants.ts"],"names":[],"mappings":"AAAA,qBAAa,GAAG;IACd,MAAM,CAAC,QAAQ,CAAC,gBAAgB,SAAiD;IACjF,MAAM,CAAC,QAAQ,CAAC,kBAAkB,SAC+B;IAEjE,MAAM,CAAC,QAAQ,CAAC,cAAc,cAAc;IAC5C,MAAM,CAAC,QAAQ,CAAC,qBAAqB,eAAe;IAEpD,MAAM,CAAC,QAAQ,CAAC,mBAAmB,MAAM;CAC1C;AAED,qBAAa,gBAAgB;IAC3B,MAAM,CAAC,QAAQ,CAAC,GAAG,SAAS;CAC7B;AAED,qBAAa,KAAK;IAChB,MAAM,CAAC,QAAQ,CAAC,IAAI,UAAU;IAC9B,MAAM,CAAC,QAAQ,CAAC,GAAG,SAAS;CAC7B;AAED,qBAAa,mBAAmB;IAC9B,MAAM,CAAC,QAAQ,CAAC,aAAa,aAAa;IAC1C,MAAM,CAAC,QAAQ,CAAC,YAAY,aAAa;IACzC,MAAM,CAAC,QAAQ,CAAC,SAAS,UAAU;CACpC;AAED,qBAAa,eAAe;IAC1B,MAAM,CAAC,QAAQ,CAAC,UAAU,eAAe;IACzC,MAAM,CAAC,QAAQ,CAAC,OAAO,YAAY;IACnC,MAAM,CAAC,QAAQ,CAAC,QAAQ,aAAa;IACrC,MAAM,CAAC,QAAQ,CAAC,gBAAgB,oBAAoB;IACpD,MAAM,CAAC,QAAQ,CAAC,oBAAoB,wBAAwB;IAE5D,MAAM,CAAC,QAAQ,CAAC,UAAU,cAMvB;IAEH,MAAM,CAAC,OAAO,CAAC,IAAI,EAAE,MAAM;CAG5B;AAED,qBAAa,SAAS;IACpB,MAAM,CAAC,QAAQ,CAAC,OAAO,aAAa;IACpC,MAAM,CAAC,QAAQ,CAAC,KAAK,WAAW;IAChC,MAAM,CAAC,QAAQ,CAAC,KAAK,WAAW;IAChC,MAAM,CAAC,QAAQ,CAAC,IAAI,UAAU;CAC/B"}
1
+ {"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../src/common/constants.ts"],"names":[],"mappings":"AAAA,qBAAa,GAAG;IACd,MAAM,CAAC,QAAQ,CAAC,gBAAgB,SAAiD;IACjF,MAAM,CAAC,QAAQ,CAAC,mBAAmB,SAAsD;IACzF,MAAM,CAAC,QAAQ,CAAC,8BAA8B,SACgB;IAC9D,MAAM,CAAC,QAAQ,CAAC,kBAAkB,SAC+B;IAEjE,MAAM,CAAC,QAAQ,CAAC,cAAc,cAAc;IAC5C,MAAM,CAAC,QAAQ,CAAC,qBAAqB,eAAe;IAEpD,MAAM,CAAC,QAAQ,CAAC,mBAAmB,MAAM;CAC1C;AAED,qBAAa,gBAAgB;IAC3B,MAAM,CAAC,QAAQ,CAAC,GAAG,SAAS;CAC7B;AAED,qBAAa,KAAK;IAChB,MAAM,CAAC,QAAQ,CAAC,IAAI,UAAU;IAC9B,MAAM,CAAC,QAAQ,CAAC,GAAG,SAAS;CAC7B;AAED,qBAAa,mBAAmB;IAC9B,MAAM,CAAC,QAAQ,CAAC,aAAa,aAAa;IAC1C,MAAM,CAAC,QAAQ,CAAC,YAAY,aAAa;IACzC,MAAM,CAAC,QAAQ,CAAC,SAAS,UAAU;CACpC;AAED,qBAAa,eAAe;IAC1B,MAAM,CAAC,QAAQ,CAAC,UAAU,eAAe;IACzC,MAAM,CAAC,QAAQ,CAAC,OAAO,YAAY;IACnC,MAAM,CAAC,QAAQ,CAAC,QAAQ,aAAa;IACrC,MAAM,CAAC,QAAQ,CAAC,gBAAgB,oBAAoB;IACpD,MAAM,CAAC,QAAQ,CAAC,oBAAoB,wBAAwB;IAE5D,MAAM,CAAC,QAAQ,CAAC,UAAU,cAMvB;IAEH,MAAM,CAAC,OAAO,CAAC,IAAI,EAAE,MAAM;CAG5B;AAED,qBAAa,SAAS;IACpB,MAAM,CAAC,QAAQ,CAAC,OAAO,aAAa;IACpC,MAAM,CAAC,QAAQ,CAAC,KAAK,WAAW;IAChC,MAAM,CAAC,QAAQ,CAAC,KAAK,WAAW;IAChC,MAAM,CAAC,QAAQ,CAAC,IAAI,UAAU;CAC/B"}
@@ -3,6 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.MimeTypes = exports.EntityRelations = exports.ApplicationRunModes = exports.Sorts = exports.ApplicationRoles = exports.App = void 0;
4
4
  class App {
5
5
  static { this.APPLICATION_NAME = process.env.APP_ENV_APPLICATION_NAME ?? 'APP'; }
6
+ static { this.APPLICATION_VERSION = process.env.APP_ENV_APPLICATION_VERSION ?? '1.0.0'; }
7
+ static { this.APPLICATION_LOGGER_FOLDER_PATH = process.env.APP_ENV_LOGGER_FOLDER_PATH ?? './app_data/logs'; }
6
8
  static { this.APPLICATION_SECRET = process.env.APP_ENV_APPLICATION_SECRET ?? 'application.secret'; }
7
9
  static { this.DEFAULT_LOCALE = 'en.UTF-8'; }
8
10
  static { this.DEFAULT_EXPLORER_PATH = '/explorer'; }