@mongodb-js/connection-form 1.11.1 → 1.12.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.
|
@@ -1,12 +1,9 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
-
};
|
|
5
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
3
|
exports.randomLocalKey = exports.adjustCSFLEParams = exports.encryptedFieldConfigToText = exports.textToEncryptedFieldConfig = exports.hasAnyCsfleOption = exports.unsetAutoEncryptionIfEmpty = exports.handleUpdateCsfleKmsTlsParam = exports.handleUpdateCsfleKmsParam = exports.handleUpdateCsfleParam = exports.handleUpdateCsfleStoreCredentials = void 0;
|
|
7
4
|
const crypto_1 = require("crypto");
|
|
8
5
|
const lodash_1 = require("lodash");
|
|
9
|
-
const mongodb_query_parser_1 =
|
|
6
|
+
const mongodb_query_parser_1 = require("mongodb-query-parser");
|
|
10
7
|
const DEFAULT_FLE_OPTIONS = {
|
|
11
8
|
storeCredentials: false,
|
|
12
9
|
autoEncryption: undefined,
|
|
@@ -139,7 +136,7 @@ function textToEncryptedFieldConfig(text) {
|
|
|
139
136
|
}
|
|
140
137
|
let parsed = {};
|
|
141
138
|
try {
|
|
142
|
-
parsed = (0, mongodb_query_parser_1.
|
|
139
|
+
parsed = (0, mongodb_query_parser_1.parseFilter)(text);
|
|
143
140
|
if (!parsed || typeof parsed !== 'object') {
|
|
144
141
|
parsed = {};
|
|
145
142
|
throw new Error('Field contained invalid input');
|
|
@@ -161,7 +158,7 @@ function encryptedFieldConfigToText(config) {
|
|
|
161
158
|
return config['$compass.rawText'];
|
|
162
159
|
}
|
|
163
160
|
const withoutCompassKeys = Object.fromEntries(Object.entries(config).filter(([key]) => !key.startsWith('$compass.')));
|
|
164
|
-
return mongodb_query_parser_1.
|
|
161
|
+
return (0, mongodb_query_parser_1.toJSString)(withoutCompassKeys) || '';
|
|
165
162
|
}
|
|
166
163
|
exports.encryptedFieldConfigToText = encryptedFieldConfigToText;
|
|
167
164
|
function adjustCSFLEParams(connectionOptions) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"csfle-handler.js","sourceRoot":"","sources":["../../src/utils/csfle-handler.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"csfle-handler.js","sourceRoot":"","sources":["../../src/utils/csfle-handler.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -13,7 +13,7 @@
|
|
|
13
13
|
"email": "compass@mongodb.com"
|
|
14
14
|
},
|
|
15
15
|
"homepage": "https://github.com/mongodb-js/compass",
|
|
16
|
-
"version": "1.
|
|
16
|
+
"version": "1.12.0",
|
|
17
17
|
"repository": {
|
|
18
18
|
"type": "git",
|
|
19
19
|
"url": "https://github.com/mongodb-js/compass.git"
|
|
@@ -47,24 +47,24 @@
|
|
|
47
47
|
"reformat": "npm run prettier -- --write . && npm run eslint . --fix"
|
|
48
48
|
},
|
|
49
49
|
"peerDependencies": {
|
|
50
|
-
"@mongodb-js/compass-components": "^1.
|
|
51
|
-
"@mongodb-js/compass-editor": "^0.
|
|
50
|
+
"@mongodb-js/compass-components": "^1.12.0",
|
|
51
|
+
"@mongodb-js/compass-editor": "^0.11.0",
|
|
52
52
|
"react": "^17.0.2"
|
|
53
53
|
},
|
|
54
54
|
"dependencies": {
|
|
55
|
-
"@mongodb-js/compass-components": "^1.
|
|
56
|
-
"@mongodb-js/compass-editor": "^0.
|
|
57
|
-
"@mongodb-js/connection-storage": "^0.
|
|
55
|
+
"@mongodb-js/compass-components": "^1.12.0",
|
|
56
|
+
"@mongodb-js/compass-editor": "^0.11.0",
|
|
57
|
+
"@mongodb-js/connection-storage": "^0.3.0",
|
|
58
58
|
"@testing-library/react-hooks": "^7.0.2",
|
|
59
|
-
"compass-preferences-model": "^2.
|
|
59
|
+
"compass-preferences-model": "^2.12.0",
|
|
60
60
|
"lodash": "^4.17.21",
|
|
61
61
|
"mongodb-build-info": "^1.5.0",
|
|
62
62
|
"mongodb-connection-string-url": "^2.6.0",
|
|
63
|
-
"mongodb-query-parser": "^
|
|
63
|
+
"mongodb-query-parser": "^3.1.3"
|
|
64
64
|
},
|
|
65
65
|
"devDependencies": {
|
|
66
|
-
"@mongodb-js/eslint-config-compass": "^1.0.
|
|
67
|
-
"@mongodb-js/mocha-config-compass": "^1.
|
|
66
|
+
"@mongodb-js/eslint-config-compass": "^1.0.8",
|
|
67
|
+
"@mongodb-js/mocha-config-compass": "^1.3.0",
|
|
68
68
|
"@mongodb-js/prettier-config-compass": "^1.0.1",
|
|
69
69
|
"@mongodb-js/tsconfig-compass": "^1.0.3",
|
|
70
70
|
"@testing-library/react": "^12.1.4",
|
|
@@ -81,7 +81,7 @@
|
|
|
81
81
|
"eslint": "^7.25.0",
|
|
82
82
|
"mocha": "^10.2.0",
|
|
83
83
|
"mongodb": "^5.6.0",
|
|
84
|
-
"mongodb-data-service": "^22.9.
|
|
84
|
+
"mongodb-data-service": "^22.9.2",
|
|
85
85
|
"nyc": "^15.1.0",
|
|
86
86
|
"prettier": "^2.7.1",
|
|
87
87
|
"react": "^17.0.2",
|
|
@@ -89,5 +89,5 @@
|
|
|
89
89
|
"sinon": "^9.2.3",
|
|
90
90
|
"xvfb-maybe": "^0.2.1"
|
|
91
91
|
},
|
|
92
|
-
"gitHead": "
|
|
92
|
+
"gitHead": "62acadaa32f014e73080cfaf7c15753e2e1db08f"
|
|
93
93
|
}
|