@terreno/test 0.31.0 → 56.0.0-beta.2

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.
@@ -112,6 +112,7 @@ exports.createMongoTestCache = void 0;
112
112
  var crypto = __importStar(require("node:crypto"));
113
113
  var fs = __importStar(require("node:fs"));
114
114
  var path = __importStar(require("node:path"));
115
+ var luxon_1 = require("luxon");
115
116
  var mongoose_1 = __importDefault(require("mongoose"));
116
117
  var testLogger_1 = require("../logging/testLogger");
117
118
  var connection_1 = require("../mongo/connection");
@@ -196,7 +197,7 @@ var cacheFilesExist = function (cacheDir) {
196
197
  return false;
197
198
  }
198
199
  if (!process.env.CI) {
199
- var cacheAge = Date.now() - fs.statSync(dataFilePath).mtimeMs;
200
+ var cacheAge = luxon_1.DateTime.now().toMillis() - fs.statSync(dataFilePath).mtimeMs;
200
201
  if (cacheAge > MAX_CACHE_AGE_MS) {
201
202
  return false;
202
203
  }
@@ -210,7 +211,7 @@ var convertValue = function (value) {
210
211
  }
211
212
  if (typeof value === "string") {
212
213
  if (value.match(/^\d{4}-\d{2}-\d{2}T/)) {
213
- return new Date(value);
214
+ return luxon_1.DateTime.fromISO(value).toJSDate();
214
215
  }
215
216
  if (value.match(/^[0-9a-fA-F]{24}$/)) {
216
217
  return new mongoose_1.default.Types.ObjectId(value);
@@ -246,6 +247,14 @@ var getReconnectUri = function (publishedUriEnvVar, baseDatabaseName) {
246
247
  }
247
248
  return (0, connection_1.buildDatabaseUri)({ databaseName: mongoose_1.default.connection.name || baseDatabaseName, uri: uri });
248
249
  };
250
+ /** Throws when the driver has no database handle, so callers treat it like a failed ping. */
251
+ var requireDb = function () {
252
+ var db = mongoose_1.default.connection.db;
253
+ if (!db) {
254
+ throw new Error("[mongoTestCache] mongoose connection has no database handle");
255
+ }
256
+ return db;
257
+ };
249
258
  var ensureConnectionReady = function (publishedUriEnvVar, baseDatabaseName) { return __awaiter(void 0, void 0, void 0, function () {
250
259
  var maxQuickAttempts, delayMs, attempt, state, _a, _b;
251
260
  return __generator(this, function (_c) {
@@ -262,7 +271,7 @@ var ensureConnectionReady = function (publishedUriEnvVar, baseDatabaseName) { re
262
271
  _c.label = 2;
263
272
  case 2:
264
273
  _c.trys.push([2, 4, , 5]);
265
- return [4 /*yield*/, mongoose_1.default.connection.db.admin().command({ ping: 1 })];
274
+ return [4 /*yield*/, requireDb().admin().command({ ping: 1 })];
266
275
  case 3:
267
276
  _c.sent();
268
277
  return [2 /*return*/];
@@ -286,7 +295,7 @@ var ensureConnectionReady = function (publishedUriEnvVar, baseDatabaseName) { re
286
295
  })];
287
296
  case 9:
288
297
  _c.sent();
289
- return [4 /*yield*/, mongoose_1.default.connection.db.admin().command({ ping: 1 })];
298
+ return [4 /*yield*/, requireDb().admin().command({ ping: 1 })];
290
299
  case 10:
291
300
  _c.sent();
292
301
  return [4 /*yield*/, (0, testTransaction_1.resetTestSessionAfterReconnect)()];
@@ -326,7 +335,7 @@ var loadTestDataIntoDb = function (cachedCollections) { return __awaiter(void 0,
326
335
  try {
327
336
  for (_a = __values(Object.keys(cachedCollections)), _b = _a.next(); !_b.done; _b = _a.next()) {
328
337
  collectionName = _b.value;
329
- clearPromises.push(mongoose_1.default.connection.db.collection(collectionName).deleteMany({}));
338
+ clearPromises.push(requireDb().collection(collectionName).deleteMany({}));
330
339
  }
331
340
  }
332
341
  catch (e_4_1) { e_4 = { error: e_4_1 }; }
@@ -510,8 +519,10 @@ var createMongoTestCache = function (options) {
510
519
  inflightSetupTestCache = null;
511
520
  });
512
521
  }
513
- return [4 /*yield*/, inflightSetupTestCache];
522
+ // Wrapped because the `finally` above clears the shared slot once it settles.
523
+ return [4 /*yield*/, Promise.resolve(inflightSetupTestCache)];
514
524
  case 1:
525
+ // Wrapped because the `finally` above clears the shared slot once it settles.
515
526
  _a.sent();
516
527
  _a.label = 2;
517
528
  case 2:
@@ -110,9 +110,11 @@ var createLogSilencer = function (options) {
110
110
  var _b;
111
111
  winston_1.default.clear();
112
112
  winston_1.default.add(silentTransport);
113
- var extraLoggers = __spreadArray(__spreadArray([], __read(((_b = options.additionalWinstonLoggers) !== null && _b !== void 0 ? _b : [])), false), [
114
- getApiWinstonLogger(),
115
- ], false).filter(Boolean);
113
+ // Only reach for @terreno/api when the caller has not supplied its logger. Requiring the
114
+ // package from inside api's own test run would load its built dist alongside the sources
115
+ // under test, registering every Mongoose model twice.
116
+ var provided = (_b = options.additionalWinstonLoggers) !== null && _b !== void 0 ? _b : [];
117
+ var extraLoggers = (provided.length > 0 ? provided : [getApiWinstonLogger()]).filter(Boolean);
116
118
  try {
117
119
  for (var extraLoggers_1 = __values(extraLoggers), extraLoggers_1_1 = extraLoggers_1.next(); !extraLoggers_1_1.done; extraLoggers_1_1 = extraLoggers_1.next()) {
118
120
  var extraLogger = extraLoggers_1_1.value;
@@ -120,6 +120,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
120
120
  };
121
121
  Object.defineProperty(exports, "__esModule", { value: true });
122
122
  exports.getMongoServerUri = exports.stopMongoServer = exports.restartMongoServer = exports.startMongoServer = exports.initializeModels = exports.waitForDatabaseReady = void 0;
123
+ var luxon_1 = require("luxon");
123
124
  var mongoose_1 = __importDefault(require("mongoose"));
124
125
  var testLogger_1 = require("../logging/testLogger");
125
126
  var connection_1 = require("./connection");
@@ -195,7 +196,7 @@ var initializeModels = function () { return __awaiter(void 0, void 0, void 0, fu
195
196
  if (newModels.length === 0) {
196
197
  return [2 /*return*/, { modelCount: models.length, modelInitMs: 0 }];
197
198
  }
198
- startTime = Date.now();
199
+ startTime = luxon_1.DateTime.now().toMillis();
199
200
  initPromises = newModels.map(function (modelName) { return __awaiter(void 0, void 0, void 0, function () {
200
201
  return __generator(this, function (_a) {
201
202
  switch (_a.label) {
@@ -222,7 +223,7 @@ var initializeModels = function () { return __awaiter(void 0, void 0, void 0, fu
222
223
  }
223
224
  finally { if (e_1) throw e_1.error; }
224
225
  }
225
- return [2 /*return*/, { modelCount: models.length, modelInitMs: Date.now() - startTime }];
226
+ return [2 /*return*/, { modelCount: models.length, modelInitMs: luxon_1.DateTime.now().toMillis() - startTime }];
226
227
  }
227
228
  });
228
229
  }); };
@@ -286,7 +287,7 @@ var startMongoServer = function () {
286
287
  return [2 /*return*/, mongoServerUri];
287
288
  }
288
289
  merged = __assign(__assign({}, DEFAULT_OPTIONS), options);
289
- startTime = Date.now();
290
+ startTime = luxon_1.DateTime.now().toMillis();
290
291
  externalUri = (_b = process.env[merged.externalUriEnvVar]) === null || _b === void 0 ? void 0 : _b.trim();
291
292
  if (!externalUri) return [3 /*break*/, 1];
292
293
  uri = externalUri;
@@ -318,7 +319,7 @@ var startMongoServer = function () {
318
319
  case 6:
319
320
  _a = _c.sent(), modelCount = _a.modelCount, modelInitMs = _a.modelInitMs;
320
321
  if (process.env.DEBUG_MONGO_PRELOAD === "true") {
321
- testLogger_1.testLogger.debug("[mongoServer] Initialized ".concat(modelCount, " models in ").concat(modelInitMs, "ms, connected in ").concat(Date.now() - startTime, "ms"));
322
+ testLogger_1.testLogger.debug("[mongoServer] Initialized ".concat(modelCount, " models in ").concat(modelInitMs, "ms, connected in ").concat(luxon_1.DateTime.now().toMillis() - startTime, "ms"));
322
323
  }
323
324
  return [2 /*return*/, uri];
324
325
  }
@@ -339,7 +340,7 @@ var restartMongoServer = function () {
339
340
  switch (_c.label) {
340
341
  case 0:
341
342
  merged = __assign(__assign({}, DEFAULT_OPTIONS), options);
342
- startTime = Date.now();
343
+ startTime = luxon_1.DateTime.now().toMillis();
343
344
  testLogger_1.testLogger.warn("[mongoServer] Force-restarting MongoDB server...");
344
345
  _c.label = 1;
345
346
  case 1:
@@ -394,7 +395,7 @@ var restartMongoServer = function () {
394
395
  return [4 /*yield*/, (0, exports.initializeModels)()];
395
396
  case 13:
396
397
  _c.sent();
397
- testLogger_1.testLogger.warn("[mongoServer] MongoDB server restarted in ".concat(Date.now() - startTime, "ms"));
398
+ testLogger_1.testLogger.warn("[mongoServer] MongoDB server restarted in ".concat(luxon_1.DateTime.now().toMillis() - startTime, "ms"));
398
399
  return [2 /*return*/];
399
400
  }
400
401
  });
@@ -62,6 +62,7 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
62
62
  };
63
63
  Object.defineProperty(exports, "__esModule", { value: true });
64
64
  exports.waitForDocument = exports.waitForDocuments = void 0;
65
+ var luxon_1 = require("luxon");
65
66
  /**
66
67
  * Polls until at least `count` documents match the query.
67
68
  * Useful when writes are asynchronous (audit logs, webhooks, etc.).
@@ -78,10 +79,10 @@ var waitForDocuments = function (model_1, query_1) {
78
79
  return __generator(this, function (_e) {
79
80
  switch (_e.label) {
80
81
  case 0:
81
- start = Date.now();
82
+ start = luxon_1.DateTime.now().toMillis();
82
83
  _e.label = 1;
83
84
  case 1:
84
- if (!(Date.now() - start < timeoutMs)) return [3 /*break*/, 4];
85
+ if (!(luxon_1.DateTime.now().toMillis() - start < timeoutMs)) return [3 /*break*/, 4];
85
86
  q = model.find(query);
86
87
  if (sort) {
87
88
  q = q.sort(sort);
package/package.json CHANGED
@@ -6,6 +6,7 @@
6
6
  "dependencies": {
7
7
  "express": "^5.2.1",
8
8
  "lodash": "^4.18.1",
9
+ "luxon": "^3.7.2",
9
10
  "qs": "^6.15.0",
10
11
  "winston": "^3.18.3"
11
12
  },
@@ -14,13 +15,14 @@
14
15
  "@biomejs/biome": "^2.3.6",
15
16
  "@types/bun": "^1.3.8",
16
17
  "@types/express": "^5.0.6",
18
+ "@types/luxon": "^3.7.1",
17
19
  "@types/supertest": "^7.2.0",
18
20
  "mongodb-memory-server": "^11.0.1",
19
21
  "mongodb-memory-server-core": "^11.0.1",
20
22
  "mongodb-memory-server-global": "^11.0.1",
21
23
  "mongoose": "9.7.4",
22
24
  "supertest": "^7.2.2",
23
- "typescript": "~5.9.2"
25
+ "typescript": "~6.0.3"
24
26
  },
25
27
  "homepage": "https://github.com/FlourishHealth/terreno#readme",
26
28
  "keywords": [
@@ -61,5 +63,5 @@
61
63
  "test:ci": "bun test"
62
64
  },
63
65
  "types": "dist/index.d.ts",
64
- "version": "0.31.0"
66
+ "version": "56.0.0-beta.2"
65
67
  }
@@ -1,6 +1,7 @@
1
1
  import * as crypto from "node:crypto";
2
2
  import * as fs from "node:fs";
3
3
  import * as path from "node:path";
4
+ import {DateTime} from "luxon";
4
5
  import mongoose from "mongoose";
5
6
 
6
7
  import {testLogger} from "../logging/testLogger";
@@ -89,7 +90,7 @@ const cacheFilesExist = (cacheDir: string): boolean => {
89
90
  }
90
91
 
91
92
  if (!process.env.CI) {
92
- const cacheAge = Date.now() - fs.statSync(dataFilePath).mtimeMs;
93
+ const cacheAge = DateTime.now().toMillis() - fs.statSync(dataFilePath).mtimeMs;
93
94
  if (cacheAge > MAX_CACHE_AGE_MS) {
94
95
  return false;
95
96
  }
@@ -104,7 +105,7 @@ const convertValue = (value: unknown): unknown => {
104
105
  }
105
106
  if (typeof value === "string") {
106
107
  if (value.match(/^\d{4}-\d{2}-\d{2}T/)) {
107
- return new Date(value);
108
+ return DateTime.fromISO(value).toJSDate();
108
109
  }
109
110
  if (value.match(/^[0-9a-fA-F]{24}$/)) {
110
111
  return new mongoose.Types.ObjectId(value);
@@ -132,6 +133,15 @@ const getReconnectUri = (publishedUriEnvVar: string, baseDatabaseName: string):
132
133
  return buildDatabaseUri({databaseName: mongoose.connection.name || baseDatabaseName, uri});
133
134
  };
134
135
 
136
+ /** Throws when the driver has no database handle, so callers treat it like a failed ping. */
137
+ const requireDb = (): mongoose.mongo.Db => {
138
+ const {db} = mongoose.connection;
139
+ if (!db) {
140
+ throw new Error("[mongoTestCache] mongoose connection has no database handle");
141
+ }
142
+ return db;
143
+ };
144
+
135
145
  const ensureConnectionReady = async (
136
146
  publishedUriEnvVar: string,
137
147
  baseDatabaseName: string
@@ -143,7 +153,7 @@ const ensureConnectionReady = async (
143
153
  const state = mongoose.connection.readyState;
144
154
  if (state === 1) {
145
155
  try {
146
- await mongoose.connection.db!.admin().command({ping: 1});
156
+ await requireDb().admin().command({ping: 1});
147
157
  return;
148
158
  } catch {
149
159
  // stale connection
@@ -160,7 +170,7 @@ const ensureConnectionReady = async (
160
170
  serverSelectionTimeoutMS: 2000,
161
171
  socketTimeoutMS: 2000,
162
172
  });
163
- await mongoose.connection.db!.admin().command({ping: 1});
173
+ await requireDb().admin().command({ping: 1});
164
174
  await resetTestSessionAfterReconnect();
165
175
  return;
166
176
  } catch {
@@ -180,7 +190,7 @@ const ensureConnectionReady = async (
180
190
  const loadTestDataIntoDb = async (cachedCollections: Record<string, unknown[]>): Promise<void> => {
181
191
  const clearPromises: Array<Promise<unknown>> = [];
182
192
  for (const collectionName of Object.keys(cachedCollections)) {
183
- clearPromises.push(mongoose.connection.db!.collection(collectionName).deleteMany({}));
193
+ clearPromises.push(requireDb().collection(collectionName).deleteMany({}));
184
194
  }
185
195
  await Promise.all(clearPromises);
186
196
 
@@ -287,7 +297,8 @@ export const createMongoTestCache = (options: MongoTestCacheOptions): MongoTestC
287
297
  inflightSetupTestCache = null;
288
298
  });
289
299
  }
290
- await inflightSetupTestCache;
300
+ // Wrapped because the `finally` above clears the shared slot once it settles.
301
+ await Promise.resolve(inflightSetupTestCache);
291
302
  }
292
303
 
293
304
  if (!cachedCollectionsInMemory) {
@@ -82,10 +82,13 @@ export const createLogSilencer = (options: SilenceLogsOptions = {}): SilenceLogs
82
82
  winston.clear();
83
83
  winston.add(silentTransport);
84
84
 
85
- const extraLoggers = [
86
- ...(options.additionalWinstonLoggers ?? []),
87
- getApiWinstonLogger(),
88
- ].filter(Boolean) as winston.Logger[];
85
+ // Only reach for @terreno/api when the caller has not supplied its logger. Requiring the
86
+ // package from inside api's own test run would load its built dist alongside the sources
87
+ // under test, registering every Mongoose model twice.
88
+ const provided = options.additionalWinstonLoggers ?? [];
89
+ const extraLoggers = (provided.length > 0 ? provided : [getApiWinstonLogger()]).filter(
90
+ Boolean
91
+ ) as winston.Logger[];
89
92
 
90
93
  for (const extraLogger of extraLoggers) {
91
94
  extraLogger.clear();
@@ -1,3 +1,4 @@
1
+ import {DateTime} from "luxon";
1
2
  import mongoose from "mongoose";
2
3
 
3
4
  import {testLogger} from "../logging/testLogger";
@@ -69,7 +70,7 @@ export const initializeModels = async (): Promise<{modelCount: number; modelInit
69
70
  return {modelCount: models.length, modelInitMs: 0};
70
71
  }
71
72
 
72
- const startTime = Date.now();
73
+ const startTime = DateTime.now().toMillis();
73
74
  const initPromises = newModels.map(async (modelName) => {
74
75
  await mongoose.models[modelName].init();
75
76
  });
@@ -79,7 +80,7 @@ export const initializeModels = async (): Promise<{modelCount: number; modelInit
79
80
  initializedModelNames.add(modelName);
80
81
  }
81
82
 
82
- return {modelCount: models.length, modelInitMs: Date.now() - startTime};
83
+ return {modelCount: models.length, modelInitMs: DateTime.now().toMillis() - startTime};
83
84
  };
84
85
 
85
86
  const shouldUseReplSet = (options: MongoServerOptions): boolean => {
@@ -119,7 +120,7 @@ export const startMongoServer = async (options: MongoServerOptions = {}): Promis
119
120
  }
120
121
 
121
122
  const merged = {...DEFAULT_OPTIONS, ...options};
122
- const startTime = Date.now();
123
+ const startTime = DateTime.now().toMillis();
123
124
  const externalUri = process.env[merged.externalUriEnvVar]?.trim();
124
125
  let uri: string;
125
126
 
@@ -149,7 +150,7 @@ export const startMongoServer = async (options: MongoServerOptions = {}): Promis
149
150
 
150
151
  if (process.env.DEBUG_MONGO_PRELOAD === "true") {
151
152
  testLogger.debug(
152
- `[mongoServer] Initialized ${modelCount} models in ${modelInitMs}ms, connected in ${Date.now() - startTime}ms`
153
+ `[mongoServer] Initialized ${modelCount} models in ${modelInitMs}ms, connected in ${DateTime.now().toMillis() - startTime}ms`
153
154
  );
154
155
  }
155
156
 
@@ -159,7 +160,7 @@ export const startMongoServer = async (options: MongoServerOptions = {}): Promis
159
160
  /** Force-restarts the in-memory MongoDB server and reconnects mongoose. */
160
161
  export const restartMongoServer = async (options: MongoServerOptions = {}): Promise<void> => {
161
162
  const merged = {...DEFAULT_OPTIONS, ...options};
162
- const startTime = Date.now();
163
+ const startTime = DateTime.now().toMillis();
163
164
  testLogger.warn("[mongoServer] Force-restarting MongoDB server...");
164
165
 
165
166
  try {
@@ -199,7 +200,9 @@ export const restartMongoServer = async (options: MongoServerOptions = {}): Prom
199
200
  initializedModelNames.clear();
200
201
  await initializeModels();
201
202
 
202
- testLogger.warn(`[mongoServer] MongoDB server restarted in ${Date.now() - startTime}ms`);
203
+ testLogger.warn(
204
+ `[mongoServer] MongoDB server restarted in ${DateTime.now().toMillis() - startTime}ms`
205
+ );
203
206
  };
204
207
 
205
208
  export const stopMongoServer = async (): Promise<void> => {
@@ -1,3 +1,4 @@
1
+ import {DateTime} from "luxon";
1
2
  import type {Model} from "mongoose";
2
3
 
3
4
  type ModelQuery<T> = Partial<Record<keyof T, unknown>> & Record<string, unknown>;
@@ -18,8 +19,8 @@ export const waitForDocuments = async <T>(
18
19
  count = 1,
19
20
  {timeoutMs = 5000, intervalMs = 100, sort}: WaitForDocumentsOptions = {}
20
21
  ): Promise<T[]> => {
21
- const start = Date.now();
22
- while (Date.now() - start < timeoutMs) {
22
+ const start = DateTime.now().toMillis();
23
+ while (DateTime.now().toMillis() - start < timeoutMs) {
23
24
  let q = model.find(query as never);
24
25
  if (sort) {
25
26
  q = q.sort(sort);
package/tsconfig.json CHANGED
@@ -7,6 +7,7 @@
7
7
  "downlevelIteration": true,
8
8
  "esModuleInterop": true,
9
9
  "forceConsistentCasingInFileNames": true,
10
+ "ignoreDeprecations": "6.0",
10
11
  "jsx": "react",
11
12
  "lib": ["es2017", "dom", "es2017.object"],
12
13
  "module": "commonjs",
@@ -20,11 +21,13 @@
20
21
  "outDir": "./dist",
21
22
  "preserveConstEnums": true,
22
23
  "removeComments": false,
24
+ "rootDir": "./src",
23
25
  "skipLibCheck": true,
24
26
  "strict": true,
25
27
  "strictFunctionTypes": true,
26
28
  "strictNullChecks": true,
27
- "target": "es5"
29
+ "target": "es5",
30
+ "types": ["bun", "node"]
28
31
  },
29
32
  "exclude": ["node_modules", "src/mongo/ensureMongoBinary.ts"],
30
33
  "include": ["src/**/*.ts"]