@etohq/test-utils 1.5.1-alpha.3 → 1.5.1-alpha.4
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/database.d.ts.map +1 -1
- package/dist/database.js +53 -16
- package/dist/database.js.map +1 -1
- package/dist/eto-test-runner-utils/bootstrap-app.d.ts.map +1 -1
- package/dist/eto-test-runner-utils/bootstrap-app.js +27 -3
- package/dist/eto-test-runner-utils/bootstrap-app.js.map +1 -1
- package/dist/eto-test-runner.d.ts +2 -1
- package/dist/eto-test-runner.d.ts.map +1 -1
- package/dist/init-modules.d.ts +3 -1
- package/dist/init-modules.d.ts.map +1 -1
- package/dist/init-modules.js +2 -1
- package/dist/init-modules.js.map +1 -1
- package/dist/jest.d.ts.map +1 -1
- package/dist/jest.js +20 -1
- package/dist/jest.js.map +1 -1
- package/dist/module-test-runner.d.ts +4 -1
- package/dist/module-test-runner.d.ts.map +1 -1
- package/dist/module-test-runner.js +63 -11
- package/dist/module-test-runner.js.map +1 -1
- package/package.json +4 -4
package/dist/database.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"database.d.ts","sourceRoot":"","sources":["../src/database.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgB,QAAQ,EAAE,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAA;
|
|
1
|
+
{"version":3,"file":"database.d.ts","sourceRoot":"","sources":["../src/database.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgB,QAAQ,EAAE,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAA;AA8CzF,wBAAgB,cAAc,CAAC,MAAM,CAAC,EAAE,MAAM,GAAG,MAAM,CAiBtD;AAED,wBAAgB,iBAAiB,CAAC,EAChC,gBAAgB,EAChB,gBAAgB,EAChB,SAAS,EACT,MAAM,GACP,EAAE;IACD,gBAAgB,EAAE,GAAG,EAAE,CAAA;IACvB,gBAAgB,CAAC,EAAE,MAAM,CAAA;IACzB,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,MAAM,CAAC,EAAE,MAAM,CAAA;CAChB,GAAG,OAAO,CAgBV;AAED,MAAM,WAAW,YAAY;IAC3B,gBAAgB,EAAE,GAAG,EAAE,CAAA;IACvB,gBAAgB,CAAC,EAAE,MAAM,CAAA;IACzB,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,SAAS,CAAC,EAAE,MAAM,CAAA;IAElB,GAAG,EAAE,QAAQ,GAAG,IAAI,CAAA;IACpB,OAAO,EAAE,gBAAgB,GAAG,IAAI,CAAA;IAEhC,aAAa,IAAI,OAAO,CAAC,IAAI,CAAC,CAAA;IAC9B,aAAa,IAAI,OAAO,CAAC,IAAI,CAAC,CAAA;IAC9B,UAAU,IAAI,gBAAgB,CAAA;IAC9B,WAAW,IAAI,gBAAgB,CAAA;IAC/B,MAAM,IAAI,QAAQ,CAAA;CACnB;AAED,wBAAgB,kBAAkB,CAAC,EACjC,gBAAgB,EAChB,gBAAgB,EAChB,SAAS,EACT,MAAM,GACP,EAAE;IACD,gBAAgB,EAAE,GAAG,EAAE,CAAA;IACvB,gBAAgB,CAAC,EAAE,MAAM,CAAA;IACzB,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,MAAM,CAAC,EAAE,MAAM,CAAA;CAChB,GAAG,YAAY,CAqHf;AAED,eAAO,MAAM,iBAAiB,QAAO,GA6FnC,CAAA"}
|
package/dist/database.js
CHANGED
|
@@ -7,20 +7,52 @@ exports.getMikroOrmWrapper = getMikroOrmWrapper;
|
|
|
7
7
|
const postgresql_1 = require("@mikro-orm/postgresql");
|
|
8
8
|
const pg_god_1 = require("pg-god");
|
|
9
9
|
const eto_test_runner_utils_1 = require("./eto-test-runner-utils");
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
10
|
+
function resolveDatabaseUrl() {
|
|
11
|
+
return (process.env.DATABASE_URL ??
|
|
12
|
+
process.env.ETO_DATABASE_URL);
|
|
13
|
+
}
|
|
14
|
+
function resolveDbCredentials() {
|
|
15
|
+
const databaseUrl = resolveDatabaseUrl();
|
|
16
|
+
if (databaseUrl) {
|
|
17
|
+
try {
|
|
18
|
+
const parsed = new URL(databaseUrl);
|
|
19
|
+
return {
|
|
20
|
+
host: parsed.host || "localhost",
|
|
21
|
+
user: decodeURIComponent(parsed.username || "postgres"),
|
|
22
|
+
password: decodeURIComponent(parsed.password || ""),
|
|
23
|
+
};
|
|
24
|
+
}
|
|
25
|
+
catch {
|
|
26
|
+
// fallback to legacy DB_* env vars
|
|
27
|
+
}
|
|
28
|
+
}
|
|
29
|
+
return {
|
|
30
|
+
host: process.env.DB_HOST ?? "localhost",
|
|
31
|
+
user: process.env.DB_USERNAME ?? "postgres",
|
|
32
|
+
password: process.env.DB_PASSWORD ?? "",
|
|
33
|
+
};
|
|
34
|
+
}
|
|
13
35
|
const pgGodCredentials = {
|
|
14
|
-
user:
|
|
15
|
-
password:
|
|
16
|
-
host:
|
|
36
|
+
user: resolveDbCredentials().user,
|
|
37
|
+
password: resolveDbCredentials().password,
|
|
38
|
+
host: resolveDbCredentials().host,
|
|
17
39
|
};
|
|
18
40
|
function getDatabaseURL(dbName) {
|
|
19
|
-
const
|
|
20
|
-
const
|
|
21
|
-
const DB_PASSWORD = process.env.DB_PASSWORD;
|
|
41
|
+
const resolvedDatabaseUrl = resolveDatabaseUrl();
|
|
42
|
+
const { host, user, password } = resolveDbCredentials();
|
|
22
43
|
const DB_NAME = dbName ?? process.env.DB_TEMP_NAME;
|
|
23
|
-
|
|
44
|
+
if (resolvedDatabaseUrl) {
|
|
45
|
+
try {
|
|
46
|
+
const parsed = new URL(resolvedDatabaseUrl);
|
|
47
|
+
parsed.pathname = `/${DB_NAME}`;
|
|
48
|
+
return parsed.toString();
|
|
49
|
+
}
|
|
50
|
+
catch {
|
|
51
|
+
// fallback to constructed URL below
|
|
52
|
+
}
|
|
53
|
+
}
|
|
54
|
+
// Keep an explicit password segment so downstream pg parsing always yields a string.
|
|
55
|
+
return `postgres://${user}:${password ?? ""}@${host}/${DB_NAME}`;
|
|
24
56
|
}
|
|
25
57
|
function getMikroOrmConfig({ mikroOrmEntities, pathToMigrations, clientUrl, schema, }) {
|
|
26
58
|
const DB_URL = clientUrl ?? getDatabaseURL();
|
|
@@ -82,13 +114,18 @@ function getMikroOrmWrapper({ mikroOrmEntities, pathToMigrations, clientUrl, sch
|
|
|
82
114
|
throw err;
|
|
83
115
|
}
|
|
84
116
|
await this.manager?.execute(`CREATE SCHEMA IF NOT EXISTS "${this.schema ?? "public"}";`);
|
|
85
|
-
|
|
86
|
-
.
|
|
87
|
-
.getPendingMigrations();
|
|
88
|
-
if (pendingMigrations && pendingMigrations.length > 0) {
|
|
89
|
-
await this.orm
|
|
117
|
+
if (this.pathToMigrations) {
|
|
118
|
+
const pendingMigrations = await this.orm
|
|
90
119
|
.getMigrator()
|
|
91
|
-
.
|
|
120
|
+
.getPendingMigrations();
|
|
121
|
+
if (pendingMigrations && pendingMigrations.length > 0) {
|
|
122
|
+
await this.orm
|
|
123
|
+
.getMigrator()
|
|
124
|
+
.up({ migrations: pendingMigrations.map((m) => m.name) });
|
|
125
|
+
}
|
|
126
|
+
else {
|
|
127
|
+
await this.orm.schema.refreshDatabase();
|
|
128
|
+
}
|
|
92
129
|
}
|
|
93
130
|
else {
|
|
94
131
|
await this.orm.schema.refreshDatabase();
|
package/dist/database.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"database.js","sourceRoot":"","sources":["../src/database.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"database.js","sourceRoot":"","sources":["../src/database.ts"],"names":[],"mappings":";;;AA8CA,wCAiBC;AAED,8CA0BC;AAkBD,gDA+HC;AA5OD,sDAAyF;AACzF,mCAAqD;AACrD,mEAAuD;AAQvD,SAAS,kBAAkB;IACzB,OAAO,CACL,OAAO,CAAC,GAAG,CAAC,YAAY;QACxB,OAAO,CAAC,GAAG,CAAC,gBAAgB,CAC7B,CAAA;AACH,CAAC;AAED,SAAS,oBAAoB;IAC3B,MAAM,WAAW,GAAG,kBAAkB,EAAE,CAAA;IAExC,IAAI,WAAW,EAAE,CAAC;QAChB,IAAI,CAAC;YACH,MAAM,MAAM,GAAG,IAAI,GAAG,CAAC,WAAW,CAAC,CAAA;YACnC,OAAO;gBACL,IAAI,EAAE,MAAM,CAAC,IAAI,IAAI,WAAW;gBAChC,IAAI,EAAE,kBAAkB,CAAC,MAAM,CAAC,QAAQ,IAAI,UAAU,CAAC;gBACvD,QAAQ,EAAE,kBAAkB,CAAC,MAAM,CAAC,QAAQ,IAAI,EAAE,CAAC;aACpD,CAAA;QACH,CAAC;QAAC,MAAM,CAAC;YACP,mCAAmC;QACrC,CAAC;IACH,CAAC;IAED,OAAO;QACL,IAAI,EAAE,OAAO,CAAC,GAAG,CAAC,OAAO,IAAI,WAAW;QACxC,IAAI,EAAE,OAAO,CAAC,GAAG,CAAC,WAAW,IAAI,UAAU;QAC3C,QAAQ,EAAE,OAAO,CAAC,GAAG,CAAC,WAAW,IAAI,EAAE;KACxC,CAAA;AACH,CAAC;AAED,MAAM,gBAAgB,GAAG;IACvB,IAAI,EAAE,oBAAoB,EAAE,CAAC,IAAI;IACjC,QAAQ,EAAE,oBAAoB,EAAE,CAAC,QAAQ;IACzC,IAAI,EAAE,oBAAoB,EAAE,CAAC,IAAI;CAClC,CAAA;AAED,SAAgB,cAAc,CAAC,MAAe;IAC5C,MAAM,mBAAmB,GAAG,kBAAkB,EAAE,CAAA;IAChD,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,QAAQ,EAAE,GAAG,oBAAoB,EAAE,CAAA;IACvD,MAAM,OAAO,GAAG,MAAM,IAAI,OAAO,CAAC,GAAG,CAAC,YAAY,CAAA;IAElD,IAAI,mBAAmB,EAAE,CAAC;QACxB,IAAI,CAAC;YACH,MAAM,MAAM,GAAG,IAAI,GAAG,CAAC,mBAAmB,CAAC,CAAA;YAC3C,MAAM,CAAC,QAAQ,GAAG,IAAI,OAAO,EAAE,CAAA;YAC/B,OAAO,MAAM,CAAC,QAAQ,EAAE,CAAA;QAC1B,CAAC;QAAC,MAAM,CAAC;YACP,oCAAoC;QACtC,CAAC;IACH,CAAC;IAED,qFAAqF;IACrF,OAAO,cAAc,IAAI,IAAI,QAAQ,IAAI,EAAE,IAAI,IAAI,IAAI,OAAO,EAAE,CAAA;AAClE,CAAC;AAED,SAAgB,iBAAiB,CAAC,EAChC,gBAAgB,EAChB,gBAAgB,EAChB,SAAS,EACT,MAAM,GAMP;IACC,MAAM,MAAM,GAAG,SAAS,IAAI,cAAc,EAAE,CAAA;IAE5C,OAAO,IAAA,yBAAY,EAAC;QAClB,SAAS,EAAE,MAAM;QACjB,QAAQ,EAAE,MAAM,CAAC,MAAM,CAAC,gBAAgB,CAAC;QACzC,MAAM,EAAE,MAAM,IAAI,OAAO,CAAC,GAAG,CAAC,aAAa;QAC3C,KAAK,EAAE,KAAK;QACZ,IAAI,EAAE;YACJ,GAAG,EAAE,CAAC;SACP;QACD,UAAU,EAAE;YACV,MAAM,EAAE,gBAAgB;YACxB,MAAM,EAAE,IAAI;SACb;KACF,CAAC,CAAA;AACJ,CAAC;AAkBD,SAAgB,kBAAkB,CAAC,EACjC,gBAAgB,EAChB,gBAAgB,EAChB,SAAS,EACT,MAAM,GAMP;IACC,OAAO;QACL,gBAAgB;QAChB,gBAAgB;QAChB,SAAS,EAAE,SAAS,IAAI,cAAc,EAAE;QACxC,MAAM,EAAE,MAAM,IAAI,OAAO,CAAC,GAAG,CAAC,aAAa;QAE3C,GAAG,EAAE,IAAI;QACT,OAAO,EAAE,IAAI;QAEb,UAAU;YACR,IAAI,IAAI,CAAC,OAAO,KAAK,IAAI,EAAE,CAAC;gBAC1B,MAAM,IAAI,KAAK,CAAC,8BAA8B,CAAC,CAAA;YACjD,CAAC;YAED,OAAO,IAAI,CAAC,OAAO,CAAA;QACrB,CAAC;QAED,WAAW;YACT,IAAI,IAAI,CAAC,OAAO,KAAK,IAAI,EAAE,CAAC;gBAC1B,MAAM,IAAI,KAAK,CAAC,8BAA8B,CAAC,CAAA;YACjD,CAAC;YAED,OAAO,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,CAAA;QAC5B,CAAC;QAED,MAAM;YACJ,IAAI,IAAI,CAAC,GAAG,KAAK,IAAI,EAAE,CAAC;gBACtB,MAAM,IAAI,KAAK,CAAC,0BAA0B,CAAC,CAAA;YAC7C,CAAC;YAED,OAAO,IAAI,CAAC,GAAG,CAAA;QACjB,CAAC;QAED,KAAK,CAAC,aAAa;YACjB,MAAM,SAAS,GAAG,iBAAiB,CAAC;gBAClC,gBAAgB,EAAE,IAAI,CAAC,gBAAgB;gBACvC,gBAAgB,EAAE,IAAI,CAAC,gBAAgB;gBACvC,SAAS,EAAE,IAAI,CAAC,SAAS;gBACzB,MAAM,EAAE,IAAI,CAAC,MAAM;aACpB,CAAC,CAAA;YAEF,IAAI,CAAC;gBACL,IAAI,CAAC,GAAG,GAAG,MAAM,qBAAQ,CAAC,IAAI,CAAC,SAAS,CAAC,CAAA;gBACzC,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,GAAG,CAAC,EAAE,CAAA;gBAE1B,IAAI,CAAC;oBACH,MAAM,IAAI,CAAC,GAAG,CAAC,kBAAkB,EAAE,CAAC,cAAc,EAAE,CAAA;gBACtD,CAAC;gBAAC,OAAO,GAAG,EAAE,CAAC;oBACX,OAAO,CAAC,KAAK,CAAC,0BAA0B,EAAE,GAAG,CAAC,CAAA;oBAC9C,MAAM,GAAG,CAAA;gBACb,CAAC;gBAED,MAAM,IAAI,CAAC,OAAO,EAAE,OAAO,CACzB,gCAAgC,IAAI,CAAC,MAAM,IAAI,QAAQ,IAAI,CAC5D,CAAA;gBAED,IAAI,IAAI,CAAC,gBAAgB,EAAE,CAAC;oBAC1B,MAAM,iBAAiB,GAAG,MAAM,IAAI,CAAC,GAAG;yBACrC,WAAW,EAAE;yBACb,oBAAoB,EAAE,CAAA;oBAEzB,IAAI,iBAAiB,IAAI,iBAAiB,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;wBACtD,MAAM,IAAI,CAAC,GAAG;6BACX,WAAW,EAAE;6BACb,EAAE,CAAC,EAAE,UAAU,EAAE,iBAAiB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAK,CAAC,EAAE,CAAC,CAAA;oBAC9D,CAAC;yBAAM,CAAC;wBACN,MAAM,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,eAAe,EAAE,CAAA;oBACzC,CAAC;gBACH,CAAC;qBAAM,CAAC;oBACN,MAAM,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,eAAe,EAAE,CAAA;gBACzC,CAAC;YACD,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,IAAI,IAAI,CAAC,GAAG,EAAE,CAAC;oBACb,IAAI,CAAC;wBACH,MAAM,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,CAAA;oBACxB,CAAC;oBAAC,OAAO,UAAU,EAAE,CAAC;wBACpB,OAAO,CAAC,KAAK,CAAC,oBAAoB,EAAE,UAAU,CAAC,CAAA;oBACjD,CAAC;gBACH,CAAC;gBACD,IAAI,CAAC,GAAG,GAAG,IAAI,CAAA;gBACf,IAAI,CAAC,OAAO,GAAG,IAAI,CAAA;gBACnB,MAAM,KAAK,CAAA;YACb,CAAC;QACH,CAAC;QAED,KAAK,CAAC,aAAa;YACjB,IAAI,IAAI,CAAC,GAAG,KAAK,IAAI,EAAE,CAAC;gBACtB,MAAM,IAAI,KAAK,CAAC,oBAAoB,CAAC,CAAA;YACvC,CAAC;YAED,IAAI,CAAC;gBACL,MAAM,IAAI,CAAC,OAAO,EAAE,OAAO,CACzB,0BAA0B,IAAI,CAAC,MAAM,IAAI,QAAQ,YAAY,CAC9D,CAAA;gBAED,MAAM,IAAI,CAAC,OAAO,EAAE,OAAO,CACzB,gCAAgC,IAAI,CAAC,MAAM,IAAI,QAAQ,IAAI,CAC5D,CAAA;gBAEC,MAAM,YAAY,GAAG,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,CAAA;gBAErC,MAAM,IAAA,qCAAa,EAAC,YAAY,CAAC,CAAA;YACnC,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,OAAO,CAAC,KAAK,CAAC,0BAA0B,EAAE,KAAK,CAAC,CAAA;gBAClD,IAAI,CAAC;oBACD,MAAM,IAAI,CAAC,GAAG,EAAE,KAAK,EAAE,CAAA;gBACzB,CAAC;gBAAC,OAAO,UAAU,EAAE,CAAC;oBACpB,OAAO,CAAC,KAAK,CAAC,gCAAgC,EAAE,UAAU,CAAC,CAAA;gBAC7D,CAAC;gBACD,MAAM,KAAK,CAAA;YACb,CAAC;oBAAS,CAAC;gBACX,IAAI,CAAC,GAAG,GAAG,IAAI,CAAA;gBACf,IAAI,CAAC,OAAO,GAAG,IAAI,CAAA;YACnB,CAAC;QACH,CAAC;KACF,CAAA;AACH,CAAC;AAEM,MAAM,iBAAiB,GAAG,GAAQ,EAAE,CAAC,CAAC;IAC3C,aAAa,EAAE,IAAI;IAEnB,MAAM,EAAE,KAAK,WAAW,MAAc;QACpC,IAAI,CAAC;YACL,MAAM,IAAA,uBAAc,EAClB,EAAE,YAAY,EAAE,MAAM,EAAE,YAAY,EAAE,KAAK,EAAE,EAC7C,gBAAgB,CACjB,CAAA;QACD,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,OAAO,CAAC,KAAK,CAAC,0BAA0B,EAAE,KAAK,CAAC,CAAA;YAChD,MAAM,KAAK,CAAA;QACb,CAAC;IACH,CAAC;IAED,QAAQ,EAAE,KAAK,WAAW,EAAE,MAAM,KAA0B,EAAE;QAC5D,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,CAAC;YACxB,OAAM;QACR,CAAC;QAED,IAAI,CAAC;YACL,MAAM,WAAW,GAAG,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,CAAA;YACnE,MAAM,KAAK,QAAQ,CAAA;YAEnB,MAAM,WAAW,CAAC,2CAA2C,CAAC,CAAA;YAC9D,MAAM,EAAE,IAAI,EAAE,UAAU,EAAE,GAAG,MAAM,WAAW,CAAC;;oEAEiB,MAAM,IAAI,CAAC,CAAA;YAEzE,MAAM,wBAAwB,GAAG,MAAM,CAAA;YACvC,MAAM,mBAAmB,GAAG,CAAC,YAAY,EAAE,gBAAgB,CAAC,CAAA;YAC5D,IAAI,cAAc,GAAG,KAAK,CAAA;YAE5B,KAAK,MAAM,EAAE,UAAU,EAAE,IAAI,UAAU,EAAE,CAAC;gBACtC,IAAI,mBAAmB,CAAC,QAAQ,CAAC,UAAU,CAAC,EAAE,CAAC;oBAC7C,cAAc,GAAG,IAAI,CAAA;gBACvB,CAAC;gBAED,IACE,UAAU,CAAC,UAAU,CAAC,wBAAwB,CAAC;oBAC/C,mBAAmB,CAAC,QAAQ,CAAC,UAAU,CAAC,EACxC,CAAC;oBACD,SAAQ;gBACV,CAAC;gBAED,MAAM,WAAW,CAAC,eAAe,MAAM,KAAK,UAAU,IAAI,CAAC,CAAA;YAC7D,CAAC;YAED,IAAI,cAAc,EAAE,CAAC;gBACnB,MAAM,WAAW,CAAC,kBAAkB,MAAM,cAAc,CAAC,CAAA;gBACzD,MAAM,WAAW,CAAC,kBAAkB,MAAM,kBAAkB,CAAC,CAAA;YACjE,CAAC;YAED,MAAM,WAAW,CAAC,0CAA0C,CAAC,CAAA;QAC7D,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,OAAO,CAAC,KAAK,CAAC,iCAAiC,EAAE,KAAK,CAAC,CAAA;YACvD,MAAM,KAAK,CAAA;QACb,CAAC;IACH,CAAC;IAED,QAAQ,EAAE,KAAK,WAAW,MAAc;QACtC,IAAI,CAAC;YACH,MAAM,eAAe,GAAmB,EAAE,CAAA;YAE1C,IAAI,IAAI,CAAC,aAAa,EAAE,OAAO,EAAE,CAAC;gBAChC,eAAe,CAAC,IAAI,CAClB,IAAA,qCAAa,EAAC,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC,CACpD,CAAA;YACH,CAAC;YAED,IAAI,IAAI,CAAC,aAAa,EAAE,CAAC;gBACvB,eAAe,CAAC,IAAI,CAAC,IAAA,qCAAa,EAAC,IAAI,CAAC,aAAa,CAAC,OAAO,EAAE,CAAC,CAAC,CAAA;YACnE,CAAC;YAED,MAAM,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC,CAAA;YAEpC,OAAO,MAAM,IAAA,qBAAY,EACvB,EAAE,YAAY,EAAE,MAAM,EAAE,eAAe,EAAE,KAAK,EAAE,EAChD,gBAAgB,CACjB,CAAA;QACD,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,OAAO,CAAC,KAAK,CAAC,iCAAiC,EAAE,KAAK,CAAC,CAAA;YACvD,IAAI,CAAC;gBACH,MAAM,IAAI,CAAC,aAAa,EAAE,OAAO,EAAE,OAAO,EAAE,CAAA;gBAC5C,MAAM,IAAI,CAAC,aAAa,EAAE,OAAO,EAAE,CAAA;YACrC,CAAC;YAAC,OAAO,YAAY,EAAE,CAAC;gBACtB,OAAO,CAAC,KAAK,CAAC,8BAA8B,EAAE,YAAY,CAAC,CAAA;YAC7D,CAAC;YACD,MAAM,KAAK,CAAA;QACb,CAAC;gBAAS,CAAC;YACT,IAAI,CAAC,aAAa,GAAG,IAAI,CAAA;QAC3B,CAAC;IACH,CAAC;CACF,CAAC,CAAA;AA7FW,QAAA,iBAAiB,qBA6F5B"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bootstrap-app.d.ts","sourceRoot":"","sources":["../../src/eto-test-runner-utils/bootstrap-app.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"bootstrap-app.d.ts","sourceRoot":"","sources":["../../src/eto-test-runner-utils/bootstrap-app.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAA;AAyDrD,wBAAsB,QAAQ,CAAC,EAC7B,GAAG,EACH,GAAQ,GACT,GAAE;IAAE,GAAG,CAAC,EAAE,MAAM,CAAC;IAAC,GAAG,CAAC,EAAE,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC,CAAA;CAAO,GAAG,OAAO,CAAC;IACzD,QAAQ,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAA;IAC7B,SAAS,EAAE,YAAY,CAAA;CACxB,CAAC,CAuBD"}
|
|
@@ -4,11 +4,33 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.startApp = startApp;
|
|
7
|
-
|
|
8
|
-
const get_port_1 = __importDefault(require("get-port"));
|
|
7
|
+
const node_net_1 = __importDefault(require("node:net"));
|
|
9
8
|
const path_1 = require("path");
|
|
10
9
|
const utils_1 = require("./utils");
|
|
11
10
|
const utils_2 = require("@etohq/framework/utils");
|
|
11
|
+
async function getAvailablePort() {
|
|
12
|
+
return await new Promise((resolvePort, reject) => {
|
|
13
|
+
const server = node_net_1.default.createServer();
|
|
14
|
+
server.once("error", (error) => {
|
|
15
|
+
reject(error);
|
|
16
|
+
});
|
|
17
|
+
server.listen(0, () => {
|
|
18
|
+
const address = server.address();
|
|
19
|
+
if (!address || typeof address === "string") {
|
|
20
|
+
server.close(() => reject(new Error("Failed to resolve an available port")));
|
|
21
|
+
return;
|
|
22
|
+
}
|
|
23
|
+
const { port } = address;
|
|
24
|
+
server.close((error) => {
|
|
25
|
+
if (error) {
|
|
26
|
+
reject(error);
|
|
27
|
+
return;
|
|
28
|
+
}
|
|
29
|
+
resolvePort(port);
|
|
30
|
+
});
|
|
31
|
+
});
|
|
32
|
+
});
|
|
33
|
+
}
|
|
12
34
|
// toodo refactor ... this will not work.
|
|
13
35
|
async function bootstrapApp({ cwd, env = {}, } = {}) {
|
|
14
36
|
(0, utils_1.applyEnvVarsToProcess)(env);
|
|
@@ -16,7 +38,9 @@ async function bootstrapApp({ cwd, env = {}, } = {}) {
|
|
|
16
38
|
const { container, shutdown } = await loaders({
|
|
17
39
|
directory: (0, path_1.resolve)(cwd || process.cwd()),
|
|
18
40
|
});
|
|
19
|
-
const PORT = process.env.PORT
|
|
41
|
+
const PORT = process.env.PORT
|
|
42
|
+
? parseInt(process.env.PORT)
|
|
43
|
+
: await getAvailablePort();
|
|
20
44
|
return {
|
|
21
45
|
shutdown,
|
|
22
46
|
container,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bootstrap-app.js","sourceRoot":"","sources":["../../src/eto-test-runner-utils/bootstrap-app.ts"],"names":[],"mappings":";;;;;
|
|
1
|
+
{"version":3,"file":"bootstrap-app.js","sourceRoot":"","sources":["../../src/eto-test-runner-utils/bootstrap-app.ts"],"names":[],"mappings":";;;;;AA2DA,4BA6BC;AAxFD,wDAA0B;AAC1B,+BAA8B;AAE9B,mCAA+C;AAC/C,kDAAmD;AAEnD,KAAK,UAAU,gBAAgB;IAC7B,OAAO,MAAM,IAAI,OAAO,CAAC,CAAC,WAAW,EAAE,MAAM,EAAE,EAAE;QAC/C,MAAM,MAAM,GAAG,kBAAG,CAAC,YAAY,EAAE,CAAA;QAEjC,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,KAAK,EAAE,EAAE;YAC7B,MAAM,CAAC,KAAK,CAAC,CAAA;QACf,CAAC,CAAC,CAAA;QAEF,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,GAAG,EAAE;YACpB,MAAM,OAAO,GAAG,MAAM,CAAC,OAAO,EAAE,CAAA;YAEhC,IAAI,CAAC,OAAO,IAAI,OAAO,OAAO,KAAK,QAAQ,EAAE,CAAC;gBAC5C,MAAM,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC,qCAAqC,CAAC,CAAC,CAAC,CAAA;gBAC5E,OAAM;YACR,CAAC;YAED,MAAM,EAAE,IAAI,EAAE,GAAG,OAAO,CAAA;YACxB,MAAM,CAAC,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE;gBACrB,IAAI,KAAK,EAAE,CAAC;oBACV,MAAM,CAAC,KAAK,CAAC,CAAA;oBACb,OAAM;gBACR,CAAC;gBAED,WAAW,CAAC,IAAI,CAAC,CAAA;YACnB,CAAC,CAAC,CAAA;QACJ,CAAC,CAAC,CAAA;IACJ,CAAC,CAAC,CAAA;AACJ,CAAC;AAED,0CAA0C;AAC1C,KAAK,UAAU,YAAY,CAAC,EAC1B,GAAG,EACH,GAAG,GAAG,EAAE,MACoC,EAAE;IAC9C,IAAA,6BAAqB,EAAC,GAAG,CAAC,CAAA;IAE1B,MAAM,OAAO,GAAG,OAAO,CAAC,0BAA0B,CAAC,CAAC,OAAO,CAAA;IAE3D,MAAM,EAAE,SAAS,EAAE,QAAQ,EAAE,GAAG,MAAM,OAAO,CAAC;QAC5C,SAAS,EAAE,IAAA,cAAO,EAAC,GAAG,IAAI,OAAO,CAAC,GAAG,EAAE,CAAC;KACzC,CAAC,CAAA;IAEF,MAAM,IAAI,GAAG,OAAO,CAAC,GAAG,CAAC,IAAI;QAC3B,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC;QAC5B,CAAC,CAAC,MAAM,gBAAgB,EAAE,CAAA;IAE5B,OAAO;QACL,QAAQ;QACR,SAAS;QACT,IAAI,EAAE,IAAI;KACX,CAAA;AACH,CAAC;AAEM,KAAK,UAAU,QAAQ,CAAC,EAC7B,GAAG,EACH,GAAG,GAAG,EAAE,MACoC,EAAE;IAI9C,MAAM,EACJ,SAAS,EACT,QAAQ,EAAE,WAAW,GACtB,GAAG,MAAM,YAAY,CAAC;QACrB,GAAG;QACH,GAAG;KACJ,CAAC,CAAA;IAGF,MAAM,QAAQ,GAAG,KAAK,IAAI,EAAE;QAC1B,MAAM,IAAA,kBAAU,EAAC,CAAC,WAAW,EAAE,CAAC,CAAC,CAAA;QAEjC,IAAI,OAAO,MAAM,KAAK,WAAW,IAAI,MAAM,EAAE,EAAE,EAAE,CAAC;YAChD,MAAM,CAAC,EAAE,EAAE,CAAA;QACb,CAAC;IACH,CAAC,CAAA;IAED,OAAO;QACL,QAAQ;QACR,SAAS;KACV,CAAA;AAEH,CAAC"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
|
|
1
|
+
type EtoAppOutput = any;
|
|
2
2
|
import { EtoContainer } from "@etohq/framework/types";
|
|
3
3
|
export interface EtoSuiteOptions {
|
|
4
4
|
dbConnection: any;
|
|
@@ -28,4 +28,5 @@ export declare function etoIntegrationTestRunner({ moduleName, dbName, etoConfig
|
|
|
28
28
|
inApp?: boolean;
|
|
29
29
|
testSuite: (options: EtoSuiteOptions) => void;
|
|
30
30
|
}): void;
|
|
31
|
+
export {};
|
|
31
32
|
//# sourceMappingURL=eto-test-runner.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"eto-test-runner.d.ts","sourceRoot":"","sources":["../src/eto-test-runner.ts"],"names":[],"mappings":"AAAA,
|
|
1
|
+
{"version":3,"file":"eto-test-runner.d.ts","sourceRoot":"","sources":["../src/eto-test-runner.ts"],"names":[],"mappings":"AAAA,KAAK,YAAY,GAAG,GAAG,CAAA;AAEvB,OAAO,EAAiB,YAAY,EAAE,MAAM,wBAAwB,CAAA;AAiBpE,MAAM,WAAW,eAAe;IAC9B,YAAY,EAAE,GAAG,CAAA;IACjB,YAAY,EAAE,MAAM,YAAY,CAAA;IAChC,GAAG,EAAE,GAAG,CAAA;IACR,OAAO,EAAE;QACP,MAAM,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAA;QACzC,QAAQ,EAAE,CAAC,OAAO,EAAE;YAAE,MAAM,CAAC,EAAE,MAAM,CAAA;SAAE,KAAK,OAAO,CAAC,IAAI,CAAC,CAAA;QACzD,QAAQ,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAA;KAC5C,CAAA;IACD,QAAQ,EAAE;QACR,MAAM,EAAE,MAAM,CAAA;QACd,MAAM,EAAE,MAAM,CAAA;QACd,SAAS,EAAE,MAAM,CAAA;KAClB,CAAA;IACD,SAAS,EAAE,MAAM,YAAY,CAAA;CAC9B;AAED,wBAAgB,wBAAwB,CAAC,EACvC,UAAU,EACV,MAAM,EACN,aAAa,EACb,MAAiB,EACjB,GAAQ,EACR,KAAa,EACb,KAAa,EACb,SAAS,GACV,EAAE;IACD,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,GAAG,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;IACzB,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,aAAa,CAAC,EAAE,MAAM,CAAA;IACtB,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,KAAK,CAAC,EAAE,OAAO,CAAA;IACf,KAAK,CAAC,EAAE,OAAO,CAAA;IACf,SAAS,EAAE,CAAC,OAAO,EAAE,eAAe,KAAK,IAAI,CAAA;CAC9C,QAmLA"}
|
package/dist/init-modules.d.ts
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { ExternalModuleDeclaration, InternalModuleDeclaration, ModuleJoinerConfig } from "@etohq/framework/types";
|
|
2
|
+
import type { RegisterModuleJoinerConfig } from "@etohq/framework/modules-sdk";
|
|
2
3
|
export interface InitModulesOptions {
|
|
3
4
|
injectedDependencies?: Record<string, unknown>;
|
|
4
5
|
databaseConfig: {
|
|
@@ -8,10 +9,11 @@ export interface InitModulesOptions {
|
|
|
8
9
|
modulesConfig: {
|
|
9
10
|
[key: string]: string | boolean | Partial<InternalModuleDeclaration | ExternalModuleDeclaration>;
|
|
10
11
|
};
|
|
12
|
+
linkModules?: RegisterModuleJoinerConfig | RegisterModuleJoinerConfig[];
|
|
11
13
|
joinerConfig?: ModuleJoinerConfig[];
|
|
12
14
|
preventConnectionDestroyWarning?: boolean;
|
|
13
15
|
}
|
|
14
|
-
export declare function initModules({ injectedDependencies, databaseConfig, modulesConfig, joinerConfig, preventConnectionDestroyWarning, }: InitModulesOptions): Promise<{
|
|
16
|
+
export declare function initModules({ injectedDependencies, databaseConfig, modulesConfig, linkModules, joinerConfig, preventConnectionDestroyWarning, }: InitModulesOptions): Promise<{
|
|
15
17
|
etoApp: any;
|
|
16
18
|
shutdown: () => Promise<void>;
|
|
17
19
|
}>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"init-modules.d.ts","sourceRoot":"","sources":["../src/init-modules.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,yBAAyB,EACzB,yBAAyB,EACzB,kBAAkB,EACnB,MAAM,wBAAwB,CAAA;
|
|
1
|
+
{"version":3,"file":"init-modules.d.ts","sourceRoot":"","sources":["../src/init-modules.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,yBAAyB,EACzB,yBAAyB,EACzB,kBAAkB,EACnB,MAAM,wBAAwB,CAAA;AAC/B,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,8BAA8B,CAAA;AAO9E,MAAM,WAAW,kBAAkB;IACjC,oBAAoB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;IAC9C,cAAc,EAAE;QACd,SAAS,EAAE,MAAM,CAAA;QACjB,MAAM,CAAC,EAAE,MAAM,CAAA;KAChB,CAAA;IACD,aAAa,EAAE;QACb,CAAC,GAAG,EAAE,MAAM,GACR,MAAM,GACN,OAAO,GACP,OAAO,CAAC,yBAAyB,GAAG,yBAAyB,CAAC,CAAA;KACnE,CAAA;IACD,WAAW,CAAC,EAAE,0BAA0B,GAAG,0BAA0B,EAAE,CAAA;IACvE,YAAY,CAAC,EAAE,kBAAkB,EAAE,CAAA;IACnC,+BAA+B,CAAC,EAAE,OAAO,CAAA;CAC1C;AAED,wBAAsB,WAAW,CAAC,EAChC,oBAAoB,EACpB,cAAc,EACd,aAAa,EACb,WAAW,EACX,YAAY,EACZ,+BAAuC,GACxC,EAAE,kBAAkB;;;GAmDpB"}
|
package/dist/init-modules.js
CHANGED
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.initModules = initModules;
|
|
4
4
|
const utils_1 = require("@etohq/framework/utils");
|
|
5
|
-
async function initModules({ injectedDependencies, databaseConfig, modulesConfig, joinerConfig, preventConnectionDestroyWarning = false, }) {
|
|
5
|
+
async function initModules({ injectedDependencies, databaseConfig, modulesConfig, linkModules, joinerConfig, preventConnectionDestroyWarning = false, }) {
|
|
6
6
|
const moduleSdkImports = require("@etohq/framework/modules-sdk");
|
|
7
7
|
injectedDependencies ??= {};
|
|
8
8
|
let sharedPgConnection = injectedDependencies?.[utils_1.ContainerRegistrationKeys.PG_CONNECTION];
|
|
@@ -17,6 +17,7 @@ async function initModules({ injectedDependencies, databaseConfig, modulesConfig
|
|
|
17
17
|
}
|
|
18
18
|
const etoApp = await moduleSdkImports.EtoApp({
|
|
19
19
|
modulesConfig,
|
|
20
|
+
linkModules,
|
|
20
21
|
servicesConfig: joinerConfig,
|
|
21
22
|
injectedDependencies,
|
|
22
23
|
});
|
package/dist/init-modules.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"init-modules.js","sourceRoot":"","sources":["../src/init-modules.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"init-modules.js","sourceRoot":"","sources":["../src/init-modules.ts"],"names":[],"mappings":";;AA6BA,kCA0DC;AAjFD,kDAI+B;AAmBxB,KAAK,UAAU,WAAW,CAAC,EAChC,oBAAoB,EACpB,cAAc,EACd,aAAa,EACb,WAAW,EACX,YAAY,EACZ,+BAA+B,GAAG,KAAK,GACpB;IACnB,MAAM,gBAAgB,GAAG,OAAO,CAAC,8BAA8B,CAAC,CAAA;IAEhE,oBAAoB,KAAK,EAAE,CAAA;IAE3B,IAAI,kBAAkB,GACpB,oBAAoB,EAAE,CAAC,iCAAyB,CAAC,aAAa,CAAC,CAAA;IAEjE,IAAI,oCAAoC,GAAG,CAAC,kBAAkB,CAAA;IAC9D,IAAI,CAAC,kBAAkB,EAAE,CAAC;QACxB,kBAAkB,GAAG,IAAA,0BAAkB,EAAC;YACtC,SAAS,EAAE,cAAc,CAAC,SAAS;YACnC,MAAM,EAAE,cAAc,CAAC,MAAM;SAC9B,CAAC,CAAA;QAEF,oBAAoB,CAAC,iCAAyB,CAAC,aAAa,CAAC;YAC3D,kBAAkB,CAAA;IACtB,CAAC;IAED,MAAM,MAAM,GAAG,MAAM,gBAAgB,CAAC,MAAM,CAAC;QAC3C,aAAa;QACb,WAAW;QACX,cAAc,EAAE,YAAY;QAC5B,oBAAoB;KACrB,CAAC,CAAA;IAEF,MAAM,MAAM,CAAC,kBAAkB,EAAE,CAAA;IAEjC,KAAK,UAAU,QAAQ;QACrB,IAAI,oCAAoC,EAAE,CAAC;YACzC,MAAM,MAAM,CAAC,4BAA4B,EAAE,CAAA;YAE3C,MAAM,IAAA,kBAAU,EAAC;gBACd,kBAA0B,CAAC,OAAO,EAAE,OAAO,EAAE;gBAC7C,kBAA0B,CAAC,OAAO,EAAE;gBACrC,MAAM,CAAC,qBAAqB,EAAE;aAC/B,CAAC,CAAA;QACJ,CAAC;aAAM,CAAC;YACN,IAAI,CAAC,+BAA+B,EAAE,CAAC;gBACrC,OAAO,CAAC,IAAI,CACV,4FAA4F,CAC7F,CAAA;YACH,CAAC;QACH,CAAC;QACD,gBAAgB,CAAC,SAAS,CAAC,cAAc,EAAE,CAAA;IAC7C,CAAC;IAED,OAAO;QACL,MAAM;QACN,QAAQ;KACT,CAAA;AACH,CAAC"}
|
package/dist/jest.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"jest.d.ts","sourceRoot":"","sources":["../src/jest.ts"],"names":[],"mappings":"AAEA,wBAAgB,wBAAwB,
|
|
1
|
+
{"version":3,"file":"jest.d.ts","sourceRoot":"","sources":["../src/jest.ts"],"names":[],"mappings":"AAEA,wBAAgB,wBAAwB,SAyCvC"}
|
package/dist/jest.js
CHANGED
|
@@ -3,15 +3,34 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.afterAllHookDropDatabase = afterAllHookDropDatabase;
|
|
4
4
|
const pg_god_1 = require("pg-god");
|
|
5
5
|
function afterAllHookDropDatabase() {
|
|
6
|
+
const databaseUrl = process.env.DATABASE_URL ?? process.env.ETO_DATABASE_URL;
|
|
6
7
|
const DB_HOST = process.env.DB_HOST ?? "localhost";
|
|
7
8
|
const DB_USERNAME = process.env.DB_USERNAME ?? "postgres";
|
|
8
9
|
const DB_PASSWORD = process.env.DB_PASSWORD ?? "";
|
|
9
10
|
const DB_NAME = process.env.DB_TEMP_NAME || "";
|
|
10
|
-
|
|
11
|
+
let credentials = {
|
|
11
12
|
user: DB_USERNAME,
|
|
12
13
|
password: DB_PASSWORD,
|
|
13
14
|
host: DB_HOST,
|
|
14
15
|
};
|
|
16
|
+
if (databaseUrl) {
|
|
17
|
+
try {
|
|
18
|
+
const parsed = new URL(databaseUrl);
|
|
19
|
+
credentials = {
|
|
20
|
+
user: decodeURIComponent(parsed.username || DB_USERNAME),
|
|
21
|
+
password: decodeURIComponent(parsed.password || DB_PASSWORD),
|
|
22
|
+
host: parsed.host || DB_HOST,
|
|
23
|
+
};
|
|
24
|
+
}
|
|
25
|
+
catch {
|
|
26
|
+
// fallback to DB_* env vars
|
|
27
|
+
}
|
|
28
|
+
}
|
|
29
|
+
const pgGodCredentials = {
|
|
30
|
+
user: credentials.user,
|
|
31
|
+
password: credentials.password,
|
|
32
|
+
host: credentials.host,
|
|
33
|
+
};
|
|
15
34
|
afterAll(async () => {
|
|
16
35
|
try {
|
|
17
36
|
await (0, pg_god_1.dropDatabase)({ databaseName: DB_NAME }, pgGodCredentials);
|
package/dist/jest.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"jest.js","sourceRoot":"","sources":["../src/jest.ts"],"names":[],"mappings":";;AAEA,
|
|
1
|
+
{"version":3,"file":"jest.js","sourceRoot":"","sources":["../src/jest.ts"],"names":[],"mappings":";;AAEA,4DAyCC;AA3CD,mCAAqC;AAErC,SAAgB,wBAAwB;IACtC,MAAM,WAAW,GAAG,OAAO,CAAC,GAAG,CAAC,YAAY,IAAI,OAAO,CAAC,GAAG,CAAC,gBAAgB,CAAA;IAC5E,MAAM,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC,OAAO,IAAI,WAAW,CAAA;IAClD,MAAM,WAAW,GAAG,OAAO,CAAC,GAAG,CAAC,WAAW,IAAI,UAAU,CAAA;IACzD,MAAM,WAAW,GAAG,OAAO,CAAC,GAAG,CAAC,WAAW,IAAI,EAAE,CAAA;IACjD,MAAM,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC,YAAY,IAAI,EAAE,CAAA;IAE9C,IAAI,WAAW,GAAG;QAChB,IAAI,EAAE,WAAW;QACjB,QAAQ,EAAE,WAAW;QACrB,IAAI,EAAE,OAAO;KACd,CAAA;IAED,IAAI,WAAW,EAAE,CAAC;QAChB,IAAI,CAAC;YACH,MAAM,MAAM,GAAG,IAAI,GAAG,CAAC,WAAW,CAAC,CAAA;YACnC,WAAW,GAAG;gBACZ,IAAI,EAAE,kBAAkB,CAAC,MAAM,CAAC,QAAQ,IAAI,WAAW,CAAC;gBACxD,QAAQ,EAAE,kBAAkB,CAAC,MAAM,CAAC,QAAQ,IAAI,WAAW,CAAC;gBAC5D,IAAI,EAAE,MAAM,CAAC,IAAI,IAAI,OAAO;aAC7B,CAAA;QACH,CAAC;QAAC,MAAM,CAAC;YACP,4BAA4B;QAC9B,CAAC;IACH,CAAC;IAED,MAAM,gBAAgB,GAAG;QACvB,IAAI,EAAE,WAAW,CAAC,IAAI;QACtB,QAAQ,EAAE,WAAW,CAAC,QAAQ;QAC9B,IAAI,EAAE,WAAW,CAAC,IAAI;KACvB,CAAA;IAED,QAAQ,CAAC,KAAK,IAAI,EAAE;QAClB,IAAI,CAAC;YACH,MAAM,IAAA,qBAAY,EAAC,EAAE,YAAY,EAAE,OAAO,EAAE,EAAE,gBAAgB,CAAC,CAAA;QACjE,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,OAAO,CAAC,KAAK,CACX,qIAAqI,CAAC,CAAC,OAAO,EAAE,CACjJ,CAAA;QACH,CAAC;IACH,CAAC,CAAC,CAAA;AACJ,CAAC"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import type { RegisterModuleJoinerConfig } from "@etohq/framework/modules-sdk";
|
|
1
2
|
import { TestDatabase } from "./database";
|
|
2
3
|
export interface SuiteOptions<TService = unknown> {
|
|
3
4
|
MikroOrmWrapper: TestDatabase;
|
|
@@ -8,15 +9,17 @@ export interface SuiteOptions<TService = unknown> {
|
|
|
8
9
|
clientUrl: string;
|
|
9
10
|
};
|
|
10
11
|
}
|
|
11
|
-
export declare function moduleIntegrationTestRunner<TService = any>({ moduleName, moduleModels, moduleOptions, moduleDependencies, joinerConfig, schema, debug, testSuite, resolve, injectedDependencies, }: {
|
|
12
|
+
export declare function moduleIntegrationTestRunner<TService = any>({ moduleName, moduleModels, moduleOptions, moduleDependencies, linkModules, joinerConfig, schema, debug, testSuite, resolve, injectedDependencies, moduleDefinition, }: {
|
|
12
13
|
moduleName: string;
|
|
13
14
|
moduleModels?: any[];
|
|
14
15
|
moduleOptions?: Record<string, any>;
|
|
15
16
|
moduleDependencies?: string[];
|
|
17
|
+
linkModules?: RegisterModuleJoinerConfig | RegisterModuleJoinerConfig[];
|
|
16
18
|
joinerConfig?: any[];
|
|
17
19
|
schema?: string;
|
|
18
20
|
dbName?: string;
|
|
19
21
|
injectedDependencies?: Record<string, any>;
|
|
22
|
+
moduleDefinition?: any;
|
|
20
23
|
resolve?: string;
|
|
21
24
|
debug?: boolean;
|
|
22
25
|
testSuite: (options: SuiteOptions<TService>) => void;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"module-test-runner.d.ts","sourceRoot":"","sources":["../src/module-test-runner.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"module-test-runner.d.ts","sourceRoot":"","sources":["../src/module-test-runner.ts"],"names":[],"mappings":"AAUA,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,8BAA8B,CAAA;AAE9E,OAAO,EAAsC,YAAY,EAAE,MAAM,YAAY,CAAA;AAI7E,MAAM,WAAW,YAAY,CAAC,QAAQ,GAAG,OAAO;IAC9C,eAAe,EAAE,YAAY,CAAA;IAC7B,MAAM,EAAE,GAAG,CAAA;IACX,OAAO,EAAE,QAAQ,CAAA;IACjB,QAAQ,EAAE;QACR,MAAM,EAAE,MAAM,CAAA;QACd,SAAS,EAAE,MAAM,CAAA;KAClB,CAAA;CACF;AA2GD,wBAAgB,2BAA2B,CAAC,QAAQ,GAAG,GAAG,EAAE,EAC1D,UAAU,EACV,YAAY,EACZ,aAAkB,EAClB,kBAAkB,EAClB,WAAW,EACX,YAAiB,EACjB,MAAiB,EACjB,KAAa,EACb,SAAS,EACT,OAAO,EACP,oBAAyB,EACzB,gBAAgB,GACjB,EAAE;IACD,UAAU,EAAE,MAAM,CAAA;IAClB,YAAY,CAAC,EAAE,GAAG,EAAE,CAAA;IACpB,aAAa,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;IACnC,kBAAkB,CAAC,EAAE,MAAM,EAAE,CAAA;IAC7B,WAAW,CAAC,EAAE,0BAA0B,GAAG,0BAA0B,EAAE,CAAA;IACvE,YAAY,CAAC,EAAE,GAAG,EAAE,CAAA;IACpB,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,oBAAoB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;IAC1C,gBAAgB,CAAC,EAAE,GAAG,CAAA;IACtB,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,KAAK,CAAC,EAAE,OAAO,CAAA;IACf,SAAS,EAAE,CAAC,OAAO,EAAE,YAAY,CAAC,QAAQ,CAAC,KAAK,IAAI,CAAA;CACrD,QA+HA"}
|
|
@@ -42,15 +42,48 @@ const fs = __importStar(require("fs"));
|
|
|
42
42
|
const database_1 = require("./database");
|
|
43
43
|
const init_modules_1 = require("./init-modules");
|
|
44
44
|
const mock_event_bus_service_1 = __importDefault(require("./mock-event-bus-service"));
|
|
45
|
+
function resolveModuleDefinition({ moduleName, moduleSdkImports, injectedDependencies, moduleDefinition, }) {
|
|
46
|
+
if (moduleDefinition) {
|
|
47
|
+
return moduleDefinition;
|
|
48
|
+
}
|
|
49
|
+
const modulesDefinition = moduleSdkImports.ModulesDefinition ?? moduleSdkImports.defaultModulesDefinition;
|
|
50
|
+
const injectedModulesDefinition = injectedDependencies?.configModule?.modulesDefinition;
|
|
51
|
+
const resolvedDefinition = modulesDefinition?.[moduleName] ?? injectedModulesDefinition?.[moduleName];
|
|
52
|
+
if (resolvedDefinition) {
|
|
53
|
+
return resolvedDefinition;
|
|
54
|
+
}
|
|
55
|
+
return {
|
|
56
|
+
key: moduleName,
|
|
57
|
+
defaultPackage: false,
|
|
58
|
+
label: moduleName,
|
|
59
|
+
isRequired: false,
|
|
60
|
+
isQueryable: true,
|
|
61
|
+
dependencies: [utils_1.ContainerRegistrationKeys.LOGGER],
|
|
62
|
+
defaultModuleDeclaration: {
|
|
63
|
+
scope: moduleSdkImports.MODULE_SCOPE?.INTERNAL ?? "internal",
|
|
64
|
+
},
|
|
65
|
+
};
|
|
66
|
+
}
|
|
67
|
+
function resolveModulesDefinition({ moduleName, moduleSdkImports, injectedDependencies, moduleDefinition, }) {
|
|
68
|
+
const baseModulesDefinition = moduleSdkImports.ModulesDefinition ?? moduleSdkImports.defaultModulesDefinition ?? {};
|
|
69
|
+
const injectedModulesDefinition = injectedDependencies?.[utils_1.ContainerRegistrationKeys.CONFIG_MODULE]?.modulesDefinition ?? {};
|
|
70
|
+
return {
|
|
71
|
+
...baseModulesDefinition,
|
|
72
|
+
...injectedModulesDefinition,
|
|
73
|
+
[moduleName]: moduleDefinition,
|
|
74
|
+
};
|
|
75
|
+
}
|
|
45
76
|
function createMikroOrmWrapper(options) {
|
|
46
77
|
let moduleModels = options.moduleModels ?? [];
|
|
47
78
|
if (!options.moduleModels) {
|
|
48
79
|
const basePath = (0, utils_1.normalizeImportPathWithSource)(options.resolve ?? process.cwd());
|
|
49
|
-
const modelsPath = fs.existsSync(`${basePath}/
|
|
50
|
-
? "/
|
|
51
|
-
: fs.existsSync(`${basePath}/models`)
|
|
52
|
-
? "/models"
|
|
53
|
-
:
|
|
80
|
+
const modelsPath = fs.existsSync(`${basePath}/models`)
|
|
81
|
+
? "/models"
|
|
82
|
+
: fs.existsSync(`${basePath}/dist/models`)
|
|
83
|
+
? "/dist/models"
|
|
84
|
+
: fs.existsSync(`${basePath}/src/models`)
|
|
85
|
+
? "/src/models"
|
|
86
|
+
: "";
|
|
54
87
|
if (modelsPath) {
|
|
55
88
|
moduleModels = (0, utils_1.loadModels)(`${basePath}${modelsPath}`);
|
|
56
89
|
}
|
|
@@ -66,8 +99,9 @@ function createMikroOrmWrapper(options) {
|
|
|
66
99
|
});
|
|
67
100
|
return { MikroOrmWrapper, models: moduleModels };
|
|
68
101
|
}
|
|
69
|
-
function moduleIntegrationTestRunner({ moduleName, moduleModels, moduleOptions = {}, moduleDependencies, joinerConfig = [], schema = "public", debug = false, testSuite, resolve, injectedDependencies = {}, }) {
|
|
102
|
+
function moduleIntegrationTestRunner({ moduleName, moduleModels, moduleOptions = {}, moduleDependencies, linkModules, joinerConfig = [], schema = "public", debug = false, testSuite, resolve, injectedDependencies = {}, moduleDefinition, }) {
|
|
70
103
|
const moduleSdkImports = require("@etohq/framework/modules-sdk");
|
|
104
|
+
const moduleResolvePath = resolve ?? process.cwd();
|
|
71
105
|
process.env.LOG_LEVEL = "error";
|
|
72
106
|
const tempName = parseInt(process.env.JEST_WORKER_ID || "1");
|
|
73
107
|
const dbName = `eto-${moduleName.toLowerCase()}-integration-${tempName}`;
|
|
@@ -80,14 +114,26 @@ function moduleIntegrationTestRunner({ moduleName, moduleModels, moduleOptions =
|
|
|
80
114
|
const connection = utils_1.ModulesSdkUtils.createPgConnection(dbConfig);
|
|
81
115
|
const { MikroOrmWrapper, models } = createMikroOrmWrapper({
|
|
82
116
|
moduleModels,
|
|
83
|
-
resolve,
|
|
117
|
+
resolve: moduleResolvePath,
|
|
84
118
|
dbConfig,
|
|
85
119
|
});
|
|
86
120
|
moduleModels = models;
|
|
121
|
+
const resolvedModuleDefinition = resolveModuleDefinition({
|
|
122
|
+
moduleName,
|
|
123
|
+
moduleSdkImports,
|
|
124
|
+
injectedDependencies,
|
|
125
|
+
moduleDefinition,
|
|
126
|
+
});
|
|
127
|
+
const resolvedModulesDefinition = resolveModulesDefinition({
|
|
128
|
+
moduleName,
|
|
129
|
+
moduleSdkImports,
|
|
130
|
+
injectedDependencies,
|
|
131
|
+
moduleDefinition: resolvedModuleDefinition,
|
|
132
|
+
});
|
|
87
133
|
const modulesConfig_ = {
|
|
88
134
|
[moduleName]: {
|
|
89
|
-
definition:
|
|
90
|
-
resolve,
|
|
135
|
+
definition: resolvedModuleDefinition,
|
|
136
|
+
resolve: moduleResolvePath,
|
|
91
137
|
dependencies: moduleDependencies,
|
|
92
138
|
options: {
|
|
93
139
|
database: dbConfig,
|
|
@@ -101,14 +147,20 @@ function moduleIntegrationTestRunner({ moduleName, moduleModels, moduleOptions =
|
|
|
101
147
|
[utils_1.ContainerRegistrationKeys.PG_CONNECTION]: connection,
|
|
102
148
|
[utils_1.Modules.EVENT_BUS]: new mock_event_bus_service_1.default(),
|
|
103
149
|
[utils_1.ContainerRegistrationKeys.LOGGER]: console,
|
|
150
|
+
[utils_1.ContainerRegistrationKeys.CONFIG_MODULE]: {
|
|
151
|
+
modules: modulesConfig_,
|
|
152
|
+
modulesDefinition: resolvedModulesDefinition,
|
|
153
|
+
projectConfig: {},
|
|
154
|
+
},
|
|
104
155
|
...injectedDependencies,
|
|
105
156
|
},
|
|
106
157
|
modulesConfig: modulesConfig_,
|
|
158
|
+
linkModules,
|
|
107
159
|
databaseConfig: dbConfig,
|
|
108
160
|
joinerConfig,
|
|
109
161
|
preventConnectionDestroyWarning: true,
|
|
110
162
|
};
|
|
111
|
-
let shutdown;
|
|
163
|
+
let shutdown = async () => void 0;
|
|
112
164
|
let moduleService;
|
|
113
165
|
let etoApp = {};
|
|
114
166
|
const options = {
|
|
@@ -133,7 +185,7 @@ function moduleIntegrationTestRunner({ moduleName, moduleModels, moduleOptions =
|
|
|
133
185
|
await MikroOrmWrapper.setupDatabase();
|
|
134
186
|
}
|
|
135
187
|
const output = await (0, init_modules_1.initModules)(moduleOptions_);
|
|
136
|
-
shutdown = output.shutdown;
|
|
188
|
+
shutdown = output.shutdown ?? (async () => void 0);
|
|
137
189
|
etoApp = output.etoApp;
|
|
138
190
|
moduleService = output.etoApp.modules[moduleName];
|
|
139
191
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"module-test-runner.js","sourceRoot":"","sources":["../src/module-test-runner.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"module-test-runner.js","sourceRoot":"","sources":["../src/module-test-runner.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@etohq/test-utils",
|
|
3
|
-
"version": "1.5.1-alpha.
|
|
3
|
+
"version": "1.5.1-alpha.4",
|
|
4
4
|
"description": "Test utils for Eto",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"repository": {
|
|
@@ -31,7 +31,7 @@
|
|
|
31
31
|
"pg-god": "1.0.12",
|
|
32
32
|
"rimraf": "5.0.2",
|
|
33
33
|
"typescript": "5.8.3",
|
|
34
|
-
"@etohq/framework": "1.5.1-alpha.
|
|
34
|
+
"@etohq/framework": "1.5.1-alpha.4"
|
|
35
35
|
},
|
|
36
36
|
"dependencies": {
|
|
37
37
|
"@types/express": "4.17.17",
|
|
@@ -42,8 +42,8 @@
|
|
|
42
42
|
"peerDependencies": {
|
|
43
43
|
"@mikro-orm/postgresql": "6.4.3",
|
|
44
44
|
"awilix": "8.0.1",
|
|
45
|
-
"@etohq/eto": "1.5.1-alpha.
|
|
46
|
-
"@etohq/framework": "1.5.1-alpha.
|
|
45
|
+
"@etohq/eto": "1.5.1-alpha.4",
|
|
46
|
+
"@etohq/framework": "1.5.1-alpha.4"
|
|
47
47
|
},
|
|
48
48
|
"peerDependenciesMeta": {
|
|
49
49
|
"@etohq/eto": {
|