@etohq/test-utils 1.1.0 → 1.2.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.
@@ -5,6 +5,5 @@ export declare function startApp({ cwd, env, }?: {
5
5
  }): Promise<{
6
6
  shutdown: () => Promise<void>;
7
7
  container: EtoContainer;
8
- port: number;
9
8
  }>;
10
9
  //# sourceMappingURL=bootstrap-app.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"bootstrap-app.d.ts","sourceRoot":"","sources":["../../src/eto-test-runner-utils/bootstrap-app.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAA;AA4BrD,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;IACvB,IAAI,EAAE,MAAM,CAAA;CACb,CAAC,CAyCD"}
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;AA0BrD,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,56 +4,38 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
4
4
  };
5
5
  Object.defineProperty(exports, "__esModule", { value: true });
6
6
  exports.startApp = startApp;
7
- const express_1 = __importDefault(require("express"));
8
7
  const get_port_1 = __importDefault(require("get-port"));
9
8
  const path_1 = require("path");
10
9
  const utils_1 = require("./utils");
11
10
  const utils_2 = require("@etohq/framework/utils");
11
+ // toodo refactor ... this will not work.
12
12
  async function bootstrapApp({ cwd, env = {}, } = {}) {
13
- const app = (0, express_1.default)();
14
13
  (0, utils_1.applyEnvVarsToProcess)(env);
15
14
  const loaders = require("@etohq/eto/loaders/index").default;
16
15
  const { container, shutdown } = await loaders({
17
16
  directory: (0, path_1.resolve)(cwd || process.cwd()),
18
- expressApp: app,
19
17
  });
20
18
  const PORT = process.env.PORT ? parseInt(process.env.PORT) : await (0, get_port_1.default)();
21
19
  return {
22
20
  shutdown,
23
21
  container,
24
- app,
25
22
  port: PORT,
26
23
  };
27
24
  }
