@payloadcms/db-mongodb 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.
- package/dist/connect.d.ts.map +1 -1
- package/dist/connect.js +6 -1
- package/dist/create.d.ts.map +1 -1
- package/dist/create.js +8 -10
- package/dist/index.d.ts +5 -2
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +8 -3
- package/dist/queries/buildSearchParams.js +6 -6
- package/dist/queries/sanitizeQueryValue.d.ts +4 -1
- package/dist/queries/sanitizeQueryValue.d.ts.map +1 -1
- package/dist/queries/sanitizeQueryValue.js +17 -4
- package/dist/transactions/beginTransaction.d.ts.map +1 -1
- package/dist/transactions/beginTransaction.js +9 -17
- package/dist/updateOne.d.ts.map +1 -1
- package/dist/updateOne.js +3 -10
- package/dist/utilities/handleError.d.ts +3 -0
- package/dist/utilities/handleError.d.ts.map +1 -0
- package/dist/utilities/handleError.js +35 -0
- package/package.json +5 -3
package/dist/connect.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"connect.d.ts","sourceRoot":"","sources":["../src/connect.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAA;AAM/C,eAAO,MAAM,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"connect.d.ts","sourceRoot":"","sources":["../src/connect.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAA;AAM/C,eAAO,MAAM,OAAO,EAAE,OA2DrB,CAAA"}
|
package/dist/connect.js
CHANGED
|
@@ -48,6 +48,11 @@ const connect = async function connect(payload) {
|
|
|
48
48
|
}
|
|
49
49
|
try {
|
|
50
50
|
this.connection = (await _mongoose.default.connect(urlToConnect, connectionOptions)).connection;
|
|
51
|
+
const client = this.connection.getClient();
|
|
52
|
+
if (!client.options.replicaSet || this.transactionOptions === false) {
|
|
53
|
+
this.transactionOptions = false;
|
|
54
|
+
this.beginTransaction = undefined;
|
|
55
|
+
}
|
|
51
56
|
if (process.env.PAYLOAD_DROP_DATABASE === 'true') {
|
|
52
57
|
this.payload.logger.info('---- DROPPING DATABASE ----');
|
|
53
58
|
await _mongoose.default.connection.dropDatabase();
|
|
@@ -60,4 +65,4 @@ const connect = async function connect(payload) {
|
|
|
60
65
|
}
|
|
61
66
|
};
|
|
62
67
|
|
|
63
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
68
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uL3NyYy9jb25uZWN0LnRzIl0sInNvdXJjZXNDb250ZW50IjpbIi8qIGVzbGludC1kaXNhYmxlIEB0eXBlc2NyaXB0LWVzbGludC9uby12YXItcmVxdWlyZXMgKi9cbmltcG9ydCB0eXBlIHsgQ29ubmVjdE9wdGlvbnMgfSBmcm9tICdtb25nb29zZSdcbmltcG9ydCB0eXBlIHsgQ29ubmVjdCB9IGZyb20gJ3BheWxvYWQvZGF0YWJhc2UnXG5cbmltcG9ydCBtb25nb29zZSBmcm9tICdtb25nb29zZSdcblxuaW1wb3J0IHR5cGUgeyBNb25nb29zZUFkYXB0ZXIgfSBmcm9tICcuJ1xuXG5leHBvcnQgY29uc3QgY29ubmVjdDogQ29ubmVjdCA9IGFzeW5jIGZ1bmN0aW9uIGNvbm5lY3QodGhpczogTW9uZ29vc2VBZGFwdGVyLCBwYXlsb2FkKSB7XG4gIGlmICh0aGlzLnVybCA9PT0gZmFsc2UpIHtcbiAgICByZXR1cm5cbiAgfVxuXG4gIGlmICghcGF5bG9hZC5sb2NhbCAmJiB0eXBlb2YgdGhpcy51cmwgIT09ICdzdHJpbmcnKSB7XG4gICAgdGhyb3cgbmV3IEVycm9yKCdFcnJvcjogbWlzc2luZyBNb25nb0RCIGNvbm5lY3Rpb24gVVJMLicpXG4gIH1cblxuICBsZXQgdXJsVG9Db25uZWN0ID0gdGhpcy51cmxcbiAgbGV0IHN1Y2Nlc3NmdWxDb25uZWN0aW9uTWVzc2FnZSA9ICdDb25uZWN0ZWQgdG8gTW9uZ29EQiBzZXJ2ZXIgc3VjY2Vzc2Z1bGx5ISdcblxuICBjb25zdCBjb25uZWN0aW9uT3B0aW9uczogQ29ubmVjdE9wdGlvbnMgJiB7IHVzZUZhY2V0OiB1bmRlZmluZWQgfSA9IHtcbiAgICBhdXRvSW5kZXg6IHRydWUsXG4gICAgLi4udGhpcy5jb25uZWN0T3B0aW9ucyxcbiAgICB1c2VGYWNldDogdW5kZWZpbmVkLFxuICB9XG5cbiAgaWYgKHByb2Nlc3MuZW52Lk5PREVfRU5WID09PSAndGVzdCcpIHtcbiAgICBpZiAocHJvY2Vzcy5lbnYuUEFZTE9BRF9URVNUX01PTkdPX1VSTCkge1xuICAgICAgdXJsVG9Db25uZWN0ID0gcHJvY2Vzcy5lbnYuUEFZTE9BRF9URVNUX01PTkdPX1VSTFxuICAgIH0gZWxzZSB7XG4gICAgICBjb25uZWN0aW9uT3B0aW9ucy5kYk5hbWUgPSAncGF5bG9hZG1lbW9yeSdcbiAgICAgIGNvbnN0IHsgTW9uZ29NZW1vcnlTZXJ2ZXIgfSA9IHJlcXVpcmUoJ21vbmdvZGItbWVtb3J5LXNlcnZlcicpXG4gICAgICBjb25zdCBnZXRQb3J0ID0gcmVxdWlyZSgnZ2V0LXBvcnQnKVxuXG4gICAgICBjb25zdCBwb3J0ID0gYXdhaXQgZ2V0UG9ydCgpXG4gICAgICB0aGlzLm1vbmdvTWVtb3J5U2VydmVyID0gYXdhaXQgTW9uZ29NZW1vcnlTZXJ2ZXIuY3JlYXRlKHtcbiAgICAgICAgaW5zdGFuY2U6IHtcbiAgICAgICAgICBkYk5hbWU6ICdwYXlsb2FkbWVtb3J5JyxcbiAgICAgICAgICBwb3J0LFxuICAgICAgICB9LFxuICAgICAgfSlcblxuICAgICAgdXJsVG9Db25uZWN0ID0gdGhpcy5tb25nb01lbW9yeVNlcnZlci5nZXRVcmkoKVxuICAgICAgc3VjY2Vzc2Z1bENvbm5lY3Rpb25NZXNzYWdlID0gJ0Nvbm5lY3RlZCB0byBpbi1tZW1vcnkgTW9uZ29EQiBzZXJ2ZXIgc3VjY2Vzc2Z1bGx5ISdcbiAgICB9XG4gIH1cblxuICB0cnkge1xuICAgIHRoaXMuY29ubmVjdGlvbiA9IChhd2FpdCBtb25nb29zZS5jb25uZWN0KHVybFRvQ29ubmVjdCwgY29ubmVjdGlvbk9wdGlvbnMpKS5jb25uZWN0aW9uXG5cbiAgICBjb25zdCBjbGllbnQgPSB0aGlzLmNvbm5lY3Rpb24uZ2V0Q2xpZW50KClcblxuICAgIGlmICghY2xpZW50Lm9wdGlvbnMucmVwbGljYVNldCB8fCB0aGlzLnRyYW5zYWN0aW9uT3B0aW9ucyA9PT0gZmFsc2UpIHtcbiAgICAgIHRoaXMudHJhbnNhY3Rpb25PcHRpb25zID0gZmFsc2VcbiAgICAgIHRoaXMuYmVnaW5UcmFuc2FjdGlvbiA9IHVuZGVmaW5lZFxuICAgIH1cblxuICAgIGlmIChwcm9jZXNzLmVudi5QQVlMT0FEX0RST1BfREFUQUJBU0UgPT09ICd0cnVlJykge1xuICAgICAgdGhpcy5wYXlsb2FkLmxvZ2dlci5pbmZvKCctLS0tIERST1BQSU5HIERBVEFCQVNFIC0tLS0nKVxuICAgICAgYXdhaXQgbW9uZ29vc2UuY29ubmVjdGlvbi5kcm9wRGF0YWJhc2UoKVxuICAgICAgdGhpcy5wYXlsb2FkLmxvZ2dlci5pbmZvKCctLS0tIERST1BQRUQgREFUQUJBU0UgLS0tLScpXG4gICAgfVxuICAgIHRoaXMucGF5bG9hZC5sb2dnZXIuaW5mbyhzdWNjZXNzZnVsQ29ubmVjdGlvbk1lc3NhZ2UpXG4gIH0gY2F0Y2ggKGVycikge1xuICAgIHRoaXMucGF5bG9hZC5sb2dnZXIuZXJyb3IoYEVycm9yOiBjYW5ub3QgY29ubmVjdCB0byBNb25nb0RCLiBEZXRhaWxzOiAke2Vyci5tZXNzYWdlfWAsIGVycilcbiAgICBwcm9jZXNzLmV4aXQoMSlcbiAgfVxufVxuIl0sIm5hbWVzIjpbImNvbm5lY3QiLCJwYXlsb2FkIiwidXJsIiwibG9jYWwiLCJFcnJvciIsInVybFRvQ29ubmVjdCIsInN1Y2Nlc3NmdWxDb25uZWN0aW9uTWVzc2FnZSIsImNvbm5lY3Rpb25PcHRpb25zIiwiYXV0b0luZGV4IiwiY29ubmVjdE9wdGlvbnMiLCJ1c2VGYWNldCIsInVuZGVmaW5lZCIsInByb2Nlc3MiLCJlbnYiLCJOT0RFX0VOViIsIlBBWUxPQURfVEVTVF9NT05HT19VUkwiLCJkYk5hbWUiLCJNb25nb01lbW9yeVNlcnZlciIsInJlcXVpcmUiLCJnZXRQb3J0IiwicG9ydCIsIm1vbmdvTWVtb3J5U2VydmVyIiwiY3JlYXRlIiwiaW5zdGFuY2UiLCJnZXRVcmkiLCJjb25uZWN0aW9uIiwibW9uZ29vc2UiLCJjbGllbnQiLCJnZXRDbGllbnQiLCJvcHRpb25zIiwicmVwbGljYVNldCIsInRyYW5zYWN0aW9uT3B0aW9ucyIsImJlZ2luVHJhbnNhY3Rpb24iLCJQQVlMT0FEX0RST1BfREFUQUJBU0UiLCJsb2dnZXIiLCJpbmZvIiwiZHJvcERhdGFiYXNlIiwiZXJyIiwiZXJyb3IiLCJtZXNzYWdlIiwiZXhpdCJdLCJtYXBwaW5ncyI6IkFBQUEscURBQXFEOzs7OytCQVF4Q0E7OztlQUFBQTs7O2lFQUpROzs7Ozs7QUFJZCxNQUFNQSxVQUFtQixlQUFlQSxRQUErQkMsT0FBTztJQUNuRixJQUFJLElBQUksQ0FBQ0MsR0FBRyxLQUFLLE9BQU87UUFDdEI7SUFDRjtJQUVBLElBQUksQ0FBQ0QsUUFBUUUsS0FBSyxJQUFJLE9BQU8sSUFBSSxDQUFDRCxHQUFHLEtBQUssVUFBVTtRQUNsRCxNQUFNLElBQUlFLE1BQU07SUFDbEI7SUFFQSxJQUFJQyxlQUFlLElBQUksQ0FBQ0gsR0FBRztJQUMzQixJQUFJSSw4QkFBOEI7SUFFbEMsTUFBTUMsb0JBQThEO1FBQ2xFQyxXQUFXO1FBQ1gsR0FBRyxJQUFJLENBQUNDLGNBQWM7UUFDdEJDLFVBQVVDO0lBQ1o7SUFFQSxJQUFJQyxRQUFRQyxHQUFHLENBQUNDLFFBQVEsS0FBSyxRQUFRO1FBQ25DLElBQUlGLFFBQVFDLEdBQUcsQ0FBQ0Usc0JBQXNCLEVBQUU7WUFDdENWLGVBQWVPLFFBQVFDLEdBQUcsQ0FBQ0Usc0JBQXNCO1FBQ25ELE9BQU87WUFDTFIsa0JBQWtCUyxNQUFNLEdBQUc7WUFDM0IsTUFBTSxFQUFFQyxpQkFBaUIsRUFBRSxHQUFHQyxRQUFRO1lBQ3RDLE1BQU1DLFVBQVVELFFBQVE7WUFFeEIsTUFBTUUsT0FBTyxNQUFNRDtZQUNuQixJQUFJLENBQUNFLGlCQUFpQixHQUFHLE1BQU1KLGtCQUFrQkssTUFBTSxDQUFDO2dCQUN0REMsVUFBVTtvQkFDUlAsUUFBUTtvQkFDUkk7Z0JBQ0Y7WUFDRjtZQUVBZixlQUFlLElBQUksQ0FBQ2dCLGlCQUFpQixDQUFDRyxNQUFNO1lBQzVDbEIsOEJBQThCO1FBQ2hDO0lBQ0Y7SUFFQSxJQUFJO1FBQ0YsSUFBSSxDQUFDbUIsVUFBVSxHQUFHLEFBQUMsQ0FBQSxNQUFNQyxpQkFBUSxDQUFDMUIsT0FBTyxDQUFDSyxjQUFjRSxrQkFBaUIsRUFBR2tCLFVBQVU7UUFFdEYsTUFBTUUsU0FBUyxJQUFJLENBQUNGLFVBQVUsQ0FBQ0csU0FBUztRQUV4QyxJQUFJLENBQUNELE9BQU9FLE9BQU8sQ0FBQ0MsVUFBVSxJQUFJLElBQUksQ0FBQ0Msa0JBQWtCLEtBQUssT0FBTztZQUNuRSxJQUFJLENBQUNBLGtCQUFrQixHQUFHO1lBQzFCLElBQUksQ0FBQ0MsZ0JBQWdCLEdBQUdyQjtRQUMxQjtRQUVBLElBQUlDLFFBQVFDLEdBQUcsQ0FBQ29CLHFCQUFxQixLQUFLLFFBQVE7WUFDaEQsSUFBSSxDQUFDaEMsT0FBTyxDQUFDaUMsTUFBTSxDQUFDQyxJQUFJLENBQUM7WUFDekIsTUFBTVQsaUJBQVEsQ0FBQ0QsVUFBVSxDQUFDVyxZQUFZO1lBQ3RDLElBQUksQ0FBQ25DLE9BQU8sQ0FBQ2lDLE1BQU0sQ0FBQ0MsSUFBSSxDQUFDO1FBQzNCO1FBQ0EsSUFBSSxDQUFDbEMsT0FBTyxDQUFDaUMsTUFBTSxDQUFDQyxJQUFJLENBQUM3QjtJQUMzQixFQUFFLE9BQU8rQixLQUFLO1FBQ1osSUFBSSxDQUFDcEMsT0FBTyxDQUFDaUMsTUFBTSxDQUFDSSxLQUFLLENBQUMsQ0FBQywyQ0FBMkMsRUFBRUQsSUFBSUUsT0FBTyxDQUFDLENBQUMsRUFBRUY7UUFDdkZ6QixRQUFRNEIsSUFBSSxDQUFDO0lBQ2Y7QUFDRiJ9
|
package/dist/create.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"create.d.ts","sourceRoot":"","sources":["../src/create.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAA;
|
|
1
|
+
{"version":3,"file":"create.d.ts","sourceRoot":"","sources":["../src/create.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAA;AAQ9C,eAAO,MAAM,MAAM,EAAE,MAwBpB,CAAA"}
|
package/dist/create.js
CHANGED
|
@@ -8,9 +8,13 @@ Object.defineProperty(exports, "create", {
|
|
|
8
8
|
return create;
|
|
9
9
|
}
|
|
10
10
|
});
|
|
11
|
+
const _handleError = /*#__PURE__*/ _interop_require_default(require("./utilities/handleError"));
|
|
11
12
|
const _withSession = require("./withSession");
|
|
12
|
-
|
|
13
|
-
|
|
13
|
+
function _interop_require_default(obj) {
|
|
14
|
+
return obj && obj.__esModule ? obj : {
|
|
15
|
+
default: obj
|
|
16
|
+
};
|
|
17
|
+
}
|
|
14
18
|
const create = async function create({ collection, data, req = {} }) {
|
|
15
19
|
const Model = this.collections[collection];
|
|
16
20
|
const options = (0, _withSession.withSession)(this, req.transactionID);
|
|
@@ -20,13 +24,7 @@ const create = async function create({ collection, data, req = {} }) {
|
|
|
20
24
|
data
|
|
21
25
|
], options);
|
|
22
26
|
} catch (error) {
|
|
23
|
-
|
|
24
|
-
throw error.code === 11000 && error.keyValue ? new _errors.ValidationError([
|
|
25
|
-
{
|
|
26
|
-
field: Object.keys(error.keyValue)[0],
|
|
27
|
-
message: req.t('error:valueMustBeUnique')
|
|
28
|
-
}
|
|
29
|
-
], req?.t ?? (0, _utilities.i18nInit)(this.payload.config.i18n).t) : error;
|
|
27
|
+
(0, _handleError.default)(error, req);
|
|
30
28
|
}
|
|
31
29
|
// doc.toJSON does not do stuff like converting ObjectIds to string, or date strings to date objects. That's why we use JSON.parse/stringify here
|
|
32
30
|
const result = JSON.parse(JSON.stringify(doc));
|
|
@@ -39,4 +37,4 @@ const create = async function create({ collection, data, req = {} }) {
|
|
|
39
37
|
return result;
|
|
40
38
|
};
|
|
41
39
|
|
|
42
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
40
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uL3NyYy9jcmVhdGUudHMiXSwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHR5cGUgeyBDcmVhdGUgfSBmcm9tICdwYXlsb2FkL2RhdGFiYXNlJ1xuaW1wb3J0IHR5cGUgeyBEb2N1bWVudCwgUGF5bG9hZFJlcXVlc3QgfSBmcm9tICdwYXlsb2FkL3R5cGVzJ1xuXG5pbXBvcnQgdHlwZSB7IE1vbmdvb3NlQWRhcHRlciB9IGZyb20gJy4nXG5cbmltcG9ydCBoYW5kbGVFcnJvciBmcm9tICcuL3V0aWxpdGllcy9oYW5kbGVFcnJvcidcbmltcG9ydCB7IHdpdGhTZXNzaW9uIH0gZnJvbSAnLi93aXRoU2Vzc2lvbidcblxuZXhwb3J0IGNvbnN0IGNyZWF0ZTogQ3JlYXRlID0gYXN5bmMgZnVuY3Rpb24gY3JlYXRlKFxuICB0aGlzOiBNb25nb29zZUFkYXB0ZXIsXG4gIHsgY29sbGVjdGlvbiwgZGF0YSwgcmVxID0ge30gYXMgUGF5bG9hZFJlcXVlc3QgfSxcbikge1xuICBjb25zdCBNb2RlbCA9IHRoaXMuY29sbGVjdGlvbnNbY29sbGVjdGlvbl1cbiAgY29uc3Qgb3B0aW9ucyA9IHdpdGhTZXNzaW9uKHRoaXMsIHJlcS50cmFuc2FjdGlvbklEKVxuICBsZXQgZG9jXG4gIHRyeSB7XG4gICAgO1tkb2NdID0gYXdhaXQgTW9kZWwuY3JlYXRlKFtkYXRhXSwgb3B0aW9ucylcbiAgfSBjYXRjaCAoZXJyb3IpIHtcbiAgICBoYW5kbGVFcnJvcihlcnJvciwgcmVxKVxuICB9XG5cbiAgLy8gZG9jLnRvSlNPTiBkb2VzIG5vdCBkbyBzdHVmZiBsaWtlIGNvbnZlcnRpbmcgT2JqZWN0SWRzIHRvIHN0cmluZywgb3IgZGF0ZSBzdHJpbmdzIHRvIGRhdGUgb2JqZWN0cy4gVGhhdCdzIHdoeSB3ZSB1c2UgSlNPTi5wYXJzZS9zdHJpbmdpZnkgaGVyZVxuICBjb25zdCByZXN1bHQ6IERvY3VtZW50ID0gSlNPTi5wYXJzZShKU09OLnN0cmluZ2lmeShkb2MpKVxuICBjb25zdCB2ZXJpZmljYXRpb25Ub2tlbiA9IGRvYy5fdmVyaWZpY2F0aW9uVG9rZW5cblxuICAvLyBjdXN0b20gaWQgdHlwZSByZXNldFxuICByZXN1bHQuaWQgPSByZXN1bHQuX2lkXG4gIGlmICh2ZXJpZmljYXRpb25Ub2tlbikge1xuICAgIHJlc3VsdC5fdmVyaWZpY2F0aW9uVG9rZW4gPSB2ZXJpZmljYXRpb25Ub2tlblxuICB9XG5cbiAgcmV0dXJuIHJlc3VsdFxufVxuIl0sIm5hbWVzIjpbImNyZWF0ZSIsImNvbGxlY3Rpb24iLCJkYXRhIiwicmVxIiwiTW9kZWwiLCJjb2xsZWN0aW9ucyIsIm9wdGlvbnMiLCJ3aXRoU2Vzc2lvbiIsInRyYW5zYWN0aW9uSUQiLCJkb2MiLCJlcnJvciIsImhhbmRsZUVycm9yIiwicmVzdWx0IiwiSlNPTiIsInBhcnNlIiwic3RyaW5naWZ5IiwidmVyaWZpY2F0aW9uVG9rZW4iLCJfdmVyaWZpY2F0aW9uVG9rZW4iLCJpZCIsIl9pZCJdLCJtYXBwaW5ncyI6Ijs7OzsrQkFRYUE7OztlQUFBQTs7O29FQUhXOzZCQUNJOzs7Ozs7QUFFckIsTUFBTUEsU0FBaUIsZUFBZUEsT0FFM0MsRUFBRUMsVUFBVSxFQUFFQyxJQUFJLEVBQUVDLE1BQU0sQ0FBQyxDQUFtQixFQUFFO0lBRWhELE1BQU1DLFFBQVEsSUFBSSxDQUFDQyxXQUFXLENBQUNKLFdBQVc7SUFDMUMsTUFBTUssVUFBVUMsSUFBQUEsd0JBQVcsRUFBQyxJQUFJLEVBQUVKLElBQUlLLGFBQWE7SUFDbkQsSUFBSUM7SUFDSixJQUFJO1FBQ0QsQ0FBQ0EsSUFBSSxHQUFHLE1BQU1MLE1BQU1KLE1BQU0sQ0FBQztZQUFDRTtTQUFLLEVBQUVJO0lBQ3RDLEVBQUUsT0FBT0ksT0FBTztRQUNkQyxJQUFBQSxvQkFBVyxFQUFDRCxPQUFPUDtJQUNyQjtJQUVBLGlKQUFpSjtJQUNqSixNQUFNUyxTQUFtQkMsS0FBS0MsS0FBSyxDQUFDRCxLQUFLRSxTQUFTLENBQUNOO0lBQ25ELE1BQU1PLG9CQUFvQlAsSUFBSVEsa0JBQWtCO0lBRWhELHVCQUF1QjtJQUN2QkwsT0FBT00sRUFBRSxHQUFHTixPQUFPTyxHQUFHO0lBQ3RCLElBQUlILG1CQUFtQjtRQUNyQkosT0FBT0ssa0JBQWtCLEdBQUdEO0lBQzlCO0lBRUEsT0FBT0o7QUFDVCJ9
|
package/dist/index.d.ts
CHANGED
|
@@ -1,8 +1,9 @@
|
|
|
1
|
+
import type { TransactionOptions } from 'mongodb';
|
|
1
2
|
import type { ClientSession, ConnectOptions, Connection } from 'mongoose';
|
|
2
3
|
import type { Payload } from 'payload';
|
|
3
4
|
import type { BaseDatabaseAdapter } from 'payload/database';
|
|
4
|
-
export type { MigrateDownArgs, MigrateUpArgs } from './types';
|
|
5
5
|
import type { CollectionModel, GlobalModel } from './types';
|
|
6
|
+
export type { MigrateDownArgs, MigrateUpArgs } from './types';
|
|
6
7
|
export interface Args {
|
|
7
8
|
/** Set to false to disable auto-pluralization of collection names, Defaults to true */
|
|
8
9
|
autoPluralization?: boolean;
|
|
@@ -14,6 +15,7 @@ export interface Args {
|
|
|
14
15
|
/** Set to true to disable hinting to MongoDB to use 'id' as index. This is currently done when counting documents for pagination. Disabling this optimization might fix some problems with AWS DocumentDB. Defaults to false */
|
|
15
16
|
disableIndexHints?: boolean;
|
|
16
17
|
migrationDir?: string;
|
|
18
|
+
transactionOptions?: TransactionOptions | false;
|
|
17
19
|
/** The URL to connect to MongoDB or false to start payload and prevent connecting */
|
|
18
20
|
url: false | string;
|
|
19
21
|
}
|
|
@@ -41,10 +43,11 @@ declare module 'payload' {
|
|
|
41
43
|
globals: GlobalModel;
|
|
42
44
|
mongoMemoryServer: any;
|
|
43
45
|
sessions: Record<number | string, ClientSession>;
|
|
46
|
+
transactionOptions: TransactionOptions;
|
|
44
47
|
versions: {
|
|
45
48
|
[slug: string]: CollectionModel;
|
|
46
49
|
};
|
|
47
50
|
}
|
|
48
51
|
}
|
|
49
|
-
export declare function mongooseAdapter({ autoPluralization, connectOptions, disableIndexHints, migrationDir: migrationDirArg, url, }: Args): MongooseAdapterResult;
|
|
52
|
+
export declare function mongooseAdapter({ autoPluralization, connectOptions, disableIndexHints, migrationDir: migrationDirArg, transactionOptions, url, }: Args): MongooseAdapterResult;
|
|
50
53
|
//# sourceMappingURL=index.d.ts.map
|
package/dist/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,cAAc,EAAE,UAAU,EAAE,MAAM,UAAU,CAAA;AACzE,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,SAAS,CAAA;AACtC,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAA;AAO3D,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,SAAS,CAAA;AACjD,OAAO,KAAK,EAAE,aAAa,EAAE,cAAc,EAAE,UAAU,EAAE,MAAM,UAAU,CAAA;AACzE,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,SAAS,CAAA;AACtC,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAA;AAO3D,OAAO,KAAK,EAAE,eAAe,EAAE,WAAW,EAAE,MAAM,SAAS,CAAA;AA8B3D,YAAY,EAAE,eAAe,EAAE,aAAa,EAAE,MAAM,SAAS,CAAA;AAE7D,MAAM,WAAW,IAAI;IACnB,uFAAuF;IACvF,iBAAiB,CAAC,EAAE,OAAO,CAAA;IAC3B,kCAAkC;IAClC,cAAc,CAAC,EAAE,cAAc,GAAG;QAChC,4FAA4F;QAC5F,QAAQ,CAAC,EAAE,OAAO,CAAA;KACnB,CAAA;IACD,gOAAgO;IAChO,iBAAiB,CAAC,EAAE,OAAO,CAAA;IAC3B,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,kBAAkB,CAAC,EAAE,kBAAkB,GAAG,KAAK,CAAA;IAC/C,qFAAqF;IACrF,GAAG,EAAE,KAAK,GAAG,MAAM,CAAA;CACpB;AAED,MAAM,MAAM,eAAe,GAAG,mBAAmB,GAC/C,IAAI,GAAG;IACL,WAAW,EAAE;QACX,CAAC,IAAI,EAAE,MAAM,GAAG,eAAe,CAAA;KAChC,CAAA;IACD,UAAU,EAAE,UAAU,CAAA;IACtB,OAAO,EAAE,WAAW,CAAA;IACpB,iBAAiB,EAAE,GAAG,CAAA;IACtB,QAAQ,EAAE,MAAM,CAAC,MAAM,GAAG,MAAM,EAAE,aAAa,CAAC,CAAA;IAChD,QAAQ,EAAE;QACR,CAAC,IAAI,EAAE,MAAM,GAAG,eAAe,CAAA;KAChC,CAAA;CACF,CAAA;AAEH,KAAK,qBAAqB,GAAG,CAAC,IAAI,EAAE;IAAE,OAAO,EAAE,OAAO,CAAA;CAAE,KAAK,eAAe,CAAA;AAE5E,OAAO,QAAQ,SAAS,CAAC;IACvB,UAAiB,eACf,SAAQ,IAAI,CAAC,mBAAmB,EAAE,UAAU,CAAC,EAC3C,IAAI,CAAC,IAAI,EAAE,cAAc,CAAC;QAC5B,WAAW,EAAE;YACX,CAAC,IAAI,EAAE,MAAM,GAAG,eAAe,CAAA;SAChC,CAAA;QACD,UAAU,EAAE,UAAU,CAAA;QACtB,OAAO,EAAE,WAAW,CAAA;QACpB,iBAAiB,EAAE,GAAG,CAAA;QACtB,QAAQ,EAAE,MAAM,CAAC,MAAM,GAAG,MAAM,EAAE,aAAa,CAAC,CAAA;QAChD,kBAAkB,EAAE,kBAAkB,CAAA;QACtC,QAAQ,EAAE;YACR,CAAC,IAAI,EAAE,MAAM,GAAG,eAAe,CAAA;SAChC,CAAA;KACF;CACF;AAED,wBAAgB,eAAe,CAAC,EAC9B,iBAAwB,EACxB,cAAc,EACd,iBAAyB,EACzB,YAAY,EAAE,eAAe,EAC7B,kBAAkB,EAClB,GAAG,GACJ,EAAE,IAAI,GAAG,qBAAqB,CA8D9B"}
|
package/dist/index.js
CHANGED
|
@@ -44,12 +44,16 @@ function _interop_require_default(obj) {
|
|
|
44
44
|
default: obj
|
|
45
45
|
};
|
|
46
46
|
}
|
|
47
|
-
function mongooseAdapter({ autoPluralization = true, connectOptions, disableIndexHints = false, migrationDir: migrationDirArg, url }) {
|
|
47
|
+
function mongooseAdapter({ autoPluralization = true, connectOptions, disableIndexHints = false, migrationDir: migrationDirArg, transactionOptions, url }) {
|
|
48
48
|
function adapter({ payload }) {
|
|
49
49
|
const migrationDir = findMigrationDir(migrationDirArg);
|
|
50
|
+
let beginTransactionFunction = _beginTransaction.beginTransaction;
|
|
50
51
|
_mongoose.default.set('strictQuery', false);
|
|
51
52
|
(0, _extendWebpackConfig.extendWebpackConfig)(payload.config);
|
|
52
53
|
(0, _extendViteConfig.extendViteConfig)(payload.config);
|
|
54
|
+
if (transactionOptions === false) {
|
|
55
|
+
beginTransactionFunction = undefined;
|
|
56
|
+
}
|
|
53
57
|
return (0, _database.createDatabaseAdapter)({
|
|
54
58
|
name: 'mongoose',
|
|
55
59
|
// Mongoose-specific
|
|
@@ -61,10 +65,11 @@ function mongooseAdapter({ autoPluralization = true, connectOptions, disableInde
|
|
|
61
65
|
globals: undefined,
|
|
62
66
|
mongoMemoryServer: undefined,
|
|
63
67
|
sessions: {},
|
|
68
|
+
transactionOptions: transactionOptions === false ? undefined : transactionOptions,
|
|
64
69
|
url,
|
|
65
70
|
versions: {},
|
|
66
71
|
// DatabaseAdapter
|
|
67
|
-
beginTransaction:
|
|
72
|
+
beginTransaction: beginTransactionFunction,
|
|
68
73
|
commitTransaction: _commitTransaction.commitTransaction,
|
|
69
74
|
connect: _connect.connect,
|
|
70
75
|
create: _create.create,
|
|
@@ -129,4 +134,4 @@ function mongooseAdapter({ autoPluralization = true, connectOptions, disableInde
|
|
|
129
134
|
return srcDir;
|
|
130
135
|
}
|
|
131
136
|
|
|
132
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["../src/index.ts"],"sourcesContent":["import type { ClientSession, ConnectOptions, Connection } from 'mongoose'\nimport type { Payload } from 'payload'\nimport type { BaseDatabaseAdapter } from 'payload/database'\n\nimport fs from 'fs'\nimport mongoose from 'mongoose'\nimport path from 'path'\nimport { createDatabaseAdapter } from 'payload/database'\n\nexport type { MigrateDownArgs, MigrateUpArgs } from './types'\n\nimport type { CollectionModel, GlobalModel } from './types'\n\nimport { connect } from './connect'\nimport { create } from './create'\nimport { createGlobal } from './createGlobal'\nimport { createGlobalVersion } from './createGlobalVersion'\nimport { createMigration } from './createMigration'\nimport { createVersion } from './createVersion'\nimport { deleteMany } from './deleteMany'\nimport { deleteOne } from './deleteOne'\nimport { deleteVersions } from './deleteVersions'\nimport { destroy } from './destroy'\nimport { extendViteConfig } from './extendViteConfig'\nimport { extendWebpackConfig } from './extendWebpackConfig'\nimport { find } from './find'\nimport { findGlobal } from './findGlobal'\nimport { findGlobalVersions } from './findGlobalVersions'\nimport { findOne } from './findOne'\nimport { findVersions } from './findVersions'\nimport { init } from './init'\nimport { migrateFresh } from './migrateFresh'\nimport { queryDrafts } from './queryDrafts'\nimport { beginTransaction } from './transactions/beginTransaction'\nimport { commitTransaction } from './transactions/commitTransaction'\nimport { rollbackTransaction } from './transactions/rollbackTransaction'\nimport { updateGlobal } from './updateGlobal'\nimport { updateGlobalVersion } from './updateGlobalVersion'\nimport { updateOne } from './updateOne'\nimport { updateVersion } from './updateVersion'\n\nexport interface Args {\n  /** Set to false to disable auto-pluralization of collection names, Defaults to true */\n  autoPluralization?: boolean\n  /** Extra configuration options */\n  connectOptions?: ConnectOptions & {\n    /** Set false to disable $facet aggregation in non-supporting databases, Defaults to true */\n    useFacet?: boolean\n  }\n  /** Set to true to disable hinting to MongoDB to use 'id' as index. This is currently done when counting documents for pagination. Disabling this optimization might fix some problems with AWS DocumentDB. Defaults to false */\n  disableIndexHints?: boolean\n  migrationDir?: string\n  /** The URL to connect to MongoDB or false to start payload and prevent connecting */\n  url: false | string\n}\n\nexport type MongooseAdapter = BaseDatabaseAdapter &\n  Args & {\n    collections: {\n      [slug: string]: CollectionModel\n    }\n    connection: Connection\n    globals: GlobalModel\n    mongoMemoryServer: any\n    sessions: Record<number | string, ClientSession>\n    versions: {\n      [slug: string]: CollectionModel\n    }\n  }\n\ntype MongooseAdapterResult = (args: { payload: Payload }) => MongooseAdapter\n\ndeclare module 'payload' {\n  export interface DatabaseAdapter\n    extends Omit<BaseDatabaseAdapter, 'sessions'>,\n      Omit<Args, 'migrationDir'> {\n    collections: {\n      [slug: string]: CollectionModel\n    }\n    connection: Connection\n    globals: GlobalModel\n    mongoMemoryServer: any\n    sessions: Record<number | string, ClientSession>\n    versions: {\n      [slug: string]: CollectionModel\n    }\n  }\n}\n\nexport function mongooseAdapter({\n  autoPluralization = true,\n  connectOptions,\n  disableIndexHints = false,\n  migrationDir: migrationDirArg,\n  url,\n}: Args): MongooseAdapterResult {\n  function adapter({ payload }: { payload: Payload }) {\n    const migrationDir = findMigrationDir(migrationDirArg)\n    mongoose.set('strictQuery', false)\n\n    extendWebpackConfig(payload.config)\n    extendViteConfig(payload.config)\n\n    return createDatabaseAdapter<MongooseAdapter>({\n      name: 'mongoose',\n\n      // Mongoose-specific\n      autoPluralization,\n      collections: {},\n      connectOptions: connectOptions || {},\n      connection: undefined,\n      disableIndexHints,\n      globals: undefined,\n      mongoMemoryServer: undefined,\n      sessions: {},\n      url,\n      versions: {},\n\n      // DatabaseAdapter\n      beginTransaction,\n      commitTransaction,\n      connect,\n      create,\n      createGlobal,\n      createGlobalVersion,\n      createMigration,\n      createVersion,\n      defaultIDType: 'text',\n      deleteMany,\n      deleteOne,\n      deleteVersions,\n      destroy,\n      find,\n      findGlobal,\n      findGlobalVersions,\n      findOne,\n      findVersions,\n      init,\n      migrateFresh,\n      migrationDir,\n      payload,\n      queryDrafts,\n      rollbackTransaction,\n      updateGlobal,\n      updateGlobalVersion,\n      updateOne,\n      updateVersion,\n    })\n  }\n\n  return adapter\n}\n\n/**\n * Attempt to find migrations directory.\n *\n * Checks for the following directories in order:\n * - `migrationDir` argument from Payload config\n * - `src/migrations`\n * - `dist/migrations`\n * - `migrations`\n *\n * Defaults to `src/migrations`\n *\n * @param migrationDir\n * @returns\n */\nfunction findMigrationDir(migrationDir?: string): string {\n  const cwd = process.cwd()\n  const srcDir = path.resolve(cwd, 'src/migrations')\n  const distDir = path.resolve(cwd, 'dist/migrations')\n  const relativeMigrations = path.resolve(cwd, 'migrations')\n\n  // Use arg if provided\n  if (migrationDir) return migrationDir\n\n  // Check other common locations\n  if (fs.existsSync(srcDir)) {\n    return srcDir\n  }\n\n  if (fs.existsSync(distDir)) {\n    return distDir\n  }\n\n  if (fs.existsSync(relativeMigrations)) {\n    return relativeMigrations\n  }\n\n  return srcDir\n}\n"],"names":["mongooseAdapter","autoPluralization","connectOptions","disableIndexHints","migrationDir","migrationDirArg","url","adapter","payload","findMigrationDir","mongoose","set","extendWebpackConfig","config","extendViteConfig","createDatabaseAdapter","name","collections","connection","undefined","globals","mongoMemoryServer","sessions","versions","beginTransaction","commitTransaction","connect","create","createGlobal","createGlobalVersion","createMigration","createVersion","defaultIDType","deleteMany","deleteOne","deleteVersions","destroy","find","findGlobal","findGlobalVersions","findOne","findVersions","init","migrateFresh","queryDrafts","rollbackTransaction","updateGlobal","updateGlobalVersion","updateOne","updateVersion","cwd","process","srcDir","path","resolve","distDir","relativeMigrations","fs","existsSync"],"mappings":";;;;+BAyFgBA;;;eAAAA;;;2DArFD;iEACM;6DACJ;0BACqB;yBAMd;wBACD;8BACM;qCACO;iCACJ;+BACF;4BACH;2BACD;gCACK;yBACP;kCACS;qCACG;sBACf;4BACM;oCACQ;yBACX;8BACK;sBACR;8BACQ;6BACD;kCACK;mCACC;qCACE;8BACP;qCACO;2BACV;+BACI;;;;;;AAkDvB,SAASA,gBAAgB,EAC9BC,oBAAoB,IAAI,EACxBC,cAAc,EACdC,oBAAoB,KAAK,EACzBC,cAAcC,eAAe,EAC7BC,GAAG,EACE;IACL,SAASC,QAAQ,EAAEC,OAAO,EAAwB;QAChD,MAAMJ,eAAeK,iBAAiBJ;QACtCK,iBAAQ,CAACC,GAAG,CAAC,eAAe;QAE5BC,IAAAA,wCAAmB,EAACJ,QAAQK,MAAM;QAClCC,IAAAA,kCAAgB,EAACN,QAAQK,MAAM;QAE/B,OAAOE,IAAAA,+BAAqB,EAAkB;YAC5CC,MAAM;YAEN,oBAAoB;YACpBf;YACAgB,aAAa,CAAC;YACdf,gBAAgBA,kBAAkB,CAAC;YACnCgB,YAAYC;YACZhB;YACAiB,SAASD;YACTE,mBAAmBF;YACnBG,UAAU,CAAC;YACXhB;YACAiB,UAAU,CAAC;YAEX,kBAAkB;YAClBC,kBAAAA,kCAAgB;YAChBC,mBAAAA,oCAAiB;YACjBC,SAAAA,gBAAO;YACPC,QAAAA,cAAM;YACNC,cAAAA,0BAAY;YACZC,qBAAAA,wCAAmB;YACnBC,iBAAAA,gCAAe;YACfC,eAAAA,4BAAa;YACbC,eAAe;YACfC,YAAAA,sBAAU;YACVC,WAAAA,oBAAS;YACTC,gBAAAA,8BAAc;YACdC,SAAAA,gBAAO;YACPC,MAAAA,UAAI;YACJC,YAAAA,sBAAU;YACVC,oBAAAA,sCAAkB;YAClBC,SAAAA,gBAAO;YACPC,cAAAA,0BAAY;YACZC,MAAAA,UAAI;YACJC,cAAAA,0BAAY;YACZvC;YACAI;YACAoC,aAAAA,wBAAW;YACXC,qBAAAA,wCAAmB;YACnBC,cAAAA,0BAAY;YACZC,qBAAAA,wCAAmB;YACnBC,WAAAA,oBAAS;YACTC,eAAAA,4BAAa;QACf;IACF;IAEA,OAAO1C;AACT;AAEA;;;;;;;;;;;;;CAaC,GACD,SAASE,iBAAiBL,YAAqB;IAC7C,MAAM8C,MAAMC,QAAQD,GAAG;IACvB,MAAME,SAASC,aAAI,CAACC,OAAO,CAACJ,KAAK;IACjC,MAAMK,UAAUF,aAAI,CAACC,OAAO,CAACJ,KAAK;IAClC,MAAMM,qBAAqBH,aAAI,CAACC,OAAO,CAACJ,KAAK;IAE7C,sBAAsB;IACtB,IAAI9C,cAAc,OAAOA;IAEzB,+BAA+B;IAC/B,IAAIqD,WAAE,CAACC,UAAU,CAACN,SAAS;QACzB,OAAOA;IACT;IAEA,IAAIK,WAAE,CAACC,UAAU,CAACH,UAAU;QAC1B,OAAOA;IACT;IAEA,IAAIE,WAAE,CAACC,UAAU,CAACF,qBAAqB;QACrC,OAAOA;IACT;IAEA,OAAOJ;AACT"}
|
|
137
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["../src/index.ts"],"sourcesContent":["import type { TransactionOptions } from 'mongodb'\nimport type { ClientSession, ConnectOptions, Connection } from 'mongoose'\nimport type { Payload } from 'payload'\nimport type { BaseDatabaseAdapter } from 'payload/database'\n\nimport fs from 'fs'\nimport mongoose from 'mongoose'\nimport path from 'path'\nimport { createDatabaseAdapter } from 'payload/database'\n\nimport type { CollectionModel, GlobalModel } from './types'\n\nimport { connect } from './connect'\nimport { create } from './create'\nimport { createGlobal } from './createGlobal'\nimport { createGlobalVersion } from './createGlobalVersion'\nimport { createMigration } from './createMigration'\nimport { createVersion } from './createVersion'\nimport { deleteMany } from './deleteMany'\nimport { deleteOne } from './deleteOne'\nimport { deleteVersions } from './deleteVersions'\nimport { destroy } from './destroy'\nimport { extendViteConfig } from './extendViteConfig'\nimport { extendWebpackConfig } from './extendWebpackConfig'\nimport { find } from './find'\nimport { findGlobal } from './findGlobal'\nimport { findGlobalVersions } from './findGlobalVersions'\nimport { findOne } from './findOne'\nimport { findVersions } from './findVersions'\nimport { init } from './init'\nimport { migrateFresh } from './migrateFresh'\nimport { queryDrafts } from './queryDrafts'\nimport { beginTransaction } from './transactions/beginTransaction'\nimport { commitTransaction } from './transactions/commitTransaction'\nimport { rollbackTransaction } from './transactions/rollbackTransaction'\nimport { updateGlobal } from './updateGlobal'\nimport { updateGlobalVersion } from './updateGlobalVersion'\nimport { updateOne } from './updateOne'\nimport { updateVersion } from './updateVersion'\n\nexport type { MigrateDownArgs, MigrateUpArgs } from './types'\n\nexport interface Args {\n  /** Set to false to disable auto-pluralization of collection names, Defaults to true */\n  autoPluralization?: boolean\n  /** Extra configuration options */\n  connectOptions?: ConnectOptions & {\n    /** Set false to disable $facet aggregation in non-supporting databases, Defaults to true */\n    useFacet?: boolean\n  }\n  /** Set to true to disable hinting to MongoDB to use 'id' as index. This is currently done when counting documents for pagination. Disabling this optimization might fix some problems with AWS DocumentDB. Defaults to false */\n  disableIndexHints?: boolean\n  migrationDir?: string\n  transactionOptions?: TransactionOptions | false\n  /** The URL to connect to MongoDB or false to start payload and prevent connecting */\n  url: false | string\n}\n\nexport type MongooseAdapter = BaseDatabaseAdapter &\n  Args & {\n    collections: {\n      [slug: string]: CollectionModel\n    }\n    connection: Connection\n    globals: GlobalModel\n    mongoMemoryServer: any\n    sessions: Record<number | string, ClientSession>\n    versions: {\n      [slug: string]: CollectionModel\n    }\n  }\n\ntype MongooseAdapterResult = (args: { payload: Payload }) => MongooseAdapter\n\ndeclare module 'payload' {\n  export interface DatabaseAdapter\n    extends Omit<BaseDatabaseAdapter, 'sessions'>,\n      Omit<Args, 'migrationDir'> {\n    collections: {\n      [slug: string]: CollectionModel\n    }\n    connection: Connection\n    globals: GlobalModel\n    mongoMemoryServer: any\n    sessions: Record<number | string, ClientSession>\n    transactionOptions: TransactionOptions\n    versions: {\n      [slug: string]: CollectionModel\n    }\n  }\n}\n\nexport function mongooseAdapter({\n  autoPluralization = true,\n  connectOptions,\n  disableIndexHints = false,\n  migrationDir: migrationDirArg,\n  transactionOptions,\n  url,\n}: Args): MongooseAdapterResult {\n  function adapter({ payload }: { payload: Payload }) {\n    const migrationDir = findMigrationDir(migrationDirArg)\n    let beginTransactionFunction = beginTransaction\n    mongoose.set('strictQuery', false)\n\n    extendWebpackConfig(payload.config)\n    extendViteConfig(payload.config)\n\n    if (transactionOptions === false) {\n      beginTransactionFunction = undefined\n    }\n\n    return createDatabaseAdapter<MongooseAdapter>({\n      name: 'mongoose',\n\n      // Mongoose-specific\n      autoPluralization,\n      collections: {},\n      connectOptions: connectOptions || {},\n      connection: undefined,\n      disableIndexHints,\n      globals: undefined,\n      mongoMemoryServer: undefined,\n      sessions: {},\n      transactionOptions: transactionOptions === false ? undefined : transactionOptions,\n      url,\n      versions: {},\n\n      // DatabaseAdapter\n      beginTransaction: beginTransactionFunction,\n      commitTransaction,\n      connect,\n      create,\n      createGlobal,\n      createGlobalVersion,\n      createMigration,\n      createVersion,\n      defaultIDType: 'text',\n      deleteMany,\n      deleteOne,\n      deleteVersions,\n      destroy,\n      find,\n      findGlobal,\n      findGlobalVersions,\n      findOne,\n      findVersions,\n      init,\n      migrateFresh,\n      migrationDir,\n      payload,\n      queryDrafts,\n      rollbackTransaction,\n      updateGlobal,\n      updateGlobalVersion,\n      updateOne,\n      updateVersion,\n    })\n  }\n\n  return adapter\n}\n\n/**\n * Attempt to find migrations directory.\n *\n * Checks for the following directories in order:\n * - `migrationDir` argument from Payload config\n * - `src/migrations`\n * - `dist/migrations`\n * - `migrations`\n *\n * Defaults to `src/migrations`\n *\n * @param migrationDir\n * @returns\n */\nfunction findMigrationDir(migrationDir?: string): string {\n  const cwd = process.cwd()\n  const srcDir = path.resolve(cwd, 'src/migrations')\n  const distDir = path.resolve(cwd, 'dist/migrations')\n  const relativeMigrations = path.resolve(cwd, 'migrations')\n\n  // Use arg if provided\n  if (migrationDir) return migrationDir\n\n  // Check other common locations\n  if (fs.existsSync(srcDir)) {\n    return srcDir\n  }\n\n  if (fs.existsSync(distDir)) {\n    return distDir\n  }\n\n  if (fs.existsSync(relativeMigrations)) {\n    return relativeMigrations\n  }\n\n  return srcDir\n}\n"],"names":["mongooseAdapter","autoPluralization","connectOptions","disableIndexHints","migrationDir","migrationDirArg","transactionOptions","url","adapter","payload","findMigrationDir","beginTransactionFunction","beginTransaction","mongoose","set","extendWebpackConfig","config","extendViteConfig","undefined","createDatabaseAdapter","name","collections","connection","globals","mongoMemoryServer","sessions","versions","commitTransaction","connect","create","createGlobal","createGlobalVersion","createMigration","createVersion","defaultIDType","deleteMany","deleteOne","deleteVersions","destroy","find","findGlobal","findGlobalVersions","findOne","findVersions","init","migrateFresh","queryDrafts","rollbackTransaction","updateGlobal","updateGlobalVersion","updateOne","updateVersion","cwd","process","srcDir","path","resolve","distDir","relativeMigrations","fs","existsSync"],"mappings":";;;;+BA4FgBA;;;eAAAA;;;2DAvFD;iEACM;6DACJ;0BACqB;yBAId;wBACD;8BACM;qCACO;iCACJ;+BACF;4BACH;2BACD;gCACK;yBACP;kCACS;qCACG;sBACf;4BACM;oCACQ;yBACX;8BACK;sBACR;8BACQ;6BACD;kCACK;mCACC;qCACE;8BACP;qCACO;2BACV;+BACI;;;;;;AAsDvB,SAASA,gBAAgB,EAC9BC,oBAAoB,IAAI,EACxBC,cAAc,EACdC,oBAAoB,KAAK,EACzBC,cAAcC,eAAe,EAC7BC,kBAAkB,EAClBC,GAAG,EACE;IACL,SAASC,QAAQ,EAAEC,OAAO,EAAwB;QAChD,MAAML,eAAeM,iBAAiBL;QACtC,IAAIM,2BAA2BC,kCAAgB;QAC/CC,iBAAQ,CAACC,GAAG,CAAC,eAAe;QAE5BC,IAAAA,wCAAmB,EAACN,QAAQO,MAAM;QAClCC,IAAAA,kCAAgB,EAACR,QAAQO,MAAM;QAE/B,IAAIV,uBAAuB,OAAO;YAChCK,2BAA2BO;QAC7B;QAEA,OAAOC,IAAAA,+BAAqB,EAAkB;YAC5CC,MAAM;YAEN,oBAAoB;YACpBnB;YACAoB,aAAa,CAAC;YACdnB,gBAAgBA,kBAAkB,CAAC;YACnCoB,YAAYJ;YACZf;YACAoB,SAASL;YACTM,mBAAmBN;YACnBO,UAAU,CAAC;YACXnB,oBAAoBA,uBAAuB,QAAQY,YAAYZ;YAC/DC;YACAmB,UAAU,CAAC;YAEX,kBAAkB;YAClBd,kBAAkBD;YAClBgB,mBAAAA,oCAAiB;YACjBC,SAAAA,gBAAO;YACPC,QAAAA,cAAM;YACNC,cAAAA,0BAAY;YACZC,qBAAAA,wCAAmB;YACnBC,iBAAAA,gCAAe;YACfC,eAAAA,4BAAa;YACbC,eAAe;YACfC,YAAAA,sBAAU;YACVC,WAAAA,oBAAS;YACTC,gBAAAA,8BAAc;YACdC,SAAAA,gBAAO;YACPC,MAAAA,UAAI;YACJC,YAAAA,sBAAU;YACVC,oBAAAA,sCAAkB;YAClBC,SAAAA,gBAAO;YACPC,cAAAA,0BAAY;YACZC,MAAAA,UAAI;YACJC,cAAAA,0BAAY;YACZzC;YACAK;YACAqC,aAAAA,wBAAW;YACXC,qBAAAA,wCAAmB;YACnBC,cAAAA,0BAAY;YACZC,qBAAAA,wCAAmB;YACnBC,WAAAA,oBAAS;YACTC,eAAAA,4BAAa;QACf;IACF;IAEA,OAAO3C;AACT;AAEA;;;;;;;;;;;;;CAaC,GACD,SAASE,iBAAiBN,YAAqB;IAC7C,MAAMgD,MAAMC,QAAQD,GAAG;IACvB,MAAME,SAASC,aAAI,CAACC,OAAO,CAACJ,KAAK;IACjC,MAAMK,UAAUF,aAAI,CAACC,OAAO,CAACJ,KAAK;IAClC,MAAMM,qBAAqBH,aAAI,CAACC,OAAO,CAACJ,KAAK;IAE7C,sBAAsB;IACtB,IAAIhD,cAAc,OAAOA;IAEzB,+BAA+B;IAC/B,IAAIuD,WAAE,CAACC,UAAU,CAACN,SAAS;QACzB,OAAOA;IACT;IAEA,IAAIK,WAAE,CAACC,UAAU,CAACH,UAAU;QAC1B,OAAOA;IACT;IAEA,IAAIE,WAAE,CAACC,UAAU,CAACF,qBAAqB;QACrC,OAAOA;IACT;IAEA,OAAOJ;AACT"}
|
|
@@ -59,7 +59,7 @@ async function buildSearchParam({ collectionSlug, fields, globalSlug, incomingPa
|
|
|
59
59
|
}
|
|
60
60
|
const [{ field, path }] = paths;
|
|
61
61
|
if (path) {
|
|
62
|
-
const formattedValue = (0, _sanitizeQueryValue.sanitizeQueryValue)({
|
|
62
|
+
const { operator: formattedOperator, val: formattedValue } = (0, _sanitizeQueryValue.sanitizeQueryValue)({
|
|
63
63
|
field,
|
|
64
64
|
hasCustomID,
|
|
65
65
|
operator,
|
|
@@ -86,7 +86,7 @@ async function buildSearchParam({ collectionSlug, fields, globalSlug, incomingPa
|
|
|
86
86
|
payload,
|
|
87
87
|
where: {
|
|
88
88
|
[subPath]: {
|
|
89
|
-
[
|
|
89
|
+
[formattedOperator]: val
|
|
90
90
|
}
|
|
91
91
|
}
|
|
92
92
|
});
|
|
@@ -139,8 +139,8 @@ async function buildSearchParam({ collectionSlug, fields, globalSlug, incomingPa
|
|
|
139
139
|
}, Promise.resolve(initialRelationshipQuery));
|
|
140
140
|
return relationshipQuery;
|
|
141
141
|
}
|
|
142
|
-
if (
|
|
143
|
-
const operatorKey = _operatorMap.operatorMap[
|
|
142
|
+
if (formattedOperator && _types.validOperators.includes(formattedOperator)) {
|
|
143
|
+
const operatorKey = _operatorMap.operatorMap[formattedOperator];
|
|
144
144
|
if (field.type === 'relationship' || field.type === 'upload') {
|
|
145
145
|
let hasNumberIDRelation;
|
|
146
146
|
const result = {
|
|
@@ -183,7 +183,7 @@ async function buildSearchParam({ collectionSlug, fields, globalSlug, incomingPa
|
|
|
183
183
|
return result;
|
|
184
184
|
}
|
|
185
185
|
}
|
|
186
|
-
if (
|
|
186
|
+
if (formattedOperator === 'like' && typeof formattedValue === 'string') {
|
|
187
187
|
const words = formattedValue.split(' ');
|
|
188
188
|
const result = {
|
|
189
189
|
value: {
|
|
@@ -216,4 +216,4 @@ async function buildSearchParam({ collectionSlug, fields, globalSlug, incomingPa
|
|
|
216
216
|
return undefined;
|
|
217
217
|
}
|
|
218
218
|
|
|
219
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["../../src/queries/buildSearchParams.ts"],"sourcesContent":["import type { Payload } from 'payload'\nimport type { PathToQuery } from 'payload/database'\nimport type { Field } from 'payload/types'\nimport type { Operator } from 'payload/types'\n\nimport objectID from 'bson-objectid'\nimport mongoose from 'mongoose'\nimport { getLocalizedPaths } from 'payload/database'\nimport { fieldAffectsData } from 'payload/types'\nimport { validOperators } from 'payload/types'\n\nimport type { MongooseAdapter } from '..'\n\nimport { operatorMap } from './operatorMap'\nimport { sanitizeQueryValue } from './sanitizeQueryValue'\n\ntype SearchParam = {\n  path?: string\n  value: unknown\n}\n\nconst subQueryOptions = {\n  lean: true,\n  limit: 50,\n}\n\n/**\n * Convert the Payload key / value / operator into a MongoDB query\n */\nexport async function buildSearchParam({\n  collectionSlug,\n  fields,\n  globalSlug,\n  incomingPath,\n  locale,\n  operator,\n  payload,\n  val,\n}: {\n  collectionSlug?: string\n  fields: Field[]\n  globalSlug?: string\n  incomingPath: string\n  locale?: string\n  operator: string\n  payload: Payload\n  val: unknown\n}): Promise<SearchParam> {\n  // Replace GraphQL nested field double underscore formatting\n  let sanitizedPath = incomingPath.replace(/__/g, '.')\n  if (sanitizedPath === 'id') sanitizedPath = '_id'\n\n  let paths: PathToQuery[] = []\n\n  let hasCustomID = false\n\n  if (sanitizedPath === '_id') {\n    const customIDfield = payload.collections[collectionSlug]?.config.fields.find(\n      (field) => fieldAffectsData(field) && field.name === 'id',\n    )\n\n    let idFieldType: 'number' | 'text' = 'text'\n\n    if (customIDfield) {\n      if (customIDfield?.type === 'text' || customIDfield?.type === 'number') {\n        idFieldType = customIDfield.type\n      }\n\n      hasCustomID = true\n    }\n\n    paths.push({\n      collectionSlug,\n      complete: true,\n      field: {\n        name: 'id',\n        type: idFieldType,\n      } as Field,\n      path: '_id',\n    })\n  } else {\n    paths = await getLocalizedPaths({\n      collectionSlug,\n      fields,\n      globalSlug,\n      incomingPath: sanitizedPath,\n      locale,\n      payload,\n    })\n  }\n\n  const [{ field, path }] = paths\n\n  if (path) {\n    const formattedValue = sanitizeQueryValue({\n      field,\n      hasCustomID,\n      operator,\n      path,\n      val,\n    })\n\n    // If there are multiple collections to search through,\n    // Recursively build up a list of query constraints\n    if (paths.length > 1) {\n      // Remove top collection and reverse array\n      // to work backwards from top\n      const pathsToQuery = paths.slice(1).reverse()\n\n      const initialRelationshipQuery = {\n        value: {},\n      } as SearchParam\n\n      const relationshipQuery = await pathsToQuery.reduce(\n        async (priorQuery, { collectionSlug: slug, path: subPath }, i) => {\n          const priorQueryResult = await priorQuery\n\n          const SubModel = (payload.db as MongooseAdapter).collections[slug]\n\n          // On the \"deepest\" collection,\n          // Search on the value passed through the query\n          if (i === 0) {\n            const subQuery = await SubModel.buildQuery({\n              locale,\n              payload,\n              where: {\n                [subPath]: {\n                  [operator]: val,\n                },\n              },\n            })\n\n            const result = await SubModel.find(subQuery, subQueryOptions)\n\n            const $in: unknown[] = []\n\n            result.forEach((doc) => {\n              const stringID = doc._id.toString()\n              $in.push(stringID)\n\n              if (mongoose.Types.ObjectId.isValid(stringID)) {\n                $in.push(doc._id)\n              }\n            })\n\n            if (pathsToQuery.length === 1) {\n              return {\n                path,\n                value: { $in },\n              }\n            }\n\n            const nextSubPath = pathsToQuery[i + 1].path\n\n            return {\n              value: { [nextSubPath]: { $in } },\n            }\n          }\n\n          const subQuery = priorQueryResult.value\n          const result = await SubModel.find(subQuery, subQueryOptions)\n\n          const $in = result.map((doc) => doc._id.toString())\n\n          // If it is the last recursion\n          // then pass through the search param\n          if (i + 1 === pathsToQuery.length) {\n            return {\n              path,\n              value: { $in },\n            }\n          }\n\n          return {\n            value: {\n              _id: { $in },\n            },\n          }\n        },\n        Promise.resolve(initialRelationshipQuery),\n      )\n\n      return relationshipQuery\n    }\n\n    if (operator && validOperators.includes(operator as Operator)) {\n      const operatorKey = operatorMap[operator]\n\n      if (field.type === 'relationship' || field.type === 'upload') {\n        let hasNumberIDRelation\n\n        const result = {\n          value: {\n            $or: [{ [path]: { [operatorKey]: formattedValue } }],\n          },\n        }\n\n        if (typeof formattedValue === 'string') {\n          if (mongoose.Types.ObjectId.isValid(formattedValue)) {\n            result.value.$or.push({ [path]: { [operatorKey]: objectID(formattedValue) } })\n          } else {\n            ;(Array.isArray(field.relationTo) ? field.relationTo : [field.relationTo]).forEach(\n              (relationTo) => {\n                const isRelatedToCustomNumberID = payload.collections[\n                  relationTo\n                ]?.config?.fields.find((relatedField) => {\n                  return (\n                    fieldAffectsData(relatedField) &&\n                    relatedField.name === 'id' &&\n                    relatedField.type === 'number'\n                  )\n                })\n\n                if (isRelatedToCustomNumberID) {\n                  if (isRelatedToCustomNumberID.type === 'number') hasNumberIDRelation = true\n                }\n              },\n            )\n\n            if (hasNumberIDRelation)\n              result.value.$or.push({ [path]: { [operatorKey]: parseFloat(formattedValue) } })\n          }\n        }\n\n        if (result.value.$or.length > 1) {\n          return result\n        }\n      }\n\n      if (operator === 'like' && typeof formattedValue === 'string') {\n        const words = formattedValue.split(' ')\n\n        const result = {\n          value: {\n            $and: words.map((word) => ({\n              [path]: {\n                $options: 'i',\n                $regex: word.replace(/[\\\\^$*+?.()|[\\]{}]/g, '\\\\$&'),\n              },\n            })),\n          },\n        }\n\n        return result\n      }\n\n      // Some operators like 'near' need to define a full query\n      // so if there is no operator key, just return the value\n      if (!operatorKey) {\n        return {\n          path,\n          value: formattedValue,\n        }\n      }\n\n      return {\n        path,\n        value: { [operatorKey]: formattedValue },\n      }\n    }\n  }\n  return undefined\n}\n"],"names":["buildSearchParam","subQueryOptions","lean","limit","collectionSlug","fields","globalSlug","incomingPath","locale","operator","payload","val","sanitizedPath","replace","paths","hasCustomID","customIDfield","collections","config","find","field","fieldAffectsData","name","idFieldType","type","push","complete","path","getLocalizedPaths","formattedValue","sanitizeQueryValue","length","pathsToQuery","slice","reverse","initialRelationshipQuery","value","relationshipQuery","reduce","priorQuery","slug","subPath","i","priorQueryResult","SubModel","db","subQuery","buildQuery","where","result","$in","forEach","doc","stringID","_id","toString","mongoose","Types","ObjectId","isValid","nextSubPath","map","Promise","resolve","validOperators","includes","operatorKey","operatorMap","hasNumberIDRelation","$or","objectID","Array","isArray","relationTo","isRelatedToCustomNumberID","relatedField","parseFloat","words","split","$and","word","$options","$regex","undefined"],"mappings":"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"}
|
|
219
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["../../src/queries/buildSearchParams.ts"],"sourcesContent":["import type { Payload } from 'payload'\nimport type { PathToQuery } from 'payload/database'\nimport type { Field } from 'payload/types'\nimport type { Operator } from 'payload/types'\n\nimport objectID from 'bson-objectid'\nimport mongoose from 'mongoose'\nimport { getLocalizedPaths } from 'payload/database'\nimport { fieldAffectsData } from 'payload/types'\nimport { validOperators } from 'payload/types'\n\nimport type { MongooseAdapter } from '..'\n\nimport { operatorMap } from './operatorMap'\nimport { sanitizeQueryValue } from './sanitizeQueryValue'\n\ntype SearchParam = {\n  path?: string\n  value: unknown\n}\n\nconst subQueryOptions = {\n  lean: true,\n  limit: 50,\n}\n\n/**\n * Convert the Payload key / value / operator into a MongoDB query\n */\nexport async function buildSearchParam({\n  collectionSlug,\n  fields,\n  globalSlug,\n  incomingPath,\n  locale,\n  operator,\n  payload,\n  val,\n}: {\n  collectionSlug?: string\n  fields: Field[]\n  globalSlug?: string\n  incomingPath: string\n  locale?: string\n  operator: string\n  payload: Payload\n  val: unknown\n}): Promise<SearchParam> {\n  // Replace GraphQL nested field double underscore formatting\n  let sanitizedPath = incomingPath.replace(/__/g, '.')\n  if (sanitizedPath === 'id') sanitizedPath = '_id'\n\n  let paths: PathToQuery[] = []\n\n  let hasCustomID = false\n\n  if (sanitizedPath === '_id') {\n    const customIDfield = payload.collections[collectionSlug]?.config.fields.find(\n      (field) => fieldAffectsData(field) && field.name === 'id',\n    )\n\n    let idFieldType: 'number' | 'text' = 'text'\n\n    if (customIDfield) {\n      if (customIDfield?.type === 'text' || customIDfield?.type === 'number') {\n        idFieldType = customIDfield.type\n      }\n\n      hasCustomID = true\n    }\n\n    paths.push({\n      collectionSlug,\n      complete: true,\n      field: {\n        name: 'id',\n        type: idFieldType,\n      } as Field,\n      path: '_id',\n    })\n  } else {\n    paths = await getLocalizedPaths({\n      collectionSlug,\n      fields,\n      globalSlug,\n      incomingPath: sanitizedPath,\n      locale,\n      payload,\n    })\n  }\n\n  const [{ field, path }] = paths\n\n  if (path) {\n    const { operator: formattedOperator, val: formattedValue } = sanitizeQueryValue({\n      field,\n      hasCustomID,\n      operator,\n      path,\n      val,\n    })\n\n    // If there are multiple collections to search through,\n    // Recursively build up a list of query constraints\n    if (paths.length > 1) {\n      // Remove top collection and reverse array\n      // to work backwards from top\n      const pathsToQuery = paths.slice(1).reverse()\n\n      const initialRelationshipQuery = {\n        value: {},\n      } as SearchParam\n\n      const relationshipQuery = await pathsToQuery.reduce(\n        async (priorQuery, { collectionSlug: slug, path: subPath }, i) => {\n          const priorQueryResult = await priorQuery\n\n          const SubModel = (payload.db as MongooseAdapter).collections[slug]\n\n          // On the \"deepest\" collection,\n          // Search on the value passed through the query\n          if (i === 0) {\n            const subQuery = await SubModel.buildQuery({\n              locale,\n              payload,\n              where: {\n                [subPath]: {\n                  [formattedOperator]: val,\n                },\n              },\n            })\n\n            const result = await SubModel.find(subQuery, subQueryOptions)\n\n            const $in: unknown[] = []\n\n            result.forEach((doc) => {\n              const stringID = doc._id.toString()\n              $in.push(stringID)\n\n              if (mongoose.Types.ObjectId.isValid(stringID)) {\n                $in.push(doc._id)\n              }\n            })\n\n            if (pathsToQuery.length === 1) {\n              return {\n                path,\n                value: { $in },\n              }\n            }\n\n            const nextSubPath = pathsToQuery[i + 1].path\n\n            return {\n              value: { [nextSubPath]: { $in } },\n            }\n          }\n\n          const subQuery = priorQueryResult.value\n          const result = await SubModel.find(subQuery, subQueryOptions)\n\n          const $in = result.map((doc) => doc._id.toString())\n\n          // If it is the last recursion\n          // then pass through the search param\n          if (i + 1 === pathsToQuery.length) {\n            return {\n              path,\n              value: { $in },\n            }\n          }\n\n          return {\n            value: {\n              _id: { $in },\n            },\n          }\n        },\n        Promise.resolve(initialRelationshipQuery),\n      )\n\n      return relationshipQuery\n    }\n\n    if (formattedOperator && validOperators.includes(formattedOperator as Operator)) {\n      const operatorKey = operatorMap[formattedOperator]\n\n      if (field.type === 'relationship' || field.type === 'upload') {\n        let hasNumberIDRelation\n\n        const result = {\n          value: {\n            $or: [{ [path]: { [operatorKey]: formattedValue } }],\n          },\n        }\n\n        if (typeof formattedValue === 'string') {\n          if (mongoose.Types.ObjectId.isValid(formattedValue)) {\n            result.value.$or.push({ [path]: { [operatorKey]: objectID(formattedValue) } })\n          } else {\n            ;(Array.isArray(field.relationTo) ? field.relationTo : [field.relationTo]).forEach(\n              (relationTo) => {\n                const isRelatedToCustomNumberID = payload.collections[\n                  relationTo\n                ]?.config?.fields.find((relatedField) => {\n                  return (\n                    fieldAffectsData(relatedField) &&\n                    relatedField.name === 'id' &&\n                    relatedField.type === 'number'\n                  )\n                })\n\n                if (isRelatedToCustomNumberID) {\n                  if (isRelatedToCustomNumberID.type === 'number') hasNumberIDRelation = true\n                }\n              },\n            )\n\n            if (hasNumberIDRelation)\n              result.value.$or.push({ [path]: { [operatorKey]: parseFloat(formattedValue) } })\n          }\n        }\n\n        if (result.value.$or.length > 1) {\n          return result\n        }\n      }\n\n      if (formattedOperator === 'like' && typeof formattedValue === 'string') {\n        const words = formattedValue.split(' ')\n\n        const result = {\n          value: {\n            $and: words.map((word) => ({\n              [path]: {\n                $options: 'i',\n                $regex: word.replace(/[\\\\^$*+?.()|[\\]{}]/g, '\\\\$&'),\n              },\n            })),\n          },\n        }\n\n        return result\n      }\n\n      // Some operators like 'near' need to define a full query\n      // so if there is no operator key, just return the value\n      if (!operatorKey) {\n        return {\n          path,\n          value: formattedValue,\n        }\n      }\n\n      return {\n        path,\n        value: { [operatorKey]: formattedValue },\n      }\n    }\n  }\n  return undefined\n}\n"],"names":["buildSearchParam","subQueryOptions","lean","limit","collectionSlug","fields","globalSlug","incomingPath","locale","operator","payload","val","sanitizedPath","replace","paths","hasCustomID","customIDfield","collections","config","find","field","fieldAffectsData","name","idFieldType","type","push","complete","path","getLocalizedPaths","formattedOperator","formattedValue","sanitizeQueryValue","length","pathsToQuery","slice","reverse","initialRelationshipQuery","value","relationshipQuery","reduce","priorQuery","slug","subPath","i","priorQueryResult","SubModel","db","subQuery","buildQuery","where","result","$in","forEach","doc","stringID","_id","toString","mongoose","Types","ObjectId","isValid","nextSubPath","map","Promise","resolve","validOperators","includes","operatorKey","operatorMap","hasNumberIDRelation","$or","objectID","Array","isArray","relationTo","isRelatedToCustomNumberID","relatedField","parseFloat","words","split","$and","word","$options","$regex","undefined"],"mappings":"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"}
|
|
@@ -6,6 +6,9 @@ type SanitizeQueryValueArgs = {
|
|
|
6
6
|
path: string;
|
|
7
7
|
val: any;
|
|
8
8
|
};
|
|
9
|
-
export declare const sanitizeQueryValue: ({ field, hasCustomID, operator, path, val, }: SanitizeQueryValueArgs) =>
|
|
9
|
+
export declare const sanitizeQueryValue: ({ field, hasCustomID, operator, path, val, }: SanitizeQueryValueArgs) => {
|
|
10
|
+
operator: string;
|
|
11
|
+
val: unknown;
|
|
12
|
+
};
|
|
10
13
|
export {};
|
|
11
14
|
//# sourceMappingURL=sanitizeQueryValue.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sanitizeQueryValue.d.ts","sourceRoot":"","sources":["../../src/queries/sanitizeQueryValue.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,UAAU,EAAE,MAAM,eAAe,CAAA;AAKtD,KAAK,sBAAsB,GAAG;IAC5B,KAAK,EAAE,KAAK,GAAG,UAAU,CAAA;IACzB,WAAW,EAAE,OAAO,CAAA;IACpB,QAAQ,EAAE,MAAM,CAAA;IAChB,IAAI,EAAE,MAAM,CAAA;IACZ,GAAG,EAAE,GAAG,CAAA;CACT,CAAA;AAED,eAAO,MAAM,kBAAkB,iDAM5B,sBAAsB,
|
|
1
|
+
{"version":3,"file":"sanitizeQueryValue.d.ts","sourceRoot":"","sources":["../../src/queries/sanitizeQueryValue.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,UAAU,EAAE,MAAM,eAAe,CAAA;AAKtD,KAAK,sBAAsB,GAAG;IAC5B,KAAK,EAAE,KAAK,GAAG,UAAU,CAAA;IACzB,WAAW,EAAE,OAAO,CAAA;IACpB,QAAQ,EAAE,MAAM,CAAA;IAChB,IAAI,EAAE,MAAM,CAAA;IACZ,GAAG,EAAE,GAAG,CAAA;CACT,CAAA;AAED,eAAO,MAAM,kBAAkB,iDAM5B,sBAAsB;cAAe,MAAM;SAAO,OAAO;CAyH3D,CAAA"}
|
|
@@ -17,18 +17,25 @@ function _interop_require_default(obj) {
|
|
|
17
17
|
}
|
|
18
18
|
const sanitizeQueryValue = ({ field, hasCustomID, operator, path, val })=>{
|
|
19
19
|
let formattedValue = val;
|
|
20
|
+
let formattedOperator = operator;
|
|
20
21
|
// Disregard invalid _ids
|
|
21
22
|
if (path === '_id' && typeof val === 'string' && val.split(',').length === 1) {
|
|
22
23
|
if (!hasCustomID) {
|
|
23
24
|
const isValid = _mongoose.default.Types.ObjectId.isValid(val);
|
|
24
25
|
if (!isValid) {
|
|
25
|
-
return
|
|
26
|
+
return {
|
|
27
|
+
operator: formattedOperator,
|
|
28
|
+
val: undefined
|
|
29
|
+
};
|
|
26
30
|
}
|
|
27
31
|
}
|
|
28
32
|
if (field.type === 'number') {
|
|
29
33
|
const parsedNumber = parseFloat(val);
|
|
30
34
|
if (Number.isNaN(parsedNumber)) {
|
|
31
|
-
return
|
|
35
|
+
return {
|
|
36
|
+
operator: formattedOperator,
|
|
37
|
+
val: undefined
|
|
38
|
+
};
|
|
32
39
|
}
|
|
33
40
|
}
|
|
34
41
|
}
|
|
@@ -119,10 +126,16 @@ const sanitizeQueryValue = ({ field, hasCustomID, operator, path, val })=>{
|
|
|
119
126
|
};
|
|
120
127
|
}
|
|
121
128
|
}
|
|
129
|
+
if ((path === '_id' || path === 'parent') && operator === 'like' && formattedValue.length === 24 && !hasCustomID) {
|
|
130
|
+
formattedOperator = 'equals';
|
|
131
|
+
}
|
|
122
132
|
if (operator === 'exists') {
|
|
123
133
|
formattedValue = formattedValue === 'true' || formattedValue === true;
|
|
124
134
|
}
|
|
125
|
-
return
|
|
135
|
+
return {
|
|
136
|
+
operator: formattedOperator,
|
|
137
|
+
val: formattedValue
|
|
138
|
+
};
|
|
126
139
|
};
|
|
127
140
|
|
|
128
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
141
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["../../src/queries/sanitizeQueryValue.ts"],"sourcesContent":["import type { Field, TabAsField } from 'payload/types'\n\nimport mongoose from 'mongoose'\nimport { createArrayFromCommaDelineated } from 'payload/utilities'\n\ntype SanitizeQueryValueArgs = {\n  field: Field | TabAsField\n  hasCustomID: boolean\n  operator: string\n  path: string\n  val: any\n}\n\nexport const sanitizeQueryValue = ({\n  field,\n  hasCustomID,\n  operator,\n  path,\n  val,\n}: SanitizeQueryValueArgs): { operator: string; val: unknown } => {\n  let formattedValue = val\n  let formattedOperator = operator\n\n  // Disregard invalid _ids\n  if (path === '_id' && typeof val === 'string' && val.split(',').length === 1) {\n    if (!hasCustomID) {\n      const isValid = mongoose.Types.ObjectId.isValid(val)\n\n      if (!isValid) {\n        return { operator: formattedOperator, val: undefined }\n      }\n    }\n\n    if (field.type === 'number') {\n      const parsedNumber = parseFloat(val)\n\n      if (Number.isNaN(parsedNumber)) {\n        return { operator: formattedOperator, val: undefined }\n      }\n    }\n  }\n\n  // Cast incoming values as proper searchable types\n  if (field.type === 'checkbox' && typeof val === 'string') {\n    if (val.toLowerCase() === 'true') formattedValue = true\n    if (val.toLowerCase() === 'false') formattedValue = false\n  }\n\n  if (['all', 'in', 'not_in'].includes(operator) && typeof formattedValue === 'string') {\n    formattedValue = createArrayFromCommaDelineated(formattedValue)\n\n    if (field.type === 'number') {\n      formattedValue = formattedValue.map((arrayVal) => parseFloat(arrayVal))\n    }\n  }\n\n  if (field.type === 'number' && typeof formattedValue === 'string') {\n    formattedValue = Number(val)\n  }\n\n  if (field.type === 'date' && typeof val === 'string') {\n    formattedValue = new Date(val)\n    if (Number.isNaN(Date.parse(formattedValue))) {\n      return undefined\n    }\n  }\n\n  if (['relationship', 'upload'].includes(field.type)) {\n    if (val === 'null') {\n      formattedValue = null\n    }\n\n    if (operator === 'in' && Array.isArray(formattedValue)) {\n      formattedValue = formattedValue.reduce((formattedValues, inVal) => {\n        const newValues = [inVal]\n        if (mongoose.Types.ObjectId.isValid(inVal))\n          newValues.push(new mongoose.Types.ObjectId(inVal))\n\n        const parsedNumber = parseFloat(inVal)\n        if (!Number.isNaN(parsedNumber)) newValues.push(parsedNumber)\n\n        return [...formattedValues, ...newValues]\n      }, [])\n    }\n  }\n\n  // Set up specific formatting necessary by operators\n\n  if (operator === 'near') {\n    let lng\n    let lat\n    let maxDistance\n    let minDistance\n\n    if (Array.isArray(formattedValue)) {\n      ;[lng, lat, maxDistance, minDistance] = formattedValue\n    }\n\n    if (typeof formattedValue === 'string') {\n      ;[lng, lat, maxDistance, minDistance] = createArrayFromCommaDelineated(formattedValue)\n    }\n\n    if (lng == null || lat == null || (maxDistance == null && minDistance == null)) {\n      formattedValue = undefined\n    } else {\n      formattedValue = {\n        $geometry: { coordinates: [parseFloat(lng), parseFloat(lat)], type: 'Point' },\n      }\n\n      if (maxDistance) formattedValue.$maxDistance = parseFloat(maxDistance)\n      if (minDistance) formattedValue.$minDistance = parseFloat(minDistance)\n    }\n  }\n\n  if (operator === 'within' || operator === 'intersects') {\n    formattedValue = {\n      $geometry: formattedValue,\n    }\n  }\n\n  if (path !== '_id' || (path === '_id' && hasCustomID && field.type === 'text')) {\n    if (operator === 'contains') {\n      formattedValue = { $options: 'i', $regex: formattedValue }\n    }\n  }\n\n  if (\n    (path === '_id' || path === 'parent') &&\n    operator === 'like' &&\n    formattedValue.length === 24 &&\n    !hasCustomID\n  ) {\n    formattedOperator = 'equals'\n  }\n\n  if (operator === 'exists') {\n    formattedValue = formattedValue === 'true' || formattedValue === true\n  }\n\n  return { operator: formattedOperator, val: formattedValue }\n}\n"],"names":["sanitizeQueryValue","field","hasCustomID","operator","path","val","formattedValue","formattedOperator","split","length","isValid","mongoose","Types","ObjectId","undefined","type","parsedNumber","parseFloat","Number","isNaN","toLowerCase","includes","createArrayFromCommaDelineated","map","arrayVal","Date","parse","Array","isArray","reduce","formattedValues","inVal","newValues","push","lng","lat","maxDistance","minDistance","$geometry","coordinates","$maxDistance","$minDistance","$options","$regex"],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"beginTransaction.d.ts","sourceRoot":"","sources":["../../src/transactions/beginTransaction.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"beginTransaction.d.ts","sourceRoot":"","sources":["../../src/transactions/beginTransaction.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAA;AAOxD,eAAO,MAAM,gBAAgB,EAAE,gBAqB9B,CAAA"}
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
// @ts-expect-error // TODO: Fix this import
|
|
2
1
|
"use strict";
|
|
3
2
|
Object.defineProperty(exports, "__esModule", {
|
|
4
3
|
value: true
|
|
@@ -11,28 +10,21 @@ Object.defineProperty(exports, "beginTransaction", {
|
|
|
11
10
|
});
|
|
12
11
|
const _errors = require("payload/errors");
|
|
13
12
|
const _uuid = require("uuid");
|
|
14
|
-
|
|
15
|
-
const beginTransaction = async function beginTransaction(options = {}) {
|
|
16
|
-
let id = null;
|
|
13
|
+
const beginTransaction = async function beginTransaction(options) {
|
|
17
14
|
if (!this.connection) {
|
|
18
15
|
throw new _errors.APIError('beginTransaction called while no connection to the database exists');
|
|
19
16
|
}
|
|
20
|
-
if (transactionsNotAvailable) return id;
|
|
21
17
|
const client = this.connection.getClient();
|
|
22
|
-
|
|
23
|
-
|
|
18
|
+
const id = (0, _uuid.v4)();
|
|
19
|
+
if (!this.sessions[id]) {
|
|
20
|
+
this.sessions[id] = client.startSession();
|
|
21
|
+
}
|
|
22
|
+
if (this.sessions[id].inTransaction()) {
|
|
23
|
+
this.payload.logger.warn('beginTransaction called while transaction already exists');
|
|
24
24
|
} else {
|
|
25
|
-
id
|
|
26
|
-
if (!this.sessions[id]) {
|
|
27
|
-
this.sessions[id] = await client.startSession();
|
|
28
|
-
}
|
|
29
|
-
if (this.sessions[id].inTransaction()) {
|
|
30
|
-
this.payload.logger.warn('beginTransaction called while transaction already exists');
|
|
31
|
-
} else {
|
|
32
|
-
await this.sessions[id].startTransaction(options);
|
|
33
|
-
}
|
|
25
|
+
this.sessions[id].startTransaction(options || this.transactionOptions);
|
|
34
26
|
}
|
|
35
27
|
return id;
|
|
36
28
|
};
|
|
37
29
|
|
|
38
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
30
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy90cmFuc2FjdGlvbnMvYmVnaW5UcmFuc2FjdGlvbi50cyJdLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgdHlwZSB7IFRyYW5zYWN0aW9uT3B0aW9ucyB9IGZyb20gJ21vbmdvZGInXG5pbXBvcnQgdHlwZSB7IEJlZ2luVHJhbnNhY3Rpb24gfSBmcm9tICdwYXlsb2FkL2RhdGFiYXNlJ1xuXG5pbXBvcnQgeyBBUElFcnJvciB9IGZyb20gJ3BheWxvYWQvZXJyb3JzJ1xuaW1wb3J0IHsgdjQgYXMgdXVpZCB9IGZyb20gJ3V1aWQnXG5cbmltcG9ydCB0eXBlIHsgTW9uZ29vc2VBZGFwdGVyIH0gZnJvbSAnLi4vaW5kZXgnXG5cbmV4cG9ydCBjb25zdCBiZWdpblRyYW5zYWN0aW9uOiBCZWdpblRyYW5zYWN0aW9uID0gYXN5bmMgZnVuY3Rpb24gYmVnaW5UcmFuc2FjdGlvbihcbiAgdGhpczogTW9uZ29vc2VBZGFwdGVyLFxuICBvcHRpb25zOiBUcmFuc2FjdGlvbk9wdGlvbnMsXG4pIHtcbiAgaWYgKCF0aGlzLmNvbm5lY3Rpb24pIHtcbiAgICB0aHJvdyBuZXcgQVBJRXJyb3IoJ2JlZ2luVHJhbnNhY3Rpb24gY2FsbGVkIHdoaWxlIG5vIGNvbm5lY3Rpb24gdG8gdGhlIGRhdGFiYXNlIGV4aXN0cycpXG4gIH1cblxuICBjb25zdCBjbGllbnQgPSB0aGlzLmNvbm5lY3Rpb24uZ2V0Q2xpZW50KClcbiAgY29uc3QgaWQgPSB1dWlkKClcblxuICBpZiAoIXRoaXMuc2Vzc2lvbnNbaWRdKSB7XG4gICAgdGhpcy5zZXNzaW9uc1tpZF0gPSBjbGllbnQuc3RhcnRTZXNzaW9uKClcbiAgfVxuICBpZiAodGhpcy5zZXNzaW9uc1tpZF0uaW5UcmFuc2FjdGlvbigpKSB7XG4gICAgdGhpcy5wYXlsb2FkLmxvZ2dlci53YXJuKCdiZWdpblRyYW5zYWN0aW9uIGNhbGxlZCB3aGlsZSB0cmFuc2FjdGlvbiBhbHJlYWR5IGV4aXN0cycpXG4gIH0gZWxzZSB7XG4gICAgdGhpcy5zZXNzaW9uc1tpZF0uc3RhcnRUcmFuc2FjdGlvbihvcHRpb25zIHx8ICh0aGlzLnRyYW5zYWN0aW9uT3B0aW9ucyBhcyBUcmFuc2FjdGlvbk9wdGlvbnMpKVxuICB9XG5cbiAgcmV0dXJuIGlkXG59XG4iXSwibmFtZXMiOlsiYmVnaW5UcmFuc2FjdGlvbiIsIm9wdGlvbnMiLCJjb25uZWN0aW9uIiwiQVBJRXJyb3IiLCJjbGllbnQiLCJnZXRDbGllbnQiLCJpZCIsInV1aWQiLCJzZXNzaW9ucyIsInN0YXJ0U2Vzc2lvbiIsImluVHJhbnNhY3Rpb24iLCJwYXlsb2FkIiwibG9nZ2VyIiwid2FybiIsInN0YXJ0VHJhbnNhY3Rpb24iLCJ0cmFuc2FjdGlvbk9wdGlvbnMiXSwibWFwcGluZ3MiOiI7Ozs7K0JBUWFBOzs7ZUFBQUE7Ozt3QkFMWTtzQkFDRTtBQUlwQixNQUFNQSxtQkFBcUMsZUFBZUEsaUJBRS9EQyxPQUEyQjtJQUUzQixJQUFJLENBQUMsSUFBSSxDQUFDQyxVQUFVLEVBQUU7UUFDcEIsTUFBTSxJQUFJQyxnQkFBUSxDQUFDO0lBQ3JCO0lBRUEsTUFBTUMsU0FBUyxJQUFJLENBQUNGLFVBQVUsQ0FBQ0csU0FBUztJQUN4QyxNQUFNQyxLQUFLQyxJQUFBQSxRQUFJO0lBRWYsSUFBSSxDQUFDLElBQUksQ0FBQ0MsUUFBUSxDQUFDRixHQUFHLEVBQUU7UUFDdEIsSUFBSSxDQUFDRSxRQUFRLENBQUNGLEdBQUcsR0FBR0YsT0FBT0ssWUFBWTtJQUN6QztJQUNBLElBQUksSUFBSSxDQUFDRCxRQUFRLENBQUNGLEdBQUcsQ0FBQ0ksYUFBYSxJQUFJO1FBQ3JDLElBQUksQ0FBQ0MsT0FBTyxDQUFDQyxNQUFNLENBQUNDLElBQUksQ0FBQztJQUMzQixPQUFPO1FBQ0wsSUFBSSxDQUFDTCxRQUFRLENBQUNGLEdBQUcsQ0FBQ1EsZ0JBQWdCLENBQUNiLFdBQVksSUFBSSxDQUFDYyxrQkFBa0I7SUFDeEU7SUFFQSxPQUFPVDtBQUNUIn0=
|
package/dist/updateOne.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"updateOne.d.ts","sourceRoot":"","sources":["../src/updateOne.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAA;
|
|
1
|
+
{"version":3,"file":"updateOne.d.ts","sourceRoot":"","sources":["../src/updateOne.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAA;AASjD,eAAO,MAAM,SAAS,EAAE,SA8BvB,CAAA"}
|
package/dist/updateOne.js
CHANGED
|
@@ -8,8 +8,7 @@ Object.defineProperty(exports, "updateOne", {
|
|
|
8
8
|
return updateOne;
|
|
9
9
|
}
|
|
10
10
|
});
|
|
11
|
-
const
|
|
12
|
-
const _utilities = require("payload/utilities");
|
|
11
|
+
const _handleError = /*#__PURE__*/ _interop_require_default(require("./utilities/handleError"));
|
|
13
12
|
const _sanitizeInternalFields = /*#__PURE__*/ _interop_require_default(require("./utilities/sanitizeInternalFields"));
|
|
14
13
|
const _withSession = require("./withSession");
|
|
15
14
|
function _interop_require_default(obj) {
|
|
@@ -38,13 +37,7 @@ const updateOne = async function updateOne({ id, collection, data, locale, req =
|
|
|
38
37
|
try {
|
|
39
38
|
result = await Model.findOneAndUpdate(query, data, options);
|
|
40
39
|
} catch (error) {
|
|
41
|
-
|
|
42
|
-
throw error.code === 11000 && error.keyValue ? new _errors.ValidationError([
|
|
43
|
-
{
|
|
44
|
-
field: Object.keys(error.keyValue)[0],
|
|
45
|
-
message: 'Value must be unique'
|
|
46
|
-
}
|
|
47
|
-
], req?.t ?? (0, _utilities.i18nInit)(this.payload.config.i18n).t) : error;
|
|
40
|
+
(0, _handleError.default)(error, req);
|
|
48
41
|
}
|
|
49
42
|
result = JSON.parse(JSON.stringify(result));
|
|
50
43
|
result.id = result._id;
|
|
@@ -52,4 +45,4 @@ const updateOne = async function updateOne({ id, collection, data, locale, req =
|
|
|
52
45
|
return result;
|
|
53
46
|
};
|
|
54
47
|
|
|
55
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
48
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uL3NyYy91cGRhdGVPbmUudHMiXSwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHR5cGUgeyBVcGRhdGVPbmUgfSBmcm9tICdwYXlsb2FkL2RhdGFiYXNlJ1xuaW1wb3J0IHR5cGUgeyBQYXlsb2FkUmVxdWVzdCB9IGZyb20gJ3BheWxvYWQvdHlwZXMnXG5cbmltcG9ydCB0eXBlIHsgTW9uZ29vc2VBZGFwdGVyIH0gZnJvbSAnLidcblxuaW1wb3J0IGhhbmRsZUVycm9yIGZyb20gJy4vdXRpbGl0aWVzL2hhbmRsZUVycm9yJ1xuaW1wb3J0IHNhbml0aXplSW50ZXJuYWxGaWVsZHMgZnJvbSAnLi91dGlsaXRpZXMvc2FuaXRpemVJbnRlcm5hbEZpZWxkcydcbmltcG9ydCB7IHdpdGhTZXNzaW9uIH0gZnJvbSAnLi93aXRoU2Vzc2lvbidcblxuZXhwb3J0IGNvbnN0IHVwZGF0ZU9uZTogVXBkYXRlT25lID0gYXN5bmMgZnVuY3Rpb24gdXBkYXRlT25lKFxuICB0aGlzOiBNb25nb29zZUFkYXB0ZXIsXG4gIHsgaWQsIGNvbGxlY3Rpb24sIGRhdGEsIGxvY2FsZSwgcmVxID0ge30gYXMgUGF5bG9hZFJlcXVlc3QsIHdoZXJlOiB3aGVyZUFyZyB9LFxuKSB7XG4gIGNvbnN0IHdoZXJlID0gaWQgPyB7IGlkOiB7IGVxdWFsczogaWQgfSB9IDogd2hlcmVBcmdcbiAgY29uc3QgTW9kZWwgPSB0aGlzLmNvbGxlY3Rpb25zW2NvbGxlY3Rpb25dXG4gIGNvbnN0IG9wdGlvbnMgPSB7XG4gICAgLi4ud2l0aFNlc3Npb24odGhpcywgcmVxLnRyYW5zYWN0aW9uSUQpLFxuICAgIGxlYW46IHRydWUsXG4gICAgbmV3OiB0cnVlLFxuICB9XG5cbiAgY29uc3QgcXVlcnkgPSBhd2FpdCBNb2RlbC5idWlsZFF1ZXJ5KHtcbiAgICBsb2NhbGUsXG4gICAgcGF5bG9hZDogdGhpcy5wYXlsb2FkLFxuICAgIHdoZXJlLFxuICB9KVxuXG4gIGxldCByZXN1bHRcbiAgdHJ5IHtcbiAgICByZXN1bHQgPSBhd2FpdCBNb2RlbC5maW5kT25lQW5kVXBkYXRlKHF1ZXJ5LCBkYXRhLCBvcHRpb25zKVxuICB9IGNhdGNoIChlcnJvcikge1xuICAgIGhhbmRsZUVycm9yKGVycm9yLCByZXEpXG4gIH1cblxuICByZXN1bHQgPSBKU09OLnBhcnNlKEpTT04uc3RyaW5naWZ5KHJlc3VsdCkpXG4gIHJlc3VsdC5pZCA9IHJlc3VsdC5faWRcbiAgcmVzdWx0ID0gc2FuaXRpemVJbnRlcm5hbEZpZWxkcyhyZXN1bHQpXG5cbiAgcmV0dXJuIHJlc3VsdFxufVxuIl0sIm5hbWVzIjpbInVwZGF0ZU9uZSIsImlkIiwiY29sbGVjdGlvbiIsImRhdGEiLCJsb2NhbGUiLCJyZXEiLCJ3aGVyZSIsIndoZXJlQXJnIiwiZXF1YWxzIiwiTW9kZWwiLCJjb2xsZWN0aW9ucyIsIm9wdGlvbnMiLCJ3aXRoU2Vzc2lvbiIsInRyYW5zYWN0aW9uSUQiLCJsZWFuIiwibmV3IiwicXVlcnkiLCJidWlsZFF1ZXJ5IiwicGF5bG9hZCIsInJlc3VsdCIsImZpbmRPbmVBbmRVcGRhdGUiLCJlcnJvciIsImhhbmRsZUVycm9yIiwiSlNPTiIsInBhcnNlIiwic3RyaW5naWZ5IiwiX2lkIiwic2FuaXRpemVJbnRlcm5hbEZpZWxkcyJdLCJtYXBwaW5ncyI6Ijs7OzsrQkFTYUE7OztlQUFBQTs7O29FQUpXOytFQUNXOzZCQUNQOzs7Ozs7QUFFckIsTUFBTUEsWUFBdUIsZUFBZUEsVUFFakQsRUFBRUMsRUFBRSxFQUFFQyxVQUFVLEVBQUVDLElBQUksRUFBRUMsTUFBTSxFQUFFQyxNQUFNLENBQUMsQ0FBbUIsRUFBRUMsT0FBT0MsUUFBUSxFQUFFO0lBRTdFLE1BQU1ELFFBQVFMLEtBQUs7UUFBRUEsSUFBSTtZQUFFTyxRQUFRUDtRQUFHO0lBQUUsSUFBSU07SUFDNUMsTUFBTUUsUUFBUSxJQUFJLENBQUNDLFdBQVcsQ0FBQ1IsV0FBVztJQUMxQyxNQUFNUyxVQUFVO1FBQ2QsR0FBR0MsSUFBQUEsd0JBQVcsRUFBQyxJQUFJLEVBQUVQLElBQUlRLGFBQWEsQ0FBQztRQUN2Q0MsTUFBTTtRQUNOQyxLQUFLO0lBQ1A7SUFFQSxNQUFNQyxRQUFRLE1BQU1QLE1BQU1RLFVBQVUsQ0FBQztRQUNuQ2I7UUFDQWMsU0FBUyxJQUFJLENBQUNBLE9BQU87UUFDckJaO0lBQ0Y7SUFFQSxJQUFJYTtJQUNKLElBQUk7UUFDRkEsU0FBUyxNQUFNVixNQUFNVyxnQkFBZ0IsQ0FBQ0osT0FBT2IsTUFBTVE7SUFDckQsRUFBRSxPQUFPVSxPQUFPO1FBQ2RDLElBQUFBLG9CQUFXLEVBQUNELE9BQU9oQjtJQUNyQjtJQUVBYyxTQUFTSSxLQUFLQyxLQUFLLENBQUNELEtBQUtFLFNBQVMsQ0FBQ047SUFDbkNBLE9BQU9sQixFQUFFLEdBQUdrQixPQUFPTyxHQUFHO0lBQ3RCUCxTQUFTUSxJQUFBQSwrQkFBc0IsRUFBQ1I7SUFFaEMsT0FBT0E7QUFDVCJ9
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"handleError.d.ts","sourceRoot":"","sources":["../../src/utilities/handleError.ts"],"names":[],"mappings":"AAGA,QAAA,MAAM,WAAW,iCAiBhB,CAAA;AAED,eAAe,WAAW,CAAA"}
|
|
@@ -0,0 +1,35 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", {
|
|
3
|
+
value: true
|
|
4
|
+
});
|
|
5
|
+
Object.defineProperty(exports, "default", {
|
|
6
|
+
enumerable: true,
|
|
7
|
+
get: function() {
|
|
8
|
+
return _default;
|
|
9
|
+
}
|
|
10
|
+
});
|
|
11
|
+
const _httpstatus = /*#__PURE__*/ _interop_require_default(require("http-status"));
|
|
12
|
+
const _errors = require("payload/errors");
|
|
13
|
+
function _interop_require_default(obj) {
|
|
14
|
+
return obj && obj.__esModule ? obj : {
|
|
15
|
+
default: obj
|
|
16
|
+
};
|
|
17
|
+
}
|
|
18
|
+
const handleError = (error, req)=>{
|
|
19
|
+
// Handle uniqueness error from MongoDB
|
|
20
|
+
if (error.code === 11000 && error.keyValue) {
|
|
21
|
+
throw new _errors.ValidationError([
|
|
22
|
+
{
|
|
23
|
+
field: Object.keys(error.keyValue)[0],
|
|
24
|
+
message: req.t('error:valueMustBeUnique')
|
|
25
|
+
}
|
|
26
|
+
], req.t);
|
|
27
|
+
} else if (error.code === 11000) {
|
|
28
|
+
throw new _errors.APIError(req.t('error:valueMustBeUnique'), _httpstatus.default.BAD_REQUEST);
|
|
29
|
+
} else {
|
|
30
|
+
throw error;
|
|
31
|
+
}
|
|
32
|
+
};
|
|
33
|
+
const _default = handleError;
|
|
34
|
+
|
|
35
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy91dGlsaXRpZXMvaGFuZGxlRXJyb3IudHMiXSwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IGh0dHBTdGF0dXMgZnJvbSAnaHR0cC1zdGF0dXMnXG5pbXBvcnQgeyBBUElFcnJvciwgVmFsaWRhdGlvbkVycm9yIH0gZnJvbSAncGF5bG9hZC9lcnJvcnMnXG5cbmNvbnN0IGhhbmRsZUVycm9yID0gKGVycm9yLCByZXEpID0+IHtcbiAgLy8gSGFuZGxlIHVuaXF1ZW5lc3MgZXJyb3IgZnJvbSBNb25nb0RCXG4gIGlmIChlcnJvci5jb2RlID09PSAxMTAwMCAmJiBlcnJvci5rZXlWYWx1ZSkge1xuICAgIHRocm93IG5ldyBWYWxpZGF0aW9uRXJyb3IoXG4gICAgICBbXG4gICAgICAgIHtcbiAgICAgICAgICBmaWVsZDogT2JqZWN0LmtleXMoZXJyb3Iua2V5VmFsdWUpWzBdLFxuICAgICAgICAgIG1lc3NhZ2U6IHJlcS50KCdlcnJvcjp2YWx1ZU11c3RCZVVuaXF1ZScpLFxuICAgICAgICB9LFxuICAgICAgXSxcbiAgICAgIHJlcS50LFxuICAgIClcbiAgfSBlbHNlIGlmIChlcnJvci5jb2RlID09PSAxMTAwMCkge1xuICAgIHRocm93IG5ldyBBUElFcnJvcihyZXEudCgnZXJyb3I6dmFsdWVNdXN0QmVVbmlxdWUnKSwgaHR0cFN0YXR1cy5CQURfUkVRVUVTVClcbiAgfSBlbHNlIHtcbiAgICB0aHJvdyBlcnJvclxuICB9XG59XG5cbmV4cG9ydCBkZWZhdWx0IGhhbmRsZUVycm9yXG4iXSwibmFtZXMiOlsiaGFuZGxlRXJyb3IiLCJlcnJvciIsInJlcSIsImNvZGUiLCJrZXlWYWx1ZSIsIlZhbGlkYXRpb25FcnJvciIsImZpZWxkIiwiT2JqZWN0Iiwia2V5cyIsIm1lc3NhZ2UiLCJ0IiwiQVBJRXJyb3IiLCJodHRwU3RhdHVzIiwiQkFEX1JFUVVFU1QiXSwibWFwcGluZ3MiOiI7Ozs7K0JBc0JBOzs7ZUFBQTs7O21FQXRCdUI7d0JBQ21COzs7Ozs7QUFFMUMsTUFBTUEsY0FBYyxDQUFDQyxPQUFPQztJQUMxQix1Q0FBdUM7SUFDdkMsSUFBSUQsTUFBTUUsSUFBSSxLQUFLLFNBQVNGLE1BQU1HLFFBQVEsRUFBRTtRQUMxQyxNQUFNLElBQUlDLHVCQUFlLENBQ3ZCO1lBQ0U7Z0JBQ0VDLE9BQU9DLE9BQU9DLElBQUksQ0FBQ1AsTUFBTUcsUUFBUSxDQUFDLENBQUMsRUFBRTtnQkFDckNLLFNBQVNQLElBQUlRLENBQUMsQ0FBQztZQUNqQjtTQUNELEVBQ0RSLElBQUlRLENBQUM7SUFFVCxPQUFPLElBQUlULE1BQU1FLElBQUksS0FBSyxPQUFPO1FBQy9CLE1BQU0sSUFBSVEsZ0JBQVEsQ0FBQ1QsSUFBSVEsQ0FBQyxDQUFDLDRCQUE0QkUsbUJBQVUsQ0FBQ0MsV0FBVztJQUM3RSxPQUFPO1FBQ0wsTUFBTVo7SUFDUjtBQUNGO01BRUEsV0FBZUQifQ==
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@payloadcms/db-mongodb",
|
|
3
|
-
"version": "1.
|
|
3
|
+
"version": "1.2.0",
|
|
4
4
|
"description": "The officially supported MongoDB database adapter for Payload",
|
|
5
5
|
"repository": "https://github.com/payloadcms/payload",
|
|
6
6
|
"license": "MIT",
|
|
@@ -16,16 +16,18 @@
|
|
|
16
16
|
"bson-objectid": "2.0.4",
|
|
17
17
|
"deepmerge": "4.3.1",
|
|
18
18
|
"get-port": "5.1.1",
|
|
19
|
-
"mongoose": "6.12.
|
|
19
|
+
"mongoose": "6.12.3",
|
|
20
20
|
"mongoose-aggregate-paginate-v2": "1.0.6",
|
|
21
21
|
"mongoose-paginate-v2": "1.7.22",
|
|
22
22
|
"prompts": "2.4.2",
|
|
23
|
+
"http-status": "1.6.2",
|
|
23
24
|
"uuid": "9.0.0"
|
|
24
25
|
},
|
|
25
26
|
"devDependencies": {
|
|
26
27
|
"@types/mongoose-aggregate-paginate-v2": "1.0.9",
|
|
28
|
+
"mongodb": "4.17.1",
|
|
27
29
|
"mongodb-memory-server": "8.13.0",
|
|
28
|
-
"payload": "2.
|
|
30
|
+
"payload": "2.6.0",
|
|
29
31
|
"@payloadcms/eslint-config": "1.0.0"
|
|
30
32
|
},
|
|
31
33
|
"peerDependencies": {
|