@villedemontreal/mongo 7.0.0-beta → 7.0.1
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/scripts/index.d.ts +6 -0
- package/dist/scripts/index.js +16 -0
- package/dist/scripts/index.js.map +1 -0
- package/dist/scripts/lint.d.ts +6 -0
- package/dist/scripts/lint.js +18 -0
- package/dist/scripts/lint.js.map +1 -0
- package/dist/scripts/lintFix.d.ts +6 -0
- package/dist/scripts/lintFix.js +21 -0
- package/dist/scripts/lintFix.js.map +1 -0
- package/dist/scripts/showCoverage.d.ts +13 -0
- package/dist/scripts/showCoverage.js +40 -0
- package/dist/scripts/showCoverage.js.map +1 -0
- package/dist/scripts/test.d.ts +13 -0
- package/dist/scripts/test.js +29 -0
- package/dist/scripts/test.js.map +1 -0
- package/dist/scripts/testUnits.d.ts +15 -0
- package/dist/scripts/testUnits.js +95 -0
- package/dist/scripts/testUnits.js.map +1 -0
- package/dist/scripts/watch.d.ts +14 -0
- package/dist/scripts/watch.js +96 -0
- package/dist/scripts/watch.js.map +1 -0
- package/dist/src/config/configs.d.ts +3 -0
- package/dist/src/config/configs.js +6 -0
- package/dist/src/config/configs.js.map +1 -1
- package/dist/src/mongoClient.js +63 -58
- package/dist/src/mongoClient.js.map +1 -1
- package/dist/src/mongoUpdater.js +9 -9
- package/dist/src/mongoUpdater.js.map +1 -1
- package/dist/src/mongoUpdater.test.js +9 -9
- package/dist/src/mongoUpdater.test.js.map +1 -1
- package/dist/src/mongoUtils.js +4 -1
- package/dist/src/mongoUtils.js.map +1 -1
- package/dist/src/mongoUtils.test.js +1 -0
- package/dist/src/mongoUtils.test.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/dist/tests/testingMongoUpdates/1.0.1.js +1 -1
- package/dist/tests/testingMongoUpdates/1.0.1.js.map +1 -1
- package/package.json +18 -16
- package/src/config/configs.ts +9 -0
- package/src/mongoClient.ts +80 -69
- package/src/mongoUpdater.test.ts +9 -9
- package/src/mongoUpdater.ts +9 -10
- package/src/plugins/pagination/index.test.ts +1 -1
package/dist/src/mongoUpdater.js
CHANGED
|
@@ -22,25 +22,20 @@ class MongoUpdater {
|
|
|
22
22
|
this.checkUpdates = async () => {
|
|
23
23
|
logger.info('Checking for db app schema updates:');
|
|
24
24
|
let lockAcquired = false;
|
|
25
|
+
let currentAppSchemaVersion;
|
|
25
26
|
const targetVersion = this.findMongoAppSchemaTargetVersion();
|
|
26
27
|
try {
|
|
27
|
-
while (
|
|
28
|
+
while (!lockAcquired) {
|
|
28
29
|
// ==========================================
|
|
29
30
|
// Checks if the appSchema version has to be
|
|
30
31
|
// updated.
|
|
31
32
|
// ==========================================
|
|
32
|
-
|
|
33
|
+
currentAppSchemaVersion = await this.getAppSchemaVersion();
|
|
33
34
|
if (semver.gte(currentAppSchemaVersion, targetVersion)) {
|
|
34
35
|
// tslint:disable-next-line: prefer-template
|
|
35
36
|
logger.info(' > Current database app schema is up to date : ' + currentAppSchemaVersion + ').');
|
|
36
37
|
return;
|
|
37
38
|
}
|
|
38
|
-
if (lockAcquired) {
|
|
39
|
-
logger.info(` > Applying some required updates...`);
|
|
40
|
-
await this.applyAppSchemaUpdates(currentAppSchemaVersion, targetVersion);
|
|
41
|
-
await this.updateAppSchemaVersion(currentAppSchemaVersion, targetVersion);
|
|
42
|
-
return;
|
|
43
|
-
}
|
|
44
39
|
// ==========================================
|
|
45
40
|
// Tries to get the lock. Will do this as long
|
|
46
41
|
// as the lock can't be acquired (ie : it is
|
|
@@ -58,6 +53,11 @@ class MongoUpdater {
|
|
|
58
53
|
logger.info(` > Lock acquired.`);
|
|
59
54
|
}
|
|
60
55
|
}
|
|
56
|
+
if (lockAcquired && currentAppSchemaVersion) {
|
|
57
|
+
logger.info(` > Applying some required updates...`);
|
|
58
|
+
await this.applyAppSchemaUpdates(currentAppSchemaVersion, targetVersion);
|
|
59
|
+
await this.updateAppSchemaVersion(currentAppSchemaVersion, targetVersion);
|
|
60
|
+
}
|
|
61
61
|
}
|
|
62
62
|
finally {
|
|
63
63
|
if (lockAcquired) {
|
|
@@ -182,7 +182,7 @@ class MongoUpdater {
|
|
|
182
182
|
}
|
|
183
183
|
}
|
|
184
184
|
async getAppSchemaCollection() {
|
|
185
|
-
return
|
|
185
|
+
return this.mongoDb.collection(this.appSchemaCollectionName);
|
|
186
186
|
}
|
|
187
187
|
async getAppSchemaVersion() {
|
|
188
188
|
const appSchemaCollection = await this.getAppSchemaCollection();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mongoUpdater.js","sourceRoot":"","sources":["../../src/mongoUpdater.ts"],"names":[],"mappings":";;;AAAA,kEAA8D;AAC9D,yBAAyB;AACzB,mCAAoC;AAEpC,iCAAiC;AACjC,kDAAmE;AACnE,2CAA8C;AAE9C,MAAM,MAAM,GAAG,IAAA,qBAAY,EAAC,cAAc,CAAC,CAAC;AA0E5C,MAAa,YAAY;IACvB,YACU,OAAmB;IAC3B;;;OAGG;IACK,yBAAiC,EACjC,iBAAyB,EACzB,uBAA+B;QAP/B,YAAO,GAAP,OAAO,CAAY;QAKnB,8BAAyB,GAAzB,yBAAyB,CAAQ;QACjC,sBAAiB,GAAjB,iBAAiB,CAAQ;QACzB,4BAAuB,GAAvB,uBAAuB,CAAQ;QAkRlC,iBAAY,GAAG,KAAK,IAAmB,EAAE;YAC9C,MAAM,CAAC,IAAI,CAAC,qCAAqC,CAAC,CAAC;YAEnD,IAAI,YAAY,GAAG,KAAK,CAAC;YACzB,MAAM,aAAa,GAAW,IAAI,CAAC,+BAA+B,EAAE,CAAC;YACrE,IAAI;gBACF,OAAO,
|
|
1
|
+
{"version":3,"file":"mongoUpdater.js","sourceRoot":"","sources":["../../src/mongoUpdater.ts"],"names":[],"mappings":"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"}
|
|
@@ -36,13 +36,13 @@ describe('Mongo Updater', () => {
|
|
|
36
36
|
// ==========================================
|
|
37
37
|
await mongoDb.dropDatabase();
|
|
38
38
|
});
|
|
39
|
-
describe('getSchemaVersion',
|
|
39
|
+
describe('getSchemaVersion', () => {
|
|
40
40
|
it('should contain schema version 0.0.0', async () => {
|
|
41
41
|
const version = await mongoUpdater.getAppSchemaVersion();
|
|
42
42
|
chai_1.assert.strictEqual(version, '0.0.0');
|
|
43
43
|
});
|
|
44
44
|
});
|
|
45
|
-
describe('checkInstall',
|
|
45
|
+
describe('checkInstall', () => {
|
|
46
46
|
let installAppSchemaCollectionSpy;
|
|
47
47
|
beforeEach(async () => {
|
|
48
48
|
installAppSchemaCollectionSpy = sinon.spy(mongoUpdater, 'installAppSchemaCollection');
|
|
@@ -80,13 +80,13 @@ describe('Mongo Updater', () => {
|
|
|
80
80
|
chai_1.assert.strictEqual(schemaDb[0].version, '0.0.0');
|
|
81
81
|
});
|
|
82
82
|
});
|
|
83
|
-
describe('getSchemaVersion',
|
|
83
|
+
describe('getSchemaVersion', () => {
|
|
84
84
|
it('should contain schema version 0.0.0', async () => {
|
|
85
85
|
const version = await mongoUpdater.getAppSchemaVersion();
|
|
86
86
|
chai_1.assert.strictEqual(version, '0.0.0');
|
|
87
87
|
});
|
|
88
88
|
});
|
|
89
|
-
describe('lock',
|
|
89
|
+
describe('lock', () => {
|
|
90
90
|
it('lock should be equal to false', async () => {
|
|
91
91
|
const schema = mongoDb.collection(testconfig.updater.appSchemaCollectionName);
|
|
92
92
|
const schemaDb = await schema.find().toArray();
|
|
@@ -106,7 +106,7 @@ describe('Mongo Updater', () => {
|
|
|
106
106
|
chai_1.assert.strictEqual(isLocked, false);
|
|
107
107
|
});
|
|
108
108
|
});
|
|
109
|
-
describe('unlock',
|
|
109
|
+
describe('unlock', () => {
|
|
110
110
|
it('lock should be equal to true', async () => {
|
|
111
111
|
const schema = mongoDb.collection(testconfig.updater.appSchemaCollectionName);
|
|
112
112
|
const schemaDb = await schema.find().toArray();
|
|
@@ -129,7 +129,7 @@ describe('Mongo Updater', () => {
|
|
|
129
129
|
chai_1.assert.strictEqual(schemaDb[0].lock, false);
|
|
130
130
|
});
|
|
131
131
|
});
|
|
132
|
-
describe('updateSchemaVersion',
|
|
132
|
+
describe('updateSchemaVersion', () => {
|
|
133
133
|
it('should contain schema version 0.0.0', async () => {
|
|
134
134
|
const version = await mongoUpdater.getAppSchemaVersion();
|
|
135
135
|
chai_1.assert.strictEqual(version, '0.0.0');
|
|
@@ -145,7 +145,7 @@ describe('Mongo Updater', () => {
|
|
|
145
145
|
chai_1.assert.strictEqual(version, '0.0.0');
|
|
146
146
|
});
|
|
147
147
|
});
|
|
148
|
-
describe('checkUpdate',
|
|
148
|
+
describe('checkUpdate', () => {
|
|
149
149
|
let lockSpy;
|
|
150
150
|
let applyUpdateSchemasSpy;
|
|
151
151
|
let updateSchemaVersionSpy;
|
|
@@ -200,7 +200,7 @@ describe('Mongo Updater', () => {
|
|
|
200
200
|
}
|
|
201
201
|
});
|
|
202
202
|
});
|
|
203
|
-
describe('getUpdateFiles',
|
|
203
|
+
describe('getUpdateFiles', () => {
|
|
204
204
|
it('should not contain files for version between 0.0.0 and 0.0.0', async () => {
|
|
205
205
|
const files = await mongoUpdater.getAppSchemaUpdateFiles('0.0.0', '0.0.0');
|
|
206
206
|
chai_1.assert.strictEqual(files.length, 0);
|
|
@@ -215,7 +215,7 @@ describe('Mongo Updater', () => {
|
|
|
215
215
|
chai_1.assert.strictEqual(files[0], '1.0.0');
|
|
216
216
|
});
|
|
217
217
|
});
|
|
218
|
-
describe('applyUpdateSchemas',
|
|
218
|
+
describe('applyUpdateSchemas', () => {
|
|
219
219
|
let getUpdateFilesSpy;
|
|
220
220
|
beforeEach(async () => {
|
|
221
221
|
getUpdateFilesSpy = sinon.spy(mongoUpdater, 'getAppSchemaUpdateFiles');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mongoUpdater.test.js","sourceRoot":"","sources":["../../src/mongoUpdater.test.ts"],"names":[],"mappings":";AAAA,sBAAsB;AACtB,sCAAsC;AACtC,mCAAmC;;AAEnC,kEAAuD;AACvD,+BAA8B;AAE9B,+BAA+B;AAC/B,kDAAmE;AAEnE,+CAA6C;AAC7C,iDAA6D;AAC7D,6CAA0C;AAC1C,yEAAyE;AAEzE,IAAI,OAAmB,CAAC;AACxB,IAAI,YAA2B,CAAC;AAEhC,IAAA,gDAAwB,GAAE,CAAC;AAE3B,6CAA6C;AAC7C,gBAAgB;AAChB,6CAA6C;AAC7C,QAAQ,CAAC,eAAe,EAAE,GAAG,EAAE;IAC7B,qDAAqD;IACrD,kDAAkD;IAClD,MAAM,UAAU,GAAqB,qBAAgB,CAAC,WAAW,CAAC;IAElE,MAAM,CAAC,KAAK;QACV,oGAAoG;QACpG,MAAM,uBAAU,CAAC,YAAY,CAAC,IAAI,EAAE,UAAU,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC;QACzE,MAAM,UAAU,GAAG,MAAM,IAAA,0BAAY,EAAC,UAAU,CAAC,CAAC;QAElD,aAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QACxB,OAAO,GAAG,UAAU,CAAC,EAAE,CAAC;QAExB,gCAAgC;QAChC,YAAY,GAAG,IAAI,2BAAY,CAC7B,OAAO,EACP,UAAU,CAAC,OAAO,CAAC,yBAAyB,EAC5C,UAAU,CAAC,OAAO,CAAC,iBAAiB,EACpC,UAAU,CAAC,OAAO,CAAC,uBAAuB,CAC3C,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,KAAK,CAAC,KAAK,IAAI,EAAE;QACf,6CAA6C;QAC7C,6BAA6B;QAC7B,6CAA6C;QAC7C,MAAM,OAAO,CAAC,YAAY,EAAE,CAAC;IAC/B,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,kBAAkB,EAAE,
|
|
1
|
+
{"version":3,"file":"mongoUpdater.test.js","sourceRoot":"","sources":["../../src/mongoUpdater.test.ts"],"names":[],"mappings":"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"}
|
package/dist/src/mongoUtils.js
CHANGED
|
@@ -97,7 +97,10 @@ class MongoUtils {
|
|
|
97
97
|
debug: false,
|
|
98
98
|
};
|
|
99
99
|
if (useReplSet) {
|
|
100
|
-
const replSetOptions =
|
|
100
|
+
const replSetOptions = {
|
|
101
|
+
...memoryServerOption,
|
|
102
|
+
replSet: { count: 3 },
|
|
103
|
+
};
|
|
101
104
|
this.mongoMemServer = await mongodb_memory_server_core_1.MongoMemoryReplSet.create(replSetOptions);
|
|
102
105
|
}
|
|
103
106
|
else {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mongoUtils.js","sourceRoot":"","sources":["../../src/mongoUtils.ts"],"names":[],"mappings":";;;AAAA,6CAA6C;AAC7C,kBAAkB;AAClB,6CAA6C;AAC7C,kEASwC;AACxC,oDAAmD;AACnD,+BAA+B;AAC/B,qDAAqD;AACrD,4BAA4B;AAE5B,2EAAmF;AACnF,qCAAqC;AACrC,kDAA+C;AAE/C;;GAEG;AACH,MAAa,UAAU;IAAvB;QAEU,eAAU,GAAG,KAAK,CAAC;QAEnB,wBAAmB,GAAG,QAAQ,CAAC;IAySzC,CAAC;IAvSC;;;;;;;;;;;;;;;;;;;;;OAqBG;IACI,KAAK,CAAC,YAAY,CACvB,aAA4B,EAC5B,kBAA0B,EAC1B,UAAU,GAAG,KAAK;QAElB,6CAA6C;QAC7C,oCAAoC;QACpC,kBAAkB;QAClB,6CAA6C;QAC7C,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE;YACxB,gCAAgC;YAChC,6CAA6C;YAC7C,+CAA+C;YAC/C,qDAAqD;YACrD,iDAAiD;YACjD,+CAA+C;YAC/C,iBAAiB;YACjB,6CAA6C;YAC7C,MAAM,eAAe,GAAG,qBAAS,CAAC,OAAO,GAAG,kBAAkB,CAAC;YAC/D,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,eAAe,CAAC,EAAE;gBACnC,EAAE,CAAC,UAAU,CAAC,eAAe,CAAC,CAAC;aAChC;YAED,6CAA6C;YAC7C,iBAAiB;YACjB,6CAA6C;YAC7C,MAAM,YAAY,GAAG,eAAe,GAAG,OAAO,CAAC;YAC/C,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,YAAY,CAAC,EAAE;gBAChC,EAAE,CAAC,UAAU,CAAC,YAAY,CAAC,CAAC;aAC7B;iBAAM;gBACL,MAAM,qBAAK,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC;aACpC;YACD,MAAM,QAAQ,GAAG,GAAG,YAAY,IAAI,IAAI,CAAC,GAAG,EAAE,EAAE,CAAC;YACjD,EAAE,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;YAExB,6CAA6C;YAC7C,oDAAoD;YACpD,yCAAyC;YACzC,6CAA6C;YAC7C,IAAI,aAAa,EAAE;gBACjB,IAAI,CAAC,aAAa,CAAC,OAAO,IAAI,CAAC,CAAC,CAAC,UAAU,CAAC,aAAa,CAAC,OAAO,CAAC,EAAE;oBAClE,MAAM,IAAI,KAAK,CACb,iEAAiE;wBAC/D,+EAA+E;wBAC/E,oFAAoF;wBACpF,6EAA6E,CAChF,CAAC;iBACH;gBAED,aAAa,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;aAC/B;YAED,4EAA4E;YAC5E,MAAM,kBAAkB,GAAQ;gBAC9B,QAAQ,EAAE;oBACR,MAAM,EAAE,QAAQ,EAAE,uCAAuC;iBAC1D;gBAED,MAAM,EAAE;oBACN,OAAO,EAAE,kBAAkB,CAAC,CAAC,CAAC,kBAAkB,CAAC,CAAC,CAAC,QAAQ;oBAC3D,WAAW,EAAE,eAAe,EAAE,wEAAwE;iBACvG;gBACD,KAAK,EAAE,KAAK;aACb,CAAC;YAEF,IAAI,UAAU,EAAE;gBACd,MAAM,cAAc,
|
|
1
|
+
{"version":3,"file":"mongoUtils.js","sourceRoot":"","sources":["../../src/mongoUtils.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mongoUtils.test.js","sourceRoot":"","sources":["../../src/mongoUtils.test.ts"],"names":[],"mappings":"AAAA,iCAAiC;AACjC,sFAAsF;AACtF,6CAA6C;AAE7C,iDAAiD;AACjD,OAAO;AACP,iOAAiO;AACjO,oGAAoG;AACpG,OAAO;AACP,iEAAiE;AACjE,2CAA2C;AAC3C,wEAAwE;AACxE,iCAAiC;AACjC,qDAAqD;AACrD,QAAQ;AAER,sEAAsE;AACtE,2CAA2C;AAC3C,uEAAuE;AACvE,iCAAiC;AACjC,sDAAsD;AACtD,QAAQ;AACR,MAAM"}
|
|
1
|
+
{"version":3,"file":"mongoUtils.test.js","sourceRoot":"","sources":["../../src/mongoUtils.test.ts"],"names":[],"mappings":";AAAA,iCAAiC;AACjC,sFAAsF;AACtF,6CAA6C;AAE7C,iDAAiD;AACjD,OAAO;AACP,iOAAiO;AACjO,oGAAoG;AACpG,OAAO;AACP,iEAAiE;AACjE,2CAA2C;AAC3C,wEAAwE;AACxE,iCAAiC;AACjC,qDAAqD;AACrD,QAAQ;AAER,sEAAsE;AACtE,2CAA2C;AAC3C,uEAAuE;AACvE,iCAAiC;AACjC,sDAAsD;AACtD,QAAQ;AACR,MAAM"}
|
|
@@ -36,7 +36,7 @@ describe('plugin pagination', () => {
|
|
|
36
36
|
return authorModel.create({ name: 'Arthur Conan Doyle' }).then((author) => {
|
|
37
37
|
for (let i = 1; i <= 100; i++) {
|
|
38
38
|
book = new bookModel({
|
|
39
|
-
title:
|
|
39
|
+
title: `Book #${i}`,
|
|
40
40
|
date: new Date(date.getTime() + i),
|
|
41
41
|
author: author._id,
|
|
42
42
|
});
|
|
@@ -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,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,
|
|
1
|
+
{"version":3,"file":"index.test.js","sourceRoot":"","sources":["../../../../src/plugins/pagination/index.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,7 +7,7 @@ async function update(db) {
|
|
|
7
7
|
// ==========================================
|
|
8
8
|
// Adding extra indexes on the "test" collection.
|
|
9
9
|
// ==========================================
|
|
10
|
-
const testUserCollection =
|
|
10
|
+
const testUserCollection = db.collection('test');
|
|
11
11
|
await testUserCollection.createIndexes([
|
|
12
12
|
{
|
|
13
13
|
key: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"1.0.1.js","sourceRoot":"","sources":["../../../tests/testingMongoUpdates/1.0.1.ts"],"names":[],"mappings":";;AAEA;;GAEG;AACY,KAAK,UAAU,MAAM,CAAC,EAAc;IACjD,6CAA6C;IAC7C,iDAAiD;IACjD,6CAA6C;IAC7C,MAAM,kBAAkB,GAAuB,
|
|
1
|
+
{"version":3,"file":"1.0.1.js","sourceRoot":"","sources":["../../../tests/testingMongoUpdates/1.0.1.ts"],"names":[],"mappings":";;AAEA;;GAEG;AACY,KAAK,UAAU,MAAM,CAAC,EAAc;IACjD,6CAA6C;IAC7C,iDAAiD;IACjD,6CAA6C;IAC7C,MAAM,kBAAkB,GAAuB,EAAE,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;IAErE,MAAM,kBAAkB,CAAC,aAAa,CAAC;QACrC;YACE,GAAG,EAAE;gBACH,SAAS,EAAE,CAAC;gBACZ,QAAQ,EAAE,CAAC;aACZ;YACD,IAAI,EAAE,oBAAoB;SAC3B;KACF,CAAC,CAAC;AACL,CAAC;AAfD,yBAeC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@villedemontreal/mongo",
|
|
3
|
-
"version": "7.0.
|
|
3
|
+
"version": "7.0.1",
|
|
4
4
|
"description": "Utilities for Mongo / Mongoose",
|
|
5
5
|
"main": "dist/src/index.js",
|
|
6
6
|
"typings": "dist/src",
|
|
@@ -32,12 +32,13 @@
|
|
|
32
32
|
"license": "MIT",
|
|
33
33
|
"dependencies": {
|
|
34
34
|
"@types/http-status-codes": "1.2.0",
|
|
35
|
-
"@types/lodash": "4.14.
|
|
36
|
-
"@types/semver": "7.3.
|
|
37
|
-
"@villedemontreal/general-utils": "5.16.
|
|
38
|
-
"@villedemontreal/logger": "6.5.
|
|
39
|
-
"@villedemontreal/scripting": "1.
|
|
40
|
-
"
|
|
35
|
+
"@types/lodash": "4.14.184",
|
|
36
|
+
"@types/semver": "7.3.12",
|
|
37
|
+
"@villedemontreal/general-utils": "5.16.7",
|
|
38
|
+
"@villedemontreal/logger": "6.5.7",
|
|
39
|
+
"@villedemontreal/scripting": "2.1.6",
|
|
40
|
+
"app-root-path": "3.1.0",
|
|
41
|
+
"fs-extra": "10.1.0",
|
|
41
42
|
"http-status-codes": "2.2.0",
|
|
42
43
|
"lodash": "4.17.21",
|
|
43
44
|
"mongodb": "4.8.1",
|
|
@@ -47,20 +48,21 @@
|
|
|
47
48
|
"ts-node": "^10.9.1"
|
|
48
49
|
},
|
|
49
50
|
"devDependencies": {
|
|
50
|
-
"@types/chai": "4.3.
|
|
51
|
+
"@types/chai": "4.3.3",
|
|
51
52
|
"@types/fs-extra": "9.0.13",
|
|
52
|
-
"@types/mocha": "9.1.
|
|
53
|
-
"@types/sinon": "10.0.
|
|
54
|
-
"@typescript-eslint/eslint-plugin": "
|
|
55
|
-
"@typescript-eslint/parser": "
|
|
53
|
+
"@types/mocha": "9.1.1",
|
|
54
|
+
"@types/sinon": "10.0.13",
|
|
55
|
+
"@typescript-eslint/eslint-plugin": "5.36.1",
|
|
56
|
+
"@typescript-eslint/parser": "5.36.1",
|
|
56
57
|
"chai": "4.3.6",
|
|
57
|
-
"eslint": "
|
|
58
|
+
"eslint": "8.23.0",
|
|
58
59
|
"eslint-config-prettier": "8.5.0",
|
|
59
|
-
"eslint-plugin-prettier": "4.
|
|
60
|
+
"eslint-plugin-prettier": "4.2.1",
|
|
60
61
|
"mocha": "9.2.2",
|
|
61
62
|
"mocha-jenkins-reporter": "0.4.7",
|
|
62
63
|
"prettier": "2.7.1",
|
|
63
|
-
"sinon": "
|
|
64
|
-
"typescript": "4.
|
|
64
|
+
"sinon": "14.0.0",
|
|
65
|
+
"typescript": "4.8.2"
|
|
66
|
+
|
|
65
67
|
}
|
|
66
68
|
}
|
package/src/config/configs.ts
CHANGED
|
@@ -1,11 +1,20 @@
|
|
|
1
1
|
import { ILogger } from '@villedemontreal/logger';
|
|
2
|
+
import * as os from 'os';
|
|
3
|
+
import * as path from 'path';
|
|
2
4
|
|
|
3
5
|
/**
|
|
4
6
|
* Lib configs
|
|
5
7
|
*/
|
|
6
8
|
export class Configs {
|
|
9
|
+
public isWindows: boolean;
|
|
10
|
+
public libRoot: string;
|
|
7
11
|
private _loggerCreator: (name: string) => ILogger;
|
|
8
12
|
|
|
13
|
+
constructor() {
|
|
14
|
+
this.libRoot = path.normalize(__dirname + '/../../..');
|
|
15
|
+
this.isWindows = os.platform() === 'win32';
|
|
16
|
+
}
|
|
17
|
+
|
|
9
18
|
/**
|
|
10
19
|
* The Logger creator
|
|
11
20
|
*/
|
package/src/mongoClient.ts
CHANGED
|
@@ -10,6 +10,81 @@ const logger = createLogger('mongoClient');
|
|
|
10
10
|
|
|
11
11
|
let mongooseConnection: mongoose.Connection;
|
|
12
12
|
|
|
13
|
+
async function doInitMongoose(
|
|
14
|
+
mongooseConfigClean: MongooseConfigs,
|
|
15
|
+
resolve: (value: mongoose.Connection) => void,
|
|
16
|
+
reject: (reason?: any) => void
|
|
17
|
+
): Promise<void> {
|
|
18
|
+
let connectionString = mongooseConfigClean.connectionString;
|
|
19
|
+
|
|
20
|
+
// ==========================================
|
|
21
|
+
// Mocked Mongo server?
|
|
22
|
+
// ==========================================
|
|
23
|
+
if (connectionString === constants.mongo.testing.MOCK_CONNECTION_STRING) {
|
|
24
|
+
// ==========================================
|
|
25
|
+
// Mock!
|
|
26
|
+
// ==========================================
|
|
27
|
+
const mongoServer = await mongoUtils.mockMongoose(
|
|
28
|
+
null,
|
|
29
|
+
mongooseConfigClean.mockServer.serverVersion
|
|
30
|
+
);
|
|
31
|
+
|
|
32
|
+
connectionString = mongoServer.getUri();
|
|
33
|
+
}
|
|
34
|
+
|
|
35
|
+
if (mongooseConnection) {
|
|
36
|
+
await mongooseConnection.close();
|
|
37
|
+
mongooseConnection = undefined;
|
|
38
|
+
}
|
|
39
|
+
|
|
40
|
+
// Updates Promise for mongoose, avoid warning log emit by mongoose
|
|
41
|
+
(mongoose as any).Promise = global.Promise;
|
|
42
|
+
const mongoOptions: mongoose.ConnectOptions = defaultsDeep(
|
|
43
|
+
mongooseConfigClean.connectionOptions,
|
|
44
|
+
{
|
|
45
|
+
promiseLibrary: global.Promise,
|
|
46
|
+
}
|
|
47
|
+
);
|
|
48
|
+
|
|
49
|
+
// Creates the connection
|
|
50
|
+
mongooseConnection = mongoose.createConnection(connectionString, mongoOptions);
|
|
51
|
+
|
|
52
|
+
// Triggered if an error occured
|
|
53
|
+
mongooseConnection.on('error', (err: any) => {
|
|
54
|
+
mongooseConnection = null;
|
|
55
|
+
reject(`Mongo Database: Error connecting to Mongo: ${err}`);
|
|
56
|
+
});
|
|
57
|
+
|
|
58
|
+
// Triggered when the connection is made.
|
|
59
|
+
mongooseConnection.on('connected', () => {
|
|
60
|
+
(async () => {
|
|
61
|
+
// Check for schema updates once the connexion is made
|
|
62
|
+
if (mongooseConfigClean.applyUpdates) {
|
|
63
|
+
try {
|
|
64
|
+
await checkForUpdates(mongooseConfigClean);
|
|
65
|
+
} catch (err) {
|
|
66
|
+
try {
|
|
67
|
+
await mongooseConnection.close();
|
|
68
|
+
mongooseConnection = undefined;
|
|
69
|
+
} catch (err) {
|
|
70
|
+
logger.warning(`Error closing connection to Mongo : ${err}`);
|
|
71
|
+
}
|
|
72
|
+
|
|
73
|
+
reject(`Error updating Mongo: ${err}`);
|
|
74
|
+
return;
|
|
75
|
+
}
|
|
76
|
+
} else {
|
|
77
|
+
logger.info(`Mongo updates skipped`);
|
|
78
|
+
}
|
|
79
|
+
|
|
80
|
+
// All good!
|
|
81
|
+
resolve(mongooseConnection);
|
|
82
|
+
})().catch((err) => {
|
|
83
|
+
reject(err);
|
|
84
|
+
});
|
|
85
|
+
});
|
|
86
|
+
}
|
|
87
|
+
|
|
13
88
|
/**
|
|
14
89
|
* This is the entry point to use this library to manage your
|
|
15
90
|
* Mongoose connections.
|
|
@@ -26,74 +101,10 @@ export async function initMongoose(mongooseConfig: IMongooseConfigs): Promise<mo
|
|
|
26
101
|
// ==========================================
|
|
27
102
|
const mongooseConfigClean = new MongooseConfigs(mongooseConfig);
|
|
28
103
|
|
|
29
|
-
return new Promise<mongoose.Connection>(
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
// Mocked Mongo server?
|
|
34
|
-
// ==========================================
|
|
35
|
-
if (connectionString === constants.mongo.testing.MOCK_CONNECTION_STRING) {
|
|
36
|
-
// ==========================================
|
|
37
|
-
// Mock!
|
|
38
|
-
// ==========================================
|
|
39
|
-
const mongoServer = await mongoUtils.mockMongoose(
|
|
40
|
-
null,
|
|
41
|
-
mongooseConfigClean.mockServer.serverVersion
|
|
42
|
-
);
|
|
43
|
-
|
|
44
|
-
connectionString = mongoServer.getUri();
|
|
45
|
-
}
|
|
46
|
-
|
|
47
|
-
try {
|
|
48
|
-
if (mongooseConnection) {
|
|
49
|
-
await mongooseConnection.close();
|
|
50
|
-
mongooseConnection = undefined;
|
|
51
|
-
}
|
|
52
|
-
|
|
53
|
-
// Updates Promise for mongoose, avoid warning log emit by mongoose
|
|
54
|
-
(mongoose as any).Promise = global.Promise;
|
|
55
|
-
const mongoOptions: mongoose.ConnectOptions = defaultsDeep(
|
|
56
|
-
mongooseConfigClean.connectionOptions,
|
|
57
|
-
{
|
|
58
|
-
promiseLibrary: global.Promise,
|
|
59
|
-
}
|
|
60
|
-
);
|
|
61
|
-
|
|
62
|
-
// Creates the connection
|
|
63
|
-
mongooseConnection = mongoose.createConnection(connectionString, mongoOptions);
|
|
64
|
-
|
|
65
|
-
// Triggered if an error occured
|
|
66
|
-
mongooseConnection.on('error', (err: any) => {
|
|
67
|
-
mongooseConnection = null;
|
|
68
|
-
reject('Mongo Database: Error connecting to Mongo: ' + err);
|
|
69
|
-
});
|
|
70
|
-
|
|
71
|
-
// Triggered when the connection is made.
|
|
72
|
-
mongooseConnection.on('connected', async () => {
|
|
73
|
-
// Check for schema updates once the connexion is made
|
|
74
|
-
if (mongooseConfigClean.applyUpdates) {
|
|
75
|
-
try {
|
|
76
|
-
await checkForUpdates(mongooseConfigClean);
|
|
77
|
-
} catch (err) {
|
|
78
|
-
try {
|
|
79
|
-
await mongooseConnection.close();
|
|
80
|
-
mongooseConnection = undefined;
|
|
81
|
-
} catch (err) {
|
|
82
|
-
logger.warning(`Error closing connection to Mongo : ${err}`);
|
|
83
|
-
}
|
|
84
|
-
|
|
85
|
-
return reject('Error updating Mongo: ' + err);
|
|
86
|
-
}
|
|
87
|
-
} else {
|
|
88
|
-
logger.info(`Mongo updates skipped`);
|
|
89
|
-
}
|
|
90
|
-
|
|
91
|
-
// All good!
|
|
92
|
-
resolve(mongooseConnection);
|
|
93
|
-
});
|
|
94
|
-
} catch (err) {
|
|
95
|
-
return reject('Error initializing Mongo: ' + err);
|
|
96
|
-
}
|
|
104
|
+
return new Promise<mongoose.Connection>((resolve, reject) => {
|
|
105
|
+
doInitMongoose(mongooseConfigClean, resolve, reject).catch((err) => {
|
|
106
|
+
reject(`Error initializing Mongo: ${err}`);
|
|
107
|
+
});
|
|
97
108
|
});
|
|
98
109
|
}
|
|
99
110
|
|
|
@@ -102,7 +113,7 @@ export async function initMongoose(mongooseConfig: IMongooseConfigs): Promise<mo
|
|
|
102
113
|
* to run the application on the target Mongo database.
|
|
103
114
|
*/
|
|
104
115
|
async function checkForUpdates(mongooseConfig: IMongooseConfigs): Promise<void> {
|
|
105
|
-
const connection =
|
|
116
|
+
const connection = getMongooseConnection();
|
|
106
117
|
const updater: IMongoUpdater = new MongoUpdater(
|
|
107
118
|
connection.db,
|
|
108
119
|
mongooseConfig.updater.mongoSchemaUpdatesDirPath,
|