28
25
  async function startApp({ cwd, env = {}, } = {}) {
29
- const { app, port, container, shutdown: etoShutdown, } = await bootstrapApp({
26
+ const { container, shutdown: etoShutdown, } = await bootstrapApp({
30
27
  cwd,
31
28
  env,
32
29
  });
33
- let expressServer;
34
30
  const shutdown = async () => {
35
- await (0, utils_2.promiseAll)([expressServer?.shutdown(), etoShutdown()]);
31
+ await (0, utils_2.promiseAll)([etoShutdown()]);
36
32
  if (typeof global !== "undefined" && global?.gc) {
37
33
  global.gc();
38
34
  }
39
35
  };
40
- return await new Promise((resolve, reject) => {
41
- const server = app
42
- .listen(port)
43
- .on("error", async (err) => {
44
- await shutdown();
45
- return reject(err);
46
- })
47
- .on("listening", () => {
48
- process.send?.(port);
49
- resolve({
50
- shutdown,
51
- container,
52
- port,
53
- });
54
- });
55
- // TODO: fix that once we find the appropriate place to put this util
56
- expressServer = utils_2.GracefulShutdownServer.create(server);
57
- });
36
+ return {
37
+ shutdown,
38
+ container,
39
+ };
58
40
  }
59
41
  //# sourceMappingURL=bootstrap-app.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"bootstrap-app.js","sourceRoot":"","sources":["../../src/eto-test-runner-utils/bootstrap-app.ts"],"names":[],"mappings":";;;;;AA+BA,4BAgDC;AA/ED,sDAA6B;AAC7B,wDAA8B;AAC9B,+BAA8B;AAE9B,mCAA+C;AAC/C,kDAA2E;AAE3E,KAAK,UAAU,YAAY,CAAC,EAC1B,GAAG,EACH,GAAG,GAAG,EAAE,MACoC,EAAE;IAC9C,MAAM,GAAG,GAAG,IAAA,iBAAO,GAAE,CAAA;IACrB,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;QACxC,UAAU,EAAE,GAAG;KAChB,CAAC,CAAA;IAEF,MAAM,IAAI,GAAG,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,MAAM,IAAA,kBAAO,GAAE,CAAA;IAE5E,OAAO;QACL,QAAQ;QACR,SAAS;QACT,GAAG;QACH,IAAI,EAAE,IAAI;KACX,CAAA;AACH,CAAC;AAEM,KAAK,UAAU,QAAQ,CAAC,EAC7B,GAAG,EACH,GAAG,GAAG,EAAE,MACoC,EAAE;IAK9C,MAAM,EACJ,GAAG,EACH,IAAI,EACJ,SAAS,EACT,QAAQ,EAAE,WAAW,GACtB,GAAG,MAAM,YAAY,CAAC;QACrB,GAAG;QACH,GAAG;KACJ,CAAC,CAAA;IAEF,IAAI,aAAa,CAAA;IAEjB,MAAM,QAAQ,GAAG,KAAK,IAAI,EAAE;QAC1B,MAAM,IAAA,kBAAU,EAAC,CAAC,aAAa,EAAE,QAAQ,EAAE,EAAE,WAAW,EAAE,CAAC,CAAC,CAAA;QAE5D,IAAI,OAAO,MAAM,KAAK,WAAW,IAAI,MAAM,EAAE,EAAE,EAAE,CAAC;YAChD,MAAM,CAAC,EAAE,EAAE,CAAA;QACb,CAAC;IACH,CAAC,CAAA;IAED,OAAO,MAAM,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QAC3C,MAAM,MAAM,GAAG,GAAG;aACf,MAAM,CAAC,IAAI,CAAC;aACZ,EAAE,CAAC,OAAO,EAAE,KAAK,EAAE,GAAG,EAAE,EAAE;YACzB,MAAM,QAAQ,EAAE,CAAA;YAChB,OAAO,MAAM,CAAC,GAAG,CAAC,CAAA;QACpB,CAAC,CAAC;aACD,EAAE,CAAC,WAAW,EAAE,GAAG,EAAE;YACpB,OAAO,CAAC,IAAI,EAAE,CAAC,IAAI,CAAC,CAAA;YAEpB,OAAO,CAAC;gBACN,QAAQ;gBACR,SAAS;gBACT,IAAI;aACL,CAAC,CAAA;QACJ,CAAC,CAAC,CAAA;QAEJ,qEAAqE;QACrE,aAAa,GAAG,8BAAsB,CAAC,MAAM,CAAC,MAAM,CAAC,CAAA;IACvD,CAAC,CAAC,CAAA;AACJ,CAAC"}
1
+ {"version":3,"file":"bootstrap-app.js","sourceRoot":"","sources":["../../src/eto-test-runner-utils/bootstrap-app.ts"],"names":[],"mappings":";;;;;AA4BA,4BA6BC;AAzDD,wDAA8B;AAC9B,+BAA8B;AAE9B,mCAA+C;AAC/C,kDAAmD;AAEnD,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,CAAC,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,MAAM,IAAA,kBAAO,GAAE,CAAA;IAE5E,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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@etohq/test-utils",
3
- "version": "1.1.0",
3
+ "version": "1.2.0",
4
4
  "description": "Test utils for Eto",
5
5
  "main": "dist/index.js",
6
6
  "repository": {
@@ -25,7 +25,7 @@
25
25
  "author": "Eto",
26
26
  "license": "MIT",
27
27
  "devDependencies": {
28
- "@etohq/framework": "^1.1.0",
28
+ "@etohq/framework": "^1.2.0",
29
29
  "@mikro-orm/core": "5.9.7",
30
30
  "@mikro-orm/knex": "5.9.7",
31
31
  "@mikro-orm/migrations": "5.9.7",
@@ -41,13 +41,12 @@
41
41
  "dependencies": {
42
42
  "@types/express": "^4.17.17",
43
43
  "axios": "^0.21.4",
44
- "express": "^4.21.0",
45
44
  "get-port": "^5.1.1",
46
45
  "randomatic": "^3.1.1"
47
46
  },
48
47
  "peerDependencies": {
49
- "@etohq/eto": "^1.0.0",
50
- "@etohq/framework": "^1.0.0",
48
+ "@etohq/eto": "^1.1.0",
49
+ "@etohq/framework": "^1.1.0",
51
50
  "@mikro-orm/postgresql": "5.9.7",
52
51
  "awilix": "^8.0.1"
53
52
  },