@villedemontreal/mongo 6.7.3 → 7.0.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/src/mongoClient.js.map +1 -1
- package/dist/src/mongoUpdater.js +3 -3
- package/dist/src/mongoUpdater.js.map +1 -1
- package/dist/src/plugins/pagination/index.test.js +1 -1
- package/dist/src/plugins/pagination/index.test.js.map +1 -1
- package/package.json +12 -12
- package/src/mongoClient.ts +1 -1
- package/src/mongoUpdater.ts +3 -3
- package/src/plugins/pagination/index.test.ts +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mongoClient.js","sourceRoot":"","sources":["../../src/mongoClient.ts"],"names":[],"mappings":";;;AAAA,mCAAsC;AACtC,qCAAqC;AACrC,kDAA+C;AAC/C,8DAA6E;AAC7E,iDAA6D;AAC7D,6CAA0C;AAC1C,2CAA8C;AAE9C,MAAM,MAAM,GAAG,IAAA,qBAAY,EAAC,aAAa,CAAC,CAAC;AAE3C,IAAI,kBAAuC,CAAC;AAE5C,KAAK,UAAU,cAAc,CAC3B,mBAAoC,EACpC,OAA6C,EAC7C,MAA8B;IAE9B,IAAI,gBAAgB,GAAG,mBAAmB,CAAC,gBAAgB,CAAC;IAE5D,6CAA6C;IAC7C,uBAAuB;IACvB,6CAA6C;IAC7C,IAAI,gBAAgB,KAAK,qBAAS,CAAC,KAAK,CAAC,OAAO,CAAC,sBAAsB,EAAE;QACvE,6CAA6C;QAC7C,QAAQ;QACR,6CAA6C;QAC7C,MAAM,WAAW,GAAG,MAAM,uBAAU,CAAC,YAAY,CAC/C,IAAI,EACJ,mBAAmB,CAAC,UAAU,CAAC,aAAa,CAC7C,CAAC;QAEF,gBAAgB,GAAG,WAAW,CAAC,MAAM,EAAE,CAAC;KACzC;IAED,IAAI,kBAAkB,EAAE;QACtB,MAAM,kBAAkB,CAAC,KAAK,EAAE,CAAC;QACjC,kBAAkB,GAAG,SAAS,CAAC;KAChC;IAED,mEAAmE;IAClE,QAAgB,CAAC,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC;IAC3C,MAAM,YAAY,
|
|
1
|
+
{"version":3,"file":"mongoClient.js","sourceRoot":"","sources":["../../src/mongoClient.ts"],"names":[],"mappings":"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"}
|
package/dist/src/mongoUpdater.js
CHANGED
|
@@ -214,15 +214,15 @@ class MongoUpdater {
|
|
|
214
214
|
logger.info(` > Succesfully locked the ${this.appSchemaCollectionName} document`);
|
|
215
215
|
return true;
|
|
216
216
|
}
|
|
217
|
-
|
|
218
|
-
if (
|
|
217
|
+
const existingLock = await appSchemaCollection.findOne({ lock: true });
|
|
218
|
+
if (existingLock === null) {
|
|
219
219
|
// try again!
|
|
220
220
|
return this.lockAppSchemaDocument();
|
|
221
221
|
}
|
|
222
222
|
// ==========================================
|
|
223
223
|
// Checks the existing lock's timestamp
|
|
224
224
|
// ==========================================
|
|
225
|
-
const lockTimestamp =
|
|
225
|
+
const lockTimestamp = existingLock.lockTimestamp;
|
|
226
226
|
const nowTimestamp = new Date().getTime();
|
|
227
227
|
const lockAgeMilliSeconds = nowTimestamp - lockTimestamp;
|
|
228
228
|
// ==========================================
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mongoUpdater.js","sourceRoot":"","sources":["../../src/mongoUpdater.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"mongoUpdater.js","sourceRoot":"","sources":["../../src/mongoUpdater.ts"],"names":[],"mappings":"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"}
|
|
@@ -26,7 +26,7 @@ describe('plugin pagination', () => {
|
|
|
26
26
|
// Makes sure Mongoose is mocked, but not in Jenkins as we will start a dedicated mongodb container.
|
|
27
27
|
const mockedDb = await mongoUtils_1.mongoUtils.mockMongoose(this, constants_1.constants.testsConfig.mockServer.serverVersion);
|
|
28
28
|
const connString = mockedDb.getUri();
|
|
29
|
-
await mongoose.connect(connString
|
|
29
|
+
await mongoose.connect(connString);
|
|
30
30
|
});
|
|
31
31
|
before(async function () {
|
|
32
32
|
this.timeout(10000);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.test.js","sourceRoot":"","sources":["../../../../src/plugins/pagination/index.test.ts"],"names":[],"mappings":";AAAA,uDAAuD;AACvD,sCAAsC;;AAGtC,6BAA6B;AAC7B,qCAAqC;AACrC,sDAAmD;AACnD,iDAA8C;AAC9C,mCAA2C;AAE3C,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC;AAE3B,MAAM,YAAY,GAAG,IAAI,QAAQ,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,CAAC;AAC3D,MAAM,WAAW,GAAG,QAAQ,CAAC,KAAK,CAAC,QAAQ,EAAE,YAAY,CAAC,CAAC;AAE3D,MAAM,UAAU,GAAG,IAAI,QAAQ,CAAC,MAAM,CAAC;IACrC,KAAK,EAAE,MAAM;IACb,IAAI,EAAE,IAAI;IACV,MAAM,EAAE;QACN,IAAI,EAAE,MAAM;QACZ,GAAG,EAAE,QAAQ;KACd;CACF,CAAC,CAAC;AAEH,UAAU,CAAC,MAAM,CAAC,wBAAgB,CAAC,CAAC;AACpC,MAAM,SAAS,GAAQ,QAAQ,CAAC,KAAK,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;AAE1D,QAAQ,CAAC,mBAAmB,EAAE,GAAG,EAAE;IACjC,MAAM,CAAC,KAAK;QACV,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QAErB,oGAAoG;QACpG,MAAM,QAAQ,GAAG,MAAM,uBAAU,CAAC,YAAY,CAC5C,IAAI,EACJ,qBAAS,CAAC,WAAW,CAAC,UAAU,CAAC,aAAa,CAC/C,CAAC;QACF,MAAM,UAAU,GAAG,QAAQ,CAAC,MAAM,EAAE,CAAC;QACrC,MAAM,QAAQ,CAAC,OAAO,CAAC,UAAU,
|
|
1
|
+
{"version":3,"file":"index.test.js","sourceRoot":"","sources":["../../../../src/plugins/pagination/index.test.ts"],"names":[],"mappings":";AAAA,uDAAuD;AACvD,sCAAsC;;AAGtC,6BAA6B;AAC7B,qCAAqC;AACrC,sDAAmD;AACnD,iDAA8C;AAC9C,mCAA2C;AAE3C,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC;AAE3B,MAAM,YAAY,GAAG,IAAI,QAAQ,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,CAAC;AAC3D,MAAM,WAAW,GAAG,QAAQ,CAAC,KAAK,CAAC,QAAQ,EAAE,YAAY,CAAC,CAAC;AAE3D,MAAM,UAAU,GAAG,IAAI,QAAQ,CAAC,MAAM,CAAC;IACrC,KAAK,EAAE,MAAM;IACb,IAAI,EAAE,IAAI;IACV,MAAM,EAAE;QACN,IAAI,EAAE,MAAM;QACZ,GAAG,EAAE,QAAQ;KACd;CACF,CAAC,CAAC;AAEH,UAAU,CAAC,MAAM,CAAC,wBAAgB,CAAC,CAAC;AACpC,MAAM,SAAS,GAAQ,QAAQ,CAAC,KAAK,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;AAE1D,QAAQ,CAAC,mBAAmB,EAAE,GAAG,EAAE;IACjC,MAAM,CAAC,KAAK;QACV,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QAErB,oGAAoG;QACpG,MAAM,QAAQ,GAAG,MAAM,uBAAU,CAAC,YAAY,CAC5C,IAAI,EACJ,qBAAS,CAAC,WAAW,CAAC,UAAU,CAAC,aAAa,CAC/C,CAAC;QACF,MAAM,UAAU,GAAG,QAAQ,CAAC,MAAM,EAAE,CAAC;QACrC,MAAM,QAAQ,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;IACrC,CAAC,CAAC,CAAC;IAEH,MAAM,CAAC,KAAK;QACV,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;QACpB,IAAI,IAAI,CAAC;QACT,MAAM,KAAK,GAAQ,EAAE,CAAC;QACtB,MAAM,IAAI,GAAG,IAAI,IAAI,EAAE,CAAC;QACxB,OAAO,WAAW,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,oBAAoB,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE;YACxE,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,GAAG,EAAE,CAAC,EAAE,EAAE;gBAC7B,IAAI,GAAG,IAAI,SAAS,CAAC;oBACnB,KAAK,EAAE,SAAS,CAAC,EAAE;oBACnB,IAAI,EAAE,IAAI,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC;oBAClC,MAAM,EAAE,MAAM,CAAC,GAAG;iBACnB,CAAC,CAAC;gBACH,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;aAClB;YACD,OAAO,SAAS,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QACjC,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,iBAAiB,EAAE,GAAG,EAAE;QACzB,MAAM,OAAO,GAAG,SAAS,CAAC,QAAQ,EAAE,CAAC;QACrC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;IACrD,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,gBAAgB,EAAE,CAAC,IAAI,EAAE,EAAE;QAC5B,SAAS,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,EAAE,CAAC,GAAU,EAAE,MAA6B,EAAE,EAAE;YACvE,MAAM,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC;YACvB,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;YAC3C,IAAI,EAAE,CAAC;QACT,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,WAAW,EAAE,GAAG,EAAE;QACzB,EAAE,CAAC,eAAe,EAAE,GAAG,EAAE;YACvB,OAAO,SAAS,CAAC,QAAQ,CAAC,EAAE,KAAK,EAAE,UAAU,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,MAA6B,EAAE,EAAE;gBACtF,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;gBACvC,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;YACrD,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QACH,EAAE,CAAC,6CAA6C,EAAE,GAAG,EAAE;YACrD,OAAO,SAAS,CAAC,QAAQ,EAAE,CAAC,IAAI,CAAC,CAAC,MAA6B,EAAE,EAAE;gBACjE,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;gBACxC,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,UAAU,CAAE,QAAgB,CAAC,QAAQ,CAAC,CAAC;gBACxE,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;gBAC/C,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;gBACzC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;YAC3C,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QACH,EAAE,CAAC,uBAAuB,EAAE,GAAG,EAAE;YAC/B,OAAO,SAAS;iBACb,QAAQ,CAAC,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC;iBACvC,IAAI,CAAC,CAAC,MAA6B,EAAE,EAAE;gBACtC,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;gBACxC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;gBAC/C,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;gBACzC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;YAC5C,CAAC,CAAC,CAAC;QACP,CAAC,CAAC,CAAC;QACH,EAAE,CAAC,iBAAiB,EAAE,GAAG,EAAE;YACzB,OAAO,SAAS,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,IAAI,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,MAA6B,EAAE,EAAE;gBAC1F,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;gBACvC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;gBAC/C,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;YAC1C,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QACH,EAAE,CAAC,aAAa,EAAE,GAAG,EAAE;YACrB,OAAO,SAAS,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,MAA6B,EAAE,EAAE;gBACxF,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC;gBACvC,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,KAAK,CAAC;YAC5C,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QACH,EAAE,CAAC,WAAW,EAAE,GAAG,EAAE;YACnB,OAAO,SAAS;iBACb,QAAQ,CAAC,EAAE,EAAE,EAAE,IAAI,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC;iBACpC,IAAI,CAAC,CAAC,MAA6B,EAAE,EAAE;gBACtC,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;YACtD,CAAC,CAAC,CAAC;QACP,CAAC,CAAC,CAAC;QACH,EAAE,CAAC,eAAe,EAAE,GAAG,EAAE;YACvB,OAAO,SAAS;iBACb,QAAQ,CAAC,EAAE,EAAE,EAAE,QAAQ,EAAE,QAAQ,EAAE,CAAC;iBACpC,IAAI,CAAC,CAAC,MAA6B,EAAE,EAAE;gBACtC,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,oBAAoB,CAAC,CAAC;YACrE,CAAC,CAAC,CAAC;QACP,CAAC,CAAC,CAAC;QACH,QAAQ,CAAC,WAAW,EAAE,GAAG,EAAE;YACzB,EAAE,CAAC,8BAA8B,EAAE,GAAG,EAAE;gBACtC,OAAO,SAAS,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,MAA6B,EAAE,EAAE;oBACnF,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,UAAU,CAAE,QAAgB,CAAC,QAAQ,CAAC,CAAC;oBAC5E,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC;oBACpC,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;gBACtD,CAAC,CAAC,CAAC;YACL,CAAC,CAAC,CAAC;YACH,EAAE,CAAC,uBAAuB,EAAE,GAAG,EAAE;gBAC/B,OAAO,SAAS;qBACb,QAAQ,CAAC,EAAE,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,UAAU,EAAE,KAAK,EAAE,CAAC;qBAC/C,IAAI,CAAC,CAAC,MAA6B,EAAE,EAAE;oBACtC,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,UAAU,CAAE,QAAgB,CAAC,QAAQ,CAAC,CAAC;oBAC5E,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;gBACrD,CAAC,CAAC,CAAC;YACP,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,KAAK,CAAC,CAAC,IAAI,EAAE,EAAE;QACb,QAAQ,CAAC,UAAU,CAAC,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;IAC5C,CAAC,CAAC,CAAC;IAEH,KAAK,CAAC,CAAC,IAAI,EAAE,EAAE;QACb,QAAQ,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;IAC5B,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@villedemontreal/mongo",
|
|
3
|
-
"version": "
|
|
3
|
+
"version": "7.0.0",
|
|
4
4
|
"description": "Utilities for Mongo / Mongoose",
|
|
5
5
|
"main": "dist/src/index.js",
|
|
6
6
|
"typings": "dist/src",
|
|
@@ -10,12 +10,10 @@
|
|
|
10
10
|
],
|
|
11
11
|
"scripts": {
|
|
12
12
|
"start": "node run test",
|
|
13
|
-
"test": "
|
|
13
|
+
"test": "npm run compile && mocha --require ts-node/register --exit ./**/*.test.ts",
|
|
14
14
|
"compile": "node run compile",
|
|
15
|
-
"lint": "
|
|
16
|
-
"lint-fix": "
|
|
17
|
-
"tslint": "node run tslint",
|
|
18
|
-
"tslint-fix": "node run tslint-fix",
|
|
15
|
+
"lint": "npx eslint .",
|
|
16
|
+
"lint-fix": "npx eslint --fix .",
|
|
19
17
|
"prettier": "node run prettier",
|
|
20
18
|
"prettier-fix": "node run prettier-fix",
|
|
21
19
|
"watch": "node run watch"
|
|
@@ -38,14 +36,16 @@
|
|
|
38
36
|
"@types/semver": "7.3.12",
|
|
39
37
|
"@villedemontreal/general-utils": "5.16.7",
|
|
40
38
|
"@villedemontreal/logger": "6.5.7",
|
|
39
|
+
"@villedemontreal/scripting": "1.5.0",
|
|
41
40
|
"app-root-path": "3.1.0",
|
|
42
41
|
"fs-extra": "10.1.0",
|
|
43
42
|
"http-status-codes": "2.2.0",
|
|
44
43
|
"lodash": "4.17.21",
|
|
45
|
-
"mongodb": "
|
|
46
|
-
"mongodb-memory-server-core": "
|
|
47
|
-
"mongoose": "5.
|
|
48
|
-
"semver": "7.3.
|
|
44
|
+
"mongodb": "4.8.1",
|
|
45
|
+
"mongodb-memory-server-core": "8.8.0",
|
|
46
|
+
"mongoose": "6.5.0",
|
|
47
|
+
"semver": "7.3.5",
|
|
48
|
+
"ts-node": "^10.9.1"
|
|
49
49
|
},
|
|
50
50
|
"devDependencies": {
|
|
51
51
|
"@types/chai": "4.3.3",
|
|
@@ -54,15 +54,15 @@
|
|
|
54
54
|
"@types/sinon": "10.0.13",
|
|
55
55
|
"@typescript-eslint/eslint-plugin": "5.36.1",
|
|
56
56
|
"@typescript-eslint/parser": "5.36.1",
|
|
57
|
-
"@villedemontreal/scripting": "2.1.6",
|
|
58
57
|
"chai": "4.3.6",
|
|
59
58
|
"eslint": "8.23.0",
|
|
60
59
|
"eslint-config-prettier": "8.5.0",
|
|
61
60
|
"eslint-plugin-prettier": "4.2.1",
|
|
62
61
|
"mocha": "9.2.2",
|
|
63
62
|
"mocha-jenkins-reporter": "0.4.7",
|
|
64
|
-
"
|
|
63
|
+
"prettier": "2.7.1",
|
|
65
64
|
"sinon": "14.0.0",
|
|
66
65
|
"typescript": "4.8.2"
|
|
66
|
+
|
|
67
67
|
}
|
|
68
68
|
}
|
package/src/mongoClient.ts
CHANGED
|
@@ -39,7 +39,7 @@ async function doInitMongoose(
|
|
|
39
39
|
|
|
40
40
|
// Updates Promise for mongoose, avoid warning log emit by mongoose
|
|
41
41
|
(mongoose as any).Promise = global.Promise;
|
|
42
|
-
const mongoOptions: mongoose.
|
|
42
|
+
const mongoOptions: mongoose.ConnectOptions = defaultsDeep(
|
|
43
43
|
mongooseConfigClean.connectionOptions,
|
|
44
44
|
{
|
|
45
45
|
promiseLibrary: global.Promise,
|
package/src/mongoUpdater.ts
CHANGED
|
@@ -277,8 +277,8 @@ export class MongoUpdater implements IMongoUpdater {
|
|
|
277
277
|
return true;
|
|
278
278
|
}
|
|
279
279
|
|
|
280
|
-
|
|
281
|
-
if (
|
|
280
|
+
const existingLock = await appSchemaCollection.findOne({ lock: true });
|
|
281
|
+
if (existingLock === null) {
|
|
282
282
|
// try again!
|
|
283
283
|
return this.lockAppSchemaDocument();
|
|
284
284
|
}
|
|
@@ -286,7 +286,7 @@ export class MongoUpdater implements IMongoUpdater {
|
|
|
286
286
|
// ==========================================
|
|
287
287
|
// Checks the existing lock's timestamp
|
|
288
288
|
// ==========================================
|
|
289
|
-
const lockTimestamp = (
|
|
289
|
+
const lockTimestamp = (existingLock as any).lockTimestamp;
|
|
290
290
|
const nowTimestamp = new Date().getTime();
|
|
291
291
|
const lockAgeMilliSeconds = nowTimestamp - lockTimestamp;
|
|
292
292
|
|
|
@@ -35,7 +35,7 @@ describe('plugin pagination', () => {
|
|
|
35
35
|
constants.testsConfig.mockServer.serverVersion
|
|
36
36
|
);
|
|
37
37
|
const connString = mockedDb.getUri();
|
|
38
|
-
await mongoose.connect(connString
|
|
38
|
+
await mongoose.connect(connString);
|
|
39
39
|
});
|
|
40
40
|
|
|
41
41
|
before(async function () {
|