@mongosh/arg-parser 1.6.1 → 1.7.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/lib/arg-mapper.js +16 -0
- package/lib/arg-mapper.js.map +1 -1
- package/package.json +6 -6
package/lib/arg-mapper.js
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.mapCliToDriver = void 0;
|
|
4
|
+
const errors_1 = require("@mongosh/errors");
|
|
4
5
|
const mongodb_connection_string_url_1 = require("mongodb-connection-string-url");
|
|
5
6
|
function setDriver(i, key, value) {
|
|
6
7
|
return { ...i, driverOptions: { ...i.driverOptions, [key]: value } };
|
|
@@ -99,6 +100,7 @@ function mapCliToDriver(options, i) {
|
|
|
99
100
|
i = mapOption(i, cliOption, optionValue);
|
|
100
101
|
}
|
|
101
102
|
}
|
|
103
|
+
validateConnectionInfoAfterArgMapping(i, options);
|
|
102
104
|
return i;
|
|
103
105
|
}
|
|
104
106
|
exports.mapCliToDriver = mapCliToDriver;
|
|
@@ -111,5 +113,19 @@ function mapGSSAPIHostnameCanonicalization(value) {
|
|
|
111
113
|
}
|
|
112
114
|
return value;
|
|
113
115
|
}
|
|
116
|
+
function validateConnectionInfoAfterArgMapping(info, originalOptions) {
|
|
117
|
+
if (!info.connectionString) {
|
|
118
|
+
return;
|
|
119
|
+
}
|
|
120
|
+
const connectionString = new mongodb_connection_string_url_1.ConnectionString(info.connectionString, { looseValidation: true });
|
|
121
|
+
if (connectionString.password && !connectionString.username) {
|
|
122
|
+
let text = 'Invalid connection information: Password specified but no username provided';
|
|
123
|
+
if (originalOptions.password && !originalOptions.port) {
|
|
124
|
+
text += " (did you mean '--port' instead of '-p'?)";
|
|
125
|
+
}
|
|
126
|
+
throw new errors_1.MongoshInvalidInputError(text, errors_1.CommonErrors.InvalidArgument);
|
|
127
|
+
}
|
|
128
|
+
new mongodb_connection_string_url_1.ConnectionString(info.connectionString, { looseValidation: false });
|
|
129
|
+
}
|
|
114
130
|
exports.default = mapCliToDriver;
|
|
115
131
|
//# sourceMappingURL=arg-mapper.js.map
|
package/lib/arg-mapper.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"arg-mapper.js","sourceRoot":"","sources":["../src/arg-mapper.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"arg-mapper.js","sourceRoot":"","sources":["../src/arg-mapper.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@mongosh/arg-parser",
|
|
3
|
-
"version": "1.
|
|
3
|
+
"version": "1.7.0",
|
|
4
4
|
"description": "MongoDB Shell CLI Argument List Parser Package",
|
|
5
5
|
"main": "./lib/index.js",
|
|
6
6
|
"repository": {
|
|
@@ -29,13 +29,13 @@
|
|
|
29
29
|
"unitTestsOnly": true
|
|
30
30
|
},
|
|
31
31
|
"dependencies": {
|
|
32
|
-
"@mongosh/errors": "1.
|
|
33
|
-
"@mongosh/i18n": "1.
|
|
34
|
-
"mongodb-connection-string-url": "^2.
|
|
32
|
+
"@mongosh/errors": "1.7.0",
|
|
33
|
+
"@mongosh/i18n": "1.7.0",
|
|
34
|
+
"mongodb-connection-string-url": "^2.6.0"
|
|
35
35
|
},
|
|
36
36
|
"devDependencies": {
|
|
37
37
|
"@mongodb-js/devtools-connect": "^1.4.3",
|
|
38
|
-
"mongodb": "^4.
|
|
38
|
+
"mongodb": "^4.13.0"
|
|
39
39
|
},
|
|
40
|
-
"gitHead": "
|
|
40
|
+
"gitHead": "a2605fcf349a050c7a9081016a431b036b4c5ec3"
|
|
41
41
|
}
|