@hg-ts/knex 0.3.4 → 0.4.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.
- package/dist/event.knex.repository.d.ts +2 -2
- package/dist/event.knex.repository.d.ts.map +1 -1
- package/dist/event.knex.repository.js +11 -15
- package/dist/event.knex.repository.js.map +1 -1
- package/dist/event.migration.js +2 -6
- package/dist/event.migration.js.map +1 -1
- package/dist/external-config.d.ts +1 -1
- package/dist/external-config.d.ts.map +1 -1
- package/dist/external-config.js +3 -7
- package/dist/external-config.js.map +1 -1
- package/dist/index.d.ts +7 -7
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +8 -12
- package/dist/index.js.map +1 -1
- package/dist/knex.config.d.ts +3 -3
- package/dist/knex.config.d.ts.map +1 -1
- package/dist/knex.config.js +12 -17
- package/dist/knex.config.js.map +1 -1
- package/dist/knex.module.js +14 -17
- package/dist/knex.module.js.map +1 -1
- package/dist/knex.repository.d.ts +1 -1
- package/dist/knex.repository.d.ts.map +1 -1
- package/dist/knex.repository.js +10 -14
- package/dist/knex.repository.js.map +1 -1
- package/dist/knex.service.js +21 -25
- package/dist/knex.service.js.map +1 -1
- package/dist/test-containers/index.d.ts +1 -1
- package/dist/test-containers/index.d.ts.map +1 -1
- package/dist/test-containers/index.js +1 -4
- package/dist/test-containers/index.js.map +1 -1
- package/dist/test-containers/postgres-testcontainer.module.js +8 -11
- package/dist/test-containers/postgres-testcontainer.module.js.map +1 -1
- package/dist/test-containers/postgres-testcontainer.service.js +15 -19
- package/dist/test-containers/postgres-testcontainer.service.js.map +1 -1
- package/package.json +24 -23
- package/tsconfig.json +1 -1
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { DomainEvent } from '@hg-ts/domain';
|
|
2
2
|
import { BaseEventRepository, EventFindOptions } from '@hg-ts/repository';
|
|
3
|
-
import { KnexService } from './knex.service';
|
|
3
|
+
import { KnexService } from './knex.service.js';
|
|
4
4
|
export type EventTable = {
|
|
5
5
|
id: string;
|
|
6
6
|
entityName: string;
|
|
@@ -11,7 +11,7 @@ export type EventTable = {
|
|
|
11
11
|
occurredOn: Date;
|
|
12
12
|
createdAt: Date;
|
|
13
13
|
};
|
|
14
|
-
declare module 'knex/types/tables' {
|
|
14
|
+
declare module 'knex/types/tables.js' {
|
|
15
15
|
interface Tables {
|
|
16
16
|
event: EventTable;
|
|
17
17
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"event.knex.repository.d.ts","sourceRoot":"","sources":["../src/event.knex.repository.ts"],"names":[],"mappings":"AAAA,OAAO,EACN,WAAW,EAEX,MAAM,eAAe,CAAC;AACvB,OAAO,EACN,mBAAmB,EACnB,gBAAgB,EAChB,MAAM,mBAAmB,CAAC;AAI3B,OAAO,EAAE,WAAW,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"event.knex.repository.d.ts","sourceRoot":"","sources":["../src/event.knex.repository.ts"],"names":[],"mappings":"AAAA,OAAO,EACN,WAAW,EAEX,MAAM,eAAe,CAAC;AACvB,OAAO,EACN,mBAAmB,EACnB,gBAAgB,EAChB,MAAM,mBAAmB,CAAC;AAI3B,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAEhD,MAAM,MAAM,UAAU,GAAG;IACxB,EAAE,EAAE,MAAM,CAAC;IACX,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,OAAO,CAAC;IACd,OAAO,EAAE,QAAQ,CAAC,MAAM,CAAC,CAAC;IAC1B,UAAU,EAAE,IAAI,CAAC;IACjB,SAAS,EAAE,IAAI,CAAC;CAChB,CAAC;AAEF,OAAO,QAAQ,sBAAsB,CAAC;IAErC,UAAU,MAAM;QACf,KAAK,EAAE,UAAU,CAAC;KAClB;CACD;AAED,qBAAa,mBAAoB,SAAQ,mBAAmB;IAE3D,SAAS,CAAC,QAAQ,CAAC,IAAI,EAAE,WAAW,CAAC;IAEf,GAAG,CAAC,KAAK,EAAE,WAAW,GAAG,WAAW,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;cASnD,YAAY,CACpC,OAAO,GAAE,OAAO,CAAC,gBAAgB,CAAM,EACvC,KAAK,GAAE,OAAiB,GACtB,OAAO,CAAC,WAAW,EAAE,CAAC;IA2CzB,SAAS,CAAC,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,IAAI,CAAC,UAAU,EAAE,MAAM,CAAC,GAAG,WAAW;CAU/E"}
|
|
@@ -1,12 +1,9 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
const common_1 = require("@nestjs/common");
|
|
8
|
-
const knex_service_1 = require("./knex.service");
|
|
9
|
-
class EventKnexRepository extends repository_1.BaseEventRepository {
|
|
1
|
+
import { __decorate, __metadata } from "tslib";
|
|
2
|
+
import { DomainEvent, STORED_PROPERTY, } from '@hg-ts/domain';
|
|
3
|
+
import { BaseEventRepository, } from '@hg-ts/repository';
|
|
4
|
+
import { Inject } from '@nestjs/common';
|
|
5
|
+
import { KnexService } from './knex.service.js';
|
|
6
|
+
export class EventKnexRepository extends BaseEventRepository {
|
|
10
7
|
knex;
|
|
11
8
|
async add(event) {
|
|
12
9
|
const events = Array.isArray(event) ? event : [event];
|
|
@@ -42,12 +39,12 @@ class EventKnexRepository extends repository_1.BaseEventRepository {
|
|
|
42
39
|
return rows.map(row => {
|
|
43
40
|
const { name, ...eventData } = row;
|
|
44
41
|
const event = this.createEvent(name, eventData);
|
|
45
|
-
event[
|
|
42
|
+
event[STORED_PROPERTY] = true;
|
|
46
43
|
return event;
|
|
47
44
|
});
|
|
48
45
|
}
|
|
49
46
|
createEvent(name, row) {
|
|
50
|
-
return new
|
|
47
|
+
return new DomainEvent({
|
|
51
48
|
body: row.body,
|
|
52
49
|
entityName: row.entityName,
|
|
53
50
|
entityId: row.entityId,
|
|
@@ -57,9 +54,8 @@ class EventKnexRepository extends repository_1.BaseEventRepository {
|
|
|
57
54
|
});
|
|
58
55
|
}
|
|
59
56
|
}
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
(
|
|
63
|
-
tslib_1.__metadata("design:type", knex_service_1.KnexService)
|
|
57
|
+
__decorate([
|
|
58
|
+
Inject(),
|
|
59
|
+
__metadata("design:type", KnexService)
|
|
64
60
|
], EventKnexRepository.prototype, "knex", void 0);
|
|
65
61
|
//# sourceMappingURL=event.knex.repository.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"event.knex.repository.js","sourceRoot":"","sources":["../src/event.knex.repository.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"event.knex.repository.js","sourceRoot":"","sources":["../src/event.knex.repository.ts"],"names":[],"mappings":";AAAA,OAAO,EACN,WAAW,EACX,eAAe,GACf,MAAM,eAAe,CAAC;AACvB,OAAO,EACN,mBAAmB,GAEnB,MAAM,mBAAmB,CAAC;AAE3B,OAAO,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAC;AAExC,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAoBhD,MAAM,OAAO,mBAAoB,SAAQ,mBAAmB;IAExC,IAAI,CAAc;IAErB,KAAK,CAAC,GAAG,CAAC,KAAkC;QAC3D,MAAM,MAAM,GAAG,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;QACtD,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,CAAC;QAE3C,MAAM,iBAAiB,GAAG,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC,CAAC;QAE7D,MAAM,GAAG,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,iBAAiB,CAAC,CAAC;IAC9C,CAAC;IAEkB,KAAK,CAAC,YAAY,CACpC,UAAqC,EAAE,EACvC,QAAiB,OAAO;QAExB,MAAM,EAAE,EAAE,EAAE,QAAQ,EAAE,UAAU,EAAE,KAAK,EAAE,GAAG,OAAO,CAAC;QAEpD,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,CAAC;QAE3C,MAAM,EAAE,GAAG,GAAG,CAAC,KAAK,CAAC,CAAC;QAEtB,IAAI,EAAE,EAAE,CAAC;YACR,IAAI,KAAK,CAAC,OAAO,CAAC,EAAE,CAAC,EAAE,CAAC;gBACvB,EAAE,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;YACtB,CAAC;iBAAM,CAAC;gBACP,EAAE,CAAC,KAAK,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;YACpB,CAAC;QACF,CAAC;QAED,IAAI,QAAQ,EAAE,CAAC;YACd,EAAE,CAAC,KAAK,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC;QAChC,CAAC;QAED,IAAI,UAAU,EAAE,CAAC;YAChB,EAAE,CAAC,KAAK,CAAC,YAAY,EAAE,UAAU,CAAC,CAAC;QACpC,CAAC;QAED,IAAI,UAAU,EAAE,CAAC;YAChB,EAAE,CAAC,KAAK,CAAC,YAAY,EAAE,UAAU,CAAC,CAAC;QACpC,CAAC;QAED,IAAI,KAAK,EAAE,CAAC;YACX,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;QACjB,CAAC;QAED,MAAM,IAAI,GAAG,MAAM,EAAE,CAAC;QAEtB,OAAO,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE;YACrB,MAAM,EAAE,IAAI,EAAE,GAAG,SAAS,EAAE,GAAG,GAAG,CAAC;YACnC,MAAM,KAAK,GAAG,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;YAEhD,KAAK,CAAC,eAAe,CAAC,GAAG,IAAI,CAAC;YAE9B,OAAO,KAAK,CAAC;QACd,CAAC,CAAC,CAAC;IACJ,CAAC;IAES,WAAW,CAAC,IAAY,EAAE,GAA6B;QAChE,OAAO,IAAI,WAAW,CAAC;YACtB,IAAI,EAAE,GAAG,CAAC,IAAI;YACd,UAAU,EAAE,GAAG,CAAC,UAAU;YAC1B,QAAQ,EAAE,GAAG,CAAC,QAAQ;YACtB,UAAU,EAAE,GAAG,CAAC,UAAU;YAC1B,OAAO,EAAE,GAAG,CAAC,OAAO;YACpB,IAAI;SACJ,CAAC,CAAC;IACJ,CAAC;CACD;AAnEmB;IADlB,MAAM,EAAE;8BACgB,WAAW;iDAAC"}
|
package/dist/event.migration.js
CHANGED
|
@@ -1,7 +1,3 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.up = up;
|
|
4
|
-
exports.down = down;
|
|
5
1
|
function createEventTable(table, knex) {
|
|
6
2
|
table.uuid('id').primary();
|
|
7
3
|
table.string('entityName').notNullable();
|
|
@@ -14,10 +10,10 @@ function createEventTable(table, knex) {
|
|
|
14
10
|
table.index(['entityName', 'entityId'], 'eventEntityIdx', { storageEngineIndexType: 'btree' });
|
|
15
11
|
table.index('occurredOn', 'eventOccurredOnIdx', { storageEngineIndexType: 'btree' });
|
|
16
12
|
}
|
|
17
|
-
async function up(knex) {
|
|
13
|
+
export async function up(knex) {
|
|
18
14
|
await knex.schema.createTable('event', table => createEventTable(table, knex));
|
|
19
15
|
}
|
|
20
|
-
async function down(knex) {
|
|
16
|
+
export async function down(knex) {
|
|
21
17
|
await knex.schema.dropTable('event');
|
|
22
18
|
}
|
|
23
19
|
//# sourceMappingURL=event.migration.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"event.migration.js","sourceRoot":"","sources":["../src/event.migration.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"event.migration.js","sourceRoot":"","sources":["../src/event.migration.ts"],"names":[],"mappings":"AAEA,SAAS,gBAAgB,CAAC,KAA8B,EAAE,IAAU;IACnE,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,CAAC;IAE3B,KAAK,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,WAAW,EAAE,CAAC;IACzC,KAAK,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,WAAW,EAAE,CAAC;IAEvC,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,WAAW,EAAE,CAAC;IACnC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,WAAW,EAAE,CAAC;IAEjC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,QAAQ,EAAE,CAAC;IAEjC,KAAK,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC,WAAW,EAAE,CAAC;IAC5C,KAAK,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC,WAAW,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC,GAAG,EAAE,CAAC,CAAC;IAEpE,KAAK,CAAC,KAAK,CAAC,CAAC,YAAY,EAAE,UAAU,CAAC,EAAE,gBAAgB,EAAE,EAAE,sBAAsB,EAAE,OAAO,EAAE,CAAC,CAAC;IAC/F,KAAK,CAAC,KAAK,CAAC,YAAY,EAAE,oBAAoB,EAAE,EAAE,sBAAsB,EAAE,OAAO,EAAE,CAAC,CAAC;AACtF,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,EAAE,CAAC,IAAU;IAClC,MAAM,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,OAAO,EAAE,KAAK,CAAC,EAAE,CAAC,gBAAgB,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC,CAAC;AAChF,CAAC;AACD,MAAM,CAAC,KAAK,UAAU,IAAI,CAAC,IAAU;IACpC,MAAM,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;AACtC,CAAC"}
|
|
@@ -2,7 +2,7 @@ import { ConfigLoader } from '@hg-ts/config-loader';
|
|
|
2
2
|
import { ExecutionMode } from '@hg-ts/execution-mode';
|
|
3
3
|
import { Logger } from '@hg-ts/logger';
|
|
4
4
|
import { Knex } from 'knex';
|
|
5
|
-
import { KnexConfig } from './knex.config';
|
|
5
|
+
import { KnexConfig } from './knex.config.js';
|
|
6
6
|
export type ExternalConfigOptions = {
|
|
7
7
|
executionMode?: ExecutionMode;
|
|
8
8
|
logger?: Logger;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"external-config.d.ts","sourceRoot":"","sources":["../src/external-config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACpD,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AACtD,OAAO,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AAEvC,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAC5B,OAAO,EAAE,UAAU,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"external-config.d.ts","sourceRoot":"","sources":["../src/external-config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACpD,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AACtD,OAAO,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AAEvC,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAC5B,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAE9C,MAAM,MAAM,qBAAqB,GAAG;IACnC,aAAa,CAAC,EAAE,aAAa,CAAC;IAC9B,MAAM,CAAC,EAAE,MAAM,CAAC;CAChB,GAAG,CAAC;IACJ,MAAM,EAAE,UAAU,CAAC;IACnB,MAAM,CAAC,EAAE,SAAS,CAAC;CACnB,GAAG;IACH,MAAM,CAAC,EAAE,SAAS,CAAC;IACnB,MAAM,EAAE,YAAY,CAAC;CACrB,CAAC,CAAA;AAEF,qBAAa,cAAc;WACN,KAAK,CAAC,OAAO,EAAE,qBAAqB,GAAG,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC;mBA8C1D,SAAS;CAO9B"}
|
package/dist/external-config.js
CHANGED
|
@@ -1,8 +1,5 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
exports.ExternalConfig = void 0;
|
|
4
|
-
const knex_config_1 = require("./knex.config");
|
|
5
|
-
class ExternalConfig {
|
|
1
|
+
import { KnexConfig } from './knex.config.js';
|
|
2
|
+
export class ExternalConfig {
|
|
6
3
|
static async build(options) {
|
|
7
4
|
const { executionMode, logger } = options;
|
|
8
5
|
const config = await ExternalConfig.getConfig(options);
|
|
@@ -49,8 +46,7 @@ class ExternalConfig {
|
|
|
49
46
|
if (options.config) {
|
|
50
47
|
return options.config;
|
|
51
48
|
}
|
|
52
|
-
return options.loader.load(
|
|
49
|
+
return options.loader.load(KnexConfig, 'knex');
|
|
53
50
|
}
|
|
54
51
|
}
|
|
55
|
-
exports.ExternalConfig = ExternalConfig;
|
|
56
52
|
//# sourceMappingURL=external-config.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"external-config.js","sourceRoot":"","sources":["../src/external-config.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"external-config.js","sourceRoot":"","sources":["../src/external-config.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAa9C,MAAM,OAAO,cAAc;IACnB,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,OAA8B;QACvD,MAAM,EAAE,aAAa,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC;QAC1C,MAAM,MAAM,GAAG,MAAM,cAAc,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;QACvD,MAAM,EAAE,UAAU,EAAE,KAAK,EAAE,GAAG,MAAM,CAAC;QACrC,MAAM,OAAO,GAAG,aAAa,EAAE,OAAO,EAAE,IAAI,aAAa,EAAE,KAAK,EAAE,CAAC;QAEnE,MAAM,UAAU,GAAgB;YAC/B,MAAM,EAAE,UAAU;YAClB,OAAO,EAAE,UAAU;YACnB,KAAK,EAAE,OAAO,IAAI,KAAK;YACvB,gBAAgB,EAAE,IAAI;YACtB,UAAU,EAAE;gBACX,IAAI,EAAE,MAAM,CAAC,IAAI;gBACjB,IAAI,EAAE,MAAM,CAAC,IAAI;gBACjB,QAAQ,EAAE,MAAM,CAAC,QAAQ;gBACzB,IAAI,EAAE,MAAM,CAAC,IAAI;gBACjB,QAAQ,EAAE,MAAM,CAAC,QAAQ;aACzB;YACD,iBAAiB,EAAE,KAAK;YACxB,UAAU,EAAE;gBACX,cAAc,EAAE,UAAU,CAAC,eAAe;oBACzC,CAAC,CAAC,CAAC,KAAK,EAAE,KAAK,CAAC;oBAChB,CAAC,CAAC,CAAC,KAAK,CAAC;gBACV,SAAS,EAAE,UAAU,CAAC,IAAI;gBAC1B,SAAS,EAAE,IAAI;aACf;YACD,KAAK,EAAE,EAAE,SAAS,EAAE,KAAK,CAAC,IAAI,EAAE;SAChC,CAAC;QAEF,IAAI,MAAM,EAAE,CAAC;YACZ,UAAU,CAAC,GAAG,GAAG;gBAChB,KAAK,EAAE,CAAC,OAAgB,EAAQ,EAAE;oBACjC,MAAM,CAAC,KAAK,CAAC,iBAAiB,EAAE,OAAO,CAAC,CAAC;gBAC1C,CAAC;gBACD,IAAI,EAAE,CAAC,OAAgB,EAAQ,EAAE;oBAChC,MAAM,CAAC,OAAO,CAAC,6BAA6B,EAAE,OAAO,CAAC,CAAC;gBACxD,CAAC;gBACD,KAAK,EAAE,CAAC,KAAc,EAAQ,EAAE;oBAC/B,MAAM,CAAC,KAAK,CAAC,eAAe,EAAE,KAAK,CAAC,CAAC;gBACtC,CAAC;aACD,CAAC;QACH,CAAC;QAED,OAAO,UAAU,CAAC;IACnB,CAAC;IAEO,MAAM,CAAC,KAAK,CAAC,SAAS,CAAC,OAA8B;QAC5D,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;YACpB,OAAO,OAAO,CAAC,MAAM,CAAC;QACvB,CAAC;QAED,OAAO,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC;IAChD,CAAC;CACD"}
|
package/dist/index.d.ts
CHANGED
|
@@ -1,9 +1,9 @@
|
|
|
1
|
-
import * as eventMigration from './event.migration';
|
|
2
|
-
export * from './knex.module';
|
|
3
|
-
export * from './knex.service';
|
|
4
|
-
export * from './external-config';
|
|
5
|
-
export * from './test-containers';
|
|
6
|
-
export * from './knex.repository';
|
|
7
|
-
export * from './event.knex.repository';
|
|
1
|
+
import * as eventMigration from './event.migration.js';
|
|
2
|
+
export * from './knex.module.js';
|
|
3
|
+
export * from './knex.service.js';
|
|
4
|
+
export * from './external-config.js';
|
|
5
|
+
export * from './test-containers/index.js';
|
|
6
|
+
export * from './knex.repository.js';
|
|
7
|
+
export * from './event.knex.repository.js';
|
|
8
8
|
export { eventMigration };
|
|
9
9
|
//# sourceMappingURL=index.d.ts.map
|
package/dist/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,cAAc,MAAM,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,cAAc,MAAM,sBAAsB,CAAC;AAEvD,cAAc,kBAAkB,CAAC;AACjC,cAAc,mBAAmB,CAAC;AAClC,cAAc,sBAAsB,CAAC;AACrC,cAAc,4BAA4B,CAAC;AAE3C,cAAc,sBAAsB,CAAC;AACrC,cAAc,4BAA4B,CAAC;AAE3C,OAAO,EAAE,cAAc,EAAE,CAAC"}
|
package/dist/index.js
CHANGED
|
@@ -1,13 +1,9 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
tslib_1.__exportStar(require("./external-config"), exports);
|
|
10
|
-
tslib_1.__exportStar(require("./test-containers"), exports);
|
|
11
|
-
tslib_1.__exportStar(require("./knex.repository"), exports);
|
|
12
|
-
tslib_1.__exportStar(require("./event.knex.repository"), exports);
|
|
1
|
+
import * as eventMigration from './event.migration.js';
|
|
2
|
+
export * from './knex.module.js';
|
|
3
|
+
export * from './knex.service.js';
|
|
4
|
+
export * from './external-config.js';
|
|
5
|
+
export * from './test-containers/index.js';
|
|
6
|
+
export * from './knex.repository.js';
|
|
7
|
+
export * from './event.knex.repository.js';
|
|
8
|
+
export { eventMigration };
|
|
13
9
|
//# sourceMappingURL=index.js.map
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,cAAc,MAAM,sBAAsB,CAAC;AAEvD,cAAc,kBAAkB,CAAC;AACjC,cAAc,mBAAmB,CAAC;AAClC,cAAc,sBAAsB,CAAC;AACrC,cAAc,4BAA4B,CAAC;AAE3C,cAAc,sBAAsB,CAAC;AACrC,cAAc,4BAA4B,CAAC;AAE3C,OAAO,EAAE,cAAc,EAAE,CAAC"}
|
package/dist/knex.config.d.ts
CHANGED
|
@@ -8,11 +8,11 @@ export declare const KNEX_CONFIG_SCHEMA: zod.ZodObject<{
|
|
|
8
8
|
migrations: zod.ZodObject<{
|
|
9
9
|
path: zod.ZodString;
|
|
10
10
|
allowTypescript: zod.ZodOptional<zod.ZodBoolean>;
|
|
11
|
-
}, zod.core.$strip>;
|
|
11
|
+
}, zod.z.core.$strip>;
|
|
12
12
|
seeds: zod.ZodObject<{
|
|
13
13
|
path: zod.ZodString;
|
|
14
|
-
}, zod.core.$strip>;
|
|
15
|
-
}, zod.core.$strip>;
|
|
14
|
+
}, zod.z.core.$strip>;
|
|
15
|
+
}, zod.z.core.$strip>;
|
|
16
16
|
declare const KnexConfig_base: import("@hg-ts/validation").ZodDto<{
|
|
17
17
|
host: string;
|
|
18
18
|
port: number;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"knex.config.d.ts","sourceRoot":"","sources":["../src/knex.config.ts"],"names":[],"mappings":"AAAA,OAAO,GAAG,MAAM,mBAAmB,CAAC;AAEpC,eAAO,MAAM,kBAAkB;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"knex.config.d.ts","sourceRoot":"","sources":["../src/knex.config.ts"],"names":[],"mappings":"AAAA,OAAO,GAAG,MAAM,mBAAmB,CAAC;AAEpC,eAAO,MAAM,kBAAkB;;;;;;;;;;;;;qBAW7B,CAAC;;;;;;;;;;;;;;;AAEH,qBAAa,UAAW,SAAQ,eAA4B;CAAG"}
|
package/dist/knex.config.js
CHANGED
|
@@ -1,21 +1,16 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
password: validation_1.default.string().enforceEnv('PG_PASSWORD'),
|
|
12
|
-
migrations: validation_1.default.object({
|
|
13
|
-
path: validation_1.default.string(),
|
|
14
|
-
allowTypescript: validation_1.default.boolean().optional(),
|
|
1
|
+
import zod from '@hg-ts/validation';
|
|
2
|
+
export const KNEX_CONFIG_SCHEMA = zod.object({
|
|
3
|
+
host: zod.string().enforceEnv('PG_HOST'),
|
|
4
|
+
port: zod.number().positive().int(),
|
|
5
|
+
user: zod.string().enforceEnv('PG_USER'),
|
|
6
|
+
database: zod.string().enforceEnv('PG_DATABASE'),
|
|
7
|
+
password: zod.string().enforceEnv('PG_PASSWORD'),
|
|
8
|
+
migrations: zod.object({
|
|
9
|
+
path: zod.string(),
|
|
10
|
+
allowTypescript: zod.boolean().optional(),
|
|
15
11
|
}),
|
|
16
|
-
seeds:
|
|
12
|
+
seeds: zod.object({ path: zod.string() }),
|
|
17
13
|
});
|
|
18
|
-
class KnexConfig extends
|
|
14
|
+
export class KnexConfig extends KNEX_CONFIG_SCHEMA.toClass() {
|
|
19
15
|
}
|
|
20
|
-
exports.KnexConfig = KnexConfig;
|
|
21
16
|
//# sourceMappingURL=knex.config.js.map
|
package/dist/knex.config.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"knex.config.js","sourceRoot":"","sources":["../src/knex.config.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"knex.config.js","sourceRoot":"","sources":["../src/knex.config.ts"],"names":[],"mappings":"AAAA,OAAO,GAAG,MAAM,mBAAmB,CAAC;AAEpC,MAAM,CAAC,MAAM,kBAAkB,GAAG,GAAG,CAAC,MAAM,CAAC;IAC5C,IAAI,EAAE,GAAG,CAAC,MAAM,EAAE,CAAC,UAAU,CAAC,SAAS,CAAC;IACxC,IAAI,EAAE,GAAG,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE,CAAC,GAAG,EAAE;IACnC,IAAI,EAAE,GAAG,CAAC,MAAM,EAAE,CAAC,UAAU,CAAC,SAAS,CAAC;IACxC,QAAQ,EAAE,GAAG,CAAC,MAAM,EAAE,CAAC,UAAU,CAAC,aAAa,CAAC;IAChD,QAAQ,EAAE,GAAG,CAAC,MAAM,EAAE,CAAC,UAAU,CAAC,aAAa,CAAC;IAChD,UAAU,EAAE,GAAG,CAAC,MAAM,CAAC;QACtB,IAAI,EAAE,GAAG,CAAC,MAAM,EAAE;QAClB,eAAe,EAAE,GAAG,CAAC,OAAO,EAAE,CAAC,QAAQ,EAAE;KACzC,CAAC;IACF,KAAK,EAAE,GAAG,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,GAAG,CAAC,MAAM,EAAE,EAAE,CAAC;CACzC,CAAC,CAAC;AAEH,MAAM,OAAO,UAAW,SAAQ,kBAAkB,CAAC,OAAO,EAAE;CAAG"}
|
package/dist/knex.module.js
CHANGED
|
@@ -1,28 +1,25 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
const common_1 = require("@nestjs/common");
|
|
7
|
-
const knex_config_1 = require("./knex.config");
|
|
8
|
-
const knex_service_1 = require("./knex.service");
|
|
1
|
+
import { __decorate } from "tslib";
|
|
2
|
+
import { ConfigLoader } from '@hg-ts/config-loader';
|
|
3
|
+
import { Global, Module, } from '@nestjs/common';
|
|
4
|
+
import { KnexConfig } from './knex.config.js';
|
|
5
|
+
import { KnexService } from './knex.service.js';
|
|
9
6
|
let KnexModule = class KnexModule {
|
|
10
7
|
};
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
(
|
|
14
|
-
(0, common_1.Module)({
|
|
8
|
+
KnexModule = __decorate([
|
|
9
|
+
Global(),
|
|
10
|
+
Module({
|
|
15
11
|
providers: [
|
|
16
|
-
|
|
12
|
+
KnexService,
|
|
17
13
|
{
|
|
18
|
-
provide:
|
|
14
|
+
provide: KnexConfig,
|
|
19
15
|
async useFactory(configLoader) {
|
|
20
|
-
return configLoader.load(
|
|
16
|
+
return configLoader.load(KnexConfig, 'knex');
|
|
21
17
|
},
|
|
22
|
-
inject: [
|
|
18
|
+
inject: [ConfigLoader],
|
|
23
19
|
},
|
|
24
20
|
],
|
|
25
|
-
exports: [
|
|
21
|
+
exports: [KnexService, KnexConfig],
|
|
26
22
|
})
|
|
27
23
|
], KnexModule);
|
|
24
|
+
export { KnexModule };
|
|
28
25
|
//# sourceMappingURL=knex.module.js.map
|
package/dist/knex.module.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"knex.module.js","sourceRoot":"","sources":["../src/knex.module.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"knex.module.js","sourceRoot":"","sources":["../src/knex.module.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAEpD,OAAO,EACN,MAAM,EACN,MAAM,GACN,MAAM,gBAAgB,CAAC;AAExB,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAgBzC,IAAM,UAAU,GAAhB,MAAM,UAAU;CAAG,CAAA;AAAb,UAAU;IAdtB,MAAM,EAAE;IACR,MAAM,CAAC;QACP,SAAS,EAAE;YACV,WAAW;YACX;gBACC,OAAO,EAAE,UAAU;gBACnB,KAAK,CAAC,UAAU,CAAC,YAA0B;oBAC1C,OAAO,YAAY,CAAC,IAAI,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC;gBAC9C,CAAC;gBACD,MAAM,EAAE,CAAC,YAAY,CAAC;aACtB;SACD;QACD,OAAO,EAAE,CAAC,WAAW,EAAE,UAAU,CAAC;KAClC,CAAC;GACW,UAAU,CAAG"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { BaseAggregate } from '@hg-ts/domain';
|
|
2
2
|
import { BaseFindOptions, BaseRepository } from '@hg-ts/repository';
|
|
3
|
-
import { KnexService } from './knex.service';
|
|
3
|
+
import { KnexService } from './knex.service.js';
|
|
4
4
|
export declare abstract class KnexRepository<Aggregate extends BaseAggregate<any>, FindOptions extends BaseFindOptions<Aggregate> = BaseFindOptions<Aggregate>> extends BaseRepository<Aggregate, FindOptions> {
|
|
5
5
|
protected readonly knex: KnexService;
|
|
6
6
|
clear(): Promise<void>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"knex.repository.d.ts","sourceRoot":"","sources":["../src/knex.repository.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAE9C,OAAO,EACN,eAAe,EACf,cAAc,EACd,MAAM,mBAAmB,CAAC;AAI3B,OAAO,EAAE,WAAW,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"knex.repository.d.ts","sourceRoot":"","sources":["../src/knex.repository.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAE9C,OAAO,EACN,eAAe,EACf,cAAc,EACd,MAAM,mBAAmB,CAAC;AAI3B,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAEhD,8BAAsB,cAAc,CACnC,SAAS,SAAS,aAAa,CAAC,GAAG,CAAC,EACpC,WAAW,SAAS,eAAe,CAAC,SAAS,CAAC,GAAG,eAAe,CAAC,SAAS,CAAC,CAC1E,SAAQ,cAAc,CAAC,SAAS,EAAE,WAAW,CAAC;IAE/C,SAAS,CAAC,QAAQ,CAAC,IAAI,EAAE,WAAW,CAAC;IAExB,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;CAGnC"}
|
package/dist/knex.repository.js
CHANGED
|
@@ -1,20 +1,16 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
const common_1 = require("@nestjs/common");
|
|
8
|
-
const knex_service_1 = require("./knex.service");
|
|
9
|
-
class KnexRepository extends repository_1.BaseRepository {
|
|
1
|
+
import { __decorate, __metadata } from "tslib";
|
|
2
|
+
import { WillNeverHappenedException } from '@hg-ts/exception';
|
|
3
|
+
import { BaseRepository, } from '@hg-ts/repository';
|
|
4
|
+
import { Inject } from '@nestjs/common';
|
|
5
|
+
import { KnexService } from './knex.service.js';
|
|
6
|
+
export class KnexRepository extends BaseRepository {
|
|
10
7
|
knex;
|
|
11
8
|
async clear() {
|
|
12
|
-
throw new
|
|
9
|
+
throw new WillNeverHappenedException('Knex repository cannot be cleared');
|
|
13
10
|
}
|
|
14
11
|
}
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
(
|
|
18
|
-
tslib_1.__metadata("design:type", knex_service_1.KnexService)
|
|
12
|
+
__decorate([
|
|
13
|
+
Inject(),
|
|
14
|
+
__metadata("design:type", KnexService)
|
|
19
15
|
], KnexRepository.prototype, "knex", void 0);
|
|
20
16
|
//# sourceMappingURL=knex.repository.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"knex.repository.js","sourceRoot":"","sources":["../src/knex.repository.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"knex.repository.js","sourceRoot":"","sources":["../src/knex.repository.ts"],"names":[],"mappings":";AACA,OAAO,EAAE,0BAA0B,EAAE,MAAM,kBAAkB,CAAC;AAC9D,OAAO,EAEN,cAAc,GACd,MAAM,mBAAmB,CAAC;AAE3B,OAAO,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAC;AAExC,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAEhD,MAAM,OAAgB,cAGpB,SAAQ,cAAsC;IAE5B,IAAI,CAAc;IAE9B,KAAK,CAAC,KAAK;QACjB,MAAM,IAAI,0BAA0B,CAAC,mCAAmC,CAAC,CAAC;IAC3E,CAAC;CACD;AALmB;IADlB,MAAM,EAAE;8BACgB,WAAW;4CAAC"}
|
package/dist/knex.service.js
CHANGED
|
@@ -1,20 +1,17 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
const external_config_1 = require("./external-config");
|
|
11
|
-
const knex_config_1 = require("./knex.config");
|
|
12
|
-
class KnexService {
|
|
1
|
+
import { __decorate, __metadata } from "tslib";
|
|
2
|
+
import { AsyncContextProvider } from '@hg-ts/async-context';
|
|
3
|
+
import { ExecutionMode } from '@hg-ts/execution-mode';
|
|
4
|
+
import { Logger } from '@hg-ts/logger';
|
|
5
|
+
import { Inject, } from '@nestjs/common';
|
|
6
|
+
import knex from 'knex';
|
|
7
|
+
import { ExternalConfig } from './external-config.js';
|
|
8
|
+
import { KnexConfig } from './knex.config.js';
|
|
9
|
+
export class KnexService {
|
|
13
10
|
config;
|
|
14
11
|
logger;
|
|
15
12
|
executionMode;
|
|
16
13
|
initHook = null;
|
|
17
|
-
transactionStorage = new
|
|
14
|
+
transactionStorage = new AsyncContextProvider();
|
|
18
15
|
connection;
|
|
19
16
|
async getReplicaTrx() {
|
|
20
17
|
const { replica } = this.transactionStorage.getOrFail();
|
|
@@ -45,12 +42,12 @@ class KnexService {
|
|
|
45
42
|
}
|
|
46
43
|
async internalInit() {
|
|
47
44
|
this.logger.setContext('knex');
|
|
48
|
-
const config = await
|
|
45
|
+
const config = await ExternalConfig.build({
|
|
49
46
|
config: this.config,
|
|
50
47
|
logger: this.logger,
|
|
51
48
|
executionMode: this.executionMode,
|
|
52
49
|
});
|
|
53
|
-
this.connection = (
|
|
50
|
+
this.connection = knex(config);
|
|
54
51
|
}
|
|
55
52
|
async getKnexTransactionProvider() {
|
|
56
53
|
await this.onModuleInit();
|
|
@@ -84,17 +81,16 @@ class KnexService {
|
|
|
84
81
|
}
|
|
85
82
|
}
|
|
86
83
|
}
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
(
|
|
90
|
-
tslib_1.__metadata("design:type", knex_config_1.KnexConfig)
|
|
84
|
+
__decorate([
|
|
85
|
+
Inject(),
|
|
86
|
+
__metadata("design:type", KnexConfig)
|
|
91
87
|
], KnexService.prototype, "config", void 0);
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
88
|
+
__decorate([
|
|
89
|
+
Inject(),
|
|
90
|
+
__metadata("design:type", Logger)
|
|
95
91
|
], KnexService.prototype, "logger", void 0);
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
92
|
+
__decorate([
|
|
93
|
+
Inject(),
|
|
94
|
+
__metadata("design:type", ExecutionMode)
|
|
99
95
|
], KnexService.prototype, "executionMode", void 0);
|
|
100
96
|
//# sourceMappingURL=knex.service.js.map
|
package/dist/knex.service.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"knex.service.js","sourceRoot":"","sources":["../src/knex.service.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"knex.service.js","sourceRoot":"","sources":["../src/knex.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export * from './postgres-testcontainer.module';
|
|
1
|
+
export * from './postgres-testcontainer.module.js';
|
|
2
2
|
//# sourceMappingURL=index.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/test-containers/index.ts"],"names":[],"mappings":"AAAA,cAAc,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/test-containers/index.ts"],"names":[],"mappings":"AAAA,cAAc,oCAAoC,CAAC"}
|
|
@@ -1,5 +1,2 @@
|
|
|
1
|
-
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
const tslib_1 = require("tslib");
|
|
4
|
-
tslib_1.__exportStar(require("./postgres-testcontainer.module"), exports);
|
|
1
|
+
export * from './postgres-testcontainer.module.js';
|
|
5
2
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/test-containers/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/test-containers/index.ts"],"names":[],"mappings":"AAAA,cAAc,oCAAoC,CAAC"}
|
|
@@ -1,15 +1,12 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
const common_1 = require("@nestjs/common");
|
|
6
|
-
const knex_module_1 = require("../knex.module");
|
|
7
|
-
const postgres_testcontainer_service_1 = require("./postgres-testcontainer.service");
|
|
1
|
+
import { __decorate } from "tslib";
|
|
2
|
+
import { Global, Module, } from '@nestjs/common';
|
|
3
|
+
import { KnexModule } from '../knex.module.js';
|
|
4
|
+
import { PostgresTestcontainerService } from './postgres-testcontainer.service.js';
|
|
8
5
|
let PostgresTestcontainerModule = class PostgresTestcontainerModule {
|
|
9
6
|
};
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
(
|
|
13
|
-
(0, common_1.Module)({ imports: [knex_module_1.KnexModule], providers: [postgres_testcontainer_service_1.PostgresTestcontainerService] })
|
|
7
|
+
PostgresTestcontainerModule = __decorate([
|
|
8
|
+
Global(),
|
|
9
|
+
Module({ imports: [KnexModule], providers: [PostgresTestcontainerService] })
|
|
14
10
|
], PostgresTestcontainerModule);
|
|
11
|
+
export { PostgresTestcontainerModule };
|
|
15
12
|
//# sourceMappingURL=postgres-testcontainer.module.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"postgres-testcontainer.module.js","sourceRoot":"","sources":["../../src/test-containers/postgres-testcontainer.module.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"postgres-testcontainer.module.js","sourceRoot":"","sources":["../../src/test-containers/postgres-testcontainer.module.ts"],"names":[],"mappings":";AAAA,OAAO,EACN,MAAM,EACN,MAAM,GACN,MAAM,gBAAgB,CAAC;AAExB,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAE/C,OAAO,EAAE,4BAA4B,EAAE,MAAM,qCAAqC,CAAC;AAI5E,IAAM,2BAA2B,GAAjC,MAAM,2BAA2B;CAAG,CAAA;AAA9B,2BAA2B;IAFvC,MAAM,EAAE;IACR,MAAM,CAAC,EAAE,OAAO,EAAE,CAAC,UAAU,CAAC,EAAE,SAAS,EAAE,CAAC,4BAA4B,CAAC,EAAE,CAAC;GAChE,2BAA2B,CAAG"}
|
|
@@ -1,12 +1,9 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
const knex_config_1 = require("../knex.config");
|
|
8
|
-
const knex_service_1 = require("../knex.service");
|
|
9
|
-
class PostgresTestcontainerService {
|
|
1
|
+
import { __decorate, __metadata } from "tslib";
|
|
2
|
+
import { Inject, } from '@nestjs/common';
|
|
3
|
+
import { PostgreSqlContainer, } from '@testcontainers/postgresql';
|
|
4
|
+
import { KnexConfig } from '../knex.config.js';
|
|
5
|
+
import { KnexService } from '../knex.service.js';
|
|
6
|
+
export class PostgresTestcontainerService {
|
|
10
7
|
config;
|
|
11
8
|
postgres;
|
|
12
9
|
container;
|
|
@@ -31,7 +28,7 @@ class PostgresTestcontainerService {
|
|
|
31
28
|
await this.stopContainer();
|
|
32
29
|
}
|
|
33
30
|
async startContainer() {
|
|
34
|
-
const container = new
|
|
31
|
+
const container = new PostgreSqlContainer('postgres')
|
|
35
32
|
.withDatabase(this.config.database)
|
|
36
33
|
.withUsername(this.config.user)
|
|
37
34
|
.withPassword(this.config.password)
|
|
@@ -42,21 +39,20 @@ class PostgresTestcontainerService {
|
|
|
42
39
|
await this.container.stop();
|
|
43
40
|
}
|
|
44
41
|
enrichClient() {
|
|
45
|
-
const originalInitHook =
|
|
42
|
+
const originalInitHook = KnexService.prototype.onModuleInit;
|
|
46
43
|
const self = this;
|
|
47
|
-
|
|
44
|
+
KnexService.prototype.onModuleInit = async function () {
|
|
48
45
|
await self.onModuleInit();
|
|
49
46
|
return originalInitHook.call(this);
|
|
50
47
|
};
|
|
51
48
|
}
|
|
52
49
|
}
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
(
|
|
56
|
-
tslib_1.__metadata("design:type", knex_config_1.KnexConfig)
|
|
50
|
+
__decorate([
|
|
51
|
+
Inject(),
|
|
52
|
+
__metadata("design:type", KnexConfig)
|
|
57
53
|
], PostgresTestcontainerService.prototype, "config", void 0);
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
54
|
+
__decorate([
|
|
55
|
+
Inject(),
|
|
56
|
+
__metadata("design:type", KnexService)
|
|
61
57
|
], PostgresTestcontainerService.prototype, "postgres", void 0);
|
|
62
58
|
//# sourceMappingURL=postgres-testcontainer.service.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"postgres-testcontainer.service.js","sourceRoot":"","sources":["../../src/test-containers/postgres-testcontainer.service.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"postgres-testcontainer.service.js","sourceRoot":"","sources":["../../src/test-containers/postgres-testcontainer.service.ts"],"names":[],"mappings":";AAAA,OAAO,EACN,MAAM,GAIN,MAAM,gBAAgB,CAAC;AAExB,OAAO,EACN,mBAAmB,GAEnB,MAAM,4BAA4B,CAAC;AAEpC,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAC/C,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAEjD,MAAM,OAAO,4BAA4B;IAEvB,MAAM,CAAa;IAEnB,QAAQ,CAAc;IAE/B,SAAS,CAA6B;IAEtC,WAAW,GAA4B,IAAI,CAAC;IAEpD;QACC,IAAI,CAAC,YAAY,EAAE,CAAC;IACrB,CAAC;IAEM,KAAK,CAAC,YAAY;QACxB,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC;YACvB,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,cAAc,EAAE,CAAC;QAC1C,CAAC;QAED,OAAO,IAAI,CAAC,WAAW,CAAC;IACzB,CAAC;IAEM,KAAK,CAAC,sBAAsB;QAClC,MAAM,IAAI,CAAC,QAAQ,CAAC,gBAAgB,CAAC,KAAK,IAAG,EAAE;YAC9C,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,YAAY,EAAE,CAAC;YAE/C,MAAM,GAAG,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC;YAC3B,MAAM,GAAG,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC;QACtB,CAAC,CAAC,CAAC;IACJ,CAAC;IAEM,KAAK,CAAC,eAAe;QAC3B,MAAM,IAAI,CAAC,aAAa,EAAE,CAAC;IAC5B,CAAC;IAEO,KAAK,CAAC,cAAc;QAC3B,MAAM,SAAS,GAAG,IAAI,mBAAmB,CAAC,UAAU,CAAC;aACnD,YAAY,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC;aAClC,YAAY,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC;aAC9B,YAAY,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC;aAClC,gBAAgB,CAAC,EAAE,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC;QAEhE,IAAI,CAAC,SAAS,GAAG,MAAM,SAAS,CAAC,KAAK,EAAE,CAAC;IAC1C,CAAC;IAEO,KAAK,CAAC,aAAa;QAC1B,MAAM,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,CAAC;IAC7B,CAAC;IAEO,YAAY;QAEnB,MAAM,gBAAgB,GAAG,WAAW,CAAC,SAAS,CAAC,YAAY,CAAC;QAE5D,MAAM,IAAI,GAAG,IAAI,CAAC;QAElB,WAAW,CAAC,SAAS,CAAC,YAAY,GAAG,KAAK;YACzC,MAAM,IAAI,CAAC,YAAY,EAAE,CAAC;YAC1B,OAAO,gBAAgB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACpC,CAAC,CAAC;IACH,CAAC;CACD;AA1DiB;IADhB,MAAM,EAAE;8BACgB,UAAU;4DAAC;AAEnB;IADhB,MAAM,EAAE;8BACkB,WAAW;8DAAC"}
|
package/package.json
CHANGED
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@hg-ts/knex",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.4.0",
|
|
4
4
|
"main": "dist/index.js",
|
|
5
|
+
"type": "module",
|
|
5
6
|
"exports": {
|
|
6
7
|
".": "./dist/index.js"
|
|
7
8
|
},
|
|
@@ -15,19 +16,19 @@
|
|
|
15
16
|
"lint:ts:fix": "lint-ts --fix"
|
|
16
17
|
},
|
|
17
18
|
"devDependencies": {
|
|
18
|
-
"@hg-ts-config/typescript": "0.
|
|
19
|
-
"@hg-ts/async-context": "0.
|
|
20
|
-
"@hg-ts/config-loader": "0.
|
|
21
|
-
"@hg-ts/domain": "0.
|
|
22
|
-
"@hg-ts/events": "0.
|
|
23
|
-
"@hg-ts/exception": "0.
|
|
24
|
-
"@hg-ts/execution-mode": "0.
|
|
25
|
-
"@hg-ts/linter": "0.
|
|
26
|
-
"@hg-ts/logger": "0.
|
|
27
|
-
"@hg-ts/repository": "0.
|
|
28
|
-
"@hg-ts/tests": "0.
|
|
29
|
-
"@hg-ts/types": "0.
|
|
30
|
-
"@hg-ts/validation": "0.
|
|
19
|
+
"@hg-ts-config/typescript": "0.4.0",
|
|
20
|
+
"@hg-ts/async-context": "0.4.0",
|
|
21
|
+
"@hg-ts/config-loader": "0.4.0",
|
|
22
|
+
"@hg-ts/domain": "0.4.0",
|
|
23
|
+
"@hg-ts/events": "0.4.0",
|
|
24
|
+
"@hg-ts/exception": "0.4.0",
|
|
25
|
+
"@hg-ts/execution-mode": "0.4.0",
|
|
26
|
+
"@hg-ts/linter": "0.4.0",
|
|
27
|
+
"@hg-ts/logger": "0.4.0",
|
|
28
|
+
"@hg-ts/repository": "0.4.0",
|
|
29
|
+
"@hg-ts/tests": "0.4.0",
|
|
30
|
+
"@hg-ts/types": "0.4.0",
|
|
31
|
+
"@hg-ts/validation": "0.4.0",
|
|
31
32
|
"@nestjs/common": "11.1.0",
|
|
32
33
|
"@types/node": "22.19.1",
|
|
33
34
|
"@types/pg": "^8",
|
|
@@ -40,15 +41,15 @@
|
|
|
40
41
|
"typescript": "5.7.3"
|
|
41
42
|
},
|
|
42
43
|
"peerDependencies": {
|
|
43
|
-
"@hg-ts/async-context": "0.
|
|
44
|
-
"@hg-ts/config-loader": "0.
|
|
45
|
-
"@hg-ts/domain": "0.
|
|
46
|
-
"@hg-ts/events": "0.
|
|
47
|
-
"@hg-ts/exception": "0.
|
|
48
|
-
"@hg-ts/execution-mode": "0.
|
|
49
|
-
"@hg-ts/logger": "0.
|
|
50
|
-
"@hg-ts/repository": "0.
|
|
51
|
-
"@hg-ts/validation": "0.
|
|
44
|
+
"@hg-ts/async-context": "0.4.0",
|
|
45
|
+
"@hg-ts/config-loader": "0.4.0",
|
|
46
|
+
"@hg-ts/domain": "0.4.0",
|
|
47
|
+
"@hg-ts/events": "0.4.0",
|
|
48
|
+
"@hg-ts/exception": "0.4.0",
|
|
49
|
+
"@hg-ts/execution-mode": "0.4.0",
|
|
50
|
+
"@hg-ts/logger": "0.4.0",
|
|
51
|
+
"@hg-ts/repository": "0.4.0",
|
|
52
|
+
"@hg-ts/validation": "0.4.0",
|
|
52
53
|
"@nestjs/common": "*",
|
|
53
54
|
"knex": ">=3.1.0",
|
|
54
55
|
"reflect-metadata": "*",
|
package/tsconfig.json
CHANGED