@mongosh/arg-parser 1.10.1 → 1.10.3
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/.depcheckrc +13 -1
- package/.eslintrc.js +10 -1
- package/.prettierignore +6 -0
- package/.prettierrc.json +1 -0
- package/lib/arg-mapper.js +27 -11
- package/lib/arg-mapper.js.map +1 -1
- package/lib/index.js.map +1 -1
- package/lib/uri-generator.js +19 -11
- package/lib/uri-generator.js.map +1 -1
- package/package.json +20 -10
- package/tsconfig-lint.json +5 -0
- package/tsconfig.lint.json +0 -8
package/.depcheckrc
CHANGED
|
@@ -1,2 +1,14 @@
|
|
|
1
|
+
ignores:
|
|
2
|
+
- '@mongodb-js/eslint-config-mongosh'
|
|
3
|
+
- '@mongodb-js/tsconfig-mongosh'
|
|
4
|
+
- '@mongodb-js/prettier-config-devtools'
|
|
5
|
+
- '@typescript-eslint/parser'
|
|
6
|
+
- '@typescript-eslint/eslint-plugin'
|
|
7
|
+
- chai
|
|
8
|
+
- sinon-chai
|
|
9
|
+
- eslint-plugin-mocha
|
|
10
|
+
- eslint-config-mongodb-js
|
|
1
11
|
# needed as a peer dependency of @mongodb-js/devtools-connect
|
|
2
|
-
|
|
12
|
+
- mongodb
|
|
13
|
+
ignore-patterns:
|
|
14
|
+
- .eslintrc.js
|
package/.eslintrc.js
CHANGED
|
@@ -1 +1,10 @@
|
|
|
1
|
-
|
|
1
|
+
const { fixCygwinPath } = require('@mongodb-js/eslint-config-mongosh/utils');
|
|
2
|
+
|
|
3
|
+
module.exports = {
|
|
4
|
+
root: true,
|
|
5
|
+
extends: ['@mongodb-js/eslint-config-mongosh'],
|
|
6
|
+
parserOptions: {
|
|
7
|
+
tsconfigRootDir: fixCygwinPath(__dirname),
|
|
8
|
+
project: ['./tsconfig-lint.json'],
|
|
9
|
+
},
|
|
10
|
+
};
|
package/.prettierignore
ADDED
package/.prettierrc.json
ADDED
|
@@ -0,0 +1 @@
|
|
|
1
|
+
"@mongodb-js/prettier-config-devtools"
|
package/lib/arg-mapper.js
CHANGED
|
@@ -9,7 +9,9 @@ function setDriver(i, key, value) {
|
|
|
9
9
|
function setServerApi(i, key, value) {
|
|
10
10
|
var _a;
|
|
11
11
|
const previousServerApi = i.driverOptions.serverApi;
|
|
12
|
-
const serverApi = typeof previousServerApi === 'string'
|
|
12
|
+
const serverApi = typeof previousServerApi === 'string'
|
|
13
|
+
? { version: previousServerApi }
|
|
14
|
+
: (_a = { ...previousServerApi }) !== null && _a !== void 0 ? _a : {};
|
|
13
15
|
serverApi[key] = value;
|
|
14
16
|
return setDriver(i, 'serverApi', serverApi);
|
|
15
17
|
}
|
|
@@ -33,7 +35,9 @@ function setAWSKMS(i, key, value) {
|
|
|
33
35
|
return setAutoEncrypt(i, 'kmsProviders', { ...kmsProviders, aws });
|
|
34
36
|
}
|
|
35
37
|
function setUrlParam(i, key, value) {
|
|
36
|
-
const connectionString = new mongodb_connection_string_url_1.ConnectionString(i.connectionString, {
|
|
38
|
+
const connectionString = new mongodb_connection_string_url_1.ConnectionString(i.connectionString, {
|
|
39
|
+
looseValidation: true,
|
|
40
|
+
});
|
|
37
41
|
const searchParams = connectionString.typedSearchParams();
|
|
38
42
|
if (value === '' || value === undefined) {
|
|
39
43
|
searchParams.delete(key);
|
|
@@ -44,13 +48,19 @@ function setUrlParam(i, key, value) {
|
|
|
44
48
|
return { ...i, connectionString: connectionString.toString() };
|
|
45
49
|
}
|
|
46
50
|
function setUrl(i, key, value) {
|
|
47
|
-
const connectionString = new mongodb_connection_string_url_1.ConnectionString(i.connectionString, {
|
|
51
|
+
const connectionString = new mongodb_connection_string_url_1.ConnectionString(i.connectionString, {
|
|
52
|
+
looseValidation: true,
|
|
53
|
+
});
|
|
48
54
|
connectionString[key] = value;
|
|
49
55
|
return { ...i, connectionString: connectionString.toString() };
|
|
50
56
|
}
|
|
51
57
|
function setAuthMechProp(i, key, value) {
|
|
52
|
-
const connectionString = new mongodb_connection_string_url_1.ConnectionString(i.connectionString, {
|
|
53
|
-
|
|
58
|
+
const connectionString = new mongodb_connection_string_url_1.ConnectionString(i.connectionString, {
|
|
59
|
+
looseValidation: true,
|
|
60
|
+
});
|
|
61
|
+
const authMechanismProps = new mongodb_connection_string_url_1.CommaAndColonSeparatedRecord(connectionString
|
|
62
|
+
.typedSearchParams()
|
|
63
|
+
.get('authMechanismProperties'));
|
|
54
64
|
if (value === '' || value === undefined) {
|
|
55
65
|
authMechanismProps.delete(key);
|
|
56
66
|
}
|
|
@@ -62,21 +72,23 @@ function setAuthMechProp(i, key, value) {
|
|
|
62
72
|
function setAuthMechPropNonUrl(i, key, value) {
|
|
63
73
|
return setDriver(i, 'authMechanismProperties', {
|
|
64
74
|
...i.driverOptions.authMechanismProperties,
|
|
65
|
-
[key]: value
|
|
75
|
+
[key]: value,
|
|
66
76
|
});
|
|
67
77
|
}
|
|
68
78
|
function setOIDC(i, key, value) {
|
|
69
79
|
return setDriver(i, 'oidc', { ...i.driverOptions.oidc, [key]: value });
|
|
70
80
|
}
|
|
71
81
|
function matchingAllowedHosts(i) {
|
|
72
|
-
const connectionString = new mongodb_connection_string_url_1.ConnectionString(i.connectionString, {
|
|
73
|
-
|
|
82
|
+
const connectionString = new mongodb_connection_string_url_1.ConnectionString(i.connectionString, {
|
|
83
|
+
looseValidation: true,
|
|
84
|
+
});
|
|
85
|
+
const suffixes = connectionString.hosts.map((hostStr) => {
|
|
74
86
|
var _a;
|
|
75
87
|
const { host } = (_a = hostStr.match(/^(?<host>.+?)(?<port>:[^:\]\[]+)?$/)) === null || _a === void 0 ? void 0 : _a.groups;
|
|
76
88
|
if (host.startsWith('[') && host.endsWith(']')) {
|
|
77
89
|
return host.slice(1, -1);
|
|
78
90
|
}
|
|
79
|
-
if (
|
|
91
|
+
if (/^[0-9.]+$/.exec(host)) {
|
|
80
92
|
return host;
|
|
81
93
|
}
|
|
82
94
|
if (!host.includes('.') || !connectionString.isSRV) {
|
|
@@ -127,7 +139,9 @@ function mapOption(i, key, value) {
|
|
|
127
139
|
function mapCliToDriver(options, i) {
|
|
128
140
|
for (const cliOption of Object.keys(options)) {
|
|
129
141
|
const optionValue = options[cliOption];
|
|
130
|
-
if (optionValue !== null &&
|
|
142
|
+
if (optionValue !== null &&
|
|
143
|
+
optionValue !== undefined &&
|
|
144
|
+
optionValue !== '') {
|
|
131
145
|
i = mapOption(i, cliOption, optionValue);
|
|
132
146
|
}
|
|
133
147
|
}
|
|
@@ -148,7 +162,9 @@ function validateConnectionInfoAfterArgMapping(info, originalOptions) {
|
|
|
148
162
|
if (!info.connectionString) {
|
|
149
163
|
return;
|
|
150
164
|
}
|
|
151
|
-
const connectionString = new mongodb_connection_string_url_1.ConnectionString(info.connectionString, {
|
|
165
|
+
const connectionString = new mongodb_connection_string_url_1.ConnectionString(info.connectionString, {
|
|
166
|
+
looseValidation: true,
|
|
167
|
+
});
|
|
152
168
|
if (connectionString.password && !connectionString.username) {
|
|
153
169
|
let text = 'Invalid connection information: Password specified but no username provided';
|
|
154
170
|
if (originalOptions.password && !originalOptions.port) {
|
package/lib/arg-mapper.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"arg-mapper.js","sourceRoot":"","sources":["../src/arg-mapper.ts"],"names":[],"mappings":";;;AAAA,4CAAyE;AAGzE,
|
|
1
|
+
{"version":3,"file":"arg-mapper.js","sourceRoot":"","sources":["../src/arg-mapper.ts"],"names":[],"mappings":"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"}
|
package/lib/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;AAEA,mDAA8C;AAC9C,6CAA8C;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;AAEA,mDAA8C;AAC9C,6CAA8C;AAUD,+FAVpC,2BAAc,OAUoC;AAE3D,SAAgB,iCAAiC,CAC/C,OAAmB;IAEnB,MAAM,gBAAgB,GAAG,IAAA,2BAAW,EAAC,OAAO,CAAC,CAAC;IAC9C,OAAO,IAAA,2BAAc,EAAC,OAAO,EAAE,EAAE,gBAAgB,EAAE,aAAa,EAAE,EAAE,EAAE,CAAC,CAAC;AAC1E,CAAC;AALD,8EAKC"}
|
package/lib/uri-generator.js
CHANGED
|
@@ -18,10 +18,12 @@ function validateConflicts(options, connectionString) {
|
|
|
18
18
|
if (options.host || options.port) {
|
|
19
19
|
throw new errors_1.MongoshInvalidInputError(i18n_1.default.__(CONFLICT), errors_1.CommonErrors.InvalidArgument);
|
|
20
20
|
}
|
|
21
|
-
if (options.gssapiServiceName &&
|
|
21
|
+
if (options.gssapiServiceName &&
|
|
22
|
+
(connectionString === null || connectionString === void 0 ? void 0 : connectionString.searchParams.has('authMechanismProperties'))) {
|
|
22
23
|
const authProperties = new mongodb_connection_string_url_1.CommaAndColonSeparatedRecord(connectionString.searchParams.get('authMechanismProperties'));
|
|
23
24
|
const serviceName = authProperties.get('SERVICE_NAME');
|
|
24
|
-
if (serviceName !== undefined &&
|
|
25
|
+
if (serviceName !== undefined &&
|
|
26
|
+
options.gssapiServiceName !== serviceName) {
|
|
25
27
|
throw new errors_1.MongoshInvalidInputError(i18n_1.default.__(DIVERGING_SERVICE_NAME), errors_1.CommonErrors.InvalidArgument);
|
|
26
28
|
}
|
|
27
29
|
}
|
|
@@ -30,21 +32,24 @@ function validateConflicts(options, connectionString) {
|
|
|
30
32
|
}
|
|
31
33
|
}
|
|
32
34
|
function validateHost(host) {
|
|
33
|
-
const invalidCharacter =
|
|
35
|
+
const invalidCharacter = /[^a-zA-Z0-9.:[\]_-]/.exec(host);
|
|
34
36
|
if (invalidCharacter) {
|
|
35
|
-
throw new errors_1.MongoshInvalidInputError(i18n_1.default.__(INVALID_HOST)
|
|
37
|
+
throw new errors_1.MongoshInvalidInputError(`${i18n_1.default.__(INVALID_HOST)}: ${invalidCharacter[0]}`, errors_1.CommonErrors.InvalidArgument);
|
|
36
38
|
}
|
|
37
39
|
}
|
|
38
40
|
function validateHostSeedList(hosts, fixedPort) {
|
|
39
41
|
var _a, _b;
|
|
40
|
-
const trimmedHosts = hosts
|
|
42
|
+
const trimmedHosts = hosts
|
|
43
|
+
.split(',')
|
|
44
|
+
.map((h) => h.trim())
|
|
45
|
+
.filter((h) => !!h);
|
|
41
46
|
const hostList = [];
|
|
42
47
|
for (const h of trimmedHosts) {
|
|
43
|
-
const { host, port } = (_b = (_a =
|
|
48
|
+
const { host, port } = (_b = (_a = /^(?<host>.+?)(:(?<port>\d+))?$/.exec(h)) === null || _a === void 0 ? void 0 : _a.groups) !== null && _b !== void 0 ? _b : {};
|
|
44
49
|
if (fixedPort && port !== undefined && port !== fixedPort) {
|
|
45
50
|
throw new errors_1.MongoshInvalidInputError(i18n_1.default.__(HOST_LIST_PORT_MISMATCH), errors_1.CommonErrors.InvalidArgument);
|
|
46
51
|
}
|
|
47
|
-
hostList.push(`${host}${
|
|
52
|
+
hostList.push(`${host}${port || fixedPort ? `:${(port || fixedPort)}` : ''}`);
|
|
48
53
|
}
|
|
49
54
|
return hostList;
|
|
50
55
|
}
|
|
@@ -74,7 +79,7 @@ function generateUri(options) {
|
|
|
74
79
|
return '';
|
|
75
80
|
}
|
|
76
81
|
const connectionString = generateUriNormalized(options);
|
|
77
|
-
if (connectionString.hosts.every(host => ['localhost', '127.0.0.1'].includes(host.split(':')[0]))) {
|
|
82
|
+
if (connectionString.hosts.every((host) => ['localhost', '127.0.0.1'].includes(host.split(':')[0]))) {
|
|
78
83
|
const params = connectionString.searchParams;
|
|
79
84
|
if (!params.has('serverSelectionTimeoutMS')) {
|
|
80
85
|
params.set('serverSelectionTimeoutMS', '2000');
|
|
@@ -86,7 +91,7 @@ exports.generateUri = generateUri;
|
|
|
86
91
|
function generateUriNormalized(options) {
|
|
87
92
|
var _a, _b, _c;
|
|
88
93
|
const uri = options.connectionSpecifier;
|
|
89
|
-
const replSetHostMatch =
|
|
94
|
+
const replSetHostMatch = /^(?<replSetName>[^/]+)\/(?<hosts>(([A-Za-z0-9._-]+|\[[0-9a-fA-F:]+\])(:\d+)?,?)+)$/.exec((_a = options.host) !== null && _a !== void 0 ? _a : '');
|
|
90
95
|
if (replSetHostMatch) {
|
|
91
96
|
const { replSetName, hosts } = replSetHostMatch.groups;
|
|
92
97
|
const connectionString = new mongodb_connection_string_url_1.ConnectionString(`mongodb://replacemeHost/${encodeURIComponent(uri || '')}`);
|
|
@@ -94,7 +99,7 @@ function generateUriNormalized(options) {
|
|
|
94
99
|
connectionString.searchParams.set('replicaSet', replSetName);
|
|
95
100
|
return addShellConnectionStringParameters(connectionString);
|
|
96
101
|
}
|
|
97
|
-
const seedList = ((_b = options.host) !== null && _b !== void 0 ? _b : '')
|
|
102
|
+
const seedList = /^(?<hosts>([A-Za-z0-9._-]+(:\d+)?,?)+)$/.exec((_b = options.host) !== null && _b !== void 0 ? _b : '');
|
|
98
103
|
if (seedList && ((_c = options.host) === null || _c === void 0 ? void 0 : _c.includes(','))) {
|
|
99
104
|
const { hosts } = seedList.groups;
|
|
100
105
|
const connectionString = new mongodb_connection_string_url_1.ConnectionString(`mongodb://replacemeHost/${encodeURIComponent(uri || '')}`);
|
|
@@ -139,7 +144,10 @@ function generateUriNormalized(options) {
|
|
|
139
144
|
function addShellConnectionStringParameters(uri) {
|
|
140
145
|
uri = uri.clone();
|
|
141
146
|
const params = uri.searchParams;
|
|
142
|
-
if (!params.has('replicaSet') &&
|
|
147
|
+
if (!params.has('replicaSet') &&
|
|
148
|
+
!params.has('directConnection') &&
|
|
149
|
+
!params.has('loadBalanced') &&
|
|
150
|
+
uri.hosts.length === 1) {
|
|
143
151
|
params.set('directConnection', 'true');
|
|
144
152
|
}
|
|
145
153
|
return uri;
|
package/lib/uri-generator.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"uri-generator.js","sourceRoot":"","sources":["../src/uri-generator.ts"],"names":[],"mappings":";;;;;;
|
|
1
|
+
{"version":3,"file":"uri-generator.js","sourceRoot":"","sources":["../src/uri-generator.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.10.
|
|
3
|
+
"version": "1.10.3",
|
|
4
4
|
"description": "MongoDB Shell CLI Argument List Parser Package",
|
|
5
5
|
"main": "./lib/index.js",
|
|
6
6
|
"repository": {
|
|
@@ -13,10 +13,14 @@
|
|
|
13
13
|
"scripts": {
|
|
14
14
|
"test": "mocha -r \"../../scripts/import-expansions.js\" --timeout 60000 -r ts-node/register \"./{src,lib}/**/*.spec.ts\"",
|
|
15
15
|
"test-ci": "node ../../scripts/run-if-package-requested.js npm test",
|
|
16
|
-
"
|
|
17
|
-
"
|
|
18
|
-
"
|
|
19
|
-
"
|
|
16
|
+
"eslint": "eslint",
|
|
17
|
+
"lint": "npm run eslint . && npm run prettier -- --check .",
|
|
18
|
+
"check": "npm run lint && npm run depcheck",
|
|
19
|
+
"depcheck": "depcheck",
|
|
20
|
+
"compile": "tsc -p tsconfig.json",
|
|
21
|
+
"prepublish": "npm run compile",
|
|
22
|
+
"prettier": "prettier",
|
|
23
|
+
"reformat": "npm run prettier -- --write . && npm run eslint --fix"
|
|
20
24
|
},
|
|
21
25
|
"license": "Apache-2.0",
|
|
22
26
|
"publishConfig": {
|
|
@@ -29,13 +33,19 @@
|
|
|
29
33
|
"unitTestsOnly": true
|
|
30
34
|
},
|
|
31
35
|
"dependencies": {
|
|
32
|
-
"@mongosh/errors": "1.10.
|
|
33
|
-
"@mongosh/i18n": "1.10.
|
|
36
|
+
"@mongosh/errors": "1.10.3",
|
|
37
|
+
"@mongosh/i18n": "1.10.3",
|
|
34
38
|
"mongodb-connection-string-url": "^2.6.0"
|
|
35
39
|
},
|
|
36
40
|
"devDependencies": {
|
|
37
41
|
"@mongodb-js/devtools-connect": "^2.2.1",
|
|
38
|
-
"mongodb": "
|
|
39
|
-
|
|
40
|
-
|
|
42
|
+
"@mongodb-js/eslint-config-mongosh": "1.10.3",
|
|
43
|
+
"@mongodb-js/prettier-config-devtools": "^1.0.1",
|
|
44
|
+
"@mongodb-js/tsconfig-mongosh": "1.10.3",
|
|
45
|
+
"depcheck": "^1.4.3",
|
|
46
|
+
"eslint": "^7.25.0",
|
|
47
|
+
"mongodb": "^5.7.0",
|
|
48
|
+
"prettier": "^2.8.8"
|
|
49
|
+
},
|
|
50
|
+
"gitHead": "5df718faed3916fc5ce637f953eef2f913b14303"
|
|
41
51
|
}
|