@mongosh/shell-evaluator 1.0.7 → 1.1.4

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.
@@ -18,12 +18,14 @@ class ShellEvaluator {
18
18
  async innerEval(originalEval, input, context, filename) {
19
19
  var _a, _b, _c, _d, _e;
20
20
  const { shellApi } = this.instanceState;
21
- const argv = input.trim().replace(/;$/, '').split(/\s+/g);
21
+ const trimmedInput = input.trim();
22
+ const argv = trimmedInput.replace(/;$/, '').split(/\s+/g);
22
23
  const cmd = argv.shift();
23
24
  if (((_a = shellApi[cmd]) === null || _a === void 0 ? void 0 : _a.isDirectShellCommand) &&
24
25
  ((_b = shellApi[cmd]) === null || _b === void 0 ? void 0 : _b.acceptsRawInput) &&
25
26
  !((_c = argv[0]) !== null && _c !== void 0 ? _c : '').startsWith('(')) {
26
- return shellApi[cmd](input);
27
+ const rawArg = trimmedInput.replace(/^\S+\s*/, '');
28
+ return shellApi[cmd](rawArg);
27
29
  }
28
30
  if (((_d = shellApi[cmd]) === null || _d === void 0 ? void 0 : _d.isDirectShellCommand) && !((_e = argv[0]) !== null && _e !== void 0 ? _e : '').startsWith('(')) {
29
31
  return shellApi[cmd](...argv);
@@ -31,7 +33,7 @@ class ShellEvaluator {
31
33
  let rewrittenInput = this.asyncWriter.process(input);
32
34
  const hiddenCommands = RegExp(history_1.HIDDEN_COMMANDS, 'g');
33
35
  if (!hiddenCommands.test(input) && !hiddenCommands.test(rewrittenInput)) {
34
- this.instanceState.messageBus.emit('mongosh:evaluate-input', { input: history_1.redactSensitiveData(input.trim()) });
36
+ this.instanceState.messageBus.emit('mongosh:evaluate-input', { input: history_1.redactSensitiveData(trimmedInput) });
35
37
  }
36
38
  if (!this.hasAppliedAsyncWriterRuntimeSupport) {
37
39
  this.hasAppliedAsyncWriterRuntimeSupport = true;
@@ -1 +1 @@
1
- {"version":3,"file":"shell-evaluator.js","sourceRoot":"","sources":["../src/shell-evaluator.ts"],"names":[],"mappings":";;;;;;AAAA,kDAK4B;AAC5B,+EAAmD;AAInD,8CAAwE;AAGxE,MAAM,cAAc;IAMlB,YAAY,aAAiC,EAAE,gBAAqD,yBAAoB;QAHhH,wCAAmC,GAAG,IAAI,CAAC;QAIjD,IAAI,CAAC,aAAa,GAAG,aAAa,CAAC;QACnC,IAAI,CAAC,aAAa,GAAG,aAAa,CAAC;QACnC,IAAI,CAAC,WAAW,GAAG,IAAI,yBAAW,EAAE,CAAC;QACrC,IAAI,CAAC,mCAAmC,GAAG,KAAK,CAAC;IACnD,CAAC;IAWO,KAAK,CAAC,SAAS,CAAC,YAAgC,EAAE,KAAa,EAAE,OAAe,EAAE,QAAgB;;QACxG,MAAM,EAAE,QAAQ,EAAE,GAAG,IAAI,CAAC,aAAa,CAAC;QACxC,MAAM,IAAI,GAAG,KAAK,CAAC,IAAI,EAAE,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;QAC1D,MAAM,GAAG,GAAG,IAAI,CAAC,KAAK,EAA2B,CAAC;QAElD,IACE,CAAA,MAAA,QAAQ,CAAC,GAAG,CAAC,0CAAE,oBAAoB;aACnC,MAAA,QAAQ,CAAC,GAAG,CAAC,0CAAE,eAAe,CAAA;YAC9B,CAAC,CAAC,MAAA,IAAI,CAAC,CAAC,CAAC,mCAAI,EAAE,CAAC,CAAC,UAAU,CAAC,GAAG,CAAC,EAChC;YACA,OAAO,QAAQ,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC;SAC7B;QAED,IAAI,CAAA,MAAA,QAAQ,CAAC,GAAG,CAAC,0CAAE,oBAAoB,KAAI,CAAC,CAAC,MAAA,IAAI,CAAC,CAAC,CAAC,mCAAI,EAAE,CAAC,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE;YAC3E,OAAO,QAAQ,CAAC,GAAG,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC;SAC/B;QAED,IAAI,cAAc,GAAG,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;QAErD,MAAM,cAAc,GAAG,MAAM,CAAC,yBAAe,EAAE,GAAG,CAAC,CAAC;QACpD,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,cAAc,CAAC,EAAE;YACvE,IAAI,CAAC,aAAa,CAAC,UAAU,CAAC,IAAI,CAChC,wBAAwB,EACxB,EAAE,KAAK,EAAE,6BAAmB,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,EAAE,CAC7C,CAAC;SACH;QAED,IAAI,CAAC,IAAI,CAAC,mCAAmC,EAAE;YAC7C,IAAI,CAAC,mCAAmC,GAAG,IAAI,CAAC;YAChD,MAAM,WAAW,GAAG,IAAI,CAAC,WAAW,CAAC,kBAAkB,EAAE,CAAC;YAO1D,IAAI,CAAC,WAAW,CAAC,CAAC;YAClB,cAAc,GAAG,WAAW,GAAG,KAAK,GAAG,cAAc,CAAC;SACvD;QAED,IAAI;YACF,OAAO,MAAM,YAAY,CAAC,cAAc,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAC;SAC9D;QAAC,OAAO,GAAG,EAAE;YACZ,MAAM,IAAI,CAAC,aAAa,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC;SAC9C;IACH,CAAC;IAUM,KAAK,CAAC,UAAU,CAAC,YAAgC,EAAE,KAAa,EAAE,OAAe,EAAE,QAAgB;QACxG,MAAM,gBAAgB,GAAG,MAAM,IAAI,CAAC,SAAS,CAC3C,YAAY,EACZ,KAAK,EACL,OAAO,EACP,QAAQ,CACT,CAAC;QAEF,OAAO,MAAM,IAAI,CAAC,aAAa,CAAC,gBAAgB,CAAC,CAAC;IACpD,CAAC;CACF;AAIC,wCAAc"}
1
+ {"version":3,"file":"shell-evaluator.js","sourceRoot":"","sources":["../src/shell-evaluator.ts"],"names":[],"mappings":";;;;;;AAAA,kDAK4B;AAC5B,+EAAmD;AAInD,8CAAwE;AAGxE,MAAM,cAAc;IAMlB,YAAY,aAAiC,EAAE,gBAAqD,yBAAoB;QAHhH,wCAAmC,GAAG,IAAI,CAAC;QAIjD,IAAI,CAAC,aAAa,GAAG,aAAa,CAAC;QACnC,IAAI,CAAC,aAAa,GAAG,aAAa,CAAC;QACnC,IAAI,CAAC,WAAW,GAAG,IAAI,yBAAW,EAAE,CAAC;QACrC,IAAI,CAAC,mCAAmC,GAAG,KAAK,CAAC;IACnD,CAAC;IAWO,KAAK,CAAC,SAAS,CAAC,YAAgC,EAAE,KAAa,EAAE,OAAe,EAAE,QAAgB;;QACxG,MAAM,EAAE,QAAQ,EAAE,GAAG,IAAI,CAAC,aAAa,CAAC;QACxC,MAAM,YAAY,GAAG,KAAK,CAAC,IAAI,EAAE,CAAC;QAClC,MAAM,IAAI,GAAG,YAAY,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;QAC1D,MAAM,GAAG,GAAG,IAAI,CAAC,KAAK,EAA2B,CAAC;QAElD,IACE,CAAA,MAAA,QAAQ,CAAC,GAAG,CAAC,0CAAE,oBAAoB;aACnC,MAAA,QAAQ,CAAC,GAAG,CAAC,0CAAE,eAAe,CAAA;YAC9B,CAAC,CAAC,MAAA,IAAI,CAAC,CAAC,CAAC,mCAAI,EAAE,CAAC,CAAC,UAAU,CAAC,GAAG,CAAC,EAChC;YACA,MAAM,MAAM,GAAG,YAAY,CAAC,OAAO,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC;YACnD,OAAO,QAAQ,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,CAAC;SAC9B;QAED,IAAI,CAAA,MAAA,QAAQ,CAAC,GAAG,CAAC,0CAAE,oBAAoB,KAAI,CAAC,CAAC,MAAA,IAAI,CAAC,CAAC,CAAC,mCAAI,EAAE,CAAC,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE;YAC3E,OAAO,QAAQ,CAAC,GAAG,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC;SAC/B;QAED,IAAI,cAAc,GAAG,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;QAErD,MAAM,cAAc,GAAG,MAAM,CAAC,yBAAe,EAAE,GAAG,CAAC,CAAC;QACpD,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,cAAc,CAAC,EAAE;YACvE,IAAI,CAAC,aAAa,CAAC,UAAU,CAAC,IAAI,CAChC,wBAAwB,EACxB,EAAE,KAAK,EAAE,6BAAmB,CAAC,YAAY,CAAC,EAAE,CAC7C,CAAC;SACH;QAED,IAAI,CAAC,IAAI,CAAC,mCAAmC,EAAE;YAC7C,IAAI,CAAC,mCAAmC,GAAG,IAAI,CAAC;YAChD,MAAM,WAAW,GAAG,IAAI,CAAC,WAAW,CAAC,kBAAkB,EAAE,CAAC;YAO1D,IAAI,CAAC,WAAW,CAAC,CAAC;YAClB,cAAc,GAAG,WAAW,GAAG,KAAK,GAAG,cAAc,CAAC;SACvD;QAED,IAAI;YACF,OAAO,MAAM,YAAY,CAAC,cAAc,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAC;SAC9D;QAAC,OAAO,GAAG,EAAE;YACZ,MAAM,IAAI,CAAC,aAAa,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC;SAC9C;IACH,CAAC;IAUM,KAAK,CAAC,UAAU,CAAC,YAAgC,EAAE,KAAa,EAAE,OAAe,EAAE,QAAgB;QACxG,MAAM,gBAAgB,GAAG,MAAM,IAAI,CAAC,SAAS,CAC3C,YAAY,EACZ,KAAK,EACL,OAAO,EACP,QAAQ,CACT,CAAC;QAEF,OAAO,MAAM,IAAI,CAAC,aAAa,CAAC,gBAAgB,CAAC,CAAC;IACpD,CAAC;CACF;AAIC,wCAAc"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@mongosh/shell-evaluator",
3
- "version": "1.0.7",
3
+ "version": "1.1.4",
4
4
  "description": "MongoDB Top Level API Package",
5
5
  "main": "./lib/index.js",
6
6
  "scripts": {
@@ -32,9 +32,9 @@
32
32
  "@types/sinon-chai": "^3.2.3"
33
33
  },
34
34
  "dependencies": {
35
- "@mongosh/async-rewriter2": "1.0.7",
36
- "@mongosh/history": "1.0.7",
37
- "@mongosh/shell-api": "1.0.7"
35
+ "@mongosh/async-rewriter2": "1.1.4",
36
+ "@mongosh/history": "1.1.4",
37
+ "@mongosh/shell-api": "1.1.4"
38
38
  },
39
- "gitHead": "fa92af95014f84e2ae640aacbe063ec0ba62fbd1"
39
+ "gitHead": "956e60d4d4e064956f11f4f03c0a21d42a9d8193"
40
40
  }